diff --git a/build.zig b/build.zig index 7290d770db..42ab60c469 100644 --- a/build.zig +++ b/build.zig @@ -6,7 +6,6 @@ const BufMap = std.BufMap; const warn = std.debug.warn; const mem = std.mem; const ArrayList = std.ArrayList; -const Buffer = std.Buffer; const io = std.io; const fs = std.fs; const InstallDirectoryOptions = std.build.InstallDirectoryOptions; diff --git a/ci/srht/freebsd_script b/ci/srht/freebsd_script index 37f78291e5..fb4a5d357e 100755 --- a/ci/srht/freebsd_script +++ b/ci/srht/freebsd_script @@ -3,8 +3,15 @@ set -x set -e -sudo pkg update -f -yes | sudo pkg install cmake py27-s3cmd wget curl jq +# The following line can be removed as soon as FreeBSD fixes +# their packaging glitch. If not fixed by March 15, 2020 +# there is something wrong. Should be fixed much sooner. +# note: this will cause some complaints when running +# pkg commands but let's ignore them. +sudo rm /usr/local/etc/pkg/repos/FreeBSD.conf + +sudo pkg update -fq +sudo pkg install -y cmake py27-s3cmd wget curl jq ZIGDIR="$(pwd)" CACHE_BASENAME="llvm+clang-10.0.0-freebsd-x86_64-release" diff --git a/ci/srht/update_download_page b/ci/srht/update_download_page index cd289713db..1a721bec80 100755 --- a/ci/srht/update_download_page +++ b/ci/srht/update_download_page @@ -21,10 +21,7 @@ curl --fail -I "$AARCH64_LINUX_JSON_URL" >/dev/null || exit 0 curl --fail -I "$X86_64_LINUX_JSON_URL" >/dev/null || exit 0 curl --fail -I "$X86_64_WINDOWS_JSON_URL" >/dev/null || exit 0 curl --fail -I "$X86_64_MACOS_JSON_URL" >/dev/null || exit 0 - -# FreeBSD is dealing with some weird upstream bug right now -# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=244549 -#curl --fail -I "$X86_64_FREEBSD_JSON_URL" >/dev/null || exit 0 +curl --fail -I "$X86_64_FREEBSD_JSON_URL" >/dev/null || exit 0 # Without --user, this gave me: # ERROR: Could not install packages due to an EnvironmentError: [Errno 13] Permission denied @@ -66,12 +63,10 @@ export AARCH64_LINUX_TARBALL="$(echo "$AARCH64_LINUX_JSON" | jq .tarball -r)" export AARCH64_LINUX_BYTESIZE="$(echo "$AARCH64_LINUX_JSON" | jq .size -r)" export AARCH64_LINUX_SHASUM="$(echo "$AARCH64_LINUX_JSON" | jq .shasum -r)" -# FreeBSD is dealing with some weird upstream bug right now -# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=244549 -#X86_64_FREEBSD_JSON=$(curl --fail "$X86_64_FREEBSD_JSON_URL" || exit 1) -#export X86_64_FREEBSD_TARBALL="$(echo "$X86_64_FREEBSD_JSON" | jq .tarball -r)" -#export X86_64_FREEBSD_BYTESIZE="$(echo "$X86_64_FREEBSD_JSON" | jq .size -r)" -#export X86_64_FREEBSD_SHASUM="$(echo "$X86_64_FREEBSD_JSON" | jq .shasum -r)" +X86_64_FREEBSD_JSON=$(curl --fail "$X86_64_FREEBSD_JSON_URL" || exit 1) +export X86_64_FREEBSD_TARBALL="$(echo "$X86_64_FREEBSD_JSON" | jq .tarball -r)" +export X86_64_FREEBSD_BYTESIZE="$(echo "$X86_64_FREEBSD_JSON" | jq .size -r)" +export X86_64_FREEBSD_SHASUM="$(echo "$X86_64_FREEBSD_JSON" | jq .shasum -r)" git clone https://github.com/ziglang/www.ziglang.org --depth 1 cd www.ziglang.org diff --git a/doc/langref.html.in b/doc/langref.html.in index 455d07b52f..a39f73cf96 100644 --- a/doc/langref.html.in +++ b/doc/langref.html.in @@ -7247,11 +7247,13 @@ test "main" { {#see_also|@divFloor|@divExact#} {#header_close#} {#header_open|@embedFile#} - 
{#syntax#}@embedFile(comptime path: []const u8) [X]u8{#endsyntax#}
+ 
{#syntax#}@embedFile(comptime path: []const u8) *const [X:0]u8{#endsyntax#}

- This function returns a compile time constant fixed-size array with length - equal to the byte count of the file given by {#syntax#}path{#endsyntax#}. The contents of the array - are the contents of the file. + This function returns a compile time constant pointer to null-terminated, + fixed-size array with length equal to the byte count of the file given by + {#syntax#}path{#endsyntax#}. The contents of the array are the contents of the file. + This is equivalent to a {#link|string literal|String Literals and Character Literals#} + with the file contents.

{#syntax#}path{#endsyntax#} is absolute or relative to the current file, just like {#syntax#}@import{#endsyntax#}. @@ -8337,12 +8339,14 @@ test "integer truncation" { {#header_close#} {#header_open|@TypeOf#} - 

{#syntax#}@TypeOf(expression) type{#endsyntax#}
+ 
{#syntax#}@TypeOf(...) type{#endsyntax#}

- This function returns a compile-time constant, which is the type of the - expression passed as an argument. The expression is evaluated. + {#syntax#}@TypeOf{#endsyntax#} is a special builtin function that takes any (nonzero) number of expressions + as parameters and returns the type of the result, using {#link|Peer Type Resolution#}. +

+

+ The expressions are evaluated, however they are guaranteed to have no runtime side-effects:

-

{#syntax#}@TypeOf{#endsyntax#} guarantees no run-time side-effects within the expression:

{#code_begin|test#} const std = @import("std"); const assert = std.debug.assert; diff --git a/lib/libc/include/any-windows-any/GL/glcorearb.h b/lib/libc/include/any-windows-any/GL/glcorearb.h index a849352857..3f76c23ad8 100644 --- a/lib/libc/include/any-windows-any/GL/glcorearb.h +++ b/lib/libc/include/any-windows-any/GL/glcorearb.h @@ -1,12 +1,12 @@ -#ifndef __glcorearb_h_ -#define __glcorearb_h_ 1 +#ifndef __gl_glcorearb_h_ +#define __gl_glcorearb_h_ 1 #ifdef __cplusplus extern "C" { #endif /* -** Copyright (c) 2013-2014 The Khronos Group Inc. +** Copyright (c) 2013-2018 The Khronos Group Inc. ** ** Permission is hereby granted, free of charge, to any person obtaining a ** copy of this software and/or associated documentation files (the @@ -31,9 +31,7 @@ extern "C" { ** This header is generated from the Khronos OpenGL / OpenGL ES XML ** API Registry. The current version of the Registry, generator scripts ** used to make the header, and the header can be found at -** http://www.opengl.org/registry/ -** -** Khronos $Revision: 28299 $ on $Date: 2014-09-25 11:11:58 +0000 (Thu, 25 Sep 2014) $ +** https://github.com/KhronosGroup/OpenGL-Registry */ #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) @@ -81,118 +79,15 @@ extern "C" { #define GL_VERSION_1_0 1 typedef void GLvoid; typedef unsigned int GLenum; -typedef float GLfloat; +#include +typedef khronos_float_t GLfloat; typedef int GLint; typedef int GLsizei; typedef unsigned int GLbitfield; typedef double GLdouble; typedef unsigned int GLuint; typedef unsigned char GLboolean; -typedef unsigned char GLubyte; -typedef void (APIENTRYP PFNGLCULLFACEPROC) (GLenum mode); -typedef void (APIENTRYP PFNGLFRONTFACEPROC) (GLenum mode); -typedef void (APIENTRYP PFNGLHINTPROC) (GLenum target, GLenum mode); -typedef void (APIENTRYP PFNGLLINEWIDTHPROC) (GLfloat width); -typedef void (APIENTRYP PFNGLPOINTSIZEPROC) (GLfloat size); -typedef void (APIENTRYP PFNGLPOLYGONMODEPROC) (GLenum face, GLenum mode); -typedef void (APIENTRYP PFNGLSCISSORPROC) (GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLTEXPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLTEXPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLTEXPARAMETERIPROC) (GLenum target, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLTEXPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLTEXIMAGE1DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels); -typedef void (APIENTRYP PFNGLTEXIMAGE2DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels); -typedef void (APIENTRYP PFNGLDRAWBUFFERPROC) (GLenum buf); -typedef void (APIENTRYP PFNGLCLEARPROC) (GLbitfield mask); -typedef void (APIENTRYP PFNGLCLEARCOLORPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); -typedef void (APIENTRYP PFNGLCLEARSTENCILPROC) (GLint s); -typedef void (APIENTRYP PFNGLCLEARDEPTHPROC) (GLdouble depth); -typedef void (APIENTRYP PFNGLSTENCILMASKPROC) (GLuint mask); -typedef void (APIENTRYP PFNGLCOLORMASKPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); -typedef void (APIENTRYP PFNGLDEPTHMASKPROC) (GLboolean flag); -typedef void (APIENTRYP PFNGLDISABLEPROC) (GLenum cap); -typedef void (APIENTRYP PFNGLENABLEPROC) (GLenum cap); -typedef void (APIENTRYP PFNGLFINISHPROC) (void); -typedef void (APIENTRYP PFNGLFLUSHPROC) (void); -typedef void (APIENTRYP PFNGLBLENDFUNCPROC) (GLenum sfactor, GLenum dfactor); -typedef void (APIENTRYP PFNGLLOGICOPPROC) (GLenum opcode); -typedef void (APIENTRYP PFNGLSTENCILFUNCPROC) (GLenum func, GLint ref, GLuint mask); -typedef void (APIENTRYP PFNGLSTENCILOPPROC) (GLenum fail, GLenum zfail, GLenum zpass); -typedef void (APIENTRYP PFNGLDEPTHFUNCPROC) (GLenum func); -typedef void (APIENTRYP PFNGLPIXELSTOREFPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPIXELSTOREIPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLREADBUFFERPROC) (GLenum src); -typedef void (APIENTRYP PFNGLREADPIXELSPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels); -typedef void (APIENTRYP PFNGLGETBOOLEANVPROC) (GLenum pname, GLboolean *data); -typedef void (APIENTRYP PFNGLGETDOUBLEVPROC) (GLenum pname, GLdouble *data); -typedef GLenum (APIENTRYP PFNGLGETERRORPROC) (void); -typedef void (APIENTRYP PFNGLGETFLOATVPROC) (GLenum pname, GLfloat *data); -typedef void (APIENTRYP PFNGLGETINTEGERVPROC) (GLenum pname, GLint *data); -typedef const GLubyte *(APIENTRYP PFNGLGETSTRINGPROC) (GLenum name); -typedef void (APIENTRYP PFNGLGETTEXIMAGEPROC) (GLenum target, GLint level, GLenum format, GLenum type, void *pixels); -typedef void (APIENTRYP PFNGLGETTEXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETTEXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERFVPROC) (GLenum target, GLint level, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERIVPROC) (GLenum target, GLint level, GLenum pname, GLint *params); -typedef GLboolean (APIENTRYP PFNGLISENABLEDPROC) (GLenum cap); -typedef void (APIENTRYP PFNGLDEPTHRANGEPROC) (GLdouble near, GLdouble far); -typedef void (APIENTRYP PFNGLVIEWPORTPROC) (GLint x, GLint y, GLsizei width, GLsizei height); -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCullFace (GLenum mode); -GLAPI void APIENTRY glFrontFace (GLenum mode); -GLAPI void APIENTRY glHint (GLenum target, GLenum mode); -GLAPI void APIENTRY glLineWidth (GLfloat width); -GLAPI void APIENTRY glPointSize (GLfloat size); -GLAPI void APIENTRY glPolygonMode (GLenum face, GLenum mode); -GLAPI void APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param); -GLAPI void APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param); -GLAPI void APIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glTexImage1D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels); -GLAPI void APIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels); -GLAPI void APIENTRY glDrawBuffer (GLenum buf); -GLAPI void APIENTRY glClear (GLbitfield mask); -GLAPI void APIENTRY glClearColor (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); -GLAPI void APIENTRY glClearStencil (GLint s); -GLAPI void APIENTRY glClearDepth (GLdouble depth); -GLAPI void APIENTRY glStencilMask (GLuint mask); -GLAPI void APIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); -GLAPI void APIENTRY glDepthMask (GLboolean flag); -GLAPI void APIENTRY glDisable (GLenum cap); -GLAPI void APIENTRY glEnable (GLenum cap); -GLAPI void APIENTRY glFinish (void); -GLAPI void APIENTRY glFlush (void); -GLAPI void APIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor); -GLAPI void APIENTRY glLogicOp (GLenum opcode); -GLAPI void APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask); -GLAPI void APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass); -GLAPI void APIENTRY glDepthFunc (GLenum func); -GLAPI void APIENTRY glPixelStoref (GLenum pname, GLfloat param); -GLAPI void APIENTRY glPixelStorei (GLenum pname, GLint param); -GLAPI void APIENTRY glReadBuffer (GLenum src); -GLAPI void APIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels); -GLAPI void APIENTRY glGetBooleanv (GLenum pname, GLboolean *data); -GLAPI void APIENTRY glGetDoublev (GLenum pname, GLdouble *data); -GLAPI GLenum APIENTRY glGetError (void); -GLAPI void APIENTRY glGetFloatv (GLenum pname, GLfloat *data); -GLAPI void APIENTRY glGetIntegerv (GLenum pname, GLint *data); -GLAPI const GLubyte *APIENTRY glGetString (GLenum name); -GLAPI void APIENTRY glGetTexImage (GLenum target, GLint level, GLenum format, GLenum type, void *pixels); -GLAPI void APIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetTexLevelParameterfv (GLenum target, GLint level, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetTexLevelParameteriv (GLenum target, GLint level, GLenum pname, GLint *params); -GLAPI GLboolean APIENTRY glIsEnabled (GLenum cap); -GLAPI void APIENTRY glDepthRange (GLdouble near, GLdouble far); -GLAPI void APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height); -#endif -#endif /* GL_VERSION_1_0 */ - -#ifndef GL_VERSION_1_1 -#define GL_VERSION_1_1 1 -typedef float GLclampf; -typedef double GLclampd; +typedef khronos_uint8_t GLubyte; #define GL_DEPTH_BUFFER_BIT 0x00000100 #define GL_STENCIL_BUFFER_BIT 0x00000400 #define GL_COLOR_BUFFER_BIT 0x00004000 @@ -274,7 +169,6 @@ typedef double GLclampd; #define GL_BLEND_SRC 0x0BE1 #define GL_BLEND 0x0BE2 #define GL_LOGIC_OP_MODE 0x0BF0 -#define GL_COLOR_LOGIC_OP 0x0BF2 #define GL_DRAW_BUFFER 0x0C01 #define GL_READ_BUFFER 0x0C02 #define GL_SCISSOR_BOX 0x0C10 @@ -302,21 +196,9 @@ typedef double GLclampd; #define GL_SUBPIXEL_BITS 0x0D50 #define GL_TEXTURE_1D 0x0DE0 #define GL_TEXTURE_2D 0x0DE1 -#define GL_POLYGON_OFFSET_UNITS 0x2A00 -#define GL_POLYGON_OFFSET_POINT 0x2A01 -#define GL_POLYGON_OFFSET_LINE 0x2A02 -#define GL_POLYGON_OFFSET_FILL 0x8037 -#define GL_POLYGON_OFFSET_FACTOR 0x8038 -#define GL_TEXTURE_BINDING_1D 0x8068 -#define GL_TEXTURE_BINDING_2D 0x8069 #define GL_TEXTURE_WIDTH 0x1000 #define GL_TEXTURE_HEIGHT 0x1001 -#define GL_TEXTURE_INTERNAL_FORMAT 0x1003 #define GL_TEXTURE_BORDER_COLOR 0x1004 -#define GL_TEXTURE_RED_SIZE 0x805C -#define GL_TEXTURE_GREEN_SIZE 0x805D -#define GL_TEXTURE_BLUE_SIZE 0x805E -#define GL_TEXTURE_ALPHA_SIZE 0x805F #define GL_DONT_CARE 0x1100 #define GL_FASTEST 0x1101 #define GL_NICEST 0x1102 @@ -327,7 +209,6 @@ typedef double GLclampd; #define GL_INT 0x1404 #define GL_UNSIGNED_INT 0x1405 #define GL_FLOAT 0x1406 -#define GL_DOUBLE 0x140A #define GL_STACK_OVERFLOW 0x0503 #define GL_STACK_UNDERFLOW 0x0504 #define GL_CLEAR 0x1500 @@ -379,9 +260,127 @@ typedef double GLclampd; #define GL_TEXTURE_MIN_FILTER 0x2801 #define GL_TEXTURE_WRAP_S 0x2802 #define GL_TEXTURE_WRAP_T 0x2803 +#define GL_REPEAT 0x2901 +typedef void (APIENTRYP PFNGLCULLFACEPROC) (GLenum mode); +typedef void (APIENTRYP PFNGLFRONTFACEPROC) (GLenum mode); +typedef void (APIENTRYP PFNGLHINTPROC) (GLenum target, GLenum mode); +typedef void (APIENTRYP PFNGLLINEWIDTHPROC) (GLfloat width); +typedef void (APIENTRYP PFNGLPOINTSIZEPROC) (GLfloat size); +typedef void (APIENTRYP PFNGLPOLYGONMODEPROC) (GLenum face, GLenum mode); +typedef void (APIENTRYP PFNGLSCISSORPROC) (GLint x, GLint y, GLsizei width, GLsizei height); +typedef void (APIENTRYP PFNGLTEXPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat param); +typedef void (APIENTRYP PFNGLTEXPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params); +typedef void (APIENTRYP PFNGLTEXPARAMETERIPROC) (GLenum target, GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLTEXPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params); +typedef void (APIENTRYP PFNGLTEXIMAGE1DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels); +typedef void (APIENTRYP PFNGLTEXIMAGE2DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels); +typedef void (APIENTRYP PFNGLDRAWBUFFERPROC) (GLenum buf); +typedef void (APIENTRYP PFNGLCLEARPROC) (GLbitfield mask); +typedef void (APIENTRYP PFNGLCLEARCOLORPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); +typedef void (APIENTRYP PFNGLCLEARSTENCILPROC) (GLint s); +typedef void (APIENTRYP PFNGLCLEARDEPTHPROC) (GLdouble depth); +typedef void (APIENTRYP PFNGLSTENCILMASKPROC) (GLuint mask); +typedef void (APIENTRYP PFNGLCOLORMASKPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); +typedef void (APIENTRYP PFNGLDEPTHMASKPROC) (GLboolean flag); +typedef void (APIENTRYP PFNGLDISABLEPROC) (GLenum cap); +typedef void (APIENTRYP PFNGLENABLEPROC) (GLenum cap); +typedef void (APIENTRYP PFNGLFINISHPROC) (void); +typedef void (APIENTRYP PFNGLFLUSHPROC) (void); +typedef void (APIENTRYP PFNGLBLENDFUNCPROC) (GLenum sfactor, GLenum dfactor); +typedef void (APIENTRYP PFNGLLOGICOPPROC) (GLenum opcode); +typedef void (APIENTRYP PFNGLSTENCILFUNCPROC) (GLenum func, GLint ref, GLuint mask); +typedef void (APIENTRYP PFNGLSTENCILOPPROC) (GLenum fail, GLenum zfail, GLenum zpass); +typedef void (APIENTRYP PFNGLDEPTHFUNCPROC) (GLenum func); +typedef void (APIENTRYP PFNGLPIXELSTOREFPROC) (GLenum pname, GLfloat param); +typedef void (APIENTRYP PFNGLPIXELSTOREIPROC) (GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLREADBUFFERPROC) (GLenum src); +typedef void (APIENTRYP PFNGLREADPIXELSPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels); +typedef void (APIENTRYP PFNGLGETBOOLEANVPROC) (GLenum pname, GLboolean *data); +typedef void (APIENTRYP PFNGLGETDOUBLEVPROC) (GLenum pname, GLdouble *data); +typedef GLenum (APIENTRYP PFNGLGETERRORPROC) (void); +typedef void (APIENTRYP PFNGLGETFLOATVPROC) (GLenum pname, GLfloat *data); +typedef void (APIENTRYP PFNGLGETINTEGERVPROC) (GLenum pname, GLint *data); +typedef const GLubyte *(APIENTRYP PFNGLGETSTRINGPROC) (GLenum name); +typedef void (APIENTRYP PFNGLGETTEXIMAGEPROC) (GLenum target, GLint level, GLenum format, GLenum type, void *pixels); +typedef void (APIENTRYP PFNGLGETTEXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETTEXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERFVPROC) (GLenum target, GLint level, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERIVPROC) (GLenum target, GLint level, GLenum pname, GLint *params); +typedef GLboolean (APIENTRYP PFNGLISENABLEDPROC) (GLenum cap); +typedef void (APIENTRYP PFNGLDEPTHRANGEPROC) (GLdouble n, GLdouble f); +typedef void (APIENTRYP PFNGLVIEWPORTPROC) (GLint x, GLint y, GLsizei width, GLsizei height); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glCullFace (GLenum mode); +GLAPI void APIENTRY glFrontFace (GLenum mode); +GLAPI void APIENTRY glHint (GLenum target, GLenum mode); +GLAPI void APIENTRY glLineWidth (GLfloat width); +GLAPI void APIENTRY glPointSize (GLfloat size); +GLAPI void APIENTRY glPolygonMode (GLenum face, GLenum mode); +GLAPI void APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height); +GLAPI void APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param); +GLAPI void APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat *params); +GLAPI void APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param); +GLAPI void APIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint *params); +GLAPI void APIENTRY glTexImage1D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels); +GLAPI void APIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels); +GLAPI void APIENTRY glDrawBuffer (GLenum buf); +GLAPI void APIENTRY glClear (GLbitfield mask); +GLAPI void APIENTRY glClearColor (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); +GLAPI void APIENTRY glClearStencil (GLint s); +GLAPI void APIENTRY glClearDepth (GLdouble depth); +GLAPI void APIENTRY glStencilMask (GLuint mask); +GLAPI void APIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); +GLAPI void APIENTRY glDepthMask (GLboolean flag); +GLAPI void APIENTRY glDisable (GLenum cap); +GLAPI void APIENTRY glEnable (GLenum cap); +GLAPI void APIENTRY glFinish (void); +GLAPI void APIENTRY glFlush (void); +GLAPI void APIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor); +GLAPI void APIENTRY glLogicOp (GLenum opcode); +GLAPI void APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask); +GLAPI void APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass); +GLAPI void APIENTRY glDepthFunc (GLenum func); +GLAPI void APIENTRY glPixelStoref (GLenum pname, GLfloat param); +GLAPI void APIENTRY glPixelStorei (GLenum pname, GLint param); +GLAPI void APIENTRY glReadBuffer (GLenum src); +GLAPI void APIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels); +GLAPI void APIENTRY glGetBooleanv (GLenum pname, GLboolean *data); +GLAPI void APIENTRY glGetDoublev (GLenum pname, GLdouble *data); +GLAPI GLenum APIENTRY glGetError (void); +GLAPI void APIENTRY glGetFloatv (GLenum pname, GLfloat *data); +GLAPI void APIENTRY glGetIntegerv (GLenum pname, GLint *data); +GLAPI const GLubyte *APIENTRY glGetString (GLenum name); +GLAPI void APIENTRY glGetTexImage (GLenum target, GLint level, GLenum format, GLenum type, void *pixels); +GLAPI void APIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params); +GLAPI void APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint *params); +GLAPI void APIENTRY glGetTexLevelParameterfv (GLenum target, GLint level, GLenum pname, GLfloat *params); +GLAPI void APIENTRY glGetTexLevelParameteriv (GLenum target, GLint level, GLenum pname, GLint *params); +GLAPI GLboolean APIENTRY glIsEnabled (GLenum cap); +GLAPI void APIENTRY glDepthRange (GLdouble n, GLdouble f); +GLAPI void APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height); +#endif +#endif /* GL_VERSION_1_0 */ + +#ifndef GL_VERSION_1_1 +#define GL_VERSION_1_1 1 +typedef khronos_float_t GLclampf; +typedef double GLclampd; +#define GL_COLOR_LOGIC_OP 0x0BF2 +#define GL_POLYGON_OFFSET_UNITS 0x2A00 +#define GL_POLYGON_OFFSET_POINT 0x2A01 +#define GL_POLYGON_OFFSET_LINE 0x2A02 +#define GL_POLYGON_OFFSET_FILL 0x8037 +#define GL_POLYGON_OFFSET_FACTOR 0x8038 +#define GL_TEXTURE_BINDING_1D 0x8068 +#define GL_TEXTURE_BINDING_2D 0x8069 +#define GL_TEXTURE_INTERNAL_FORMAT 0x1003 +#define GL_TEXTURE_RED_SIZE 0x805C +#define GL_TEXTURE_GREEN_SIZE 0x805D +#define GL_TEXTURE_BLUE_SIZE 0x805E +#define GL_TEXTURE_ALPHA_SIZE 0x805F +#define GL_DOUBLE 0x140A #define GL_PROXY_TEXTURE_1D 0x8063 #define GL_PROXY_TEXTURE_2D 0x8064 -#define GL_REPEAT 0x2901 #define GL_R3_G3_B2 0x2A10 #define GL_RGB4 0x804F #define GL_RGB5 0x8050 @@ -580,15 +579,17 @@ GLAPI void APIENTRY glGetCompressedTexImage (GLenum target, GLint level, void *i #define GL_TEXTURE_DEPTH_SIZE 0x884A #define GL_TEXTURE_COMPARE_MODE 0x884C #define GL_TEXTURE_COMPARE_FUNC 0x884D -#define GL_FUNC_ADD 0x8006 -#define GL_FUNC_SUBTRACT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT 0x800B -#define GL_MIN 0x8007 -#define GL_MAX 0x8008 +#define GL_BLEND_COLOR 0x8005 +#define GL_BLEND_EQUATION 0x8009 #define GL_CONSTANT_COLOR 0x8001 #define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 #define GL_CONSTANT_ALPHA 0x8003 #define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 +#define GL_FUNC_ADD 0x8006 +#define GL_FUNC_REVERSE_SUBTRACT 0x800B +#define GL_FUNC_SUBTRACT 0x800A +#define GL_MIN 0x8007 +#define GL_MAX 0x8008 typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount); typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount); @@ -613,9 +614,8 @@ GLAPI void APIENTRY glBlendEquation (GLenum mode); #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 -#include -typedef ptrdiff_t GLsizeiptr; -typedef ptrdiff_t GLintptr; +typedef khronos_ssize_t GLsizeiptr; +typedef khronos_intptr_t GLintptr; #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 #define GL_QUERY_COUNTER_BITS 0x8864 @@ -689,9 +689,9 @@ GLAPI void APIENTRY glGetBufferPointerv (GLenum target, GLenum pname, void **par #ifndef GL_VERSION_2_0 #define GL_VERSION_2_0 1 typedef char GLchar; -typedef short GLshort; -typedef signed char GLbyte; -typedef unsigned short GLushort; +typedef khronos_int16_t GLshort; +typedef khronos_int8_t GLbyte; +typedef khronos_uint16_t GLushort; #define GL_BLEND_EQUATION_RGB 0x8009 #define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622 #define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623 @@ -998,7 +998,7 @@ GLAPI void APIENTRY glUniformMatrix4x3fv (GLint location, GLsizei count, GLboole #ifndef GL_VERSION_3_0 #define GL_VERSION_3_0 1 -typedef unsigned short GLhalf; +typedef khronos_uint16_t GLhalf; #define GL_COMPARE_REF_TO_TEXTURE 0x884E #define GL_CLIP_DISTANCE0 0x3000 #define GL_CLIP_DISTANCE1 0x3001 @@ -1160,6 +1160,22 @@ typedef unsigned short GLhalf; #define GL_COLOR_ATTACHMENT13 0x8CED #define GL_COLOR_ATTACHMENT14 0x8CEE #define GL_COLOR_ATTACHMENT15 0x8CEF +#define GL_COLOR_ATTACHMENT16 0x8CF0 +#define GL_COLOR_ATTACHMENT17 0x8CF1 +#define GL_COLOR_ATTACHMENT18 0x8CF2 +#define GL_COLOR_ATTACHMENT19 0x8CF3 +#define GL_COLOR_ATTACHMENT20 0x8CF4 +#define GL_COLOR_ATTACHMENT21 0x8CF5 +#define GL_COLOR_ATTACHMENT22 0x8CF6 +#define GL_COLOR_ATTACHMENT23 0x8CF7 +#define GL_COLOR_ATTACHMENT24 0x8CF8 +#define GL_COLOR_ATTACHMENT25 0x8CF9 +#define GL_COLOR_ATTACHMENT26 0x8CFA +#define GL_COLOR_ATTACHMENT27 0x8CFB +#define GL_COLOR_ATTACHMENT28 0x8CFC +#define GL_COLOR_ATTACHMENT29 0x8CFD +#define GL_COLOR_ATTACHMENT30 0x8CFE +#define GL_COLOR_ATTACHMENT31 0x8CFF #define GL_DEPTH_ATTACHMENT 0x8D00 #define GL_STENCIL_ATTACHMENT 0x8D20 #define GL_FRAMEBUFFER 0x8D40 @@ -1480,45 +1496,8 @@ GLAPI void APIENTRY glUniformBlockBinding (GLuint program, GLuint uniformBlockIn #ifndef GL_VERSION_3_2 #define GL_VERSION_3_2 1 typedef struct __GLsync *GLsync; -#ifndef GLEXT_64_TYPES_DEFINED -/* This code block is duplicated in glxext.h, so must be protected */ -#define GLEXT_64_TYPES_DEFINED -/* Define int32_t, int64_t, and uint64_t types for UST/MSC */ -/* (as used in the GL_EXT_timer_query extension). */ -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -#include -#elif defined(__sun__) || defined(__digital__) -#include -#if defined(__STDC__) -#if defined(__arch64__) || defined(_LP64) -typedef long int int64_t; -typedef unsigned long int uint64_t; -#else -typedef long long int int64_t; -typedef unsigned long long int uint64_t; -#endif /* __arch64__ */ -#endif /* __STDC__ */ -#elif defined( __VMS ) || defined(__sgi) -#include -#elif defined(__SCO__) || defined(__USLC__) -#include -#elif defined(__UNIXOS2__) || defined(__SOL64__) -typedef long int int32_t; -typedef long long int int64_t; -typedef unsigned long long int uint64_t; -#elif defined(_WIN32) && defined(__GNUC__) -#include -#elif defined(_WIN32) -typedef __int32 int32_t; -typedef __int64 int64_t; -typedef unsigned __int64 uint64_t; -#else -/* Fallback if nothing above works */ -#include -#endif -#endif -typedef uint64_t GLuint64; -typedef int64_t GLint64; +typedef khronos_uint64_t GLuint64; +typedef khronos_int64_t GLint64; #define GL_CONTEXT_CORE_PROFILE_BIT 0x00000001 #define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002 #define GL_LINES_ADJACENCY 0x000A @@ -2646,7 +2625,6 @@ GLAPI void APIENTRY glBindVertexBuffers (GLuint first, GLsizei count, const GLui #define GL_MAX_COMBINED_CLIP_AND_CULL_DISTANCES 0x82FA #define GL_TEXTURE_TARGET 0x1006 #define GL_QUERY_TARGET 0x82EA -#define GL_TEXTURE_BINDING 0x82EB #define GL_GUILTY_CONTEXT_RESET 0x8253 #define GL_INNOCENT_CONTEXT_RESET 0x8254 #define GL_UNKNOWN_CONTEXT_RESET 0x8255 @@ -2659,25 +2637,25 @@ GLAPI void APIENTRY glBindVertexBuffers (GLuint first, GLsizei count, const GLui typedef void (APIENTRYP PFNGLCLIPCONTROLPROC) (GLenum origin, GLenum depth); typedef void (APIENTRYP PFNGLCREATETRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint *ids); typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKBUFFERBASEPROC) (GLuint xfb, GLuint index, GLuint buffer); -typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC) (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizei size); +typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC) (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKIVPROC) (GLuint xfb, GLenum pname, GLint *param); typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKI_VPROC) (GLuint xfb, GLenum pname, GLuint index, GLint *param); typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKI64_VPROC) (GLuint xfb, GLenum pname, GLuint index, GLint64 *param); typedef void (APIENTRYP PFNGLCREATEBUFFERSPROC) (GLsizei n, GLuint *buffers); -typedef void (APIENTRYP PFNGLNAMEDBUFFERSTORAGEPROC) (GLuint buffer, GLsizei size, const void *data, GLbitfield flags); -typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAPROC) (GLuint buffer, GLsizei size, const void *data, GLenum usage); -typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizei size, const void *data); -typedef void (APIENTRYP PFNGLCOPYNAMEDBUFFERSUBDATAPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizei size); +typedef void (APIENTRYP PFNGLNAMEDBUFFERSTORAGEPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags); +typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage); +typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data); +typedef void (APIENTRYP PFNGLCOPYNAMEDBUFFERSUBDATAPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERDATAPROC) (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data); -typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizei size, GLenum format, GLenum type, const void *data); +typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data); typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFERPROC) (GLuint buffer, GLenum access); -typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFERRANGEPROC) (GLuint buffer, GLintptr offset, GLsizei length, GLbitfield access); +typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFERRANGEPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access); typedef GLboolean (APIENTRYP PFNGLUNMAPNAMEDBUFFERPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC) (GLuint buffer, GLintptr offset, GLsizei length); +typedef void (APIENTRYP PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length); typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERIVPROC) (GLuint buffer, GLenum pname, GLint *params); typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERI64VPROC) (GLuint buffer, GLenum pname, GLint64 *params); typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPOINTERVPROC) (GLuint buffer, GLenum pname, void **params); -typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizei size, void *data); +typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data); typedef void (APIENTRYP PFNGLCREATEFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers); typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERPARAMETERIPROC) (GLuint framebuffer, GLenum pname, GLint param); @@ -2691,7 +2669,7 @@ typedef void (APIENTRYP PFNGLINVALIDATENAMEDFRAMEBUFFERSUBDATAPROC) (GLuint fram typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERIVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLint *value); typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERUIVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLuint *value); typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERFVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLfloat *value); -typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERFIPROC) (GLuint framebuffer, GLenum buffer, const GLfloat depth, GLint stencil); +typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERFIPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil); typedef void (APIENTRYP PFNGLBLITNAMEDFRAMEBUFFERPROC) (GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); typedef GLenum (APIENTRYP PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC) (GLuint framebuffer, GLenum target); typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVPROC) (GLuint framebuffer, GLenum pname, GLint *param); @@ -2702,7 +2680,7 @@ typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLuint re typedef void (APIENTRYP PFNGLGETNAMEDRENDERBUFFERPARAMETERIVPROC) (GLuint renderbuffer, GLenum pname, GLint *params); typedef void (APIENTRYP PFNGLCREATETEXTURESPROC) (GLenum target, GLsizei n, GLuint *textures); typedef void (APIENTRYP PFNGLTEXTUREBUFFERPROC) (GLuint texture, GLenum internalformat, GLuint buffer); -typedef void (APIENTRYP PFNGLTEXTUREBUFFERRANGEPROC) (GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizei size); +typedef void (APIENTRYP PFNGLTEXTUREBUFFERRANGEPROC) (GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); typedef void (APIENTRYP PFNGLTEXTURESTORAGE1DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width); typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); @@ -2770,25 +2748,25 @@ typedef void (APIENTRYP PFNGLTEXTUREBARRIERPROC) (void); GLAPI void APIENTRY glClipControl (GLenum origin, GLenum depth); GLAPI void APIENTRY glCreateTransformFeedbacks (GLsizei n, GLuint *ids); GLAPI void APIENTRY glTransformFeedbackBufferBase (GLuint xfb, GLuint index, GLuint buffer); -GLAPI void APIENTRY glTransformFeedbackBufferRange (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizei size); +GLAPI void APIENTRY glTransformFeedbackBufferRange (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); GLAPI void APIENTRY glGetTransformFeedbackiv (GLuint xfb, GLenum pname, GLint *param); GLAPI void APIENTRY glGetTransformFeedbacki_v (GLuint xfb, GLenum pname, GLuint index, GLint *param); GLAPI void APIENTRY glGetTransformFeedbacki64_v (GLuint xfb, GLenum pname, GLuint index, GLint64 *param); GLAPI void APIENTRY glCreateBuffers (GLsizei n, GLuint *buffers); -GLAPI void APIENTRY glNamedBufferStorage (GLuint buffer, GLsizei size, const void *data, GLbitfield flags); -GLAPI void APIENTRY glNamedBufferData (GLuint buffer, GLsizei size, const void *data, GLenum usage); -GLAPI void APIENTRY glNamedBufferSubData (GLuint buffer, GLintptr offset, GLsizei size, const void *data); -GLAPI void APIENTRY glCopyNamedBufferSubData (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizei size); +GLAPI void APIENTRY glNamedBufferStorage (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags); +GLAPI void APIENTRY glNamedBufferData (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage); +GLAPI void APIENTRY glNamedBufferSubData (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data); +GLAPI void APIENTRY glCopyNamedBufferSubData (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); GLAPI void APIENTRY glClearNamedBufferData (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data); -GLAPI void APIENTRY glClearNamedBufferSubData (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizei size, GLenum format, GLenum type, const void *data); +GLAPI void APIENTRY glClearNamedBufferSubData (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data); GLAPI void *APIENTRY glMapNamedBuffer (GLuint buffer, GLenum access); -GLAPI void *APIENTRY glMapNamedBufferRange (GLuint buffer, GLintptr offset, GLsizei length, GLbitfield access); +GLAPI void *APIENTRY glMapNamedBufferRange (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access); GLAPI GLboolean APIENTRY glUnmapNamedBuffer (GLuint buffer); -GLAPI void APIENTRY glFlushMappedNamedBufferRange (GLuint buffer, GLintptr offset, GLsizei length); +GLAPI void APIENTRY glFlushMappedNamedBufferRange (GLuint buffer, GLintptr offset, GLsizeiptr length); GLAPI void APIENTRY glGetNamedBufferParameteriv (GLuint buffer, GLenum pname, GLint *params); GLAPI void APIENTRY glGetNamedBufferParameteri64v (GLuint buffer, GLenum pname, GLint64 *params); GLAPI void APIENTRY glGetNamedBufferPointerv (GLuint buffer, GLenum pname, void **params); -GLAPI void APIENTRY glGetNamedBufferSubData (GLuint buffer, GLintptr offset, GLsizei size, void *data); +GLAPI void APIENTRY glGetNamedBufferSubData (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data); GLAPI void APIENTRY glCreateFramebuffers (GLsizei n, GLuint *framebuffers); GLAPI void APIENTRY glNamedFramebufferRenderbuffer (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); GLAPI void APIENTRY glNamedFramebufferParameteri (GLuint framebuffer, GLenum pname, GLint param); @@ -2802,7 +2780,7 @@ GLAPI void APIENTRY glInvalidateNamedFramebufferSubData (GLuint framebuffer, GLs GLAPI void APIENTRY glClearNamedFramebufferiv (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLint *value); GLAPI void APIENTRY glClearNamedFramebufferuiv (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLuint *value); GLAPI void APIENTRY glClearNamedFramebufferfv (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLfloat *value); -GLAPI void APIENTRY glClearNamedFramebufferfi (GLuint framebuffer, GLenum buffer, const GLfloat depth, GLint stencil); +GLAPI void APIENTRY glClearNamedFramebufferfi (GLuint framebuffer, GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil); GLAPI void APIENTRY glBlitNamedFramebuffer (GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); GLAPI GLenum APIENTRY glCheckNamedFramebufferStatus (GLuint framebuffer, GLenum target); GLAPI void APIENTRY glGetNamedFramebufferParameteriv (GLuint framebuffer, GLenum pname, GLint *param); @@ -2813,7 +2791,7 @@ GLAPI void APIENTRY glNamedRenderbufferStorageMultisample (GLuint renderbuffer, GLAPI void APIENTRY glGetNamedRenderbufferParameteriv (GLuint renderbuffer, GLenum pname, GLint *params); GLAPI void APIENTRY glCreateTextures (GLenum target, GLsizei n, GLuint *textures); GLAPI void APIENTRY glTextureBuffer (GLuint texture, GLenum internalformat, GLuint buffer); -GLAPI void APIENTRY glTextureBufferRange (GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizei size); +GLAPI void APIENTRY glTextureBufferRange (GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); GLAPI void APIENTRY glTextureStorage1D (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width); GLAPI void APIENTRY glTextureStorage2D (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); GLAPI void APIENTRY glTextureStorage3D (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); @@ -2880,6 +2858,42 @@ GLAPI void APIENTRY glTextureBarrier (void); #endif #endif /* GL_VERSION_4_5 */ +#ifndef GL_VERSION_4_6 +#define GL_VERSION_4_6 1 +#define GL_SHADER_BINARY_FORMAT_SPIR_V 0x9551 +#define GL_SPIR_V_BINARY 0x9552 +#define GL_PARAMETER_BUFFER 0x80EE +#define GL_PARAMETER_BUFFER_BINDING 0x80EF +#define GL_CONTEXT_FLAG_NO_ERROR_BIT 0x00000008 +#define GL_VERTICES_SUBMITTED 0x82EE +#define GL_PRIMITIVES_SUBMITTED 0x82EF +#define GL_VERTEX_SHADER_INVOCATIONS 0x82F0 +#define GL_TESS_CONTROL_SHADER_PATCHES 0x82F1 +#define GL_TESS_EVALUATION_SHADER_INVOCATIONS 0x82F2 +#define GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED 0x82F3 +#define GL_FRAGMENT_SHADER_INVOCATIONS 0x82F4 +#define GL_COMPUTE_SHADER_INVOCATIONS 0x82F5 +#define GL_CLIPPING_INPUT_PRIMITIVES 0x82F6 +#define GL_CLIPPING_OUTPUT_PRIMITIVES 0x82F7 +#define GL_POLYGON_OFFSET_CLAMP 0x8E1B +#define GL_SPIR_V_EXTENSIONS 0x9553 +#define GL_NUM_SPIR_V_EXTENSIONS 0x9554 +#define GL_TEXTURE_MAX_ANISOTROPY 0x84FE +#define GL_MAX_TEXTURE_MAX_ANISOTROPY 0x84FF +#define GL_TRANSFORM_FEEDBACK_OVERFLOW 0x82EC +#define GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW 0x82ED +typedef void (APIENTRYP PFNGLSPECIALIZESHADERPROC) (GLuint shader, const GLchar *pEntryPoint, GLuint numSpecializationConstants, const GLuint *pConstantIndex, const GLuint *pConstantValue); +typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTCOUNTPROC) (GLenum mode, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); +typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTPROC) (GLenum mode, GLenum type, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); +typedef void (APIENTRYP PFNGLPOLYGONOFFSETCLAMPPROC) (GLfloat factor, GLfloat units, GLfloat clamp); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glSpecializeShader (GLuint shader, const GLchar *pEntryPoint, GLuint numSpecializationConstants, const GLuint *pConstantIndex, const GLuint *pConstantValue); +GLAPI void APIENTRY glMultiDrawArraysIndirectCount (GLenum mode, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); +GLAPI void APIENTRY glMultiDrawElementsIndirectCount (GLenum mode, GLenum type, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); +GLAPI void APIENTRY glPolygonOffsetClamp (GLfloat factor, GLfloat units, GLfloat clamp); +#endif +#endif /* GL_VERSION_4_6 */ + #ifndef GL_ARB_ES2_compatibility #define GL_ARB_ES2_compatibility 1 #endif /* GL_ARB_ES2_compatibility */ @@ -2888,6 +2902,17 @@ GLAPI void APIENTRY glTextureBarrier (void); #define GL_ARB_ES3_1_compatibility 1 #endif /* GL_ARB_ES3_1_compatibility */ +#ifndef GL_ARB_ES3_2_compatibility +#define GL_ARB_ES3_2_compatibility 1 +#define GL_PRIMITIVE_BOUNDING_BOX_ARB 0x92BE +#define GL_MULTISAMPLE_LINE_WIDTH_RANGE_ARB 0x9381 +#define GL_MULTISAMPLE_LINE_WIDTH_GRANULARITY_ARB 0x9382 +typedef void (APIENTRYP PFNGLPRIMITIVEBOUNDINGBOXARBPROC) (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glPrimitiveBoundingBoxARB (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW); +#endif +#endif /* GL_ARB_ES3_2_compatibility */ + #ifndef GL_ARB_ES3_compatibility #define GL_ARB_ES3_compatibility 1 #endif /* GL_ARB_ES3_compatibility */ @@ -2902,7 +2927,7 @@ GLAPI void APIENTRY glTextureBarrier (void); #ifndef GL_ARB_bindless_texture #define GL_ARB_bindless_texture 1 -typedef uint64_t GLuint64EXT; +typedef khronos_uint64_t GLuint64EXT; #define GL_UNSIGNED_INT64_ARB 0x140F typedef GLuint64 (APIENTRYP PFNGLGETTEXTUREHANDLEARBPROC) (GLuint texture); typedef GLuint64 (APIENTRYP PFNGLGETTEXTURESAMPLERHANDLEARBPROC) (GLuint texture, GLuint sampler); @@ -3087,6 +3112,16 @@ GLAPI void APIENTRY glBlendFuncSeparateiARB (GLuint buf, GLenum srcRGB, GLenum d #define GL_ARB_draw_indirect 1 #endif /* GL_ARB_draw_indirect */ +#ifndef GL_ARB_draw_instanced +#define GL_ARB_draw_instanced 1 +typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); +typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDARBPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glDrawArraysInstancedARB (GLenum mode, GLint first, GLsizei count, GLsizei primcount); +GLAPI void APIENTRY glDrawElementsInstancedARB (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); +#endif +#endif /* GL_ARB_draw_instanced */ + #ifndef GL_ARB_enhanced_layouts #define GL_ARB_enhanced_layouts 1 #endif /* GL_ARB_enhanced_layouts */ @@ -3107,6 +3142,10 @@ GLAPI void APIENTRY glBlendFuncSeparateiARB (GLuint buf, GLenum srcRGB, GLenum d #define GL_ARB_fragment_layer_viewport 1 #endif /* GL_ARB_fragment_layer_viewport */ +#ifndef GL_ARB_fragment_shader_interlock +#define GL_ARB_fragment_shader_interlock 1 +#endif /* GL_ARB_fragment_shader_interlock */ + #ifndef GL_ARB_framebuffer_no_attachments #define GL_ARB_framebuffer_no_attachments 1 #endif /* GL_ARB_framebuffer_no_attachments */ @@ -3119,6 +3158,38 @@ GLAPI void APIENTRY glBlendFuncSeparateiARB (GLuint buf, GLenum srcRGB, GLenum d #define GL_ARB_framebuffer_sRGB 1 #endif /* GL_ARB_framebuffer_sRGB */ +#ifndef GL_ARB_geometry_shader4 +#define GL_ARB_geometry_shader4 1 +#define GL_LINES_ADJACENCY_ARB 0x000A +#define GL_LINE_STRIP_ADJACENCY_ARB 0x000B +#define GL_TRIANGLES_ADJACENCY_ARB 0x000C +#define GL_TRIANGLE_STRIP_ADJACENCY_ARB 0x000D +#define GL_PROGRAM_POINT_SIZE_ARB 0x8642 +#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB 0x8C29 +#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB 0x8DA7 +#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB 0x8DA8 +#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB 0x8DA9 +#define GL_GEOMETRY_SHADER_ARB 0x8DD9 +#define GL_GEOMETRY_VERTICES_OUT_ARB 0x8DDA +#define GL_GEOMETRY_INPUT_TYPE_ARB 0x8DDB +#define GL_GEOMETRY_OUTPUT_TYPE_ARB 0x8DDC +#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB 0x8DDD +#define GL_MAX_VERTEX_VARYING_COMPONENTS_ARB 0x8DDE +#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB 0x8DDF +#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB 0x8DE0 +#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB 0x8DE1 +typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIARBPROC) (GLuint program, GLenum pname, GLint value); +typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level); +typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); +typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glProgramParameteriARB (GLuint program, GLenum pname, GLint value); +GLAPI void APIENTRY glFramebufferTextureARB (GLenum target, GLenum attachment, GLuint texture, GLint level); +GLAPI void APIENTRY glFramebufferTextureLayerARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); +GLAPI void APIENTRY glFramebufferTextureFaceARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); +#endif +#endif /* GL_ARB_geometry_shader4 */ + #ifndef GL_ARB_get_program_binary #define GL_ARB_get_program_binary 1 #endif /* GL_ARB_get_program_binary */ @@ -3127,6 +3198,16 @@ GLAPI void APIENTRY glBlendFuncSeparateiARB (GLuint buf, GLenum srcRGB, GLenum d #define GL_ARB_get_texture_sub_image 1 #endif /* GL_ARB_get_texture_sub_image */ +#ifndef GL_ARB_gl_spirv +#define GL_ARB_gl_spirv 1 +#define GL_SHADER_BINARY_FORMAT_SPIR_V_ARB 0x9551 +#define GL_SPIR_V_BINARY_ARB 0x9552 +typedef void (APIENTRYP PFNGLSPECIALIZESHADERARBPROC) (GLuint shader, const GLchar *pEntryPoint, GLuint numSpecializationConstants, const GLuint *pConstantIndex, const GLuint *pConstantValue); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glSpecializeShaderARB (GLuint shader, const GLchar *pEntryPoint, GLuint numSpecializationConstants, const GLuint *pConstantIndex, const GLuint *pConstantValue); +#endif +#endif /* GL_ARB_gl_spirv */ + #ifndef GL_ARB_gpu_shader5 #define GL_ARB_gpu_shader5 1 #endif /* GL_ARB_gpu_shader5 */ @@ -3135,28 +3216,120 @@ GLAPI void APIENTRY glBlendFuncSeparateiARB (GLuint buf, GLenum srcRGB, GLenum d #define GL_ARB_gpu_shader_fp64 1 #endif /* GL_ARB_gpu_shader_fp64 */ +#ifndef GL_ARB_gpu_shader_int64 +#define GL_ARB_gpu_shader_int64 1 +#define GL_INT64_ARB 0x140E +#define GL_INT64_VEC2_ARB 0x8FE9 +#define GL_INT64_VEC3_ARB 0x8FEA +#define GL_INT64_VEC4_ARB 0x8FEB +#define GL_UNSIGNED_INT64_VEC2_ARB 0x8FF5 +#define GL_UNSIGNED_INT64_VEC3_ARB 0x8FF6 +#define GL_UNSIGNED_INT64_VEC4_ARB 0x8FF7 +typedef void (APIENTRYP PFNGLUNIFORM1I64ARBPROC) (GLint location, GLint64 x); +typedef void (APIENTRYP PFNGLUNIFORM2I64ARBPROC) (GLint location, GLint64 x, GLint64 y); +typedef void (APIENTRYP PFNGLUNIFORM3I64ARBPROC) (GLint location, GLint64 x, GLint64 y, GLint64 z); +typedef void (APIENTRYP PFNGLUNIFORM4I64ARBPROC) (GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w); +typedef void (APIENTRYP PFNGLUNIFORM1I64VARBPROC) (GLint location, GLsizei count, const GLint64 *value); +typedef void (APIENTRYP PFNGLUNIFORM2I64VARBPROC) (GLint location, GLsizei count, const GLint64 *value); +typedef void (APIENTRYP PFNGLUNIFORM3I64VARBPROC) (GLint location, GLsizei count, const GLint64 *value); +typedef void (APIENTRYP PFNGLUNIFORM4I64VARBPROC) (GLint location, GLsizei count, const GLint64 *value); +typedef void (APIENTRYP PFNGLUNIFORM1UI64ARBPROC) (GLint location, GLuint64 x); +typedef void (APIENTRYP PFNGLUNIFORM2UI64ARBPROC) (GLint location, GLuint64 x, GLuint64 y); +typedef void (APIENTRYP PFNGLUNIFORM3UI64ARBPROC) (GLint location, GLuint64 x, GLuint64 y, GLuint64 z); +typedef void (APIENTRYP PFNGLUNIFORM4UI64ARBPROC) (GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w); +typedef void (APIENTRYP PFNGLUNIFORM1UI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value); +typedef void (APIENTRYP PFNGLUNIFORM2UI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value); +typedef void (APIENTRYP PFNGLUNIFORM3UI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value); +typedef void (APIENTRYP PFNGLUNIFORM4UI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value); +typedef void (APIENTRYP PFNGLGETUNIFORMI64VARBPROC) (GLuint program, GLint location, GLint64 *params); +typedef void (APIENTRYP PFNGLGETUNIFORMUI64VARBPROC) (GLuint program, GLint location, GLuint64 *params); +typedef void (APIENTRYP PFNGLGETNUNIFORMI64VARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLint64 *params); +typedef void (APIENTRYP PFNGLGETNUNIFORMUI64VARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint64 *params); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64ARBPROC) (GLuint program, GLint location, GLint64 x); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64ARBPROC) (GLuint program, GLint location, GLint64 x, GLint64 y); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64ARBPROC) (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64ARBPROC) (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64 *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64 *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64 *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64 *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64ARBPROC) (GLuint program, GLint location, GLuint64 x); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64ARBPROC) (GLuint program, GLint location, GLuint64 x, GLuint64 y); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64ARBPROC) (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64ARBPROC) (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *value); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glUniform1i64ARB (GLint location, GLint64 x); +GLAPI void APIENTRY glUniform2i64ARB (GLint location, GLint64 x, GLint64 y); +GLAPI void APIENTRY glUniform3i64ARB (GLint location, GLint64 x, GLint64 y, GLint64 z); +GLAPI void APIENTRY glUniform4i64ARB (GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w); +GLAPI void APIENTRY glUniform1i64vARB (GLint location, GLsizei count, const GLint64 *value); +GLAPI void APIENTRY glUniform2i64vARB (GLint location, GLsizei count, const GLint64 *value); +GLAPI void APIENTRY glUniform3i64vARB (GLint location, GLsizei count, const GLint64 *value); +GLAPI void APIENTRY glUniform4i64vARB (GLint location, GLsizei count, const GLint64 *value); +GLAPI void APIENTRY glUniform1ui64ARB (GLint location, GLuint64 x); +GLAPI void APIENTRY glUniform2ui64ARB (GLint location, GLuint64 x, GLuint64 y); +GLAPI void APIENTRY glUniform3ui64ARB (GLint location, GLuint64 x, GLuint64 y, GLuint64 z); +GLAPI void APIENTRY glUniform4ui64ARB (GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w); +GLAPI void APIENTRY glUniform1ui64vARB (GLint location, GLsizei count, const GLuint64 *value); +GLAPI void APIENTRY glUniform2ui64vARB (GLint location, GLsizei count, const GLuint64 *value); +GLAPI void APIENTRY glUniform3ui64vARB (GLint location, GLsizei count, const GLuint64 *value); +GLAPI void APIENTRY glUniform4ui64vARB (GLint location, GLsizei count, const GLuint64 *value); +GLAPI void APIENTRY glGetUniformi64vARB (GLuint program, GLint location, GLint64 *params); +GLAPI void APIENTRY glGetUniformui64vARB (GLuint program, GLint location, GLuint64 *params); +GLAPI void APIENTRY glGetnUniformi64vARB (GLuint program, GLint location, GLsizei bufSize, GLint64 *params); +GLAPI void APIENTRY glGetnUniformui64vARB (GLuint program, GLint location, GLsizei bufSize, GLuint64 *params); +GLAPI void APIENTRY glProgramUniform1i64ARB (GLuint program, GLint location, GLint64 x); +GLAPI void APIENTRY glProgramUniform2i64ARB (GLuint program, GLint location, GLint64 x, GLint64 y); +GLAPI void APIENTRY glProgramUniform3i64ARB (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z); +GLAPI void APIENTRY glProgramUniform4i64ARB (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w); +GLAPI void APIENTRY glProgramUniform1i64vARB (GLuint program, GLint location, GLsizei count, const GLint64 *value); +GLAPI void APIENTRY glProgramUniform2i64vARB (GLuint program, GLint location, GLsizei count, const GLint64 *value); +GLAPI void APIENTRY glProgramUniform3i64vARB (GLuint program, GLint location, GLsizei count, const GLint64 *value); +GLAPI void APIENTRY glProgramUniform4i64vARB (GLuint program, GLint location, GLsizei count, const GLint64 *value); +GLAPI void APIENTRY glProgramUniform1ui64ARB (GLuint program, GLint location, GLuint64 x); +GLAPI void APIENTRY glProgramUniform2ui64ARB (GLuint program, GLint location, GLuint64 x, GLuint64 y); +GLAPI void APIENTRY glProgramUniform3ui64ARB (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z); +GLAPI void APIENTRY glProgramUniform4ui64ARB (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w); +GLAPI void APIENTRY glProgramUniform1ui64vARB (GLuint program, GLint location, GLsizei count, const GLuint64 *value); +GLAPI void APIENTRY glProgramUniform2ui64vARB (GLuint program, GLint location, GLsizei count, const GLuint64 *value); +GLAPI void APIENTRY glProgramUniform3ui64vARB (GLuint program, GLint location, GLsizei count, const GLuint64 *value); +GLAPI void APIENTRY glProgramUniform4ui64vARB (GLuint program, GLint location, GLsizei count, const GLuint64 *value); +#endif +#endif /* GL_ARB_gpu_shader_int64 */ + #ifndef GL_ARB_half_float_vertex #define GL_ARB_half_float_vertex 1 #endif /* GL_ARB_half_float_vertex */ #ifndef GL_ARB_imaging #define GL_ARB_imaging 1 -#define GL_BLEND_COLOR 0x8005 -#define GL_BLEND_EQUATION 0x8009 #endif /* GL_ARB_imaging */ #ifndef GL_ARB_indirect_parameters #define GL_ARB_indirect_parameters 1 #define GL_PARAMETER_BUFFER_ARB 0x80EE #define GL_PARAMETER_BUFFER_BINDING_ARB 0x80EF -typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTCOUNTARBPROC) (GLenum mode, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTARBPROC) (GLenum mode, GLenum type, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); +typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTCOUNTARBPROC) (GLenum mode, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); +typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTARBPROC) (GLenum mode, GLenum type, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); #ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMultiDrawArraysIndirectCountARB (GLenum mode, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); -GLAPI void APIENTRY glMultiDrawElementsIndirectCountARB (GLenum mode, GLenum type, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); +GLAPI void APIENTRY glMultiDrawArraysIndirectCountARB (GLenum mode, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); +GLAPI void APIENTRY glMultiDrawElementsIndirectCountARB (GLenum mode, GLenum type, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); #endif #endif /* GL_ARB_indirect_parameters */ +#ifndef GL_ARB_instanced_arrays +#define GL_ARB_instanced_arrays 1 +#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB 0x88FE +typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORARBPROC) (GLuint index, GLuint divisor); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glVertexAttribDivisorARB (GLuint index, GLuint divisor); +#endif +#endif /* GL_ARB_instanced_arrays */ + #ifndef GL_ARB_internalformat_query #define GL_ARB_internalformat_query 1 #endif /* GL_ARB_internalformat_query */ @@ -3164,6 +3337,25 @@ GLAPI void APIENTRY glMultiDrawElementsIndirectCountARB (GLenum mode, GLenum typ #ifndef GL_ARB_internalformat_query2 #define GL_ARB_internalformat_query2 1 #define GL_SRGB_DECODE_ARB 0x8299 +#define GL_VIEW_CLASS_EAC_R11 0x9383 +#define GL_VIEW_CLASS_EAC_RG11 0x9384 +#define GL_VIEW_CLASS_ETC2_RGB 0x9385 +#define GL_VIEW_CLASS_ETC2_RGBA 0x9386 +#define GL_VIEW_CLASS_ETC2_EAC_RGBA 0x9387 +#define GL_VIEW_CLASS_ASTC_4x4_RGBA 0x9388 +#define GL_VIEW_CLASS_ASTC_5x4_RGBA 0x9389 +#define GL_VIEW_CLASS_ASTC_5x5_RGBA 0x938A +#define GL_VIEW_CLASS_ASTC_6x5_RGBA 0x938B +#define GL_VIEW_CLASS_ASTC_6x6_RGBA 0x938C +#define GL_VIEW_CLASS_ASTC_8x5_RGBA 0x938D +#define GL_VIEW_CLASS_ASTC_8x6_RGBA 0x938E +#define GL_VIEW_CLASS_ASTC_8x8_RGBA 0x938F +#define GL_VIEW_CLASS_ASTC_10x5_RGBA 0x9390 +#define GL_VIEW_CLASS_ASTC_10x6_RGBA 0x9391 +#define GL_VIEW_CLASS_ASTC_10x8_RGBA 0x9392 +#define GL_VIEW_CLASS_ASTC_10x10_RGBA 0x9393 +#define GL_VIEW_CLASS_ASTC_12x10_RGBA 0x9394 +#define GL_VIEW_CLASS_ASTC_12x12_RGBA 0x9395 #endif /* GL_ARB_internalformat_query2 */ #ifndef GL_ARB_invalidate_subdata @@ -3190,6 +3382,16 @@ GLAPI void APIENTRY glMultiDrawElementsIndirectCountARB (GLenum mode, GLenum typ #define GL_ARB_occlusion_query2 1 #endif /* GL_ARB_occlusion_query2 */ +#ifndef GL_ARB_parallel_shader_compile +#define GL_ARB_parallel_shader_compile 1 +#define GL_MAX_SHADER_COMPILER_THREADS_ARB 0x91B0 +#define GL_COMPLETION_STATUS_ARB 0x91B1 +typedef void (APIENTRYP PFNGLMAXSHADERCOMPILERTHREADSARBPROC) (GLuint count); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glMaxShaderCompilerThreadsARB (GLuint count); +#endif +#endif /* GL_ARB_parallel_shader_compile */ + #ifndef GL_ARB_pipeline_statistics_query #define GL_ARB_pipeline_statistics_query 1 #define GL_VERTICES_SUBMITTED_ARB 0x82EE @@ -3204,6 +3406,22 @@ GLAPI void APIENTRY glMultiDrawElementsIndirectCountARB (GLenum mode, GLenum typ #define GL_CLIPPING_OUTPUT_PRIMITIVES_ARB 0x82F7 #endif /* GL_ARB_pipeline_statistics_query */ +#ifndef GL_ARB_pixel_buffer_object +#define GL_ARB_pixel_buffer_object 1 +#define GL_PIXEL_PACK_BUFFER_ARB 0x88EB +#define GL_PIXEL_UNPACK_BUFFER_ARB 0x88EC +#define GL_PIXEL_PACK_BUFFER_BINDING_ARB 0x88ED +#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF +#endif /* GL_ARB_pixel_buffer_object */ + +#ifndef GL_ARB_polygon_offset_clamp +#define GL_ARB_polygon_offset_clamp 1 +#endif /* GL_ARB_polygon_offset_clamp */ + +#ifndef GL_ARB_post_depth_coverage +#define GL_ARB_post_depth_coverage 1 +#endif /* GL_ARB_post_depth_coverage */ + #ifndef GL_ARB_program_interface_query #define GL_ARB_program_interface_query 1 #endif /* GL_ARB_program_interface_query */ @@ -3253,6 +3471,26 @@ GLAPI void APIENTRY glGetnUniformdvARB (GLuint program, GLint location, GLsizei #define GL_ARB_robustness_isolation 1 #endif /* GL_ARB_robustness_isolation */ +#ifndef GL_ARB_sample_locations +#define GL_ARB_sample_locations 1 +#define GL_SAMPLE_LOCATION_SUBPIXEL_BITS_ARB 0x933D +#define GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_ARB 0x933E +#define GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_ARB 0x933F +#define GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_ARB 0x9340 +#define GL_SAMPLE_LOCATION_ARB 0x8E50 +#define GL_PROGRAMMABLE_SAMPLE_LOCATION_ARB 0x9341 +#define GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_ARB 0x9342 +#define GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_ARB 0x9343 +typedef void (APIENTRYP PFNGLFRAMEBUFFERSAMPLELOCATIONSFVARBPROC) (GLenum target, GLuint start, GLsizei count, const GLfloat *v); +typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVARBPROC) (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat *v); +typedef void (APIENTRYP PFNGLEVALUATEDEPTHVALUESARBPROC) (void); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glFramebufferSampleLocationsfvARB (GLenum target, GLuint start, GLsizei count, const GLfloat *v); +GLAPI void APIENTRY glNamedFramebufferSampleLocationsfvARB (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat *v); +GLAPI void APIENTRY glEvaluateDepthValuesARB (void); +#endif +#endif /* GL_ARB_sample_locations */ + #ifndef GL_ARB_sample_shading #define GL_ARB_sample_shading 1 #define GL_SAMPLE_SHADING_ARB 0x8C36 @@ -3279,14 +3517,26 @@ GLAPI void APIENTRY glMinSampleShadingARB (GLfloat value); #define GL_ARB_separate_shader_objects 1 #endif /* GL_ARB_separate_shader_objects */ +#ifndef GL_ARB_shader_atomic_counter_ops +#define GL_ARB_shader_atomic_counter_ops 1 +#endif /* GL_ARB_shader_atomic_counter_ops */ + #ifndef GL_ARB_shader_atomic_counters #define GL_ARB_shader_atomic_counters 1 #endif /* GL_ARB_shader_atomic_counters */ +#ifndef GL_ARB_shader_ballot +#define GL_ARB_shader_ballot 1 +#endif /* GL_ARB_shader_ballot */ + #ifndef GL_ARB_shader_bit_encoding #define GL_ARB_shader_bit_encoding 1 #endif /* GL_ARB_shader_bit_encoding */ +#ifndef GL_ARB_shader_clock +#define GL_ARB_shader_clock 1 +#endif /* GL_ARB_shader_clock */ + #ifndef GL_ARB_shader_draw_parameters #define GL_ARB_shader_draw_parameters 1 #endif /* GL_ARB_shader_draw_parameters */ @@ -3323,6 +3573,10 @@ GLAPI void APIENTRY glMinSampleShadingARB (GLfloat value); #define GL_ARB_shader_texture_image_samples 1 #endif /* GL_ARB_shader_texture_image_samples */ +#ifndef GL_ARB_shader_viewport_layer_array +#define GL_ARB_shader_viewport_layer_array 1 +#endif /* GL_ARB_shader_viewport_layer_array */ + #ifndef GL_ARB_shading_language_420pack #define GL_ARB_shading_language_420pack 1 #endif /* GL_ARB_shading_language_420pack */ @@ -3379,12 +3633,24 @@ GLAPI void APIENTRY glNamedBufferPageCommitmentARB (GLuint buffer, GLintptr offs #define GL_MAX_SPARSE_3D_TEXTURE_SIZE_ARB 0x9199 #define GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS_ARB 0x919A #define GL_SPARSE_TEXTURE_FULL_ARRAY_CUBE_MIPMAPS_ARB 0x91A9 -typedef void (APIENTRYP PFNGLTEXPAGECOMMITMENTARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean resident); +typedef void (APIENTRYP PFNGLTEXPAGECOMMITMENTARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit); #ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexPageCommitmentARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean resident); +GLAPI void APIENTRY glTexPageCommitmentARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit); #endif #endif /* GL_ARB_sparse_texture */ +#ifndef GL_ARB_sparse_texture2 +#define GL_ARB_sparse_texture2 1 +#endif /* GL_ARB_sparse_texture2 */ + +#ifndef GL_ARB_sparse_texture_clamp +#define GL_ARB_sparse_texture_clamp 1 +#endif /* GL_ARB_sparse_texture_clamp */ + +#ifndef GL_ARB_spirv_extensions +#define GL_ARB_spirv_extensions 1 +#endif /* GL_ARB_spirv_extensions */ + #ifndef GL_ARB_stencil_texturing #define GL_ARB_stencil_texturing 1 #endif /* GL_ARB_stencil_texturing */ @@ -3401,6 +3667,24 @@ GLAPI void APIENTRY glTexPageCommitmentARB (GLenum target, GLint level, GLint xo #define GL_ARB_texture_barrier 1 #endif /* GL_ARB_texture_barrier */ +#ifndef GL_ARB_texture_border_clamp +#define GL_ARB_texture_border_clamp 1 +#define GL_CLAMP_TO_BORDER_ARB 0x812D +#endif /* GL_ARB_texture_border_clamp */ + +#ifndef GL_ARB_texture_buffer_object +#define GL_ARB_texture_buffer_object 1 +#define GL_TEXTURE_BUFFER_ARB 0x8C2A +#define GL_MAX_TEXTURE_BUFFER_SIZE_ARB 0x8C2B +#define GL_TEXTURE_BINDING_BUFFER_ARB 0x8C2C +#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB 0x8C2D +#define GL_TEXTURE_BUFFER_FORMAT_ARB 0x8C2E +typedef void (APIENTRYP PFNGLTEXBUFFERARBPROC) (GLenum target, GLenum internalformat, GLuint buffer); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glTexBufferARB (GLenum target, GLenum internalformat, GLuint buffer); +#endif +#endif /* GL_ARB_texture_buffer_object */ + #ifndef GL_ARB_texture_buffer_object_rgb32 #define GL_ARB_texture_buffer_object_rgb32 1 #endif /* GL_ARB_texture_buffer_object_rgb32 */ @@ -3432,6 +3716,16 @@ GLAPI void APIENTRY glTexPageCommitmentARB (GLenum target, GLint level, GLint xo #define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900F #endif /* GL_ARB_texture_cube_map_array */ +#ifndef GL_ARB_texture_filter_anisotropic +#define GL_ARB_texture_filter_anisotropic 1 +#endif /* GL_ARB_texture_filter_anisotropic */ + +#ifndef GL_ARB_texture_filter_minmax +#define GL_ARB_texture_filter_minmax 1 +#define GL_TEXTURE_REDUCTION_MODE_ARB 0x9366 +#define GL_WEIGHTED_AVERAGE_ARB 0x9367 +#endif /* GL_ARB_texture_filter_minmax */ + #ifndef GL_ARB_texture_gather #define GL_ARB_texture_gather 1 #define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5E @@ -3443,10 +3737,19 @@ GLAPI void APIENTRY glTexPageCommitmentARB (GLenum target, GLint level, GLint xo #define GL_ARB_texture_mirror_clamp_to_edge 1 #endif /* GL_ARB_texture_mirror_clamp_to_edge */ +#ifndef GL_ARB_texture_mirrored_repeat +#define GL_ARB_texture_mirrored_repeat 1 +#define GL_MIRRORED_REPEAT_ARB 0x8370 +#endif /* GL_ARB_texture_mirrored_repeat */ + #ifndef GL_ARB_texture_multisample #define GL_ARB_texture_multisample 1 #endif /* GL_ARB_texture_multisample */ +#ifndef GL_ARB_texture_non_power_of_two +#define GL_ARB_texture_non_power_of_two 1 +#endif /* GL_ARB_texture_non_power_of_two */ + #ifndef GL_ARB_texture_query_levels #define GL_ARB_texture_query_levels 1 #endif /* GL_ARB_texture_query_levels */ @@ -3537,6 +3840,34 @@ GLAPI void APIENTRY glTexPageCommitmentARB (GLenum target, GLint level, GLint xo #define GL_ARB_viewport_array 1 #endif /* GL_ARB_viewport_array */ +#ifndef GL_KHR_blend_equation_advanced +#define GL_KHR_blend_equation_advanced 1 +#define GL_MULTIPLY_KHR 0x9294 +#define GL_SCREEN_KHR 0x9295 +#define GL_OVERLAY_KHR 0x9296 +#define GL_DARKEN_KHR 0x9297 +#define GL_LIGHTEN_KHR 0x9298 +#define GL_COLORDODGE_KHR 0x9299 +#define GL_COLORBURN_KHR 0x929A +#define GL_HARDLIGHT_KHR 0x929B +#define GL_SOFTLIGHT_KHR 0x929C +#define GL_DIFFERENCE_KHR 0x929E +#define GL_EXCLUSION_KHR 0x92A0 +#define GL_HSL_HUE_KHR 0x92AD +#define GL_HSL_SATURATION_KHR 0x92AE +#define GL_HSL_COLOR_KHR 0x92AF +#define GL_HSL_LUMINOSITY_KHR 0x92B0 +typedef void (APIENTRYP PFNGLBLENDBARRIERKHRPROC) (void); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBlendBarrierKHR (void); +#endif +#endif /* GL_KHR_blend_equation_advanced */ + +#ifndef GL_KHR_blend_equation_advanced_coherent +#define GL_KHR_blend_equation_advanced_coherent 1 +#define GL_BLEND_ADVANCED_COHERENT_KHR 0x9285 +#endif /* GL_KHR_blend_equation_advanced_coherent */ + #ifndef GL_KHR_context_flush_control #define GL_KHR_context_flush_control 1 #endif /* GL_KHR_context_flush_control */ @@ -3545,6 +3876,21 @@ GLAPI void APIENTRY glTexPageCommitmentARB (GLenum target, GLint level, GLint xo #define GL_KHR_debug 1 #endif /* GL_KHR_debug */ +#ifndef GL_KHR_no_error +#define GL_KHR_no_error 1 +#define GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR 0x00000008 +#endif /* GL_KHR_no_error */ + +#ifndef GL_KHR_parallel_shader_compile +#define GL_KHR_parallel_shader_compile 1 +#define GL_MAX_SHADER_COMPILER_THREADS_KHR 0x91B0 +#define GL_COMPLETION_STATUS_KHR 0x91B1 +typedef void (APIENTRYP PFNGLMAXSHADERCOMPILERTHREADSKHRPROC) (GLuint count); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glMaxShaderCompilerThreadsKHR (GLuint count); +#endif +#endif /* GL_KHR_parallel_shader_compile */ + #ifndef GL_KHR_robust_buffer_access_behavior #define GL_KHR_robust_buffer_access_behavior 1 #endif /* GL_KHR_robust_buffer_access_behavior */ @@ -3590,6 +3936,1929 @@ GLAPI void APIENTRY glTexPageCommitmentARB (GLenum target, GLint level, GLint xo #define GL_KHR_texture_compression_astc_ldr 1 #endif /* GL_KHR_texture_compression_astc_ldr */ +#ifndef GL_KHR_texture_compression_astc_sliced_3d +#define GL_KHR_texture_compression_astc_sliced_3d 1 +#endif /* GL_KHR_texture_compression_astc_sliced_3d */ + +#ifndef GL_AMD_framebuffer_multisample_advanced +#define GL_AMD_framebuffer_multisample_advanced 1 +#define GL_RENDERBUFFER_STORAGE_SAMPLES_AMD 0x91B2 +#define GL_MAX_COLOR_FRAMEBUFFER_SAMPLES_AMD 0x91B3 +#define GL_MAX_COLOR_FRAMEBUFFER_STORAGE_SAMPLES_AMD 0x91B4 +#define GL_MAX_DEPTH_STENCIL_FRAMEBUFFER_SAMPLES_AMD 0x91B5 +#define GL_NUM_SUPPORTED_MULTISAMPLE_MODES_AMD 0x91B6 +#define GL_SUPPORTED_MULTISAMPLE_MODES_AMD 0x91B7 +typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEADVANCEDAMDPROC) (GLenum target, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height); +typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEADVANCEDAMDPROC) (GLuint renderbuffer, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glRenderbufferStorageMultisampleAdvancedAMD (GLenum target, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height); +GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleAdvancedAMD (GLuint renderbuffer, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height); +#endif +#endif /* GL_AMD_framebuffer_multisample_advanced */ + +#ifndef GL_AMD_performance_monitor +#define GL_AMD_performance_monitor 1 +#define GL_COUNTER_TYPE_AMD 0x8BC0 +#define GL_COUNTER_RANGE_AMD 0x8BC1 +#define GL_UNSIGNED_INT64_AMD 0x8BC2 +#define GL_PERCENTAGE_AMD 0x8BC3 +#define GL_PERFMON_RESULT_AVAILABLE_AMD 0x8BC4 +#define GL_PERFMON_RESULT_SIZE_AMD 0x8BC5 +#define GL_PERFMON_RESULT_AMD 0x8BC6 +typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint *numGroups, GLsizei groupsSize, GLuint *groups); +typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters); +typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString); +typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString); +typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, void *data); +typedef void (APIENTRYP PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors); +typedef void (APIENTRYP PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors); +typedef void (APIENTRYP PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList); +typedef void (APIENTRYP PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor); +typedef void (APIENTRYP PFNGLENDPERFMONITORAMDPROC) (GLuint monitor); +typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glGetPerfMonitorGroupsAMD (GLint *numGroups, GLsizei groupsSize, GLuint *groups); +GLAPI void APIENTRY glGetPerfMonitorCountersAMD (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters); +GLAPI void APIENTRY glGetPerfMonitorGroupStringAMD (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString); +GLAPI void APIENTRY glGetPerfMonitorCounterStringAMD (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString); +GLAPI void APIENTRY glGetPerfMonitorCounterInfoAMD (GLuint group, GLuint counter, GLenum pname, void *data); +GLAPI void APIENTRY glGenPerfMonitorsAMD (GLsizei n, GLuint *monitors); +GLAPI void APIENTRY glDeletePerfMonitorsAMD (GLsizei n, GLuint *monitors); +GLAPI void APIENTRY glSelectPerfMonitorCountersAMD (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList); +GLAPI void APIENTRY glBeginPerfMonitorAMD (GLuint monitor); +GLAPI void APIENTRY glEndPerfMonitorAMD (GLuint monitor); +GLAPI void APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten); +#endif +#endif /* GL_AMD_performance_monitor */ + +#ifndef GL_APPLE_rgb_422 +#define GL_APPLE_rgb_422 1 +#define GL_RGB_422_APPLE 0x8A1F +#define GL_UNSIGNED_SHORT_8_8_APPLE 0x85BA +#define GL_UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB +#define GL_RGB_RAW_422_APPLE 0x8A51 +#endif /* GL_APPLE_rgb_422 */ + +#ifndef GL_EXT_EGL_image_storage +#define GL_EXT_EGL_image_storage 1 +typedef void *GLeglImageOES; +typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXSTORAGEEXTPROC) (GLenum target, GLeglImageOES image, const GLint* attrib_list); +typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXTURESTORAGEEXTPROC) (GLuint texture, GLeglImageOES image, const GLint* attrib_list); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glEGLImageTargetTexStorageEXT (GLenum target, GLeglImageOES image, const GLint* attrib_list); +GLAPI void APIENTRY glEGLImageTargetTextureStorageEXT (GLuint texture, GLeglImageOES image, const GLint* attrib_list); +#endif +#endif /* GL_EXT_EGL_image_storage */ + +#ifndef GL_EXT_debug_label +#define GL_EXT_debug_label 1 +#define GL_PROGRAM_PIPELINE_OBJECT_EXT 0x8A4F +#define GL_PROGRAM_OBJECT_EXT 0x8B40 +#define GL_SHADER_OBJECT_EXT 0x8B48 +#define GL_BUFFER_OBJECT_EXT 0x9151 +#define GL_QUERY_OBJECT_EXT 0x9153 +#define GL_VERTEX_ARRAY_OBJECT_EXT 0x9154 +typedef void (APIENTRYP PFNGLLABELOBJECTEXTPROC) (GLenum type, GLuint object, GLsizei length, const GLchar *label); +typedef void (APIENTRYP PFNGLGETOBJECTLABELEXTPROC) (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glLabelObjectEXT (GLenum type, GLuint object, GLsizei length, const GLchar *label); +GLAPI void APIENTRY glGetObjectLabelEXT (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label); +#endif +#endif /* GL_EXT_debug_label */ + +#ifndef GL_EXT_debug_marker +#define GL_EXT_debug_marker 1 +typedef void (APIENTRYP PFNGLINSERTEVENTMARKEREXTPROC) (GLsizei length, const GLchar *marker); +typedef void (APIENTRYP PFNGLPUSHGROUPMARKEREXTPROC) (GLsizei length, const GLchar *marker); +typedef void (APIENTRYP PFNGLPOPGROUPMARKEREXTPROC) (void); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glInsertEventMarkerEXT (GLsizei length, const GLchar *marker); +GLAPI void APIENTRY glPushGroupMarkerEXT (GLsizei length, const GLchar *marker); +GLAPI void APIENTRY glPopGroupMarkerEXT (void); +#endif +#endif /* GL_EXT_debug_marker */ + +#ifndef GL_EXT_direct_state_access +#define GL_EXT_direct_state_access 1 +#define GL_PROGRAM_MATRIX_EXT 0x8E2D +#define GL_TRANSPOSE_PROGRAM_MATRIX_EXT 0x8E2E +#define GL_PROGRAM_MATRIX_STACK_DEPTH_EXT 0x8E2F +typedef void (APIENTRYP PFNGLMATRIXLOADFEXTPROC) (GLenum mode, const GLfloat *m); +typedef void (APIENTRYP PFNGLMATRIXLOADDEXTPROC) (GLenum mode, const GLdouble *m); +typedef void (APIENTRYP PFNGLMATRIXMULTFEXTPROC) (GLenum mode, const GLfloat *m); +typedef void (APIENTRYP PFNGLMATRIXMULTDEXTPROC) (GLenum mode, const GLdouble *m); +typedef void (APIENTRYP PFNGLMATRIXLOADIDENTITYEXTPROC) (GLenum mode); +typedef void (APIENTRYP PFNGLMATRIXROTATEFEXTPROC) (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLMATRIXROTATEDEXTPROC) (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z); +typedef void (APIENTRYP PFNGLMATRIXSCALEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLMATRIXSCALEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z); +typedef void (APIENTRYP PFNGLMATRIXTRANSLATEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLMATRIXTRANSLATEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z); +typedef void (APIENTRYP PFNGLMATRIXFRUSTUMEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); +typedef void (APIENTRYP PFNGLMATRIXORTHOEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); +typedef void (APIENTRYP PFNGLMATRIXPOPEXTPROC) (GLenum mode); +typedef void (APIENTRYP PFNGLMATRIXPUSHEXTPROC) (GLenum mode); +typedef void (APIENTRYP PFNGLCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask); +typedef void (APIENTRYP PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask); +typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat param); +typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLfloat *params); +typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params); +typedef void (APIENTRYP PFNGLTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels); +typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels); +typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels); +typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels); +typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); +typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); +typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); +typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); +typedef void (APIENTRYP PFNGLGETTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, void *pixels); +typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels); +typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels); +typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); +typedef void (APIENTRYP PFNGLBINDMULTITEXTUREEXTPROC) (GLenum texunit, GLenum target, GLuint texture); +typedef void (APIENTRYP PFNGLMULTITEXCOORDPOINTEREXTPROC) (GLenum texunit, GLint size, GLenum type, GLsizei stride, const void *pointer); +typedef void (APIENTRYP PFNGLMULTITEXENVFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param); +typedef void (APIENTRYP PFNGLMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params); +typedef void (APIENTRYP PFNGLMULTITEXENVIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params); +typedef void (APIENTRYP PFNGLMULTITEXGENDEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble param); +typedef void (APIENTRYP PFNGLMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params); +typedef void (APIENTRYP PFNGLMULTITEXGENFEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat param); +typedef void (APIENTRYP PFNGLMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params); +typedef void (APIENTRYP PFNGLMULTITEXGENIEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLint *params); +typedef void (APIENTRYP PFNGLGETMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params); +typedef void (APIENTRYP PFNGLGETMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params); +typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param); +typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params); +typedef void (APIENTRYP PFNGLMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels); +typedef void (APIENTRYP PFNGLMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels); +typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels); +typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels); +typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); +typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); +typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); +typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); +typedef void (APIENTRYP PFNGLGETMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, void *pixels); +typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels); +typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels); +typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); +typedef void (APIENTRYP PFNGLENABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index); +typedef void (APIENTRYP PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index); +typedef void (APIENTRYP PFNGLGETFLOATINDEXEDVEXTPROC) (GLenum target, GLuint index, GLfloat *data); +typedef void (APIENTRYP PFNGLGETDOUBLEINDEXEDVEXTPROC) (GLenum target, GLuint index, GLdouble *data); +typedef void (APIENTRYP PFNGLGETPOINTERINDEXEDVEXTPROC) (GLenum target, GLuint index, void **data); +typedef void (APIENTRYP PFNGLENABLEINDEXEDEXTPROC) (GLenum target, GLuint index); +typedef void (APIENTRYP PFNGLDISABLEINDEXEDEXTPROC) (GLenum target, GLuint index); +typedef GLboolean (APIENTRYP PFNGLISENABLEDINDEXEDEXTPROC) (GLenum target, GLuint index); +typedef void (APIENTRYP PFNGLGETINTEGERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLint *data); +typedef void (APIENTRYP PFNGLGETBOOLEANINDEXEDVEXTPROC) (GLenum target, GLuint index, GLboolean *data); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *bits); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *bits); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *bits); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *bits); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *bits); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *bits); +typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint lod, void *img); +typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *bits); +typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *bits); +typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *bits); +typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *bits); +typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *bits); +typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *bits); +typedef void (APIENTRYP PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint lod, void *img); +typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m); +typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m); +typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m); +typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m); +typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage); +typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data); +typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFEREXTPROC) (GLuint buffer, GLenum access); +typedef GLboolean (APIENTRYP PFNGLUNMAPNAMEDBUFFEREXTPROC) (GLuint buffer); +typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC) (GLuint buffer, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPOINTERVEXTPROC) (GLuint buffer, GLenum pname, void **params); +typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat v0); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint v0); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +typedef void (APIENTRYP PFNGLTEXTUREBUFFEREXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer); +typedef void (APIENTRYP PFNGLMULTITEXBUFFEREXTPROC) (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer); +typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params); +typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLuint *params); +typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLuint *params); +typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params); +typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLuint *params); +typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLuint *params); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIEXTPROC) (GLuint program, GLint location, GLuint v0); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); +typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params); +typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC) (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); +typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLint *params); +typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params); +typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); +typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLuint *params); +typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params); +typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLint *params); +typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint *params); +typedef void (APIENTRYP PFNGLENABLECLIENTSTATEIEXTPROC) (GLenum array, GLuint index); +typedef void (APIENTRYP PFNGLDISABLECLIENTSTATEIEXTPROC) (GLenum array, GLuint index); +typedef void (APIENTRYP PFNGLGETFLOATI_VEXTPROC) (GLenum pname, GLuint index, GLfloat *params); +typedef void (APIENTRYP PFNGLGETDOUBLEI_VEXTPROC) (GLenum pname, GLuint index, GLdouble *params); +typedef void (APIENTRYP PFNGLGETPOINTERI_VEXTPROC) (GLenum pname, GLuint index, void **params); +typedef void (APIENTRYP PFNGLNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum format, GLsizei len, const void *string); +typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); +typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLdouble *params); +typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLfloat *params); +typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble *params); +typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat *params); +typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMIVEXTPROC) (GLuint program, GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum pname, void *string); +typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height); +typedef void (APIENTRYP PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC) (GLuint renderbuffer, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); +typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC) (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height); +typedef GLenum (APIENTRYP PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC) (GLuint framebuffer, GLenum target); +typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level); +typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level); +typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); +typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); +typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGENERATETEXTUREMIPMAPEXTPROC) (GLuint texture, GLenum target); +typedef void (APIENTRYP PFNGLGENERATEMULTITEXMIPMAPEXTPROC) (GLenum texunit, GLenum target); +typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC) (GLuint framebuffer, GLenum mode); +typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC) (GLuint framebuffer, GLsizei n, const GLenum *bufs); +typedef void (APIENTRYP PFNGLFRAMEBUFFERREADBUFFEREXTPROC) (GLuint framebuffer, GLenum mode); +typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLNAMEDCOPYBUFFERSUBDATAEXTPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); +typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level); +typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer); +typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face); +typedef void (APIENTRYP PFNGLTEXTURERENDERBUFFEREXTPROC) (GLuint texture, GLenum target, GLuint renderbuffer); +typedef void (APIENTRYP PFNGLMULTITEXRENDERBUFFEREXTPROC) (GLenum texunit, GLenum target, GLuint renderbuffer); +typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset); +typedef void (APIENTRYP PFNGLVERTEXARRAYCOLOROFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset); +typedef void (APIENTRYP PFNGLVERTEXARRAYEDGEFLAGOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLsizei stride, GLintptr offset); +typedef void (APIENTRYP PFNGLVERTEXARRAYINDEXOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset); +typedef void (APIENTRYP PFNGLVERTEXARRAYNORMALOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset); +typedef void (APIENTRYP PFNGLVERTEXARRAYTEXCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset); +typedef void (APIENTRYP PFNGLVERTEXARRAYMULTITEXCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum texunit, GLint size, GLenum type, GLsizei stride, GLintptr offset); +typedef void (APIENTRYP PFNGLVERTEXARRAYFOGCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset); +typedef void (APIENTRYP PFNGLVERTEXARRAYSECONDARYCOLOROFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset); +typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLintptr offset); +typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBIOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset); +typedef void (APIENTRYP PFNGLENABLEVERTEXARRAYEXTPROC) (GLuint vaobj, GLenum array); +typedef void (APIENTRYP PFNGLDISABLEVERTEXARRAYEXTPROC) (GLuint vaobj, GLenum array); +typedef void (APIENTRYP PFNGLENABLEVERTEXARRAYATTRIBEXTPROC) (GLuint vaobj, GLuint index); +typedef void (APIENTRYP PFNGLDISABLEVERTEXARRAYATTRIBEXTPROC) (GLuint vaobj, GLuint index); +typedef void (APIENTRYP PFNGLGETVERTEXARRAYINTEGERVEXTPROC) (GLuint vaobj, GLenum pname, GLint *param); +typedef void (APIENTRYP PFNGLGETVERTEXARRAYPOINTERVEXTPROC) (GLuint vaobj, GLenum pname, void **param); +typedef void (APIENTRYP PFNGLGETVERTEXARRAYINTEGERI_VEXTPROC) (GLuint vaobj, GLuint index, GLenum pname, GLint *param); +typedef void (APIENTRYP PFNGLGETVERTEXARRAYPOINTERI_VEXTPROC) (GLuint vaobj, GLuint index, GLenum pname, void **param); +typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access); +typedef void (APIENTRYP PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length); +typedef void (APIENTRYP PFNGLNAMEDBUFFERSTORAGEEXTPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags); +typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data); +typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLenum internalformat, GLsizeiptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data); +typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERPARAMETERIEXTPROC) (GLuint framebuffer, GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DEXTPROC) (GLuint program, GLint location, GLdouble x); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +typedef void (APIENTRYP PFNGLTEXTUREBUFFERRANGEEXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); +typedef void (APIENTRYP PFNGLTEXTURESTORAGE1DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); +typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); +typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); +typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DMULTISAMPLEEXTPROC) (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); +typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DMULTISAMPLEEXTPROC) (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); +typedef void (APIENTRYP PFNGLVERTEXARRAYBINDVERTEXBUFFEREXTPROC) (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride); +typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset); +typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBIFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); +typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBLFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); +typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBBINDINGEXTPROC) (GLuint vaobj, GLuint attribindex, GLuint bindingindex); +typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXBINDINGDIVISOREXTPROC) (GLuint vaobj, GLuint bindingindex, GLuint divisor); +typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBLOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset); +typedef void (APIENTRYP PFNGLTEXTUREPAGECOMMITMENTEXTPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit); +typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBDIVISOREXTPROC) (GLuint vaobj, GLuint index, GLuint divisor); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glMatrixLoadfEXT (GLenum mode, const GLfloat *m); +GLAPI void APIENTRY glMatrixLoaddEXT (GLenum mode, const GLdouble *m); +GLAPI void APIENTRY glMatrixMultfEXT (GLenum mode, const GLfloat *m); +GLAPI void APIENTRY glMatrixMultdEXT (GLenum mode, const GLdouble *m); +GLAPI void APIENTRY glMatrixLoadIdentityEXT (GLenum mode); +GLAPI void APIENTRY glMatrixRotatefEXT (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z); +GLAPI void APIENTRY glMatrixRotatedEXT (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z); +GLAPI void APIENTRY glMatrixScalefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z); +GLAPI void APIENTRY glMatrixScaledEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z); +GLAPI void APIENTRY glMatrixTranslatefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z); +GLAPI void APIENTRY glMatrixTranslatedEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z); +GLAPI void APIENTRY glMatrixFrustumEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); +GLAPI void APIENTRY glMatrixOrthoEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); +GLAPI void APIENTRY glMatrixPopEXT (GLenum mode); +GLAPI void APIENTRY glMatrixPushEXT (GLenum mode); +GLAPI void APIENTRY glClientAttribDefaultEXT (GLbitfield mask); +GLAPI void APIENTRY glPushClientAttribDefaultEXT (GLbitfield mask); +GLAPI void APIENTRY glTextureParameterfEXT (GLuint texture, GLenum target, GLenum pname, GLfloat param); +GLAPI void APIENTRY glTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, const GLfloat *params); +GLAPI void APIENTRY glTextureParameteriEXT (GLuint texture, GLenum target, GLenum pname, GLint param); +GLAPI void APIENTRY glTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params); +GLAPI void APIENTRY glTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels); +GLAPI void APIENTRY glTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels); +GLAPI void APIENTRY glTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels); +GLAPI void APIENTRY glTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels); +GLAPI void APIENTRY glCopyTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); +GLAPI void APIENTRY glCopyTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); +GLAPI void APIENTRY glCopyTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); +GLAPI void APIENTRY glCopyTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); +GLAPI void APIENTRY glGetTextureImageEXT (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, void *pixels); +GLAPI void APIENTRY glGetTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, GLfloat *params); +GLAPI void APIENTRY glGetTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params); +GLAPI void APIENTRY glGetTextureLevelParameterfvEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params); +GLAPI void APIENTRY glGetTextureLevelParameterivEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params); +GLAPI void APIENTRY glTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels); +GLAPI void APIENTRY glTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels); +GLAPI void APIENTRY glCopyTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); +GLAPI void APIENTRY glBindMultiTextureEXT (GLenum texunit, GLenum target, GLuint texture); +GLAPI void APIENTRY glMultiTexCoordPointerEXT (GLenum texunit, GLint size, GLenum type, GLsizei stride, const void *pointer); +GLAPI void APIENTRY glMultiTexEnvfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param); +GLAPI void APIENTRY glMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params); +GLAPI void APIENTRY glMultiTexEnviEXT (GLenum texunit, GLenum target, GLenum pname, GLint param); +GLAPI void APIENTRY glMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params); +GLAPI void APIENTRY glMultiTexGendEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble param); +GLAPI void APIENTRY glMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params); +GLAPI void APIENTRY glMultiTexGenfEXT (GLenum texunit, GLenum coord, GLenum pname, GLfloat param); +GLAPI void APIENTRY glMultiTexGenfvEXT (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params); +GLAPI void APIENTRY glMultiTexGeniEXT (GLenum texunit, GLenum coord, GLenum pname, GLint param); +GLAPI void APIENTRY glMultiTexGenivEXT (GLenum texunit, GLenum coord, GLenum pname, const GLint *params); +GLAPI void APIENTRY glGetMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params); +GLAPI void APIENTRY glGetMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params); +GLAPI void APIENTRY glGetMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params); +GLAPI void APIENTRY glGetMultiTexGenfvEXT (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params); +GLAPI void APIENTRY glGetMultiTexGenivEXT (GLenum texunit, GLenum coord, GLenum pname, GLint *params); +GLAPI void APIENTRY glMultiTexParameteriEXT (GLenum texunit, GLenum target, GLenum pname, GLint param); +GLAPI void APIENTRY glMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params); +GLAPI void APIENTRY glMultiTexParameterfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param); +GLAPI void APIENTRY glMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params); +GLAPI void APIENTRY glMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels); +GLAPI void APIENTRY glMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels); +GLAPI void APIENTRY glMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels); +GLAPI void APIENTRY glMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels); +GLAPI void APIENTRY glCopyMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); +GLAPI void APIENTRY glCopyMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); +GLAPI void APIENTRY glCopyMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); +GLAPI void APIENTRY glCopyMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); +GLAPI void APIENTRY glGetMultiTexImageEXT (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, void *pixels); +GLAPI void APIENTRY glGetMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params); +GLAPI void APIENTRY glGetMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params); +GLAPI void APIENTRY glGetMultiTexLevelParameterfvEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params); +GLAPI void APIENTRY glGetMultiTexLevelParameterivEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params); +GLAPI void APIENTRY glMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels); +GLAPI void APIENTRY glMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels); +GLAPI void APIENTRY glCopyMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); +GLAPI void APIENTRY glEnableClientStateIndexedEXT (GLenum array, GLuint index); +GLAPI void APIENTRY glDisableClientStateIndexedEXT (GLenum array, GLuint index); +GLAPI void APIENTRY glGetFloatIndexedvEXT (GLenum target, GLuint index, GLfloat *data); +GLAPI void APIENTRY glGetDoubleIndexedvEXT (GLenum target, GLuint index, GLdouble *data); +GLAPI void APIENTRY glGetPointerIndexedvEXT (GLenum target, GLuint index, void **data); +GLAPI void APIENTRY glEnableIndexedEXT (GLenum target, GLuint index); +GLAPI void APIENTRY glDisableIndexedEXT (GLenum target, GLuint index); +GLAPI GLboolean APIENTRY glIsEnabledIndexedEXT (GLenum target, GLuint index); +GLAPI void APIENTRY glGetIntegerIndexedvEXT (GLenum target, GLuint index, GLint *data); +GLAPI void APIENTRY glGetBooleanIndexedvEXT (GLenum target, GLuint index, GLboolean *data); +GLAPI void APIENTRY glCompressedTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *bits); +GLAPI void APIENTRY glCompressedTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *bits); +GLAPI void APIENTRY glCompressedTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *bits); +GLAPI void APIENTRY glCompressedTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *bits); +GLAPI void APIENTRY glCompressedTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *bits); +GLAPI void APIENTRY glCompressedTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *bits); +GLAPI void APIENTRY glGetCompressedTextureImageEXT (GLuint texture, GLenum target, GLint lod, void *img); +GLAPI void APIENTRY glCompressedMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *bits); +GLAPI void APIENTRY glCompressedMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *bits); +GLAPI void APIENTRY glCompressedMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *bits); +GLAPI void APIENTRY glCompressedMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *bits); +GLAPI void APIENTRY glCompressedMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *bits); +GLAPI void APIENTRY glCompressedMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *bits); +GLAPI void APIENTRY glGetCompressedMultiTexImageEXT (GLenum texunit, GLenum target, GLint lod, void *img); +GLAPI void APIENTRY glMatrixLoadTransposefEXT (GLenum mode, const GLfloat *m); +GLAPI void APIENTRY glMatrixLoadTransposedEXT (GLenum mode, const GLdouble *m); +GLAPI void APIENTRY glMatrixMultTransposefEXT (GLenum mode, const GLfloat *m); +GLAPI void APIENTRY glMatrixMultTransposedEXT (GLenum mode, const GLdouble *m); +GLAPI void APIENTRY glNamedBufferDataEXT (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage); +GLAPI void APIENTRY glNamedBufferSubDataEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data); +GLAPI void *APIENTRY glMapNamedBufferEXT (GLuint buffer, GLenum access); +GLAPI GLboolean APIENTRY glUnmapNamedBufferEXT (GLuint buffer); +GLAPI void APIENTRY glGetNamedBufferParameterivEXT (GLuint buffer, GLenum pname, GLint *params); +GLAPI void APIENTRY glGetNamedBufferPointervEXT (GLuint buffer, GLenum pname, void **params); +GLAPI void APIENTRY glGetNamedBufferSubDataEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data); +GLAPI void APIENTRY glProgramUniform1fEXT (GLuint program, GLint location, GLfloat v0); +GLAPI void APIENTRY glProgramUniform2fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1); +GLAPI void APIENTRY glProgramUniform3fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2); +GLAPI void APIENTRY glProgramUniform4fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); +GLAPI void APIENTRY glProgramUniform1iEXT (GLuint program, GLint location, GLint v0); +GLAPI void APIENTRY glProgramUniform2iEXT (GLuint program, GLint location, GLint v0, GLint v1); +GLAPI void APIENTRY glProgramUniform3iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2); +GLAPI void APIENTRY glProgramUniform4iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3); +GLAPI void APIENTRY glProgramUniform1fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); +GLAPI void APIENTRY glProgramUniform2fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); +GLAPI void APIENTRY glProgramUniform3fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); +GLAPI void APIENTRY glProgramUniform4fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); +GLAPI void APIENTRY glProgramUniform1ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); +GLAPI void APIENTRY glProgramUniform2ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); +GLAPI void APIENTRY glProgramUniform3ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); +GLAPI void APIENTRY glProgramUniform4ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); +GLAPI void APIENTRY glProgramUniformMatrix2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI void APIENTRY glProgramUniformMatrix3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI void APIENTRY glProgramUniformMatrix4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI void APIENTRY glProgramUniformMatrix2x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI void APIENTRY glProgramUniformMatrix3x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI void APIENTRY glProgramUniformMatrix2x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI void APIENTRY glProgramUniformMatrix4x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI void APIENTRY glProgramUniformMatrix3x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI void APIENTRY glProgramUniformMatrix4x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI void APIENTRY glTextureBufferEXT (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer); +GLAPI void APIENTRY glMultiTexBufferEXT (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer); +GLAPI void APIENTRY glTextureParameterIivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params); +GLAPI void APIENTRY glTextureParameterIuivEXT (GLuint texture, GLenum target, GLenum pname, const GLuint *params); +GLAPI void APIENTRY glGetTextureParameterIivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params); +GLAPI void APIENTRY glGetTextureParameterIuivEXT (GLuint texture, GLenum target, GLenum pname, GLuint *params); +GLAPI void APIENTRY glMultiTexParameterIivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params); +GLAPI void APIENTRY glMultiTexParameterIuivEXT (GLenum texunit, GLenum target, GLenum pname, const GLuint *params); +GLAPI void APIENTRY glGetMultiTexParameterIivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params); +GLAPI void APIENTRY glGetMultiTexParameterIuivEXT (GLenum texunit, GLenum target, GLenum pname, GLuint *params); +GLAPI void APIENTRY glProgramUniform1uiEXT (GLuint program, GLint location, GLuint v0); +GLAPI void APIENTRY glProgramUniform2uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1); +GLAPI void APIENTRY glProgramUniform3uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2); +GLAPI void APIENTRY glProgramUniform4uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); +GLAPI void APIENTRY glProgramUniform1uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value); +GLAPI void APIENTRY glProgramUniform2uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value); +GLAPI void APIENTRY glProgramUniform3uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value); +GLAPI void APIENTRY glProgramUniform4uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value); +GLAPI void APIENTRY glNamedProgramLocalParameters4fvEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params); +GLAPI void APIENTRY glNamedProgramLocalParameterI4iEXT (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); +GLAPI void APIENTRY glNamedProgramLocalParameterI4ivEXT (GLuint program, GLenum target, GLuint index, const GLint *params); +GLAPI void APIENTRY glNamedProgramLocalParametersI4ivEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params); +GLAPI void APIENTRY glNamedProgramLocalParameterI4uiEXT (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); +GLAPI void APIENTRY glNamedProgramLocalParameterI4uivEXT (GLuint program, GLenum target, GLuint index, const GLuint *params); +GLAPI void APIENTRY glNamedProgramLocalParametersI4uivEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params); +GLAPI void APIENTRY glGetNamedProgramLocalParameterIivEXT (GLuint program, GLenum target, GLuint index, GLint *params); +GLAPI void APIENTRY glGetNamedProgramLocalParameterIuivEXT (GLuint program, GLenum target, GLuint index, GLuint *params); +GLAPI void APIENTRY glEnableClientStateiEXT (GLenum array, GLuint index); +GLAPI void APIENTRY glDisableClientStateiEXT (GLenum array, GLuint index); +GLAPI void APIENTRY glGetFloati_vEXT (GLenum pname, GLuint index, GLfloat *params); +GLAPI void APIENTRY glGetDoublei_vEXT (GLenum pname, GLuint index, GLdouble *params); +GLAPI void APIENTRY glGetPointeri_vEXT (GLenum pname, GLuint index, void **params); +GLAPI void APIENTRY glNamedProgramStringEXT (GLuint program, GLenum target, GLenum format, GLsizei len, const void *string); +GLAPI void APIENTRY glNamedProgramLocalParameter4dEXT (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); +GLAPI void APIENTRY glNamedProgramLocalParameter4dvEXT (GLuint program, GLenum target, GLuint index, const GLdouble *params); +GLAPI void APIENTRY glNamedProgramLocalParameter4fEXT (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +GLAPI void APIENTRY glNamedProgramLocalParameter4fvEXT (GLuint program, GLenum target, GLuint index, const GLfloat *params); +GLAPI void APIENTRY glGetNamedProgramLocalParameterdvEXT (GLuint program, GLenum target, GLuint index, GLdouble *params); +GLAPI void APIENTRY glGetNamedProgramLocalParameterfvEXT (GLuint program, GLenum target, GLuint index, GLfloat *params); +GLAPI void APIENTRY glGetNamedProgramivEXT (GLuint program, GLenum target, GLenum pname, GLint *params); +GLAPI void APIENTRY glGetNamedProgramStringEXT (GLuint program, GLenum target, GLenum pname, void *string); +GLAPI void APIENTRY glNamedRenderbufferStorageEXT (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height); +GLAPI void APIENTRY glGetNamedRenderbufferParameterivEXT (GLuint renderbuffer, GLenum pname, GLint *params); +GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleEXT (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); +GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleCoverageEXT (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height); +GLAPI GLenum APIENTRY glCheckNamedFramebufferStatusEXT (GLuint framebuffer, GLenum target); +GLAPI void APIENTRY glNamedFramebufferTexture1DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level); +GLAPI void APIENTRY glNamedFramebufferTexture2DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level); +GLAPI void APIENTRY glNamedFramebufferTexture3DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); +GLAPI void APIENTRY glNamedFramebufferRenderbufferEXT (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); +GLAPI void APIENTRY glGetNamedFramebufferAttachmentParameterivEXT (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params); +GLAPI void APIENTRY glGenerateTextureMipmapEXT (GLuint texture, GLenum target); +GLAPI void APIENTRY glGenerateMultiTexMipmapEXT (GLenum texunit, GLenum target); +GLAPI void APIENTRY glFramebufferDrawBufferEXT (GLuint framebuffer, GLenum mode); +GLAPI void APIENTRY glFramebufferDrawBuffersEXT (GLuint framebuffer, GLsizei n, const GLenum *bufs); +GLAPI void APIENTRY glFramebufferReadBufferEXT (GLuint framebuffer, GLenum mode); +GLAPI void APIENTRY glGetFramebufferParameterivEXT (GLuint framebuffer, GLenum pname, GLint *params); +GLAPI void APIENTRY glNamedCopyBufferSubDataEXT (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); +GLAPI void APIENTRY glNamedFramebufferTextureEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level); +GLAPI void APIENTRY glNamedFramebufferTextureLayerEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer); +GLAPI void APIENTRY glNamedFramebufferTextureFaceEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face); +GLAPI void APIENTRY glTextureRenderbufferEXT (GLuint texture, GLenum target, GLuint renderbuffer); +GLAPI void APIENTRY glMultiTexRenderbufferEXT (GLenum texunit, GLenum target, GLuint renderbuffer); +GLAPI void APIENTRY glVertexArrayVertexOffsetEXT (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset); +GLAPI void APIENTRY glVertexArrayColorOffsetEXT (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset); +GLAPI void APIENTRY glVertexArrayEdgeFlagOffsetEXT (GLuint vaobj, GLuint buffer, GLsizei stride, GLintptr offset); +GLAPI void APIENTRY glVertexArrayIndexOffsetEXT (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset); +GLAPI void APIENTRY glVertexArrayNormalOffsetEXT (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset); +GLAPI void APIENTRY glVertexArrayTexCoordOffsetEXT (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset); +GLAPI void APIENTRY glVertexArrayMultiTexCoordOffsetEXT (GLuint vaobj, GLuint buffer, GLenum texunit, GLint size, GLenum type, GLsizei stride, GLintptr offset); +GLAPI void APIENTRY glVertexArrayFogCoordOffsetEXT (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset); +GLAPI void APIENTRY glVertexArraySecondaryColorOffsetEXT (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset); +GLAPI void APIENTRY glVertexArrayVertexAttribOffsetEXT (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLintptr offset); +GLAPI void APIENTRY glVertexArrayVertexAttribIOffsetEXT (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset); +GLAPI void APIENTRY glEnableVertexArrayEXT (GLuint vaobj, GLenum array); +GLAPI void APIENTRY glDisableVertexArrayEXT (GLuint vaobj, GLenum array); +GLAPI void APIENTRY glEnableVertexArrayAttribEXT (GLuint vaobj, GLuint index); +GLAPI void APIENTRY glDisableVertexArrayAttribEXT (GLuint vaobj, GLuint index); +GLAPI void APIENTRY glGetVertexArrayIntegervEXT (GLuint vaobj, GLenum pname, GLint *param); +GLAPI void APIENTRY glGetVertexArrayPointervEXT (GLuint vaobj, GLenum pname, void **param); +GLAPI void APIENTRY glGetVertexArrayIntegeri_vEXT (GLuint vaobj, GLuint index, GLenum pname, GLint *param); +GLAPI void APIENTRY glGetVertexArrayPointeri_vEXT (GLuint vaobj, GLuint index, GLenum pname, void **param); +GLAPI void *APIENTRY glMapNamedBufferRangeEXT (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access); +GLAPI void APIENTRY glFlushMappedNamedBufferRangeEXT (GLuint buffer, GLintptr offset, GLsizeiptr length); +GLAPI void APIENTRY glNamedBufferStorageEXT (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags); +GLAPI void APIENTRY glClearNamedBufferDataEXT (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data); +GLAPI void APIENTRY glClearNamedBufferSubDataEXT (GLuint buffer, GLenum internalformat, GLsizeiptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data); +GLAPI void APIENTRY glNamedFramebufferParameteriEXT (GLuint framebuffer, GLenum pname, GLint param); +GLAPI void APIENTRY glGetNamedFramebufferParameterivEXT (GLuint framebuffer, GLenum pname, GLint *params); +GLAPI void APIENTRY glProgramUniform1dEXT (GLuint program, GLint location, GLdouble x); +GLAPI void APIENTRY glProgramUniform2dEXT (GLuint program, GLint location, GLdouble x, GLdouble y); +GLAPI void APIENTRY glProgramUniform3dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z); +GLAPI void APIENTRY glProgramUniform4dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w); +GLAPI void APIENTRY glProgramUniform1dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value); +GLAPI void APIENTRY glProgramUniform2dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value); +GLAPI void APIENTRY glProgramUniform3dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value); +GLAPI void APIENTRY glProgramUniform4dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value); +GLAPI void APIENTRY glProgramUniformMatrix2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI void APIENTRY glProgramUniformMatrix3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI void APIENTRY glProgramUniformMatrix4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI void APIENTRY glProgramUniformMatrix2x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI void APIENTRY glProgramUniformMatrix2x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI void APIENTRY glProgramUniformMatrix3x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI void APIENTRY glProgramUniformMatrix3x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI void APIENTRY glProgramUniformMatrix4x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI void APIENTRY glProgramUniformMatrix4x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI void APIENTRY glTextureBufferRangeEXT (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); +GLAPI void APIENTRY glTextureStorage1DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); +GLAPI void APIENTRY glTextureStorage2DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); +GLAPI void APIENTRY glTextureStorage3DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); +GLAPI void APIENTRY glTextureStorage2DMultisampleEXT (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); +GLAPI void APIENTRY glTextureStorage3DMultisampleEXT (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); +GLAPI void APIENTRY glVertexArrayBindVertexBufferEXT (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride); +GLAPI void APIENTRY glVertexArrayVertexAttribFormatEXT (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset); +GLAPI void APIENTRY glVertexArrayVertexAttribIFormatEXT (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); +GLAPI void APIENTRY glVertexArrayVertexAttribLFormatEXT (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); +GLAPI void APIENTRY glVertexArrayVertexAttribBindingEXT (GLuint vaobj, GLuint attribindex, GLuint bindingindex); +GLAPI void APIENTRY glVertexArrayVertexBindingDivisorEXT (GLuint vaobj, GLuint bindingindex, GLuint divisor); +GLAPI void APIENTRY glVertexArrayVertexAttribLOffsetEXT (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset); +GLAPI void APIENTRY glTexturePageCommitmentEXT (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit); +GLAPI void APIENTRY glVertexArrayVertexAttribDivisorEXT (GLuint vaobj, GLuint index, GLuint divisor); +#endif +#endif /* GL_EXT_direct_state_access */ + +#ifndef GL_EXT_draw_instanced +#define GL_EXT_draw_instanced 1 +typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount); +typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glDrawArraysInstancedEXT (GLenum mode, GLint start, GLsizei count, GLsizei primcount); +GLAPI void APIENTRY glDrawElementsInstancedEXT (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); +#endif +#endif /* GL_EXT_draw_instanced */ + +#ifndef GL_EXT_polygon_offset_clamp +#define GL_EXT_polygon_offset_clamp 1 +#define GL_POLYGON_OFFSET_CLAMP_EXT 0x8E1B +typedef void (APIENTRYP PFNGLPOLYGONOFFSETCLAMPEXTPROC) (GLfloat factor, GLfloat units, GLfloat clamp); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glPolygonOffsetClampEXT (GLfloat factor, GLfloat units, GLfloat clamp); +#endif +#endif /* GL_EXT_polygon_offset_clamp */ + +#ifndef GL_EXT_post_depth_coverage +#define GL_EXT_post_depth_coverage 1 +#endif /* GL_EXT_post_depth_coverage */ + +#ifndef GL_EXT_raster_multisample +#define GL_EXT_raster_multisample 1 +#define GL_RASTER_MULTISAMPLE_EXT 0x9327 +#define GL_RASTER_SAMPLES_EXT 0x9328 +#define GL_MAX_RASTER_SAMPLES_EXT 0x9329 +#define GL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT 0x932A +#define GL_MULTISAMPLE_RASTERIZATION_ALLOWED_EXT 0x932B +#define GL_EFFECTIVE_RASTER_SAMPLES_EXT 0x932C +typedef void (APIENTRYP PFNGLRASTERSAMPLESEXTPROC) (GLuint samples, GLboolean fixedsamplelocations); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glRasterSamplesEXT (GLuint samples, GLboolean fixedsamplelocations); +#endif +#endif /* GL_EXT_raster_multisample */ + +#ifndef GL_EXT_separate_shader_objects +#define GL_EXT_separate_shader_objects 1 +#define GL_ACTIVE_PROGRAM_EXT 0x8B8D +typedef void (APIENTRYP PFNGLUSESHADERPROGRAMEXTPROC) (GLenum type, GLuint program); +typedef void (APIENTRYP PFNGLACTIVEPROGRAMEXTPROC) (GLuint program); +typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMEXTPROC) (GLenum type, const GLchar *string); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glUseShaderProgramEXT (GLenum type, GLuint program); +GLAPI void APIENTRY glActiveProgramEXT (GLuint program); +GLAPI GLuint APIENTRY glCreateShaderProgramEXT (GLenum type, const GLchar *string); +#endif +#endif /* GL_EXT_separate_shader_objects */ + +#ifndef GL_EXT_shader_framebuffer_fetch +#define GL_EXT_shader_framebuffer_fetch 1 +#define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52 +#endif /* GL_EXT_shader_framebuffer_fetch */ + +#ifndef GL_EXT_shader_framebuffer_fetch_non_coherent +#define GL_EXT_shader_framebuffer_fetch_non_coherent 1 +typedef void (APIENTRYP PFNGLFRAMEBUFFERFETCHBARRIEREXTPROC) (void); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glFramebufferFetchBarrierEXT (void); +#endif +#endif /* GL_EXT_shader_framebuffer_fetch_non_coherent */ + +#ifndef GL_EXT_shader_integer_mix +#define GL_EXT_shader_integer_mix 1 +#endif /* GL_EXT_shader_integer_mix */ + +#ifndef GL_EXT_texture_compression_s3tc +#define GL_EXT_texture_compression_s3tc 1 +#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 +#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 +#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2 +#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3 +#endif /* GL_EXT_texture_compression_s3tc */ + +#ifndef GL_EXT_texture_filter_minmax +#define GL_EXT_texture_filter_minmax 1 +#define GL_TEXTURE_REDUCTION_MODE_EXT 0x9366 +#define GL_WEIGHTED_AVERAGE_EXT 0x9367 +#endif /* GL_EXT_texture_filter_minmax */ + +#ifndef GL_EXT_texture_sRGB_R8 +#define GL_EXT_texture_sRGB_R8 1 +#define GL_SR8_EXT 0x8FBD +#endif /* GL_EXT_texture_sRGB_R8 */ + +#ifndef GL_EXT_texture_sRGB_decode +#define GL_EXT_texture_sRGB_decode 1 +#define GL_TEXTURE_SRGB_DECODE_EXT 0x8A48 +#define GL_DECODE_EXT 0x8A49 +#define GL_SKIP_DECODE_EXT 0x8A4A +#endif /* GL_EXT_texture_sRGB_decode */ + +#ifndef GL_EXT_window_rectangles +#define GL_EXT_window_rectangles 1 +#define GL_INCLUSIVE_EXT 0x8F10 +#define GL_EXCLUSIVE_EXT 0x8F11 +#define GL_WINDOW_RECTANGLE_EXT 0x8F12 +#define GL_WINDOW_RECTANGLE_MODE_EXT 0x8F13 +#define GL_MAX_WINDOW_RECTANGLES_EXT 0x8F14 +#define GL_NUM_WINDOW_RECTANGLES_EXT 0x8F15 +typedef void (APIENTRYP PFNGLWINDOWRECTANGLESEXTPROC) (GLenum mode, GLsizei count, const GLint *box); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glWindowRectanglesEXT (GLenum mode, GLsizei count, const GLint *box); +#endif +#endif /* GL_EXT_window_rectangles */ + +#ifndef GL_INTEL_blackhole_render +#define GL_INTEL_blackhole_render 1 +#define GL_BLACKHOLE_RENDER_INTEL 0x83FC +#endif /* GL_INTEL_blackhole_render */ + +#ifndef GL_INTEL_conservative_rasterization +#define GL_INTEL_conservative_rasterization 1 +#define GL_CONSERVATIVE_RASTERIZATION_INTEL 0x83FE +#endif /* GL_INTEL_conservative_rasterization */ + +#ifndef GL_INTEL_framebuffer_CMAA +#define GL_INTEL_framebuffer_CMAA 1 +typedef void (APIENTRYP PFNGLAPPLYFRAMEBUFFERATTACHMENTCMAAINTELPROC) (void); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glApplyFramebufferAttachmentCMAAINTEL (void); +#endif +#endif /* GL_INTEL_framebuffer_CMAA */ + +#ifndef GL_INTEL_performance_query +#define GL_INTEL_performance_query 1 +#define GL_PERFQUERY_SINGLE_CONTEXT_INTEL 0x00000000 +#define GL_PERFQUERY_GLOBAL_CONTEXT_INTEL 0x00000001 +#define GL_PERFQUERY_WAIT_INTEL 0x83FB +#define GL_PERFQUERY_FLUSH_INTEL 0x83FA +#define GL_PERFQUERY_DONOT_FLUSH_INTEL 0x83F9 +#define GL_PERFQUERY_COUNTER_EVENT_INTEL 0x94F0 +#define GL_PERFQUERY_COUNTER_DURATION_NORM_INTEL 0x94F1 +#define GL_PERFQUERY_COUNTER_DURATION_RAW_INTEL 0x94F2 +#define GL_PERFQUERY_COUNTER_THROUGHPUT_INTEL 0x94F3 +#define GL_PERFQUERY_COUNTER_RAW_INTEL 0x94F4 +#define GL_PERFQUERY_COUNTER_TIMESTAMP_INTEL 0x94F5 +#define GL_PERFQUERY_COUNTER_DATA_UINT32_INTEL 0x94F8 +#define GL_PERFQUERY_COUNTER_DATA_UINT64_INTEL 0x94F9 +#define GL_PERFQUERY_COUNTER_DATA_FLOAT_INTEL 0x94FA +#define GL_PERFQUERY_COUNTER_DATA_DOUBLE_INTEL 0x94FB +#define GL_PERFQUERY_COUNTER_DATA_BOOL32_INTEL 0x94FC +#define GL_PERFQUERY_QUERY_NAME_LENGTH_MAX_INTEL 0x94FD +#define GL_PERFQUERY_COUNTER_NAME_LENGTH_MAX_INTEL 0x94FE +#define GL_PERFQUERY_COUNTER_DESC_LENGTH_MAX_INTEL 0x94FF +#define GL_PERFQUERY_GPA_EXTENDED_COUNTERS_INTEL 0x9500 +typedef void (APIENTRYP PFNGLBEGINPERFQUERYINTELPROC) (GLuint queryHandle); +typedef void (APIENTRYP PFNGLCREATEPERFQUERYINTELPROC) (GLuint queryId, GLuint *queryHandle); +typedef void (APIENTRYP PFNGLDELETEPERFQUERYINTELPROC) (GLuint queryHandle); +typedef void (APIENTRYP PFNGLENDPERFQUERYINTELPROC) (GLuint queryHandle); +typedef void (APIENTRYP PFNGLGETFIRSTPERFQUERYIDINTELPROC) (GLuint *queryId); +typedef void (APIENTRYP PFNGLGETNEXTPERFQUERYIDINTELPROC) (GLuint queryId, GLuint *nextQueryId); +typedef void (APIENTRYP PFNGLGETPERFCOUNTERINFOINTELPROC) (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue); +typedef void (APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten); +typedef void (APIENTRYP PFNGLGETPERFQUERYIDBYNAMEINTELPROC) (GLchar *queryName, GLuint *queryId); +typedef void (APIENTRYP PFNGLGETPERFQUERYINFOINTELPROC) (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBeginPerfQueryINTEL (GLuint queryHandle); +GLAPI void APIENTRY glCreatePerfQueryINTEL (GLuint queryId, GLuint *queryHandle); +GLAPI void APIENTRY glDeletePerfQueryINTEL (GLuint queryHandle); +GLAPI void APIENTRY glEndPerfQueryINTEL (GLuint queryHandle); +GLAPI void APIENTRY glGetFirstPerfQueryIdINTEL (GLuint *queryId); +GLAPI void APIENTRY glGetNextPerfQueryIdINTEL (GLuint queryId, GLuint *nextQueryId); +GLAPI void APIENTRY glGetPerfCounterInfoINTEL (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue); +GLAPI void APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten); +GLAPI void APIENTRY glGetPerfQueryIdByNameINTEL (GLchar *queryName, GLuint *queryId); +GLAPI void APIENTRY glGetPerfQueryInfoINTEL (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask); +#endif +#endif /* GL_INTEL_performance_query */ + +#ifndef GL_NV_bindless_multi_draw_indirect +#define GL_NV_bindless_multi_draw_indirect 1 +typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSNVPROC) (GLenum mode, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount); +typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSNVPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glMultiDrawArraysIndirectBindlessNV (GLenum mode, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount); +GLAPI void APIENTRY glMultiDrawElementsIndirectBindlessNV (GLenum mode, GLenum type, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount); +#endif +#endif /* GL_NV_bindless_multi_draw_indirect */ + +#ifndef GL_NV_bindless_multi_draw_indirect_count +#define GL_NV_bindless_multi_draw_indirect_count 1 +typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSCOUNTNVPROC) (GLenum mode, const void *indirect, GLsizei drawCount, GLsizei maxDrawCount, GLsizei stride, GLint vertexBufferCount); +typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSCOUNTNVPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei drawCount, GLsizei maxDrawCount, GLsizei stride, GLint vertexBufferCount); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glMultiDrawArraysIndirectBindlessCountNV (GLenum mode, const void *indirect, GLsizei drawCount, GLsizei maxDrawCount, GLsizei stride, GLint vertexBufferCount); +GLAPI void APIENTRY glMultiDrawElementsIndirectBindlessCountNV (GLenum mode, GLenum type, const void *indirect, GLsizei drawCount, GLsizei maxDrawCount, GLsizei stride, GLint vertexBufferCount); +#endif +#endif /* GL_NV_bindless_multi_draw_indirect_count */ + +#ifndef GL_NV_bindless_texture +#define GL_NV_bindless_texture 1 +typedef GLuint64 (APIENTRYP PFNGLGETTEXTUREHANDLENVPROC) (GLuint texture); +typedef GLuint64 (APIENTRYP PFNGLGETTEXTURESAMPLERHANDLENVPROC) (GLuint texture, GLuint sampler); +typedef void (APIENTRYP PFNGLMAKETEXTUREHANDLERESIDENTNVPROC) (GLuint64 handle); +typedef void (APIENTRYP PFNGLMAKETEXTUREHANDLENONRESIDENTNVPROC) (GLuint64 handle); +typedef GLuint64 (APIENTRYP PFNGLGETIMAGEHANDLENVPROC) (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format); +typedef void (APIENTRYP PFNGLMAKEIMAGEHANDLERESIDENTNVPROC) (GLuint64 handle, GLenum access); +typedef void (APIENTRYP PFNGLMAKEIMAGEHANDLENONRESIDENTNVPROC) (GLuint64 handle); +typedef void (APIENTRYP PFNGLUNIFORMHANDLEUI64NVPROC) (GLint location, GLuint64 value); +typedef void (APIENTRYP PFNGLUNIFORMHANDLEUI64VNVPROC) (GLint location, GLsizei count, const GLuint64 *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMHANDLEUI64NVPROC) (GLuint program, GLint location, GLuint64 value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMHANDLEUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *values); +typedef GLboolean (APIENTRYP PFNGLISTEXTUREHANDLERESIDENTNVPROC) (GLuint64 handle); +typedef GLboolean (APIENTRYP PFNGLISIMAGEHANDLERESIDENTNVPROC) (GLuint64 handle); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI GLuint64 APIENTRY glGetTextureHandleNV (GLuint texture); +GLAPI GLuint64 APIENTRY glGetTextureSamplerHandleNV (GLuint texture, GLuint sampler); +GLAPI void APIENTRY glMakeTextureHandleResidentNV (GLuint64 handle); +GLAPI void APIENTRY glMakeTextureHandleNonResidentNV (GLuint64 handle); +GLAPI GLuint64 APIENTRY glGetImageHandleNV (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format); +GLAPI void APIENTRY glMakeImageHandleResidentNV (GLuint64 handle, GLenum access); +GLAPI void APIENTRY glMakeImageHandleNonResidentNV (GLuint64 handle); +GLAPI void APIENTRY glUniformHandleui64NV (GLint location, GLuint64 value); +GLAPI void APIENTRY glUniformHandleui64vNV (GLint location, GLsizei count, const GLuint64 *value); +GLAPI void APIENTRY glProgramUniformHandleui64NV (GLuint program, GLint location, GLuint64 value); +GLAPI void APIENTRY glProgramUniformHandleui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64 *values); +GLAPI GLboolean APIENTRY glIsTextureHandleResidentNV (GLuint64 handle); +GLAPI GLboolean APIENTRY glIsImageHandleResidentNV (GLuint64 handle); +#endif +#endif /* GL_NV_bindless_texture */ + +#ifndef GL_NV_blend_equation_advanced +#define GL_NV_blend_equation_advanced 1 +#define GL_BLEND_OVERLAP_NV 0x9281 +#define GL_BLEND_PREMULTIPLIED_SRC_NV 0x9280 +#define GL_BLUE_NV 0x1905 +#define GL_COLORBURN_NV 0x929A +#define GL_COLORDODGE_NV 0x9299 +#define GL_CONJOINT_NV 0x9284 +#define GL_CONTRAST_NV 0x92A1 +#define GL_DARKEN_NV 0x9297 +#define GL_DIFFERENCE_NV 0x929E +#define GL_DISJOINT_NV 0x9283 +#define GL_DST_ATOP_NV 0x928F +#define GL_DST_IN_NV 0x928B +#define GL_DST_NV 0x9287 +#define GL_DST_OUT_NV 0x928D +#define GL_DST_OVER_NV 0x9289 +#define GL_EXCLUSION_NV 0x92A0 +#define GL_GREEN_NV 0x1904 +#define GL_HARDLIGHT_NV 0x929B +#define GL_HARDMIX_NV 0x92A9 +#define GL_HSL_COLOR_NV 0x92AF +#define GL_HSL_HUE_NV 0x92AD +#define GL_HSL_LUMINOSITY_NV 0x92B0 +#define GL_HSL_SATURATION_NV 0x92AE +#define GL_INVERT_OVG_NV 0x92B4 +#define GL_INVERT_RGB_NV 0x92A3 +#define GL_LIGHTEN_NV 0x9298 +#define GL_LINEARBURN_NV 0x92A5 +#define GL_LINEARDODGE_NV 0x92A4 +#define GL_LINEARLIGHT_NV 0x92A7 +#define GL_MINUS_CLAMPED_NV 0x92B3 +#define GL_MINUS_NV 0x929F +#define GL_MULTIPLY_NV 0x9294 +#define GL_OVERLAY_NV 0x9296 +#define GL_PINLIGHT_NV 0x92A8 +#define GL_PLUS_CLAMPED_ALPHA_NV 0x92B2 +#define GL_PLUS_CLAMPED_NV 0x92B1 +#define GL_PLUS_DARKER_NV 0x9292 +#define GL_PLUS_NV 0x9291 +#define GL_RED_NV 0x1903 +#define GL_SCREEN_NV 0x9295 +#define GL_SOFTLIGHT_NV 0x929C +#define GL_SRC_ATOP_NV 0x928E +#define GL_SRC_IN_NV 0x928A +#define GL_SRC_NV 0x9286 +#define GL_SRC_OUT_NV 0x928C +#define GL_SRC_OVER_NV 0x9288 +#define GL_UNCORRELATED_NV 0x9282 +#define GL_VIVIDLIGHT_NV 0x92A6 +#define GL_XOR_NV 0x1506 +typedef void (APIENTRYP PFNGLBLENDPARAMETERINVPROC) (GLenum pname, GLint value); +typedef void (APIENTRYP PFNGLBLENDBARRIERNVPROC) (void); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBlendParameteriNV (GLenum pname, GLint value); +GLAPI void APIENTRY glBlendBarrierNV (void); +#endif +#endif /* GL_NV_blend_equation_advanced */ + +#ifndef GL_NV_blend_equation_advanced_coherent +#define GL_NV_blend_equation_advanced_coherent 1 +#define GL_BLEND_ADVANCED_COHERENT_NV 0x9285 +#endif /* GL_NV_blend_equation_advanced_coherent */ + +#ifndef GL_NV_blend_minmax_factor +#define GL_NV_blend_minmax_factor 1 +#define GL_FACTOR_MIN_AMD 0x901C +#define GL_FACTOR_MAX_AMD 0x901D +#endif /* GL_NV_blend_minmax_factor */ + +#ifndef GL_NV_clip_space_w_scaling +#define GL_NV_clip_space_w_scaling 1 +#define GL_VIEWPORT_POSITION_W_SCALE_NV 0x937C +#define GL_VIEWPORT_POSITION_W_SCALE_X_COEFF_NV 0x937D +#define GL_VIEWPORT_POSITION_W_SCALE_Y_COEFF_NV 0x937E +typedef void (APIENTRYP PFNGLVIEWPORTPOSITIONWSCALENVPROC) (GLuint index, GLfloat xcoeff, GLfloat ycoeff); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glViewportPositionWScaleNV (GLuint index, GLfloat xcoeff, GLfloat ycoeff); +#endif +#endif /* GL_NV_clip_space_w_scaling */ + +#ifndef GL_NV_command_list +#define GL_NV_command_list 1 +#define GL_TERMINATE_SEQUENCE_COMMAND_NV 0x0000 +#define GL_NOP_COMMAND_NV 0x0001 +#define GL_DRAW_ELEMENTS_COMMAND_NV 0x0002 +#define GL_DRAW_ARRAYS_COMMAND_NV 0x0003 +#define GL_DRAW_ELEMENTS_STRIP_COMMAND_NV 0x0004 +#define GL_DRAW_ARRAYS_STRIP_COMMAND_NV 0x0005 +#define GL_DRAW_ELEMENTS_INSTANCED_COMMAND_NV 0x0006 +#define GL_DRAW_ARRAYS_INSTANCED_COMMAND_NV 0x0007 +#define GL_ELEMENT_ADDRESS_COMMAND_NV 0x0008 +#define GL_ATTRIBUTE_ADDRESS_COMMAND_NV 0x0009 +#define GL_UNIFORM_ADDRESS_COMMAND_NV 0x000A +#define GL_BLEND_COLOR_COMMAND_NV 0x000B +#define GL_STENCIL_REF_COMMAND_NV 0x000C +#define GL_LINE_WIDTH_COMMAND_NV 0x000D +#define GL_POLYGON_OFFSET_COMMAND_NV 0x000E +#define GL_ALPHA_REF_COMMAND_NV 0x000F +#define GL_VIEWPORT_COMMAND_NV 0x0010 +#define GL_SCISSOR_COMMAND_NV 0x0011 +#define GL_FRONT_FACE_COMMAND_NV 0x0012 +typedef void (APIENTRYP PFNGLCREATESTATESNVPROC) (GLsizei n, GLuint *states); +typedef void (APIENTRYP PFNGLDELETESTATESNVPROC) (GLsizei n, const GLuint *states); +typedef GLboolean (APIENTRYP PFNGLISSTATENVPROC) (GLuint state); +typedef void (APIENTRYP PFNGLSTATECAPTURENVPROC) (GLuint state, GLenum mode); +typedef GLuint (APIENTRYP PFNGLGETCOMMANDHEADERNVPROC) (GLenum tokenID, GLuint size); +typedef GLushort (APIENTRYP PFNGLGETSTAGEINDEXNVPROC) (GLenum shadertype); +typedef void (APIENTRYP PFNGLDRAWCOMMANDSNVPROC) (GLenum primitiveMode, GLuint buffer, const GLintptr *indirects, const GLsizei *sizes, GLuint count); +typedef void (APIENTRYP PFNGLDRAWCOMMANDSADDRESSNVPROC) (GLenum primitiveMode, const GLuint64 *indirects, const GLsizei *sizes, GLuint count); +typedef void (APIENTRYP PFNGLDRAWCOMMANDSSTATESNVPROC) (GLuint buffer, const GLintptr *indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count); +typedef void (APIENTRYP PFNGLDRAWCOMMANDSSTATESADDRESSNVPROC) (const GLuint64 *indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count); +typedef void (APIENTRYP PFNGLCREATECOMMANDLISTSNVPROC) (GLsizei n, GLuint *lists); +typedef void (APIENTRYP PFNGLDELETECOMMANDLISTSNVPROC) (GLsizei n, const GLuint *lists); +typedef GLboolean (APIENTRYP PFNGLISCOMMANDLISTNVPROC) (GLuint list); +typedef void (APIENTRYP PFNGLLISTDRAWCOMMANDSSTATESCLIENTNVPROC) (GLuint list, GLuint segment, const void **indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count); +typedef void (APIENTRYP PFNGLCOMMANDLISTSEGMENTSNVPROC) (GLuint list, GLuint segments); +typedef void (APIENTRYP PFNGLCOMPILECOMMANDLISTNVPROC) (GLuint list); +typedef void (APIENTRYP PFNGLCALLCOMMANDLISTNVPROC) (GLuint list); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glCreateStatesNV (GLsizei n, GLuint *states); +GLAPI void APIENTRY glDeleteStatesNV (GLsizei n, const GLuint *states); +GLAPI GLboolean APIENTRY glIsStateNV (GLuint state); +GLAPI void APIENTRY glStateCaptureNV (GLuint state, GLenum mode); +GLAPI GLuint APIENTRY glGetCommandHeaderNV (GLenum tokenID, GLuint size); +GLAPI GLushort APIENTRY glGetStageIndexNV (GLenum shadertype); +GLAPI void APIENTRY glDrawCommandsNV (GLenum primitiveMode, GLuint buffer, const GLintptr *indirects, const GLsizei *sizes, GLuint count); +GLAPI void APIENTRY glDrawCommandsAddressNV (GLenum primitiveMode, const GLuint64 *indirects, const GLsizei *sizes, GLuint count); +GLAPI void APIENTRY glDrawCommandsStatesNV (GLuint buffer, const GLintptr *indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count); +GLAPI void APIENTRY glDrawCommandsStatesAddressNV (const GLuint64 *indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count); +GLAPI void APIENTRY glCreateCommandListsNV (GLsizei n, GLuint *lists); +GLAPI void APIENTRY glDeleteCommandListsNV (GLsizei n, const GLuint *lists); +GLAPI GLboolean APIENTRY glIsCommandListNV (GLuint list); +GLAPI void APIENTRY glListDrawCommandsStatesClientNV (GLuint list, GLuint segment, const void **indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count); +GLAPI void APIENTRY glCommandListSegmentsNV (GLuint list, GLuint segments); +GLAPI void APIENTRY glCompileCommandListNV (GLuint list); +GLAPI void APIENTRY glCallCommandListNV (GLuint list); +#endif +#endif /* GL_NV_command_list */ + +#ifndef GL_NV_compute_shader_derivatives +#define GL_NV_compute_shader_derivatives 1 +#endif /* GL_NV_compute_shader_derivatives */ + +#ifndef GL_NV_conditional_render +#define GL_NV_conditional_render 1 +#define GL_QUERY_WAIT_NV 0x8E13 +#define GL_QUERY_NO_WAIT_NV 0x8E14 +#define GL_QUERY_BY_REGION_WAIT_NV 0x8E15 +#define GL_QUERY_BY_REGION_NO_WAIT_NV 0x8E16 +typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERNVPROC) (GLuint id, GLenum mode); +typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERNVPROC) (void); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBeginConditionalRenderNV (GLuint id, GLenum mode); +GLAPI void APIENTRY glEndConditionalRenderNV (void); +#endif +#endif /* GL_NV_conditional_render */ + +#ifndef GL_NV_conservative_raster +#define GL_NV_conservative_raster 1 +#define GL_CONSERVATIVE_RASTERIZATION_NV 0x9346 +#define GL_SUBPIXEL_PRECISION_BIAS_X_BITS_NV 0x9347 +#define GL_SUBPIXEL_PRECISION_BIAS_Y_BITS_NV 0x9348 +#define GL_MAX_SUBPIXEL_PRECISION_BIAS_BITS_NV 0x9349 +typedef void (APIENTRYP PFNGLSUBPIXELPRECISIONBIASNVPROC) (GLuint xbits, GLuint ybits); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glSubpixelPrecisionBiasNV (GLuint xbits, GLuint ybits); +#endif +#endif /* GL_NV_conservative_raster */ + +#ifndef GL_NV_conservative_raster_dilate +#define GL_NV_conservative_raster_dilate 1 +#define GL_CONSERVATIVE_RASTER_DILATE_NV 0x9379 +#define GL_CONSERVATIVE_RASTER_DILATE_RANGE_NV 0x937A +#define GL_CONSERVATIVE_RASTER_DILATE_GRANULARITY_NV 0x937B +typedef void (APIENTRYP PFNGLCONSERVATIVERASTERPARAMETERFNVPROC) (GLenum pname, GLfloat value); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glConservativeRasterParameterfNV (GLenum pname, GLfloat value); +#endif +#endif /* GL_NV_conservative_raster_dilate */ + +#ifndef GL_NV_conservative_raster_pre_snap +#define GL_NV_conservative_raster_pre_snap 1 +#define GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_NV 0x9550 +#endif /* GL_NV_conservative_raster_pre_snap */ + +#ifndef GL_NV_conservative_raster_pre_snap_triangles +#define GL_NV_conservative_raster_pre_snap_triangles 1 +#define GL_CONSERVATIVE_RASTER_MODE_NV 0x954D +#define GL_CONSERVATIVE_RASTER_MODE_POST_SNAP_NV 0x954E +#define GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_TRIANGLES_NV 0x954F +typedef void (APIENTRYP PFNGLCONSERVATIVERASTERPARAMETERINVPROC) (GLenum pname, GLint param); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glConservativeRasterParameteriNV (GLenum pname, GLint param); +#endif +#endif /* GL_NV_conservative_raster_pre_snap_triangles */ + +#ifndef GL_NV_conservative_raster_underestimation +#define GL_NV_conservative_raster_underestimation 1 +#endif /* GL_NV_conservative_raster_underestimation */ + +#ifndef GL_NV_draw_vulkan_image +#define GL_NV_draw_vulkan_image 1 +typedef void (APIENTRY *GLVULKANPROCNV)(void); +typedef void (APIENTRYP PFNGLDRAWVKIMAGENVPROC) (GLuint64 vkImage, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1); +typedef GLVULKANPROCNV (APIENTRYP PFNGLGETVKPROCADDRNVPROC) (const GLchar *name); +typedef void (APIENTRYP PFNGLWAITVKSEMAPHORENVPROC) (GLuint64 vkSemaphore); +typedef void (APIENTRYP PFNGLSIGNALVKSEMAPHORENVPROC) (GLuint64 vkSemaphore); +typedef void (APIENTRYP PFNGLSIGNALVKFENCENVPROC) (GLuint64 vkFence); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glDrawVkImageNV (GLuint64 vkImage, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1); +GLAPI GLVULKANPROCNV APIENTRY glGetVkProcAddrNV (const GLchar *name); +GLAPI void APIENTRY glWaitVkSemaphoreNV (GLuint64 vkSemaphore); +GLAPI void APIENTRY glSignalVkSemaphoreNV (GLuint64 vkSemaphore); +GLAPI void APIENTRY glSignalVkFenceNV (GLuint64 vkFence); +#endif +#endif /* GL_NV_draw_vulkan_image */ + +#ifndef GL_NV_fill_rectangle +#define GL_NV_fill_rectangle 1 +#define GL_FILL_RECTANGLE_NV 0x933C +#endif /* GL_NV_fill_rectangle */ + +#ifndef GL_NV_fragment_coverage_to_color +#define GL_NV_fragment_coverage_to_color 1 +#define GL_FRAGMENT_COVERAGE_TO_COLOR_NV 0x92DD +#define GL_FRAGMENT_COVERAGE_COLOR_NV 0x92DE +typedef void (APIENTRYP PFNGLFRAGMENTCOVERAGECOLORNVPROC) (GLuint color); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glFragmentCoverageColorNV (GLuint color); +#endif +#endif /* GL_NV_fragment_coverage_to_color */ + +#ifndef GL_NV_fragment_shader_barycentric +#define GL_NV_fragment_shader_barycentric 1 +#endif /* GL_NV_fragment_shader_barycentric */ + +#ifndef GL_NV_fragment_shader_interlock +#define GL_NV_fragment_shader_interlock 1 +#endif /* GL_NV_fragment_shader_interlock */ + +#ifndef GL_NV_framebuffer_mixed_samples +#define GL_NV_framebuffer_mixed_samples 1 +#define GL_COVERAGE_MODULATION_TABLE_NV 0x9331 +#define GL_COLOR_SAMPLES_NV 0x8E20 +#define GL_DEPTH_SAMPLES_NV 0x932D +#define GL_STENCIL_SAMPLES_NV 0x932E +#define GL_MIXED_DEPTH_SAMPLES_SUPPORTED_NV 0x932F +#define GL_MIXED_STENCIL_SAMPLES_SUPPORTED_NV 0x9330 +#define GL_COVERAGE_MODULATION_NV 0x9332 +#define GL_COVERAGE_MODULATION_TABLE_SIZE_NV 0x9333 +typedef void (APIENTRYP PFNGLCOVERAGEMODULATIONTABLENVPROC) (GLsizei n, const GLfloat *v); +typedef void (APIENTRYP PFNGLGETCOVERAGEMODULATIONTABLENVPROC) (GLsizei bufsize, GLfloat *v); +typedef void (APIENTRYP PFNGLCOVERAGEMODULATIONNVPROC) (GLenum components); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glCoverageModulationTableNV (GLsizei n, const GLfloat *v); +GLAPI void APIENTRY glGetCoverageModulationTableNV (GLsizei bufsize, GLfloat *v); +GLAPI void APIENTRY glCoverageModulationNV (GLenum components); +#endif +#endif /* GL_NV_framebuffer_mixed_samples */ + +#ifndef GL_NV_framebuffer_multisample_coverage +#define GL_NV_framebuffer_multisample_coverage 1 +#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB +#define GL_RENDERBUFFER_COLOR_SAMPLES_NV 0x8E10 +#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11 +#define GL_MULTISAMPLE_COVERAGE_MODES_NV 0x8E12 +typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glRenderbufferStorageMultisampleCoverageNV (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height); +#endif +#endif /* GL_NV_framebuffer_multisample_coverage */ + +#ifndef GL_NV_geometry_shader_passthrough +#define GL_NV_geometry_shader_passthrough 1 +#endif /* GL_NV_geometry_shader_passthrough */ + +#ifndef GL_NV_gpu_shader5 +#define GL_NV_gpu_shader5 1 +typedef khronos_int64_t GLint64EXT; +#define GL_INT64_NV 0x140E +#define GL_UNSIGNED_INT64_NV 0x140F +#define GL_INT8_NV 0x8FE0 +#define GL_INT8_VEC2_NV 0x8FE1 +#define GL_INT8_VEC3_NV 0x8FE2 +#define GL_INT8_VEC4_NV 0x8FE3 +#define GL_INT16_NV 0x8FE4 +#define GL_INT16_VEC2_NV 0x8FE5 +#define GL_INT16_VEC3_NV 0x8FE6 +#define GL_INT16_VEC4_NV 0x8FE7 +#define GL_INT64_VEC2_NV 0x8FE9 +#define GL_INT64_VEC3_NV 0x8FEA +#define GL_INT64_VEC4_NV 0x8FEB +#define GL_UNSIGNED_INT8_NV 0x8FEC +#define GL_UNSIGNED_INT8_VEC2_NV 0x8FED +#define GL_UNSIGNED_INT8_VEC3_NV 0x8FEE +#define GL_UNSIGNED_INT8_VEC4_NV 0x8FEF +#define GL_UNSIGNED_INT16_NV 0x8FF0 +#define GL_UNSIGNED_INT16_VEC2_NV 0x8FF1 +#define GL_UNSIGNED_INT16_VEC3_NV 0x8FF2 +#define GL_UNSIGNED_INT16_VEC4_NV 0x8FF3 +#define GL_UNSIGNED_INT64_VEC2_NV 0x8FF5 +#define GL_UNSIGNED_INT64_VEC3_NV 0x8FF6 +#define GL_UNSIGNED_INT64_VEC4_NV 0x8FF7 +#define GL_FLOAT16_NV 0x8FF8 +#define GL_FLOAT16_VEC2_NV 0x8FF9 +#define GL_FLOAT16_VEC3_NV 0x8FFA +#define GL_FLOAT16_VEC4_NV 0x8FFB +typedef void (APIENTRYP PFNGLUNIFORM1I64NVPROC) (GLint location, GLint64EXT x); +typedef void (APIENTRYP PFNGLUNIFORM2I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y); +typedef void (APIENTRYP PFNGLUNIFORM3I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z); +typedef void (APIENTRYP PFNGLUNIFORM4I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); +typedef void (APIENTRYP PFNGLUNIFORM1I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value); +typedef void (APIENTRYP PFNGLUNIFORM2I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value); +typedef void (APIENTRYP PFNGLUNIFORM3I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value); +typedef void (APIENTRYP PFNGLUNIFORM4I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value); +typedef void (APIENTRYP PFNGLUNIFORM1UI64NVPROC) (GLint location, GLuint64EXT x); +typedef void (APIENTRYP PFNGLUNIFORM2UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y); +typedef void (APIENTRYP PFNGLUNIFORM3UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); +typedef void (APIENTRYP PFNGLUNIFORM4UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); +typedef void (APIENTRYP PFNGLUNIFORM1UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value); +typedef void (APIENTRYP PFNGLUNIFORM2UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value); +typedef void (APIENTRYP PFNGLUNIFORM3UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value); +typedef void (APIENTRYP PFNGLUNIFORM4UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value); +typedef void (APIENTRYP PFNGLGETUNIFORMI64VNVPROC) (GLuint program, GLint location, GLint64EXT *params); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64NVPROC) (GLuint program, GLint location, GLint64EXT x); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glUniform1i64NV (GLint location, GLint64EXT x); +GLAPI void APIENTRY glUniform2i64NV (GLint location, GLint64EXT x, GLint64EXT y); +GLAPI void APIENTRY glUniform3i64NV (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z); +GLAPI void APIENTRY glUniform4i64NV (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); +GLAPI void APIENTRY glUniform1i64vNV (GLint location, GLsizei count, const GLint64EXT *value); +GLAPI void APIENTRY glUniform2i64vNV (GLint location, GLsizei count, const GLint64EXT *value); +GLAPI void APIENTRY glUniform3i64vNV (GLint location, GLsizei count, const GLint64EXT *value); +GLAPI void APIENTRY glUniform4i64vNV (GLint location, GLsizei count, const GLint64EXT *value); +GLAPI void APIENTRY glUniform1ui64NV (GLint location, GLuint64EXT x); +GLAPI void APIENTRY glUniform2ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y); +GLAPI void APIENTRY glUniform3ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); +GLAPI void APIENTRY glUniform4ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); +GLAPI void APIENTRY glUniform1ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value); +GLAPI void APIENTRY glUniform2ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value); +GLAPI void APIENTRY glUniform3ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value); +GLAPI void APIENTRY glUniform4ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value); +GLAPI void APIENTRY glGetUniformi64vNV (GLuint program, GLint location, GLint64EXT *params); +GLAPI void APIENTRY glProgramUniform1i64NV (GLuint program, GLint location, GLint64EXT x); +GLAPI void APIENTRY glProgramUniform2i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y); +GLAPI void APIENTRY glProgramUniform3i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z); +GLAPI void APIENTRY glProgramUniform4i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); +GLAPI void APIENTRY glProgramUniform1i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); +GLAPI void APIENTRY glProgramUniform2i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); +GLAPI void APIENTRY glProgramUniform3i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); +GLAPI void APIENTRY glProgramUniform4i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); +GLAPI void APIENTRY glProgramUniform1ui64NV (GLuint program, GLint location, GLuint64EXT x); +GLAPI void APIENTRY glProgramUniform2ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y); +GLAPI void APIENTRY glProgramUniform3ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); +GLAPI void APIENTRY glProgramUniform4ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); +GLAPI void APIENTRY glProgramUniform1ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); +GLAPI void APIENTRY glProgramUniform2ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); +GLAPI void APIENTRY glProgramUniform3ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); +GLAPI void APIENTRY glProgramUniform4ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); +#endif +#endif /* GL_NV_gpu_shader5 */ + +#ifndef GL_NV_internalformat_sample_query +#define GL_NV_internalformat_sample_query 1 +#define GL_MULTISAMPLES_NV 0x9371 +#define GL_SUPERSAMPLE_SCALE_X_NV 0x9372 +#define GL_SUPERSAMPLE_SCALE_Y_NV 0x9373 +#define GL_CONFORMANT_NV 0x9374 +typedef void (APIENTRYP PFNGLGETINTERNALFORMATSAMPLEIVNVPROC) (GLenum target, GLenum internalformat, GLsizei samples, GLenum pname, GLsizei bufSize, GLint *params); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glGetInternalformatSampleivNV (GLenum target, GLenum internalformat, GLsizei samples, GLenum pname, GLsizei bufSize, GLint *params); +#endif +#endif /* GL_NV_internalformat_sample_query */ + +#ifndef GL_NV_memory_attachment +#define GL_NV_memory_attachment 1 +#define GL_ATTACHED_MEMORY_OBJECT_NV 0x95A4 +#define GL_ATTACHED_MEMORY_OFFSET_NV 0x95A5 +#define GL_MEMORY_ATTACHABLE_ALIGNMENT_NV 0x95A6 +#define GL_MEMORY_ATTACHABLE_SIZE_NV 0x95A7 +#define GL_MEMORY_ATTACHABLE_NV 0x95A8 +#define GL_DETACHED_MEMORY_INCARNATION_NV 0x95A9 +#define GL_DETACHED_TEXTURES_NV 0x95AA +#define GL_DETACHED_BUFFERS_NV 0x95AB +#define GL_MAX_DETACHED_TEXTURES_NV 0x95AC +#define GL_MAX_DETACHED_BUFFERS_NV 0x95AD +typedef void (APIENTRYP PFNGLGETMEMORYOBJECTDETACHEDRESOURCESUIVNVPROC) (GLuint memory, GLenum pname, GLint first, GLsizei count, GLuint *params); +typedef void (APIENTRYP PFNGLRESETMEMORYOBJECTPARAMETERNVPROC) (GLuint memory, GLenum pname); +typedef void (APIENTRYP PFNGLTEXATTACHMEMORYNVPROC) (GLenum target, GLuint memory, GLuint64 offset); +typedef void (APIENTRYP PFNGLBUFFERATTACHMEMORYNVPROC) (GLenum target, GLuint memory, GLuint64 offset); +typedef void (APIENTRYP PFNGLTEXTUREATTACHMEMORYNVPROC) (GLuint texture, GLuint memory, GLuint64 offset); +typedef void (APIENTRYP PFNGLNAMEDBUFFERATTACHMEMORYNVPROC) (GLuint buffer, GLuint memory, GLuint64 offset); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glGetMemoryObjectDetachedResourcesuivNV (GLuint memory, GLenum pname, GLint first, GLsizei count, GLuint *params); +GLAPI void APIENTRY glResetMemoryObjectParameterNV (GLuint memory, GLenum pname); +GLAPI void APIENTRY glTexAttachMemoryNV (GLenum target, GLuint memory, GLuint64 offset); +GLAPI void APIENTRY glBufferAttachMemoryNV (GLenum target, GLuint memory, GLuint64 offset); +GLAPI void APIENTRY glTextureAttachMemoryNV (GLuint texture, GLuint memory, GLuint64 offset); +GLAPI void APIENTRY glNamedBufferAttachMemoryNV (GLuint buffer, GLuint memory, GLuint64 offset); +#endif +#endif /* GL_NV_memory_attachment */ + +#ifndef GL_NV_mesh_shader +#define GL_NV_mesh_shader 1 +#define GL_MESH_SHADER_NV 0x9559 +#define GL_TASK_SHADER_NV 0x955A +#define GL_MAX_MESH_UNIFORM_BLOCKS_NV 0x8E60 +#define GL_MAX_MESH_TEXTURE_IMAGE_UNITS_NV 0x8E61 +#define GL_MAX_MESH_IMAGE_UNIFORMS_NV 0x8E62 +#define GL_MAX_MESH_UNIFORM_COMPONENTS_NV 0x8E63 +#define GL_MAX_MESH_ATOMIC_COUNTER_BUFFERS_NV 0x8E64 +#define GL_MAX_MESH_ATOMIC_COUNTERS_NV 0x8E65 +#define GL_MAX_MESH_SHADER_STORAGE_BLOCKS_NV 0x8E66 +#define GL_MAX_COMBINED_MESH_UNIFORM_COMPONENTS_NV 0x8E67 +#define GL_MAX_TASK_UNIFORM_BLOCKS_NV 0x8E68 +#define GL_MAX_TASK_TEXTURE_IMAGE_UNITS_NV 0x8E69 +#define GL_MAX_TASK_IMAGE_UNIFORMS_NV 0x8E6A +#define GL_MAX_TASK_UNIFORM_COMPONENTS_NV 0x8E6B +#define GL_MAX_TASK_ATOMIC_COUNTER_BUFFERS_NV 0x8E6C +#define GL_MAX_TASK_ATOMIC_COUNTERS_NV 0x8E6D +#define GL_MAX_TASK_SHADER_STORAGE_BLOCKS_NV 0x8E6E +#define GL_MAX_COMBINED_TASK_UNIFORM_COMPONENTS_NV 0x8E6F +#define GL_MAX_MESH_WORK_GROUP_INVOCATIONS_NV 0x95A2 +#define GL_MAX_TASK_WORK_GROUP_INVOCATIONS_NV 0x95A3 +#define GL_MAX_MESH_TOTAL_MEMORY_SIZE_NV 0x9536 +#define GL_MAX_TASK_TOTAL_MEMORY_SIZE_NV 0x9537 +#define GL_MAX_MESH_OUTPUT_VERTICES_NV 0x9538 +#define GL_MAX_MESH_OUTPUT_PRIMITIVES_NV 0x9539 +#define GL_MAX_TASK_OUTPUT_COUNT_NV 0x953A +#define GL_MAX_DRAW_MESH_TASKS_COUNT_NV 0x953D +#define GL_MAX_MESH_VIEWS_NV 0x9557 +#define GL_MESH_OUTPUT_PER_VERTEX_GRANULARITY_NV 0x92DF +#define GL_MESH_OUTPUT_PER_PRIMITIVE_GRANULARITY_NV 0x9543 +#define GL_MAX_MESH_WORK_GROUP_SIZE_NV 0x953B +#define GL_MAX_TASK_WORK_GROUP_SIZE_NV 0x953C +#define GL_MESH_WORK_GROUP_SIZE_NV 0x953E +#define GL_TASK_WORK_GROUP_SIZE_NV 0x953F +#define GL_MESH_VERTICES_OUT_NV 0x9579 +#define GL_MESH_PRIMITIVES_OUT_NV 0x957A +#define GL_MESH_OUTPUT_TYPE_NV 0x957B +#define GL_UNIFORM_BLOCK_REFERENCED_BY_MESH_SHADER_NV 0x959C +#define GL_UNIFORM_BLOCK_REFERENCED_BY_TASK_SHADER_NV 0x959D +#define GL_REFERENCED_BY_MESH_SHADER_NV 0x95A0 +#define GL_REFERENCED_BY_TASK_SHADER_NV 0x95A1 +#define GL_MESH_SHADER_BIT_NV 0x00000040 +#define GL_TASK_SHADER_BIT_NV 0x00000080 +#define GL_MESH_SUBROUTINE_NV 0x957C +#define GL_TASK_SUBROUTINE_NV 0x957D +#define GL_MESH_SUBROUTINE_UNIFORM_NV 0x957E +#define GL_TASK_SUBROUTINE_UNIFORM_NV 0x957F +#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_MESH_SHADER_NV 0x959E +#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TASK_SHADER_NV 0x959F +typedef void (APIENTRYP PFNGLDRAWMESHTASKSNVPROC) (GLuint first, GLuint count); +typedef void (APIENTRYP PFNGLDRAWMESHTASKSINDIRECTNVPROC) (GLintptr indirect); +typedef void (APIENTRYP PFNGLMULTIDRAWMESHTASKSINDIRECTNVPROC) (GLintptr indirect, GLsizei drawcount, GLsizei stride); +typedef void (APIENTRYP PFNGLMULTIDRAWMESHTASKSINDIRECTCOUNTNVPROC) (GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glDrawMeshTasksNV (GLuint first, GLuint count); +GLAPI void APIENTRY glDrawMeshTasksIndirectNV (GLintptr indirect); +GLAPI void APIENTRY glMultiDrawMeshTasksIndirectNV (GLintptr indirect, GLsizei drawcount, GLsizei stride); +GLAPI void APIENTRY glMultiDrawMeshTasksIndirectCountNV (GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); +#endif +#endif /* GL_NV_mesh_shader */ + +#ifndef GL_NV_path_rendering +#define GL_NV_path_rendering 1 +#define GL_PATH_FORMAT_SVG_NV 0x9070 +#define GL_PATH_FORMAT_PS_NV 0x9071 +#define GL_STANDARD_FONT_NAME_NV 0x9072 +#define GL_SYSTEM_FONT_NAME_NV 0x9073 +#define GL_FILE_NAME_NV 0x9074 +#define GL_PATH_STROKE_WIDTH_NV 0x9075 +#define GL_PATH_END_CAPS_NV 0x9076 +#define GL_PATH_INITIAL_END_CAP_NV 0x9077 +#define GL_PATH_TERMINAL_END_CAP_NV 0x9078 +#define GL_PATH_JOIN_STYLE_NV 0x9079 +#define GL_PATH_MITER_LIMIT_NV 0x907A +#define GL_PATH_DASH_CAPS_NV 0x907B +#define GL_PATH_INITIAL_DASH_CAP_NV 0x907C +#define GL_PATH_TERMINAL_DASH_CAP_NV 0x907D +#define GL_PATH_DASH_OFFSET_NV 0x907E +#define GL_PATH_CLIENT_LENGTH_NV 0x907F +#define GL_PATH_FILL_MODE_NV 0x9080 +#define GL_PATH_FILL_MASK_NV 0x9081 +#define GL_PATH_FILL_COVER_MODE_NV 0x9082 +#define GL_PATH_STROKE_COVER_MODE_NV 0x9083 +#define GL_PATH_STROKE_MASK_NV 0x9084 +#define GL_COUNT_UP_NV 0x9088 +#define GL_COUNT_DOWN_NV 0x9089 +#define GL_PATH_OBJECT_BOUNDING_BOX_NV 0x908A +#define GL_CONVEX_HULL_NV 0x908B +#define GL_BOUNDING_BOX_NV 0x908D +#define GL_TRANSLATE_X_NV 0x908E +#define GL_TRANSLATE_Y_NV 0x908F +#define GL_TRANSLATE_2D_NV 0x9090 +#define GL_TRANSLATE_3D_NV 0x9091 +#define GL_AFFINE_2D_NV 0x9092 +#define GL_AFFINE_3D_NV 0x9094 +#define GL_TRANSPOSE_AFFINE_2D_NV 0x9096 +#define GL_TRANSPOSE_AFFINE_3D_NV 0x9098 +#define GL_UTF8_NV 0x909A +#define GL_UTF16_NV 0x909B +#define GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV 0x909C +#define GL_PATH_COMMAND_COUNT_NV 0x909D +#define GL_PATH_COORD_COUNT_NV 0x909E +#define GL_PATH_DASH_ARRAY_COUNT_NV 0x909F +#define GL_PATH_COMPUTED_LENGTH_NV 0x90A0 +#define GL_PATH_FILL_BOUNDING_BOX_NV 0x90A1 +#define GL_PATH_STROKE_BOUNDING_BOX_NV 0x90A2 +#define GL_SQUARE_NV 0x90A3 +#define GL_ROUND_NV 0x90A4 +#define GL_TRIANGULAR_NV 0x90A5 +#define GL_BEVEL_NV 0x90A6 +#define GL_MITER_REVERT_NV 0x90A7 +#define GL_MITER_TRUNCATE_NV 0x90A8 +#define GL_SKIP_MISSING_GLYPH_NV 0x90A9 +#define GL_USE_MISSING_GLYPH_NV 0x90AA +#define GL_PATH_ERROR_POSITION_NV 0x90AB +#define GL_ACCUM_ADJACENT_PAIRS_NV 0x90AD +#define GL_ADJACENT_PAIRS_NV 0x90AE +#define GL_FIRST_TO_REST_NV 0x90AF +#define GL_PATH_GEN_MODE_NV 0x90B0 +#define GL_PATH_GEN_COEFF_NV 0x90B1 +#define GL_PATH_GEN_COMPONENTS_NV 0x90B3 +#define GL_PATH_STENCIL_FUNC_NV 0x90B7 +#define GL_PATH_STENCIL_REF_NV 0x90B8 +#define GL_PATH_STENCIL_VALUE_MASK_NV 0x90B9 +#define GL_PATH_STENCIL_DEPTH_OFFSET_FACTOR_NV 0x90BD +#define GL_PATH_STENCIL_DEPTH_OFFSET_UNITS_NV 0x90BE +#define GL_PATH_COVER_DEPTH_FUNC_NV 0x90BF +#define GL_PATH_DASH_OFFSET_RESET_NV 0x90B4 +#define GL_MOVE_TO_RESETS_NV 0x90B5 +#define GL_MOVE_TO_CONTINUES_NV 0x90B6 +#define GL_CLOSE_PATH_NV 0x00 +#define GL_MOVE_TO_NV 0x02 +#define GL_RELATIVE_MOVE_TO_NV 0x03 +#define GL_LINE_TO_NV 0x04 +#define GL_RELATIVE_LINE_TO_NV 0x05 +#define GL_HORIZONTAL_LINE_TO_NV 0x06 +#define GL_RELATIVE_HORIZONTAL_LINE_TO_NV 0x07 +#define GL_VERTICAL_LINE_TO_NV 0x08 +#define GL_RELATIVE_VERTICAL_LINE_TO_NV 0x09 +#define GL_QUADRATIC_CURVE_TO_NV 0x0A +#define GL_RELATIVE_QUADRATIC_CURVE_TO_NV 0x0B +#define GL_CUBIC_CURVE_TO_NV 0x0C +#define GL_RELATIVE_CUBIC_CURVE_TO_NV 0x0D +#define GL_SMOOTH_QUADRATIC_CURVE_TO_NV 0x0E +#define GL_RELATIVE_SMOOTH_QUADRATIC_CURVE_TO_NV 0x0F +#define GL_SMOOTH_CUBIC_CURVE_TO_NV 0x10 +#define GL_RELATIVE_SMOOTH_CUBIC_CURVE_TO_NV 0x11 +#define GL_SMALL_CCW_ARC_TO_NV 0x12 +#define GL_RELATIVE_SMALL_CCW_ARC_TO_NV 0x13 +#define GL_SMALL_CW_ARC_TO_NV 0x14 +#define GL_RELATIVE_SMALL_CW_ARC_TO_NV 0x15 +#define GL_LARGE_CCW_ARC_TO_NV 0x16 +#define GL_RELATIVE_LARGE_CCW_ARC_TO_NV 0x17 +#define GL_LARGE_CW_ARC_TO_NV 0x18 +#define GL_RELATIVE_LARGE_CW_ARC_TO_NV 0x19 +#define GL_RESTART_PATH_NV 0xF0 +#define GL_DUP_FIRST_CUBIC_CURVE_TO_NV 0xF2 +#define GL_DUP_LAST_CUBIC_CURVE_TO_NV 0xF4 +#define GL_RECT_NV 0xF6 +#define GL_CIRCULAR_CCW_ARC_TO_NV 0xF8 +#define GL_CIRCULAR_CW_ARC_TO_NV 0xFA +#define GL_CIRCULAR_TANGENT_ARC_TO_NV 0xFC +#define GL_ARC_TO_NV 0xFE +#define GL_RELATIVE_ARC_TO_NV 0xFF +#define GL_BOLD_BIT_NV 0x01 +#define GL_ITALIC_BIT_NV 0x02 +#define GL_GLYPH_WIDTH_BIT_NV 0x01 +#define GL_GLYPH_HEIGHT_BIT_NV 0x02 +#define GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV 0x04 +#define GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV 0x08 +#define GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV 0x10 +#define GL_GLYPH_VERTICAL_BEARING_X_BIT_NV 0x20 +#define GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV 0x40 +#define GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV 0x80 +#define GL_GLYPH_HAS_KERNING_BIT_NV 0x100 +#define GL_FONT_X_MIN_BOUNDS_BIT_NV 0x00010000 +#define GL_FONT_Y_MIN_BOUNDS_BIT_NV 0x00020000 +#define GL_FONT_X_MAX_BOUNDS_BIT_NV 0x00040000 +#define GL_FONT_Y_MAX_BOUNDS_BIT_NV 0x00080000 +#define GL_FONT_UNITS_PER_EM_BIT_NV 0x00100000 +#define GL_FONT_ASCENDER_BIT_NV 0x00200000 +#define GL_FONT_DESCENDER_BIT_NV 0x00400000 +#define GL_FONT_HEIGHT_BIT_NV 0x00800000 +#define GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV 0x01000000 +#define GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV 0x02000000 +#define GL_FONT_UNDERLINE_POSITION_BIT_NV 0x04000000 +#define GL_FONT_UNDERLINE_THICKNESS_BIT_NV 0x08000000 +#define GL_FONT_HAS_KERNING_BIT_NV 0x10000000 +#define GL_ROUNDED_RECT_NV 0xE8 +#define GL_RELATIVE_ROUNDED_RECT_NV 0xE9 +#define GL_ROUNDED_RECT2_NV 0xEA +#define GL_RELATIVE_ROUNDED_RECT2_NV 0xEB +#define GL_ROUNDED_RECT4_NV 0xEC +#define GL_RELATIVE_ROUNDED_RECT4_NV 0xED +#define GL_ROUNDED_RECT8_NV 0xEE +#define GL_RELATIVE_ROUNDED_RECT8_NV 0xEF +#define GL_RELATIVE_RECT_NV 0xF7 +#define GL_FONT_GLYPHS_AVAILABLE_NV 0x9368 +#define GL_FONT_TARGET_UNAVAILABLE_NV 0x9369 +#define GL_FONT_UNAVAILABLE_NV 0x936A +#define GL_FONT_UNINTELLIGIBLE_NV 0x936B +#define GL_CONIC_CURVE_TO_NV 0x1A +#define GL_RELATIVE_CONIC_CURVE_TO_NV 0x1B +#define GL_FONT_NUM_GLYPH_INDICES_BIT_NV 0x20000000 +#define GL_STANDARD_FONT_FORMAT_NV 0x936C +#define GL_PATH_PROJECTION_NV 0x1701 +#define GL_PATH_MODELVIEW_NV 0x1700 +#define GL_PATH_MODELVIEW_STACK_DEPTH_NV 0x0BA3 +#define GL_PATH_MODELVIEW_MATRIX_NV 0x0BA6 +#define GL_PATH_MAX_MODELVIEW_STACK_DEPTH_NV 0x0D36 +#define GL_PATH_TRANSPOSE_MODELVIEW_MATRIX_NV 0x84E3 +#define GL_PATH_PROJECTION_STACK_DEPTH_NV 0x0BA4 +#define GL_PATH_PROJECTION_MATRIX_NV 0x0BA7 +#define GL_PATH_MAX_PROJECTION_STACK_DEPTH_NV 0x0D38 +#define GL_PATH_TRANSPOSE_PROJECTION_MATRIX_NV 0x84E4 +#define GL_FRAGMENT_INPUT_NV 0x936D +typedef GLuint (APIENTRYP PFNGLGENPATHSNVPROC) (GLsizei range); +typedef void (APIENTRYP PFNGLDELETEPATHSNVPROC) (GLuint path, GLsizei range); +typedef GLboolean (APIENTRYP PFNGLISPATHNVPROC) (GLuint path); +typedef void (APIENTRYP PFNGLPATHCOMMANDSNVPROC) (GLuint path, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const void *coords); +typedef void (APIENTRYP PFNGLPATHCOORDSNVPROC) (GLuint path, GLsizei numCoords, GLenum coordType, const void *coords); +typedef void (APIENTRYP PFNGLPATHSUBCOMMANDSNVPROC) (GLuint path, GLsizei commandStart, GLsizei commandsToDelete, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const void *coords); +typedef void (APIENTRYP PFNGLPATHSUBCOORDSNVPROC) (GLuint path, GLsizei coordStart, GLsizei numCoords, GLenum coordType, const void *coords); +typedef void (APIENTRYP PFNGLPATHSTRINGNVPROC) (GLuint path, GLenum format, GLsizei length, const void *pathString); +typedef void (APIENTRYP PFNGLPATHGLYPHSNVPROC) (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLsizei numGlyphs, GLenum type, const void *charcodes, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale); +typedef void (APIENTRYP PFNGLPATHGLYPHRANGENVPROC) (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyph, GLsizei numGlyphs, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale); +typedef void (APIENTRYP PFNGLWEIGHTPATHSNVPROC) (GLuint resultPath, GLsizei numPaths, const GLuint *paths, const GLfloat *weights); +typedef void (APIENTRYP PFNGLCOPYPATHNVPROC) (GLuint resultPath, GLuint srcPath); +typedef void (APIENTRYP PFNGLINTERPOLATEPATHSNVPROC) (GLuint resultPath, GLuint pathA, GLuint pathB, GLfloat weight); +typedef void (APIENTRYP PFNGLTRANSFORMPATHNVPROC) (GLuint resultPath, GLuint srcPath, GLenum transformType, const GLfloat *transformValues); +typedef void (APIENTRYP PFNGLPATHPARAMETERIVNVPROC) (GLuint path, GLenum pname, const GLint *value); +typedef void (APIENTRYP PFNGLPATHPARAMETERINVPROC) (GLuint path, GLenum pname, GLint value); +typedef void (APIENTRYP PFNGLPATHPARAMETERFVNVPROC) (GLuint path, GLenum pname, const GLfloat *value); +typedef void (APIENTRYP PFNGLPATHPARAMETERFNVPROC) (GLuint path, GLenum pname, GLfloat value); +typedef void (APIENTRYP PFNGLPATHDASHARRAYNVPROC) (GLuint path, GLsizei dashCount, const GLfloat *dashArray); +typedef void (APIENTRYP PFNGLPATHSTENCILFUNCNVPROC) (GLenum func, GLint ref, GLuint mask); +typedef void (APIENTRYP PFNGLPATHSTENCILDEPTHOFFSETNVPROC) (GLfloat factor, GLfloat units); +typedef void (APIENTRYP PFNGLSTENCILFILLPATHNVPROC) (GLuint path, GLenum fillMode, GLuint mask); +typedef void (APIENTRYP PFNGLSTENCILSTROKEPATHNVPROC) (GLuint path, GLint reference, GLuint mask); +typedef void (APIENTRYP PFNGLSTENCILFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum transformType, const GLfloat *transformValues); +typedef void (APIENTRYP PFNGLSTENCILSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum transformType, const GLfloat *transformValues); +typedef void (APIENTRYP PFNGLPATHCOVERDEPTHFUNCNVPROC) (GLenum func); +typedef void (APIENTRYP PFNGLCOVERFILLPATHNVPROC) (GLuint path, GLenum coverMode); +typedef void (APIENTRYP PFNGLCOVERSTROKEPATHNVPROC) (GLuint path, GLenum coverMode); +typedef void (APIENTRYP PFNGLCOVERFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues); +typedef void (APIENTRYP PFNGLCOVERSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues); +typedef void (APIENTRYP PFNGLGETPATHPARAMETERIVNVPROC) (GLuint path, GLenum pname, GLint *value); +typedef void (APIENTRYP PFNGLGETPATHPARAMETERFVNVPROC) (GLuint path, GLenum pname, GLfloat *value); +typedef void (APIENTRYP PFNGLGETPATHCOMMANDSNVPROC) (GLuint path, GLubyte *commands); +typedef void (APIENTRYP PFNGLGETPATHCOORDSNVPROC) (GLuint path, GLfloat *coords); +typedef void (APIENTRYP PFNGLGETPATHDASHARRAYNVPROC) (GLuint path, GLfloat *dashArray); +typedef void (APIENTRYP PFNGLGETPATHMETRICSNVPROC) (GLbitfield metricQueryMask, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLsizei stride, GLfloat *metrics); +typedef void (APIENTRYP PFNGLGETPATHMETRICRANGENVPROC) (GLbitfield metricQueryMask, GLuint firstPathName, GLsizei numPaths, GLsizei stride, GLfloat *metrics); +typedef void (APIENTRYP PFNGLGETPATHSPACINGNVPROC) (GLenum pathListMode, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLfloat advanceScale, GLfloat kerningScale, GLenum transformType, GLfloat *returnedSpacing); +typedef GLboolean (APIENTRYP PFNGLISPOINTINFILLPATHNVPROC) (GLuint path, GLuint mask, GLfloat x, GLfloat y); +typedef GLboolean (APIENTRYP PFNGLISPOINTINSTROKEPATHNVPROC) (GLuint path, GLfloat x, GLfloat y); +typedef GLfloat (APIENTRYP PFNGLGETPATHLENGTHNVPROC) (GLuint path, GLsizei startSegment, GLsizei numSegments); +typedef GLboolean (APIENTRYP PFNGLPOINTALONGPATHNVPROC) (GLuint path, GLsizei startSegment, GLsizei numSegments, GLfloat distance, GLfloat *x, GLfloat *y, GLfloat *tangentX, GLfloat *tangentY); +typedef void (APIENTRYP PFNGLMATRIXLOAD3X2FNVPROC) (GLenum matrixMode, const GLfloat *m); +typedef void (APIENTRYP PFNGLMATRIXLOAD3X3FNVPROC) (GLenum matrixMode, const GLfloat *m); +typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSE3X3FNVPROC) (GLenum matrixMode, const GLfloat *m); +typedef void (APIENTRYP PFNGLMATRIXMULT3X2FNVPROC) (GLenum matrixMode, const GLfloat *m); +typedef void (APIENTRYP PFNGLMATRIXMULT3X3FNVPROC) (GLenum matrixMode, const GLfloat *m); +typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSE3X3FNVPROC) (GLenum matrixMode, const GLfloat *m); +typedef void (APIENTRYP PFNGLSTENCILTHENCOVERFILLPATHNVPROC) (GLuint path, GLenum fillMode, GLuint mask, GLenum coverMode); +typedef void (APIENTRYP PFNGLSTENCILTHENCOVERSTROKEPATHNVPROC) (GLuint path, GLint reference, GLuint mask, GLenum coverMode); +typedef void (APIENTRYP PFNGLSTENCILTHENCOVERFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues); +typedef void (APIENTRYP PFNGLSTENCILTHENCOVERSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues); +typedef GLenum (APIENTRYP PFNGLPATHGLYPHINDEXRANGENVPROC) (GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint pathParameterTemplate, GLfloat emScale, GLuint baseAndCount[2]); +typedef GLenum (APIENTRYP PFNGLPATHGLYPHINDEXARRAYNVPROC) (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale); +typedef GLenum (APIENTRYP PFNGLPATHMEMORYGLYPHINDEXARRAYNVPROC) (GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void *fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale); +typedef void (APIENTRYP PFNGLPROGRAMPATHFRAGMENTINPUTGENNVPROC) (GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat *coeffs); +typedef void (APIENTRYP PFNGLGETPROGRAMRESOURCEFVNVPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLfloat *params); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI GLuint APIENTRY glGenPathsNV (GLsizei range); +GLAPI void APIENTRY glDeletePathsNV (GLuint path, GLsizei range); +GLAPI GLboolean APIENTRY glIsPathNV (GLuint path); +GLAPI void APIENTRY glPathCommandsNV (GLuint path, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const void *coords); +GLAPI void APIENTRY glPathCoordsNV (GLuint path, GLsizei numCoords, GLenum coordType, const void *coords); +GLAPI void APIENTRY glPathSubCommandsNV (GLuint path, GLsizei commandStart, GLsizei commandsToDelete, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const void *coords); +GLAPI void APIENTRY glPathSubCoordsNV (GLuint path, GLsizei coordStart, GLsizei numCoords, GLenum coordType, const void *coords); +GLAPI void APIENTRY glPathStringNV (GLuint path, GLenum format, GLsizei length, const void *pathString); +GLAPI void APIENTRY glPathGlyphsNV (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLsizei numGlyphs, GLenum type, const void *charcodes, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale); +GLAPI void APIENTRY glPathGlyphRangeNV (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyph, GLsizei numGlyphs, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale); +GLAPI void APIENTRY glWeightPathsNV (GLuint resultPath, GLsizei numPaths, const GLuint *paths, const GLfloat *weights); +GLAPI void APIENTRY glCopyPathNV (GLuint resultPath, GLuint srcPath); +GLAPI void APIENTRY glInterpolatePathsNV (GLuint resultPath, GLuint pathA, GLuint pathB, GLfloat weight); +GLAPI void APIENTRY glTransformPathNV (GLuint resultPath, GLuint srcPath, GLenum transformType, const GLfloat *transformValues); +GLAPI void APIENTRY glPathParameterivNV (GLuint path, GLenum pname, const GLint *value); +GLAPI void APIENTRY glPathParameteriNV (GLuint path, GLenum pname, GLint value); +GLAPI void APIENTRY glPathParameterfvNV (GLuint path, GLenum pname, const GLfloat *value); +GLAPI void APIENTRY glPathParameterfNV (GLuint path, GLenum pname, GLfloat value); +GLAPI void APIENTRY glPathDashArrayNV (GLuint path, GLsizei dashCount, const GLfloat *dashArray); +GLAPI void APIENTRY glPathStencilFuncNV (GLenum func, GLint ref, GLuint mask); +GLAPI void APIENTRY glPathStencilDepthOffsetNV (GLfloat factor, GLfloat units); +GLAPI void APIENTRY glStencilFillPathNV (GLuint path, GLenum fillMode, GLuint mask); +GLAPI void APIENTRY glStencilStrokePathNV (GLuint path, GLint reference, GLuint mask); +GLAPI void APIENTRY glStencilFillPathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum transformType, const GLfloat *transformValues); +GLAPI void APIENTRY glStencilStrokePathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum transformType, const GLfloat *transformValues); +GLAPI void APIENTRY glPathCoverDepthFuncNV (GLenum func); +GLAPI void APIENTRY glCoverFillPathNV (GLuint path, GLenum coverMode); +GLAPI void APIENTRY glCoverStrokePathNV (GLuint path, GLenum coverMode); +GLAPI void APIENTRY glCoverFillPathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues); +GLAPI void APIENTRY glCoverStrokePathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues); +GLAPI void APIENTRY glGetPathParameterivNV (GLuint path, GLenum pname, GLint *value); +GLAPI void APIENTRY glGetPathParameterfvNV (GLuint path, GLenum pname, GLfloat *value); +GLAPI void APIENTRY glGetPathCommandsNV (GLuint path, GLubyte *commands); +GLAPI void APIENTRY glGetPathCoordsNV (GLuint path, GLfloat *coords); +GLAPI void APIENTRY glGetPathDashArrayNV (GLuint path, GLfloat *dashArray); +GLAPI void APIENTRY glGetPathMetricsNV (GLbitfield metricQueryMask, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLsizei stride, GLfloat *metrics); +GLAPI void APIENTRY glGetPathMetricRangeNV (GLbitfield metricQueryMask, GLuint firstPathName, GLsizei numPaths, GLsizei stride, GLfloat *metrics); +GLAPI void APIENTRY glGetPathSpacingNV (GLenum pathListMode, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLfloat advanceScale, GLfloat kerningScale, GLenum transformType, GLfloat *returnedSpacing); +GLAPI GLboolean APIENTRY glIsPointInFillPathNV (GLuint path, GLuint mask, GLfloat x, GLfloat y); +GLAPI GLboolean APIENTRY glIsPointInStrokePathNV (GLuint path, GLfloat x, GLfloat y); +GLAPI GLfloat APIENTRY glGetPathLengthNV (GLuint path, GLsizei startSegment, GLsizei numSegments); +GLAPI GLboolean APIENTRY glPointAlongPathNV (GLuint path, GLsizei startSegment, GLsizei numSegments, GLfloat distance, GLfloat *x, GLfloat *y, GLfloat *tangentX, GLfloat *tangentY); +GLAPI void APIENTRY glMatrixLoad3x2fNV (GLenum matrixMode, const GLfloat *m); +GLAPI void APIENTRY glMatrixLoad3x3fNV (GLenum matrixMode, const GLfloat *m); +GLAPI void APIENTRY glMatrixLoadTranspose3x3fNV (GLenum matrixMode, const GLfloat *m); +GLAPI void APIENTRY glMatrixMult3x2fNV (GLenum matrixMode, const GLfloat *m); +GLAPI void APIENTRY glMatrixMult3x3fNV (GLenum matrixMode, const GLfloat *m); +GLAPI void APIENTRY glMatrixMultTranspose3x3fNV (GLenum matrixMode, const GLfloat *m); +GLAPI void APIENTRY glStencilThenCoverFillPathNV (GLuint path, GLenum fillMode, GLuint mask, GLenum coverMode); +GLAPI void APIENTRY glStencilThenCoverStrokePathNV (GLuint path, GLint reference, GLuint mask, GLenum coverMode); +GLAPI void APIENTRY glStencilThenCoverFillPathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues); +GLAPI void APIENTRY glStencilThenCoverStrokePathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues); +GLAPI GLenum APIENTRY glPathGlyphIndexRangeNV (GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint pathParameterTemplate, GLfloat emScale, GLuint baseAndCount[2]); +GLAPI GLenum APIENTRY glPathGlyphIndexArrayNV (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale); +GLAPI GLenum APIENTRY glPathMemoryGlyphIndexArrayNV (GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void *fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale); +GLAPI void APIENTRY glProgramPathFragmentInputGenNV (GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat *coeffs); +GLAPI void APIENTRY glGetProgramResourcefvNV (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLfloat *params); +#endif +#endif /* GL_NV_path_rendering */ + +#ifndef GL_NV_path_rendering_shared_edge +#define GL_NV_path_rendering_shared_edge 1 +#define GL_SHARED_EDGE_NV 0xC0 +#endif /* GL_NV_path_rendering_shared_edge */ + +#ifndef GL_NV_representative_fragment_test +#define GL_NV_representative_fragment_test 1 +#define GL_REPRESENTATIVE_FRAGMENT_TEST_NV 0x937F +#endif /* GL_NV_representative_fragment_test */ + +#ifndef GL_NV_sample_locations +#define GL_NV_sample_locations 1 +#define GL_SAMPLE_LOCATION_SUBPIXEL_BITS_NV 0x933D +#define GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_NV 0x933E +#define GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_NV 0x933F +#define GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_NV 0x9340 +#define GL_SAMPLE_LOCATION_NV 0x8E50 +#define GL_PROGRAMMABLE_SAMPLE_LOCATION_NV 0x9341 +#define GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_NV 0x9342 +#define GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_NV 0x9343 +typedef void (APIENTRYP PFNGLFRAMEBUFFERSAMPLELOCATIONSFVNVPROC) (GLenum target, GLuint start, GLsizei count, const GLfloat *v); +typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVNVPROC) (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat *v); +typedef void (APIENTRYP PFNGLRESOLVEDEPTHVALUESNVPROC) (void); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glFramebufferSampleLocationsfvNV (GLenum target, GLuint start, GLsizei count, const GLfloat *v); +GLAPI void APIENTRY glNamedFramebufferSampleLocationsfvNV (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat *v); +GLAPI void APIENTRY glResolveDepthValuesNV (void); +#endif +#endif /* GL_NV_sample_locations */ + +#ifndef GL_NV_sample_mask_override_coverage +#define GL_NV_sample_mask_override_coverage 1 +#endif /* GL_NV_sample_mask_override_coverage */ + +#ifndef GL_NV_scissor_exclusive +#define GL_NV_scissor_exclusive 1 +#define GL_SCISSOR_TEST_EXCLUSIVE_NV 0x9555 +#define GL_SCISSOR_BOX_EXCLUSIVE_NV 0x9556 +typedef void (APIENTRYP PFNGLSCISSOREXCLUSIVENVPROC) (GLint x, GLint y, GLsizei width, GLsizei height); +typedef void (APIENTRYP PFNGLSCISSOREXCLUSIVEARRAYVNVPROC) (GLuint first, GLsizei count, const GLint *v); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glScissorExclusiveNV (GLint x, GLint y, GLsizei width, GLsizei height); +GLAPI void APIENTRY glScissorExclusiveArrayvNV (GLuint first, GLsizei count, const GLint *v); +#endif +#endif /* GL_NV_scissor_exclusive */ + +#ifndef GL_NV_shader_atomic_counters +#define GL_NV_shader_atomic_counters 1 +#endif /* GL_NV_shader_atomic_counters */ + +#ifndef GL_NV_shader_atomic_float +#define GL_NV_shader_atomic_float 1 +#endif /* GL_NV_shader_atomic_float */ + +#ifndef GL_NV_shader_atomic_float64 +#define GL_NV_shader_atomic_float64 1 +#endif /* GL_NV_shader_atomic_float64 */ + +#ifndef GL_NV_shader_atomic_fp16_vector +#define GL_NV_shader_atomic_fp16_vector 1 +#endif /* GL_NV_shader_atomic_fp16_vector */ + +#ifndef GL_NV_shader_atomic_int64 +#define GL_NV_shader_atomic_int64 1 +#endif /* GL_NV_shader_atomic_int64 */ + +#ifndef GL_NV_shader_buffer_load +#define GL_NV_shader_buffer_load 1 +#define GL_BUFFER_GPU_ADDRESS_NV 0x8F1D +#define GL_GPU_ADDRESS_NV 0x8F34 +#define GL_MAX_SHADER_BUFFER_ADDRESS_NV 0x8F35 +typedef void (APIENTRYP PFNGLMAKEBUFFERRESIDENTNVPROC) (GLenum target, GLenum access); +typedef void (APIENTRYP PFNGLMAKEBUFFERNONRESIDENTNVPROC) (GLenum target); +typedef GLboolean (APIENTRYP PFNGLISBUFFERRESIDENTNVPROC) (GLenum target); +typedef void (APIENTRYP PFNGLMAKENAMEDBUFFERRESIDENTNVPROC) (GLuint buffer, GLenum access); +typedef void (APIENTRYP PFNGLMAKENAMEDBUFFERNONRESIDENTNVPROC) (GLuint buffer); +typedef GLboolean (APIENTRYP PFNGLISNAMEDBUFFERRESIDENTNVPROC) (GLuint buffer); +typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERUI64VNVPROC) (GLenum target, GLenum pname, GLuint64EXT *params); +typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC) (GLuint buffer, GLenum pname, GLuint64EXT *params); +typedef void (APIENTRYP PFNGLGETINTEGERUI64VNVPROC) (GLenum value, GLuint64EXT *result); +typedef void (APIENTRYP PFNGLUNIFORMUI64NVPROC) (GLint location, GLuint64EXT value); +typedef void (APIENTRYP PFNGLUNIFORMUI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value); +typedef void (APIENTRYP PFNGLGETUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLuint64EXT *params); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64NVPROC) (GLuint program, GLint location, GLuint64EXT value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glMakeBufferResidentNV (GLenum target, GLenum access); +GLAPI void APIENTRY glMakeBufferNonResidentNV (GLenum target); +GLAPI GLboolean APIENTRY glIsBufferResidentNV (GLenum target); +GLAPI void APIENTRY glMakeNamedBufferResidentNV (GLuint buffer, GLenum access); +GLAPI void APIENTRY glMakeNamedBufferNonResidentNV (GLuint buffer); +GLAPI GLboolean APIENTRY glIsNamedBufferResidentNV (GLuint buffer); +GLAPI void APIENTRY glGetBufferParameterui64vNV (GLenum target, GLenum pname, GLuint64EXT *params); +GLAPI void APIENTRY glGetNamedBufferParameterui64vNV (GLuint buffer, GLenum pname, GLuint64EXT *params); +GLAPI void APIENTRY glGetIntegerui64vNV (GLenum value, GLuint64EXT *result); +GLAPI void APIENTRY glUniformui64NV (GLint location, GLuint64EXT value); +GLAPI void APIENTRY glUniformui64vNV (GLint location, GLsizei count, const GLuint64EXT *value); +GLAPI void APIENTRY glGetUniformui64vNV (GLuint program, GLint location, GLuint64EXT *params); +GLAPI void APIENTRY glProgramUniformui64NV (GLuint program, GLint location, GLuint64EXT value); +GLAPI void APIENTRY glProgramUniformui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); +#endif +#endif /* GL_NV_shader_buffer_load */ + +#ifndef GL_NV_shader_buffer_store +#define GL_NV_shader_buffer_store 1 +#define GL_SHADER_GLOBAL_ACCESS_BARRIER_BIT_NV 0x00000010 +#endif /* GL_NV_shader_buffer_store */ + +#ifndef GL_NV_shader_texture_footprint +#define GL_NV_shader_texture_footprint 1 +#endif /* GL_NV_shader_texture_footprint */ + +#ifndef GL_NV_shader_thread_group +#define GL_NV_shader_thread_group 1 +#define GL_WARP_SIZE_NV 0x9339 +#define GL_WARPS_PER_SM_NV 0x933A +#define GL_SM_COUNT_NV 0x933B +#endif /* GL_NV_shader_thread_group */ + +#ifndef GL_NV_shader_thread_shuffle +#define GL_NV_shader_thread_shuffle 1 +#endif /* GL_NV_shader_thread_shuffle */ + +#ifndef GL_NV_shading_rate_image +#define GL_NV_shading_rate_image 1 +#define GL_SHADING_RATE_IMAGE_NV 0x9563 +#define GL_SHADING_RATE_NO_INVOCATIONS_NV 0x9564 +#define GL_SHADING_RATE_1_INVOCATION_PER_PIXEL_NV 0x9565 +#define GL_SHADING_RATE_1_INVOCATION_PER_1X2_PIXELS_NV 0x9566 +#define GL_SHADING_RATE_1_INVOCATION_PER_2X1_PIXELS_NV 0x9567 +#define GL_SHADING_RATE_1_INVOCATION_PER_2X2_PIXELS_NV 0x9568 +#define GL_SHADING_RATE_1_INVOCATION_PER_2X4_PIXELS_NV 0x9569 +#define GL_SHADING_RATE_1_INVOCATION_PER_4X2_PIXELS_NV 0x956A +#define GL_SHADING_RATE_1_INVOCATION_PER_4X4_PIXELS_NV 0x956B +#define GL_SHADING_RATE_2_INVOCATIONS_PER_PIXEL_NV 0x956C +#define GL_SHADING_RATE_4_INVOCATIONS_PER_PIXEL_NV 0x956D +#define GL_SHADING_RATE_8_INVOCATIONS_PER_PIXEL_NV 0x956E +#define GL_SHADING_RATE_16_INVOCATIONS_PER_PIXEL_NV 0x956F +#define GL_SHADING_RATE_IMAGE_BINDING_NV 0x955B +#define GL_SHADING_RATE_IMAGE_TEXEL_WIDTH_NV 0x955C +#define GL_SHADING_RATE_IMAGE_TEXEL_HEIGHT_NV 0x955D +#define GL_SHADING_RATE_IMAGE_PALETTE_SIZE_NV 0x955E +#define GL_MAX_COARSE_FRAGMENT_SAMPLES_NV 0x955F +#define GL_SHADING_RATE_SAMPLE_ORDER_DEFAULT_NV 0x95AE +#define GL_SHADING_RATE_SAMPLE_ORDER_PIXEL_MAJOR_NV 0x95AF +#define GL_SHADING_RATE_SAMPLE_ORDER_SAMPLE_MAJOR_NV 0x95B0 +typedef void (APIENTRYP PFNGLBINDSHADINGRATEIMAGENVPROC) (GLuint texture); +typedef void (APIENTRYP PFNGLGETSHADINGRATEIMAGEPALETTENVPROC) (GLuint viewport, GLuint entry, GLenum *rate); +typedef void (APIENTRYP PFNGLGETSHADINGRATESAMPLELOCATIONIVNVPROC) (GLenum rate, GLuint samples, GLuint index, GLint *location); +typedef void (APIENTRYP PFNGLSHADINGRATEIMAGEBARRIERNVPROC) (GLboolean synchronize); +typedef void (APIENTRYP PFNGLSHADINGRATEIMAGEPALETTENVPROC) (GLuint viewport, GLuint first, GLsizei count, const GLenum *rates); +typedef void (APIENTRYP PFNGLSHADINGRATESAMPLEORDERNVPROC) (GLenum order); +typedef void (APIENTRYP PFNGLSHADINGRATESAMPLEORDERCUSTOMNVPROC) (GLenum rate, GLuint samples, const GLint *locations); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBindShadingRateImageNV (GLuint texture); +GLAPI void APIENTRY glGetShadingRateImagePaletteNV (GLuint viewport, GLuint entry, GLenum *rate); +GLAPI void APIENTRY glGetShadingRateSampleLocationivNV (GLenum rate, GLuint samples, GLuint index, GLint *location); +GLAPI void APIENTRY glShadingRateImageBarrierNV (GLboolean synchronize); +GLAPI void APIENTRY glShadingRateImagePaletteNV (GLuint viewport, GLuint first, GLsizei count, const GLenum *rates); +GLAPI void APIENTRY glShadingRateSampleOrderNV (GLenum order); +GLAPI void APIENTRY glShadingRateSampleOrderCustomNV (GLenum rate, GLuint samples, const GLint *locations); +#endif +#endif /* GL_NV_shading_rate_image */ + +#ifndef GL_NV_stereo_view_rendering +#define GL_NV_stereo_view_rendering 1 +#endif /* GL_NV_stereo_view_rendering */ + +#ifndef GL_NV_texture_barrier +#define GL_NV_texture_barrier 1 +typedef void (APIENTRYP PFNGLTEXTUREBARRIERNVPROC) (void); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glTextureBarrierNV (void); +#endif +#endif /* GL_NV_texture_barrier */ + +#ifndef GL_NV_texture_rectangle_compressed +#define GL_NV_texture_rectangle_compressed 1 +#endif /* GL_NV_texture_rectangle_compressed */ + +#ifndef GL_NV_uniform_buffer_unified_memory +#define GL_NV_uniform_buffer_unified_memory 1 +#define GL_UNIFORM_BUFFER_UNIFIED_NV 0x936E +#define GL_UNIFORM_BUFFER_ADDRESS_NV 0x936F +#define GL_UNIFORM_BUFFER_LENGTH_NV 0x9370 +#endif /* GL_NV_uniform_buffer_unified_memory */ + +#ifndef GL_NV_vertex_attrib_integer_64bit +#define GL_NV_vertex_attrib_integer_64bit 1 +typedef void (APIENTRYP PFNGLVERTEXATTRIBL1I64NVPROC) (GLuint index, GLint64EXT x); +typedef void (APIENTRYP PFNGLVERTEXATTRIBL2I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y); +typedef void (APIENTRYP PFNGLVERTEXATTRIBL3I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z); +typedef void (APIENTRYP PFNGLVERTEXATTRIBL4I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); +typedef void (APIENTRYP PFNGLVERTEXATTRIBL1I64VNVPROC) (GLuint index, const GLint64EXT *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBL2I64VNVPROC) (GLuint index, const GLint64EXT *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBL3I64VNVPROC) (GLuint index, const GLint64EXT *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBL4I64VNVPROC) (GLuint index, const GLint64EXT *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64NVPROC) (GLuint index, GLuint64EXT x); +typedef void (APIENTRYP PFNGLVERTEXATTRIBL2UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y); +typedef void (APIENTRYP PFNGLVERTEXATTRIBL3UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); +typedef void (APIENTRYP PFNGLVERTEXATTRIBL4UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); +typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64VNVPROC) (GLuint index, const GLuint64EXT *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBL2UI64VNVPROC) (GLuint index, const GLuint64EXT *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBL3UI64VNVPROC) (GLuint index, const GLuint64EXT *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBL4UI64VNVPROC) (GLuint index, const GLuint64EXT *v); +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLI64VNVPROC) (GLuint index, GLenum pname, GLint64EXT *params); +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLUI64VNVPROC) (GLuint index, GLenum pname, GLuint64EXT *params); +typedef void (APIENTRYP PFNGLVERTEXATTRIBLFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glVertexAttribL1i64NV (GLuint index, GLint64EXT x); +GLAPI void APIENTRY glVertexAttribL2i64NV (GLuint index, GLint64EXT x, GLint64EXT y); +GLAPI void APIENTRY glVertexAttribL3i64NV (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z); +GLAPI void APIENTRY glVertexAttribL4i64NV (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); +GLAPI void APIENTRY glVertexAttribL1i64vNV (GLuint index, const GLint64EXT *v); +GLAPI void APIENTRY glVertexAttribL2i64vNV (GLuint index, const GLint64EXT *v); +GLAPI void APIENTRY glVertexAttribL3i64vNV (GLuint index, const GLint64EXT *v); +GLAPI void APIENTRY glVertexAttribL4i64vNV (GLuint index, const GLint64EXT *v); +GLAPI void APIENTRY glVertexAttribL1ui64NV (GLuint index, GLuint64EXT x); +GLAPI void APIENTRY glVertexAttribL2ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y); +GLAPI void APIENTRY glVertexAttribL3ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); +GLAPI void APIENTRY glVertexAttribL4ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); +GLAPI void APIENTRY glVertexAttribL1ui64vNV (GLuint index, const GLuint64EXT *v); +GLAPI void APIENTRY glVertexAttribL2ui64vNV (GLuint index, const GLuint64EXT *v); +GLAPI void APIENTRY glVertexAttribL3ui64vNV (GLuint index, const GLuint64EXT *v); +GLAPI void APIENTRY glVertexAttribL4ui64vNV (GLuint index, const GLuint64EXT *v); +GLAPI void APIENTRY glGetVertexAttribLi64vNV (GLuint index, GLenum pname, GLint64EXT *params); +GLAPI void APIENTRY glGetVertexAttribLui64vNV (GLuint index, GLenum pname, GLuint64EXT *params); +GLAPI void APIENTRY glVertexAttribLFormatNV (GLuint index, GLint size, GLenum type, GLsizei stride); +#endif +#endif /* GL_NV_vertex_attrib_integer_64bit */ + +#ifndef GL_NV_vertex_buffer_unified_memory +#define GL_NV_vertex_buffer_unified_memory 1 +#define GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV 0x8F1E +#define GL_ELEMENT_ARRAY_UNIFIED_NV 0x8F1F +#define GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV 0x8F20 +#define GL_VERTEX_ARRAY_ADDRESS_NV 0x8F21 +#define GL_NORMAL_ARRAY_ADDRESS_NV 0x8F22 +#define GL_COLOR_ARRAY_ADDRESS_NV 0x8F23 +#define GL_INDEX_ARRAY_ADDRESS_NV 0x8F24 +#define GL_TEXTURE_COORD_ARRAY_ADDRESS_NV 0x8F25 +#define GL_EDGE_FLAG_ARRAY_ADDRESS_NV 0x8F26 +#define GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV 0x8F27 +#define GL_FOG_COORD_ARRAY_ADDRESS_NV 0x8F28 +#define GL_ELEMENT_ARRAY_ADDRESS_NV 0x8F29 +#define GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV 0x8F2A +#define GL_VERTEX_ARRAY_LENGTH_NV 0x8F2B +#define GL_NORMAL_ARRAY_LENGTH_NV 0x8F2C +#define GL_COLOR_ARRAY_LENGTH_NV 0x8F2D +#define GL_INDEX_ARRAY_LENGTH_NV 0x8F2E +#define GL_TEXTURE_COORD_ARRAY_LENGTH_NV 0x8F2F +#define GL_EDGE_FLAG_ARRAY_LENGTH_NV 0x8F30 +#define GL_SECONDARY_COLOR_ARRAY_LENGTH_NV 0x8F31 +#define GL_FOG_COORD_ARRAY_LENGTH_NV 0x8F32 +#define GL_ELEMENT_ARRAY_LENGTH_NV 0x8F33 +#define GL_DRAW_INDIRECT_UNIFIED_NV 0x8F40 +#define GL_DRAW_INDIRECT_ADDRESS_NV 0x8F41 +#define GL_DRAW_INDIRECT_LENGTH_NV 0x8F42 +typedef void (APIENTRYP PFNGLBUFFERADDRESSRANGENVPROC) (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length); +typedef void (APIENTRYP PFNGLVERTEXFORMATNVPROC) (GLint size, GLenum type, GLsizei stride); +typedef void (APIENTRYP PFNGLNORMALFORMATNVPROC) (GLenum type, GLsizei stride); +typedef void (APIENTRYP PFNGLCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride); +typedef void (APIENTRYP PFNGLINDEXFORMATNVPROC) (GLenum type, GLsizei stride); +typedef void (APIENTRYP PFNGLTEXCOORDFORMATNVPROC) (GLint size, GLenum type, GLsizei stride); +typedef void (APIENTRYP PFNGLEDGEFLAGFORMATNVPROC) (GLsizei stride); +typedef void (APIENTRYP PFNGLSECONDARYCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride); +typedef void (APIENTRYP PFNGLFOGCOORDFORMATNVPROC) (GLenum type, GLsizei stride); +typedef void (APIENTRYP PFNGLVERTEXATTRIBFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride); +typedef void (APIENTRYP PFNGLVERTEXATTRIBIFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride); +typedef void (APIENTRYP PFNGLGETINTEGERUI64I_VNVPROC) (GLenum value, GLuint index, GLuint64EXT *result); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBufferAddressRangeNV (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length); +GLAPI void APIENTRY glVertexFormatNV (GLint size, GLenum type, GLsizei stride); +GLAPI void APIENTRY glNormalFormatNV (GLenum type, GLsizei stride); +GLAPI void APIENTRY glColorFormatNV (GLint size, GLenum type, GLsizei stride); +GLAPI void APIENTRY glIndexFormatNV (GLenum type, GLsizei stride); +GLAPI void APIENTRY glTexCoordFormatNV (GLint size, GLenum type, GLsizei stride); +GLAPI void APIENTRY glEdgeFlagFormatNV (GLsizei stride); +GLAPI void APIENTRY glSecondaryColorFormatNV (GLint size, GLenum type, GLsizei stride); +GLAPI void APIENTRY glFogCoordFormatNV (GLenum type, GLsizei stride); +GLAPI void APIENTRY glVertexAttribFormatNV (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride); +GLAPI void APIENTRY glVertexAttribIFormatNV (GLuint index, GLint size, GLenum type, GLsizei stride); +GLAPI void APIENTRY glGetIntegerui64i_vNV (GLenum value, GLuint index, GLuint64EXT *result); +#endif +#endif /* GL_NV_vertex_buffer_unified_memory */ + +#ifndef GL_NV_viewport_array2 +#define GL_NV_viewport_array2 1 +#endif /* GL_NV_viewport_array2 */ + +#ifndef GL_NV_viewport_swizzle +#define GL_NV_viewport_swizzle 1 +#define GL_VIEWPORT_SWIZZLE_POSITIVE_X_NV 0x9350 +#define GL_VIEWPORT_SWIZZLE_NEGATIVE_X_NV 0x9351 +#define GL_VIEWPORT_SWIZZLE_POSITIVE_Y_NV 0x9352 +#define GL_VIEWPORT_SWIZZLE_NEGATIVE_Y_NV 0x9353 +#define GL_VIEWPORT_SWIZZLE_POSITIVE_Z_NV 0x9354 +#define GL_VIEWPORT_SWIZZLE_NEGATIVE_Z_NV 0x9355 +#define GL_VIEWPORT_SWIZZLE_POSITIVE_W_NV 0x9356 +#define GL_VIEWPORT_SWIZZLE_NEGATIVE_W_NV 0x9357 +#define GL_VIEWPORT_SWIZZLE_X_NV 0x9358 +#define GL_VIEWPORT_SWIZZLE_Y_NV 0x9359 +#define GL_VIEWPORT_SWIZZLE_Z_NV 0x935A +#define GL_VIEWPORT_SWIZZLE_W_NV 0x935B +typedef void (APIENTRYP PFNGLVIEWPORTSWIZZLENVPROC) (GLuint index, GLenum swizzlex, GLenum swizzley, GLenum swizzlez, GLenum swizzlew); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glViewportSwizzleNV (GLuint index, GLenum swizzlex, GLenum swizzley, GLenum swizzlez, GLenum swizzlew); +#endif +#endif /* GL_NV_viewport_swizzle */ + +#ifndef GL_OVR_multiview +#define GL_OVR_multiview 1 +#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR 0x9630 +#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR 0x9632 +#define GL_MAX_VIEWS_OVR 0x9631 +#define GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR 0x9633 +typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glFramebufferTextureMultiviewOVR (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews); +#endif +#endif /* GL_OVR_multiview */ + +#ifndef GL_OVR_multiview2 +#define GL_OVR_multiview2 1 +#endif /* GL_OVR_multiview2 */ + #ifdef __cplusplus } #endif diff --git a/lib/libc/include/any-windows-any/GL/glext.h b/lib/libc/include/any-windows-any/GL/glext.h index a2f66612eb..fe03eb6f38 100644 --- a/lib/libc/include/any-windows-any/GL/glext.h +++ b/lib/libc/include/any-windows-any/GL/glext.h @@ -1,12 +1,12 @@ -#ifndef __glext_h_ -#define __glext_h_ 1 +#ifndef __gl_glext_h_ +#define __gl_glext_h_ 1 #ifdef __cplusplus extern "C" { #endif /* -** Copyright (c) 2013-2014 The Khronos Group Inc. +** Copyright (c) 2013-2018 The Khronos Group Inc. ** ** Permission is hereby granted, free of charge, to any person obtaining a ** copy of this software and/or associated documentation files (the @@ -31,9 +31,7 @@ extern "C" { ** This header is generated from the Khronos OpenGL / OpenGL ES XML ** API Registry. The current version of the Registry, generator scripts ** used to make the header, and the header can be found at -** http://www.opengl.org/registry/ -** -** Khronos $Revision: 29324 $ on $Date: 2015-01-05 01:42:37 +0000 (Mon, 05 Jan 2015) $ +** https://github.com/KhronosGroup/OpenGL-Registry */ #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) @@ -53,7 +51,9 @@ extern "C" { #define GLAPI extern #endif -#define GL_GLEXT_VERSION 20150104 +#define GL_GLEXT_VERSION 20190326 + +#include /* Generated C header for: * API: gl @@ -355,15 +355,17 @@ GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *m); #define GL_TEXTURE_FILTER_CONTROL 0x8500 #define GL_DEPTH_TEXTURE_MODE 0x884B #define GL_COMPARE_R_TO_TEXTURE 0x884E -#define GL_FUNC_ADD 0x8006 -#define GL_FUNC_SUBTRACT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT 0x800B -#define GL_MIN 0x8007 -#define GL_MAX 0x8008 +#define GL_BLEND_COLOR 0x8005 +#define GL_BLEND_EQUATION 0x8009 #define GL_CONSTANT_COLOR 0x8001 #define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 #define GL_CONSTANT_ALPHA 0x8003 #define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 +#define GL_FUNC_ADD 0x8006 +#define GL_FUNC_REVERSE_SUBTRACT 0x800B +#define GL_FUNC_SUBTRACT 0x800A +#define GL_MIN 0x8007 +#define GL_MAX 0x8008 typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount); typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount); @@ -464,9 +466,8 @@ GLAPI void APIENTRY glBlendEquation (GLenum mode); #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 -#include -typedef ptrdiff_t GLsizeiptr; -typedef ptrdiff_t GLintptr; +typedef khronos_ssize_t GLsizeiptr; +typedef khronos_intptr_t GLintptr; #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 #define GL_QUERY_COUNTER_BITS 0x8864 @@ -879,7 +880,7 @@ GLAPI void APIENTRY glUniformMatrix4x3fv (GLint location, GLsizei count, GLboole #ifndef GL_VERSION_3_0 #define GL_VERSION_3_0 1 -typedef unsigned short GLhalf; +typedef khronos_uint16_t GLhalf; #define GL_COMPARE_REF_TO_TEXTURE 0x884E #define GL_CLIP_DISTANCE0 0x3000 #define GL_CLIP_DISTANCE1 0x3001 @@ -1041,6 +1042,22 @@ typedef unsigned short GLhalf; #define GL_COLOR_ATTACHMENT13 0x8CED #define GL_COLOR_ATTACHMENT14 0x8CEE #define GL_COLOR_ATTACHMENT15 0x8CEF +#define GL_COLOR_ATTACHMENT16 0x8CF0 +#define GL_COLOR_ATTACHMENT17 0x8CF1 +#define GL_COLOR_ATTACHMENT18 0x8CF2 +#define GL_COLOR_ATTACHMENT19 0x8CF3 +#define GL_COLOR_ATTACHMENT20 0x8CF4 +#define GL_COLOR_ATTACHMENT21 0x8CF5 +#define GL_COLOR_ATTACHMENT22 0x8CF6 +#define GL_COLOR_ATTACHMENT23 0x8CF7 +#define GL_COLOR_ATTACHMENT24 0x8CF8 +#define GL_COLOR_ATTACHMENT25 0x8CF9 +#define GL_COLOR_ATTACHMENT26 0x8CFA +#define GL_COLOR_ATTACHMENT27 0x8CFB +#define GL_COLOR_ATTACHMENT28 0x8CFC +#define GL_COLOR_ATTACHMENT29 0x8CFD +#define GL_COLOR_ATTACHMENT30 0x8CFE +#define GL_COLOR_ATTACHMENT31 0x8CFF #define GL_DEPTH_ATTACHMENT 0x8D00 #define GL_STENCIL_ATTACHMENT 0x8D20 #define GL_FRAMEBUFFER 0x8D40 @@ -1367,45 +1384,8 @@ GLAPI void APIENTRY glUniformBlockBinding (GLuint program, GLuint uniformBlockIn #ifndef GL_VERSION_3_2 #define GL_VERSION_3_2 1 typedef struct __GLsync *GLsync; -#ifndef GLEXT_64_TYPES_DEFINED -/* This code block is duplicated in glxext.h, so must be protected */ -#define GLEXT_64_TYPES_DEFINED -/* Define int32_t, int64_t, and uint64_t types for UST/MSC */ -/* (as used in the GL_EXT_timer_query extension). */ -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -#include -#elif defined(__sun__) || defined(__digital__) -#include -#if defined(__STDC__) -#if defined(__arch64__) || defined(_LP64) -typedef long int int64_t; -typedef unsigned long int uint64_t; -#else -typedef long long int int64_t; -typedef unsigned long long int uint64_t; -#endif /* __arch64__ */ -#endif /* __STDC__ */ -#elif defined( __VMS ) || defined(__sgi) -#include -#elif defined(__SCO__) || defined(__USLC__) -#include -#elif defined(__UNIXOS2__) || defined(__SOL64__) -typedef long int int32_t; -typedef long long int int64_t; -typedef unsigned long long int uint64_t; -#elif defined(_WIN32) && defined(__GNUC__) -#include -#elif defined(_WIN32) -typedef __int32 int32_t; -typedef __int64 int64_t; -typedef unsigned __int64 uint64_t; -#else -/* Fallback if nothing above works */ -#include -#endif -#endif -typedef uint64_t GLuint64; -typedef int64_t GLint64; +typedef khronos_uint64_t GLuint64; +typedef khronos_int64_t GLint64; #define GL_CONTEXT_CORE_PROFILE_BIT 0x00000001 #define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002 #define GL_LINES_ADJACENCY 0x000A @@ -2594,7 +2574,6 @@ GLAPI void APIENTRY glBindVertexBuffers (GLuint first, GLsizei count, const GLui #define GL_MAX_COMBINED_CLIP_AND_CULL_DISTANCES 0x82FA #define GL_TEXTURE_TARGET 0x1006 #define GL_QUERY_TARGET 0x82EA -#define GL_TEXTURE_BINDING 0x82EB #define GL_GUILTY_CONTEXT_RESET 0x8253 #define GL_INNOCENT_CONTEXT_RESET 0x8254 #define GL_UNKNOWN_CONTEXT_RESET 0x8255 @@ -2607,25 +2586,25 @@ GLAPI void APIENTRY glBindVertexBuffers (GLuint first, GLsizei count, const GLui typedef void (APIENTRYP PFNGLCLIPCONTROLPROC) (GLenum origin, GLenum depth); typedef void (APIENTRYP PFNGLCREATETRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint *ids); typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKBUFFERBASEPROC) (GLuint xfb, GLuint index, GLuint buffer); -typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC) (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizei size); +typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC) (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKIVPROC) (GLuint xfb, GLenum pname, GLint *param); typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKI_VPROC) (GLuint xfb, GLenum pname, GLuint index, GLint *param); typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKI64_VPROC) (GLuint xfb, GLenum pname, GLuint index, GLint64 *param); typedef void (APIENTRYP PFNGLCREATEBUFFERSPROC) (GLsizei n, GLuint *buffers); -typedef void (APIENTRYP PFNGLNAMEDBUFFERSTORAGEPROC) (GLuint buffer, GLsizei size, const void *data, GLbitfield flags); -typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAPROC) (GLuint buffer, GLsizei size, const void *data, GLenum usage); -typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizei size, const void *data); -typedef void (APIENTRYP PFNGLCOPYNAMEDBUFFERSUBDATAPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizei size); +typedef void (APIENTRYP PFNGLNAMEDBUFFERSTORAGEPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags); +typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage); +typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data); +typedef void (APIENTRYP PFNGLCOPYNAMEDBUFFERSUBDATAPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERDATAPROC) (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data); -typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizei size, GLenum format, GLenum type, const void *data); +typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data); typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFERPROC) (GLuint buffer, GLenum access); -typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFERRANGEPROC) (GLuint buffer, GLintptr offset, GLsizei length, GLbitfield access); +typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFERRANGEPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access); typedef GLboolean (APIENTRYP PFNGLUNMAPNAMEDBUFFERPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC) (GLuint buffer, GLintptr offset, GLsizei length); +typedef void (APIENTRYP PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length); typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERIVPROC) (GLuint buffer, GLenum pname, GLint *params); typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERI64VPROC) (GLuint buffer, GLenum pname, GLint64 *params); typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPOINTERVPROC) (GLuint buffer, GLenum pname, void **params); -typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizei size, void *data); +typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data); typedef void (APIENTRYP PFNGLCREATEFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers); typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERPARAMETERIPROC) (GLuint framebuffer, GLenum pname, GLint param); @@ -2639,7 +2618,7 @@ typedef void (APIENTRYP PFNGLINVALIDATENAMEDFRAMEBUFFERSUBDATAPROC) (GLuint fram typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERIVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLint *value); typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERUIVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLuint *value); typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERFVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLfloat *value); -typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERFIPROC) (GLuint framebuffer, GLenum buffer, const GLfloat depth, GLint stencil); +typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERFIPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil); typedef void (APIENTRYP PFNGLBLITNAMEDFRAMEBUFFERPROC) (GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); typedef GLenum (APIENTRYP PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC) (GLuint framebuffer, GLenum target); typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVPROC) (GLuint framebuffer, GLenum pname, GLint *param); @@ -2650,7 +2629,7 @@ typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLuint re typedef void (APIENTRYP PFNGLGETNAMEDRENDERBUFFERPARAMETERIVPROC) (GLuint renderbuffer, GLenum pname, GLint *params); typedef void (APIENTRYP PFNGLCREATETEXTURESPROC) (GLenum target, GLsizei n, GLuint *textures); typedef void (APIENTRYP PFNGLTEXTUREBUFFERPROC) (GLuint texture, GLenum internalformat, GLuint buffer); -typedef void (APIENTRYP PFNGLTEXTUREBUFFERRANGEPROC) (GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizei size); +typedef void (APIENTRYP PFNGLTEXTUREBUFFERRANGEPROC) (GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); typedef void (APIENTRYP PFNGLTEXTURESTORAGE1DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width); typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); @@ -2730,25 +2709,25 @@ typedef void (APIENTRYP PFNGLTEXTUREBARRIERPROC) (void); GLAPI void APIENTRY glClipControl (GLenum origin, GLenum depth); GLAPI void APIENTRY glCreateTransformFeedbacks (GLsizei n, GLuint *ids); GLAPI void APIENTRY glTransformFeedbackBufferBase (GLuint xfb, GLuint index, GLuint buffer); -GLAPI void APIENTRY glTransformFeedbackBufferRange (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizei size); +GLAPI void APIENTRY glTransformFeedbackBufferRange (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); GLAPI void APIENTRY glGetTransformFeedbackiv (GLuint xfb, GLenum pname, GLint *param); GLAPI void APIENTRY glGetTransformFeedbacki_v (GLuint xfb, GLenum pname, GLuint index, GLint *param); GLAPI void APIENTRY glGetTransformFeedbacki64_v (GLuint xfb, GLenum pname, GLuint index, GLint64 *param); GLAPI void APIENTRY glCreateBuffers (GLsizei n, GLuint *buffers); -GLAPI void APIENTRY glNamedBufferStorage (GLuint buffer, GLsizei size, const void *data, GLbitfield flags); -GLAPI void APIENTRY glNamedBufferData (GLuint buffer, GLsizei size, const void *data, GLenum usage); -GLAPI void APIENTRY glNamedBufferSubData (GLuint buffer, GLintptr offset, GLsizei size, const void *data); -GLAPI void APIENTRY glCopyNamedBufferSubData (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizei size); +GLAPI void APIENTRY glNamedBufferStorage (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags); +GLAPI void APIENTRY glNamedBufferData (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage); +GLAPI void APIENTRY glNamedBufferSubData (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data); +GLAPI void APIENTRY glCopyNamedBufferSubData (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); GLAPI void APIENTRY glClearNamedBufferData (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data); -GLAPI void APIENTRY glClearNamedBufferSubData (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizei size, GLenum format, GLenum type, const void *data); +GLAPI void APIENTRY glClearNamedBufferSubData (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data); GLAPI void *APIENTRY glMapNamedBuffer (GLuint buffer, GLenum access); -GLAPI void *APIENTRY glMapNamedBufferRange (GLuint buffer, GLintptr offset, GLsizei length, GLbitfield access); +GLAPI void *APIENTRY glMapNamedBufferRange (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access); GLAPI GLboolean APIENTRY glUnmapNamedBuffer (GLuint buffer); -GLAPI void APIENTRY glFlushMappedNamedBufferRange (GLuint buffer, GLintptr offset, GLsizei length); +GLAPI void APIENTRY glFlushMappedNamedBufferRange (GLuint buffer, GLintptr offset, GLsizeiptr length); GLAPI void APIENTRY glGetNamedBufferParameteriv (GLuint buffer, GLenum pname, GLint *params); GLAPI void APIENTRY glGetNamedBufferParameteri64v (GLuint buffer, GLenum pname, GLint64 *params); GLAPI void APIENTRY glGetNamedBufferPointerv (GLuint buffer, GLenum pname, void **params); -GLAPI void APIENTRY glGetNamedBufferSubData (GLuint buffer, GLintptr offset, GLsizei size, void *data); +GLAPI void APIENTRY glGetNamedBufferSubData (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data); GLAPI void APIENTRY glCreateFramebuffers (GLsizei n, GLuint *framebuffers); GLAPI void APIENTRY glNamedFramebufferRenderbuffer (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); GLAPI void APIENTRY glNamedFramebufferParameteri (GLuint framebuffer, GLenum pname, GLint param); @@ -2762,7 +2741,7 @@ GLAPI void APIENTRY glInvalidateNamedFramebufferSubData (GLuint framebuffer, GLs GLAPI void APIENTRY glClearNamedFramebufferiv (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLint *value); GLAPI void APIENTRY glClearNamedFramebufferuiv (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLuint *value); GLAPI void APIENTRY glClearNamedFramebufferfv (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLfloat *value); -GLAPI void APIENTRY glClearNamedFramebufferfi (GLuint framebuffer, GLenum buffer, const GLfloat depth, GLint stencil); +GLAPI void APIENTRY glClearNamedFramebufferfi (GLuint framebuffer, GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil); GLAPI void APIENTRY glBlitNamedFramebuffer (GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); GLAPI GLenum APIENTRY glCheckNamedFramebufferStatus (GLuint framebuffer, GLenum target); GLAPI void APIENTRY glGetNamedFramebufferParameteriv (GLuint framebuffer, GLenum pname, GLint *param); @@ -2773,7 +2752,7 @@ GLAPI void APIENTRY glNamedRenderbufferStorageMultisample (GLuint renderbuffer, GLAPI void APIENTRY glGetNamedRenderbufferParameteriv (GLuint renderbuffer, GLenum pname, GLint *params); GLAPI void APIENTRY glCreateTextures (GLenum target, GLsizei n, GLuint *textures); GLAPI void APIENTRY glTextureBuffer (GLuint texture, GLenum internalformat, GLuint buffer); -GLAPI void APIENTRY glTextureBufferRange (GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizei size); +GLAPI void APIENTRY glTextureBufferRange (GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); GLAPI void APIENTRY glTextureStorage1D (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width); GLAPI void APIENTRY glTextureStorage2D (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); GLAPI void APIENTRY glTextureStorage3D (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); @@ -2852,6 +2831,42 @@ GLAPI void APIENTRY glTextureBarrier (void); #endif #endif /* GL_VERSION_4_5 */ +#ifndef GL_VERSION_4_6 +#define GL_VERSION_4_6 1 +#define GL_SHADER_BINARY_FORMAT_SPIR_V 0x9551 +#define GL_SPIR_V_BINARY 0x9552 +#define GL_PARAMETER_BUFFER 0x80EE +#define GL_PARAMETER_BUFFER_BINDING 0x80EF +#define GL_CONTEXT_FLAG_NO_ERROR_BIT 0x00000008 +#define GL_VERTICES_SUBMITTED 0x82EE +#define GL_PRIMITIVES_SUBMITTED 0x82EF +#define GL_VERTEX_SHADER_INVOCATIONS 0x82F0 +#define GL_TESS_CONTROL_SHADER_PATCHES 0x82F1 +#define GL_TESS_EVALUATION_SHADER_INVOCATIONS 0x82F2 +#define GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED 0x82F3 +#define GL_FRAGMENT_SHADER_INVOCATIONS 0x82F4 +#define GL_COMPUTE_SHADER_INVOCATIONS 0x82F5 +#define GL_CLIPPING_INPUT_PRIMITIVES 0x82F6 +#define GL_CLIPPING_OUTPUT_PRIMITIVES 0x82F7 +#define GL_POLYGON_OFFSET_CLAMP 0x8E1B +#define GL_SPIR_V_EXTENSIONS 0x9553 +#define GL_NUM_SPIR_V_EXTENSIONS 0x9554 +#define GL_TEXTURE_MAX_ANISOTROPY 0x84FE +#define GL_MAX_TEXTURE_MAX_ANISOTROPY 0x84FF +#define GL_TRANSFORM_FEEDBACK_OVERFLOW 0x82EC +#define GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW 0x82ED +typedef void (APIENTRYP PFNGLSPECIALIZESHADERPROC) (GLuint shader, const GLchar *pEntryPoint, GLuint numSpecializationConstants, const GLuint *pConstantIndex, const GLuint *pConstantValue); +typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTCOUNTPROC) (GLenum mode, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); +typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTPROC) (GLenum mode, GLenum type, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); +typedef void (APIENTRYP PFNGLPOLYGONOFFSETCLAMPPROC) (GLfloat factor, GLfloat units, GLfloat clamp); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glSpecializeShader (GLuint shader, const GLchar *pEntryPoint, GLuint numSpecializationConstants, const GLuint *pConstantIndex, const GLuint *pConstantValue); +GLAPI void APIENTRY glMultiDrawArraysIndirectCount (GLenum mode, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); +GLAPI void APIENTRY glMultiDrawElementsIndirectCount (GLenum mode, GLenum type, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); +GLAPI void APIENTRY glPolygonOffsetClamp (GLfloat factor, GLfloat units, GLfloat clamp); +#endif +#endif /* GL_VERSION_4_6 */ + #ifndef GL_ARB_ES2_compatibility #define GL_ARB_ES2_compatibility 1 #endif /* GL_ARB_ES2_compatibility */ @@ -2860,6 +2875,17 @@ GLAPI void APIENTRY glTextureBarrier (void); #define GL_ARB_ES3_1_compatibility 1 #endif /* GL_ARB_ES3_1_compatibility */ +#ifndef GL_ARB_ES3_2_compatibility +#define GL_ARB_ES3_2_compatibility 1 +#define GL_PRIMITIVE_BOUNDING_BOX_ARB 0x92BE +#define GL_MULTISAMPLE_LINE_WIDTH_RANGE_ARB 0x9381 +#define GL_MULTISAMPLE_LINE_WIDTH_GRANULARITY_ARB 0x9382 +typedef void (APIENTRYP PFNGLPRIMITIVEBOUNDINGBOXARBPROC) (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glPrimitiveBoundingBoxARB (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW); +#endif +#endif /* GL_ARB_ES3_2_compatibility */ + #ifndef GL_ARB_ES3_compatibility #define GL_ARB_ES3_compatibility 1 #endif /* GL_ARB_ES3_compatibility */ @@ -2874,7 +2900,7 @@ GLAPI void APIENTRY glTextureBarrier (void); #ifndef GL_ARB_bindless_texture #define GL_ARB_bindless_texture 1 -typedef uint64_t GLuint64EXT; +typedef khronos_uint64_t GLuint64EXT; #define GL_UNSIGNED_INT64_ARB 0x140F typedef GLuint64 (APIENTRYP PFNGLGETTEXTUREHANDLEARBPROC) (GLuint texture); typedef GLuint64 (APIENTRYP PFNGLGETTEXTURESAMPLERHANDLEARBPROC) (GLuint texture, GLuint sampler); @@ -3273,6 +3299,10 @@ GLAPI GLboolean APIENTRY glIsProgramARB (GLuint program); #define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B #endif /* GL_ARB_fragment_shader */ +#ifndef GL_ARB_fragment_shader_interlock +#define GL_ARB_fragment_shader_interlock 1 +#endif /* GL_ARB_fragment_shader_interlock */ + #ifndef GL_ARB_framebuffer_no_attachments #define GL_ARB_framebuffer_no_attachments 1 #endif /* GL_ARB_framebuffer_no_attachments */ @@ -3325,6 +3355,16 @@ GLAPI void APIENTRY glFramebufferTextureFaceARB (GLenum target, GLenum attachmen #define GL_ARB_get_texture_sub_image 1 #endif /* GL_ARB_get_texture_sub_image */ +#ifndef GL_ARB_gl_spirv +#define GL_ARB_gl_spirv 1 +#define GL_SHADER_BINARY_FORMAT_SPIR_V_ARB 0x9551 +#define GL_SPIR_V_BINARY_ARB 0x9552 +typedef void (APIENTRYP PFNGLSPECIALIZESHADERARBPROC) (GLuint shader, const GLchar *pEntryPoint, GLuint numSpecializationConstants, const GLuint *pConstantIndex, const GLuint *pConstantValue); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glSpecializeShaderARB (GLuint shader, const GLchar *pEntryPoint, GLuint numSpecializationConstants, const GLuint *pConstantIndex, const GLuint *pConstantValue); +#endif +#endif /* GL_ARB_gl_spirv */ + #ifndef GL_ARB_gpu_shader5 #define GL_ARB_gpu_shader5 1 #endif /* GL_ARB_gpu_shader5 */ @@ -3333,9 +3373,94 @@ GLAPI void APIENTRY glFramebufferTextureFaceARB (GLenum target, GLenum attachmen #define GL_ARB_gpu_shader_fp64 1 #endif /* GL_ARB_gpu_shader_fp64 */ +#ifndef GL_ARB_gpu_shader_int64 +#define GL_ARB_gpu_shader_int64 1 +#define GL_INT64_ARB 0x140E +#define GL_INT64_VEC2_ARB 0x8FE9 +#define GL_INT64_VEC3_ARB 0x8FEA +#define GL_INT64_VEC4_ARB 0x8FEB +#define GL_UNSIGNED_INT64_VEC2_ARB 0x8FF5 +#define GL_UNSIGNED_INT64_VEC3_ARB 0x8FF6 +#define GL_UNSIGNED_INT64_VEC4_ARB 0x8FF7 +typedef void (APIENTRYP PFNGLUNIFORM1I64ARBPROC) (GLint location, GLint64 x); +typedef void (APIENTRYP PFNGLUNIFORM2I64ARBPROC) (GLint location, GLint64 x, GLint64 y); +typedef void (APIENTRYP PFNGLUNIFORM3I64ARBPROC) (GLint location, GLint64 x, GLint64 y, GLint64 z); +typedef void (APIENTRYP PFNGLUNIFORM4I64ARBPROC) (GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w); +typedef void (APIENTRYP PFNGLUNIFORM1I64VARBPROC) (GLint location, GLsizei count, const GLint64 *value); +typedef void (APIENTRYP PFNGLUNIFORM2I64VARBPROC) (GLint location, GLsizei count, const GLint64 *value); +typedef void (APIENTRYP PFNGLUNIFORM3I64VARBPROC) (GLint location, GLsizei count, const GLint64 *value); +typedef void (APIENTRYP PFNGLUNIFORM4I64VARBPROC) (GLint location, GLsizei count, const GLint64 *value); +typedef void (APIENTRYP PFNGLUNIFORM1UI64ARBPROC) (GLint location, GLuint64 x); +typedef void (APIENTRYP PFNGLUNIFORM2UI64ARBPROC) (GLint location, GLuint64 x, GLuint64 y); +typedef void (APIENTRYP PFNGLUNIFORM3UI64ARBPROC) (GLint location, GLuint64 x, GLuint64 y, GLuint64 z); +typedef void (APIENTRYP PFNGLUNIFORM4UI64ARBPROC) (GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w); +typedef void (APIENTRYP PFNGLUNIFORM1UI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value); +typedef void (APIENTRYP PFNGLUNIFORM2UI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value); +typedef void (APIENTRYP PFNGLUNIFORM3UI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value); +typedef void (APIENTRYP PFNGLUNIFORM4UI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value); +typedef void (APIENTRYP PFNGLGETUNIFORMI64VARBPROC) (GLuint program, GLint location, GLint64 *params); +typedef void (APIENTRYP PFNGLGETUNIFORMUI64VARBPROC) (GLuint program, GLint location, GLuint64 *params); +typedef void (APIENTRYP PFNGLGETNUNIFORMI64VARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLint64 *params); +typedef void (APIENTRYP PFNGLGETNUNIFORMUI64VARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint64 *params); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64ARBPROC) (GLuint program, GLint location, GLint64 x); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64ARBPROC) (GLuint program, GLint location, GLint64 x, GLint64 y); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64ARBPROC) (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64ARBPROC) (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64 *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64 *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64 *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64 *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64ARBPROC) (GLuint program, GLint location, GLuint64 x); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64ARBPROC) (GLuint program, GLint location, GLuint64 x, GLuint64 y); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64ARBPROC) (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64ARBPROC) (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *value); +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *value); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glUniform1i64ARB (GLint location, GLint64 x); +GLAPI void APIENTRY glUniform2i64ARB (GLint location, GLint64 x, GLint64 y); +GLAPI void APIENTRY glUniform3i64ARB (GLint location, GLint64 x, GLint64 y, GLint64 z); +GLAPI void APIENTRY glUniform4i64ARB (GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w); +GLAPI void APIENTRY glUniform1i64vARB (GLint location, GLsizei count, const GLint64 *value); +GLAPI void APIENTRY glUniform2i64vARB (GLint location, GLsizei count, const GLint64 *value); +GLAPI void APIENTRY glUniform3i64vARB (GLint location, GLsizei count, const GLint64 *value); +GLAPI void APIENTRY glUniform4i64vARB (GLint location, GLsizei count, const GLint64 *value); +GLAPI void APIENTRY glUniform1ui64ARB (GLint location, GLuint64 x); +GLAPI void APIENTRY glUniform2ui64ARB (GLint location, GLuint64 x, GLuint64 y); +GLAPI void APIENTRY glUniform3ui64ARB (GLint location, GLuint64 x, GLuint64 y, GLuint64 z); +GLAPI void APIENTRY glUniform4ui64ARB (GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w); +GLAPI void APIENTRY glUniform1ui64vARB (GLint location, GLsizei count, const GLuint64 *value); +GLAPI void APIENTRY glUniform2ui64vARB (GLint location, GLsizei count, const GLuint64 *value); +GLAPI void APIENTRY glUniform3ui64vARB (GLint location, GLsizei count, const GLuint64 *value); +GLAPI void APIENTRY glUniform4ui64vARB (GLint location, GLsizei count, const GLuint64 *value); +GLAPI void APIENTRY glGetUniformi64vARB (GLuint program, GLint location, GLint64 *params); +GLAPI void APIENTRY glGetUniformui64vARB (GLuint program, GLint location, GLuint64 *params); +GLAPI void APIENTRY glGetnUniformi64vARB (GLuint program, GLint location, GLsizei bufSize, GLint64 *params); +GLAPI void APIENTRY glGetnUniformui64vARB (GLuint program, GLint location, GLsizei bufSize, GLuint64 *params); +GLAPI void APIENTRY glProgramUniform1i64ARB (GLuint program, GLint location, GLint64 x); +GLAPI void APIENTRY glProgramUniform2i64ARB (GLuint program, GLint location, GLint64 x, GLint64 y); +GLAPI void APIENTRY glProgramUniform3i64ARB (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z); +GLAPI void APIENTRY glProgramUniform4i64ARB (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w); +GLAPI void APIENTRY glProgramUniform1i64vARB (GLuint program, GLint location, GLsizei count, const GLint64 *value); +GLAPI void APIENTRY glProgramUniform2i64vARB (GLuint program, GLint location, GLsizei count, const GLint64 *value); +GLAPI void APIENTRY glProgramUniform3i64vARB (GLuint program, GLint location, GLsizei count, const GLint64 *value); +GLAPI void APIENTRY glProgramUniform4i64vARB (GLuint program, GLint location, GLsizei count, const GLint64 *value); +GLAPI void APIENTRY glProgramUniform1ui64ARB (GLuint program, GLint location, GLuint64 x); +GLAPI void APIENTRY glProgramUniform2ui64ARB (GLuint program, GLint location, GLuint64 x, GLuint64 y); +GLAPI void APIENTRY glProgramUniform3ui64ARB (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z); +GLAPI void APIENTRY glProgramUniform4ui64ARB (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w); +GLAPI void APIENTRY glProgramUniform1ui64vARB (GLuint program, GLint location, GLsizei count, const GLuint64 *value); +GLAPI void APIENTRY glProgramUniform2ui64vARB (GLuint program, GLint location, GLsizei count, const GLuint64 *value); +GLAPI void APIENTRY glProgramUniform3ui64vARB (GLuint program, GLint location, GLsizei count, const GLuint64 *value); +GLAPI void APIENTRY glProgramUniform4ui64vARB (GLuint program, GLint location, GLsizei count, const GLuint64 *value); +#endif +#endif /* GL_ARB_gpu_shader_int64 */ + #ifndef GL_ARB_half_float_pixel #define GL_ARB_half_float_pixel 1 -typedef unsigned short GLhalfARB; +typedef khronos_uint16_t GLhalfARB; #define GL_HALF_FLOAT_ARB 0x140B #endif /* GL_ARB_half_float_pixel */ @@ -3345,8 +3470,6 @@ typedef unsigned short GLhalfARB; #ifndef GL_ARB_imaging #define GL_ARB_imaging 1 -#define GL_BLEND_COLOR 0x8005 -#define GL_BLEND_EQUATION 0x8009 #define GL_CONVOLUTION_1D 0x8010 #define GL_CONVOLUTION_2D 0x8011 #define GL_SEPARABLE_2D 0x8012 @@ -3483,11 +3606,11 @@ GLAPI void APIENTRY glResetMinmax (GLenum target); #define GL_ARB_indirect_parameters 1 #define GL_PARAMETER_BUFFER_ARB 0x80EE #define GL_PARAMETER_BUFFER_BINDING_ARB 0x80EF -typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTCOUNTARBPROC) (GLenum mode, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTARBPROC) (GLenum mode, GLenum type, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); +typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTCOUNTARBPROC) (GLenum mode, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); +typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTARBPROC) (GLenum mode, GLenum type, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); #ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMultiDrawArraysIndirectCountARB (GLenum mode, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); -GLAPI void APIENTRY glMultiDrawElementsIndirectCountARB (GLenum mode, GLenum type, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); +GLAPI void APIENTRY glMultiDrawArraysIndirectCountARB (GLenum mode, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); +GLAPI void APIENTRY glMultiDrawElementsIndirectCountARB (GLenum mode, GLenum type, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); #endif #endif /* GL_ARB_indirect_parameters */ @@ -3507,6 +3630,25 @@ GLAPI void APIENTRY glVertexAttribDivisorARB (GLuint index, GLuint divisor); #ifndef GL_ARB_internalformat_query2 #define GL_ARB_internalformat_query2 1 #define GL_SRGB_DECODE_ARB 0x8299 +#define GL_VIEW_CLASS_EAC_R11 0x9383 +#define GL_VIEW_CLASS_EAC_RG11 0x9384 +#define GL_VIEW_CLASS_ETC2_RGB 0x9385 +#define GL_VIEW_CLASS_ETC2_RGBA 0x9386 +#define GL_VIEW_CLASS_ETC2_EAC_RGBA 0x9387 +#define GL_VIEW_CLASS_ASTC_4x4_RGBA 0x9388 +#define GL_VIEW_CLASS_ASTC_5x4_RGBA 0x9389 +#define GL_VIEW_CLASS_ASTC_5x5_RGBA 0x938A +#define GL_VIEW_CLASS_ASTC_6x5_RGBA 0x938B +#define GL_VIEW_CLASS_ASTC_6x6_RGBA 0x938C +#define GL_VIEW_CLASS_ASTC_8x5_RGBA 0x938D +#define GL_VIEW_CLASS_ASTC_8x6_RGBA 0x938E +#define GL_VIEW_CLASS_ASTC_8x8_RGBA 0x938F +#define GL_VIEW_CLASS_ASTC_10x5_RGBA 0x9390 +#define GL_VIEW_CLASS_ASTC_10x6_RGBA 0x9391 +#define GL_VIEW_CLASS_ASTC_10x8_RGBA 0x9392 +#define GL_VIEW_CLASS_ASTC_10x10_RGBA 0x9393 +#define GL_VIEW_CLASS_ASTC_12x10_RGBA 0x9394 +#define GL_VIEW_CLASS_ASTC_12x12_RGBA 0x9395 #endif /* GL_ARB_internalformat_query2 */ #ifndef GL_ARB_invalidate_subdata @@ -3712,6 +3854,16 @@ GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint id, GLenum pname, GLuint *par #define GL_ARB_occlusion_query2 1 #endif /* GL_ARB_occlusion_query2 */ +#ifndef GL_ARB_parallel_shader_compile +#define GL_ARB_parallel_shader_compile 1 +#define GL_MAX_SHADER_COMPILER_THREADS_ARB 0x91B0 +#define GL_COMPLETION_STATUS_ARB 0x91B1 +typedef void (APIENTRYP PFNGLMAXSHADERCOMPILERTHREADSARBPROC) (GLuint count); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glMaxShaderCompilerThreadsARB (GLuint count); +#endif +#endif /* GL_ARB_parallel_shader_compile */ + #ifndef GL_ARB_pipeline_statistics_query #define GL_ARB_pipeline_statistics_query 1 #define GL_VERTICES_SUBMITTED_ARB 0x82EE @@ -3754,6 +3906,14 @@ GLAPI void APIENTRY glPointParameterfvARB (GLenum pname, const GLfloat *params); #define GL_COORD_REPLACE_ARB 0x8862 #endif /* GL_ARB_point_sprite */ +#ifndef GL_ARB_polygon_offset_clamp +#define GL_ARB_polygon_offset_clamp 1 +#endif /* GL_ARB_polygon_offset_clamp */ + +#ifndef GL_ARB_post_depth_coverage +#define GL_ARB_post_depth_coverage 1 +#endif /* GL_ARB_post_depth_coverage */ + #ifndef GL_ARB_program_interface_query #define GL_ARB_program_interface_query 1 #endif /* GL_ARB_program_interface_query */ @@ -3827,6 +3987,26 @@ GLAPI void APIENTRY glGetnMinmaxARB (GLenum target, GLboolean reset, GLenum form #define GL_ARB_robustness_isolation 1 #endif /* GL_ARB_robustness_isolation */ +#ifndef GL_ARB_sample_locations +#define GL_ARB_sample_locations 1 +#define GL_SAMPLE_LOCATION_SUBPIXEL_BITS_ARB 0x933D +#define GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_ARB 0x933E +#define GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_ARB 0x933F +#define GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_ARB 0x9340 +#define GL_SAMPLE_LOCATION_ARB 0x8E50 +#define GL_PROGRAMMABLE_SAMPLE_LOCATION_ARB 0x9341 +#define GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_ARB 0x9342 +#define GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_ARB 0x9343 +typedef void (APIENTRYP PFNGLFRAMEBUFFERSAMPLELOCATIONSFVARBPROC) (GLenum target, GLuint start, GLsizei count, const GLfloat *v); +typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVARBPROC) (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat *v); +typedef void (APIENTRYP PFNGLEVALUATEDEPTHVALUESARBPROC) (void); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glFramebufferSampleLocationsfvARB (GLenum target, GLuint start, GLsizei count, const GLfloat *v); +GLAPI void APIENTRY glNamedFramebufferSampleLocationsfvARB (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat *v); +GLAPI void APIENTRY glEvaluateDepthValuesARB (void); +#endif +#endif /* GL_ARB_sample_locations */ + #ifndef GL_ARB_sample_shading #define GL_ARB_sample_shading 1 #define GL_SAMPLE_SHADING_ARB 0x8C36 @@ -3853,14 +4033,26 @@ GLAPI void APIENTRY glMinSampleShadingARB (GLfloat value); #define GL_ARB_separate_shader_objects 1 #endif /* GL_ARB_separate_shader_objects */ +#ifndef GL_ARB_shader_atomic_counter_ops +#define GL_ARB_shader_atomic_counter_ops 1 +#endif /* GL_ARB_shader_atomic_counter_ops */ + #ifndef GL_ARB_shader_atomic_counters #define GL_ARB_shader_atomic_counters 1 #endif /* GL_ARB_shader_atomic_counters */ +#ifndef GL_ARB_shader_ballot +#define GL_ARB_shader_ballot 1 +#endif /* GL_ARB_shader_ballot */ + #ifndef GL_ARB_shader_bit_encoding #define GL_ARB_shader_bit_encoding 1 #endif /* GL_ARB_shader_bit_encoding */ +#ifndef GL_ARB_shader_clock +#define GL_ARB_shader_clock 1 +#endif /* GL_ARB_shader_clock */ + #ifndef GL_ARB_shader_draw_parameters #define GL_ARB_shader_draw_parameters 1 #endif /* GL_ARB_shader_draw_parameters */ @@ -4025,6 +4217,10 @@ GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB obj, GLsizei maxLength, GL #define GL_ARB_shader_texture_lod 1 #endif /* GL_ARB_shader_texture_lod */ +#ifndef GL_ARB_shader_viewport_layer_array +#define GL_ARB_shader_viewport_layer_array 1 +#endif /* GL_ARB_shader_viewport_layer_array */ + #ifndef GL_ARB_shading_language_100 #define GL_ARB_shading_language_100 1 #define GL_SHADING_LANGUAGE_VERSION_ARB 0x8B8C @@ -4098,12 +4294,24 @@ GLAPI void APIENTRY glNamedBufferPageCommitmentARB (GLuint buffer, GLintptr offs #define GL_MAX_SPARSE_3D_TEXTURE_SIZE_ARB 0x9199 #define GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS_ARB 0x919A #define GL_SPARSE_TEXTURE_FULL_ARRAY_CUBE_MIPMAPS_ARB 0x91A9 -typedef void (APIENTRYP PFNGLTEXPAGECOMMITMENTARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean resident); +typedef void (APIENTRYP PFNGLTEXPAGECOMMITMENTARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit); #ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexPageCommitmentARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean resident); +GLAPI void APIENTRY glTexPageCommitmentARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit); #endif #endif /* GL_ARB_sparse_texture */ +#ifndef GL_ARB_sparse_texture2 +#define GL_ARB_sparse_texture2 1 +#endif /* GL_ARB_sparse_texture2 */ + +#ifndef GL_ARB_sparse_texture_clamp +#define GL_ARB_sparse_texture_clamp 1 +#endif /* GL_ARB_sparse_texture_clamp */ + +#ifndef GL_ARB_spirv_extensions +#define GL_ARB_spirv_extensions 1 +#endif /* GL_ARB_spirv_extensions */ + #ifndef GL_ARB_stencil_texturing #define GL_ARB_stencil_texturing 1 #endif /* GL_ARB_stencil_texturing */ @@ -4256,6 +4464,16 @@ GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum target, GLint level, void #define GL_DOT3_RGBA_ARB 0x86AF #endif /* GL_ARB_texture_env_dot3 */ +#ifndef GL_ARB_texture_filter_anisotropic +#define GL_ARB_texture_filter_anisotropic 1 +#endif /* GL_ARB_texture_filter_anisotropic */ + +#ifndef GL_ARB_texture_filter_minmax +#define GL_ARB_texture_filter_minmax 1 +#define GL_TEXTURE_REDUCTION_MODE_ARB 0x9366 +#define GL_WEIGHTED_AVERAGE_ARB 0x9367 +#endif /* GL_ARB_texture_filter_minmax */ + #ifndef GL_ARB_texture_float #define GL_ARB_texture_float 1 #define GL_TEXTURE_RED_TYPE_ARB 0x8C10 @@ -4478,8 +4696,8 @@ GLAPI void APIENTRY glVertexBlendARB (GLint count); #ifndef GL_ARB_vertex_buffer_object #define GL_ARB_vertex_buffer_object 1 -typedef ptrdiff_t GLsizeiptrARB; -typedef ptrdiff_t GLintptrARB; +typedef khronos_ssize_t GLsizeiptrARB; +typedef khronos_intptr_t GLintptrARB; #define GL_BUFFER_SIZE_ARB 0x8764 #define GL_BUFFER_USAGE_ARB 0x8765 #define GL_ARRAY_BUFFER_ARB 0x8892 @@ -4750,6 +4968,21 @@ GLAPI void APIENTRY glBlendBarrierKHR (void); #define GL_KHR_debug 1 #endif /* GL_KHR_debug */ +#ifndef GL_KHR_no_error +#define GL_KHR_no_error 1 +#define GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR 0x00000008 +#endif /* GL_KHR_no_error */ + +#ifndef GL_KHR_parallel_shader_compile +#define GL_KHR_parallel_shader_compile 1 +#define GL_MAX_SHADER_COMPILER_THREADS_KHR 0x91B0 +#define GL_COMPLETION_STATUS_KHR 0x91B1 +typedef void (APIENTRYP PFNGLMAXSHADERCOMPILERTHREADSKHRPROC) (GLuint count); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glMaxShaderCompilerThreadsKHR (GLuint count); +#endif +#endif /* GL_KHR_parallel_shader_compile */ + #ifndef GL_KHR_robust_buffer_access_behavior #define GL_KHR_robust_buffer_access_behavior 1 #endif /* GL_KHR_robust_buffer_access_behavior */ @@ -4795,6 +5028,10 @@ GLAPI void APIENTRY glBlendBarrierKHR (void); #define GL_KHR_texture_compression_astc_ldr 1 #endif /* GL_KHR_texture_compression_astc_ldr */ +#ifndef GL_KHR_texture_compression_astc_sliced_3d +#define GL_KHR_texture_compression_astc_sliced_3d 1 +#endif /* GL_KHR_texture_compression_astc_sliced_3d */ + #ifndef GL_OES_byte_coordinates #define GL_OES_byte_coordinates 1 typedef void (APIENTRYP PFNGLMULTITEXCOORD1BOESPROC) (GLenum texture, GLbyte s); @@ -4861,7 +5098,7 @@ GLAPI void APIENTRY glVertex4bvOES (const GLbyte *coords); #ifndef GL_OES_fixed_point #define GL_OES_fixed_point 1 -typedef GLint GLfixed; +typedef khronos_int32_t GLfixed; #define GL_FIXED_OES 0x140C typedef void (APIENTRYP PFNGLALPHAFUNCXOESPROC) (GLenum func, GLfixed ref); typedef void (APIENTRYP PFNGLCLEARCOLORXOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); @@ -4892,7 +5129,6 @@ typedef void (APIENTRYP PFNGLPOINTPARAMETERXVOESPROC) (GLenum pname, const GLfix typedef void (APIENTRYP PFNGLPOINTSIZEXOESPROC) (GLfixed size); typedef void (APIENTRYP PFNGLPOLYGONOFFSETXOESPROC) (GLfixed factor, GLfixed units); typedef void (APIENTRYP PFNGLROTATEXOESPROC) (GLfixed angle, GLfixed x, GLfixed y, GLfixed z); -typedef void (APIENTRYP PFNGLSAMPLECOVERAGEOESPROC) (GLfixed value, GLboolean invert); typedef void (APIENTRYP PFNGLSCALEXOESPROC) (GLfixed x, GLfixed y, GLfixed z); typedef void (APIENTRYP PFNGLTEXENVXOESPROC) (GLenum target, GLenum pname, GLfixed param); typedef void (APIENTRYP PFNGLTEXENVXVOESPROC) (GLenum target, GLenum pname, const GLfixed *params); @@ -4997,7 +5233,6 @@ GLAPI void APIENTRY glPointParameterxvOES (GLenum pname, const GLfixed *params); GLAPI void APIENTRY glPointSizexOES (GLfixed size); GLAPI void APIENTRY glPolygonOffsetxOES (GLfixed factor, GLfixed units); GLAPI void APIENTRY glRotatexOES (GLfixed angle, GLfixed x, GLfixed y, GLfixed z); -GLAPI void APIENTRY glSampleCoverageOES (GLfixed value, GLboolean invert); GLAPI void APIENTRY glScalexOES (GLfixed x, GLfixed y, GLfixed z); GLAPI void APIENTRY glTexEnvxOES (GLenum target, GLenum pname, GLfixed param); GLAPI void APIENTRY glTexEnvxvOES (GLenum target, GLenum pname, const GLfixed *params); @@ -5188,13 +5423,68 @@ GLAPI void APIENTRY glBlendEquationSeparateIndexedAMD (GLuint buf, GLenum modeRG #endif #endif /* GL_AMD_draw_buffers_blend */ +#ifndef GL_AMD_framebuffer_multisample_advanced +#define GL_AMD_framebuffer_multisample_advanced 1 +#define GL_RENDERBUFFER_STORAGE_SAMPLES_AMD 0x91B2 +#define GL_MAX_COLOR_FRAMEBUFFER_SAMPLES_AMD 0x91B3 +#define GL_MAX_COLOR_FRAMEBUFFER_STORAGE_SAMPLES_AMD 0x91B4 +#define GL_MAX_DEPTH_STENCIL_FRAMEBUFFER_SAMPLES_AMD 0x91B5 +#define GL_NUM_SUPPORTED_MULTISAMPLE_MODES_AMD 0x91B6 +#define GL_SUPPORTED_MULTISAMPLE_MODES_AMD 0x91B7 +typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEADVANCEDAMDPROC) (GLenum target, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height); +typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEADVANCEDAMDPROC) (GLuint renderbuffer, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glRenderbufferStorageMultisampleAdvancedAMD (GLenum target, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height); +GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleAdvancedAMD (GLuint renderbuffer, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height); +#endif +#endif /* GL_AMD_framebuffer_multisample_advanced */ + +#ifndef GL_AMD_framebuffer_sample_positions +#define GL_AMD_framebuffer_sample_positions 1 +#define GL_SUBSAMPLE_DISTANCE_AMD 0x883F +#define GL_PIXELS_PER_SAMPLE_PATTERN_X_AMD 0x91AE +#define GL_PIXELS_PER_SAMPLE_PATTERN_Y_AMD 0x91AF +#define GL_ALL_PIXELS_AMD 0xFFFFFFFF +typedef void (APIENTRYP PFNGLFRAMEBUFFERSAMPLEPOSITIONSFVAMDPROC) (GLenum target, GLuint numsamples, GLuint pixelindex, const GLfloat *values); +typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERSAMPLEPOSITIONSFVAMDPROC) (GLuint framebuffer, GLuint numsamples, GLuint pixelindex, const GLfloat *values); +typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERFVAMDPROC) (GLenum target, GLenum pname, GLuint numsamples, GLuint pixelindex, GLsizei size, GLfloat *values); +typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERPARAMETERFVAMDPROC) (GLuint framebuffer, GLenum pname, GLuint numsamples, GLuint pixelindex, GLsizei size, GLfloat *values); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glFramebufferSamplePositionsfvAMD (GLenum target, GLuint numsamples, GLuint pixelindex, const GLfloat *values); +GLAPI void APIENTRY glNamedFramebufferSamplePositionsfvAMD (GLuint framebuffer, GLuint numsamples, GLuint pixelindex, const GLfloat *values); +GLAPI void APIENTRY glGetFramebufferParameterfvAMD (GLenum target, GLenum pname, GLuint numsamples, GLuint pixelindex, GLsizei size, GLfloat *values); +GLAPI void APIENTRY glGetNamedFramebufferParameterfvAMD (GLuint framebuffer, GLenum pname, GLuint numsamples, GLuint pixelindex, GLsizei size, GLfloat *values); +#endif +#endif /* GL_AMD_framebuffer_sample_positions */ + #ifndef GL_AMD_gcn_shader #define GL_AMD_gcn_shader 1 #endif /* GL_AMD_gcn_shader */ +#ifndef GL_AMD_gpu_shader_half_float +#define GL_AMD_gpu_shader_half_float 1 +#define GL_FLOAT16_NV 0x8FF8 +#define GL_FLOAT16_VEC2_NV 0x8FF9 +#define GL_FLOAT16_VEC3_NV 0x8FFA +#define GL_FLOAT16_VEC4_NV 0x8FFB +#define GL_FLOAT16_MAT2_AMD 0x91C5 +#define GL_FLOAT16_MAT3_AMD 0x91C6 +#define GL_FLOAT16_MAT4_AMD 0x91C7 +#define GL_FLOAT16_MAT2x3_AMD 0x91C8 +#define GL_FLOAT16_MAT2x4_AMD 0x91C9 +#define GL_FLOAT16_MAT3x2_AMD 0x91CA +#define GL_FLOAT16_MAT3x4_AMD 0x91CB +#define GL_FLOAT16_MAT4x2_AMD 0x91CC +#define GL_FLOAT16_MAT4x3_AMD 0x91CD +#endif /* GL_AMD_gpu_shader_half_float */ + +#ifndef GL_AMD_gpu_shader_int16 +#define GL_AMD_gpu_shader_int16 1 +#endif /* GL_AMD_gpu_shader_int16 */ + #ifndef GL_AMD_gpu_shader_int64 #define GL_AMD_gpu_shader_int64 1 -typedef int64_t GLint64EXT; +typedef khronos_int64_t GLint64EXT; #define GL_INT64_NV 0x140E #define GL_UNSIGNED_INT64_NV 0x140F #define GL_INT8_NV 0x8FE0 @@ -5219,10 +5509,6 @@ typedef int64_t GLint64EXT; #define GL_UNSIGNED_INT64_VEC2_NV 0x8FF5 #define GL_UNSIGNED_INT64_VEC3_NV 0x8FF6 #define GL_UNSIGNED_INT64_VEC4_NV 0x8FF7 -#define GL_FLOAT16_NV 0x8FF8 -#define GL_FLOAT16_VEC2_NV 0x8FF9 -#define GL_FLOAT16_VEC3_NV 0x8FFA -#define GL_FLOAT16_VEC4_NV 0x8FFB typedef void (APIENTRYP PFNGLUNIFORM1I64NVPROC) (GLint location, GLint64EXT x); typedef void (APIENTRYP PFNGLUNIFORM2I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y); typedef void (APIENTRYP PFNGLUNIFORM3I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z); @@ -5395,7 +5681,6 @@ GLAPI void APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname #ifndef GL_AMD_sample_positions #define GL_AMD_sample_positions 1 -#define GL_SUBSAMPLE_DISTANCE_AMD 0x883F typedef void (APIENTRYP PFNGLSETMULTISAMPLEFVAMDPROC) (GLenum pname, GLuint index, const GLfloat *val); #ifdef GL_GLEXT_PROTOTYPES GLAPI void APIENTRY glSetMultisamplefvAMD (GLenum pname, GLuint index, const GLfloat *val); @@ -5410,6 +5695,22 @@ GLAPI void APIENTRY glSetMultisamplefvAMD (GLenum pname, GLuint index, const GLf #define GL_AMD_shader_atomic_counter_ops 1 #endif /* GL_AMD_shader_atomic_counter_ops */ +#ifndef GL_AMD_shader_ballot +#define GL_AMD_shader_ballot 1 +#endif /* GL_AMD_shader_ballot */ + +#ifndef GL_AMD_shader_explicit_vertex_parameter +#define GL_AMD_shader_explicit_vertex_parameter 1 +#endif /* GL_AMD_shader_explicit_vertex_parameter */ + +#ifndef GL_AMD_shader_gpu_shader_half_float_fetch +#define GL_AMD_shader_gpu_shader_half_float_fetch 1 +#endif /* GL_AMD_shader_gpu_shader_half_float_fetch */ + +#ifndef GL_AMD_shader_image_load_store_lod +#define GL_AMD_shader_image_load_store_lod 1 +#endif /* GL_AMD_shader_image_load_store_lod */ + #ifndef GL_AMD_shader_stencil_export #define GL_AMD_shader_stencil_export 1 #endif /* GL_AMD_shader_stencil_export */ @@ -5449,6 +5750,10 @@ GLAPI void APIENTRY glStencilOpValueAMD (GLenum face, GLuint value); #endif #endif /* GL_AMD_stencil_operation_extended */ +#ifndef GL_AMD_texture_gather_bias_lod +#define GL_AMD_texture_gather_bias_lod 1 +#endif /* GL_AMD_texture_gather_bias_lod */ + #ifndef GL_AMD_texture_texture4 #define GL_AMD_texture_texture4 1 #endif /* GL_AMD_texture_texture4 */ @@ -6149,6 +6454,17 @@ GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum pname, GLfloat param); #define GL_422_REV_AVERAGE_EXT 0x80CF #endif /* GL_EXT_422_pixels */ +#ifndef GL_EXT_EGL_image_storage +#define GL_EXT_EGL_image_storage 1 +typedef void *GLeglImageOES; +typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXSTORAGEEXTPROC) (GLenum target, GLeglImageOES image, const GLint* attrib_list); +typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXTURESTORAGEEXTPROC) (GLuint texture, GLeglImageOES image, const GLint* attrib_list); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glEGLImageTargetTexStorageEXT (GLenum target, GLeglImageOES image, const GLint* attrib_list); +GLAPI void APIENTRY glEGLImageTargetTextureStorageEXT (GLuint texture, GLeglImageOES image, const GLint* attrib_list); +#endif +#endif /* GL_EXT_EGL_image_storage */ + #ifndef GL_EXT_abgr #define GL_EXT_abgr 1 #define GL_ABGR_EXT 0x8000 @@ -6711,7 +7027,7 @@ typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBLFORMATEXTPROC) (GLuint vaob typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBBINDINGEXTPROC) (GLuint vaobj, GLuint attribindex, GLuint bindingindex); typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXBINDINGDIVISOREXTPROC) (GLuint vaobj, GLuint bindingindex, GLuint divisor); typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBLOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset); -typedef void (APIENTRYP PFNGLTEXTUREPAGECOMMITMENTEXTPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean resident); +typedef void (APIENTRYP PFNGLTEXTUREPAGECOMMITMENTEXTPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit); typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBDIVISOREXTPROC) (GLuint vaobj, GLuint index, GLuint divisor); #ifdef GL_GLEXT_PROTOTYPES GLAPI void APIENTRY glMatrixLoadfEXT (GLenum mode, const GLfloat *m); @@ -6967,7 +7283,7 @@ GLAPI void APIENTRY glVertexArrayVertexAttribLFormatEXT (GLuint vaobj, GLuint at GLAPI void APIENTRY glVertexArrayVertexAttribBindingEXT (GLuint vaobj, GLuint attribindex, GLuint bindingindex); GLAPI void APIENTRY glVertexArrayVertexBindingDivisorEXT (GLuint vaobj, GLuint bindingindex, GLuint divisor); GLAPI void APIENTRY glVertexArrayVertexAttribLOffsetEXT (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset); -GLAPI void APIENTRY glTexturePageCommitmentEXT (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean resident); +GLAPI void APIENTRY glTexturePageCommitmentEXT (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit); GLAPI void APIENTRY glVertexArrayVertexAttribDivisorEXT (GLuint vaobj, GLuint index, GLuint divisor); #endif #endif /* GL_EXT_direct_state_access */ @@ -7000,6 +7316,17 @@ GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum mode, GLuint start, GLuint en #endif #endif /* GL_EXT_draw_range_elements */ +#ifndef GL_EXT_external_buffer +#define GL_EXT_external_buffer 1 +typedef void *GLeglClientBufferEXT; +typedef void (APIENTRYP PFNGLBUFFERSTORAGEEXTERNALEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags); +typedef void (APIENTRYP PFNGLNAMEDBUFFERSTORAGEEXTERNALEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBufferStorageExternalEXT (GLenum target, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags); +GLAPI void APIENTRY glNamedBufferStorageExternalEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags); +#endif +#endif /* GL_EXT_external_buffer */ + #ifndef GL_EXT_fog_coord #define GL_EXT_fog_coord 1 #define GL_FOG_COORDINATE_SOURCE_EXT 0x8450 @@ -7343,6 +7670,89 @@ GLAPI void APIENTRY glTextureMaterialEXT (GLenum face, GLenum mode); #endif #endif /* GL_EXT_light_texture */ +#ifndef GL_EXT_memory_object +#define GL_EXT_memory_object 1 +#define GL_TEXTURE_TILING_EXT 0x9580 +#define GL_DEDICATED_MEMORY_OBJECT_EXT 0x9581 +#define GL_PROTECTED_MEMORY_OBJECT_EXT 0x959B +#define GL_NUM_TILING_TYPES_EXT 0x9582 +#define GL_TILING_TYPES_EXT 0x9583 +#define GL_OPTIMAL_TILING_EXT 0x9584 +#define GL_LINEAR_TILING_EXT 0x9585 +#define GL_NUM_DEVICE_UUIDS_EXT 0x9596 +#define GL_DEVICE_UUID_EXT 0x9597 +#define GL_DRIVER_UUID_EXT 0x9598 +#define GL_UUID_SIZE_EXT 16 +typedef void (APIENTRYP PFNGLGETUNSIGNEDBYTEVEXTPROC) (GLenum pname, GLubyte *data); +typedef void (APIENTRYP PFNGLGETUNSIGNEDBYTEI_VEXTPROC) (GLenum target, GLuint index, GLubyte *data); +typedef void (APIENTRYP PFNGLDELETEMEMORYOBJECTSEXTPROC) (GLsizei n, const GLuint *memoryObjects); +typedef GLboolean (APIENTRYP PFNGLISMEMORYOBJECTEXTPROC) (GLuint memoryObject); +typedef void (APIENTRYP PFNGLCREATEMEMORYOBJECTSEXTPROC) (GLsizei n, GLuint *memoryObjects); +typedef void (APIENTRYP PFNGLMEMORYOBJECTPARAMETERIVEXTPROC) (GLuint memoryObject, GLenum pname, const GLint *params); +typedef void (APIENTRYP PFNGLGETMEMORYOBJECTPARAMETERIVEXTPROC) (GLuint memoryObject, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLTEXSTORAGEMEM2DEXTPROC) (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLuint memory, GLuint64 offset); +typedef void (APIENTRYP PFNGLTEXSTORAGEMEM2DMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset); +typedef void (APIENTRYP PFNGLTEXSTORAGEMEM3DEXTPROC) (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset); +typedef void (APIENTRYP PFNGLTEXSTORAGEMEM3DMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset); +typedef void (APIENTRYP PFNGLBUFFERSTORAGEMEMEXTPROC) (GLenum target, GLsizeiptr size, GLuint memory, GLuint64 offset); +typedef void (APIENTRYP PFNGLTEXTURESTORAGEMEM2DEXTPROC) (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLuint memory, GLuint64 offset); +typedef void (APIENTRYP PFNGLTEXTURESTORAGEMEM2DMULTISAMPLEEXTPROC) (GLuint texture, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset); +typedef void (APIENTRYP PFNGLTEXTURESTORAGEMEM3DEXTPROC) (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset); +typedef void (APIENTRYP PFNGLTEXTURESTORAGEMEM3DMULTISAMPLEEXTPROC) (GLuint texture, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset); +typedef void (APIENTRYP PFNGLNAMEDBUFFERSTORAGEMEMEXTPROC) (GLuint buffer, GLsizeiptr size, GLuint memory, GLuint64 offset); +typedef void (APIENTRYP PFNGLTEXSTORAGEMEM1DEXTPROC) (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLuint memory, GLuint64 offset); +typedef void (APIENTRYP PFNGLTEXTURESTORAGEMEM1DEXTPROC) (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLuint memory, GLuint64 offset); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glGetUnsignedBytevEXT (GLenum pname, GLubyte *data); +GLAPI void APIENTRY glGetUnsignedBytei_vEXT (GLenum target, GLuint index, GLubyte *data); +GLAPI void APIENTRY glDeleteMemoryObjectsEXT (GLsizei n, const GLuint *memoryObjects); +GLAPI GLboolean APIENTRY glIsMemoryObjectEXT (GLuint memoryObject); +GLAPI void APIENTRY glCreateMemoryObjectsEXT (GLsizei n, GLuint *memoryObjects); +GLAPI void APIENTRY glMemoryObjectParameterivEXT (GLuint memoryObject, GLenum pname, const GLint *params); +GLAPI void APIENTRY glGetMemoryObjectParameterivEXT (GLuint memoryObject, GLenum pname, GLint *params); +GLAPI void APIENTRY glTexStorageMem2DEXT (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLuint memory, GLuint64 offset); +GLAPI void APIENTRY glTexStorageMem2DMultisampleEXT (GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset); +GLAPI void APIENTRY glTexStorageMem3DEXT (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset); +GLAPI void APIENTRY glTexStorageMem3DMultisampleEXT (GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset); +GLAPI void APIENTRY glBufferStorageMemEXT (GLenum target, GLsizeiptr size, GLuint memory, GLuint64 offset); +GLAPI void APIENTRY glTextureStorageMem2DEXT (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLuint memory, GLuint64 offset); +GLAPI void APIENTRY glTextureStorageMem2DMultisampleEXT (GLuint texture, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset); +GLAPI void APIENTRY glTextureStorageMem3DEXT (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset); +GLAPI void APIENTRY glTextureStorageMem3DMultisampleEXT (GLuint texture, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset); +GLAPI void APIENTRY glNamedBufferStorageMemEXT (GLuint buffer, GLsizeiptr size, GLuint memory, GLuint64 offset); +GLAPI void APIENTRY glTexStorageMem1DEXT (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLuint memory, GLuint64 offset); +GLAPI void APIENTRY glTextureStorageMem1DEXT (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLuint memory, GLuint64 offset); +#endif +#endif /* GL_EXT_memory_object */ + +#ifndef GL_EXT_memory_object_fd +#define GL_EXT_memory_object_fd 1 +#define GL_HANDLE_TYPE_OPAQUE_FD_EXT 0x9586 +typedef void (APIENTRYP PFNGLIMPORTMEMORYFDEXTPROC) (GLuint memory, GLuint64 size, GLenum handleType, GLint fd); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glImportMemoryFdEXT (GLuint memory, GLuint64 size, GLenum handleType, GLint fd); +#endif +#endif /* GL_EXT_memory_object_fd */ + +#ifndef GL_EXT_memory_object_win32 +#define GL_EXT_memory_object_win32 1 +#define GL_HANDLE_TYPE_OPAQUE_WIN32_EXT 0x9587 +#define GL_HANDLE_TYPE_OPAQUE_WIN32_KMT_EXT 0x9588 +#define GL_DEVICE_LUID_EXT 0x9599 +#define GL_DEVICE_NODE_MASK_EXT 0x959A +#define GL_LUID_SIZE_EXT 8 +#define GL_HANDLE_TYPE_D3D12_TILEPOOL_EXT 0x9589 +#define GL_HANDLE_TYPE_D3D12_RESOURCE_EXT 0x958A +#define GL_HANDLE_TYPE_D3D11_IMAGE_EXT 0x958B +#define GL_HANDLE_TYPE_D3D11_IMAGE_KMT_EXT 0x958C +typedef void (APIENTRYP PFNGLIMPORTMEMORYWIN32HANDLEEXTPROC) (GLuint memory, GLuint64 size, GLenum handleType, void *handle); +typedef void (APIENTRYP PFNGLIMPORTMEMORYWIN32NAMEEXTPROC) (GLuint memory, GLuint64 size, GLenum handleType, const void *name); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glImportMemoryWin32HandleEXT (GLuint memory, GLuint64 size, GLenum handleType, void *handle); +GLAPI void APIENTRY glImportMemoryWin32NameEXT (GLuint memory, GLuint64 size, GLenum handleType, const void *name); +#endif +#endif /* GL_EXT_memory_object_win32 */ + #ifndef GL_EXT_misc_attribute #define GL_EXT_misc_attribute 1 #endif /* GL_EXT_misc_attribute */ @@ -7584,6 +7994,55 @@ GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint size, GLenum type, GLsizei #endif #endif /* GL_EXT_secondary_color */ +#ifndef GL_EXT_semaphore +#define GL_EXT_semaphore 1 +#define GL_LAYOUT_GENERAL_EXT 0x958D +#define GL_LAYOUT_COLOR_ATTACHMENT_EXT 0x958E +#define GL_LAYOUT_DEPTH_STENCIL_ATTACHMENT_EXT 0x958F +#define GL_LAYOUT_DEPTH_STENCIL_READ_ONLY_EXT 0x9590 +#define GL_LAYOUT_SHADER_READ_ONLY_EXT 0x9591 +#define GL_LAYOUT_TRANSFER_SRC_EXT 0x9592 +#define GL_LAYOUT_TRANSFER_DST_EXT 0x9593 +#define GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT 0x9530 +#define GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT 0x9531 +typedef void (APIENTRYP PFNGLGENSEMAPHORESEXTPROC) (GLsizei n, GLuint *semaphores); +typedef void (APIENTRYP PFNGLDELETESEMAPHORESEXTPROC) (GLsizei n, const GLuint *semaphores); +typedef GLboolean (APIENTRYP PFNGLISSEMAPHOREEXTPROC) (GLuint semaphore); +typedef void (APIENTRYP PFNGLSEMAPHOREPARAMETERUI64VEXTPROC) (GLuint semaphore, GLenum pname, const GLuint64 *params); +typedef void (APIENTRYP PFNGLGETSEMAPHOREPARAMETERUI64VEXTPROC) (GLuint semaphore, GLenum pname, GLuint64 *params); +typedef void (APIENTRYP PFNGLWAITSEMAPHOREEXTPROC) (GLuint semaphore, GLuint numBufferBarriers, const GLuint *buffers, GLuint numTextureBarriers, const GLuint *textures, const GLenum *srcLayouts); +typedef void (APIENTRYP PFNGLSIGNALSEMAPHOREEXTPROC) (GLuint semaphore, GLuint numBufferBarriers, const GLuint *buffers, GLuint numTextureBarriers, const GLuint *textures, const GLenum *dstLayouts); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glGenSemaphoresEXT (GLsizei n, GLuint *semaphores); +GLAPI void APIENTRY glDeleteSemaphoresEXT (GLsizei n, const GLuint *semaphores); +GLAPI GLboolean APIENTRY glIsSemaphoreEXT (GLuint semaphore); +GLAPI void APIENTRY glSemaphoreParameterui64vEXT (GLuint semaphore, GLenum pname, const GLuint64 *params); +GLAPI void APIENTRY glGetSemaphoreParameterui64vEXT (GLuint semaphore, GLenum pname, GLuint64 *params); +GLAPI void APIENTRY glWaitSemaphoreEXT (GLuint semaphore, GLuint numBufferBarriers, const GLuint *buffers, GLuint numTextureBarriers, const GLuint *textures, const GLenum *srcLayouts); +GLAPI void APIENTRY glSignalSemaphoreEXT (GLuint semaphore, GLuint numBufferBarriers, const GLuint *buffers, GLuint numTextureBarriers, const GLuint *textures, const GLenum *dstLayouts); +#endif +#endif /* GL_EXT_semaphore */ + +#ifndef GL_EXT_semaphore_fd +#define GL_EXT_semaphore_fd 1 +typedef void (APIENTRYP PFNGLIMPORTSEMAPHOREFDEXTPROC) (GLuint semaphore, GLenum handleType, GLint fd); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glImportSemaphoreFdEXT (GLuint semaphore, GLenum handleType, GLint fd); +#endif +#endif /* GL_EXT_semaphore_fd */ + +#ifndef GL_EXT_semaphore_win32 +#define GL_EXT_semaphore_win32 1 +#define GL_HANDLE_TYPE_D3D12_FENCE_EXT 0x9594 +#define GL_D3D12_FENCE_VALUE_EXT 0x9595 +typedef void (APIENTRYP PFNGLIMPORTSEMAPHOREWIN32HANDLEEXTPROC) (GLuint semaphore, GLenum handleType, void *handle); +typedef void (APIENTRYP PFNGLIMPORTSEMAPHOREWIN32NAMEEXTPROC) (GLuint semaphore, GLenum handleType, const void *name); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glImportSemaphoreWin32HandleEXT (GLuint semaphore, GLenum handleType, void *handle); +GLAPI void APIENTRY glImportSemaphoreWin32NameEXT (GLuint semaphore, GLenum handleType, const void *name); +#endif +#endif /* GL_EXT_semaphore_win32 */ + #ifndef GL_EXT_separate_shader_objects #define GL_EXT_separate_shader_objects 1 #define GL_ACTIVE_PROGRAM_EXT 0x8B8D @@ -7604,6 +8063,19 @@ GLAPI GLuint APIENTRY glCreateShaderProgramEXT (GLenum type, const GLchar *strin #define GL_SEPARATE_SPECULAR_COLOR_EXT 0x81FA #endif /* GL_EXT_separate_specular_color */ +#ifndef GL_EXT_shader_framebuffer_fetch +#define GL_EXT_shader_framebuffer_fetch 1 +#define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52 +#endif /* GL_EXT_shader_framebuffer_fetch */ + +#ifndef GL_EXT_shader_framebuffer_fetch_non_coherent +#define GL_EXT_shader_framebuffer_fetch_non_coherent 1 +typedef void (APIENTRYP PFNGLFRAMEBUFFERFETCHBARRIEREXTPROC) (void); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glFramebufferFetchBarrierEXT (void); +#endif +#endif /* GL_EXT_shader_framebuffer_fetch_non_coherent */ + #ifndef GL_EXT_shader_image_load_formatted #define GL_EXT_shader_image_load_formatted 1 #endif /* GL_EXT_shader_image_load_formatted */ @@ -7904,6 +8376,8 @@ GLAPI void APIENTRY glTexBufferEXT (GLenum target, GLenum internalformat, GLuint #ifndef GL_EXT_texture_filter_minmax #define GL_EXT_texture_filter_minmax 1 +#define GL_TEXTURE_REDUCTION_MODE_EXT 0x9366 +#define GL_WEIGHTED_AVERAGE_EXT 0x9367 #endif /* GL_EXT_texture_filter_minmax */ #ifndef GL_EXT_texture_integer @@ -8038,6 +8512,11 @@ GLAPI void APIENTRY glTextureNormalEXT (GLenum mode); #define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F #endif /* GL_EXT_texture_sRGB */ +#ifndef GL_EXT_texture_sRGB_R8 +#define GL_EXT_texture_sRGB_R8 1 +#define GL_SR8_EXT 0x8FBD +#endif /* GL_EXT_texture_sRGB_R8 */ + #ifndef GL_EXT_texture_sRGB_decode #define GL_EXT_texture_sRGB_decode 1 #define GL_TEXTURE_SRGB_DECODE_EXT 0x8A48 @@ -8450,6 +8929,30 @@ GLAPI void APIENTRY glVertexWeightPointerEXT (GLint size, GLenum type, GLsizei s #endif #endif /* GL_EXT_vertex_weighting */ +#ifndef GL_EXT_win32_keyed_mutex +#define GL_EXT_win32_keyed_mutex 1 +typedef GLboolean (APIENTRYP PFNGLACQUIREKEYEDMUTEXWIN32EXTPROC) (GLuint memory, GLuint64 key, GLuint timeout); +typedef GLboolean (APIENTRYP PFNGLRELEASEKEYEDMUTEXWIN32EXTPROC) (GLuint memory, GLuint64 key); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI GLboolean APIENTRY glAcquireKeyedMutexWin32EXT (GLuint memory, GLuint64 key, GLuint timeout); +GLAPI GLboolean APIENTRY glReleaseKeyedMutexWin32EXT (GLuint memory, GLuint64 key); +#endif +#endif /* GL_EXT_win32_keyed_mutex */ + +#ifndef GL_EXT_window_rectangles +#define GL_EXT_window_rectangles 1 +#define GL_INCLUSIVE_EXT 0x8F10 +#define GL_EXCLUSIVE_EXT 0x8F11 +#define GL_WINDOW_RECTANGLE_EXT 0x8F12 +#define GL_WINDOW_RECTANGLE_MODE_EXT 0x8F13 +#define GL_MAX_WINDOW_RECTANGLES_EXT 0x8F14 +#define GL_NUM_WINDOW_RECTANGLES_EXT 0x8F15 +typedef void (APIENTRYP PFNGLWINDOWRECTANGLESEXTPROC) (GLenum mode, GLsizei count, const GLint *box); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glWindowRectanglesEXT (GLenum mode, GLsizei count, const GLint *box); +#endif +#endif /* GL_EXT_window_rectangles */ + #ifndef GL_EXT_x11_sync_object #define GL_EXT_x11_sync_object 1 #define GL_SYNC_X11_FENCE_EXT 0x90E1 @@ -8627,10 +9130,28 @@ GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum sfactorRGB, GLenum dfactorRG #define GL_INTERLACE_READ_INGR 0x8568 #endif /* GL_INGR_interlace_read */ +#ifndef GL_INTEL_blackhole_render +#define GL_INTEL_blackhole_render 1 +#define GL_BLACKHOLE_RENDER_INTEL 0x83FC +#endif /* GL_INTEL_blackhole_render */ + +#ifndef GL_INTEL_conservative_rasterization +#define GL_INTEL_conservative_rasterization 1 +#define GL_CONSERVATIVE_RASTERIZATION_INTEL 0x83FE +#endif /* GL_INTEL_conservative_rasterization */ + #ifndef GL_INTEL_fragment_shader_ordering #define GL_INTEL_fragment_shader_ordering 1 #endif /* GL_INTEL_fragment_shader_ordering */ +#ifndef GL_INTEL_framebuffer_CMAA +#define GL_INTEL_framebuffer_CMAA 1 +typedef void (APIENTRYP PFNGLAPPLYFRAMEBUFFERATTACHMENTCMAAINTELPROC) (void); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glApplyFramebufferAttachmentCMAAINTEL (void); +#endif +#endif /* GL_INTEL_framebuffer_CMAA */ + #ifndef GL_INTEL_map_texture #define GL_INTEL_map_texture 1 #define GL_TEXTURE_MEMORY_LAYOUT_INTEL 0x83FF @@ -8695,7 +9216,7 @@ typedef void (APIENTRYP PFNGLENDPERFQUERYINTELPROC) (GLuint queryHandle); typedef void (APIENTRYP PFNGLGETFIRSTPERFQUERYIDINTELPROC) (GLuint *queryId); typedef void (APIENTRYP PFNGLGETNEXTPERFQUERYIDINTELPROC) (GLuint queryId, GLuint *nextQueryId); typedef void (APIENTRYP PFNGLGETPERFCOUNTERINFOINTELPROC) (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue); -typedef void (APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten); +typedef void (APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten); typedef void (APIENTRYP PFNGLGETPERFQUERYIDBYNAMEINTELPROC) (GLchar *queryName, GLuint *queryId); typedef void (APIENTRYP PFNGLGETPERFQUERYINFOINTELPROC) (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask); #ifdef GL_GLEXT_PROTOTYPES @@ -8706,7 +9227,7 @@ GLAPI void APIENTRY glEndPerfQueryINTEL (GLuint queryHandle); GLAPI void APIENTRY glGetFirstPerfQueryIdINTEL (GLuint *queryId); GLAPI void APIENTRY glGetNextPerfQueryIdINTEL (GLuint queryId, GLuint *nextQueryId); GLAPI void APIENTRY glGetPerfCounterInfoINTEL (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue); -GLAPI void APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten); +GLAPI void APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten); GLAPI void APIENTRY glGetPerfQueryIdByNameINTEL (GLchar *queryName, GLuint *queryId); GLAPI void APIENTRY glGetPerfQueryInfoINTEL (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask); #endif @@ -8727,6 +9248,11 @@ GLAPI void APIENTRY glGetPerfQueryInfoINTEL (GLuint queryId, GLuint queryNameLen #define GL_PACK_INVERT_MESA 0x8758 #endif /* GL_MESA_pack_invert */ +#ifndef GL_MESA_program_binary_formats +#define GL_MESA_program_binary_formats 1 +#define GL_PROGRAM_BINARY_FORMAT_MESA 0x875F +#endif /* GL_MESA_program_binary_formats */ + #ifndef GL_MESA_resize_buffers #define GL_MESA_resize_buffers 1 typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void); @@ -8735,6 +9261,17 @@ GLAPI void APIENTRY glResizeBuffersMESA (void); #endif #endif /* GL_MESA_resize_buffers */ +#ifndef GL_MESA_shader_integer_functions +#define GL_MESA_shader_integer_functions 1 +#endif /* GL_MESA_shader_integer_functions */ + +#ifndef GL_MESA_tile_raster_order +#define GL_MESA_tile_raster_order 1 +#define GL_TILE_RASTER_ORDER_FIXED_MESA 0x8BB8 +#define GL_TILE_RASTER_ORDER_INCREASING_X_MESA 0x8BB9 +#define GL_TILE_RASTER_ORDER_INCREASING_Y_MESA 0x8BBA +#endif /* GL_MESA_tile_raster_order */ + #ifndef GL_MESA_window_pos #define GL_MESA_window_pos 1 typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y); @@ -8796,6 +9333,10 @@ GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *v); #define GL_YCBCR_MESA 0x8757 #endif /* GL_MESA_ycbcr_texture */ +#ifndef GL_NVX_blend_equation_advanced_multi_draw_buffers +#define GL_NVX_blend_equation_advanced_multi_draw_buffers 1 +#endif /* GL_NVX_blend_equation_advanced_multi_draw_buffers */ + #ifndef GL_NVX_conditional_render #define GL_NVX_conditional_render 1 typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERNVXPROC) (GLuint id); @@ -8815,6 +9356,32 @@ GLAPI void APIENTRY glEndConditionalRenderNVX (void); #define GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX 0x904B #endif /* GL_NVX_gpu_memory_info */ +#ifndef GL_NVX_linked_gpu_multicast +#define GL_NVX_linked_gpu_multicast 1 +#define GL_LGPU_SEPARATE_STORAGE_BIT_NVX 0x0800 +#define GL_MAX_LGPU_GPUS_NVX 0x92BA +typedef void (APIENTRYP PFNGLLGPUNAMEDBUFFERSUBDATANVXPROC) (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data); +typedef void (APIENTRYP PFNGLLGPUCOPYIMAGESUBDATANVXPROC) (GLuint sourceGpu, GLbitfield destinationGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srxY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth); +typedef void (APIENTRYP PFNGLLGPUINTERLOCKNVXPROC) (void); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glLGPUNamedBufferSubDataNVX (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data); +GLAPI void APIENTRY glLGPUCopyImageSubDataNVX (GLuint sourceGpu, GLbitfield destinationGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srxY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth); +GLAPI void APIENTRY glLGPUInterlockNVX (void); +#endif +#endif /* GL_NVX_linked_gpu_multicast */ + +#ifndef GL_NV_alpha_to_coverage_dither_control +#define GL_NV_alpha_to_coverage_dither_control 1 +#define GL_ALPHA_TO_COVERAGE_DITHER_DEFAULT_NV 0x934D +#define GL_ALPHA_TO_COVERAGE_DITHER_ENABLE_NV 0x934E +#define GL_ALPHA_TO_COVERAGE_DITHER_DISABLE_NV 0x934F +#define GL_ALPHA_TO_COVERAGE_DITHER_MODE_NV 0x92BF +typedef void (APIENTRYP PFNGLALPHATOCOVERAGEDITHERCONTROLNVPROC) (GLenum mode); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glAlphaToCoverageDitherControlNV (GLenum mode); +#endif +#endif /* GL_NV_alpha_to_coverage_dither_control */ + #ifndef GL_NV_bindless_multi_draw_indirect #define GL_NV_bindless_multi_draw_indirect 1 typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSNVPROC) (GLenum mode, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount); @@ -8931,16 +9498,94 @@ GLAPI void APIENTRY glBlendBarrierNV (void); #define GL_BLEND_ADVANCED_COHERENT_NV 0x9285 #endif /* GL_NV_blend_equation_advanced_coherent */ +#ifndef GL_NV_blend_minmax_factor +#define GL_NV_blend_minmax_factor 1 +#endif /* GL_NV_blend_minmax_factor */ + #ifndef GL_NV_blend_square #define GL_NV_blend_square 1 #endif /* GL_NV_blend_square */ +#ifndef GL_NV_clip_space_w_scaling +#define GL_NV_clip_space_w_scaling 1 +#define GL_VIEWPORT_POSITION_W_SCALE_NV 0x937C +#define GL_VIEWPORT_POSITION_W_SCALE_X_COEFF_NV 0x937D +#define GL_VIEWPORT_POSITION_W_SCALE_Y_COEFF_NV 0x937E +typedef void (APIENTRYP PFNGLVIEWPORTPOSITIONWSCALENVPROC) (GLuint index, GLfloat xcoeff, GLfloat ycoeff); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glViewportPositionWScaleNV (GLuint index, GLfloat xcoeff, GLfloat ycoeff); +#endif +#endif /* GL_NV_clip_space_w_scaling */ + +#ifndef GL_NV_command_list +#define GL_NV_command_list 1 +#define GL_TERMINATE_SEQUENCE_COMMAND_NV 0x0000 +#define GL_NOP_COMMAND_NV 0x0001 +#define GL_DRAW_ELEMENTS_COMMAND_NV 0x0002 +#define GL_DRAW_ARRAYS_COMMAND_NV 0x0003 +#define GL_DRAW_ELEMENTS_STRIP_COMMAND_NV 0x0004 +#define GL_DRAW_ARRAYS_STRIP_COMMAND_NV 0x0005 +#define GL_DRAW_ELEMENTS_INSTANCED_COMMAND_NV 0x0006 +#define GL_DRAW_ARRAYS_INSTANCED_COMMAND_NV 0x0007 +#define GL_ELEMENT_ADDRESS_COMMAND_NV 0x0008 +#define GL_ATTRIBUTE_ADDRESS_COMMAND_NV 0x0009 +#define GL_UNIFORM_ADDRESS_COMMAND_NV 0x000A +#define GL_BLEND_COLOR_COMMAND_NV 0x000B +#define GL_STENCIL_REF_COMMAND_NV 0x000C +#define GL_LINE_WIDTH_COMMAND_NV 0x000D +#define GL_POLYGON_OFFSET_COMMAND_NV 0x000E +#define GL_ALPHA_REF_COMMAND_NV 0x000F +#define GL_VIEWPORT_COMMAND_NV 0x0010 +#define GL_SCISSOR_COMMAND_NV 0x0011 +#define GL_FRONT_FACE_COMMAND_NV 0x0012 +typedef void (APIENTRYP PFNGLCREATESTATESNVPROC) (GLsizei n, GLuint *states); +typedef void (APIENTRYP PFNGLDELETESTATESNVPROC) (GLsizei n, const GLuint *states); +typedef GLboolean (APIENTRYP PFNGLISSTATENVPROC) (GLuint state); +typedef void (APIENTRYP PFNGLSTATECAPTURENVPROC) (GLuint state, GLenum mode); +typedef GLuint (APIENTRYP PFNGLGETCOMMANDHEADERNVPROC) (GLenum tokenID, GLuint size); +typedef GLushort (APIENTRYP PFNGLGETSTAGEINDEXNVPROC) (GLenum shadertype); +typedef void (APIENTRYP PFNGLDRAWCOMMANDSNVPROC) (GLenum primitiveMode, GLuint buffer, const GLintptr *indirects, const GLsizei *sizes, GLuint count); +typedef void (APIENTRYP PFNGLDRAWCOMMANDSADDRESSNVPROC) (GLenum primitiveMode, const GLuint64 *indirects, const GLsizei *sizes, GLuint count); +typedef void (APIENTRYP PFNGLDRAWCOMMANDSSTATESNVPROC) (GLuint buffer, const GLintptr *indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count); +typedef void (APIENTRYP PFNGLDRAWCOMMANDSSTATESADDRESSNVPROC) (const GLuint64 *indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count); +typedef void (APIENTRYP PFNGLCREATECOMMANDLISTSNVPROC) (GLsizei n, GLuint *lists); +typedef void (APIENTRYP PFNGLDELETECOMMANDLISTSNVPROC) (GLsizei n, const GLuint *lists); +typedef GLboolean (APIENTRYP PFNGLISCOMMANDLISTNVPROC) (GLuint list); +typedef void (APIENTRYP PFNGLLISTDRAWCOMMANDSSTATESCLIENTNVPROC) (GLuint list, GLuint segment, const void **indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count); +typedef void (APIENTRYP PFNGLCOMMANDLISTSEGMENTSNVPROC) (GLuint list, GLuint segments); +typedef void (APIENTRYP PFNGLCOMPILECOMMANDLISTNVPROC) (GLuint list); +typedef void (APIENTRYP PFNGLCALLCOMMANDLISTNVPROC) (GLuint list); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glCreateStatesNV (GLsizei n, GLuint *states); +GLAPI void APIENTRY glDeleteStatesNV (GLsizei n, const GLuint *states); +GLAPI GLboolean APIENTRY glIsStateNV (GLuint state); +GLAPI void APIENTRY glStateCaptureNV (GLuint state, GLenum mode); +GLAPI GLuint APIENTRY glGetCommandHeaderNV (GLenum tokenID, GLuint size); +GLAPI GLushort APIENTRY glGetStageIndexNV (GLenum shadertype); +GLAPI void APIENTRY glDrawCommandsNV (GLenum primitiveMode, GLuint buffer, const GLintptr *indirects, const GLsizei *sizes, GLuint count); +GLAPI void APIENTRY glDrawCommandsAddressNV (GLenum primitiveMode, const GLuint64 *indirects, const GLsizei *sizes, GLuint count); +GLAPI void APIENTRY glDrawCommandsStatesNV (GLuint buffer, const GLintptr *indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count); +GLAPI void APIENTRY glDrawCommandsStatesAddressNV (const GLuint64 *indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count); +GLAPI void APIENTRY glCreateCommandListsNV (GLsizei n, GLuint *lists); +GLAPI void APIENTRY glDeleteCommandListsNV (GLsizei n, const GLuint *lists); +GLAPI GLboolean APIENTRY glIsCommandListNV (GLuint list); +GLAPI void APIENTRY glListDrawCommandsStatesClientNV (GLuint list, GLuint segment, const void **indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count); +GLAPI void APIENTRY glCommandListSegmentsNV (GLuint list, GLuint segments); +GLAPI void APIENTRY glCompileCommandListNV (GLuint list); +GLAPI void APIENTRY glCallCommandListNV (GLuint list); +#endif +#endif /* GL_NV_command_list */ + #ifndef GL_NV_compute_program5 #define GL_NV_compute_program5 1 #define GL_COMPUTE_PROGRAM_NV 0x90FB #define GL_COMPUTE_PROGRAM_PARAMETER_BUFFER_NV 0x90FC #endif /* GL_NV_compute_program5 */ +#ifndef GL_NV_compute_shader_derivatives +#define GL_NV_compute_shader_derivatives 1 +#endif /* GL_NV_compute_shader_derivatives */ + #ifndef GL_NV_conditional_render #define GL_NV_conditional_render 1 #define GL_QUERY_WAIT_NV 0x8E13 @@ -8967,6 +9612,37 @@ GLAPI void APIENTRY glSubpixelPrecisionBiasNV (GLuint xbits, GLuint ybits); #endif #endif /* GL_NV_conservative_raster */ +#ifndef GL_NV_conservative_raster_dilate +#define GL_NV_conservative_raster_dilate 1 +#define GL_CONSERVATIVE_RASTER_DILATE_NV 0x9379 +#define GL_CONSERVATIVE_RASTER_DILATE_RANGE_NV 0x937A +#define GL_CONSERVATIVE_RASTER_DILATE_GRANULARITY_NV 0x937B +typedef void (APIENTRYP PFNGLCONSERVATIVERASTERPARAMETERFNVPROC) (GLenum pname, GLfloat value); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glConservativeRasterParameterfNV (GLenum pname, GLfloat value); +#endif +#endif /* GL_NV_conservative_raster_dilate */ + +#ifndef GL_NV_conservative_raster_pre_snap +#define GL_NV_conservative_raster_pre_snap 1 +#define GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_NV 0x9550 +#endif /* GL_NV_conservative_raster_pre_snap */ + +#ifndef GL_NV_conservative_raster_pre_snap_triangles +#define GL_NV_conservative_raster_pre_snap_triangles 1 +#define GL_CONSERVATIVE_RASTER_MODE_NV 0x954D +#define GL_CONSERVATIVE_RASTER_MODE_POST_SNAP_NV 0x954E +#define GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_TRIANGLES_NV 0x954F +typedef void (APIENTRYP PFNGLCONSERVATIVERASTERPARAMETERINVPROC) (GLenum pname, GLint param); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glConservativeRasterParameteriNV (GLenum pname, GLint param); +#endif +#endif /* GL_NV_conservative_raster_pre_snap_triangles */ + +#ifndef GL_NV_conservative_raster_underestimation +#define GL_NV_conservative_raster_underestimation 1 +#endif /* GL_NV_conservative_raster_underestimation */ + #ifndef GL_NV_copy_depth_to_color #define GL_NV_copy_depth_to_color 1 #define GL_DEPTH_STENCIL_TO_RGBA_NV 0x886E @@ -9016,6 +9692,23 @@ GLAPI void APIENTRY glDrawTextureNV (GLuint texture, GLuint sampler, GLfloat x0, #endif #endif /* GL_NV_draw_texture */ +#ifndef GL_NV_draw_vulkan_image +#define GL_NV_draw_vulkan_image 1 +typedef void (APIENTRY *GLVULKANPROCNV)(void); +typedef void (APIENTRYP PFNGLDRAWVKIMAGENVPROC) (GLuint64 vkImage, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1); +typedef GLVULKANPROCNV (APIENTRYP PFNGLGETVKPROCADDRNVPROC) (const GLchar *name); +typedef void (APIENTRYP PFNGLWAITVKSEMAPHORENVPROC) (GLuint64 vkSemaphore); +typedef void (APIENTRYP PFNGLSIGNALVKSEMAPHORENVPROC) (GLuint64 vkSemaphore); +typedef void (APIENTRYP PFNGLSIGNALVKFENCENVPROC) (GLuint64 vkFence); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glDrawVkImageNV (GLuint64 vkImage, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1); +GLAPI GLVULKANPROCNV APIENTRY glGetVkProcAddrNV (const GLchar *name); +GLAPI void APIENTRY glWaitVkSemaphoreNV (GLuint64 vkSemaphore); +GLAPI void APIENTRY glSignalVkSemaphoreNV (GLuint64 vkSemaphore); +GLAPI void APIENTRY glSignalVkFenceNV (GLuint64 vkFence); +#endif +#endif /* GL_NV_draw_vulkan_image */ + #ifndef GL_NV_evaluators #define GL_NV_evaluators 1 #define GL_EVAL_2D_NV 0x86C0 @@ -9191,6 +9884,10 @@ GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint id, GLsizei len, cons #define GL_NV_fragment_program_option 1 #endif /* GL_NV_fragment_program_option */ +#ifndef GL_NV_fragment_shader_barycentric +#define GL_NV_fragment_shader_barycentric 1 +#endif /* GL_NV_fragment_shader_barycentric */ + #ifndef GL_NV_fragment_shader_interlock #define GL_NV_fragment_shader_interlock 1 #endif /* GL_NV_fragment_shader_interlock */ @@ -9250,6 +9947,41 @@ GLAPI void APIENTRY glFramebufferTextureFaceEXT (GLenum target, GLenum attachmen #define GL_NV_geometry_shader_passthrough 1 #endif /* GL_NV_geometry_shader_passthrough */ +#ifndef GL_NV_gpu_multicast +#define GL_NV_gpu_multicast 1 +#define GL_PER_GPU_STORAGE_BIT_NV 0x0800 +#define GL_MULTICAST_GPUS_NV 0x92BA +#define GL_RENDER_GPU_MASK_NV 0x9558 +#define GL_PER_GPU_STORAGE_NV 0x9548 +#define GL_MULTICAST_PROGRAMMABLE_SAMPLE_LOCATION_NV 0x9549 +typedef void (APIENTRYP PFNGLRENDERGPUMASKNVPROC) (GLbitfield mask); +typedef void (APIENTRYP PFNGLMULTICASTBUFFERSUBDATANVPROC) (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data); +typedef void (APIENTRYP PFNGLMULTICASTCOPYBUFFERSUBDATANVPROC) (GLuint readGpu, GLbitfield writeGpuMask, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); +typedef void (APIENTRYP PFNGLMULTICASTCOPYIMAGESUBDATANVPROC) (GLuint srcGpu, GLbitfield dstGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth); +typedef void (APIENTRYP PFNGLMULTICASTBLITFRAMEBUFFERNVPROC) (GLuint srcGpu, GLuint dstGpu, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); +typedef void (APIENTRYP PFNGLMULTICASTFRAMEBUFFERSAMPLELOCATIONSFVNVPROC) (GLuint gpu, GLuint framebuffer, GLuint start, GLsizei count, const GLfloat *v); +typedef void (APIENTRYP PFNGLMULTICASTBARRIERNVPROC) (void); +typedef void (APIENTRYP PFNGLMULTICASTWAITSYNCNVPROC) (GLuint signalGpu, GLbitfield waitGpuMask); +typedef void (APIENTRYP PFNGLMULTICASTGETQUERYOBJECTIVNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLMULTICASTGETQUERYOBJECTUIVNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLuint *params); +typedef void (APIENTRYP PFNGLMULTICASTGETQUERYOBJECTI64VNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLint64 *params); +typedef void (APIENTRYP PFNGLMULTICASTGETQUERYOBJECTUI64VNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLuint64 *params); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glRenderGpuMaskNV (GLbitfield mask); +GLAPI void APIENTRY glMulticastBufferSubDataNV (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data); +GLAPI void APIENTRY glMulticastCopyBufferSubDataNV (GLuint readGpu, GLbitfield writeGpuMask, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); +GLAPI void APIENTRY glMulticastCopyImageSubDataNV (GLuint srcGpu, GLbitfield dstGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth); +GLAPI void APIENTRY glMulticastBlitFramebufferNV (GLuint srcGpu, GLuint dstGpu, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); +GLAPI void APIENTRY glMulticastFramebufferSampleLocationsfvNV (GLuint gpu, GLuint framebuffer, GLuint start, GLsizei count, const GLfloat *v); +GLAPI void APIENTRY glMulticastBarrierNV (void); +GLAPI void APIENTRY glMulticastWaitSyncNV (GLuint signalGpu, GLbitfield waitGpuMask); +GLAPI void APIENTRY glMulticastGetQueryObjectivNV (GLuint gpu, GLuint id, GLenum pname, GLint *params); +GLAPI void APIENTRY glMulticastGetQueryObjectuivNV (GLuint gpu, GLuint id, GLenum pname, GLuint *params); +GLAPI void APIENTRY glMulticastGetQueryObjecti64vNV (GLuint gpu, GLuint id, GLenum pname, GLint64 *params); +GLAPI void APIENTRY glMulticastGetQueryObjectui64vNV (GLuint gpu, GLuint id, GLenum pname, GLuint64 *params); +#endif +#endif /* GL_NV_gpu_multicast */ + #ifndef GL_NV_gpu_program4 #define GL_NV_gpu_program4 1 #define GL_MIN_PROGRAM_TEXEL_OFFSET_NV 0x8904 @@ -9440,6 +10172,96 @@ GLAPI void APIENTRY glGetInternalformatSampleivNV (GLenum target, GLenum interna #define GL_MAX_SPOT_EXPONENT_NV 0x8505 #endif /* GL_NV_light_max_exponent */ +#ifndef GL_NV_memory_attachment +#define GL_NV_memory_attachment 1 +#define GL_ATTACHED_MEMORY_OBJECT_NV 0x95A4 +#define GL_ATTACHED_MEMORY_OFFSET_NV 0x95A5 +#define GL_MEMORY_ATTACHABLE_ALIGNMENT_NV 0x95A6 +#define GL_MEMORY_ATTACHABLE_SIZE_NV 0x95A7 +#define GL_MEMORY_ATTACHABLE_NV 0x95A8 +#define GL_DETACHED_MEMORY_INCARNATION_NV 0x95A9 +#define GL_DETACHED_TEXTURES_NV 0x95AA +#define GL_DETACHED_BUFFERS_NV 0x95AB +#define GL_MAX_DETACHED_TEXTURES_NV 0x95AC +#define GL_MAX_DETACHED_BUFFERS_NV 0x95AD +typedef void (APIENTRYP PFNGLGETMEMORYOBJECTDETACHEDRESOURCESUIVNVPROC) (GLuint memory, GLenum pname, GLint first, GLsizei count, GLuint *params); +typedef void (APIENTRYP PFNGLRESETMEMORYOBJECTPARAMETERNVPROC) (GLuint memory, GLenum pname); +typedef void (APIENTRYP PFNGLTEXATTACHMEMORYNVPROC) (GLenum target, GLuint memory, GLuint64 offset); +typedef void (APIENTRYP PFNGLBUFFERATTACHMEMORYNVPROC) (GLenum target, GLuint memory, GLuint64 offset); +typedef void (APIENTRYP PFNGLTEXTUREATTACHMEMORYNVPROC) (GLuint texture, GLuint memory, GLuint64 offset); +typedef void (APIENTRYP PFNGLNAMEDBUFFERATTACHMEMORYNVPROC) (GLuint buffer, GLuint memory, GLuint64 offset); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glGetMemoryObjectDetachedResourcesuivNV (GLuint memory, GLenum pname, GLint first, GLsizei count, GLuint *params); +GLAPI void APIENTRY glResetMemoryObjectParameterNV (GLuint memory, GLenum pname); +GLAPI void APIENTRY glTexAttachMemoryNV (GLenum target, GLuint memory, GLuint64 offset); +GLAPI void APIENTRY glBufferAttachMemoryNV (GLenum target, GLuint memory, GLuint64 offset); +GLAPI void APIENTRY glTextureAttachMemoryNV (GLuint texture, GLuint memory, GLuint64 offset); +GLAPI void APIENTRY glNamedBufferAttachMemoryNV (GLuint buffer, GLuint memory, GLuint64 offset); +#endif +#endif /* GL_NV_memory_attachment */ + +#ifndef GL_NV_mesh_shader +#define GL_NV_mesh_shader 1 +#define GL_MESH_SHADER_NV 0x9559 +#define GL_TASK_SHADER_NV 0x955A +#define GL_MAX_MESH_UNIFORM_BLOCKS_NV 0x8E60 +#define GL_MAX_MESH_TEXTURE_IMAGE_UNITS_NV 0x8E61 +#define GL_MAX_MESH_IMAGE_UNIFORMS_NV 0x8E62 +#define GL_MAX_MESH_UNIFORM_COMPONENTS_NV 0x8E63 +#define GL_MAX_MESH_ATOMIC_COUNTER_BUFFERS_NV 0x8E64 +#define GL_MAX_MESH_ATOMIC_COUNTERS_NV 0x8E65 +#define GL_MAX_MESH_SHADER_STORAGE_BLOCKS_NV 0x8E66 +#define GL_MAX_COMBINED_MESH_UNIFORM_COMPONENTS_NV 0x8E67 +#define GL_MAX_TASK_UNIFORM_BLOCKS_NV 0x8E68 +#define GL_MAX_TASK_TEXTURE_IMAGE_UNITS_NV 0x8E69 +#define GL_MAX_TASK_IMAGE_UNIFORMS_NV 0x8E6A +#define GL_MAX_TASK_UNIFORM_COMPONENTS_NV 0x8E6B +#define GL_MAX_TASK_ATOMIC_COUNTER_BUFFERS_NV 0x8E6C +#define GL_MAX_TASK_ATOMIC_COUNTERS_NV 0x8E6D +#define GL_MAX_TASK_SHADER_STORAGE_BLOCKS_NV 0x8E6E +#define GL_MAX_COMBINED_TASK_UNIFORM_COMPONENTS_NV 0x8E6F +#define GL_MAX_MESH_WORK_GROUP_INVOCATIONS_NV 0x95A2 +#define GL_MAX_TASK_WORK_GROUP_INVOCATIONS_NV 0x95A3 +#define GL_MAX_MESH_TOTAL_MEMORY_SIZE_NV 0x9536 +#define GL_MAX_TASK_TOTAL_MEMORY_SIZE_NV 0x9537 +#define GL_MAX_MESH_OUTPUT_VERTICES_NV 0x9538 +#define GL_MAX_MESH_OUTPUT_PRIMITIVES_NV 0x9539 +#define GL_MAX_TASK_OUTPUT_COUNT_NV 0x953A +#define GL_MAX_DRAW_MESH_TASKS_COUNT_NV 0x953D +#define GL_MAX_MESH_VIEWS_NV 0x9557 +#define GL_MESH_OUTPUT_PER_VERTEX_GRANULARITY_NV 0x92DF +#define GL_MESH_OUTPUT_PER_PRIMITIVE_GRANULARITY_NV 0x9543 +#define GL_MAX_MESH_WORK_GROUP_SIZE_NV 0x953B +#define GL_MAX_TASK_WORK_GROUP_SIZE_NV 0x953C +#define GL_MESH_WORK_GROUP_SIZE_NV 0x953E +#define GL_TASK_WORK_GROUP_SIZE_NV 0x953F +#define GL_MESH_VERTICES_OUT_NV 0x9579 +#define GL_MESH_PRIMITIVES_OUT_NV 0x957A +#define GL_MESH_OUTPUT_TYPE_NV 0x957B +#define GL_UNIFORM_BLOCK_REFERENCED_BY_MESH_SHADER_NV 0x959C +#define GL_UNIFORM_BLOCK_REFERENCED_BY_TASK_SHADER_NV 0x959D +#define GL_REFERENCED_BY_MESH_SHADER_NV 0x95A0 +#define GL_REFERENCED_BY_TASK_SHADER_NV 0x95A1 +#define GL_MESH_SHADER_BIT_NV 0x00000040 +#define GL_TASK_SHADER_BIT_NV 0x00000080 +#define GL_MESH_SUBROUTINE_NV 0x957C +#define GL_TASK_SUBROUTINE_NV 0x957D +#define GL_MESH_SUBROUTINE_UNIFORM_NV 0x957E +#define GL_TASK_SUBROUTINE_UNIFORM_NV 0x957F +#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_MESH_SHADER_NV 0x959E +#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TASK_SHADER_NV 0x959F +typedef void (APIENTRYP PFNGLDRAWMESHTASKSNVPROC) (GLuint first, GLuint count); +typedef void (APIENTRYP PFNGLDRAWMESHTASKSINDIRECTNVPROC) (GLintptr indirect); +typedef void (APIENTRYP PFNGLMULTIDRAWMESHTASKSINDIRECTNVPROC) (GLintptr indirect, GLsizei drawcount, GLsizei stride); +typedef void (APIENTRYP PFNGLMULTIDRAWMESHTASKSINDIRECTCOUNTNVPROC) (GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glDrawMeshTasksNV (GLuint first, GLuint count); +GLAPI void APIENTRY glDrawMeshTasksIndirectNV (GLintptr indirect); +GLAPI void APIENTRY glMultiDrawMeshTasksIndirectNV (GLintptr indirect, GLsizei drawcount, GLsizei stride); +GLAPI void APIENTRY glMultiDrawMeshTasksIndirectCountNV (GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); +#endif +#endif /* GL_NV_mesh_shader */ + #ifndef GL_NV_multisample_coverage #define GL_NV_multisample_coverage 1 #endif /* GL_NV_multisample_coverage */ @@ -9867,6 +10689,32 @@ GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint index); #endif #endif /* GL_NV_primitive_restart */ +#ifndef GL_NV_query_resource +#define GL_NV_query_resource 1 +#define GL_QUERY_RESOURCE_TYPE_VIDMEM_ALLOC_NV 0x9540 +#define GL_QUERY_RESOURCE_MEMTYPE_VIDMEM_NV 0x9542 +#define GL_QUERY_RESOURCE_SYS_RESERVED_NV 0x9544 +#define GL_QUERY_RESOURCE_TEXTURE_NV 0x9545 +#define GL_QUERY_RESOURCE_RENDERBUFFER_NV 0x9546 +#define GL_QUERY_RESOURCE_BUFFEROBJECT_NV 0x9547 +typedef GLint (APIENTRYP PFNGLQUERYRESOURCENVPROC) (GLenum queryType, GLint tagId, GLuint bufSize, GLint *buffer); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI GLint APIENTRY glQueryResourceNV (GLenum queryType, GLint tagId, GLuint bufSize, GLint *buffer); +#endif +#endif /* GL_NV_query_resource */ + +#ifndef GL_NV_query_resource_tag +#define GL_NV_query_resource_tag 1 +typedef void (APIENTRYP PFNGLGENQUERYRESOURCETAGNVPROC) (GLsizei n, GLint *tagIds); +typedef void (APIENTRYP PFNGLDELETEQUERYRESOURCETAGNVPROC) (GLsizei n, const GLint *tagIds); +typedef void (APIENTRYP PFNGLQUERYRESOURCETAGNVPROC) (GLint tagId, const GLchar *tagString); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glGenQueryResourceTagNV (GLsizei n, GLint *tagIds); +GLAPI void APIENTRY glDeleteQueryResourceTagNV (GLsizei n, const GLint *tagIds); +GLAPI void APIENTRY glQueryResourceTagNV (GLint tagId, const GLchar *tagString); +#endif +#endif /* GL_NV_query_resource_tag */ + #ifndef GL_NV_register_combiners #define GL_NV_register_combiners 1 #define GL_REGISTER_COMBINERS_NV 0x8522 @@ -9959,6 +10807,16 @@ GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum stage, GLenum pname, #endif #endif /* GL_NV_register_combiners2 */ +#ifndef GL_NV_representative_fragment_test +#define GL_NV_representative_fragment_test 1 +#define GL_REPRESENTATIVE_FRAGMENT_TEST_NV 0x937F +#endif /* GL_NV_representative_fragment_test */ + +#ifndef GL_NV_robustness_video_memory_purge +#define GL_NV_robustness_video_memory_purge 1 +#define GL_PURGED_CONTEXT_RESET_NV 0x92BB +#endif /* GL_NV_robustness_video_memory_purge */ + #ifndef GL_NV_sample_locations #define GL_NV_sample_locations 1 #define GL_SAMPLE_LOCATION_SUBPIXEL_BITS_NV 0x933D @@ -9983,6 +10841,18 @@ GLAPI void APIENTRY glResolveDepthValuesNV (void); #define GL_NV_sample_mask_override_coverage 1 #endif /* GL_NV_sample_mask_override_coverage */ +#ifndef GL_NV_scissor_exclusive +#define GL_NV_scissor_exclusive 1 +#define GL_SCISSOR_TEST_EXCLUSIVE_NV 0x9555 +#define GL_SCISSOR_BOX_EXCLUSIVE_NV 0x9556 +typedef void (APIENTRYP PFNGLSCISSOREXCLUSIVENVPROC) (GLint x, GLint y, GLsizei width, GLsizei height); +typedef void (APIENTRYP PFNGLSCISSOREXCLUSIVEARRAYVNVPROC) (GLuint first, GLsizei count, const GLint *v); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glScissorExclusiveNV (GLint x, GLint y, GLsizei width, GLsizei height); +GLAPI void APIENTRY glScissorExclusiveArrayvNV (GLuint first, GLsizei count, const GLint *v); +#endif +#endif /* GL_NV_scissor_exclusive */ + #ifndef GL_NV_shader_atomic_counters #define GL_NV_shader_atomic_counters 1 #endif /* GL_NV_shader_atomic_counters */ @@ -9991,6 +10861,10 @@ GLAPI void APIENTRY glResolveDepthValuesNV (void); #define GL_NV_shader_atomic_float 1 #endif /* GL_NV_shader_atomic_float */ +#ifndef GL_NV_shader_atomic_float64 +#define GL_NV_shader_atomic_float64 1 +#endif /* GL_NV_shader_atomic_float64 */ + #ifndef GL_NV_shader_atomic_fp16_vector #define GL_NV_shader_atomic_fp16_vector 1 #endif /* GL_NV_shader_atomic_fp16_vector */ @@ -10043,6 +10917,10 @@ GLAPI void APIENTRY glProgramUniformui64vNV (GLuint program, GLint location, GLs #define GL_NV_shader_storage_buffer_object 1 #endif /* GL_NV_shader_storage_buffer_object */ +#ifndef GL_NV_shader_texture_footprint +#define GL_NV_shader_texture_footprint 1 +#endif /* GL_NV_shader_texture_footprint */ + #ifndef GL_NV_shader_thread_group #define GL_NV_shader_thread_group 1 #define GL_WARP_SIZE_NV 0x9339 @@ -10054,6 +10932,51 @@ GLAPI void APIENTRY glProgramUniformui64vNV (GLuint program, GLint location, GLs #define GL_NV_shader_thread_shuffle 1 #endif /* GL_NV_shader_thread_shuffle */ +#ifndef GL_NV_shading_rate_image +#define GL_NV_shading_rate_image 1 +#define GL_SHADING_RATE_IMAGE_NV 0x9563 +#define GL_SHADING_RATE_NO_INVOCATIONS_NV 0x9564 +#define GL_SHADING_RATE_1_INVOCATION_PER_PIXEL_NV 0x9565 +#define GL_SHADING_RATE_1_INVOCATION_PER_1X2_PIXELS_NV 0x9566 +#define GL_SHADING_RATE_1_INVOCATION_PER_2X1_PIXELS_NV 0x9567 +#define GL_SHADING_RATE_1_INVOCATION_PER_2X2_PIXELS_NV 0x9568 +#define GL_SHADING_RATE_1_INVOCATION_PER_2X4_PIXELS_NV 0x9569 +#define GL_SHADING_RATE_1_INVOCATION_PER_4X2_PIXELS_NV 0x956A +#define GL_SHADING_RATE_1_INVOCATION_PER_4X4_PIXELS_NV 0x956B +#define GL_SHADING_RATE_2_INVOCATIONS_PER_PIXEL_NV 0x956C +#define GL_SHADING_RATE_4_INVOCATIONS_PER_PIXEL_NV 0x956D +#define GL_SHADING_RATE_8_INVOCATIONS_PER_PIXEL_NV 0x956E +#define GL_SHADING_RATE_16_INVOCATIONS_PER_PIXEL_NV 0x956F +#define GL_SHADING_RATE_IMAGE_BINDING_NV 0x955B +#define GL_SHADING_RATE_IMAGE_TEXEL_WIDTH_NV 0x955C +#define GL_SHADING_RATE_IMAGE_TEXEL_HEIGHT_NV 0x955D +#define GL_SHADING_RATE_IMAGE_PALETTE_SIZE_NV 0x955E +#define GL_MAX_COARSE_FRAGMENT_SAMPLES_NV 0x955F +#define GL_SHADING_RATE_SAMPLE_ORDER_DEFAULT_NV 0x95AE +#define GL_SHADING_RATE_SAMPLE_ORDER_PIXEL_MAJOR_NV 0x95AF +#define GL_SHADING_RATE_SAMPLE_ORDER_SAMPLE_MAJOR_NV 0x95B0 +typedef void (APIENTRYP PFNGLBINDSHADINGRATEIMAGENVPROC) (GLuint texture); +typedef void (APIENTRYP PFNGLGETSHADINGRATEIMAGEPALETTENVPROC) (GLuint viewport, GLuint entry, GLenum *rate); +typedef void (APIENTRYP PFNGLGETSHADINGRATESAMPLELOCATIONIVNVPROC) (GLenum rate, GLuint samples, GLuint index, GLint *location); +typedef void (APIENTRYP PFNGLSHADINGRATEIMAGEBARRIERNVPROC) (GLboolean synchronize); +typedef void (APIENTRYP PFNGLSHADINGRATEIMAGEPALETTENVPROC) (GLuint viewport, GLuint first, GLsizei count, const GLenum *rates); +typedef void (APIENTRYP PFNGLSHADINGRATESAMPLEORDERNVPROC) (GLenum order); +typedef void (APIENTRYP PFNGLSHADINGRATESAMPLEORDERCUSTOMNVPROC) (GLenum rate, GLuint samples, const GLint *locations); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBindShadingRateImageNV (GLuint texture); +GLAPI void APIENTRY glGetShadingRateImagePaletteNV (GLuint viewport, GLuint entry, GLenum *rate); +GLAPI void APIENTRY glGetShadingRateSampleLocationivNV (GLenum rate, GLuint samples, GLuint index, GLint *location); +GLAPI void APIENTRY glShadingRateImageBarrierNV (GLboolean synchronize); +GLAPI void APIENTRY glShadingRateImagePaletteNV (GLuint viewport, GLuint first, GLsizei count, const GLenum *rates); +GLAPI void APIENTRY glShadingRateSampleOrderNV (GLenum order); +GLAPI void APIENTRY glShadingRateSampleOrderCustomNV (GLenum rate, GLuint samples, const GLint *locations); +#endif +#endif /* GL_NV_shading_rate_image */ + +#ifndef GL_NV_stereo_view_rendering +#define GL_NV_stereo_view_rendering 1 +#endif /* GL_NV_stereo_view_rendering */ + #ifndef GL_NV_tessellation_program5 #define GL_NV_tessellation_program5 1 #define GL_MAX_PROGRAM_PATCH_ATTRIBS_NV 0x86D8 @@ -10130,6 +11053,10 @@ GLAPI void APIENTRY glTextureImage3DMultisampleCoverageNV (GLuint texture, GLenu #define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV 0x84F8 #endif /* GL_NV_texture_rectangle */ +#ifndef GL_NV_texture_rectangle_compressed +#define GL_NV_texture_rectangle_compressed 1 +#endif /* GL_NV_texture_rectangle_compressed */ + #ifndef GL_NV_texture_shader #define GL_NV_texture_shader 1 #define GL_OFFSET_TEXTURE_RECTANGLE_NV 0x864C @@ -10356,6 +11283,14 @@ GLAPI void APIENTRY glVDPAUUnmapSurfacesNV (GLsizei numSurface, const GLvdpauSur #endif #endif /* GL_NV_vdpau_interop */ +#ifndef GL_NV_vdpau_interop2 +#define GL_NV_vdpau_interop2 1 +typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTERVIDEOSURFACEWITHPICTURESTRUCTURENVPROC) (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames, GLboolean isFrameStructure); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterVideoSurfaceWithPictureStructureNV (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames, GLboolean isFrameStructure); +#endif +#endif /* GL_NV_vdpau_interop2 */ + #ifndef GL_NV_vertex_array_range #define GL_NV_vertex_array_range 1 #define GL_VERTEX_ARRAY_RANGE_NV 0x851D @@ -10824,6 +11759,26 @@ GLAPI void APIENTRY glVideoCaptureStreamParameterdvNV (GLuint video_capture_slot #define GL_NV_viewport_array2 1 #endif /* GL_NV_viewport_array2 */ +#ifndef GL_NV_viewport_swizzle +#define GL_NV_viewport_swizzle 1 +#define GL_VIEWPORT_SWIZZLE_POSITIVE_X_NV 0x9350 +#define GL_VIEWPORT_SWIZZLE_NEGATIVE_X_NV 0x9351 +#define GL_VIEWPORT_SWIZZLE_POSITIVE_Y_NV 0x9352 +#define GL_VIEWPORT_SWIZZLE_NEGATIVE_Y_NV 0x9353 +#define GL_VIEWPORT_SWIZZLE_POSITIVE_Z_NV 0x9354 +#define GL_VIEWPORT_SWIZZLE_NEGATIVE_Z_NV 0x9355 +#define GL_VIEWPORT_SWIZZLE_POSITIVE_W_NV 0x9356 +#define GL_VIEWPORT_SWIZZLE_NEGATIVE_W_NV 0x9357 +#define GL_VIEWPORT_SWIZZLE_X_NV 0x9358 +#define GL_VIEWPORT_SWIZZLE_Y_NV 0x9359 +#define GL_VIEWPORT_SWIZZLE_Z_NV 0x935A +#define GL_VIEWPORT_SWIZZLE_W_NV 0x935B +typedef void (APIENTRYP PFNGLVIEWPORTSWIZZLENVPROC) (GLuint index, GLenum swizzlex, GLenum swizzley, GLenum swizzlez, GLenum swizzlew); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glViewportSwizzleNV (GLuint index, GLenum swizzlex, GLenum swizzley, GLenum swizzlez, GLenum swizzlew); +#endif +#endif /* GL_NV_viewport_swizzle */ + #ifndef GL_OML_interlace #define GL_OML_interlace 1 #define GL_INTERLACE_OML 0x8980 @@ -10846,6 +11801,22 @@ GLAPI void APIENTRY glVideoCaptureStreamParameterdvNV (GLuint video_capture_slot #define GL_FORMAT_SUBSAMPLE_244_244_OML 0x8983 #endif /* GL_OML_subsample */ +#ifndef GL_OVR_multiview +#define GL_OVR_multiview 1 +#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR 0x9630 +#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR 0x9632 +#define GL_MAX_VIEWS_OVR 0x9631 +#define GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR 0x9633 +typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glFramebufferTextureMultiviewOVR (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews); +#endif +#endif /* GL_OVR_multiview */ + +#ifndef GL_OVR_multiview2 +#define GL_OVR_multiview2 1 +#endif /* GL_OVR_multiview2 */ + #ifndef GL_PGI_misc_hints #define GL_PGI_misc_hints 1 #define GL_PREFER_DOUBLEBUFFER_HINT_PGI 0x1A1F8 @@ -11402,10 +12373,10 @@ GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *equation); #ifndef GL_SGIX_resample #define GL_SGIX_resample 1 -#define GL_PACK_RESAMPLE_SGIX 0x842C -#define GL_UNPACK_RESAMPLE_SGIX 0x842D -#define GL_RESAMPLE_REPLICATE_SGIX 0x842E -#define GL_RESAMPLE_ZERO_FILL_SGIX 0x842F +#define GL_PACK_RESAMPLE_SGIX 0x842E +#define GL_UNPACK_RESAMPLE_SGIX 0x842F +#define GL_RESAMPLE_REPLICATE_SGIX 0x8433 +#define GL_RESAMPLE_ZERO_FILL_SGIX 0x8434 #define GL_RESAMPLE_DECIMATE_SGIX 0x8430 #endif /* GL_SGIX_resample */ diff --git a/lib/libc/include/any-windows-any/GL/glxext.h b/lib/libc/include/any-windows-any/GL/glxext.h index aa8bda6a5e..a821d95192 100644 --- a/lib/libc/include/any-windows-any/GL/glxext.h +++ b/lib/libc/include/any-windows-any/GL/glxext.h @@ -1,12 +1,12 @@ -#ifndef __glxext_h_ -#define __glxext_h_ 1 +#ifndef __glx_glxext_h_ +#define __glx_glxext_h_ 1 #ifdef __cplusplus extern "C" { #endif /* -** Copyright (c) 2013-2014 The Khronos Group Inc. +** Copyright (c) 2013-2018 The Khronos Group Inc. ** ** Permission is hereby granted, free of charge, to any person obtaining a ** copy of this software and/or associated documentation files (the @@ -31,12 +31,10 @@ extern "C" { ** This header is generated from the Khronos OpenGL / OpenGL ES XML ** API Registry. The current version of the Registry, generator scripts ** used to make the header, and the header can be found at -** http://www.opengl.org/registry/ -** -** Khronos $Revision: 28198 $ on $Date: 2014-09-18 14:42:14 +0000 (Thu, 18 Sep 2014) $ +** https://github.com/KhronosGroup/OpenGL-Registry */ -#define GLX_GLXEXT_VERSION 20140918 +#define GLX_GLXEXT_VERSION 20190411 /* Generated C header for: * API: glx @@ -178,6 +176,11 @@ GLXContext glXCreateContextAttribsARB (Display *dpy, GLXFBConfig config, GLXCont #endif #endif /* GLX_ARB_create_context */ +#ifndef GLX_ARB_create_context_no_error +#define GLX_ARB_create_context_no_error 1 +#define GLX_CONTEXT_OPENGL_NO_ERROR_ARB 0x31B3 +#endif /* GLX_ARB_create_context_no_error */ + #ifndef GLX_ARB_create_context_profile #define GLX_ARB_create_context_profile 1 #define GLX_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 @@ -277,6 +280,14 @@ void glXBlitContextFramebufferAMD (GLXContext dstCtx, GLint srcX0, GLint srcY0, #define GLX_BACK_BUFFER_AGE_EXT 0x20F4 #endif /* GLX_EXT_buffer_age */ +#ifndef GLX_EXT_context_priority +#define GLX_EXT_context_priority 1 +#define GLX_CONTEXT_PRIORITY_LEVEL_EXT 0x3100 +#define GLX_CONTEXT_PRIORITY_HIGH_EXT 0x3101 +#define GLX_CONTEXT_PRIORITY_MEDIUM_EXT 0x3102 +#define GLX_CONTEXT_PRIORITY_LOW_EXT 0x3103 +#endif /* GLX_EXT_context_priority */ + #ifndef GLX_EXT_create_context_es2_profile #define GLX_EXT_create_context_es2_profile 1 #define GLX_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004 @@ -317,6 +328,15 @@ void glXFreeContextEXT (Display *dpy, GLXContext context); #endif #endif /* GLX_EXT_import_context */ +#ifndef GLX_EXT_libglvnd +#define GLX_EXT_libglvnd 1 +#define GLX_VENDOR_NAMES_EXT 0x20F6 +#endif /* GLX_EXT_libglvnd */ + +#ifndef GLX_EXT_no_config_context +#define GLX_EXT_no_config_context 1 +#endif /* GLX_EXT_no_config_context */ + #ifndef GLX_EXT_stereo_tree #define GLX_EXT_stereo_tree 1 typedef struct { @@ -464,7 +484,6 @@ GLXPixmap glXCreateGLXPixmapMESA (Display *dpy, XVisualInfo *visual, Pixmap pixm #define GLX_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION_MESA 0x818B #define GLX_RENDERER_OPENGL_ES_PROFILE_VERSION_MESA 0x818C #define GLX_RENDERER_OPENGL_ES2_PROFILE_VERSION_MESA 0x818D -#define GLX_RENDERER_ID_MESA 0x818E typedef Bool ( *PFNGLXQUERYCURRENTRENDERERINTEGERMESAPROC) (int attribute, unsigned int *value); typedef const char *( *PFNGLXQUERYCURRENTRENDERERSTRINGMESAPROC) (int attribute); typedef Bool ( *PFNGLXQUERYRENDERERINTEGERMESAPROC) (Display *dpy, int screen, int renderer, int attribute, unsigned int *value); @@ -489,12 +508,22 @@ Bool glXReleaseBuffersMESA (Display *dpy, GLXDrawable drawable); #define GLX_MESA_set_3dfx_mode 1 #define GLX_3DFX_WINDOW_MODE_MESA 0x1 #define GLX_3DFX_FULLSCREEN_MODE_MESA 0x2 -typedef Bool ( *PFNGLXSET3DFXMODEMESAPROC) (int mode); +typedef GLboolean ( *PFNGLXSET3DFXMODEMESAPROC) (GLint mode); #ifdef GLX_GLXEXT_PROTOTYPES -Bool glXSet3DfxModeMESA (int mode); +GLboolean glXSet3DfxModeMESA (GLint mode); #endif #endif /* GLX_MESA_set_3dfx_mode */ +#ifndef GLX_MESA_swap_control +#define GLX_MESA_swap_control 1 +typedef int ( *PFNGLXGETSWAPINTERVALMESAPROC) (void); +typedef int ( *PFNGLXSWAPINTERVALMESAPROC) (unsigned int interval); +#ifdef GLX_GLXEXT_PROTOTYPES +int glXGetSwapIntervalMESA (void); +int glXSwapIntervalMESA (unsigned int interval); +#endif +#endif /* GLX_MESA_swap_control */ + #ifndef GLX_NV_copy_buffer #define GLX_NV_copy_buffer 1 typedef void ( *PFNGLXCOPYBUFFERSUBDATANVPROC) (Display *dpy, GLXContext readCtx, GLXContext writeCtx, GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); @@ -543,6 +572,11 @@ int glXBindVideoDeviceNV (Display *dpy, unsigned int video_slot, unsigned int vi #endif #endif /* GLX_NV_present_video */ +#ifndef GLX_NV_robustness_video_memory_purge +#define GLX_NV_robustness_video_memory_purge 1 +#define GLX_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV 0x20F7 +#endif /* GLX_NV_robustness_video_memory_purge */ + #ifndef GLX_NV_swap_group #define GLX_NV_swap_group 1 typedef Bool ( *PFNGLXJOINSWAPGROUPNVPROC) (Display *dpy, GLXDrawable drawable, GLuint group); @@ -809,13 +843,13 @@ int glXQueryHyperpipeAttribSGIX (Display *dpy, int timeSlice, int attrib, int si #define GLX_PBUFFER_SGIX 0x8023 typedef GLXPbufferSGIX ( *PFNGLXCREATEGLXPBUFFERSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list); typedef void ( *PFNGLXDESTROYGLXPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuf); -typedef int ( *PFNGLXQUERYGLXPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value); +typedef void ( *PFNGLXQUERYGLXPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value); typedef void ( *PFNGLXSELECTEVENTSGIXPROC) (Display *dpy, GLXDrawable drawable, unsigned long mask); typedef void ( *PFNGLXGETSELECTEDEVENTSGIXPROC) (Display *dpy, GLXDrawable drawable, unsigned long *mask); #ifdef GLX_GLXEXT_PROTOTYPES GLXPbufferSGIX glXCreateGLXPbufferSGIX (Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list); void glXDestroyGLXPbufferSGIX (Display *dpy, GLXPbufferSGIX pbuf); -int glXQueryGLXPbufferSGIX (Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value); +void glXQueryGLXPbufferSGIX (Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value); void glXSelectEventSGIX (Display *dpy, GLXDrawable drawable, unsigned long mask); void glXGetSelectedEventSGIX (Display *dpy, GLXDrawable drawable, unsigned long *mask); #endif @@ -913,9 +947,9 @@ int glXWaitVideoSyncSGI (int divisor, int remainder, unsigned int *count); #ifndef GLX_SUN_get_transparent_index #define GLX_SUN_get_transparent_index 1 -typedef Status ( *PFNGLXGETTRANSPARENTINDEXSUNPROC) (Display *dpy, Window overlay, Window underlay, long *pTransparentIndex); +typedef Status ( *PFNGLXGETTRANSPARENTINDEXSUNPROC) (Display *dpy, Window overlay, Window underlay, unsigned long *pTransparentIndex); #ifdef GLX_GLXEXT_PROTOTYPES -Status glXGetTransparentIndexSUN (Display *dpy, Window overlay, Window underlay, long *pTransparentIndex); +Status glXGetTransparentIndexSUN (Display *dpy, Window overlay, Window underlay, unsigned long *pTransparentIndex); #endif #endif /* GLX_SUN_get_transparent_index */ diff --git a/lib/libc/include/any-windows-any/GL/wgl.h b/lib/libc/include/any-windows-any/GL/wgl.h new file mode 100644 index 0000000000..3f94946e0b --- /dev/null +++ b/lib/libc/include/any-windows-any/GL/wgl.h @@ -0,0 +1,946 @@ +#ifndef __wgl_wgl_h_ +#define __wgl_wgl_h_ 1 + +#ifdef __cplusplus +extern "C" { +#endif + +/* +** Copyright (c) 2013-2018 The Khronos Group Inc. +** +** Permission is hereby granted, free of charge, to any person obtaining a +** copy of this software and/or associated documentation files (the +** "Materials"), to deal in the Materials without restriction, including +** without limitation the rights to use, copy, modify, merge, publish, +** distribute, sublicense, and/or sell copies of the Materials, and to +** permit persons to whom the Materials are furnished to do so, subject to +** the following conditions: +** +** The above copyright notice and this permission notice shall be included +** in all copies or substantial portions of the Materials. +** +** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. +*/ +/* +** This header is generated from the Khronos OpenGL / OpenGL ES XML +** API Registry. The current version of the Registry, generator scripts +** used to make the header, and the header can be found at +** https://github.com/KhronosGroup/OpenGL-Registry +*/ + +#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) +#define WIN32_LEAN_AND_MEAN 1 +#include +#endif + +/* Generated on date 20190228 */ + +/* Generated C header for: + * API: wgl + * Versions considered: .* + * Versions emitted: .* + * Default extensions included: wgl + * Additional extensions included: _nomatch_^ + * Extensions removed: _nomatch_^ + */ + +#ifndef WGL_VERSION_1_0 +#define WGL_VERSION_1_0 1 +#define WGL_FONT_LINES 0 +#define WGL_FONT_POLYGONS 1 +#define WGL_SWAP_MAIN_PLANE 0x00000001 +#define WGL_SWAP_OVERLAY1 0x00000002 +#define WGL_SWAP_OVERLAY2 0x00000004 +#define WGL_SWAP_OVERLAY3 0x00000008 +#define WGL_SWAP_OVERLAY4 0x00000010 +#define WGL_SWAP_OVERLAY5 0x00000020 +#define WGL_SWAP_OVERLAY6 0x00000040 +#define WGL_SWAP_OVERLAY7 0x00000080 +#define WGL_SWAP_OVERLAY8 0x00000100 +#define WGL_SWAP_OVERLAY9 0x00000200 +#define WGL_SWAP_OVERLAY10 0x00000400 +#define WGL_SWAP_OVERLAY11 0x00000800 +#define WGL_SWAP_OVERLAY12 0x00001000 +#define WGL_SWAP_OVERLAY13 0x00002000 +#define WGL_SWAP_OVERLAY14 0x00004000 +#define WGL_SWAP_OVERLAY15 0x00008000 +#define WGL_SWAP_UNDERLAY1 0x00010000 +#define WGL_SWAP_UNDERLAY2 0x00020000 +#define WGL_SWAP_UNDERLAY3 0x00040000 +#define WGL_SWAP_UNDERLAY4 0x00080000 +#define WGL_SWAP_UNDERLAY5 0x00100000 +#define WGL_SWAP_UNDERLAY6 0x00200000 +#define WGL_SWAP_UNDERLAY7 0x00400000 +#define WGL_SWAP_UNDERLAY8 0x00800000 +#define WGL_SWAP_UNDERLAY9 0x01000000 +#define WGL_SWAP_UNDERLAY10 0x02000000 +#define WGL_SWAP_UNDERLAY11 0x04000000 +#define WGL_SWAP_UNDERLAY12 0x08000000 +#define WGL_SWAP_UNDERLAY13 0x10000000 +#define WGL_SWAP_UNDERLAY14 0x20000000 +#define WGL_SWAP_UNDERLAY15 0x40000000 +typedef int (WINAPI * PFNCHOOSEPIXELFORMATPROC) (HDC hDc, const PIXELFORMATDESCRIPTOR *pPfd); +typedef int (WINAPI * PFNDESCRIBEPIXELFORMATPROC) (HDC hdc, int ipfd, UINT cjpfd, const PIXELFORMATDESCRIPTOR *ppfd); +typedef UINT (WINAPI * PFNGETENHMETAFILEPIXELFORMATPROC) (HENHMETAFILE hemf, const PIXELFORMATDESCRIPTOR *ppfd); +typedef int (WINAPI * PFNGETPIXELFORMATPROC) (HDC hdc); +typedef BOOL (WINAPI * PFNSETPIXELFORMATPROC) (HDC hdc, int ipfd, const PIXELFORMATDESCRIPTOR *ppfd); +typedef BOOL (WINAPI * PFNSWAPBUFFERSPROC) (HDC hdc); +typedef BOOL (WINAPI * PFNWGLCOPYCONTEXTPROC) (HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask); +typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTPROC) (HDC hDc); +typedef HGLRC (WINAPI * PFNWGLCREATELAYERCONTEXTPROC) (HDC hDc, int level); +typedef BOOL (WINAPI * PFNWGLDELETECONTEXTPROC) (HGLRC oldContext); +typedef BOOL (WINAPI * PFNWGLDESCRIBELAYERPLANEPROC) (HDC hDc, int pixelFormat, int layerPlane, UINT nBytes, const LAYERPLANEDESCRIPTOR *plpd); +typedef HGLRC (WINAPI * PFNWGLGETCURRENTCONTEXTPROC) (void); +typedef HDC (WINAPI * PFNWGLGETCURRENTDCPROC) (void); +typedef int (WINAPI * PFNWGLGETLAYERPALETTEENTRIESPROC) (HDC hdc, int iLayerPlane, int iStart, int cEntries, const COLORREF *pcr); +typedef PROC (WINAPI * PFNWGLGETPROCADDRESSPROC) (LPCSTR lpszProc); +typedef BOOL (WINAPI * PFNWGLMAKECURRENTPROC) (HDC hDc, HGLRC newContext); +typedef BOOL (WINAPI * PFNWGLREALIZELAYERPALETTEPROC) (HDC hdc, int iLayerPlane, BOOL bRealize); +typedef int (WINAPI * PFNWGLSETLAYERPALETTEENTRIESPROC) (HDC hdc, int iLayerPlane, int iStart, int cEntries, const COLORREF *pcr); +typedef BOOL (WINAPI * PFNWGLSHARELISTSPROC) (HGLRC hrcSrvShare, HGLRC hrcSrvSource); +typedef BOOL (WINAPI * PFNWGLSWAPLAYERBUFFERSPROC) (HDC hdc, UINT fuFlags); +typedef BOOL (WINAPI * PFNWGLUSEFONTBITMAPSPROC) (HDC hDC, DWORD first, DWORD count, DWORD listBase); +typedef BOOL (WINAPI * PFNWGLUSEFONTBITMAPSAPROC) (HDC hDC, DWORD first, DWORD count, DWORD listBase); +typedef BOOL (WINAPI * PFNWGLUSEFONTBITMAPSWPROC) (HDC hDC, DWORD first, DWORD count, DWORD listBase); +typedef BOOL (WINAPI * PFNWGLUSEFONTOUTLINESPROC) (HDC hDC, DWORD first, DWORD count, DWORD listBase, FLOAT deviation, FLOAT extrusion, int format, LPGLYPHMETRICSFLOAT lpgmf); +typedef BOOL (WINAPI * PFNWGLUSEFONTOUTLINESAPROC) (HDC hDC, DWORD first, DWORD count, DWORD listBase, FLOAT deviation, FLOAT extrusion, int format, LPGLYPHMETRICSFLOAT lpgmf); +typedef BOOL (WINAPI * PFNWGLUSEFONTOUTLINESWPROC) (HDC hDC, DWORD first, DWORD count, DWORD listBase, FLOAT deviation, FLOAT extrusion, int format, LPGLYPHMETRICSFLOAT lpgmf); +#ifdef WGL_WGLEXT_PROTOTYPES +int WINAPI ChoosePixelFormat (HDC hDc, const PIXELFORMATDESCRIPTOR *pPfd); +int WINAPI DescribePixelFormat (HDC hdc, int ipfd, UINT cjpfd, const PIXELFORMATDESCRIPTOR *ppfd); +UINT WINAPI GetEnhMetaFilePixelFormat (HENHMETAFILE hemf, const PIXELFORMATDESCRIPTOR *ppfd); +int WINAPI GetPixelFormat (HDC hdc); +BOOL WINAPI SetPixelFormat (HDC hdc, int ipfd, const PIXELFORMATDESCRIPTOR *ppfd); +BOOL WINAPI SwapBuffers (HDC hdc); +BOOL WINAPI wglCopyContext (HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask); +HGLRC WINAPI wglCreateContext (HDC hDc); +HGLRC WINAPI wglCreateLayerContext (HDC hDc, int level); +BOOL WINAPI wglDeleteContext (HGLRC oldContext); +BOOL WINAPI wglDescribeLayerPlane (HDC hDc, int pixelFormat, int layerPlane, UINT nBytes, const LAYERPLANEDESCRIPTOR *plpd); +HGLRC WINAPI wglGetCurrentContext (void); +HDC WINAPI wglGetCurrentDC (void); +int WINAPI wglGetLayerPaletteEntries (HDC hdc, int iLayerPlane, int iStart, int cEntries, const COLORREF *pcr); +PROC WINAPI wglGetProcAddress (LPCSTR lpszProc); +BOOL WINAPI wglMakeCurrent (HDC hDc, HGLRC newContext); +BOOL WINAPI wglRealizeLayerPalette (HDC hdc, int iLayerPlane, BOOL bRealize); +int WINAPI wglSetLayerPaletteEntries (HDC hdc, int iLayerPlane, int iStart, int cEntries, const COLORREF *pcr); +BOOL WINAPI wglShareLists (HGLRC hrcSrvShare, HGLRC hrcSrvSource); +BOOL WINAPI wglSwapLayerBuffers (HDC hdc, UINT fuFlags); +BOOL WINAPI wglUseFontBitmaps (HDC hDC, DWORD first, DWORD count, DWORD listBase); +BOOL WINAPI wglUseFontBitmapsA (HDC hDC, DWORD first, DWORD count, DWORD listBase); +BOOL WINAPI wglUseFontBitmapsW (HDC hDC, DWORD first, DWORD count, DWORD listBase); +BOOL WINAPI wglUseFontOutlines (HDC hDC, DWORD first, DWORD count, DWORD listBase, FLOAT deviation, FLOAT extrusion, int format, LPGLYPHMETRICSFLOAT lpgmf); +BOOL WINAPI wglUseFontOutlinesA (HDC hDC, DWORD first, DWORD count, DWORD listBase, FLOAT deviation, FLOAT extrusion, int format, LPGLYPHMETRICSFLOAT lpgmf); +BOOL WINAPI wglUseFontOutlinesW (HDC hDC, DWORD first, DWORD count, DWORD listBase, FLOAT deviation, FLOAT extrusion, int format, LPGLYPHMETRICSFLOAT lpgmf); +#endif +#endif /* WGL_VERSION_1_0 */ + +#ifndef WGL_ARB_buffer_region +#define WGL_ARB_buffer_region 1 +#define WGL_FRONT_COLOR_BUFFER_BIT_ARB 0x00000001 +#define WGL_BACK_COLOR_BUFFER_BIT_ARB 0x00000002 +#define WGL_DEPTH_BUFFER_BIT_ARB 0x00000004 +#define WGL_STENCIL_BUFFER_BIT_ARB 0x00000008 +typedef HANDLE (WINAPI * PFNWGLCREATEBUFFERREGIONARBPROC) (HDC hDC, int iLayerPlane, UINT uType); +typedef VOID (WINAPI * PFNWGLDELETEBUFFERREGIONARBPROC) (HANDLE hRegion); +typedef BOOL (WINAPI * PFNWGLSAVEBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height); +typedef BOOL (WINAPI * PFNWGLRESTOREBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc); +#ifdef WGL_WGLEXT_PROTOTYPES +HANDLE WINAPI wglCreateBufferRegionARB (HDC hDC, int iLayerPlane, UINT uType); +VOID WINAPI wglDeleteBufferRegionARB (HANDLE hRegion); +BOOL WINAPI wglSaveBufferRegionARB (HANDLE hRegion, int x, int y, int width, int height); +BOOL WINAPI wglRestoreBufferRegionARB (HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc); +#endif +#endif /* WGL_ARB_buffer_region */ + +#ifndef WGL_ARB_context_flush_control +#define WGL_ARB_context_flush_control 1 +#define WGL_CONTEXT_RELEASE_BEHAVIOR_ARB 0x2097 +#define WGL_CONTEXT_RELEASE_BEHAVIOR_NONE_ARB 0 +#define WGL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_ARB 0x2098 +#endif /* WGL_ARB_context_flush_control */ + +#ifndef WGL_ARB_create_context +#define WGL_ARB_create_context 1 +#define WGL_CONTEXT_DEBUG_BIT_ARB 0x00000001 +#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002 +#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 +#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092 +#define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093 +#define WGL_CONTEXT_FLAGS_ARB 0x2094 +#define ERROR_INVALID_VERSION_ARB 0x2095 +typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShareContext, const int *attribList); +#ifdef WGL_WGLEXT_PROTOTYPES +HGLRC WINAPI wglCreateContextAttribsARB (HDC hDC, HGLRC hShareContext, const int *attribList); +#endif +#endif /* WGL_ARB_create_context */ + +#ifndef WGL_ARB_create_context_no_error +#define WGL_ARB_create_context_no_error 1 +#define WGL_CONTEXT_OPENGL_NO_ERROR_ARB 0x31B3 +#endif /* WGL_ARB_create_context_no_error */ + +#ifndef WGL_ARB_create_context_profile +#define WGL_ARB_create_context_profile 1 +#define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126 +#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 +#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002 +#define ERROR_INVALID_PROFILE_ARB 0x2096 +#endif /* WGL_ARB_create_context_profile */ + +#ifndef WGL_ARB_create_context_robustness +#define WGL_ARB_create_context_robustness 1 +#define WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB 0x00000004 +#define WGL_LOSE_CONTEXT_ON_RESET_ARB 0x8252 +#define WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB 0x8256 +#define WGL_NO_RESET_NOTIFICATION_ARB 0x8261 +#endif /* WGL_ARB_create_context_robustness */ + +#ifndef WGL_ARB_extensions_string +#define WGL_ARB_extensions_string 1 +typedef const char *(WINAPI * PFNWGLGETEXTENSIONSSTRINGARBPROC) (HDC hdc); +#ifdef WGL_WGLEXT_PROTOTYPES +const char *WINAPI wglGetExtensionsStringARB (HDC hdc); +#endif +#endif /* WGL_ARB_extensions_string */ + +#ifndef WGL_ARB_framebuffer_sRGB +#define WGL_ARB_framebuffer_sRGB 1 +#define WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20A9 +#endif /* WGL_ARB_framebuffer_sRGB */ + +#ifndef WGL_ARB_make_current_read +#define WGL_ARB_make_current_read 1 +#define ERROR_INVALID_PIXEL_TYPE_ARB 0x2043 +#define ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB 0x2054 +typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTARBPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc); +typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCARBPROC) (void); +#ifdef WGL_WGLEXT_PROTOTYPES +BOOL WINAPI wglMakeContextCurrentARB (HDC hDrawDC, HDC hReadDC, HGLRC hglrc); +HDC WINAPI wglGetCurrentReadDCARB (void); +#endif +#endif /* WGL_ARB_make_current_read */ + +#ifndef WGL_ARB_multisample +#define WGL_ARB_multisample 1 +#define WGL_SAMPLE_BUFFERS_ARB 0x2041 +#define WGL_SAMPLES_ARB 0x2042 +#endif /* WGL_ARB_multisample */ + +#ifndef WGL_ARB_pbuffer +#define WGL_ARB_pbuffer 1 +DECLARE_HANDLE(HPBUFFERARB); +#define WGL_DRAW_TO_PBUFFER_ARB 0x202D +#define WGL_MAX_PBUFFER_PIXELS_ARB 0x202E +#define WGL_MAX_PBUFFER_WIDTH_ARB 0x202F +#define WGL_MAX_PBUFFER_HEIGHT_ARB 0x2030 +#define WGL_PBUFFER_LARGEST_ARB 0x2033 +#define WGL_PBUFFER_WIDTH_ARB 0x2034 +#define WGL_PBUFFER_HEIGHT_ARB 0x2035 +#define WGL_PBUFFER_LOST_ARB 0x2036 +typedef HPBUFFERARB (WINAPI * PFNWGLCREATEPBUFFERARBPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList); +typedef HDC (WINAPI * PFNWGLGETPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer); +typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer, HDC hDC); +typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFERARBPROC) (HPBUFFERARB hPbuffer); +typedef BOOL (WINAPI * PFNWGLQUERYPBUFFERARBPROC) (HPBUFFERARB hPbuffer, int iAttribute, int *piValue); +#ifdef WGL_WGLEXT_PROTOTYPES +HPBUFFERARB WINAPI wglCreatePbufferARB (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList); +HDC WINAPI wglGetPbufferDCARB (HPBUFFERARB hPbuffer); +int WINAPI wglReleasePbufferDCARB (HPBUFFERARB hPbuffer, HDC hDC); +BOOL WINAPI wglDestroyPbufferARB (HPBUFFERARB hPbuffer); +BOOL WINAPI wglQueryPbufferARB (HPBUFFERARB hPbuffer, int iAttribute, int *piValue); +#endif +#endif /* WGL_ARB_pbuffer */ + +#ifndef WGL_ARB_pixel_format +#define WGL_ARB_pixel_format 1 +#define WGL_NUMBER_PIXEL_FORMATS_ARB 0x2000 +#define WGL_DRAW_TO_WINDOW_ARB 0x2001 +#define WGL_DRAW_TO_BITMAP_ARB 0x2002 +#define WGL_ACCELERATION_ARB 0x2003 +#define WGL_NEED_PALETTE_ARB 0x2004 +#define WGL_NEED_SYSTEM_PALETTE_ARB 0x2005 +#define WGL_SWAP_LAYER_BUFFERS_ARB 0x2006 +#define WGL_SWAP_METHOD_ARB 0x2007 +#define WGL_NUMBER_OVERLAYS_ARB 0x2008 +#define WGL_NUMBER_UNDERLAYS_ARB 0x2009 +#define WGL_TRANSPARENT_ARB 0x200A +#define WGL_TRANSPARENT_RED_VALUE_ARB 0x2037 +#define WGL_TRANSPARENT_GREEN_VALUE_ARB 0x2038 +#define WGL_TRANSPARENT_BLUE_VALUE_ARB 0x2039 +#define WGL_TRANSPARENT_ALPHA_VALUE_ARB 0x203A +#define WGL_TRANSPARENT_INDEX_VALUE_ARB 0x203B +#define WGL_SHARE_DEPTH_ARB 0x200C +#define WGL_SHARE_STENCIL_ARB 0x200D +#define WGL_SHARE_ACCUM_ARB 0x200E +#define WGL_SUPPORT_GDI_ARB 0x200F +#define WGL_SUPPORT_OPENGL_ARB 0x2010 +#define WGL_DOUBLE_BUFFER_ARB 0x2011 +#define WGL_STEREO_ARB 0x2012 +#define WGL_PIXEL_TYPE_ARB 0x2013 +#define WGL_COLOR_BITS_ARB 0x2014 +#define WGL_RED_BITS_ARB 0x2015 +#define WGL_RED_SHIFT_ARB 0x2016 +#define WGL_GREEN_BITS_ARB 0x2017 +#define WGL_GREEN_SHIFT_ARB 0x2018 +#define WGL_BLUE_BITS_ARB 0x2019 +#define WGL_BLUE_SHIFT_ARB 0x201A +#define WGL_ALPHA_BITS_ARB 0x201B +#define WGL_ALPHA_SHIFT_ARB 0x201C +#define WGL_ACCUM_BITS_ARB 0x201D +#define WGL_ACCUM_RED_BITS_ARB 0x201E +#define WGL_ACCUM_GREEN_BITS_ARB 0x201F +#define WGL_ACCUM_BLUE_BITS_ARB 0x2020 +#define WGL_ACCUM_ALPHA_BITS_ARB 0x2021 +#define WGL_DEPTH_BITS_ARB 0x2022 +#define WGL_STENCIL_BITS_ARB 0x2023 +#define WGL_AUX_BUFFERS_ARB 0x2024 +#define WGL_NO_ACCELERATION_ARB 0x2025 +#define WGL_GENERIC_ACCELERATION_ARB 0x2026 +#define WGL_FULL_ACCELERATION_ARB 0x2027 +#define WGL_SWAP_EXCHANGE_ARB 0x2028 +#define WGL_SWAP_COPY_ARB 0x2029 +#define WGL_SWAP_UNDEFINED_ARB 0x202A +#define WGL_TYPE_RGBA_ARB 0x202B +#define WGL_TYPE_COLORINDEX_ARB 0x202C +typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues); +typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues); +typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATARBPROC) (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); +#ifdef WGL_WGLEXT_PROTOTYPES +BOOL WINAPI wglGetPixelFormatAttribivARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues); +BOOL WINAPI wglGetPixelFormatAttribfvARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues); +BOOL WINAPI wglChoosePixelFormatARB (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); +#endif +#endif /* WGL_ARB_pixel_format */ + +#ifndef WGL_ARB_pixel_format_float +#define WGL_ARB_pixel_format_float 1 +#define WGL_TYPE_RGBA_FLOAT_ARB 0x21A0 +#endif /* WGL_ARB_pixel_format_float */ + +#ifndef WGL_ARB_render_texture +#define WGL_ARB_render_texture 1 +#define WGL_BIND_TO_TEXTURE_RGB_ARB 0x2070 +#define WGL_BIND_TO_TEXTURE_RGBA_ARB 0x2071 +#define WGL_TEXTURE_FORMAT_ARB 0x2072 +#define WGL_TEXTURE_TARGET_ARB 0x2073 +#define WGL_MIPMAP_TEXTURE_ARB 0x2074 +#define WGL_TEXTURE_RGB_ARB 0x2075 +#define WGL_TEXTURE_RGBA_ARB 0x2076 +#define WGL_NO_TEXTURE_ARB 0x2077 +#define WGL_TEXTURE_CUBE_MAP_ARB 0x2078 +#define WGL_TEXTURE_1D_ARB 0x2079 +#define WGL_TEXTURE_2D_ARB 0x207A +#define WGL_MIPMAP_LEVEL_ARB 0x207B +#define WGL_CUBE_MAP_FACE_ARB 0x207C +#define WGL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x207D +#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x207E +#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x207F +#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x2080 +#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x2081 +#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x2082 +#define WGL_FRONT_LEFT_ARB 0x2083 +#define WGL_FRONT_RIGHT_ARB 0x2084 +#define WGL_BACK_LEFT_ARB 0x2085 +#define WGL_BACK_RIGHT_ARB 0x2086 +#define WGL_AUX0_ARB 0x2087 +#define WGL_AUX1_ARB 0x2088 +#define WGL_AUX2_ARB 0x2089 +#define WGL_AUX3_ARB 0x208A +#define WGL_AUX4_ARB 0x208B +#define WGL_AUX5_ARB 0x208C +#define WGL_AUX6_ARB 0x208D +#define WGL_AUX7_ARB 0x208E +#define WGL_AUX8_ARB 0x208F +#define WGL_AUX9_ARB 0x2090 +typedef BOOL (WINAPI * PFNWGLBINDTEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer); +typedef BOOL (WINAPI * PFNWGLRELEASETEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer); +typedef BOOL (WINAPI * PFNWGLSETPBUFFERATTRIBARBPROC) (HPBUFFERARB hPbuffer, const int *piAttribList); +#ifdef WGL_WGLEXT_PROTOTYPES +BOOL WINAPI wglBindTexImageARB (HPBUFFERARB hPbuffer, int iBuffer); +BOOL WINAPI wglReleaseTexImageARB (HPBUFFERARB hPbuffer, int iBuffer); +BOOL WINAPI wglSetPbufferAttribARB (HPBUFFERARB hPbuffer, const int *piAttribList); +#endif +#endif /* WGL_ARB_render_texture */ + +#ifndef WGL_ARB_robustness_application_isolation +#define WGL_ARB_robustness_application_isolation 1 +#define WGL_CONTEXT_RESET_ISOLATION_BIT_ARB 0x00000008 +#endif /* WGL_ARB_robustness_application_isolation */ + +#ifndef WGL_ARB_robustness_share_group_isolation +#define WGL_ARB_robustness_share_group_isolation 1 +#endif /* WGL_ARB_robustness_share_group_isolation */ + +#ifndef WGL_3DFX_multisample +#define WGL_3DFX_multisample 1 +#define WGL_SAMPLE_BUFFERS_3DFX 0x2060 +#define WGL_SAMPLES_3DFX 0x2061 +#endif /* WGL_3DFX_multisample */ + +#ifndef WGL_3DL_stereo_control +#define WGL_3DL_stereo_control 1 +#define WGL_STEREO_EMITTER_ENABLE_3DL 0x2055 +#define WGL_STEREO_EMITTER_DISABLE_3DL 0x2056 +#define WGL_STEREO_POLARITY_NORMAL_3DL 0x2057 +#define WGL_STEREO_POLARITY_INVERT_3DL 0x2058 +typedef BOOL (WINAPI * PFNWGLSETSTEREOEMITTERSTATE3DLPROC) (HDC hDC, UINT uState); +#ifdef WGL_WGLEXT_PROTOTYPES +BOOL WINAPI wglSetStereoEmitterState3DL (HDC hDC, UINT uState); +#endif +#endif /* WGL_3DL_stereo_control */ + +#ifndef WGL_AMD_gpu_association +#define WGL_AMD_gpu_association 1 +#define WGL_GPU_VENDOR_AMD 0x1F00 +#define WGL_GPU_RENDERER_STRING_AMD 0x1F01 +#define WGL_GPU_OPENGL_VERSION_STRING_AMD 0x1F02 +#define WGL_GPU_FASTEST_TARGET_GPUS_AMD 0x21A2 +#define WGL_GPU_RAM_AMD 0x21A3 +#define WGL_GPU_CLOCK_AMD 0x21A4 +#define WGL_GPU_NUM_PIPES_AMD 0x21A5 +#define WGL_GPU_NUM_SIMD_AMD 0x21A6 +#define WGL_GPU_NUM_RB_AMD 0x21A7 +#define WGL_GPU_NUM_SPI_AMD 0x21A8 +typedef UINT (WINAPI * PFNWGLGETGPUIDSAMDPROC) (UINT maxCount, UINT *ids); +typedef INT (WINAPI * PFNWGLGETGPUINFOAMDPROC) (UINT id, INT property, GLenum dataType, UINT size, void *data); +typedef UINT (WINAPI * PFNWGLGETCONTEXTGPUIDAMDPROC) (HGLRC hglrc); +typedef HGLRC (WINAPI * PFNWGLCREATEASSOCIATEDCONTEXTAMDPROC) (UINT id); +typedef HGLRC (WINAPI * PFNWGLCREATEASSOCIATEDCONTEXTATTRIBSAMDPROC) (UINT id, HGLRC hShareContext, const int *attribList); +typedef BOOL (WINAPI * PFNWGLDELETEASSOCIATEDCONTEXTAMDPROC) (HGLRC hglrc); +typedef BOOL (WINAPI * PFNWGLMAKEASSOCIATEDCONTEXTCURRENTAMDPROC) (HGLRC hglrc); +typedef HGLRC (WINAPI * PFNWGLGETCURRENTASSOCIATEDCONTEXTAMDPROC) (void); +typedef VOID (WINAPI * PFNWGLBLITCONTEXTFRAMEBUFFERAMDPROC) (HGLRC dstCtx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); +#ifdef WGL_WGLEXT_PROTOTYPES +UINT WINAPI wglGetGPUIDsAMD (UINT maxCount, UINT *ids); +INT WINAPI wglGetGPUInfoAMD (UINT id, INT property, GLenum dataType, UINT size, void *data); +UINT WINAPI wglGetContextGPUIDAMD (HGLRC hglrc); +HGLRC WINAPI wglCreateAssociatedContextAMD (UINT id); +HGLRC WINAPI wglCreateAssociatedContextAttribsAMD (UINT id, HGLRC hShareContext, const int *attribList); +BOOL WINAPI wglDeleteAssociatedContextAMD (HGLRC hglrc); +BOOL WINAPI wglMakeAssociatedContextCurrentAMD (HGLRC hglrc); +HGLRC WINAPI wglGetCurrentAssociatedContextAMD (void); +VOID WINAPI wglBlitContextFramebufferAMD (HGLRC dstCtx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); +#endif +#endif /* WGL_AMD_gpu_association */ + +#ifndef WGL_ATI_pixel_format_float +#define WGL_ATI_pixel_format_float 1 +#define WGL_TYPE_RGBA_FLOAT_ATI 0x21A0 +#endif /* WGL_ATI_pixel_format_float */ + +#ifndef WGL_ATI_render_texture_rectangle +#define WGL_ATI_render_texture_rectangle 1 +#define WGL_TEXTURE_RECTANGLE_ATI 0x21A5 +#endif /* WGL_ATI_render_texture_rectangle */ + +#ifndef WGL_EXT_colorspace +#define WGL_EXT_colorspace 1 +#define WGL_COLORSPACE_EXT 0x309D +#define WGL_COLORSPACE_SRGB_EXT 0x3089 +#define WGL_COLORSPACE_LINEAR_EXT 0x308A +#endif /* WGL_EXT_colorspace */ + +#ifndef WGL_EXT_create_context_es2_profile +#define WGL_EXT_create_context_es2_profile 1 +#define WGL_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004 +#endif /* WGL_EXT_create_context_es2_profile */ + +#ifndef WGL_EXT_create_context_es_profile +#define WGL_EXT_create_context_es_profile 1 +#define WGL_CONTEXT_ES_PROFILE_BIT_EXT 0x00000004 +#endif /* WGL_EXT_create_context_es_profile */ + +#ifndef WGL_EXT_depth_float +#define WGL_EXT_depth_float 1 +#define WGL_DEPTH_FLOAT_EXT 0x2040 +#endif /* WGL_EXT_depth_float */ + +#ifndef WGL_EXT_display_color_table +#define WGL_EXT_display_color_table 1 +typedef GLboolean (WINAPI * PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC) (GLushort id); +typedef GLboolean (WINAPI * PFNWGLLOADDISPLAYCOLORTABLEEXTPROC) (const GLushort *table, GLuint length); +typedef GLboolean (WINAPI * PFNWGLBINDDISPLAYCOLORTABLEEXTPROC) (GLushort id); +typedef VOID (WINAPI * PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC) (GLushort id); +#ifdef WGL_WGLEXT_PROTOTYPES +GLboolean WINAPI wglCreateDisplayColorTableEXT (GLushort id); +GLboolean WINAPI wglLoadDisplayColorTableEXT (const GLushort *table, GLuint length); +GLboolean WINAPI wglBindDisplayColorTableEXT (GLushort id); +VOID WINAPI wglDestroyDisplayColorTableEXT (GLushort id); +#endif +#endif /* WGL_EXT_display_color_table */ + +#ifndef WGL_EXT_extensions_string +#define WGL_EXT_extensions_string 1 +typedef const char *(WINAPI * PFNWGLGETEXTENSIONSSTRINGEXTPROC) (void); +#ifdef WGL_WGLEXT_PROTOTYPES +const char *WINAPI wglGetExtensionsStringEXT (void); +#endif +#endif /* WGL_EXT_extensions_string */ + +#ifndef WGL_EXT_framebuffer_sRGB +#define WGL_EXT_framebuffer_sRGB 1 +#define WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20A9 +#endif /* WGL_EXT_framebuffer_sRGB */ + +#ifndef WGL_EXT_make_current_read +#define WGL_EXT_make_current_read 1 +#define ERROR_INVALID_PIXEL_TYPE_EXT 0x2043 +typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTEXTPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc); +typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCEXTPROC) (void); +#ifdef WGL_WGLEXT_PROTOTYPES +BOOL WINAPI wglMakeContextCurrentEXT (HDC hDrawDC, HDC hReadDC, HGLRC hglrc); +HDC WINAPI wglGetCurrentReadDCEXT (void); +#endif +#endif /* WGL_EXT_make_current_read */ + +#ifndef WGL_EXT_multisample +#define WGL_EXT_multisample 1 +#define WGL_SAMPLE_BUFFERS_EXT 0x2041 +#define WGL_SAMPLES_EXT 0x2042 +#endif /* WGL_EXT_multisample */ + +#ifndef WGL_EXT_pbuffer +#define WGL_EXT_pbuffer 1 +DECLARE_HANDLE(HPBUFFEREXT); +#define WGL_DRAW_TO_PBUFFER_EXT 0x202D +#define WGL_MAX_PBUFFER_PIXELS_EXT 0x202E +#define WGL_MAX_PBUFFER_WIDTH_EXT 0x202F +#define WGL_MAX_PBUFFER_HEIGHT_EXT 0x2030 +#define WGL_OPTIMAL_PBUFFER_WIDTH_EXT 0x2031 +#define WGL_OPTIMAL_PBUFFER_HEIGHT_EXT 0x2032 +#define WGL_PBUFFER_LARGEST_EXT 0x2033 +#define WGL_PBUFFER_WIDTH_EXT 0x2034 +#define WGL_PBUFFER_HEIGHT_EXT 0x2035 +typedef HPBUFFEREXT (WINAPI * PFNWGLCREATEPBUFFEREXTPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList); +typedef HDC (WINAPI * PFNWGLGETPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer); +typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer, HDC hDC); +typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer); +typedef BOOL (WINAPI * PFNWGLQUERYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer, int iAttribute, int *piValue); +#ifdef WGL_WGLEXT_PROTOTYPES +HPBUFFEREXT WINAPI wglCreatePbufferEXT (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList); +HDC WINAPI wglGetPbufferDCEXT (HPBUFFEREXT hPbuffer); +int WINAPI wglReleasePbufferDCEXT (HPBUFFEREXT hPbuffer, HDC hDC); +BOOL WINAPI wglDestroyPbufferEXT (HPBUFFEREXT hPbuffer); +BOOL WINAPI wglQueryPbufferEXT (HPBUFFEREXT hPbuffer, int iAttribute, int *piValue); +#endif +#endif /* WGL_EXT_pbuffer */ + +#ifndef WGL_EXT_pixel_format +#define WGL_EXT_pixel_format 1 +#define WGL_NUMBER_PIXEL_FORMATS_EXT 0x2000 +#define WGL_DRAW_TO_WINDOW_EXT 0x2001 +#define WGL_DRAW_TO_BITMAP_EXT 0x2002 +#define WGL_ACCELERATION_EXT 0x2003 +#define WGL_NEED_PALETTE_EXT 0x2004 +#define WGL_NEED_SYSTEM_PALETTE_EXT 0x2005 +#define WGL_SWAP_LAYER_BUFFERS_EXT 0x2006 +#define WGL_SWAP_METHOD_EXT 0x2007 +#define WGL_NUMBER_OVERLAYS_EXT 0x2008 +#define WGL_NUMBER_UNDERLAYS_EXT 0x2009 +#define WGL_TRANSPARENT_EXT 0x200A +#define WGL_TRANSPARENT_VALUE_EXT 0x200B +#define WGL_SHARE_DEPTH_EXT 0x200C +#define WGL_SHARE_STENCIL_EXT 0x200D +#define WGL_SHARE_ACCUM_EXT 0x200E +#define WGL_SUPPORT_GDI_EXT 0x200F +#define WGL_SUPPORT_OPENGL_EXT 0x2010 +#define WGL_DOUBLE_BUFFER_EXT 0x2011 +#define WGL_STEREO_EXT 0x2012 +#define WGL_PIXEL_TYPE_EXT 0x2013 +#define WGL_COLOR_BITS_EXT 0x2014 +#define WGL_RED_BITS_EXT 0x2015 +#define WGL_RED_SHIFT_EXT 0x2016 +#define WGL_GREEN_BITS_EXT 0x2017 +#define WGL_GREEN_SHIFT_EXT 0x2018 +#define WGL_BLUE_BITS_EXT 0x2019 +#define WGL_BLUE_SHIFT_EXT 0x201A +#define WGL_ALPHA_BITS_EXT 0x201B +#define WGL_ALPHA_SHIFT_EXT 0x201C +#define WGL_ACCUM_BITS_EXT 0x201D +#define WGL_ACCUM_RED_BITS_EXT 0x201E +#define WGL_ACCUM_GREEN_BITS_EXT 0x201F +#define WGL_ACCUM_BLUE_BITS_EXT 0x2020 +#define WGL_ACCUM_ALPHA_BITS_EXT 0x2021 +#define WGL_DEPTH_BITS_EXT 0x2022 +#define WGL_STENCIL_BITS_EXT 0x2023 +#define WGL_AUX_BUFFERS_EXT 0x2024 +#define WGL_NO_ACCELERATION_EXT 0x2025 +#define WGL_GENERIC_ACCELERATION_EXT 0x2026 +#define WGL_FULL_ACCELERATION_EXT 0x2027 +#define WGL_SWAP_EXCHANGE_EXT 0x2028 +#define WGL_SWAP_COPY_EXT 0x2029 +#define WGL_SWAP_UNDEFINED_EXT 0x202A +#define WGL_TYPE_RGBA_EXT 0x202B +#define WGL_TYPE_COLORINDEX_EXT 0x202C +typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, int *piValues); +typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, FLOAT *pfValues); +typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATEXTPROC) (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); +#ifdef WGL_WGLEXT_PROTOTYPES +BOOL WINAPI wglGetPixelFormatAttribivEXT (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, int *piValues); +BOOL WINAPI wglGetPixelFormatAttribfvEXT (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, FLOAT *pfValues); +BOOL WINAPI wglChoosePixelFormatEXT (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); +#endif +#endif /* WGL_EXT_pixel_format */ + +#ifndef WGL_EXT_pixel_format_packed_float +#define WGL_EXT_pixel_format_packed_float 1 +#define WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT 0x20A8 +#endif /* WGL_EXT_pixel_format_packed_float */ + +#ifndef WGL_EXT_swap_control +#define WGL_EXT_swap_control 1 +typedef BOOL (WINAPI * PFNWGLSWAPINTERVALEXTPROC) (int interval); +typedef int (WINAPI * PFNWGLGETSWAPINTERVALEXTPROC) (void); +#ifdef WGL_WGLEXT_PROTOTYPES +BOOL WINAPI wglSwapIntervalEXT (int interval); +int WINAPI wglGetSwapIntervalEXT (void); +#endif +#endif /* WGL_EXT_swap_control */ + +#ifndef WGL_EXT_swap_control_tear +#define WGL_EXT_swap_control_tear 1 +#endif /* WGL_EXT_swap_control_tear */ + +#ifndef WGL_I3D_digital_video_control +#define WGL_I3D_digital_video_control 1 +#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_FRAMEBUFFER_I3D 0x2050 +#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_VALUE_I3D 0x2051 +#define WGL_DIGITAL_VIDEO_CURSOR_INCLUDED_I3D 0x2052 +#define WGL_DIGITAL_VIDEO_GAMMA_CORRECTED_I3D 0x2053 +typedef BOOL (WINAPI * PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int *piValue); +typedef BOOL (WINAPI * PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int *piValue); +#ifdef WGL_WGLEXT_PROTOTYPES +BOOL WINAPI wglGetDigitalVideoParametersI3D (HDC hDC, int iAttribute, int *piValue); +BOOL WINAPI wglSetDigitalVideoParametersI3D (HDC hDC, int iAttribute, const int *piValue); +#endif +#endif /* WGL_I3D_digital_video_control */ + +#ifndef WGL_I3D_gamma +#define WGL_I3D_gamma 1 +#define WGL_GAMMA_TABLE_SIZE_I3D 0x204E +#define WGL_GAMMA_EXCLUDE_DESKTOP_I3D 0x204F +typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int *piValue); +typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int *piValue); +typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, USHORT *puRed, USHORT *puGreen, USHORT *puBlue); +typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, const USHORT *puRed, const USHORT *puGreen, const USHORT *puBlue); +#ifdef WGL_WGLEXT_PROTOTYPES +BOOL WINAPI wglGetGammaTableParametersI3D (HDC hDC, int iAttribute, int *piValue); +BOOL WINAPI wglSetGammaTableParametersI3D (HDC hDC, int iAttribute, const int *piValue); +BOOL WINAPI wglGetGammaTableI3D (HDC hDC, int iEntries, USHORT *puRed, USHORT *puGreen, USHORT *puBlue); +BOOL WINAPI wglSetGammaTableI3D (HDC hDC, int iEntries, const USHORT *puRed, const USHORT *puGreen, const USHORT *puBlue); +#endif +#endif /* WGL_I3D_gamma */ + +#ifndef WGL_I3D_genlock +#define WGL_I3D_genlock 1 +#define WGL_GENLOCK_SOURCE_MULTIVIEW_I3D 0x2044 +#define WGL_GENLOCK_SOURCE_EXTERNAL_SYNC_I3D 0x2045 +#define WGL_GENLOCK_SOURCE_EXTERNAL_FIELD_I3D 0x2046 +#define WGL_GENLOCK_SOURCE_EXTERNAL_TTL_I3D 0x2047 +#define WGL_GENLOCK_SOURCE_DIGITAL_SYNC_I3D 0x2048 +#define WGL_GENLOCK_SOURCE_DIGITAL_FIELD_I3D 0x2049 +#define WGL_GENLOCK_SOURCE_EDGE_FALLING_I3D 0x204A +#define WGL_GENLOCK_SOURCE_EDGE_RISING_I3D 0x204B +#define WGL_GENLOCK_SOURCE_EDGE_BOTH_I3D 0x204C +typedef BOOL (WINAPI * PFNWGLENABLEGENLOCKI3DPROC) (HDC hDC); +typedef BOOL (WINAPI * PFNWGLDISABLEGENLOCKI3DPROC) (HDC hDC); +typedef BOOL (WINAPI * PFNWGLISENABLEDGENLOCKI3DPROC) (HDC hDC, BOOL *pFlag); +typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEI3DPROC) (HDC hDC, UINT uSource); +typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEI3DPROC) (HDC hDC, UINT *uSource); +typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT uEdge); +typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT *uEdge); +typedef BOOL (WINAPI * PFNWGLGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT uRate); +typedef BOOL (WINAPI * PFNWGLGETGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT *uRate); +typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT uDelay); +typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT *uDelay); +typedef BOOL (WINAPI * PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC) (HDC hDC, UINT *uMaxLineDelay, UINT *uMaxPixelDelay); +#ifdef WGL_WGLEXT_PROTOTYPES +BOOL WINAPI wglEnableGenlockI3D (HDC hDC); +BOOL WINAPI wglDisableGenlockI3D (HDC hDC); +BOOL WINAPI wglIsEnabledGenlockI3D (HDC hDC, BOOL *pFlag); +BOOL WINAPI wglGenlockSourceI3D (HDC hDC, UINT uSource); +BOOL WINAPI wglGetGenlockSourceI3D (HDC hDC, UINT *uSource); +BOOL WINAPI wglGenlockSourceEdgeI3D (HDC hDC, UINT uEdge); +BOOL WINAPI wglGetGenlockSourceEdgeI3D (HDC hDC, UINT *uEdge); +BOOL WINAPI wglGenlockSampleRateI3D (HDC hDC, UINT uRate); +BOOL WINAPI wglGetGenlockSampleRateI3D (HDC hDC, UINT *uRate); +BOOL WINAPI wglGenlockSourceDelayI3D (HDC hDC, UINT uDelay); +BOOL WINAPI wglGetGenlockSourceDelayI3D (HDC hDC, UINT *uDelay); +BOOL WINAPI wglQueryGenlockMaxSourceDelayI3D (HDC hDC, UINT *uMaxLineDelay, UINT *uMaxPixelDelay); +#endif +#endif /* WGL_I3D_genlock */ + +#ifndef WGL_I3D_image_buffer +#define WGL_I3D_image_buffer 1 +#define WGL_IMAGE_BUFFER_MIN_ACCESS_I3D 0x00000001 +#define WGL_IMAGE_BUFFER_LOCK_I3D 0x00000002 +typedef LPVOID (WINAPI * PFNWGLCREATEIMAGEBUFFERI3DPROC) (HDC hDC, DWORD dwSize, UINT uFlags); +typedef BOOL (WINAPI * PFNWGLDESTROYIMAGEBUFFERI3DPROC) (HDC hDC, LPVOID pAddress); +typedef BOOL (WINAPI * PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC) (HDC hDC, const HANDLE *pEvent, const LPVOID *pAddress, const DWORD *pSize, UINT count); +typedef BOOL (WINAPI * PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC) (HDC hDC, const LPVOID *pAddress, UINT count); +#ifdef WGL_WGLEXT_PROTOTYPES +LPVOID WINAPI wglCreateImageBufferI3D (HDC hDC, DWORD dwSize, UINT uFlags); +BOOL WINAPI wglDestroyImageBufferI3D (HDC hDC, LPVOID pAddress); +BOOL WINAPI wglAssociateImageBufferEventsI3D (HDC hDC, const HANDLE *pEvent, const LPVOID *pAddress, const DWORD *pSize, UINT count); +BOOL WINAPI wglReleaseImageBufferEventsI3D (HDC hDC, const LPVOID *pAddress, UINT count); +#endif +#endif /* WGL_I3D_image_buffer */ + +#ifndef WGL_I3D_swap_frame_lock +#define WGL_I3D_swap_frame_lock 1 +typedef BOOL (WINAPI * PFNWGLENABLEFRAMELOCKI3DPROC) (void); +typedef BOOL (WINAPI * PFNWGLDISABLEFRAMELOCKI3DPROC) (void); +typedef BOOL (WINAPI * PFNWGLISENABLEDFRAMELOCKI3DPROC) (BOOL *pFlag); +typedef BOOL (WINAPI * PFNWGLQUERYFRAMELOCKMASTERI3DPROC) (BOOL *pFlag); +#ifdef WGL_WGLEXT_PROTOTYPES +BOOL WINAPI wglEnableFrameLockI3D (void); +BOOL WINAPI wglDisableFrameLockI3D (void); +BOOL WINAPI wglIsEnabledFrameLockI3D (BOOL *pFlag); +BOOL WINAPI wglQueryFrameLockMasterI3D (BOOL *pFlag); +#endif +#endif /* WGL_I3D_swap_frame_lock */ + +#ifndef WGL_I3D_swap_frame_usage +#define WGL_I3D_swap_frame_usage 1 +typedef BOOL (WINAPI * PFNWGLGETFRAMEUSAGEI3DPROC) (float *pUsage); +typedef BOOL (WINAPI * PFNWGLBEGINFRAMETRACKINGI3DPROC) (void); +typedef BOOL (WINAPI * PFNWGLENDFRAMETRACKINGI3DPROC) (void); +typedef BOOL (WINAPI * PFNWGLQUERYFRAMETRACKINGI3DPROC) (DWORD *pFrameCount, DWORD *pMissedFrames, float *pLastMissedUsage); +#ifdef WGL_WGLEXT_PROTOTYPES +BOOL WINAPI wglGetFrameUsageI3D (float *pUsage); +BOOL WINAPI wglBeginFrameTrackingI3D (void); +BOOL WINAPI wglEndFrameTrackingI3D (void); +BOOL WINAPI wglQueryFrameTrackingI3D (DWORD *pFrameCount, DWORD *pMissedFrames, float *pLastMissedUsage); +#endif +#endif /* WGL_I3D_swap_frame_usage */ + +#ifndef WGL_NV_DX_interop +#define WGL_NV_DX_interop 1 +#define WGL_ACCESS_READ_ONLY_NV 0x00000000 +#define WGL_ACCESS_READ_WRITE_NV 0x00000001 +#define WGL_ACCESS_WRITE_DISCARD_NV 0x00000002 +typedef BOOL (WINAPI * PFNWGLDXSETRESOURCESHAREHANDLENVPROC) (void *dxObject, HANDLE shareHandle); +typedef HANDLE (WINAPI * PFNWGLDXOPENDEVICENVPROC) (void *dxDevice); +typedef BOOL (WINAPI * PFNWGLDXCLOSEDEVICENVPROC) (HANDLE hDevice); +typedef HANDLE (WINAPI * PFNWGLDXREGISTEROBJECTNVPROC) (HANDLE hDevice, void *dxObject, GLuint name, GLenum type, GLenum access); +typedef BOOL (WINAPI * PFNWGLDXUNREGISTEROBJECTNVPROC) (HANDLE hDevice, HANDLE hObject); +typedef BOOL (WINAPI * PFNWGLDXOBJECTACCESSNVPROC) (HANDLE hObject, GLenum access); +typedef BOOL (WINAPI * PFNWGLDXLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE *hObjects); +typedef BOOL (WINAPI * PFNWGLDXUNLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE *hObjects); +#ifdef WGL_WGLEXT_PROTOTYPES +BOOL WINAPI wglDXSetResourceShareHandleNV (void *dxObject, HANDLE shareHandle); +HANDLE WINAPI wglDXOpenDeviceNV (void *dxDevice); +BOOL WINAPI wglDXCloseDeviceNV (HANDLE hDevice); +HANDLE WINAPI wglDXRegisterObjectNV (HANDLE hDevice, void *dxObject, GLuint name, GLenum type, GLenum access); +BOOL WINAPI wglDXUnregisterObjectNV (HANDLE hDevice, HANDLE hObject); +BOOL WINAPI wglDXObjectAccessNV (HANDLE hObject, GLenum access); +BOOL WINAPI wglDXLockObjectsNV (HANDLE hDevice, GLint count, HANDLE *hObjects); +BOOL WINAPI wglDXUnlockObjectsNV (HANDLE hDevice, GLint count, HANDLE *hObjects); +#endif +#endif /* WGL_NV_DX_interop */ + +#ifndef WGL_NV_DX_interop2 +#define WGL_NV_DX_interop2 1 +#endif /* WGL_NV_DX_interop2 */ + +#ifndef WGL_NV_copy_image +#define WGL_NV_copy_image 1 +typedef BOOL (WINAPI * PFNWGLCOPYIMAGESUBDATANVPROC) (HGLRC hSrcRC, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, HGLRC hDstRC, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth); +#ifdef WGL_WGLEXT_PROTOTYPES +BOOL WINAPI wglCopyImageSubDataNV (HGLRC hSrcRC, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, HGLRC hDstRC, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth); +#endif +#endif /* WGL_NV_copy_image */ + +#ifndef WGL_NV_delay_before_swap +#define WGL_NV_delay_before_swap 1 +typedef BOOL (WINAPI * PFNWGLDELAYBEFORESWAPNVPROC) (HDC hDC, GLfloat seconds); +#ifdef WGL_WGLEXT_PROTOTYPES +BOOL WINAPI wglDelayBeforeSwapNV (HDC hDC, GLfloat seconds); +#endif +#endif /* WGL_NV_delay_before_swap */ + +#ifndef WGL_NV_float_buffer +#define WGL_NV_float_buffer 1 +#define WGL_FLOAT_COMPONENTS_NV 0x20B0 +#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV 0x20B1 +#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV 0x20B2 +#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV 0x20B3 +#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV 0x20B4 +#define WGL_TEXTURE_FLOAT_R_NV 0x20B5 +#define WGL_TEXTURE_FLOAT_RG_NV 0x20B6 +#define WGL_TEXTURE_FLOAT_RGB_NV 0x20B7 +#define WGL_TEXTURE_FLOAT_RGBA_NV 0x20B8 +#endif /* WGL_NV_float_buffer */ + +#ifndef WGL_NV_gpu_affinity +#define WGL_NV_gpu_affinity 1 +DECLARE_HANDLE(HGPUNV); +struct _GPU_DEVICE { + DWORD cb; + CHAR DeviceName[32]; + CHAR DeviceString[128]; + DWORD Flags; + RECT rcVirtualScreen; +}; +typedef struct _GPU_DEVICE *PGPU_DEVICE; +#define ERROR_INCOMPATIBLE_AFFINITY_MASKS_NV 0x20D0 +#define ERROR_MISSING_AFFINITY_MASK_NV 0x20D1 +typedef BOOL (WINAPI * PFNWGLENUMGPUSNVPROC) (UINT iGpuIndex, HGPUNV *phGpu); +typedef BOOL (WINAPI * PFNWGLENUMGPUDEVICESNVPROC) (HGPUNV hGpu, UINT iDeviceIndex, PGPU_DEVICE lpGpuDevice); +typedef HDC (WINAPI * PFNWGLCREATEAFFINITYDCNVPROC) (const HGPUNV *phGpuList); +typedef BOOL (WINAPI * PFNWGLENUMGPUSFROMAFFINITYDCNVPROC) (HDC hAffinityDC, UINT iGpuIndex, HGPUNV *hGpu); +typedef BOOL (WINAPI * PFNWGLDELETEDCNVPROC) (HDC hdc); +#ifdef WGL_WGLEXT_PROTOTYPES +BOOL WINAPI wglEnumGpusNV (UINT iGpuIndex, HGPUNV *phGpu); +BOOL WINAPI wglEnumGpuDevicesNV (HGPUNV hGpu, UINT iDeviceIndex, PGPU_DEVICE lpGpuDevice); +HDC WINAPI wglCreateAffinityDCNV (const HGPUNV *phGpuList); +BOOL WINAPI wglEnumGpusFromAffinityDCNV (HDC hAffinityDC, UINT iGpuIndex, HGPUNV *hGpu); +BOOL WINAPI wglDeleteDCNV (HDC hdc); +#endif +#endif /* WGL_NV_gpu_affinity */ + +#ifndef WGL_NV_multisample_coverage +#define WGL_NV_multisample_coverage 1 +#define WGL_COVERAGE_SAMPLES_NV 0x2042 +#define WGL_COLOR_SAMPLES_NV 0x20B9 +#endif /* WGL_NV_multisample_coverage */ + +#ifndef WGL_NV_present_video +#define WGL_NV_present_video 1 +DECLARE_HANDLE(HVIDEOOUTPUTDEVICENV); +#define WGL_NUM_VIDEO_SLOTS_NV 0x20F0 +typedef int (WINAPI * PFNWGLENUMERATEVIDEODEVICESNVPROC) (HDC hDc, HVIDEOOUTPUTDEVICENV *phDeviceList); +typedef BOOL (WINAPI * PFNWGLBINDVIDEODEVICENVPROC) (HDC hDc, unsigned int uVideoSlot, HVIDEOOUTPUTDEVICENV hVideoDevice, const int *piAttribList); +typedef BOOL (WINAPI * PFNWGLQUERYCURRENTCONTEXTNVPROC) (int iAttribute, int *piValue); +#ifdef WGL_WGLEXT_PROTOTYPES +int WINAPI wglEnumerateVideoDevicesNV (HDC hDc, HVIDEOOUTPUTDEVICENV *phDeviceList); +BOOL WINAPI wglBindVideoDeviceNV (HDC hDc, unsigned int uVideoSlot, HVIDEOOUTPUTDEVICENV hVideoDevice, const int *piAttribList); +BOOL WINAPI wglQueryCurrentContextNV (int iAttribute, int *piValue); +#endif +#endif /* WGL_NV_present_video */ + +#ifndef WGL_NV_render_depth_texture +#define WGL_NV_render_depth_texture 1 +#define WGL_BIND_TO_TEXTURE_DEPTH_NV 0x20A3 +#define WGL_BIND_TO_TEXTURE_RECTANGLE_DEPTH_NV 0x20A4 +#define WGL_DEPTH_TEXTURE_FORMAT_NV 0x20A5 +#define WGL_TEXTURE_DEPTH_COMPONENT_NV 0x20A6 +#define WGL_DEPTH_COMPONENT_NV 0x20A7 +#endif /* WGL_NV_render_depth_texture */ + +#ifndef WGL_NV_render_texture_rectangle +#define WGL_NV_render_texture_rectangle 1 +#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV 0x20A0 +#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV 0x20A1 +#define WGL_TEXTURE_RECTANGLE_NV 0x20A2 +#endif /* WGL_NV_render_texture_rectangle */ + +#ifndef WGL_NV_swap_group +#define WGL_NV_swap_group 1 +typedef BOOL (WINAPI * PFNWGLJOINSWAPGROUPNVPROC) (HDC hDC, GLuint group); +typedef BOOL (WINAPI * PFNWGLBINDSWAPBARRIERNVPROC) (GLuint group, GLuint barrier); +typedef BOOL (WINAPI * PFNWGLQUERYSWAPGROUPNVPROC) (HDC hDC, GLuint *group, GLuint *barrier); +typedef BOOL (WINAPI * PFNWGLQUERYMAXSWAPGROUPSNVPROC) (HDC hDC, GLuint *maxGroups, GLuint *maxBarriers); +typedef BOOL (WINAPI * PFNWGLQUERYFRAMECOUNTNVPROC) (HDC hDC, GLuint *count); +typedef BOOL (WINAPI * PFNWGLRESETFRAMECOUNTNVPROC) (HDC hDC); +#ifdef WGL_WGLEXT_PROTOTYPES +BOOL WINAPI wglJoinSwapGroupNV (HDC hDC, GLuint group); +BOOL WINAPI wglBindSwapBarrierNV (GLuint group, GLuint barrier); +BOOL WINAPI wglQuerySwapGroupNV (HDC hDC, GLuint *group, GLuint *barrier); +BOOL WINAPI wglQueryMaxSwapGroupsNV (HDC hDC, GLuint *maxGroups, GLuint *maxBarriers); +BOOL WINAPI wglQueryFrameCountNV (HDC hDC, GLuint *count); +BOOL WINAPI wglResetFrameCountNV (HDC hDC); +#endif +#endif /* WGL_NV_swap_group */ + +#ifndef WGL_NV_vertex_array_range +#define WGL_NV_vertex_array_range 1 +typedef void *(WINAPI * PFNWGLALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority); +typedef void (WINAPI * PFNWGLFREEMEMORYNVPROC) (void *pointer); +#ifdef WGL_WGLEXT_PROTOTYPES +void *WINAPI wglAllocateMemoryNV (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority); +void WINAPI wglFreeMemoryNV (void *pointer); +#endif +#endif /* WGL_NV_vertex_array_range */ + +#ifndef WGL_NV_video_capture +#define WGL_NV_video_capture 1 +DECLARE_HANDLE(HVIDEOINPUTDEVICENV); +#define WGL_UNIQUE_ID_NV 0x20CE +#define WGL_NUM_VIDEO_CAPTURE_SLOTS_NV 0x20CF +typedef BOOL (WINAPI * PFNWGLBINDVIDEOCAPTUREDEVICENVPROC) (UINT uVideoSlot, HVIDEOINPUTDEVICENV hDevice); +typedef UINT (WINAPI * PFNWGLENUMERATEVIDEOCAPTUREDEVICESNVPROC) (HDC hDc, HVIDEOINPUTDEVICENV *phDeviceList); +typedef BOOL (WINAPI * PFNWGLLOCKVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice); +typedef BOOL (WINAPI * PFNWGLQUERYVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice, int iAttribute, int *piValue); +typedef BOOL (WINAPI * PFNWGLRELEASEVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice); +#ifdef WGL_WGLEXT_PROTOTYPES +BOOL WINAPI wglBindVideoCaptureDeviceNV (UINT uVideoSlot, HVIDEOINPUTDEVICENV hDevice); +UINT WINAPI wglEnumerateVideoCaptureDevicesNV (HDC hDc, HVIDEOINPUTDEVICENV *phDeviceList); +BOOL WINAPI wglLockVideoCaptureDeviceNV (HDC hDc, HVIDEOINPUTDEVICENV hDevice); +BOOL WINAPI wglQueryVideoCaptureDeviceNV (HDC hDc, HVIDEOINPUTDEVICENV hDevice, int iAttribute, int *piValue); +BOOL WINAPI wglReleaseVideoCaptureDeviceNV (HDC hDc, HVIDEOINPUTDEVICENV hDevice); +#endif +#endif /* WGL_NV_video_capture */ + +#ifndef WGL_NV_video_output +#define WGL_NV_video_output 1 +DECLARE_HANDLE(HPVIDEODEV); +#define WGL_BIND_TO_VIDEO_RGB_NV 0x20C0 +#define WGL_BIND_TO_VIDEO_RGBA_NV 0x20C1 +#define WGL_BIND_TO_VIDEO_RGB_AND_DEPTH_NV 0x20C2 +#define WGL_VIDEO_OUT_COLOR_NV 0x20C3 +#define WGL_VIDEO_OUT_ALPHA_NV 0x20C4 +#define WGL_VIDEO_OUT_DEPTH_NV 0x20C5 +#define WGL_VIDEO_OUT_COLOR_AND_ALPHA_NV 0x20C6 +#define WGL_VIDEO_OUT_COLOR_AND_DEPTH_NV 0x20C7 +#define WGL_VIDEO_OUT_FRAME 0x20C8 +#define WGL_VIDEO_OUT_FIELD_1 0x20C9 +#define WGL_VIDEO_OUT_FIELD_2 0x20CA +#define WGL_VIDEO_OUT_STACKED_FIELDS_1_2 0x20CB +#define WGL_VIDEO_OUT_STACKED_FIELDS_2_1 0x20CC +typedef BOOL (WINAPI * PFNWGLGETVIDEODEVICENVPROC) (HDC hDC, int numDevices, HPVIDEODEV *hVideoDevice); +typedef BOOL (WINAPI * PFNWGLRELEASEVIDEODEVICENVPROC) (HPVIDEODEV hVideoDevice); +typedef BOOL (WINAPI * PFNWGLBINDVIDEOIMAGENVPROC) (HPVIDEODEV hVideoDevice, HPBUFFERARB hPbuffer, int iVideoBuffer); +typedef BOOL (WINAPI * PFNWGLRELEASEVIDEOIMAGENVPROC) (HPBUFFERARB hPbuffer, int iVideoBuffer); +typedef BOOL (WINAPI * PFNWGLSENDPBUFFERTOVIDEONVPROC) (HPBUFFERARB hPbuffer, int iBufferType, unsigned long *pulCounterPbuffer, BOOL bBlock); +typedef BOOL (WINAPI * PFNWGLGETVIDEOINFONVPROC) (HPVIDEODEV hpVideoDevice, unsigned long *pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo); +#ifdef WGL_WGLEXT_PROTOTYPES +BOOL WINAPI wglGetVideoDeviceNV (HDC hDC, int numDevices, HPVIDEODEV *hVideoDevice); +BOOL WINAPI wglReleaseVideoDeviceNV (HPVIDEODEV hVideoDevice); +BOOL WINAPI wglBindVideoImageNV (HPVIDEODEV hVideoDevice, HPBUFFERARB hPbuffer, int iVideoBuffer); +BOOL WINAPI wglReleaseVideoImageNV (HPBUFFERARB hPbuffer, int iVideoBuffer); +BOOL WINAPI wglSendPbufferToVideoNV (HPBUFFERARB hPbuffer, int iBufferType, unsigned long *pulCounterPbuffer, BOOL bBlock); +BOOL WINAPI wglGetVideoInfoNV (HPVIDEODEV hpVideoDevice, unsigned long *pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo); +#endif +#endif /* WGL_NV_video_output */ + +#ifndef WGL_OML_sync_control +#define WGL_OML_sync_control 1 +typedef BOOL (WINAPI * PFNWGLGETSYNCVALUESOMLPROC) (HDC hdc, INT64 *ust, INT64 *msc, INT64 *sbc); +typedef BOOL (WINAPI * PFNWGLGETMSCRATEOMLPROC) (HDC hdc, INT32 *numerator, INT32 *denominator); +typedef INT64 (WINAPI * PFNWGLSWAPBUFFERSMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder); +typedef INT64 (WINAPI * PFNWGLSWAPLAYERBUFFERSMSCOMLPROC) (HDC hdc, INT fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder); +typedef BOOL (WINAPI * PFNWGLWAITFORMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64 *ust, INT64 *msc, INT64 *sbc); +typedef BOOL (WINAPI * PFNWGLWAITFORSBCOMLPROC) (HDC hdc, INT64 target_sbc, INT64 *ust, INT64 *msc, INT64 *sbc); +#ifdef WGL_WGLEXT_PROTOTYPES +BOOL WINAPI wglGetSyncValuesOML (HDC hdc, INT64 *ust, INT64 *msc, INT64 *sbc); +BOOL WINAPI wglGetMscRateOML (HDC hdc, INT32 *numerator, INT32 *denominator); +INT64 WINAPI wglSwapBuffersMscOML (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder); +INT64 WINAPI wglSwapLayerBuffersMscOML (HDC hdc, INT fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder); +BOOL WINAPI wglWaitForMscOML (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64 *ust, INT64 *msc, INT64 *sbc); +BOOL WINAPI wglWaitForSbcOML (HDC hdc, INT64 target_sbc, INT64 *ust, INT64 *msc, INT64 *sbc); +#endif +#endif /* WGL_OML_sync_control */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/lib/libc/include/any-windows-any/GL/wglext.h b/lib/libc/include/any-windows-any/GL/wglext.h index 181fd9b588..cb31ac4533 100644 --- a/lib/libc/include/any-windows-any/GL/wglext.h +++ b/lib/libc/include/any-windows-any/GL/wglext.h @@ -1,12 +1,12 @@ -#ifndef __wglext_h_ -#define __wglext_h_ 1 +#ifndef __wgl_wglext_h_ +#define __wgl_wglext_h_ 1 #ifdef __cplusplus extern "C" { #endif /* -** Copyright (c) 2013-2014 The Khronos Group Inc. +** Copyright (c) 2013-2018 The Khronos Group Inc. ** ** Permission is hereby granted, free of charge, to any person obtaining a ** copy of this software and/or associated documentation files (the @@ -31,9 +31,7 @@ extern "C" { ** This header is generated from the Khronos OpenGL / OpenGL ES XML ** API Registry. The current version of the Registry, generator scripts ** used to make the header, and the header can be found at -** http://www.opengl.org/registry/ -** -** Khronos $Revision: 27684 $ on $Date: 2014-08-11 08:21:35 +0000 (Mon, 11 Aug 2014) $ +** https://github.com/KhronosGroup/OpenGL-Registry */ #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) @@ -41,7 +39,7 @@ extern "C" { #include #endif -#define WGL_WGLEXT_VERSION 20140810 +#define WGL_WGLEXT_VERSION 20190228 /* Generated C header for: * API: wgl @@ -92,6 +90,11 @@ HGLRC WINAPI wglCreateContextAttribsARB (HDC hDC, HGLRC hShareContext, const int #endif #endif /* WGL_ARB_create_context */ +#ifndef WGL_ARB_create_context_no_error +#define WGL_ARB_create_context_no_error 1 +#define WGL_CONTEXT_OPENGL_NO_ERROR_ARB 0x31B3 +#endif /* WGL_ARB_create_context_no_error */ + #ifndef WGL_ARB_create_context_profile #define WGL_ARB_create_context_profile 1 #define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126 @@ -315,7 +318,7 @@ BOOL WINAPI wglSetStereoEmitterState3DL (HDC hDC, UINT uState); #define WGL_GPU_NUM_RB_AMD 0x21A7 #define WGL_GPU_NUM_SPI_AMD 0x21A8 typedef UINT (WINAPI * PFNWGLGETGPUIDSAMDPROC) (UINT maxCount, UINT *ids); -typedef INT (WINAPI * PFNWGLGETGPUINFOAMDPROC) (UINT id, int property, GLenum dataType, UINT size, void *data); +typedef INT (WINAPI * PFNWGLGETGPUINFOAMDPROC) (UINT id, INT property, GLenum dataType, UINT size, void *data); typedef UINT (WINAPI * PFNWGLGETCONTEXTGPUIDAMDPROC) (HGLRC hglrc); typedef HGLRC (WINAPI * PFNWGLCREATEASSOCIATEDCONTEXTAMDPROC) (UINT id); typedef HGLRC (WINAPI * PFNWGLCREATEASSOCIATEDCONTEXTATTRIBSAMDPROC) (UINT id, HGLRC hShareContext, const int *attribList); @@ -325,7 +328,7 @@ typedef HGLRC (WINAPI * PFNWGLGETCURRENTASSOCIATEDCONTEXTAMDPROC) (void); typedef VOID (WINAPI * PFNWGLBLITCONTEXTFRAMEBUFFERAMDPROC) (HGLRC dstCtx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); #ifdef WGL_WGLEXT_PROTOTYPES UINT WINAPI wglGetGPUIDsAMD (UINT maxCount, UINT *ids); -INT WINAPI wglGetGPUInfoAMD (UINT id, int property, GLenum dataType, UINT size, void *data); +INT WINAPI wglGetGPUInfoAMD (UINT id, INT property, GLenum dataType, UINT size, void *data); UINT WINAPI wglGetContextGPUIDAMD (HGLRC hglrc); HGLRC WINAPI wglCreateAssociatedContextAMD (UINT id); HGLRC WINAPI wglCreateAssociatedContextAttribsAMD (UINT id, HGLRC hShareContext, const int *attribList); @@ -341,6 +344,18 @@ VOID WINAPI wglBlitContextFramebufferAMD (HGLRC dstCtx, GLint srcX0, GLint srcY0 #define WGL_TYPE_RGBA_FLOAT_ATI 0x21A0 #endif /* WGL_ATI_pixel_format_float */ +#ifndef WGL_ATI_render_texture_rectangle +#define WGL_ATI_render_texture_rectangle 1 +#define WGL_TEXTURE_RECTANGLE_ATI 0x21A5 +#endif /* WGL_ATI_render_texture_rectangle */ + +#ifndef WGL_EXT_colorspace +#define WGL_EXT_colorspace 1 +#define WGL_COLORSPACE_EXT 0x309D +#define WGL_COLORSPACE_SRGB_EXT 0x3089 +#define WGL_COLORSPACE_LINEAR_EXT 0x308A +#endif /* WGL_EXT_colorspace */ + #ifndef WGL_EXT_create_context_es2_profile #define WGL_EXT_create_context_es2_profile 1 #define WGL_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004 @@ -710,12 +725,12 @@ BOOL WINAPI wglDeleteDCNV (HDC hdc); #define WGL_NV_present_video 1 DECLARE_HANDLE(HVIDEOOUTPUTDEVICENV); #define WGL_NUM_VIDEO_SLOTS_NV 0x20F0 -typedef int (WINAPI * PFNWGLENUMERATEVIDEODEVICESNVPROC) (HDC hDC, HVIDEOOUTPUTDEVICENV *phDeviceList); -typedef BOOL (WINAPI * PFNWGLBINDVIDEODEVICENVPROC) (HDC hDC, unsigned int uVideoSlot, HVIDEOOUTPUTDEVICENV hVideoDevice, const int *piAttribList); +typedef int (WINAPI * PFNWGLENUMERATEVIDEODEVICESNVPROC) (HDC hDc, HVIDEOOUTPUTDEVICENV *phDeviceList); +typedef BOOL (WINAPI * PFNWGLBINDVIDEODEVICENVPROC) (HDC hDc, unsigned int uVideoSlot, HVIDEOOUTPUTDEVICENV hVideoDevice, const int *piAttribList); typedef BOOL (WINAPI * PFNWGLQUERYCURRENTCONTEXTNVPROC) (int iAttribute, int *piValue); #ifdef WGL_WGLEXT_PROTOTYPES -int WINAPI wglEnumerateVideoDevicesNV (HDC hDC, HVIDEOOUTPUTDEVICENV *phDeviceList); -BOOL WINAPI wglBindVideoDeviceNV (HDC hDC, unsigned int uVideoSlot, HVIDEOOUTPUTDEVICENV hVideoDevice, const int *piAttribList); +int WINAPI wglEnumerateVideoDevicesNV (HDC hDc, HVIDEOOUTPUTDEVICENV *phDeviceList); +BOOL WINAPI wglBindVideoDeviceNV (HDC hDc, unsigned int uVideoSlot, HVIDEOOUTPUTDEVICENV hVideoDevice, const int *piAttribList); BOOL WINAPI wglQueryCurrentContextNV (int iAttribute, int *piValue); #endif #endif /* WGL_NV_present_video */ @@ -820,14 +835,14 @@ BOOL WINAPI wglGetVideoInfoNV (HPVIDEODEV hpVideoDevice, unsigned long *pulCount typedef BOOL (WINAPI * PFNWGLGETSYNCVALUESOMLPROC) (HDC hdc, INT64 *ust, INT64 *msc, INT64 *sbc); typedef BOOL (WINAPI * PFNWGLGETMSCRATEOMLPROC) (HDC hdc, INT32 *numerator, INT32 *denominator); typedef INT64 (WINAPI * PFNWGLSWAPBUFFERSMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder); -typedef INT64 (WINAPI * PFNWGLSWAPLAYERBUFFERSMSCOMLPROC) (HDC hdc, int fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder); +typedef INT64 (WINAPI * PFNWGLSWAPLAYERBUFFERSMSCOMLPROC) (HDC hdc, INT fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder); typedef BOOL (WINAPI * PFNWGLWAITFORMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64 *ust, INT64 *msc, INT64 *sbc); typedef BOOL (WINAPI * PFNWGLWAITFORSBCOMLPROC) (HDC hdc, INT64 target_sbc, INT64 *ust, INT64 *msc, INT64 *sbc); #ifdef WGL_WGLEXT_PROTOTYPES BOOL WINAPI wglGetSyncValuesOML (HDC hdc, INT64 *ust, INT64 *msc, INT64 *sbc); BOOL WINAPI wglGetMscRateOML (HDC hdc, INT32 *numerator, INT32 *denominator); INT64 WINAPI wglSwapBuffersMscOML (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder); -INT64 WINAPI wglSwapLayerBuffersMscOML (HDC hdc, int fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder); +INT64 WINAPI wglSwapLayerBuffersMscOML (HDC hdc, INT fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder); BOOL WINAPI wglWaitForMscOML (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64 *ust, INT64 *msc, INT64 *sbc); BOOL WINAPI wglWaitForSbcOML (HDC hdc, INT64 target_sbc, INT64 *ust, INT64 *msc, INT64 *sbc); #endif diff --git a/lib/libc/include/any-windows-any/KHR/khrplatform.h b/lib/libc/include/any-windows-any/KHR/khrplatform.h new file mode 100644 index 0000000000..5b55ea2b98 --- /dev/null +++ b/lib/libc/include/any-windows-any/KHR/khrplatform.h @@ -0,0 +1,290 @@ +#ifndef __khrplatform_h_ +#define __khrplatform_h_ + +/* +** Copyright (c) 2008-2018 The Khronos Group Inc. +** +** Permission is hereby granted, free of charge, to any person obtaining a +** copy of this software and/or associated documentation files (the +** "Materials"), to deal in the Materials without restriction, including +** without limitation the rights to use, copy, modify, merge, publish, +** distribute, sublicense, and/or sell copies of the Materials, and to +** permit persons to whom the Materials are furnished to do so, subject to +** the following conditions: +** +** The above copyright notice and this permission notice shall be included +** in all copies or substantial portions of the Materials. +** +** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. +*/ + +/* Khronos platform-specific types and definitions. + * + * The master copy of khrplatform.h is maintained in the Khronos EGL + * Registry repository at https://github.com/KhronosGroup/EGL-Registry + * The last semantic modification to khrplatform.h was at commit ID: + * 67a3e0864c2d75ea5287b9f3d2eb74a745936692 + * + * Adopters may modify this file to suit their platform. Adopters are + * encouraged to submit platform specific modifications to the Khronos + * group so that they can be included in future versions of this file. + * Please submit changes by filing pull requests or issues on + * the EGL Registry repository linked above. + * + * + * See the Implementer's Guidelines for information about where this file + * should be located on your system and for more details of its use: + * http://www.khronos.org/registry/implementers_guide.pdf + * + * This file should be included as + * #include + * by Khronos client API header files that use its types and defines. + * + * The types in khrplatform.h should only be used to define API-specific types. + * + * Types defined in khrplatform.h: + * khronos_int8_t signed 8 bit + * khronos_uint8_t unsigned 8 bit + * khronos_int16_t signed 16 bit + * khronos_uint16_t unsigned 16 bit + * khronos_int32_t signed 32 bit + * khronos_uint32_t unsigned 32 bit + * khronos_int64_t signed 64 bit + * khronos_uint64_t unsigned 64 bit + * khronos_intptr_t signed same number of bits as a pointer + * khronos_uintptr_t unsigned same number of bits as a pointer + * khronos_ssize_t signed size + * khronos_usize_t unsigned size + * khronos_float_t signed 32 bit floating point + * khronos_time_ns_t unsigned 64 bit time in nanoseconds + * khronos_utime_nanoseconds_t unsigned time interval or absolute time in + * nanoseconds + * khronos_stime_nanoseconds_t signed time interval in nanoseconds + * khronos_boolean_enum_t enumerated boolean type. This should + * only be used as a base type when a client API's boolean type is + * an enum. Client APIs which use an integer or other type for + * booleans cannot use this as the base type for their boolean. + * + * Tokens defined in khrplatform.h: + * + * KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values. + * + * KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0. + * KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0. + * + * Calling convention macros defined in this file: + * KHRONOS_APICALL + * KHRONOS_APIENTRY + * KHRONOS_APIATTRIBUTES + * + * These may be used in function prototypes as: + * + * KHRONOS_APICALL void KHRONOS_APIENTRY funcname( + * int arg1, + * int arg2) KHRONOS_APIATTRIBUTES; + */ + +#if defined(__SCITECH_SNAP__) && !defined(KHRONOS_STATIC) +# define KHRONOS_STATIC 1 +#endif + +/*------------------------------------------------------------------------- + * Definition of KHRONOS_APICALL + *------------------------------------------------------------------------- + * This precedes the return type of the function in the function prototype. + */ +#if defined(KHRONOS_STATIC) + /* If the preprocessor constant KHRONOS_STATIC is defined, make the + * header compatible with static linking. */ +# define KHRONOS_APICALL +#elif defined(_WIN32) +# define KHRONOS_APICALL __declspec(dllimport) +#elif defined (__SYMBIAN32__) +# define KHRONOS_APICALL IMPORT_C +#elif defined(__ANDROID__) +# define KHRONOS_APICALL __attribute__((visibility("default"))) +#else +# define KHRONOS_APICALL +#endif + +/*------------------------------------------------------------------------- + * Definition of KHRONOS_APIENTRY + *------------------------------------------------------------------------- + * This follows the return type of the function and precedes the function + * name in the function prototype. + */ +#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(KHRONOS_STATIC) + /* Win32 but not WinCE */ +# define KHRONOS_APIENTRY __stdcall +#else +# define KHRONOS_APIENTRY +#endif + +/*------------------------------------------------------------------------- + * Definition of KHRONOS_APIATTRIBUTES + *------------------------------------------------------------------------- + * This follows the closing parenthesis of the function prototype arguments. + */ +#if defined (__ARMCC_2__) +#define KHRONOS_APIATTRIBUTES __softfp +#else +#define KHRONOS_APIATTRIBUTES +#endif + +/*------------------------------------------------------------------------- + * basic type definitions + *-----------------------------------------------------------------------*/ +#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__) + + +/* + * Using + */ +#include +typedef int32_t khronos_int32_t; +typedef uint32_t khronos_uint32_t; +typedef int64_t khronos_int64_t; +typedef uint64_t khronos_uint64_t; +#define KHRONOS_SUPPORT_INT64 1 +#define KHRONOS_SUPPORT_FLOAT 1 + +#elif defined(__VMS ) || defined(__sgi) + +/* + * Using + */ +#include +typedef int32_t khronos_int32_t; +typedef uint32_t khronos_uint32_t; +typedef int64_t khronos_int64_t; +typedef uint64_t khronos_uint64_t; +#define KHRONOS_SUPPORT_INT64 1 +#define KHRONOS_SUPPORT_FLOAT 1 + +#elif defined(_WIN32) && !defined(__SCITECH_SNAP__) + +/* + * Win32 + */ +typedef __int32 khronos_int32_t; +typedef unsigned __int32 khronos_uint32_t; +typedef __int64 khronos_int64_t; +typedef unsigned __int64 khronos_uint64_t; +#define KHRONOS_SUPPORT_INT64 1 +#define KHRONOS_SUPPORT_FLOAT 1 + +#elif defined(__sun__) || defined(__digital__) + +/* + * Sun or Digital + */ +typedef int khronos_int32_t; +typedef unsigned int khronos_uint32_t; +#if defined(__arch64__) || defined(_LP64) +typedef long int khronos_int64_t; +typedef unsigned long int khronos_uint64_t; +#else +typedef long long int khronos_int64_t; +typedef unsigned long long int khronos_uint64_t; +#endif /* __arch64__ */ +#define KHRONOS_SUPPORT_INT64 1 +#define KHRONOS_SUPPORT_FLOAT 1 + +#elif 0 + +/* + * Hypothetical platform with no float or int64 support + */ +typedef int khronos_int32_t; +typedef unsigned int khronos_uint32_t; +#define KHRONOS_SUPPORT_INT64 0 +#define KHRONOS_SUPPORT_FLOAT 0 + +#else + +/* + * Generic fallback + */ +#include +typedef int32_t khronos_int32_t; +typedef uint32_t khronos_uint32_t; +typedef int64_t khronos_int64_t; +typedef uint64_t khronos_uint64_t; +#define KHRONOS_SUPPORT_INT64 1 +#define KHRONOS_SUPPORT_FLOAT 1 + +#endif + + +/* + * Types that are (so far) the same on all platforms + */ +typedef signed char khronos_int8_t; +typedef unsigned char khronos_uint8_t; +typedef signed short int khronos_int16_t; +typedef unsigned short int khronos_uint16_t; + +/* + * Types that differ between LLP64 and LP64 architectures - in LLP64, + * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears + * to be the only LLP64 architecture in current use. + */ +#ifdef _WIN64 +typedef signed long long int khronos_intptr_t; +typedef unsigned long long int khronos_uintptr_t; +typedef signed long long int khronos_ssize_t; +typedef unsigned long long int khronos_usize_t; +#else +typedef signed long int khronos_intptr_t; +typedef unsigned long int khronos_uintptr_t; +typedef signed long int khronos_ssize_t; +typedef unsigned long int khronos_usize_t; +#endif + +#if KHRONOS_SUPPORT_FLOAT +/* + * Float type + */ +typedef float khronos_float_t; +#endif + +#if KHRONOS_SUPPORT_INT64 +/* Time types + * + * These types can be used to represent a time interval in nanoseconds or + * an absolute Unadjusted System Time. Unadjusted System Time is the number + * of nanoseconds since some arbitrary system event (e.g. since the last + * time the system booted). The Unadjusted System Time is an unsigned + * 64 bit value that wraps back to 0 every 584 years. Time intervals + * may be either signed or unsigned. + */ +typedef khronos_uint64_t khronos_utime_nanoseconds_t; +typedef khronos_int64_t khronos_stime_nanoseconds_t; +#endif + +/* + * Dummy value used to pad enum types to 32 bits. + */ +#ifndef KHRONOS_MAX_ENUM +#define KHRONOS_MAX_ENUM 0x7FFFFFFF +#endif + +/* + * Enumerated boolean type + * + * Values other than zero should be considered to be true. Therefore + * comparisons should not be made against KHRONOS_TRUE. + */ +typedef enum { + KHRONOS_FALSE = 0, + KHRONOS_TRUE = 1, + KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM +} khronos_boolean_enum_t; + +#endif /* __khrplatform_h_ */ diff --git a/lib/libc/include/any-windows-any/_mingw.h b/lib/libc/include/any-windows-any/_mingw.h index 8195a435e9..3609df27b5 100644 --- a/lib/libc/include/any-windows-any/_mingw.h +++ b/lib/libc/include/any-windows-any/_mingw.h @@ -7,8 +7,6 @@ #ifndef _INC__MINGW_H #define _INC__MINGW_H - - #include "_mingw_mac.h" #include "_mingw_secapi.h" @@ -224,12 +222,16 @@ limitations in handling dllimport attribute. */ #ifndef __MSVCRT_VERSION__ /* High byte is the major version, low byte is the minor. */ -# define __MSVCRT_VERSION__ 0x700 +# ifndef _UCRT +# define __MSVCRT_VERSION__ 0x700 +# else +# define __MSVCRT_VERSION__ 0xE00 +# endif #endif #ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0601 +#define _WIN32_WINNT 0x0603 #endif #ifndef _INT128_DEFINED @@ -428,6 +430,15 @@ typedef int __int128 __attribute__ ((__mode__ (TI))); # define __USE_MINGW_ANSI_STDIO 1 #endif +/* We are defining __USE_MINGW_ANSI_STDIO as 0 or 1 */ +#if !defined(__USE_MINGW_ANSI_STDIO) +#define __USE_MINGW_ANSI_STDIO 0 /* was not defined so it should be 0 */ +#elif (__USE_MINGW_ANSI_STDIO + 0) != 0 || (1 - __USE_MINGW_ANSI_STDIO - 1) == 2 +#define __USE_MINGW_ANSI_STDIO 1 /* was defined as nonzero or empty so it should be 1 */ +#else +#define __USE_MINGW_ANSI_STDIO 0 /* was defined as (int)zero and non-empty so it should be 0 */ +#endif + /* _dowildcard is an int that controls the globbing of the command line. * The MinGW32 (mingw.org) runtime calls it _CRT_glob, so we are adding * a compatibility definition here: you can use either of _CRT_glob or @@ -586,10 +597,13 @@ const char *__mingw_get_crt_info (void); #ifndef MINGW_SDK_INIT #define MINGW_SDK_INIT -#ifdef MINGW_HAS_SECURE_API +/* for backward compatibility */ +#ifndef MINGW_HAS_SECURE_API +#define MINGW_HAS_SECURE_API 1 +#endif + #define __STDC_SECURE_LIB__ 200411L #define __GOT_SECURE_LIB__ __STDC_SECURE_LIB__ -#endif #ifndef __WIDL__ #include "sdks/_mingw_directx.h" diff --git a/lib/libc/include/any-windows-any/_mingw_mac.h b/lib/libc/include/any-windows-any/_mingw_mac.h index a921a46672..213daa65dc 100644 --- a/lib/libc/include/any-windows-any/_mingw_mac.h +++ b/lib/libc/include/any-windows-any/_mingw_mac.h @@ -11,7 +11,7 @@ #define __MINGW64_STRINGIFY(x) \ __STRINGIFY(x) -#define __MINGW64_VERSION_MAJOR 6 +#define __MINGW64_VERSION_MAJOR 7 #define __MINGW64_VERSION_MINOR 0 #define __MINGW64_VERSION_BUGFIX 0 @@ -127,6 +127,9 @@ # define __MINGW_LSYMBOL(sym) sym #endif /* if __MINGW_USE_UNDERSCORE_PREFIX == 0 */ +#define __MINGW_ASM_CALL(func) __asm__(__MINGW64_STRINGIFY(__MINGW_USYMBOL(func))) +#define __MINGW_ASM_CRT_CALL(func) __asm__(__STRINGIFY(func)) + #ifndef __PTRDIFF_TYPE__ # ifdef _WIN64 # define __PTRDIFF_TYPE__ long long int @@ -291,4 +294,68 @@ # define __mingw_static_ovr __mingw_ovr #endif /* __cplusplus */ +#if __MINGW_GNUC_PREREQ(4, 3) && !defined(__clang__) +# define __mingw_attribute_artificial \ + __attribute__((__artificial__)) +#else +# define __mingw_attribute_artificial +#endif + +#if _FORTIFY_SOURCE > 0 && __OPTIMIZE__ > 0 && __MINGW_GNUC_PREREQ(4, 1) +# if _FORTIFY_SOURCE > 1 +# define __MINGW_FORTIFY_LEVEL 2 +# else +# define __MINGW_FORTIFY_LEVEL 1 +# endif +#else +# define __MINGW_FORTIFY_LEVEL 0 +#endif + +#if __MINGW_FORTIFY_LEVEL > 0 + /* Calling an function with __attribute__((__warning__("..."))) + from a system include __inline__ function does not print + a warning unless caller has __attribute__((__artificial__)). */ +# define __mingw_bos_declare \ + void __cdecl __chk_fail(void) __attribute__((__noreturn__)); \ + void __cdecl __mingw_chk_fail_warn(void) __MINGW_ASM_CALL(__chk_fail) \ + __attribute__((__noreturn__)) \ + __attribute__((__warning__("Buffer overflow detected"))) +# define __mingw_bos(p, maxtype) \ + __builtin_object_size((p), ((maxtype) > 0) && (__MINGW_FORTIFY_LEVEL > 1)) +# define __mingw_bos_known(p) \ + (__mingw_bos(p, 0) != (size_t)-1) +# define __mingw_bos_cond_chk(c) \ + (__builtin_expect((c), 1) ? (void)0 : __chk_fail()) +# define __mingw_bos_ptr_chk(p, n, maxtype) \ + __mingw_bos_cond_chk(!__mingw_bos_known(p) || __mingw_bos(p, maxtype) >= (size_t)(n)) +# define __mingw_bos_ptr_chk_warn(p, n, maxtype) \ + (__mingw_bos_known(p) && __builtin_constant_p((n)) && __mingw_bos(p, maxtype) < (size_t)(n) \ + ? __mingw_chk_fail_warn() : __mingw_bos_ptr_chk(p, n, maxtype)) +# define __mingw_bos_ovr __mingw_ovr \ + __attribute__((__always_inline__)) \ + __mingw_attribute_artificial +# define __mingw_bos_extern_ovr extern __inline__ __cdecl \ + __attribute__((__always_inline__, __gnu_inline__)) \ + __mingw_attribute_artificial +#else +# define __mingw_bos_ovr __mingw_ovr +#endif /* __MINGW_FORTIFY_LEVEL > 0 */ + +/* If _FORTIFY_SOURCE is enabled, some inline functions may use + __builtin_va_arg_pack(). GCC may report an error if the address + of such a function is used. Set _FORTIFY_VA_ARG=0 in this case. */ +#if __MINGW_FORTIFY_LEVEL > 0 && __MINGW_GNUC_PREREQ(4, 3) && !defined(__clang__) \ + && (!defined(_FORTIFY_VA_ARG) || _FORTIFY_VA_ARG > 0) +# define __MINGW_FORTIFY_VA_ARG 1 +#else +# define __MINGW_FORTIFY_VA_ARG 0 +#endif + +/* Enable workaround for ABI incompatibility on affected platforms */ +#ifndef WIDL_EXPLICIT_AGGREGATE_RETURNS +#if defined(__GNUC__) && defined(__cplusplus) && (defined(__x86_64__) || defined(__i386__)) +#define WIDL_EXPLICIT_AGGREGATE_RETURNS +#endif +#endif + #endif /* _INC_CRTDEFS_MACRO */ diff --git a/lib/libc/include/any-windows-any/_mingw_print_pop.h b/lib/libc/include/any-windows-any/_mingw_print_pop.h deleted file mode 100644 index 046b62035c..0000000000 --- a/lib/libc/include/any-windows-any/_mingw_print_pop.h +++ /dev/null @@ -1,136 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ - -/* Define __mingw_ macros. */ -#if defined(__USE_MINGW_ANSI_STDIO) && (defined(_INC_STDIO) || defined(_WSTDIO_DEFINED)) && ((__USE_MINGW_ANSI_STDIO + 0) != 0) - -/* Redefine to GNU specific PRI... and SCN... macros. */ -#if defined(_INTTYPES_H_) && defined(PRId64) -#undef PRId64 -#undef PRIdLEAST64 -#undef PRIdFAST64 -#undef PRIdMAX -#undef PRIi64 -#undef PRIiLEAST64 -#undef PRIiFAST64 -#undef PRIiMAX -#undef PRIo64 -#undef PRIoLEAST64 -#undef PRIoFAST64 -#undef PRIoMAX -#undef PRIu64 -#undef PRIuLEAST64 -#undef PRIuFAST64 -#undef PRIuMAX -#undef PRIx64 -#undef PRIxLEAST64 -#undef PRIxFAST64 -#undef PRIxMAX -#undef PRIX64 -#undef PRIXLEAST64 -#undef PRIXFAST64 -#undef PRIXMAX - -#undef SCNd64 -#undef SCNdLEAST64 -#undef SCNdFAST64 -#undef SCNdMAX -#undef SCNi64 -#undef SCNiLEAST64 -#undef SCNiFAST64 -#undef SCNiMAX -#undef SCNo64 -#undef SCNoLEAST64 -#undef SCNoFAST64 -#undef SCNoMAX -#undef SCNx64 -#undef SCNxLEAST64 -#undef SCNxFAST64 -#undef SCNxMAX -#undef SCNu64 -#undef SCNuLEAST64 -#undef SCNuFAST64 -#undef SCNuMAX - -#ifdef _WIN64 -#undef PRIdPTR -#undef PRIiPTR -#undef PRIoPTR -#undef PRIuPTR -#undef PRIxPTR -#undef PRIXPTR - -#undef SCNdPTR -#undef SCNiPTR -#undef SCNoPTR -#undef SCNxPTR -#undef SCNuPTR - -#endif /* _WIN64 */ - -#define PRId64 "lld" -#define PRIdLEAST64 "lld" -#define PRIdFAST64 "lld" -#define PRIdMAX "lld" -#define PRIi64 "lli" -#define PRIiLEAST64 "lli" -#define PRIiFAST64 "lli" -#define PRIiMAX "lli" -#define PRIo64 "llo" -#define PRIoLEAST64 "llo" -#define PRIoFAST64 "llo" -#define PRIoMAX "llo" -#define PRIu64 "llu" -#define PRIuLEAST64 "llu" -#define PRIuFAST64 "llu" -#define PRIuMAX "llu" -#define PRIx64 "llx" -#define PRIxLEAST64 "llx" -#define PRIxFAST64 "llx" -#define PRIxMAX "llx" -#define PRIX64 "llX" -#define PRIXLEAST64 "llX" -#define PRIXFAST64 "llX" -#define PRIXMAX "llX" - -#define SCNd64 "lld" -#define SCNdLEAST64 "lld" -#define SCNdFAST64 "lld" -#define SCNdMAX "lld" -#define SCNi64 "lli" -#define SCNiLEAST64 "lli" -#define SCNiFAST64 "lli" -#define SCNiMAX "lli" -#define SCNo64 "llo" -#define SCNoLEAST64 "llo" -#define SCNoFAST64 "llo" -#define SCNoMAX "llo" -#define SCNx64 "llx" -#define SCNxLEAST64 "llx" -#define SCNxFAST64 "llx" -#define SCNxMAX "llx" -#define SCNu64 "llu" -#define SCNuLEAST64 "llu" -#define SCNuFAST64 "llu" -#define SCNuMAX "llu" - -#ifdef _WIN64 -#define PRIdPTR "lld" -#define PRIiPTR "lli" -#define PRIoPTR "llo" -#define PRIuPTR "llu" -#define PRIxPTR "llx" -#define PRIXPTR "llX" - -#define SCNdPTR "lld" -#define SCNiPTR "lli" -#define SCNoPTR "llo" -#define SCNxPTR "llx" -#define SCNuPTR "llu" -#endif /* _WIN64 */ -#endif /* defined(_INTTYPES_H_) && defined(PRId64) */ - -#endif /* defined(__USE_MINGW_ANSI_STDIO) && defined(_INC_STDIO) && __USE_MINGW_ANSI_STDIO != 0 */ diff --git a/lib/libc/include/any-windows-any/_mingw_print_push.h b/lib/libc/include/any-windows-any/_mingw_print_push.h deleted file mode 100644 index e0da9d00d0..0000000000 --- a/lib/libc/include/any-windows-any/_mingw_print_push.h +++ /dev/null @@ -1,136 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ - -/* Undefine __mingw_ macros. */ -#if defined(__USE_MINGW_ANSI_STDIO) && ((__USE_MINGW_ANSI_STDIO + 0) != 0) - -/* Redefine to MS specific PRI... and SCN... macros. */ -#if defined(_INTTYPES_H_) && defined(PRId64) -#undef PRId64 -#undef PRIdLEAST64 -#undef PRIdFAST64 -#undef PRIdMAX -#undef PRIi64 -#undef PRIiLEAST64 -#undef PRIiFAST64 -#undef PRIiMAX -#undef PRIo64 -#undef PRIoLEAST64 -#undef PRIoFAST64 -#undef PRIoMAX -#undef PRIu64 -#undef PRIuLEAST64 -#undef PRIuFAST64 -#undef PRIuMAX -#undef PRIx64 -#undef PRIxLEAST64 -#undef PRIxFAST64 -#undef PRIxMAX -#undef PRIX64 -#undef PRIXLEAST64 -#undef PRIXFAST64 -#undef PRIXMAX - -#undef SCNd64 -#undef SCNdLEAST64 -#undef SCNdFAST64 -#undef SCNdMAX -#undef SCNi64 -#undef SCNiLEAST64 -#undef SCNiFAST64 -#undef SCNiMAX -#undef SCNo64 -#undef SCNoLEAST64 -#undef SCNoFAST64 -#undef SCNoMAX -#undef SCNx64 -#undef SCNxLEAST64 -#undef SCNxFAST64 -#undef SCNxMAX -#undef SCNu64 -#undef SCNuLEAST64 -#undef SCNuFAST64 -#undef SCNuMAX - -#ifdef _WIN64 -#undef PRIdPTR -#undef PRIiPTR -#undef PRIoPTR -#undef PRIuPTR -#undef PRIxPTR -#undef PRIXPTR - -#undef SCNdPTR -#undef SCNiPTR -#undef SCNoPTR -#undef SCNxPTR -#undef SCNuPTR -#endif /* _WIN64 */ - -#define PRId64 "lld" -#define PRIdLEAST64 "lld" -#define PRIdFAST64 "lld" -#define PRIdMAX "lld" -#define PRIi64 "lli" -#define PRIiLEAST64 "lli" -#define PRIiFAST64 "lli" -#define PRIiMAX "lli" -#define PRIo64 "llo" -#define PRIoLEAST64 "llo" -#define PRIoFAST64 "llo" -#define PRIoMAX "llo" -#define PRIu64 "llu" -#define PRIuLEAST64 "llu" -#define PRIuFAST64 "llu" -#define PRIuMAX "llu" -#define PRIx64 "llx" -#define PRIxLEAST64 "llx" -#define PRIxFAST64 "llx" -#define PRIxMAX "llx" -#define PRIX64 "llX" -#define PRIXLEAST64 "llX" -#define PRIXFAST64 "llX" -#define PRIXMAX "llX" - -#define SCNd64 "lld" -#define SCNdLEAST64 "lld" -#define SCNdFAST64 "lld" -#define SCNdMAX "lld" -#define SCNi64 "lli" -#define SCNiLEAST64 "lli" -#define SCNiFAST64 "lli" -#define SCNiMAX "lli" -#define SCNo64 "llo" -#define SCNoLEAST64 "llo" -#define SCNoFAST64 "llo" -#define SCNoMAX "llo" -#define SCNx64 "llx" -#define SCNxLEAST64 "llx" -#define SCNxFAST64 "llx" -#define SCNxMAX "llx" -#define SCNu64 "llu" -#define SCNuLEAST64 "llu" -#define SCNuFAST64 "llu" -#define SCNuMAX "llu" - -#ifdef _WIN64 -#define PRIdPTR "lld" -#define PRIiPTR "lli" -#define PRIoPTR "llo" -#define PRIuPTR "llu" -#define PRIxPTR "llx" -#define PRIXPTR "llX" - -#define SCNdPTR "lld" -#define SCNiPTR "lli" -#define SCNoPTR "llo" -#define SCNxPTR "llx" -#define SCNuPTR "llu" -#endif /* _WIN64 */ - -#endif /* defined(_INTTYPES_H_) && defined(PRId64) */ - -#endif /* defined(__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO != 0 */ diff --git a/lib/libc/include/any-windows-any/_mingw_secapi.h b/lib/libc/include/any-windows-any/_mingw_secapi.h index d3390edf91..541a4d3c63 100644 --- a/lib/libc/include/any-windows-any/_mingw_secapi.h +++ b/lib/libc/include/any-windows-any/_mingw_secapi.h @@ -8,7 +8,7 @@ #define _INC_MINGW_SECAPI /* http://msdn.microsoft.com/en-us/library/ms175759%28v=VS.100%29.aspx */ -#if defined(__cplusplus) && (MINGW_HAS_SECURE_API == 1) +#if defined(__cplusplus) #ifndef _CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES #define _CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES 1 /* default to 1 */ #endif /*_CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES*/ @@ -36,7 +36,7 @@ #define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 0 #define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT 0 #define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_MEMORY 0 -#endif /*defined(__cplusplus) && (MINGW_HAS_SECURE_API == 1)*/ +#endif /*defined(__cplusplus)*/ #define __MINGW_CRT_NAME_CONCAT2(sym) ::sym##_s diff --git a/lib/libc/include/any-windows-any/_mingw_stat64.h b/lib/libc/include/any-windows-any/_mingw_stat64.h index 00b68ce3f6..1238580b3d 100644 --- a/lib/libc/include/any-windows-any/_mingw_stat64.h +++ b/lib/libc/include/any-windows-any/_mingw_stat64.h @@ -4,7 +4,7 @@ #define _fstat _fstat32 #define _stat _stat32 #define _wstat _wstat32 -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT #define _fstati64 _fstat32i64 #define _stati64 _stat32i64 #define _wstati64 _wstat32i64 diff --git a/lib/libc/include/any-windows-any/activation.h b/lib/libc/include/any-windows-any/activation.h index 38af050b21..37b11c5f16 100644 --- a/lib/libc/include/any-windows-any/activation.h +++ b/lib/libc/include/any-windows-any/activation.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/activation.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/activation.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,6 +21,9 @@ #ifndef __IActivationFactory_FWD_DEFINED__ #define __IActivationFactory_FWD_DEFINED__ typedef interface IActivationFactory IActivationFactory; +#ifdef __cplusplus +interface IActivationFactory; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -54,37 +58,38 @@ typedef struct IActivationFactoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActivationFactory* This, + IActivationFactory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActivationFactory* This); + IActivationFactory *This); ULONG (STDMETHODCALLTYPE *Release)( - IActivationFactory* This); + IActivationFactory *This); /*** IInspectable methods ***/ HRESULT (STDMETHODCALLTYPE *GetIids)( - IActivationFactory* This, + IActivationFactory *This, ULONG *iidCount, IID **iids); HRESULT (STDMETHODCALLTYPE *GetRuntimeClassName)( - IActivationFactory* This, + IActivationFactory *This, HSTRING *className); HRESULT (STDMETHODCALLTYPE *GetTrustLevel)( - IActivationFactory* This, + IActivationFactory *This, TrustLevel *trustLevel); /*** IActivationFactory methods ***/ HRESULT (STDMETHODCALLTYPE *ActivateInstance)( - IActivationFactory* This, + IActivationFactory *This, IInspectable **instance); END_INTERFACE } IActivationFactoryVtbl; + interface IActivationFactory { CONST_VTBL IActivationFactoryVtbl* lpVtbl; }; @@ -131,14 +136,6 @@ static FORCEINLINE HRESULT IActivationFactory_ActivateInstance(IActivationFactor #endif -HRESULT STDMETHODCALLTYPE IActivationFactory_ActivateInstance_Proxy( - IActivationFactory* This, - IInspectable **instance); -void __RPC_STUB IActivationFactory_ActivateInstance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActivationFactory_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/activaut.h b/lib/libc/include/any-windows-any/activaut.h index 2299a5d0ff..c79aafde31 100644 --- a/lib/libc/include/any-windows-any/activaut.h +++ b/lib/libc/include/any-windows-any/activaut.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/activaut.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/activaut.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,26 +21,41 @@ #ifndef __IScriptNode_FWD_DEFINED__ #define __IScriptNode_FWD_DEFINED__ typedef interface IScriptNode IScriptNode; +#ifdef __cplusplus +interface IScriptNode; +#endif /* __cplusplus */ #endif #ifndef __IScriptEntry_FWD_DEFINED__ #define __IScriptEntry_FWD_DEFINED__ typedef interface IScriptEntry IScriptEntry; +#ifdef __cplusplus +interface IScriptEntry; +#endif /* __cplusplus */ #endif #ifndef __IScriptScriptlet_FWD_DEFINED__ #define __IScriptScriptlet_FWD_DEFINED__ typedef interface IScriptScriptlet IScriptScriptlet; +#ifdef __cplusplus +interface IScriptScriptlet; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptAuthor_FWD_DEFINED__ #define __IActiveScriptAuthor_FWD_DEFINED__ typedef interface IActiveScriptAuthor IActiveScriptAuthor; +#ifdef __cplusplus +interface IActiveScriptAuthor; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptAuthorProcedure_FWD_DEFINED__ #define __IActiveScriptAuthorProcedure_FWD_DEFINED__ typedef interface IActiveScriptAuthorProcedure IActiveScriptAuthorProcedure; +#ifdef __cplusplus +interface IActiveScriptAuthorProcedure; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -98,21 +114,33 @@ const DWORD SOURCETEXT_ATTR_HUMANTEXT = 0x8000; #ifndef __IActiveScriptAuthor_FWD_DEFINED__ #define __IActiveScriptAuthor_FWD_DEFINED__ typedef interface IActiveScriptAuthor IActiveScriptAuthor; +#ifdef __cplusplus +interface IActiveScriptAuthor; +#endif /* __cplusplus */ #endif #ifndef __IScriptNode_FWD_DEFINED__ #define __IScriptNode_FWD_DEFINED__ typedef interface IScriptNode IScriptNode; +#ifdef __cplusplus +interface IScriptNode; +#endif /* __cplusplus */ #endif #ifndef __IScriptEntry_FWD_DEFINED__ #define __IScriptEntry_FWD_DEFINED__ typedef interface IScriptEntry IScriptEntry; +#ifdef __cplusplus +interface IScriptEntry; +#endif /* __cplusplus */ #endif #ifndef __IScriptScriptlet_FWD_DEFINED__ #define __IScriptScriptlet_FWD_DEFINED__ typedef interface IScriptScriptlet IScriptScriptlet; +#ifdef __cplusplus +interface IScriptScriptlet; +#endif /* __cplusplus */ #endif typedef WORD SOURCE_TEXT_ATTR; @@ -180,57 +208,57 @@ typedef struct IScriptNodeVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IScriptNode* This, + IScriptNode *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IScriptNode* This); + IScriptNode *This); ULONG (STDMETHODCALLTYPE *Release)( - IScriptNode* This); + IScriptNode *This); /*** IScriptNode methods ***/ HRESULT (STDMETHODCALLTYPE *Alive)( - IScriptNode* This); + IScriptNode *This); HRESULT (STDMETHODCALLTYPE *Delete)( - IScriptNode* This); + IScriptNode *This); HRESULT (STDMETHODCALLTYPE *GetParent)( - IScriptNode* This, + IScriptNode *This, IScriptNode **ppsnParent); HRESULT (STDMETHODCALLTYPE *GetIndexInParent)( - IScriptNode* This, + IScriptNode *This, ULONG *pisn); HRESULT (STDMETHODCALLTYPE *GetCookie)( - IScriptNode* This, + IScriptNode *This, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *GetNumberOfChildren)( - IScriptNode* This, + IScriptNode *This, ULONG *pcsn); HRESULT (STDMETHODCALLTYPE *GetChild)( - IScriptNode* This, + IScriptNode *This, ULONG isn, IScriptNode **ppsn); HRESULT (STDMETHODCALLTYPE *GetLanguage)( - IScriptNode* This, + IScriptNode *This, BSTR *pbstr); HRESULT (STDMETHODCALLTYPE *CreateChildEntry)( - IScriptNode* This, + IScriptNode *This, ULONG isn, DWORD dwCookie, LPCOLESTR pszDelimiter, IScriptEntry **ppse); HRESULT (STDMETHODCALLTYPE *CreateChildHandler)( - IScriptNode* This, + IScriptNode *This, LPCOLESTR pszDefaultName, LPCOLESTR *prgpszNames, ULONG cpszNames, @@ -244,6 +272,7 @@ typedef struct IScriptNodeVtbl { END_INTERFACE } IScriptNodeVtbl; + interface IScriptNode { CONST_VTBL IScriptNodeVtbl* lpVtbl; }; @@ -312,97 +341,6 @@ static FORCEINLINE HRESULT IScriptNode_CreateChildHandler(IScriptNode* This,LPCO #endif -HRESULT STDMETHODCALLTYPE IScriptNode_Alive_Proxy( - IScriptNode* This); -void __RPC_STUB IScriptNode_Alive_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptNode_Delete_Proxy( - IScriptNode* This); -void __RPC_STUB IScriptNode_Delete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptNode_GetParent_Proxy( - IScriptNode* This, - IScriptNode **ppsnParent); -void __RPC_STUB IScriptNode_GetParent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptNode_GetIndexInParent_Proxy( - IScriptNode* This, - ULONG *pisn); -void __RPC_STUB IScriptNode_GetIndexInParent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptNode_GetCookie_Proxy( - IScriptNode* This, - DWORD *pdwCookie); -void __RPC_STUB IScriptNode_GetCookie_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptNode_GetNumberOfChildren_Proxy( - IScriptNode* This, - ULONG *pcsn); -void __RPC_STUB IScriptNode_GetNumberOfChildren_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptNode_GetChild_Proxy( - IScriptNode* This, - ULONG isn, - IScriptNode **ppsn); -void __RPC_STUB IScriptNode_GetChild_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptNode_GetLanguage_Proxy( - IScriptNode* This, - BSTR *pbstr); -void __RPC_STUB IScriptNode_GetLanguage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptNode_CreateChildEntry_Proxy( - IScriptNode* This, - ULONG isn, - DWORD dwCookie, - LPCOLESTR pszDelimiter, - IScriptEntry **ppse); -void __RPC_STUB IScriptNode_CreateChildEntry_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptNode_CreateChildHandler_Proxy( - IScriptNode* This, - LPCOLESTR pszDefaultName, - LPCOLESTR *prgpszNames, - ULONG cpszNames, - LPCOLESTR pszEvent, - LPCOLESTR pszDelimiter, - ITypeInfo *ptiSignature, - ULONG iMethodSignature, - ULONG isn, - DWORD dwCookie, - IScriptEntry **ppse); -void __RPC_STUB IScriptNode_CreateChildHandler_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IScriptNode_INTERFACE_DEFINED__ */ @@ -463,57 +401,57 @@ typedef struct IScriptEntryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IScriptEntry* This, + IScriptEntry *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IScriptEntry* This); + IScriptEntry *This); ULONG (STDMETHODCALLTYPE *Release)( - IScriptEntry* This); + IScriptEntry *This); /*** IScriptNode methods ***/ HRESULT (STDMETHODCALLTYPE *Alive)( - IScriptEntry* This); + IScriptEntry *This); HRESULT (STDMETHODCALLTYPE *Delete)( - IScriptEntry* This); + IScriptEntry *This); HRESULT (STDMETHODCALLTYPE *GetParent)( - IScriptEntry* This, + IScriptEntry *This, IScriptNode **ppsnParent); HRESULT (STDMETHODCALLTYPE *GetIndexInParent)( - IScriptEntry* This, + IScriptEntry *This, ULONG *pisn); HRESULT (STDMETHODCALLTYPE *GetCookie)( - IScriptEntry* This, + IScriptEntry *This, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *GetNumberOfChildren)( - IScriptEntry* This, + IScriptEntry *This, ULONG *pcsn); HRESULT (STDMETHODCALLTYPE *GetChild)( - IScriptEntry* This, + IScriptEntry *This, ULONG isn, IScriptNode **ppsn); HRESULT (STDMETHODCALLTYPE *GetLanguage)( - IScriptEntry* This, + IScriptEntry *This, BSTR *pbstr); HRESULT (STDMETHODCALLTYPE *CreateChildEntry)( - IScriptEntry* This, + IScriptEntry *This, ULONG isn, DWORD dwCookie, LPCOLESTR pszDelimiter, IScriptEntry **ppse); HRESULT (STDMETHODCALLTYPE *CreateChildHandler)( - IScriptEntry* This, + IScriptEntry *This, LPCOLESTR pszDefaultName, LPCOLESTR *prgpszNames, ULONG cpszNames, @@ -527,54 +465,55 @@ typedef struct IScriptEntryVtbl { /*** IScriptEntry methods ***/ HRESULT (STDMETHODCALLTYPE *GetText)( - IScriptEntry* This, + IScriptEntry *This, BSTR *pbstr); HRESULT (STDMETHODCALLTYPE *SetText)( - IScriptEntry* This, + IScriptEntry *This, LPCOLESTR psz); HRESULT (STDMETHODCALLTYPE *GetBody)( - IScriptEntry* This, + IScriptEntry *This, BSTR *pbstr); HRESULT (STDMETHODCALLTYPE *SetBody)( - IScriptEntry* This, + IScriptEntry *This, LPCOLESTR psz); HRESULT (STDMETHODCALLTYPE *GetName)( - IScriptEntry* This, + IScriptEntry *This, BSTR *pbstr); HRESULT (STDMETHODCALLTYPE *SetName)( - IScriptEntry* This, + IScriptEntry *This, LPCOLESTR psz); HRESULT (STDMETHODCALLTYPE *GetItemName)( - IScriptEntry* This, + IScriptEntry *This, BSTR *pbstr); HRESULT (STDMETHODCALLTYPE *SetItemName)( - IScriptEntry* This, + IScriptEntry *This, LPCOLESTR psz); HRESULT (STDMETHODCALLTYPE *GetSignature)( - IScriptEntry* This, + IScriptEntry *This, ITypeInfo **ppti, ULONG *piMethod); HRESULT (STDMETHODCALLTYPE *SetSignature)( - IScriptEntry* This, + IScriptEntry *This, ITypeInfo *pti, ULONG iMethod); HRESULT (STDMETHODCALLTYPE *GetRange)( - IScriptEntry* This, + IScriptEntry *This, ULONG *pichMin, ULONG *pcch); END_INTERFACE } IScriptEntryVtbl; + interface IScriptEntry { CONST_VTBL IScriptEntryVtbl* lpVtbl; }; @@ -689,97 +628,6 @@ static FORCEINLINE HRESULT IScriptEntry_GetRange(IScriptEntry* This,ULONG *pichM #endif -HRESULT STDMETHODCALLTYPE IScriptEntry_GetText_Proxy( - IScriptEntry* This, - BSTR *pbstr); -void __RPC_STUB IScriptEntry_GetText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptEntry_SetText_Proxy( - IScriptEntry* This, - LPCOLESTR psz); -void __RPC_STUB IScriptEntry_SetText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptEntry_GetBody_Proxy( - IScriptEntry* This, - BSTR *pbstr); -void __RPC_STUB IScriptEntry_GetBody_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptEntry_SetBody_Proxy( - IScriptEntry* This, - LPCOLESTR psz); -void __RPC_STUB IScriptEntry_SetBody_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptEntry_GetName_Proxy( - IScriptEntry* This, - BSTR *pbstr); -void __RPC_STUB IScriptEntry_GetName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptEntry_SetName_Proxy( - IScriptEntry* This, - LPCOLESTR psz); -void __RPC_STUB IScriptEntry_SetName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptEntry_GetItemName_Proxy( - IScriptEntry* This, - BSTR *pbstr); -void __RPC_STUB IScriptEntry_GetItemName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptEntry_SetItemName_Proxy( - IScriptEntry* This, - LPCOLESTR psz); -void __RPC_STUB IScriptEntry_SetItemName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptEntry_GetSignature_Proxy( - IScriptEntry* This, - ITypeInfo **ppti, - ULONG *piMethod); -void __RPC_STUB IScriptEntry_GetSignature_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptEntry_SetSignature_Proxy( - IScriptEntry* This, - ITypeInfo *pti, - ULONG iMethod); -void __RPC_STUB IScriptEntry_SetSignature_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptEntry_GetRange_Proxy( - IScriptEntry* This, - ULONG *pichMin, - ULONG *pcch); -void __RPC_STUB IScriptEntry_GetRange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IScriptEntry_INTERFACE_DEFINED__ */ @@ -822,57 +670,57 @@ typedef struct IScriptScriptletVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IScriptScriptlet* This, + IScriptScriptlet *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IScriptScriptlet* This); + IScriptScriptlet *This); ULONG (STDMETHODCALLTYPE *Release)( - IScriptScriptlet* This); + IScriptScriptlet *This); /*** IScriptNode methods ***/ HRESULT (STDMETHODCALLTYPE *Alive)( - IScriptScriptlet* This); + IScriptScriptlet *This); HRESULT (STDMETHODCALLTYPE *Delete)( - IScriptScriptlet* This); + IScriptScriptlet *This); HRESULT (STDMETHODCALLTYPE *GetParent)( - IScriptScriptlet* This, + IScriptScriptlet *This, IScriptNode **ppsnParent); HRESULT (STDMETHODCALLTYPE *GetIndexInParent)( - IScriptScriptlet* This, + IScriptScriptlet *This, ULONG *pisn); HRESULT (STDMETHODCALLTYPE *GetCookie)( - IScriptScriptlet* This, + IScriptScriptlet *This, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *GetNumberOfChildren)( - IScriptScriptlet* This, + IScriptScriptlet *This, ULONG *pcsn); HRESULT (STDMETHODCALLTYPE *GetChild)( - IScriptScriptlet* This, + IScriptScriptlet *This, ULONG isn, IScriptNode **ppsn); HRESULT (STDMETHODCALLTYPE *GetLanguage)( - IScriptScriptlet* This, + IScriptScriptlet *This, BSTR *pbstr); HRESULT (STDMETHODCALLTYPE *CreateChildEntry)( - IScriptScriptlet* This, + IScriptScriptlet *This, ULONG isn, DWORD dwCookie, LPCOLESTR pszDelimiter, IScriptEntry **ppse); HRESULT (STDMETHODCALLTYPE *CreateChildHandler)( - IScriptScriptlet* This, + IScriptScriptlet *This, LPCOLESTR pszDefaultName, LPCOLESTR *prgpszNames, ULONG cpszNames, @@ -886,79 +734,80 @@ typedef struct IScriptScriptletVtbl { /*** IScriptEntry methods ***/ HRESULT (STDMETHODCALLTYPE *GetText)( - IScriptScriptlet* This, + IScriptScriptlet *This, BSTR *pbstr); HRESULT (STDMETHODCALLTYPE *SetText)( - IScriptScriptlet* This, + IScriptScriptlet *This, LPCOLESTR psz); HRESULT (STDMETHODCALLTYPE *GetBody)( - IScriptScriptlet* This, + IScriptScriptlet *This, BSTR *pbstr); HRESULT (STDMETHODCALLTYPE *SetBody)( - IScriptScriptlet* This, + IScriptScriptlet *This, LPCOLESTR psz); HRESULT (STDMETHODCALLTYPE *GetName)( - IScriptScriptlet* This, + IScriptScriptlet *This, BSTR *pbstr); HRESULT (STDMETHODCALLTYPE *SetName)( - IScriptScriptlet* This, + IScriptScriptlet *This, LPCOLESTR psz); HRESULT (STDMETHODCALLTYPE *GetItemName)( - IScriptScriptlet* This, + IScriptScriptlet *This, BSTR *pbstr); HRESULT (STDMETHODCALLTYPE *SetItemName)( - IScriptScriptlet* This, + IScriptScriptlet *This, LPCOLESTR psz); HRESULT (STDMETHODCALLTYPE *GetSignature)( - IScriptScriptlet* This, + IScriptScriptlet *This, ITypeInfo **ppti, ULONG *piMethod); HRESULT (STDMETHODCALLTYPE *SetSignature)( - IScriptScriptlet* This, + IScriptScriptlet *This, ITypeInfo *pti, ULONG iMethod); HRESULT (STDMETHODCALLTYPE *GetRange)( - IScriptScriptlet* This, + IScriptScriptlet *This, ULONG *pichMin, ULONG *pcch); /*** IScriptScriptlet methods ***/ HRESULT (STDMETHODCALLTYPE *GetSubItemName)( - IScriptScriptlet* This, + IScriptScriptlet *This, BSTR *pbstr); HRESULT (STDMETHODCALLTYPE *SetSubItemName)( - IScriptScriptlet* This, + IScriptScriptlet *This, LPCOLESTR psz); HRESULT (STDMETHODCALLTYPE *GetEventName)( - IScriptScriptlet* This, + IScriptScriptlet *This, BSTR *pbstr); HRESULT (STDMETHODCALLTYPE *SetEventName)( - IScriptScriptlet* This, + IScriptScriptlet *This, LPCOLESTR psz); HRESULT (STDMETHODCALLTYPE *GetSimpleEventName)( - IScriptScriptlet* This, + IScriptScriptlet *This, BSTR *pbstr); HRESULT (STDMETHODCALLTYPE *SetSimpleEventName)( - IScriptScriptlet* This, + IScriptScriptlet *This, LPCOLESTR psz); END_INTERFACE } IScriptScriptletVtbl; + interface IScriptScriptlet { CONST_VTBL IScriptScriptletVtbl* lpVtbl; }; @@ -1099,54 +948,6 @@ static FORCEINLINE HRESULT IScriptScriptlet_SetSimpleEventName(IScriptScriptlet* #endif -HRESULT STDMETHODCALLTYPE IScriptScriptlet_GetSubItemName_Proxy( - IScriptScriptlet* This, - BSTR *pbstr); -void __RPC_STUB IScriptScriptlet_GetSubItemName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptScriptlet_SetSubItemName_Proxy( - IScriptScriptlet* This, - LPCOLESTR psz); -void __RPC_STUB IScriptScriptlet_SetSubItemName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptScriptlet_GetEventName_Proxy( - IScriptScriptlet* This, - BSTR *pbstr); -void __RPC_STUB IScriptScriptlet_GetEventName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptScriptlet_SetEventName_Proxy( - IScriptScriptlet* This, - LPCOLESTR psz); -void __RPC_STUB IScriptScriptlet_SetEventName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptScriptlet_GetSimpleEventName_Proxy( - IScriptScriptlet* This, - BSTR *pbstr); -void __RPC_STUB IScriptScriptlet_GetSimpleEventName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptScriptlet_SetSimpleEventName_Proxy( - IScriptScriptlet* This, - LPCOLESTR psz); -void __RPC_STUB IScriptScriptlet_SetSimpleEventName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IScriptScriptlet_INTERFACE_DEFINED__ */ @@ -1254,25 +1055,25 @@ typedef struct IActiveScriptAuthorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptAuthor* This, + IActiveScriptAuthor *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptAuthor* This); + IActiveScriptAuthor *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptAuthor* This); + IActiveScriptAuthor *This); /*** IActiveScriptAuthor methods ***/ HRESULT (STDMETHODCALLTYPE *AddNamedItem)( - IActiveScriptAuthor* This, + IActiveScriptAuthor *This, LPCOLESTR pszName, DWORD dwFlags, IDispatch *pdisp); HRESULT (STDMETHODCALLTYPE *AddScriptlet)( - IActiveScriptAuthor* This, + IActiveScriptAuthor *This, LPCOLESTR pszDefaultName, LPCOLESTR pszCode, LPCOLESTR pszItemName, @@ -1283,7 +1084,7 @@ typedef struct IActiveScriptAuthorVtbl { DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *ParseScriptText)( - IActiveScriptAuthor* This, + IActiveScriptAuthor *This, LPCOLESTR pszCode, LPCOLESTR pszItemName, LPCOLESTR pszDelimiter, @@ -1291,7 +1092,7 @@ typedef struct IActiveScriptAuthorVtbl { DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetScriptTextAttributes)( - IActiveScriptAuthor* This, + IActiveScriptAuthor *This, LPCOLESTR pszCode, ULONG cch, LPCOLESTR pszDelimiter, @@ -1299,7 +1100,7 @@ typedef struct IActiveScriptAuthorVtbl { SOURCE_TEXT_ATTR *pattr); HRESULT (STDMETHODCALLTYPE *GetScriptletTextAttributes)( - IActiveScriptAuthor* This, + IActiveScriptAuthor *This, LPCOLESTR pszCode, ULONG cch, LPCOLESTR pszDelimiter, @@ -1307,15 +1108,15 @@ typedef struct IActiveScriptAuthorVtbl { SOURCE_TEXT_ATTR *pattr); HRESULT (STDMETHODCALLTYPE *GetRoot)( - IActiveScriptAuthor* This, + IActiveScriptAuthor *This, IScriptNode **ppsp); HRESULT (STDMETHODCALLTYPE *GetLanguageFlags)( - IActiveScriptAuthor* This, + IActiveScriptAuthor *This, DWORD *pgrfasa); HRESULT (STDMETHODCALLTYPE *GetEventHandler)( - IActiveScriptAuthor* This, + IActiveScriptAuthor *This, IDispatch *pdisp, LPCOLESTR pszItem, LPCOLESTR pszSubItem, @@ -1323,29 +1124,29 @@ typedef struct IActiveScriptAuthorVtbl { IScriptEntry **ppse); HRESULT (STDMETHODCALLTYPE *RemoveNamedItem)( - IActiveScriptAuthor* This, + IActiveScriptAuthor *This, LPCOLESTR pszName); HRESULT (STDMETHODCALLTYPE *AddTypeLib)( - IActiveScriptAuthor* This, + IActiveScriptAuthor *This, REFGUID rguidTypeLib, DWORD dwMajor, DWORD dwMinor, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *RemoveTypeLib)( - IActiveScriptAuthor* This, + IActiveScriptAuthor *This, REFGUID rguidTypeLib, DWORD dwMajor, DWORD dwMinor); HRESULT (STDMETHODCALLTYPE *GetChars)( - IActiveScriptAuthor* This, + IActiveScriptAuthor *This, DWORD fRequestedList, BSTR *pbstrChars); HRESULT (STDMETHODCALLTYPE *GetInfoFromContext)( - IActiveScriptAuthor* This, + IActiveScriptAuthor *This, LPCOLESTR pszCode, ULONG cchCode, ULONG ichCurrentPosition, @@ -1358,12 +1159,13 @@ typedef struct IActiveScriptAuthorVtbl { IUnknown **ppunk); HRESULT (STDMETHODCALLTYPE *IsCommitChar)( - IActiveScriptAuthor* This, + IActiveScriptAuthor *This, OLECHAR ch, WINBOOL *pfcommit); END_INTERFACE } IActiveScriptAuthorVtbl; + interface IActiveScriptAuthor { CONST_VTBL IActiveScriptAuthorVtbl* lpVtbl; }; @@ -1448,159 +1250,6 @@ static FORCEINLINE HRESULT IActiveScriptAuthor_IsCommitChar(IActiveScriptAuthor* #endif -HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_AddNamedItem_Proxy( - IActiveScriptAuthor* This, - LPCOLESTR pszName, - DWORD dwFlags, - IDispatch *pdisp); -void __RPC_STUB IActiveScriptAuthor_AddNamedItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_AddScriptlet_Proxy( - IActiveScriptAuthor* This, - LPCOLESTR pszDefaultName, - LPCOLESTR pszCode, - LPCOLESTR pszItemName, - LPCOLESTR pszSubItemName, - LPCOLESTR pszEventName, - LPCOLESTR pszDelimiter, - DWORD dwCookie, - DWORD dwFlags); -void __RPC_STUB IActiveScriptAuthor_AddScriptlet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_ParseScriptText_Proxy( - IActiveScriptAuthor* This, - LPCOLESTR pszCode, - LPCOLESTR pszItemName, - LPCOLESTR pszDelimiter, - DWORD dwCookie, - DWORD dwFlags); -void __RPC_STUB IActiveScriptAuthor_ParseScriptText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_GetScriptTextAttributes_Proxy( - IActiveScriptAuthor* This, - LPCOLESTR pszCode, - ULONG cch, - LPCOLESTR pszDelimiter, - DWORD dwFlags, - SOURCE_TEXT_ATTR *pattr); -void __RPC_STUB IActiveScriptAuthor_GetScriptTextAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_GetScriptletTextAttributes_Proxy( - IActiveScriptAuthor* This, - LPCOLESTR pszCode, - ULONG cch, - LPCOLESTR pszDelimiter, - DWORD dwFlags, - SOURCE_TEXT_ATTR *pattr); -void __RPC_STUB IActiveScriptAuthor_GetScriptletTextAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_GetRoot_Proxy( - IActiveScriptAuthor* This, - IScriptNode **ppsp); -void __RPC_STUB IActiveScriptAuthor_GetRoot_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_GetLanguageFlags_Proxy( - IActiveScriptAuthor* This, - DWORD *pgrfasa); -void __RPC_STUB IActiveScriptAuthor_GetLanguageFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_GetEventHandler_Proxy( - IActiveScriptAuthor* This, - IDispatch *pdisp, - LPCOLESTR pszItem, - LPCOLESTR pszSubItem, - LPCOLESTR pszEvent, - IScriptEntry **ppse); -void __RPC_STUB IActiveScriptAuthor_GetEventHandler_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_RemoveNamedItem_Proxy( - IActiveScriptAuthor* This, - LPCOLESTR pszName); -void __RPC_STUB IActiveScriptAuthor_RemoveNamedItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_AddTypeLib_Proxy( - IActiveScriptAuthor* This, - REFGUID rguidTypeLib, - DWORD dwMajor, - DWORD dwMinor, - DWORD dwFlags); -void __RPC_STUB IActiveScriptAuthor_AddTypeLib_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_RemoveTypeLib_Proxy( - IActiveScriptAuthor* This, - REFGUID rguidTypeLib, - DWORD dwMajor, - DWORD dwMinor); -void __RPC_STUB IActiveScriptAuthor_RemoveTypeLib_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_GetChars_Proxy( - IActiveScriptAuthor* This, - DWORD fRequestedList, - BSTR *pbstrChars); -void __RPC_STUB IActiveScriptAuthor_GetChars_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_GetInfoFromContext_Proxy( - IActiveScriptAuthor* This, - LPCOLESTR pszCode, - ULONG cchCode, - ULONG ichCurrentPosition, - DWORD dwListTypesRequested, - DWORD *pdwListTypesProvided, - ULONG *pichListAnchorPosition, - ULONG *pichFuncAnchorPosition, - MEMBERID *pmemid, - LONG *piCurrentParameter, - IUnknown **ppunk); -void __RPC_STUB IActiveScriptAuthor_GetInfoFromContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_IsCommitChar_Proxy( - IActiveScriptAuthor* This, - OLECHAR ch, - WINBOOL *pfcommit); -void __RPC_STUB IActiveScriptAuthor_IsCommitChar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptAuthor_INTERFACE_DEFINED__ */ @@ -1635,19 +1284,19 @@ typedef struct IActiveScriptAuthorProcedureVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptAuthorProcedure* This, + IActiveScriptAuthorProcedure *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptAuthorProcedure* This); + IActiveScriptAuthorProcedure *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptAuthorProcedure* This); + IActiveScriptAuthorProcedure *This); /*** IActiveScriptAuthorProcedure methods ***/ HRESULT (STDMETHODCALLTYPE *ParseProcedureText)( - IActiveScriptAuthorProcedure* This, + IActiveScriptAuthorProcedure *This, LPCOLESTR pszCode, LPCOLESTR pszFormalParams, LPCOLESTR pszProcedureName, @@ -1659,6 +1308,7 @@ typedef struct IActiveScriptAuthorProcedureVtbl { END_INTERFACE } IActiveScriptAuthorProcedureVtbl; + interface IActiveScriptAuthorProcedure { CONST_VTBL IActiveScriptAuthorProcedureVtbl* lpVtbl; }; @@ -1691,21 +1341,6 @@ static FORCEINLINE HRESULT IActiveScriptAuthorProcedure_ParseProcedureText(IActi #endif -HRESULT STDMETHODCALLTYPE IActiveScriptAuthorProcedure_ParseProcedureText_Proxy( - IActiveScriptAuthorProcedure* This, - LPCOLESTR pszCode, - LPCOLESTR pszFormalParams, - LPCOLESTR pszProcedureName, - LPCOLESTR pszItemName, - LPCOLESTR pszDelimiter, - DWORD dwCookie, - DWORD dwFlags, - IDispatch *pdispFor); -void __RPC_STUB IActiveScriptAuthorProcedure_ParseProcedureText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptAuthorProcedure_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/activdbg.h b/lib/libc/include/any-windows-any/activdbg.h index e6c0e2a1eb..24fdda1be3 100644 --- a/lib/libc/include/any-windows-any/activdbg.h +++ b/lib/libc/include/any-windows-any/activdbg.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/activdbg.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/activdbg.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,301 +21,481 @@ #ifndef __IActiveScriptDebug32_FWD_DEFINED__ #define __IActiveScriptDebug32_FWD_DEFINED__ typedef interface IActiveScriptDebug32 IActiveScriptDebug32; +#ifdef __cplusplus +interface IActiveScriptDebug32; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptDebug64_FWD_DEFINED__ #define __IActiveScriptDebug64_FWD_DEFINED__ typedef interface IActiveScriptDebug64 IActiveScriptDebug64; +#ifdef __cplusplus +interface IActiveScriptDebug64; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptSiteDebug32_FWD_DEFINED__ #define __IActiveScriptSiteDebug32_FWD_DEFINED__ typedef interface IActiveScriptSiteDebug32 IActiveScriptSiteDebug32; +#ifdef __cplusplus +interface IActiveScriptSiteDebug32; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptSiteDebug64_FWD_DEFINED__ #define __IActiveScriptSiteDebug64_FWD_DEFINED__ typedef interface IActiveScriptSiteDebug64 IActiveScriptSiteDebug64; +#ifdef __cplusplus +interface IActiveScriptSiteDebug64; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptSiteDebugEx_FWD_DEFINED__ #define __IActiveScriptSiteDebugEx_FWD_DEFINED__ typedef interface IActiveScriptSiteDebugEx IActiveScriptSiteDebugEx; +#ifdef __cplusplus +interface IActiveScriptSiteDebugEx; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptErrorDebug_FWD_DEFINED__ #define __IActiveScriptErrorDebug_FWD_DEFINED__ typedef interface IActiveScriptErrorDebug IActiveScriptErrorDebug; +#ifdef __cplusplus +interface IActiveScriptErrorDebug; +#endif /* __cplusplus */ #endif #ifndef __IDebugCodeContext_FWD_DEFINED__ #define __IDebugCodeContext_FWD_DEFINED__ typedef interface IDebugCodeContext IDebugCodeContext; +#ifdef __cplusplus +interface IDebugCodeContext; +#endif /* __cplusplus */ #endif #ifndef __IDebugExpression_FWD_DEFINED__ #define __IDebugExpression_FWD_DEFINED__ typedef interface IDebugExpression IDebugExpression; +#ifdef __cplusplus +interface IDebugExpression; +#endif /* __cplusplus */ #endif #ifndef __IDebugExpressionContext_FWD_DEFINED__ #define __IDebugExpressionContext_FWD_DEFINED__ typedef interface IDebugExpressionContext IDebugExpressionContext; +#ifdef __cplusplus +interface IDebugExpressionContext; +#endif /* __cplusplus */ #endif #ifndef __IDebugExpressionCallBack_FWD_DEFINED__ #define __IDebugExpressionCallBack_FWD_DEFINED__ typedef interface IDebugExpressionCallBack IDebugExpressionCallBack; +#ifdef __cplusplus +interface IDebugExpressionCallBack; +#endif /* __cplusplus */ #endif #ifndef __IDebugStackFrame_FWD_DEFINED__ #define __IDebugStackFrame_FWD_DEFINED__ typedef interface IDebugStackFrame IDebugStackFrame; +#ifdef __cplusplus +interface IDebugStackFrame; +#endif /* __cplusplus */ #endif #ifndef __IDebugStackFrameSniffer_FWD_DEFINED__ #define __IDebugStackFrameSniffer_FWD_DEFINED__ typedef interface IDebugStackFrameSniffer IDebugStackFrameSniffer; +#ifdef __cplusplus +interface IDebugStackFrameSniffer; +#endif /* __cplusplus */ #endif #ifndef __IDebugStackFrameSnifferEx32_FWD_DEFINED__ #define __IDebugStackFrameSnifferEx32_FWD_DEFINED__ typedef interface IDebugStackFrameSnifferEx32 IDebugStackFrameSnifferEx32; +#ifdef __cplusplus +interface IDebugStackFrameSnifferEx32; +#endif /* __cplusplus */ #endif #ifndef __IDebugStackFrameSnifferEx64_FWD_DEFINED__ #define __IDebugStackFrameSnifferEx64_FWD_DEFINED__ typedef interface IDebugStackFrameSnifferEx64 IDebugStackFrameSnifferEx64; +#ifdef __cplusplus +interface IDebugStackFrameSnifferEx64; +#endif /* __cplusplus */ #endif #ifndef __IDebugSyncOperation_FWD_DEFINED__ #define __IDebugSyncOperation_FWD_DEFINED__ typedef interface IDebugSyncOperation IDebugSyncOperation; +#ifdef __cplusplus +interface IDebugSyncOperation; +#endif /* __cplusplus */ #endif #ifndef __IDebugAsyncOperation_FWD_DEFINED__ #define __IDebugAsyncOperation_FWD_DEFINED__ typedef interface IDebugAsyncOperation IDebugAsyncOperation; +#ifdef __cplusplus +interface IDebugAsyncOperation; +#endif /* __cplusplus */ #endif #ifndef __IDebugAsyncOperationCallBack_FWD_DEFINED__ #define __IDebugAsyncOperationCallBack_FWD_DEFINED__ typedef interface IDebugAsyncOperationCallBack IDebugAsyncOperationCallBack; +#ifdef __cplusplus +interface IDebugAsyncOperationCallBack; +#endif /* __cplusplus */ #endif #ifndef __IEnumDebugCodeContexts_FWD_DEFINED__ #define __IEnumDebugCodeContexts_FWD_DEFINED__ typedef interface IEnumDebugCodeContexts IEnumDebugCodeContexts; +#ifdef __cplusplus +interface IEnumDebugCodeContexts; +#endif /* __cplusplus */ #endif #ifndef __IEnumDebugStackFrames_FWD_DEFINED__ #define __IEnumDebugStackFrames_FWD_DEFINED__ typedef interface IEnumDebugStackFrames IEnumDebugStackFrames; +#ifdef __cplusplus +interface IEnumDebugStackFrames; +#endif /* __cplusplus */ #endif #ifndef __IEnumDebugStackFrames64_FWD_DEFINED__ #define __IEnumDebugStackFrames64_FWD_DEFINED__ typedef interface IEnumDebugStackFrames64 IEnumDebugStackFrames64; +#ifdef __cplusplus +interface IEnumDebugStackFrames64; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentInfo_FWD_DEFINED__ #define __IDebugDocumentInfo_FWD_DEFINED__ typedef interface IDebugDocumentInfo IDebugDocumentInfo; +#ifdef __cplusplus +interface IDebugDocumentInfo; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentProvider_FWD_DEFINED__ #define __IDebugDocumentProvider_FWD_DEFINED__ typedef interface IDebugDocumentProvider IDebugDocumentProvider; +#ifdef __cplusplus +interface IDebugDocumentProvider; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocument_FWD_DEFINED__ #define __IDebugDocument_FWD_DEFINED__ typedef interface IDebugDocument IDebugDocument; +#ifdef __cplusplus +interface IDebugDocument; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentText_FWD_DEFINED__ #define __IDebugDocumentText_FWD_DEFINED__ typedef interface IDebugDocumentText IDebugDocumentText; +#ifdef __cplusplus +interface IDebugDocumentText; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentTextEvents_FWD_DEFINED__ #define __IDebugDocumentTextEvents_FWD_DEFINED__ typedef interface IDebugDocumentTextEvents IDebugDocumentTextEvents; +#ifdef __cplusplus +interface IDebugDocumentTextEvents; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentTextAuthor_FWD_DEFINED__ #define __IDebugDocumentTextAuthor_FWD_DEFINED__ typedef interface IDebugDocumentTextAuthor IDebugDocumentTextAuthor; +#ifdef __cplusplus +interface IDebugDocumentTextAuthor; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentTextExternalAuthor_FWD_DEFINED__ #define __IDebugDocumentTextExternalAuthor_FWD_DEFINED__ typedef interface IDebugDocumentTextExternalAuthor IDebugDocumentTextExternalAuthor; +#ifdef __cplusplus +interface IDebugDocumentTextExternalAuthor; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentHelper32_FWD_DEFINED__ #define __IDebugDocumentHelper32_FWD_DEFINED__ typedef interface IDebugDocumentHelper32 IDebugDocumentHelper32; +#ifdef __cplusplus +interface IDebugDocumentHelper32; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentHelper64_FWD_DEFINED__ #define __IDebugDocumentHelper64_FWD_DEFINED__ typedef interface IDebugDocumentHelper64 IDebugDocumentHelper64; +#ifdef __cplusplus +interface IDebugDocumentHelper64; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentHost_FWD_DEFINED__ #define __IDebugDocumentHost_FWD_DEFINED__ typedef interface IDebugDocumentHost IDebugDocumentHost; +#ifdef __cplusplus +interface IDebugDocumentHost; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentContext_FWD_DEFINED__ #define __IDebugDocumentContext_FWD_DEFINED__ typedef interface IDebugDocumentContext IDebugDocumentContext; +#ifdef __cplusplus +interface IDebugDocumentContext; +#endif /* __cplusplus */ #endif #ifndef __IDebugSessionProvider_FWD_DEFINED__ #define __IDebugSessionProvider_FWD_DEFINED__ typedef interface IDebugSessionProvider IDebugSessionProvider; +#ifdef __cplusplus +interface IDebugSessionProvider; +#endif /* __cplusplus */ #endif #ifndef __IApplicationDebugger_FWD_DEFINED__ #define __IApplicationDebugger_FWD_DEFINED__ typedef interface IApplicationDebugger IApplicationDebugger; +#ifdef __cplusplus +interface IApplicationDebugger; +#endif /* __cplusplus */ #endif #ifndef __IApplicationDebuggerUI_FWD_DEFINED__ #define __IApplicationDebuggerUI_FWD_DEFINED__ typedef interface IApplicationDebuggerUI IApplicationDebuggerUI; +#ifdef __cplusplus +interface IApplicationDebuggerUI; +#endif /* __cplusplus */ #endif #ifndef __IMachineDebugManager_FWD_DEFINED__ #define __IMachineDebugManager_FWD_DEFINED__ typedef interface IMachineDebugManager IMachineDebugManager; +#ifdef __cplusplus +interface IMachineDebugManager; +#endif /* __cplusplus */ #endif #ifndef __IMachineDebugManagerCookie_FWD_DEFINED__ #define __IMachineDebugManagerCookie_FWD_DEFINED__ typedef interface IMachineDebugManagerCookie IMachineDebugManagerCookie; +#ifdef __cplusplus +interface IMachineDebugManagerCookie; +#endif /* __cplusplus */ #endif #ifndef __IMachineDebugManagerEvents_FWD_DEFINED__ #define __IMachineDebugManagerEvents_FWD_DEFINED__ typedef interface IMachineDebugManagerEvents IMachineDebugManagerEvents; +#ifdef __cplusplus +interface IMachineDebugManagerEvents; +#endif /* __cplusplus */ #endif #ifndef __IProcessDebugManager32_FWD_DEFINED__ #define __IProcessDebugManager32_FWD_DEFINED__ typedef interface IProcessDebugManager32 IProcessDebugManager32; +#ifdef __cplusplus +interface IProcessDebugManager32; +#endif /* __cplusplus */ #endif #ifndef __IProcessDebugManager64_FWD_DEFINED__ #define __IProcessDebugManager64_FWD_DEFINED__ typedef interface IProcessDebugManager64 IProcessDebugManager64; +#ifdef __cplusplus +interface IProcessDebugManager64; +#endif /* __cplusplus */ #endif #ifndef __IRemoteDebugApplication_FWD_DEFINED__ #define __IRemoteDebugApplication_FWD_DEFINED__ typedef interface IRemoteDebugApplication IRemoteDebugApplication; +#ifdef __cplusplus +interface IRemoteDebugApplication; +#endif /* __cplusplus */ #endif #ifndef __IDebugApplication32_FWD_DEFINED__ #define __IDebugApplication32_FWD_DEFINED__ typedef interface IDebugApplication32 IDebugApplication32; +#ifdef __cplusplus +interface IDebugApplication32; +#endif /* __cplusplus */ #endif #ifndef __IDebugApplication64_FWD_DEFINED__ #define __IDebugApplication64_FWD_DEFINED__ typedef interface IDebugApplication64 IDebugApplication64; +#ifdef __cplusplus +interface IDebugApplication64; +#endif /* __cplusplus */ #endif #ifndef __IRemoteDebugApplicationEvents_FWD_DEFINED__ #define __IRemoteDebugApplicationEvents_FWD_DEFINED__ typedef interface IRemoteDebugApplicationEvents IRemoteDebugApplicationEvents; +#ifdef __cplusplus +interface IRemoteDebugApplicationEvents; +#endif /* __cplusplus */ #endif #ifndef __IDebugApplicationNode_FWD_DEFINED__ #define __IDebugApplicationNode_FWD_DEFINED__ typedef interface IDebugApplicationNode IDebugApplicationNode; +#ifdef __cplusplus +interface IDebugApplicationNode; +#endif /* __cplusplus */ #endif #ifndef __IDebugApplicationNodeEvents_FWD_DEFINED__ #define __IDebugApplicationNodeEvents_FWD_DEFINED__ typedef interface IDebugApplicationNodeEvents IDebugApplicationNodeEvents; +#ifdef __cplusplus +interface IDebugApplicationNodeEvents; +#endif /* __cplusplus */ #endif #ifndef __AsyncIDebugApplicationNodeEvents_FWD_DEFINED__ #define __AsyncIDebugApplicationNodeEvents_FWD_DEFINED__ typedef interface AsyncIDebugApplicationNodeEvents AsyncIDebugApplicationNodeEvents; +#ifdef __cplusplus +interface AsyncIDebugApplicationNodeEvents; +#endif /* __cplusplus */ #endif #ifndef __IDebugThreadCall32_FWD_DEFINED__ #define __IDebugThreadCall32_FWD_DEFINED__ typedef interface IDebugThreadCall32 IDebugThreadCall32; +#ifdef __cplusplus +interface IDebugThreadCall32; +#endif /* __cplusplus */ #endif #ifndef __IDebugThreadCall64_FWD_DEFINED__ #define __IDebugThreadCall64_FWD_DEFINED__ typedef interface IDebugThreadCall64 IDebugThreadCall64; +#ifdef __cplusplus +interface IDebugThreadCall64; +#endif /* __cplusplus */ #endif #ifndef __IRemoteDebugApplicationThread_FWD_DEFINED__ #define __IRemoteDebugApplicationThread_FWD_DEFINED__ typedef interface IRemoteDebugApplicationThread IRemoteDebugApplicationThread; +#ifdef __cplusplus +interface IRemoteDebugApplicationThread; +#endif /* __cplusplus */ #endif #ifndef __IDebugApplicationThread_FWD_DEFINED__ #define __IDebugApplicationThread_FWD_DEFINED__ typedef interface IDebugApplicationThread IDebugApplicationThread; +#ifdef __cplusplus +interface IDebugApplicationThread; +#endif /* __cplusplus */ #endif #ifndef __IDebugApplicationThread64_FWD_DEFINED__ #define __IDebugApplicationThread64_FWD_DEFINED__ typedef interface IDebugApplicationThread64 IDebugApplicationThread64; +#ifdef __cplusplus +interface IDebugApplicationThread64; +#endif /* __cplusplus */ #endif #ifndef __IDebugCookie_FWD_DEFINED__ #define __IDebugCookie_FWD_DEFINED__ typedef interface IDebugCookie IDebugCookie; +#ifdef __cplusplus +interface IDebugCookie; +#endif /* __cplusplus */ #endif #ifndef __IEnumDebugApplicationNodes_FWD_DEFINED__ #define __IEnumDebugApplicationNodes_FWD_DEFINED__ typedef interface IEnumDebugApplicationNodes IEnumDebugApplicationNodes; +#ifdef __cplusplus +interface IEnumDebugApplicationNodes; +#endif /* __cplusplus */ #endif #ifndef __IEnumRemoteDebugApplications_FWD_DEFINED__ #define __IEnumRemoteDebugApplications_FWD_DEFINED__ typedef interface IEnumRemoteDebugApplications IEnumRemoteDebugApplications; +#ifdef __cplusplus +interface IEnumRemoteDebugApplications; +#endif /* __cplusplus */ #endif #ifndef __IEnumRemoteDebugApplicationThreads_FWD_DEFINED__ #define __IEnumRemoteDebugApplicationThreads_FWD_DEFINED__ typedef interface IEnumRemoteDebugApplicationThreads IEnumRemoteDebugApplicationThreads; +#ifdef __cplusplus +interface IEnumRemoteDebugApplicationThreads; +#endif /* __cplusplus */ #endif #ifndef __IDebugFormatter_FWD_DEFINED__ #define __IDebugFormatter_FWD_DEFINED__ typedef interface IDebugFormatter IDebugFormatter; +#ifdef __cplusplus +interface IDebugFormatter; +#endif /* __cplusplus */ #endif #ifndef __ISimpleConnectionPoint_FWD_DEFINED__ #define __ISimpleConnectionPoint_FWD_DEFINED__ typedef interface ISimpleConnectionPoint ISimpleConnectionPoint; +#ifdef __cplusplus +interface ISimpleConnectionPoint; +#endif /* __cplusplus */ #endif #ifndef __IDebugHelper_FWD_DEFINED__ #define __IDebugHelper_FWD_DEFINED__ typedef interface IDebugHelper IDebugHelper; +#ifdef __cplusplus +interface IDebugHelper; +#endif /* __cplusplus */ #endif #ifndef __IEnumDebugExpressionContexts_FWD_DEFINED__ #define __IEnumDebugExpressionContexts_FWD_DEFINED__ typedef interface IEnumDebugExpressionContexts IEnumDebugExpressionContexts; +#ifdef __cplusplus +interface IEnumDebugExpressionContexts; +#endif /* __cplusplus */ #endif #ifndef __IProvideExpressionContexts_FWD_DEFINED__ #define __IProvideExpressionContexts_FWD_DEFINED__ typedef interface IProvideExpressionContexts IProvideExpressionContexts; +#ifdef __cplusplus +interface IProvideExpressionContexts; +#endif /* __cplusplus */ #endif #ifndef __ProcessDebugManager_FWD_DEFINED__ @@ -392,271 +573,425 @@ extern "C" { #ifndef __IActiveScriptDebug32_FWD_DEFINED__ #define __IActiveScriptDebug32_FWD_DEFINED__ typedef interface IActiveScriptDebug32 IActiveScriptDebug32; +#ifdef __cplusplus +interface IActiveScriptDebug32; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptDebug64_FWD_DEFINED__ #define __IActiveScriptDebug64_FWD_DEFINED__ typedef interface IActiveScriptDebug64 IActiveScriptDebug64; +#ifdef __cplusplus +interface IActiveScriptDebug64; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptErrorDebug_FWD_DEFINED__ #define __IActiveScriptErrorDebug_FWD_DEFINED__ typedef interface IActiveScriptErrorDebug IActiveScriptErrorDebug; +#ifdef __cplusplus +interface IActiveScriptErrorDebug; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptSiteDebug32_FWD_DEFINED__ #define __IActiveScriptSiteDebug32_FWD_DEFINED__ typedef interface IActiveScriptSiteDebug32 IActiveScriptSiteDebug32; +#ifdef __cplusplus +interface IActiveScriptSiteDebug32; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptSiteDebug64_FWD_DEFINED__ #define __IActiveScriptSiteDebug64_FWD_DEFINED__ typedef interface IActiveScriptSiteDebug64 IActiveScriptSiteDebug64; +#ifdef __cplusplus +interface IActiveScriptSiteDebug64; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptSiteDebugEx_FWD_DEFINED__ #define __IActiveScriptSiteDebugEx_FWD_DEFINED__ typedef interface IActiveScriptSiteDebugEx IActiveScriptSiteDebugEx; +#ifdef __cplusplus +interface IActiveScriptSiteDebugEx; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptTextInfo_FWD_DEFINED__ #define __IActiveScriptTextInfo_FWD_DEFINED__ typedef interface IActiveScriptTextInfo IActiveScriptTextInfo; +#ifdef __cplusplus +interface IActiveScriptTextInfo; +#endif /* __cplusplus */ #endif #ifndef __IApplicationDebugger_FWD_DEFINED__ #define __IApplicationDebugger_FWD_DEFINED__ typedef interface IApplicationDebugger IApplicationDebugger; +#ifdef __cplusplus +interface IApplicationDebugger; +#endif /* __cplusplus */ #endif #ifndef __IDebugApplication32_FWD_DEFINED__ #define __IDebugApplication32_FWD_DEFINED__ typedef interface IDebugApplication32 IDebugApplication32; +#ifdef __cplusplus +interface IDebugApplication32; +#endif /* __cplusplus */ #endif #ifndef __IDebugApplication64_FWD_DEFINED__ #define __IDebugApplication64_FWD_DEFINED__ typedef interface IDebugApplication64 IDebugApplication64; +#ifdef __cplusplus +interface IDebugApplication64; +#endif /* __cplusplus */ #endif #ifndef __IDebugApplicationNode_FWD_DEFINED__ #define __IDebugApplicationNode_FWD_DEFINED__ typedef interface IDebugApplicationNode IDebugApplicationNode; +#ifdef __cplusplus +interface IDebugApplicationNode; +#endif /* __cplusplus */ #endif #ifndef __IDebugApplicationNodeEvents_FWD_DEFINED__ #define __IDebugApplicationNodeEvents_FWD_DEFINED__ typedef interface IDebugApplicationNodeEvents IDebugApplicationNodeEvents; -#endif - -#ifndef __AsyncIDebugApplicationNodeEvents_FWD_DEFINED__ -#define __AsyncIDebugApplicationNodeEvents_FWD_DEFINED__ -typedef interface AsyncIDebugApplicationNodeEvents AsyncIDebugApplicationNodeEvents; +#ifdef __cplusplus +interface IDebugApplicationNodeEvents; +#endif /* __cplusplus */ #endif #ifndef __IDebugApplicationThread_FWD_DEFINED__ #define __IDebugApplicationThread_FWD_DEFINED__ typedef interface IDebugApplicationThread IDebugApplicationThread; +#ifdef __cplusplus +interface IDebugApplicationThread; +#endif /* __cplusplus */ #endif #ifndef __IDebugAsyncOperation_FWD_DEFINED__ #define __IDebugAsyncOperation_FWD_DEFINED__ typedef interface IDebugAsyncOperation IDebugAsyncOperation; +#ifdef __cplusplus +interface IDebugAsyncOperation; +#endif /* __cplusplus */ #endif #ifndef __IDebugAsyncOperationCallBack_FWD_DEFINED__ #define __IDebugAsyncOperationCallBack_FWD_DEFINED__ typedef interface IDebugAsyncOperationCallBack IDebugAsyncOperationCallBack; +#ifdef __cplusplus +interface IDebugAsyncOperationCallBack; +#endif /* __cplusplus */ #endif #ifndef __IDebugCodeContext_FWD_DEFINED__ #define __IDebugCodeContext_FWD_DEFINED__ typedef interface IDebugCodeContext IDebugCodeContext; +#ifdef __cplusplus +interface IDebugCodeContext; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocument_FWD_DEFINED__ #define __IDebugDocument_FWD_DEFINED__ typedef interface IDebugDocument IDebugDocument; +#ifdef __cplusplus +interface IDebugDocument; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentContext_FWD_DEFINED__ #define __IDebugDocumentContext_FWD_DEFINED__ typedef interface IDebugDocumentContext IDebugDocumentContext; +#ifdef __cplusplus +interface IDebugDocumentContext; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentHelper32_FWD_DEFINED__ #define __IDebugDocumentHelper32_FWD_DEFINED__ typedef interface IDebugDocumentHelper32 IDebugDocumentHelper32; +#ifdef __cplusplus +interface IDebugDocumentHelper32; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentHelper64_FWD_DEFINED__ #define __IDebugDocumentHelper64_FWD_DEFINED__ typedef interface IDebugDocumentHelper64 IDebugDocumentHelper64; +#ifdef __cplusplus +interface IDebugDocumentHelper64; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentHost_FWD_DEFINED__ #define __IDebugDocumentHost_FWD_DEFINED__ typedef interface IDebugDocumentHost IDebugDocumentHost; +#ifdef __cplusplus +interface IDebugDocumentHost; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentInfo_FWD_DEFINED__ #define __IDebugDocumentInfo_FWD_DEFINED__ typedef interface IDebugDocumentInfo IDebugDocumentInfo; +#ifdef __cplusplus +interface IDebugDocumentInfo; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentProvider_FWD_DEFINED__ #define __IDebugDocumentProvider_FWD_DEFINED__ typedef interface IDebugDocumentProvider IDebugDocumentProvider; +#ifdef __cplusplus +interface IDebugDocumentProvider; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentText_FWD_DEFINED__ #define __IDebugDocumentText_FWD_DEFINED__ typedef interface IDebugDocumentText IDebugDocumentText; +#ifdef __cplusplus +interface IDebugDocumentText; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentTextAuthor_FWD_DEFINED__ #define __IDebugDocumentTextAuthor_FWD_DEFINED__ typedef interface IDebugDocumentTextAuthor IDebugDocumentTextAuthor; +#ifdef __cplusplus +interface IDebugDocumentTextAuthor; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentTextEvents_FWD_DEFINED__ #define __IDebugDocumentTextEvents_FWD_DEFINED__ typedef interface IDebugDocumentTextEvents IDebugDocumentTextEvents; +#ifdef __cplusplus +interface IDebugDocumentTextEvents; +#endif /* __cplusplus */ #endif #ifndef __IDebugExpression_FWD_DEFINED__ #define __IDebugExpression_FWD_DEFINED__ typedef interface IDebugExpression IDebugExpression; +#ifdef __cplusplus +interface IDebugExpression; +#endif /* __cplusplus */ #endif #ifndef __IDebugExpressionCallBack_FWD_DEFINED__ #define __IDebugExpressionCallBack_FWD_DEFINED__ typedef interface IDebugExpressionCallBack IDebugExpressionCallBack; +#ifdef __cplusplus +interface IDebugExpressionCallBack; +#endif /* __cplusplus */ #endif #ifndef __IDebugExpressionContext_FWD_DEFINED__ #define __IDebugExpressionContext_FWD_DEFINED__ typedef interface IDebugExpressionContext IDebugExpressionContext; +#ifdef __cplusplus +interface IDebugExpressionContext; +#endif /* __cplusplus */ #endif #ifndef __IDebugFormatter_FWD_DEFINED__ #define __IDebugFormatter_FWD_DEFINED__ typedef interface IDebugFormatter IDebugFormatter; +#ifdef __cplusplus +interface IDebugFormatter; +#endif /* __cplusplus */ #endif #ifndef __IDebugSessionProvider_FWD_DEFINED__ #define __IDebugSessionProvider_FWD_DEFINED__ typedef interface IDebugSessionProvider IDebugSessionProvider; +#ifdef __cplusplus +interface IDebugSessionProvider; +#endif /* __cplusplus */ #endif #ifndef __IDebugStackFrame_FWD_DEFINED__ #define __IDebugStackFrame_FWD_DEFINED__ typedef interface IDebugStackFrame IDebugStackFrame; +#ifdef __cplusplus +interface IDebugStackFrame; +#endif /* __cplusplus */ #endif #ifndef __IDebugStackFrameSniffer_FWD_DEFINED__ #define __IDebugStackFrameSniffer_FWD_DEFINED__ typedef interface IDebugStackFrameSniffer IDebugStackFrameSniffer; +#ifdef __cplusplus +interface IDebugStackFrameSniffer; +#endif /* __cplusplus */ #endif #ifndef __IDebugSyncOperation_FWD_DEFINED__ #define __IDebugSyncOperation_FWD_DEFINED__ typedef interface IDebugSyncOperation IDebugSyncOperation; +#ifdef __cplusplus +interface IDebugSyncOperation; +#endif /* __cplusplus */ #endif #ifndef __IDebugThreadCall32_FWD_DEFINED__ #define __IDebugThreadCall32_FWD_DEFINED__ typedef interface IDebugThreadCall32 IDebugThreadCall32; +#ifdef __cplusplus +interface IDebugThreadCall32; +#endif /* __cplusplus */ #endif #ifndef __IDebugThreadCall64_FWD_DEFINED__ #define __IDebugThreadCall64_FWD_DEFINED__ typedef interface IDebugThreadCall64 IDebugThreadCall64; +#ifdef __cplusplus +interface IDebugThreadCall64; +#endif /* __cplusplus */ #endif #ifndef __IEnumActiveScriptDebugs_FWD_DEFINED__ #define __IEnumActiveScriptDebugs_FWD_DEFINED__ typedef interface IEnumActiveScriptDebugs IEnumActiveScriptDebugs; +#ifdef __cplusplus +interface IEnumActiveScriptDebugs; +#endif /* __cplusplus */ #endif #ifndef __IEnumDebugApplicationNodes_FWD_DEFINED__ #define __IEnumDebugApplicationNodes_FWD_DEFINED__ typedef interface IEnumDebugApplicationNodes IEnumDebugApplicationNodes; +#ifdef __cplusplus +interface IEnumDebugApplicationNodes; +#endif /* __cplusplus */ #endif #ifndef __IEnumDebugCodeContexts_FWD_DEFINED__ #define __IEnumDebugCodeContexts_FWD_DEFINED__ typedef interface IEnumDebugCodeContexts IEnumDebugCodeContexts; +#ifdef __cplusplus +interface IEnumDebugCodeContexts; +#endif /* __cplusplus */ #endif #ifndef __IEnumDebugDocumentContexts_FWD_DEFINED__ #define __IEnumDebugDocumentContexts_FWD_DEFINED__ typedef interface IEnumDebugDocumentContexts IEnumDebugDocumentContexts; +#ifdef __cplusplus +interface IEnumDebugDocumentContexts; +#endif /* __cplusplus */ #endif #ifndef __IEnumDebugExpressionContexts_FWD_DEFINED__ #define __IEnumDebugExpressionContexts_FWD_DEFINED__ typedef interface IEnumDebugExpressionContexts IEnumDebugExpressionContexts; +#ifdef __cplusplus +interface IEnumDebugExpressionContexts; +#endif /* __cplusplus */ #endif #ifndef __IEnumDebugObjectBrowsers_FWD_DEFINED__ #define __IEnumDebugObjectBrowsers_FWD_DEFINED__ typedef interface IEnumDebugObjectBrowsers IEnumDebugObjectBrowsers; +#ifdef __cplusplus +interface IEnumDebugObjectBrowsers; +#endif /* __cplusplus */ #endif #ifndef __IEnumDebugStackFrames_FWD_DEFINED__ #define __IEnumDebugStackFrames_FWD_DEFINED__ typedef interface IEnumDebugStackFrames IEnumDebugStackFrames; +#ifdef __cplusplus +interface IEnumDebugStackFrames; +#endif /* __cplusplus */ #endif #ifndef __IEnumDebugStackFrames64_FWD_DEFINED__ #define __IEnumDebugStackFrames64_FWD_DEFINED__ typedef interface IEnumDebugStackFrames64 IEnumDebugStackFrames64; +#ifdef __cplusplus +interface IEnumDebugStackFrames64; +#endif /* __cplusplus */ #endif #ifndef __IEnumRemoteDebugApplications_FWD_DEFINED__ #define __IEnumRemoteDebugApplications_FWD_DEFINED__ typedef interface IEnumRemoteDebugApplications IEnumRemoteDebugApplications; +#ifdef __cplusplus +interface IEnumRemoteDebugApplications; +#endif /* __cplusplus */ #endif #ifndef __IEnumRemoteDebugApplicationThreads_FWD_DEFINED__ #define __IEnumRemoteDebugApplicationThreads_FWD_DEFINED__ typedef interface IEnumRemoteDebugApplicationThreads IEnumRemoteDebugApplicationThreads; +#ifdef __cplusplus +interface IEnumRemoteDebugApplicationThreads; +#endif /* __cplusplus */ #endif #ifndef __IMachineDebugManager_FWD_DEFINED__ #define __IMachineDebugManager_FWD_DEFINED__ typedef interface IMachineDebugManager IMachineDebugManager; +#ifdef __cplusplus +interface IMachineDebugManager; +#endif /* __cplusplus */ #endif #ifndef __IMachineDebugManagerCookie_FWD_DEFINED__ #define __IMachineDebugManagerCookie_FWD_DEFINED__ typedef interface IMachineDebugManagerCookie IMachineDebugManagerCookie; +#ifdef __cplusplus +interface IMachineDebugManagerCookie; +#endif /* __cplusplus */ #endif #ifndef __IMachineDebugManagerEvents_FWD_DEFINED__ #define __IMachineDebugManagerEvents_FWD_DEFINED__ typedef interface IMachineDebugManagerEvents IMachineDebugManagerEvents; +#ifdef __cplusplus +interface IMachineDebugManagerEvents; +#endif /* __cplusplus */ #endif #ifndef __IProcessDebugManager_FWD_DEFINED__ #define __IProcessDebugManager_FWD_DEFINED__ typedef interface IProcessDebugManager IProcessDebugManager; +#ifdef __cplusplus +interface IProcessDebugManager; +#endif /* __cplusplus */ #endif #ifndef __IProvideExpressionContexts_FWD_DEFINED__ #define __IProvideExpressionContexts_FWD_DEFINED__ typedef interface IProvideExpressionContexts IProvideExpressionContexts; +#ifdef __cplusplus +interface IProvideExpressionContexts; +#endif /* __cplusplus */ #endif #ifndef __IRemoteDebugApplication_FWD_DEFINED__ #define __IRemoteDebugApplication_FWD_DEFINED__ typedef interface IRemoteDebugApplication IRemoteDebugApplication; +#ifdef __cplusplus +interface IRemoteDebugApplication; +#endif /* __cplusplus */ #endif #ifndef __IRemoteDebugApplicationThread_FWD_DEFINED__ #define __IRemoteDebugApplicationThread_FWD_DEFINED__ typedef interface IRemoteDebugApplicationThread IRemoteDebugApplicationThread; +#ifdef __cplusplus +interface IRemoteDebugApplicationThread; +#endif /* __cplusplus */ #endif typedef DWORD APPBREAKFLAGS; @@ -845,19 +1180,19 @@ typedef struct IActiveScriptDebug32Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptDebug32* This, + IActiveScriptDebug32 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptDebug32* This); + IActiveScriptDebug32 *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptDebug32* This); + IActiveScriptDebug32 *This); /*** IActiveScriptDebug32 methods ***/ HRESULT (STDMETHODCALLTYPE *GetScriptTextAttributes)( - IActiveScriptDebug32* This, + IActiveScriptDebug32 *This, LPCOLESTR pstrCode, ULONG uNumCodeChars, LPCOLESTR pstrDelimiter, @@ -865,7 +1200,7 @@ typedef struct IActiveScriptDebug32Vtbl { SOURCE_TEXT_ATTR *pattr); HRESULT (STDMETHODCALLTYPE *GetScriptletTextAttributes)( - IActiveScriptDebug32* This, + IActiveScriptDebug32 *This, LPCOLESTR pstrCode, ULONG uNumCodeChars, LPCOLESTR pstrDelimiter, @@ -873,7 +1208,7 @@ typedef struct IActiveScriptDebug32Vtbl { SOURCE_TEXT_ATTR *pattr); HRESULT (STDMETHODCALLTYPE *EnumCodeContextsOfPosition)( - IActiveScriptDebug32* This, + IActiveScriptDebug32 *This, DWORD dwSourceContext, ULONG uCharacterOffset, ULONG uNumChars, @@ -881,6 +1216,7 @@ typedef struct IActiveScriptDebug32Vtbl { END_INTERFACE } IActiveScriptDebug32Vtbl; + interface IActiveScriptDebug32 { CONST_VTBL IActiveScriptDebug32Vtbl* lpVtbl; }; @@ -921,41 +1257,6 @@ static FORCEINLINE HRESULT IActiveScriptDebug32_EnumCodeContextsOfPosition(IActi #endif -HRESULT STDMETHODCALLTYPE IActiveScriptDebug32_GetScriptTextAttributes_Proxy( - IActiveScriptDebug32* This, - LPCOLESTR pstrCode, - ULONG uNumCodeChars, - LPCOLESTR pstrDelimiter, - DWORD dwFlags, - SOURCE_TEXT_ATTR *pattr); -void __RPC_STUB IActiveScriptDebug32_GetScriptTextAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptDebug32_GetScriptletTextAttributes_Proxy( - IActiveScriptDebug32* This, - LPCOLESTR pstrCode, - ULONG uNumCodeChars, - LPCOLESTR pstrDelimiter, - DWORD dwFlags, - SOURCE_TEXT_ATTR *pattr); -void __RPC_STUB IActiveScriptDebug32_GetScriptletTextAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptDebug32_EnumCodeContextsOfPosition_Proxy( - IActiveScriptDebug32* This, - DWORD dwSourceContext, - ULONG uCharacterOffset, - ULONG uNumChars, - IEnumDebugCodeContexts **ppescc); -void __RPC_STUB IActiveScriptDebug32_EnumCodeContextsOfPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptDebug32_INTERFACE_DEFINED__ */ @@ -1000,19 +1301,19 @@ typedef struct IActiveScriptDebug64Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptDebug64* This, + IActiveScriptDebug64 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptDebug64* This); + IActiveScriptDebug64 *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptDebug64* This); + IActiveScriptDebug64 *This); /*** IActiveScriptDebug64 methods ***/ HRESULT (STDMETHODCALLTYPE *GetScriptTextAttributes)( - IActiveScriptDebug64* This, + IActiveScriptDebug64 *This, LPCOLESTR pstrCode, ULONG uNumCodeChars, LPCOLESTR pstrDelimiter, @@ -1020,7 +1321,7 @@ typedef struct IActiveScriptDebug64Vtbl { SOURCE_TEXT_ATTR *pattr); HRESULT (STDMETHODCALLTYPE *GetScriptletTextAttributes)( - IActiveScriptDebug64* This, + IActiveScriptDebug64 *This, LPCOLESTR pstrCode, ULONG uNumCodeChars, LPCOLESTR pstrDelimiter, @@ -1028,7 +1329,7 @@ typedef struct IActiveScriptDebug64Vtbl { SOURCE_TEXT_ATTR *pattr); HRESULT (STDMETHODCALLTYPE *EnumCodeContextsOfPosition)( - IActiveScriptDebug64* This, + IActiveScriptDebug64 *This, DWORDLONG dwSourceContext, ULONG uCharacterOffset, ULONG uNumChars, @@ -1036,6 +1337,7 @@ typedef struct IActiveScriptDebug64Vtbl { END_INTERFACE } IActiveScriptDebug64Vtbl; + interface IActiveScriptDebug64 { CONST_VTBL IActiveScriptDebug64Vtbl* lpVtbl; }; @@ -1076,41 +1378,6 @@ static FORCEINLINE HRESULT IActiveScriptDebug64_EnumCodeContextsOfPosition(IActi #endif -HRESULT STDMETHODCALLTYPE IActiveScriptDebug64_GetScriptTextAttributes_Proxy( - IActiveScriptDebug64* This, - LPCOLESTR pstrCode, - ULONG uNumCodeChars, - LPCOLESTR pstrDelimiter, - DWORD dwFlags, - SOURCE_TEXT_ATTR *pattr); -void __RPC_STUB IActiveScriptDebug64_GetScriptTextAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptDebug64_GetScriptletTextAttributes_Proxy( - IActiveScriptDebug64* This, - LPCOLESTR pstrCode, - ULONG uNumCodeChars, - LPCOLESTR pstrDelimiter, - DWORD dwFlags, - SOURCE_TEXT_ATTR *pattr); -void __RPC_STUB IActiveScriptDebug64_GetScriptletTextAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptDebug64_EnumCodeContextsOfPosition_Proxy( - IActiveScriptDebug64* This, - DWORDLONG dwSourceContext, - ULONG uCharacterOffset, - ULONG uNumChars, - IEnumDebugCodeContexts **ppescc); -void __RPC_STUB IActiveScriptDebug64_EnumCodeContextsOfPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptDebug64_INTERFACE_DEFINED__ */ @@ -1152,40 +1419,41 @@ typedef struct IActiveScriptSiteDebug32Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptSiteDebug32* This, + IActiveScriptSiteDebug32 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptSiteDebug32* This); + IActiveScriptSiteDebug32 *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptSiteDebug32* This); + IActiveScriptSiteDebug32 *This); /*** IActiveScriptSiteDebug32 methods ***/ HRESULT (STDMETHODCALLTYPE *GetDocumentContextFromPosition)( - IActiveScriptSiteDebug32* This, + IActiveScriptSiteDebug32 *This, DWORD dwSourceContext, ULONG uCharacterOffset, ULONG uNumChars, IDebugDocumentContext **ppsc); HRESULT (STDMETHODCALLTYPE *GetApplication)( - IActiveScriptSiteDebug32* This, + IActiveScriptSiteDebug32 *This, IDebugApplication32 **ppda); HRESULT (STDMETHODCALLTYPE *GetRootApplicationNode)( - IActiveScriptSiteDebug32* This, + IActiveScriptSiteDebug32 *This, IDebugApplicationNode **ppdanRoot); HRESULT (STDMETHODCALLTYPE *OnScriptErrorDebug)( - IActiveScriptSiteDebug32* This, + IActiveScriptSiteDebug32 *This, IActiveScriptErrorDebug *pErrorDebug, WINBOOL *pfEnterDebugger, WINBOOL *pfCallOnScriptErrorWhenContinuing); END_INTERFACE } IActiveScriptSiteDebug32Vtbl; + interface IActiveScriptSiteDebug32 { CONST_VTBL IActiveScriptSiteDebug32Vtbl* lpVtbl; }; @@ -1230,43 +1498,6 @@ static FORCEINLINE HRESULT IActiveScriptSiteDebug32_OnScriptErrorDebug(IActiveSc #endif -HRESULT STDMETHODCALLTYPE IActiveScriptSiteDebug32_GetDocumentContextFromPosition_Proxy( - IActiveScriptSiteDebug32* This, - DWORD dwSourceContext, - ULONG uCharacterOffset, - ULONG uNumChars, - IDebugDocumentContext **ppsc); -void __RPC_STUB IActiveScriptSiteDebug32_GetDocumentContextFromPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptSiteDebug32_GetApplication_Proxy( - IActiveScriptSiteDebug32* This, - IDebugApplication32 **ppda); -void __RPC_STUB IActiveScriptSiteDebug32_GetApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptSiteDebug32_GetRootApplicationNode_Proxy( - IActiveScriptSiteDebug32* This, - IDebugApplicationNode **ppdanRoot); -void __RPC_STUB IActiveScriptSiteDebug32_GetRootApplicationNode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptSiteDebug32_OnScriptErrorDebug_Proxy( - IActiveScriptSiteDebug32* This, - IActiveScriptErrorDebug *pErrorDebug, - WINBOOL *pfEnterDebugger, - WINBOOL *pfCallOnScriptErrorWhenContinuing); -void __RPC_STUB IActiveScriptSiteDebug32_OnScriptErrorDebug_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptSiteDebug32_INTERFACE_DEFINED__ */ @@ -1308,40 +1539,41 @@ typedef struct IActiveScriptSiteDebug64Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptSiteDebug64* This, + IActiveScriptSiteDebug64 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptSiteDebug64* This); + IActiveScriptSiteDebug64 *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptSiteDebug64* This); + IActiveScriptSiteDebug64 *This); /*** IActiveScriptSiteDebug64 methods ***/ HRESULT (STDMETHODCALLTYPE *GetDocumentContextFromPosition)( - IActiveScriptSiteDebug64* This, + IActiveScriptSiteDebug64 *This, DWORDLONG dwSourceContext, ULONG uCharacterOffset, ULONG uNumChars, IDebugDocumentContext **ppsc); HRESULT (STDMETHODCALLTYPE *GetApplication)( - IActiveScriptSiteDebug64* This, + IActiveScriptSiteDebug64 *This, IDebugApplication64 **ppda); HRESULT (STDMETHODCALLTYPE *GetRootApplicationNode)( - IActiveScriptSiteDebug64* This, + IActiveScriptSiteDebug64 *This, IDebugApplicationNode **ppdanRoot); HRESULT (STDMETHODCALLTYPE *OnScriptErrorDebug)( - IActiveScriptSiteDebug64* This, + IActiveScriptSiteDebug64 *This, IActiveScriptErrorDebug *pErrorDebug, WINBOOL *pfEnterDebugger, WINBOOL *pfCallOnScriptErrorWhenContinuing); END_INTERFACE } IActiveScriptSiteDebug64Vtbl; + interface IActiveScriptSiteDebug64 { CONST_VTBL IActiveScriptSiteDebug64Vtbl* lpVtbl; }; @@ -1386,43 +1618,6 @@ static FORCEINLINE HRESULT IActiveScriptSiteDebug64_OnScriptErrorDebug(IActiveSc #endif -HRESULT STDMETHODCALLTYPE IActiveScriptSiteDebug64_GetDocumentContextFromPosition_Proxy( - IActiveScriptSiteDebug64* This, - DWORDLONG dwSourceContext, - ULONG uCharacterOffset, - ULONG uNumChars, - IDebugDocumentContext **ppsc); -void __RPC_STUB IActiveScriptSiteDebug64_GetDocumentContextFromPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptSiteDebug64_GetApplication_Proxy( - IActiveScriptSiteDebug64* This, - IDebugApplication64 **ppda); -void __RPC_STUB IActiveScriptSiteDebug64_GetApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptSiteDebug64_GetRootApplicationNode_Proxy( - IActiveScriptSiteDebug64* This, - IDebugApplicationNode **ppdanRoot); -void __RPC_STUB IActiveScriptSiteDebug64_GetRootApplicationNode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptSiteDebug64_OnScriptErrorDebug_Proxy( - IActiveScriptSiteDebug64* This, - IActiveScriptErrorDebug *pErrorDebug, - WINBOOL *pfEnterDebugger, - WINBOOL *pfCallOnScriptErrorWhenContinuing); -void __RPC_STUB IActiveScriptSiteDebug64_OnScriptErrorDebug_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptSiteDebug64_INTERFACE_DEFINED__ */ @@ -1451,24 +1646,25 @@ typedef struct IActiveScriptSiteDebugExVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptSiteDebugEx* This, + IActiveScriptSiteDebugEx *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptSiteDebugEx* This); + IActiveScriptSiteDebugEx *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptSiteDebugEx* This); + IActiveScriptSiteDebugEx *This); /*** IActiveScriptSiteDebugEx methods ***/ HRESULT (STDMETHODCALLTYPE *OnCanNotJITScriptErrorDebug)( - IActiveScriptSiteDebugEx* This, + IActiveScriptSiteDebugEx *This, IActiveScriptErrorDebug *pErrorDebug, WINBOOL *pfCallOnScriptErrorWhenContinuing); END_INTERFACE } IActiveScriptSiteDebugExVtbl; + interface IActiveScriptSiteDebugEx { CONST_VTBL IActiveScriptSiteDebugExVtbl* lpVtbl; }; @@ -1501,15 +1697,6 @@ static FORCEINLINE HRESULT IActiveScriptSiteDebugEx_OnCanNotJITScriptErrorDebug( #endif -HRESULT STDMETHODCALLTYPE IActiveScriptSiteDebugEx_OnCanNotJITScriptErrorDebug_Proxy( - IActiveScriptSiteDebugEx* This, - IActiveScriptErrorDebug *pErrorDebug, - WINBOOL *pfCallOnScriptErrorWhenContinuing); -void __RPC_STUB IActiveScriptSiteDebugEx_OnCanNotJITScriptErrorDebug_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptSiteDebugEx_INTERFACE_DEFINED__ */ @@ -1540,42 +1727,43 @@ typedef struct IActiveScriptErrorDebugVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptErrorDebug* This, + IActiveScriptErrorDebug *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptErrorDebug* This); + IActiveScriptErrorDebug *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptErrorDebug* This); + IActiveScriptErrorDebug *This); /*** IActiveScriptError methods ***/ HRESULT (STDMETHODCALLTYPE *GetExceptionInfo)( - IActiveScriptErrorDebug* This, + IActiveScriptErrorDebug *This, EXCEPINFO *pexcepinfo); HRESULT (STDMETHODCALLTYPE *GetSourcePosition)( - IActiveScriptErrorDebug* This, + IActiveScriptErrorDebug *This, DWORD *pdwSourceContext, ULONG *pulLineNumber, LONG *plCharacterPosition); HRESULT (STDMETHODCALLTYPE *GetSourceLineText)( - IActiveScriptErrorDebug* This, + IActiveScriptErrorDebug *This, BSTR *pbstrSourceLine); /*** IActiveScriptErrorDebug methods ***/ HRESULT (STDMETHODCALLTYPE *GetDocumentContext)( - IActiveScriptErrorDebug* This, + IActiveScriptErrorDebug *This, IDebugDocumentContext **ppssc); HRESULT (STDMETHODCALLTYPE *GetStackFrame)( - IActiveScriptErrorDebug* This, + IActiveScriptErrorDebug *This, IDebugStackFrame **ppdsf); END_INTERFACE } IActiveScriptErrorDebugVtbl; + interface IActiveScriptErrorDebug { CONST_VTBL IActiveScriptErrorDebugVtbl* lpVtbl; }; @@ -1626,22 +1814,6 @@ static FORCEINLINE HRESULT IActiveScriptErrorDebug_GetStackFrame(IActiveScriptEr #endif -HRESULT STDMETHODCALLTYPE IActiveScriptErrorDebug_GetDocumentContext_Proxy( - IActiveScriptErrorDebug* This, - IDebugDocumentContext **ppssc); -void __RPC_STUB IActiveScriptErrorDebug_GetDocumentContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptErrorDebug_GetStackFrame_Proxy( - IActiveScriptErrorDebug* This, - IDebugStackFrame **ppdsf); -void __RPC_STUB IActiveScriptErrorDebug_GetStackFrame_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptErrorDebug_INTERFACE_DEFINED__ */ @@ -1672,27 +1844,28 @@ typedef struct IDebugCodeContextVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugCodeContext* This, + IDebugCodeContext *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugCodeContext* This); + IDebugCodeContext *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugCodeContext* This); + IDebugCodeContext *This); /*** IDebugCodeContext methods ***/ HRESULT (STDMETHODCALLTYPE *GetDocumentContext)( - IDebugCodeContext* This, + IDebugCodeContext *This, IDebugDocumentContext **ppsc); HRESULT (STDMETHODCALLTYPE *SetBreakPoint)( - IDebugCodeContext* This, + IDebugCodeContext *This, BREAKPOINT_STATE bps); END_INTERFACE } IDebugCodeContextVtbl; + interface IDebugCodeContext { CONST_VTBL IDebugCodeContextVtbl* lpVtbl; }; @@ -1729,22 +1902,6 @@ static FORCEINLINE HRESULT IDebugCodeContext_SetBreakPoint(IDebugCodeContext* Th #endif -HRESULT STDMETHODCALLTYPE IDebugCodeContext_GetDocumentContext_Proxy( - IDebugCodeContext* This, - IDebugDocumentContext **ppsc); -void __RPC_STUB IDebugCodeContext_GetDocumentContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugCodeContext_SetBreakPoint_Proxy( - IDebugCodeContext* This, - BREAKPOINT_STATE bps); -void __RPC_STUB IDebugCodeContext_SetBreakPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugCodeContext_INTERFACE_DEFINED__ */ @@ -1786,39 +1943,40 @@ typedef struct IDebugExpressionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugExpression* This, + IDebugExpression *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugExpression* This); + IDebugExpression *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugExpression* This); + IDebugExpression *This); /*** IDebugExpression methods ***/ HRESULT (STDMETHODCALLTYPE *Start)( - IDebugExpression* This, + IDebugExpression *This, IDebugExpressionCallBack *pdecb); HRESULT (STDMETHODCALLTYPE *Abort)( - IDebugExpression* This); + IDebugExpression *This); HRESULT (STDMETHODCALLTYPE *QueryIsComplete)( - IDebugExpression* This); + IDebugExpression *This); HRESULT (STDMETHODCALLTYPE *GetResultAsString)( - IDebugExpression* This, + IDebugExpression *This, HRESULT *phrResult, BSTR *pbstrResult); HRESULT (STDMETHODCALLTYPE *GetResultAsDebugProperty)( - IDebugExpression* This, + IDebugExpression *This, HRESULT *phrResult, IDebugProperty **ppdp); END_INTERFACE } IDebugExpressionVtbl; + interface IDebugExpression { CONST_VTBL IDebugExpressionVtbl* lpVtbl; }; @@ -1867,46 +2025,6 @@ static FORCEINLINE HRESULT IDebugExpression_GetResultAsDebugProperty(IDebugExpre #endif -HRESULT STDMETHODCALLTYPE IDebugExpression_Start_Proxy( - IDebugExpression* This, - IDebugExpressionCallBack *pdecb); -void __RPC_STUB IDebugExpression_Start_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugExpression_Abort_Proxy( - IDebugExpression* This); -void __RPC_STUB IDebugExpression_Abort_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugExpression_QueryIsComplete_Proxy( - IDebugExpression* This); -void __RPC_STUB IDebugExpression_QueryIsComplete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugExpression_GetResultAsString_Proxy( - IDebugExpression* This, - HRESULT *phrResult, - BSTR *pbstrResult); -void __RPC_STUB IDebugExpression_GetResultAsString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugExpression_GetResultAsDebugProperty_Proxy( - IDebugExpression* This, - HRESULT *phrResult, - IDebugProperty **ppdp); -void __RPC_STUB IDebugExpression_GetResultAsDebugProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugExpression_INTERFACE_DEFINED__ */ @@ -1942,19 +2060,19 @@ typedef struct IDebugExpressionContextVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugExpressionContext* This, + IDebugExpressionContext *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugExpressionContext* This); + IDebugExpressionContext *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugExpressionContext* This); + IDebugExpressionContext *This); /*** IDebugExpressionContext methods ***/ HRESULT (STDMETHODCALLTYPE *ParseLanguageText)( - IDebugExpressionContext* This, + IDebugExpressionContext *This, LPCOLESTR pstrCode, UINT nRadix, LPCOLESTR pstrDelimiter, @@ -1962,12 +2080,13 @@ typedef struct IDebugExpressionContextVtbl { IDebugExpression **ppe); HRESULT (STDMETHODCALLTYPE *GetLanguageInfo)( - IDebugExpressionContext* This, + IDebugExpressionContext *This, BSTR *pbstrLanguageName, GUID *pLanguageID); END_INTERFACE } IDebugExpressionContextVtbl; + interface IDebugExpressionContext { CONST_VTBL IDebugExpressionContextVtbl* lpVtbl; }; @@ -2004,27 +2123,6 @@ static FORCEINLINE HRESULT IDebugExpressionContext_GetLanguageInfo(IDebugExpress #endif -HRESULT STDMETHODCALLTYPE IDebugExpressionContext_ParseLanguageText_Proxy( - IDebugExpressionContext* This, - LPCOLESTR pstrCode, - UINT nRadix, - LPCOLESTR pstrDelimiter, - DWORD dwFlags, - IDebugExpression **ppe); -void __RPC_STUB IDebugExpressionContext_ParseLanguageText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugExpressionContext_GetLanguageInfo_Proxy( - IDebugExpressionContext* This, - BSTR *pbstrLanguageName, - GUID *pLanguageID); -void __RPC_STUB IDebugExpressionContext_GetLanguageInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugExpressionContext_INTERFACE_DEFINED__ */ @@ -2052,22 +2150,23 @@ typedef struct IDebugExpressionCallBackVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugExpressionCallBack* This, + IDebugExpressionCallBack *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugExpressionCallBack* This); + IDebugExpressionCallBack *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugExpressionCallBack* This); + IDebugExpressionCallBack *This); /*** IDebugExpressionCallBack methods ***/ HRESULT (STDMETHODCALLTYPE *onComplete)( - IDebugExpressionCallBack* This); + IDebugExpressionCallBack *This); END_INTERFACE } IDebugExpressionCallBackVtbl; + interface IDebugExpressionCallBack { CONST_VTBL IDebugExpressionCallBackVtbl* lpVtbl; }; @@ -2100,13 +2199,6 @@ static FORCEINLINE HRESULT IDebugExpressionCallBack_onComplete(IDebugExpressionC #endif -HRESULT STDMETHODCALLTYPE IDebugExpressionCallBack_onComplete_Proxy( - IDebugExpressionCallBack* This); -void __RPC_STUB IDebugExpressionCallBack_onComplete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugExpressionCallBack_INTERFACE_DEFINED__ */ @@ -2148,41 +2240,42 @@ typedef struct IDebugStackFrameVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugStackFrame* This, + IDebugStackFrame *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugStackFrame* This); + IDebugStackFrame *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugStackFrame* This); + IDebugStackFrame *This); /*** IDebugStackFrame methods ***/ HRESULT (STDMETHODCALLTYPE *GetCodeContext)( - IDebugStackFrame* This, + IDebugStackFrame *This, IDebugCodeContext **ppcc); HRESULT (STDMETHODCALLTYPE *GetDescriptionString)( - IDebugStackFrame* This, + IDebugStackFrame *This, WINBOOL fLong, BSTR *pbstrDescription); HRESULT (STDMETHODCALLTYPE *GetLanguageString)( - IDebugStackFrame* This, + IDebugStackFrame *This, WINBOOL fLong, BSTR *pbstrLanguage); HRESULT (STDMETHODCALLTYPE *GetThread)( - IDebugStackFrame* This, + IDebugStackFrame *This, IDebugApplicationThread **ppat); HRESULT (STDMETHODCALLTYPE *GetDebugProperty)( - IDebugStackFrame* This, + IDebugStackFrame *This, IDebugProperty **ppDebugProp); END_INTERFACE } IDebugStackFrameVtbl; + interface IDebugStackFrame { CONST_VTBL IDebugStackFrameVtbl* lpVtbl; }; @@ -2231,48 +2324,6 @@ static FORCEINLINE HRESULT IDebugStackFrame_GetDebugProperty(IDebugStackFrame* T #endif -HRESULT STDMETHODCALLTYPE IDebugStackFrame_GetCodeContext_Proxy( - IDebugStackFrame* This, - IDebugCodeContext **ppcc); -void __RPC_STUB IDebugStackFrame_GetCodeContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugStackFrame_GetDescriptionString_Proxy( - IDebugStackFrame* This, - WINBOOL fLong, - BSTR *pbstrDescription); -void __RPC_STUB IDebugStackFrame_GetDescriptionString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugStackFrame_GetLanguageString_Proxy( - IDebugStackFrame* This, - WINBOOL fLong, - BSTR *pbstrLanguage); -void __RPC_STUB IDebugStackFrame_GetLanguageString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugStackFrame_GetThread_Proxy( - IDebugStackFrame* This, - IDebugApplicationThread **ppat); -void __RPC_STUB IDebugStackFrame_GetThread_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugStackFrame_GetDebugProperty_Proxy( - IDebugStackFrame* This, - IDebugProperty **ppDebugProp); -void __RPC_STUB IDebugStackFrame_GetDebugProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugStackFrame_INTERFACE_DEFINED__ */ @@ -2300,23 +2351,24 @@ typedef struct IDebugStackFrameSnifferVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugStackFrameSniffer* This, + IDebugStackFrameSniffer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugStackFrameSniffer* This); + IDebugStackFrameSniffer *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugStackFrameSniffer* This); + IDebugStackFrameSniffer *This); /*** IDebugStackFrameSniffer methods ***/ HRESULT (STDMETHODCALLTYPE *EnumStackFrames)( - IDebugStackFrameSniffer* This, + IDebugStackFrameSniffer *This, IEnumDebugStackFrames **ppedsf); END_INTERFACE } IDebugStackFrameSnifferVtbl; + interface IDebugStackFrameSniffer { CONST_VTBL IDebugStackFrameSnifferVtbl* lpVtbl; }; @@ -2349,14 +2401,6 @@ static FORCEINLINE HRESULT IDebugStackFrameSniffer_EnumStackFrames(IDebugStackFr #endif -HRESULT STDMETHODCALLTYPE IDebugStackFrameSniffer_EnumStackFrames_Proxy( - IDebugStackFrameSniffer* This, - IEnumDebugStackFrames **ppedsf); -void __RPC_STUB IDebugStackFrameSniffer_EnumStackFrames_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugStackFrameSniffer_INTERFACE_DEFINED__ */ @@ -2385,29 +2429,30 @@ typedef struct IDebugStackFrameSnifferEx32Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugStackFrameSnifferEx32* This, + IDebugStackFrameSnifferEx32 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugStackFrameSnifferEx32* This); + IDebugStackFrameSnifferEx32 *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugStackFrameSnifferEx32* This); + IDebugStackFrameSnifferEx32 *This); /*** IDebugStackFrameSniffer methods ***/ HRESULT (STDMETHODCALLTYPE *EnumStackFrames)( - IDebugStackFrameSnifferEx32* This, + IDebugStackFrameSnifferEx32 *This, IEnumDebugStackFrames **ppedsf); /*** IDebugStackFrameSnifferEx32 methods ***/ HRESULT (STDMETHODCALLTYPE *EnumStackFramesEx32)( - IDebugStackFrameSnifferEx32* This, + IDebugStackFrameSnifferEx32 *This, DWORD dwSpMin, IEnumDebugStackFrames **ppedsf); END_INTERFACE } IDebugStackFrameSnifferEx32Vtbl; + interface IDebugStackFrameSnifferEx32 { CONST_VTBL IDebugStackFrameSnifferEx32Vtbl* lpVtbl; }; @@ -2446,15 +2491,6 @@ static FORCEINLINE HRESULT IDebugStackFrameSnifferEx32_EnumStackFramesEx32(IDebu #endif -HRESULT STDMETHODCALLTYPE IDebugStackFrameSnifferEx32_EnumStackFramesEx32_Proxy( - IDebugStackFrameSnifferEx32* This, - DWORD dwSpMin, - IEnumDebugStackFrames **ppedsf); -void __RPC_STUB IDebugStackFrameSnifferEx32_EnumStackFramesEx32_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugStackFrameSnifferEx32_INTERFACE_DEFINED__ */ @@ -2483,29 +2519,30 @@ typedef struct IDebugStackFrameSnifferEx64Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugStackFrameSnifferEx64* This, + IDebugStackFrameSnifferEx64 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugStackFrameSnifferEx64* This); + IDebugStackFrameSnifferEx64 *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugStackFrameSnifferEx64* This); + IDebugStackFrameSnifferEx64 *This); /*** IDebugStackFrameSniffer methods ***/ HRESULT (STDMETHODCALLTYPE *EnumStackFrames)( - IDebugStackFrameSnifferEx64* This, + IDebugStackFrameSnifferEx64 *This, IEnumDebugStackFrames **ppedsf); /*** IDebugStackFrameSnifferEx64 methods ***/ HRESULT (STDMETHODCALLTYPE *EnumStackFramesEx64)( - IDebugStackFrameSnifferEx64* This, + IDebugStackFrameSnifferEx64 *This, DWORDLONG dwSpMin, IEnumDebugStackFrames64 **ppedsf); END_INTERFACE } IDebugStackFrameSnifferEx64Vtbl; + interface IDebugStackFrameSnifferEx64 { CONST_VTBL IDebugStackFrameSnifferEx64Vtbl* lpVtbl; }; @@ -2544,15 +2581,6 @@ static FORCEINLINE HRESULT IDebugStackFrameSnifferEx64_EnumStackFramesEx64(IDebu #endif -HRESULT STDMETHODCALLTYPE IDebugStackFrameSnifferEx64_EnumStackFramesEx64_Proxy( - IDebugStackFrameSnifferEx64* This, - DWORDLONG dwSpMin, - IEnumDebugStackFrames64 **ppedsf); -void __RPC_STUB IDebugStackFrameSnifferEx64_EnumStackFramesEx64_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugStackFrameSnifferEx64_INTERFACE_DEFINED__ */ @@ -2586,30 +2614,31 @@ typedef struct IDebugSyncOperationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugSyncOperation* This, + IDebugSyncOperation *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugSyncOperation* This); + IDebugSyncOperation *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugSyncOperation* This); + IDebugSyncOperation *This); /*** IDebugSyncOperation methods ***/ HRESULT (STDMETHODCALLTYPE *GetTargetThread)( - IDebugSyncOperation* This, + IDebugSyncOperation *This, IDebugApplicationThread **ppatTarget); HRESULT (STDMETHODCALLTYPE *Execute)( - IDebugSyncOperation* This, + IDebugSyncOperation *This, IUnknown **ppunkResult); HRESULT (STDMETHODCALLTYPE *InProgressAbort)( - IDebugSyncOperation* This); + IDebugSyncOperation *This); END_INTERFACE } IDebugSyncOperationVtbl; + interface IDebugSyncOperation { CONST_VTBL IDebugSyncOperationVtbl* lpVtbl; }; @@ -2650,29 +2679,6 @@ static FORCEINLINE HRESULT IDebugSyncOperation_InProgressAbort(IDebugSyncOperati #endif -HRESULT STDMETHODCALLTYPE IDebugSyncOperation_GetTargetThread_Proxy( - IDebugSyncOperation* This, - IDebugApplicationThread **ppatTarget); -void __RPC_STUB IDebugSyncOperation_GetTargetThread_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugSyncOperation_Execute_Proxy( - IDebugSyncOperation* This, - IUnknown **ppunkResult); -void __RPC_STUB IDebugSyncOperation_Execute_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugSyncOperation_InProgressAbort_Proxy( - IDebugSyncOperation* This); -void __RPC_STUB IDebugSyncOperation_InProgressAbort_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugSyncOperation_INTERFACE_DEFINED__ */ @@ -2713,38 +2719,39 @@ typedef struct IDebugAsyncOperationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugAsyncOperation* This, + IDebugAsyncOperation *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugAsyncOperation* This); + IDebugAsyncOperation *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugAsyncOperation* This); + IDebugAsyncOperation *This); /*** IDebugAsyncOperation methods ***/ HRESULT (STDMETHODCALLTYPE *GetSyncDebugOperation)( - IDebugAsyncOperation* This, + IDebugAsyncOperation *This, IDebugSyncOperation **ppsdo); HRESULT (STDMETHODCALLTYPE *Start)( - IDebugAsyncOperation* This, + IDebugAsyncOperation *This, IDebugAsyncOperationCallBack *padocb); HRESULT (STDMETHODCALLTYPE *Abort)( - IDebugAsyncOperation* This); + IDebugAsyncOperation *This); HRESULT (STDMETHODCALLTYPE *QueryIsComplete)( - IDebugAsyncOperation* This); + IDebugAsyncOperation *This); HRESULT (STDMETHODCALLTYPE *GetResult)( - IDebugAsyncOperation* This, + IDebugAsyncOperation *This, HRESULT *phrResult, IUnknown **ppunkResult); END_INTERFACE } IDebugAsyncOperationVtbl; + interface IDebugAsyncOperation { CONST_VTBL IDebugAsyncOperationVtbl* lpVtbl; }; @@ -2793,45 +2800,6 @@ static FORCEINLINE HRESULT IDebugAsyncOperation_GetResult(IDebugAsyncOperation* #endif -HRESULT STDMETHODCALLTYPE IDebugAsyncOperation_GetSyncDebugOperation_Proxy( - IDebugAsyncOperation* This, - IDebugSyncOperation **ppsdo); -void __RPC_STUB IDebugAsyncOperation_GetSyncDebugOperation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugAsyncOperation_Start_Proxy( - IDebugAsyncOperation* This, - IDebugAsyncOperationCallBack *padocb); -void __RPC_STUB IDebugAsyncOperation_Start_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugAsyncOperation_Abort_Proxy( - IDebugAsyncOperation* This); -void __RPC_STUB IDebugAsyncOperation_Abort_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugAsyncOperation_QueryIsComplete_Proxy( - IDebugAsyncOperation* This); -void __RPC_STUB IDebugAsyncOperation_QueryIsComplete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugAsyncOperation_GetResult_Proxy( - IDebugAsyncOperation* This, - HRESULT *phrResult, - IUnknown **ppunkResult); -void __RPC_STUB IDebugAsyncOperation_GetResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugAsyncOperation_INTERFACE_DEFINED__ */ @@ -2859,22 +2827,23 @@ typedef struct IDebugAsyncOperationCallBackVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugAsyncOperationCallBack* This, + IDebugAsyncOperationCallBack *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugAsyncOperationCallBack* This); + IDebugAsyncOperationCallBack *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugAsyncOperationCallBack* This); + IDebugAsyncOperationCallBack *This); /*** IDebugAsyncOperationCallBack methods ***/ HRESULT (STDMETHODCALLTYPE *onComplete)( - IDebugAsyncOperationCallBack* This); + IDebugAsyncOperationCallBack *This); END_INTERFACE } IDebugAsyncOperationCallBackVtbl; + interface IDebugAsyncOperationCallBack { CONST_VTBL IDebugAsyncOperationCallBackVtbl* lpVtbl; }; @@ -2907,13 +2876,6 @@ static FORCEINLINE HRESULT IDebugAsyncOperationCallBack_onComplete(IDebugAsyncOp #endif -HRESULT STDMETHODCALLTYPE IDebugAsyncOperationCallBack_onComplete_Proxy( - IDebugAsyncOperationCallBack* This); -void __RPC_STUB IDebugAsyncOperationCallBack_onComplete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugAsyncOperationCallBack_INTERFACE_DEFINED__ */ @@ -2952,36 +2914,37 @@ typedef struct IEnumDebugCodeContextsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumDebugCodeContexts* This, + IEnumDebugCodeContexts *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumDebugCodeContexts* This); + IEnumDebugCodeContexts *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumDebugCodeContexts* This); + IEnumDebugCodeContexts *This); /*** IEnumDebugCodeContexts methods ***/ HRESULT (__stdcall *Next)( - IEnumDebugCodeContexts* This, + IEnumDebugCodeContexts *This, ULONG celt, IDebugCodeContext **pscc, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumDebugCodeContexts* This, + IEnumDebugCodeContexts *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumDebugCodeContexts* This); + IEnumDebugCodeContexts *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumDebugCodeContexts* This, + IEnumDebugCodeContexts *This, IEnumDebugCodeContexts **ppescc); END_INTERFACE } IEnumDebugCodeContextsVtbl; + interface IEnumDebugCodeContexts { CONST_VTBL IEnumDebugCodeContextsVtbl* lpVtbl; }; @@ -3036,29 +2999,6 @@ void __RPC_STUB IEnumDebugCodeContexts_RemoteNext_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDebugCodeContexts_Skip_Proxy( - IEnumDebugCodeContexts* This, - ULONG celt); -void __RPC_STUB IEnumDebugCodeContexts_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDebugCodeContexts_Reset_Proxy( - IEnumDebugCodeContexts* This); -void __RPC_STUB IEnumDebugCodeContexts_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDebugCodeContexts_Clone_Proxy( - IEnumDebugCodeContexts* This, - IEnumDebugCodeContexts **ppescc); -void __RPC_STUB IEnumDebugCodeContexts_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IEnumDebugCodeContexts_Next_Proxy( IEnumDebugCodeContexts* This, ULONG celt, @@ -3107,36 +3047,37 @@ typedef struct IEnumDebugStackFramesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumDebugStackFrames* This, + IEnumDebugStackFrames *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumDebugStackFrames* This); + IEnumDebugStackFrames *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumDebugStackFrames* This); + IEnumDebugStackFrames *This); /*** IEnumDebugStackFrames methods ***/ HRESULT (__stdcall *Next)( - IEnumDebugStackFrames* This, + IEnumDebugStackFrames *This, ULONG celt, DebugStackFrameDescriptor *prgdsfd, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumDebugStackFrames* This, + IEnumDebugStackFrames *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumDebugStackFrames* This); + IEnumDebugStackFrames *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumDebugStackFrames* This, + IEnumDebugStackFrames *This, IEnumDebugStackFrames **ppedsf); END_INTERFACE } IEnumDebugStackFramesVtbl; + interface IEnumDebugStackFrames { CONST_VTBL IEnumDebugStackFramesVtbl* lpVtbl; }; @@ -3191,29 +3132,6 @@ void __RPC_STUB IEnumDebugStackFrames_RemoteNext_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDebugStackFrames_Skip_Proxy( - IEnumDebugStackFrames* This, - ULONG celt); -void __RPC_STUB IEnumDebugStackFrames_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDebugStackFrames_Reset_Proxy( - IEnumDebugStackFrames* This); -void __RPC_STUB IEnumDebugStackFrames_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDebugStackFrames_Clone_Proxy( - IEnumDebugStackFrames* This, - IEnumDebugStackFrames **ppedsf); -void __RPC_STUB IEnumDebugStackFrames_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IEnumDebugStackFrames_Next_Proxy( IEnumDebugStackFrames* This, ULONG celt, @@ -3253,43 +3171,44 @@ typedef struct IEnumDebugStackFrames64Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumDebugStackFrames64* This, + IEnumDebugStackFrames64 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumDebugStackFrames64* This); + IEnumDebugStackFrames64 *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumDebugStackFrames64* This); + IEnumDebugStackFrames64 *This); /*** IEnumDebugStackFrames methods ***/ HRESULT (__stdcall *Next)( - IEnumDebugStackFrames64* This, + IEnumDebugStackFrames64 *This, ULONG celt, DebugStackFrameDescriptor *prgdsfd, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumDebugStackFrames64* This, + IEnumDebugStackFrames64 *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumDebugStackFrames64* This); + IEnumDebugStackFrames64 *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumDebugStackFrames64* This, + IEnumDebugStackFrames64 *This, IEnumDebugStackFrames **ppedsf); /*** IEnumDebugStackFrames64 methods ***/ HRESULT (__stdcall *Next64)( - IEnumDebugStackFrames64* This, + IEnumDebugStackFrames64 *This, ULONG celt, DebugStackFrameDescriptor64 *prgdsfd, ULONG *pceltFetched); END_INTERFACE } IEnumDebugStackFrames64Vtbl; + interface IEnumDebugStackFrames64 { CONST_VTBL IEnumDebugStackFrames64Vtbl* lpVtbl; }; @@ -3391,28 +3310,29 @@ typedef struct IDebugDocumentInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugDocumentInfo* This, + IDebugDocumentInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugDocumentInfo* This); + IDebugDocumentInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugDocumentInfo* This); + IDebugDocumentInfo *This); /*** IDebugDocumentInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetName)( - IDebugDocumentInfo* This, + IDebugDocumentInfo *This, DOCUMENTNAMETYPE dnt, BSTR *pbstrName); HRESULT (STDMETHODCALLTYPE *GetDocumentClassId)( - IDebugDocumentInfo* This, + IDebugDocumentInfo *This, CLSID *pclsidDocument); END_INTERFACE } IDebugDocumentInfoVtbl; + interface IDebugDocumentInfo { CONST_VTBL IDebugDocumentInfoVtbl* lpVtbl; }; @@ -3449,23 +3369,6 @@ static FORCEINLINE HRESULT IDebugDocumentInfo_GetDocumentClassId(IDebugDocumentI #endif -HRESULT STDMETHODCALLTYPE IDebugDocumentInfo_GetName_Proxy( - IDebugDocumentInfo* This, - DOCUMENTNAMETYPE dnt, - BSTR *pbstrName); -void __RPC_STUB IDebugDocumentInfo_GetName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentInfo_GetDocumentClassId_Proxy( - IDebugDocumentInfo* This, - CLSID *pclsidDocument); -void __RPC_STUB IDebugDocumentInfo_GetDocumentClassId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugDocumentInfo_INTERFACE_DEFINED__ */ @@ -3493,33 +3396,34 @@ typedef struct IDebugDocumentProviderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugDocumentProvider* This, + IDebugDocumentProvider *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugDocumentProvider* This); + IDebugDocumentProvider *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugDocumentProvider* This); + IDebugDocumentProvider *This); /*** IDebugDocumentInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetName)( - IDebugDocumentProvider* This, + IDebugDocumentProvider *This, DOCUMENTNAMETYPE dnt, BSTR *pbstrName); HRESULT (STDMETHODCALLTYPE *GetDocumentClassId)( - IDebugDocumentProvider* This, + IDebugDocumentProvider *This, CLSID *pclsidDocument); /*** IDebugDocumentProvider methods ***/ HRESULT (STDMETHODCALLTYPE *GetDocument)( - IDebugDocumentProvider* This, + IDebugDocumentProvider *This, IDebugDocument **ppssd); END_INTERFACE } IDebugDocumentProviderVtbl; + interface IDebugDocumentProvider { CONST_VTBL IDebugDocumentProviderVtbl* lpVtbl; }; @@ -3562,14 +3466,6 @@ static FORCEINLINE HRESULT IDebugDocumentProvider_GetDocument(IDebugDocumentProv #endif -HRESULT STDMETHODCALLTYPE IDebugDocumentProvider_GetDocument_Proxy( - IDebugDocumentProvider* This, - IDebugDocument **ppssd); -void __RPC_STUB IDebugDocumentProvider_GetDocument_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugDocumentProvider_INTERFACE_DEFINED__ */ @@ -3594,28 +3490,29 @@ typedef struct IDebugDocumentVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugDocument* This, + IDebugDocument *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugDocument* This); + IDebugDocument *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugDocument* This); + IDebugDocument *This); /*** IDebugDocumentInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetName)( - IDebugDocument* This, + IDebugDocument *This, DOCUMENTNAMETYPE dnt, BSTR *pbstrName); HRESULT (STDMETHODCALLTYPE *GetDocumentClassId)( - IDebugDocument* This, + IDebugDocument *This, CLSID *pclsidDocument); END_INTERFACE } IDebugDocumentVtbl; + interface IDebugDocument { CONST_VTBL IDebugDocumentVtbl* lpVtbl; }; @@ -3709,49 +3606,49 @@ typedef struct IDebugDocumentTextVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugDocumentText* This, + IDebugDocumentText *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugDocumentText* This); + IDebugDocumentText *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugDocumentText* This); + IDebugDocumentText *This); /*** IDebugDocumentInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetName)( - IDebugDocumentText* This, + IDebugDocumentText *This, DOCUMENTNAMETYPE dnt, BSTR *pbstrName); HRESULT (STDMETHODCALLTYPE *GetDocumentClassId)( - IDebugDocumentText* This, + IDebugDocumentText *This, CLSID *pclsidDocument); /*** IDebugDocumentText methods ***/ HRESULT (STDMETHODCALLTYPE *GetDocumentAttributes)( - IDebugDocumentText* This, + IDebugDocumentText *This, TEXT_DOC_ATTR *ptextdocattr); HRESULT (STDMETHODCALLTYPE *GetSize)( - IDebugDocumentText* This, + IDebugDocumentText *This, ULONG *pcNumLines, ULONG *pcNumChars); HRESULT (STDMETHODCALLTYPE *GetPositionOfLine)( - IDebugDocumentText* This, + IDebugDocumentText *This, ULONG cLineNumber, ULONG *pcCharacterPosition); HRESULT (STDMETHODCALLTYPE *GetLineOfPosition)( - IDebugDocumentText* This, + IDebugDocumentText *This, ULONG cCharacterPosition, ULONG *pcLineNumber, ULONG *pcCharacterOffsetInLine); HRESULT (STDMETHODCALLTYPE *GetText)( - IDebugDocumentText* This, + IDebugDocumentText *This, ULONG cCharacterPosition, WCHAR *pcharText, SOURCE_TEXT_ATTR *pstaTextAttr, @@ -3759,19 +3656,20 @@ typedef struct IDebugDocumentTextVtbl { ULONG cMaxChars); HRESULT (STDMETHODCALLTYPE *GetPositionOfContext)( - IDebugDocumentText* This, + IDebugDocumentText *This, IDebugDocumentContext *psc, ULONG *pcCharacterPosition, ULONG *cNumChars); HRESULT (STDMETHODCALLTYPE *GetContextOfPosition)( - IDebugDocumentText* This, + IDebugDocumentText *This, ULONG cCharacterPosition, ULONG cNumChars, IDebugDocumentContext **ppsc); END_INTERFACE } IDebugDocumentTextVtbl; + interface IDebugDocumentText { CONST_VTBL IDebugDocumentTextVtbl* lpVtbl; }; @@ -3838,74 +3736,6 @@ static FORCEINLINE HRESULT IDebugDocumentText_GetContextOfPosition(IDebugDocumen #endif -HRESULT STDMETHODCALLTYPE IDebugDocumentText_GetDocumentAttributes_Proxy( - IDebugDocumentText* This, - TEXT_DOC_ATTR *ptextdocattr); -void __RPC_STUB IDebugDocumentText_GetDocumentAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentText_GetSize_Proxy( - IDebugDocumentText* This, - ULONG *pcNumLines, - ULONG *pcNumChars); -void __RPC_STUB IDebugDocumentText_GetSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentText_GetPositionOfLine_Proxy( - IDebugDocumentText* This, - ULONG cLineNumber, - ULONG *pcCharacterPosition); -void __RPC_STUB IDebugDocumentText_GetPositionOfLine_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentText_GetLineOfPosition_Proxy( - IDebugDocumentText* This, - ULONG cCharacterPosition, - ULONG *pcLineNumber, - ULONG *pcCharacterOffsetInLine); -void __RPC_STUB IDebugDocumentText_GetLineOfPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentText_GetText_Proxy( - IDebugDocumentText* This, - ULONG cCharacterPosition, - WCHAR *pcharText, - SOURCE_TEXT_ATTR *pstaTextAttr, - ULONG *pcNumChars, - ULONG cMaxChars); -void __RPC_STUB IDebugDocumentText_GetText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentText_GetPositionOfContext_Proxy( - IDebugDocumentText* This, - IDebugDocumentContext *psc, - ULONG *pcCharacterPosition, - ULONG *cNumChars); -void __RPC_STUB IDebugDocumentText_GetPositionOfContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentText_GetContextOfPosition_Proxy( - IDebugDocumentText* This, - ULONG cCharacterPosition, - ULONG cNumChars, - IDebugDocumentContext **ppsc); -void __RPC_STUB IDebugDocumentText_GetContextOfPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugDocumentText_INTERFACE_DEFINED__ */ @@ -3952,46 +3782,47 @@ typedef struct IDebugDocumentTextEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugDocumentTextEvents* This, + IDebugDocumentTextEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugDocumentTextEvents* This); + IDebugDocumentTextEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugDocumentTextEvents* This); + IDebugDocumentTextEvents *This); /*** IDebugDocumentTextEvents methods ***/ HRESULT (STDMETHODCALLTYPE *onDestroy)( - IDebugDocumentTextEvents* This); + IDebugDocumentTextEvents *This); HRESULT (STDMETHODCALLTYPE *onInsertText)( - IDebugDocumentTextEvents* This, + IDebugDocumentTextEvents *This, ULONG cCharacterPosition, ULONG cNumToInsert); HRESULT (STDMETHODCALLTYPE *onRemoveText)( - IDebugDocumentTextEvents* This, + IDebugDocumentTextEvents *This, ULONG cCharacterPosition, ULONG cNumToRemove); HRESULT (STDMETHODCALLTYPE *onReplaceText)( - IDebugDocumentTextEvents* This, + IDebugDocumentTextEvents *This, ULONG cCharacterPosition, ULONG cNumToReplace); HRESULT (STDMETHODCALLTYPE *onUpdateTextAttributes)( - IDebugDocumentTextEvents* This, + IDebugDocumentTextEvents *This, ULONG cCharacterPosition, ULONG cNumToUpdate); HRESULT (STDMETHODCALLTYPE *onUpdateDocumentAttributes)( - IDebugDocumentTextEvents* This, + IDebugDocumentTextEvents *This, TEXT_DOC_ATTR textdocattr); END_INTERFACE } IDebugDocumentTextEventsVtbl; + interface IDebugDocumentTextEvents { CONST_VTBL IDebugDocumentTextEventsVtbl* lpVtbl; }; @@ -4044,57 +3875,6 @@ static FORCEINLINE HRESULT IDebugDocumentTextEvents_onUpdateDocumentAttributes(I #endif -HRESULT STDMETHODCALLTYPE IDebugDocumentTextEvents_onDestroy_Proxy( - IDebugDocumentTextEvents* This); -void __RPC_STUB IDebugDocumentTextEvents_onDestroy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentTextEvents_onInsertText_Proxy( - IDebugDocumentTextEvents* This, - ULONG cCharacterPosition, - ULONG cNumToInsert); -void __RPC_STUB IDebugDocumentTextEvents_onInsertText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentTextEvents_onRemoveText_Proxy( - IDebugDocumentTextEvents* This, - ULONG cCharacterPosition, - ULONG cNumToRemove); -void __RPC_STUB IDebugDocumentTextEvents_onRemoveText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentTextEvents_onReplaceText_Proxy( - IDebugDocumentTextEvents* This, - ULONG cCharacterPosition, - ULONG cNumToReplace); -void __RPC_STUB IDebugDocumentTextEvents_onReplaceText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentTextEvents_onUpdateTextAttributes_Proxy( - IDebugDocumentTextEvents* This, - ULONG cCharacterPosition, - ULONG cNumToUpdate); -void __RPC_STUB IDebugDocumentTextEvents_onUpdateTextAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentTextEvents_onUpdateDocumentAttributes_Proxy( - IDebugDocumentTextEvents* This, - TEXT_DOC_ATTR textdocattr); -void __RPC_STUB IDebugDocumentTextEvents_onUpdateDocumentAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugDocumentTextEvents_INTERFACE_DEFINED__ */ @@ -4133,49 +3913,49 @@ typedef struct IDebugDocumentTextAuthorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugDocumentTextAuthor* This, + IDebugDocumentTextAuthor *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugDocumentTextAuthor* This); + IDebugDocumentTextAuthor *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugDocumentTextAuthor* This); + IDebugDocumentTextAuthor *This); /*** IDebugDocumentInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetName)( - IDebugDocumentTextAuthor* This, + IDebugDocumentTextAuthor *This, DOCUMENTNAMETYPE dnt, BSTR *pbstrName); HRESULT (STDMETHODCALLTYPE *GetDocumentClassId)( - IDebugDocumentTextAuthor* This, + IDebugDocumentTextAuthor *This, CLSID *pclsidDocument); /*** IDebugDocumentText methods ***/ HRESULT (STDMETHODCALLTYPE *GetDocumentAttributes)( - IDebugDocumentTextAuthor* This, + IDebugDocumentTextAuthor *This, TEXT_DOC_ATTR *ptextdocattr); HRESULT (STDMETHODCALLTYPE *GetSize)( - IDebugDocumentTextAuthor* This, + IDebugDocumentTextAuthor *This, ULONG *pcNumLines, ULONG *pcNumChars); HRESULT (STDMETHODCALLTYPE *GetPositionOfLine)( - IDebugDocumentTextAuthor* This, + IDebugDocumentTextAuthor *This, ULONG cLineNumber, ULONG *pcCharacterPosition); HRESULT (STDMETHODCALLTYPE *GetLineOfPosition)( - IDebugDocumentTextAuthor* This, + IDebugDocumentTextAuthor *This, ULONG cCharacterPosition, ULONG *pcLineNumber, ULONG *pcCharacterOffsetInLine); HRESULT (STDMETHODCALLTYPE *GetText)( - IDebugDocumentTextAuthor* This, + IDebugDocumentTextAuthor *This, ULONG cCharacterPosition, WCHAR *pcharText, SOURCE_TEXT_ATTR *pstaTextAttr, @@ -4183,37 +3963,38 @@ typedef struct IDebugDocumentTextAuthorVtbl { ULONG cMaxChars); HRESULT (STDMETHODCALLTYPE *GetPositionOfContext)( - IDebugDocumentTextAuthor* This, + IDebugDocumentTextAuthor *This, IDebugDocumentContext *psc, ULONG *pcCharacterPosition, ULONG *cNumChars); HRESULT (STDMETHODCALLTYPE *GetContextOfPosition)( - IDebugDocumentTextAuthor* This, + IDebugDocumentTextAuthor *This, ULONG cCharacterPosition, ULONG cNumChars, IDebugDocumentContext **ppsc); /*** IDebugDocumentTextAuthor methods ***/ HRESULT (STDMETHODCALLTYPE *InsertText)( - IDebugDocumentTextAuthor* This, + IDebugDocumentTextAuthor *This, ULONG cCharacterPosition, ULONG cNumToInsert, OLECHAR pcharText[]); HRESULT (STDMETHODCALLTYPE *RemoveText)( - IDebugDocumentTextAuthor* This, + IDebugDocumentTextAuthor *This, ULONG cCharacterPosition, ULONG cNumToRemove); HRESULT (STDMETHODCALLTYPE *ReplaceText)( - IDebugDocumentTextAuthor* This, + IDebugDocumentTextAuthor *This, ULONG cCharacterPosition, ULONG cNumToReplace, OLECHAR pcharText[]); END_INTERFACE } IDebugDocumentTextAuthorVtbl; + interface IDebugDocumentTextAuthor { CONST_VTBL IDebugDocumentTextAuthorVtbl* lpVtbl; }; @@ -4294,35 +4075,6 @@ static FORCEINLINE HRESULT IDebugDocumentTextAuthor_ReplaceText(IDebugDocumentTe #endif -HRESULT STDMETHODCALLTYPE IDebugDocumentTextAuthor_InsertText_Proxy( - IDebugDocumentTextAuthor* This, - ULONG cCharacterPosition, - ULONG cNumToInsert, - OLECHAR pcharText[]); -void __RPC_STUB IDebugDocumentTextAuthor_InsertText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentTextAuthor_RemoveText_Proxy( - IDebugDocumentTextAuthor* This, - ULONG cCharacterPosition, - ULONG cNumToRemove); -void __RPC_STUB IDebugDocumentTextAuthor_RemoveText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentTextAuthor_ReplaceText_Proxy( - IDebugDocumentTextAuthor* This, - ULONG cCharacterPosition, - ULONG cNumToReplace, - OLECHAR pcharText[]); -void __RPC_STUB IDebugDocumentTextAuthor_ReplaceText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugDocumentTextAuthor_INTERFACE_DEFINED__ */ @@ -4357,31 +4109,32 @@ typedef struct IDebugDocumentTextExternalAuthorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugDocumentTextExternalAuthor* This, + IDebugDocumentTextExternalAuthor *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugDocumentTextExternalAuthor* This); + IDebugDocumentTextExternalAuthor *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugDocumentTextExternalAuthor* This); + IDebugDocumentTextExternalAuthor *This); /*** IDebugDocumentTextExternalAuthor methods ***/ HRESULT (STDMETHODCALLTYPE *GetPathName)( - IDebugDocumentTextExternalAuthor* This, + IDebugDocumentTextExternalAuthor *This, BSTR *pbstrLongName, WINBOOL *pfIsOriginalFile); HRESULT (STDMETHODCALLTYPE *GetFileName)( - IDebugDocumentTextExternalAuthor* This, + IDebugDocumentTextExternalAuthor *This, BSTR *pbstrShortName); HRESULT (STDMETHODCALLTYPE *NotifyChanged)( - IDebugDocumentTextExternalAuthor* This); + IDebugDocumentTextExternalAuthor *This); END_INTERFACE } IDebugDocumentTextExternalAuthorVtbl; + interface IDebugDocumentTextExternalAuthor { CONST_VTBL IDebugDocumentTextExternalAuthorVtbl* lpVtbl; }; @@ -4422,30 +4175,6 @@ static FORCEINLINE HRESULT IDebugDocumentTextExternalAuthor_NotifyChanged(IDebug #endif -HRESULT STDMETHODCALLTYPE IDebugDocumentTextExternalAuthor_GetPathName_Proxy( - IDebugDocumentTextExternalAuthor* This, - BSTR *pbstrLongName, - WINBOOL *pfIsOriginalFile); -void __RPC_STUB IDebugDocumentTextExternalAuthor_GetPathName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentTextExternalAuthor_GetFileName_Proxy( - IDebugDocumentTextExternalAuthor* This, - BSTR *pbstrShortName); -void __RPC_STUB IDebugDocumentTextExternalAuthor_GetFileName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentTextExternalAuthor_NotifyChanged_Proxy( - IDebugDocumentTextExternalAuthor* This); -void __RPC_STUB IDebugDocumentTextExternalAuthor_NotifyChanged_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugDocumentTextExternalAuthor_INTERFACE_DEFINED__ */ @@ -4539,50 +4268,50 @@ typedef struct IDebugDocumentHelper32Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugDocumentHelper32* This, + IDebugDocumentHelper32 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugDocumentHelper32* This); + IDebugDocumentHelper32 *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugDocumentHelper32* This); + IDebugDocumentHelper32 *This); /*** IDebugDocumentHelper32 methods ***/ HRESULT (STDMETHODCALLTYPE *Init)( - IDebugDocumentHelper32* This, + IDebugDocumentHelper32 *This, IDebugApplication32 *pda, LPCOLESTR pszShortName, LPCOLESTR pszLongName, TEXT_DOC_ATTR docAttr); HRESULT (STDMETHODCALLTYPE *Attach)( - IDebugDocumentHelper32* This, + IDebugDocumentHelper32 *This, IDebugDocumentHelper32 *pddhParent); HRESULT (STDMETHODCALLTYPE *Detach)( - IDebugDocumentHelper32* This); + IDebugDocumentHelper32 *This); HRESULT (STDMETHODCALLTYPE *AddUnicodeText)( - IDebugDocumentHelper32* This, + IDebugDocumentHelper32 *This, LPCOLESTR pszText); HRESULT (STDMETHODCALLTYPE *AddDBCSText)( - IDebugDocumentHelper32* This, + IDebugDocumentHelper32 *This, LPCSTR pszText); HRESULT (STDMETHODCALLTYPE *SetDebugDocumentHost)( - IDebugDocumentHelper32* This, + IDebugDocumentHelper32 *This, IDebugDocumentHost *pddh); HRESULT (STDMETHODCALLTYPE *AddDeferredText)( - IDebugDocumentHelper32* This, + IDebugDocumentHelper32 *This, ULONG cChars, DWORD dwTextStartCookie); HRESULT (STDMETHODCALLTYPE *DefineScriptBlock)( - IDebugDocumentHelper32* This, + IDebugDocumentHelper32 *This, ULONG ulCharOffset, ULONG cChars, IActiveScript *pas, @@ -4590,53 +4319,54 @@ typedef struct IDebugDocumentHelper32Vtbl { DWORD *pdwSourceContext); HRESULT (STDMETHODCALLTYPE *SetDefaultTextAttr)( - IDebugDocumentHelper32* This, + IDebugDocumentHelper32 *This, SOURCE_TEXT_ATTR staTextAttr); HRESULT (STDMETHODCALLTYPE *SetTextAttributes)( - IDebugDocumentHelper32* This, + IDebugDocumentHelper32 *This, ULONG ulCharOffset, ULONG cChars, SOURCE_TEXT_ATTR *pstaTextAttr); HRESULT (STDMETHODCALLTYPE *SetLongName)( - IDebugDocumentHelper32* This, + IDebugDocumentHelper32 *This, LPCOLESTR pszLongName); HRESULT (STDMETHODCALLTYPE *SetShortName)( - IDebugDocumentHelper32* This, + IDebugDocumentHelper32 *This, LPCOLESTR pszShortName); HRESULT (STDMETHODCALLTYPE *SetDocumentAttr)( - IDebugDocumentHelper32* This, + IDebugDocumentHelper32 *This, TEXT_DOC_ATTR pszAttributes); HRESULT (STDMETHODCALLTYPE *GetDebugApplicationNode)( - IDebugDocumentHelper32* This, + IDebugDocumentHelper32 *This, IDebugApplicationNode **ppdan); HRESULT (STDMETHODCALLTYPE *GetScriptBlockInfo)( - IDebugDocumentHelper32* This, + IDebugDocumentHelper32 *This, DWORD dwSourceContext, IActiveScript **ppasd, ULONG *piCharPos, ULONG *pcChars); HRESULT (STDMETHODCALLTYPE *CreateDebugDocumentContext)( - IDebugDocumentHelper32* This, + IDebugDocumentHelper32 *This, ULONG iCharPos, ULONG cChars, IDebugDocumentContext **ppddc); HRESULT (STDMETHODCALLTYPE *BringDocumentToTop)( - IDebugDocumentHelper32* This); + IDebugDocumentHelper32 *This); HRESULT (STDMETHODCALLTYPE *BringDocumentContextToTop)( - IDebugDocumentHelper32* This, + IDebugDocumentHelper32 *This, IDebugDocumentContext *pddc); END_INTERFACE } IDebugDocumentHelper32Vtbl; + interface IDebugDocumentHelper32 { CONST_VTBL IDebugDocumentHelper32Vtbl* lpVtbl; }; @@ -4737,163 +4467,6 @@ static FORCEINLINE HRESULT IDebugDocumentHelper32_BringDocumentContextToTop(IDeb #endif -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper32_Init_Proxy( - IDebugDocumentHelper32* This, - IDebugApplication32 *pda, - LPCOLESTR pszShortName, - LPCOLESTR pszLongName, - TEXT_DOC_ATTR docAttr); -void __RPC_STUB IDebugDocumentHelper32_Init_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper32_Attach_Proxy( - IDebugDocumentHelper32* This, - IDebugDocumentHelper32 *pddhParent); -void __RPC_STUB IDebugDocumentHelper32_Attach_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper32_Detach_Proxy( - IDebugDocumentHelper32* This); -void __RPC_STUB IDebugDocumentHelper32_Detach_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper32_AddUnicodeText_Proxy( - IDebugDocumentHelper32* This, - LPCOLESTR pszText); -void __RPC_STUB IDebugDocumentHelper32_AddUnicodeText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper32_AddDBCSText_Proxy( - IDebugDocumentHelper32* This, - LPCSTR pszText); -void __RPC_STUB IDebugDocumentHelper32_AddDBCSText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper32_SetDebugDocumentHost_Proxy( - IDebugDocumentHelper32* This, - IDebugDocumentHost *pddh); -void __RPC_STUB IDebugDocumentHelper32_SetDebugDocumentHost_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper32_AddDeferredText_Proxy( - IDebugDocumentHelper32* This, - ULONG cChars, - DWORD dwTextStartCookie); -void __RPC_STUB IDebugDocumentHelper32_AddDeferredText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper32_DefineScriptBlock_Proxy( - IDebugDocumentHelper32* This, - ULONG ulCharOffset, - ULONG cChars, - IActiveScript *pas, - WINBOOL fScriptlet, - DWORD *pdwSourceContext); -void __RPC_STUB IDebugDocumentHelper32_DefineScriptBlock_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper32_SetDefaultTextAttr_Proxy( - IDebugDocumentHelper32* This, - SOURCE_TEXT_ATTR staTextAttr); -void __RPC_STUB IDebugDocumentHelper32_SetDefaultTextAttr_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper32_SetTextAttributes_Proxy( - IDebugDocumentHelper32* This, - ULONG ulCharOffset, - ULONG cChars, - SOURCE_TEXT_ATTR *pstaTextAttr); -void __RPC_STUB IDebugDocumentHelper32_SetTextAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper32_SetLongName_Proxy( - IDebugDocumentHelper32* This, - LPCOLESTR pszLongName); -void __RPC_STUB IDebugDocumentHelper32_SetLongName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper32_SetShortName_Proxy( - IDebugDocumentHelper32* This, - LPCOLESTR pszShortName); -void __RPC_STUB IDebugDocumentHelper32_SetShortName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper32_SetDocumentAttr_Proxy( - IDebugDocumentHelper32* This, - TEXT_DOC_ATTR pszAttributes); -void __RPC_STUB IDebugDocumentHelper32_SetDocumentAttr_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper32_GetDebugApplicationNode_Proxy( - IDebugDocumentHelper32* This, - IDebugApplicationNode **ppdan); -void __RPC_STUB IDebugDocumentHelper32_GetDebugApplicationNode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper32_GetScriptBlockInfo_Proxy( - IDebugDocumentHelper32* This, - DWORD dwSourceContext, - IActiveScript **ppasd, - ULONG *piCharPos, - ULONG *pcChars); -void __RPC_STUB IDebugDocumentHelper32_GetScriptBlockInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper32_CreateDebugDocumentContext_Proxy( - IDebugDocumentHelper32* This, - ULONG iCharPos, - ULONG cChars, - IDebugDocumentContext **ppddc); -void __RPC_STUB IDebugDocumentHelper32_CreateDebugDocumentContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper32_BringDocumentToTop_Proxy( - IDebugDocumentHelper32* This); -void __RPC_STUB IDebugDocumentHelper32_BringDocumentToTop_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper32_BringDocumentContextToTop_Proxy( - IDebugDocumentHelper32* This, - IDebugDocumentContext *pddc); -void __RPC_STUB IDebugDocumentHelper32_BringDocumentContextToTop_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugDocumentHelper32_INTERFACE_DEFINED__ */ @@ -4987,50 +4560,50 @@ typedef struct IDebugDocumentHelper64Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugDocumentHelper64* This, + IDebugDocumentHelper64 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugDocumentHelper64* This); + IDebugDocumentHelper64 *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugDocumentHelper64* This); + IDebugDocumentHelper64 *This); /*** IDebugDocumentHelper64 methods ***/ HRESULT (STDMETHODCALLTYPE *Init)( - IDebugDocumentHelper64* This, + IDebugDocumentHelper64 *This, IDebugApplication64 *pda, LPCOLESTR pszShortName, LPCOLESTR pszLongName, TEXT_DOC_ATTR docAttr); HRESULT (STDMETHODCALLTYPE *Attach)( - IDebugDocumentHelper64* This, + IDebugDocumentHelper64 *This, IDebugDocumentHelper64 *pddhParent); HRESULT (STDMETHODCALLTYPE *Detach)( - IDebugDocumentHelper64* This); + IDebugDocumentHelper64 *This); HRESULT (STDMETHODCALLTYPE *AddUnicodeText)( - IDebugDocumentHelper64* This, + IDebugDocumentHelper64 *This, LPCOLESTR pszText); HRESULT (STDMETHODCALLTYPE *AddDBCSText)( - IDebugDocumentHelper64* This, + IDebugDocumentHelper64 *This, LPCSTR pszText); HRESULT (STDMETHODCALLTYPE *SetDebugDocumentHost)( - IDebugDocumentHelper64* This, + IDebugDocumentHelper64 *This, IDebugDocumentHost *pddh); HRESULT (STDMETHODCALLTYPE *AddDeferredText)( - IDebugDocumentHelper64* This, + IDebugDocumentHelper64 *This, ULONG cChars, DWORD dwTextStartCookie); HRESULT (STDMETHODCALLTYPE *DefineScriptBlock)( - IDebugDocumentHelper64* This, + IDebugDocumentHelper64 *This, ULONG ulCharOffset, ULONG cChars, IActiveScript *pas, @@ -5038,53 +4611,54 @@ typedef struct IDebugDocumentHelper64Vtbl { DWORDLONG *pdwSourceContext); HRESULT (STDMETHODCALLTYPE *SetDefaultTextAttr)( - IDebugDocumentHelper64* This, + IDebugDocumentHelper64 *This, SOURCE_TEXT_ATTR staTextAttr); HRESULT (STDMETHODCALLTYPE *SetTextAttributes)( - IDebugDocumentHelper64* This, + IDebugDocumentHelper64 *This, ULONG ulCharOffset, ULONG cChars, SOURCE_TEXT_ATTR *pstaTextAttr); HRESULT (STDMETHODCALLTYPE *SetLongName)( - IDebugDocumentHelper64* This, + IDebugDocumentHelper64 *This, LPCOLESTR pszLongName); HRESULT (STDMETHODCALLTYPE *SetShortName)( - IDebugDocumentHelper64* This, + IDebugDocumentHelper64 *This, LPCOLESTR pszShortName); HRESULT (STDMETHODCALLTYPE *SetDocumentAttr)( - IDebugDocumentHelper64* This, + IDebugDocumentHelper64 *This, TEXT_DOC_ATTR pszAttributes); HRESULT (STDMETHODCALLTYPE *GetDebugApplicationNode)( - IDebugDocumentHelper64* This, + IDebugDocumentHelper64 *This, IDebugApplicationNode **ppdan); HRESULT (STDMETHODCALLTYPE *GetScriptBlockInfo)( - IDebugDocumentHelper64* This, + IDebugDocumentHelper64 *This, DWORDLONG dwSourceContext, IActiveScript **ppasd, ULONG *piCharPos, ULONG *pcChars); HRESULT (STDMETHODCALLTYPE *CreateDebugDocumentContext)( - IDebugDocumentHelper64* This, + IDebugDocumentHelper64 *This, ULONG iCharPos, ULONG cChars, IDebugDocumentContext **ppddc); HRESULT (STDMETHODCALLTYPE *BringDocumentToTop)( - IDebugDocumentHelper64* This); + IDebugDocumentHelper64 *This); HRESULT (STDMETHODCALLTYPE *BringDocumentContextToTop)( - IDebugDocumentHelper64* This, + IDebugDocumentHelper64 *This, IDebugDocumentContext *pddc); END_INTERFACE } IDebugDocumentHelper64Vtbl; + interface IDebugDocumentHelper64 { CONST_VTBL IDebugDocumentHelper64Vtbl* lpVtbl; }; @@ -5185,163 +4759,6 @@ static FORCEINLINE HRESULT IDebugDocumentHelper64_BringDocumentContextToTop(IDeb #endif -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper64_Init_Proxy( - IDebugDocumentHelper64* This, - IDebugApplication64 *pda, - LPCOLESTR pszShortName, - LPCOLESTR pszLongName, - TEXT_DOC_ATTR docAttr); -void __RPC_STUB IDebugDocumentHelper64_Init_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper64_Attach_Proxy( - IDebugDocumentHelper64* This, - IDebugDocumentHelper64 *pddhParent); -void __RPC_STUB IDebugDocumentHelper64_Attach_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper64_Detach_Proxy( - IDebugDocumentHelper64* This); -void __RPC_STUB IDebugDocumentHelper64_Detach_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper64_AddUnicodeText_Proxy( - IDebugDocumentHelper64* This, - LPCOLESTR pszText); -void __RPC_STUB IDebugDocumentHelper64_AddUnicodeText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper64_AddDBCSText_Proxy( - IDebugDocumentHelper64* This, - LPCSTR pszText); -void __RPC_STUB IDebugDocumentHelper64_AddDBCSText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper64_SetDebugDocumentHost_Proxy( - IDebugDocumentHelper64* This, - IDebugDocumentHost *pddh); -void __RPC_STUB IDebugDocumentHelper64_SetDebugDocumentHost_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper64_AddDeferredText_Proxy( - IDebugDocumentHelper64* This, - ULONG cChars, - DWORD dwTextStartCookie); -void __RPC_STUB IDebugDocumentHelper64_AddDeferredText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper64_DefineScriptBlock_Proxy( - IDebugDocumentHelper64* This, - ULONG ulCharOffset, - ULONG cChars, - IActiveScript *pas, - WINBOOL fScriptlet, - DWORDLONG *pdwSourceContext); -void __RPC_STUB IDebugDocumentHelper64_DefineScriptBlock_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper64_SetDefaultTextAttr_Proxy( - IDebugDocumentHelper64* This, - SOURCE_TEXT_ATTR staTextAttr); -void __RPC_STUB IDebugDocumentHelper64_SetDefaultTextAttr_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper64_SetTextAttributes_Proxy( - IDebugDocumentHelper64* This, - ULONG ulCharOffset, - ULONG cChars, - SOURCE_TEXT_ATTR *pstaTextAttr); -void __RPC_STUB IDebugDocumentHelper64_SetTextAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper64_SetLongName_Proxy( - IDebugDocumentHelper64* This, - LPCOLESTR pszLongName); -void __RPC_STUB IDebugDocumentHelper64_SetLongName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper64_SetShortName_Proxy( - IDebugDocumentHelper64* This, - LPCOLESTR pszShortName); -void __RPC_STUB IDebugDocumentHelper64_SetShortName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper64_SetDocumentAttr_Proxy( - IDebugDocumentHelper64* This, - TEXT_DOC_ATTR pszAttributes); -void __RPC_STUB IDebugDocumentHelper64_SetDocumentAttr_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper64_GetDebugApplicationNode_Proxy( - IDebugDocumentHelper64* This, - IDebugApplicationNode **ppdan); -void __RPC_STUB IDebugDocumentHelper64_GetDebugApplicationNode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper64_GetScriptBlockInfo_Proxy( - IDebugDocumentHelper64* This, - DWORDLONG dwSourceContext, - IActiveScript **ppasd, - ULONG *piCharPos, - ULONG *pcChars); -void __RPC_STUB IDebugDocumentHelper64_GetScriptBlockInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper64_CreateDebugDocumentContext_Proxy( - IDebugDocumentHelper64* This, - ULONG iCharPos, - ULONG cChars, - IDebugDocumentContext **ppddc); -void __RPC_STUB IDebugDocumentHelper64_CreateDebugDocumentContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper64_BringDocumentToTop_Proxy( - IDebugDocumentHelper64* This); -void __RPC_STUB IDebugDocumentHelper64_BringDocumentToTop_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHelper64_BringDocumentContextToTop_Proxy( - IDebugDocumentHelper64* This, - IDebugDocumentContext *pddc); -void __RPC_STUB IDebugDocumentHelper64_BringDocumentContextToTop_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugDocumentHelper64_INTERFACE_DEFINED__ */ @@ -5393,19 +4810,19 @@ typedef struct IDebugDocumentHostVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugDocumentHost* This, + IDebugDocumentHost *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugDocumentHost* This); + IDebugDocumentHost *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugDocumentHost* This); + IDebugDocumentHost *This); /*** IDebugDocumentHost methods ***/ HRESULT (STDMETHODCALLTYPE *GetDeferredText)( - IDebugDocumentHost* This, + IDebugDocumentHost *This, DWORD dwTextStartCookie, WCHAR *pcharText, SOURCE_TEXT_ATTR *pstaTextAttr, @@ -5413,7 +4830,7 @@ typedef struct IDebugDocumentHostVtbl { ULONG cMaxChars); HRESULT (STDMETHODCALLTYPE *GetScriptTextAttributes)( - IDebugDocumentHost* This, + IDebugDocumentHost *This, LPCOLESTR pstrCode, ULONG uNumCodeChars, LPCOLESTR pstrDelimiter, @@ -5421,23 +4838,24 @@ typedef struct IDebugDocumentHostVtbl { SOURCE_TEXT_ATTR *pattr); HRESULT (STDMETHODCALLTYPE *OnCreateDocumentContext)( - IDebugDocumentHost* This, + IDebugDocumentHost *This, IUnknown **ppunkOuter); HRESULT (STDMETHODCALLTYPE *GetPathName)( - IDebugDocumentHost* This, + IDebugDocumentHost *This, BSTR *pbstrLongName, WINBOOL *pfIsOriginalFile); HRESULT (STDMETHODCALLTYPE *GetFileName)( - IDebugDocumentHost* This, + IDebugDocumentHost *This, BSTR *pbstrShortName); HRESULT (STDMETHODCALLTYPE *NotifyChanged)( - IDebugDocumentHost* This); + IDebugDocumentHost *This); END_INTERFACE } IDebugDocumentHostVtbl; + interface IDebugDocumentHost { CONST_VTBL IDebugDocumentHostVtbl* lpVtbl; }; @@ -5490,62 +4908,6 @@ static FORCEINLINE HRESULT IDebugDocumentHost_NotifyChanged(IDebugDocumentHost* #endif -HRESULT STDMETHODCALLTYPE IDebugDocumentHost_GetDeferredText_Proxy( - IDebugDocumentHost* This, - DWORD dwTextStartCookie, - WCHAR *pcharText, - SOURCE_TEXT_ATTR *pstaTextAttr, - ULONG *pcNumChars, - ULONG cMaxChars); -void __RPC_STUB IDebugDocumentHost_GetDeferredText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHost_GetScriptTextAttributes_Proxy( - IDebugDocumentHost* This, - LPCOLESTR pstrCode, - ULONG uNumCodeChars, - LPCOLESTR pstrDelimiter, - DWORD dwFlags, - SOURCE_TEXT_ATTR *pattr); -void __RPC_STUB IDebugDocumentHost_GetScriptTextAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHost_OnCreateDocumentContext_Proxy( - IDebugDocumentHost* This, - IUnknown **ppunkOuter); -void __RPC_STUB IDebugDocumentHost_OnCreateDocumentContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHost_GetPathName_Proxy( - IDebugDocumentHost* This, - BSTR *pbstrLongName, - WINBOOL *pfIsOriginalFile); -void __RPC_STUB IDebugDocumentHost_GetPathName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHost_GetFileName_Proxy( - IDebugDocumentHost* This, - BSTR *pbstrShortName); -void __RPC_STUB IDebugDocumentHost_GetFileName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentHost_NotifyChanged_Proxy( - IDebugDocumentHost* This); -void __RPC_STUB IDebugDocumentHost_NotifyChanged_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugDocumentHost_INTERFACE_DEFINED__ */ @@ -5576,27 +4938,28 @@ typedef struct IDebugDocumentContextVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugDocumentContext* This, + IDebugDocumentContext *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugDocumentContext* This); + IDebugDocumentContext *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugDocumentContext* This); + IDebugDocumentContext *This); /*** IDebugDocumentContext methods ***/ HRESULT (STDMETHODCALLTYPE *GetDocument)( - IDebugDocumentContext* This, + IDebugDocumentContext *This, IDebugDocument **ppsd); HRESULT (STDMETHODCALLTYPE *EnumCodeContexts)( - IDebugDocumentContext* This, + IDebugDocumentContext *This, IEnumDebugCodeContexts **ppescc); END_INTERFACE } IDebugDocumentContextVtbl; + interface IDebugDocumentContext { CONST_VTBL IDebugDocumentContextVtbl* lpVtbl; }; @@ -5633,22 +4996,6 @@ static FORCEINLINE HRESULT IDebugDocumentContext_EnumCodeContexts(IDebugDocument #endif -HRESULT STDMETHODCALLTYPE IDebugDocumentContext_GetDocument_Proxy( - IDebugDocumentContext* This, - IDebugDocument **ppsd); -void __RPC_STUB IDebugDocumentContext_GetDocument_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugDocumentContext_EnumCodeContexts_Proxy( - IDebugDocumentContext* This, - IEnumDebugCodeContexts **ppescc); -void __RPC_STUB IDebugDocumentContext_EnumCodeContexts_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugDocumentContext_INTERFACE_DEFINED__ */ @@ -5676,23 +5023,24 @@ typedef struct IDebugSessionProviderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugSessionProvider* This, + IDebugSessionProvider *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugSessionProvider* This); + IDebugSessionProvider *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugSessionProvider* This); + IDebugSessionProvider *This); /*** IDebugSessionProvider methods ***/ HRESULT (STDMETHODCALLTYPE *StartDebugSession)( - IDebugSessionProvider* This, + IDebugSessionProvider *This, IRemoteDebugApplication *pda); END_INTERFACE } IDebugSessionProviderVtbl; + interface IDebugSessionProvider { CONST_VTBL IDebugSessionProviderVtbl* lpVtbl; }; @@ -5725,14 +5073,6 @@ static FORCEINLINE HRESULT IDebugSessionProvider_StartDebugSession(IDebugSession #endif -HRESULT STDMETHODCALLTYPE IDebugSessionProvider_StartDebugSession_Proxy( - IDebugSessionProvider* This, - IRemoteDebugApplication *pda); -void __RPC_STUB IDebugSessionProvider_StartDebugSession_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugSessionProvider_INTERFACE_DEFINED__ */ @@ -5782,22 +5122,22 @@ typedef struct IApplicationDebuggerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IApplicationDebugger* This, + IApplicationDebugger *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IApplicationDebugger* This); + IApplicationDebugger *This); ULONG (STDMETHODCALLTYPE *Release)( - IApplicationDebugger* This); + IApplicationDebugger *This); /*** IApplicationDebugger methods ***/ HRESULT (STDMETHODCALLTYPE *QueryAlive)( - IApplicationDebugger* This); + IApplicationDebugger *This); HRESULT (STDMETHODCALLTYPE *CreateInstanceAtDebugger)( - IApplicationDebugger* This, + IApplicationDebugger *This, REFCLSID rclsid, IUnknown *pUnkOuter, DWORD dwClsContext, @@ -5805,25 +5145,26 @@ typedef struct IApplicationDebuggerVtbl { IUnknown **ppvObject); HRESULT (STDMETHODCALLTYPE *onDebugOutput)( - IApplicationDebugger* This, + IApplicationDebugger *This, LPCOLESTR pstr); HRESULT (STDMETHODCALLTYPE *onHandleBreakPoint)( - IApplicationDebugger* This, + IApplicationDebugger *This, IRemoteDebugApplicationThread *prpt, BREAKREASON br, IActiveScriptErrorDebug *pError); HRESULT (STDMETHODCALLTYPE *onClose)( - IApplicationDebugger* This); + IApplicationDebugger *This); HRESULT (STDMETHODCALLTYPE *onDebuggerEvent)( - IApplicationDebugger* This, + IApplicationDebugger *This, REFIID riid, IUnknown *punk); END_INTERFACE } IApplicationDebuggerVtbl; + interface IApplicationDebugger { CONST_VTBL IApplicationDebuggerVtbl* lpVtbl; }; @@ -5876,59 +5217,6 @@ static FORCEINLINE HRESULT IApplicationDebugger_onDebuggerEvent(IApplicationDebu #endif -HRESULT STDMETHODCALLTYPE IApplicationDebugger_QueryAlive_Proxy( - IApplicationDebugger* This); -void __RPC_STUB IApplicationDebugger_QueryAlive_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationDebugger_CreateInstanceAtDebugger_Proxy( - IApplicationDebugger* This, - REFCLSID rclsid, - IUnknown *pUnkOuter, - DWORD dwClsContext, - REFIID riid, - IUnknown **ppvObject); -void __RPC_STUB IApplicationDebugger_CreateInstanceAtDebugger_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationDebugger_onDebugOutput_Proxy( - IApplicationDebugger* This, - LPCOLESTR pstr); -void __RPC_STUB IApplicationDebugger_onDebugOutput_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationDebugger_onHandleBreakPoint_Proxy( - IApplicationDebugger* This, - IRemoteDebugApplicationThread *prpt, - BREAKREASON br, - IActiveScriptErrorDebug *pError); -void __RPC_STUB IApplicationDebugger_onHandleBreakPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationDebugger_onClose_Proxy( - IApplicationDebugger* This); -void __RPC_STUB IApplicationDebugger_onClose_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationDebugger_onDebuggerEvent_Proxy( - IApplicationDebugger* This, - REFIID riid, - IUnknown *punk); -void __RPC_STUB IApplicationDebugger_onDebuggerEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IApplicationDebugger_INTERFACE_DEFINED__ */ @@ -5959,27 +5247,28 @@ typedef struct IApplicationDebuggerUIVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IApplicationDebuggerUI* This, + IApplicationDebuggerUI *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IApplicationDebuggerUI* This); + IApplicationDebuggerUI *This); ULONG (STDMETHODCALLTYPE *Release)( - IApplicationDebuggerUI* This); + IApplicationDebuggerUI *This); /*** IApplicationDebuggerUI methods ***/ HRESULT (STDMETHODCALLTYPE *BringDocumentToTop)( - IApplicationDebuggerUI* This, + IApplicationDebuggerUI *This, IDebugDocumentText *pddt); HRESULT (STDMETHODCALLTYPE *BringDocumentContextToTop)( - IApplicationDebuggerUI* This, + IApplicationDebuggerUI *This, IDebugDocumentContext *pddc); END_INTERFACE } IApplicationDebuggerUIVtbl; + interface IApplicationDebuggerUI { CONST_VTBL IApplicationDebuggerUIVtbl* lpVtbl; }; @@ -6016,22 +5305,6 @@ static FORCEINLINE HRESULT IApplicationDebuggerUI_BringDocumentContextToTop(IApp #endif -HRESULT STDMETHODCALLTYPE IApplicationDebuggerUI_BringDocumentToTop_Proxy( - IApplicationDebuggerUI* This, - IDebugDocumentText *pddt); -void __RPC_STUB IApplicationDebuggerUI_BringDocumentToTop_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationDebuggerUI_BringDocumentContextToTop_Proxy( - IApplicationDebuggerUI* This, - IDebugDocumentContext *pddc); -void __RPC_STUB IApplicationDebuggerUI_BringDocumentContextToTop_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IApplicationDebuggerUI_INTERFACE_DEFINED__ */ @@ -6066,32 +5339,33 @@ typedef struct IMachineDebugManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMachineDebugManager* This, + IMachineDebugManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMachineDebugManager* This); + IMachineDebugManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IMachineDebugManager* This); + IMachineDebugManager *This); /*** IMachineDebugManager methods ***/ HRESULT (STDMETHODCALLTYPE *AddApplication)( - IMachineDebugManager* This, + IMachineDebugManager *This, IRemoteDebugApplication *pda, DWORD *pdwAppCookie); HRESULT (STDMETHODCALLTYPE *RemoveApplication)( - IMachineDebugManager* This, + IMachineDebugManager *This, DWORD dwAppCookie); HRESULT (STDMETHODCALLTYPE *EnumApplications)( - IMachineDebugManager* This, + IMachineDebugManager *This, IEnumRemoteDebugApplications **ppeda); END_INTERFACE } IMachineDebugManagerVtbl; + interface IMachineDebugManager { CONST_VTBL IMachineDebugManagerVtbl* lpVtbl; }; @@ -6132,31 +5406,6 @@ static FORCEINLINE HRESULT IMachineDebugManager_EnumApplications(IMachineDebugMa #endif -HRESULT STDMETHODCALLTYPE IMachineDebugManager_AddApplication_Proxy( - IMachineDebugManager* This, - IRemoteDebugApplication *pda, - DWORD *pdwAppCookie); -void __RPC_STUB IMachineDebugManager_AddApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMachineDebugManager_RemoveApplication_Proxy( - IMachineDebugManager* This, - DWORD dwAppCookie); -void __RPC_STUB IMachineDebugManager_RemoveApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMachineDebugManager_EnumApplications_Proxy( - IMachineDebugManager* This, - IEnumRemoteDebugApplications **ppeda); -void __RPC_STUB IMachineDebugManager_EnumApplications_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMachineDebugManager_INTERFACE_DEFINED__ */ @@ -6193,34 +5442,35 @@ typedef struct IMachineDebugManagerCookieVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMachineDebugManagerCookie* This, + IMachineDebugManagerCookie *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMachineDebugManagerCookie* This); + IMachineDebugManagerCookie *This); ULONG (STDMETHODCALLTYPE *Release)( - IMachineDebugManagerCookie* This); + IMachineDebugManagerCookie *This); /*** IMachineDebugManagerCookie methods ***/ HRESULT (STDMETHODCALLTYPE *AddApplication)( - IMachineDebugManagerCookie* This, + IMachineDebugManagerCookie *This, IRemoteDebugApplication *pda, DWORD dwDebugAppCookie, DWORD *pdwAppCookie); HRESULT (STDMETHODCALLTYPE *RemoveApplication)( - IMachineDebugManagerCookie* This, + IMachineDebugManagerCookie *This, DWORD dwDebugAppCookie, DWORD dwAppCookie); HRESULT (STDMETHODCALLTYPE *EnumApplications)( - IMachineDebugManagerCookie* This, + IMachineDebugManagerCookie *This, IEnumRemoteDebugApplications **ppeda); END_INTERFACE } IMachineDebugManagerCookieVtbl; + interface IMachineDebugManagerCookie { CONST_VTBL IMachineDebugManagerCookieVtbl* lpVtbl; }; @@ -6261,33 +5511,6 @@ static FORCEINLINE HRESULT IMachineDebugManagerCookie_EnumApplications(IMachineD #endif -HRESULT STDMETHODCALLTYPE IMachineDebugManagerCookie_AddApplication_Proxy( - IMachineDebugManagerCookie* This, - IRemoteDebugApplication *pda, - DWORD dwDebugAppCookie, - DWORD *pdwAppCookie); -void __RPC_STUB IMachineDebugManagerCookie_AddApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMachineDebugManagerCookie_RemoveApplication_Proxy( - IMachineDebugManagerCookie* This, - DWORD dwDebugAppCookie, - DWORD dwAppCookie); -void __RPC_STUB IMachineDebugManagerCookie_RemoveApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMachineDebugManagerCookie_EnumApplications_Proxy( - IMachineDebugManagerCookie* This, - IEnumRemoteDebugApplications **ppeda); -void __RPC_STUB IMachineDebugManagerCookie_EnumApplications_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMachineDebugManagerCookie_INTERFACE_DEFINED__ */ @@ -6320,29 +5543,30 @@ typedef struct IMachineDebugManagerEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMachineDebugManagerEvents* This, + IMachineDebugManagerEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMachineDebugManagerEvents* This); + IMachineDebugManagerEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - IMachineDebugManagerEvents* This); + IMachineDebugManagerEvents *This); /*** IMachineDebugManagerEvents methods ***/ HRESULT (STDMETHODCALLTYPE *onAddApplication)( - IMachineDebugManagerEvents* This, + IMachineDebugManagerEvents *This, IRemoteDebugApplication *pda, DWORD dwAppCookie); HRESULT (STDMETHODCALLTYPE *onRemoveApplication)( - IMachineDebugManagerEvents* This, + IMachineDebugManagerEvents *This, IRemoteDebugApplication *pda, DWORD dwAppCookie); END_INTERFACE } IMachineDebugManagerEventsVtbl; + interface IMachineDebugManagerEvents { CONST_VTBL IMachineDebugManagerEventsVtbl* lpVtbl; }; @@ -6379,24 +5603,6 @@ static FORCEINLINE HRESULT IMachineDebugManagerEvents_onRemoveApplication(IMachi #endif -HRESULT STDMETHODCALLTYPE IMachineDebugManagerEvents_onAddApplication_Proxy( - IMachineDebugManagerEvents* This, - IRemoteDebugApplication *pda, - DWORD dwAppCookie); -void __RPC_STUB IMachineDebugManagerEvents_onAddApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMachineDebugManagerEvents_onRemoveApplication_Proxy( - IMachineDebugManagerEvents* This, - IRemoteDebugApplication *pda, - DWORD dwAppCookie); -void __RPC_STUB IMachineDebugManagerEvents_onRemoveApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMachineDebugManagerEvents_INTERFACE_DEFINED__ */ @@ -6438,41 +5644,42 @@ typedef struct IProcessDebugManager32Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IProcessDebugManager32* This, + IProcessDebugManager32 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IProcessDebugManager32* This); + IProcessDebugManager32 *This); ULONG (STDMETHODCALLTYPE *Release)( - IProcessDebugManager32* This); + IProcessDebugManager32 *This); /*** IProcessDebugManager32 methods ***/ HRESULT (STDMETHODCALLTYPE *CreateApplication)( - IProcessDebugManager32* This, + IProcessDebugManager32 *This, IDebugApplication32 **ppda); HRESULT (STDMETHODCALLTYPE *GetDefaultApplication)( - IProcessDebugManager32* This, + IProcessDebugManager32 *This, IDebugApplication32 **ppda); HRESULT (STDMETHODCALLTYPE *AddApplication)( - IProcessDebugManager32* This, + IProcessDebugManager32 *This, IDebugApplication32 *pda, DWORD *pdwAppCookie); HRESULT (STDMETHODCALLTYPE *RemoveApplication)( - IProcessDebugManager32* This, + IProcessDebugManager32 *This, DWORD dwAppCookie); HRESULT (STDMETHODCALLTYPE *CreateDebugDocumentHelper)( - IProcessDebugManager32* This, + IProcessDebugManager32 *This, IUnknown *punkOuter, IDebugDocumentHelper32 **pddh); END_INTERFACE } IProcessDebugManager32Vtbl; + interface IProcessDebugManager32 { CONST_VTBL IProcessDebugManager32Vtbl* lpVtbl; }; @@ -6521,48 +5728,6 @@ static FORCEINLINE HRESULT IProcessDebugManager32_CreateDebugDocumentHelper(IPro #endif -HRESULT STDMETHODCALLTYPE IProcessDebugManager32_CreateApplication_Proxy( - IProcessDebugManager32* This, - IDebugApplication32 **ppda); -void __RPC_STUB IProcessDebugManager32_CreateApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IProcessDebugManager32_GetDefaultApplication_Proxy( - IProcessDebugManager32* This, - IDebugApplication32 **ppda); -void __RPC_STUB IProcessDebugManager32_GetDefaultApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IProcessDebugManager32_AddApplication_Proxy( - IProcessDebugManager32* This, - IDebugApplication32 *pda, - DWORD *pdwAppCookie); -void __RPC_STUB IProcessDebugManager32_AddApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IProcessDebugManager32_RemoveApplication_Proxy( - IProcessDebugManager32* This, - DWORD dwAppCookie); -void __RPC_STUB IProcessDebugManager32_RemoveApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IProcessDebugManager32_CreateDebugDocumentHelper_Proxy( - IProcessDebugManager32* This, - IUnknown *punkOuter, - IDebugDocumentHelper32 **pddh); -void __RPC_STUB IProcessDebugManager32_CreateDebugDocumentHelper_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IProcessDebugManager32_INTERFACE_DEFINED__ */ @@ -6604,41 +5769,42 @@ typedef struct IProcessDebugManager64Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IProcessDebugManager64* This, + IProcessDebugManager64 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IProcessDebugManager64* This); + IProcessDebugManager64 *This); ULONG (STDMETHODCALLTYPE *Release)( - IProcessDebugManager64* This); + IProcessDebugManager64 *This); /*** IProcessDebugManager64 methods ***/ HRESULT (STDMETHODCALLTYPE *CreateApplication)( - IProcessDebugManager64* This, + IProcessDebugManager64 *This, IDebugApplication64 **ppda); HRESULT (STDMETHODCALLTYPE *GetDefaultApplication)( - IProcessDebugManager64* This, + IProcessDebugManager64 *This, IDebugApplication64 **ppda); HRESULT (STDMETHODCALLTYPE *AddApplication)( - IProcessDebugManager64* This, + IProcessDebugManager64 *This, IDebugApplication64 *pda, DWORD *pdwAppCookie); HRESULT (STDMETHODCALLTYPE *RemoveApplication)( - IProcessDebugManager64* This, + IProcessDebugManager64 *This, DWORD dwAppCookie); HRESULT (STDMETHODCALLTYPE *CreateDebugDocumentHelper)( - IProcessDebugManager64* This, + IProcessDebugManager64 *This, IUnknown *punkOuter, IDebugDocumentHelper64 **pddh); END_INTERFACE } IProcessDebugManager64Vtbl; + interface IProcessDebugManager64 { CONST_VTBL IProcessDebugManager64Vtbl* lpVtbl; }; @@ -6687,48 +5853,6 @@ static FORCEINLINE HRESULT IProcessDebugManager64_CreateDebugDocumentHelper(IPro #endif -HRESULT STDMETHODCALLTYPE IProcessDebugManager64_CreateApplication_Proxy( - IProcessDebugManager64* This, - IDebugApplication64 **ppda); -void __RPC_STUB IProcessDebugManager64_CreateApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IProcessDebugManager64_GetDefaultApplication_Proxy( - IProcessDebugManager64* This, - IDebugApplication64 **ppda); -void __RPC_STUB IProcessDebugManager64_GetDefaultApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IProcessDebugManager64_AddApplication_Proxy( - IProcessDebugManager64* This, - IDebugApplication64 *pda, - DWORD *pdwAppCookie); -void __RPC_STUB IProcessDebugManager64_AddApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IProcessDebugManager64_RemoveApplication_Proxy( - IProcessDebugManager64* This, - DWORD dwAppCookie); -void __RPC_STUB IProcessDebugManager64_RemoveApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IProcessDebugManager64_CreateDebugDocumentHelper_Proxy( - IProcessDebugManager64* This, - IUnknown *punkOuter, - IDebugDocumentHelper64 **pddh); -void __RPC_STUB IProcessDebugManager64_CreateDebugDocumentHelper_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IProcessDebugManager64_INTERFACE_DEFINED__ */ @@ -6792,39 +5916,39 @@ typedef struct IRemoteDebugApplicationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IRemoteDebugApplication* This, + IRemoteDebugApplication *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IRemoteDebugApplication* This); + IRemoteDebugApplication *This); ULONG (STDMETHODCALLTYPE *Release)( - IRemoteDebugApplication* This); + IRemoteDebugApplication *This); /*** IRemoteDebugApplication methods ***/ HRESULT (STDMETHODCALLTYPE *ResumeFromBreakPoint)( - IRemoteDebugApplication* This, + IRemoteDebugApplication *This, IRemoteDebugApplicationThread *prptFocus, BREAKRESUMEACTION bra, ERRORRESUMEACTION era); HRESULT (STDMETHODCALLTYPE *CauseBreak)( - IRemoteDebugApplication* This); + IRemoteDebugApplication *This); HRESULT (STDMETHODCALLTYPE *ConnectDebugger)( - IRemoteDebugApplication* This, + IRemoteDebugApplication *This, IApplicationDebugger *pad); HRESULT (STDMETHODCALLTYPE *DisconnectDebugger)( - IRemoteDebugApplication* This); + IRemoteDebugApplication *This); HRESULT (STDMETHODCALLTYPE *GetDebugger)( - IRemoteDebugApplication* This, + IRemoteDebugApplication *This, IApplicationDebugger **pad); HRESULT (STDMETHODCALLTYPE *CreateInstanceAtApplication)( - IRemoteDebugApplication* This, + IRemoteDebugApplication *This, REFCLSID rclsid, IUnknown *pUnkOuter, DWORD dwClsContext, @@ -6832,26 +5956,27 @@ typedef struct IRemoteDebugApplicationVtbl { IUnknown **ppvObject); HRESULT (STDMETHODCALLTYPE *QueryAlive)( - IRemoteDebugApplication* This); + IRemoteDebugApplication *This); HRESULT (STDMETHODCALLTYPE *EnumThreads)( - IRemoteDebugApplication* This, + IRemoteDebugApplication *This, IEnumRemoteDebugApplicationThreads **pperdat); HRESULT (STDMETHODCALLTYPE *GetName)( - IRemoteDebugApplication* This, + IRemoteDebugApplication *This, BSTR *pbstrName); HRESULT (STDMETHODCALLTYPE *GetRootNode)( - IRemoteDebugApplication* This, + IRemoteDebugApplication *This, IDebugApplicationNode **ppdanRoot); HRESULT (STDMETHODCALLTYPE *EnumGlobalExpressionContexts)( - IRemoteDebugApplication* This, + IRemoteDebugApplication *This, IEnumDebugExpressionContexts **ppedec); END_INTERFACE } IRemoteDebugApplicationVtbl; + interface IRemoteDebugApplication { CONST_VTBL IRemoteDebugApplicationVtbl* lpVtbl; }; @@ -6924,97 +6049,6 @@ static FORCEINLINE HRESULT IRemoteDebugApplication_EnumGlobalExpressionContexts( #endif -HRESULT STDMETHODCALLTYPE IRemoteDebugApplication_ResumeFromBreakPoint_Proxy( - IRemoteDebugApplication* This, - IRemoteDebugApplicationThread *prptFocus, - BREAKRESUMEACTION bra, - ERRORRESUMEACTION era); -void __RPC_STUB IRemoteDebugApplication_ResumeFromBreakPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplication_CauseBreak_Proxy( - IRemoteDebugApplication* This); -void __RPC_STUB IRemoteDebugApplication_CauseBreak_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplication_ConnectDebugger_Proxy( - IRemoteDebugApplication* This, - IApplicationDebugger *pad); -void __RPC_STUB IRemoteDebugApplication_ConnectDebugger_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplication_DisconnectDebugger_Proxy( - IRemoteDebugApplication* This); -void __RPC_STUB IRemoteDebugApplication_DisconnectDebugger_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplication_GetDebugger_Proxy( - IRemoteDebugApplication* This, - IApplicationDebugger **pad); -void __RPC_STUB IRemoteDebugApplication_GetDebugger_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplication_CreateInstanceAtApplication_Proxy( - IRemoteDebugApplication* This, - REFCLSID rclsid, - IUnknown *pUnkOuter, - DWORD dwClsContext, - REFIID riid, - IUnknown **ppvObject); -void __RPC_STUB IRemoteDebugApplication_CreateInstanceAtApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplication_QueryAlive_Proxy( - IRemoteDebugApplication* This); -void __RPC_STUB IRemoteDebugApplication_QueryAlive_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplication_EnumThreads_Proxy( - IRemoteDebugApplication* This, - IEnumRemoteDebugApplicationThreads **pperdat); -void __RPC_STUB IRemoteDebugApplication_EnumThreads_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplication_GetName_Proxy( - IRemoteDebugApplication* This, - BSTR *pbstrName); -void __RPC_STUB IRemoteDebugApplication_GetName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplication_GetRootNode_Proxy( - IRemoteDebugApplication* This, - IDebugApplicationNode **ppdanRoot); -void __RPC_STUB IRemoteDebugApplication_GetRootNode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplication_EnumGlobalExpressionContexts_Proxy( - IRemoteDebugApplication* This, - IEnumDebugExpressionContexts **ppedec); -void __RPC_STUB IRemoteDebugApplication_EnumGlobalExpressionContexts_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IRemoteDebugApplication_INTERFACE_DEFINED__ */ @@ -7112,39 +6146,39 @@ typedef struct IDebugApplication32Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugApplication32* This, + IDebugApplication32 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugApplication32* This); + IDebugApplication32 *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugApplication32* This); + IDebugApplication32 *This); /*** IRemoteDebugApplication methods ***/ HRESULT (STDMETHODCALLTYPE *ResumeFromBreakPoint)( - IDebugApplication32* This, + IDebugApplication32 *This, IRemoteDebugApplicationThread *prptFocus, BREAKRESUMEACTION bra, ERRORRESUMEACTION era); HRESULT (STDMETHODCALLTYPE *CauseBreak)( - IDebugApplication32* This); + IDebugApplication32 *This); HRESULT (STDMETHODCALLTYPE *ConnectDebugger)( - IDebugApplication32* This, + IDebugApplication32 *This, IApplicationDebugger *pad); HRESULT (STDMETHODCALLTYPE *DisconnectDebugger)( - IDebugApplication32* This); + IDebugApplication32 *This); HRESULT (STDMETHODCALLTYPE *GetDebugger)( - IDebugApplication32* This, + IDebugApplication32 *This, IApplicationDebugger **pad); HRESULT (STDMETHODCALLTYPE *CreateInstanceAtApplication)( - IDebugApplication32* This, + IDebugApplication32 *This, REFCLSID rclsid, IUnknown *pUnkOuter, DWORD dwClsContext, @@ -7152,91 +6186,91 @@ typedef struct IDebugApplication32Vtbl { IUnknown **ppvObject); HRESULT (STDMETHODCALLTYPE *QueryAlive)( - IDebugApplication32* This); + IDebugApplication32 *This); HRESULT (STDMETHODCALLTYPE *EnumThreads)( - IDebugApplication32* This, + IDebugApplication32 *This, IEnumRemoteDebugApplicationThreads **pperdat); HRESULT (STDMETHODCALLTYPE *GetName)( - IDebugApplication32* This, + IDebugApplication32 *This, BSTR *pbstrName); HRESULT (STDMETHODCALLTYPE *GetRootNode)( - IDebugApplication32* This, + IDebugApplication32 *This, IDebugApplicationNode **ppdanRoot); HRESULT (STDMETHODCALLTYPE *EnumGlobalExpressionContexts)( - IDebugApplication32* This, + IDebugApplication32 *This, IEnumDebugExpressionContexts **ppedec); /*** IDebugApplication32 methods ***/ HRESULT (STDMETHODCALLTYPE *SetName)( - IDebugApplication32* This, + IDebugApplication32 *This, LPCOLESTR pstrName); HRESULT (STDMETHODCALLTYPE *StepOutComplete)( - IDebugApplication32* This); + IDebugApplication32 *This); HRESULT (STDMETHODCALLTYPE *DebugOutput)( - IDebugApplication32* This, + IDebugApplication32 *This, LPCOLESTR pstr); HRESULT (STDMETHODCALLTYPE *StartDebugSession)( - IDebugApplication32* This); + IDebugApplication32 *This); HRESULT (STDMETHODCALLTYPE *HandleBreakPoint)( - IDebugApplication32* This, + IDebugApplication32 *This, BREAKREASON br, BREAKRESUMEACTION *pbra); HRESULT (STDMETHODCALLTYPE *Close)( - IDebugApplication32* This); + IDebugApplication32 *This); HRESULT (STDMETHODCALLTYPE *GetBreakFlags)( - IDebugApplication32* This, + IDebugApplication32 *This, APPBREAKFLAGS *pabf, IRemoteDebugApplicationThread **pprdatSteppingThread); HRESULT (STDMETHODCALLTYPE *GetCurrentThread)( - IDebugApplication32* This, + IDebugApplication32 *This, IDebugApplicationThread **pat); HRESULT (STDMETHODCALLTYPE *CreateAsyncDebugOperation)( - IDebugApplication32* This, + IDebugApplication32 *This, IDebugSyncOperation *psdo, IDebugAsyncOperation **ppado); HRESULT (STDMETHODCALLTYPE *AddStackFrameSniffer)( - IDebugApplication32* This, + IDebugApplication32 *This, IDebugStackFrameSniffer *pdsfs, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *RemoveStackFrameSniffer)( - IDebugApplication32* This, + IDebugApplication32 *This, DWORD dwCookie); HRESULT (STDMETHODCALLTYPE *QueryCurrentThreadIsDebuggerThread)( - IDebugApplication32* This); + IDebugApplication32 *This); HRESULT (STDMETHODCALLTYPE *SynchronousCallInDebuggerThread)( - IDebugApplication32* This, + IDebugApplication32 *This, IDebugThreadCall32 *pptc, DWORD dwParam1, DWORD dwParam2, DWORD dwParam3); HRESULT (STDMETHODCALLTYPE *CreateApplicationNode)( - IDebugApplication32* This, + IDebugApplication32 *This, IDebugApplicationNode **ppdanNew); HRESULT (STDMETHODCALLTYPE *FireDebuggerEvent)( - IDebugApplication32* This, + IDebugApplication32 *This, REFGUID riid, IUnknown *punk); HRESULT (STDMETHODCALLTYPE *HandleRuntimeError)( - IDebugApplication32* This, + IDebugApplication32 *This, IActiveScriptErrorDebug *pErrorDebug, IActiveScriptSite *pScriptSite, BREAKRESUMEACTION *pbra, @@ -7244,22 +6278,23 @@ typedef struct IDebugApplication32Vtbl { WINBOOL *pfCallOnScriptError); WINBOOL (STDMETHODCALLTYPE *FCanJitDebug)( - IDebugApplication32* This); + IDebugApplication32 *This); WINBOOL (STDMETHODCALLTYPE *FIsAutoJitDebugEnabled)( - IDebugApplication32* This); + IDebugApplication32 *This); HRESULT (STDMETHODCALLTYPE *AddGlobalExpressionContextProvider)( - IDebugApplication32* This, + IDebugApplication32 *This, IProvideExpressionContexts *pdsfs, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *RemoveGlobalExpressionContextProvider)( - IDebugApplication32* This, + IDebugApplication32 *This, DWORD dwCookie); END_INTERFACE } IDebugApplication32Vtbl; + interface IDebugApplication32 { CONST_VTBL IDebugApplication32Vtbl* lpVtbl; }; @@ -7414,173 +6449,6 @@ static FORCEINLINE HRESULT IDebugApplication32_RemoveGlobalExpressionContextProv #endif -HRESULT STDMETHODCALLTYPE IDebugApplication32_SetName_Proxy( - IDebugApplication32* This, - LPCOLESTR pstrName); -void __RPC_STUB IDebugApplication32_SetName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication32_StepOutComplete_Proxy( - IDebugApplication32* This); -void __RPC_STUB IDebugApplication32_StepOutComplete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication32_DebugOutput_Proxy( - IDebugApplication32* This, - LPCOLESTR pstr); -void __RPC_STUB IDebugApplication32_DebugOutput_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication32_StartDebugSession_Proxy( - IDebugApplication32* This); -void __RPC_STUB IDebugApplication32_StartDebugSession_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication32_HandleBreakPoint_Proxy( - IDebugApplication32* This, - BREAKREASON br, - BREAKRESUMEACTION *pbra); -void __RPC_STUB IDebugApplication32_HandleBreakPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication32_Close_Proxy( - IDebugApplication32* This); -void __RPC_STUB IDebugApplication32_Close_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication32_GetBreakFlags_Proxy( - IDebugApplication32* This, - APPBREAKFLAGS *pabf, - IRemoteDebugApplicationThread **pprdatSteppingThread); -void __RPC_STUB IDebugApplication32_GetBreakFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication32_GetCurrentThread_Proxy( - IDebugApplication32* This, - IDebugApplicationThread **pat); -void __RPC_STUB IDebugApplication32_GetCurrentThread_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication32_CreateAsyncDebugOperation_Proxy( - IDebugApplication32* This, - IDebugSyncOperation *psdo, - IDebugAsyncOperation **ppado); -void __RPC_STUB IDebugApplication32_CreateAsyncDebugOperation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication32_AddStackFrameSniffer_Proxy( - IDebugApplication32* This, - IDebugStackFrameSniffer *pdsfs, - DWORD *pdwCookie); -void __RPC_STUB IDebugApplication32_AddStackFrameSniffer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication32_RemoveStackFrameSniffer_Proxy( - IDebugApplication32* This, - DWORD dwCookie); -void __RPC_STUB IDebugApplication32_RemoveStackFrameSniffer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication32_QueryCurrentThreadIsDebuggerThread_Proxy( - IDebugApplication32* This); -void __RPC_STUB IDebugApplication32_QueryCurrentThreadIsDebuggerThread_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication32_SynchronousCallInDebuggerThread_Proxy( - IDebugApplication32* This, - IDebugThreadCall32 *pptc, - DWORD dwParam1, - DWORD dwParam2, - DWORD dwParam3); -void __RPC_STUB IDebugApplication32_SynchronousCallInDebuggerThread_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication32_CreateApplicationNode_Proxy( - IDebugApplication32* This, - IDebugApplicationNode **ppdanNew); -void __RPC_STUB IDebugApplication32_CreateApplicationNode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication32_FireDebuggerEvent_Proxy( - IDebugApplication32* This, - REFGUID riid, - IUnknown *punk); -void __RPC_STUB IDebugApplication32_FireDebuggerEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication32_HandleRuntimeError_Proxy( - IDebugApplication32* This, - IActiveScriptErrorDebug *pErrorDebug, - IActiveScriptSite *pScriptSite, - BREAKRESUMEACTION *pbra, - ERRORRESUMEACTION *perra, - WINBOOL *pfCallOnScriptError); -void __RPC_STUB IDebugApplication32_HandleRuntimeError_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -WINBOOL STDMETHODCALLTYPE IDebugApplication32_FCanJitDebug_Proxy( - IDebugApplication32* This); -void __RPC_STUB IDebugApplication32_FCanJitDebug_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -WINBOOL STDMETHODCALLTYPE IDebugApplication32_FIsAutoJitDebugEnabled_Proxy( - IDebugApplication32* This); -void __RPC_STUB IDebugApplication32_FIsAutoJitDebugEnabled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication32_AddGlobalExpressionContextProvider_Proxy( - IDebugApplication32* This, - IProvideExpressionContexts *pdsfs, - DWORD *pdwCookie); -void __RPC_STUB IDebugApplication32_AddGlobalExpressionContextProvider_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication32_RemoveGlobalExpressionContextProvider_Proxy( - IDebugApplication32* This, - DWORD dwCookie); -void __RPC_STUB IDebugApplication32_RemoveGlobalExpressionContextProvider_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugApplication32_INTERFACE_DEFINED__ */ @@ -7678,39 +6546,39 @@ typedef struct IDebugApplication64Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugApplication64* This, + IDebugApplication64 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugApplication64* This); + IDebugApplication64 *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugApplication64* This); + IDebugApplication64 *This); /*** IRemoteDebugApplication methods ***/ HRESULT (STDMETHODCALLTYPE *ResumeFromBreakPoint)( - IDebugApplication64* This, + IDebugApplication64 *This, IRemoteDebugApplicationThread *prptFocus, BREAKRESUMEACTION bra, ERRORRESUMEACTION era); HRESULT (STDMETHODCALLTYPE *CauseBreak)( - IDebugApplication64* This); + IDebugApplication64 *This); HRESULT (STDMETHODCALLTYPE *ConnectDebugger)( - IDebugApplication64* This, + IDebugApplication64 *This, IApplicationDebugger *pad); HRESULT (STDMETHODCALLTYPE *DisconnectDebugger)( - IDebugApplication64* This); + IDebugApplication64 *This); HRESULT (STDMETHODCALLTYPE *GetDebugger)( - IDebugApplication64* This, + IDebugApplication64 *This, IApplicationDebugger **pad); HRESULT (STDMETHODCALLTYPE *CreateInstanceAtApplication)( - IDebugApplication64* This, + IDebugApplication64 *This, REFCLSID rclsid, IUnknown *pUnkOuter, DWORD dwClsContext, @@ -7718,91 +6586,91 @@ typedef struct IDebugApplication64Vtbl { IUnknown **ppvObject); HRESULT (STDMETHODCALLTYPE *QueryAlive)( - IDebugApplication64* This); + IDebugApplication64 *This); HRESULT (STDMETHODCALLTYPE *EnumThreads)( - IDebugApplication64* This, + IDebugApplication64 *This, IEnumRemoteDebugApplicationThreads **pperdat); HRESULT (STDMETHODCALLTYPE *GetName)( - IDebugApplication64* This, + IDebugApplication64 *This, BSTR *pbstrName); HRESULT (STDMETHODCALLTYPE *GetRootNode)( - IDebugApplication64* This, + IDebugApplication64 *This, IDebugApplicationNode **ppdanRoot); HRESULT (STDMETHODCALLTYPE *EnumGlobalExpressionContexts)( - IDebugApplication64* This, + IDebugApplication64 *This, IEnumDebugExpressionContexts **ppedec); /*** IDebugApplication64 methods ***/ HRESULT (STDMETHODCALLTYPE *SetName)( - IDebugApplication64* This, + IDebugApplication64 *This, LPCOLESTR pstrName); HRESULT (STDMETHODCALLTYPE *StepOutComplete)( - IDebugApplication64* This); + IDebugApplication64 *This); HRESULT (STDMETHODCALLTYPE *DebugOutput)( - IDebugApplication64* This, + IDebugApplication64 *This, LPCOLESTR pstr); HRESULT (STDMETHODCALLTYPE *StartDebugSession)( - IDebugApplication64* This); + IDebugApplication64 *This); HRESULT (STDMETHODCALLTYPE *HandleBreakPoint)( - IDebugApplication64* This, + IDebugApplication64 *This, BREAKREASON br, BREAKRESUMEACTION *pbra); HRESULT (STDMETHODCALLTYPE *Close)( - IDebugApplication64* This); + IDebugApplication64 *This); HRESULT (STDMETHODCALLTYPE *GetBreakFlags)( - IDebugApplication64* This, + IDebugApplication64 *This, APPBREAKFLAGS *pabf, IRemoteDebugApplicationThread **pprdatSteppingThread); HRESULT (STDMETHODCALLTYPE *GetCurrentThread)( - IDebugApplication64* This, + IDebugApplication64 *This, IDebugApplicationThread **pat); HRESULT (STDMETHODCALLTYPE *CreateAsyncDebugOperation)( - IDebugApplication64* This, + IDebugApplication64 *This, IDebugSyncOperation *psdo, IDebugAsyncOperation **ppado); HRESULT (STDMETHODCALLTYPE *AddStackFrameSniffer)( - IDebugApplication64* This, + IDebugApplication64 *This, IDebugStackFrameSniffer *pdsfs, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *RemoveStackFrameSniffer)( - IDebugApplication64* This, + IDebugApplication64 *This, DWORD dwCookie); HRESULT (STDMETHODCALLTYPE *QueryCurrentThreadIsDebuggerThread)( - IDebugApplication64* This); + IDebugApplication64 *This); HRESULT (STDMETHODCALLTYPE *SynchronousCallInDebuggerThread)( - IDebugApplication64* This, + IDebugApplication64 *This, IDebugThreadCall64 *pptc, DWORDLONG dwParam1, DWORDLONG dwParam2, DWORDLONG dwParam3); HRESULT (STDMETHODCALLTYPE *CreateApplicationNode)( - IDebugApplication64* This, + IDebugApplication64 *This, IDebugApplicationNode **ppdanNew); HRESULT (STDMETHODCALLTYPE *FireDebuggerEvent)( - IDebugApplication64* This, + IDebugApplication64 *This, REFGUID riid, IUnknown *punk); HRESULT (STDMETHODCALLTYPE *HandleRuntimeError)( - IDebugApplication64* This, + IDebugApplication64 *This, IActiveScriptErrorDebug *pErrorDebug, IActiveScriptSite *pScriptSite, BREAKRESUMEACTION *pbra, @@ -7810,22 +6678,23 @@ typedef struct IDebugApplication64Vtbl { WINBOOL *pfCallOnScriptError); WINBOOL (STDMETHODCALLTYPE *FCanJitDebug)( - IDebugApplication64* This); + IDebugApplication64 *This); WINBOOL (STDMETHODCALLTYPE *FIsAutoJitDebugEnabled)( - IDebugApplication64* This); + IDebugApplication64 *This); HRESULT (STDMETHODCALLTYPE *AddGlobalExpressionContextProvider)( - IDebugApplication64* This, + IDebugApplication64 *This, IProvideExpressionContexts *pdsfs, DWORDLONG *pdwCookie); HRESULT (STDMETHODCALLTYPE *RemoveGlobalExpressionContextProvider)( - IDebugApplication64* This, + IDebugApplication64 *This, DWORDLONG dwCookie); END_INTERFACE } IDebugApplication64Vtbl; + interface IDebugApplication64 { CONST_VTBL IDebugApplication64Vtbl* lpVtbl; }; @@ -7980,173 +6849,6 @@ static FORCEINLINE HRESULT IDebugApplication64_RemoveGlobalExpressionContextProv #endif -HRESULT STDMETHODCALLTYPE IDebugApplication64_SetName_Proxy( - IDebugApplication64* This, - LPCOLESTR pstrName); -void __RPC_STUB IDebugApplication64_SetName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication64_StepOutComplete_Proxy( - IDebugApplication64* This); -void __RPC_STUB IDebugApplication64_StepOutComplete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication64_DebugOutput_Proxy( - IDebugApplication64* This, - LPCOLESTR pstr); -void __RPC_STUB IDebugApplication64_DebugOutput_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication64_StartDebugSession_Proxy( - IDebugApplication64* This); -void __RPC_STUB IDebugApplication64_StartDebugSession_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication64_HandleBreakPoint_Proxy( - IDebugApplication64* This, - BREAKREASON br, - BREAKRESUMEACTION *pbra); -void __RPC_STUB IDebugApplication64_HandleBreakPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication64_Close_Proxy( - IDebugApplication64* This); -void __RPC_STUB IDebugApplication64_Close_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication64_GetBreakFlags_Proxy( - IDebugApplication64* This, - APPBREAKFLAGS *pabf, - IRemoteDebugApplicationThread **pprdatSteppingThread); -void __RPC_STUB IDebugApplication64_GetBreakFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication64_GetCurrentThread_Proxy( - IDebugApplication64* This, - IDebugApplicationThread **pat); -void __RPC_STUB IDebugApplication64_GetCurrentThread_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication64_CreateAsyncDebugOperation_Proxy( - IDebugApplication64* This, - IDebugSyncOperation *psdo, - IDebugAsyncOperation **ppado); -void __RPC_STUB IDebugApplication64_CreateAsyncDebugOperation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication64_AddStackFrameSniffer_Proxy( - IDebugApplication64* This, - IDebugStackFrameSniffer *pdsfs, - DWORD *pdwCookie); -void __RPC_STUB IDebugApplication64_AddStackFrameSniffer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication64_RemoveStackFrameSniffer_Proxy( - IDebugApplication64* This, - DWORD dwCookie); -void __RPC_STUB IDebugApplication64_RemoveStackFrameSniffer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication64_QueryCurrentThreadIsDebuggerThread_Proxy( - IDebugApplication64* This); -void __RPC_STUB IDebugApplication64_QueryCurrentThreadIsDebuggerThread_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication64_SynchronousCallInDebuggerThread_Proxy( - IDebugApplication64* This, - IDebugThreadCall64 *pptc, - DWORDLONG dwParam1, - DWORDLONG dwParam2, - DWORDLONG dwParam3); -void __RPC_STUB IDebugApplication64_SynchronousCallInDebuggerThread_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication64_CreateApplicationNode_Proxy( - IDebugApplication64* This, - IDebugApplicationNode **ppdanNew); -void __RPC_STUB IDebugApplication64_CreateApplicationNode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication64_FireDebuggerEvent_Proxy( - IDebugApplication64* This, - REFGUID riid, - IUnknown *punk); -void __RPC_STUB IDebugApplication64_FireDebuggerEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication64_HandleRuntimeError_Proxy( - IDebugApplication64* This, - IActiveScriptErrorDebug *pErrorDebug, - IActiveScriptSite *pScriptSite, - BREAKRESUMEACTION *pbra, - ERRORRESUMEACTION *perra, - WINBOOL *pfCallOnScriptError); -void __RPC_STUB IDebugApplication64_HandleRuntimeError_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -WINBOOL STDMETHODCALLTYPE IDebugApplication64_FCanJitDebug_Proxy( - IDebugApplication64* This); -void __RPC_STUB IDebugApplication64_FCanJitDebug_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -WINBOOL STDMETHODCALLTYPE IDebugApplication64_FIsAutoJitDebugEnabled_Proxy( - IDebugApplication64* This); -void __RPC_STUB IDebugApplication64_FIsAutoJitDebugEnabled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication64_AddGlobalExpressionContextProvider_Proxy( - IDebugApplication64* This, - IProvideExpressionContexts *pdsfs, - DWORDLONG *pdwCookie); -void __RPC_STUB IDebugApplication64_AddGlobalExpressionContextProvider_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication64_RemoveGlobalExpressionContextProvider_Proxy( - IDebugApplication64* This, - DWORDLONG dwCookie); -void __RPC_STUB IDebugApplication64_RemoveGlobalExpressionContextProvider_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugApplication64_INTERFACE_DEFINED__ */ @@ -8202,58 +6904,59 @@ typedef struct IRemoteDebugApplicationEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IRemoteDebugApplicationEvents* This, + IRemoteDebugApplicationEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IRemoteDebugApplicationEvents* This); + IRemoteDebugApplicationEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - IRemoteDebugApplicationEvents* This); + IRemoteDebugApplicationEvents *This); /*** IRemoteDebugApplicationEvents methods ***/ HRESULT (STDMETHODCALLTYPE *OnConnectDebugger)( - IRemoteDebugApplicationEvents* This, + IRemoteDebugApplicationEvents *This, IApplicationDebugger *pad); HRESULT (STDMETHODCALLTYPE *OnDisconnectDebugger)( - IRemoteDebugApplicationEvents* This); + IRemoteDebugApplicationEvents *This); HRESULT (STDMETHODCALLTYPE *OnSetName)( - IRemoteDebugApplicationEvents* This, + IRemoteDebugApplicationEvents *This, LPCOLESTR pstrName); HRESULT (STDMETHODCALLTYPE *OnDebugOutput)( - IRemoteDebugApplicationEvents* This, + IRemoteDebugApplicationEvents *This, LPCOLESTR pstr); HRESULT (STDMETHODCALLTYPE *OnClose)( - IRemoteDebugApplicationEvents* This); + IRemoteDebugApplicationEvents *This); HRESULT (STDMETHODCALLTYPE *OnEnterBreakPoint)( - IRemoteDebugApplicationEvents* This, + IRemoteDebugApplicationEvents *This, IRemoteDebugApplicationThread *prdat); HRESULT (STDMETHODCALLTYPE *OnLeaveBreakPoint)( - IRemoteDebugApplicationEvents* This, + IRemoteDebugApplicationEvents *This, IRemoteDebugApplicationThread *prdat); HRESULT (STDMETHODCALLTYPE *OnCreateThread)( - IRemoteDebugApplicationEvents* This, + IRemoteDebugApplicationEvents *This, IRemoteDebugApplicationThread *prdat); HRESULT (STDMETHODCALLTYPE *OnDestroyThread)( - IRemoteDebugApplicationEvents* This, + IRemoteDebugApplicationEvents *This, IRemoteDebugApplicationThread *prdat); HRESULT (STDMETHODCALLTYPE *OnBreakFlagChange)( - IRemoteDebugApplicationEvents* This, + IRemoteDebugApplicationEvents *This, APPBREAKFLAGS abf, IRemoteDebugApplicationThread *prdatSteppingThread); END_INTERFACE } IRemoteDebugApplicationEventsVtbl; + interface IRemoteDebugApplicationEvents { CONST_VTBL IRemoteDebugApplicationEventsVtbl* lpVtbl; }; @@ -8322,85 +7025,6 @@ static FORCEINLINE HRESULT IRemoteDebugApplicationEvents_OnBreakFlagChange(IRemo #endif -HRESULT STDMETHODCALLTYPE IRemoteDebugApplicationEvents_OnConnectDebugger_Proxy( - IRemoteDebugApplicationEvents* This, - IApplicationDebugger *pad); -void __RPC_STUB IRemoteDebugApplicationEvents_OnConnectDebugger_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplicationEvents_OnDisconnectDebugger_Proxy( - IRemoteDebugApplicationEvents* This); -void __RPC_STUB IRemoteDebugApplicationEvents_OnDisconnectDebugger_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplicationEvents_OnSetName_Proxy( - IRemoteDebugApplicationEvents* This, - LPCOLESTR pstrName); -void __RPC_STUB IRemoteDebugApplicationEvents_OnSetName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplicationEvents_OnDebugOutput_Proxy( - IRemoteDebugApplicationEvents* This, - LPCOLESTR pstr); -void __RPC_STUB IRemoteDebugApplicationEvents_OnDebugOutput_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplicationEvents_OnClose_Proxy( - IRemoteDebugApplicationEvents* This); -void __RPC_STUB IRemoteDebugApplicationEvents_OnClose_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplicationEvents_OnEnterBreakPoint_Proxy( - IRemoteDebugApplicationEvents* This, - IRemoteDebugApplicationThread *prdat); -void __RPC_STUB IRemoteDebugApplicationEvents_OnEnterBreakPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplicationEvents_OnLeaveBreakPoint_Proxy( - IRemoteDebugApplicationEvents* This, - IRemoteDebugApplicationThread *prdat); -void __RPC_STUB IRemoteDebugApplicationEvents_OnLeaveBreakPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplicationEvents_OnCreateThread_Proxy( - IRemoteDebugApplicationEvents* This, - IRemoteDebugApplicationThread *prdat); -void __RPC_STUB IRemoteDebugApplicationEvents_OnCreateThread_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplicationEvents_OnDestroyThread_Proxy( - IRemoteDebugApplicationEvents* This, - IRemoteDebugApplicationThread *prdat); -void __RPC_STUB IRemoteDebugApplicationEvents_OnDestroyThread_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplicationEvents_OnBreakFlagChange_Proxy( - IRemoteDebugApplicationEvents* This, - APPBREAKFLAGS abf, - IRemoteDebugApplicationThread *prdatSteppingThread); -void __RPC_STUB IRemoteDebugApplicationEvents_OnBreakFlagChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IRemoteDebugApplicationEvents_INTERFACE_DEFINED__ */ @@ -8443,56 +7067,57 @@ typedef struct IDebugApplicationNodeVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugApplicationNode* This, + IDebugApplicationNode *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugApplicationNode* This); + IDebugApplicationNode *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugApplicationNode* This); + IDebugApplicationNode *This); /*** IDebugDocumentInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetName)( - IDebugApplicationNode* This, + IDebugApplicationNode *This, DOCUMENTNAMETYPE dnt, BSTR *pbstrName); HRESULT (STDMETHODCALLTYPE *GetDocumentClassId)( - IDebugApplicationNode* This, + IDebugApplicationNode *This, CLSID *pclsidDocument); /*** IDebugDocumentProvider methods ***/ HRESULT (STDMETHODCALLTYPE *GetDocument)( - IDebugApplicationNode* This, + IDebugApplicationNode *This, IDebugDocument **ppssd); /*** IDebugApplicationNode methods ***/ HRESULT (STDMETHODCALLTYPE *EnumChildren)( - IDebugApplicationNode* This, + IDebugApplicationNode *This, IEnumDebugApplicationNodes **pperddp); HRESULT (STDMETHODCALLTYPE *GetParent)( - IDebugApplicationNode* This, + IDebugApplicationNode *This, IDebugApplicationNode **pprddp); HRESULT (STDMETHODCALLTYPE *SetDocumentProvider)( - IDebugApplicationNode* This, + IDebugApplicationNode *This, IDebugDocumentProvider *pddp); HRESULT (STDMETHODCALLTYPE *Close)( - IDebugApplicationNode* This); + IDebugApplicationNode *This); HRESULT (STDMETHODCALLTYPE *Attach)( - IDebugApplicationNode* This, + IDebugApplicationNode *This, IDebugApplicationNode *pdanParent); HRESULT (STDMETHODCALLTYPE *Detach)( - IDebugApplicationNode* This); + IDebugApplicationNode *This); END_INTERFACE } IDebugApplicationNodeVtbl; + interface IDebugApplicationNode { CONST_VTBL IDebugApplicationNodeVtbl* lpVtbl; }; @@ -8561,52 +7186,6 @@ static FORCEINLINE HRESULT IDebugApplicationNode_Detach(IDebugApplicationNode* T #endif -HRESULT STDMETHODCALLTYPE IDebugApplicationNode_EnumChildren_Proxy( - IDebugApplicationNode* This, - IEnumDebugApplicationNodes **pperddp); -void __RPC_STUB IDebugApplicationNode_EnumChildren_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplicationNode_GetParent_Proxy( - IDebugApplicationNode* This, - IDebugApplicationNode **pprddp); -void __RPC_STUB IDebugApplicationNode_GetParent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplicationNode_SetDocumentProvider_Proxy( - IDebugApplicationNode* This, - IDebugDocumentProvider *pddp); -void __RPC_STUB IDebugApplicationNode_SetDocumentProvider_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplicationNode_Close_Proxy( - IDebugApplicationNode* This); -void __RPC_STUB IDebugApplicationNode_Close_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplicationNode_Attach_Proxy( - IDebugApplicationNode* This, - IDebugApplicationNode *pdanParent); -void __RPC_STUB IDebugApplicationNode_Attach_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplicationNode_Detach_Proxy( - IDebugApplicationNode* This); -void __RPC_STUB IDebugApplicationNode_Detach_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugApplicationNode_INTERFACE_DEFINED__ */ @@ -8643,34 +7222,35 @@ typedef struct IDebugApplicationNodeEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugApplicationNodeEvents* This, + IDebugApplicationNodeEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugApplicationNodeEvents* This); + IDebugApplicationNodeEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugApplicationNodeEvents* This); + IDebugApplicationNodeEvents *This); /*** IDebugApplicationNodeEvents methods ***/ HRESULT (STDMETHODCALLTYPE *onAddChild)( - IDebugApplicationNodeEvents* This, + IDebugApplicationNodeEvents *This, IDebugApplicationNode *prddpChild); HRESULT (STDMETHODCALLTYPE *onRemoveChild)( - IDebugApplicationNodeEvents* This, + IDebugApplicationNodeEvents *This, IDebugApplicationNode *prddpChild); HRESULT (STDMETHODCALLTYPE *onDetach)( - IDebugApplicationNodeEvents* This); + IDebugApplicationNodeEvents *This); HRESULT (STDMETHODCALLTYPE *onAttach)( - IDebugApplicationNodeEvents* This, + IDebugApplicationNodeEvents *This, IDebugApplicationNode *prddpParent); END_INTERFACE } IDebugApplicationNodeEventsVtbl; + interface IDebugApplicationNodeEvents { CONST_VTBL IDebugApplicationNodeEventsVtbl* lpVtbl; }; @@ -8715,37 +7295,6 @@ static FORCEINLINE HRESULT IDebugApplicationNodeEvents_onAttach(IDebugApplicatio #endif -HRESULT STDMETHODCALLTYPE IDebugApplicationNodeEvents_onAddChild_Proxy( - IDebugApplicationNodeEvents* This, - IDebugApplicationNode *prddpChild); -void __RPC_STUB IDebugApplicationNodeEvents_onAddChild_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplicationNodeEvents_onRemoveChild_Proxy( - IDebugApplicationNodeEvents* This, - IDebugApplicationNode *prddpChild); -void __RPC_STUB IDebugApplicationNodeEvents_onRemoveChild_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplicationNodeEvents_onDetach_Proxy( - IDebugApplicationNodeEvents* This); -void __RPC_STUB IDebugApplicationNodeEvents_onDetach_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplicationNodeEvents_onAttach_Proxy( - IDebugApplicationNodeEvents* This, - IDebugApplicationNode *prddpParent); -void __RPC_STUB IDebugApplicationNodeEvents_onAttach_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugApplicationNodeEvents_INTERFACE_DEFINED__ */ @@ -8760,25 +7309,25 @@ DEFINE_GUID(IID_AsyncIDebugApplicationNodeEvents, 0xa2e3aa3b, 0xaa8d, 0x4ebf, 0x MIDL_INTERFACE("a2e3aa3b-aa8d-4ebf-84cd-648b737b8c13") AsyncIDebugApplicationNodeEvents : public IUnknown { - virtual void STDMETHODCALLTYPE Begin_onAddChild( + virtual HRESULT STDMETHODCALLTYPE Begin_onAddChild( IDebugApplicationNode *prddpChild) = 0; virtual HRESULT STDMETHODCALLTYPE Finish_onAddChild( ) = 0; - virtual void STDMETHODCALLTYPE Begin_onRemoveChild( + virtual HRESULT STDMETHODCALLTYPE Begin_onRemoveChild( IDebugApplicationNode *prddpChild) = 0; virtual HRESULT STDMETHODCALLTYPE Finish_onRemoveChild( ) = 0; - virtual void STDMETHODCALLTYPE Begin_onDetach( + virtual HRESULT STDMETHODCALLTYPE Begin_onDetach( ) = 0; virtual HRESULT STDMETHODCALLTYPE Finish_onDetach( ) = 0; - virtual void STDMETHODCALLTYPE Begin_onAttach( + virtual HRESULT STDMETHODCALLTYPE Begin_onAttach( IDebugApplicationNode *prddpParent) = 0; virtual HRESULT STDMETHODCALLTYPE Finish_onAttach( @@ -8794,46 +7343,47 @@ typedef struct AsyncIDebugApplicationNodeEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - AsyncIDebugApplicationNodeEvents* This, + AsyncIDebugApplicationNodeEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - AsyncIDebugApplicationNodeEvents* This); + AsyncIDebugApplicationNodeEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - AsyncIDebugApplicationNodeEvents* This); + AsyncIDebugApplicationNodeEvents *This); - /*** IDebugApplicationNodeEvents methods ***/ - void (STDMETHODCALLTYPE *Begin_onAddChild)( - AsyncIDebugApplicationNodeEvents* This, + /*** AsyncIDebugApplicationNodeEvents methods ***/ + HRESULT (STDMETHODCALLTYPE *Begin_onAddChild)( + AsyncIDebugApplicationNodeEvents *This, IDebugApplicationNode *prddpChild); HRESULT (STDMETHODCALLTYPE *Finish_onAddChild)( - AsyncIDebugApplicationNodeEvents* This); + AsyncIDebugApplicationNodeEvents *This); - void (STDMETHODCALLTYPE *Begin_onRemoveChild)( - AsyncIDebugApplicationNodeEvents* This, + HRESULT (STDMETHODCALLTYPE *Begin_onRemoveChild)( + AsyncIDebugApplicationNodeEvents *This, IDebugApplicationNode *prddpChild); HRESULT (STDMETHODCALLTYPE *Finish_onRemoveChild)( - AsyncIDebugApplicationNodeEvents* This); + AsyncIDebugApplicationNodeEvents *This); - void (STDMETHODCALLTYPE *Begin_onDetach)( - AsyncIDebugApplicationNodeEvents* This); + HRESULT (STDMETHODCALLTYPE *Begin_onDetach)( + AsyncIDebugApplicationNodeEvents *This); HRESULT (STDMETHODCALLTYPE *Finish_onDetach)( - AsyncIDebugApplicationNodeEvents* This); + AsyncIDebugApplicationNodeEvents *This); - void (STDMETHODCALLTYPE *Begin_onAttach)( - AsyncIDebugApplicationNodeEvents* This, + HRESULT (STDMETHODCALLTYPE *Begin_onAttach)( + AsyncIDebugApplicationNodeEvents *This, IDebugApplicationNode *prddpParent); HRESULT (STDMETHODCALLTYPE *Finish_onAttach)( - AsyncIDebugApplicationNodeEvents* This); + AsyncIDebugApplicationNodeEvents *This); END_INTERFACE } AsyncIDebugApplicationNodeEventsVtbl; + interface AsyncIDebugApplicationNodeEvents { CONST_VTBL AsyncIDebugApplicationNodeEventsVtbl* lpVtbl; }; @@ -8844,7 +7394,7 @@ interface AsyncIDebugApplicationNodeEvents { #define AsyncIDebugApplicationNodeEvents_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) #define AsyncIDebugApplicationNodeEvents_AddRef(This) (This)->lpVtbl->AddRef(This) #define AsyncIDebugApplicationNodeEvents_Release(This) (This)->lpVtbl->Release(This) -/*** IDebugApplicationNodeEvents methods ***/ +/*** AsyncIDebugApplicationNodeEvents methods ***/ #define AsyncIDebugApplicationNodeEvents_Begin_onAddChild(This,prddpChild) (This)->lpVtbl->Begin_onAddChild(This,prddpChild) #define AsyncIDebugApplicationNodeEvents_Finish_onAddChild(This) (This)->lpVtbl->Finish_onAddChild(This) #define AsyncIDebugApplicationNodeEvents_Begin_onRemoveChild(This,prddpChild) (This)->lpVtbl->Begin_onRemoveChild(This,prddpChild) @@ -8864,29 +7414,29 @@ static FORCEINLINE ULONG AsyncIDebugApplicationNodeEvents_AddRef(AsyncIDebugAppl static FORCEINLINE ULONG AsyncIDebugApplicationNodeEvents_Release(AsyncIDebugApplicationNodeEvents* This) { return This->lpVtbl->Release(This); } -/*** IDebugApplicationNodeEvents methods ***/ -static FORCEINLINE void Begin_AsyncIDebugApplicationNodeEvents_onAddChild(AsyncIDebugApplicationNodeEvents* This,IDebugApplicationNode *prddpChild) { - This->lpVtbl->Begin_onAddChild(This,prddpChild); +/*** AsyncIDebugApplicationNodeEvents methods ***/ +static FORCEINLINE HRESULT AsyncIDebugApplicationNodeEvents_Begin_onAddChild(AsyncIDebugApplicationNodeEvents* This,IDebugApplicationNode *prddpChild) { + return This->lpVtbl->Begin_onAddChild(This,prddpChild); } -static FORCEINLINE HRESULT Finish_AsyncIDebugApplicationNodeEvents_onAddChild(AsyncIDebugApplicationNodeEvents* This) { +static FORCEINLINE HRESULT AsyncIDebugApplicationNodeEvents_Finish_onAddChild(AsyncIDebugApplicationNodeEvents* This) { return This->lpVtbl->Finish_onAddChild(This); } -static FORCEINLINE void Begin_AsyncIDebugApplicationNodeEvents_onRemoveChild(AsyncIDebugApplicationNodeEvents* This,IDebugApplicationNode *prddpChild) { - This->lpVtbl->Begin_onRemoveChild(This,prddpChild); +static FORCEINLINE HRESULT AsyncIDebugApplicationNodeEvents_Begin_onRemoveChild(AsyncIDebugApplicationNodeEvents* This,IDebugApplicationNode *prddpChild) { + return This->lpVtbl->Begin_onRemoveChild(This,prddpChild); } -static FORCEINLINE HRESULT Finish_AsyncIDebugApplicationNodeEvents_onRemoveChild(AsyncIDebugApplicationNodeEvents* This) { +static FORCEINLINE HRESULT AsyncIDebugApplicationNodeEvents_Finish_onRemoveChild(AsyncIDebugApplicationNodeEvents* This) { return This->lpVtbl->Finish_onRemoveChild(This); } -static FORCEINLINE void Begin_AsyncIDebugApplicationNodeEvents_onDetach(AsyncIDebugApplicationNodeEvents* This) { - This->lpVtbl->Begin_onDetach(This); +static FORCEINLINE HRESULT AsyncIDebugApplicationNodeEvents_Begin_onDetach(AsyncIDebugApplicationNodeEvents* This) { + return This->lpVtbl->Begin_onDetach(This); } -static FORCEINLINE HRESULT Finish_AsyncIDebugApplicationNodeEvents_onDetach(AsyncIDebugApplicationNodeEvents* This) { +static FORCEINLINE HRESULT AsyncIDebugApplicationNodeEvents_Finish_onDetach(AsyncIDebugApplicationNodeEvents* This) { return This->lpVtbl->Finish_onDetach(This); } -static FORCEINLINE void Begin_AsyncIDebugApplicationNodeEvents_onAttach(AsyncIDebugApplicationNodeEvents* This,IDebugApplicationNode *prddpParent) { - This->lpVtbl->Begin_onAttach(This,prddpParent); +static FORCEINLINE HRESULT AsyncIDebugApplicationNodeEvents_Begin_onAttach(AsyncIDebugApplicationNodeEvents* This,IDebugApplicationNode *prddpParent) { + return This->lpVtbl->Begin_onAttach(This,prddpParent); } -static FORCEINLINE HRESULT Finish_AsyncIDebugApplicationNodeEvents_onAttach(AsyncIDebugApplicationNodeEvents* This) { +static FORCEINLINE HRESULT AsyncIDebugApplicationNodeEvents_Finish_onAttach(AsyncIDebugApplicationNodeEvents* This) { return This->lpVtbl->Finish_onAttach(This); } #endif @@ -8894,68 +7444,6 @@ static FORCEINLINE HRESULT Finish_AsyncIDebugApplicationNodeEvents_onAttach(Asyn #endif -HRESULT STDMETHODCALLTYPE AsyncIDebugApplicationNodeEvents_Begin_onAddChild_Proxy( - IDebugApplicationNodeEvents* This, - IDebugApplicationNode *prddpChild); -void __RPC_STUB AsyncIDebugApplicationNodeEvents_Begin_onAddChild_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE AsyncIDebugApplicationNodeEvents_Finish_onAddChild_Proxy( - IDebugApplicationNodeEvents* This, - IDebugApplicationNode *prddpChild); -void __RPC_STUB AsyncIDebugApplicationNodeEvents_Finish_onAddChild_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE AsyncIDebugApplicationNodeEvents_Begin_onRemoveChild_Proxy( - IDebugApplicationNodeEvents* This, - IDebugApplicationNode *prddpChild); -void __RPC_STUB AsyncIDebugApplicationNodeEvents_Begin_onRemoveChild_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE AsyncIDebugApplicationNodeEvents_Finish_onRemoveChild_Proxy( - IDebugApplicationNodeEvents* This, - IDebugApplicationNode *prddpChild); -void __RPC_STUB AsyncIDebugApplicationNodeEvents_Finish_onRemoveChild_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE AsyncIDebugApplicationNodeEvents_Begin_onDetach_Proxy( - IDebugApplicationNodeEvents* This); -void __RPC_STUB AsyncIDebugApplicationNodeEvents_Begin_onDetach_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE AsyncIDebugApplicationNodeEvents_Finish_onDetach_Proxy( - IDebugApplicationNodeEvents* This); -void __RPC_STUB AsyncIDebugApplicationNodeEvents_Finish_onDetach_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE AsyncIDebugApplicationNodeEvents_Begin_onAttach_Proxy( - IDebugApplicationNodeEvents* This, - IDebugApplicationNode *prddpParent); -void __RPC_STUB AsyncIDebugApplicationNodeEvents_Begin_onAttach_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE AsyncIDebugApplicationNodeEvents_Finish_onAttach_Proxy( - IDebugApplicationNodeEvents* This, - IDebugApplicationNode *prddpParent); -void __RPC_STUB AsyncIDebugApplicationNodeEvents_Finish_onAttach_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __AsyncIDebugApplicationNodeEvents_INTERFACE_DEFINED__ */ @@ -8985,25 +7473,26 @@ typedef struct IDebugThreadCall32Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugThreadCall32* This, + IDebugThreadCall32 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugThreadCall32* This); + IDebugThreadCall32 *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugThreadCall32* This); + IDebugThreadCall32 *This); /*** IDebugThreadCall32 methods ***/ HRESULT (STDMETHODCALLTYPE *ThreadCallHandler)( - IDebugThreadCall32* This, + IDebugThreadCall32 *This, DWORD dwParam1, DWORD dwParam2, DWORD dwParam3); END_INTERFACE } IDebugThreadCall32Vtbl; + interface IDebugThreadCall32 { CONST_VTBL IDebugThreadCall32Vtbl* lpVtbl; }; @@ -9036,16 +7525,6 @@ static FORCEINLINE HRESULT IDebugThreadCall32_ThreadCallHandler(IDebugThreadCall #endif -HRESULT STDMETHODCALLTYPE IDebugThreadCall32_ThreadCallHandler_Proxy( - IDebugThreadCall32* This, - DWORD dwParam1, - DWORD dwParam2, - DWORD dwParam3); -void __RPC_STUB IDebugThreadCall32_ThreadCallHandler_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugThreadCall32_INTERFACE_DEFINED__ */ @@ -9075,25 +7554,26 @@ typedef struct IDebugThreadCall64Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugThreadCall64* This, + IDebugThreadCall64 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugThreadCall64* This); + IDebugThreadCall64 *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugThreadCall64* This); + IDebugThreadCall64 *This); /*** IDebugThreadCall64 methods ***/ HRESULT (STDMETHODCALLTYPE *ThreadCallHandler)( - IDebugThreadCall64* This, + IDebugThreadCall64 *This, DWORDLONG dwParam1, DWORDLONG dwParam2, DWORDLONG dwParam3); END_INTERFACE } IDebugThreadCall64Vtbl; + interface IDebugThreadCall64 { CONST_VTBL IDebugThreadCall64Vtbl* lpVtbl; }; @@ -9126,16 +7606,6 @@ static FORCEINLINE HRESULT IDebugThreadCall64_ThreadCallHandler(IDebugThreadCall #endif -HRESULT STDMETHODCALLTYPE IDebugThreadCall64_ThreadCallHandler_Proxy( - IDebugThreadCall64* This, - DWORDLONG dwParam1, - DWORDLONG dwParam2, - DWORDLONG dwParam3); -void __RPC_STUB IDebugThreadCall64_ThreadCallHandler_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugThreadCall64_INTERFACE_DEFINED__ */ @@ -9198,57 +7668,58 @@ typedef struct IRemoteDebugApplicationThreadVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IRemoteDebugApplicationThread* This, + IRemoteDebugApplicationThread *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IRemoteDebugApplicationThread* This); + IRemoteDebugApplicationThread *This); ULONG (STDMETHODCALLTYPE *Release)( - IRemoteDebugApplicationThread* This); + IRemoteDebugApplicationThread *This); /*** IRemoteDebugApplicationThread methods ***/ HRESULT (STDMETHODCALLTYPE *GetSystemThreadId)( - IRemoteDebugApplicationThread* This, + IRemoteDebugApplicationThread *This, DWORD *dwThreadId); HRESULT (STDMETHODCALLTYPE *GetApplication)( - IRemoteDebugApplicationThread* This, + IRemoteDebugApplicationThread *This, IRemoteDebugApplication **pprda); HRESULT (STDMETHODCALLTYPE *EnumStackFrames)( - IRemoteDebugApplicationThread* This, + IRemoteDebugApplicationThread *This, IEnumDebugStackFrames **ppedsf); HRESULT (STDMETHODCALLTYPE *GetDescription)( - IRemoteDebugApplicationThread* This, + IRemoteDebugApplicationThread *This, BSTR *pbstrDescription, BSTR *pbstrState); HRESULT (STDMETHODCALLTYPE *SetNextStatement)( - IRemoteDebugApplicationThread* This, + IRemoteDebugApplicationThread *This, IDebugStackFrame *pStackFrame, IDebugCodeContext *pCodeContext); HRESULT (STDMETHODCALLTYPE *GetState)( - IRemoteDebugApplicationThread* This, + IRemoteDebugApplicationThread *This, DWORD *pState); HRESULT (STDMETHODCALLTYPE *Suspend)( - IRemoteDebugApplicationThread* This, + IRemoteDebugApplicationThread *This, DWORD *pdwCount); HRESULT (STDMETHODCALLTYPE *Resume)( - IRemoteDebugApplicationThread* This, + IRemoteDebugApplicationThread *This, DWORD *pdwCount); HRESULT (STDMETHODCALLTYPE *GetSuspendCount)( - IRemoteDebugApplicationThread* This, + IRemoteDebugApplicationThread *This, DWORD *pdwCount); END_INTERFACE } IRemoteDebugApplicationThreadVtbl; + interface IRemoteDebugApplicationThread { CONST_VTBL IRemoteDebugApplicationThreadVtbl* lpVtbl; }; @@ -9313,80 +7784,6 @@ static FORCEINLINE HRESULT IRemoteDebugApplicationThread_GetSuspendCount(IRemote #endif -HRESULT STDMETHODCALLTYPE IRemoteDebugApplicationThread_GetSystemThreadId_Proxy( - IRemoteDebugApplicationThread* This, - DWORD *dwThreadId); -void __RPC_STUB IRemoteDebugApplicationThread_GetSystemThreadId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplicationThread_GetApplication_Proxy( - IRemoteDebugApplicationThread* This, - IRemoteDebugApplication **pprda); -void __RPC_STUB IRemoteDebugApplicationThread_GetApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplicationThread_EnumStackFrames_Proxy( - IRemoteDebugApplicationThread* This, - IEnumDebugStackFrames **ppedsf); -void __RPC_STUB IRemoteDebugApplicationThread_EnumStackFrames_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplicationThread_GetDescription_Proxy( - IRemoteDebugApplicationThread* This, - BSTR *pbstrDescription, - BSTR *pbstrState); -void __RPC_STUB IRemoteDebugApplicationThread_GetDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplicationThread_SetNextStatement_Proxy( - IRemoteDebugApplicationThread* This, - IDebugStackFrame *pStackFrame, - IDebugCodeContext *pCodeContext); -void __RPC_STUB IRemoteDebugApplicationThread_SetNextStatement_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplicationThread_GetState_Proxy( - IRemoteDebugApplicationThread* This, - DWORD *pState); -void __RPC_STUB IRemoteDebugApplicationThread_GetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplicationThread_Suspend_Proxy( - IRemoteDebugApplicationThread* This, - DWORD *pdwCount); -void __RPC_STUB IRemoteDebugApplicationThread_Suspend_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplicationThread_Resume_Proxy( - IRemoteDebugApplicationThread* This, - DWORD *pdwCount); -void __RPC_STUB IRemoteDebugApplicationThread_Resume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplicationThread_GetSuspendCount_Proxy( - IRemoteDebugApplicationThread* This, - DWORD *pdwCount); -void __RPC_STUB IRemoteDebugApplicationThread_GetSuspendCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IRemoteDebugApplicationThread_INTERFACE_DEFINED__ */ @@ -9429,79 +7826,80 @@ typedef struct IDebugApplicationThreadVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugApplicationThread* This, + IDebugApplicationThread *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugApplicationThread* This); + IDebugApplicationThread *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugApplicationThread* This); + IDebugApplicationThread *This); /*** IRemoteDebugApplicationThread methods ***/ HRESULT (STDMETHODCALLTYPE *GetSystemThreadId)( - IDebugApplicationThread* This, + IDebugApplicationThread *This, DWORD *dwThreadId); HRESULT (STDMETHODCALLTYPE *GetApplication)( - IDebugApplicationThread* This, + IDebugApplicationThread *This, IRemoteDebugApplication **pprda); HRESULT (STDMETHODCALLTYPE *EnumStackFrames)( - IDebugApplicationThread* This, + IDebugApplicationThread *This, IEnumDebugStackFrames **ppedsf); HRESULT (STDMETHODCALLTYPE *GetDescription)( - IDebugApplicationThread* This, + IDebugApplicationThread *This, BSTR *pbstrDescription, BSTR *pbstrState); HRESULT (STDMETHODCALLTYPE *SetNextStatement)( - IDebugApplicationThread* This, + IDebugApplicationThread *This, IDebugStackFrame *pStackFrame, IDebugCodeContext *pCodeContext); HRESULT (STDMETHODCALLTYPE *GetState)( - IDebugApplicationThread* This, + IDebugApplicationThread *This, DWORD *pState); HRESULT (STDMETHODCALLTYPE *Suspend)( - IDebugApplicationThread* This, + IDebugApplicationThread *This, DWORD *pdwCount); HRESULT (STDMETHODCALLTYPE *Resume)( - IDebugApplicationThread* This, + IDebugApplicationThread *This, DWORD *pdwCount); HRESULT (STDMETHODCALLTYPE *GetSuspendCount)( - IDebugApplicationThread* This, + IDebugApplicationThread *This, DWORD *pdwCount); /*** IDebugApplicationThread methods ***/ HRESULT (STDMETHODCALLTYPE *SynchronousCallIntoThread32)( - IDebugApplicationThread* This, + IDebugApplicationThread *This, IDebugThreadCall32 *pstcb, DWORD dwParam1, DWORD dwParam2, DWORD dwParam3); HRESULT (STDMETHODCALLTYPE *QueryIsCurrentThread)( - IDebugApplicationThread* This); + IDebugApplicationThread *This); HRESULT (STDMETHODCALLTYPE *QueryIsDebuggerThread)( - IDebugApplicationThread* This); + IDebugApplicationThread *This); HRESULT (STDMETHODCALLTYPE *SetDescription)( - IDebugApplicationThread* This, + IDebugApplicationThread *This, LPCOLESTR pstrDescription); HRESULT (STDMETHODCALLTYPE *SetStateString)( - IDebugApplicationThread* This, + IDebugApplicationThread *This, LPCOLESTR pstrState); END_INTERFACE } IDebugApplicationThreadVtbl; + interface IDebugApplicationThread { CONST_VTBL IDebugApplicationThreadVtbl* lpVtbl; }; @@ -9588,47 +7986,6 @@ static FORCEINLINE HRESULT IDebugApplicationThread_SetStateString(IDebugApplicat #endif -HRESULT STDMETHODCALLTYPE IDebugApplicationThread_SynchronousCallIntoThread32_Proxy( - IDebugApplicationThread* This, - IDebugThreadCall32 *pstcb, - DWORD dwParam1, - DWORD dwParam2, - DWORD dwParam3); -void __RPC_STUB IDebugApplicationThread_SynchronousCallIntoThread32_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplicationThread_QueryIsCurrentThread_Proxy( - IDebugApplicationThread* This); -void __RPC_STUB IDebugApplicationThread_QueryIsCurrentThread_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplicationThread_QueryIsDebuggerThread_Proxy( - IDebugApplicationThread* This); -void __RPC_STUB IDebugApplicationThread_QueryIsDebuggerThread_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplicationThread_SetDescription_Proxy( - IDebugApplicationThread* This, - LPCOLESTR pstrDescription); -void __RPC_STUB IDebugApplicationThread_SetDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplicationThread_SetStateString_Proxy( - IDebugApplicationThread* This, - LPCOLESTR pstrState); -void __RPC_STUB IDebugApplicationThread_SetStateString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugApplicationThread_INTERFACE_DEFINED__ */ @@ -9659,80 +8016,80 @@ typedef struct IDebugApplicationThread64Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugApplicationThread64* This, + IDebugApplicationThread64 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugApplicationThread64* This); + IDebugApplicationThread64 *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugApplicationThread64* This); + IDebugApplicationThread64 *This); /*** IRemoteDebugApplicationThread methods ***/ HRESULT (STDMETHODCALLTYPE *GetSystemThreadId)( - IDebugApplicationThread64* This, + IDebugApplicationThread64 *This, DWORD *dwThreadId); HRESULT (STDMETHODCALLTYPE *GetApplication)( - IDebugApplicationThread64* This, + IDebugApplicationThread64 *This, IRemoteDebugApplication **pprda); HRESULT (STDMETHODCALLTYPE *EnumStackFrames)( - IDebugApplicationThread64* This, + IDebugApplicationThread64 *This, IEnumDebugStackFrames **ppedsf); HRESULT (STDMETHODCALLTYPE *GetDescription)( - IDebugApplicationThread64* This, + IDebugApplicationThread64 *This, BSTR *pbstrDescription, BSTR *pbstrState); HRESULT (STDMETHODCALLTYPE *SetNextStatement)( - IDebugApplicationThread64* This, + IDebugApplicationThread64 *This, IDebugStackFrame *pStackFrame, IDebugCodeContext *pCodeContext); HRESULT (STDMETHODCALLTYPE *GetState)( - IDebugApplicationThread64* This, + IDebugApplicationThread64 *This, DWORD *pState); HRESULT (STDMETHODCALLTYPE *Suspend)( - IDebugApplicationThread64* This, + IDebugApplicationThread64 *This, DWORD *pdwCount); HRESULT (STDMETHODCALLTYPE *Resume)( - IDebugApplicationThread64* This, + IDebugApplicationThread64 *This, DWORD *pdwCount); HRESULT (STDMETHODCALLTYPE *GetSuspendCount)( - IDebugApplicationThread64* This, + IDebugApplicationThread64 *This, DWORD *pdwCount); /*** IDebugApplicationThread methods ***/ HRESULT (STDMETHODCALLTYPE *SynchronousCallIntoThread32)( - IDebugApplicationThread64* This, + IDebugApplicationThread64 *This, IDebugThreadCall32 *pstcb, DWORD dwParam1, DWORD dwParam2, DWORD dwParam3); HRESULT (STDMETHODCALLTYPE *QueryIsCurrentThread)( - IDebugApplicationThread64* This); + IDebugApplicationThread64 *This); HRESULT (STDMETHODCALLTYPE *QueryIsDebuggerThread)( - IDebugApplicationThread64* This); + IDebugApplicationThread64 *This); HRESULT (STDMETHODCALLTYPE *SetDescription)( - IDebugApplicationThread64* This, + IDebugApplicationThread64 *This, LPCOLESTR pstrDescription); HRESULT (STDMETHODCALLTYPE *SetStateString)( - IDebugApplicationThread64* This, + IDebugApplicationThread64 *This, LPCOLESTR pstrState); /*** IDebugApplicationThread64 methods ***/ HRESULT (STDMETHODCALLTYPE *SynchronousCallIntoThread64)( - IDebugApplicationThread64* This, + IDebugApplicationThread64 *This, IDebugThreadCall64 *pstcb, DWORDLONG dwParam1, DWORDLONG dwParam2, @@ -9740,6 +8097,7 @@ typedef struct IDebugApplicationThread64Vtbl { END_INTERFACE } IDebugApplicationThread64Vtbl; + interface IDebugApplicationThread64 { CONST_VTBL IDebugApplicationThread64Vtbl* lpVtbl; }; @@ -9832,17 +8190,6 @@ static FORCEINLINE HRESULT IDebugApplicationThread64_SynchronousCallIntoThread64 #endif -HRESULT STDMETHODCALLTYPE IDebugApplicationThread64_SynchronousCallIntoThread64_Proxy( - IDebugApplicationThread64* This, - IDebugThreadCall64 *pstcb, - DWORDLONG dwParam1, - DWORDLONG dwParam2, - DWORDLONG dwParam3); -void __RPC_STUB IDebugApplicationThread64_SynchronousCallIntoThread64_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugApplicationThread64_INTERFACE_DEFINED__ */ @@ -9870,23 +8217,24 @@ typedef struct IDebugCookieVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugCookie* This, + IDebugCookie *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugCookie* This); + IDebugCookie *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugCookie* This); + IDebugCookie *This); /*** IDebugCookie methods ***/ HRESULT (STDMETHODCALLTYPE *SetDebugCookie)( - IDebugCookie* This, + IDebugCookie *This, DWORD dwDebugAppCookie); END_INTERFACE } IDebugCookieVtbl; + interface IDebugCookie { CONST_VTBL IDebugCookieVtbl* lpVtbl; }; @@ -9919,14 +8267,6 @@ static FORCEINLINE HRESULT IDebugCookie_SetDebugCookie(IDebugCookie* This,DWORD #endif -HRESULT STDMETHODCALLTYPE IDebugCookie_SetDebugCookie_Proxy( - IDebugCookie* This, - DWORD dwDebugAppCookie); -void __RPC_STUB IDebugCookie_SetDebugCookie_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugCookie_INTERFACE_DEFINED__ */ @@ -9965,36 +8305,37 @@ typedef struct IEnumDebugApplicationNodesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumDebugApplicationNodes* This, + IEnumDebugApplicationNodes *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumDebugApplicationNodes* This); + IEnumDebugApplicationNodes *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumDebugApplicationNodes* This); + IEnumDebugApplicationNodes *This); /*** IEnumDebugApplicationNodes methods ***/ HRESULT (__stdcall *Next)( - IEnumDebugApplicationNodes* This, + IEnumDebugApplicationNodes *This, ULONG celt, IDebugApplicationNode **pprddp, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumDebugApplicationNodes* This, + IEnumDebugApplicationNodes *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumDebugApplicationNodes* This); + IEnumDebugApplicationNodes *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumDebugApplicationNodes* This, + IEnumDebugApplicationNodes *This, IEnumDebugApplicationNodes **pperddp); END_INTERFACE } IEnumDebugApplicationNodesVtbl; + interface IEnumDebugApplicationNodes { CONST_VTBL IEnumDebugApplicationNodesVtbl* lpVtbl; }; @@ -10049,29 +8390,6 @@ void __RPC_STUB IEnumDebugApplicationNodes_RemoteNext_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDebugApplicationNodes_Skip_Proxy( - IEnumDebugApplicationNodes* This, - ULONG celt); -void __RPC_STUB IEnumDebugApplicationNodes_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDebugApplicationNodes_Reset_Proxy( - IEnumDebugApplicationNodes* This); -void __RPC_STUB IEnumDebugApplicationNodes_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDebugApplicationNodes_Clone_Proxy( - IEnumDebugApplicationNodes* This, - IEnumDebugApplicationNodes **pperddp); -void __RPC_STUB IEnumDebugApplicationNodes_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IEnumDebugApplicationNodes_Next_Proxy( IEnumDebugApplicationNodes* This, ULONG celt, @@ -10120,36 +8438,37 @@ typedef struct IEnumRemoteDebugApplicationsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumRemoteDebugApplications* This, + IEnumRemoteDebugApplications *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumRemoteDebugApplications* This); + IEnumRemoteDebugApplications *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumRemoteDebugApplications* This); + IEnumRemoteDebugApplications *This); /*** IEnumRemoteDebugApplications methods ***/ HRESULT (__stdcall *Next)( - IEnumRemoteDebugApplications* This, + IEnumRemoteDebugApplications *This, ULONG celt, IRemoteDebugApplication **ppda, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumRemoteDebugApplications* This, + IEnumRemoteDebugApplications *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumRemoteDebugApplications* This); + IEnumRemoteDebugApplications *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumRemoteDebugApplications* This, + IEnumRemoteDebugApplications *This, IEnumRemoteDebugApplications **ppessd); END_INTERFACE } IEnumRemoteDebugApplicationsVtbl; + interface IEnumRemoteDebugApplications { CONST_VTBL IEnumRemoteDebugApplicationsVtbl* lpVtbl; }; @@ -10204,29 +8523,6 @@ void __RPC_STUB IEnumRemoteDebugApplications_RemoteNext_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumRemoteDebugApplications_Skip_Proxy( - IEnumRemoteDebugApplications* This, - ULONG celt); -void __RPC_STUB IEnumRemoteDebugApplications_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumRemoteDebugApplications_Reset_Proxy( - IEnumRemoteDebugApplications* This); -void __RPC_STUB IEnumRemoteDebugApplications_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumRemoteDebugApplications_Clone_Proxy( - IEnumRemoteDebugApplications* This, - IEnumRemoteDebugApplications **ppessd); -void __RPC_STUB IEnumRemoteDebugApplications_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IEnumRemoteDebugApplications_Next_Proxy( IEnumRemoteDebugApplications* This, ULONG celt, @@ -10275,36 +8571,37 @@ typedef struct IEnumRemoteDebugApplicationThreadsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumRemoteDebugApplicationThreads* This, + IEnumRemoteDebugApplicationThreads *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumRemoteDebugApplicationThreads* This); + IEnumRemoteDebugApplicationThreads *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumRemoteDebugApplicationThreads* This); + IEnumRemoteDebugApplicationThreads *This); /*** IEnumRemoteDebugApplicationThreads methods ***/ HRESULT (__stdcall *Next)( - IEnumRemoteDebugApplicationThreads* This, + IEnumRemoteDebugApplicationThreads *This, ULONG celt, IRemoteDebugApplicationThread **pprdat, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumRemoteDebugApplicationThreads* This, + IEnumRemoteDebugApplicationThreads *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumRemoteDebugApplicationThreads* This); + IEnumRemoteDebugApplicationThreads *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumRemoteDebugApplicationThreads* This, + IEnumRemoteDebugApplicationThreads *This, IEnumRemoteDebugApplicationThreads **pperdat); END_INTERFACE } IEnumRemoteDebugApplicationThreadsVtbl; + interface IEnumRemoteDebugApplicationThreads { CONST_VTBL IEnumRemoteDebugApplicationThreadsVtbl* lpVtbl; }; @@ -10359,29 +8656,6 @@ void __RPC_STUB IEnumRemoteDebugApplicationThreads_RemoteNext_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumRemoteDebugApplicationThreads_Skip_Proxy( - IEnumRemoteDebugApplicationThreads* This, - ULONG celt); -void __RPC_STUB IEnumRemoteDebugApplicationThreads_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumRemoteDebugApplicationThreads_Reset_Proxy( - IEnumRemoteDebugApplicationThreads* This); -void __RPC_STUB IEnumRemoteDebugApplicationThreads_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumRemoteDebugApplicationThreads_Clone_Proxy( - IEnumRemoteDebugApplicationThreads* This, - IEnumRemoteDebugApplicationThreads **pperdat); -void __RPC_STUB IEnumRemoteDebugApplicationThreads_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IEnumRemoteDebugApplicationThreads_Next_Proxy( IEnumRemoteDebugApplicationThreads* This, ULONG celt, @@ -10430,36 +8704,37 @@ typedef struct IDebugFormatterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugFormatter* This, + IDebugFormatter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugFormatter* This); + IDebugFormatter *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugFormatter* This); + IDebugFormatter *This); /*** IDebugFormatter methods ***/ HRESULT (STDMETHODCALLTYPE *GetStringForVariant)( - IDebugFormatter* This, + IDebugFormatter *This, VARIANT *pvar, ULONG nRadix, BSTR *pbstrValue); HRESULT (STDMETHODCALLTYPE *GetVariantForString)( - IDebugFormatter* This, + IDebugFormatter *This, LPCOLESTR pwstrValue, VARIANT *pvar); HRESULT (STDMETHODCALLTYPE *GetStringForVarType)( - IDebugFormatter* This, + IDebugFormatter *This, VARTYPE vt, TYPEDESC *ptdescArrayType, BSTR *pbstr); END_INTERFACE } IDebugFormatterVtbl; + interface IDebugFormatter { CONST_VTBL IDebugFormatterVtbl* lpVtbl; }; @@ -10500,35 +8775,6 @@ static FORCEINLINE HRESULT IDebugFormatter_GetStringForVarType(IDebugFormatter* #endif -HRESULT STDMETHODCALLTYPE IDebugFormatter_GetStringForVariant_Proxy( - IDebugFormatter* This, - VARIANT *pvar, - ULONG nRadix, - BSTR *pbstrValue); -void __RPC_STUB IDebugFormatter_GetStringForVariant_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugFormatter_GetVariantForString_Proxy( - IDebugFormatter* This, - LPCOLESTR pwstrValue, - VARIANT *pvar); -void __RPC_STUB IDebugFormatter_GetVariantForString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugFormatter_GetStringForVarType_Proxy( - IDebugFormatter* This, - VARTYPE vt, - TYPEDESC *ptdescArrayType, - BSTR *pbstr); -void __RPC_STUB IDebugFormatter_GetStringForVarType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugFormatter_INTERFACE_DEFINED__ */ @@ -10570,23 +8816,23 @@ typedef struct ISimpleConnectionPointVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISimpleConnectionPoint* This, + ISimpleConnectionPoint *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISimpleConnectionPoint* This); + ISimpleConnectionPoint *This); ULONG (STDMETHODCALLTYPE *Release)( - ISimpleConnectionPoint* This); + ISimpleConnectionPoint *This); /*** ISimpleConnectionPoint methods ***/ HRESULT (STDMETHODCALLTYPE *GetEventCount)( - ISimpleConnectionPoint* This, + ISimpleConnectionPoint *This, ULONG *pulCount); HRESULT (STDMETHODCALLTYPE *DescribeEvents)( - ISimpleConnectionPoint* This, + ISimpleConnectionPoint *This, ULONG iEvent, ULONG cEvents, DISPID *prgid, @@ -10594,16 +8840,17 @@ typedef struct ISimpleConnectionPointVtbl { ULONG *pcEventsFetched); HRESULT (STDMETHODCALLTYPE *Advise)( - ISimpleConnectionPoint* This, + ISimpleConnectionPoint *This, IDispatch *pdisp, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *Unadvise)( - ISimpleConnectionPoint* This, + ISimpleConnectionPoint *This, DWORD dwCookie); END_INTERFACE } ISimpleConnectionPointVtbl; + interface ISimpleConnectionPoint { CONST_VTBL ISimpleConnectionPointVtbl* lpVtbl; }; @@ -10648,43 +8895,6 @@ static FORCEINLINE HRESULT ISimpleConnectionPoint_Unadvise(ISimpleConnectionPoin #endif -HRESULT STDMETHODCALLTYPE ISimpleConnectionPoint_GetEventCount_Proxy( - ISimpleConnectionPoint* This, - ULONG *pulCount); -void __RPC_STUB ISimpleConnectionPoint_GetEventCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISimpleConnectionPoint_DescribeEvents_Proxy( - ISimpleConnectionPoint* This, - ULONG iEvent, - ULONG cEvents, - DISPID *prgid, - BSTR *prgbstr, - ULONG *pcEventsFetched); -void __RPC_STUB ISimpleConnectionPoint_DescribeEvents_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISimpleConnectionPoint_Advise_Proxy( - ISimpleConnectionPoint* This, - IDispatch *pdisp, - DWORD *pdwCookie); -void __RPC_STUB ISimpleConnectionPoint_Advise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISimpleConnectionPoint_Unadvise_Proxy( - ISimpleConnectionPoint* This, - DWORD dwCookie); -void __RPC_STUB ISimpleConnectionPoint_Unadvise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISimpleConnectionPoint_INTERFACE_DEFINED__ */ @@ -10726,26 +8936,26 @@ typedef struct IDebugHelperVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugHelper* This, + IDebugHelper *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugHelper* This); + IDebugHelper *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugHelper* This); + IDebugHelper *This); /*** IDebugHelper methods ***/ HRESULT (STDMETHODCALLTYPE *CreatePropertyBrowser)( - IDebugHelper* This, + IDebugHelper *This, VARIANT *pvar, LPCOLESTR bstrName, IDebugApplicationThread *pdat, IDebugProperty **ppdob); HRESULT (STDMETHODCALLTYPE *CreatePropertyBrowserEx)( - IDebugHelper* This, + IDebugHelper *This, VARIANT *pvar, LPCOLESTR bstrName, IDebugApplicationThread *pdat, @@ -10753,12 +8963,13 @@ typedef struct IDebugHelperVtbl { IDebugProperty **ppdob); HRESULT (STDMETHODCALLTYPE *CreateSimpleConnectionPoint)( - IDebugHelper* This, + IDebugHelper *This, IDispatch *pdisp, ISimpleConnectionPoint **ppscp); END_INTERFACE } IDebugHelperVtbl; + interface IDebugHelper { CONST_VTBL IDebugHelperVtbl* lpVtbl; }; @@ -10799,38 +9010,6 @@ static FORCEINLINE HRESULT IDebugHelper_CreateSimpleConnectionPoint(IDebugHelper #endif -HRESULT STDMETHODCALLTYPE IDebugHelper_CreatePropertyBrowser_Proxy( - IDebugHelper* This, - VARIANT *pvar, - LPCOLESTR bstrName, - IDebugApplicationThread *pdat, - IDebugProperty **ppdob); -void __RPC_STUB IDebugHelper_CreatePropertyBrowser_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugHelper_CreatePropertyBrowserEx_Proxy( - IDebugHelper* This, - VARIANT *pvar, - LPCOLESTR bstrName, - IDebugApplicationThread *pdat, - IDebugFormatter *pdf, - IDebugProperty **ppdob); -void __RPC_STUB IDebugHelper_CreatePropertyBrowserEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugHelper_CreateSimpleConnectionPoint_Proxy( - IDebugHelper* This, - IDispatch *pdisp, - ISimpleConnectionPoint **ppscp); -void __RPC_STUB IDebugHelper_CreateSimpleConnectionPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugHelper_INTERFACE_DEFINED__ */ @@ -10869,36 +9048,37 @@ typedef struct IEnumDebugExpressionContextsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumDebugExpressionContexts* This, + IEnumDebugExpressionContexts *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumDebugExpressionContexts* This); + IEnumDebugExpressionContexts *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumDebugExpressionContexts* This); + IEnumDebugExpressionContexts *This); /*** IEnumDebugExpressionContexts methods ***/ HRESULT (__stdcall *Next)( - IEnumDebugExpressionContexts* This, + IEnumDebugExpressionContexts *This, ULONG celt, IDebugExpressionContext **ppdec, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumDebugExpressionContexts* This, + IEnumDebugExpressionContexts *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumDebugExpressionContexts* This); + IEnumDebugExpressionContexts *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumDebugExpressionContexts* This, + IEnumDebugExpressionContexts *This, IEnumDebugExpressionContexts **ppedec); END_INTERFACE } IEnumDebugExpressionContextsVtbl; + interface IEnumDebugExpressionContexts { CONST_VTBL IEnumDebugExpressionContextsVtbl* lpVtbl; }; @@ -10953,29 +9133,6 @@ void __RPC_STUB IEnumDebugExpressionContexts_RemoteNext_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDebugExpressionContexts_Skip_Proxy( - IEnumDebugExpressionContexts* This, - ULONG celt); -void __RPC_STUB IEnumDebugExpressionContexts_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDebugExpressionContexts_Reset_Proxy( - IEnumDebugExpressionContexts* This); -void __RPC_STUB IEnumDebugExpressionContexts_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDebugExpressionContexts_Clone_Proxy( - IEnumDebugExpressionContexts* This, - IEnumDebugExpressionContexts **ppedec); -void __RPC_STUB IEnumDebugExpressionContexts_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IEnumDebugExpressionContexts_Next_Proxy( IEnumDebugExpressionContexts* This, ULONG celt, @@ -11013,23 +9170,24 @@ typedef struct IProvideExpressionContextsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IProvideExpressionContexts* This, + IProvideExpressionContexts *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IProvideExpressionContexts* This); + IProvideExpressionContexts *This); ULONG (STDMETHODCALLTYPE *Release)( - IProvideExpressionContexts* This); + IProvideExpressionContexts *This); /*** IProvideExpressionContexts methods ***/ HRESULT (STDMETHODCALLTYPE *EnumExpressionContexts)( - IProvideExpressionContexts* This, + IProvideExpressionContexts *This, IEnumDebugExpressionContexts **ppedec); END_INTERFACE } IProvideExpressionContextsVtbl; + interface IProvideExpressionContexts { CONST_VTBL IProvideExpressionContextsVtbl* lpVtbl; }; @@ -11062,14 +9220,6 @@ static FORCEINLINE HRESULT IProvideExpressionContexts_EnumExpressionContexts(IPr #endif -HRESULT STDMETHODCALLTYPE IProvideExpressionContexts_EnumExpressionContexts_Proxy( - IProvideExpressionContexts* This, - IEnumDebugExpressionContexts **ppedec); -void __RPC_STUB IProvideExpressionContexts_EnumExpressionContexts_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IProvideExpressionContexts_INTERFACE_DEFINED__ */ @@ -11079,296 +9229,465 @@ DEFINE_GUID(LIBID_ProcessDebugManagerLib, 0x78a51821, 0x51f4, 0x11d0, 0x8f,0x20, #ifndef __IActiveScriptDebug32_FWD_DEFINED__ #define __IActiveScriptDebug32_FWD_DEFINED__ typedef interface IActiveScriptDebug32 IActiveScriptDebug32; +#ifdef __cplusplus +interface IActiveScriptDebug32; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptDebug64_FWD_DEFINED__ #define __IActiveScriptDebug64_FWD_DEFINED__ typedef interface IActiveScriptDebug64 IActiveScriptDebug64; +#ifdef __cplusplus +interface IActiveScriptDebug64; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptErrorDebug_FWD_DEFINED__ #define __IActiveScriptErrorDebug_FWD_DEFINED__ typedef interface IActiveScriptErrorDebug IActiveScriptErrorDebug; +#ifdef __cplusplus +interface IActiveScriptErrorDebug; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptSiteDebug32_FWD_DEFINED__ #define __IActiveScriptSiteDebug32_FWD_DEFINED__ typedef interface IActiveScriptSiteDebug32 IActiveScriptSiteDebug32; +#ifdef __cplusplus +interface IActiveScriptSiteDebug32; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptSiteDebug64_FWD_DEFINED__ #define __IActiveScriptSiteDebug64_FWD_DEFINED__ typedef interface IActiveScriptSiteDebug64 IActiveScriptSiteDebug64; +#ifdef __cplusplus +interface IActiveScriptSiteDebug64; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptSiteDebugEx_FWD_DEFINED__ #define __IActiveScriptSiteDebugEx_FWD_DEFINED__ typedef interface IActiveScriptSiteDebugEx IActiveScriptSiteDebugEx; +#ifdef __cplusplus +interface IActiveScriptSiteDebugEx; +#endif /* __cplusplus */ #endif #ifndef __IApplicationDebugger_FWD_DEFINED__ #define __IApplicationDebugger_FWD_DEFINED__ typedef interface IApplicationDebugger IApplicationDebugger; +#ifdef __cplusplus +interface IApplicationDebugger; +#endif /* __cplusplus */ #endif #ifndef __IApplicationDebuggerUI_FWD_DEFINED__ #define __IApplicationDebuggerUI_FWD_DEFINED__ typedef interface IApplicationDebuggerUI IApplicationDebuggerUI; +#ifdef __cplusplus +interface IApplicationDebuggerUI; +#endif /* __cplusplus */ #endif #ifndef __IDebugApplication32_FWD_DEFINED__ #define __IDebugApplication32_FWD_DEFINED__ typedef interface IDebugApplication32 IDebugApplication32; +#ifdef __cplusplus +interface IDebugApplication32; +#endif /* __cplusplus */ #endif #ifndef __IDebugApplication64_FWD_DEFINED__ #define __IDebugApplication64_FWD_DEFINED__ typedef interface IDebugApplication64 IDebugApplication64; +#ifdef __cplusplus +interface IDebugApplication64; +#endif /* __cplusplus */ #endif #ifndef __IDebugApplicationNode_FWD_DEFINED__ #define __IDebugApplicationNode_FWD_DEFINED__ typedef interface IDebugApplicationNode IDebugApplicationNode; +#ifdef __cplusplus +interface IDebugApplicationNode; +#endif /* __cplusplus */ #endif #ifndef __IDebugApplicationNodeEvents_FWD_DEFINED__ #define __IDebugApplicationNodeEvents_FWD_DEFINED__ typedef interface IDebugApplicationNodeEvents IDebugApplicationNodeEvents; -#endif - -#ifndef __AsyncIDebugApplicationNodeEvents_FWD_DEFINED__ -#define __AsyncIDebugApplicationNodeEvents_FWD_DEFINED__ -typedef interface AsyncIDebugApplicationNodeEvents AsyncIDebugApplicationNodeEvents; +#ifdef __cplusplus +interface IDebugApplicationNodeEvents; +#endif /* __cplusplus */ #endif #ifndef __IDebugApplicationThread_FWD_DEFINED__ #define __IDebugApplicationThread_FWD_DEFINED__ typedef interface IDebugApplicationThread IDebugApplicationThread; +#ifdef __cplusplus +interface IDebugApplicationThread; +#endif /* __cplusplus */ #endif #ifndef __IDebugAsyncOperation_FWD_DEFINED__ #define __IDebugAsyncOperation_FWD_DEFINED__ typedef interface IDebugAsyncOperation IDebugAsyncOperation; +#ifdef __cplusplus +interface IDebugAsyncOperation; +#endif /* __cplusplus */ #endif #ifndef __IDebugAsyncOperationCallBack_FWD_DEFINED__ #define __IDebugAsyncOperationCallBack_FWD_DEFINED__ typedef interface IDebugAsyncOperationCallBack IDebugAsyncOperationCallBack; +#ifdef __cplusplus +interface IDebugAsyncOperationCallBack; +#endif /* __cplusplus */ #endif #ifndef __IDebugCodeContext_FWD_DEFINED__ #define __IDebugCodeContext_FWD_DEFINED__ typedef interface IDebugCodeContext IDebugCodeContext; +#ifdef __cplusplus +interface IDebugCodeContext; +#endif /* __cplusplus */ #endif #ifndef __IDebugCookie_FWD_DEFINED__ #define __IDebugCookie_FWD_DEFINED__ typedef interface IDebugCookie IDebugCookie; +#ifdef __cplusplus +interface IDebugCookie; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocument_FWD_DEFINED__ #define __IDebugDocument_FWD_DEFINED__ typedef interface IDebugDocument IDebugDocument; +#ifdef __cplusplus +interface IDebugDocument; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentContext_FWD_DEFINED__ #define __IDebugDocumentContext_FWD_DEFINED__ typedef interface IDebugDocumentContext IDebugDocumentContext; +#ifdef __cplusplus +interface IDebugDocumentContext; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentHelper32_FWD_DEFINED__ #define __IDebugDocumentHelper32_FWD_DEFINED__ typedef interface IDebugDocumentHelper32 IDebugDocumentHelper32; +#ifdef __cplusplus +interface IDebugDocumentHelper32; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentHelper64_FWD_DEFINED__ #define __IDebugDocumentHelper64_FWD_DEFINED__ typedef interface IDebugDocumentHelper64 IDebugDocumentHelper64; +#ifdef __cplusplus +interface IDebugDocumentHelper64; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentHost_FWD_DEFINED__ #define __IDebugDocumentHost_FWD_DEFINED__ typedef interface IDebugDocumentHost IDebugDocumentHost; +#ifdef __cplusplus +interface IDebugDocumentHost; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentInfo_FWD_DEFINED__ #define __IDebugDocumentInfo_FWD_DEFINED__ typedef interface IDebugDocumentInfo IDebugDocumentInfo; +#ifdef __cplusplus +interface IDebugDocumentInfo; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentProvider_FWD_DEFINED__ #define __IDebugDocumentProvider_FWD_DEFINED__ typedef interface IDebugDocumentProvider IDebugDocumentProvider; +#ifdef __cplusplus +interface IDebugDocumentProvider; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentText_FWD_DEFINED__ #define __IDebugDocumentText_FWD_DEFINED__ typedef interface IDebugDocumentText IDebugDocumentText; +#ifdef __cplusplus +interface IDebugDocumentText; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentTextAuthor_FWD_DEFINED__ #define __IDebugDocumentTextAuthor_FWD_DEFINED__ typedef interface IDebugDocumentTextAuthor IDebugDocumentTextAuthor; +#ifdef __cplusplus +interface IDebugDocumentTextAuthor; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentTextEvents_FWD_DEFINED__ #define __IDebugDocumentTextEvents_FWD_DEFINED__ typedef interface IDebugDocumentTextEvents IDebugDocumentTextEvents; +#ifdef __cplusplus +interface IDebugDocumentTextEvents; +#endif /* __cplusplus */ #endif #ifndef __IDebugDocumentTextExternalAuthor_FWD_DEFINED__ #define __IDebugDocumentTextExternalAuthor_FWD_DEFINED__ typedef interface IDebugDocumentTextExternalAuthor IDebugDocumentTextExternalAuthor; +#ifdef __cplusplus +interface IDebugDocumentTextExternalAuthor; +#endif /* __cplusplus */ #endif #ifndef __IDebugExpression_FWD_DEFINED__ #define __IDebugExpression_FWD_DEFINED__ typedef interface IDebugExpression IDebugExpression; +#ifdef __cplusplus +interface IDebugExpression; +#endif /* __cplusplus */ #endif #ifndef __IDebugExpressionCallBack_FWD_DEFINED__ #define __IDebugExpressionCallBack_FWD_DEFINED__ typedef interface IDebugExpressionCallBack IDebugExpressionCallBack; +#ifdef __cplusplus +interface IDebugExpressionCallBack; +#endif /* __cplusplus */ #endif #ifndef __IDebugExpressionContext_FWD_DEFINED__ #define __IDebugExpressionContext_FWD_DEFINED__ typedef interface IDebugExpressionContext IDebugExpressionContext; +#ifdef __cplusplus +interface IDebugExpressionContext; +#endif /* __cplusplus */ #endif #ifndef __IDebugFormatter_FWD_DEFINED__ #define __IDebugFormatter_FWD_DEFINED__ typedef interface IDebugFormatter IDebugFormatter; +#ifdef __cplusplus +interface IDebugFormatter; +#endif /* __cplusplus */ #endif #ifndef __IDebugHelper_FWD_DEFINED__ #define __IDebugHelper_FWD_DEFINED__ typedef interface IDebugHelper IDebugHelper; +#ifdef __cplusplus +interface IDebugHelper; +#endif /* __cplusplus */ #endif #ifndef __IDebugSessionProvider_FWD_DEFINED__ #define __IDebugSessionProvider_FWD_DEFINED__ typedef interface IDebugSessionProvider IDebugSessionProvider; +#ifdef __cplusplus +interface IDebugSessionProvider; +#endif /* __cplusplus */ #endif #ifndef __IDebugStackFrame_FWD_DEFINED__ #define __IDebugStackFrame_FWD_DEFINED__ typedef interface IDebugStackFrame IDebugStackFrame; +#ifdef __cplusplus +interface IDebugStackFrame; +#endif /* __cplusplus */ #endif #ifndef __IDebugStackFrameSniffer_FWD_DEFINED__ #define __IDebugStackFrameSniffer_FWD_DEFINED__ typedef interface IDebugStackFrameSniffer IDebugStackFrameSniffer; +#ifdef __cplusplus +interface IDebugStackFrameSniffer; +#endif /* __cplusplus */ #endif #ifndef __IDebugStackFrameSnifferEx32_FWD_DEFINED__ #define __IDebugStackFrameSnifferEx32_FWD_DEFINED__ typedef interface IDebugStackFrameSnifferEx32 IDebugStackFrameSnifferEx32; +#ifdef __cplusplus +interface IDebugStackFrameSnifferEx32; +#endif /* __cplusplus */ #endif #ifndef __IDebugStackFrameSnifferEx64_FWD_DEFINED__ #define __IDebugStackFrameSnifferEx64_FWD_DEFINED__ typedef interface IDebugStackFrameSnifferEx64 IDebugStackFrameSnifferEx64; +#ifdef __cplusplus +interface IDebugStackFrameSnifferEx64; +#endif /* __cplusplus */ #endif #ifndef __IDebugSyncOperation_FWD_DEFINED__ #define __IDebugSyncOperation_FWD_DEFINED__ typedef interface IDebugSyncOperation IDebugSyncOperation; +#ifdef __cplusplus +interface IDebugSyncOperation; +#endif /* __cplusplus */ #endif #ifndef __IDebugThreadCall32_FWD_DEFINED__ #define __IDebugThreadCall32_FWD_DEFINED__ typedef interface IDebugThreadCall32 IDebugThreadCall32; +#ifdef __cplusplus +interface IDebugThreadCall32; +#endif /* __cplusplus */ #endif #ifndef __IDebugThreadCall64_FWD_DEFINED__ #define __IDebugThreadCall64_FWD_DEFINED__ typedef interface IDebugThreadCall64 IDebugThreadCall64; +#ifdef __cplusplus +interface IDebugThreadCall64; +#endif /* __cplusplus */ #endif #ifndef __IEnumDebugApplicationNodes_FWD_DEFINED__ #define __IEnumDebugApplicationNodes_FWD_DEFINED__ typedef interface IEnumDebugApplicationNodes IEnumDebugApplicationNodes; +#ifdef __cplusplus +interface IEnumDebugApplicationNodes; +#endif /* __cplusplus */ #endif #ifndef __IEnumDebugCodeContexts_FWD_DEFINED__ #define __IEnumDebugCodeContexts_FWD_DEFINED__ typedef interface IEnumDebugCodeContexts IEnumDebugCodeContexts; +#ifdef __cplusplus +interface IEnumDebugCodeContexts; +#endif /* __cplusplus */ #endif #ifndef __IEnumDebugExpressionContexts_FWD_DEFINED__ #define __IEnumDebugExpressionContexts_FWD_DEFINED__ typedef interface IEnumDebugExpressionContexts IEnumDebugExpressionContexts; +#ifdef __cplusplus +interface IEnumDebugExpressionContexts; +#endif /* __cplusplus */ #endif #ifndef __IEnumDebugStackFrames_FWD_DEFINED__ #define __IEnumDebugStackFrames_FWD_DEFINED__ typedef interface IEnumDebugStackFrames IEnumDebugStackFrames; +#ifdef __cplusplus +interface IEnumDebugStackFrames; +#endif /* __cplusplus */ #endif #ifndef __IEnumDebugStackFrames64_FWD_DEFINED__ #define __IEnumDebugStackFrames64_FWD_DEFINED__ typedef interface IEnumDebugStackFrames64 IEnumDebugStackFrames64; +#ifdef __cplusplus +interface IEnumDebugStackFrames64; +#endif /* __cplusplus */ #endif #ifndef __IEnumRemoteDebugApplications_FWD_DEFINED__ #define __IEnumRemoteDebugApplications_FWD_DEFINED__ typedef interface IEnumRemoteDebugApplications IEnumRemoteDebugApplications; +#ifdef __cplusplus +interface IEnumRemoteDebugApplications; +#endif /* __cplusplus */ #endif #ifndef __IEnumRemoteDebugApplicationThreads_FWD_DEFINED__ #define __IEnumRemoteDebugApplicationThreads_FWD_DEFINED__ typedef interface IEnumRemoteDebugApplicationThreads IEnumRemoteDebugApplicationThreads; +#ifdef __cplusplus +interface IEnumRemoteDebugApplicationThreads; +#endif /* __cplusplus */ #endif #ifndef __IProcessDebugManager32_FWD_DEFINED__ #define __IProcessDebugManager32_FWD_DEFINED__ typedef interface IProcessDebugManager32 IProcessDebugManager32; +#ifdef __cplusplus +interface IProcessDebugManager32; +#endif /* __cplusplus */ #endif #ifndef __IProcessDebugManager64_FWD_DEFINED__ #define __IProcessDebugManager64_FWD_DEFINED__ typedef interface IProcessDebugManager64 IProcessDebugManager64; +#ifdef __cplusplus +interface IProcessDebugManager64; +#endif /* __cplusplus */ #endif #ifndef __IProvideExpressionContexts_FWD_DEFINED__ #define __IProvideExpressionContexts_FWD_DEFINED__ typedef interface IProvideExpressionContexts IProvideExpressionContexts; +#ifdef __cplusplus +interface IProvideExpressionContexts; +#endif /* __cplusplus */ #endif #ifndef __IMachineDebugManager_FWD_DEFINED__ #define __IMachineDebugManager_FWD_DEFINED__ typedef interface IMachineDebugManager IMachineDebugManager; +#ifdef __cplusplus +interface IMachineDebugManager; +#endif /* __cplusplus */ #endif #ifndef __IMachineDebugManagerCookie_FWD_DEFINED__ #define __IMachineDebugManagerCookie_FWD_DEFINED__ typedef interface IMachineDebugManagerCookie IMachineDebugManagerCookie; +#ifdef __cplusplus +interface IMachineDebugManagerCookie; +#endif /* __cplusplus */ #endif #ifndef __IMachineDebugManagerEvents_FWD_DEFINED__ #define __IMachineDebugManagerEvents_FWD_DEFINED__ typedef interface IMachineDebugManagerEvents IMachineDebugManagerEvents; +#ifdef __cplusplus +interface IMachineDebugManagerEvents; +#endif /* __cplusplus */ #endif #ifndef __IRemoteDebugApplication_FWD_DEFINED__ #define __IRemoteDebugApplication_FWD_DEFINED__ typedef interface IRemoteDebugApplication IRemoteDebugApplication; +#ifdef __cplusplus +interface IRemoteDebugApplication; +#endif /* __cplusplus */ #endif #ifndef __IRemoteDebugApplicationEvents_FWD_DEFINED__ #define __IRemoteDebugApplicationEvents_FWD_DEFINED__ typedef interface IRemoteDebugApplicationEvents IRemoteDebugApplicationEvents; +#ifdef __cplusplus +interface IRemoteDebugApplicationEvents; +#endif /* __cplusplus */ #endif #ifndef __IRemoteDebugApplicationThread_FWD_DEFINED__ #define __IRemoteDebugApplicationThread_FWD_DEFINED__ typedef interface IRemoteDebugApplicationThread IRemoteDebugApplicationThread; +#ifdef __cplusplus +interface IRemoteDebugApplicationThread; +#endif /* __cplusplus */ #endif #ifndef __ISimpleConnectionPoint_FWD_DEFINED__ #define __ISimpleConnectionPoint_FWD_DEFINED__ typedef interface ISimpleConnectionPoint ISimpleConnectionPoint; +#ifdef __cplusplus +interface ISimpleConnectionPoint; +#endif /* __cplusplus */ #endif /***************************************************************************** diff --git a/lib/libc/include/any-windows-any/activdbg100.h b/lib/libc/include/any-windows-any/activdbg100.h index 25bdaee323..83ac56f13b 100644 --- a/lib/libc/include/any-windows-any/activdbg100.h +++ b/lib/libc/include/any-windows-any/activdbg100.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/activdbg100.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/activdbg100.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,61 +21,97 @@ #ifndef __IDebugApplicationNode100_FWD_DEFINED__ #define __IDebugApplicationNode100_FWD_DEFINED__ typedef interface IDebugApplicationNode100 IDebugApplicationNode100; +#ifdef __cplusplus +interface IDebugApplicationNode100; +#endif /* __cplusplus */ #endif #ifndef __IWebAppDiagnosticsSetup_FWD_DEFINED__ #define __IWebAppDiagnosticsSetup_FWD_DEFINED__ typedef interface IWebAppDiagnosticsSetup IWebAppDiagnosticsSetup; +#ifdef __cplusplus +interface IWebAppDiagnosticsSetup; +#endif /* __cplusplus */ #endif #ifndef __IRemoteDebugApplication110_FWD_DEFINED__ #define __IRemoteDebugApplication110_FWD_DEFINED__ typedef interface IRemoteDebugApplication110 IRemoteDebugApplication110; +#ifdef __cplusplus +interface IRemoteDebugApplication110; +#endif /* __cplusplus */ #endif #ifndef __IDebugApplication11032_FWD_DEFINED__ #define __IDebugApplication11032_FWD_DEFINED__ typedef interface IDebugApplication11032 IDebugApplication11032; +#ifdef __cplusplus +interface IDebugApplication11032; +#endif /* __cplusplus */ #endif #ifndef __IDebugApplication11064_FWD_DEFINED__ #define __IDebugApplication11064_FWD_DEFINED__ typedef interface IDebugApplication11064 IDebugApplication11064; +#ifdef __cplusplus +interface IDebugApplication11064; +#endif /* __cplusplus */ #endif #ifndef __IWebAppDiagnosticsObjectInitialization_FWD_DEFINED__ #define __IWebAppDiagnosticsObjectInitialization_FWD_DEFINED__ typedef interface IWebAppDiagnosticsObjectInitialization IWebAppDiagnosticsObjectInitialization; +#ifdef __cplusplus +interface IWebAppDiagnosticsObjectInitialization; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptWinRTErrorDebug_FWD_DEFINED__ #define __IActiveScriptWinRTErrorDebug_FWD_DEFINED__ typedef interface IActiveScriptWinRTErrorDebug IActiveScriptWinRTErrorDebug; +#ifdef __cplusplus +interface IActiveScriptWinRTErrorDebug; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptErrorDebug110_FWD_DEFINED__ #define __IActiveScriptErrorDebug110_FWD_DEFINED__ typedef interface IActiveScriptErrorDebug110 IActiveScriptErrorDebug110; +#ifdef __cplusplus +interface IActiveScriptErrorDebug110; +#endif /* __cplusplus */ #endif #ifndef __IDebugApplicationThreadEvents110_FWD_DEFINED__ #define __IDebugApplicationThreadEvents110_FWD_DEFINED__ typedef interface IDebugApplicationThreadEvents110 IDebugApplicationThreadEvents110; +#ifdef __cplusplus +interface IDebugApplicationThreadEvents110; +#endif /* __cplusplus */ #endif #ifndef __IDebugApplicationThread11032_FWD_DEFINED__ #define __IDebugApplicationThread11032_FWD_DEFINED__ typedef interface IDebugApplicationThread11032 IDebugApplicationThread11032; +#ifdef __cplusplus +interface IDebugApplicationThread11032; +#endif /* __cplusplus */ #endif #ifndef __IDebugApplicationThread11064_FWD_DEFINED__ #define __IDebugApplicationThread11064_FWD_DEFINED__ typedef interface IDebugApplicationThread11064 IDebugApplicationThread11064; +#ifdef __cplusplus +interface IDebugApplicationThread11064; +#endif /* __cplusplus */ #endif #ifndef __IRemoteDebugCriticalErrorEvent110_FWD_DEFINED__ #define __IRemoteDebugCriticalErrorEvent110_FWD_DEFINED__ typedef interface IRemoteDebugCriticalErrorEvent110 IRemoteDebugCriticalErrorEvent110; +#ifdef __cplusplus +interface IRemoteDebugCriticalErrorEvent110; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -91,6 +128,9 @@ extern "C" { #ifndef __IWebAppDiagnosticsSetupEvent_FWD_DEFINED__ #define __IWebAppDiagnosticsSetupEvent_FWD_DEFINED__ typedef interface IWebAppDiagnosticsSetupEvent IWebAppDiagnosticsSetupEvent; +#ifdef __cplusplus +interface IWebAppDiagnosticsSetupEvent; +#endif /* __cplusplus */ #endif typedef enum tagAPPLICATION_NODE_EVENT_FILTER { @@ -109,7 +149,6 @@ enum SCRIPT_DEBUGGER_OPTIONS { SDO_ENABLE_WEB_WORKER_SUPPORT = 0x2, SDO_ENABLE_NONUSER_CODE_SUPPORT = 0x4 }; - typedef struct tagTEXT_DOCUMENT_ARRAY { DWORD dwCount; IDebugDocumentText **Members; @@ -160,33 +199,34 @@ typedef struct IDebugApplicationNode100Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugApplicationNode100* This, + IDebugApplicationNode100 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugApplicationNode100* This); + IDebugApplicationNode100 *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugApplicationNode100* This); + IDebugApplicationNode100 *This); /*** IDebugApplicationNode100 methods ***/ HRESULT (STDMETHODCALLTYPE *SetFilterForEventSink)( - IDebugApplicationNode100* This, + IDebugApplicationNode100 *This, DWORD dwCookie, APPLICATION_NODE_EVENT_FILTER filter); HRESULT (STDMETHODCALLTYPE *GetExcludedDocuments)( - IDebugApplicationNode100* This, + IDebugApplicationNode100 *This, APPLICATION_NODE_EVENT_FILTER filter, TEXT_DOCUMENT_ARRAY *pDocuments); HRESULT (STDMETHODCALLTYPE *QueryIsChildNode)( - IDebugApplicationNode100* This, + IDebugApplicationNode100 *This, IDebugDocument *pSearchKey); END_INTERFACE } IDebugApplicationNode100Vtbl; + interface IDebugApplicationNode100 { CONST_VTBL IDebugApplicationNode100Vtbl* lpVtbl; }; @@ -227,32 +267,6 @@ static FORCEINLINE HRESULT IDebugApplicationNode100_QueryIsChildNode(IDebugAppli #endif -HRESULT STDMETHODCALLTYPE IDebugApplicationNode100_SetFilterForEventSink_Proxy( - IDebugApplicationNode100* This, - DWORD dwCookie, - APPLICATION_NODE_EVENT_FILTER filter); -void __RPC_STUB IDebugApplicationNode100_SetFilterForEventSink_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplicationNode100_GetExcludedDocuments_Proxy( - IDebugApplicationNode100* This, - APPLICATION_NODE_EVENT_FILTER filter, - TEXT_DOCUMENT_ARRAY *pDocuments); -void __RPC_STUB IDebugApplicationNode100_GetExcludedDocuments_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplicationNode100_QueryIsChildNode_Proxy( - IDebugApplicationNode100* This, - IDebugDocument *pSearchKey); -void __RPC_STUB IDebugApplicationNode100_QueryIsChildNode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugApplicationNode100_INTERFACE_DEFINED__ */ @@ -286,23 +300,23 @@ typedef struct IWebAppDiagnosticsSetupVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWebAppDiagnosticsSetup* This, + IWebAppDiagnosticsSetup *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWebAppDiagnosticsSetup* This); + IWebAppDiagnosticsSetup *This); ULONG (STDMETHODCALLTYPE *Release)( - IWebAppDiagnosticsSetup* This); + IWebAppDiagnosticsSetup *This); /*** IWebAppDiagnosticsSetup methods ***/ HRESULT (STDMETHODCALLTYPE *DiagnosticsSupported)( - IWebAppDiagnosticsSetup* This, + IWebAppDiagnosticsSetup *This, VARIANT_BOOL *pRetVal); HRESULT (STDMETHODCALLTYPE *CreateObjectWithSiteAtWebApp)( - IWebAppDiagnosticsSetup* This, + IWebAppDiagnosticsSetup *This, REFCLSID rclsid, DWORD dwClsContext, REFIID riid, @@ -310,6 +324,7 @@ typedef struct IWebAppDiagnosticsSetupVtbl { END_INTERFACE } IWebAppDiagnosticsSetupVtbl; + interface IWebAppDiagnosticsSetup { CONST_VTBL IWebAppDiagnosticsSetupVtbl* lpVtbl; }; @@ -346,25 +361,6 @@ static FORCEINLINE HRESULT IWebAppDiagnosticsSetup_CreateObjectWithSiteAtWebApp( #endif -HRESULT STDMETHODCALLTYPE IWebAppDiagnosticsSetup_DiagnosticsSupported_Proxy( - IWebAppDiagnosticsSetup* This, - VARIANT_BOOL *pRetVal); -void __RPC_STUB IWebAppDiagnosticsSetup_DiagnosticsSupported_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebAppDiagnosticsSetup_CreateObjectWithSiteAtWebApp_Proxy( - IWebAppDiagnosticsSetup* This, - REFCLSID rclsid, - DWORD dwClsContext, - REFIID riid, - DWORD_PTR hPassToObject); -void __RPC_STUB IWebAppDiagnosticsSetup_CreateObjectWithSiteAtWebApp_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWebAppDiagnosticsSetup_INTERFACE_DEFINED__ */ @@ -399,32 +395,33 @@ typedef struct IRemoteDebugApplication110Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IRemoteDebugApplication110* This, + IRemoteDebugApplication110 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IRemoteDebugApplication110* This); + IRemoteDebugApplication110 *This); ULONG (STDMETHODCALLTYPE *Release)( - IRemoteDebugApplication110* This); + IRemoteDebugApplication110 *This); /*** IRemoteDebugApplication110 methods ***/ HRESULT (STDMETHODCALLTYPE *SetDebuggerOptions)( - IRemoteDebugApplication110* This, + IRemoteDebugApplication110 *This, enum SCRIPT_DEBUGGER_OPTIONS mask, enum SCRIPT_DEBUGGER_OPTIONS value); HRESULT (STDMETHODCALLTYPE *GetCurrentDebuggerOptions)( - IRemoteDebugApplication110* This, + IRemoteDebugApplication110 *This, enum SCRIPT_DEBUGGER_OPTIONS *pCurrentOptions); HRESULT (STDMETHODCALLTYPE *GetMainThread)( - IRemoteDebugApplication110* This, + IRemoteDebugApplication110 *This, IRemoteDebugApplicationThread **ppThread); END_INTERFACE } IRemoteDebugApplication110Vtbl; + interface IRemoteDebugApplication110 { CONST_VTBL IRemoteDebugApplication110Vtbl* lpVtbl; }; @@ -465,31 +462,6 @@ static FORCEINLINE HRESULT IRemoteDebugApplication110_GetMainThread(IRemoteDebug #endif -HRESULT STDMETHODCALLTYPE IRemoteDebugApplication110_SetDebuggerOptions_Proxy( - IRemoteDebugApplication110* This, - enum SCRIPT_DEBUGGER_OPTIONS mask, - enum SCRIPT_DEBUGGER_OPTIONS value); -void __RPC_STUB IRemoteDebugApplication110_SetDebuggerOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplication110_GetCurrentDebuggerOptions_Proxy( - IRemoteDebugApplication110* This, - enum SCRIPT_DEBUGGER_OPTIONS *pCurrentOptions); -void __RPC_STUB IRemoteDebugApplication110_GetCurrentDebuggerOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRemoteDebugApplication110_GetMainThread_Proxy( - IRemoteDebugApplication110* This, - IRemoteDebugApplicationThread **ppThread); -void __RPC_STUB IRemoteDebugApplication110_GetMainThread_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IRemoteDebugApplication110_INTERFACE_DEFINED__ */ @@ -531,53 +503,54 @@ typedef struct IDebugApplication11032Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugApplication11032* This, + IDebugApplication11032 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugApplication11032* This); + IDebugApplication11032 *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugApplication11032* This); + IDebugApplication11032 *This); /*** IRemoteDebugApplication110 methods ***/ HRESULT (STDMETHODCALLTYPE *SetDebuggerOptions)( - IDebugApplication11032* This, + IDebugApplication11032 *This, enum SCRIPT_DEBUGGER_OPTIONS mask, enum SCRIPT_DEBUGGER_OPTIONS value); HRESULT (STDMETHODCALLTYPE *GetCurrentDebuggerOptions)( - IDebugApplication11032* This, + IDebugApplication11032 *This, enum SCRIPT_DEBUGGER_OPTIONS *pCurrentOptions); HRESULT (STDMETHODCALLTYPE *GetMainThread)( - IDebugApplication11032* This, + IDebugApplication11032 *This, IRemoteDebugApplicationThread **ppThread); /*** IDebugApplication11032 methods ***/ HRESULT (STDMETHODCALLTYPE *SynchronousCallInMainThread)( - IDebugApplication11032* This, + IDebugApplication11032 *This, IDebugThreadCall32 *pptc, DWORD_PTR dwParam1, DWORD_PTR dwParam2, DWORD_PTR dwParam3); HRESULT (STDMETHODCALLTYPE *AsynchronousCallInMainThread)( - IDebugApplication11032* This, + IDebugApplication11032 *This, IDebugThreadCall32 *pptc, DWORD_PTR dwParam1, DWORD_PTR dwParam2, DWORD_PTR dwParam3); HRESULT (STDMETHODCALLTYPE *CallableWaitForHandles)( - IDebugApplication11032* This, + IDebugApplication11032 *This, DWORD handleCount, const HANDLE *pHandles, DWORD *pIndex); END_INTERFACE } IDebugApplication11032Vtbl; + interface IDebugApplication11032 { CONST_VTBL IDebugApplication11032Vtbl* lpVtbl; }; @@ -632,38 +605,6 @@ static FORCEINLINE HRESULT IDebugApplication11032_CallableWaitForHandles(IDebugA #endif -HRESULT STDMETHODCALLTYPE IDebugApplication11032_SynchronousCallInMainThread_Proxy( - IDebugApplication11032* This, - IDebugThreadCall32 *pptc, - DWORD_PTR dwParam1, - DWORD_PTR dwParam2, - DWORD_PTR dwParam3); -void __RPC_STUB IDebugApplication11032_SynchronousCallInMainThread_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication11032_AsynchronousCallInMainThread_Proxy( - IDebugApplication11032* This, - IDebugThreadCall32 *pptc, - DWORD_PTR dwParam1, - DWORD_PTR dwParam2, - DWORD_PTR dwParam3); -void __RPC_STUB IDebugApplication11032_AsynchronousCallInMainThread_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication11032_CallableWaitForHandles_Proxy( - IDebugApplication11032* This, - DWORD handleCount, - const HANDLE *pHandles, - DWORD *pIndex); -void __RPC_STUB IDebugApplication11032_CallableWaitForHandles_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugApplication11032_INTERFACE_DEFINED__ */ @@ -705,53 +646,54 @@ typedef struct IDebugApplication11064Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugApplication11064* This, + IDebugApplication11064 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugApplication11064* This); + IDebugApplication11064 *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugApplication11064* This); + IDebugApplication11064 *This); /*** IRemoteDebugApplication110 methods ***/ HRESULT (STDMETHODCALLTYPE *SetDebuggerOptions)( - IDebugApplication11064* This, + IDebugApplication11064 *This, enum SCRIPT_DEBUGGER_OPTIONS mask, enum SCRIPT_DEBUGGER_OPTIONS value); HRESULT (STDMETHODCALLTYPE *GetCurrentDebuggerOptions)( - IDebugApplication11064* This, + IDebugApplication11064 *This, enum SCRIPT_DEBUGGER_OPTIONS *pCurrentOptions); HRESULT (STDMETHODCALLTYPE *GetMainThread)( - IDebugApplication11064* This, + IDebugApplication11064 *This, IRemoteDebugApplicationThread **ppThread); /*** IDebugApplication11064 methods ***/ HRESULT (STDMETHODCALLTYPE *SynchronousCallInMainThread)( - IDebugApplication11064* This, + IDebugApplication11064 *This, IDebugThreadCall64 *pptc, DWORD_PTR dwParam1, DWORD_PTR dwParam2, DWORD_PTR dwParam3); HRESULT (STDMETHODCALLTYPE *AsynchronousCallInMainThread)( - IDebugApplication11064* This, + IDebugApplication11064 *This, IDebugThreadCall64 *pptc, DWORD_PTR dwParam1, DWORD_PTR dwParam2, DWORD_PTR dwParam3); HRESULT (STDMETHODCALLTYPE *CallableWaitForHandles)( - IDebugApplication11064* This, + IDebugApplication11064 *This, DWORD handleCount, const HANDLE *pHandles, DWORD *pIndex); END_INTERFACE } IDebugApplication11064Vtbl; + interface IDebugApplication11064 { CONST_VTBL IDebugApplication11064Vtbl* lpVtbl; }; @@ -806,38 +748,6 @@ static FORCEINLINE HRESULT IDebugApplication11064_CallableWaitForHandles(IDebugA #endif -HRESULT STDMETHODCALLTYPE IDebugApplication11064_SynchronousCallInMainThread_Proxy( - IDebugApplication11064* This, - IDebugThreadCall64 *pptc, - DWORD_PTR dwParam1, - DWORD_PTR dwParam2, - DWORD_PTR dwParam3); -void __RPC_STUB IDebugApplication11064_SynchronousCallInMainThread_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication11064_AsynchronousCallInMainThread_Proxy( - IDebugApplication11064* This, - IDebugThreadCall64 *pptc, - DWORD_PTR dwParam1, - DWORD_PTR dwParam2, - DWORD_PTR dwParam3); -void __RPC_STUB IDebugApplication11064_AsynchronousCallInMainThread_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplication11064_CallableWaitForHandles_Proxy( - IDebugApplication11064* This, - DWORD handleCount, - const HANDLE *pHandles, - DWORD *pIndex); -void __RPC_STUB IDebugApplication11064_CallableWaitForHandles_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugApplication11064_INTERFACE_DEFINED__ */ @@ -866,24 +776,25 @@ typedef struct IWebAppDiagnosticsObjectInitializationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWebAppDiagnosticsObjectInitialization* This, + IWebAppDiagnosticsObjectInitialization *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWebAppDiagnosticsObjectInitialization* This); + IWebAppDiagnosticsObjectInitialization *This); ULONG (STDMETHODCALLTYPE *Release)( - IWebAppDiagnosticsObjectInitialization* This); + IWebAppDiagnosticsObjectInitialization *This); /*** IWebAppDiagnosticsObjectInitialization methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IWebAppDiagnosticsObjectInitialization* This, + IWebAppDiagnosticsObjectInitialization *This, HANDLE_PTR hPassedHandle, IUnknown *pDebugApplication); END_INTERFACE } IWebAppDiagnosticsObjectInitializationVtbl; + interface IWebAppDiagnosticsObjectInitialization { CONST_VTBL IWebAppDiagnosticsObjectInitializationVtbl* lpVtbl; }; @@ -916,15 +827,6 @@ static FORCEINLINE HRESULT IWebAppDiagnosticsObjectInitialization_Initialize(IWe #endif -HRESULT STDMETHODCALLTYPE IWebAppDiagnosticsObjectInitialization_Initialize_Proxy( - IWebAppDiagnosticsObjectInitialization* This, - HANDLE_PTR hPassedHandle, - IUnknown *pDebugApplication); -void __RPC_STUB IWebAppDiagnosticsObjectInitialization_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWebAppDiagnosticsObjectInitialization_INTERFACE_DEFINED__ */ @@ -958,46 +860,47 @@ typedef struct IActiveScriptWinRTErrorDebugVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptWinRTErrorDebug* This, + IActiveScriptWinRTErrorDebug *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptWinRTErrorDebug* This); + IActiveScriptWinRTErrorDebug *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptWinRTErrorDebug* This); + IActiveScriptWinRTErrorDebug *This); /*** IActiveScriptError methods ***/ HRESULT (STDMETHODCALLTYPE *GetExceptionInfo)( - IActiveScriptWinRTErrorDebug* This, + IActiveScriptWinRTErrorDebug *This, EXCEPINFO *pexcepinfo); HRESULT (STDMETHODCALLTYPE *GetSourcePosition)( - IActiveScriptWinRTErrorDebug* This, + IActiveScriptWinRTErrorDebug *This, DWORD *pdwSourceContext, ULONG *pulLineNumber, LONG *plCharacterPosition); HRESULT (STDMETHODCALLTYPE *GetSourceLineText)( - IActiveScriptWinRTErrorDebug* This, + IActiveScriptWinRTErrorDebug *This, BSTR *pbstrSourceLine); /*** IActiveScriptWinRTErrorDebug methods ***/ HRESULT (STDMETHODCALLTYPE *GetRestrictedErrorString)( - IActiveScriptWinRTErrorDebug* This, + IActiveScriptWinRTErrorDebug *This, BSTR *errorString); HRESULT (STDMETHODCALLTYPE *GetRestrictedErrorReference)( - IActiveScriptWinRTErrorDebug* This, + IActiveScriptWinRTErrorDebug *This, BSTR *referenceString); HRESULT (STDMETHODCALLTYPE *GetCapabilitySid)( - IActiveScriptWinRTErrorDebug* This, + IActiveScriptWinRTErrorDebug *This, BSTR *capabilitySid); END_INTERFACE } IActiveScriptWinRTErrorDebugVtbl; + interface IActiveScriptWinRTErrorDebug { CONST_VTBL IActiveScriptWinRTErrorDebugVtbl* lpVtbl; }; @@ -1052,30 +955,6 @@ static FORCEINLINE HRESULT IActiveScriptWinRTErrorDebug_GetCapabilitySid(IActive #endif -HRESULT STDMETHODCALLTYPE IActiveScriptWinRTErrorDebug_GetRestrictedErrorString_Proxy( - IActiveScriptWinRTErrorDebug* This, - BSTR *errorString); -void __RPC_STUB IActiveScriptWinRTErrorDebug_GetRestrictedErrorString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptWinRTErrorDebug_GetRestrictedErrorReference_Proxy( - IActiveScriptWinRTErrorDebug* This, - BSTR *referenceString); -void __RPC_STUB IActiveScriptWinRTErrorDebug_GetRestrictedErrorReference_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptWinRTErrorDebug_GetCapabilitySid_Proxy( - IActiveScriptWinRTErrorDebug* This, - BSTR *capabilitySid); -void __RPC_STUB IActiveScriptWinRTErrorDebug_GetCapabilitySid_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptWinRTErrorDebug_INTERFACE_DEFINED__ */ @@ -1104,23 +983,24 @@ typedef struct IActiveScriptErrorDebug110Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptErrorDebug110* This, + IActiveScriptErrorDebug110 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptErrorDebug110* This); + IActiveScriptErrorDebug110 *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptErrorDebug110* This); + IActiveScriptErrorDebug110 *This); /*** IActiveScriptErrorDebug110 methods ***/ HRESULT (STDMETHODCALLTYPE *GetExceptionThrownKind)( - IActiveScriptErrorDebug110* This, + IActiveScriptErrorDebug110 *This, SCRIPT_ERROR_DEBUG_EXCEPTION_THROWN_KIND *pExceptionKind); END_INTERFACE } IActiveScriptErrorDebug110Vtbl; + interface IActiveScriptErrorDebug110 { CONST_VTBL IActiveScriptErrorDebug110Vtbl* lpVtbl; }; @@ -1153,14 +1033,6 @@ static FORCEINLINE HRESULT IActiveScriptErrorDebug110_GetExceptionThrownKind(IAc #endif -HRESULT STDMETHODCALLTYPE IActiveScriptErrorDebug110_GetExceptionThrownKind_Proxy( - IActiveScriptErrorDebug110* This, - SCRIPT_ERROR_DEBUG_EXCEPTION_THROWN_KIND *pExceptionKind); -void __RPC_STUB IActiveScriptErrorDebug110_GetExceptionThrownKind_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptErrorDebug110_INTERFACE_DEFINED__ */ @@ -1197,31 +1069,32 @@ typedef struct IDebugApplicationThreadEvents110Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugApplicationThreadEvents110* This, + IDebugApplicationThreadEvents110 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugApplicationThreadEvents110* This); + IDebugApplicationThreadEvents110 *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugApplicationThreadEvents110* This); + IDebugApplicationThreadEvents110 *This); /*** IDebugApplicationThreadEvents110 methods ***/ HRESULT (STDMETHODCALLTYPE *OnSuspendForBreakPoint)( - IDebugApplicationThreadEvents110* This); + IDebugApplicationThreadEvents110 *This); HRESULT (STDMETHODCALLTYPE *OnResumeFromBreakPoint)( - IDebugApplicationThreadEvents110* This); + IDebugApplicationThreadEvents110 *This); HRESULT (STDMETHODCALLTYPE *OnThreadRequestComplete)( - IDebugApplicationThreadEvents110* This); + IDebugApplicationThreadEvents110 *This); HRESULT (STDMETHODCALLTYPE *OnBeginThreadRequest)( - IDebugApplicationThreadEvents110* This); + IDebugApplicationThreadEvents110 *This); END_INTERFACE } IDebugApplicationThreadEvents110Vtbl; + interface IDebugApplicationThreadEvents110 { CONST_VTBL IDebugApplicationThreadEvents110Vtbl* lpVtbl; }; @@ -1266,34 +1139,6 @@ static FORCEINLINE HRESULT IDebugApplicationThreadEvents110_OnBeginThreadRequest #endif -HRESULT STDMETHODCALLTYPE IDebugApplicationThreadEvents110_OnSuspendForBreakPoint_Proxy( - IDebugApplicationThreadEvents110* This); -void __RPC_STUB IDebugApplicationThreadEvents110_OnSuspendForBreakPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplicationThreadEvents110_OnResumeFromBreakPoint_Proxy( - IDebugApplicationThreadEvents110* This); -void __RPC_STUB IDebugApplicationThreadEvents110_OnResumeFromBreakPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplicationThreadEvents110_OnThreadRequestComplete_Proxy( - IDebugApplicationThreadEvents110* This); -void __RPC_STUB IDebugApplicationThreadEvents110_OnThreadRequestComplete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplicationThreadEvents110_OnBeginThreadRequest_Proxy( - IDebugApplicationThreadEvents110* This); -void __RPC_STUB IDebugApplicationThreadEvents110_OnBeginThreadRequest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugApplicationThreadEvents110_INTERFACE_DEFINED__ */ @@ -1333,31 +1178,31 @@ typedef struct IDebugApplicationThread11032Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugApplicationThread11032* This, + IDebugApplicationThread11032 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugApplicationThread11032* This); + IDebugApplicationThread11032 *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugApplicationThread11032* This); + IDebugApplicationThread11032 *This); /*** IDebugApplicationThread11032 methods ***/ HRESULT (STDMETHODCALLTYPE *GetActiveThreadRequestCount)( - IDebugApplicationThread11032* This, + IDebugApplicationThread11032 *This, UINT *puiThreadRequests); HRESULT (STDMETHODCALLTYPE *IsSuspendedForBreakPoint)( - IDebugApplicationThread11032* This, + IDebugApplicationThread11032 *This, WINBOOL *pfIsSuspended); HRESULT (STDMETHODCALLTYPE *IsThreadCallable)( - IDebugApplicationThread11032* This, + IDebugApplicationThread11032 *This, WINBOOL *pfIsCallable); HRESULT (STDMETHODCALLTYPE *AsynchronousCallIntoThread)( - IDebugApplicationThread11032* This, + IDebugApplicationThread11032 *This, IDebugThreadCall32 *pptc, DWORD_PTR dwParam1, DWORD_PTR dwParam2, @@ -1365,6 +1210,7 @@ typedef struct IDebugApplicationThread11032Vtbl { END_INTERFACE } IDebugApplicationThread11032Vtbl; + interface IDebugApplicationThread11032 { CONST_VTBL IDebugApplicationThread11032Vtbl* lpVtbl; }; @@ -1409,41 +1255,6 @@ static FORCEINLINE HRESULT IDebugApplicationThread11032_AsynchronousCallIntoThre #endif -HRESULT STDMETHODCALLTYPE IDebugApplicationThread11032_GetActiveThreadRequestCount_Proxy( - IDebugApplicationThread11032* This, - UINT *puiThreadRequests); -void __RPC_STUB IDebugApplicationThread11032_GetActiveThreadRequestCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplicationThread11032_IsSuspendedForBreakPoint_Proxy( - IDebugApplicationThread11032* This, - WINBOOL *pfIsSuspended); -void __RPC_STUB IDebugApplicationThread11032_IsSuspendedForBreakPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplicationThread11032_IsThreadCallable_Proxy( - IDebugApplicationThread11032* This, - WINBOOL *pfIsCallable); -void __RPC_STUB IDebugApplicationThread11032_IsThreadCallable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplicationThread11032_AsynchronousCallIntoThread_Proxy( - IDebugApplicationThread11032* This, - IDebugThreadCall32 *pptc, - DWORD_PTR dwParam1, - DWORD_PTR dwParam2, - DWORD_PTR dwParam3); -void __RPC_STUB IDebugApplicationThread11032_AsynchronousCallIntoThread_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugApplicationThread11032_INTERFACE_DEFINED__ */ @@ -1483,31 +1294,31 @@ typedef struct IDebugApplicationThread11064Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugApplicationThread11064* This, + IDebugApplicationThread11064 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugApplicationThread11064* This); + IDebugApplicationThread11064 *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugApplicationThread11064* This); + IDebugApplicationThread11064 *This); /*** IDebugApplicationThread11064 methods ***/ HRESULT (STDMETHODCALLTYPE *GetActiveThreadRequestCount)( - IDebugApplicationThread11064* This, + IDebugApplicationThread11064 *This, UINT *puiThreadRequests); HRESULT (STDMETHODCALLTYPE *IsSuspendedForBreakPoint)( - IDebugApplicationThread11064* This, + IDebugApplicationThread11064 *This, WINBOOL *pfIsSuspended); HRESULT (STDMETHODCALLTYPE *IsThreadCallable)( - IDebugApplicationThread11064* This, + IDebugApplicationThread11064 *This, WINBOOL *pfIsCallable); HRESULT (STDMETHODCALLTYPE *AsynchronousCallIntoThread)( - IDebugApplicationThread11064* This, + IDebugApplicationThread11064 *This, IDebugThreadCall64 *pptc, DWORD_PTR dwParam1, DWORD_PTR dwParam2, @@ -1515,6 +1326,7 @@ typedef struct IDebugApplicationThread11064Vtbl { END_INTERFACE } IDebugApplicationThread11064Vtbl; + interface IDebugApplicationThread11064 { CONST_VTBL IDebugApplicationThread11064Vtbl* lpVtbl; }; @@ -1559,41 +1371,6 @@ static FORCEINLINE HRESULT IDebugApplicationThread11064_AsynchronousCallIntoThre #endif -HRESULT STDMETHODCALLTYPE IDebugApplicationThread11064_GetActiveThreadRequestCount_Proxy( - IDebugApplicationThread11064* This, - UINT *puiThreadRequests); -void __RPC_STUB IDebugApplicationThread11064_GetActiveThreadRequestCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplicationThread11064_IsSuspendedForBreakPoint_Proxy( - IDebugApplicationThread11064* This, - WINBOOL *pfIsSuspended); -void __RPC_STUB IDebugApplicationThread11064_IsSuspendedForBreakPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplicationThread11064_IsThreadCallable_Proxy( - IDebugApplicationThread11064* This, - WINBOOL *pfIsCallable); -void __RPC_STUB IDebugApplicationThread11064_IsThreadCallable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugApplicationThread11064_AsynchronousCallIntoThread_Proxy( - IDebugApplicationThread11064* This, - IDebugThreadCall64 *pptc, - DWORD_PTR dwParam1, - DWORD_PTR dwParam2, - DWORD_PTR dwParam3); -void __RPC_STUB IDebugApplicationThread11064_AsynchronousCallIntoThread_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugApplicationThread11064_INTERFACE_DEFINED__ */ @@ -1624,19 +1401,19 @@ typedef struct IRemoteDebugCriticalErrorEvent110Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IRemoteDebugCriticalErrorEvent110* This, + IRemoteDebugCriticalErrorEvent110 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IRemoteDebugCriticalErrorEvent110* This); + IRemoteDebugCriticalErrorEvent110 *This); ULONG (STDMETHODCALLTYPE *Release)( - IRemoteDebugCriticalErrorEvent110* This); + IRemoteDebugCriticalErrorEvent110 *This); /*** IRemoteDebugCriticalErrorEvent110 methods ***/ HRESULT (STDMETHODCALLTYPE *GetErrorInfo)( - IRemoteDebugCriticalErrorEvent110* This, + IRemoteDebugCriticalErrorEvent110 *This, BSTR *pbstrSource, int *pMessageId, BSTR *pbstrMessage, @@ -1644,6 +1421,7 @@ typedef struct IRemoteDebugCriticalErrorEvent110Vtbl { END_INTERFACE } IRemoteDebugCriticalErrorEvent110Vtbl; + interface IRemoteDebugCriticalErrorEvent110 { CONST_VTBL IRemoteDebugCriticalErrorEvent110Vtbl* lpVtbl; }; @@ -1676,17 +1454,6 @@ static FORCEINLINE HRESULT IRemoteDebugCriticalErrorEvent110_GetErrorInfo(IRemot #endif -HRESULT STDMETHODCALLTYPE IRemoteDebugCriticalErrorEvent110_GetErrorInfo_Proxy( - IRemoteDebugCriticalErrorEvent110* This, - BSTR *pbstrSource, - int *pMessageId, - BSTR *pbstrMessage, - IDebugDocumentContext **ppLocation); -void __RPC_STUB IRemoteDebugCriticalErrorEvent110_GetErrorInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IRemoteDebugCriticalErrorEvent110_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/activprof.h b/lib/libc/include/any-windows-any/activprof.h index df29427def..75ebbb0c12 100644 --- a/lib/libc/include/any-windows-any/activprof.h +++ b/lib/libc/include/any-windows-any/activprof.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/activprof.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/activprof.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,36 +21,57 @@ #ifndef __IActiveScriptProfilerControl_FWD_DEFINED__ #define __IActiveScriptProfilerControl_FWD_DEFINED__ typedef interface IActiveScriptProfilerControl IActiveScriptProfilerControl; +#ifdef __cplusplus +interface IActiveScriptProfilerControl; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptProfilerControl2_FWD_DEFINED__ #define __IActiveScriptProfilerControl2_FWD_DEFINED__ typedef interface IActiveScriptProfilerControl2 IActiveScriptProfilerControl2; +#ifdef __cplusplus +interface IActiveScriptProfilerControl2; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptProfilerHeapEnum_FWD_DEFINED__ #define __IActiveScriptProfilerHeapEnum_FWD_DEFINED__ typedef interface IActiveScriptProfilerHeapEnum IActiveScriptProfilerHeapEnum; +#ifdef __cplusplus +interface IActiveScriptProfilerHeapEnum; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptProfilerControl3_FWD_DEFINED__ #define __IActiveScriptProfilerControl3_FWD_DEFINED__ typedef interface IActiveScriptProfilerControl3 IActiveScriptProfilerControl3; +#ifdef __cplusplus +interface IActiveScriptProfilerControl3; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptProfilerCallback_FWD_DEFINED__ #define __IActiveScriptProfilerCallback_FWD_DEFINED__ typedef interface IActiveScriptProfilerCallback IActiveScriptProfilerCallback; +#ifdef __cplusplus +interface IActiveScriptProfilerCallback; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptProfilerCallback2_FWD_DEFINED__ #define __IActiveScriptProfilerCallback2_FWD_DEFINED__ typedef interface IActiveScriptProfilerCallback2 IActiveScriptProfilerCallback2; +#ifdef __cplusplus +interface IActiveScriptProfilerCallback2; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptProfilerCallback3_FWD_DEFINED__ #define __IActiveScriptProfilerCallback3_FWD_DEFINED__ typedef interface IActiveScriptProfilerCallback3 IActiveScriptProfilerCallback3; +#ifdef __cplusplus +interface IActiveScriptProfilerCallback3; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -132,33 +154,34 @@ typedef struct IActiveScriptProfilerControlVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptProfilerControl* This, + IActiveScriptProfilerControl *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptProfilerControl* This); + IActiveScriptProfilerControl *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptProfilerControl* This); + IActiveScriptProfilerControl *This); /*** IActiveScriptProfilerControl methods ***/ HRESULT (STDMETHODCALLTYPE *StartProfiling)( - IActiveScriptProfilerControl* This, + IActiveScriptProfilerControl *This, REFCLSID clsidProfilerObject, DWORD dwEventMask, DWORD dwContext); HRESULT (STDMETHODCALLTYPE *SetProfilerEventMask)( - IActiveScriptProfilerControl* This, + IActiveScriptProfilerControl *This, DWORD dwEventMask); HRESULT (STDMETHODCALLTYPE *StopProfiling)( - IActiveScriptProfilerControl* This, + IActiveScriptProfilerControl *This, HRESULT hrShutdownReason); END_INTERFACE } IActiveScriptProfilerControlVtbl; + interface IActiveScriptProfilerControl { CONST_VTBL IActiveScriptProfilerControlVtbl* lpVtbl; }; @@ -199,32 +222,6 @@ static FORCEINLINE HRESULT IActiveScriptProfilerControl_StopProfiling(IActiveScr #endif -HRESULT STDMETHODCALLTYPE IActiveScriptProfilerControl_StartProfiling_Proxy( - IActiveScriptProfilerControl* This, - REFCLSID clsidProfilerObject, - DWORD dwEventMask, - DWORD dwContext); -void __RPC_STUB IActiveScriptProfilerControl_StartProfiling_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptProfilerControl_SetProfilerEventMask_Proxy( - IActiveScriptProfilerControl* This, - DWORD dwEventMask); -void __RPC_STUB IActiveScriptProfilerControl_SetProfilerEventMask_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptProfilerControl_StopProfiling_Proxy( - IActiveScriptProfilerControl* This, - HRESULT hrShutdownReason); -void __RPC_STUB IActiveScriptProfilerControl_StopProfiling_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptProfilerControl_INTERFACE_DEFINED__ */ @@ -256,40 +253,41 @@ typedef struct IActiveScriptProfilerControl2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptProfilerControl2* This, + IActiveScriptProfilerControl2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptProfilerControl2* This); + IActiveScriptProfilerControl2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptProfilerControl2* This); + IActiveScriptProfilerControl2 *This); /*** IActiveScriptProfilerControl methods ***/ HRESULT (STDMETHODCALLTYPE *StartProfiling)( - IActiveScriptProfilerControl2* This, + IActiveScriptProfilerControl2 *This, REFCLSID clsidProfilerObject, DWORD dwEventMask, DWORD dwContext); HRESULT (STDMETHODCALLTYPE *SetProfilerEventMask)( - IActiveScriptProfilerControl2* This, + IActiveScriptProfilerControl2 *This, DWORD dwEventMask); HRESULT (STDMETHODCALLTYPE *StopProfiling)( - IActiveScriptProfilerControl2* This, + IActiveScriptProfilerControl2 *This, HRESULT hrShutdownReason); /*** IActiveScriptProfilerControl2 methods ***/ HRESULT (STDMETHODCALLTYPE *CompleteProfilerStart)( - IActiveScriptProfilerControl2* This); + IActiveScriptProfilerControl2 *This); HRESULT (STDMETHODCALLTYPE *PrepareProfilerStop)( - IActiveScriptProfilerControl2* This); + IActiveScriptProfilerControl2 *This); END_INTERFACE } IActiveScriptProfilerControl2Vtbl; + interface IActiveScriptProfilerControl2 { CONST_VTBL IActiveScriptProfilerControl2Vtbl* lpVtbl; }; @@ -340,20 +338,6 @@ static FORCEINLINE HRESULT IActiveScriptProfilerControl2_PrepareProfilerStop(IAc #endif -HRESULT STDMETHODCALLTYPE IActiveScriptProfilerControl2_CompleteProfilerStart_Proxy( - IActiveScriptProfilerControl2* This); -void __RPC_STUB IActiveScriptProfilerControl2_CompleteProfilerStart_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptProfilerControl2_PrepareProfilerStop_Proxy( - IActiveScriptProfilerControl2* This); -void __RPC_STUB IActiveScriptProfilerControl2_PrepareProfilerStop_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptProfilerControl2_INTERFACE_DEFINED__ */ @@ -489,41 +473,42 @@ typedef struct IActiveScriptProfilerHeapEnumVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptProfilerHeapEnum* This, + IActiveScriptProfilerHeapEnum *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptProfilerHeapEnum* This); + IActiveScriptProfilerHeapEnum *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptProfilerHeapEnum* This); + IActiveScriptProfilerHeapEnum *This); /*** IActiveScriptProfilerHeapEnum methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IActiveScriptProfilerHeapEnum* This, + IActiveScriptProfilerHeapEnum *This, ULONG celt, PROFILER_HEAP_OBJECT **heapObjects, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *GetOptionalInfo)( - IActiveScriptProfilerHeapEnum* This, + IActiveScriptProfilerHeapEnum *This, PROFILER_HEAP_OBJECT *heapObject, ULONG celt, PROFILER_HEAP_OBJECT_OPTIONAL_INFO *optionalInfo); HRESULT (STDMETHODCALLTYPE *FreeObjectAndOptionalInfo)( - IActiveScriptProfilerHeapEnum* This, + IActiveScriptProfilerHeapEnum *This, ULONG celt, PROFILER_HEAP_OBJECT **heapObjects); HRESULT (STDMETHODCALLTYPE *GetNameIdMap)( - IActiveScriptProfilerHeapEnum* This, + IActiveScriptProfilerHeapEnum *This, LPCWSTR * pNameList[], UINT *pcelt); END_INTERFACE } IActiveScriptProfilerHeapEnumVtbl; + interface IActiveScriptProfilerHeapEnum { CONST_VTBL IActiveScriptProfilerHeapEnumVtbl* lpVtbl; }; @@ -568,44 +553,6 @@ static FORCEINLINE HRESULT IActiveScriptProfilerHeapEnum_GetNameIdMap(IActiveScr #endif -HRESULT STDMETHODCALLTYPE IActiveScriptProfilerHeapEnum_Next_Proxy( - IActiveScriptProfilerHeapEnum* This, - ULONG celt, - PROFILER_HEAP_OBJECT **heapObjects, - ULONG *pceltFetched); -void __RPC_STUB IActiveScriptProfilerHeapEnum_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptProfilerHeapEnum_GetOptionalInfo_Proxy( - IActiveScriptProfilerHeapEnum* This, - PROFILER_HEAP_OBJECT *heapObject, - ULONG celt, - PROFILER_HEAP_OBJECT_OPTIONAL_INFO *optionalInfo); -void __RPC_STUB IActiveScriptProfilerHeapEnum_GetOptionalInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptProfilerHeapEnum_FreeObjectAndOptionalInfo_Proxy( - IActiveScriptProfilerHeapEnum* This, - ULONG celt, - PROFILER_HEAP_OBJECT **heapObjects); -void __RPC_STUB IActiveScriptProfilerHeapEnum_FreeObjectAndOptionalInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptProfilerHeapEnum_GetNameIdMap_Proxy( - IActiveScriptProfilerHeapEnum* This, - LPCWSTR * pNameList[], - UINT *pcelt); -void __RPC_STUB IActiveScriptProfilerHeapEnum_GetNameIdMap_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptProfilerHeapEnum_INTERFACE_DEFINED__ */ @@ -634,45 +581,46 @@ typedef struct IActiveScriptProfilerControl3Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptProfilerControl3* This, + IActiveScriptProfilerControl3 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptProfilerControl3* This); + IActiveScriptProfilerControl3 *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptProfilerControl3* This); + IActiveScriptProfilerControl3 *This); /*** IActiveScriptProfilerControl methods ***/ HRESULT (STDMETHODCALLTYPE *StartProfiling)( - IActiveScriptProfilerControl3* This, + IActiveScriptProfilerControl3 *This, REFCLSID clsidProfilerObject, DWORD dwEventMask, DWORD dwContext); HRESULT (STDMETHODCALLTYPE *SetProfilerEventMask)( - IActiveScriptProfilerControl3* This, + IActiveScriptProfilerControl3 *This, DWORD dwEventMask); HRESULT (STDMETHODCALLTYPE *StopProfiling)( - IActiveScriptProfilerControl3* This, + IActiveScriptProfilerControl3 *This, HRESULT hrShutdownReason); /*** IActiveScriptProfilerControl2 methods ***/ HRESULT (STDMETHODCALLTYPE *CompleteProfilerStart)( - IActiveScriptProfilerControl3* This); + IActiveScriptProfilerControl3 *This); HRESULT (STDMETHODCALLTYPE *PrepareProfilerStop)( - IActiveScriptProfilerControl3* This); + IActiveScriptProfilerControl3 *This); /*** IActiveScriptProfilerControl3 methods ***/ HRESULT (STDMETHODCALLTYPE *EnumHeap)( - IActiveScriptProfilerControl3* This, + IActiveScriptProfilerControl3 *This, IActiveScriptProfilerHeapEnum **ppEnum); END_INTERFACE } IActiveScriptProfilerControl3Vtbl; + interface IActiveScriptProfilerControl3 { CONST_VTBL IActiveScriptProfilerControl3Vtbl* lpVtbl; }; @@ -729,14 +677,6 @@ static FORCEINLINE HRESULT IActiveScriptProfilerControl3_EnumHeap(IActiveScriptP #endif -HRESULT STDMETHODCALLTYPE IActiveScriptProfilerControl3_EnumHeap_Proxy( - IActiveScriptProfilerControl3* This, - IActiveScriptProfilerHeapEnum **ppEnum); -void __RPC_STUB IActiveScriptProfilerControl3_EnumHeap_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptProfilerControl3_INTERFACE_DEFINED__ */ @@ -788,33 +728,33 @@ typedef struct IActiveScriptProfilerCallbackVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptProfilerCallback* This, + IActiveScriptProfilerCallback *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptProfilerCallback* This); + IActiveScriptProfilerCallback *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptProfilerCallback* This); + IActiveScriptProfilerCallback *This); /*** IActiveScriptProfilerCallback methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IActiveScriptProfilerCallback* This, + IActiveScriptProfilerCallback *This, DWORD dwContext); HRESULT (STDMETHODCALLTYPE *Shutdown)( - IActiveScriptProfilerCallback* This, + IActiveScriptProfilerCallback *This, HRESULT hrReason); HRESULT (STDMETHODCALLTYPE *ScriptCompiled)( - IActiveScriptProfilerCallback* This, + IActiveScriptProfilerCallback *This, PROFILER_TOKEN scriptId, PROFILER_SCRIPT_TYPE type, IUnknown *pIDebugDocumentContext); HRESULT (STDMETHODCALLTYPE *FunctionCompiled)( - IActiveScriptProfilerCallback* This, + IActiveScriptProfilerCallback *This, PROFILER_TOKEN functionId, PROFILER_TOKEN scriptId, const WCHAR *pwszFunctionName, @@ -822,17 +762,18 @@ typedef struct IActiveScriptProfilerCallbackVtbl { IUnknown *pIDebugDocumentContext); HRESULT (STDMETHODCALLTYPE *OnFunctionEnter)( - IActiveScriptProfilerCallback* This, + IActiveScriptProfilerCallback *This, PROFILER_TOKEN scriptId, PROFILER_TOKEN functionId); HRESULT (STDMETHODCALLTYPE *OnFunctionExit)( - IActiveScriptProfilerCallback* This, + IActiveScriptProfilerCallback *This, PROFILER_TOKEN scriptId, PROFILER_TOKEN functionId); END_INTERFACE } IActiveScriptProfilerCallbackVtbl; + interface IActiveScriptProfilerCallback { CONST_VTBL IActiveScriptProfilerCallbackVtbl* lpVtbl; }; @@ -885,62 +826,6 @@ static FORCEINLINE HRESULT IActiveScriptProfilerCallback_OnFunctionExit(IActiveS #endif -HRESULT STDMETHODCALLTYPE IActiveScriptProfilerCallback_Initialize_Proxy( - IActiveScriptProfilerCallback* This, - DWORD dwContext); -void __RPC_STUB IActiveScriptProfilerCallback_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptProfilerCallback_Shutdown_Proxy( - IActiveScriptProfilerCallback* This, - HRESULT hrReason); -void __RPC_STUB IActiveScriptProfilerCallback_Shutdown_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptProfilerCallback_ScriptCompiled_Proxy( - IActiveScriptProfilerCallback* This, - PROFILER_TOKEN scriptId, - PROFILER_SCRIPT_TYPE type, - IUnknown *pIDebugDocumentContext); -void __RPC_STUB IActiveScriptProfilerCallback_ScriptCompiled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptProfilerCallback_FunctionCompiled_Proxy( - IActiveScriptProfilerCallback* This, - PROFILER_TOKEN functionId, - PROFILER_TOKEN scriptId, - const WCHAR *pwszFunctionName, - const WCHAR *pwszFunctionNameHint, - IUnknown *pIDebugDocumentContext); -void __RPC_STUB IActiveScriptProfilerCallback_FunctionCompiled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptProfilerCallback_OnFunctionEnter_Proxy( - IActiveScriptProfilerCallback* This, - PROFILER_TOKEN scriptId, - PROFILER_TOKEN functionId); -void __RPC_STUB IActiveScriptProfilerCallback_OnFunctionEnter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptProfilerCallback_OnFunctionExit_Proxy( - IActiveScriptProfilerCallback* This, - PROFILER_TOKEN scriptId, - PROFILER_TOKEN functionId); -void __RPC_STUB IActiveScriptProfilerCallback_OnFunctionExit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptProfilerCallback_INTERFACE_DEFINED__ */ @@ -974,33 +859,33 @@ typedef struct IActiveScriptProfilerCallback2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptProfilerCallback2* This, + IActiveScriptProfilerCallback2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptProfilerCallback2* This); + IActiveScriptProfilerCallback2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptProfilerCallback2* This); + IActiveScriptProfilerCallback2 *This); /*** IActiveScriptProfilerCallback methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IActiveScriptProfilerCallback2* This, + IActiveScriptProfilerCallback2 *This, DWORD dwContext); HRESULT (STDMETHODCALLTYPE *Shutdown)( - IActiveScriptProfilerCallback2* This, + IActiveScriptProfilerCallback2 *This, HRESULT hrReason); HRESULT (STDMETHODCALLTYPE *ScriptCompiled)( - IActiveScriptProfilerCallback2* This, + IActiveScriptProfilerCallback2 *This, PROFILER_TOKEN scriptId, PROFILER_SCRIPT_TYPE type, IUnknown *pIDebugDocumentContext); HRESULT (STDMETHODCALLTYPE *FunctionCompiled)( - IActiveScriptProfilerCallback2* This, + IActiveScriptProfilerCallback2 *This, PROFILER_TOKEN functionId, PROFILER_TOKEN scriptId, const WCHAR *pwszFunctionName, @@ -1008,28 +893,29 @@ typedef struct IActiveScriptProfilerCallback2Vtbl { IUnknown *pIDebugDocumentContext); HRESULT (STDMETHODCALLTYPE *OnFunctionEnter)( - IActiveScriptProfilerCallback2* This, + IActiveScriptProfilerCallback2 *This, PROFILER_TOKEN scriptId, PROFILER_TOKEN functionId); HRESULT (STDMETHODCALLTYPE *OnFunctionExit)( - IActiveScriptProfilerCallback2* This, + IActiveScriptProfilerCallback2 *This, PROFILER_TOKEN scriptId, PROFILER_TOKEN functionId); /*** IActiveScriptProfilerCallback2 methods ***/ HRESULT (STDMETHODCALLTYPE *OnFunctionEnterByName)( - IActiveScriptProfilerCallback2* This, + IActiveScriptProfilerCallback2 *This, const WCHAR *pwszFunctionName, PROFILER_SCRIPT_TYPE type); HRESULT (STDMETHODCALLTYPE *OnFunctionExitByName)( - IActiveScriptProfilerCallback2* This, + IActiveScriptProfilerCallback2 *This, const WCHAR *pwszFunctionName, PROFILER_SCRIPT_TYPE type); END_INTERFACE } IActiveScriptProfilerCallback2Vtbl; + interface IActiveScriptProfilerCallback2 { CONST_VTBL IActiveScriptProfilerCallback2Vtbl* lpVtbl; }; @@ -1092,24 +978,6 @@ static FORCEINLINE HRESULT IActiveScriptProfilerCallback2_OnFunctionExitByName(I #endif -HRESULT STDMETHODCALLTYPE IActiveScriptProfilerCallback2_OnFunctionEnterByName_Proxy( - IActiveScriptProfilerCallback2* This, - const WCHAR *pwszFunctionName, - PROFILER_SCRIPT_TYPE type); -void __RPC_STUB IActiveScriptProfilerCallback2_OnFunctionEnterByName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptProfilerCallback2_OnFunctionExitByName_Proxy( - IActiveScriptProfilerCallback2* This, - const WCHAR *pwszFunctionName, - PROFILER_SCRIPT_TYPE type); -void __RPC_STUB IActiveScriptProfilerCallback2_OnFunctionExitByName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptProfilerCallback2_INTERFACE_DEFINED__ */ @@ -1138,33 +1006,33 @@ typedef struct IActiveScriptProfilerCallback3Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptProfilerCallback3* This, + IActiveScriptProfilerCallback3 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptProfilerCallback3* This); + IActiveScriptProfilerCallback3 *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptProfilerCallback3* This); + IActiveScriptProfilerCallback3 *This); /*** IActiveScriptProfilerCallback methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IActiveScriptProfilerCallback3* This, + IActiveScriptProfilerCallback3 *This, DWORD dwContext); HRESULT (STDMETHODCALLTYPE *Shutdown)( - IActiveScriptProfilerCallback3* This, + IActiveScriptProfilerCallback3 *This, HRESULT hrReason); HRESULT (STDMETHODCALLTYPE *ScriptCompiled)( - IActiveScriptProfilerCallback3* This, + IActiveScriptProfilerCallback3 *This, PROFILER_TOKEN scriptId, PROFILER_SCRIPT_TYPE type, IUnknown *pIDebugDocumentContext); HRESULT (STDMETHODCALLTYPE *FunctionCompiled)( - IActiveScriptProfilerCallback3* This, + IActiveScriptProfilerCallback3 *This, PROFILER_TOKEN functionId, PROFILER_TOKEN scriptId, const WCHAR *pwszFunctionName, @@ -1172,33 +1040,34 @@ typedef struct IActiveScriptProfilerCallback3Vtbl { IUnknown *pIDebugDocumentContext); HRESULT (STDMETHODCALLTYPE *OnFunctionEnter)( - IActiveScriptProfilerCallback3* This, + IActiveScriptProfilerCallback3 *This, PROFILER_TOKEN scriptId, PROFILER_TOKEN functionId); HRESULT (STDMETHODCALLTYPE *OnFunctionExit)( - IActiveScriptProfilerCallback3* This, + IActiveScriptProfilerCallback3 *This, PROFILER_TOKEN scriptId, PROFILER_TOKEN functionId); /*** IActiveScriptProfilerCallback2 methods ***/ HRESULT (STDMETHODCALLTYPE *OnFunctionEnterByName)( - IActiveScriptProfilerCallback3* This, + IActiveScriptProfilerCallback3 *This, const WCHAR *pwszFunctionName, PROFILER_SCRIPT_TYPE type); HRESULT (STDMETHODCALLTYPE *OnFunctionExitByName)( - IActiveScriptProfilerCallback3* This, + IActiveScriptProfilerCallback3 *This, const WCHAR *pwszFunctionName, PROFILER_SCRIPT_TYPE type); /*** IActiveScriptProfilerCallback3 methods ***/ HRESULT (STDMETHODCALLTYPE *SetWebWorkerId)( - IActiveScriptProfilerCallback3* This, + IActiveScriptProfilerCallback3 *This, DWORD webWorkerId); END_INTERFACE } IActiveScriptProfilerCallback3Vtbl; + interface IActiveScriptProfilerCallback3 { CONST_VTBL IActiveScriptProfilerCallback3Vtbl* lpVtbl; }; @@ -1267,14 +1136,6 @@ static FORCEINLINE HRESULT IActiveScriptProfilerCallback3_SetWebWorkerId(IActive #endif -HRESULT STDMETHODCALLTYPE IActiveScriptProfilerCallback3_SetWebWorkerId_Proxy( - IActiveScriptProfilerCallback3* This, - DWORD webWorkerId); -void __RPC_STUB IActiveScriptProfilerCallback3_SetWebWorkerId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptProfilerCallback3_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/activscp.h b/lib/libc/include/any-windows-any/activscp.h index cf93d7a4f7..8d8c15ea63 100644 --- a/lib/libc/include/any-windows-any/activscp.h +++ b/lib/libc/include/any-windows-any/activscp.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/activscp.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/activscp.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,131 +21,209 @@ #ifndef __IActiveScriptSite_FWD_DEFINED__ #define __IActiveScriptSite_FWD_DEFINED__ typedef interface IActiveScriptSite IActiveScriptSite; +#ifdef __cplusplus +interface IActiveScriptSite; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptError_FWD_DEFINED__ #define __IActiveScriptError_FWD_DEFINED__ typedef interface IActiveScriptError IActiveScriptError; +#ifdef __cplusplus +interface IActiveScriptError; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptError64_FWD_DEFINED__ #define __IActiveScriptError64_FWD_DEFINED__ typedef interface IActiveScriptError64 IActiveScriptError64; +#ifdef __cplusplus +interface IActiveScriptError64; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptSiteWindow_FWD_DEFINED__ #define __IActiveScriptSiteWindow_FWD_DEFINED__ typedef interface IActiveScriptSiteWindow IActiveScriptSiteWindow; +#ifdef __cplusplus +interface IActiveScriptSiteWindow; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptSiteUIControl_FWD_DEFINED__ #define __IActiveScriptSiteUIControl_FWD_DEFINED__ typedef interface IActiveScriptSiteUIControl IActiveScriptSiteUIControl; +#ifdef __cplusplus +interface IActiveScriptSiteUIControl; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptSiteInterruptPoll_FWD_DEFINED__ #define __IActiveScriptSiteInterruptPoll_FWD_DEFINED__ typedef interface IActiveScriptSiteInterruptPoll IActiveScriptSiteInterruptPoll; +#ifdef __cplusplus +interface IActiveScriptSiteInterruptPoll; +#endif /* __cplusplus */ #endif #ifndef __IActiveScript_FWD_DEFINED__ #define __IActiveScript_FWD_DEFINED__ typedef interface IActiveScript IActiveScript; +#ifdef __cplusplus +interface IActiveScript; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptParse32_FWD_DEFINED__ #define __IActiveScriptParse32_FWD_DEFINED__ typedef interface IActiveScriptParse32 IActiveScriptParse32; +#ifdef __cplusplus +interface IActiveScriptParse32; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptParse64_FWD_DEFINED__ #define __IActiveScriptParse64_FWD_DEFINED__ typedef interface IActiveScriptParse64 IActiveScriptParse64; +#ifdef __cplusplus +interface IActiveScriptParse64; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptParseProcedureOld32_FWD_DEFINED__ #define __IActiveScriptParseProcedureOld32_FWD_DEFINED__ typedef interface IActiveScriptParseProcedureOld32 IActiveScriptParseProcedureOld32; +#ifdef __cplusplus +interface IActiveScriptParseProcedureOld32; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptParseProcedureOld64_FWD_DEFINED__ #define __IActiveScriptParseProcedureOld64_FWD_DEFINED__ typedef interface IActiveScriptParseProcedureOld64 IActiveScriptParseProcedureOld64; +#ifdef __cplusplus +interface IActiveScriptParseProcedureOld64; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptParseProcedure32_FWD_DEFINED__ #define __IActiveScriptParseProcedure32_FWD_DEFINED__ typedef interface IActiveScriptParseProcedure32 IActiveScriptParseProcedure32; +#ifdef __cplusplus +interface IActiveScriptParseProcedure32; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptParseProcedure64_FWD_DEFINED__ #define __IActiveScriptParseProcedure64_FWD_DEFINED__ typedef interface IActiveScriptParseProcedure64 IActiveScriptParseProcedure64; +#ifdef __cplusplus +interface IActiveScriptParseProcedure64; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptParseProcedure2_32_FWD_DEFINED__ #define __IActiveScriptParseProcedure2_32_FWD_DEFINED__ typedef interface IActiveScriptParseProcedure2_32 IActiveScriptParseProcedure2_32; +#ifdef __cplusplus +interface IActiveScriptParseProcedure2_32; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptParseProcedure2_64_FWD_DEFINED__ #define __IActiveScriptParseProcedure2_64_FWD_DEFINED__ typedef interface IActiveScriptParseProcedure2_64 IActiveScriptParseProcedure2_64; +#ifdef __cplusplus +interface IActiveScriptParseProcedure2_64; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptEncode_FWD_DEFINED__ #define __IActiveScriptEncode_FWD_DEFINED__ typedef interface IActiveScriptEncode IActiveScriptEncode; +#ifdef __cplusplus +interface IActiveScriptEncode; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptHostEncode_FWD_DEFINED__ #define __IActiveScriptHostEncode_FWD_DEFINED__ typedef interface IActiveScriptHostEncode IActiveScriptHostEncode; +#ifdef __cplusplus +interface IActiveScriptHostEncode; +#endif /* __cplusplus */ #endif #ifndef __IBindEventHandler_FWD_DEFINED__ #define __IBindEventHandler_FWD_DEFINED__ typedef interface IBindEventHandler IBindEventHandler; +#ifdef __cplusplus +interface IBindEventHandler; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptStats_FWD_DEFINED__ #define __IActiveScriptStats_FWD_DEFINED__ typedef interface IActiveScriptStats IActiveScriptStats; +#ifdef __cplusplus +interface IActiveScriptStats; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptProperty_FWD_DEFINED__ #define __IActiveScriptProperty_FWD_DEFINED__ typedef interface IActiveScriptProperty IActiveScriptProperty; +#ifdef __cplusplus +interface IActiveScriptProperty; +#endif /* __cplusplus */ #endif #ifndef __ITridentEventSink_FWD_DEFINED__ #define __ITridentEventSink_FWD_DEFINED__ typedef interface ITridentEventSink ITridentEventSink; +#ifdef __cplusplus +interface ITridentEventSink; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptGarbageCollector_FWD_DEFINED__ #define __IActiveScriptGarbageCollector_FWD_DEFINED__ typedef interface IActiveScriptGarbageCollector IActiveScriptGarbageCollector; +#ifdef __cplusplus +interface IActiveScriptGarbageCollector; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptSIPInfo_FWD_DEFINED__ #define __IActiveScriptSIPInfo_FWD_DEFINED__ typedef interface IActiveScriptSIPInfo IActiveScriptSIPInfo; +#ifdef __cplusplus +interface IActiveScriptSIPInfo; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptSiteTraceInfo_FWD_DEFINED__ #define __IActiveScriptSiteTraceInfo_FWD_DEFINED__ typedef interface IActiveScriptSiteTraceInfo IActiveScriptSiteTraceInfo; +#ifdef __cplusplus +interface IActiveScriptSiteTraceInfo; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptTraceInfo_FWD_DEFINED__ #define __IActiveScriptTraceInfo_FWD_DEFINED__ typedef interface IActiveScriptTraceInfo IActiveScriptTraceInfo; +#ifdef __cplusplus +interface IActiveScriptTraceInfo; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptStringCompare_FWD_DEFINED__ #define __IActiveScriptStringCompare_FWD_DEFINED__ typedef interface IActiveScriptStringCompare IActiveScriptStringCompare; +#ifdef __cplusplus +interface IActiveScriptStringCompare; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -317,121 +396,193 @@ typedef DWORD SCRIPTTHREADID; #ifndef __IActiveScriptSite_FWD_DEFINED__ #define __IActiveScriptSite_FWD_DEFINED__ typedef interface IActiveScriptSite IActiveScriptSite; +#ifdef __cplusplus +interface IActiveScriptSite; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptError_FWD_DEFINED__ #define __IActiveScriptError_FWD_DEFINED__ typedef interface IActiveScriptError IActiveScriptError; +#ifdef __cplusplus +interface IActiveScriptError; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptError64_FWD_DEFINED__ #define __IActiveScriptError64_FWD_DEFINED__ typedef interface IActiveScriptError64 IActiveScriptError64; +#ifdef __cplusplus +interface IActiveScriptError64; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptSiteWindow_FWD_DEFINED__ #define __IActiveScriptSiteWindow_FWD_DEFINED__ typedef interface IActiveScriptSiteWindow IActiveScriptSiteWindow; +#ifdef __cplusplus +interface IActiveScriptSiteWindow; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptSiteUIControl_FWD_DEFINED__ #define __IActiveScriptSiteUIControl_FWD_DEFINED__ typedef interface IActiveScriptSiteUIControl IActiveScriptSiteUIControl; +#ifdef __cplusplus +interface IActiveScriptSiteUIControl; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptSiteInterruptPoll_FWD_DEFINED__ #define __IActiveScriptSiteInterruptPoll_FWD_DEFINED__ typedef interface IActiveScriptSiteInterruptPoll IActiveScriptSiteInterruptPoll; +#ifdef __cplusplus +interface IActiveScriptSiteInterruptPoll; +#endif /* __cplusplus */ #endif #ifndef __IActiveScript_FWD_DEFINED__ #define __IActiveScript_FWD_DEFINED__ typedef interface IActiveScript IActiveScript; +#ifdef __cplusplus +interface IActiveScript; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptParse32_FWD_DEFINED__ #define __IActiveScriptParse32_FWD_DEFINED__ typedef interface IActiveScriptParse32 IActiveScriptParse32; +#ifdef __cplusplus +interface IActiveScriptParse32; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptParse64_FWD_DEFINED__ #define __IActiveScriptParse64_FWD_DEFINED__ typedef interface IActiveScriptParse64 IActiveScriptParse64; +#ifdef __cplusplus +interface IActiveScriptParse64; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptParseProcedureOld32_FWD_DEFINED__ #define __IActiveScriptParseProcedureOld32_FWD_DEFINED__ typedef interface IActiveScriptParseProcedureOld32 IActiveScriptParseProcedureOld32; +#ifdef __cplusplus +interface IActiveScriptParseProcedureOld32; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptParseProcedureOld64_FWD_DEFINED__ #define __IActiveScriptParseProcedureOld64_FWD_DEFINED__ typedef interface IActiveScriptParseProcedureOld64 IActiveScriptParseProcedureOld64; +#ifdef __cplusplus +interface IActiveScriptParseProcedureOld64; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptParseProcedure32_FWD_DEFINED__ #define __IActiveScriptParseProcedure32_FWD_DEFINED__ typedef interface IActiveScriptParseProcedure32 IActiveScriptParseProcedure32; +#ifdef __cplusplus +interface IActiveScriptParseProcedure32; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptParseProcedure64_FWD_DEFINED__ #define __IActiveScriptParseProcedure64_FWD_DEFINED__ typedef interface IActiveScriptParseProcedure64 IActiveScriptParseProcedure64; +#ifdef __cplusplus +interface IActiveScriptParseProcedure64; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptParseProcedure2_32_FWD_DEFINED__ #define __IActiveScriptParseProcedure2_32_FWD_DEFINED__ typedef interface IActiveScriptParseProcedure2_32 IActiveScriptParseProcedure2_32; +#ifdef __cplusplus +interface IActiveScriptParseProcedure2_32; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptParseProcedure2_64_FWD_DEFINED__ #define __IActiveScriptParseProcedure2_64_FWD_DEFINED__ typedef interface IActiveScriptParseProcedure2_64 IActiveScriptParseProcedure2_64; +#ifdef __cplusplus +interface IActiveScriptParseProcedure2_64; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptEncode_FWD_DEFINED__ #define __IActiveScriptEncode_FWD_DEFINED__ typedef interface IActiveScriptEncode IActiveScriptEncode; +#ifdef __cplusplus +interface IActiveScriptEncode; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptHostEncode_FWD_DEFINED__ #define __IActiveScriptHostEncode_FWD_DEFINED__ typedef interface IActiveScriptHostEncode IActiveScriptHostEncode; +#ifdef __cplusplus +interface IActiveScriptHostEncode; +#endif /* __cplusplus */ #endif #ifndef __IBindEventHandler_FWD_DEFINED__ #define __IBindEventHandler_FWD_DEFINED__ typedef interface IBindEventHandler IBindEventHandler; +#ifdef __cplusplus +interface IBindEventHandler; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptStats_FWD_DEFINED__ #define __IActiveScriptStats_FWD_DEFINED__ typedef interface IActiveScriptStats IActiveScriptStats; +#ifdef __cplusplus +interface IActiveScriptStats; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptProperty_FWD_DEFINED__ #define __IActiveScriptProperty_FWD_DEFINED__ typedef interface IActiveScriptProperty IActiveScriptProperty; +#ifdef __cplusplus +interface IActiveScriptProperty; +#endif /* __cplusplus */ #endif #ifndef __ITridentEventSink_FWD_DEFINED__ #define __ITridentEventSink_FWD_DEFINED__ typedef interface ITridentEventSink ITridentEventSink; +#ifdef __cplusplus +interface ITridentEventSink; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptGarbageCollector_FWD_DEFINED__ #define __IActiveScriptGarbageCollector_FWD_DEFINED__ typedef interface IActiveScriptGarbageCollector IActiveScriptGarbageCollector; +#ifdef __cplusplus +interface IActiveScriptGarbageCollector; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptSIPInfo_FWD_DEFINED__ #define __IActiveScriptSIPInfo_FWD_DEFINED__ typedef interface IActiveScriptSIPInfo IActiveScriptSIPInfo; +#ifdef __cplusplus +interface IActiveScriptSIPInfo; +#endif /* __cplusplus */ #endif #ifndef __IActiveScriptStringCompare_FWD_DEFINED__ #define __IActiveScriptStringCompare_FWD_DEFINED__ typedef interface IActiveScriptStringCompare IActiveScriptStringCompare; +#ifdef __cplusplus +interface IActiveScriptStringCompare; +#endif /* __cplusplus */ #endif @@ -484,53 +635,54 @@ typedef struct IActiveScriptSiteVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptSite* This, + IActiveScriptSite *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptSite* This); + IActiveScriptSite *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptSite* This); + IActiveScriptSite *This); /*** IActiveScriptSite methods ***/ HRESULT (STDMETHODCALLTYPE *GetLCID)( - IActiveScriptSite* This, + IActiveScriptSite *This, LCID *plcid); HRESULT (STDMETHODCALLTYPE *GetItemInfo)( - IActiveScriptSite* This, + IActiveScriptSite *This, LPCOLESTR pstrName, DWORD dwReturnMask, IUnknown **ppiunkItem, ITypeInfo **ppti); HRESULT (STDMETHODCALLTYPE *GetDocVersionString)( - IActiveScriptSite* This, + IActiveScriptSite *This, BSTR *pbstrVersion); HRESULT (STDMETHODCALLTYPE *OnScriptTerminate)( - IActiveScriptSite* This, + IActiveScriptSite *This, const VARIANT *pvarResult, const EXCEPINFO *pexcepinfo); HRESULT (STDMETHODCALLTYPE *OnStateChange)( - IActiveScriptSite* This, + IActiveScriptSite *This, SCRIPTSTATE ssScriptState); HRESULT (STDMETHODCALLTYPE *OnScriptError)( - IActiveScriptSite* This, + IActiveScriptSite *This, IActiveScriptError *pscripterror); HRESULT (STDMETHODCALLTYPE *OnEnterScript)( - IActiveScriptSite* This); + IActiveScriptSite *This); HRESULT (STDMETHODCALLTYPE *OnLeaveScript)( - IActiveScriptSite* This); + IActiveScriptSite *This); END_INTERFACE } IActiveScriptSiteVtbl; + interface IActiveScriptSite { CONST_VTBL IActiveScriptSiteVtbl* lpVtbl; }; @@ -591,72 +743,6 @@ static FORCEINLINE HRESULT IActiveScriptSite_OnLeaveScript(IActiveScriptSite* Th #endif -HRESULT STDMETHODCALLTYPE IActiveScriptSite_GetLCID_Proxy( - IActiveScriptSite* This, - LCID *plcid); -void __RPC_STUB IActiveScriptSite_GetLCID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptSite_GetItemInfo_Proxy( - IActiveScriptSite* This, - LPCOLESTR pstrName, - DWORD dwReturnMask, - IUnknown **ppiunkItem, - ITypeInfo **ppti); -void __RPC_STUB IActiveScriptSite_GetItemInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptSite_GetDocVersionString_Proxy( - IActiveScriptSite* This, - BSTR *pbstrVersion); -void __RPC_STUB IActiveScriptSite_GetDocVersionString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptSite_OnScriptTerminate_Proxy( - IActiveScriptSite* This, - const VARIANT *pvarResult, - const EXCEPINFO *pexcepinfo); -void __RPC_STUB IActiveScriptSite_OnScriptTerminate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptSite_OnStateChange_Proxy( - IActiveScriptSite* This, - SCRIPTSTATE ssScriptState); -void __RPC_STUB IActiveScriptSite_OnStateChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptSite_OnScriptError_Proxy( - IActiveScriptSite* This, - IActiveScriptError *pscripterror); -void __RPC_STUB IActiveScriptSite_OnScriptError_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptSite_OnEnterScript_Proxy( - IActiveScriptSite* This); -void __RPC_STUB IActiveScriptSite_OnEnterScript_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptSite_OnLeaveScript_Proxy( - IActiveScriptSite* This); -void __RPC_STUB IActiveScriptSite_OnLeaveScript_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptSite_INTERFACE_DEFINED__ */ @@ -693,33 +779,34 @@ typedef struct IActiveScriptErrorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptError* This, + IActiveScriptError *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptError* This); + IActiveScriptError *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptError* This); + IActiveScriptError *This); /*** IActiveScriptError methods ***/ HRESULT (STDMETHODCALLTYPE *GetExceptionInfo)( - IActiveScriptError* This, + IActiveScriptError *This, EXCEPINFO *pexcepinfo); HRESULT (STDMETHODCALLTYPE *GetSourcePosition)( - IActiveScriptError* This, + IActiveScriptError *This, DWORD *pdwSourceContext, ULONG *pulLineNumber, LONG *plCharacterPosition); HRESULT (STDMETHODCALLTYPE *GetSourceLineText)( - IActiveScriptError* This, + IActiveScriptError *This, BSTR *pbstrSourceLine); END_INTERFACE } IActiveScriptErrorVtbl; + interface IActiveScriptError { CONST_VTBL IActiveScriptErrorVtbl* lpVtbl; }; @@ -768,24 +855,6 @@ void __RPC_STUB IActiveScriptError_RemoteGetExceptionInfo_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptError_GetSourcePosition_Proxy( - IActiveScriptError* This, - DWORD *pdwSourceContext, - ULONG *pulLineNumber, - LONG *plCharacterPosition); -void __RPC_STUB IActiveScriptError_GetSourcePosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptError_GetSourceLineText_Proxy( - IActiveScriptError* This, - BSTR *pbstrSourceLine); -void __RPC_STUB IActiveScriptError_GetSourceLineText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IActiveScriptError_GetExceptionInfo_Proxy( IActiveScriptError* This, EXCEPINFO *pexcepinfo); @@ -822,40 +891,41 @@ typedef struct IActiveScriptError64Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptError64* This, + IActiveScriptError64 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptError64* This); + IActiveScriptError64 *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptError64* This); + IActiveScriptError64 *This); /*** IActiveScriptError methods ***/ HRESULT (STDMETHODCALLTYPE *GetExceptionInfo)( - IActiveScriptError64* This, + IActiveScriptError64 *This, EXCEPINFO *pexcepinfo); HRESULT (STDMETHODCALLTYPE *GetSourcePosition)( - IActiveScriptError64* This, + IActiveScriptError64 *This, DWORD *pdwSourceContext, ULONG *pulLineNumber, LONG *plCharacterPosition); HRESULT (STDMETHODCALLTYPE *GetSourceLineText)( - IActiveScriptError64* This, + IActiveScriptError64 *This, BSTR *pbstrSourceLine); /*** IActiveScriptError64 methods ***/ HRESULT (STDMETHODCALLTYPE *GetSourcePosition64)( - IActiveScriptError64* This, + IActiveScriptError64 *This, DWORDLONG *pdwSourceContext, ULONG *pulLineNumber, LONG *plCharacterPosition); END_INTERFACE } IActiveScriptError64Vtbl; + interface IActiveScriptError64 { CONST_VTBL IActiveScriptError64Vtbl* lpVtbl; }; @@ -902,16 +972,6 @@ static FORCEINLINE HRESULT IActiveScriptError64_GetSourcePosition64(IActiveScrip #endif -HRESULT STDMETHODCALLTYPE IActiveScriptError64_GetSourcePosition64_Proxy( - IActiveScriptError64* This, - DWORDLONG *pdwSourceContext, - ULONG *pulLineNumber, - LONG *plCharacterPosition); -void __RPC_STUB IActiveScriptError64_GetSourcePosition64_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptError64_INTERFACE_DEFINED__ */ @@ -942,27 +1002,28 @@ typedef struct IActiveScriptSiteWindowVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptSiteWindow* This, + IActiveScriptSiteWindow *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptSiteWindow* This); + IActiveScriptSiteWindow *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptSiteWindow* This); + IActiveScriptSiteWindow *This); /*** IActiveScriptSiteWindow methods ***/ HRESULT (STDMETHODCALLTYPE *GetWindow)( - IActiveScriptSiteWindow* This, + IActiveScriptSiteWindow *This, HWND *phwnd); HRESULT (STDMETHODCALLTYPE *EnableModeless)( - IActiveScriptSiteWindow* This, + IActiveScriptSiteWindow *This, WINBOOL fEnable); END_INTERFACE } IActiveScriptSiteWindowVtbl; + interface IActiveScriptSiteWindow { CONST_VTBL IActiveScriptSiteWindowVtbl* lpVtbl; }; @@ -999,22 +1060,6 @@ static FORCEINLINE HRESULT IActiveScriptSiteWindow_EnableModeless(IActiveScriptS #endif -HRESULT STDMETHODCALLTYPE IActiveScriptSiteWindow_GetWindow_Proxy( - IActiveScriptSiteWindow* This, - HWND *phwnd); -void __RPC_STUB IActiveScriptSiteWindow_GetWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptSiteWindow_EnableModeless_Proxy( - IActiveScriptSiteWindow* This, - WINBOOL fEnable); -void __RPC_STUB IActiveScriptSiteWindow_EnableModeless_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptSiteWindow_INTERFACE_DEFINED__ */ @@ -1044,24 +1089,25 @@ typedef struct IActiveScriptSiteUIControlVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptSiteUIControl* This, + IActiveScriptSiteUIControl *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptSiteUIControl* This); + IActiveScriptSiteUIControl *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptSiteUIControl* This); + IActiveScriptSiteUIControl *This); /*** IActiveScriptSiteUIControl methods ***/ HRESULT (STDMETHODCALLTYPE *GetUIBehavior)( - IActiveScriptSiteUIControl* This, + IActiveScriptSiteUIControl *This, SCRIPTUICITEM UicItem, SCRIPTUICHANDLING *pUicHandling); END_INTERFACE } IActiveScriptSiteUIControlVtbl; + interface IActiveScriptSiteUIControl { CONST_VTBL IActiveScriptSiteUIControlVtbl* lpVtbl; }; @@ -1094,15 +1140,6 @@ static FORCEINLINE HRESULT IActiveScriptSiteUIControl_GetUIBehavior(IActiveScrip #endif -HRESULT STDMETHODCALLTYPE IActiveScriptSiteUIControl_GetUIBehavior_Proxy( - IActiveScriptSiteUIControl* This, - SCRIPTUICITEM UicItem, - SCRIPTUICHANDLING *pUicHandling); -void __RPC_STUB IActiveScriptSiteUIControl_GetUIBehavior_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptSiteUIControl_INTERFACE_DEFINED__ */ @@ -1131,22 +1168,23 @@ typedef struct IActiveScriptSiteInterruptPollVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptSiteInterruptPoll* This, + IActiveScriptSiteInterruptPoll *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptSiteInterruptPoll* This); + IActiveScriptSiteInterruptPoll *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptSiteInterruptPoll* This); + IActiveScriptSiteInterruptPoll *This); /*** IActiveScriptSiteInterruptPoll methods ***/ HRESULT (STDMETHODCALLTYPE *QueryContinue)( - IActiveScriptSiteInterruptPoll* This); + IActiveScriptSiteInterruptPoll *This); END_INTERFACE } IActiveScriptSiteInterruptPollVtbl; + interface IActiveScriptSiteInterruptPoll { CONST_VTBL IActiveScriptSiteInterruptPollVtbl* lpVtbl; }; @@ -1179,13 +1217,6 @@ static FORCEINLINE HRESULT IActiveScriptSiteInterruptPoll_QueryContinue(IActiveS #endif -HRESULT STDMETHODCALLTYPE IActiveScriptSiteInterruptPoll_QueryContinue_Proxy( - IActiveScriptSiteInterruptPoll* This); -void __RPC_STUB IActiveScriptSiteInterruptPoll_QueryContinue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptSiteInterruptPoll_INTERFACE_DEFINED__ */ @@ -1260,80 +1291,81 @@ typedef struct IActiveScriptVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScript* This, + IActiveScript *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScript* This); + IActiveScript *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScript* This); + IActiveScript *This); /*** IActiveScript methods ***/ HRESULT (STDMETHODCALLTYPE *SetScriptSite)( - IActiveScript* This, + IActiveScript *This, IActiveScriptSite *pass); HRESULT (STDMETHODCALLTYPE *GetScriptSite)( - IActiveScript* This, + IActiveScript *This, REFIID riid, void **ppvObject); HRESULT (STDMETHODCALLTYPE *SetScriptState)( - IActiveScript* This, + IActiveScript *This, SCRIPTSTATE ss); HRESULT (STDMETHODCALLTYPE *GetScriptState)( - IActiveScript* This, + IActiveScript *This, SCRIPTSTATE *pssState); HRESULT (STDMETHODCALLTYPE *Close)( - IActiveScript* This); + IActiveScript *This); HRESULT (STDMETHODCALLTYPE *AddNamedItem)( - IActiveScript* This, + IActiveScript *This, LPCOLESTR pstrName, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *AddTypeLib)( - IActiveScript* This, + IActiveScript *This, REFGUID rguidTypeLib, DWORD dwMajor, DWORD dwMinor, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetScriptDispatch)( - IActiveScript* This, + IActiveScript *This, LPCOLESTR pstrItemName, IDispatch **ppdisp); HRESULT (STDMETHODCALLTYPE *GetCurrentScriptThreadID)( - IActiveScript* This, + IActiveScript *This, SCRIPTTHREADID *pstidThread); HRESULT (STDMETHODCALLTYPE *GetScriptThreadID)( - IActiveScript* This, + IActiveScript *This, DWORD dwWin32ThreadId, SCRIPTTHREADID *pstidThread); HRESULT (STDMETHODCALLTYPE *GetScriptThreadState)( - IActiveScript* This, + IActiveScript *This, SCRIPTTHREADID stidThread, SCRIPTTHREADSTATE *pstsState); HRESULT (STDMETHODCALLTYPE *InterruptScriptThread)( - IActiveScript* This, + IActiveScript *This, SCRIPTTHREADID stidThread, const EXCEPINFO *pexcepinfo, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *Clone)( - IActiveScript* This, + IActiveScript *This, IActiveScript **ppscript); END_INTERFACE } IActiveScriptVtbl; + interface IActiveScript { CONST_VTBL IActiveScriptVtbl* lpVtbl; }; @@ -1414,119 +1446,6 @@ static FORCEINLINE HRESULT IActiveScript_Clone(IActiveScript* This,IActiveScript #endif -HRESULT STDMETHODCALLTYPE IActiveScript_SetScriptSite_Proxy( - IActiveScript* This, - IActiveScriptSite *pass); -void __RPC_STUB IActiveScript_SetScriptSite_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScript_GetScriptSite_Proxy( - IActiveScript* This, - REFIID riid, - void **ppvObject); -void __RPC_STUB IActiveScript_GetScriptSite_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScript_SetScriptState_Proxy( - IActiveScript* This, - SCRIPTSTATE ss); -void __RPC_STUB IActiveScript_SetScriptState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScript_GetScriptState_Proxy( - IActiveScript* This, - SCRIPTSTATE *pssState); -void __RPC_STUB IActiveScript_GetScriptState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScript_Close_Proxy( - IActiveScript* This); -void __RPC_STUB IActiveScript_Close_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScript_AddNamedItem_Proxy( - IActiveScript* This, - LPCOLESTR pstrName, - DWORD dwFlags); -void __RPC_STUB IActiveScript_AddNamedItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScript_AddTypeLib_Proxy( - IActiveScript* This, - REFGUID rguidTypeLib, - DWORD dwMajor, - DWORD dwMinor, - DWORD dwFlags); -void __RPC_STUB IActiveScript_AddTypeLib_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScript_GetScriptDispatch_Proxy( - IActiveScript* This, - LPCOLESTR pstrItemName, - IDispatch **ppdisp); -void __RPC_STUB IActiveScript_GetScriptDispatch_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScript_GetCurrentScriptThreadID_Proxy( - IActiveScript* This, - SCRIPTTHREADID *pstidThread); -void __RPC_STUB IActiveScript_GetCurrentScriptThreadID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScript_GetScriptThreadID_Proxy( - IActiveScript* This, - DWORD dwWin32ThreadId, - SCRIPTTHREADID *pstidThread); -void __RPC_STUB IActiveScript_GetScriptThreadID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScript_GetScriptThreadState_Proxy( - IActiveScript* This, - SCRIPTTHREADID stidThread, - SCRIPTTHREADSTATE *pstsState); -void __RPC_STUB IActiveScript_GetScriptThreadState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScript_InterruptScriptThread_Proxy( - IActiveScript* This, - SCRIPTTHREADID stidThread, - const EXCEPINFO *pexcepinfo, - DWORD dwFlags); -void __RPC_STUB IActiveScript_InterruptScriptThread_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScript_Clone_Proxy( - IActiveScript* This, - IActiveScript **ppscript); -void __RPC_STUB IActiveScript_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScript_INTERFACE_DEFINED__ */ @@ -1579,22 +1498,22 @@ typedef struct IActiveScriptParse32Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptParse32* This, + IActiveScriptParse32 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptParse32* This); + IActiveScriptParse32 *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptParse32* This); + IActiveScriptParse32 *This); /*** IActiveScriptParse32 methods ***/ HRESULT (STDMETHODCALLTYPE *InitNew)( - IActiveScriptParse32* This); + IActiveScriptParse32 *This); HRESULT (STDMETHODCALLTYPE *AddScriptlet)( - IActiveScriptParse32* This, + IActiveScriptParse32 *This, LPCOLESTR pstrDefaultName, LPCOLESTR pstrCode, LPCOLESTR pstrItemName, @@ -1608,7 +1527,7 @@ typedef struct IActiveScriptParse32Vtbl { EXCEPINFO *pexcepinfo); HRESULT (STDMETHODCALLTYPE *ParseScriptText)( - IActiveScriptParse32* This, + IActiveScriptParse32 *This, LPCOLESTR pstrCode, LPCOLESTR pstrItemName, IUnknown *punkContext, @@ -1621,6 +1540,7 @@ typedef struct IActiveScriptParse32Vtbl { END_INTERFACE } IActiveScriptParse32Vtbl; + interface IActiveScriptParse32 { CONST_VTBL IActiveScriptParse32Vtbl* lpVtbl; }; @@ -1661,47 +1581,6 @@ static FORCEINLINE HRESULT IActiveScriptParse32_ParseScriptText(IActiveScriptPar #endif -HRESULT STDMETHODCALLTYPE IActiveScriptParse32_InitNew_Proxy( - IActiveScriptParse32* This); -void __RPC_STUB IActiveScriptParse32_InitNew_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptParse32_AddScriptlet_Proxy( - IActiveScriptParse32* This, - LPCOLESTR pstrDefaultName, - LPCOLESTR pstrCode, - LPCOLESTR pstrItemName, - LPCOLESTR pstrSubItemName, - LPCOLESTR pstrEventName, - LPCOLESTR pstrDelimiter, - DWORD dwSourceContextCookie, - ULONG ulStartingLineNumber, - DWORD dwFlags, - BSTR *pbstrName, - EXCEPINFO *pexcepinfo); -void __RPC_STUB IActiveScriptParse32_AddScriptlet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptParse32_ParseScriptText_Proxy( - IActiveScriptParse32* This, - LPCOLESTR pstrCode, - LPCOLESTR pstrItemName, - IUnknown *punkContext, - LPCOLESTR pstrDelimiter, - DWORD dwSourceContextCookie, - ULONG ulStartingLineNumber, - DWORD dwFlags, - VARIANT *pvarResult, - EXCEPINFO *pexcepinfo); -void __RPC_STUB IActiveScriptParse32_ParseScriptText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptParse32_INTERFACE_DEFINED__ */ @@ -1754,22 +1633,22 @@ typedef struct IActiveScriptParse64Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptParse64* This, + IActiveScriptParse64 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptParse64* This); + IActiveScriptParse64 *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptParse64* This); + IActiveScriptParse64 *This); /*** IActiveScriptParse64 methods ***/ HRESULT (STDMETHODCALLTYPE *InitNew)( - IActiveScriptParse64* This); + IActiveScriptParse64 *This); HRESULT (STDMETHODCALLTYPE *AddScriptlet)( - IActiveScriptParse64* This, + IActiveScriptParse64 *This, LPCOLESTR pstrDefaultName, LPCOLESTR pstrCode, LPCOLESTR pstrItemName, @@ -1783,7 +1662,7 @@ typedef struct IActiveScriptParse64Vtbl { EXCEPINFO *pexcepinfo); HRESULT (STDMETHODCALLTYPE *ParseScriptText)( - IActiveScriptParse64* This, + IActiveScriptParse64 *This, LPCOLESTR pstrCode, LPCOLESTR pstrItemName, IUnknown *punkContext, @@ -1796,6 +1675,7 @@ typedef struct IActiveScriptParse64Vtbl { END_INTERFACE } IActiveScriptParse64Vtbl; + interface IActiveScriptParse64 { CONST_VTBL IActiveScriptParse64Vtbl* lpVtbl; }; @@ -1836,47 +1716,6 @@ static FORCEINLINE HRESULT IActiveScriptParse64_ParseScriptText(IActiveScriptPar #endif -HRESULT STDMETHODCALLTYPE IActiveScriptParse64_InitNew_Proxy( - IActiveScriptParse64* This); -void __RPC_STUB IActiveScriptParse64_InitNew_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptParse64_AddScriptlet_Proxy( - IActiveScriptParse64* This, - LPCOLESTR pstrDefaultName, - LPCOLESTR pstrCode, - LPCOLESTR pstrItemName, - LPCOLESTR pstrSubItemName, - LPCOLESTR pstrEventName, - LPCOLESTR pstrDelimiter, - DWORDLONG dwSourceContextCookie, - ULONG ulStartingLineNumber, - DWORD dwFlags, - BSTR *pbstrName, - EXCEPINFO *pexcepinfo); -void __RPC_STUB IActiveScriptParse64_AddScriptlet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptParse64_ParseScriptText_Proxy( - IActiveScriptParse64* This, - LPCOLESTR pstrCode, - LPCOLESTR pstrItemName, - IUnknown *punkContext, - LPCOLESTR pstrDelimiter, - DWORDLONG dwSourceContextCookie, - ULONG ulStartingLineNumber, - DWORD dwFlags, - VARIANT *pvarResult, - EXCEPINFO *pexcepinfo); -void __RPC_STUB IActiveScriptParse64_ParseScriptText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptParse64_INTERFACE_DEFINED__ */ @@ -1923,19 +1762,19 @@ typedef struct IActiveScriptParseProcedureOld32Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptParseProcedureOld32* This, + IActiveScriptParseProcedureOld32 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptParseProcedureOld32* This); + IActiveScriptParseProcedureOld32 *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptParseProcedureOld32* This); + IActiveScriptParseProcedureOld32 *This); /*** IActiveScriptParseProcedureOld32 methods ***/ HRESULT (STDMETHODCALLTYPE *ParseProcedureText)( - IActiveScriptParseProcedureOld32* This, + IActiveScriptParseProcedureOld32 *This, LPCOLESTR pstrCode, LPCOLESTR pstrFormalParams, LPCOLESTR pstrItemName, @@ -1948,6 +1787,7 @@ typedef struct IActiveScriptParseProcedureOld32Vtbl { END_INTERFACE } IActiveScriptParseProcedureOld32Vtbl; + interface IActiveScriptParseProcedureOld32 { CONST_VTBL IActiveScriptParseProcedureOld32Vtbl* lpVtbl; }; @@ -1980,22 +1820,6 @@ static FORCEINLINE HRESULT IActiveScriptParseProcedureOld32_ParseProcedureText(I #endif -HRESULT STDMETHODCALLTYPE IActiveScriptParseProcedureOld32_ParseProcedureText_Proxy( - IActiveScriptParseProcedureOld32* This, - LPCOLESTR pstrCode, - LPCOLESTR pstrFormalParams, - LPCOLESTR pstrItemName, - IUnknown *punkContext, - LPCOLESTR pstrDelimiter, - DWORD dwSourceContextCookie, - ULONG ulStartingLineNumber, - DWORD dwFlags, - IDispatch **ppdisp); -void __RPC_STUB IActiveScriptParseProcedureOld32_ParseProcedureText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptParseProcedureOld32_INTERFACE_DEFINED__ */ @@ -2032,19 +1856,19 @@ typedef struct IActiveScriptParseProcedureOld64Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptParseProcedureOld64* This, + IActiveScriptParseProcedureOld64 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptParseProcedureOld64* This); + IActiveScriptParseProcedureOld64 *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptParseProcedureOld64* This); + IActiveScriptParseProcedureOld64 *This); /*** IActiveScriptParseProcedureOld64 methods ***/ HRESULT (STDMETHODCALLTYPE *ParseProcedureText)( - IActiveScriptParseProcedureOld64* This, + IActiveScriptParseProcedureOld64 *This, LPCOLESTR pstrCode, LPCOLESTR pstrFormalParams, LPCOLESTR pstrItemName, @@ -2057,6 +1881,7 @@ typedef struct IActiveScriptParseProcedureOld64Vtbl { END_INTERFACE } IActiveScriptParseProcedureOld64Vtbl; + interface IActiveScriptParseProcedureOld64 { CONST_VTBL IActiveScriptParseProcedureOld64Vtbl* lpVtbl; }; @@ -2089,22 +1914,6 @@ static FORCEINLINE HRESULT IActiveScriptParseProcedureOld64_ParseProcedureText(I #endif -HRESULT STDMETHODCALLTYPE IActiveScriptParseProcedureOld64_ParseProcedureText_Proxy( - IActiveScriptParseProcedureOld64* This, - LPCOLESTR pstrCode, - LPCOLESTR pstrFormalParams, - LPCOLESTR pstrItemName, - IUnknown *punkContext, - LPCOLESTR pstrDelimiter, - DWORDLONG dwSourceContextCookie, - ULONG ulStartingLineNumber, - DWORD dwFlags, - IDispatch **ppdisp); -void __RPC_STUB IActiveScriptParseProcedureOld64_ParseProcedureText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptParseProcedureOld64_INTERFACE_DEFINED__ */ @@ -2152,19 +1961,19 @@ typedef struct IActiveScriptParseProcedure32Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptParseProcedure32* This, + IActiveScriptParseProcedure32 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptParseProcedure32* This); + IActiveScriptParseProcedure32 *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptParseProcedure32* This); + IActiveScriptParseProcedure32 *This); /*** IActiveScriptParseProcedure32 methods ***/ HRESULT (STDMETHODCALLTYPE *ParseProcedureText)( - IActiveScriptParseProcedure32* This, + IActiveScriptParseProcedure32 *This, LPCOLESTR pstrCode, LPCOLESTR pstrFormalParams, LPCOLESTR pstrProcedureName, @@ -2178,6 +1987,7 @@ typedef struct IActiveScriptParseProcedure32Vtbl { END_INTERFACE } IActiveScriptParseProcedure32Vtbl; + interface IActiveScriptParseProcedure32 { CONST_VTBL IActiveScriptParseProcedure32Vtbl* lpVtbl; }; @@ -2210,23 +2020,6 @@ static FORCEINLINE HRESULT IActiveScriptParseProcedure32_ParseProcedureText(IAct #endif -HRESULT STDMETHODCALLTYPE IActiveScriptParseProcedure32_ParseProcedureText_Proxy( - IActiveScriptParseProcedure32* This, - LPCOLESTR pstrCode, - LPCOLESTR pstrFormalParams, - LPCOLESTR pstrProcedureName, - LPCOLESTR pstrItemName, - IUnknown *punkContext, - LPCOLESTR pstrDelimiter, - DWORD dwSourceContextCookie, - ULONG ulStartingLineNumber, - DWORD dwFlags, - IDispatch **ppdisp); -void __RPC_STUB IActiveScriptParseProcedure32_ParseProcedureText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptParseProcedure32_INTERFACE_DEFINED__ */ @@ -2264,19 +2057,19 @@ typedef struct IActiveScriptParseProcedure64Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptParseProcedure64* This, + IActiveScriptParseProcedure64 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptParseProcedure64* This); + IActiveScriptParseProcedure64 *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptParseProcedure64* This); + IActiveScriptParseProcedure64 *This); /*** IActiveScriptParseProcedure64 methods ***/ HRESULT (STDMETHODCALLTYPE *ParseProcedureText)( - IActiveScriptParseProcedure64* This, + IActiveScriptParseProcedure64 *This, LPCOLESTR pstrCode, LPCOLESTR pstrFormalParams, LPCOLESTR pstrProcedureName, @@ -2290,6 +2083,7 @@ typedef struct IActiveScriptParseProcedure64Vtbl { END_INTERFACE } IActiveScriptParseProcedure64Vtbl; + interface IActiveScriptParseProcedure64 { CONST_VTBL IActiveScriptParseProcedure64Vtbl* lpVtbl; }; @@ -2322,23 +2116,6 @@ static FORCEINLINE HRESULT IActiveScriptParseProcedure64_ParseProcedureText(IAct #endif -HRESULT STDMETHODCALLTYPE IActiveScriptParseProcedure64_ParseProcedureText_Proxy( - IActiveScriptParseProcedure64* This, - LPCOLESTR pstrCode, - LPCOLESTR pstrFormalParams, - LPCOLESTR pstrProcedureName, - LPCOLESTR pstrItemName, - IUnknown *punkContext, - LPCOLESTR pstrDelimiter, - DWORDLONG dwSourceContextCookie, - ULONG ulStartingLineNumber, - DWORD dwFlags, - IDispatch **ppdisp); -void __RPC_STUB IActiveScriptParseProcedure64_ParseProcedureText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptParseProcedure64_INTERFACE_DEFINED__ */ @@ -2374,19 +2151,19 @@ typedef struct IActiveScriptParseProcedure2_32Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptParseProcedure2_32* This, + IActiveScriptParseProcedure2_32 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptParseProcedure2_32* This); + IActiveScriptParseProcedure2_32 *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptParseProcedure2_32* This); + IActiveScriptParseProcedure2_32 *This); /*** IActiveScriptParseProcedure32 methods ***/ HRESULT (STDMETHODCALLTYPE *ParseProcedureText)( - IActiveScriptParseProcedure2_32* This, + IActiveScriptParseProcedure2_32 *This, LPCOLESTR pstrCode, LPCOLESTR pstrFormalParams, LPCOLESTR pstrProcedureName, @@ -2400,6 +2177,7 @@ typedef struct IActiveScriptParseProcedure2_32Vtbl { END_INTERFACE } IActiveScriptParseProcedure2_32Vtbl; + interface IActiveScriptParseProcedure2_32 { CONST_VTBL IActiveScriptParseProcedure2_32Vtbl* lpVtbl; }; @@ -2457,19 +2235,19 @@ typedef struct IActiveScriptParseProcedure2_64Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptParseProcedure2_64* This, + IActiveScriptParseProcedure2_64 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptParseProcedure2_64* This); + IActiveScriptParseProcedure2_64 *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptParseProcedure2_64* This); + IActiveScriptParseProcedure2_64 *This); /*** IActiveScriptParseProcedure64 methods ***/ HRESULT (STDMETHODCALLTYPE *ParseProcedureText)( - IActiveScriptParseProcedure2_64* This, + IActiveScriptParseProcedure2_64 *This, LPCOLESTR pstrCode, LPCOLESTR pstrFormalParams, LPCOLESTR pstrProcedureName, @@ -2483,6 +2261,7 @@ typedef struct IActiveScriptParseProcedure2_64Vtbl { END_INTERFACE } IActiveScriptParseProcedure2_64Vtbl; + interface IActiveScriptParseProcedure2_64 { CONST_VTBL IActiveScriptParseProcedure2_64Vtbl* lpVtbl; }; @@ -2567,19 +2346,19 @@ typedef struct IActiveScriptEncodeVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptEncode* This, + IActiveScriptEncode *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptEncode* This); + IActiveScriptEncode *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptEncode* This); + IActiveScriptEncode *This); /*** IActiveScriptEncode methods ***/ HRESULT (STDMETHODCALLTYPE *EncodeSection)( - IActiveScriptEncode* This, + IActiveScriptEncode *This, LPCOLESTR pchIn, DWORD cchIn, LPOLESTR pchOut, @@ -2587,7 +2366,7 @@ typedef struct IActiveScriptEncodeVtbl { DWORD *pcchRet); HRESULT (STDMETHODCALLTYPE *DecodeScript)( - IActiveScriptEncode* This, + IActiveScriptEncode *This, LPCOLESTR pchIn, DWORD cchIn, LPOLESTR pchOut, @@ -2595,11 +2374,12 @@ typedef struct IActiveScriptEncodeVtbl { DWORD *pcchRet); HRESULT (STDMETHODCALLTYPE *GetEncodeProgId)( - IActiveScriptEncode* This, + IActiveScriptEncode *This, BSTR *pbstrOut); END_INTERFACE } IActiveScriptEncodeVtbl; + interface IActiveScriptEncode { CONST_VTBL IActiveScriptEncodeVtbl* lpVtbl; }; @@ -2640,38 +2420,6 @@ static FORCEINLINE HRESULT IActiveScriptEncode_GetEncodeProgId(IActiveScriptEnco #endif -HRESULT STDMETHODCALLTYPE IActiveScriptEncode_EncodeSection_Proxy( - IActiveScriptEncode* This, - LPCOLESTR pchIn, - DWORD cchIn, - LPOLESTR pchOut, - DWORD cchOut, - DWORD *pcchRet); -void __RPC_STUB IActiveScriptEncode_EncodeSection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptEncode_DecodeScript_Proxy( - IActiveScriptEncode* This, - LPCOLESTR pchIn, - DWORD cchIn, - LPOLESTR pchOut, - DWORD cchOut, - DWORD *pcchRet); -void __RPC_STUB IActiveScriptEncode_DecodeScript_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptEncode_GetEncodeProgId_Proxy( - IActiveScriptEncode* This, - BSTR *pbstrOut); -void __RPC_STUB IActiveScriptEncode_GetEncodeProgId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptEncode_INTERFACE_DEFINED__ */ @@ -2703,19 +2451,19 @@ typedef struct IActiveScriptHostEncodeVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptHostEncode* This, + IActiveScriptHostEncode *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptHostEncode* This); + IActiveScriptHostEncode *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptHostEncode* This); + IActiveScriptHostEncode *This); /*** IActiveScriptHostEncode methods ***/ HRESULT (STDMETHODCALLTYPE *EncodeScriptHostFile)( - IActiveScriptHostEncode* This, + IActiveScriptHostEncode *This, BSTR bstrInFile, BSTR *pbstrOutFile, ULONG cFlags, @@ -2723,6 +2471,7 @@ typedef struct IActiveScriptHostEncodeVtbl { END_INTERFACE } IActiveScriptHostEncodeVtbl; + interface IActiveScriptHostEncode { CONST_VTBL IActiveScriptHostEncodeVtbl* lpVtbl; }; @@ -2755,17 +2504,6 @@ static FORCEINLINE HRESULT IActiveScriptHostEncode_EncodeScriptHostFile(IActiveS #endif -HRESULT STDMETHODCALLTYPE IActiveScriptHostEncode_EncodeScriptHostFile_Proxy( - IActiveScriptHostEncode* This, - BSTR bstrInFile, - BSTR *pbstrOutFile, - ULONG cFlags, - BSTR bstrDefaultLang); -void __RPC_STUB IActiveScriptHostEncode_EncodeScriptHostFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptHostEncode_INTERFACE_DEFINED__ */ @@ -2795,24 +2533,25 @@ typedef struct IBindEventHandlerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IBindEventHandler* This, + IBindEventHandler *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IBindEventHandler* This); + IBindEventHandler *This); ULONG (STDMETHODCALLTYPE *Release)( - IBindEventHandler* This); + IBindEventHandler *This); /*** IBindEventHandler methods ***/ HRESULT (STDMETHODCALLTYPE *BindHandler)( - IBindEventHandler* This, + IBindEventHandler *This, LPCOLESTR pstrEvent, IDispatch *pdisp); END_INTERFACE } IBindEventHandlerVtbl; + interface IBindEventHandler { CONST_VTBL IBindEventHandlerVtbl* lpVtbl; }; @@ -2845,15 +2584,6 @@ static FORCEINLINE HRESULT IBindEventHandler_BindHandler(IBindEventHandler* This #endif -HRESULT STDMETHODCALLTYPE IBindEventHandler_BindHandler_Proxy( - IBindEventHandler* This, - LPCOLESTR pstrEvent, - IDispatch *pdisp); -void __RPC_STUB IBindEventHandler_BindHandler_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IBindEventHandler_INTERFACE_DEFINED__ */ @@ -2892,34 +2622,35 @@ typedef struct IActiveScriptStatsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptStats* This, + IActiveScriptStats *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptStats* This); + IActiveScriptStats *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptStats* This); + IActiveScriptStats *This); /*** IActiveScriptStats methods ***/ HRESULT (STDMETHODCALLTYPE *GetStat)( - IActiveScriptStats* This, + IActiveScriptStats *This, DWORD stid, ULONG *pluHi, ULONG *pluLo); HRESULT (STDMETHODCALLTYPE *GetStatEx)( - IActiveScriptStats* This, + IActiveScriptStats *This, REFGUID guid, ULONG *pluHi, ULONG *pluLo); HRESULT (STDMETHODCALLTYPE *ResetStats)( - IActiveScriptStats* This); + IActiveScriptStats *This); END_INTERFACE } IActiveScriptStatsVtbl; + interface IActiveScriptStats { CONST_VTBL IActiveScriptStatsVtbl* lpVtbl; }; @@ -2960,33 +2691,6 @@ static FORCEINLINE HRESULT IActiveScriptStats_ResetStats(IActiveScriptStats* Thi #endif -HRESULT STDMETHODCALLTYPE IActiveScriptStats_GetStat_Proxy( - IActiveScriptStats* This, - DWORD stid, - ULONG *pluHi, - ULONG *pluLo); -void __RPC_STUB IActiveScriptStats_GetStat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptStats_GetStatEx_Proxy( - IActiveScriptStats* This, - REFGUID guid, - ULONG *pluHi, - ULONG *pluLo); -void __RPC_STUB IActiveScriptStats_GetStatEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptStats_ResetStats_Proxy( - IActiveScriptStats* This); -void __RPC_STUB IActiveScriptStats_ResetStats_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptStats_INTERFACE_DEFINED__ */ @@ -3022,31 +2726,32 @@ typedef struct IActiveScriptPropertyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptProperty* This, + IActiveScriptProperty *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptProperty* This); + IActiveScriptProperty *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptProperty* This); + IActiveScriptProperty *This); /*** IActiveScriptProperty methods ***/ HRESULT (STDMETHODCALLTYPE *GetProperty)( - IActiveScriptProperty* This, + IActiveScriptProperty *This, DWORD dwProperty, VARIANT *pvarIndex, VARIANT *pvarValue); HRESULT (STDMETHODCALLTYPE *SetProperty)( - IActiveScriptProperty* This, + IActiveScriptProperty *This, DWORD dwProperty, VARIANT *pvarIndex, VARIANT *pvarValue); END_INTERFACE } IActiveScriptPropertyVtbl; + interface IActiveScriptProperty { CONST_VTBL IActiveScriptPropertyVtbl* lpVtbl; }; @@ -3083,26 +2788,6 @@ static FORCEINLINE HRESULT IActiveScriptProperty_SetProperty(IActiveScriptProper #endif -HRESULT STDMETHODCALLTYPE IActiveScriptProperty_GetProperty_Proxy( - IActiveScriptProperty* This, - DWORD dwProperty, - VARIANT *pvarIndex, - VARIANT *pvarValue); -void __RPC_STUB IActiveScriptProperty_GetProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptProperty_SetProperty_Proxy( - IActiveScriptProperty* This, - DWORD dwProperty, - VARIANT *pvarIndex, - VARIANT *pvarValue); -void __RPC_STUB IActiveScriptProperty_SetProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptProperty_INTERFACE_DEFINED__ */ @@ -3134,19 +2819,19 @@ typedef struct ITridentEventSinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITridentEventSink* This, + ITridentEventSink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITridentEventSink* This); + ITridentEventSink *This); ULONG (STDMETHODCALLTYPE *Release)( - ITridentEventSink* This); + ITridentEventSink *This); /*** ITridentEventSink methods ***/ HRESULT (STDMETHODCALLTYPE *FireEvent)( - ITridentEventSink* This, + ITridentEventSink *This, LPCOLESTR pstrEvent, DISPPARAMS *pdp, VARIANT *pvarRes, @@ -3154,6 +2839,7 @@ typedef struct ITridentEventSinkVtbl { END_INTERFACE } ITridentEventSinkVtbl; + interface ITridentEventSink { CONST_VTBL ITridentEventSinkVtbl* lpVtbl; }; @@ -3186,17 +2872,6 @@ static FORCEINLINE HRESULT ITridentEventSink_FireEvent(ITridentEventSink* This,L #endif -HRESULT STDMETHODCALLTYPE ITridentEventSink_FireEvent_Proxy( - ITridentEventSink* This, - LPCOLESTR pstrEvent, - DISPPARAMS *pdp, - VARIANT *pvarRes, - EXCEPINFO *pei); -void __RPC_STUB ITridentEventSink_FireEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ITridentEventSink_INTERFACE_DEFINED__ */ @@ -3225,23 +2900,24 @@ typedef struct IActiveScriptGarbageCollectorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptGarbageCollector* This, + IActiveScriptGarbageCollector *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptGarbageCollector* This); + IActiveScriptGarbageCollector *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptGarbageCollector* This); + IActiveScriptGarbageCollector *This); /*** IActiveScriptGarbageCollector methods ***/ HRESULT (STDMETHODCALLTYPE *CollectGarbage)( - IActiveScriptGarbageCollector* This, + IActiveScriptGarbageCollector *This, SCRIPTGCTYPE scriptgctype); END_INTERFACE } IActiveScriptGarbageCollectorVtbl; + interface IActiveScriptGarbageCollector { CONST_VTBL IActiveScriptGarbageCollectorVtbl* lpVtbl; }; @@ -3274,14 +2950,6 @@ static FORCEINLINE HRESULT IActiveScriptGarbageCollector_CollectGarbage(IActiveS #endif -HRESULT STDMETHODCALLTYPE IActiveScriptGarbageCollector_CollectGarbage_Proxy( - IActiveScriptGarbageCollector* This, - SCRIPTGCTYPE scriptgctype); -void __RPC_STUB IActiveScriptGarbageCollector_CollectGarbage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptGarbageCollector_INTERFACE_DEFINED__ */ @@ -3310,23 +2978,24 @@ typedef struct IActiveScriptSIPInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptSIPInfo* This, + IActiveScriptSIPInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptSIPInfo* This); + IActiveScriptSIPInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptSIPInfo* This); + IActiveScriptSIPInfo *This); /*** IActiveScriptSIPInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetSIPOID)( - IActiveScriptSIPInfo* This, + IActiveScriptSIPInfo *This, GUID *poid_sip); END_INTERFACE } IActiveScriptSIPInfoVtbl; + interface IActiveScriptSIPInfo { CONST_VTBL IActiveScriptSIPInfoVtbl* lpVtbl; }; @@ -3359,14 +3028,6 @@ static FORCEINLINE HRESULT IActiveScriptSIPInfo_GetSIPOID(IActiveScriptSIPInfo* #endif -HRESULT STDMETHODCALLTYPE IActiveScriptSIPInfo_GetSIPOID_Proxy( - IActiveScriptSIPInfo* This, - GUID *poid_sip); -void __RPC_STUB IActiveScriptSIPInfo_GetSIPOID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptSIPInfo_INTERFACE_DEFINED__ */ @@ -3400,19 +3061,19 @@ typedef struct IActiveScriptSiteTraceInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptSiteTraceInfo* This, + IActiveScriptSiteTraceInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptSiteTraceInfo* This); + IActiveScriptSiteTraceInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptSiteTraceInfo* This); + IActiveScriptSiteTraceInfo *This); /*** IActiveScriptSiteTraceInfo methods ***/ HRESULT (STDMETHODCALLTYPE *SendScriptTraceInfo)( - IActiveScriptSiteTraceInfo* This, + IActiveScriptSiteTraceInfo *This, SCRIPTTRACEINFO stiEventType, GUID guidContextID, DWORD dwScriptContextCookie, @@ -3422,6 +3083,7 @@ typedef struct IActiveScriptSiteTraceInfoVtbl { END_INTERFACE } IActiveScriptSiteTraceInfoVtbl; + interface IActiveScriptSiteTraceInfo { CONST_VTBL IActiveScriptSiteTraceInfoVtbl* lpVtbl; }; @@ -3454,19 +3116,6 @@ static FORCEINLINE HRESULT IActiveScriptSiteTraceInfo_SendScriptTraceInfo(IActiv #endif -HRESULT STDMETHODCALLTYPE IActiveScriptSiteTraceInfo_SendScriptTraceInfo_Proxy( - IActiveScriptSiteTraceInfo* This, - SCRIPTTRACEINFO stiEventType, - GUID guidContextID, - DWORD dwScriptContextCookie, - LONG lScriptStatementStart, - LONG lScriptStatementEnd, - DWORD64 dwReserved); -void __RPC_STUB IActiveScriptSiteTraceInfo_SendScriptTraceInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptSiteTraceInfo_INTERFACE_DEFINED__ */ @@ -3499,27 +3148,28 @@ typedef struct IActiveScriptTraceInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptTraceInfo* This, + IActiveScriptTraceInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptTraceInfo* This); + IActiveScriptTraceInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptTraceInfo* This); + IActiveScriptTraceInfo *This); /*** IActiveScriptTraceInfo methods ***/ HRESULT (STDMETHODCALLTYPE *StartScriptTracing)( - IActiveScriptTraceInfo* This, + IActiveScriptTraceInfo *This, IActiveScriptSiteTraceInfo *pSiteTraceInfo, GUID guidContextID); HRESULT (STDMETHODCALLTYPE *StopScriptTracing)( - IActiveScriptTraceInfo* This); + IActiveScriptTraceInfo *This); END_INTERFACE } IActiveScriptTraceInfoVtbl; + interface IActiveScriptTraceInfo { CONST_VTBL IActiveScriptTraceInfoVtbl* lpVtbl; }; @@ -3556,22 +3206,6 @@ static FORCEINLINE HRESULT IActiveScriptTraceInfo_StopScriptTracing(IActiveScrip #endif -HRESULT STDMETHODCALLTYPE IActiveScriptTraceInfo_StartScriptTracing_Proxy( - IActiveScriptTraceInfo* This, - IActiveScriptSiteTraceInfo *pSiteTraceInfo, - GUID guidContextID); -void __RPC_STUB IActiveScriptTraceInfo_StartScriptTracing_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveScriptTraceInfo_StopScriptTracing_Proxy( - IActiveScriptTraceInfo* This); -void __RPC_STUB IActiveScriptTraceInfo_StopScriptTracing_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptTraceInfo_INTERFACE_DEFINED__ */ @@ -3602,25 +3236,26 @@ typedef struct IActiveScriptStringCompareVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveScriptStringCompare* This, + IActiveScriptStringCompare *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveScriptStringCompare* This); + IActiveScriptStringCompare *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveScriptStringCompare* This); + IActiveScriptStringCompare *This); /*** IActiveScriptStringCompare methods ***/ HRESULT (STDMETHODCALLTYPE *StrComp)( - IActiveScriptStringCompare* This, + IActiveScriptStringCompare *This, BSTR bszStr1, BSTR bszStr2, LONG *iRet); END_INTERFACE } IActiveScriptStringCompareVtbl; + interface IActiveScriptStringCompare { CONST_VTBL IActiveScriptStringCompareVtbl* lpVtbl; }; @@ -3653,16 +3288,6 @@ static FORCEINLINE HRESULT IActiveScriptStringCompare_StrComp(IActiveScriptStrin #endif -HRESULT STDMETHODCALLTYPE IActiveScriptStringCompare_StrComp_Proxy( - IActiveScriptStringCompare* This, - BSTR bszStr1, - BSTR bszStr2, - LONG *iRet); -void __RPC_STUB IActiveScriptStringCompare_StrComp_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveScriptStringCompare_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/adhoc.h b/lib/libc/include/any-windows-any/adhoc.h index 9828a45dc7..d4cd448b29 100644 --- a/lib/libc/include/any-windows-any/adhoc.h +++ b/lib/libc/include/any-windows-any/adhoc.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/adhoc.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/adhoc.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,51 +21,81 @@ #ifndef __IDot11AdHocManager_FWD_DEFINED__ #define __IDot11AdHocManager_FWD_DEFINED__ typedef interface IDot11AdHocManager IDot11AdHocManager; +#ifdef __cplusplus +interface IDot11AdHocManager; +#endif /* __cplusplus */ #endif #ifndef __IDot11AdHocManagerNotificationSink_FWD_DEFINED__ #define __IDot11AdHocManagerNotificationSink_FWD_DEFINED__ typedef interface IDot11AdHocManagerNotificationSink IDot11AdHocManagerNotificationSink; +#ifdef __cplusplus +interface IDot11AdHocManagerNotificationSink; +#endif /* __cplusplus */ #endif #ifndef __IEnumDot11AdHocNetworks_FWD_DEFINED__ #define __IEnumDot11AdHocNetworks_FWD_DEFINED__ typedef interface IEnumDot11AdHocNetworks IEnumDot11AdHocNetworks; +#ifdef __cplusplus +interface IEnumDot11AdHocNetworks; +#endif /* __cplusplus */ #endif #ifndef __IDot11AdHocNetwork_FWD_DEFINED__ #define __IDot11AdHocNetwork_FWD_DEFINED__ typedef interface IDot11AdHocNetwork IDot11AdHocNetwork; +#ifdef __cplusplus +interface IDot11AdHocNetwork; +#endif /* __cplusplus */ #endif #ifndef __IDot11AdHocNetworkNotificationSink_FWD_DEFINED__ #define __IDot11AdHocNetworkNotificationSink_FWD_DEFINED__ typedef interface IDot11AdHocNetworkNotificationSink IDot11AdHocNetworkNotificationSink; +#ifdef __cplusplus +interface IDot11AdHocNetworkNotificationSink; +#endif /* __cplusplus */ #endif #ifndef __IDot11AdHocInterface_FWD_DEFINED__ #define __IDot11AdHocInterface_FWD_DEFINED__ typedef interface IDot11AdHocInterface IDot11AdHocInterface; +#ifdef __cplusplus +interface IDot11AdHocInterface; +#endif /* __cplusplus */ #endif #ifndef __IEnumDot11AdHocInterfaces_FWD_DEFINED__ #define __IEnumDot11AdHocInterfaces_FWD_DEFINED__ typedef interface IEnumDot11AdHocInterfaces IEnumDot11AdHocInterfaces; +#ifdef __cplusplus +interface IEnumDot11AdHocInterfaces; +#endif /* __cplusplus */ #endif #ifndef __IEnumDot11AdHocSecuritySettings_FWD_DEFINED__ #define __IEnumDot11AdHocSecuritySettings_FWD_DEFINED__ typedef interface IEnumDot11AdHocSecuritySettings IEnumDot11AdHocSecuritySettings; +#ifdef __cplusplus +interface IEnumDot11AdHocSecuritySettings; +#endif /* __cplusplus */ #endif #ifndef __IDot11AdHocSecuritySettings_FWD_DEFINED__ #define __IDot11AdHocSecuritySettings_FWD_DEFINED__ typedef interface IDot11AdHocSecuritySettings IDot11AdHocSecuritySettings; +#ifdef __cplusplus +interface IDot11AdHocSecuritySettings; +#endif /* __cplusplus */ #endif #ifndef __IDot11AdHocInterfaceNotificationSink_FWD_DEFINED__ #define __IDot11AdHocInterfaceNotificationSink_FWD_DEFINED__ typedef interface IDot11AdHocInterfaceNotificationSink IDot11AdHocInterfaceNotificationSink; +#ifdef __cplusplus +interface IDot11AdHocInterfaceNotificationSink; +#endif /* __cplusplus */ #endif #ifndef __Dot11AdHocManager_FWD_DEFINED__ @@ -92,51 +123,81 @@ extern "C" { #ifndef __IDot11AdHocManager_FWD_DEFINED__ #define __IDot11AdHocManager_FWD_DEFINED__ typedef interface IDot11AdHocManager IDot11AdHocManager; +#ifdef __cplusplus +interface IDot11AdHocManager; +#endif /* __cplusplus */ #endif #ifndef __IDot11AdHocManagerNotificationSink_FWD_DEFINED__ #define __IDot11AdHocManagerNotificationSink_FWD_DEFINED__ typedef interface IDot11AdHocManagerNotificationSink IDot11AdHocManagerNotificationSink; +#ifdef __cplusplus +interface IDot11AdHocManagerNotificationSink; +#endif /* __cplusplus */ #endif #ifndef __IDot11AdHocNetwork_FWD_DEFINED__ #define __IDot11AdHocNetwork_FWD_DEFINED__ typedef interface IDot11AdHocNetwork IDot11AdHocNetwork; +#ifdef __cplusplus +interface IDot11AdHocNetwork; +#endif /* __cplusplus */ #endif #ifndef __IDot11AdHocNetworkNotificationSink_FWD_DEFINED__ #define __IDot11AdHocNetworkNotificationSink_FWD_DEFINED__ typedef interface IDot11AdHocNetworkNotificationSink IDot11AdHocNetworkNotificationSink; +#ifdef __cplusplus +interface IDot11AdHocNetworkNotificationSink; +#endif /* __cplusplus */ #endif #ifndef __IDot11AdHocInterface_FWD_DEFINED__ #define __IDot11AdHocInterface_FWD_DEFINED__ typedef interface IDot11AdHocInterface IDot11AdHocInterface; +#ifdef __cplusplus +interface IDot11AdHocInterface; +#endif /* __cplusplus */ #endif #ifndef __IDot11AdHocInterfaceNotificationSink_FWD_DEFINED__ #define __IDot11AdHocInterfaceNotificationSink_FWD_DEFINED__ typedef interface IDot11AdHocInterfaceNotificationSink IDot11AdHocInterfaceNotificationSink; +#ifdef __cplusplus +interface IDot11AdHocInterfaceNotificationSink; +#endif /* __cplusplus */ #endif #ifndef __IDot11AdHocSecuritySettings_FWD_DEFINED__ #define __IDot11AdHocSecuritySettings_FWD_DEFINED__ typedef interface IDot11AdHocSecuritySettings IDot11AdHocSecuritySettings; +#ifdef __cplusplus +interface IDot11AdHocSecuritySettings; +#endif /* __cplusplus */ #endif #ifndef __IEnumDot11AdHocInterfaces_FWD_DEFINED__ #define __IEnumDot11AdHocInterfaces_FWD_DEFINED__ typedef interface IEnumDot11AdHocInterfaces IEnumDot11AdHocInterfaces; +#ifdef __cplusplus +interface IEnumDot11AdHocInterfaces; +#endif /* __cplusplus */ #endif #ifndef __IEnumDot11AdHocNetworks_FWD_DEFINED__ #define __IEnumDot11AdHocNetworks_FWD_DEFINED__ typedef interface IEnumDot11AdHocNetworks IEnumDot11AdHocNetworks; +#ifdef __cplusplus +interface IEnumDot11AdHocNetworks; +#endif /* __cplusplus */ #endif #ifndef __IEnumDot11AdHocSecuritySettings_FWD_DEFINED__ #define __IEnumDot11AdHocSecuritySettings_FWD_DEFINED__ typedef interface IEnumDot11AdHocSecuritySettings IEnumDot11AdHocSecuritySettings; +#ifdef __cplusplus +interface IEnumDot11AdHocSecuritySettings; +#endif /* __cplusplus */ #endif typedef enum tagDOT11_ADHOC_CIPHER_ALGORITHM { @@ -209,19 +270,19 @@ typedef struct IDot11AdHocManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDot11AdHocManager* This, + IDot11AdHocManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDot11AdHocManager* This); + IDot11AdHocManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IDot11AdHocManager* This); + IDot11AdHocManager *This); /*** IDot11AdHocManager methods ***/ HRESULT (STDMETHODCALLTYPE *CreateNetwork)( - IDot11AdHocManager* This, + IDot11AdHocManager *This, LPCWSTR Name, LPCWSTR Password, LONG GeographicalId, @@ -231,27 +292,28 @@ typedef struct IDot11AdHocManagerVtbl { IDot11AdHocNetwork **pIAdHoc); HRESULT (STDMETHODCALLTYPE *CommitCreatedNetwork)( - IDot11AdHocManager* This, + IDot11AdHocManager *This, IDot11AdHocNetwork *pIAdHoc, BOOLEAN fSaveProfile, BOOLEAN fMakeSavedProfileUserSpecific); HRESULT (STDMETHODCALLTYPE *GetIEnumDot11AdHocNetworks)( - IDot11AdHocManager* This, + IDot11AdHocManager *This, GUID *pContextGuid, IEnumDot11AdHocNetworks **ppEnum); HRESULT (STDMETHODCALLTYPE *GetIEnumDot11AdHocInterfaces)( - IDot11AdHocManager* This, + IDot11AdHocManager *This, IEnumDot11AdHocInterfaces **ppEnum); HRESULT (STDMETHODCALLTYPE *GetNetwork)( - IDot11AdHocManager* This, + IDot11AdHocManager *This, GUID *NetworkSignature, IDot11AdHocNetwork **pNetwork); END_INTERFACE } IDot11AdHocManagerVtbl; + interface IDot11AdHocManager { CONST_VTBL IDot11AdHocManagerVtbl* lpVtbl; }; @@ -300,56 +362,6 @@ static FORCEINLINE HRESULT IDot11AdHocManager_GetNetwork(IDot11AdHocManager* Thi #endif -HRESULT STDMETHODCALLTYPE IDot11AdHocManager_CreateNetwork_Proxy( - IDot11AdHocManager* This, - LPCWSTR Name, - LPCWSTR Password, - LONG GeographicalId, - IDot11AdHocInterface *pInterface, - IDot11AdHocSecuritySettings *pSecurity, - GUID *pContextGuid, - IDot11AdHocNetwork **pIAdHoc); -void __RPC_STUB IDot11AdHocManager_CreateNetwork_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocManager_CommitCreatedNetwork_Proxy( - IDot11AdHocManager* This, - IDot11AdHocNetwork *pIAdHoc, - BOOLEAN fSaveProfile, - BOOLEAN fMakeSavedProfileUserSpecific); -void __RPC_STUB IDot11AdHocManager_CommitCreatedNetwork_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocManager_GetIEnumDot11AdHocNetworks_Proxy( - IDot11AdHocManager* This, - GUID *pContextGuid, - IEnumDot11AdHocNetworks **ppEnum); -void __RPC_STUB IDot11AdHocManager_GetIEnumDot11AdHocNetworks_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocManager_GetIEnumDot11AdHocInterfaces_Proxy( - IDot11AdHocManager* This, - IEnumDot11AdHocInterfaces **ppEnum); -void __RPC_STUB IDot11AdHocManager_GetIEnumDot11AdHocInterfaces_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocManager_GetNetwork_Proxy( - IDot11AdHocManager* This, - GUID *NetworkSignature, - IDot11AdHocNetwork **pNetwork); -void __RPC_STUB IDot11AdHocManager_GetNetwork_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDot11AdHocManager_INTERFACE_DEFINED__ */ @@ -386,35 +398,36 @@ typedef struct IDot11AdHocManagerNotificationSinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDot11AdHocManagerNotificationSink* This, + IDot11AdHocManagerNotificationSink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDot11AdHocManagerNotificationSink* This); + IDot11AdHocManagerNotificationSink *This); ULONG (STDMETHODCALLTYPE *Release)( - IDot11AdHocManagerNotificationSink* This); + IDot11AdHocManagerNotificationSink *This); /*** IDot11AdHocManagerNotificationSink methods ***/ HRESULT (STDMETHODCALLTYPE *OnNetworkAdd)( - IDot11AdHocManagerNotificationSink* This, + IDot11AdHocManagerNotificationSink *This, IDot11AdHocNetwork *pIAdHocNetwork); HRESULT (STDMETHODCALLTYPE *OnNetworkRemove)( - IDot11AdHocManagerNotificationSink* This, + IDot11AdHocManagerNotificationSink *This, GUID *Signature); HRESULT (STDMETHODCALLTYPE *OnInterfaceAdd)( - IDot11AdHocManagerNotificationSink* This, + IDot11AdHocManagerNotificationSink *This, IDot11AdHocInterface *pIAdHocInterface); HRESULT (STDMETHODCALLTYPE *OnInterfaceRemove)( - IDot11AdHocManagerNotificationSink* This, + IDot11AdHocManagerNotificationSink *This, GUID *Signature); END_INTERFACE } IDot11AdHocManagerNotificationSinkVtbl; + interface IDot11AdHocManagerNotificationSink { CONST_VTBL IDot11AdHocManagerNotificationSinkVtbl* lpVtbl; }; @@ -459,38 +472,6 @@ static FORCEINLINE HRESULT IDot11AdHocManagerNotificationSink_OnInterfaceRemove( #endif -HRESULT STDMETHODCALLTYPE IDot11AdHocManagerNotificationSink_OnNetworkAdd_Proxy( - IDot11AdHocManagerNotificationSink* This, - IDot11AdHocNetwork *pIAdHocNetwork); -void __RPC_STUB IDot11AdHocManagerNotificationSink_OnNetworkAdd_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocManagerNotificationSink_OnNetworkRemove_Proxy( - IDot11AdHocManagerNotificationSink* This, - GUID *Signature); -void __RPC_STUB IDot11AdHocManagerNotificationSink_OnNetworkRemove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocManagerNotificationSink_OnInterfaceAdd_Proxy( - IDot11AdHocManagerNotificationSink* This, - IDot11AdHocInterface *pIAdHocInterface); -void __RPC_STUB IDot11AdHocManagerNotificationSink_OnInterfaceAdd_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocManagerNotificationSink_OnInterfaceRemove_Proxy( - IDot11AdHocManagerNotificationSink* This, - GUID *Signature); -void __RPC_STUB IDot11AdHocManagerNotificationSink_OnInterfaceRemove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDot11AdHocManagerNotificationSink_INTERFACE_DEFINED__ */ @@ -529,36 +510,37 @@ typedef struct IEnumDot11AdHocNetworksVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumDot11AdHocNetworks* This, + IEnumDot11AdHocNetworks *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumDot11AdHocNetworks* This); + IEnumDot11AdHocNetworks *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumDot11AdHocNetworks* This); + IEnumDot11AdHocNetworks *This); /*** IEnumDot11AdHocNetworks methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumDot11AdHocNetworks* This, + IEnumDot11AdHocNetworks *This, ULONG cElt, IDot11AdHocNetwork **rgElt, ULONG *pcEltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumDot11AdHocNetworks* This, + IEnumDot11AdHocNetworks *This, ULONG cElt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumDot11AdHocNetworks* This); + IEnumDot11AdHocNetworks *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumDot11AdHocNetworks* This, + IEnumDot11AdHocNetworks *This, IEnumDot11AdHocNetworks **ppEnum); END_INTERFACE } IEnumDot11AdHocNetworksVtbl; + interface IEnumDot11AdHocNetworks { CONST_VTBL IEnumDot11AdHocNetworksVtbl* lpVtbl; }; @@ -603,39 +585,6 @@ static FORCEINLINE HRESULT IEnumDot11AdHocNetworks_Clone(IEnumDot11AdHocNetworks #endif -HRESULT STDMETHODCALLTYPE IEnumDot11AdHocNetworks_Next_Proxy( - IEnumDot11AdHocNetworks* This, - ULONG cElt, - IDot11AdHocNetwork **rgElt, - ULONG *pcEltFetched); -void __RPC_STUB IEnumDot11AdHocNetworks_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDot11AdHocNetworks_Skip_Proxy( - IEnumDot11AdHocNetworks* This, - ULONG cElt); -void __RPC_STUB IEnumDot11AdHocNetworks_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDot11AdHocNetworks_Reset_Proxy( - IEnumDot11AdHocNetworks* This); -void __RPC_STUB IEnumDot11AdHocNetworks_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDot11AdHocNetworks_Clone_Proxy( - IEnumDot11AdHocNetworks* This, - IEnumDot11AdHocNetworks **ppEnum); -void __RPC_STUB IEnumDot11AdHocNetworks_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumDot11AdHocNetworks_INTERFACE_DEFINED__ */ @@ -700,69 +649,70 @@ typedef struct IDot11AdHocNetworkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDot11AdHocNetwork* This, + IDot11AdHocNetwork *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDot11AdHocNetwork* This); + IDot11AdHocNetwork *This); ULONG (STDMETHODCALLTYPE *Release)( - IDot11AdHocNetwork* This); + IDot11AdHocNetwork *This); /*** IDot11AdHocNetwork methods ***/ HRESULT (STDMETHODCALLTYPE *GetStatus)( - IDot11AdHocNetwork* This, + IDot11AdHocNetwork *This, DOT11_ADHOC_NETWORK_CONNECTION_STATUS *eStatus); HRESULT (STDMETHODCALLTYPE *GetSSID)( - IDot11AdHocNetwork* This, + IDot11AdHocNetwork *This, LPWSTR *ppszwSSID); HRESULT (STDMETHODCALLTYPE *HasProfile)( - IDot11AdHocNetwork* This, + IDot11AdHocNetwork *This, BOOLEAN *pf11d); HRESULT (STDMETHODCALLTYPE *GetProfileName)( - IDot11AdHocNetwork* This, + IDot11AdHocNetwork *This, LPWSTR *ppszwProfileName); HRESULT (STDMETHODCALLTYPE *DeleteProfile)( - IDot11AdHocNetwork* This); + IDot11AdHocNetwork *This); HRESULT (STDMETHODCALLTYPE *GetSignalQuality)( - IDot11AdHocNetwork* This, + IDot11AdHocNetwork *This, ULONG *puStrengthValue, ULONG *puStrengthMax); HRESULT (STDMETHODCALLTYPE *GetSecuritySetting)( - IDot11AdHocNetwork* This, + IDot11AdHocNetwork *This, IDot11AdHocSecuritySettings **pAdHocSecuritySetting); HRESULT (STDMETHODCALLTYPE *GetContextGuid)( - IDot11AdHocNetwork* This, + IDot11AdHocNetwork *This, GUID *pContextGuid); HRESULT (STDMETHODCALLTYPE *GetSignature)( - IDot11AdHocNetwork* This, + IDot11AdHocNetwork *This, GUID *pSignature); HRESULT (STDMETHODCALLTYPE *GetInterface)( - IDot11AdHocNetwork* This, + IDot11AdHocNetwork *This, IDot11AdHocInterface **pAdHocInterface); HRESULT (STDMETHODCALLTYPE *Connect)( - IDot11AdHocNetwork* This, + IDot11AdHocNetwork *This, LPCWSTR Passphrase, LONG GeographicalId, BOOLEAN fSaveProfile, BOOLEAN fMakeSavedProfileUserSpecific); HRESULT (STDMETHODCALLTYPE *Disconnect)( - IDot11AdHocNetwork* This); + IDot11AdHocNetwork *This); END_INTERFACE } IDot11AdHocNetworkVtbl; + interface IDot11AdHocNetwork { CONST_VTBL IDot11AdHocNetworkVtbl* lpVtbl; }; @@ -839,104 +789,6 @@ static FORCEINLINE HRESULT IDot11AdHocNetwork_Disconnect(IDot11AdHocNetwork* Thi #endif -HRESULT STDMETHODCALLTYPE IDot11AdHocNetwork_GetStatus_Proxy( - IDot11AdHocNetwork* This, - DOT11_ADHOC_NETWORK_CONNECTION_STATUS *eStatus); -void __RPC_STUB IDot11AdHocNetwork_GetStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocNetwork_GetSSID_Proxy( - IDot11AdHocNetwork* This, - LPWSTR *ppszwSSID); -void __RPC_STUB IDot11AdHocNetwork_GetSSID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocNetwork_HasProfile_Proxy( - IDot11AdHocNetwork* This, - BOOLEAN *pf11d); -void __RPC_STUB IDot11AdHocNetwork_HasProfile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocNetwork_GetProfileName_Proxy( - IDot11AdHocNetwork* This, - LPWSTR *ppszwProfileName); -void __RPC_STUB IDot11AdHocNetwork_GetProfileName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocNetwork_DeleteProfile_Proxy( - IDot11AdHocNetwork* This); -void __RPC_STUB IDot11AdHocNetwork_DeleteProfile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocNetwork_GetSignalQuality_Proxy( - IDot11AdHocNetwork* This, - ULONG *puStrengthValue, - ULONG *puStrengthMax); -void __RPC_STUB IDot11AdHocNetwork_GetSignalQuality_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocNetwork_GetSecuritySetting_Proxy( - IDot11AdHocNetwork* This, - IDot11AdHocSecuritySettings **pAdHocSecuritySetting); -void __RPC_STUB IDot11AdHocNetwork_GetSecuritySetting_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocNetwork_GetContextGuid_Proxy( - IDot11AdHocNetwork* This, - GUID *pContextGuid); -void __RPC_STUB IDot11AdHocNetwork_GetContextGuid_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocNetwork_GetSignature_Proxy( - IDot11AdHocNetwork* This, - GUID *pSignature); -void __RPC_STUB IDot11AdHocNetwork_GetSignature_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocNetwork_GetInterface_Proxy( - IDot11AdHocNetwork* This, - IDot11AdHocInterface **pAdHocInterface); -void __RPC_STUB IDot11AdHocNetwork_GetInterface_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocNetwork_Connect_Proxy( - IDot11AdHocNetwork* This, - LPCWSTR Passphrase, - LONG GeographicalId, - BOOLEAN fSaveProfile, - BOOLEAN fMakeSavedProfileUserSpecific); -void __RPC_STUB IDot11AdHocNetwork_Connect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocNetwork_Disconnect_Proxy( - IDot11AdHocNetwork* This); -void __RPC_STUB IDot11AdHocNetwork_Disconnect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDot11AdHocNetwork_INTERFACE_DEFINED__ */ @@ -967,27 +819,28 @@ typedef struct IDot11AdHocNetworkNotificationSinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDot11AdHocNetworkNotificationSink* This, + IDot11AdHocNetworkNotificationSink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDot11AdHocNetworkNotificationSink* This); + IDot11AdHocNetworkNotificationSink *This); ULONG (STDMETHODCALLTYPE *Release)( - IDot11AdHocNetworkNotificationSink* This); + IDot11AdHocNetworkNotificationSink *This); /*** IDot11AdHocNetworkNotificationSink methods ***/ HRESULT (STDMETHODCALLTYPE *OnStatusChange)( - IDot11AdHocNetworkNotificationSink* This, + IDot11AdHocNetworkNotificationSink *This, DOT11_ADHOC_NETWORK_CONNECTION_STATUS eStatus); HRESULT (STDMETHODCALLTYPE *OnConnectFail)( - IDot11AdHocNetworkNotificationSink* This, + IDot11AdHocNetworkNotificationSink *This, DOT11_ADHOC_CONNECT_FAIL_REASON eFailReason); END_INTERFACE } IDot11AdHocNetworkNotificationSinkVtbl; + interface IDot11AdHocNetworkNotificationSink { CONST_VTBL IDot11AdHocNetworkNotificationSinkVtbl* lpVtbl; }; @@ -1024,22 +877,6 @@ static FORCEINLINE HRESULT IDot11AdHocNetworkNotificationSink_OnConnectFail(IDot #endif -HRESULT STDMETHODCALLTYPE IDot11AdHocNetworkNotificationSink_OnStatusChange_Proxy( - IDot11AdHocNetworkNotificationSink* This, - DOT11_ADHOC_NETWORK_CONNECTION_STATUS eStatus); -void __RPC_STUB IDot11AdHocNetworkNotificationSink_OnStatusChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocNetworkNotificationSink_OnConnectFail_Proxy( - IDot11AdHocNetworkNotificationSink* This, - DOT11_ADHOC_CONNECT_FAIL_REASON eFailReason); -void __RPC_STUB IDot11AdHocNetworkNotificationSink_OnConnectFail_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDot11AdHocNetworkNotificationSink_INTERFACE_DEFINED__ */ @@ -1092,56 +929,57 @@ typedef struct IDot11AdHocInterfaceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDot11AdHocInterface* This, + IDot11AdHocInterface *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDot11AdHocInterface* This); + IDot11AdHocInterface *This); ULONG (STDMETHODCALLTYPE *Release)( - IDot11AdHocInterface* This); + IDot11AdHocInterface *This); /*** IDot11AdHocInterface methods ***/ HRESULT (STDMETHODCALLTYPE *GetDeviceSignature)( - IDot11AdHocInterface* This, + IDot11AdHocInterface *This, GUID *pSignature); HRESULT (STDMETHODCALLTYPE *GetFriendlyName)( - IDot11AdHocInterface* This, + IDot11AdHocInterface *This, LPWSTR *ppszName); HRESULT (STDMETHODCALLTYPE *IsDot11d)( - IDot11AdHocInterface* This, + IDot11AdHocInterface *This, BOOLEAN *pf11d); HRESULT (STDMETHODCALLTYPE *IsAdHocCapable)( - IDot11AdHocInterface* This, + IDot11AdHocInterface *This, BOOLEAN *pfAdHocCapable); HRESULT (STDMETHODCALLTYPE *IsRadioOn)( - IDot11AdHocInterface* This, + IDot11AdHocInterface *This, BOOLEAN *pfIsRadioOn); HRESULT (STDMETHODCALLTYPE *GetActiveNetwork)( - IDot11AdHocInterface* This, + IDot11AdHocInterface *This, IDot11AdHocNetwork **ppNetwork); HRESULT (STDMETHODCALLTYPE *GetIEnumSecuritySettings)( - IDot11AdHocInterface* This, + IDot11AdHocInterface *This, IEnumDot11AdHocSecuritySettings **ppEnum); HRESULT (STDMETHODCALLTYPE *GetIEnumDot11AdHocNetworks)( - IDot11AdHocInterface* This, + IDot11AdHocInterface *This, GUID *pFilterGuid, IEnumDot11AdHocNetworks **ppEnum); HRESULT (STDMETHODCALLTYPE *GetStatus)( - IDot11AdHocInterface* This, + IDot11AdHocInterface *This, DOT11_ADHOC_NETWORK_CONNECTION_STATUS *pState); END_INTERFACE } IDot11AdHocInterfaceVtbl; + interface IDot11AdHocInterface { CONST_VTBL IDot11AdHocInterfaceVtbl* lpVtbl; }; @@ -1206,79 +1044,6 @@ static FORCEINLINE HRESULT IDot11AdHocInterface_GetStatus(IDot11AdHocInterface* #endif -HRESULT STDMETHODCALLTYPE IDot11AdHocInterface_GetDeviceSignature_Proxy( - IDot11AdHocInterface* This, - GUID *pSignature); -void __RPC_STUB IDot11AdHocInterface_GetDeviceSignature_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocInterface_GetFriendlyName_Proxy( - IDot11AdHocInterface* This, - LPWSTR *ppszName); -void __RPC_STUB IDot11AdHocInterface_GetFriendlyName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocInterface_IsDot11d_Proxy( - IDot11AdHocInterface* This, - BOOLEAN *pf11d); -void __RPC_STUB IDot11AdHocInterface_IsDot11d_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocInterface_IsAdHocCapable_Proxy( - IDot11AdHocInterface* This, - BOOLEAN *pfAdHocCapable); -void __RPC_STUB IDot11AdHocInterface_IsAdHocCapable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocInterface_IsRadioOn_Proxy( - IDot11AdHocInterface* This, - BOOLEAN *pfIsRadioOn); -void __RPC_STUB IDot11AdHocInterface_IsRadioOn_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocInterface_GetActiveNetwork_Proxy( - IDot11AdHocInterface* This, - IDot11AdHocNetwork **ppNetwork); -void __RPC_STUB IDot11AdHocInterface_GetActiveNetwork_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocInterface_GetIEnumSecuritySettings_Proxy( - IDot11AdHocInterface* This, - IEnumDot11AdHocSecuritySettings **ppEnum); -void __RPC_STUB IDot11AdHocInterface_GetIEnumSecuritySettings_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocInterface_GetIEnumDot11AdHocNetworks_Proxy( - IDot11AdHocInterface* This, - GUID *pFilterGuid, - IEnumDot11AdHocNetworks **ppEnum); -void __RPC_STUB IDot11AdHocInterface_GetIEnumDot11AdHocNetworks_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocInterface_GetStatus_Proxy( - IDot11AdHocInterface* This, - DOT11_ADHOC_NETWORK_CONNECTION_STATUS *pState); -void __RPC_STUB IDot11AdHocInterface_GetStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDot11AdHocInterface_INTERFACE_DEFINED__ */ @@ -1317,36 +1082,37 @@ typedef struct IEnumDot11AdHocInterfacesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumDot11AdHocInterfaces* This, + IEnumDot11AdHocInterfaces *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumDot11AdHocInterfaces* This); + IEnumDot11AdHocInterfaces *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumDot11AdHocInterfaces* This); + IEnumDot11AdHocInterfaces *This); /*** IEnumDot11AdHocInterfaces methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumDot11AdHocInterfaces* This, + IEnumDot11AdHocInterfaces *This, ULONG cElt, IDot11AdHocInterface **rgElt, ULONG *pcEltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumDot11AdHocInterfaces* This, + IEnumDot11AdHocInterfaces *This, ULONG cElt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumDot11AdHocInterfaces* This); + IEnumDot11AdHocInterfaces *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumDot11AdHocInterfaces* This, + IEnumDot11AdHocInterfaces *This, IEnumDot11AdHocInterfaces **ppEnum); END_INTERFACE } IEnumDot11AdHocInterfacesVtbl; + interface IEnumDot11AdHocInterfaces { CONST_VTBL IEnumDot11AdHocInterfacesVtbl* lpVtbl; }; @@ -1391,39 +1157,6 @@ static FORCEINLINE HRESULT IEnumDot11AdHocInterfaces_Clone(IEnumDot11AdHocInterf #endif -HRESULT STDMETHODCALLTYPE IEnumDot11AdHocInterfaces_Next_Proxy( - IEnumDot11AdHocInterfaces* This, - ULONG cElt, - IDot11AdHocInterface **rgElt, - ULONG *pcEltFetched); -void __RPC_STUB IEnumDot11AdHocInterfaces_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDot11AdHocInterfaces_Skip_Proxy( - IEnumDot11AdHocInterfaces* This, - ULONG cElt); -void __RPC_STUB IEnumDot11AdHocInterfaces_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDot11AdHocInterfaces_Reset_Proxy( - IEnumDot11AdHocInterfaces* This); -void __RPC_STUB IEnumDot11AdHocInterfaces_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDot11AdHocInterfaces_Clone_Proxy( - IEnumDot11AdHocInterfaces* This, - IEnumDot11AdHocInterfaces **ppEnum); -void __RPC_STUB IEnumDot11AdHocInterfaces_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumDot11AdHocInterfaces_INTERFACE_DEFINED__ */ @@ -1462,36 +1195,37 @@ typedef struct IEnumDot11AdHocSecuritySettingsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumDot11AdHocSecuritySettings* This, + IEnumDot11AdHocSecuritySettings *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumDot11AdHocSecuritySettings* This); + IEnumDot11AdHocSecuritySettings *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumDot11AdHocSecuritySettings* This); + IEnumDot11AdHocSecuritySettings *This); /*** IEnumDot11AdHocSecuritySettings methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumDot11AdHocSecuritySettings* This, + IEnumDot11AdHocSecuritySettings *This, ULONG cElt, IDot11AdHocSecuritySettings **rgElt, ULONG *pcEltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumDot11AdHocSecuritySettings* This, + IEnumDot11AdHocSecuritySettings *This, ULONG cElt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumDot11AdHocSecuritySettings* This); + IEnumDot11AdHocSecuritySettings *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumDot11AdHocSecuritySettings* This, + IEnumDot11AdHocSecuritySettings *This, IEnumDot11AdHocSecuritySettings **ppEnum); END_INTERFACE } IEnumDot11AdHocSecuritySettingsVtbl; + interface IEnumDot11AdHocSecuritySettings { CONST_VTBL IEnumDot11AdHocSecuritySettingsVtbl* lpVtbl; }; @@ -1536,39 +1270,6 @@ static FORCEINLINE HRESULT IEnumDot11AdHocSecuritySettings_Clone(IEnumDot11AdHoc #endif -HRESULT STDMETHODCALLTYPE IEnumDot11AdHocSecuritySettings_Next_Proxy( - IEnumDot11AdHocSecuritySettings* This, - ULONG cElt, - IDot11AdHocSecuritySettings **rgElt, - ULONG *pcEltFetched); -void __RPC_STUB IEnumDot11AdHocSecuritySettings_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDot11AdHocSecuritySettings_Skip_Proxy( - IEnumDot11AdHocSecuritySettings* This, - ULONG cElt); -void __RPC_STUB IEnumDot11AdHocSecuritySettings_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDot11AdHocSecuritySettings_Reset_Proxy( - IEnumDot11AdHocSecuritySettings* This); -void __RPC_STUB IEnumDot11AdHocSecuritySettings_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDot11AdHocSecuritySettings_Clone_Proxy( - IEnumDot11AdHocSecuritySettings* This, - IEnumDot11AdHocSecuritySettings **ppEnum); -void __RPC_STUB IEnumDot11AdHocSecuritySettings_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumDot11AdHocSecuritySettings_INTERFACE_DEFINED__ */ @@ -1599,27 +1300,28 @@ typedef struct IDot11AdHocSecuritySettingsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDot11AdHocSecuritySettings* This, + IDot11AdHocSecuritySettings *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDot11AdHocSecuritySettings* This); + IDot11AdHocSecuritySettings *This); ULONG (STDMETHODCALLTYPE *Release)( - IDot11AdHocSecuritySettings* This); + IDot11AdHocSecuritySettings *This); /*** IDot11AdHocSecuritySettings methods ***/ HRESULT (STDMETHODCALLTYPE *GetDot11AuthAlgorithm)( - IDot11AdHocSecuritySettings* This, + IDot11AdHocSecuritySettings *This, DOT11_ADHOC_AUTH_ALGORITHM *pAuth); HRESULT (STDMETHODCALLTYPE *GetDot11CipherAlgorithm)( - IDot11AdHocSecuritySettings* This, + IDot11AdHocSecuritySettings *This, DOT11_ADHOC_CIPHER_ALGORITHM *pCipher); END_INTERFACE } IDot11AdHocSecuritySettingsVtbl; + interface IDot11AdHocSecuritySettings { CONST_VTBL IDot11AdHocSecuritySettingsVtbl* lpVtbl; }; @@ -1656,22 +1358,6 @@ static FORCEINLINE HRESULT IDot11AdHocSecuritySettings_GetDot11CipherAlgorithm(I #endif -HRESULT STDMETHODCALLTYPE IDot11AdHocSecuritySettings_GetDot11AuthAlgorithm_Proxy( - IDot11AdHocSecuritySettings* This, - DOT11_ADHOC_AUTH_ALGORITHM *pAuth); -void __RPC_STUB IDot11AdHocSecuritySettings_GetDot11AuthAlgorithm_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDot11AdHocSecuritySettings_GetDot11CipherAlgorithm_Proxy( - IDot11AdHocSecuritySettings* This, - DOT11_ADHOC_CIPHER_ALGORITHM *pCipher); -void __RPC_STUB IDot11AdHocSecuritySettings_GetDot11CipherAlgorithm_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDot11AdHocSecuritySettings_INTERFACE_DEFINED__ */ @@ -1699,23 +1385,24 @@ typedef struct IDot11AdHocInterfaceNotificationSinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDot11AdHocInterfaceNotificationSink* This, + IDot11AdHocInterfaceNotificationSink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDot11AdHocInterfaceNotificationSink* This); + IDot11AdHocInterfaceNotificationSink *This); ULONG (STDMETHODCALLTYPE *Release)( - IDot11AdHocInterfaceNotificationSink* This); + IDot11AdHocInterfaceNotificationSink *This); /*** IDot11AdHocInterfaceNotificationSink methods ***/ HRESULT (STDMETHODCALLTYPE *OnConnectionStatusChange)( - IDot11AdHocInterfaceNotificationSink* This, + IDot11AdHocInterfaceNotificationSink *This, DOT11_ADHOC_NETWORK_CONNECTION_STATUS eStatus); END_INTERFACE } IDot11AdHocInterfaceNotificationSinkVtbl; + interface IDot11AdHocInterfaceNotificationSink { CONST_VTBL IDot11AdHocInterfaceNotificationSinkVtbl* lpVtbl; }; @@ -1748,14 +1435,6 @@ static FORCEINLINE HRESULT IDot11AdHocInterfaceNotificationSink_OnConnectionStat #endif -HRESULT STDMETHODCALLTYPE IDot11AdHocInterfaceNotificationSink_OnConnectionStatusChange_Proxy( - IDot11AdHocInterfaceNotificationSink* This, - DOT11_ADHOC_NETWORK_CONNECTION_STATUS eStatus); -void __RPC_STUB IDot11AdHocInterfaceNotificationSink_OnConnectionStatusChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDot11AdHocInterfaceNotificationSink_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/alg.h b/lib/libc/include/any-windows-any/alg.h index 110648d4a4..fb96c4d27e 100644 --- a/lib/libc/include/any-windows-any/alg.h +++ b/lib/libc/include/any-windows-any/alg.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/alg.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/alg.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,51 +21,81 @@ #ifndef __IAdapterInfo_FWD_DEFINED__ #define __IAdapterInfo_FWD_DEFINED__ typedef interface IAdapterInfo IAdapterInfo; +#ifdef __cplusplus +interface IAdapterInfo; +#endif /* __cplusplus */ #endif #ifndef __IPendingProxyConnection_FWD_DEFINED__ #define __IPendingProxyConnection_FWD_DEFINED__ typedef interface IPendingProxyConnection IPendingProxyConnection; +#ifdef __cplusplus +interface IPendingProxyConnection; +#endif /* __cplusplus */ #endif #ifndef __IDataChannel_FWD_DEFINED__ #define __IDataChannel_FWD_DEFINED__ typedef interface IDataChannel IDataChannel; +#ifdef __cplusplus +interface IDataChannel; +#endif /* __cplusplus */ #endif #ifndef __IPersistentDataChannel_FWD_DEFINED__ #define __IPersistentDataChannel_FWD_DEFINED__ typedef interface IPersistentDataChannel IPersistentDataChannel; +#ifdef __cplusplus +interface IPersistentDataChannel; +#endif /* __cplusplus */ #endif #ifndef __IPrimaryControlChannel_FWD_DEFINED__ #define __IPrimaryControlChannel_FWD_DEFINED__ typedef interface IPrimaryControlChannel IPrimaryControlChannel; +#ifdef __cplusplus +interface IPrimaryControlChannel; +#endif /* __cplusplus */ #endif #ifndef __ISecondaryControlChannel_FWD_DEFINED__ #define __ISecondaryControlChannel_FWD_DEFINED__ typedef interface ISecondaryControlChannel ISecondaryControlChannel; +#ifdef __cplusplus +interface ISecondaryControlChannel; +#endif /* __cplusplus */ #endif #ifndef __IEnumAdapterInfo_FWD_DEFINED__ #define __IEnumAdapterInfo_FWD_DEFINED__ typedef interface IEnumAdapterInfo IEnumAdapterInfo; +#ifdef __cplusplus +interface IEnumAdapterInfo; +#endif /* __cplusplus */ #endif #ifndef __IAdapterNotificationSink_FWD_DEFINED__ #define __IAdapterNotificationSink_FWD_DEFINED__ typedef interface IAdapterNotificationSink IAdapterNotificationSink; +#ifdef __cplusplus +interface IAdapterNotificationSink; +#endif /* __cplusplus */ #endif #ifndef __IApplicationGatewayServices_FWD_DEFINED__ #define __IApplicationGatewayServices_FWD_DEFINED__ typedef interface IApplicationGatewayServices IApplicationGatewayServices; +#ifdef __cplusplus +interface IApplicationGatewayServices; +#endif /* __cplusplus */ #endif #ifndef __IApplicationGateway_FWD_DEFINED__ #define __IApplicationGateway_FWD_DEFINED__ typedef interface IApplicationGateway IApplicationGateway; +#ifdef __cplusplus +interface IApplicationGateway; +#endif /* __cplusplus */ #endif #ifndef __ApplicationGatewayServices_FWD_DEFINED__ @@ -251,32 +282,33 @@ typedef struct IAdapterInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAdapterInfo* This, + IAdapterInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAdapterInfo* This); + IAdapterInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IAdapterInfo* This); + IAdapterInfo *This); /*** IAdapterInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetAdapterIndex)( - IAdapterInfo* This, + IAdapterInfo *This, ULONG *pulIndex); HRESULT (STDMETHODCALLTYPE *GetAdapterType)( - IAdapterInfo* This, + IAdapterInfo *This, ALG_ADAPTER_TYPE *pAdapterType); HRESULT (STDMETHODCALLTYPE *GetAdapterAddresses)( - IAdapterInfo* This, + IAdapterInfo *This, ULONG *pulAddressCount, ULONG **prgAddresses); END_INTERFACE } IAdapterInfoVtbl; + interface IAdapterInfo { CONST_VTBL IAdapterInfoVtbl* lpVtbl; }; @@ -317,31 +349,6 @@ static FORCEINLINE HRESULT IAdapterInfo_GetAdapterAddresses(IAdapterInfo* This,U #endif -HRESULT STDMETHODCALLTYPE IAdapterInfo_GetAdapterIndex_Proxy( - IAdapterInfo* This, - ULONG *pulIndex); -void __RPC_STUB IAdapterInfo_GetAdapterIndex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAdapterInfo_GetAdapterType_Proxy( - IAdapterInfo* This, - ALG_ADAPTER_TYPE *pAdapterType); -void __RPC_STUB IAdapterInfo_GetAdapterType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAdapterInfo_GetAdapterAddresses_Proxy( - IAdapterInfo* This, - ULONG *pulAddressCount, - ULONG **prgAddresses); -void __RPC_STUB IAdapterInfo_GetAdapterAddresses_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAdapterInfo_INTERFACE_DEFINED__ */ @@ -369,22 +376,23 @@ typedef struct IPendingProxyConnectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPendingProxyConnection* This, + IPendingProxyConnection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPendingProxyConnection* This); + IPendingProxyConnection *This); ULONG (STDMETHODCALLTYPE *Release)( - IPendingProxyConnection* This); + IPendingProxyConnection *This); /*** IPendingProxyConnection methods ***/ HRESULT (STDMETHODCALLTYPE *Cancel)( - IPendingProxyConnection* This); + IPendingProxyConnection *This); END_INTERFACE } IPendingProxyConnectionVtbl; + interface IPendingProxyConnection { CONST_VTBL IPendingProxyConnectionVtbl* lpVtbl; }; @@ -417,13 +425,6 @@ static FORCEINLINE HRESULT IPendingProxyConnection_Cancel(IPendingProxyConnectio #endif -HRESULT STDMETHODCALLTYPE IPendingProxyConnection_Cancel_Proxy( - IPendingProxyConnection* This); -void __RPC_STUB IPendingProxyConnection_Cancel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPendingProxyConnection_INTERFACE_DEFINED__ */ @@ -460,34 +461,35 @@ typedef struct IDataChannelVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDataChannel* This, + IDataChannel *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDataChannel* This); + IDataChannel *This); ULONG (STDMETHODCALLTYPE *Release)( - IDataChannel* This); + IDataChannel *This); /*** IDataChannel methods ***/ HRESULT (STDMETHODCALLTYPE *Cancel)( - IDataChannel* This); + IDataChannel *This); HRESULT (STDMETHODCALLTYPE *GetChannelProperties)( - IDataChannel* This, + IDataChannel *This, ALG_DATA_CHANNEL_PROPERTIES **ppProperties); HRESULT (STDMETHODCALLTYPE *GetSessionCreationEventHandle)( - IDataChannel* This, + IDataChannel *This, HANDLE *pHandle); HRESULT (STDMETHODCALLTYPE *GetSessionDeletionEventHandle)( - IDataChannel* This, + IDataChannel *This, HANDLE *pHandle); END_INTERFACE } IDataChannelVtbl; + interface IDataChannel { CONST_VTBL IDataChannelVtbl* lpVtbl; }; @@ -532,37 +534,6 @@ static FORCEINLINE HRESULT IDataChannel_GetSessionDeletionEventHandle(IDataChann #endif -HRESULT STDMETHODCALLTYPE IDataChannel_Cancel_Proxy( - IDataChannel* This); -void __RPC_STUB IDataChannel_Cancel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDataChannel_GetChannelProperties_Proxy( - IDataChannel* This, - ALG_DATA_CHANNEL_PROPERTIES **ppProperties); -void __RPC_STUB IDataChannel_GetChannelProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDataChannel_GetSessionCreationEventHandle_Proxy( - IDataChannel* This, - HANDLE *pHandle); -void __RPC_STUB IDataChannel_GetSessionCreationEventHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDataChannel_GetSessionDeletionEventHandle_Proxy( - IDataChannel* This, - HANDLE *pHandle); -void __RPC_STUB IDataChannel_GetSessionDeletionEventHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDataChannel_INTERFACE_DEFINED__ */ @@ -593,26 +564,27 @@ typedef struct IPersistentDataChannelVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPersistentDataChannel* This, + IPersistentDataChannel *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPersistentDataChannel* This); + IPersistentDataChannel *This); ULONG (STDMETHODCALLTYPE *Release)( - IPersistentDataChannel* This); + IPersistentDataChannel *This); /*** IPersistentDataChannel methods ***/ HRESULT (STDMETHODCALLTYPE *Cancel)( - IPersistentDataChannel* This); + IPersistentDataChannel *This); HRESULT (STDMETHODCALLTYPE *GetChannelProperties)( - IPersistentDataChannel* This, + IPersistentDataChannel *This, ALG_PERSISTENT_DATA_CHANNEL_PROPERTIES **ppProperties); END_INTERFACE } IPersistentDataChannelVtbl; + interface IPersistentDataChannel { CONST_VTBL IPersistentDataChannelVtbl* lpVtbl; }; @@ -649,21 +621,6 @@ static FORCEINLINE HRESULT IPersistentDataChannel_GetChannelProperties(IPersiste #endif -HRESULT STDMETHODCALLTYPE IPersistentDataChannel_Cancel_Proxy( - IPersistentDataChannel* This); -void __RPC_STUB IPersistentDataChannel_Cancel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPersistentDataChannel_GetChannelProperties_Proxy( - IPersistentDataChannel* This, - ALG_PERSISTENT_DATA_CHANNEL_PROPERTIES **ppProperties); -void __RPC_STUB IPersistentDataChannel_GetChannelProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPersistentDataChannel_INTERFACE_DEFINED__ */ @@ -703,26 +660,26 @@ typedef struct IPrimaryControlChannelVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPrimaryControlChannel* This, + IPrimaryControlChannel *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPrimaryControlChannel* This); + IPrimaryControlChannel *This); ULONG (STDMETHODCALLTYPE *Release)( - IPrimaryControlChannel* This); + IPrimaryControlChannel *This); /*** IPrimaryControlChannel methods ***/ HRESULT (STDMETHODCALLTYPE *Cancel)( - IPrimaryControlChannel* This); + IPrimaryControlChannel *This); HRESULT (STDMETHODCALLTYPE *GetChannelProperties)( - IPrimaryControlChannel* This, + IPrimaryControlChannel *This, ALG_PRIMARY_CHANNEL_PROPERTIES **ppProperties); HRESULT (STDMETHODCALLTYPE *GetOriginalDestinationInformation)( - IPrimaryControlChannel* This, + IPrimaryControlChannel *This, ULONG ulSourceAddress, USHORT usSourcePort, ULONG *pulOriginalDestinationAddress, @@ -733,6 +690,7 @@ typedef struct IPrimaryControlChannelVtbl { END_INTERFACE } IPrimaryControlChannelVtbl; + interface IPrimaryControlChannel { CONST_VTBL IPrimaryControlChannelVtbl* lpVtbl; }; @@ -773,35 +731,6 @@ static FORCEINLINE HRESULT IPrimaryControlChannel_GetOriginalDestinationInformat #endif -HRESULT STDMETHODCALLTYPE IPrimaryControlChannel_Cancel_Proxy( - IPrimaryControlChannel* This); -void __RPC_STUB IPrimaryControlChannel_Cancel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPrimaryControlChannel_GetChannelProperties_Proxy( - IPrimaryControlChannel* This, - ALG_PRIMARY_CHANNEL_PROPERTIES **ppProperties); -void __RPC_STUB IPrimaryControlChannel_GetChannelProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPrimaryControlChannel_GetOriginalDestinationInformation_Proxy( - IPrimaryControlChannel* This, - ULONG ulSourceAddress, - USHORT usSourcePort, - ULONG *pulOriginalDestinationAddress, - USHORT *pusOriginalDestinationPort, - ULONG *pulRemapDestinationAddress, - USHORT *pulRemapDestinationPort, - IAdapterInfo **ppReceiveAdapter); -void __RPC_STUB IPrimaryControlChannel_GetOriginalDestinationInformation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPrimaryControlChannel_INTERFACE_DEFINED__ */ @@ -839,26 +768,26 @@ typedef struct ISecondaryControlChannelVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISecondaryControlChannel* This, + ISecondaryControlChannel *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISecondaryControlChannel* This); + ISecondaryControlChannel *This); ULONG (STDMETHODCALLTYPE *Release)( - ISecondaryControlChannel* This); + ISecondaryControlChannel *This); /*** ISecondaryControlChannel methods ***/ HRESULT (STDMETHODCALLTYPE *Cancel)( - ISecondaryControlChannel* This); + ISecondaryControlChannel *This); HRESULT (STDMETHODCALLTYPE *GetChannelProperties)( - ISecondaryControlChannel* This, + ISecondaryControlChannel *This, ALG_SECONDARY_CHANNEL_PROPERTIES **ppProperties); HRESULT (STDMETHODCALLTYPE *GetOriginalDestinationInformation)( - ISecondaryControlChannel* This, + ISecondaryControlChannel *This, ULONG ulSourceAddress, USHORT usSourcePort, ULONG *pulOriginalDestinationAddress, @@ -867,6 +796,7 @@ typedef struct ISecondaryControlChannelVtbl { END_INTERFACE } ISecondaryControlChannelVtbl; + interface ISecondaryControlChannel { CONST_VTBL ISecondaryControlChannelVtbl* lpVtbl; }; @@ -907,33 +837,6 @@ static FORCEINLINE HRESULT ISecondaryControlChannel_GetOriginalDestinationInform #endif -HRESULT STDMETHODCALLTYPE ISecondaryControlChannel_Cancel_Proxy( - ISecondaryControlChannel* This); -void __RPC_STUB ISecondaryControlChannel_Cancel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISecondaryControlChannel_GetChannelProperties_Proxy( - ISecondaryControlChannel* This, - ALG_SECONDARY_CHANNEL_PROPERTIES **ppProperties); -void __RPC_STUB ISecondaryControlChannel_GetChannelProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISecondaryControlChannel_GetOriginalDestinationInformation_Proxy( - ISecondaryControlChannel* This, - ULONG ulSourceAddress, - USHORT usSourcePort, - ULONG *pulOriginalDestinationAddress, - USHORT *pusOriginalDestinationPort, - IAdapterInfo **ppReceiveAdapter); -void __RPC_STUB ISecondaryControlChannel_GetOriginalDestinationInformation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISecondaryControlChannel_INTERFACE_DEFINED__ */ @@ -972,36 +875,37 @@ typedef struct IEnumAdapterInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumAdapterInfo* This, + IEnumAdapterInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumAdapterInfo* This); + IEnumAdapterInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumAdapterInfo* This); + IEnumAdapterInfo *This); /*** IEnumAdapterInfo methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumAdapterInfo* This, + IEnumAdapterInfo *This, ULONG celt, IAdapterInfo **rgAI, ULONG *pCeltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumAdapterInfo* This, + IEnumAdapterInfo *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumAdapterInfo* This); + IEnumAdapterInfo *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumAdapterInfo* This, + IEnumAdapterInfo *This, IEnumAdapterInfo **ppEnum); END_INTERFACE } IEnumAdapterInfoVtbl; + interface IEnumAdapterInfo { CONST_VTBL IEnumAdapterInfoVtbl* lpVtbl; }; @@ -1046,39 +950,6 @@ static FORCEINLINE HRESULT IEnumAdapterInfo_Clone(IEnumAdapterInfo* This,IEnumAd #endif -HRESULT STDMETHODCALLTYPE IEnumAdapterInfo_Next_Proxy( - IEnumAdapterInfo* This, - ULONG celt, - IAdapterInfo **rgAI, - ULONG *pCeltFetched); -void __RPC_STUB IEnumAdapterInfo_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumAdapterInfo_Skip_Proxy( - IEnumAdapterInfo* This, - ULONG celt); -void __RPC_STUB IEnumAdapterInfo_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumAdapterInfo_Reset_Proxy( - IEnumAdapterInfo* This); -void __RPC_STUB IEnumAdapterInfo_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumAdapterInfo_Clone_Proxy( - IEnumAdapterInfo* This, - IEnumAdapterInfo **ppEnum); -void __RPC_STUB IEnumAdapterInfo_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumAdapterInfo_INTERFACE_DEFINED__ */ @@ -1115,35 +986,36 @@ typedef struct IAdapterNotificationSinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAdapterNotificationSink* This, + IAdapterNotificationSink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAdapterNotificationSink* This); + IAdapterNotificationSink *This); ULONG (STDMETHODCALLTYPE *Release)( - IAdapterNotificationSink* This); + IAdapterNotificationSink *This); /*** IAdapterNotificationSink methods ***/ HRESULT (STDMETHODCALLTYPE *AdapterAdded)( - IAdapterNotificationSink* This, + IAdapterNotificationSink *This, IAdapterInfo *pAdapter); HRESULT (STDMETHODCALLTYPE *AdapterRemoved)( - IAdapterNotificationSink* This, + IAdapterNotificationSink *This, IAdapterInfo *pAdapter); HRESULT (STDMETHODCALLTYPE *AdapterModified)( - IAdapterNotificationSink* This, + IAdapterNotificationSink *This, IAdapterInfo *pAdapter); HRESULT (STDMETHODCALLTYPE *AdapterUpdatePortMapping)( - IAdapterNotificationSink* This, + IAdapterNotificationSink *This, IAdapterInfo *pAdapter); END_INTERFACE } IAdapterNotificationSinkVtbl; + interface IAdapterNotificationSink { CONST_VTBL IAdapterNotificationSinkVtbl* lpVtbl; }; @@ -1188,38 +1060,6 @@ static FORCEINLINE HRESULT IAdapterNotificationSink_AdapterUpdatePortMapping(IAd #endif -HRESULT STDMETHODCALLTYPE IAdapterNotificationSink_AdapterAdded_Proxy( - IAdapterNotificationSink* This, - IAdapterInfo *pAdapter); -void __RPC_STUB IAdapterNotificationSink_AdapterAdded_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAdapterNotificationSink_AdapterRemoved_Proxy( - IAdapterNotificationSink* This, - IAdapterInfo *pAdapter); -void __RPC_STUB IAdapterNotificationSink_AdapterRemoved_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAdapterNotificationSink_AdapterModified_Proxy( - IAdapterNotificationSink* This, - IAdapterInfo *pAdapter); -void __RPC_STUB IAdapterNotificationSink_AdapterModified_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAdapterNotificationSink_AdapterUpdatePortMapping_Proxy( - IAdapterNotificationSink* This, - IAdapterInfo *pAdapter); -void __RPC_STUB IAdapterNotificationSink_AdapterUpdatePortMapping_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAdapterNotificationSink_INTERFACE_DEFINED__ */ @@ -1342,19 +1182,19 @@ typedef struct IApplicationGatewayServicesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IApplicationGatewayServices* This, + IApplicationGatewayServices *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IApplicationGatewayServices* This); + IApplicationGatewayServices *This); ULONG (STDMETHODCALLTYPE *Release)( - IApplicationGatewayServices* This); + IApplicationGatewayServices *This); /*** IApplicationGatewayServices methods ***/ HRESULT (STDMETHODCALLTYPE *CreatePrimaryControlChannel)( - IApplicationGatewayServices* This, + IApplicationGatewayServices *This, ULONG uAdapterIndex, ALG_PROTOCOL eProtocol, USHORT usPortToCapture, @@ -1365,7 +1205,7 @@ typedef struct IApplicationGatewayServicesVtbl { IPrimaryControlChannel **ppIControlChannel); HRESULT (STDMETHODCALLTYPE *CreateSecondaryControlChannel)( - IApplicationGatewayServices* This, + IApplicationGatewayServices *This, ALG_PROTOCOL eProtocol, ULONG ulPrivateAddress, USHORT usPrivatePort, @@ -1380,13 +1220,13 @@ typedef struct IApplicationGatewayServicesVtbl { ISecondaryControlChannel **ppControlChannel); HRESULT (STDMETHODCALLTYPE *GetBestSourceAddressForDestinationAddress)( - IApplicationGatewayServices* This, + IApplicationGatewayServices *This, ULONG ulDstAddress, WINBOOL fDemandDial, ULONG *pulBestSrcAddress); HRESULT (STDMETHODCALLTYPE *PrepareProxyConnection)( - IApplicationGatewayServices* This, + IApplicationGatewayServices *This, ALG_PROTOCOL eProtocol, ULONG ulSrcAddress, USHORT usSrcPort, @@ -1396,7 +1236,7 @@ typedef struct IApplicationGatewayServicesVtbl { IPendingProxyConnection **ppPendingConnection); HRESULT (STDMETHODCALLTYPE *PrepareSourceModifiedProxyConnection)( - IApplicationGatewayServices* This, + IApplicationGatewayServices *This, ALG_PROTOCOL eProtocol, ULONG ulSrcAddress, USHORT usSrcPort, @@ -1407,7 +1247,7 @@ typedef struct IApplicationGatewayServicesVtbl { IPendingProxyConnection **ppPendingConnection); HRESULT (STDMETHODCALLTYPE *CreateDataChannel)( - IApplicationGatewayServices* This, + IApplicationGatewayServices *This, ALG_PROTOCOL eProtocol, ULONG ulPrivateAddress, USHORT usPrivatePort, @@ -1421,7 +1261,7 @@ typedef struct IApplicationGatewayServicesVtbl { IDataChannel **ppDataChannel); HRESULT (STDMETHODCALLTYPE *CreatePersistentDataChannel)( - IApplicationGatewayServices* This, + IApplicationGatewayServices *This, ALG_PROTOCOL eProtocol, ULONG ulPrivateAddress, USHORT usPrivatePort, @@ -1433,30 +1273,30 @@ typedef struct IApplicationGatewayServicesVtbl { IPersistentDataChannel **ppIPersistentDataChannel); HRESULT (STDMETHODCALLTYPE *ReservePort)( - IApplicationGatewayServices* This, + IApplicationGatewayServices *This, USHORT usPortCount, USHORT *pusReservedPort); HRESULT (STDMETHODCALLTYPE *ReleaseReservedPort)( - IApplicationGatewayServices* This, + IApplicationGatewayServices *This, USHORT usReservedPortBase, USHORT usPortCount); HRESULT (STDMETHODCALLTYPE *EnumerateAdapters)( - IApplicationGatewayServices* This, + IApplicationGatewayServices *This, IEnumAdapterInfo **ppIEnumAdapterInfo); HRESULT (STDMETHODCALLTYPE *StartAdapterNotifications)( - IApplicationGatewayServices* This, + IApplicationGatewayServices *This, IAdapterNotificationSink *pSink, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *StopAdapterNotifications)( - IApplicationGatewayServices* This, + IApplicationGatewayServices *This, DWORD dwCookieOfSink); HRESULT (STDMETHODCALLTYPE *LookupAdapterPortMapping)( - IApplicationGatewayServices* This, + IApplicationGatewayServices *This, ULONG ulAdapterIndex, UCHAR Protocol, ULONG ulDestinationAddress, @@ -1466,6 +1306,7 @@ typedef struct IApplicationGatewayServicesVtbl { END_INTERFACE } IApplicationGatewayServicesVtbl; + interface IApplicationGatewayServices { CONST_VTBL IApplicationGatewayServicesVtbl* lpVtbl; }; @@ -1546,169 +1387,6 @@ static FORCEINLINE HRESULT IApplicationGatewayServices_LookupAdapterPortMapping( #endif -HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_CreatePrimaryControlChannel_Proxy( - IApplicationGatewayServices* This, - ULONG uAdapterIndex, - ALG_PROTOCOL eProtocol, - USHORT usPortToCapture, - ALG_CAPTURE eCaptureType, - WINBOOL fCaptureInbound, - ULONG ulListenAddress, - USHORT usListenPort, - IPrimaryControlChannel **ppIControlChannel); -void __RPC_STUB IApplicationGatewayServices_CreatePrimaryControlChannel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_CreateSecondaryControlChannel_Proxy( - IApplicationGatewayServices* This, - ALG_PROTOCOL eProtocol, - ULONG ulPrivateAddress, - USHORT usPrivatePort, - ULONG ulPublicAddress, - USHORT usPublicPort, - ULONG ulRemoteAddress, - USHORT usRemotePort, - ULONG ulListenAddress, - USHORT usListenPort, - ALG_DIRECTION eDirection, - WINBOOL fPersistent, - ISecondaryControlChannel **ppControlChannel); -void __RPC_STUB IApplicationGatewayServices_CreateSecondaryControlChannel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_GetBestSourceAddressForDestinationAddress_Proxy( - IApplicationGatewayServices* This, - ULONG ulDstAddress, - WINBOOL fDemandDial, - ULONG *pulBestSrcAddress); -void __RPC_STUB IApplicationGatewayServices_GetBestSourceAddressForDestinationAddress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_PrepareProxyConnection_Proxy( - IApplicationGatewayServices* This, - ALG_PROTOCOL eProtocol, - ULONG ulSrcAddress, - USHORT usSrcPort, - ULONG ulDstAddress, - USHORT usDstPort, - WINBOOL fNoTimeout, - IPendingProxyConnection **ppPendingConnection); -void __RPC_STUB IApplicationGatewayServices_PrepareProxyConnection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_PrepareSourceModifiedProxyConnection_Proxy( - IApplicationGatewayServices* This, - ALG_PROTOCOL eProtocol, - ULONG ulSrcAddress, - USHORT usSrcPort, - ULONG ulDstAddress, - USHORT usDstPort, - ULONG ulNewSrcAddress, - USHORT usNewSourcePort, - IPendingProxyConnection **ppPendingConnection); -void __RPC_STUB IApplicationGatewayServices_PrepareSourceModifiedProxyConnection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_CreateDataChannel_Proxy( - IApplicationGatewayServices* This, - ALG_PROTOCOL eProtocol, - ULONG ulPrivateAddress, - USHORT usPrivatePort, - ULONG ulPublicAddress, - USHORT usPublicPort, - ULONG ulRemoteAddress, - USHORT usRemotePort, - ALG_DIRECTION eDirection, - ALG_NOTIFICATION eDesiredNotification, - WINBOOL fNoTimeout, - IDataChannel **ppDataChannel); -void __RPC_STUB IApplicationGatewayServices_CreateDataChannel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_CreatePersistentDataChannel_Proxy( - IApplicationGatewayServices* This, - ALG_PROTOCOL eProtocol, - ULONG ulPrivateAddress, - USHORT usPrivatePort, - ULONG ulPublicAddress, - USHORT usPublicPort, - ULONG ulRemoteAddress, - USHORT usRemotePort, - ALG_DIRECTION eDirection, - IPersistentDataChannel **ppIPersistentDataChannel); -void __RPC_STUB IApplicationGatewayServices_CreatePersistentDataChannel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_ReservePort_Proxy( - IApplicationGatewayServices* This, - USHORT usPortCount, - USHORT *pusReservedPort); -void __RPC_STUB IApplicationGatewayServices_ReservePort_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_ReleaseReservedPort_Proxy( - IApplicationGatewayServices* This, - USHORT usReservedPortBase, - USHORT usPortCount); -void __RPC_STUB IApplicationGatewayServices_ReleaseReservedPort_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_EnumerateAdapters_Proxy( - IApplicationGatewayServices* This, - IEnumAdapterInfo **ppIEnumAdapterInfo); -void __RPC_STUB IApplicationGatewayServices_EnumerateAdapters_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_StartAdapterNotifications_Proxy( - IApplicationGatewayServices* This, - IAdapterNotificationSink *pSink, - DWORD *pdwCookie); -void __RPC_STUB IApplicationGatewayServices_StartAdapterNotifications_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_StopAdapterNotifications_Proxy( - IApplicationGatewayServices* This, - DWORD dwCookieOfSink); -void __RPC_STUB IApplicationGatewayServices_StopAdapterNotifications_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_LookupAdapterPortMapping_Proxy( - IApplicationGatewayServices* This, - ULONG ulAdapterIndex, - UCHAR Protocol, - ULONG ulDestinationAddress, - USHORT usDestinationPort, - ULONG *pulRemapAddress, - USHORT *pusRemapPort); -void __RPC_STUB IApplicationGatewayServices_LookupAdapterPortMapping_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IApplicationGatewayServices_INTERFACE_DEFINED__ */ @@ -1739,26 +1417,27 @@ typedef struct IApplicationGatewayVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IApplicationGateway* This, + IApplicationGateway *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IApplicationGateway* This); + IApplicationGateway *This); ULONG (STDMETHODCALLTYPE *Release)( - IApplicationGateway* This); + IApplicationGateway *This); /*** IApplicationGateway methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IApplicationGateway* This, + IApplicationGateway *This, IApplicationGatewayServices *pAlgServices); HRESULT (STDMETHODCALLTYPE *Stop)( - IApplicationGateway* This); + IApplicationGateway *This); END_INTERFACE } IApplicationGatewayVtbl; + interface IApplicationGateway { CONST_VTBL IApplicationGatewayVtbl* lpVtbl; }; @@ -1795,21 +1474,6 @@ static FORCEINLINE HRESULT IApplicationGateway_Stop(IApplicationGateway* This) { #endif -HRESULT STDMETHODCALLTYPE IApplicationGateway_Initialize_Proxy( - IApplicationGateway* This, - IApplicationGatewayServices *pAlgServices); -void __RPC_STUB IApplicationGateway_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationGateway_Stop_Proxy( - IApplicationGateway* This); -void __RPC_STUB IApplicationGateway_Stop_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IApplicationGateway_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/amstream.h b/lib/libc/include/any-windows-any/amstream.h index 1cacc86cca..45f38c2ec8 100644 --- a/lib/libc/include/any-windows-any/amstream.h +++ b/lib/libc/include/any-windows-any/amstream.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/amstream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/amstream.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -180,7 +181,7 @@ enum { AMMSF_NOCLOCK = 0x4, AMMSF_RUN = 0x8 }; -typedef enum __WIDL_amstream_generated_name_0000000C { +typedef enum __WIDL_amstream_generated_name_00000019 { Disabled = 0, ReadData = 1, RenderData = 2 diff --git a/lib/libc/include/any-windows-any/amvideo.h b/lib/libc/include/any-windows-any/amvideo.h index 2e211c47e3..306967b7ce 100644 --- a/lib/libc/include/any-windows-any/amvideo.h +++ b/lib/libc/include/any-windows-any/amvideo.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/amvideo.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/amvideo.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -78,7 +79,7 @@ typedef void DDSURFACEDESC; typedef void DDCAPS; typedef DWORD RGBQUAD; typedef LONGLONG REFERENCE_TIME; -typedef struct __WIDL_amvideo_generated_name_00000002 { +typedef struct __WIDL_amvideo_generated_name_0000000E { DWORD biSize; LONG biWidth; LONG biHeight; @@ -91,8 +92,8 @@ typedef struct __WIDL_amvideo_generated_name_00000002 { DWORD biClrUsed; DWORD biClrImportant; } BITMAPINFOHEADER; -typedef struct __WIDL_amvideo_generated_name_00000002 *PBITMAPINFOHEADER; -typedef struct __WIDL_amvideo_generated_name_00000002 *LPBITMAPINFOHEADER; +typedef struct __WIDL_amvideo_generated_name_0000000E *PBITMAPINFOHEADER; +typedef struct __WIDL_amvideo_generated_name_0000000E *LPBITMAPINFOHEADER; #endif #include #define AMDDS_NONE 0x00 @@ -1165,7 +1166,7 @@ typedef struct tagAnalogVideoInfo { DWORD dwActiveHeight; REFERENCE_TIME AvgTimePerFrame; } ANALOGVIDEOINFO; -typedef enum __WIDL_amvideo_generated_name_00000003 { +typedef enum __WIDL_amvideo_generated_name_0000000F { AM_PROPERTY_FRAMESTEP_STEP = 0x1, AM_PROPERTY_FRAMESTEP_CANCEL = 0x2, AM_PROPERTY_FRAMESTEP_CANSTEP = 0x3, diff --git a/lib/libc/include/any-windows-any/assert.h b/lib/libc/include/any-windows-any/assert.h index 0d7b1f1605..fce63a03cd 100644 --- a/lib/libc/include/any-windows-any/assert.h +++ b/lib/libc/include/any-windows-any/assert.h @@ -42,10 +42,8 @@ extern "C" { #endif /* _CRT_TERMINATE_DEFINED */ -extern void __cdecl -_wassert(const wchar_t *_Message,const wchar_t *_File,unsigned _Line); -extern void __cdecl -_assert (const char *_Message, const char *_File, unsigned _Line); +_CRTIMP void __cdecl _wassert(const wchar_t *_Message,const wchar_t *_File,unsigned _Line); +_CRTIMP void __cdecl _assert (const char *_Message, const char *_File, unsigned _Line); #ifdef __cplusplus } diff --git a/lib/libc/include/any-windows-any/audioclient.h b/lib/libc/include/any-windows-any/audioclient.h index 92029e9cc4..81f0ab923f 100644 --- a/lib/libc/include/any-windows-any/audioclient.h +++ b/lib/libc/include/any-windows-any/audioclient.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/audioclient.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/audioclient.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,51 +21,81 @@ #ifndef __IAudioClient_FWD_DEFINED__ #define __IAudioClient_FWD_DEFINED__ typedef interface IAudioClient IAudioClient; +#ifdef __cplusplus +interface IAudioClient; +#endif /* __cplusplus */ #endif #ifndef __IAudioClient2_FWD_DEFINED__ #define __IAudioClient2_FWD_DEFINED__ typedef interface IAudioClient2 IAudioClient2; +#ifdef __cplusplus +interface IAudioClient2; +#endif /* __cplusplus */ #endif #ifndef __IAudioRenderClient_FWD_DEFINED__ #define __IAudioRenderClient_FWD_DEFINED__ typedef interface IAudioRenderClient IAudioRenderClient; +#ifdef __cplusplus +interface IAudioRenderClient; +#endif /* __cplusplus */ #endif #ifndef __IAudioCaptureClient_FWD_DEFINED__ #define __IAudioCaptureClient_FWD_DEFINED__ typedef interface IAudioCaptureClient IAudioCaptureClient; +#ifdef __cplusplus +interface IAudioCaptureClient; +#endif /* __cplusplus */ #endif #ifndef __IAudioClock_FWD_DEFINED__ #define __IAudioClock_FWD_DEFINED__ typedef interface IAudioClock IAudioClock; +#ifdef __cplusplus +interface IAudioClock; +#endif /* __cplusplus */ #endif #ifndef __IAudioClock2_FWD_DEFINED__ #define __IAudioClock2_FWD_DEFINED__ typedef interface IAudioClock2 IAudioClock2; +#ifdef __cplusplus +interface IAudioClock2; +#endif /* __cplusplus */ #endif #ifndef __IAudioClockAdjustment_FWD_DEFINED__ #define __IAudioClockAdjustment_FWD_DEFINED__ typedef interface IAudioClockAdjustment IAudioClockAdjustment; +#ifdef __cplusplus +interface IAudioClockAdjustment; +#endif /* __cplusplus */ #endif #ifndef __ISimpleAudioVolume_FWD_DEFINED__ #define __ISimpleAudioVolume_FWD_DEFINED__ typedef interface ISimpleAudioVolume ISimpleAudioVolume; +#ifdef __cplusplus +interface ISimpleAudioVolume; +#endif /* __cplusplus */ #endif #ifndef __IAudioStreamVolume_FWD_DEFINED__ #define __IAudioStreamVolume_FWD_DEFINED__ typedef interface IAudioStreamVolume IAudioStreamVolume; +#ifdef __cplusplus +interface IAudioStreamVolume; +#endif /* __cplusplus */ #endif #ifndef __IChannelAudioVolume_FWD_DEFINED__ #define __IChannelAudioVolume_FWD_DEFINED__ typedef interface IChannelAudioVolume IChannelAudioVolume; +#ifdef __cplusplus +interface IChannelAudioVolume; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -108,7 +139,6 @@ enum _AUDCLNT_BUFFERFLAGS { AUDCLNT_BUFFERFLAGS_TIMESTAMP_ERROR = 0x4 }; - typedef struct AudioClientProperties { UINT32 cbSize; WINBOOL bIsOffload; @@ -181,19 +211,19 @@ typedef struct IAudioClientVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAudioClient* This, + IAudioClient *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAudioClient* This); + IAudioClient *This); ULONG (STDMETHODCALLTYPE *Release)( - IAudioClient* This); + IAudioClient *This); /*** IAudioClient methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IAudioClient* This, + IAudioClient *This, AUDCLNT_SHAREMODE ShareMode, DWORD StreamFlags, REFERENCE_TIME hnsBufferDuration, @@ -202,52 +232,53 @@ typedef struct IAudioClientVtbl { LPCGUID AudioSessionGuid); HRESULT (STDMETHODCALLTYPE *GetBufferSize)( - IAudioClient* This, + IAudioClient *This, UINT32 *pNumBufferFrames); HRESULT (STDMETHODCALLTYPE *GetStreamLatency)( - IAudioClient* This, + IAudioClient *This, REFERENCE_TIME *phnsLatency); HRESULT (STDMETHODCALLTYPE *GetCurrentPadding)( - IAudioClient* This, + IAudioClient *This, UINT32 *pNumPaddingFrames); HRESULT (STDMETHODCALLTYPE *IsFormatSupported)( - IAudioClient* This, + IAudioClient *This, AUDCLNT_SHAREMODE ShareMode, const WAVEFORMATEX *pFormat, WAVEFORMATEX **ppClosestMatch); HRESULT (STDMETHODCALLTYPE *GetMixFormat)( - IAudioClient* This, + IAudioClient *This, WAVEFORMATEX **ppDeviceFormat); HRESULT (STDMETHODCALLTYPE *GetDevicePeriod)( - IAudioClient* This, + IAudioClient *This, REFERENCE_TIME *phnsDefaultDevicePeriod, REFERENCE_TIME *phnsMinimumDevicePeriod); HRESULT (STDMETHODCALLTYPE *Start)( - IAudioClient* This); + IAudioClient *This); HRESULT (STDMETHODCALLTYPE *Stop)( - IAudioClient* This); + IAudioClient *This); HRESULT (STDMETHODCALLTYPE *Reset)( - IAudioClient* This); + IAudioClient *This); HRESULT (STDMETHODCALLTYPE *SetEventHandle)( - IAudioClient* This, + IAudioClient *This, HANDLE eventHandle); HRESULT (STDMETHODCALLTYPE *GetService)( - IAudioClient* This, + IAudioClient *This, REFIID riid, void **ppv); END_INTERFACE } IAudioClientVtbl; + interface IAudioClient { CONST_VTBL IAudioClientVtbl* lpVtbl; }; @@ -324,108 +355,6 @@ static FORCEINLINE HRESULT IAudioClient_GetService(IAudioClient* This,REFIID rii #endif -HRESULT STDMETHODCALLTYPE IAudioClient_Initialize_Proxy( - IAudioClient* This, - AUDCLNT_SHAREMODE ShareMode, - DWORD StreamFlags, - REFERENCE_TIME hnsBufferDuration, - REFERENCE_TIME hnsPeriodicity, - const WAVEFORMATEX *pFormat, - LPCGUID AudioSessionGuid); -void __RPC_STUB IAudioClient_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioClient_GetBufferSize_Proxy( - IAudioClient* This, - UINT32 *pNumBufferFrames); -void __RPC_STUB IAudioClient_GetBufferSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioClient_GetStreamLatency_Proxy( - IAudioClient* This, - REFERENCE_TIME *phnsLatency); -void __RPC_STUB IAudioClient_GetStreamLatency_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioClient_GetCurrentPadding_Proxy( - IAudioClient* This, - UINT32 *pNumPaddingFrames); -void __RPC_STUB IAudioClient_GetCurrentPadding_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioClient_IsFormatSupported_Proxy( - IAudioClient* This, - AUDCLNT_SHAREMODE ShareMode, - const WAVEFORMATEX *pFormat, - WAVEFORMATEX **ppClosestMatch); -void __RPC_STUB IAudioClient_IsFormatSupported_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioClient_GetMixFormat_Proxy( - IAudioClient* This, - WAVEFORMATEX **ppDeviceFormat); -void __RPC_STUB IAudioClient_GetMixFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioClient_GetDevicePeriod_Proxy( - IAudioClient* This, - REFERENCE_TIME *phnsDefaultDevicePeriod, - REFERENCE_TIME *phnsMinimumDevicePeriod); -void __RPC_STUB IAudioClient_GetDevicePeriod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioClient_Start_Proxy( - IAudioClient* This); -void __RPC_STUB IAudioClient_Start_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioClient_Stop_Proxy( - IAudioClient* This); -void __RPC_STUB IAudioClient_Stop_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioClient_Reset_Proxy( - IAudioClient* This); -void __RPC_STUB IAudioClient_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioClient_SetEventHandle_Proxy( - IAudioClient* This, - HANDLE eventHandle); -void __RPC_STUB IAudioClient_SetEventHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioClient_GetService_Proxy( - IAudioClient* This, - REFIID riid, - void **ppv); -void __RPC_STUB IAudioClient_GetService_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAudioClient_INTERFACE_DEFINED__ */ @@ -464,19 +393,19 @@ typedef struct IAudioClient2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAudioClient2* This, + IAudioClient2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAudioClient2* This); + IAudioClient2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IAudioClient2* This); + IAudioClient2 *This); /*** IAudioClient methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IAudioClient2* This, + IAudioClient2 *This, AUDCLNT_SHAREMODE ShareMode, DWORD StreamFlags, REFERENCE_TIME hnsBufferDuration, @@ -485,62 +414,62 @@ typedef struct IAudioClient2Vtbl { LPCGUID AudioSessionGuid); HRESULT (STDMETHODCALLTYPE *GetBufferSize)( - IAudioClient2* This, + IAudioClient2 *This, UINT32 *pNumBufferFrames); HRESULT (STDMETHODCALLTYPE *GetStreamLatency)( - IAudioClient2* This, + IAudioClient2 *This, REFERENCE_TIME *phnsLatency); HRESULT (STDMETHODCALLTYPE *GetCurrentPadding)( - IAudioClient2* This, + IAudioClient2 *This, UINT32 *pNumPaddingFrames); HRESULT (STDMETHODCALLTYPE *IsFormatSupported)( - IAudioClient2* This, + IAudioClient2 *This, AUDCLNT_SHAREMODE ShareMode, const WAVEFORMATEX *pFormat, WAVEFORMATEX **ppClosestMatch); HRESULT (STDMETHODCALLTYPE *GetMixFormat)( - IAudioClient2* This, + IAudioClient2 *This, WAVEFORMATEX **ppDeviceFormat); HRESULT (STDMETHODCALLTYPE *GetDevicePeriod)( - IAudioClient2* This, + IAudioClient2 *This, REFERENCE_TIME *phnsDefaultDevicePeriod, REFERENCE_TIME *phnsMinimumDevicePeriod); HRESULT (STDMETHODCALLTYPE *Start)( - IAudioClient2* This); + IAudioClient2 *This); HRESULT (STDMETHODCALLTYPE *Stop)( - IAudioClient2* This); + IAudioClient2 *This); HRESULT (STDMETHODCALLTYPE *Reset)( - IAudioClient2* This); + IAudioClient2 *This); HRESULT (STDMETHODCALLTYPE *SetEventHandle)( - IAudioClient2* This, + IAudioClient2 *This, HANDLE eventHandle); HRESULT (STDMETHODCALLTYPE *GetService)( - IAudioClient2* This, + IAudioClient2 *This, REFIID riid, void **ppv); /*** IAudioClient2 methods ***/ HRESULT (STDMETHODCALLTYPE *IsOffloadCapable)( - IAudioClient2* This, + IAudioClient2 *This, AUDIO_STREAM_CATEGORY Category, WINBOOL *pbOffloadCapable); HRESULT (STDMETHODCALLTYPE *SetClientProperties)( - IAudioClient2* This, + IAudioClient2 *This, const AudioClientProperties *pProperties); HRESULT (STDMETHODCALLTYPE *GetBufferSizeLimits)( - IAudioClient2* This, + IAudioClient2 *This, const WAVEFORMATEX *pFormat, WINBOOL bEventDriven, REFERENCE_TIME *phnsMinBufferDuration, @@ -548,6 +477,7 @@ typedef struct IAudioClient2Vtbl { END_INTERFACE } IAudioClient2Vtbl; + interface IAudioClient2 { CONST_VTBL IAudioClient2Vtbl* lpVtbl; }; @@ -638,34 +568,6 @@ static FORCEINLINE HRESULT IAudioClient2_GetBufferSizeLimits(IAudioClient2* This #endif -HRESULT STDMETHODCALLTYPE IAudioClient2_IsOffloadCapable_Proxy( - IAudioClient2* This, - AUDIO_STREAM_CATEGORY Category, - WINBOOL *pbOffloadCapable); -void __RPC_STUB IAudioClient2_IsOffloadCapable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioClient2_SetClientProperties_Proxy( - IAudioClient2* This, - const AudioClientProperties *pProperties); -void __RPC_STUB IAudioClient2_SetClientProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioClient2_GetBufferSizeLimits_Proxy( - IAudioClient2* This, - const WAVEFORMATEX *pFormat, - WINBOOL bEventDriven, - REFERENCE_TIME *phnsMinBufferDuration, - REFERENCE_TIME *phnsMaxBufferDuration); -void __RPC_STUB IAudioClient2_GetBufferSizeLimits_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAudioClient2_INTERFACE_DEFINED__ */ @@ -699,29 +601,30 @@ typedef struct IAudioRenderClientVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAudioRenderClient* This, + IAudioRenderClient *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAudioRenderClient* This); + IAudioRenderClient *This); ULONG (STDMETHODCALLTYPE *Release)( - IAudioRenderClient* This); + IAudioRenderClient *This); /*** IAudioRenderClient methods ***/ HRESULT (STDMETHODCALLTYPE *GetBuffer)( - IAudioRenderClient* This, + IAudioRenderClient *This, UINT32 NumFramesRequested, BYTE **ppData); HRESULT (STDMETHODCALLTYPE *ReleaseBuffer)( - IAudioRenderClient* This, + IAudioRenderClient *This, UINT32 NumFramesWritten, DWORD dwFlags); END_INTERFACE } IAudioRenderClientVtbl; + interface IAudioRenderClient { CONST_VTBL IAudioRenderClientVtbl* lpVtbl; }; @@ -758,24 +661,6 @@ static FORCEINLINE HRESULT IAudioRenderClient_ReleaseBuffer(IAudioRenderClient* #endif -HRESULT STDMETHODCALLTYPE IAudioRenderClient_GetBuffer_Proxy( - IAudioRenderClient* This, - UINT32 NumFramesRequested, - BYTE **ppData); -void __RPC_STUB IAudioRenderClient_GetBuffer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioRenderClient_ReleaseBuffer_Proxy( - IAudioRenderClient* This, - UINT32 NumFramesWritten, - DWORD dwFlags); -void __RPC_STUB IAudioRenderClient_ReleaseBuffer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAudioRenderClient_INTERFACE_DEFINED__ */ @@ -814,19 +699,19 @@ typedef struct IAudioCaptureClientVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAudioCaptureClient* This, + IAudioCaptureClient *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAudioCaptureClient* This); + IAudioCaptureClient *This); ULONG (STDMETHODCALLTYPE *Release)( - IAudioCaptureClient* This); + IAudioCaptureClient *This); /*** IAudioCaptureClient methods ***/ HRESULT (STDMETHODCALLTYPE *GetBuffer)( - IAudioCaptureClient* This, + IAudioCaptureClient *This, BYTE **ppData, UINT32 *pNumFramesToRead, DWORD *pdwFlags, @@ -834,15 +719,16 @@ typedef struct IAudioCaptureClientVtbl { UINT64 *pu64QPCPosition); HRESULT (STDMETHODCALLTYPE *ReleaseBuffer)( - IAudioCaptureClient* This, + IAudioCaptureClient *This, UINT32 NumFramesRead); HRESULT (STDMETHODCALLTYPE *GetNextPacketSize)( - IAudioCaptureClient* This, + IAudioCaptureClient *This, UINT32 *pNumFramesInNextPacket); END_INTERFACE } IAudioCaptureClientVtbl; + interface IAudioCaptureClient { CONST_VTBL IAudioCaptureClientVtbl* lpVtbl; }; @@ -883,34 +769,6 @@ static FORCEINLINE HRESULT IAudioCaptureClient_GetNextPacketSize(IAudioCaptureCl #endif -HRESULT STDMETHODCALLTYPE IAudioCaptureClient_GetBuffer_Proxy( - IAudioCaptureClient* This, - BYTE **ppData, - UINT32 *pNumFramesToRead, - DWORD *pdwFlags, - UINT64 *pu64DevicePosition, - UINT64 *pu64QPCPosition); -void __RPC_STUB IAudioCaptureClient_GetBuffer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioCaptureClient_ReleaseBuffer_Proxy( - IAudioCaptureClient* This, - UINT32 NumFramesRead); -void __RPC_STUB IAudioCaptureClient_ReleaseBuffer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioCaptureClient_GetNextPacketSize_Proxy( - IAudioCaptureClient* This, - UINT32 *pNumFramesInNextPacket); -void __RPC_STUB IAudioCaptureClient_GetNextPacketSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAudioCaptureClient_INTERFACE_DEFINED__ */ @@ -948,32 +806,33 @@ typedef struct IAudioClockVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAudioClock* This, + IAudioClock *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAudioClock* This); + IAudioClock *This); ULONG (STDMETHODCALLTYPE *Release)( - IAudioClock* This); + IAudioClock *This); /*** IAudioClock methods ***/ HRESULT (STDMETHODCALLTYPE *GetFrequency)( - IAudioClock* This, + IAudioClock *This, UINT64 *pu64Frequency); HRESULT (STDMETHODCALLTYPE *GetPosition)( - IAudioClock* This, + IAudioClock *This, UINT64 *pu64Position, UINT64 *pu64QPCPosition); HRESULT (STDMETHODCALLTYPE *GetCharacteristics)( - IAudioClock* This, + IAudioClock *This, DWORD *pdwCharacteristics); END_INTERFACE } IAudioClockVtbl; + interface IAudioClock { CONST_VTBL IAudioClockVtbl* lpVtbl; }; @@ -1014,31 +873,6 @@ static FORCEINLINE HRESULT IAudioClock_GetCharacteristics(IAudioClock* This,DWOR #endif -HRESULT STDMETHODCALLTYPE IAudioClock_GetFrequency_Proxy( - IAudioClock* This, - UINT64 *pu64Frequency); -void __RPC_STUB IAudioClock_GetFrequency_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioClock_GetPosition_Proxy( - IAudioClock* This, - UINT64 *pu64Position, - UINT64 *pu64QPCPosition); -void __RPC_STUB IAudioClock_GetPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioClock_GetCharacteristics_Proxy( - IAudioClock* This, - DWORD *pdwCharacteristics); -void __RPC_STUB IAudioClock_GetCharacteristics_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAudioClock_INTERFACE_DEFINED__ */ @@ -1070,24 +904,25 @@ typedef struct IAudioClock2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAudioClock2* This, + IAudioClock2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAudioClock2* This); + IAudioClock2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IAudioClock2* This); + IAudioClock2 *This); /*** IAudioClock2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetDevicePosition)( - IAudioClock2* This, + IAudioClock2 *This, UINT64 *DevicePosition, UINT64 *QPCPosition); END_INTERFACE } IAudioClock2Vtbl; + interface IAudioClock2 { CONST_VTBL IAudioClock2Vtbl* lpVtbl; }; @@ -1120,15 +955,6 @@ static FORCEINLINE HRESULT IAudioClock2_GetDevicePosition(IAudioClock2* This,UIN #endif -HRESULT STDMETHODCALLTYPE IAudioClock2_GetDevicePosition_Proxy( - IAudioClock2* This, - UINT64 *DevicePosition, - UINT64 *QPCPosition); -void __RPC_STUB IAudioClock2_GetDevicePosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAudioClock2_INTERFACE_DEFINED__ */ @@ -1157,23 +983,24 @@ typedef struct IAudioClockAdjustmentVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAudioClockAdjustment* This, + IAudioClockAdjustment *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAudioClockAdjustment* This); + IAudioClockAdjustment *This); ULONG (STDMETHODCALLTYPE *Release)( - IAudioClockAdjustment* This); + IAudioClockAdjustment *This); /*** IAudioClockAdjustment methods ***/ HRESULT (STDMETHODCALLTYPE *SetSampleRate)( - IAudioClockAdjustment* This, + IAudioClockAdjustment *This, float flSampleRate); END_INTERFACE } IAudioClockAdjustmentVtbl; + interface IAudioClockAdjustment { CONST_VTBL IAudioClockAdjustmentVtbl* lpVtbl; }; @@ -1206,14 +1033,6 @@ static FORCEINLINE HRESULT IAudioClockAdjustment_SetSampleRate(IAudioClockAdjust #endif -HRESULT STDMETHODCALLTYPE IAudioClockAdjustment_SetSampleRate_Proxy( - IAudioClockAdjustment* This, - float flSampleRate); -void __RPC_STUB IAudioClockAdjustment_SetSampleRate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAudioClockAdjustment_INTERFACE_DEFINED__ */ @@ -1255,37 +1074,38 @@ typedef struct ISimpleAudioVolumeVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISimpleAudioVolume* This, + ISimpleAudioVolume *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISimpleAudioVolume* This); + ISimpleAudioVolume *This); ULONG (STDMETHODCALLTYPE *Release)( - ISimpleAudioVolume* This); + ISimpleAudioVolume *This); /*** ISimpleAudioVolume methods ***/ HRESULT (STDMETHODCALLTYPE *SetMasterVolume)( - ISimpleAudioVolume* This, + ISimpleAudioVolume *This, float fLevel, LPCGUID EventContext); HRESULT (STDMETHODCALLTYPE *GetMasterVolume)( - ISimpleAudioVolume* This, + ISimpleAudioVolume *This, float *pfLevel); HRESULT (STDMETHODCALLTYPE *SetMute)( - ISimpleAudioVolume* This, + ISimpleAudioVolume *This, const WINBOOL bMute, LPCGUID EventContext); HRESULT (STDMETHODCALLTYPE *GetMute)( - ISimpleAudioVolume* This, + ISimpleAudioVolume *This, WINBOOL *pbMute); END_INTERFACE } ISimpleAudioVolumeVtbl; + interface ISimpleAudioVolume { CONST_VTBL ISimpleAudioVolumeVtbl* lpVtbl; }; @@ -1330,40 +1150,6 @@ static FORCEINLINE HRESULT ISimpleAudioVolume_GetMute(ISimpleAudioVolume* This,W #endif -HRESULT STDMETHODCALLTYPE ISimpleAudioVolume_SetMasterVolume_Proxy( - ISimpleAudioVolume* This, - float fLevel, - LPCGUID EventContext); -void __RPC_STUB ISimpleAudioVolume_SetMasterVolume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISimpleAudioVolume_GetMasterVolume_Proxy( - ISimpleAudioVolume* This, - float *pfLevel); -void __RPC_STUB ISimpleAudioVolume_GetMasterVolume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISimpleAudioVolume_SetMute_Proxy( - ISimpleAudioVolume* This, - const WINBOOL bMute, - LPCGUID EventContext); -void __RPC_STUB ISimpleAudioVolume_SetMute_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISimpleAudioVolume_GetMute_Proxy( - ISimpleAudioVolume* This, - WINBOOL *pbMute); -void __RPC_STUB ISimpleAudioVolume_GetMute_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISimpleAudioVolume_INTERFACE_DEFINED__ */ @@ -1410,43 +1196,44 @@ typedef struct IAudioStreamVolumeVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAudioStreamVolume* This, + IAudioStreamVolume *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAudioStreamVolume* This); + IAudioStreamVolume *This); ULONG (STDMETHODCALLTYPE *Release)( - IAudioStreamVolume* This); + IAudioStreamVolume *This); /*** IAudioStreamVolume methods ***/ HRESULT (STDMETHODCALLTYPE *GetChannelCount)( - IAudioStreamVolume* This, + IAudioStreamVolume *This, UINT32 *pdwCount); HRESULT (STDMETHODCALLTYPE *SetChannelVolume)( - IAudioStreamVolume* This, + IAudioStreamVolume *This, UINT32 dwIndex, const float fLevel); HRESULT (STDMETHODCALLTYPE *GetChannelVolume)( - IAudioStreamVolume* This, + IAudioStreamVolume *This, UINT32 dwIndex, float *pfLevel); HRESULT (STDMETHODCALLTYPE *SetAllVolumes)( - IAudioStreamVolume* This, + IAudioStreamVolume *This, UINT32 dwCount, const float *pfVolumes); HRESULT (STDMETHODCALLTYPE *GetAllVolumes)( - IAudioStreamVolume* This, + IAudioStreamVolume *This, UINT32 dwCount, float *pfVolumes); END_INTERFACE } IAudioStreamVolumeVtbl; + interface IAudioStreamVolume { CONST_VTBL IAudioStreamVolumeVtbl* lpVtbl; }; @@ -1495,50 +1282,6 @@ static FORCEINLINE HRESULT IAudioStreamVolume_GetAllVolumes(IAudioStreamVolume* #endif -HRESULT STDMETHODCALLTYPE IAudioStreamVolume_GetChannelCount_Proxy( - IAudioStreamVolume* This, - UINT32 *pdwCount); -void __RPC_STUB IAudioStreamVolume_GetChannelCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioStreamVolume_SetChannelVolume_Proxy( - IAudioStreamVolume* This, - UINT32 dwIndex, - const float fLevel); -void __RPC_STUB IAudioStreamVolume_SetChannelVolume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioStreamVolume_GetChannelVolume_Proxy( - IAudioStreamVolume* This, - UINT32 dwIndex, - float *pfLevel); -void __RPC_STUB IAudioStreamVolume_GetChannelVolume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioStreamVolume_SetAllVolumes_Proxy( - IAudioStreamVolume* This, - UINT32 dwCount, - const float *pfVolumes); -void __RPC_STUB IAudioStreamVolume_SetAllVolumes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioStreamVolume_GetAllVolumes_Proxy( - IAudioStreamVolume* This, - UINT32 dwCount, - float *pfVolumes); -void __RPC_STUB IAudioStreamVolume_GetAllVolumes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAudioStreamVolume_INTERFACE_DEFINED__ */ @@ -1585,45 +1328,46 @@ typedef struct IChannelAudioVolumeVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IChannelAudioVolume* This, + IChannelAudioVolume *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IChannelAudioVolume* This); + IChannelAudioVolume *This); ULONG (STDMETHODCALLTYPE *Release)( - IChannelAudioVolume* This); + IChannelAudioVolume *This); /*** IChannelAudioVolume methods ***/ HRESULT (STDMETHODCALLTYPE *GetChannelCount)( - IChannelAudioVolume* This, + IChannelAudioVolume *This, UINT32 *pdwCount); HRESULT (STDMETHODCALLTYPE *SetChannelVolume)( - IChannelAudioVolume* This, + IChannelAudioVolume *This, UINT32 dwIndex, const float fLevel, LPCGUID EventContext); HRESULT (STDMETHODCALLTYPE *GetChannelVolume)( - IChannelAudioVolume* This, + IChannelAudioVolume *This, UINT32 dwIndex, float *pfLevel); HRESULT (STDMETHODCALLTYPE *SetAllVolumes)( - IChannelAudioVolume* This, + IChannelAudioVolume *This, UINT32 dwCount, const float *pfVolumes, LPCGUID EventContext); HRESULT (STDMETHODCALLTYPE *GetAllVolumes)( - IChannelAudioVolume* This, + IChannelAudioVolume *This, UINT32 dwCount, float *pfVolumes); END_INTERFACE } IChannelAudioVolumeVtbl; + interface IChannelAudioVolume { CONST_VTBL IChannelAudioVolumeVtbl* lpVtbl; }; @@ -1672,52 +1416,6 @@ static FORCEINLINE HRESULT IChannelAudioVolume_GetAllVolumes(IChannelAudioVolume #endif -HRESULT STDMETHODCALLTYPE IChannelAudioVolume_GetChannelCount_Proxy( - IChannelAudioVolume* This, - UINT32 *pdwCount); -void __RPC_STUB IChannelAudioVolume_GetChannelCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IChannelAudioVolume_SetChannelVolume_Proxy( - IChannelAudioVolume* This, - UINT32 dwIndex, - const float fLevel, - LPCGUID EventContext); -void __RPC_STUB IChannelAudioVolume_SetChannelVolume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IChannelAudioVolume_GetChannelVolume_Proxy( - IChannelAudioVolume* This, - UINT32 dwIndex, - float *pfLevel); -void __RPC_STUB IChannelAudioVolume_GetChannelVolume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IChannelAudioVolume_SetAllVolumes_Proxy( - IChannelAudioVolume* This, - UINT32 dwCount, - const float *pfVolumes, - LPCGUID EventContext); -void __RPC_STUB IChannelAudioVolume_SetAllVolumes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IChannelAudioVolume_GetAllVolumes_Proxy( - IChannelAudioVolume* This, - UINT32 dwCount, - float *pfVolumes); -void __RPC_STUB IChannelAudioVolume_GetAllVolumes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IChannelAudioVolume_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/audioendpoints.h b/lib/libc/include/any-windows-any/audioendpoints.h index 3f972b8e7a..afc0804f79 100644 --- a/lib/libc/include/any-windows-any/audioendpoints.h +++ b/lib/libc/include/any-windows-any/audioendpoints.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/audioendpoints.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/audioendpoints.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,6 +21,9 @@ #ifndef __IAudioEndpointFormatControl_FWD_DEFINED__ #define __IAudioEndpointFormatControl_FWD_DEFINED__ typedef interface IAudioEndpointFormatControl IAudioEndpointFormatControl; +#ifdef __cplusplus +interface IAudioEndpointFormatControl; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -62,23 +66,24 @@ typedef struct IAudioEndpointFormatControlVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAudioEndpointFormatControl* This, + IAudioEndpointFormatControl *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAudioEndpointFormatControl* This); + IAudioEndpointFormatControl *This); ULONG (STDMETHODCALLTYPE *Release)( - IAudioEndpointFormatControl* This); + IAudioEndpointFormatControl *This); /*** IAudioEndpointFormatControl methods ***/ HRESULT (STDMETHODCALLTYPE *ResetToDefault)( - IAudioEndpointFormatControl* This, + IAudioEndpointFormatControl *This, DWORD ResetFlags); END_INTERFACE } IAudioEndpointFormatControlVtbl; + interface IAudioEndpointFormatControl { CONST_VTBL IAudioEndpointFormatControlVtbl* lpVtbl; }; @@ -111,14 +116,6 @@ static FORCEINLINE HRESULT IAudioEndpointFormatControl_ResetToDefault(IAudioEndp #endif -HRESULT STDMETHODCALLTYPE IAudioEndpointFormatControl_ResetToDefault_Proxy( - IAudioEndpointFormatControl* This, - DWORD ResetFlags); -void __RPC_STUB IAudioEndpointFormatControl_ResetToDefault_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAudioEndpointFormatControl_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/audiopolicy.h b/lib/libc/include/any-windows-any/audiopolicy.h index b9521aa7d8..72051db4b7 100644 --- a/lib/libc/include/any-windows-any/audiopolicy.h +++ b/lib/libc/include/any-windows-any/audiopolicy.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/audiopolicy.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/audiopolicy.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,41 +21,65 @@ #ifndef __IAudioSessionEvents_FWD_DEFINED__ #define __IAudioSessionEvents_FWD_DEFINED__ typedef interface IAudioSessionEvents IAudioSessionEvents; +#ifdef __cplusplus +interface IAudioSessionEvents; +#endif /* __cplusplus */ #endif #ifndef __IAudioSessionControl_FWD_DEFINED__ #define __IAudioSessionControl_FWD_DEFINED__ typedef interface IAudioSessionControl IAudioSessionControl; +#ifdef __cplusplus +interface IAudioSessionControl; +#endif /* __cplusplus */ #endif #ifndef __IAudioSessionControl2_FWD_DEFINED__ #define __IAudioSessionControl2_FWD_DEFINED__ typedef interface IAudioSessionControl2 IAudioSessionControl2; +#ifdef __cplusplus +interface IAudioSessionControl2; +#endif /* __cplusplus */ #endif #ifndef __IAudioSessionManager_FWD_DEFINED__ #define __IAudioSessionManager_FWD_DEFINED__ typedef interface IAudioSessionManager IAudioSessionManager; +#ifdef __cplusplus +interface IAudioSessionManager; +#endif /* __cplusplus */ #endif #ifndef __IAudioVolumeDuckNotification_FWD_DEFINED__ #define __IAudioVolumeDuckNotification_FWD_DEFINED__ typedef interface IAudioVolumeDuckNotification IAudioVolumeDuckNotification; +#ifdef __cplusplus +interface IAudioVolumeDuckNotification; +#endif /* __cplusplus */ #endif #ifndef __IAudioSessionNotification_FWD_DEFINED__ #define __IAudioSessionNotification_FWD_DEFINED__ typedef interface IAudioSessionNotification IAudioSessionNotification; +#ifdef __cplusplus +interface IAudioSessionNotification; +#endif /* __cplusplus */ #endif #ifndef __IAudioSessionEnumerator_FWD_DEFINED__ #define __IAudioSessionEnumerator_FWD_DEFINED__ typedef interface IAudioSessionEnumerator IAudioSessionEnumerator; +#ifdef __cplusplus +interface IAudioSessionEnumerator; +#endif /* __cplusplus */ #endif #ifndef __IAudioSessionManager2_FWD_DEFINED__ #define __IAudioSessionManager2_FWD_DEFINED__ typedef interface IAudioSessionManager2 IAudioSessionManager2; +#ifdef __cplusplus +interface IAudioSessionManager2; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -132,55 +157,56 @@ typedef struct IAudioSessionEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAudioSessionEvents* This, + IAudioSessionEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAudioSessionEvents* This); + IAudioSessionEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - IAudioSessionEvents* This); + IAudioSessionEvents *This); /*** IAudioSessionEvents methods ***/ HRESULT (STDMETHODCALLTYPE *OnDisplayNameChanged)( - IAudioSessionEvents* This, + IAudioSessionEvents *This, LPCWSTR NewDisplayName, LPCGUID EventContext); HRESULT (STDMETHODCALLTYPE *OnIconPathChanged)( - IAudioSessionEvents* This, + IAudioSessionEvents *This, LPCWSTR NewIconPath, LPCGUID EventContext); HRESULT (STDMETHODCALLTYPE *OnSimpleVolumeChanged)( - IAudioSessionEvents* This, + IAudioSessionEvents *This, float NewVolume, WINBOOL NewMute, LPCGUID EventContext); HRESULT (STDMETHODCALLTYPE *OnChannelVolumeChanged)( - IAudioSessionEvents* This, + IAudioSessionEvents *This, DWORD ChannelCount, float NewChannelVolumeArray[], DWORD ChangedChannel, LPCGUID EventContext); HRESULT (STDMETHODCALLTYPE *OnGroupingParamChanged)( - IAudioSessionEvents* This, + IAudioSessionEvents *This, LPCGUID NewGroupingParam, LPCGUID EventContext); HRESULT (STDMETHODCALLTYPE *OnStateChanged)( - IAudioSessionEvents* This, + IAudioSessionEvents *This, AudioSessionState NewState); HRESULT (STDMETHODCALLTYPE *OnSessionDisconnected)( - IAudioSessionEvents* This, + IAudioSessionEvents *This, AudioSessionDisconnectReason DisconnectReason); END_INTERFACE } IAudioSessionEventsVtbl; + interface IAudioSessionEvents { CONST_VTBL IAudioSessionEventsVtbl* lpVtbl; }; @@ -237,70 +263,6 @@ static FORCEINLINE HRESULT IAudioSessionEvents_OnSessionDisconnected(IAudioSessi #endif -HRESULT STDMETHODCALLTYPE IAudioSessionEvents_OnDisplayNameChanged_Proxy( - IAudioSessionEvents* This, - LPCWSTR NewDisplayName, - LPCGUID EventContext); -void __RPC_STUB IAudioSessionEvents_OnDisplayNameChanged_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioSessionEvents_OnIconPathChanged_Proxy( - IAudioSessionEvents* This, - LPCWSTR NewIconPath, - LPCGUID EventContext); -void __RPC_STUB IAudioSessionEvents_OnIconPathChanged_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioSessionEvents_OnSimpleVolumeChanged_Proxy( - IAudioSessionEvents* This, - float NewVolume, - WINBOOL NewMute, - LPCGUID EventContext); -void __RPC_STUB IAudioSessionEvents_OnSimpleVolumeChanged_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioSessionEvents_OnChannelVolumeChanged_Proxy( - IAudioSessionEvents* This, - DWORD ChannelCount, - float NewChannelVolumeArray[], - DWORD ChangedChannel, - LPCGUID EventContext); -void __RPC_STUB IAudioSessionEvents_OnChannelVolumeChanged_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioSessionEvents_OnGroupingParamChanged_Proxy( - IAudioSessionEvents* This, - LPCGUID NewGroupingParam, - LPCGUID EventContext); -void __RPC_STUB IAudioSessionEvents_OnGroupingParamChanged_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioSessionEvents_OnStateChanged_Proxy( - IAudioSessionEvents* This, - AudioSessionState NewState); -void __RPC_STUB IAudioSessionEvents_OnStateChanged_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioSessionEvents_OnSessionDisconnected_Proxy( - IAudioSessionEvents* This, - AudioSessionDisconnectReason DisconnectReason); -void __RPC_STUB IAudioSessionEvents_OnSessionDisconnected_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAudioSessionEvents_INTERFACE_DEFINED__ */ @@ -356,58 +318,59 @@ typedef struct IAudioSessionControlVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAudioSessionControl* This, + IAudioSessionControl *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAudioSessionControl* This); + IAudioSessionControl *This); ULONG (STDMETHODCALLTYPE *Release)( - IAudioSessionControl* This); + IAudioSessionControl *This); /*** IAudioSessionControl methods ***/ HRESULT (STDMETHODCALLTYPE *GetState)( - IAudioSessionControl* This, + IAudioSessionControl *This, AudioSessionState *pRetVal); HRESULT (STDMETHODCALLTYPE *GetDisplayName)( - IAudioSessionControl* This, + IAudioSessionControl *This, LPWSTR *pRetVal); HRESULT (STDMETHODCALLTYPE *SetDisplayName)( - IAudioSessionControl* This, + IAudioSessionControl *This, LPCWSTR Value, LPCGUID EventContext); HRESULT (STDMETHODCALLTYPE *GetIconPath)( - IAudioSessionControl* This, + IAudioSessionControl *This, LPWSTR *pRetVal); HRESULT (STDMETHODCALLTYPE *SetIconPath)( - IAudioSessionControl* This, + IAudioSessionControl *This, LPCWSTR Value, LPCGUID EventContext); HRESULT (STDMETHODCALLTYPE *GetGroupingParam)( - IAudioSessionControl* This, + IAudioSessionControl *This, GUID *pRetVal); HRESULT (STDMETHODCALLTYPE *SetGroupingParam)( - IAudioSessionControl* This, + IAudioSessionControl *This, LPCGUID Override, LPCGUID EventContext); HRESULT (STDMETHODCALLTYPE *RegisterAudioSessionNotification)( - IAudioSessionControl* This, + IAudioSessionControl *This, IAudioSessionEvents *NewNotifications); HRESULT (STDMETHODCALLTYPE *UnregisterAudioSessionNotification)( - IAudioSessionControl* This, + IAudioSessionControl *This, IAudioSessionEvents *NewNotifications); END_INTERFACE } IAudioSessionControlVtbl; + interface IAudioSessionControl { CONST_VTBL IAudioSessionControlVtbl* lpVtbl; }; @@ -472,81 +435,6 @@ static FORCEINLINE HRESULT IAudioSessionControl_UnregisterAudioSessionNotificati #endif -HRESULT STDMETHODCALLTYPE IAudioSessionControl_GetState_Proxy( - IAudioSessionControl* This, - AudioSessionState *pRetVal); -void __RPC_STUB IAudioSessionControl_GetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioSessionControl_GetDisplayName_Proxy( - IAudioSessionControl* This, - LPWSTR *pRetVal); -void __RPC_STUB IAudioSessionControl_GetDisplayName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioSessionControl_SetDisplayName_Proxy( - IAudioSessionControl* This, - LPCWSTR Value, - LPCGUID EventContext); -void __RPC_STUB IAudioSessionControl_SetDisplayName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioSessionControl_GetIconPath_Proxy( - IAudioSessionControl* This, - LPWSTR *pRetVal); -void __RPC_STUB IAudioSessionControl_GetIconPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioSessionControl_SetIconPath_Proxy( - IAudioSessionControl* This, - LPCWSTR Value, - LPCGUID EventContext); -void __RPC_STUB IAudioSessionControl_SetIconPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioSessionControl_GetGroupingParam_Proxy( - IAudioSessionControl* This, - GUID *pRetVal); -void __RPC_STUB IAudioSessionControl_GetGroupingParam_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioSessionControl_SetGroupingParam_Proxy( - IAudioSessionControl* This, - LPCGUID Override, - LPCGUID EventContext); -void __RPC_STUB IAudioSessionControl_SetGroupingParam_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioSessionControl_RegisterAudioSessionNotification_Proxy( - IAudioSessionControl* This, - IAudioSessionEvents *NewNotifications); -void __RPC_STUB IAudioSessionControl_RegisterAudioSessionNotification_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioSessionControl_UnregisterAudioSessionNotification_Proxy( - IAudioSessionControl* This, - IAudioSessionEvents *NewNotifications); -void __RPC_STUB IAudioSessionControl_UnregisterAudioSessionNotification_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAudioSessionControl_INTERFACE_DEFINED__ */ @@ -589,78 +477,79 @@ typedef struct IAudioSessionControl2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAudioSessionControl2* This, + IAudioSessionControl2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAudioSessionControl2* This); + IAudioSessionControl2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IAudioSessionControl2* This); + IAudioSessionControl2 *This); /*** IAudioSessionControl methods ***/ HRESULT (STDMETHODCALLTYPE *GetState)( - IAudioSessionControl2* This, + IAudioSessionControl2 *This, AudioSessionState *pRetVal); HRESULT (STDMETHODCALLTYPE *GetDisplayName)( - IAudioSessionControl2* This, + IAudioSessionControl2 *This, LPWSTR *pRetVal); HRESULT (STDMETHODCALLTYPE *SetDisplayName)( - IAudioSessionControl2* This, + IAudioSessionControl2 *This, LPCWSTR Value, LPCGUID EventContext); HRESULT (STDMETHODCALLTYPE *GetIconPath)( - IAudioSessionControl2* This, + IAudioSessionControl2 *This, LPWSTR *pRetVal); HRESULT (STDMETHODCALLTYPE *SetIconPath)( - IAudioSessionControl2* This, + IAudioSessionControl2 *This, LPCWSTR Value, LPCGUID EventContext); HRESULT (STDMETHODCALLTYPE *GetGroupingParam)( - IAudioSessionControl2* This, + IAudioSessionControl2 *This, GUID *pRetVal); HRESULT (STDMETHODCALLTYPE *SetGroupingParam)( - IAudioSessionControl2* This, + IAudioSessionControl2 *This, LPCGUID Override, LPCGUID EventContext); HRESULT (STDMETHODCALLTYPE *RegisterAudioSessionNotification)( - IAudioSessionControl2* This, + IAudioSessionControl2 *This, IAudioSessionEvents *NewNotifications); HRESULT (STDMETHODCALLTYPE *UnregisterAudioSessionNotification)( - IAudioSessionControl2* This, + IAudioSessionControl2 *This, IAudioSessionEvents *NewNotifications); /*** IAudioSessionControl2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetSessionIdentifier)( - IAudioSessionControl2* This, + IAudioSessionControl2 *This, LPWSTR *pRetVal); HRESULT (STDMETHODCALLTYPE *GetSessionInstanceIdentifier)( - IAudioSessionControl2* This, + IAudioSessionControl2 *This, LPWSTR *pRetVal); HRESULT (STDMETHODCALLTYPE *GetProcessId)( - IAudioSessionControl2* This, + IAudioSessionControl2 *This, DWORD *pRetVal); HRESULT (STDMETHODCALLTYPE *IsSystemSoundsSession)( - IAudioSessionControl2* This); + IAudioSessionControl2 *This); HRESULT (STDMETHODCALLTYPE *SetDuckingPreference)( - IAudioSessionControl2* This, + IAudioSessionControl2 *This, WINBOOL optOut); END_INTERFACE } IAudioSessionControl2Vtbl; + interface IAudioSessionControl2 { CONST_VTBL IAudioSessionControl2Vtbl* lpVtbl; }; @@ -747,45 +636,6 @@ static FORCEINLINE HRESULT IAudioSessionControl2_SetDuckingPreference(IAudioSess #endif -HRESULT STDMETHODCALLTYPE IAudioSessionControl2_GetSessionIdentifier_Proxy( - IAudioSessionControl2* This, - LPWSTR *pRetVal); -void __RPC_STUB IAudioSessionControl2_GetSessionIdentifier_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioSessionControl2_GetSessionInstanceIdentifier_Proxy( - IAudioSessionControl2* This, - LPWSTR *pRetVal); -void __RPC_STUB IAudioSessionControl2_GetSessionInstanceIdentifier_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioSessionControl2_GetProcessId_Proxy( - IAudioSessionControl2* This, - DWORD *pRetVal); -void __RPC_STUB IAudioSessionControl2_GetProcessId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioSessionControl2_IsSystemSoundsSession_Proxy( - IAudioSessionControl2* This); -void __RPC_STUB IAudioSessionControl2_IsSystemSoundsSession_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioSessionControl2_SetDuckingPreference_Proxy( - IAudioSessionControl2* This, - WINBOOL optOut); -void __RPC_STUB IAudioSessionControl2_SetDuckingPreference_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAudioSessionControl2_INTERFACE_DEFINED__ */ @@ -821,31 +671,32 @@ typedef struct IAudioSessionManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAudioSessionManager* This, + IAudioSessionManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAudioSessionManager* This); + IAudioSessionManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IAudioSessionManager* This); + IAudioSessionManager *This); /*** IAudioSessionManager methods ***/ HRESULT (STDMETHODCALLTYPE *GetAudioSessionControl)( - IAudioSessionManager* This, + IAudioSessionManager *This, LPCGUID AudioSessionGuid, DWORD StreamFlags, IAudioSessionControl **SessionControl); HRESULT (STDMETHODCALLTYPE *GetSimpleAudioVolume)( - IAudioSessionManager* This, + IAudioSessionManager *This, LPCGUID AudioSessionGuid, DWORD StreamFlags, ISimpleAudioVolume **AudioVolume); END_INTERFACE } IAudioSessionManagerVtbl; + interface IAudioSessionManager { CONST_VTBL IAudioSessionManagerVtbl* lpVtbl; }; @@ -882,26 +733,6 @@ static FORCEINLINE HRESULT IAudioSessionManager_GetSimpleAudioVolume(IAudioSessi #endif -HRESULT STDMETHODCALLTYPE IAudioSessionManager_GetAudioSessionControl_Proxy( - IAudioSessionManager* This, - LPCGUID AudioSessionGuid, - DWORD StreamFlags, - IAudioSessionControl **SessionControl); -void __RPC_STUB IAudioSessionManager_GetAudioSessionControl_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioSessionManager_GetSimpleAudioVolume_Proxy( - IAudioSessionManager* This, - LPCGUID AudioSessionGuid, - DWORD StreamFlags, - ISimpleAudioVolume **AudioVolume); -void __RPC_STUB IAudioSessionManager_GetSimpleAudioVolume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAudioSessionManager_INTERFACE_DEFINED__ */ @@ -934,28 +765,29 @@ typedef struct IAudioVolumeDuckNotificationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAudioVolumeDuckNotification* This, + IAudioVolumeDuckNotification *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAudioVolumeDuckNotification* This); + IAudioVolumeDuckNotification *This); ULONG (STDMETHODCALLTYPE *Release)( - IAudioVolumeDuckNotification* This); + IAudioVolumeDuckNotification *This); /*** IAudioVolumeDuckNotification methods ***/ HRESULT (STDMETHODCALLTYPE *OnVolumeDuckNotification)( - IAudioVolumeDuckNotification* This, + IAudioVolumeDuckNotification *This, LPCWSTR sessionID, UINT32 countCommunicationSessions); HRESULT (STDMETHODCALLTYPE *OnVolumeUnduckNotification)( - IAudioVolumeDuckNotification* This, + IAudioVolumeDuckNotification *This, LPCWSTR sessionID); END_INTERFACE } IAudioVolumeDuckNotificationVtbl; + interface IAudioVolumeDuckNotification { CONST_VTBL IAudioVolumeDuckNotificationVtbl* lpVtbl; }; @@ -992,23 +824,6 @@ static FORCEINLINE HRESULT IAudioVolumeDuckNotification_OnVolumeUnduckNotificati #endif -HRESULT STDMETHODCALLTYPE IAudioVolumeDuckNotification_OnVolumeDuckNotification_Proxy( - IAudioVolumeDuckNotification* This, - LPCWSTR sessionID, - UINT32 countCommunicationSessions); -void __RPC_STUB IAudioVolumeDuckNotification_OnVolumeDuckNotification_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioVolumeDuckNotification_OnVolumeUnduckNotification_Proxy( - IAudioVolumeDuckNotification* This, - LPCWSTR sessionID); -void __RPC_STUB IAudioVolumeDuckNotification_OnVolumeUnduckNotification_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAudioVolumeDuckNotification_INTERFACE_DEFINED__ */ @@ -1037,23 +852,24 @@ typedef struct IAudioSessionNotificationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAudioSessionNotification* This, + IAudioSessionNotification *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAudioSessionNotification* This); + IAudioSessionNotification *This); ULONG (STDMETHODCALLTYPE *Release)( - IAudioSessionNotification* This); + IAudioSessionNotification *This); /*** IAudioSessionNotification methods ***/ HRESULT (STDMETHODCALLTYPE *OnSessionCreated)( - IAudioSessionNotification* This, + IAudioSessionNotification *This, IAudioSessionControl *NewSession); END_INTERFACE } IAudioSessionNotificationVtbl; + interface IAudioSessionNotification { CONST_VTBL IAudioSessionNotificationVtbl* lpVtbl; }; @@ -1086,14 +902,6 @@ static FORCEINLINE HRESULT IAudioSessionNotification_OnSessionCreated(IAudioSess #endif -HRESULT STDMETHODCALLTYPE IAudioSessionNotification_OnSessionCreated_Proxy( - IAudioSessionNotification* This, - IAudioSessionControl *NewSession); -void __RPC_STUB IAudioSessionNotification_OnSessionCreated_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAudioSessionNotification_INTERFACE_DEFINED__ */ @@ -1126,28 +934,29 @@ typedef struct IAudioSessionEnumeratorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAudioSessionEnumerator* This, + IAudioSessionEnumerator *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAudioSessionEnumerator* This); + IAudioSessionEnumerator *This); ULONG (STDMETHODCALLTYPE *Release)( - IAudioSessionEnumerator* This); + IAudioSessionEnumerator *This); /*** IAudioSessionEnumerator methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IAudioSessionEnumerator* This, + IAudioSessionEnumerator *This, int *SessionCount); HRESULT (STDMETHODCALLTYPE *GetSession)( - IAudioSessionEnumerator* This, + IAudioSessionEnumerator *This, int SessionCount, IAudioSessionControl **Session); END_INTERFACE } IAudioSessionEnumeratorVtbl; + interface IAudioSessionEnumerator { CONST_VTBL IAudioSessionEnumeratorVtbl* lpVtbl; }; @@ -1184,23 +993,6 @@ static FORCEINLINE HRESULT IAudioSessionEnumerator_GetSession(IAudioSessionEnume #endif -HRESULT STDMETHODCALLTYPE IAudioSessionEnumerator_GetCount_Proxy( - IAudioSessionEnumerator* This, - int *SessionCount); -void __RPC_STUB IAudioSessionEnumerator_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioSessionEnumerator_GetSession_Proxy( - IAudioSessionEnumerator* This, - int SessionCount, - IAudioSessionControl **Session); -void __RPC_STUB IAudioSessionEnumerator_GetSession_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAudioSessionEnumerator_INTERFACE_DEFINED__ */ @@ -1242,53 +1034,54 @@ typedef struct IAudioSessionManager2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAudioSessionManager2* This, + IAudioSessionManager2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAudioSessionManager2* This); + IAudioSessionManager2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IAudioSessionManager2* This); + IAudioSessionManager2 *This); /*** IAudioSessionManager methods ***/ HRESULT (STDMETHODCALLTYPE *GetAudioSessionControl)( - IAudioSessionManager2* This, + IAudioSessionManager2 *This, LPCGUID AudioSessionGuid, DWORD StreamFlags, IAudioSessionControl **SessionControl); HRESULT (STDMETHODCALLTYPE *GetSimpleAudioVolume)( - IAudioSessionManager2* This, + IAudioSessionManager2 *This, LPCGUID AudioSessionGuid, DWORD StreamFlags, ISimpleAudioVolume **AudioVolume); /*** IAudioSessionManager2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetSessionEnumerator)( - IAudioSessionManager2* This, + IAudioSessionManager2 *This, IAudioSessionEnumerator **SessionEnum); HRESULT (STDMETHODCALLTYPE *RegisterSessionNotification)( - IAudioSessionManager2* This, + IAudioSessionManager2 *This, IAudioSessionNotification *SessionNotification); HRESULT (STDMETHODCALLTYPE *UnregisterSessionNotification)( - IAudioSessionManager2* This, + IAudioSessionManager2 *This, IAudioSessionNotification *SessionNotification); HRESULT (STDMETHODCALLTYPE *RegisterDuckNotification)( - IAudioSessionManager2* This, + IAudioSessionManager2 *This, LPCWSTR sessionID, IAudioVolumeDuckNotification *duckNotification); HRESULT (STDMETHODCALLTYPE *UnregisterDuckNotification)( - IAudioSessionManager2* This, + IAudioSessionManager2 *This, IAudioVolumeDuckNotification *duckNotification); END_INTERFACE } IAudioSessionManager2Vtbl; + interface IAudioSessionManager2 { CONST_VTBL IAudioSessionManager2Vtbl* lpVtbl; }; @@ -1347,47 +1140,6 @@ static FORCEINLINE HRESULT IAudioSessionManager2_UnregisterDuckNotification(IAud #endif -HRESULT STDMETHODCALLTYPE IAudioSessionManager2_GetSessionEnumerator_Proxy( - IAudioSessionManager2* This, - IAudioSessionEnumerator **SessionEnum); -void __RPC_STUB IAudioSessionManager2_GetSessionEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioSessionManager2_RegisterSessionNotification_Proxy( - IAudioSessionManager2* This, - IAudioSessionNotification *SessionNotification); -void __RPC_STUB IAudioSessionManager2_RegisterSessionNotification_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioSessionManager2_UnregisterSessionNotification_Proxy( - IAudioSessionManager2* This, - IAudioSessionNotification *SessionNotification); -void __RPC_STUB IAudioSessionManager2_UnregisterSessionNotification_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioSessionManager2_RegisterDuckNotification_Proxy( - IAudioSessionManager2* This, - LPCWSTR sessionID, - IAudioVolumeDuckNotification *duckNotification); -void __RPC_STUB IAudioSessionManager2_RegisterDuckNotification_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAudioSessionManager2_UnregisterDuckNotification_Proxy( - IAudioSessionManager2* This, - IAudioVolumeDuckNotification *duckNotification); -void __RPC_STUB IAudioSessionManager2_UnregisterDuckNotification_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAudioSessionManager2_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/austream.h b/lib/libc/include/any-windows-any/austream.h index 53f0fcd2fe..b28b330674 100644 --- a/lib/libc/include/any-windows-any/austream.h +++ b/lib/libc/include/any-windows-any/austream.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/austream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/austream.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/cfgmgr32.h b/lib/libc/include/any-windows-any/cfgmgr32.h index a0cbd7a4b2..eafdf8a555 100644 --- a/lib/libc/include/any-windows-any/cfgmgr32.h +++ b/lib/libc/include/any-windows-any/cfgmgr32.h @@ -10,6 +10,7 @@ #include #include #include +#include #ifdef __cplusplus extern "C" { @@ -835,6 +836,10 @@ extern "C" { #define CM_Get_DevInst_Custom_PropertyA CM_Get_DevNode_Custom_PropertyA #define CM_Get_DevInst_Custom_Property_ExW CM_Get_DevNode_Custom_Property_ExW #define CM_Get_DevInst_Custom_Property_ExA CM_Get_DevNode_Custom_Property_ExA + CMAPI CONFIGRET WINAPI CM_Get_DevNode_PropertyW(DEVINST dnDevInst, const DEVPROPKEY *PropertyKey, DEVPROPTYPE *PropertyType, PBYTE PropertyBuffer, PULONG PropertyBufferSize, ULONG ulFlags); +#ifdef UNICODE +#define CM_Get_DevNode_Property CM_Get_DevNode_PropertyW +#endif CMAPI CONFIGRET WINAPI CM_Get_DevNode_Status(PULONG pulStatus,PULONG pulProblemNumber,DEVINST dnDevInst,ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(PULONG pulStatus,PULONG pulProblemNumber,DEVINST dnDevInst,ULONG ulFlags,HMACHINE hMachine); #define CM_Get_DevInst_Status CM_Get_DevNode_Status diff --git a/lib/libc/include/any-windows-any/comadmin.h b/lib/libc/include/any-windows-any/comadmin.h index a84a1a554b..4f5be2e082 100644 --- a/lib/libc/include/any-windows-any/comadmin.h +++ b/lib/libc/include/any-windows-any/comadmin.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/comadmin.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/comadmin.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,21 +21,33 @@ #ifndef __ICOMAdminCatalog_FWD_DEFINED__ #define __ICOMAdminCatalog_FWD_DEFINED__ typedef interface ICOMAdminCatalog ICOMAdminCatalog; +#ifdef __cplusplus +interface ICOMAdminCatalog; +#endif /* __cplusplus */ #endif #ifndef __ICOMAdminCatalog2_FWD_DEFINED__ #define __ICOMAdminCatalog2_FWD_DEFINED__ typedef interface ICOMAdminCatalog2 ICOMAdminCatalog2; +#ifdef __cplusplus +interface ICOMAdminCatalog2; +#endif /* __cplusplus */ #endif #ifndef __ICatalogObject_FWD_DEFINED__ #define __ICatalogObject_FWD_DEFINED__ typedef interface ICatalogObject ICatalogObject; +#ifdef __cplusplus +interface ICatalogObject; +#endif /* __cplusplus */ #endif #ifndef __ICatalogCollection_FWD_DEFINED__ #define __ICatalogCollection_FWD_DEFINED__ typedef interface ICatalogCollection ICatalogCollection; +#ifdef __cplusplus +interface ICatalogCollection; +#endif /* __cplusplus */ #endif #ifndef __COMAdminCatalog_FWD_DEFINED__ @@ -471,29 +484,29 @@ typedef struct ICOMAdminCatalogVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICOMAdminCatalog* This); + ICOMAdminCatalog *This); ULONG (STDMETHODCALLTYPE *Release)( - ICOMAdminCatalog* This); + ICOMAdminCatalog *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -501,7 +514,7 @@ typedef struct ICOMAdminCatalogVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -513,53 +526,53 @@ typedef struct ICOMAdminCatalogVtbl { /*** ICOMAdminCatalog methods ***/ HRESULT (STDMETHODCALLTYPE *GetCollection)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, BSTR bstrCollName, IDispatch **ppCatalogCollection); HRESULT (STDMETHODCALLTYPE *Connect)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, BSTR bstrCatalogServerName, IDispatch **ppCatalogCollection); HRESULT (STDMETHODCALLTYPE *get_MajorVersion)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, LONG *plMajorVersion); HRESULT (STDMETHODCALLTYPE *get_MinorVersion)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, LONG *plMinorVersion); HRESULT (STDMETHODCALLTYPE *GetCollectionByQuery)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, BSTR bstrCollName, SAFEARRAY **ppsaVarQuery, IDispatch **ppCatalogCollection); HRESULT (STDMETHODCALLTYPE *ImportComponent)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, BSTR bstrApplIDOrName, BSTR bstrCLSIDOrProgID); HRESULT (STDMETHODCALLTYPE *InstallComponent)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, BSTR bstrApplIDOrName, BSTR bstrDLL, BSTR bstrTLB, BSTR bstrPSDLL); HRESULT (STDMETHODCALLTYPE *ShutdownApplication)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, BSTR bstrApplIDOrName); HRESULT (STDMETHODCALLTYPE *ExportApplication)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, BSTR bstrApplIDOrName, BSTR bstrApplicationFile, LONG lOptions); HRESULT (STDMETHODCALLTYPE *InstallApplication)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, BSTR bstrApplicationFile, BSTR bstrDestinationDirectory, LONG lOptions, @@ -568,28 +581,28 @@ typedef struct ICOMAdminCatalogVtbl { BSTR bstrRSN); HRESULT (STDMETHODCALLTYPE *StopRouter)( - ICOMAdminCatalog* This); + ICOMAdminCatalog *This); HRESULT (STDMETHODCALLTYPE *RefreshRouter)( - ICOMAdminCatalog* This); + ICOMAdminCatalog *This); HRESULT (STDMETHODCALLTYPE *StartRouter)( - ICOMAdminCatalog* This); + ICOMAdminCatalog *This); HRESULT (STDMETHODCALLTYPE *Reserved1)( - ICOMAdminCatalog* This); + ICOMAdminCatalog *This); HRESULT (STDMETHODCALLTYPE *Reserved2)( - ICOMAdminCatalog* This); + ICOMAdminCatalog *This); HRESULT (STDMETHODCALLTYPE *InstallMultipleComponents)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, BSTR bstrApplIDOrName, SAFEARRAY **ppsaVarFileNames, SAFEARRAY **ppsaVarCLSIDs); HRESULT (STDMETHODCALLTYPE *GetMultipleComponentsInfo)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, BSTR bstrApplIdOrName, SAFEARRAY **ppsaVarFileNames, SAFEARRAY **ppsaVarCLSIDs, @@ -598,18 +611,18 @@ typedef struct ICOMAdminCatalogVtbl { SAFEARRAY **ppsaVarComponentFlags); HRESULT (STDMETHODCALLTYPE *RefreshComponents)( - ICOMAdminCatalog* This); + ICOMAdminCatalog *This); HRESULT (STDMETHODCALLTYPE *BackupREGDB)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, BSTR bstrBackupFilePath); HRESULT (STDMETHODCALLTYPE *RestoreREGDB)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, BSTR bstrBackupFilePath); HRESULT (STDMETHODCALLTYPE *QueryApplicationFile)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, BSTR bstrApplicationFile, BSTR *pbstrApplicationName, BSTR *pbstrApplicationDescription, @@ -618,29 +631,29 @@ typedef struct ICOMAdminCatalogVtbl { SAFEARRAY **ppsaVarFileNames); HRESULT (STDMETHODCALLTYPE *StartApplication)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, BSTR bstrApplIdOrName); HRESULT (STDMETHODCALLTYPE *ServiceCheck)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, LONG lService, LONG *plStatus); HRESULT (STDMETHODCALLTYPE *InstallMultipleEventClasses)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, BSTR bstrApplIdOrName, SAFEARRAY **ppsaVarFileNames, SAFEARRAY **ppsaVarCLSIDS); HRESULT (STDMETHODCALLTYPE *InstallEventClass)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, BSTR bstrApplIdOrName, BSTR bstrDLL, BSTR bstrTLB, BSTR bstrPSDLL); HRESULT (STDMETHODCALLTYPE *GetEventClassesForIID)( - ICOMAdminCatalog* This, + ICOMAdminCatalog *This, BSTR bstrIID, SAFEARRAY **ppsaVarCLSIDs, SAFEARRAY **ppsaVarProgIDs, @@ -648,6 +661,7 @@ typedef struct ICOMAdminCatalogVtbl { END_INTERFACE } ICOMAdminCatalogVtbl; + interface ICOMAdminCatalog { CONST_VTBL ICOMAdminCatalogVtbl* lpVtbl; }; @@ -798,244 +812,6 @@ static FORCEINLINE HRESULT ICOMAdminCatalog_GetEventClassesForIID(ICOMAdminCatal #endif -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_GetCollection_Proxy( - ICOMAdminCatalog* This, - BSTR bstrCollName, - IDispatch **ppCatalogCollection); -void __RPC_STUB ICOMAdminCatalog_GetCollection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_Connect_Proxy( - ICOMAdminCatalog* This, - BSTR bstrCatalogServerName, - IDispatch **ppCatalogCollection); -void __RPC_STUB ICOMAdminCatalog_Connect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_get_MajorVersion_Proxy( - ICOMAdminCatalog* This, - LONG *plMajorVersion); -void __RPC_STUB ICOMAdminCatalog_get_MajorVersion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_get_MinorVersion_Proxy( - ICOMAdminCatalog* This, - LONG *plMinorVersion); -void __RPC_STUB ICOMAdminCatalog_get_MinorVersion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_GetCollectionByQuery_Proxy( - ICOMAdminCatalog* This, - BSTR bstrCollName, - SAFEARRAY **ppsaVarQuery, - IDispatch **ppCatalogCollection); -void __RPC_STUB ICOMAdminCatalog_GetCollectionByQuery_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_ImportComponent_Proxy( - ICOMAdminCatalog* This, - BSTR bstrApplIDOrName, - BSTR bstrCLSIDOrProgID); -void __RPC_STUB ICOMAdminCatalog_ImportComponent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_InstallComponent_Proxy( - ICOMAdminCatalog* This, - BSTR bstrApplIDOrName, - BSTR bstrDLL, - BSTR bstrTLB, - BSTR bstrPSDLL); -void __RPC_STUB ICOMAdminCatalog_InstallComponent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_ShutdownApplication_Proxy( - ICOMAdminCatalog* This, - BSTR bstrApplIDOrName); -void __RPC_STUB ICOMAdminCatalog_ShutdownApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_ExportApplication_Proxy( - ICOMAdminCatalog* This, - BSTR bstrApplIDOrName, - BSTR bstrApplicationFile, - LONG lOptions); -void __RPC_STUB ICOMAdminCatalog_ExportApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_InstallApplication_Proxy( - ICOMAdminCatalog* This, - BSTR bstrApplicationFile, - BSTR bstrDestinationDirectory, - LONG lOptions, - BSTR bstrUserId, - BSTR bstrPassword, - BSTR bstrRSN); -void __RPC_STUB ICOMAdminCatalog_InstallApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_StopRouter_Proxy( - ICOMAdminCatalog* This); -void __RPC_STUB ICOMAdminCatalog_StopRouter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_RefreshRouter_Proxy( - ICOMAdminCatalog* This); -void __RPC_STUB ICOMAdminCatalog_RefreshRouter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_StartRouter_Proxy( - ICOMAdminCatalog* This); -void __RPC_STUB ICOMAdminCatalog_StartRouter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_Reserved1_Proxy( - ICOMAdminCatalog* This); -void __RPC_STUB ICOMAdminCatalog_Reserved1_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_Reserved2_Proxy( - ICOMAdminCatalog* This); -void __RPC_STUB ICOMAdminCatalog_Reserved2_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_InstallMultipleComponents_Proxy( - ICOMAdminCatalog* This, - BSTR bstrApplIDOrName, - SAFEARRAY **ppsaVarFileNames, - SAFEARRAY **ppsaVarCLSIDs); -void __RPC_STUB ICOMAdminCatalog_InstallMultipleComponents_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_GetMultipleComponentsInfo_Proxy( - ICOMAdminCatalog* This, - BSTR bstrApplIdOrName, - SAFEARRAY **ppsaVarFileNames, - SAFEARRAY **ppsaVarCLSIDs, - SAFEARRAY **ppsaVarClassNames, - SAFEARRAY **ppsaVarFileFlags, - SAFEARRAY **ppsaVarComponentFlags); -void __RPC_STUB ICOMAdminCatalog_GetMultipleComponentsInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_RefreshComponents_Proxy( - ICOMAdminCatalog* This); -void __RPC_STUB ICOMAdminCatalog_RefreshComponents_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_BackupREGDB_Proxy( - ICOMAdminCatalog* This, - BSTR bstrBackupFilePath); -void __RPC_STUB ICOMAdminCatalog_BackupREGDB_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_RestoreREGDB_Proxy( - ICOMAdminCatalog* This, - BSTR bstrBackupFilePath); -void __RPC_STUB ICOMAdminCatalog_RestoreREGDB_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_QueryApplicationFile_Proxy( - ICOMAdminCatalog* This, - BSTR bstrApplicationFile, - BSTR *pbstrApplicationName, - BSTR *pbstrApplicationDescription, - VARIANT_BOOL *pbHasUsers, - VARIANT_BOOL *pbIsProxy, - SAFEARRAY **ppsaVarFileNames); -void __RPC_STUB ICOMAdminCatalog_QueryApplicationFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_StartApplication_Proxy( - ICOMAdminCatalog* This, - BSTR bstrApplIdOrName); -void __RPC_STUB ICOMAdminCatalog_StartApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_ServiceCheck_Proxy( - ICOMAdminCatalog* This, - LONG lService, - LONG *plStatus); -void __RPC_STUB ICOMAdminCatalog_ServiceCheck_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_InstallMultipleEventClasses_Proxy( - ICOMAdminCatalog* This, - BSTR bstrApplIdOrName, - SAFEARRAY **ppsaVarFileNames, - SAFEARRAY **ppsaVarCLSIDS); -void __RPC_STUB ICOMAdminCatalog_InstallMultipleEventClasses_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_InstallEventClass_Proxy( - ICOMAdminCatalog* This, - BSTR bstrApplIdOrName, - BSTR bstrDLL, - BSTR bstrTLB, - BSTR bstrPSDLL); -void __RPC_STUB ICOMAdminCatalog_InstallEventClass_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_GetEventClassesForIID_Proxy( - ICOMAdminCatalog* This, - BSTR bstrIID, - SAFEARRAY **ppsaVarCLSIDs, - SAFEARRAY **ppsaVarProgIDs, - SAFEARRAY **ppsaVarDescriptions); -void __RPC_STUB ICOMAdminCatalog_GetEventClassesForIID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICOMAdminCatalog_INTERFACE_DEFINED__ */ @@ -1196,29 +972,29 @@ typedef struct ICOMAdminCatalog2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICOMAdminCatalog2* This); + ICOMAdminCatalog2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ICOMAdminCatalog2* This); + ICOMAdminCatalog2 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1226,7 +1002,7 @@ typedef struct ICOMAdminCatalog2Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1238,53 +1014,53 @@ typedef struct ICOMAdminCatalog2Vtbl { /*** ICOMAdminCatalog methods ***/ HRESULT (STDMETHODCALLTYPE *GetCollection)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrCollName, IDispatch **ppCatalogCollection); HRESULT (STDMETHODCALLTYPE *Connect)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrCatalogServerName, IDispatch **ppCatalogCollection); HRESULT (STDMETHODCALLTYPE *get_MajorVersion)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, LONG *plMajorVersion); HRESULT (STDMETHODCALLTYPE *get_MinorVersion)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, LONG *plMinorVersion); HRESULT (STDMETHODCALLTYPE *GetCollectionByQuery)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrCollName, SAFEARRAY **ppsaVarQuery, IDispatch **ppCatalogCollection); HRESULT (STDMETHODCALLTYPE *ImportComponent)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrApplIDOrName, BSTR bstrCLSIDOrProgID); HRESULT (STDMETHODCALLTYPE *InstallComponent)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrApplIDOrName, BSTR bstrDLL, BSTR bstrTLB, BSTR bstrPSDLL); HRESULT (STDMETHODCALLTYPE *ShutdownApplication)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrApplIDOrName); HRESULT (STDMETHODCALLTYPE *ExportApplication)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrApplIDOrName, BSTR bstrApplicationFile, LONG lOptions); HRESULT (STDMETHODCALLTYPE *InstallApplication)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrApplicationFile, BSTR bstrDestinationDirectory, LONG lOptions, @@ -1293,28 +1069,28 @@ typedef struct ICOMAdminCatalog2Vtbl { BSTR bstrRSN); HRESULT (STDMETHODCALLTYPE *StopRouter)( - ICOMAdminCatalog2* This); + ICOMAdminCatalog2 *This); HRESULT (STDMETHODCALLTYPE *RefreshRouter)( - ICOMAdminCatalog2* This); + ICOMAdminCatalog2 *This); HRESULT (STDMETHODCALLTYPE *StartRouter)( - ICOMAdminCatalog2* This); + ICOMAdminCatalog2 *This); HRESULT (STDMETHODCALLTYPE *Reserved1)( - ICOMAdminCatalog2* This); + ICOMAdminCatalog2 *This); HRESULT (STDMETHODCALLTYPE *Reserved2)( - ICOMAdminCatalog2* This); + ICOMAdminCatalog2 *This); HRESULT (STDMETHODCALLTYPE *InstallMultipleComponents)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrApplIDOrName, SAFEARRAY **ppsaVarFileNames, SAFEARRAY **ppsaVarCLSIDs); HRESULT (STDMETHODCALLTYPE *GetMultipleComponentsInfo)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrApplIdOrName, SAFEARRAY **ppsaVarFileNames, SAFEARRAY **ppsaVarCLSIDs, @@ -1323,18 +1099,18 @@ typedef struct ICOMAdminCatalog2Vtbl { SAFEARRAY **ppsaVarComponentFlags); HRESULT (STDMETHODCALLTYPE *RefreshComponents)( - ICOMAdminCatalog2* This); + ICOMAdminCatalog2 *This); HRESULT (STDMETHODCALLTYPE *BackupREGDB)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrBackupFilePath); HRESULT (STDMETHODCALLTYPE *RestoreREGDB)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrBackupFilePath); HRESULT (STDMETHODCALLTYPE *QueryApplicationFile)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrApplicationFile, BSTR *pbstrApplicationName, BSTR *pbstrApplicationDescription, @@ -1343,29 +1119,29 @@ typedef struct ICOMAdminCatalog2Vtbl { SAFEARRAY **ppsaVarFileNames); HRESULT (STDMETHODCALLTYPE *StartApplication)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrApplIdOrName); HRESULT (STDMETHODCALLTYPE *ServiceCheck)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, LONG lService, LONG *plStatus); HRESULT (STDMETHODCALLTYPE *InstallMultipleEventClasses)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrApplIdOrName, SAFEARRAY **ppsaVarFileNames, SAFEARRAY **ppsaVarCLSIDS); HRESULT (STDMETHODCALLTYPE *InstallEventClass)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrApplIdOrName, BSTR bstrDLL, BSTR bstrTLB, BSTR bstrPSDLL); HRESULT (STDMETHODCALLTYPE *GetEventClassesForIID)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrIID, SAFEARRAY **ppsaVarCLSIDs, SAFEARRAY **ppsaVarProgIDs, @@ -1373,51 +1149,51 @@ typedef struct ICOMAdminCatalog2Vtbl { /*** ICOMAdminCatalog2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetCollectionByQuery2)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrCollectionName, VARIANT *pVarQueryStrings, IDispatch **ppCatalogCollection); HRESULT (STDMETHODCALLTYPE *GetApplicationInstanceIDFromProcessID)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, LONG lProcessID, BSTR *pbstrApplicationInstanceID); HRESULT (STDMETHODCALLTYPE *ShutdownApplicationInstances)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, VARIANT *pVarApplicationInstanceID); HRESULT (STDMETHODCALLTYPE *PauseApplicationInstances)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, VARIANT *pVarApplicationInstanceID); HRESULT (STDMETHODCALLTYPE *ResumeApplicationInstances)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, VARIANT *pVarApplicationInstanceID); HRESULT (STDMETHODCALLTYPE *RecycleApplicationInstances)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, VARIANT *pVarApplicationInstanceID, LONG lReasonCode); HRESULT (STDMETHODCALLTYPE *AreApplicationInstancesPaused)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, VARIANT *pVarApplicationInstanceID, VARIANT_BOOL *pVarBoolPaused); HRESULT (STDMETHODCALLTYPE *DumpApplicationInstance)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrApplicationInstanceID, BSTR bstrDirectory, LONG lMaxImages, BSTR *pbstrDumpFile); HRESULT (STDMETHODCALLTYPE *get_IsApplicationInstanceDumpSupported)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, VARIANT_BOOL *pVarBoolDumpSupported); HRESULT (STDMETHODCALLTYPE *CreateServiceForApplication)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrApplicationIDOrName, BSTR bstrServiceName, BSTR bstrStartType, @@ -1428,58 +1204,58 @@ typedef struct ICOMAdminCatalog2Vtbl { VARIANT_BOOL bDesktopOk); HRESULT (STDMETHODCALLTYPE *DeleteServiceForApplication)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrApplicationIDOrName); HRESULT (STDMETHODCALLTYPE *GetPartitionID)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrApplicationIDOrName, BSTR *pbstrPartitionID); HRESULT (STDMETHODCALLTYPE *GetPartitionName)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrApplicationIDOrName, BSTR *pbstrPartitionName); HRESULT (STDMETHODCALLTYPE *put_CurrentPartition)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrPartitionIDOrName); HRESULT (STDMETHODCALLTYPE *get_CurrentPartitionID)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR *pbstrPartitionID); HRESULT (STDMETHODCALLTYPE *get_CurrentPartitionName)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR *pbstrPartitionName); HRESULT (STDMETHODCALLTYPE *get_GlobalPartitionID)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR *pbstrGlobalPartitionID); HRESULT (STDMETHODCALLTYPE *FlushPartitionCache)( - ICOMAdminCatalog2* This); + ICOMAdminCatalog2 *This); HRESULT (STDMETHODCALLTYPE *CopyApplications)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrSourcePartitionIDOrName, VARIANT *pVarApplicationID, BSTR bstrDestinationPartitionIDOrName); HRESULT (STDMETHODCALLTYPE *CopyComponents)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrSourceApplicationIDOrName, VARIANT *pVarCLSIDOrProgID, BSTR bstrDestinationApplicationIDOrName); HRESULT (STDMETHODCALLTYPE *MoveComponents)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrSourceApplicationIDOrName, VARIANT *pVarCLSIDOrProgID, BSTR bstrDestinationApplicationIDOrName); HRESULT (STDMETHODCALLTYPE *AliasComponent)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrSrcApplicationIDOrName, BSTR bstrCLSIDOrProgID, BSTR bstrDestApplicationIDOrName, @@ -1487,40 +1263,40 @@ typedef struct ICOMAdminCatalog2Vtbl { BSTR bstrNewClsid); HRESULT (STDMETHODCALLTYPE *IsSafeToDelete)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrDllName, COMAdminInUse *pCOMAdminInUse); HRESULT (STDMETHODCALLTYPE *ImportUnconfiguredComponents)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrApplicationIDOrName, VARIANT *pVarCLSIDOrProgID, VARIANT *pVarComponentType); HRESULT (STDMETHODCALLTYPE *PromoteUnconfiguredComponents)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrApplicationIDOrName, VARIANT *pVarCLSIDOrProgID, VARIANT *pVarComponentType); HRESULT (STDMETHODCALLTYPE *ImportComponents)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrApplicationIDOrName, VARIANT *pVarCLSIDOrProgID, VARIANT *pVarComponentType); HRESULT (STDMETHODCALLTYPE *get_Is64BitCatalogServer)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, VARIANT_BOOL *pbIs64Bit); HRESULT (STDMETHODCALLTYPE *ExportPartition)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrPartitionIDOrName, BSTR bstrPartitionFileName, LONG lOptions); HRESULT (STDMETHODCALLTYPE *InstallPartition)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrFileName, BSTR bstrDestDirectory, LONG lOptions, @@ -1529,17 +1305,18 @@ typedef struct ICOMAdminCatalog2Vtbl { BSTR bstrRSN); HRESULT (STDMETHODCALLTYPE *QueryApplicationFile2)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrApplicationFile, IDispatch **ppFilesForImport); HRESULT (STDMETHODCALLTYPE *GetComponentVersionCount)( - ICOMAdminCatalog2* This, + ICOMAdminCatalog2 *This, BSTR bstrCLSIDOrProgID, LONG *plVersionCount); END_INTERFACE } ICOMAdminCatalog2Vtbl; + interface ICOMAdminCatalog2 { CONST_VTBL ICOMAdminCatalog2Vtbl* lpVtbl; }; @@ -1816,296 +1593,6 @@ static FORCEINLINE HRESULT ICOMAdminCatalog2_GetComponentVersionCount(ICOMAdminC #endif -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_GetCollectionByQuery2_Proxy( - ICOMAdminCatalog2* This, - BSTR bstrCollectionName, - VARIANT *pVarQueryStrings, - IDispatch **ppCatalogCollection); -void __RPC_STUB ICOMAdminCatalog2_GetCollectionByQuery2_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_GetApplicationInstanceIDFromProcessID_Proxy( - ICOMAdminCatalog2* This, - LONG lProcessID, - BSTR *pbstrApplicationInstanceID); -void __RPC_STUB ICOMAdminCatalog2_GetApplicationInstanceIDFromProcessID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_ShutdownApplicationInstances_Proxy( - ICOMAdminCatalog2* This, - VARIANT *pVarApplicationInstanceID); -void __RPC_STUB ICOMAdminCatalog2_ShutdownApplicationInstances_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_PauseApplicationInstances_Proxy( - ICOMAdminCatalog2* This, - VARIANT *pVarApplicationInstanceID); -void __RPC_STUB ICOMAdminCatalog2_PauseApplicationInstances_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_ResumeApplicationInstances_Proxy( - ICOMAdminCatalog2* This, - VARIANT *pVarApplicationInstanceID); -void __RPC_STUB ICOMAdminCatalog2_ResumeApplicationInstances_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_RecycleApplicationInstances_Proxy( - ICOMAdminCatalog2* This, - VARIANT *pVarApplicationInstanceID, - LONG lReasonCode); -void __RPC_STUB ICOMAdminCatalog2_RecycleApplicationInstances_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_AreApplicationInstancesPaused_Proxy( - ICOMAdminCatalog2* This, - VARIANT *pVarApplicationInstanceID, - VARIANT_BOOL *pVarBoolPaused); -void __RPC_STUB ICOMAdminCatalog2_AreApplicationInstancesPaused_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_DumpApplicationInstance_Proxy( - ICOMAdminCatalog2* This, - BSTR bstrApplicationInstanceID, - BSTR bstrDirectory, - LONG lMaxImages, - BSTR *pbstrDumpFile); -void __RPC_STUB ICOMAdminCatalog2_DumpApplicationInstance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_get_IsApplicationInstanceDumpSupported_Proxy( - ICOMAdminCatalog2* This, - VARIANT_BOOL *pVarBoolDumpSupported); -void __RPC_STUB ICOMAdminCatalog2_get_IsApplicationInstanceDumpSupported_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_CreateServiceForApplication_Proxy( - ICOMAdminCatalog2* This, - BSTR bstrApplicationIDOrName, - BSTR bstrServiceName, - BSTR bstrStartType, - BSTR bstrErrorControl, - BSTR bstrDependencies, - BSTR bstrRunAs, - BSTR bstrPassword, - VARIANT_BOOL bDesktopOk); -void __RPC_STUB ICOMAdminCatalog2_CreateServiceForApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_DeleteServiceForApplication_Proxy( - ICOMAdminCatalog2* This, - BSTR bstrApplicationIDOrName); -void __RPC_STUB ICOMAdminCatalog2_DeleteServiceForApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_GetPartitionID_Proxy( - ICOMAdminCatalog2* This, - BSTR bstrApplicationIDOrName, - BSTR *pbstrPartitionID); -void __RPC_STUB ICOMAdminCatalog2_GetPartitionID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_GetPartitionName_Proxy( - ICOMAdminCatalog2* This, - BSTR bstrApplicationIDOrName, - BSTR *pbstrPartitionName); -void __RPC_STUB ICOMAdminCatalog2_GetPartitionName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_put_CurrentPartition_Proxy( - ICOMAdminCatalog2* This, - BSTR bstrPartitionIDOrName); -void __RPC_STUB ICOMAdminCatalog2_put_CurrentPartition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_get_CurrentPartitionID_Proxy( - ICOMAdminCatalog2* This, - BSTR *pbstrPartitionID); -void __RPC_STUB ICOMAdminCatalog2_get_CurrentPartitionID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_get_CurrentPartitionName_Proxy( - ICOMAdminCatalog2* This, - BSTR *pbstrPartitionName); -void __RPC_STUB ICOMAdminCatalog2_get_CurrentPartitionName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_get_GlobalPartitionID_Proxy( - ICOMAdminCatalog2* This, - BSTR *pbstrGlobalPartitionID); -void __RPC_STUB ICOMAdminCatalog2_get_GlobalPartitionID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_FlushPartitionCache_Proxy( - ICOMAdminCatalog2* This); -void __RPC_STUB ICOMAdminCatalog2_FlushPartitionCache_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_CopyApplications_Proxy( - ICOMAdminCatalog2* This, - BSTR bstrSourcePartitionIDOrName, - VARIANT *pVarApplicationID, - BSTR bstrDestinationPartitionIDOrName); -void __RPC_STUB ICOMAdminCatalog2_CopyApplications_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_CopyComponents_Proxy( - ICOMAdminCatalog2* This, - BSTR bstrSourceApplicationIDOrName, - VARIANT *pVarCLSIDOrProgID, - BSTR bstrDestinationApplicationIDOrName); -void __RPC_STUB ICOMAdminCatalog2_CopyComponents_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_MoveComponents_Proxy( - ICOMAdminCatalog2* This, - BSTR bstrSourceApplicationIDOrName, - VARIANT *pVarCLSIDOrProgID, - BSTR bstrDestinationApplicationIDOrName); -void __RPC_STUB ICOMAdminCatalog2_MoveComponents_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_AliasComponent_Proxy( - ICOMAdminCatalog2* This, - BSTR bstrSrcApplicationIDOrName, - BSTR bstrCLSIDOrProgID, - BSTR bstrDestApplicationIDOrName, - BSTR bstrNewProgId, - BSTR bstrNewClsid); -void __RPC_STUB ICOMAdminCatalog2_AliasComponent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_IsSafeToDelete_Proxy( - ICOMAdminCatalog2* This, - BSTR bstrDllName, - COMAdminInUse *pCOMAdminInUse); -void __RPC_STUB ICOMAdminCatalog2_IsSafeToDelete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_ImportUnconfiguredComponents_Proxy( - ICOMAdminCatalog2* This, - BSTR bstrApplicationIDOrName, - VARIANT *pVarCLSIDOrProgID, - VARIANT *pVarComponentType); -void __RPC_STUB ICOMAdminCatalog2_ImportUnconfiguredComponents_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_PromoteUnconfiguredComponents_Proxy( - ICOMAdminCatalog2* This, - BSTR bstrApplicationIDOrName, - VARIANT *pVarCLSIDOrProgID, - VARIANT *pVarComponentType); -void __RPC_STUB ICOMAdminCatalog2_PromoteUnconfiguredComponents_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_ImportComponents_Proxy( - ICOMAdminCatalog2* This, - BSTR bstrApplicationIDOrName, - VARIANT *pVarCLSIDOrProgID, - VARIANT *pVarComponentType); -void __RPC_STUB ICOMAdminCatalog2_ImportComponents_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_get_Is64BitCatalogServer_Proxy( - ICOMAdminCatalog2* This, - VARIANT_BOOL *pbIs64Bit); -void __RPC_STUB ICOMAdminCatalog2_get_Is64BitCatalogServer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_ExportPartition_Proxy( - ICOMAdminCatalog2* This, - BSTR bstrPartitionIDOrName, - BSTR bstrPartitionFileName, - LONG lOptions); -void __RPC_STUB ICOMAdminCatalog2_ExportPartition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_InstallPartition_Proxy( - ICOMAdminCatalog2* This, - BSTR bstrFileName, - BSTR bstrDestDirectory, - LONG lOptions, - BSTR bstrUserID, - BSTR bstrPassword, - BSTR bstrRSN); -void __RPC_STUB ICOMAdminCatalog2_InstallPartition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_QueryApplicationFile2_Proxy( - ICOMAdminCatalog2* This, - BSTR bstrApplicationFile, - IDispatch **ppFilesForImport); -void __RPC_STUB ICOMAdminCatalog2_QueryApplicationFile2_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_GetComponentVersionCount_Proxy( - ICOMAdminCatalog2* This, - BSTR bstrCLSIDOrProgID, - LONG *plVersionCount); -void __RPC_STUB ICOMAdminCatalog2_GetComponentVersionCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICOMAdminCatalog2_INTERFACE_DEFINED__ */ @@ -2155,29 +1642,29 @@ typedef struct ICatalogObjectVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICatalogObject* This, + ICatalogObject *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICatalogObject* This); + ICatalogObject *This); ULONG (STDMETHODCALLTYPE *Release)( - ICatalogObject* This); + ICatalogObject *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ICatalogObject* This, + ICatalogObject *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ICatalogObject* This, + ICatalogObject *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ICatalogObject* This, + ICatalogObject *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2185,7 +1672,7 @@ typedef struct ICatalogObjectVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ICatalogObject* This, + ICatalogObject *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2197,39 +1684,40 @@ typedef struct ICatalogObjectVtbl { /*** ICatalogObject methods ***/ HRESULT (STDMETHODCALLTYPE *get_Value)( - ICatalogObject* This, + ICatalogObject *This, BSTR bstrPropName, VARIANT *pvarRetVal); HRESULT (STDMETHODCALLTYPE *put_Value)( - ICatalogObject* This, + ICatalogObject *This, BSTR bstrPropName, VARIANT val); HRESULT (STDMETHODCALLTYPE *get_Key)( - ICatalogObject* This, + ICatalogObject *This, VARIANT *pvarRetVal); HRESULT (STDMETHODCALLTYPE *get_Name)( - ICatalogObject* This, + ICatalogObject *This, VARIANT *pvarRetVal); HRESULT (STDMETHODCALLTYPE *IsPropertyReadOnly)( - ICatalogObject* This, + ICatalogObject *This, BSTR bstrPropName, VARIANT_BOOL *pbRetVal); HRESULT (STDMETHODCALLTYPE *get_Valid)( - ICatalogObject* This, + ICatalogObject *This, VARIANT_BOOL *pbRetVal); HRESULT (STDMETHODCALLTYPE *IsPropertyWriteOnly)( - ICatalogObject* This, + ICatalogObject *This, BSTR bstrPropName, VARIANT_BOOL *pbRetVal); END_INTERFACE } ICatalogObjectVtbl; + interface ICatalogObject { CONST_VTBL ICatalogObjectVtbl* lpVtbl; }; @@ -2304,66 +1792,6 @@ static FORCEINLINE HRESULT ICatalogObject_IsPropertyWriteOnly(ICatalogObject* Th #endif -HRESULT STDMETHODCALLTYPE ICatalogObject_get_Value_Proxy( - ICatalogObject* This, - BSTR bstrPropName, - VARIANT *pvarRetVal); -void __RPC_STUB ICatalogObject_get_Value_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatalogObject_put_Value_Proxy( - ICatalogObject* This, - BSTR bstrPropName, - VARIANT val); -void __RPC_STUB ICatalogObject_put_Value_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatalogObject_get_Key_Proxy( - ICatalogObject* This, - VARIANT *pvarRetVal); -void __RPC_STUB ICatalogObject_get_Key_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatalogObject_get_Name_Proxy( - ICatalogObject* This, - VARIANT *pvarRetVal); -void __RPC_STUB ICatalogObject_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatalogObject_IsPropertyReadOnly_Proxy( - ICatalogObject* This, - BSTR bstrPropName, - VARIANT_BOOL *pbRetVal); -void __RPC_STUB ICatalogObject_IsPropertyReadOnly_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatalogObject_get_Valid_Proxy( - ICatalogObject* This, - VARIANT_BOOL *pbRetVal); -void __RPC_STUB ICatalogObject_get_Valid_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatalogObject_IsPropertyWriteOnly_Proxy( - ICatalogObject* This, - BSTR bstrPropName, - VARIANT_BOOL *pbRetVal); -void __RPC_STUB ICatalogObject_IsPropertyWriteOnly_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICatalogObject_INTERFACE_DEFINED__ */ @@ -2440,29 +1868,29 @@ typedef struct ICatalogCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICatalogCollection* This, + ICatalogCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICatalogCollection* This); + ICatalogCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - ICatalogCollection* This); + ICatalogCollection *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ICatalogCollection* This, + ICatalogCollection *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ICatalogCollection* This, + ICatalogCollection *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ICatalogCollection* This, + ICatalogCollection *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2470,7 +1898,7 @@ typedef struct ICatalogCollectionVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ICatalogCollection* This, + ICatalogCollection *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2482,74 +1910,75 @@ typedef struct ICatalogCollectionVtbl { /*** ICatalogCollection methods ***/ HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ICatalogCollection* This, + ICatalogCollection *This, IUnknown **ppEnumVariant); HRESULT (STDMETHODCALLTYPE *get_Item)( - ICatalogCollection* This, + ICatalogCollection *This, LONG lIndex, IDispatch **ppCatalogObject); HRESULT (STDMETHODCALLTYPE *get_Count)( - ICatalogCollection* This, + ICatalogCollection *This, LONG *plObjectCount); HRESULT (STDMETHODCALLTYPE *Remove)( - ICatalogCollection* This, + ICatalogCollection *This, LONG lIndex); HRESULT (STDMETHODCALLTYPE *Add)( - ICatalogCollection* This, + ICatalogCollection *This, IDispatch **ppCatalogObject); HRESULT (STDMETHODCALLTYPE *Populate)( - ICatalogCollection* This); + ICatalogCollection *This); HRESULT (STDMETHODCALLTYPE *SaveChanges)( - ICatalogCollection* This, + ICatalogCollection *This, LONG *pcChanges); HRESULT (STDMETHODCALLTYPE *GetCollection)( - ICatalogCollection* This, + ICatalogCollection *This, BSTR bstrCollName, VARIANT varObjectKey, IDispatch **ppCatalogCollection); HRESULT (STDMETHODCALLTYPE *get_Name)( - ICatalogCollection* This, + ICatalogCollection *This, VARIANT *pVarNamel); HRESULT (STDMETHODCALLTYPE *get_AddEnabled)( - ICatalogCollection* This, + ICatalogCollection *This, VARIANT_BOOL *pVarBool); HRESULT (STDMETHODCALLTYPE *get_RemoveEnabled)( - ICatalogCollection* This, + ICatalogCollection *This, VARIANT_BOOL *pVarBool); HRESULT (STDMETHODCALLTYPE *GetUtilInterface)( - ICatalogCollection* This, + ICatalogCollection *This, IDispatch **ppIDispatch); HRESULT (STDMETHODCALLTYPE *get_DataStoreMajorVersion)( - ICatalogCollection* This, + ICatalogCollection *This, LONG *plMajorVersion); HRESULT (STDMETHODCALLTYPE *get_DataStoreMinorVersion)( - ICatalogCollection* This, + ICatalogCollection *This, LONG *plMinorVersionl); HRESULT (STDMETHODCALLTYPE *PopulateByKey)( - ICatalogCollection* This, + ICatalogCollection *This, SAFEARRAY *psaKeys); HRESULT (STDMETHODCALLTYPE *PopulateByQuery)( - ICatalogCollection* This, + ICatalogCollection *This, BSTR bstrQueryString, LONG lQueryType); END_INTERFACE } ICatalogCollectionVtbl; + interface ICatalogCollection { CONST_VTBL ICatalogCollectionVtbl* lpVtbl; }; @@ -2660,137 +2089,6 @@ static FORCEINLINE HRESULT ICatalogCollection_PopulateByQuery(ICatalogCollection #endif -HRESULT STDMETHODCALLTYPE ICatalogCollection_get__NewEnum_Proxy( - ICatalogCollection* This, - IUnknown **ppEnumVariant); -void __RPC_STUB ICatalogCollection_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatalogCollection_get_Item_Proxy( - ICatalogCollection* This, - LONG lIndex, - IDispatch **ppCatalogObject); -void __RPC_STUB ICatalogCollection_get_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatalogCollection_get_Count_Proxy( - ICatalogCollection* This, - LONG *plObjectCount); -void __RPC_STUB ICatalogCollection_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatalogCollection_Remove_Proxy( - ICatalogCollection* This, - LONG lIndex); -void __RPC_STUB ICatalogCollection_Remove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatalogCollection_Add_Proxy( - ICatalogCollection* This, - IDispatch **ppCatalogObject); -void __RPC_STUB ICatalogCollection_Add_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatalogCollection_Populate_Proxy( - ICatalogCollection* This); -void __RPC_STUB ICatalogCollection_Populate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatalogCollection_SaveChanges_Proxy( - ICatalogCollection* This, - LONG *pcChanges); -void __RPC_STUB ICatalogCollection_SaveChanges_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatalogCollection_GetCollection_Proxy( - ICatalogCollection* This, - BSTR bstrCollName, - VARIANT varObjectKey, - IDispatch **ppCatalogCollection); -void __RPC_STUB ICatalogCollection_GetCollection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatalogCollection_get_Name_Proxy( - ICatalogCollection* This, - VARIANT *pVarNamel); -void __RPC_STUB ICatalogCollection_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatalogCollection_get_AddEnabled_Proxy( - ICatalogCollection* This, - VARIANT_BOOL *pVarBool); -void __RPC_STUB ICatalogCollection_get_AddEnabled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatalogCollection_get_RemoveEnabled_Proxy( - ICatalogCollection* This, - VARIANT_BOOL *pVarBool); -void __RPC_STUB ICatalogCollection_get_RemoveEnabled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatalogCollection_GetUtilInterface_Proxy( - ICatalogCollection* This, - IDispatch **ppIDispatch); -void __RPC_STUB ICatalogCollection_GetUtilInterface_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatalogCollection_get_DataStoreMajorVersion_Proxy( - ICatalogCollection* This, - LONG *plMajorVersion); -void __RPC_STUB ICatalogCollection_get_DataStoreMajorVersion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatalogCollection_get_DataStoreMinorVersion_Proxy( - ICatalogCollection* This, - LONG *plMinorVersionl); -void __RPC_STUB ICatalogCollection_get_DataStoreMinorVersion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatalogCollection_PopulateByKey_Proxy( - ICatalogCollection* This, - SAFEARRAY *psaKeys); -void __RPC_STUB ICatalogCollection_PopulateByKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatalogCollection_PopulateByQuery_Proxy( - ICatalogCollection* This, - BSTR bstrQueryString, - LONG lQueryType); -void __RPC_STUB ICatalogCollection_PopulateByQuery_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICatalogCollection_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/comcat.h b/lib/libc/include/any-windows-any/comcat.h index 5465d81fc2..c867b578c8 100644 --- a/lib/libc/include/any-windows-any/comcat.h +++ b/lib/libc/include/any-windows-any/comcat.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/comcat.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/comcat.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,21 +21,33 @@ #ifndef __IEnumGUID_FWD_DEFINED__ #define __IEnumGUID_FWD_DEFINED__ typedef interface IEnumGUID IEnumGUID; +#ifdef __cplusplus +interface IEnumGUID; +#endif /* __cplusplus */ #endif #ifndef __IEnumCATEGORYINFO_FWD_DEFINED__ #define __IEnumCATEGORYINFO_FWD_DEFINED__ typedef interface IEnumCATEGORYINFO IEnumCATEGORYINFO; +#ifdef __cplusplus +interface IEnumCATEGORYINFO; +#endif /* __cplusplus */ #endif #ifndef __ICatRegister_FWD_DEFINED__ #define __ICatRegister_FWD_DEFINED__ typedef interface ICatRegister ICatRegister; +#ifdef __cplusplus +interface ICatRegister; +#endif /* __cplusplus */ #endif #ifndef __ICatInformation_FWD_DEFINED__ #define __ICatInformation_FWD_DEFINED__ typedef interface ICatInformation ICatInformation; +#ifdef __cplusplus +interface ICatInformation; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -56,6 +69,9 @@ extern "C" { #ifndef __IEnumGUID_FWD_DEFINED__ #define __IEnumGUID_FWD_DEFINED__ typedef interface IEnumGUID IEnumGUID; +#ifdef __cplusplus +interface IEnumGUID; +#endif /* __cplusplus */ #endif #endif @@ -63,16 +79,25 @@ typedef interface IEnumGUID IEnumGUID; #ifndef __IEnumCATEGORYINFO_FWD_DEFINED__ #define __IEnumCATEGORYINFO_FWD_DEFINED__ typedef interface IEnumCATEGORYINFO IEnumCATEGORYINFO; +#ifdef __cplusplus +interface IEnumCATEGORYINFO; +#endif /* __cplusplus */ #endif #ifndef __ICatRegister_FWD_DEFINED__ #define __ICatRegister_FWD_DEFINED__ typedef interface ICatRegister ICatRegister; +#ifdef __cplusplus +interface ICatRegister; +#endif /* __cplusplus */ #endif #ifndef __ICatInformation_FWD_DEFINED__ #define __ICatInformation_FWD_DEFINED__ typedef interface ICatInformation ICatInformation; +#ifdef __cplusplus +interface ICatInformation; +#endif /* __cplusplus */ #endif @@ -153,36 +178,37 @@ typedef struct IEnumGUIDVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumGUID* This, + IEnumGUID *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumGUID* This); + IEnumGUID *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumGUID* This); + IEnumGUID *This); /*** IEnumGUID methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumGUID* This, + IEnumGUID *This, ULONG celt, GUID *rgelt, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumGUID* This, + IEnumGUID *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumGUID* This); + IEnumGUID *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumGUID* This, + IEnumGUID *This, IEnumGUID **ppenum); END_INTERFACE } IEnumGUIDVtbl; + interface IEnumGUID { CONST_VTBL IEnumGUIDVtbl* lpVtbl; }; @@ -237,29 +263,6 @@ void __RPC_STUB IEnumGUID_RemoteNext_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumGUID_Skip_Proxy( - IEnumGUID* This, - ULONG celt); -void __RPC_STUB IEnumGUID_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumGUID_Reset_Proxy( - IEnumGUID* This); -void __RPC_STUB IEnumGUID_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumGUID_Clone_Proxy( - IEnumGUID* This, - IEnumGUID **ppenum); -void __RPC_STUB IEnumGUID_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IEnumGUID_Next_Proxy( IEnumGUID* This, ULONG celt, @@ -323,36 +326,37 @@ typedef struct IEnumCATEGORYINFOVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumCATEGORYINFO* This, + IEnumCATEGORYINFO *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumCATEGORYINFO* This); + IEnumCATEGORYINFO *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumCATEGORYINFO* This); + IEnumCATEGORYINFO *This); /*** IEnumCATEGORYINFO methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumCATEGORYINFO* This, + IEnumCATEGORYINFO *This, ULONG celt, CATEGORYINFO *rgelt, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumCATEGORYINFO* This, + IEnumCATEGORYINFO *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumCATEGORYINFO* This); + IEnumCATEGORYINFO *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumCATEGORYINFO* This, + IEnumCATEGORYINFO *This, IEnumCATEGORYINFO **ppenum); END_INTERFACE } IEnumCATEGORYINFOVtbl; + interface IEnumCATEGORYINFO { CONST_VTBL IEnumCATEGORYINFOVtbl* lpVtbl; }; @@ -397,39 +401,6 @@ static FORCEINLINE HRESULT IEnumCATEGORYINFO_Clone(IEnumCATEGORYINFO* This,IEnum #endif -HRESULT STDMETHODCALLTYPE IEnumCATEGORYINFO_Next_Proxy( - IEnumCATEGORYINFO* This, - ULONG celt, - CATEGORYINFO *rgelt, - ULONG *pceltFetched); -void __RPC_STUB IEnumCATEGORYINFO_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumCATEGORYINFO_Skip_Proxy( - IEnumCATEGORYINFO* This, - ULONG celt); -void __RPC_STUB IEnumCATEGORYINFO_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumCATEGORYINFO_Reset_Proxy( - IEnumCATEGORYINFO* This); -void __RPC_STUB IEnumCATEGORYINFO_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumCATEGORYINFO_Clone_Proxy( - IEnumCATEGORYINFO* This, - IEnumCATEGORYINFO **ppenum); -void __RPC_STUB IEnumCATEGORYINFO_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumCATEGORYINFO_INTERFACE_DEFINED__ */ @@ -488,53 +459,54 @@ typedef struct ICatRegisterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICatRegister* This, + ICatRegister *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICatRegister* This); + ICatRegister *This); ULONG (STDMETHODCALLTYPE *Release)( - ICatRegister* This); + ICatRegister *This); /*** ICatRegister methods ***/ HRESULT (STDMETHODCALLTYPE *RegisterCategories)( - ICatRegister* This, + ICatRegister *This, ULONG cCategories, CATEGORYINFO rgCategoryInfo[]); HRESULT (STDMETHODCALLTYPE *UnRegisterCategories)( - ICatRegister* This, + ICatRegister *This, ULONG cCategories, CATID rgcatid[]); HRESULT (STDMETHODCALLTYPE *RegisterClassImplCategories)( - ICatRegister* This, + ICatRegister *This, REFCLSID rclsid, ULONG cCategories, CATID rgcatid[]); HRESULT (STDMETHODCALLTYPE *UnRegisterClassImplCategories)( - ICatRegister* This, + ICatRegister *This, REFCLSID rclsid, ULONG cCategories, CATID rgcatid[]); HRESULT (STDMETHODCALLTYPE *RegisterClassReqCategories)( - ICatRegister* This, + ICatRegister *This, REFCLSID rclsid, ULONG cCategories, CATID rgcatid[]); HRESULT (STDMETHODCALLTYPE *UnRegisterClassReqCategories)( - ICatRegister* This, + ICatRegister *This, REFCLSID rclsid, ULONG cCategories, CATID rgcatid[]); END_INTERFACE } ICatRegisterVtbl; + interface ICatRegister { CONST_VTBL ICatRegisterVtbl* lpVtbl; }; @@ -587,64 +559,6 @@ static FORCEINLINE HRESULT ICatRegister_UnRegisterClassReqCategories(ICatRegiste #endif -HRESULT STDMETHODCALLTYPE ICatRegister_RegisterCategories_Proxy( - ICatRegister* This, - ULONG cCategories, - CATEGORYINFO rgCategoryInfo[]); -void __RPC_STUB ICatRegister_RegisterCategories_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatRegister_UnRegisterCategories_Proxy( - ICatRegister* This, - ULONG cCategories, - CATID rgcatid[]); -void __RPC_STUB ICatRegister_UnRegisterCategories_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatRegister_RegisterClassImplCategories_Proxy( - ICatRegister* This, - REFCLSID rclsid, - ULONG cCategories, - CATID rgcatid[]); -void __RPC_STUB ICatRegister_RegisterClassImplCategories_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatRegister_UnRegisterClassImplCategories_Proxy( - ICatRegister* This, - REFCLSID rclsid, - ULONG cCategories, - CATID rgcatid[]); -void __RPC_STUB ICatRegister_UnRegisterClassImplCategories_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatRegister_RegisterClassReqCategories_Proxy( - ICatRegister* This, - REFCLSID rclsid, - ULONG cCategories, - CATID rgcatid[]); -void __RPC_STUB ICatRegister_RegisterClassReqCategories_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatRegister_UnRegisterClassReqCategories_Proxy( - ICatRegister* This, - REFCLSID rclsid, - ULONG cCategories, - CATID rgcatid[]); -void __RPC_STUB ICatRegister_UnRegisterClassReqCategories_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICatRegister_INTERFACE_DEFINED__ */ @@ -706,30 +620,30 @@ typedef struct ICatInformationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICatInformation* This, + ICatInformation *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICatInformation* This); + ICatInformation *This); ULONG (STDMETHODCALLTYPE *Release)( - ICatInformation* This); + ICatInformation *This); /*** ICatInformation methods ***/ HRESULT (STDMETHODCALLTYPE *EnumCategories)( - ICatInformation* This, + ICatInformation *This, LCID lcid, IEnumCATEGORYINFO **ppenumCategoryInfo); HRESULT (STDMETHODCALLTYPE *GetCategoryDesc)( - ICatInformation* This, + ICatInformation *This, REFCATID rcatid, LCID lcid, LPWSTR *pszDesc); HRESULT (STDMETHODCALLTYPE *EnumClassesOfCategories)( - ICatInformation* This, + ICatInformation *This, ULONG cImplemented, const CATID rgcatidImpl[], ULONG cRequired, @@ -737,7 +651,7 @@ typedef struct ICatInformationVtbl { IEnumGUID **ppenumClsid); HRESULT (STDMETHODCALLTYPE *IsClassOfCategories)( - ICatInformation* This, + ICatInformation *This, REFCLSID rclsid, ULONG cImplemented, const CATID rgcatidImpl[], @@ -745,17 +659,18 @@ typedef struct ICatInformationVtbl { const CATID rgcatidReq[]); HRESULT (STDMETHODCALLTYPE *EnumImplCategoriesOfClass)( - ICatInformation* This, + ICatInformation *This, REFCLSID rclsid, IEnumGUID **ppenumCatid); HRESULT (STDMETHODCALLTYPE *EnumReqCategoriesOfClass)( - ICatInformation* This, + ICatInformation *This, REFCLSID rclsid, IEnumGUID **ppenumCatid); END_INTERFACE } ICatInformationVtbl; + interface ICatInformation { CONST_VTBL ICatInformationVtbl* lpVtbl; }; @@ -808,25 +723,6 @@ static FORCEINLINE HRESULT ICatInformation_EnumReqCategoriesOfClass(ICatInformat #endif -HRESULT STDMETHODCALLTYPE ICatInformation_EnumCategories_Proxy( - ICatInformation* This, - LCID lcid, - IEnumCATEGORYINFO **ppenumCategoryInfo); -void __RPC_STUB ICatInformation_EnumCategories_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatInformation_GetCategoryDesc_Proxy( - ICatInformation* This, - REFCATID rcatid, - LCID lcid, - LPWSTR *pszDesc); -void __RPC_STUB ICatInformation_GetCategoryDesc_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE ICatInformation_RemoteEnumClassesOfCategories_Proxy( ICatInformation* This, ULONG cImplemented, @@ -851,24 +747,6 @@ void __RPC_STUB ICatInformation_RemoteIsClassOfCategories_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatInformation_EnumImplCategoriesOfClass_Proxy( - ICatInformation* This, - REFCLSID rclsid, - IEnumGUID **ppenumCatid); -void __RPC_STUB ICatInformation_EnumImplCategoriesOfClass_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatInformation_EnumReqCategoriesOfClass_Proxy( - ICatInformation* This, - REFCLSID rclsid, - IEnumGUID **ppenumCatid); -void __RPC_STUB ICatInformation_EnumReqCategoriesOfClass_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK ICatInformation_EnumClassesOfCategories_Proxy( ICatInformation* This, ULONG cImplemented, diff --git a/lib/libc/include/any-windows-any/commoncontrols.h b/lib/libc/include/any-windows-any/commoncontrols.h index 59fc68df2a..39f432d664 100644 --- a/lib/libc/include/any-windows-any/commoncontrols.h +++ b/lib/libc/include/any-windows-any/commoncontrols.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/commoncontrols.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/commoncontrols.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,11 +21,17 @@ #ifndef __IImageList_FWD_DEFINED__ #define __IImageList_FWD_DEFINED__ typedef interface IImageList IImageList; +#ifdef __cplusplus +interface IImageList; +#endif /* __cplusplus */ #endif #ifndef __IImageList2_FWD_DEFINED__ #define __IImageList2_FWD_DEFINED__ typedef interface IImageList2 IImageList2; +#ifdef __cplusplus +interface IImageList2; +#endif /* __cplusplus */ #endif #ifndef __ImageList_FWD_DEFINED__ @@ -277,74 +284,74 @@ typedef struct IImageListVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IImageList* This, + IImageList *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IImageList* This); + IImageList *This); ULONG (STDMETHODCALLTYPE *Release)( - IImageList* This); + IImageList *This); /*** IImageList methods ***/ HRESULT (STDMETHODCALLTYPE *Add)( - IImageList* This, + IImageList *This, HBITMAP hbmImage, HBITMAP hbmMask, int *pi); HRESULT (STDMETHODCALLTYPE *ReplaceIcon)( - IImageList* This, + IImageList *This, int i, HICON hicon, int *pi); HRESULT (STDMETHODCALLTYPE *SetOverlayImage)( - IImageList* This, + IImageList *This, int iImage, int iOverlay); HRESULT (STDMETHODCALLTYPE *Replace)( - IImageList* This, + IImageList *This, int i, HBITMAP hbmImage, HBITMAP hbmMask); HRESULT (STDMETHODCALLTYPE *AddMasked)( - IImageList* This, + IImageList *This, HBITMAP hbmImage, COLORREF crMask, int *pi); HRESULT (STDMETHODCALLTYPE *Draw)( - IImageList* This, + IImageList *This, IMAGELISTDRAWPARAMS *pimldp); HRESULT (STDMETHODCALLTYPE *Remove)( - IImageList* This, + IImageList *This, int i); HRESULT (STDMETHODCALLTYPE *GetIcon)( - IImageList* This, + IImageList *This, int i, UINT flags, HICON *picon); HRESULT (STDMETHODCALLTYPE *GetImageInfo)( - IImageList* This, + IImageList *This, int i, IMAGEINFO *pImageInfo); HRESULT (STDMETHODCALLTYPE *Copy)( - IImageList* This, + IImageList *This, int iDst, IUnknown *punkSrc, int iSrc, UINT uFlags); HRESULT (STDMETHODCALLTYPE *Merge)( - IImageList* This, + IImageList *This, int i1, IUnknown *punk2, int i2, @@ -354,96 +361,97 @@ typedef struct IImageListVtbl { void **ppv); HRESULT (STDMETHODCALLTYPE *Clone)( - IImageList* This, + IImageList *This, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetImageRect)( - IImageList* This, + IImageList *This, int i, RECT *prc); HRESULT (STDMETHODCALLTYPE *GetIconSize)( - IImageList* This, + IImageList *This, int *cx, int *cy); HRESULT (STDMETHODCALLTYPE *SetIconSize)( - IImageList* This, + IImageList *This, int cx, int cy); HRESULT (STDMETHODCALLTYPE *GetImageCount)( - IImageList* This, + IImageList *This, int *pi); HRESULT (STDMETHODCALLTYPE *SetImageCount)( - IImageList* This, + IImageList *This, UINT uNewCount); HRESULT (STDMETHODCALLTYPE *SetBkColor)( - IImageList* This, + IImageList *This, COLORREF clrBk, COLORREF *pclr); HRESULT (STDMETHODCALLTYPE *GetBkColor)( - IImageList* This, + IImageList *This, COLORREF *pclr); HRESULT (STDMETHODCALLTYPE *BeginDrag)( - IImageList* This, + IImageList *This, int iTrack, int dxHotspot, int dyHotspot); HRESULT (STDMETHODCALLTYPE *EndDrag)( - IImageList* This); + IImageList *This); HRESULT (STDMETHODCALLTYPE *DragEnter)( - IImageList* This, + IImageList *This, HWND hwndLock, int x, int y); HRESULT (STDMETHODCALLTYPE *DragLeave)( - IImageList* This, + IImageList *This, HWND hwndLock); HRESULT (STDMETHODCALLTYPE *DragMove)( - IImageList* This, + IImageList *This, int x, int y); HRESULT (STDMETHODCALLTYPE *SetDragCursorImage)( - IImageList* This, + IImageList *This, IUnknown *punk, int iDrag, int dxHotspot, int dyHotspot); HRESULT (STDMETHODCALLTYPE *DragShowNolock)( - IImageList* This, + IImageList *This, WINBOOL fShow); HRESULT (STDMETHODCALLTYPE *GetDragImage)( - IImageList* This, + IImageList *This, POINT *ppt, POINT *pptHotspot, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetItemFlags)( - IImageList* This, + IImageList *This, int i, DWORD *dwFlags); HRESULT (STDMETHODCALLTYPE *GetOverlayImage)( - IImageList* This, + IImageList *This, int iOverlay, int *piIndex); END_INTERFACE } IImageListVtbl; + interface IImageList { CONST_VTBL IImageListVtbl* lpVtbl; }; @@ -588,276 +596,6 @@ static FORCEINLINE HRESULT IImageList_GetOverlayImage(IImageList* This,int iOver #endif -HRESULT STDMETHODCALLTYPE IImageList_Add_Proxy( - IImageList* This, - HBITMAP hbmImage, - HBITMAP hbmMask, - int *pi); -void __RPC_STUB IImageList_Add_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_ReplaceIcon_Proxy( - IImageList* This, - int i, - HICON hicon, - int *pi); -void __RPC_STUB IImageList_ReplaceIcon_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_SetOverlayImage_Proxy( - IImageList* This, - int iImage, - int iOverlay); -void __RPC_STUB IImageList_SetOverlayImage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_Replace_Proxy( - IImageList* This, - int i, - HBITMAP hbmImage, - HBITMAP hbmMask); -void __RPC_STUB IImageList_Replace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_AddMasked_Proxy( - IImageList* This, - HBITMAP hbmImage, - COLORREF crMask, - int *pi); -void __RPC_STUB IImageList_AddMasked_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_Draw_Proxy( - IImageList* This, - IMAGELISTDRAWPARAMS *pimldp); -void __RPC_STUB IImageList_Draw_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_Remove_Proxy( - IImageList* This, - int i); -void __RPC_STUB IImageList_Remove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_GetIcon_Proxy( - IImageList* This, - int i, - UINT flags, - HICON *picon); -void __RPC_STUB IImageList_GetIcon_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_GetImageInfo_Proxy( - IImageList* This, - int i, - IMAGEINFO *pImageInfo); -void __RPC_STUB IImageList_GetImageInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_Copy_Proxy( - IImageList* This, - int iDst, - IUnknown *punkSrc, - int iSrc, - UINT uFlags); -void __RPC_STUB IImageList_Copy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_Merge_Proxy( - IImageList* This, - int i1, - IUnknown *punk2, - int i2, - int dx, - int dy, - REFIID riid, - void **ppv); -void __RPC_STUB IImageList_Merge_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_Clone_Proxy( - IImageList* This, - REFIID riid, - void **ppv); -void __RPC_STUB IImageList_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_GetImageRect_Proxy( - IImageList* This, - int i, - RECT *prc); -void __RPC_STUB IImageList_GetImageRect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_GetIconSize_Proxy( - IImageList* This, - int *cx, - int *cy); -void __RPC_STUB IImageList_GetIconSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_SetIconSize_Proxy( - IImageList* This, - int cx, - int cy); -void __RPC_STUB IImageList_SetIconSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_GetImageCount_Proxy( - IImageList* This, - int *pi); -void __RPC_STUB IImageList_GetImageCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_SetImageCount_Proxy( - IImageList* This, - UINT uNewCount); -void __RPC_STUB IImageList_SetImageCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_SetBkColor_Proxy( - IImageList* This, - COLORREF clrBk, - COLORREF *pclr); -void __RPC_STUB IImageList_SetBkColor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_GetBkColor_Proxy( - IImageList* This, - COLORREF *pclr); -void __RPC_STUB IImageList_GetBkColor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_BeginDrag_Proxy( - IImageList* This, - int iTrack, - int dxHotspot, - int dyHotspot); -void __RPC_STUB IImageList_BeginDrag_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_EndDrag_Proxy( - IImageList* This); -void __RPC_STUB IImageList_EndDrag_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_DragEnter_Proxy( - IImageList* This, - HWND hwndLock, - int x, - int y); -void __RPC_STUB IImageList_DragEnter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_DragLeave_Proxy( - IImageList* This, - HWND hwndLock); -void __RPC_STUB IImageList_DragLeave_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_DragMove_Proxy( - IImageList* This, - int x, - int y); -void __RPC_STUB IImageList_DragMove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_SetDragCursorImage_Proxy( - IImageList* This, - IUnknown *punk, - int iDrag, - int dxHotspot, - int dyHotspot); -void __RPC_STUB IImageList_SetDragCursorImage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_DragShowNolock_Proxy( - IImageList* This, - WINBOOL fShow); -void __RPC_STUB IImageList_DragShowNolock_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_GetDragImage_Proxy( - IImageList* This, - POINT *ppt, - POINT *pptHotspot, - REFIID riid, - void **ppv); -void __RPC_STUB IImageList_GetDragImage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_GetItemFlags_Proxy( - IImageList* This, - int i, - DWORD *dwFlags); -void __RPC_STUB IImageList_GetItemFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList_GetOverlayImage_Proxy( - IImageList* This, - int iOverlay, - int *piIndex); -void __RPC_STUB IImageList_GetOverlayImage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IImageList_INTERFACE_DEFINED__ */ @@ -940,74 +678,74 @@ typedef struct IImageList2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IImageList2* This, + IImageList2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IImageList2* This); + IImageList2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IImageList2* This); + IImageList2 *This); /*** IImageList methods ***/ HRESULT (STDMETHODCALLTYPE *Add)( - IImageList2* This, + IImageList2 *This, HBITMAP hbmImage, HBITMAP hbmMask, int *pi); HRESULT (STDMETHODCALLTYPE *ReplaceIcon)( - IImageList2* This, + IImageList2 *This, int i, HICON hicon, int *pi); HRESULT (STDMETHODCALLTYPE *SetOverlayImage)( - IImageList2* This, + IImageList2 *This, int iImage, int iOverlay); HRESULT (STDMETHODCALLTYPE *Replace)( - IImageList2* This, + IImageList2 *This, int i, HBITMAP hbmImage, HBITMAP hbmMask); HRESULT (STDMETHODCALLTYPE *AddMasked)( - IImageList2* This, + IImageList2 *This, HBITMAP hbmImage, COLORREF crMask, int *pi); HRESULT (STDMETHODCALLTYPE *Draw)( - IImageList2* This, + IImageList2 *This, IMAGELISTDRAWPARAMS *pimldp); HRESULT (STDMETHODCALLTYPE *Remove)( - IImageList2* This, + IImageList2 *This, int i); HRESULT (STDMETHODCALLTYPE *GetIcon)( - IImageList2* This, + IImageList2 *This, int i, UINT flags, HICON *picon); HRESULT (STDMETHODCALLTYPE *GetImageInfo)( - IImageList2* This, + IImageList2 *This, int i, IMAGEINFO *pImageInfo); HRESULT (STDMETHODCALLTYPE *Copy)( - IImageList2* This, + IImageList2 *This, int iDst, IUnknown *punkSrc, int iSrc, UINT uFlags); HRESULT (STDMETHODCALLTYPE *Merge)( - IImageList2* This, + IImageList2 *This, int i1, IUnknown *punk2, int i2, @@ -1017,143 +755,143 @@ typedef struct IImageList2Vtbl { void **ppv); HRESULT (STDMETHODCALLTYPE *Clone)( - IImageList2* This, + IImageList2 *This, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetImageRect)( - IImageList2* This, + IImageList2 *This, int i, RECT *prc); HRESULT (STDMETHODCALLTYPE *GetIconSize)( - IImageList2* This, + IImageList2 *This, int *cx, int *cy); HRESULT (STDMETHODCALLTYPE *SetIconSize)( - IImageList2* This, + IImageList2 *This, int cx, int cy); HRESULT (STDMETHODCALLTYPE *GetImageCount)( - IImageList2* This, + IImageList2 *This, int *pi); HRESULT (STDMETHODCALLTYPE *SetImageCount)( - IImageList2* This, + IImageList2 *This, UINT uNewCount); HRESULT (STDMETHODCALLTYPE *SetBkColor)( - IImageList2* This, + IImageList2 *This, COLORREF clrBk, COLORREF *pclr); HRESULT (STDMETHODCALLTYPE *GetBkColor)( - IImageList2* This, + IImageList2 *This, COLORREF *pclr); HRESULT (STDMETHODCALLTYPE *BeginDrag)( - IImageList2* This, + IImageList2 *This, int iTrack, int dxHotspot, int dyHotspot); HRESULT (STDMETHODCALLTYPE *EndDrag)( - IImageList2* This); + IImageList2 *This); HRESULT (STDMETHODCALLTYPE *DragEnter)( - IImageList2* This, + IImageList2 *This, HWND hwndLock, int x, int y); HRESULT (STDMETHODCALLTYPE *DragLeave)( - IImageList2* This, + IImageList2 *This, HWND hwndLock); HRESULT (STDMETHODCALLTYPE *DragMove)( - IImageList2* This, + IImageList2 *This, int x, int y); HRESULT (STDMETHODCALLTYPE *SetDragCursorImage)( - IImageList2* This, + IImageList2 *This, IUnknown *punk, int iDrag, int dxHotspot, int dyHotspot); HRESULT (STDMETHODCALLTYPE *DragShowNolock)( - IImageList2* This, + IImageList2 *This, WINBOOL fShow); HRESULT (STDMETHODCALLTYPE *GetDragImage)( - IImageList2* This, + IImageList2 *This, POINT *ppt, POINT *pptHotspot, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetItemFlags)( - IImageList2* This, + IImageList2 *This, int i, DWORD *dwFlags); HRESULT (STDMETHODCALLTYPE *GetOverlayImage)( - IImageList2* This, + IImageList2 *This, int iOverlay, int *piIndex); /*** IImageList2 methods ***/ HRESULT (STDMETHODCALLTYPE *Resize)( - IImageList2* This, + IImageList2 *This, int cxNewIconSize, int cyNewIconSize); HRESULT (STDMETHODCALLTYPE *GetOriginalSize)( - IImageList2* This, + IImageList2 *This, int iImage, DWORD dwFlags, int *pcx, int *pcy); HRESULT (STDMETHODCALLTYPE *SetOriginalSize)( - IImageList2* This, + IImageList2 *This, int iImage, int cx, int cy); HRESULT (STDMETHODCALLTYPE *SetCallback)( - IImageList2* This, + IImageList2 *This, IUnknown *punk); HRESULT (STDMETHODCALLTYPE *GetCallback)( - IImageList2* This, + IImageList2 *This, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *ForceImagePresent)( - IImageList2* This, + IImageList2 *This, int iImage, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *DiscardImages)( - IImageList2* This, + IImageList2 *This, int iFirstImage, int iLastImage, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *PreloadImages)( - IImageList2* This, + IImageList2 *This, IMAGELISTDRAWPARAMS *pimldp); HRESULT (STDMETHODCALLTYPE *GetStatistics)( - IImageList2* This, + IImageList2 *This, IMAGELISTSTATS *pils); HRESULT (STDMETHODCALLTYPE *Initialize)( - IImageList2* This, + IImageList2 *This, int cx, int cy, UINT flags, @@ -1161,7 +899,7 @@ typedef struct IImageList2Vtbl { int cGrow); HRESULT (STDMETHODCALLTYPE *Replace2)( - IImageList2* This, + IImageList2 *This, int i, HBITMAP hbmImage, HBITMAP hbmMask, @@ -1169,7 +907,7 @@ typedef struct IImageList2Vtbl { DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *ReplaceFromImageList)( - IImageList2* This, + IImageList2 *This, int i, IImageList *pil, int iSrc, @@ -1178,6 +916,7 @@ typedef struct IImageList2Vtbl { END_INTERFACE } IImageList2Vtbl; + interface IImageList2 { CONST_VTBL IImageList2Vtbl* lpVtbl; }; @@ -1372,124 +1111,6 @@ static FORCEINLINE HRESULT IImageList2_ReplaceFromImageList(IImageList2* This,in #endif -HRESULT STDMETHODCALLTYPE IImageList2_Resize_Proxy( - IImageList2* This, - int cxNewIconSize, - int cyNewIconSize); -void __RPC_STUB IImageList2_Resize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList2_GetOriginalSize_Proxy( - IImageList2* This, - int iImage, - DWORD dwFlags, - int *pcx, - int *pcy); -void __RPC_STUB IImageList2_GetOriginalSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList2_SetOriginalSize_Proxy( - IImageList2* This, - int iImage, - int cx, - int cy); -void __RPC_STUB IImageList2_SetOriginalSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList2_SetCallback_Proxy( - IImageList2* This, - IUnknown *punk); -void __RPC_STUB IImageList2_SetCallback_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList2_GetCallback_Proxy( - IImageList2* This, - REFIID riid, - void **ppv); -void __RPC_STUB IImageList2_GetCallback_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList2_ForceImagePresent_Proxy( - IImageList2* This, - int iImage, - DWORD dwFlags); -void __RPC_STUB IImageList2_ForceImagePresent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList2_DiscardImages_Proxy( - IImageList2* This, - int iFirstImage, - int iLastImage, - DWORD dwFlags); -void __RPC_STUB IImageList2_DiscardImages_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList2_PreloadImages_Proxy( - IImageList2* This, - IMAGELISTDRAWPARAMS *pimldp); -void __RPC_STUB IImageList2_PreloadImages_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList2_GetStatistics_Proxy( - IImageList2* This, - IMAGELISTSTATS *pils); -void __RPC_STUB IImageList2_GetStatistics_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList2_Initialize_Proxy( - IImageList2* This, - int cx, - int cy, - UINT flags, - int cInitial, - int cGrow); -void __RPC_STUB IImageList2_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList2_Replace2_Proxy( - IImageList2* This, - int i, - HBITMAP hbmImage, - HBITMAP hbmMask, - IUnknown *punk, - DWORD dwFlags); -void __RPC_STUB IImageList2_Replace2_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IImageList2_ReplaceFromImageList_Proxy( - IImageList2* This, - int i, - IImageList *pil, - int iSrc, - IUnknown *punk, - DWORD dwFlags); -void __RPC_STUB IImageList2_ReplaceFromImageList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IImageList2_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/concurrencysal.h b/lib/libc/include/any-windows-any/concurrencysal.h new file mode 100644 index 0000000000..1f3310ac13 --- /dev/null +++ b/lib/libc/include/any-windows-any/concurrencysal.h @@ -0,0 +1,49 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#ifndef CONCURRENCYSAL_HXX +#define CONCURRENCYSAL_HXX + +#define _Benign_race_begin_ +#define _Benign_race_end_ +#define _No_competing_thread_begin_ +#define _No_competing_thread_end_ + +#define _Acquires_exclusive_lock_(lock) +#define _Acquires_lock_(lock) +#define _Acquires_nonreentrant_lock_(lock) +#define _Acquires_shared_lock_(lock) +#define _Analysis_assume_lock_acquired_(lock) +#define _Analysis_assume_lock_released_(lock) +#define _Analysis_assume_lock_held_(lock) +#define _Analysis_assume_lock_not_held_(lock) +#define _Analysis_assume_same_lock_(lock1, lock2) +#define _Analysis_suppress_lock_checking_(lock) +#define _Create_lock_level_(level) +#define _Csalcat1_(x,y) +#define _Csalcat2_(x,y) +#define _Function_ignore_lock_checking_(lock) +#define _Guarded_by_(lock) +#define _Has_lock_kind_(kind) +#define _Has_lock_level_(level) +#define _Interlocked_ +#define _Internal_lock_level_order_(a,b) +#define _Lock_level_order_(a,b) +#define _No_competing_thread_ +#define _Post_same_lock_(lock1,lock2) +#define _Releases_exclusive_lock_(lock) +#define _Releases_lock_(lock) +#define _Releases_nonreentrant_lock_(lock) +#define _Releases_shared_lock_(lock) +#define _Requires_exclusive_lock_held_(lock) +#define _Requires_shared_lock_held_(lock) +#define _Requires_lock_held_(lock) +#define _Requires_lock_not_held_(lock) +#define _Requires_no_locks_held_ +#define _Write_guarded_by_(lock) + +#endif + diff --git a/lib/libc/include/any-windows-any/conio.h b/lib/libc/include/any-windows-any/conio.h index 5a90de23e5..a92ee0590e 100644 --- a/lib/libc/include/any-windows-any/conio.h +++ b/lib/libc/include/any-windows-any/conio.h @@ -8,7 +8,7 @@ #include -#if !defined(_UCRTBASE_STDIO_DEFINED) && __MSVCRT_VERSION__ >= 0x1400 +#if !defined(_UCRTBASE_STDIO_DEFINED) && defined(_UCRT) #define _UCRTBASE_STDIO_DEFINED #define UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION (0x0001) @@ -21,12 +21,13 @@ #define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) #define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) -// Default wide printfs and scanfs to the standard mode +// Default wide printfs and scanfs to the legacy wide mode. Only code built +// with -D__USE_MINGW_ANSI_STDIO=1 will expect the standard behaviour. #ifndef UCRTBASE_PRINTF_DEFAULT_WIDE -#define UCRTBASE_PRINTF_DEFAULT_WIDE 0 +#define UCRTBASE_PRINTF_DEFAULT_WIDE UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS #endif #ifndef UCRTBASE_SCANF_DEFAULT_WIDE -#define UCRTBASE_SCANF_DEFAULT_WIDE 0 +#define UCRTBASE_SCANF_DEFAULT_WIDE UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS #endif #endif @@ -41,7 +42,7 @@ extern "C" { _CRTIMP int __cdecl _getche(void); _CRTIMP int __cdecl _kbhit(void); -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT int __cdecl __conio_common_vcprintf(unsigned __int64 _Options, const char *_Format, _locale_t _Locale, va_list _ArgList); int __cdecl __conio_common_vcprintf_p(unsigned __int64 _Options, const char *_Format, _locale_t _Locale, va_list _ArgList); int __cdecl __conio_common_vcprintf_s(unsigned __int64 _Options, const char *_Format, _locale_t _Locale, va_list _ArgList); @@ -161,7 +162,7 @@ extern "C" { _CRTIMP wint_t __cdecl _putwch(wchar_t _WCh); _CRTIMP wint_t __cdecl _ungetwch(wint_t _WCh); _CRTIMP int __cdecl _cputws(const wchar_t *_String); -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT int __cdecl __conio_common_vcwprintf(unsigned __int64 _Options, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); int __cdecl __conio_common_vcwprintf_p(unsigned __int64 _Options, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); int __cdecl __conio_common_vcwprintf_s(unsigned __int64 _Options, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); @@ -258,7 +259,7 @@ extern "C" { #ifndef NO_OLDNAMES char *__cdecl cgets(char *_Buffer) __MINGW_ATTRIB_DEPRECATED_MSVC2005; -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT __mingw_ovr int __cdecl cprintf(const char * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_MSVC2005 { __builtin_va_list _ArgList; diff --git a/lib/libc/include/any-windows-any/control.h b/lib/libc/include/any-windows-any/control.h index e40ace123c..48231e8d96 100644 --- a/lib/libc/include/any-windows-any/control.h +++ b/lib/libc/include/any-windows-any/control.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/control.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/control.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,6 +21,9 @@ #ifndef __IMediaControl_FWD_DEFINED__ #define __IMediaControl_FWD_DEFINED__ typedef interface IMediaControl IMediaControl; +#ifdef __cplusplus +interface IMediaControl; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -179,29 +183,29 @@ typedef struct IMediaControlVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMediaControl* This, + IMediaControl *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMediaControl* This); + IMediaControl *This); ULONG (STDMETHODCALLTYPE *Release)( - IMediaControl* This); + IMediaControl *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IMediaControl* This, + IMediaControl *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IMediaControl* This, + IMediaControl *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IMediaControl* This, + IMediaControl *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -209,7 +213,7 @@ typedef struct IMediaControlVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IMediaControl* This, + IMediaControl *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -221,41 +225,42 @@ typedef struct IMediaControlVtbl { /*** IMediaControl methods ***/ HRESULT (STDMETHODCALLTYPE *Run)( - IMediaControl* This); + IMediaControl *This); HRESULT (STDMETHODCALLTYPE *Pause)( - IMediaControl* This); + IMediaControl *This); HRESULT (STDMETHODCALLTYPE *Stop)( - IMediaControl* This); + IMediaControl *This); HRESULT (STDMETHODCALLTYPE *GetState)( - IMediaControl* This, + IMediaControl *This, LONG msTimeout, OAFilterState *pfs); HRESULT (STDMETHODCALLTYPE *RenderFile)( - IMediaControl* This, + IMediaControl *This, BSTR strFilename); HRESULT (STDMETHODCALLTYPE *AddSourceFilter)( - IMediaControl* This, + IMediaControl *This, BSTR strFilename, IDispatch **ppUnk); HRESULT (STDMETHODCALLTYPE *get_FilterCollection)( - IMediaControl* This, + IMediaControl *This, IDispatch **ppUnk); HRESULT (STDMETHODCALLTYPE *get_RegFilterCollection)( - IMediaControl* This, + IMediaControl *This, IDispatch **ppUnk); HRESULT (STDMETHODCALLTYPE *StopWhenReady)( - IMediaControl* This); + IMediaControl *This); END_INTERFACE } IMediaControlVtbl; + interface IMediaControl { CONST_VTBL IMediaControlVtbl* lpVtbl; }; @@ -338,76 +343,6 @@ static FORCEINLINE HRESULT IMediaControl_StopWhenReady(IMediaControl* This) { #endif -HRESULT STDMETHODCALLTYPE IMediaControl_Run_Proxy( - IMediaControl* This); -void __RPC_STUB IMediaControl_Run_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaControl_Pause_Proxy( - IMediaControl* This); -void __RPC_STUB IMediaControl_Pause_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaControl_Stop_Proxy( - IMediaControl* This); -void __RPC_STUB IMediaControl_Stop_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaControl_GetState_Proxy( - IMediaControl* This, - LONG msTimeout, - OAFilterState *pfs); -void __RPC_STUB IMediaControl_GetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaControl_RenderFile_Proxy( - IMediaControl* This, - BSTR strFilename); -void __RPC_STUB IMediaControl_RenderFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaControl_AddSourceFilter_Proxy( - IMediaControl* This, - BSTR strFilename, - IDispatch **ppUnk); -void __RPC_STUB IMediaControl_AddSourceFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaControl_get_FilterCollection_Proxy( - IMediaControl* This, - IDispatch **ppUnk); -void __RPC_STUB IMediaControl_get_FilterCollection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaControl_get_RegFilterCollection_Proxy( - IMediaControl* This, - IDispatch **ppUnk); -void __RPC_STUB IMediaControl_get_RegFilterCollection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaControl_StopWhenReady_Proxy( - IMediaControl* This); -void __RPC_STUB IMediaControl_StopWhenReady_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMediaControl_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/corecrt.h b/lib/libc/include/any-windows-any/corecrt.h new file mode 100644 index 0000000000..bd9a134505 --- /dev/null +++ b/lib/libc/include/any-windows-any/corecrt.h @@ -0,0 +1,498 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#ifndef _INC_CORECRT +#define _INC_CORECRT + +#include <_mingw.h> + +#ifndef __WIDL__ +#undef _CRT_PACKING +#define _CRT_PACKING 8 +#pragma pack(push,_CRT_PACKING) +#endif + +#if !defined(_UCRT) && ((__MSVCRT_VERSION__ >= 0x1400) || (__MSVCRT_VERSION__ >= 0xE00 && __MSVCRT_VERSION__ < 0x1000)) +// Allow both 0x1400 and 0xE00 to identify UCRT +#define _UCRT +#endif + +#ifdef __ERRCODE_DEFINED_MS +/* #define __ERRCODE_DEFINED_MS */ +typedef int errcode; +#endif + +#ifndef _CRTNOALIAS +#define _CRTNOALIAS +#endif + +#ifndef _CRTRESTRICT +#define _CRTRESTRICT +#endif + +#ifndef _SIZE_T_DEFINED +#define _SIZE_T_DEFINED +#undef size_t +#ifdef _WIN64 +__MINGW_EXTENSION typedef unsigned __int64 size_t; +#else +typedef unsigned int size_t; +#endif /* _WIN64 */ +#endif /* _SIZE_T_DEFINED */ + +#ifndef _SSIZE_T_DEFINED +#define _SSIZE_T_DEFINED +#undef ssize_t +#ifdef _WIN64 +__MINGW_EXTENSION typedef __int64 ssize_t; +#else +typedef int ssize_t; +#endif /* _WIN64 */ +#endif /* _SSIZE_T_DEFINED */ + +#ifndef _RSIZE_T_DEFINED +typedef size_t rsize_t; +#define _RSIZE_T_DEFINED +#endif + +#ifndef _INTPTR_T_DEFINED +#define _INTPTR_T_DEFINED +#ifndef __intptr_t_defined +#define __intptr_t_defined +#undef intptr_t +#ifdef _WIN64 +__MINGW_EXTENSION typedef __int64 intptr_t; +#else +typedef int intptr_t; +#endif /* _WIN64 */ +#endif /* __intptr_t_defined */ +#endif /* _INTPTR_T_DEFINED */ + +#ifndef _UINTPTR_T_DEFINED +#define _UINTPTR_T_DEFINED +#ifndef __uintptr_t_defined +#define __uintptr_t_defined +#undef uintptr_t +#ifdef _WIN64 +__MINGW_EXTENSION typedef unsigned __int64 uintptr_t; +#else +typedef unsigned int uintptr_t; +#endif /* _WIN64 */ +#endif /* __uintptr_t_defined */ +#endif /* _UINTPTR_T_DEFINED */ + +#ifndef _PTRDIFF_T_DEFINED +#define _PTRDIFF_T_DEFINED +#ifndef _PTRDIFF_T_ +#define _PTRDIFF_T_ +#undef ptrdiff_t +#ifdef _WIN64 +__MINGW_EXTENSION typedef __int64 ptrdiff_t; +#else +typedef int ptrdiff_t; +#endif /* _WIN64 */ +#endif /* _PTRDIFF_T_ */ +#endif /* _PTRDIFF_T_DEFINED */ + +#ifndef _WCHAR_T_DEFINED +#define _WCHAR_T_DEFINED +#if !defined(__cplusplus) && !defined(__WIDL__) +typedef unsigned short wchar_t; +#endif /* C++ */ +#endif /* _WCHAR_T_DEFINED */ + +#ifndef _WCTYPE_T_DEFINED +#define _WCTYPE_T_DEFINED +#ifndef _WINT_T +#define _WINT_T +typedef unsigned short wint_t; +typedef unsigned short wctype_t; +#endif /* _WINT_T */ +#endif /* _WCTYPE_T_DEFINED */ + +#ifndef _ERRCODE_DEFINED +#define _ERRCODE_DEFINED +typedef int errno_t; +#endif + +#ifndef _TIME32_T_DEFINED +#define _TIME32_T_DEFINED +typedef long __time32_t; +#endif + +#ifndef _TIME64_T_DEFINED +#define _TIME64_T_DEFINED +__MINGW_EXTENSION typedef __int64 __time64_t; +#endif /* _TIME64_T_DEFINED */ + +#ifdef _USE_32BIT_TIME_T +#ifdef _WIN64 +#error You cannot use 32-bit time_t (_USE_32BIT_TIME_T) with _WIN64 +#undef _USE_32BIT_TIME_T +#endif +#endif /* _USE_32BIT_TIME_T */ + +#ifndef _TIME_T_DEFINED +#define _TIME_T_DEFINED +#ifdef _USE_32BIT_TIME_T +typedef __time32_t time_t; +#else +typedef __time64_t time_t; +#endif +#endif /* _TIME_T_DEFINED */ + +#ifndef _CRT_SECURE_CPP_NOTHROW +#define _CRT_SECURE_CPP_NOTHROW throw() +#endif + +#ifndef __CRTDECL +#if !defined(__cplusplus) && defined(__GNUC__) +#define __CRTDECL __cdecl __attribute__ ((__unused__)) +#else +#define __CRTDECL __cdecl +#endif +#endif + +#if defined(__cplusplus) && _CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES + +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(__ret,__func,__dsttype,__dst) \ + extern "C++" { \ + template \ + inline __ret __cdecl __func(__dsttype (&__dst)[__size]) { \ + return __func(__dst,__size); \ + } \ + } + +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(__ret,__func,__dsttype,__dst,__type1,__arg1) \ + extern "C++" {\ + template \ + inline __ret __cdecl __func(__dsttype (&__dst)[__size], __type1 __arg1) { \ + return __func(__dst,__size,__arg1); \ + }\ + } + +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2(__ret,__func,__dsttype,__dst,__type1,__arg1,__type2,__arg2)\ + extern "C++" {\ + template inline\ + __ret __cdecl __func(__dsttype (&__dst)[__size], __type1 __arg1, __type2 __arg2) { \ + return __func(__dst,__size,__arg1,__arg2); \ + }\ + } + +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_3(__ret,__func,__dsttype,__dst,__type1,__arg1,__type2,__arg2,__type3,__arg3) \ + extern "C++" { \ + template inline \ + __ret __cdecl __func(__dsttype (&__dst)[__size], __type1 __arg1, __type2 __arg2, __type3 __arg3) { \ + return __func(__dst,__size,__arg1,__arg2,__arg3); \ + }\ + } + +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_4(__ret,__func,__dsttype,__dst,__type1,__arg1,__type2,__arg2,__type3,__arg3,__type4,__arg4) \ + extern "C++" { \ + template inline \ + __ret __cdecl __func(__dsttype (&__dst)[__size], __type1 __arg1, __type2 __arg2, __type3 __arg3, __type4 __arg4) { \ + return __func(__dst,__size,__arg1,__arg2,__arg3,__arg4); \ + }\ + } + +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(__ret,__func,__type0,__arg0,__dsttype,__dst,__type1,__arg1) \ + extern "C++" { \ + template inline \ + __ret __cdecl __func(__type0 __arg0, __dsttype (&__dst)[__size], __type1 __arg1) { \ + return __func(__arg0, __dst, __size, __arg1); \ + } \ + } + +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_2(__ret,__func,__type0,__arg0,__dsttype,__dst,__type1,__arg1,__type2,__arg2) \ + extern "C++" { \ + template inline \ + __ret __cdecl __func(__type0 __arg0, __dsttype (&__dst)[__size], __type1 __arg1, __type2 __arg2) { \ + return __func(__arg0, __dst, __size, __arg1, __arg2); \ + } \ + } + +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_3(__ret,__func,__type0,__arg0,__dsttype,__dst,__type1,__arg1,__type2,__arg2,__type3,__arg3) \ + extern "C++" { \ + template inline \ + __ret __cdecl __func(__type0 __arg0, __dsttype (&__dst)[__size], __type1 __arg1, __type2 __arg2, __type3 __arg3) { \ + return __func(__arg0, __dst, __size, __arg1, __arg2, __arg3); \ + } \ + } + +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_2_0(__ret,__func,__type1,__arg1,__type2,__arg2,__dsttype,__dst) \ + extern "C++" { \ + template inline \ + __ret __cdecl __func(__type1 __arg1, __type2 __arg2, __dsttype (&__dst)[__size]) { \ + return __func(__arg1, __arg2, __dst, __size); \ + } \ + } + +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1_ARGLIST(__ret,__func,__vfunc,__dsttype,__dst,__type1,__arg1) \ + extern "C++" {\ + template \ + inline __ret __cdecl __func(__dsttype (&__dst)[__size], __type1 __arg1, ...) { \ + va_list __vaargs; \ + _crt_va_start(__vaargs, __arg1); \ + __ret __retval = __vfunc(__dst,__size,__arg1,__vaargs); \ + _crt_va_end(__vaargs); \ + return __retval; \ + }\ + } + +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2_ARGLIST(__ret,__func,__vfunc,__dsttype,__dst,__type1,__arg1,__type2,__arg2) \ + extern "C++" {\ + template \ + inline __ret __cdecl __func(__dsttype (&__dst)[__size], __type1 __arg1, __type2 __arg2, ...) { \ + va_list __vaargs; \ + _crt_va_start(__vaargs, __arg2); \ + __ret __retval = __vfunc(__dst,__size,__arg1,__arg2,__vaargs); \ + _crt_va_end(__vaargs); \ + return __retval; \ + }\ + } + +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_SPLITPATH(__ret,__func,__dsttype,__src) \ + extern "C++" { \ + template inline \ + __ret __cdecl __func(const __dsttype *__src, __dsttype (&__drive)[__drive_size], __dsttype (&__dir)[__dir_size], __dsttype (&__name)[__name_size], __dsttype (&__ext)[__ext_size]) { \ + return __func(__src, __drive, __drive_size, __dir, __dir_size, __name, __name_size, __ext, __ext_size); \ + } \ + } + +#else + +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(__ret,__func,__dsttype,__dst) +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(__ret,__func,__dsttype,__dst,__type1,__arg1) +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2(__ret,__func,__dsttype,__dst,__type1,__arg1,__type2,__arg2) +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_3(__ret,__func,__dsttype,__dst,__type1,__arg1,__type2,__arg2,__type3,__arg3) +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_4(__ret,__func,__dsttype,__dst,__type1,__arg1,__type2,__arg2,__type3,__arg3,__type4,__arg4) +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(__ret,__func,__type0,__arg0,__dsttype,__dst,__type1,__arg1) +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_2(__ret,__func,__type0,__arg0,__dsttype,__dst,__type1,__arg1,__type2,__arg2) +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_3(__ret,__func,__type0,__arg0,__dsttype,__dst,__type1,__arg1,__type2,__arg2,__type3,__arg3) +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_2_0(__ret,__func,__type1,__arg1,__type2,__arg2,__dsttype,__dst) +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1_ARGLIST(__ret,__func,__vfunc,__dsttype,__dst,__type1,__arg1) +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2_ARGLIST(__ret,__func,__vfunc,__dsttype,__dst,__type1,__arg1,__type2,__arg2) +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_SPLITPATH(__ret,__func,__dsttype,__src) + +#endif + +#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0(__ret_type, __ret_policy, __decl_spec, __name, __dst_attr, __dst_type, __dst) \ + __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0_EX(__ret_type, __ret_policy, __decl_spec, __func_name, __func_name##_s, __dst_attr, __dst_type, __dst) +#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1(__ret_type, __ret_policy, __decl_spec, __name, __dst_attr, __dst_type, __dst, __arg1_type, __arg1) \ + __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2_EX(__ret_type, __ret_policy, __decl_spec, __func_name, __func_name##_s, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2) +#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2(__ret_type, __ret_policy, __decl_spec, __name, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2) \ + __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2_EX(__ret_type, __ret_policy, __decl_spec, __func_name, __func_name##_s, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2) +#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_3(__ret_type, __ret_policy, __decl_spec, __name, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2, __arg3_type, __arg3) \ + __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_3_EX(__ret_type, __ret_policy, __decl_spec, __func_name, __func_name##_s, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2, __arg3_type, __arg3) +#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_4(__ret_type, __ret_policy, __decl_spec, __name, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2, __arg3_type, __arg3, __arg4_type, __arg4) \ + __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_4_EX(__ret_type, __ret_policy, __decl_spec, __func_name, __func_name##_s, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2, __arg3_type, __arg3, __arg4_type, __arg4) + +#if defined(__cplusplus) && _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES + +#define __RETURN_POLICY_SAME(__func_call, __dst) return (__func_call) +#define __RETURN_POLICY_DST(__func_call, __dst) return ((__func_call) == 0 ? __dst : 0) +#define __RETURN_POLICY_VOID(__func_call, __dst) (__func_call); return +#define __EMPTY_DECLSPEC + +#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0_EX(__ret_type, __ret_policy, __decl_spec, __name, __sec_name, __dst_attr, __dst_type, __dst) \ + __inline __ret_type __CRTDECL __insecure_##__name(__dst_attr __dst_type *__dst) \ + { \ + __decl_spec __ret_type __cdecl __name(__dst_type *__dst); \ + return __name(__dst); \ + } \ + extern "C++" { \ + template \ + inline __ret_type __CRTDECL __name(_T &__dst) _CRT_SECURE_CPP_NOTHROW { \ + return __insecure_##__name(static_cast<__dst_type*>(__dst)); \ + } \ + template \ + inline __ret_type __CRTDECL __name(const _T &__dst) _CRT_SECURE_CPP_NOTHROW { \ + return __insecure_##__name(static_cast<__dst_type *>(__dst)); \ + } \ + template <> \ + inline __ret_type __CRTDECL __name(__dst_type *&__dst) _CRT_SECURE_CPP_NOTHROW { \ + return __insecure_##__name(__dst); \ + } \ + template \ + inline __ret_type __CRTDECL __name(__dst_type (&__dst)[__size]) _CRT_SECURE_CPP_NOTHROW { \ + __ret_policy(__sec_name(__dst, __size), __dst); \ + } \ + } + +#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2_EX(__ret_type, __ret_policy, __decl_spec, __name, __sec_name, __sec_dst_type, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2) \ + __inline __ret_type __CRTDECL __insecure_##__name(__dst_attr __dst_type *__dst, __arg1_type __arg1, __arg2_type __arg2) \ + { \ + __decl_spec __ret_type __cdecl __name(__dst_type *__dst, __arg1_type, __arg2_type); \ + return __name(__dst, __arg1, __arg2); \ + } \ + extern "C++" { \ + template \ + inline __ret_type __CRTDECL __name(_T &__dst, __arg1_type __arg1, __arg2_type __arg2) _CRT_SECURE_CPP_NOTHROW { \ + return __insecure_##__name(static_cast<__dst_type*>(__dst), __arg1, __arg2); \ + } \ + template \ + inline __ret_type __CRTDECL __name(const _T &__dst, __arg1_type __arg1, __arg2_type __arg2) _CRT_SECURE_CPP_NOTHROW { \ + return __insecure_##__name(static_cast<__dst_type *>(__dst), __arg1, __arg2); \ + } \ + template <> \ + inline __ret_type __CRTDECL __name(__dst_type *&__dst, __arg1_type __arg1, __arg2_type __arg2) _CRT_SECURE_CPP_NOTHROW { \ + return __insecure_##__name(__dst, __arg1, __arg2); \ + } \ + template \ + inline __ret_type __CRTDECL __name(__sec_dst_type (&__dst)[__size], __arg1_type __arg1, __arg2_type __arg2) _CRT_SECURE_CPP_NOTHROW { \ + __ret_policy(__sec_name(__dst, __size), __dst); \ + } \ + } + +#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1_EX(__ret_type, __ret_policy, __decl_spec, __name, __sec_name, __sec_dst_type, __dst_attr, __dst_type, __dst, __arg1_type, __arg1) \ + __inline __ret_type __CRTDECL __insecure_##__name(__dst_attr __dst_type *__dst, __arg1_type __arg1) \ + { \ + __decl_spec __ret_type __cdecl __name(__dst_type *__dst, __arg1_type); \ + return __name(__dst, __arg1); \ + } \ + extern "C++" { \ + template \ + inline __ret_type __CRTDECL __name(_T &__dst, __arg1_type __arg1) _CRT_SECURE_CPP_NOTHROW { \ + return __insecure_##__name(static_cast<__dst_type*>(__dst), __arg1); \ + } \ + template \ + inline __ret_type __CRTDECL __name(const _T &__dst, __arg1_type __arg1) _CRT_SECURE_CPP_NOTHROW { \ + return __insecure_##__name(static_cast<__dst_type *>(__dst), __arg1); \ + } \ + template <> \ + inline __ret_type __CRTDECL __name(__dst_type *&__dst, __arg1_type __arg1) _CRT_SECURE_CPP_NOTHROW { \ + return __insecure_##__name(__dst, __arg1); \ + } \ + template \ + inline __ret_type __CRTDECL __name(__sec_dst_type (&__dst)[__size], __arg1_type __arg1) _CRT_SECURE_CPP_NOTHROW { \ + __ret_policy(__sec_name(__dst, __size), __dst); \ + } \ + } + +#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_3_EX(__ret_type, __ret_policy, __decl_spec, __name, __sec_name, __sec_dst_type, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2, __arg3_type, __arg3) \ + __inline __ret_type __CRTDECL __insecure_##__name(__dst_attr __dst_type *__dst, __arg1_type __arg1, __arg2_type __arg2, __arg3_type __arg3) \ + { \ + __decl_spec __ret_type __cdecl __name(__dst_type *__dst, __arg1_type, __arg2_type, __arg3_type); \ + return __name(__dst, __arg1, __arg2, __arg3); \ + } \ + extern "C++" { \ + template \ + inline __ret_type __CRTDECL __name(_T &__dst, __arg1_type __arg1, __arg2_type __arg2, __arg3_type __arg3) _CRT_SECURE_CPP_NOTHROW { \ + return __insecure_##__name(static_cast<__dst_type*>(__dst), __arg1, __arg2, __arg3); \ + } \ + template \ + inline __ret_type __CRTDECL __name(const _T &__dst, __arg1_type __arg1, __arg2_type __arg2, __arg3_type __arg3) _CRT_SECURE_CPP_NOTHROW { \ + return __insecure_##__name(static_cast<__dst_type *>(__dst), __arg1, __arg2, __arg3); \ + } \ + template <> \ + inline __ret_type __CRTDECL __name(__dst_type *&__dst, __arg1_type __arg1, __arg2_type __arg2, __arg3_type __arg3) _CRT_SECURE_CPP_NOTHROW { \ + return __insecure_##__name(__dst, __arg1, __arg2, __arg3); \ + } \ + template \ + inline __ret_type __CRTDECL __name(__sec_dst_type (&__dst)[__size], __arg1_type __arg1, __arg2_type __arg2, __arg3_type __arg3) _CRT_SECURE_CPP_NOTHROW { \ + __ret_policy(__sec_name(__dst, __size), __dst); \ + } \ + } + +#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_4_EX(__ret_type, __ret_policy, __decl_spec, __name, __sec_name, __sec_dst_type, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2, __arg3_type, __arg3, __arg4_type, __arg4) \ + __inline __ret_type __CRTDECL __insecure_##__name(__dst_attr __dst_type *__dst, __arg1_type __arg1, __arg2_type __arg2, __arg3_type __arg3, __arg4_type __arg4) \ + { \ + __decl_spec __ret_type __cdecl __name(__dst_type *__dst, __arg1_type, __arg2_type, __arg3_type, __arg4_type); \ + return __name(__dst, __arg1, __arg2, __arg3, __arg4); \ + } \ + extern "C++" { \ + template \ + inline __ret_type __CRTDECL __name(_T &__dst, __arg1_type __arg1, __arg2_type __arg2, __arg3_type __arg3, __arg4_type __arg4) _CRT_SECURE_CPP_NOTHROW { \ + return __insecure_##__name(static_cast<__dst_type*>(__dst), __arg1, __arg2, __arg3, __arg4); \ + } \ + template \ + inline __ret_type __CRTDECL __name(const _T &__dst, __arg1_type __arg1, __arg2_type __arg2, __arg3_type __arg3, __arg4_type __arg4) _CRT_SECURE_CPP_NOTHROW { \ + return __insecure_##__name(static_cast<__dst_type *>(__dst), __arg1, __arg2, __arg3, __arg4); \ + } \ + template <> \ + inline __ret_type __CRTDECL __name(__dst_type *&__dst, __arg1_type __arg1, __arg2_type __arg2, __arg3_type __arg3, __arg4_type __arg4) _CRT_SECURE_CPP_NOTHROW { \ + return __insecure_##__name(__dst, __arg1, __arg2, __arg3, __arg4); \ + } \ + template \ + inline __ret_type __CRTDECL __name(__sec_dst_type (&__dst)[__size], __arg1_type __arg1, __arg2_type __arg2, __arg3_type __arg3, __arg4_type __arg4) _CRT_SECURE_CPP_NOTHROW { \ + __ret_policy(__sec_name(__dst, __size)); \ + } \ + } + +#else + +#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0_EX(__ret_type, __ret_policy, __decl_spec, __name, __sec_name, __dst_attr, __dst_type, __dst) +#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1_EX(__ret_type, __ret_policy, __decl_spec, __name, __sec_name, __dst_attr, __dst_type, __dst, __arg1_type, __arg1) +#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2_EX(__ret_type, __ret_policy, __decl_spec, __name, __sec_name, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2) +#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_3_EX(__ret_type, __ret_policy, __decl_spec, __name, __sec_name, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2, __arg3_type, __arg3) +#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_4_EX(__ret_type, __ret_policy, __decl_spec, __name, __sec_name, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2, __arg3_type, __arg3, __arg4_type, __arg4) + +#endif + +struct threadlocaleinfostruct; +struct threadmbcinfostruct; +typedef struct threadlocaleinfostruct *pthreadlocinfo; +typedef struct threadmbcinfostruct *pthreadmbcinfo; +struct __lc_time_data; + +typedef struct localeinfo_struct { + pthreadlocinfo locinfo; + pthreadmbcinfo mbcinfo; +} _locale_tstruct,*_locale_t; + +#ifndef _TAGLC_ID_DEFINED +#define _TAGLC_ID_DEFINED +typedef struct tagLC_ID { + unsigned short wLanguage; + unsigned short wCountry; + unsigned short wCodePage; +} LC_ID,*LPLC_ID; +#endif /* _TAGLC_ID_DEFINED */ + +#ifndef _THREADLOCALEINFO +#define _THREADLOCALEINFO +typedef struct threadlocaleinfostruct { +#ifdef _UCRT + const unsigned short *_locale_pctype; + int _locale_mb_cur_max; + unsigned int _locale_lc_codepage; +#else + int refcount; + unsigned int lc_codepage; + unsigned int lc_collate_cp; + unsigned long lc_handle[6]; + LC_ID lc_id[6]; + struct { + char *locale; + wchar_t *wlocale; + int *refcount; + int *wrefcount; + } lc_category[6]; + int lc_clike; + int mb_cur_max; + int *lconv_intl_refcount; + int *lconv_num_refcount; + int *lconv_mon_refcount; + struct lconv *lconv; + int *ctype1_refcount; + unsigned short *ctype1; + const unsigned short *pctype; + const unsigned char *pclmap; + const unsigned char *pcumap; + struct __lc_time_data *lc_time_curr; +#endif +} threadlocinfo; +#endif /* _THREADLOCALEINFO */ + +#ifndef __crt_typefix +#define __crt_typefix(ctype) +#endif + +#ifndef __WIDL__ +#pragma pack(pop) +#endif + +#endif /* _INC_CORECRT */ diff --git a/lib/libc/include/any-windows-any/corecrt_wstdlib.h b/lib/libc/include/any-windows-any/corecrt_wstdlib.h new file mode 100644 index 0000000000..6169c2d40a --- /dev/null +++ b/lib/libc/include/any-windows-any/corecrt_wstdlib.h @@ -0,0 +1,46 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ +#ifndef _INC_CORECRT_WSTDLIB +#define _INC_CORECRT_WSTDLIB + +#include + +#ifdef __cplusplus +extern "C" { +#endif + + _CRTIMP errno_t __cdecl _itow_s (int _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); + __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(errno_t,_itow_s,int,_Val,wchar_t,_DstBuf,int,_Radix) + + _CRTIMP errno_t __cdecl _ltow_s (long _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); + __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(errno_t,_ltow_s,long,_Val,wchar_t,_DstBuf,int,_Radix) + + _CRTIMP errno_t __cdecl _ultow_s (unsigned long _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); + __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(errno_t,_ultow_s,unsigned long,_Val,wchar_t,_DstBuf,int,_Radix) + + _CRTIMP errno_t __cdecl _wgetenv_s(size_t *_ReturnSize,wchar_t *_DstBuf,size_t _DstSizeInWords,const wchar_t *_VarName); + __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(errno_t,_wgetenv_s,size_t*,_ReturnSize,wchar_t,_DstBuf,const wchar_t*,_VarName) + + _CRTIMP errno_t __cdecl _wdupenv_s(wchar_t **_Buffer,size_t *_BufferSizeInWords,const wchar_t *_VarName); + _CRTIMP errno_t __cdecl _i64tow_s(__int64 _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); + _CRTIMP errno_t __cdecl _ui64tow_s(unsigned __int64 _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); + + _CRTIMP errno_t __cdecl _wmakepath_s(wchar_t *_PathResult,size_t _SizeInWords,const wchar_t *_Drive,const wchar_t *_Dir,const wchar_t *_Filename,const wchar_t *_Ext); + __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_4(errno_t,_wmakepath_s,wchar_t,_PathResult,const wchar_t*,_Drive,const wchar_t*,_Dir,const wchar_t*,_Filename,const wchar_t*,_Ext) + + _CRTIMP errno_t __cdecl _wputenv_s(const wchar_t *_Name,const wchar_t *_Value); + + _CRTIMP errno_t __cdecl _wsearchenv_s(const wchar_t *_Filename,const wchar_t *_EnvVar,wchar_t *_ResultPath,size_t _SizeInWords); + __DEFINE_CPP_OVERLOAD_SECURE_FUNC_2_0(errno_t,_wsearchenv_s,const wchar_t*,_Filename,const wchar_t*,_EnvVar,wchar_t,_ResultPath) + + _CRTIMP errno_t __cdecl _wsplitpath_s(const wchar_t *_FullPath,wchar_t *_Drive,size_t _DriveSizeInWords,wchar_t *_Dir,size_t _DirSizeInWords,wchar_t *_Filename,size_t _FilenameSizeInWords,wchar_t *_Ext,size_t _ExtSizeInWords); + __DEFINE_CPP_OVERLOAD_SECURE_FUNC_SPLITPATH(errno_t,_wsplitpath_s,wchar_t,_Dest) + +#ifdef __cplusplus +} +#endif +#endif /* _INC_CORECRT_WSTDLIB */ + diff --git a/lib/libc/include/any-windows-any/crtdefs.h b/lib/libc/include/any-windows-any/crtdefs.h index 20ba574c43..ef515a3db5 100644 --- a/lib/libc/include/any-windows-any/crtdefs.h +++ b/lib/libc/include/any-windows-any/crtdefs.h @@ -7,473 +7,6 @@ #ifndef _INC_CRTDEFS #define _INC_CRTDEFS -#include <_mingw.h> - -#ifndef __WIDL__ -#undef _CRT_PACKING -#define _CRT_PACKING 8 -#pragma pack(push,_CRT_PACKING) -#endif - -#ifdef __ERRCODE_DEFINED_MS -/* #define __ERRCODE_DEFINED_MS */ -typedef int errcode; -#endif - -#ifndef _CRTNOALIAS -#define _CRTNOALIAS -#endif - -#ifndef _CRTRESTRICT -#define _CRTRESTRICT -#endif - -#ifndef _SIZE_T_DEFINED -#define _SIZE_T_DEFINED -#undef size_t -#ifdef _WIN64 -__MINGW_EXTENSION typedef unsigned __int64 size_t; -#else -typedef unsigned int size_t; -#endif /* _WIN64 */ -#endif /* _SIZE_T_DEFINED */ - -#ifndef _SSIZE_T_DEFINED -#define _SSIZE_T_DEFINED -#undef ssize_t -#ifdef _WIN64 -__MINGW_EXTENSION typedef __int64 ssize_t; -#else -typedef int ssize_t; -#endif /* _WIN64 */ -#endif /* _SSIZE_T_DEFINED */ - -#ifndef _RSIZE_T_DEFINED -typedef size_t rsize_t; -#define _RSIZE_T_DEFINED -#endif - -#ifndef _INTPTR_T_DEFINED -#define _INTPTR_T_DEFINED -#ifndef __intptr_t_defined -#define __intptr_t_defined -#undef intptr_t -#ifdef _WIN64 -__MINGW_EXTENSION typedef __int64 intptr_t; -#else -typedef int intptr_t; -#endif /* _WIN64 */ -#endif /* __intptr_t_defined */ -#endif /* _INTPTR_T_DEFINED */ - -#ifndef _UINTPTR_T_DEFINED -#define _UINTPTR_T_DEFINED -#ifndef __uintptr_t_defined -#define __uintptr_t_defined -#undef uintptr_t -#ifdef _WIN64 -__MINGW_EXTENSION typedef unsigned __int64 uintptr_t; -#else -typedef unsigned int uintptr_t; -#endif /* _WIN64 */ -#endif /* __uintptr_t_defined */ -#endif /* _UINTPTR_T_DEFINED */ - -#ifndef _PTRDIFF_T_DEFINED -#define _PTRDIFF_T_DEFINED -#ifndef _PTRDIFF_T_ -#define _PTRDIFF_T_ -#undef ptrdiff_t -#ifdef _WIN64 -__MINGW_EXTENSION typedef __int64 ptrdiff_t; -#else -typedef int ptrdiff_t; -#endif /* _WIN64 */ -#endif /* _PTRDIFF_T_ */ -#endif /* _PTRDIFF_T_DEFINED */ - -#ifndef _WCHAR_T_DEFINED -#define _WCHAR_T_DEFINED -#if !defined(__cplusplus) && !defined(__WIDL__) -typedef unsigned short wchar_t; -#endif /* C++ */ -#endif /* _WCHAR_T_DEFINED */ - -#ifndef _WCTYPE_T_DEFINED -#define _WCTYPE_T_DEFINED -#ifndef _WINT_T -#define _WINT_T -typedef unsigned short wint_t; -typedef unsigned short wctype_t; -#endif /* _WINT_T */ -#endif /* _WCTYPE_T_DEFINED */ - -#ifndef _ERRCODE_DEFINED -#define _ERRCODE_DEFINED -typedef int errno_t; -#endif - -#ifndef _TIME32_T_DEFINED -#define _TIME32_T_DEFINED -typedef long __time32_t; -#endif - -#ifndef _TIME64_T_DEFINED -#define _TIME64_T_DEFINED -__MINGW_EXTENSION typedef __int64 __time64_t; -#endif /* _TIME64_T_DEFINED */ - -#ifdef _USE_32BIT_TIME_T -#ifdef _WIN64 -#error You cannot use 32-bit time_t (_USE_32BIT_TIME_T) with _WIN64 -#undef _USE_32BIT_TIME_T -#endif -#endif /* _USE_32BIT_TIME_T */ - -#ifndef _TIME_T_DEFINED -#define _TIME_T_DEFINED -#ifdef _USE_32BIT_TIME_T -typedef __time32_t time_t; -#else -typedef __time64_t time_t; -#endif -#endif /* _TIME_T_DEFINED */ - -#ifndef _CRT_SECURE_CPP_NOTHROW -#define _CRT_SECURE_CPP_NOTHROW throw() -#endif - -#if defined(__cplusplus) && _CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES - -#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(__ret,__func,__dsttype,__dst) \ - extern "C++" { \ - template \ - inline __ret __cdecl __func(__dsttype (&__dst)[__size]) { \ - return __func(__dst,__size); \ - } \ - } - -#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(__ret,__func,__dsttype,__dst,__type1,__arg1) \ - extern "C++" {\ - template \ - inline __ret __cdecl __func(__dsttype (&__dst)[__size], __type1 __arg1) { \ - return __func(__dst,__size,__arg1); \ - }\ - } - -#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2(__ret,__func,__dsttype,__dst,__type1,__arg1,__type2,__arg2)\ - extern "C++" {\ - template inline\ - __ret __cdecl __func(__dsttype (&__dst)[__size], __type1 __arg1, __type2 __arg2) { \ - return __func(__dst,__size,__arg1,__arg2); \ - }\ - } - -#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_3(__ret,__func,__dsttype,__dst,__type1,__arg1,__type2,__arg2,__type3,__arg3) \ - extern "C++" { \ - template inline \ - __ret __cdecl __func(__dsttype (&__dst)[__size], __type1 __arg1, __type2 __arg2, __type3 __arg3) { \ - return __func(__dst,__size,__arg1,__arg2,__arg3); \ - }\ - } - -#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_4(__ret,__func,__dsttype,__dst,__type1,__arg1,__type2,__arg2,__type3,__arg3,__type4,__arg4) \ - extern "C++" { \ - template inline \ - __ret __cdecl __func(__dsttype (&__dst)[__size], __type1 __arg1, __type2 __arg2, __type3 __arg3, __type4 __arg4) { \ - return __func(__dst,__size,__arg1,__arg2,__arg3,__arg4); \ - }\ - } - -#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(__ret,__func,__type0,__arg0,__dsttype,__dst,__type1,__arg1) \ - extern "C++" { \ - template inline \ - __ret __cdecl __func(__type0 __arg0, __dsttype (&__dst)[__size], __type1 __arg1) { \ - return __func(__arg0, __dst, __size, __arg1); \ - } \ - } - -#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_2(__ret,__func,__type0,__arg0,__dsttype,__dst,__type1,__arg1,__type2,__arg2) \ - extern "C++" { \ - template inline \ - __ret __cdecl __func(__type0 __arg0, __dsttype (&__dst)[__size], __type1 __arg1, __type2 __arg2) { \ - return __func(__arg0, __dst, __size, __arg1, __arg2); \ - } \ - } - -#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_3(__ret,__func,__type0,__arg0,__dsttype,__dst,__type1,__arg1,__type2,__arg2,__type3,__arg3) \ - extern "C++" { \ - template inline \ - __ret __cdecl __func(__type0 __arg0, __dsttype (&__dst)[__size], __type1 __arg1, __type2 __arg2, __type3 __arg3) { \ - return __func(__arg0, __dst, __size, __arg1, __arg2, __arg3); \ - } \ - } - -#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_2_0(__ret,__func,__type1,__arg1,__type2,__arg2,__dsttype,__dst) \ - extern "C++" { \ - template inline \ - __ret __cdecl __func(__type1 __arg1, __type2 __arg2, __dsttype (&__dst)[__size]) { \ - return __func(__arg1, __arg2, __dst, __size); \ - } \ - } - -#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1_ARGLIST(__ret,__func,__vfunc,__dsttype,__dst,__type1,__arg1) \ - extern "C++" {\ - template \ - inline __ret __cdecl __func(__dsttype (&__dst)[__size], __type1 __arg1, ...) { \ - va_list __vaargs; \ - _crt_va_start(__vaargs, __arg1); \ - __ret __retval = __vfunc(__dst,__size,__arg1,__vaargs); \ - _crt_va_end(__vaargs); \ - return __retval; \ - }\ - } - -#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2_ARGLIST(__ret,__func,__vfunc,__dsttype,__dst,__type1,__arg1,__type2,__arg2) \ - extern "C++" {\ - template \ - inline __ret __cdecl __func(__dsttype (&__dst)[__size], __type1 __arg1, __type2 __arg2, ...) { \ - va_list __vaargs; \ - _crt_va_start(__vaargs, __arg2); \ - __ret __retval = __vfunc(__dst,__size,__arg1,__arg2,__vaargs); \ - _crt_va_end(__vaargs); \ - return __retval; \ - }\ - } - -#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_SPLITPATH(__ret,__func,__dsttype,__src) \ - extern "C++" { \ - template inline \ - __ret __cdecl __func(const __dsttype *__src, __dsttype (&__drive)[__drive_size], __dsttype (&__dir)[__dir_size], __dsttype (&__name)[__name_size], __dsttype (&__ext)[__ext_size]) { \ - return __func(__src, __drive, __drive_size, __dir, __dir_size, __name, __name_size, __ext, __ext_size); \ - } \ - } - -#else - -#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(__ret,__func,__dsttype,__dst) -#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(__ret,__func,__dsttype,__dst,__type1,__arg1) -#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2(__ret,__func,__dsttype,__dst,__type1,__arg1,__type2,__arg2) -#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_3(__ret,__func,__dsttype,__dst,__type1,__arg1,__type2,__arg2,__type3,__arg3) -#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_4(__ret,__func,__dsttype,__dst,__type1,__arg1,__type2,__arg2,__type3,__arg3,__type4,__arg4) -#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(__ret,__func,__type0,__arg0,__dsttype,__dst,__type1,__arg1) -#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_2(__ret,__func,__type0,__arg0,__dsttype,__dst,__type1,__arg1,__type2,__arg2) -#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_3(__ret,__func,__type0,__arg0,__dsttype,__dst,__type1,__arg1,__type2,__arg2,__type3,__arg3) -#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_2_0(__ret,__func,__type1,__arg1,__type2,__arg2,__dsttype,__dst) -#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1_ARGLIST(__ret,__func,__vfunc,__dsttype,__dst,__type1,__arg1) -#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2_ARGLIST(__ret,__func,__vfunc,__dsttype,__dst,__type1,__arg1,__type2,__arg2) -#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_SPLITPATH(__ret,__func,__dsttype,__src) - -#endif - -#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0(__ret_type, __ret_policy, __decl_spec, __name, __dst_attr, __dst_type, __dst) \ - __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0_EX(__ret_type, __ret_policy, __decl_spec, __func_name, __func_name##_s, __dst_attr, __dst_type, __dst) -#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1(__ret_type, __ret_policy, __decl_spec, __name, __dst_attr, __dst_type, __dst, __arg1_type, __arg1) \ - __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2_EX(__ret_type, __ret_policy, __decl_spec, __func_name, __func_name##_s, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2) -#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2(__ret_type, __ret_policy, __decl_spec, __name, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2) \ - __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2_EX(__ret_type, __ret_policy, __decl_spec, __func_name, __func_name##_s, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2) -#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_3(__ret_type, __ret_policy, __decl_spec, __name, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2, __arg3_type, __arg3) \ - __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_3_EX(__ret_type, __ret_policy, __decl_spec, __func_name, __func_name##_s, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2, __arg3_type, __arg3) -#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_4(__ret_type, __ret_policy, __decl_spec, __name, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2, __arg3_type, __arg3, __arg4_type, __arg4) \ - __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_4_EX(__ret_type, __ret_policy, __decl_spec, __func_name, __func_name##_s, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2, __arg3_type, __arg3, __arg4_type, __arg4) - -#if defined(__cplusplus) && _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES - -#define __RETURN_POLICY_SAME(__func_call, __dst) return (__func_call) -#define __RETURN_POLICY_DST(__func_call, __dst) return ((__func_call) == 0 ? __dst : 0) -#define __RETURN_POLICY_VOID(__func_call, __dst) (__func_call); return -#define __EMPTY_DECLSPEC - -#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0_EX(__ret_type, __ret_policy, __decl_spec, __name, __sec_name, __dst_attr, __dst_type, __dst) \ - __inline __ret_type __CRTDECL __insecure_##__name(__dst_attr __dst_type *__dst) \ - { \ - __decl_spec __ret_type __cdecl __name(__dst_type *__dst); \ - return __name(__dst); \ - } \ - extern "C++" { \ - template \ - inline __ret_type __CRTDECL __name(_T &__dst) _CRT_SECURE_CPP_NOTHROW { \ - return __insecure_##__name(static_cast<__dst_type*>(__dst)); \ - } \ - template \ - inline __ret_type __CRTDECL __name(const _T &__dst) _CRT_SECURE_CPP_NOTHROW { \ - return __insecure_##__name(static_cast<__dst_type *>(__dst)); \ - } \ - template <> \ - inline __ret_type __CRTDECL __name(__dst_type *&__dst) _CRT_SECURE_CPP_NOTHROW { \ - return __insecure_##__name(__dst); \ - } \ - template \ - inline __ret_type __CRTDECL __name(__dst_type (&__dst)[__size]) _CRT_SECURE_CPP_NOTHROW { \ - __ret_policy(__sec_name(__dst, __size), __dst); \ - } \ - } - -#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2_EX(__ret_type, __ret_policy, __decl_spec, __name, __sec_name, __sec_dst_type, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2) \ - __inline __ret_type __CRTDECL __insecure_##__name(__dst_attr __dst_type *__dst, __arg1_type __arg1, __arg2_type __arg2) \ - { \ - __decl_spec __ret_type __cdecl __name(__dst_type *__dst, __arg1_type, __arg2_type); \ - return __name(__dst, __arg1, __arg2); \ - } \ - extern "C++" { \ - template \ - inline __ret_type __CRTDECL __name(_T &__dst, __arg1_type __arg1, __arg2_type __arg2) _CRT_SECURE_CPP_NOTHROW { \ - return __insecure_##__name(static_cast<__dst_type*>(__dst), __arg1, __arg2); \ - } \ - template \ - inline __ret_type __CRTDECL __name(const _T &__dst, __arg1_type __arg1, __arg2_type __arg2) _CRT_SECURE_CPP_NOTHROW { \ - return __insecure_##__name(static_cast<__dst_type *>(__dst), __arg1, __arg2); \ - } \ - template <> \ - inline __ret_type __CRTDECL __name(__dst_type *&__dst, __arg1_type __arg1, __arg2_type __arg2) _CRT_SECURE_CPP_NOTHROW { \ - return __insecure_##__name(__dst, __arg1, __arg2); \ - } \ - template \ - inline __ret_type __CRTDECL __name(__sec_dst_type (&__dst)[__size], __arg1_type __arg1, __arg2_type __arg2) _CRT_SECURE_CPP_NOTHROW { \ - __ret_policy(__sec_name(__dst, __size), __dst); \ - } \ - } - -#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1_EX(__ret_type, __ret_policy, __decl_spec, __name, __sec_name, __sec_dst_type, __dst_attr, __dst_type, __dst, __arg1_type, __arg1) \ - __inline __ret_type __CRTDECL __insecure_##__name(__dst_attr __dst_type *__dst, __arg1_type __arg1) \ - { \ - __decl_spec __ret_type __cdecl __name(__dst_type *__dst, __arg1_type); \ - return __name(__dst, __arg1); \ - } \ - extern "C++" { \ - template \ - inline __ret_type __CRTDECL __name(_T &__dst, __arg1_type __arg1) _CRT_SECURE_CPP_NOTHROW { \ - return __insecure_##__name(static_cast<__dst_type*>(__dst), __arg1); \ - } \ - template \ - inline __ret_type __CRTDECL __name(const _T &__dst, __arg1_type __arg1) _CRT_SECURE_CPP_NOTHROW { \ - return __insecure_##__name(static_cast<__dst_type *>(__dst), __arg1); \ - } \ - template <> \ - inline __ret_type __CRTDECL __name(__dst_type *&__dst, __arg1_type __arg1) _CRT_SECURE_CPP_NOTHROW { \ - return __insecure_##__name(__dst, __arg1); \ - } \ - template \ - inline __ret_type __CRTDECL __name(__sec_dst_type (&__dst)[__size], __arg1_type __arg1) _CRT_SECURE_CPP_NOTHROW { \ - __ret_policy(__sec_name(__dst, __size), __dst); \ - } \ - } - -#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_3_EX(__ret_type, __ret_policy, __decl_spec, __name, __sec_name, __sec_dst_type, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2, __arg3_type, __arg3) \ - __inline __ret_type __CRTDECL __insecure_##__name(__dst_attr __dst_type *__dst, __arg1_type __arg1, __arg2_type __arg2, __arg3_type __arg3) \ - { \ - __decl_spec __ret_type __cdecl __name(__dst_type *__dst, __arg1_type, __arg2_type, __arg3_type); \ - return __name(__dst, __arg1, __arg2, __arg3); \ - } \ - extern "C++" { \ - template \ - inline __ret_type __CRTDECL __name(_T &__dst, __arg1_type __arg1, __arg2_type __arg2, __arg3_type __arg3) _CRT_SECURE_CPP_NOTHROW { \ - return __insecure_##__name(static_cast<__dst_type*>(__dst), __arg1, __arg2, __arg3); \ - } \ - template \ - inline __ret_type __CRTDECL __name(const _T &__dst, __arg1_type __arg1, __arg2_type __arg2, __arg3_type __arg3) _CRT_SECURE_CPP_NOTHROW { \ - return __insecure_##__name(static_cast<__dst_type *>(__dst), __arg1, __arg2, __arg3); \ - } \ - template <> \ - inline __ret_type __CRTDECL __name(__dst_type *&__dst, __arg1_type __arg1, __arg2_type __arg2, __arg3_type __arg3) _CRT_SECURE_CPP_NOTHROW { \ - return __insecure_##__name(__dst, __arg1, __arg2, __arg3); \ - } \ - template \ - inline __ret_type __CRTDECL __name(__sec_dst_type (&__dst)[__size], __arg1_type __arg1, __arg2_type __arg2, __arg3_type __arg3) _CRT_SECURE_CPP_NOTHROW { \ - __ret_policy(__sec_name(__dst, __size), __dst); \ - } \ - } - -#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_4_EX(__ret_type, __ret_policy, __decl_spec, __name, __sec_name, __sec_dst_type, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2, __arg3_type, __arg3, __arg4_type, __arg4) \ - __inline __ret_type __CRTDECL __insecure_##__name(__dst_attr __dst_type *__dst, __arg1_type __arg1, __arg2_type __arg2, __arg3_type __arg3, __arg4_type __arg4) \ - { \ - __decl_spec __ret_type __cdecl __name(__dst_type *__dst, __arg1_type, __arg2_type, __arg3_type, __arg4_type); \ - return __name(__dst, __arg1, __arg2, __arg3, __arg4); \ - } \ - extern "C++" { \ - template \ - inline __ret_type __CRTDECL __name(_T &__dst, __arg1_type __arg1, __arg2_type __arg2, __arg3_type __arg3, __arg4_type __arg4) _CRT_SECURE_CPP_NOTHROW { \ - return __insecure_##__name(static_cast<__dst_type*>(__dst), __arg1, __arg2, __arg3, __arg4); \ - } \ - template \ - inline __ret_type __CRTDECL __name(const _T &__dst, __arg1_type __arg1, __arg2_type __arg2, __arg3_type __arg3, __arg4_type __arg4) _CRT_SECURE_CPP_NOTHROW { \ - return __insecure_##__name(static_cast<__dst_type *>(__dst), __arg1, __arg2, __arg3, __arg4); \ - } \ - template <> \ - inline __ret_type __CRTDECL __name(__dst_type *&__dst, __arg1_type __arg1, __arg2_type __arg2, __arg3_type __arg3, __arg4_type __arg4) _CRT_SECURE_CPP_NOTHROW { \ - return __insecure_##__name(__dst, __arg1, __arg2, __arg3, __arg4); \ - } \ - template \ - inline __ret_type __CRTDECL __name(__sec_dst_type (&__dst)[__size], __arg1_type __arg1, __arg2_type __arg2, __arg3_type __arg3, __arg4_type __arg4) _CRT_SECURE_CPP_NOTHROW { \ - __ret_policy(__sec_name(__dst, __size)); \ - } \ - } - -#else - -#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_0_EX(__ret_type, __ret_policy, __decl_spec, __name, __sec_name, __dst_attr, __dst_type, __dst) -#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_1_EX(__ret_type, __ret_policy, __decl_spec, __name, __sec_name, __dst_attr, __dst_type, __dst, __arg1_type, __arg1) -#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_2_EX(__ret_type, __ret_policy, __decl_spec, __name, __sec_name, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2) -#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_3_EX(__ret_type, __ret_policy, __decl_spec, __name, __sec_name, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2, __arg3_type, __arg3) -#define __DEFINE_CPP_OVERLOAD_STANDARD_FUNC_0_4_EX(__ret_type, __ret_policy, __decl_spec, __name, __sec_name, __dst_attr, __dst_type, __dst, __arg1_type, __arg1, __arg2_type, __arg2, __arg3_type, __arg3, __arg4_type, __arg4) - -#endif - -struct threadlocaleinfostruct; -struct threadmbcinfostruct; -typedef struct threadlocaleinfostruct *pthreadlocinfo; -typedef struct threadmbcinfostruct *pthreadmbcinfo; -struct __lc_time_data; - -typedef struct localeinfo_struct { - pthreadlocinfo locinfo; - pthreadmbcinfo mbcinfo; -} _locale_tstruct,*_locale_t; - -#ifndef _TAGLC_ID_DEFINED -#define _TAGLC_ID_DEFINED -typedef struct tagLC_ID { - unsigned short wLanguage; - unsigned short wCountry; - unsigned short wCodePage; -} LC_ID,*LPLC_ID; -#endif /* _TAGLC_ID_DEFINED */ - -#ifndef _THREADLOCALEINFO -#define _THREADLOCALEINFO -typedef struct threadlocaleinfostruct { - int refcount; - unsigned int lc_codepage; - unsigned int lc_collate_cp; - unsigned long lc_handle[6]; - LC_ID lc_id[6]; - struct { - char *locale; - wchar_t *wlocale; - int *refcount; - int *wrefcount; - } lc_category[6]; - int lc_clike; - int mb_cur_max; - int *lconv_intl_refcount; - int *lconv_num_refcount; - int *lconv_mon_refcount; - struct lconv *lconv; - int *ctype1_refcount; - unsigned short *ctype1; - const unsigned short *pctype; - const unsigned char *pclmap; - const unsigned char *pcumap; - struct __lc_time_data *lc_time_curr; -} threadlocinfo; -#endif /* _THREADLOCALEINFO */ - -#ifndef __crt_typefix -#define __crt_typefix(ctype) -#endif - -#ifndef __WIDL__ -#pragma pack(pop) -#endif +#include #endif /* _INC_CRTDEFS */ diff --git a/lib/libc/include/any-windows-any/ctfutb.h b/lib/libc/include/any-windows-any/ctfutb.h index 9ae0a54715..2885045132 100644 --- a/lib/libc/include/any-windows-any/ctfutb.h +++ b/lib/libc/include/any-windows-any/ctfutb.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/ctfutb.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from include/ctfutb.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/ctype.h b/lib/libc/include/any-windows-any/ctype.h index a85ad96065..9d0983366d 100644 --- a/lib/libc/include/any-windows-any/ctype.h +++ b/lib/libc/include/any-windows-any/ctype.h @@ -25,7 +25,7 @@ extern "C" { #ifdef _MSVCRT_ #define __pctype_func() (_pctype) #else -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT _CRTIMP unsigned short* __pctype_func(void); #else #define __pctype_func() (* __MINGW_IMP_SYMBOL(_pctype)) @@ -37,7 +37,7 @@ extern "C" { #ifdef _MSVCRT_ extern unsigned short *_pctype; #else -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT #define _pctype (__pctype_func()) #else extern unsigned short ** __MINGW_IMP_SYMBOL(_pctype); @@ -199,7 +199,7 @@ int __cdecl iswblank(wint_t _C); extern int __mb_cur_max; #define __mb_cur_max __mb_cur_max #else -#if __MSVCRT_VERSION__ < 0x1400 +#ifndef _UCRT extern int * __MINGW_IMP_SYMBOL(__mb_cur_max); #endif #define __mb_cur_max (___mb_cur_max_func()) @@ -209,8 +209,13 @@ _CRTIMP int __cdecl ___mb_cur_max_func(void); #endif #define __chvalidchk(a,b) (__PCTYPE_FUNC[(unsigned char)(a)] & (b)) +#ifdef _UCRT +#define _chvalidchk_l(_Char,_Flag,_Locale) (!_Locale ? __chvalidchk(_Char,_Flag) : ((_locale_t)_Locale)->locinfo->_locale_pctype[(unsigned char)(_Char)] & (_Flag)) +#define _ischartype_l(_Char,_Flag,_Locale) (((_Locale)!=NULL && (((_locale_t)(_Locale))->locinfo->_locale_mb_cur_max) > 1) ? _isctype_l(_Char,(_Flag),_Locale) : _chvalidchk_l(_Char,_Flag,_Locale)) +#else #define _chvalidchk_l(_Char,_Flag,_Locale) (!_Locale ? __chvalidchk(_Char,_Flag) : ((_locale_t)_Locale)->locinfo->pctype[(unsigned char)(_Char)] & (_Flag)) #define _ischartype_l(_Char,_Flag,_Locale) (((_Locale)!=NULL && (((_locale_t)(_Locale))->locinfo->mb_cur_max) > 1) ? _isctype_l(_Char,(_Flag),_Locale) : _chvalidchk_l(_Char,_Flag,_Locale)) +#endif #define _isalpha_l(_Char,_Locale) _ischartype_l(_Char,_ALPHA,_Locale) #define _isupper_l(_Char,_Locale) _ischartype_l(_Char,_UPPER,_Locale) #define _islower_l(_Char,_Locale) _ischartype_l(_Char,_LOWER,_Locale) diff --git a/lib/libc/include/any-windows-any/d2d1.h b/lib/libc/include/any-windows-any/d2d1.h index ea8a032916..765c68090b 100644 --- a/lib/libc/include/any-windows-any/d2d1.h +++ b/lib/libc/include/any-windows-any/d2d1.h @@ -190,21 +190,24 @@ typedef struct IDWriteTextLayout IDWriteTextLayout; typedef struct IDWriteFontFace IDWriteFontFace; #endif -typedef enum _D2D1_ALPHA_MODE { +typedef enum D2D1_ALPHA_MODE { D2D1_ALPHA_MODE_UNKNOWN = 0, D2D1_ALPHA_MODE_PREMULTIPLIED = 1, D2D1_ALPHA_MODE_STRAIGHT = 2, - D2D1_ALPHA_MODE_IGNORE = 3 + D2D1_ALPHA_MODE_IGNORE = 3, + D2D1_ALPHA_MODE_FORCE_DWORD = 0xffffffff } D2D1_ALPHA_MODE; -typedef enum _D2D1_ANTIALIAS_MODE { +typedef enum D2D1_ANTIALIAS_MODE { D2D1_ANTIALIAS_MODE_PER_PRIMITIVE = 0, - D2D1_ANTIALIAS_MODE_ALIASED = 1 + D2D1_ANTIALIAS_MODE_ALIASED = 1, + D2D1_ANTIALIAS_MODE_FORCE_DWORD = 0xffffffff } D2D1_ANTIALIAS_MODE; -typedef enum _D2D1_ARC_SIZE { - D2D1_ARC_SIZE_SMALL = 0, - D2D1_ARC_SIZE_LARGE = 1 +typedef enum D2D1_ARC_SIZE { + D2D1_ARC_SIZE_SMALL = 0, + D2D1_ARC_SIZE_LARGE = 1, + D2D1_ARC_SIZE_FORCE_DWORD = 0xffffffff } D2D1_ARC_SIZE; enum { @@ -218,164 +221,193 @@ enum { D2D1_INTERPOLATION_MODE_DEFINITION_MIPMAP_LINEAR = 7 }; -typedef enum _D2D1_BITMAP_INTERPOLATION_MODE { +typedef enum D2D1_BITMAP_INTERPOLATION_MODE { D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR = 0, - D2D1_BITMAP_INTERPOLATION_MODE_LINEAR = 1 + D2D1_BITMAP_INTERPOLATION_MODE_LINEAR = 1, + D2D1_BITMAP_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff } D2D1_BITMAP_INTERPOLATION_MODE; -typedef enum _D2D1_CAP_STYLE { - D2D1_CAP_STYLE_FLAT = 0, - D2D1_CAP_STYLE_SQUARE = 1, - D2D1_CAP_STYLE_ROUND = 2, - D2D1_CAP_STYLE_TRIANGLE = 3 +typedef enum D2D1_CAP_STYLE { + D2D1_CAP_STYLE_FLAT = 0, + D2D1_CAP_STYLE_SQUARE = 1, + D2D1_CAP_STYLE_ROUND = 2, + D2D1_CAP_STYLE_TRIANGLE = 3, + D2D1_CAP_STYLE_FORCE_DWORD = 0xffffffff } D2D1_CAP_STYLE; -typedef enum _D2D1_COMBINE_MODE { +typedef enum D2D1_COMBINE_MODE { D2D1_COMBINE_MODE_UNION = 0, D2D1_COMBINE_MODE_INTERSECT = 1, D2D1_COMBINE_MODE_XOR = 2, - D2D1_COMBINE_MODE_EXCLUDE = 3 + D2D1_COMBINE_MODE_EXCLUDE = 3, + D2D1_COMBINE_MODE_FORCE_DWORD = 0xffffffff } D2D1_COMBINE_MODE; -typedef enum _D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS { +typedef enum D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS { D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE = 0x00000000, - D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_GDI_COMPATIBLE = 0x00000001 + D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_GDI_COMPATIBLE = 0x00000001, + D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_FORCE_DWORD = 0xffffffff } D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS; -typedef enum _D2D1_DASH_STYLE { +typedef enum D2D1_DASH_STYLE { D2D1_DASH_STYLE_SOLID = 0, D2D1_DASH_STYLE_DASH = 1, D2D1_DASH_STYLE_DOT = 2, D2D1_DASH_STYLE_DASH_DOT = 3, D2D1_DASH_STYLE_DASH_DOT_DOT = 4, - D2D1_DASH_STYLE_CUSTOM = 5 + D2D1_DASH_STYLE_CUSTOM = 5, + D2D1_DASH_STYLE_FORCE_DWORD = 0xffffffff } D2D1_DASH_STYLE; -typedef enum _D2D1_DC_INITIALIZE_MODE { - D2D1_DC_INITIALIZE_MODE_COPY = 0, - D2D1_DC_INITIALIZE_MODE_CLEAR = 1 +typedef enum D2D1_DC_INITIALIZE_MODE { + D2D1_DC_INITIALIZE_MODE_COPY = 0, + D2D1_DC_INITIALIZE_MODE_CLEAR = 1, + D2D1_DC_INITIALIZE_MODE_FORCE_DWORD = 0xffffffff } D2D1_DC_INITIALIZE_MODE; -typedef enum _D2D1_DEBUG_LEVEL { +typedef enum D2D1_DEBUG_LEVEL { D2D1_DEBUG_LEVEL_NONE = 0, D2D1_DEBUG_LEVEL_ERROR = 1, D2D1_DEBUG_LEVEL_WARNING = 2, - D2D1_DEBUG_LEVEL_INFORMATION = 3 + D2D1_DEBUG_LEVEL_INFORMATION = 3, + D2D1_DEBUG_LEVEL_FORCE_DWORD = 0xffffffff } D2D1_DEBUG_LEVEL; -typedef enum _D2D1_DRAW_TEXT_OPTIONS { - D2D1_DRAW_TEXT_OPTIONS_NO_SNAP = 0x00000001, - D2D1_DRAW_TEXT_OPTIONS_CLIP = 0x00000002, - D2D1_DRAW_TEXT_OPTIONS_NONE = 0x00000000 +typedef enum D2D1_DRAW_TEXT_OPTIONS { + D2D1_DRAW_TEXT_OPTIONS_NO_SNAP = 0x00000001, + D2D1_DRAW_TEXT_OPTIONS_CLIP = 0x00000002, + D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT = 0x00000004, + D2D1_DRAW_TEXT_OPTIONS_DISABLE_COLOR_BITMAP_SNAPPING = 0x00000008, + D2D1_DRAW_TEXT_OPTIONS_NONE = 0x00000000, + D2D1_DRAW_TEXT_OPTIONS_FORCE_DWORD = 0xffffffff } D2D1_DRAW_TEXT_OPTIONS; -typedef enum _D2D1_EXTEND_MODE { - D2D1_EXTEND_MODE_CLAMP = 0, - D2D1_EXTEND_MODE_WRAP = 1, - D2D1_EXTEND_MODE_MIRROR = 2 +typedef enum D2D1_EXTEND_MODE { + D2D1_EXTEND_MODE_CLAMP = 0, + D2D1_EXTEND_MODE_WRAP = 1, + D2D1_EXTEND_MODE_MIRROR = 2, + D2D1_EXTEND_MODE_FORCE_DWORD = 0xffffffff } D2D1_EXTEND_MODE; -typedef enum _D2D1_FACTORY_TYPE { +typedef enum D2D1_FACTORY_TYPE { D2D1_FACTORY_TYPE_SINGLE_THREADED = 0, - D2D1_FACTORY_TYPE_MULTI_THREADED = 1 + D2D1_FACTORY_TYPE_MULTI_THREADED = 1, + D2D1_FACTORY_TYPE_FORCE_DWORD = 0xffffffff } D2D1_FACTORY_TYPE; -typedef enum _D2D1_FEATURE_LEVEL { - D2D1_FEATURE_LEVEL_DEFAULT = 0, - D2D1_FEATURE_LEVEL_9 = D3D10_FEATURE_LEVEL_9_1, - D2D1_FEATURE_LEVEL_10 = D3D10_FEATURE_LEVEL_10_0 +typedef enum D2D1_FEATURE_LEVEL { + D2D1_FEATURE_LEVEL_DEFAULT = 0, + D2D1_FEATURE_LEVEL_9 = D3D10_FEATURE_LEVEL_9_1, + D2D1_FEATURE_LEVEL_10 = D3D10_FEATURE_LEVEL_10_0, + D2D1_FEATURE_LEVEL_FORCE_DWORD = 0xffffffff } D2D1_FEATURE_LEVEL; -typedef enum _D2D1_FIGURE_BEGIN { - D2D1_FIGURE_BEGIN_FILLED = 0, - D2D1_FIGURE_BEGIN_HOLLOW = 1 +typedef enum D2D1_FIGURE_BEGIN { + D2D1_FIGURE_BEGIN_FILLED = 0, + D2D1_FIGURE_BEGIN_HOLLOW = 1, + D2D1_FIGURE_BEGIN_FORCE_DWORD = 0xffffffff } D2D1_FIGURE_BEGIN; -typedef enum _D2D1_FIGURE_END { - D2D1_FIGURE_END_OPEN = 0, - D2D1_FIGURE_END_CLOSED = 1 +typedef enum D2D1_FIGURE_END { + D2D1_FIGURE_END_OPEN = 0, + D2D1_FIGURE_END_CLOSED = 1, + D2D1_FIGURE_END_FORCE_DWORD = 0xffffffff } D2D1_FIGURE_END; -typedef enum _D2D1_FILL_MODE { +typedef enum D2D1_FILL_MODE { D2D1_FILL_MODE_ALTERNATE = 0, - D2D1_FILL_MODE_WINDING = 1 + D2D1_FILL_MODE_WINDING = 1, + D2D1_FILL_MODE_FORCE_DWORD = 0xffffffff } D2D1_FILL_MODE; -typedef enum _D2D1_GAMMA { - D2D1_GAMMA_2_2 = 0, - D2D1_GAMMA_1_0 = 1 +typedef enum D2D1_GAMMA { + D2D1_GAMMA_2_2 = 0, + D2D1_GAMMA_1_0 = 1, + D2D1_GAMMA_FORCE_DWORD = 0xffffffff } D2D1_GAMMA; -typedef enum _D2D1_GEOMETRY_RELATION { +typedef enum D2D1_GEOMETRY_RELATION { D2D1_GEOMETRY_RELATION_UNKNOWN = 0, D2D1_GEOMETRY_RELATION_DISJOINT = 1, D2D1_GEOMETRY_RELATION_IS_CONTAINED = 2, D2D1_GEOMETRY_RELATION_CONTAINS = 3, - D2D1_GEOMETRY_RELATION_OVERLAP = 4 + D2D1_GEOMETRY_RELATION_OVERLAP = 4, + D2D1_GEOMETRY_RELATION_FORCE_DWORD = 0xffffffff } D2D1_GEOMETRY_RELATION; -typedef enum _D2D1_GEOMETRY_SIMPLIFICATION_OPTION { +typedef enum D2D1_GEOMETRY_SIMPLIFICATION_OPTION { D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES = 0, - D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES = 1 + D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES = 1, + D2D1_GEOMETRY_SIMPLIFICATION_OPTION_FORCE_DWORD = 0xffffffff } D2D1_GEOMETRY_SIMPLIFICATION_OPTION; -typedef enum _D2D1_LAYER_OPTIONS { +typedef enum D2D1_LAYER_OPTIONS { D2D1_LAYER_OPTIONS_NONE = 0x00000000, - D2D1_LAYER_OPTIONS_INITIALIZE_FOR_CLEARTYPE = 0x00000001 + D2D1_LAYER_OPTIONS_INITIALIZE_FOR_CLEARTYPE = 0x00000001, + D2D1_LAYER_OPTIONS_FORCE_DWORD = 0xffffffff } D2D1_LAYER_OPTIONS; -typedef enum _D2D1_LINE_JOIN { +typedef enum D2D1_LINE_JOIN { D2D1_LINE_JOIN_MITER = 0, D2D1_LINE_JOIN_BEVEL = 1, D2D1_LINE_JOIN_ROUND = 2, - D2D1_LINE_JOIN_MITER_OR_BEVEL = 3 + D2D1_LINE_JOIN_MITER_OR_BEVEL = 3, + D2D1_LINE_JOIN_FORCE_DWORD = 0xffffffff } D2D1_LINE_JOIN; -typedef enum _D2D1_OPACITY_MASK_CONTENT { +typedef enum D2D1_OPACITY_MASK_CONTENT { D2D1_OPACITY_MASK_CONTENT_GRAPHICS = 0, D2D1_OPACITY_MASK_CONTENT_TEXT_NATURAL = 1, - D2D1_OPACITY_MASK_CONTENT_TEXT_GDI_COMPATIBLE = 2 + D2D1_OPACITY_MASK_CONTENT_TEXT_GDI_COMPATIBLE = 2, + D2D1_OPACITY_MASK_CONTENT_FORCE_DWORD = 0xffffffff } D2D1_OPACITY_MASK_CONTENT; -typedef enum _D2D1_PATH_SEGMENT { +typedef enum D2D1_PATH_SEGMENT { D2D1_PATH_SEGMENT_NONE = 0x00000000, D2D1_PATH_SEGMENT_FORCE_UNSTROKED = 0x00000001, - D2D1_PATH_SEGMENT_FORCE_ROUND_LINE_JOIN = 0x00000002 + D2D1_PATH_SEGMENT_FORCE_ROUND_LINE_JOIN = 0x00000002, + D2D1_PATH_SEGMENT_FORCE_DWORD = 0xffffffff } D2D1_PATH_SEGMENT; -typedef enum _D2D1_PRESENT_OPTIONS { +typedef enum D2D1_PRESENT_OPTIONS { D2D1_PRESENT_OPTIONS_NONE = 0x00000000, D2D1_PRESENT_OPTIONS_RETAIN_CONTENTS = 0x00000001, - D2D1_PRESENT_OPTIONS_IMMEDIATELY = 0x00000002 + D2D1_PRESENT_OPTIONS_IMMEDIATELY = 0x00000002, + D2D1_PRESENT_OPTIONS_FORCE_DWORD = 0xffffffff } D2D1_PRESENT_OPTIONS; -typedef enum _D2D1_RENDER_TARGET_TYPE { +typedef enum D2D1_RENDER_TARGET_TYPE { D2D1_RENDER_TARGET_TYPE_DEFAULT = 0, D2D1_RENDER_TARGET_TYPE_SOFTWARE = 1, - D2D1_RENDER_TARGET_TYPE_HARDWARE = 2 + D2D1_RENDER_TARGET_TYPE_HARDWARE = 2, + D2D1_RENDER_TARGET_TYPE_FORCE_DWORD = 0xffffffff } D2D1_RENDER_TARGET_TYPE; -typedef enum _D2D1_RENDER_TARGET_USAGE { +typedef enum D2D1_RENDER_TARGET_USAGE { D2D1_RENDER_TARGET_USAGE_NONE = 0x00000000, D2D1_RENDER_TARGET_USAGE_FORCE_BITMAP_REMOTING = 0x00000001, - D2D1_RENDER_TARGET_USAGE_GDI_COMPATIBLE = 0x00000002 + D2D1_RENDER_TARGET_USAGE_GDI_COMPATIBLE = 0x00000002, + D2D1_RENDER_TARGET_USAGE_FORCE_DWORD = 0xffffffff } D2D1_RENDER_TARGET_USAGE; -typedef enum _D2D1_SWEEP_DIRECTION { +typedef enum D2D1_SWEEP_DIRECTION { D2D1_SWEEP_DIRECTION_COUNTER_CLOCKWISE = 0, - D2D1_SWEEP_DIRECTION_CLOCKWISE = 1 + D2D1_SWEEP_DIRECTION_CLOCKWISE = 1, + D2D1_SWEEP_DIRECTION_FORCE_DWORD = 0xffffffff } D2D1_SWEEP_DIRECTION; -typedef enum _D2D1_TEXT_ANTIALIAS_MODE { +typedef enum D2D1_TEXT_ANTIALIAS_MODE { D2D1_TEXT_ANTIALIAS_MODE_DEFAULT = 0, D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE = 1, D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE = 2, - D2D1_TEXT_ANTIALIAS_MODE_ALIASED = 3 + D2D1_TEXT_ANTIALIAS_MODE_ALIASED = 3, + D2D1_TEXT_ANTIALIAS_MODE_FORCE_DWORD = 0xffffffff } D2D1_TEXT_ANTIALIAS_MODE; -typedef enum _D2D1_WINDOW_STATE { - D2D1_WINDOW_STATE_NONE = 0x0000000, - D2D1_WINDOW_STATE_OCCLUDED = 0x0000001 +typedef enum D2D1_WINDOW_STATE { + D2D1_WINDOW_STATE_NONE = 0x00000000, + D2D1_WINDOW_STATE_OCCLUDED = 0x00000001, + D2D1_WINDOW_STATE_FORCE_DWORD = 0xffffffff } D2D1_WINDOW_STATE; /* this is a hack so we can use forward declares in C (easier than reordering interfaces) */ diff --git a/lib/libc/include/any-windows-any/d3d10.h b/lib/libc/include/any-windows-any/d3d10.h index e7db3d3de4..bb4679f0a7 100644 --- a/lib/libc/include/any-windows-any/d3d10.h +++ b/lib/libc/include/any-windows-any/d3d10.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/d3d10.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/d3d10.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/d3d10_1.h b/lib/libc/include/any-windows-any/d3d10_1.h index 2af549930b..2959ad514c 100644 --- a/lib/libc/include/any-windows-any/d3d10_1.h +++ b/lib/libc/include/any-windows-any/d3d10_1.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/d3d10_1.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/d3d10_1.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/d3d10sdklayers.h b/lib/libc/include/any-windows-any/d3d10sdklayers.h index ae35505b78..49a62f6c7d 100644 --- a/lib/libc/include/any-windows-any/d3d10sdklayers.h +++ b/lib/libc/include/any-windows-any/d3d10sdklayers.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/d3d10sdklayers.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/d3d10sdklayers.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/d3d11.h b/lib/libc/include/any-windows-any/d3d11.h index 038d1a3bd2..09900a766c 100644 --- a/lib/libc/include/any-windows-any/d3d11.h +++ b/lib/libc/include/any-windows-any/d3d11.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/d3d11.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/d3d11.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/d3d11_1.h b/lib/libc/include/any-windows-any/d3d11_1.h index a31b492c5d..f2c3dca668 100644 --- a/lib/libc/include/any-windows-any/d3d11_1.h +++ b/lib/libc/include/any-windows-any/d3d11_1.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/d3d11_1.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/d3d11_1.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/d3d11_2.h b/lib/libc/include/any-windows-any/d3d11_2.h index ac63b612fb..00e6ee40e0 100644 --- a/lib/libc/include/any-windows-any/d3d11_2.h +++ b/lib/libc/include/any-windows-any/d3d11_2.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/d3d11_2.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/d3d11_2.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/d3d11_3.h b/lib/libc/include/any-windows-any/d3d11_3.h index 6354998016..515d05b4e3 100644 --- a/lib/libc/include/any-windows-any/d3d11_3.h +++ b/lib/libc/include/any-windows-any/d3d11_3.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/d3d11_3.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/d3d11_3.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/d3d11_4.h b/lib/libc/include/any-windows-any/d3d11_4.h index 2e280e4b0b..49ed793559 100644 --- a/lib/libc/include/any-windows-any/d3d11_4.h +++ b/lib/libc/include/any-windows-any/d3d11_4.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/d3d11_4.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/d3d11_4.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/d3d11sdklayers.h b/lib/libc/include/any-windows-any/d3d11sdklayers.h index b2da261728..c2ca8c9cfd 100644 --- a/lib/libc/include/any-windows-any/d3d11sdklayers.h +++ b/lib/libc/include/any-windows-any/d3d11sdklayers.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/d3d11sdklayers.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/d3d11sdklayers.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/d3d11shader.h b/lib/libc/include/any-windows-any/d3d11shader.h index dd241fe266..52ed8dfe27 100644 --- a/lib/libc/include/any-windows-any/d3d11shader.h +++ b/lib/libc/include/any-windows-any/d3d11shader.h @@ -175,7 +175,13 @@ DECLARE_INTERFACE(ID3D11ShaderReflectionConstantBuffer) }; #undef INTERFACE +#if D3D_COMPILER_VERSION <= 42 +DEFINE_GUID(IID_ID3D11ShaderReflection, 0x17f27486, 0xa342, 0x4d10, 0x88, 0x42, 0xab, 0x08, 0x74, 0xe7, 0xf6, 0x70); +#elif D3D_COMPILER_VERSION == 43 DEFINE_GUID(IID_ID3D11ShaderReflection, 0x0a233719, 0x3960, 0x4578, 0x9d, 0x7c, 0x20, 0x3b, 0x8b, 0x1d, 0x9c, 0xc1); +#else +DEFINE_GUID(IID_ID3D11ShaderReflection, 0x8d536ca1, 0x0cca, 0x4956, 0xa8, 0x37, 0x78, 0x69, 0x63, 0x75, 0x55, 0x84); +#endif #define INTERFACE ID3D11ShaderReflection DECLARE_INTERFACE_(ID3D11ShaderReflection, IUnknown) @@ -203,6 +209,7 @@ DECLARE_INTERFACE_(ID3D11ShaderReflection, IUnknown) STDMETHOD_(UINT, GetNumInterfaceSlots)(THIS) PURE; STDMETHOD(GetMinFeatureLevel)(THIS_ enum D3D_FEATURE_LEVEL *level) PURE; STDMETHOD_(UINT, GetThreadGroupSize)(THIS_ UINT *sizex, UINT *sizey, UINT *sizez) PURE; + STDMETHOD_(UINT64, GetRequiresFlags)(THIS) PURE; }; #undef INTERFACE diff --git a/lib/libc/include/any-windows-any/d3d8.h b/lib/libc/include/any-windows-any/d3d8.h index 092907ce5b..856c084979 100644 --- a/lib/libc/include/any-windows-any/d3d8.h +++ b/lib/libc/include/any-windows-any/d3d8.h @@ -1015,7 +1015,7 @@ DECLARE_INTERFACE_(IDirect3DDevice8,IUnknown) #define IDirect3DDevice8_DrawIndexedPrimitive(p,a,b,c,d,e) (p)->lpVtbl->DrawIndexedPrimitive(p,a,b,c,d,e) #define IDirect3DDevice8_DrawPrimitiveUP(p,a,b,c,d) (p)->lpVtbl->DrawPrimitiveUP(p,a,b,c,d) #define IDirect3DDevice8_DrawIndexedPrimitiveUP(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->DrawIndexedPrimitiveUP(p,a,b,c,d,e,f,g,h) -#define IDirect3DDevice8_ProcessVertices(p,a,b,c,d,e) (p)->lpVtbl->processVertices(p,a,b,c,d,e) +#define IDirect3DDevice8_ProcessVertices(p,a,b,c,d,e) (p)->lpVtbl->ProcessVertices(p,a,b,c,d,e) #define IDirect3DDevice8_CreateVertexShader(p,a,b,c,d) (p)->lpVtbl->CreateVertexShader(p,a,b,c,d) #define IDirect3DDevice8_SetVertexShader(p,a) (p)->lpVtbl->SetVertexShader(p,a) #define IDirect3DDevice8_GetVertexShader(p,a) (p)->lpVtbl->GetVertexShader(p,a) diff --git a/lib/libc/include/any-windows-any/d3d9.h b/lib/libc/include/any-windows-any/d3d9.h index aea02f4e00..bb686abc8a 100644 --- a/lib/libc/include/any-windows-any/d3d9.h +++ b/lib/libc/include/any-windows-any/d3d9.h @@ -66,8 +66,10 @@ #define D3DPRESENT_DONOTWAIT __MSABI_LONG(1) #define D3DPRESENT_LINEAR_CONTENT __MSABI_LONG(2) #define D3DPRESENT_BACK_BUFFERS_MAX __MSABI_LONG(3) +#define D3DPRESENT_BACK_BUFFERS_MAX_EX __MSABI_LONG(30) #define D3DSGR_NO_CALIBRATION __MSABI_LONG(0x00000000) #define D3DSGR_CALIBRATE __MSABI_LONG(0x00000001) +#define D3DCURSOR_IMMEDIATE_UPDATE __MSABI_LONG(0x00000001) #define _FACD3D 0x876 #define MAKE_D3DHRESULT( code ) MAKE_HRESULT( 1, _FACD3D, code ) @@ -1618,7 +1620,8 @@ DECLARE_INTERFACE_(IDirect3D9Ex, IDirect3D9) STDMETHOD_(UINT, GetAdapterModeCountEx)(THIS_ UINT adapter_idx, const D3DDISPLAYMODEFILTER *filter) PURE; STDMETHOD(EnumAdapterModesEx)(THIS_ UINT adapter_idx, const D3DDISPLAYMODEFILTER *filter, UINT mode_idx, D3DDISPLAYMODEEX *mode) PURE; - STDMETHOD(GetAdapterDisplayModeEx)(THIS_ UINT adapter_idx, D3DDISPLAYMODEEX *mode, D3DDISPLAYROTATION *rotation); + STDMETHOD(GetAdapterDisplayModeEx)(THIS_ UINT adapter_idx, + D3DDISPLAYMODEEX *mode, D3DDISPLAYROTATION *rotation) PURE; STDMETHOD(CreateDeviceEx)(THIS_ UINT adapter_idx, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters, D3DDISPLAYMODEEX *mode, struct IDirect3DDevice9Ex **device) PURE; STDMETHOD(GetAdapterLUID)(THIS_ UINT adapter_idx, LUID *luid) PURE; diff --git a/lib/libc/include/any-windows-any/d3d9caps.h b/lib/libc/include/any-windows-any/d3d9caps.h index 58fd3d91d0..feee0d4ce5 100644 --- a/lib/libc/include/any-windows-any/d3d9caps.h +++ b/lib/libc/include/any-windows-any/d3d9caps.h @@ -125,13 +125,10 @@ #endif #define D3DPRASTERCAPS_DITHER __MSABI_LONG(0x00000001) -#define D3DPRASTERCAPS_PAT __MSABI_LONG(0x00000008) #define D3DPRASTERCAPS_ZTEST __MSABI_LONG(0x00000010) #define D3DPRASTERCAPS_FOGVERTEX __MSABI_LONG(0x00000080) #define D3DPRASTERCAPS_FOGTABLE __MSABI_LONG(0x00000100) -#define D3DPRASTERCAPS_ANTIALIASEDGES __MSABI_LONG(0x00001000) #define D3DPRASTERCAPS_MIPMAPLODBIAS __MSABI_LONG(0x00002000) -#define D3DPRASTERCAPS_ZBIAS __MSABI_LONG(0x00004000) #define D3DPRASTERCAPS_ZBUFFERLESSHSR __MSABI_LONG(0x00008000) #define D3DPRASTERCAPS_FOGRANGE __MSABI_LONG(0x00010000) #define D3DPRASTERCAPS_ANISOTROPY __MSABI_LONG(0x00020000) diff --git a/lib/libc/include/any-windows-any/d3d9types.h b/lib/libc/include/any-windows-any/d3d9types.h index b77f7cd5b7..49e7f94cbe 100644 --- a/lib/libc/include/any-windows-any/d3d9types.h +++ b/lib/libc/include/any-windows-any/d3d9types.h @@ -481,6 +481,9 @@ typedef enum _D3DSHADER_INSTRUCTION_OPCODE_TYPE { #define D3DSP_DCL_USAGEINDEX_SHIFT 16 #define D3DSP_DCL_USAGEINDEX_MASK 0x000f0000 +#define D3DSP_OPCODESPECIFICCONTROL_SHIFT 16 +#define D3DSP_OPCODESPECIFICCONTROL_MASK 0x00ff0000 + #define D3DSP_TEXTURETYPE_SHIFT 27 #define D3DSP_TEXTURETYPE_MASK 0x78000000 diff --git a/lib/libc/include/any-windows-any/d3dcommon.h b/lib/libc/include/any-windows-any/d3dcommon.h index f9684b6ebe..3d6131da24 100644 --- a/lib/libc/include/any-windows-any/d3dcommon.h +++ b/lib/libc/include/any-windows-any/d3dcommon.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/d3dcommon.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/d3dcommon.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/d3dcompiler.h b/lib/libc/include/any-windows-any/d3dcompiler.h index 381ad6cab4..df6eec2d3b 100644 --- a/lib/libc/include/any-windows-any/d3dcompiler.h +++ b/lib/libc/include/any-windows-any/d3dcompiler.h @@ -26,45 +26,57 @@ extern "C" { #endif -#if defined(__GNUC__) -#define D3DCOMPILER_DLL_W (const WCHAR[]){'d','3','d','c','o','m','p','i','l','e','r','_','4','3','.','d','l','l',0} -#elif defined(_MSC_VER) -#define D3DCOMPILER_DLL_W L"d3dcompiler_43.dll" +#if defined(_MSC_VER) || defined(__MINGW32__) +#define D3DCOMPILER_DLL_W L"d3dcompiler_47.dll" #else -static const WCHAR D3DCOMPILER_DLL_W[] = {'d','3','d','c','o','m','p','i','l','e','r','_','4','3','.','d','l','l',0}; +static const WCHAR D3DCOMPILER_DLL_W[] = {'d','3','d','c','o','m','p','i','l','e','r','_','4','7','.','d','l','l',0}; #endif -#define D3DCOMPILER_DLL_A "d3dcompiler_43.dll" +#define D3DCOMPILER_DLL_A "d3dcompiler_47.dll" #define D3DCOMPILER_DLL __MINGW_NAME_AW(D3DCOMPILER_DLL_) -#define D3DCOMPILE_DEBUG 0x00000001 -#define D3DCOMPILE_SKIP_VALIDATION 0x00000002 -#define D3DCOMPILE_SKIP_OPTIMIZATION 0x00000004 -#define D3DCOMPILE_PACK_MATRIX_ROW_MAJOR 0x00000008 -#define D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR 0x00000010 -#define D3DCOMPILE_PARTIAL_PRECISION 0x00000020 -#define D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT 0x00000040 -#define D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT 0x00000080 -#define D3DCOMPILE_NO_PRESHADER 0x00000100 -#define D3DCOMPILE_AVOID_FLOW_CONTROL 0x00000200 -#define D3DCOMPILE_PREFER_FLOW_CONTROL 0x00000400 -#define D3DCOMPILE_ENABLE_STRICTNESS 0x00000800 -#define D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY 0x00001000 -#define D3DCOMPILE_IEEE_STRICTNESS 0x00002000 -#define D3DCOMPILE_OPTIMIZATION_LEVEL0 0x00004000 -#define D3DCOMPILE_OPTIMIZATION_LEVEL1 0x00000000 -#define D3DCOMPILE_OPTIMIZATION_LEVEL2 0x0000c000 -#define D3DCOMPILE_OPTIMIZATION_LEVEL3 0x00008000 -#define D3DCOMPILE_RESERVED16 0x00010000 -#define D3DCOMPILE_RESERVED17 0x00020000 -#define D3DCOMPILE_WARNINGS_ARE_ERRORS 0x00040000 -#define D3DCOMPILE_RESOURCES_MAY_ALIAS 0x00080000 +#define D3DCOMPILE_DEBUG 0x00000001 +#define D3DCOMPILE_SKIP_VALIDATION 0x00000002 +#define D3DCOMPILE_SKIP_OPTIMIZATION 0x00000004 +#define D3DCOMPILE_PACK_MATRIX_ROW_MAJOR 0x00000008 +#define D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR 0x00000010 +#define D3DCOMPILE_PARTIAL_PRECISION 0x00000020 +#define D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT 0x00000040 +#define D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT 0x00000080 +#define D3DCOMPILE_NO_PRESHADER 0x00000100 +#define D3DCOMPILE_AVOID_FLOW_CONTROL 0x00000200 +#define D3DCOMPILE_PREFER_FLOW_CONTROL 0x00000400 +#define D3DCOMPILE_ENABLE_STRICTNESS 0x00000800 +#define D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY 0x00001000 +#define D3DCOMPILE_IEEE_STRICTNESS 0x00002000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL0 0x00004000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL1 0x00000000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL2 0x0000c000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL3 0x00008000 +#define D3DCOMPILE_RESERVED16 0x00010000 +#define D3DCOMPILE_RESERVED17 0x00020000 +#define D3DCOMPILE_WARNINGS_ARE_ERRORS 0x00040000 +#define D3DCOMPILE_RESOURCES_MAY_ALIAS 0x00080000 +#define D3DCOMPILE_ENABLE_UNBOUNDED_DESCRIPTOR_TABLES 0x00100000 +#define D3DCOMPILE_ALL_RESOURCES_BOUND 0x00200000 +#define D3DCOMPILE_DEBUG_NAME_FOR_SOURCE 0x00400000 +#define D3DCOMPILE_DEBUG_NAME_FOR_BINARY 0x00800000 -#define D3D_DISASM_ENABLE_COLOR_CODE 0x00000001 -#define D3D_DISASM_ENABLE_DEFAULT_VALUE_PRINTS 0x00000002 -#define D3D_DISASM_ENABLE_INSTRUCTION_NUMBERING 0x00000004 -#define D3D_DISASM_ENABLE_INSTRUCTION_CYCLE 0x00000008 -#define D3D_DISASM_DISABLE_DEBUG_INFO 0x00000010 +#define D3DCOMPILE_EFFECT_CHILD_EFFECT 0x00000001 +#define D3DCOMPILE_EFFECT_ALLOW_SLOW_OPS 0x00000002 + +#define D3DCOMPILE_FLAGS2_FORCE_ROOT_SIGNATURE_LATEST 0x00000000 +#define D3DCOMPILE_FLAGS2_FORCE_ROOT_SIGNATURE_1_0 0x00000010 +#define D3DCOMPILE_FLAGS2_FORCE_ROOT_SIGNATURE_1_1 0x00000020 + +#define D3D_DISASM_ENABLE_COLOR_CODE 0x00000001 +#define D3D_DISASM_ENABLE_DEFAULT_VALUE_PRINTS 0x00000002 +#define D3D_DISASM_ENABLE_INSTRUCTION_NUMBERING 0x00000004 +#define D3D_DISASM_ENABLE_INSTRUCTION_CYCLE 0x00000008 +#define D3D_DISASM_DISABLE_DEBUG_INFO 0x00000010 +#define D3D_DISASM_ENABLE_INSTRUCTION_OFFSET 0x00000020 +#define D3D_DISASM_INSTRUCTION_ONLY 0x00000040 +#define D3D_DISASM_PRINT_HEX_LITERALS 0x00000080 HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, @@ -72,12 +84,19 @@ HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filena typedef HRESULT (WINAPI *pD3DCompile)(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages); +HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filename, + const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, + const char *target, UINT sflags, UINT eflags, UINT secondary_flags, + const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader, + ID3DBlob **error_messages); typedef enum D3DCOMPILER_STRIP_FLAGS { - D3DCOMPILER_STRIP_REFLECTION_DATA = 1, - D3DCOMPILER_STRIP_DEBUG_INFO = 2, - D3DCOMPILER_STRIP_TEST_BLOBS = 4, + D3DCOMPILER_STRIP_REFLECTION_DATA = 0x1, + D3DCOMPILER_STRIP_DEBUG_INFO = 0x2, + D3DCOMPILER_STRIP_TEST_BLOBS = 0x4, + D3DCOMPILER_STRIP_PRIVATE_DATA = 0x8, + D3DCOMPILER_STRIP_ROOT_SIGNATURE = 0x10, D3DCOMPILER_STRIP_FORCE_DWORD = 0x7fffffff } D3DCOMPILER_STRIP_FLAGS; @@ -94,15 +113,22 @@ typedef enum D3D_BLOB_PART D3D_BLOB_LEGACY_SHADER, D3D_BLOB_XNA_PREPASS_SHADER, D3D_BLOB_XNA_SHADER, + D3D_BLOB_PDB, + D3D_BLOB_PRIVATE_DATA, + D3D_BLOB_ROOT_SIGNATURE, + D3D_BLOB_DEBUG_NAME, D3D_BLOB_TEST_ALTERNATE_SHADER = 0x8000, D3D_BLOB_TEST_COMPILE_DETAILS, - D3D_BLOB_TEST_COMPILE_PERF + D3D_BLOB_TEST_COMPILE_PERF, + D3D_BLOB_TEST_COMPILE_REPORT } D3D_BLOB_PART; HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T data_size, UINT flags, const char *comments, ID3DBlob **disassembly); typedef HRESULT (WINAPI *pD3DDisassemble)(const void *data, SIZE_T data_size, UINT flags, const char *comments, ID3DBlob **disassembly); +HRESULT WINAPI D3DCompileFromFile(const WCHAR *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *includes, + const char *entrypoint, const char *target, UINT flags1, UINT flags2, ID3DBlob **code, ID3DBlob **errors); HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob); HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); diff --git a/lib/libc/include/any-windows-any/d3dhal.h b/lib/libc/include/any-windows-any/d3dhal.h index 36e6d0cae2..a294016d62 100644 --- a/lib/libc/include/any-windows-any/d3dhal.h +++ b/lib/libc/include/any-windows-any/d3dhal.h @@ -47,6 +47,75 @@ typedef struct _D3DDeviceDesc_V1 { DWORD dwMaxVertexCount; } D3DDEVICEDESC_V1,*LPD3DDEVICEDESC_V1; +typedef struct _D3DDeviceDesc_V2 +{ + DWORD dwSize; + DWORD dwFlags; + D3DCOLORMODEL dcmColorModel; + DWORD dwDevCaps; + D3DTRANSFORMCAPS dtcTransformCaps; + WINBOOL bClipping; + D3DLIGHTINGCAPS dlcLightingCaps; + D3DPRIMCAPS dpcLineCaps; + D3DPRIMCAPS dpcTriCaps; + DWORD dwDeviceRenderBitDepth; + DWORD dwDeviceZBufferBitDepth; + DWORD dwMaxBufferSize; + DWORD dwMaxVertexCount; + + /* DirectX 5 */ + DWORD dwMinTextureWidth; + DWORD dwMinTextureHeight; + DWORD dwMaxTextureWidth; + DWORD dwMaxTextureHeight; + DWORD dwMinStippleWidth; + DWORD dwMaxStippleWidth; + DWORD dwMinStippleHeight; + DWORD dwMaxStippleHeight; +} D3DDEVICEDESC_V2, *LPD3DDEVICEDESC_V2; + +typedef struct _D3DDeviceDesc_V3 +{ + DWORD dwSize; + DWORD dwFlags; + D3DCOLORMODEL dcmColorModel; + DWORD dwDevCaps; + D3DTRANSFORMCAPS dtcTransformCaps; + WINBOOL bClipping; + D3DLIGHTINGCAPS dlcLightingCaps; + D3DPRIMCAPS dpcLineCaps; + D3DPRIMCAPS dpcTriCaps; + DWORD dwDeviceRenderBitDepth; + DWORD dwDeviceZBufferBitDepth; + DWORD dwMaxBufferSize; + DWORD dwMaxVertexCount; + + /* DirectX 5 */ + DWORD dwMinTextureWidth; + DWORD dwMinTextureHeight; + DWORD dwMaxTextureWidth; + DWORD dwMaxTextureHeight; + DWORD dwMinStippleWidth; + DWORD dwMaxStippleWidth; + DWORD dwMinStippleHeight; + DWORD dwMaxStippleHeight; + + /* DirectX 6 */ + DWORD dwMaxTextureRepeat; + DWORD dwMaxTextureAspectRatio; + DWORD dwMaxAnisotropy; + D3DVALUE dvGuardBandLeft; + D3DVALUE dvGuardBandTop; + D3DVALUE dvGuardBandRight; + D3DVALUE dvGuardBandBottom; + D3DVALUE dvExtentsAdjust; + DWORD dwStencilCaps; + DWORD dwFVFCaps; + DWORD dwTextureOpCaps; + WORD wMaxTextureBlendStages; + WORD wMaxSimultaneousTextures; +} D3DDEVICEDESC_V3, *LPD3DDEVICEDESC_V3; + typedef struct _D3DHAL_GLOBALDRIVERDATA { DWORD dwSize; D3DDEVICEDESC_V1 hwCaps; diff --git a/lib/libc/include/any-windows-any/d3drm.h b/lib/libc/include/any-windows-any/d3drm.h index a1de5d83d6..f305b54b9a 100644 --- a/lib/libc/include/any-windows-any/d3drm.h +++ b/lib/libc/include/any-windows-any/d3drm.h @@ -323,7 +323,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) #define IDirect3DRM2_EnumerateObjects(p,a,b) (p)->EnumerateObjects(a,b) #define IDirect3DRM2_Load(p,a,b,c,d,e,f,g,h,i,j) (p)->Load(a,b,c,d,e,f,g,h,i,j) #define IDirect3DRM2_Tick(p,a) (p)->Tick(a) -#define IDirect3DRM2_CreateProgressiveMesh(p,a) (p)->CreateProgressiveMesh(p,a) +#define IDirect3DRM2_CreateProgressiveMesh(p,a) (p)->CreateProgressiveMesh(a) #endif /***************************************************************************** @@ -435,7 +435,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) #define IDirect3DRM3_CreateProgressiveMesh(p,a) (p)->lpVtbl->CreateProgressiveMesh(p,a) #define IDirect3DRM3_RegisterClient(p,a,b) (p)->lpVtbl->RegisterClient(p,a,b) #define IDirect3DRM3_UnregisterClient(p,a) (p)->lpVtbl->UnregisterClient(p,a) -#define IDirect3DRM3_CreateClippedVisual(p,ab) (p)->lpVtbl->CreateClippedVisual(p,a,b) +#define IDirect3DRM3_CreateClippedVisual(p,a,b) (p)->lpVtbl->CreateClippedVisual(p,a,b) #define IDirect3DRM3_SetOptions(p,a) (p)->lpVtbl->SetOptions(p,a) #define IDirect3DRM3_GetOptions(p,a) (p)->lpVtbl->GetOptions(p,a) #else @@ -476,12 +476,12 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) #define IDirect3DRM3_EnumerateObjects(p,a,b) (p)->EnumerateObjects(a,b) #define IDirect3DRM3_Load(p,a,b,c,d,e,f,g,h,i,j) (p)->Load(a,b,c,d,e,f,g,h,i,j) #define IDirect3DRM3_Tick(p,a) (p)->Tick(a) -#define IDirect3DRM3_CreateProgressiveMesh(p,a) (p)->CreateProgressiveMesh(p,a) -#define IDirect3DRM3_RegisterClient(p,a,b) (p)->RegisterClient(p,a,b) -#define IDirect3DRM3_UnregisterClient(p,a) (p)->UnregisterClient(p,a) -#define IDirect3DRM3_CreateClippedVisual(p,ab) (p)->CreateClippedVisual(p,a,b) -#define IDirect3DRM3_SetOptions(p,a) (p)->SetOptions(p,a) -#define IDirect3DRM3_GetOptions(p,a) (p)->GetOptions(p,a) +#define IDirect3DRM3_CreateProgressiveMesh(p,a) (p)->CreateProgressiveMesh(a) +#define IDirect3DRM3_RegisterClient(p,a,b) (p)->RegisterClient(a,b) +#define IDirect3DRM3_UnregisterClient(p,a) (p)->UnregisterClient(a) +#define IDirect3DRM3_CreateClippedVisual(p,a,b) (p)->CreateClippedVisual(a,b) +#define IDirect3DRM3_SetOptions(p,a) (p)->SetOptions(a) +#define IDirect3DRM3_GetOptions(p,a) (p)->GetOptions(a) #endif #define D3DRM_OK DD_OK diff --git a/lib/libc/include/any-windows-any/d3drmobj.h b/lib/libc/include/any-windows-any/d3drmobj.h index a549cbe153..0484322983 100644 --- a/lib/libc/include/any-windows-any/d3drmobj.h +++ b/lib/libc/include/any-windows-any/d3drmobj.h @@ -3617,9 +3617,9 @@ DECLARE_INTERFACE_(IDirect3DRMWrap, IDirect3DRMObject) #define IDirect3DRMWrap_GetName(p,a,b) (p)->GetName(a,b) #define IDirect3DRMWrap_GetClassName(p,a,b) (p)->GetClassName(a,b) /*** IDirect3DRMWrap methods ***/ -#define IDirect3DRMWrap_Init(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) (p)->Init(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) -#define IDirect3DRMWrap_Apply(p,a) (p)->Apply(p,a) -#define IDirect3DRMWrap_ApplyRelative(p,a,b) (p)->ApplyRelative(p,a,b) +#define IDirect3DRMWrap_Init(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) (p)->Init(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) +#define IDirect3DRMWrap_Apply(p,a) (p)->Apply(a) +#define IDirect3DRMWrap_ApplyRelative(p,a,b) (p)->ApplyRelative(a,b) #endif /***************************************************************************** diff --git a/lib/libc/include/any-windows-any/d3dx9xof.h b/lib/libc/include/any-windows-any/d3dx9xof.h index 5859814f6c..a1c94c94ea 100644 --- a/lib/libc/include/any-windows-any/d3dx9xof.h +++ b/lib/libc/include/any-windows-any/d3dx9xof.h @@ -50,7 +50,7 @@ typedef struct _D3DXF_FILELOADRESOURCE typedef struct _D3DXF_FILELOADMEMORY { - void *lpMemory; + const void *lpMemory; SIZE_T dSize; } D3DXF_FILELOADMEMORY; diff --git a/lib/libc/include/any-windows-any/dbgprop.h b/lib/libc/include/any-windows-any/dbgprop.h index 2240ed8e51..562e7999d4 100644 --- a/lib/libc/include/any-windows-any/dbgprop.h +++ b/lib/libc/include/any-windows-any/dbgprop.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/dbgprop.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/dbgprop.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,51 +21,81 @@ #ifndef __IDebugProperty_FWD_DEFINED__ #define __IDebugProperty_FWD_DEFINED__ typedef interface IDebugProperty IDebugProperty; +#ifdef __cplusplus +interface IDebugProperty; +#endif /* __cplusplus */ #endif #ifndef __IEnumDebugPropertyInfo_FWD_DEFINED__ #define __IEnumDebugPropertyInfo_FWD_DEFINED__ typedef interface IEnumDebugPropertyInfo IEnumDebugPropertyInfo; +#ifdef __cplusplus +interface IEnumDebugPropertyInfo; +#endif /* __cplusplus */ #endif #ifndef __IDebugExtendedProperty_FWD_DEFINED__ #define __IDebugExtendedProperty_FWD_DEFINED__ typedef interface IDebugExtendedProperty IDebugExtendedProperty; +#ifdef __cplusplus +interface IDebugExtendedProperty; +#endif /* __cplusplus */ #endif #ifndef __IEnumDebugExtendedPropertyInfo_FWD_DEFINED__ #define __IEnumDebugExtendedPropertyInfo_FWD_DEFINED__ typedef interface IEnumDebugExtendedPropertyInfo IEnumDebugExtendedPropertyInfo; +#ifdef __cplusplus +interface IEnumDebugExtendedPropertyInfo; +#endif /* __cplusplus */ #endif #ifndef __IPerPropertyBrowsing2_FWD_DEFINED__ #define __IPerPropertyBrowsing2_FWD_DEFINED__ typedef interface IPerPropertyBrowsing2 IPerPropertyBrowsing2; +#ifdef __cplusplus +interface IPerPropertyBrowsing2; +#endif /* __cplusplus */ #endif #ifndef __IDebugPropertyEnumType_All_FWD_DEFINED__ #define __IDebugPropertyEnumType_All_FWD_DEFINED__ typedef interface IDebugPropertyEnumType_All IDebugPropertyEnumType_All; +#ifdef __cplusplus +interface IDebugPropertyEnumType_All; +#endif /* __cplusplus */ #endif #ifndef __IDebugPropertyEnumType_Locals_FWD_DEFINED__ #define __IDebugPropertyEnumType_Locals_FWD_DEFINED__ typedef interface IDebugPropertyEnumType_Locals IDebugPropertyEnumType_Locals; +#ifdef __cplusplus +interface IDebugPropertyEnumType_Locals; +#endif /* __cplusplus */ #endif #ifndef __IDebugPropertyEnumType_Arguments_FWD_DEFINED__ #define __IDebugPropertyEnumType_Arguments_FWD_DEFINED__ typedef interface IDebugPropertyEnumType_Arguments IDebugPropertyEnumType_Arguments; +#ifdef __cplusplus +interface IDebugPropertyEnumType_Arguments; +#endif /* __cplusplus */ #endif #ifndef __IDebugPropertyEnumType_LocalsPlusArgs_FWD_DEFINED__ #define __IDebugPropertyEnumType_LocalsPlusArgs_FWD_DEFINED__ typedef interface IDebugPropertyEnumType_LocalsPlusArgs IDebugPropertyEnumType_LocalsPlusArgs; +#ifdef __cplusplus +interface IDebugPropertyEnumType_LocalsPlusArgs; +#endif /* __cplusplus */ #endif #ifndef __IDebugPropertyEnumType_Registers_FWD_DEFINED__ #define __IDebugPropertyEnumType_Registers_FWD_DEFINED__ typedef interface IDebugPropertyEnumType_Registers IDebugPropertyEnumType_Registers; +#ifdef __cplusplus +interface IDebugPropertyEnumType_Registers; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -89,26 +120,41 @@ extern "C" { #ifndef __IDebugProperty_FWD_DEFINED__ #define __IDebugProperty_FWD_DEFINED__ typedef interface IDebugProperty IDebugProperty; +#ifdef __cplusplus +interface IDebugProperty; +#endif /* __cplusplus */ #endif #ifndef __IDebugExtendedProperty_FWD_DEFINED__ #define __IDebugExtendedProperty_FWD_DEFINED__ typedef interface IDebugExtendedProperty IDebugExtendedProperty; +#ifdef __cplusplus +interface IDebugExtendedProperty; +#endif /* __cplusplus */ #endif #ifndef __IEnumDebugPropertyInfo_FWD_DEFINED__ #define __IEnumDebugPropertyInfo_FWD_DEFINED__ typedef interface IEnumDebugPropertyInfo IEnumDebugPropertyInfo; +#ifdef __cplusplus +interface IEnumDebugPropertyInfo; +#endif /* __cplusplus */ #endif #ifndef __IEnumDebugExtendedPropertyInfo_FWD_DEFINED__ #define __IEnumDebugExtendedPropertyInfo_FWD_DEFINED__ typedef interface IEnumDebugExtendedPropertyInfo IEnumDebugExtendedPropertyInfo; +#ifdef __cplusplus +interface IEnumDebugExtendedPropertyInfo; +#endif /* __cplusplus */ #endif #ifndef __IPerPropertyBrowsing2_FWD_DEFINED__ #define __IPerPropertyBrowsing2_FWD_DEFINED__ typedef interface IPerPropertyBrowsing2 IPerPropertyBrowsing2; +#ifdef __cplusplus +interface IPerPropertyBrowsing2; +#endif /* __cplusplus */ #endif @@ -138,7 +184,6 @@ enum { DBGPROP_ATTRIB_HAS_EXTENDED_ATTRIBS = 0x800000 }; - typedef DWORD DBGPROP_ATTRIB_FLAGS; enum { @@ -153,7 +198,6 @@ enum { DBGPROP_INFO_AUTOEXPAND = 0x8000000 }; - typedef DWORD DBGPROP_INFO_FLAGS; #define DBGPROP_INFO_STANDARD (((DBGPROP_INFO_NAME | DBGPROP_INFO_TYPE) | DBGPROP_INFO_VALUE) | DBGPROP_INFO_ATTRIBUTES) @@ -290,47 +334,48 @@ typedef struct IDebugPropertyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugProperty* This, + IDebugProperty *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugProperty* This); + IDebugProperty *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugProperty* This); + IDebugProperty *This); /*** IDebugProperty methods ***/ HRESULT (STDMETHODCALLTYPE *GetPropertyInfo)( - IDebugProperty* This, + IDebugProperty *This, DWORD dwFieldSpec, UINT nRadix, DebugPropertyInfo *pPropertyInfo); HRESULT (STDMETHODCALLTYPE *GetExtendedInfo)( - IDebugProperty* This, + IDebugProperty *This, ULONG cInfos, GUID *rgguidExtendedInfo, VARIANT *rgvar); HRESULT (STDMETHODCALLTYPE *SetValueAsString)( - IDebugProperty* This, + IDebugProperty *This, LPCOLESTR pszValue, UINT nRadix); HRESULT (STDMETHODCALLTYPE *EnumMembers)( - IDebugProperty* This, + IDebugProperty *This, DWORD dwFieldSpec, UINT nRadix, REFIID refiid, IEnumDebugPropertyInfo **ppepi); HRESULT (STDMETHODCALLTYPE *GetParent)( - IDebugProperty* This, + IDebugProperty *This, IDebugProperty **ppDebugProp); END_INTERFACE } IDebugPropertyVtbl; + interface IDebugProperty { CONST_VTBL IDebugPropertyVtbl* lpVtbl; }; @@ -395,44 +440,6 @@ void __RPC_STUB IDebugProperty_RemoteGetPropertyInfo_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugProperty_GetExtendedInfo_Proxy( - IDebugProperty* This, - ULONG cInfos, - GUID *rgguidExtendedInfo, - VARIANT *rgvar); -void __RPC_STUB IDebugProperty_GetExtendedInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugProperty_SetValueAsString_Proxy( - IDebugProperty* This, - LPCOLESTR pszValue, - UINT nRadix); -void __RPC_STUB IDebugProperty_SetValueAsString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugProperty_EnumMembers_Proxy( - IDebugProperty* This, - DWORD dwFieldSpec, - UINT nRadix, - REFIID refiid, - IEnumDebugPropertyInfo **ppepi); -void __RPC_STUB IDebugProperty_EnumMembers_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugProperty_GetParent_Proxy( - IDebugProperty* This, - IDebugProperty **ppDebugProp); -void __RPC_STUB IDebugProperty_GetParent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IDebugProperty_GetPropertyInfo_Proxy( IDebugProperty* This, DWORD dwFieldSpec, @@ -491,40 +498,41 @@ typedef struct IEnumDebugPropertyInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumDebugPropertyInfo* This, + IEnumDebugPropertyInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumDebugPropertyInfo* This); + IEnumDebugPropertyInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumDebugPropertyInfo* This); + IEnumDebugPropertyInfo *This); /*** IEnumDebugPropertyInfo methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumDebugPropertyInfo* This, + IEnumDebugPropertyInfo *This, ULONG celt, DebugPropertyInfo *pi, ULONG *pcEltsfetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumDebugPropertyInfo* This, + IEnumDebugPropertyInfo *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumDebugPropertyInfo* This); + IEnumDebugPropertyInfo *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumDebugPropertyInfo* This, + IEnumDebugPropertyInfo *This, IEnumDebugPropertyInfo **ppepi); HRESULT (STDMETHODCALLTYPE *GetCount)( - IEnumDebugPropertyInfo* This, + IEnumDebugPropertyInfo *This, ULONG *pcelt); END_INTERFACE } IEnumDebugPropertyInfoVtbl; + interface IEnumDebugPropertyInfo { CONST_VTBL IEnumDebugPropertyInfoVtbl* lpVtbl; }; @@ -583,37 +591,6 @@ void __RPC_STUB IEnumDebugPropertyInfo_RemoteNext_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDebugPropertyInfo_Skip_Proxy( - IEnumDebugPropertyInfo* This, - ULONG celt); -void __RPC_STUB IEnumDebugPropertyInfo_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDebugPropertyInfo_Reset_Proxy( - IEnumDebugPropertyInfo* This); -void __RPC_STUB IEnumDebugPropertyInfo_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDebugPropertyInfo_Clone_Proxy( - IEnumDebugPropertyInfo* This, - IEnumDebugPropertyInfo **ppepi); -void __RPC_STUB IEnumDebugPropertyInfo_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDebugPropertyInfo_GetCount_Proxy( - IEnumDebugPropertyInfo* This, - ULONG *pcelt); -void __RPC_STUB IEnumDebugPropertyInfo_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IEnumDebugPropertyInfo_Next_Proxy( IEnumDebugPropertyInfo* This, ULONG celt, @@ -659,60 +636,61 @@ typedef struct IDebugExtendedPropertyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugExtendedProperty* This, + IDebugExtendedProperty *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugExtendedProperty* This); + IDebugExtendedProperty *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugExtendedProperty* This); + IDebugExtendedProperty *This); /*** IDebugProperty methods ***/ HRESULT (STDMETHODCALLTYPE *GetPropertyInfo)( - IDebugExtendedProperty* This, + IDebugExtendedProperty *This, DWORD dwFieldSpec, UINT nRadix, DebugPropertyInfo *pPropertyInfo); HRESULT (STDMETHODCALLTYPE *GetExtendedInfo)( - IDebugExtendedProperty* This, + IDebugExtendedProperty *This, ULONG cInfos, GUID *rgguidExtendedInfo, VARIANT *rgvar); HRESULT (STDMETHODCALLTYPE *SetValueAsString)( - IDebugExtendedProperty* This, + IDebugExtendedProperty *This, LPCOLESTR pszValue, UINT nRadix); HRESULT (STDMETHODCALLTYPE *EnumMembers)( - IDebugExtendedProperty* This, + IDebugExtendedProperty *This, DWORD dwFieldSpec, UINT nRadix, REFIID refiid, IEnumDebugPropertyInfo **ppepi); HRESULT (STDMETHODCALLTYPE *GetParent)( - IDebugExtendedProperty* This, + IDebugExtendedProperty *This, IDebugProperty **ppDebugProp); /*** IDebugExtendedProperty methods ***/ HRESULT (STDMETHODCALLTYPE *GetExtendedPropertyInfo)( - IDebugExtendedProperty* This, + IDebugExtendedProperty *This, DWORD dwFieldSpec, UINT nRadix, ExtendedDebugPropertyInfo *pExtendedPropertyInfo); HRESULT (STDMETHODCALLTYPE *EnumExtendedMembers)( - IDebugExtendedProperty* This, + IDebugExtendedProperty *This, DWORD dwFieldSpec, UINT nRadix, IEnumDebugExtendedPropertyInfo **ppeepi); END_INTERFACE } IDebugExtendedPropertyVtbl; + interface IDebugExtendedProperty { CONST_VTBL IDebugExtendedPropertyVtbl* lpVtbl; }; @@ -771,26 +749,6 @@ static FORCEINLINE HRESULT IDebugExtendedProperty_EnumExtendedMembers(IDebugExte #endif -HRESULT STDMETHODCALLTYPE IDebugExtendedProperty_GetExtendedPropertyInfo_Proxy( - IDebugExtendedProperty* This, - DWORD dwFieldSpec, - UINT nRadix, - ExtendedDebugPropertyInfo *pExtendedPropertyInfo); -void __RPC_STUB IDebugExtendedProperty_GetExtendedPropertyInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDebugExtendedProperty_EnumExtendedMembers_Proxy( - IDebugExtendedProperty* This, - DWORD dwFieldSpec, - UINT nRadix, - IEnumDebugExtendedPropertyInfo **ppeepi); -void __RPC_STUB IDebugExtendedProperty_EnumExtendedMembers_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugExtendedProperty_INTERFACE_DEFINED__ */ @@ -833,40 +791,41 @@ typedef struct IEnumDebugExtendedPropertyInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumDebugExtendedPropertyInfo* This, + IEnumDebugExtendedPropertyInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumDebugExtendedPropertyInfo* This); + IEnumDebugExtendedPropertyInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumDebugExtendedPropertyInfo* This); + IEnumDebugExtendedPropertyInfo *This); /*** IEnumDebugExtendedPropertyInfo methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumDebugExtendedPropertyInfo* This, + IEnumDebugExtendedPropertyInfo *This, ULONG celt, ExtendedDebugPropertyInfo *rgExtendedPropertyInfo, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumDebugExtendedPropertyInfo* This, + IEnumDebugExtendedPropertyInfo *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumDebugExtendedPropertyInfo* This); + IEnumDebugExtendedPropertyInfo *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumDebugExtendedPropertyInfo* This, + IEnumDebugExtendedPropertyInfo *This, IEnumDebugExtendedPropertyInfo **pedpe); HRESULT (STDMETHODCALLTYPE *GetCount)( - IEnumDebugExtendedPropertyInfo* This, + IEnumDebugExtendedPropertyInfo *This, ULONG *pcelt); END_INTERFACE } IEnumDebugExtendedPropertyInfoVtbl; + interface IEnumDebugExtendedPropertyInfo { CONST_VTBL IEnumDebugExtendedPropertyInfoVtbl* lpVtbl; }; @@ -915,47 +874,6 @@ static FORCEINLINE HRESULT IEnumDebugExtendedPropertyInfo_GetCount(IEnumDebugExt #endif -HRESULT STDMETHODCALLTYPE IEnumDebugExtendedPropertyInfo_Next_Proxy( - IEnumDebugExtendedPropertyInfo* This, - ULONG celt, - ExtendedDebugPropertyInfo *rgExtendedPropertyInfo, - ULONG *pceltFetched); -void __RPC_STUB IEnumDebugExtendedPropertyInfo_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDebugExtendedPropertyInfo_Skip_Proxy( - IEnumDebugExtendedPropertyInfo* This, - ULONG celt); -void __RPC_STUB IEnumDebugExtendedPropertyInfo_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDebugExtendedPropertyInfo_Reset_Proxy( - IEnumDebugExtendedPropertyInfo* This); -void __RPC_STUB IEnumDebugExtendedPropertyInfo_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDebugExtendedPropertyInfo_Clone_Proxy( - IEnumDebugExtendedPropertyInfo* This, - IEnumDebugExtendedPropertyInfo **pedpe); -void __RPC_STUB IEnumDebugExtendedPropertyInfo_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumDebugExtendedPropertyInfo_GetCount_Proxy( - IEnumDebugExtendedPropertyInfo* This, - ULONG *pcelt); -void __RPC_STUB IEnumDebugExtendedPropertyInfo_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumDebugExtendedPropertyInfo_INTERFACE_DEFINED__ */ @@ -998,40 +916,41 @@ typedef struct IPerPropertyBrowsing2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPerPropertyBrowsing2* This, + IPerPropertyBrowsing2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPerPropertyBrowsing2* This); + IPerPropertyBrowsing2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IPerPropertyBrowsing2* This); + IPerPropertyBrowsing2 *This); /*** IPerPropertyBrowsing2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetDisplayString)( - IPerPropertyBrowsing2* This, + IPerPropertyBrowsing2 *This, DISPID dispid, BSTR *pBstr); HRESULT (STDMETHODCALLTYPE *MapPropertyToPage)( - IPerPropertyBrowsing2* This, + IPerPropertyBrowsing2 *This, DISPID dispid, CLSID *pClsidPropPage); HRESULT (STDMETHODCALLTYPE *GetPredefinedStrings)( - IPerPropertyBrowsing2* This, + IPerPropertyBrowsing2 *This, DISPID dispid, CALPOLESTR *pCaStrings, CADWORD *pCaCookies); HRESULT (STDMETHODCALLTYPE *SetPredefinedValue)( - IPerPropertyBrowsing2* This, + IPerPropertyBrowsing2 *This, DISPID dispid, DWORD dwCookie); END_INTERFACE } IPerPropertyBrowsing2Vtbl; + interface IPerPropertyBrowsing2 { CONST_VTBL IPerPropertyBrowsing2Vtbl* lpVtbl; }; @@ -1076,43 +995,6 @@ static FORCEINLINE HRESULT IPerPropertyBrowsing2_SetPredefinedValue(IPerProperty #endif -HRESULT STDMETHODCALLTYPE IPerPropertyBrowsing2_GetDisplayString_Proxy( - IPerPropertyBrowsing2* This, - DISPID dispid, - BSTR *pBstr); -void __RPC_STUB IPerPropertyBrowsing2_GetDisplayString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPerPropertyBrowsing2_MapPropertyToPage_Proxy( - IPerPropertyBrowsing2* This, - DISPID dispid, - CLSID *pClsidPropPage); -void __RPC_STUB IPerPropertyBrowsing2_MapPropertyToPage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPerPropertyBrowsing2_GetPredefinedStrings_Proxy( - IPerPropertyBrowsing2* This, - DISPID dispid, - CALPOLESTR *pCaStrings, - CADWORD *pCaCookies); -void __RPC_STUB IPerPropertyBrowsing2_GetPredefinedStrings_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPerPropertyBrowsing2_SetPredefinedValue_Proxy( - IPerPropertyBrowsing2* This, - DISPID dispid, - DWORD dwCookie); -void __RPC_STUB IPerPropertyBrowsing2_SetPredefinedValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPerPropertyBrowsing2_INTERFACE_DEFINED__ */ @@ -1141,23 +1023,24 @@ typedef struct IDebugPropertyEnumType_AllVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugPropertyEnumType_All* This, + IDebugPropertyEnumType_All *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugPropertyEnumType_All* This); + IDebugPropertyEnumType_All *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugPropertyEnumType_All* This); + IDebugPropertyEnumType_All *This); /*** IDebugPropertyEnumType_All methods ***/ HRESULT (STDMETHODCALLTYPE *GetName)( - IDebugPropertyEnumType_All* This, + IDebugPropertyEnumType_All *This, BSTR *a); END_INTERFACE } IDebugPropertyEnumType_AllVtbl; + interface IDebugPropertyEnumType_All { CONST_VTBL IDebugPropertyEnumType_AllVtbl* lpVtbl; }; @@ -1190,14 +1073,6 @@ static FORCEINLINE HRESULT IDebugPropertyEnumType_All_GetName(IDebugPropertyEnum #endif -HRESULT STDMETHODCALLTYPE IDebugPropertyEnumType_All_GetName_Proxy( - IDebugPropertyEnumType_All* This, - BSTR *a); -void __RPC_STUB IDebugPropertyEnumType_All_GetName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDebugPropertyEnumType_All_INTERFACE_DEFINED__ */ @@ -1223,23 +1098,24 @@ typedef struct IDebugPropertyEnumType_LocalsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugPropertyEnumType_Locals* This, + IDebugPropertyEnumType_Locals *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugPropertyEnumType_Locals* This); + IDebugPropertyEnumType_Locals *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugPropertyEnumType_Locals* This); + IDebugPropertyEnumType_Locals *This); /*** IDebugPropertyEnumType_All methods ***/ HRESULT (STDMETHODCALLTYPE *GetName)( - IDebugPropertyEnumType_Locals* This, + IDebugPropertyEnumType_Locals *This, BSTR *a); END_INTERFACE } IDebugPropertyEnumType_LocalsVtbl; + interface IDebugPropertyEnumType_Locals { CONST_VTBL IDebugPropertyEnumType_LocalsVtbl* lpVtbl; }; @@ -1297,23 +1173,24 @@ typedef struct IDebugPropertyEnumType_ArgumentsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugPropertyEnumType_Arguments* This, + IDebugPropertyEnumType_Arguments *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugPropertyEnumType_Arguments* This); + IDebugPropertyEnumType_Arguments *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugPropertyEnumType_Arguments* This); + IDebugPropertyEnumType_Arguments *This); /*** IDebugPropertyEnumType_All methods ***/ HRESULT (STDMETHODCALLTYPE *GetName)( - IDebugPropertyEnumType_Arguments* This, + IDebugPropertyEnumType_Arguments *This, BSTR *a); END_INTERFACE } IDebugPropertyEnumType_ArgumentsVtbl; + interface IDebugPropertyEnumType_Arguments { CONST_VTBL IDebugPropertyEnumType_ArgumentsVtbl* lpVtbl; }; @@ -1371,23 +1248,24 @@ typedef struct IDebugPropertyEnumType_LocalsPlusArgsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugPropertyEnumType_LocalsPlusArgs* This, + IDebugPropertyEnumType_LocalsPlusArgs *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugPropertyEnumType_LocalsPlusArgs* This); + IDebugPropertyEnumType_LocalsPlusArgs *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugPropertyEnumType_LocalsPlusArgs* This); + IDebugPropertyEnumType_LocalsPlusArgs *This); /*** IDebugPropertyEnumType_All methods ***/ HRESULT (STDMETHODCALLTYPE *GetName)( - IDebugPropertyEnumType_LocalsPlusArgs* This, + IDebugPropertyEnumType_LocalsPlusArgs *This, BSTR *a); END_INTERFACE } IDebugPropertyEnumType_LocalsPlusArgsVtbl; + interface IDebugPropertyEnumType_LocalsPlusArgs { CONST_VTBL IDebugPropertyEnumType_LocalsPlusArgsVtbl* lpVtbl; }; @@ -1445,23 +1323,24 @@ typedef struct IDebugPropertyEnumType_RegistersVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDebugPropertyEnumType_Registers* This, + IDebugPropertyEnumType_Registers *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDebugPropertyEnumType_Registers* This); + IDebugPropertyEnumType_Registers *This); ULONG (STDMETHODCALLTYPE *Release)( - IDebugPropertyEnumType_Registers* This); + IDebugPropertyEnumType_Registers *This); /*** IDebugPropertyEnumType_All methods ***/ HRESULT (STDMETHODCALLTYPE *GetName)( - IDebugPropertyEnumType_Registers* This, + IDebugPropertyEnumType_Registers *This, BSTR *a); END_INTERFACE } IDebugPropertyEnumType_RegistersVtbl; + interface IDebugPropertyEnumType_Registers { CONST_VTBL IDebugPropertyEnumType_RegistersVtbl* lpVtbl; }; diff --git a/lib/libc/include/any-windows-any/dcomp.h b/lib/libc/include/any-windows-any/dcomp.h index 160f3de756..9bd9a4efa8 100644 --- a/lib/libc/include/any-windows-any/dcomp.h +++ b/lib/libc/include/any-windows-any/dcomp.h @@ -283,5 +283,26 @@ DECLARE_INTERFACE_IID_(IDCompositionDevice,IUnknown,"c37ea93a-e7aa-450d-b16f-974 __CRT_UUID_DECL(IDCompositionDevice,0xc37ea93a,0xe7aa,0x450d,0xb1,0x6f,0x97,0x46,0xcb,0x04,0x07,0xf3); #endif +STDAPI DCompositionCreateDevice(IDXGIDevice *dxgiDevice, REFIID iid, void **dcompositionDevice); + +#if (_WIN32_WINNT >= 0x0603) + +STDAPI DCompositionCreateDevice2(IUnknown *renderingDevice, REFIID iid, void **dcompositionDevice); + +#endif + +#if (_WIN32_WINNT >= 0x0A00) + +STDAPI DCompositionCreateDevice3(IUnknown *renderingDevice, REFIID iid, void **dcompositionDevice); + +#endif + +STDAPI DCompositionCreateSurfaceHandle(DWORD desiredAccess, SECURITY_ATTRIBUTES *securityAttributes, HANDLE *surfaceHandle); + +STDAPI DCompositionAttachMouseWheelToHwnd(IDCompositionVisual* visual, HWND hwnd, BOOL enable); + +STDAPI DCompositionAttachMouseDragToHwnd(IDCompositionVisual* visual, HWND hwnd, BOOL enable); + + #endif #endif /* _DCOMP_H_ */ diff --git a/lib/libc/include/any-windows-any/dcompanimation.h b/lib/libc/include/any-windows-any/dcompanimation.h index 20df08326d..4d57175d9a 100644 --- a/lib/libc/include/any-windows-any/dcompanimation.h +++ b/lib/libc/include/any-windows-any/dcompanimation.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/dcompanimation.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/dcompanimation.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,6 +21,9 @@ #ifndef __IDCompositionAnimation_FWD_DEFINED__ #define __IDCompositionAnimation_FWD_DEFINED__ typedef interface IDCompositionAnimation IDCompositionAnimation; +#ifdef __cplusplus +interface IDCompositionAnimation; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -80,26 +84,26 @@ typedef struct IDCompositionAnimationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDCompositionAnimation* This, + IDCompositionAnimation *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDCompositionAnimation* This); + IDCompositionAnimation *This); ULONG (STDMETHODCALLTYPE *Release)( - IDCompositionAnimation* This); + IDCompositionAnimation *This); /*** IDCompositionAnimation methods ***/ HRESULT (STDMETHODCALLTYPE *Reset)( - IDCompositionAnimation* This); + IDCompositionAnimation *This); HRESULT (STDMETHODCALLTYPE *SetAbsoluteBeginTime)( - IDCompositionAnimation* This, + IDCompositionAnimation *This, LARGE_INTEGER a); HRESULT (STDMETHODCALLTYPE *AddCubic)( - IDCompositionAnimation* This, + IDCompositionAnimation *This, double a, float b, float c, @@ -107,7 +111,7 @@ typedef struct IDCompositionAnimationVtbl { float e); HRESULT (STDMETHODCALLTYPE *AddSinusoidal)( - IDCompositionAnimation* This, + IDCompositionAnimation *This, double a, float b, float c, @@ -115,17 +119,18 @@ typedef struct IDCompositionAnimationVtbl { float e); HRESULT (STDMETHODCALLTYPE *AddRepeat)( - IDCompositionAnimation* This, + IDCompositionAnimation *This, double a, double b); HRESULT (STDMETHODCALLTYPE *End)( - IDCompositionAnimation* This, + IDCompositionAnimation *This, double a, float b); END_INTERFACE } IDCompositionAnimationVtbl; + interface IDCompositionAnimation { CONST_VTBL IDCompositionAnimationVtbl* lpVtbl; }; @@ -178,63 +183,6 @@ static FORCEINLINE HRESULT IDCompositionAnimation_End(IDCompositionAnimation* Th #endif -HRESULT STDMETHODCALLTYPE IDCompositionAnimation_Reset_Proxy( - IDCompositionAnimation* This); -void __RPC_STUB IDCompositionAnimation_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDCompositionAnimation_SetAbsoluteBeginTime_Proxy( - IDCompositionAnimation* This, - LARGE_INTEGER a); -void __RPC_STUB IDCompositionAnimation_SetAbsoluteBeginTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDCompositionAnimation_AddCubic_Proxy( - IDCompositionAnimation* This, - double a, - float b, - float c, - float d, - float e); -void __RPC_STUB IDCompositionAnimation_AddCubic_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDCompositionAnimation_AddSinusoidal_Proxy( - IDCompositionAnimation* This, - double a, - float b, - float c, - float d, - float e); -void __RPC_STUB IDCompositionAnimation_AddSinusoidal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDCompositionAnimation_AddRepeat_Proxy( - IDCompositionAnimation* This, - double a, - double b); -void __RPC_STUB IDCompositionAnimation_AddRepeat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDCompositionAnimation_End_Proxy( - IDCompositionAnimation* This, - double a, - float b); -void __RPC_STUB IDCompositionAnimation_End_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDCompositionAnimation_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/ddk/ntintsafe.h b/lib/libc/include/any-windows-any/ddk/ntintsafe.h new file mode 100644 index 0000000000..92f1858fee --- /dev/null +++ b/lib/libc/include/any-windows-any/ddk/ntintsafe.h @@ -0,0 +1,411 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#ifndef _NTINTSAFE_H_INCLUDED_ +#define _NTINTSAFE_H_INCLUDED_ + +#include + +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) + +#include +#include + +#ifndef __MINGW_INTSAFE_WORKS +#ifdef __clang__ +#if __has_builtin(__builtin_add_overflow) +#define __MINGW_INTSAFE_WORKS +#endif +#elif __GNUC__ >= 5 +#define __MINGW_INTSAFE_WORKS +#endif +#endif + +#ifdef __MINGW_INTSAFE_WORKS + +#ifndef __MINGW_INTSAFE_API +#define __MINGW_INTSAFE_API FORCEINLINE +#endif + +/** If CHAR is unsigned, use static inline for functions that operate +on chars. This avoids the risk of linking to the wrong function when +different translation units with different types of chars are linked +together, and code using signed chars will not be affected. */ +#ifndef __MINGW_INTSAFE_CHAR_API +#ifdef __CHAR_UNSIGNED__ +#define __MINGW_INTSAFE_CHAR_API static inline +#else +#define __MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_API +#endif +#endif + +#define __MINGW_INTSAFE_BODY(operation, x, y, overflow) \ +{ \ + if (__builtin_##operation##_overflow(x, y, result)) \ + { \ + *result = overflow; \ + return STATUS_INTEGER_OVERFLOW; \ + } \ + return STATUS_SUCCESS; \ +} + +#define __MINGW_INTSAFE_CONV_UCHAR(name, type_src, type_dest) \ + NTSTATUS Rtl##name(type_src operand, type_dest * result) \ + __MINGW_INTSAFE_BODY(add, operand, 0, 0) + +#define __MINGW_INTSAFE_CONV(name, type_src, type_dest) \ + NTSTATUS Rtl##name(type_src operand, type_dest * result) \ + __MINGW_INTSAFE_BODY(add, operand, 0, ~0) + +#define __MINGW_INTSAFE_MATH(name, type, operation) \ + NTSTATUS Rtl##name(type x, type y, type * result) \ + __MINGW_INTSAFE_BODY(operation, x, y, ~0) + +#ifdef __CHAR_UNSIGNED__ +#define __MINGW_INTSAFE_CONV_CHAR __MINGW_INTSAFE_CONV_UCHAR +#else +#define __MINGW_INTSAFE_CONV_CHAR __MINGW_INTSAFE_CONV +#endif + +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UInt8ToInt8, UINT8, INT8) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(UInt8ToChar, UINT8, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ByteToInt8, BYTE, INT8) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(ByteToChar, BYTE, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(Int8ToUChar, INT8, UCHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int8ToUInt8, INT8, UINT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int8ToUShort, INT8, USHORT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int8ToUInt, INT8, UINT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int8ToULong, INT8, ULONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int8ToUIntPtr, INT8, UINT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int8ToULongPtr, INT8, ULONG_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int8ToULongLong, INT8, ULONGLONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(UShortToUChar, USHORT, UCHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UShortToUInt8, USHORT, UINT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UShortToByte, USHORT, BYTE) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UShortToInt8, USHORT, INT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UShortToShort, USHORT, SHORT) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(UShortToChar, USHORT, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(WordToUChar, WORD, UCHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(WordToByte, WORD, BYTE) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(WordToShort, WORD, SHORT) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(WordToChar, WORD, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(ShortToUChar, SHORT, UCHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ShortToUInt8, SHORT, UINT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ShortToByte, SHORT, BYTE) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ShortToInt8, SHORT, INT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ShortToUShort, SHORT, USHORT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ShortToWord, SHORT, WORD) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ShortToUInt, SHORT, UINT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ShortToULong, SHORT, ULONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ShortToUIntPtr, SHORT, UINT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ShortToULongPtr, SHORT, ULONG_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ShortToDWordPtr, SHORT, DWORD_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ShortToULongLong, SHORT, ULONGLONG) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(ShortToChar, SHORT, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(UIntToUChar, UINT, UCHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntToUInt8, UINT, UINT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntToByte, UINT, BYTE) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntToInt8, UINT, INT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntToUShort, UINT, USHORT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntToWord, UINT, WORD) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntToShort, UINT, SHORT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntToLong, UINT, LONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntToInt, UINT, INT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntToIntPtr, UINT, INT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntToPtrdiffT, UINT, ptrdiff_t) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntToLongPtr, UINT, LONG_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntToSSIZET, UINT, SSIZE_T) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(UIntToChar, UINT, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(ULongToUChar, ULONG, UCHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongToUInt8, ULONG, UINT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongToByte, ULONG, BYTE) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongToInt8, ULONG, INT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongToUShort, ULONG, USHORT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongToWord, ULONG, WORD) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongToShort, ULONG, SHORT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongToUInt, ULONG, UINT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongToLong, ULONG, LONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongToInt, ULONG, INT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongToUIntPtr, ULONG, UINT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongToIntPtr, ULONG, INT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongToPtrdiffT, ULONG, ptrdiff_t) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongToLongPtr, ULONG, LONG_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongToSSIZET, ULONG, SSIZE_T) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV(ULongToChar, ULONG, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(DWordToUChar, DWORD, UCHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordToByte, DWORD, BYTE) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordToUShort, DWORD, USHORT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordToWord, DWORD, WORD) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordToShort, DWORD, SHORT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordToUInt, DWORD, UINT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordToLong, DWORD, LONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordToInt, DWORD, INT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordToUIntPtr, DWORD, UINT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordToIntPtr, DWORD, INT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordToPtrdiffT, DWORD, ptrdiff_t) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordToLongPtr, DWORD, LONG_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordToSSIZET, DWORD, SSIZE_T) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(DWordToChar, DWORD, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(LongToUChar, LONG, UCHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToUInt8, LONG, UINT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToByte, LONG, BYTE) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToInt8, LONG, INT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToUShort, LONG, USHORT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToWord, LONG, WORD) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToShort, LONG, SHORT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToUInt, LONG, UINT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToULong, LONG, ULONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToDWord, LONG, DWORD) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToInt, LONG, INT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToUIntPtr, LONG, UINT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToSizeT, LONG, size_t) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToULongPtr, LONG, ULONG_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToDWordPtr, LONG, DWORD_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToIntPtr, LONG, INT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToPtrdiffT, LONG, ptrdiff_t) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToULongLong, LONG, ULONGLONG) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(LongToChar, LONG, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(IntToUChar, INT, UCHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntToUInt8, INT, UINT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntToByte, INT, BYTE) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntToInt8, INT, INT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntToUShort, INT, USHORT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntToWord, INT, WORD) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntToShort, INT, SHORT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntToUInt, INT, UINT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntToULong, INT, ULONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntToDWord, INT, DWORD) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntToUIntPtr, INT, UINT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntToSizeT, INT, size_t) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntToULongPtr, INT, ULONG_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntToDWordPtr, INT, DWORD_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntToULongLong, INT, ULONGLONG) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(IntToChar, INT, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(UIntPtrToUChar, UINT_PTR, UCHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToUInt8, UINT_PTR, UINT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToInt8, UINT_PTR, INT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToUInt16, UINT_PTR, UINT16) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToUShort, UINT_PTR, USHORT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToInt16, UINT_PTR, INT16) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToShort, UINT_PTR, SHORT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToUInt, UINT_PTR, UINT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToULong, UINT_PTR, ULONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToDWord, UINT_PTR, DWORD) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToLong, UINT_PTR, LONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToInt, UINT_PTR, INT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToIntPtr, UINT_PTR, INT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToLongPtr, UINT_PTR, LONG_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToSSIZET, UINT_PTR, SSIZE_T) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToInt64, UINT_PTR, INT64) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToLongLong, UINT_PTR, LONGLONG) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(UIntPtrToChar, UINT_PTR, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SizeTToUInt, size_t, UINT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SizeTToULong, size_t, ULONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SizeTToDWord, size_t, DWORD) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SizeTToLong, size_t, LONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SizeTToInt, size_t, INT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SizeTToIntPtr, size_t, INT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SizeTToPtrdiffT, size_t, ptrdiff_t) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SizeTToLongPtr, size_t, LONG_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SizeTToSSIZET, size_t, SSIZE_T) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SizeTToInt64, size_t, INT64) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(ULongPtrToUChar, ULONG_PTR, UCHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongPtrToUInt8, ULONG_PTR, UINT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongPtrToInt8, ULONG_PTR, INT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongPtrToUShort, ULONG_PTR, USHORT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongPtrToShort, ULONG_PTR, SHORT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongPtrToUInt, ULONG_PTR, UINT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongPtrToULong, ULONG_PTR, ULONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongPtrToDWord, ULONG_PTR, DWORD) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongPtrToLong, ULONG_PTR, LONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongPtrToInt, ULONG_PTR, INT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongPtrToUIntPtr, ULONG_PTR, UINT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongPtrToIntPtr, ULONG_PTR, INT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongPtrToPtrdiffT, ULONG_PTR, ptrdiff_t) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongPtrToLongPtr, ULONG_PTR, LONG_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongPtrToSSIZET, ULONG_PTR, SSIZE_T) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongPtrToInt64, ULONG_PTR, INT64) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongPtrToLongLong, ULONG_PTR, LONGLONG) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(ULongPtrToChar, ULONG_PTR, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordPtrToUInt, DWORD_PTR, UINT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordPtrToULong, DWORD_PTR, ULONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordPtrToDWord, DWORD_PTR, DWORD) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordPtrToLong, DWORD_PTR, LONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordPtrToInt, DWORD_PTR, INT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordPtrToUIntPtr, DWORD_PTR, UINT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordPtrToIntPtr, DWORD_PTR, INT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordPtrToPtrdiffT, DWORD_PTR, ptrdiff_t) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordPtrToLongPtr, DWORD_PTR, LONG_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordPtrToSSIZET, DWORD_PTR, SSIZE_T) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordPtrToInt64, DWORD_PTR, INT64) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(IntPtrToUChar, INT_PTR, UCHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntPtrToUInt8, INT_PTR, UINT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntPtrToInt8, INT_PTR, INT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntPtrToUShort, INT_PTR, USHORT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntPtrToShort, INT_PTR, SHORT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntPtrToUInt, INT_PTR, UINT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntPtrToULong, INT_PTR, ULONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntPtrToDWord, INT_PTR, DWORD) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntPtrToLong, INT_PTR, LONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntPtrToInt, INT_PTR, INT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntPtrToUIntPtr, INT_PTR, UINT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntPtrToSizeT, INT_PTR, size_t) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntPtrToULongPtr, INT_PTR, ULONG_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntPtrToDWordPtr, INT_PTR, DWORD_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntPtrToLongPtr, INT_PTR, LONG_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntPtrToULongLong, INT_PTR, ULONGLONG) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(IntPtrToChar, INT_PTR, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToUInt, ptrdiff_t, UINT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToULong, ptrdiff_t, ULONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToDWord, ptrdiff_t, DWORD) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToLong, ptrdiff_t, LONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToInt, ptrdiff_t, INT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToUIntPtr, ptrdiff_t, UINT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToSizeT, ptrdiff_t, size_t) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToULongPtr, ptrdiff_t, ULONG_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToDWordPtr, ptrdiff_t, DWORD_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(LongPtrToUChar, LONG_PTR, UCHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongPtrToUInt8, LONG_PTR, UINT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongPtrToInt8, LONG_PTR, INT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongPtrToUShort, LONG_PTR, USHORT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongPtrToShort, LONG_PTR, SHORT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongPtrToUInt, LONG_PTR, UINT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongPtrToULong, LONG_PTR, ULONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongPtrToDWord, LONG_PTR, DWORD) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongPtrToLong, LONG_PTR, LONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongPtrToInt, LONG_PTR, INT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongPtrToUIntPtr, LONG_PTR, UINT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongPtrToSizeT, LONG_PTR, size_t) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongPtrToULongPtr, LONG_PTR, ULONG_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongPtrToDWordPtr, LONG_PTR, DWORD_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongPtrToIntPtr, LONG_PTR, INT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongPtrToULongLong, LONG_PTR, ULONGLONG) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(LongPtrToChar, LONG_PTR, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SSIZETToUInt, SSIZE_T, UINT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SSIZETToULong, SSIZE_T, ULONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SSIZETToDWord, SSIZE_T, DWORD) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SSIZETToLong, SSIZE_T, LONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SSIZETToInt, SSIZE_T, INT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SSIZETToUIntPtr, SSIZE_T, UINT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SSIZETToSizeT, SSIZE_T, size_t) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SSIZETToULongPtr, SSIZE_T, ULONG_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SSIZETToDWordPtr, SSIZE_T, DWORD_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SSIZETToIntPtr, SSIZE_T, INT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(ULongLongToUChar, ULONGLONG, UCHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToUInt8, ULONGLONG, UINT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToInt8, ULONGLONG, INT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToUShort, ULONGLONG, USHORT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToShort, ULONGLONG, SHORT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToUInt, ULONGLONG, UINT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToULong, ULONGLONG, ULONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToDWord, ULONGLONG, DWORD) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToLong, ULONGLONG, LONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToInt, ULONGLONG, INT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToUIntPtr, ULONGLONG, UINT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToSizeT, ULONGLONG, size_t) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToULongPtr, ULONGLONG, ULONG_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToDWordPtr, ULONGLONG, DWORD_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToIntPtr, ULONGLONG, INT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToPtrdiffT, ULONGLONG, ptrdiff_t) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToLongPtr, ULONGLONG, LONG_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToSSIZET, ULONGLONG, SSIZE_T) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToInt64, ULONGLONG, INT64) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToLongLong, ULONGLONG, LONGLONG) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(ULongLongToChar, ULONGLONG, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int64ToUInt, INT64, UINT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int64ToULong, INT64, ULONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int64ToDWord, INT64, DWORD) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int64ToLong, INT64, LONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int64ToInt, INT64, INT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int64ToUIntPtr, INT64, UINT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int64ToSizeT, INT64, size_t) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int64ToULongPtr, INT64, ULONG_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int64ToDWordPtr, INT64, DWORD_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int64ToIntPtr, INT64, INT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int64ToPtrdiffT, INT64, ptrdiff_t) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int64ToLongPtr, INT64, LONG_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int64ToSSIZET, INT64, SSIZE_T) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int64ToULongLong, INT64, ULONGLONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(LongLongToUChar, LONGLONG, UCHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongLongToUInt8, LONGLONG, UINT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongLongToInt8, LONGLONG, INT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongLongToUShort, LONGLONG, USHORT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongLongToShort, LONGLONG, SHORT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongLongToUInt, LONGLONG, UINT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongLongToULong, LONGLONG, ULONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongLongToLong, LONGLONG, LONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongLongToInt, LONGLONG, INT) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongLongToIntPtr, LONGLONG, INT_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongLongToLongPtr, LONGLONG, LONG_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongLongToULongLong, LONGLONG, ULONGLONG) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(LongLongToChar, LONGLONG, CHAR) + +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(UInt8Add, UINT8, add) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(Int8Add, INT8, add) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(UShortAdd, USHORT, add) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(WordAdd, WORD, add) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(ShortAdd, SHORT, add) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(UIntAdd, UINT, add) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(ULongAdd, ULONG, add) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(DWordAdd, DWORD, add) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongAdd, LONG, add) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(IntAdd, INT, add) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(UIntPtrAdd, UINT_PTR, add) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(SizeTAdd, size_t, add) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(ULongPtrAdd, ULONG_PTR, add) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(DWordPtrAdd, DWORD_PTR, add) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(IntPtrAdd, INT_PTR, add) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(PtrdiffTAdd, ptrdiff_t, add) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongPtrAdd, LONG_PTR, add) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(SSIZETAdd, SSIZE_T, add) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(ULongLongAdd, ULONGLONG, add) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongAdd, LONGLONG, add) + +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(UInt8Sub, UINT8, sub) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(Int8Sub, INT8, sub) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(UShortSub, USHORT, sub) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(WordSub, WORD, sub) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(ShortSub, SHORT, sub) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(UIntSub, UINT, sub) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(ULongSub, ULONG, sub) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(DWordSub, DWORD, sub) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongSub, LONG, sub) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(IntSub, INT, sub) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(UIntPtrSub, UINT_PTR, sub) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(SizeTSub, size_t, sub) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(ULongPtrSub, ULONG_PTR, sub) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(DWordPtrSub, DWORD_PTR, sub) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(IntPtrSub, INT_PTR, sub) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(PtrdiffTSub, ptrdiff_t, sub) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongPtrSub, LONG_PTR, sub) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(SSIZETSub, SSIZE_T, sub) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(ULongLongSub, ULONGLONG, sub) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongSub, LONGLONG, sub) + +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(UInt8Mult, UINT8, mul) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(Int8Mult, INT8, mul) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(UShortMult, USHORT, mul) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(WordMult, WORD, mul) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(ShortMult, SHORT, mul) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(UIntMult, UINT, mul) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(ULongMult, ULONG, mul) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(DWordMult, DWORD, mul) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongMult, LONG, mul) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(IntMult, INT, mul) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(UIntPtrMult, UINT_PTR, mul) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(SizeTMult, size_t, mul) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(ULongPtrMult, ULONG_PTR, mul) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(DWordPtrMult, DWORD_PTR, mul) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(IntPtrMult, INT_PTR, mul) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(PtrdiffTMult, ptrdiff_t, mul) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongPtrMult, LONG_PTR, mul) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(SSIZETMult, SSIZE_T, mul) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(ULongLongMult, ULONGLONG, mul) +__MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul) + +#endif /* __MINGW_INTSAFE_WORKS */ +#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ +#endif /* _NTINTSAFE_H_INCLUDED_ */ diff --git a/lib/libc/include/any-windows-any/ddk/ntstrsafe.h b/lib/libc/include/any-windows-any/ddk/ntstrsafe.h index 53dc8ab20c..95f4dd4d62 100644 --- a/lib/libc/include/any-windows-any/ddk/ntstrsafe.h +++ b/lib/libc/include/any-windows-any/ddk/ntstrsafe.h @@ -1,521 +1,1633 @@ -/* - * PROJECT: ReactOS Kernel - * LICENSE: This file is in the public domain. - * FILE: include/ddk/ntstrsafe.h - * PURPOSE: Safe String Library for NT Code (Native/Kernel) - * PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org) +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ - -/* INCLUDES ******************************************************************/ - #ifndef _NTSTRSAFE_H_INCLUDED_ #define _NTSTRSAFE_H_INCLUDED_ -// -// Dependencies -// +#include <_mingw_unicode.h> #include #include #include +#include -// -// Maximum limits: allow overriding the maximum -// -#ifndef NTSTRSAFE_MAX_CCH -#define NTSTRSAFE_MAX_CCH 2147483647 +#if defined(__CRT__NO_INLINE) && !defined(__CRT_STRSAFE_IMPL) +#define __STRSAFE__NO_INLINE #endif -#define NTSTRSAFE_MAX_LENGTH (NTSTRSAFE_MAX_CCH - 1) -// -// Typedefs -// -typedef ULONG DWORD; +#ifndef _SIZE_T_DEFINED +#define _SIZE_T_DEFINED +#undef size_t +#ifdef _WIN64 +__MINGW_EXTENSION typedef unsigned __int64 size_t; +#else +typedef unsigned int size_t; +#endif +#endif -/* PRIVATE FUNCTIONS *********************************************************/ +#ifndef _WCHAR_T_DEFINED +#define _WCHAR_T_DEFINED +typedef unsigned short wchar_t; +#endif -static __inline -NTSTATUS -NTAPI -RtlStringLengthWorkerA(IN LPCSTR String, - IN SIZE_T MaxLength, - OUT PSIZE_T ReturnLength OPTIONAL) -{ - NTSTATUS Status = STATUS_SUCCESS; - SIZE_T LocalMax = MaxLength; +#ifndef _NTSTATUS_DEFINED +#define _NTSTATUS_DEFINED +typedef __LONG32 NTSTATUS; +#endif - while (MaxLength && (*String != ANSI_NULL)) - { - String++; - MaxLength--; - } +#ifndef C_ASSERT +#ifdef _MSC_VER +# define C_ASSERT(e) typedef char __C_ASSERT__[(e)?1:-1] +#else +# define C_ASSERT(e) extern void __C_ASSERT__(int [(e)?1:-1]) +#endif +#endif /* C_ASSERT */ - if (!MaxLength) Status = STATUS_INVALID_PARAMETER; +/* extern removed for C mode to avoid double extern qualifier from __CRT_INLINE */ +#ifdef __cplusplus +#define _STRSAFE_EXTERN_C extern "C" +#else +#define _STRSAFE_EXTERN_C extern +#endif - if (ReturnLength) - { - if (NT_SUCCESS(Status)) - { - *ReturnLength = LocalMax - MaxLength; - } - else - { - *ReturnLength = 0; - } - } +#ifndef WINAPI +#if defined(_ARM_) +#define WINAPI +#else +#define WINAPI __stdcall +#endif +#endif - return Status; +#if !defined(__CRT__NO_INLINE) && !defined(__CRT_STRSAFE_IMPL) +#define NTSTRSAFEDDI _STRSAFE_EXTERN_C __inline NTSTATUS WINAPI +/* Variadic functions can't be __stdcall. */ +#define NTSTRSAFEDDIV _STRSAFE_EXTERN_C __inline NTSTATUS +#else +#define NTSTRSAFEDDI _STRSAFE_EXTERN_C NTSTATUS WINAPI +/* Variadic functions can't be __stdcall. */ +#define NTSTRSAFEDDIV _STRSAFE_EXTERN_C NTSTATUS +#endif + +#define NTSTRSAFE_MAX_CCH 2147483647 + +#define STRSAFE_IGNORE_NULLS 0x00000100 +#define STRSAFE_FILL_BEHIND_NULL 0x00000200 +#define STRSAFE_FILL_ON_FAILURE 0x00000400 +#define STRSAFE_NULL_ON_FAILURE 0x00000800 +#define STRSAFE_NO_TRUNCATION 0x00001000 +#define STRSAFE_IGNORE_NULL_UNICODE_STRINGS 0x00010000 +#define STRSAFE_UNICODE_STRING_DEST_NULL_TERMINATED 0x00020000 + +#define STRSAFE_VALID_FLAGS (0x000000FF | STRSAFE_IGNORE_NULLS | STRSAFE_FILL_BEHIND_NULL | STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION) +#define STRSAFE_UNICODE_STRING_VALID_FLAGS (STRSAFE_VALID_FLAGS | STRSAFE_IGNORE_NULL_UNICODE_STRINGS | STRSAFE_UNICODE_STRING_DEST_NULL_TERMINATED) + +#define STRSAFE_FILL_BYTE(x) ((unsigned __LONG32)((x & 0x000000FF) | STRSAFE_FILL_BEHIND_NULL)) +#define STRSAFE_FAILURE_BYTE(x) ((unsigned __LONG32)((x & 0x000000FF) | STRSAFE_FILL_ON_FAILURE)) + +#define STRSAFE_GET_FILL_PATTERN(dwFlags) ((int)(dwFlags & 0x000000FF)) + +typedef char *NTSTRSAFE_PSTR; +typedef const char *NTSTRSAFE_PCSTR; +typedef wchar_t *NTSTRSAFE_PWSTR; +typedef const wchar_t *NTSTRSAFE_PCWSTR; + +NTSTRSAFEDDI RtlStringCopyWorkerA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszSrc); +NTSTRSAFEDDI RtlStringCopyWorkerW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszSrc); +NTSTRSAFEDDI RtlStringCopyExWorkerA(NTSTRSAFE_PSTR pszDest,size_t cchDest,size_t cbDest,NTSTRSAFE_PCSTR pszSrc,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags); +NTSTRSAFEDDI RtlStringCopyExWorkerW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,size_t cbDest,NTSTRSAFE_PCWSTR pszSrc,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags); +NTSTRSAFEDDI RtlStringCopyNWorkerA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszSrc,size_t cchToCopy); +NTSTRSAFEDDI RtlStringCopyNWorkerW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszSrc,size_t cchToCopy); +NTSTRSAFEDDI RtlStringCopyNExWorkerA(NTSTRSAFE_PSTR pszDest,size_t cchDest,size_t cbDest,NTSTRSAFE_PCSTR pszSrc,size_t cchToCopy,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags); +NTSTRSAFEDDI RtlStringCopyNExWorkerW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,size_t cbDest,NTSTRSAFE_PCWSTR pszSrc,size_t cchToCopy,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags); +NTSTRSAFEDDI RtlStringCatWorkerA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszSrc); +NTSTRSAFEDDI RtlStringCatWorkerW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszSrc); +NTSTRSAFEDDI RtlStringCatExWorkerA(NTSTRSAFE_PSTR pszDest,size_t cchDest,size_t cbDest,NTSTRSAFE_PCSTR pszSrc,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags); +NTSTRSAFEDDI RtlStringCatExWorkerW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,size_t cbDest,NTSTRSAFE_PCWSTR pszSrc,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags); +NTSTRSAFEDDI RtlStringCatNWorkerA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszSrc,size_t cchToAppend); +NTSTRSAFEDDI RtlStringCatNWorkerW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszSrc,size_t cchToAppend); +NTSTRSAFEDDI RtlStringCatNExWorkerA(NTSTRSAFE_PSTR pszDest,size_t cchDest,size_t cbDest,NTSTRSAFE_PCSTR pszSrc,size_t cchToAppend,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags); +NTSTRSAFEDDI RtlStringCatNExWorkerW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,size_t cbDest,NTSTRSAFE_PCWSTR pszSrc,size_t cchToAppend,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags); +NTSTRSAFEDDI RtlStringVPrintfWorkerA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszFormat,va_list argList); +NTSTRSAFEDDI RtlStringVPrintfWorkerW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszFormat,va_list argList); +NTSTRSAFEDDI RtlStringVPrintfExWorkerA(NTSTRSAFE_PSTR pszDest,size_t cchDest,size_t cbDest,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags,NTSTRSAFE_PCSTR pszFormat,va_list argList); +NTSTRSAFEDDI RtlStringVPrintfExWorkerW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,size_t cbDest,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags,NTSTRSAFE_PCWSTR pszFormat,va_list argList); +NTSTRSAFEDDI RtlStringLengthWorkerA(NTSTRSAFE_PCSTR psz,size_t cchMax,size_t *pcchLength); +NTSTRSAFEDDI RtlStringLengthWorkerW(NTSTRSAFE_PCWSTR psz,size_t cchMax,size_t *pcchLength); + +#define RtlStringCchCopy __MINGW_NAME_AW(RtlStringCchCopy) + +NTSTRSAFEDDI RtlStringCchCopyA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszSrc); +NTSTRSAFEDDI RtlStringCchCopyW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszSrc); + +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDI RtlStringCchCopyA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszSrc) { + return (cchDest > NTSTRSAFE_MAX_CCH ? STATUS_INVALID_PARAMETER : RtlStringCopyWorkerA(pszDest,cchDest,pszSrc)); } -static __inline -NTSTATUS -NTAPI -RtlStringValidateDestA(IN LPSTR Destination, - IN SIZE_T Length, - OUT PSIZE_T ReturnLength OPTIONAL, - IN SIZE_T MaxLength) -{ - NTSTATUS Status = STATUS_SUCCESS; +NTSTRSAFEDDI RtlStringCchCopyW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszSrc) { + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + return RtlStringCopyWorkerW(pszDest,cchDest,pszSrc); +} +#endif /* !__STRSAFE__NO_INLINE */ - if (!(Length) || (Length > MaxLength)) Status = STATUS_INVALID_PARAMETER; +#define RtlStringCbCopy __MINGW_NAME_AW(RtlStringCbCopy) - if (ReturnLength) - { - if (NT_SUCCESS(Status)) - { - Status = RtlStringLengthWorkerA(Destination, - Length, - ReturnLength); - } - else - { - *ReturnLength = 0; - } - } +NTSTRSAFEDDI RtlStringCbCopyA(NTSTRSAFE_PSTR pszDest,size_t cbDest,NTSTRSAFE_PCSTR pszSrc); +NTSTRSAFEDDI RtlStringCbCopyW(NTSTRSAFE_PWSTR pszDest,size_t cbDest,NTSTRSAFE_PCWSTR pszSrc); - return Status; +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDI RtlStringCbCopyA(NTSTRSAFE_PSTR pszDest,size_t cbDest,NTSTRSAFE_PCSTR pszSrc) { + if(cbDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + return RtlStringCopyWorkerA(pszDest,cbDest,pszSrc); } -static __inline -NTSTATUS -NTAPI -RtlStringExValidateDestA(IN OUT LPSTR *Destination, - IN OUT PSIZE_T DestinationLength, - OUT PSIZE_T ReturnLength OPTIONAL, - IN SIZE_T MaxLength, - IN DWORD Flags) -{ - ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); - return RtlStringValidateDestA(*Destination, - *DestinationLength, - ReturnLength, - MaxLength); +NTSTRSAFEDDI RtlStringCbCopyW(NTSTRSAFE_PWSTR pszDest,size_t cbDest,NTSTRSAFE_PCWSTR pszSrc) { + size_t cchDest = cbDest / sizeof(wchar_t); + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + return RtlStringCopyWorkerW(pszDest,cchDest,pszSrc); +} +#endif /* !__STRSAFE__NO_INLINE */ + +#define RtlStringCchCopyEx __MINGW_NAME_AW(RtlStringCchCopyEx) + +NTSTRSAFEDDI RtlStringCchCopyExA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszSrc,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags); +NTSTRSAFEDDI RtlStringCchCopyExW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszSrc,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags); + +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDI RtlStringCchCopyExA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszSrc,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags) { + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + return RtlStringCopyExWorkerA(pszDest,cchDest,cchDest,pszSrc,ppszDestEnd,pcchRemaining,dwFlags); } -static __inline -NTSTATUS -NTAPI -RtlStringExValidateSrcA(IN OUT LPCSTR *Source OPTIONAL, - IN OUT PSIZE_T ReturnLength OPTIONAL, - IN SIZE_T MaxLength, - IN DWORD Flags) -{ - NTSTATUS Status = STATUS_SUCCESS; - ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); +NTSTRSAFEDDI RtlStringCchCopyExW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszSrc,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags) { + size_t cbDest; + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + cbDest = cchDest * sizeof(wchar_t); + return RtlStringCopyExWorkerW(pszDest,cchDest,cbDest,pszSrc,ppszDestEnd,pcchRemaining,dwFlags); +} +#endif /* !__STRSAFE__NO_INLINE */ - if ((ReturnLength) && (*ReturnLength >= MaxLength)) - { - Status = STATUS_INVALID_PARAMETER; - } +#define RtlStringCbCopyEx __MINGW_NAME_AW(RtlStringCbCopyEx) - return Status; +NTSTRSAFEDDI RtlStringCbCopyExA(NTSTRSAFE_PSTR pszDest,size_t cbDest,NTSTRSAFE_PCSTR pszSrc,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcbRemaining,unsigned __LONG32 dwFlags); +NTSTRSAFEDDI RtlStringCbCopyExW(NTSTRSAFE_PWSTR pszDest,size_t cbDest,NTSTRSAFE_PCWSTR pszSrc,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcbRemaining,unsigned __LONG32 dwFlags); + +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDI RtlStringCbCopyExA(NTSTRSAFE_PSTR pszDest,size_t cbDest,NTSTRSAFE_PCSTR pszSrc,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcbRemaining,unsigned __LONG32 dwFlags) { + NTSTATUS hr; + size_t cchRemaining = 0; + if(cbDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + hr = RtlStringCopyExWorkerA(pszDest,cbDest,cbDest,pszSrc,ppszDestEnd,&cchRemaining,dwFlags); + if(NT_SUCCESS(hr) || hr == STATUS_BUFFER_OVERFLOW) { + if(pcbRemaining) + *pcbRemaining = (cchRemaining*sizeof(char)) + (cbDest % sizeof(char)); + } + return hr; } -static __inline -NTSTATUS -NTAPI -RtlStringVPrintfWorkerA(OUT LPSTR Destination, - IN SIZE_T Length, - OUT PSIZE_T NewLength OPTIONAL, - IN LPCSTR Format, - IN va_list argList) -{ - NTSTATUS Status = STATUS_SUCCESS; - LONG Return; - SIZE_T MaxLength, LocalNewLength = 0; +NTSTRSAFEDDI RtlStringCbCopyExW(NTSTRSAFE_PWSTR pszDest,size_t cbDest,NTSTRSAFE_PCWSTR pszSrc,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcbRemaining,unsigned __LONG32 dwFlags) { + NTSTATUS hr; + size_t cchDest = cbDest / sizeof(wchar_t); + size_t cchRemaining = 0; - MaxLength = Length - 1; + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + hr = RtlStringCopyExWorkerW(pszDest,cchDest,cbDest,pszSrc,ppszDestEnd,&cchRemaining,dwFlags); + if(NT_SUCCESS(hr) || (hr==STATUS_BUFFER_OVERFLOW)) { + if(pcbRemaining) + *pcbRemaining = (cchRemaining*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); + } + return hr; +} +#endif /* !__STRSAFE__NO_INLINE */ - Return = _vsnprintf(Destination, MaxLength, Format, argList); - if ((Return < 0) || ((SIZE_T)Return > MaxLength)) - { - Destination += MaxLength; - *Destination = ANSI_NULL; +NTSTRSAFEDDI RtlStringCchCopyNA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszSrc,size_t cchToCopy); +NTSTRSAFEDDI RtlStringCchCopyNW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszSrc,size_t cchToCopy); +#define RtlStringCchCopyN __MINGW_NAME_AW(RtlStringCchCopyN) - LocalNewLength = MaxLength; - - Status = STATUS_BUFFER_OVERFLOW; - } - else if ((SIZE_T)Return == MaxLength) - { - Destination += MaxLength; - *Destination = ANSI_NULL; - - LocalNewLength = MaxLength; - } - else - { - LocalNewLength = Return; - } - - if (NewLength) *NewLength = LocalNewLength; - return Status; +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDI RtlStringCchCopyNA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszSrc,size_t cchToCopy) { + if(cchDest > NTSTRSAFE_MAX_CCH || cchToCopy > NTSTRSAFE_MAX_CCH) + return STATUS_INVALID_PARAMETER; + return RtlStringCopyNWorkerA(pszDest,cchDest,pszSrc,cchToCopy); } -static __inline -NTSTATUS -NTAPI -RtlStringCopyWorkerA(OUT LPSTR Destination, - IN SIZE_T Length, - OUT PSIZE_T NewLength OPTIONAL, - IN LPCSTR Source, - IN SIZE_T CopyLength) -{ - NTSTATUS Status = STATUS_SUCCESS; - SIZE_T LocalNewLength = 0; +NTSTRSAFEDDI RtlStringCchCopyNW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszSrc,size_t cchToCopy) { + if(cchDest > NTSTRSAFE_MAX_CCH || cchToCopy > NTSTRSAFE_MAX_CCH) + return STATUS_INVALID_PARAMETER; + return RtlStringCopyNWorkerW(pszDest,cchDest,pszSrc,cchToCopy); +} +#endif /* !__STRSAFE__NO_INLINE */ - while ((Length) && (CopyLength) && (*Source != ANSI_NULL)) - { - *Destination++ = *Source++; - Length--; - CopyLength--; +NTSTRSAFEDDI RtlStringCbCopyNA(NTSTRSAFE_PSTR pszDest,size_t cbDest,NTSTRSAFE_PCSTR pszSrc,size_t cbToCopy); +NTSTRSAFEDDI RtlStringCbCopyNW(NTSTRSAFE_PWSTR pszDest,size_t cbDest,NTSTRSAFE_PCWSTR pszSrc,size_t cbToCopy); - LocalNewLength++; - } +#define RtlStringCbCopyN __MINGW_NAME_AW(RtlStringCbCopyN) - if (!Length) - { - Destination--; - LocalNewLength--; - - Status = STATUS_BUFFER_OVERFLOW; - } - - *Destination = ANSI_NULL; - - if (NewLength) *NewLength = LocalNewLength; - return Status; +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDI RtlStringCbCopyNA(NTSTRSAFE_PSTR pszDest,size_t cbDest,NTSTRSAFE_PCSTR pszSrc,size_t cbToCopy) { + if(cbDest > NTSTRSAFE_MAX_CCH || cbToCopy > NTSTRSAFE_MAX_CCH) + return STATUS_INVALID_PARAMETER; + return RtlStringCopyNWorkerA(pszDest,cbDest,pszSrc,cbToCopy); } -/* PUBLIC FUNCTIONS **********************************************************/ +NTSTRSAFEDDI RtlStringCbCopyNW(NTSTRSAFE_PWSTR pszDest,size_t cbDest,NTSTRSAFE_PCWSTR pszSrc,size_t cbToCopy) { + size_t cchDest = cbDest / sizeof(wchar_t); + size_t cchToCopy = cbToCopy / sizeof(wchar_t); + if(cchDest > NTSTRSAFE_MAX_CCH || cchToCopy > NTSTRSAFE_MAX_CCH) + return STATUS_INVALID_PARAMETER; + return RtlStringCopyNWorkerW(pszDest,cchDest,pszSrc,cchToCopy); +} +#endif /* !__STRSAFE__NO_INLINE */ -static __inline -NTSTATUS -NTAPI -RtlStringCchCopyA(IN LPSTR Destination, - IN SIZE_T cchDest, - IN LPCSTR pszSrc) -{ - ASSERTMSG("RtlStringCchCopyA is UNIMPLEMENTED!\n", FALSE); - return STATUS_NOT_IMPLEMENTED; +NTSTRSAFEDDI RtlStringCchCopyNExA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszSrc,size_t cchToCopy,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags); +NTSTRSAFEDDI RtlStringCchCopyNExW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszSrc,size_t cchToCopy,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags); + +#define RtlStringCchCopyNEx __MINGW_NAME_AW(RtlStringCchCopyNEx) + +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDI RtlStringCchCopyNExA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszSrc,size_t cchToCopy,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags) { + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + return RtlStringCopyNExWorkerA(pszDest,cchDest,cchDest,pszSrc,cchToCopy,ppszDestEnd,pcchRemaining,dwFlags); } -static __inline -NTSTATUS -RtlStringCbPrintfA(OUT LPSTR Destination, - IN SIZE_T Length, - IN LPCSTR Format, - ...) -{ - NTSTATUS Status; - SIZE_T CharLength = Length / sizeof(CHAR); +NTSTRSAFEDDI RtlStringCchCopyNExW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszSrc,size_t cchToCopy,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags) { + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + return RtlStringCopyNExWorkerW(pszDest,cchDest,cchDest * sizeof(wchar_t),pszSrc,cchToCopy,ppszDestEnd,pcchRemaining,dwFlags); +} +#endif /* !__STRSAFE__NO_INLINE */ + +NTSTRSAFEDDI RtlStringCbCopyNExA(NTSTRSAFE_PSTR pszDest,size_t cbDest,NTSTRSAFE_PCSTR pszSrc,size_t cbToCopy,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcbRemaining,unsigned __LONG32 dwFlags); +NTSTRSAFEDDI RtlStringCbCopyNExW(NTSTRSAFE_PWSTR pszDest,size_t cbDest,NTSTRSAFE_PCWSTR pszSrc,size_t cbToCopy,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcbRemaining,unsigned __LONG32 dwFlags); + +#define RtlStringCbCopyNEx __MINGW_NAME_AW(RtlStringCbCopyNEx) + +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDI RtlStringCbCopyNExA(NTSTRSAFE_PSTR pszDest,size_t cbDest,NTSTRSAFE_PCSTR pszSrc,size_t cbToCopy,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcbRemaining,unsigned __LONG32 dwFlags) { + NTSTATUS hr; + size_t cchRemaining = 0; + if(cbDest > NTSTRSAFE_MAX_CCH) + hr = STATUS_INVALID_PARAMETER; + else + hr = RtlStringCopyNExWorkerA(pszDest,cbDest,cbDest,pszSrc,cbToCopy,ppszDestEnd,&cchRemaining,dwFlags); + if((NT_SUCCESS(hr) || hr == STATUS_BUFFER_OVERFLOW) && pcbRemaining) + *pcbRemaining = cchRemaining; + return hr; +} + +NTSTRSAFEDDI RtlStringCbCopyNExW(NTSTRSAFE_PWSTR pszDest,size_t cbDest,NTSTRSAFE_PCWSTR pszSrc,size_t cbToCopy,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcbRemaining,unsigned __LONG32 dwFlags) { + NTSTATUS hr; + size_t cchDest; + size_t cchToCopy; + size_t cchRemaining = 0; + cchDest = cbDest / sizeof(wchar_t); + cchToCopy = cbToCopy / sizeof(wchar_t); + if(cchDest > NTSTRSAFE_MAX_CCH) hr = STATUS_INVALID_PARAMETER; + else hr = RtlStringCopyNExWorkerW(pszDest,cchDest,cbDest,pszSrc,cchToCopy,ppszDestEnd,&cchRemaining,dwFlags); + if((NT_SUCCESS(hr) || hr == STATUS_BUFFER_OVERFLOW) && pcbRemaining) + *pcbRemaining = (cchRemaining*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); + return hr; +} +#endif /* !__STRSAFE__NO_INLINE */ + +NTSTRSAFEDDI RtlStringCchCatA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszSrc); +NTSTRSAFEDDI RtlStringCchCatW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszSrc); + +#define RtlStringCchCat __MINGW_NAME_AW(RtlStringCchCat) + +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDI RtlStringCchCatA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszSrc) { + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + return RtlStringCatWorkerA(pszDest,cchDest,pszSrc); +} + +NTSTRSAFEDDI RtlStringCchCatW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszSrc) { + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + return RtlStringCatWorkerW(pszDest,cchDest,pszSrc); +} +#endif /* !__STRSAFE__NO_INLINE */ + +NTSTRSAFEDDI RtlStringCbCatA(NTSTRSAFE_PSTR pszDest,size_t cbDest,NTSTRSAFE_PCSTR pszSrc); +NTSTRSAFEDDI RtlStringCbCatW(NTSTRSAFE_PWSTR pszDest,size_t cbDest,NTSTRSAFE_PCWSTR pszSrc); + +#define RtlStringCbCat __MINGW_NAME_AW(RtlStringCbCat) + +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDI RtlStringCbCatA(NTSTRSAFE_PSTR pszDest,size_t cbDest,NTSTRSAFE_PCSTR pszSrc) { + if(cbDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + return RtlStringCatWorkerA(pszDest,cbDest,pszSrc); +} + +NTSTRSAFEDDI RtlStringCbCatW(NTSTRSAFE_PWSTR pszDest,size_t cbDest,NTSTRSAFE_PCWSTR pszSrc) { + size_t cchDest = cbDest / sizeof(wchar_t); + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + return RtlStringCatWorkerW(pszDest,cchDest,pszSrc); +} +#endif /* !__STRSAFE__NO_INLINE */ + +NTSTRSAFEDDI RtlStringCchCatExA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszSrc,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags); +NTSTRSAFEDDI RtlStringCchCatExW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszSrc,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags); + +#define RtlStringCchCatEx __MINGW_NAME_AW(RtlStringCchCatEx) + +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDI RtlStringCchCatExA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszSrc,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags) { + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + return RtlStringCatExWorkerA(pszDest,cchDest,cchDest,pszSrc,ppszDestEnd,pcchRemaining,dwFlags); +} + +NTSTRSAFEDDI RtlStringCchCatExW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszSrc,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags) { + size_t cbDest = cchDest*sizeof(wchar_t); + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + return RtlStringCatExWorkerW(pszDest,cchDest,cbDest,pszSrc,ppszDestEnd,pcchRemaining,dwFlags); +} +#endif /* !__STRSAFE__NO_INLINE */ + +NTSTRSAFEDDI RtlStringCbCatExA(NTSTRSAFE_PSTR pszDest,size_t cbDest,NTSTRSAFE_PCSTR pszSrc,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcbRemaining,unsigned __LONG32 dwFlags); +NTSTRSAFEDDI RtlStringCbCatExW(NTSTRSAFE_PWSTR pszDest,size_t cbDest,NTSTRSAFE_PCWSTR pszSrc,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcbRemaining,unsigned __LONG32 dwFlags); + +#define RtlStringCbCatEx __MINGW_NAME_AW(RtlStringCbCatEx) + +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDI RtlStringCbCatExA(NTSTRSAFE_PSTR pszDest,size_t cbDest,NTSTRSAFE_PCSTR pszSrc,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcbRemaining,unsigned __LONG32 dwFlags) { + NTSTATUS hr; + size_t cchRemaining = 0; + if(cbDest > NTSTRSAFE_MAX_CCH) hr = STATUS_INVALID_PARAMETER; + else hr = RtlStringCatExWorkerA(pszDest,cbDest,cbDest,pszSrc,ppszDestEnd,&cchRemaining,dwFlags); + if((NT_SUCCESS(hr) || hr == STATUS_BUFFER_OVERFLOW) && pcbRemaining) + *pcbRemaining = (cchRemaining*sizeof(char)) + (cbDest % sizeof(char)); + return hr; +} + +NTSTRSAFEDDI RtlStringCbCatExW(NTSTRSAFE_PWSTR pszDest,size_t cbDest,NTSTRSAFE_PCWSTR pszSrc,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcbRemaining,unsigned __LONG32 dwFlags) { + NTSTATUS hr; + size_t cchDest = cbDest / sizeof(wchar_t); + size_t cchRemaining = 0; + + if(cchDest > NTSTRSAFE_MAX_CCH) hr = STATUS_INVALID_PARAMETER; + else hr = RtlStringCatExWorkerW(pszDest,cchDest,cbDest,pszSrc,ppszDestEnd,&cchRemaining,dwFlags); + if((NT_SUCCESS(hr) || hr == STATUS_BUFFER_OVERFLOW) && pcbRemaining) + *pcbRemaining = (cchRemaining*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); + return hr; +} +#endif /* !__STRSAFE__NO_INLINE */ + +NTSTRSAFEDDI RtlStringCchCatNA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszSrc,size_t cchToAppend); +NTSTRSAFEDDI RtlStringCchCatNW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszSrc,size_t cchToAppend); + +#define RtlStringCchCatN __MINGW_NAME_AW(RtlStringCchCatN) + +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDI RtlStringCchCatNA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszSrc,size_t cchToAppend) { + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + return RtlStringCatNWorkerA(pszDest,cchDest,pszSrc,cchToAppend); +} + +NTSTRSAFEDDI RtlStringCchCatNW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszSrc,size_t cchToAppend) { + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + return RtlStringCatNWorkerW(pszDest,cchDest,pszSrc,cchToAppend); +} +#endif /* !__STRSAFE__NO_INLINE */ + +NTSTRSAFEDDI RtlStringCbCatNA(NTSTRSAFE_PSTR pszDest,size_t cbDest,NTSTRSAFE_PCSTR pszSrc,size_t cbToAppend); +NTSTRSAFEDDI RtlStringCbCatNW(NTSTRSAFE_PWSTR pszDest,size_t cbDest,NTSTRSAFE_PCWSTR pszSrc,size_t cbToAppend); + +#define RtlStringCbCatN __MINGW_NAME_AW(RtlStringCbCatN) + +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDI RtlStringCbCatNA(NTSTRSAFE_PSTR pszDest,size_t cbDest,NTSTRSAFE_PCSTR pszSrc,size_t cbToAppend) { + if(cbDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + return RtlStringCatNWorkerA(pszDest,cbDest,pszSrc,cbToAppend); +} + +NTSTRSAFEDDI RtlStringCbCatNW(NTSTRSAFE_PWSTR pszDest,size_t cbDest,NTSTRSAFE_PCWSTR pszSrc,size_t cbToAppend) { + size_t cchDest = cbDest / sizeof(wchar_t); + size_t cchToAppend = cbToAppend / sizeof(wchar_t); + + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + return RtlStringCatNWorkerW(pszDest,cchDest,pszSrc,cchToAppend); +} +#endif /* !__STRSAFE__NO_INLINE */ + +NTSTRSAFEDDI RtlStringCchCatNExA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszSrc,size_t cchToAppend,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags); +NTSTRSAFEDDI RtlStringCchCatNExW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszSrc,size_t cchToAppend,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags); + +#define RtlStringCchCatNEx __MINGW_NAME_AW(RtlStringCchCatNEx) + +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDI RtlStringCchCatNExA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszSrc,size_t cchToAppend,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags) { + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + return RtlStringCatNExWorkerA(pszDest,cchDest,cchDest,pszSrc,cchToAppend,ppszDestEnd,pcchRemaining,dwFlags); +} + +NTSTRSAFEDDI RtlStringCchCatNExW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszSrc,size_t cchToAppend,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags) { + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + return RtlStringCatNExWorkerW(pszDest,cchDest,(cchDest*sizeof(wchar_t)),pszSrc,cchToAppend,ppszDestEnd,pcchRemaining,dwFlags); +} +#endif + +NTSTRSAFEDDI RtlStringCbCatNExA(NTSTRSAFE_PSTR pszDest,size_t cbDest,NTSTRSAFE_PCSTR pszSrc,size_t cbToAppend,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcbRemaining,unsigned __LONG32 dwFlags); +NTSTRSAFEDDI RtlStringCbCatNExW(NTSTRSAFE_PWSTR pszDest,size_t cbDest,NTSTRSAFE_PCWSTR pszSrc,size_t cbToAppend,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcbRemaining,unsigned __LONG32 dwFlags); + +#define RtlStringCbCatNEx __MINGW_NAME_AW(RtlStringCbCatNEx) + +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDI RtlStringCbCatNExA(NTSTRSAFE_PSTR pszDest,size_t cbDest,NTSTRSAFE_PCSTR pszSrc,size_t cbToAppend,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcbRemaining,unsigned __LONG32 dwFlags) { + NTSTATUS hr; + size_t cchRemaining = 0; + if(cbDest > NTSTRSAFE_MAX_CCH) hr = STATUS_INVALID_PARAMETER; + else hr = RtlStringCatNExWorkerA(pszDest,cbDest,cbDest,pszSrc,cbToAppend,ppszDestEnd,&cchRemaining,dwFlags); + if((NT_SUCCESS(hr) || hr == STATUS_BUFFER_OVERFLOW) && pcbRemaining) + *pcbRemaining = (cchRemaining*sizeof(char)) + (cbDest % sizeof(char)); + return hr; +} + +NTSTRSAFEDDI RtlStringCbCatNExW(NTSTRSAFE_PWSTR pszDest,size_t cbDest,NTSTRSAFE_PCWSTR pszSrc,size_t cbToAppend,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcbRemaining,unsigned __LONG32 dwFlags) { + NTSTATUS hr; + size_t cchDest = cbDest / sizeof(wchar_t); + size_t cchToAppend = cbToAppend / sizeof(wchar_t); + size_t cchRemaining = 0; + if(cchDest > NTSTRSAFE_MAX_CCH) hr = STATUS_INVALID_PARAMETER; + else hr = RtlStringCatNExWorkerW(pszDest,cchDest,cbDest,pszSrc,cchToAppend,ppszDestEnd,&cchRemaining,dwFlags); + if((NT_SUCCESS(hr) || hr == STATUS_BUFFER_OVERFLOW) && pcbRemaining) + *pcbRemaining = (cchRemaining*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); + return hr; +} +#endif /* !__STRSAFE__NO_INLINE */ + +NTSTRSAFEDDI RtlStringCchVPrintfA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszFormat,va_list argList); +NTSTRSAFEDDI RtlStringCchVPrintfW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszFormat,va_list argList); + +#define RtlStringCchVPrintf __MINGW_NAME_AW(RtlStringCchVPrintf) + +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDI RtlStringCchVPrintfA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszFormat,va_list argList) { + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + return RtlStringVPrintfWorkerA(pszDest,cchDest,pszFormat,argList); +} + +NTSTRSAFEDDI RtlStringCchVPrintfW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszFormat,va_list argList) { + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + return RtlStringVPrintfWorkerW(pszDest,cchDest,pszFormat,argList); +} +#endif /* !__STRSAFE__NO_INLINE */ + +NTSTRSAFEDDI RtlStringCbVPrintfA(NTSTRSAFE_PSTR pszDest,size_t cbDest,NTSTRSAFE_PCSTR pszFormat,va_list argList); +NTSTRSAFEDDI RtlStringCbVPrintfW(NTSTRSAFE_PWSTR pszDest,size_t cbDest,NTSTRSAFE_PCWSTR pszFormat,va_list argList); + +#define RtlStringCbVPrintf __MINGW_NAME_AW(RtlStringCbVPrintf) + +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDI RtlStringCbVPrintfA(NTSTRSAFE_PSTR pszDest,size_t cbDest,NTSTRSAFE_PCSTR pszFormat,va_list argList) { + if(cbDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + return RtlStringVPrintfWorkerA(pszDest,cbDest,pszFormat,argList); +} + +NTSTRSAFEDDI RtlStringCbVPrintfW(NTSTRSAFE_PWSTR pszDest,size_t cbDest,NTSTRSAFE_PCWSTR pszFormat,va_list argList) { + size_t cchDest = cbDest / sizeof(wchar_t); + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + return RtlStringVPrintfWorkerW(pszDest,cchDest,pszFormat,argList); +} +#endif /* !__STRSAFE__NO_INLINE */ + +NTSTRSAFEDDIV RtlStringCchPrintfA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszFormat,...); +NTSTRSAFEDDIV RtlStringCchPrintfW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszFormat,...); + +#define RtlStringCchPrintf __MINGW_NAME_AW(RtlStringCchPrintf) + +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDIV RtlStringCchPrintfA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszFormat,...) { + NTSTATUS hr; + va_list argList; + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + va_start(argList,pszFormat); + hr = RtlStringVPrintfWorkerA(pszDest,cchDest,pszFormat,argList); + va_end(argList); + return hr; +} + +NTSTRSAFEDDIV RtlStringCchPrintfW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszFormat,...) { + NTSTATUS hr; + va_list argList; + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + va_start(argList,pszFormat); + hr = RtlStringVPrintfWorkerW(pszDest,cchDest,pszFormat,argList); + va_end(argList); + return hr; +} +#endif /* !__STRSAFE__NO_INLINE */ + +NTSTRSAFEDDIV RtlStringCbPrintfA(NTSTRSAFE_PSTR pszDest,size_t cbDest,NTSTRSAFE_PCSTR pszFormat,...); +NTSTRSAFEDDIV RtlStringCbPrintfW(NTSTRSAFE_PWSTR pszDest,size_t cbDest,NTSTRSAFE_PCWSTR pszFormat,...); + +#define RtlStringCbPrintf __MINGW_NAME_AW(RtlStringCbPrintf) + +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDIV RtlStringCbPrintfA(NTSTRSAFE_PSTR pszDest,size_t cbDest,NTSTRSAFE_PCSTR pszFormat,...) { + NTSTATUS hr; + va_list argList; + if(cbDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + va_start(argList,pszFormat); + hr = RtlStringVPrintfWorkerA(pszDest,cbDest,pszFormat,argList); + va_end(argList); + return hr; +} + +NTSTRSAFEDDIV RtlStringCbPrintfW(NTSTRSAFE_PWSTR pszDest,size_t cbDest,NTSTRSAFE_PCWSTR pszFormat,...) { + NTSTATUS hr; + va_list argList; + size_t cchDest = cbDest / sizeof(wchar_t); + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + va_start(argList,pszFormat); + hr = RtlStringVPrintfWorkerW(pszDest,cchDest,pszFormat,argList); + va_end(argList); + return hr; +} +#endif /* !__STRSAFE__NO_INLINE */ + +NTSTRSAFEDDIV RtlStringCchPrintfExA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags,NTSTRSAFE_PCSTR pszFormat,...); +NTSTRSAFEDDIV RtlStringCchPrintfExW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags,NTSTRSAFE_PCWSTR pszFormat,...); + +#define RtlStringCchPrintfEx __MINGW_NAME_AW(RtlStringCchPrintfEx) + +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDIV RtlStringCchPrintfExA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags,NTSTRSAFE_PCSTR pszFormat,...) { + NTSTATUS hr; + va_list argList; + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + va_start(argList,pszFormat); + hr = RtlStringVPrintfExWorkerA(pszDest,cchDest,cchDest,ppszDestEnd,pcchRemaining,dwFlags,pszFormat,argList); + va_end(argList); + return hr; +} + +NTSTRSAFEDDIV RtlStringCchPrintfExW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags,NTSTRSAFE_PCWSTR pszFormat,...) { + NTSTATUS hr; + size_t cbDest = cchDest * sizeof(wchar_t); + va_list argList; + if(cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; + va_start(argList,pszFormat); + hr = RtlStringVPrintfExWorkerW(pszDest,cchDest,cbDest,ppszDestEnd,pcchRemaining,dwFlags,pszFormat,argList); + va_end(argList); + return hr; +} +#endif /* !__STRSAFE__NO_INLINE */ + +NTSTRSAFEDDIV RtlStringCbPrintfExA(NTSTRSAFE_PSTR pszDest,size_t cbDest,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcbRemaining,unsigned __LONG32 dwFlags,NTSTRSAFE_PCSTR pszFormat,...); +NTSTRSAFEDDIV RtlStringCbPrintfExW(NTSTRSAFE_PWSTR pszDest,size_t cbDest,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcbRemaining,unsigned __LONG32 dwFlags,NTSTRSAFE_PCWSTR pszFormat,...); + +#define RtlStringCbPrintfEx __MINGW_NAME_AW(RtlStringCbPrintfEx) + +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDIV RtlStringCbPrintfExA(NTSTRSAFE_PSTR pszDest,size_t cbDest,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcbRemaining,unsigned __LONG32 dwFlags,NTSTRSAFE_PCSTR pszFormat,...) { + NTSTATUS hr; + size_t cchDest; + size_t cchRemaining = 0; + cchDest = cbDest / sizeof(char); + if(cchDest > NTSTRSAFE_MAX_CCH) hr = STATUS_INVALID_PARAMETER; + else { va_list argList; - - Status = RtlStringValidateDestA(Destination, - CharLength, - NULL, - NTSTRSAFE_MAX_CCH); - if (NT_SUCCESS(Status)) - { - va_start(argList, Format); - Status = RtlStringVPrintfWorkerA(Destination, - CharLength, - NULL, - Format, - argList); - va_end(argList); + va_start(argList,pszFormat); + hr = RtlStringVPrintfExWorkerA(pszDest,cchDest,cbDest,ppszDestEnd,&cchRemaining,dwFlags,pszFormat,argList); + va_end(argList); + } + if(NT_SUCCESS(hr) || (hr==STATUS_BUFFER_OVERFLOW)) { + if(pcbRemaining) { + *pcbRemaining = (cchRemaining*sizeof(char)) + (cbDest % sizeof(char)); } - - return Status; + } + return hr; } -static __inline -NTSTATUS -RtlStringCbPrintfExA(OUT LPSTR Destination, - IN SIZE_T Length, - OUT LPSTR *DestinationEnd OPTIONAL, - OUT PSIZE_T RemainingSize OPTIONAL, - IN DWORD Flags, - IN LPCSTR Format, - ...) -{ - NTSTATUS Status; - SIZE_T CharLength = Length / sizeof(CHAR), Remaining, LocalNewLength = 0; - PCHAR LocalDestinationEnd; +NTSTRSAFEDDIV RtlStringCbPrintfExW(NTSTRSAFE_PWSTR pszDest,size_t cbDest,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcbRemaining,unsigned __LONG32 dwFlags,NTSTRSAFE_PCWSTR pszFormat,...) { + NTSTATUS hr; + size_t cchDest; + size_t cchRemaining = 0; + cchDest = cbDest / sizeof(wchar_t); + if(cchDest > NTSTRSAFE_MAX_CCH) hr = STATUS_INVALID_PARAMETER; + else { va_list argList; - ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); - - Status = RtlStringExValidateDestA(&Destination, - &CharLength, - NULL, - NTSTRSAFE_MAX_CCH, - Flags); - if (NT_SUCCESS(Status)) - { - LocalDestinationEnd = Destination; - Remaining = CharLength; - - Status = RtlStringExValidateSrcA(&Format, - NULL, - NTSTRSAFE_MAX_CCH, - Flags); - if (NT_SUCCESS(Status)) - { - if (!Length) - { - if (*Format != ANSI_NULL) - { - if (!Destination) - { - Status = STATUS_INVALID_PARAMETER; - } - else - { - Status = STATUS_BUFFER_OVERFLOW; - } - } - } - else - { - va_start(argList, Format); - Status = RtlStringVPrintfWorkerA(Destination, - CharLength, - &LocalNewLength, - Format, - argList); - va_end(argList); - - LocalDestinationEnd = Destination + LocalNewLength; - Remaining = CharLength - LocalNewLength; - } - } - else - { - if (Length) *Destination = ANSI_NULL; - } - - if ((NT_SUCCESS(Status)) || (Status == STATUS_BUFFER_OVERFLOW)) - { - if (DestinationEnd) *DestinationEnd = LocalDestinationEnd; - - if (RemainingSize) - { - *RemainingSize = (Remaining * sizeof(CHAR)) + - (Length % sizeof(CHAR)); - } - } + va_start(argList,pszFormat); + hr = RtlStringVPrintfExWorkerW(pszDest,cchDest,cbDest,ppszDestEnd,&cchRemaining,dwFlags,pszFormat,argList); + va_end(argList); + } + if(NT_SUCCESS(hr) || (hr==STATUS_BUFFER_OVERFLOW)) { + if(pcbRemaining) { + *pcbRemaining = (cchRemaining*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); } + } + return hr; +} +#endif /* !__STRSAFE__NO_INLINE */ - return Status; +NTSTRSAFEDDI RtlStringCchVPrintfExA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags,NTSTRSAFE_PCSTR pszFormat,va_list argList); +NTSTRSAFEDDI RtlStringCchVPrintfExW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags,NTSTRSAFE_PCWSTR pszFormat,va_list argList); + +#define RtlStringCchVPrintfEx __MINGW_NAME_AW(RtlStringCchVPrintfEx) + +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDI RtlStringCchVPrintfExA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags,NTSTRSAFE_PCSTR pszFormat,va_list argList) { + NTSTATUS hr; + if(cchDest > NTSTRSAFE_MAX_CCH) hr = STATUS_INVALID_PARAMETER; + else { + size_t cbDest; + cbDest = cchDest*sizeof(char); + hr = RtlStringVPrintfExWorkerA(pszDest,cchDest,cbDest,ppszDestEnd,pcchRemaining,dwFlags,pszFormat,argList); + } + return hr; } -static __inline -NTSTATUS -NTAPI -RtlStringCbCopyExA(OUT LPSTR Destination, - IN SIZE_T Length, - IN LPCSTR Source, - OUT LPSTR *DestinationEnd OPTIONAL, - OUT PSIZE_T RemainingSize OPTIONAL, - IN DWORD Flags) -{ - NTSTATUS Status; - SIZE_T CharLength = Length / sizeof(CHAR), Copied = 0, Remaining; - PCHAR LocalDestinationEnd; - ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); +NTSTRSAFEDDI RtlStringCchVPrintfExW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags,NTSTRSAFE_PCWSTR pszFormat,va_list argList) { + NTSTATUS hr; + if(cchDest > NTSTRSAFE_MAX_CCH) hr = STATUS_INVALID_PARAMETER; + else { + size_t cbDest; + cbDest = cchDest*sizeof(wchar_t); + hr = RtlStringVPrintfExWorkerW(pszDest,cchDest,cbDest,ppszDestEnd,pcchRemaining,dwFlags,pszFormat,argList); + } + return hr; +} +#endif /* !__STRSAFE__NO_INLINE */ - Status = RtlStringExValidateDestA(&Destination, - &Length, - NULL, - NTSTRSAFE_MAX_CCH, - Flags); - if (NT_SUCCESS(Status)) - { - LocalDestinationEnd = Destination; - Remaining = CharLength; +NTSTRSAFEDDI RtlStringCbVPrintfExA(NTSTRSAFE_PSTR pszDest,size_t cbDest,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcbRemaining,unsigned __LONG32 dwFlags,NTSTRSAFE_PCSTR pszFormat,va_list argList); +NTSTRSAFEDDI RtlStringCbVPrintfExW(NTSTRSAFE_PWSTR pszDest,size_t cbDest,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcbRemaining,unsigned __LONG32 dwFlags,NTSTRSAFE_PCWSTR pszFormat,va_list argList); - Status = RtlStringExValidateSrcA(&Source, - NULL, - NTSTRSAFE_MAX_CCH, - Flags); - if (NT_SUCCESS(Status)) - { - if (!CharLength) - { - if (*Source != ANSI_NULL) - { - if (!Destination) - { - Status = STATUS_INVALID_PARAMETER; - } - else - { - Status = STATUS_BUFFER_OVERFLOW; - } - } - } - else - { - Status = RtlStringCopyWorkerA(Destination, - CharLength, - &Copied, - Source, - NTSTRSAFE_MAX_LENGTH); +#define RtlStringCbVPrintfEx __MINGW_NAME_AW(RtlStringCbVPrintfEx) - LocalDestinationEnd = Destination + Copied; - Remaining = CharLength - Copied; - } - } - else - { - if (CharLength) *Destination = ANSI_NULL; - } - - if ((NT_SUCCESS(Status)) || (Status == STATUS_BUFFER_OVERFLOW)) - { - if (DestinationEnd) *DestinationEnd = LocalDestinationEnd; - - if (RemainingSize) - { - *RemainingSize = (Remaining * sizeof(CHAR)) + - (Length % sizeof(CHAR)); - } - } +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDI RtlStringCbVPrintfExA(NTSTRSAFE_PSTR pszDest,size_t cbDest,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcbRemaining,unsigned __LONG32 dwFlags,NTSTRSAFE_PCSTR pszFormat,va_list argList) { + NTSTATUS hr; + size_t cchDest; + size_t cchRemaining = 0; + cchDest = cbDest / sizeof(char); + if(cchDest > NTSTRSAFE_MAX_CCH) hr = STATUS_INVALID_PARAMETER; + else hr = RtlStringVPrintfExWorkerA(pszDest,cchDest,cbDest,ppszDestEnd,&cchRemaining,dwFlags,pszFormat,argList); + if(NT_SUCCESS(hr) || (hr==STATUS_BUFFER_OVERFLOW)) { + if(pcbRemaining) { + *pcbRemaining = (cchRemaining*sizeof(char)) + (cbDest % sizeof(char)); } - - return Status; + } + return hr; } -static __inline -NTSTATUS -RtlStringCbPrintfW( - LPWSTR pszDest, - IN size_t cbDest, - IN LPCWSTR pszFormat, - ...) -{ - ASSERTMSG("RtlStringCbPrintfW is UNIMPLEMENTED!\n", FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -static __inline -NTSTATUS -NTAPI -RtlStringCbCatExA(IN OUT LPSTR Destination, - IN SIZE_T Length, - IN LPCSTR Source, - OUT LPSTR *DestinationEnd OPTIONAL, - OUT PSIZE_T RemainingSize OPTIONAL, - IN DWORD Flags) -{ - NTSTATUS Status; - SIZE_T CharLength = Length / sizeof(CHAR); - SIZE_T DestinationLength, Remaining, Copied = 0; - PCHAR LocalDestinationEnd; - ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); - - Status = RtlStringExValidateDestA(&Destination, - &CharLength, - &DestinationLength, - NTSTRSAFE_MAX_CCH, - Flags); - if (NT_SUCCESS(Status)) - { - LocalDestinationEnd = Destination + DestinationLength; - Remaining = CharLength - DestinationLength; - - Status = RtlStringExValidateSrcA(&Source, - NULL, - NTSTRSAFE_MAX_CCH, - Flags); - if (NT_SUCCESS(Status)) - { - if (Remaining <= 1) - { - if (*Source != ANSI_NULL) - { - if (!Destination) - { - Status = STATUS_INVALID_PARAMETER; - } - else - { - Status = STATUS_BUFFER_OVERFLOW; - } - } - } - else - { - Status = RtlStringCopyWorkerA(LocalDestinationEnd, - Remaining, - &Copied, - Source, - NTSTRSAFE_MAX_LENGTH); - - LocalDestinationEnd = LocalDestinationEnd + Copied; - Remaining = Remaining - Copied; - } - } - - if ((NT_SUCCESS(Status)) || (Status == STATUS_BUFFER_OVERFLOW)) - { - if (DestinationEnd) *DestinationEnd = LocalDestinationEnd; - - if (RemainingSize) - { - *RemainingSize = (Remaining * sizeof(CHAR)) + - (Length % sizeof(CHAR)); - } - } +NTSTRSAFEDDI RtlStringCbVPrintfExW(NTSTRSAFE_PWSTR pszDest,size_t cbDest,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcbRemaining,unsigned __LONG32 dwFlags,NTSTRSAFE_PCWSTR pszFormat,va_list argList) { + NTSTATUS hr; + size_t cchDest; + size_t cchRemaining = 0; + cchDest = cbDest / sizeof(wchar_t); + if(cchDest > NTSTRSAFE_MAX_CCH) hr = STATUS_INVALID_PARAMETER; + else hr = RtlStringVPrintfExWorkerW(pszDest,cchDest,cbDest,ppszDestEnd,&cchRemaining,dwFlags,pszFormat,argList); + if(NT_SUCCESS(hr) || (hr==STATUS_BUFFER_OVERFLOW)) { + if(pcbRemaining) { + *pcbRemaining = (cchRemaining*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); } + } + return hr; +} +#endif /* !__STRSAFE__NO_INLINE */ - return Status; +NTSTRSAFEDDI RtlStringCchLengthA(NTSTRSAFE_PCSTR psz,size_t cchMax,size_t *pcchLength); +NTSTRSAFEDDI RtlStringCchLengthW(NTSTRSAFE_PCWSTR psz,size_t cchMax,size_t *pcchLength); + +#define RtlStringCchLength __MINGW_NAME_AW(RtlStringCchLength) + +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDI RtlStringCchLengthA(NTSTRSAFE_PCSTR psz,size_t cchMax,size_t *pcchLength) { + NTSTATUS hr; + if(!psz || (cchMax > NTSTRSAFE_MAX_CCH)) hr = STATUS_INVALID_PARAMETER; + else hr = RtlStringLengthWorkerA(psz,cchMax,pcchLength); + if(!NT_SUCCESS(hr) && pcchLength) { + *pcchLength = 0; + } + return hr; } -static __inline -NTSTATUS -NTAPI -RtlStringCbCopyA(OUT LPSTR Destination, - IN SIZE_T Length, - IN LPCSTR Source) -{ - NTSTATUS Status; - SIZE_T CharLength = Length / sizeof(CHAR); +NTSTRSAFEDDI RtlStringCchLengthW(NTSTRSAFE_PCWSTR psz,size_t cchMax,size_t *pcchLength) { + NTSTATUS hr; + if(!psz || (cchMax > NTSTRSAFE_MAX_CCH)) hr = STATUS_INVALID_PARAMETER; + else hr = RtlStringLengthWorkerW(psz,cchMax,pcchLength); + if(!NT_SUCCESS(hr) && pcchLength) { + *pcchLength = 0; + } + return hr; +} +#endif /* !__STRSAFE__NO_INLINE */ - Status = RtlStringValidateDestA(Destination, - CharLength, - NULL, - NTSTRSAFE_MAX_CCH); - if (NT_SUCCESS(Status)) - { - Status = RtlStringCopyWorkerA(Destination, - CharLength, - NULL, - Source, - NTSTRSAFE_MAX_LENGTH); +NTSTRSAFEDDI RtlStringCbLengthA(NTSTRSAFE_PCSTR psz,size_t cbMax,size_t *pcbLength); +NTSTRSAFEDDI RtlStringCbLengthW(NTSTRSAFE_PCWSTR psz,size_t cbMax,size_t *pcbLength); + +#define RtlStringCbLength __MINGW_NAME_AW(RtlStringCbLength) + +#ifndef __STRSAFE__NO_INLINE +NTSTRSAFEDDI RtlStringCbLengthA(NTSTRSAFE_PCSTR psz,size_t cbMax,size_t *pcbLength) { + NTSTATUS hr; + size_t cchMax; + size_t cchLength = 0; + cchMax = cbMax / sizeof(char); + if(!psz || (cchMax > NTSTRSAFE_MAX_CCH)) hr = STATUS_INVALID_PARAMETER; + else hr = RtlStringLengthWorkerA(psz,cchMax,&cchLength); + if(pcbLength) { + if(NT_SUCCESS(hr)) { + *pcbLength = cchLength*sizeof(char); + } else { + *pcbLength = 0; } - - return Status; + } + return hr; } -#endif /* _NTSTRSAFE_H_INCLUDED_ */ +NTSTRSAFEDDI RtlStringCbLengthW(NTSTRSAFE_PCWSTR psz,size_t cbMax,size_t *pcbLength) { + NTSTATUS hr; + size_t cchMax; + size_t cchLength = 0; + cchMax = cbMax / sizeof(wchar_t); + if(!psz || (cchMax > NTSTRSAFE_MAX_CCH)) hr = STATUS_INVALID_PARAMETER; + else hr = RtlStringLengthWorkerW(psz,cchMax,&cchLength); + if(pcbLength) { + if(NT_SUCCESS(hr)) { + *pcbLength = cchLength*sizeof(wchar_t); + } else { + *pcbLength = 0; + } + } + return hr; +} +NTSTRSAFEDDI RtlStringCopyWorkerA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszSrc) { + NTSTATUS hr = STATUS_SUCCESS; + if(cchDest==0) hr = STATUS_INVALID_PARAMETER; + else { + while(cchDest && (*pszSrc!='\0')) { + *pszDest++ = *pszSrc++; + cchDest--; + } + if(cchDest==0) { + pszDest--; + hr = STATUS_BUFFER_OVERFLOW; + } + *pszDest= '\0'; + } + return hr; +} + +NTSTRSAFEDDI RtlStringCopyWorkerW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszSrc) { + NTSTATUS hr = STATUS_SUCCESS; + if(cchDest==0) hr = STATUS_INVALID_PARAMETER; + else { + while(cchDest && (*pszSrc!=L'\0')) { + *pszDest++ = *pszSrc++; + cchDest--; + } + if(cchDest==0) { + pszDest--; + hr = STATUS_BUFFER_OVERFLOW; + } + *pszDest= L'\0'; + } + return hr; +} + +NTSTRSAFEDDI RtlStringCopyExWorkerA(NTSTRSAFE_PSTR pszDest,size_t cchDest,size_t cbDest,NTSTRSAFE_PCSTR pszSrc,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags) { + NTSTATUS hr = STATUS_SUCCESS; + NTSTRSAFE_PSTR pszDestEnd = pszDest; + size_t cchRemaining = 0; + if(dwFlags & (~STRSAFE_VALID_FLAGS)) hr = STATUS_INVALID_PARAMETER; + else { + if(dwFlags & STRSAFE_IGNORE_NULLS) { + if(!pszDest) { + if((cchDest!=0) || (cbDest!=0)) hr = STATUS_INVALID_PARAMETER; + } + if(!pszSrc) pszSrc = ""; + } + if(NT_SUCCESS(hr)) { + if(cchDest==0) { + pszDestEnd = pszDest; + cchRemaining = 0; + if(*pszSrc!='\0') { + if(!pszDest) hr = STATUS_INVALID_PARAMETER; + else hr = STATUS_BUFFER_OVERFLOW; + } + } else { + pszDestEnd = pszDest; + cchRemaining = cchDest; + while(cchRemaining && (*pszSrc!='\0')) { + *pszDestEnd++ = *pszSrc++; + cchRemaining--; + } + if(cchRemaining > 0) { + if(dwFlags & STRSAFE_FILL_BEHIND_NULL) { + memset(pszDestEnd + 1,STRSAFE_GET_FILL_PATTERN(dwFlags),((cchRemaining - 1)*sizeof(char)) + (cbDest % sizeof(char))); + } + } else { + pszDestEnd--; + cchRemaining++; + hr = STATUS_BUFFER_OVERFLOW; + } + *pszDestEnd = '\0'; + } + } + } + if(!NT_SUCCESS(hr)) { + if(pszDest) { + if(dwFlags & STRSAFE_FILL_ON_FAILURE) { + memset(pszDest,STRSAFE_GET_FILL_PATTERN(dwFlags),cbDest); + if(STRSAFE_GET_FILL_PATTERN(dwFlags)==0) { + pszDestEnd = pszDest; + cchRemaining = cchDest; + } else if(cchDest > 0) { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = '\0'; + } + } + if(dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) { + if(cchDest > 0) { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = '\0'; + } + } + } + } + if(NT_SUCCESS(hr) || (hr==STATUS_BUFFER_OVERFLOW)) { + if(ppszDestEnd) *ppszDestEnd = pszDestEnd; + if(pcchRemaining) *pcchRemaining = cchRemaining; + } + return hr; +} + +NTSTRSAFEDDI RtlStringCopyExWorkerW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,size_t cbDest,NTSTRSAFE_PCWSTR pszSrc,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags) { + NTSTATUS hr = STATUS_SUCCESS; + NTSTRSAFE_PWSTR pszDestEnd = pszDest; + size_t cchRemaining = 0; + if(dwFlags & (~STRSAFE_VALID_FLAGS)) hr = STATUS_INVALID_PARAMETER; + else { + if(dwFlags & STRSAFE_IGNORE_NULLS) { + if(!pszDest) { + if((cchDest!=0) || (cbDest!=0)) hr = STATUS_INVALID_PARAMETER; + } + if(!pszSrc) pszSrc = L""; + } + if(NT_SUCCESS(hr)) { + if(cchDest==0) { + pszDestEnd = pszDest; + cchRemaining = 0; + if(*pszSrc!=L'\0') { + if(!pszDest) hr = STATUS_INVALID_PARAMETER; + else hr = STATUS_BUFFER_OVERFLOW; + } + } else { + pszDestEnd = pszDest; + cchRemaining = cchDest; + while(cchRemaining && (*pszSrc!=L'\0')) { + *pszDestEnd++ = *pszSrc++; + cchRemaining--; + } + if(cchRemaining > 0) { + if(dwFlags & STRSAFE_FILL_BEHIND_NULL) { + memset(pszDestEnd + 1,STRSAFE_GET_FILL_PATTERN(dwFlags),((cchRemaining - 1)*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t))); + } + } else { + pszDestEnd--; + cchRemaining++; + hr = STATUS_BUFFER_OVERFLOW; + } + *pszDestEnd = L'\0'; + } + } + } + if(!NT_SUCCESS(hr)) { + if(pszDest) { + if(dwFlags & STRSAFE_FILL_ON_FAILURE) { + memset(pszDest,STRSAFE_GET_FILL_PATTERN(dwFlags),cbDest); + if(STRSAFE_GET_FILL_PATTERN(dwFlags)==0) { + pszDestEnd = pszDest; + cchRemaining = cchDest; + } else if(cchDest > 0) { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = L'\0'; + } + } + if(dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) { + if(cchDest > 0) { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = L'\0'; + } + } + } + } + if(NT_SUCCESS(hr) || (hr==STATUS_BUFFER_OVERFLOW)) { + if(ppszDestEnd) *ppszDestEnd = pszDestEnd; + if(pcchRemaining) *pcchRemaining = cchRemaining; + } + return hr; +} + +NTSTRSAFEDDI RtlStringCopyNWorkerA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszSrc,size_t cchSrc) { + NTSTATUS hr = STATUS_SUCCESS; + if(cchDest==0) hr = STATUS_INVALID_PARAMETER; + else { + while(cchDest && cchSrc && (*pszSrc!='\0')) { + *pszDest++ = *pszSrc++; + cchDest--; + cchSrc--; + } + if(cchDest==0) { + pszDest--; + hr = STATUS_BUFFER_OVERFLOW; + } + *pszDest= '\0'; + } + return hr; +} + +NTSTRSAFEDDI RtlStringCopyNWorkerW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszSrc,size_t cchToCopy) { + NTSTATUS hr = STATUS_SUCCESS; + if(cchDest==0) hr = STATUS_INVALID_PARAMETER; + else { + while(cchDest && cchToCopy && (*pszSrc!=L'\0')) { + *pszDest++ = *pszSrc++; + cchDest--; + cchToCopy--; + } + if(cchDest==0) { + pszDest--; + hr = STATUS_BUFFER_OVERFLOW; + } + *pszDest= L'\0'; + } + return hr; +} + +NTSTRSAFEDDI RtlStringCopyNExWorkerA(NTSTRSAFE_PSTR pszDest,size_t cchDest,size_t cbDest,NTSTRSAFE_PCSTR pszSrc,size_t cchToCopy,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags) { + NTSTATUS hr = STATUS_SUCCESS; + NTSTRSAFE_PSTR pszDestEnd = pszDest; + size_t cchRemaining = 0; + if(dwFlags & (~STRSAFE_VALID_FLAGS)) hr = STATUS_INVALID_PARAMETER; + else if(cchToCopy > NTSTRSAFE_MAX_CCH) hr = STATUS_INVALID_PARAMETER; + else { + if(dwFlags & STRSAFE_IGNORE_NULLS) { + if(!pszDest) { + if((cchDest!=0) || (cbDest!=0)) hr = STATUS_INVALID_PARAMETER; + } + if(!pszSrc) pszSrc = ""; + } + if(NT_SUCCESS(hr)) { + if(cchDest==0) { + pszDestEnd = pszDest; + cchRemaining = 0; + if((cchToCopy!=0) && (*pszSrc!='\0')) { + if(!pszDest) hr = STATUS_INVALID_PARAMETER; + else hr = STATUS_BUFFER_OVERFLOW; + } + } else { + pszDestEnd = pszDest; + cchRemaining = cchDest; + while(cchRemaining && cchToCopy && (*pszSrc!='\0')) { + *pszDestEnd++ = *pszSrc++; + cchRemaining--; + cchToCopy--; + } + if(cchRemaining > 0) { + if(dwFlags & STRSAFE_FILL_BEHIND_NULL) { + memset(pszDestEnd + 1,STRSAFE_GET_FILL_PATTERN(dwFlags),((cchRemaining - 1)*sizeof(char)) + (cbDest % sizeof(char))); + } + } else { + pszDestEnd--; + cchRemaining++; + hr = STATUS_BUFFER_OVERFLOW; + } + *pszDestEnd = '\0'; + } + } + } + if(!NT_SUCCESS(hr)) { + if(pszDest) { + if(dwFlags & STRSAFE_FILL_ON_FAILURE) { + memset(pszDest,STRSAFE_GET_FILL_PATTERN(dwFlags),cbDest); + if(STRSAFE_GET_FILL_PATTERN(dwFlags)==0) { + pszDestEnd = pszDest; + cchRemaining = cchDest; + } else if(cchDest > 0) { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = '\0'; + } + } + if(dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) { + if(cchDest > 0) { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = '\0'; + } + } + } + } + if(NT_SUCCESS(hr) || (hr==STATUS_BUFFER_OVERFLOW)) { + if(ppszDestEnd) *ppszDestEnd = pszDestEnd; + if(pcchRemaining) *pcchRemaining = cchRemaining; + } + return hr; +} + +NTSTRSAFEDDI RtlStringCopyNExWorkerW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,size_t cbDest,NTSTRSAFE_PCWSTR pszSrc,size_t cchToCopy,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags) { + NTSTATUS hr = STATUS_SUCCESS; + NTSTRSAFE_PWSTR pszDestEnd = pszDest; + size_t cchRemaining = 0; + if(dwFlags & (~STRSAFE_VALID_FLAGS)) hr = STATUS_INVALID_PARAMETER; + else if(cchToCopy > NTSTRSAFE_MAX_CCH) hr = STATUS_INVALID_PARAMETER; + else { + if(dwFlags & STRSAFE_IGNORE_NULLS) { + if(!pszDest) { + if((cchDest!=0) || (cbDest!=0)) hr = STATUS_INVALID_PARAMETER; + } + if(!pszSrc) pszSrc = L""; + } + if(NT_SUCCESS(hr)) { + if(cchDest==0) { + pszDestEnd = pszDest; + cchRemaining = 0; + if((cchToCopy!=0) && (*pszSrc!=L'\0')) { + if(!pszDest) hr = STATUS_INVALID_PARAMETER; + else hr = STATUS_BUFFER_OVERFLOW; + } + } else { + pszDestEnd = pszDest; + cchRemaining = cchDest; + while(cchRemaining && cchToCopy && (*pszSrc!=L'\0')) { + *pszDestEnd++ = *pszSrc++; + cchRemaining--; + cchToCopy--; + } + if(cchRemaining > 0) { + if(dwFlags & STRSAFE_FILL_BEHIND_NULL) { + memset(pszDestEnd + 1,STRSAFE_GET_FILL_PATTERN(dwFlags),((cchRemaining - 1)*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t))); + } + } else { + pszDestEnd--; + cchRemaining++; + hr = STATUS_BUFFER_OVERFLOW; + } + *pszDestEnd = L'\0'; + } + } + } + if(!NT_SUCCESS(hr)) { + if(pszDest) { + if(dwFlags & STRSAFE_FILL_ON_FAILURE) { + memset(pszDest,STRSAFE_GET_FILL_PATTERN(dwFlags),cbDest); + if(STRSAFE_GET_FILL_PATTERN(dwFlags)==0) { + pszDestEnd = pszDest; + cchRemaining = cchDest; + } else if(cchDest > 0) { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = L'\0'; + } + } + if(dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) { + if(cchDest > 0) { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = L'\0'; + } + } + } + } + if(NT_SUCCESS(hr) || (hr==STATUS_BUFFER_OVERFLOW)) { + if(ppszDestEnd) *ppszDestEnd = pszDestEnd; + if(pcchRemaining) *pcchRemaining = cchRemaining; + } + return hr; +} + +NTSTRSAFEDDI RtlStringCatWorkerA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszSrc) { + NTSTATUS hr; + size_t cchDestLength; + hr = RtlStringLengthWorkerA(pszDest,cchDest,&cchDestLength); + if(NT_SUCCESS(hr)) hr = RtlStringCopyWorkerA(pszDest + cchDestLength,cchDest - cchDestLength,pszSrc); + return hr; +} + +NTSTRSAFEDDI RtlStringCatWorkerW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszSrc) { + NTSTATUS hr; + size_t cchDestLength; + hr = RtlStringLengthWorkerW(pszDest,cchDest,&cchDestLength); + if(NT_SUCCESS(hr)) hr = RtlStringCopyWorkerW(pszDest + cchDestLength,cchDest - cchDestLength,pszSrc); + return hr; +} + +NTSTRSAFEDDI RtlStringCatExWorkerA(NTSTRSAFE_PSTR pszDest,size_t cchDest,size_t cbDest,NTSTRSAFE_PCSTR pszSrc,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags) { + NTSTATUS hr = STATUS_SUCCESS; + NTSTRSAFE_PSTR pszDestEnd = pszDest; + size_t cchRemaining = 0; + if(dwFlags & (~STRSAFE_VALID_FLAGS)) hr = STATUS_INVALID_PARAMETER; + else { + size_t cchDestLength; + if(dwFlags & STRSAFE_IGNORE_NULLS) { + if(!pszDest) { + if((cchDest==0) && (cbDest==0)) cchDestLength = 0; + else hr = STATUS_INVALID_PARAMETER; + } else { + hr = RtlStringLengthWorkerA(pszDest,cchDest,&cchDestLength); + if(NT_SUCCESS(hr)) { + pszDestEnd = pszDest + cchDestLength; + cchRemaining = cchDest - cchDestLength; + } + } + if(!pszSrc) pszSrc = ""; + } else { + hr = RtlStringLengthWorkerA(pszDest,cchDest,&cchDestLength); + if(NT_SUCCESS(hr)) { + pszDestEnd = pszDest + cchDestLength; + cchRemaining = cchDest - cchDestLength; + } + } + if(NT_SUCCESS(hr)) { + if(cchDest==0) { + if(*pszSrc!='\0') { + if(!pszDest) hr = STATUS_INVALID_PARAMETER; + else hr = STATUS_BUFFER_OVERFLOW; + } + } else hr = RtlStringCopyExWorkerA(pszDestEnd,cchRemaining,(cchRemaining*sizeof(char)) + (cbDest % sizeof(char)),pszSrc,&pszDestEnd,&cchRemaining,dwFlags & (~(STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE))); + } + } + if(!NT_SUCCESS(hr)) { + if(pszDest) { + if(dwFlags & STRSAFE_FILL_ON_FAILURE) { + memset(pszDest,STRSAFE_GET_FILL_PATTERN(dwFlags),cbDest); + if(STRSAFE_GET_FILL_PATTERN(dwFlags)==0) { + pszDestEnd = pszDest; + cchRemaining = cchDest; + } else if(cchDest > 0) { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = '\0'; + } + } + if(dwFlags & STRSAFE_NULL_ON_FAILURE) { + if(cchDest > 0) { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = '\0'; + } + } + } + } + if(NT_SUCCESS(hr) || (hr==STATUS_BUFFER_OVERFLOW)) { + if(ppszDestEnd) *ppszDestEnd = pszDestEnd; + if(pcchRemaining) *pcchRemaining = cchRemaining; + } + return hr; +} + +NTSTRSAFEDDI RtlStringCatExWorkerW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,size_t cbDest,NTSTRSAFE_PCWSTR pszSrc,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags) { + NTSTATUS hr = STATUS_SUCCESS; + NTSTRSAFE_PWSTR pszDestEnd = pszDest; + size_t cchRemaining = 0; + if(dwFlags & (~STRSAFE_VALID_FLAGS)) hr = STATUS_INVALID_PARAMETER; + else { + size_t cchDestLength; + if(dwFlags & STRSAFE_IGNORE_NULLS) { + if(!pszDest) { + if((cchDest==0) && (cbDest==0)) cchDestLength = 0; + else hr = STATUS_INVALID_PARAMETER; + } else { + hr = RtlStringLengthWorkerW(pszDest,cchDest,&cchDestLength); + if(NT_SUCCESS(hr)) { + pszDestEnd = pszDest + cchDestLength; + cchRemaining = cchDest - cchDestLength; + } + } + if(!pszSrc) pszSrc = L""; + } else { + hr = RtlStringLengthWorkerW(pszDest,cchDest,&cchDestLength); + if(NT_SUCCESS(hr)) { + pszDestEnd = pszDest + cchDestLength; + cchRemaining = cchDest - cchDestLength; + } + } + if(NT_SUCCESS(hr)) { + if(cchDest==0) { + if(*pszSrc!=L'\0') { + if(!pszDest) hr = STATUS_INVALID_PARAMETER; + else hr = STATUS_BUFFER_OVERFLOW; + } + } else hr = RtlStringCopyExWorkerW(pszDestEnd,cchRemaining,(cchRemaining*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)),pszSrc,&pszDestEnd,&cchRemaining,dwFlags & (~(STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE))); + } + } + if(!NT_SUCCESS(hr)) { + if(pszDest) { + if(dwFlags & STRSAFE_FILL_ON_FAILURE) { + memset(pszDest,STRSAFE_GET_FILL_PATTERN(dwFlags),cbDest); + if(STRSAFE_GET_FILL_PATTERN(dwFlags)==0) { + pszDestEnd = pszDest; + cchRemaining = cchDest; + } else if(cchDest > 0) { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = L'\0'; + } + } + if(dwFlags & STRSAFE_NULL_ON_FAILURE) { + if(cchDest > 0) { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = L'\0'; + } + } + } + } + if(NT_SUCCESS(hr) || (hr==STATUS_BUFFER_OVERFLOW)) { + if(ppszDestEnd) *ppszDestEnd = pszDestEnd; + if(pcchRemaining) *pcchRemaining = cchRemaining; + } + return hr; +} + +NTSTRSAFEDDI RtlStringCatNWorkerA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszSrc,size_t cchToAppend) { + NTSTATUS hr; + size_t cchDestLength; + hr = RtlStringLengthWorkerA(pszDest,cchDest,&cchDestLength); + if(NT_SUCCESS(hr)) hr = RtlStringCopyNWorkerA(pszDest + cchDestLength,cchDest - cchDestLength,pszSrc,cchToAppend); + return hr; +} + +NTSTRSAFEDDI RtlStringCatNWorkerW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszSrc,size_t cchToAppend) { + NTSTATUS hr; + size_t cchDestLength; + hr = RtlStringLengthWorkerW(pszDest,cchDest,&cchDestLength); + if(NT_SUCCESS(hr)) hr = RtlStringCopyNWorkerW(pszDest + cchDestLength,cchDest - cchDestLength,pszSrc,cchToAppend); + return hr; +} + +NTSTRSAFEDDI RtlStringCatNExWorkerA(NTSTRSAFE_PSTR pszDest,size_t cchDest,size_t cbDest,NTSTRSAFE_PCSTR pszSrc,size_t cchToAppend,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags) { + NTSTATUS hr = STATUS_SUCCESS; + NTSTRSAFE_PSTR pszDestEnd = pszDest; + size_t cchRemaining = 0; + size_t cchDestLength = 0; + if(dwFlags & (~STRSAFE_VALID_FLAGS)) hr = STATUS_INVALID_PARAMETER; + else if(cchToAppend > NTSTRSAFE_MAX_CCH) hr = STATUS_INVALID_PARAMETER; + else { + if(dwFlags & STRSAFE_IGNORE_NULLS) { + if(!pszDest) { + if((cchDest==0) && (cbDest==0)) cchDestLength = 0; + else hr = STATUS_INVALID_PARAMETER; + } else { + hr = RtlStringLengthWorkerA(pszDest,cchDest,&cchDestLength); + if(NT_SUCCESS(hr)) { + pszDestEnd = pszDest + cchDestLength; + cchRemaining = cchDest - cchDestLength; + } + } + if(!pszSrc) pszSrc = ""; + } else { + hr = RtlStringLengthWorkerA(pszDest,cchDest,&cchDestLength); + if(NT_SUCCESS(hr)) { + pszDestEnd = pszDest + cchDestLength; + cchRemaining = cchDest - cchDestLength; + } + } + if(NT_SUCCESS(hr)) { + if(cchDest==0) { + if((cchToAppend!=0) && (*pszSrc!='\0')) { + if(!pszDest) hr = STATUS_INVALID_PARAMETER; + else hr = STATUS_BUFFER_OVERFLOW; + } + } else hr = RtlStringCopyNExWorkerA(pszDestEnd,cchRemaining,(cchRemaining*sizeof(char)) + (cbDest % sizeof(char)),pszSrc,cchToAppend,&pszDestEnd,&cchRemaining,dwFlags & (~(STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE))); + } + } + if(!NT_SUCCESS(hr)) { + if(pszDest) { + if(dwFlags & STRSAFE_FILL_ON_FAILURE) { + memset(pszDest,STRSAFE_GET_FILL_PATTERN(dwFlags),cbDest); + if(STRSAFE_GET_FILL_PATTERN(dwFlags)==0) { + pszDestEnd = pszDest; + cchRemaining = cchDest; + } else if(cchDest > 0) { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = '\0'; + } + } + if(dwFlags & (STRSAFE_NULL_ON_FAILURE)) { + if(cchDest > 0) { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = '\0'; + } + } + } + } + if(NT_SUCCESS(hr) || (hr==STATUS_BUFFER_OVERFLOW)) { + if(ppszDestEnd) *ppszDestEnd = pszDestEnd; + if(pcchRemaining) *pcchRemaining = cchRemaining; + } + return hr; +} + +NTSTRSAFEDDI RtlStringCatNExWorkerW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,size_t cbDest,NTSTRSAFE_PCWSTR pszSrc,size_t cchToAppend,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags) { + NTSTATUS hr = STATUS_SUCCESS; + NTSTRSAFE_PWSTR pszDestEnd = pszDest; + size_t cchRemaining = 0; + size_t cchDestLength = 0; + if(dwFlags & (~STRSAFE_VALID_FLAGS)) hr = STATUS_INVALID_PARAMETER; + else if(cchToAppend > NTSTRSAFE_MAX_CCH) hr = STATUS_INVALID_PARAMETER; + else { + if(dwFlags & STRSAFE_IGNORE_NULLS) { + if(!pszDest) { + if((cchDest==0) && (cbDest==0)) cchDestLength = 0; + else hr = STATUS_INVALID_PARAMETER; + } else { + hr = RtlStringLengthWorkerW(pszDest,cchDest,&cchDestLength); + if(NT_SUCCESS(hr)) { + pszDestEnd = pszDest + cchDestLength; + cchRemaining = cchDest - cchDestLength; + } + } + if(!pszSrc) pszSrc = L""; + } else { + hr = RtlStringLengthWorkerW(pszDest,cchDest,&cchDestLength); + if(NT_SUCCESS(hr)) { + pszDestEnd = pszDest + cchDestLength; + cchRemaining = cchDest - cchDestLength; + } + } + if(NT_SUCCESS(hr)) { + if(cchDest==0) { + if((cchToAppend!=0) && (*pszSrc!=L'\0')) { + if(!pszDest) hr = STATUS_INVALID_PARAMETER; + else hr = STATUS_BUFFER_OVERFLOW; + } + } else hr = RtlStringCopyNExWorkerW(pszDestEnd,cchRemaining,(cchRemaining*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)),pszSrc,cchToAppend,&pszDestEnd,&cchRemaining,dwFlags & (~(STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE))); + } + } + if(!NT_SUCCESS(hr)) { + if(pszDest) { + if(dwFlags & STRSAFE_FILL_ON_FAILURE) { + memset(pszDest,STRSAFE_GET_FILL_PATTERN(dwFlags),cbDest); + if(STRSAFE_GET_FILL_PATTERN(dwFlags)==0) { + pszDestEnd = pszDest; + cchRemaining = cchDest; + } else if(cchDest > 0) { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = L'\0'; + } + } + if(dwFlags & (STRSAFE_NULL_ON_FAILURE)) { + if(cchDest > 0) { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = L'\0'; + } + } + } + } + if(NT_SUCCESS(hr) || (hr==STATUS_BUFFER_OVERFLOW)) { + if(ppszDestEnd) *ppszDestEnd = pszDestEnd; + if(pcchRemaining) *pcchRemaining = cchRemaining; + } + return hr; +} + +NTSTRSAFEDDI RtlStringVPrintfWorkerA(NTSTRSAFE_PSTR pszDest,size_t cchDest,NTSTRSAFE_PCSTR pszFormat,va_list argList) { + NTSTATUS hr = STATUS_SUCCESS; + if(cchDest==0) hr = STATUS_INVALID_PARAMETER; + else { + int iRet; + size_t cchMax; + cchMax = cchDest - 1; + iRet = _vsnprintf(pszDest,cchMax,pszFormat,argList); + if((iRet < 0) || (((size_t)iRet) > cchMax)) { + pszDest += cchMax; + *pszDest = '\0'; + hr = STATUS_BUFFER_OVERFLOW; + } else if(((size_t)iRet)==cchMax) { + pszDest += cchMax; + *pszDest = '\0'; + } + } + return hr; +} + +NTSTRSAFEDDI RtlStringVPrintfWorkerW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,NTSTRSAFE_PCWSTR pszFormat,va_list argList) { + NTSTATUS hr = STATUS_SUCCESS; + if(cchDest==0) hr = STATUS_INVALID_PARAMETER; + else { + int iRet; + size_t cchMax; + cchMax = cchDest - 1; + iRet = _vsnwprintf(pszDest,cchMax,pszFormat,argList); + if((iRet < 0) || (((size_t)iRet) > cchMax)) { + pszDest += cchMax; + *pszDest = L'\0'; + hr = STATUS_BUFFER_OVERFLOW; + } else if(((size_t)iRet)==cchMax) { + pszDest += cchMax; + *pszDest = L'\0'; + } + } + return hr; +} + +NTSTRSAFEDDI RtlStringVPrintfExWorkerA(NTSTRSAFE_PSTR pszDest,size_t cchDest,size_t cbDest,NTSTRSAFE_PSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags,NTSTRSAFE_PCSTR pszFormat,va_list argList) { + NTSTATUS hr = STATUS_SUCCESS; + NTSTRSAFE_PSTR pszDestEnd = pszDest; + size_t cchRemaining = 0; + if(dwFlags & (~STRSAFE_VALID_FLAGS)) hr = STATUS_INVALID_PARAMETER; + else { + if(dwFlags & STRSAFE_IGNORE_NULLS) { + if(!pszDest) { + if((cchDest!=0) || (cbDest!=0)) hr = STATUS_INVALID_PARAMETER; + } + if(!pszFormat) pszFormat = ""; + } + if(NT_SUCCESS(hr)) { + if(cchDest==0) { + pszDestEnd = pszDest; + cchRemaining = 0; + if(*pszFormat!='\0') { + if(!pszDest) hr = STATUS_INVALID_PARAMETER; + else hr = STATUS_BUFFER_OVERFLOW; + } + } else { + int iRet; + size_t cchMax; + cchMax = cchDest - 1; + iRet = _vsnprintf(pszDest,cchMax,pszFormat,argList); + if((iRet < 0) || (((size_t)iRet) > cchMax)) { + pszDestEnd = pszDest + cchMax; + cchRemaining = 1; + *pszDestEnd = '\0'; + hr = STATUS_BUFFER_OVERFLOW; + } else if(((size_t)iRet)==cchMax) { + pszDestEnd = pszDest + cchMax; + cchRemaining = 1; + *pszDestEnd = '\0'; + } else if(((size_t)iRet) < cchMax) { + pszDestEnd = pszDest + iRet; + cchRemaining = cchDest - iRet; + if(dwFlags & STRSAFE_FILL_BEHIND_NULL) { + memset(pszDestEnd + 1,STRSAFE_GET_FILL_PATTERN(dwFlags),((cchRemaining - 1)*sizeof(char)) + (cbDest % sizeof(char))); + } + } + } + } + } + if(!NT_SUCCESS(hr)) { + if(pszDest) { + if(dwFlags & STRSAFE_FILL_ON_FAILURE) { + memset(pszDest,STRSAFE_GET_FILL_PATTERN(dwFlags),cbDest); + if(STRSAFE_GET_FILL_PATTERN(dwFlags)==0) { + pszDestEnd = pszDest; + cchRemaining = cchDest; + } else if(cchDest > 0) { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = '\0'; + } + } + if(dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) { + if(cchDest > 0) { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = '\0'; + } + } + } + } + if(NT_SUCCESS(hr) || (hr==STATUS_BUFFER_OVERFLOW)) { + if(ppszDestEnd) *ppszDestEnd = pszDestEnd; + if(pcchRemaining) *pcchRemaining = cchRemaining; + } + return hr; +} + +NTSTRSAFEDDI RtlStringVPrintfExWorkerW(NTSTRSAFE_PWSTR pszDest,size_t cchDest,size_t cbDest,NTSTRSAFE_PWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned __LONG32 dwFlags,NTSTRSAFE_PCWSTR pszFormat,va_list argList) { + NTSTATUS hr = STATUS_SUCCESS; + NTSTRSAFE_PWSTR pszDestEnd = pszDest; + size_t cchRemaining = 0; + if(dwFlags & (~STRSAFE_VALID_FLAGS)) hr = STATUS_INVALID_PARAMETER; + else { + if(dwFlags & STRSAFE_IGNORE_NULLS) { + if(!pszDest) { + if((cchDest!=0) || (cbDest!=0)) hr = STATUS_INVALID_PARAMETER; + } + if(!pszFormat) pszFormat = L""; + } + if(NT_SUCCESS(hr)) { + if(cchDest==0) { + pszDestEnd = pszDest; + cchRemaining = 0; + if(*pszFormat!=L'\0') { + if(!pszDest) hr = STATUS_INVALID_PARAMETER; + else hr = STATUS_BUFFER_OVERFLOW; + } + } else { + int iRet; + size_t cchMax; + cchMax = cchDest - 1; + iRet = _vsnwprintf(pszDest,cchMax,pszFormat,argList); + if((iRet < 0) || (((size_t)iRet) > cchMax)) { + pszDestEnd = pszDest + cchMax; + cchRemaining = 1; + *pszDestEnd = L'\0'; + hr = STATUS_BUFFER_OVERFLOW; + } else if(((size_t)iRet)==cchMax) { + pszDestEnd = pszDest + cchMax; + cchRemaining = 1; + *pszDestEnd = L'\0'; + } else if(((size_t)iRet) < cchMax) { + pszDestEnd = pszDest + iRet; + cchRemaining = cchDest - iRet; + if(dwFlags & STRSAFE_FILL_BEHIND_NULL) { + memset(pszDestEnd + 1,STRSAFE_GET_FILL_PATTERN(dwFlags),((cchRemaining - 1)*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t))); + } + } + } + } + } + if(!NT_SUCCESS(hr)) { + if(pszDest) { + if(dwFlags & STRSAFE_FILL_ON_FAILURE) { + memset(pszDest,STRSAFE_GET_FILL_PATTERN(dwFlags),cbDest); + if(STRSAFE_GET_FILL_PATTERN(dwFlags)==0) { + pszDestEnd = pszDest; + cchRemaining = cchDest; + } else if(cchDest > 0) { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = L'\0'; + } + } + if(dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) { + if(cchDest > 0) { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = L'\0'; + } + } + } + } + if(NT_SUCCESS(hr) || (hr==STATUS_BUFFER_OVERFLOW)) { + if(ppszDestEnd) *ppszDestEnd = pszDestEnd; + if(pcchRemaining) *pcchRemaining = cchRemaining; + } + return hr; +} + +NTSTRSAFEDDI RtlStringLengthWorkerA(NTSTRSAFE_PCSTR psz,size_t cchMax,size_t *pcchLength) { + NTSTATUS hr = STATUS_SUCCESS; + size_t cchMaxPrev = cchMax; + while(cchMax && (*psz!='\0')) { + psz++; + cchMax--; + } + if(cchMax==0) hr = STATUS_INVALID_PARAMETER; + if(pcchLength) { + if(NT_SUCCESS(hr)) *pcchLength = cchMaxPrev - cchMax; + else *pcchLength = 0; + } + return hr; +} + +NTSTRSAFEDDI RtlStringLengthWorkerW(NTSTRSAFE_PCWSTR psz,size_t cchMax,size_t *pcchLength) { + NTSTATUS hr = STATUS_SUCCESS; + size_t cchMaxPrev = cchMax; + while(cchMax && (*psz!=L'\0')) { + psz++; + cchMax--; + } + if(cchMax==0) hr = STATUS_INVALID_PARAMETER; + if(pcchLength) { + if(NT_SUCCESS(hr)) *pcchLength = cchMaxPrev - cchMax; + else *pcchLength = 0; + } + return hr; +} + +#endif /* !__STRSAFE__NO_INLINE */ + +#define RtlStringCopyWorkerA RtlStringCopyWorkerA_instead_use_RtlStringCchCopyA_or_RtlStringCchCopyExA; +#define RtlStringCopyWorkerW RtlStringCopyWorkerW_instead_use_RtlStringCchCopyW_or_RtlStringCchCopyExW; +#define RtlStringCopyExWorkerA RtlStringCopyExWorkerA_instead_use_RtlStringCchCopyA_or_RtlStringCchCopyExA; +#define RtlStringCopyExWorkerW RtlStringCopyExWorkerW_instead_use_RtlStringCchCopyW_or_RtlStringCchCopyExW; +#define RtlStringCatWorkerA RtlStringCatWorkerA_instead_use_RtlStringCchCatA_or_RtlStringCchCatExA; +#define RtlStringCatWorkerW RtlStringCatWorkerW_instead_use_RtlStringCchCatW_or_RtlStringCchCatExW; +#define RtlStringCatExWorkerA RtlStringCatExWorkerA_instead_use_RtlStringCchCatA_or_RtlStringCchCatExA; +#define RtlStringCatExWorkerW RtlStringCatExWorkerW_instead_use_RtlStringCchCatW_or_RtlStringCchCatExW; +#define RtlStringCatNWorkerA RtlStringCatNWorkerA_instead_use_RtlStringCchCatNA_or_StrincCbCatNA; +#define RtlStringCatNWorkerW RtlStringCatNWorkerW_instead_use_RtlStringCchCatNW_or_RtlStringCbCatNW; +#define RtlStringCatNExWorkerA RtlStringCatNExWorkerA_instead_use_RtlStringCchCatNExA_or_RtlStringCbCatNExA; +#define RtlStringCatNExWorkerW RtlStringCatNExWorkerW_instead_use_RtlStringCchCatNExW_or_RtlStringCbCatNExW; +#define RtlStringVPrintfWorkerA RtlStringVPrintfWorkerA_instead_use_RtlStringCchVPrintfA_or_RtlStringCchVPrintfExA; +#define RtlStringVPrintfWorkerW RtlStringVPrintfWorkerW_instead_use_RtlStringCchVPrintfW_or_RtlStringCchVPrintfExW; +#define RtlStringVPrintfExWorkerA RtlStringVPrintfExWorkerA_instead_use_RtlStringCchVPrintfA_or_RtlStringCchVPrintfExA; +#define RtlStringVPrintfExWorkerW RtlStringVPrintfExWorkerW_instead_use_RtlStringCchVPrintfW_or_RtlStringCchVPrintfExW; +#define RtlStringLengthWorkerA RtlStringLengthWorkerA_instead_use_RtlStringCchLengthA_or_RtlStringCbLengthA; +#define RtlStringLengthWorkerW RtlStringLengthWorkerW_instead_use_RtlStringCchLengthW_or_RtlStringCbLengthW; + +#endif diff --git a/lib/libc/include/any-windows-any/ddk/wdm.h b/lib/libc/include/any-windows-any/ddk/wdm.h index 6ac1690491..f54e0a1230 100644 --- a/lib/libc/include/any-windows-any/ddk/wdm.h +++ b/lib/libc/include/any-windows-any/ddk/wdm.h @@ -369,19 +369,6 @@ InterlockedExchangeAdd( #endif // _M_AMD64 -#if defined(_M_AMD64) && !defined(RC_INVOKED) && !defined(MIDL_PASS) -//#if !defined(_X86AMD64_) // FIXME: what's _X86AMD64_ used for? -FORCEINLINE -LONG64 -InterlockedAdd64( - IN OUT LONG64 volatile *Addend, - IN LONG64 Value) -{ - return InterlockedExchangeAdd64(Addend, Value) + Value; -} -//#endif -#endif - #endif /* !__INTERLOCKED_DECLARED */ diff --git a/lib/libc/include/any-windows-any/ddk/wmilib.h b/lib/libc/include/any-windows-any/ddk/wmilib.h index 85ad7611ab..e3e5cee50c 100644 --- a/lib/libc/include/any-windows-any/ddk/wmilib.h +++ b/lib/libc/include/any-windows-any/ddk/wmilib.h @@ -23,24 +23,26 @@ typedef struct _WMIGUIDREGINFO { } WMIGUIDREGINFO, *PWMIGUIDREGINFO; typedef NTSTATUS -(NTAPI *PWMI_QUERY_REGINFO) ( +(NTAPI WMI_QUERY_REGINFO_CALLBACK) ( IN OUT PDEVICE_OBJECT DeviceObject, IN OUT PULONG RegFlags, IN OUT PUNICODE_STRING InstanceName, OUT PUNICODE_STRING *RegistryPath OPTIONAL, IN OUT PUNICODE_STRING MofResourceName, OUT PDEVICE_OBJECT *Pdo OPTIONAL); +typedef WMI_QUERY_REGINFO_CALLBACK *PWMI_QUERY_REGINFO; typedef NTSTATUS -(NTAPI *PWMI_FUNCTION_CONTROL) ( +(NTAPI WMI_FUNCTION_CONTROL_CALLBACK) ( IN OUT PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp, IN ULONG GuidIndex, IN WMIENABLEDISABLECONTROL Function, IN BOOLEAN Enable); +typedef WMI_FUNCTION_CONTROL_CALLBACK *PWMI_FUNCTION_CONTROL; typedef NTSTATUS -(NTAPI *PWMI_QUERY_DATABLOCK) ( +(NTAPI WMI_QUERY_DATABLOCK_CALLBACK) ( IN OUT PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp, IN ULONG GuidIndex, @@ -49,9 +51,10 @@ typedef NTSTATUS OUT PULONG InstanceLengthArray OPTIONAL, IN ULONG BufferAvail, OUT PUCHAR Buffer OPTIONAL); +typedef WMI_QUERY_DATABLOCK_CALLBACK *PWMI_QUERY_DATABLOCK; typedef NTSTATUS -(NTAPI *PWMI_EXECUTE_METHOD) ( +(NTAPI WMI_EXECUTE_METHOD_CALLBACK) ( IN OUT PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp, IN ULONG GuidIndex, @@ -60,18 +63,20 @@ typedef NTSTATUS IN ULONG InBufferSize, IN ULONG OutBufferSize, IN OUT PUCHAR Buffer); +typedef WMI_EXECUTE_METHOD_CALLBACK *PWMI_EXECUTE_METHOD; typedef NTSTATUS -(NTAPI *PWMI_SET_DATABLOCK) ( +(NTAPI WMI_SET_DATABLOCK_CALLBACK) ( IN OUT PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp, IN ULONG GuidIndex, IN ULONG InstanceIndex, IN ULONG BufferSize, IN PUCHAR Buffer); +typedef WMI_SET_DATABLOCK_CALLBACK *PWMI_SET_DATABLOCK; typedef NTSTATUS -(NTAPI *PWMI_SET_DATAITEM) ( +(NTAPI WMI_SET_DATAITEM_CALLBACK) ( IN OUT PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp, IN ULONG GuidIndex, @@ -79,6 +84,7 @@ typedef NTSTATUS IN ULONG DataItemId, IN ULONG BufferSize, IN PUCHAR Buffer); +typedef WMI_SET_DATAITEM_CALLBACK *PWMI_SET_DATAITEM; typedef struct _WMILIB_CONTEXT { ULONG GuidCount; diff --git a/lib/libc/include/any-windows-any/ddstream.h b/lib/libc/include/any-windows-any/ddstream.h index 15daac9ae6..3a0e9e49fd 100644 --- a/lib/libc/include/any-windows-any/ddstream.h +++ b/lib/libc/include/any-windows-any/ddstream.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/ddstream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/ddstream.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/devicetopology.h b/lib/libc/include/any-windows-any/devicetopology.h index 1cc8409c6e..cf3f7d89bb 100644 --- a/lib/libc/include/any-windows-any/devicetopology.h +++ b/lib/libc/include/any-windows-any/devicetopology.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/devicetopology.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from include/devicetopology.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -277,7 +278,7 @@ DEFINE_GUID(EVENTCONTEXT_VOLUMESLIDER, 0xe2c2e9de, 0x09b1, 0x4b04,0x84,0xe5, 0x0 #include #include #ifndef _KS_ -typedef struct __WIDL_devicetopology_generated_name_00000013 { +typedef struct __WIDL_devicetopology_generated_name_00000020 { ULONG FormatSize; ULONG Flags; ULONG SampleSize; @@ -287,7 +288,7 @@ typedef struct __WIDL_devicetopology_generated_name_00000013 { GUID Specifier; } KSDATAFORMAT; typedef KSDATAFORMAT *PKSDATAFORMAT; -typedef struct __WIDL_devicetopology_generated_name_00000014 { +typedef struct __WIDL_devicetopology_generated_name_00000021 { __C89_NAMELESS union { __C89_NAMELESS struct { GUID Set; @@ -303,7 +304,7 @@ typedef KSIDENTIFIER KSMETHOD; typedef KSIDENTIFIER *PKSMETHOD; typedef KSIDENTIFIER KSEVENT; typedef KSIDENTIFIER *PKSEVENT; -typedef enum __WIDL_devicetopology_generated_name_00000015 { +typedef enum __WIDL_devicetopology_generated_name_00000022 { eConnTypeUnknown = 0, eConnType3Point5mm = 1, eConnTypeQuarter = 2, @@ -317,7 +318,7 @@ typedef enum __WIDL_devicetopology_generated_name_00000015 { eConnTypeRJ11Modem = 10, eConnTypeCombination = 11 } EPcxConnectionType; -typedef enum __WIDL_devicetopology_generated_name_00000016 { +typedef enum __WIDL_devicetopology_generated_name_00000023 { eGeoLocRear = 1, eGeoLocFront = 2, eGeoLocLeft = 3, @@ -334,19 +335,19 @@ typedef enum __WIDL_devicetopology_generated_name_00000016 { eGeoLocReserved5 = 14, eGeoLocReserved6 = 15 } EPcxGeoLocation; -typedef enum __WIDL_devicetopology_generated_name_00000017 { +typedef enum __WIDL_devicetopology_generated_name_00000024 { eGenLocPrimaryBox = 0, eGenLocInternal = 1, eGenLocSeparate = 2, eGenLocOther = 3 } EPcxGenLocation; -typedef enum __WIDL_devicetopology_generated_name_00000018 { +typedef enum __WIDL_devicetopology_generated_name_00000025 { ePortConnJack = 0, ePortConnIntegratedDevice = 1, ePortConnBothIntegratedAndJack = 2, ePortConnUnknown = 3 } EPxcPortConnection; -typedef struct __WIDL_devicetopology_generated_name_00000019 { +typedef struct __WIDL_devicetopology_generated_name_00000026 { DWORD ChannelMapping; COLORREF Color; EPcxConnectionType ConnectionType; @@ -361,7 +362,7 @@ typedef struct _LUID { LONG HighPart; } LUID; typedef struct _LUID *PLUID; -typedef enum __WIDL_devicetopology_generated_name_0000001A { +typedef enum __WIDL_devicetopology_generated_name_00000027 { KSJACK_SINK_CONNECTIONTYPE_HDMI = 0, KSJACK_SINK_CONNECTIONTYPE_DISPLAYPORT = 1 } KSJACK_SINK_CONNECTIONTYPE; @@ -382,15 +383,15 @@ typedef struct _tagKSJACK_DESCRIPTION2 { } KSJACK_DESCRIPTION2; typedef struct _tagKSJACK_DESCRIPTION2 *PKSJACK_DESCRIPTION2; #endif -typedef enum __WIDL_devicetopology_generated_name_0000001B { +typedef enum __WIDL_devicetopology_generated_name_00000028 { In = 0, Out = 1 } DataFlow; -typedef enum __WIDL_devicetopology_generated_name_0000001C { +typedef enum __WIDL_devicetopology_generated_name_00000029 { Connector = 0, Subunit = 1 } PartType; -typedef enum __WIDL_devicetopology_generated_name_0000001D { +typedef enum __WIDL_devicetopology_generated_name_0000002A { Unknown_Connector = 0, Physical_Internal = 1, Physical_External = 2, diff --git a/lib/libc/include/any-windows-any/devpkey.h b/lib/libc/include/any-windows-any/devpkey.h index 7f026549e5..d24b38271a 100644 --- a/lib/libc/include/any-windows-any/devpkey.h +++ b/lib/libc/include/any-windows-any/devpkey.h @@ -1 +1,7 @@ #include +#include + +DEFINE_DEVPROPKEY(DEVPKEY_NAME, 0xb725f130,0x47ef,0x101a,0xa5,0xf1,0x02,0x60,0x8c,0x9e,0xeb,0xac, 10); +DEFINE_DEVPROPKEY(DEVPKEY_Device_HardwareIds, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 3); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverDate, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 2); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverVersion, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 3); diff --git a/lib/libc/include/any-windows-any/dimm.h b/lib/libc/include/any-windows-any/dimm.h index c97f1b7417..271e61b205 100644 --- a/lib/libc/include/any-windows-any/dimm.h +++ b/lib/libc/include/any-windows-any/dimm.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/dimm.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/dimm.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,46 +21,73 @@ #ifndef __IEnumInputContext_FWD_DEFINED__ #define __IEnumInputContext_FWD_DEFINED__ typedef interface IEnumInputContext IEnumInputContext; +#ifdef __cplusplus +interface IEnumInputContext; +#endif /* __cplusplus */ #endif #ifndef __IActiveIMMRegistrar_FWD_DEFINED__ #define __IActiveIMMRegistrar_FWD_DEFINED__ typedef interface IActiveIMMRegistrar IActiveIMMRegistrar; +#ifdef __cplusplus +interface IActiveIMMRegistrar; +#endif /* __cplusplus */ #endif #ifndef __IActiveIMMMessagePumpOwner_FWD_DEFINED__ #define __IActiveIMMMessagePumpOwner_FWD_DEFINED__ typedef interface IActiveIMMMessagePumpOwner IActiveIMMMessagePumpOwner; +#ifdef __cplusplus +interface IActiveIMMMessagePumpOwner; +#endif /* __cplusplus */ #endif #ifndef __IActiveIMMApp_FWD_DEFINED__ #define __IActiveIMMApp_FWD_DEFINED__ typedef interface IActiveIMMApp IActiveIMMApp; +#ifdef __cplusplus +interface IActiveIMMApp; +#endif /* __cplusplus */ #endif #ifndef __IActiveIMMIME_FWD_DEFINED__ #define __IActiveIMMIME_FWD_DEFINED__ typedef interface IActiveIMMIME IActiveIMMIME; +#ifdef __cplusplus +interface IActiveIMMIME; +#endif /* __cplusplus */ #endif #ifndef __IActiveIME_FWD_DEFINED__ #define __IActiveIME_FWD_DEFINED__ typedef interface IActiveIME IActiveIME; +#ifdef __cplusplus +interface IActiveIME; +#endif /* __cplusplus */ #endif #ifndef __IActiveIME2_FWD_DEFINED__ #define __IActiveIME2_FWD_DEFINED__ typedef interface IActiveIME2 IActiveIME2; +#ifdef __cplusplus +interface IActiveIME2; +#endif /* __cplusplus */ #endif #ifndef __IEnumRegisterWordA_FWD_DEFINED__ #define __IEnumRegisterWordA_FWD_DEFINED__ typedef interface IEnumRegisterWordA IEnumRegisterWordA; +#ifdef __cplusplus +interface IEnumRegisterWordA; +#endif /* __cplusplus */ #endif #ifndef __IEnumRegisterWordW_FWD_DEFINED__ #define __IEnumRegisterWordW_FWD_DEFINED__ typedef interface IEnumRegisterWordW IEnumRegisterWordW; +#ifdef __cplusplus +interface IEnumRegisterWordW; +#endif /* __cplusplus */ #endif #ifndef __CActiveIMM_FWD_DEFINED__ @@ -87,11 +115,17 @@ extern "C" { #ifndef __IEnumRegisterWordA_FWD_DEFINED__ #define __IEnumRegisterWordA_FWD_DEFINED__ typedef interface IEnumRegisterWordA IEnumRegisterWordA; +#ifdef __cplusplus +interface IEnumRegisterWordA; +#endif /* __cplusplus */ #endif #ifndef __IEnumRegisterWordW_FWD_DEFINED__ #define __IEnumRegisterWordW_FWD_DEFINED__ typedef interface IEnumRegisterWordW IEnumRegisterWordW; +#ifdef __cplusplus +interface IEnumRegisterWordW; +#endif /* __cplusplus */ #endif #include @@ -265,36 +299,37 @@ typedef struct IEnumInputContextVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumInputContext* This, + IEnumInputContext *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumInputContext* This); + IEnumInputContext *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumInputContext* This); + IEnumInputContext *This); /*** IEnumInputContext methods ***/ HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumInputContext* This, + IEnumInputContext *This, IEnumInputContext **ppEnum); HRESULT (STDMETHODCALLTYPE *Next)( - IEnumInputContext* This, + IEnumInputContext *This, ULONG ulCount, HIMC *rgInputContext, ULONG *pcFetched); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumInputContext* This); + IEnumInputContext *This); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumInputContext* This, + IEnumInputContext *This, ULONG ulCount); END_INTERFACE } IEnumInputContextVtbl; + interface IEnumInputContext { CONST_VTBL IEnumInputContextVtbl* lpVtbl; }; @@ -339,39 +374,6 @@ static FORCEINLINE HRESULT IEnumInputContext_Skip(IEnumInputContext* This,ULONG #endif -HRESULT STDMETHODCALLTYPE IEnumInputContext_Clone_Proxy( - IEnumInputContext* This, - IEnumInputContext **ppEnum); -void __RPC_STUB IEnumInputContext_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumInputContext_Next_Proxy( - IEnumInputContext* This, - ULONG ulCount, - HIMC *rgInputContext, - ULONG *pcFetched); -void __RPC_STUB IEnumInputContext_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumInputContext_Reset_Proxy( - IEnumInputContext* This); -void __RPC_STUB IEnumInputContext_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumInputContext_Skip_Proxy( - IEnumInputContext* This, - ULONG ulCount); -void __RPC_STUB IEnumInputContext_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumInputContext_INTERFACE_DEFINED__ */ @@ -405,30 +407,31 @@ typedef struct IActiveIMMRegistrarVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveIMMRegistrar* This, + IActiveIMMRegistrar *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveIMMRegistrar* This); + IActiveIMMRegistrar *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveIMMRegistrar* This); + IActiveIMMRegistrar *This); /*** IActiveIMMRegistrar methods ***/ HRESULT (STDMETHODCALLTYPE *RegisterIME)( - IActiveIMMRegistrar* This, + IActiveIMMRegistrar *This, REFCLSID rclsid, LANGID lgid, LPCWSTR pszIconFile, LPCWSTR pszDesc); HRESULT (STDMETHODCALLTYPE *UnregisterIME)( - IActiveIMMRegistrar* This, + IActiveIMMRegistrar *This, REFCLSID rclsid); END_INTERFACE } IActiveIMMRegistrarVtbl; + interface IActiveIMMRegistrar { CONST_VTBL IActiveIMMRegistrarVtbl* lpVtbl; }; @@ -465,25 +468,6 @@ static FORCEINLINE HRESULT IActiveIMMRegistrar_UnregisterIME(IActiveIMMRegistrar #endif -HRESULT STDMETHODCALLTYPE IActiveIMMRegistrar_RegisterIME_Proxy( - IActiveIMMRegistrar* This, - REFCLSID rclsid, - LANGID lgid, - LPCWSTR pszIconFile, - LPCWSTR pszDesc); -void __RPC_STUB IActiveIMMRegistrar_RegisterIME_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMRegistrar_UnregisterIME_Proxy( - IActiveIMMRegistrar* This, - REFCLSID rclsid); -void __RPC_STUB IActiveIMMRegistrar_UnregisterIME_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveIMMRegistrar_INTERFACE_DEFINED__ */ @@ -523,37 +507,38 @@ typedef struct IActiveIMMMessagePumpOwnerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveIMMMessagePumpOwner* This, + IActiveIMMMessagePumpOwner *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveIMMMessagePumpOwner* This); + IActiveIMMMessagePumpOwner *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveIMMMessagePumpOwner* This); + IActiveIMMMessagePumpOwner *This); /*** IActiveIMMMessagePumpOwner methods ***/ HRESULT (STDMETHODCALLTYPE *Start)( - IActiveIMMMessagePumpOwner* This); + IActiveIMMMessagePumpOwner *This); HRESULT (STDMETHODCALLTYPE *End)( - IActiveIMMMessagePumpOwner* This); + IActiveIMMMessagePumpOwner *This); HRESULT (STDMETHODCALLTYPE *OnTranslateMessage)( - IActiveIMMMessagePumpOwner* This, + IActiveIMMMessagePumpOwner *This, const MSG *pMsg); HRESULT (STDMETHODCALLTYPE *Pause)( - IActiveIMMMessagePumpOwner* This, + IActiveIMMMessagePumpOwner *This, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *Resume)( - IActiveIMMMessagePumpOwner* This, + IActiveIMMMessagePumpOwner *This, DWORD dwCookie); END_INTERFACE } IActiveIMMMessagePumpOwnerVtbl; + interface IActiveIMMMessagePumpOwner { CONST_VTBL IActiveIMMMessagePumpOwnerVtbl* lpVtbl; }; @@ -602,44 +587,6 @@ static FORCEINLINE HRESULT IActiveIMMMessagePumpOwner_Resume(IActiveIMMMessagePu #endif -HRESULT STDMETHODCALLTYPE IActiveIMMMessagePumpOwner_Start_Proxy( - IActiveIMMMessagePumpOwner* This); -void __RPC_STUB IActiveIMMMessagePumpOwner_Start_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMMessagePumpOwner_End_Proxy( - IActiveIMMMessagePumpOwner* This); -void __RPC_STUB IActiveIMMMessagePumpOwner_End_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMMessagePumpOwner_OnTranslateMessage_Proxy( - IActiveIMMMessagePumpOwner* This, - const MSG *pMsg); -void __RPC_STUB IActiveIMMMessagePumpOwner_OnTranslateMessage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMMessagePumpOwner_Pause_Proxy( - IActiveIMMMessagePumpOwner* This, - DWORD *pdwCookie); -void __RPC_STUB IActiveIMMMessagePumpOwner_Pause_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMMessagePumpOwner_Resume_Proxy( - IActiveIMMMessagePumpOwner* This, - DWORD dwCookie); -void __RPC_STUB IActiveIMMMessagePumpOwner_Resume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveIMMMessagePumpOwner_INTERFACE_DEFINED__ */ @@ -1032,47 +979,47 @@ typedef struct IActiveIMMAppVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveIMMApp* This, + IActiveIMMApp *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveIMMApp* This); + IActiveIMMApp *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveIMMApp* This); + IActiveIMMApp *This); /*** IActiveIMMApp methods ***/ HRESULT (STDMETHODCALLTYPE *AssociateContext)( - IActiveIMMApp* This, + IActiveIMMApp *This, HWND hWnd, HIMC hIME, HIMC *phPrev); HRESULT (STDMETHODCALLTYPE *ConfigureIMEA)( - IActiveIMMApp* This, + IActiveIMMApp *This, HKL hKL, HWND hWnd, DWORD dwMode, REGISTERWORDA *pData); HRESULT (STDMETHODCALLTYPE *ConfigureIMEW)( - IActiveIMMApp* This, + IActiveIMMApp *This, HKL hKL, HWND hWnd, DWORD dwMode, REGISTERWORDW *pData); HRESULT (STDMETHODCALLTYPE *CreateContext)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC *phIMC); HRESULT (STDMETHODCALLTYPE *DestroyContext)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIME); HRESULT (STDMETHODCALLTYPE *EnumRegisterWordA)( - IActiveIMMApp* This, + IActiveIMMApp *This, HKL hKL, LPSTR szReading, DWORD dwStyle, @@ -1081,7 +1028,7 @@ typedef struct IActiveIMMAppVtbl { IEnumRegisterWordA **pEnum); HRESULT (STDMETHODCALLTYPE *EnumRegisterWordW)( - IActiveIMMApp* This, + IActiveIMMApp *This, HKL hKL, LPWSTR szReading, DWORD dwStyle, @@ -1090,7 +1037,7 @@ typedef struct IActiveIMMAppVtbl { IEnumRegisterWordW **pEnum); HRESULT (STDMETHODCALLTYPE *EscapeA)( - IActiveIMMApp* This, + IActiveIMMApp *This, HKL hKL, HIMC hIMC, UINT uEscape, @@ -1098,7 +1045,7 @@ typedef struct IActiveIMMAppVtbl { LRESULT *plResult); HRESULT (STDMETHODCALLTYPE *EscapeW)( - IActiveIMMApp* This, + IActiveIMMApp *This, HKL hKL, HIMC hIMC, UINT uEscape, @@ -1106,7 +1053,7 @@ typedef struct IActiveIMMAppVtbl { LRESULT *plResult); HRESULT (STDMETHODCALLTYPE *GetCandidateListA)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, DWORD dwIndex, UINT uBufLen, @@ -1114,7 +1061,7 @@ typedef struct IActiveIMMAppVtbl { UINT *puCopied); HRESULT (STDMETHODCALLTYPE *GetCandidateListW)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, DWORD dwIndex, UINT uBufLen, @@ -1122,35 +1069,35 @@ typedef struct IActiveIMMAppVtbl { UINT *puCopied); HRESULT (STDMETHODCALLTYPE *GetCandidateListCountA)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, DWORD *pdwListSize, DWORD *pdwBufLen); HRESULT (STDMETHODCALLTYPE *GetCandidateListCountW)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, DWORD *pdwListSize, DWORD *pdwBufLen); HRESULT (STDMETHODCALLTYPE *GetCandidateWindow)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, DWORD dwIndex, CANDIDATEFORM *pCandidate); HRESULT (STDMETHODCALLTYPE *GetCompositionFontA)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, LOGFONTA *plf); HRESULT (STDMETHODCALLTYPE *GetCompositionFontW)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, LOGFONTW *plf); HRESULT (STDMETHODCALLTYPE *GetCompositionStringA)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, DWORD dwIndex, DWORD dwBufLen, @@ -1158,7 +1105,7 @@ typedef struct IActiveIMMAppVtbl { LPVOID pBuf); HRESULT (STDMETHODCALLTYPE *GetCompositionStringW)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, DWORD dwIndex, DWORD dwBufLen, @@ -1166,17 +1113,17 @@ typedef struct IActiveIMMAppVtbl { LPVOID pBuf); HRESULT (STDMETHODCALLTYPE *GetCompositionWindow)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, COMPOSITIONFORM *pCompForm); HRESULT (STDMETHODCALLTYPE *GetContext)( - IActiveIMMApp* This, + IActiveIMMApp *This, HWND hWnd, HIMC *phIMC); HRESULT (STDMETHODCALLTYPE *GetConversionListA)( - IActiveIMMApp* This, + IActiveIMMApp *This, HKL hKL, HIMC hIMC, LPSTR pSrc, @@ -1186,7 +1133,7 @@ typedef struct IActiveIMMAppVtbl { UINT *puCopied); HRESULT (STDMETHODCALLTYPE *GetConversionListW)( - IActiveIMMApp* This, + IActiveIMMApp *This, HKL hKL, HIMC hIMC, LPWSTR pSrc, @@ -1196,32 +1143,32 @@ typedef struct IActiveIMMAppVtbl { UINT *puCopied); HRESULT (STDMETHODCALLTYPE *GetConversionStatus)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, DWORD *pfdwConversion, DWORD *pfdwSentence); HRESULT (STDMETHODCALLTYPE *GetDefaultIMEWnd)( - IActiveIMMApp* This, + IActiveIMMApp *This, HWND hWnd, HWND *phDefWnd); HRESULT (STDMETHODCALLTYPE *GetDescriptionA)( - IActiveIMMApp* This, + IActiveIMMApp *This, HKL hKL, UINT uBufLen, LPSTR szDescription, UINT *puCopied); HRESULT (STDMETHODCALLTYPE *GetDescriptionW)( - IActiveIMMApp* This, + IActiveIMMApp *This, HKL hKL, UINT uBufLen, LPWSTR szDescription, UINT *puCopied); HRESULT (STDMETHODCALLTYPE *GetGuideLineA)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, DWORD dwIndex, DWORD dwBufLen, @@ -1229,7 +1176,7 @@ typedef struct IActiveIMMAppVtbl { DWORD *pdwResult); HRESULT (STDMETHODCALLTYPE *GetGuideLineW)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, DWORD dwIndex, DWORD dwBufLen, @@ -1237,126 +1184,126 @@ typedef struct IActiveIMMAppVtbl { DWORD *pdwResult); HRESULT (STDMETHODCALLTYPE *GetIMEFileNameA)( - IActiveIMMApp* This, + IActiveIMMApp *This, HKL hKL, UINT uBufLen, LPSTR szFileName, UINT *puCopied); HRESULT (STDMETHODCALLTYPE *GetIMEFileNameW)( - IActiveIMMApp* This, + IActiveIMMApp *This, HKL hKL, UINT uBufLen, LPWSTR szFileName, UINT *puCopied); HRESULT (STDMETHODCALLTYPE *GetOpenStatus)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC); HRESULT (STDMETHODCALLTYPE *GetProperty)( - IActiveIMMApp* This, + IActiveIMMApp *This, HKL hKL, DWORD fdwIndex, DWORD *pdwProperty); HRESULT (STDMETHODCALLTYPE *GetRegisterWordStyleA)( - IActiveIMMApp* This, + IActiveIMMApp *This, HKL hKL, UINT nItem, STYLEBUFA *pStyleBuf, UINT *puCopied); HRESULT (STDMETHODCALLTYPE *GetRegisterWordStyleW)( - IActiveIMMApp* This, + IActiveIMMApp *This, HKL hKL, UINT nItem, STYLEBUFW *pStyleBuf, UINT *puCopied); HRESULT (STDMETHODCALLTYPE *GetStatusWindowPos)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, POINT *pptPos); HRESULT (STDMETHODCALLTYPE *GetVirtualKey)( - IActiveIMMApp* This, + IActiveIMMApp *This, HWND hWnd, UINT *puVirtualKey); HRESULT (STDMETHODCALLTYPE *InstallIMEA)( - IActiveIMMApp* This, + IActiveIMMApp *This, LPSTR szIMEFileName, LPSTR szLayoutText, HKL *phKL); HRESULT (STDMETHODCALLTYPE *InstallIMEW)( - IActiveIMMApp* This, + IActiveIMMApp *This, LPWSTR szIMEFileName, LPWSTR szLayoutText, HKL *phKL); HRESULT (STDMETHODCALLTYPE *IsIME)( - IActiveIMMApp* This, + IActiveIMMApp *This, HKL hKL); HRESULT (STDMETHODCALLTYPE *IsUIMessageA)( - IActiveIMMApp* This, + IActiveIMMApp *This, HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *IsUIMessageW)( - IActiveIMMApp* This, + IActiveIMMApp *This, HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *NotifyIME)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue); HRESULT (STDMETHODCALLTYPE *RegisterWordA)( - IActiveIMMApp* This, + IActiveIMMApp *This, HKL hKL, LPSTR szReading, DWORD dwStyle, LPSTR szRegister); HRESULT (STDMETHODCALLTYPE *RegisterWordW)( - IActiveIMMApp* This, + IActiveIMMApp *This, HKL hKL, LPWSTR szReading, DWORD dwStyle, LPWSTR szRegister); HRESULT (STDMETHODCALLTYPE *ReleaseContext)( - IActiveIMMApp* This, + IActiveIMMApp *This, HWND hWnd, HIMC hIMC); HRESULT (STDMETHODCALLTYPE *SetCandidateWindow)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, CANDIDATEFORM *pCandidate); HRESULT (STDMETHODCALLTYPE *SetCompositionFontA)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, LOGFONTA *plf); HRESULT (STDMETHODCALLTYPE *SetCompositionFontW)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, LOGFONTW *plf); HRESULT (STDMETHODCALLTYPE *SetCompositionStringA)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, DWORD dwIndex, LPVOID pComp, @@ -1365,7 +1312,7 @@ typedef struct IActiveIMMAppVtbl { DWORD dwReadLen); HRESULT (STDMETHODCALLTYPE *SetCompositionStringW)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, DWORD dwIndex, LPVOID pComp, @@ -1374,54 +1321,54 @@ typedef struct IActiveIMMAppVtbl { DWORD dwReadLen); HRESULT (STDMETHODCALLTYPE *SetCompositionWindow)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, COMPOSITIONFORM *pCompForm); HRESULT (STDMETHODCALLTYPE *SetConversionStatus)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, DWORD fdwConversion, DWORD fdwSentence); HRESULT (STDMETHODCALLTYPE *SetOpenStatus)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, WINBOOL fOpen); HRESULT (STDMETHODCALLTYPE *SetStatusWindowPos)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, POINT *pptPos); HRESULT (STDMETHODCALLTYPE *SimulateHotKey)( - IActiveIMMApp* This, + IActiveIMMApp *This, HWND hWnd, DWORD dwHotKeyID); HRESULT (STDMETHODCALLTYPE *UnregisterWordA)( - IActiveIMMApp* This, + IActiveIMMApp *This, HKL hKL, LPSTR szReading, DWORD dwStyle, LPSTR szUnregister); HRESULT (STDMETHODCALLTYPE *UnregisterWordW)( - IActiveIMMApp* This, + IActiveIMMApp *This, HKL hKL, LPWSTR szReading, DWORD dwStyle, LPWSTR szUnregister); HRESULT (STDMETHODCALLTYPE *Activate)( - IActiveIMMApp* This, + IActiveIMMApp *This, WINBOOL fRestoreLayout); HRESULT (STDMETHODCALLTYPE *Deactivate)( - IActiveIMMApp* This); + IActiveIMMApp *This); HRESULT (STDMETHODCALLTYPE *OnDefWindowProc)( - IActiveIMMApp* This, + IActiveIMMApp *This, HWND hWnd, UINT Msg, WPARAM wParam, @@ -1429,32 +1376,32 @@ typedef struct IActiveIMMAppVtbl { LRESULT *plResult); HRESULT (STDMETHODCALLTYPE *FilterClientWindows)( - IActiveIMMApp* This, + IActiveIMMApp *This, ATOM *aaClassList, UINT uSize); HRESULT (STDMETHODCALLTYPE *GetCodePageA)( - IActiveIMMApp* This, + IActiveIMMApp *This, HKL hKL, UINT *uCodePage); HRESULT (STDMETHODCALLTYPE *GetLangId)( - IActiveIMMApp* This, + IActiveIMMApp *This, HKL hKL, LANGID *plid); HRESULT (STDMETHODCALLTYPE *AssociateContextEx)( - IActiveIMMApp* This, + IActiveIMMApp *This, HWND hWnd, HIMC hIMC, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *DisableIME)( - IActiveIMMApp* This, + IActiveIMMApp *This, DWORD idThread); HRESULT (STDMETHODCALLTYPE *GetImeMenuItemsA)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, DWORD dwFlags, DWORD dwType, @@ -1464,7 +1411,7 @@ typedef struct IActiveIMMAppVtbl { DWORD *pdwResult); HRESULT (STDMETHODCALLTYPE *GetImeMenuItemsW)( - IActiveIMMApp* This, + IActiveIMMApp *This, HIMC hIMC, DWORD dwFlags, DWORD dwType, @@ -1474,12 +1421,13 @@ typedef struct IActiveIMMAppVtbl { DWORD *pdwResult); HRESULT (STDMETHODCALLTYPE *EnumInputContext)( - IActiveIMMApp* This, + IActiveIMMApp *This, DWORD idThread, IEnumInputContext **ppEnum); END_INTERFACE } IActiveIMMAppVtbl; + interface IActiveIMMApp { CONST_VTBL IActiveIMMAppVtbl* lpVtbl; }; @@ -1780,713 +1728,6 @@ static FORCEINLINE HRESULT IActiveIMMApp_EnumInputContext(IActiveIMMApp* This,DW #endif -HRESULT STDMETHODCALLTYPE IActiveIMMApp_AssociateContext_Proxy( - IActiveIMMApp* This, - HWND hWnd, - HIMC hIME, - HIMC *phPrev); -void __RPC_STUB IActiveIMMApp_AssociateContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_ConfigureIMEA_Proxy( - IActiveIMMApp* This, - HKL hKL, - HWND hWnd, - DWORD dwMode, - REGISTERWORDA *pData); -void __RPC_STUB IActiveIMMApp_ConfigureIMEA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_ConfigureIMEW_Proxy( - IActiveIMMApp* This, - HKL hKL, - HWND hWnd, - DWORD dwMode, - REGISTERWORDW *pData); -void __RPC_STUB IActiveIMMApp_ConfigureIMEW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_CreateContext_Proxy( - IActiveIMMApp* This, - HIMC *phIMC); -void __RPC_STUB IActiveIMMApp_CreateContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_DestroyContext_Proxy( - IActiveIMMApp* This, - HIMC hIME); -void __RPC_STUB IActiveIMMApp_DestroyContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_EnumRegisterWordA_Proxy( - IActiveIMMApp* This, - HKL hKL, - LPSTR szReading, - DWORD dwStyle, - LPSTR szRegister, - LPVOID pData, - IEnumRegisterWordA **pEnum); -void __RPC_STUB IActiveIMMApp_EnumRegisterWordA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_EnumRegisterWordW_Proxy( - IActiveIMMApp* This, - HKL hKL, - LPWSTR szReading, - DWORD dwStyle, - LPWSTR szRegister, - LPVOID pData, - IEnumRegisterWordW **pEnum); -void __RPC_STUB IActiveIMMApp_EnumRegisterWordW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_EscapeA_Proxy( - IActiveIMMApp* This, - HKL hKL, - HIMC hIMC, - UINT uEscape, - LPVOID pData, - LRESULT *plResult); -void __RPC_STUB IActiveIMMApp_EscapeA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_EscapeW_Proxy( - IActiveIMMApp* This, - HKL hKL, - HIMC hIMC, - UINT uEscape, - LPVOID pData, - LRESULT *plResult); -void __RPC_STUB IActiveIMMApp_EscapeW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetCandidateListA_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - DWORD dwIndex, - UINT uBufLen, - CANDIDATELIST *pCandList, - UINT *puCopied); -void __RPC_STUB IActiveIMMApp_GetCandidateListA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetCandidateListW_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - DWORD dwIndex, - UINT uBufLen, - CANDIDATELIST *pCandList, - UINT *puCopied); -void __RPC_STUB IActiveIMMApp_GetCandidateListW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetCandidateListCountA_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - DWORD *pdwListSize, - DWORD *pdwBufLen); -void __RPC_STUB IActiveIMMApp_GetCandidateListCountA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetCandidateListCountW_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - DWORD *pdwListSize, - DWORD *pdwBufLen); -void __RPC_STUB IActiveIMMApp_GetCandidateListCountW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetCandidateWindow_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - DWORD dwIndex, - CANDIDATEFORM *pCandidate); -void __RPC_STUB IActiveIMMApp_GetCandidateWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetCompositionFontA_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - LOGFONTA *plf); -void __RPC_STUB IActiveIMMApp_GetCompositionFontA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetCompositionFontW_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - LOGFONTW *plf); -void __RPC_STUB IActiveIMMApp_GetCompositionFontW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetCompositionStringA_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - DWORD dwIndex, - DWORD dwBufLen, - LONG *plCopied, - LPVOID pBuf); -void __RPC_STUB IActiveIMMApp_GetCompositionStringA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetCompositionStringW_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - DWORD dwIndex, - DWORD dwBufLen, - LONG *plCopied, - LPVOID pBuf); -void __RPC_STUB IActiveIMMApp_GetCompositionStringW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetCompositionWindow_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - COMPOSITIONFORM *pCompForm); -void __RPC_STUB IActiveIMMApp_GetCompositionWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetContext_Proxy( - IActiveIMMApp* This, - HWND hWnd, - HIMC *phIMC); -void __RPC_STUB IActiveIMMApp_GetContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetConversionListA_Proxy( - IActiveIMMApp* This, - HKL hKL, - HIMC hIMC, - LPSTR pSrc, - UINT uBufLen, - UINT uFlag, - CANDIDATELIST *pDst, - UINT *puCopied); -void __RPC_STUB IActiveIMMApp_GetConversionListA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetConversionListW_Proxy( - IActiveIMMApp* This, - HKL hKL, - HIMC hIMC, - LPWSTR pSrc, - UINT uBufLen, - UINT uFlag, - CANDIDATELIST *pDst, - UINT *puCopied); -void __RPC_STUB IActiveIMMApp_GetConversionListW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetConversionStatus_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - DWORD *pfdwConversion, - DWORD *pfdwSentence); -void __RPC_STUB IActiveIMMApp_GetConversionStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetDefaultIMEWnd_Proxy( - IActiveIMMApp* This, - HWND hWnd, - HWND *phDefWnd); -void __RPC_STUB IActiveIMMApp_GetDefaultIMEWnd_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetDescriptionA_Proxy( - IActiveIMMApp* This, - HKL hKL, - UINT uBufLen, - LPSTR szDescription, - UINT *puCopied); -void __RPC_STUB IActiveIMMApp_GetDescriptionA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetDescriptionW_Proxy( - IActiveIMMApp* This, - HKL hKL, - UINT uBufLen, - LPWSTR szDescription, - UINT *puCopied); -void __RPC_STUB IActiveIMMApp_GetDescriptionW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetGuideLineA_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - DWORD dwIndex, - DWORD dwBufLen, - LPSTR pBuf, - DWORD *pdwResult); -void __RPC_STUB IActiveIMMApp_GetGuideLineA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetGuideLineW_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - DWORD dwIndex, - DWORD dwBufLen, - LPWSTR pBuf, - DWORD *pdwResult); -void __RPC_STUB IActiveIMMApp_GetGuideLineW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetIMEFileNameA_Proxy( - IActiveIMMApp* This, - HKL hKL, - UINT uBufLen, - LPSTR szFileName, - UINT *puCopied); -void __RPC_STUB IActiveIMMApp_GetIMEFileNameA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetIMEFileNameW_Proxy( - IActiveIMMApp* This, - HKL hKL, - UINT uBufLen, - LPWSTR szFileName, - UINT *puCopied); -void __RPC_STUB IActiveIMMApp_GetIMEFileNameW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetOpenStatus_Proxy( - IActiveIMMApp* This, - HIMC hIMC); -void __RPC_STUB IActiveIMMApp_GetOpenStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetProperty_Proxy( - IActiveIMMApp* This, - HKL hKL, - DWORD fdwIndex, - DWORD *pdwProperty); -void __RPC_STUB IActiveIMMApp_GetProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetRegisterWordStyleA_Proxy( - IActiveIMMApp* This, - HKL hKL, - UINT nItem, - STYLEBUFA *pStyleBuf, - UINT *puCopied); -void __RPC_STUB IActiveIMMApp_GetRegisterWordStyleA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetRegisterWordStyleW_Proxy( - IActiveIMMApp* This, - HKL hKL, - UINT nItem, - STYLEBUFW *pStyleBuf, - UINT *puCopied); -void __RPC_STUB IActiveIMMApp_GetRegisterWordStyleW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetStatusWindowPos_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - POINT *pptPos); -void __RPC_STUB IActiveIMMApp_GetStatusWindowPos_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetVirtualKey_Proxy( - IActiveIMMApp* This, - HWND hWnd, - UINT *puVirtualKey); -void __RPC_STUB IActiveIMMApp_GetVirtualKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_InstallIMEA_Proxy( - IActiveIMMApp* This, - LPSTR szIMEFileName, - LPSTR szLayoutText, - HKL *phKL); -void __RPC_STUB IActiveIMMApp_InstallIMEA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_InstallIMEW_Proxy( - IActiveIMMApp* This, - LPWSTR szIMEFileName, - LPWSTR szLayoutText, - HKL *phKL); -void __RPC_STUB IActiveIMMApp_InstallIMEW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_IsIME_Proxy( - IActiveIMMApp* This, - HKL hKL); -void __RPC_STUB IActiveIMMApp_IsIME_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_IsUIMessageA_Proxy( - IActiveIMMApp* This, - HWND hWndIME, - UINT msg, - WPARAM wParam, - LPARAM lParam); -void __RPC_STUB IActiveIMMApp_IsUIMessageA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_IsUIMessageW_Proxy( - IActiveIMMApp* This, - HWND hWndIME, - UINT msg, - WPARAM wParam, - LPARAM lParam); -void __RPC_STUB IActiveIMMApp_IsUIMessageW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_NotifyIME_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - DWORD dwAction, - DWORD dwIndex, - DWORD dwValue); -void __RPC_STUB IActiveIMMApp_NotifyIME_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_RegisterWordA_Proxy( - IActiveIMMApp* This, - HKL hKL, - LPSTR szReading, - DWORD dwStyle, - LPSTR szRegister); -void __RPC_STUB IActiveIMMApp_RegisterWordA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_RegisterWordW_Proxy( - IActiveIMMApp* This, - HKL hKL, - LPWSTR szReading, - DWORD dwStyle, - LPWSTR szRegister); -void __RPC_STUB IActiveIMMApp_RegisterWordW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_ReleaseContext_Proxy( - IActiveIMMApp* This, - HWND hWnd, - HIMC hIMC); -void __RPC_STUB IActiveIMMApp_ReleaseContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_SetCandidateWindow_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - CANDIDATEFORM *pCandidate); -void __RPC_STUB IActiveIMMApp_SetCandidateWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_SetCompositionFontA_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - LOGFONTA *plf); -void __RPC_STUB IActiveIMMApp_SetCompositionFontA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_SetCompositionFontW_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - LOGFONTW *plf); -void __RPC_STUB IActiveIMMApp_SetCompositionFontW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_SetCompositionStringA_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - DWORD dwIndex, - LPVOID pComp, - DWORD dwCompLen, - LPVOID pRead, - DWORD dwReadLen); -void __RPC_STUB IActiveIMMApp_SetCompositionStringA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_SetCompositionStringW_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - DWORD dwIndex, - LPVOID pComp, - DWORD dwCompLen, - LPVOID pRead, - DWORD dwReadLen); -void __RPC_STUB IActiveIMMApp_SetCompositionStringW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_SetCompositionWindow_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - COMPOSITIONFORM *pCompForm); -void __RPC_STUB IActiveIMMApp_SetCompositionWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_SetConversionStatus_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - DWORD fdwConversion, - DWORD fdwSentence); -void __RPC_STUB IActiveIMMApp_SetConversionStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_SetOpenStatus_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - WINBOOL fOpen); -void __RPC_STUB IActiveIMMApp_SetOpenStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_SetStatusWindowPos_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - POINT *pptPos); -void __RPC_STUB IActiveIMMApp_SetStatusWindowPos_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_SimulateHotKey_Proxy( - IActiveIMMApp* This, - HWND hWnd, - DWORD dwHotKeyID); -void __RPC_STUB IActiveIMMApp_SimulateHotKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_UnregisterWordA_Proxy( - IActiveIMMApp* This, - HKL hKL, - LPSTR szReading, - DWORD dwStyle, - LPSTR szUnregister); -void __RPC_STUB IActiveIMMApp_UnregisterWordA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_UnregisterWordW_Proxy( - IActiveIMMApp* This, - HKL hKL, - LPWSTR szReading, - DWORD dwStyle, - LPWSTR szUnregister); -void __RPC_STUB IActiveIMMApp_UnregisterWordW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_Activate_Proxy( - IActiveIMMApp* This, - WINBOOL fRestoreLayout); -void __RPC_STUB IActiveIMMApp_Activate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_Deactivate_Proxy( - IActiveIMMApp* This); -void __RPC_STUB IActiveIMMApp_Deactivate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_OnDefWindowProc_Proxy( - IActiveIMMApp* This, - HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - LRESULT *plResult); -void __RPC_STUB IActiveIMMApp_OnDefWindowProc_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_FilterClientWindows_Proxy( - IActiveIMMApp* This, - ATOM *aaClassList, - UINT uSize); -void __RPC_STUB IActiveIMMApp_FilterClientWindows_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetCodePageA_Proxy( - IActiveIMMApp* This, - HKL hKL, - UINT *uCodePage); -void __RPC_STUB IActiveIMMApp_GetCodePageA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetLangId_Proxy( - IActiveIMMApp* This, - HKL hKL, - LANGID *plid); -void __RPC_STUB IActiveIMMApp_GetLangId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_AssociateContextEx_Proxy( - IActiveIMMApp* This, - HWND hWnd, - HIMC hIMC, - DWORD dwFlags); -void __RPC_STUB IActiveIMMApp_AssociateContextEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_DisableIME_Proxy( - IActiveIMMApp* This, - DWORD idThread); -void __RPC_STUB IActiveIMMApp_DisableIME_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetImeMenuItemsA_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - DWORD dwFlags, - DWORD dwType, - IMEMENUITEMINFOA *pImeParentMenu, - IMEMENUITEMINFOA *pImeMenu, - DWORD dwSize, - DWORD *pdwResult); -void __RPC_STUB IActiveIMMApp_GetImeMenuItemsA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetImeMenuItemsW_Proxy( - IActiveIMMApp* This, - HIMC hIMC, - DWORD dwFlags, - DWORD dwType, - IMEMENUITEMINFOW *pImeParentMenu, - IMEMENUITEMINFOW *pImeMenu, - DWORD dwSize, - DWORD *pdwResult); -void __RPC_STUB IActiveIMMApp_GetImeMenuItemsW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMApp_EnumInputContext_Proxy( - IActiveIMMApp* This, - DWORD idThread, - IEnumInputContext **ppEnum); -void __RPC_STUB IActiveIMMApp_EnumInputContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveIMMApp_INTERFACE_DEFINED__ */ @@ -2971,47 +2212,47 @@ typedef struct IActiveIMMIMEVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveIMMIME* This, + IActiveIMMIME *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveIMMIME* This); + IActiveIMMIME *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveIMMIME* This); + IActiveIMMIME *This); /*** IActiveIMMIME methods ***/ HRESULT (STDMETHODCALLTYPE *AssociateContext)( - IActiveIMMIME* This, + IActiveIMMIME *This, HWND hWnd, HIMC hIME, HIMC *phPrev); HRESULT (STDMETHODCALLTYPE *ConfigureIMEA)( - IActiveIMMIME* This, + IActiveIMMIME *This, HKL hKL, HWND hWnd, DWORD dwMode, REGISTERWORDA *pData); HRESULT (STDMETHODCALLTYPE *ConfigureIMEW)( - IActiveIMMIME* This, + IActiveIMMIME *This, HKL hKL, HWND hWnd, DWORD dwMode, REGISTERWORDW *pData); HRESULT (STDMETHODCALLTYPE *CreateContext)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC *phIMC); HRESULT (STDMETHODCALLTYPE *DestroyContext)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIME); HRESULT (STDMETHODCALLTYPE *EnumRegisterWordA)( - IActiveIMMIME* This, + IActiveIMMIME *This, HKL hKL, LPSTR szReading, DWORD dwStyle, @@ -3020,7 +2261,7 @@ typedef struct IActiveIMMIMEVtbl { IEnumRegisterWordA **pEnum); HRESULT (STDMETHODCALLTYPE *EnumRegisterWordW)( - IActiveIMMIME* This, + IActiveIMMIME *This, HKL hKL, LPWSTR szReading, DWORD dwStyle, @@ -3029,7 +2270,7 @@ typedef struct IActiveIMMIMEVtbl { IEnumRegisterWordW **pEnum); HRESULT (STDMETHODCALLTYPE *EscapeA)( - IActiveIMMIME* This, + IActiveIMMIME *This, HKL hKL, HIMC hIMC, UINT uEscape, @@ -3037,7 +2278,7 @@ typedef struct IActiveIMMIMEVtbl { LRESULT *plResult); HRESULT (STDMETHODCALLTYPE *EscapeW)( - IActiveIMMIME* This, + IActiveIMMIME *This, HKL hKL, HIMC hIMC, UINT uEscape, @@ -3045,7 +2286,7 @@ typedef struct IActiveIMMIMEVtbl { LRESULT *plResult); HRESULT (STDMETHODCALLTYPE *GetCandidateListA)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, DWORD dwIndex, UINT uBufLen, @@ -3053,7 +2294,7 @@ typedef struct IActiveIMMIMEVtbl { UINT *puCopied); HRESULT (STDMETHODCALLTYPE *GetCandidateListW)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, DWORD dwIndex, UINT uBufLen, @@ -3061,35 +2302,35 @@ typedef struct IActiveIMMIMEVtbl { UINT *puCopied); HRESULT (STDMETHODCALLTYPE *GetCandidateListCountA)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, DWORD *pdwListSize, DWORD *pdwBufLen); HRESULT (STDMETHODCALLTYPE *GetCandidateListCountW)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, DWORD *pdwListSize, DWORD *pdwBufLen); HRESULT (STDMETHODCALLTYPE *GetCandidateWindow)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, DWORD dwIndex, CANDIDATEFORM *pCandidate); HRESULT (STDMETHODCALLTYPE *GetCompositionFontA)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, LOGFONTA *plf); HRESULT (STDMETHODCALLTYPE *GetCompositionFontW)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, LOGFONTW *plf); HRESULT (STDMETHODCALLTYPE *GetCompositionStringA)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, DWORD dwIndex, DWORD dwBufLen, @@ -3097,7 +2338,7 @@ typedef struct IActiveIMMIMEVtbl { LPVOID pBuf); HRESULT (STDMETHODCALLTYPE *GetCompositionStringW)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, DWORD dwIndex, DWORD dwBufLen, @@ -3105,17 +2346,17 @@ typedef struct IActiveIMMIMEVtbl { LPVOID pBuf); HRESULT (STDMETHODCALLTYPE *GetCompositionWindow)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, COMPOSITIONFORM *pCompForm); HRESULT (STDMETHODCALLTYPE *GetContext)( - IActiveIMMIME* This, + IActiveIMMIME *This, HWND hWnd, HIMC *phIMC); HRESULT (STDMETHODCALLTYPE *GetConversionListA)( - IActiveIMMIME* This, + IActiveIMMIME *This, HKL hKL, HIMC hIMC, LPSTR pSrc, @@ -3125,7 +2366,7 @@ typedef struct IActiveIMMIMEVtbl { UINT *puCopied); HRESULT (STDMETHODCALLTYPE *GetConversionListW)( - IActiveIMMIME* This, + IActiveIMMIME *This, HKL hKL, HIMC hIMC, LPWSTR pSrc, @@ -3135,32 +2376,32 @@ typedef struct IActiveIMMIMEVtbl { UINT *puCopied); HRESULT (STDMETHODCALLTYPE *GetConversionStatus)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, DWORD *pfdwConversion, DWORD *pfdwSentence); HRESULT (STDMETHODCALLTYPE *GetDefaultIMEWnd)( - IActiveIMMIME* This, + IActiveIMMIME *This, HWND hWnd, HWND *phDefWnd); HRESULT (STDMETHODCALLTYPE *GetDescriptionA)( - IActiveIMMIME* This, + IActiveIMMIME *This, HKL hKL, UINT uBufLen, LPSTR szDescription, UINT *puCopied); HRESULT (STDMETHODCALLTYPE *GetDescriptionW)( - IActiveIMMIME* This, + IActiveIMMIME *This, HKL hKL, UINT uBufLen, LPWSTR szDescription, UINT *puCopied); HRESULT (STDMETHODCALLTYPE *GetGuideLineA)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, DWORD dwIndex, DWORD dwBufLen, @@ -3168,7 +2409,7 @@ typedef struct IActiveIMMIMEVtbl { DWORD *pdwResult); HRESULT (STDMETHODCALLTYPE *GetGuideLineW)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, DWORD dwIndex, DWORD dwBufLen, @@ -3176,126 +2417,126 @@ typedef struct IActiveIMMIMEVtbl { DWORD *pdwResult); HRESULT (STDMETHODCALLTYPE *GetIMEFileNameA)( - IActiveIMMIME* This, + IActiveIMMIME *This, HKL hKL, UINT uBufLen, LPSTR szFileName, UINT *puCopied); HRESULT (STDMETHODCALLTYPE *GetIMEFileNameW)( - IActiveIMMIME* This, + IActiveIMMIME *This, HKL hKL, UINT uBufLen, LPWSTR szFileName, UINT *puCopied); HRESULT (STDMETHODCALLTYPE *GetOpenStatus)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC); HRESULT (STDMETHODCALLTYPE *GetProperty)( - IActiveIMMIME* This, + IActiveIMMIME *This, HKL hKL, DWORD fdwIndex, DWORD *pdwProperty); HRESULT (STDMETHODCALLTYPE *GetRegisterWordStyleA)( - IActiveIMMIME* This, + IActiveIMMIME *This, HKL hKL, UINT nItem, STYLEBUFA *pStyleBuf, UINT *puCopied); HRESULT (STDMETHODCALLTYPE *GetRegisterWordStyleW)( - IActiveIMMIME* This, + IActiveIMMIME *This, HKL hKL, UINT nItem, STYLEBUFW *pStyleBuf, UINT *puCopied); HRESULT (STDMETHODCALLTYPE *GetStatusWindowPos)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, POINT *pptPos); HRESULT (STDMETHODCALLTYPE *GetVirtualKey)( - IActiveIMMIME* This, + IActiveIMMIME *This, HWND hWnd, UINT *puVirtualKey); HRESULT (STDMETHODCALLTYPE *InstallIMEA)( - IActiveIMMIME* This, + IActiveIMMIME *This, LPSTR szIMEFileName, LPSTR szLayoutText, HKL *phKL); HRESULT (STDMETHODCALLTYPE *InstallIMEW)( - IActiveIMMIME* This, + IActiveIMMIME *This, LPWSTR szIMEFileName, LPWSTR szLayoutText, HKL *phKL); HRESULT (STDMETHODCALLTYPE *IsIME)( - IActiveIMMIME* This, + IActiveIMMIME *This, HKL hKL); HRESULT (STDMETHODCALLTYPE *IsUIMessageA)( - IActiveIMMIME* This, + IActiveIMMIME *This, HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *IsUIMessageW)( - IActiveIMMIME* This, + IActiveIMMIME *This, HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *NotifyIME)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue); HRESULT (STDMETHODCALLTYPE *RegisterWordA)( - IActiveIMMIME* This, + IActiveIMMIME *This, HKL hKL, LPSTR szReading, DWORD dwStyle, LPSTR szRegister); HRESULT (STDMETHODCALLTYPE *RegisterWordW)( - IActiveIMMIME* This, + IActiveIMMIME *This, HKL hKL, LPWSTR szReading, DWORD dwStyle, LPWSTR szRegister); HRESULT (STDMETHODCALLTYPE *ReleaseContext)( - IActiveIMMIME* This, + IActiveIMMIME *This, HWND hWnd, HIMC hIMC); HRESULT (STDMETHODCALLTYPE *SetCandidateWindow)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, CANDIDATEFORM *pCandidate); HRESULT (STDMETHODCALLTYPE *SetCompositionFontA)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, LOGFONTA *plf); HRESULT (STDMETHODCALLTYPE *SetCompositionFontW)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, LOGFONTW *plf); HRESULT (STDMETHODCALLTYPE *SetCompositionStringA)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, DWORD dwIndex, LPVOID pComp, @@ -3304,7 +2545,7 @@ typedef struct IActiveIMMIMEVtbl { DWORD dwReadLen); HRESULT (STDMETHODCALLTYPE *SetCompositionStringW)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, DWORD dwIndex, LPVOID pComp, @@ -3313,113 +2554,113 @@ typedef struct IActiveIMMIMEVtbl { DWORD dwReadLen); HRESULT (STDMETHODCALLTYPE *SetCompositionWindow)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, COMPOSITIONFORM *pCompForm); HRESULT (STDMETHODCALLTYPE *SetConversionStatus)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, DWORD fdwConversion, DWORD fdwSentence); HRESULT (STDMETHODCALLTYPE *SetOpenStatus)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, WINBOOL fOpen); HRESULT (STDMETHODCALLTYPE *SetStatusWindowPos)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, POINT *pptPos); HRESULT (STDMETHODCALLTYPE *SimulateHotKey)( - IActiveIMMIME* This, + IActiveIMMIME *This, HWND hWnd, DWORD dwHotKeyID); HRESULT (STDMETHODCALLTYPE *UnregisterWordA)( - IActiveIMMIME* This, + IActiveIMMIME *This, HKL hKL, LPSTR szReading, DWORD dwStyle, LPSTR szUnregister); HRESULT (STDMETHODCALLTYPE *UnregisterWordW)( - IActiveIMMIME* This, + IActiveIMMIME *This, HKL hKL, LPWSTR szReading, DWORD dwStyle, LPWSTR szUnregister); HRESULT (STDMETHODCALLTYPE *GenerateMessage)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC); HRESULT (STDMETHODCALLTYPE *LockIMC)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, INPUTCONTEXT **ppIMC); HRESULT (STDMETHODCALLTYPE *UnlockIMC)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC); HRESULT (STDMETHODCALLTYPE *GetIMCLockCount)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, DWORD *pdwLockCount); HRESULT (STDMETHODCALLTYPE *CreateIMCC)( - IActiveIMMIME* This, + IActiveIMMIME *This, DWORD dwSize, HIMCC *phIMCC); HRESULT (STDMETHODCALLTYPE *DestroyIMCC)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMCC hIMCC); HRESULT (STDMETHODCALLTYPE *LockIMCC)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMCC hIMCC, void **ppv); HRESULT (STDMETHODCALLTYPE *UnlockIMCC)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMCC hIMCC); HRESULT (STDMETHODCALLTYPE *ReSizeIMCC)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMCC hIMCC, DWORD dwSize, HIMCC *phIMCC); HRESULT (STDMETHODCALLTYPE *GetIMCCSize)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMCC hIMCC, DWORD *pdwSize); HRESULT (STDMETHODCALLTYPE *GetIMCCLockCount)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMCC hIMCC, DWORD *pdwLockCount); HRESULT (STDMETHODCALLTYPE *GetHotKey)( - IActiveIMMIME* This, + IActiveIMMIME *This, DWORD dwHotKeyID, UINT *puModifiers, UINT *puVKey, HKL *phKL); HRESULT (STDMETHODCALLTYPE *SetHotKey)( - IActiveIMMIME* This, + IActiveIMMIME *This, DWORD dwHotKeyID, UINT uModifiers, UINT uVKey, HKL hKL); HRESULT (STDMETHODCALLTYPE *CreateSoftKeyboard)( - IActiveIMMIME* This, + IActiveIMMIME *This, UINT uType, HWND hOwner, int x, @@ -3427,26 +2668,26 @@ typedef struct IActiveIMMIMEVtbl { HWND *phSoftKbdWnd); HRESULT (STDMETHODCALLTYPE *DestroySoftKeyboard)( - IActiveIMMIME* This, + IActiveIMMIME *This, HWND hSoftKbdWnd); HRESULT (STDMETHODCALLTYPE *ShowSoftKeyboard)( - IActiveIMMIME* This, + IActiveIMMIME *This, HWND hSoftKbdWnd, int nCmdShow); HRESULT (STDMETHODCALLTYPE *GetCodePageA)( - IActiveIMMIME* This, + IActiveIMMIME *This, HKL hKL, UINT *uCodePage); HRESULT (STDMETHODCALLTYPE *GetLangId)( - IActiveIMMIME* This, + IActiveIMMIME *This, HKL hKL, LANGID *plid); HRESULT (STDMETHODCALLTYPE *KeybdEvent)( - IActiveIMMIME* This, + IActiveIMMIME *This, LANGID lgidIME, BYTE bVk, BYTE bScan, @@ -3454,23 +2695,23 @@ typedef struct IActiveIMMIMEVtbl { DWORD dwExtraInfo); HRESULT (STDMETHODCALLTYPE *LockModal)( - IActiveIMMIME* This); + IActiveIMMIME *This); HRESULT (STDMETHODCALLTYPE *UnlockModal)( - IActiveIMMIME* This); + IActiveIMMIME *This); HRESULT (STDMETHODCALLTYPE *AssociateContextEx)( - IActiveIMMIME* This, + IActiveIMMIME *This, HWND hWnd, HIMC hIMC, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *DisableIME)( - IActiveIMMIME* This, + IActiveIMMIME *This, DWORD idThread); HRESULT (STDMETHODCALLTYPE *GetImeMenuItemsA)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, DWORD dwFlags, DWORD dwType, @@ -3480,7 +2721,7 @@ typedef struct IActiveIMMIMEVtbl { DWORD *pdwResult); HRESULT (STDMETHODCALLTYPE *GetImeMenuItemsW)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, DWORD dwFlags, DWORD dwType, @@ -3490,26 +2731,26 @@ typedef struct IActiveIMMIMEVtbl { DWORD *pdwResult); HRESULT (STDMETHODCALLTYPE *EnumInputContext)( - IActiveIMMIME* This, + IActiveIMMIME *This, DWORD idThread, IEnumInputContext **ppEnum); HRESULT (STDMETHODCALLTYPE *RequestMessageA)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, WPARAM wParam, LPARAM lParam, LRESULT *plResult); HRESULT (STDMETHODCALLTYPE *RequestMessageW)( - IActiveIMMIME* This, + IActiveIMMIME *This, HIMC hIMC, WPARAM wParam, LPARAM lParam, LRESULT *plResult); HRESULT (STDMETHODCALLTYPE *SendIMCA)( - IActiveIMMIME* This, + IActiveIMMIME *This, HWND hWnd, UINT uMsg, WPARAM wParam, @@ -3517,7 +2758,7 @@ typedef struct IActiveIMMIMEVtbl { LRESULT *plResult); HRESULT (STDMETHODCALLTYPE *SendIMCW)( - IActiveIMMIME* This, + IActiveIMMIME *This, HWND hWnd, UINT uMsg, WPARAM wParam, @@ -3525,10 +2766,11 @@ typedef struct IActiveIMMIMEVtbl { LRESULT *plResult); HRESULT (STDMETHODCALLTYPE *IsSleeping)( - IActiveIMMIME* This); + IActiveIMMIME *This); END_INTERFACE } IActiveIMMIMEVtbl; + interface IActiveIMMIME { CONST_VTBL IActiveIMMIMEVtbl* lpVtbl; }; @@ -3909,903 +3151,6 @@ static FORCEINLINE HRESULT IActiveIMMIME_IsSleeping(IActiveIMMIME* This) { #endif -HRESULT STDMETHODCALLTYPE IActiveIMMIME_AssociateContext_Proxy( - IActiveIMMIME* This, - HWND hWnd, - HIMC hIME, - HIMC *phPrev); -void __RPC_STUB IActiveIMMIME_AssociateContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_ConfigureIMEA_Proxy( - IActiveIMMIME* This, - HKL hKL, - HWND hWnd, - DWORD dwMode, - REGISTERWORDA *pData); -void __RPC_STUB IActiveIMMIME_ConfigureIMEA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_ConfigureIMEW_Proxy( - IActiveIMMIME* This, - HKL hKL, - HWND hWnd, - DWORD dwMode, - REGISTERWORDW *pData); -void __RPC_STUB IActiveIMMIME_ConfigureIMEW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_CreateContext_Proxy( - IActiveIMMIME* This, - HIMC *phIMC); -void __RPC_STUB IActiveIMMIME_CreateContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_DestroyContext_Proxy( - IActiveIMMIME* This, - HIMC hIME); -void __RPC_STUB IActiveIMMIME_DestroyContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_EnumRegisterWordA_Proxy( - IActiveIMMIME* This, - HKL hKL, - LPSTR szReading, - DWORD dwStyle, - LPSTR szRegister, - LPVOID pData, - IEnumRegisterWordA **pEnum); -void __RPC_STUB IActiveIMMIME_EnumRegisterWordA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_EnumRegisterWordW_Proxy( - IActiveIMMIME* This, - HKL hKL, - LPWSTR szReading, - DWORD dwStyle, - LPWSTR szRegister, - LPVOID pData, - IEnumRegisterWordW **pEnum); -void __RPC_STUB IActiveIMMIME_EnumRegisterWordW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_EscapeA_Proxy( - IActiveIMMIME* This, - HKL hKL, - HIMC hIMC, - UINT uEscape, - LPVOID pData, - LRESULT *plResult); -void __RPC_STUB IActiveIMMIME_EscapeA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_EscapeW_Proxy( - IActiveIMMIME* This, - HKL hKL, - HIMC hIMC, - UINT uEscape, - LPVOID pData, - LRESULT *plResult); -void __RPC_STUB IActiveIMMIME_EscapeW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetCandidateListA_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - DWORD dwIndex, - UINT uBufLen, - CANDIDATELIST *pCandList, - UINT *puCopied); -void __RPC_STUB IActiveIMMIME_GetCandidateListA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetCandidateListW_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - DWORD dwIndex, - UINT uBufLen, - CANDIDATELIST *pCandList, - UINT *puCopied); -void __RPC_STUB IActiveIMMIME_GetCandidateListW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetCandidateListCountA_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - DWORD *pdwListSize, - DWORD *pdwBufLen); -void __RPC_STUB IActiveIMMIME_GetCandidateListCountA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetCandidateListCountW_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - DWORD *pdwListSize, - DWORD *pdwBufLen); -void __RPC_STUB IActiveIMMIME_GetCandidateListCountW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetCandidateWindow_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - DWORD dwIndex, - CANDIDATEFORM *pCandidate); -void __RPC_STUB IActiveIMMIME_GetCandidateWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetCompositionFontA_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - LOGFONTA *plf); -void __RPC_STUB IActiveIMMIME_GetCompositionFontA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetCompositionFontW_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - LOGFONTW *plf); -void __RPC_STUB IActiveIMMIME_GetCompositionFontW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetCompositionStringA_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - DWORD dwIndex, - DWORD dwBufLen, - LONG *plCopied, - LPVOID pBuf); -void __RPC_STUB IActiveIMMIME_GetCompositionStringA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetCompositionStringW_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - DWORD dwIndex, - DWORD dwBufLen, - LONG *plCopied, - LPVOID pBuf); -void __RPC_STUB IActiveIMMIME_GetCompositionStringW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetCompositionWindow_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - COMPOSITIONFORM *pCompForm); -void __RPC_STUB IActiveIMMIME_GetCompositionWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetContext_Proxy( - IActiveIMMIME* This, - HWND hWnd, - HIMC *phIMC); -void __RPC_STUB IActiveIMMIME_GetContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetConversionListA_Proxy( - IActiveIMMIME* This, - HKL hKL, - HIMC hIMC, - LPSTR pSrc, - UINT uBufLen, - UINT uFlag, - CANDIDATELIST *pDst, - UINT *puCopied); -void __RPC_STUB IActiveIMMIME_GetConversionListA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetConversionListW_Proxy( - IActiveIMMIME* This, - HKL hKL, - HIMC hIMC, - LPWSTR pSrc, - UINT uBufLen, - UINT uFlag, - CANDIDATELIST *pDst, - UINT *puCopied); -void __RPC_STUB IActiveIMMIME_GetConversionListW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetConversionStatus_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - DWORD *pfdwConversion, - DWORD *pfdwSentence); -void __RPC_STUB IActiveIMMIME_GetConversionStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetDefaultIMEWnd_Proxy( - IActiveIMMIME* This, - HWND hWnd, - HWND *phDefWnd); -void __RPC_STUB IActiveIMMIME_GetDefaultIMEWnd_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetDescriptionA_Proxy( - IActiveIMMIME* This, - HKL hKL, - UINT uBufLen, - LPSTR szDescription, - UINT *puCopied); -void __RPC_STUB IActiveIMMIME_GetDescriptionA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetDescriptionW_Proxy( - IActiveIMMIME* This, - HKL hKL, - UINT uBufLen, - LPWSTR szDescription, - UINT *puCopied); -void __RPC_STUB IActiveIMMIME_GetDescriptionW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetGuideLineA_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - DWORD dwIndex, - DWORD dwBufLen, - LPSTR pBuf, - DWORD *pdwResult); -void __RPC_STUB IActiveIMMIME_GetGuideLineA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetGuideLineW_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - DWORD dwIndex, - DWORD dwBufLen, - LPWSTR pBuf, - DWORD *pdwResult); -void __RPC_STUB IActiveIMMIME_GetGuideLineW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetIMEFileNameA_Proxy( - IActiveIMMIME* This, - HKL hKL, - UINT uBufLen, - LPSTR szFileName, - UINT *puCopied); -void __RPC_STUB IActiveIMMIME_GetIMEFileNameA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetIMEFileNameW_Proxy( - IActiveIMMIME* This, - HKL hKL, - UINT uBufLen, - LPWSTR szFileName, - UINT *puCopied); -void __RPC_STUB IActiveIMMIME_GetIMEFileNameW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetOpenStatus_Proxy( - IActiveIMMIME* This, - HIMC hIMC); -void __RPC_STUB IActiveIMMIME_GetOpenStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetProperty_Proxy( - IActiveIMMIME* This, - HKL hKL, - DWORD fdwIndex, - DWORD *pdwProperty); -void __RPC_STUB IActiveIMMIME_GetProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetRegisterWordStyleA_Proxy( - IActiveIMMIME* This, - HKL hKL, - UINT nItem, - STYLEBUFA *pStyleBuf, - UINT *puCopied); -void __RPC_STUB IActiveIMMIME_GetRegisterWordStyleA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetRegisterWordStyleW_Proxy( - IActiveIMMIME* This, - HKL hKL, - UINT nItem, - STYLEBUFW *pStyleBuf, - UINT *puCopied); -void __RPC_STUB IActiveIMMIME_GetRegisterWordStyleW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetStatusWindowPos_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - POINT *pptPos); -void __RPC_STUB IActiveIMMIME_GetStatusWindowPos_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetVirtualKey_Proxy( - IActiveIMMIME* This, - HWND hWnd, - UINT *puVirtualKey); -void __RPC_STUB IActiveIMMIME_GetVirtualKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_InstallIMEA_Proxy( - IActiveIMMIME* This, - LPSTR szIMEFileName, - LPSTR szLayoutText, - HKL *phKL); -void __RPC_STUB IActiveIMMIME_InstallIMEA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_InstallIMEW_Proxy( - IActiveIMMIME* This, - LPWSTR szIMEFileName, - LPWSTR szLayoutText, - HKL *phKL); -void __RPC_STUB IActiveIMMIME_InstallIMEW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_IsIME_Proxy( - IActiveIMMIME* This, - HKL hKL); -void __RPC_STUB IActiveIMMIME_IsIME_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_IsUIMessageA_Proxy( - IActiveIMMIME* This, - HWND hWndIME, - UINT msg, - WPARAM wParam, - LPARAM lParam); -void __RPC_STUB IActiveIMMIME_IsUIMessageA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_IsUIMessageW_Proxy( - IActiveIMMIME* This, - HWND hWndIME, - UINT msg, - WPARAM wParam, - LPARAM lParam); -void __RPC_STUB IActiveIMMIME_IsUIMessageW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_NotifyIME_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - DWORD dwAction, - DWORD dwIndex, - DWORD dwValue); -void __RPC_STUB IActiveIMMIME_NotifyIME_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_RegisterWordA_Proxy( - IActiveIMMIME* This, - HKL hKL, - LPSTR szReading, - DWORD dwStyle, - LPSTR szRegister); -void __RPC_STUB IActiveIMMIME_RegisterWordA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_RegisterWordW_Proxy( - IActiveIMMIME* This, - HKL hKL, - LPWSTR szReading, - DWORD dwStyle, - LPWSTR szRegister); -void __RPC_STUB IActiveIMMIME_RegisterWordW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_ReleaseContext_Proxy( - IActiveIMMIME* This, - HWND hWnd, - HIMC hIMC); -void __RPC_STUB IActiveIMMIME_ReleaseContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_SetCandidateWindow_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - CANDIDATEFORM *pCandidate); -void __RPC_STUB IActiveIMMIME_SetCandidateWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_SetCompositionFontA_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - LOGFONTA *plf); -void __RPC_STUB IActiveIMMIME_SetCompositionFontA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_SetCompositionFontW_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - LOGFONTW *plf); -void __RPC_STUB IActiveIMMIME_SetCompositionFontW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_SetCompositionStringA_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - DWORD dwIndex, - LPVOID pComp, - DWORD dwCompLen, - LPVOID pRead, - DWORD dwReadLen); -void __RPC_STUB IActiveIMMIME_SetCompositionStringA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_SetCompositionStringW_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - DWORD dwIndex, - LPVOID pComp, - DWORD dwCompLen, - LPVOID pRead, - DWORD dwReadLen); -void __RPC_STUB IActiveIMMIME_SetCompositionStringW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_SetCompositionWindow_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - COMPOSITIONFORM *pCompForm); -void __RPC_STUB IActiveIMMIME_SetCompositionWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_SetConversionStatus_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - DWORD fdwConversion, - DWORD fdwSentence); -void __RPC_STUB IActiveIMMIME_SetConversionStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_SetOpenStatus_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - WINBOOL fOpen); -void __RPC_STUB IActiveIMMIME_SetOpenStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_SetStatusWindowPos_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - POINT *pptPos); -void __RPC_STUB IActiveIMMIME_SetStatusWindowPos_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_SimulateHotKey_Proxy( - IActiveIMMIME* This, - HWND hWnd, - DWORD dwHotKeyID); -void __RPC_STUB IActiveIMMIME_SimulateHotKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_UnregisterWordA_Proxy( - IActiveIMMIME* This, - HKL hKL, - LPSTR szReading, - DWORD dwStyle, - LPSTR szUnregister); -void __RPC_STUB IActiveIMMIME_UnregisterWordA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_UnregisterWordW_Proxy( - IActiveIMMIME* This, - HKL hKL, - LPWSTR szReading, - DWORD dwStyle, - LPWSTR szUnregister); -void __RPC_STUB IActiveIMMIME_UnregisterWordW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GenerateMessage_Proxy( - IActiveIMMIME* This, - HIMC hIMC); -void __RPC_STUB IActiveIMMIME_GenerateMessage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_LockIMC_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - INPUTCONTEXT **ppIMC); -void __RPC_STUB IActiveIMMIME_LockIMC_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_UnlockIMC_Proxy( - IActiveIMMIME* This, - HIMC hIMC); -void __RPC_STUB IActiveIMMIME_UnlockIMC_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetIMCLockCount_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - DWORD *pdwLockCount); -void __RPC_STUB IActiveIMMIME_GetIMCLockCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_CreateIMCC_Proxy( - IActiveIMMIME* This, - DWORD dwSize, - HIMCC *phIMCC); -void __RPC_STUB IActiveIMMIME_CreateIMCC_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_DestroyIMCC_Proxy( - IActiveIMMIME* This, - HIMCC hIMCC); -void __RPC_STUB IActiveIMMIME_DestroyIMCC_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_LockIMCC_Proxy( - IActiveIMMIME* This, - HIMCC hIMCC, - void **ppv); -void __RPC_STUB IActiveIMMIME_LockIMCC_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_UnlockIMCC_Proxy( - IActiveIMMIME* This, - HIMCC hIMCC); -void __RPC_STUB IActiveIMMIME_UnlockIMCC_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_ReSizeIMCC_Proxy( - IActiveIMMIME* This, - HIMCC hIMCC, - DWORD dwSize, - HIMCC *phIMCC); -void __RPC_STUB IActiveIMMIME_ReSizeIMCC_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetIMCCSize_Proxy( - IActiveIMMIME* This, - HIMCC hIMCC, - DWORD *pdwSize); -void __RPC_STUB IActiveIMMIME_GetIMCCSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetIMCCLockCount_Proxy( - IActiveIMMIME* This, - HIMCC hIMCC, - DWORD *pdwLockCount); -void __RPC_STUB IActiveIMMIME_GetIMCCLockCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetHotKey_Proxy( - IActiveIMMIME* This, - DWORD dwHotKeyID, - UINT *puModifiers, - UINT *puVKey, - HKL *phKL); -void __RPC_STUB IActiveIMMIME_GetHotKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_SetHotKey_Proxy( - IActiveIMMIME* This, - DWORD dwHotKeyID, - UINT uModifiers, - UINT uVKey, - HKL hKL); -void __RPC_STUB IActiveIMMIME_SetHotKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_CreateSoftKeyboard_Proxy( - IActiveIMMIME* This, - UINT uType, - HWND hOwner, - int x, - int y, - HWND *phSoftKbdWnd); -void __RPC_STUB IActiveIMMIME_CreateSoftKeyboard_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_DestroySoftKeyboard_Proxy( - IActiveIMMIME* This, - HWND hSoftKbdWnd); -void __RPC_STUB IActiveIMMIME_DestroySoftKeyboard_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_ShowSoftKeyboard_Proxy( - IActiveIMMIME* This, - HWND hSoftKbdWnd, - int nCmdShow); -void __RPC_STUB IActiveIMMIME_ShowSoftKeyboard_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetCodePageA_Proxy( - IActiveIMMIME* This, - HKL hKL, - UINT *uCodePage); -void __RPC_STUB IActiveIMMIME_GetCodePageA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetLangId_Proxy( - IActiveIMMIME* This, - HKL hKL, - LANGID *plid); -void __RPC_STUB IActiveIMMIME_GetLangId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_KeybdEvent_Proxy( - IActiveIMMIME* This, - LANGID lgidIME, - BYTE bVk, - BYTE bScan, - DWORD dwFlags, - DWORD dwExtraInfo); -void __RPC_STUB IActiveIMMIME_KeybdEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_LockModal_Proxy( - IActiveIMMIME* This); -void __RPC_STUB IActiveIMMIME_LockModal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_UnlockModal_Proxy( - IActiveIMMIME* This); -void __RPC_STUB IActiveIMMIME_UnlockModal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_AssociateContextEx_Proxy( - IActiveIMMIME* This, - HWND hWnd, - HIMC hIMC, - DWORD dwFlags); -void __RPC_STUB IActiveIMMIME_AssociateContextEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_DisableIME_Proxy( - IActiveIMMIME* This, - DWORD idThread); -void __RPC_STUB IActiveIMMIME_DisableIME_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetImeMenuItemsA_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - DWORD dwFlags, - DWORD dwType, - IMEMENUITEMINFOA *pImeParentMenu, - IMEMENUITEMINFOA *pImeMenu, - DWORD dwSize, - DWORD *pdwResult); -void __RPC_STUB IActiveIMMIME_GetImeMenuItemsA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetImeMenuItemsW_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - DWORD dwFlags, - DWORD dwType, - IMEMENUITEMINFOW *pImeParentMenu, - IMEMENUITEMINFOW *pImeMenu, - DWORD dwSize, - DWORD *pdwResult); -void __RPC_STUB IActiveIMMIME_GetImeMenuItemsW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_EnumInputContext_Proxy( - IActiveIMMIME* This, - DWORD idThread, - IEnumInputContext **ppEnum); -void __RPC_STUB IActiveIMMIME_EnumInputContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_RequestMessageA_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - WPARAM wParam, - LPARAM lParam, - LRESULT *plResult); -void __RPC_STUB IActiveIMMIME_RequestMessageA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_RequestMessageW_Proxy( - IActiveIMMIME* This, - HIMC hIMC, - WPARAM wParam, - LPARAM lParam, - LRESULT *plResult); -void __RPC_STUB IActiveIMMIME_RequestMessageW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_SendIMCA_Proxy( - IActiveIMMIME* This, - HWND hWnd, - UINT uMsg, - WPARAM wParam, - LPARAM lParam, - LRESULT *plResult); -void __RPC_STUB IActiveIMMIME_SendIMCA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_SendIMCW_Proxy( - IActiveIMMIME* This, - HWND hWnd, - UINT uMsg, - WPARAM wParam, - LPARAM lParam, - LRESULT *plResult); -void __RPC_STUB IActiveIMMIME_SendIMCW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIMMIME_IsSleeping_Proxy( - IActiveIMMIME* This); -void __RPC_STUB IActiveIMMIME_IsSleeping_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveIMMIME_INTERFACE_DEFINED__ */ @@ -4924,26 +3269,26 @@ typedef struct IActiveIMEVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveIME* This, + IActiveIME *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveIME* This); + IActiveIME *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveIME* This); + IActiveIME *This); /*** IActiveIME methods ***/ HRESULT (STDMETHODCALLTYPE *Inquire)( - IActiveIME* This, + IActiveIME *This, DWORD dwSystemInfoFlags, IMEINFO *pIMEInfo, LPWSTR szWndClass, DWORD *pdwPrivate); HRESULT (STDMETHODCALLTYPE *ConversionList)( - IActiveIME* This, + IActiveIME *This, HIMC hIMC, LPWSTR szSource, UINT uFlag, @@ -4952,49 +3297,49 @@ typedef struct IActiveIMEVtbl { UINT *puCopied); HRESULT (STDMETHODCALLTYPE *Configure)( - IActiveIME* This, + IActiveIME *This, HKL hKL, HWND hWnd, DWORD dwMode, REGISTERWORDW *pRegisterWord); HRESULT (STDMETHODCALLTYPE *Destroy)( - IActiveIME* This, + IActiveIME *This, UINT uReserved); HRESULT (STDMETHODCALLTYPE *Escape)( - IActiveIME* This, + IActiveIME *This, HIMC hIMC, UINT uEscape, void *pData, LRESULT *plResult); HRESULT (STDMETHODCALLTYPE *SetActiveContext)( - IActiveIME* This, + IActiveIME *This, HIMC hIMC, WINBOOL fFlag); HRESULT (STDMETHODCALLTYPE *ProcessKey)( - IActiveIME* This, + IActiveIME *This, HIMC hIMC, UINT uVirKey, DWORD lParam, BYTE *pbKeyState); HRESULT (STDMETHODCALLTYPE *Notify)( - IActiveIME* This, + IActiveIME *This, HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue); HRESULT (STDMETHODCALLTYPE *Select)( - IActiveIME* This, + IActiveIME *This, HIMC hIMC, WINBOOL fSelect); HRESULT (STDMETHODCALLTYPE *SetCompositionString)( - IActiveIME* This, + IActiveIME *This, HIMC hIMC, DWORD dwIndex, void *pComp, @@ -5003,7 +3348,7 @@ typedef struct IActiveIMEVtbl { DWORD dwReadLen); HRESULT (STDMETHODCALLTYPE *ToAsciiEx)( - IActiveIME* This, + IActiveIME *This, UINT uVirKey, UINT uScanCode, BYTE *pbKeyState, @@ -5013,25 +3358,25 @@ typedef struct IActiveIMEVtbl { UINT *puSize); HRESULT (STDMETHODCALLTYPE *RegisterWord)( - IActiveIME* This, + IActiveIME *This, LPWSTR szReading, DWORD dwStyle, LPWSTR szString); HRESULT (STDMETHODCALLTYPE *UnregisterWord)( - IActiveIME* This, + IActiveIME *This, LPWSTR szReading, DWORD dwStyle, LPWSTR szString); HRESULT (STDMETHODCALLTYPE *GetRegisterWordStyle)( - IActiveIME* This, + IActiveIME *This, UINT nItem, STYLEBUFW *pStyleBuf, UINT *puBufSize); HRESULT (STDMETHODCALLTYPE *EnumRegisterWord)( - IActiveIME* This, + IActiveIME *This, LPWSTR szReading, DWORD dwStyle, LPWSTR szRegister, @@ -5039,15 +3384,16 @@ typedef struct IActiveIMEVtbl { IEnumRegisterWordW **ppEnum); HRESULT (STDMETHODCALLTYPE *GetCodePageA)( - IActiveIME* This, + IActiveIME *This, UINT *uCodePage); HRESULT (STDMETHODCALLTYPE *GetLangId)( - IActiveIME* This, + IActiveIME *This, LANGID *plid); END_INTERFACE } IActiveIMEVtbl; + interface IActiveIME { CONST_VTBL IActiveIMEVtbl* lpVtbl; }; @@ -5144,185 +3490,6 @@ static FORCEINLINE HRESULT IActiveIME_GetLangId(IActiveIME* This,LANGID *plid) { #endif -HRESULT STDMETHODCALLTYPE IActiveIME_Inquire_Proxy( - IActiveIME* This, - DWORD dwSystemInfoFlags, - IMEINFO *pIMEInfo, - LPWSTR szWndClass, - DWORD *pdwPrivate); -void __RPC_STUB IActiveIME_Inquire_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIME_ConversionList_Proxy( - IActiveIME* This, - HIMC hIMC, - LPWSTR szSource, - UINT uFlag, - UINT uBufLen, - CANDIDATELIST *pDest, - UINT *puCopied); -void __RPC_STUB IActiveIME_ConversionList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIME_Configure_Proxy( - IActiveIME* This, - HKL hKL, - HWND hWnd, - DWORD dwMode, - REGISTERWORDW *pRegisterWord); -void __RPC_STUB IActiveIME_Configure_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIME_Destroy_Proxy( - IActiveIME* This, - UINT uReserved); -void __RPC_STUB IActiveIME_Destroy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIME_Escape_Proxy( - IActiveIME* This, - HIMC hIMC, - UINT uEscape, - void *pData, - LRESULT *plResult); -void __RPC_STUB IActiveIME_Escape_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIME_SetActiveContext_Proxy( - IActiveIME* This, - HIMC hIMC, - WINBOOL fFlag); -void __RPC_STUB IActiveIME_SetActiveContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIME_ProcessKey_Proxy( - IActiveIME* This, - HIMC hIMC, - UINT uVirKey, - DWORD lParam, - BYTE *pbKeyState); -void __RPC_STUB IActiveIME_ProcessKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIME_Notify_Proxy( - IActiveIME* This, - HIMC hIMC, - DWORD dwAction, - DWORD dwIndex, - DWORD dwValue); -void __RPC_STUB IActiveIME_Notify_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIME_Select_Proxy( - IActiveIME* This, - HIMC hIMC, - WINBOOL fSelect); -void __RPC_STUB IActiveIME_Select_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIME_SetCompositionString_Proxy( - IActiveIME* This, - HIMC hIMC, - DWORD dwIndex, - void *pComp, - DWORD dwCompLen, - void *pRead, - DWORD dwReadLen); -void __RPC_STUB IActiveIME_SetCompositionString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIME_ToAsciiEx_Proxy( - IActiveIME* This, - UINT uVirKey, - UINT uScanCode, - BYTE *pbKeyState, - UINT fuState, - HIMC hIMC, - DWORD *pdwTransBuf, - UINT *puSize); -void __RPC_STUB IActiveIME_ToAsciiEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIME_RegisterWord_Proxy( - IActiveIME* This, - LPWSTR szReading, - DWORD dwStyle, - LPWSTR szString); -void __RPC_STUB IActiveIME_RegisterWord_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIME_UnregisterWord_Proxy( - IActiveIME* This, - LPWSTR szReading, - DWORD dwStyle, - LPWSTR szString); -void __RPC_STUB IActiveIME_UnregisterWord_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIME_GetRegisterWordStyle_Proxy( - IActiveIME* This, - UINT nItem, - STYLEBUFW *pStyleBuf, - UINT *puBufSize); -void __RPC_STUB IActiveIME_GetRegisterWordStyle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIME_EnumRegisterWord_Proxy( - IActiveIME* This, - LPWSTR szReading, - DWORD dwStyle, - LPWSTR szRegister, - LPVOID pData, - IEnumRegisterWordW **ppEnum); -void __RPC_STUB IActiveIME_EnumRegisterWord_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIME_GetCodePageA_Proxy( - IActiveIME* This, - UINT *uCodePage); -void __RPC_STUB IActiveIME_GetCodePageA_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIME_GetLangId_Proxy( - IActiveIME* This, - LANGID *plid); -void __RPC_STUB IActiveIME_GetLangId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveIME_INTERFACE_DEFINED__ */ @@ -5353,26 +3520,26 @@ typedef struct IActiveIME2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActiveIME2* This, + IActiveIME2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActiveIME2* This); + IActiveIME2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IActiveIME2* This); + IActiveIME2 *This); /*** IActiveIME methods ***/ HRESULT (STDMETHODCALLTYPE *Inquire)( - IActiveIME2* This, + IActiveIME2 *This, DWORD dwSystemInfoFlags, IMEINFO *pIMEInfo, LPWSTR szWndClass, DWORD *pdwPrivate); HRESULT (STDMETHODCALLTYPE *ConversionList)( - IActiveIME2* This, + IActiveIME2 *This, HIMC hIMC, LPWSTR szSource, UINT uFlag, @@ -5381,49 +3548,49 @@ typedef struct IActiveIME2Vtbl { UINT *puCopied); HRESULT (STDMETHODCALLTYPE *Configure)( - IActiveIME2* This, + IActiveIME2 *This, HKL hKL, HWND hWnd, DWORD dwMode, REGISTERWORDW *pRegisterWord); HRESULT (STDMETHODCALLTYPE *Destroy)( - IActiveIME2* This, + IActiveIME2 *This, UINT uReserved); HRESULT (STDMETHODCALLTYPE *Escape)( - IActiveIME2* This, + IActiveIME2 *This, HIMC hIMC, UINT uEscape, void *pData, LRESULT *plResult); HRESULT (STDMETHODCALLTYPE *SetActiveContext)( - IActiveIME2* This, + IActiveIME2 *This, HIMC hIMC, WINBOOL fFlag); HRESULT (STDMETHODCALLTYPE *ProcessKey)( - IActiveIME2* This, + IActiveIME2 *This, HIMC hIMC, UINT uVirKey, DWORD lParam, BYTE *pbKeyState); HRESULT (STDMETHODCALLTYPE *Notify)( - IActiveIME2* This, + IActiveIME2 *This, HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue); HRESULT (STDMETHODCALLTYPE *Select)( - IActiveIME2* This, + IActiveIME2 *This, HIMC hIMC, WINBOOL fSelect); HRESULT (STDMETHODCALLTYPE *SetCompositionString)( - IActiveIME2* This, + IActiveIME2 *This, HIMC hIMC, DWORD dwIndex, void *pComp, @@ -5432,7 +3599,7 @@ typedef struct IActiveIME2Vtbl { DWORD dwReadLen); HRESULT (STDMETHODCALLTYPE *ToAsciiEx)( - IActiveIME2* This, + IActiveIME2 *This, UINT uVirKey, UINT uScanCode, BYTE *pbKeyState, @@ -5442,25 +3609,25 @@ typedef struct IActiveIME2Vtbl { UINT *puSize); HRESULT (STDMETHODCALLTYPE *RegisterWord)( - IActiveIME2* This, + IActiveIME2 *This, LPWSTR szReading, DWORD dwStyle, LPWSTR szString); HRESULT (STDMETHODCALLTYPE *UnregisterWord)( - IActiveIME2* This, + IActiveIME2 *This, LPWSTR szReading, DWORD dwStyle, LPWSTR szString); HRESULT (STDMETHODCALLTYPE *GetRegisterWordStyle)( - IActiveIME2* This, + IActiveIME2 *This, UINT nItem, STYLEBUFW *pStyleBuf, UINT *puBufSize); HRESULT (STDMETHODCALLTYPE *EnumRegisterWord)( - IActiveIME2* This, + IActiveIME2 *This, LPWSTR szReading, DWORD dwStyle, LPWSTR szRegister, @@ -5468,23 +3635,24 @@ typedef struct IActiveIME2Vtbl { IEnumRegisterWordW **ppEnum); HRESULT (STDMETHODCALLTYPE *GetCodePageA)( - IActiveIME2* This, + IActiveIME2 *This, UINT *uCodePage); HRESULT (STDMETHODCALLTYPE *GetLangId)( - IActiveIME2* This, + IActiveIME2 *This, LANGID *plid); /*** IActiveIME2 methods ***/ HRESULT (STDMETHODCALLTYPE *Sleep)( - IActiveIME2* This); + IActiveIME2 *This); HRESULT (STDMETHODCALLTYPE *Unsleep)( - IActiveIME2* This, + IActiveIME2 *This, WINBOOL fDead); END_INTERFACE } IActiveIME2Vtbl; + interface IActiveIME2 { CONST_VTBL IActiveIME2Vtbl* lpVtbl; }; @@ -5591,21 +3759,6 @@ static FORCEINLINE HRESULT IActiveIME2_Unsleep(IActiveIME2* This,WINBOOL fDead) #endif -HRESULT STDMETHODCALLTYPE IActiveIME2_Sleep_Proxy( - IActiveIME2* This); -void __RPC_STUB IActiveIME2_Sleep_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActiveIME2_Unsleep_Proxy( - IActiveIME2* This, - WINBOOL fDead); -void __RPC_STUB IActiveIME2_Unsleep_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActiveIME2_INTERFACE_DEFINED__ */ @@ -5644,36 +3797,37 @@ typedef struct IEnumRegisterWordAVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumRegisterWordA* This, + IEnumRegisterWordA *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumRegisterWordA* This); + IEnumRegisterWordA *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumRegisterWordA* This); + IEnumRegisterWordA *This); /*** IEnumRegisterWordA methods ***/ HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumRegisterWordA* This, + IEnumRegisterWordA *This, IEnumRegisterWordA **ppEnum); HRESULT (STDMETHODCALLTYPE *Next)( - IEnumRegisterWordA* This, + IEnumRegisterWordA *This, ULONG ulCount, REGISTERWORDA *rgRegisterWord, ULONG *pcFetched); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumRegisterWordA* This); + IEnumRegisterWordA *This); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumRegisterWordA* This, + IEnumRegisterWordA *This, ULONG ulCount); END_INTERFACE } IEnumRegisterWordAVtbl; + interface IEnumRegisterWordA { CONST_VTBL IEnumRegisterWordAVtbl* lpVtbl; }; @@ -5718,39 +3872,6 @@ static FORCEINLINE HRESULT IEnumRegisterWordA_Skip(IEnumRegisterWordA* This,ULON #endif -HRESULT STDMETHODCALLTYPE IEnumRegisterWordA_Clone_Proxy( - IEnumRegisterWordA* This, - IEnumRegisterWordA **ppEnum); -void __RPC_STUB IEnumRegisterWordA_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumRegisterWordA_Next_Proxy( - IEnumRegisterWordA* This, - ULONG ulCount, - REGISTERWORDA *rgRegisterWord, - ULONG *pcFetched); -void __RPC_STUB IEnumRegisterWordA_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumRegisterWordA_Reset_Proxy( - IEnumRegisterWordA* This); -void __RPC_STUB IEnumRegisterWordA_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumRegisterWordA_Skip_Proxy( - IEnumRegisterWordA* This, - ULONG ulCount); -void __RPC_STUB IEnumRegisterWordA_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumRegisterWordA_INTERFACE_DEFINED__ */ @@ -5789,36 +3910,37 @@ typedef struct IEnumRegisterWordWVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumRegisterWordW* This, + IEnumRegisterWordW *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumRegisterWordW* This); + IEnumRegisterWordW *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumRegisterWordW* This); + IEnumRegisterWordW *This); /*** IEnumRegisterWordW methods ***/ HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumRegisterWordW* This, + IEnumRegisterWordW *This, IEnumRegisterWordW **ppEnum); HRESULT (STDMETHODCALLTYPE *Next)( - IEnumRegisterWordW* This, + IEnumRegisterWordW *This, ULONG ulCount, REGISTERWORDW *rgRegisterWord, ULONG *pcFetched); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumRegisterWordW* This); + IEnumRegisterWordW *This); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumRegisterWordW* This, + IEnumRegisterWordW *This, ULONG ulCount); END_INTERFACE } IEnumRegisterWordWVtbl; + interface IEnumRegisterWordW { CONST_VTBL IEnumRegisterWordWVtbl* lpVtbl; }; @@ -5863,39 +3985,6 @@ static FORCEINLINE HRESULT IEnumRegisterWordW_Skip(IEnumRegisterWordW* This,ULON #endif -HRESULT STDMETHODCALLTYPE IEnumRegisterWordW_Clone_Proxy( - IEnumRegisterWordW* This, - IEnumRegisterWordW **ppEnum); -void __RPC_STUB IEnumRegisterWordW_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumRegisterWordW_Next_Proxy( - IEnumRegisterWordW* This, - ULONG ulCount, - REGISTERWORDW *rgRegisterWord, - ULONG *pcFetched); -void __RPC_STUB IEnumRegisterWordW_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumRegisterWordW_Reset_Proxy( - IEnumRegisterWordW* This); -void __RPC_STUB IEnumRegisterWordW_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumRegisterWordW_Skip_Proxy( - IEnumRegisterWordW* This, - ULONG ulCount); -void __RPC_STUB IEnumRegisterWordW_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumRegisterWordW_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/dinput.h b/lib/libc/include/any-windows-any/dinput.h index 14438f773a..551d27ce5c 100644 --- a/lib/libc/include/any-windows-any/dinput.h +++ b/lib/libc/include/any-windows-any/dinput.h @@ -2461,6 +2461,252 @@ HRESULT WINAPI DirectInputCreateW(HINSTANCE,DWORD,LPDIRECTINPUTW *,LPUNKNOWN); HRESULT WINAPI DirectInputCreateEx(HINSTANCE,DWORD,REFIID,LPVOID *,LPUNKNOWN); #endif /* DI8 */ + +/* New DirectInput8 style keyboard constants */ + +#define DIKEYBOARD_ESCAPE (DIK_ESCAPE | 0x81000400) +#define DIKEYBOARD_1 (DIK_1 | 0x81000400) +#define DIKEYBOARD_2 (DIK_2 | 0x81000400) +#define DIKEYBOARD_3 (DIK_3 | 0x81000400) +#define DIKEYBOARD_4 (DIK_4 | 0x81000400) +#define DIKEYBOARD_5 (DIK_5 | 0x81000400) +#define DIKEYBOARD_6 (DIK_6 | 0x81000400) +#define DIKEYBOARD_7 (DIK_7 | 0x81000400) +#define DIKEYBOARD_8 (DIK_8 | 0x81000400) +#define DIKEYBOARD_9 (DIK_9 | 0x81000400) +#define DIKEYBOARD_0 (DIK_0 | 0x81000400) +#define DIKEYBOARD_MINUS (DIK_MINUS | 0x81000400) +#define DIKEYBOARD_EQUALS (DIK_EQUALS | 0x81000400) +#define DIKEYBOARD_BACK (DIK_BACK | 0x81000400) +#define DIKEYBOARD_TAB (DIK_TAB | 0x81000400) +#define DIKEYBOARD_Q (DIK_Q | 0x81000400) +#define DIKEYBOARD_W (DIK_W | 0x81000400) +#define DIKEYBOARD_E (DIK_E | 0x81000400) +#define DIKEYBOARD_R (DIK_R | 0x81000400) +#define DIKEYBOARD_T (DIK_T | 0x81000400) +#define DIKEYBOARD_Y (DIK_Y | 0x81000400) +#define DIKEYBOARD_U (DIK_U | 0x81000400) +#define DIKEYBOARD_I (DIK_I | 0x81000400) +#define DIKEYBOARD_O (DIK_O | 0x81000400) +#define DIKEYBOARD_P (DIK_P | 0x81000400) +#define DIKEYBOARD_LBRACKET (DIK_LBRACKET | 0x81000400) +#define DIKEYBOARD_RBRACKET (DIK_RBRACKET | 0x81000400) +#define DIKEYBOARD_RETURN (DIK_RETURN | 0x81000400) +#define DIKEYBOARD_LCONTROL (DIK_LCONTROL | 0x81000400) +#define DIKEYBOARD_A (DIK_A | 0x81000400) +#define DIKEYBOARD_S (DIK_S | 0x81000400) +#define DIKEYBOARD_D (DIK_D | 0x81000400) +#define DIKEYBOARD_F (DIK_F | 0x81000400) +#define DIKEYBOARD_G (DIK_G | 0x81000400) +#define DIKEYBOARD_H (DIK_H | 0x81000400) +#define DIKEYBOARD_J (DIK_J | 0x81000400) +#define DIKEYBOARD_K (DIK_K | 0x81000400) +#define DIKEYBOARD_L (DIK_L | 0x81000400) +#define DIKEYBOARD_SEMICOLON (DIK_SEMICOLON | 0x81000400) +#define DIKEYBOARD_APOSTROPHE (DIK_APOSTROPHE | 0x81000400) +#define DIKEYBOARD_GRAVE (DIK_GRAVE | 0x81000400) +#define DIKEYBOARD_LSHIFT (DIK_LSHIFT | 0x81000400) +#define DIKEYBOARD_BACKSLASH (DIK_BACKSLASH | 0x81000400) +#define DIKEYBOARD_Z (DIK_Z | 0x81000400) +#define DIKEYBOARD_X (DIK_X | 0x81000400) +#define DIKEYBOARD_C (DIK_C | 0x81000400) +#define DIKEYBOARD_V (DIK_V | 0x81000400) +#define DIKEYBOARD_B (DIK_B | 0x81000400) +#define DIKEYBOARD_N (DIK_N | 0x81000400) +#define DIKEYBOARD_M (DIK_M | 0x81000400) +#define DIKEYBOARD_COMMA (DIK_COMMA | 0x81000400) +#define DIKEYBOARD_PERIOD (DIK_PERIOD | 0x81000400) +#define DIKEYBOARD_SLASH (DIK_SLASH | 0x81000400) +#define DIKEYBOARD_RSHIFT (DIK_RSHIFT | 0x81000400) +#define DIKEYBOARD_MULTIPLY (DIK_MULTIPLY | 0x81000400) +#define DIKEYBOARD_LMENU (DIK_LMENU | 0x81000400) +#define DIKEYBOARD_SPACE (DIK_SPACE | 0x81000400) +#define DIKEYBOARD_CAPITAL (DIK_CAPITAL | 0x81000400) +#define DIKEYBOARD_F1 (DIK_F1 | 0x81000400) +#define DIKEYBOARD_F2 (DIK_F2 | 0x81000400) +#define DIKEYBOARD_F3 (DIK_F3 | 0x81000400) +#define DIKEYBOARD_F4 (DIK_F4 | 0x81000400) +#define DIKEYBOARD_F5 (DIK_F5 | 0x81000400) +#define DIKEYBOARD_F6 (DIK_F6 | 0x81000400) +#define DIKEYBOARD_F7 (DIK_F7 | 0x81000400) +#define DIKEYBOARD_F8 (DIK_F8 | 0x81000400) +#define DIKEYBOARD_F9 (DIK_F9 | 0x81000400) +#define DIKEYBOARD_F10 (DIK_F10 | 0x81000400) +#define DIKEYBOARD_NUMLOCK (DIK_NUMLOCK | 0x81000400) +#define DIKEYBOARD_SCROLL (DIK_SCROLL | 0x81000400) +#define DIKEYBOARD_NUMPAD7 (DIK_NUMPAD7 | 0x81000400) +#define DIKEYBOARD_NUMPAD8 (DIK_NUMPAD8 | 0x81000400) +#define DIKEYBOARD_NUMPAD9 (DIK_NUMPAD9 | 0x81000400) +#define DIKEYBOARD_SUBTRACT (DIK_SUBTRACT | 0x81000400) +#define DIKEYBOARD_NUMPAD4 (DIK_NUMPAD4 | 0x81000400) +#define DIKEYBOARD_NUMPAD5 (DIK_NUMPAD5 | 0x81000400) +#define DIKEYBOARD_NUMPAD6 (DIK_NUMPAD6 | 0x81000400) +#define DIKEYBOARD_ADD (DIK_ADD | 0x81000400) +#define DIKEYBOARD_NUMPAD1 (DIK_NUMPAD1 | 0x81000400) +#define DIKEYBOARD_NUMPAD2 (DIK_NUMPAD2 | 0x81000400) +#define DIKEYBOARD_NUMPAD3 (DIK_NUMPAD3 | 0x81000400) +#define DIKEYBOARD_NUMPAD0 (DIK_NUMPAD0 | 0x81000400) +#define DIKEYBOARD_DECIMAL (DIK_DECIMAL | 0x81000400) +#define DIKEYBOARD_F11 (DIK_F11 | 0x81000400) +#define DIKEYBOARD_F12 (DIK_F12 | 0x81000400) +#define DIKEYBOARD_F13 (DIK_F13 | 0x81000400) +#define DIKEYBOARD_F14 (DIK_F14 | 0x81000400) +#define DIKEYBOARD_F15 (DIK_F15 | 0x81000400) +#define DIKEYBOARD_KANA (DIK_KANA | 0x81000400) +#define DIKEYBOARD_CONVERT (DIK_CONVERT | 0x81000400) +#define DIKEYBOARD_NOCONVERT (DIK_NOCONVERT | 0x81000400) +#define DIKEYBOARD_YEN (DIK_YEN | 0x81000400) +#define DIKEYBOARD_NUMPADEQUALS (DIK_NUMPADEQUALS | 0x81000400) +#define DIKEYBOARD_CIRCUMFLEX (DIK_CIRCUMFLEX | 0x81000400) +#define DIKEYBOARD_AT (DIK_AT | 0x81000400) +#define DIKEYBOARD_COLON (DIK_COLON | 0x81000400) +#define DIKEYBOARD_UNDERLINE (DIK_UNDERLINE | 0x81000400) +#define DIKEYBOARD_KANJI (DIK_KANJI | 0x81000400) +#define DIKEYBOARD_STOP (DIK_STOP | 0x81000400) +#define DIKEYBOARD_AX (DIK_AX | 0x81000400) +#define DIKEYBOARD_UNLABELED (DIK_UNLABELED | 0x81000400) +#define DIKEYBOARD_NUMPADENTER (DIK_NUMPADENTER | 0x81000400) +#define DIKEYBOARD_RCONTROL (DIK_RCONTROL | 0x81000400) +#define DIKEYBOARD_NUMPADCOMMA (DIK_NUMPADCOMMA | 0x81000400) +#define DIKEYBOARD_DIVIDE (DIK_DIVIDE | 0x81000400) +#define DIKEYBOARD_SYSRQ (DIK_SYSRQ | 0x81000400) +#define DIKEYBOARD_RMENU (DIK_RMENU | 0x81000400) +#define DIKEYBOARD_PAUSE (DIK_PAUSE | 0x81000400) +#define DIKEYBOARD_HOME (DIK_HOME | 0x81000400) +#define DIKEYBOARD_UP (DIK_UP | 0x81000400) +#define DIKEYBOARD_PRIOR (DIK_PRIOR | 0x81000400) +#define DIKEYBOARD_LEFT (DIK_LEFT | 0x81000400) +#define DIKEYBOARD_RIGHT (DIK_RIGHT | 0x81000400) +#define DIKEYBOARD_END (DIK_END | 0x81000400) +#define DIKEYBOARD_DOWN (DIK_DOWN | 0x81000400) +#define DIKEYBOARD_NEXT (DIK_NEXT | 0x81000400) +#define DIKEYBOARD_INSERT (DIK_INSERT | 0x81000400) +#define DIKEYBOARD_DELETE (DIK_DELETE | 0x81000400) +#define DIKEYBOARD_LWIN (DIK_LWIN | 0x81000400) +#define DIKEYBOARD_RWIN (DIK_RWIN | 0x81000400) +#define DIKEYBOARD_APPS (DIK_APPS | 0x81000400) +#define DIKEYBOARD_POWER (DIK_POWER | 0x81000400) +#define DIKEYBOARD_SLEEP (DIK_SLEEP | 0x81000400) +#define DIKEYBOARD_BACKSPACE (DIK_BACKSPACE | 0x81000400) +#define DIKEYBOARD_NUMPADSTAR (DIK_NUMPADSTAR | 0x81000400) +#define DIKEYBOARD_LALT (DIK_LALT | 0x81000400) +#define DIKEYBOARD_CAPSLOCK (DIK_CAPSLOCK | 0x81000400) +#define DIKEYBOARD_NUMPADMINUS (DIK_NUMPADMINUS | 0x81000400) +#define DIKEYBOARD_NUMPADPLUS (DIK_NUMPADPLUS | 0x81000400) +#define DIKEYBOARD_NUMPADPERIOD (DIK_NUMPADPERIOD | 0x81000400) +#define DIKEYBOARD_NUMPADSLASH (DIK_NUMPADSLASH | 0x81000400) +#define DIKEYBOARD_RALT (DIK_RALT | 0x81000400) +#define DIKEYBOARD_UPARROW (DIK_UPARROW | 0x81000400) +#define DIKEYBOARD_PGUP (DIK_PGUP | 0x81000400) +#define DIKEYBOARD_LEFTARROW (DIK_LEFTARROW | 0x81000400) +#define DIKEYBOARD_RIGHTARROW (DIK_RIGHTARROW | 0x81000400) +#define DIKEYBOARD_DOWNARROW (DIK_DOWNARROW | 0x81000400) +#define DIKEYBOARD_PGDN (DIK_PGDN | 0x81000400) + +/* New DirectInput8 mouse definitions */ + +#define DIMOUSE_XAXISAB (0x82000200 | DIMOFS_X) +#define DIMOUSE_YAXISAB (0x82000200 | DIMOFS_Y) +#define DIMOUSE_XAXIS (0x82000300 | DIMOFS_X) +#define DIMOUSE_YAXIS (0x82000300 | DIMOFS_Y) +#define DIMOUSE_WHEEL (0x82000300 | DIMOFS_Z) +#define DIMOUSE_BUTTON0 (0x82000400 | DIMOFS_BUTTON0) +#define DIMOUSE_BUTTON1 (0x82000400 | DIMOFS_BUTTON1) +#define DIMOUSE_BUTTON2 (0x82000400 | DIMOFS_BUTTON2) +#define DIMOUSE_BUTTON3 (0x82000400 | DIMOFS_BUTTON3) +#define DIMOUSE_BUTTON4 (0x82000400 | DIMOFS_BUTTON4) +#define DIMOUSE_BUTTON5 (0x82000400 | DIMOFS_BUTTON5) +#define DIMOUSE_BUTTON6 (0x82000400 | DIMOFS_BUTTON6) +#define DIMOUSE_BUTTON7 (0x82000400 | DIMOFS_BUTTON7) + + +#define DIAXIS_ANY_X_1 0xFF00C201 +#define DIAXIS_ANY_X_2 0xFF00C202 +#define DIAXIS_ANY_Y_1 0xFF014201 +#define DIAXIS_ANY_Y_2 0xFF014202 +#define DIAXIS_ANY_Z_1 0xFF01C201 +#define DIAXIS_ANY_Z_2 0xFF01C202 +#define DIAXIS_ANY_R_1 0xFF024201 +#define DIAXIS_ANY_R_2 0xFF024202 +#define DIAXIS_ANY_U_1 0xFF02C201 +#define DIAXIS_ANY_U_2 0xFF02C202 +#define DIAXIS_ANY_V_1 0xFF034201 +#define DIAXIS_ANY_V_2 0xFF034202 +#define DIAXIS_ANY_A_1 0xFF03C201 +#define DIAXIS_ANY_A_2 0xFF03C202 +#define DIAXIS_ANY_B_1 0xFF044201 +#define DIAXIS_ANY_B_2 0xFF044202 +#define DIAXIS_ANY_C_1 0xFF04C201 +#define DIAXIS_ANY_C_2 0xFF04C202 +#define DIAXIS_ANY_S_1 0xFF054201 +#define DIAXIS_ANY_S_2 0xFF054202 +#define DIAXIS_ANY_1 0xFF004201 +#define DIAXIS_ANY_2 0xFF004202 +#define DIAXIS_ANY_3 0xFF004203 +#define DIAXIS_ANY_4 0xFF004204 +#define DIPOV_ANY_1 0xFF004601 +#define DIPOV_ANY_2 0xFF004602 +#define DIPOV_ANY_3 0xFF004603 +#define DIPOV_ANY_4 0xFF004604 +#define DIBUTTON_ANY(instance) (0xFF004400 | (instance)) + + +#define DIVIRTUAL_FLYING_HELICOPTER 0x06000000 +#define DIBUTTON_FLYINGH_MENU 0x060004fd +#define DIBUTTON_FLYINGH_FIRE 0x06001401 +#define DIBUTTON_FLYINGH_WEAPONS 0x06001402 +#define DIBUTTON_FLYINGH_TARGET 0x06001403 +#define DIBUTTON_FLYINGH_DEVICE 0x060044fe +#define DIBUTTON_FLYINGH_PAUSE 0x060044fc +#define DIHATSWITCH_FLYINGH_GLANCE 0x06004601 +#define DIBUTTON_FLYINGH_FIRESECONDARY 0x06004c07 +#define DIBUTTON_FLYINGH_COUNTER 0x06005404 +#define DIBUTTON_FLYINGH_VIEW 0x06006405 +#define DIBUTTON_FLYINGH_GEAR 0x06006406 +#define DIAXIS_FLYINGH_BANK 0x06008a01 +#define DIAXIS_FLYINGH_PITCH 0x06010a02 +#define DIAXIS_FLYINGH_COLLECTIVE 0x06018a03 +#define DIAXIS_FLYINGH_TORQUE 0x06025a04 +#define DIAXIS_FLYINGH_THROTTLE 0x0603da05 +#define DIBUTTON_FLYINGH_FASTER_LINK 0x0603dce0 +#define DIBUTTON_FLYINGH_SLOWER_LINK 0x0603dce8 +#define DIBUTTON_FLYINGH_GLANCE_LEFT_LINK 0x0607c4e4 +#define DIBUTTON_FLYINGH_GLANCE_RIGHT_LINK 0x0607c4ec +#define DIBUTTON_FLYINGH_GLANCE_UP_LINK 0x0607c4e0 +#define DIBUTTON_FLYINGH_GLANCE_DOWN_LINK 0x0607c4e8 + +#define DIVIRTUAL_SPACESIM 0x07000000 +#define DIBUTTON_SPACESIM_FIRE 0x07000401 +#define DIBUTTON_SPACESIM_WEAPONS 0x07000402 +#define DIBUTTON_SPACESIM_TARGET 0x07000403 +#define DIBUTTON_SPACESIM_MENU 0x070004fd +#define DIBUTTON_SPACESIM_VIEW 0x07004404 +#define DIBUTTON_SPACESIM_DISPLAY 0x07004405 +#define DIBUTTON_SPACESIM_RAISE 0x07004406 +#define DIBUTTON_SPACESIM_LOWER 0x07004407 +#define DIBUTTON_SPACESIM_GEAR 0x07004408 +#define DIBUTTON_SPACESIM_FIRESECONDARY 0x07004409 +#define DIBUTTON_SPACESIM_PAUSE 0x070044fc +#define DIBUTTON_SPACESIM_DEVICE 0x070044fe +#define DIHATSWITCH_SPACESIM_GLANCE 0x07004601 +#define DIBUTTON_SPACESIM_LEFT_LINK 0x0700c4e4 +#define DIBUTTON_SPACESIM_RIGHT_LINK 0x0700c4ec +#define DIAXIS_SPACESIM_LATERAL 0x07008201 +#define DIAXIS_SPACESIM_MOVE 0x07010202 +#define DIBUTTON_SPACESIM_FORWARD_LINK 0x070144e0 +#define DIBUTTON_SPACESIM_BACKWARD_LINK 0x070144e8 +#define DIAXIS_SPACESIM_CLIMB 0x0701c204 +#define DIAXIS_SPACESIM_ROTATE 0x07024205 +#define DIBUTTON_SPACESIM_TURN_LEFT_LINK 0x070244e4 +#define DIBUTTON_SPACESIM_TURN_RIGHT_LINK 0x070244ec +#define DIAXIS_SPACESIM_THROTTLE 0x07038203 +#define DIBUTTON_SPACESIM_FASTER_LINK 0x0703c4e0 +#define DIBUTTON_SPACESIM_SLOWER_LINK 0x0703c4e8 +#define DIBUTTON_SPACESIM_GLANCE_UP_LINK 0x0707c4e0 +#define DIBUTTON_SPACESIM_GLANCE_LEFT_LINK 0x0707c4e4 +#define DIBUTTON_SPACESIM_GLANCE_DOWN_LINK 0x0707c4e8 +#define DIBUTTON_SPACESIM_GLANCE_RIGHT_LINK 0x0707c4ec + #ifdef __cplusplus }; #endif diff --git a/lib/libc/include/any-windows-any/dispatcherqueue.h b/lib/libc/include/any-windows-any/dispatcherqueue.h new file mode 100644 index 0000000000..040210c58a --- /dev/null +++ b/lib/libc/include/any-windows-any/dispatcherqueue.h @@ -0,0 +1,31 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#ifndef _DISPATCHERQUEUE_H_ +#define _DISPATCHERQUEUE_H_ + +#include + +enum DISPATCHERQUEUE_THREAD_APARTMENTTYPE { + DQTAT_COM_NONE = 0, + DQTAT_COM_ASTA = 1, + DQTAT_COM_STA = 2 +}; + +enum DISPATCHERQUEUE_THREAD_TYPE { + DQTYPE_THREAD_DEDICATED = 1, + DQTYPE_THREAD_CURRENT = 2 +}; + +struct DispatcherQueueOptions { + DWORD dwSize; + DISPATCHERQUEUE_THREAD_TYPE threadType; + DISPATCHERQUEUE_THREAD_APARTMENTTYPE apartmentType; +}; + +EXTERN_C HRESULT WINAPI CreateDispatcherQueueController(DispatcherQueueOptions,ABI::Windows::System::IDispatcherQueueController**); + +#endif /* _DISPATCHERQUEUE_H_ */ diff --git a/lib/libc/include/any-windows-any/dispex.h b/lib/libc/include/any-windows-any/dispex.h index da36a2f9a7..3d40f29036 100644 --- a/lib/libc/include/any-windows-any/dispex.h +++ b/lib/libc/include/any-windows-any/dispex.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/dispex.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/dispex.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,31 +21,49 @@ #ifndef __IDispatchEx_FWD_DEFINED__ #define __IDispatchEx_FWD_DEFINED__ typedef interface IDispatchEx IDispatchEx; +#ifdef __cplusplus +interface IDispatchEx; +#endif /* __cplusplus */ #endif #ifndef __IDispError_FWD_DEFINED__ #define __IDispError_FWD_DEFINED__ typedef interface IDispError IDispError; +#ifdef __cplusplus +interface IDispError; +#endif /* __cplusplus */ #endif #ifndef __IVariantChangeType_FWD_DEFINED__ #define __IVariantChangeType_FWD_DEFINED__ typedef interface IVariantChangeType IVariantChangeType; +#ifdef __cplusplus +interface IVariantChangeType; +#endif /* __cplusplus */ #endif #ifndef __IObjectIdentity_FWD_DEFINED__ #define __IObjectIdentity_FWD_DEFINED__ typedef interface IObjectIdentity IObjectIdentity; +#ifdef __cplusplus +interface IObjectIdentity; +#endif /* __cplusplus */ #endif #ifndef __ICanHandleException_FWD_DEFINED__ #define __ICanHandleException_FWD_DEFINED__ typedef interface ICanHandleException ICanHandleException; +#ifdef __cplusplus +interface ICanHandleException; +#endif /* __cplusplus */ #endif #ifndef __IProvideRuntimeContext_FWD_DEFINED__ #define __IProvideRuntimeContext_FWD_DEFINED__ typedef interface IProvideRuntimeContext IProvideRuntimeContext; +#ifdef __cplusplus +interface IProvideRuntimeContext; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -66,16 +85,25 @@ extern "C" { #ifndef __IDispatchEx_FWD_DEFINED__ #define __IDispatchEx_FWD_DEFINED__ typedef interface IDispatchEx IDispatchEx; +#ifdef __cplusplus +interface IDispatchEx; +#endif /* __cplusplus */ #endif #ifndef __IDispError_FWD_DEFINED__ #define __IDispError_FWD_DEFINED__ typedef interface IDispError IDispError; +#ifdef __cplusplus +interface IDispError; +#endif /* __cplusplus */ #endif #ifndef __IVariantChangeType_FWD_DEFINED__ #define __IVariantChangeType_FWD_DEFINED__ typedef interface IVariantChangeType IVariantChangeType; +#ifdef __cplusplus +interface IVariantChangeType; +#endif /* __cplusplus */ #endif #ifndef DISPEX_H_ @@ -192,29 +220,29 @@ typedef struct IDispatchExVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDispatchEx* This, + IDispatchEx *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDispatchEx* This); + IDispatchEx *This); ULONG (STDMETHODCALLTYPE *Release)( - IDispatchEx* This); + IDispatchEx *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IDispatchEx* This, + IDispatchEx *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IDispatchEx* This, + IDispatchEx *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IDispatchEx* This, + IDispatchEx *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -222,7 +250,7 @@ typedef struct IDispatchExVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IDispatchEx* This, + IDispatchEx *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -234,13 +262,13 @@ typedef struct IDispatchExVtbl { /*** IDispatchEx methods ***/ HRESULT (STDMETHODCALLTYPE *GetDispID)( - IDispatchEx* This, + IDispatchEx *This, BSTR bstrName, DWORD grfdex, DISPID *pid); HRESULT (STDMETHODCALLTYPE *InvokeEx)( - IDispatchEx* This, + IDispatchEx *This, DISPID id, LCID lcid, WORD wFlags, @@ -250,37 +278,38 @@ typedef struct IDispatchExVtbl { IServiceProvider *pspCaller); HRESULT (STDMETHODCALLTYPE *DeleteMemberByName)( - IDispatchEx* This, + IDispatchEx *This, BSTR bstrName, DWORD grfdex); HRESULT (STDMETHODCALLTYPE *DeleteMemberByDispID)( - IDispatchEx* This, + IDispatchEx *This, DISPID id); HRESULT (STDMETHODCALLTYPE *GetMemberProperties)( - IDispatchEx* This, + IDispatchEx *This, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex); HRESULT (STDMETHODCALLTYPE *GetMemberName)( - IDispatchEx* This, + IDispatchEx *This, DISPID id, BSTR *pbstrName); HRESULT (STDMETHODCALLTYPE *GetNextDispID)( - IDispatchEx* This, + IDispatchEx *This, DWORD grfdex, DISPID id, DISPID *pid); HRESULT (STDMETHODCALLTYPE *GetNameSpaceParent)( - IDispatchEx* This, + IDispatchEx *This, IUnknown **ppunk); END_INTERFACE } IDispatchExVtbl; + interface IDispatchEx { CONST_VTBL IDispatchExVtbl* lpVtbl; }; @@ -359,16 +388,6 @@ static FORCEINLINE HRESULT IDispatchEx_GetNameSpaceParent(IDispatchEx* This,IUnk #endif -HRESULT STDMETHODCALLTYPE IDispatchEx_GetDispID_Proxy( - IDispatchEx* This, - BSTR bstrName, - DWORD grfdex, - DISPID *pid); -void __RPC_STUB IDispatchEx_GetDispID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE IDispatchEx_RemoteInvokeEx_Proxy( IDispatchEx* This, DISPID id, @@ -386,60 +405,6 @@ void __RPC_STUB IDispatchEx_RemoteInvokeEx_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDispatchEx_DeleteMemberByName_Proxy( - IDispatchEx* This, - BSTR bstrName, - DWORD grfdex); -void __RPC_STUB IDispatchEx_DeleteMemberByName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDispatchEx_DeleteMemberByDispID_Proxy( - IDispatchEx* This, - DISPID id); -void __RPC_STUB IDispatchEx_DeleteMemberByDispID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDispatchEx_GetMemberProperties_Proxy( - IDispatchEx* This, - DISPID id, - DWORD grfdexFetch, - DWORD *pgrfdex); -void __RPC_STUB IDispatchEx_GetMemberProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDispatchEx_GetMemberName_Proxy( - IDispatchEx* This, - DISPID id, - BSTR *pbstrName); -void __RPC_STUB IDispatchEx_GetMemberName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDispatchEx_GetNextDispID_Proxy( - IDispatchEx* This, - DWORD grfdex, - DISPID id, - DISPID *pid); -void __RPC_STUB IDispatchEx_GetNextDispID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDispatchEx_GetNameSpaceParent_Proxy( - IDispatchEx* This, - IUnknown **ppunk); -void __RPC_STUB IDispatchEx_GetNameSpaceParent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IDispatchEx_InvokeEx_Proxy( IDispatchEx* This, DISPID id, @@ -505,45 +470,46 @@ typedef struct IDispErrorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDispError* This, + IDispError *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDispError* This); + IDispError *This); ULONG (STDMETHODCALLTYPE *Release)( - IDispError* This); + IDispError *This); /*** IDispError methods ***/ HRESULT (STDMETHODCALLTYPE *QueryErrorInfo)( - IDispError* This, + IDispError *This, GUID guidErrorType, IDispError **ppde); HRESULT (STDMETHODCALLTYPE *GetNext)( - IDispError* This, + IDispError *This, IDispError **ppde); HRESULT (STDMETHODCALLTYPE *GetHresult)( - IDispError* This, + IDispError *This, HRESULT *phr); HRESULT (STDMETHODCALLTYPE *GetSource)( - IDispError* This, + IDispError *This, BSTR *pbstrSource); HRESULT (STDMETHODCALLTYPE *GetHelpInfo)( - IDispError* This, + IDispError *This, BSTR *pbstrFileName, DWORD *pdwContext); HRESULT (STDMETHODCALLTYPE *GetDescription)( - IDispError* This, + IDispError *This, BSTR *pbstrDescription); END_INTERFACE } IDispErrorVtbl; + interface IDispError { CONST_VTBL IDispErrorVtbl* lpVtbl; }; @@ -596,56 +562,6 @@ static FORCEINLINE HRESULT IDispError_GetDescription(IDispError* This,BSTR *pbst #endif -HRESULT STDMETHODCALLTYPE IDispError_QueryErrorInfo_Proxy( - IDispError* This, - GUID guidErrorType, - IDispError **ppde); -void __RPC_STUB IDispError_QueryErrorInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDispError_GetNext_Proxy( - IDispError* This, - IDispError **ppde); -void __RPC_STUB IDispError_GetNext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDispError_GetHresult_Proxy( - IDispError* This, - HRESULT *phr); -void __RPC_STUB IDispError_GetHresult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDispError_GetSource_Proxy( - IDispError* This, - BSTR *pbstrSource); -void __RPC_STUB IDispError_GetSource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDispError_GetHelpInfo_Proxy( - IDispError* This, - BSTR *pbstrFileName, - DWORD *pdwContext); -void __RPC_STUB IDispError_GetHelpInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDispError_GetDescription_Proxy( - IDispError* This, - BSTR *pbstrDescription); -void __RPC_STUB IDispError_GetDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDispError_INTERFACE_DEFINED__ */ @@ -676,19 +592,19 @@ typedef struct IVariantChangeTypeVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IVariantChangeType* This, + IVariantChangeType *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IVariantChangeType* This); + IVariantChangeType *This); ULONG (STDMETHODCALLTYPE *Release)( - IVariantChangeType* This); + IVariantChangeType *This); /*** IVariantChangeType methods ***/ HRESULT (STDMETHODCALLTYPE *ChangeType)( - IVariantChangeType* This, + IVariantChangeType *This, VARIANT *pvarDst, VARIANT *pvarSrc, LCID lcid, @@ -696,6 +612,7 @@ typedef struct IVariantChangeTypeVtbl { END_INTERFACE } IVariantChangeTypeVtbl; + interface IVariantChangeType { CONST_VTBL IVariantChangeTypeVtbl* lpVtbl; }; @@ -728,17 +645,6 @@ static FORCEINLINE HRESULT IVariantChangeType_ChangeType(IVariantChangeType* Thi #endif -HRESULT STDMETHODCALLTYPE IVariantChangeType_ChangeType_Proxy( - IVariantChangeType* This, - VARIANT *pvarDst, - VARIANT *pvarSrc, - LCID lcid, - VARTYPE vtNew); -void __RPC_STUB IVariantChangeType_ChangeType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IVariantChangeType_INTERFACE_DEFINED__ */ @@ -766,23 +672,24 @@ typedef struct IObjectIdentityVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IObjectIdentity* This, + IObjectIdentity *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IObjectIdentity* This); + IObjectIdentity *This); ULONG (STDMETHODCALLTYPE *Release)( - IObjectIdentity* This); + IObjectIdentity *This); /*** IObjectIdentity methods ***/ HRESULT (STDMETHODCALLTYPE *IsEqualObject)( - IObjectIdentity* This, + IObjectIdentity *This, IUnknown *punk); END_INTERFACE } IObjectIdentityVtbl; + interface IObjectIdentity { CONST_VTBL IObjectIdentityVtbl* lpVtbl; }; @@ -815,14 +722,6 @@ static FORCEINLINE HRESULT IObjectIdentity_IsEqualObject(IObjectIdentity* This,I #endif -HRESULT STDMETHODCALLTYPE IObjectIdentity_IsEqualObject_Proxy( - IObjectIdentity* This, - IUnknown *punk); -void __RPC_STUB IObjectIdentity_IsEqualObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IObjectIdentity_INTERFACE_DEFINED__ */ @@ -851,24 +750,25 @@ typedef struct ICanHandleExceptionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICanHandleException* This, + ICanHandleException *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICanHandleException* This); + ICanHandleException *This); ULONG (STDMETHODCALLTYPE *Release)( - ICanHandleException* This); + ICanHandleException *This); /*** ICanHandleException methods ***/ HRESULT (STDMETHODCALLTYPE *CanHandleException)( - ICanHandleException* This, + ICanHandleException *This, EXCEPINFO *pExcepInfo, VARIANT *pvar); END_INTERFACE } ICanHandleExceptionVtbl; + interface ICanHandleException { CONST_VTBL ICanHandleExceptionVtbl* lpVtbl; }; @@ -901,15 +801,6 @@ static FORCEINLINE HRESULT ICanHandleException_CanHandleException(ICanHandleExce #endif -HRESULT STDMETHODCALLTYPE ICanHandleException_CanHandleException_Proxy( - ICanHandleException* This, - EXCEPINFO *pExcepInfo, - VARIANT *pvar); -void __RPC_STUB ICanHandleException_CanHandleException_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICanHandleException_INTERFACE_DEFINED__ */ @@ -938,24 +829,25 @@ typedef struct IProvideRuntimeContextVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IProvideRuntimeContext* This, + IProvideRuntimeContext *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IProvideRuntimeContext* This); + IProvideRuntimeContext *This); ULONG (STDMETHODCALLTYPE *Release)( - IProvideRuntimeContext* This); + IProvideRuntimeContext *This); /*** IProvideRuntimeContext methods ***/ HRESULT (STDMETHODCALLTYPE *GetCurrentSourceContext)( - IProvideRuntimeContext* This, + IProvideRuntimeContext *This, DWORD_PTR *pdwContext, VARIANT_BOOL *pfExecutingGlobalCode); END_INTERFACE } IProvideRuntimeContextVtbl; + interface IProvideRuntimeContext { CONST_VTBL IProvideRuntimeContextVtbl* lpVtbl; }; @@ -988,15 +880,6 @@ static FORCEINLINE HRESULT IProvideRuntimeContext_GetCurrentSourceContext(IProvi #endif -HRESULT STDMETHODCALLTYPE IProvideRuntimeContext_GetCurrentSourceContext_Proxy( - IProvideRuntimeContext* This, - DWORD_PTR *pdwContext, - VARIANT_BOOL *pfExecutingGlobalCode); -void __RPC_STUB IProvideRuntimeContext_GetCurrentSourceContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IProvideRuntimeContext_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/dls1.h b/lib/libc/include/any-windows-any/dls1.h index d980b2b9b4..24c49c1e52 100644 --- a/lib/libc/include/any-windows-any/dls1.h +++ b/lib/libc/include/any-windows-any/dls1.h @@ -99,104 +99,89 @@ /***************************************************************************** * Structures */ -/* typedef definitions */ -typedef struct _DLSID DLSID, *LPDLSID; -typedef struct _DLSVERSION DLSVERSION, *LPDLSVERSION; -typedef struct _CONNECTION CONNECTION, *LPCONNECTION; -typedef struct _CONNECTIONLIST CONNECTIONLIST, *LPCONNECTIONLIST; -typedef struct _RGNRANGE RGNRANGE, *LPRGNRANGE; -typedef struct _MIDILOCALE MIDILOCALE, *LPMIDILOCALE; -typedef struct _RGNHEADER RGNHEADER, *LPRGNHEADER; -typedef struct _INSTHEADER INSTHEADER, *LPINSTHEADER; -typedef struct _DLSHEADER DLSHEADER, *LPDLSHEADER; -typedef struct _WAVELINK WAVELINK, *LPWAVELINK; -typedef struct _POOLCUE POOLCUE, *LPPOOLCUE; -typedef struct _POOLTABLE POOLTABLE, *LPPOOLTABLE; -typedef struct _rwsmp WSMPL, *LPWSMPL; -typedef struct _rloop WLOOP, *LPWLOOP; /* actual structures */ -struct _DLSID { +typedef struct _DLSID { ULONG ulData1; USHORT usData2; USHORT usData3; BYTE abData4[8]; -}; +} DLSID, *LPDLSID; -struct _DLSVERSION { +typedef struct _DLSVERSION { DWORD dwVersionMS; DWORD dwVersionLS; -}; +} DLSVERSION, *LPDLSVERSION; -struct _CONNECTION { +typedef struct _CONNECTION { USHORT usSource; USHORT usControl; USHORT usDestination; USHORT usTransform; LONG lScale; -}; +} CONNECTION, *LPCONNECTION; -struct _CONNECTIONLIST { +typedef struct _CONNECTIONLIST { ULONG cbSize; ULONG cConnections; -}; +} CONNECTIONLIST, *LPCONNECTIONLIST; -struct _RGNRANGE { +typedef struct _RGNRANGE { USHORT usLow; USHORT usHigh; -}; +} RGNRANGE, *LPRGNRANGE; -struct _MIDILOCALE { +typedef struct _MIDILOCALE { ULONG ulBank; ULONG ulInstrument; -}; +} MIDILOCALE, *LPMIDILOCALE; -struct _RGNHEADER { +typedef struct _RGNHEADER { RGNRANGE RangeKey; RGNRANGE RangeVelocity; USHORT fusOptions; USHORT usKeyGroup; -}; +} RGNHEADER, *LPRGNHEADER; -struct _INSTHEADER { +typedef struct _INSTHEADER { ULONG cRegions; MIDILOCALE Locale; -}; +} INSTHEADER, *LPINSTHEADER; -struct _DLSHEADER { +typedef struct _DLSHEADER { ULONG cInstruments; -}; +} DLSHEADER, *LPDLSHEADER; -struct _WAVELINK { +typedef struct _WAVELINK { USHORT fusOptions; USHORT usPhaseGroup; ULONG ulChannel; ULONG ulTableIndex; -}; +} WAVELINK, *LPWAVELINK; -struct _POOLCUE { +typedef struct _POOLCUE { ULONG ulOffset; -}; +} POOLCUE, *LPPOOLCUE; -struct _POOLTABLE { +typedef struct _POOLTABLE { ULONG cbSize; ULONG cCues; -}; +} POOLTABLE, *LPPOOLTABLE; -struct _rwsmp { +typedef struct _rwsmp { ULONG cbSize; USHORT usUnityNote; SHORT sFineTune; LONG lAttenuation; ULONG fulOptions; ULONG cSampleLoops; -}; +} WSMPL, *LPWSMPL; -struct _rloop { +typedef struct _rloop { ULONG cbSize; ULONG ulType; ULONG ulStart; ULONG ulLength; -}; +} WLOOP, *LPWLOOP; #endif /* __WINE_INCLUDE_DLS1_H */ diff --git a/lib/libc/include/any-windows-any/dmodshow.h b/lib/libc/include/any-windows-any/dmodshow.h index 517dc749a4..d9f620d7ad 100644 --- a/lib/libc/include/any-windows-any/dmodshow.h +++ b/lib/libc/include/any-windows-any/dmodshow.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from direct-x/include/dmodshow.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from direct-x/include/dmodshow.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,6 +21,9 @@ #ifndef __IDMOWrapperFilter_FWD_DEFINED__ #define __IDMOWrapperFilter_FWD_DEFINED__ typedef interface IDMOWrapperFilter IDMOWrapperFilter; +#ifdef __cplusplus +interface IDMOWrapperFilter; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -56,24 +60,25 @@ typedef struct IDMOWrapperFilterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDMOWrapperFilter* This, + IDMOWrapperFilter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDMOWrapperFilter* This); + IDMOWrapperFilter *This); ULONG (STDMETHODCALLTYPE *Release)( - IDMOWrapperFilter* This); + IDMOWrapperFilter *This); /*** IDMOWrapperFilter methods ***/ HRESULT (STDMETHODCALLTYPE *Init)( - IDMOWrapperFilter* This, + IDMOWrapperFilter *This, REFCLSID clsidDMO, REFCLSID catDMO); END_INTERFACE } IDMOWrapperFilterVtbl; + interface IDMOWrapperFilter { CONST_VTBL IDMOWrapperFilterVtbl* lpVtbl; }; @@ -106,15 +111,6 @@ static FORCEINLINE HRESULT IDMOWrapperFilter_Init(IDMOWrapperFilter* This,REFCLS #endif -HRESULT STDMETHODCALLTYPE IDMOWrapperFilter_Init_Proxy( - IDMOWrapperFilter* This, - REFCLSID clsidDMO, - REFCLSID catDMO); -void __RPC_STUB IDMOWrapperFilter_Init_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDMOWrapperFilter_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/dmplugin.h b/lib/libc/include/any-windows-any/dmplugin.h index fca55cd7d4..5b35f7ec3a 100644 --- a/lib/libc/include/any-windows-any/dmplugin.h +++ b/lib/libc/include/any-windows-any/dmplugin.h @@ -102,11 +102,8 @@ typedef LONG MUSIC_TIME; /***************************************************************************** * Enumerations */ -/* typedef definitions */ -typedef enum enumDMUS_TRACKF_FLAGS DMUS_TRACKF_FLAGS; - -/* actual enumerations */ -enum enumDMUS_TRACKF_FLAGS { +typedef enum enumDMUS_TRACKF_FLAGS +{ DMUS_TRACKF_SEEK = 0x001, DMUS_TRACKF_LOOP = 0x002, DMUS_TRACKF_START = 0x004, @@ -118,7 +115,7 @@ enum enumDMUS_TRACKF_FLAGS { DMUS_TRACKF_STOP = 0x100, DMUS_TRACKF_RECOMPOSE = 0x200, DMUS_TRACKF_CLOCK = 0x400, -}; +} DMUS_TRACKF_FLAGS; /***************************************************************************** * IDirectMusicTool interface diff --git a/lib/libc/include/any-windows-any/dmusici.h b/lib/libc/include/any-windows-any/dmusici.h index 50399f02ca..a0f55886bf 100644 --- a/lib/libc/include/any-windows-any/dmusici.h +++ b/lib/libc/include/any-windows-any/dmusici.h @@ -367,38 +367,23 @@ typedef WORD TRANSITION_TYPE, *LPTRANSITION_TYPE; /***************************************************************************** * Enumerations */ -/* typedef definitions */ -typedef enum enumDMUS_STYLET_TYPES DMUS_STYLET_TYPES; -typedef enum enumDMUS_COMMANDT_TYPES DMUS_COMMANDT_TYPES; -typedef enum enumDMUS_SHAPET_TYPES DMUS_SHAPET_TYPES; -typedef enum enumDMUS_COMPOSEF_FLAGS DMUS_COMPOSEF_FLAGS; -typedef enum enumDMUS_PMSGF_FLAGS DMUS_PMSGF_FLAGS; -typedef enum enumDMUS_PMSGT_TYPES DMUS_PMSGT_TYPES; -typedef enum enumDMUS_SEGF_FLAGS DMUS_SEGF_FLAGS; -typedef enum enumDMUS_TIME_RESOLVE_FLAGS DMUS_TIME_RESOLVE_FLAGS; -typedef enum enumDMUS_CHORDKEYF_FLAGS DMUS_CHORDKEYF_FLAGS; -typedef enum enumDMUS_NOTEF_FLAGS DMUS_NOTEF_FLAGS; -typedef enum enumDMUS_PLAYMODE_FLAGS DMUS_PLAYMODE_FLAGS; -typedef enum enumDMUS_CURVE_FLAGS DMUS_CURVE_FLAGS; - - /* actual enumerations */ -enum enumDMUS_STYLET_TYPES { +typedef enum enumDMUS_STYLET_TYPES { DMUS_STYLET_PATTERN = 0x0, DMUS_STYLET_MOTIF = 0x1, -}; +} DMUS_STYLET_TYPES; -enum enumDMUS_COMMANDT_TYPES { +typedef enum enumDMUS_COMMANDT_TYPES { DMUS_COMMANDT_GROOVE = 0x0, DMUS_COMMANDT_FILL = 0x1, DMUS_COMMANDT_INTRO = 0x2, DMUS_COMMANDT_BREAK = 0x3, DMUS_COMMANDT_END = 0x4, DMUS_COMMANDT_ENDANDINTRO = 0x5 -}; +} DMUS_COMMANDT_TYPES; -enum enumDMUS_SHAPET_TYPES { +typedef enum enumDMUS_SHAPET_TYPES { DMUS_SHAPET_FALLING = 0x0, DMUS_SHAPET_LEVEL = 0x1, DMUS_SHAPET_LOOPABLE = 0x2, @@ -408,9 +393,9 @@ enum enumDMUS_SHAPET_TYPES { DMUS_SHAPET_RANDOM = 0x6, DMUS_SHAPET_RISING = 0x7, DMUS_SHAPET_SONG = 0x8 -}; +} DMUS_SHAPET_TYPES; -enum enumDMUS_COMPOSEF_FLAGS { +typedef enum enumDMUS_COMPOSEF_FLAGS { DMUS_COMPOSEF_NONE = 0x000000, DMUS_COMPOSEF_ALIGN = 0x000001, DMUS_COMPOSEF_OVERLAP = 0x000002, @@ -435,9 +420,9 @@ enum enumDMUS_COMPOSEF_FLAGS { DMUS_COMPOSEF_NOINVALIDATE = 0x100000, DMUS_COMPOSEF_USE_AUDIOPATH = 0x200000, DMUS_COMPOSEF_INVALIDATE_PRI = 0x400000 -}; +} DMUS_COMPOSEF_FLAGS; -enum enumDMUS_PMSGF_FLAGS { +typedef enum enumDMUS_PMSGF_FLAGS { DMUS_PMSGF_REFTIME = 1, DMUS_PMSGF_MUSICTIME = 2, DMUS_PMSGF_TOOL_IMMEDIATE = 4, @@ -446,9 +431,9 @@ enum enumDMUS_PMSGF_FLAGS { DMUS_PMSGF_TOOL_FLUSH = 0x20, DMUS_PMSGF_LOCKTOREFTIME = 0x40, DMUS_PMSGF_DX8 = 0x80 -}; +} DMUS_PMSGF_FLAGS; -enum enumDMUS_PMSGT_TYPES { +typedef enum enumDMUS_PMSGT_TYPES { DMUS_PMSGT_MIDI = 0x00, DMUS_PMSGT_NOTE = 0x01, DMUS_PMSGT_SYSEX = 0x02, @@ -465,9 +450,9 @@ enum enumDMUS_PMSGT_TYPES { DMUS_PMSGT_LYRIC = 0x0D, DMUS_PMSGT_SCRIPTLYRIC = 0x0E, DMUS_PMSGT_USER = 0xFF -}; +} DMUS_PMSGT_TYPES; -enum enumDMUS_SEGF_FLAGS { +typedef enum enumDMUS_SEGF_FLAGS { DMUS_SEGF_REFTIME = 0x000040, DMUS_SEGF_SECONDARY = 0x000080, DMUS_SEGF_QUEUE = 0x000100, @@ -491,9 +476,9 @@ enum enumDMUS_SEGF_FLAGS { DMUS_SEGF_USE_AUDIOPATH = 0x04000000, DMUS_SEGF_VALID_START_MEASURE = 0x08000000, DMUS_SEGF_INVALIDATE_PRI = 0x10000000 -}; +} DMUS_SEGF_FLAGS; -enum enumDMUS_TIME_RESOLVE_FLAGS { +typedef enum enumDMUS_TIME_RESOLVE_FLAGS { DMUS_TIME_RESOLVE_AFTERPREPARETIME = DMUS_SEGF_AFTERPREPARETIME, DMUS_TIME_RESOLVE_AFTERQUEUETIME = DMUS_SEGF_AFTERQUEUETIME, DMUS_TIME_RESOLVE_AFTERLATENCYTIME = DMUS_SEGF_AFTERLATENCYTIME, @@ -502,33 +487,33 @@ enum enumDMUS_TIME_RESOLVE_FLAGS { DMUS_TIME_RESOLVE_MEASURE = DMUS_SEGF_MEASURE, DMUS_TIME_RESOLVE_MARKER = DMUS_SEGF_MARKER, DMUS_TIME_RESOLVE_SEGMENTEND = DMUS_SEGF_SEGMENTEND, -}; +} DMUS_TIME_RESOLVE_FLAGS; -enum enumDMUS_CHORDKEYF_FLAGS { +typedef enum enumDMUS_CHORDKEYF_FLAGS { DMUS_CHORDKEYF_SILENT = 0x1, -}; +} DMUS_CHORDKEYF_FLAGS; -enum enumDMUS_NOTEF_FLAGS { +typedef enum enumDMUS_NOTEF_FLAGS { DMUS_NOTEF_NOTEON = 0x01, /* DX8 */ DMUS_NOTEF_NOINVALIDATE = 0x02, DMUS_NOTEF_NOINVALIDATE_INSCALE = 0x04, DMUS_NOTEF_NOINVALIDATE_INCHORD = 0x08, DMUS_NOTEF_REGENERATE = 0x10, -}; +} DMUS_NOTEF_FLAGS; -enum enumDMUS_PLAYMODE_FLAGS { +typedef enum enumDMUS_PLAYMODE_FLAGS { DMUS_PLAYMODE_KEY_ROOT = 0x01, DMUS_PLAYMODE_CHORD_ROOT = 0x02, DMUS_PLAYMODE_SCALE_INTERVALS = 0x04, DMUS_PLAYMODE_CHORD_INTERVALS = 0x08, DMUS_PLAYMODE_NONE = 0x10, -}; +} DMUS_PLAYMODE_FLAGS; -enum enumDMUS_CURVE_FLAGS { +typedef enum enumDMUS_CURVE_FLAGS { DMUS_CURVE_RESET = 0x1, DMUS_CURVE_START_FROM_CURRENT = 0x2 -}; +} DMUS_CURVE_FLAGS; enum { DMUS_CURVES_LINEAR = 0x0, diff --git a/lib/libc/include/any-windows-any/docobj.h b/lib/libc/include/any-windows-any/docobj.h index bd89676239..502d40573d 100644 --- a/lib/libc/include/any-windows-any/docobj.h +++ b/lib/libc/include/any-windows-any/docobj.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/docobj.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/docobj.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,51 +21,81 @@ #ifndef __IOleDocument_FWD_DEFINED__ #define __IOleDocument_FWD_DEFINED__ typedef interface IOleDocument IOleDocument; +#ifdef __cplusplus +interface IOleDocument; +#endif /* __cplusplus */ #endif #ifndef __IOleDocumentSite_FWD_DEFINED__ #define __IOleDocumentSite_FWD_DEFINED__ typedef interface IOleDocumentSite IOleDocumentSite; +#ifdef __cplusplus +interface IOleDocumentSite; +#endif /* __cplusplus */ #endif #ifndef __IOleDocumentView_FWD_DEFINED__ #define __IOleDocumentView_FWD_DEFINED__ typedef interface IOleDocumentView IOleDocumentView; +#ifdef __cplusplus +interface IOleDocumentView; +#endif /* __cplusplus */ #endif #ifndef __IEnumOleDocumentViews_FWD_DEFINED__ #define __IEnumOleDocumentViews_FWD_DEFINED__ typedef interface IEnumOleDocumentViews IEnumOleDocumentViews; +#ifdef __cplusplus +interface IEnumOleDocumentViews; +#endif /* __cplusplus */ #endif #ifndef __IContinueCallback_FWD_DEFINED__ #define __IContinueCallback_FWD_DEFINED__ typedef interface IContinueCallback IContinueCallback; +#ifdef __cplusplus +interface IContinueCallback; +#endif /* __cplusplus */ #endif #ifndef __IPrint_FWD_DEFINED__ #define __IPrint_FWD_DEFINED__ typedef interface IPrint IPrint; +#ifdef __cplusplus +interface IPrint; +#endif /* __cplusplus */ #endif #ifndef __IOleCommandTarget_FWD_DEFINED__ #define __IOleCommandTarget_FWD_DEFINED__ typedef interface IOleCommandTarget IOleCommandTarget; +#ifdef __cplusplus +interface IOleCommandTarget; +#endif /* __cplusplus */ #endif #ifndef __IZoomEvents_FWD_DEFINED__ #define __IZoomEvents_FWD_DEFINED__ typedef interface IZoomEvents IZoomEvents; +#ifdef __cplusplus +interface IZoomEvents; +#endif /* __cplusplus */ #endif #ifndef __IProtectFocus_FWD_DEFINED__ #define __IProtectFocus_FWD_DEFINED__ typedef interface IProtectFocus IProtectFocus; +#ifdef __cplusplus +interface IProtectFocus; +#endif /* __cplusplus */ #endif #ifndef __IProtectedModeMenuServices_FWD_DEFINED__ #define __IProtectedModeMenuServices_FWD_DEFINED__ typedef interface IProtectedModeMenuServices IProtectedModeMenuServices; +#ifdef __cplusplus +interface IProtectedModeMenuServices; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -92,41 +123,65 @@ extern "C" { #ifndef __IOleDocument_FWD_DEFINED__ #define __IOleDocument_FWD_DEFINED__ typedef interface IOleDocument IOleDocument; +#ifdef __cplusplus +interface IOleDocument; +#endif /* __cplusplus */ #endif #ifndef __IOleDocumentSite_FWD_DEFINED__ #define __IOleDocumentSite_FWD_DEFINED__ typedef interface IOleDocumentSite IOleDocumentSite; +#ifdef __cplusplus +interface IOleDocumentSite; +#endif /* __cplusplus */ #endif #ifndef __IOleDocumentView_FWD_DEFINED__ #define __IOleDocumentView_FWD_DEFINED__ typedef interface IOleDocumentView IOleDocumentView; +#ifdef __cplusplus +interface IOleDocumentView; +#endif /* __cplusplus */ #endif #ifndef __IEnumOleDocumentViews_FWD_DEFINED__ #define __IEnumOleDocumentViews_FWD_DEFINED__ typedef interface IEnumOleDocumentViews IEnumOleDocumentViews; +#ifdef __cplusplus +interface IEnumOleDocumentViews; +#endif /* __cplusplus */ #endif #ifndef __IContinueCallback_FWD_DEFINED__ #define __IContinueCallback_FWD_DEFINED__ typedef interface IContinueCallback IContinueCallback; +#ifdef __cplusplus +interface IContinueCallback; +#endif /* __cplusplus */ #endif #ifndef __IPrint_FWD_DEFINED__ #define __IPrint_FWD_DEFINED__ typedef interface IPrint IPrint; +#ifdef __cplusplus +interface IPrint; +#endif /* __cplusplus */ #endif #ifndef __IOleCommandTarget_FWD_DEFINED__ #define __IOleCommandTarget_FWD_DEFINED__ typedef interface IOleCommandTarget IOleCommandTarget; +#ifdef __cplusplus +interface IOleCommandTarget; +#endif /* __cplusplus */ #endif #ifndef __IProtectedModeMenuServices_FWD_DEFINED__ #define __IProtectedModeMenuServices_FWD_DEFINED__ typedef interface IProtectedModeMenuServices IProtectedModeMenuServices; +#ifdef __cplusplus +interface IProtectedModeMenuServices; +#endif /* __cplusplus */ #endif @@ -175,35 +230,36 @@ typedef struct IOleDocumentVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleDocument* This, + IOleDocument *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleDocument* This); + IOleDocument *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleDocument* This); + IOleDocument *This); /*** IOleDocument methods ***/ HRESULT (STDMETHODCALLTYPE *CreateView)( - IOleDocument* This, + IOleDocument *This, IOleInPlaceSite *pIPSite, IStream *pstm, DWORD dwReserved, IOleDocumentView **ppView); HRESULT (STDMETHODCALLTYPE *GetDocMiscStatus)( - IOleDocument* This, + IOleDocument *This, DWORD *pdwStatus); HRESULT (STDMETHODCALLTYPE *EnumViews)( - IOleDocument* This, + IOleDocument *This, IEnumOleDocumentViews **ppEnum, IOleDocumentView **ppView); END_INTERFACE } IOleDocumentVtbl; + interface IOleDocument { CONST_VTBL IOleDocumentVtbl* lpVtbl; }; @@ -244,34 +300,6 @@ static FORCEINLINE HRESULT IOleDocument_EnumViews(IOleDocument* This,IEnumOleDoc #endif -HRESULT STDMETHODCALLTYPE IOleDocument_CreateView_Proxy( - IOleDocument* This, - IOleInPlaceSite *pIPSite, - IStream *pstm, - DWORD dwReserved, - IOleDocumentView **ppView); -void __RPC_STUB IOleDocument_CreateView_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleDocument_GetDocMiscStatus_Proxy( - IOleDocument* This, - DWORD *pdwStatus); -void __RPC_STUB IOleDocument_GetDocMiscStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleDocument_EnumViews_Proxy( - IOleDocument* This, - IEnumOleDocumentViews **ppEnum, - IOleDocumentView **ppView); -void __RPC_STUB IOleDocument_EnumViews_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleDocument_INTERFACE_DEFINED__ */ @@ -305,23 +333,24 @@ typedef struct IOleDocumentSiteVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleDocumentSite* This, + IOleDocumentSite *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleDocumentSite* This); + IOleDocumentSite *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleDocumentSite* This); + IOleDocumentSite *This); /*** IOleDocumentSite methods ***/ HRESULT (STDMETHODCALLTYPE *ActivateMe)( - IOleDocumentSite* This, + IOleDocumentSite *This, IOleDocumentView *pViewToActivate); END_INTERFACE } IOleDocumentSiteVtbl; + interface IOleDocumentSite { CONST_VTBL IOleDocumentSiteVtbl* lpVtbl; }; @@ -354,14 +383,6 @@ static FORCEINLINE HRESULT IOleDocumentSite_ActivateMe(IOleDocumentSite* This,IO #endif -HRESULT STDMETHODCALLTYPE IOleDocumentSite_ActivateMe_Proxy( - IOleDocumentSite* This, - IOleDocumentView *pViewToActivate); -void __RPC_STUB IOleDocumentSite_ActivateMe_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleDocumentSite_INTERFACE_DEFINED__ */ @@ -435,74 +456,75 @@ typedef struct IOleDocumentViewVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleDocumentView* This, + IOleDocumentView *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleDocumentView* This); + IOleDocumentView *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleDocumentView* This); + IOleDocumentView *This); /*** IOleDocumentView methods ***/ HRESULT (STDMETHODCALLTYPE *SetInPlaceSite)( - IOleDocumentView* This, + IOleDocumentView *This, IOleInPlaceSite *pIPSite); HRESULT (STDMETHODCALLTYPE *GetInPlaceSite)( - IOleDocumentView* This, + IOleDocumentView *This, IOleInPlaceSite **ppIPSite); HRESULT (STDMETHODCALLTYPE *GetDocument)( - IOleDocumentView* This, + IOleDocumentView *This, IUnknown **ppunk); HRESULT (STDMETHODCALLTYPE *SetRect)( - IOleDocumentView* This, + IOleDocumentView *This, LPRECT prcView); HRESULT (STDMETHODCALLTYPE *GetRect)( - IOleDocumentView* This, + IOleDocumentView *This, LPRECT prcView); HRESULT (STDMETHODCALLTYPE *SetRectComplex)( - IOleDocumentView* This, + IOleDocumentView *This, LPRECT prcView, LPRECT prcHScroll, LPRECT prcVScroll, LPRECT prcSizeBox); HRESULT (STDMETHODCALLTYPE *Show)( - IOleDocumentView* This, + IOleDocumentView *This, WINBOOL fShow); HRESULT (STDMETHODCALLTYPE *UIActivate)( - IOleDocumentView* This, + IOleDocumentView *This, WINBOOL fUIActivate); HRESULT (STDMETHODCALLTYPE *Open)( - IOleDocumentView* This); + IOleDocumentView *This); HRESULT (STDMETHODCALLTYPE *CloseView)( - IOleDocumentView* This, + IOleDocumentView *This, DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *SaveViewState)( - IOleDocumentView* This, + IOleDocumentView *This, LPSTREAM pstm); HRESULT (STDMETHODCALLTYPE *ApplyViewState)( - IOleDocumentView* This, + IOleDocumentView *This, LPSTREAM pstm); HRESULT (STDMETHODCALLTYPE *Clone)( - IOleDocumentView* This, + IOleDocumentView *This, IOleInPlaceSite *pIPSiteNew, IOleDocumentView **ppViewNew); END_INTERFACE } IOleDocumentViewVtbl; + interface IOleDocumentView { CONST_VTBL IOleDocumentViewVtbl* lpVtbl; }; @@ -583,113 +605,6 @@ static FORCEINLINE HRESULT IOleDocumentView_Clone(IOleDocumentView* This,IOleInP #endif -HRESULT STDMETHODCALLTYPE IOleDocumentView_SetInPlaceSite_Proxy( - IOleDocumentView* This, - IOleInPlaceSite *pIPSite); -void __RPC_STUB IOleDocumentView_SetInPlaceSite_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleDocumentView_GetInPlaceSite_Proxy( - IOleDocumentView* This, - IOleInPlaceSite **ppIPSite); -void __RPC_STUB IOleDocumentView_GetInPlaceSite_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleDocumentView_GetDocument_Proxy( - IOleDocumentView* This, - IUnknown **ppunk); -void __RPC_STUB IOleDocumentView_GetDocument_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleDocumentView_SetRect_Proxy( - IOleDocumentView* This, - LPRECT prcView); -void __RPC_STUB IOleDocumentView_SetRect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleDocumentView_GetRect_Proxy( - IOleDocumentView* This, - LPRECT prcView); -void __RPC_STUB IOleDocumentView_GetRect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleDocumentView_SetRectComplex_Proxy( - IOleDocumentView* This, - LPRECT prcView, - LPRECT prcHScroll, - LPRECT prcVScroll, - LPRECT prcSizeBox); -void __RPC_STUB IOleDocumentView_SetRectComplex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleDocumentView_Show_Proxy( - IOleDocumentView* This, - WINBOOL fShow); -void __RPC_STUB IOleDocumentView_Show_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleDocumentView_UIActivate_Proxy( - IOleDocumentView* This, - WINBOOL fUIActivate); -void __RPC_STUB IOleDocumentView_UIActivate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleDocumentView_Open_Proxy( - IOleDocumentView* This); -void __RPC_STUB IOleDocumentView_Open_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleDocumentView_CloseView_Proxy( - IOleDocumentView* This, - DWORD dwReserved); -void __RPC_STUB IOleDocumentView_CloseView_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleDocumentView_SaveViewState_Proxy( - IOleDocumentView* This, - LPSTREAM pstm); -void __RPC_STUB IOleDocumentView_SaveViewState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleDocumentView_ApplyViewState_Proxy( - IOleDocumentView* This, - LPSTREAM pstm); -void __RPC_STUB IOleDocumentView_ApplyViewState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleDocumentView_Clone_Proxy( - IOleDocumentView* This, - IOleInPlaceSite *pIPSiteNew, - IOleDocumentView **ppViewNew); -void __RPC_STUB IOleDocumentView_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleDocumentView_INTERFACE_DEFINED__ */ @@ -734,36 +649,37 @@ typedef struct IEnumOleDocumentViewsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumOleDocumentViews* This, + IEnumOleDocumentViews *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumOleDocumentViews* This); + IEnumOleDocumentViews *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumOleDocumentViews* This); + IEnumOleDocumentViews *This); /*** IEnumOleDocumentViews methods ***/ HRESULT (__stdcall *Next)( - IEnumOleDocumentViews* This, + IEnumOleDocumentViews *This, ULONG cViews, IOleDocumentView **rgpView, ULONG *pcFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumOleDocumentViews* This, + IEnumOleDocumentViews *This, ULONG cViews); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumOleDocumentViews* This); + IEnumOleDocumentViews *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumOleDocumentViews* This, + IEnumOleDocumentViews *This, IEnumOleDocumentViews **ppEnum); END_INTERFACE } IEnumOleDocumentViewsVtbl; + interface IEnumOleDocumentViews { CONST_VTBL IEnumOleDocumentViewsVtbl* lpVtbl; }; @@ -818,29 +734,6 @@ void __RPC_STUB IEnumOleDocumentViews_RemoteNext_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumOleDocumentViews_Skip_Proxy( - IEnumOleDocumentViews* This, - ULONG cViews); -void __RPC_STUB IEnumOleDocumentViews_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumOleDocumentViews_Reset_Proxy( - IEnumOleDocumentViews* This); -void __RPC_STUB IEnumOleDocumentViews_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumOleDocumentViews_Clone_Proxy( - IEnumOleDocumentViews* This, - IEnumOleDocumentViews **ppEnum); -void __RPC_STUB IEnumOleDocumentViews_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IEnumOleDocumentViews_Next_Proxy( IEnumOleDocumentViews* This, ULONG cViews, @@ -889,28 +782,29 @@ typedef struct IContinueCallbackVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IContinueCallback* This, + IContinueCallback *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IContinueCallback* This); + IContinueCallback *This); ULONG (STDMETHODCALLTYPE *Release)( - IContinueCallback* This); + IContinueCallback *This); /*** IContinueCallback methods ***/ HRESULT (STDMETHODCALLTYPE *FContinue)( - IContinueCallback* This); + IContinueCallback *This); HRESULT (STDMETHODCALLTYPE *FContinuePrinting)( - IContinueCallback* This, + IContinueCallback *This, LONG nCntPrinted, LONG nCurPage, wchar_t *pwszPrintStatus); END_INTERFACE } IContinueCallbackVtbl; + interface IContinueCallback { CONST_VTBL IContinueCallbackVtbl* lpVtbl; }; @@ -947,23 +841,6 @@ static FORCEINLINE HRESULT IContinueCallback_FContinuePrinting(IContinueCallback #endif -HRESULT STDMETHODCALLTYPE IContinueCallback_FContinue_Proxy( - IContinueCallback* This); -void __RPC_STUB IContinueCallback_FContinue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IContinueCallback_FContinuePrinting_Proxy( - IContinueCallback* This, - LONG nCntPrinted, - LONG nCurPage, - wchar_t *pwszPrintStatus); -void __RPC_STUB IContinueCallback_FContinuePrinting_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IContinueCallback_INTERFACE_DEFINED__ */ @@ -1036,28 +913,28 @@ typedef struct IPrintVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPrint* This, + IPrint *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPrint* This); + IPrint *This); ULONG (STDMETHODCALLTYPE *Release)( - IPrint* This); + IPrint *This); /*** IPrint methods ***/ HRESULT (STDMETHODCALLTYPE *SetInitialPageNum)( - IPrint* This, + IPrint *This, LONG nFirstPage); HRESULT (STDMETHODCALLTYPE *GetPageInfo)( - IPrint* This, + IPrint *This, LONG *pnFirstPage, LONG *pcPages); HRESULT (__stdcall *Print)( - IPrint* This, + IPrint *This, DWORD grfFlags, DVTARGETDEVICE **pptd, PAGESET **ppPageSet, @@ -1069,6 +946,7 @@ typedef struct IPrintVtbl { END_INTERFACE } IPrintVtbl; + interface IPrint { CONST_VTBL IPrintVtbl* lpVtbl; }; @@ -1109,23 +987,6 @@ static FORCEINLINE HRESULT IPrint_Print(IPrint* This,DWORD grfFlags,DVTARGETDEVI #endif -HRESULT STDMETHODCALLTYPE IPrint_SetInitialPageNum_Proxy( - IPrint* This, - LONG nFirstPage); -void __RPC_STUB IPrint_SetInitialPageNum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPrint_GetPageInfo_Proxy( - IPrint* This, - LONG *pnFirstPage, - LONG *pcPages); -void __RPC_STUB IPrint_GetPageInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT __stdcall IPrint_RemotePrint_Proxy( IPrint* This, DWORD grfFlags, @@ -1363,26 +1224,26 @@ typedef struct IOleCommandTargetVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleCommandTarget* This, + IOleCommandTarget *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleCommandTarget* This); + IOleCommandTarget *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleCommandTarget* This); + IOleCommandTarget *This); /*** IOleCommandTarget methods ***/ HRESULT (STDMETHODCALLTYPE *QueryStatus)( - IOleCommandTarget* This, + IOleCommandTarget *This, const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText); HRESULT (STDMETHODCALLTYPE *Exec)( - IOleCommandTarget* This, + IOleCommandTarget *This, const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, @@ -1391,6 +1252,7 @@ typedef struct IOleCommandTargetVtbl { END_INTERFACE } IOleCommandTargetVtbl; + interface IOleCommandTarget { CONST_VTBL IOleCommandTargetVtbl* lpVtbl; }; @@ -1427,29 +1289,6 @@ static FORCEINLINE HRESULT IOleCommandTarget_Exec(IOleCommandTarget* This,const #endif -HRESULT STDMETHODCALLTYPE IOleCommandTarget_QueryStatus_Proxy( - IOleCommandTarget* This, - const GUID *pguidCmdGroup, - ULONG cCmds, - OLECMD prgCmds[], - OLECMDTEXT *pCmdText); -void __RPC_STUB IOleCommandTarget_QueryStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleCommandTarget_Exec_Proxy( - IOleCommandTarget* This, - const GUID *pguidCmdGroup, - DWORD nCmdID, - DWORD nCmdexecopt, - VARIANT *pvaIn, - VARIANT *pvaOut); -void __RPC_STUB IOleCommandTarget_Exec_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleCommandTarget_INTERFACE_DEFINED__ */ @@ -1629,23 +1468,24 @@ typedef struct IZoomEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IZoomEvents* This, + IZoomEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IZoomEvents* This); + IZoomEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - IZoomEvents* This); + IZoomEvents *This); /*** IZoomEvents methods ***/ HRESULT (STDMETHODCALLTYPE *OnZoomPercentChanged)( - IZoomEvents* This, + IZoomEvents *This, ULONG ulZoomPercent); END_INTERFACE } IZoomEventsVtbl; + interface IZoomEvents { CONST_VTBL IZoomEventsVtbl* lpVtbl; }; @@ -1678,14 +1518,6 @@ static FORCEINLINE HRESULT IZoomEvents_OnZoomPercentChanged(IZoomEvents* This,UL #endif -HRESULT STDMETHODCALLTYPE IZoomEvents_OnZoomPercentChanged_Proxy( - IZoomEvents* This, - ULONG ulZoomPercent); -void __RPC_STUB IZoomEvents_OnZoomPercentChanged_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IZoomEvents_INTERFACE_DEFINED__ */ @@ -1714,23 +1546,24 @@ typedef struct IProtectFocusVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IProtectFocus* This, + IProtectFocus *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IProtectFocus* This); + IProtectFocus *This); ULONG (STDMETHODCALLTYPE *Release)( - IProtectFocus* This); + IProtectFocus *This); /*** IProtectFocus methods ***/ HRESULT (STDMETHODCALLTYPE *AllowFocusChange)( - IProtectFocus* This, + IProtectFocus *This, WINBOOL *pfAllow); END_INTERFACE } IProtectFocusVtbl; + interface IProtectFocus { CONST_VTBL IProtectFocusVtbl* lpVtbl; }; @@ -1763,14 +1596,6 @@ static FORCEINLINE HRESULT IProtectFocus_AllowFocusChange(IProtectFocus* This,WI #endif -HRESULT STDMETHODCALLTYPE IProtectFocus_AllowFocusChange_Proxy( - IProtectFocus* This, - WINBOOL *pfAllow); -void __RPC_STUB IProtectFocus_AllowFocusChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IProtectFocus_INTERFACE_DEFINED__ */ @@ -1813,35 +1638,36 @@ typedef struct IProtectedModeMenuServicesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IProtectedModeMenuServices* This, + IProtectedModeMenuServices *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IProtectedModeMenuServices* This); + IProtectedModeMenuServices *This); ULONG (STDMETHODCALLTYPE *Release)( - IProtectedModeMenuServices* This); + IProtectedModeMenuServices *This); /*** IProtectedModeMenuServices methods ***/ HRESULT (STDMETHODCALLTYPE *CreateMenu)( - IProtectedModeMenuServices* This, + IProtectedModeMenuServices *This, HMENU *phMenu); HRESULT (STDMETHODCALLTYPE *LoadMenu)( - IProtectedModeMenuServices* This, + IProtectedModeMenuServices *This, LPCWSTR pszModuleName, LPCWSTR pszMenuName, HMENU *phMenu); HRESULT (STDMETHODCALLTYPE *LoadMenuID)( - IProtectedModeMenuServices* This, + IProtectedModeMenuServices *This, LPCWSTR pszModuleName, WORD wResourceID, HMENU *phMenu); END_INTERFACE } IProtectedModeMenuServicesVtbl; + interface IProtectedModeMenuServices { CONST_VTBL IProtectedModeMenuServicesVtbl* lpVtbl; }; @@ -1882,34 +1708,6 @@ static FORCEINLINE HRESULT IProtectedModeMenuServices_LoadMenuID(IProtectedModeM #endif -HRESULT STDMETHODCALLTYPE IProtectedModeMenuServices_CreateMenu_Proxy( - IProtectedModeMenuServices* This, - HMENU *phMenu); -void __RPC_STUB IProtectedModeMenuServices_CreateMenu_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IProtectedModeMenuServices_LoadMenu_Proxy( - IProtectedModeMenuServices* This, - LPCWSTR pszModuleName, - LPCWSTR pszMenuName, - HMENU *phMenu); -void __RPC_STUB IProtectedModeMenuServices_LoadMenu_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IProtectedModeMenuServices_LoadMenuID_Proxy( - IProtectedModeMenuServices* This, - LPCWSTR pszModuleName, - WORD wResourceID, - HMENU *phMenu); -void __RPC_STUB IProtectedModeMenuServices_LoadMenuID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IProtectedModeMenuServices_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/documenttarget.h b/lib/libc/include/any-windows-any/documenttarget.h index afae3591a2..e651f4145b 100644 --- a/lib/libc/include/any-windows-any/documenttarget.h +++ b/lib/libc/include/any-windows-any/documenttarget.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/documenttarget.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/documenttarget.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,16 +21,25 @@ #ifndef __IPrintDocumentPackageTarget_FWD_DEFINED__ #define __IPrintDocumentPackageTarget_FWD_DEFINED__ typedef interface IPrintDocumentPackageTarget IPrintDocumentPackageTarget; +#ifdef __cplusplus +interface IPrintDocumentPackageTarget; +#endif /* __cplusplus */ #endif #ifndef __IPrintDocumentPackageStatusEvent_FWD_DEFINED__ #define __IPrintDocumentPackageStatusEvent_FWD_DEFINED__ typedef interface IPrintDocumentPackageStatusEvent IPrintDocumentPackageStatusEvent; +#ifdef __cplusplus +interface IPrintDocumentPackageStatusEvent; +#endif /* __cplusplus */ #endif #ifndef __IPrintDocumentPackageTargetFactory_FWD_DEFINED__ #define __IPrintDocumentPackageTargetFactory_FWD_DEFINED__ typedef interface IPrintDocumentPackageTargetFactory IPrintDocumentPackageTargetFactory; +#ifdef __cplusplus +interface IPrintDocumentPackageTargetFactory; +#endif /* __cplusplus */ #endif #ifndef __PrintDocumentPackageTarget_FWD_DEFINED__ @@ -104,33 +114,34 @@ typedef struct IPrintDocumentPackageTargetVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPrintDocumentPackageTarget* This, + IPrintDocumentPackageTarget *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPrintDocumentPackageTarget* This); + IPrintDocumentPackageTarget *This); ULONG (STDMETHODCALLTYPE *Release)( - IPrintDocumentPackageTarget* This); + IPrintDocumentPackageTarget *This); /*** IPrintDocumentPackageTarget methods ***/ HRESULT (STDMETHODCALLTYPE *GetPackageTargetTypes)( - IPrintDocumentPackageTarget* This, + IPrintDocumentPackageTarget *This, UINT32 *targetCount, GUID **targetTypes); HRESULT (STDMETHODCALLTYPE *GetPackageTarget)( - IPrintDocumentPackageTarget* This, + IPrintDocumentPackageTarget *This, REFGUID guidTargetType, REFIID riid, void **ppvTarget); HRESULT (STDMETHODCALLTYPE *Cancel)( - IPrintDocumentPackageTarget* This); + IPrintDocumentPackageTarget *This); END_INTERFACE } IPrintDocumentPackageTargetVtbl; + interface IPrintDocumentPackageTarget { CONST_VTBL IPrintDocumentPackageTargetVtbl* lpVtbl; }; @@ -171,32 +182,6 @@ static FORCEINLINE HRESULT IPrintDocumentPackageTarget_Cancel(IPrintDocumentPack #endif -HRESULT STDMETHODCALLTYPE IPrintDocumentPackageTarget_GetPackageTargetTypes_Proxy( - IPrintDocumentPackageTarget* This, - UINT32 *targetCount, - GUID **targetTypes); -void __RPC_STUB IPrintDocumentPackageTarget_GetPackageTargetTypes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPrintDocumentPackageTarget_GetPackageTarget_Proxy( - IPrintDocumentPackageTarget* This, - REFGUID guidTargetType, - REFIID riid, - void **ppvTarget); -void __RPC_STUB IPrintDocumentPackageTarget_GetPackageTarget_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPrintDocumentPackageTarget_Cancel_Proxy( - IPrintDocumentPackageTarget* This); -void __RPC_STUB IPrintDocumentPackageTarget_Cancel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPrintDocumentPackageTarget_INTERFACE_DEFINED__ */ @@ -241,29 +226,29 @@ typedef struct IPrintDocumentPackageStatusEventVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPrintDocumentPackageStatusEvent* This, + IPrintDocumentPackageStatusEvent *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPrintDocumentPackageStatusEvent* This); + IPrintDocumentPackageStatusEvent *This); ULONG (STDMETHODCALLTYPE *Release)( - IPrintDocumentPackageStatusEvent* This); + IPrintDocumentPackageStatusEvent *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IPrintDocumentPackageStatusEvent* This, + IPrintDocumentPackageStatusEvent *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IPrintDocumentPackageStatusEvent* This, + IPrintDocumentPackageStatusEvent *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IPrintDocumentPackageStatusEvent* This, + IPrintDocumentPackageStatusEvent *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -271,7 +256,7 @@ typedef struct IPrintDocumentPackageStatusEventVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IPrintDocumentPackageStatusEvent* This, + IPrintDocumentPackageStatusEvent *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -283,11 +268,12 @@ typedef struct IPrintDocumentPackageStatusEventVtbl { /*** IPrintDocumentPackageStatusEvent methods ***/ HRESULT (STDMETHODCALLTYPE *PackageStatusUpdated)( - IPrintDocumentPackageStatusEvent* This, + IPrintDocumentPackageStatusEvent *This, PrintDocumentPackageStatus *packageStatus); END_INTERFACE } IPrintDocumentPackageStatusEventVtbl; + interface IPrintDocumentPackageStatusEvent { CONST_VTBL IPrintDocumentPackageStatusEventVtbl* lpVtbl; }; @@ -338,14 +324,6 @@ static FORCEINLINE HRESULT IPrintDocumentPackageStatusEvent_PackageStatusUpdated #endif -HRESULT STDMETHODCALLTYPE IPrintDocumentPackageStatusEvent_PackageStatusUpdated_Proxy( - IPrintDocumentPackageStatusEvent* This, - PrintDocumentPackageStatus *packageStatus); -void __RPC_STUB IPrintDocumentPackageStatusEvent_PackageStatusUpdated_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPrintDocumentPackageStatusEvent_INTERFACE_DEFINED__ */ @@ -377,19 +355,19 @@ typedef struct IPrintDocumentPackageTargetFactoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPrintDocumentPackageTargetFactory* This, + IPrintDocumentPackageTargetFactory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPrintDocumentPackageTargetFactory* This); + IPrintDocumentPackageTargetFactory *This); ULONG (STDMETHODCALLTYPE *Release)( - IPrintDocumentPackageTargetFactory* This); + IPrintDocumentPackageTargetFactory *This); /*** IPrintDocumentPackageTargetFactory methods ***/ HRESULT (STDMETHODCALLTYPE *CreateDocumentPackageTargetForPrintJob)( - IPrintDocumentPackageTargetFactory* This, + IPrintDocumentPackageTargetFactory *This, LPCWSTR printerName, LPCWSTR jobName, IStream *jobOutputStream, @@ -398,6 +376,7 @@ typedef struct IPrintDocumentPackageTargetFactoryVtbl { END_INTERFACE } IPrintDocumentPackageTargetFactoryVtbl; + interface IPrintDocumentPackageTargetFactory { CONST_VTBL IPrintDocumentPackageTargetFactoryVtbl* lpVtbl; }; @@ -430,18 +409,6 @@ static FORCEINLINE HRESULT IPrintDocumentPackageTargetFactory_CreateDocumentPack #endif -HRESULT STDMETHODCALLTYPE IPrintDocumentPackageTargetFactory_CreateDocumentPackageTargetForPrintJob_Proxy( - IPrintDocumentPackageTargetFactory* This, - LPCWSTR printerName, - LPCWSTR jobName, - IStream *jobOutputStream, - IStream *jobPrintTicketStream, - IPrintDocumentPackageTarget **docPackageTarget); -void __RPC_STUB IPrintDocumentPackageTargetFactory_CreateDocumentPackageTargetForPrintJob_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPrintDocumentPackageTargetFactory_INTERFACE_DEFINED__ */ @@ -453,6 +420,9 @@ DEFINE_GUID(LIBID_PrintDocumentTargetLib, 0x410d76f7, 0x8bb5, 0x4a7d, 0x9d,0x37, #ifndef __IPrintDocumentPackageTarget_FWD_DEFINED__ #define __IPrintDocumentPackageTarget_FWD_DEFINED__ typedef interface IPrintDocumentPackageTarget IPrintDocumentPackageTarget; +#ifdef __cplusplus +interface IPrintDocumentPackageTarget; +#endif /* __cplusplus */ #endif #endif @@ -460,11 +430,17 @@ typedef interface IPrintDocumentPackageTarget IPrintDocumentPackageTarget; #ifndef __IPrintDocumentPackageStatusEvent_FWD_DEFINED__ #define __IPrintDocumentPackageStatusEvent_FWD_DEFINED__ typedef interface IPrintDocumentPackageStatusEvent IPrintDocumentPackageStatusEvent; +#ifdef __cplusplus +interface IPrintDocumentPackageStatusEvent; +#endif /* __cplusplus */ #endif #ifndef __IPrintDocumentPackageTargetFactory_FWD_DEFINED__ #define __IPrintDocumentPackageTargetFactory_FWD_DEFINED__ typedef interface IPrintDocumentPackageTargetFactory IPrintDocumentPackageTargetFactory; +#ifdef __cplusplus +interface IPrintDocumentPackageTargetFactory; +#endif /* __cplusplus */ #endif /***************************************************************************** diff --git a/lib/libc/include/any-windows-any/downloadmgr.h b/lib/libc/include/any-windows-any/downloadmgr.h index bbcadb6db7..dd226e3a78 100644 --- a/lib/libc/include/any-windows-any/downloadmgr.h +++ b/lib/libc/include/any-windows-any/downloadmgr.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/downloadmgr.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from include/downloadmgr.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/dpaddr.h b/lib/libc/include/any-windows-any/dpaddr.h index c8bdbe9267..9201f29610 100644 --- a/lib/libc/include/any-windows-any/dpaddr.h +++ b/lib/libc/include/any-windows-any/dpaddr.h @@ -88,43 +88,7 @@ typedef struct sockaddr SOCKADDR; #define DPNA_VALUE_SERIALPROVIDER_A "SERIAL" /* And now the same thing but as Unicode strings */ -#if defined(__GNUC__) - -# define DPNA_HEADER (const WCHAR []){ 'x','-','d','i','r','e','c','t','p','l','a','y',':','/',0 } -# define DPNA_KEY_APPLICATION_INSTANCE (const WCHAR []){ 'a','p','p','l','i','c','a','t','i','o','n','i','n','s','t','a','n','c','e',0 } -# define DPNA_KEY_BAUD (const WCHAR []){ 'b','a','u','d',0 } -# define DPNA_KEY_DEVICE (const WCHAR []){ 'd','e','v','i','c','e',0 } -# define DPNA_KEY_FLOWCONTROL (const WCHAR []){ 'f','l','o','w','c','o','n','t','r','o','l',0 } -# define DPNA_KEY_HOSTNAME (const WCHAR []){ 'h','o','s','t','n','a','m','e',0 } -# define DPNA_KEY_NAMEINFO (const WCHAR []){ 'n','a','m','e','i','n','f','o',0 } -# define DPNA_KEY_PARITY (const WCHAR []){ 'p','a','r','i','t','y',0 } -# define DPNA_KEY_PHONENUMBER (const WCHAR []){ 'p','h','o','n','e','n','u','m','b','e','r',0 } -# define DPNA_KEY_PORT (const WCHAR []){ 'p','o','r','t',0 } -# define DPNA_KEY_PROCESSOR (const WCHAR []){ 'p','r','o','c','e','s','s','o','r',0 } -# define DPNA_KEY_PROGRAM (const WCHAR []){ 'p','r','o','g','r','a','m',0 } -# define DPNA_KEY_PROVIDER (const WCHAR []){ 'p','r','o','v','i','d','e','r',0 } -# define DPNA_KEY_SCOPE (const WCHAR []){ 's','c','o','p','e',0 } -# define DPNA_KEY_STOPBITS (const WCHAR []){ 's','t','o','p','b','i','t','s',0 } -# define DPNA_KEY_TRAVERSALMODE (const WCHAR []){ 't','r','a','v','e','r','s','a','l','m','o','d','e',0 } -# define DPNA_STOP_BITS_ONE (const WCHAR []){ '1',0 } -# define DPNA_STOP_BITS_ONE_FIVE (const WCHAR []){ '1','.','5',0 } -# define DPNA_STOP_BITS_TWO (const WCHAR []){ '2',0 } -# define DPNA_PARITY_NONE (const WCHAR []){ 'N','O','N','E',0 } -# define DPNA_PARITY_EVEN (const WCHAR []){ 'E','V','E','N',0 } -# define DPNA_PARITY_ODD (const WCHAR []){ 'O','D','D',0 } -# define DPNA_PARITY_MARK (const WCHAR []){ 'M','A','R','K',0 } -# define DPNA_PARITY_SPACE (const WCHAR []){ 'S','P','A','C','E',0 } -# define DPNA_FLOW_CONTROL_NONE (const WCHAR []){ 'N','O','N','E',0 } -# define DPNA_FLOW_CONTROL_XONXOFF (const WCHAR []){ 'X','O','N','X','O','F','F',0 } -# define DPNA_FLOW_CONTROL_RTS (const WCHAR []){ 'R','T','S',0 } -# define DPNA_FLOW_CONTROL_DTR (const WCHAR []){ 'D','T','R',0 } -# define DPNA_FLOW_CONTROL_RTSDTR (const WCHAR []){ 'R','T','S','D','T','R',0 } -# define DPNA_VALUE_TCPIPPROVIDER (const WCHAR []){ 'I','P',0 } -# define DPNA_VALUE_IPXPROVIDER (const WCHAR []){ 'I','P','X',0 } -# define DPNA_VALUE_MODEMPROVIDER (const WCHAR []){ 'M','O','D','E','M',0 } -# define DPNA_VALUE_SERIALPROVIDER (const WCHAR []){ 'S','E','R','I','A','L',0 } - -#elif defined(_MSC_VER) +#if defined(_MSC_VER) || defined(__MINGW32__) # define DPNA_HEADER L"x-directplay:/" # define DPNA_KEY_APPLICATION_INSTANCE L"applicationinstance" diff --git a/lib/libc/include/any-windows-any/driverspecs.h b/lib/libc/include/any-windows-any/driverspecs.h index ad39a93f56..8fbfeb00e6 100644 --- a/lib/libc/include/any-windows-any/driverspecs.h +++ b/lib/libc/include/any-windows-any/driverspecs.h @@ -6,12 +6,31 @@ * allow drivers using them to compile with our header set. */ -/* - * Stubs - */ +#ifndef DRIVERSPECS_H +#define DRIVERSPECS_H + +#include + #define __drv_dispatchType(x) #define __drv_dispatchType_other #define __drv_aliasesMem #define __drv_allocatesMem(kind) #define __drv_freesMem(kind) + +#define __drv_arg(x,y) +#define __drv_at(x,y) +#define __drv_deref(x) +#define __drv_in(x) +#define __drv_in_deref(x) +#define __drv_out(x) +#define __drv_out_deref(x) +#define __drv_when(x,y) + +#define __internal_kernel_driver +#define __kernel_code +#define __kernel_driver +#define __user_code +#define __user_driver + +#endif diff --git a/lib/libc/include/any-windows-any/drmexternals.h b/lib/libc/include/any-windows-any/drmexternals.h index 52b74c69c5..1999459884 100644 --- a/lib/libc/include/any-windows-any/drmexternals.h +++ b/lib/libc/include/any-windows-any/drmexternals.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/drmexternals.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from include/drmexternals.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -25,6 +26,18 @@ extern "C" { #endif +typedef enum WMT_RIGHTS { + WMT_RIGHT_PLAYBACK = 0x1, + WMT_RIGHT_COPY_TO_NON_SDMI_DEVICE = 0x2, + WMT_RIGHT_COPY_TO_CD = 0x8, + WMT_RIGHT_COPY_TO_SDMI_DEVICE = 0x10, + WMT_RIGHT_ONE_TIME = 0x20, + WMT_RIGHT_SAVE_STREAM_PROTECTED = 0x40, + WMT_RIGHT_COPY = 0x80, + WMT_RIGHT_COLLABORATIVE_PLAY = 0x100, + WMT_RIGHT_SDMI_TRIGGER = 0x10000, + WMT_RIGHT_SDMI_NOMORECOPIES = 0x20000 +} WMT_RIGHTS; /* Begin additional prototypes for all interfaces */ diff --git a/lib/libc/include/any-windows-any/dsound.h b/lib/libc/include/any-windows-any/dsound.h index f4835fd476..45ff107216 100644 --- a/lib/libc/include/any-windows-any/dsound.h +++ b/lib/libc/include/any-windows-any/dsound.h @@ -132,6 +132,46 @@ DEFINE_GUID(GUID_DSCFX_CLASS_NS, 0xE07F903F,0x62FD,0x4E60,0x8C,0xDD,0 DEFINE_GUID(GUID_DSCFX_MS_NS, 0x11C5C73B,0x66E9,0x4BA1,0xA0,0xBA,0xE8,0x14,0xC6,0xEE,0xD9,0x2D); DEFINE_GUID(GUID_DSCFX_SYSTEM_NS, 0x5AB0882E,0x7274,0x4516,0x87,0x7D,0x4E,0xEE,0x99,0xBA,0x4F,0xD0); +DEFINE_GUID(IID_IDirectSoundFXGargle, 0xd616f352,0xd622,0x11ce,0xaa,0xc5,0x00,0x20,0xaf,0x0b,0x99,0xa3); +#define IDirectSoundFXGargle8 IDirectSoundFXGargle +typedef struct IDirectSoundFXGargle8 *LPDIRECTSOUNDFXGARGLE8; +#define IID_IDirectSoundFXGargle8 IID_IDirectSoundFXGargle + +DEFINE_GUID(IID_IDirectSoundFXChorus, 0x880842e3,0x145f,0x43e6,0xa9,0x34,0xa7,0x18,0x06,0xe5,0x05,0x47); +#define IDirectSoundFXChorus8 IDirectSoundFXChorus +typedef struct IDirectSoundFXChorus8 *LPDIRECTSOUNDFXCHORUS8; +#define IID_IDirectSoundFXChorus8 IID_IDirectSoundFXChorus + +DEFINE_GUID(IID_IDirectSoundFXFlanger, 0x903e9878,0x2c92,0x4072,0x9b,0x2c,0xea,0x68,0xf5,0x39,0x67,0x83); +#define IDirectSoundFXFlanger8 IDirectSoundFXFlanger +typedef struct IDirectSoundFXFlanger8 *LPDIRECTSOUNDFXFLANGER8; +#define IID_IDirectSoundFXFlanger8 IID_IDirectSoundFXFlanger + +DEFINE_GUID(IID_IDirectSoundFXEcho, 0x8bd28edf,0x50db,0x4e92,0xa2,0xbd,0x44,0x54,0x88, 0xd1,0xed,0x42); +#define IDirectSoundFXEcho8 IDirectSoundFXEcho +typedef struct IDirectSoundFXEcho8 *LPDIRECTSOUNDFXECHO8; +#define IID_IDirectSoundFXEcho8 IID_IDirectSoundFXEcho + +DEFINE_GUID(IID_IDirectSoundFXDistortion, 0x8ecf4326,0x455f,0x4d8b,0xbd,0xa9,0x8d,0x5d,0x3e,0x9e,0x3e,0x0b); +#define IDirectSoundFXDistortion8 IDirectSoundFXDistortion +typedef struct IDirectSoundFXDistortion8 *LPDIRECTSOUNDFXDISTORTION8; +#define IID_IDirectSoundFXDistortion8 IID_IDirectSoundFXDistortion + +DEFINE_GUID(IID_IDirectSoundFXCompressor, 0x4bbd1154,0x62f6,0x4e2c,0xa1,0x5c,0xd3,0xb6,0xc4,0x17,0xf7,0xa0); +#define IDirectSoundFXCompressor8 IDirectSoundFXCompressor +typedef struct IDirectSoundFXCompressor8 *LPDIRECTSOUNDFXCOMPRESSOR8; +#define IID_IDirectSoundFXCompressor8 IID_IDirectSoundFXCompressor + +DEFINE_GUID(IID_IDirectSoundFXParamEq, 0xc03ca9fe,0xfe90,0x4204,0x80,0x78,0x82,0x33,0x4c,0xd1,0x77,0xda); +#define IDirectSoundFXParamEq8 IDirectSoundFXParamEq +typedef struct IDirectSoundFXParamEq8 *LPDIRECTSOUNDFXPARAMEQ8; +#define IID_IDirectSoundFXParamEq8 IID_IDirectSoundFXParamEq + +DEFINE_GUID(IID_IDirectSoundFXWavesReverb, 0x46858c3a,0x0dc6,0x45e3,0xb7,0x60,0xd4,0xee,0xf1,0x6c,0xb3,0x25); +#define IDirectSoundFXWavesReverb8 IDirectSoundFXWavesReverb +typedef struct IDirectSoundFXWavesReverb8 *LPDIRECTSOUNDFXWAVESREVERB8; +#define IID_IDirectSoundFXWavesReverb8 IID_IDirectSoundFXWavesReverb + #define _FACDS 0x878 #define MAKE_DSHRESULT(code) MAKE_HRESULT(1,_FACDS,code) @@ -431,6 +471,46 @@ typedef struct _DSFXI3DL2Reverb FLOAT flHFReference; } DSFXI3DL2Reverb, *LPDSFXI3DL2Reverb; +#define DSFX_I3DL2REVERB_DECAYTIME_DEFAULT 1.49f +#define DSFX_I3DL2REVERB_DECAYTIME_MIN 0.1f +#define DSFX_I3DL2REVERB_DECAYTIME_MAX 20.0f +#define DSFX_I3DL2REVERB_DECAYHFRATIO_DEFAULT 0.83f +#define DSFX_I3DL2REVERB_DECAYHFRATIO_MIN 0.1f +#define DSFX_I3DL2REVERB_DECAYHFRATIO_MAX 2.0f +#define DSFX_I3DL2REVERB_DENSITY_DEFAULT 100.0f +#define DSFX_I3DL2REVERB_DENSITY_MIN 0.0f +#define DSFX_I3DL2REVERB_DENSITY_MAX 100.0f +#define DSFX_I3DL2REVERB_DIFFUSION_DEFAULT 100.0f +#define DSFX_I3DL2REVERB_DIFFUSION_MIN 0.0f +#define DSFX_I3DL2REVERB_DIFFUSION_MAX 100.0f +#define DSFX_I3DL2REVERB_HFREFERENCE_DEFAULT 5000.0f +#define DSFX_I3DL2REVERB_HFREFERENCE_MIN 20.0f +#define DSFX_I3DL2REVERB_HFREFERENCE_MAX 20000.0f +#define DSFX_I3DL2REVERB_QUALITY_DEFAULT 2 +#define DSFX_I3DL2REVERB_QUALITY_MIN 0 +#define DSFX_I3DL2REVERB_QUALITY_MAX 3 +#define DSFX_I3DL2REVERB_REFLECTIONS_DEFAULT (-2602) +#define DSFX_I3DL2REVERB_REFLECTIONS_MIN (-10000) +#define DSFX_I3DL2REVERB_REFLECTIONS_MAX 1000 +#define DSFX_I3DL2REVERB_REFLECTIONSDELAY_DEFAULT 0.007f +#define DSFX_I3DL2REVERB_REFLECTIONSDELAY_MIN 0.0f +#define DSFX_I3DL2REVERB_REFLECTIONSDELAY_MAX 0.3f +#define DSFX_I3DL2REVERB_REVERB_MIN (-10000) +#define DSFX_I3DL2REVERB_REVERB_MAX 2000 +#define DSFX_I3DL2REVERB_REVERB_DEFAULT 200 +#define DSFX_I3DL2REVERB_REVERBDELAY_MIN 0.0f +#define DSFX_I3DL2REVERB_REVERBDELAY_MAX 0.1f +#define DSFX_I3DL2REVERB_REVERBDELAY_DEFAULT 0.011f +#define DSFX_I3DL2REVERB_ROOM_DEFAULT (-1000) +#define DSFX_I3DL2REVERB_ROOM_MIN (-10000) +#define DSFX_I3DL2REVERB_ROOM_MAX 0 +#define DSFX_I3DL2REVERB_ROOMHF_MIN (-10000) +#define DSFX_I3DL2REVERB_ROOMHF_MAX 0 +#define DSFX_I3DL2REVERB_ROOMHF_DEFAULT (-100) +#define DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_MIN 0.0f +#define DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_MAX 10.0f +#define DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_DEFAULT 0.0f + typedef const DSFXI3DL2Reverb *LPCDSFXI3DL2Reverb; #define DSCCAPS_EMULDRIVER DSCAPS_EMULDRIVER @@ -1289,6 +1369,417 @@ DECLARE_INTERFACE_(IDirectSoundFXI3DL2Reverb,IUnknown) #define IDirectSoundFXI3DL2Reverb_GetPreset(p,a) (p)->GetPreset(a) #endif +typedef struct _DSFXGargle +{ + DWORD dwRateHz; + DWORD dwWaveShape; +} DSFXGargle, *LPDSFXGargle; + +typedef const DSFXGargle *LPCDSFXGargle; + +#define DSFXGARGLE_RATEHZ_MIN 1 +#define DSFXGARGLE_RATEHZ_MAX 1000 +#define DSFXGARGLE_WAVE_SQUARE 1 +#define DSFXGARGLE_WAVE_TRIANGLE 0 + +#define INTERFACE IDirectSoundFXGargle +DECLARE_INTERFACE_(IDirectSoundFXGargle,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID, void**) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + + /*** IDirectSoundFXGargle methods ***/ + STDMETHOD(SetAllParameters)(THIS_ const DSFXGargle *gargle) PURE; + STDMETHOD(GetAllParameters)(THIS_ DSFXGargle *gargle) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +#define IDirectSoundFXGargle_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirectSoundFXGargle_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirectSoundFXGargle_Release(p) (p)->lpVtbl->Release(p) +#define IDirectSoundFXGargle_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a) +#define IDirectSoundFXGargle_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a) +#else +#define IDirectSoundFXGargle_QueryInterface(p,a,b) (p)->QueryInterface(p,a,b) +#define IDirectSoundFXGargle_AddRef(p) (p)->AddRef(p) +#define IDirectSoundFXGargle_Release(p) (p)->Release(p) +#define IDirectSoundFXGargle_SetAllParameters(p,a) (p)->SetAllParameters(a) +#define IDirectSoundFXGargle_GetAllParameters(p,a) (p)->GetAllParameters(a) +#endif + +typedef struct _DSFXChorus +{ + FLOAT fWetDryMix; + FLOAT fDepth; + FLOAT fFeedback; + FLOAT fFrequency; + LONG lWaveform; + FLOAT fDelay; + LONG lPhase; +} DSFXChorus, *LPDSFXChorus; + +typedef const DSFXChorus *LPCDSFXChorus; + +#define DSFXCHORUS_DEPTH_MIN 0.0f +#define DSFXCHORUS_DEPTH_MAX 100.0f +#define DSFXCHORUS_DELAY_MIN 0.0f +#define DSFXCHORUS_DELAY_MAX 20.0f +#define DSFXCHORUS_FEEDBACK_MIN -99.0f +#define DSFXCHORUS_FEEDBACK_MAX 99.0f +#define DSFXCHORUS_FREQUENCY_MIN 0.0f +#define DSFXCHORUS_FREQUENCY_MAX 10.0f +#define DSFXCHORUS_PHASE_MIN 0 +#define DSFXCHORUS_PHASE_MAX 4 +#define DSFXCHORUS_PHASE_NEG_180 0 +#define DSFXCHORUS_PHASE_NEG_90 1 +#define DSFXCHORUS_PHASE_ZERO 2 +#define DSFXCHORUS_PHASE_90 3 +#define DSFXCHORUS_PHASE_180 4 +#define DSFXCHORUS_WAVE_TRIANGLE 0 +#define DSFXCHORUS_WAVE_SIN 1 +#define DSFXCHORUS_WETDRYMIX_MIN 0.0f +#define DSFXCHORUS_WETDRYMIX_MAX 100.0f + +#define INTERFACE IDirectSoundFXChorus +DECLARE_INTERFACE_(IDirectSoundFXChorus,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID, void**) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + + /*** IDirectSoundFXChorus methods ***/ + STDMETHOD(SetAllParameters)(THIS_ const DSFXChorus *chorus) PURE; + STDMETHOD(GetAllParameters)(THIS_ DSFXChorus *chorus) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +#define IDirectSoundFXChorus_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirectSoundFXChorus_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirectSoundFXChorus_Release(p) (p)->lpVtbl->Release(p) +#define IDirectSoundFXChorus_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a) +#define IDirectSoundFXChorus_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a) +#else +#define IDirectSoundFXChorus_QueryInterface(p,a,b) (p)->QueryInterface(p,a,b) +#define IDirectSoundFXChorus_AddRef(p) (p)->AddRef(p) +#define IDirectSoundFXChorus_Release(p) (p)->Release(p) +#define IDirectSoundFXChorus_SetAllParameters(p,a) (p)->SetAllParameters(a) +#define IDirectSoundFXChorus_GetAllParameters(p,a) (p)->GetAllParameters(a) +#endif + +typedef struct _DSFXFlanger +{ + FLOAT fWetDryMix; + FLOAT fDepth; + FLOAT fFeedback; + FLOAT fFrequency; + LONG lWaveform; + FLOAT fDelay; + LONG lPhase; +} DSFXFlanger, *LPDSFXFlanger; + +typedef const DSFXFlanger *LPCDSFXFlanger; + +#define DSFXFLANGER_DELAY_MIN 0.0f +#define DSFXFLANGER_DELAY_MAX 4.0f +#define DSFXFLANGER_DEPTH_MIN 0.0f +#define DSFXFLANGER_DEPTH_MAX 100.0f +#define DSFXFLANGER_FREQUENCY_MIN 0.0f +#define DSFXFLANGER_FREQUENCY_MAX 10.0f +#define DSFXFLANGER_FEEDBACK_MIN -99.0f +#define DSFXFLANGER_FEEDBACK_MAX 99.0f +#define DSFXFLANGER_PHASE_MIN 0 +#define DSFXFLANGER_PHASE_MAX 4 +#define DSFXFLANGER_PHASE_NEG_180 0 +#define DSFXFLANGER_PHASE_NEG_90 1 +#define DSFXFLANGER_PHASE_ZERO 2 +#define DSFXFLANGER_PHASE_90 3 +#define DSFXFLANGER_PHASE_180 4 +#define DSFXFLANGER_WAVE_SIN 1 +#define DSFXFLANGER_WAVE_TRIANGLE 0 +#define DSFXFLANGER_WETDRYMIX_MIN 0.0f +#define DSFXFLANGER_WETDRYMIX_MAX 100.0f + +#define INTERFACE IDirectSoundFXFlanger +DECLARE_INTERFACE_(IDirectSoundFXFlanger,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID, void**) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + + /*** IDirectSoundFXFlanger methods ***/ + STDMETHOD(SetAllParameters)(THIS_ const DSFXFlanger *flanger) PURE; + STDMETHOD(GetAllParameters)(THIS_ DSFXFlanger *flanger) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +#define IDirectSoundFXFlanger_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirectSoundFXFlanger_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirectSoundFXFlanger_Release(p) (p)->lpVtbl->Release(p) +#define IDirectSoundFXFlanger_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a) +#define IDirectSoundFXFlanger_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a) +#else +#define IDirectSoundFXFlanger_QueryInterface(p,a,b) (p)->QueryInterface(p,a,b) +#define IDirectSoundFXFlanger_AddRef(p) (p)->AddRef(p) +#define IDirectSoundFXFlanger_Release(p) (p)->Release(p) +#define IDirectSoundFXFlanger_SetAllParameters(p,a) (p)->SetAllParameters(a) +#define IDirectSoundFXFlanger_GetAllParameters(p,a) (p)->GetAllParameters(a) +#endif + +typedef struct _DSFXEcho +{ + FLOAT fWetDryMix; + FLOAT fFeedback; + FLOAT fLeftDelay; + FLOAT fRightDelay; + LONG lPanDelay; +} DSFXEcho, *LPDSFXEcho; + +typedef const DSFXEcho *LPCDSFXEcho; + +#define DSFXECHO_FEEDBACK_MIN 0.0f +#define DSFXECHO_FEEDBACK_MAX 100.0f +#define DSFXECHO_LEFTDELAY_MIN 1.0f +#define DSFXECHO_LEFTDELAY_MAX 2000.0f +#define DSFXECHO_PANDELAY_MIN 0 +#define DSFXECHO_PANDELAY_MAX 1 +#define DSFXECHO_RIGHTDELAY_MIN 1.0f +#define DSFXECHO_RIGHTDELAY_MAX 2000.0f +#define DSFXECHO_WETDRYMIX_MIN 0.0f +#define DSFXECHO_WETDRYMIX_MAX 100.0f + +#define INTERFACE IDirectSoundFXEcho +DECLARE_INTERFACE_(IDirectSoundFXEcho,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID, void**) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + + /*** IDirectSoundFXEcho methods ***/ + STDMETHOD(SetAllParameters)(THIS_ const DSFXEcho *echo) PURE; + STDMETHOD(GetAllParameters)(THIS_ DSFXEcho *echo) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +#define IDirectSoundFXEcho_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirectSoundFXEcho_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirectSoundFXEcho_Release(p) (p)->lpVtbl->Release(p) +#define IDirectSoundFXEcho_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a) +#define IDirectSoundFXEcho_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a) +#else +#define IDirectSoundFXEcho_QueryInterface(p,a,b) (p)->QueryInterface(p,a,b) +#define IDirectSoundFXEcho_AddRef(p) (p)->AddRef(p) +#define IDirectSoundFXEcho_Release(p) (p)->Release(p) +#define IDirectSoundFXEcho_SetAllParameters(p,a) (p)->SetAllParameters(a) +#define IDirectSoundFXEcho_GetAllParameters(p,a) (p)->GetAllParameters(a) +#endif + +typedef struct _DSFXDistortion +{ + FLOAT fGain; + FLOAT fEdge; + FLOAT fPostEQCenterFrequency; + FLOAT fPostEQBandwidth; + FLOAT fPreLowpassCutoff; +} DSFXDistortion, *LPDSFXDistortion; + +typedef const DSFXDistortion *LPCDSFXDistortion; + +#define DSFXDISTORTION_EDGE_MIN 0.0f +#define DSFXDISTORTION_EDGE_MAX 100.0f +#define DSFXDISTORTION_GAIN_MIN -60.0f +#define DSFXDISTORTION_GAIN_MAX 0.0f +#define DSFXDISTORTION_POSTEQCENTERFREQUENCY_MIN 100.0f +#define DSFXDISTORTION_POSTEQCENTERFREQUENCY_MAX 8000.0f +#define DSFXDISTORTION_POSTEQBANDWIDTH_MIN 100.0f +#define DSFXDISTORTION_POSTEQBANDWIDTH_MAX 8000.0f +#define DSFXDISTORTION_PRELOWPASSCUTOFF_MIN 100.0f +#define DSFXDISTORTION_PRELOWPASSCUTOFF_MAX 8000.0f + +#define INTERFACE IDirectSoundFXDistortion +DECLARE_INTERFACE_(IDirectSoundFXDistortion,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID, void**) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + + /*** IDirectSoundFXDistortion methods ***/ + STDMETHOD(SetAllParameters)(THIS_ const DSFXDistortion *distortion) PURE; + STDMETHOD(GetAllParameters)(THIS_ DSFXDistortion *distortion) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +#define IDirectSoundFXDistortion_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirectSoundFXDistortion_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirectSoundFXDistortion_Release(p) (p)->lpVtbl->Release(p) +#define IDirectSoundFXDistortion_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a) +#define IDirectSoundFXDistortion_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a) +#else +#define IDirectSoundFXDistortion_QueryInterface(p,a,b) (p)->QueryInterface(p,a,b) +#define IDirectSoundFXDistortion_AddRef(p) (p)->AddRef(p) +#define IDirectSoundFXDistortion_Release(p) (p)->Release(p) +#define IDirectSoundFXDistortion_SetAllParameters(p,a) (p)->SetAllParameters(a) +#define IDirectSoundFXDistortion_GetAllParameters(p,a) (p)->GetAllParameters(a) +#endif + +typedef struct _DSFXCompressor +{ + FLOAT fGain; + FLOAT fAttack; + FLOAT fRelease; + FLOAT fThreshold; + FLOAT fRatio; + FLOAT fPredelay; +} DSFXCompressor, *LPDSFXCompressor; + +typedef const DSFXCompressor *LPCDSFXCompressor; + +#define DSFXCOMPRESSOR_ATTACK_MIN 0.01f +#define DSFXCOMPRESSOR_ATTACK_MAX 500.0f +#define DSFXCOMPRESSOR_GAIN_MIN -60.0f +#define DSFXCOMPRESSOR_GAIN_MAX 60.0f +#define DSFXCOMPRESSOR_PREDELAY_MIN 0.0f +#define DSFXCOMPRESSOR_PREDELAY_MAX 4.0f +#define DSFXCOMPRESSOR_RATIO_MIN 1.0f +#define DSFXCOMPRESSOR_RATIO_MAX 100.0f +#define DSFXCOMPRESSOR_RELEASE_MIN 50.0f +#define DSFXCOMPRESSOR_RELEASE_MAX 3000.0f +#define DSFXCOMPRESSOR_THRESHOLD_MIN -60.0f +#define DSFXCOMPRESSOR_THRESHOLD_MAX 0.0f + +#define INTERFACE IDirectSoundFXCompressor +DECLARE_INTERFACE_(IDirectSoundFXCompressor, IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID, void**) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + + /*** IDirectSoundFXCompressor methods ***/ + STDMETHOD(SetAllParameters)(THIS_ const DSFXCompressor *compressor) PURE; + STDMETHOD(GetAllParameters)(THIS_ DSFXCompressor *compressor) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +#define IDirectSoundFXCompressor_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirectSoundFXCompressor_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirectSoundFXCompressor_Release(p) (p)->lpVtbl->Release(p) +#define IDirectSoundFXCompressor_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a) +#define IDirectSoundFXCompressor_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a) +#else +#define IDirectSoundFXCompressor_QueryInterface(p,a,b) (p)->QueryInterface(p,a,b) +#define IDirectSoundFXCompressor_AddRef(p) (p)->AddRef(p) +#define IDirectSoundFXCompressor_Release(p) (p)->Release(p) +#define IDirectSoundFXCompressor_SetAllParameters(p,a) (p)->SetAllParameters(a) +#define IDirectSoundFXCompressor_GetAllParameters(p,a) (p)->GetAllParameters(a) +#endif + +typedef struct _DSFXParamEq +{ + FLOAT fCenter; + FLOAT fBandwidth; + FLOAT fGain; +} DSFXParamEq, *LPDSFXParamEq; + +typedef const DSFXParamEq *LPCDSFXParamEq; + +#define DSFXPARAMEQ_BANDWIDTH_MIN 1.0f +#define DSFXPARAMEQ_BANDWIDTH_MAX 36.0f +#define DSFXPARAMEQ_CENTER_MIN 80.0f +#define DSFXPARAMEQ_CENTER_MAX 16000.0f +#define DSFXPARAMEQ_GAIN_MIN -15.0f +#define DSFXPARAMEQ_GAIN_MAX 15.0f + +#define INTERFACE IDirectSoundFXParamEq +DECLARE_INTERFACE_(IDirectSoundFXParamEq, IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID, void**) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + + /*** IDirectSoundFXParamEq methods ***/ + STDMETHOD(SetAllParameters)(THIS_ const DSFXParamEq *param) PURE; + STDMETHOD(GetAllParameters)(THIS_ DSFXParamEq *param) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +#define IDirectSoundFXParamEq_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirectSoundFXParamEq_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirectSoundFXParamEq_Release(p) (p)->lpVtbl->Release(p) +#define IDirectSoundFXParamEq_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a) +#define IDirectSoundFXParamEq_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a) +#else +#define IDirectSoundFXParamEq_QueryInterface(p,a,b) (p)->QueryInterface(p,a,b) +#define IDirectSoundFXParamEq_AddRef(p) (p)->AddRef(p) +#define IDirectSoundFXParamEq_Release(p) (p)->Release(p) +#define IDirectSoundFXParamEq_SetAllParameters(p,a) (p)->SetAllParameters(a) +#define IDirectSoundFXParamEq_GetAllParameters(p,a) (p)->GetAllParameters(a) +#endif + +typedef struct _DSFXWavesReverb +{ + FLOAT fInGain; + FLOAT fReverbMix; + FLOAT fReverbTime; + FLOAT fHighFreqRTRatio; +} DSFXWavesReverb, *LPDSFXWavesReverb; + +typedef const DSFXWavesReverb *LPCDSFXWavesReverb; + +#define DSFX_WAVESREVERB_HIGHFREQRTRATIO_MIN 0.001f +#define DSFX_WAVESREVERB_HIGHFREQRTRATIO_MAX 0.999f +#define DSFX_WAVESREVERB_HIGHFREQRTRATIO_DEFAULT 0.001f +#define DSFX_WAVESREVERB_INGAIN_MIN -96.0f +#define DSFX_WAVESREVERB_INGAIN_MAX 0.0f +#define DSFX_WAVESREVERB_INGAIN_DEFAULT 0.0f +#define DSFX_WAVESREVERB_REVERBMIX_MIN -96.0f +#define DSFX_WAVESREVERB_REVERBMIX_MAX 0.0f +#define DSFX_WAVESREVERB_REVERBMIX_DEFAULT 0.0f +#define DSFX_WAVESREVERB_REVERBTIME_MIN 0.001f +#define DSFX_WAVESREVERB_REVERBTIME_MAX 3000.0f +#define DSFX_WAVESREVERB_REVERBTIME_DEFAULT 1000.0f + +#define INTERFACE IDirectSoundFXWavesReverb +DECLARE_INTERFACE_(IDirectSoundFXWavesReverb,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID, void**) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + + /*** IDirectSoundFXWavesReverb methods ***/ + STDMETHOD(SetAllParameters)(THIS_ const DSFXWavesReverb *reverb) PURE; + STDMETHOD(GetAllParameters)(THIS_ DSFXWavesReverb *reverb) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +#define IDirectSoundFXWavesReverb_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirectSoundFXWavesReverb_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirectSoundFXWavesReverb_Release(p) (p)->lpVtbl->Release(p) +#define IDirectSoundFXWavesReverb_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a) +#define IDirectSoundFXWavesReverb_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a) +#else +#define IDirectSoundFXWavesReverb_QueryInterface(p,a,b) (p)->QueryInterface(p,a,b) +#define IDirectSoundFXWavesReverb_AddRef(p) (p)->AddRef(p) +#define IDirectSoundFXWavesReverb_Release(p) (p)->Release(p) +#define IDirectSoundFXWavesReverb_SetAllParameters(p,a) (p)->SetAllParameters(a) +#define IDirectSoundFXWavesReverb_GetAllParameters(p,a) (p)->GetAllParameters(a) +#endif + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */ diff --git a/lib/libc/include/any-windows-any/dwmapi.h b/lib/libc/include/any-windows-any/dwmapi.h index 7ea83859cb..f3944dd1e3 100644 --- a/lib/libc/include/any-windows-any/dwmapi.h +++ b/lib/libc/include/any-windows-any/dwmapi.h @@ -44,6 +44,7 @@ extern "C" { DWMWA_CLOAK, DWMWA_CLOAKED, DWMWA_FREEZE_REPRESENTATION, + DWMWA_PASSIVE_UPDATE_MODE, DWMWA_LAST }; @@ -61,7 +62,7 @@ extern "C" { DWMNCRP_LAST }; -#if NTDDI_VERSION >= 0x06020000 +#if NTDDI_VERSION >= NTDDI_WIN8 enum GESTURE_TYPE { GT_PEN_TAP = 0, GT_PEN_DOUBLETAP = 1, @@ -89,6 +90,24 @@ extern "C" { DEFINE_ENUM_FLAG_OPERATORS (DWM_SHOWCONTACT); #endif +#if NTDDI_VERSION >= NTDDI_WIN10_RS4 + enum DWM_TAB_WINDOW_REQUIREMENTS { + DWMTWR_NONE = 0x0000, + DWMTWR_IMPLEMENTED_BY_SYSTEM = 0x0001, + DWMTWR_WINDOW_RELATIONSHIP = 0x0002, + DWMTWR_WINDOW_STYLES = 0x0004, + DWMTWR_WINDOW_REGION = 0x0008, + DWMTWR_WINDOW_DWM_ATTRIBUTES = 0x0010, + DWMTWR_WINDOW_MARGINS = 0x0020, + DWMTWR_TABBING_ENABLED = 0x0040, + DWMTWR_USER_POLICY = 0x0080, + DWMTWR_GROUP_POLICY = 0x0100, + DWMTWR_APP_COMPAT = 0x0200 + }; + + DEFINE_ENUM_FLAG_OPERATORS(DWM_TAB_WINDOW_REQUIREMENTS); +#endif + typedef enum { DWM_SOURCE_FRAME_SAMPLING_POINT, DWM_SOURCE_FRAME_SAMPLING_COVERAGE, @@ -251,11 +270,14 @@ extern "C" { HRESULT WINAPI DwmSetIconicLivePreviewBitmap (HWND hwnd, HBITMAP hbmp, POINT *pptClient, DWORD dwSITFlags); HRESULT WINAPI DwmInvalidateIconicBitmaps (HWND hwnd); #endif -#if NTDDI_VERSION >= 0x06020000 +#if NTDDI_VERSION >= NTDDI_WIN8 HRESULT WINAPI DwmRenderGesture (enum GESTURE_TYPE gt, UINT cContacts, const DWORD *pdwPointerID, const POINT *pPoints); HRESULT WINAPI DwmTetherContact (DWORD dwPointerID, WINBOOL fEnable, POINT ptTether); HRESULT WINAPI DwmShowContact (DWORD dwPointerID, enum DWM_SHOWCONTACT eShowContact); #endif +#if NTDDI_VERSION >= NTDDI_WIN10_RS4 + HRESULT WINAPI DwmGetUnmetTabRequirements (HWND appWindow, enum DWM_TAB_WINDOW_REQUIREMENTS *value); +#endif #ifdef __cplusplus } diff --git a/lib/libc/include/any-windows-any/dwrite_1.h b/lib/libc/include/any-windows-any/dwrite_1.h index 413f9e87da..52de1fc75b 100644 --- a/lib/libc/include/any-windows-any/dwrite_1.h +++ b/lib/libc/include/any-windows-any/dwrite_1.h @@ -41,6 +41,12 @@ enum DWRITE_TEXT_ANTIALIAS_MODE DWRITE_TEXT_ANTIALIAS_MODE_GRAYSCALE }; +enum DWRITE_VERTICAL_GLYPH_ORIENTATION +{ + DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT, + DWRITE_VERTICAL_GLYPH_ORIENTATION_STACKED +}; + struct DWRITE_CARET_METRICS { INT16 slopeRise; INT16 slopeRun; @@ -52,7 +58,23 @@ struct DWRITE_UNICODE_RANGE { UINT32 last; }; -struct DWRITE_FONT_METRICS1 : public DWRITE_FONT_METRICS { +struct DWRITE_FONT_METRICS1 +#ifdef __cplusplus + : public DWRITE_FONT_METRICS +#endif +{ +#ifndef __cplusplus + UINT16 designUnitsPerEm; + UINT16 ascent; + UINT16 descent; + INT16 lineGap; + UINT16 capHeight; + UINT16 xHeight; + INT16 underlinePosition; + UINT16 underlineThickness; + INT16 strikethroughPosition; + UINT16 strikethroughThickness; +#endif INT16 glyphBoxLeft; INT16 glyphBoxTop; INT16 glyphBoxRight; @@ -65,7 +87,7 @@ struct DWRITE_FONT_METRICS1 : public DWRITE_FONT_METRICS { INT16 superscriptPositionY; INT16 superscriptSizeX; INT16 superscriptSizeY; - BOOL hasTypographicMetrics; + WINBOOL hasTypographicMetrics; }; struct DWRITE_SCRIPT_PROPERTIES @@ -152,7 +174,65 @@ union DWRITE_PANOSE { }; #undef INTERFACE -#define INTERFACE IDWriteFontCollection +#define INTERFACE IDWriteFont1 +DECLARE_INTERFACE_(IDWriteFont1,IDWriteFont) +{ + BEGIN_INTERFACE + +#ifndef __cplusplus + /* IUnknown methods */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + + /* IDWriteFont methods */ + STDMETHOD(GetFontFamily)(THIS_ + IDWriteFontFamily **fontFamily) PURE; + + STDMETHOD_(DWRITE_FONT_WEIGHT, GetWeight)(THIS) PURE; + STDMETHOD_(DWRITE_FONT_STRETCH, GetStretch)(THIS) PURE; + STDMETHOD_(DWRITE_FONT_STYLE, GetStyle)(THIS) PURE; + STDMETHOD_(WINBOOL, IsSymbolFont)(THIS) PURE; + + STDMETHOD(GetFaceNames)(THIS_ + IDWriteLocalizedStrings **names) PURE; + + STDMETHOD(GetInformationalStrings)(THIS_ + DWRITE_INFORMATIONAL_STRING_ID informationalStringID, + IDWriteLocalizedStrings **informationalStrings, + WINBOOL *exists) PURE; + + STDMETHOD_(DWRITE_FONT_SIMULATIONS, GetSimulations)(THIS) PURE; + + STDMETHOD_(void, GetMetrics)(THIS_ + DWRITE_FONT_METRICS *fontMetrics) PURE; + + STDMETHOD(HasCharacter)(THIS_ + UINT32 unicodeValue, + WINBOOL *exists) PURE; + + STDMETHOD(CreateFontFace)(THIS_ + IDWriteFontFace **fontFace) PURE; +#endif + + STDMETHOD_(void, GetMetrics)(THIS_ + DWRITE_FONT_METRICS1 *fontMetrics) PURE; + + STDMETHOD_(void, GetPanose)(THIS_ + DWRITE_PANOSE *panose) PURE; + + STDMETHOD(GetUnicodeRanges)(THIS_ + UINT32 maxCount, + DWRITE_UNICODE_RANGE *ranges, + UINT32 *actualCount) PURE; + + END_INTERFACE +}; + +__CRT_UUID_DECL(IDWriteFont1, 0xacd16696,0x8c14,0x4f5d,0x87,0x7e,0xfe,0x3f,0xc1,0xd3,0x27,0x38); + +#undef INTERFACE +#define INTERFACE IDWriteFontFace1 DECLARE_INTERFACE_(IDWriteFontFace1, IDWriteFontFace) { BEGIN_INTERFACE @@ -282,9 +362,101 @@ DECLARE_INTERFACE_(IDWriteRenderingParams1,IDWriteRenderingParams) __CRT_UUID_DECL(IDWriteRenderingParams1, 0x94413cf4,0xa6fc,0x4248,0x8b,0x50,0x66,0x74,0x34,0x8f,0xca,0xd3) -interface IDWriteTextAnalysisSource1; -interface IDWriteTextAnalysisSink1; -interface IDWriteRenderingParams1; +#undef INTERFACE +#define INTERFACE IDWriteTextAnalysisSource1 +DECLARE_INTERFACE_(IDWriteTextAnalysisSource1,IDWriteTextAnalysisSource) +{ + BEGIN_INTERFACE + +#ifndef __cplusplus + /* IUnknown methods */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + + /* IDWriteTextAnalysisSource methods */ + STDMETHOD(GetTextAtPosition)(THIS_ + UINT32 textPosition, + WCHAR const **textString, + UINT32 *textLength) PURE; + + STDMETHOD(GetTextBeforePosition)(THIS_ + UINT32 textPosition, + WCHAR const **textString, + UINT32 *textLength) PURE; + + STDMETHOD_(DWRITE_READING_DIRECTION, GetParagraphReadingDirection)(THIS) PURE; + + STDMETHOD(GetLocaleName)(THIS_ + UINT32 textPosition, + UINT32 *textLength, + WCHAR const **localeName) PURE; + + STDMETHOD(GetNumberSubstitution)(THIS_ + UINT32 textPosition, + UINT32 *textLength, + IDWriteNumberSubstitution **numberSubstitution) PURE; +#endif + + STDMETHOD(GetVerticalGlyphOrientation)(THIS_ + UINT32 textPosition, + UINT32 *textLength, + DWRITE_VERTICAL_GLYPH_ORIENTATION *orientation, + UINT8 *bidiLevel) PURE; + + END_INTERFACE +}; + +__CRT_UUID_DECL(IDWriteTextAnalysisSource1, 0x639cfad8,0x0fb4,0x4b21,0xa5,0x8a,0x06,0x79,0x20,0x12,0x00,0x09); + +#undef INTERFACE +#define INTERFACE IDWriteTextAnalysisSink1 +DECLARE_INTERFACE_(IDWriteTextAnalysisSink1,IDWriteTextAnalysisSink) +{ + BEGIN_INTERFACE + +#ifndef __cplusplus + /* IUnknown methods */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + + /* IDWriteTextAnalysisSink methods */ + STDMETHOD(SetScriptAnalysis)(THIS_ + UINT32 textPosition, + UINT32 textLength, + DWRITE_SCRIPT_ANALYSIS const *scriptAnalysis) PURE; + + STDMETHOD(SetLineBreakpoints)(THIS_ + UINT32 textPosition, + UINT32 textLength, + DWRITE_LINE_BREAKPOINT const *lineBreakpoints) PURE; + + STDMETHOD(SetBidiLevel)(THIS_ + UINT32 textPosition, + UINT32 textLength, + UINT8 explicitLevel, + UINT8 resolvedLevel) PURE; + + STDMETHOD(SetNumberSubstitution)(THIS_ + UINT32 textPosition, + UINT32 textLength, + IDWriteNumberSubstitution *numberSubstitution) PURE; +#endif + + /* IDWriteTextAnalysisSink1 methods */ + STDMETHOD(SetGlyphOrientation)(THIS_ + UINT32 textPosition, + UINT32 textLength, + DWRITE_GLYPH_ORIENTATION_ANGLE angle, + UINT8 adjustedBidilevel, + WINBOOL isSideways, + WINBOOL isRtl) PURE; + + END_INTERFACE +}; + +__CRT_UUID_DECL(IDWriteTextAnalysisSink1, 0xb0d941a0,0x85e7,0x4d8b,0x9f,0xd3,0x5c,0xed,0x99,0x34,0x48,0x2a); #undef INTERFACE #define INTERFACE IDWriteTextAnalyzer1 @@ -485,6 +657,232 @@ DECLARE_INTERFACE_(IDWriteTextAnalyzer1,IDWriteTextAnalyzer) __CRT_UUID_DECL(IDWriteTextAnalyzer1, 0x80dad800,0xe21f,0x4e83,0x4e,0xce,0xbf,0xcc,0xe5,0x00,0xdb,0x7c); +#undef INTERFACE +#define INTERFACE IDWriteTextLayout1 +DECLARE_INTERFACE_(IDWriteTextLayout1,IDWriteTextLayout) +{ + BEGIN_INTERFACE + +#ifndef __cplusplus + /* IUnknown methods */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + + /* IDWriteTextFormat methods */ + STDMETHOD(SetTextAlignment)(THIS_ + DWRITE_TEXT_ALIGNMENT textAlignment) PURE; + STDMETHOD(SetParagraphAlignment)(THIS_ + DWRITE_PARAGRAPH_ALIGNMENT paragraphAlignment) PURE; + STDMETHOD(SetWordWrapping)(THIS_ + DWRITE_WORD_WRAPPING wordWrapping) PURE; + STDMETHOD(SetReadingDirection)(THIS_ + DWRITE_READING_DIRECTION readingDirection) PURE; + STDMETHOD(SetFlowDirection)(THIS_ + DWRITE_FLOW_DIRECTION flowDirection) PURE; + STDMETHOD(SetIncrementalTabStop)(THIS_ + FLOAT incrementalTabStop) PURE; + STDMETHOD(SetTrimming)(THIS_ + DWRITE_TRIMMING const *trimmingOptions, + IDWriteInlineObject *trimmingSign) PURE; + STDMETHOD(SetLineSpacing)(THIS_ + DWRITE_LINE_SPACING_METHOD lineSpacingMethod, + FLOAT lineSpacing, + FLOAT baseline) PURE; + STDMETHOD_(DWRITE_TEXT_ALIGNMENT, GetTextAlignment)(THIS) PURE; + STDMETHOD_(DWRITE_PARAGRAPH_ALIGNMENT, GetParagraphAlignment)(THIS) PURE; + STDMETHOD_(DWRITE_WORD_WRAPPING, GetWordWrapping)(THIS) PURE; + STDMETHOD_(DWRITE_READING_DIRECTION, GetReadingDirection)(THIS) PURE; + STDMETHOD_(DWRITE_FLOW_DIRECTION, GetFlowDirection)(THIS) PURE; + STDMETHOD_(FLOAT, GetIncrementalTabStop)(THIS) PURE; + STDMETHOD(GetTrimming)(THIS_ + DWRITE_TRIMMING* trimmingOptions, + IDWriteInlineObject **trimmingSign) PURE; + STDMETHOD(GetLineSpacing)(THIS_ + DWRITE_LINE_SPACING_METHOD *lineSpacingMethod, + FLOAT *lineSpacing, + FLOAT *baseline) PURE; + STDMETHOD(GetFontCollection)(THIS_ + IDWriteFontCollection **fontCollection) PURE; + STDMETHOD_(UINT32, GetFontFamilyNameLength)(THIS) PURE; + STDMETHOD(GetFontFamilyName)(THIS_ + WCHAR *fontFamilyName, + UINT32 nameSize) PURE; + STDMETHOD_(DWRITE_FONT_WEIGHT, GetFontWeight)(THIS) PURE; + STDMETHOD_(DWRITE_FONT_STYLE, GetFontStyle)(THIS) PURE; + STDMETHOD_(DWRITE_FONT_STRETCH, GetFontStretch)(THIS) PURE; + STDMETHOD_(FLOAT, GetFontSize)(THIS) PURE; + STDMETHOD_(UINT32, GetLocaleNameLength)(THIS) PURE; + STDMETHOD(GetLocaleName)(THIS_ + WCHAR *localeName, + UINT32 nameSize) PURE; + + /* IDWriteTextLayout methods */ + STDMETHOD(SetMaxWidth)(THIS_ + FLOAT maxWidth) PURE; + STDMETHOD(SetMaxHeight)(THIS_ + FLOAT maxHeight) PURE; + STDMETHOD(SetFontCollection)(THIS_ + IDWriteFontCollection *fontCollection, + DWRITE_TEXT_RANGE textRange) PURE; + STDMETHOD(SetFontFamilyName)(THIS_ + WCHAR const *fontFamilyName, + DWRITE_TEXT_RANGE textRange) PURE; + STDMETHOD(SetFontWeight)(THIS_ + DWRITE_FONT_WEIGHT fontWeight, + DWRITE_TEXT_RANGE textRange) PURE; + STDMETHOD(SetFontStyle)(THIS_ + DWRITE_FONT_STYLE fontStyle, + DWRITE_TEXT_RANGE textRange) PURE; + STDMETHOD(SetFontStretch)(THIS_ + DWRITE_FONT_STRETCH fontStretch, + DWRITE_TEXT_RANGE textRange) PURE; + STDMETHOD(SetFontSize)(THIS_ + FLOAT fontSize, + DWRITE_TEXT_RANGE textRange) PURE; + STDMETHOD(SetUnderline)(THIS_ + WINBOOL hasUnderline, + DWRITE_TEXT_RANGE textRange) PURE; + STDMETHOD(SetStrikethrough)(THIS_ + WINBOOL hasStrikethrough, + DWRITE_TEXT_RANGE textRange) PURE; + STDMETHOD(SetDrawingEffect)(THIS_ + IUnknown *drawingEffect, + DWRITE_TEXT_RANGE textRange) PURE; + STDMETHOD(SetInlineObject)(THIS_ + IDWriteInlineObject *inlineObject, + DWRITE_TEXT_RANGE textRange) PURE; + STDMETHOD(SetTypography)(THIS_ + IDWriteTypography *typography, + DWRITE_TEXT_RANGE textRange) PURE; + STDMETHOD(SetLocaleName)(THIS_ + WCHAR const *localeName, + DWRITE_TEXT_RANGE textRange) PURE; + STDMETHOD_(FLOAT, GetMaxWidth)(THIS) PURE; + STDMETHOD_(FLOAT, GetMaxHeight)(THIS) PURE; + STDMETHOD(GetFontCollection)(THIS_ + UINT32 currentPosition, + IDWriteFontCollection** fontCollection, + DWRITE_TEXT_RANGE *textRange __MINGW_DEF_ARG_VAL(NULL)) PURE; + STDMETHOD(GetFontFamilyNameLength)(THIS_ + UINT32 currentPosition, + UINT32 *nameLength, + DWRITE_TEXT_RANGE *textRange __MINGW_DEF_ARG_VAL(NULL)) PURE; + STDMETHOD(GetFontFamilyName)(THIS_ + UINT32 currentPosition, + WCHAR *fontFamilyName, + UINT32 nameSize, + DWRITE_TEXT_RANGE *textRange __MINGW_DEF_ARG_VAL(NULL)) PURE; + STDMETHOD(GetFontWeight)(THIS_ + UINT32 currentPosition, + DWRITE_FONT_WEIGHT *fontWeight, + DWRITE_TEXT_RANGE* textRange __MINGW_DEF_ARG_VAL(NULL)) PURE; + STDMETHOD(GetFontStyle)(THIS_ + UINT32 currentPosition, + DWRITE_FONT_STYLE *fontStyle, + DWRITE_TEXT_RANGE *textRange __MINGW_DEF_ARG_VAL(NULL)) PURE; + STDMETHOD(GetFontStretch)(THIS_ + UINT32 currentPosition, + DWRITE_FONT_STRETCH* fontStretch, + DWRITE_TEXT_RANGE *textRange __MINGW_DEF_ARG_VAL(NULL)) PURE; + STDMETHOD(GetFontSize)(THIS_ + UINT32 currentPosition, + FLOAT *fontSize, + DWRITE_TEXT_RANGE *textRange __MINGW_DEF_ARG_VAL(NULL)) PURE; + STDMETHOD(GetUnderline)(THIS_ + UINT32 currentPosition, + WINBOOL *hasUnderline, + DWRITE_TEXT_RANGE *textRange __MINGW_DEF_ARG_VAL(NULL)) PURE; + STDMETHOD(GetStrikethrough)(THIS_ + UINT32 currentPosition, + WINBOOL *hasStrikethrough, + DWRITE_TEXT_RANGE *textRange __MINGW_DEF_ARG_VAL(NULL)) PURE; + STDMETHOD(GetDrawingEffect)(THIS_ + UINT32 currentPosition, + IUnknown **drawingEffect, + DWRITE_TEXT_RANGE *textRange __MINGW_DEF_ARG_VAL(NULL)) PURE; + STDMETHOD(GetInlineObject)(THIS_ + UINT32 currentPosition, + IDWriteInlineObject **inlineObject, + DWRITE_TEXT_RANGE *textRange __MINGW_DEF_ARG_VAL(NULL)) PURE; + STDMETHOD(GetTypography)(THIS_ + UINT32 currentPosition, + IDWriteTypography **typography, + DWRITE_TEXT_RANGE *textRange __MINGW_DEF_ARG_VAL(NULL)) PURE; + STDMETHOD(GetLocaleNameLength)(THIS_ + UINT32 currentPosition, + UINT32 *nameLength, + DWRITE_TEXT_RANGE *textRange __MINGW_DEF_ARG_VAL(NULL)) PURE; + STDMETHOD(GetLocaleName)(THIS_ + UINT32 currentPosition, + WCHAR *localeName, + UINT32 nameSize, + DWRITE_TEXT_RANGE *textRange __MINGW_DEF_ARG_VAL(NULL)) PURE; + STDMETHOD(Draw)(THIS_ + void *clientDrawingContext, + IDWriteTextRenderer *renderer, + FLOAT originX, + FLOAT originY) PURE; + STDMETHOD(GetLineMetrics)(THIS_ + DWRITE_LINE_METRICS *lineMetrics, + UINT32 maxLineCount, + UINT32 *actualLineCount) PURE; + STDMETHOD(GetMetrics)(THIS_ + DWRITE_TEXT_METRICS *textMetrics) PURE; + STDMETHOD(GetOverhangMetrics)(THIS_ + DWRITE_OVERHANG_METRICS *overhangs) PURE; + STDMETHOD(GetClusterMetrics)(THIS_ + DWRITE_CLUSTER_METRICS *clusterMetrics, + UINT32 maxClusterCount, + UINT32 *actualClusterCount) PURE; + STDMETHOD(DetermineMinWidth)(THIS_ + FLOAT *minWidth) PURE; + STDMETHOD(HitTestPoint)(THIS_ + FLOAT pointX, + FLOAT pointY, + WINBOOL *isTrailingHit, + WINBOOL *isInside, + DWRITE_HIT_TEST_METRICS *hitTestMetrics) PURE; + STDMETHOD(HitTestTextPosition)(THIS_ + UINT32 textPosition, + WINBOOL isTrailingHit, + FLOAT *pointX, + FLOAT *pointY, + DWRITE_HIT_TEST_METRICS *hitTestMetrics) PURE; + STDMETHOD(HitTestTextRange)(THIS_ + UINT32 textPosition, + UINT32 textLength, + FLOAT originX, + FLOAT originY, + DWRITE_HIT_TEST_METRICS *hitTestMetrics, + UINT32 maxHitTestMetricsCount, + UINT32 *actualHitTestMetricsCount) PURE; +#endif + + /* IDWriteTextLayout1 methods */ + STDMETHOD(SetPairKerning)(THIS_ + WINBOOL isPairKerningEnabled, + DWRITE_TEXT_RANGE textRange) PURE; + STDMETHOD(GetPairKerning)(THIS_ + UINT32 position, + WINBOOL *isPairKerningEnabled, + DWRITE_TEXT_RANGE *textRange __MINGW_DEF_ARG_VAL(NULL)) PURE; + STDMETHOD(SetCharacterSpacing)(THIS_ + FLOAT leadingSpacing, + FLOAT trailingSpacing, + FLOAT minimumAdvance, + DWRITE_TEXT_RANGE textRange) PURE; + STDMETHOD(GetCharacterSpacing)(THIS_ + FLOAT *leadingSpacing, + FLOAT *trailingSpacing, + FLOAT *minimumAdvance, + DWRITE_TEXT_RANGE *textRange __MINGW_DEF_ARG_VAL(NULL)) PURE; + + END_INTERFACE +}; + +__CRT_UUID_DECL(IDWriteTextLayout1, 0x9064d822,0x80a7,0x465c,0xa9,0x86,0xdf,0x65,0xf7,0x8b,0x8f,0xeb) + #undef INTERFACE #define INTERFACE IDWriteFactory1 DECLARE_INTERFACE_(IDWriteFactory1,IDWriteFactory) diff --git a/lib/libc/include/any-windows-any/dxgi.h b/lib/libc/include/any-windows-any/dxgi.h index 2246308d06..3f80f10727 100644 --- a/lib/libc/include/any-windows-any/dxgi.h +++ b/lib/libc/include/any-windows-any/dxgi.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/dxgi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/dxgi.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/dxgi1_2.h b/lib/libc/include/any-windows-any/dxgi1_2.h index 72502d6bd5..b3e15f504a 100644 --- a/lib/libc/include/any-windows-any/dxgi1_2.h +++ b/lib/libc/include/any-windows-any/dxgi1_2.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/dxgi1_2.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/dxgi1_2.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/dxgi1_3.h b/lib/libc/include/any-windows-any/dxgi1_3.h index 482e31beca..aafa3ebd89 100644 --- a/lib/libc/include/any-windows-any/dxgi1_3.h +++ b/lib/libc/include/any-windows-any/dxgi1_3.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/dxgi1_3.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/dxgi1_3.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/dxgi1_4.h b/lib/libc/include/any-windows-any/dxgi1_4.h index 31f58faf49..32e7b6e79a 100644 --- a/lib/libc/include/any-windows-any/dxgi1_4.h +++ b/lib/libc/include/any-windows-any/dxgi1_4.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/dxgi1_4.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/dxgi1_4.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/dxgi1_5.h b/lib/libc/include/any-windows-any/dxgi1_5.h index 431f2a6225..b9953a265b 100644 --- a/lib/libc/include/any-windows-any/dxgi1_5.h +++ b/lib/libc/include/any-windows-any/dxgi1_5.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/dxgi1_5.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/dxgi1_5.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/dxgi1_6.h b/lib/libc/include/any-windows-any/dxgi1_6.h index d115c3c8b3..ab1f387e23 100644 --- a/lib/libc/include/any-windows-any/dxgi1_6.h +++ b/lib/libc/include/any-windows-any/dxgi1_6.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/dxgi1_6.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/dxgi1_6.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/dxgicommon.h b/lib/libc/include/any-windows-any/dxgicommon.h index a3c2000507..08f8a870be 100644 --- a/lib/libc/include/any-windows-any/dxgicommon.h +++ b/lib/libc/include/any-windows-any/dxgicommon.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/dxgicommon.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/dxgicommon.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/dxgiformat.h b/lib/libc/include/any-windows-any/dxgiformat.h index ef074c5cc2..c5fc14a2ea 100644 --- a/lib/libc/include/any-windows-any/dxgiformat.h +++ b/lib/libc/include/any-windows-any/dxgiformat.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/dxgiformat.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/dxgiformat.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/dxgitype.h b/lib/libc/include/any-windows-any/dxgitype.h index 9f8bea55da..4740dc5a1b 100644 --- a/lib/libc/include/any-windows-any/dxgitype.h +++ b/lib/libc/include/any-windows-any/dxgitype.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/dxgitype.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/dxgitype.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/dxva2api.h b/lib/libc/include/any-windows-any/dxva2api.h index d4c5446295..e277e767ee 100644 --- a/lib/libc/include/any-windows-any/dxva2api.h +++ b/lib/libc/include/any-windows-any/dxva2api.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/dxva2api.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/dxva2api.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,21 +21,33 @@ #ifndef __IDirect3DDeviceManager9_FWD_DEFINED__ #define __IDirect3DDeviceManager9_FWD_DEFINED__ typedef interface IDirect3DDeviceManager9 IDirect3DDeviceManager9; +#ifdef __cplusplus +interface IDirect3DDeviceManager9; +#endif /* __cplusplus */ #endif #ifndef __IDirectXVideoDecoder_FWD_DEFINED__ #define __IDirectXVideoDecoder_FWD_DEFINED__ typedef interface IDirectXVideoDecoder IDirectXVideoDecoder; +#ifdef __cplusplus +interface IDirectXVideoDecoder; +#endif /* __cplusplus */ #endif #ifndef __IDirectXVideoAccelerationService_FWD_DEFINED__ #define __IDirectXVideoAccelerationService_FWD_DEFINED__ typedef interface IDirectXVideoAccelerationService IDirectXVideoAccelerationService; +#ifdef __cplusplus +interface IDirectXVideoAccelerationService; +#endif /* __cplusplus */ #endif #ifndef __IDirectXVideoDecoderService_FWD_DEFINED__ #define __IDirectXVideoDecoderService_FWD_DEFINED__ typedef interface IDirectXVideoDecoderService IDirectXVideoDecoderService; +#ifdef __cplusplus +interface IDirectXVideoDecoderService; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -54,6 +67,9 @@ typedef DWORD D3DPOOL; #ifndef __IDirectXVideoDecoderService_FWD_DEFINED__ #define __IDirectXVideoDecoderService_FWD_DEFINED__ typedef interface IDirectXVideoDecoderService IDirectXVideoDecoderService; +#ifdef __cplusplus +interface IDirectXVideoDecoderService; +#endif /* __cplusplus */ #endif #ifndef __REFERENCE_TIME_DEFINED @@ -487,53 +503,54 @@ typedef struct IDirect3DDeviceManager9Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDirect3DDeviceManager9* This, + IDirect3DDeviceManager9 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDirect3DDeviceManager9* This); + IDirect3DDeviceManager9 *This); ULONG (STDMETHODCALLTYPE *Release)( - IDirect3DDeviceManager9* This); + IDirect3DDeviceManager9 *This); /*** IDirect3DDeviceManager9 methods ***/ HRESULT (STDMETHODCALLTYPE *ResetDevice)( - IDirect3DDeviceManager9* This, + IDirect3DDeviceManager9 *This, IDirect3DDevice9 *pDevice, UINT resetToken); HRESULT (STDMETHODCALLTYPE *OpenDeviceHandle)( - IDirect3DDeviceManager9* This, + IDirect3DDeviceManager9 *This, HANDLE *phDevice); HRESULT (STDMETHODCALLTYPE *CloseDeviceHandle)( - IDirect3DDeviceManager9* This, + IDirect3DDeviceManager9 *This, HANDLE hDevice); HRESULT (STDMETHODCALLTYPE *TestDevice)( - IDirect3DDeviceManager9* This, + IDirect3DDeviceManager9 *This, HANDLE hDevice); HRESULT (STDMETHODCALLTYPE *LockDevice)( - IDirect3DDeviceManager9* This, + IDirect3DDeviceManager9 *This, HANDLE hDevice, IDirect3DDevice9 **ppDevice, WINBOOL fBlock); HRESULT (STDMETHODCALLTYPE *UnlockDevice)( - IDirect3DDeviceManager9* This, + IDirect3DDeviceManager9 *This, HANDLE hDevice, WINBOOL fSaveState); HRESULT (STDMETHODCALLTYPE *GetVideoService)( - IDirect3DDeviceManager9* This, + IDirect3DDeviceManager9 *This, HANDLE hDevice, REFIID riid, void **ppService); END_INTERFACE } IDirect3DDeviceManager9Vtbl; + interface IDirect3DDeviceManager9 { CONST_VTBL IDirect3DDeviceManager9Vtbl* lpVtbl; }; @@ -590,68 +607,6 @@ static FORCEINLINE HRESULT IDirect3DDeviceManager9_GetVideoService(IDirect3DDevi #endif -HRESULT STDMETHODCALLTYPE IDirect3DDeviceManager9_ResetDevice_Proxy( - IDirect3DDeviceManager9* This, - IDirect3DDevice9 *pDevice, - UINT resetToken); -void __RPC_STUB IDirect3DDeviceManager9_ResetDevice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDirect3DDeviceManager9_OpenDeviceHandle_Proxy( - IDirect3DDeviceManager9* This, - HANDLE *phDevice); -void __RPC_STUB IDirect3DDeviceManager9_OpenDeviceHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDirect3DDeviceManager9_CloseDeviceHandle_Proxy( - IDirect3DDeviceManager9* This, - HANDLE hDevice); -void __RPC_STUB IDirect3DDeviceManager9_CloseDeviceHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDirect3DDeviceManager9_TestDevice_Proxy( - IDirect3DDeviceManager9* This, - HANDLE hDevice); -void __RPC_STUB IDirect3DDeviceManager9_TestDevice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDirect3DDeviceManager9_LockDevice_Proxy( - IDirect3DDeviceManager9* This, - HANDLE hDevice, - IDirect3DDevice9 **ppDevice, - WINBOOL fBlock); -void __RPC_STUB IDirect3DDeviceManager9_LockDevice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDirect3DDeviceManager9_UnlockDevice_Proxy( - IDirect3DDeviceManager9* This, - HANDLE hDevice, - WINBOOL fSaveState); -void __RPC_STUB IDirect3DDeviceManager9_UnlockDevice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDirect3DDeviceManager9_GetVideoService_Proxy( - IDirect3DDeviceManager9* This, - HANDLE hDevice, - REFIID riid, - void **ppService); -void __RPC_STUB IDirect3DDeviceManager9_GetVideoService_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDirect3DDeviceManager9_INTERFACE_DEFINED__ */ @@ -704,23 +659,23 @@ typedef struct IDirectXVideoDecoderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDirectXVideoDecoder* This, + IDirectXVideoDecoder *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDirectXVideoDecoder* This); + IDirectXVideoDecoder *This); ULONG (STDMETHODCALLTYPE *Release)( - IDirectXVideoDecoder* This); + IDirectXVideoDecoder *This); /*** IDirectXVideoDecoder methods ***/ HRESULT (STDMETHODCALLTYPE *GetVideoDecoderService)( - IDirectXVideoDecoder* This, + IDirectXVideoDecoder *This, IDirectXVideoDecoderService **ppService); HRESULT (STDMETHODCALLTYPE *GetCreationParameters)( - IDirectXVideoDecoder* This, + IDirectXVideoDecoder *This, GUID *pDeviceGuid, DXVA2_VideoDesc *pVideoDesc, DXVA2_ConfigPictureDecode *pConfig, @@ -728,30 +683,31 @@ typedef struct IDirectXVideoDecoderVtbl { UINT *pNumSurfaces); HRESULT (STDMETHODCALLTYPE *GetBuffer)( - IDirectXVideoDecoder* This, + IDirectXVideoDecoder *This, UINT BufferType, void **ppBuffer, UINT *pBufferSize); HRESULT (STDMETHODCALLTYPE *ReleaseBuffer)( - IDirectXVideoDecoder* This, + IDirectXVideoDecoder *This, UINT BufferType); HRESULT (STDMETHODCALLTYPE *BeginFrame)( - IDirectXVideoDecoder* This, + IDirectXVideoDecoder *This, IDirect3DSurface9 *pRenderTarget, void *pvPVPData); HRESULT (STDMETHODCALLTYPE *EndFrame)( - IDirectXVideoDecoder* This, + IDirectXVideoDecoder *This, HANDLE *pHandleComplete); HRESULT (STDMETHODCALLTYPE *Execute)( - IDirectXVideoDecoder* This, + IDirectXVideoDecoder *This, const DXVA2_DecodeExecuteParams *pExecuteParams); END_INTERFACE } IDirectXVideoDecoderVtbl; + interface IDirectXVideoDecoder { CONST_VTBL IDirectXVideoDecoderVtbl* lpVtbl; }; @@ -808,69 +764,6 @@ static FORCEINLINE HRESULT IDirectXVideoDecoder_Execute(IDirectXVideoDecoder* Th #endif -HRESULT STDMETHODCALLTYPE IDirectXVideoDecoder_GetVideoDecoderService_Proxy( - IDirectXVideoDecoder* This, - IDirectXVideoDecoderService **ppService); -void __RPC_STUB IDirectXVideoDecoder_GetVideoDecoderService_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDirectXVideoDecoder_GetCreationParameters_Proxy( - IDirectXVideoDecoder* This, - GUID *pDeviceGuid, - DXVA2_VideoDesc *pVideoDesc, - DXVA2_ConfigPictureDecode *pConfig, - IDirect3DSurface9 ***pDecoderRenderTargets, - UINT *pNumSurfaces); -void __RPC_STUB IDirectXVideoDecoder_GetCreationParameters_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDirectXVideoDecoder_GetBuffer_Proxy( - IDirectXVideoDecoder* This, - UINT BufferType, - void **ppBuffer, - UINT *pBufferSize); -void __RPC_STUB IDirectXVideoDecoder_GetBuffer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDirectXVideoDecoder_ReleaseBuffer_Proxy( - IDirectXVideoDecoder* This, - UINT BufferType); -void __RPC_STUB IDirectXVideoDecoder_ReleaseBuffer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDirectXVideoDecoder_BeginFrame_Proxy( - IDirectXVideoDecoder* This, - IDirect3DSurface9 *pRenderTarget, - void *pvPVPData); -void __RPC_STUB IDirectXVideoDecoder_BeginFrame_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDirectXVideoDecoder_EndFrame_Proxy( - IDirectXVideoDecoder* This, - HANDLE *pHandleComplete); -void __RPC_STUB IDirectXVideoDecoder_EndFrame_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDirectXVideoDecoder_Execute_Proxy( - IDirectXVideoDecoder* This, - const DXVA2_DecodeExecuteParams *pExecuteParams); -void __RPC_STUB IDirectXVideoDecoder_Execute_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDirectXVideoDecoder_INTERFACE_DEFINED__ */ @@ -906,19 +799,19 @@ typedef struct IDirectXVideoAccelerationServiceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDirectXVideoAccelerationService* This, + IDirectXVideoAccelerationService *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDirectXVideoAccelerationService* This); + IDirectXVideoAccelerationService *This); ULONG (STDMETHODCALLTYPE *Release)( - IDirectXVideoAccelerationService* This); + IDirectXVideoAccelerationService *This); /*** IDirectXVideoAccelerationService methods ***/ HRESULT (STDMETHODCALLTYPE *CreateSurface)( - IDirectXVideoAccelerationService* This, + IDirectXVideoAccelerationService *This, UINT Width, UINT Height, UINT BackBuffers, @@ -931,6 +824,7 @@ typedef struct IDirectXVideoAccelerationServiceVtbl { END_INTERFACE } IDirectXVideoAccelerationServiceVtbl; + interface IDirectXVideoAccelerationService { CONST_VTBL IDirectXVideoAccelerationServiceVtbl* lpVtbl; }; @@ -963,22 +857,6 @@ static FORCEINLINE HRESULT IDirectXVideoAccelerationService_CreateSurface(IDirec #endif -HRESULT STDMETHODCALLTYPE IDirectXVideoAccelerationService_CreateSurface_Proxy( - IDirectXVideoAccelerationService* This, - UINT Width, - UINT Height, - UINT BackBuffers, - D3DFORMAT Format, - D3DPOOL Pool, - DWORD Usage, - DWORD DxvaType, - IDirect3DSurface9 **ppSurface, - HANDLE *pSharedHandle); -void __RPC_STUB IDirectXVideoAccelerationService_CreateSurface_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDirectXVideoAccelerationService_INTERFACE_DEFINED__ */ @@ -1027,19 +905,19 @@ typedef struct IDirectXVideoDecoderServiceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDirectXVideoDecoderService* This, + IDirectXVideoDecoderService *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDirectXVideoDecoderService* This); + IDirectXVideoDecoderService *This); ULONG (STDMETHODCALLTYPE *Release)( - IDirectXVideoDecoderService* This); + IDirectXVideoDecoderService *This); /*** IDirectXVideoAccelerationService methods ***/ HRESULT (STDMETHODCALLTYPE *CreateSurface)( - IDirectXVideoDecoderService* This, + IDirectXVideoDecoderService *This, UINT Width, UINT Height, UINT BackBuffers, @@ -1052,18 +930,18 @@ typedef struct IDirectXVideoDecoderServiceVtbl { /*** IDirectXVideoDecoderService methods ***/ HRESULT (STDMETHODCALLTYPE *GetDecoderDeviceGuids)( - IDirectXVideoDecoderService* This, + IDirectXVideoDecoderService *This, UINT *pCount, GUID **pGuids); HRESULT (STDMETHODCALLTYPE *GetDecoderRenderTargets)( - IDirectXVideoDecoderService* This, + IDirectXVideoDecoderService *This, REFGUID Guid, UINT *pCount, D3DFORMAT **pFormats); HRESULT (STDMETHODCALLTYPE *GetDecoderConfigurations)( - IDirectXVideoDecoderService* This, + IDirectXVideoDecoderService *This, REFGUID Guid, const DXVA2_VideoDesc *pVideoDesc, void *pReserved, @@ -1071,7 +949,7 @@ typedef struct IDirectXVideoDecoderServiceVtbl { DXVA2_ConfigPictureDecode **ppConfigs); HRESULT (STDMETHODCALLTYPE *CreateVideoDecoder)( - IDirectXVideoDecoderService* This, + IDirectXVideoDecoderService *This, REFGUID Guid, const DXVA2_VideoDesc *pVideoDesc, const DXVA2_ConfigPictureDecode *pConfig, @@ -1081,6 +959,7 @@ typedef struct IDirectXVideoDecoderServiceVtbl { END_INTERFACE } IDirectXVideoDecoderServiceVtbl; + interface IDirectXVideoDecoderService { CONST_VTBL IDirectXVideoDecoderServiceVtbl* lpVtbl; }; @@ -1131,50 +1010,6 @@ static FORCEINLINE HRESULT IDirectXVideoDecoderService_CreateVideoDecoder(IDirec #endif -HRESULT STDMETHODCALLTYPE IDirectXVideoDecoderService_GetDecoderDeviceGuids_Proxy( - IDirectXVideoDecoderService* This, - UINT *pCount, - GUID **pGuids); -void __RPC_STUB IDirectXVideoDecoderService_GetDecoderDeviceGuids_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDirectXVideoDecoderService_GetDecoderRenderTargets_Proxy( - IDirectXVideoDecoderService* This, - REFGUID Guid, - UINT *pCount, - D3DFORMAT **pFormats); -void __RPC_STUB IDirectXVideoDecoderService_GetDecoderRenderTargets_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDirectXVideoDecoderService_GetDecoderConfigurations_Proxy( - IDirectXVideoDecoderService* This, - REFGUID Guid, - const DXVA2_VideoDesc *pVideoDesc, - void *pReserved, - UINT *pCount, - DXVA2_ConfigPictureDecode **ppConfigs); -void __RPC_STUB IDirectXVideoDecoderService_GetDecoderConfigurations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDirectXVideoDecoderService_CreateVideoDecoder_Proxy( - IDirectXVideoDecoderService* This, - REFGUID Guid, - const DXVA2_VideoDesc *pVideoDesc, - const DXVA2_ConfigPictureDecode *pConfig, - IDirect3DSurface9 **ppDecoderRenderTargets, - UINT NumRenderTargets, - IDirectXVideoDecoder **ppDecode); -void __RPC_STUB IDirectXVideoDecoderService_CreateVideoDecoder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDirectXVideoDecoderService_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/endpointvolume.h b/lib/libc/include/any-windows-any/endpointvolume.h index 9929dc321e..6e4c1ebf35 100644 --- a/lib/libc/include/any-windows-any/endpointvolume.h +++ b/lib/libc/include/any-windows-any/endpointvolume.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/endpointvolume.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from include/endpointvolume.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/evntprov.h b/lib/libc/include/any-windows-any/evntprov.h index ae4bafa9e7..87f4eecbdd 100644 --- a/lib/libc/include/any-windows-any/evntprov.h +++ b/lib/libc/include/any-windows-any/evntprov.h @@ -88,7 +88,7 @@ extern "C" { typedef const EVENT_DESCRIPTOR *PCEVENT_DESCRIPTOR; #endif - typedef struct _EVENT_FILTER_DESCRIPTOR { + struct _EVENT_FILTER_DESCRIPTOR { ULONGLONG Ptr; ULONG Size; ULONG Type; diff --git a/lib/libc/include/any-windows-any/evntrace.h b/lib/libc/include/any-windows-any/evntrace.h index c7b9260f2a..5cc04252d5 100644 --- a/lib/libc/include/any-windows-any/evntrace.h +++ b/lib/libc/include/any-windows-any/evntrace.h @@ -90,6 +90,7 @@ typedef ULONG64 TRACEHANDLE,*PTRACEHANDLE; #define TRACE_LEVEL_RESERVED9 9 #define EVENT_TRACE_TYPE_LOAD 0x0a +#define EVENT_TRACE_TYPE_TERMINATE 0x0b #define EVENT_TRACE_TYPE_IO_READ 0x0a #define EVENT_TRACE_TYPE_IO_WRITE 0x0b @@ -168,6 +169,13 @@ typedef ULONG64 TRACEHANDLE,*PTRACEHANDLE; #define EVENT_TRACE_TYPE_CONFIG_PROCESSORGROUP 0x1a #define EVENT_TRACE_TYPE_CONFIG_PROCESSORNUMBER 0x1b #define EVENT_TRACE_TYPE_CONFIG_DPI 0x1c +#define EVENT_TRACE_TYPE_CONFIG_CI_INFO 0x1d +#define EVENT_TRACE_TYPE_CONFIG_MACHINEID 0x1e +#define EVENT_TRACE_TYPE_CONFIG_DEFRAG 0x1f +#define EVENT_TRACE_TYPE_CONFIG_MOBILEPLATFORM 0x20 +#define EVENT_TRACE_TYPE_CONFIG_DEVICEFAMILY 0x21 +#define EVENT_TRACE_TYPE_CONFIG_FLIGHTID 0x22 +#define EVENT_TRACE_TYPE_CONFIG_PROCESSOR 0x23 #define EVENT_TRACE_TYPE_OPTICAL_IO_READ 0x37 #define EVENT_TRACE_TYPE_OPTICAL_IO_WRITE 0x38 @@ -219,6 +227,9 @@ typedef ULONG64 TRACEHANDLE,*PTRACEHANDLE; #define EVENT_TRACE_FLAG_VAMAP 0x00008000 #define EVENT_TRACE_FLAG_NO_SYSCONFIG 0x10000000 +#define EVENT_TRACE_FLAG_JOB 0x00080000 +#define EVENT_TRACE_FLAG_DEBUG_EVENTS 0x00400000 + #define EVENT_TRACE_FLAG_EXTENSION 0x80000000 #define EVENT_TRACE_FLAG_FORWARD_WMI 0x40000000 #define EVENT_TRACE_FLAG_ENABLE_RESERVE 0x20000000 @@ -257,10 +268,14 @@ typedef ULONG64 TRACEHANDLE,*PTRACEHANDLE; #define EVENT_TRACE_STOP_ON_HYBRID_SHUTDOWN 0x00400000 #define EVENT_TRACE_PERSIST_ON_HYBRID_SHUTDOWN 0x00800000 +#define EVENT_TRACE_INDEPENDENT_SESSION_MODE 0x08000000 +#define EVENT_TRACE_COMPRESSED_MODE 0x04000000 + #define EVENT_TRACE_CONTROL_QUERY 0 #define EVENT_TRACE_CONTROL_STOP 1 #define EVENT_TRACE_CONTROL_UPDATE 2 #define EVENT_TRACE_CONTROL_FLUSH 3 +#define EVENT_TRACE_CONTROL_INCREMENT_FILE 4 #define TRACE_MESSAGE_SEQUENCE 1 #define TRACE_MESSAGE_GUID 2 @@ -285,6 +300,12 @@ typedef ULONG64 TRACEHANDLE,*PTRACEHANDLE; #define TRACE_HEADER_FLAG_USE_GUID_PTR 0x00080000 #define TRACE_HEADER_FLAG_USE_MOF_PTR 0x00100000 +typedef enum { + EtwCompressionModeRestart = 0, + EtwCompressionModeNoDisable = 1, + EtwCompressionModeNoRestart = 2 +} ETW_COMPRESSION_RESUMPTION_MODE; + typedef struct _EVENT_TRACE_HEADER { USHORT Size; __C89_NAMELESS union { @@ -538,6 +559,9 @@ typedef struct EVENT_INSTANCE_INFO { } EVENT_INSTANCE_INFO,*PEVENT_INSTANCE_INFO; #ifndef _EVNTRACE_KERNEL_MODE + +typedef struct _EVENT_FILTER_DESCRIPTOR EVENT_FILTER_DESCRIPTOR, *PEVENT_FILTER_DESCRIPTOR; + typedef struct _EVENT_TRACE_PROPERTIES { WNODE_HEADER Wnode; ULONG BufferSize; @@ -559,6 +583,45 @@ typedef struct _EVENT_TRACE_PROPERTIES { ULONG LoggerNameOffset; } EVENT_TRACE_PROPERTIES,*PEVENT_TRACE_PROPERTIES; +typedef struct _EVENT_TRACE_PROPERTIES_V2 { + WNODE_HEADER Wnode; + ULONG BufferSize; + ULONG MinimumBuffers; + ULONG MaximumBuffers; + ULONG MaximumFileSize; + ULONG LogFileMode; + ULONG FlushTimer; + ULONG EnableFlags; + __C89_NAMELESS union { + LONG AgeLimit; + LONG FlushThreshold; + }; + ULONG NumberOfBuffers; + ULONG FreeBuffers; + ULONG EventsLost; + ULONG BuffersWritten; + ULONG LogBuffersLost; + ULONG RealTimeBuffersLost; + HANDLE LoggerThreadId; + ULONG LogFileNameOffset; + ULONG LoggerNameOffset; + __C89_NAMELESS union { + __C89_NAMELESS struct { + ULONG VersionNumber : 8; + }; + ULONG V2Control; + }; + ULONG FilterDescCount; + PEVENT_FILTER_DESCRIPTOR FilterDesc; + __C89_NAMELESS union { + __C89_NAMELESS struct { + ULONG Wow : 1; + ULONG QpcDeltaTracking : 1; + }; + ULONG64 V2Options; + }; +} EVENT_TRACE_PROPERTIES_V2, *PEVENT_TRACE_PROPERTIES_V2; + typedef struct _TRACE_GUID_REGISTRATION { LPCGUID Guid; HANDLE RegHandle; @@ -721,8 +784,9 @@ extern "C" { #endif #define ENABLE_TRACE_PARAMETERS_VERSION 1 +#define ENABLE_TRACE_PARAMETERS_VERSION_2 2 - typedef enum _TRACE_QUERY_INFO_CLASS { +typedef enum _TRACE_QUERY_INFO_CLASS { TraceGuidQueryList, TraceGuidQueryInfo, TraceGuidQueryProcess, @@ -733,30 +797,60 @@ extern "C" { TraceProfileSourceListInfo, TracePmcEventListInfo, TracePmcCounterListInfo, + TraceSetDisallowList, + TraceVersionInfo, + TraceGroupQueryList, + TraceGroupQueryInfo, + TraceDisallowListQuery, + TraceCompressionInfo, + TracePeriodicCaptureStateListInfo, + TracePeriodicCaptureStateInfo, + TraceProviderBinaryTracking, + TraceMaxLoggersQuery, MaxTraceSetInfoClass - } TRACE_QUERY_INFO_CLASS, TRACE_INFO_CLASS; +} TRACE_QUERY_INFO_CLASS, TRACE_INFO_CLASS; - typedef struct _EVENT_FILTER_DESCRIPTOR EVENT_FILTER_DESCRIPTOR,*PEVENT_FILTER_DESCRIPTOR; +typedef struct _EVENT_FILTER_DESCRIPTOR EVENT_FILTER_DESCRIPTOR,*PEVENT_FILTER_DESCRIPTOR; - typedef struct _ENABLE_TRACE_PARAMETERS { - ULONG Version; - ULONG EnableProperty; - ULONG ControlFlags; - GUID SourceId; +typedef struct _ENABLE_TRACE_PARAMETERS_V1 { + ULONG Version; + ULONG EnableProperty; + ULONG ControlFlags; + GUID SourceId; PEVENT_FILTER_DESCRIPTOR EnableFilterDesc; - } ENABLE_TRACE_PARAMETERS,*PENABLE_TRACE_PARAMETERS; +} ENABLE_TRACE_PARAMETERS_V1, *PENABLE_TRACE_PARAMETERS_V1; - /*To enable the read event type for disk IO events, set GUID to 3d6fa8d4-fe05-11d0-9dda-00c04fd7ba7c and Type to 10.*/ - typedef struct _CLASSIC_EVENT_ID { - GUID EventGuid; +typedef struct _ENABLE_TRACE_PARAMETERS { + ULONG Version; + ULONG EnableProperty; + ULONG ControlFlags; + GUID SourceId; + PEVENT_FILTER_DESCRIPTOR EnableFilterDesc; + ULONG FilterDescCount; +} ENABLE_TRACE_PARAMETERS, *PENABLE_TRACE_PARAMETERS; + +/*To enable the read event type for disk IO events, set GUID to 3d6fa8d4-fe05-11d0-9dda-00c04fd7ba7c and Type to 10.*/ +typedef struct _CLASSIC_EVENT_ID { + GUID EventGuid; UCHAR Type; UCHAR Reserved[7]; - } CLASSIC_EVENT_ID,*PCLASSIC_EVENT_ID; +} CLASSIC_EVENT_ID, *PCLASSIC_EVENT_ID; - typedef struct _TRACE_PROFILE_INTERVAL { +typedef struct _TRACE_PROFILE_INTERVAL { ULONG Source; ULONG Interval; - } TRACE_PROFILE_INTERVAL,*PTRACE_PROFILE_INTERVAL; +} TRACE_PROFILE_INTERVAL, *PTRACE_PROFILE_INTERVAL; + +typedef struct _TRACE_VERSION_INFO { + UINT EtwTraceProcessingVersion; + UINT Reserved; +} TRACE_VERSION_INFO, *PTRACE_VERSION_INFO; + +typedef struct _TRACE_PERIODIC_CAPTURE_STATE_INFO { + ULONG CaptureStateFrequencyInSeconds; + USHORT ProviderCount; + USHORT Reserved; +} TRACE_PERIODIC_CAPTURE_STATE_INFO, *PTRACE_PERIODIC_CAPTURE_STATE_INFO; #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) EXTERN_C ULONG WMIAPI StartTraceA (PTRACEHANDLE TraceHandle, LPCSTR InstanceName, PEVENT_TRACE_PROPERTIES Properties); @@ -791,9 +885,22 @@ extern "C" { #if WINVER >= 0x0602 EXTERN_C ULONG WMIAPI TraceQueryInformation (TRACEHANDLE SessionHandle, TRACE_INFO_CLASS InformationClass, PVOID TraceInformation, ULONG InformationLength, PULONG ReturnLength); #endif -#endif +#endif /* WINAPI_PARTITION_DESKTOP */ #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP) + +typedef enum _ETW_PROCESS_HANDLE_INFO_TYPE { + EtwQueryPartitionInformation = 1, + EtwQueryProcessHandleInfoMax +} ETW_PROCESS_HANDLE_INFO_TYPE; + +typedef struct _ETW_TRACE_PARTITION_INFORMATION { + GUID PartitionId; + GUID ParentId; + LONG64 QpcOffsetFromRoot; + ULONG PartitionType; +} ETW_TRACE_PARTITION_INFORMATION, *PETW_TRACE_PARTITION_INFORMATION; + EXTERN_C ULONG WMIAPI StartTraceW (PTRACEHANDLE TraceHandle, LPCWSTR InstanceName, PEVENT_TRACE_PROPERTIES Properties); EXTERN_C ULONG WMIAPI StopTraceW (TRACEHANDLE TraceHandle, LPCWSTR InstanceName, PEVENT_TRACE_PROPERTIES Properties); EXTERN_C ULONG WMIAPI QueryTraceW (TRACEHANDLE TraceHandle, LPCWSTR InstanceName, PEVENT_TRACE_PROPERTIES Properties); @@ -806,7 +913,8 @@ extern "C" { EXTERN_C UCHAR WMIAPI GetTraceEnableLevel (TRACEHANDLE TraceHandle); EXTERN_C ULONG WMIAPI GetTraceEnableFlags (TRACEHANDLE TraceHandle); EXTERN_C ULONG __cdecl TraceMessage (TRACEHANDLE LoggerHandle, ULONG MessageFlags, LPCGUID MessageGuid, USHORT MessageNumber,...); -#endif + EXTERN_C ULONG WMIAPI QueryTraceProcessingHandle (TRACEHANDLE ProcessingHandle, ETW_PROCESS_HANDLE_INFO_TYPE InformationClass, PVOID InBuffer, ULONG InBufferSize, PVOID OutBuffer, ULONG OutBufferSize, PULONG ReturnLength); +#endif /* WINAPI_PARTITION_APP */ #ifdef __cplusplus } diff --git a/lib/libc/include/any-windows-any/evr.h b/lib/libc/include/any-windows-any/evr.h index cf8d4fc04f..45f6a489fe 100644 --- a/lib/libc/include/any-windows-any/evr.h +++ b/lib/libc/include/any-windows-any/evr.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/evr.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/evr.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/exdisp.h b/lib/libc/include/any-windows-any/exdisp.h index 3189953aa2..f56146df10 100644 --- a/lib/libc/include/any-windows-any/exdisp.h +++ b/lib/libc/include/any-windows-any/exdisp.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/exdisp.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/exdisp.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,26 +21,41 @@ #ifndef __IWebBrowser_FWD_DEFINED__ #define __IWebBrowser_FWD_DEFINED__ typedef interface IWebBrowser IWebBrowser; +#ifdef __cplusplus +interface IWebBrowser; +#endif /* __cplusplus */ #endif #ifndef __DWebBrowserEvents_FWD_DEFINED__ #define __DWebBrowserEvents_FWD_DEFINED__ typedef interface DWebBrowserEvents DWebBrowserEvents; +#ifdef __cplusplus +interface DWebBrowserEvents; +#endif /* __cplusplus */ #endif #ifndef __IWebBrowserApp_FWD_DEFINED__ #define __IWebBrowserApp_FWD_DEFINED__ typedef interface IWebBrowserApp IWebBrowserApp; +#ifdef __cplusplus +interface IWebBrowserApp; +#endif /* __cplusplus */ #endif #ifndef __IWebBrowser2_FWD_DEFINED__ #define __IWebBrowser2_FWD_DEFINED__ typedef interface IWebBrowser2 IWebBrowser2; +#ifdef __cplusplus +interface IWebBrowser2; +#endif /* __cplusplus */ #endif #ifndef __DWebBrowserEvents2_FWD_DEFINED__ #define __DWebBrowserEvents2_FWD_DEFINED__ typedef interface DWebBrowserEvents2 DWebBrowserEvents2; +#ifdef __cplusplus +interface DWebBrowserEvents2; +#endif /* __cplusplus */ #endif #ifndef __WebBrowser_V1_FWD_DEFINED__ @@ -81,11 +97,17 @@ typedef struct ShellBrowserWindow ShellBrowserWindow; #ifndef __DShellWindowsEvents_FWD_DEFINED__ #define __DShellWindowsEvents_FWD_DEFINED__ typedef interface DShellWindowsEvents DShellWindowsEvents; +#ifdef __cplusplus +interface DShellWindowsEvents; +#endif /* __cplusplus */ #endif #ifndef __IShellWindows_FWD_DEFINED__ #define __IShellWindows_FWD_DEFINED__ typedef interface IShellWindows IShellWindows; +#ifdef __cplusplus +interface IShellWindows; +#endif /* __cplusplus */ #endif #ifndef __ShellWindows_FWD_DEFINED__ @@ -100,11 +122,17 @@ typedef struct ShellWindows ShellWindows; #ifndef __IShellUIHelper_FWD_DEFINED__ #define __IShellUIHelper_FWD_DEFINED__ typedef interface IShellUIHelper IShellUIHelper; +#ifdef __cplusplus +interface IShellUIHelper; +#endif /* __cplusplus */ #endif #ifndef __IShellUIHelper2_FWD_DEFINED__ #define __IShellUIHelper2_FWD_DEFINED__ typedef interface IShellUIHelper2 IShellUIHelper2; +#ifdef __cplusplus +interface IShellUIHelper2; +#endif /* __cplusplus */ #endif #ifndef __ShellUIHelper_FWD_DEFINED__ @@ -119,16 +147,25 @@ typedef struct ShellUIHelper ShellUIHelper; #ifndef __DShellNameSpaceEvents_FWD_DEFINED__ #define __DShellNameSpaceEvents_FWD_DEFINED__ typedef interface DShellNameSpaceEvents DShellNameSpaceEvents; +#ifdef __cplusplus +interface DShellNameSpaceEvents; +#endif /* __cplusplus */ #endif #ifndef __IShellFavoritesNameSpace_FWD_DEFINED__ #define __IShellFavoritesNameSpace_FWD_DEFINED__ typedef interface IShellFavoritesNameSpace IShellFavoritesNameSpace; +#ifdef __cplusplus +interface IShellFavoritesNameSpace; +#endif /* __cplusplus */ #endif #ifndef __IShellNameSpace_FWD_DEFINED__ #define __IShellNameSpace_FWD_DEFINED__ typedef interface IShellNameSpace IShellNameSpace; +#ifdef __cplusplus +interface IShellNameSpace; +#endif /* __cplusplus */ #endif #ifndef __ShellShellNameSpace_FWD_DEFINED__ @@ -152,6 +189,9 @@ typedef struct ShellNameSpace ShellNameSpace; #ifndef __IScriptErrorList_FWD_DEFINED__ #define __IScriptErrorList_FWD_DEFINED__ typedef interface IScriptErrorList IScriptErrorList; +#ifdef __cplusplus +interface IScriptErrorList; +#endif /* __cplusplus */ #endif #ifndef __CScriptErrorList_FWD_DEFINED__ @@ -166,31 +206,49 @@ typedef struct CScriptErrorList CScriptErrorList; #ifndef __ISearch_FWD_DEFINED__ #define __ISearch_FWD_DEFINED__ typedef interface ISearch ISearch; +#ifdef __cplusplus +interface ISearch; +#endif /* __cplusplus */ #endif #ifndef __ISearches_FWD_DEFINED__ #define __ISearches_FWD_DEFINED__ typedef interface ISearches ISearches; +#ifdef __cplusplus +interface ISearches; +#endif /* __cplusplus */ #endif #ifndef __ISearchAssistantOC_FWD_DEFINED__ #define __ISearchAssistantOC_FWD_DEFINED__ typedef interface ISearchAssistantOC ISearchAssistantOC; +#ifdef __cplusplus +interface ISearchAssistantOC; +#endif /* __cplusplus */ #endif #ifndef __ISearchAssistantOC2_FWD_DEFINED__ #define __ISearchAssistantOC2_FWD_DEFINED__ typedef interface ISearchAssistantOC2 ISearchAssistantOC2; +#ifdef __cplusplus +interface ISearchAssistantOC2; +#endif /* __cplusplus */ #endif #ifndef __ISearchAssistantOC3_FWD_DEFINED__ #define __ISearchAssistantOC3_FWD_DEFINED__ typedef interface ISearchAssistantOC3 ISearchAssistantOC3; +#ifdef __cplusplus +interface ISearchAssistantOC3; +#endif /* __cplusplus */ #endif #ifndef ___SearchAssistantEvents_FWD_DEFINED__ #define ___SearchAssistantEvents_FWD_DEFINED__ typedef interface _SearchAssistantEvents _SearchAssistantEvents; +#ifdef __cplusplus +interface _SearchAssistantEvents; +#endif /* __cplusplus */ #endif #ifndef __ShellSearchAssistantOC_FWD_DEFINED__ @@ -341,29 +399,29 @@ typedef struct IWebBrowserVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWebBrowser* This, + IWebBrowser *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWebBrowser* This); + IWebBrowser *This); ULONG (STDMETHODCALLTYPE *Release)( - IWebBrowser* This); + IWebBrowser *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWebBrowser* This, + IWebBrowser *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWebBrowser* This, + IWebBrowser *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWebBrowser* This, + IWebBrowser *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -371,7 +429,7 @@ typedef struct IWebBrowserVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWebBrowser* This, + IWebBrowser *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -383,19 +441,19 @@ typedef struct IWebBrowserVtbl { /*** IWebBrowser methods ***/ HRESULT (STDMETHODCALLTYPE *GoBack)( - IWebBrowser* This); + IWebBrowser *This); HRESULT (STDMETHODCALLTYPE *GoForward)( - IWebBrowser* This); + IWebBrowser *This); HRESULT (STDMETHODCALLTYPE *GoHome)( - IWebBrowser* This); + IWebBrowser *This); HRESULT (STDMETHODCALLTYPE *GoSearch)( - IWebBrowser* This); + IWebBrowser *This); HRESULT (STDMETHODCALLTYPE *Navigate)( - IWebBrowser* This, + IWebBrowser *This, BSTR URL, VARIANT *Flags, VARIANT *TargetFrameName, @@ -403,85 +461,86 @@ typedef struct IWebBrowserVtbl { VARIANT *Headers); HRESULT (STDMETHODCALLTYPE *Refresh)( - IWebBrowser* This); + IWebBrowser *This); HRESULT (STDMETHODCALLTYPE *Refresh2)( - IWebBrowser* This, + IWebBrowser *This, VARIANT *Level); HRESULT (STDMETHODCALLTYPE *Stop)( - IWebBrowser* This); + IWebBrowser *This); HRESULT (STDMETHODCALLTYPE *get_Application)( - IWebBrowser* This, + IWebBrowser *This, IDispatch **ppDisp); HRESULT (STDMETHODCALLTYPE *get_Parent)( - IWebBrowser* This, + IWebBrowser *This, IDispatch **ppDisp); HRESULT (STDMETHODCALLTYPE *get_Container)( - IWebBrowser* This, + IWebBrowser *This, IDispatch **ppDisp); HRESULT (STDMETHODCALLTYPE *get_Document)( - IWebBrowser* This, + IWebBrowser *This, IDispatch **ppDisp); HRESULT (STDMETHODCALLTYPE *get_TopLevelContainer)( - IWebBrowser* This, + IWebBrowser *This, VARIANT_BOOL *pBool); HRESULT (STDMETHODCALLTYPE *get_Type)( - IWebBrowser* This, + IWebBrowser *This, BSTR *Type); HRESULT (STDMETHODCALLTYPE *get_Left)( - IWebBrowser* This, + IWebBrowser *This, LONG *pl); HRESULT (STDMETHODCALLTYPE *put_Left)( - IWebBrowser* This, + IWebBrowser *This, LONG Left); HRESULT (STDMETHODCALLTYPE *get_Top)( - IWebBrowser* This, + IWebBrowser *This, LONG *pl); HRESULT (STDMETHODCALLTYPE *put_Top)( - IWebBrowser* This, + IWebBrowser *This, LONG Top); HRESULT (STDMETHODCALLTYPE *get_Width)( - IWebBrowser* This, + IWebBrowser *This, LONG *pl); HRESULT (STDMETHODCALLTYPE *put_Width)( - IWebBrowser* This, + IWebBrowser *This, LONG Width); HRESULT (STDMETHODCALLTYPE *get_Height)( - IWebBrowser* This, + IWebBrowser *This, LONG *pl); HRESULT (STDMETHODCALLTYPE *put_Height)( - IWebBrowser* This, + IWebBrowser *This, LONG Height); HRESULT (STDMETHODCALLTYPE *get_LocationName)( - IWebBrowser* This, + IWebBrowser *This, BSTR *LocationName); HRESULT (STDMETHODCALLTYPE *get_LocationURL)( - IWebBrowser* This, + IWebBrowser *This, BSTR *LocationURL); HRESULT (STDMETHODCALLTYPE *get_Busy)( - IWebBrowser* This, + IWebBrowser *This, VARIANT_BOOL *pBool); END_INTERFACE } IWebBrowserVtbl; + interface IWebBrowser { CONST_VTBL IWebBrowserVtbl* lpVtbl; }; @@ -628,204 +687,6 @@ static FORCEINLINE HRESULT IWebBrowser_get_Busy(IWebBrowser* This,VARIANT_BOOL * #endif -HRESULT STDMETHODCALLTYPE IWebBrowser_GoBack_Proxy( - IWebBrowser* This); -void __RPC_STUB IWebBrowser_GoBack_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser_GoForward_Proxy( - IWebBrowser* This); -void __RPC_STUB IWebBrowser_GoForward_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser_GoHome_Proxy( - IWebBrowser* This); -void __RPC_STUB IWebBrowser_GoHome_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser_GoSearch_Proxy( - IWebBrowser* This); -void __RPC_STUB IWebBrowser_GoSearch_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser_Navigate_Proxy( - IWebBrowser* This, - BSTR URL, - VARIANT *Flags, - VARIANT *TargetFrameName, - VARIANT *PostData, - VARIANT *Headers); -void __RPC_STUB IWebBrowser_Navigate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser_Refresh_Proxy( - IWebBrowser* This); -void __RPC_STUB IWebBrowser_Refresh_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser_Refresh2_Proxy( - IWebBrowser* This, - VARIANT *Level); -void __RPC_STUB IWebBrowser_Refresh2_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser_Stop_Proxy( - IWebBrowser* This); -void __RPC_STUB IWebBrowser_Stop_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser_get_Application_Proxy( - IWebBrowser* This, - IDispatch **ppDisp); -void __RPC_STUB IWebBrowser_get_Application_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser_get_Parent_Proxy( - IWebBrowser* This, - IDispatch **ppDisp); -void __RPC_STUB IWebBrowser_get_Parent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser_get_Container_Proxy( - IWebBrowser* This, - IDispatch **ppDisp); -void __RPC_STUB IWebBrowser_get_Container_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser_get_Document_Proxy( - IWebBrowser* This, - IDispatch **ppDisp); -void __RPC_STUB IWebBrowser_get_Document_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser_get_TopLevelContainer_Proxy( - IWebBrowser* This, - VARIANT_BOOL *pBool); -void __RPC_STUB IWebBrowser_get_TopLevelContainer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser_get_Type_Proxy( - IWebBrowser* This, - BSTR *Type); -void __RPC_STUB IWebBrowser_get_Type_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser_get_Left_Proxy( - IWebBrowser* This, - LONG *pl); -void __RPC_STUB IWebBrowser_get_Left_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser_put_Left_Proxy( - IWebBrowser* This, - LONG Left); -void __RPC_STUB IWebBrowser_put_Left_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser_get_Top_Proxy( - IWebBrowser* This, - LONG *pl); -void __RPC_STUB IWebBrowser_get_Top_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser_put_Top_Proxy( - IWebBrowser* This, - LONG Top); -void __RPC_STUB IWebBrowser_put_Top_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser_get_Width_Proxy( - IWebBrowser* This, - LONG *pl); -void __RPC_STUB IWebBrowser_get_Width_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser_put_Width_Proxy( - IWebBrowser* This, - LONG Width); -void __RPC_STUB IWebBrowser_put_Width_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser_get_Height_Proxy( - IWebBrowser* This, - LONG *pl); -void __RPC_STUB IWebBrowser_get_Height_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser_put_Height_Proxy( - IWebBrowser* This, - LONG Height); -void __RPC_STUB IWebBrowser_put_Height_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser_get_LocationName_Proxy( - IWebBrowser* This, - BSTR *LocationName); -void __RPC_STUB IWebBrowser_get_LocationName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser_get_LocationURL_Proxy( - IWebBrowser* This, - BSTR *LocationURL); -void __RPC_STUB IWebBrowser_get_LocationURL_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser_get_Busy_Proxy( - IWebBrowser* This, - VARIANT_BOOL *pBool); -void __RPC_STUB IWebBrowser_get_Busy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWebBrowser_INTERFACE_DEFINED__ */ @@ -850,29 +711,29 @@ typedef struct DWebBrowserEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - DWebBrowserEvents* This, + DWebBrowserEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - DWebBrowserEvents* This); + DWebBrowserEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - DWebBrowserEvents* This); + DWebBrowserEvents *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - DWebBrowserEvents* This, + DWebBrowserEvents *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - DWebBrowserEvents* This, + DWebBrowserEvents *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - DWebBrowserEvents* This, + DWebBrowserEvents *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -880,7 +741,7 @@ typedef struct DWebBrowserEventsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - DWebBrowserEvents* This, + DWebBrowserEvents *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -892,6 +753,7 @@ typedef struct DWebBrowserEventsVtbl { END_INTERFACE } DWebBrowserEventsVtbl; + interface DWebBrowserEvents { CONST_VTBL DWebBrowserEventsVtbl* lpVtbl; }; @@ -1027,29 +889,29 @@ typedef struct IWebBrowserAppVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWebBrowserApp* This, + IWebBrowserApp *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWebBrowserApp* This); + IWebBrowserApp *This); ULONG (STDMETHODCALLTYPE *Release)( - IWebBrowserApp* This); + IWebBrowserApp *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWebBrowserApp* This, + IWebBrowserApp *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWebBrowserApp* This, + IWebBrowserApp *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWebBrowserApp* This, + IWebBrowserApp *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1057,7 +919,7 @@ typedef struct IWebBrowserAppVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWebBrowserApp* This, + IWebBrowserApp *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1069,19 +931,19 @@ typedef struct IWebBrowserAppVtbl { /*** IWebBrowser methods ***/ HRESULT (STDMETHODCALLTYPE *GoBack)( - IWebBrowserApp* This); + IWebBrowserApp *This); HRESULT (STDMETHODCALLTYPE *GoForward)( - IWebBrowserApp* This); + IWebBrowserApp *This); HRESULT (STDMETHODCALLTYPE *GoHome)( - IWebBrowserApp* This); + IWebBrowserApp *This); HRESULT (STDMETHODCALLTYPE *GoSearch)( - IWebBrowserApp* This); + IWebBrowserApp *This); HRESULT (STDMETHODCALLTYPE *Navigate)( - IWebBrowserApp* This, + IWebBrowserApp *This, BSTR URL, VARIANT *Flags, VARIANT *TargetFrameName, @@ -1089,168 +951,169 @@ typedef struct IWebBrowserAppVtbl { VARIANT *Headers); HRESULT (STDMETHODCALLTYPE *Refresh)( - IWebBrowserApp* This); + IWebBrowserApp *This); HRESULT (STDMETHODCALLTYPE *Refresh2)( - IWebBrowserApp* This, + IWebBrowserApp *This, VARIANT *Level); HRESULT (STDMETHODCALLTYPE *Stop)( - IWebBrowserApp* This); + IWebBrowserApp *This); HRESULT (STDMETHODCALLTYPE *get_Application)( - IWebBrowserApp* This, + IWebBrowserApp *This, IDispatch **ppDisp); HRESULT (STDMETHODCALLTYPE *get_Parent)( - IWebBrowserApp* This, + IWebBrowserApp *This, IDispatch **ppDisp); HRESULT (STDMETHODCALLTYPE *get_Container)( - IWebBrowserApp* This, + IWebBrowserApp *This, IDispatch **ppDisp); HRESULT (STDMETHODCALLTYPE *get_Document)( - IWebBrowserApp* This, + IWebBrowserApp *This, IDispatch **ppDisp); HRESULT (STDMETHODCALLTYPE *get_TopLevelContainer)( - IWebBrowserApp* This, + IWebBrowserApp *This, VARIANT_BOOL *pBool); HRESULT (STDMETHODCALLTYPE *get_Type)( - IWebBrowserApp* This, + IWebBrowserApp *This, BSTR *Type); HRESULT (STDMETHODCALLTYPE *get_Left)( - IWebBrowserApp* This, + IWebBrowserApp *This, LONG *pl); HRESULT (STDMETHODCALLTYPE *put_Left)( - IWebBrowserApp* This, + IWebBrowserApp *This, LONG Left); HRESULT (STDMETHODCALLTYPE *get_Top)( - IWebBrowserApp* This, + IWebBrowserApp *This, LONG *pl); HRESULT (STDMETHODCALLTYPE *put_Top)( - IWebBrowserApp* This, + IWebBrowserApp *This, LONG Top); HRESULT (STDMETHODCALLTYPE *get_Width)( - IWebBrowserApp* This, + IWebBrowserApp *This, LONG *pl); HRESULT (STDMETHODCALLTYPE *put_Width)( - IWebBrowserApp* This, + IWebBrowserApp *This, LONG Width); HRESULT (STDMETHODCALLTYPE *get_Height)( - IWebBrowserApp* This, + IWebBrowserApp *This, LONG *pl); HRESULT (STDMETHODCALLTYPE *put_Height)( - IWebBrowserApp* This, + IWebBrowserApp *This, LONG Height); HRESULT (STDMETHODCALLTYPE *get_LocationName)( - IWebBrowserApp* This, + IWebBrowserApp *This, BSTR *LocationName); HRESULT (STDMETHODCALLTYPE *get_LocationURL)( - IWebBrowserApp* This, + IWebBrowserApp *This, BSTR *LocationURL); HRESULT (STDMETHODCALLTYPE *get_Busy)( - IWebBrowserApp* This, + IWebBrowserApp *This, VARIANT_BOOL *pBool); /*** IWebBrowserApp methods ***/ HRESULT (STDMETHODCALLTYPE *Quit)( - IWebBrowserApp* This); + IWebBrowserApp *This); HRESULT (STDMETHODCALLTYPE *ClientToWindow)( - IWebBrowserApp* This, + IWebBrowserApp *This, int *pcx, int *pcy); HRESULT (STDMETHODCALLTYPE *PutProperty)( - IWebBrowserApp* This, + IWebBrowserApp *This, BSTR Property, VARIANT vtValue); HRESULT (STDMETHODCALLTYPE *GetProperty)( - IWebBrowserApp* This, + IWebBrowserApp *This, BSTR Property, VARIANT *pvtValue); HRESULT (STDMETHODCALLTYPE *get_Name)( - IWebBrowserApp* This, + IWebBrowserApp *This, BSTR *Name); HRESULT (STDMETHODCALLTYPE *get_HWND)( - IWebBrowserApp* This, + IWebBrowserApp *This, SHANDLE_PTR *pHWND); HRESULT (STDMETHODCALLTYPE *get_FullName)( - IWebBrowserApp* This, + IWebBrowserApp *This, BSTR *FullName); HRESULT (STDMETHODCALLTYPE *get_Path)( - IWebBrowserApp* This, + IWebBrowserApp *This, BSTR *Path); HRESULT (STDMETHODCALLTYPE *get_Visible)( - IWebBrowserApp* This, + IWebBrowserApp *This, VARIANT_BOOL *pBool); HRESULT (STDMETHODCALLTYPE *put_Visible)( - IWebBrowserApp* This, + IWebBrowserApp *This, VARIANT_BOOL Value); HRESULT (STDMETHODCALLTYPE *get_StatusBar)( - IWebBrowserApp* This, + IWebBrowserApp *This, VARIANT_BOOL *pBool); HRESULT (STDMETHODCALLTYPE *put_StatusBar)( - IWebBrowserApp* This, + IWebBrowserApp *This, VARIANT_BOOL Value); HRESULT (STDMETHODCALLTYPE *get_StatusText)( - IWebBrowserApp* This, + IWebBrowserApp *This, BSTR *StatusText); HRESULT (STDMETHODCALLTYPE *put_StatusText)( - IWebBrowserApp* This, + IWebBrowserApp *This, BSTR StatusText); HRESULT (STDMETHODCALLTYPE *get_ToolBar)( - IWebBrowserApp* This, + IWebBrowserApp *This, int *Value); HRESULT (STDMETHODCALLTYPE *put_ToolBar)( - IWebBrowserApp* This, + IWebBrowserApp *This, int Value); HRESULT (STDMETHODCALLTYPE *get_MenuBar)( - IWebBrowserApp* This, + IWebBrowserApp *This, VARIANT_BOOL *Value); HRESULT (STDMETHODCALLTYPE *put_MenuBar)( - IWebBrowserApp* This, + IWebBrowserApp *This, VARIANT_BOOL Value); HRESULT (STDMETHODCALLTYPE *get_FullScreen)( - IWebBrowserApp* This, + IWebBrowserApp *This, VARIANT_BOOL *pbFullScreen); HRESULT (STDMETHODCALLTYPE *put_FullScreen)( - IWebBrowserApp* This, + IWebBrowserApp *This, VARIANT_BOOL bFullScreen); END_INTERFACE } IWebBrowserAppVtbl; + interface IWebBrowserApp { CONST_VTBL IWebBrowserAppVtbl* lpVtbl; }; @@ -1479,168 +1342,6 @@ static FORCEINLINE HRESULT IWebBrowserApp_put_FullScreen(IWebBrowserApp* This,VA #endif -HRESULT STDMETHODCALLTYPE IWebBrowserApp_Quit_Proxy( - IWebBrowserApp* This); -void __RPC_STUB IWebBrowserApp_Quit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowserApp_ClientToWindow_Proxy( - IWebBrowserApp* This, - int *pcx, - int *pcy); -void __RPC_STUB IWebBrowserApp_ClientToWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowserApp_PutProperty_Proxy( - IWebBrowserApp* This, - BSTR Property, - VARIANT vtValue); -void __RPC_STUB IWebBrowserApp_PutProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowserApp_GetProperty_Proxy( - IWebBrowserApp* This, - BSTR Property, - VARIANT *pvtValue); -void __RPC_STUB IWebBrowserApp_GetProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowserApp_get_Name_Proxy( - IWebBrowserApp* This, - BSTR *Name); -void __RPC_STUB IWebBrowserApp_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowserApp_get_HWND_Proxy( - IWebBrowserApp* This, - SHANDLE_PTR *pHWND); -void __RPC_STUB IWebBrowserApp_get_HWND_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowserApp_get_FullName_Proxy( - IWebBrowserApp* This, - BSTR *FullName); -void __RPC_STUB IWebBrowserApp_get_FullName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowserApp_get_Path_Proxy( - IWebBrowserApp* This, - BSTR *Path); -void __RPC_STUB IWebBrowserApp_get_Path_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowserApp_get_Visible_Proxy( - IWebBrowserApp* This, - VARIANT_BOOL *pBool); -void __RPC_STUB IWebBrowserApp_get_Visible_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowserApp_put_Visible_Proxy( - IWebBrowserApp* This, - VARIANT_BOOL Value); -void __RPC_STUB IWebBrowserApp_put_Visible_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowserApp_get_StatusBar_Proxy( - IWebBrowserApp* This, - VARIANT_BOOL *pBool); -void __RPC_STUB IWebBrowserApp_get_StatusBar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowserApp_put_StatusBar_Proxy( - IWebBrowserApp* This, - VARIANT_BOOL Value); -void __RPC_STUB IWebBrowserApp_put_StatusBar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowserApp_get_StatusText_Proxy( - IWebBrowserApp* This, - BSTR *StatusText); -void __RPC_STUB IWebBrowserApp_get_StatusText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowserApp_put_StatusText_Proxy( - IWebBrowserApp* This, - BSTR StatusText); -void __RPC_STUB IWebBrowserApp_put_StatusText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowserApp_get_ToolBar_Proxy( - IWebBrowserApp* This, - int *Value); -void __RPC_STUB IWebBrowserApp_get_ToolBar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowserApp_put_ToolBar_Proxy( - IWebBrowserApp* This, - int Value); -void __RPC_STUB IWebBrowserApp_put_ToolBar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowserApp_get_MenuBar_Proxy( - IWebBrowserApp* This, - VARIANT_BOOL *Value); -void __RPC_STUB IWebBrowserApp_get_MenuBar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowserApp_put_MenuBar_Proxy( - IWebBrowserApp* This, - VARIANT_BOOL Value); -void __RPC_STUB IWebBrowserApp_put_MenuBar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowserApp_get_FullScreen_Proxy( - IWebBrowserApp* This, - VARIANT_BOOL *pbFullScreen); -void __RPC_STUB IWebBrowserApp_get_FullScreen_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowserApp_put_FullScreen_Proxy( - IWebBrowserApp* This, - VARIANT_BOOL bFullScreen); -void __RPC_STUB IWebBrowserApp_put_FullScreen_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWebBrowserApp_INTERFACE_DEFINED__ */ @@ -1732,29 +1433,29 @@ typedef struct IWebBrowser2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWebBrowser2* This, + IWebBrowser2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWebBrowser2* This); + IWebBrowser2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IWebBrowser2* This); + IWebBrowser2 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWebBrowser2* This, + IWebBrowser2 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWebBrowser2* This, + IWebBrowser2 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWebBrowser2* This, + IWebBrowser2 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1762,7 +1463,7 @@ typedef struct IWebBrowser2Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWebBrowser2* This, + IWebBrowser2 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1774,19 +1475,19 @@ typedef struct IWebBrowser2Vtbl { /*** IWebBrowser methods ***/ HRESULT (STDMETHODCALLTYPE *GoBack)( - IWebBrowser2* This); + IWebBrowser2 *This); HRESULT (STDMETHODCALLTYPE *GoForward)( - IWebBrowser2* This); + IWebBrowser2 *This); HRESULT (STDMETHODCALLTYPE *GoHome)( - IWebBrowser2* This); + IWebBrowser2 *This); HRESULT (STDMETHODCALLTYPE *GoSearch)( - IWebBrowser2* This); + IWebBrowser2 *This); HRESULT (STDMETHODCALLTYPE *Navigate)( - IWebBrowser2* This, + IWebBrowser2 *This, BSTR URL, VARIANT *Flags, VARIANT *TargetFrameName, @@ -1794,169 +1495,169 @@ typedef struct IWebBrowser2Vtbl { VARIANT *Headers); HRESULT (STDMETHODCALLTYPE *Refresh)( - IWebBrowser2* This); + IWebBrowser2 *This); HRESULT (STDMETHODCALLTYPE *Refresh2)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT *Level); HRESULT (STDMETHODCALLTYPE *Stop)( - IWebBrowser2* This); + IWebBrowser2 *This); HRESULT (STDMETHODCALLTYPE *get_Application)( - IWebBrowser2* This, + IWebBrowser2 *This, IDispatch **ppDisp); HRESULT (STDMETHODCALLTYPE *get_Parent)( - IWebBrowser2* This, + IWebBrowser2 *This, IDispatch **ppDisp); HRESULT (STDMETHODCALLTYPE *get_Container)( - IWebBrowser2* This, + IWebBrowser2 *This, IDispatch **ppDisp); HRESULT (STDMETHODCALLTYPE *get_Document)( - IWebBrowser2* This, + IWebBrowser2 *This, IDispatch **ppDisp); HRESULT (STDMETHODCALLTYPE *get_TopLevelContainer)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT_BOOL *pBool); HRESULT (STDMETHODCALLTYPE *get_Type)( - IWebBrowser2* This, + IWebBrowser2 *This, BSTR *Type); HRESULT (STDMETHODCALLTYPE *get_Left)( - IWebBrowser2* This, + IWebBrowser2 *This, LONG *pl); HRESULT (STDMETHODCALLTYPE *put_Left)( - IWebBrowser2* This, + IWebBrowser2 *This, LONG Left); HRESULT (STDMETHODCALLTYPE *get_Top)( - IWebBrowser2* This, + IWebBrowser2 *This, LONG *pl); HRESULT (STDMETHODCALLTYPE *put_Top)( - IWebBrowser2* This, + IWebBrowser2 *This, LONG Top); HRESULT (STDMETHODCALLTYPE *get_Width)( - IWebBrowser2* This, + IWebBrowser2 *This, LONG *pl); HRESULT (STDMETHODCALLTYPE *put_Width)( - IWebBrowser2* This, + IWebBrowser2 *This, LONG Width); HRESULT (STDMETHODCALLTYPE *get_Height)( - IWebBrowser2* This, + IWebBrowser2 *This, LONG *pl); HRESULT (STDMETHODCALLTYPE *put_Height)( - IWebBrowser2* This, + IWebBrowser2 *This, LONG Height); HRESULT (STDMETHODCALLTYPE *get_LocationName)( - IWebBrowser2* This, + IWebBrowser2 *This, BSTR *LocationName); HRESULT (STDMETHODCALLTYPE *get_LocationURL)( - IWebBrowser2* This, + IWebBrowser2 *This, BSTR *LocationURL); HRESULT (STDMETHODCALLTYPE *get_Busy)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT_BOOL *pBool); /*** IWebBrowserApp methods ***/ HRESULT (STDMETHODCALLTYPE *Quit)( - IWebBrowser2* This); + IWebBrowser2 *This); HRESULT (STDMETHODCALLTYPE *ClientToWindow)( - IWebBrowser2* This, + IWebBrowser2 *This, int *pcx, int *pcy); HRESULT (STDMETHODCALLTYPE *PutProperty)( - IWebBrowser2* This, + IWebBrowser2 *This, BSTR Property, VARIANT vtValue); HRESULT (STDMETHODCALLTYPE *GetProperty)( - IWebBrowser2* This, + IWebBrowser2 *This, BSTR Property, VARIANT *pvtValue); HRESULT (STDMETHODCALLTYPE *get_Name)( - IWebBrowser2* This, + IWebBrowser2 *This, BSTR *Name); HRESULT (STDMETHODCALLTYPE *get_HWND)( - IWebBrowser2* This, + IWebBrowser2 *This, SHANDLE_PTR *pHWND); HRESULT (STDMETHODCALLTYPE *get_FullName)( - IWebBrowser2* This, + IWebBrowser2 *This, BSTR *FullName); HRESULT (STDMETHODCALLTYPE *get_Path)( - IWebBrowser2* This, + IWebBrowser2 *This, BSTR *Path); HRESULT (STDMETHODCALLTYPE *get_Visible)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT_BOOL *pBool); HRESULT (STDMETHODCALLTYPE *put_Visible)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT_BOOL Value); HRESULT (STDMETHODCALLTYPE *get_StatusBar)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT_BOOL *pBool); HRESULT (STDMETHODCALLTYPE *put_StatusBar)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT_BOOL Value); HRESULT (STDMETHODCALLTYPE *get_StatusText)( - IWebBrowser2* This, + IWebBrowser2 *This, BSTR *StatusText); HRESULT (STDMETHODCALLTYPE *put_StatusText)( - IWebBrowser2* This, + IWebBrowser2 *This, BSTR StatusText); HRESULT (STDMETHODCALLTYPE *get_ToolBar)( - IWebBrowser2* This, + IWebBrowser2 *This, int *Value); HRESULT (STDMETHODCALLTYPE *put_ToolBar)( - IWebBrowser2* This, + IWebBrowser2 *This, int Value); HRESULT (STDMETHODCALLTYPE *get_MenuBar)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT_BOOL *Value); HRESULT (STDMETHODCALLTYPE *put_MenuBar)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT_BOOL Value); HRESULT (STDMETHODCALLTYPE *get_FullScreen)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT_BOOL *pbFullScreen); HRESULT (STDMETHODCALLTYPE *put_FullScreen)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT_BOOL bFullScreen); /*** IWebBrowser2 methods ***/ HRESULT (STDMETHODCALLTYPE *Navigate2)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT *URL, VARIANT *Flags, VARIANT *TargetFrameName, @@ -1964,85 +1665,86 @@ typedef struct IWebBrowser2Vtbl { VARIANT *Headers); HRESULT (STDMETHODCALLTYPE *QueryStatusWB)( - IWebBrowser2* This, + IWebBrowser2 *This, OLECMDID cmdID, OLECMDF *pcmdf); HRESULT (STDMETHODCALLTYPE *ExecWB)( - IWebBrowser2* This, + IWebBrowser2 *This, OLECMDID cmdID, OLECMDEXECOPT cmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); HRESULT (STDMETHODCALLTYPE *ShowBrowserBar)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT *pvaClsid, VARIANT *pvarShow, VARIANT *pvarSize); HRESULT (STDMETHODCALLTYPE *get_ReadyState)( - IWebBrowser2* This, + IWebBrowser2 *This, READYSTATE *plReadyState); HRESULT (STDMETHODCALLTYPE *get_Offline)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT_BOOL *pbOffline); HRESULT (STDMETHODCALLTYPE *put_Offline)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT_BOOL bOffline); HRESULT (STDMETHODCALLTYPE *get_Silent)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT_BOOL *pbSilent); HRESULT (STDMETHODCALLTYPE *put_Silent)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT_BOOL bSilent); HRESULT (STDMETHODCALLTYPE *get_RegisterAsBrowser)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT_BOOL *pbRegister); HRESULT (STDMETHODCALLTYPE *put_RegisterAsBrowser)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT_BOOL bRegister); HRESULT (STDMETHODCALLTYPE *get_RegisterAsDropTarget)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT_BOOL *pbRegister); HRESULT (STDMETHODCALLTYPE *put_RegisterAsDropTarget)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT_BOOL bRegister); HRESULT (STDMETHODCALLTYPE *get_TheaterMode)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT_BOOL *pbRegister); HRESULT (STDMETHODCALLTYPE *put_TheaterMode)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT_BOOL bRegister); HRESULT (STDMETHODCALLTYPE *get_AddressBar)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT_BOOL *Value); HRESULT (STDMETHODCALLTYPE *put_AddressBar)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT_BOOL Value); HRESULT (STDMETHODCALLTYPE *get_Resizable)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT_BOOL *Value); HRESULT (STDMETHODCALLTYPE *put_Resizable)( - IWebBrowser2* This, + IWebBrowser2 *This, VARIANT_BOOL Value); END_INTERFACE } IWebBrowser2Vtbl; + interface IWebBrowser2 { CONST_VTBL IWebBrowser2Vtbl* lpVtbl; }; @@ -2349,168 +2051,6 @@ static FORCEINLINE HRESULT IWebBrowser2_put_Resizable(IWebBrowser2* This,VARIANT #endif -HRESULT STDMETHODCALLTYPE IWebBrowser2_Navigate2_Proxy( - IWebBrowser2* This, - VARIANT *URL, - VARIANT *Flags, - VARIANT *TargetFrameName, - VARIANT *PostData, - VARIANT *Headers); -void __RPC_STUB IWebBrowser2_Navigate2_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser2_QueryStatusWB_Proxy( - IWebBrowser2* This, - OLECMDID cmdID, - OLECMDF *pcmdf); -void __RPC_STUB IWebBrowser2_QueryStatusWB_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser2_ExecWB_Proxy( - IWebBrowser2* This, - OLECMDID cmdID, - OLECMDEXECOPT cmdexecopt, - VARIANT *pvaIn, - VARIANT *pvaOut); -void __RPC_STUB IWebBrowser2_ExecWB_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser2_ShowBrowserBar_Proxy( - IWebBrowser2* This, - VARIANT *pvaClsid, - VARIANT *pvarShow, - VARIANT *pvarSize); -void __RPC_STUB IWebBrowser2_ShowBrowserBar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser2_get_ReadyState_Proxy( - IWebBrowser2* This, - READYSTATE *plReadyState); -void __RPC_STUB IWebBrowser2_get_ReadyState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser2_get_Offline_Proxy( - IWebBrowser2* This, - VARIANT_BOOL *pbOffline); -void __RPC_STUB IWebBrowser2_get_Offline_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser2_put_Offline_Proxy( - IWebBrowser2* This, - VARIANT_BOOL bOffline); -void __RPC_STUB IWebBrowser2_put_Offline_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser2_get_Silent_Proxy( - IWebBrowser2* This, - VARIANT_BOOL *pbSilent); -void __RPC_STUB IWebBrowser2_get_Silent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser2_put_Silent_Proxy( - IWebBrowser2* This, - VARIANT_BOOL bSilent); -void __RPC_STUB IWebBrowser2_put_Silent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser2_get_RegisterAsBrowser_Proxy( - IWebBrowser2* This, - VARIANT_BOOL *pbRegister); -void __RPC_STUB IWebBrowser2_get_RegisterAsBrowser_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser2_put_RegisterAsBrowser_Proxy( - IWebBrowser2* This, - VARIANT_BOOL bRegister); -void __RPC_STUB IWebBrowser2_put_RegisterAsBrowser_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser2_get_RegisterAsDropTarget_Proxy( - IWebBrowser2* This, - VARIANT_BOOL *pbRegister); -void __RPC_STUB IWebBrowser2_get_RegisterAsDropTarget_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser2_put_RegisterAsDropTarget_Proxy( - IWebBrowser2* This, - VARIANT_BOOL bRegister); -void __RPC_STUB IWebBrowser2_put_RegisterAsDropTarget_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser2_get_TheaterMode_Proxy( - IWebBrowser2* This, - VARIANT_BOOL *pbRegister); -void __RPC_STUB IWebBrowser2_get_TheaterMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser2_put_TheaterMode_Proxy( - IWebBrowser2* This, - VARIANT_BOOL bRegister); -void __RPC_STUB IWebBrowser2_put_TheaterMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser2_get_AddressBar_Proxy( - IWebBrowser2* This, - VARIANT_BOOL *Value); -void __RPC_STUB IWebBrowser2_get_AddressBar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser2_put_AddressBar_Proxy( - IWebBrowser2* This, - VARIANT_BOOL Value); -void __RPC_STUB IWebBrowser2_put_AddressBar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser2_get_Resizable_Proxy( - IWebBrowser2* This, - VARIANT_BOOL *Value); -void __RPC_STUB IWebBrowser2_get_Resizable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebBrowser2_put_Resizable_Proxy( - IWebBrowser2* This, - VARIANT_BOOL Value); -void __RPC_STUB IWebBrowser2_put_Resizable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWebBrowser2_INTERFACE_DEFINED__ */ @@ -2544,29 +2084,29 @@ typedef struct DWebBrowserEvents2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - DWebBrowserEvents2* This, + DWebBrowserEvents2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - DWebBrowserEvents2* This); + DWebBrowserEvents2 *This); ULONG (STDMETHODCALLTYPE *Release)( - DWebBrowserEvents2* This); + DWebBrowserEvents2 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - DWebBrowserEvents2* This, + DWebBrowserEvents2 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - DWebBrowserEvents2* This, + DWebBrowserEvents2 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - DWebBrowserEvents2* This, + DWebBrowserEvents2 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2574,7 +2114,7 @@ typedef struct DWebBrowserEvents2Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - DWebBrowserEvents2* This, + DWebBrowserEvents2 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2586,6 +2126,7 @@ typedef struct DWebBrowserEvents2Vtbl { END_INTERFACE } DWebBrowserEvents2Vtbl; + interface DWebBrowserEvents2 { CONST_VTBL DWebBrowserEvents2Vtbl* lpVtbl; }; @@ -2717,29 +2258,29 @@ typedef struct DShellWindowsEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - DShellWindowsEvents* This, + DShellWindowsEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - DShellWindowsEvents* This); + DShellWindowsEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - DShellWindowsEvents* This); + DShellWindowsEvents *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - DShellWindowsEvents* This, + DShellWindowsEvents *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - DShellWindowsEvents* This, + DShellWindowsEvents *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - DShellWindowsEvents* This, + DShellWindowsEvents *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2747,7 +2288,7 @@ typedef struct DShellWindowsEventsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - DShellWindowsEvents* This, + DShellWindowsEvents *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2759,6 +2300,7 @@ typedef struct DShellWindowsEventsVtbl { END_INTERFACE } DShellWindowsEventsVtbl; + interface DShellWindowsEvents { CONST_VTBL DShellWindowsEventsVtbl* lpVtbl; }; @@ -2875,29 +2417,29 @@ typedef struct IShellWindowsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellWindows* This, + IShellWindows *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellWindows* This); + IShellWindows *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellWindows* This); + IShellWindows *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IShellWindows* This, + IShellWindows *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IShellWindows* This, + IShellWindows *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IShellWindows* This, + IShellWindows *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2905,7 +2447,7 @@ typedef struct IShellWindowsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IShellWindows* This, + IShellWindows *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2917,27 +2459,27 @@ typedef struct IShellWindowsVtbl { /*** IShellWindows methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - IShellWindows* This, + IShellWindows *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - IShellWindows* This, + IShellWindows *This, VARIANT index, IDispatch **Folder); HRESULT (STDMETHODCALLTYPE *_NewEnum)( - IShellWindows* This, + IShellWindows *This, IUnknown **ppunk); HRESULT (STDMETHODCALLTYPE *Register)( - IShellWindows* This, + IShellWindows *This, IDispatch *pid, LONG hWnd, int swClass, LONG *plCookie); HRESULT (STDMETHODCALLTYPE *RegisterPending)( - IShellWindows* This, + IShellWindows *This, LONG lThreadId, VARIANT *pvarloc, VARIANT *pvarlocRoot, @@ -2945,21 +2487,21 @@ typedef struct IShellWindowsVtbl { LONG *plCookie); HRESULT (STDMETHODCALLTYPE *Revoke)( - IShellWindows* This, + IShellWindows *This, LONG lCookie); HRESULT (STDMETHODCALLTYPE *OnNavigate)( - IShellWindows* This, + IShellWindows *This, LONG lCookie, VARIANT *pvarLoc); HRESULT (STDMETHODCALLTYPE *OnActivated)( - IShellWindows* This, + IShellWindows *This, LONG lCookie, VARIANT_BOOL fActive); HRESULT (STDMETHODCALLTYPE *FindWindowSW)( - IShellWindows* This, + IShellWindows *This, VARIANT *pvarLoc, VARIANT *pvarLocRoot, int swClass, @@ -2968,16 +2510,17 @@ typedef struct IShellWindowsVtbl { IDispatch **ppdispOut); HRESULT (STDMETHODCALLTYPE *OnCreated)( - IShellWindows* This, + IShellWindows *This, LONG lCookie, IUnknown *punk); HRESULT (STDMETHODCALLTYPE *ProcessAttachDetach)( - IShellWindows* This, + IShellWindows *This, VARIANT_BOOL fAttach); END_INTERFACE } IShellWindowsVtbl; + interface IShellWindows { CONST_VTBL IShellWindowsVtbl* lpVtbl; }; @@ -3068,110 +2611,6 @@ static FORCEINLINE HRESULT IShellWindows_ProcessAttachDetach(IShellWindows* This #endif -HRESULT STDMETHODCALLTYPE IShellWindows_get_Count_Proxy( - IShellWindows* This, - LONG *Count); -void __RPC_STUB IShellWindows_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellWindows_Item_Proxy( - IShellWindows* This, - VARIANT index, - IDispatch **Folder); -void __RPC_STUB IShellWindows_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellWindows__NewEnum_Proxy( - IShellWindows* This, - IUnknown **ppunk); -void __RPC_STUB IShellWindows__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellWindows_Register_Proxy( - IShellWindows* This, - IDispatch *pid, - LONG hWnd, - int swClass, - LONG *plCookie); -void __RPC_STUB IShellWindows_Register_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellWindows_RegisterPending_Proxy( - IShellWindows* This, - LONG lThreadId, - VARIANT *pvarloc, - VARIANT *pvarlocRoot, - int swClass, - LONG *plCookie); -void __RPC_STUB IShellWindows_RegisterPending_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellWindows_Revoke_Proxy( - IShellWindows* This, - LONG lCookie); -void __RPC_STUB IShellWindows_Revoke_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellWindows_OnNavigate_Proxy( - IShellWindows* This, - LONG lCookie, - VARIANT *pvarLoc); -void __RPC_STUB IShellWindows_OnNavigate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellWindows_OnActivated_Proxy( - IShellWindows* This, - LONG lCookie, - VARIANT_BOOL fActive); -void __RPC_STUB IShellWindows_OnActivated_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellWindows_FindWindowSW_Proxy( - IShellWindows* This, - VARIANT *pvarLoc, - VARIANT *pvarLocRoot, - int swClass, - LONG *phwnd, - int swfwOptions, - IDispatch **ppdispOut); -void __RPC_STUB IShellWindows_FindWindowSW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellWindows_OnCreated_Proxy( - IShellWindows* This, - LONG lCookie, - IUnknown *punk); -void __RPC_STUB IShellWindows_OnCreated_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellWindows_ProcessAttachDetach_Proxy( - IShellWindows* This, - VARIANT_BOOL fAttach); -void __RPC_STUB IShellWindows_ProcessAttachDetach_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellWindows_INTERFACE_DEFINED__ */ @@ -3262,29 +2701,29 @@ typedef struct IShellUIHelperVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellUIHelper* This, + IShellUIHelper *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellUIHelper* This); + IShellUIHelper *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellUIHelper* This); + IShellUIHelper *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IShellUIHelper* This, + IShellUIHelper *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IShellUIHelper* This, + IShellUIHelper *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IShellUIHelper* This, + IShellUIHelper *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -3292,7 +2731,7 @@ typedef struct IShellUIHelperVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IShellUIHelper* This, + IShellUIHelper *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -3304,25 +2743,25 @@ typedef struct IShellUIHelperVtbl { /*** IShellUIHelper methods ***/ HRESULT (STDMETHODCALLTYPE *ResetFirstBootMode)( - IShellUIHelper* This); + IShellUIHelper *This); HRESULT (STDMETHODCALLTYPE *ResetSafeMode)( - IShellUIHelper* This); + IShellUIHelper *This); HRESULT (STDMETHODCALLTYPE *RefreshOfflineDesktop)( - IShellUIHelper* This); + IShellUIHelper *This); HRESULT (STDMETHODCALLTYPE *AddFavorite)( - IShellUIHelper* This, + IShellUIHelper *This, BSTR URL, VARIANT *Title); HRESULT (STDMETHODCALLTYPE *AddChannel)( - IShellUIHelper* This, + IShellUIHelper *This, BSTR URL); HRESULT (STDMETHODCALLTYPE *AddDesktopComponent)( - IShellUIHelper* This, + IShellUIHelper *This, BSTR URL, BSTR Type, VARIANT *Left, @@ -3331,43 +2770,44 @@ typedef struct IShellUIHelperVtbl { VARIANT *Height); HRESULT (STDMETHODCALLTYPE *IsSubscribed)( - IShellUIHelper* This, + IShellUIHelper *This, BSTR URL, VARIANT_BOOL *pBool); HRESULT (STDMETHODCALLTYPE *NavigateAndFind)( - IShellUIHelper* This, + IShellUIHelper *This, BSTR URL, BSTR strQuery, VARIANT *varTargetFrame); HRESULT (STDMETHODCALLTYPE *ImportExportFavorites)( - IShellUIHelper* This, + IShellUIHelper *This, VARIANT_BOOL fImport, BSTR strImpExpPath); HRESULT (STDMETHODCALLTYPE *AutoCompleteSaveForm)( - IShellUIHelper* This, + IShellUIHelper *This, VARIANT *Form); HRESULT (STDMETHODCALLTYPE *AutoScan)( - IShellUIHelper* This, + IShellUIHelper *This, BSTR strSearch, BSTR strFailureUrl, VARIANT *pvarTargetFrame); HRESULT (STDMETHODCALLTYPE *AutoCompleteAttach)( - IShellUIHelper* This, + IShellUIHelper *This, VARIANT *Reserved); HRESULT (STDMETHODCALLTYPE *ShowBrowserUI)( - IShellUIHelper* This, + IShellUIHelper *This, BSTR bstrName, VARIANT *pvarIn, VARIANT *pvarOut); END_INTERFACE } IShellUIHelperVtbl; + interface IShellUIHelper { CONST_VTBL IShellUIHelperVtbl* lpVtbl; }; @@ -3466,121 +2906,6 @@ static FORCEINLINE HRESULT IShellUIHelper_ShowBrowserUI(IShellUIHelper* This,BST #endif -HRESULT STDMETHODCALLTYPE IShellUIHelper_ResetFirstBootMode_Proxy( - IShellUIHelper* This); -void __RPC_STUB IShellUIHelper_ResetFirstBootMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper_ResetSafeMode_Proxy( - IShellUIHelper* This); -void __RPC_STUB IShellUIHelper_ResetSafeMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper_RefreshOfflineDesktop_Proxy( - IShellUIHelper* This); -void __RPC_STUB IShellUIHelper_RefreshOfflineDesktop_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper_AddFavorite_Proxy( - IShellUIHelper* This, - BSTR URL, - VARIANT *Title); -void __RPC_STUB IShellUIHelper_AddFavorite_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper_AddChannel_Proxy( - IShellUIHelper* This, - BSTR URL); -void __RPC_STUB IShellUIHelper_AddChannel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper_AddDesktopComponent_Proxy( - IShellUIHelper* This, - BSTR URL, - BSTR Type, - VARIANT *Left, - VARIANT *Top, - VARIANT *Width, - VARIANT *Height); -void __RPC_STUB IShellUIHelper_AddDesktopComponent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper_IsSubscribed_Proxy( - IShellUIHelper* This, - BSTR URL, - VARIANT_BOOL *pBool); -void __RPC_STUB IShellUIHelper_IsSubscribed_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper_NavigateAndFind_Proxy( - IShellUIHelper* This, - BSTR URL, - BSTR strQuery, - VARIANT *varTargetFrame); -void __RPC_STUB IShellUIHelper_NavigateAndFind_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper_ImportExportFavorites_Proxy( - IShellUIHelper* This, - VARIANT_BOOL fImport, - BSTR strImpExpPath); -void __RPC_STUB IShellUIHelper_ImportExportFavorites_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper_AutoCompleteSaveForm_Proxy( - IShellUIHelper* This, - VARIANT *Form); -void __RPC_STUB IShellUIHelper_AutoCompleteSaveForm_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper_AutoScan_Proxy( - IShellUIHelper* This, - BSTR strSearch, - BSTR strFailureUrl, - VARIANT *pvarTargetFrame); -void __RPC_STUB IShellUIHelper_AutoScan_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper_AutoCompleteAttach_Proxy( - IShellUIHelper* This, - VARIANT *Reserved); -void __RPC_STUB IShellUIHelper_AutoCompleteAttach_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper_ShowBrowserUI_Proxy( - IShellUIHelper* This, - BSTR bstrName, - VARIANT *pvarIn, - VARIANT *pvarOut); -void __RPC_STUB IShellUIHelper_ShowBrowserUI_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellUIHelper_INTERFACE_DEFINED__ */ @@ -3656,29 +2981,29 @@ typedef struct IShellUIHelper2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellUIHelper2* This, + IShellUIHelper2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellUIHelper2* This); + IShellUIHelper2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellUIHelper2* This); + IShellUIHelper2 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IShellUIHelper2* This, + IShellUIHelper2 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IShellUIHelper2* This, + IShellUIHelper2 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IShellUIHelper2* This, + IShellUIHelper2 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -3686,7 +3011,7 @@ typedef struct IShellUIHelper2Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IShellUIHelper2* This, + IShellUIHelper2 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -3698,25 +3023,25 @@ typedef struct IShellUIHelper2Vtbl { /*** IShellUIHelper methods ***/ HRESULT (STDMETHODCALLTYPE *ResetFirstBootMode)( - IShellUIHelper2* This); + IShellUIHelper2 *This); HRESULT (STDMETHODCALLTYPE *ResetSafeMode)( - IShellUIHelper2* This); + IShellUIHelper2 *This); HRESULT (STDMETHODCALLTYPE *RefreshOfflineDesktop)( - IShellUIHelper2* This); + IShellUIHelper2 *This); HRESULT (STDMETHODCALLTYPE *AddFavorite)( - IShellUIHelper2* This, + IShellUIHelper2 *This, BSTR URL, VARIANT *Title); HRESULT (STDMETHODCALLTYPE *AddChannel)( - IShellUIHelper2* This, + IShellUIHelper2 *This, BSTR URL); HRESULT (STDMETHODCALLTYPE *AddDesktopComponent)( - IShellUIHelper2* This, + IShellUIHelper2 *This, BSTR URL, BSTR Type, VARIANT *Left, @@ -3725,107 +3050,108 @@ typedef struct IShellUIHelper2Vtbl { VARIANT *Height); HRESULT (STDMETHODCALLTYPE *IsSubscribed)( - IShellUIHelper2* This, + IShellUIHelper2 *This, BSTR URL, VARIANT_BOOL *pBool); HRESULT (STDMETHODCALLTYPE *NavigateAndFind)( - IShellUIHelper2* This, + IShellUIHelper2 *This, BSTR URL, BSTR strQuery, VARIANT *varTargetFrame); HRESULT (STDMETHODCALLTYPE *ImportExportFavorites)( - IShellUIHelper2* This, + IShellUIHelper2 *This, VARIANT_BOOL fImport, BSTR strImpExpPath); HRESULT (STDMETHODCALLTYPE *AutoCompleteSaveForm)( - IShellUIHelper2* This, + IShellUIHelper2 *This, VARIANT *Form); HRESULT (STDMETHODCALLTYPE *AutoScan)( - IShellUIHelper2* This, + IShellUIHelper2 *This, BSTR strSearch, BSTR strFailureUrl, VARIANT *pvarTargetFrame); HRESULT (STDMETHODCALLTYPE *AutoCompleteAttach)( - IShellUIHelper2* This, + IShellUIHelper2 *This, VARIANT *Reserved); HRESULT (STDMETHODCALLTYPE *ShowBrowserUI)( - IShellUIHelper2* This, + IShellUIHelper2 *This, BSTR bstrName, VARIANT *pvarIn, VARIANT *pvarOut); /*** IShellUIHelper2 methods ***/ HRESULT (STDMETHODCALLTYPE *AddSearchProvider)( - IShellUIHelper2* This, + IShellUIHelper2 *This, BSTR URL); HRESULT (STDMETHODCALLTYPE *RunOnceShown)( - IShellUIHelper2* This); + IShellUIHelper2 *This); HRESULT (STDMETHODCALLTYPE *SkipRunOnce)( - IShellUIHelper2* This); + IShellUIHelper2 *This); HRESULT (STDMETHODCALLTYPE *CustomizeSettings)( - IShellUIHelper2* This, + IShellUIHelper2 *This, VARIANT_BOOL fSQM, VARIANT_BOOL fPhishing, BSTR bstrLocale); HRESULT (STDMETHODCALLTYPE *SqmEnabled)( - IShellUIHelper2* This, + IShellUIHelper2 *This, VARIANT_BOOL *pfEnabled); HRESULT (STDMETHODCALLTYPE *PhishingEnabled)( - IShellUIHelper2* This, + IShellUIHelper2 *This, VARIANT_BOOL *pfEnabled); HRESULT (STDMETHODCALLTYPE *BrandImageUri)( - IShellUIHelper2* This, + IShellUIHelper2 *This, BSTR *pbstrUri); HRESULT (STDMETHODCALLTYPE *SkipTabsWelcome)( - IShellUIHelper2* This); + IShellUIHelper2 *This); HRESULT (STDMETHODCALLTYPE *DiagnoseConnection)( - IShellUIHelper2* This); + IShellUIHelper2 *This); HRESULT (STDMETHODCALLTYPE *CustomizeClearType)( - IShellUIHelper2* This, + IShellUIHelper2 *This, VARIANT_BOOL fSet); HRESULT (STDMETHODCALLTYPE *IsSearchProviderInstalled)( - IShellUIHelper2* This, + IShellUIHelper2 *This, BSTR URL, DWORD *pdwResult); HRESULT (STDMETHODCALLTYPE *IsSearchMigrated)( - IShellUIHelper2* This, + IShellUIHelper2 *This, VARIANT_BOOL *pfMigrated); HRESULT (STDMETHODCALLTYPE *DefaultSearchProvider)( - IShellUIHelper2* This, + IShellUIHelper2 *This, BSTR *pbstrName); HRESULT (STDMETHODCALLTYPE *RunOnceRequiredSettingsComplete)( - IShellUIHelper2* This, + IShellUIHelper2 *This, VARIANT_BOOL fComplete); HRESULT (STDMETHODCALLTYPE *RunOnceHasShown)( - IShellUIHelper2* This, + IShellUIHelper2 *This, VARIANT_BOOL *pfShown); HRESULT (STDMETHODCALLTYPE *SearchGuideUrl)( - IShellUIHelper2* This, + IShellUIHelper2 *This, BSTR *pbstrUrl); END_INTERFACE } IShellUIHelper2Vtbl; + interface IShellUIHelper2 { CONST_VTBL IShellUIHelper2Vtbl* lpVtbl; }; @@ -3990,133 +3316,6 @@ static FORCEINLINE HRESULT IShellUIHelper2_SearchGuideUrl(IShellUIHelper2* This, #endif -HRESULT STDMETHODCALLTYPE IShellUIHelper2_AddSearchProvider_Proxy( - IShellUIHelper2* This, - BSTR URL); -void __RPC_STUB IShellUIHelper2_AddSearchProvider_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper2_RunOnceShown_Proxy( - IShellUIHelper2* This); -void __RPC_STUB IShellUIHelper2_RunOnceShown_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper2_SkipRunOnce_Proxy( - IShellUIHelper2* This); -void __RPC_STUB IShellUIHelper2_SkipRunOnce_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper2_CustomizeSettings_Proxy( - IShellUIHelper2* This, - VARIANT_BOOL fSQM, - VARIANT_BOOL fPhishing, - BSTR bstrLocale); -void __RPC_STUB IShellUIHelper2_CustomizeSettings_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper2_SqmEnabled_Proxy( - IShellUIHelper2* This, - VARIANT_BOOL *pfEnabled); -void __RPC_STUB IShellUIHelper2_SqmEnabled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper2_PhishingEnabled_Proxy( - IShellUIHelper2* This, - VARIANT_BOOL *pfEnabled); -void __RPC_STUB IShellUIHelper2_PhishingEnabled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper2_BrandImageUri_Proxy( - IShellUIHelper2* This, - BSTR *pbstrUri); -void __RPC_STUB IShellUIHelper2_BrandImageUri_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper2_SkipTabsWelcome_Proxy( - IShellUIHelper2* This); -void __RPC_STUB IShellUIHelper2_SkipTabsWelcome_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper2_DiagnoseConnection_Proxy( - IShellUIHelper2* This); -void __RPC_STUB IShellUIHelper2_DiagnoseConnection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper2_CustomizeClearType_Proxy( - IShellUIHelper2* This, - VARIANT_BOOL fSet); -void __RPC_STUB IShellUIHelper2_CustomizeClearType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper2_IsSearchProviderInstalled_Proxy( - IShellUIHelper2* This, - BSTR URL, - DWORD *pdwResult); -void __RPC_STUB IShellUIHelper2_IsSearchProviderInstalled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper2_IsSearchMigrated_Proxy( - IShellUIHelper2* This, - VARIANT_BOOL *pfMigrated); -void __RPC_STUB IShellUIHelper2_IsSearchMigrated_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper2_DefaultSearchProvider_Proxy( - IShellUIHelper2* This, - BSTR *pbstrName); -void __RPC_STUB IShellUIHelper2_DefaultSearchProvider_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper2_RunOnceRequiredSettingsComplete_Proxy( - IShellUIHelper2* This, - VARIANT_BOOL fComplete); -void __RPC_STUB IShellUIHelper2_RunOnceRequiredSettingsComplete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper2_RunOnceHasShown_Proxy( - IShellUIHelper2* This, - VARIANT_BOOL *pfShown); -void __RPC_STUB IShellUIHelper2_RunOnceHasShown_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellUIHelper2_SearchGuideUrl_Proxy( - IShellUIHelper2* This, - BSTR *pbstrUrl); -void __RPC_STUB IShellUIHelper2_SearchGuideUrl_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellUIHelper2_INTERFACE_DEFINED__ */ @@ -4154,29 +3353,29 @@ typedef struct DShellNameSpaceEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - DShellNameSpaceEvents* This, + DShellNameSpaceEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - DShellNameSpaceEvents* This); + DShellNameSpaceEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - DShellNameSpaceEvents* This); + DShellNameSpaceEvents *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - DShellNameSpaceEvents* This, + DShellNameSpaceEvents *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - DShellNameSpaceEvents* This, + DShellNameSpaceEvents *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - DShellNameSpaceEvents* This, + DShellNameSpaceEvents *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -4184,7 +3383,7 @@ typedef struct DShellNameSpaceEventsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - DShellNameSpaceEvents* This, + DShellNameSpaceEvents *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -4196,6 +3395,7 @@ typedef struct DShellNameSpaceEventsVtbl { END_INTERFACE } DShellNameSpaceEventsVtbl; + interface DShellNameSpaceEvents { CONST_VTBL DShellNameSpaceEventsVtbl* lpVtbl; }; @@ -4302,29 +3502,29 @@ typedef struct IShellFavoritesNameSpaceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellFavoritesNameSpace* This, + IShellFavoritesNameSpace *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellFavoritesNameSpace* This); + IShellFavoritesNameSpace *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellFavoritesNameSpace* This); + IShellFavoritesNameSpace *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IShellFavoritesNameSpace* This, + IShellFavoritesNameSpace *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IShellFavoritesNameSpace* This, + IShellFavoritesNameSpace *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IShellFavoritesNameSpace* This, + IShellFavoritesNameSpace *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -4332,7 +3532,7 @@ typedef struct IShellFavoritesNameSpaceVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IShellFavoritesNameSpace* This, + IShellFavoritesNameSpace *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -4344,51 +3544,52 @@ typedef struct IShellFavoritesNameSpaceVtbl { /*** IShellFavoritesNameSpace methods ***/ HRESULT (STDMETHODCALLTYPE *MoveSelectionUp)( - IShellFavoritesNameSpace* This); + IShellFavoritesNameSpace *This); HRESULT (STDMETHODCALLTYPE *MoveSelectionDown)( - IShellFavoritesNameSpace* This); + IShellFavoritesNameSpace *This); HRESULT (STDMETHODCALLTYPE *ResetSort)( - IShellFavoritesNameSpace* This); + IShellFavoritesNameSpace *This); HRESULT (STDMETHODCALLTYPE *NewFolder)( - IShellFavoritesNameSpace* This); + IShellFavoritesNameSpace *This); HRESULT (STDMETHODCALLTYPE *Synchronize)( - IShellFavoritesNameSpace* This); + IShellFavoritesNameSpace *This); HRESULT (STDMETHODCALLTYPE *Import)( - IShellFavoritesNameSpace* This); + IShellFavoritesNameSpace *This); HRESULT (STDMETHODCALLTYPE *Export)( - IShellFavoritesNameSpace* This); + IShellFavoritesNameSpace *This); HRESULT (STDMETHODCALLTYPE *InvokeContextMenuCommand)( - IShellFavoritesNameSpace* This, + IShellFavoritesNameSpace *This, BSTR strCommand); HRESULT (STDMETHODCALLTYPE *MoveSelectionTo)( - IShellFavoritesNameSpace* This); + IShellFavoritesNameSpace *This); HRESULT (STDMETHODCALLTYPE *get_SubscriptionsEnabled)( - IShellFavoritesNameSpace* This, + IShellFavoritesNameSpace *This, VARIANT_BOOL *pBool); HRESULT (STDMETHODCALLTYPE *CreateSubscriptionForSelection)( - IShellFavoritesNameSpace* This, + IShellFavoritesNameSpace *This, VARIANT_BOOL *pBool); HRESULT (STDMETHODCALLTYPE *DeleteSubscriptionForSelection)( - IShellFavoritesNameSpace* This, + IShellFavoritesNameSpace *This, VARIANT_BOOL *pBool); HRESULT (STDMETHODCALLTYPE *SetRoot)( - IShellFavoritesNameSpace* This, + IShellFavoritesNameSpace *This, BSTR bstrFullPath); END_INTERFACE } IShellFavoritesNameSpaceVtbl; + interface IShellFavoritesNameSpace { CONST_VTBL IShellFavoritesNameSpaceVtbl* lpVtbl; }; @@ -4487,102 +3688,6 @@ static FORCEINLINE HRESULT IShellFavoritesNameSpace_SetRoot(IShellFavoritesNameS #endif -HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_MoveSelectionUp_Proxy( - IShellFavoritesNameSpace* This); -void __RPC_STUB IShellFavoritesNameSpace_MoveSelectionUp_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_MoveSelectionDown_Proxy( - IShellFavoritesNameSpace* This); -void __RPC_STUB IShellFavoritesNameSpace_MoveSelectionDown_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_ResetSort_Proxy( - IShellFavoritesNameSpace* This); -void __RPC_STUB IShellFavoritesNameSpace_ResetSort_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_NewFolder_Proxy( - IShellFavoritesNameSpace* This); -void __RPC_STUB IShellFavoritesNameSpace_NewFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_Synchronize_Proxy( - IShellFavoritesNameSpace* This); -void __RPC_STUB IShellFavoritesNameSpace_Synchronize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_Import_Proxy( - IShellFavoritesNameSpace* This); -void __RPC_STUB IShellFavoritesNameSpace_Import_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_Export_Proxy( - IShellFavoritesNameSpace* This); -void __RPC_STUB IShellFavoritesNameSpace_Export_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_InvokeContextMenuCommand_Proxy( - IShellFavoritesNameSpace* This, - BSTR strCommand); -void __RPC_STUB IShellFavoritesNameSpace_InvokeContextMenuCommand_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_MoveSelectionTo_Proxy( - IShellFavoritesNameSpace* This); -void __RPC_STUB IShellFavoritesNameSpace_MoveSelectionTo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_get_SubscriptionsEnabled_Proxy( - IShellFavoritesNameSpace* This, - VARIANT_BOOL *pBool); -void __RPC_STUB IShellFavoritesNameSpace_get_SubscriptionsEnabled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_CreateSubscriptionForSelection_Proxy( - IShellFavoritesNameSpace* This, - VARIANT_BOOL *pBool); -void __RPC_STUB IShellFavoritesNameSpace_CreateSubscriptionForSelection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_DeleteSubscriptionForSelection_Proxy( - IShellFavoritesNameSpace* This, - VARIANT_BOOL *pBool); -void __RPC_STUB IShellFavoritesNameSpace_DeleteSubscriptionForSelection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_SetRoot_Proxy( - IShellFavoritesNameSpace* This, - BSTR bstrFullPath); -void __RPC_STUB IShellFavoritesNameSpace_SetRoot_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellFavoritesNameSpace_INTERFACE_DEFINED__ */ @@ -4671,29 +3776,29 @@ typedef struct IShellNameSpaceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellNameSpace* This, + IShellNameSpace *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellNameSpace* This); + IShellNameSpace *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellNameSpace* This); + IShellNameSpace *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IShellNameSpace* This, + IShellNameSpace *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IShellNameSpace* This, + IShellNameSpace *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IShellNameSpace* This, + IShellNameSpace *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -4701,7 +3806,7 @@ typedef struct IShellNameSpaceVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IShellNameSpace* This, + IShellNameSpace *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -4713,136 +3818,137 @@ typedef struct IShellNameSpaceVtbl { /*** IShellFavoritesNameSpace methods ***/ HRESULT (STDMETHODCALLTYPE *MoveSelectionUp)( - IShellNameSpace* This); + IShellNameSpace *This); HRESULT (STDMETHODCALLTYPE *MoveSelectionDown)( - IShellNameSpace* This); + IShellNameSpace *This); HRESULT (STDMETHODCALLTYPE *ResetSort)( - IShellNameSpace* This); + IShellNameSpace *This); HRESULT (STDMETHODCALLTYPE *NewFolder)( - IShellNameSpace* This); + IShellNameSpace *This); HRESULT (STDMETHODCALLTYPE *Synchronize)( - IShellNameSpace* This); + IShellNameSpace *This); HRESULT (STDMETHODCALLTYPE *Import)( - IShellNameSpace* This); + IShellNameSpace *This); HRESULT (STDMETHODCALLTYPE *Export)( - IShellNameSpace* This); + IShellNameSpace *This); HRESULT (STDMETHODCALLTYPE *InvokeContextMenuCommand)( - IShellNameSpace* This, + IShellNameSpace *This, BSTR strCommand); HRESULT (STDMETHODCALLTYPE *MoveSelectionTo)( - IShellNameSpace* This); + IShellNameSpace *This); HRESULT (STDMETHODCALLTYPE *get_SubscriptionsEnabled)( - IShellNameSpace* This, + IShellNameSpace *This, VARIANT_BOOL *pBool); HRESULT (STDMETHODCALLTYPE *CreateSubscriptionForSelection)( - IShellNameSpace* This, + IShellNameSpace *This, VARIANT_BOOL *pBool); HRESULT (STDMETHODCALLTYPE *DeleteSubscriptionForSelection)( - IShellNameSpace* This, + IShellNameSpace *This, VARIANT_BOOL *pBool); HRESULT (STDMETHODCALLTYPE *SetRoot)( - IShellNameSpace* This, + IShellNameSpace *This, BSTR bstrFullPath); /*** IShellNameSpace methods ***/ HRESULT (STDMETHODCALLTYPE *get_EnumOptions)( - IShellNameSpace* This, + IShellNameSpace *This, LONG *pgrfEnumFlags); HRESULT (STDMETHODCALLTYPE *put_EnumOptions)( - IShellNameSpace* This, + IShellNameSpace *This, LONG pgrfEnumFlags); HRESULT (STDMETHODCALLTYPE *get_SelectedItem)( - IShellNameSpace* This, + IShellNameSpace *This, IDispatch **pItem); HRESULT (STDMETHODCALLTYPE *put_SelectedItem)( - IShellNameSpace* This, + IShellNameSpace *This, IDispatch *pItem); HRESULT (STDMETHODCALLTYPE *get_Root)( - IShellNameSpace* This, + IShellNameSpace *This, VARIANT *pvar); HRESULT (STDMETHODCALLTYPE *put_Root)( - IShellNameSpace* This, + IShellNameSpace *This, VARIANT pvar); HRESULT (STDMETHODCALLTYPE *get_Depth)( - IShellNameSpace* This, + IShellNameSpace *This, int *piDepth); HRESULT (STDMETHODCALLTYPE *put_Depth)( - IShellNameSpace* This, + IShellNameSpace *This, int piDepth); HRESULT (STDMETHODCALLTYPE *get_Mode)( - IShellNameSpace* This, + IShellNameSpace *This, unsigned int *puMode); HRESULT (STDMETHODCALLTYPE *put_Mode)( - IShellNameSpace* This, + IShellNameSpace *This, unsigned int puMode); HRESULT (STDMETHODCALLTYPE *get_Flags)( - IShellNameSpace* This, + IShellNameSpace *This, ULONG *pdwFlags); HRESULT (STDMETHODCALLTYPE *put_Flags)( - IShellNameSpace* This, + IShellNameSpace *This, ULONG pdwFlags); HRESULT (STDMETHODCALLTYPE *put_TVFlags)( - IShellNameSpace* This, + IShellNameSpace *This, ULONG dwFlags); HRESULT (STDMETHODCALLTYPE *get_TVFlags)( - IShellNameSpace* This, + IShellNameSpace *This, ULONG *dwFlags); HRESULT (STDMETHODCALLTYPE *get_Columns)( - IShellNameSpace* This, + IShellNameSpace *This, BSTR *bstrColumns); HRESULT (STDMETHODCALLTYPE *put_Columns)( - IShellNameSpace* This, + IShellNameSpace *This, BSTR bstrColumns); HRESULT (STDMETHODCALLTYPE *get_CountViewTypes)( - IShellNameSpace* This, + IShellNameSpace *This, int *piTypes); HRESULT (STDMETHODCALLTYPE *SetViewType)( - IShellNameSpace* This, + IShellNameSpace *This, int iType); HRESULT (STDMETHODCALLTYPE *SelectedItems)( - IShellNameSpace* This, + IShellNameSpace *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *Expand)( - IShellNameSpace* This, + IShellNameSpace *This, VARIANT var, int iDepth); HRESULT (STDMETHODCALLTYPE *UnselectAll)( - IShellNameSpace* This); + IShellNameSpace *This); END_INTERFACE } IShellNameSpaceVtbl; + interface IShellNameSpace { CONST_VTBL IShellNameSpaceVtbl* lpVtbl; }; @@ -5027,174 +4133,6 @@ static FORCEINLINE HRESULT IShellNameSpace_UnselectAll(IShellNameSpace* This) { #endif -HRESULT STDMETHODCALLTYPE IShellNameSpace_get_EnumOptions_Proxy( - IShellNameSpace* This, - LONG *pgrfEnumFlags); -void __RPC_STUB IShellNameSpace_get_EnumOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellNameSpace_put_EnumOptions_Proxy( - IShellNameSpace* This, - LONG pgrfEnumFlags); -void __RPC_STUB IShellNameSpace_put_EnumOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellNameSpace_get_SelectedItem_Proxy( - IShellNameSpace* This, - IDispatch **pItem); -void __RPC_STUB IShellNameSpace_get_SelectedItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellNameSpace_put_SelectedItem_Proxy( - IShellNameSpace* This, - IDispatch *pItem); -void __RPC_STUB IShellNameSpace_put_SelectedItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellNameSpace_get_Root_Proxy( - IShellNameSpace* This, - VARIANT *pvar); -void __RPC_STUB IShellNameSpace_get_Root_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellNameSpace_put_Root_Proxy( - IShellNameSpace* This, - VARIANT pvar); -void __RPC_STUB IShellNameSpace_put_Root_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellNameSpace_get_Depth_Proxy( - IShellNameSpace* This, - int *piDepth); -void __RPC_STUB IShellNameSpace_get_Depth_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellNameSpace_put_Depth_Proxy( - IShellNameSpace* This, - int piDepth); -void __RPC_STUB IShellNameSpace_put_Depth_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellNameSpace_get_Mode_Proxy( - IShellNameSpace* This, - unsigned int *puMode); -void __RPC_STUB IShellNameSpace_get_Mode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellNameSpace_put_Mode_Proxy( - IShellNameSpace* This, - unsigned int puMode); -void __RPC_STUB IShellNameSpace_put_Mode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellNameSpace_get_Flags_Proxy( - IShellNameSpace* This, - ULONG *pdwFlags); -void __RPC_STUB IShellNameSpace_get_Flags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellNameSpace_put_Flags_Proxy( - IShellNameSpace* This, - ULONG pdwFlags); -void __RPC_STUB IShellNameSpace_put_Flags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellNameSpace_put_TVFlags_Proxy( - IShellNameSpace* This, - ULONG dwFlags); -void __RPC_STUB IShellNameSpace_put_TVFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellNameSpace_get_TVFlags_Proxy( - IShellNameSpace* This, - ULONG *dwFlags); -void __RPC_STUB IShellNameSpace_get_TVFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellNameSpace_get_Columns_Proxy( - IShellNameSpace* This, - BSTR *bstrColumns); -void __RPC_STUB IShellNameSpace_get_Columns_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellNameSpace_put_Columns_Proxy( - IShellNameSpace* This, - BSTR bstrColumns); -void __RPC_STUB IShellNameSpace_put_Columns_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellNameSpace_get_CountViewTypes_Proxy( - IShellNameSpace* This, - int *piTypes); -void __RPC_STUB IShellNameSpace_get_CountViewTypes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellNameSpace_SetViewType_Proxy( - IShellNameSpace* This, - int iType); -void __RPC_STUB IShellNameSpace_SetViewType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellNameSpace_SelectedItems_Proxy( - IShellNameSpace* This, - IDispatch **ppid); -void __RPC_STUB IShellNameSpace_SelectedItems_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellNameSpace_Expand_Proxy( - IShellNameSpace* This, - VARIANT var, - int iDepth); -void __RPC_STUB IShellNameSpace_Expand_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellNameSpace_UnselectAll_Proxy( - IShellNameSpace* This); -void __RPC_STUB IShellNameSpace_UnselectAll_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellNameSpace_INTERFACE_DEFINED__ */ @@ -5287,29 +4225,29 @@ typedef struct IScriptErrorListVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IScriptErrorList* This, + IScriptErrorList *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IScriptErrorList* This); + IScriptErrorList *This); ULONG (STDMETHODCALLTYPE *Release)( - IScriptErrorList* This); + IScriptErrorList *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IScriptErrorList* This, + IScriptErrorList *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IScriptErrorList* This, + IScriptErrorList *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IScriptErrorList* This, + IScriptErrorList *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -5317,7 +4255,7 @@ typedef struct IScriptErrorListVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IScriptErrorList* This, + IScriptErrorList *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -5329,61 +4267,62 @@ typedef struct IScriptErrorListVtbl { /*** IScriptErrorList methods ***/ HRESULT (STDMETHODCALLTYPE *advanceError)( - IScriptErrorList* This); + IScriptErrorList *This); HRESULT (STDMETHODCALLTYPE *retreatError)( - IScriptErrorList* This); + IScriptErrorList *This); HRESULT (STDMETHODCALLTYPE *canAdvanceError)( - IScriptErrorList* This, + IScriptErrorList *This, LONG *pfCanAdvance); HRESULT (STDMETHODCALLTYPE *canRetreatError)( - IScriptErrorList* This, + IScriptErrorList *This, LONG *pfCanRetreat); HRESULT (STDMETHODCALLTYPE *getErrorLine)( - IScriptErrorList* This, + IScriptErrorList *This, LONG *plLine); HRESULT (STDMETHODCALLTYPE *getErrorChar)( - IScriptErrorList* This, + IScriptErrorList *This, LONG *plChar); HRESULT (STDMETHODCALLTYPE *getErrorCode)( - IScriptErrorList* This, + IScriptErrorList *This, LONG *plCode); HRESULT (STDMETHODCALLTYPE *getErrorMsg)( - IScriptErrorList* This, + IScriptErrorList *This, BSTR *pstr); HRESULT (STDMETHODCALLTYPE *getErrorUrl)( - IScriptErrorList* This, + IScriptErrorList *This, BSTR *pstr); HRESULT (STDMETHODCALLTYPE *getAlwaysShowLockState)( - IScriptErrorList* This, + IScriptErrorList *This, LONG *pfAlwaysShowLocked); HRESULT (STDMETHODCALLTYPE *getDetailsPaneOpen)( - IScriptErrorList* This, + IScriptErrorList *This, LONG *pfDetailsPaneOpen); HRESULT (STDMETHODCALLTYPE *setDetailsPaneOpen)( - IScriptErrorList* This, + IScriptErrorList *This, LONG fDetailsPaneOpen); HRESULT (STDMETHODCALLTYPE *getPerErrorDisplay)( - IScriptErrorList* This, + IScriptErrorList *This, LONG *pfPerErrorDisplay); HRESULT (STDMETHODCALLTYPE *setPerErrorDisplay)( - IScriptErrorList* This, + IScriptErrorList *This, LONG fPerErrorDisplay); END_INTERFACE } IScriptErrorListVtbl; + interface IScriptErrorList { CONST_VTBL IScriptErrorListVtbl* lpVtbl; }; @@ -5486,116 +4425,6 @@ static FORCEINLINE HRESULT IScriptErrorList_setPerErrorDisplay(IScriptErrorList* #endif -HRESULT STDMETHODCALLTYPE IScriptErrorList_advanceError_Proxy( - IScriptErrorList* This); -void __RPC_STUB IScriptErrorList_advanceError_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptErrorList_retreatError_Proxy( - IScriptErrorList* This); -void __RPC_STUB IScriptErrorList_retreatError_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptErrorList_canAdvanceError_Proxy( - IScriptErrorList* This, - LONG *pfCanAdvance); -void __RPC_STUB IScriptErrorList_canAdvanceError_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptErrorList_canRetreatError_Proxy( - IScriptErrorList* This, - LONG *pfCanRetreat); -void __RPC_STUB IScriptErrorList_canRetreatError_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptErrorList_getErrorLine_Proxy( - IScriptErrorList* This, - LONG *plLine); -void __RPC_STUB IScriptErrorList_getErrorLine_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptErrorList_getErrorChar_Proxy( - IScriptErrorList* This, - LONG *plChar); -void __RPC_STUB IScriptErrorList_getErrorChar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptErrorList_getErrorCode_Proxy( - IScriptErrorList* This, - LONG *plCode); -void __RPC_STUB IScriptErrorList_getErrorCode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptErrorList_getErrorMsg_Proxy( - IScriptErrorList* This, - BSTR *pstr); -void __RPC_STUB IScriptErrorList_getErrorMsg_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptErrorList_getErrorUrl_Proxy( - IScriptErrorList* This, - BSTR *pstr); -void __RPC_STUB IScriptErrorList_getErrorUrl_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptErrorList_getAlwaysShowLockState_Proxy( - IScriptErrorList* This, - LONG *pfAlwaysShowLocked); -void __RPC_STUB IScriptErrorList_getAlwaysShowLockState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptErrorList_getDetailsPaneOpen_Proxy( - IScriptErrorList* This, - LONG *pfDetailsPaneOpen); -void __RPC_STUB IScriptErrorList_getDetailsPaneOpen_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptErrorList_setDetailsPaneOpen_Proxy( - IScriptErrorList* This, - LONG fDetailsPaneOpen); -void __RPC_STUB IScriptErrorList_setDetailsPaneOpen_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptErrorList_getPerErrorDisplay_Proxy( - IScriptErrorList* This, - LONG *pfPerErrorDisplay); -void __RPC_STUB IScriptErrorList_getPerErrorDisplay_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IScriptErrorList_setPerErrorDisplay_Proxy( - IScriptErrorList* This, - LONG fPerErrorDisplay); -void __RPC_STUB IScriptErrorList_setPerErrorDisplay_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IScriptErrorList_INTERFACE_DEFINED__ */ @@ -5642,29 +4471,29 @@ typedef struct ISearchVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISearch* This, + ISearch *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISearch* This); + ISearch *This); ULONG (STDMETHODCALLTYPE *Release)( - ISearch* This); + ISearch *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISearch* This, + ISearch *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISearch* This, + ISearch *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISearch* This, + ISearch *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -5672,7 +4501,7 @@ typedef struct ISearchVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISearch* This, + ISearch *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -5684,19 +4513,20 @@ typedef struct ISearchVtbl { /*** ISearch methods ***/ HRESULT (STDMETHODCALLTYPE *get_Title)( - ISearch* This, + ISearch *This, BSTR *pbstrTitle); HRESULT (STDMETHODCALLTYPE *get_Id)( - ISearch* This, + ISearch *This, BSTR *pbstrId); HRESULT (STDMETHODCALLTYPE *get_URL)( - ISearch* This, + ISearch *This, BSTR *pbstrUrl); END_INTERFACE } ISearchVtbl; + interface ISearch { CONST_VTBL ISearchVtbl* lpVtbl; }; @@ -5755,30 +4585,6 @@ static FORCEINLINE HRESULT ISearch_get_URL(ISearch* This,BSTR *pbstrUrl) { #endif -HRESULT STDMETHODCALLTYPE ISearch_get_Title_Proxy( - ISearch* This, - BSTR *pbstrTitle); -void __RPC_STUB ISearch_get_Title_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearch_get_Id_Proxy( - ISearch* This, - BSTR *pbstrId); -void __RPC_STUB ISearch_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearch_get_URL_Proxy( - ISearch* This, - BSTR *pbstrUrl); -void __RPC_STUB ISearch_get_URL_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISearch_INTERFACE_DEFINED__ */ @@ -5816,29 +4622,29 @@ typedef struct ISearchesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISearches* This, + ISearches *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISearches* This); + ISearches *This); ULONG (STDMETHODCALLTYPE *Release)( - ISearches* This); + ISearches *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISearches* This, + ISearches *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISearches* This, + ISearches *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISearches* This, + ISearches *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -5846,7 +4652,7 @@ typedef struct ISearchesVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISearches* This, + ISearches *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -5858,24 +4664,25 @@ typedef struct ISearchesVtbl { /*** ISearches methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISearches* This, + ISearches *This, LONG *plCount); HRESULT (STDMETHODCALLTYPE *get_Default)( - ISearches* This, + ISearches *This, BSTR *pbstrDefault); HRESULT (STDMETHODCALLTYPE *Item)( - ISearches* This, + ISearches *This, VARIANT index, ISearch **ppid); HRESULT (STDMETHODCALLTYPE *_NewEnum)( - ISearches* This, + ISearches *This, IUnknown **ppunk); END_INTERFACE } ISearchesVtbl; + interface ISearches { CONST_VTBL ISearchesVtbl* lpVtbl; }; @@ -5938,39 +4745,6 @@ static FORCEINLINE HRESULT ISearches__NewEnum(ISearches* This,IUnknown **ppunk) #endif -HRESULT STDMETHODCALLTYPE ISearches_get_Count_Proxy( - ISearches* This, - LONG *plCount); -void __RPC_STUB ISearches_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearches_get_Default_Proxy( - ISearches* This, - BSTR *pbstrDefault); -void __RPC_STUB ISearches_get_Default_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearches_Item_Proxy( - ISearches* This, - VARIANT index, - ISearch **ppid); -void __RPC_STUB ISearches_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearches__NewEnum_Proxy( - ISearches* This, - IUnknown **ppunk); -void __RPC_STUB ISearches__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISearches_INTERFACE_DEFINED__ */ @@ -6087,29 +4861,29 @@ typedef struct ISearchAssistantOCVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISearchAssistantOC* This, + ISearchAssistantOC *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISearchAssistantOC* This); + ISearchAssistantOC *This); ULONG (STDMETHODCALLTYPE *Release)( - ISearchAssistantOC* This); + ISearchAssistantOC *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISearchAssistantOC* This, + ISearchAssistantOC *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISearchAssistantOC* This, + ISearchAssistantOC *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISearchAssistantOC* This, + ISearchAssistantOC *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -6117,7 +4891,7 @@ typedef struct ISearchAssistantOCVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISearchAssistantOC* This, + ISearchAssistantOC *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -6129,110 +4903,110 @@ typedef struct ISearchAssistantOCVtbl { /*** ISearchAssistantOC methods ***/ HRESULT (STDMETHODCALLTYPE *AddNextMenuItem)( - ISearchAssistantOC* This, + ISearchAssistantOC *This, BSTR bstrText, LONG idItem); HRESULT (STDMETHODCALLTYPE *SetDefaultSearchUrl)( - ISearchAssistantOC* This, + ISearchAssistantOC *This, BSTR bstrUrl); HRESULT (STDMETHODCALLTYPE *NavigateToDefaultSearch)( - ISearchAssistantOC* This); + ISearchAssistantOC *This); HRESULT (STDMETHODCALLTYPE *IsRestricted)( - ISearchAssistantOC* This, + ISearchAssistantOC *This, BSTR bstrGuid, VARIANT_BOOL *pVal); HRESULT (STDMETHODCALLTYPE *get_ShellFeaturesEnabled)( - ISearchAssistantOC* This, + ISearchAssistantOC *This, VARIANT_BOOL *pVal); HRESULT (STDMETHODCALLTYPE *get_SearchAssistantDefault)( - ISearchAssistantOC* This, + ISearchAssistantOC *This, VARIANT_BOOL *pVal); HRESULT (STDMETHODCALLTYPE *get_Searches)( - ISearchAssistantOC* This, + ISearchAssistantOC *This, ISearches **ppid); HRESULT (STDMETHODCALLTYPE *get_InWebFolder)( - ISearchAssistantOC* This, + ISearchAssistantOC *This, VARIANT_BOOL *pVal); HRESULT (STDMETHODCALLTYPE *PutProperty)( - ISearchAssistantOC* This, + ISearchAssistantOC *This, VARIANT_BOOL bPerLocale, BSTR bstrName, BSTR bstrValue); HRESULT (STDMETHODCALLTYPE *GetProperty)( - ISearchAssistantOC* This, + ISearchAssistantOC *This, VARIANT_BOOL bPerLocale, BSTR bstrName, BSTR *pbstrValue); HRESULT (STDMETHODCALLTYPE *put_EventHandled)( - ISearchAssistantOC* This, + ISearchAssistantOC *This, VARIANT_BOOL rhs); HRESULT (STDMETHODCALLTYPE *ResetNextMenu)( - ISearchAssistantOC* This); + ISearchAssistantOC *This); HRESULT (STDMETHODCALLTYPE *FindOnWeb)( - ISearchAssistantOC* This); + ISearchAssistantOC *This); HRESULT (STDMETHODCALLTYPE *FindFilesOrFolders)( - ISearchAssistantOC* This); + ISearchAssistantOC *This); HRESULT (STDMETHODCALLTYPE *FindComputer)( - ISearchAssistantOC* This); + ISearchAssistantOC *This); HRESULT (STDMETHODCALLTYPE *FindPrinter)( - ISearchAssistantOC* This); + ISearchAssistantOC *This); HRESULT (STDMETHODCALLTYPE *FindPeople)( - ISearchAssistantOC* This); + ISearchAssistantOC *This); HRESULT (STDMETHODCALLTYPE *GetSearchAssistantURL)( - ISearchAssistantOC* This, + ISearchAssistantOC *This, VARIANT_BOOL bSubstitute, VARIANT_BOOL bCustomize, BSTR *pbstrValue); HRESULT (STDMETHODCALLTYPE *NotifySearchSettingsChanged)( - ISearchAssistantOC* This); + ISearchAssistantOC *This); HRESULT (STDMETHODCALLTYPE *put_ASProvider)( - ISearchAssistantOC* This, + ISearchAssistantOC *This, BSTR pProvider); HRESULT (STDMETHODCALLTYPE *get_ASProvider)( - ISearchAssistantOC* This, + ISearchAssistantOC *This, BSTR *pProvider); HRESULT (STDMETHODCALLTYPE *put_ASSetting)( - ISearchAssistantOC* This, + ISearchAssistantOC *This, int pSetting); HRESULT (STDMETHODCALLTYPE *get_ASSetting)( - ISearchAssistantOC* This, + ISearchAssistantOC *This, int *pSetting); HRESULT (STDMETHODCALLTYPE *NETDetectNextNavigate)( - ISearchAssistantOC* This); + ISearchAssistantOC *This); HRESULT (STDMETHODCALLTYPE *PutFindText)( - ISearchAssistantOC* This, + ISearchAssistantOC *This, BSTR FindText); HRESULT (STDMETHODCALLTYPE *get_Version)( - ISearchAssistantOC* This, + ISearchAssistantOC *This, int *pVersion); HRESULT (STDMETHODCALLTYPE *EncodeString)( - ISearchAssistantOC* This, + ISearchAssistantOC *This, BSTR bstrValue, BSTR bstrCharSet, VARIANT_BOOL bUseUTF8, @@ -6240,6 +5014,7 @@ typedef struct ISearchAssistantOCVtbl { END_INTERFACE } ISearchAssistantOCVtbl; + interface ISearchAssistantOC { CONST_VTBL ISearchAssistantOCVtbl* lpVtbl; }; @@ -6394,224 +5169,6 @@ static FORCEINLINE HRESULT ISearchAssistantOC_EncodeString(ISearchAssistantOC* T #endif -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_AddNextMenuItem_Proxy( - ISearchAssistantOC* This, - BSTR bstrText, - LONG idItem); -void __RPC_STUB ISearchAssistantOC_AddNextMenuItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_SetDefaultSearchUrl_Proxy( - ISearchAssistantOC* This, - BSTR bstrUrl); -void __RPC_STUB ISearchAssistantOC_SetDefaultSearchUrl_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_NavigateToDefaultSearch_Proxy( - ISearchAssistantOC* This); -void __RPC_STUB ISearchAssistantOC_NavigateToDefaultSearch_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_IsRestricted_Proxy( - ISearchAssistantOC* This, - BSTR bstrGuid, - VARIANT_BOOL *pVal); -void __RPC_STUB ISearchAssistantOC_IsRestricted_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_get_ShellFeaturesEnabled_Proxy( - ISearchAssistantOC* This, - VARIANT_BOOL *pVal); -void __RPC_STUB ISearchAssistantOC_get_ShellFeaturesEnabled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_get_SearchAssistantDefault_Proxy( - ISearchAssistantOC* This, - VARIANT_BOOL *pVal); -void __RPC_STUB ISearchAssistantOC_get_SearchAssistantDefault_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_get_Searches_Proxy( - ISearchAssistantOC* This, - ISearches **ppid); -void __RPC_STUB ISearchAssistantOC_get_Searches_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_get_InWebFolder_Proxy( - ISearchAssistantOC* This, - VARIANT_BOOL *pVal); -void __RPC_STUB ISearchAssistantOC_get_InWebFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_PutProperty_Proxy( - ISearchAssistantOC* This, - VARIANT_BOOL bPerLocale, - BSTR bstrName, - BSTR bstrValue); -void __RPC_STUB ISearchAssistantOC_PutProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_GetProperty_Proxy( - ISearchAssistantOC* This, - VARIANT_BOOL bPerLocale, - BSTR bstrName, - BSTR *pbstrValue); -void __RPC_STUB ISearchAssistantOC_GetProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_put_EventHandled_Proxy( - ISearchAssistantOC* This, - VARIANT_BOOL rhs); -void __RPC_STUB ISearchAssistantOC_put_EventHandled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_ResetNextMenu_Proxy( - ISearchAssistantOC* This); -void __RPC_STUB ISearchAssistantOC_ResetNextMenu_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_FindOnWeb_Proxy( - ISearchAssistantOC* This); -void __RPC_STUB ISearchAssistantOC_FindOnWeb_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_FindFilesOrFolders_Proxy( - ISearchAssistantOC* This); -void __RPC_STUB ISearchAssistantOC_FindFilesOrFolders_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_FindComputer_Proxy( - ISearchAssistantOC* This); -void __RPC_STUB ISearchAssistantOC_FindComputer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_FindPrinter_Proxy( - ISearchAssistantOC* This); -void __RPC_STUB ISearchAssistantOC_FindPrinter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_FindPeople_Proxy( - ISearchAssistantOC* This); -void __RPC_STUB ISearchAssistantOC_FindPeople_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_GetSearchAssistantURL_Proxy( - ISearchAssistantOC* This, - VARIANT_BOOL bSubstitute, - VARIANT_BOOL bCustomize, - BSTR *pbstrValue); -void __RPC_STUB ISearchAssistantOC_GetSearchAssistantURL_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_NotifySearchSettingsChanged_Proxy( - ISearchAssistantOC* This); -void __RPC_STUB ISearchAssistantOC_NotifySearchSettingsChanged_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_put_ASProvider_Proxy( - ISearchAssistantOC* This, - BSTR pProvider); -void __RPC_STUB ISearchAssistantOC_put_ASProvider_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_get_ASProvider_Proxy( - ISearchAssistantOC* This, - BSTR *pProvider); -void __RPC_STUB ISearchAssistantOC_get_ASProvider_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_put_ASSetting_Proxy( - ISearchAssistantOC* This, - int pSetting); -void __RPC_STUB ISearchAssistantOC_put_ASSetting_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_get_ASSetting_Proxy( - ISearchAssistantOC* This, - int *pSetting); -void __RPC_STUB ISearchAssistantOC_get_ASSetting_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_NETDetectNextNavigate_Proxy( - ISearchAssistantOC* This); -void __RPC_STUB ISearchAssistantOC_NETDetectNextNavigate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_PutFindText_Proxy( - ISearchAssistantOC* This, - BSTR FindText); -void __RPC_STUB ISearchAssistantOC_PutFindText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_get_Version_Proxy( - ISearchAssistantOC* This, - int *pVersion); -void __RPC_STUB ISearchAssistantOC_get_Version_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC_EncodeString_Proxy( - ISearchAssistantOC* This, - BSTR bstrValue, - BSTR bstrCharSet, - VARIANT_BOOL bUseUTF8, - BSTR *pbstrResult); -void __RPC_STUB ISearchAssistantOC_EncodeString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISearchAssistantOC_INTERFACE_DEFINED__ */ @@ -6639,29 +5196,29 @@ typedef struct ISearchAssistantOC2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISearchAssistantOC2* This, + ISearchAssistantOC2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISearchAssistantOC2* This); + ISearchAssistantOC2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ISearchAssistantOC2* This); + ISearchAssistantOC2 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISearchAssistantOC2* This, + ISearchAssistantOC2 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISearchAssistantOC2* This, + ISearchAssistantOC2 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISearchAssistantOC2* This, + ISearchAssistantOC2 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -6669,7 +5226,7 @@ typedef struct ISearchAssistantOC2Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISearchAssistantOC2* This, + ISearchAssistantOC2 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -6681,110 +5238,110 @@ typedef struct ISearchAssistantOC2Vtbl { /*** ISearchAssistantOC methods ***/ HRESULT (STDMETHODCALLTYPE *AddNextMenuItem)( - ISearchAssistantOC2* This, + ISearchAssistantOC2 *This, BSTR bstrText, LONG idItem); HRESULT (STDMETHODCALLTYPE *SetDefaultSearchUrl)( - ISearchAssistantOC2* This, + ISearchAssistantOC2 *This, BSTR bstrUrl); HRESULT (STDMETHODCALLTYPE *NavigateToDefaultSearch)( - ISearchAssistantOC2* This); + ISearchAssistantOC2 *This); HRESULT (STDMETHODCALLTYPE *IsRestricted)( - ISearchAssistantOC2* This, + ISearchAssistantOC2 *This, BSTR bstrGuid, VARIANT_BOOL *pVal); HRESULT (STDMETHODCALLTYPE *get_ShellFeaturesEnabled)( - ISearchAssistantOC2* This, + ISearchAssistantOC2 *This, VARIANT_BOOL *pVal); HRESULT (STDMETHODCALLTYPE *get_SearchAssistantDefault)( - ISearchAssistantOC2* This, + ISearchAssistantOC2 *This, VARIANT_BOOL *pVal); HRESULT (STDMETHODCALLTYPE *get_Searches)( - ISearchAssistantOC2* This, + ISearchAssistantOC2 *This, ISearches **ppid); HRESULT (STDMETHODCALLTYPE *get_InWebFolder)( - ISearchAssistantOC2* This, + ISearchAssistantOC2 *This, VARIANT_BOOL *pVal); HRESULT (STDMETHODCALLTYPE *PutProperty)( - ISearchAssistantOC2* This, + ISearchAssistantOC2 *This, VARIANT_BOOL bPerLocale, BSTR bstrName, BSTR bstrValue); HRESULT (STDMETHODCALLTYPE *GetProperty)( - ISearchAssistantOC2* This, + ISearchAssistantOC2 *This, VARIANT_BOOL bPerLocale, BSTR bstrName, BSTR *pbstrValue); HRESULT (STDMETHODCALLTYPE *put_EventHandled)( - ISearchAssistantOC2* This, + ISearchAssistantOC2 *This, VARIANT_BOOL rhs); HRESULT (STDMETHODCALLTYPE *ResetNextMenu)( - ISearchAssistantOC2* This); + ISearchAssistantOC2 *This); HRESULT (STDMETHODCALLTYPE *FindOnWeb)( - ISearchAssistantOC2* This); + ISearchAssistantOC2 *This); HRESULT (STDMETHODCALLTYPE *FindFilesOrFolders)( - ISearchAssistantOC2* This); + ISearchAssistantOC2 *This); HRESULT (STDMETHODCALLTYPE *FindComputer)( - ISearchAssistantOC2* This); + ISearchAssistantOC2 *This); HRESULT (STDMETHODCALLTYPE *FindPrinter)( - ISearchAssistantOC2* This); + ISearchAssistantOC2 *This); HRESULT (STDMETHODCALLTYPE *FindPeople)( - ISearchAssistantOC2* This); + ISearchAssistantOC2 *This); HRESULT (STDMETHODCALLTYPE *GetSearchAssistantURL)( - ISearchAssistantOC2* This, + ISearchAssistantOC2 *This, VARIANT_BOOL bSubstitute, VARIANT_BOOL bCustomize, BSTR *pbstrValue); HRESULT (STDMETHODCALLTYPE *NotifySearchSettingsChanged)( - ISearchAssistantOC2* This); + ISearchAssistantOC2 *This); HRESULT (STDMETHODCALLTYPE *put_ASProvider)( - ISearchAssistantOC2* This, + ISearchAssistantOC2 *This, BSTR pProvider); HRESULT (STDMETHODCALLTYPE *get_ASProvider)( - ISearchAssistantOC2* This, + ISearchAssistantOC2 *This, BSTR *pProvider); HRESULT (STDMETHODCALLTYPE *put_ASSetting)( - ISearchAssistantOC2* This, + ISearchAssistantOC2 *This, int pSetting); HRESULT (STDMETHODCALLTYPE *get_ASSetting)( - ISearchAssistantOC2* This, + ISearchAssistantOC2 *This, int *pSetting); HRESULT (STDMETHODCALLTYPE *NETDetectNextNavigate)( - ISearchAssistantOC2* This); + ISearchAssistantOC2 *This); HRESULT (STDMETHODCALLTYPE *PutFindText)( - ISearchAssistantOC2* This, + ISearchAssistantOC2 *This, BSTR FindText); HRESULT (STDMETHODCALLTYPE *get_Version)( - ISearchAssistantOC2* This, + ISearchAssistantOC2 *This, int *pVersion); HRESULT (STDMETHODCALLTYPE *EncodeString)( - ISearchAssistantOC2* This, + ISearchAssistantOC2 *This, BSTR bstrValue, BSTR bstrCharSet, VARIANT_BOOL bUseUTF8, @@ -6792,11 +5349,12 @@ typedef struct ISearchAssistantOC2Vtbl { /*** ISearchAssistantOC2 methods ***/ HRESULT (STDMETHODCALLTYPE *get_ShowFindPrinter)( - ISearchAssistantOC2* This, + ISearchAssistantOC2 *This, VARIANT_BOOL *pbShowFindPrinter); END_INTERFACE } ISearchAssistantOC2Vtbl; + interface ISearchAssistantOC2 { CONST_VTBL ISearchAssistantOC2Vtbl* lpVtbl; }; @@ -6957,14 +5515,6 @@ static FORCEINLINE HRESULT ISearchAssistantOC2_get_ShowFindPrinter(ISearchAssist #endif -HRESULT STDMETHODCALLTYPE ISearchAssistantOC2_get_ShowFindPrinter_Proxy( - ISearchAssistantOC2* This, - VARIANT_BOOL *pbShowFindPrinter); -void __RPC_STUB ISearchAssistantOC2_get_ShowFindPrinter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISearchAssistantOC2_INTERFACE_DEFINED__ */ @@ -6998,29 +5548,29 @@ typedef struct ISearchAssistantOC3Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISearchAssistantOC3* This); + ISearchAssistantOC3 *This); ULONG (STDMETHODCALLTYPE *Release)( - ISearchAssistantOC3* This); + ISearchAssistantOC3 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -7028,7 +5578,7 @@ typedef struct ISearchAssistantOC3Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -7040,110 +5590,110 @@ typedef struct ISearchAssistantOC3Vtbl { /*** ISearchAssistantOC methods ***/ HRESULT (STDMETHODCALLTYPE *AddNextMenuItem)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, BSTR bstrText, LONG idItem); HRESULT (STDMETHODCALLTYPE *SetDefaultSearchUrl)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, BSTR bstrUrl); HRESULT (STDMETHODCALLTYPE *NavigateToDefaultSearch)( - ISearchAssistantOC3* This); + ISearchAssistantOC3 *This); HRESULT (STDMETHODCALLTYPE *IsRestricted)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, BSTR bstrGuid, VARIANT_BOOL *pVal); HRESULT (STDMETHODCALLTYPE *get_ShellFeaturesEnabled)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, VARIANT_BOOL *pVal); HRESULT (STDMETHODCALLTYPE *get_SearchAssistantDefault)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, VARIANT_BOOL *pVal); HRESULT (STDMETHODCALLTYPE *get_Searches)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, ISearches **ppid); HRESULT (STDMETHODCALLTYPE *get_InWebFolder)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, VARIANT_BOOL *pVal); HRESULT (STDMETHODCALLTYPE *PutProperty)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, VARIANT_BOOL bPerLocale, BSTR bstrName, BSTR bstrValue); HRESULT (STDMETHODCALLTYPE *GetProperty)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, VARIANT_BOOL bPerLocale, BSTR bstrName, BSTR *pbstrValue); HRESULT (STDMETHODCALLTYPE *put_EventHandled)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, VARIANT_BOOL rhs); HRESULT (STDMETHODCALLTYPE *ResetNextMenu)( - ISearchAssistantOC3* This); + ISearchAssistantOC3 *This); HRESULT (STDMETHODCALLTYPE *FindOnWeb)( - ISearchAssistantOC3* This); + ISearchAssistantOC3 *This); HRESULT (STDMETHODCALLTYPE *FindFilesOrFolders)( - ISearchAssistantOC3* This); + ISearchAssistantOC3 *This); HRESULT (STDMETHODCALLTYPE *FindComputer)( - ISearchAssistantOC3* This); + ISearchAssistantOC3 *This); HRESULT (STDMETHODCALLTYPE *FindPrinter)( - ISearchAssistantOC3* This); + ISearchAssistantOC3 *This); HRESULT (STDMETHODCALLTYPE *FindPeople)( - ISearchAssistantOC3* This); + ISearchAssistantOC3 *This); HRESULT (STDMETHODCALLTYPE *GetSearchAssistantURL)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, VARIANT_BOOL bSubstitute, VARIANT_BOOL bCustomize, BSTR *pbstrValue); HRESULT (STDMETHODCALLTYPE *NotifySearchSettingsChanged)( - ISearchAssistantOC3* This); + ISearchAssistantOC3 *This); HRESULT (STDMETHODCALLTYPE *put_ASProvider)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, BSTR pProvider); HRESULT (STDMETHODCALLTYPE *get_ASProvider)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, BSTR *pProvider); HRESULT (STDMETHODCALLTYPE *put_ASSetting)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, int pSetting); HRESULT (STDMETHODCALLTYPE *get_ASSetting)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, int *pSetting); HRESULT (STDMETHODCALLTYPE *NETDetectNextNavigate)( - ISearchAssistantOC3* This); + ISearchAssistantOC3 *This); HRESULT (STDMETHODCALLTYPE *PutFindText)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, BSTR FindText); HRESULT (STDMETHODCALLTYPE *get_Version)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, int *pVersion); HRESULT (STDMETHODCALLTYPE *EncodeString)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, BSTR bstrValue, BSTR bstrCharSet, VARIANT_BOOL bUseUTF8, @@ -7151,24 +5701,25 @@ typedef struct ISearchAssistantOC3Vtbl { /*** ISearchAssistantOC2 methods ***/ HRESULT (STDMETHODCALLTYPE *get_ShowFindPrinter)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, VARIANT_BOOL *pbShowFindPrinter); /*** ISearchAssistantOC3 methods ***/ HRESULT (STDMETHODCALLTYPE *get_SearchCompanionAvailable)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, VARIANT_BOOL *pbAvailable); HRESULT (STDMETHODCALLTYPE *put_UseSearchCompanion)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, VARIANT_BOOL pbUseSC); HRESULT (STDMETHODCALLTYPE *get_UseSearchCompanion)( - ISearchAssistantOC3* This, + ISearchAssistantOC3 *This, VARIANT_BOOL *pbUseSC); END_INTERFACE } ISearchAssistantOC3Vtbl; + interface ISearchAssistantOC3 { CONST_VTBL ISearchAssistantOC3Vtbl* lpVtbl; }; @@ -7343,30 +5894,6 @@ static FORCEINLINE HRESULT ISearchAssistantOC3_get_UseSearchCompanion(ISearchAss #endif -HRESULT STDMETHODCALLTYPE ISearchAssistantOC3_get_SearchCompanionAvailable_Proxy( - ISearchAssistantOC3* This, - VARIANT_BOOL *pbAvailable); -void __RPC_STUB ISearchAssistantOC3_get_SearchCompanionAvailable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC3_put_UseSearchCompanion_Proxy( - ISearchAssistantOC3* This, - VARIANT_BOOL pbUseSC); -void __RPC_STUB ISearchAssistantOC3_put_UseSearchCompanion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchAssistantOC3_get_UseSearchCompanion_Proxy( - ISearchAssistantOC3* This, - VARIANT_BOOL *pbUseSC); -void __RPC_STUB ISearchAssistantOC3_get_UseSearchCompanion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISearchAssistantOC3_INTERFACE_DEFINED__ */ @@ -7391,29 +5918,29 @@ typedef struct _SearchAssistantEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - _SearchAssistantEvents* This, + _SearchAssistantEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - _SearchAssistantEvents* This); + _SearchAssistantEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - _SearchAssistantEvents* This); + _SearchAssistantEvents *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - _SearchAssistantEvents* This, + _SearchAssistantEvents *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - _SearchAssistantEvents* This, + _SearchAssistantEvents *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - _SearchAssistantEvents* This, + _SearchAssistantEvents *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -7421,7 +5948,7 @@ typedef struct _SearchAssistantEventsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - _SearchAssistantEvents* This, + _SearchAssistantEvents *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -7433,6 +5960,7 @@ typedef struct _SearchAssistantEventsVtbl { END_INTERFACE } _SearchAssistantEventsVtbl; + interface _SearchAssistantEvents { CONST_VTBL _SearchAssistantEventsVtbl* lpVtbl; }; diff --git a/lib/libc/include/any-windows-any/expandedresources.h b/lib/libc/include/any-windows-any/expandedresources.h new file mode 100644 index 0000000000..fa9cb0d64d --- /dev/null +++ b/lib/libc/include/any-windows-any/expandedresources.h @@ -0,0 +1,20 @@ +/** + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. + */ +#ifndef __EXPANDEDRESOURCES_H__ +#define __EXPANDEDRESOURCES_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT WINAPI GetExpandedResourceExclusiveCpuCount(ULONG *exclusiveCpuCount); +HRESULT WINAPI HasExpandedResources(BOOL *hasExpandedResources); +HRESULT WINAPI ReleaseExclusiveCpuSets(VOID); + +#ifdef __cplusplus +} +#endif + +#endif /* __EXPANDEDRESOURCES_H__ */ diff --git a/lib/libc/include/any-windows-any/fileapi.h b/lib/libc/include/any-windows-any/fileapi.h index eb7ccc9a78..fc62d24f6b 100644 --- a/lib/libc/include/any-windows-any/fileapi.h +++ b/lib/libc/include/any-windows-any/fileapi.h @@ -26,7 +26,7 @@ extern "C" { #define INVALID_FILE_ATTRIBUTES ((DWORD)-1) #endif -#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || defined(WINSTORECOMPAT) +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= _WIN32_WINNT_WIN10 WINBASEAPI HANDLE WINAPI CreateFileW (LPCWSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile); #define CreateFile __MINGW_NAME_AW(CreateFile) WINBASEAPI DWORD WINAPI GetFileAttributesW (LPCWSTR lpFileName); @@ -49,36 +49,41 @@ WINBASEAPI DWORD WINAPI SetFilePointer (HANDLE hFile, LONG lDistanceToMove, PLON } BY_HANDLE_FILE_INFORMATION, *PBY_HANDLE_FILE_INFORMATION, *LPBY_HANDLE_FILE_INFORMATION; - WINBASEAPI LONG WINAPI CompareFileTime (CONST FILETIME *lpFileTime1, CONST FILETIME *lpFileTime2); WINBASEAPI HANDLE WINAPI CreateFileA (LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile); WINBASEAPI WINBOOL WINAPI DefineDosDeviceW (DWORD dwFlags, LPCWSTR lpDeviceName, LPCWSTR lpTargetPath); - WINBASEAPI WINBOOL WINAPI DeleteVolumeMountPointW (LPCWSTR lpszVolumeMountPoint); - WINBASEAPI WINBOOL WINAPI FileTimeToLocalFileTime (CONST FILETIME *lpFileTime, LPFILETIME lpLocalFileTime); WINBASEAPI WINBOOL WINAPI FindCloseChangeNotification (HANDLE hChangeHandle); WINBASEAPI HANDLE WINAPI FindFirstChangeNotificationA (LPCSTR lpPathName, WINBOOL bWatchSubtree, DWORD dwNotifyFilter); WINBASEAPI HANDLE WINAPI FindFirstChangeNotificationW (LPCWSTR lpPathName, WINBOOL bWatchSubtree, DWORD dwNotifyFilter); - WINBASEAPI HANDLE WINAPI FindFirstFileA (LPCSTR lpFileName, LPWIN32_FIND_DATAA lpFindFileData); - WINBASEAPI HANDLE WINAPI FindFirstFileW (LPCWSTR lpFileName, LPWIN32_FIND_DATAW lpFindFileData); WINBASEAPI HANDLE WINAPI FindFirstVolumeW (LPWSTR lpszVolumeName, DWORD cchBufferLength); WINBASEAPI WINBOOL WINAPI FindNextChangeNotification (HANDLE hChangeHandle); WINBASEAPI WINBOOL WINAPI FindNextVolumeW (HANDLE hFindVolume, LPWSTR lpszVolumeName, DWORD cchBufferLength); WINBASEAPI WINBOOL WINAPI FindVolumeClose (HANDLE hFindVolume); + WINBASEAPI WINBOOL WINAPI GetFileInformationByHandle (HANDLE hFile, LPBY_HANDLE_FILE_INFORMATION lpFileInformation); +#endif +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= _WIN32_WINNT_WIN10 + WINBASEAPI LONG WINAPI CompareFileTime (CONST FILETIME *lpFileTime1, CONST FILETIME *lpFileTime2); + WINBASEAPI WINBOOL WINAPI DeleteVolumeMountPointW (LPCWSTR lpszVolumeMountPoint); + WINBASEAPI WINBOOL WINAPI FileTimeToLocalFileTime (CONST FILETIME *lpFileTime, LPFILETIME lpLocalFileTime); + WINBASEAPI HANDLE WINAPI FindFirstFileA (LPCSTR lpFileName, LPWIN32_FIND_DATAA lpFindFileData); + WINBASEAPI HANDLE WINAPI FindFirstFileW (LPCWSTR lpFileName, LPWIN32_FIND_DATAW lpFindFileData); WINBASEAPI WINBOOL WINAPI GetDiskFreeSpaceA (LPCSTR lpRootPathName, LPDWORD lpSectorsPerCluster, LPDWORD lpBytesPerSector, LPDWORD lpNumberOfFreeClusters, LPDWORD lpTotalNumberOfClusters); WINBASEAPI WINBOOL WINAPI GetDiskFreeSpaceW (LPCWSTR lpRootPathName, LPDWORD lpSectorsPerCluster, LPDWORD lpBytesPerSector, LPDWORD lpNumberOfFreeClusters, LPDWORD lpTotalNumberOfClusters); WINBASEAPI UINT WINAPI GetDriveTypeA (LPCSTR lpRootPathName); WINBASEAPI UINT WINAPI GetDriveTypeW (LPCWSTR lpRootPathName); WINBASEAPI DWORD WINAPI GetFileAttributesA (LPCSTR lpFileName); - WINBASEAPI WINBOOL WINAPI GetFileInformationByHandle (HANDLE hFile, LPBY_HANDLE_FILE_INFORMATION lpFileInformation); WINBASEAPI WINBOOL WINAPI GetFileSizeEx (HANDLE hFile, PLARGE_INTEGER lpFileSize); WINBASEAPI WINBOOL WINAPI GetFileTime (HANDLE hFile, LPFILETIME lpCreationTime, LPFILETIME lpLastAccessTime, LPFILETIME lpLastWriteTime); WINBASEAPI DWORD WINAPI GetFileType (HANDLE hFile); WINBASEAPI DWORD WINAPI GetFullPathNameA (LPCSTR lpFileName, DWORD nBufferLength, LPSTR lpBuffer, LPSTR *lpFilePart); WINBASEAPI DWORD WINAPI GetFullPathNameW (LPCWSTR lpFileName, DWORD nBufferLength, LPWSTR lpBuffer, LPWSTR *lpFilePart); WINBASEAPI DWORD WINAPI GetLogicalDrives (VOID); +#endif +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) WINBASEAPI DWORD WINAPI GetLogicalDriveStringsW (DWORD nBufferLength, LPWSTR lpBuffer); WINBASEAPI DWORD WINAPI GetLongPathNameA (LPCSTR lpszShortPath, LPSTR lpszLongPath, DWORD cchBuffer); WINBASEAPI DWORD WINAPI GetLongPathNameW (LPCWSTR lpszShortPath, LPWSTR lpszLongPath, DWORD cchBuffer); WINBASEAPI DWORD WINAPI GetShortPathNameW (LPCWSTR lpszLongPath, LPWSTR lpszShortPath, DWORD cchBuffer); + WINBASEAPI UINT WINAPI GetTempFileNameA (LPCSTR lpPathName, LPCSTR lpPrefixString, UINT uUnique, LPSTR lpTempFileName); WINBASEAPI UINT WINAPI GetTempFileNameW (LPCWSTR lpPathName, LPCWSTR lpPrefixString, UINT uUnique, LPWSTR lpTempFileName); WINBASEAPI WINBOOL WINAPI GetVolumeInformationW (LPCWSTR lpRootPathName, LPWSTR lpVolumeNameBuffer, DWORD nVolumeNameSize, LPDWORD lpVolumeSerialNumber, LPDWORD lpMaximumComponentLength, LPDWORD lpFileSystemFlags, LPWSTR lpFileSystemNameBuffer, DWORD nFileSystemNameSize); WINBASEAPI WINBOOL WINAPI GetVolumePathNameW (LPCWSTR lpszFileName, LPWSTR lpszVolumePathName, DWORD cchBufferLength); @@ -94,6 +99,8 @@ WINBASEAPI DWORD WINAPI SetFilePointer (HANDLE hFile, LONG lDistanceToMove, PLON WINBASEAPI WINBOOL WINAPI WriteFileGather (HANDLE hFile, FILE_SEGMENT_ELEMENT aSegmentArray[], DWORD nNumberOfBytesToWrite, LPDWORD lpReserved, LPOVERLAPPED lpOverlapped); WINBASEAPI WINBOOL WINAPI GetVolumeNameForVolumeMountPointW (LPCWSTR lpszVolumeMountPoint, LPWSTR lpszVolumeName, DWORD cchBufferLength); WINBASEAPI WINBOOL WINAPI GetVolumePathNamesForVolumeNameW (LPCWSTR lpszVolumeName, LPWCH lpszVolumePathNames, DWORD cchBufferLength, PDWORD lpcchReturnLength); + WINBASEAPI DWORD WINAPI GetTempPathA (DWORD nBufferLength, LPSTR lpBuffer); + WINBASEAPI DWORD WINAPI GetTempPathW (DWORD nBufferLength, LPWSTR lpBuffer); #ifdef UNICODE #define DefineDosDevice DefineDosDeviceW @@ -102,7 +109,6 @@ WINBASEAPI DWORD WINAPI SetFilePointer (HANDLE hFile, LONG lDistanceToMove, PLON #define FindNextVolume FindNextVolumeW #define GetLogicalDriveStrings GetLogicalDriveStringsW #define GetShortPathName GetShortPathNameW -#define GetTempFileName GetTempFileNameW #define GetVolumeInformation GetVolumeInformationW #define GetVolumePathName GetVolumePathNameW #define QueryDosDevice QueryDosDeviceW @@ -115,6 +121,9 @@ WINBASEAPI DWORD WINAPI SetFilePointer (HANDLE hFile, LONG lDistanceToMove, PLON #define GetDriveType __MINGW_NAME_AW(GetDriveType) #define GetFullPathName __MINGW_NAME_AW(GetFullPathName) #define GetLongPathName __MINGW_NAME_AW(GetLongPathName) +#define GetTempPath __MINGW_NAME_AW(GetTempPath) +#define GetTempFileName __MINGW_NAME_AW(GetTempFileName) + #if _WIN32_WINNT >= 0x0600 WINBASEAPI DWORD WINAPI GetFinalPathNameByHandleA (HANDLE hFile, LPSTR lpszFilePath, DWORD cchFilePath, DWORD dwFlags); @@ -124,8 +133,8 @@ WINBASEAPI DWORD WINAPI SetFilePointer (HANDLE hFile, LONG lDistanceToMove, PLON #define GetFinalPathNameByHandle __MINGW_NAME_AW(GetFinalPathNameByHandle) #endif #endif - -#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP) + +#if WINAPI_FAMILY_PARTITION (WINAPI_FAMILY_DESKTOP_APP) typedef struct _WIN32_FILE_ATTRIBUTE_DATA { DWORD dwFileAttributes; FILETIME ftCreationTime; @@ -162,7 +171,6 @@ WINBASEAPI DWORD WINAPI SetFilePointer (HANDLE hFile, LONG lDistanceToMove, PLON WINBASEAPI DWORD WINAPI GetFileType (HANDLE hFile); WINBASEAPI WINBOOL WINAPI GetFileAttributesExA (LPCSTR lpFileName, GET_FILEEX_INFO_LEVELS fInfoLevelId, LPVOID lpFileInformation); WINBASEAPI WINBOOL WINAPI GetFileAttributesExW (LPCWSTR lpFileName, GET_FILEEX_INFO_LEVELS fInfoLevelId, LPVOID lpFileInformation); - WINBASEAPI DWORD WINAPI GetTempPathW (DWORD nBufferLength, LPWSTR lpBuffer); WINBASEAPI WINBOOL WINAPI LockFileEx (HANDLE hFile, DWORD dwFlags, DWORD dwReserved, DWORD nNumberOfBytesToLockLow, DWORD nNumberOfBytesToLockHigh, LPOVERLAPPED lpOverlapped); WINBASEAPI WINBOOL WINAPI ReadFile (HANDLE hFile, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, LPDWORD lpNumberOfBytesRead, LPOVERLAPPED lpOverlapped); WINBASEAPI WINBOOL WINAPI RemoveDirectoryA (LPCSTR lpPathName); @@ -182,9 +190,6 @@ WINBASEAPI DWORD WINAPI SetFilePointer (HANDLE hFile, LONG lDistanceToMove, PLON #define GetFileAttributesEx __MINGW_NAME_AW(GetFileAttributesEx) #define RemoveDirectory __MINGW_NAME_AW(RemoveDirectory) #define SetFileAttributes __MINGW_NAME_AW(SetFileAttributes) -#ifdef UNICODE -#define GetTempPath GetTempPathW -#endif #if _WIN32_WINNT >= 0x0600 WINBASEAPI WINBOOL WINAPI SetFileInformationByHandle (HANDLE hFile, FILE_INFO_BY_HANDLE_CLASS FileInformationClass, LPVOID lpFileInformation, DWORD dwBufferSize); diff --git a/lib/libc/include/any-windows-any/filter.h b/lib/libc/include/any-windows-any/filter.h index dd6f61a454..299384281f 100644 --- a/lib/libc/include/any-windows-any/filter.h +++ b/lib/libc/include/any-windows-any/filter.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/filter.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/filter.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,6 +21,9 @@ #ifndef __IFilter_FWD_DEFINED__ #define __IFilter_FWD_DEFINED__ typedef interface IFilter IFilter; +#ifdef __cplusplus +interface IFilter; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -35,6 +39,9 @@ extern "C" { #ifndef __IFilter_FWD_DEFINED__ #define __IFilter_FWD_DEFINED__ typedef interface IFilter IFilter; +#ifdef __cplusplus +interface IFilter; +#endif /* __cplusplus */ #endif #include @@ -158,45 +165,46 @@ typedef struct IFilterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFilter* This, + IFilter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFilter* This); + IFilter *This); ULONG (STDMETHODCALLTYPE *Release)( - IFilter* This); + IFilter *This); /*** IFilter methods ***/ SCODE (STDMETHODCALLTYPE *Init)( - IFilter* This, + IFilter *This, ULONG grfFlags, ULONG cAttributes, const FULLPROPSPEC *aAttributes, ULONG *pFlags); SCODE (STDMETHODCALLTYPE *GetChunk)( - IFilter* This, + IFilter *This, STAT_CHUNK *pStat); SCODE (STDMETHODCALLTYPE *GetText)( - IFilter* This, + IFilter *This, ULONG *pcwcBuffer, WCHAR *awcBuffer); SCODE (STDMETHODCALLTYPE *GetValue)( - IFilter* This, + IFilter *This, PROPVARIANT **ppPropValue); SCODE (STDMETHODCALLTYPE *BindRegion)( - IFilter* This, + IFilter *This, FILTERREGION origPos, REFIID riid, void **ppunk); END_INTERFACE } IFilterVtbl; + interface IFilter { CONST_VTBL IFilterVtbl* lpVtbl; }; @@ -245,42 +253,6 @@ static FORCEINLINE SCODE IFilter_BindRegion(IFilter* This,FILTERREGION origPos,R #endif -SCODE STDMETHODCALLTYPE IFilter_Init_Proxy( - IFilter* This, - ULONG grfFlags, - ULONG cAttributes, - const FULLPROPSPEC *aAttributes, - ULONG *pFlags); -void __RPC_STUB IFilter_Init_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -SCODE STDMETHODCALLTYPE IFilter_GetChunk_Proxy( - IFilter* This, - STAT_CHUNK *pStat); -void __RPC_STUB IFilter_GetChunk_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -SCODE STDMETHODCALLTYPE IFilter_GetText_Proxy( - IFilter* This, - ULONG *pcwcBuffer, - WCHAR *awcBuffer); -void __RPC_STUB IFilter_GetText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -SCODE STDMETHODCALLTYPE IFilter_GetValue_Proxy( - IFilter* This, - PROPVARIANT **ppPropValue); -void __RPC_STUB IFilter_GetValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFilter_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/fsrm.h b/lib/libc/include/any-windows-any/fsrm.h index 7d78b4a0a6..b7dfb12ebf 100644 --- a/lib/libc/include/any-windows-any/fsrm.h +++ b/lib/libc/include/any-windows-any/fsrm.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/fsrm.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/fsrm.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,76 +21,121 @@ #ifndef __IFsrmCommittableCollection_FWD_DEFINED__ #define __IFsrmCommittableCollection_FWD_DEFINED__ typedef interface IFsrmCommittableCollection IFsrmCommittableCollection; +#ifdef __cplusplus +interface IFsrmCommittableCollection; +#endif /* __cplusplus */ #endif #ifndef __IFsrmAccessDeniedRemediationClient_FWD_DEFINED__ #define __IFsrmAccessDeniedRemediationClient_FWD_DEFINED__ typedef interface IFsrmAccessDeniedRemediationClient IFsrmAccessDeniedRemediationClient; +#ifdef __cplusplus +interface IFsrmAccessDeniedRemediationClient; +#endif /* __cplusplus */ #endif #ifndef __IFsrmAction_FWD_DEFINED__ #define __IFsrmAction_FWD_DEFINED__ typedef interface IFsrmAction IFsrmAction; +#ifdef __cplusplus +interface IFsrmAction; +#endif /* __cplusplus */ #endif #ifndef __IFsrmActionCommand_FWD_DEFINED__ #define __IFsrmActionCommand_FWD_DEFINED__ typedef interface IFsrmActionCommand IFsrmActionCommand; +#ifdef __cplusplus +interface IFsrmActionCommand; +#endif /* __cplusplus */ #endif #ifndef __IFsrmActionEventLog_FWD_DEFINED__ #define __IFsrmActionEventLog_FWD_DEFINED__ typedef interface IFsrmActionEventLog IFsrmActionEventLog; +#ifdef __cplusplus +interface IFsrmActionEventLog; +#endif /* __cplusplus */ #endif #ifndef __IFsrmActionReport_FWD_DEFINED__ #define __IFsrmActionReport_FWD_DEFINED__ typedef interface IFsrmActionReport IFsrmActionReport; +#ifdef __cplusplus +interface IFsrmActionReport; +#endif /* __cplusplus */ #endif #ifndef __IFsrmCollection_FWD_DEFINED__ #define __IFsrmCollection_FWD_DEFINED__ typedef interface IFsrmCollection IFsrmCollection; +#ifdef __cplusplus +interface IFsrmCollection; +#endif /* __cplusplus */ #endif #ifndef __IFsrmDerivedObjectsResult_FWD_DEFINED__ #define __IFsrmDerivedObjectsResult_FWD_DEFINED__ typedef interface IFsrmDerivedObjectsResult IFsrmDerivedObjectsResult; +#ifdef __cplusplus +interface IFsrmDerivedObjectsResult; +#endif /* __cplusplus */ #endif #ifndef __IFsrmExportImport_FWD_DEFINED__ #define __IFsrmExportImport_FWD_DEFINED__ typedef interface IFsrmExportImport IFsrmExportImport; +#ifdef __cplusplus +interface IFsrmExportImport; +#endif /* __cplusplus */ #endif #ifndef __IFsrmObject_FWD_DEFINED__ #define __IFsrmObject_FWD_DEFINED__ typedef interface IFsrmObject IFsrmObject; +#ifdef __cplusplus +interface IFsrmObject; +#endif /* __cplusplus */ #endif #ifndef __IFsrmPathMapper_FWD_DEFINED__ #define __IFsrmPathMapper_FWD_DEFINED__ typedef interface IFsrmPathMapper IFsrmPathMapper; +#ifdef __cplusplus +interface IFsrmPathMapper; +#endif /* __cplusplus */ #endif #ifndef __IFsrmSetting_FWD_DEFINED__ #define __IFsrmSetting_FWD_DEFINED__ typedef interface IFsrmSetting IFsrmSetting; +#ifdef __cplusplus +interface IFsrmSetting; +#endif /* __cplusplus */ #endif #ifndef __IFsrmActionEmail_FWD_DEFINED__ #define __IFsrmActionEmail_FWD_DEFINED__ typedef interface IFsrmActionEmail IFsrmActionEmail; +#ifdef __cplusplus +interface IFsrmActionEmail; +#endif /* __cplusplus */ #endif #ifndef __IFsrmActionEmail2_FWD_DEFINED__ #define __IFsrmActionEmail2_FWD_DEFINED__ typedef interface IFsrmActionEmail2 IFsrmActionEmail2; +#ifdef __cplusplus +interface IFsrmActionEmail2; +#endif /* __cplusplus */ #endif #ifndef __IFsrmMutableCollection_FWD_DEFINED__ #define __IFsrmMutableCollection_FWD_DEFINED__ typedef interface IFsrmMutableCollection IFsrmMutableCollection; +#ifdef __cplusplus +interface IFsrmMutableCollection; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -107,61 +153,97 @@ extern "C" { #ifndef __IFsrmObject_FWD_DEFINED__ #define __IFsrmObject_FWD_DEFINED__ typedef interface IFsrmObject IFsrmObject; +#ifdef __cplusplus +interface IFsrmObject; +#endif /* __cplusplus */ #endif #ifndef __IFsrmCollection_FWD_DEFINED__ #define __IFsrmCollection_FWD_DEFINED__ typedef interface IFsrmCollection IFsrmCollection; +#ifdef __cplusplus +interface IFsrmCollection; +#endif /* __cplusplus */ #endif #ifndef __IFsrmMutableCollection_FWD_DEFINED__ #define __IFsrmMutableCollection_FWD_DEFINED__ typedef interface IFsrmMutableCollection IFsrmMutableCollection; +#ifdef __cplusplus +interface IFsrmMutableCollection; +#endif /* __cplusplus */ #endif #ifndef __IFsrmCommittableCollection_FWD_DEFINED__ #define __IFsrmCommittableCollection_FWD_DEFINED__ typedef interface IFsrmCommittableCollection IFsrmCommittableCollection; +#ifdef __cplusplus +interface IFsrmCommittableCollection; +#endif /* __cplusplus */ #endif #ifndef __IFsrmAction_FWD_DEFINED__ #define __IFsrmAction_FWD_DEFINED__ typedef interface IFsrmAction IFsrmAction; +#ifdef __cplusplus +interface IFsrmAction; +#endif /* __cplusplus */ #endif #ifndef __IFsrmActionEmail_FWD_DEFINED__ #define __IFsrmActionEmail_FWD_DEFINED__ typedef interface IFsrmActionEmail IFsrmActionEmail; +#ifdef __cplusplus +interface IFsrmActionEmail; +#endif /* __cplusplus */ #endif #ifndef __IFsrmActionReport_FWD_DEFINED__ #define __IFsrmActionReport_FWD_DEFINED__ typedef interface IFsrmActionReport IFsrmActionReport; +#ifdef __cplusplus +interface IFsrmActionReport; +#endif /* __cplusplus */ #endif #ifndef __IFsrmActionEventLog_FWD_DEFINED__ #define __IFsrmActionEventLog_FWD_DEFINED__ typedef interface IFsrmActionEventLog IFsrmActionEventLog; +#ifdef __cplusplus +interface IFsrmActionEventLog; +#endif /* __cplusplus */ #endif #ifndef __IFsrmActionCommand_FWD_DEFINED__ #define __IFsrmActionCommand_FWD_DEFINED__ typedef interface IFsrmActionCommand IFsrmActionCommand; +#ifdef __cplusplus +interface IFsrmActionCommand; +#endif /* __cplusplus */ #endif #ifndef __IFsrmSetting_FWD_DEFINED__ #define __IFsrmSetting_FWD_DEFINED__ typedef interface IFsrmSetting IFsrmSetting; +#ifdef __cplusplus +interface IFsrmSetting; +#endif /* __cplusplus */ #endif #ifndef __IFsrmPathMapper_FWD_DEFINED__ #define __IFsrmPathMapper_FWD_DEFINED__ typedef interface IFsrmPathMapper IFsrmPathMapper; +#ifdef __cplusplus +interface IFsrmPathMapper; +#endif /* __cplusplus */ #endif #ifndef __IFsrmExportImport_FWD_DEFINED__ #define __IFsrmExportImport_FWD_DEFINED__ typedef interface IFsrmExportImport IFsrmExportImport; +#ifdef __cplusplus +interface IFsrmExportImport; +#endif /* __cplusplus */ #endif #define FSRM_DISPID_FEATURE_MASK (0xf000000) @@ -249,29 +331,29 @@ typedef struct IFsrmCommittableCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmCommittableCollection* This, + IFsrmCommittableCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmCommittableCollection* This); + IFsrmCommittableCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmCommittableCollection* This); + IFsrmCommittableCollection *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmCommittableCollection* This, + IFsrmCommittableCollection *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmCommittableCollection* This, + IFsrmCommittableCollection *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmCommittableCollection* This, + IFsrmCommittableCollection *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -279,7 +361,7 @@ typedef struct IFsrmCommittableCollectionVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmCommittableCollection* This, + IFsrmCommittableCollection *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -291,60 +373,61 @@ typedef struct IFsrmCommittableCollectionVtbl { /*** IFsrmCollection methods ***/ HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - IFsrmCommittableCollection* This, + IFsrmCommittableCollection *This, IUnknown **unknown); HRESULT (STDMETHODCALLTYPE *get_Item)( - IFsrmCommittableCollection* This, + IFsrmCommittableCollection *This, LONG index, VARIANT *item); HRESULT (STDMETHODCALLTYPE *get_Count)( - IFsrmCommittableCollection* This, + IFsrmCommittableCollection *This, LONG *count); HRESULT (STDMETHODCALLTYPE *get_State)( - IFsrmCommittableCollection* This, + IFsrmCommittableCollection *This, FsrmCollectionState *state); HRESULT (STDMETHODCALLTYPE *Cancel)( - IFsrmCommittableCollection* This); + IFsrmCommittableCollection *This); HRESULT (STDMETHODCALLTYPE *WaitForCompletion)( - IFsrmCommittableCollection* This, + IFsrmCommittableCollection *This, LONG waitSeconds, VARIANT_BOOL *completed); HRESULT (STDMETHODCALLTYPE *GetById)( - IFsrmCommittableCollection* This, + IFsrmCommittableCollection *This, FSRM_OBJECT_ID id, VARIANT *entry); /*** IFsrmMutableCollection methods ***/ HRESULT (STDMETHODCALLTYPE *Add)( - IFsrmCommittableCollection* This, + IFsrmCommittableCollection *This, VARIANT item); HRESULT (STDMETHODCALLTYPE *Remove)( - IFsrmCommittableCollection* This, + IFsrmCommittableCollection *This, LONG index); HRESULT (STDMETHODCALLTYPE *RemoveById)( - IFsrmCommittableCollection* This, + IFsrmCommittableCollection *This, FSRM_OBJECT_ID id); HRESULT (STDMETHODCALLTYPE *Clone)( - IFsrmCommittableCollection* This, + IFsrmCommittableCollection *This, IFsrmMutableCollection **collection); /*** IFsrmCommittableCollection methods ***/ HRESULT (STDMETHODCALLTYPE *Commit)( - IFsrmCommittableCollection* This, + IFsrmCommittableCollection *This, FsrmCommitOptions options, IFsrmCollection **results); END_INTERFACE } IFsrmCommittableCollectionVtbl; + interface IFsrmCommittableCollection { CONST_VTBL IFsrmCommittableCollectionVtbl* lpVtbl; }; @@ -443,15 +526,6 @@ static FORCEINLINE HRESULT IFsrmCommittableCollection_Commit(IFsrmCommittableCol #endif -HRESULT STDMETHODCALLTYPE IFsrmCommittableCollection_Commit_Proxy( - IFsrmCommittableCollection* This, - FsrmCommitOptions options, - IFsrmCollection **results); -void __RPC_STUB IFsrmCommittableCollection_Commit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmCommittableCollection_INTERFACE_DEFINED__ */ @@ -485,29 +559,29 @@ typedef struct IFsrmAccessDeniedRemediationClientVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmAccessDeniedRemediationClient* This, + IFsrmAccessDeniedRemediationClient *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmAccessDeniedRemediationClient* This); + IFsrmAccessDeniedRemediationClient *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmAccessDeniedRemediationClient* This); + IFsrmAccessDeniedRemediationClient *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmAccessDeniedRemediationClient* This, + IFsrmAccessDeniedRemediationClient *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmAccessDeniedRemediationClient* This, + IFsrmAccessDeniedRemediationClient *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmAccessDeniedRemediationClient* This, + IFsrmAccessDeniedRemediationClient *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -515,7 +589,7 @@ typedef struct IFsrmAccessDeniedRemediationClientVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmAccessDeniedRemediationClient* This, + IFsrmAccessDeniedRemediationClient *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -527,7 +601,7 @@ typedef struct IFsrmAccessDeniedRemediationClientVtbl { /*** IFsrmAccessDeniedRemediationClient methods ***/ HRESULT (STDMETHODCALLTYPE *Show)( - IFsrmAccessDeniedRemediationClient* This, + IFsrmAccessDeniedRemediationClient *This, ULONG_PTR parentWnd, BSTR accessPath, AdrClientErrorType errorType, @@ -538,6 +612,7 @@ typedef struct IFsrmAccessDeniedRemediationClientVtbl { END_INTERFACE } IFsrmAccessDeniedRemediationClientVtbl; + interface IFsrmAccessDeniedRemediationClient { CONST_VTBL IFsrmAccessDeniedRemediationClientVtbl* lpVtbl; }; @@ -588,20 +663,6 @@ static FORCEINLINE HRESULT IFsrmAccessDeniedRemediationClient_Show(IFsrmAccessDe #endif -HRESULT STDMETHODCALLTYPE IFsrmAccessDeniedRemediationClient_Show_Proxy( - IFsrmAccessDeniedRemediationClient* This, - ULONG_PTR parentWnd, - BSTR accessPath, - AdrClientErrorType errorType, - LONG flags, - BSTR windowTitle, - BSTR windowMessage, - LONG *result); -void __RPC_STUB IFsrmAccessDeniedRemediationClient_Show_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmAccessDeniedRemediationClient_INTERFACE_DEFINED__ */ @@ -641,29 +702,29 @@ typedef struct IFsrmActionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmAction* This, + IFsrmAction *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmAction* This); + IFsrmAction *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmAction* This); + IFsrmAction *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmAction* This, + IFsrmAction *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmAction* This, + IFsrmAction *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmAction* This, + IFsrmAction *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -671,7 +732,7 @@ typedef struct IFsrmActionVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmAction* This, + IFsrmAction *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -683,26 +744,27 @@ typedef struct IFsrmActionVtbl { /*** IFsrmAction methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - IFsrmAction* This, + IFsrmAction *This, FSRM_OBJECT_ID *id); HRESULT (STDMETHODCALLTYPE *get_ActionType)( - IFsrmAction* This, + IFsrmAction *This, FsrmActionType *actionType); HRESULT (STDMETHODCALLTYPE *get_RunLimitInterval)( - IFsrmAction* This, + IFsrmAction *This, LONG *minutes); HRESULT (STDMETHODCALLTYPE *put_RunLimitInterval)( - IFsrmAction* This, + IFsrmAction *This, LONG minutes); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmAction* This); + IFsrmAction *This); END_INTERFACE } IFsrmActionVtbl; + interface IFsrmAction { CONST_VTBL IFsrmActionVtbl* lpVtbl; }; @@ -769,45 +831,6 @@ static FORCEINLINE HRESULT IFsrmAction_Delete(IFsrmAction* This) { #endif -HRESULT STDMETHODCALLTYPE IFsrmAction_get_Id_Proxy( - IFsrmAction* This, - FSRM_OBJECT_ID *id); -void __RPC_STUB IFsrmAction_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmAction_get_ActionType_Proxy( - IFsrmAction* This, - FsrmActionType *actionType); -void __RPC_STUB IFsrmAction_get_ActionType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmAction_get_RunLimitInterval_Proxy( - IFsrmAction* This, - LONG *minutes); -void __RPC_STUB IFsrmAction_get_RunLimitInterval_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmAction_put_RunLimitInterval_Proxy( - IFsrmAction* This, - LONG minutes); -void __RPC_STUB IFsrmAction_put_RunLimitInterval_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmAction_Delete_Proxy( - IFsrmAction* This); -void __RPC_STUB IFsrmAction_Delete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmAction_INTERFACE_DEFINED__ */ @@ -874,29 +897,29 @@ typedef struct IFsrmActionCommandVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmActionCommand* This, + IFsrmActionCommand *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmActionCommand* This); + IFsrmActionCommand *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmActionCommand* This); + IFsrmActionCommand *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmActionCommand* This, + IFsrmActionCommand *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmActionCommand* This, + IFsrmActionCommand *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmActionCommand* This, + IFsrmActionCommand *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -904,7 +927,7 @@ typedef struct IFsrmActionCommandVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmActionCommand* This, + IFsrmActionCommand *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -916,83 +939,84 @@ typedef struct IFsrmActionCommandVtbl { /*** IFsrmAction methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - IFsrmActionCommand* This, + IFsrmActionCommand *This, FSRM_OBJECT_ID *id); HRESULT (STDMETHODCALLTYPE *get_ActionType)( - IFsrmActionCommand* This, + IFsrmActionCommand *This, FsrmActionType *actionType); HRESULT (STDMETHODCALLTYPE *get_RunLimitInterval)( - IFsrmActionCommand* This, + IFsrmActionCommand *This, LONG *minutes); HRESULT (STDMETHODCALLTYPE *put_RunLimitInterval)( - IFsrmActionCommand* This, + IFsrmActionCommand *This, LONG minutes); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmActionCommand* This); + IFsrmActionCommand *This); /*** IFsrmActionCommand methods ***/ HRESULT (STDMETHODCALLTYPE *get_ExecutablePath)( - IFsrmActionCommand* This, + IFsrmActionCommand *This, BSTR *executablePath); HRESULT (STDMETHODCALLTYPE *put_ExecutablePath)( - IFsrmActionCommand* This, + IFsrmActionCommand *This, BSTR executablePath); HRESULT (STDMETHODCALLTYPE *get_Arguments)( - IFsrmActionCommand* This, + IFsrmActionCommand *This, BSTR *arguments); HRESULT (STDMETHODCALLTYPE *put_Arguments)( - IFsrmActionCommand* This, + IFsrmActionCommand *This, BSTR arguments); HRESULT (STDMETHODCALLTYPE *get_Account)( - IFsrmActionCommand* This, + IFsrmActionCommand *This, FsrmAccountType *account); HRESULT (STDMETHODCALLTYPE *put_Account)( - IFsrmActionCommand* This, + IFsrmActionCommand *This, FsrmAccountType account); HRESULT (STDMETHODCALLTYPE *get_WorkingDirectory)( - IFsrmActionCommand* This, + IFsrmActionCommand *This, BSTR *workingDirectory); HRESULT (STDMETHODCALLTYPE *put_WorkingDirectory)( - IFsrmActionCommand* This, + IFsrmActionCommand *This, BSTR workingDirectory); HRESULT (STDMETHODCALLTYPE *get_MonitorCommand)( - IFsrmActionCommand* This, + IFsrmActionCommand *This, VARIANT_BOOL *monitorCommand); HRESULT (STDMETHODCALLTYPE *put_MonitorCommand)( - IFsrmActionCommand* This, + IFsrmActionCommand *This, VARIANT_BOOL monitorCommand); HRESULT (STDMETHODCALLTYPE *get_KillTimeOut)( - IFsrmActionCommand* This, + IFsrmActionCommand *This, LONG *minutes); HRESULT (STDMETHODCALLTYPE *put_KillTimeOut)( - IFsrmActionCommand* This, + IFsrmActionCommand *This, LONG minutes); HRESULT (STDMETHODCALLTYPE *get_LogResult)( - IFsrmActionCommand* This, + IFsrmActionCommand *This, VARIANT_BOOL *logResults); HRESULT (STDMETHODCALLTYPE *put_LogResult)( - IFsrmActionCommand* This, + IFsrmActionCommand *This, VARIANT_BOOL logResults); END_INTERFACE } IFsrmActionCommandVtbl; + interface IFsrmActionCommand { CONST_VTBL IFsrmActionCommandVtbl* lpVtbl; }; @@ -1117,118 +1141,6 @@ static FORCEINLINE HRESULT IFsrmActionCommand_put_LogResult(IFsrmActionCommand* #endif -HRESULT STDMETHODCALLTYPE IFsrmActionCommand_get_ExecutablePath_Proxy( - IFsrmActionCommand* This, - BSTR *executablePath); -void __RPC_STUB IFsrmActionCommand_get_ExecutablePath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionCommand_put_ExecutablePath_Proxy( - IFsrmActionCommand* This, - BSTR executablePath); -void __RPC_STUB IFsrmActionCommand_put_ExecutablePath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionCommand_get_Arguments_Proxy( - IFsrmActionCommand* This, - BSTR *arguments); -void __RPC_STUB IFsrmActionCommand_get_Arguments_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionCommand_put_Arguments_Proxy( - IFsrmActionCommand* This, - BSTR arguments); -void __RPC_STUB IFsrmActionCommand_put_Arguments_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionCommand_get_Account_Proxy( - IFsrmActionCommand* This, - FsrmAccountType *account); -void __RPC_STUB IFsrmActionCommand_get_Account_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionCommand_put_Account_Proxy( - IFsrmActionCommand* This, - FsrmAccountType account); -void __RPC_STUB IFsrmActionCommand_put_Account_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionCommand_get_WorkingDirectory_Proxy( - IFsrmActionCommand* This, - BSTR *workingDirectory); -void __RPC_STUB IFsrmActionCommand_get_WorkingDirectory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionCommand_put_WorkingDirectory_Proxy( - IFsrmActionCommand* This, - BSTR workingDirectory); -void __RPC_STUB IFsrmActionCommand_put_WorkingDirectory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionCommand_get_MonitorCommand_Proxy( - IFsrmActionCommand* This, - VARIANT_BOOL *monitorCommand); -void __RPC_STUB IFsrmActionCommand_get_MonitorCommand_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionCommand_put_MonitorCommand_Proxy( - IFsrmActionCommand* This, - VARIANT_BOOL monitorCommand); -void __RPC_STUB IFsrmActionCommand_put_MonitorCommand_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionCommand_get_KillTimeOut_Proxy( - IFsrmActionCommand* This, - LONG *minutes); -void __RPC_STUB IFsrmActionCommand_get_KillTimeOut_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionCommand_put_KillTimeOut_Proxy( - IFsrmActionCommand* This, - LONG minutes); -void __RPC_STUB IFsrmActionCommand_put_KillTimeOut_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionCommand_get_LogResult_Proxy( - IFsrmActionCommand* This, - VARIANT_BOOL *logResults); -void __RPC_STUB IFsrmActionCommand_get_LogResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionCommand_put_LogResult_Proxy( - IFsrmActionCommand* This, - VARIANT_BOOL logResults); -void __RPC_STUB IFsrmActionCommand_put_LogResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmActionCommand_INTERFACE_DEFINED__ */ @@ -1265,29 +1177,29 @@ typedef struct IFsrmActionEventLogVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmActionEventLog* This, + IFsrmActionEventLog *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmActionEventLog* This); + IFsrmActionEventLog *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmActionEventLog* This); + IFsrmActionEventLog *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmActionEventLog* This, + IFsrmActionEventLog *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmActionEventLog* This, + IFsrmActionEventLog *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmActionEventLog* This, + IFsrmActionEventLog *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1295,7 +1207,7 @@ typedef struct IFsrmActionEventLogVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmActionEventLog* This, + IFsrmActionEventLog *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1307,43 +1219,44 @@ typedef struct IFsrmActionEventLogVtbl { /*** IFsrmAction methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - IFsrmActionEventLog* This, + IFsrmActionEventLog *This, FSRM_OBJECT_ID *id); HRESULT (STDMETHODCALLTYPE *get_ActionType)( - IFsrmActionEventLog* This, + IFsrmActionEventLog *This, FsrmActionType *actionType); HRESULT (STDMETHODCALLTYPE *get_RunLimitInterval)( - IFsrmActionEventLog* This, + IFsrmActionEventLog *This, LONG *minutes); HRESULT (STDMETHODCALLTYPE *put_RunLimitInterval)( - IFsrmActionEventLog* This, + IFsrmActionEventLog *This, LONG minutes); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmActionEventLog* This); + IFsrmActionEventLog *This); /*** IFsrmActionEventLog methods ***/ HRESULT (STDMETHODCALLTYPE *get_EventType)( - IFsrmActionEventLog* This, + IFsrmActionEventLog *This, FsrmEventType *eventType); HRESULT (STDMETHODCALLTYPE *put_EventType)( - IFsrmActionEventLog* This, + IFsrmActionEventLog *This, FsrmEventType eventType); HRESULT (STDMETHODCALLTYPE *get_MessageText)( - IFsrmActionEventLog* This, + IFsrmActionEventLog *This, BSTR *messageText); HRESULT (STDMETHODCALLTYPE *put_MessageText)( - IFsrmActionEventLog* This, + IFsrmActionEventLog *This, BSTR messageText); END_INTERFACE } IFsrmActionEventLogVtbl; + interface IFsrmActionEventLog { CONST_VTBL IFsrmActionEventLogVtbl* lpVtbl; }; @@ -1428,38 +1341,6 @@ static FORCEINLINE HRESULT IFsrmActionEventLog_put_MessageText(IFsrmActionEventL #endif -HRESULT STDMETHODCALLTYPE IFsrmActionEventLog_get_EventType_Proxy( - IFsrmActionEventLog* This, - FsrmEventType *eventType); -void __RPC_STUB IFsrmActionEventLog_get_EventType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionEventLog_put_EventType_Proxy( - IFsrmActionEventLog* This, - FsrmEventType eventType); -void __RPC_STUB IFsrmActionEventLog_put_EventType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionEventLog_get_MessageText_Proxy( - IFsrmActionEventLog* This, - BSTR *messageText); -void __RPC_STUB IFsrmActionEventLog_get_MessageText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionEventLog_put_MessageText_Proxy( - IFsrmActionEventLog* This, - BSTR messageText); -void __RPC_STUB IFsrmActionEventLog_put_MessageText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmActionEventLog_INTERFACE_DEFINED__ */ @@ -1496,29 +1377,29 @@ typedef struct IFsrmActionReportVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmActionReport* This, + IFsrmActionReport *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmActionReport* This); + IFsrmActionReport *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmActionReport* This); + IFsrmActionReport *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmActionReport* This, + IFsrmActionReport *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmActionReport* This, + IFsrmActionReport *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmActionReport* This, + IFsrmActionReport *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1526,7 +1407,7 @@ typedef struct IFsrmActionReportVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmActionReport* This, + IFsrmActionReport *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1538,43 +1419,44 @@ typedef struct IFsrmActionReportVtbl { /*** IFsrmAction methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - IFsrmActionReport* This, + IFsrmActionReport *This, FSRM_OBJECT_ID *id); HRESULT (STDMETHODCALLTYPE *get_ActionType)( - IFsrmActionReport* This, + IFsrmActionReport *This, FsrmActionType *actionType); HRESULT (STDMETHODCALLTYPE *get_RunLimitInterval)( - IFsrmActionReport* This, + IFsrmActionReport *This, LONG *minutes); HRESULT (STDMETHODCALLTYPE *put_RunLimitInterval)( - IFsrmActionReport* This, + IFsrmActionReport *This, LONG minutes); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmActionReport* This); + IFsrmActionReport *This); /*** IFsrmActionReport methods ***/ HRESULT (STDMETHODCALLTYPE *get_ReportTypes)( - IFsrmActionReport* This, + IFsrmActionReport *This, SAFEARRAY **reportTypes); HRESULT (STDMETHODCALLTYPE *put_ReportTypes)( - IFsrmActionReport* This, + IFsrmActionReport *This, SAFEARRAY *reportTypes); HRESULT (STDMETHODCALLTYPE *get_MailTo)( - IFsrmActionReport* This, + IFsrmActionReport *This, BSTR *mailTo); HRESULT (STDMETHODCALLTYPE *put_MailTo)( - IFsrmActionReport* This, + IFsrmActionReport *This, BSTR mailTo); END_INTERFACE } IFsrmActionReportVtbl; + interface IFsrmActionReport { CONST_VTBL IFsrmActionReportVtbl* lpVtbl; }; @@ -1659,38 +1541,6 @@ static FORCEINLINE HRESULT IFsrmActionReport_put_MailTo(IFsrmActionReport* This, #endif -HRESULT STDMETHODCALLTYPE IFsrmActionReport_get_ReportTypes_Proxy( - IFsrmActionReport* This, - SAFEARRAY **reportTypes); -void __RPC_STUB IFsrmActionReport_get_ReportTypes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionReport_put_ReportTypes_Proxy( - IFsrmActionReport* This, - SAFEARRAY *reportTypes); -void __RPC_STUB IFsrmActionReport_put_ReportTypes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionReport_get_MailTo_Proxy( - IFsrmActionReport* This, - BSTR *mailTo); -void __RPC_STUB IFsrmActionReport_get_MailTo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionReport_put_MailTo_Proxy( - IFsrmActionReport* This, - BSTR mailTo); -void __RPC_STUB IFsrmActionReport_put_MailTo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmActionReport_INTERFACE_DEFINED__ */ @@ -1739,29 +1589,29 @@ typedef struct IFsrmCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmCollection* This, + IFsrmCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmCollection* This); + IFsrmCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmCollection* This); + IFsrmCollection *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmCollection* This, + IFsrmCollection *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmCollection* This, + IFsrmCollection *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmCollection* This, + IFsrmCollection *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1769,7 +1619,7 @@ typedef struct IFsrmCollectionVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmCollection* This, + IFsrmCollection *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1781,37 +1631,38 @@ typedef struct IFsrmCollectionVtbl { /*** IFsrmCollection methods ***/ HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - IFsrmCollection* This, + IFsrmCollection *This, IUnknown **unknown); HRESULT (STDMETHODCALLTYPE *get_Item)( - IFsrmCollection* This, + IFsrmCollection *This, LONG index, VARIANT *item); HRESULT (STDMETHODCALLTYPE *get_Count)( - IFsrmCollection* This, + IFsrmCollection *This, LONG *count); HRESULT (STDMETHODCALLTYPE *get_State)( - IFsrmCollection* This, + IFsrmCollection *This, FsrmCollectionState *state); HRESULT (STDMETHODCALLTYPE *Cancel)( - IFsrmCollection* This); + IFsrmCollection *This); HRESULT (STDMETHODCALLTYPE *WaitForCompletion)( - IFsrmCollection* This, + IFsrmCollection *This, LONG waitSeconds, VARIANT_BOOL *completed); HRESULT (STDMETHODCALLTYPE *GetById)( - IFsrmCollection* This, + IFsrmCollection *This, FSRM_OBJECT_ID id, VARIANT *entry); END_INTERFACE } IFsrmCollectionVtbl; + interface IFsrmCollection { CONST_VTBL IFsrmCollectionVtbl* lpVtbl; }; @@ -1886,64 +1737,6 @@ static FORCEINLINE HRESULT IFsrmCollection_GetById(IFsrmCollection* This,FSRM_OB #endif -HRESULT STDMETHODCALLTYPE IFsrmCollection_get__NewEnum_Proxy( - IFsrmCollection* This, - IUnknown **unknown); -void __RPC_STUB IFsrmCollection_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmCollection_get_Item_Proxy( - IFsrmCollection* This, - LONG index, - VARIANT *item); -void __RPC_STUB IFsrmCollection_get_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmCollection_get_Count_Proxy( - IFsrmCollection* This, - LONG *count); -void __RPC_STUB IFsrmCollection_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmCollection_get_State_Proxy( - IFsrmCollection* This, - FsrmCollectionState *state); -void __RPC_STUB IFsrmCollection_get_State_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmCollection_Cancel_Proxy( - IFsrmCollection* This); -void __RPC_STUB IFsrmCollection_Cancel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmCollection_WaitForCompletion_Proxy( - IFsrmCollection* This, - LONG waitSeconds, - VARIANT_BOOL *completed); -void __RPC_STUB IFsrmCollection_WaitForCompletion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmCollection_GetById_Proxy( - IFsrmCollection* This, - FSRM_OBJECT_ID id, - VARIANT *entry); -void __RPC_STUB IFsrmCollection_GetById_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmCollection_INTERFACE_DEFINED__ */ @@ -1974,29 +1767,29 @@ typedef struct IFsrmDerivedObjectsResultVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmDerivedObjectsResult* This, + IFsrmDerivedObjectsResult *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmDerivedObjectsResult* This); + IFsrmDerivedObjectsResult *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmDerivedObjectsResult* This); + IFsrmDerivedObjectsResult *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmDerivedObjectsResult* This, + IFsrmDerivedObjectsResult *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmDerivedObjectsResult* This, + IFsrmDerivedObjectsResult *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmDerivedObjectsResult* This, + IFsrmDerivedObjectsResult *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2004,7 +1797,7 @@ typedef struct IFsrmDerivedObjectsResultVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmDerivedObjectsResult* This, + IFsrmDerivedObjectsResult *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2016,15 +1809,16 @@ typedef struct IFsrmDerivedObjectsResultVtbl { /*** IFsrmDerivedObjectsResult methods ***/ HRESULT (STDMETHODCALLTYPE *get_DerivedObjects)( - IFsrmDerivedObjectsResult* This, + IFsrmDerivedObjectsResult *This, IFsrmCollection **derivedObjects); HRESULT (STDMETHODCALLTYPE *get_Results)( - IFsrmDerivedObjectsResult* This, + IFsrmDerivedObjectsResult *This, IFsrmCollection **results); END_INTERFACE } IFsrmDerivedObjectsResultVtbl; + interface IFsrmDerivedObjectsResult { CONST_VTBL IFsrmDerivedObjectsResultVtbl* lpVtbl; }; @@ -2079,22 +1873,6 @@ static FORCEINLINE HRESULT IFsrmDerivedObjectsResult_get_Results(IFsrmDerivedObj #endif -HRESULT STDMETHODCALLTYPE IFsrmDerivedObjectsResult_get_DerivedObjects_Proxy( - IFsrmDerivedObjectsResult* This, - IFsrmCollection **derivedObjects); -void __RPC_STUB IFsrmDerivedObjectsResult_get_DerivedObjects_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmDerivedObjectsResult_get_Results_Proxy( - IFsrmDerivedObjectsResult* This, - IFsrmCollection **results); -void __RPC_STUB IFsrmDerivedObjectsResult_get_Results_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmDerivedObjectsResult_INTERFACE_DEFINED__ */ @@ -2152,29 +1930,29 @@ typedef struct IFsrmExportImportVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmExportImport* This, + IFsrmExportImport *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmExportImport* This); + IFsrmExportImport *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmExportImport* This); + IFsrmExportImport *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmExportImport* This, + IFsrmExportImport *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmExportImport* This, + IFsrmExportImport *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmExportImport* This, + IFsrmExportImport *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2182,7 +1960,7 @@ typedef struct IFsrmExportImportVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmExportImport* This, + IFsrmExportImport *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2194,39 +1972,39 @@ typedef struct IFsrmExportImportVtbl { /*** IFsrmExportImport methods ***/ HRESULT (STDMETHODCALLTYPE *ExportFileGroups)( - IFsrmExportImport* This, + IFsrmExportImport *This, BSTR filePath, VARIANT *fileGroupNamesSafeArray, BSTR remoteHost); HRESULT (STDMETHODCALLTYPE *ImportFileGroups)( - IFsrmExportImport* This, + IFsrmExportImport *This, BSTR filePath, VARIANT *fileGroupNamesSafeArray, BSTR remoteHost, IFsrmCommittableCollection **fileGroups); HRESULT (STDMETHODCALLTYPE *ExportFileScreenTemplates)( - IFsrmExportImport* This, + IFsrmExportImport *This, BSTR filePath, VARIANT *templateNamesSafeArray, BSTR remoteHost); HRESULT (STDMETHODCALLTYPE *ImportFileScreenTemplates)( - IFsrmExportImport* This, + IFsrmExportImport *This, BSTR filePath, VARIANT *templateNamesSafeArray, BSTR remoteHost, IFsrmCommittableCollection **templates); HRESULT (STDMETHODCALLTYPE *ExportQuotaTemplates)( - IFsrmExportImport* This, + IFsrmExportImport *This, BSTR filePath, VARIANT *templateNamesSafeArray, BSTR remoteHost); HRESULT (STDMETHODCALLTYPE *ImportQuotaTemplates)( - IFsrmExportImport* This, + IFsrmExportImport *This, BSTR filePath, VARIANT *templateNamesSafeArray, BSTR remoteHost, @@ -2234,6 +2012,7 @@ typedef struct IFsrmExportImportVtbl { END_INTERFACE } IFsrmExportImportVtbl; + interface IFsrmExportImport { CONST_VTBL IFsrmExportImportVtbl* lpVtbl; }; @@ -2304,69 +2083,6 @@ static FORCEINLINE HRESULT IFsrmExportImport_ImportQuotaTemplates(IFsrmExportImp #endif -HRESULT STDMETHODCALLTYPE IFsrmExportImport_ExportFileGroups_Proxy( - IFsrmExportImport* This, - BSTR filePath, - VARIANT *fileGroupNamesSafeArray, - BSTR remoteHost); -void __RPC_STUB IFsrmExportImport_ExportFileGroups_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmExportImport_ImportFileGroups_Proxy( - IFsrmExportImport* This, - BSTR filePath, - VARIANT *fileGroupNamesSafeArray, - BSTR remoteHost, - IFsrmCommittableCollection **fileGroups); -void __RPC_STUB IFsrmExportImport_ImportFileGroups_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmExportImport_ExportFileScreenTemplates_Proxy( - IFsrmExportImport* This, - BSTR filePath, - VARIANT *templateNamesSafeArray, - BSTR remoteHost); -void __RPC_STUB IFsrmExportImport_ExportFileScreenTemplates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmExportImport_ImportFileScreenTemplates_Proxy( - IFsrmExportImport* This, - BSTR filePath, - VARIANT *templateNamesSafeArray, - BSTR remoteHost, - IFsrmCommittableCollection **templates); -void __RPC_STUB IFsrmExportImport_ImportFileScreenTemplates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmExportImport_ExportQuotaTemplates_Proxy( - IFsrmExportImport* This, - BSTR filePath, - VARIANT *templateNamesSafeArray, - BSTR remoteHost); -void __RPC_STUB IFsrmExportImport_ExportQuotaTemplates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmExportImport_ImportQuotaTemplates_Proxy( - IFsrmExportImport* This, - BSTR filePath, - VARIANT *templateNamesSafeArray, - BSTR remoteHost, - IFsrmCommittableCollection **templates); -void __RPC_STUB IFsrmExportImport_ImportQuotaTemplates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmExportImport_INTERFACE_DEFINED__ */ @@ -2406,29 +2122,29 @@ typedef struct IFsrmObjectVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmObject* This, + IFsrmObject *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmObject* This); + IFsrmObject *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmObject* This); + IFsrmObject *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmObject* This, + IFsrmObject *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmObject* This, + IFsrmObject *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmObject* This, + IFsrmObject *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2436,7 +2152,7 @@ typedef struct IFsrmObjectVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmObject* This, + IFsrmObject *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2448,25 +2164,26 @@ typedef struct IFsrmObjectVtbl { /*** IFsrmObject methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - IFsrmObject* This, + IFsrmObject *This, FSRM_OBJECT_ID *id); HRESULT (STDMETHODCALLTYPE *get_Description)( - IFsrmObject* This, + IFsrmObject *This, BSTR *description); HRESULT (STDMETHODCALLTYPE *put_Description)( - IFsrmObject* This, + IFsrmObject *This, BSTR description); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmObject* This); + IFsrmObject *This); HRESULT (STDMETHODCALLTYPE *Commit)( - IFsrmObject* This); + IFsrmObject *This); END_INTERFACE } IFsrmObjectVtbl; + interface IFsrmObject { CONST_VTBL IFsrmObjectVtbl* lpVtbl; }; @@ -2533,44 +2250,6 @@ static FORCEINLINE HRESULT IFsrmObject_Commit(IFsrmObject* This) { #endif -HRESULT STDMETHODCALLTYPE IFsrmObject_get_Id_Proxy( - IFsrmObject* This, - FSRM_OBJECT_ID *id); -void __RPC_STUB IFsrmObject_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmObject_get_Description_Proxy( - IFsrmObject* This, - BSTR *description); -void __RPC_STUB IFsrmObject_get_Description_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmObject_put_Description_Proxy( - IFsrmObject* This, - BSTR description); -void __RPC_STUB IFsrmObject_put_Description_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmObject_Delete_Proxy( - IFsrmObject* This); -void __RPC_STUB IFsrmObject_Delete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmObject_Commit_Proxy( - IFsrmObject* This); -void __RPC_STUB IFsrmObject_Commit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmObject_INTERFACE_DEFINED__ */ @@ -2599,29 +2278,29 @@ typedef struct IFsrmPathMapperVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmPathMapper* This, + IFsrmPathMapper *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmPathMapper* This); + IFsrmPathMapper *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmPathMapper* This); + IFsrmPathMapper *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmPathMapper* This, + IFsrmPathMapper *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmPathMapper* This, + IFsrmPathMapper *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmPathMapper* This, + IFsrmPathMapper *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2629,7 +2308,7 @@ typedef struct IFsrmPathMapperVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmPathMapper* This, + IFsrmPathMapper *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2641,12 +2320,13 @@ typedef struct IFsrmPathMapperVtbl { /*** IFsrmPathMapper methods ***/ HRESULT (STDMETHODCALLTYPE *GetSharePathsForLocalPath)( - IFsrmPathMapper* This, + IFsrmPathMapper *This, BSTR localPath, SAFEARRAY **sharePaths); END_INTERFACE } IFsrmPathMapperVtbl; + interface IFsrmPathMapper { CONST_VTBL IFsrmPathMapperVtbl* lpVtbl; }; @@ -2697,15 +2377,6 @@ static FORCEINLINE HRESULT IFsrmPathMapper_GetSharePathsForLocalPath(IFsrmPathMa #endif -HRESULT STDMETHODCALLTYPE IFsrmPathMapper_GetSharePathsForLocalPath_Proxy( - IFsrmPathMapper* This, - BSTR localPath, - SAFEARRAY **sharePaths); -void __RPC_STUB IFsrmPathMapper_GetSharePathsForLocalPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmPathMapper_INTERFACE_DEFINED__ */ @@ -2771,29 +2442,29 @@ typedef struct IFsrmSettingVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmSetting* This, + IFsrmSetting *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmSetting* This); + IFsrmSetting *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmSetting* This); + IFsrmSetting *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmSetting* This, + IFsrmSetting *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmSetting* This, + IFsrmSetting *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmSetting* This, + IFsrmSetting *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2801,7 +2472,7 @@ typedef struct IFsrmSettingVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmSetting* This, + IFsrmSetting *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2813,61 +2484,62 @@ typedef struct IFsrmSettingVtbl { /*** IFsrmSetting methods ***/ HRESULT (STDMETHODCALLTYPE *get_SmtpServer)( - IFsrmSetting* This, + IFsrmSetting *This, BSTR *smtpServer); HRESULT (STDMETHODCALLTYPE *put_SmtpServer)( - IFsrmSetting* This, + IFsrmSetting *This, BSTR smtpServer); HRESULT (STDMETHODCALLTYPE *get_MailFrom)( - IFsrmSetting* This, + IFsrmSetting *This, BSTR *mailFrom); HRESULT (STDMETHODCALLTYPE *put_MailFrom)( - IFsrmSetting* This, + IFsrmSetting *This, BSTR mailFrom); HRESULT (STDMETHODCALLTYPE *get_AdminEmail)( - IFsrmSetting* This, + IFsrmSetting *This, BSTR *adminEmail); HRESULT (STDMETHODCALLTYPE *put_AdminEmail)( - IFsrmSetting* This, + IFsrmSetting *This, BSTR adminEmail); HRESULT (STDMETHODCALLTYPE *get_DisableCommandLine)( - IFsrmSetting* This, + IFsrmSetting *This, VARIANT_BOOL *disableCommandLine); HRESULT (STDMETHODCALLTYPE *put_DisableCommandLine)( - IFsrmSetting* This, + IFsrmSetting *This, VARIANT_BOOL disableCommandLine); HRESULT (STDMETHODCALLTYPE *get_EnableScreeningAudit)( - IFsrmSetting* This, + IFsrmSetting *This, VARIANT_BOOL *enableScreeningAudit); HRESULT (STDMETHODCALLTYPE *put_EnableScreeningAudit)( - IFsrmSetting* This, + IFsrmSetting *This, VARIANT_BOOL enableScreeningAudit); HRESULT (STDMETHODCALLTYPE *EmailTest)( - IFsrmSetting* This, + IFsrmSetting *This, BSTR mailTo); HRESULT (STDMETHODCALLTYPE *SetActionRunLimitInterval)( - IFsrmSetting* This, + IFsrmSetting *This, FsrmActionType actionType, LONG delayTimeMinutes); HRESULT (STDMETHODCALLTYPE *GetActionRunLimitInterval)( - IFsrmSetting* This, + IFsrmSetting *This, FsrmActionType actionType, LONG *delayTimeMinutes); END_INTERFACE } IFsrmSettingVtbl; + interface IFsrmSetting { CONST_VTBL IFsrmSettingVtbl* lpVtbl; }; @@ -2966,112 +2638,6 @@ static FORCEINLINE HRESULT IFsrmSetting_GetActionRunLimitInterval(IFsrmSetting* #endif -HRESULT STDMETHODCALLTYPE IFsrmSetting_get_SmtpServer_Proxy( - IFsrmSetting* This, - BSTR *smtpServer); -void __RPC_STUB IFsrmSetting_get_SmtpServer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmSetting_put_SmtpServer_Proxy( - IFsrmSetting* This, - BSTR smtpServer); -void __RPC_STUB IFsrmSetting_put_SmtpServer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmSetting_get_MailFrom_Proxy( - IFsrmSetting* This, - BSTR *mailFrom); -void __RPC_STUB IFsrmSetting_get_MailFrom_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmSetting_put_MailFrom_Proxy( - IFsrmSetting* This, - BSTR mailFrom); -void __RPC_STUB IFsrmSetting_put_MailFrom_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmSetting_get_AdminEmail_Proxy( - IFsrmSetting* This, - BSTR *adminEmail); -void __RPC_STUB IFsrmSetting_get_AdminEmail_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmSetting_put_AdminEmail_Proxy( - IFsrmSetting* This, - BSTR adminEmail); -void __RPC_STUB IFsrmSetting_put_AdminEmail_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmSetting_get_DisableCommandLine_Proxy( - IFsrmSetting* This, - VARIANT_BOOL *disableCommandLine); -void __RPC_STUB IFsrmSetting_get_DisableCommandLine_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmSetting_put_DisableCommandLine_Proxy( - IFsrmSetting* This, - VARIANT_BOOL disableCommandLine); -void __RPC_STUB IFsrmSetting_put_DisableCommandLine_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmSetting_get_EnableScreeningAudit_Proxy( - IFsrmSetting* This, - VARIANT_BOOL *enableScreeningAudit); -void __RPC_STUB IFsrmSetting_get_EnableScreeningAudit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmSetting_put_EnableScreeningAudit_Proxy( - IFsrmSetting* This, - VARIANT_BOOL enableScreeningAudit); -void __RPC_STUB IFsrmSetting_put_EnableScreeningAudit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmSetting_EmailTest_Proxy( - IFsrmSetting* This, - BSTR mailTo); -void __RPC_STUB IFsrmSetting_EmailTest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmSetting_SetActionRunLimitInterval_Proxy( - IFsrmSetting* This, - FsrmActionType actionType, - LONG delayTimeMinutes); -void __RPC_STUB IFsrmSetting_SetActionRunLimitInterval_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmSetting_GetActionRunLimitInterval_Proxy( - IFsrmSetting* This, - FsrmActionType actionType, - LONG *delayTimeMinutes); -void __RPC_STUB IFsrmSetting_GetActionRunLimitInterval_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmSetting_INTERFACE_DEFINED__ */ @@ -3138,29 +2704,29 @@ typedef struct IFsrmActionEmailVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmActionEmail* This, + IFsrmActionEmail *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmActionEmail* This); + IFsrmActionEmail *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmActionEmail* This); + IFsrmActionEmail *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmActionEmail* This, + IFsrmActionEmail *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmActionEmail* This, + IFsrmActionEmail *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmActionEmail* This, + IFsrmActionEmail *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -3168,7 +2734,7 @@ typedef struct IFsrmActionEmailVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmActionEmail* This, + IFsrmActionEmail *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -3180,83 +2746,84 @@ typedef struct IFsrmActionEmailVtbl { /*** IFsrmAction methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - IFsrmActionEmail* This, + IFsrmActionEmail *This, FSRM_OBJECT_ID *id); HRESULT (STDMETHODCALLTYPE *get_ActionType)( - IFsrmActionEmail* This, + IFsrmActionEmail *This, FsrmActionType *actionType); HRESULT (STDMETHODCALLTYPE *get_RunLimitInterval)( - IFsrmActionEmail* This, + IFsrmActionEmail *This, LONG *minutes); HRESULT (STDMETHODCALLTYPE *put_RunLimitInterval)( - IFsrmActionEmail* This, + IFsrmActionEmail *This, LONG minutes); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmActionEmail* This); + IFsrmActionEmail *This); /*** IFsrmActionEmail methods ***/ HRESULT (STDMETHODCALLTYPE *get_MailFrom)( - IFsrmActionEmail* This, + IFsrmActionEmail *This, BSTR *mailFrom); HRESULT (STDMETHODCALLTYPE *put_MailFrom)( - IFsrmActionEmail* This, + IFsrmActionEmail *This, BSTR mailFrom); HRESULT (STDMETHODCALLTYPE *get_MailReplyTo)( - IFsrmActionEmail* This, + IFsrmActionEmail *This, BSTR *mailReplyTo); HRESULT (STDMETHODCALLTYPE *put_MailReplyTo)( - IFsrmActionEmail* This, + IFsrmActionEmail *This, BSTR mailReplyTo); HRESULT (STDMETHODCALLTYPE *get_MailTo)( - IFsrmActionEmail* This, + IFsrmActionEmail *This, BSTR *mailTo); HRESULT (STDMETHODCALLTYPE *put_MailTo)( - IFsrmActionEmail* This, + IFsrmActionEmail *This, BSTR mailTo); HRESULT (STDMETHODCALLTYPE *get_MailCc)( - IFsrmActionEmail* This, + IFsrmActionEmail *This, BSTR *mailCc); HRESULT (STDMETHODCALLTYPE *put_MailCc)( - IFsrmActionEmail* This, + IFsrmActionEmail *This, BSTR mailCc); HRESULT (STDMETHODCALLTYPE *get_MailBcc)( - IFsrmActionEmail* This, + IFsrmActionEmail *This, BSTR *mailBcc); HRESULT (STDMETHODCALLTYPE *put_MailBcc)( - IFsrmActionEmail* This, + IFsrmActionEmail *This, BSTR mailBcc); HRESULT (STDMETHODCALLTYPE *get_MailSubject)( - IFsrmActionEmail* This, + IFsrmActionEmail *This, BSTR *mailSubject); HRESULT (STDMETHODCALLTYPE *put_MailSubject)( - IFsrmActionEmail* This, + IFsrmActionEmail *This, BSTR mailSubject); HRESULT (STDMETHODCALLTYPE *get_MessageText)( - IFsrmActionEmail* This, + IFsrmActionEmail *This, BSTR *messageText); HRESULT (STDMETHODCALLTYPE *put_MessageText)( - IFsrmActionEmail* This, + IFsrmActionEmail *This, BSTR messageText); END_INTERFACE } IFsrmActionEmailVtbl; + interface IFsrmActionEmail { CONST_VTBL IFsrmActionEmailVtbl* lpVtbl; }; @@ -3381,118 +2948,6 @@ static FORCEINLINE HRESULT IFsrmActionEmail_put_MessageText(IFsrmActionEmail* Th #endif -HRESULT STDMETHODCALLTYPE IFsrmActionEmail_get_MailFrom_Proxy( - IFsrmActionEmail* This, - BSTR *mailFrom); -void __RPC_STUB IFsrmActionEmail_get_MailFrom_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionEmail_put_MailFrom_Proxy( - IFsrmActionEmail* This, - BSTR mailFrom); -void __RPC_STUB IFsrmActionEmail_put_MailFrom_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionEmail_get_MailReplyTo_Proxy( - IFsrmActionEmail* This, - BSTR *mailReplyTo); -void __RPC_STUB IFsrmActionEmail_get_MailReplyTo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionEmail_put_MailReplyTo_Proxy( - IFsrmActionEmail* This, - BSTR mailReplyTo); -void __RPC_STUB IFsrmActionEmail_put_MailReplyTo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionEmail_get_MailTo_Proxy( - IFsrmActionEmail* This, - BSTR *mailTo); -void __RPC_STUB IFsrmActionEmail_get_MailTo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionEmail_put_MailTo_Proxy( - IFsrmActionEmail* This, - BSTR mailTo); -void __RPC_STUB IFsrmActionEmail_put_MailTo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionEmail_get_MailCc_Proxy( - IFsrmActionEmail* This, - BSTR *mailCc); -void __RPC_STUB IFsrmActionEmail_get_MailCc_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionEmail_put_MailCc_Proxy( - IFsrmActionEmail* This, - BSTR mailCc); -void __RPC_STUB IFsrmActionEmail_put_MailCc_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionEmail_get_MailBcc_Proxy( - IFsrmActionEmail* This, - BSTR *mailBcc); -void __RPC_STUB IFsrmActionEmail_get_MailBcc_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionEmail_put_MailBcc_Proxy( - IFsrmActionEmail* This, - BSTR mailBcc); -void __RPC_STUB IFsrmActionEmail_put_MailBcc_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionEmail_get_MailSubject_Proxy( - IFsrmActionEmail* This, - BSTR *mailSubject); -void __RPC_STUB IFsrmActionEmail_get_MailSubject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionEmail_put_MailSubject_Proxy( - IFsrmActionEmail* This, - BSTR mailSubject); -void __RPC_STUB IFsrmActionEmail_put_MailSubject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionEmail_get_MessageText_Proxy( - IFsrmActionEmail* This, - BSTR *messageText); -void __RPC_STUB IFsrmActionEmail_get_MessageText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionEmail_put_MessageText_Proxy( - IFsrmActionEmail* This, - BSTR messageText); -void __RPC_STUB IFsrmActionEmail_put_MessageText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmActionEmail_INTERFACE_DEFINED__ */ @@ -3523,29 +2978,29 @@ typedef struct IFsrmActionEmail2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmActionEmail2* This); + IFsrmActionEmail2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmActionEmail2* This); + IFsrmActionEmail2 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -3553,7 +3008,7 @@ typedef struct IFsrmActionEmail2Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -3565,92 +3020,93 @@ typedef struct IFsrmActionEmail2Vtbl { /*** IFsrmAction methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, FSRM_OBJECT_ID *id); HRESULT (STDMETHODCALLTYPE *get_ActionType)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, FsrmActionType *actionType); HRESULT (STDMETHODCALLTYPE *get_RunLimitInterval)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, LONG *minutes); HRESULT (STDMETHODCALLTYPE *put_RunLimitInterval)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, LONG minutes); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmActionEmail2* This); + IFsrmActionEmail2 *This); /*** IFsrmActionEmail methods ***/ HRESULT (STDMETHODCALLTYPE *get_MailFrom)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, BSTR *mailFrom); HRESULT (STDMETHODCALLTYPE *put_MailFrom)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, BSTR mailFrom); HRESULT (STDMETHODCALLTYPE *get_MailReplyTo)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, BSTR *mailReplyTo); HRESULT (STDMETHODCALLTYPE *put_MailReplyTo)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, BSTR mailReplyTo); HRESULT (STDMETHODCALLTYPE *get_MailTo)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, BSTR *mailTo); HRESULT (STDMETHODCALLTYPE *put_MailTo)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, BSTR mailTo); HRESULT (STDMETHODCALLTYPE *get_MailCc)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, BSTR *mailCc); HRESULT (STDMETHODCALLTYPE *put_MailCc)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, BSTR mailCc); HRESULT (STDMETHODCALLTYPE *get_MailBcc)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, BSTR *mailBcc); HRESULT (STDMETHODCALLTYPE *put_MailBcc)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, BSTR mailBcc); HRESULT (STDMETHODCALLTYPE *get_MailSubject)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, BSTR *mailSubject); HRESULT (STDMETHODCALLTYPE *put_MailSubject)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, BSTR mailSubject); HRESULT (STDMETHODCALLTYPE *get_MessageText)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, BSTR *messageText); HRESULT (STDMETHODCALLTYPE *put_MessageText)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, BSTR messageText); /*** IFsrmActionEmail2 methods ***/ HRESULT (STDMETHODCALLTYPE *get_AttachmentFileListSize)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, LONG *attachmentFileListSize); HRESULT (STDMETHODCALLTYPE *put_AttachmentFileListSize)( - IFsrmActionEmail2* This, + IFsrmActionEmail2 *This, LONG attachmentFileListSize); END_INTERFACE } IFsrmActionEmail2Vtbl; + interface IFsrmActionEmail2 { CONST_VTBL IFsrmActionEmail2Vtbl* lpVtbl; }; @@ -3785,22 +3241,6 @@ static FORCEINLINE HRESULT IFsrmActionEmail2_put_AttachmentFileListSize(IFsrmAct #endif -HRESULT STDMETHODCALLTYPE IFsrmActionEmail2_get_AttachmentFileListSize_Proxy( - IFsrmActionEmail2* This, - LONG *attachmentFileListSize); -void __RPC_STUB IFsrmActionEmail2_get_AttachmentFileListSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmActionEmail2_put_AttachmentFileListSize_Proxy( - IFsrmActionEmail2* This, - LONG attachmentFileListSize); -void __RPC_STUB IFsrmActionEmail2_put_AttachmentFileListSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmActionEmail2_INTERFACE_DEFINED__ */ @@ -3837,29 +3277,29 @@ typedef struct IFsrmMutableCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmMutableCollection* This, + IFsrmMutableCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmMutableCollection* This); + IFsrmMutableCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmMutableCollection* This); + IFsrmMutableCollection *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmMutableCollection* This, + IFsrmMutableCollection *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmMutableCollection* This, + IFsrmMutableCollection *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmMutableCollection* This, + IFsrmMutableCollection *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -3867,7 +3307,7 @@ typedef struct IFsrmMutableCollectionVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmMutableCollection* This, + IFsrmMutableCollection *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -3879,54 +3319,55 @@ typedef struct IFsrmMutableCollectionVtbl { /*** IFsrmCollection methods ***/ HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - IFsrmMutableCollection* This, + IFsrmMutableCollection *This, IUnknown **unknown); HRESULT (STDMETHODCALLTYPE *get_Item)( - IFsrmMutableCollection* This, + IFsrmMutableCollection *This, LONG index, VARIANT *item); HRESULT (STDMETHODCALLTYPE *get_Count)( - IFsrmMutableCollection* This, + IFsrmMutableCollection *This, LONG *count); HRESULT (STDMETHODCALLTYPE *get_State)( - IFsrmMutableCollection* This, + IFsrmMutableCollection *This, FsrmCollectionState *state); HRESULT (STDMETHODCALLTYPE *Cancel)( - IFsrmMutableCollection* This); + IFsrmMutableCollection *This); HRESULT (STDMETHODCALLTYPE *WaitForCompletion)( - IFsrmMutableCollection* This, + IFsrmMutableCollection *This, LONG waitSeconds, VARIANT_BOOL *completed); HRESULT (STDMETHODCALLTYPE *GetById)( - IFsrmMutableCollection* This, + IFsrmMutableCollection *This, FSRM_OBJECT_ID id, VARIANT *entry); /*** IFsrmMutableCollection methods ***/ HRESULT (STDMETHODCALLTYPE *Add)( - IFsrmMutableCollection* This, + IFsrmMutableCollection *This, VARIANT item); HRESULT (STDMETHODCALLTYPE *Remove)( - IFsrmMutableCollection* This, + IFsrmMutableCollection *This, LONG index); HRESULT (STDMETHODCALLTYPE *RemoveById)( - IFsrmMutableCollection* This, + IFsrmMutableCollection *This, FSRM_OBJECT_ID id); HRESULT (STDMETHODCALLTYPE *Clone)( - IFsrmMutableCollection* This, + IFsrmMutableCollection *This, IFsrmMutableCollection **collection); END_INTERFACE } IFsrmMutableCollectionVtbl; + interface IFsrmMutableCollection { CONST_VTBL IFsrmMutableCollectionVtbl* lpVtbl; }; @@ -4019,38 +3460,6 @@ static FORCEINLINE HRESULT IFsrmMutableCollection_Clone(IFsrmMutableCollection* #endif -HRESULT STDMETHODCALLTYPE IFsrmMutableCollection_Add_Proxy( - IFsrmMutableCollection* This, - VARIANT item); -void __RPC_STUB IFsrmMutableCollection_Add_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmMutableCollection_Remove_Proxy( - IFsrmMutableCollection* This, - LONG index); -void __RPC_STUB IFsrmMutableCollection_Remove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmMutableCollection_RemoveById_Proxy( - IFsrmMutableCollection* This, - FSRM_OBJECT_ID id); -void __RPC_STUB IFsrmMutableCollection_RemoveById_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmMutableCollection_Clone_Proxy( - IFsrmMutableCollection* This, - IFsrmMutableCollection **collection); -void __RPC_STUB IFsrmMutableCollection_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmMutableCollection_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/fsrmenums.h b/lib/libc/include/any-windows-any/fsrmenums.h index b3d81fc759..5e3272a306 100644 --- a/lib/libc/include/any-windows-any/fsrmenums.h +++ b/lib/libc/include/any-windows-any/fsrmenums.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/fsrmenums.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/fsrmenums.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/fsrmquota.h b/lib/libc/include/any-windows-any/fsrmquota.h index 757790a973..43db5642d8 100644 --- a/lib/libc/include/any-windows-any/fsrmquota.h +++ b/lib/libc/include/any-windows-any/fsrmquota.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/fsrmquota.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/fsrmquota.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,46 +21,73 @@ #ifndef __IFsrmQuotaManager_FWD_DEFINED__ #define __IFsrmQuotaManager_FWD_DEFINED__ typedef interface IFsrmQuotaManager IFsrmQuotaManager; +#ifdef __cplusplus +interface IFsrmQuotaManager; +#endif /* __cplusplus */ #endif #ifndef __IFsrmQuotaTemplateManager_FWD_DEFINED__ #define __IFsrmQuotaTemplateManager_FWD_DEFINED__ typedef interface IFsrmQuotaTemplateManager IFsrmQuotaTemplateManager; +#ifdef __cplusplus +interface IFsrmQuotaTemplateManager; +#endif /* __cplusplus */ #endif #ifndef __IFsrmQuotaBase_FWD_DEFINED__ #define __IFsrmQuotaBase_FWD_DEFINED__ typedef interface IFsrmQuotaBase IFsrmQuotaBase; +#ifdef __cplusplus +interface IFsrmQuotaBase; +#endif /* __cplusplus */ #endif #ifndef __IFsrmQuotaObject_FWD_DEFINED__ #define __IFsrmQuotaObject_FWD_DEFINED__ typedef interface IFsrmQuotaObject IFsrmQuotaObject; +#ifdef __cplusplus +interface IFsrmQuotaObject; +#endif /* __cplusplus */ #endif #ifndef __IFsrmQuotaTemplate_FWD_DEFINED__ #define __IFsrmQuotaTemplate_FWD_DEFINED__ typedef interface IFsrmQuotaTemplate IFsrmQuotaTemplate; +#ifdef __cplusplus +interface IFsrmQuotaTemplate; +#endif /* __cplusplus */ #endif #ifndef __IFsrmQuota_FWD_DEFINED__ #define __IFsrmQuota_FWD_DEFINED__ typedef interface IFsrmQuota IFsrmQuota; +#ifdef __cplusplus +interface IFsrmQuota; +#endif /* __cplusplus */ #endif #ifndef __IFsrmAutoApplyQuota_FWD_DEFINED__ #define __IFsrmAutoApplyQuota_FWD_DEFINED__ typedef interface IFsrmAutoApplyQuota IFsrmAutoApplyQuota; +#ifdef __cplusplus +interface IFsrmAutoApplyQuota; +#endif /* __cplusplus */ #endif #ifndef __IFsrmQuotaManagerEx_FWD_DEFINED__ #define __IFsrmQuotaManagerEx_FWD_DEFINED__ typedef interface IFsrmQuotaManagerEx IFsrmQuotaManagerEx; +#ifdef __cplusplus +interface IFsrmQuotaManagerEx; +#endif /* __cplusplus */ #endif #ifndef __IFsrmQuotaTemplateImported_FWD_DEFINED__ #define __IFsrmQuotaTemplateImported_FWD_DEFINED__ typedef interface IFsrmQuotaTemplateImported IFsrmQuotaTemplateImported; +#ifdef __cplusplus +interface IFsrmQuotaTemplateImported; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -78,41 +106,65 @@ extern "C" { #ifndef __IFsrmAutoApplyQuota_FWD_DEFINED__ #define __IFsrmAutoApplyQuota_FWD_DEFINED__ typedef interface IFsrmAutoApplyQuota IFsrmAutoApplyQuota; +#ifdef __cplusplus +interface IFsrmAutoApplyQuota; +#endif /* __cplusplus */ #endif #ifndef __IFsrmQuota_FWD_DEFINED__ #define __IFsrmQuota_FWD_DEFINED__ typedef interface IFsrmQuota IFsrmQuota; +#ifdef __cplusplus +interface IFsrmQuota; +#endif /* __cplusplus */ #endif #ifndef __IFsrmQuotaBase_FWD_DEFINED__ #define __IFsrmQuotaBase_FWD_DEFINED__ typedef interface IFsrmQuotaBase IFsrmQuotaBase; +#ifdef __cplusplus +interface IFsrmQuotaBase; +#endif /* __cplusplus */ #endif #ifndef __IFsrmQuotaObject_FWD_DEFINED__ #define __IFsrmQuotaObject_FWD_DEFINED__ typedef interface IFsrmQuotaObject IFsrmQuotaObject; +#ifdef __cplusplus +interface IFsrmQuotaObject; +#endif /* __cplusplus */ #endif #ifndef __IFsrmQuotaManager_FWD_DEFINED__ #define __IFsrmQuotaManager_FWD_DEFINED__ typedef interface IFsrmQuotaManager IFsrmQuotaManager; +#ifdef __cplusplus +interface IFsrmQuotaManager; +#endif /* __cplusplus */ #endif #ifndef __IFsrmQuotaTemplate_FWD_DEFINED__ #define __IFsrmQuotaTemplate_FWD_DEFINED__ typedef interface IFsrmQuotaTemplate IFsrmQuotaTemplate; +#ifdef __cplusplus +interface IFsrmQuotaTemplate; +#endif /* __cplusplus */ #endif #ifndef __IFsrmQuotaTemplateImported_FWD_DEFINED__ #define __IFsrmQuotaTemplateImported_FWD_DEFINED__ typedef interface IFsrmQuotaTemplateImported IFsrmQuotaTemplateImported; +#ifdef __cplusplus +interface IFsrmQuotaTemplateImported; +#endif /* __cplusplus */ #endif #ifndef __IFsrmQuotaTemplateManager_FWD_DEFINED__ #define __IFsrmQuotaTemplateManager_FWD_DEFINED__ typedef interface IFsrmQuotaTemplateManager IFsrmQuotaTemplateManager; +#ifdef __cplusplus +interface IFsrmQuotaTemplateManager; +#endif /* __cplusplus */ #endif typedef LONG FSRM_QUOTA_THRESHOLD; @@ -213,29 +265,29 @@ typedef struct IFsrmQuotaManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmQuotaManager* This, + IFsrmQuotaManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmQuotaManager* This); + IFsrmQuotaManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmQuotaManager* This); + IFsrmQuotaManager *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmQuotaManager* This, + IFsrmQuotaManager *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmQuotaManager* This, + IFsrmQuotaManager *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmQuotaManager* This, + IFsrmQuotaManager *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -243,7 +295,7 @@ typedef struct IFsrmQuotaManagerVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmQuotaManager* This, + IFsrmQuotaManager *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -255,67 +307,68 @@ typedef struct IFsrmQuotaManagerVtbl { /*** IFsrmQuotaManager methods ***/ HRESULT (STDMETHODCALLTYPE *get_ActionVariables)( - IFsrmQuotaManager* This, + IFsrmQuotaManager *This, SAFEARRAY **variables); HRESULT (STDMETHODCALLTYPE *get_ActionVariableDescriptions)( - IFsrmQuotaManager* This, + IFsrmQuotaManager *This, SAFEARRAY **descriptions); HRESULT (STDMETHODCALLTYPE *CreateQuota)( - IFsrmQuotaManager* This, + IFsrmQuotaManager *This, BSTR path, IFsrmQuota **quota); HRESULT (STDMETHODCALLTYPE *CreateAutoApplyQuota)( - IFsrmQuotaManager* This, + IFsrmQuotaManager *This, BSTR quotaTemplateName, BSTR path, IFsrmAutoApplyQuota **quota); HRESULT (STDMETHODCALLTYPE *GetQuota)( - IFsrmQuotaManager* This, + IFsrmQuotaManager *This, BSTR path, IFsrmQuota **quota); HRESULT (STDMETHODCALLTYPE *GetAutoApplyQuota)( - IFsrmQuotaManager* This, + IFsrmQuotaManager *This, BSTR path, IFsrmAutoApplyQuota **quota); HRESULT (STDMETHODCALLTYPE *GetRestrictiveQuota)( - IFsrmQuotaManager* This, + IFsrmQuotaManager *This, BSTR path, IFsrmQuota **quota); HRESULT (STDMETHODCALLTYPE *EnumQuotas)( - IFsrmQuotaManager* This, + IFsrmQuotaManager *This, BSTR path, FsrmEnumOptions options, IFsrmCommittableCollection **quotas); HRESULT (STDMETHODCALLTYPE *EnumAutoApplyQuotas)( - IFsrmQuotaManager* This, + IFsrmQuotaManager *This, BSTR path, FsrmEnumOptions options, IFsrmCommittableCollection **quotas); HRESULT (STDMETHODCALLTYPE *EnumEffectiveQuotas)( - IFsrmQuotaManager* This, + IFsrmQuotaManager *This, BSTR path, FsrmEnumOptions options, IFsrmCommittableCollection **quotas); HRESULT (STDMETHODCALLTYPE *Scan)( - IFsrmQuotaManager* This, + IFsrmQuotaManager *This, BSTR strPath); HRESULT (STDMETHODCALLTYPE *CreateQuotaCollection)( - IFsrmQuotaManager* This, + IFsrmQuotaManager *This, IFsrmCommittableCollection **collection); END_INTERFACE } IFsrmQuotaManagerVtbl; + interface IFsrmQuotaManager { CONST_VTBL IFsrmQuotaManagerVtbl* lpVtbl; }; @@ -410,114 +463,6 @@ static FORCEINLINE HRESULT IFsrmQuotaManager_CreateQuotaCollection(IFsrmQuotaMan #endif -HRESULT STDMETHODCALLTYPE IFsrmQuotaManager_get_ActionVariables_Proxy( - IFsrmQuotaManager* This, - SAFEARRAY **variables); -void __RPC_STUB IFsrmQuotaManager_get_ActionVariables_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaManager_get_ActionVariableDescriptions_Proxy( - IFsrmQuotaManager* This, - SAFEARRAY **descriptions); -void __RPC_STUB IFsrmQuotaManager_get_ActionVariableDescriptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaManager_CreateQuota_Proxy( - IFsrmQuotaManager* This, - BSTR path, - IFsrmQuota **quota); -void __RPC_STUB IFsrmQuotaManager_CreateQuota_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaManager_CreateAutoApplyQuota_Proxy( - IFsrmQuotaManager* This, - BSTR quotaTemplateName, - BSTR path, - IFsrmAutoApplyQuota **quota); -void __RPC_STUB IFsrmQuotaManager_CreateAutoApplyQuota_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaManager_GetQuota_Proxy( - IFsrmQuotaManager* This, - BSTR path, - IFsrmQuota **quota); -void __RPC_STUB IFsrmQuotaManager_GetQuota_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaManager_GetAutoApplyQuota_Proxy( - IFsrmQuotaManager* This, - BSTR path, - IFsrmAutoApplyQuota **quota); -void __RPC_STUB IFsrmQuotaManager_GetAutoApplyQuota_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaManager_GetRestrictiveQuota_Proxy( - IFsrmQuotaManager* This, - BSTR path, - IFsrmQuota **quota); -void __RPC_STUB IFsrmQuotaManager_GetRestrictiveQuota_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaManager_EnumQuotas_Proxy( - IFsrmQuotaManager* This, - BSTR path, - FsrmEnumOptions options, - IFsrmCommittableCollection **quotas); -void __RPC_STUB IFsrmQuotaManager_EnumQuotas_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaManager_EnumAutoApplyQuotas_Proxy( - IFsrmQuotaManager* This, - BSTR path, - FsrmEnumOptions options, - IFsrmCommittableCollection **quotas); -void __RPC_STUB IFsrmQuotaManager_EnumAutoApplyQuotas_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaManager_EnumEffectiveQuotas_Proxy( - IFsrmQuotaManager* This, - BSTR path, - FsrmEnumOptions options, - IFsrmCommittableCollection **quotas); -void __RPC_STUB IFsrmQuotaManager_EnumEffectiveQuotas_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaManager_Scan_Proxy( - IFsrmQuotaManager* This, - BSTR strPath); -void __RPC_STUB IFsrmQuotaManager_Scan_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaManager_CreateQuotaCollection_Proxy( - IFsrmQuotaManager* This, - IFsrmCommittableCollection **collection); -void __RPC_STUB IFsrmQuotaManager_CreateQuotaCollection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmQuotaManager_INTERFACE_DEFINED__ */ @@ -562,29 +507,29 @@ typedef struct IFsrmQuotaTemplateManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmQuotaTemplateManager* This, + IFsrmQuotaTemplateManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmQuotaTemplateManager* This); + IFsrmQuotaTemplateManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmQuotaTemplateManager* This); + IFsrmQuotaTemplateManager *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmQuotaTemplateManager* This, + IFsrmQuotaTemplateManager *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmQuotaTemplateManager* This, + IFsrmQuotaTemplateManager *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmQuotaTemplateManager* This, + IFsrmQuotaTemplateManager *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -592,7 +537,7 @@ typedef struct IFsrmQuotaTemplateManagerVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmQuotaTemplateManager* This, + IFsrmQuotaTemplateManager *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -604,32 +549,33 @@ typedef struct IFsrmQuotaTemplateManagerVtbl { /*** IFsrmQuotaTemplateManager methods ***/ HRESULT (STDMETHODCALLTYPE *CreateTemplate)( - IFsrmQuotaTemplateManager* This, + IFsrmQuotaTemplateManager *This, IFsrmQuotaTemplate **quotaTemplate); HRESULT (STDMETHODCALLTYPE *GetTemplate)( - IFsrmQuotaTemplateManager* This, + IFsrmQuotaTemplateManager *This, BSTR name, IFsrmQuotaTemplate **quotaTemplate); HRESULT (STDMETHODCALLTYPE *EnumTemplates)( - IFsrmQuotaTemplateManager* This, + IFsrmQuotaTemplateManager *This, FsrmEnumOptions options, IFsrmCommittableCollection **quotaTemplates); HRESULT (STDMETHODCALLTYPE *ExportTemplates)( - IFsrmQuotaTemplateManager* This, + IFsrmQuotaTemplateManager *This, VARIANT *quotaTemplateNamesArray, BSTR *serializedQuotaTemplates); HRESULT (STDMETHODCALLTYPE *ImportTemplates)( - IFsrmQuotaTemplateManager* This, + IFsrmQuotaTemplateManager *This, BSTR serializedQuotaTemplates, VARIANT *quotaTemplateNamesArray, IFsrmCommittableCollection **quotaTemplates); END_INTERFACE } IFsrmQuotaTemplateManagerVtbl; + interface IFsrmQuotaTemplateManager { CONST_VTBL IFsrmQuotaTemplateManagerVtbl* lpVtbl; }; @@ -696,51 +642,6 @@ static FORCEINLINE HRESULT IFsrmQuotaTemplateManager_ImportTemplates(IFsrmQuotaT #endif -HRESULT STDMETHODCALLTYPE IFsrmQuotaTemplateManager_CreateTemplate_Proxy( - IFsrmQuotaTemplateManager* This, - IFsrmQuotaTemplate **quotaTemplate); -void __RPC_STUB IFsrmQuotaTemplateManager_CreateTemplate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaTemplateManager_GetTemplate_Proxy( - IFsrmQuotaTemplateManager* This, - BSTR name, - IFsrmQuotaTemplate **quotaTemplate); -void __RPC_STUB IFsrmQuotaTemplateManager_GetTemplate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaTemplateManager_EnumTemplates_Proxy( - IFsrmQuotaTemplateManager* This, - FsrmEnumOptions options, - IFsrmCommittableCollection **quotaTemplates); -void __RPC_STUB IFsrmQuotaTemplateManager_EnumTemplates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaTemplateManager_ExportTemplates_Proxy( - IFsrmQuotaTemplateManager* This, - VARIANT *quotaTemplateNamesArray, - BSTR *serializedQuotaTemplates); -void __RPC_STUB IFsrmQuotaTemplateManager_ExportTemplates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaTemplateManager_ImportTemplates_Proxy( - IFsrmQuotaTemplateManager* This, - BSTR serializedQuotaTemplates, - VARIANT *quotaTemplateNamesArray, - IFsrmCommittableCollection **quotaTemplates); -void __RPC_STUB IFsrmQuotaTemplateManager_ImportTemplates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmQuotaTemplateManager_INTERFACE_DEFINED__ */ @@ -799,29 +700,29 @@ typedef struct IFsrmQuotaBaseVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmQuotaBase* This, + IFsrmQuotaBase *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmQuotaBase* This); + IFsrmQuotaBase *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmQuotaBase* This); + IFsrmQuotaBase *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmQuotaBase* This, + IFsrmQuotaBase *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmQuotaBase* This, + IFsrmQuotaBase *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmQuotaBase* This, + IFsrmQuotaBase *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -829,7 +730,7 @@ typedef struct IFsrmQuotaBaseVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmQuotaBase* This, + IFsrmQuotaBase *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -841,70 +742,71 @@ typedef struct IFsrmQuotaBaseVtbl { /*** IFsrmObject methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - IFsrmQuotaBase* This, + IFsrmQuotaBase *This, FSRM_OBJECT_ID *id); HRESULT (STDMETHODCALLTYPE *get_Description)( - IFsrmQuotaBase* This, + IFsrmQuotaBase *This, BSTR *description); HRESULT (STDMETHODCALLTYPE *put_Description)( - IFsrmQuotaBase* This, + IFsrmQuotaBase *This, BSTR description); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmQuotaBase* This); + IFsrmQuotaBase *This); HRESULT (STDMETHODCALLTYPE *Commit)( - IFsrmQuotaBase* This); + IFsrmQuotaBase *This); /*** IFsrmQuotaBase methods ***/ HRESULT (STDMETHODCALLTYPE *get_QuotaLimit)( - IFsrmQuotaBase* This, + IFsrmQuotaBase *This, VARIANT *quotaLimit); HRESULT (STDMETHODCALLTYPE *put_QuotaLimit)( - IFsrmQuotaBase* This, + IFsrmQuotaBase *This, VARIANT quotaLimit); HRESULT (STDMETHODCALLTYPE *get_QuotaFlags)( - IFsrmQuotaBase* This, + IFsrmQuotaBase *This, LONG *quotaFlags); HRESULT (STDMETHODCALLTYPE *put_QuotaFlags)( - IFsrmQuotaBase* This, + IFsrmQuotaBase *This, LONG quotaFlags); HRESULT (STDMETHODCALLTYPE *get_Thresholds)( - IFsrmQuotaBase* This, + IFsrmQuotaBase *This, SAFEARRAY **thresholds); HRESULT (STDMETHODCALLTYPE *AddThreshold)( - IFsrmQuotaBase* This, + IFsrmQuotaBase *This, FSRM_QUOTA_THRESHOLD threshold); HRESULT (STDMETHODCALLTYPE *DeleteThreshold)( - IFsrmQuotaBase* This, + IFsrmQuotaBase *This, FSRM_QUOTA_THRESHOLD threshold); HRESULT (STDMETHODCALLTYPE *ModifyThreshold)( - IFsrmQuotaBase* This, + IFsrmQuotaBase *This, FSRM_QUOTA_THRESHOLD threshold, FSRM_QUOTA_THRESHOLD newThreshold); HRESULT (STDMETHODCALLTYPE *CreateThresholdAction)( - IFsrmQuotaBase* This, + IFsrmQuotaBase *This, FSRM_QUOTA_THRESHOLD threshold, FsrmActionType actionType, IFsrmAction **action); HRESULT (STDMETHODCALLTYPE *EnumThresholdActions)( - IFsrmQuotaBase* This, + IFsrmQuotaBase *This, FSRM_QUOTA_THRESHOLD threshold, IFsrmCollection **actions); END_INTERFACE } IFsrmQuotaBaseVtbl; + interface IFsrmQuotaBase { CONST_VTBL IFsrmQuotaBaseVtbl* lpVtbl; }; @@ -1013,90 +915,6 @@ static FORCEINLINE HRESULT IFsrmQuotaBase_EnumThresholdActions(IFsrmQuotaBase* T #endif -HRESULT STDMETHODCALLTYPE IFsrmQuotaBase_get_QuotaLimit_Proxy( - IFsrmQuotaBase* This, - VARIANT *quotaLimit); -void __RPC_STUB IFsrmQuotaBase_get_QuotaLimit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaBase_put_QuotaLimit_Proxy( - IFsrmQuotaBase* This, - VARIANT quotaLimit); -void __RPC_STUB IFsrmQuotaBase_put_QuotaLimit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaBase_get_QuotaFlags_Proxy( - IFsrmQuotaBase* This, - LONG *quotaFlags); -void __RPC_STUB IFsrmQuotaBase_get_QuotaFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaBase_put_QuotaFlags_Proxy( - IFsrmQuotaBase* This, - LONG quotaFlags); -void __RPC_STUB IFsrmQuotaBase_put_QuotaFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaBase_get_Thresholds_Proxy( - IFsrmQuotaBase* This, - SAFEARRAY **thresholds); -void __RPC_STUB IFsrmQuotaBase_get_Thresholds_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaBase_AddThreshold_Proxy( - IFsrmQuotaBase* This, - FSRM_QUOTA_THRESHOLD threshold); -void __RPC_STUB IFsrmQuotaBase_AddThreshold_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaBase_DeleteThreshold_Proxy( - IFsrmQuotaBase* This, - FSRM_QUOTA_THRESHOLD threshold); -void __RPC_STUB IFsrmQuotaBase_DeleteThreshold_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaBase_ModifyThreshold_Proxy( - IFsrmQuotaBase* This, - FSRM_QUOTA_THRESHOLD threshold, - FSRM_QUOTA_THRESHOLD newThreshold); -void __RPC_STUB IFsrmQuotaBase_ModifyThreshold_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaBase_CreateThresholdAction_Proxy( - IFsrmQuotaBase* This, - FSRM_QUOTA_THRESHOLD threshold, - FsrmActionType actionType, - IFsrmAction **action); -void __RPC_STUB IFsrmQuotaBase_CreateThresholdAction_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaBase_EnumThresholdActions_Proxy( - IFsrmQuotaBase* This, - FSRM_QUOTA_THRESHOLD threshold, - IFsrmCollection **actions); -void __RPC_STUB IFsrmQuotaBase_EnumThresholdActions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmQuotaBase_INTERFACE_DEFINED__ */ @@ -1139,29 +957,29 @@ typedef struct IFsrmQuotaObjectVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmQuotaObject* This, + IFsrmQuotaObject *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmQuotaObject* This); + IFsrmQuotaObject *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmQuotaObject* This); + IFsrmQuotaObject *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmQuotaObject* This, + IFsrmQuotaObject *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmQuotaObject* This, + IFsrmQuotaObject *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmQuotaObject* This, + IFsrmQuotaObject *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1169,7 +987,7 @@ typedef struct IFsrmQuotaObjectVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmQuotaObject* This, + IFsrmQuotaObject *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1181,95 +999,96 @@ typedef struct IFsrmQuotaObjectVtbl { /*** IFsrmObject methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - IFsrmQuotaObject* This, + IFsrmQuotaObject *This, FSRM_OBJECT_ID *id); HRESULT (STDMETHODCALLTYPE *get_Description)( - IFsrmQuotaObject* This, + IFsrmQuotaObject *This, BSTR *description); HRESULT (STDMETHODCALLTYPE *put_Description)( - IFsrmQuotaObject* This, + IFsrmQuotaObject *This, BSTR description); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmQuotaObject* This); + IFsrmQuotaObject *This); HRESULT (STDMETHODCALLTYPE *Commit)( - IFsrmQuotaObject* This); + IFsrmQuotaObject *This); /*** IFsrmQuotaBase methods ***/ HRESULT (STDMETHODCALLTYPE *get_QuotaLimit)( - IFsrmQuotaObject* This, + IFsrmQuotaObject *This, VARIANT *quotaLimit); HRESULT (STDMETHODCALLTYPE *put_QuotaLimit)( - IFsrmQuotaObject* This, + IFsrmQuotaObject *This, VARIANT quotaLimit); HRESULT (STDMETHODCALLTYPE *get_QuotaFlags)( - IFsrmQuotaObject* This, + IFsrmQuotaObject *This, LONG *quotaFlags); HRESULT (STDMETHODCALLTYPE *put_QuotaFlags)( - IFsrmQuotaObject* This, + IFsrmQuotaObject *This, LONG quotaFlags); HRESULT (STDMETHODCALLTYPE *get_Thresholds)( - IFsrmQuotaObject* This, + IFsrmQuotaObject *This, SAFEARRAY **thresholds); HRESULT (STDMETHODCALLTYPE *AddThreshold)( - IFsrmQuotaObject* This, + IFsrmQuotaObject *This, FSRM_QUOTA_THRESHOLD threshold); HRESULT (STDMETHODCALLTYPE *DeleteThreshold)( - IFsrmQuotaObject* This, + IFsrmQuotaObject *This, FSRM_QUOTA_THRESHOLD threshold); HRESULT (STDMETHODCALLTYPE *ModifyThreshold)( - IFsrmQuotaObject* This, + IFsrmQuotaObject *This, FSRM_QUOTA_THRESHOLD threshold, FSRM_QUOTA_THRESHOLD newThreshold); HRESULT (STDMETHODCALLTYPE *CreateThresholdAction)( - IFsrmQuotaObject* This, + IFsrmQuotaObject *This, FSRM_QUOTA_THRESHOLD threshold, FsrmActionType actionType, IFsrmAction **action); HRESULT (STDMETHODCALLTYPE *EnumThresholdActions)( - IFsrmQuotaObject* This, + IFsrmQuotaObject *This, FSRM_QUOTA_THRESHOLD threshold, IFsrmCollection **actions); /*** IFsrmQuotaObject methods ***/ HRESULT (STDMETHODCALLTYPE *get_Path)( - IFsrmQuotaObject* This, + IFsrmQuotaObject *This, BSTR *path); HRESULT (STDMETHODCALLTYPE *get_UserSid)( - IFsrmQuotaObject* This, + IFsrmQuotaObject *This, BSTR *userSid); HRESULT (STDMETHODCALLTYPE *get_UserAccount)( - IFsrmQuotaObject* This, + IFsrmQuotaObject *This, BSTR *userAccount); HRESULT (STDMETHODCALLTYPE *get_SourceTemplateName)( - IFsrmQuotaObject* This, + IFsrmQuotaObject *This, BSTR *quotaTemplateName); HRESULT (STDMETHODCALLTYPE *get_MatchesSourceTemplate)( - IFsrmQuotaObject* This, + IFsrmQuotaObject *This, VARIANT_BOOL *matches); HRESULT (STDMETHODCALLTYPE *ApplyTemplate)( - IFsrmQuotaObject* This, + IFsrmQuotaObject *This, BSTR quotaTemplateName); END_INTERFACE } IFsrmQuotaObjectVtbl; + interface IFsrmQuotaObject { CONST_VTBL IFsrmQuotaObjectVtbl* lpVtbl; }; @@ -1404,54 +1223,6 @@ static FORCEINLINE HRESULT IFsrmQuotaObject_ApplyTemplate(IFsrmQuotaObject* This #endif -HRESULT STDMETHODCALLTYPE IFsrmQuotaObject_get_Path_Proxy( - IFsrmQuotaObject* This, - BSTR *path); -void __RPC_STUB IFsrmQuotaObject_get_Path_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaObject_get_UserSid_Proxy( - IFsrmQuotaObject* This, - BSTR *userSid); -void __RPC_STUB IFsrmQuotaObject_get_UserSid_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaObject_get_UserAccount_Proxy( - IFsrmQuotaObject* This, - BSTR *userAccount); -void __RPC_STUB IFsrmQuotaObject_get_UserAccount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaObject_get_SourceTemplateName_Proxy( - IFsrmQuotaObject* This, - BSTR *quotaTemplateName); -void __RPC_STUB IFsrmQuotaObject_get_SourceTemplateName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaObject_get_MatchesSourceTemplate_Proxy( - IFsrmQuotaObject* This, - VARIANT_BOOL *matches); -void __RPC_STUB IFsrmQuotaObject_get_MatchesSourceTemplate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaObject_ApplyTemplate_Proxy( - IFsrmQuotaObject* This, - BSTR quotaTemplateName); -void __RPC_STUB IFsrmQuotaObject_ApplyTemplate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmQuotaObject_INTERFACE_DEFINED__ */ @@ -1490,29 +1261,29 @@ typedef struct IFsrmQuotaTemplateVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmQuotaTemplate* This, + IFsrmQuotaTemplate *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmQuotaTemplate* This); + IFsrmQuotaTemplate *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmQuotaTemplate* This); + IFsrmQuotaTemplate *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmQuotaTemplate* This, + IFsrmQuotaTemplate *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmQuotaTemplate* This, + IFsrmQuotaTemplate *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmQuotaTemplate* This, + IFsrmQuotaTemplate *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1520,7 +1291,7 @@ typedef struct IFsrmQuotaTemplateVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmQuotaTemplate* This, + IFsrmQuotaTemplate *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1532,89 +1303,90 @@ typedef struct IFsrmQuotaTemplateVtbl { /*** IFsrmObject methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - IFsrmQuotaTemplate* This, + IFsrmQuotaTemplate *This, FSRM_OBJECT_ID *id); HRESULT (STDMETHODCALLTYPE *get_Description)( - IFsrmQuotaTemplate* This, + IFsrmQuotaTemplate *This, BSTR *description); HRESULT (STDMETHODCALLTYPE *put_Description)( - IFsrmQuotaTemplate* This, + IFsrmQuotaTemplate *This, BSTR description); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmQuotaTemplate* This); + IFsrmQuotaTemplate *This); HRESULT (STDMETHODCALLTYPE *Commit)( - IFsrmQuotaTemplate* This); + IFsrmQuotaTemplate *This); /*** IFsrmQuotaBase methods ***/ HRESULT (STDMETHODCALLTYPE *get_QuotaLimit)( - IFsrmQuotaTemplate* This, + IFsrmQuotaTemplate *This, VARIANT *quotaLimit); HRESULT (STDMETHODCALLTYPE *put_QuotaLimit)( - IFsrmQuotaTemplate* This, + IFsrmQuotaTemplate *This, VARIANT quotaLimit); HRESULT (STDMETHODCALLTYPE *get_QuotaFlags)( - IFsrmQuotaTemplate* This, + IFsrmQuotaTemplate *This, LONG *quotaFlags); HRESULT (STDMETHODCALLTYPE *put_QuotaFlags)( - IFsrmQuotaTemplate* This, + IFsrmQuotaTemplate *This, LONG quotaFlags); HRESULT (STDMETHODCALLTYPE *get_Thresholds)( - IFsrmQuotaTemplate* This, + IFsrmQuotaTemplate *This, SAFEARRAY **thresholds); HRESULT (STDMETHODCALLTYPE *AddThreshold)( - IFsrmQuotaTemplate* This, + IFsrmQuotaTemplate *This, FSRM_QUOTA_THRESHOLD threshold); HRESULT (STDMETHODCALLTYPE *DeleteThreshold)( - IFsrmQuotaTemplate* This, + IFsrmQuotaTemplate *This, FSRM_QUOTA_THRESHOLD threshold); HRESULT (STDMETHODCALLTYPE *ModifyThreshold)( - IFsrmQuotaTemplate* This, + IFsrmQuotaTemplate *This, FSRM_QUOTA_THRESHOLD threshold, FSRM_QUOTA_THRESHOLD newThreshold); HRESULT (STDMETHODCALLTYPE *CreateThresholdAction)( - IFsrmQuotaTemplate* This, + IFsrmQuotaTemplate *This, FSRM_QUOTA_THRESHOLD threshold, FsrmActionType actionType, IFsrmAction **action); HRESULT (STDMETHODCALLTYPE *EnumThresholdActions)( - IFsrmQuotaTemplate* This, + IFsrmQuotaTemplate *This, FSRM_QUOTA_THRESHOLD threshold, IFsrmCollection **actions); /*** IFsrmQuotaTemplate methods ***/ HRESULT (STDMETHODCALLTYPE *get_Name)( - IFsrmQuotaTemplate* This, + IFsrmQuotaTemplate *This, BSTR *name); HRESULT (STDMETHODCALLTYPE *put_Name)( - IFsrmQuotaTemplate* This, + IFsrmQuotaTemplate *This, BSTR name); HRESULT (STDMETHODCALLTYPE *CopyTemplate)( - IFsrmQuotaTemplate* This, + IFsrmQuotaTemplate *This, BSTR quotaTemplateName); HRESULT (STDMETHODCALLTYPE *CommitAndUpdateDerived)( - IFsrmQuotaTemplate* This, + IFsrmQuotaTemplate *This, FsrmCommitOptions commitOptions, FsrmTemplateApplyOptions applyOptions, IFsrmDerivedObjectsResult **derivedObjectsResult); END_INTERFACE } IFsrmQuotaTemplateVtbl; + interface IFsrmQuotaTemplate { CONST_VTBL IFsrmQuotaTemplateVtbl* lpVtbl; }; @@ -1741,40 +1513,6 @@ static FORCEINLINE HRESULT IFsrmQuotaTemplate_CommitAndUpdateDerived(IFsrmQuotaT #endif -HRESULT STDMETHODCALLTYPE IFsrmQuotaTemplate_get_Name_Proxy( - IFsrmQuotaTemplate* This, - BSTR *name); -void __RPC_STUB IFsrmQuotaTemplate_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaTemplate_put_Name_Proxy( - IFsrmQuotaTemplate* This, - BSTR name); -void __RPC_STUB IFsrmQuotaTemplate_put_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaTemplate_CopyTemplate_Proxy( - IFsrmQuotaTemplate* This, - BSTR quotaTemplateName); -void __RPC_STUB IFsrmQuotaTemplate_CopyTemplate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaTemplate_CommitAndUpdateDerived_Proxy( - IFsrmQuotaTemplate* This, - FsrmCommitOptions commitOptions, - FsrmTemplateApplyOptions applyOptions, - IFsrmDerivedObjectsResult **derivedObjectsResult); -void __RPC_STUB IFsrmQuotaTemplate_CommitAndUpdateDerived_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmQuotaTemplate_INTERFACE_DEFINED__ */ @@ -1814,29 +1552,29 @@ typedef struct IFsrmQuotaVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmQuota* This, + IFsrmQuota *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmQuota* This); + IFsrmQuota *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmQuota* This); + IFsrmQuota *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmQuota* This, + IFsrmQuota *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmQuota* This, + IFsrmQuota *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmQuota* This, + IFsrmQuota *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1844,7 +1582,7 @@ typedef struct IFsrmQuotaVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmQuota* This, + IFsrmQuota *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1856,114 +1594,115 @@ typedef struct IFsrmQuotaVtbl { /*** IFsrmObject methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - IFsrmQuota* This, + IFsrmQuota *This, FSRM_OBJECT_ID *id); HRESULT (STDMETHODCALLTYPE *get_Description)( - IFsrmQuota* This, + IFsrmQuota *This, BSTR *description); HRESULT (STDMETHODCALLTYPE *put_Description)( - IFsrmQuota* This, + IFsrmQuota *This, BSTR description); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmQuota* This); + IFsrmQuota *This); HRESULT (STDMETHODCALLTYPE *Commit)( - IFsrmQuota* This); + IFsrmQuota *This); /*** IFsrmQuotaBase methods ***/ HRESULT (STDMETHODCALLTYPE *get_QuotaLimit)( - IFsrmQuota* This, + IFsrmQuota *This, VARIANT *quotaLimit); HRESULT (STDMETHODCALLTYPE *put_QuotaLimit)( - IFsrmQuota* This, + IFsrmQuota *This, VARIANT quotaLimit); HRESULT (STDMETHODCALLTYPE *get_QuotaFlags)( - IFsrmQuota* This, + IFsrmQuota *This, LONG *quotaFlags); HRESULT (STDMETHODCALLTYPE *put_QuotaFlags)( - IFsrmQuota* This, + IFsrmQuota *This, LONG quotaFlags); HRESULT (STDMETHODCALLTYPE *get_Thresholds)( - IFsrmQuota* This, + IFsrmQuota *This, SAFEARRAY **thresholds); HRESULT (STDMETHODCALLTYPE *AddThreshold)( - IFsrmQuota* This, + IFsrmQuota *This, FSRM_QUOTA_THRESHOLD threshold); HRESULT (STDMETHODCALLTYPE *DeleteThreshold)( - IFsrmQuota* This, + IFsrmQuota *This, FSRM_QUOTA_THRESHOLD threshold); HRESULT (STDMETHODCALLTYPE *ModifyThreshold)( - IFsrmQuota* This, + IFsrmQuota *This, FSRM_QUOTA_THRESHOLD threshold, FSRM_QUOTA_THRESHOLD newThreshold); HRESULT (STDMETHODCALLTYPE *CreateThresholdAction)( - IFsrmQuota* This, + IFsrmQuota *This, FSRM_QUOTA_THRESHOLD threshold, FsrmActionType actionType, IFsrmAction **action); HRESULT (STDMETHODCALLTYPE *EnumThresholdActions)( - IFsrmQuota* This, + IFsrmQuota *This, FSRM_QUOTA_THRESHOLD threshold, IFsrmCollection **actions); /*** IFsrmQuotaObject methods ***/ HRESULT (STDMETHODCALLTYPE *get_Path)( - IFsrmQuota* This, + IFsrmQuota *This, BSTR *path); HRESULT (STDMETHODCALLTYPE *get_UserSid)( - IFsrmQuota* This, + IFsrmQuota *This, BSTR *userSid); HRESULT (STDMETHODCALLTYPE *get_UserAccount)( - IFsrmQuota* This, + IFsrmQuota *This, BSTR *userAccount); HRESULT (STDMETHODCALLTYPE *get_SourceTemplateName)( - IFsrmQuota* This, + IFsrmQuota *This, BSTR *quotaTemplateName); HRESULT (STDMETHODCALLTYPE *get_MatchesSourceTemplate)( - IFsrmQuota* This, + IFsrmQuota *This, VARIANT_BOOL *matches); HRESULT (STDMETHODCALLTYPE *ApplyTemplate)( - IFsrmQuota* This, + IFsrmQuota *This, BSTR quotaTemplateName); /*** IFsrmQuota methods ***/ HRESULT (STDMETHODCALLTYPE *get_QuotaUsed)( - IFsrmQuota* This, + IFsrmQuota *This, VARIANT *used); HRESULT (STDMETHODCALLTYPE *get_QuotaPeakUsage)( - IFsrmQuota* This, + IFsrmQuota *This, VARIANT *peakUsage); HRESULT (STDMETHODCALLTYPE *get_QuotaPeakUsageTime)( - IFsrmQuota* This, + IFsrmQuota *This, DATE *peakUsageDateTime); HRESULT (STDMETHODCALLTYPE *ResetPeakUsage)( - IFsrmQuota* This); + IFsrmQuota *This); HRESULT (STDMETHODCALLTYPE *RefreshUsageProperties)( - IFsrmQuota* This); + IFsrmQuota *This); END_INTERFACE } IFsrmQuotaVtbl; + interface IFsrmQuota { CONST_VTBL IFsrmQuotaVtbl* lpVtbl; }; @@ -2120,44 +1859,6 @@ static FORCEINLINE HRESULT IFsrmQuota_RefreshUsageProperties(IFsrmQuota* This) { #endif -HRESULT STDMETHODCALLTYPE IFsrmQuota_get_QuotaUsed_Proxy( - IFsrmQuota* This, - VARIANT *used); -void __RPC_STUB IFsrmQuota_get_QuotaUsed_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuota_get_QuotaPeakUsage_Proxy( - IFsrmQuota* This, - VARIANT *peakUsage); -void __RPC_STUB IFsrmQuota_get_QuotaPeakUsage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuota_get_QuotaPeakUsageTime_Proxy( - IFsrmQuota* This, - DATE *peakUsageDateTime); -void __RPC_STUB IFsrmQuota_get_QuotaPeakUsageTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuota_ResetPeakUsage_Proxy( - IFsrmQuota* This); -void __RPC_STUB IFsrmQuota_ResetPeakUsage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuota_RefreshUsageProperties_Proxy( - IFsrmQuota* This); -void __RPC_STUB IFsrmQuota_RefreshUsageProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmQuota_INTERFACE_DEFINED__ */ @@ -2193,29 +1894,29 @@ typedef struct IFsrmAutoApplyQuotaVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmAutoApplyQuota* This); + IFsrmAutoApplyQuota *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmAutoApplyQuota* This); + IFsrmAutoApplyQuota *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2223,7 +1924,7 @@ typedef struct IFsrmAutoApplyQuotaVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2235,110 +1936,111 @@ typedef struct IFsrmAutoApplyQuotaVtbl { /*** IFsrmObject methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, FSRM_OBJECT_ID *id); HRESULT (STDMETHODCALLTYPE *get_Description)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, BSTR *description); HRESULT (STDMETHODCALLTYPE *put_Description)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, BSTR description); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmAutoApplyQuota* This); + IFsrmAutoApplyQuota *This); HRESULT (STDMETHODCALLTYPE *Commit)( - IFsrmAutoApplyQuota* This); + IFsrmAutoApplyQuota *This); /*** IFsrmQuotaBase methods ***/ HRESULT (STDMETHODCALLTYPE *get_QuotaLimit)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, VARIANT *quotaLimit); HRESULT (STDMETHODCALLTYPE *put_QuotaLimit)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, VARIANT quotaLimit); HRESULT (STDMETHODCALLTYPE *get_QuotaFlags)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, LONG *quotaFlags); HRESULT (STDMETHODCALLTYPE *put_QuotaFlags)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, LONG quotaFlags); HRESULT (STDMETHODCALLTYPE *get_Thresholds)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, SAFEARRAY **thresholds); HRESULT (STDMETHODCALLTYPE *AddThreshold)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, FSRM_QUOTA_THRESHOLD threshold); HRESULT (STDMETHODCALLTYPE *DeleteThreshold)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, FSRM_QUOTA_THRESHOLD threshold); HRESULT (STDMETHODCALLTYPE *ModifyThreshold)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, FSRM_QUOTA_THRESHOLD threshold, FSRM_QUOTA_THRESHOLD newThreshold); HRESULT (STDMETHODCALLTYPE *CreateThresholdAction)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, FSRM_QUOTA_THRESHOLD threshold, FsrmActionType actionType, IFsrmAction **action); HRESULT (STDMETHODCALLTYPE *EnumThresholdActions)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, FSRM_QUOTA_THRESHOLD threshold, IFsrmCollection **actions); /*** IFsrmQuotaObject methods ***/ HRESULT (STDMETHODCALLTYPE *get_Path)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, BSTR *path); HRESULT (STDMETHODCALLTYPE *get_UserSid)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, BSTR *userSid); HRESULT (STDMETHODCALLTYPE *get_UserAccount)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, BSTR *userAccount); HRESULT (STDMETHODCALLTYPE *get_SourceTemplateName)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, BSTR *quotaTemplateName); HRESULT (STDMETHODCALLTYPE *get_MatchesSourceTemplate)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, VARIANT_BOOL *matches); HRESULT (STDMETHODCALLTYPE *ApplyTemplate)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, BSTR quotaTemplateName); /*** IFsrmAutoApplyQuota methods ***/ HRESULT (STDMETHODCALLTYPE *get_ExcludeFolders)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, SAFEARRAY **folders); HRESULT (STDMETHODCALLTYPE *put_ExcludeFolders)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, SAFEARRAY *folders); HRESULT (STDMETHODCALLTYPE *CommitAndUpdateDerived)( - IFsrmAutoApplyQuota* This, + IFsrmAutoApplyQuota *This, FsrmCommitOptions commitOptions, FsrmTemplateApplyOptions applyOptions, IFsrmDerivedObjectsResult **derivedObjectsResult); END_INTERFACE } IFsrmAutoApplyQuotaVtbl; + interface IFsrmAutoApplyQuota { CONST_VTBL IFsrmAutoApplyQuotaVtbl* lpVtbl; }; @@ -2487,32 +2189,6 @@ static FORCEINLINE HRESULT IFsrmAutoApplyQuota_CommitAndUpdateDerived(IFsrmAutoA #endif -HRESULT STDMETHODCALLTYPE IFsrmAutoApplyQuota_get_ExcludeFolders_Proxy( - IFsrmAutoApplyQuota* This, - SAFEARRAY **folders); -void __RPC_STUB IFsrmAutoApplyQuota_get_ExcludeFolders_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmAutoApplyQuota_put_ExcludeFolders_Proxy( - IFsrmAutoApplyQuota* This, - SAFEARRAY *folders); -void __RPC_STUB IFsrmAutoApplyQuota_put_ExcludeFolders_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmAutoApplyQuota_CommitAndUpdateDerived_Proxy( - IFsrmAutoApplyQuota* This, - FsrmCommitOptions commitOptions, - FsrmTemplateApplyOptions applyOptions, - IFsrmDerivedObjectsResult **derivedObjectsResult); -void __RPC_STUB IFsrmAutoApplyQuota_CommitAndUpdateDerived_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmAutoApplyQuota_INTERFACE_DEFINED__ */ @@ -2542,29 +2218,29 @@ typedef struct IFsrmQuotaManagerExVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmQuotaManagerEx* This, + IFsrmQuotaManagerEx *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmQuotaManagerEx* This); + IFsrmQuotaManagerEx *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmQuotaManagerEx* This); + IFsrmQuotaManagerEx *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmQuotaManagerEx* This, + IFsrmQuotaManagerEx *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmQuotaManagerEx* This, + IFsrmQuotaManagerEx *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmQuotaManagerEx* This, + IFsrmQuotaManagerEx *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2572,7 +2248,7 @@ typedef struct IFsrmQuotaManagerExVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmQuotaManagerEx* This, + IFsrmQuotaManagerEx *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2584,74 +2260,75 @@ typedef struct IFsrmQuotaManagerExVtbl { /*** IFsrmQuotaManager methods ***/ HRESULT (STDMETHODCALLTYPE *get_ActionVariables)( - IFsrmQuotaManagerEx* This, + IFsrmQuotaManagerEx *This, SAFEARRAY **variables); HRESULT (STDMETHODCALLTYPE *get_ActionVariableDescriptions)( - IFsrmQuotaManagerEx* This, + IFsrmQuotaManagerEx *This, SAFEARRAY **descriptions); HRESULT (STDMETHODCALLTYPE *CreateQuota)( - IFsrmQuotaManagerEx* This, + IFsrmQuotaManagerEx *This, BSTR path, IFsrmQuota **quota); HRESULT (STDMETHODCALLTYPE *CreateAutoApplyQuota)( - IFsrmQuotaManagerEx* This, + IFsrmQuotaManagerEx *This, BSTR quotaTemplateName, BSTR path, IFsrmAutoApplyQuota **quota); HRESULT (STDMETHODCALLTYPE *GetQuota)( - IFsrmQuotaManagerEx* This, + IFsrmQuotaManagerEx *This, BSTR path, IFsrmQuota **quota); HRESULT (STDMETHODCALLTYPE *GetAutoApplyQuota)( - IFsrmQuotaManagerEx* This, + IFsrmQuotaManagerEx *This, BSTR path, IFsrmAutoApplyQuota **quota); HRESULT (STDMETHODCALLTYPE *GetRestrictiveQuota)( - IFsrmQuotaManagerEx* This, + IFsrmQuotaManagerEx *This, BSTR path, IFsrmQuota **quota); HRESULT (STDMETHODCALLTYPE *EnumQuotas)( - IFsrmQuotaManagerEx* This, + IFsrmQuotaManagerEx *This, BSTR path, FsrmEnumOptions options, IFsrmCommittableCollection **quotas); HRESULT (STDMETHODCALLTYPE *EnumAutoApplyQuotas)( - IFsrmQuotaManagerEx* This, + IFsrmQuotaManagerEx *This, BSTR path, FsrmEnumOptions options, IFsrmCommittableCollection **quotas); HRESULT (STDMETHODCALLTYPE *EnumEffectiveQuotas)( - IFsrmQuotaManagerEx* This, + IFsrmQuotaManagerEx *This, BSTR path, FsrmEnumOptions options, IFsrmCommittableCollection **quotas); HRESULT (STDMETHODCALLTYPE *Scan)( - IFsrmQuotaManagerEx* This, + IFsrmQuotaManagerEx *This, BSTR strPath); HRESULT (STDMETHODCALLTYPE *CreateQuotaCollection)( - IFsrmQuotaManagerEx* This, + IFsrmQuotaManagerEx *This, IFsrmCommittableCollection **collection); /*** IFsrmQuotaManagerEx methods ***/ HRESULT (STDMETHODCALLTYPE *IsAffectedByQuota)( - IFsrmQuotaManagerEx* This, + IFsrmQuotaManagerEx *This, BSTR path, FsrmEnumOptions options, VARIANT_BOOL *affected); END_INTERFACE } IFsrmQuotaManagerExVtbl; + interface IFsrmQuotaManagerEx { CONST_VTBL IFsrmQuotaManagerExVtbl* lpVtbl; }; @@ -2752,16 +2429,6 @@ static FORCEINLINE HRESULT IFsrmQuotaManagerEx_IsAffectedByQuota(IFsrmQuotaManag #endif -HRESULT STDMETHODCALLTYPE IFsrmQuotaManagerEx_IsAffectedByQuota_Proxy( - IFsrmQuotaManagerEx* This, - BSTR path, - FsrmEnumOptions options, - VARIANT_BOOL *affected); -void __RPC_STUB IFsrmQuotaManagerEx_IsAffectedByQuota_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmQuotaManagerEx_INTERFACE_DEFINED__ */ @@ -2792,29 +2459,29 @@ typedef struct IFsrmQuotaTemplateImportedVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmQuotaTemplateImported* This, + IFsrmQuotaTemplateImported *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmQuotaTemplateImported* This); + IFsrmQuotaTemplateImported *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmQuotaTemplateImported* This); + IFsrmQuotaTemplateImported *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmQuotaTemplateImported* This, + IFsrmQuotaTemplateImported *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmQuotaTemplateImported* This, + IFsrmQuotaTemplateImported *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmQuotaTemplateImported* This, + IFsrmQuotaTemplateImported *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2822,7 +2489,7 @@ typedef struct IFsrmQuotaTemplateImportedVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmQuotaTemplateImported* This, + IFsrmQuotaTemplateImported *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2834,98 +2501,99 @@ typedef struct IFsrmQuotaTemplateImportedVtbl { /*** IFsrmObject methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - IFsrmQuotaTemplateImported* This, + IFsrmQuotaTemplateImported *This, FSRM_OBJECT_ID *id); HRESULT (STDMETHODCALLTYPE *get_Description)( - IFsrmQuotaTemplateImported* This, + IFsrmQuotaTemplateImported *This, BSTR *description); HRESULT (STDMETHODCALLTYPE *put_Description)( - IFsrmQuotaTemplateImported* This, + IFsrmQuotaTemplateImported *This, BSTR description); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmQuotaTemplateImported* This); + IFsrmQuotaTemplateImported *This); HRESULT (STDMETHODCALLTYPE *Commit)( - IFsrmQuotaTemplateImported* This); + IFsrmQuotaTemplateImported *This); /*** IFsrmQuotaBase methods ***/ HRESULT (STDMETHODCALLTYPE *get_QuotaLimit)( - IFsrmQuotaTemplateImported* This, + IFsrmQuotaTemplateImported *This, VARIANT *quotaLimit); HRESULT (STDMETHODCALLTYPE *put_QuotaLimit)( - IFsrmQuotaTemplateImported* This, + IFsrmQuotaTemplateImported *This, VARIANT quotaLimit); HRESULT (STDMETHODCALLTYPE *get_QuotaFlags)( - IFsrmQuotaTemplateImported* This, + IFsrmQuotaTemplateImported *This, LONG *quotaFlags); HRESULT (STDMETHODCALLTYPE *put_QuotaFlags)( - IFsrmQuotaTemplateImported* This, + IFsrmQuotaTemplateImported *This, LONG quotaFlags); HRESULT (STDMETHODCALLTYPE *get_Thresholds)( - IFsrmQuotaTemplateImported* This, + IFsrmQuotaTemplateImported *This, SAFEARRAY **thresholds); HRESULT (STDMETHODCALLTYPE *AddThreshold)( - IFsrmQuotaTemplateImported* This, + IFsrmQuotaTemplateImported *This, FSRM_QUOTA_THRESHOLD threshold); HRESULT (STDMETHODCALLTYPE *DeleteThreshold)( - IFsrmQuotaTemplateImported* This, + IFsrmQuotaTemplateImported *This, FSRM_QUOTA_THRESHOLD threshold); HRESULT (STDMETHODCALLTYPE *ModifyThreshold)( - IFsrmQuotaTemplateImported* This, + IFsrmQuotaTemplateImported *This, FSRM_QUOTA_THRESHOLD threshold, FSRM_QUOTA_THRESHOLD newThreshold); HRESULT (STDMETHODCALLTYPE *CreateThresholdAction)( - IFsrmQuotaTemplateImported* This, + IFsrmQuotaTemplateImported *This, FSRM_QUOTA_THRESHOLD threshold, FsrmActionType actionType, IFsrmAction **action); HRESULT (STDMETHODCALLTYPE *EnumThresholdActions)( - IFsrmQuotaTemplateImported* This, + IFsrmQuotaTemplateImported *This, FSRM_QUOTA_THRESHOLD threshold, IFsrmCollection **actions); /*** IFsrmQuotaTemplate methods ***/ HRESULT (STDMETHODCALLTYPE *get_Name)( - IFsrmQuotaTemplateImported* This, + IFsrmQuotaTemplateImported *This, BSTR *name); HRESULT (STDMETHODCALLTYPE *put_Name)( - IFsrmQuotaTemplateImported* This, + IFsrmQuotaTemplateImported *This, BSTR name); HRESULT (STDMETHODCALLTYPE *CopyTemplate)( - IFsrmQuotaTemplateImported* This, + IFsrmQuotaTemplateImported *This, BSTR quotaTemplateName); HRESULT (STDMETHODCALLTYPE *CommitAndUpdateDerived)( - IFsrmQuotaTemplateImported* This, + IFsrmQuotaTemplateImported *This, FsrmCommitOptions commitOptions, FsrmTemplateApplyOptions applyOptions, IFsrmDerivedObjectsResult **derivedObjectsResult); /*** IFsrmQuotaTemplateImported methods ***/ HRESULT (STDMETHODCALLTYPE *get_OverwriteOnCommit)( - IFsrmQuotaTemplateImported* This, + IFsrmQuotaTemplateImported *This, VARIANT_BOOL *overwrite); HRESULT (STDMETHODCALLTYPE *put_OverwriteOnCommit)( - IFsrmQuotaTemplateImported* This, + IFsrmQuotaTemplateImported *This, VARIANT_BOOL overwrite); END_INTERFACE } IFsrmQuotaTemplateImportedVtbl; + interface IFsrmQuotaTemplateImported { CONST_VTBL IFsrmQuotaTemplateImportedVtbl* lpVtbl; }; @@ -3062,22 +2730,6 @@ static FORCEINLINE HRESULT IFsrmQuotaTemplateImported_put_OverwriteOnCommit(IFsr #endif -HRESULT STDMETHODCALLTYPE IFsrmQuotaTemplateImported_get_OverwriteOnCommit_Proxy( - IFsrmQuotaTemplateImported* This, - VARIANT_BOOL *overwrite); -void __RPC_STUB IFsrmQuotaTemplateImported_get_OverwriteOnCommit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmQuotaTemplateImported_put_OverwriteOnCommit_Proxy( - IFsrmQuotaTemplateImported* This, - VARIANT_BOOL overwrite); -void __RPC_STUB IFsrmQuotaTemplateImported_put_OverwriteOnCommit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmQuotaTemplateImported_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/fsrmreports.h b/lib/libc/include/any-windows-any/fsrmreports.h index eb8c09930e..d8c7a48ef4 100644 --- a/lib/libc/include/any-windows-any/fsrmreports.h +++ b/lib/libc/include/any-windows-any/fsrmreports.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/fsrmreports.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/fsrmreports.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,46 +21,73 @@ #ifndef __IFsrmReport_FWD_DEFINED__ #define __IFsrmReport_FWD_DEFINED__ typedef interface IFsrmReport IFsrmReport; +#ifdef __cplusplus +interface IFsrmReport; +#endif /* __cplusplus */ #endif #ifndef __IFsrmReportScheduler_FWD_DEFINED__ #define __IFsrmReportScheduler_FWD_DEFINED__ typedef interface IFsrmReportScheduler IFsrmReportScheduler; +#ifdef __cplusplus +interface IFsrmReportScheduler; +#endif /* __cplusplus */ #endif #ifndef __IFsrmFileManagementJobManager_FWD_DEFINED__ #define __IFsrmFileManagementJobManager_FWD_DEFINED__ typedef interface IFsrmFileManagementJobManager IFsrmFileManagementJobManager; +#ifdef __cplusplus +interface IFsrmFileManagementJobManager; +#endif /* __cplusplus */ #endif #ifndef __IFsrmPropertyCondition_FWD_DEFINED__ #define __IFsrmPropertyCondition_FWD_DEFINED__ typedef interface IFsrmPropertyCondition IFsrmPropertyCondition; +#ifdef __cplusplus +interface IFsrmPropertyCondition; +#endif /* __cplusplus */ #endif #ifndef __IFsrmReportManager_FWD_DEFINED__ #define __IFsrmReportManager_FWD_DEFINED__ typedef interface IFsrmReportManager IFsrmReportManager; +#ifdef __cplusplus +interface IFsrmReportManager; +#endif /* __cplusplus */ #endif #ifndef __IFsrmReportJob_FWD_DEFINED__ #define __IFsrmReportJob_FWD_DEFINED__ typedef interface IFsrmReportJob IFsrmReportJob; +#ifdef __cplusplus +interface IFsrmReportJob; +#endif /* __cplusplus */ #endif #ifndef __IFsrmFileManagementJob_FWD_DEFINED__ #define __IFsrmFileManagementJob_FWD_DEFINED__ typedef interface IFsrmFileManagementJob IFsrmFileManagementJob; +#ifdef __cplusplus +interface IFsrmFileManagementJob; +#endif /* __cplusplus */ #endif #ifndef __IFsrmFileCondition_FWD_DEFINED__ #define __IFsrmFileCondition_FWD_DEFINED__ typedef interface IFsrmFileCondition IFsrmFileCondition; +#ifdef __cplusplus +interface IFsrmFileCondition; +#endif /* __cplusplus */ #endif #ifndef __IFsrmFileConditionProperty_FWD_DEFINED__ #define __IFsrmFileConditionProperty_FWD_DEFINED__ typedef interface IFsrmFileConditionProperty IFsrmFileConditionProperty; +#ifdef __cplusplus +interface IFsrmFileConditionProperty; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -78,31 +106,49 @@ extern "C" { #ifndef __IFsrmFileManagementJob_FWD_DEFINED__ #define __IFsrmFileManagementJob_FWD_DEFINED__ typedef interface IFsrmFileManagementJob IFsrmFileManagementJob; +#ifdef __cplusplus +interface IFsrmFileManagementJob; +#endif /* __cplusplus */ #endif #ifndef __IFsrmFileManagementJobManager_FWD_DEFINED__ #define __IFsrmFileManagementJobManager_FWD_DEFINED__ typedef interface IFsrmFileManagementJobManager IFsrmFileManagementJobManager; +#ifdef __cplusplus +interface IFsrmFileManagementJobManager; +#endif /* __cplusplus */ #endif #ifndef __IFsrmPropertyCondition_FWD_DEFINED__ #define __IFsrmPropertyCondition_FWD_DEFINED__ typedef interface IFsrmPropertyCondition IFsrmPropertyCondition; +#ifdef __cplusplus +interface IFsrmPropertyCondition; +#endif /* __cplusplus */ #endif #ifndef __IFsrmReport_FWD_DEFINED__ #define __IFsrmReport_FWD_DEFINED__ typedef interface IFsrmReport IFsrmReport; +#ifdef __cplusplus +interface IFsrmReport; +#endif /* __cplusplus */ #endif #ifndef __IFsrmReportJob_FWD_DEFINED__ #define __IFsrmReportJob_FWD_DEFINED__ typedef interface IFsrmReportJob IFsrmReportJob; +#ifdef __cplusplus +interface IFsrmReportJob; +#endif /* __cplusplus */ #endif #ifndef __IFsrmReportManager_FWD_DEFINED__ #define __IFsrmReportManager_FWD_DEFINED__ typedef interface IFsrmReportManager IFsrmReportManager; +#ifdef __cplusplus +interface IFsrmReportManager; +#endif /* __cplusplus */ #endif #define FSRM_DISPID_REPORT_MANAGER (FSRM_DISPID_FEATURE_REPORTS | 0x100000) @@ -177,29 +223,29 @@ typedef struct IFsrmReportVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmReport* This, + IFsrmReport *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmReport* This); + IFsrmReport *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmReport* This); + IFsrmReport *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmReport* This, + IFsrmReport *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmReport* This, + IFsrmReport *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmReport* This, + IFsrmReport *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -207,7 +253,7 @@ typedef struct IFsrmReportVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmReport* This, + IFsrmReport *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -219,44 +265,45 @@ typedef struct IFsrmReportVtbl { /*** IFsrmReport methods ***/ HRESULT (STDMETHODCALLTYPE *get_Type)( - IFsrmReport* This, + IFsrmReport *This, FsrmReportType *reportType); HRESULT (STDMETHODCALLTYPE *get_Name)( - IFsrmReport* This, + IFsrmReport *This, BSTR *name); HRESULT (STDMETHODCALLTYPE *put_Name)( - IFsrmReport* This, + IFsrmReport *This, BSTR name); HRESULT (STDMETHODCALLTYPE *get_Description)( - IFsrmReport* This, + IFsrmReport *This, BSTR *description); HRESULT (STDMETHODCALLTYPE *put_Description)( - IFsrmReport* This, + IFsrmReport *This, BSTR description); HRESULT (STDMETHODCALLTYPE *get_LastGeneratedFileNamePrefix)( - IFsrmReport* This, + IFsrmReport *This, BSTR *prefix); HRESULT (STDMETHODCALLTYPE *GetFilter)( - IFsrmReport* This, + IFsrmReport *This, FsrmReportFilter filter, VARIANT *filterValue); HRESULT (STDMETHODCALLTYPE *SetFilter)( - IFsrmReport* This, + IFsrmReport *This, FsrmReportFilter filter, VARIANT filterValue); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmReport* This); + IFsrmReport *This); END_INTERFACE } IFsrmReportVtbl; + interface IFsrmReport { CONST_VTBL IFsrmReportVtbl* lpVtbl; }; @@ -339,79 +386,6 @@ static FORCEINLINE HRESULT IFsrmReport_Delete(IFsrmReport* This) { #endif -HRESULT STDMETHODCALLTYPE IFsrmReport_get_Type_Proxy( - IFsrmReport* This, - FsrmReportType *reportType); -void __RPC_STUB IFsrmReport_get_Type_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReport_get_Name_Proxy( - IFsrmReport* This, - BSTR *name); -void __RPC_STUB IFsrmReport_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReport_put_Name_Proxy( - IFsrmReport* This, - BSTR name); -void __RPC_STUB IFsrmReport_put_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReport_get_Description_Proxy( - IFsrmReport* This, - BSTR *description); -void __RPC_STUB IFsrmReport_get_Description_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReport_put_Description_Proxy( - IFsrmReport* This, - BSTR description); -void __RPC_STUB IFsrmReport_put_Description_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReport_get_LastGeneratedFileNamePrefix_Proxy( - IFsrmReport* This, - BSTR *prefix); -void __RPC_STUB IFsrmReport_get_LastGeneratedFileNamePrefix_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReport_GetFilter_Proxy( - IFsrmReport* This, - FsrmReportFilter filter, - VARIANT *filterValue); -void __RPC_STUB IFsrmReport_GetFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReport_SetFilter_Proxy( - IFsrmReport* This, - FsrmReportFilter filter, - VARIANT filterValue); -void __RPC_STUB IFsrmReport_SetFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReport_Delete_Proxy( - IFsrmReport* This); -void __RPC_STUB IFsrmReport_Delete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmReport_INTERFACE_DEFINED__ */ @@ -452,29 +426,29 @@ typedef struct IFsrmReportSchedulerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmReportScheduler* This, + IFsrmReportScheduler *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmReportScheduler* This); + IFsrmReportScheduler *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmReportScheduler* This); + IFsrmReportScheduler *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmReportScheduler* This, + IFsrmReportScheduler *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmReportScheduler* This, + IFsrmReportScheduler *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmReportScheduler* This, + IFsrmReportScheduler *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -482,7 +456,7 @@ typedef struct IFsrmReportSchedulerVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmReportScheduler* This, + IFsrmReportScheduler *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -494,27 +468,28 @@ typedef struct IFsrmReportSchedulerVtbl { /*** IFsrmReportScheduler methods ***/ HRESULT (STDMETHODCALLTYPE *VerifyNamespaces)( - IFsrmReportScheduler* This, + IFsrmReportScheduler *This, VARIANT *namespacesSafeArray); HRESULT (STDMETHODCALLTYPE *CreateScheduleTask)( - IFsrmReportScheduler* This, + IFsrmReportScheduler *This, BSTR taskName, VARIANT *namespacesSafeArray, BSTR serializedTask); HRESULT (STDMETHODCALLTYPE *ModifyScheduleTask)( - IFsrmReportScheduler* This, + IFsrmReportScheduler *This, BSTR taskName, VARIANT *namespacesSafeArray, BSTR serializedTask); HRESULT (STDMETHODCALLTYPE *DeleteScheduleTask)( - IFsrmReportScheduler* This, + IFsrmReportScheduler *This, BSTR taskName); END_INTERFACE } IFsrmReportSchedulerVtbl; + interface IFsrmReportScheduler { CONST_VTBL IFsrmReportSchedulerVtbl* lpVtbl; }; @@ -577,42 +552,6 @@ static FORCEINLINE HRESULT IFsrmReportScheduler_DeleteScheduleTask(IFsrmReportSc #endif -HRESULT STDMETHODCALLTYPE IFsrmReportScheduler_VerifyNamespaces_Proxy( - IFsrmReportScheduler* This, - VARIANT *namespacesSafeArray); -void __RPC_STUB IFsrmReportScheduler_VerifyNamespaces_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportScheduler_CreateScheduleTask_Proxy( - IFsrmReportScheduler* This, - BSTR taskName, - VARIANT *namespacesSafeArray, - BSTR serializedTask); -void __RPC_STUB IFsrmReportScheduler_CreateScheduleTask_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportScheduler_ModifyScheduleTask_Proxy( - IFsrmReportScheduler* This, - BSTR taskName, - VARIANT *namespacesSafeArray, - BSTR serializedTask); -void __RPC_STUB IFsrmReportScheduler_ModifyScheduleTask_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportScheduler_DeleteScheduleTask_Proxy( - IFsrmReportScheduler* This, - BSTR taskName); -void __RPC_STUB IFsrmReportScheduler_DeleteScheduleTask_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmReportScheduler_INTERFACE_DEFINED__ */ @@ -654,29 +593,29 @@ typedef struct IFsrmFileManagementJobManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmFileManagementJobManager* This, + IFsrmFileManagementJobManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmFileManagementJobManager* This); + IFsrmFileManagementJobManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmFileManagementJobManager* This); + IFsrmFileManagementJobManager *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmFileManagementJobManager* This, + IFsrmFileManagementJobManager *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmFileManagementJobManager* This, + IFsrmFileManagementJobManager *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmFileManagementJobManager* This, + IFsrmFileManagementJobManager *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -684,7 +623,7 @@ typedef struct IFsrmFileManagementJobManagerVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmFileManagementJobManager* This, + IFsrmFileManagementJobManager *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -696,29 +635,30 @@ typedef struct IFsrmFileManagementJobManagerVtbl { /*** IFsrmFileManagementJobManager methods ***/ HRESULT (STDMETHODCALLTYPE *get_ActionVariables)( - IFsrmFileManagementJobManager* This, + IFsrmFileManagementJobManager *This, SAFEARRAY **variables); HRESULT (STDMETHODCALLTYPE *get_ActionVariableDescriptions)( - IFsrmFileManagementJobManager* This, + IFsrmFileManagementJobManager *This, SAFEARRAY **descriptions); HRESULT (STDMETHODCALLTYPE *EnumFileManagementJobs)( - IFsrmFileManagementJobManager* This, + IFsrmFileManagementJobManager *This, FsrmEnumOptions options, IFsrmCollection **fileManagementJobs); HRESULT (STDMETHODCALLTYPE *CreateFileManagementJob)( - IFsrmFileManagementJobManager* This, + IFsrmFileManagementJobManager *This, IFsrmFileManagementJob **fileManagementJob); HRESULT (STDMETHODCALLTYPE *GetFileManagementJob)( - IFsrmFileManagementJobManager* This, + IFsrmFileManagementJobManager *This, BSTR name, IFsrmFileManagementJob **fileManagementJob); END_INTERFACE } IFsrmFileManagementJobManagerVtbl; + interface IFsrmFileManagementJobManager { CONST_VTBL IFsrmFileManagementJobManagerVtbl* lpVtbl; }; @@ -785,48 +725,6 @@ static FORCEINLINE HRESULT IFsrmFileManagementJobManager_GetFileManagementJob(IF #endif -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJobManager_get_ActionVariables_Proxy( - IFsrmFileManagementJobManager* This, - SAFEARRAY **variables); -void __RPC_STUB IFsrmFileManagementJobManager_get_ActionVariables_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJobManager_get_ActionVariableDescriptions_Proxy( - IFsrmFileManagementJobManager* This, - SAFEARRAY **descriptions); -void __RPC_STUB IFsrmFileManagementJobManager_get_ActionVariableDescriptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJobManager_EnumFileManagementJobs_Proxy( - IFsrmFileManagementJobManager* This, - FsrmEnumOptions options, - IFsrmCollection **fileManagementJobs); -void __RPC_STUB IFsrmFileManagementJobManager_EnumFileManagementJobs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJobManager_CreateFileManagementJob_Proxy( - IFsrmFileManagementJobManager* This, - IFsrmFileManagementJob **fileManagementJob); -void __RPC_STUB IFsrmFileManagementJobManager_CreateFileManagementJob_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJobManager_GetFileManagementJob_Proxy( - IFsrmFileManagementJobManager* This, - BSTR name, - IFsrmFileManagementJob **fileManagementJob); -void __RPC_STUB IFsrmFileManagementJobManager_GetFileManagementJob_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmFileManagementJobManager_INTERFACE_DEFINED__ */ @@ -872,29 +770,29 @@ typedef struct IFsrmPropertyConditionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmPropertyCondition* This, + IFsrmPropertyCondition *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmPropertyCondition* This); + IFsrmPropertyCondition *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmPropertyCondition* This); + IFsrmPropertyCondition *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmPropertyCondition* This, + IFsrmPropertyCondition *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmPropertyCondition* This, + IFsrmPropertyCondition *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmPropertyCondition* This, + IFsrmPropertyCondition *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -902,7 +800,7 @@ typedef struct IFsrmPropertyConditionVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmPropertyCondition* This, + IFsrmPropertyCondition *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -914,34 +812,35 @@ typedef struct IFsrmPropertyConditionVtbl { /*** IFsrmPropertyCondition methods ***/ HRESULT (STDMETHODCALLTYPE *get_Name)( - IFsrmPropertyCondition* This, + IFsrmPropertyCondition *This, BSTR *name); HRESULT (STDMETHODCALLTYPE *put_Name)( - IFsrmPropertyCondition* This, + IFsrmPropertyCondition *This, BSTR name); HRESULT (STDMETHODCALLTYPE *get_Type)( - IFsrmPropertyCondition* This, + IFsrmPropertyCondition *This, FsrmPropertyConditionType *type); HRESULT (STDMETHODCALLTYPE *put_Type)( - IFsrmPropertyCondition* This, + IFsrmPropertyCondition *This, FsrmPropertyConditionType type); HRESULT (STDMETHODCALLTYPE *get_Value)( - IFsrmPropertyCondition* This, + IFsrmPropertyCondition *This, BSTR *value); HRESULT (STDMETHODCALLTYPE *put_Value)( - IFsrmPropertyCondition* This, + IFsrmPropertyCondition *This, BSTR value); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmPropertyCondition* This); + IFsrmPropertyCondition *This); END_INTERFACE } IFsrmPropertyConditionVtbl; + interface IFsrmPropertyCondition { CONST_VTBL IFsrmPropertyConditionVtbl* lpVtbl; }; @@ -1016,61 +915,6 @@ static FORCEINLINE HRESULT IFsrmPropertyCondition_Delete(IFsrmPropertyCondition* #endif -HRESULT STDMETHODCALLTYPE IFsrmPropertyCondition_get_Name_Proxy( - IFsrmPropertyCondition* This, - BSTR *name); -void __RPC_STUB IFsrmPropertyCondition_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmPropertyCondition_put_Name_Proxy( - IFsrmPropertyCondition* This, - BSTR name); -void __RPC_STUB IFsrmPropertyCondition_put_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmPropertyCondition_get_Type_Proxy( - IFsrmPropertyCondition* This, - FsrmPropertyConditionType *type); -void __RPC_STUB IFsrmPropertyCondition_get_Type_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmPropertyCondition_put_Type_Proxy( - IFsrmPropertyCondition* This, - FsrmPropertyConditionType type); -void __RPC_STUB IFsrmPropertyCondition_put_Type_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmPropertyCondition_get_Value_Proxy( - IFsrmPropertyCondition* This, - BSTR *value); -void __RPC_STUB IFsrmPropertyCondition_get_Value_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmPropertyCondition_put_Value_Proxy( - IFsrmPropertyCondition* This, - BSTR value); -void __RPC_STUB IFsrmPropertyCondition_put_Value_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmPropertyCondition_Delete_Proxy( - IFsrmPropertyCondition* This); -void __RPC_STUB IFsrmPropertyCondition_Delete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmPropertyCondition_INTERFACE_DEFINED__ */ @@ -1137,29 +981,29 @@ typedef struct IFsrmReportManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmReportManager* This, + IFsrmReportManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmReportManager* This); + IFsrmReportManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmReportManager* This); + IFsrmReportManager *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmReportManager* This, + IFsrmReportManager *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmReportManager* This, + IFsrmReportManager *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmReportManager* This, + IFsrmReportManager *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1167,7 +1011,7 @@ typedef struct IFsrmReportManagerVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmReportManager* This, + IFsrmReportManager *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1179,59 +1023,60 @@ typedef struct IFsrmReportManagerVtbl { /*** IFsrmReportManager methods ***/ HRESULT (STDMETHODCALLTYPE *EnumReportJobs)( - IFsrmReportManager* This, + IFsrmReportManager *This, FsrmEnumOptions options, IFsrmCollection **reportJobs); HRESULT (STDMETHODCALLTYPE *CreateReportJob)( - IFsrmReportManager* This, + IFsrmReportManager *This, IFsrmReportJob **reportJob); HRESULT (STDMETHODCALLTYPE *GetReportJob)( - IFsrmReportManager* This, + IFsrmReportManager *This, BSTR taskName, IFsrmReportJob **reportJob); HRESULT (STDMETHODCALLTYPE *GetOutputDirectory)( - IFsrmReportManager* This, + IFsrmReportManager *This, FsrmReportGenerationContext context, BSTR *path); HRESULT (STDMETHODCALLTYPE *SetOutputDirectory)( - IFsrmReportManager* This, + IFsrmReportManager *This, FsrmReportGenerationContext context, BSTR path); HRESULT (STDMETHODCALLTYPE *IsFilterValidForReportType)( - IFsrmReportManager* This, + IFsrmReportManager *This, FsrmReportType reportType, FsrmReportFilter filter, VARIANT_BOOL *valid); HRESULT (STDMETHODCALLTYPE *GetDefaultFilter)( - IFsrmReportManager* This, + IFsrmReportManager *This, FsrmReportType reportType, FsrmReportFilter filter, VARIANT *filterValue); HRESULT (STDMETHODCALLTYPE *SetDefaultFilter)( - IFsrmReportManager* This, + IFsrmReportManager *This, FsrmReportType reportType, FsrmReportFilter filter, VARIANT filterValue); HRESULT (STDMETHODCALLTYPE *GetReportSizeLimit)( - IFsrmReportManager* This, + IFsrmReportManager *This, FsrmReportLimit limit, VARIANT *limitValue); HRESULT (STDMETHODCALLTYPE *SetReportSizeLimit)( - IFsrmReportManager* This, + IFsrmReportManager *This, FsrmReportLimit limit, VARIANT limitValue); END_INTERFACE } IFsrmReportManagerVtbl; + interface IFsrmReportManager { CONST_VTBL IFsrmReportManagerVtbl* lpVtbl; }; @@ -1318,98 +1163,6 @@ static FORCEINLINE HRESULT IFsrmReportManager_SetReportSizeLimit(IFsrmReportMana #endif -HRESULT STDMETHODCALLTYPE IFsrmReportManager_EnumReportJobs_Proxy( - IFsrmReportManager* This, - FsrmEnumOptions options, - IFsrmCollection **reportJobs); -void __RPC_STUB IFsrmReportManager_EnumReportJobs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportManager_CreateReportJob_Proxy( - IFsrmReportManager* This, - IFsrmReportJob **reportJob); -void __RPC_STUB IFsrmReportManager_CreateReportJob_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportManager_GetReportJob_Proxy( - IFsrmReportManager* This, - BSTR taskName, - IFsrmReportJob **reportJob); -void __RPC_STUB IFsrmReportManager_GetReportJob_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportManager_GetOutputDirectory_Proxy( - IFsrmReportManager* This, - FsrmReportGenerationContext context, - BSTR *path); -void __RPC_STUB IFsrmReportManager_GetOutputDirectory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportManager_SetOutputDirectory_Proxy( - IFsrmReportManager* This, - FsrmReportGenerationContext context, - BSTR path); -void __RPC_STUB IFsrmReportManager_SetOutputDirectory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportManager_IsFilterValidForReportType_Proxy( - IFsrmReportManager* This, - FsrmReportType reportType, - FsrmReportFilter filter, - VARIANT_BOOL *valid); -void __RPC_STUB IFsrmReportManager_IsFilterValidForReportType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportManager_GetDefaultFilter_Proxy( - IFsrmReportManager* This, - FsrmReportType reportType, - FsrmReportFilter filter, - VARIANT *filterValue); -void __RPC_STUB IFsrmReportManager_GetDefaultFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportManager_SetDefaultFilter_Proxy( - IFsrmReportManager* This, - FsrmReportType reportType, - FsrmReportFilter filter, - VARIANT filterValue); -void __RPC_STUB IFsrmReportManager_SetDefaultFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportManager_GetReportSizeLimit_Proxy( - IFsrmReportManager* This, - FsrmReportLimit limit, - VARIANT *limitValue); -void __RPC_STUB IFsrmReportManager_GetReportSizeLimit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportManager_SetReportSizeLimit_Proxy( - IFsrmReportManager* This, - FsrmReportLimit limit, - VARIANT limitValue); -void __RPC_STUB IFsrmReportManager_SetReportSizeLimit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmReportManager_INTERFACE_DEFINED__ */ @@ -1487,29 +1240,29 @@ typedef struct IFsrmReportJobVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmReportJob* This, + IFsrmReportJob *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmReportJob* This); + IFsrmReportJob *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmReportJob* This); + IFsrmReportJob *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmReportJob* This, + IFsrmReportJob *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmReportJob* This, + IFsrmReportJob *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmReportJob* This, + IFsrmReportJob *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1517,7 +1270,7 @@ typedef struct IFsrmReportJobVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmReportJob* This, + IFsrmReportJob *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1529,95 +1282,96 @@ typedef struct IFsrmReportJobVtbl { /*** IFsrmObject methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - IFsrmReportJob* This, + IFsrmReportJob *This, FSRM_OBJECT_ID *id); HRESULT (STDMETHODCALLTYPE *get_Description)( - IFsrmReportJob* This, + IFsrmReportJob *This, BSTR *description); HRESULT (STDMETHODCALLTYPE *put_Description)( - IFsrmReportJob* This, + IFsrmReportJob *This, BSTR description); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmReportJob* This); + IFsrmReportJob *This); HRESULT (STDMETHODCALLTYPE *Commit)( - IFsrmReportJob* This); + IFsrmReportJob *This); /*** IFsrmReportJob methods ***/ HRESULT (STDMETHODCALLTYPE *get_Task)( - IFsrmReportJob* This, + IFsrmReportJob *This, BSTR *taskName); HRESULT (STDMETHODCALLTYPE *put_Task)( - IFsrmReportJob* This, + IFsrmReportJob *This, BSTR taskName); HRESULT (STDMETHODCALLTYPE *get_NamespaceRoots)( - IFsrmReportJob* This, + IFsrmReportJob *This, SAFEARRAY **namespaceRoots); HRESULT (STDMETHODCALLTYPE *put_NamespaceRoots)( - IFsrmReportJob* This, + IFsrmReportJob *This, SAFEARRAY *namespaceRoots); HRESULT (STDMETHODCALLTYPE *get_Formats)( - IFsrmReportJob* This, + IFsrmReportJob *This, SAFEARRAY **formats); HRESULT (STDMETHODCALLTYPE *put_Formats)( - IFsrmReportJob* This, + IFsrmReportJob *This, SAFEARRAY *formats); HRESULT (STDMETHODCALLTYPE *get_MailTo)( - IFsrmReportJob* This, + IFsrmReportJob *This, BSTR *mailTo); HRESULT (STDMETHODCALLTYPE *put_MailTo)( - IFsrmReportJob* This, + IFsrmReportJob *This, BSTR mailTo); HRESULT (STDMETHODCALLTYPE *get_RunningStatus)( - IFsrmReportJob* This, + IFsrmReportJob *This, FsrmReportRunningStatus *runningStatus); HRESULT (STDMETHODCALLTYPE *get_LastRun)( - IFsrmReportJob* This, + IFsrmReportJob *This, DATE *lastRun); HRESULT (STDMETHODCALLTYPE *get_LastError)( - IFsrmReportJob* This, + IFsrmReportJob *This, BSTR *lastError); HRESULT (STDMETHODCALLTYPE *get_LastGeneratedInDirectory)( - IFsrmReportJob* This, + IFsrmReportJob *This, BSTR *path); HRESULT (STDMETHODCALLTYPE *EnumReports)( - IFsrmReportJob* This, + IFsrmReportJob *This, IFsrmCollection **reports); HRESULT (STDMETHODCALLTYPE *CreateReport)( - IFsrmReportJob* This, + IFsrmReportJob *This, FsrmReportType reportType, IFsrmReport **report); HRESULT (STDMETHODCALLTYPE *Run)( - IFsrmReportJob* This, + IFsrmReportJob *This, FsrmReportGenerationContext context); HRESULT (STDMETHODCALLTYPE *WaitForCompletion)( - IFsrmReportJob* This, + IFsrmReportJob *This, LONG waitSeconds, VARIANT_BOOL *completed); HRESULT (STDMETHODCALLTYPE *Cancel)( - IFsrmReportJob* This); + IFsrmReportJob *This); END_INTERFACE } IFsrmReportJobVtbl; + interface IFsrmReportJob { CONST_VTBL IFsrmReportJobVtbl* lpVtbl; }; @@ -1754,143 +1508,6 @@ static FORCEINLINE HRESULT IFsrmReportJob_Cancel(IFsrmReportJob* This) { #endif -HRESULT STDMETHODCALLTYPE IFsrmReportJob_get_Task_Proxy( - IFsrmReportJob* This, - BSTR *taskName); -void __RPC_STUB IFsrmReportJob_get_Task_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportJob_put_Task_Proxy( - IFsrmReportJob* This, - BSTR taskName); -void __RPC_STUB IFsrmReportJob_put_Task_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportJob_get_NamespaceRoots_Proxy( - IFsrmReportJob* This, - SAFEARRAY **namespaceRoots); -void __RPC_STUB IFsrmReportJob_get_NamespaceRoots_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportJob_put_NamespaceRoots_Proxy( - IFsrmReportJob* This, - SAFEARRAY *namespaceRoots); -void __RPC_STUB IFsrmReportJob_put_NamespaceRoots_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportJob_get_Formats_Proxy( - IFsrmReportJob* This, - SAFEARRAY **formats); -void __RPC_STUB IFsrmReportJob_get_Formats_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportJob_put_Formats_Proxy( - IFsrmReportJob* This, - SAFEARRAY *formats); -void __RPC_STUB IFsrmReportJob_put_Formats_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportJob_get_MailTo_Proxy( - IFsrmReportJob* This, - BSTR *mailTo); -void __RPC_STUB IFsrmReportJob_get_MailTo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportJob_put_MailTo_Proxy( - IFsrmReportJob* This, - BSTR mailTo); -void __RPC_STUB IFsrmReportJob_put_MailTo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportJob_get_RunningStatus_Proxy( - IFsrmReportJob* This, - FsrmReportRunningStatus *runningStatus); -void __RPC_STUB IFsrmReportJob_get_RunningStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportJob_get_LastRun_Proxy( - IFsrmReportJob* This, - DATE *lastRun); -void __RPC_STUB IFsrmReportJob_get_LastRun_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportJob_get_LastError_Proxy( - IFsrmReportJob* This, - BSTR *lastError); -void __RPC_STUB IFsrmReportJob_get_LastError_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportJob_get_LastGeneratedInDirectory_Proxy( - IFsrmReportJob* This, - BSTR *path); -void __RPC_STUB IFsrmReportJob_get_LastGeneratedInDirectory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportJob_EnumReports_Proxy( - IFsrmReportJob* This, - IFsrmCollection **reports); -void __RPC_STUB IFsrmReportJob_EnumReports_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportJob_CreateReport_Proxy( - IFsrmReportJob* This, - FsrmReportType reportType, - IFsrmReport **report); -void __RPC_STUB IFsrmReportJob_CreateReport_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportJob_Run_Proxy( - IFsrmReportJob* This, - FsrmReportGenerationContext context); -void __RPC_STUB IFsrmReportJob_Run_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportJob_WaitForCompletion_Proxy( - IFsrmReportJob* This, - LONG waitSeconds, - VARIANT_BOOL *completed); -void __RPC_STUB IFsrmReportJob_WaitForCompletion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmReportJob_Cancel_Proxy( - IFsrmReportJob* This); -void __RPC_STUB IFsrmReportJob_Cancel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmReportJob_INTERFACE_DEFINED__ */ @@ -2072,29 +1689,29 @@ typedef struct IFsrmFileManagementJobVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmFileManagementJob* This); + IFsrmFileManagementJob *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmFileManagementJob* This); + IFsrmFileManagementJob *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2102,7 +1719,7 @@ typedef struct IFsrmFileManagementJobVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2114,227 +1731,228 @@ typedef struct IFsrmFileManagementJobVtbl { /*** IFsrmObject methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, FSRM_OBJECT_ID *id); HRESULT (STDMETHODCALLTYPE *get_Description)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, BSTR *description); HRESULT (STDMETHODCALLTYPE *put_Description)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, BSTR description); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmFileManagementJob* This); + IFsrmFileManagementJob *This); HRESULT (STDMETHODCALLTYPE *Commit)( - IFsrmFileManagementJob* This); + IFsrmFileManagementJob *This); /*** IFsrmFileManagementJob methods ***/ HRESULT (STDMETHODCALLTYPE *get_Name)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, BSTR *name); HRESULT (STDMETHODCALLTYPE *put_Name)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, BSTR name); HRESULT (STDMETHODCALLTYPE *get_NamespaceRoots)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, SAFEARRAY **namespaceRoots); HRESULT (STDMETHODCALLTYPE *put_NamespaceRoots)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, SAFEARRAY *namespaceRoots); HRESULT (STDMETHODCALLTYPE *get_Enabled)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, VARIANT_BOOL *enabled); HRESULT (STDMETHODCALLTYPE *put_Enabled)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, VARIANT_BOOL enabled); HRESULT (STDMETHODCALLTYPE *get_OperationType)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, FsrmFileManagementType *operationType); HRESULT (STDMETHODCALLTYPE *put_OperationType)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, FsrmFileManagementType operationType); HRESULT (STDMETHODCALLTYPE *get_ExpirationDirectory)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, BSTR *expirationDirectory); HRESULT (STDMETHODCALLTYPE *put_ExpirationDirectory)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, BSTR expirationDirectory); HRESULT (STDMETHODCALLTYPE *get_CustomAction)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, IFsrmActionCommand **action); HRESULT (STDMETHODCALLTYPE *get_Notifications)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, SAFEARRAY **notifications); HRESULT (STDMETHODCALLTYPE *get_Logging)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, LONG *loggingFlags); HRESULT (STDMETHODCALLTYPE *put_Logging)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, LONG loggingFlags); HRESULT (STDMETHODCALLTYPE *get_ReportEnabled)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, VARIANT_BOOL *reportEnabled); HRESULT (STDMETHODCALLTYPE *put_ReportEnabled)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, VARIANT_BOOL reportEnabled); HRESULT (STDMETHODCALLTYPE *get_Formats)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, SAFEARRAY **formats); HRESULT (STDMETHODCALLTYPE *put_Formats)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, SAFEARRAY *formats); HRESULT (STDMETHODCALLTYPE *get_MailTo)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, BSTR *mailTo); HRESULT (STDMETHODCALLTYPE *put_MailTo)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, BSTR mailTo); HRESULT (STDMETHODCALLTYPE *get_DaysSinceFileCreated)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, LONG *daysSinceCreation); HRESULT (STDMETHODCALLTYPE *put_DaysSinceFileCreated)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, LONG daysSinceCreation); HRESULT (STDMETHODCALLTYPE *get_DaysSinceFileLastAccessed)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, LONG *daysSinceAccess); HRESULT (STDMETHODCALLTYPE *put_DaysSinceFileLastAccessed)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, LONG daysSinceAccess); HRESULT (STDMETHODCALLTYPE *get_DaysSinceFileLastModified)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, LONG *daysSinceModify); HRESULT (STDMETHODCALLTYPE *put_DaysSinceFileLastModified)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, LONG daysSinceModify); HRESULT (STDMETHODCALLTYPE *get_PropertyConditions)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, IFsrmCollection **propertyConditions); HRESULT (STDMETHODCALLTYPE *get_FromDate)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, DATE *fromDate); HRESULT (STDMETHODCALLTYPE *put_FromDate)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, DATE fromDate); HRESULT (STDMETHODCALLTYPE *get_Task)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, BSTR *taskName); HRESULT (STDMETHODCALLTYPE *put_Task)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, BSTR taskName); HRESULT (STDMETHODCALLTYPE *get_Parameters)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, SAFEARRAY **parameters); HRESULT (STDMETHODCALLTYPE *put_Parameters)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, SAFEARRAY *parameters); HRESULT (STDMETHODCALLTYPE *get_RunningStatus)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, FsrmReportRunningStatus *runningStatus); HRESULT (STDMETHODCALLTYPE *get_LastError)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, BSTR *lastError); HRESULT (STDMETHODCALLTYPE *get_LastReportPathWithoutExtension)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, BSTR *path); HRESULT (STDMETHODCALLTYPE *get_LastRun)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, DATE *lastRun); HRESULT (STDMETHODCALLTYPE *get_FileNamePattern)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, BSTR *fileNamePattern); HRESULT (STDMETHODCALLTYPE *put_FileNamePattern)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, BSTR fileNamePattern); HRESULT (STDMETHODCALLTYPE *Run)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, FsrmReportGenerationContext context); HRESULT (STDMETHODCALLTYPE *WaitForCompletion)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, LONG waitSeconds, VARIANT_BOOL *completed); HRESULT (STDMETHODCALLTYPE *Cancel)( - IFsrmFileManagementJob* This); + IFsrmFileManagementJob *This); HRESULT (STDMETHODCALLTYPE *AddNotification)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, LONG days); HRESULT (STDMETHODCALLTYPE *DeleteNotification)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, LONG days); HRESULT (STDMETHODCALLTYPE *ModifyNotification)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, LONG days, LONG newDays); HRESULT (STDMETHODCALLTYPE *CreateNotificationAction)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, LONG days, FsrmActionType actionType, IFsrmAction **action); HRESULT (STDMETHODCALLTYPE *EnumNotificationActions)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, LONG days, IFsrmCollection **actions); HRESULT (STDMETHODCALLTYPE *CreatePropertyCondition)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, BSTR name, IFsrmPropertyCondition **propertyCondition); HRESULT (STDMETHODCALLTYPE *CreateCustomAction)( - IFsrmFileManagementJob* This, + IFsrmFileManagementJob *This, IFsrmActionCommand **customAction); END_INTERFACE } IFsrmFileManagementJobVtbl; + interface IFsrmFileManagementJob { CONST_VTBL IFsrmFileManagementJobVtbl* lpVtbl; }; @@ -2599,403 +2217,6 @@ static FORCEINLINE HRESULT IFsrmFileManagementJob_CreateCustomAction(IFsrmFileMa #endif -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_Name_Proxy( - IFsrmFileManagementJob* This, - BSTR *name); -void __RPC_STUB IFsrmFileManagementJob_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_Name_Proxy( - IFsrmFileManagementJob* This, - BSTR name); -void __RPC_STUB IFsrmFileManagementJob_put_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_NamespaceRoots_Proxy( - IFsrmFileManagementJob* This, - SAFEARRAY **namespaceRoots); -void __RPC_STUB IFsrmFileManagementJob_get_NamespaceRoots_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_NamespaceRoots_Proxy( - IFsrmFileManagementJob* This, - SAFEARRAY *namespaceRoots); -void __RPC_STUB IFsrmFileManagementJob_put_NamespaceRoots_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_Enabled_Proxy( - IFsrmFileManagementJob* This, - VARIANT_BOOL *enabled); -void __RPC_STUB IFsrmFileManagementJob_get_Enabled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_Enabled_Proxy( - IFsrmFileManagementJob* This, - VARIANT_BOOL enabled); -void __RPC_STUB IFsrmFileManagementJob_put_Enabled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_OperationType_Proxy( - IFsrmFileManagementJob* This, - FsrmFileManagementType *operationType); -void __RPC_STUB IFsrmFileManagementJob_get_OperationType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_OperationType_Proxy( - IFsrmFileManagementJob* This, - FsrmFileManagementType operationType); -void __RPC_STUB IFsrmFileManagementJob_put_OperationType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_ExpirationDirectory_Proxy( - IFsrmFileManagementJob* This, - BSTR *expirationDirectory); -void __RPC_STUB IFsrmFileManagementJob_get_ExpirationDirectory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_ExpirationDirectory_Proxy( - IFsrmFileManagementJob* This, - BSTR expirationDirectory); -void __RPC_STUB IFsrmFileManagementJob_put_ExpirationDirectory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_CustomAction_Proxy( - IFsrmFileManagementJob* This, - IFsrmActionCommand **action); -void __RPC_STUB IFsrmFileManagementJob_get_CustomAction_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_Notifications_Proxy( - IFsrmFileManagementJob* This, - SAFEARRAY **notifications); -void __RPC_STUB IFsrmFileManagementJob_get_Notifications_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_Logging_Proxy( - IFsrmFileManagementJob* This, - LONG *loggingFlags); -void __RPC_STUB IFsrmFileManagementJob_get_Logging_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_Logging_Proxy( - IFsrmFileManagementJob* This, - LONG loggingFlags); -void __RPC_STUB IFsrmFileManagementJob_put_Logging_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_ReportEnabled_Proxy( - IFsrmFileManagementJob* This, - VARIANT_BOOL *reportEnabled); -void __RPC_STUB IFsrmFileManagementJob_get_ReportEnabled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_ReportEnabled_Proxy( - IFsrmFileManagementJob* This, - VARIANT_BOOL reportEnabled); -void __RPC_STUB IFsrmFileManagementJob_put_ReportEnabled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_Formats_Proxy( - IFsrmFileManagementJob* This, - SAFEARRAY **formats); -void __RPC_STUB IFsrmFileManagementJob_get_Formats_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_Formats_Proxy( - IFsrmFileManagementJob* This, - SAFEARRAY *formats); -void __RPC_STUB IFsrmFileManagementJob_put_Formats_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_MailTo_Proxy( - IFsrmFileManagementJob* This, - BSTR *mailTo); -void __RPC_STUB IFsrmFileManagementJob_get_MailTo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_MailTo_Proxy( - IFsrmFileManagementJob* This, - BSTR mailTo); -void __RPC_STUB IFsrmFileManagementJob_put_MailTo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_DaysSinceFileCreated_Proxy( - IFsrmFileManagementJob* This, - LONG *daysSinceCreation); -void __RPC_STUB IFsrmFileManagementJob_get_DaysSinceFileCreated_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_DaysSinceFileCreated_Proxy( - IFsrmFileManagementJob* This, - LONG daysSinceCreation); -void __RPC_STUB IFsrmFileManagementJob_put_DaysSinceFileCreated_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_DaysSinceFileLastAccessed_Proxy( - IFsrmFileManagementJob* This, - LONG *daysSinceAccess); -void __RPC_STUB IFsrmFileManagementJob_get_DaysSinceFileLastAccessed_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_DaysSinceFileLastAccessed_Proxy( - IFsrmFileManagementJob* This, - LONG daysSinceAccess); -void __RPC_STUB IFsrmFileManagementJob_put_DaysSinceFileLastAccessed_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_DaysSinceFileLastModified_Proxy( - IFsrmFileManagementJob* This, - LONG *daysSinceModify); -void __RPC_STUB IFsrmFileManagementJob_get_DaysSinceFileLastModified_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_DaysSinceFileLastModified_Proxy( - IFsrmFileManagementJob* This, - LONG daysSinceModify); -void __RPC_STUB IFsrmFileManagementJob_put_DaysSinceFileLastModified_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_PropertyConditions_Proxy( - IFsrmFileManagementJob* This, - IFsrmCollection **propertyConditions); -void __RPC_STUB IFsrmFileManagementJob_get_PropertyConditions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_FromDate_Proxy( - IFsrmFileManagementJob* This, - DATE *fromDate); -void __RPC_STUB IFsrmFileManagementJob_get_FromDate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_FromDate_Proxy( - IFsrmFileManagementJob* This, - DATE fromDate); -void __RPC_STUB IFsrmFileManagementJob_put_FromDate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_Task_Proxy( - IFsrmFileManagementJob* This, - BSTR *taskName); -void __RPC_STUB IFsrmFileManagementJob_get_Task_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_Task_Proxy( - IFsrmFileManagementJob* This, - BSTR taskName); -void __RPC_STUB IFsrmFileManagementJob_put_Task_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_Parameters_Proxy( - IFsrmFileManagementJob* This, - SAFEARRAY **parameters); -void __RPC_STUB IFsrmFileManagementJob_get_Parameters_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_Parameters_Proxy( - IFsrmFileManagementJob* This, - SAFEARRAY *parameters); -void __RPC_STUB IFsrmFileManagementJob_put_Parameters_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_RunningStatus_Proxy( - IFsrmFileManagementJob* This, - FsrmReportRunningStatus *runningStatus); -void __RPC_STUB IFsrmFileManagementJob_get_RunningStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_LastError_Proxy( - IFsrmFileManagementJob* This, - BSTR *lastError); -void __RPC_STUB IFsrmFileManagementJob_get_LastError_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_LastReportPathWithoutExtension_Proxy( - IFsrmFileManagementJob* This, - BSTR *path); -void __RPC_STUB IFsrmFileManagementJob_get_LastReportPathWithoutExtension_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_LastRun_Proxy( - IFsrmFileManagementJob* This, - DATE *lastRun); -void __RPC_STUB IFsrmFileManagementJob_get_LastRun_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_FileNamePattern_Proxy( - IFsrmFileManagementJob* This, - BSTR *fileNamePattern); -void __RPC_STUB IFsrmFileManagementJob_get_FileNamePattern_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_FileNamePattern_Proxy( - IFsrmFileManagementJob* This, - BSTR fileNamePattern); -void __RPC_STUB IFsrmFileManagementJob_put_FileNamePattern_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_Run_Proxy( - IFsrmFileManagementJob* This, - FsrmReportGenerationContext context); -void __RPC_STUB IFsrmFileManagementJob_Run_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_WaitForCompletion_Proxy( - IFsrmFileManagementJob* This, - LONG waitSeconds, - VARIANT_BOOL *completed); -void __RPC_STUB IFsrmFileManagementJob_WaitForCompletion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_Cancel_Proxy( - IFsrmFileManagementJob* This); -void __RPC_STUB IFsrmFileManagementJob_Cancel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_AddNotification_Proxy( - IFsrmFileManagementJob* This, - LONG days); -void __RPC_STUB IFsrmFileManagementJob_AddNotification_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_DeleteNotification_Proxy( - IFsrmFileManagementJob* This, - LONG days); -void __RPC_STUB IFsrmFileManagementJob_DeleteNotification_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_ModifyNotification_Proxy( - IFsrmFileManagementJob* This, - LONG days, - LONG newDays); -void __RPC_STUB IFsrmFileManagementJob_ModifyNotification_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_CreateNotificationAction_Proxy( - IFsrmFileManagementJob* This, - LONG days, - FsrmActionType actionType, - IFsrmAction **action); -void __RPC_STUB IFsrmFileManagementJob_CreateNotificationAction_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_EnumNotificationActions_Proxy( - IFsrmFileManagementJob* This, - LONG days, - IFsrmCollection **actions); -void __RPC_STUB IFsrmFileManagementJob_EnumNotificationActions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_CreatePropertyCondition_Proxy( - IFsrmFileManagementJob* This, - BSTR name, - IFsrmPropertyCondition **propertyCondition); -void __RPC_STUB IFsrmFileManagementJob_CreatePropertyCondition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_CreateCustomAction_Proxy( - IFsrmFileManagementJob* This, - IFsrmActionCommand **customAction); -void __RPC_STUB IFsrmFileManagementJob_CreateCustomAction_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmFileManagementJob_INTERFACE_DEFINED__ */ @@ -3026,29 +2247,29 @@ typedef struct IFsrmFileConditionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmFileCondition* This, + IFsrmFileCondition *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmFileCondition* This); + IFsrmFileCondition *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmFileCondition* This); + IFsrmFileCondition *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmFileCondition* This, + IFsrmFileCondition *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmFileCondition* This, + IFsrmFileCondition *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmFileCondition* This, + IFsrmFileCondition *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -3056,7 +2277,7 @@ typedef struct IFsrmFileConditionVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmFileCondition* This, + IFsrmFileCondition *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -3068,14 +2289,15 @@ typedef struct IFsrmFileConditionVtbl { /*** IFsrmFileCondition methods ***/ HRESULT (STDMETHODCALLTYPE *get_Type)( - IFsrmFileCondition* This, + IFsrmFileCondition *This, FsrmFileConditionType *pVal); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmFileCondition* This); + IFsrmFileCondition *This); END_INTERFACE } IFsrmFileConditionVtbl; + interface IFsrmFileCondition { CONST_VTBL IFsrmFileConditionVtbl* lpVtbl; }; @@ -3130,21 +2352,6 @@ static FORCEINLINE HRESULT IFsrmFileCondition_Delete(IFsrmFileCondition* This) { #endif -HRESULT STDMETHODCALLTYPE IFsrmFileCondition_get_Type_Proxy( - IFsrmFileCondition* This, - FsrmFileConditionType *pVal); -void __RPC_STUB IFsrmFileCondition_get_Type_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileCondition_Delete_Proxy( - IFsrmFileCondition* This); -void __RPC_STUB IFsrmFileCondition_Delete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmFileCondition_INTERFACE_DEFINED__ */ @@ -3199,29 +2406,29 @@ typedef struct IFsrmFileConditionPropertyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmFileConditionProperty* This, + IFsrmFileConditionProperty *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmFileConditionProperty* This); + IFsrmFileConditionProperty *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmFileConditionProperty* This); + IFsrmFileConditionProperty *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmFileConditionProperty* This, + IFsrmFileConditionProperty *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmFileConditionProperty* This, + IFsrmFileConditionProperty *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmFileConditionProperty* This, + IFsrmFileConditionProperty *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -3229,7 +2436,7 @@ typedef struct IFsrmFileConditionPropertyVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmFileConditionProperty* This, + IFsrmFileConditionProperty *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -3241,55 +2448,56 @@ typedef struct IFsrmFileConditionPropertyVtbl { /*** IFsrmFileCondition methods ***/ HRESULT (STDMETHODCALLTYPE *get_Type)( - IFsrmFileConditionProperty* This, + IFsrmFileConditionProperty *This, FsrmFileConditionType *pVal); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmFileConditionProperty* This); + IFsrmFileConditionProperty *This); /*** IFsrmFileConditionProperty methods ***/ HRESULT (STDMETHODCALLTYPE *get_PropertyName)( - IFsrmFileConditionProperty* This, + IFsrmFileConditionProperty *This, BSTR *pVal); HRESULT (STDMETHODCALLTYPE *put_PropertyName)( - IFsrmFileConditionProperty* This, + IFsrmFileConditionProperty *This, BSTR newVal); HRESULT (STDMETHODCALLTYPE *get_PropertyId)( - IFsrmFileConditionProperty* This, + IFsrmFileConditionProperty *This, FsrmFileSystemPropertyId *pVal); HRESULT (STDMETHODCALLTYPE *put_PropertyId)( - IFsrmFileConditionProperty* This, + IFsrmFileConditionProperty *This, FsrmFileSystemPropertyId newVal); HRESULT (STDMETHODCALLTYPE *get_Operator)( - IFsrmFileConditionProperty* This, + IFsrmFileConditionProperty *This, FsrmPropertyConditionType *pVal); HRESULT (STDMETHODCALLTYPE *put_Operator)( - IFsrmFileConditionProperty* This, + IFsrmFileConditionProperty *This, FsrmPropertyConditionType newVal); HRESULT (STDMETHODCALLTYPE *get_ValueType)( - IFsrmFileConditionProperty* This, + IFsrmFileConditionProperty *This, FsrmPropertyValueType *pVal); HRESULT (STDMETHODCALLTYPE *put_ValueType)( - IFsrmFileConditionProperty* This, + IFsrmFileConditionProperty *This, FsrmPropertyValueType newVal); HRESULT (STDMETHODCALLTYPE *get_Value)( - IFsrmFileConditionProperty* This, + IFsrmFileConditionProperty *This, VARIANT *pVal); HRESULT (STDMETHODCALLTYPE *put_Value)( - IFsrmFileConditionProperty* This, + IFsrmFileConditionProperty *This, VARIANT newVal); END_INTERFACE } IFsrmFileConditionPropertyVtbl; + interface IFsrmFileConditionProperty { CONST_VTBL IFsrmFileConditionPropertyVtbl* lpVtbl; }; @@ -3386,86 +2594,6 @@ static FORCEINLINE HRESULT IFsrmFileConditionProperty_put_Value(IFsrmFileConditi #endif -HRESULT STDMETHODCALLTYPE IFsrmFileConditionProperty_get_PropertyName_Proxy( - IFsrmFileConditionProperty* This, - BSTR *pVal); -void __RPC_STUB IFsrmFileConditionProperty_get_PropertyName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileConditionProperty_put_PropertyName_Proxy( - IFsrmFileConditionProperty* This, - BSTR newVal); -void __RPC_STUB IFsrmFileConditionProperty_put_PropertyName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileConditionProperty_get_PropertyId_Proxy( - IFsrmFileConditionProperty* This, - FsrmFileSystemPropertyId *pVal); -void __RPC_STUB IFsrmFileConditionProperty_get_PropertyId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileConditionProperty_put_PropertyId_Proxy( - IFsrmFileConditionProperty* This, - FsrmFileSystemPropertyId newVal); -void __RPC_STUB IFsrmFileConditionProperty_put_PropertyId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileConditionProperty_get_Operator_Proxy( - IFsrmFileConditionProperty* This, - FsrmPropertyConditionType *pVal); -void __RPC_STUB IFsrmFileConditionProperty_get_Operator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileConditionProperty_put_Operator_Proxy( - IFsrmFileConditionProperty* This, - FsrmPropertyConditionType newVal); -void __RPC_STUB IFsrmFileConditionProperty_put_Operator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileConditionProperty_get_ValueType_Proxy( - IFsrmFileConditionProperty* This, - FsrmPropertyValueType *pVal); -void __RPC_STUB IFsrmFileConditionProperty_get_ValueType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileConditionProperty_put_ValueType_Proxy( - IFsrmFileConditionProperty* This, - FsrmPropertyValueType newVal); -void __RPC_STUB IFsrmFileConditionProperty_put_ValueType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileConditionProperty_get_Value_Proxy( - IFsrmFileConditionProperty* This, - VARIANT *pVal); -void __RPC_STUB IFsrmFileConditionProperty_get_Value_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileConditionProperty_put_Value_Proxy( - IFsrmFileConditionProperty* This, - VARIANT newVal); -void __RPC_STUB IFsrmFileConditionProperty_put_Value_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmFileConditionProperty_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/fsrmscreen.h b/lib/libc/include/any-windows-any/fsrmscreen.h index 4f01ac919d..be93c529d8 100644 --- a/lib/libc/include/any-windows-any/fsrmscreen.h +++ b/lib/libc/include/any-windows-any/fsrmscreen.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/fsrmscreen.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/fsrmscreen.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,51 +21,81 @@ #ifndef __IFsrmFileGroupManager_FWD_DEFINED__ #define __IFsrmFileGroupManager_FWD_DEFINED__ typedef interface IFsrmFileGroupManager IFsrmFileGroupManager; +#ifdef __cplusplus +interface IFsrmFileGroupManager; +#endif /* __cplusplus */ #endif #ifndef __IFsrmFileScreenManager_FWD_DEFINED__ #define __IFsrmFileScreenManager_FWD_DEFINED__ typedef interface IFsrmFileScreenManager IFsrmFileScreenManager; +#ifdef __cplusplus +interface IFsrmFileScreenManager; +#endif /* __cplusplus */ #endif #ifndef __IFsrmFileScreenTemplateManager_FWD_DEFINED__ #define __IFsrmFileScreenTemplateManager_FWD_DEFINED__ typedef interface IFsrmFileScreenTemplateManager IFsrmFileScreenTemplateManager; +#ifdef __cplusplus +interface IFsrmFileScreenTemplateManager; +#endif /* __cplusplus */ #endif #ifndef __IFsrmFileGroup_FWD_DEFINED__ #define __IFsrmFileGroup_FWD_DEFINED__ typedef interface IFsrmFileGroup IFsrmFileGroup; +#ifdef __cplusplus +interface IFsrmFileGroup; +#endif /* __cplusplus */ #endif #ifndef __IFsrmFileScreenBase_FWD_DEFINED__ #define __IFsrmFileScreenBase_FWD_DEFINED__ typedef interface IFsrmFileScreenBase IFsrmFileScreenBase; +#ifdef __cplusplus +interface IFsrmFileScreenBase; +#endif /* __cplusplus */ #endif #ifndef __IFsrmFileScreenException_FWD_DEFINED__ #define __IFsrmFileScreenException_FWD_DEFINED__ typedef interface IFsrmFileScreenException IFsrmFileScreenException; +#ifdef __cplusplus +interface IFsrmFileScreenException; +#endif /* __cplusplus */ #endif #ifndef __IFsrmFileScreen_FWD_DEFINED__ #define __IFsrmFileScreen_FWD_DEFINED__ typedef interface IFsrmFileScreen IFsrmFileScreen; +#ifdef __cplusplus +interface IFsrmFileScreen; +#endif /* __cplusplus */ #endif #ifndef __IFsrmFileGroupImported_FWD_DEFINED__ #define __IFsrmFileGroupImported_FWD_DEFINED__ typedef interface IFsrmFileGroupImported IFsrmFileGroupImported; +#ifdef __cplusplus +interface IFsrmFileGroupImported; +#endif /* __cplusplus */ #endif #ifndef __IFsrmFileScreenTemplate_FWD_DEFINED__ #define __IFsrmFileScreenTemplate_FWD_DEFINED__ typedef interface IFsrmFileScreenTemplate IFsrmFileScreenTemplate; +#ifdef __cplusplus +interface IFsrmFileScreenTemplate; +#endif /* __cplusplus */ #endif #ifndef __IFsrmFileScreenTemplateImported_FWD_DEFINED__ #define __IFsrmFileScreenTemplateImported_FWD_DEFINED__ typedef interface IFsrmFileScreenTemplateImported IFsrmFileScreenTemplateImported; +#ifdef __cplusplus +interface IFsrmFileScreenTemplateImported; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -83,51 +114,81 @@ extern "C" { #ifndef __IFsrmFileGroup_FWD_DEFINED__ #define __IFsrmFileGroup_FWD_DEFINED__ typedef interface IFsrmFileGroup IFsrmFileGroup; +#ifdef __cplusplus +interface IFsrmFileGroup; +#endif /* __cplusplus */ #endif #ifndef __IFsrmFileGroupImported_FWD_DEFINED__ #define __IFsrmFileGroupImported_FWD_DEFINED__ typedef interface IFsrmFileGroupImported IFsrmFileGroupImported; +#ifdef __cplusplus +interface IFsrmFileGroupImported; +#endif /* __cplusplus */ #endif #ifndef __IFsrmFileGroupManager_FWD_DEFINED__ #define __IFsrmFileGroupManager_FWD_DEFINED__ typedef interface IFsrmFileGroupManager IFsrmFileGroupManager; +#ifdef __cplusplus +interface IFsrmFileGroupManager; +#endif /* __cplusplus */ #endif #ifndef __IFsrmFileScreen_FWD_DEFINED__ #define __IFsrmFileScreen_FWD_DEFINED__ typedef interface IFsrmFileScreen IFsrmFileScreen; +#ifdef __cplusplus +interface IFsrmFileScreen; +#endif /* __cplusplus */ #endif #ifndef __IFsrmFileScreenBase_FWD_DEFINED__ #define __IFsrmFileScreenBase_FWD_DEFINED__ typedef interface IFsrmFileScreenBase IFsrmFileScreenBase; +#ifdef __cplusplus +interface IFsrmFileScreenBase; +#endif /* __cplusplus */ #endif #ifndef __IFsrmFileScreenException_FWD_DEFINED__ #define __IFsrmFileScreenException_FWD_DEFINED__ typedef interface IFsrmFileScreenException IFsrmFileScreenException; +#ifdef __cplusplus +interface IFsrmFileScreenException; +#endif /* __cplusplus */ #endif #ifndef __IFsrmFileScreenManager_FWD_DEFINED__ #define __IFsrmFileScreenManager_FWD_DEFINED__ typedef interface IFsrmFileScreenManager IFsrmFileScreenManager; +#ifdef __cplusplus +interface IFsrmFileScreenManager; +#endif /* __cplusplus */ #endif #ifndef __IFsrmFileScreenTemplate_FWD_DEFINED__ #define __IFsrmFileScreenTemplate_FWD_DEFINED__ typedef interface IFsrmFileScreenTemplate IFsrmFileScreenTemplate; +#ifdef __cplusplus +interface IFsrmFileScreenTemplate; +#endif /* __cplusplus */ #endif #ifndef __IFsrmFileScreenTemplateImported_FWD_DEFINED__ #define __IFsrmFileScreenTemplateImported_FWD_DEFINED__ typedef interface IFsrmFileScreenTemplateImported IFsrmFileScreenTemplateImported; +#ifdef __cplusplus +interface IFsrmFileScreenTemplateImported; +#endif /* __cplusplus */ #endif #ifndef __IFsrmFileScreenTemplateManager_FWD_DEFINED__ #define __IFsrmFileScreenTemplateManager_FWD_DEFINED__ typedef interface IFsrmFileScreenTemplateManager IFsrmFileScreenTemplateManager; +#ifdef __cplusplus +interface IFsrmFileScreenTemplateManager; +#endif /* __cplusplus */ #endif #define FSRM_DISPID_FILEGROUP (FSRM_DISPID_FEATURE_FILESCREEN | 0x100000) @@ -191,29 +252,29 @@ typedef struct IFsrmFileGroupManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmFileGroupManager* This, + IFsrmFileGroupManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmFileGroupManager* This); + IFsrmFileGroupManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmFileGroupManager* This); + IFsrmFileGroupManager *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmFileGroupManager* This, + IFsrmFileGroupManager *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmFileGroupManager* This, + IFsrmFileGroupManager *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmFileGroupManager* This, + IFsrmFileGroupManager *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -221,7 +282,7 @@ typedef struct IFsrmFileGroupManagerVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmFileGroupManager* This, + IFsrmFileGroupManager *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -233,32 +294,33 @@ typedef struct IFsrmFileGroupManagerVtbl { /*** IFsrmFileGroupManager methods ***/ HRESULT (STDMETHODCALLTYPE *CreateFileGroup)( - IFsrmFileGroupManager* This, + IFsrmFileGroupManager *This, IFsrmFileGroup **fileGroup); HRESULT (STDMETHODCALLTYPE *GetFileGroup)( - IFsrmFileGroupManager* This, + IFsrmFileGroupManager *This, BSTR name, IFsrmFileGroup **fileGroup); HRESULT (STDMETHODCALLTYPE *EnumFileGroups)( - IFsrmFileGroupManager* This, + IFsrmFileGroupManager *This, FsrmEnumOptions options, IFsrmCommittableCollection **fileGroups); HRESULT (STDMETHODCALLTYPE *ExportFileGroups)( - IFsrmFileGroupManager* This, + IFsrmFileGroupManager *This, VARIANT *fileGroupNamesArray, BSTR *serializedFileGroups); HRESULT (STDMETHODCALLTYPE *ImportFileGroups)( - IFsrmFileGroupManager* This, + IFsrmFileGroupManager *This, BSTR serializedFileGroups, VARIANT *fileGroupNamesArray, IFsrmCommittableCollection **fileGroups); END_INTERFACE } IFsrmFileGroupManagerVtbl; + interface IFsrmFileGroupManager { CONST_VTBL IFsrmFileGroupManagerVtbl* lpVtbl; }; @@ -325,51 +387,6 @@ static FORCEINLINE HRESULT IFsrmFileGroupManager_ImportFileGroups(IFsrmFileGroup #endif -HRESULT STDMETHODCALLTYPE IFsrmFileGroupManager_CreateFileGroup_Proxy( - IFsrmFileGroupManager* This, - IFsrmFileGroup **fileGroup); -void __RPC_STUB IFsrmFileGroupManager_CreateFileGroup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileGroupManager_GetFileGroup_Proxy( - IFsrmFileGroupManager* This, - BSTR name, - IFsrmFileGroup **fileGroup); -void __RPC_STUB IFsrmFileGroupManager_GetFileGroup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileGroupManager_EnumFileGroups_Proxy( - IFsrmFileGroupManager* This, - FsrmEnumOptions options, - IFsrmCommittableCollection **fileGroups); -void __RPC_STUB IFsrmFileGroupManager_EnumFileGroups_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileGroupManager_ExportFileGroups_Proxy( - IFsrmFileGroupManager* This, - VARIANT *fileGroupNamesArray, - BSTR *serializedFileGroups); -void __RPC_STUB IFsrmFileGroupManager_ExportFileGroups_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileGroupManager_ImportFileGroups_Proxy( - IFsrmFileGroupManager* This, - BSTR serializedFileGroups, - VARIANT *fileGroupNamesArray, - IFsrmCommittableCollection **fileGroups); -void __RPC_STUB IFsrmFileGroupManager_ImportFileGroups_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmFileGroupManager_INTERFACE_DEFINED__ */ @@ -429,29 +446,29 @@ typedef struct IFsrmFileScreenManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmFileScreenManager* This, + IFsrmFileScreenManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmFileScreenManager* This); + IFsrmFileScreenManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmFileScreenManager* This); + IFsrmFileScreenManager *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmFileScreenManager* This, + IFsrmFileScreenManager *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmFileScreenManager* This, + IFsrmFileScreenManager *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmFileScreenManager* This, + IFsrmFileScreenManager *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -459,7 +476,7 @@ typedef struct IFsrmFileScreenManagerVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmFileScreenManager* This, + IFsrmFileScreenManager *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -471,51 +488,52 @@ typedef struct IFsrmFileScreenManagerVtbl { /*** IFsrmFileScreenManager methods ***/ HRESULT (STDMETHODCALLTYPE *get_ActionVariables)( - IFsrmFileScreenManager* This, + IFsrmFileScreenManager *This, SAFEARRAY **variables); HRESULT (STDMETHODCALLTYPE *get_ActionVariableDescriptions)( - IFsrmFileScreenManager* This, + IFsrmFileScreenManager *This, SAFEARRAY **descriptions); HRESULT (STDMETHODCALLTYPE *CreateFileScreen)( - IFsrmFileScreenManager* This, + IFsrmFileScreenManager *This, BSTR path, IFsrmFileScreen **fileScreen); HRESULT (STDMETHODCALLTYPE *GetFileScreen)( - IFsrmFileScreenManager* This, + IFsrmFileScreenManager *This, BSTR path, IFsrmFileScreen **fileScreen); HRESULT (STDMETHODCALLTYPE *EnumFileScreens)( - IFsrmFileScreenManager* This, + IFsrmFileScreenManager *This, BSTR path, FsrmEnumOptions options, IFsrmCommittableCollection **fileScreens); HRESULT (STDMETHODCALLTYPE *CreateFileScreenException)( - IFsrmFileScreenManager* This, + IFsrmFileScreenManager *This, BSTR path, IFsrmFileScreenException **fileScreenException); HRESULT (STDMETHODCALLTYPE *GetFileScreenException)( - IFsrmFileScreenManager* This, + IFsrmFileScreenManager *This, BSTR path, IFsrmFileScreenException **fileScreenException); HRESULT (STDMETHODCALLTYPE *EnumFileScreenExceptions)( - IFsrmFileScreenManager* This, + IFsrmFileScreenManager *This, BSTR path, FsrmEnumOptions options, IFsrmCommittableCollection **fileScreenExceptions); HRESULT (STDMETHODCALLTYPE *CreateFileScreenCollection)( - IFsrmFileScreenManager* This, + IFsrmFileScreenManager *This, IFsrmCommittableCollection **collection); END_INTERFACE } IFsrmFileScreenManagerVtbl; + interface IFsrmFileScreenManager { CONST_VTBL IFsrmFileScreenManagerVtbl* lpVtbl; }; @@ -598,86 +616,6 @@ static FORCEINLINE HRESULT IFsrmFileScreenManager_CreateFileScreenCollection(IFs #endif -HRESULT STDMETHODCALLTYPE IFsrmFileScreenManager_get_ActionVariables_Proxy( - IFsrmFileScreenManager* This, - SAFEARRAY **variables); -void __RPC_STUB IFsrmFileScreenManager_get_ActionVariables_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreenManager_get_ActionVariableDescriptions_Proxy( - IFsrmFileScreenManager* This, - SAFEARRAY **descriptions); -void __RPC_STUB IFsrmFileScreenManager_get_ActionVariableDescriptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreenManager_CreateFileScreen_Proxy( - IFsrmFileScreenManager* This, - BSTR path, - IFsrmFileScreen **fileScreen); -void __RPC_STUB IFsrmFileScreenManager_CreateFileScreen_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreenManager_GetFileScreen_Proxy( - IFsrmFileScreenManager* This, - BSTR path, - IFsrmFileScreen **fileScreen); -void __RPC_STUB IFsrmFileScreenManager_GetFileScreen_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreenManager_EnumFileScreens_Proxy( - IFsrmFileScreenManager* This, - BSTR path, - FsrmEnumOptions options, - IFsrmCommittableCollection **fileScreens); -void __RPC_STUB IFsrmFileScreenManager_EnumFileScreens_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreenManager_CreateFileScreenException_Proxy( - IFsrmFileScreenManager* This, - BSTR path, - IFsrmFileScreenException **fileScreenException); -void __RPC_STUB IFsrmFileScreenManager_CreateFileScreenException_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreenManager_GetFileScreenException_Proxy( - IFsrmFileScreenManager* This, - BSTR path, - IFsrmFileScreenException **fileScreenException); -void __RPC_STUB IFsrmFileScreenManager_GetFileScreenException_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreenManager_EnumFileScreenExceptions_Proxy( - IFsrmFileScreenManager* This, - BSTR path, - FsrmEnumOptions options, - IFsrmCommittableCollection **fileScreenExceptions); -void __RPC_STUB IFsrmFileScreenManager_EnumFileScreenExceptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreenManager_CreateFileScreenCollection_Proxy( - IFsrmFileScreenManager* This, - IFsrmCommittableCollection **collection); -void __RPC_STUB IFsrmFileScreenManager_CreateFileScreenCollection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmFileScreenManager_INTERFACE_DEFINED__ */ @@ -722,29 +660,29 @@ typedef struct IFsrmFileScreenTemplateManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmFileScreenTemplateManager* This, + IFsrmFileScreenTemplateManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmFileScreenTemplateManager* This); + IFsrmFileScreenTemplateManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmFileScreenTemplateManager* This); + IFsrmFileScreenTemplateManager *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmFileScreenTemplateManager* This, + IFsrmFileScreenTemplateManager *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmFileScreenTemplateManager* This, + IFsrmFileScreenTemplateManager *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmFileScreenTemplateManager* This, + IFsrmFileScreenTemplateManager *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -752,7 +690,7 @@ typedef struct IFsrmFileScreenTemplateManagerVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmFileScreenTemplateManager* This, + IFsrmFileScreenTemplateManager *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -764,32 +702,33 @@ typedef struct IFsrmFileScreenTemplateManagerVtbl { /*** IFsrmFileScreenTemplateManager methods ***/ HRESULT (STDMETHODCALLTYPE *CreateTemplate)( - IFsrmFileScreenTemplateManager* This, + IFsrmFileScreenTemplateManager *This, IFsrmFileScreenTemplate **fileScreenTemplate); HRESULT (STDMETHODCALLTYPE *GetTemplate)( - IFsrmFileScreenTemplateManager* This, + IFsrmFileScreenTemplateManager *This, BSTR name, IFsrmFileScreenTemplate **fileScreenTemplate); HRESULT (STDMETHODCALLTYPE *EnumTemplates)( - IFsrmFileScreenTemplateManager* This, + IFsrmFileScreenTemplateManager *This, FsrmEnumOptions options, IFsrmCommittableCollection **fileScreenTemplates); HRESULT (STDMETHODCALLTYPE *ExportTemplates)( - IFsrmFileScreenTemplateManager* This, + IFsrmFileScreenTemplateManager *This, VARIANT *fileScreenTemplateNamesArray, BSTR *serializedFileScreenTemplates); HRESULT (STDMETHODCALLTYPE *ImportTemplates)( - IFsrmFileScreenTemplateManager* This, + IFsrmFileScreenTemplateManager *This, BSTR serializedFileScreenTemplates, VARIANT *fileScreenTemplateNamesArray, IFsrmCommittableCollection **fileScreenTemplates); END_INTERFACE } IFsrmFileScreenTemplateManagerVtbl; + interface IFsrmFileScreenTemplateManager { CONST_VTBL IFsrmFileScreenTemplateManagerVtbl* lpVtbl; }; @@ -856,51 +795,6 @@ static FORCEINLINE HRESULT IFsrmFileScreenTemplateManager_ImportTemplates(IFsrmF #endif -HRESULT STDMETHODCALLTYPE IFsrmFileScreenTemplateManager_CreateTemplate_Proxy( - IFsrmFileScreenTemplateManager* This, - IFsrmFileScreenTemplate **fileScreenTemplate); -void __RPC_STUB IFsrmFileScreenTemplateManager_CreateTemplate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreenTemplateManager_GetTemplate_Proxy( - IFsrmFileScreenTemplateManager* This, - BSTR name, - IFsrmFileScreenTemplate **fileScreenTemplate); -void __RPC_STUB IFsrmFileScreenTemplateManager_GetTemplate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreenTemplateManager_EnumTemplates_Proxy( - IFsrmFileScreenTemplateManager* This, - FsrmEnumOptions options, - IFsrmCommittableCollection **fileScreenTemplates); -void __RPC_STUB IFsrmFileScreenTemplateManager_EnumTemplates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreenTemplateManager_ExportTemplates_Proxy( - IFsrmFileScreenTemplateManager* This, - VARIANT *fileScreenTemplateNamesArray, - BSTR *serializedFileScreenTemplates); -void __RPC_STUB IFsrmFileScreenTemplateManager_ExportTemplates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreenTemplateManager_ImportTemplates_Proxy( - IFsrmFileScreenTemplateManager* This, - BSTR serializedFileScreenTemplates, - VARIANT *fileScreenTemplateNamesArray, - IFsrmCommittableCollection **fileScreenTemplates); -void __RPC_STUB IFsrmFileScreenTemplateManager_ImportTemplates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmFileScreenTemplateManager_INTERFACE_DEFINED__ */ @@ -943,29 +837,29 @@ typedef struct IFsrmFileGroupVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmFileGroup* This, + IFsrmFileGroup *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmFileGroup* This); + IFsrmFileGroup *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmFileGroup* This); + IFsrmFileGroup *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmFileGroup* This, + IFsrmFileGroup *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmFileGroup* This, + IFsrmFileGroup *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmFileGroup* This, + IFsrmFileGroup *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -973,7 +867,7 @@ typedef struct IFsrmFileGroupVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmFileGroup* This, + IFsrmFileGroup *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -985,50 +879,51 @@ typedef struct IFsrmFileGroupVtbl { /*** IFsrmObject methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - IFsrmFileGroup* This, + IFsrmFileGroup *This, FSRM_OBJECT_ID *id); HRESULT (STDMETHODCALLTYPE *get_Description)( - IFsrmFileGroup* This, + IFsrmFileGroup *This, BSTR *description); HRESULT (STDMETHODCALLTYPE *put_Description)( - IFsrmFileGroup* This, + IFsrmFileGroup *This, BSTR description); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmFileGroup* This); + IFsrmFileGroup *This); HRESULT (STDMETHODCALLTYPE *Commit)( - IFsrmFileGroup* This); + IFsrmFileGroup *This); /*** IFsrmFileGroup methods ***/ HRESULT (STDMETHODCALLTYPE *get_Name)( - IFsrmFileGroup* This, + IFsrmFileGroup *This, BSTR *name); HRESULT (STDMETHODCALLTYPE *put_Name)( - IFsrmFileGroup* This, + IFsrmFileGroup *This, BSTR name); HRESULT (STDMETHODCALLTYPE *get_Members)( - IFsrmFileGroup* This, + IFsrmFileGroup *This, IFsrmMutableCollection **members); HRESULT (STDMETHODCALLTYPE *put_Members)( - IFsrmFileGroup* This, + IFsrmFileGroup *This, IFsrmMutableCollection *members); HRESULT (STDMETHODCALLTYPE *get_NonMembers)( - IFsrmFileGroup* This, + IFsrmFileGroup *This, IFsrmMutableCollection **nonMembers); HRESULT (STDMETHODCALLTYPE *put_NonMembers)( - IFsrmFileGroup* This, + IFsrmFileGroup *This, IFsrmMutableCollection *nonMembers); END_INTERFACE } IFsrmFileGroupVtbl; + interface IFsrmFileGroup { CONST_VTBL IFsrmFileGroupVtbl* lpVtbl; }; @@ -1121,54 +1016,6 @@ static FORCEINLINE HRESULT IFsrmFileGroup_put_NonMembers(IFsrmFileGroup* This,IF #endif -HRESULT STDMETHODCALLTYPE IFsrmFileGroup_get_Name_Proxy( - IFsrmFileGroup* This, - BSTR *name); -void __RPC_STUB IFsrmFileGroup_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileGroup_put_Name_Proxy( - IFsrmFileGroup* This, - BSTR name); -void __RPC_STUB IFsrmFileGroup_put_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileGroup_get_Members_Proxy( - IFsrmFileGroup* This, - IFsrmMutableCollection **members); -void __RPC_STUB IFsrmFileGroup_get_Members_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileGroup_put_Members_Proxy( - IFsrmFileGroup* This, - IFsrmMutableCollection *members); -void __RPC_STUB IFsrmFileGroup_put_Members_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileGroup_get_NonMembers_Proxy( - IFsrmFileGroup* This, - IFsrmMutableCollection **nonMembers); -void __RPC_STUB IFsrmFileGroup_get_NonMembers_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileGroup_put_NonMembers_Proxy( - IFsrmFileGroup* This, - IFsrmMutableCollection *nonMembers); -void __RPC_STUB IFsrmFileGroup_put_NonMembers_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmFileGroup_INTERFACE_DEFINED__ */ @@ -1212,29 +1059,29 @@ typedef struct IFsrmFileScreenBaseVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmFileScreenBase* This, + IFsrmFileScreenBase *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmFileScreenBase* This); + IFsrmFileScreenBase *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmFileScreenBase* This); + IFsrmFileScreenBase *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmFileScreenBase* This, + IFsrmFileScreenBase *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmFileScreenBase* This, + IFsrmFileScreenBase *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmFileScreenBase* This, + IFsrmFileScreenBase *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1242,7 +1089,7 @@ typedef struct IFsrmFileScreenBaseVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmFileScreenBase* This, + IFsrmFileScreenBase *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1254,51 +1101,52 @@ typedef struct IFsrmFileScreenBaseVtbl { /*** IFsrmObject methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - IFsrmFileScreenBase* This, + IFsrmFileScreenBase *This, FSRM_OBJECT_ID *id); HRESULT (STDMETHODCALLTYPE *get_Description)( - IFsrmFileScreenBase* This, + IFsrmFileScreenBase *This, BSTR *description); HRESULT (STDMETHODCALLTYPE *put_Description)( - IFsrmFileScreenBase* This, + IFsrmFileScreenBase *This, BSTR description); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmFileScreenBase* This); + IFsrmFileScreenBase *This); HRESULT (STDMETHODCALLTYPE *Commit)( - IFsrmFileScreenBase* This); + IFsrmFileScreenBase *This); /*** IFsrmFileScreenBase methods ***/ HRESULT (STDMETHODCALLTYPE *get_BlockedFileGroups)( - IFsrmFileScreenBase* This, + IFsrmFileScreenBase *This, IFsrmMutableCollection **blockList); HRESULT (STDMETHODCALLTYPE *put_BlockedFileGroups)( - IFsrmFileScreenBase* This, + IFsrmFileScreenBase *This, IFsrmMutableCollection *blockList); HRESULT (STDMETHODCALLTYPE *get_FileScreenFlags)( - IFsrmFileScreenBase* This, + IFsrmFileScreenBase *This, LONG *fileScreenFlags); HRESULT (STDMETHODCALLTYPE *put_FileScreenFlags)( - IFsrmFileScreenBase* This, + IFsrmFileScreenBase *This, LONG fileScreenFlags); HRESULT (STDMETHODCALLTYPE *CreateAction)( - IFsrmFileScreenBase* This, + IFsrmFileScreenBase *This, FsrmActionType actionType, IFsrmAction **action); HRESULT (STDMETHODCALLTYPE *EnumActions)( - IFsrmFileScreenBase* This, + IFsrmFileScreenBase *This, IFsrmCollection **actions); END_INTERFACE } IFsrmFileScreenBaseVtbl; + interface IFsrmFileScreenBase { CONST_VTBL IFsrmFileScreenBaseVtbl* lpVtbl; }; @@ -1391,55 +1239,6 @@ static FORCEINLINE HRESULT IFsrmFileScreenBase_EnumActions(IFsrmFileScreenBase* #endif -HRESULT STDMETHODCALLTYPE IFsrmFileScreenBase_get_BlockedFileGroups_Proxy( - IFsrmFileScreenBase* This, - IFsrmMutableCollection **blockList); -void __RPC_STUB IFsrmFileScreenBase_get_BlockedFileGroups_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreenBase_put_BlockedFileGroups_Proxy( - IFsrmFileScreenBase* This, - IFsrmMutableCollection *blockList); -void __RPC_STUB IFsrmFileScreenBase_put_BlockedFileGroups_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreenBase_get_FileScreenFlags_Proxy( - IFsrmFileScreenBase* This, - LONG *fileScreenFlags); -void __RPC_STUB IFsrmFileScreenBase_get_FileScreenFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreenBase_put_FileScreenFlags_Proxy( - IFsrmFileScreenBase* This, - LONG fileScreenFlags); -void __RPC_STUB IFsrmFileScreenBase_put_FileScreenFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreenBase_CreateAction_Proxy( - IFsrmFileScreenBase* This, - FsrmActionType actionType, - IFsrmAction **action); -void __RPC_STUB IFsrmFileScreenBase_CreateAction_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreenBase_EnumActions_Proxy( - IFsrmFileScreenBase* This, - IFsrmCollection **actions); -void __RPC_STUB IFsrmFileScreenBase_EnumActions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmFileScreenBase_INTERFACE_DEFINED__ */ @@ -1473,29 +1272,29 @@ typedef struct IFsrmFileScreenExceptionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmFileScreenException* This, + IFsrmFileScreenException *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmFileScreenException* This); + IFsrmFileScreenException *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmFileScreenException* This); + IFsrmFileScreenException *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmFileScreenException* This, + IFsrmFileScreenException *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmFileScreenException* This, + IFsrmFileScreenException *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmFileScreenException* This, + IFsrmFileScreenException *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1503,7 +1302,7 @@ typedef struct IFsrmFileScreenExceptionVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmFileScreenException* This, + IFsrmFileScreenException *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1515,38 +1314,39 @@ typedef struct IFsrmFileScreenExceptionVtbl { /*** IFsrmObject methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - IFsrmFileScreenException* This, + IFsrmFileScreenException *This, FSRM_OBJECT_ID *id); HRESULT (STDMETHODCALLTYPE *get_Description)( - IFsrmFileScreenException* This, + IFsrmFileScreenException *This, BSTR *description); HRESULT (STDMETHODCALLTYPE *put_Description)( - IFsrmFileScreenException* This, + IFsrmFileScreenException *This, BSTR description); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmFileScreenException* This); + IFsrmFileScreenException *This); HRESULT (STDMETHODCALLTYPE *Commit)( - IFsrmFileScreenException* This); + IFsrmFileScreenException *This); /*** IFsrmFileScreenException methods ***/ HRESULT (STDMETHODCALLTYPE *get_Path)( - IFsrmFileScreenException* This, + IFsrmFileScreenException *This, BSTR *path); HRESULT (STDMETHODCALLTYPE *get_AllowedFileGroups)( - IFsrmFileScreenException* This, + IFsrmFileScreenException *This, IFsrmMutableCollection **allowList); HRESULT (STDMETHODCALLTYPE *put_AllowedFileGroups)( - IFsrmFileScreenException* This, + IFsrmFileScreenException *This, IFsrmMutableCollection *allowList); END_INTERFACE } IFsrmFileScreenExceptionVtbl; + interface IFsrmFileScreenException { CONST_VTBL IFsrmFileScreenExceptionVtbl* lpVtbl; }; @@ -1627,30 +1427,6 @@ static FORCEINLINE HRESULT IFsrmFileScreenException_put_AllowedFileGroups(IFsrmF #endif -HRESULT STDMETHODCALLTYPE IFsrmFileScreenException_get_Path_Proxy( - IFsrmFileScreenException* This, - BSTR *path); -void __RPC_STUB IFsrmFileScreenException_get_Path_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreenException_get_AllowedFileGroups_Proxy( - IFsrmFileScreenException* This, - IFsrmMutableCollection **allowList); -void __RPC_STUB IFsrmFileScreenException_get_AllowedFileGroups_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreenException_put_AllowedFileGroups_Proxy( - IFsrmFileScreenException* This, - IFsrmMutableCollection *allowList); -void __RPC_STUB IFsrmFileScreenException_put_AllowedFileGroups_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmFileScreenException_INTERFACE_DEFINED__ */ @@ -1693,29 +1469,29 @@ typedef struct IFsrmFileScreenVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmFileScreen* This, + IFsrmFileScreen *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmFileScreen* This); + IFsrmFileScreen *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmFileScreen* This); + IFsrmFileScreen *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmFileScreen* This, + IFsrmFileScreen *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmFileScreen* This, + IFsrmFileScreen *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmFileScreen* This, + IFsrmFileScreen *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1723,7 +1499,7 @@ typedef struct IFsrmFileScreenVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmFileScreen* This, + IFsrmFileScreen *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1735,76 +1511,77 @@ typedef struct IFsrmFileScreenVtbl { /*** IFsrmObject methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - IFsrmFileScreen* This, + IFsrmFileScreen *This, FSRM_OBJECT_ID *id); HRESULT (STDMETHODCALLTYPE *get_Description)( - IFsrmFileScreen* This, + IFsrmFileScreen *This, BSTR *description); HRESULT (STDMETHODCALLTYPE *put_Description)( - IFsrmFileScreen* This, + IFsrmFileScreen *This, BSTR description); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmFileScreen* This); + IFsrmFileScreen *This); HRESULT (STDMETHODCALLTYPE *Commit)( - IFsrmFileScreen* This); + IFsrmFileScreen *This); /*** IFsrmFileScreenBase methods ***/ HRESULT (STDMETHODCALLTYPE *get_BlockedFileGroups)( - IFsrmFileScreen* This, + IFsrmFileScreen *This, IFsrmMutableCollection **blockList); HRESULT (STDMETHODCALLTYPE *put_BlockedFileGroups)( - IFsrmFileScreen* This, + IFsrmFileScreen *This, IFsrmMutableCollection *blockList); HRESULT (STDMETHODCALLTYPE *get_FileScreenFlags)( - IFsrmFileScreen* This, + IFsrmFileScreen *This, LONG *fileScreenFlags); HRESULT (STDMETHODCALLTYPE *put_FileScreenFlags)( - IFsrmFileScreen* This, + IFsrmFileScreen *This, LONG fileScreenFlags); HRESULT (STDMETHODCALLTYPE *CreateAction)( - IFsrmFileScreen* This, + IFsrmFileScreen *This, FsrmActionType actionType, IFsrmAction **action); HRESULT (STDMETHODCALLTYPE *EnumActions)( - IFsrmFileScreen* This, + IFsrmFileScreen *This, IFsrmCollection **actions); /*** IFsrmFileScreen methods ***/ HRESULT (STDMETHODCALLTYPE *get_Path)( - IFsrmFileScreen* This, + IFsrmFileScreen *This, BSTR *path); HRESULT (STDMETHODCALLTYPE *get_SourceTemplateName)( - IFsrmFileScreen* This, + IFsrmFileScreen *This, BSTR *fileScreenTemplateName); HRESULT (STDMETHODCALLTYPE *get_MatchesSourceTemplate)( - IFsrmFileScreen* This, + IFsrmFileScreen *This, VARIANT_BOOL *matches); HRESULT (STDMETHODCALLTYPE *get_UserSid)( - IFsrmFileScreen* This, + IFsrmFileScreen *This, BSTR *userSid); HRESULT (STDMETHODCALLTYPE *get_UserAccount)( - IFsrmFileScreen* This, + IFsrmFileScreen *This, BSTR *userAccount); HRESULT (STDMETHODCALLTYPE *ApplyTemplate)( - IFsrmFileScreen* This, + IFsrmFileScreen *This, BSTR fileScreenTemplateName); END_INTERFACE } IFsrmFileScreenVtbl; + interface IFsrmFileScreen { CONST_VTBL IFsrmFileScreenVtbl* lpVtbl; }; @@ -1923,54 +1700,6 @@ static FORCEINLINE HRESULT IFsrmFileScreen_ApplyTemplate(IFsrmFileScreen* This,B #endif -HRESULT STDMETHODCALLTYPE IFsrmFileScreen_get_Path_Proxy( - IFsrmFileScreen* This, - BSTR *path); -void __RPC_STUB IFsrmFileScreen_get_Path_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreen_get_SourceTemplateName_Proxy( - IFsrmFileScreen* This, - BSTR *fileScreenTemplateName); -void __RPC_STUB IFsrmFileScreen_get_SourceTemplateName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreen_get_MatchesSourceTemplate_Proxy( - IFsrmFileScreen* This, - VARIANT_BOOL *matches); -void __RPC_STUB IFsrmFileScreen_get_MatchesSourceTemplate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreen_get_UserSid_Proxy( - IFsrmFileScreen* This, - BSTR *userSid); -void __RPC_STUB IFsrmFileScreen_get_UserSid_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreen_get_UserAccount_Proxy( - IFsrmFileScreen* This, - BSTR *userAccount); -void __RPC_STUB IFsrmFileScreen_get_UserAccount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreen_ApplyTemplate_Proxy( - IFsrmFileScreen* This, - BSTR fileScreenTemplateName); -void __RPC_STUB IFsrmFileScreen_ApplyTemplate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmFileScreen_INTERFACE_DEFINED__ */ @@ -2001,29 +1730,29 @@ typedef struct IFsrmFileGroupImportedVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmFileGroupImported* This, + IFsrmFileGroupImported *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmFileGroupImported* This); + IFsrmFileGroupImported *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmFileGroupImported* This); + IFsrmFileGroupImported *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmFileGroupImported* This, + IFsrmFileGroupImported *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmFileGroupImported* This, + IFsrmFileGroupImported *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmFileGroupImported* This, + IFsrmFileGroupImported *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2031,7 +1760,7 @@ typedef struct IFsrmFileGroupImportedVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmFileGroupImported* This, + IFsrmFileGroupImported *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2043,59 +1772,60 @@ typedef struct IFsrmFileGroupImportedVtbl { /*** IFsrmObject methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - IFsrmFileGroupImported* This, + IFsrmFileGroupImported *This, FSRM_OBJECT_ID *id); HRESULT (STDMETHODCALLTYPE *get_Description)( - IFsrmFileGroupImported* This, + IFsrmFileGroupImported *This, BSTR *description); HRESULT (STDMETHODCALLTYPE *put_Description)( - IFsrmFileGroupImported* This, + IFsrmFileGroupImported *This, BSTR description); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmFileGroupImported* This); + IFsrmFileGroupImported *This); HRESULT (STDMETHODCALLTYPE *Commit)( - IFsrmFileGroupImported* This); + IFsrmFileGroupImported *This); /*** IFsrmFileGroup methods ***/ HRESULT (STDMETHODCALLTYPE *get_Name)( - IFsrmFileGroupImported* This, + IFsrmFileGroupImported *This, BSTR *name); HRESULT (STDMETHODCALLTYPE *put_Name)( - IFsrmFileGroupImported* This, + IFsrmFileGroupImported *This, BSTR name); HRESULT (STDMETHODCALLTYPE *get_Members)( - IFsrmFileGroupImported* This, + IFsrmFileGroupImported *This, IFsrmMutableCollection **members); HRESULT (STDMETHODCALLTYPE *put_Members)( - IFsrmFileGroupImported* This, + IFsrmFileGroupImported *This, IFsrmMutableCollection *members); HRESULT (STDMETHODCALLTYPE *get_NonMembers)( - IFsrmFileGroupImported* This, + IFsrmFileGroupImported *This, IFsrmMutableCollection **nonMembers); HRESULT (STDMETHODCALLTYPE *put_NonMembers)( - IFsrmFileGroupImported* This, + IFsrmFileGroupImported *This, IFsrmMutableCollection *nonMembers); /*** IFsrmFileGroupImported methods ***/ HRESULT (STDMETHODCALLTYPE *get_OverwriteOnCommit)( - IFsrmFileGroupImported* This, + IFsrmFileGroupImported *This, VARIANT_BOOL *overwrite); HRESULT (STDMETHODCALLTYPE *put_OverwriteOnCommit)( - IFsrmFileGroupImported* This, + IFsrmFileGroupImported *This, VARIANT_BOOL overwrite); END_INTERFACE } IFsrmFileGroupImportedVtbl; + interface IFsrmFileGroupImported { CONST_VTBL IFsrmFileGroupImportedVtbl* lpVtbl; }; @@ -2198,22 +1928,6 @@ static FORCEINLINE HRESULT IFsrmFileGroupImported_put_OverwriteOnCommit(IFsrmFil #endif -HRESULT STDMETHODCALLTYPE IFsrmFileGroupImported_get_OverwriteOnCommit_Proxy( - IFsrmFileGroupImported* This, - VARIANT_BOOL *overwrite); -void __RPC_STUB IFsrmFileGroupImported_get_OverwriteOnCommit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileGroupImported_put_OverwriteOnCommit_Proxy( - IFsrmFileGroupImported* This, - VARIANT_BOOL overwrite); -void __RPC_STUB IFsrmFileGroupImported_put_OverwriteOnCommit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmFileGroupImported_INTERFACE_DEFINED__ */ @@ -2252,29 +1966,29 @@ typedef struct IFsrmFileScreenTemplateVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmFileScreenTemplate* This, + IFsrmFileScreenTemplate *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmFileScreenTemplate* This); + IFsrmFileScreenTemplate *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmFileScreenTemplate* This); + IFsrmFileScreenTemplate *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmFileScreenTemplate* This, + IFsrmFileScreenTemplate *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmFileScreenTemplate* This, + IFsrmFileScreenTemplate *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmFileScreenTemplate* This, + IFsrmFileScreenTemplate *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2282,7 +1996,7 @@ typedef struct IFsrmFileScreenTemplateVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmFileScreenTemplate* This, + IFsrmFileScreenTemplate *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2294,70 +2008,71 @@ typedef struct IFsrmFileScreenTemplateVtbl { /*** IFsrmObject methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - IFsrmFileScreenTemplate* This, + IFsrmFileScreenTemplate *This, FSRM_OBJECT_ID *id); HRESULT (STDMETHODCALLTYPE *get_Description)( - IFsrmFileScreenTemplate* This, + IFsrmFileScreenTemplate *This, BSTR *description); HRESULT (STDMETHODCALLTYPE *put_Description)( - IFsrmFileScreenTemplate* This, + IFsrmFileScreenTemplate *This, BSTR description); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmFileScreenTemplate* This); + IFsrmFileScreenTemplate *This); HRESULT (STDMETHODCALLTYPE *Commit)( - IFsrmFileScreenTemplate* This); + IFsrmFileScreenTemplate *This); /*** IFsrmFileScreenBase methods ***/ HRESULT (STDMETHODCALLTYPE *get_BlockedFileGroups)( - IFsrmFileScreenTemplate* This, + IFsrmFileScreenTemplate *This, IFsrmMutableCollection **blockList); HRESULT (STDMETHODCALLTYPE *put_BlockedFileGroups)( - IFsrmFileScreenTemplate* This, + IFsrmFileScreenTemplate *This, IFsrmMutableCollection *blockList); HRESULT (STDMETHODCALLTYPE *get_FileScreenFlags)( - IFsrmFileScreenTemplate* This, + IFsrmFileScreenTemplate *This, LONG *fileScreenFlags); HRESULT (STDMETHODCALLTYPE *put_FileScreenFlags)( - IFsrmFileScreenTemplate* This, + IFsrmFileScreenTemplate *This, LONG fileScreenFlags); HRESULT (STDMETHODCALLTYPE *CreateAction)( - IFsrmFileScreenTemplate* This, + IFsrmFileScreenTemplate *This, FsrmActionType actionType, IFsrmAction **action); HRESULT (STDMETHODCALLTYPE *EnumActions)( - IFsrmFileScreenTemplate* This, + IFsrmFileScreenTemplate *This, IFsrmCollection **actions); /*** IFsrmFileScreenTemplate methods ***/ HRESULT (STDMETHODCALLTYPE *get_Name)( - IFsrmFileScreenTemplate* This, + IFsrmFileScreenTemplate *This, BSTR *name); HRESULT (STDMETHODCALLTYPE *put_Name)( - IFsrmFileScreenTemplate* This, + IFsrmFileScreenTemplate *This, BSTR name); HRESULT (STDMETHODCALLTYPE *CopyTemplate)( - IFsrmFileScreenTemplate* This, + IFsrmFileScreenTemplate *This, BSTR fileScreenTemplateName); HRESULT (STDMETHODCALLTYPE *CommitAndUpdateDerived)( - IFsrmFileScreenTemplate* This, + IFsrmFileScreenTemplate *This, FsrmCommitOptions commitOptions, FsrmTemplateApplyOptions applyOptions, IFsrmDerivedObjectsResult **derivedObjectsResult); END_INTERFACE } IFsrmFileScreenTemplateVtbl; + interface IFsrmFileScreenTemplate { CONST_VTBL IFsrmFileScreenTemplateVtbl* lpVtbl; }; @@ -2468,40 +2183,6 @@ static FORCEINLINE HRESULT IFsrmFileScreenTemplate_CommitAndUpdateDerived(IFsrmF #endif -HRESULT STDMETHODCALLTYPE IFsrmFileScreenTemplate_get_Name_Proxy( - IFsrmFileScreenTemplate* This, - BSTR *name); -void __RPC_STUB IFsrmFileScreenTemplate_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreenTemplate_put_Name_Proxy( - IFsrmFileScreenTemplate* This, - BSTR name); -void __RPC_STUB IFsrmFileScreenTemplate_put_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreenTemplate_CopyTemplate_Proxy( - IFsrmFileScreenTemplate* This, - BSTR fileScreenTemplateName); -void __RPC_STUB IFsrmFileScreenTemplate_CopyTemplate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreenTemplate_CommitAndUpdateDerived_Proxy( - IFsrmFileScreenTemplate* This, - FsrmCommitOptions commitOptions, - FsrmTemplateApplyOptions applyOptions, - IFsrmDerivedObjectsResult **derivedObjectsResult); -void __RPC_STUB IFsrmFileScreenTemplate_CommitAndUpdateDerived_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmFileScreenTemplate_INTERFACE_DEFINED__ */ @@ -2532,29 +2213,29 @@ typedef struct IFsrmFileScreenTemplateImportedVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmFileScreenTemplateImported* This, + IFsrmFileScreenTemplateImported *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmFileScreenTemplateImported* This); + IFsrmFileScreenTemplateImported *This); ULONG (STDMETHODCALLTYPE *Release)( - IFsrmFileScreenTemplateImported* This); + IFsrmFileScreenTemplateImported *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmFileScreenTemplateImported* This, + IFsrmFileScreenTemplateImported *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmFileScreenTemplateImported* This, + IFsrmFileScreenTemplateImported *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmFileScreenTemplateImported* This, + IFsrmFileScreenTemplateImported *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2562,7 +2243,7 @@ typedef struct IFsrmFileScreenTemplateImportedVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmFileScreenTemplateImported* This, + IFsrmFileScreenTemplateImported *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2574,79 +2255,80 @@ typedef struct IFsrmFileScreenTemplateImportedVtbl { /*** IFsrmObject methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - IFsrmFileScreenTemplateImported* This, + IFsrmFileScreenTemplateImported *This, FSRM_OBJECT_ID *id); HRESULT (STDMETHODCALLTYPE *get_Description)( - IFsrmFileScreenTemplateImported* This, + IFsrmFileScreenTemplateImported *This, BSTR *description); HRESULT (STDMETHODCALLTYPE *put_Description)( - IFsrmFileScreenTemplateImported* This, + IFsrmFileScreenTemplateImported *This, BSTR description); HRESULT (STDMETHODCALLTYPE *Delete)( - IFsrmFileScreenTemplateImported* This); + IFsrmFileScreenTemplateImported *This); HRESULT (STDMETHODCALLTYPE *Commit)( - IFsrmFileScreenTemplateImported* This); + IFsrmFileScreenTemplateImported *This); /*** IFsrmFileScreenBase methods ***/ HRESULT (STDMETHODCALLTYPE *get_BlockedFileGroups)( - IFsrmFileScreenTemplateImported* This, + IFsrmFileScreenTemplateImported *This, IFsrmMutableCollection **blockList); HRESULT (STDMETHODCALLTYPE *put_BlockedFileGroups)( - IFsrmFileScreenTemplateImported* This, + IFsrmFileScreenTemplateImported *This, IFsrmMutableCollection *blockList); HRESULT (STDMETHODCALLTYPE *get_FileScreenFlags)( - IFsrmFileScreenTemplateImported* This, + IFsrmFileScreenTemplateImported *This, LONG *fileScreenFlags); HRESULT (STDMETHODCALLTYPE *put_FileScreenFlags)( - IFsrmFileScreenTemplateImported* This, + IFsrmFileScreenTemplateImported *This, LONG fileScreenFlags); HRESULT (STDMETHODCALLTYPE *CreateAction)( - IFsrmFileScreenTemplateImported* This, + IFsrmFileScreenTemplateImported *This, FsrmActionType actionType, IFsrmAction **action); HRESULT (STDMETHODCALLTYPE *EnumActions)( - IFsrmFileScreenTemplateImported* This, + IFsrmFileScreenTemplateImported *This, IFsrmCollection **actions); /*** IFsrmFileScreenTemplate methods ***/ HRESULT (STDMETHODCALLTYPE *get_Name)( - IFsrmFileScreenTemplateImported* This, + IFsrmFileScreenTemplateImported *This, BSTR *name); HRESULT (STDMETHODCALLTYPE *put_Name)( - IFsrmFileScreenTemplateImported* This, + IFsrmFileScreenTemplateImported *This, BSTR name); HRESULT (STDMETHODCALLTYPE *CopyTemplate)( - IFsrmFileScreenTemplateImported* This, + IFsrmFileScreenTemplateImported *This, BSTR fileScreenTemplateName); HRESULT (STDMETHODCALLTYPE *CommitAndUpdateDerived)( - IFsrmFileScreenTemplateImported* This, + IFsrmFileScreenTemplateImported *This, FsrmCommitOptions commitOptions, FsrmTemplateApplyOptions applyOptions, IFsrmDerivedObjectsResult **derivedObjectsResult); /*** IFsrmFileScreenTemplateImported methods ***/ HRESULT (STDMETHODCALLTYPE *get_OverwriteOnCommit)( - IFsrmFileScreenTemplateImported* This, + IFsrmFileScreenTemplateImported *This, VARIANT_BOOL *overwrite); HRESULT (STDMETHODCALLTYPE *put_OverwriteOnCommit)( - IFsrmFileScreenTemplateImported* This, + IFsrmFileScreenTemplateImported *This, VARIANT_BOOL overwrite); END_INTERFACE } IFsrmFileScreenTemplateImportedVtbl; + interface IFsrmFileScreenTemplateImported { CONST_VTBL IFsrmFileScreenTemplateImportedVtbl* lpVtbl; }; @@ -2767,22 +2449,6 @@ static FORCEINLINE HRESULT IFsrmFileScreenTemplateImported_put_OverwriteOnCommit #endif -HRESULT STDMETHODCALLTYPE IFsrmFileScreenTemplateImported_get_OverwriteOnCommit_Proxy( - IFsrmFileScreenTemplateImported* This, - VARIANT_BOOL *overwrite); -void __RPC_STUB IFsrmFileScreenTemplateImported_get_OverwriteOnCommit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFsrmFileScreenTemplateImported_put_OverwriteOnCommit_Proxy( - IFsrmFileScreenTemplateImported* This, - VARIANT_BOOL overwrite); -void __RPC_STUB IFsrmFileScreenTemplateImported_put_OverwriteOnCommit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFsrmFileScreenTemplateImported_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/fusion.h b/lib/libc/include/any-windows-any/fusion.h index 77a7d2783b..86f66f484d 100644 --- a/lib/libc/include/any-windows-any/fusion.h +++ b/lib/libc/include/any-windows-any/fusion.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/fusion.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from include/fusion.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -105,14 +106,14 @@ interface IAssemblyName; #endif /* __cplusplus */ #endif -typedef enum __WIDL_fusion_generated_name_00000002 { +typedef enum __WIDL_fusion_generated_name_0000000E { ASM_CACHE_ZAP = 0x1, ASM_CACHE_GAC = 0x2, ASM_CACHE_DOWNLOAD = 0x4, ASM_CACHE_ROOT = 0x8, ASM_CACHE_ROOT_EX = 0x80 } ASM_CACHE_FLAGS; -typedef enum __WIDL_fusion_generated_name_00000003 { +typedef enum __WIDL_fusion_generated_name_0000000F { peNone = 0x0, peMSIL = 0x1, peI386 = 0x2, @@ -430,13 +431,13 @@ static FORCEINLINE HRESULT IAssemblyCacheItem_AbortItem(IAssemblyCacheItem* This #define __IAssemblyName_INTERFACE_DEFINED__ typedef IAssemblyName *LPASSEMBLYNAME; -typedef enum __WIDL_fusion_generated_name_00000004 { +typedef enum __WIDL_fusion_generated_name_00000010 { CANOF_PARSE_DISPLAY_NAME = 0x1, CANOF_SET_DEFAULT_VALUES = 0x2, CANOF_VERIFY_FRIEND_ASSEMBLYNAME = 0x4, CANOF_PARSE_FRIEND_DISPLAY_NAME = CANOF_PARSE_DISPLAY_NAME | CANOF_VERIFY_FRIEND_ASSEMBLYNAME } CREATE_ASM_NAME_OBJ_FLAGS; -typedef enum __WIDL_fusion_generated_name_00000005 { +typedef enum __WIDL_fusion_generated_name_00000011 { ASM_NAME_PUBLIC_KEY = 0, ASM_NAME_PUBLIC_KEY_TOKEN = 1, ASM_NAME_HASH_VALUE = 2, @@ -467,7 +468,7 @@ typedef enum __WIDL_fusion_generated_name_00000005 { ASM_NAME_ARCHITECTURE = 27, ASM_NAME_MAX_PARAMS = 28 } ASM_NAME; -typedef enum __WIDL_fusion_generated_name_00000006 { +typedef enum __WIDL_fusion_generated_name_00000012 { ASM_DISPLAYF_VERSION = 0x1, ASM_DISPLAYF_CULTURE = 0x2, ASM_DISPLAYF_PUBLIC_KEY_TOKEN = 0x4, @@ -480,7 +481,7 @@ typedef enum __WIDL_fusion_generated_name_00000006 { ASM_DISPLAYF_MVID = 0x200, ASM_DISPLAYF_FULL = (((ASM_DISPLAYF_VERSION | ASM_DISPLAYF_CULTURE) | ASM_DISPLAYF_PUBLIC_KEY_TOKEN) | ASM_DISPLAYF_RETARGET) | ASM_DISPLAYF_PROCESSORARCHITECTURE } ASM_DISPLAY_FLAGS; -typedef enum __WIDL_fusion_generated_name_00000007 { +typedef enum __WIDL_fusion_generated_name_00000013 { ASM_CMPF_NAME = 0x1, ASM_CMPF_MAJOR_VERSION = 0x2, ASM_CMPF_MINOR_VERSION = 0x4, diff --git a/lib/libc/include/any-windows-any/fwptypes.h b/lib/libc/include/any-windows-any/fwptypes.h index 1742837500..873018c196 100644 --- a/lib/libc/include/any-windows-any/fwptypes.h +++ b/lib/libc/include/any-windows-any/fwptypes.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/fwptypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/fwptypes.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/hstring.h b/lib/libc/include/any-windows-any/hstring.h index 54e0ed0f55..c5f134234b 100644 --- a/lib/libc/include/any-windows-any/hstring.h +++ b/lib/libc/include/any-windows-any/hstring.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/hstring.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/hstring.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/hvsocket.h b/lib/libc/include/any-windows-any/hvsocket.h new file mode 100644 index 0000000000..83f96d3363 --- /dev/null +++ b/lib/libc/include/any-windows-any/hvsocket.h @@ -0,0 +1,49 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#ifndef HVSOCKET_H +#define HVSOCKET_H + +#include +#include + +#define HVSOCKET_CONNECT_TIMEOUT 0x01 +#define HVSOCKET_CONNECT_TIMEOUT_MAX 300000 +#define HVSOCKET_CONTAINER_PASSTHRU 0x02 +#define HVSOCKET_CONNECTED_SUSPEND 0x04 + +DEFINE_GUID(HV_GUID_ZERO, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); +DEFINE_GUID(HV_GUID_BROADCAST, 0xFFFFFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF); + +#define HV_GUID_WILDCARD HV_GUID_ZERO + +DEFINE_GUID(HV_GUID_CHILDREN, 0x90db8b89, 0x0d35, 0x4f79, 0x8c, 0xe9, 0x49, 0xea, 0x0a, 0xc8, 0xb7, 0xcd); +DEFINE_GUID(HV_GUID_LOOPBACK, 0xe0e16197, 0xdd56, 0x4a10, 0x91, 0x95, 0x5e, 0xe7, 0xa1, 0x55, 0xa8, 0x38); +DEFINE_GUID(HV_GUID_PARENT, 0xa42e7cda, 0xd03f, 0x480c, 0x9c, 0xc2, 0xa4, 0xde, 0x20, 0xab, 0xb8, 0x78); +DEFINE_GUID(HV_GUID_SILOHOST, 0x36bd0c5c, 0x7276, 0x4223, 0x88, 0xba, 0x7d, 0x03, 0xb6, 0x54, 0xc5, 0x68); +DEFINE_GUID(HV_GUID_VSOCK_TEMPLATE, 0x00000000, 0xfacb, 0x11e6, 0xbd, 0x58, 0x64, 0x00, 0x6a, 0x79, 0x86, 0xd3); + +#define HV_PROTOCOL_RAW 1 + +typedef struct _SOCKADDR_HV +{ + ADDRESS_FAMILY Family; + USHORT Reserved; + GUID VmId; + GUID ServiceId; +}SOCKADDR_HV, *PSOCKADDR_HV; + +#define HVSOCKET_ADDRESS_FLAG_PASSTHRU 0x00000001 + +typedef struct _HVSOCKET_ADDRESS_INFO +{ + GUID SystemId; + GUID VirtualMachineId; + GUID SiloId; + ULONG Flags; +} HVSOCKET_ADDRESS_INFO, *PHVSOCKET_ADDRESS_INFO; + +#endif diff --git a/lib/libc/include/any-windows-any/icftypes.h b/lib/libc/include/any-windows-any/icftypes.h index fb4e859faf..390ff3f359 100644 --- a/lib/libc/include/any-windows-any/icftypes.h +++ b/lib/libc/include/any-windows-any/icftypes.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/icftypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from include/icftypes.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/icodecapi.h b/lib/libc/include/any-windows-any/icodecapi.h index ce93d4b77b..049e4c828f 100644 --- a/lib/libc/include/any-windows-any/icodecapi.h +++ b/lib/libc/include/any-windows-any/icodecapi.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/icodecapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/icodecapi.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,6 +21,9 @@ #ifndef __ICodecAPI_FWD_DEFINED__ #define __ICodecAPI_FWD_DEFINED__ typedef interface ICodecAPI ICodecAPI; +#ifdef __cplusplus +interface ICodecAPI; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -46,10 +50,12 @@ struct CodecAPIEventData { DWORD reserved[3]; }; - #ifndef __IStream_FWD_DEFINED__ #define __IStream_FWD_DEFINED__ typedef interface IStream IStream; +#ifdef __cplusplus +interface IStream; +#endif /* __cplusplus */ #endif @@ -134,93 +140,94 @@ typedef struct ICodecAPIVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICodecAPI* This, + ICodecAPI *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICodecAPI* This); + ICodecAPI *This); ULONG (STDMETHODCALLTYPE *Release)( - ICodecAPI* This); + ICodecAPI *This); /*** ICodecAPI methods ***/ HRESULT (STDMETHODCALLTYPE *IsSupported)( - ICodecAPI* This, + ICodecAPI *This, const GUID *Api); HRESULT (STDMETHODCALLTYPE *IsModifiable)( - ICodecAPI* This, + ICodecAPI *This, const GUID *Api); HRESULT (STDMETHODCALLTYPE *GetParameterRange)( - ICodecAPI* This, + ICodecAPI *This, const GUID *Api, VARIANT *ValueMin, VARIANT *ValueMax, VARIANT *SteppingDelta); HRESULT (STDMETHODCALLTYPE *GetParameterValues)( - ICodecAPI* This, + ICodecAPI *This, const GUID *Api, VARIANT **Values, ULONG *ValuesCount); HRESULT (STDMETHODCALLTYPE *GetDefaultValue)( - ICodecAPI* This, + ICodecAPI *This, const GUID *Api, VARIANT *Value); HRESULT (STDMETHODCALLTYPE *GetValue)( - ICodecAPI* This, + ICodecAPI *This, const GUID *Api, VARIANT *Value); HRESULT (STDMETHODCALLTYPE *SetValue)( - ICodecAPI* This, + ICodecAPI *This, const GUID *Api, VARIANT *Value); HRESULT (STDMETHODCALLTYPE *RegisterForEvent)( - ICodecAPI* This, + ICodecAPI *This, const GUID *Api, LONG_PTR userData); HRESULT (STDMETHODCALLTYPE *UnregisterForEvent)( - ICodecAPI* This, + ICodecAPI *This, const GUID *Api); HRESULT (STDMETHODCALLTYPE *SetAllDefaults)( - ICodecAPI* This); + ICodecAPI *This); HRESULT (STDMETHODCALLTYPE *SetValueWithNotify)( - ICodecAPI* This, + ICodecAPI *This, const GUID *Api, VARIANT *Value, GUID **ChangedParam, ULONG *ChangedParamCount); HRESULT (STDMETHODCALLTYPE *SetAllDefaultsWithNotify)( - ICodecAPI* This, + ICodecAPI *This, GUID **ChangedParam, ULONG *ChangedParamCount); HRESULT (STDMETHODCALLTYPE *GetAllSettings)( - ICodecAPI* This, + ICodecAPI *This, IStream *a); HRESULT (STDMETHODCALLTYPE *SetAllSettings)( - ICodecAPI* This, + ICodecAPI *This, IStream *a); HRESULT (STDMETHODCALLTYPE *SetAllSettingsWithNotify)( - ICodecAPI* This, + ICodecAPI *This, IStream *a, GUID **ChangedParam, ULONG *ChangedParamCount); END_INTERFACE } ICodecAPIVtbl; + interface ICodecAPI { CONST_VTBL ICodecAPIVtbl* lpVtbl; }; @@ -309,140 +316,6 @@ static FORCEINLINE HRESULT ICodecAPI_SetAllSettingsWithNotify(ICodecAPI* This,IS #endif -HRESULT STDMETHODCALLTYPE ICodecAPI_IsSupported_Proxy( - ICodecAPI* This, - const GUID *Api); -void __RPC_STUB ICodecAPI_IsSupported_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICodecAPI_IsModifiable_Proxy( - ICodecAPI* This, - const GUID *Api); -void __RPC_STUB ICodecAPI_IsModifiable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICodecAPI_GetParameterRange_Proxy( - ICodecAPI* This, - const GUID *Api, - VARIANT *ValueMin, - VARIANT *ValueMax, - VARIANT *SteppingDelta); -void __RPC_STUB ICodecAPI_GetParameterRange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICodecAPI_GetParameterValues_Proxy( - ICodecAPI* This, - const GUID *Api, - VARIANT **Values, - ULONG *ValuesCount); -void __RPC_STUB ICodecAPI_GetParameterValues_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICodecAPI_GetDefaultValue_Proxy( - ICodecAPI* This, - const GUID *Api, - VARIANT *Value); -void __RPC_STUB ICodecAPI_GetDefaultValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICodecAPI_GetValue_Proxy( - ICodecAPI* This, - const GUID *Api, - VARIANT *Value); -void __RPC_STUB ICodecAPI_GetValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICodecAPI_SetValue_Proxy( - ICodecAPI* This, - const GUID *Api, - VARIANT *Value); -void __RPC_STUB ICodecAPI_SetValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICodecAPI_RegisterForEvent_Proxy( - ICodecAPI* This, - const GUID *Api, - LONG_PTR userData); -void __RPC_STUB ICodecAPI_RegisterForEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICodecAPI_UnregisterForEvent_Proxy( - ICodecAPI* This, - const GUID *Api); -void __RPC_STUB ICodecAPI_UnregisterForEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICodecAPI_SetAllDefaults_Proxy( - ICodecAPI* This); -void __RPC_STUB ICodecAPI_SetAllDefaults_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICodecAPI_SetValueWithNotify_Proxy( - ICodecAPI* This, - const GUID *Api, - VARIANT *Value, - GUID **ChangedParam, - ULONG *ChangedParamCount); -void __RPC_STUB ICodecAPI_SetValueWithNotify_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICodecAPI_SetAllDefaultsWithNotify_Proxy( - ICodecAPI* This, - GUID **ChangedParam, - ULONG *ChangedParamCount); -void __RPC_STUB ICodecAPI_SetAllDefaultsWithNotify_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICodecAPI_GetAllSettings_Proxy( - ICodecAPI* This, - IStream *a); -void __RPC_STUB ICodecAPI_GetAllSettings_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICodecAPI_SetAllSettings_Proxy( - ICodecAPI* This, - IStream *a); -void __RPC_STUB ICodecAPI_SetAllSettings_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICodecAPI_SetAllSettingsWithNotify_Proxy( - ICodecAPI* This, - IStream *a, - GUID **ChangedParam, - ULONG *ChangedParamCount); -void __RPC_STUB ICodecAPI_SetAllSettingsWithNotify_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICodecAPI_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/iketypes.h b/lib/libc/include/any-windows-any/iketypes.h index 2638e72983..8572ff4a81 100644 --- a/lib/libc/include/any-windows-any/iketypes.h +++ b/lib/libc/include/any-windows-any/iketypes.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/iketypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/iketypes.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/inputscope.h b/lib/libc/include/any-windows-any/inputscope.h index 949c389d83..e0519894be 100644 --- a/lib/libc/include/any-windows-any/inputscope.h +++ b/lib/libc/include/any-windows-any/inputscope.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/inputscope.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/inputscope.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,6 +21,9 @@ #ifndef __ITfInputScope_FWD_DEFINED__ #define __ITfInputScope_FWD_DEFINED__ typedef interface ITfInputScope ITfInputScope; +#ifdef __cplusplus +interface ITfInputScope; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -136,41 +140,42 @@ typedef struct ITfInputScopeVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITfInputScope* This, + ITfInputScope *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITfInputScope* This); + ITfInputScope *This); ULONG (STDMETHODCALLTYPE *Release)( - ITfInputScope* This); + ITfInputScope *This); /*** ITfInputScope methods ***/ HRESULT (STDMETHODCALLTYPE *GetInputScopes)( - ITfInputScope* This, + ITfInputScope *This, InputScope **pprgInputScopes, UINT *pcCount); HRESULT (STDMETHODCALLTYPE *GetPhrase)( - ITfInputScope* This, + ITfInputScope *This, BSTR **ppbstrPhrases, UINT *pcCount); HRESULT (STDMETHODCALLTYPE *GetRegularExpression)( - ITfInputScope* This, + ITfInputScope *This, BSTR *pbstrRegExp); HRESULT (STDMETHODCALLTYPE *GetSRGS)( - ITfInputScope* This, + ITfInputScope *This, BSTR *pbstrSRGS); HRESULT (STDMETHODCALLTYPE *GetXML)( - ITfInputScope* This, + ITfInputScope *This, BSTR *pbstrXML); END_INTERFACE } ITfInputScopeVtbl; + interface ITfInputScope { CONST_VTBL ITfInputScopeVtbl* lpVtbl; }; @@ -219,48 +224,6 @@ static FORCEINLINE HRESULT ITfInputScope_GetXML(ITfInputScope* This,BSTR *pbstrX #endif -HRESULT STDMETHODCALLTYPE ITfInputScope_GetInputScopes_Proxy( - ITfInputScope* This, - InputScope **pprgInputScopes, - UINT *pcCount); -void __RPC_STUB ITfInputScope_GetInputScopes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITfInputScope_GetPhrase_Proxy( - ITfInputScope* This, - BSTR **ppbstrPhrases, - UINT *pcCount); -void __RPC_STUB ITfInputScope_GetPhrase_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITfInputScope_GetRegularExpression_Proxy( - ITfInputScope* This, - BSTR *pbstrRegExp); -void __RPC_STUB ITfInputScope_GetRegularExpression_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITfInputScope_GetSRGS_Proxy( - ITfInputScope* This, - BSTR *pbstrSRGS); -void __RPC_STUB ITfInputScope_GetSRGS_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITfInputScope_GetXML_Proxy( - ITfInputScope* This, - BSTR *pbstrXML); -void __RPC_STUB ITfInputScope_GetXML_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ITfInputScope_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/inspectable.h b/lib/libc/include/any-windows-any/inspectable.h index 9d38eca3e3..508f7acbd6 100644 --- a/lib/libc/include/any-windows-any/inspectable.h +++ b/lib/libc/include/any-windows-any/inspectable.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/inspectable.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/inspectable.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,6 +21,9 @@ #ifndef __IInspectable_FWD_DEFINED__ #define __IInspectable_FWD_DEFINED__ typedef interface IInspectable IInspectable; +#ifdef __cplusplus +interface IInspectable; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -68,32 +72,33 @@ typedef struct IInspectableVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInspectable* This, + IInspectable *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInspectable* This); + IInspectable *This); ULONG (STDMETHODCALLTYPE *Release)( - IInspectable* This); + IInspectable *This); /*** IInspectable methods ***/ HRESULT (STDMETHODCALLTYPE *GetIids)( - IInspectable* This, + IInspectable *This, ULONG *iidCount, IID **iids); HRESULT (STDMETHODCALLTYPE *GetRuntimeClassName)( - IInspectable* This, + IInspectable *This, HSTRING *className); HRESULT (STDMETHODCALLTYPE *GetTrustLevel)( - IInspectable* This, + IInspectable *This, TrustLevel *trustLevel); END_INTERFACE } IInspectableVtbl; + interface IInspectable { CONST_VTBL IInspectableVtbl* lpVtbl; }; @@ -134,31 +139,6 @@ static FORCEINLINE HRESULT IInspectable_GetTrustLevel(IInspectable* This,TrustLe #endif -HRESULT STDMETHODCALLTYPE IInspectable_GetIids_Proxy( - IInspectable* This, - ULONG *iidCount, - IID **iids); -void __RPC_STUB IInspectable_GetIids_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInspectable_GetRuntimeClassName_Proxy( - IInspectable* This, - HSTRING *className); -void __RPC_STUB IInspectable_GetRuntimeClassName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInspectable_GetTrustLevel_Proxy( - IInspectable* This, - TrustLevel *trustLevel); -void __RPC_STUB IInspectable_GetTrustLevel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInspectable_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/intsafe.h b/lib/libc/include/any-windows-any/intsafe.h index 5764d4eb8e..057c3796d0 100644 --- a/lib/libc/include/any-windows-any/intsafe.h +++ b/lib/libc/include/any-windows-any/intsafe.h @@ -46,29 +46,39 @@ together, and code using signed chars will not be affected. */ #endif #endif -#define __MINGW_INTSAFE_BODY(operation, x, y) \ +#define __MINGW_INTSAFE_BODY(operation, x, y, overflow) \ { \ if (__builtin_##operation##_overflow(x, y, result)) \ { \ - *result = 0; \ + *result = overflow; \ return INTSAFE_E_ARITHMETIC_OVERFLOW; \ } \ return S_OK; \ } +#define __MINGW_INTSAFE_CONV_UCHAR(name, type_src, type_dest) \ + HRESULT name(type_src operand, type_dest * result) \ + __MINGW_INTSAFE_BODY(add, operand, 0, 0) + #define __MINGW_INTSAFE_CONV(name, type_src, type_dest) \ HRESULT name(type_src operand, type_dest * result) \ - __MINGW_INTSAFE_BODY(add, operand, 0) + __MINGW_INTSAFE_BODY(add, operand, 0, ~0) #define __MINGW_INTSAFE_MATH(name, type, operation) \ HRESULT name(type x, type y, type * result) \ - __MINGW_INTSAFE_BODY(operation, x, y) + __MINGW_INTSAFE_BODY(operation, x, y, ~0) + +#ifdef __CHAR_UNSIGNED__ +#define __MINGW_INTSAFE_CONV_CHAR __MINGW_INTSAFE_CONV_UCHAR +#else +#define __MINGW_INTSAFE_CONV_CHAR __MINGW_INTSAFE_CONV +#endif __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UInt8ToInt8, UINT8, INT8) -__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV(UInt8ToChar, UINT8, CHAR) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(UInt8ToChar, UINT8, CHAR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ByteToInt8, BYTE, INT8) -__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV(ByteToChar, BYTE, CHAR) -__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int8ToUChar, INT8, UCHAR) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(ByteToChar, BYTE, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(Int8ToUChar, INT8, UCHAR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int8ToUInt8, INT8, UINT8) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int8ToUShort, INT8, USHORT) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int8ToUInt, INT8, UINT) @@ -76,17 +86,17 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int8ToULong, INT8, ULONG) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int8ToUIntPtr, INT8, UINT_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int8ToULongPtr, INT8, ULONG_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int8ToULongLong, INT8, ULONGLONG) -__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UShortToUChar, USHORT, UCHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(UShortToUChar, USHORT, UCHAR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UShortToUInt8, USHORT, UINT8) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UShortToByte, USHORT, BYTE) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UShortToInt8, USHORT, INT8) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UShortToShort, USHORT, SHORT) -__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV(UShortToChar, USHORT, CHAR) -__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(WordToUChar, WORD, UCHAR) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(UShortToChar, USHORT, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(WordToUChar, WORD, UCHAR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(WordToByte, WORD, BYTE) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(WordToShort, WORD, SHORT) -__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV(WordToChar, WORD, CHAR) -__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ShortToUChar, SHORT, UCHAR) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(WordToChar, WORD, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(ShortToUChar, SHORT, UCHAR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ShortToUInt8, SHORT, UINT8) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ShortToByte, SHORT, BYTE) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ShortToInt8, SHORT, INT8) @@ -98,8 +108,8 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ShortToUIntPtr, SHORT, UINT_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ShortToULongPtr, SHORT, ULONG_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ShortToDWordPtr, SHORT, DWORD_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ShortToULongLong, SHORT, ULONGLONG) -__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV(ShortToChar, SHORT, CHAR) -__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntToUChar, UINT, UCHAR) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(ShortToChar, SHORT, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(UIntToUChar, UINT, UCHAR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntToUInt8, UINT, UINT8) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntToByte, UINT, BYTE) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntToInt8, UINT, INT8) @@ -112,8 +122,8 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntToIntPtr, UINT, INT_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntToPtrdiffT, UINT, ptrdiff_t) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntToLongPtr, UINT, LONG_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntToSSIZET, UINT, SSIZE_T) -__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV(UIntToChar, UINT, CHAR) -__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongToUChar, ULONG, UCHAR) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(UIntToChar, UINT, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(ULongToUChar, ULONG, UCHAR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongToUInt8, ULONG, UINT8) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongToByte, ULONG, BYTE) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongToInt8, ULONG, INT8) @@ -129,7 +139,7 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongToPtrdiffT, ULONG, ptrdiff_t) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongToLongPtr, ULONG, LONG_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongToSSIZET, ULONG, SSIZE_T) __MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV(ULongToChar, ULONG, CHAR) -__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordToUChar, DWORD, UCHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(DWordToUChar, DWORD, UCHAR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordToByte, DWORD, BYTE) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordToUShort, DWORD, USHORT) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordToWord, DWORD, WORD) @@ -142,8 +152,8 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordToIntPtr, DWORD, INT_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordToPtrdiffT, DWORD, ptrdiff_t) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordToLongPtr, DWORD, LONG_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordToSSIZET, DWORD, SSIZE_T) -__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV(DWordToChar, DWORD, CHAR) -__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToUChar, LONG, UCHAR) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(DWordToChar, DWORD, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(LongToUChar, LONG, UCHAR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToUInt8, LONG, UINT8) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToByte, LONG, BYTE) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToInt8, LONG, INT8) @@ -161,8 +171,8 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToDWordPtr, LONG, DWORD_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToIntPtr, LONG, INT_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToPtrdiffT, LONG, ptrdiff_t) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongToULongLong, LONG, ULONGLONG) -__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV(LongToChar, LONG, CHAR) -__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntToUChar, INT, UCHAR) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(LongToChar, LONG, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(IntToUChar, INT, UCHAR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntToUInt8, INT, UINT8) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntToByte, INT, BYTE) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntToInt8, INT, INT8) @@ -177,8 +187,8 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntToSizeT, INT, size_t) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntToULongPtr, INT, ULONG_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntToDWordPtr, INT, DWORD_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntToULongLong, INT, ULONGLONG) -__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV(IntToChar, INT, CHAR) -__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToUChar, UINT_PTR, UCHAR) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(IntToChar, INT, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(UIntPtrToUChar, UINT_PTR, UCHAR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToUInt8, UINT_PTR, UINT8) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToInt8, UINT_PTR, INT8) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToUInt16, UINT_PTR, UINT16) @@ -195,7 +205,7 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToLongPtr, UINT_PTR, LONG_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToSSIZET, UINT_PTR, SSIZE_T) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToInt64, UINT_PTR, INT64) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToLongLong, UINT_PTR, LONGLONG) -__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV(UIntPtrToChar, UINT_PTR, CHAR) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(UIntPtrToChar, UINT_PTR, CHAR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SizeTToUInt, size_t, UINT) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SizeTToULong, size_t, ULONG) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SizeTToDWord, size_t, DWORD) @@ -206,7 +216,8 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SizeTToPtrdiffT, size_t, ptrdiff_t) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SizeTToLongPtr, size_t, LONG_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SizeTToSSIZET, size_t, SSIZE_T) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SizeTToInt64, size_t, INT64) -__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongPtrToUChar, ULONG_PTR, UCHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SizeTToUInt32, size_t, UINT32) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(ULongPtrToUChar, ULONG_PTR, UCHAR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongPtrToUInt8, ULONG_PTR, UINT8) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongPtrToInt8, ULONG_PTR, INT8) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongPtrToUShort, ULONG_PTR, USHORT) @@ -223,7 +234,7 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongPtrToLongPtr, ULONG_PTR, LONG_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongPtrToSSIZET, ULONG_PTR, SSIZE_T) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongPtrToInt64, ULONG_PTR, INT64) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongPtrToLongLong, ULONG_PTR, LONGLONG) -__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV(ULongPtrToChar, ULONG_PTR, CHAR) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(ULongPtrToChar, ULONG_PTR, CHAR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordPtrToUInt, DWORD_PTR, UINT) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordPtrToULong, DWORD_PTR, ULONG) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordPtrToDWord, DWORD_PTR, DWORD) @@ -235,7 +246,7 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordPtrToPtrdiffT, DWORD_PTR, ptrdiff_ __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordPtrToLongPtr, DWORD_PTR, LONG_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordPtrToSSIZET, DWORD_PTR, SSIZE_T) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordPtrToInt64, DWORD_PTR, INT64) -__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntPtrToUChar, INT_PTR, UCHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(IntPtrToUChar, INT_PTR, UCHAR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntPtrToUInt8, INT_PTR, UINT8) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntPtrToInt8, INT_PTR, INT8) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntPtrToUShort, INT_PTR, USHORT) @@ -251,7 +262,7 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntPtrToULongPtr, INT_PTR, ULONG_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntPtrToDWordPtr, INT_PTR, DWORD_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntPtrToLongPtr, INT_PTR, LONG_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(IntPtrToULongLong, INT_PTR, ULONGLONG) -__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV(IntPtrToChar, INT_PTR, CHAR) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(IntPtrToChar, INT_PTR, CHAR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToUInt, ptrdiff_t, UINT) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToULong, ptrdiff_t, ULONG) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToDWord, ptrdiff_t, DWORD) @@ -261,7 +272,7 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToUIntPtr, ptrdiff_t, UINT_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToSizeT, ptrdiff_t, size_t) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToULongPtr, ptrdiff_t, ULONG_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToDWordPtr, ptrdiff_t, DWORD_PTR) -__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongPtrToUChar, LONG_PTR, UCHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(LongPtrToUChar, LONG_PTR, UCHAR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongPtrToUInt8, LONG_PTR, UINT8) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongPtrToInt8, LONG_PTR, INT8) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongPtrToUShort, LONG_PTR, USHORT) @@ -277,7 +288,7 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongPtrToULongPtr, LONG_PTR, ULONG_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongPtrToDWordPtr, LONG_PTR, DWORD_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongPtrToIntPtr, LONG_PTR, INT_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongPtrToULongLong, LONG_PTR, ULONGLONG) -__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV(LongPtrToChar, LONG_PTR, CHAR) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(LongPtrToChar, LONG_PTR, CHAR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SSIZETToUInt, SSIZE_T, UINT) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SSIZETToULong, SSIZE_T, ULONG) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SSIZETToDWord, SSIZE_T, DWORD) @@ -288,7 +299,7 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SSIZETToSizeT, SSIZE_T, size_t) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SSIZETToULongPtr, SSIZE_T, ULONG_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SSIZETToDWordPtr, SSIZE_T, DWORD_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SSIZETToIntPtr, SSIZE_T, INT_PTR) -__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToUChar, ULONGLONG, UCHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(ULongLongToUChar, ULONGLONG, UCHAR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToUInt8, ULONGLONG, UINT8) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToInt8, ULONGLONG, INT8) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToUShort, ULONGLONG, USHORT) @@ -308,7 +319,7 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToLongPtr, ULONGLONG, LONG_PTR __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToSSIZET, ULONGLONG, SSIZE_T) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToInt64, ULONGLONG, INT64) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULongLongToLongLong, ULONGLONG, LONGLONG) -__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV(ULongLongToChar, ULONGLONG, CHAR) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(ULongLongToChar, ULONGLONG, CHAR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int64ToUInt, INT64, UINT) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int64ToULong, INT64, ULONG) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int64ToDWord, INT64, DWORD) @@ -323,7 +334,7 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int64ToPtrdiffT, INT64, ptrdiff_t) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int64ToLongPtr, INT64, LONG_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int64ToSSIZET, INT64, SSIZE_T) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int64ToULongLong, INT64, ULONGLONG) -__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongLongToUChar, LONGLONG, UCHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(LongLongToUChar, LONGLONG, UCHAR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongLongToUInt8, LONGLONG, UINT8) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongLongToInt8, LONGLONG, INT8) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongLongToUShort, LONGLONG, USHORT) @@ -335,7 +346,7 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongLongToInt, LONGLONG, INT) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongLongToIntPtr, LONGLONG, INT_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongLongToLongPtr, LONGLONG, LONG_PTR) __MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongLongToULongLong, LONGLONG, ULONGLONG) -__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV(LongLongToChar, LONGLONG, CHAR) +__MINGW_INTSAFE_CHAR_API __MINGW_INTSAFE_CONV_CHAR(LongLongToChar, LONGLONG, CHAR) __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(UInt8Add, UINT8, add) __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(Int8Add, INT8, add) diff --git a/lib/libc/include/any-windows-any/inttypes.h b/lib/libc/include/any-windows-any/inttypes.h index a30bdac1db..0a3abb879c 100644 --- a/lib/libc/include/any-windows-any/inttypes.h +++ b/lib/libc/include/any-windows-any/inttypes.h @@ -22,11 +22,6 @@ typedef struct { intmax_t rem; } imaxdiv_t; -/* Restore to !define(__USE_MINGW_ANSI_STDIO) */ -#include <_mingw_print_push.h> - -#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) - /* 7.8.1 Macros for format specifiers * * MS runtime does not yet understand C9x standard "ll" @@ -34,111 +29,120 @@ typedef struct { * The non-standard I64 length specifier causes warning in GCC, * but understood by MS runtime functions. */ +#if defined(_UCRT) || __USE_MINGW_ANSI_STDIO +#define PRId64 "lld" +#define PRIi64 "lli" +#define PRIo64 "llo" +#define PRIu64 "llu" +#define PRIx64 "llx" +#define PRIX64 "llX" +#else +#define PRId64 "I64d" +#define PRIi64 "I64i" +#define PRIo64 "I64o" +#define PRIu64 "I64u" +#define PRIx64 "I64x" +#define PRIX64 "I64X" +#endif /* fprintf macros for signed types */ #define PRId8 "d" #define PRId16 "d" #define PRId32 "d" -#define PRId64 "I64d" #define PRIdLEAST8 "d" #define PRIdLEAST16 "d" #define PRIdLEAST32 "d" -#define PRIdLEAST64 "I64d" +#define PRIdLEAST64 PRId64 #define PRIdFAST8 "d" #define PRIdFAST16 "d" #define PRIdFAST32 "d" -#define PRIdFAST64 "I64d" +#define PRIdFAST64 PRId64 -#define PRIdMAX "I64d" +#define PRIdMAX PRId64 #define PRIi8 "i" #define PRIi16 "i" #define PRIi32 "i" -#define PRIi64 "I64i" #define PRIiLEAST8 "i" #define PRIiLEAST16 "i" #define PRIiLEAST32 "i" -#define PRIiLEAST64 "I64i" +#define PRIiLEAST64 PRIi64 #define PRIiFAST8 "i" #define PRIiFAST16 "i" #define PRIiFAST32 "i" -#define PRIiFAST64 "I64i" +#define PRIiFAST64 PRIi64 -#define PRIiMAX "I64i" +#define PRIiMAX PRIi64 #define PRIo8 "o" #define PRIo16 "o" #define PRIo32 "o" -#define PRIo64 "I64o" #define PRIoLEAST8 "o" #define PRIoLEAST16 "o" #define PRIoLEAST32 "o" -#define PRIoLEAST64 "I64o" +#define PRIoLEAST64 PRIo64 #define PRIoFAST8 "o" #define PRIoFAST16 "o" #define PRIoFAST32 "o" -#define PRIoFAST64 "I64o" +#define PRIoFAST64 PRIo64 -#define PRIoMAX "I64o" +#define PRIoMAX PRIo64 /* fprintf macros for unsigned types */ #define PRIu8 "u" #define PRIu16 "u" #define PRIu32 "u" -#define PRIu64 "I64u" #define PRIuLEAST8 "u" #define PRIuLEAST16 "u" #define PRIuLEAST32 "u" -#define PRIuLEAST64 "I64u" +#define PRIuLEAST64 PRIu64 #define PRIuFAST8 "u" #define PRIuFAST16 "u" #define PRIuFAST32 "u" -#define PRIuFAST64 "I64u" +#define PRIuFAST64 PRIu64 -#define PRIuMAX "I64u" +#define PRIuMAX PRIu64 #define PRIx8 "x" #define PRIx16 "x" #define PRIx32 "x" -#define PRIx64 "I64x" #define PRIxLEAST8 "x" #define PRIxLEAST16 "x" #define PRIxLEAST32 "x" -#define PRIxLEAST64 "I64x" +#define PRIxLEAST64 PRIx64 #define PRIxFAST8 "x" #define PRIxFAST16 "x" #define PRIxFAST32 "x" -#define PRIxFAST64 "I64x" +#define PRIxFAST64 PRIx64 -#define PRIxMAX "I64x" +#define PRIxMAX PRIx64 #define PRIX8 "X" #define PRIX16 "X" #define PRIX32 "X" -#define PRIX64 "I64X" #define PRIXLEAST8 "X" #define PRIXLEAST16 "X" #define PRIXLEAST32 "X" -#define PRIXLEAST64 "I64X" +#define PRIXLEAST64 PRIX64 #define PRIXFAST8 "X" #define PRIXFAST16 "X" #define PRIXFAST32 "X" -#define PRIXFAST64 "I64X" +#define PRIXFAST64 PRIX64 -#define PRIXMAX "I64X" +#define PRIXMAX PRIX64 /* * fscanf macros for signed int types @@ -149,88 +153,88 @@ typedef struct { #define SCNd16 "hd" #define SCNd32 "d" -#define SCNd64 "I64d" +#define SCNd64 PRId64 #define SCNdLEAST16 "hd" #define SCNdLEAST32 "d" -#define SCNdLEAST64 "I64d" +#define SCNdLEAST64 PRId64 #define SCNdFAST16 "hd" #define SCNdFAST32 "d" -#define SCNdFAST64 "I64d" +#define SCNdFAST64 PRId64 -#define SCNdMAX "I64d" +#define SCNdMAX PRId64 #define SCNi16 "hi" #define SCNi32 "i" -#define SCNi64 "I64i" +#define SCNi64 PRIi64 #define SCNiLEAST16 "hi" #define SCNiLEAST32 "i" -#define SCNiLEAST64 "I64i" +#define SCNiLEAST64 PRIi64 #define SCNiFAST16 "hi" #define SCNiFAST32 "i" -#define SCNiFAST64 "I64i" +#define SCNiFAST64 PRIi64 -#define SCNiMAX "I64i" +#define SCNiMAX PRIi64 #define SCNo16 "ho" #define SCNo32 "o" -#define SCNo64 "I64o" +#define SCNo64 PRIo64 #define SCNoLEAST16 "ho" #define SCNoLEAST32 "o" -#define SCNoLEAST64 "I64o" +#define SCNoLEAST64 PRIo64 #define SCNoFAST16 "ho" #define SCNoFAST32 "o" -#define SCNoFAST64 "I64o" +#define SCNoFAST64 PRIo64 -#define SCNoMAX "I64o" +#define SCNoMAX PRIo64 #define SCNx16 "hx" #define SCNx32 "x" -#define SCNx64 "I64x" +#define SCNx64 PRIx64 #define SCNxLEAST16 "hx" #define SCNxLEAST32 "x" -#define SCNxLEAST64 "I64x" +#define SCNxLEAST64 PRIx64 #define SCNxFAST16 "hx" #define SCNxFAST32 "x" -#define SCNxFAST64 "I64x" +#define SCNxFAST64 PRIx64 -#define SCNxMAX "I64x" +#define SCNxMAX PRIx64 /* fscanf macros for unsigned int types */ #define SCNu16 "hu" #define SCNu32 "u" -#define SCNu64 "I64u" +#define SCNu64 PRIu64 #define SCNuLEAST16 "hu" #define SCNuLEAST32 "u" -#define SCNuLEAST64 "I64u" +#define SCNuLEAST64 PRIu64 #define SCNuFAST16 "hu" #define SCNuFAST32 "u" -#define SCNuFAST64 "I64u" +#define SCNuFAST64 PRIu64 -#define SCNuMAX "I64u" +#define SCNuMAX PRIu64 #ifdef _WIN64 -#define PRIdPTR "I64d" -#define PRIiPTR "I64i" -#define PRIoPTR "I64o" -#define PRIuPTR "I64u" -#define PRIxPTR "I64x" -#define PRIXPTR "I64X" -#define SCNdPTR "I64d" -#define SCNiPTR "I64i" -#define SCNoPTR "I64o" -#define SCNxPTR "I64x" -#define SCNuPTR "I64u" +#define PRIdPTR PRId64 +#define PRIiPTR PRIi64 +#define PRIoPTR PRIo64 +#define PRIuPTR PRIu64 +#define PRIxPTR PRIx64 +#define PRIXPTR PRIX64 +#define SCNdPTR PRId64 +#define SCNiPTR PRIi64 +#define SCNoPTR PRIo64 +#define SCNxPTR PRIx64 +#define SCNuPTR PRIu64 #else #define PRIdPTR "d" #define PRIiPTR "i" @@ -274,8 +278,6 @@ typedef struct { #define SCNuFAST8 "hhu" #endif /* __STDC_VERSION__ >= 199901 */ -#endif /* !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) */ - intmax_t __cdecl imaxabs (intmax_t j); #ifndef __CRT__NO_INLINE __CRT_INLINE intmax_t __cdecl imaxabs (intmax_t j) @@ -295,9 +297,6 @@ intmax_t __cdecl wcstoimax (const wchar_t* __restrict__ nptr, uintmax_t __cdecl wcstoumax (const wchar_t* __restrict__ nptr, wchar_t** __restrict__ endptr, int base); -/* Set PRI... and SCN... according to __USE_MINGW_ANSI_STDIO. */ -#include <_mingw_print_pop.h> - #ifdef __cplusplus } #endif diff --git a/lib/libc/include/any-windows-any/io.h b/lib/libc/include/any-windows-any/io.h index a7cc5fc47e..b0f5d2b8d0 100644 --- a/lib/libc/include/any-windows-any/io.h +++ b/lib/libc/include/any-windows-any/io.h @@ -365,13 +365,122 @@ unsigned int alarm(unsigned int seconds); /* Old versions of MSVCRT access() just ignored X_OK, while the version shipped with Vista, returns an error code. This will restore the old behaviour */ -static inline int __mingw_access (const char *__fname, int __mode) { - return _access (__fname, __mode & ~X_OK); -} +int __cdecl __mingw_access (const char *__fname, int __mode); #define access(__f,__m) __mingw_access (__f, __m) #endif +#if __MINGW_FORTIFY_LEVEL > 0 + +_CRTIMP int __cdecl __mingw_call__read(int, void *, unsigned int) __MINGW_ASM_CRT_CALL(_read); + +__mingw_bos_extern_ovr +int _read(int __fh, void * __dst, unsigned int __n) +{ + __mingw_bos_ptr_chk_warn(__dst, __n, 0); + return __mingw_call__read(__fh, __dst, __n); +} + +#ifndef NO_OLDNAMES +__mingw_bos_extern_ovr +int read(int __fh, void * __dst, unsigned int __n) +{ + return _read(__fh, __dst, __n); +} +#endif + +#if __MINGW_FORTIFY_VA_ARG + +#define _O_CREAT 0x0100 + +_CRTIMP int __cdecl __mingw_call__open(const char *, int, ...) __MINGW_ASM_CRT_CALL(_open); +_CRTIMP int __cdecl __mingw_call__open_warn_toomany(const char *, int, ...) __MINGW_ASM_CRT_CALL(_open) + __attribute__((__warning__("_open(): too many arguments"))); +_CRTIMP int __cdecl __mingw_call__open_warn_missing(const char *, int, ...) __MINGW_ASM_CRT_CALL(_open) + __attribute__((__warning__("_open(..._O_CREAT...): missing argument"))); + +__mingw_bos_extern_ovr +int _open(const char * __filename, int __flags, ...) +{ + if (__builtin_va_arg_pack_len() > 1) + return __mingw_call__open_warn_toomany(__filename, __flags, __builtin_va_arg_pack()); + if (__builtin_va_arg_pack_len() < 1 && __builtin_constant_p(__flags) && (__flags & _O_CREAT)) + return __mingw_call__open_warn_missing(__filename, __flags, 0); + if (__builtin_va_arg_pack_len() < 1) + return __mingw_call__open(__filename, __flags, 0); + return __mingw_call__open(__filename, __flags, __builtin_va_arg_pack()); +} + +_CRTIMP int __cdecl __mingw_call__sopen(const char *, int, int, ...) __MINGW_ASM_CRT_CALL(_sopen); +_CRTIMP int __cdecl __mingw_call__sopen_warn_toomany(const char *, int, int, ...) __MINGW_ASM_CRT_CALL(_sopen) + __attribute__((__warning__("_sopen(): too many arguments"))); +_CRTIMP int __cdecl __mingw_call__sopen_warn_missing(const char *, int, int, ...) __MINGW_ASM_CRT_CALL(_sopen) + __attribute__((__warning__("_sopen(..._O_CREAT...): missing argument"))); + +__mingw_bos_extern_ovr +int _sopen(const char * __filename, int __flags, int __share, ...) +{ + if (__builtin_va_arg_pack_len() > 1) + return __mingw_call__sopen_warn_toomany(__filename, __flags, __share, __builtin_va_arg_pack()); + if (__builtin_va_arg_pack_len() < 1 && __builtin_constant_p(__flags) && (__flags & _O_CREAT)) + return __mingw_call__sopen_warn_missing(__filename, __flags, __share, 0); + if (__builtin_va_arg_pack_len() < 1) + return __mingw_call__sopen(__filename, __flags, __share, 0); + return __mingw_call__sopen(__filename, __flags, __share, __builtin_va_arg_pack()); +} + +_CRTIMP int __cdecl __mingw_call__wopen(const wchar_t *, int, ...) __MINGW_ASM_CRT_CALL(_wopen); +_CRTIMP int __cdecl __mingw_call__wopen_warn_toomany(const wchar_t *, int, ...) __MINGW_ASM_CRT_CALL(_wopen) + __attribute__((__warning__("_wopen(): too many arguments"))); +_CRTIMP int __cdecl __mingw_call__wopen_warn_missing(const wchar_t *, int, ...) __MINGW_ASM_CRT_CALL(_wopen) + __attribute__((__warning__("_wopen(..._O_CREAT...): missing argument"))); + +__mingw_bos_extern_ovr +int _wopen(const wchar_t * __filename, int __flags, ...) +{ + if (__builtin_va_arg_pack_len() > 1) + return __mingw_call__wopen_warn_toomany(__filename, __flags, __builtin_va_arg_pack()); + if (__builtin_va_arg_pack_len() < 1 && __builtin_constant_p(__flags) && (__flags & _O_CREAT)) + return __mingw_call__wopen_warn_missing(__filename, __flags, 0); + if (__builtin_va_arg_pack_len() < 1) + return __mingw_call__wopen(__filename, __flags, 0); + return __mingw_call__wopen(__filename, __flags, __builtin_va_arg_pack()); +} + +_CRTIMP int __cdecl __mingw_call__wsopen(const wchar_t *, int, int, ...) __MINGW_ASM_CRT_CALL(_wsopen); +_CRTIMP int __cdecl __mingw_call__wsopen_warn_toomany(const wchar_t *, int, int, ...) __MINGW_ASM_CRT_CALL(_wsopen) + __attribute__((__warning__("_wsopen(): too many arguments"))); +_CRTIMP int __cdecl __mingw_call__wsopen_warn_missing(const wchar_t *, int, int, ...) __MINGW_ASM_CRT_CALL(_wsopen) + __attribute__((__warning__("_wsopen(..._O_CREAT...): missing argument"))); + +__mingw_bos_extern_ovr +int _wsopen(const wchar_t * __filename, int __flags, int __share, ...) +{ + if (__builtin_va_arg_pack_len() > 1) + return __mingw_call__wsopen_warn_toomany(__filename, __flags, __share, __builtin_va_arg_pack()); + if (__builtin_va_arg_pack_len() < 1 && __builtin_constant_p(__flags) && (__flags & _O_CREAT)) + return __mingw_call__wsopen_warn_missing(__filename, __flags, __share, 0); + if (__builtin_va_arg_pack_len() < 1) + return __mingw_call__wsopen(__filename, __flags, __share, 0); + return __mingw_call__wsopen(__filename, __flags, __share, __builtin_va_arg_pack()); +} + +#ifndef NO_OLDNAMES +__mingw_bos_extern_ovr +int open(const char * __filename, int __flags, ...) +{ + return _open(__filename, __flags, __builtin_va_arg_pack()); +} + +__mingw_bos_extern_ovr +int sopen(const char * __filename, int __flags, int __share, ...) +{ + return _sopen(__filename, __flags, __share, __builtin_va_arg_pack()); +} +#endif + +#endif /* __MINGW_FORTIFY_VA_ARG */ +#endif /* __MINGW_FORTIFY_LEVEL > 0 */ #ifdef __cplusplus } diff --git a/lib/libc/include/any-windows-any/ioapiset.h b/lib/libc/include/any-windows-any/ioapiset.h index f8953b0581..d7f6606be3 100644 --- a/lib/libc/include/any-windows-any/ioapiset.h +++ b/lib/libc/include/any-windows-any/ioapiset.h @@ -14,22 +14,27 @@ extern "C" { #endif -#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= _WIN32_WINNT_WIN10 WINBASEAPI WINBOOL WINAPI GetOverlappedResult (HANDLE hFile, LPOVERLAPPED lpOverlapped, LPDWORD lpNumberOfBytesTransferred, WINBOOL bWait); WINBASEAPI HANDLE WINAPI CreateIoCompletionPort (HANDLE FileHandle, HANDLE ExistingCompletionPort, ULONG_PTR CompletionKey, DWORD NumberOfConcurrentThreads); WINBASEAPI WINBOOL WINAPI GetQueuedCompletionStatus (HANDLE CompletionPort, LPDWORD lpNumberOfBytesTransferred, PULONG_PTR lpCompletionKey, LPOVERLAPPED *lpOverlapped, DWORD dwMilliseconds); WINBASEAPI WINBOOL WINAPI PostQueuedCompletionStatus (HANDLE CompletionPort, DWORD dwNumberOfBytesTransferred, ULONG_PTR dwCompletionKey, LPOVERLAPPED lpOverlapped); WINBASEAPI WINBOOL WINAPI DeviceIoControl (HANDLE hDevice, DWORD dwIoControlCode, LPVOID lpInBuffer, DWORD nInBufferSize, LPVOID lpOutBuffer, DWORD nOutBufferSize, LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped); WINBASEAPI WINBOOL WINAPI CancelIo (HANDLE hFile); + WINBASEAPI WINBOOL WINAPI GetOverlappedResultEx (HANDLE hFile, LPOVERLAPPED lpOverlapped, LPDWORD lpNumberOfBytesTransferred, DWORD dwMilliseconds, WINBOOL bAlertable); #if _WIN32_WINNT >= 0x0600 WINBASEAPI WINBOOL WINAPI GetQueuedCompletionStatusEx (HANDLE CompletionPort, LPOVERLAPPED_ENTRY lpCompletionPortEntries, ULONG ulCount, PULONG ulNumEntriesRemoved, DWORD dwMilliseconds, WINBOOL fAlertable); WINBASEAPI WINBOOL WINAPI CancelIoEx (HANDLE hFile, LPOVERLAPPED lpOverlapped); - WINBASEAPI WINBOOL WINAPI CancelSynchronousIo (HANDLE hThread); +#if _WIN32_WINNT >= _WIN32_WINNT_WIN8 + WINBASEAPI WINBOOL WINAPI GetOverlappedResultEx (HANDLE hFile, LPOVERLAPPED lpOverlapped, LPDWORD lpNumberOfBytesTransferred, DWORD dwMilliseconds, WINBOOL bAlertable); +#endif #endif #endif #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP) - WINBASEAPI WINBOOL WINAPI GetOverlappedResultEx (HANDLE hFile, LPOVERLAPPED lpOverlapped, LPDWORD lpNumberOfBytesTransferred, DWORD dwMilliseconds, WINBOOL bAlertable); +#if _WIN32_WINNT >= 0x0600 + WINBASEAPI WINBOOL WINAPI CancelSynchronousIo (HANDLE hThread); +#endif #endif #ifdef __cplusplus diff --git a/lib/libc/include/any-windows-any/libloaderapi.h b/lib/libc/include/any-windows-any/libloaderapi.h index ee002d90a2..ccb6efb844 100644 --- a/lib/libc/include/any-windows-any/libloaderapi.h +++ b/lib/libc/include/any-windows-any/libloaderapi.h @@ -69,6 +69,17 @@ extern "C" { #define LOAD_LIBRARY_SEARCH_SYSTEM32 0x800 #define LOAD_LIBRARY_SEARCH_DEFAULT_DIRS 0x1000 +#if (NTDDI_VERSION >= NTDDI_WIN10_RS1) +#define LOAD_LIBRARY_SAFE_CURRENT_DIRS 0x00002000 +#define LOAD_LIBRARY_SEARCH_SYSTEM32_NO_FORWARDER 0x00004000 +#else +#define LOAD_LIBRARY_SEARCH_SYSTEM32_NO_FORWARDER LOAD_LIBRARY_SEARCH_SYSTEM32 +#endif + +#if (NTDDI_VERSION >= NTDDI_WIN10_RS2) +#define LOAD_LIBRARY_OS_INTEGRITY_CONTINUITY 0x00008000 +#endif + #define GET_MODULE_HANDLE_EX_FLAG_PIN (0x1) #define GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT (0x2) #define GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS (0x4) @@ -77,11 +88,15 @@ extern "C" { #define ENUMRESNAMEPROC __MINGW_NAME_AW(ENUMRESNAMEPROC) #define ENUMRESTYPEPROC __MINGW_NAME_AW(ENUMRESTYPEPROC) + WINBASEAPI WINBOOL WINAPI EnumResourceNamesW(HMODULE hModule, LPCWSTR lpType, ENUMRESNAMEPROCW lpEnumFunc, LONG_PTR lParam); + WINBASEAPI HRSRC WINAPI FindResourceW(HMODULE hModule, LPCWSTR lpName, LPCWSTR lpType); WINBASEAPI HRSRC WINAPI FindResourceExW (HMODULE hModule, LPCWSTR lpType, LPCWSTR lpName, WORD wLanguage); WINBASEAPI DECLSPEC_NORETURN VOID WINAPI FreeLibraryAndExitThread (HMODULE hLibModule, DWORD dwExitCode); WINBASEAPI WINBOOL WINAPI FreeResource (HGLOBAL hResData); WINBASEAPI HMODULE WINAPI GetModuleHandleA (LPCSTR lpModuleName); WINBASEAPI HMODULE WINAPI GetModuleHandleW (LPCWSTR lpModuleName); + WINBASEAPI HMODULE WINAPI LoadLibraryA(LPCSTR lpLibFileName); + WINBASEAPI HMODULE WINAPI LoadLibraryW(LPCWSTR lpLibFileName); WINBASEAPI HMODULE WINAPI LoadLibraryExA (LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags); WINBASEAPI HMODULE WINAPI LoadLibraryExW (LPCWSTR lpLibFileName, HANDLE hFile, DWORD dwFlags); WINBASEAPI HGLOBAL WINAPI LoadResource (HMODULE hModule, HRSRC hResInfo); @@ -95,15 +110,17 @@ extern "C" { WINBASEAPI WINBOOL WINAPI GetModuleHandleExA (DWORD dwFlags, LPCSTR lpModuleName, HMODULE *phModule); WINBASEAPI WINBOOL WINAPI GetModuleHandleExW (DWORD dwFlags, LPCWSTR lpModuleName, HMODULE *phModule); -#define PGET_MODULE_HANDLE_EX __MINGW_NAME_AW(PGET_MODULE_HANDLE_EX) -#define GetModuleHandleEx __MINGW_NAME_AW(GetModuleHandleEx) - #ifdef UNICODE +#define EnumResourceNames EnumResourceNamesW +#define FindResource FindResourceW #define FindResourceEx FindResourceExW #endif +#define PGET_MODULE_HANDLE_EX __MINGW_NAME_AW(PGET_MODULE_HANDLE_EX) #define LoadString __MINGW_NAME_AW(LoadString) #define GetModuleHandle __MINGW_NAME_AW(GetModuleHandle) +#define GetModuleHandleEx __MINGW_NAME_AW(GetModuleHandleEx) +#define LoadLibrary __MINGW_NAME_AW(LoadLibrary) #define LoadLibraryEx __MINGW_NAME_AW(LoadLibraryEx) #define EnumResourceLanguages __MINGW_NAME_AW(EnumResourceLanguages) @@ -138,6 +155,24 @@ WINBASEAPI HMODULE WINAPI GetModuleHandleW (LPCWSTR lpModuleName); WINBASEAPI DWORD WINAPI GetModuleFileNameW (HMODULE hModule, LPWSTR lpFilename, DWORD nSize); #define GetModuleFileName __MINGW_NAME_AW(GetModuleFileName) +#define CURRENT_IMPORT_REDIRECTION_VERSION 1 + +typedef struct _REDIRECTION_FUNCTION_DESCRIPTOR { + PCSTR DllName; + PCSTR FunctionName; + PVOID RedirectionTarget; +} REDIRECTION_FUNCTION_DESCRIPTOR, *PREDIRECTION_FUNCTION_DESCRIPTOR; + +typedef const REDIRECTION_FUNCTION_DESCRIPTOR *PCREDIRECTION_FUNCTION_DESCRIPTOR; + +typedef struct _REDIRECTION_DESCRIPTOR { + ULONG Version; + ULONG FunctionCount; + PCREDIRECTION_FUNCTION_DESCRIPTOR Redirections; +} REDIRECTION_DESCRIPTOR, *PREDIRECTION_DESCRIPTOR; + +typedef const REDIRECTION_DESCRIPTOR *PCREDIRECTION_DESCRIPTOR; + #if WINVER >= 0x0601 WINBASEAPI int WINAPI FindStringOrdinal (DWORD dwFindStringOrdinalFlags, LPCWSTR lpStringSource, int cchSource, LPCWSTR lpStringValue, int cchValue, WINBOOL bIgnoreCase); #endif diff --git a/lib/libc/include/any-windows-any/libloaderapi2.h b/lib/libc/include/any-windows-any/libloaderapi2.h new file mode 100644 index 0000000000..00df6ae723 --- /dev/null +++ b/lib/libc/include/any-windows-any/libloaderapi2.h @@ -0,0 +1,30 @@ +/** + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. + */ +#ifndef _APISETLIBLOADER2_ +#define _APISETLIBLOADER2_ + +#include +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP) +#if (_WIN32_WINNT >= 0x0602) + + WINBASEAPI HMODULE WINAPI LoadPackagedLibrary(LPCWSTR lpwLibFileName, DWORD Reserved); + WINBASEAPI WINBOOL WINAPI QueryOptionalDelayLoadedAPI(HMODULE hParentModule, LPCSTR lpDllName, LPCSTR lpProcName, DWORD Reserved); + +#endif +#endif + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/lib/libc/include/any-windows-any/locale.h b/lib/libc/include/any-windows-any/locale.h index 1f588e8583..336429fbaf 100644 --- a/lib/libc/include/any-windows-any/locale.h +++ b/lib/libc/include/any-windows-any/locale.h @@ -80,8 +80,8 @@ extern "C" { char *__cdecl setlocale(int _Category,const char *_Locale); _CRTIMP struct lconv *__cdecl localeconv(void); _CRTIMP _locale_t __cdecl _get_current_locale(void); - _locale_t __cdecl _create_locale(int _Category,const char *_Locale); - void __cdecl _free_locale(_locale_t _Locale); + _CRTIMP _locale_t __cdecl _create_locale(int _Category,const char *_Locale); + _CRTIMP void __cdecl _free_locale(_locale_t _Locale); _locale_t __cdecl __get_current_locale(void); _locale_t __cdecl __create_locale(int _Category,const char *_Locale); void __cdecl __free_locale(_locale_t _Locale); diff --git a/lib/libc/include/any-windows-any/locationapi.h b/lib/libc/include/any-windows-any/locationapi.h index 55a7dc5827..6f6dd6e46b 100644 --- a/lib/libc/include/any-windows-any/locationapi.h +++ b/lib/libc/include/any-windows-any/locationapi.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/locationapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/locationapi.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,31 +21,49 @@ #ifndef __ILocationReport_FWD_DEFINED__ #define __ILocationReport_FWD_DEFINED__ typedef interface ILocationReport ILocationReport; +#ifdef __cplusplus +interface ILocationReport; +#endif /* __cplusplus */ #endif #ifndef __ICivicAddressReport_FWD_DEFINED__ #define __ICivicAddressReport_FWD_DEFINED__ typedef interface ICivicAddressReport ICivicAddressReport; +#ifdef __cplusplus +interface ICivicAddressReport; +#endif /* __cplusplus */ #endif #ifndef __ILatLongReport_FWD_DEFINED__ #define __ILatLongReport_FWD_DEFINED__ typedef interface ILatLongReport ILatLongReport; +#ifdef __cplusplus +interface ILatLongReport; +#endif /* __cplusplus */ #endif #ifndef __IDefaultLocation_FWD_DEFINED__ #define __IDefaultLocation_FWD_DEFINED__ typedef interface IDefaultLocation IDefaultLocation; +#ifdef __cplusplus +interface IDefaultLocation; +#endif /* __cplusplus */ #endif #ifndef __ILocationEvents_FWD_DEFINED__ #define __ILocationEvents_FWD_DEFINED__ typedef interface ILocationEvents ILocationEvents; +#ifdef __cplusplus +interface ILocationEvents; +#endif /* __cplusplus */ #endif #ifndef __ILocation_FWD_DEFINED__ #define __ILocation_FWD_DEFINED__ typedef interface ILocation ILocation; +#ifdef __cplusplus +interface ILocation; +#endif /* __cplusplus */ #endif #ifndef __Location_FWD_DEFINED__ @@ -105,32 +124,33 @@ typedef struct ILocationReportVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ILocationReport* This, + ILocationReport *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ILocationReport* This); + ILocationReport *This); ULONG (STDMETHODCALLTYPE *Release)( - ILocationReport* This); + ILocationReport *This); /*** ILocationReport methods ***/ HRESULT (STDMETHODCALLTYPE *GetSensorID)( - ILocationReport* This, + ILocationReport *This, SENSOR_ID *pSensorID); HRESULT (STDMETHODCALLTYPE *GetTimestamp)( - ILocationReport* This, + ILocationReport *This, SYSTEMTIME *pCreationTime); HRESULT (STDMETHODCALLTYPE *GetValue)( - ILocationReport* This, + ILocationReport *This, REFPROPERTYKEY pKey, PROPVARIANT *pValue); END_INTERFACE } ILocationReportVtbl; + interface ILocationReport { CONST_VTBL ILocationReportVtbl* lpVtbl; }; @@ -171,31 +191,6 @@ static FORCEINLINE HRESULT ILocationReport_GetValue(ILocationReport* This,REFPRO #endif -HRESULT STDMETHODCALLTYPE ILocationReport_GetSensorID_Proxy( - ILocationReport* This, - SENSOR_ID *pSensorID); -void __RPC_STUB ILocationReport_GetSensorID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ILocationReport_GetTimestamp_Proxy( - ILocationReport* This, - SYSTEMTIME *pCreationTime); -void __RPC_STUB ILocationReport_GetTimestamp_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ILocationReport_GetValue_Proxy( - ILocationReport* This, - REFPROPERTYKEY pKey, - PROPVARIANT *pValue); -void __RPC_STUB ILocationReport_GetValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ILocationReport_INTERFACE_DEFINED__ */ @@ -241,61 +236,62 @@ typedef struct ICivicAddressReportVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICivicAddressReport* This, + ICivicAddressReport *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICivicAddressReport* This); + ICivicAddressReport *This); ULONG (STDMETHODCALLTYPE *Release)( - ICivicAddressReport* This); + ICivicAddressReport *This); /*** ILocationReport methods ***/ HRESULT (STDMETHODCALLTYPE *GetSensorID)( - ICivicAddressReport* This, + ICivicAddressReport *This, SENSOR_ID *pSensorID); HRESULT (STDMETHODCALLTYPE *GetTimestamp)( - ICivicAddressReport* This, + ICivicAddressReport *This, SYSTEMTIME *pCreationTime); HRESULT (STDMETHODCALLTYPE *GetValue)( - ICivicAddressReport* This, + ICivicAddressReport *This, REFPROPERTYKEY pKey, PROPVARIANT *pValue); /*** ICivicAddressReport methods ***/ HRESULT (STDMETHODCALLTYPE *GetAddressLine1)( - ICivicAddressReport* This, + ICivicAddressReport *This, BSTR *pbstrAddress1); HRESULT (STDMETHODCALLTYPE *GetAddressLine2)( - ICivicAddressReport* This, + ICivicAddressReport *This, BSTR *pbstrAddress2); HRESULT (STDMETHODCALLTYPE *GetCity)( - ICivicAddressReport* This, + ICivicAddressReport *This, BSTR *pbstrCity); HRESULT (STDMETHODCALLTYPE *GetStateProvince)( - ICivicAddressReport* This, + ICivicAddressReport *This, BSTR *pbstrStateProvince); HRESULT (STDMETHODCALLTYPE *GetPostalCode)( - ICivicAddressReport* This, + ICivicAddressReport *This, BSTR *pbstrPostalCode); HRESULT (STDMETHODCALLTYPE *GetCountryRegion)( - ICivicAddressReport* This, + ICivicAddressReport *This, BSTR *pbstrCountryRegion); HRESULT (STDMETHODCALLTYPE *GetDetailLevel)( - ICivicAddressReport* This, + ICivicAddressReport *This, DWORD *pDetailLevel); END_INTERFACE } ICivicAddressReportVtbl; + interface ICivicAddressReport { CONST_VTBL ICivicAddressReportVtbl* lpVtbl; }; @@ -366,62 +362,6 @@ static FORCEINLINE HRESULT ICivicAddressReport_GetDetailLevel(ICivicAddressRepor #endif -HRESULT STDMETHODCALLTYPE ICivicAddressReport_GetAddressLine1_Proxy( - ICivicAddressReport* This, - BSTR *pbstrAddress1); -void __RPC_STUB ICivicAddressReport_GetAddressLine1_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICivicAddressReport_GetAddressLine2_Proxy( - ICivicAddressReport* This, - BSTR *pbstrAddress2); -void __RPC_STUB ICivicAddressReport_GetAddressLine2_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICivicAddressReport_GetCity_Proxy( - ICivicAddressReport* This, - BSTR *pbstrCity); -void __RPC_STUB ICivicAddressReport_GetCity_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICivicAddressReport_GetStateProvince_Proxy( - ICivicAddressReport* This, - BSTR *pbstrStateProvince); -void __RPC_STUB ICivicAddressReport_GetStateProvince_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICivicAddressReport_GetPostalCode_Proxy( - ICivicAddressReport* This, - BSTR *pbstrPostalCode); -void __RPC_STUB ICivicAddressReport_GetPostalCode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICivicAddressReport_GetCountryRegion_Proxy( - ICivicAddressReport* This, - BSTR *pbstrCountryRegion); -void __RPC_STUB ICivicAddressReport_GetCountryRegion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICivicAddressReport_GetDetailLevel_Proxy( - ICivicAddressReport* This, - DWORD *pDetailLevel); -void __RPC_STUB ICivicAddressReport_GetDetailLevel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICivicAddressReport_INTERFACE_DEFINED__ */ @@ -461,53 +401,54 @@ typedef struct ILatLongReportVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ILatLongReport* This, + ILatLongReport *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ILatLongReport* This); + ILatLongReport *This); ULONG (STDMETHODCALLTYPE *Release)( - ILatLongReport* This); + ILatLongReport *This); /*** ILocationReport methods ***/ HRESULT (STDMETHODCALLTYPE *GetSensorID)( - ILatLongReport* This, + ILatLongReport *This, SENSOR_ID *pSensorID); HRESULT (STDMETHODCALLTYPE *GetTimestamp)( - ILatLongReport* This, + ILatLongReport *This, SYSTEMTIME *pCreationTime); HRESULT (STDMETHODCALLTYPE *GetValue)( - ILatLongReport* This, + ILatLongReport *This, REFPROPERTYKEY pKey, PROPVARIANT *pValue); /*** ILatLongReport methods ***/ HRESULT (STDMETHODCALLTYPE *GetLatitude)( - ILatLongReport* This, + ILatLongReport *This, DOUBLE *pLatitude); HRESULT (STDMETHODCALLTYPE *GetLongitude)( - ILatLongReport* This, + ILatLongReport *This, DOUBLE *pLongitude); HRESULT (STDMETHODCALLTYPE *GetErrorRadius)( - ILatLongReport* This, + ILatLongReport *This, DOUBLE *pErrorRadius); HRESULT (STDMETHODCALLTYPE *GetAltitude)( - ILatLongReport* This, + ILatLongReport *This, DOUBLE *pAltitude); HRESULT (STDMETHODCALLTYPE *GetAltitudeError)( - ILatLongReport* This, + ILatLongReport *This, DOUBLE *pAltitudeError); END_INTERFACE } ILatLongReportVtbl; + interface ILatLongReport { CONST_VTBL ILatLongReportVtbl* lpVtbl; }; @@ -570,46 +511,6 @@ static FORCEINLINE HRESULT ILatLongReport_GetAltitudeError(ILatLongReport* This, #endif -HRESULT STDMETHODCALLTYPE ILatLongReport_GetLatitude_Proxy( - ILatLongReport* This, - DOUBLE *pLatitude); -void __RPC_STUB ILatLongReport_GetLatitude_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ILatLongReport_GetLongitude_Proxy( - ILatLongReport* This, - DOUBLE *pLongitude); -void __RPC_STUB ILatLongReport_GetLongitude_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ILatLongReport_GetErrorRadius_Proxy( - ILatLongReport* This, - DOUBLE *pErrorRadius); -void __RPC_STUB ILatLongReport_GetErrorRadius_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ILatLongReport_GetAltitude_Proxy( - ILatLongReport* This, - DOUBLE *pAltitude); -void __RPC_STUB ILatLongReport_GetAltitude_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ILatLongReport_GetAltitudeError_Proxy( - ILatLongReport* This, - DOUBLE *pAltitudeError); -void __RPC_STUB ILatLongReport_GetAltitudeError_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ILatLongReport_INTERFACE_DEFINED__ */ @@ -642,29 +543,30 @@ typedef struct IDefaultLocationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDefaultLocation* This, + IDefaultLocation *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDefaultLocation* This); + IDefaultLocation *This); ULONG (STDMETHODCALLTYPE *Release)( - IDefaultLocation* This); + IDefaultLocation *This); /*** IDefaultLocation methods ***/ HRESULT (STDMETHODCALLTYPE *SetReport)( - IDefaultLocation* This, + IDefaultLocation *This, REFIID reportType, ILocationReport *pLocationReport); HRESULT (STDMETHODCALLTYPE *GetReport)( - IDefaultLocation* This, + IDefaultLocation *This, REFIID reportType, ILocationReport **ppLocationReport); END_INTERFACE } IDefaultLocationVtbl; + interface IDefaultLocation { CONST_VTBL IDefaultLocationVtbl* lpVtbl; }; @@ -701,24 +603,6 @@ static FORCEINLINE HRESULT IDefaultLocation_GetReport(IDefaultLocation* This,REF #endif -HRESULT STDMETHODCALLTYPE IDefaultLocation_SetReport_Proxy( - IDefaultLocation* This, - REFIID reportType, - ILocationReport *pLocationReport); -void __RPC_STUB IDefaultLocation_SetReport_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDefaultLocation_GetReport_Proxy( - IDefaultLocation* This, - REFIID reportType, - ILocationReport **ppLocationReport); -void __RPC_STUB IDefaultLocation_GetReport_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDefaultLocation_INTERFACE_DEFINED__ */ @@ -751,29 +635,30 @@ typedef struct ILocationEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ILocationEvents* This, + ILocationEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ILocationEvents* This); + ILocationEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - ILocationEvents* This); + ILocationEvents *This); /*** ILocationEvents methods ***/ HRESULT (STDMETHODCALLTYPE *OnLocationChanged)( - ILocationEvents* This, + ILocationEvents *This, REFIID reportType, ILocationReport *pLocationReport); HRESULT (STDMETHODCALLTYPE *OnStatusChanged)( - ILocationEvents* This, + ILocationEvents *This, REFIID reportType, LOCATION_REPORT_STATUS newStatus); END_INTERFACE } ILocationEventsVtbl; + interface ILocationEvents { CONST_VTBL ILocationEventsVtbl* lpVtbl; }; @@ -810,24 +695,6 @@ static FORCEINLINE HRESULT ILocationEvents_OnStatusChanged(ILocationEvents* This #endif -HRESULT STDMETHODCALLTYPE ILocationEvents_OnLocationChanged_Proxy( - ILocationEvents* This, - REFIID reportType, - ILocationReport *pLocationReport); -void __RPC_STUB ILocationEvents_OnLocationChanged_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ILocationEvents_OnStatusChanged_Proxy( - ILocationEvents* This, - REFIID reportType, - LOCATION_REPORT_STATUS newStatus); -void __RPC_STUB ILocationEvents_OnStatusChanged_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ILocationEvents_INTERFACE_DEFINED__ */ @@ -890,59 +757,59 @@ typedef struct ILocationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ILocation* This, + ILocation *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ILocation* This); + ILocation *This); ULONG (STDMETHODCALLTYPE *Release)( - ILocation* This); + ILocation *This); /*** ILocation methods ***/ HRESULT (STDMETHODCALLTYPE *RegisterForReport)( - ILocation* This, + ILocation *This, ILocationEvents *pEvents, REFIID reportType, DWORD dwRequestedReportInterval); HRESULT (STDMETHODCALLTYPE *UnregisterForReport)( - ILocation* This, + ILocation *This, REFIID reportType); HRESULT (STDMETHODCALLTYPE *GetReport)( - ILocation* This, + ILocation *This, REFIID reportType, ILocationReport **ppLocationReport); HRESULT (STDMETHODCALLTYPE *GetReportStatus)( - ILocation* This, + ILocation *This, REFIID reportType, LOCATION_REPORT_STATUS *pStatus); HRESULT (STDMETHODCALLTYPE *GetReportInterval)( - ILocation* This, + ILocation *This, REFIID reportType, DWORD *pMilliseconds); HRESULT (STDMETHODCALLTYPE *SetReportInterval)( - ILocation* This, + ILocation *This, REFIID reportType, DWORD millisecondsRequested); HRESULT (STDMETHODCALLTYPE *GetDesiredAccuracy)( - ILocation* This, + ILocation *This, REFIID reportType, LOCATION_DESIRED_ACCURACY *pDesiredAccuracy); HRESULT (STDMETHODCALLTYPE *SetDesiredAccuracy)( - ILocation* This, + ILocation *This, REFIID reportType, LOCATION_DESIRED_ACCURACY desiredAccuracy); HRESULT (STDMETHODCALLTYPE *RequestPermissions)( - ILocation* This, + ILocation *This, HWND hParent, IID pReportTypes[], ULONG count, @@ -950,6 +817,7 @@ typedef struct ILocationVtbl { END_INTERFACE } ILocationVtbl; + interface ILocation { CONST_VTBL ILocationVtbl* lpVtbl; }; @@ -1014,89 +882,6 @@ static FORCEINLINE HRESULT ILocation_RequestPermissions(ILocation* This,HWND hPa #endif -HRESULT STDMETHODCALLTYPE ILocation_RegisterForReport_Proxy( - ILocation* This, - ILocationEvents *pEvents, - REFIID reportType, - DWORD dwRequestedReportInterval); -void __RPC_STUB ILocation_RegisterForReport_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ILocation_UnregisterForReport_Proxy( - ILocation* This, - REFIID reportType); -void __RPC_STUB ILocation_UnregisterForReport_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ILocation_GetReport_Proxy( - ILocation* This, - REFIID reportType, - ILocationReport **ppLocationReport); -void __RPC_STUB ILocation_GetReport_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ILocation_GetReportStatus_Proxy( - ILocation* This, - REFIID reportType, - LOCATION_REPORT_STATUS *pStatus); -void __RPC_STUB ILocation_GetReportStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ILocation_GetReportInterval_Proxy( - ILocation* This, - REFIID reportType, - DWORD *pMilliseconds); -void __RPC_STUB ILocation_GetReportInterval_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ILocation_SetReportInterval_Proxy( - ILocation* This, - REFIID reportType, - DWORD millisecondsRequested); -void __RPC_STUB ILocation_SetReportInterval_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ILocation_GetDesiredAccuracy_Proxy( - ILocation* This, - REFIID reportType, - LOCATION_DESIRED_ACCURACY *pDesiredAccuracy); -void __RPC_STUB ILocation_GetDesiredAccuracy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ILocation_SetDesiredAccuracy_Proxy( - ILocation* This, - REFIID reportType, - LOCATION_DESIRED_ACCURACY desiredAccuracy); -void __RPC_STUB ILocation_SetDesiredAccuracy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ILocation_RequestPermissions_Proxy( - ILocation* This, - HWND hParent, - IID pReportTypes[], - ULONG count, - WINBOOL fModal); -void __RPC_STUB ILocation_RequestPermissions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ILocation_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/math.h b/lib/libc/include/any-windows-any/math.h index 658abc8007..3754dc64e9 100644 --- a/lib/libc/include/any-windows-any/math.h +++ b/lib/libc/include/any-windows-any/math.h @@ -140,16 +140,6 @@ extern "C" { } lh; } __mingw_ldbl_type_t; - typedef union __mingw_fp_types_t - { - long double *ld; - double *d; - float *f; - __mingw_ldbl_type_t *ldt; - __mingw_dbl_type_t *dt; - __mingw_flt_type_t *ft; - } __mingw_fp_types_t; - #endif #ifndef _HUGE @@ -273,7 +263,7 @@ extern "C" { }; #endif - double __cdecl _cabs(struct _complex _ComplexA); /* Overriden to use our cabs. */ + double __cdecl _cabs(struct _complex _ComplexA); /* Overridden to use our cabs. */ double __cdecl _hypot(double _X,double _Y); _CRTIMP double __cdecl _j0(double _X); _CRTIMP double __cdecl _j1(double _X); @@ -411,20 +401,20 @@ typedef long double double_t; #ifndef __CRT__NO_INLINE __CRT_INLINE int __cdecl __fpclassifyl (long double x) { #if defined(__x86_64__) || defined(_AMD64_) - __mingw_fp_types_t hlp; + __mingw_ldbl_type_t hlp; unsigned int e; - hlp.ld = &x; - e = hlp.ldt->lh.sign_exponent & 0x7fff; + hlp.x = x; + e = hlp.lh.sign_exponent & 0x7fff; if (!e) { - unsigned int h = hlp.ldt->lh.high; - if (!(hlp.ldt->lh.low | h)) + unsigned int h = hlp.lh.high; + if (!(hlp.lh.low | h)) return FP_ZERO; else if (!(h & 0x80000000)) return FP_SUBNORMAL; } else if (e == 0x7fff) - return (((hlp.ldt->lh.high & 0x7fffffff) | hlp.ldt->lh.low) == 0 ? + return (((hlp.lh.high & 0x7fffffff) | hlp.lh.low) == 0 ? FP_INFINITE : FP_NAN); return FP_NORMAL; #elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) @@ -437,12 +427,12 @@ typedef long double double_t; } __CRT_INLINE int __cdecl __fpclassify (double x) { #if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) - __mingw_fp_types_t hlp; + __mingw_dbl_type_t hlp; unsigned int l, h; - hlp.d = &x; - h = hlp.ldt->lh.high; - l = hlp.ldt->lh.low | (h & 0xfffff); + hlp.x = x; + h = hlp.lh.high; + l = hlp.lh.low | (h & 0xfffff); h &= 0x7ff00000; if ((h | l) == 0) return FP_ZERO; @@ -459,16 +449,16 @@ typedef long double double_t; } __CRT_INLINE int __cdecl __fpclassifyf (float x) { #if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) - __mingw_fp_types_t hlp; + __mingw_flt_type_t hlp; - hlp.f = &x; - hlp.ft->val &= 0x7fffffff; - if (hlp.ft->val == 0) + hlp.x = x; + hlp.val &= 0x7fffffff; + if (hlp.val == 0) return FP_ZERO; - if (hlp.ft->val < 0x800000) + if (hlp.val < 0x800000) return FP_SUBNORMAL; - if (hlp.ft->val >= 0x7f800000) - return (hlp.ft->val > 0x7f800000 ? FP_NAN : FP_INFINITE); + if (hlp.val >= 0x7f800000) + return (hlp.val > 0x7f800000 ? FP_NAN : FP_INFINITE); return FP_NORMAL; #elif defined(__i386__) || defined(_X86_) unsigned short sw; @@ -525,12 +515,12 @@ __mingw_choose_expr ( \ __CRT_INLINE int __cdecl __isnan (double _x) { #if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) - __mingw_fp_types_t hlp; + __mingw_dbl_type_t hlp; int l, h; - hlp.d = &_x; - l = hlp.dt->lh.low; - h = hlp.dt->lh.high & 0x7fffffff; + hlp.x = _x; + l = hlp.lh.low; + h = hlp.lh.high & 0x7fffffff; h |= (unsigned int) (l | -l) >> 31; h = 0x7ff00000 - h; return (int) ((unsigned int) h) >> 31; @@ -546,11 +536,11 @@ __mingw_choose_expr ( \ __CRT_INLINE int __cdecl __isnanf (float _x) { #if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) - __mingw_fp_types_t hlp; + __mingw_flt_type_t hlp; int i; - hlp.f = &_x; - i = hlp.ft->val & 0x7fffffff; + hlp.x = _x; + i = hlp.val & 0x7fffffff; i = 0x7f800000 - i; return (int) (((unsigned int) i) >> 31); #elif defined(__i386__) || defined(_X86_) @@ -565,12 +555,12 @@ __mingw_choose_expr ( \ __CRT_INLINE int __cdecl __isnanl (long double _x) { #if defined(__x86_64__) || defined(_AMD64_) - __mingw_fp_types_t ld; + __mingw_ldbl_type_t ld; int xx, signexp; - ld.ld = &_x; - signexp = (ld.ldt->lh.sign_exponent & 0x7fff) << 1; - xx = (int) (ld.ldt->lh.low | (ld.ldt->lh.high & 0x7fffffffu)); /* explicit */ + ld.x = _x; + signexp = (ld.lh.sign_exponent & 0x7fff) << 1; + xx = (int) (ld.lh.low | (ld.lh.high & 0x7fffffffu)); /* explicit */ signexp |= (unsigned int) (xx | (-xx)) >> 31; signexp = 0xfffe - signexp; return (int) ((unsigned int) signexp) >> 16; @@ -610,10 +600,10 @@ __mingw_choose_expr ( \ #ifndef __CRT__NO_INLINE __CRT_INLINE int __cdecl __signbit (double x) { #if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) - __mingw_fp_types_t hlp; + __mingw_dbl_type_t hlp; - hlp.d = &x; - return ((hlp.dt->lh.high & 0x80000000) != 0); + hlp.x = x; + return ((hlp.lh.high & 0x80000000) != 0); #elif defined(__i386__) || defined(_X86_) unsigned short stw; __asm__ __volatile__ ( "fxam; fstsw %%ax;": "=a" (stw) : "t" (x)); @@ -623,9 +613,9 @@ __mingw_choose_expr ( \ __CRT_INLINE int __cdecl __signbitf (float x) { #if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) - __mingw_fp_types_t hlp; - hlp.f = &x; - return ((hlp.ft->val & 0x80000000) != 0); + __mingw_flt_type_t hlp; + hlp.x = x; + return ((hlp.val & 0x80000000) != 0); #elif defined(__i386__) || defined(_X86_) unsigned short stw; __asm__ __volatile__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (x)); @@ -635,9 +625,9 @@ __mingw_choose_expr ( \ __CRT_INLINE int __cdecl __signbitl (long double x) { #if defined(__x86_64__) || defined(_AMD64_) - __mingw_fp_types_t ld; - ld.ld = &x; - return ((ld.ldt->lh.sign_exponent & 0x8000) != 0); + __mingw_ldbl_type_t ld; + ld.x = x; + return ((ld.lh.sign_exponent & 0x8000) != 0); #elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) return __signbit(x); #elif defined(__i386__) || defined(_X86_) @@ -744,7 +734,7 @@ __mingw_choose_expr ( \ /* 7.12.6.5 */ #define FP_ILOGB0 ((int)0x80000000) -#define FP_ILOGBNAN ((int)0x80000000) +#define FP_ILOGBNAN ((int)0x7fffffff) extern int __cdecl ilogb (double); extern int __cdecl ilogbf (float); extern int __cdecl ilogbl (long double); @@ -789,18 +779,20 @@ __mingw_choose_expr ( \ __CRT_INLINE double __cdecl logb (double x) { #if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) - __mingw_fp_types_t hlp; + __mingw_dbl_type_t hlp; int lx, hx; - hlp.d = &x; - lx = hlp.dt->lh.low; - hx = hlp.dt->lh.high & 0x7fffffff; /* high |x| */ + hlp.x = x; + lx = hlp.lh.low; + hx = hlp.lh.high & 0x7fffffff; /* high |x| */ if ((hx | lx) == 0) return -1.0 / fabs (x); if (hx >= 0x7ff00000) return x * x; - if ((hx >>= 20) == 0) /* IEEE 754 logb */ - return -1022.0; + if ((hx >>= 20) == 0) { + unsigned long long mantissa = hlp.val & 0xfffffffffffffULL; + return -1023.0 - (__builtin_clzll(mantissa) - 12); + } return (double) (hx - 1023); #elif defined(__i386__) || defined(_X86_) double res = 0.0; @@ -814,16 +806,16 @@ __mingw_choose_expr ( \ { #if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) int v; - __mingw_fp_types_t hlp; + __mingw_flt_type_t hlp; - hlp.f = &x; - v = hlp.ft->val & 0x7fffffff; /* high |x| */ + hlp.x = x; + v = hlp.val & 0x7fffffff; /* high |x| */ if (!v) return (float)-1.0 / fabsf (x); if (v >= 0x7f800000) return x * x; - if ((v >>= 23) == 0) /* IEEE 754 logb */ - return -126.0; + if ((v >>= 23) == 0) + return -127.0 - (__builtin_clzl(hlp.val & 0x7fffff) - 9); return (float) (v - 127); #elif defined(__i386__) || defined(_X86_) float res = 0.0F; @@ -836,18 +828,20 @@ __mingw_choose_expr ( \ __CRT_INLINE long double __cdecl logbl (long double x) { #if defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) - __mingw_fp_types_t hlp; + __mingw_ldbl_type_t hlp; int lx, hx; - hlp.d = &x; - lx = hlp.dt->lh.low; - hx = hlp.dt->lh.high & 0x7fffffff; /* high |x| */ + hlp.x = x; + lx = hlp.lh.low; + hx = hlp.lh.high & 0x7fffffff; /* high |x| */ if ((hx | lx) == 0) return -1.0 / fabs (x); if (hx >= 0x7ff00000) return x * x; - if ((hx >>= 20) == 0) /* IEEE 754 logb */ - return -1022.0; + if ((hx >>= 20) == 0) { + unsigned long long mantissa = hlp.val & 0xfffffffffffffULL; + return -1023.0 - (__builtin_clzll(mantissa) - 12); + } return (double) (hx - 1023); #elif defined(__x86_64__) || defined(_AMD64_) || defined(__i386__) || defined(_X86_) long double res = 0.0l; diff --git a/lib/libc/include/any-windows-any/mediaobj.h b/lib/libc/include/any-windows-any/mediaobj.h index b4d793ebd9..ea69ea6f97 100644 --- a/lib/libc/include/any-windows-any/mediaobj.h +++ b/lib/libc/include/any-windows-any/mediaobj.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/mediaobj.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/mediaobj.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/medparam.h b/lib/libc/include/any-windows-any/medparam.h index 01a77535f7..341acd995c 100644 --- a/lib/libc/include/any-windows-any/medparam.h +++ b/lib/libc/include/any-windows-any/medparam.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from direct-x/include/medparam.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from direct-x/include/medparam.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,11 +21,17 @@ #ifndef __IMediaParams_FWD_DEFINED__ #define __IMediaParams_FWD_DEFINED__ typedef interface IMediaParams IMediaParams; +#ifdef __cplusplus +interface IMediaParams; +#endif /* __cplusplus */ #endif #ifndef __IMediaParamInfo_FWD_DEFINED__ #define __IMediaParamInfo_FWD_DEFINED__ typedef interface IMediaParamInfo IMediaParamInfo; +#ifdef __cplusplus +interface IMediaParamInfo; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -124,46 +131,47 @@ typedef struct IMediaParamsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMediaParams* This, + IMediaParams *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMediaParams* This); + IMediaParams *This); ULONG (STDMETHODCALLTYPE *Release)( - IMediaParams* This); + IMediaParams *This); /*** IMediaParams methods ***/ HRESULT (STDMETHODCALLTYPE *AddEnvelope)( - IMediaParams* This, + IMediaParams *This, DWORD dwParamIndex, DWORD cPoints, MP_ENVELOPE_SEGMENT *pEnvelope); HRESULT (STDMETHODCALLTYPE *FlushEnvelope)( - IMediaParams* This, + IMediaParams *This, DWORD dwParamIndex, REFERENCE_TIME refTimeStart, REFERENCE_TIME refTimeEnd); HRESULT (STDMETHODCALLTYPE *GetParam)( - IMediaParams* This, + IMediaParams *This, DWORD dwParamIndex, MP_DATA *pValue); HRESULT (STDMETHODCALLTYPE *SetParam)( - IMediaParams* This, + IMediaParams *This, DWORD dwParamIndex, MP_DATA value); HRESULT (STDMETHODCALLTYPE *SetTimeFormat)( - IMediaParams* This, + IMediaParams *This, GUID guidTimeFormat, MP_TIMEDATA mpTimeData); END_INTERFACE } IMediaParamsVtbl; + interface IMediaParams { CONST_VTBL IMediaParamsVtbl* lpVtbl; }; @@ -212,53 +220,6 @@ static FORCEINLINE HRESULT IMediaParams_SetTimeFormat(IMediaParams* This,GUID gu #endif -HRESULT STDMETHODCALLTYPE IMediaParams_AddEnvelope_Proxy( - IMediaParams* This, - DWORD dwParamIndex, - DWORD cPoints, - MP_ENVELOPE_SEGMENT *pEnvelope); -void __RPC_STUB IMediaParams_AddEnvelope_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaParams_FlushEnvelope_Proxy( - IMediaParams* This, - DWORD dwParamIndex, - REFERENCE_TIME refTimeStart, - REFERENCE_TIME refTimeEnd); -void __RPC_STUB IMediaParams_FlushEnvelope_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaParams_GetParam_Proxy( - IMediaParams* This, - DWORD dwParamIndex, - MP_DATA *pValue); -void __RPC_STUB IMediaParams_GetParam_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaParams_SetParam_Proxy( - IMediaParams* This, - DWORD dwParamIndex, - MP_DATA value); -void __RPC_STUB IMediaParams_SetParam_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaParams_SetTimeFormat_Proxy( - IMediaParams* This, - GUID guidTimeFormat, - MP_TIMEDATA mpTimeData); -void __RPC_STUB IMediaParams_SetTimeFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMediaParams_INTERFACE_DEFINED__ */ @@ -305,47 +266,48 @@ typedef struct IMediaParamInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMediaParamInfo* This, + IMediaParamInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMediaParamInfo* This); + IMediaParamInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IMediaParamInfo* This); + IMediaParamInfo *This); /*** IMediaParamInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetParamCount)( - IMediaParamInfo* This, + IMediaParamInfo *This, DWORD *pdwParams); HRESULT (STDMETHODCALLTYPE *GetParamInfo)( - IMediaParamInfo* This, + IMediaParamInfo *This, DWORD dwParamIndex, MP_PARAMINFO *pInfo); HRESULT (STDMETHODCALLTYPE *GetParamText)( - IMediaParamInfo* This, + IMediaParamInfo *This, DWORD dwParamIndex, WCHAR **ppwchText); HRESULT (STDMETHODCALLTYPE *GetNumTimeFormats)( - IMediaParamInfo* This, + IMediaParamInfo *This, DWORD *pdwNumTimeFormats); HRESULT (STDMETHODCALLTYPE *GetSupportedTimeFormat)( - IMediaParamInfo* This, + IMediaParamInfo *This, DWORD dwFormatIndex, GUID *pguidTimeFormat); HRESULT (STDMETHODCALLTYPE *GetCurrentTimeFormat)( - IMediaParamInfo* This, + IMediaParamInfo *This, GUID *pguidTimeFormat, MP_TIMEDATA *pTimeData); END_INTERFACE } IMediaParamInfoVtbl; + interface IMediaParamInfo { CONST_VTBL IMediaParamInfoVtbl* lpVtbl; }; @@ -398,58 +360,6 @@ static FORCEINLINE HRESULT IMediaParamInfo_GetCurrentTimeFormat(IMediaParamInfo* #endif -HRESULT STDMETHODCALLTYPE IMediaParamInfo_GetParamCount_Proxy( - IMediaParamInfo* This, - DWORD *pdwParams); -void __RPC_STUB IMediaParamInfo_GetParamCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaParamInfo_GetParamInfo_Proxy( - IMediaParamInfo* This, - DWORD dwParamIndex, - MP_PARAMINFO *pInfo); -void __RPC_STUB IMediaParamInfo_GetParamInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaParamInfo_GetParamText_Proxy( - IMediaParamInfo* This, - DWORD dwParamIndex, - WCHAR **ppwchText); -void __RPC_STUB IMediaParamInfo_GetParamText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaParamInfo_GetNumTimeFormats_Proxy( - IMediaParamInfo* This, - DWORD *pdwNumTimeFormats); -void __RPC_STUB IMediaParamInfo_GetNumTimeFormats_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaParamInfo_GetSupportedTimeFormat_Proxy( - IMediaParamInfo* This, - DWORD dwFormatIndex, - GUID *pguidTimeFormat); -void __RPC_STUB IMediaParamInfo_GetSupportedTimeFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaParamInfo_GetCurrentTimeFormat_Proxy( - IMediaParamInfo* This, - GUID *pguidTimeFormat, - MP_TIMEDATA *pTimeData); -void __RPC_STUB IMediaParamInfo_GetCurrentTimeFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMediaParamInfo_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/mfidl.h b/lib/libc/include/any-windows-any/mfidl.h index e6f66f3777..3052ce29d2 100644 --- a/lib/libc/include/any-windows-any/mfidl.h +++ b/lib/libc/include/any-windows-any/mfidl.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/mfidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/mfidl.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/mfobjects.h b/lib/libc/include/any-windows-any/mfobjects.h index fabd2bbf48..f11afc1368 100644 --- a/lib/libc/include/any-windows-any/mfobjects.h +++ b/lib/libc/include/any-windows-any/mfobjects.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/mfobjects.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/mfobjects.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,121 +21,193 @@ #ifndef __IMFAttributes_FWD_DEFINED__ #define __IMFAttributes_FWD_DEFINED__ typedef interface IMFAttributes IMFAttributes; +#ifdef __cplusplus +interface IMFAttributes; +#endif /* __cplusplus */ #endif #ifndef __IMFMediaBuffer_FWD_DEFINED__ #define __IMFMediaBuffer_FWD_DEFINED__ typedef interface IMFMediaBuffer IMFMediaBuffer; +#ifdef __cplusplus +interface IMFMediaBuffer; +#endif /* __cplusplus */ #endif #ifndef __IMFSample_FWD_DEFINED__ #define __IMFSample_FWD_DEFINED__ typedef interface IMFSample IMFSample; +#ifdef __cplusplus +interface IMFSample; +#endif /* __cplusplus */ #endif #ifndef __IMF2DBuffer_FWD_DEFINED__ #define __IMF2DBuffer_FWD_DEFINED__ typedef interface IMF2DBuffer IMF2DBuffer; +#ifdef __cplusplus +interface IMF2DBuffer; +#endif /* __cplusplus */ #endif #ifndef __IMF2DBuffer2_FWD_DEFINED__ #define __IMF2DBuffer2_FWD_DEFINED__ typedef interface IMF2DBuffer2 IMF2DBuffer2; +#ifdef __cplusplus +interface IMF2DBuffer2; +#endif /* __cplusplus */ #endif #ifndef __IMFDXGIBuffer_FWD_DEFINED__ #define __IMFDXGIBuffer_FWD_DEFINED__ typedef interface IMFDXGIBuffer IMFDXGIBuffer; +#ifdef __cplusplus +interface IMFDXGIBuffer; +#endif /* __cplusplus */ #endif #ifndef __IMFMediaType_FWD_DEFINED__ #define __IMFMediaType_FWD_DEFINED__ typedef interface IMFMediaType IMFMediaType; +#ifdef __cplusplus +interface IMFMediaType; +#endif /* __cplusplus */ #endif #ifndef __IMFAudioMediaType_FWD_DEFINED__ #define __IMFAudioMediaType_FWD_DEFINED__ typedef interface IMFAudioMediaType IMFAudioMediaType; +#ifdef __cplusplus +interface IMFAudioMediaType; +#endif /* __cplusplus */ #endif #ifndef __IMFVideoMediaType_FWD_DEFINED__ #define __IMFVideoMediaType_FWD_DEFINED__ typedef interface IMFVideoMediaType IMFVideoMediaType; +#ifdef __cplusplus +interface IMFVideoMediaType; +#endif /* __cplusplus */ #endif #ifndef __IMFAsyncResult_FWD_DEFINED__ #define __IMFAsyncResult_FWD_DEFINED__ typedef interface IMFAsyncResult IMFAsyncResult; +#ifdef __cplusplus +interface IMFAsyncResult; +#endif /* __cplusplus */ #endif #ifndef __IMFAsyncCallback_FWD_DEFINED__ #define __IMFAsyncCallback_FWD_DEFINED__ typedef interface IMFAsyncCallback IMFAsyncCallback; +#ifdef __cplusplus +interface IMFAsyncCallback; +#endif /* __cplusplus */ #endif #ifndef __IMFAsyncCallbackLogging_FWD_DEFINED__ #define __IMFAsyncCallbackLogging_FWD_DEFINED__ typedef interface IMFAsyncCallbackLogging IMFAsyncCallbackLogging; +#ifdef __cplusplus +interface IMFAsyncCallbackLogging; +#endif /* __cplusplus */ #endif #ifndef __IMFMediaEvent_FWD_DEFINED__ #define __IMFMediaEvent_FWD_DEFINED__ typedef interface IMFMediaEvent IMFMediaEvent; +#ifdef __cplusplus +interface IMFMediaEvent; +#endif /* __cplusplus */ #endif #ifndef __IMFMediaEventGenerator_FWD_DEFINED__ #define __IMFMediaEventGenerator_FWD_DEFINED__ typedef interface IMFMediaEventGenerator IMFMediaEventGenerator; +#ifdef __cplusplus +interface IMFMediaEventGenerator; +#endif /* __cplusplus */ #endif #ifndef __IMFRemoteAsyncCallback_FWD_DEFINED__ #define __IMFRemoteAsyncCallback_FWD_DEFINED__ typedef interface IMFRemoteAsyncCallback IMFRemoteAsyncCallback; +#ifdef __cplusplus +interface IMFRemoteAsyncCallback; +#endif /* __cplusplus */ #endif #ifndef __IMFByteStream_FWD_DEFINED__ #define __IMFByteStream_FWD_DEFINED__ typedef interface IMFByteStream IMFByteStream; +#ifdef __cplusplus +interface IMFByteStream; +#endif /* __cplusplus */ #endif #ifndef __IMFByteStreamProxyClassFactory_FWD_DEFINED__ #define __IMFByteStreamProxyClassFactory_FWD_DEFINED__ typedef interface IMFByteStreamProxyClassFactory IMFByteStreamProxyClassFactory; +#ifdef __cplusplus +interface IMFByteStreamProxyClassFactory; +#endif /* __cplusplus */ #endif #ifndef __IMFSampleOutputStream_FWD_DEFINED__ #define __IMFSampleOutputStream_FWD_DEFINED__ typedef interface IMFSampleOutputStream IMFSampleOutputStream; +#ifdef __cplusplus +interface IMFSampleOutputStream; +#endif /* __cplusplus */ #endif #ifndef __IMFCollection_FWD_DEFINED__ #define __IMFCollection_FWD_DEFINED__ typedef interface IMFCollection IMFCollection; +#ifdef __cplusplus +interface IMFCollection; +#endif /* __cplusplus */ #endif #ifndef __IMFMediaEventQueue_FWD_DEFINED__ #define __IMFMediaEventQueue_FWD_DEFINED__ typedef interface IMFMediaEventQueue IMFMediaEventQueue; +#ifdef __cplusplus +interface IMFMediaEventQueue; +#endif /* __cplusplus */ #endif #ifndef __IMFActivate_FWD_DEFINED__ #define __IMFActivate_FWD_DEFINED__ typedef interface IMFActivate IMFActivate; +#ifdef __cplusplus +interface IMFActivate; +#endif /* __cplusplus */ #endif #ifndef __IMFPluginControl_FWD_DEFINED__ #define __IMFPluginControl_FWD_DEFINED__ typedef interface IMFPluginControl IMFPluginControl; +#ifdef __cplusplus +interface IMFPluginControl; +#endif /* __cplusplus */ #endif #ifndef __IMFPluginControl2_FWD_DEFINED__ #define __IMFPluginControl2_FWD_DEFINED__ typedef interface IMFPluginControl2 IMFPluginControl2; +#ifdef __cplusplus +interface IMFPluginControl2; +#endif /* __cplusplus */ #endif #ifndef __IMFDXGIDeviceManager_FWD_DEFINED__ #define __IMFDXGIDeviceManager_FWD_DEFINED__ typedef interface IMFDXGIDeviceManager IMFDXGIDeviceManager; +#ifdef __cplusplus +interface IMFDXGIDeviceManager; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -352,171 +425,172 @@ typedef struct IMFAttributesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFAttributes* This, + IMFAttributes *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFAttributes* This); + IMFAttributes *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFAttributes* This); + IMFAttributes *This); /*** IMFAttributes methods ***/ HRESULT (STDMETHODCALLTYPE *GetItem)( - IMFAttributes* This, + IMFAttributes *This, REFGUID guidKey, PROPVARIANT *pValue); HRESULT (STDMETHODCALLTYPE *GetItemType)( - IMFAttributes* This, + IMFAttributes *This, REFGUID guidKey, MF_ATTRIBUTE_TYPE *pType); HRESULT (STDMETHODCALLTYPE *CompareItem)( - IMFAttributes* This, + IMFAttributes *This, REFGUID guidKey, REFPROPVARIANT Value, WINBOOL *pbResult); HRESULT (STDMETHODCALLTYPE *Compare)( - IMFAttributes* This, + IMFAttributes *This, IMFAttributes *pTheirs, MF_ATTRIBUTES_MATCH_TYPE MatchType, WINBOOL *pbResult); HRESULT (STDMETHODCALLTYPE *GetUINT32)( - IMFAttributes* This, + IMFAttributes *This, REFGUID guidKey, UINT32 *punValue); HRESULT (STDMETHODCALLTYPE *GetUINT64)( - IMFAttributes* This, + IMFAttributes *This, REFGUID guidKey, UINT64 *punValue); HRESULT (STDMETHODCALLTYPE *GetDouble)( - IMFAttributes* This, + IMFAttributes *This, REFGUID guidKey, double *pfValue); HRESULT (STDMETHODCALLTYPE *GetGUID)( - IMFAttributes* This, + IMFAttributes *This, REFGUID guidKey, GUID *pguidValue); HRESULT (STDMETHODCALLTYPE *GetStringLength)( - IMFAttributes* This, + IMFAttributes *This, REFGUID guidKey, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetString)( - IMFAttributes* This, + IMFAttributes *This, REFGUID guidKey, LPWSTR pwszValue, UINT32 cchBufSize, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetAllocatedString)( - IMFAttributes* This, + IMFAttributes *This, REFGUID guidKey, LPWSTR *ppwszValue, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetBlobSize)( - IMFAttributes* This, + IMFAttributes *This, REFGUID guidKey, UINT32 *pcbBlobSize); HRESULT (STDMETHODCALLTYPE *GetBlob)( - IMFAttributes* This, + IMFAttributes *This, REFGUID guidKey, UINT8 *pBuf, UINT32 cbBufSize, UINT32 *pcbBlobSize); HRESULT (STDMETHODCALLTYPE *GetAllocatedBlob)( - IMFAttributes* This, + IMFAttributes *This, REFGUID guidKey, UINT8 **ppBuf, UINT32 *pcbSize); HRESULT (STDMETHODCALLTYPE *GetUnknown)( - IMFAttributes* This, + IMFAttributes *This, REFGUID guidKey, REFIID riid, LPVOID *ppv); HRESULT (STDMETHODCALLTYPE *SetItem)( - IMFAttributes* This, + IMFAttributes *This, REFGUID guidKey, REFPROPVARIANT Value); HRESULT (STDMETHODCALLTYPE *DeleteItem)( - IMFAttributes* This, + IMFAttributes *This, REFGUID guidKey); HRESULT (STDMETHODCALLTYPE *DeleteAllItems)( - IMFAttributes* This); + IMFAttributes *This); HRESULT (STDMETHODCALLTYPE *SetUINT32)( - IMFAttributes* This, + IMFAttributes *This, REFGUID guidKey, UINT32 unValue); HRESULT (STDMETHODCALLTYPE *SetUINT64)( - IMFAttributes* This, + IMFAttributes *This, REFGUID guidKey, UINT64 unValue); HRESULT (STDMETHODCALLTYPE *SetDouble)( - IMFAttributes* This, + IMFAttributes *This, REFGUID guidKey, double fValue); HRESULT (STDMETHODCALLTYPE *SetGUID)( - IMFAttributes* This, + IMFAttributes *This, REFGUID guidKey, REFGUID guidValue); HRESULT (STDMETHODCALLTYPE *SetString)( - IMFAttributes* This, + IMFAttributes *This, REFGUID guidKey, LPCWSTR wszValue); HRESULT (STDMETHODCALLTYPE *SetBlob)( - IMFAttributes* This, + IMFAttributes *This, REFGUID guidKey, const UINT8 *pBuf, UINT32 cbBufSize); HRESULT (STDMETHODCALLTYPE *SetUnknown)( - IMFAttributes* This, + IMFAttributes *This, REFGUID guidKey, IUnknown *pUnknown); HRESULT (STDMETHODCALLTYPE *LockStore)( - IMFAttributes* This); + IMFAttributes *This); HRESULT (STDMETHODCALLTYPE *UnlockStore)( - IMFAttributes* This); + IMFAttributes *This); HRESULT (STDMETHODCALLTYPE *GetCount)( - IMFAttributes* This, + IMFAttributes *This, UINT32 *pcItems); HRESULT (STDMETHODCALLTYPE *GetItemByIndex)( - IMFAttributes* This, + IMFAttributes *This, UINT32 unIndex, GUID *pguidKey, PROPVARIANT *pValue); HRESULT (STDMETHODCALLTYPE *CopyAllItems)( - IMFAttributes* This, + IMFAttributes *This, IMFAttributes *pDest); END_INTERFACE } IMFAttributesVtbl; + interface IMFAttributes { CONST_VTBL IMFAttributesVtbl* lpVtbl; }; @@ -665,278 +739,6 @@ static FORCEINLINE HRESULT IMFAttributes_CopyAllItems(IMFAttributes* This,IMFAtt #endif -HRESULT STDMETHODCALLTYPE IMFAttributes_GetItem_Proxy( - IMFAttributes* This, - REFGUID guidKey, - PROPVARIANT *pValue); -void __RPC_STUB IMFAttributes_GetItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_GetItemType_Proxy( - IMFAttributes* This, - REFGUID guidKey, - MF_ATTRIBUTE_TYPE *pType); -void __RPC_STUB IMFAttributes_GetItemType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_CompareItem_Proxy( - IMFAttributes* This, - REFGUID guidKey, - REFPROPVARIANT Value, - WINBOOL *pbResult); -void __RPC_STUB IMFAttributes_CompareItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_Compare_Proxy( - IMFAttributes* This, - IMFAttributes *pTheirs, - MF_ATTRIBUTES_MATCH_TYPE MatchType, - WINBOOL *pbResult); -void __RPC_STUB IMFAttributes_Compare_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_GetUINT32_Proxy( - IMFAttributes* This, - REFGUID guidKey, - UINT32 *punValue); -void __RPC_STUB IMFAttributes_GetUINT32_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_GetUINT64_Proxy( - IMFAttributes* This, - REFGUID guidKey, - UINT64 *punValue); -void __RPC_STUB IMFAttributes_GetUINT64_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_GetDouble_Proxy( - IMFAttributes* This, - REFGUID guidKey, - double *pfValue); -void __RPC_STUB IMFAttributes_GetDouble_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_GetGUID_Proxy( - IMFAttributes* This, - REFGUID guidKey, - GUID *pguidValue); -void __RPC_STUB IMFAttributes_GetGUID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_GetStringLength_Proxy( - IMFAttributes* This, - REFGUID guidKey, - UINT32 *pcchLength); -void __RPC_STUB IMFAttributes_GetStringLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_GetString_Proxy( - IMFAttributes* This, - REFGUID guidKey, - LPWSTR pwszValue, - UINT32 cchBufSize, - UINT32 *pcchLength); -void __RPC_STUB IMFAttributes_GetString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_GetAllocatedString_Proxy( - IMFAttributes* This, - REFGUID guidKey, - LPWSTR *ppwszValue, - UINT32 *pcchLength); -void __RPC_STUB IMFAttributes_GetAllocatedString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_GetBlobSize_Proxy( - IMFAttributes* This, - REFGUID guidKey, - UINT32 *pcbBlobSize); -void __RPC_STUB IMFAttributes_GetBlobSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_GetBlob_Proxy( - IMFAttributes* This, - REFGUID guidKey, - UINT8 *pBuf, - UINT32 cbBufSize, - UINT32 *pcbBlobSize); -void __RPC_STUB IMFAttributes_GetBlob_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_GetAllocatedBlob_Proxy( - IMFAttributes* This, - REFGUID guidKey, - UINT8 **ppBuf, - UINT32 *pcbSize); -void __RPC_STUB IMFAttributes_GetAllocatedBlob_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_GetUnknown_Proxy( - IMFAttributes* This, - REFGUID guidKey, - REFIID riid, - LPVOID *ppv); -void __RPC_STUB IMFAttributes_GetUnknown_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_SetItem_Proxy( - IMFAttributes* This, - REFGUID guidKey, - REFPROPVARIANT Value); -void __RPC_STUB IMFAttributes_SetItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_DeleteItem_Proxy( - IMFAttributes* This, - REFGUID guidKey); -void __RPC_STUB IMFAttributes_DeleteItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_DeleteAllItems_Proxy( - IMFAttributes* This); -void __RPC_STUB IMFAttributes_DeleteAllItems_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_SetUINT32_Proxy( - IMFAttributes* This, - REFGUID guidKey, - UINT32 unValue); -void __RPC_STUB IMFAttributes_SetUINT32_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_SetUINT64_Proxy( - IMFAttributes* This, - REFGUID guidKey, - UINT64 unValue); -void __RPC_STUB IMFAttributes_SetUINT64_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_SetDouble_Proxy( - IMFAttributes* This, - REFGUID guidKey, - double fValue); -void __RPC_STUB IMFAttributes_SetDouble_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_SetGUID_Proxy( - IMFAttributes* This, - REFGUID guidKey, - REFGUID guidValue); -void __RPC_STUB IMFAttributes_SetGUID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_SetString_Proxy( - IMFAttributes* This, - REFGUID guidKey, - LPCWSTR wszValue); -void __RPC_STUB IMFAttributes_SetString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_SetBlob_Proxy( - IMFAttributes* This, - REFGUID guidKey, - const UINT8 *pBuf, - UINT32 cbBufSize); -void __RPC_STUB IMFAttributes_SetBlob_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_SetUnknown_Proxy( - IMFAttributes* This, - REFGUID guidKey, - IUnknown *pUnknown); -void __RPC_STUB IMFAttributes_SetUnknown_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_LockStore_Proxy( - IMFAttributes* This); -void __RPC_STUB IMFAttributes_LockStore_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_UnlockStore_Proxy( - IMFAttributes* This); -void __RPC_STUB IMFAttributes_UnlockStore_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_GetCount_Proxy( - IMFAttributes* This, - UINT32 *pcItems); -void __RPC_STUB IMFAttributes_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_GetItemByIndex_Proxy( - IMFAttributes* This, - UINT32 unIndex, - GUID *pguidKey, - PROPVARIANT *pValue); -void __RPC_STUB IMFAttributes_GetItemByIndex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAttributes_CopyAllItems_Proxy( - IMFAttributes* This, - IMFAttributes *pDest); -void __RPC_STUB IMFAttributes_CopyAllItems_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFAttributes_INTERFACE_DEFINED__ */ @@ -945,7 +747,6 @@ enum MF_ATTRIBUTE_SERIALIZE_OPTIONS { MF_ATTRIBUTE_SERIALIZE_UNKNOWN_BYREF = 0x1 }; - STDAPI MFSerializeAttributesToStream(IMFAttributes *pAttr, DWORD dwOptions, IStream *pStm); STDAPI MFDeserializeAttributesFromStream(IMFAttributes *pAttr, DWORD dwOptions, IStream *pStm); @@ -987,40 +788,41 @@ typedef struct IMFMediaBufferVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFMediaBuffer* This, + IMFMediaBuffer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFMediaBuffer* This); + IMFMediaBuffer *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFMediaBuffer* This); + IMFMediaBuffer *This); /*** IMFMediaBuffer methods ***/ HRESULT (STDMETHODCALLTYPE *Lock)( - IMFMediaBuffer* This, + IMFMediaBuffer *This, BYTE **ppbBuffer, DWORD *pcbMaxLength, DWORD *pcbCurrentLength); HRESULT (STDMETHODCALLTYPE *Unlock)( - IMFMediaBuffer* This); + IMFMediaBuffer *This); HRESULT (STDMETHODCALLTYPE *GetCurrentLength)( - IMFMediaBuffer* This, + IMFMediaBuffer *This, DWORD *pcbCurrentLength); HRESULT (STDMETHODCALLTYPE *SetCurrentLength)( - IMFMediaBuffer* This, + IMFMediaBuffer *This, DWORD cbCurrentLength); HRESULT (STDMETHODCALLTYPE *GetMaxLength)( - IMFMediaBuffer* This, + IMFMediaBuffer *This, DWORD *pcbMaxLength); END_INTERFACE } IMFMediaBufferVtbl; + interface IMFMediaBuffer { CONST_VTBL IMFMediaBufferVtbl* lpVtbl; }; @@ -1069,47 +871,6 @@ static FORCEINLINE HRESULT IMFMediaBuffer_GetMaxLength(IMFMediaBuffer* This,DWOR #endif -HRESULT STDMETHODCALLTYPE IMFMediaBuffer_Lock_Proxy( - IMFMediaBuffer* This, - BYTE **ppbBuffer, - DWORD *pcbMaxLength, - DWORD *pcbCurrentLength); -void __RPC_STUB IMFMediaBuffer_Lock_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFMediaBuffer_Unlock_Proxy( - IMFMediaBuffer* This); -void __RPC_STUB IMFMediaBuffer_Unlock_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFMediaBuffer_GetCurrentLength_Proxy( - IMFMediaBuffer* This, - DWORD *pcbCurrentLength); -void __RPC_STUB IMFMediaBuffer_GetCurrentLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFMediaBuffer_SetCurrentLength_Proxy( - IMFMediaBuffer* This, - DWORD cbCurrentLength); -void __RPC_STUB IMFMediaBuffer_SetCurrentLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFMediaBuffer_GetMaxLength_Proxy( - IMFMediaBuffer* This, - DWORD *pcbMaxLength); -void __RPC_STUB IMFMediaBuffer_GetMaxLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFMediaBuffer_INTERFACE_DEFINED__ */ @@ -1178,228 +939,229 @@ typedef struct IMFSampleVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFSample* This, + IMFSample *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFSample* This); + IMFSample *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFSample* This); + IMFSample *This); /*** IMFAttributes methods ***/ HRESULT (STDMETHODCALLTYPE *GetItem)( - IMFSample* This, + IMFSample *This, REFGUID guidKey, PROPVARIANT *pValue); HRESULT (STDMETHODCALLTYPE *GetItemType)( - IMFSample* This, + IMFSample *This, REFGUID guidKey, MF_ATTRIBUTE_TYPE *pType); HRESULT (STDMETHODCALLTYPE *CompareItem)( - IMFSample* This, + IMFSample *This, REFGUID guidKey, REFPROPVARIANT Value, WINBOOL *pbResult); HRESULT (STDMETHODCALLTYPE *Compare)( - IMFSample* This, + IMFSample *This, IMFAttributes *pTheirs, MF_ATTRIBUTES_MATCH_TYPE MatchType, WINBOOL *pbResult); HRESULT (STDMETHODCALLTYPE *GetUINT32)( - IMFSample* This, + IMFSample *This, REFGUID guidKey, UINT32 *punValue); HRESULT (STDMETHODCALLTYPE *GetUINT64)( - IMFSample* This, + IMFSample *This, REFGUID guidKey, UINT64 *punValue); HRESULT (STDMETHODCALLTYPE *GetDouble)( - IMFSample* This, + IMFSample *This, REFGUID guidKey, double *pfValue); HRESULT (STDMETHODCALLTYPE *GetGUID)( - IMFSample* This, + IMFSample *This, REFGUID guidKey, GUID *pguidValue); HRESULT (STDMETHODCALLTYPE *GetStringLength)( - IMFSample* This, + IMFSample *This, REFGUID guidKey, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetString)( - IMFSample* This, + IMFSample *This, REFGUID guidKey, LPWSTR pwszValue, UINT32 cchBufSize, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetAllocatedString)( - IMFSample* This, + IMFSample *This, REFGUID guidKey, LPWSTR *ppwszValue, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetBlobSize)( - IMFSample* This, + IMFSample *This, REFGUID guidKey, UINT32 *pcbBlobSize); HRESULT (STDMETHODCALLTYPE *GetBlob)( - IMFSample* This, + IMFSample *This, REFGUID guidKey, UINT8 *pBuf, UINT32 cbBufSize, UINT32 *pcbBlobSize); HRESULT (STDMETHODCALLTYPE *GetAllocatedBlob)( - IMFSample* This, + IMFSample *This, REFGUID guidKey, UINT8 **ppBuf, UINT32 *pcbSize); HRESULT (STDMETHODCALLTYPE *GetUnknown)( - IMFSample* This, + IMFSample *This, REFGUID guidKey, REFIID riid, LPVOID *ppv); HRESULT (STDMETHODCALLTYPE *SetItem)( - IMFSample* This, + IMFSample *This, REFGUID guidKey, REFPROPVARIANT Value); HRESULT (STDMETHODCALLTYPE *DeleteItem)( - IMFSample* This, + IMFSample *This, REFGUID guidKey); HRESULT (STDMETHODCALLTYPE *DeleteAllItems)( - IMFSample* This); + IMFSample *This); HRESULT (STDMETHODCALLTYPE *SetUINT32)( - IMFSample* This, + IMFSample *This, REFGUID guidKey, UINT32 unValue); HRESULT (STDMETHODCALLTYPE *SetUINT64)( - IMFSample* This, + IMFSample *This, REFGUID guidKey, UINT64 unValue); HRESULT (STDMETHODCALLTYPE *SetDouble)( - IMFSample* This, + IMFSample *This, REFGUID guidKey, double fValue); HRESULT (STDMETHODCALLTYPE *SetGUID)( - IMFSample* This, + IMFSample *This, REFGUID guidKey, REFGUID guidValue); HRESULT (STDMETHODCALLTYPE *SetString)( - IMFSample* This, + IMFSample *This, REFGUID guidKey, LPCWSTR wszValue); HRESULT (STDMETHODCALLTYPE *SetBlob)( - IMFSample* This, + IMFSample *This, REFGUID guidKey, const UINT8 *pBuf, UINT32 cbBufSize); HRESULT (STDMETHODCALLTYPE *SetUnknown)( - IMFSample* This, + IMFSample *This, REFGUID guidKey, IUnknown *pUnknown); HRESULT (STDMETHODCALLTYPE *LockStore)( - IMFSample* This); + IMFSample *This); HRESULT (STDMETHODCALLTYPE *UnlockStore)( - IMFSample* This); + IMFSample *This); HRESULT (STDMETHODCALLTYPE *GetCount)( - IMFSample* This, + IMFSample *This, UINT32 *pcItems); HRESULT (STDMETHODCALLTYPE *GetItemByIndex)( - IMFSample* This, + IMFSample *This, UINT32 unIndex, GUID *pguidKey, PROPVARIANT *pValue); HRESULT (STDMETHODCALLTYPE *CopyAllItems)( - IMFSample* This, + IMFSample *This, IMFAttributes *pDest); /*** IMFSample methods ***/ HRESULT (STDMETHODCALLTYPE *GetSampleFlags)( - IMFSample* This, + IMFSample *This, DWORD *pdwSampleFlags); HRESULT (STDMETHODCALLTYPE *SetSampleFlags)( - IMFSample* This, + IMFSample *This, DWORD dwSampleFlags); HRESULT (STDMETHODCALLTYPE *GetSampleTime)( - IMFSample* This, + IMFSample *This, LONGLONG *phnsSampleTime); HRESULT (STDMETHODCALLTYPE *SetSampleTime)( - IMFSample* This, + IMFSample *This, LONGLONG hnsSampleTime); HRESULT (STDMETHODCALLTYPE *GetSampleDuration)( - IMFSample* This, + IMFSample *This, LONGLONG *phnsSampleDuration); HRESULT (STDMETHODCALLTYPE *SetSampleDuration)( - IMFSample* This, + IMFSample *This, LONGLONG hnsSampleDuration); HRESULT (STDMETHODCALLTYPE *GetBufferCount)( - IMFSample* This, + IMFSample *This, DWORD *pdwBufferCount); HRESULT (STDMETHODCALLTYPE *GetBufferByIndex)( - IMFSample* This, + IMFSample *This, DWORD dwIndex, IMFMediaBuffer **ppBuffer); HRESULT (STDMETHODCALLTYPE *ConvertToContiguousBuffer)( - IMFSample* This, + IMFSample *This, IMFMediaBuffer **ppBuffer); HRESULT (STDMETHODCALLTYPE *AddBuffer)( - IMFSample* This, + IMFSample *This, IMFMediaBuffer *pBuffer); HRESULT (STDMETHODCALLTYPE *RemoveBufferByIndex)( - IMFSample* This, + IMFSample *This, DWORD dwIndex); HRESULT (STDMETHODCALLTYPE *RemoveAllBuffers)( - IMFSample* This); + IMFSample *This); HRESULT (STDMETHODCALLTYPE *GetTotalLength)( - IMFSample* This, + IMFSample *This, DWORD *pcbTotalLength); HRESULT (STDMETHODCALLTYPE *CopyToBuffer)( - IMFSample* This, + IMFSample *This, IMFMediaBuffer *pBuffer); END_INTERFACE } IMFSampleVtbl; + interface IMFSample { CONST_VTBL IMFSampleVtbl* lpVtbl; }; @@ -1606,118 +1368,6 @@ static FORCEINLINE HRESULT IMFSample_CopyToBuffer(IMFSample* This,IMFMediaBuffer #endif -HRESULT STDMETHODCALLTYPE IMFSample_GetSampleFlags_Proxy( - IMFSample* This, - DWORD *pdwSampleFlags); -void __RPC_STUB IMFSample_GetSampleFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSample_SetSampleFlags_Proxy( - IMFSample* This, - DWORD dwSampleFlags); -void __RPC_STUB IMFSample_SetSampleFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSample_GetSampleTime_Proxy( - IMFSample* This, - LONGLONG *phnsSampleTime); -void __RPC_STUB IMFSample_GetSampleTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSample_SetSampleTime_Proxy( - IMFSample* This, - LONGLONG hnsSampleTime); -void __RPC_STUB IMFSample_SetSampleTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSample_GetSampleDuration_Proxy( - IMFSample* This, - LONGLONG *phnsSampleDuration); -void __RPC_STUB IMFSample_GetSampleDuration_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSample_SetSampleDuration_Proxy( - IMFSample* This, - LONGLONG hnsSampleDuration); -void __RPC_STUB IMFSample_SetSampleDuration_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSample_GetBufferCount_Proxy( - IMFSample* This, - DWORD *pdwBufferCount); -void __RPC_STUB IMFSample_GetBufferCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSample_GetBufferByIndex_Proxy( - IMFSample* This, - DWORD dwIndex, - IMFMediaBuffer **ppBuffer); -void __RPC_STUB IMFSample_GetBufferByIndex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSample_ConvertToContiguousBuffer_Proxy( - IMFSample* This, - IMFMediaBuffer **ppBuffer); -void __RPC_STUB IMFSample_ConvertToContiguousBuffer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSample_AddBuffer_Proxy( - IMFSample* This, - IMFMediaBuffer *pBuffer); -void __RPC_STUB IMFSample_AddBuffer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSample_RemoveBufferByIndex_Proxy( - IMFSample* This, - DWORD dwIndex); -void __RPC_STUB IMFSample_RemoveBufferByIndex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSample_RemoveAllBuffers_Proxy( - IMFSample* This); -void __RPC_STUB IMFSample_RemoveAllBuffers_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSample_GetTotalLength_Proxy( - IMFSample* This, - DWORD *pcbTotalLength); -void __RPC_STUB IMFSample_GetTotalLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSample_CopyToBuffer_Proxy( - IMFSample* This, - IMFMediaBuffer *pBuffer); -void __RPC_STUB IMFSample_CopyToBuffer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFSample_INTERFACE_DEFINED__ */ @@ -1768,50 +1418,51 @@ typedef struct IMF2DBufferVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMF2DBuffer* This, + IMF2DBuffer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMF2DBuffer* This); + IMF2DBuffer *This); ULONG (STDMETHODCALLTYPE *Release)( - IMF2DBuffer* This); + IMF2DBuffer *This); /*** IMF2DBuffer methods ***/ HRESULT (STDMETHODCALLTYPE *Lock2D)( - IMF2DBuffer* This, + IMF2DBuffer *This, BYTE **ppbScanline0, LONG *plPitch); HRESULT (STDMETHODCALLTYPE *Unlock2D)( - IMF2DBuffer* This); + IMF2DBuffer *This); HRESULT (STDMETHODCALLTYPE *GetScanline0AndPitch)( - IMF2DBuffer* This, + IMF2DBuffer *This, BYTE **pbScanline0, LONG *plPitch); HRESULT (STDMETHODCALLTYPE *IsContiguousFormat)( - IMF2DBuffer* This, + IMF2DBuffer *This, WINBOOL *pfIsContiguous); HRESULT (STDMETHODCALLTYPE *GetContiguousLength)( - IMF2DBuffer* This, + IMF2DBuffer *This, DWORD *pcbLength); HRESULT (STDMETHODCALLTYPE *ContiguousCopyTo)( - IMF2DBuffer* This, + IMF2DBuffer *This, BYTE *pbDestBuffer, DWORD cbDestBuffer); HRESULT (STDMETHODCALLTYPE *ContiguousCopyFrom)( - IMF2DBuffer* This, + IMF2DBuffer *This, const BYTE *pbSrcBuffer, DWORD cbSrcBuffer); END_INTERFACE } IMF2DBufferVtbl; + interface IMF2DBuffer { CONST_VTBL IMF2DBufferVtbl* lpVtbl; }; @@ -1868,65 +1519,6 @@ static FORCEINLINE HRESULT IMF2DBuffer_ContiguousCopyFrom(IMF2DBuffer* This,cons #endif -HRESULT STDMETHODCALLTYPE IMF2DBuffer_Lock2D_Proxy( - IMF2DBuffer* This, - BYTE **ppbScanline0, - LONG *plPitch); -void __RPC_STUB IMF2DBuffer_Lock2D_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMF2DBuffer_Unlock2D_Proxy( - IMF2DBuffer* This); -void __RPC_STUB IMF2DBuffer_Unlock2D_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMF2DBuffer_GetScanline0AndPitch_Proxy( - IMF2DBuffer* This, - BYTE **pbScanline0, - LONG *plPitch); -void __RPC_STUB IMF2DBuffer_GetScanline0AndPitch_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMF2DBuffer_IsContiguousFormat_Proxy( - IMF2DBuffer* This, - WINBOOL *pfIsContiguous); -void __RPC_STUB IMF2DBuffer_IsContiguousFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMF2DBuffer_GetContiguousLength_Proxy( - IMF2DBuffer* This, - DWORD *pcbLength); -void __RPC_STUB IMF2DBuffer_GetContiguousLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMF2DBuffer_ContiguousCopyTo_Proxy( - IMF2DBuffer* This, - BYTE *pbDestBuffer, - DWORD cbDestBuffer); -void __RPC_STUB IMF2DBuffer_ContiguousCopyTo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMF2DBuffer_ContiguousCopyFrom_Proxy( - IMF2DBuffer* This, - const BYTE *pbSrcBuffer, - DWORD cbSrcBuffer); -void __RPC_STUB IMF2DBuffer_ContiguousCopyFrom_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMF2DBuffer_INTERFACE_DEFINED__ */ @@ -1970,51 +1562,51 @@ typedef struct IMF2DBuffer2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMF2DBuffer2* This, + IMF2DBuffer2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMF2DBuffer2* This); + IMF2DBuffer2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IMF2DBuffer2* This); + IMF2DBuffer2 *This); /*** IMF2DBuffer methods ***/ HRESULT (STDMETHODCALLTYPE *Lock2D)( - IMF2DBuffer2* This, + IMF2DBuffer2 *This, BYTE **ppbScanline0, LONG *plPitch); HRESULT (STDMETHODCALLTYPE *Unlock2D)( - IMF2DBuffer2* This); + IMF2DBuffer2 *This); HRESULT (STDMETHODCALLTYPE *GetScanline0AndPitch)( - IMF2DBuffer2* This, + IMF2DBuffer2 *This, BYTE **pbScanline0, LONG *plPitch); HRESULT (STDMETHODCALLTYPE *IsContiguousFormat)( - IMF2DBuffer2* This, + IMF2DBuffer2 *This, WINBOOL *pfIsContiguous); HRESULT (STDMETHODCALLTYPE *GetContiguousLength)( - IMF2DBuffer2* This, + IMF2DBuffer2 *This, DWORD *pcbLength); HRESULT (STDMETHODCALLTYPE *ContiguousCopyTo)( - IMF2DBuffer2* This, + IMF2DBuffer2 *This, BYTE *pbDestBuffer, DWORD cbDestBuffer); HRESULT (STDMETHODCALLTYPE *ContiguousCopyFrom)( - IMF2DBuffer2* This, + IMF2DBuffer2 *This, const BYTE *pbSrcBuffer, DWORD cbSrcBuffer); /*** IMF2DBuffer2 methods ***/ HRESULT (STDMETHODCALLTYPE *Lock2DSize)( - IMF2DBuffer2* This, + IMF2DBuffer2 *This, MF2DBuffer_LockFlags lockFlags, BYTE **ppbScanline0, LONG *plPitch, @@ -2022,11 +1614,12 @@ typedef struct IMF2DBuffer2Vtbl { DWORD *pcbBufferLength); HRESULT (STDMETHODCALLTYPE *Copy2DTo)( - IMF2DBuffer2* This, + IMF2DBuffer2 *This, IMF2DBuffer2 *pDestBuffer); END_INTERFACE } IMF2DBuffer2Vtbl; + interface IMF2DBuffer2 { CONST_VTBL IMF2DBuffer2Vtbl* lpVtbl; }; @@ -2093,26 +1686,6 @@ static FORCEINLINE HRESULT IMF2DBuffer2_Copy2DTo(IMF2DBuffer2* This,IMF2DBuffer2 #endif -HRESULT STDMETHODCALLTYPE IMF2DBuffer2_Lock2DSize_Proxy( - IMF2DBuffer2* This, - MF2DBuffer_LockFlags lockFlags, - BYTE **ppbScanline0, - LONG *plPitch, - BYTE **ppbBufferStart, - DWORD *pcbBufferLength); -void __RPC_STUB IMF2DBuffer2_Lock2DSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMF2DBuffer2_Copy2DTo_Proxy( - IMF2DBuffer2* This, - IMF2DBuffer2 *pDestBuffer); -void __RPC_STUB IMF2DBuffer2_Copy2DTo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMF2DBuffer2_INTERFACE_DEFINED__ */ @@ -2154,39 +1727,40 @@ typedef struct IMFDXGIBufferVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFDXGIBuffer* This, + IMFDXGIBuffer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFDXGIBuffer* This); + IMFDXGIBuffer *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFDXGIBuffer* This); + IMFDXGIBuffer *This); /*** IMFDXGIBuffer methods ***/ HRESULT (STDMETHODCALLTYPE *GetResource)( - IMFDXGIBuffer* This, + IMFDXGIBuffer *This, REFIID riid, LPVOID *ppvObject); HRESULT (STDMETHODCALLTYPE *GetSubresourceIndex)( - IMFDXGIBuffer* This, + IMFDXGIBuffer *This, UINT *puSubresource); HRESULT (STDMETHODCALLTYPE *GetUnknown)( - IMFDXGIBuffer* This, + IMFDXGIBuffer *This, REFIID guid, REFIID riid, LPVOID *ppvObject); HRESULT (STDMETHODCALLTYPE *SetUnknown)( - IMFDXGIBuffer* This, + IMFDXGIBuffer *This, REFIID guid, IUnknown *pUnkData); END_INTERFACE } IMFDXGIBufferVtbl; + interface IMFDXGIBuffer { CONST_VTBL IMFDXGIBufferVtbl* lpVtbl; }; @@ -2231,42 +1805,6 @@ static FORCEINLINE HRESULT IMFDXGIBuffer_SetUnknown(IMFDXGIBuffer* This,REFIID g #endif -HRESULT STDMETHODCALLTYPE IMFDXGIBuffer_GetResource_Proxy( - IMFDXGIBuffer* This, - REFIID riid, - LPVOID *ppvObject); -void __RPC_STUB IMFDXGIBuffer_GetResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFDXGIBuffer_GetSubresourceIndex_Proxy( - IMFDXGIBuffer* This, - UINT *puSubresource); -void __RPC_STUB IMFDXGIBuffer_GetSubresourceIndex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFDXGIBuffer_GetUnknown_Proxy( - IMFDXGIBuffer* This, - REFIID guid, - REFIID riid, - LPVOID *ppvObject); -void __RPC_STUB IMFDXGIBuffer_GetUnknown_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFDXGIBuffer_SetUnknown_Proxy( - IMFDXGIBuffer* This, - REFIID guid, - IUnknown *pUnkData); -void __RPC_STUB IMFDXGIBuffer_SetUnknown_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFDXGIBuffer_INTERFACE_DEFINED__ */ @@ -2310,195 +1848,196 @@ typedef struct IMFMediaTypeVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFMediaType* This, + IMFMediaType *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFMediaType* This); + IMFMediaType *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFMediaType* This); + IMFMediaType *This); /*** IMFAttributes methods ***/ HRESULT (STDMETHODCALLTYPE *GetItem)( - IMFMediaType* This, + IMFMediaType *This, REFGUID guidKey, PROPVARIANT *pValue); HRESULT (STDMETHODCALLTYPE *GetItemType)( - IMFMediaType* This, + IMFMediaType *This, REFGUID guidKey, MF_ATTRIBUTE_TYPE *pType); HRESULT (STDMETHODCALLTYPE *CompareItem)( - IMFMediaType* This, + IMFMediaType *This, REFGUID guidKey, REFPROPVARIANT Value, WINBOOL *pbResult); HRESULT (STDMETHODCALLTYPE *Compare)( - IMFMediaType* This, + IMFMediaType *This, IMFAttributes *pTheirs, MF_ATTRIBUTES_MATCH_TYPE MatchType, WINBOOL *pbResult); HRESULT (STDMETHODCALLTYPE *GetUINT32)( - IMFMediaType* This, + IMFMediaType *This, REFGUID guidKey, UINT32 *punValue); HRESULT (STDMETHODCALLTYPE *GetUINT64)( - IMFMediaType* This, + IMFMediaType *This, REFGUID guidKey, UINT64 *punValue); HRESULT (STDMETHODCALLTYPE *GetDouble)( - IMFMediaType* This, + IMFMediaType *This, REFGUID guidKey, double *pfValue); HRESULT (STDMETHODCALLTYPE *GetGUID)( - IMFMediaType* This, + IMFMediaType *This, REFGUID guidKey, GUID *pguidValue); HRESULT (STDMETHODCALLTYPE *GetStringLength)( - IMFMediaType* This, + IMFMediaType *This, REFGUID guidKey, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetString)( - IMFMediaType* This, + IMFMediaType *This, REFGUID guidKey, LPWSTR pwszValue, UINT32 cchBufSize, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetAllocatedString)( - IMFMediaType* This, + IMFMediaType *This, REFGUID guidKey, LPWSTR *ppwszValue, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetBlobSize)( - IMFMediaType* This, + IMFMediaType *This, REFGUID guidKey, UINT32 *pcbBlobSize); HRESULT (STDMETHODCALLTYPE *GetBlob)( - IMFMediaType* This, + IMFMediaType *This, REFGUID guidKey, UINT8 *pBuf, UINT32 cbBufSize, UINT32 *pcbBlobSize); HRESULT (STDMETHODCALLTYPE *GetAllocatedBlob)( - IMFMediaType* This, + IMFMediaType *This, REFGUID guidKey, UINT8 **ppBuf, UINT32 *pcbSize); HRESULT (STDMETHODCALLTYPE *GetUnknown)( - IMFMediaType* This, + IMFMediaType *This, REFGUID guidKey, REFIID riid, LPVOID *ppv); HRESULT (STDMETHODCALLTYPE *SetItem)( - IMFMediaType* This, + IMFMediaType *This, REFGUID guidKey, REFPROPVARIANT Value); HRESULT (STDMETHODCALLTYPE *DeleteItem)( - IMFMediaType* This, + IMFMediaType *This, REFGUID guidKey); HRESULT (STDMETHODCALLTYPE *DeleteAllItems)( - IMFMediaType* This); + IMFMediaType *This); HRESULT (STDMETHODCALLTYPE *SetUINT32)( - IMFMediaType* This, + IMFMediaType *This, REFGUID guidKey, UINT32 unValue); HRESULT (STDMETHODCALLTYPE *SetUINT64)( - IMFMediaType* This, + IMFMediaType *This, REFGUID guidKey, UINT64 unValue); HRESULT (STDMETHODCALLTYPE *SetDouble)( - IMFMediaType* This, + IMFMediaType *This, REFGUID guidKey, double fValue); HRESULT (STDMETHODCALLTYPE *SetGUID)( - IMFMediaType* This, + IMFMediaType *This, REFGUID guidKey, REFGUID guidValue); HRESULT (STDMETHODCALLTYPE *SetString)( - IMFMediaType* This, + IMFMediaType *This, REFGUID guidKey, LPCWSTR wszValue); HRESULT (STDMETHODCALLTYPE *SetBlob)( - IMFMediaType* This, + IMFMediaType *This, REFGUID guidKey, const UINT8 *pBuf, UINT32 cbBufSize); HRESULT (STDMETHODCALLTYPE *SetUnknown)( - IMFMediaType* This, + IMFMediaType *This, REFGUID guidKey, IUnknown *pUnknown); HRESULT (STDMETHODCALLTYPE *LockStore)( - IMFMediaType* This); + IMFMediaType *This); HRESULT (STDMETHODCALLTYPE *UnlockStore)( - IMFMediaType* This); + IMFMediaType *This); HRESULT (STDMETHODCALLTYPE *GetCount)( - IMFMediaType* This, + IMFMediaType *This, UINT32 *pcItems); HRESULT (STDMETHODCALLTYPE *GetItemByIndex)( - IMFMediaType* This, + IMFMediaType *This, UINT32 unIndex, GUID *pguidKey, PROPVARIANT *pValue); HRESULT (STDMETHODCALLTYPE *CopyAllItems)( - IMFMediaType* This, + IMFMediaType *This, IMFAttributes *pDest); /*** IMFMediaType methods ***/ HRESULT (STDMETHODCALLTYPE *GetMajorType)( - IMFMediaType* This, + IMFMediaType *This, GUID *pguidMajorType); HRESULT (STDMETHODCALLTYPE *IsCompressedFormat)( - IMFMediaType* This, + IMFMediaType *This, WINBOOL *pfCompressed); HRESULT (STDMETHODCALLTYPE *IsEqual)( - IMFMediaType* This, + IMFMediaType *This, IMFMediaType *pIMediaType, DWORD *pdwFlags); HRESULT (STDMETHODCALLTYPE *GetRepresentation)( - IMFMediaType* This, + IMFMediaType *This, GUID guidRepresentation, LPVOID *ppvRepresentation); HRESULT (STDMETHODCALLTYPE *FreeRepresentation)( - IMFMediaType* This, + IMFMediaType *This, GUID guidRepresentation, LPVOID pvRepresentation); END_INTERFACE } IMFMediaTypeVtbl; + interface IMFMediaType { CONST_VTBL IMFMediaTypeVtbl* lpVtbl; }; @@ -2669,49 +2208,6 @@ static FORCEINLINE HRESULT IMFMediaType_FreeRepresentation(IMFMediaType* This,GU #endif -HRESULT STDMETHODCALLTYPE IMFMediaType_GetMajorType_Proxy( - IMFMediaType* This, - GUID *pguidMajorType); -void __RPC_STUB IMFMediaType_GetMajorType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFMediaType_IsCompressedFormat_Proxy( - IMFMediaType* This, - WINBOOL *pfCompressed); -void __RPC_STUB IMFMediaType_IsCompressedFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFMediaType_IsEqual_Proxy( - IMFMediaType* This, - IMFMediaType *pIMediaType, - DWORD *pdwFlags); -void __RPC_STUB IMFMediaType_IsEqual_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFMediaType_GetRepresentation_Proxy( - IMFMediaType* This, - GUID guidRepresentation, - LPVOID *ppvRepresentation); -void __RPC_STUB IMFMediaType_GetRepresentation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFMediaType_FreeRepresentation_Proxy( - IMFMediaType* This, - GUID guidRepresentation, - LPVOID pvRepresentation); -void __RPC_STUB IMFMediaType_FreeRepresentation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFMediaType_INTERFACE_DEFINED__ */ @@ -2747,199 +2243,200 @@ typedef struct IMFAudioMediaTypeVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFAudioMediaType* This); + IMFAudioMediaType *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFAudioMediaType* This); + IMFAudioMediaType *This); /*** IMFAttributes methods ***/ HRESULT (STDMETHODCALLTYPE *GetItem)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, REFGUID guidKey, PROPVARIANT *pValue); HRESULT (STDMETHODCALLTYPE *GetItemType)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, REFGUID guidKey, MF_ATTRIBUTE_TYPE *pType); HRESULT (STDMETHODCALLTYPE *CompareItem)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, REFGUID guidKey, REFPROPVARIANT Value, WINBOOL *pbResult); HRESULT (STDMETHODCALLTYPE *Compare)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, IMFAttributes *pTheirs, MF_ATTRIBUTES_MATCH_TYPE MatchType, WINBOOL *pbResult); HRESULT (STDMETHODCALLTYPE *GetUINT32)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, REFGUID guidKey, UINT32 *punValue); HRESULT (STDMETHODCALLTYPE *GetUINT64)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, REFGUID guidKey, UINT64 *punValue); HRESULT (STDMETHODCALLTYPE *GetDouble)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, REFGUID guidKey, double *pfValue); HRESULT (STDMETHODCALLTYPE *GetGUID)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, REFGUID guidKey, GUID *pguidValue); HRESULT (STDMETHODCALLTYPE *GetStringLength)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, REFGUID guidKey, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetString)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, REFGUID guidKey, LPWSTR pwszValue, UINT32 cchBufSize, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetAllocatedString)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, REFGUID guidKey, LPWSTR *ppwszValue, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetBlobSize)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, REFGUID guidKey, UINT32 *pcbBlobSize); HRESULT (STDMETHODCALLTYPE *GetBlob)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, REFGUID guidKey, UINT8 *pBuf, UINT32 cbBufSize, UINT32 *pcbBlobSize); HRESULT (STDMETHODCALLTYPE *GetAllocatedBlob)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, REFGUID guidKey, UINT8 **ppBuf, UINT32 *pcbSize); HRESULT (STDMETHODCALLTYPE *GetUnknown)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, REFGUID guidKey, REFIID riid, LPVOID *ppv); HRESULT (STDMETHODCALLTYPE *SetItem)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, REFGUID guidKey, REFPROPVARIANT Value); HRESULT (STDMETHODCALLTYPE *DeleteItem)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, REFGUID guidKey); HRESULT (STDMETHODCALLTYPE *DeleteAllItems)( - IMFAudioMediaType* This); + IMFAudioMediaType *This); HRESULT (STDMETHODCALLTYPE *SetUINT32)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, REFGUID guidKey, UINT32 unValue); HRESULT (STDMETHODCALLTYPE *SetUINT64)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, REFGUID guidKey, UINT64 unValue); HRESULT (STDMETHODCALLTYPE *SetDouble)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, REFGUID guidKey, double fValue); HRESULT (STDMETHODCALLTYPE *SetGUID)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, REFGUID guidKey, REFGUID guidValue); HRESULT (STDMETHODCALLTYPE *SetString)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, REFGUID guidKey, LPCWSTR wszValue); HRESULT (STDMETHODCALLTYPE *SetBlob)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, REFGUID guidKey, const UINT8 *pBuf, UINT32 cbBufSize); HRESULT (STDMETHODCALLTYPE *SetUnknown)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, REFGUID guidKey, IUnknown *pUnknown); HRESULT (STDMETHODCALLTYPE *LockStore)( - IMFAudioMediaType* This); + IMFAudioMediaType *This); HRESULT (STDMETHODCALLTYPE *UnlockStore)( - IMFAudioMediaType* This); + IMFAudioMediaType *This); HRESULT (STDMETHODCALLTYPE *GetCount)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, UINT32 *pcItems); HRESULT (STDMETHODCALLTYPE *GetItemByIndex)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, UINT32 unIndex, GUID *pguidKey, PROPVARIANT *pValue); HRESULT (STDMETHODCALLTYPE *CopyAllItems)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, IMFAttributes *pDest); /*** IMFMediaType methods ***/ HRESULT (STDMETHODCALLTYPE *GetMajorType)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, GUID *pguidMajorType); HRESULT (STDMETHODCALLTYPE *IsCompressedFormat)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, WINBOOL *pfCompressed); HRESULT (STDMETHODCALLTYPE *IsEqual)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, IMFMediaType *pIMediaType, DWORD *pdwFlags); HRESULT (STDMETHODCALLTYPE *GetRepresentation)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, GUID guidRepresentation, LPVOID *ppvRepresentation); HRESULT (STDMETHODCALLTYPE *FreeRepresentation)( - IMFAudioMediaType* This, + IMFAudioMediaType *This, GUID guidRepresentation, LPVOID pvRepresentation); /*** IMFAudioMediaType methods ***/ const WAVEFORMATEX * (STDMETHODCALLTYPE *GetAudioFormat)( - IMFAudioMediaType* This); + IMFAudioMediaType *This); END_INTERFACE } IMFAudioMediaTypeVtbl; + interface IMFAudioMediaType { CONST_VTBL IMFAudioMediaTypeVtbl* lpVtbl; }; @@ -3116,13 +2613,6 @@ static FORCEINLINE const WAVEFORMATEX * IMFAudioMediaType_GetAudioFormat(IMFAudi #endif -const WAVEFORMATEX * STDMETHODCALLTYPE IMFAudioMediaType_GetAudioFormat_Proxy( - IMFAudioMediaType* This); -void __RPC_STUB IMFAudioMediaType_GetAudioFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFAudioMediaType_INTERFACE_DEFINED__ */ @@ -3217,7 +2707,9 @@ typedef enum _MFVideoTransferMatrix { MFVideoTransferMatrix_BT709 = 1, MFVideoTransferMatrix_BT601 = 2, MFVideoTransferMatrix_SMPTE240M = 3, - MFVideoTransferMatrix_Last = 4, + MFVideoTransferMatrix_BT2020_10 = 4, + MFVideoTransferMatrix_BT2020_12 = 5, + MFVideoTransferMatrix_Last = 6, MFVideoTransferMatrix_ForceDWORD = 0x7fffffff } MFVideoTransferMatrix; @@ -3396,205 +2888,206 @@ typedef struct IMFVideoMediaTypeVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFVideoMediaType* This); + IMFVideoMediaType *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFVideoMediaType* This); + IMFVideoMediaType *This); /*** IMFAttributes methods ***/ HRESULT (STDMETHODCALLTYPE *GetItem)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, REFGUID guidKey, PROPVARIANT *pValue); HRESULT (STDMETHODCALLTYPE *GetItemType)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, REFGUID guidKey, MF_ATTRIBUTE_TYPE *pType); HRESULT (STDMETHODCALLTYPE *CompareItem)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, REFGUID guidKey, REFPROPVARIANT Value, WINBOOL *pbResult); HRESULT (STDMETHODCALLTYPE *Compare)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, IMFAttributes *pTheirs, MF_ATTRIBUTES_MATCH_TYPE MatchType, WINBOOL *pbResult); HRESULT (STDMETHODCALLTYPE *GetUINT32)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, REFGUID guidKey, UINT32 *punValue); HRESULT (STDMETHODCALLTYPE *GetUINT64)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, REFGUID guidKey, UINT64 *punValue); HRESULT (STDMETHODCALLTYPE *GetDouble)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, REFGUID guidKey, double *pfValue); HRESULT (STDMETHODCALLTYPE *GetGUID)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, REFGUID guidKey, GUID *pguidValue); HRESULT (STDMETHODCALLTYPE *GetStringLength)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, REFGUID guidKey, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetString)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, REFGUID guidKey, LPWSTR pwszValue, UINT32 cchBufSize, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetAllocatedString)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, REFGUID guidKey, LPWSTR *ppwszValue, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetBlobSize)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, REFGUID guidKey, UINT32 *pcbBlobSize); HRESULT (STDMETHODCALLTYPE *GetBlob)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, REFGUID guidKey, UINT8 *pBuf, UINT32 cbBufSize, UINT32 *pcbBlobSize); HRESULT (STDMETHODCALLTYPE *GetAllocatedBlob)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, REFGUID guidKey, UINT8 **ppBuf, UINT32 *pcbSize); HRESULT (STDMETHODCALLTYPE *GetUnknown)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, REFGUID guidKey, REFIID riid, LPVOID *ppv); HRESULT (STDMETHODCALLTYPE *SetItem)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, REFGUID guidKey, REFPROPVARIANT Value); HRESULT (STDMETHODCALLTYPE *DeleteItem)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, REFGUID guidKey); HRESULT (STDMETHODCALLTYPE *DeleteAllItems)( - IMFVideoMediaType* This); + IMFVideoMediaType *This); HRESULT (STDMETHODCALLTYPE *SetUINT32)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, REFGUID guidKey, UINT32 unValue); HRESULT (STDMETHODCALLTYPE *SetUINT64)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, REFGUID guidKey, UINT64 unValue); HRESULT (STDMETHODCALLTYPE *SetDouble)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, REFGUID guidKey, double fValue); HRESULT (STDMETHODCALLTYPE *SetGUID)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, REFGUID guidKey, REFGUID guidValue); HRESULT (STDMETHODCALLTYPE *SetString)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, REFGUID guidKey, LPCWSTR wszValue); HRESULT (STDMETHODCALLTYPE *SetBlob)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, REFGUID guidKey, const UINT8 *pBuf, UINT32 cbBufSize); HRESULT (STDMETHODCALLTYPE *SetUnknown)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, REFGUID guidKey, IUnknown *pUnknown); HRESULT (STDMETHODCALLTYPE *LockStore)( - IMFVideoMediaType* This); + IMFVideoMediaType *This); HRESULT (STDMETHODCALLTYPE *UnlockStore)( - IMFVideoMediaType* This); + IMFVideoMediaType *This); HRESULT (STDMETHODCALLTYPE *GetCount)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, UINT32 *pcItems); HRESULT (STDMETHODCALLTYPE *GetItemByIndex)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, UINT32 unIndex, GUID *pguidKey, PROPVARIANT *pValue); HRESULT (STDMETHODCALLTYPE *CopyAllItems)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, IMFAttributes *pDest); /*** IMFMediaType methods ***/ HRESULT (STDMETHODCALLTYPE *GetMajorType)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, GUID *pguidMajorType); HRESULT (STDMETHODCALLTYPE *IsCompressedFormat)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, WINBOOL *pfCompressed); HRESULT (STDMETHODCALLTYPE *IsEqual)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, IMFMediaType *pIMediaType, DWORD *pdwFlags); HRESULT (STDMETHODCALLTYPE *GetRepresentation)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, GUID guidRepresentation, LPVOID *ppvRepresentation); HRESULT (STDMETHODCALLTYPE *FreeRepresentation)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, GUID guidRepresentation, LPVOID pvRepresentation); /*** IMFVideoMediaType methods ***/ const MFVIDEOFORMAT * (STDMETHODCALLTYPE *GetVideoFormat)( - IMFVideoMediaType* This); + IMFVideoMediaType *This); HRESULT (STDMETHODCALLTYPE *GetVideoRepresentation)( - IMFVideoMediaType* This, + IMFVideoMediaType *This, GUID guidRepresentation, LPVOID *ppvRepresentation, LONG lStride); END_INTERFACE } IMFVideoMediaTypeVtbl; + interface IMFVideoMediaType { CONST_VTBL IMFVideoMediaTypeVtbl* lpVtbl; }; @@ -3775,23 +3268,6 @@ static FORCEINLINE HRESULT IMFVideoMediaType_GetVideoRepresentation(IMFVideoMedi #endif -const MFVIDEOFORMAT * STDMETHODCALLTYPE IMFVideoMediaType_GetVideoFormat_Proxy( - IMFVideoMediaType* This); -void __RPC_STUB IMFVideoMediaType_GetVideoFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFVideoMediaType_GetVideoRepresentation_Proxy( - IMFVideoMediaType* This, - GUID guidRepresentation, - LPVOID *ppvRepresentation, - LONG lStride); -void __RPC_STUB IMFVideoMediaType_GetVideoRepresentation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFVideoMediaType_INTERFACE_DEFINED__ */ @@ -3834,37 +3310,38 @@ typedef struct IMFAsyncResultVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFAsyncResult* This, + IMFAsyncResult *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFAsyncResult* This); + IMFAsyncResult *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFAsyncResult* This); + IMFAsyncResult *This); /*** IMFAsyncResult methods ***/ HRESULT (STDMETHODCALLTYPE *GetState)( - IMFAsyncResult* This, + IMFAsyncResult *This, IUnknown **ppunkState); HRESULT (STDMETHODCALLTYPE *GetStatus)( - IMFAsyncResult* This); + IMFAsyncResult *This); HRESULT (STDMETHODCALLTYPE *SetStatus)( - IMFAsyncResult* This, + IMFAsyncResult *This, HRESULT hrStatus); HRESULT (STDMETHODCALLTYPE *GetObject)( - IMFAsyncResult* This, + IMFAsyncResult *This, IUnknown **ppObject); IUnknown * (STDMETHODCALLTYPE *GetStateNoAddRef)( - IMFAsyncResult* This); + IMFAsyncResult *This); END_INTERFACE } IMFAsyncResultVtbl; + interface IMFAsyncResult { CONST_VTBL IMFAsyncResultVtbl* lpVtbl; }; @@ -3913,37 +3390,6 @@ static FORCEINLINE IUnknown * IMFAsyncResult_GetStateNoAddRef(IMFAsyncResult* Th #endif -HRESULT STDMETHODCALLTYPE IMFAsyncResult_GetState_Proxy( - IMFAsyncResult* This, - IUnknown **ppunkState); -void __RPC_STUB IMFAsyncResult_GetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAsyncResult_GetStatus_Proxy( - IMFAsyncResult* This); -void __RPC_STUB IMFAsyncResult_GetStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAsyncResult_SetStatus_Proxy( - IMFAsyncResult* This, - HRESULT hrStatus); -void __RPC_STUB IMFAsyncResult_SetStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAsyncResult_GetObject_Proxy( - IMFAsyncResult* This, - IUnknown **ppObject); -void __RPC_STUB IMFAsyncResult_GetObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFAsyncResult_INTERFACE_DEFINED__ */ @@ -3976,28 +3422,29 @@ typedef struct IMFAsyncCallbackVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFAsyncCallback* This, + IMFAsyncCallback *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFAsyncCallback* This); + IMFAsyncCallback *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFAsyncCallback* This); + IMFAsyncCallback *This); /*** IMFAsyncCallback methods ***/ HRESULT (STDMETHODCALLTYPE *GetParameters)( - IMFAsyncCallback* This, + IMFAsyncCallback *This, DWORD *pdwFlags, DWORD *pdwQueue); HRESULT (STDMETHODCALLTYPE *Invoke)( - IMFAsyncCallback* This, + IMFAsyncCallback *This, IMFAsyncResult *pAsyncResult); END_INTERFACE } IMFAsyncCallbackVtbl; + interface IMFAsyncCallback { CONST_VTBL IMFAsyncCallbackVtbl* lpVtbl; }; @@ -4034,23 +3481,6 @@ static FORCEINLINE HRESULT IMFAsyncCallback_Invoke(IMFAsyncCallback* This,IMFAsy #endif -HRESULT STDMETHODCALLTYPE IMFAsyncCallback_GetParameters_Proxy( - IMFAsyncCallback* This, - DWORD *pdwFlags, - DWORD *pdwQueue); -void __RPC_STUB IMFAsyncCallback_GetParameters_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFAsyncCallback_Invoke_Proxy( - IMFAsyncCallback* This, - IMFAsyncResult *pAsyncResult); -void __RPC_STUB IMFAsyncCallback_Invoke_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFAsyncCallback_INTERFACE_DEFINED__ */ @@ -4084,35 +3514,36 @@ typedef struct IMFAsyncCallbackLoggingVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFAsyncCallbackLogging* This, + IMFAsyncCallbackLogging *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFAsyncCallbackLogging* This); + IMFAsyncCallbackLogging *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFAsyncCallbackLogging* This); + IMFAsyncCallbackLogging *This); /*** IMFAsyncCallback methods ***/ HRESULT (STDMETHODCALLTYPE *GetParameters)( - IMFAsyncCallbackLogging* This, + IMFAsyncCallbackLogging *This, DWORD *pdwFlags, DWORD *pdwQueue); HRESULT (STDMETHODCALLTYPE *Invoke)( - IMFAsyncCallbackLogging* This, + IMFAsyncCallbackLogging *This, IMFAsyncResult *pAsyncResult); /*** IMFAsyncCallbackLogging methods ***/ void * (STDMETHODCALLTYPE *GetObjectPointer)( - IMFAsyncCallbackLogging* This); + IMFAsyncCallbackLogging *This); DWORD (STDMETHODCALLTYPE *GetObjectTag)( - IMFAsyncCallbackLogging* This); + IMFAsyncCallbackLogging *This); END_INTERFACE } IMFAsyncCallbackLoggingVtbl; + interface IMFAsyncCallbackLogging { CONST_VTBL IMFAsyncCallbackLoggingVtbl* lpVtbl; }; @@ -4159,20 +3590,6 @@ static FORCEINLINE DWORD IMFAsyncCallbackLogging_GetObjectTag(IMFAsyncCallbackLo #endif -void * STDMETHODCALLTYPE IMFAsyncCallbackLogging_GetObjectPointer_Proxy( - IMFAsyncCallbackLogging* This); -void __RPC_STUB IMFAsyncCallbackLogging_GetObjectPointer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -DWORD STDMETHODCALLTYPE IMFAsyncCallbackLogging_GetObjectTag_Proxy( - IMFAsyncCallbackLogging* This); -void __RPC_STUB IMFAsyncCallbackLogging_GetObjectTag_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFAsyncCallbackLogging_INTERFACE_DEFINED__ */ @@ -4298,7 +3715,6 @@ enum { MEReservedMax = 10000 }; - typedef DWORD MediaEventType; /***************************************************************************** @@ -4334,188 +3750,189 @@ typedef struct IMFMediaEventVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFMediaEvent* This, + IMFMediaEvent *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFMediaEvent* This); + IMFMediaEvent *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFMediaEvent* This); + IMFMediaEvent *This); /*** IMFAttributes methods ***/ HRESULT (STDMETHODCALLTYPE *GetItem)( - IMFMediaEvent* This, + IMFMediaEvent *This, REFGUID guidKey, PROPVARIANT *pValue); HRESULT (STDMETHODCALLTYPE *GetItemType)( - IMFMediaEvent* This, + IMFMediaEvent *This, REFGUID guidKey, MF_ATTRIBUTE_TYPE *pType); HRESULT (STDMETHODCALLTYPE *CompareItem)( - IMFMediaEvent* This, + IMFMediaEvent *This, REFGUID guidKey, REFPROPVARIANT Value, WINBOOL *pbResult); HRESULT (STDMETHODCALLTYPE *Compare)( - IMFMediaEvent* This, + IMFMediaEvent *This, IMFAttributes *pTheirs, MF_ATTRIBUTES_MATCH_TYPE MatchType, WINBOOL *pbResult); HRESULT (STDMETHODCALLTYPE *GetUINT32)( - IMFMediaEvent* This, + IMFMediaEvent *This, REFGUID guidKey, UINT32 *punValue); HRESULT (STDMETHODCALLTYPE *GetUINT64)( - IMFMediaEvent* This, + IMFMediaEvent *This, REFGUID guidKey, UINT64 *punValue); HRESULT (STDMETHODCALLTYPE *GetDouble)( - IMFMediaEvent* This, + IMFMediaEvent *This, REFGUID guidKey, double *pfValue); HRESULT (STDMETHODCALLTYPE *GetGUID)( - IMFMediaEvent* This, + IMFMediaEvent *This, REFGUID guidKey, GUID *pguidValue); HRESULT (STDMETHODCALLTYPE *GetStringLength)( - IMFMediaEvent* This, + IMFMediaEvent *This, REFGUID guidKey, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetString)( - IMFMediaEvent* This, + IMFMediaEvent *This, REFGUID guidKey, LPWSTR pwszValue, UINT32 cchBufSize, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetAllocatedString)( - IMFMediaEvent* This, + IMFMediaEvent *This, REFGUID guidKey, LPWSTR *ppwszValue, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetBlobSize)( - IMFMediaEvent* This, + IMFMediaEvent *This, REFGUID guidKey, UINT32 *pcbBlobSize); HRESULT (STDMETHODCALLTYPE *GetBlob)( - IMFMediaEvent* This, + IMFMediaEvent *This, REFGUID guidKey, UINT8 *pBuf, UINT32 cbBufSize, UINT32 *pcbBlobSize); HRESULT (STDMETHODCALLTYPE *GetAllocatedBlob)( - IMFMediaEvent* This, + IMFMediaEvent *This, REFGUID guidKey, UINT8 **ppBuf, UINT32 *pcbSize); HRESULT (STDMETHODCALLTYPE *GetUnknown)( - IMFMediaEvent* This, + IMFMediaEvent *This, REFGUID guidKey, REFIID riid, LPVOID *ppv); HRESULT (STDMETHODCALLTYPE *SetItem)( - IMFMediaEvent* This, + IMFMediaEvent *This, REFGUID guidKey, REFPROPVARIANT Value); HRESULT (STDMETHODCALLTYPE *DeleteItem)( - IMFMediaEvent* This, + IMFMediaEvent *This, REFGUID guidKey); HRESULT (STDMETHODCALLTYPE *DeleteAllItems)( - IMFMediaEvent* This); + IMFMediaEvent *This); HRESULT (STDMETHODCALLTYPE *SetUINT32)( - IMFMediaEvent* This, + IMFMediaEvent *This, REFGUID guidKey, UINT32 unValue); HRESULT (STDMETHODCALLTYPE *SetUINT64)( - IMFMediaEvent* This, + IMFMediaEvent *This, REFGUID guidKey, UINT64 unValue); HRESULT (STDMETHODCALLTYPE *SetDouble)( - IMFMediaEvent* This, + IMFMediaEvent *This, REFGUID guidKey, double fValue); HRESULT (STDMETHODCALLTYPE *SetGUID)( - IMFMediaEvent* This, + IMFMediaEvent *This, REFGUID guidKey, REFGUID guidValue); HRESULT (STDMETHODCALLTYPE *SetString)( - IMFMediaEvent* This, + IMFMediaEvent *This, REFGUID guidKey, LPCWSTR wszValue); HRESULT (STDMETHODCALLTYPE *SetBlob)( - IMFMediaEvent* This, + IMFMediaEvent *This, REFGUID guidKey, const UINT8 *pBuf, UINT32 cbBufSize); HRESULT (STDMETHODCALLTYPE *SetUnknown)( - IMFMediaEvent* This, + IMFMediaEvent *This, REFGUID guidKey, IUnknown *pUnknown); HRESULT (STDMETHODCALLTYPE *LockStore)( - IMFMediaEvent* This); + IMFMediaEvent *This); HRESULT (STDMETHODCALLTYPE *UnlockStore)( - IMFMediaEvent* This); + IMFMediaEvent *This); HRESULT (STDMETHODCALLTYPE *GetCount)( - IMFMediaEvent* This, + IMFMediaEvent *This, UINT32 *pcItems); HRESULT (STDMETHODCALLTYPE *GetItemByIndex)( - IMFMediaEvent* This, + IMFMediaEvent *This, UINT32 unIndex, GUID *pguidKey, PROPVARIANT *pValue); HRESULT (STDMETHODCALLTYPE *CopyAllItems)( - IMFMediaEvent* This, + IMFMediaEvent *This, IMFAttributes *pDest); /*** IMFMediaEvent methods ***/ HRESULT (STDMETHODCALLTYPE *GetType)( - IMFMediaEvent* This, + IMFMediaEvent *This, MediaEventType *pmet); HRESULT (STDMETHODCALLTYPE *GetExtendedType)( - IMFMediaEvent* This, + IMFMediaEvent *This, GUID *pguidExtendedType); HRESULT (STDMETHODCALLTYPE *GetStatus)( - IMFMediaEvent* This, + IMFMediaEvent *This, HRESULT *phrStatus); HRESULT (STDMETHODCALLTYPE *GetValue)( - IMFMediaEvent* This, + IMFMediaEvent *This, PROPVARIANT *pvValue); END_INTERFACE } IMFMediaEventVtbl; + interface IMFMediaEvent { CONST_VTBL IMFMediaEventVtbl* lpVtbl; }; @@ -4682,38 +4099,6 @@ static FORCEINLINE HRESULT IMFMediaEvent_GetValue(IMFMediaEvent* This,PROPVARIAN #endif -HRESULT STDMETHODCALLTYPE IMFMediaEvent_GetType_Proxy( - IMFMediaEvent* This, - MediaEventType *pmet); -void __RPC_STUB IMFMediaEvent_GetType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFMediaEvent_GetExtendedType_Proxy( - IMFMediaEvent* This, - GUID *pguidExtendedType); -void __RPC_STUB IMFMediaEvent_GetExtendedType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFMediaEvent_GetStatus_Proxy( - IMFMediaEvent* This, - HRESULT *phrStatus); -void __RPC_STUB IMFMediaEvent_GetStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFMediaEvent_GetValue_Proxy( - IMFMediaEvent* This, - PROPVARIANT *pvValue); -void __RPC_STUB IMFMediaEvent_GetValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFMediaEvent_INTERFACE_DEFINED__ */ @@ -4723,6 +4108,9 @@ void __RPC_STUB IMFMediaEvent_GetValue_Stub( #ifndef __IMFRemoteAsyncCallback_FWD_DEFINED__ #define __IMFRemoteAsyncCallback_FWD_DEFINED__ typedef interface IMFRemoteAsyncCallback IMFRemoteAsyncCallback; +#ifdef __cplusplus +interface IMFRemoteAsyncCallback; +#endif /* __cplusplus */ #endif @@ -4765,34 +4153,34 @@ typedef struct IMFMediaEventGeneratorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFMediaEventGenerator* This, + IMFMediaEventGenerator *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFMediaEventGenerator* This); + IMFMediaEventGenerator *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFMediaEventGenerator* This); + IMFMediaEventGenerator *This); /*** IMFMediaEventGenerator methods ***/ HRESULT (STDMETHODCALLTYPE *GetEvent)( - IMFMediaEventGenerator* This, + IMFMediaEventGenerator *This, DWORD dwFlags, IMFMediaEvent **ppEvent); HRESULT (STDMETHODCALLTYPE *BeginGetEvent)( - IMFMediaEventGenerator* This, + IMFMediaEventGenerator *This, IMFAsyncCallback *pCallback, IUnknown *punkState); HRESULT (STDMETHODCALLTYPE *EndGetEvent)( - IMFMediaEventGenerator* This, + IMFMediaEventGenerator *This, IMFAsyncResult *pResult, IMFMediaEvent **ppEvent); HRESULT (STDMETHODCALLTYPE *QueueEvent)( - IMFMediaEventGenerator* This, + IMFMediaEventGenerator *This, MediaEventType met, REFGUID guidExtendedType, HRESULT hrStatus, @@ -4800,6 +4188,7 @@ typedef struct IMFMediaEventGeneratorVtbl { END_INTERFACE } IMFMediaEventGeneratorVtbl; + interface IMFMediaEventGenerator { CONST_VTBL IMFMediaEventGeneratorVtbl* lpVtbl; }; @@ -4844,15 +4233,6 @@ static FORCEINLINE HRESULT IMFMediaEventGenerator_QueueEvent(IMFMediaEventGenera #endif -HRESULT STDMETHODCALLTYPE IMFMediaEventGenerator_GetEvent_Proxy( - IMFMediaEventGenerator* This, - DWORD dwFlags, - IMFMediaEvent **ppEvent); -void __RPC_STUB IMFMediaEventGenerator_GetEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE IMFMediaEventGenerator_RemoteBeginGetEvent_Proxy( IMFMediaEventGenerator* This, IMFRemoteAsyncCallback *pCallback); @@ -4871,17 +4251,6 @@ void __RPC_STUB IMFMediaEventGenerator_RemoteEndGetEvent_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFMediaEventGenerator_QueueEvent_Proxy( - IMFMediaEventGenerator* This, - MediaEventType met, - REFGUID guidExtendedType, - HRESULT hrStatus, - const PROPVARIANT *pvValue); -void __RPC_STUB IMFMediaEventGenerator_QueueEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IMFMediaEventGenerator_BeginGetEvent_Proxy( IMFMediaEventGenerator* This, IMFAsyncCallback *pCallback, @@ -4929,24 +4298,25 @@ typedef struct IMFRemoteAsyncCallbackVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFRemoteAsyncCallback* This, + IMFRemoteAsyncCallback *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFRemoteAsyncCallback* This); + IMFRemoteAsyncCallback *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFRemoteAsyncCallback* This); + IMFRemoteAsyncCallback *This); /*** IMFRemoteAsyncCallback methods ***/ HRESULT (STDMETHODCALLTYPE *Invoke)( - IMFRemoteAsyncCallback* This, + IMFRemoteAsyncCallback *This, HRESULT hr, IUnknown *pRemoteResult); END_INTERFACE } IMFRemoteAsyncCallbackVtbl; + interface IMFRemoteAsyncCallback { CONST_VTBL IMFRemoteAsyncCallbackVtbl* lpVtbl; }; @@ -4979,15 +4349,6 @@ static FORCEINLINE HRESULT IMFRemoteAsyncCallback_Invoke(IMFRemoteAsyncCallback* #endif -HRESULT STDMETHODCALLTYPE IMFRemoteAsyncCallback_Invoke_Proxy( - IMFRemoteAsyncCallback* This, - HRESULT hr, - IUnknown *pRemoteResult); -void __RPC_STUB IMFRemoteAsyncCallback_Invoke_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFRemoteAsyncCallback_INTERFACE_DEFINED__ */ @@ -5081,92 +4442,93 @@ typedef struct IMFByteStreamVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFByteStream* This, + IMFByteStream *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFByteStream* This); + IMFByteStream *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFByteStream* This); + IMFByteStream *This); /*** IMFByteStream methods ***/ HRESULT (STDMETHODCALLTYPE *GetCapabilities)( - IMFByteStream* This, + IMFByteStream *This, DWORD *pdwCapabilities); HRESULT (STDMETHODCALLTYPE *GetLength)( - IMFByteStream* This, + IMFByteStream *This, QWORD *pqwLength); HRESULT (STDMETHODCALLTYPE *SetLength)( - IMFByteStream* This, + IMFByteStream *This, QWORD qwLength); HRESULT (STDMETHODCALLTYPE *GetCurrentPosition)( - IMFByteStream* This, + IMFByteStream *This, QWORD *pqwPosition); HRESULT (STDMETHODCALLTYPE *SetCurrentPosition)( - IMFByteStream* This, + IMFByteStream *This, QWORD qwPosition); HRESULT (STDMETHODCALLTYPE *IsEndOfStream)( - IMFByteStream* This, + IMFByteStream *This, WINBOOL *pfEndOfStream); HRESULT (STDMETHODCALLTYPE *Read)( - IMFByteStream* This, + IMFByteStream *This, BYTE *pb, ULONG cb, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *BeginRead)( - IMFByteStream* This, + IMFByteStream *This, BYTE *pb, ULONG cb, IMFAsyncCallback *pCallback, IUnknown *punkState); HRESULT (STDMETHODCALLTYPE *EndRead)( - IMFByteStream* This, + IMFByteStream *This, IMFAsyncResult *pResult, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Write)( - IMFByteStream* This, + IMFByteStream *This, const BYTE *pb, ULONG cb, ULONG *pcbWritten); HRESULT (STDMETHODCALLTYPE *BeginWrite)( - IMFByteStream* This, + IMFByteStream *This, const BYTE *pb, ULONG cb, IMFAsyncCallback *pCallback, IUnknown *punkState); HRESULT (STDMETHODCALLTYPE *EndWrite)( - IMFByteStream* This, + IMFByteStream *This, IMFAsyncResult *pResult, ULONG *pcbWritten); HRESULT (STDMETHODCALLTYPE *Seek)( - IMFByteStream* This, + IMFByteStream *This, MFBYTESTREAM_SEEK_ORIGIN SeekOrigin, LONGLONG llSeekOffset, DWORD dwSeekFlags, QWORD *pqwCurrentPosition); HRESULT (STDMETHODCALLTYPE *Flush)( - IMFByteStream* This); + IMFByteStream *This); HRESULT (STDMETHODCALLTYPE *Close)( - IMFByteStream* This); + IMFByteStream *This); END_INTERFACE } IMFByteStreamVtbl; + interface IMFByteStream { CONST_VTBL IMFByteStreamVtbl* lpVtbl; }; @@ -5255,64 +4617,6 @@ static FORCEINLINE HRESULT IMFByteStream_Close(IMFByteStream* This) { #endif -HRESULT STDMETHODCALLTYPE IMFByteStream_GetCapabilities_Proxy( - IMFByteStream* This, - DWORD *pdwCapabilities); -void __RPC_STUB IMFByteStream_GetCapabilities_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFByteStream_GetLength_Proxy( - IMFByteStream* This, - QWORD *pqwLength); -void __RPC_STUB IMFByteStream_GetLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFByteStream_SetLength_Proxy( - IMFByteStream* This, - QWORD qwLength); -void __RPC_STUB IMFByteStream_SetLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFByteStream_GetCurrentPosition_Proxy( - IMFByteStream* This, - QWORD *pqwPosition); -void __RPC_STUB IMFByteStream_GetCurrentPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFByteStream_SetCurrentPosition_Proxy( - IMFByteStream* This, - QWORD qwPosition); -void __RPC_STUB IMFByteStream_SetCurrentPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFByteStream_IsEndOfStream_Proxy( - IMFByteStream* This, - WINBOOL *pfEndOfStream); -void __RPC_STUB IMFByteStream_IsEndOfStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFByteStream_Read_Proxy( - IMFByteStream* This, - BYTE *pb, - ULONG cb, - ULONG *pcbRead); -void __RPC_STUB IMFByteStream_Read_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE IMFByteStream_RemoteBeginRead_Proxy( IMFByteStream* This, ULONG cb, @@ -5333,16 +4637,6 @@ void __RPC_STUB IMFByteStream_RemoteEndRead_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFByteStream_Write_Proxy( - IMFByteStream* This, - const BYTE *pb, - ULONG cb, - ULONG *pcbWritten); -void __RPC_STUB IMFByteStream_Write_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE IMFByteStream_RemoteBeginWrite_Proxy( IMFByteStream* This, const BYTE *pb, @@ -5362,31 +4656,6 @@ void __RPC_STUB IMFByteStream_RemoteEndWrite_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFByteStream_Seek_Proxy( - IMFByteStream* This, - MFBYTESTREAM_SEEK_ORIGIN SeekOrigin, - LONGLONG llSeekOffset, - DWORD dwSeekFlags, - QWORD *pqwCurrentPosition); -void __RPC_STUB IMFByteStream_Seek_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFByteStream_Flush_Proxy( - IMFByteStream* This); -void __RPC_STUB IMFByteStream_Flush_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFByteStream_Close_Proxy( - IMFByteStream* This); -void __RPC_STUB IMFByteStream_Close_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IMFByteStream_BeginRead_Proxy( IMFByteStream* This, BYTE *pb, @@ -5488,19 +4757,19 @@ typedef struct IMFByteStreamProxyClassFactoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFByteStreamProxyClassFactory* This, + IMFByteStreamProxyClassFactory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFByteStreamProxyClassFactory* This); + IMFByteStreamProxyClassFactory *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFByteStreamProxyClassFactory* This); + IMFByteStreamProxyClassFactory *This); /*** IMFByteStreamProxyClassFactory methods ***/ HRESULT (STDMETHODCALLTYPE *CreateByteStreamProxy)( - IMFByteStreamProxyClassFactory* This, + IMFByteStreamProxyClassFactory *This, IMFByteStream *pByteStream, IMFAttributes *pAttributes, REFIID riid, @@ -5508,6 +4777,7 @@ typedef struct IMFByteStreamProxyClassFactoryVtbl { END_INTERFACE } IMFByteStreamProxyClassFactoryVtbl; + interface IMFByteStreamProxyClassFactory { CONST_VTBL IMFByteStreamProxyClassFactoryVtbl* lpVtbl; }; @@ -5540,17 +4810,6 @@ static FORCEINLINE HRESULT IMFByteStreamProxyClassFactory_CreateByteStreamProxy( #endif -HRESULT STDMETHODCALLTYPE IMFByteStreamProxyClassFactory_CreateByteStreamProxy_Proxy( - IMFByteStreamProxyClassFactory* This, - IMFByteStream *pByteStream, - IMFAttributes *pAttributes, - REFIID riid, - LPVOID *ppvObject); -void __RPC_STUB IMFByteStreamProxyClassFactory_CreateByteStreamProxy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFByteStreamProxyClassFactory_INTERFACE_DEFINED__ */ @@ -5608,32 +4867,33 @@ typedef struct IMFSampleOutputStreamVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFSampleOutputStream* This, + IMFSampleOutputStream *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFSampleOutputStream* This); + IMFSampleOutputStream *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFSampleOutputStream* This); + IMFSampleOutputStream *This); /*** IMFSampleOutputStream methods ***/ HRESULT (STDMETHODCALLTYPE *BeginWriteSample)( - IMFSampleOutputStream* This, + IMFSampleOutputStream *This, IMFSample *pSample, IMFAsyncCallback *pCallback, IUnknown *punkState); HRESULT (STDMETHODCALLTYPE *EndWriteSample)( - IMFSampleOutputStream* This, + IMFSampleOutputStream *This, IMFAsyncResult *pResult); HRESULT (STDMETHODCALLTYPE *Close)( - IMFSampleOutputStream* This); + IMFSampleOutputStream *This); END_INTERFACE } IMFSampleOutputStreamVtbl; + interface IMFSampleOutputStream { CONST_VTBL IMFSampleOutputStreamVtbl* lpVtbl; }; @@ -5674,31 +4934,6 @@ static FORCEINLINE HRESULT IMFSampleOutputStream_Close(IMFSampleOutputStream* Th #endif -HRESULT STDMETHODCALLTYPE IMFSampleOutputStream_BeginWriteSample_Proxy( - IMFSampleOutputStream* This, - IMFSample *pSample, - IMFAsyncCallback *pCallback, - IUnknown *punkState); -void __RPC_STUB IMFSampleOutputStream_BeginWriteSample_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSampleOutputStream_EndWriteSample_Proxy( - IMFSampleOutputStream* This, - IMFAsyncResult *pResult); -void __RPC_STUB IMFSampleOutputStream_EndWriteSample_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSampleOutputStream_Close_Proxy( - IMFSampleOutputStream* This); -void __RPC_STUB IMFSampleOutputStream_Close_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFSampleOutputStream_INTERFACE_DEFINED__ */ @@ -5745,45 +4980,46 @@ typedef struct IMFCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFCollection* This, + IMFCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFCollection* This); + IMFCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFCollection* This); + IMFCollection *This); /*** IMFCollection methods ***/ HRESULT (STDMETHODCALLTYPE *GetElementCount)( - IMFCollection* This, + IMFCollection *This, DWORD *pcElements); HRESULT (STDMETHODCALLTYPE *GetElement)( - IMFCollection* This, + IMFCollection *This, DWORD dwElementIndex, IUnknown **ppUnkElement); HRESULT (STDMETHODCALLTYPE *AddElement)( - IMFCollection* This, + IMFCollection *This, IUnknown *pUnkElement); HRESULT (STDMETHODCALLTYPE *RemoveElement)( - IMFCollection* This, + IMFCollection *This, DWORD dwElementIndex, IUnknown **ppUnkElement); HRESULT (STDMETHODCALLTYPE *InsertElementAt)( - IMFCollection* This, + IMFCollection *This, DWORD dwIndex, IUnknown *pUnknown); HRESULT (STDMETHODCALLTYPE *RemoveAllElements)( - IMFCollection* This); + IMFCollection *This); END_INTERFACE } IMFCollectionVtbl; + interface IMFCollection { CONST_VTBL IMFCollectionVtbl* lpVtbl; }; @@ -5836,56 +5072,6 @@ static FORCEINLINE HRESULT IMFCollection_RemoveAllElements(IMFCollection* This) #endif -HRESULT STDMETHODCALLTYPE IMFCollection_GetElementCount_Proxy( - IMFCollection* This, - DWORD *pcElements); -void __RPC_STUB IMFCollection_GetElementCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFCollection_GetElement_Proxy( - IMFCollection* This, - DWORD dwElementIndex, - IUnknown **ppUnkElement); -void __RPC_STUB IMFCollection_GetElement_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFCollection_AddElement_Proxy( - IMFCollection* This, - IUnknown *pUnkElement); -void __RPC_STUB IMFCollection_AddElement_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFCollection_RemoveElement_Proxy( - IMFCollection* This, - DWORD dwElementIndex, - IUnknown **ppUnkElement); -void __RPC_STUB IMFCollection_RemoveElement_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFCollection_InsertElementAt_Proxy( - IMFCollection* This, - DWORD dwIndex, - IUnknown *pUnknown); -void __RPC_STUB IMFCollection_InsertElementAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFCollection_RemoveAllElements_Proxy( - IMFCollection* This); -void __RPC_STUB IMFCollection_RemoveAllElements_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFCollection_INTERFACE_DEFINED__ */ @@ -5941,55 +5127,56 @@ typedef struct IMFMediaEventQueueVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFMediaEventQueue* This, + IMFMediaEventQueue *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFMediaEventQueue* This); + IMFMediaEventQueue *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFMediaEventQueue* This); + IMFMediaEventQueue *This); /*** IMFMediaEventQueue methods ***/ HRESULT (STDMETHODCALLTYPE *GetEvent)( - IMFMediaEventQueue* This, + IMFMediaEventQueue *This, DWORD dwFlags, IMFMediaEvent **ppEvent); HRESULT (STDMETHODCALLTYPE *BeginGetEvent)( - IMFMediaEventQueue* This, + IMFMediaEventQueue *This, IMFAsyncCallback *pCallback, IUnknown *punkState); HRESULT (STDMETHODCALLTYPE *EndGetEvent)( - IMFMediaEventQueue* This, + IMFMediaEventQueue *This, IMFAsyncResult *pResult, IMFMediaEvent **ppEvent); HRESULT (STDMETHODCALLTYPE *QueueEvent)( - IMFMediaEventQueue* This, + IMFMediaEventQueue *This, IMFMediaEvent *pEvent); HRESULT (STDMETHODCALLTYPE *QueueEventParamVar)( - IMFMediaEventQueue* This, + IMFMediaEventQueue *This, MediaEventType met, REFGUID guidExtendedType, HRESULT hrStatus, const PROPVARIANT *pvValue); HRESULT (STDMETHODCALLTYPE *QueueEventParamUnk)( - IMFMediaEventQueue* This, + IMFMediaEventQueue *This, MediaEventType met, REFGUID guidExtendedType, HRESULT hrStatus, IUnknown *pUnk); HRESULT (STDMETHODCALLTYPE *Shutdown)( - IMFMediaEventQueue* This); + IMFMediaEventQueue *This); END_INTERFACE } IMFMediaEventQueueVtbl; + interface IMFMediaEventQueue { CONST_VTBL IMFMediaEventQueueVtbl* lpVtbl; }; @@ -6046,70 +5233,6 @@ static FORCEINLINE HRESULT IMFMediaEventQueue_Shutdown(IMFMediaEventQueue* This) #endif -HRESULT STDMETHODCALLTYPE IMFMediaEventQueue_GetEvent_Proxy( - IMFMediaEventQueue* This, - DWORD dwFlags, - IMFMediaEvent **ppEvent); -void __RPC_STUB IMFMediaEventQueue_GetEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFMediaEventQueue_BeginGetEvent_Proxy( - IMFMediaEventQueue* This, - IMFAsyncCallback *pCallback, - IUnknown *punkState); -void __RPC_STUB IMFMediaEventQueue_BeginGetEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFMediaEventQueue_EndGetEvent_Proxy( - IMFMediaEventQueue* This, - IMFAsyncResult *pResult, - IMFMediaEvent **ppEvent); -void __RPC_STUB IMFMediaEventQueue_EndGetEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFMediaEventQueue_QueueEvent_Proxy( - IMFMediaEventQueue* This, - IMFMediaEvent *pEvent); -void __RPC_STUB IMFMediaEventQueue_QueueEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFMediaEventQueue_QueueEventParamVar_Proxy( - IMFMediaEventQueue* This, - MediaEventType met, - REFGUID guidExtendedType, - HRESULT hrStatus, - const PROPVARIANT *pvValue); -void __RPC_STUB IMFMediaEventQueue_QueueEventParamVar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFMediaEventQueue_QueueEventParamUnk_Proxy( - IMFMediaEventQueue* This, - MediaEventType met, - REFGUID guidExtendedType, - HRESULT hrStatus, - IUnknown *pUnk); -void __RPC_STUB IMFMediaEventQueue_QueueEventParamUnk_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFMediaEventQueue_Shutdown_Proxy( - IMFMediaEventQueue* This); -void __RPC_STUB IMFMediaEventQueue_Shutdown_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFMediaEventQueue_INTERFACE_DEFINED__ */ @@ -6145,183 +5268,184 @@ typedef struct IMFActivateVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFActivate* This, + IMFActivate *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFActivate* This); + IMFActivate *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFActivate* This); + IMFActivate *This); /*** IMFAttributes methods ***/ HRESULT (STDMETHODCALLTYPE *GetItem)( - IMFActivate* This, + IMFActivate *This, REFGUID guidKey, PROPVARIANT *pValue); HRESULT (STDMETHODCALLTYPE *GetItemType)( - IMFActivate* This, + IMFActivate *This, REFGUID guidKey, MF_ATTRIBUTE_TYPE *pType); HRESULT (STDMETHODCALLTYPE *CompareItem)( - IMFActivate* This, + IMFActivate *This, REFGUID guidKey, REFPROPVARIANT Value, WINBOOL *pbResult); HRESULT (STDMETHODCALLTYPE *Compare)( - IMFActivate* This, + IMFActivate *This, IMFAttributes *pTheirs, MF_ATTRIBUTES_MATCH_TYPE MatchType, WINBOOL *pbResult); HRESULT (STDMETHODCALLTYPE *GetUINT32)( - IMFActivate* This, + IMFActivate *This, REFGUID guidKey, UINT32 *punValue); HRESULT (STDMETHODCALLTYPE *GetUINT64)( - IMFActivate* This, + IMFActivate *This, REFGUID guidKey, UINT64 *punValue); HRESULT (STDMETHODCALLTYPE *GetDouble)( - IMFActivate* This, + IMFActivate *This, REFGUID guidKey, double *pfValue); HRESULT (STDMETHODCALLTYPE *GetGUID)( - IMFActivate* This, + IMFActivate *This, REFGUID guidKey, GUID *pguidValue); HRESULT (STDMETHODCALLTYPE *GetStringLength)( - IMFActivate* This, + IMFActivate *This, REFGUID guidKey, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetString)( - IMFActivate* This, + IMFActivate *This, REFGUID guidKey, LPWSTR pwszValue, UINT32 cchBufSize, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetAllocatedString)( - IMFActivate* This, + IMFActivate *This, REFGUID guidKey, LPWSTR *ppwszValue, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetBlobSize)( - IMFActivate* This, + IMFActivate *This, REFGUID guidKey, UINT32 *pcbBlobSize); HRESULT (STDMETHODCALLTYPE *GetBlob)( - IMFActivate* This, + IMFActivate *This, REFGUID guidKey, UINT8 *pBuf, UINT32 cbBufSize, UINT32 *pcbBlobSize); HRESULT (STDMETHODCALLTYPE *GetAllocatedBlob)( - IMFActivate* This, + IMFActivate *This, REFGUID guidKey, UINT8 **ppBuf, UINT32 *pcbSize); HRESULT (STDMETHODCALLTYPE *GetUnknown)( - IMFActivate* This, + IMFActivate *This, REFGUID guidKey, REFIID riid, LPVOID *ppv); HRESULT (STDMETHODCALLTYPE *SetItem)( - IMFActivate* This, + IMFActivate *This, REFGUID guidKey, REFPROPVARIANT Value); HRESULT (STDMETHODCALLTYPE *DeleteItem)( - IMFActivate* This, + IMFActivate *This, REFGUID guidKey); HRESULT (STDMETHODCALLTYPE *DeleteAllItems)( - IMFActivate* This); + IMFActivate *This); HRESULT (STDMETHODCALLTYPE *SetUINT32)( - IMFActivate* This, + IMFActivate *This, REFGUID guidKey, UINT32 unValue); HRESULT (STDMETHODCALLTYPE *SetUINT64)( - IMFActivate* This, + IMFActivate *This, REFGUID guidKey, UINT64 unValue); HRESULT (STDMETHODCALLTYPE *SetDouble)( - IMFActivate* This, + IMFActivate *This, REFGUID guidKey, double fValue); HRESULT (STDMETHODCALLTYPE *SetGUID)( - IMFActivate* This, + IMFActivate *This, REFGUID guidKey, REFGUID guidValue); HRESULT (STDMETHODCALLTYPE *SetString)( - IMFActivate* This, + IMFActivate *This, REFGUID guidKey, LPCWSTR wszValue); HRESULT (STDMETHODCALLTYPE *SetBlob)( - IMFActivate* This, + IMFActivate *This, REFGUID guidKey, const UINT8 *pBuf, UINT32 cbBufSize); HRESULT (STDMETHODCALLTYPE *SetUnknown)( - IMFActivate* This, + IMFActivate *This, REFGUID guidKey, IUnknown *pUnknown); HRESULT (STDMETHODCALLTYPE *LockStore)( - IMFActivate* This); + IMFActivate *This); HRESULT (STDMETHODCALLTYPE *UnlockStore)( - IMFActivate* This); + IMFActivate *This); HRESULT (STDMETHODCALLTYPE *GetCount)( - IMFActivate* This, + IMFActivate *This, UINT32 *pcItems); HRESULT (STDMETHODCALLTYPE *GetItemByIndex)( - IMFActivate* This, + IMFActivate *This, UINT32 unIndex, GUID *pguidKey, PROPVARIANT *pValue); HRESULT (STDMETHODCALLTYPE *CopyAllItems)( - IMFActivate* This, + IMFActivate *This, IMFAttributes *pDest); /*** IMFActivate methods ***/ HRESULT (STDMETHODCALLTYPE *ActivateObject)( - IMFActivate* This, + IMFActivate *This, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *ShutdownObject)( - IMFActivate* This); + IMFActivate *This); HRESULT (STDMETHODCALLTYPE *DetachObject)( - IMFActivate* This); + IMFActivate *This); END_INTERFACE } IMFActivateVtbl; + interface IMFActivate { CONST_VTBL IMFActivateVtbl* lpVtbl; }; @@ -6484,29 +5608,6 @@ static FORCEINLINE HRESULT IMFActivate_DetachObject(IMFActivate* This) { #endif -HRESULT STDMETHODCALLTYPE IMFActivate_ActivateObject_Proxy( - IMFActivate* This, - REFIID riid, - void **ppv); -void __RPC_STUB IMFActivate_ActivateObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFActivate_ShutdownObject_Proxy( - IMFActivate* This); -void __RPC_STUB IMFActivate_ShutdownObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFActivate_DetachObject_Proxy( - IMFActivate* This); -void __RPC_STUB IMFActivate_DetachObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFActivate_INTERFACE_DEFINED__ */ @@ -6572,55 +5673,56 @@ typedef struct IMFPluginControlVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFPluginControl* This, + IMFPluginControl *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFPluginControl* This); + IMFPluginControl *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFPluginControl* This); + IMFPluginControl *This); /*** IMFPluginControl methods ***/ HRESULT (STDMETHODCALLTYPE *GetPreferredClsid)( - IMFPluginControl* This, + IMFPluginControl *This, DWORD pluginType, LPCWSTR selector, CLSID *clsid); HRESULT (STDMETHODCALLTYPE *GetPreferredClsidByIndex)( - IMFPluginControl* This, + IMFPluginControl *This, DWORD pluginType, DWORD index, LPWSTR *selector, CLSID *clsid); HRESULT (STDMETHODCALLTYPE *SetPreferredClsid)( - IMFPluginControl* This, + IMFPluginControl *This, DWORD pluginType, LPCWSTR selector, const CLSID *clsid); HRESULT (STDMETHODCALLTYPE *IsDisabled)( - IMFPluginControl* This, + IMFPluginControl *This, DWORD pluginType, REFCLSID clsid); HRESULT (STDMETHODCALLTYPE *GetDisabledByIndex)( - IMFPluginControl* This, + IMFPluginControl *This, DWORD pluginType, DWORD index, CLSID *clsid); HRESULT (STDMETHODCALLTYPE *SetDisabled)( - IMFPluginControl* This, + IMFPluginControl *This, DWORD pluginType, REFCLSID clsid, WINBOOL disabled); END_INTERFACE } IMFPluginControlVtbl; + interface IMFPluginControl { CONST_VTBL IMFPluginControlVtbl* lpVtbl; }; @@ -6673,66 +5775,6 @@ static FORCEINLINE HRESULT IMFPluginControl_SetDisabled(IMFPluginControl* This,D #endif -HRESULT STDMETHODCALLTYPE IMFPluginControl_GetPreferredClsid_Proxy( - IMFPluginControl* This, - DWORD pluginType, - LPCWSTR selector, - CLSID *clsid); -void __RPC_STUB IMFPluginControl_GetPreferredClsid_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFPluginControl_GetPreferredClsidByIndex_Proxy( - IMFPluginControl* This, - DWORD pluginType, - DWORD index, - LPWSTR *selector, - CLSID *clsid); -void __RPC_STUB IMFPluginControl_GetPreferredClsidByIndex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFPluginControl_SetPreferredClsid_Proxy( - IMFPluginControl* This, - DWORD pluginType, - LPCWSTR selector, - const CLSID *clsid); -void __RPC_STUB IMFPluginControl_SetPreferredClsid_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFPluginControl_IsDisabled_Proxy( - IMFPluginControl* This, - DWORD pluginType, - REFCLSID clsid); -void __RPC_STUB IMFPluginControl_IsDisabled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFPluginControl_GetDisabledByIndex_Proxy( - IMFPluginControl* This, - DWORD pluginType, - DWORD index, - CLSID *clsid); -void __RPC_STUB IMFPluginControl_GetDisabledByIndex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFPluginControl_SetDisabled_Proxy( - IMFPluginControl* This, - DWORD pluginType, - REFCLSID clsid, - WINBOOL disabled); -void __RPC_STUB IMFPluginControl_SetDisabled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFPluginControl_INTERFACE_DEFINED__ */ @@ -6767,60 +5809,61 @@ typedef struct IMFPluginControl2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFPluginControl2* This, + IMFPluginControl2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFPluginControl2* This); + IMFPluginControl2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFPluginControl2* This); + IMFPluginControl2 *This); /*** IMFPluginControl methods ***/ HRESULT (STDMETHODCALLTYPE *GetPreferredClsid)( - IMFPluginControl2* This, + IMFPluginControl2 *This, DWORD pluginType, LPCWSTR selector, CLSID *clsid); HRESULT (STDMETHODCALLTYPE *GetPreferredClsidByIndex)( - IMFPluginControl2* This, + IMFPluginControl2 *This, DWORD pluginType, DWORD index, LPWSTR *selector, CLSID *clsid); HRESULT (STDMETHODCALLTYPE *SetPreferredClsid)( - IMFPluginControl2* This, + IMFPluginControl2 *This, DWORD pluginType, LPCWSTR selector, const CLSID *clsid); HRESULT (STDMETHODCALLTYPE *IsDisabled)( - IMFPluginControl2* This, + IMFPluginControl2 *This, DWORD pluginType, REFCLSID clsid); HRESULT (STDMETHODCALLTYPE *GetDisabledByIndex)( - IMFPluginControl2* This, + IMFPluginControl2 *This, DWORD pluginType, DWORD index, CLSID *clsid); HRESULT (STDMETHODCALLTYPE *SetDisabled)( - IMFPluginControl2* This, + IMFPluginControl2 *This, DWORD pluginType, REFCLSID clsid, WINBOOL disabled); /*** IMFPluginControl2 methods ***/ HRESULT (STDMETHODCALLTYPE *SetPolicy)( - IMFPluginControl2* This, + IMFPluginControl2 *This, MF_PLUGIN_CONTROL_POLICY policy); END_INTERFACE } IMFPluginControl2Vtbl; + interface IMFPluginControl2 { CONST_VTBL IMFPluginControl2Vtbl* lpVtbl; }; @@ -6879,14 +5922,6 @@ static FORCEINLINE HRESULT IMFPluginControl2_SetPolicy(IMFPluginControl2* This,M #endif -HRESULT STDMETHODCALLTYPE IMFPluginControl2_SetPolicy_Proxy( - IMFPluginControl2* This, - MF_PLUGIN_CONTROL_POLICY policy); -void __RPC_STUB IMFPluginControl2_SetPolicy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFPluginControl2_INTERFACE_DEFINED__ */ @@ -6942,54 +5977,55 @@ typedef struct IMFDXGIDeviceManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFDXGIDeviceManager* This, + IMFDXGIDeviceManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFDXGIDeviceManager* This); + IMFDXGIDeviceManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFDXGIDeviceManager* This); + IMFDXGIDeviceManager *This); /*** IMFDXGIDeviceManager methods ***/ HRESULT (STDMETHODCALLTYPE *CloseDeviceHandle)( - IMFDXGIDeviceManager* This, + IMFDXGIDeviceManager *This, HANDLE hDevice); HRESULT (STDMETHODCALLTYPE *GetVideoService)( - IMFDXGIDeviceManager* This, + IMFDXGIDeviceManager *This, HANDLE hDevice, REFIID riid, void **ppService); HRESULT (STDMETHODCALLTYPE *LockDevice)( - IMFDXGIDeviceManager* This, + IMFDXGIDeviceManager *This, HANDLE hDevice, REFIID riid, void **ppUnkDevice, WINBOOL fBlock); HRESULT (STDMETHODCALLTYPE *OpenDeviceHandle)( - IMFDXGIDeviceManager* This, + IMFDXGIDeviceManager *This, HANDLE *phDevice); HRESULT (STDMETHODCALLTYPE *ResetDevice)( - IMFDXGIDeviceManager* This, + IMFDXGIDeviceManager *This, IUnknown *pUnkDevice, UINT resetToken); HRESULT (STDMETHODCALLTYPE *TestDevice)( - IMFDXGIDeviceManager* This, + IMFDXGIDeviceManager *This, HANDLE hDevice); HRESULT (STDMETHODCALLTYPE *UnlockDevice)( - IMFDXGIDeviceManager* This, + IMFDXGIDeviceManager *This, HANDLE hDevice, WINBOOL fSaveState); END_INTERFACE } IMFDXGIDeviceManagerVtbl; + interface IMFDXGIDeviceManager { CONST_VTBL IMFDXGIDeviceManagerVtbl* lpVtbl; }; @@ -7046,69 +6082,6 @@ static FORCEINLINE HRESULT IMFDXGIDeviceManager_UnlockDevice(IMFDXGIDeviceManage #endif -HRESULT STDMETHODCALLTYPE IMFDXGIDeviceManager_CloseDeviceHandle_Proxy( - IMFDXGIDeviceManager* This, - HANDLE hDevice); -void __RPC_STUB IMFDXGIDeviceManager_CloseDeviceHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFDXGIDeviceManager_GetVideoService_Proxy( - IMFDXGIDeviceManager* This, - HANDLE hDevice, - REFIID riid, - void **ppService); -void __RPC_STUB IMFDXGIDeviceManager_GetVideoService_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFDXGIDeviceManager_LockDevice_Proxy( - IMFDXGIDeviceManager* This, - HANDLE hDevice, - REFIID riid, - void **ppUnkDevice, - WINBOOL fBlock); -void __RPC_STUB IMFDXGIDeviceManager_LockDevice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFDXGIDeviceManager_OpenDeviceHandle_Proxy( - IMFDXGIDeviceManager* This, - HANDLE *phDevice); -void __RPC_STUB IMFDXGIDeviceManager_OpenDeviceHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFDXGIDeviceManager_ResetDevice_Proxy( - IMFDXGIDeviceManager* This, - IUnknown *pUnkDevice, - UINT resetToken); -void __RPC_STUB IMFDXGIDeviceManager_ResetDevice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFDXGIDeviceManager_TestDevice_Proxy( - IMFDXGIDeviceManager* This, - HANDLE hDevice); -void __RPC_STUB IMFDXGIDeviceManager_TestDevice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFDXGIDeviceManager_UnlockDevice_Proxy( - IMFDXGIDeviceManager* This, - HANDLE hDevice, - WINBOOL fSaveState); -void __RPC_STUB IMFDXGIDeviceManager_UnlockDevice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFDXGIDeviceManager_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/mfplay.h b/lib/libc/include/any-windows-any/mfplay.h index 088a78b864..3a711faac3 100644 --- a/lib/libc/include/any-windows-any/mfplay.h +++ b/lib/libc/include/any-windows-any/mfplay.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/mfplay.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/mfplay.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/mfreadwrite.h b/lib/libc/include/any-windows-any/mfreadwrite.h index 73d2581a75..866e466db2 100644 --- a/lib/libc/include/any-windows-any/mfreadwrite.h +++ b/lib/libc/include/any-windows-any/mfreadwrite.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/mfreadwrite.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/mfreadwrite.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,16 +21,25 @@ #ifndef __IMFSourceReader_FWD_DEFINED__ #define __IMFSourceReader_FWD_DEFINED__ typedef interface IMFSourceReader IMFSourceReader; +#ifdef __cplusplus +interface IMFSourceReader; +#endif /* __cplusplus */ #endif #ifndef __IMFSinkWriter_FWD_DEFINED__ #define __IMFSinkWriter_FWD_DEFINED__ typedef interface IMFSinkWriter IMFSinkWriter; +#ifdef __cplusplus +interface IMFSinkWriter; +#endif /* __cplusplus */ #endif #ifndef __IMFSourceReaderCallback_FWD_DEFINED__ #define __IMFSourceReaderCallback_FWD_DEFINED__ typedef interface IMFSourceReaderCallback IMFSourceReaderCallback; +#ifdef __cplusplus +interface IMFSourceReaderCallback; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -81,7 +91,6 @@ enum { MF_SOURCE_READER_FIRST_VIDEO_STREAM = 0xfffffffc, MF_SOURCE_READER_MEDIASOURCE = 0xffffffff }; - /***************************************************************************** * IMFSourceReader interface */ @@ -151,51 +160,51 @@ typedef struct IMFSourceReaderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFSourceReader* This, + IMFSourceReader *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFSourceReader* This); + IMFSourceReader *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFSourceReader* This); + IMFSourceReader *This); /*** IMFSourceReader methods ***/ HRESULT (STDMETHODCALLTYPE *GetStreamSelection)( - IMFSourceReader* This, + IMFSourceReader *This, DWORD dwStreamIndex, WINBOOL *pfSelected); HRESULT (STDMETHODCALLTYPE *SetStreamSelection)( - IMFSourceReader* This, + IMFSourceReader *This, DWORD dwStreamIndex, WINBOOL fSelected); HRESULT (STDMETHODCALLTYPE *GetNativeMediaType)( - IMFSourceReader* This, + IMFSourceReader *This, DWORD dwStreamIndex, DWORD dwMediaTypeIndex, IMFMediaType **ppMediaType); HRESULT (STDMETHODCALLTYPE *GetCurrentMediaType)( - IMFSourceReader* This, + IMFSourceReader *This, DWORD dwStreamIndex, IMFMediaType **ppMediaType); HRESULT (STDMETHODCALLTYPE *SetCurrentMediaType)( - IMFSourceReader* This, + IMFSourceReader *This, DWORD dwStreamIndex, DWORD *pdwReserved, IMFMediaType *pMediaType); HRESULT (STDMETHODCALLTYPE *SetCurrentPosition)( - IMFSourceReader* This, + IMFSourceReader *This, REFGUID guidTimeFormat, REFPROPVARIANT varPosition); HRESULT (STDMETHODCALLTYPE *ReadSample)( - IMFSourceReader* This, + IMFSourceReader *This, DWORD dwStreamIndex, DWORD dwControlFlags, DWORD *pdwActualStreamIndex, @@ -204,24 +213,25 @@ typedef struct IMFSourceReaderVtbl { IMFSample **ppSample); HRESULT (STDMETHODCALLTYPE *Flush)( - IMFSourceReader* This, + IMFSourceReader *This, DWORD dwStreamIndex); HRESULT (STDMETHODCALLTYPE *GetServiceForStream)( - IMFSourceReader* This, + IMFSourceReader *This, DWORD dwStreamIndex, REFGUID guidService, REFIID riid, LPVOID *ppvObject); HRESULT (STDMETHODCALLTYPE *GetPresentationAttribute)( - IMFSourceReader* This, + IMFSourceReader *This, DWORD dwStreamIndex, REFGUID guidAttribute, PROPVARIANT *pvarAttribute); END_INTERFACE } IMFSourceReaderVtbl; + interface IMFSourceReader { CONST_VTBL IMFSourceReaderVtbl* lpVtbl; }; @@ -290,104 +300,6 @@ static FORCEINLINE HRESULT IMFSourceReader_GetPresentationAttribute(IMFSourceRea #endif -HRESULT STDMETHODCALLTYPE IMFSourceReader_GetStreamSelection_Proxy( - IMFSourceReader* This, - DWORD dwStreamIndex, - WINBOOL *pfSelected); -void __RPC_STUB IMFSourceReader_GetStreamSelection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSourceReader_SetStreamSelection_Proxy( - IMFSourceReader* This, - DWORD dwStreamIndex, - WINBOOL fSelected); -void __RPC_STUB IMFSourceReader_SetStreamSelection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSourceReader_GetNativeMediaType_Proxy( - IMFSourceReader* This, - DWORD dwStreamIndex, - DWORD dwMediaTypeIndex, - IMFMediaType **ppMediaType); -void __RPC_STUB IMFSourceReader_GetNativeMediaType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSourceReader_GetCurrentMediaType_Proxy( - IMFSourceReader* This, - DWORD dwStreamIndex, - IMFMediaType **ppMediaType); -void __RPC_STUB IMFSourceReader_GetCurrentMediaType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSourceReader_SetCurrentMediaType_Proxy( - IMFSourceReader* This, - DWORD dwStreamIndex, - DWORD *pdwReserved, - IMFMediaType *pMediaType); -void __RPC_STUB IMFSourceReader_SetCurrentMediaType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSourceReader_SetCurrentPosition_Proxy( - IMFSourceReader* This, - REFGUID guidTimeFormat, - REFPROPVARIANT varPosition); -void __RPC_STUB IMFSourceReader_SetCurrentPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSourceReader_ReadSample_Proxy( - IMFSourceReader* This, - DWORD dwStreamIndex, - DWORD dwControlFlags, - DWORD *pdwActualStreamIndex, - DWORD *pdwStreamFlags, - LONGLONG *pllTimestamp, - IMFSample **ppSample); -void __RPC_STUB IMFSourceReader_ReadSample_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSourceReader_Flush_Proxy( - IMFSourceReader* This, - DWORD dwStreamIndex); -void __RPC_STUB IMFSourceReader_Flush_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSourceReader_GetServiceForStream_Proxy( - IMFSourceReader* This, - DWORD dwStreamIndex, - REFGUID guidService, - REFIID riid, - LPVOID *ppvObject); -void __RPC_STUB IMFSourceReader_GetServiceForStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSourceReader_GetPresentationAttribute_Proxy( - IMFSourceReader* This, - DWORD dwStreamIndex, - REFGUID guidAttribute, - PROPVARIANT *pvarAttribute); -void __RPC_STUB IMFSourceReader_GetPresentationAttribute_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFSourceReader_INTERFACE_DEFINED__ */ @@ -455,71 +367,72 @@ typedef struct IMFSinkWriterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFSinkWriter* This, + IMFSinkWriter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFSinkWriter* This); + IMFSinkWriter *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFSinkWriter* This); + IMFSinkWriter *This); /*** IMFSinkWriter methods ***/ HRESULT (STDMETHODCALLTYPE *AddStream)( - IMFSinkWriter* This, + IMFSinkWriter *This, IMFMediaType *pTargetMediaType, DWORD *pdwStreamIndex); HRESULT (STDMETHODCALLTYPE *SetInputMediaType)( - IMFSinkWriter* This, + IMFSinkWriter *This, DWORD dwStreamIndex, IMFMediaType *pInputMediaType, IMFAttributes *pEncodingParameters); HRESULT (STDMETHODCALLTYPE *BeginWriting)( - IMFSinkWriter* This); + IMFSinkWriter *This); HRESULT (STDMETHODCALLTYPE *WriteSample)( - IMFSinkWriter* This, + IMFSinkWriter *This, DWORD dwStreamIndex, IMFSample *pSample); HRESULT (STDMETHODCALLTYPE *SendStreamTick)( - IMFSinkWriter* This, + IMFSinkWriter *This, DWORD dwStreamIndex, LONGLONG llTimestamp); HRESULT (STDMETHODCALLTYPE *PlaceMarker)( - IMFSinkWriter* This, + IMFSinkWriter *This, DWORD dwStreamIndex, LPVOID pvContext); HRESULT (STDMETHODCALLTYPE *NotifyEndOfSegment)( - IMFSinkWriter* This, + IMFSinkWriter *This, DWORD dwStreamIndex); HRESULT (STDMETHODCALLTYPE *Flush)( - IMFSinkWriter* This, + IMFSinkWriter *This, DWORD dwStreamIndex); HRESULT (STDMETHODCALLTYPE *Finalize)( - IMFSinkWriter* This); + IMFSinkWriter *This); HRESULT (STDMETHODCALLTYPE *GetServiceForStream)( - IMFSinkWriter* This, + IMFSinkWriter *This, DWORD dwStreamIndex, REFGUID guidService, REFIID riid, LPVOID *ppvObject); HRESULT (STDMETHODCALLTYPE *GetStatistics)( - IMFSinkWriter* This, + IMFSinkWriter *This, DWORD dwStreamIndex, MF_SINK_WRITER_STATISTICS *pStats); END_INTERFACE } IMFSinkWriterVtbl; + interface IMFSinkWriter { CONST_VTBL IMFSinkWriterVtbl* lpVtbl; }; @@ -592,102 +505,6 @@ static FORCEINLINE HRESULT IMFSinkWriter_GetStatistics(IMFSinkWriter* This,DWORD #endif -HRESULT STDMETHODCALLTYPE IMFSinkWriter_AddStream_Proxy( - IMFSinkWriter* This, - IMFMediaType *pTargetMediaType, - DWORD *pdwStreamIndex); -void __RPC_STUB IMFSinkWriter_AddStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSinkWriter_SetInputMediaType_Proxy( - IMFSinkWriter* This, - DWORD dwStreamIndex, - IMFMediaType *pInputMediaType, - IMFAttributes *pEncodingParameters); -void __RPC_STUB IMFSinkWriter_SetInputMediaType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSinkWriter_BeginWriting_Proxy( - IMFSinkWriter* This); -void __RPC_STUB IMFSinkWriter_BeginWriting_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSinkWriter_WriteSample_Proxy( - IMFSinkWriter* This, - DWORD dwStreamIndex, - IMFSample *pSample); -void __RPC_STUB IMFSinkWriter_WriteSample_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSinkWriter_SendStreamTick_Proxy( - IMFSinkWriter* This, - DWORD dwStreamIndex, - LONGLONG llTimestamp); -void __RPC_STUB IMFSinkWriter_SendStreamTick_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSinkWriter_PlaceMarker_Proxy( - IMFSinkWriter* This, - DWORD dwStreamIndex, - LPVOID pvContext); -void __RPC_STUB IMFSinkWriter_PlaceMarker_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSinkWriter_NotifyEndOfSegment_Proxy( - IMFSinkWriter* This, - DWORD dwStreamIndex); -void __RPC_STUB IMFSinkWriter_NotifyEndOfSegment_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSinkWriter_Flush_Proxy( - IMFSinkWriter* This, - DWORD dwStreamIndex); -void __RPC_STUB IMFSinkWriter_Flush_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSinkWriter_Finalize_Proxy( - IMFSinkWriter* This); -void __RPC_STUB IMFSinkWriter_Finalize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSinkWriter_GetServiceForStream_Proxy( - IMFSinkWriter* This, - DWORD dwStreamIndex, - REFGUID guidService, - REFIID riid, - LPVOID *ppvObject); -void __RPC_STUB IMFSinkWriter_GetServiceForStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSinkWriter_GetStatistics_Proxy( - IMFSinkWriter* This, - DWORD dwStreamIndex, - MF_SINK_WRITER_STATISTICS *pStats); -void __RPC_STUB IMFSinkWriter_GetStatistics_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFSinkWriter_INTERFACE_DEFINED__ */ @@ -726,19 +543,19 @@ typedef struct IMFSourceReaderCallbackVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFSourceReaderCallback* This, + IMFSourceReaderCallback *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFSourceReaderCallback* This); + IMFSourceReaderCallback *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFSourceReaderCallback* This); + IMFSourceReaderCallback *This); /*** IMFSourceReaderCallback methods ***/ HRESULT (STDMETHODCALLTYPE *OnReadSample)( - IMFSourceReaderCallback* This, + IMFSourceReaderCallback *This, HRESULT hrStatus, DWORD dwStreamIndex, DWORD dwStreamFlags, @@ -746,16 +563,17 @@ typedef struct IMFSourceReaderCallbackVtbl { IMFSample *pSample); HRESULT (STDMETHODCALLTYPE *OnFlush)( - IMFSourceReaderCallback* This, + IMFSourceReaderCallback *This, DWORD dwStreamIndex); HRESULT (STDMETHODCALLTYPE *OnEvent)( - IMFSourceReaderCallback* This, + IMFSourceReaderCallback *This, DWORD dwStreamIndex, IMFMediaEvent *pEvent); END_INTERFACE } IMFSourceReaderCallbackVtbl; + interface IMFSourceReaderCallback { CONST_VTBL IMFSourceReaderCallbackVtbl* lpVtbl; }; @@ -796,35 +614,6 @@ static FORCEINLINE HRESULT IMFSourceReaderCallback_OnEvent(IMFSourceReaderCallba #endif -HRESULT STDMETHODCALLTYPE IMFSourceReaderCallback_OnReadSample_Proxy( - IMFSourceReaderCallback* This, - HRESULT hrStatus, - DWORD dwStreamIndex, - DWORD dwStreamFlags, - LONGLONG llTimestamp, - IMFSample *pSample); -void __RPC_STUB IMFSourceReaderCallback_OnReadSample_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSourceReaderCallback_OnFlush_Proxy( - IMFSourceReaderCallback* This, - DWORD dwStreamIndex); -void __RPC_STUB IMFSourceReaderCallback_OnFlush_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFSourceReaderCallback_OnEvent_Proxy( - IMFSourceReaderCallback* This, - DWORD dwStreamIndex, - IMFMediaEvent *pEvent); -void __RPC_STUB IMFSourceReaderCallback_OnEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFSourceReaderCallback_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/mftransform.h b/lib/libc/include/any-windows-any/mftransform.h index 954c86112a..5be048b0c9 100644 --- a/lib/libc/include/any-windows-any/mftransform.h +++ b/lib/libc/include/any-windows-any/mftransform.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/mftransform.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/mftransform.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,6 +21,9 @@ #ifndef __IMFTransform_FWD_DEFINED__ #define __IMFTransform_FWD_DEFINED__ typedef interface IMFTransform IMFTransform; +#ifdef __cplusplus +interface IMFTransform; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -90,15 +94,12 @@ extern "C" { enum _MFT_SET_TYPE_FLAGS { MFT_SET_TYPE_TEST_ONLY = 0x1 }; - enum _MFT_PROCESS_OUTPUT_STATUS { MFT_PROCESS_OUTPUT_STATUS_NEW_STREAMS = 0x100 }; - enum _MFT_PROCESS_OUTPUT_FLAGS { MFT_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER = 0x1 }; - typedef enum _MFT_MESSAGE_TYPE { MFT_MESSAGE_COMMAND_FLUSH = 0x0, MFT_MESSAGE_COMMAND_DRAIN = 0x1, @@ -248,135 +249,135 @@ typedef struct IMFTransformVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFTransform* This, + IMFTransform *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFTransform* This); + IMFTransform *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFTransform* This); + IMFTransform *This); /*** IMFTransform methods ***/ HRESULT (STDMETHODCALLTYPE *GetStreamLimits)( - IMFTransform* This, + IMFTransform *This, DWORD *pdwInputMinimum, DWORD *pdwInputMaximum, DWORD *pdwOutputMinimum, DWORD *pdwOutputMaximum); HRESULT (STDMETHODCALLTYPE *GetStreamCount)( - IMFTransform* This, + IMFTransform *This, DWORD *pcInputStreams, DWORD *pcOutputStreams); HRESULT (STDMETHODCALLTYPE *GetStreamIDs)( - IMFTransform* This, + IMFTransform *This, DWORD dwInputIDArraySize, DWORD *pdwInputIDs, DWORD dwOutputIDArraySize, DWORD *pdwOutputIDs); HRESULT (STDMETHODCALLTYPE *GetInputStreamInfo)( - IMFTransform* This, + IMFTransform *This, DWORD dwInputStreamID, MFT_INPUT_STREAM_INFO *pStreamInfo); HRESULT (STDMETHODCALLTYPE *GetOutputStreamInfo)( - IMFTransform* This, + IMFTransform *This, DWORD dwOutputStreamID, MFT_OUTPUT_STREAM_INFO *pStreamInfo); HRESULT (STDMETHODCALLTYPE *GetAttributes)( - IMFTransform* This, + IMFTransform *This, IMFAttributes **pAttributes); HRESULT (STDMETHODCALLTYPE *GetInputStreamAttributes)( - IMFTransform* This, + IMFTransform *This, DWORD dwInputStreamID, IMFAttributes **pAttributes); HRESULT (STDMETHODCALLTYPE *GetOutputStreamAttributes)( - IMFTransform* This, + IMFTransform *This, DWORD dwOutputStreamID, IMFAttributes **pAttributes); HRESULT (STDMETHODCALLTYPE *DeleteInputStream)( - IMFTransform* This, + IMFTransform *This, DWORD dwStreamID); HRESULT (STDMETHODCALLTYPE *AddInputStreams)( - IMFTransform* This, + IMFTransform *This, DWORD cStreams, DWORD *adwStreamIDs); HRESULT (STDMETHODCALLTYPE *GetInputAvailableType)( - IMFTransform* This, + IMFTransform *This, DWORD dwInputStreamID, DWORD dwTypeIndex, IMFMediaType **ppType); HRESULT (STDMETHODCALLTYPE *GetOutputAvailableType)( - IMFTransform* This, + IMFTransform *This, DWORD dwOutputStreamID, DWORD dwTypeIndex, IMFMediaType **ppType); HRESULT (STDMETHODCALLTYPE *SetInputType)( - IMFTransform* This, + IMFTransform *This, DWORD dwInputStreamID, IMFMediaType *pType, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *SetOutputType)( - IMFTransform* This, + IMFTransform *This, DWORD dwOutputStreamID, IMFMediaType *pType, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetInputCurrentType)( - IMFTransform* This, + IMFTransform *This, DWORD dwInputStreamID, IMFMediaType **ppType); HRESULT (STDMETHODCALLTYPE *GetOutputCurrentType)( - IMFTransform* This, + IMFTransform *This, DWORD dwOutputStreamID, IMFMediaType **ppType); HRESULT (STDMETHODCALLTYPE *GetInputStatus)( - IMFTransform* This, + IMFTransform *This, DWORD dwInputStreamID, DWORD *pdwFlags); HRESULT (STDMETHODCALLTYPE *GetOutputStatus)( - IMFTransform* This, + IMFTransform *This, DWORD *pdwFlags); HRESULT (STDMETHODCALLTYPE *SetOutputBounds)( - IMFTransform* This, + IMFTransform *This, LONGLONG hnsLowerBound, LONGLONG hnsUpperBound); HRESULT (STDMETHODCALLTYPE *ProcessEvent)( - IMFTransform* This, + IMFTransform *This, DWORD dwInputStreamID, IMFMediaEvent *pEvent); HRESULT (STDMETHODCALLTYPE *ProcessMessage)( - IMFTransform* This, + IMFTransform *This, MFT_MESSAGE_TYPE eMessage, ULONG_PTR ulParam); HRESULT (STDMETHODCALLTYPE *ProcessInput)( - IMFTransform* This, + IMFTransform *This, DWORD dwInputStreamID, IMFSample *pSample, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *ProcessOutput)( - IMFTransform* This, + IMFTransform *This, DWORD dwFlags, DWORD cOutputBufferCount, MFT_OUTPUT_DATA_BUFFER *pOutputSamples, @@ -384,6 +385,7 @@ typedef struct IMFTransformVtbl { END_INTERFACE } IMFTransformVtbl; + interface IMFTransform { CONST_VTBL IMFTransformVtbl* lpVtbl; }; @@ -504,200 +506,6 @@ static FORCEINLINE HRESULT IMFTransform_ProcessOutput(IMFTransform* This,DWORD d #endif -HRESULT STDMETHODCALLTYPE IMFTransform_GetStreamLimits_Proxy( - IMFTransform* This, - DWORD *pdwInputMinimum, - DWORD *pdwInputMaximum, - DWORD *pdwOutputMinimum, - DWORD *pdwOutputMaximum); -void __RPC_STUB IMFTransform_GetStreamLimits_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFTransform_GetStreamCount_Proxy( - IMFTransform* This, - DWORD *pcInputStreams, - DWORD *pcOutputStreams); -void __RPC_STUB IMFTransform_GetStreamCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFTransform_GetStreamIDs_Proxy( - IMFTransform* This, - DWORD dwInputIDArraySize, - DWORD *pdwInputIDs, - DWORD dwOutputIDArraySize, - DWORD *pdwOutputIDs); -void __RPC_STUB IMFTransform_GetStreamIDs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFTransform_GetInputStreamInfo_Proxy( - IMFTransform* This, - DWORD dwInputStreamID, - MFT_INPUT_STREAM_INFO *pStreamInfo); -void __RPC_STUB IMFTransform_GetInputStreamInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFTransform_GetOutputStreamInfo_Proxy( - IMFTransform* This, - DWORD dwOutputStreamID, - MFT_OUTPUT_STREAM_INFO *pStreamInfo); -void __RPC_STUB IMFTransform_GetOutputStreamInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFTransform_GetAttributes_Proxy( - IMFTransform* This, - IMFAttributes **pAttributes); -void __RPC_STUB IMFTransform_GetAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFTransform_GetInputStreamAttributes_Proxy( - IMFTransform* This, - DWORD dwInputStreamID, - IMFAttributes **pAttributes); -void __RPC_STUB IMFTransform_GetInputStreamAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFTransform_GetOutputStreamAttributes_Proxy( - IMFTransform* This, - DWORD dwOutputStreamID, - IMFAttributes **pAttributes); -void __RPC_STUB IMFTransform_GetOutputStreamAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFTransform_DeleteInputStream_Proxy( - IMFTransform* This, - DWORD dwStreamID); -void __RPC_STUB IMFTransform_DeleteInputStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFTransform_AddInputStreams_Proxy( - IMFTransform* This, - DWORD cStreams, - DWORD *adwStreamIDs); -void __RPC_STUB IMFTransform_AddInputStreams_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFTransform_GetInputAvailableType_Proxy( - IMFTransform* This, - DWORD dwInputStreamID, - DWORD dwTypeIndex, - IMFMediaType **ppType); -void __RPC_STUB IMFTransform_GetInputAvailableType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFTransform_GetOutputAvailableType_Proxy( - IMFTransform* This, - DWORD dwOutputStreamID, - DWORD dwTypeIndex, - IMFMediaType **ppType); -void __RPC_STUB IMFTransform_GetOutputAvailableType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFTransform_SetInputType_Proxy( - IMFTransform* This, - DWORD dwInputStreamID, - IMFMediaType *pType, - DWORD dwFlags); -void __RPC_STUB IMFTransform_SetInputType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFTransform_SetOutputType_Proxy( - IMFTransform* This, - DWORD dwOutputStreamID, - IMFMediaType *pType, - DWORD dwFlags); -void __RPC_STUB IMFTransform_SetOutputType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFTransform_GetInputCurrentType_Proxy( - IMFTransform* This, - DWORD dwInputStreamID, - IMFMediaType **ppType); -void __RPC_STUB IMFTransform_GetInputCurrentType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFTransform_GetOutputCurrentType_Proxy( - IMFTransform* This, - DWORD dwOutputStreamID, - IMFMediaType **ppType); -void __RPC_STUB IMFTransform_GetOutputCurrentType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFTransform_GetInputStatus_Proxy( - IMFTransform* This, - DWORD dwInputStreamID, - DWORD *pdwFlags); -void __RPC_STUB IMFTransform_GetInputStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFTransform_GetOutputStatus_Proxy( - IMFTransform* This, - DWORD *pdwFlags); -void __RPC_STUB IMFTransform_GetOutputStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFTransform_SetOutputBounds_Proxy( - IMFTransform* This, - LONGLONG hnsLowerBound, - LONGLONG hnsUpperBound); -void __RPC_STUB IMFTransform_SetOutputBounds_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFTransform_ProcessEvent_Proxy( - IMFTransform* This, - DWORD dwInputStreamID, - IMFMediaEvent *pEvent); -void __RPC_STUB IMFTransform_ProcessEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFTransform_ProcessMessage_Proxy( - IMFTransform* This, - MFT_MESSAGE_TYPE eMessage, - ULONG_PTR ulParam); -void __RPC_STUB IMFTransform_ProcessMessage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFTransform_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/minwinbase.h b/lib/libc/include/any-windows-any/minwinbase.h index 1c17a333d5..0ff173616e 100644 --- a/lib/libc/include/any-windows-any/minwinbase.h +++ b/lib/libc/include/any-windows-any/minwinbase.h @@ -20,11 +20,11 @@ extern "C" { ULONG_PTR Internal; ULONG_PTR InternalHigh; __C89_NAMELESS union { - struct { - DWORD Offset; - DWORD OffsetHigh; - } DUMMYSTRUCTNAME; - PVOID Pointer; + struct { + DWORD Offset; + DWORD OffsetHigh; + } DUMMYSTRUCTNAME; + PVOID Pointer; } DUMMYUNIONNAME; HANDLE hEvent; } OVERLAPPED, *LPOVERLAPPED; @@ -69,6 +69,11 @@ extern "C" { DWORD dwReserved1; CHAR cFileName[MAX_PATH]; CHAR cAlternateFileName[14]; +#ifdef _MAC + DWORD dwFileType; + DWORD dwCreatorType; + WORD wFinderFlags; +#endif } WIN32_FIND_DATAA, *PWIN32_FIND_DATAA, *LPWIN32_FIND_DATAA; typedef struct _WIN32_FIND_DATAW { @@ -82,12 +87,18 @@ extern "C" { DWORD dwReserved1; WCHAR cFileName[MAX_PATH]; WCHAR cAlternateFileName[14]; +#ifdef _MAC + DWORD dwFileType; + DWORD dwCreatorType; + WORD wFinderFlags; +#endif } WIN32_FIND_DATAW, *PWIN32_FIND_DATAW, *LPWIN32_FIND_DATAW; __MINGW_TYPEDEF_AW(WIN32_FIND_DATA) __MINGW_TYPEDEF_AW(PWIN32_FIND_DATA) __MINGW_TYPEDEF_AW(LPWIN32_FIND_DATA) +#if _WIN32_WINNT >= 0x0400 typedef enum _FINDEX_INFO_LEVELS { FindExInfoStandard, FindExInfoBasic, @@ -96,6 +107,9 @@ extern "C" { #define FIND_FIRST_EX_CASE_SENSITIVE 0x00000001 #define FIND_FIRST_EX_LARGE_FETCH 0x00000002 +#if NTDDI_VERSION >= 0x0A000005 +#define FIND_FIRST_EX_ON_DISK_ENTRIES_ONLY 0x00000004 +#endif typedef enum _FINDEX_SEARCH_OPS { FindExSearchNameMatch, @@ -103,6 +117,16 @@ extern "C" { FindExSearchLimitToDevices, FindExSearchMaxSearchOp } FINDEX_SEARCH_OPS; +#endif + +#if _WIN32_WINNT >= 0x0400 +#if NTDDI_VERSION >= 0x0A000004 + typedef enum _READ_DIRECTORY_NOTIFY_INFORMATION_CLASS { + ReadDirectoryNotifyInformation = 1, + ReadDirectoryNotifyExtendedInformation = 2 + } READ_DIRECTORY_NOTIFY_INFORMATION_CLASS, *PREAD_DIRECTORY_NOTIFY_INFORMATION_CLASS; +#endif +#endif typedef enum _GET_FILEEX_INFO_LEVELS { GetFileExInfoStandard, @@ -134,6 +158,12 @@ extern "C" { FileIdExtdDirectoryInfo, FileIdExtdDirectoryRestartInfo, #endif +#if _WIN32_WINNT >= 0x0A000002 + FileDispositionInfoEx, + FileRenameInfoEx, +#endif + FileCaseSensitiveInfo, + FileNormalizedNameInfo, MaximumFileInfoByHandleClass } FILE_INFO_BY_HANDLE_CLASS, *PFILE_INFO_BY_HANDLE_CLASS; #endif @@ -157,22 +187,23 @@ extern "C" { BYTE iRegionIndex; WORD wFlags; __C89_NAMELESS union { - struct { - HANDLE hMem; - DWORD dwReserved[3]; - } Block; - struct { - DWORD dwCommittedSize; - DWORD dwUnCommittedSize; - LPVOID lpFirstBlock; - LPVOID lpLastBlock; - } Region; + struct { + HANDLE hMem; + DWORD dwReserved[3]; + } Block; + struct { + DWORD dwCommittedSize; + DWORD dwUnCommittedSize; + LPVOID lpFirstBlock; + LPVOID lpLastBlock; + } Region; } DUMMYUNIONNAME; } PROCESS_HEAP_ENTRY,*LPPROCESS_HEAP_ENTRY,*PPROCESS_HEAP_ENTRY; #define PROCESS_HEAP_REGION 0x1 #define PROCESS_HEAP_UNCOMMITTED_RANGE 0x2 #define PROCESS_HEAP_ENTRY_BUSY 0x4 +#define PROCESS_HEAP_SEG_ALLOC 0x8 #define PROCESS_HEAP_ENTRY_MOVEABLE 0x10 #define PROCESS_HEAP_ENTRY_DDESHARE 0x20 @@ -180,13 +211,13 @@ extern "C" { ULONG Version; DWORD Flags; union { - struct { - HMODULE LocalizedReasonModule; - ULONG LocalizedReasonId; - ULONG ReasonStringCount; - LPWSTR *ReasonStrings; - } Detailed; - LPWSTR SimpleReasonString; + struct { + HMODULE LocalizedReasonModule; + ULONG LocalizedReasonId; + ULONG ReasonStringCount; + LPWSTR *ReasonStrings; + } Detailed; + LPWSTR SimpleReasonString; } Reason; } REASON_CONTEXT, *PREASON_CONTEXT; @@ -203,6 +234,9 @@ extern "C" { typedef DWORD (WINAPI *PTHREAD_START_ROUTINE) (LPVOID lpThreadParameter); typedef PTHREAD_START_ROUTINE LPTHREAD_START_ROUTINE; + typedef LPVOID (WINAPI *PENCLAVE_ROUTINE) (LPVOID lpThreadParameter); + typedef PENCLAVE_ROUTINE LPENCLAVE_ROUTINE; + typedef struct _EXCEPTION_DEBUG_INFO { EXCEPTION_RECORD ExceptionRecord; DWORD dwFirstChance; @@ -327,6 +361,8 @@ extern "C" { #define LMEM_DISCARDED 0x4000 #define LMEM_LOCKCOUNT 0xff +#define NUMA_NO_PREFERRED_NODE ((DWORD) -1) + #ifdef __cplusplus } #endif diff --git a/lib/libc/include/any-windows-any/mmdeviceapi.h b/lib/libc/include/any-windows-any/mmdeviceapi.h index 01d24a3cc8..b7fba7af4e 100644 --- a/lib/libc/include/any-windows-any/mmdeviceapi.h +++ b/lib/libc/include/any-windows-any/mmdeviceapi.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/mmdeviceapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from include/mmdeviceapi.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/mmstream.h b/lib/libc/include/any-windows-any/mmstream.h index f3969fd7bf..7a207872b6 100644 --- a/lib/libc/include/any-windows-any/mmstream.h +++ b/lib/libc/include/any-windows-any/mmstream.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/mmstream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/mmstream.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -72,16 +73,16 @@ typedef void *PAPCFUNC; typedef LONGLONG STREAM_TIME; typedef GUID MSPID; typedef REFGUID REFMSPID; -typedef enum __WIDL_mmstream_generated_name_00000002 { +typedef enum __WIDL_mmstream_generated_name_0000000C { STREAMTYPE_READ = 0, STREAMTYPE_WRITE = 1, STREAMTYPE_TRANSFORM = 2 } STREAM_TYPE; -typedef enum __WIDL_mmstream_generated_name_00000003 { +typedef enum __WIDL_mmstream_generated_name_0000000D { STREAMSTATE_STOP = 0, STREAMSTATE_RUN = 1 } STREAM_STATE; -typedef enum __WIDL_mmstream_generated_name_00000004 { +typedef enum __WIDL_mmstream_generated_name_0000000E { COMPSTAT_NOUPDATEOK = 0x1, COMPSTAT_WAIT = 0x2, COMPSTAT_ABORT = 0x4 diff --git a/lib/libc/include/any-windows-any/mscoree.h b/lib/libc/include/any-windows-any/mscoree.h index 2f5abf3784..af8c6d48b0 100644 --- a/lib/libc/include/any-windows-any/mscoree.h +++ b/lib/libc/include/any-windows-any/mscoree.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/mscoree.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from include/mscoree.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -1005,7 +1006,7 @@ ICLRRuntimeHost : public IUnknown virtual HRESULT STDMETHODCALLTYPE ExecuteInAppDomain( DWORD dwAppDomainId, - HRESULT (__stdcall * pCallback)(void *cookie), + FExecuteInAppDomainCallback pCallback, void *cookie) = 0; virtual HRESULT STDMETHODCALLTYPE GetCurrentAppDomainId( @@ -1069,7 +1070,7 @@ typedef struct ICLRRuntimeHostVtbl { HRESULT (STDMETHODCALLTYPE *ExecuteInAppDomain)( ICLRRuntimeHost *This, DWORD dwAppDomainId, - HRESULT (__stdcall * pCallback)(void *cookie), + FExecuteInAppDomainCallback pCallback, void *cookie); HRESULT (STDMETHODCALLTYPE *GetCurrentAppDomainId)( @@ -1143,7 +1144,7 @@ static FORCEINLINE HRESULT ICLRRuntimeHost_GetCLRControl(ICLRRuntimeHost* This,I static FORCEINLINE HRESULT ICLRRuntimeHost_UnloadAppDomain(ICLRRuntimeHost* This,DWORD dwAppDomainId,WINBOOL fWaitUntilDone) { return This->lpVtbl->UnloadAppDomain(This,dwAppDomainId,fWaitUntilDone); } -static FORCEINLINE HRESULT ICLRRuntimeHost_ExecuteInAppDomain(ICLRRuntimeHost* This,DWORD dwAppDomainId,HRESULT (__stdcall * pCallback)(void *cookie),void *cookie) { +static FORCEINLINE HRESULT ICLRRuntimeHost_ExecuteInAppDomain(ICLRRuntimeHost* This,DWORD dwAppDomainId,FExecuteInAppDomainCallback pCallback,void *cookie) { return This->lpVtbl->ExecuteInAppDomain(This,dwAppDomainId,pCallback,cookie); } static FORCEINLINE HRESULT ICLRRuntimeHost_GetCurrentAppDomainId(ICLRRuntimeHost* This,DWORD *pdwAppDomainId) { diff --git a/lib/libc/include/any-windows-any/msctf.h b/lib/libc/include/any-windows-any/msctf.h index dc80220d35..9160e3e58d 100644 --- a/lib/libc/include/any-windows-any/msctf.h +++ b/lib/libc/include/any-windows-any/msctf.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/msctf.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from include/msctf.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -265,6 +266,14 @@ interface ITfKeyTraceEventSink; #endif /* __cplusplus */ #endif +#ifndef __ITfUIElementSink_FWD_DEFINED__ +#define __ITfUIElementSink_FWD_DEFINED__ +typedef interface ITfUIElementSink ITfUIElementSink; +#ifdef __cplusplus +interface ITfUIElementSink; +#endif /* __cplusplus */ +#endif + #ifndef __ITfMessagePump_FWD_DEFINED__ #define __ITfMessagePump_FWD_DEFINED__ typedef interface ITfMessagePump ITfMessagePump; @@ -716,7 +725,7 @@ typedef struct TF_PRESERVEDKEY { UINT uVKey; UINT uModifiers; } TF_PRESERVEDKEY; -typedef enum __WIDL_msctf_generated_name_00000005 { +typedef enum __WIDL_msctf_generated_name_00000012 { TF_ANCHOR_START = 0, TF_ANCHOR_END = 1 } TfAnchor; @@ -2110,7 +2119,7 @@ static FORCEINLINE HRESULT ITextStoreACPServices_CreateRange(ITextStoreACPServic #define TF_ES_ASYNC (0x8) -typedef enum __WIDL_msctf_generated_name_00000006 { +typedef enum __WIDL_msctf_generated_name_00000013 { TF_AE_NONE = 0, TF_AE_START = 1, TF_AE_END = 2 @@ -3171,14 +3180,14 @@ static FORCEINLINE HRESULT ITfInputProcessorProfileMgr_GetActiveProfile(ITfInput #endif /* __ITfInputProcessorProfileMgr_INTERFACE_DEFINED__ */ -typedef enum __WIDL_msctf_generated_name_00000007 { +typedef enum __WIDL_msctf_generated_name_00000014 { TF_LS_NONE = 0, TF_LS_SOLID = 1, TF_LS_DOT = 2, TF_LS_DASH = 3, TF_LS_SQUIGGLE = 4 } TF_DA_LINESTYLE; -typedef enum __WIDL_msctf_generated_name_00000008 { +typedef enum __WIDL_msctf_generated_name_00000015 { TF_CT_NONE = 0, TF_CT_SYSCOLOR = 1, TF_CT_COLORREF = 2 @@ -3190,7 +3199,7 @@ typedef struct TF_DA_COLOR { COLORREF cr; } __C89_NAMELESSUNIONNAME; } TF_DA_COLOR; -typedef enum __WIDL_msctf_generated_name_00000009 { +typedef enum __WIDL_msctf_generated_name_00000016 { TF_ATTR_INPUT = 0, TF_ATTR_TARGET_CONVERTED = 1, TF_ATTR_CONVERTED = 2, @@ -5125,6 +5134,107 @@ static FORCEINLINE HRESULT ITfKeyTraceEventSink_OnKeyTraceUp(ITfKeyTraceEventSin #endif /* __ITfKeyTraceEventSink_INTERFACE_DEFINED__ */ +/***************************************************************************** + * ITfUIElementSink interface + */ +#ifndef __ITfUIElementSink_INTERFACE_DEFINED__ +#define __ITfUIElementSink_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_ITfUIElementSink, 0xea1ea136, 0x19df, 0x11d7, 0xa6,0xd2, 0x00,0x06,0x5b,0x84,0x43,0x5c); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("ea1ea136-19df-11d7-a6d2-00065b84435c") +ITfUIElementSink : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE BeginUIElement( + DWORD id, + WINBOOL *show) = 0; + + virtual HRESULT STDMETHODCALLTYPE UpdateUIElement( + DWORD id) = 0; + + virtual HRESULT STDMETHODCALLTYPE EndUIElement( + DWORD id) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(ITfUIElementSink, 0xea1ea136, 0x19df, 0x11d7, 0xa6,0xd2, 0x00,0x06,0x5b,0x84,0x43,0x5c) +#endif +#else +typedef struct ITfUIElementSinkVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + ITfUIElementSink *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + ITfUIElementSink *This); + + ULONG (STDMETHODCALLTYPE *Release)( + ITfUIElementSink *This); + + /*** ITfUIElementSink methods ***/ + HRESULT (STDMETHODCALLTYPE *BeginUIElement)( + ITfUIElementSink *This, + DWORD id, + WINBOOL *show); + + HRESULT (STDMETHODCALLTYPE *UpdateUIElement)( + ITfUIElementSink *This, + DWORD id); + + HRESULT (STDMETHODCALLTYPE *EndUIElement)( + ITfUIElementSink *This, + DWORD id); + + END_INTERFACE +} ITfUIElementSinkVtbl; + +interface ITfUIElementSink { + CONST_VTBL ITfUIElementSinkVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define ITfUIElementSink_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define ITfUIElementSink_AddRef(This) (This)->lpVtbl->AddRef(This) +#define ITfUIElementSink_Release(This) (This)->lpVtbl->Release(This) +/*** ITfUIElementSink methods ***/ +#define ITfUIElementSink_BeginUIElement(This,id,show) (This)->lpVtbl->BeginUIElement(This,id,show) +#define ITfUIElementSink_UpdateUIElement(This,id) (This)->lpVtbl->UpdateUIElement(This,id) +#define ITfUIElementSink_EndUIElement(This,id) (This)->lpVtbl->EndUIElement(This,id) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT ITfUIElementSink_QueryInterface(ITfUIElementSink* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG ITfUIElementSink_AddRef(ITfUIElementSink* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG ITfUIElementSink_Release(ITfUIElementSink* This) { + return This->lpVtbl->Release(This); +} +/*** ITfUIElementSink methods ***/ +static FORCEINLINE HRESULT ITfUIElementSink_BeginUIElement(ITfUIElementSink* This,DWORD id,WINBOOL *show) { + return This->lpVtbl->BeginUIElement(This,id,show); +} +static FORCEINLINE HRESULT ITfUIElementSink_UpdateUIElement(ITfUIElementSink* This,DWORD id) { + return This->lpVtbl->UpdateUIElement(This,id); +} +static FORCEINLINE HRESULT ITfUIElementSink_EndUIElement(ITfUIElementSink* This,DWORD id) { + return This->lpVtbl->EndUIElement(This,id); +} +#endif +#endif + +#endif + + +#endif /* __ITfUIElementSink_INTERFACE_DEFINED__ */ + /***************************************************************************** * ITfMessagePump interface */ @@ -5524,11 +5634,11 @@ static FORCEINLINE HRESULT ITfEditSession_DoEditSession(ITfEditSession* This,TfE #define TF_CHAR_EMBEDDED (TS_CHAR_EMBEDDED) -typedef enum __WIDL_msctf_generated_name_0000000A { +typedef enum __WIDL_msctf_generated_name_00000017 { TF_GRAVITY_BACKWARD = 0, TF_GRAVITY_FORWARD = 1 } TfGravity; -typedef enum __WIDL_msctf_generated_name_0000000B { +typedef enum __WIDL_msctf_generated_name_00000018 { TF_SD_BACKWARD = 0, TF_SD_FORWARD = 1 } TfShiftDir; diff --git a/lib/libc/include/any-windows-any/mshtmhst.h b/lib/libc/include/any-windows-any/mshtmhst.h index f730bbed66..c4f4a3f35d 100644 --- a/lib/libc/include/any-windows-any/mshtmhst.h +++ b/lib/libc/include/any-windows-any/mshtmhst.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/mshtmhst.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/mshtmhst.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,6 +21,9 @@ #ifndef __IHostDialogHelper_FWD_DEFINED__ #define __IHostDialogHelper_FWD_DEFINED__ typedef interface IHostDialogHelper IHostDialogHelper; +#ifdef __cplusplus +interface IHostDialogHelper; +#endif /* __cplusplus */ #endif #ifndef __HostDialogHelper_FWD_DEFINED__ @@ -34,31 +38,49 @@ typedef struct HostDialogHelper HostDialogHelper; #ifndef __IDocHostUIHandler_FWD_DEFINED__ #define __IDocHostUIHandler_FWD_DEFINED__ typedef interface IDocHostUIHandler IDocHostUIHandler; +#ifdef __cplusplus +interface IDocHostUIHandler; +#endif /* __cplusplus */ #endif #ifndef __IDocHostUIHandler2_FWD_DEFINED__ #define __IDocHostUIHandler2_FWD_DEFINED__ typedef interface IDocHostUIHandler2 IDocHostUIHandler2; +#ifdef __cplusplus +interface IDocHostUIHandler2; +#endif /* __cplusplus */ #endif #ifndef __ICustomDoc_FWD_DEFINED__ #define __ICustomDoc_FWD_DEFINED__ typedef interface ICustomDoc ICustomDoc; +#ifdef __cplusplus +interface ICustomDoc; +#endif /* __cplusplus */ #endif #ifndef __IDocHostShowUI_FWD_DEFINED__ #define __IDocHostShowUI_FWD_DEFINED__ typedef interface IDocHostShowUI IDocHostShowUI; +#ifdef __cplusplus +interface IDocHostShowUI; +#endif /* __cplusplus */ #endif #ifndef __IClassFactoryEx_FWD_DEFINED__ #define __IClassFactoryEx_FWD_DEFINED__ typedef interface IClassFactoryEx IClassFactoryEx; +#ifdef __cplusplus +interface IClassFactoryEx; +#endif /* __cplusplus */ #endif #ifndef __IHTMLOMWindowServices_FWD_DEFINED__ #define __IHTMLOMWindowServices_FWD_DEFINED__ typedef interface IHTMLOMWindowServices IHTMLOMWindowServices; +#ifdef __cplusplus +interface IHTMLOMWindowServices; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -224,19 +246,19 @@ typedef struct IHostDialogHelperVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IHostDialogHelper* This, + IHostDialogHelper *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IHostDialogHelper* This); + IHostDialogHelper *This); ULONG (STDMETHODCALLTYPE *Release)( - IHostDialogHelper* This); + IHostDialogHelper *This); /*** IHostDialogHelper methods ***/ HRESULT (STDMETHODCALLTYPE *ShowHTMLDialog)( - IHostDialogHelper* This, + IHostDialogHelper *This, HWND hwndParent, IMoniker *pMk, VARIANT *pvarArgIn, @@ -246,6 +268,7 @@ typedef struct IHostDialogHelperVtbl { END_INTERFACE } IHostDialogHelperVtbl; + interface IHostDialogHelper { CONST_VTBL IHostDialogHelperVtbl* lpVtbl; }; @@ -278,19 +301,6 @@ static FORCEINLINE HRESULT IHostDialogHelper_ShowHTMLDialog(IHostDialogHelper* T #endif -HRESULT STDMETHODCALLTYPE IHostDialogHelper_ShowHTMLDialog_Proxy( - IHostDialogHelper* This, - HWND hwndParent, - IMoniker *pMk, - VARIANT *pvarArgIn, - WCHAR *pchOptions, - VARIANT *pvarArgOut, - IUnknown *punkHost); -void __RPC_STUB IHostDialogHelper_ShowHTMLDialog_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IHostDialogHelper_INTERFACE_DEFINED__ */ @@ -389,30 +399,30 @@ typedef struct IDocHostUIHandlerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDocHostUIHandler* This, + IDocHostUIHandler *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDocHostUIHandler* This); + IDocHostUIHandler *This); ULONG (STDMETHODCALLTYPE *Release)( - IDocHostUIHandler* This); + IDocHostUIHandler *This); /*** IDocHostUIHandler methods ***/ HRESULT (STDMETHODCALLTYPE *ShowContextMenu)( - IDocHostUIHandler* This, + IDocHostUIHandler *This, DWORD dwID, POINT *ppt, IUnknown *pcmdtReserved, IDispatch *pdispReserved); HRESULT (STDMETHODCALLTYPE *GetHostInfo)( - IDocHostUIHandler* This, + IDocHostUIHandler *This, DOCHOSTUIINFO *pInfo); HRESULT (STDMETHODCALLTYPE *ShowUI)( - IDocHostUIHandler* This, + IDocHostUIHandler *This, DWORD dwID, IOleInPlaceActiveObject *pActiveObject, IOleCommandTarget *pCommandTarget, @@ -420,62 +430,63 @@ typedef struct IDocHostUIHandlerVtbl { IOleInPlaceUIWindow *pDoc); HRESULT (STDMETHODCALLTYPE *HideUI)( - IDocHostUIHandler* This); + IDocHostUIHandler *This); HRESULT (STDMETHODCALLTYPE *UpdateUI)( - IDocHostUIHandler* This); + IDocHostUIHandler *This); HRESULT (STDMETHODCALLTYPE *EnableModeless)( - IDocHostUIHandler* This, + IDocHostUIHandler *This, WINBOOL fEnable); HRESULT (STDMETHODCALLTYPE *OnDocWindowActivate)( - IDocHostUIHandler* This, + IDocHostUIHandler *This, WINBOOL fActivate); HRESULT (STDMETHODCALLTYPE *OnFrameWindowActivate)( - IDocHostUIHandler* This, + IDocHostUIHandler *This, WINBOOL fActivate); HRESULT (STDMETHODCALLTYPE *ResizeBorder)( - IDocHostUIHandler* This, + IDocHostUIHandler *This, LPCRECT prcBorder, IOleInPlaceUIWindow *pUIWindow, WINBOOL fRameWindow); HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)( - IDocHostUIHandler* This, + IDocHostUIHandler *This, LPMSG lpMsg, const GUID *pguidCmdGroup, DWORD nCmdID); HRESULT (STDMETHODCALLTYPE *GetOptionKeyPath)( - IDocHostUIHandler* This, + IDocHostUIHandler *This, LPOLESTR *pchKey, DWORD dw); HRESULT (STDMETHODCALLTYPE *GetDropTarget)( - IDocHostUIHandler* This, + IDocHostUIHandler *This, IDropTarget *pDropTarget, IDropTarget **ppDropTarget); HRESULT (STDMETHODCALLTYPE *GetExternal)( - IDocHostUIHandler* This, + IDocHostUIHandler *This, IDispatch **ppDispatch); HRESULT (STDMETHODCALLTYPE *TranslateUrl)( - IDocHostUIHandler* This, + IDocHostUIHandler *This, DWORD dwTranslate, LPWSTR pchURLIn, LPWSTR *ppchURLOut); HRESULT (STDMETHODCALLTYPE *FilterDataObject)( - IDocHostUIHandler* This, + IDocHostUIHandler *This, IDataObject *pDO, IDataObject **ppDORet); END_INTERFACE } IDocHostUIHandlerVtbl; + interface IDocHostUIHandler { CONST_VTBL IDocHostUIHandlerVtbl* lpVtbl; }; @@ -564,140 +575,6 @@ static FORCEINLINE HRESULT IDocHostUIHandler_FilterDataObject(IDocHostUIHandler* #endif -HRESULT STDMETHODCALLTYPE IDocHostUIHandler_ShowContextMenu_Proxy( - IDocHostUIHandler* This, - DWORD dwID, - POINT *ppt, - IUnknown *pcmdtReserved, - IDispatch *pdispReserved); -void __RPC_STUB IDocHostUIHandler_ShowContextMenu_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDocHostUIHandler_GetHostInfo_Proxy( - IDocHostUIHandler* This, - DOCHOSTUIINFO *pInfo); -void __RPC_STUB IDocHostUIHandler_GetHostInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDocHostUIHandler_ShowUI_Proxy( - IDocHostUIHandler* This, - DWORD dwID, - IOleInPlaceActiveObject *pActiveObject, - IOleCommandTarget *pCommandTarget, - IOleInPlaceFrame *pFrame, - IOleInPlaceUIWindow *pDoc); -void __RPC_STUB IDocHostUIHandler_ShowUI_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDocHostUIHandler_HideUI_Proxy( - IDocHostUIHandler* This); -void __RPC_STUB IDocHostUIHandler_HideUI_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDocHostUIHandler_UpdateUI_Proxy( - IDocHostUIHandler* This); -void __RPC_STUB IDocHostUIHandler_UpdateUI_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDocHostUIHandler_EnableModeless_Proxy( - IDocHostUIHandler* This, - WINBOOL fEnable); -void __RPC_STUB IDocHostUIHandler_EnableModeless_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDocHostUIHandler_OnDocWindowActivate_Proxy( - IDocHostUIHandler* This, - WINBOOL fActivate); -void __RPC_STUB IDocHostUIHandler_OnDocWindowActivate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDocHostUIHandler_OnFrameWindowActivate_Proxy( - IDocHostUIHandler* This, - WINBOOL fActivate); -void __RPC_STUB IDocHostUIHandler_OnFrameWindowActivate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDocHostUIHandler_ResizeBorder_Proxy( - IDocHostUIHandler* This, - LPCRECT prcBorder, - IOleInPlaceUIWindow *pUIWindow, - WINBOOL fRameWindow); -void __RPC_STUB IDocHostUIHandler_ResizeBorder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDocHostUIHandler_TranslateAccelerator_Proxy( - IDocHostUIHandler* This, - LPMSG lpMsg, - const GUID *pguidCmdGroup, - DWORD nCmdID); -void __RPC_STUB IDocHostUIHandler_TranslateAccelerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDocHostUIHandler_GetOptionKeyPath_Proxy( - IDocHostUIHandler* This, - LPOLESTR *pchKey, - DWORD dw); -void __RPC_STUB IDocHostUIHandler_GetOptionKeyPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDocHostUIHandler_GetDropTarget_Proxy( - IDocHostUIHandler* This, - IDropTarget *pDropTarget, - IDropTarget **ppDropTarget); -void __RPC_STUB IDocHostUIHandler_GetDropTarget_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDocHostUIHandler_GetExternal_Proxy( - IDocHostUIHandler* This, - IDispatch **ppDispatch); -void __RPC_STUB IDocHostUIHandler_GetExternal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDocHostUIHandler_TranslateUrl_Proxy( - IDocHostUIHandler* This, - DWORD dwTranslate, - LPWSTR pchURLIn, - LPWSTR *ppchURLOut); -void __RPC_STUB IDocHostUIHandler_TranslateUrl_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDocHostUIHandler_FilterDataObject_Proxy( - IDocHostUIHandler* This, - IDataObject *pDO, - IDataObject **ppDORet); -void __RPC_STUB IDocHostUIHandler_FilterDataObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDocHostUIHandler_INTERFACE_DEFINED__ */ @@ -726,30 +603,30 @@ typedef struct IDocHostUIHandler2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDocHostUIHandler2* This, + IDocHostUIHandler2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDocHostUIHandler2* This); + IDocHostUIHandler2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IDocHostUIHandler2* This); + IDocHostUIHandler2 *This); /*** IDocHostUIHandler methods ***/ HRESULT (STDMETHODCALLTYPE *ShowContextMenu)( - IDocHostUIHandler2* This, + IDocHostUIHandler2 *This, DWORD dwID, POINT *ppt, IUnknown *pcmdtReserved, IDispatch *pdispReserved); HRESULT (STDMETHODCALLTYPE *GetHostInfo)( - IDocHostUIHandler2* This, + IDocHostUIHandler2 *This, DOCHOSTUIINFO *pInfo); HRESULT (STDMETHODCALLTYPE *ShowUI)( - IDocHostUIHandler2* This, + IDocHostUIHandler2 *This, DWORD dwID, IOleInPlaceActiveObject *pActiveObject, IOleCommandTarget *pCommandTarget, @@ -757,68 +634,69 @@ typedef struct IDocHostUIHandler2Vtbl { IOleInPlaceUIWindow *pDoc); HRESULT (STDMETHODCALLTYPE *HideUI)( - IDocHostUIHandler2* This); + IDocHostUIHandler2 *This); HRESULT (STDMETHODCALLTYPE *UpdateUI)( - IDocHostUIHandler2* This); + IDocHostUIHandler2 *This); HRESULT (STDMETHODCALLTYPE *EnableModeless)( - IDocHostUIHandler2* This, + IDocHostUIHandler2 *This, WINBOOL fEnable); HRESULT (STDMETHODCALLTYPE *OnDocWindowActivate)( - IDocHostUIHandler2* This, + IDocHostUIHandler2 *This, WINBOOL fActivate); HRESULT (STDMETHODCALLTYPE *OnFrameWindowActivate)( - IDocHostUIHandler2* This, + IDocHostUIHandler2 *This, WINBOOL fActivate); HRESULT (STDMETHODCALLTYPE *ResizeBorder)( - IDocHostUIHandler2* This, + IDocHostUIHandler2 *This, LPCRECT prcBorder, IOleInPlaceUIWindow *pUIWindow, WINBOOL fRameWindow); HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)( - IDocHostUIHandler2* This, + IDocHostUIHandler2 *This, LPMSG lpMsg, const GUID *pguidCmdGroup, DWORD nCmdID); HRESULT (STDMETHODCALLTYPE *GetOptionKeyPath)( - IDocHostUIHandler2* This, + IDocHostUIHandler2 *This, LPOLESTR *pchKey, DWORD dw); HRESULT (STDMETHODCALLTYPE *GetDropTarget)( - IDocHostUIHandler2* This, + IDocHostUIHandler2 *This, IDropTarget *pDropTarget, IDropTarget **ppDropTarget); HRESULT (STDMETHODCALLTYPE *GetExternal)( - IDocHostUIHandler2* This, + IDocHostUIHandler2 *This, IDispatch **ppDispatch); HRESULT (STDMETHODCALLTYPE *TranslateUrl)( - IDocHostUIHandler2* This, + IDocHostUIHandler2 *This, DWORD dwTranslate, LPWSTR pchURLIn, LPWSTR *ppchURLOut); HRESULT (STDMETHODCALLTYPE *FilterDataObject)( - IDocHostUIHandler2* This, + IDocHostUIHandler2 *This, IDataObject *pDO, IDataObject **ppDORet); /*** IDocHostUIHandler2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetOverrideKeyPath)( - IDocHostUIHandler2* This, + IDocHostUIHandler2 *This, LPOLESTR *pchKey, DWORD dw); END_INTERFACE } IDocHostUIHandler2Vtbl; + interface IDocHostUIHandler2 { CONST_VTBL IDocHostUIHandler2Vtbl* lpVtbl; }; @@ -913,15 +791,6 @@ static FORCEINLINE HRESULT IDocHostUIHandler2_GetOverrideKeyPath(IDocHostUIHandl #endif -HRESULT STDMETHODCALLTYPE IDocHostUIHandler2_GetOverrideKeyPath_Proxy( - IDocHostUIHandler2* This, - LPOLESTR *pchKey, - DWORD dw); -void __RPC_STUB IDocHostUIHandler2_GetOverrideKeyPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDocHostUIHandler2_INTERFACE_DEFINED__ */ @@ -949,23 +818,24 @@ typedef struct ICustomDocVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICustomDoc* This, + ICustomDoc *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICustomDoc* This); + ICustomDoc *This); ULONG (STDMETHODCALLTYPE *Release)( - ICustomDoc* This); + ICustomDoc *This); /*** ICustomDoc methods ***/ HRESULT (STDMETHODCALLTYPE *SetUIHandler)( - ICustomDoc* This, + ICustomDoc *This, IDocHostUIHandler *pUIHandler); END_INTERFACE } ICustomDocVtbl; + interface ICustomDoc { CONST_VTBL ICustomDocVtbl* lpVtbl; }; @@ -998,14 +868,6 @@ static FORCEINLINE HRESULT ICustomDoc_SetUIHandler(ICustomDoc* This,IDocHostUIHa #endif -HRESULT STDMETHODCALLTYPE ICustomDoc_SetUIHandler_Proxy( - ICustomDoc* This, - IDocHostUIHandler *pUIHandler); -void __RPC_STUB ICustomDoc_SetUIHandler_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICustomDoc_INTERFACE_DEFINED__ */ @@ -1047,19 +909,19 @@ typedef struct IDocHostShowUIVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDocHostShowUI* This, + IDocHostShowUI *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDocHostShowUI* This); + IDocHostShowUI *This); ULONG (STDMETHODCALLTYPE *Release)( - IDocHostShowUI* This); + IDocHostShowUI *This); /*** IDocHostShowUI methods ***/ HRESULT (STDMETHODCALLTYPE *ShowMessage)( - IDocHostShowUI* This, + IDocHostShowUI *This, HWND hwnd, LPOLESTR lpstrText, LPOLESTR lpstrCaption, @@ -1069,7 +931,7 @@ typedef struct IDocHostShowUIVtbl { LRESULT *plResult); HRESULT (STDMETHODCALLTYPE *ShowHelp)( - IDocHostShowUI* This, + IDocHostShowUI *This, HWND hwnd, LPOLESTR pszHelpFile, UINT uCommand, @@ -1079,6 +941,7 @@ typedef struct IDocHostShowUIVtbl { END_INTERFACE } IDocHostShowUIVtbl; + interface IDocHostShowUI { CONST_VTBL IDocHostShowUIVtbl* lpVtbl; }; @@ -1115,33 +978,6 @@ static FORCEINLINE HRESULT IDocHostShowUI_ShowHelp(IDocHostShowUI* This,HWND hwn #endif -HRESULT STDMETHODCALLTYPE IDocHostShowUI_ShowMessage_Proxy( - IDocHostShowUI* This, - HWND hwnd, - LPOLESTR lpstrText, - LPOLESTR lpstrCaption, - DWORD dwType, - LPOLESTR lpstrHelpFile, - DWORD dwHelpContext, - LRESULT *plResult); -void __RPC_STUB IDocHostShowUI_ShowMessage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDocHostShowUI_ShowHelp_Proxy( - IDocHostShowUI* This, - HWND hwnd, - LPOLESTR pszHelpFile, - UINT uCommand, - DWORD dwData, - POINT ptMouse, - IDispatch *pDispatchObjectHit); -void __RPC_STUB IDocHostShowUI_ShowHelp_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDocHostShowUI_INTERFACE_DEFINED__ */ @@ -1175,30 +1011,30 @@ typedef struct IClassFactoryExVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IClassFactoryEx* This, + IClassFactoryEx *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IClassFactoryEx* This); + IClassFactoryEx *This); ULONG (STDMETHODCALLTYPE *Release)( - IClassFactoryEx* This); + IClassFactoryEx *This); /*** IClassFactory methods ***/ HRESULT (STDMETHODCALLTYPE *CreateInstance)( - IClassFactoryEx* This, + IClassFactoryEx *This, IUnknown *pUnkOuter, REFIID riid, void **ppvObject); HRESULT (STDMETHODCALLTYPE *LockServer)( - IClassFactoryEx* This, + IClassFactoryEx *This, WINBOOL fLock); /*** IClassFactoryEx methods ***/ HRESULT (STDMETHODCALLTYPE *CreateInstanceWithContext)( - IClassFactoryEx* This, + IClassFactoryEx *This, IUnknown *punkContext, IUnknown *punkOuter, REFIID riid, @@ -1206,6 +1042,7 @@ typedef struct IClassFactoryExVtbl { END_INTERFACE } IClassFactoryExVtbl; + interface IClassFactoryEx { CONST_VTBL IClassFactoryExVtbl* lpVtbl; }; @@ -1248,17 +1085,6 @@ static FORCEINLINE HRESULT IClassFactoryEx_CreateInstanceWithContext(IClassFacto #endif -HRESULT STDMETHODCALLTYPE IClassFactoryEx_CreateInstanceWithContext_Proxy( - IClassFactoryEx* This, - IUnknown *punkContext, - IUnknown *punkOuter, - REFIID riid, - void **ppv); -void __RPC_STUB IClassFactoryEx_CreateInstanceWithContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IClassFactoryEx_INTERFACE_DEFINED__ */ @@ -1299,39 +1125,40 @@ typedef struct IHTMLOMWindowServicesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IHTMLOMWindowServices* This, + IHTMLOMWindowServices *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IHTMLOMWindowServices* This); + IHTMLOMWindowServices *This); ULONG (STDMETHODCALLTYPE *Release)( - IHTMLOMWindowServices* This); + IHTMLOMWindowServices *This); /*** IHTMLOMWindowServices methods ***/ HRESULT (STDMETHODCALLTYPE *moveTo)( - IHTMLOMWindowServices* This, + IHTMLOMWindowServices *This, LONG x, LONG y); HRESULT (STDMETHODCALLTYPE *moveBy)( - IHTMLOMWindowServices* This, + IHTMLOMWindowServices *This, LONG x, LONG y); HRESULT (STDMETHODCALLTYPE *resizeTo)( - IHTMLOMWindowServices* This, + IHTMLOMWindowServices *This, LONG x, LONG y); HRESULT (STDMETHODCALLTYPE *resizeBy)( - IHTMLOMWindowServices* This, + IHTMLOMWindowServices *This, LONG x, LONG y); END_INTERFACE } IHTMLOMWindowServicesVtbl; + interface IHTMLOMWindowServices { CONST_VTBL IHTMLOMWindowServicesVtbl* lpVtbl; }; @@ -1376,42 +1203,6 @@ static FORCEINLINE HRESULT IHTMLOMWindowServices_resizeBy(IHTMLOMWindowServices* #endif -HRESULT STDMETHODCALLTYPE IHTMLOMWindowServices_moveTo_Proxy( - IHTMLOMWindowServices* This, - LONG x, - LONG y); -void __RPC_STUB IHTMLOMWindowServices_moveTo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IHTMLOMWindowServices_moveBy_Proxy( - IHTMLOMWindowServices* This, - LONG x, - LONG y); -void __RPC_STUB IHTMLOMWindowServices_moveBy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IHTMLOMWindowServices_resizeTo_Proxy( - IHTMLOMWindowServices* This, - LONG x, - LONG y); -void __RPC_STUB IHTMLOMWindowServices_resizeTo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IHTMLOMWindowServices_resizeBy_Proxy( - IHTMLOMWindowServices* This, - LONG x, - LONG y); -void __RPC_STUB IHTMLOMWindowServices_resizeBy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IHTMLOMWindowServices_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/msinkaut.h b/lib/libc/include/any-windows-any/msinkaut.h index fadab561fb..e3829a9bc0 100644 --- a/lib/libc/include/any-windows-any/msinkaut.h +++ b/lib/libc/include/any-windows-any/msinkaut.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/msinkaut.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/msinkaut.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,101 +21,161 @@ #ifndef __IInkExtendedProperty_FWD_DEFINED__ #define __IInkExtendedProperty_FWD_DEFINED__ typedef interface IInkExtendedProperty IInkExtendedProperty; +#ifdef __cplusplus +interface IInkExtendedProperty; +#endif /* __cplusplus */ #endif #ifndef __IInkExtendedProperties_FWD_DEFINED__ #define __IInkExtendedProperties_FWD_DEFINED__ typedef interface IInkExtendedProperties IInkExtendedProperties; +#ifdef __cplusplus +interface IInkExtendedProperties; +#endif /* __cplusplus */ #endif #ifndef __IInkDrawingAttributes_FWD_DEFINED__ #define __IInkDrawingAttributes_FWD_DEFINED__ typedef interface IInkDrawingAttributes IInkDrawingAttributes; +#ifdef __cplusplus +interface IInkDrawingAttributes; +#endif /* __cplusplus */ #endif #ifndef __IInkRectangle_FWD_DEFINED__ #define __IInkRectangle_FWD_DEFINED__ typedef interface IInkRectangle IInkRectangle; +#ifdef __cplusplus +interface IInkRectangle; +#endif /* __cplusplus */ #endif #ifndef __IInkTablet_FWD_DEFINED__ #define __IInkTablet_FWD_DEFINED__ typedef interface IInkTablet IInkTablet; +#ifdef __cplusplus +interface IInkTablet; +#endif /* __cplusplus */ #endif #ifndef __IInkCursorButton_FWD_DEFINED__ #define __IInkCursorButton_FWD_DEFINED__ typedef interface IInkCursorButton IInkCursorButton; +#ifdef __cplusplus +interface IInkCursorButton; +#endif /* __cplusplus */ #endif #ifndef __IInkCursorButtons_FWD_DEFINED__ #define __IInkCursorButtons_FWD_DEFINED__ typedef interface IInkCursorButtons IInkCursorButtons; +#ifdef __cplusplus +interface IInkCursorButtons; +#endif /* __cplusplus */ #endif #ifndef __IInkCursor_FWD_DEFINED__ #define __IInkCursor_FWD_DEFINED__ typedef interface IInkCursor IInkCursor; +#ifdef __cplusplus +interface IInkCursor; +#endif /* __cplusplus */ #endif #ifndef __IInkTransform_FWD_DEFINED__ #define __IInkTransform_FWD_DEFINED__ typedef interface IInkTransform IInkTransform; +#ifdef __cplusplus +interface IInkTransform; +#endif /* __cplusplus */ #endif #ifndef __IInkRecognitionAlternates_FWD_DEFINED__ #define __IInkRecognitionAlternates_FWD_DEFINED__ typedef interface IInkRecognitionAlternates IInkRecognitionAlternates; +#ifdef __cplusplus +interface IInkRecognitionAlternates; +#endif /* __cplusplus */ #endif #ifndef __IInkRecognitionAlternate_FWD_DEFINED__ #define __IInkRecognitionAlternate_FWD_DEFINED__ typedef interface IInkRecognitionAlternate IInkRecognitionAlternate; +#ifdef __cplusplus +interface IInkRecognitionAlternate; +#endif /* __cplusplus */ #endif #ifndef __IInkRecognitionResult_FWD_DEFINED__ #define __IInkRecognitionResult_FWD_DEFINED__ typedef interface IInkRecognitionResult IInkRecognitionResult; +#ifdef __cplusplus +interface IInkRecognitionResult; +#endif /* __cplusplus */ #endif #ifndef __IInkStrokeDisp_FWD_DEFINED__ #define __IInkStrokeDisp_FWD_DEFINED__ typedef interface IInkStrokeDisp IInkStrokeDisp; +#ifdef __cplusplus +interface IInkStrokeDisp; +#endif /* __cplusplus */ #endif #ifndef __IInkCustomStrokes_FWD_DEFINED__ #define __IInkCustomStrokes_FWD_DEFINED__ typedef interface IInkCustomStrokes IInkCustomStrokes; +#ifdef __cplusplus +interface IInkCustomStrokes; +#endif /* __cplusplus */ #endif #ifndef __IInkDisp_FWD_DEFINED__ #define __IInkDisp_FWD_DEFINED__ typedef interface IInkDisp IInkDisp; +#ifdef __cplusplus +interface IInkDisp; +#endif /* __cplusplus */ #endif #ifndef __IInkStrokes_FWD_DEFINED__ #define __IInkStrokes_FWD_DEFINED__ typedef interface IInkStrokes IInkStrokes; +#ifdef __cplusplus +interface IInkStrokes; +#endif /* __cplusplus */ #endif #ifndef __IInkRenderer_FWD_DEFINED__ #define __IInkRenderer_FWD_DEFINED__ typedef interface IInkRenderer IInkRenderer; +#ifdef __cplusplus +interface IInkRenderer; +#endif /* __cplusplus */ #endif #ifndef __IInkCursors_FWD_DEFINED__ #define __IInkCursors_FWD_DEFINED__ typedef interface IInkCursors IInkCursors; +#ifdef __cplusplus +interface IInkCursors; +#endif /* __cplusplus */ #endif #ifndef __IInkCollector_FWD_DEFINED__ #define __IInkCollector_FWD_DEFINED__ typedef interface IInkCollector IInkCollector; +#ifdef __cplusplus +interface IInkCollector; +#endif /* __cplusplus */ #endif #ifndef ___IInkCollectorEvents_FWD_DEFINED__ #define ___IInkCollectorEvents_FWD_DEFINED__ typedef interface _IInkCollectorEvents _IInkCollectorEvents; +#ifdef __cplusplus +interface _IInkCollectorEvents; +#endif /* __cplusplus */ #endif #ifndef __InkCollector_FWD_DEFINED__ @@ -361,16 +422,25 @@ typedef enum DISPID_InkCollectorEvent { #ifndef __IInkDisp_FWD_DEFINED__ #define __IInkDisp_FWD_DEFINED__ typedef interface IInkDisp IInkDisp; +#ifdef __cplusplus +interface IInkDisp; +#endif /* __cplusplus */ #endif #ifndef __IInkStrokes_FWD_DEFINED__ #define __IInkStrokes_FWD_DEFINED__ typedef interface IInkStrokes IInkStrokes; +#ifdef __cplusplus +interface IInkStrokes; +#endif /* __cplusplus */ #endif #ifndef __IInkRecognitionAlternate_FWD_DEFINED__ #define __IInkRecognitionAlternate_FWD_DEFINED__ typedef interface IInkRecognitionAlternate IInkRecognitionAlternate; +#ifdef __cplusplus +interface IInkRecognitionAlternate; +#endif /* __cplusplus */ #endif /***************************************************************************** @@ -403,29 +473,29 @@ typedef struct IInkExtendedPropertyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInkExtendedProperty* This, + IInkExtendedProperty *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInkExtendedProperty* This); + IInkExtendedProperty *This); ULONG (STDMETHODCALLTYPE *Release)( - IInkExtendedProperty* This); + IInkExtendedProperty *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IInkExtendedProperty* This, + IInkExtendedProperty *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IInkExtendedProperty* This, + IInkExtendedProperty *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IInkExtendedProperty* This, + IInkExtendedProperty *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -433,7 +503,7 @@ typedef struct IInkExtendedPropertyVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IInkExtendedProperty* This, + IInkExtendedProperty *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -445,19 +515,20 @@ typedef struct IInkExtendedPropertyVtbl { /*** IInkExtendedProperty methods ***/ HRESULT (STDMETHODCALLTYPE *get_Guid)( - IInkExtendedProperty* This, + IInkExtendedProperty *This, BSTR *Guid); HRESULT (STDMETHODCALLTYPE *get_Data)( - IInkExtendedProperty* This, + IInkExtendedProperty *This, VARIANT *Data); HRESULT (STDMETHODCALLTYPE *put_Data)( - IInkExtendedProperty* This, + IInkExtendedProperty *This, VARIANT Data); END_INTERFACE } IInkExtendedPropertyVtbl; + interface IInkExtendedProperty { CONST_VTBL IInkExtendedPropertyVtbl* lpVtbl; }; @@ -516,30 +587,6 @@ static FORCEINLINE HRESULT IInkExtendedProperty_put_Data(IInkExtendedProperty* T #endif -HRESULT STDMETHODCALLTYPE IInkExtendedProperty_get_Guid_Proxy( - IInkExtendedProperty* This, - BSTR *Guid); -void __RPC_STUB IInkExtendedProperty_get_Guid_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkExtendedProperty_get_Data_Proxy( - IInkExtendedProperty* This, - VARIANT *Data); -void __RPC_STUB IInkExtendedProperty_get_Data_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkExtendedProperty_put_Data_Proxy( - IInkExtendedProperty* This, - VARIANT Data); -void __RPC_STUB IInkExtendedProperty_put_Data_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInkExtendedProperty_INTERFACE_DEFINED__ */ @@ -589,29 +636,29 @@ typedef struct IInkExtendedPropertiesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInkExtendedProperties* This, + IInkExtendedProperties *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInkExtendedProperties* This); + IInkExtendedProperties *This); ULONG (STDMETHODCALLTYPE *Release)( - IInkExtendedProperties* This); + IInkExtendedProperties *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IInkExtendedProperties* This, + IInkExtendedProperties *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IInkExtendedProperties* This, + IInkExtendedProperties *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IInkExtendedProperties* This, + IInkExtendedProperties *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -619,7 +666,7 @@ typedef struct IInkExtendedPropertiesVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IInkExtendedProperties* This, + IInkExtendedProperties *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -631,38 +678,39 @@ typedef struct IInkExtendedPropertiesVtbl { /*** IInkExtendedProperties methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - IInkExtendedProperties* This, + IInkExtendedProperties *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - IInkExtendedProperties* This, + IInkExtendedProperties *This, IUnknown **_NewEnum); HRESULT (STDMETHODCALLTYPE *Item)( - IInkExtendedProperties* This, + IInkExtendedProperties *This, VARIANT Identifier, IInkExtendedProperty **Item); HRESULT (STDMETHODCALLTYPE *Add)( - IInkExtendedProperties* This, + IInkExtendedProperties *This, BSTR Guid, VARIANT Data, IInkExtendedProperty **InkExtendedProperty); HRESULT (STDMETHODCALLTYPE *Remove)( - IInkExtendedProperties* This, + IInkExtendedProperties *This, VARIANT Identifier); HRESULT (STDMETHODCALLTYPE *Clear)( - IInkExtendedProperties* This); + IInkExtendedProperties *This); HRESULT (STDMETHODCALLTYPE *DoesPropertyExist)( - IInkExtendedProperties* This, + IInkExtendedProperties *This, BSTR Guid, VARIANT_BOOL *DoesPropertyExist); END_INTERFACE } IInkExtendedPropertiesVtbl; + interface IInkExtendedProperties { CONST_VTBL IInkExtendedPropertiesVtbl* lpVtbl; }; @@ -737,65 +785,6 @@ static FORCEINLINE HRESULT IInkExtendedProperties_DoesPropertyExist(IInkExtended #endif -HRESULT STDMETHODCALLTYPE IInkExtendedProperties_get_Count_Proxy( - IInkExtendedProperties* This, - LONG *Count); -void __RPC_STUB IInkExtendedProperties_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkExtendedProperties_get__NewEnum_Proxy( - IInkExtendedProperties* This, - IUnknown **_NewEnum); -void __RPC_STUB IInkExtendedProperties_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkExtendedProperties_Item_Proxy( - IInkExtendedProperties* This, - VARIANT Identifier, - IInkExtendedProperty **Item); -void __RPC_STUB IInkExtendedProperties_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkExtendedProperties_Add_Proxy( - IInkExtendedProperties* This, - BSTR Guid, - VARIANT Data, - IInkExtendedProperty **InkExtendedProperty); -void __RPC_STUB IInkExtendedProperties_Add_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkExtendedProperties_Remove_Proxy( - IInkExtendedProperties* This, - VARIANT Identifier); -void __RPC_STUB IInkExtendedProperties_Remove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkExtendedProperties_Clear_Proxy( - IInkExtendedProperties* This); -void __RPC_STUB IInkExtendedProperties_Clear_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkExtendedProperties_DoesPropertyExist_Proxy( - IInkExtendedProperties* This, - BSTR Guid, - VARIANT_BOOL *DoesPropertyExist); -void __RPC_STUB IInkExtendedProperties_DoesPropertyExist_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInkExtendedProperties_INTERFACE_DEFINED__ */ @@ -880,29 +869,29 @@ typedef struct IInkDrawingAttributesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInkDrawingAttributes* This); + IInkDrawingAttributes *This); ULONG (STDMETHODCALLTYPE *Release)( - IInkDrawingAttributes* This); + IInkDrawingAttributes *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -910,7 +899,7 @@ typedef struct IInkDrawingAttributesVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -922,87 +911,88 @@ typedef struct IInkDrawingAttributesVtbl { /*** IInkDrawingAttributes methods ***/ HRESULT (STDMETHODCALLTYPE *get_Color)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, LONG *CurrentColor); HRESULT (STDMETHODCALLTYPE *put_Color)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, LONG NewColor); HRESULT (STDMETHODCALLTYPE *get_Width)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, float *CurrentWidth); HRESULT (STDMETHODCALLTYPE *put_Width)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, float NewWidth); HRESULT (STDMETHODCALLTYPE *get_Height)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, float *CurrentHeight); HRESULT (STDMETHODCALLTYPE *put_Height)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, float NewHeight); HRESULT (STDMETHODCALLTYPE *get_FitToCurve)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, VARIANT_BOOL *Flag); HRESULT (STDMETHODCALLTYPE *put_FitToCurve)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, VARIANT_BOOL Flag); HRESULT (STDMETHODCALLTYPE *get_IgnorePressure)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, VARIANT_BOOL *Flag); HRESULT (STDMETHODCALLTYPE *put_IgnorePressure)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, VARIANT_BOOL Flag); HRESULT (STDMETHODCALLTYPE *get_AntiAliased)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, VARIANT_BOOL *Flag); HRESULT (STDMETHODCALLTYPE *put_AntiAliased)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, VARIANT_BOOL Flag); HRESULT (STDMETHODCALLTYPE *get_Transparency)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, LONG *CurrentTransparency); HRESULT (STDMETHODCALLTYPE *put_Transparency)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, LONG NewTransparency); HRESULT (STDMETHODCALLTYPE *get_RasterOperation)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, InkRasterOperation *CurrentRasterOperation); HRESULT (STDMETHODCALLTYPE *put_RasterOperation)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, InkRasterOperation NewRasterOperation); HRESULT (STDMETHODCALLTYPE *get_PenTip)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, InkPenTip *CurrentPenTip); HRESULT (STDMETHODCALLTYPE *put_PenTip)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, InkPenTip NewPenTip); HRESULT (STDMETHODCALLTYPE *get_ExtendedProperties)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, IInkExtendedProperties **Properties); HRESULT (STDMETHODCALLTYPE *Clone)( - IInkDrawingAttributes* This, + IInkDrawingAttributes *This, IInkDrawingAttributes **DrawingAttributes); END_INTERFACE } IInkDrawingAttributesVtbl; + interface IInkDrawingAttributes { CONST_VTBL IInkDrawingAttributesVtbl* lpVtbl; }; @@ -1129,166 +1119,6 @@ static FORCEINLINE HRESULT IInkDrawingAttributes_Clone(IInkDrawingAttributes* Th #endif -HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_get_Color_Proxy( - IInkDrawingAttributes* This, - LONG *CurrentColor); -void __RPC_STUB IInkDrawingAttributes_get_Color_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_put_Color_Proxy( - IInkDrawingAttributes* This, - LONG NewColor); -void __RPC_STUB IInkDrawingAttributes_put_Color_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_get_Width_Proxy( - IInkDrawingAttributes* This, - float *CurrentWidth); -void __RPC_STUB IInkDrawingAttributes_get_Width_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_put_Width_Proxy( - IInkDrawingAttributes* This, - float NewWidth); -void __RPC_STUB IInkDrawingAttributes_put_Width_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_get_Height_Proxy( - IInkDrawingAttributes* This, - float *CurrentHeight); -void __RPC_STUB IInkDrawingAttributes_get_Height_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_put_Height_Proxy( - IInkDrawingAttributes* This, - float NewHeight); -void __RPC_STUB IInkDrawingAttributes_put_Height_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_get_FitToCurve_Proxy( - IInkDrawingAttributes* This, - VARIANT_BOOL *Flag); -void __RPC_STUB IInkDrawingAttributes_get_FitToCurve_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_put_FitToCurve_Proxy( - IInkDrawingAttributes* This, - VARIANT_BOOL Flag); -void __RPC_STUB IInkDrawingAttributes_put_FitToCurve_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_get_IgnorePressure_Proxy( - IInkDrawingAttributes* This, - VARIANT_BOOL *Flag); -void __RPC_STUB IInkDrawingAttributes_get_IgnorePressure_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_put_IgnorePressure_Proxy( - IInkDrawingAttributes* This, - VARIANT_BOOL Flag); -void __RPC_STUB IInkDrawingAttributes_put_IgnorePressure_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_get_AntiAliased_Proxy( - IInkDrawingAttributes* This, - VARIANT_BOOL *Flag); -void __RPC_STUB IInkDrawingAttributes_get_AntiAliased_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_put_AntiAliased_Proxy( - IInkDrawingAttributes* This, - VARIANT_BOOL Flag); -void __RPC_STUB IInkDrawingAttributes_put_AntiAliased_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_get_Transparency_Proxy( - IInkDrawingAttributes* This, - LONG *CurrentTransparency); -void __RPC_STUB IInkDrawingAttributes_get_Transparency_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_put_Transparency_Proxy( - IInkDrawingAttributes* This, - LONG NewTransparency); -void __RPC_STUB IInkDrawingAttributes_put_Transparency_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_get_RasterOperation_Proxy( - IInkDrawingAttributes* This, - InkRasterOperation *CurrentRasterOperation); -void __RPC_STUB IInkDrawingAttributes_get_RasterOperation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_put_RasterOperation_Proxy( - IInkDrawingAttributes* This, - InkRasterOperation NewRasterOperation); -void __RPC_STUB IInkDrawingAttributes_put_RasterOperation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_get_PenTip_Proxy( - IInkDrawingAttributes* This, - InkPenTip *CurrentPenTip); -void __RPC_STUB IInkDrawingAttributes_get_PenTip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_put_PenTip_Proxy( - IInkDrawingAttributes* This, - InkPenTip NewPenTip); -void __RPC_STUB IInkDrawingAttributes_put_PenTip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_get_ExtendedProperties_Proxy( - IInkDrawingAttributes* This, - IInkExtendedProperties **Properties); -void __RPC_STUB IInkDrawingAttributes_get_ExtendedProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_Clone_Proxy( - IInkDrawingAttributes* This, - IInkDrawingAttributes **DrawingAttributes); -void __RPC_STUB IInkDrawingAttributes_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInkDrawingAttributes_INTERFACE_DEFINED__ */ @@ -1355,29 +1185,29 @@ typedef struct IInkRectangleVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInkRectangle* This, + IInkRectangle *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInkRectangle* This); + IInkRectangle *This); ULONG (STDMETHODCALLTYPE *Release)( - IInkRectangle* This); + IInkRectangle *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IInkRectangle* This, + IInkRectangle *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IInkRectangle* This, + IInkRectangle *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IInkRectangle* This, + IInkRectangle *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1385,7 +1215,7 @@ typedef struct IInkRectangleVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IInkRectangle* This, + IInkRectangle *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1397,54 +1227,54 @@ typedef struct IInkRectangleVtbl { /*** IInkRectangle methods ***/ HRESULT (STDMETHODCALLTYPE *get_Top)( - IInkRectangle* This, + IInkRectangle *This, LONG *Units); HRESULT (STDMETHODCALLTYPE *put_Top)( - IInkRectangle* This, + IInkRectangle *This, LONG Units); HRESULT (STDMETHODCALLTYPE *get_Left)( - IInkRectangle* This, + IInkRectangle *This, LONG *Units); HRESULT (STDMETHODCALLTYPE *put_Left)( - IInkRectangle* This, + IInkRectangle *This, LONG Units); HRESULT (STDMETHODCALLTYPE *get_Bottom)( - IInkRectangle* This, + IInkRectangle *This, LONG *Units); HRESULT (STDMETHODCALLTYPE *put_Bottom)( - IInkRectangle* This, + IInkRectangle *This, LONG Units); HRESULT (STDMETHODCALLTYPE *get_Right)( - IInkRectangle* This, + IInkRectangle *This, LONG *Units); HRESULT (STDMETHODCALLTYPE *put_Right)( - IInkRectangle* This, + IInkRectangle *This, LONG Units); HRESULT (STDMETHODCALLTYPE *get_Data)( - IInkRectangle* This, + IInkRectangle *This, RECT *Rect); HRESULT (STDMETHODCALLTYPE *put_Data)( - IInkRectangle* This, + IInkRectangle *This, RECT Rect); HRESULT (STDMETHODCALLTYPE *GetRectangle)( - IInkRectangle* This, + IInkRectangle *This, LONG *Top, LONG *Left, LONG *Bottom, LONG *Right); HRESULT (STDMETHODCALLTYPE *SetRectangle)( - IInkRectangle* This, + IInkRectangle *This, LONG Top, LONG Left, LONG Bottom, @@ -1452,6 +1282,7 @@ typedef struct IInkRectangleVtbl { END_INTERFACE } IInkRectangleVtbl; + interface IInkRectangle { CONST_VTBL IInkRectangleVtbl* lpVtbl; }; @@ -1546,108 +1377,6 @@ static FORCEINLINE HRESULT IInkRectangle_SetRectangle(IInkRectangle* This,LONG T #endif -HRESULT STDMETHODCALLTYPE IInkRectangle_get_Top_Proxy( - IInkRectangle* This, - LONG *Units); -void __RPC_STUB IInkRectangle_get_Top_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRectangle_put_Top_Proxy( - IInkRectangle* This, - LONG Units); -void __RPC_STUB IInkRectangle_put_Top_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRectangle_get_Left_Proxy( - IInkRectangle* This, - LONG *Units); -void __RPC_STUB IInkRectangle_get_Left_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRectangle_put_Left_Proxy( - IInkRectangle* This, - LONG Units); -void __RPC_STUB IInkRectangle_put_Left_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRectangle_get_Bottom_Proxy( - IInkRectangle* This, - LONG *Units); -void __RPC_STUB IInkRectangle_get_Bottom_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRectangle_put_Bottom_Proxy( - IInkRectangle* This, - LONG Units); -void __RPC_STUB IInkRectangle_put_Bottom_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRectangle_get_Right_Proxy( - IInkRectangle* This, - LONG *Units); -void __RPC_STUB IInkRectangle_get_Right_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRectangle_put_Right_Proxy( - IInkRectangle* This, - LONG Units); -void __RPC_STUB IInkRectangle_put_Right_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRectangle_get_Data_Proxy( - IInkRectangle* This, - RECT *Rect); -void __RPC_STUB IInkRectangle_get_Data_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRectangle_put_Data_Proxy( - IInkRectangle* This, - RECT Rect); -void __RPC_STUB IInkRectangle_put_Data_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRectangle_GetRectangle_Proxy( - IInkRectangle* This, - LONG *Top, - LONG *Left, - LONG *Bottom, - LONG *Right); -void __RPC_STUB IInkRectangle_GetRectangle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRectangle_SetRectangle_Proxy( - IInkRectangle* This, - LONG Top, - LONG Left, - LONG Bottom, - LONG Right); -void __RPC_STUB IInkRectangle_SetRectangle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInkRectangle_INTERFACE_DEFINED__ */ @@ -1695,29 +1424,29 @@ typedef struct IInkTabletVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInkTablet* This, + IInkTablet *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInkTablet* This); + IInkTablet *This); ULONG (STDMETHODCALLTYPE *Release)( - IInkTablet* This); + IInkTablet *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IInkTablet* This, + IInkTablet *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IInkTablet* This, + IInkTablet *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IInkTablet* This, + IInkTablet *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1725,7 +1454,7 @@ typedef struct IInkTabletVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IInkTablet* This, + IInkTablet *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1737,28 +1466,28 @@ typedef struct IInkTabletVtbl { /*** IInkTablet methods ***/ HRESULT (STDMETHODCALLTYPE *get_Name)( - IInkTablet* This, + IInkTablet *This, BSTR *Name); HRESULT (STDMETHODCALLTYPE *get_PlugAndPlayId)( - IInkTablet* This, + IInkTablet *This, BSTR *Id); HRESULT (STDMETHODCALLTYPE *get_MaximumInputRectangle)( - IInkTablet* This, + IInkTablet *This, IInkRectangle **Rectangle); HRESULT (STDMETHODCALLTYPE *get_HardwareCapabilities)( - IInkTablet* This, + IInkTablet *This, TabletHardwareCapabilities *Capabilities); HRESULT (STDMETHODCALLTYPE *IsPacketPropertySupported)( - IInkTablet* This, + IInkTablet *This, BSTR packetPropertyName, VARIANT_BOOL *Supported); HRESULT (STDMETHODCALLTYPE *GetPropertyMetrics)( - IInkTablet* This, + IInkTablet *This, BSTR propertyName, LONG *Minimum, LONG *Maximum, @@ -1767,6 +1496,7 @@ typedef struct IInkTabletVtbl { END_INTERFACE } IInkTabletVtbl; + interface IInkTablet { CONST_VTBL IInkTabletVtbl* lpVtbl; }; @@ -1837,59 +1567,6 @@ static FORCEINLINE HRESULT IInkTablet_GetPropertyMetrics(IInkTablet* This,BSTR p #endif -HRESULT STDMETHODCALLTYPE IInkTablet_get_Name_Proxy( - IInkTablet* This, - BSTR *Name); -void __RPC_STUB IInkTablet_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTablet_get_PlugAndPlayId_Proxy( - IInkTablet* This, - BSTR *Id); -void __RPC_STUB IInkTablet_get_PlugAndPlayId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTablet_get_MaximumInputRectangle_Proxy( - IInkTablet* This, - IInkRectangle **Rectangle); -void __RPC_STUB IInkTablet_get_MaximumInputRectangle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTablet_get_HardwareCapabilities_Proxy( - IInkTablet* This, - TabletHardwareCapabilities *Capabilities); -void __RPC_STUB IInkTablet_get_HardwareCapabilities_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTablet_IsPacketPropertySupported_Proxy( - IInkTablet* This, - BSTR packetPropertyName, - VARIANT_BOOL *Supported); -void __RPC_STUB IInkTablet_IsPacketPropertySupported_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTablet_GetPropertyMetrics_Proxy( - IInkTablet* This, - BSTR propertyName, - LONG *Minimum, - LONG *Maximum, - TabletPropertyMetricUnit *Units, - float *Resolution); -void __RPC_STUB IInkTablet_GetPropertyMetrics_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInkTablet_INTERFACE_DEFINED__ */ @@ -1923,29 +1600,29 @@ typedef struct IInkCursorButtonVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInkCursorButton* This, + IInkCursorButton *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInkCursorButton* This); + IInkCursorButton *This); ULONG (STDMETHODCALLTYPE *Release)( - IInkCursorButton* This); + IInkCursorButton *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IInkCursorButton* This, + IInkCursorButton *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IInkCursorButton* This, + IInkCursorButton *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IInkCursorButton* This, + IInkCursorButton *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1953,7 +1630,7 @@ typedef struct IInkCursorButtonVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IInkCursorButton* This, + IInkCursorButton *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1965,19 +1642,20 @@ typedef struct IInkCursorButtonVtbl { /*** IInkCursorButton methods ***/ HRESULT (STDMETHODCALLTYPE *get_Name)( - IInkCursorButton* This, + IInkCursorButton *This, BSTR *Name); HRESULT (STDMETHODCALLTYPE *get_Id)( - IInkCursorButton* This, + IInkCursorButton *This, BSTR *Id); HRESULT (STDMETHODCALLTYPE *get_State)( - IInkCursorButton* This, + IInkCursorButton *This, InkCursorButtonState *CurrentState); END_INTERFACE } IInkCursorButtonVtbl; + interface IInkCursorButton { CONST_VTBL IInkCursorButtonVtbl* lpVtbl; }; @@ -2036,30 +1714,6 @@ static FORCEINLINE HRESULT IInkCursorButton_get_State(IInkCursorButton* This,Ink #endif -HRESULT STDMETHODCALLTYPE IInkCursorButton_get_Name_Proxy( - IInkCursorButton* This, - BSTR *Name); -void __RPC_STUB IInkCursorButton_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCursorButton_get_Id_Proxy( - IInkCursorButton* This, - BSTR *Id); -void __RPC_STUB IInkCursorButton_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCursorButton_get_State_Proxy( - IInkCursorButton* This, - InkCursorButtonState *CurrentState); -void __RPC_STUB IInkCursorButton_get_State_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInkCursorButton_INTERFACE_DEFINED__ */ @@ -2094,29 +1748,29 @@ typedef struct IInkCursorButtonsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInkCursorButtons* This, + IInkCursorButtons *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInkCursorButtons* This); + IInkCursorButtons *This); ULONG (STDMETHODCALLTYPE *Release)( - IInkCursorButtons* This); + IInkCursorButtons *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IInkCursorButtons* This, + IInkCursorButtons *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IInkCursorButtons* This, + IInkCursorButtons *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IInkCursorButtons* This, + IInkCursorButtons *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2124,7 +1778,7 @@ typedef struct IInkCursorButtonsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IInkCursorButtons* This, + IInkCursorButtons *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2136,20 +1790,21 @@ typedef struct IInkCursorButtonsVtbl { /*** IInkCursorButtons methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - IInkCursorButtons* This, + IInkCursorButtons *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - IInkCursorButtons* This, + IInkCursorButtons *This, IUnknown **_NewEnum); HRESULT (STDMETHODCALLTYPE *Item)( - IInkCursorButtons* This, + IInkCursorButtons *This, VARIANT Identifier, IInkCursorButton **Button); END_INTERFACE } IInkCursorButtonsVtbl; + interface IInkCursorButtons { CONST_VTBL IInkCursorButtonsVtbl* lpVtbl; }; @@ -2208,31 +1863,6 @@ static FORCEINLINE HRESULT IInkCursorButtons_Item(IInkCursorButtons* This,VARIAN #endif -HRESULT STDMETHODCALLTYPE IInkCursorButtons_get_Count_Proxy( - IInkCursorButtons* This, - LONG *Count); -void __RPC_STUB IInkCursorButtons_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCursorButtons_get__NewEnum_Proxy( - IInkCursorButtons* This, - IUnknown **_NewEnum); -void __RPC_STUB IInkCursorButtons_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCursorButtons_Item_Proxy( - IInkCursorButtons* This, - VARIANT Identifier, - IInkCursorButton **Button); -void __RPC_STUB IInkCursorButtons_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInkCursorButtons_INTERFACE_DEFINED__ */ @@ -2278,29 +1908,29 @@ typedef struct IInkCursorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInkCursor* This, + IInkCursor *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInkCursor* This); + IInkCursor *This); ULONG (STDMETHODCALLTYPE *Release)( - IInkCursor* This); + IInkCursor *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IInkCursor* This, + IInkCursor *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IInkCursor* This, + IInkCursor *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IInkCursor* This, + IInkCursor *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2308,7 +1938,7 @@ typedef struct IInkCursorVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IInkCursor* This, + IInkCursor *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2320,35 +1950,36 @@ typedef struct IInkCursorVtbl { /*** IInkCursor methods ***/ HRESULT (STDMETHODCALLTYPE *get_Name)( - IInkCursor* This, + IInkCursor *This, BSTR *Name); HRESULT (STDMETHODCALLTYPE *get_Id)( - IInkCursor* This, + IInkCursor *This, LONG *Id); HRESULT (STDMETHODCALLTYPE *get_Inverted)( - IInkCursor* This, + IInkCursor *This, VARIANT_BOOL *Status); HRESULT (STDMETHODCALLTYPE *get_DrawingAttributes)( - IInkCursor* This, + IInkCursor *This, IInkDrawingAttributes **Attributes); HRESULT (STDMETHODCALLTYPE *putref_DrawingAttributes)( - IInkCursor* This, + IInkCursor *This, IInkDrawingAttributes *Attributes); HRESULT (STDMETHODCALLTYPE *get_Tablet)( - IInkCursor* This, + IInkCursor *This, IInkTablet **Tablet); HRESULT (STDMETHODCALLTYPE *get_Buttons)( - IInkCursor* This, + IInkCursor *This, IInkCursorButtons **Buttons); END_INTERFACE } IInkCursorVtbl; + interface IInkCursor { CONST_VTBL IInkCursorVtbl* lpVtbl; }; @@ -2423,62 +2054,6 @@ static FORCEINLINE HRESULT IInkCursor_get_Buttons(IInkCursor* This,IInkCursorBut #endif -HRESULT STDMETHODCALLTYPE IInkCursor_get_Name_Proxy( - IInkCursor* This, - BSTR *Name); -void __RPC_STUB IInkCursor_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCursor_get_Id_Proxy( - IInkCursor* This, - LONG *Id); -void __RPC_STUB IInkCursor_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCursor_get_Inverted_Proxy( - IInkCursor* This, - VARIANT_BOOL *Status); -void __RPC_STUB IInkCursor_get_Inverted_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCursor_get_DrawingAttributes_Proxy( - IInkCursor* This, - IInkDrawingAttributes **Attributes); -void __RPC_STUB IInkCursor_get_DrawingAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCursor_putref_DrawingAttributes_Proxy( - IInkCursor* This, - IInkDrawingAttributes *Attributes); -void __RPC_STUB IInkCursor_putref_DrawingAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCursor_get_Tablet_Proxy( - IInkCursor* This, - IInkTablet **Tablet); -void __RPC_STUB IInkCursor_get_Tablet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCursor_get_Buttons_Proxy( - IInkCursor* This, - IInkCursorButtons **Buttons); -void __RPC_STUB IInkCursor_get_Buttons_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInkCursor_INTERFACE_DEFINED__ */ @@ -2585,29 +2160,29 @@ typedef struct IInkTransformVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInkTransform* This, + IInkTransform *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInkTransform* This); + IInkTransform *This); ULONG (STDMETHODCALLTYPE *Release)( - IInkTransform* This); + IInkTransform *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IInkTransform* This, + IInkTransform *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IInkTransform* This, + IInkTransform *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IInkTransform* This, + IInkTransform *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2615,7 +2190,7 @@ typedef struct IInkTransformVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IInkTransform* This, + IInkTransform *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2627,36 +2202,36 @@ typedef struct IInkTransformVtbl { /*** IInkTransform methods ***/ HRESULT (STDMETHODCALLTYPE *Reset)( - IInkTransform* This); + IInkTransform *This); HRESULT (STDMETHODCALLTYPE *Translate)( - IInkTransform* This, + IInkTransform *This, float HorizontalComponent, float VerticalComponent); HRESULT (STDMETHODCALLTYPE *Rotate)( - IInkTransform* This, + IInkTransform *This, float Degrees, float x, float y); HRESULT (STDMETHODCALLTYPE *Reflect)( - IInkTransform* This, + IInkTransform *This, VARIANT_BOOL Horizontally, VARIANT_BOOL Vertically); HRESULT (STDMETHODCALLTYPE *Shear)( - IInkTransform* This, + IInkTransform *This, float HorizontalComponent, float VerticalComponent); HRESULT (STDMETHODCALLTYPE *ScaleTransform)( - IInkTransform* This, + IInkTransform *This, float HorizontalMultiplier, float VerticalMultiplier); HRESULT (STDMETHODCALLTYPE *GetTransform)( - IInkTransform* This, + IInkTransform *This, float *eM11, float *eM12, float *eM21, @@ -2665,7 +2240,7 @@ typedef struct IInkTransformVtbl { float *eDy); HRESULT (STDMETHODCALLTYPE *SetTransform)( - IInkTransform* This, + IInkTransform *This, float eM11, float eM12, float eM21, @@ -2674,63 +2249,64 @@ typedef struct IInkTransformVtbl { float eDy); HRESULT (STDMETHODCALLTYPE *get_eM11)( - IInkTransform* This, + IInkTransform *This, float *Value); HRESULT (STDMETHODCALLTYPE *put_eM11)( - IInkTransform* This, + IInkTransform *This, float Value); HRESULT (STDMETHODCALLTYPE *get_eM12)( - IInkTransform* This, + IInkTransform *This, float *Value); HRESULT (STDMETHODCALLTYPE *put_eM12)( - IInkTransform* This, + IInkTransform *This, float Value); HRESULT (STDMETHODCALLTYPE *get_eM21)( - IInkTransform* This, + IInkTransform *This, float *Value); HRESULT (STDMETHODCALLTYPE *put_eM21)( - IInkTransform* This, + IInkTransform *This, float Value); HRESULT (STDMETHODCALLTYPE *get_eM22)( - IInkTransform* This, + IInkTransform *This, float *Value); HRESULT (STDMETHODCALLTYPE *put_eM22)( - IInkTransform* This, + IInkTransform *This, float Value); HRESULT (STDMETHODCALLTYPE *get_eDx)( - IInkTransform* This, + IInkTransform *This, float *Value); HRESULT (STDMETHODCALLTYPE *put_eDx)( - IInkTransform* This, + IInkTransform *This, float Value); HRESULT (STDMETHODCALLTYPE *get_eDy)( - IInkTransform* This, + IInkTransform *This, float *Value); HRESULT (STDMETHODCALLTYPE *put_eDy)( - IInkTransform* This, + IInkTransform *This, float Value); HRESULT (STDMETHODCALLTYPE *get_Data)( - IInkTransform* This, + IInkTransform *This, XFORM *XForm); HRESULT (STDMETHODCALLTYPE *put_Data)( - IInkTransform* This, + IInkTransform *This, XFORM XForm); END_INTERFACE } IInkTransformVtbl; + interface IInkTransform { CONST_VTBL IInkTransformVtbl* lpVtbl; }; @@ -2865,197 +2441,6 @@ static FORCEINLINE HRESULT IInkTransform_put_Data(IInkTransform* This,XFORM XFor #endif -HRESULT STDMETHODCALLTYPE IInkTransform_Reset_Proxy( - IInkTransform* This); -void __RPC_STUB IInkTransform_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTransform_Translate_Proxy( - IInkTransform* This, - float HorizontalComponent, - float VerticalComponent); -void __RPC_STUB IInkTransform_Translate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTransform_Rotate_Proxy( - IInkTransform* This, - float Degrees, - float x, - float y); -void __RPC_STUB IInkTransform_Rotate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTransform_Reflect_Proxy( - IInkTransform* This, - VARIANT_BOOL Horizontally, - VARIANT_BOOL Vertically); -void __RPC_STUB IInkTransform_Reflect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTransform_Shear_Proxy( - IInkTransform* This, - float HorizontalComponent, - float VerticalComponent); -void __RPC_STUB IInkTransform_Shear_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTransform_ScaleTransform_Proxy( - IInkTransform* This, - float HorizontalMultiplier, - float VerticalMultiplier); -void __RPC_STUB IInkTransform_ScaleTransform_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTransform_GetTransform_Proxy( - IInkTransform* This, - float *eM11, - float *eM12, - float *eM21, - float *eM22, - float *eDx, - float *eDy); -void __RPC_STUB IInkTransform_GetTransform_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTransform_SetTransform_Proxy( - IInkTransform* This, - float eM11, - float eM12, - float eM21, - float eM22, - float eDx, - float eDy); -void __RPC_STUB IInkTransform_SetTransform_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTransform_get_eM11_Proxy( - IInkTransform* This, - float *Value); -void __RPC_STUB IInkTransform_get_eM11_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTransform_put_eM11_Proxy( - IInkTransform* This, - float Value); -void __RPC_STUB IInkTransform_put_eM11_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTransform_get_eM12_Proxy( - IInkTransform* This, - float *Value); -void __RPC_STUB IInkTransform_get_eM12_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTransform_put_eM12_Proxy( - IInkTransform* This, - float Value); -void __RPC_STUB IInkTransform_put_eM12_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTransform_get_eM21_Proxy( - IInkTransform* This, - float *Value); -void __RPC_STUB IInkTransform_get_eM21_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTransform_put_eM21_Proxy( - IInkTransform* This, - float Value); -void __RPC_STUB IInkTransform_put_eM21_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTransform_get_eM22_Proxy( - IInkTransform* This, - float *Value); -void __RPC_STUB IInkTransform_get_eM22_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTransform_put_eM22_Proxy( - IInkTransform* This, - float Value); -void __RPC_STUB IInkTransform_put_eM22_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTransform_get_eDx_Proxy( - IInkTransform* This, - float *Value); -void __RPC_STUB IInkTransform_get_eDx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTransform_put_eDx_Proxy( - IInkTransform* This, - float Value); -void __RPC_STUB IInkTransform_put_eDx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTransform_get_eDy_Proxy( - IInkTransform* This, - float *Value); -void __RPC_STUB IInkTransform_get_eDy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTransform_put_eDy_Proxy( - IInkTransform* This, - float Value); -void __RPC_STUB IInkTransform_put_eDy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTransform_get_Data_Proxy( - IInkTransform* This, - XFORM *XForm); -void __RPC_STUB IInkTransform_get_Data_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkTransform_put_Data_Proxy( - IInkTransform* This, - XFORM XForm); -void __RPC_STUB IInkTransform_put_Data_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInkTransform_INTERFACE_DEFINED__ */ @@ -3093,29 +2478,29 @@ typedef struct IInkRecognitionAlternatesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInkRecognitionAlternates* This, + IInkRecognitionAlternates *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInkRecognitionAlternates* This); + IInkRecognitionAlternates *This); ULONG (STDMETHODCALLTYPE *Release)( - IInkRecognitionAlternates* This); + IInkRecognitionAlternates *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IInkRecognitionAlternates* This, + IInkRecognitionAlternates *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IInkRecognitionAlternates* This, + IInkRecognitionAlternates *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IInkRecognitionAlternates* This, + IInkRecognitionAlternates *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -3123,7 +2508,7 @@ typedef struct IInkRecognitionAlternatesVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IInkRecognitionAlternates* This, + IInkRecognitionAlternates *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -3135,24 +2520,25 @@ typedef struct IInkRecognitionAlternatesVtbl { /*** IInkRecognitionAlternates methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - IInkRecognitionAlternates* This, + IInkRecognitionAlternates *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - IInkRecognitionAlternates* This, + IInkRecognitionAlternates *This, IUnknown **_NewEnum); HRESULT (STDMETHODCALLTYPE *get_Strokes)( - IInkRecognitionAlternates* This, + IInkRecognitionAlternates *This, IInkStrokes **Strokes); HRESULT (STDMETHODCALLTYPE *Item)( - IInkRecognitionAlternates* This, + IInkRecognitionAlternates *This, LONG Index, IInkRecognitionAlternate **InkRecoAlternate); END_INTERFACE } IInkRecognitionAlternatesVtbl; + interface IInkRecognitionAlternates { CONST_VTBL IInkRecognitionAlternatesVtbl* lpVtbl; }; @@ -3215,39 +2601,6 @@ static FORCEINLINE HRESULT IInkRecognitionAlternates_Item(IInkRecognitionAlterna #endif -HRESULT STDMETHODCALLTYPE IInkRecognitionAlternates_get_Count_Proxy( - IInkRecognitionAlternates* This, - LONG *Count); -void __RPC_STUB IInkRecognitionAlternates_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRecognitionAlternates_get__NewEnum_Proxy( - IInkRecognitionAlternates* This, - IUnknown **_NewEnum); -void __RPC_STUB IInkRecognitionAlternates_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRecognitionAlternates_get_Strokes_Proxy( - IInkRecognitionAlternates* This, - IInkStrokes **Strokes); -void __RPC_STUB IInkRecognitionAlternates_get_Strokes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRecognitionAlternates_Item_Proxy( - IInkRecognitionAlternates* This, - LONG Index, - IInkRecognitionAlternate **InkRecoAlternate); -void __RPC_STUB IInkRecognitionAlternates_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInkRecognitionAlternates_INTERFACE_DEFINED__ */ @@ -3324,29 +2677,29 @@ typedef struct IInkRecognitionAlternateVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInkRecognitionAlternate* This, + IInkRecognitionAlternate *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInkRecognitionAlternate* This); + IInkRecognitionAlternate *This); ULONG (STDMETHODCALLTYPE *Release)( - IInkRecognitionAlternate* This); + IInkRecognitionAlternate *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IInkRecognitionAlternate* This, + IInkRecognitionAlternate *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IInkRecognitionAlternate* This, + IInkRecognitionAlternate *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IInkRecognitionAlternate* This, + IInkRecognitionAlternate *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -3354,7 +2707,7 @@ typedef struct IInkRecognitionAlternateVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IInkRecognitionAlternate* This, + IInkRecognitionAlternate *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -3366,74 +2719,75 @@ typedef struct IInkRecognitionAlternateVtbl { /*** IInkRecognitionAlternate methods ***/ HRESULT (STDMETHODCALLTYPE *get_String)( - IInkRecognitionAlternate* This, + IInkRecognitionAlternate *This, BSTR *RecoString); HRESULT (STDMETHODCALLTYPE *get_Confidence)( - IInkRecognitionAlternate* This, + IInkRecognitionAlternate *This, InkRecognitionConfidence *Confidence); HRESULT (STDMETHODCALLTYPE *get_Baseline)( - IInkRecognitionAlternate* This, + IInkRecognitionAlternate *This, VARIANT *Baseline); HRESULT (STDMETHODCALLTYPE *get_Midline)( - IInkRecognitionAlternate* This, + IInkRecognitionAlternate *This, VARIANT *Midline); HRESULT (STDMETHODCALLTYPE *get_Ascender)( - IInkRecognitionAlternate* This, + IInkRecognitionAlternate *This, VARIANT *Ascender); HRESULT (STDMETHODCALLTYPE *get_Descender)( - IInkRecognitionAlternate* This, + IInkRecognitionAlternate *This, VARIANT *Descender); HRESULT (STDMETHODCALLTYPE *get_LineNumber)( - IInkRecognitionAlternate* This, + IInkRecognitionAlternate *This, LONG *LineNumber); HRESULT (STDMETHODCALLTYPE *get_Strokes)( - IInkRecognitionAlternate* This, + IInkRecognitionAlternate *This, IInkStrokes **Strokes); HRESULT (STDMETHODCALLTYPE *get_LineAlternates)( - IInkRecognitionAlternate* This, + IInkRecognitionAlternate *This, IInkRecognitionAlternates **LineAlternates); HRESULT (STDMETHODCALLTYPE *get_ConfidenceAlternates)( - IInkRecognitionAlternate* This, + IInkRecognitionAlternate *This, IInkRecognitionAlternates **ConfidenceAlternates); HRESULT (STDMETHODCALLTYPE *GetStrokesFromStrokeRanges)( - IInkRecognitionAlternate* This, + IInkRecognitionAlternate *This, IInkStrokes *Strokes, IInkStrokes **GetStrokesFromStrokeRanges); HRESULT (STDMETHODCALLTYPE *GetStrokesFromTextRange)( - IInkRecognitionAlternate* This, + IInkRecognitionAlternate *This, LONG *selectionStart, LONG *selectionLength, IInkStrokes **GetStrokesFromTextRange); HRESULT (STDMETHODCALLTYPE *GetTextRangeFromStrokes)( - IInkRecognitionAlternate* This, + IInkRecognitionAlternate *This, IInkStrokes *Strokes, LONG *selectionStart, LONG *selectionLength); HRESULT (STDMETHODCALLTYPE *AlternatesWithConstantPropertyValues)( - IInkRecognitionAlternate* This, + IInkRecognitionAlternate *This, BSTR PropertyType, IInkRecognitionAlternates **AlternatesWithConstantPropertyValues); HRESULT (STDMETHODCALLTYPE *GetPropertyValue)( - IInkRecognitionAlternate* This, + IInkRecognitionAlternate *This, BSTR PropertyType, VARIANT *PropertyValue); END_INTERFACE } IInkRecognitionAlternateVtbl; + interface IInkRecognitionAlternate { CONST_VTBL IInkRecognitionAlternateVtbl* lpVtbl; }; @@ -3540,133 +2894,6 @@ static FORCEINLINE HRESULT IInkRecognitionAlternate_GetPropertyValue(IInkRecogni #endif -HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_get_String_Proxy( - IInkRecognitionAlternate* This, - BSTR *RecoString); -void __RPC_STUB IInkRecognitionAlternate_get_String_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_get_Confidence_Proxy( - IInkRecognitionAlternate* This, - InkRecognitionConfidence *Confidence); -void __RPC_STUB IInkRecognitionAlternate_get_Confidence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_get_Baseline_Proxy( - IInkRecognitionAlternate* This, - VARIANT *Baseline); -void __RPC_STUB IInkRecognitionAlternate_get_Baseline_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_get_Midline_Proxy( - IInkRecognitionAlternate* This, - VARIANT *Midline); -void __RPC_STUB IInkRecognitionAlternate_get_Midline_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_get_Ascender_Proxy( - IInkRecognitionAlternate* This, - VARIANT *Ascender); -void __RPC_STUB IInkRecognitionAlternate_get_Ascender_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_get_Descender_Proxy( - IInkRecognitionAlternate* This, - VARIANT *Descender); -void __RPC_STUB IInkRecognitionAlternate_get_Descender_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_get_LineNumber_Proxy( - IInkRecognitionAlternate* This, - LONG *LineNumber); -void __RPC_STUB IInkRecognitionAlternate_get_LineNumber_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_get_Strokes_Proxy( - IInkRecognitionAlternate* This, - IInkStrokes **Strokes); -void __RPC_STUB IInkRecognitionAlternate_get_Strokes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_get_LineAlternates_Proxy( - IInkRecognitionAlternate* This, - IInkRecognitionAlternates **LineAlternates); -void __RPC_STUB IInkRecognitionAlternate_get_LineAlternates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_get_ConfidenceAlternates_Proxy( - IInkRecognitionAlternate* This, - IInkRecognitionAlternates **ConfidenceAlternates); -void __RPC_STUB IInkRecognitionAlternate_get_ConfidenceAlternates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_GetStrokesFromStrokeRanges_Proxy( - IInkRecognitionAlternate* This, - IInkStrokes *Strokes, - IInkStrokes **GetStrokesFromStrokeRanges); -void __RPC_STUB IInkRecognitionAlternate_GetStrokesFromStrokeRanges_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_GetStrokesFromTextRange_Proxy( - IInkRecognitionAlternate* This, - LONG *selectionStart, - LONG *selectionLength, - IInkStrokes **GetStrokesFromTextRange); -void __RPC_STUB IInkRecognitionAlternate_GetStrokesFromTextRange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_GetTextRangeFromStrokes_Proxy( - IInkRecognitionAlternate* This, - IInkStrokes *Strokes, - LONG *selectionStart, - LONG *selectionLength); -void __RPC_STUB IInkRecognitionAlternate_GetTextRangeFromStrokes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_AlternatesWithConstantPropertyValues_Proxy( - IInkRecognitionAlternate* This, - BSTR PropertyType, - IInkRecognitionAlternates **AlternatesWithConstantPropertyValues); -void __RPC_STUB IInkRecognitionAlternate_AlternatesWithConstantPropertyValues_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_GetPropertyValue_Proxy( - IInkRecognitionAlternate* This, - BSTR PropertyType, - VARIANT *PropertyValue); -void __RPC_STUB IInkRecognitionAlternate_GetPropertyValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInkRecognitionAlternate_INTERFACE_DEFINED__ */ @@ -3715,29 +2942,29 @@ typedef struct IInkRecognitionResultVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInkRecognitionResult* This, + IInkRecognitionResult *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInkRecognitionResult* This); + IInkRecognitionResult *This); ULONG (STDMETHODCALLTYPE *Release)( - IInkRecognitionResult* This); + IInkRecognitionResult *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IInkRecognitionResult* This, + IInkRecognitionResult *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IInkRecognitionResult* This, + IInkRecognitionResult *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IInkRecognitionResult* This, + IInkRecognitionResult *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -3745,7 +2972,7 @@ typedef struct IInkRecognitionResultVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IInkRecognitionResult* This, + IInkRecognitionResult *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -3757,37 +2984,38 @@ typedef struct IInkRecognitionResultVtbl { /*** IInkRecognitionResult methods ***/ HRESULT (STDMETHODCALLTYPE *get_TopString)( - IInkRecognitionResult* This, + IInkRecognitionResult *This, BSTR *TopString); HRESULT (STDMETHODCALLTYPE *get_TopAlternate)( - IInkRecognitionResult* This, + IInkRecognitionResult *This, IInkRecognitionAlternate **TopAlternate); HRESULT (STDMETHODCALLTYPE *get_TopConfidence)( - IInkRecognitionResult* This, + IInkRecognitionResult *This, InkRecognitionConfidence *TopConfidence); HRESULT (STDMETHODCALLTYPE *get_Strokes)( - IInkRecognitionResult* This, + IInkRecognitionResult *This, IInkStrokes **Strokes); HRESULT (STDMETHODCALLTYPE *AlternatesFromSelection)( - IInkRecognitionResult* This, + IInkRecognitionResult *This, LONG selectionStart, LONG selectionLength, LONG maximumAlternates, IInkRecognitionAlternates **AlternatesFromSelection); HRESULT (STDMETHODCALLTYPE *ModifyTopAlternate)( - IInkRecognitionResult* This, + IInkRecognitionResult *This, IInkRecognitionAlternate *Alternate); HRESULT (STDMETHODCALLTYPE *SetResultOnStrokes)( - IInkRecognitionResult* This); + IInkRecognitionResult *This); END_INTERFACE } IInkRecognitionResultVtbl; + interface IInkRecognitionResult { CONST_VTBL IInkRecognitionResultVtbl* lpVtbl; }; @@ -3862,64 +3090,6 @@ static FORCEINLINE HRESULT IInkRecognitionResult_SetResultOnStrokes(IInkRecognit #endif -HRESULT STDMETHODCALLTYPE IInkRecognitionResult_get_TopString_Proxy( - IInkRecognitionResult* This, - BSTR *TopString); -void __RPC_STUB IInkRecognitionResult_get_TopString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRecognitionResult_get_TopAlternate_Proxy( - IInkRecognitionResult* This, - IInkRecognitionAlternate **TopAlternate); -void __RPC_STUB IInkRecognitionResult_get_TopAlternate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRecognitionResult_get_TopConfidence_Proxy( - IInkRecognitionResult* This, - InkRecognitionConfidence *TopConfidence); -void __RPC_STUB IInkRecognitionResult_get_TopConfidence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRecognitionResult_get_Strokes_Proxy( - IInkRecognitionResult* This, - IInkStrokes **Strokes); -void __RPC_STUB IInkRecognitionResult_get_Strokes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRecognitionResult_AlternatesFromSelection_Proxy( - IInkRecognitionResult* This, - LONG selectionStart, - LONG selectionLength, - LONG maximumAlternates, - IInkRecognitionAlternates **AlternatesFromSelection); -void __RPC_STUB IInkRecognitionResult_AlternatesFromSelection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRecognitionResult_ModifyTopAlternate_Proxy( - IInkRecognitionResult* This, - IInkRecognitionAlternate *Alternate); -void __RPC_STUB IInkRecognitionResult_ModifyTopAlternate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRecognitionResult_SetResultOnStrokes_Proxy( - IInkRecognitionResult* This); -void __RPC_STUB IInkRecognitionResult_SetResultOnStrokes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInkRecognitionResult_INTERFACE_DEFINED__ */ @@ -4078,29 +3248,29 @@ typedef struct IInkStrokeDispVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInkStrokeDisp* This); + IInkStrokeDisp *This); ULONG (STDMETHODCALLTYPE *Release)( - IInkStrokeDisp* This); + IInkStrokeDisp *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -4108,7 +3278,7 @@ typedef struct IInkStrokeDispVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -4120,97 +3290,97 @@ typedef struct IInkStrokeDispVtbl { /*** IInkStrokeDisp methods ***/ HRESULT (STDMETHODCALLTYPE *get_ID)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, LONG *ID); HRESULT (STDMETHODCALLTYPE *get_BezierPoints)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, VARIANT *Points); HRESULT (STDMETHODCALLTYPE *get_DrawingAttributes)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, IInkDrawingAttributes **DrawAttrs); HRESULT (STDMETHODCALLTYPE *putref_DrawingAttributes)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, IInkDrawingAttributes *DrawAttrs); HRESULT (STDMETHODCALLTYPE *get_Ink)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, IInkDisp **Ink); HRESULT (STDMETHODCALLTYPE *get_ExtendedProperties)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, IInkExtendedProperties **Properties); HRESULT (STDMETHODCALLTYPE *get_PolylineCusps)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, VARIANT *Cusps); HRESULT (STDMETHODCALLTYPE *get_BezierCusps)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, VARIANT *Cusps); HRESULT (STDMETHODCALLTYPE *get_SelfIntersections)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, VARIANT *Intersections); HRESULT (STDMETHODCALLTYPE *get_PacketCount)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, LONG *plCount); HRESULT (STDMETHODCALLTYPE *get_PacketSize)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, LONG *plSize); HRESULT (STDMETHODCALLTYPE *get_PacketDescription)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, VARIANT *PacketDescription); HRESULT (STDMETHODCALLTYPE *get_Deleted)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, VARIANT_BOOL *Deleted); HRESULT (STDMETHODCALLTYPE *GetBoundingBox)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, InkBoundingBoxMode BoundingBoxMode, IInkRectangle **Rectangle); HRESULT (STDMETHODCALLTYPE *FindIntersections)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, IInkStrokes *Strokes, VARIANT *Intersections); HRESULT (STDMETHODCALLTYPE *GetRectangleIntersections)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, IInkRectangle *Rectangle, VARIANT *Intersections); HRESULT (STDMETHODCALLTYPE *Clip)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, IInkRectangle *Rectangle); HRESULT (STDMETHODCALLTYPE *HitTestCircle)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, LONG X, LONG Y, float Radius, VARIANT_BOOL *Intersects); HRESULT (STDMETHODCALLTYPE *NearestPoint)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, LONG X, LONG Y, float *Distance, float *Point); HRESULT (STDMETHODCALLTYPE *Split)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, float SplitAt, IInkStrokeDisp **NewStroke); HRESULT (STDMETHODCALLTYPE *GetPacketDescriptionPropertyMetrics)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, BSTR PropertyName, LONG *Minimum, LONG *Maximum, @@ -4218,33 +3388,33 @@ typedef struct IInkStrokeDispVtbl { float *Resolution); HRESULT (STDMETHODCALLTYPE *GetPoints)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, LONG Index, LONG Count, VARIANT *Points); HRESULT (STDMETHODCALLTYPE *SetPoints)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, VARIANT Points, LONG Index, LONG Count, LONG *NumberOfPointsSet); HRESULT (STDMETHODCALLTYPE *GetPacketData)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, LONG Index, LONG Count, VARIANT *PacketData); HRESULT (STDMETHODCALLTYPE *GetPacketValuesByProperty)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, BSTR PropertyName, LONG Index, LONG Count, VARIANT *PacketValues); HRESULT (STDMETHODCALLTYPE *SetPacketValuesByProperty)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, BSTR bstrPropertyName, VARIANT PacketValues, LONG Index, @@ -4252,42 +3422,43 @@ typedef struct IInkStrokeDispVtbl { LONG *NumberOfPacketsSet); HRESULT (STDMETHODCALLTYPE *GetFlattenedBezierPoints)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, LONG FittingError, VARIANT *FlattenedBezierPoints); HRESULT (STDMETHODCALLTYPE *Transform)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, IInkTransform *Transform, VARIANT_BOOL ApplyOnPenWidth); HRESULT (STDMETHODCALLTYPE *ScaleToRectangle)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, IInkRectangle *Rectangle); HRESULT (STDMETHODCALLTYPE *Move)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, float HorizontalComponent, float VerticalComponent); HRESULT (STDMETHODCALLTYPE *Rotate)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, float Degrees, float x, float y); HRESULT (STDMETHODCALLTYPE *Shear)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, float HorizontalMultiplier, float VerticalMultiplier); HRESULT (STDMETHODCALLTYPE *ScaleTransform)( - IInkStrokeDisp* This, + IInkStrokeDisp *This, float HorizontalMultiplier, float VerticalMultiplier); END_INTERFACE } IInkStrokeDispVtbl; + interface IInkStrokeDisp { CONST_VTBL IInkStrokeDispVtbl* lpVtbl; }; @@ -4466,305 +3637,6 @@ static FORCEINLINE HRESULT IInkStrokeDisp_ScaleTransform(IInkStrokeDisp* This,fl #endif -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_get_ID_Proxy( - IInkStrokeDisp* This, - LONG *ID); -void __RPC_STUB IInkStrokeDisp_get_ID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_get_BezierPoints_Proxy( - IInkStrokeDisp* This, - VARIANT *Points); -void __RPC_STUB IInkStrokeDisp_get_BezierPoints_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_get_DrawingAttributes_Proxy( - IInkStrokeDisp* This, - IInkDrawingAttributes **DrawAttrs); -void __RPC_STUB IInkStrokeDisp_get_DrawingAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_putref_DrawingAttributes_Proxy( - IInkStrokeDisp* This, - IInkDrawingAttributes *DrawAttrs); -void __RPC_STUB IInkStrokeDisp_putref_DrawingAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_get_Ink_Proxy( - IInkStrokeDisp* This, - IInkDisp **Ink); -void __RPC_STUB IInkStrokeDisp_get_Ink_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_get_ExtendedProperties_Proxy( - IInkStrokeDisp* This, - IInkExtendedProperties **Properties); -void __RPC_STUB IInkStrokeDisp_get_ExtendedProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_get_PolylineCusps_Proxy( - IInkStrokeDisp* This, - VARIANT *Cusps); -void __RPC_STUB IInkStrokeDisp_get_PolylineCusps_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_get_BezierCusps_Proxy( - IInkStrokeDisp* This, - VARIANT *Cusps); -void __RPC_STUB IInkStrokeDisp_get_BezierCusps_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_get_SelfIntersections_Proxy( - IInkStrokeDisp* This, - VARIANT *Intersections); -void __RPC_STUB IInkStrokeDisp_get_SelfIntersections_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_get_PacketCount_Proxy( - IInkStrokeDisp* This, - LONG *plCount); -void __RPC_STUB IInkStrokeDisp_get_PacketCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_get_PacketSize_Proxy( - IInkStrokeDisp* This, - LONG *plSize); -void __RPC_STUB IInkStrokeDisp_get_PacketSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_get_PacketDescription_Proxy( - IInkStrokeDisp* This, - VARIANT *PacketDescription); -void __RPC_STUB IInkStrokeDisp_get_PacketDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_get_Deleted_Proxy( - IInkStrokeDisp* This, - VARIANT_BOOL *Deleted); -void __RPC_STUB IInkStrokeDisp_get_Deleted_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_GetBoundingBox_Proxy( - IInkStrokeDisp* This, - InkBoundingBoxMode BoundingBoxMode, - IInkRectangle **Rectangle); -void __RPC_STUB IInkStrokeDisp_GetBoundingBox_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_FindIntersections_Proxy( - IInkStrokeDisp* This, - IInkStrokes *Strokes, - VARIANT *Intersections); -void __RPC_STUB IInkStrokeDisp_FindIntersections_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_GetRectangleIntersections_Proxy( - IInkStrokeDisp* This, - IInkRectangle *Rectangle, - VARIANT *Intersections); -void __RPC_STUB IInkStrokeDisp_GetRectangleIntersections_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_Clip_Proxy( - IInkStrokeDisp* This, - IInkRectangle *Rectangle); -void __RPC_STUB IInkStrokeDisp_Clip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_HitTestCircle_Proxy( - IInkStrokeDisp* This, - LONG X, - LONG Y, - float Radius, - VARIANT_BOOL *Intersects); -void __RPC_STUB IInkStrokeDisp_HitTestCircle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_NearestPoint_Proxy( - IInkStrokeDisp* This, - LONG X, - LONG Y, - float *Distance, - float *Point); -void __RPC_STUB IInkStrokeDisp_NearestPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_Split_Proxy( - IInkStrokeDisp* This, - float SplitAt, - IInkStrokeDisp **NewStroke); -void __RPC_STUB IInkStrokeDisp_Split_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_GetPacketDescriptionPropertyMetrics_Proxy( - IInkStrokeDisp* This, - BSTR PropertyName, - LONG *Minimum, - LONG *Maximum, - TabletPropertyMetricUnit *Units, - float *Resolution); -void __RPC_STUB IInkStrokeDisp_GetPacketDescriptionPropertyMetrics_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_GetPoints_Proxy( - IInkStrokeDisp* This, - LONG Index, - LONG Count, - VARIANT *Points); -void __RPC_STUB IInkStrokeDisp_GetPoints_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_SetPoints_Proxy( - IInkStrokeDisp* This, - VARIANT Points, - LONG Index, - LONG Count, - LONG *NumberOfPointsSet); -void __RPC_STUB IInkStrokeDisp_SetPoints_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_GetPacketData_Proxy( - IInkStrokeDisp* This, - LONG Index, - LONG Count, - VARIANT *PacketData); -void __RPC_STUB IInkStrokeDisp_GetPacketData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_GetPacketValuesByProperty_Proxy( - IInkStrokeDisp* This, - BSTR PropertyName, - LONG Index, - LONG Count, - VARIANT *PacketValues); -void __RPC_STUB IInkStrokeDisp_GetPacketValuesByProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_SetPacketValuesByProperty_Proxy( - IInkStrokeDisp* This, - BSTR bstrPropertyName, - VARIANT PacketValues, - LONG Index, - LONG Count, - LONG *NumberOfPacketsSet); -void __RPC_STUB IInkStrokeDisp_SetPacketValuesByProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_GetFlattenedBezierPoints_Proxy( - IInkStrokeDisp* This, - LONG FittingError, - VARIANT *FlattenedBezierPoints); -void __RPC_STUB IInkStrokeDisp_GetFlattenedBezierPoints_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_Transform_Proxy( - IInkStrokeDisp* This, - IInkTransform *Transform, - VARIANT_BOOL ApplyOnPenWidth); -void __RPC_STUB IInkStrokeDisp_Transform_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_ScaleToRectangle_Proxy( - IInkStrokeDisp* This, - IInkRectangle *Rectangle); -void __RPC_STUB IInkStrokeDisp_ScaleToRectangle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_Move_Proxy( - IInkStrokeDisp* This, - float HorizontalComponent, - float VerticalComponent); -void __RPC_STUB IInkStrokeDisp_Move_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_Rotate_Proxy( - IInkStrokeDisp* This, - float Degrees, - float x, - float y); -void __RPC_STUB IInkStrokeDisp_Rotate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_Shear_Proxy( - IInkStrokeDisp* This, - float HorizontalMultiplier, - float VerticalMultiplier); -void __RPC_STUB IInkStrokeDisp_Shear_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokeDisp_ScaleTransform_Proxy( - IInkStrokeDisp* This, - float HorizontalMultiplier, - float VerticalMultiplier); -void __RPC_STUB IInkStrokeDisp_ScaleTransform_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInkStrokeDisp_INTERFACE_DEFINED__ */ @@ -4809,29 +3681,29 @@ typedef struct IInkCustomStrokesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInkCustomStrokes* This, + IInkCustomStrokes *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInkCustomStrokes* This); + IInkCustomStrokes *This); ULONG (STDMETHODCALLTYPE *Release)( - IInkCustomStrokes* This); + IInkCustomStrokes *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IInkCustomStrokes* This, + IInkCustomStrokes *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IInkCustomStrokes* This, + IInkCustomStrokes *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IInkCustomStrokes* This, + IInkCustomStrokes *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -4839,7 +3711,7 @@ typedef struct IInkCustomStrokesVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IInkCustomStrokes* This, + IInkCustomStrokes *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -4851,32 +3723,33 @@ typedef struct IInkCustomStrokesVtbl { /*** IInkCustomStrokes methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - IInkCustomStrokes* This, + IInkCustomStrokes *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - IInkCustomStrokes* This, + IInkCustomStrokes *This, IUnknown **_NewEnum); HRESULT (STDMETHODCALLTYPE *Item)( - IInkCustomStrokes* This, + IInkCustomStrokes *This, VARIANT Identifier, IInkStrokes **Strokes); HRESULT (STDMETHODCALLTYPE *Add)( - IInkCustomStrokes* This, + IInkCustomStrokes *This, BSTR Name, IInkStrokes *Strokes); HRESULT (STDMETHODCALLTYPE *Remove)( - IInkCustomStrokes* This, + IInkCustomStrokes *This, VARIANT Identifier); HRESULT (STDMETHODCALLTYPE *Clear)( - IInkCustomStrokes* This); + IInkCustomStrokes *This); END_INTERFACE } IInkCustomStrokesVtbl; + interface IInkCustomStrokes { CONST_VTBL IInkCustomStrokesVtbl* lpVtbl; }; @@ -4947,55 +3820,6 @@ static FORCEINLINE HRESULT IInkCustomStrokes_Clear(IInkCustomStrokes* This) { #endif -HRESULT STDMETHODCALLTYPE IInkCustomStrokes_get_Count_Proxy( - IInkCustomStrokes* This, - LONG *Count); -void __RPC_STUB IInkCustomStrokes_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCustomStrokes_get__NewEnum_Proxy( - IInkCustomStrokes* This, - IUnknown **_NewEnum); -void __RPC_STUB IInkCustomStrokes_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCustomStrokes_Item_Proxy( - IInkCustomStrokes* This, - VARIANT Identifier, - IInkStrokes **Strokes); -void __RPC_STUB IInkCustomStrokes_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCustomStrokes_Add_Proxy( - IInkCustomStrokes* This, - BSTR Name, - IInkStrokes *Strokes); -void __RPC_STUB IInkCustomStrokes_Add_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCustomStrokes_Remove_Proxy( - IInkCustomStrokes* This, - VARIANT Identifier); -void __RPC_STUB IInkCustomStrokes_Remove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCustomStrokes_Clear_Proxy( - IInkCustomStrokes* This); -void __RPC_STUB IInkCustomStrokes_Clear_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInkCustomStrokes_INTERFACE_DEFINED__ */ @@ -5128,29 +3952,29 @@ typedef struct IInkDispVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInkDisp* This, + IInkDisp *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInkDisp* This); + IInkDisp *This); ULONG (STDMETHODCALLTYPE *Release)( - IInkDisp* This); + IInkDisp *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IInkDisp* This, + IInkDisp *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IInkDisp* This, + IInkDisp *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IInkDisp* This, + IInkDisp *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -5158,7 +3982,7 @@ typedef struct IInkDispVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IInkDisp* This, + IInkDisp *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -5170,80 +3994,80 @@ typedef struct IInkDispVtbl { /*** IInkDisp methods ***/ HRESULT (STDMETHODCALLTYPE *get_Strokes)( - IInkDisp* This, + IInkDisp *This, IInkStrokes **Strokes); HRESULT (STDMETHODCALLTYPE *get_ExtendedProperties)( - IInkDisp* This, + IInkDisp *This, IInkExtendedProperties **Properties); HRESULT (STDMETHODCALLTYPE *get_Dirty)( - IInkDisp* This, + IInkDisp *This, VARIANT_BOOL *Dirty); HRESULT (STDMETHODCALLTYPE *put_Dirty)( - IInkDisp* This, + IInkDisp *This, VARIANT_BOOL Dirty); HRESULT (STDMETHODCALLTYPE *get_CustomStrokes)( - IInkDisp* This, + IInkDisp *This, IInkCustomStrokes **ppunkInkCustomStrokes); HRESULT (STDMETHODCALLTYPE *GetBoundingBox)( - IInkDisp* This, + IInkDisp *This, InkBoundingBoxMode BoundingBoxMode, IInkRectangle **Rectangle); HRESULT (STDMETHODCALLTYPE *DeleteStrokes)( - IInkDisp* This, + IInkDisp *This, IInkStrokes *Strokes); HRESULT (STDMETHODCALLTYPE *DeleteStroke)( - IInkDisp* This, + IInkDisp *This, IInkStrokeDisp *Stroke); HRESULT (STDMETHODCALLTYPE *ExtractStrokes)( - IInkDisp* This, + IInkDisp *This, IInkStrokes *Strokes, InkExtractFlags ExtractFlags, IInkDisp **ExtractedInk); HRESULT (STDMETHODCALLTYPE *ExtractWithRectangle)( - IInkDisp* This, + IInkDisp *This, IInkRectangle *Rectangle, InkExtractFlags extractFlags, IInkDisp **ExtractedInk); HRESULT (STDMETHODCALLTYPE *Clip)( - IInkDisp* This, + IInkDisp *This, IInkRectangle *Rectangle); HRESULT (STDMETHODCALLTYPE *Clone)( - IInkDisp* This, + IInkDisp *This, IInkDisp **NewInk); HRESULT (STDMETHODCALLTYPE *HitTestCircle)( - IInkDisp* This, + IInkDisp *This, LONG X, LONG Y, float radius, IInkStrokes **Strokes); HRESULT (STDMETHODCALLTYPE *HitTestWithRectangle)( - IInkDisp* This, + IInkDisp *This, IInkRectangle *SelectionRectangle, float IntersectPercent, IInkStrokes **Strokes); HRESULT (STDMETHODCALLTYPE *HitTestWithLasso)( - IInkDisp* This, + IInkDisp *This, VARIANT Points, float IntersectPercent, VARIANT *LassoPoints, IInkStrokes **Strokes); HRESULT (STDMETHODCALLTYPE *NearestPoint)( - IInkDisp* This, + IInkDisp *This, LONG X, LONG Y, float *PointOnStroke, @@ -5251,52 +4075,52 @@ typedef struct IInkDispVtbl { IInkStrokeDisp **Stroke); HRESULT (STDMETHODCALLTYPE *CreateStrokes)( - IInkDisp* This, + IInkDisp *This, VARIANT StrokeIds, IInkStrokes **Strokes); HRESULT (STDMETHODCALLTYPE *AddStrokesAtRectangle)( - IInkDisp* This, + IInkDisp *This, IInkStrokes *SourceStrokes, IInkRectangle *TargetRectangle); HRESULT (STDMETHODCALLTYPE *Save)( - IInkDisp* This, + IInkDisp *This, InkPersistenceFormat PersistenceFormat, InkPersistenceCompressionMode CompressionMode, VARIANT *Data); HRESULT (STDMETHODCALLTYPE *Load)( - IInkDisp* This, + IInkDisp *This, VARIANT Data); HRESULT (STDMETHODCALLTYPE *CreateStroke)( - IInkDisp* This, + IInkDisp *This, VARIANT PacketData, VARIANT PacketDescription, IInkStrokeDisp **Stroke); HRESULT (STDMETHODCALLTYPE *ClipboardCopyWithRectangle)( - IInkDisp* This, + IInkDisp *This, IInkRectangle *Rectangle, InkClipboardFormats ClipboardFormats, InkClipboardModes ClipboardModes, IDataObject **DataObject); HRESULT (STDMETHODCALLTYPE *ClipboardCopy)( - IInkDisp* This, + IInkDisp *This, IInkStrokes *strokes, InkClipboardFormats ClipboardFormats, InkClipboardModes ClipboardModes, IDataObject **DataObject); HRESULT (STDMETHODCALLTYPE *CanPaste)( - IInkDisp* This, + IInkDisp *This, IDataObject *DataObject, VARIANT_BOOL *CanPaste); HRESULT (STDMETHODCALLTYPE *ClipboardPaste)( - IInkDisp* This, + IInkDisp *This, LONG x, LONG y, IDataObject *DataObject, @@ -5304,6 +4128,7 @@ typedef struct IInkDispVtbl { END_INTERFACE } IInkDispVtbl; + interface IInkDisp { CONST_VTBL IInkDispVtbl* lpVtbl; }; @@ -5450,239 +4275,6 @@ static FORCEINLINE HRESULT IInkDisp_ClipboardPaste(IInkDisp* This,LONG x,LONG y, #endif -HRESULT STDMETHODCALLTYPE IInkDisp_get_Strokes_Proxy( - IInkDisp* This, - IInkStrokes **Strokes); -void __RPC_STUB IInkDisp_get_Strokes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDisp_get_ExtendedProperties_Proxy( - IInkDisp* This, - IInkExtendedProperties **Properties); -void __RPC_STUB IInkDisp_get_ExtendedProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDisp_get_Dirty_Proxy( - IInkDisp* This, - VARIANT_BOOL *Dirty); -void __RPC_STUB IInkDisp_get_Dirty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDisp_put_Dirty_Proxy( - IInkDisp* This, - VARIANT_BOOL Dirty); -void __RPC_STUB IInkDisp_put_Dirty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDisp_get_CustomStrokes_Proxy( - IInkDisp* This, - IInkCustomStrokes **ppunkInkCustomStrokes); -void __RPC_STUB IInkDisp_get_CustomStrokes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDisp_GetBoundingBox_Proxy( - IInkDisp* This, - InkBoundingBoxMode BoundingBoxMode, - IInkRectangle **Rectangle); -void __RPC_STUB IInkDisp_GetBoundingBox_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDisp_DeleteStrokes_Proxy( - IInkDisp* This, - IInkStrokes *Strokes); -void __RPC_STUB IInkDisp_DeleteStrokes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDisp_DeleteStroke_Proxy( - IInkDisp* This, - IInkStrokeDisp *Stroke); -void __RPC_STUB IInkDisp_DeleteStroke_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDisp_ExtractStrokes_Proxy( - IInkDisp* This, - IInkStrokes *Strokes, - InkExtractFlags ExtractFlags, - IInkDisp **ExtractedInk); -void __RPC_STUB IInkDisp_ExtractStrokes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDisp_ExtractWithRectangle_Proxy( - IInkDisp* This, - IInkRectangle *Rectangle, - InkExtractFlags extractFlags, - IInkDisp **ExtractedInk); -void __RPC_STUB IInkDisp_ExtractWithRectangle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDisp_Clip_Proxy( - IInkDisp* This, - IInkRectangle *Rectangle); -void __RPC_STUB IInkDisp_Clip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDisp_Clone_Proxy( - IInkDisp* This, - IInkDisp **NewInk); -void __RPC_STUB IInkDisp_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDisp_HitTestCircle_Proxy( - IInkDisp* This, - LONG X, - LONG Y, - float radius, - IInkStrokes **Strokes); -void __RPC_STUB IInkDisp_HitTestCircle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDisp_HitTestWithRectangle_Proxy( - IInkDisp* This, - IInkRectangle *SelectionRectangle, - float IntersectPercent, - IInkStrokes **Strokes); -void __RPC_STUB IInkDisp_HitTestWithRectangle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDisp_HitTestWithLasso_Proxy( - IInkDisp* This, - VARIANT Points, - float IntersectPercent, - VARIANT *LassoPoints, - IInkStrokes **Strokes); -void __RPC_STUB IInkDisp_HitTestWithLasso_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDisp_NearestPoint_Proxy( - IInkDisp* This, - LONG X, - LONG Y, - float *PointOnStroke, - float *DistanceFromPacket, - IInkStrokeDisp **Stroke); -void __RPC_STUB IInkDisp_NearestPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDisp_CreateStrokes_Proxy( - IInkDisp* This, - VARIANT StrokeIds, - IInkStrokes **Strokes); -void __RPC_STUB IInkDisp_CreateStrokes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDisp_AddStrokesAtRectangle_Proxy( - IInkDisp* This, - IInkStrokes *SourceStrokes, - IInkRectangle *TargetRectangle); -void __RPC_STUB IInkDisp_AddStrokesAtRectangle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDisp_Save_Proxy( - IInkDisp* This, - InkPersistenceFormat PersistenceFormat, - InkPersistenceCompressionMode CompressionMode, - VARIANT *Data); -void __RPC_STUB IInkDisp_Save_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDisp_Load_Proxy( - IInkDisp* This, - VARIANT Data); -void __RPC_STUB IInkDisp_Load_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDisp_CreateStroke_Proxy( - IInkDisp* This, - VARIANT PacketData, - VARIANT PacketDescription, - IInkStrokeDisp **Stroke); -void __RPC_STUB IInkDisp_CreateStroke_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDisp_ClipboardCopyWithRectangle_Proxy( - IInkDisp* This, - IInkRectangle *Rectangle, - InkClipboardFormats ClipboardFormats, - InkClipboardModes ClipboardModes, - IDataObject **DataObject); -void __RPC_STUB IInkDisp_ClipboardCopyWithRectangle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDisp_ClipboardCopy_Proxy( - IInkDisp* This, - IInkStrokes *strokes, - InkClipboardFormats ClipboardFormats, - InkClipboardModes ClipboardModes, - IDataObject **DataObject); -void __RPC_STUB IInkDisp_ClipboardCopy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDisp_CanPaste_Proxy( - IInkDisp* This, - IDataObject *DataObject, - VARIANT_BOOL *CanPaste); -void __RPC_STUB IInkDisp_CanPaste_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkDisp_ClipboardPaste_Proxy( - IInkDisp* This, - LONG x, - LONG y, - IDataObject *DataObject, - IInkStrokes **Strokes); -void __RPC_STUB IInkDisp_ClipboardPaste_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInkDisp_INTERFACE_DEFINED__ */ @@ -5775,29 +4367,29 @@ typedef struct IInkStrokesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInkStrokes* This, + IInkStrokes *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInkStrokes* This); + IInkStrokes *This); ULONG (STDMETHODCALLTYPE *Release)( - IInkStrokes* This); + IInkStrokes *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IInkStrokes* This, + IInkStrokes *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IInkStrokes* This, + IInkStrokes *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IInkStrokes* This, + IInkStrokes *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -5805,7 +4397,7 @@ typedef struct IInkStrokesVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IInkStrokes* This, + IInkStrokes *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -5817,94 +4409,95 @@ typedef struct IInkStrokesVtbl { /*** IInkStrokes methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - IInkStrokes* This, + IInkStrokes *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - IInkStrokes* This, + IInkStrokes *This, IUnknown **_NewEnum); HRESULT (STDMETHODCALLTYPE *get_Ink)( - IInkStrokes* This, + IInkStrokes *This, IInkDisp **Ink); HRESULT (STDMETHODCALLTYPE *get_RecognitionResult)( - IInkStrokes* This, + IInkStrokes *This, IInkRecognitionResult **RecognitionResult); HRESULT (STDMETHODCALLTYPE *ToString)( - IInkStrokes* This, + IInkStrokes *This, BSTR *ToString); HRESULT (STDMETHODCALLTYPE *Item)( - IInkStrokes* This, + IInkStrokes *This, LONG Index, IInkStrokeDisp **Stroke); HRESULT (STDMETHODCALLTYPE *Add)( - IInkStrokes* This, + IInkStrokes *This, IInkStrokeDisp *InkStroke); HRESULT (STDMETHODCALLTYPE *AddStrokes)( - IInkStrokes* This, + IInkStrokes *This, IInkStrokes *InkStrokes); HRESULT (STDMETHODCALLTYPE *Remove)( - IInkStrokes* This, + IInkStrokes *This, IInkStrokeDisp *InkStroke); HRESULT (STDMETHODCALLTYPE *RemoveStrokes)( - IInkStrokes* This, + IInkStrokes *This, IInkStrokes *InkStrokes); HRESULT (STDMETHODCALLTYPE *ModifyDrawingAttributes)( - IInkStrokes* This, + IInkStrokes *This, IInkDrawingAttributes *DrawAttrs); HRESULT (STDMETHODCALLTYPE *GetBoundingBox)( - IInkStrokes* This, + IInkStrokes *This, InkBoundingBoxMode BoundingBoxMode, IInkRectangle **BoundingBox); HRESULT (STDMETHODCALLTYPE *Transform)( - IInkStrokes* This, + IInkStrokes *This, IInkTransform *Transform, VARIANT_BOOL ApplyOnPenWidth); HRESULT (STDMETHODCALLTYPE *ScaleToRectangle)( - IInkStrokes* This, + IInkStrokes *This, IInkRectangle *Rectangle); HRESULT (STDMETHODCALLTYPE *Move)( - IInkStrokes* This, + IInkStrokes *This, float HorizontalComponent, float VerticalComponent); HRESULT (STDMETHODCALLTYPE *Rotate)( - IInkStrokes* This, + IInkStrokes *This, float Degrees, float x, float y); HRESULT (STDMETHODCALLTYPE *Shear)( - IInkStrokes* This, + IInkStrokes *This, float HorizontalMultiplier, float VerticalMultiplier); HRESULT (STDMETHODCALLTYPE *ScaleTransform)( - IInkStrokes* This, + IInkStrokes *This, float HorizontalMultiplier, float VerticalMultiplier); HRESULT (STDMETHODCALLTYPE *Clip)( - IInkStrokes* This, + IInkStrokes *This, IInkRectangle *Rectangle); HRESULT (STDMETHODCALLTYPE *RemoveRecognitionResult)( - IInkStrokes* This); + IInkStrokes *This); END_INTERFACE } IInkStrokesVtbl; + interface IInkStrokes { CONST_VTBL IInkStrokesVtbl* lpVtbl; }; @@ -6031,173 +4624,6 @@ static FORCEINLINE HRESULT IInkStrokes_RemoveRecognitionResult(IInkStrokes* This #endif -HRESULT STDMETHODCALLTYPE IInkStrokes_get_Count_Proxy( - IInkStrokes* This, - LONG *Count); -void __RPC_STUB IInkStrokes_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokes_get__NewEnum_Proxy( - IInkStrokes* This, - IUnknown **_NewEnum); -void __RPC_STUB IInkStrokes_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokes_get_Ink_Proxy( - IInkStrokes* This, - IInkDisp **Ink); -void __RPC_STUB IInkStrokes_get_Ink_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokes_get_RecognitionResult_Proxy( - IInkStrokes* This, - IInkRecognitionResult **RecognitionResult); -void __RPC_STUB IInkStrokes_get_RecognitionResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokes_ToString_Proxy( - IInkStrokes* This, - BSTR *ToString); -void __RPC_STUB IInkStrokes_ToString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokes_Item_Proxy( - IInkStrokes* This, - LONG Index, - IInkStrokeDisp **Stroke); -void __RPC_STUB IInkStrokes_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokes_Add_Proxy( - IInkStrokes* This, - IInkStrokeDisp *InkStroke); -void __RPC_STUB IInkStrokes_Add_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokes_AddStrokes_Proxy( - IInkStrokes* This, - IInkStrokes *InkStrokes); -void __RPC_STUB IInkStrokes_AddStrokes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokes_Remove_Proxy( - IInkStrokes* This, - IInkStrokeDisp *InkStroke); -void __RPC_STUB IInkStrokes_Remove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokes_RemoveStrokes_Proxy( - IInkStrokes* This, - IInkStrokes *InkStrokes); -void __RPC_STUB IInkStrokes_RemoveStrokes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokes_ModifyDrawingAttributes_Proxy( - IInkStrokes* This, - IInkDrawingAttributes *DrawAttrs); -void __RPC_STUB IInkStrokes_ModifyDrawingAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokes_GetBoundingBox_Proxy( - IInkStrokes* This, - InkBoundingBoxMode BoundingBoxMode, - IInkRectangle **BoundingBox); -void __RPC_STUB IInkStrokes_GetBoundingBox_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokes_Transform_Proxy( - IInkStrokes* This, - IInkTransform *Transform, - VARIANT_BOOL ApplyOnPenWidth); -void __RPC_STUB IInkStrokes_Transform_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokes_ScaleToRectangle_Proxy( - IInkStrokes* This, - IInkRectangle *Rectangle); -void __RPC_STUB IInkStrokes_ScaleToRectangle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokes_Move_Proxy( - IInkStrokes* This, - float HorizontalComponent, - float VerticalComponent); -void __RPC_STUB IInkStrokes_Move_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokes_Rotate_Proxy( - IInkStrokes* This, - float Degrees, - float x, - float y); -void __RPC_STUB IInkStrokes_Rotate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokes_Shear_Proxy( - IInkStrokes* This, - float HorizontalMultiplier, - float VerticalMultiplier); -void __RPC_STUB IInkStrokes_Shear_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokes_ScaleTransform_Proxy( - IInkStrokes* This, - float HorizontalMultiplier, - float VerticalMultiplier); -void __RPC_STUB IInkStrokes_ScaleTransform_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokes_Clip_Proxy( - IInkStrokes* This, - IInkRectangle *Rectangle); -void __RPC_STUB IInkStrokes_Clip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkStrokes_RemoveRecognitionResult_Proxy( - IInkStrokes* This); -void __RPC_STUB IInkStrokes_RemoveRecognitionResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInkStrokes_INTERFACE_DEFINED__ */ @@ -6284,29 +4710,29 @@ typedef struct IInkRendererVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInkRenderer* This, + IInkRenderer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInkRenderer* This); + IInkRenderer *This); ULONG (STDMETHODCALLTYPE *Release)( - IInkRenderer* This); + IInkRenderer *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IInkRenderer* This, + IInkRenderer *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IInkRenderer* This, + IInkRenderer *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IInkRenderer* This, + IInkRenderer *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -6314,7 +4740,7 @@ typedef struct IInkRendererVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IInkRenderer* This, + IInkRenderer *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -6326,84 +4752,85 @@ typedef struct IInkRendererVtbl { /*** IInkRenderer methods ***/ HRESULT (STDMETHODCALLTYPE *GetViewTransform)( - IInkRenderer* This, + IInkRenderer *This, IInkTransform *ViewTransform); HRESULT (STDMETHODCALLTYPE *SetViewTransform)( - IInkRenderer* This, + IInkRenderer *This, IInkTransform *ViewTransform); HRESULT (STDMETHODCALLTYPE *GetObjectTransform)( - IInkRenderer* This, + IInkRenderer *This, IInkTransform *ObjectTransform); HRESULT (STDMETHODCALLTYPE *SetObjectTransform)( - IInkRenderer* This, + IInkRenderer *This, IInkTransform *ObjectTransform); HRESULT (STDMETHODCALLTYPE *Draw)( - IInkRenderer* This, + IInkRenderer *This, LONG_PTR hDC, IInkStrokes *Strokes); HRESULT (STDMETHODCALLTYPE *DrawStroke)( - IInkRenderer* This, + IInkRenderer *This, LONG_PTR hDC, IInkStrokeDisp *Stroke, IInkDrawingAttributes *DrawingAttributes); HRESULT (STDMETHODCALLTYPE *PixelToInkSpace)( - IInkRenderer* This, + IInkRenderer *This, LONG_PTR hDC, LONG *x, LONG *y); HRESULT (STDMETHODCALLTYPE *InkSpaceToPixel)( - IInkRenderer* This, + IInkRenderer *This, LONG_PTR hdcDisplay, LONG *x, LONG *y); HRESULT (STDMETHODCALLTYPE *PixelToInkSpaceFromPoints)( - IInkRenderer* This, + IInkRenderer *This, LONG_PTR hDC, VARIANT *Points); HRESULT (STDMETHODCALLTYPE *InkSpaceToPixelFromPoints)( - IInkRenderer* This, + IInkRenderer *This, LONG_PTR hDC, VARIANT *Points); HRESULT (STDMETHODCALLTYPE *Measure)( - IInkRenderer* This, + IInkRenderer *This, IInkStrokes *Strokes, IInkRectangle **Rectangle); HRESULT (STDMETHODCALLTYPE *MeasureStroke)( - IInkRenderer* This, + IInkRenderer *This, IInkStrokeDisp *Stroke, IInkDrawingAttributes *DrawingAttributes, IInkRectangle **Rectangle); HRESULT (STDMETHODCALLTYPE *Move)( - IInkRenderer* This, + IInkRenderer *This, float HorizontalComponent, float VerticalComponent); HRESULT (STDMETHODCALLTYPE *Rotate)( - IInkRenderer* This, + IInkRenderer *This, float Degrees, float x, float y); HRESULT (STDMETHODCALLTYPE *ScaleTransform)( - IInkRenderer* This, + IInkRenderer *This, float HorizontalMultiplier, float VerticalMultiplier, VARIANT_BOOL ApplyOnPenWidth); END_INTERFACE } IInkRendererVtbl; + interface IInkRenderer { CONST_VTBL IInkRendererVtbl* lpVtbl; }; @@ -6510,143 +4937,6 @@ static FORCEINLINE HRESULT IInkRenderer_ScaleTransform(IInkRenderer* This,float #endif -HRESULT STDMETHODCALLTYPE IInkRenderer_GetViewTransform_Proxy( - IInkRenderer* This, - IInkTransform *ViewTransform); -void __RPC_STUB IInkRenderer_GetViewTransform_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRenderer_SetViewTransform_Proxy( - IInkRenderer* This, - IInkTransform *ViewTransform); -void __RPC_STUB IInkRenderer_SetViewTransform_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRenderer_GetObjectTransform_Proxy( - IInkRenderer* This, - IInkTransform *ObjectTransform); -void __RPC_STUB IInkRenderer_GetObjectTransform_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRenderer_SetObjectTransform_Proxy( - IInkRenderer* This, - IInkTransform *ObjectTransform); -void __RPC_STUB IInkRenderer_SetObjectTransform_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRenderer_Draw_Proxy( - IInkRenderer* This, - LONG_PTR hDC, - IInkStrokes *Strokes); -void __RPC_STUB IInkRenderer_Draw_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRenderer_DrawStroke_Proxy( - IInkRenderer* This, - LONG_PTR hDC, - IInkStrokeDisp *Stroke, - IInkDrawingAttributes *DrawingAttributes); -void __RPC_STUB IInkRenderer_DrawStroke_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRenderer_PixelToInkSpace_Proxy( - IInkRenderer* This, - LONG_PTR hDC, - LONG *x, - LONG *y); -void __RPC_STUB IInkRenderer_PixelToInkSpace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRenderer_InkSpaceToPixel_Proxy( - IInkRenderer* This, - LONG_PTR hdcDisplay, - LONG *x, - LONG *y); -void __RPC_STUB IInkRenderer_InkSpaceToPixel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRenderer_PixelToInkSpaceFromPoints_Proxy( - IInkRenderer* This, - LONG_PTR hDC, - VARIANT *Points); -void __RPC_STUB IInkRenderer_PixelToInkSpaceFromPoints_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRenderer_InkSpaceToPixelFromPoints_Proxy( - IInkRenderer* This, - LONG_PTR hDC, - VARIANT *Points); -void __RPC_STUB IInkRenderer_InkSpaceToPixelFromPoints_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRenderer_Measure_Proxy( - IInkRenderer* This, - IInkStrokes *Strokes, - IInkRectangle **Rectangle); -void __RPC_STUB IInkRenderer_Measure_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRenderer_MeasureStroke_Proxy( - IInkRenderer* This, - IInkStrokeDisp *Stroke, - IInkDrawingAttributes *DrawingAttributes, - IInkRectangle **Rectangle); -void __RPC_STUB IInkRenderer_MeasureStroke_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRenderer_Move_Proxy( - IInkRenderer* This, - float HorizontalComponent, - float VerticalComponent); -void __RPC_STUB IInkRenderer_Move_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRenderer_Rotate_Proxy( - IInkRenderer* This, - float Degrees, - float x, - float y); -void __RPC_STUB IInkRenderer_Rotate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkRenderer_ScaleTransform_Proxy( - IInkRenderer* This, - float HorizontalMultiplier, - float VerticalMultiplier, - VARIANT_BOOL ApplyOnPenWidth); -void __RPC_STUB IInkRenderer_ScaleTransform_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInkRenderer_INTERFACE_DEFINED__ */ @@ -6681,29 +4971,29 @@ typedef struct IInkCursorsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInkCursors* This, + IInkCursors *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInkCursors* This); + IInkCursors *This); ULONG (STDMETHODCALLTYPE *Release)( - IInkCursors* This); + IInkCursors *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IInkCursors* This, + IInkCursors *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IInkCursors* This, + IInkCursors *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IInkCursors* This, + IInkCursors *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -6711,7 +5001,7 @@ typedef struct IInkCursorsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IInkCursors* This, + IInkCursors *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -6723,20 +5013,21 @@ typedef struct IInkCursorsVtbl { /*** IInkCursors methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - IInkCursors* This, + IInkCursors *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - IInkCursors* This, + IInkCursors *This, IUnknown **_NewEnum); HRESULT (STDMETHODCALLTYPE *Item)( - IInkCursors* This, + IInkCursors *This, LONG Index, IInkCursor **Cursor); END_INTERFACE } IInkCursorsVtbl; + interface IInkCursors { CONST_VTBL IInkCursorsVtbl* lpVtbl; }; @@ -6795,31 +5086,6 @@ static FORCEINLINE HRESULT IInkCursors_Item(IInkCursors* This,LONG Index,IInkCur #endif -HRESULT STDMETHODCALLTYPE IInkCursors_get_Count_Proxy( - IInkCursors* This, - LONG *Count); -void __RPC_STUB IInkCursors_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCursors_get__NewEnum_Proxy( - IInkCursors* This, - IUnknown **_NewEnum); -void __RPC_STUB IInkCursors_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCursors_Item_Proxy( - IInkCursors* This, - LONG Index, - IInkCursor **Cursor); -void __RPC_STUB IInkCursors_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInkCursors_INTERFACE_DEFINED__ */ @@ -6968,29 +5234,29 @@ typedef struct IInkCollectorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInkCollector* This, + IInkCollector *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInkCollector* This); + IInkCollector *This); ULONG (STDMETHODCALLTYPE *Release)( - IInkCollector* This); + IInkCollector *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IInkCollector* This, + IInkCollector *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IInkCollector* This, + IInkCollector *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IInkCollector* This, + IInkCollector *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -6998,7 +5264,7 @@ typedef struct IInkCollectorVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IInkCollector* This, + IInkCollector *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -7010,171 +5276,172 @@ typedef struct IInkCollectorVtbl { /*** IInkCollector methods ***/ HRESULT (STDMETHODCALLTYPE *get_hWnd)( - IInkCollector* This, + IInkCollector *This, LONG_PTR *CurrentWindow); HRESULT (STDMETHODCALLTYPE *put_hWnd)( - IInkCollector* This, + IInkCollector *This, LONG_PTR NewWindow); HRESULT (STDMETHODCALLTYPE *get_Enabled)( - IInkCollector* This, + IInkCollector *This, VARIANT_BOOL *Collecting); HRESULT (STDMETHODCALLTYPE *put_Enabled)( - IInkCollector* This, + IInkCollector *This, VARIANT_BOOL Collecting); HRESULT (STDMETHODCALLTYPE *get_DefaultDrawingAttributes)( - IInkCollector* This, + IInkCollector *This, IInkDrawingAttributes **CurrentAttributes); HRESULT (STDMETHODCALLTYPE *putref_DefaultDrawingAttributes)( - IInkCollector* This, + IInkCollector *This, IInkDrawingAttributes *NewAttributes); HRESULT (STDMETHODCALLTYPE *get_Renderer)( - IInkCollector* This, + IInkCollector *This, IInkRenderer **CurrentInkRenderer); HRESULT (STDMETHODCALLTYPE *putref_Renderer)( - IInkCollector* This, + IInkCollector *This, IInkRenderer *NewInkRenderer); HRESULT (STDMETHODCALLTYPE *get_Ink)( - IInkCollector* This, + IInkCollector *This, IInkDisp **Ink); HRESULT (STDMETHODCALLTYPE *putref_Ink)( - IInkCollector* This, + IInkCollector *This, IInkDisp *NewInk); HRESULT (STDMETHODCALLTYPE *get_AutoRedraw)( - IInkCollector* This, + IInkCollector *This, VARIANT_BOOL *AutoRedraw); HRESULT (STDMETHODCALLTYPE *put_AutoRedraw)( - IInkCollector* This, + IInkCollector *This, VARIANT_BOOL AutoRedraw); HRESULT (STDMETHODCALLTYPE *get_CollectingInk)( - IInkCollector* This, + IInkCollector *This, VARIANT_BOOL *Collecting); HRESULT (STDMETHODCALLTYPE *get_CollectionMode)( - IInkCollector* This, + IInkCollector *This, InkCollectionMode *Mode); HRESULT (STDMETHODCALLTYPE *put_CollectionMode)( - IInkCollector* This, + IInkCollector *This, InkCollectionMode Mode); HRESULT (STDMETHODCALLTYPE *get_DynamicRendering)( - IInkCollector* This, + IInkCollector *This, VARIANT_BOOL *Enabled); HRESULT (STDMETHODCALLTYPE *put_DynamicRendering)( - IInkCollector* This, + IInkCollector *This, VARIANT_BOOL Enabled); HRESULT (STDMETHODCALLTYPE *get_DesiredPacketDescription)( - IInkCollector* This, + IInkCollector *This, VARIANT *PacketGuids); HRESULT (STDMETHODCALLTYPE *put_DesiredPacketDescription)( - IInkCollector* This, + IInkCollector *This, VARIANT PacketGuids); HRESULT (STDMETHODCALLTYPE *get_MouseIcon)( - IInkCollector* This, + IInkCollector *This, IPictureDisp **MouseIcon); HRESULT (STDMETHODCALLTYPE *put_MouseIcon)( - IInkCollector* This, + IInkCollector *This, IPictureDisp *MouseIcon); HRESULT (STDMETHODCALLTYPE *putref_MouseIcon)( - IInkCollector* This, + IInkCollector *This, IPictureDisp *MouseIcon); HRESULT (STDMETHODCALLTYPE *get_MousePointer)( - IInkCollector* This, + IInkCollector *This, InkMousePointer *MousePointer); HRESULT (STDMETHODCALLTYPE *put_MousePointer)( - IInkCollector* This, + IInkCollector *This, InkMousePointer MousePointer); HRESULT (STDMETHODCALLTYPE *get_Cursors)( - IInkCollector* This, + IInkCollector *This, IInkCursors **Cursors); HRESULT (STDMETHODCALLTYPE *get_MarginX)( - IInkCollector* This, + IInkCollector *This, LONG *MarginX); HRESULT (STDMETHODCALLTYPE *put_MarginX)( - IInkCollector* This, + IInkCollector *This, LONG MarginX); HRESULT (STDMETHODCALLTYPE *get_MarginY)( - IInkCollector* This, + IInkCollector *This, LONG *MarginY); HRESULT (STDMETHODCALLTYPE *put_MarginY)( - IInkCollector* This, + IInkCollector *This, LONG MarginY); HRESULT (STDMETHODCALLTYPE *get_Tablet)( - IInkCollector* This, + IInkCollector *This, IInkTablet **SingleTablet); HRESULT (STDMETHODCALLTYPE *get_SupportHighContrastInk)( - IInkCollector* This, + IInkCollector *This, VARIANT_BOOL *Support); HRESULT (STDMETHODCALLTYPE *put_SupportHighContrastInk)( - IInkCollector* This, + IInkCollector *This, VARIANT_BOOL Support); HRESULT (STDMETHODCALLTYPE *SetGestureStatus)( - IInkCollector* This, + IInkCollector *This, InkApplicationGesture Gesture, VARIANT_BOOL Listen); HRESULT (STDMETHODCALLTYPE *GetGestureStatus)( - IInkCollector* This, + IInkCollector *This, InkApplicationGesture Gesture, VARIANT_BOOL *Listening); HRESULT (STDMETHODCALLTYPE *GetWindowInputRectangle)( - IInkCollector* This, + IInkCollector *This, IInkRectangle **WindowInputRectangle); HRESULT (STDMETHODCALLTYPE *SetWindowInputRectangle)( - IInkCollector* This, + IInkCollector *This, IInkRectangle *WindowInputRectangle); HRESULT (STDMETHODCALLTYPE *SetAllTabletsMode)( - IInkCollector* This, + IInkCollector *This, VARIANT_BOOL UseMouseForInput); HRESULT (STDMETHODCALLTYPE *SetSingleTabletIntegratedMode)( - IInkCollector* This, + IInkCollector *This, IInkTablet *Tablet); HRESULT (STDMETHODCALLTYPE *GetEventInterest)( - IInkCollector* This, + IInkCollector *This, InkCollectorEventInterest EventId, VARIANT_BOOL *Listen); HRESULT (STDMETHODCALLTYPE *SetEventInterest)( - IInkCollector* This, + IInkCollector *This, InkCollectorEventInterest EventId, VARIANT_BOOL Listen); END_INTERFACE } IInkCollectorVtbl; + interface IInkCollector { CONST_VTBL IInkCollectorVtbl* lpVtbl; }; @@ -7381,330 +5648,6 @@ static FORCEINLINE HRESULT IInkCollector_SetEventInterest(IInkCollector* This,In #endif -HRESULT STDMETHODCALLTYPE IInkCollector_get_hWnd_Proxy( - IInkCollector* This, - LONG_PTR *CurrentWindow); -void __RPC_STUB IInkCollector_get_hWnd_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_put_hWnd_Proxy( - IInkCollector* This, - LONG_PTR NewWindow); -void __RPC_STUB IInkCollector_put_hWnd_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_get_Enabled_Proxy( - IInkCollector* This, - VARIANT_BOOL *Collecting); -void __RPC_STUB IInkCollector_get_Enabled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_put_Enabled_Proxy( - IInkCollector* This, - VARIANT_BOOL Collecting); -void __RPC_STUB IInkCollector_put_Enabled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_get_DefaultDrawingAttributes_Proxy( - IInkCollector* This, - IInkDrawingAttributes **CurrentAttributes); -void __RPC_STUB IInkCollector_get_DefaultDrawingAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_putref_DefaultDrawingAttributes_Proxy( - IInkCollector* This, - IInkDrawingAttributes *NewAttributes); -void __RPC_STUB IInkCollector_putref_DefaultDrawingAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_get_Renderer_Proxy( - IInkCollector* This, - IInkRenderer **CurrentInkRenderer); -void __RPC_STUB IInkCollector_get_Renderer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_putref_Renderer_Proxy( - IInkCollector* This, - IInkRenderer *NewInkRenderer); -void __RPC_STUB IInkCollector_putref_Renderer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_get_Ink_Proxy( - IInkCollector* This, - IInkDisp **Ink); -void __RPC_STUB IInkCollector_get_Ink_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_putref_Ink_Proxy( - IInkCollector* This, - IInkDisp *NewInk); -void __RPC_STUB IInkCollector_putref_Ink_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_get_AutoRedraw_Proxy( - IInkCollector* This, - VARIANT_BOOL *AutoRedraw); -void __RPC_STUB IInkCollector_get_AutoRedraw_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_put_AutoRedraw_Proxy( - IInkCollector* This, - VARIANT_BOOL AutoRedraw); -void __RPC_STUB IInkCollector_put_AutoRedraw_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_get_CollectingInk_Proxy( - IInkCollector* This, - VARIANT_BOOL *Collecting); -void __RPC_STUB IInkCollector_get_CollectingInk_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_get_CollectionMode_Proxy( - IInkCollector* This, - InkCollectionMode *Mode); -void __RPC_STUB IInkCollector_get_CollectionMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_put_CollectionMode_Proxy( - IInkCollector* This, - InkCollectionMode Mode); -void __RPC_STUB IInkCollector_put_CollectionMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_get_DynamicRendering_Proxy( - IInkCollector* This, - VARIANT_BOOL *Enabled); -void __RPC_STUB IInkCollector_get_DynamicRendering_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_put_DynamicRendering_Proxy( - IInkCollector* This, - VARIANT_BOOL Enabled); -void __RPC_STUB IInkCollector_put_DynamicRendering_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_get_DesiredPacketDescription_Proxy( - IInkCollector* This, - VARIANT *PacketGuids); -void __RPC_STUB IInkCollector_get_DesiredPacketDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_put_DesiredPacketDescription_Proxy( - IInkCollector* This, - VARIANT PacketGuids); -void __RPC_STUB IInkCollector_put_DesiredPacketDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_get_MouseIcon_Proxy( - IInkCollector* This, - IPictureDisp **MouseIcon); -void __RPC_STUB IInkCollector_get_MouseIcon_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_put_MouseIcon_Proxy( - IInkCollector* This, - IPictureDisp *MouseIcon); -void __RPC_STUB IInkCollector_put_MouseIcon_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_putref_MouseIcon_Proxy( - IInkCollector* This, - IPictureDisp *MouseIcon); -void __RPC_STUB IInkCollector_putref_MouseIcon_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_get_MousePointer_Proxy( - IInkCollector* This, - InkMousePointer *MousePointer); -void __RPC_STUB IInkCollector_get_MousePointer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_put_MousePointer_Proxy( - IInkCollector* This, - InkMousePointer MousePointer); -void __RPC_STUB IInkCollector_put_MousePointer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_get_Cursors_Proxy( - IInkCollector* This, - IInkCursors **Cursors); -void __RPC_STUB IInkCollector_get_Cursors_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_get_MarginX_Proxy( - IInkCollector* This, - LONG *MarginX); -void __RPC_STUB IInkCollector_get_MarginX_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_put_MarginX_Proxy( - IInkCollector* This, - LONG MarginX); -void __RPC_STUB IInkCollector_put_MarginX_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_get_MarginY_Proxy( - IInkCollector* This, - LONG *MarginY); -void __RPC_STUB IInkCollector_get_MarginY_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_put_MarginY_Proxy( - IInkCollector* This, - LONG MarginY); -void __RPC_STUB IInkCollector_put_MarginY_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_get_Tablet_Proxy( - IInkCollector* This, - IInkTablet **SingleTablet); -void __RPC_STUB IInkCollector_get_Tablet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_get_SupportHighContrastInk_Proxy( - IInkCollector* This, - VARIANT_BOOL *Support); -void __RPC_STUB IInkCollector_get_SupportHighContrastInk_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_put_SupportHighContrastInk_Proxy( - IInkCollector* This, - VARIANT_BOOL Support); -void __RPC_STUB IInkCollector_put_SupportHighContrastInk_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_SetGestureStatus_Proxy( - IInkCollector* This, - InkApplicationGesture Gesture, - VARIANT_BOOL Listen); -void __RPC_STUB IInkCollector_SetGestureStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_GetGestureStatus_Proxy( - IInkCollector* This, - InkApplicationGesture Gesture, - VARIANT_BOOL *Listening); -void __RPC_STUB IInkCollector_GetGestureStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_GetWindowInputRectangle_Proxy( - IInkCollector* This, - IInkRectangle **WindowInputRectangle); -void __RPC_STUB IInkCollector_GetWindowInputRectangle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_SetWindowInputRectangle_Proxy( - IInkCollector* This, - IInkRectangle *WindowInputRectangle); -void __RPC_STUB IInkCollector_SetWindowInputRectangle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_SetAllTabletsMode_Proxy( - IInkCollector* This, - VARIANT_BOOL UseMouseForInput); -void __RPC_STUB IInkCollector_SetAllTabletsMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_SetSingleTabletIntegratedMode_Proxy( - IInkCollector* This, - IInkTablet *Tablet); -void __RPC_STUB IInkCollector_SetSingleTabletIntegratedMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_GetEventInterest_Proxy( - IInkCollector* This, - InkCollectorEventInterest EventId, - VARIANT_BOOL *Listen); -void __RPC_STUB IInkCollector_GetEventInterest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInkCollector_SetEventInterest_Proxy( - IInkCollector* This, - InkCollectorEventInterest EventId, - VARIANT_BOOL Listen); -void __RPC_STUB IInkCollector_SetEventInterest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInkCollector_INTERFACE_DEFINED__ */ @@ -7729,29 +5672,29 @@ typedef struct _IInkCollectorEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - _IInkCollectorEvents* This, + _IInkCollectorEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - _IInkCollectorEvents* This); + _IInkCollectorEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - _IInkCollectorEvents* This); + _IInkCollectorEvents *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - _IInkCollectorEvents* This, + _IInkCollectorEvents *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - _IInkCollectorEvents* This, + _IInkCollectorEvents *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - _IInkCollectorEvents* This, + _IInkCollectorEvents *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -7759,7 +5702,7 @@ typedef struct _IInkCollectorEventsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - _IInkCollectorEvents* This, + _IInkCollectorEvents *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -7771,6 +5714,7 @@ typedef struct _IInkCollectorEventsVtbl { END_INTERFACE } _IInkCollectorEventsVtbl; + interface _IInkCollectorEvents { CONST_VTBL _IInkCollectorEventsVtbl* lpVtbl; }; diff --git a/lib/libc/include/any-windows-any/msoledbsql.h b/lib/libc/include/any-windows-any/msoledbsql.h new file mode 100644 index 0000000000..4017aadda8 --- /dev/null +++ b/lib/libc/include/any-windows-any/msoledbsql.h @@ -0,0 +1,1452 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ +#ifndef __REQUIRED_RPCNDR_H_VERSION__ +#define __REQUIRED_RPCNDR_H_VERSION__ 475 +#endif + +#include "rpc.h" +#include "rpcndr.h" + +#ifndef __RPCNDR_H_VERSION__ +#error This stub requires an updated version of +#endif + +#ifndef COM_NO_WINDOWS_H +#include "windows.h" +#include "ole2.h" +#endif + +#ifndef __msoledbsql_h__ +#define __msoledbsql_h__ + +#ifndef __ICommandWithParameters_FWD_DEFINED__ +#define __ICommandWithParameters_FWD_DEFINED__ +typedef struct ICommandWithParameters ICommandWithParameters; +#endif + +#ifndef __IUMSInitialize_FWD_DEFINED__ +#define __IUMSInitialize_FWD_DEFINED__ +typedef struct IUMSInitialize IUMSInitialize; +#endif + +#ifndef __ISQLServerErrorInfo_FWD_DEFINED__ +#define __ISQLServerErrorInfo_FWD_DEFINED__ +typedef struct ISQLServerErrorInfo ISQLServerErrorInfo; +#endif + +#ifndef __IRowsetFastLoad_FWD_DEFINED__ +#define __IRowsetFastLoad_FWD_DEFINED__ +typedef struct IRowsetFastLoad IRowsetFastLoad; +#endif + +#ifndef __ISchemaLock_FWD_DEFINED__ +#define __ISchemaLock_FWD_DEFINED__ +typedef struct ISchemaLock ISchemaLock; +#endif + +#ifndef __IBCPSession_FWD_DEFINED__ +#define __IBCPSession_FWD_DEFINED__ +typedef struct IBCPSession IBCPSession; +#endif + +#ifndef __IBCPSession2_FWD_DEFINED__ +#define __IBCPSession2_FWD_DEFINED__ +typedef struct IBCPSession2 IBCPSession2; +#endif + +#ifndef __ISSAbort_FWD_DEFINED__ +#define __ISSAbort_FWD_DEFINED__ +typedef struct ISSAbort ISSAbort; +#endif + +#ifndef __ISSCommandWithParameters_FWD_DEFINED__ +#define __ISSCommandWithParameters_FWD_DEFINED__ +typedef struct ISSCommandWithParameters ISSCommandWithParameters; +#endif + +#ifndef __IDBAsynchStatus_FWD_DEFINED__ +#define __IDBAsynchStatus_FWD_DEFINED__ +typedef struct IDBAsynchStatus IDBAsynchStatus; +#endif + +#ifndef __ISSAsynchStatus_FWD_DEFINED__ +#define __ISSAsynchStatus_FWD_DEFINED__ +typedef struct ISSAsynchStatus ISSAsynchStatus; +#endif + +#include "unknwn.h" +#include "oaidl.h" + +#ifdef __cplusplus +extern "C"{ +#endif + +#ifndef MSOLEDBSQL_VER +#define MSOLEDBSQL_VER 1800 +#endif + +#if (MSOLEDBSQL_VER >= 1800) +#define MSOLEDBSQL_PRODUCT_NAME_FULL_ANSI "Microsoft OLE DB Driver for SQL Server" +#define MSOLEDBSQL_PRODUCT_NAME_SHORT_ANSI "OLE DB Driver for SQL Server" +#define MSOLEDBSQL_FILE_NAME_ANSI "msoledbsql" +#define MSOLEDBSQL_FILE_NAME_FULL_ANSI "msoledbsql.dll" +#define MSOLEDBSQL_PRODUCT_NAME_FULL_UNICODE L"Microsoft OLE DB Driver for SQL Server" +#define MSOLEDBSQL_PRODUCT_NAME_SHORT_UNICODE L"OLE DB Driver for SQL Server" +#define MSOLEDBSQL_FILE_NAME_UNICODE L"msoledbsql" +#define MSOLEDBSQL_FILE_NAME_FULL_UNICODE L"msoledbsql.dll" +#define MSOLEDBSQL_VI_PROG_ID_ANSI "MSOLEDBSQL" +#define MSOLEDBSQL_VI_ERROR_LOOKUP_PROG_ID_ANSI "MSOLEDBSQL.ErrorLookup" +#define MSOLEDBSQL_VI_ENUMERATOR_PROG_ID_ANSI "MSOLEDBSQL.Enumerator" +#define MSOLEDBSQL_PROG_ID_ANSI "MSOLEDBSQL.1" +#define MSOLEDBSQL_ERROR_LOOKUP_PROG_ID_ANSI "MSOLEDBSQL.ErrorLookup.1" +#define MSOLEDBSQL_ENUMERATOR_PROG_ID_ANSI "MSOLEDBSQL.Enumerator.1" +#define MSOLEDBSQL_VI_PROG_ID_UNICODE L"MSOLEDBSQL" +#define MSOLEDBSQL_VI_ERROR_LOOKUP_PROG_ID_UNICODE L"MSOLEDBSQL.ErrorLookup" +#define MSOLEDBSQL_VI_ENUMERATOR_PROG_ID_UNICODE L"MSOLEDBSQL.Enumerator" +#define MSOLEDBSQL_PROG_ID_UNICODE L"MSOLEDBSQL.1" +#define MSOLEDBSQL_ERROR_LOOKUP_PROG_ID_UNICODE L"MSOLEDBSQL.ErrorLookup.1" +#define MSOLEDBSQL_ENUMERATOR_PROG_ID_UNICODE L"MSOLEDBSQL.Enumerator.1" +#define MSOLEDBSQL_CLSID CLSID_MSOLEDBSQL +#define MSOLEDBSQL_ERROR_CLSID CLSID_MSOLEDBSQL_ERROR +#define MSOLEDBSQL_ENUMERATOR_CLSID CLSID_MSOLEDBSQL_ENUMERATOR +#endif + +#if defined(_UNICODE) || defined(UNICODE) +#define MSOLEDBSQL_PRODUCT_NAME_FULL MSOLEDBSQL_PRODUCT_NAME_FULL_UNICODE +#define MSOLEDBSQL_PRODUCT_NAME_SHORT MSOLEDBSQL_PRODUCT_NAME_SHORT_UNICODE +#define MSOLEDBSQL_FILE_NAME MSOLEDBSQL_FILE_NAME_UNICODE +#define MSOLEDBSQL_FILE_NAME_FULL MSOLEDBSQL_FILE_NAME_FULL_UNICODE +#define MSOLEDBSQL_VI_PROG_ID MSOLEDBSQL_VI_PROG_ID_UNICODE +#define MSOLEDBSQL_VI_ERROR_LOOKUP_PROG_ID MSOLEDBSQL_VI_ERROR_LOOKUP_PROG_ID_UNICODE +#define MSOLEDBSQL_VI_ENUMERATOR_PROG_ID MSOLEDBSQL_VI_ENUMERATOR_PROG_ID_UNICODE +#define MSOLEDBSQL_PROG_ID MSOLEDBSQL_PROG_ID_UNICODE +#define MSOLEDBSQL_ERROR_LOOKUP_PROG_ID MSOLEDBSQL_ERROR_LOOKUP_PROG_ID_UNICODE +#define MSOLEDBSQL_ENUMERATOR_PROG_ID MSOLEDBSQL_ENUMERATOR_PROG_ID_UNICODE +#else +#define MSOLEDBSQL_PRODUCT_NAME_FULL MSOLEDBSQL_PRODUCT_NAME_FULL_ANSI +#define MSOLEDBSQL_PRODUCT_NAME_SHORT MSOLEDBSQL_PRODUCT_NAME_SHORT_ANSI +#define MSOLEDBSQL_FILE_NAME MSOLEDBSQL_FILE_NAME_ANSI +#define MSOLEDBSQL_FILE_NAME_FULL MSOLEDBSQL_FILE_NAME_FULL_ANSI +#define MSOLEDBSQL_VI_PROG_ID MSOLEDBSQL_VI_PROG_ID_ANSI +#define MSOLEDBSQL_VI_ERROR_LOOKUP_PROG_ID MSOLEDBSQL_VI_ERROR_LOOKUP_PROG_ID_ANSI +#define MSOLEDBSQL_VI_ENUMERATOR_PROG_ID MSOLEDBSQL_VI_ENUMERATOR_PROG_ID_ANSI +#define MSOLEDBSQL_PROG_ID MSOLEDBSQL_PROG_ID_ANSI +#define MSOLEDBSQL_ERROR_LOOKUP_PROG_ID MSOLEDBSQL_ERROR_LOOKUP_PROG_ID_ANSI +#define MSOLEDBSQL_ENUMERATOR_PROG_ID MSOLEDBSQL_ENUMERATOR_PROG_ID_ANSI +#endif + +#ifndef __oledb_h__ +#include +#endif + +#define V_SS_VT(X) ((X)->vt) +#define V_SS_UNION(X, Y) ((X)->Y) +#define V_SS_UI1(X) V_SS_UNION(X, bTinyIntVal) +#define V_SS_I2(X) V_SS_UNION(X, sShortIntVal) +#define V_SS_I4(X) V_SS_UNION(X, lIntVal) +#define V_SS_I8(X) V_SS_UNION(X, llBigIntVal) +#define V_SS_R4(X) V_SS_UNION(X, fltRealVal) +#define V_SS_R8(X) V_SS_UNION(X, dblFloatVal) +#define V_SS_UI4(X) V_SS_UNION(X, ulVal) +#define V_SS_MONEY(X) V_SS_UNION(X, cyMoneyVal) +#define V_SS_SMALLMONEY(X) V_SS_UNION(X, cyMoneyVal) +#define V_SS_WSTRING(X) V_SS_UNION(X, NCharVal) +#define V_SS_WVARSTRING(X) V_SS_UNION(X, NCharVal) +#define V_SS_STRING(X) V_SS_UNION(X, CharVal) +#define V_SS_VARSTRING(X) V_SS_UNION(X, CharVal) +#define V_SS_BIT(X) V_SS_UNION(X, fBitVal) +#define V_SS_GUID(X) V_SS_UNION(X, rgbGuidVal) +#define V_SS_NUMERIC(X) V_SS_UNION(X, numNumericVal) +#define V_SS_DECIMAL(X) V_SS_UNION(X, numNumericVal) +#define V_SS_BINARY(X) V_SS_UNION(X, BinaryVal) +#define V_SS_VARBINARY(X) V_SS_UNION(X, BinaryVal) +#define V_SS_DATETIME(X) V_SS_UNION(X, tsDateTimeVal) +#define V_SS_SMALLDATETIME(X) V_SS_UNION(X, tsDateTimeVal) +#define V_SS_UNKNOWN(X) V_SS_UNION(X, UnknownType) +#define V_SS_IMAGE(X) V_SS_UNION(X, ImageVal) +#define V_SS_TEXT(X) V_SS_UNION(X, TextVal) +#define V_SS_NTEXT(X) V_SS_UNION(X, NTextVal) +#define V_SS_DATE(X) V_SS_UNION(X, dDateVal) +#define V_SS_TIME2(X) V_SS_UNION(X, Time2Val) +#define V_SS_DATETIME2(X) V_SS_UNION(X, DateTimeVal) +#define V_SS_DATETIMEOFFSET(X) V_SS_UNION(X, DateTimeOffsetVal) + +typedef enum DBTYPEENUM EOledbTypes; +#define DBTYPE_XML ((EOledbTypes) 141) +#define DBTYPE_TABLE ((EOledbTypes) 143) +#define DBTYPE_DBTIME2 ((EOledbTypes) 145) +#define DBTYPE_DBTIMESTAMPOFFSET ((EOledbTypes) 146) +#ifdef _SQLOLEDB_H_ +#undef DBTYPE_SQLVARIANT +#endif +#define DBTYPE_SQLVARIANT ((EOledbTypes) 144) + +#ifndef _SQLOLEDB_H_ +enum SQLVARENUM { + VT_SS_EMPTY = DBTYPE_EMPTY, VT_SS_NULL = DBTYPE_NULL, VT_SS_UI1 = DBTYPE_UI1, + VT_SS_I2 = DBTYPE_I2, VT_SS_I4 = DBTYPE_I4, VT_SS_I8 = DBTYPE_I8, + VT_SS_R4 = DBTYPE_R4, VT_SS_R8 = DBTYPE_R8, VT_SS_MONEY = DBTYPE_CY, + VT_SS_SMALLMONEY = 200, VT_SS_WSTRING = 201, VT_SS_WVARSTRING = 202, + VT_SS_STRING = 203, VT_SS_VARSTRING = 204, VT_SS_BIT = DBTYPE_BOOL, + VT_SS_GUID = DBTYPE_GUID, VT_SS_NUMERIC = DBTYPE_NUMERIC, VT_SS_DECIMAL = 205, + VT_SS_DATETIME = DBTYPE_DBTIMESTAMP, VT_SS_SMALLDATETIME = 206, + VT_SS_BINARY = 207, VT_SS_VARBINARY = 208, VT_SS_UNKNOWN = 209, + VT_SS_DATE = DBTYPE_DBDATE, VT_SS_TIME2 = DBTYPE_DBTIME2, + VT_SS_DATETIME2 = 212, VT_SS_DATETIMEOFFSET = DBTYPE_DBTIMESTAMPOFFSET +}; +typedef unsigned short SSVARTYPE; + +enum DBPARAMFLAGSENUM_SS_100 { + DBPARAMFLAGS_SS_ISVARIABLESCALE = 0x40000000 +}; +enum DBCOLUMNFLAGSENUM_SS_100 { + DBCOLUMNFLAGS_SS_ISVARIABLESCALE = 0x40000000, + DBCOLUMNFLAGS_SS_ISCOLUMNSET = 0x80000000 +}; + +extern RPC_IF_HANDLE __MIDL_itf_msoledbsql_0000_0001_v0_0_c_ifspec; +extern RPC_IF_HANDLE __MIDL_itf_msoledbsql_0000_0001_v0_0_s_ifspec; + +#ifndef __IUMSInitialize_INTERFACE_DEFINED__ +#define __IUMSInitialize_INTERFACE_DEFINED__ + +EXTERN_C const IID IID_IUMSInitialize; + +#if defined(__cplusplus) && !defined(CINTERFACE) +struct IUMSInitialize : public IUnknown { +public: + virtual HRESULT WINAPI Initialize(void *pUMS) = 0; +}; +#else +typedef struct IUMSInitializeVtbl { + BEGIN_INTERFACE + HRESULT (WINAPI *QueryInterface)(IUMSInitialize *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IUMSInitialize *This); + ULONG (WINAPI *Release)(IUMSInitialize *This); + HRESULT (WINAPI *Initialize)(IUMSInitialize *This, void *pUMS); + END_INTERFACE +} IUMSInitializeVtbl; +struct IUMSInitialize { + CONST_VTBL struct IUMSInitializeVtbl *lpVtbl; +}; +#ifdef COBJMACROS +#define IUMSInitialize_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IUMSInitialize_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IUMSInitialize_Release(This) (This)->lpVtbl->Release(This) +#define IUMSInitialize_Initialize(This,pUMS) (This)->lpVtbl->Initialize(This,pUMS) +#endif +#endif +#endif + +typedef struct tagSSErrorInfo { + LPOLESTR pwszMessage; + LPOLESTR pwszServer; + LPOLESTR pwszProcedure; + LONG lNative; + BYTE bState; + BYTE bClass; + WORD wLineNumber; +} SSERRORINFO; + +extern RPC_IF_HANDLE __MIDL_itf_msoledbsql_0000_0002_v0_0_c_ifspec; +extern RPC_IF_HANDLE __MIDL_itf_msoledbsql_0000_0002_v0_0_s_ifspec; + +#ifndef __ISQLServerErrorInfo_INTERFACE_DEFINED__ +#define __ISQLServerErrorInfo_INTERFACE_DEFINED__ + +EXTERN_C const IID IID_ISQLServerErrorInfo; + +#if defined(__cplusplus) && !defined(CINTERFACE) +struct ISQLServerErrorInfo : public IUnknown { +public: + virtual HRESULT WINAPI GetErrorInfo(SSERRORINFO **ppErrorInfo, OLECHAR **ppStringsBuffer) = 0; +}; +#else +typedef struct ISQLServerErrorInfoVtbl { + BEGIN_INTERFACE + HRESULT (WINAPI *QueryInterface)(ISQLServerErrorInfo *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(ISQLServerErrorInfo *This); + ULONG (WINAPI *Release)(ISQLServerErrorInfo *This); + HRESULT (WINAPI *GetErrorInfo)(ISQLServerErrorInfo *This, SSERRORINFO **ppErrorInfo, OLECHAR **ppStringsBuffer); + END_INTERFACE +} ISQLServerErrorInfoVtbl; +struct ISQLServerErrorInfo { + CONST_VTBL struct ISQLServerErrorInfoVtbl *lpVtbl; +}; +#ifdef COBJMACROS +#define ISQLServerErrorInfo_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define ISQLServerErrorInfo_AddRef(This) (This)->lpVtbl->AddRef(This) +#define ISQLServerErrorInfo_Release(This) (This)->lpVtbl->Release(This) +#define ISQLServerErrorInfo_GetErrorInfo(This,ppErrorInfo,ppStringsBuffer) (This)->lpVtbl->GetErrorInfo(This,ppErrorInfo,ppStringsBuffer) +#endif +#endif +#endif + +#ifndef __IRowsetFastLoad_INTERFACE_DEFINED__ +#define __IRowsetFastLoad_INTERFACE_DEFINED__ + +EXTERN_C const IID IID_IRowsetFastLoad; + +#if defined(__cplusplus) && !defined(CINTERFACE) +struct IRowsetFastLoad : public IUnknown { +public: + virtual HRESULT WINAPI InsertRow(HACCESSOR hAccessor, void *pData) = 0; + virtual HRESULT WINAPI Commit(BOOL fDone) = 0; +}; +#else +typedef struct IRowsetFastLoadVtbl { + BEGIN_INTERFACE + HRESULT (WINAPI *QueryInterface)(IRowsetFastLoad *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IRowsetFastLoad *This); + ULONG (WINAPI *Release)(IRowsetFastLoad *This); + HRESULT (WINAPI *InsertRow)(IRowsetFastLoad *This, HACCESSOR hAccessor, void *pData); + HRESULT (WINAPI *Commit)(IRowsetFastLoad *This, BOOL fDone); + END_INTERFACE +} IRowsetFastLoadVtbl; +struct IRowsetFastLoad { + CONST_VTBL struct IRowsetFastLoadVtbl *lpVtbl; +}; +#ifdef COBJMACROS +#define IRowsetFastLoad_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IRowsetFastLoad_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IRowsetFastLoad_Release(This) (This)->lpVtbl->Release(This) +#define IRowsetFastLoad_InsertRow(This,hAccessor,pData) (This)->lpVtbl->InsertRow(This,hAccessor,pData) +#define IRowsetFastLoad_Commit(This,fDone) (This)->lpVtbl->Commit(This,fDone) +#endif +#endif +#endif + +#include + +typedef struct tagDBTIME2 { + USHORT hour; + USHORT minute; + USHORT second; + ULONG fraction; +} DBTIME2; + +typedef struct tagDBTIMESTAMPOFFSET { + SHORT year; + USHORT month; + USHORT day; + USHORT hour; + USHORT minute; + USHORT second; + ULONG fraction; + SHORT timezone_hour; + SHORT timezone_minute; +} DBTIMESTAMPOFFSET; + +#include + +/* The original msoledbsql.h header uses a Microsoft-specific "extension" which + * allows Microsoft Visual C++ compiler to ignore the [class.union.anon]'s first + * paragraph in the standard for C++. To allow to use other compilers for this + * header, we have to alter declaration the original `SSVARIANT` structure and + * move declarations of some `struct`s out of the anonymous union inside the + * `SSVARIANT` in the code below (yes -- breaking public API of the original + * header). Moreover, we must place those moved declarations in different + * locations for C and C++ code. To avoid code duplication we use the + * `MSOLEDBSQL_H_DECL_SSVARIANT_STRUCTS` macro. */ +#define MSOLEDBSQL_H_DECL_SSVARIANT_STRUCTS \ + struct _Time2Val { \ + DBTIME2 tTime2Val; \ + BYTE bScale; \ + }; \ + struct _DateTimeVal { \ + DBTIMESTAMP tsDateTimeVal; \ + BYTE bScale; \ + }; \ + struct _DateTimeOffsetVal { \ + DBTIMESTAMPOFFSET tsoDateTimeOffsetVal; \ + BYTE bScale; \ + }; \ + struct _NCharVal { \ + SHORT sActualLength; \ + SHORT sMaxLength; \ + WCHAR *pwchNCharVal; \ + BYTE rgbReserved[5]; \ + DWORD dwReserved; \ + WCHAR *pwchReserved; \ + }; \ + struct _CharVal { \ + SHORT sActualLength; \ + SHORT sMaxLength; \ + CHAR *pchCharVal; \ + BYTE rgbReserved[5]; \ + DWORD dwReserved; \ + WCHAR *pwchReserved; \ + }; \ + struct _BinaryVal { \ + SHORT sActualLength; \ + SHORT sMaxLength; \ + BYTE *prgbBinaryVal; \ + DWORD dwReserved; \ + }; \ + struct _UnknownType { \ + DWORD dwActualLength; \ + BYTE rgMetadata[16]; \ + BYTE *pUnknownData; \ + }; \ + struct _BLOBType { \ + DBOBJECT dbobj; \ + IUnknown *pUnk; \ + }; +/* As it's already mentioned the original msoledbsql.h header defines members of + * the `SSVARIANT::{unnamed union}` of structure types specifying those types + * directly at the member definitions, which is fine for C, but not for C++ (see + * commentaries above). Therefore, we have to separate declaration of those + * structure types from the definition of the union's members. + * For C code (`-x c`/`-Tc`) we can't declare the structure types directly + * inside definition of the `SSVARIANT` type. Because: a) some C compilers know + * about `-fms-extensions` option, and if the latter was specified when invoking + * such compiler, a structure type declared within an enclosing structure type + * becomes anonymous structure (changing memory layout of the enclosing `struct` + * and disallowing several "nested" structure to have fields of the same name); + * b) for all other C compilers there is no much sense to declare "nested" + * structure types within an enclosing one, because semantically it declares all + * those "nested" structure types at scope where this header is included (6.2.1 + * Scopes of identifiers). */ +#ifndef __cplusplus + MSOLEDBSQL_H_DECL_SSVARIANT_STRUCTS +#endif +struct SSVARIANT { + SSVARTYPE vt; + DWORD dwReserved1; + DWORD dwReserved2; + /* For C++ code (`-x c++`/`-Tp`) we may move the declarations here. This, at + * least, limits scope of the declarations to the `SSVARIANT` structure, if we + * compare declaration of the structures at the global scope (as it's made for + * C code). Both variants break public API of the original header file, but + * unfortunately that's unavoidable. */ +#ifdef __cplusplus + MSOLEDBSQL_H_DECL_SSVARIANT_STRUCTS +#endif + union { + BYTE bTinyIntVal; + SHORT sShortIntVal; + LONG lIntVal; + LONGLONG llBigIntVal; + FLOAT fltRealVal; + DOUBLE dblFloatVal; + CY cyMoneyVal; + VARIANT_BOOL fBitVal; + BYTE rgbGuidVal[16]; + DB_NUMERIC numNumericVal; + DBDATE dDateVal; + DBTIMESTAMP tsDateTimeVal; + struct _Time2Val Time2Val; + struct _DateTimeVal DateTimeVal; + struct _DateTimeOffsetVal DateTimeOffsetVal; + struct _NCharVal NCharVal; + struct _CharVal CharVal; + struct _BinaryVal BinaryVal; + struct _UnknownType UnknownType; + struct _BLOBType BLOBType; + }; +}; +typedef DWORD LOCKMODE; + +enum LOCKMODEENUM { + LOCKMODE_INVALID = 0, LOCKMODE_EXCLUSIVE = (LOCKMODE_INVALID + 1), + LOCKMODE_SHARED = (LOCKMODE_EXCLUSIVE + 1) +}; + +extern RPC_IF_HANDLE __MIDL_itf_msoledbsql_0000_0004_v0_0_c_ifspec; +extern RPC_IF_HANDLE __MIDL_itf_msoledbsql_0000_0004_v0_0_s_ifspec; + +#ifndef __ISchemaLock_INTERFACE_DEFINED__ +#define __ISchemaLock_INTERFACE_DEFINED__ + +EXTERN_C const IID IID_ISchemaLock; + +#if defined(__cplusplus) && !defined(CINTERFACE) +struct ISchemaLock : public IUnknown { +public: + virtual HRESULT WINAPI GetSchemaLock(DBID *pTableID, LOCKMODE lmMode, HANDLE *phLockHandle, ULONGLONG *pTableVersion) = 0; + virtual HRESULT WINAPI ReleaseSchemaLock(HANDLE hLockHandle) = 0; +}; +#else +typedef struct ISchemaLockVtbl { + BEGIN_INTERFACE + HRESULT (WINAPI *QueryInterface)(ISchemaLock *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(ISchemaLock *This); + ULONG (WINAPI *Release)(ISchemaLock *This); + HRESULT (WINAPI *GetSchemaLock)(ISchemaLock *This, DBID *pTableID, LOCKMODE lmMode, HANDLE *phLockHandle, ULONGLONG *pTableVersion); + HRESULT (WINAPI *ReleaseSchemaLock)(ISchemaLock *This, HANDLE hLockHandle); + END_INTERFACE +} ISchemaLockVtbl; +struct ISchemaLock { + CONST_VTBL struct ISchemaLockVtbl *lpVtbl; +}; +#ifdef COBJMACROS +#define ISchemaLock_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define ISchemaLock_AddRef(This) (This)->lpVtbl->AddRef(This) +#define ISchemaLock_Release(This) (This)->lpVtbl->Release(This) +#define ISchemaLock_GetSchemaLock(This,pTableID,lmMode,phLockHandle,pTableVersion) (This)->lpVtbl->GetSchemaLock(This,pTableID,lmMode,phLockHandle,pTableVersion) +#define ISchemaLock_ReleaseSchemaLock(This,hLockHandle) (This)->lpVtbl->ReleaseSchemaLock(This,hLockHandle) +#endif +#endif +#endif + +#ifndef __IBCPSession_INTERFACE_DEFINED__ +#define __IBCPSession_INTERFACE_DEFINED__ + +EXTERN_C const IID IID_IBCPSession; + +#if defined(__cplusplus) && !defined(CINTERFACE) +struct IBCPSession : public IUnknown { +public: + virtual HRESULT WINAPI BCPColFmt(DBORDINAL idxUserDataCol, int eUserDataType, int cbIndicator, int cbUserData, BYTE *pbUserDataTerm, int cbUserDataTerm, DBORDINAL idxServerCol) = 0; + virtual HRESULT WINAPI BCPColumns(DBCOUNTITEM nColumns) = 0; + virtual HRESULT WINAPI BCPControl(int eOption, void *iValue) = 0; + virtual HRESULT WINAPI BCPDone(void) = 0; + virtual HRESULT WINAPI BCPExec(DBROWCOUNT *pRowsCopied) = 0; + virtual HRESULT WINAPI BCPInit(const wchar_t *pwszTable, const wchar_t *pwszDataFile, const wchar_t *pwszErrorFile, int eDirection) = 0; + virtual HRESULT WINAPI BCPReadFmt(const wchar_t *pwszFormatFile) = 0; + virtual HRESULT WINAPI BCPWriteFmt(const wchar_t *pwszFormatFile) = 0; +}; +#else +typedef struct IBCPSessionVtbl { + BEGIN_INTERFACE + HRESULT (WINAPI *QueryInterface)(IBCPSession *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IBCPSession *This); + ULONG (WINAPI *Release)(IBCPSession *This); + HRESULT (WINAPI *BCPColFmt)(IBCPSession *This, DBORDINAL idxUserDataCol, int eUserDataType, int cbIndicator, int cbUserData, BYTE *pbUserDataTerm, int cbUserDataTerm, DBORDINAL idxServerCol); + HRESULT (WINAPI *BCPColumns)(IBCPSession *This, DBCOUNTITEM nColumns); + HRESULT (WINAPI *BCPControl)(IBCPSession *This, int eOption, void *iValue); + HRESULT (WINAPI *BCPDone)(IBCPSession *This); + HRESULT (WINAPI *BCPExec)(IBCPSession *This, DBROWCOUNT *pRowsCopied); + HRESULT (WINAPI *BCPInit)(IBCPSession *This, const wchar_t *pwszTable, const wchar_t *pwszDataFile, const wchar_t *pwszErrorFile, int eDirection); + HRESULT (WINAPI *BCPReadFmt)(IBCPSession *This, const wchar_t *pwszFormatFile); + HRESULT (WINAPI *BCPWriteFmt)(IBCPSession *This, const wchar_t *pwszFormatFile); + END_INTERFACE +} IBCPSessionVtbl; +struct IBCPSession { + CONST_VTBL struct IBCPSessionVtbl *lpVtbl; +}; +#ifdef COBJMACROS +#define IBCPSession_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IBCPSession_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IBCPSession_Release(This) (This)->lpVtbl->Release(This) +#define IBCPSession_BCPColFmt(This,idxUserDataCol,eUserDataType,cbIndicator,cbUserData,pbUserDataTerm,cbUserDataTerm,idxServerCol) (This)->lpVtbl->BCPColFmt(This,idxUserDataCol,eUserDataType,cbIndicator,cbUserData,pbUserDataTerm,cbUserDataTerm,idxServerCol) +#define IBCPSession_BCPColumns(This,nColumns) (This)->lpVtbl->BCPColumns(This,nColumns) +#define IBCPSession_BCPControl(This,eOption,iValue) (This)->lpVtbl->BCPControl(This,eOption,iValue) +#define IBCPSession_BCPDone(This) (This)->lpVtbl->BCPDone(This) +#define IBCPSession_BCPExec(This,pRowsCopied) (This)->lpVtbl->BCPExec(This,pRowsCopied) +#define IBCPSession_BCPInit(This,pwszTable,pwszDataFile,pwszErrorFile,eDirection) (This)->lpVtbl->BCPInit(This,pwszTable,pwszDataFile,pwszErrorFile,eDirection) +#define IBCPSession_BCPReadFmt(This,pwszFormatFile) (This)->lpVtbl->BCPReadFmt(This,pwszFormatFile) +#define IBCPSession_BCPWriteFmt(This,pwszFormatFile) (This)->lpVtbl->BCPWriteFmt(This,pwszFormatFile) +#endif +#endif +#endif + +#ifndef __IBCPSession2_INTERFACE_DEFINED__ +#define __IBCPSession2_INTERFACE_DEFINED__ + +EXTERN_C const IID IID_IBCPSession2; + +#if defined(__cplusplus) && !defined(CINTERFACE) +struct IBCPSession2 : public IBCPSession { +public: + virtual HRESULT WINAPI BCPSetBulkMode(int property, void *pField, int cbField, void *pRow, int cbRow) = 0; +}; +#else +typedef struct IBCPSession2Vtbl { + BEGIN_INTERFACE + HRESULT (WINAPI *QueryInterface)(IBCPSession2 *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IBCPSession2 *This); + ULONG (WINAPI *Release)(IBCPSession2 *This); + HRESULT (WINAPI *BCPColFmt)(IBCPSession2 *This, DBORDINAL idxUserDataCol, int eUserDataType, int cbIndicator, int cbUserData, BYTE *pbUserDataTerm, int cbUserDataTerm, DBORDINAL idxServerCol); + HRESULT (WINAPI *BCPColumns)(IBCPSession2 *This, DBCOUNTITEM nColumns); + HRESULT (WINAPI *BCPControl)(IBCPSession2 *This, int eOption, void *iValue); + HRESULT (WINAPI *BCPDone)(IBCPSession2 *This); + HRESULT (WINAPI *BCPExec)(IBCPSession2 *This, DBROWCOUNT *pRowsCopied); + HRESULT (WINAPI *BCPInit)(IBCPSession2 *This, const wchar_t *pwszTable, const wchar_t *pwszDataFile, const wchar_t *pwszErrorFile, int eDirection); + HRESULT (WINAPI *BCPReadFmt)(IBCPSession2 *This, const wchar_t *pwszFormatFile); + HRESULT (WINAPI *BCPWriteFmt)(IBCPSession2 *This, const wchar_t *pwszFormatFile); + HRESULT (WINAPI *BCPSetBulkMode)(IBCPSession2 *This, int property, void *pField, int cbField, void *pRow, int cbRow); + END_INTERFACE +} IBCPSession2Vtbl; +struct IBCPSession2 { + CONST_VTBL struct IBCPSession2Vtbl *lpVtbl; +}; +#ifdef COBJMACROS +#define IBCPSession2_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IBCPSession2_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IBCPSession2_Release(This) (This)->lpVtbl->Release(This) +#define IBCPSession2_BCPColFmt(This,idxUserDataCol,eUserDataType,cbIndicator,cbUserData,pbUserDataTerm,cbUserDataTerm,idxServerCol) (This)->lpVtbl->BCPColFmt(This,idxUserDataCol,eUserDataType,cbIndicator,cbUserData,pbUserDataTerm,cbUserDataTerm,idxServerCol) +#define IBCPSession2_BCPColumns(This,nColumns) (This)->lpVtbl->BCPColumns(This,nColumns) +#define IBCPSession2_BCPControl(This,eOption,iValue) (This)->lpVtbl->BCPControl(This,eOption,iValue) +#define IBCPSession2_BCPDone(This) (This)->lpVtbl->BCPDone(This) +#define IBCPSession2_BCPExec(This,pRowsCopied) (This)->lpVtbl->BCPExec(This,pRowsCopied) +#define IBCPSession2_BCPInit(This,pwszTable,pwszDataFile,pwszErrorFile,eDirection) (This)->lpVtbl->BCPInit(This,pwszTable,pwszDataFile,pwszErrorFile,eDirection) +#define IBCPSession2_BCPReadFmt(This,pwszFormatFile) (This)->lpVtbl->BCPReadFmt(This,pwszFormatFile) +#define IBCPSession2_BCPWriteFmt(This,pwszFormatFile) (This)->lpVtbl->BCPWriteFmt(This,pwszFormatFile) +#define IBCPSession2_BCPSetBulkMode(This,property,pField,cbField,pRow,cbRow) (This,property,pField,cbField,pRow,cbRow) +#endif +#endif +#endif +#endif /* not _SQLOLEDB_H_ */ + +#define ISOLATIONLEVEL_SNAPSHOT ((ISOLATIONLEVEL)(0x01000000)) +#define DBPROPVAL_TI_SNAPSHOT 0x01000000L + +extern RPC_IF_HANDLE __MIDL_itf_msoledbsql_0000_0007_v0_0_c_ifspec; +extern RPC_IF_HANDLE __MIDL_itf_msoledbsql_0000_0007_v0_0_s_ifspec; + +#ifndef __ISSAbort_INTERFACE_DEFINED__ +#define __ISSAbort_INTERFACE_DEFINED__ + +EXTERN_C const IID IID_ISSAbort; + +#if defined(__cplusplus) && !defined(CINTERFACE) +struct ISSAbort : public IUnknown { +public: + virtual HRESULT WINAPI Abort(void) = 0; +}; +#else +typedef struct ISSAbortVtbl { + BEGIN_INTERFACE + HRESULT (WINAPI *QueryInterface)(ISSAbort *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(ISSAbort *This); + ULONG (WINAPI *Release)(ISSAbort *This); + HRESULT (WINAPI *Abort)(ISSAbort *This); + END_INTERFACE +} ISSAbortVtbl; +struct ISSAbort { + CONST_VTBL struct ISSAbortVtbl *lpVtbl; +}; +#ifdef COBJMACROS +#define ISSAbort_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define ISSAbort_AddRef(This) (This)->lpVtbl->AddRef(This) +#define ISSAbort_Release(This) (This)->lpVtbl->Release(This) +#define ISSAbort_Abort(This) (This)->lpVtbl->Abort(This) +#endif +#endif +#endif + +enum DBBINDFLAGENUM90 { + DBBINDFLAG_OBJECT = 0x2 +}; + +enum SSACCESSORFLAGS { + SSACCESSOR_ROWDATA = 0x100 +}; + +enum DBPROPFLAGSENUM90 { + DBPROPFLAGS_PARAMETER = 0x10000 +}; + +typedef struct tagSSPARAMPROPS { + DBORDINAL iOrdinal; + ULONG cPropertySets; + DBPROPSET *rgPropertySets; +} SSPARAMPROPS; + +extern RPC_IF_HANDLE __MIDL_itf_msoledbsql_0000_0008_v0_0_c_ifspec; +extern RPC_IF_HANDLE __MIDL_itf_msoledbsql_0000_0008_v0_0_s_ifspec; + +#ifndef __ISSCommandWithParameters_INTERFACE_DEFINED__ +#define __ISSCommandWithParameters_INTERFACE_DEFINED__ + +EXTERN_C const IID IID_ISSCommandWithParameters; + +#if defined(__cplusplus) && !defined(CINTERFACE) +struct ISSCommandWithParameters : public ICommandWithParameters { +public: + virtual HRESULT WINAPI GetParameterProperties(DB_UPARAMS *pcParams, SSPARAMPROPS **prgParamProperties) = 0; + virtual HRESULT WINAPI SetParameterProperties(DB_UPARAMS cParams, SSPARAMPROPS rgParamProperties[]) = 0; +}; +#else +typedef struct ISSCommandWithParametersVtbl { + BEGIN_INTERFACE + HRESULT (WINAPI *QueryInterface)(ISSCommandWithParameters *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(ISSCommandWithParameters *This); + ULONG (WINAPI *Release)(ISSCommandWithParameters *This); + HRESULT (WINAPI *GetParameterInfo)(ISSCommandWithParameters *This, DB_UPARAMS *pcParams, DBPARAMINFO **prgParamInfo, OLECHAR **ppNamesBuffer); + HRESULT (WINAPI *MapParameterNames)(ISSCommandWithParameters *This, DB_UPARAMS cParamNames, const OLECHAR *rgParamNames[], DB_LPARAMS rgParamOrdinals[]); + HRESULT (WINAPI *SetParameterInfo)(ISSCommandWithParameters *This, DB_UPARAMS cParams, const DB_UPARAMS rgParamOrdinals[], const DBPARAMBINDINFO rgParamBindInfo[]); + HRESULT (WINAPI *GetParameterProperties)(ISSCommandWithParameters *This, DB_UPARAMS *pcParams, SSPARAMPROPS **prgParamProperties); + HRESULT (WINAPI *SetParameterProperties)(ISSCommandWithParameters *This, DB_UPARAMS cParams, SSPARAMPROPS rgParamProperties[]); + END_INTERFACE +} ISSCommandWithParametersVtbl; +struct ISSCommandWithParameters { + CONST_VTBL struct ISSCommandWithParametersVtbl *lpVtbl; +}; +#ifdef COBJMACROS +#define ISSCommandWithParameters_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define ISSCommandWithParameters_AddRef(This) (This)->lpVtbl->AddRef(This) +#define ISSCommandWithParameters_Release(This) (This)->lpVtbl->Release(This) +#define ISSCommandWithParameters_GetParameterInfo(This,pcParams,prgParamInfo,ppNamesBuffer) (This)->lpVtbl->GetParameterInfo(This,pcParams,prgParamInfo,ppNamesBuffer) +#define ISSCommandWithParameters_MapParameterNames(This,cParamNames,rgParamNames,rgParamOrdinals) (This)->lpVtbl->MapParameterNames(This,cParamNames,rgParamNames,rgParamOrdinals) +#define ISSCommandWithParameters_SetParameterInfo(This,cParams,rgParamOrdinals,rgParamBindInfo) (This)->lpVtbl->SetParameterInfo(This,cParams,rgParamOrdinals,rgParamBindInfo) +#define ISSCommandWithParameters_GetParameterProperties(This,pcParams,prgParamProperties) (This)->lpVtbl->GetParameterProperties(This,pcParams,prgParamProperties) +#define ISSCommandWithParameters_SetParameterProperties(This,cParams,rgParamProperties) (This)->lpVtbl->SetParameterProperties(This,cParams,rgParamProperties) +#endif +#endif +#endif + +#ifndef __IDBAsynchStatus_INTERFACE_DEFINED__ +#define __IDBAsynchStatus_INTERFACE_DEFINED__ + +EXTERN_C const IID IID_IDBAsynchStatus; + +#if defined(__cplusplus) && !defined(CINTERFACE) +struct IDBAsynchStatus : public IUnknown { +public: + virtual HRESULT WINAPI Abort(HCHAPTER hChapter, DBASYNCHOP eOperation) = 0; + virtual HRESULT WINAPI GetStatus(HCHAPTER hChapter, DBASYNCHOP eOperation, DBCOUNTITEM *pulProgress, DBCOUNTITEM *pulProgressMax, DBASYNCHPHASE *peAsynchPhase, LPOLESTR *ppwszStatusText) = 0; +}; +#else +typedef struct IDBAsynchStatusVtbl { + BEGIN_INTERFACE + HRESULT (WINAPI *QueryInterface)(IDBAsynchStatus *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDBAsynchStatus *This); + ULONG (WINAPI *Release)(IDBAsynchStatus *This); + HRESULT (WINAPI *Abort)(IDBAsynchStatus *This, HCHAPTER hChapter, DBASYNCHOP eOperation); + HRESULT (WINAPI *GetStatus)(IDBAsynchStatus *This, HCHAPTER hChapter, DBASYNCHOP eOperation, DBCOUNTITEM *pulProgress, DBCOUNTITEM *pulProgressMax, DBASYNCHPHASE *peAsynchPhase, LPOLESTR *ppwszStatusText); + END_INTERFACE +} IDBAsynchStatusVtbl; +struct IDBAsynchStatus { + CONST_VTBL struct IDBAsynchStatusVtbl *lpVtbl; +}; +#ifdef COBJMACROS +#define IDBAsynchStatus_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IDBAsynchStatus_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IDBAsynchStatus_Release(This) (This)->lpVtbl->Release(This) +#define IDBAsynchStatus_Abort(This,hChapter,eOperation) (This)->lpVtbl->Abort(This,hChapter,eOperation) +#define IDBAsynchStatus_GetStatus(This,hChapter,eOperation,pulProgress,pulProgressMax,peAsynchPhase,ppwszStatusText) (This)->lpVtbl->GetStatus(This,hChapter,eOperation,pulProgress,pulProgressMax,peAsynchPhase,ppwszStatusText) +#endif +#endif + +HRESULT WINAPI IDBAsynchStatus_RemoteAbort_Proxy(IDBAsynchStatus *This, HCHAPTER hChapter, DBASYNCHOP eOperation, IErrorInfo **ppErrorInfoRem); +void __RPC_STUB IDBAsynchStatus_RemoteAbort_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); +HRESULT WINAPI IDBAsynchStatus_RemoteGetStatus_Proxy(IDBAsynchStatus *This, HCHAPTER hChapter, DBASYNCHOP eOperation, DBCOUNTITEM *pulProgress, DBCOUNTITEM *pulProgressMax, DBASYNCHPHASE *peAsynchPhase, LPOLESTR *ppwszStatusText, IErrorInfo **ppErrorInfoRem); +void __RPC_STUB IDBAsynchStatus_RemoteGetStatus_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); +#endif + +#ifndef __ISSAsynchStatus_INTERFACE_DEFINED__ +#define __ISSAsynchStatus_INTERFACE_DEFINED__ + +EXTERN_C const IID IID_ISSAsynchStatus; + +#if defined(__cplusplus) && !defined(CINTERFACE) +struct ISSAsynchStatus : public IDBAsynchStatus { +public: + virtual HRESULT WINAPI WaitForAsynchCompletion(DWORD dwMillisecTimeOut) = 0; +}; +#else +typedef struct ISSAsynchStatusVtbl { + BEGIN_INTERFACE + HRESULT (WINAPI *QueryInterface)(ISSAsynchStatus *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(ISSAsynchStatus *This); + ULONG (WINAPI *Release)(ISSAsynchStatus *This); + HRESULT (WINAPI *Abort)(ISSAsynchStatus *This, HCHAPTER hChapter, DBASYNCHOP eOperation); + HRESULT (WINAPI *GetStatus)(ISSAsynchStatus *This, HCHAPTER hChapter, DBASYNCHOP eOperation, DBCOUNTITEM *pulProgress, DBCOUNTITEM *pulProgressMax, DBASYNCHPHASE *peAsynchPhase, LPOLESTR *ppwszStatusText); + HRESULT (WINAPI *WaitForAsynchCompletion)(ISSAsynchStatus *This, DWORD dwMillisecTimeOut); + END_INTERFACE +} ISSAsynchStatusVtbl; +struct ISSAsynchStatus { + CONST_VTBL struct ISSAsynchStatusVtbl *lpVtbl; +}; +#ifdef COBJMACROS +#define ISSAsynchStatus_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define ISSAsynchStatus_AddRef(This) (This)->lpVtbl->AddRef(This) +#define ISSAsynchStatus_Release(This) (This)->lpVtbl->Release(This) +#define ISSAsynchStatus_Abort(This,hChapter,eOperation) (This)->lpVtbl->Abort(This,hChapter,eOperation) +#define ISSAsynchStatus_GetStatus(This,hChapter,eOperation,pulProgress,pulProgressMax,peAsynchPhase,ppwszStatusText) (This)->lpVtbl->GetStatus(This,hChapter,eOperation,pulProgress,pulProgressMax,peAsynchPhase,ppwszStatusText) +#define ISSAsynchStatus_WaitForAsynchCompletion(This,dwMillisecTimeOut) (This)->lpVtbl->WaitForAsynchCompletion(This,dwMillisecTimeOut) +#endif +#endif +#endif + +#define TABLE_HAS_UPDATE_INSTEAD_OF_TRIGGER 0x00000001 +#define TABLE_HAS_DELETE_INSTEAD_OF_TRIGGER 0x00000002 +#define TABLE_HAS_INSERT_INSTEAD_OF_TRIGGER 0x00000004 +#define TABLE_HAS_AFTER_UPDATE_TRIGGER 0x00000008 +#define TABLE_HAS_AFTER_DELETE_TRIGGER 0x00000010 +#define TABLE_HAS_AFTER_INSERT_TRIGGER 0x00000020 +#define TABLE_HAS_CASCADE_UPDATE 0x00000040 +#define TABLE_HAS_CASCADE_DELETE 0x00000080 + +#if (OLEDBVER >= 0x0210) +#define DBPROP_INIT_GENERALTIMEOUT 0x11cL +#endif + +#define SSPROP_ENABLEFASTLOAD 2 +#define SSPROP_ENABLEBULKCOPY 3 +#define SSPROP_UNICODELCID 2 +#define SSPROP_UNICODECOMPARISONSTYLE 3 +#define SSPROP_COLUMNLEVELCOLLATION 4 +#define SSPROP_CHARACTERSET 5 +#define SSPROP_SORTORDER 6 +#define SSPROP_CURRENTCOLLATION 7 +#define SSPROP_INTEGRATEDAUTHENTICATIONMETHOD 8 +#define SSPROP_MUTUALLYAUTHENTICATED 9 +#define SSPROP_INIT_CURRENTLANGUAGE 4 +#define SSPROP_INIT_NETWORKADDRESS 5 +#define SSPROP_INIT_NETWORKLIBRARY 6 +#define SSPROP_INIT_USEPROCFORPREP 7 +#define SSPROP_INIT_AUTOTRANSLATE 8 +#define SSPROP_INIT_PACKETSIZE 9 +#define SSPROP_INIT_APPNAME 10 +#define SSPROP_INIT_WSID 11 +#define SSPROP_INIT_FILENAME 12 +#define SSPROP_INIT_ENCRYPT 13 +#define SSPROP_AUTH_REPL_SERVER_NAME 14 +#define SSPROP_INIT_TAGCOLUMNCOLLATION 15 +#define SSPROP_INIT_MARSCONNECTION 16 +#define SSPROP_INIT_FAILOVERPARTNER 18 +#define SSPROP_AUTH_OLD_PASSWORD 19 +#define SSPROP_INIT_DATATYPECOMPATIBILITY 20 +#define SSPROP_INIT_TRUST_SERVER_CERTIFICATE 21 +#define SSPROP_INIT_SERVERSPN 22 +#define SSPROP_INIT_FAILOVERPARTNERSPN 23 +#define SSPROP_INIT_APPLICATIONINTENT 24 +#define SSPROP_INIT_MULTISUBNETFAILOVER 25 +#define SSPROP_INIT_USEFMTONLY 26 +#define SSPROPVAL_USEPROCFORPREP_OFF 0 +#define SSPROPVAL_USEPROCFORPREP_ON 1 +#define SSPROPVAL_USEPROCFORPREP_ON_DROP 2 +#define SSPROPVAL_DATATYPECOMPATIBILITY_SQL2000 80 +#define SSPROPVAL_DATATYPECOMPATIBILITY_DEFAULT 0 +#define SSPROP_QUOTEDCATALOGNAMES 2 +#define SSPROP_ALLOWNATIVEVARIANT 3 +#define SSPROP_SQLXMLXPROGID 4 +#define SSPROP_ASYNCH_BULKCOPY 5 +#define SSPROP_MAXBLOBLENGTH 8 +#define SSPROP_FASTLOADOPTIONS 9 +#define SSPROP_FASTLOADKEEPNULLS 10 +#define SSPROP_FASTLOADKEEPIDENTITY 11 +#define SSPROP_CURSORAUTOFETCH 12 +#define SSPROP_DEFERPREPARE 13 +#define SSPROP_IRowsetFastLoad 14 +#define SSPROP_QP_NOTIFICATION_TIMEOUT 17 +#define SSPROP_QP_NOTIFICATION_MSGTEXT 18 +#define SSPROP_QP_NOTIFICATION_OPTIONS 19 +#define SSPROP_NOCOUNT_STATUS 20 +#define SSPROP_COMPUTE_ID 21 +#define SSPROP_COLUMN_ID 22 +#define SSPROP_COMPUTE_BYLIST 23 +#define SSPROP_ISSAsynchStatus 24 +#define SSPROPVAL_DEFAULT_NOTIFICATION_TIMEOUT 432000 +#define SSPROPVAL_MAX_NOTIFICATION_TIMEOUT 0x7FFFFFFF +#define MAX_NOTIFICATION_LEN 2000 +#define SSPROP_COL_COLLATIONNAME 14 +#define SSPROP_COL_UDT_CATALOGNAME 31 +#define SSPROP_COL_UDT_SCHEMANAME 32 +#define SSPROP_COL_UDT_NAME 33 +#define SSPROP_COL_XML_SCHEMACOLLECTION_CATALOGNAME 34 +#define SSPROP_COL_XML_SCHEMACOLLECTION_SCHEMANAME 35 +#define SSPROP_COL_XML_SCHEMACOLLECTIONNAME 36 +#define SSPROP_COL_COMPUTED 37 +#define SSPROP_STREAM_XMLROOT 19 +#define SSPROP_PARAM_XML_SCHEMACOLLECTION_CATALOGNAME 24 +#define SSPROP_PARAM_XML_SCHEMACOLLECTION_SCHEMANAME 25 +#define SSPROP_PARAM_XML_SCHEMACOLLECTIONNAME 26 +#define SSPROP_PARAM_UDT_CATALOGNAME 27 +#define SSPROP_PARAM_UDT_SCHEMANAME 28 +#define SSPROP_PARAM_UDT_NAME 29 +#define SSPROP_PARAM_TYPE_CATALOGNAME 38 +#define SSPROP_PARAM_TYPE_SCHEMANAME 39 +#define SSPROP_PARAM_TYPE_TYPENAME 40 +#define SSPROP_PARAM_TABLE_DEFAULT_COLUMNS 41 +#define SSPROP_PARAM_TABLE_COLUMN_SORT_ORDER 42 +#define SSPROP_INDEX_XML 1 +#define BCP_TYPE_DEFAULT 0x00 +#define BCP_TYPE_SQLTEXT 0x23 +#define BCP_TYPE_SQLVARBINARY 0x25 +#define BCP_TYPE_SQLINTN 0x26 +#define BCP_TYPE_SQLVARCHAR 0x27 +#define BCP_TYPE_SQLBINARY 0x2d +#define BCP_TYPE_SQLIMAGE 0x22 +#define BCP_TYPE_SQLCHARACTER 0x2f +#define BCP_TYPE_SQLINT1 0x30 +#define BCP_TYPE_SQLBIT 0x32 +#define BCP_TYPE_SQLINT2 0x34 +#define BCP_TYPE_SQLINT4 0x38 +#define BCP_TYPE_SQLMONEY 0x3c +#define BCP_TYPE_SQLDATETIME 0x3d +#define BCP_TYPE_SQLFLT8 0x3e +#define BCP_TYPE_SQLFLTN 0x6d +#define BCP_TYPE_SQLMONEYN 0x6e +#define BCP_TYPE_SQLDATETIMN 0x6f +#define BCP_TYPE_SQLFLT4 0x3b +#define BCP_TYPE_SQLMONEY4 0x7a +#define BCP_TYPE_SQLDATETIM4 0x3a +#define BCP_TYPE_SQLDECIMAL 0x6a +#define BCP_TYPE_SQLNUMERIC 0x6c +#define BCP_TYPE_SQLUNIQUEID 0x24 +#define BCP_TYPE_SQLBIGCHAR 0xaf +#define BCP_TYPE_SQLBIGVARCHAR 0xa7 +#define BCP_TYPE_SQLBIGBINARY 0xad +#define BCP_TYPE_SQLBIGVARBINARY +#define BCP_TYPE_SQLBITN 0x68 +#define BCP_TYPE_SQLNCHAR 0xef +#define BCP_TYPE_SQLNVARCHAR 0xe7 +#define BCP_TYPE_SQLNTEXT 0x63 +#define BCP_TYPE_SQLDECIMALN 0x6a +#define BCP_TYPE_SQLNUMERICN 0x6c +#define BCP_TYPE_SQLINT8 0x7f +#define BCP_TYPE_SQLVARIANT 0x62 +#define BCP_TYPE_SQLUDT 0xf0 +#define BCP_TYPE_SQLXML 0xf1 +#define BCP_TYPE_SQLDATE 0x28 +#define BCP_TYPE_SQLTIME 0x29 +#define BCP_TYPE_SQLDATETIME2 0x2a +#define BCP_TYPE_SQLDATETIMEOFFSET 0x2b +#define BCP_DIRECTION_IN 1 +#define BCP_DIRECTION_OUT 2 +#define BCP_OPTION_MAXERRS 1 +#define BCP_OPTION_FIRST 2 +#define BCP_OPTION_LAST 3 +#define BCP_OPTION_BATCH 4 +#define BCP_OPTION_KEEPNULLS 5 +#define BCP_OPTION_ABORT 6 +#define BCP_OPTION_KEEPIDENTITY 8 +#define BCP_OPTION_HINTSA 10 +#define BCP_OPTION_HINTSW 11 +#define BCP_OPTION_FILECP 12 +#define BCP_OPTION_UNICODEFILE 13 +#define BCP_OPTION_TEXTFILE 14 +#define BCP_OPTION_FILEFMT 15 +#define BCP_OPTION_FMTXML 16 +#define BCP_OPTION_FIRSTEX 17 +#define BCP_OPTION_LASTEX 18 +#define BCP_OPTION_ROWCOUNT 19 +#define BCP_OPTION_DELAYREADFMT 20 +#define BCP_OUT_CHARACTER_MODE 0x01 +#define BCP_OUT_WIDE_CHARACTER_MODE 0x02 +#define BCP_OUT_NATIVE_TEXT_MODE 0x03 +#define BCP_OUT_NATIVE_MODE 0x04 +#define BCP_FILECP_ACP 0 +#define BCP_FILECP_OEMCP 1 +#define BCP_FILECP_RAW (-1) +#ifdef UNICODE +#define BCP_OPTION_HINTS BCP_OPTION_HINTSW +#else +#define BCP_OPTION_HINTS BCP_OPTION_HINTSA +#endif +#define BCP_PREFIX_DEFAULT (-10) +#define BCP_LENGTH_NULL (-1) +#define BCP_LENGTH_VARIABLE (-10) + +#if (MSOLEDBSQL_VER >= 1800) +#ifdef DBINITCONSTANTS +extern const GUID CLSID_MSOLEDBSQL = {0x5a23de84L,0x1d7b,0x4a16,{0x8d,0xed,0xb2,0x9c,0x9,0xcb,0x64,0x8d}}; +extern const GUID CLSID_MSOLEDBSQL_ERROR = {0xecab1ccbL,0x116a,0x4541,{0xad,0xba,0x69,0xc,0xeb,0x9c,0xc8,0x43}}; +extern const GUID CLSID_MSOLEDBSQL_ENUMERATOR = {0x720818d5L,0x1465,0x4812,{0x83,0x9f,0x9f,0x15,0xc3,0x8a,0x52,0xcb}}; +#else +extern const GUID CLSID_MSOLEDBSQL; +extern const GUID CLSID_MSOLEDBSQL_ERROR; +extern const GUID CLSID_MSOLEDBSQL_ENUMERATOR; +#endif +#endif +#ifdef DBINITCONSTANTS +extern const GUID CLSID_ROWSET_TVP = {0xc7ef28d5L,0x7bee,0x443f,{0x86,0xda,0xe3,0x98,0x4f,0xcd,0x4d,0xf9}}; +#else +extern const GUID CLSID_ROWSET_TVP; +#endif + +#ifndef _SQLOLEDB_H_ +#ifdef DBINITCONSTANTS +extern const GUID IID_ISQLServerErrorInfo = {0x5cf4ca12,0xef21,0x11d0,{0x97,0xe7,0x0,0xc0,0x4f,0xc2,0xad,0x98}}; +extern const GUID IID_IRowsetFastLoad = {0x5cf4ca13,0xef21,0x11d0,{0x97,0xe7,0x0,0xc0,0x4f,0xc2,0xad,0x98}}; +extern const GUID IID_IUMSInitialize = {0x5cf4ca14,0xef21,0x11d0,{0x97,0xe7,0x0,0xc0,0x4f,0xc2,0xad,0x98}}; +extern const GUID IID_ISchemaLock = {0x4c2389fb,0x2511,0x11d4,{0xb2,0x58,0x0,0xc0,0x4f,0x79,0x71,0xce}}; +extern const GUID IID_ISQLXMLHelper = {0xd22a7678L,0xf860,0x40cd,{0xa5,0x67,0x15,0x63,0xde,0xb4,0x6d,0x49}}; +#else +extern const GUID IID_ISQLServerErrorInfo; +extern const GUID IID_IRowsetFastLoad; +extern const GUID IID_IUMSInitialize; +extern const GUID IID_ISchemaLock; +extern const GUID IID_ISQLXMLHelper; +#endif +#endif +#ifdef DBINITCONSTANTS +extern const GUID IID_ISSAbort = {0x5cf4ca15,0xef21,0x11d0,{0x97,0xe7,0x0,0xc0,0x4f,0xc2,0xad,0x98}}; +extern const GUID IID_IBCPSession = {0x88352D80,0x42D1,0x42f0,{0xA1,0x70,0xAB,0x0F,0x8B,0x45,0xB9,0x39}}; +extern const GUID IID_IBCPSession2 = {0xad79d3b6,0x59dd,0x46a3,{0xbf,0xc6,0xe6,0x2a,0x65,0xff,0x35,0x23}}; +extern const GUID IID_ISSCommandWithParameters = {0xeec30162,0x6087,0x467c,{0xb9,0x95,0x7c,0x52,0x3c,0xe9,0x65,0x61}}; +extern const GUID IID_ISSAsynchStatus = {0x1FF1F743,0x8BB0, 0x4c00,{0xAC,0xC4,0xC1,0x0E,0x43,0xB0,0x8F,0xC1}}; +#else +extern const GUID IID_ISSAbort; +extern const GUID IID_IBCPSession; +extern const GUID IID_IBCPSession2; +extern const GUID IID_ISSCommandWithParameters; +extern const GUID IID_ISSAsynchStatus; +#endif + +#ifndef _SQLOLEDB_H_ +#ifdef DBINITCONSTANTS +extern const GUID DBSCHEMA_LINKEDSERVERS = {0x9093caf4,0x2eac,0x11d1,{0x98,0x9,0x0,0xc0,0x4f,0xc2,0xad,0x98}}; +#else +extern const GUID DBSCHEMA_LINKEDSERVERS; +#endif +#endif +#ifdef DBINITCONSTANTS +extern const GUID DBSCHEMA_SQL_ASSEMBLIES = {0x7c1112c8, 0xc2d3, 0x4f6e, {0x94, 0x9a, 0x98, 0x3d, 0x38, 0xa5, 0x8f, 0x46}}; +extern const GUID DBSCHEMA_SQL_ASSEMBLY_DEPENDENCIES = {0xcb0f837b, 0x974c, 0x41b8, {0x90, 0x9d, 0x64, 0x9c, 0xaf, 0x45, 0xad, 0x2f}}; +extern const GUID DBSCHEMA_SQL_USER_TYPES = {0xf1198bd8, 0xa424, 0x4ea3, {0x8d, 0x4c, 0x60, 0x7e, 0xee, 0x2b, 0xab, 0x60}}; +extern const GUID DBSCHEMA_XML_COLLECTIONS = {0x56bfad8c, 0x6e8f, 0x480d, {0x91, 0xde, 0x35, 0x16, 0xd9, 0x9a, 0x5d, 0x10}}; +extern const GUID DBSCHEMA_SQL_TABLE_TYPES = {0x4e26cde7, 0xaaa4, 0x41ed, {0x93, 0xdd, 0x37, 0x6e, 0x6d, 0x40, 0x9c, 0x17}}; +extern const GUID DBSCHEMA_SQL_TABLE_TYPE_PRIMARY_KEYS = {0x9738faea, 0x31e8, 0x4f63, {0xae, 0xd, 0x61, 0x33, 0x16, 0x41, 0x8c, 0xdd}}; +extern const GUID DBSCHEMA_SQL_TABLE_TYPE_COLUMNS = {0xa663d94b, 0xddf7, 0x4a7f, {0xa5, 0x37, 0xd6, 0x1f, 0x12, 0x36, 0x5d, 0x7c}}; +extern const GUID DBSCHEMA_COLUMNS_EXTENDED = {0x66462f01, 0x633a, 0x44d9, {0xb0, 0xd0, 0xfe, 0x66, 0xf2, 0x1a, 0x0d, 0x24}}; +extern const GUID DBSCHEMA_SPARSE_COLUMN_SET = {0x31a4837c, 0xf9ff, 0x405f, {0x89, 0x82, 0x02, 0x19, 0xaa, 0xaa, 0x4a, 0x12}}; +#else +extern const GUID DBSCHEMA_SQL_ASSEMBLIES; +extern const GUID DBSCHEMA_SQL_ASSEMBLY_DEPENDENCIES; +extern const GUID DBSCHEMA_SQL_USER_TYPES; +extern const GUID DBSCHEMA_XML_COLLECTIONS; +extern const GUID DBSCHEMA_SQL_TABLE_TYPES; +extern const GUID DBSCHEMA_SQL_TABLE_TYPE_PRIMARY_KEYS; +extern const GUID DBSCHEMA_SQL_TABLE_TYPE_COLUMNS; +extern const GUID DBSCHEMA_COLUMNS_EXTENDED; +extern const GUID DBSCHEMA_SPARSE_COLUMN_SET; +#endif + +#ifndef CRESTRICTIONS_DBSCHEMA_LINKEDSERVERS +#define CRESTRICTIONS_DBSCHEMA_LINKEDSERVERS 1 +#endif +#ifndef CRESTRICTIONS_DBSCHEMA_ASSEMBLIES +#define CRESTRICTIONS_DBSCHEMA_SQL_ASSEMBLIES 4 +#endif +#ifndef CRESTRICTIONS_DBSCHEMA_ASSEMBLY_DEPENDENCIES +#define CRESTRICTIONS_DBSCHEMA_SQL_ASSEMBLY_DEPENDENCIES 4 +#endif +#ifndef CRESTRICTIONS_DBSCHEMA_USER_TYPES +#define CRESTRICTIONS_DBSCHEMA_SQL_USER_TYPES 3 +#endif +#ifndef CRESTRICTIONS_DBSCHEMA_XML_COLLECTIONS +#define CRESTRICTIONS_DBSCHEMA_XML_COLLECTIONS 4 +#endif +#ifndef CRESTRICTIONS_DBSCHEMA_SQL_TABLE_TYPES +#define CRESTRICTIONS_DBSCHEMA_SQL_TABLE_TYPES 3 +#endif +#ifndef CRESTRICTIONS_DBSCHEMA_SQL_TABLE_TYPE_PRIMARY_KEYS +#define CRESTRICTIONS_DBSCHEMA_SQL_TABLE_TYPE_PRIMARY_KEYS 3 +#endif +#ifndef CRESTRICTIONS_DBSCHEMA_SQL_TABLE_TYPE_COLUMNS +#define CRESTRICTIONS_DBSCHEMA_SQL_TABLE_TYPE_COLUMNS 4 +#endif +#ifndef CRESTRICTIONS_DBSCHEMA_COLUMNS_EXTENDED +#define CRESTRICTIONS_DBSCHEMA_COLUMNS_EXTENDED 4 +#endif +#ifndef CRESTRICTIONS_DBSCHEMA_SPARSE_COLUMN_SET +#define CRESTRICTIONS_DBSCHEMA_SPARSE_COLUMN_SET 4 +#endif + +#ifndef _SQLOLEDB_H_ +extern const GUID OLEDBDECLSPEC DBPROPSET_SQLSERVERDATASOURCE = {0x28efaee4,0x2d2c,0x11d1,{0x98,0x7,0x0,0xc0,0x4f,0xc2,0xad,0x98}}; +extern const GUID OLEDBDECLSPEC DBPROPSET_SQLSERVERDATASOURCEINFO= {0xdf10cb94,0x35f6,0x11d2,{0x9c,0x54,0x0,0xc0,0x4f,0x79,0x71,0xd3}}; +extern const GUID OLEDBDECLSPEC DBPROPSET_SQLSERVERDBINIT = {0x5cf4ca10,0xef21,0x11d0,{0x97,0xe7,0x0,0xc0,0x4f,0xc2,0xad,0x98}}; +extern const GUID OLEDBDECLSPEC DBPROPSET_SQLSERVERROWSET = {0x5cf4ca11,0xef21,0x11d0,{0x97,0xe7,0x0,0xc0,0x4f,0xc2,0xad,0x98}}; +extern const GUID OLEDBDECLSPEC DBPROPSET_SQLSERVERSESSION = {0x28efaee5,0x2d2c,0x11d1,{0x98,0x7,0x0,0xc0,0x4f,0xc2,0xad,0x98}}; +extern const GUID OLEDBDECLSPEC DBPROPSET_SQLSERVERCOLUMN = {0x3b63fb5e,0x3fbb,0x11d3,{0x9f,0x29,0x0,0xc0,0x4f,0x8e,0xe9,0xdc}}; +extern const GUID OLEDBDECLSPEC DBPROPSET_SQLSERVERSTREAM = {0x9f79c073,0x8a6d,0x4bca,{0xa8,0xa8,0xc9,0xb7,0x9a,0x9b,0x96,0x2d}}; +#endif +extern const GUID OLEDBDECLSPEC DBPROPSET_SQLSERVERPARAMETER = {0xfee09128,0xa67d,0x47ea,{0x8d,0x40,0x24,0xa1,0xd4,0x73,0x7e,0x8d}}; +extern const GUID OLEDBDECLSPEC DBPROPSET_SQLSERVERINDEX = {0xE428B84E,0xA6B7,0x413a,{0x94,0x65,0x56,0x23,0x2E,0x0D,0x2B,0xEB}}; +extern const GUID OLEDBDECLSPEC DBPROPSET_PARAMETERALL = {0x2cd2b7d8,0xe7c2,0x4f6c,{0x9b,0x30,0x75,0xe2,0x58,0x46,0x10,0x97}}; + +#define DBCOLUMN_SS_X_GUID {0x627bd890,0xed54,0x11d2,{0xb9,0x94,0x0,0xc0,0x4f,0x8c,0xa8,0x2c}} + +#ifndef _SQLOLEDB_H_ +extern const DBID OLEDBDECLSPEC DBCOLUMN_SS_COMPFLAGS = {DBCOLUMN_SS_X_GUID, DBKIND_GUID_PROPID, (LPOLESTR)100}; +extern const DBID OLEDBDECLSPEC DBCOLUMN_SS_SORTID = {DBCOLUMN_SS_X_GUID, DBKIND_GUID_PROPID, (LPOLESTR)101}; +extern const DBID OLEDBDECLSPEC DBCOLUMN_BASETABLEINSTANCE = {DBCOLUMN_SS_X_GUID, DBKIND_GUID_PROPID, (LPOLESTR)102}; +extern const DBID OLEDBDECLSPEC DBCOLUMN_SS_TDSCOLLATION = {DBCOLUMN_SS_X_GUID, DBKIND_GUID_PROPID, (LPOLESTR)103}; +#endif +extern const DBID OLEDBDECLSPEC DBCOLUMN_BASESERVERNAME = {DBCOLUMN_SS_X_GUID, DBKIND_GUID_PROPID, (LPOLESTR)104}; +extern const DBID OLEDBDECLSPEC DBCOLUMN_SS_XML_SCHEMACOLLECTION_CATALOGNAME = {DBCOLUMN_SS_X_GUID, DBKIND_GUID_PROPID, (LPOLESTR)105}; +extern const DBID OLEDBDECLSPEC DBCOLUMN_SS_XML_SCHEMACOLLECTION_SCHEMANAME = {DBCOLUMN_SS_X_GUID, DBKIND_GUID_PROPID, (LPOLESTR)106}; +extern const DBID OLEDBDECLSPEC DBCOLUMN_SS_XML_SCHEMACOLLECTIONNAME = {DBCOLUMN_SS_X_GUID, DBKIND_GUID_PROPID, (LPOLESTR)107}; +extern const DBID OLEDBDECLSPEC DBCOLUMN_SS_UDT_CATALOGNAME = {DBCOLUMN_SS_X_GUID, DBKIND_GUID_PROPID, (LPOLESTR)108}; +extern const DBID OLEDBDECLSPEC DBCOLUMN_SS_UDT_SCHEMANAME = {DBCOLUMN_SS_X_GUID, DBKIND_GUID_PROPID, (LPOLESTR)109}; +extern const DBID OLEDBDECLSPEC DBCOLUMN_SS_UDT_NAME = {DBCOLUMN_SS_X_GUID, DBKIND_GUID_PROPID, (LPOLESTR)110}; +extern const DBID OLEDBDECLSPEC DBCOLUMN_SS_ASSEMBLY_TYPENAME= {DBCOLUMN_SS_X_GUID, DBKIND_GUID_PROPID, (LPOLESTR)111}; + +#ifndef SQL_FILESTREAM_DEFINED +#define SQL_FILESTREAM_DEFINED +typedef enum _SQL_FILESTREAM_DESIRED_ACCESS { + SQL_FILESTREAM_READ = 0, SQL_FILESTREAM_WRITE = 1, + SQL_FILESTREAM_READWRITE = 2 +} SQL_FILESTREAM_DESIRED_ACCESS; +#define SQL_FILESTREAM_OPEN_FLAG_ASYNC 0x00000001L +#define SQL_FILESTREAM_OPEN_FLAG_NO_BUFFERING 0x00000002L +#define SQL_FILESTREAM_OPEN_FLAG_NO_WRITE_THROUGH 0x00000004L +#define SQL_FILESTREAM_OPEN_FLAG_SEQUENTIAL_SCAN 0x00000008L +#define SQL_FILESTREAM_OPEN_FLAG_RANDOM_ACCESS 0x00000010L +HANDLE __stdcall OpenSqlFilestream(LPCWSTR FilestreamPath, SQL_FILESTREAM_DESIRED_ACCESS DesiredAccess, ULONG OpenOptions, LPBYTE FilestreamTransactionContext, SSIZE_T FilestreamTransactionContextLength, PLARGE_INTEGER AllocationSize); +#define FSCTL_SQL_FILESTREAM_FETCH_OLD_CONTENT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 2392, METHOD_BUFFERED, FILE_ANY_ACCESS) +#endif + +#ifndef _SQLUSERINSTANCE_H_ +#define _SQLUSERINSTANCE_H_ + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#define LOCALDB_MAX_SQLCONNECTION_BUFFER_SIZE 260 +typedef HRESULT __cdecl FnLocalDBCreateInstance(PCWSTR wszVersion, PCWSTR pInstanceName, DWORD dwFlags); +typedef FnLocalDBCreateInstance* PFnLocalDBCreateInstance; +typedef HRESULT __cdecl FnLocalDBStartInstance(PCWSTR pInstanceName, DWORD dwFlags, LPWSTR wszSqlConnection, LPDWORD lpcchSqlConnection); +typedef FnLocalDBStartInstance* PFnLocalDBStartInstance; +#define LOCALDB_TRUNCATE_ERR_MESSAGE 0x0001L +typedef HRESULT __cdecl FnLocalDBFormatMessage(HRESULT hrLocalDB, DWORD dwFlags, DWORD dwLanguageId, LPWSTR wszMessage, LPDWORD lpcchMessage); +typedef FnLocalDBFormatMessage* PFnLocalDBFormatMessage; +#define LOCALDB_ERROR_NOT_INSTALLED ((HRESULT)0x89C50116L) +FnLocalDBCreateInstance LocalDBCreateInstance; +FnLocalDBStartInstance LocalDBStartInstance; +typedef HRESULT __cdecl FnLocalDBStopInstance(PCWSTR pInstanceName, DWORD dwFlags, ULONG ulTimeout); +typedef FnLocalDBStopInstance* PFnLocalDBStopInstance; +#define LOCALDB_SHUTDOWN_KILL_PROCESS 0x0001L +#define LOCALDB_SHUTDOWN_WITH_NOWAIT 0x0002L +FnLocalDBStopInstance LocalDBStopInstance; +typedef HRESULT __cdecl FnLocalDBDeleteInstance(PCWSTR pInstanceName, DWORD dwFlags); +typedef FnLocalDBDeleteInstance* PFnLocalDBDeleteInstance; +FnLocalDBDeleteInstance LocalDBDeleteInstance; +FnLocalDBFormatMessage LocalDBFormatMessage; +#define MAX_LOCALDB_INSTANCE_NAME_LENGTH 128 +#define MAX_LOCALDB_PARENT_INSTANCE_LENGTH MAX_INSTANCE_NAME +typedef WCHAR TLocalDBInstanceName[MAX_LOCALDB_INSTANCE_NAME_LENGTH + 1]; +typedef TLocalDBInstanceName* PTLocalDBInstanceName; +typedef HRESULT __cdecl FnLocalDBGetInstances(PTLocalDBInstanceName pInstanceNames, LPDWORD lpdwNumberOfInstances); +typedef FnLocalDBGetInstances* PFnLocalDBGetInstances; +FnLocalDBGetInstances LocalDBGetInstances; +#define MAX_STRING_SID_LENGTH 186 + +#pragma pack(push,8) + +typedef struct _LocalDBInstanceInfo { + DWORD cbLocalDBInstanceInfoSize; + TLocalDBInstanceName wszInstanceName; + BOOL bExists; + BOOL bConfigurationCorrupted; + BOOL bIsRunning; + DWORD dwMajor; + DWORD dwMinor; + DWORD dwBuild; + DWORD dwRevision; + FILETIME ftLastStartDateUTC; + WCHAR wszConnection[LOCALDB_MAX_SQLCONNECTION_BUFFER_SIZE]; + BOOL bIsShared; + TLocalDBInstanceName wszSharedInstanceName; + WCHAR wszOwnerSID[MAX_STRING_SID_LENGTH + 1]; + BOOL bIsAutomatic; +} LocalDBInstanceInfo; + +#pragma pack(pop) + +typedef LocalDBInstanceInfo* PLocalDBInstanceInfo; +typedef HRESULT __cdecl FnLocalDBGetInstanceInfo(PCWSTR wszInstanceName, PLocalDBInstanceInfo pInfo, DWORD cbInfo); +typedef FnLocalDBGetInstanceInfo* PFnLocalDBGetInstanceInfo; +FnLocalDBGetInstanceInfo LocalDBGetInstanceInfo; +#define MAX_LOCALDB_VERSION_LENGTH 43 +typedef WCHAR TLocalDBVersion[MAX_LOCALDB_VERSION_LENGTH + 1]; +typedef TLocalDBVersion* PTLocalDBVersion; +typedef HRESULT __cdecl FnLocalDBGetVersions(PTLocalDBVersion pVersions, LPDWORD lpdwNumberOfVersions); +typedef FnLocalDBGetVersions* PFnLocalDBGetVersions; +FnLocalDBGetVersions LocalDBGetVersions; + +#pragma pack(push,8) + +typedef struct _LocalDBVersionInfo { + DWORD cbLocalDBVersionInfoSize; + TLocalDBVersion wszVersion; + BOOL bExists; + DWORD dwMajor; + DWORD dwMinor; + DWORD dwBuild; + DWORD dwRevision; +} LocalDBVersionInfo; + +#pragma pack(pop) + +typedef LocalDBVersionInfo* PLocalDBVersionInfo; +typedef HRESULT __cdecl FnLocalDBGetVersionInfo(PCWSTR wszVersion, PLocalDBVersionInfo pVersionInfo, DWORD cbVersionInfo); +typedef FnLocalDBGetVersionInfo* PFnLocalDBGetVersionInfo; +FnLocalDBGetVersionInfo LocalDBGetVersionInfo; +typedef HRESULT __cdecl FnLocalDBStartTracing(); +typedef FnLocalDBStartTracing* PFnLocalDBStartTracing; +FnLocalDBStartTracing LocalDBStartTracing; +typedef HRESULT __cdecl FnLocalDBStopTracing(); +typedef FnLocalDBStopTracing* PFnFnLocalDBStopTracing; +FnLocalDBStopTracing LocalDBStopTracing; +typedef HRESULT __cdecl FnLocalDBShareInstance(PSID pOwnerSID, PCWSTR wszPrivateLocalDBInstanceName, PCWSTR wszSharedName, DWORD dwFlags); +typedef FnLocalDBShareInstance* PFnLocalDBShareInstance; +FnLocalDBShareInstance LocalDBShareInstance; +typedef HRESULT __cdecl FnLocalDBUnshareInstance(PCWSTR pInstanceName, DWORD dwFlags); +typedef FnLocalDBUnshareInstance* PFnLocalDBUnshareInstance; +FnLocalDBUnshareInstance LocalDBUnshareInstance; + +#ifdef __cplusplus +} // extern "C" +#endif + +#ifdef LOCALDB_DEFINE_PROXY_FUNCTIONS +#define LOCALDB_PROXY(LocalDBFn) static Fn##LocalDBFn* pfn##LocalDBFn = NULL; if (!pfn##LocalDBFn) {HRESULT hr = LocalDBGetPFn(#LocalDBFn, (FARPROC *)&pfn##LocalDBFn); if (FAILED(hr)) return hr;} return (*pfn##LocalDBFn) + +typedef struct { + DWORD dwComponent[2]; + WCHAR wszKeyName[256]; +} Version; + +static BOOL ParseVersion(Version * pVersion) +{ + pVersion->dwComponent[0] = 0; + pVersion->dwComponent[1] = 0; + WCHAR *pwch = pVersion->wszKeyName; + + for (int i = 0; i < 2; i++) { + LONGLONG llVal = 0; + BOOL fHaveDigit = FALSE; + + while (*pwch >= L'0' && *pwch <= L'9') { + llVal = llVal * 10 + (*pwch++ - L'0'); + fHaveDigit = TRUE; + if (llVal > 0x7fffffff) { + return FALSE; + } + } + + if (!fHaveDigit) + return FALSE; + + pVersion->dwComponent[i] = (DWORD)llVal; + + if (*pwch == L'\0') + return TRUE; + + if (*pwch != L'.') + return FALSE; + + pwch++; + } + return FALSE; +} + +#include + +static HRESULT LocalDBGetPFn(LPCSTR szLocalDBFn, FARPROC *pfnLocalDBFn) +{ + static volatile HMODULE hLocalDBDll = NULL; + + if (!hLocalDBDll) { + LONG ec; + HKEY hkeyVersions = NULL; + HKEY hkeyVersion = NULL; + Version verHigh = {0}; + Version verCurrent; + DWORD cchKeyName; + DWORD dwValueType; + WCHAR wszLocalDBDll[MAX_PATH+1]; + DWORD cbLocalDBDll = sizeof(wszLocalDBDll) - sizeof(WCHAR); + HMODULE hLocalDBDllTemp = NULL; + + if (ERROR_SUCCESS != (ec = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Microsoft SQL Server Local DB\\Installed Versions", 0, KEY_READ, &hkeyVersions))) + goto Cleanup; + + for (int i = 0; ; i++) { + cchKeyName = 256; + if (ERROR_SUCCESS != (ec = RegEnumKeyExW(hkeyVersions, i, verCurrent.wszKeyName, &cchKeyName, 0, NULL, NULL, NULL))) { + if (ERROR_NO_MORE_ITEMS == ec) + break; + goto Cleanup; + } + + if (!ParseVersion(&verCurrent)) + continue; + + if (verCurrent.dwComponent[0] > verHigh.dwComponent[0] || + (verCurrent.dwComponent[0] == verHigh.dwComponent[0] && verCurrent.dwComponent[1] > verHigh.dwComponent[1])) + verHigh = verCurrent; + } + if (!verHigh.wszKeyName[0]) { + assert(ec == ERROR_NO_MORE_ITEMS); + + ec = ERROR_FILE_NOT_FOUND; + goto Cleanup; + } + + if (ERROR_SUCCESS != (ec = RegOpenKeyExW(hkeyVersions, verHigh.wszKeyName, 0, KEY_READ, &hkeyVersion))) + goto Cleanup; + if (ERROR_SUCCESS != (ec = RegQueryValueExW(hkeyVersion, L"InstanceAPIPath", NULL, &dwValueType, (PBYTE) wszLocalDBDll, &cbLocalDBDll))) + goto Cleanup; + if (dwValueType != REG_SZ) { + ec = ERROR_INVALID_DATA; + goto Cleanup; + } + wszLocalDBDll[cbLocalDBDll/sizeof(WCHAR)] = L'\0'; + + hLocalDBDllTemp = LoadLibraryW(wszLocalDBDll); + if (NULL == hLocalDBDllTemp) { + ec = GetLastError(); + goto Cleanup; + } + if (NULL == InterlockedCompareExchangePointer((volatile PVOID *)&hLocalDBDll, hLocalDBDllTemp, NULL)) + hLocalDBDllTemp = NULL; + ec = ERROR_SUCCESS; +Cleanup: + if (hLocalDBDllTemp) + FreeLibrary(hLocalDBDllTemp); + if (hkeyVersion) + RegCloseKey(hkeyVersion); + if (hkeyVersions) + RegCloseKey(hkeyVersions); + + if (ec == ERROR_FILE_NOT_FOUND) + return LOCALDB_ERROR_NOT_INSTALLED; + + if (ec != ERROR_SUCCESS) + return HRESULT_FROM_WIN32(ec); + } + + FARPROC pfn = GetProcAddress(hLocalDBDll, szLocalDBFn); + + if (!pfn) + return HRESULT_FROM_WIN32(GetLastError()); + *pfnLocalDBFn = pfn; + return S_OK; +} + +HRESULT __cdecl LocalDBCreateInstance(PCWSTR wszVersion, PCWSTR pInstanceName, DWORD dwFlags) +{ + LOCALDB_PROXY(LocalDBCreateInstance)(wszVersion, pInstanceName, dwFlags); +} + +HRESULT __cdecl LocalDBStartInstance(PCWSTR pInstanceName, DWORD dwFlags, LPWSTR wszSqlConnection, LPDWORD lpcchSqlConnection) +{ + LOCALDB_PROXY(LocalDBStartInstance)(pInstanceName, dwFlags, wszSqlConnection, lpcchSqlConnection); +} + +HRESULT __cdecl LocalDBStopInstance(PCWSTR pInstanceName, DWORD dwFlags, ULONG ulTimeout) +{ + LOCALDB_PROXY(LocalDBStopInstance)(pInstanceName, dwFlags, ulTimeout); +} + +HRESULT __cdecl LocalDBDeleteInstance(PCWSTR pInstanceName, DWORD dwFlags) +{ + LOCALDB_PROXY(LocalDBDeleteInstance)(pInstanceName, dwFlags); +} + +HRESULT __cdecl LocalDBFormatMessage(HRESULT hrLocalDB, DWORD dwFlags, DWORD dwLanguageId, LPWSTR wszMessage, LPDWORD lpcchMessage) +{ + LOCALDB_PROXY(LocalDBFormatMessage)(hrLocalDB, dwFlags, dwLanguageId, wszMessage, lpcchMessage); +} + +HRESULT __cdecl LocalDBGetInstances(PTLocalDBInstanceName pInstanceNames, LPDWORD lpdwNumberOfInstances) +{ + LOCALDB_PROXY(LocalDBGetInstances)(pInstanceNames, lpdwNumberOfInstances); +} + +HRESULT __cdecl LocalDBGetInstanceInfo(PCWSTR wszInstanceName, PLocalDBInstanceInfo pInfo, DWORD cbInfo) +{ + LOCALDB_PROXY(LocalDBGetInstanceInfo)(wszInstanceName, pInfo, cbInfo); +} + +HRESULT __cdecl LocalDBStartTracing() +{ + LOCALDB_PROXY(LocalDBStartTracing)(); +} + +HRESULT __cdecl LocalDBStopTracing() +{ + LOCALDB_PROXY(LocalDBStopTracing)(); +} + +HRESULT __cdecl LocalDBShareInstance(PSID pOwnerSID, PCWSTR wszLocalDBInstancePrivateName, PCWSTR wszSharedName, DWORD dwFlags) +{ + LOCALDB_PROXY(LocalDBShareInstance)(pOwnerSID, wszLocalDBInstancePrivateName, wszSharedName, dwFlags); +} + +HRESULT __cdecl LocalDBGetVersions(PTLocalDBVersion pVersions, LPDWORD lpdwNumberOfVersions) +{ + LOCALDB_PROXY(LocalDBGetVersions)(pVersions, lpdwNumberOfVersions); +} + +HRESULT __cdecl LocalDBUnshareInstance(PCWSTR pInstanceName, DWORD dwFlags) +{ + LOCALDB_PROXY(LocalDBUnshareInstance)(pInstanceName, dwFlags); +} + +HRESULT __cdecl LocalDBGetVersionInfo(PCWSTR wszVersion, PLocalDBVersionInfo pVersionInfo, DWORD cbVersionInfo) +{ + LOCALDB_PROXY(LocalDBGetVersionInfo)(wszVersion, pVersionInfo, cbVersionInfo); +} +#endif +#endif + +#ifndef _LOCALDB_MESSAGES_H_ +#define _LOCALDB_MESSAGES_H_ +#define FACILITY_LOCALDB 0x9C5 +#define LOCALDB_SEVERITY_SUCCESS 0x0 +#define LOCALDB_SEVERITY_ERROR 0x2 +#define LOCALDB_ERROR_CANNOT_CREATE_INSTANCE_FOLDER ((HRESULT)0x89C50100L) +#define LOCALDB_ERROR_INVALID_PARAMETER ((HRESULT)0x89C50101L) +#define LOCALDB_ERROR_INSTANCE_EXISTS_WITH_LOWER_VERSION ((HRESULT)0x89C50102L) +#define LOCALDB_ERROR_CANNOT_GET_USER_PROFILE_FOLDER ((HRESULT)0x89C50103L) +#define LOCALDB_ERROR_INSTANCE_FOLDER_PATH_TOO_LONG ((HRESULT)0x89C50104L) +#define LOCALDB_ERROR_CANNOT_ACCESS_INSTANCE_FOLDER ((HRESULT)0x89C50105L) +#define LOCALDB_ERROR_CANNOT_ACCESS_INSTANCE_REGISTRY ((HRESULT)0x89C50106L) +#define LOCALDB_ERROR_UNKNOWN_INSTANCE ((HRESULT)0x89C50107L) +#define LOCALDB_ERROR_INTERNAL_ERROR ((HRESULT)0x89C50108L) +#define LOCALDB_ERROR_CANNOT_MODIFY_INSTANCE_REGISTRY ((HRESULT)0x89C50109L) +#define LOCALDB_ERROR_SQL_SERVER_STARTUP_FAILED ((HRESULT)0x89C5010AL) +#define LOCALDB_ERROR_INSTANCE_CONFIGURATION_CORRUPT ((HRESULT)0x89C5010BL) +#define LOCALDB_ERROR_CANNOT_CREATE_SQL_PROCESS ((HRESULT)0x89C5010CL) +#define LOCALDB_ERROR_UNKNOWN_VERSION ((HRESULT)0x89C5010DL) +#define LOCALDB_ERROR_UNKNOWN_LANGUAGE_ID ((HRESULT)0x89C5010EL) +#define LOCALDB_ERROR_INSTANCE_STOP_FAILED ((HRESULT)0x89C5010FL) +#define LOCALDB_ERROR_UNKNOWN_ERROR_CODE ((HRESULT)0x89C50110L) +#define LOCALDB_ERROR_VERSION_REQUESTED_NOT_INSTALLED ((HRESULT)0x89C50111L) +#define LOCALDB_ERROR_INSTANCE_BUSY ((HRESULT)0x89C50112L) +#define LOCALDB_ERROR_INVALID_OPERATION ((HRESULT)0x89C50113L) +#define LOCALDB_ERROR_INSUFFICIENT_BUFFER ((HRESULT)0x89C50114L) +#define LOCALDB_ERROR_WAIT_TIMEOUT ((HRESULT)0x89C50115L) +#define LOCALDB_ERROR_XEVENT_FAILED ((HRESULT)0x89C50117L) +#define LOCALDB_ERROR_AUTO_INSTANCE_CREATE_FAILED ((HRESULT)0x89C50118L) +#define LOCALDB_ERROR_SHARED_NAME_TAKEN ((HRESULT)0x89C50119L) +#define LOCALDB_ERROR_CALLER_IS_NOT_OWNER ((HRESULT)0x89C5011AL) +#define LOCALDB_ERROR_INVALID_INSTANCE_NAME ((HRESULT)0x89C5011BL) +#define LOCALDB_ERROR_INSTANCE_ALREADY_SHARED ((HRESULT)0x89C5011CL) +#define LOCALDB_ERROR_INSTANCE_NOT_SHARED ((HRESULT)0x89C5011DL) +#define LOCALDB_ERROR_ADMIN_RIGHTS_REQUIRED ((HRESULT)0x89C5011EL) +#define LOCALDB_ERROR_TOO_MANY_SHARED_INSTANCES ((HRESULT)0x89C5011FL) +#define LOCALDB_ERROR_CANNOT_GET_LOCAL_APP_DATA_PATH ((HRESULT)0x89C50120L) +#define LOCALDB_ERROR_CANNOT_LOAD_RESOURCES ((HRESULT)0x89C50121L) +#define LOCALDB_EDETAIL_DATADIRECTORY_IS_MISSING ((HRESULT)0x89C50200L) +#define LOCALDB_EDETAIL_CANNOT_ACCESS_INSTANCE_FOLDER ((HRESULT)0x89C50201L) +#define LOCALDB_EDETAIL_DATADIRECTORY_IS_TOO_LONG ((HRESULT)0x89C50202L) +#define LOCALDB_EDETAIL_PARENT_INSTANCE_IS_MISSING ((HRESULT)0x89C50203L) +#define LOCALDB_EDETAIL_PARENT_INSTANCE_IS_TOO_LONG ((HRESULT)0x89C50204L) +#define LOCALDB_EDETAIL_DATA_DIRECTORY_INVALID ((HRESULT)0x89C50205L) +#define LOCALDB_EDETAIL_XEVENT_ASSERT ((HRESULT)0x89C50206L) +#define LOCALDB_EDETAIL_XEVENT_ERROR ((HRESULT)0x89C50207L) +#define LOCALDB_EDETAIL_INSTALLATION_CORRUPTED ((HRESULT)0x89C50208L) +#define LOCALDB_EDETAIL_CANNOT_GET_PROGRAM_FILES_LOCATION ((HRESULT)0x89C50209L) +#define LOCALDB_EDETAIL_XEVENT_CANNOT_INITIALIZE ((HRESULT)0x89C5020AL) +#define LOCALDB_EDETAIL_XEVENT_CANNOT_FIND_CONF_FILE ((HRESULT)0x89C5020BL) +#define LOCALDB_EDETAIL_XEVENT_CANNOT_CONFIGURE ((HRESULT)0x89C5020CL) +#define LOCALDB_EDETAIL_XEVENT_CONF_FILE_NAME_TOO_LONG ((HRESULT)0x89C5020DL) +#define LOCALDB_EDETAIL_COINITIALIZEEX_FAILED ((HRESULT)0x89C5020EL) +#define LOCALDB_EDETAIL_PARENT_INSTANCE_VERSION_INVALID ((HRESULT)0x89C5020FL) +#define LOCALDB_EDETAIL_WINAPI_ERROR ((HRESULT)0xC9C50210L) +#define LOCALDB_EDETAIL_UNEXPECTED_RESULT ((HRESULT)0x89C50211L) +#endif + +extern RPC_IF_HANDLE __MIDL_itf_msoledbsql_0000_0011_v0_0_c_ifspec; +extern RPC_IF_HANDLE __MIDL_itf_msoledbsql_0000_0011_v0_0_s_ifspec; + +#ifdef __cplusplus +} +#endif +#endif diff --git a/lib/libc/include/any-windows-any/msopc.h b/lib/libc/include/any-windows-any/msopc.h index 3fd118f3d8..2e036d6fd1 100644 --- a/lib/libc/include/any-windows-any/msopc.h +++ b/lib/libc/include/any-windows-any/msopc.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/msopc.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/msopc.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,156 +21,249 @@ #ifndef __IOpcUri_FWD_DEFINED__ #define __IOpcUri_FWD_DEFINED__ typedef interface IOpcUri IOpcUri; +#ifdef __cplusplus +interface IOpcUri; +#endif /* __cplusplus */ #endif #ifndef __IOpcPartUri_FWD_DEFINED__ #define __IOpcPartUri_FWD_DEFINED__ typedef interface IOpcPartUri IOpcPartUri; +#ifdef __cplusplus +interface IOpcPartUri; +#endif /* __cplusplus */ #endif #ifndef __IOpcPart_FWD_DEFINED__ #define __IOpcPart_FWD_DEFINED__ typedef interface IOpcPart IOpcPart; +#ifdef __cplusplus +interface IOpcPart; +#endif /* __cplusplus */ #endif #ifndef __IOpcPartEnumerator_FWD_DEFINED__ #define __IOpcPartEnumerator_FWD_DEFINED__ typedef interface IOpcPartEnumerator IOpcPartEnumerator; +#ifdef __cplusplus +interface IOpcPartEnumerator; +#endif /* __cplusplus */ #endif #ifndef __IOpcPartSet_FWD_DEFINED__ #define __IOpcPartSet_FWD_DEFINED__ typedef interface IOpcPartSet IOpcPartSet; +#ifdef __cplusplus +interface IOpcPartSet; +#endif /* __cplusplus */ #endif #ifndef __IOpcPackage_FWD_DEFINED__ #define __IOpcPackage_FWD_DEFINED__ typedef interface IOpcPackage IOpcPackage; +#ifdef __cplusplus +interface IOpcPackage; +#endif /* __cplusplus */ #endif #ifndef __IOpcRelationship_FWD_DEFINED__ #define __IOpcRelationship_FWD_DEFINED__ typedef interface IOpcRelationship IOpcRelationship; +#ifdef __cplusplus +interface IOpcRelationship; +#endif /* __cplusplus */ #endif #ifndef __IOpcRelationshipEnumerator_FWD_DEFINED__ #define __IOpcRelationshipEnumerator_FWD_DEFINED__ typedef interface IOpcRelationshipEnumerator IOpcRelationshipEnumerator; +#ifdef __cplusplus +interface IOpcRelationshipEnumerator; +#endif /* __cplusplus */ #endif #ifndef __IOpcRelationshipSelector_FWD_DEFINED__ #define __IOpcRelationshipSelector_FWD_DEFINED__ typedef interface IOpcRelationshipSelector IOpcRelationshipSelector; +#ifdef __cplusplus +interface IOpcRelationshipSelector; +#endif /* __cplusplus */ #endif #ifndef __IOpcRelationshipSet_FWD_DEFINED__ #define __IOpcRelationshipSet_FWD_DEFINED__ typedef interface IOpcRelationshipSet IOpcRelationshipSet; +#ifdef __cplusplus +interface IOpcRelationshipSet; +#endif /* __cplusplus */ #endif #ifndef __IOpcSignatureCustomObject_FWD_DEFINED__ #define __IOpcSignatureCustomObject_FWD_DEFINED__ typedef interface IOpcSignatureCustomObject IOpcSignatureCustomObject; +#ifdef __cplusplus +interface IOpcSignatureCustomObject; +#endif /* __cplusplus */ #endif #ifndef __IOpcSignatureCustomObjectEnumerator_FWD_DEFINED__ #define __IOpcSignatureCustomObjectEnumerator_FWD_DEFINED__ typedef interface IOpcSignatureCustomObjectEnumerator IOpcSignatureCustomObjectEnumerator; +#ifdef __cplusplus +interface IOpcSignatureCustomObjectEnumerator; +#endif /* __cplusplus */ #endif #ifndef __IOpcSignaturePartReference_FWD_DEFINED__ #define __IOpcSignaturePartReference_FWD_DEFINED__ typedef interface IOpcSignaturePartReference IOpcSignaturePartReference; +#ifdef __cplusplus +interface IOpcSignaturePartReference; +#endif /* __cplusplus */ #endif #ifndef __IOpcSignaturePartReferenceEnumerator_FWD_DEFINED__ #define __IOpcSignaturePartReferenceEnumerator_FWD_DEFINED__ typedef interface IOpcSignaturePartReferenceEnumerator IOpcSignaturePartReferenceEnumerator; +#ifdef __cplusplus +interface IOpcSignaturePartReferenceEnumerator; +#endif /* __cplusplus */ #endif #ifndef __IOpcSignatureReference_FWD_DEFINED__ #define __IOpcSignatureReference_FWD_DEFINED__ typedef interface IOpcSignatureReference IOpcSignatureReference; +#ifdef __cplusplus +interface IOpcSignatureReference; +#endif /* __cplusplus */ #endif #ifndef __IOpcSignatureReferenceEnumerator_FWD_DEFINED__ #define __IOpcSignatureReferenceEnumerator_FWD_DEFINED__ typedef interface IOpcSignatureReferenceEnumerator IOpcSignatureReferenceEnumerator; +#ifdef __cplusplus +interface IOpcSignatureReferenceEnumerator; +#endif /* __cplusplus */ #endif #ifndef __IOpcSignatureRelationshipReferenceEnumerator_FWD_DEFINED__ #define __IOpcSignatureRelationshipReferenceEnumerator_FWD_DEFINED__ typedef interface IOpcSignatureRelationshipReferenceEnumerator IOpcSignatureRelationshipReferenceEnumerator; +#ifdef __cplusplus +interface IOpcSignatureRelationshipReferenceEnumerator; +#endif /* __cplusplus */ #endif #ifndef __IOpcSignatureRelationshipReference_FWD_DEFINED__ #define __IOpcSignatureRelationshipReference_FWD_DEFINED__ typedef interface IOpcSignatureRelationshipReference IOpcSignatureRelationshipReference; +#ifdef __cplusplus +interface IOpcSignatureRelationshipReference; +#endif /* __cplusplus */ #endif #ifndef __IOpcRelationshipSelectorEnumerator_FWD_DEFINED__ #define __IOpcRelationshipSelectorEnumerator_FWD_DEFINED__ typedef interface IOpcRelationshipSelectorEnumerator IOpcRelationshipSelectorEnumerator; +#ifdef __cplusplus +interface IOpcRelationshipSelectorEnumerator; +#endif /* __cplusplus */ #endif #ifndef __IOpcCertificateEnumerator_FWD_DEFINED__ #define __IOpcCertificateEnumerator_FWD_DEFINED__ typedef interface IOpcCertificateEnumerator IOpcCertificateEnumerator; +#ifdef __cplusplus +interface IOpcCertificateEnumerator; +#endif /* __cplusplus */ #endif #ifndef __IOpcCertificateSet_FWD_DEFINED__ #define __IOpcCertificateSet_FWD_DEFINED__ typedef interface IOpcCertificateSet IOpcCertificateSet; +#ifdef __cplusplus +interface IOpcCertificateSet; +#endif /* __cplusplus */ #endif #ifndef __IOpcDigitalSignatureEnumerator_FWD_DEFINED__ #define __IOpcDigitalSignatureEnumerator_FWD_DEFINED__ typedef interface IOpcDigitalSignatureEnumerator IOpcDigitalSignatureEnumerator; +#ifdef __cplusplus +interface IOpcDigitalSignatureEnumerator; +#endif /* __cplusplus */ #endif #ifndef __IOpcDigitalSignatureManager_FWD_DEFINED__ #define __IOpcDigitalSignatureManager_FWD_DEFINED__ typedef interface IOpcDigitalSignatureManager IOpcDigitalSignatureManager; +#ifdef __cplusplus +interface IOpcDigitalSignatureManager; +#endif /* __cplusplus */ #endif #ifndef __IOpcSignaturePartReferenceSet_FWD_DEFINED__ #define __IOpcSignaturePartReferenceSet_FWD_DEFINED__ typedef interface IOpcSignaturePartReferenceSet IOpcSignaturePartReferenceSet; +#ifdef __cplusplus +interface IOpcSignaturePartReferenceSet; +#endif /* __cplusplus */ #endif #ifndef __IOpcRelationshipSelectorSet_FWD_DEFINED__ #define __IOpcRelationshipSelectorSet_FWD_DEFINED__ typedef interface IOpcRelationshipSelectorSet IOpcRelationshipSelectorSet; +#ifdef __cplusplus +interface IOpcRelationshipSelectorSet; +#endif /* __cplusplus */ #endif #ifndef __IOpcSignatureRelationshipReferenceSet_FWD_DEFINED__ #define __IOpcSignatureRelationshipReferenceSet_FWD_DEFINED__ typedef interface IOpcSignatureRelationshipReferenceSet IOpcSignatureRelationshipReferenceSet; +#ifdef __cplusplus +interface IOpcSignatureRelationshipReferenceSet; +#endif /* __cplusplus */ #endif #ifndef __IOpcSignatureReferenceSet_FWD_DEFINED__ #define __IOpcSignatureReferenceSet_FWD_DEFINED__ typedef interface IOpcSignatureReferenceSet IOpcSignatureReferenceSet; +#ifdef __cplusplus +interface IOpcSignatureReferenceSet; +#endif /* __cplusplus */ #endif #ifndef __IOpcSignatureCustomObjectSet_FWD_DEFINED__ #define __IOpcSignatureCustomObjectSet_FWD_DEFINED__ typedef interface IOpcSignatureCustomObjectSet IOpcSignatureCustomObjectSet; +#ifdef __cplusplus +interface IOpcSignatureCustomObjectSet; +#endif /* __cplusplus */ #endif #ifndef __IOpcDigitalSignature_FWD_DEFINED__ #define __IOpcDigitalSignature_FWD_DEFINED__ typedef interface IOpcDigitalSignature IOpcDigitalSignature; +#ifdef __cplusplus +interface IOpcDigitalSignature; +#endif /* __cplusplus */ #endif #ifndef __IOpcSigningOptions_FWD_DEFINED__ #define __IOpcSigningOptions_FWD_DEFINED__ typedef interface IOpcSigningOptions IOpcSigningOptions; +#ifdef __cplusplus +interface IOpcSigningOptions; +#endif /* __cplusplus */ #endif #ifndef __IOpcFactory_FWD_DEFINED__ #define __IOpcFactory_FWD_DEFINED__ typedef interface IOpcFactory IOpcFactory; +#ifdef __cplusplus +interface IOpcFactory; +#endif /* __cplusplus */ #endif #ifndef __OpcFactory_FWD_DEFINED__ @@ -197,11 +291,17 @@ extern "C" { #ifndef __IOpcUri_FWD_DEFINED__ #define __IOpcUri_FWD_DEFINED__ typedef interface IOpcUri IOpcUri; +#ifdef __cplusplus +interface IOpcUri; +#endif /* __cplusplus */ #endif #ifndef __IOpcPartUri_FWD_DEFINED__ #define __IOpcPartUri_FWD_DEFINED__ typedef interface IOpcPartUri IOpcPartUri; +#ifdef __cplusplus +interface IOpcPartUri; +#endif /* __cplusplus */ #endif /***************************************************************************** @@ -236,142 +336,143 @@ typedef struct IOpcUriVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcUri* This, + IOpcUri *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcUri* This); + IOpcUri *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcUri* This); + IOpcUri *This); /*** IUri methods ***/ HRESULT (STDMETHODCALLTYPE *GetPropertyBSTR)( - IOpcUri* This, + IOpcUri *This, Uri_PROPERTY uriProp, BSTR *pbstrProperty, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetPropertyLength)( - IOpcUri* This, + IOpcUri *This, Uri_PROPERTY uriProp, DWORD *pcchProperty, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetPropertyDWORD)( - IOpcUri* This, + IOpcUri *This, Uri_PROPERTY uriProp, DWORD *pdwProperty, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *HasProperty)( - IOpcUri* This, + IOpcUri *This, Uri_PROPERTY uriProp, WINBOOL *pfHasProperty); HRESULT (STDMETHODCALLTYPE *GetAbsoluteUri)( - IOpcUri* This, + IOpcUri *This, BSTR *pbstrAbsoluteUri); HRESULT (STDMETHODCALLTYPE *GetAuthority)( - IOpcUri* This, + IOpcUri *This, BSTR *pbstrAuthority); HRESULT (STDMETHODCALLTYPE *GetDisplayUri)( - IOpcUri* This, + IOpcUri *This, BSTR *pbstrDisplayString); HRESULT (STDMETHODCALLTYPE *GetDomain)( - IOpcUri* This, + IOpcUri *This, BSTR *pbstrDomain); HRESULT (STDMETHODCALLTYPE *GetExtension)( - IOpcUri* This, + IOpcUri *This, BSTR *pbstrExtension); HRESULT (STDMETHODCALLTYPE *GetFragment)( - IOpcUri* This, + IOpcUri *This, BSTR *pbstrFragment); HRESULT (STDMETHODCALLTYPE *GetHost)( - IOpcUri* This, + IOpcUri *This, BSTR *pbstrHost); HRESULT (STDMETHODCALLTYPE *GetPassword)( - IOpcUri* This, + IOpcUri *This, BSTR *pbstrPassword); HRESULT (STDMETHODCALLTYPE *GetPath)( - IOpcUri* This, + IOpcUri *This, BSTR *pbstrPath); HRESULT (STDMETHODCALLTYPE *GetPathAndQuery)( - IOpcUri* This, + IOpcUri *This, BSTR *pbstrPathAndQuery); HRESULT (STDMETHODCALLTYPE *GetQuery)( - IOpcUri* This, + IOpcUri *This, BSTR *pbstrQuery); HRESULT (STDMETHODCALLTYPE *GetRawUri)( - IOpcUri* This, + IOpcUri *This, BSTR *pbstrRawUri); HRESULT (STDMETHODCALLTYPE *GetSchemeName)( - IOpcUri* This, + IOpcUri *This, BSTR *pbstrSchemeName); HRESULT (STDMETHODCALLTYPE *GetUserInfo)( - IOpcUri* This, + IOpcUri *This, BSTR *pbstrUserInfo); HRESULT (STDMETHODCALLTYPE *GetUserName)( - IOpcUri* This, + IOpcUri *This, BSTR *pbstrUserName); HRESULT (STDMETHODCALLTYPE *GetHostType)( - IOpcUri* This, + IOpcUri *This, DWORD *pdwHostType); HRESULT (STDMETHODCALLTYPE *GetPort)( - IOpcUri* This, + IOpcUri *This, DWORD *pdwPort); HRESULT (STDMETHODCALLTYPE *GetScheme)( - IOpcUri* This, + IOpcUri *This, DWORD *pdwScheme); HRESULT (STDMETHODCALLTYPE *GetZone)( - IOpcUri* This, + IOpcUri *This, DWORD *pdwZone); HRESULT (STDMETHODCALLTYPE *GetProperties)( - IOpcUri* This, + IOpcUri *This, LPDWORD pdwFlags); HRESULT (STDMETHODCALLTYPE *IsEqual)( - IOpcUri* This, + IOpcUri *This, IUri *pUri, WINBOOL *pfEqual); /*** IOpcUri methods ***/ HRESULT (STDMETHODCALLTYPE *GetRelationshipsPartUri)( - IOpcUri* This, + IOpcUri *This, IOpcPartUri **relationshipPartUri); HRESULT (STDMETHODCALLTYPE *GetRelativeUri)( - IOpcUri* This, + IOpcUri *This, IOpcPartUri *targetPartUri, IUri **relativeUri); HRESULT (STDMETHODCALLTYPE *CombinePartUri)( - IOpcUri* This, + IOpcUri *This, IUri *relativeUri, IOpcPartUri **combinedUri); END_INTERFACE } IOpcUriVtbl; + interface IOpcUri { CONST_VTBL IOpcUriVtbl* lpVtbl; }; @@ -514,32 +615,6 @@ static FORCEINLINE HRESULT IOpcUri_CombinePartUri(IOpcUri* This,IUri *relativeUr #endif -HRESULT STDMETHODCALLTYPE IOpcUri_GetRelationshipsPartUri_Proxy( - IOpcUri* This, - IOpcPartUri **relationshipPartUri); -void __RPC_STUB IOpcUri_GetRelationshipsPartUri_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcUri_GetRelativeUri_Proxy( - IOpcUri* This, - IOpcPartUri *targetPartUri, - IUri **relativeUri); -void __RPC_STUB IOpcUri_GetRelativeUri_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcUri_CombinePartUri_Proxy( - IOpcUri* This, - IUri *relativeUri, - IOpcPartUri **combinedUri); -void __RPC_STUB IOpcUri_CombinePartUri_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcUri_INTERFACE_DEFINED__ */ @@ -574,156 +649,157 @@ typedef struct IOpcPartUriVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcPartUri* This, + IOpcPartUri *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcPartUri* This); + IOpcPartUri *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcPartUri* This); + IOpcPartUri *This); /*** IUri methods ***/ HRESULT (STDMETHODCALLTYPE *GetPropertyBSTR)( - IOpcPartUri* This, + IOpcPartUri *This, Uri_PROPERTY uriProp, BSTR *pbstrProperty, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetPropertyLength)( - IOpcPartUri* This, + IOpcPartUri *This, Uri_PROPERTY uriProp, DWORD *pcchProperty, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetPropertyDWORD)( - IOpcPartUri* This, + IOpcPartUri *This, Uri_PROPERTY uriProp, DWORD *pdwProperty, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *HasProperty)( - IOpcPartUri* This, + IOpcPartUri *This, Uri_PROPERTY uriProp, WINBOOL *pfHasProperty); HRESULT (STDMETHODCALLTYPE *GetAbsoluteUri)( - IOpcPartUri* This, + IOpcPartUri *This, BSTR *pbstrAbsoluteUri); HRESULT (STDMETHODCALLTYPE *GetAuthority)( - IOpcPartUri* This, + IOpcPartUri *This, BSTR *pbstrAuthority); HRESULT (STDMETHODCALLTYPE *GetDisplayUri)( - IOpcPartUri* This, + IOpcPartUri *This, BSTR *pbstrDisplayString); HRESULT (STDMETHODCALLTYPE *GetDomain)( - IOpcPartUri* This, + IOpcPartUri *This, BSTR *pbstrDomain); HRESULT (STDMETHODCALLTYPE *GetExtension)( - IOpcPartUri* This, + IOpcPartUri *This, BSTR *pbstrExtension); HRESULT (STDMETHODCALLTYPE *GetFragment)( - IOpcPartUri* This, + IOpcPartUri *This, BSTR *pbstrFragment); HRESULT (STDMETHODCALLTYPE *GetHost)( - IOpcPartUri* This, + IOpcPartUri *This, BSTR *pbstrHost); HRESULT (STDMETHODCALLTYPE *GetPassword)( - IOpcPartUri* This, + IOpcPartUri *This, BSTR *pbstrPassword); HRESULT (STDMETHODCALLTYPE *GetPath)( - IOpcPartUri* This, + IOpcPartUri *This, BSTR *pbstrPath); HRESULT (STDMETHODCALLTYPE *GetPathAndQuery)( - IOpcPartUri* This, + IOpcPartUri *This, BSTR *pbstrPathAndQuery); HRESULT (STDMETHODCALLTYPE *GetQuery)( - IOpcPartUri* This, + IOpcPartUri *This, BSTR *pbstrQuery); HRESULT (STDMETHODCALLTYPE *GetRawUri)( - IOpcPartUri* This, + IOpcPartUri *This, BSTR *pbstrRawUri); HRESULT (STDMETHODCALLTYPE *GetSchemeName)( - IOpcPartUri* This, + IOpcPartUri *This, BSTR *pbstrSchemeName); HRESULT (STDMETHODCALLTYPE *GetUserInfo)( - IOpcPartUri* This, + IOpcPartUri *This, BSTR *pbstrUserInfo); HRESULT (STDMETHODCALLTYPE *GetUserName)( - IOpcPartUri* This, + IOpcPartUri *This, BSTR *pbstrUserName); HRESULT (STDMETHODCALLTYPE *GetHostType)( - IOpcPartUri* This, + IOpcPartUri *This, DWORD *pdwHostType); HRESULT (STDMETHODCALLTYPE *GetPort)( - IOpcPartUri* This, + IOpcPartUri *This, DWORD *pdwPort); HRESULT (STDMETHODCALLTYPE *GetScheme)( - IOpcPartUri* This, + IOpcPartUri *This, DWORD *pdwScheme); HRESULT (STDMETHODCALLTYPE *GetZone)( - IOpcPartUri* This, + IOpcPartUri *This, DWORD *pdwZone); HRESULT (STDMETHODCALLTYPE *GetProperties)( - IOpcPartUri* This, + IOpcPartUri *This, LPDWORD pdwFlags); HRESULT (STDMETHODCALLTYPE *IsEqual)( - IOpcPartUri* This, + IOpcPartUri *This, IUri *pUri, WINBOOL *pfEqual); /*** IOpcUri methods ***/ HRESULT (STDMETHODCALLTYPE *GetRelationshipsPartUri)( - IOpcPartUri* This, + IOpcPartUri *This, IOpcPartUri **relationshipPartUri); HRESULT (STDMETHODCALLTYPE *GetRelativeUri)( - IOpcPartUri* This, + IOpcPartUri *This, IOpcPartUri *targetPartUri, IUri **relativeUri); HRESULT (STDMETHODCALLTYPE *CombinePartUri)( - IOpcPartUri* This, + IOpcPartUri *This, IUri *relativeUri, IOpcPartUri **combinedUri); /*** IOpcPartUri methods ***/ HRESULT (STDMETHODCALLTYPE *ComparePartUri)( - IOpcPartUri* This, + IOpcPartUri *This, IOpcPartUri *partUri, INT32 *comparisonResult); HRESULT (STDMETHODCALLTYPE *GetSourceUri)( - IOpcPartUri* This, + IOpcPartUri *This, IOpcUri **sourceUri); HRESULT (STDMETHODCALLTYPE *IsRelationshipsPartUri)( - IOpcPartUri* This, + IOpcPartUri *This, WINBOOL *isRelationshipUri); END_INTERFACE } IOpcPartUriVtbl; + interface IOpcPartUri { CONST_VTBL IOpcPartUriVtbl* lpVtbl; }; @@ -880,31 +956,6 @@ static FORCEINLINE HRESULT IOpcPartUri_IsRelationshipsPartUri(IOpcPartUri* This, #endif -HRESULT STDMETHODCALLTYPE IOpcPartUri_ComparePartUri_Proxy( - IOpcPartUri* This, - IOpcPartUri *partUri, - INT32 *comparisonResult); -void __RPC_STUB IOpcPartUri_ComparePartUri_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcPartUri_GetSourceUri_Proxy( - IOpcPartUri* This, - IOpcUri **sourceUri); -void __RPC_STUB IOpcPartUri_GetSourceUri_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcPartUri_IsRelationshipsPartUri_Proxy( - IOpcPartUri* This, - WINBOOL *isRelationshipUri); -void __RPC_STUB IOpcPartUri_IsRelationshipsPartUri_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcPartUri_INTERFACE_DEFINED__ */ @@ -1019,151 +1070,241 @@ DEFINE_GUID(LIBID_MSOPC, 0x3d8d6062, 0x2749, 0x442b, 0x9e,0x32, 0xe4,0x0e,0xf8,0 #ifndef __IOpcCertificateEnumerator_FWD_DEFINED__ #define __IOpcCertificateEnumerator_FWD_DEFINED__ typedef interface IOpcCertificateEnumerator IOpcCertificateEnumerator; +#ifdef __cplusplus +interface IOpcCertificateEnumerator; +#endif /* __cplusplus */ #endif #ifndef __IOpcCertificateSet_FWD_DEFINED__ #define __IOpcCertificateSet_FWD_DEFINED__ typedef interface IOpcCertificateSet IOpcCertificateSet; +#ifdef __cplusplus +interface IOpcCertificateSet; +#endif /* __cplusplus */ #endif #ifndef __IOpcDigitalSignature_FWD_DEFINED__ #define __IOpcDigitalSignature_FWD_DEFINED__ typedef interface IOpcDigitalSignature IOpcDigitalSignature; +#ifdef __cplusplus +interface IOpcDigitalSignature; +#endif /* __cplusplus */ #endif #ifndef __IOpcDigitalSignatureEnumerator_FWD_DEFINED__ #define __IOpcDigitalSignatureEnumerator_FWD_DEFINED__ typedef interface IOpcDigitalSignatureEnumerator IOpcDigitalSignatureEnumerator; +#ifdef __cplusplus +interface IOpcDigitalSignatureEnumerator; +#endif /* __cplusplus */ #endif #ifndef __IOpcDigitalSignatureManager_FWD_DEFINED__ #define __IOpcDigitalSignatureManager_FWD_DEFINED__ typedef interface IOpcDigitalSignatureManager IOpcDigitalSignatureManager; +#ifdef __cplusplus +interface IOpcDigitalSignatureManager; +#endif /* __cplusplus */ #endif #ifndef __IOpcPackage_FWD_DEFINED__ #define __IOpcPackage_FWD_DEFINED__ typedef interface IOpcPackage IOpcPackage; +#ifdef __cplusplus +interface IOpcPackage; +#endif /* __cplusplus */ #endif #ifndef __IOpcPart_FWD_DEFINED__ #define __IOpcPart_FWD_DEFINED__ typedef interface IOpcPart IOpcPart; +#ifdef __cplusplus +interface IOpcPart; +#endif /* __cplusplus */ #endif #ifndef __IOpcPartEnumerator_FWD_DEFINED__ #define __IOpcPartEnumerator_FWD_DEFINED__ typedef interface IOpcPartEnumerator IOpcPartEnumerator; +#ifdef __cplusplus +interface IOpcPartEnumerator; +#endif /* __cplusplus */ #endif #ifndef __IOpcPartSet_FWD_DEFINED__ #define __IOpcPartSet_FWD_DEFINED__ typedef interface IOpcPartSet IOpcPartSet; +#ifdef __cplusplus +interface IOpcPartSet; +#endif /* __cplusplus */ #endif #ifndef __IOpcPartUri_FWD_DEFINED__ #define __IOpcPartUri_FWD_DEFINED__ typedef interface IOpcPartUri IOpcPartUri; +#ifdef __cplusplus +interface IOpcPartUri; +#endif /* __cplusplus */ #endif #ifndef __IOpcRelationship_FWD_DEFINED__ #define __IOpcRelationship_FWD_DEFINED__ typedef interface IOpcRelationship IOpcRelationship; +#ifdef __cplusplus +interface IOpcRelationship; +#endif /* __cplusplus */ #endif #ifndef __IOpcRelationshipEnumerator_FWD_DEFINED__ #define __IOpcRelationshipEnumerator_FWD_DEFINED__ typedef interface IOpcRelationshipEnumerator IOpcRelationshipEnumerator; +#ifdef __cplusplus +interface IOpcRelationshipEnumerator; +#endif /* __cplusplus */ #endif #ifndef __IOpcRelationshipSelector_FWD_DEFINED__ #define __IOpcRelationshipSelector_FWD_DEFINED__ typedef interface IOpcRelationshipSelector IOpcRelationshipSelector; +#ifdef __cplusplus +interface IOpcRelationshipSelector; +#endif /* __cplusplus */ #endif #ifndef __IOpcRelationshipSelectorSet_FWD_DEFINED__ #define __IOpcRelationshipSelectorSet_FWD_DEFINED__ typedef interface IOpcRelationshipSelectorSet IOpcRelationshipSelectorSet; +#ifdef __cplusplus +interface IOpcRelationshipSelectorSet; +#endif /* __cplusplus */ #endif #ifndef __IOpcRelationshipSet_FWD_DEFINED__ #define __IOpcRelationshipSet_FWD_DEFINED__ typedef interface IOpcRelationshipSet IOpcRelationshipSet; +#ifdef __cplusplus +interface IOpcRelationshipSet; +#endif /* __cplusplus */ #endif #ifndef __IOpcSigningOptions_FWD_DEFINED__ #define __IOpcSigningOptions_FWD_DEFINED__ typedef interface IOpcSigningOptions IOpcSigningOptions; +#ifdef __cplusplus +interface IOpcSigningOptions; +#endif /* __cplusplus */ #endif #ifndef __IOpcSignatureCustomObject_FWD_DEFINED__ #define __IOpcSignatureCustomObject_FWD_DEFINED__ typedef interface IOpcSignatureCustomObject IOpcSignatureCustomObject; +#ifdef __cplusplus +interface IOpcSignatureCustomObject; +#endif /* __cplusplus */ #endif #ifndef __IOpcSignatureCustomObjectSet_FWD_DEFINED__ #define __IOpcSignatureCustomObjectSet_FWD_DEFINED__ typedef interface IOpcSignatureCustomObjectSet IOpcSignatureCustomObjectSet; +#ifdef __cplusplus +interface IOpcSignatureCustomObjectSet; +#endif /* __cplusplus */ #endif #ifndef __IOpcSignaturePartReference_FWD_DEFINED__ #define __IOpcSignaturePartReference_FWD_DEFINED__ typedef interface IOpcSignaturePartReference IOpcSignaturePartReference; +#ifdef __cplusplus +interface IOpcSignaturePartReference; +#endif /* __cplusplus */ #endif #ifndef __IOpcSignaturePartReferenceEnumerator_FWD_DEFINED__ #define __IOpcSignaturePartReferenceEnumerator_FWD_DEFINED__ typedef interface IOpcSignaturePartReferenceEnumerator IOpcSignaturePartReferenceEnumerator; +#ifdef __cplusplus +interface IOpcSignaturePartReferenceEnumerator; +#endif /* __cplusplus */ #endif #ifndef __IOpcSignaturePartReferenceSet_FWD_DEFINED__ #define __IOpcSignaturePartReferenceSet_FWD_DEFINED__ typedef interface IOpcSignaturePartReferenceSet IOpcSignaturePartReferenceSet; +#ifdef __cplusplus +interface IOpcSignaturePartReferenceSet; +#endif /* __cplusplus */ #endif #ifndef __IOpcSignatureReference_FWD_DEFINED__ #define __IOpcSignatureReference_FWD_DEFINED__ typedef interface IOpcSignatureReference IOpcSignatureReference; +#ifdef __cplusplus +interface IOpcSignatureReference; +#endif /* __cplusplus */ #endif #ifndef __IOpcSignatureReferenceSet_FWD_DEFINED__ #define __IOpcSignatureReferenceSet_FWD_DEFINED__ typedef interface IOpcSignatureReferenceSet IOpcSignatureReferenceSet; +#ifdef __cplusplus +interface IOpcSignatureReferenceSet; +#endif /* __cplusplus */ #endif #ifndef __IOpcSignatureRelationshipReference_FWD_DEFINED__ #define __IOpcSignatureRelationshipReference_FWD_DEFINED__ typedef interface IOpcSignatureRelationshipReference IOpcSignatureRelationshipReference; +#ifdef __cplusplus +interface IOpcSignatureRelationshipReference; +#endif /* __cplusplus */ #endif #ifndef __IOpcSignatureRelationshipReferenceEnumerator_FWD_DEFINED__ #define __IOpcSignatureRelationshipReferenceEnumerator_FWD_DEFINED__ typedef interface IOpcSignatureRelationshipReferenceEnumerator IOpcSignatureRelationshipReferenceEnumerator; +#ifdef __cplusplus +interface IOpcSignatureRelationshipReferenceEnumerator; +#endif /* __cplusplus */ #endif #ifndef __IOpcSignatureRelationshipReferenceSet_FWD_DEFINED__ #define __IOpcSignatureRelationshipReferenceSet_FWD_DEFINED__ typedef interface IOpcSignatureRelationshipReferenceSet IOpcSignatureRelationshipReferenceSet; +#ifdef __cplusplus +interface IOpcSignatureRelationshipReferenceSet; +#endif /* __cplusplus */ #endif #ifndef __IOpcRelationshipSelectorEnumerator_FWD_DEFINED__ #define __IOpcRelationshipSelectorEnumerator_FWD_DEFINED__ typedef interface IOpcRelationshipSelectorEnumerator IOpcRelationshipSelectorEnumerator; +#ifdef __cplusplus +interface IOpcRelationshipSelectorEnumerator; +#endif /* __cplusplus */ #endif #ifndef __IOpcSignatureReferenceEnumerator_FWD_DEFINED__ #define __IOpcSignatureReferenceEnumerator_FWD_DEFINED__ typedef interface IOpcSignatureReferenceEnumerator IOpcSignatureReferenceEnumerator; +#ifdef __cplusplus +interface IOpcSignatureReferenceEnumerator; +#endif /* __cplusplus */ #endif #ifndef __IOpcSignatureCustomObjectEnumerator_FWD_DEFINED__ #define __IOpcSignatureCustomObjectEnumerator_FWD_DEFINED__ typedef interface IOpcSignatureCustomObjectEnumerator IOpcSignatureCustomObjectEnumerator; +#ifdef __cplusplus +interface IOpcSignatureCustomObjectEnumerator; +#endif /* __cplusplus */ #endif #ifndef __IOpcUri_FWD_DEFINED__ #define __IOpcUri_FWD_DEFINED__ typedef interface IOpcUri IOpcUri; +#ifdef __cplusplus +interface IOpcUri; +#endif /* __cplusplus */ #endif typedef enum __WIDL_msopc_generated_name_00000016 { @@ -1258,39 +1399,40 @@ typedef struct IOpcPartVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcPart* This, + IOpcPart *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcPart* This); + IOpcPart *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcPart* This); + IOpcPart *This); /*** IOpcPart methods ***/ HRESULT (STDMETHODCALLTYPE *GetRelationshipSet)( - IOpcPart* This, + IOpcPart *This, IOpcRelationshipSet **relationshipSet); HRESULT (STDMETHODCALLTYPE *GetContentStream)( - IOpcPart* This, + IOpcPart *This, IStream **stream); HRESULT (STDMETHODCALLTYPE *GetName)( - IOpcPart* This, + IOpcPart *This, IOpcPartUri **name); HRESULT (STDMETHODCALLTYPE *GetContentType)( - IOpcPart* This, + IOpcPart *This, LPWSTR *contentType); HRESULT (STDMETHODCALLTYPE *GetCompressionOptions)( - IOpcPart* This, + IOpcPart *This, OPC_COMPRESSION_OPTIONS *compressionOptions); END_INTERFACE } IOpcPartVtbl; + interface IOpcPart { CONST_VTBL IOpcPartVtbl* lpVtbl; }; @@ -1339,46 +1481,6 @@ static FORCEINLINE HRESULT IOpcPart_GetCompressionOptions(IOpcPart* This,OPC_COM #endif -HRESULT STDMETHODCALLTYPE IOpcPart_GetRelationshipSet_Proxy( - IOpcPart* This, - IOpcRelationshipSet **relationshipSet); -void __RPC_STUB IOpcPart_GetRelationshipSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcPart_GetContentStream_Proxy( - IOpcPart* This, - IStream **stream); -void __RPC_STUB IOpcPart_GetContentStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcPart_GetName_Proxy( - IOpcPart* This, - IOpcPartUri **name); -void __RPC_STUB IOpcPart_GetName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcPart_GetContentType_Proxy( - IOpcPart* This, - LPWSTR *contentType); -void __RPC_STUB IOpcPart_GetContentType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcPart_GetCompressionOptions_Proxy( - IOpcPart* This, - OPC_COMPRESSION_OPTIONS *compressionOptions); -void __RPC_STUB IOpcPart_GetCompressionOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcPart_INTERFACE_DEFINED__ */ @@ -1415,35 +1517,36 @@ typedef struct IOpcPartEnumeratorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcPartEnumerator* This, + IOpcPartEnumerator *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcPartEnumerator* This); + IOpcPartEnumerator *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcPartEnumerator* This); + IOpcPartEnumerator *This); /*** IOpcPartEnumerator methods ***/ HRESULT (STDMETHODCALLTYPE *MoveNext)( - IOpcPartEnumerator* This, + IOpcPartEnumerator *This, WINBOOL *hasNext); HRESULT (STDMETHODCALLTYPE *MovePrevious)( - IOpcPartEnumerator* This, + IOpcPartEnumerator *This, WINBOOL *hasPrevious); HRESULT (STDMETHODCALLTYPE *GetCurrent)( - IOpcPartEnumerator* This, + IOpcPartEnumerator *This, IOpcPart **part); HRESULT (STDMETHODCALLTYPE *Clone)( - IOpcPartEnumerator* This, + IOpcPartEnumerator *This, IOpcPartEnumerator **copy); END_INTERFACE } IOpcPartEnumeratorVtbl; + interface IOpcPartEnumerator { CONST_VTBL IOpcPartEnumeratorVtbl* lpVtbl; }; @@ -1488,38 +1591,6 @@ static FORCEINLINE HRESULT IOpcPartEnumerator_Clone(IOpcPartEnumerator* This,IOp #endif -HRESULT STDMETHODCALLTYPE IOpcPartEnumerator_MoveNext_Proxy( - IOpcPartEnumerator* This, - WINBOOL *hasNext); -void __RPC_STUB IOpcPartEnumerator_MoveNext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcPartEnumerator_MovePrevious_Proxy( - IOpcPartEnumerator* This, - WINBOOL *hasPrevious); -void __RPC_STUB IOpcPartEnumerator_MovePrevious_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcPartEnumerator_GetCurrent_Proxy( - IOpcPartEnumerator* This, - IOpcPart **part); -void __RPC_STUB IOpcPartEnumerator_GetCurrent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcPartEnumerator_Clone_Proxy( - IOpcPartEnumerator* This, - IOpcPartEnumerator **copy); -void __RPC_STUB IOpcPartEnumerator_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcPartEnumerator_INTERFACE_DEFINED__ */ @@ -1564,44 +1635,45 @@ typedef struct IOpcPartSetVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcPartSet* This, + IOpcPartSet *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcPartSet* This); + IOpcPartSet *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcPartSet* This); + IOpcPartSet *This); /*** IOpcPartSet methods ***/ HRESULT (STDMETHODCALLTYPE *GetPart)( - IOpcPartSet* This, + IOpcPartSet *This, IOpcPartUri *name, IOpcPart **part); HRESULT (STDMETHODCALLTYPE *CreatePart)( - IOpcPartSet* This, + IOpcPartSet *This, IOpcPartUri *name, LPCWSTR contentType, OPC_COMPRESSION_OPTIONS compressionOptions, IOpcPart **part); HRESULT (STDMETHODCALLTYPE *DeletePart)( - IOpcPartSet* This, + IOpcPartSet *This, IOpcPartUri *name); HRESULT (STDMETHODCALLTYPE *PartExists)( - IOpcPartSet* This, + IOpcPartSet *This, IOpcPartUri *name, WINBOOL *partExists); HRESULT (STDMETHODCALLTYPE *GetEnumerator)( - IOpcPartSet* This, + IOpcPartSet *This, IOpcPartEnumerator **partEnumerator); END_INTERFACE } IOpcPartSetVtbl; + interface IOpcPartSet { CONST_VTBL IOpcPartSetVtbl* lpVtbl; }; @@ -1650,51 +1722,6 @@ static FORCEINLINE HRESULT IOpcPartSet_GetEnumerator(IOpcPartSet* This,IOpcPartE #endif -HRESULT STDMETHODCALLTYPE IOpcPartSet_GetPart_Proxy( - IOpcPartSet* This, - IOpcPartUri *name, - IOpcPart **part); -void __RPC_STUB IOpcPartSet_GetPart_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcPartSet_CreatePart_Proxy( - IOpcPartSet* This, - IOpcPartUri *name, - LPCWSTR contentType, - OPC_COMPRESSION_OPTIONS compressionOptions, - IOpcPart **part); -void __RPC_STUB IOpcPartSet_CreatePart_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcPartSet_DeletePart_Proxy( - IOpcPartSet* This, - IOpcPartUri *name); -void __RPC_STUB IOpcPartSet_DeletePart_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcPartSet_PartExists_Proxy( - IOpcPartSet* This, - IOpcPartUri *name, - WINBOOL *partExists); -void __RPC_STUB IOpcPartSet_PartExists_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcPartSet_GetEnumerator_Proxy( - IOpcPartSet* This, - IOpcPartEnumerator **partEnumerator); -void __RPC_STUB IOpcPartSet_GetEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcPartSet_INTERFACE_DEFINED__ */ @@ -1725,27 +1752,28 @@ typedef struct IOpcPackageVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcPackage* This, + IOpcPackage *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcPackage* This); + IOpcPackage *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcPackage* This); + IOpcPackage *This); /*** IOpcPackage methods ***/ HRESULT (STDMETHODCALLTYPE *GetPartSet)( - IOpcPackage* This, + IOpcPackage *This, IOpcPartSet **partSet); HRESULT (STDMETHODCALLTYPE *GetRelationshipSet)( - IOpcPackage* This, + IOpcPackage *This, IOpcRelationshipSet **relationshipSet); END_INTERFACE } IOpcPackageVtbl; + interface IOpcPackage { CONST_VTBL IOpcPackageVtbl* lpVtbl; }; @@ -1782,22 +1810,6 @@ static FORCEINLINE HRESULT IOpcPackage_GetRelationshipSet(IOpcPackage* This,IOpc #endif -HRESULT STDMETHODCALLTYPE IOpcPackage_GetPartSet_Proxy( - IOpcPackage* This, - IOpcPartSet **partSet); -void __RPC_STUB IOpcPackage_GetPartSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcPackage_GetRelationshipSet_Proxy( - IOpcPackage* This, - IOpcRelationshipSet **relationshipSet); -void __RPC_STUB IOpcPackage_GetRelationshipSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcPackage_INTERFACE_DEFINED__ */ @@ -1837,39 +1849,40 @@ typedef struct IOpcRelationshipVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcRelationship* This, + IOpcRelationship *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcRelationship* This); + IOpcRelationship *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcRelationship* This); + IOpcRelationship *This); /*** IOpcRelationship methods ***/ HRESULT (STDMETHODCALLTYPE *GetId)( - IOpcRelationship* This, + IOpcRelationship *This, LPWSTR *relationshipIdentifier); HRESULT (STDMETHODCALLTYPE *GetRelationshipType)( - IOpcRelationship* This, + IOpcRelationship *This, LPWSTR *relationshipType); HRESULT (STDMETHODCALLTYPE *GetSourceUri)( - IOpcRelationship* This, + IOpcRelationship *This, IOpcUri **sourceUri); HRESULT (STDMETHODCALLTYPE *GetTargetUri)( - IOpcRelationship* This, + IOpcRelationship *This, IUri **targetUri); HRESULT (STDMETHODCALLTYPE *GetTargetMode)( - IOpcRelationship* This, + IOpcRelationship *This, OPC_URI_TARGET_MODE *targetMode); END_INTERFACE } IOpcRelationshipVtbl; + interface IOpcRelationship { CONST_VTBL IOpcRelationshipVtbl* lpVtbl; }; @@ -1918,46 +1931,6 @@ static FORCEINLINE HRESULT IOpcRelationship_GetTargetMode(IOpcRelationship* This #endif -HRESULT STDMETHODCALLTYPE IOpcRelationship_GetId_Proxy( - IOpcRelationship* This, - LPWSTR *relationshipIdentifier); -void __RPC_STUB IOpcRelationship_GetId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcRelationship_GetRelationshipType_Proxy( - IOpcRelationship* This, - LPWSTR *relationshipType); -void __RPC_STUB IOpcRelationship_GetRelationshipType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcRelationship_GetSourceUri_Proxy( - IOpcRelationship* This, - IOpcUri **sourceUri); -void __RPC_STUB IOpcRelationship_GetSourceUri_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcRelationship_GetTargetUri_Proxy( - IOpcRelationship* This, - IUri **targetUri); -void __RPC_STUB IOpcRelationship_GetTargetUri_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcRelationship_GetTargetMode_Proxy( - IOpcRelationship* This, - OPC_URI_TARGET_MODE *targetMode); -void __RPC_STUB IOpcRelationship_GetTargetMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcRelationship_INTERFACE_DEFINED__ */ @@ -1994,35 +1967,36 @@ typedef struct IOpcRelationshipEnumeratorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcRelationshipEnumerator* This, + IOpcRelationshipEnumerator *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcRelationshipEnumerator* This); + IOpcRelationshipEnumerator *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcRelationshipEnumerator* This); + IOpcRelationshipEnumerator *This); /*** IOpcRelationshipEnumerator methods ***/ HRESULT (STDMETHODCALLTYPE *MoveNext)( - IOpcRelationshipEnumerator* This, + IOpcRelationshipEnumerator *This, WINBOOL *hasNext); HRESULT (STDMETHODCALLTYPE *MovePrevious)( - IOpcRelationshipEnumerator* This, + IOpcRelationshipEnumerator *This, WINBOOL *hasPrevious); HRESULT (STDMETHODCALLTYPE *GetCurrent)( - IOpcRelationshipEnumerator* This, + IOpcRelationshipEnumerator *This, IOpcRelationship **relationship); HRESULT (STDMETHODCALLTYPE *Clone)( - IOpcRelationshipEnumerator* This, + IOpcRelationshipEnumerator *This, IOpcRelationshipEnumerator **copy); END_INTERFACE } IOpcRelationshipEnumeratorVtbl; + interface IOpcRelationshipEnumerator { CONST_VTBL IOpcRelationshipEnumeratorVtbl* lpVtbl; }; @@ -2067,38 +2041,6 @@ static FORCEINLINE HRESULT IOpcRelationshipEnumerator_Clone(IOpcRelationshipEnum #endif -HRESULT STDMETHODCALLTYPE IOpcRelationshipEnumerator_MoveNext_Proxy( - IOpcRelationshipEnumerator* This, - WINBOOL *hasNext); -void __RPC_STUB IOpcRelationshipEnumerator_MoveNext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcRelationshipEnumerator_MovePrevious_Proxy( - IOpcRelationshipEnumerator* This, - WINBOOL *hasPrevious); -void __RPC_STUB IOpcRelationshipEnumerator_MovePrevious_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcRelationshipEnumerator_GetCurrent_Proxy( - IOpcRelationshipEnumerator* This, - IOpcRelationship **relationship); -void __RPC_STUB IOpcRelationshipEnumerator_GetCurrent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcRelationshipEnumerator_Clone_Proxy( - IOpcRelationshipEnumerator* This, - IOpcRelationshipEnumerator **copy); -void __RPC_STUB IOpcRelationshipEnumerator_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcRelationshipEnumerator_INTERFACE_DEFINED__ */ @@ -2129,27 +2071,28 @@ typedef struct IOpcRelationshipSelectorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcRelationshipSelector* This, + IOpcRelationshipSelector *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcRelationshipSelector* This); + IOpcRelationshipSelector *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcRelationshipSelector* This); + IOpcRelationshipSelector *This); /*** IOpcRelationshipSelector methods ***/ HRESULT (STDMETHODCALLTYPE *GetSelectorType)( - IOpcRelationshipSelector* This, + IOpcRelationshipSelector *This, OPC_RELATIONSHIP_SELECTOR *selector); HRESULT (STDMETHODCALLTYPE *GetSelectionCriterion)( - IOpcRelationshipSelector* This, + IOpcRelationshipSelector *This, LPWSTR *selectionCriterion); END_INTERFACE } IOpcRelationshipSelectorVtbl; + interface IOpcRelationshipSelector { CONST_VTBL IOpcRelationshipSelectorVtbl* lpVtbl; }; @@ -2186,22 +2129,6 @@ static FORCEINLINE HRESULT IOpcRelationshipSelector_GetSelectionCriterion(IOpcRe #endif -HRESULT STDMETHODCALLTYPE IOpcRelationshipSelector_GetSelectorType_Proxy( - IOpcRelationshipSelector* This, - OPC_RELATIONSHIP_SELECTOR *selector); -void __RPC_STUB IOpcRelationshipSelector_GetSelectorType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcRelationshipSelector_GetSelectionCriterion_Proxy( - IOpcRelationshipSelector* This, - LPWSTR *selectionCriterion); -void __RPC_STUB IOpcRelationshipSelector_GetSelectionCriterion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcRelationshipSelector_INTERFACE_DEFINED__ */ @@ -2254,24 +2181,24 @@ typedef struct IOpcRelationshipSetVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcRelationshipSet* This, + IOpcRelationshipSet *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcRelationshipSet* This); + IOpcRelationshipSet *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcRelationshipSet* This); + IOpcRelationshipSet *This); /*** IOpcRelationshipSet methods ***/ HRESULT (STDMETHODCALLTYPE *GetRelationship)( - IOpcRelationshipSet* This, + IOpcRelationshipSet *This, LPCWSTR relationshipIdentifier, IOpcRelationship **relationship); HRESULT (STDMETHODCALLTYPE *CreateRelationship)( - IOpcRelationshipSet* This, + IOpcRelationshipSet *This, LPCWSTR relationshipIdentifier, LPCWSTR relationshipType, IUri *targetUri, @@ -2279,29 +2206,30 @@ typedef struct IOpcRelationshipSetVtbl { IOpcRelationship **relationship); HRESULT (STDMETHODCALLTYPE *DeleteRelationship)( - IOpcRelationshipSet* This, + IOpcRelationshipSet *This, LPCWSTR relationshipIdentifier); HRESULT (STDMETHODCALLTYPE *RelationshipExists)( - IOpcRelationshipSet* This, + IOpcRelationshipSet *This, LPCWSTR relationshipIdentifier, WINBOOL *relationshipExists); HRESULT (STDMETHODCALLTYPE *GetEnumerator)( - IOpcRelationshipSet* This, + IOpcRelationshipSet *This, IOpcRelationshipEnumerator **relationshipEnumerator); HRESULT (STDMETHODCALLTYPE *GetEnumeratorForType)( - IOpcRelationshipSet* This, + IOpcRelationshipSet *This, LPCWSTR relationshipType, IOpcRelationshipEnumerator **relationshipEnumerator); HRESULT (STDMETHODCALLTYPE *GetRelationshipsContentStream)( - IOpcRelationshipSet* This, + IOpcRelationshipSet *This, IStream **contents); END_INTERFACE } IOpcRelationshipSetVtbl; + interface IOpcRelationshipSet { CONST_VTBL IOpcRelationshipSetVtbl* lpVtbl; }; @@ -2358,69 +2286,6 @@ static FORCEINLINE HRESULT IOpcRelationshipSet_GetRelationshipsContentStream(IOp #endif -HRESULT STDMETHODCALLTYPE IOpcRelationshipSet_GetRelationship_Proxy( - IOpcRelationshipSet* This, - LPCWSTR relationshipIdentifier, - IOpcRelationship **relationship); -void __RPC_STUB IOpcRelationshipSet_GetRelationship_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcRelationshipSet_CreateRelationship_Proxy( - IOpcRelationshipSet* This, - LPCWSTR relationshipIdentifier, - LPCWSTR relationshipType, - IUri *targetUri, - OPC_URI_TARGET_MODE targetMode, - IOpcRelationship **relationship); -void __RPC_STUB IOpcRelationshipSet_CreateRelationship_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcRelationshipSet_DeleteRelationship_Proxy( - IOpcRelationshipSet* This, - LPCWSTR relationshipIdentifier); -void __RPC_STUB IOpcRelationshipSet_DeleteRelationship_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcRelationshipSet_RelationshipExists_Proxy( - IOpcRelationshipSet* This, - LPCWSTR relationshipIdentifier, - WINBOOL *relationshipExists); -void __RPC_STUB IOpcRelationshipSet_RelationshipExists_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcRelationshipSet_GetEnumerator_Proxy( - IOpcRelationshipSet* This, - IOpcRelationshipEnumerator **relationshipEnumerator); -void __RPC_STUB IOpcRelationshipSet_GetEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcRelationshipSet_GetEnumeratorForType_Proxy( - IOpcRelationshipSet* This, - LPCWSTR relationshipType, - IOpcRelationshipEnumerator **relationshipEnumerator); -void __RPC_STUB IOpcRelationshipSet_GetEnumeratorForType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcRelationshipSet_GetRelationshipsContentStream_Proxy( - IOpcRelationshipSet* This, - IStream **contents); -void __RPC_STUB IOpcRelationshipSet_GetRelationshipsContentStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcRelationshipSet_INTERFACE_DEFINED__ */ @@ -2449,24 +2314,25 @@ typedef struct IOpcSignatureCustomObjectVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcSignatureCustomObject* This, + IOpcSignatureCustomObject *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcSignatureCustomObject* This); + IOpcSignatureCustomObject *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcSignatureCustomObject* This); + IOpcSignatureCustomObject *This); /*** IOpcSignatureCustomObject methods ***/ HRESULT (STDMETHODCALLTYPE *GetXml)( - IOpcSignatureCustomObject* This, + IOpcSignatureCustomObject *This, UINT8 **xmlMarkup, UINT32 *count); END_INTERFACE } IOpcSignatureCustomObjectVtbl; + interface IOpcSignatureCustomObject { CONST_VTBL IOpcSignatureCustomObjectVtbl* lpVtbl; }; @@ -2499,15 +2365,6 @@ static FORCEINLINE HRESULT IOpcSignatureCustomObject_GetXml(IOpcSignatureCustomO #endif -HRESULT STDMETHODCALLTYPE IOpcSignatureCustomObject_GetXml_Proxy( - IOpcSignatureCustomObject* This, - UINT8 **xmlMarkup, - UINT32 *count); -void __RPC_STUB IOpcSignatureCustomObject_GetXml_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcSignatureCustomObject_INTERFACE_DEFINED__ */ @@ -2544,35 +2401,36 @@ typedef struct IOpcSignatureCustomObjectEnumeratorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcSignatureCustomObjectEnumerator* This, + IOpcSignatureCustomObjectEnumerator *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcSignatureCustomObjectEnumerator* This); + IOpcSignatureCustomObjectEnumerator *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcSignatureCustomObjectEnumerator* This); + IOpcSignatureCustomObjectEnumerator *This); /*** IOpcSignatureCustomObjectEnumerator methods ***/ HRESULT (STDMETHODCALLTYPE *MoveNext)( - IOpcSignatureCustomObjectEnumerator* This, + IOpcSignatureCustomObjectEnumerator *This, WINBOOL *hasNext); HRESULT (STDMETHODCALLTYPE *MovePrevious)( - IOpcSignatureCustomObjectEnumerator* This, + IOpcSignatureCustomObjectEnumerator *This, WINBOOL *hasPrevious); HRESULT (STDMETHODCALLTYPE *GetCurrent)( - IOpcSignatureCustomObjectEnumerator* This, + IOpcSignatureCustomObjectEnumerator *This, IOpcSignatureCustomObject **customObject); HRESULT (STDMETHODCALLTYPE *Clone)( - IOpcSignatureCustomObjectEnumerator* This, + IOpcSignatureCustomObjectEnumerator *This, IOpcSignatureCustomObjectEnumerator **copy); END_INTERFACE } IOpcSignatureCustomObjectEnumeratorVtbl; + interface IOpcSignatureCustomObjectEnumerator { CONST_VTBL IOpcSignatureCustomObjectEnumeratorVtbl* lpVtbl; }; @@ -2617,38 +2475,6 @@ static FORCEINLINE HRESULT IOpcSignatureCustomObjectEnumerator_Clone(IOpcSignatu #endif -HRESULT STDMETHODCALLTYPE IOpcSignatureCustomObjectEnumerator_MoveNext_Proxy( - IOpcSignatureCustomObjectEnumerator* This, - WINBOOL *hasNext); -void __RPC_STUB IOpcSignatureCustomObjectEnumerator_MoveNext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureCustomObjectEnumerator_MovePrevious_Proxy( - IOpcSignatureCustomObjectEnumerator* This, - WINBOOL *hasPrevious); -void __RPC_STUB IOpcSignatureCustomObjectEnumerator_MovePrevious_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureCustomObjectEnumerator_GetCurrent_Proxy( - IOpcSignatureCustomObjectEnumerator* This, - IOpcSignatureCustomObject **customObject); -void __RPC_STUB IOpcSignatureCustomObjectEnumerator_GetCurrent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureCustomObjectEnumerator_Clone_Proxy( - IOpcSignatureCustomObjectEnumerator* This, - IOpcSignatureCustomObjectEnumerator **copy); -void __RPC_STUB IOpcSignatureCustomObjectEnumerator_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcSignatureCustomObjectEnumerator_INTERFACE_DEFINED__ */ @@ -2689,40 +2515,41 @@ typedef struct IOpcSignaturePartReferenceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcSignaturePartReference* This, + IOpcSignaturePartReference *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcSignaturePartReference* This); + IOpcSignaturePartReference *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcSignaturePartReference* This); + IOpcSignaturePartReference *This); /*** IOpcSignaturePartReference methods ***/ HRESULT (STDMETHODCALLTYPE *GetPartName)( - IOpcSignaturePartReference* This, + IOpcSignaturePartReference *This, IOpcPartUri **partName); HRESULT (STDMETHODCALLTYPE *GetContentType)( - IOpcSignaturePartReference* This, + IOpcSignaturePartReference *This, LPWSTR *contentType); HRESULT (STDMETHODCALLTYPE *GetDigestMethod)( - IOpcSignaturePartReference* This, + IOpcSignaturePartReference *This, LPWSTR *digestMethod); HRESULT (STDMETHODCALLTYPE *GetDigestValue)( - IOpcSignaturePartReference* This, + IOpcSignaturePartReference *This, UINT8 **digestValue, UINT32 *count); HRESULT (STDMETHODCALLTYPE *GetTransformMethod)( - IOpcSignaturePartReference* This, + IOpcSignaturePartReference *This, OPC_CANONICALIZATION_METHOD *transformMethod); END_INTERFACE } IOpcSignaturePartReferenceVtbl; + interface IOpcSignaturePartReference { CONST_VTBL IOpcSignaturePartReferenceVtbl* lpVtbl; }; @@ -2771,47 +2598,6 @@ static FORCEINLINE HRESULT IOpcSignaturePartReference_GetTransformMethod(IOpcSig #endif -HRESULT STDMETHODCALLTYPE IOpcSignaturePartReference_GetPartName_Proxy( - IOpcSignaturePartReference* This, - IOpcPartUri **partName); -void __RPC_STUB IOpcSignaturePartReference_GetPartName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignaturePartReference_GetContentType_Proxy( - IOpcSignaturePartReference* This, - LPWSTR *contentType); -void __RPC_STUB IOpcSignaturePartReference_GetContentType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignaturePartReference_GetDigestMethod_Proxy( - IOpcSignaturePartReference* This, - LPWSTR *digestMethod); -void __RPC_STUB IOpcSignaturePartReference_GetDigestMethod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignaturePartReference_GetDigestValue_Proxy( - IOpcSignaturePartReference* This, - UINT8 **digestValue, - UINT32 *count); -void __RPC_STUB IOpcSignaturePartReference_GetDigestValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignaturePartReference_GetTransformMethod_Proxy( - IOpcSignaturePartReference* This, - OPC_CANONICALIZATION_METHOD *transformMethod); -void __RPC_STUB IOpcSignaturePartReference_GetTransformMethod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcSignaturePartReference_INTERFACE_DEFINED__ */ @@ -2848,35 +2634,36 @@ typedef struct IOpcSignaturePartReferenceEnumeratorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcSignaturePartReferenceEnumerator* This, + IOpcSignaturePartReferenceEnumerator *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcSignaturePartReferenceEnumerator* This); + IOpcSignaturePartReferenceEnumerator *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcSignaturePartReferenceEnumerator* This); + IOpcSignaturePartReferenceEnumerator *This); /*** IOpcSignaturePartReferenceEnumerator methods ***/ HRESULT (STDMETHODCALLTYPE *MoveNext)( - IOpcSignaturePartReferenceEnumerator* This, + IOpcSignaturePartReferenceEnumerator *This, WINBOOL *hasNext); HRESULT (STDMETHODCALLTYPE *MovePrevious)( - IOpcSignaturePartReferenceEnumerator* This, + IOpcSignaturePartReferenceEnumerator *This, WINBOOL *hasPrevious); HRESULT (STDMETHODCALLTYPE *GetCurrent)( - IOpcSignaturePartReferenceEnumerator* This, + IOpcSignaturePartReferenceEnumerator *This, IOpcSignaturePartReference **partReference); HRESULT (STDMETHODCALLTYPE *Clone)( - IOpcSignaturePartReferenceEnumerator* This, + IOpcSignaturePartReferenceEnumerator *This, IOpcSignaturePartReferenceEnumerator **copy); END_INTERFACE } IOpcSignaturePartReferenceEnumeratorVtbl; + interface IOpcSignaturePartReferenceEnumerator { CONST_VTBL IOpcSignaturePartReferenceEnumeratorVtbl* lpVtbl; }; @@ -2921,38 +2708,6 @@ static FORCEINLINE HRESULT IOpcSignaturePartReferenceEnumerator_Clone(IOpcSignat #endif -HRESULT STDMETHODCALLTYPE IOpcSignaturePartReferenceEnumerator_MoveNext_Proxy( - IOpcSignaturePartReferenceEnumerator* This, - WINBOOL *hasNext); -void __RPC_STUB IOpcSignaturePartReferenceEnumerator_MoveNext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignaturePartReferenceEnumerator_MovePrevious_Proxy( - IOpcSignaturePartReferenceEnumerator* This, - WINBOOL *hasPrevious); -void __RPC_STUB IOpcSignaturePartReferenceEnumerator_MovePrevious_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignaturePartReferenceEnumerator_GetCurrent_Proxy( - IOpcSignaturePartReferenceEnumerator* This, - IOpcSignaturePartReference **partReference); -void __RPC_STUB IOpcSignaturePartReferenceEnumerator_GetCurrent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignaturePartReferenceEnumerator_Clone_Proxy( - IOpcSignaturePartReferenceEnumerator* This, - IOpcSignaturePartReferenceEnumerator **copy); -void __RPC_STUB IOpcSignaturePartReferenceEnumerator_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcSignaturePartReferenceEnumerator_INTERFACE_DEFINED__ */ @@ -2996,44 +2751,45 @@ typedef struct IOpcSignatureReferenceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcSignatureReference* This, + IOpcSignatureReference *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcSignatureReference* This); + IOpcSignatureReference *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcSignatureReference* This); + IOpcSignatureReference *This); /*** IOpcSignatureReference methods ***/ HRESULT (STDMETHODCALLTYPE *GetId)( - IOpcSignatureReference* This, + IOpcSignatureReference *This, LPWSTR *referenceId); HRESULT (STDMETHODCALLTYPE *GetUri)( - IOpcSignatureReference* This, + IOpcSignatureReference *This, IUri **referenceUri); HRESULT (STDMETHODCALLTYPE *GetType)( - IOpcSignatureReference* This, + IOpcSignatureReference *This, LPWSTR *type); HRESULT (STDMETHODCALLTYPE *GetTransformMethod)( - IOpcSignatureReference* This, + IOpcSignatureReference *This, OPC_CANONICALIZATION_METHOD *transformMethod); HRESULT (STDMETHODCALLTYPE *GetDigestMethod)( - IOpcSignatureReference* This, + IOpcSignatureReference *This, LPWSTR *digestMethod); HRESULT (STDMETHODCALLTYPE *GetDigestValue)( - IOpcSignatureReference* This, + IOpcSignatureReference *This, UINT8 **digestValue, UINT32 *count); END_INTERFACE } IOpcSignatureReferenceVtbl; + interface IOpcSignatureReference { CONST_VTBL IOpcSignatureReferenceVtbl* lpVtbl; }; @@ -3086,55 +2842,6 @@ static FORCEINLINE HRESULT IOpcSignatureReference_GetDigestValue(IOpcSignatureRe #endif -HRESULT STDMETHODCALLTYPE IOpcSignatureReference_GetId_Proxy( - IOpcSignatureReference* This, - LPWSTR *referenceId); -void __RPC_STUB IOpcSignatureReference_GetId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureReference_GetUri_Proxy( - IOpcSignatureReference* This, - IUri **referenceUri); -void __RPC_STUB IOpcSignatureReference_GetUri_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureReference_GetType_Proxy( - IOpcSignatureReference* This, - LPWSTR *type); -void __RPC_STUB IOpcSignatureReference_GetType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureReference_GetTransformMethod_Proxy( - IOpcSignatureReference* This, - OPC_CANONICALIZATION_METHOD *transformMethod); -void __RPC_STUB IOpcSignatureReference_GetTransformMethod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureReference_GetDigestMethod_Proxy( - IOpcSignatureReference* This, - LPWSTR *digestMethod); -void __RPC_STUB IOpcSignatureReference_GetDigestMethod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureReference_GetDigestValue_Proxy( - IOpcSignatureReference* This, - UINT8 **digestValue, - UINT32 *count); -void __RPC_STUB IOpcSignatureReference_GetDigestValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcSignatureReference_INTERFACE_DEFINED__ */ @@ -3171,35 +2878,36 @@ typedef struct IOpcSignatureReferenceEnumeratorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcSignatureReferenceEnumerator* This, + IOpcSignatureReferenceEnumerator *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcSignatureReferenceEnumerator* This); + IOpcSignatureReferenceEnumerator *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcSignatureReferenceEnumerator* This); + IOpcSignatureReferenceEnumerator *This); /*** IOpcSignatureReferenceEnumerator methods ***/ HRESULT (STDMETHODCALLTYPE *MoveNext)( - IOpcSignatureReferenceEnumerator* This, + IOpcSignatureReferenceEnumerator *This, WINBOOL *hasNext); HRESULT (STDMETHODCALLTYPE *MovePrevious)( - IOpcSignatureReferenceEnumerator* This, + IOpcSignatureReferenceEnumerator *This, WINBOOL *hasPrevious); HRESULT (STDMETHODCALLTYPE *GetCurrent)( - IOpcSignatureReferenceEnumerator* This, + IOpcSignatureReferenceEnumerator *This, IOpcSignatureReference **reference); HRESULT (STDMETHODCALLTYPE *Clone)( - IOpcSignatureReferenceEnumerator* This, + IOpcSignatureReferenceEnumerator *This, IOpcSignatureReferenceEnumerator **copy); END_INTERFACE } IOpcSignatureReferenceEnumeratorVtbl; + interface IOpcSignatureReferenceEnumerator { CONST_VTBL IOpcSignatureReferenceEnumeratorVtbl* lpVtbl; }; @@ -3244,38 +2952,6 @@ static FORCEINLINE HRESULT IOpcSignatureReferenceEnumerator_Clone(IOpcSignatureR #endif -HRESULT STDMETHODCALLTYPE IOpcSignatureReferenceEnumerator_MoveNext_Proxy( - IOpcSignatureReferenceEnumerator* This, - WINBOOL *hasNext); -void __RPC_STUB IOpcSignatureReferenceEnumerator_MoveNext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureReferenceEnumerator_MovePrevious_Proxy( - IOpcSignatureReferenceEnumerator* This, - WINBOOL *hasPrevious); -void __RPC_STUB IOpcSignatureReferenceEnumerator_MovePrevious_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureReferenceEnumerator_GetCurrent_Proxy( - IOpcSignatureReferenceEnumerator* This, - IOpcSignatureReference **reference); -void __RPC_STUB IOpcSignatureReferenceEnumerator_GetCurrent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureReferenceEnumerator_Clone_Proxy( - IOpcSignatureReferenceEnumerator* This, - IOpcSignatureReferenceEnumerator **copy); -void __RPC_STUB IOpcSignatureReferenceEnumerator_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcSignatureReferenceEnumerator_INTERFACE_DEFINED__ */ @@ -3312,35 +2988,36 @@ typedef struct IOpcSignatureRelationshipReferenceEnumeratorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcSignatureRelationshipReferenceEnumerator* This, + IOpcSignatureRelationshipReferenceEnumerator *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcSignatureRelationshipReferenceEnumerator* This); + IOpcSignatureRelationshipReferenceEnumerator *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcSignatureRelationshipReferenceEnumerator* This); + IOpcSignatureRelationshipReferenceEnumerator *This); /*** IOpcSignatureRelationshipReferenceEnumerator methods ***/ HRESULT (STDMETHODCALLTYPE *MoveNext)( - IOpcSignatureRelationshipReferenceEnumerator* This, + IOpcSignatureRelationshipReferenceEnumerator *This, WINBOOL *hasNext); HRESULT (STDMETHODCALLTYPE *MovePrevious)( - IOpcSignatureRelationshipReferenceEnumerator* This, + IOpcSignatureRelationshipReferenceEnumerator *This, WINBOOL *hasPrevious); HRESULT (STDMETHODCALLTYPE *GetCurrent)( - IOpcSignatureRelationshipReferenceEnumerator* This, + IOpcSignatureRelationshipReferenceEnumerator *This, IOpcSignatureRelationshipReference **relationshipReference); HRESULT (STDMETHODCALLTYPE *Clone)( - IOpcSignatureRelationshipReferenceEnumerator* This, + IOpcSignatureRelationshipReferenceEnumerator *This, IOpcSignatureRelationshipReferenceEnumerator **copy); END_INTERFACE } IOpcSignatureRelationshipReferenceEnumeratorVtbl; + interface IOpcSignatureRelationshipReferenceEnumerator { CONST_VTBL IOpcSignatureRelationshipReferenceEnumeratorVtbl* lpVtbl; }; @@ -3385,38 +3062,6 @@ static FORCEINLINE HRESULT IOpcSignatureRelationshipReferenceEnumerator_Clone(IO #endif -HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReferenceEnumerator_MoveNext_Proxy( - IOpcSignatureRelationshipReferenceEnumerator* This, - WINBOOL *hasNext); -void __RPC_STUB IOpcSignatureRelationshipReferenceEnumerator_MoveNext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReferenceEnumerator_MovePrevious_Proxy( - IOpcSignatureRelationshipReferenceEnumerator* This, - WINBOOL *hasPrevious); -void __RPC_STUB IOpcSignatureRelationshipReferenceEnumerator_MovePrevious_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReferenceEnumerator_GetCurrent_Proxy( - IOpcSignatureRelationshipReferenceEnumerator* This, - IOpcSignatureRelationshipReference **relationshipReference); -void __RPC_STUB IOpcSignatureRelationshipReferenceEnumerator_GetCurrent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReferenceEnumerator_Clone_Proxy( - IOpcSignatureRelationshipReferenceEnumerator* This, - IOpcSignatureRelationshipReferenceEnumerator **copy); -void __RPC_STUB IOpcSignatureRelationshipReferenceEnumerator_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcSignatureRelationshipReferenceEnumerator_INTERFACE_DEFINED__ */ @@ -3460,44 +3105,45 @@ typedef struct IOpcSignatureRelationshipReferenceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcSignatureRelationshipReference* This, + IOpcSignatureRelationshipReference *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcSignatureRelationshipReference* This); + IOpcSignatureRelationshipReference *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcSignatureRelationshipReference* This); + IOpcSignatureRelationshipReference *This); /*** IOpcSignatureRelationshipReference methods ***/ HRESULT (STDMETHODCALLTYPE *GetSourceUri)( - IOpcSignatureRelationshipReference* This, + IOpcSignatureRelationshipReference *This, IOpcUri **sourceUri); HRESULT (STDMETHODCALLTYPE *GetDigestMethod)( - IOpcSignatureRelationshipReference* This, + IOpcSignatureRelationshipReference *This, LPWSTR *digestMethod); HRESULT (STDMETHODCALLTYPE *GetDigestValue)( - IOpcSignatureRelationshipReference* This, + IOpcSignatureRelationshipReference *This, UINT8 **digestValue, UINT32 *count); HRESULT (STDMETHODCALLTYPE *GetTransformMethod)( - IOpcSignatureRelationshipReference* This, + IOpcSignatureRelationshipReference *This, OPC_CANONICALIZATION_METHOD *transformMethod); HRESULT (STDMETHODCALLTYPE *GetRelationshipSigningOption)( - IOpcSignatureRelationshipReference* This, + IOpcSignatureRelationshipReference *This, OPC_RELATIONSHIPS_SIGNING_OPTION *relationshipSigningOption); HRESULT (STDMETHODCALLTYPE *GetRelationshipSelectorEnumerator)( - IOpcSignatureRelationshipReference* This, + IOpcSignatureRelationshipReference *This, IOpcRelationshipSelectorEnumerator **selectorEnumerator); END_INTERFACE } IOpcSignatureRelationshipReferenceVtbl; + interface IOpcSignatureRelationshipReference { CONST_VTBL IOpcSignatureRelationshipReferenceVtbl* lpVtbl; }; @@ -3550,55 +3196,6 @@ static FORCEINLINE HRESULT IOpcSignatureRelationshipReference_GetRelationshipSel #endif -HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReference_GetSourceUri_Proxy( - IOpcSignatureRelationshipReference* This, - IOpcUri **sourceUri); -void __RPC_STUB IOpcSignatureRelationshipReference_GetSourceUri_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReference_GetDigestMethod_Proxy( - IOpcSignatureRelationshipReference* This, - LPWSTR *digestMethod); -void __RPC_STUB IOpcSignatureRelationshipReference_GetDigestMethod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReference_GetDigestValue_Proxy( - IOpcSignatureRelationshipReference* This, - UINT8 **digestValue, - UINT32 *count); -void __RPC_STUB IOpcSignatureRelationshipReference_GetDigestValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReference_GetTransformMethod_Proxy( - IOpcSignatureRelationshipReference* This, - OPC_CANONICALIZATION_METHOD *transformMethod); -void __RPC_STUB IOpcSignatureRelationshipReference_GetTransformMethod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReference_GetRelationshipSigningOption_Proxy( - IOpcSignatureRelationshipReference* This, - OPC_RELATIONSHIPS_SIGNING_OPTION *relationshipSigningOption); -void __RPC_STUB IOpcSignatureRelationshipReference_GetRelationshipSigningOption_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReference_GetRelationshipSelectorEnumerator_Proxy( - IOpcSignatureRelationshipReference* This, - IOpcRelationshipSelectorEnumerator **selectorEnumerator); -void __RPC_STUB IOpcSignatureRelationshipReference_GetRelationshipSelectorEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcSignatureRelationshipReference_INTERFACE_DEFINED__ */ @@ -3635,35 +3232,36 @@ typedef struct IOpcRelationshipSelectorEnumeratorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcRelationshipSelectorEnumerator* This, + IOpcRelationshipSelectorEnumerator *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcRelationshipSelectorEnumerator* This); + IOpcRelationshipSelectorEnumerator *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcRelationshipSelectorEnumerator* This); + IOpcRelationshipSelectorEnumerator *This); /*** IOpcRelationshipSelectorEnumerator methods ***/ HRESULT (STDMETHODCALLTYPE *MoveNext)( - IOpcRelationshipSelectorEnumerator* This, + IOpcRelationshipSelectorEnumerator *This, WINBOOL *hasNext); HRESULT (STDMETHODCALLTYPE *MovePrevious)( - IOpcRelationshipSelectorEnumerator* This, + IOpcRelationshipSelectorEnumerator *This, WINBOOL *hasPrevious); HRESULT (STDMETHODCALLTYPE *GetCurrent)( - IOpcRelationshipSelectorEnumerator* This, + IOpcRelationshipSelectorEnumerator *This, IOpcRelationshipSelector **relationshipSelector); HRESULT (STDMETHODCALLTYPE *Clone)( - IOpcRelationshipSelectorEnumerator* This, + IOpcRelationshipSelectorEnumerator *This, IOpcRelationshipSelectorEnumerator **copy); END_INTERFACE } IOpcRelationshipSelectorEnumeratorVtbl; + interface IOpcRelationshipSelectorEnumerator { CONST_VTBL IOpcRelationshipSelectorEnumeratorVtbl* lpVtbl; }; @@ -3708,38 +3306,6 @@ static FORCEINLINE HRESULT IOpcRelationshipSelectorEnumerator_Clone(IOpcRelation #endif -HRESULT STDMETHODCALLTYPE IOpcRelationshipSelectorEnumerator_MoveNext_Proxy( - IOpcRelationshipSelectorEnumerator* This, - WINBOOL *hasNext); -void __RPC_STUB IOpcRelationshipSelectorEnumerator_MoveNext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcRelationshipSelectorEnumerator_MovePrevious_Proxy( - IOpcRelationshipSelectorEnumerator* This, - WINBOOL *hasPrevious); -void __RPC_STUB IOpcRelationshipSelectorEnumerator_MovePrevious_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcRelationshipSelectorEnumerator_GetCurrent_Proxy( - IOpcRelationshipSelectorEnumerator* This, - IOpcRelationshipSelector **relationshipSelector); -void __RPC_STUB IOpcRelationshipSelectorEnumerator_GetCurrent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcRelationshipSelectorEnumerator_Clone_Proxy( - IOpcRelationshipSelectorEnumerator* This, - IOpcRelationshipSelectorEnumerator **copy); -void __RPC_STUB IOpcRelationshipSelectorEnumerator_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcRelationshipSelectorEnumerator_INTERFACE_DEFINED__ */ @@ -3776,35 +3342,36 @@ typedef struct IOpcCertificateEnumeratorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcCertificateEnumerator* This, + IOpcCertificateEnumerator *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcCertificateEnumerator* This); + IOpcCertificateEnumerator *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcCertificateEnumerator* This); + IOpcCertificateEnumerator *This); /*** IOpcCertificateEnumerator methods ***/ HRESULT (STDMETHODCALLTYPE *MoveNext)( - IOpcCertificateEnumerator* This, + IOpcCertificateEnumerator *This, WINBOOL *hasNext); HRESULT (STDMETHODCALLTYPE *MovePrevious)( - IOpcCertificateEnumerator* This, + IOpcCertificateEnumerator *This, WINBOOL *hasPrevious); HRESULT (STDMETHODCALLTYPE *GetCurrent)( - IOpcCertificateEnumerator* This, + IOpcCertificateEnumerator *This, const CERT_CONTEXT **certificate); HRESULT (STDMETHODCALLTYPE *Clone)( - IOpcCertificateEnumerator* This, + IOpcCertificateEnumerator *This, IOpcCertificateEnumerator **copy); END_INTERFACE } IOpcCertificateEnumeratorVtbl; + interface IOpcCertificateEnumerator { CONST_VTBL IOpcCertificateEnumeratorVtbl* lpVtbl; }; @@ -3849,38 +3416,6 @@ static FORCEINLINE HRESULT IOpcCertificateEnumerator_Clone(IOpcCertificateEnumer #endif -HRESULT STDMETHODCALLTYPE IOpcCertificateEnumerator_MoveNext_Proxy( - IOpcCertificateEnumerator* This, - WINBOOL *hasNext); -void __RPC_STUB IOpcCertificateEnumerator_MoveNext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcCertificateEnumerator_MovePrevious_Proxy( - IOpcCertificateEnumerator* This, - WINBOOL *hasPrevious); -void __RPC_STUB IOpcCertificateEnumerator_MovePrevious_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcCertificateEnumerator_GetCurrent_Proxy( - IOpcCertificateEnumerator* This, - const CERT_CONTEXT **certificate); -void __RPC_STUB IOpcCertificateEnumerator_GetCurrent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcCertificateEnumerator_Clone_Proxy( - IOpcCertificateEnumerator* This, - IOpcCertificateEnumerator **copy); -void __RPC_STUB IOpcCertificateEnumerator_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcCertificateEnumerator_INTERFACE_DEFINED__ */ @@ -3914,31 +3449,32 @@ typedef struct IOpcCertificateSetVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcCertificateSet* This, + IOpcCertificateSet *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcCertificateSet* This); + IOpcCertificateSet *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcCertificateSet* This); + IOpcCertificateSet *This); /*** IOpcCertificateSet methods ***/ HRESULT (STDMETHODCALLTYPE *Add)( - IOpcCertificateSet* This, + IOpcCertificateSet *This, const CERT_CONTEXT *certificate); HRESULT (STDMETHODCALLTYPE *Remove)( - IOpcCertificateSet* This, + IOpcCertificateSet *This, const CERT_CONTEXT *certificate); HRESULT (STDMETHODCALLTYPE *GetEnumerator)( - IOpcCertificateSet* This, + IOpcCertificateSet *This, IOpcCertificateEnumerator **certificateEnumerator); END_INTERFACE } IOpcCertificateSetVtbl; + interface IOpcCertificateSet { CONST_VTBL IOpcCertificateSetVtbl* lpVtbl; }; @@ -3979,30 +3515,6 @@ static FORCEINLINE HRESULT IOpcCertificateSet_GetEnumerator(IOpcCertificateSet* #endif -HRESULT STDMETHODCALLTYPE IOpcCertificateSet_Add_Proxy( - IOpcCertificateSet* This, - const CERT_CONTEXT *certificate); -void __RPC_STUB IOpcCertificateSet_Add_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcCertificateSet_Remove_Proxy( - IOpcCertificateSet* This, - const CERT_CONTEXT *certificate); -void __RPC_STUB IOpcCertificateSet_Remove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcCertificateSet_GetEnumerator_Proxy( - IOpcCertificateSet* This, - IOpcCertificateEnumerator **certificateEnumerator); -void __RPC_STUB IOpcCertificateSet_GetEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcCertificateSet_INTERFACE_DEFINED__ */ @@ -4039,35 +3551,36 @@ typedef struct IOpcDigitalSignatureEnumeratorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcDigitalSignatureEnumerator* This, + IOpcDigitalSignatureEnumerator *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcDigitalSignatureEnumerator* This); + IOpcDigitalSignatureEnumerator *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcDigitalSignatureEnumerator* This); + IOpcDigitalSignatureEnumerator *This); /*** IOpcDigitalSignatureEnumerator methods ***/ HRESULT (STDMETHODCALLTYPE *MoveNext)( - IOpcDigitalSignatureEnumerator* This, + IOpcDigitalSignatureEnumerator *This, WINBOOL *hasNext); HRESULT (STDMETHODCALLTYPE *MovePrevious)( - IOpcDigitalSignatureEnumerator* This, + IOpcDigitalSignatureEnumerator *This, WINBOOL *hasPrevious); HRESULT (STDMETHODCALLTYPE *GetCurrent)( - IOpcDigitalSignatureEnumerator* This, + IOpcDigitalSignatureEnumerator *This, IOpcDigitalSignature **digitalSignature); HRESULT (STDMETHODCALLTYPE *Clone)( - IOpcDigitalSignatureEnumerator* This, + IOpcDigitalSignatureEnumerator *This, IOpcDigitalSignatureEnumerator **copy); END_INTERFACE } IOpcDigitalSignatureEnumeratorVtbl; + interface IOpcDigitalSignatureEnumerator { CONST_VTBL IOpcDigitalSignatureEnumeratorVtbl* lpVtbl; }; @@ -4112,38 +3625,6 @@ static FORCEINLINE HRESULT IOpcDigitalSignatureEnumerator_Clone(IOpcDigitalSigna #endif -HRESULT STDMETHODCALLTYPE IOpcDigitalSignatureEnumerator_MoveNext_Proxy( - IOpcDigitalSignatureEnumerator* This, - WINBOOL *hasNext); -void __RPC_STUB IOpcDigitalSignatureEnumerator_MoveNext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcDigitalSignatureEnumerator_MovePrevious_Proxy( - IOpcDigitalSignatureEnumerator* This, - WINBOOL *hasPrevious); -void __RPC_STUB IOpcDigitalSignatureEnumerator_MovePrevious_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcDigitalSignatureEnumerator_GetCurrent_Proxy( - IOpcDigitalSignatureEnumerator* This, - IOpcDigitalSignature **digitalSignature); -void __RPC_STUB IOpcDigitalSignatureEnumerator_GetCurrent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcDigitalSignatureEnumerator_Clone_Proxy( - IOpcDigitalSignatureEnumerator* This, - IOpcDigitalSignatureEnumerator **copy); -void __RPC_STUB IOpcDigitalSignatureEnumerator_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcDigitalSignatureEnumerator_INTERFACE_DEFINED__ */ @@ -4199,51 +3680,51 @@ typedef struct IOpcDigitalSignatureManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcDigitalSignatureManager* This, + IOpcDigitalSignatureManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcDigitalSignatureManager* This); + IOpcDigitalSignatureManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcDigitalSignatureManager* This); + IOpcDigitalSignatureManager *This); /*** IOpcDigitalSignatureManager methods ***/ HRESULT (STDMETHODCALLTYPE *GetSignatureOriginPartName)( - IOpcDigitalSignatureManager* This, + IOpcDigitalSignatureManager *This, IOpcPartUri **signatureOriginPartName); HRESULT (STDMETHODCALLTYPE *SetSignatureOriginPartName)( - IOpcDigitalSignatureManager* This, + IOpcDigitalSignatureManager *This, IOpcPartUri *signatureOriginPartName); HRESULT (STDMETHODCALLTYPE *GetSignatureEnumerator)( - IOpcDigitalSignatureManager* This, + IOpcDigitalSignatureManager *This, IOpcDigitalSignatureEnumerator **signatureEnumerator); HRESULT (STDMETHODCALLTYPE *RemoveSignature)( - IOpcDigitalSignatureManager* This, + IOpcDigitalSignatureManager *This, IOpcPartUri *signaturePartName); HRESULT (STDMETHODCALLTYPE *CreateSigningOptions)( - IOpcDigitalSignatureManager* This, + IOpcDigitalSignatureManager *This, IOpcSigningOptions **signingOptions); HRESULT (STDMETHODCALLTYPE *Validate)( - IOpcDigitalSignatureManager* This, + IOpcDigitalSignatureManager *This, IOpcDigitalSignature *signature, const CERT_CONTEXT *certificate, OPC_SIGNATURE_VALIDATION_RESULT *validationResult); HRESULT (STDMETHODCALLTYPE *Sign)( - IOpcDigitalSignatureManager* This, + IOpcDigitalSignatureManager *This, const CERT_CONTEXT *certificate, IOpcSigningOptions *signingOptions, IOpcDigitalSignature **digitalSignature); HRESULT (STDMETHODCALLTYPE *ReplaceSignatureXml)( - IOpcDigitalSignatureManager* This, + IOpcDigitalSignatureManager *This, IOpcPartUri *signaturePartName, const UINT8 *newSignatureXml, UINT32 count, @@ -4251,6 +3732,7 @@ typedef struct IOpcDigitalSignatureManagerVtbl { END_INTERFACE } IOpcDigitalSignatureManagerVtbl; + interface IOpcDigitalSignatureManager { CONST_VTBL IOpcDigitalSignatureManagerVtbl* lpVtbl; }; @@ -4311,77 +3793,6 @@ static FORCEINLINE HRESULT IOpcDigitalSignatureManager_ReplaceSignatureXml(IOpcD #endif -HRESULT STDMETHODCALLTYPE IOpcDigitalSignatureManager_GetSignatureOriginPartName_Proxy( - IOpcDigitalSignatureManager* This, - IOpcPartUri **signatureOriginPartName); -void __RPC_STUB IOpcDigitalSignatureManager_GetSignatureOriginPartName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcDigitalSignatureManager_SetSignatureOriginPartName_Proxy( - IOpcDigitalSignatureManager* This, - IOpcPartUri *signatureOriginPartName); -void __RPC_STUB IOpcDigitalSignatureManager_SetSignatureOriginPartName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcDigitalSignatureManager_GetSignatureEnumerator_Proxy( - IOpcDigitalSignatureManager* This, - IOpcDigitalSignatureEnumerator **signatureEnumerator); -void __RPC_STUB IOpcDigitalSignatureManager_GetSignatureEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcDigitalSignatureManager_RemoveSignature_Proxy( - IOpcDigitalSignatureManager* This, - IOpcPartUri *signaturePartName); -void __RPC_STUB IOpcDigitalSignatureManager_RemoveSignature_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcDigitalSignatureManager_CreateSigningOptions_Proxy( - IOpcDigitalSignatureManager* This, - IOpcSigningOptions **signingOptions); -void __RPC_STUB IOpcDigitalSignatureManager_CreateSigningOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcDigitalSignatureManager_Validate_Proxy( - IOpcDigitalSignatureManager* This, - IOpcDigitalSignature *signature, - const CERT_CONTEXT *certificate, - OPC_SIGNATURE_VALIDATION_RESULT *validationResult); -void __RPC_STUB IOpcDigitalSignatureManager_Validate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcDigitalSignatureManager_Sign_Proxy( - IOpcDigitalSignatureManager* This, - const CERT_CONTEXT *certificate, - IOpcSigningOptions *signingOptions, - IOpcDigitalSignature **digitalSignature); -void __RPC_STUB IOpcDigitalSignatureManager_Sign_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcDigitalSignatureManager_ReplaceSignatureXml_Proxy( - IOpcDigitalSignatureManager* This, - IOpcPartUri *signaturePartName, - const UINT8 *newSignatureXml, - UINT32 count, - IOpcDigitalSignature **digitalSignature); -void __RPC_STUB IOpcDigitalSignatureManager_ReplaceSignatureXml_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcDigitalSignatureManager_INTERFACE_DEFINED__ */ @@ -4418,34 +3829,35 @@ typedef struct IOpcSignaturePartReferenceSetVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcSignaturePartReferenceSet* This, + IOpcSignaturePartReferenceSet *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcSignaturePartReferenceSet* This); + IOpcSignaturePartReferenceSet *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcSignaturePartReferenceSet* This); + IOpcSignaturePartReferenceSet *This); /*** IOpcSignaturePartReferenceSet methods ***/ HRESULT (STDMETHODCALLTYPE *Create)( - IOpcSignaturePartReferenceSet* This, + IOpcSignaturePartReferenceSet *This, IOpcPartUri *partUri, LPCWSTR digestMethod, OPC_CANONICALIZATION_METHOD transformMethod, IOpcSignaturePartReference **partReference); HRESULT (STDMETHODCALLTYPE *Delete)( - IOpcSignaturePartReferenceSet* This, + IOpcSignaturePartReferenceSet *This, IOpcSignaturePartReference *partReference); HRESULT (STDMETHODCALLTYPE *GetEnumerator)( - IOpcSignaturePartReferenceSet* This, + IOpcSignaturePartReferenceSet *This, IOpcSignaturePartReferenceEnumerator **partReferenceEnumerator); END_INTERFACE } IOpcSignaturePartReferenceSetVtbl; + interface IOpcSignaturePartReferenceSet { CONST_VTBL IOpcSignaturePartReferenceSetVtbl* lpVtbl; }; @@ -4486,33 +3898,6 @@ static FORCEINLINE HRESULT IOpcSignaturePartReferenceSet_GetEnumerator(IOpcSigna #endif -HRESULT STDMETHODCALLTYPE IOpcSignaturePartReferenceSet_Create_Proxy( - IOpcSignaturePartReferenceSet* This, - IOpcPartUri *partUri, - LPCWSTR digestMethod, - OPC_CANONICALIZATION_METHOD transformMethod, - IOpcSignaturePartReference **partReference); -void __RPC_STUB IOpcSignaturePartReferenceSet_Create_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignaturePartReferenceSet_Delete_Proxy( - IOpcSignaturePartReferenceSet* This, - IOpcSignaturePartReference *partReference); -void __RPC_STUB IOpcSignaturePartReferenceSet_Delete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignaturePartReferenceSet_GetEnumerator_Proxy( - IOpcSignaturePartReferenceSet* This, - IOpcSignaturePartReferenceEnumerator **partReferenceEnumerator); -void __RPC_STUB IOpcSignaturePartReferenceSet_GetEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcSignaturePartReferenceSet_INTERFACE_DEFINED__ */ @@ -4548,33 +3933,34 @@ typedef struct IOpcRelationshipSelectorSetVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcRelationshipSelectorSet* This, + IOpcRelationshipSelectorSet *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcRelationshipSelectorSet* This); + IOpcRelationshipSelectorSet *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcRelationshipSelectorSet* This); + IOpcRelationshipSelectorSet *This); /*** IOpcRelationshipSelectorSet methods ***/ HRESULT (STDMETHODCALLTYPE *Create)( - IOpcRelationshipSelectorSet* This, + IOpcRelationshipSelectorSet *This, OPC_RELATIONSHIP_SELECTOR selector, LPCWSTR selectionCriterion, IOpcRelationshipSelector **relationshipSelector); HRESULT (STDMETHODCALLTYPE *Delete)( - IOpcRelationshipSelectorSet* This, + IOpcRelationshipSelectorSet *This, IOpcRelationshipSelector *relationshipSelector); HRESULT (STDMETHODCALLTYPE *GetEnumerator)( - IOpcRelationshipSelectorSet* This, + IOpcRelationshipSelectorSet *This, IOpcRelationshipSelectorEnumerator **relationshipSelectorEnumerator); END_INTERFACE } IOpcRelationshipSelectorSetVtbl; + interface IOpcRelationshipSelectorSet { CONST_VTBL IOpcRelationshipSelectorSetVtbl* lpVtbl; }; @@ -4615,32 +4001,6 @@ static FORCEINLINE HRESULT IOpcRelationshipSelectorSet_GetEnumerator(IOpcRelatio #endif -HRESULT STDMETHODCALLTYPE IOpcRelationshipSelectorSet_Create_Proxy( - IOpcRelationshipSelectorSet* This, - OPC_RELATIONSHIP_SELECTOR selector, - LPCWSTR selectionCriterion, - IOpcRelationshipSelector **relationshipSelector); -void __RPC_STUB IOpcRelationshipSelectorSet_Create_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcRelationshipSelectorSet_Delete_Proxy( - IOpcRelationshipSelectorSet* This, - IOpcRelationshipSelector *relationshipSelector); -void __RPC_STUB IOpcRelationshipSelectorSet_Delete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcRelationshipSelectorSet_GetEnumerator_Proxy( - IOpcRelationshipSelectorSet* This, - IOpcRelationshipSelectorEnumerator **relationshipSelectorEnumerator); -void __RPC_STUB IOpcRelationshipSelectorSet_GetEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcRelationshipSelectorSet_INTERFACE_DEFINED__ */ @@ -4682,19 +4042,19 @@ typedef struct IOpcSignatureRelationshipReferenceSetVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcSignatureRelationshipReferenceSet* This, + IOpcSignatureRelationshipReferenceSet *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcSignatureRelationshipReferenceSet* This); + IOpcSignatureRelationshipReferenceSet *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcSignatureRelationshipReferenceSet* This); + IOpcSignatureRelationshipReferenceSet *This); /*** IOpcSignatureRelationshipReferenceSet methods ***/ HRESULT (STDMETHODCALLTYPE *Create)( - IOpcSignatureRelationshipReferenceSet* This, + IOpcSignatureRelationshipReferenceSet *This, IOpcUri *sourceUri, LPCWSTR digestMethod, OPC_RELATIONSHIPS_SIGNING_OPTION relationshipSigningOption, @@ -4703,19 +4063,20 @@ typedef struct IOpcSignatureRelationshipReferenceSetVtbl { IOpcSignatureRelationshipReference **relationshipReference); HRESULT (STDMETHODCALLTYPE *CreateRelationshipSelectorSet)( - IOpcSignatureRelationshipReferenceSet* This, + IOpcSignatureRelationshipReferenceSet *This, IOpcRelationshipSelectorSet **selectorSet); HRESULT (STDMETHODCALLTYPE *Delete)( - IOpcSignatureRelationshipReferenceSet* This, + IOpcSignatureRelationshipReferenceSet *This, IOpcSignatureRelationshipReference *relationshipReference); HRESULT (STDMETHODCALLTYPE *GetEnumerator)( - IOpcSignatureRelationshipReferenceSet* This, + IOpcSignatureRelationshipReferenceSet *This, IOpcSignatureRelationshipReferenceEnumerator **relationshipReferenceEnumerator); END_INTERFACE } IOpcSignatureRelationshipReferenceSetVtbl; + interface IOpcSignatureRelationshipReferenceSet { CONST_VTBL IOpcSignatureRelationshipReferenceSetVtbl* lpVtbl; }; @@ -4760,43 +4121,6 @@ static FORCEINLINE HRESULT IOpcSignatureRelationshipReferenceSet_GetEnumerator(I #endif -HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReferenceSet_Create_Proxy( - IOpcSignatureRelationshipReferenceSet* This, - IOpcUri *sourceUri, - LPCWSTR digestMethod, - OPC_RELATIONSHIPS_SIGNING_OPTION relationshipSigningOption, - IOpcRelationshipSelectorSet *selectorSet, - OPC_CANONICALIZATION_METHOD transformMethod, - IOpcSignatureRelationshipReference **relationshipReference); -void __RPC_STUB IOpcSignatureRelationshipReferenceSet_Create_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReferenceSet_CreateRelationshipSelectorSet_Proxy( - IOpcSignatureRelationshipReferenceSet* This, - IOpcRelationshipSelectorSet **selectorSet); -void __RPC_STUB IOpcSignatureRelationshipReferenceSet_CreateRelationshipSelectorSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReferenceSet_Delete_Proxy( - IOpcSignatureRelationshipReferenceSet* This, - IOpcSignatureRelationshipReference *relationshipReference); -void __RPC_STUB IOpcSignatureRelationshipReferenceSet_Delete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReferenceSet_GetEnumerator_Proxy( - IOpcSignatureRelationshipReferenceSet* This, - IOpcSignatureRelationshipReferenceEnumerator **relationshipReferenceEnumerator); -void __RPC_STUB IOpcSignatureRelationshipReferenceSet_GetEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcSignatureRelationshipReferenceSet_INTERFACE_DEFINED__ */ @@ -4835,19 +4159,19 @@ typedef struct IOpcSignatureReferenceSetVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcSignatureReferenceSet* This, + IOpcSignatureReferenceSet *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcSignatureReferenceSet* This); + IOpcSignatureReferenceSet *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcSignatureReferenceSet* This); + IOpcSignatureReferenceSet *This); /*** IOpcSignatureReferenceSet methods ***/ HRESULT (STDMETHODCALLTYPE *Create)( - IOpcSignatureReferenceSet* This, + IOpcSignatureReferenceSet *This, IUri *referenceUri, LPCWSTR referenceId, LPCWSTR type, @@ -4856,15 +4180,16 @@ typedef struct IOpcSignatureReferenceSetVtbl { IOpcSignatureReference **reference); HRESULT (STDMETHODCALLTYPE *Delete)( - IOpcSignatureReferenceSet* This, + IOpcSignatureReferenceSet *This, IOpcSignatureReference *reference); HRESULT (STDMETHODCALLTYPE *GetEnumerator)( - IOpcSignatureReferenceSet* This, + IOpcSignatureReferenceSet *This, IOpcSignatureReferenceEnumerator **referenceEnumerator); END_INTERFACE } IOpcSignatureReferenceSetVtbl; + interface IOpcSignatureReferenceSet { CONST_VTBL IOpcSignatureReferenceSetVtbl* lpVtbl; }; @@ -4905,35 +4230,6 @@ static FORCEINLINE HRESULT IOpcSignatureReferenceSet_GetEnumerator(IOpcSignature #endif -HRESULT STDMETHODCALLTYPE IOpcSignatureReferenceSet_Create_Proxy( - IOpcSignatureReferenceSet* This, - IUri *referenceUri, - LPCWSTR referenceId, - LPCWSTR type, - LPCWSTR digestMethod, - OPC_CANONICALIZATION_METHOD transformMethod, - IOpcSignatureReference **reference); -void __RPC_STUB IOpcSignatureReferenceSet_Create_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureReferenceSet_Delete_Proxy( - IOpcSignatureReferenceSet* This, - IOpcSignatureReference *reference); -void __RPC_STUB IOpcSignatureReferenceSet_Delete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureReferenceSet_GetEnumerator_Proxy( - IOpcSignatureReferenceSet* This, - IOpcSignatureReferenceEnumerator **referenceEnumerator); -void __RPC_STUB IOpcSignatureReferenceSet_GetEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcSignatureReferenceSet_INTERFACE_DEFINED__ */ @@ -4969,33 +4265,34 @@ typedef struct IOpcSignatureCustomObjectSetVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcSignatureCustomObjectSet* This, + IOpcSignatureCustomObjectSet *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcSignatureCustomObjectSet* This); + IOpcSignatureCustomObjectSet *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcSignatureCustomObjectSet* This); + IOpcSignatureCustomObjectSet *This); /*** IOpcSignatureCustomObjectSet methods ***/ HRESULT (STDMETHODCALLTYPE *Create)( - IOpcSignatureCustomObjectSet* This, + IOpcSignatureCustomObjectSet *This, const UINT8 *xmlMarkup, UINT32 count, IOpcSignatureCustomObject **customObject); HRESULT (STDMETHODCALLTYPE *Delete)( - IOpcSignatureCustomObjectSet* This, + IOpcSignatureCustomObjectSet *This, IOpcSignatureCustomObject *customObject); HRESULT (STDMETHODCALLTYPE *GetEnumerator)( - IOpcSignatureCustomObjectSet* This, + IOpcSignatureCustomObjectSet *This, IOpcSignatureCustomObjectEnumerator **customObjectEnumerator); END_INTERFACE } IOpcSignatureCustomObjectSetVtbl; + interface IOpcSignatureCustomObjectSet { CONST_VTBL IOpcSignatureCustomObjectSetVtbl* lpVtbl; }; @@ -5036,32 +4333,6 @@ static FORCEINLINE HRESULT IOpcSignatureCustomObjectSet_GetEnumerator(IOpcSignat #endif -HRESULT STDMETHODCALLTYPE IOpcSignatureCustomObjectSet_Create_Proxy( - IOpcSignatureCustomObjectSet* This, - const UINT8 *xmlMarkup, - UINT32 count, - IOpcSignatureCustomObject **customObject); -void __RPC_STUB IOpcSignatureCustomObjectSet_Create_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureCustomObjectSet_Delete_Proxy( - IOpcSignatureCustomObjectSet* This, - IOpcSignatureCustomObject *customObject); -void __RPC_STUB IOpcSignatureCustomObjectSet_Delete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSignatureCustomObjectSet_GetEnumerator_Proxy( - IOpcSignatureCustomObjectSet* This, - IOpcSignatureCustomObjectEnumerator **customObjectEnumerator); -void __RPC_STUB IOpcSignatureCustomObjectSet_GetEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcSignatureCustomObjectSet_INTERFACE_DEFINED__ */ @@ -5135,83 +4406,84 @@ typedef struct IOpcDigitalSignatureVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcDigitalSignature* This, + IOpcDigitalSignature *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcDigitalSignature* This); + IOpcDigitalSignature *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcDigitalSignature* This); + IOpcDigitalSignature *This); /*** IOpcDigitalSignature methods ***/ HRESULT (STDMETHODCALLTYPE *GetNamespaces)( - IOpcDigitalSignature* This, + IOpcDigitalSignature *This, LPWSTR **prefixes, LPWSTR **namespaces, UINT32 *count); HRESULT (STDMETHODCALLTYPE *GetSignatureId)( - IOpcDigitalSignature* This, + IOpcDigitalSignature *This, LPWSTR *signatureId); HRESULT (STDMETHODCALLTYPE *GetSignaturePartName)( - IOpcDigitalSignature* This, + IOpcDigitalSignature *This, IOpcPartUri **signaturePartName); HRESULT (STDMETHODCALLTYPE *GetSignatureMethod)( - IOpcDigitalSignature* This, + IOpcDigitalSignature *This, LPWSTR *signatureMethod); HRESULT (STDMETHODCALLTYPE *GetCanonicalizationMethod)( - IOpcDigitalSignature* This, + IOpcDigitalSignature *This, OPC_CANONICALIZATION_METHOD *canonicalizationMethod); HRESULT (STDMETHODCALLTYPE *GetSignatureValue)( - IOpcDigitalSignature* This, + IOpcDigitalSignature *This, UINT8 **signatureValue, UINT32 *count); HRESULT (STDMETHODCALLTYPE *GetSignaturePartReferenceEnumerator)( - IOpcDigitalSignature* This, + IOpcDigitalSignature *This, IOpcSignaturePartReferenceEnumerator **partReferenceEnumerator); HRESULT (STDMETHODCALLTYPE *GetSignatureRelationshipReferenceEnumerator)( - IOpcDigitalSignature* This, + IOpcDigitalSignature *This, IOpcSignatureRelationshipReferenceEnumerator **relationshipReferenceEnumerator); HRESULT (STDMETHODCALLTYPE *GetSigningTime)( - IOpcDigitalSignature* This, + IOpcDigitalSignature *This, LPWSTR *signingTime); HRESULT (STDMETHODCALLTYPE *GetTimeFormat)( - IOpcDigitalSignature* This, + IOpcDigitalSignature *This, OPC_SIGNATURE_TIME_FORMAT *timeFormat); HRESULT (STDMETHODCALLTYPE *GetPackageObjectReference)( - IOpcDigitalSignature* This, + IOpcDigitalSignature *This, IOpcSignatureReference **packageObjectReference); HRESULT (STDMETHODCALLTYPE *GetCertificateEnumerator)( - IOpcDigitalSignature* This, + IOpcDigitalSignature *This, IOpcCertificateEnumerator **certificateEnumerator); HRESULT (STDMETHODCALLTYPE *GetCustomReferenceEnumerator)( - IOpcDigitalSignature* This, + IOpcDigitalSignature *This, IOpcSignatureReferenceEnumerator **customReferenceEnumerator); HRESULT (STDMETHODCALLTYPE *GetCustomObjectEnumerator)( - IOpcDigitalSignature* This, + IOpcDigitalSignature *This, IOpcSignatureCustomObjectEnumerator **customObjectEnumerator); HRESULT (STDMETHODCALLTYPE *GetSignatureXml)( - IOpcDigitalSignature* This, + IOpcDigitalSignature *This, UINT8 **signatureXml, UINT32 *count); END_INTERFACE } IOpcDigitalSignatureVtbl; + interface IOpcDigitalSignature { CONST_VTBL IOpcDigitalSignatureVtbl* lpVtbl; }; @@ -5300,130 +4572,6 @@ static FORCEINLINE HRESULT IOpcDigitalSignature_GetSignatureXml(IOpcDigitalSigna #endif -HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetNamespaces_Proxy( - IOpcDigitalSignature* This, - LPWSTR **prefixes, - LPWSTR **namespaces, - UINT32 *count); -void __RPC_STUB IOpcDigitalSignature_GetNamespaces_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetSignatureId_Proxy( - IOpcDigitalSignature* This, - LPWSTR *signatureId); -void __RPC_STUB IOpcDigitalSignature_GetSignatureId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetSignaturePartName_Proxy( - IOpcDigitalSignature* This, - IOpcPartUri **signaturePartName); -void __RPC_STUB IOpcDigitalSignature_GetSignaturePartName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetSignatureMethod_Proxy( - IOpcDigitalSignature* This, - LPWSTR *signatureMethod); -void __RPC_STUB IOpcDigitalSignature_GetSignatureMethod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetCanonicalizationMethod_Proxy( - IOpcDigitalSignature* This, - OPC_CANONICALIZATION_METHOD *canonicalizationMethod); -void __RPC_STUB IOpcDigitalSignature_GetCanonicalizationMethod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetSignatureValue_Proxy( - IOpcDigitalSignature* This, - UINT8 **signatureValue, - UINT32 *count); -void __RPC_STUB IOpcDigitalSignature_GetSignatureValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetSignaturePartReferenceEnumerator_Proxy( - IOpcDigitalSignature* This, - IOpcSignaturePartReferenceEnumerator **partReferenceEnumerator); -void __RPC_STUB IOpcDigitalSignature_GetSignaturePartReferenceEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetSignatureRelationshipReferenceEnumerator_Proxy( - IOpcDigitalSignature* This, - IOpcSignatureRelationshipReferenceEnumerator **relationshipReferenceEnumerator); -void __RPC_STUB IOpcDigitalSignature_GetSignatureRelationshipReferenceEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetSigningTime_Proxy( - IOpcDigitalSignature* This, - LPWSTR *signingTime); -void __RPC_STUB IOpcDigitalSignature_GetSigningTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetTimeFormat_Proxy( - IOpcDigitalSignature* This, - OPC_SIGNATURE_TIME_FORMAT *timeFormat); -void __RPC_STUB IOpcDigitalSignature_GetTimeFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetPackageObjectReference_Proxy( - IOpcDigitalSignature* This, - IOpcSignatureReference **packageObjectReference); -void __RPC_STUB IOpcDigitalSignature_GetPackageObjectReference_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetCertificateEnumerator_Proxy( - IOpcDigitalSignature* This, - IOpcCertificateEnumerator **certificateEnumerator); -void __RPC_STUB IOpcDigitalSignature_GetCertificateEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetCustomReferenceEnumerator_Proxy( - IOpcDigitalSignature* This, - IOpcSignatureReferenceEnumerator **customReferenceEnumerator); -void __RPC_STUB IOpcDigitalSignature_GetCustomReferenceEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetCustomObjectEnumerator_Proxy( - IOpcDigitalSignature* This, - IOpcSignatureCustomObjectEnumerator **customObjectEnumerator); -void __RPC_STUB IOpcDigitalSignature_GetCustomObjectEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetSignatureXml_Proxy( - IOpcDigitalSignature* This, - UINT8 **signatureXml, - UINT32 *count); -void __RPC_STUB IOpcDigitalSignature_GetSignatureXml_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcDigitalSignature_INTERFACE_DEFINED__ */ @@ -5499,87 +4647,88 @@ typedef struct IOpcSigningOptionsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcSigningOptions* This, + IOpcSigningOptions *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcSigningOptions* This); + IOpcSigningOptions *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcSigningOptions* This); + IOpcSigningOptions *This); /*** IOpcSigningOptions methods ***/ HRESULT (STDMETHODCALLTYPE *GetSignatureId)( - IOpcSigningOptions* This, + IOpcSigningOptions *This, LPWSTR *signatureId); HRESULT (STDMETHODCALLTYPE *SetSignatureId)( - IOpcSigningOptions* This, + IOpcSigningOptions *This, LPCWSTR signatureId); HRESULT (STDMETHODCALLTYPE *GetSignatureMethod)( - IOpcSigningOptions* This, + IOpcSigningOptions *This, LPWSTR *signatureMethod); HRESULT (STDMETHODCALLTYPE *SetSignatureMethod)( - IOpcSigningOptions* This, + IOpcSigningOptions *This, LPCWSTR signatureMethod); HRESULT (STDMETHODCALLTYPE *GetDefaultDigestMethod)( - IOpcSigningOptions* This, + IOpcSigningOptions *This, LPWSTR *digestMethod); HRESULT (STDMETHODCALLTYPE *SetDefaultDigestMethod)( - IOpcSigningOptions* This, + IOpcSigningOptions *This, LPCWSTR digestMethod); HRESULT (STDMETHODCALLTYPE *GetCertificateEmbeddingOption)( - IOpcSigningOptions* This, + IOpcSigningOptions *This, OPC_CERTIFICATE_EMBEDDING_OPTION *embeddingOption); HRESULT (STDMETHODCALLTYPE *SetCertificateEmbeddingOption)( - IOpcSigningOptions* This, + IOpcSigningOptions *This, OPC_CERTIFICATE_EMBEDDING_OPTION embeddingOption); HRESULT (STDMETHODCALLTYPE *GetTimeFormat)( - IOpcSigningOptions* This, + IOpcSigningOptions *This, OPC_SIGNATURE_TIME_FORMAT *timeFormat); HRESULT (STDMETHODCALLTYPE *SetTimeFormat)( - IOpcSigningOptions* This, + IOpcSigningOptions *This, OPC_SIGNATURE_TIME_FORMAT timeFormat); HRESULT (STDMETHODCALLTYPE *GetSignaturePartReferenceSet)( - IOpcSigningOptions* This, + IOpcSigningOptions *This, IOpcSignaturePartReferenceSet **partReferenceSet); HRESULT (STDMETHODCALLTYPE *GetSignatureRelationshipReferenceSet)( - IOpcSigningOptions* This, + IOpcSigningOptions *This, IOpcSignatureRelationshipReferenceSet **relationshipReferenceSet); HRESULT (STDMETHODCALLTYPE *GetCustomObjectSet)( - IOpcSigningOptions* This, + IOpcSigningOptions *This, IOpcSignatureCustomObjectSet **customObjectSet); HRESULT (STDMETHODCALLTYPE *GetCustomReferenceSet)( - IOpcSigningOptions* This, + IOpcSigningOptions *This, IOpcSignatureReferenceSet **customReferenceSet); HRESULT (STDMETHODCALLTYPE *GetCertificateSet)( - IOpcSigningOptions* This, + IOpcSigningOptions *This, IOpcCertificateSet **certificateSet); HRESULT (STDMETHODCALLTYPE *GetSignaturePartName)( - IOpcSigningOptions* This, + IOpcSigningOptions *This, IOpcPartUri **signaturePartName); HRESULT (STDMETHODCALLTYPE *SetSignaturePartName)( - IOpcSigningOptions* This, + IOpcSigningOptions *This, IOpcPartUri *signaturePartName); END_INTERFACE } IOpcSigningOptionsVtbl; + interface IOpcSigningOptions { CONST_VTBL IOpcSigningOptionsVtbl* lpVtbl; }; @@ -5676,142 +4825,6 @@ static FORCEINLINE HRESULT IOpcSigningOptions_SetSignaturePartName(IOpcSigningOp #endif -HRESULT STDMETHODCALLTYPE IOpcSigningOptions_GetSignatureId_Proxy( - IOpcSigningOptions* This, - LPWSTR *signatureId); -void __RPC_STUB IOpcSigningOptions_GetSignatureId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSigningOptions_SetSignatureId_Proxy( - IOpcSigningOptions* This, - LPCWSTR signatureId); -void __RPC_STUB IOpcSigningOptions_SetSignatureId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSigningOptions_GetSignatureMethod_Proxy( - IOpcSigningOptions* This, - LPWSTR *signatureMethod); -void __RPC_STUB IOpcSigningOptions_GetSignatureMethod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSigningOptions_SetSignatureMethod_Proxy( - IOpcSigningOptions* This, - LPCWSTR signatureMethod); -void __RPC_STUB IOpcSigningOptions_SetSignatureMethod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSigningOptions_GetDefaultDigestMethod_Proxy( - IOpcSigningOptions* This, - LPWSTR *digestMethod); -void __RPC_STUB IOpcSigningOptions_GetDefaultDigestMethod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSigningOptions_SetDefaultDigestMethod_Proxy( - IOpcSigningOptions* This, - LPCWSTR digestMethod); -void __RPC_STUB IOpcSigningOptions_SetDefaultDigestMethod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSigningOptions_GetCertificateEmbeddingOption_Proxy( - IOpcSigningOptions* This, - OPC_CERTIFICATE_EMBEDDING_OPTION *embeddingOption); -void __RPC_STUB IOpcSigningOptions_GetCertificateEmbeddingOption_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSigningOptions_SetCertificateEmbeddingOption_Proxy( - IOpcSigningOptions* This, - OPC_CERTIFICATE_EMBEDDING_OPTION embeddingOption); -void __RPC_STUB IOpcSigningOptions_SetCertificateEmbeddingOption_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSigningOptions_GetTimeFormat_Proxy( - IOpcSigningOptions* This, - OPC_SIGNATURE_TIME_FORMAT *timeFormat); -void __RPC_STUB IOpcSigningOptions_GetTimeFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSigningOptions_SetTimeFormat_Proxy( - IOpcSigningOptions* This, - OPC_SIGNATURE_TIME_FORMAT timeFormat); -void __RPC_STUB IOpcSigningOptions_SetTimeFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSigningOptions_GetSignaturePartReferenceSet_Proxy( - IOpcSigningOptions* This, - IOpcSignaturePartReferenceSet **partReferenceSet); -void __RPC_STUB IOpcSigningOptions_GetSignaturePartReferenceSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSigningOptions_GetSignatureRelationshipReferenceSet_Proxy( - IOpcSigningOptions* This, - IOpcSignatureRelationshipReferenceSet **relationshipReferenceSet); -void __RPC_STUB IOpcSigningOptions_GetSignatureRelationshipReferenceSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSigningOptions_GetCustomObjectSet_Proxy( - IOpcSigningOptions* This, - IOpcSignatureCustomObjectSet **customObjectSet); -void __RPC_STUB IOpcSigningOptions_GetCustomObjectSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSigningOptions_GetCustomReferenceSet_Proxy( - IOpcSigningOptions* This, - IOpcSignatureReferenceSet **customReferenceSet); -void __RPC_STUB IOpcSigningOptions_GetCustomReferenceSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSigningOptions_GetCertificateSet_Proxy( - IOpcSigningOptions* This, - IOpcCertificateSet **certificateSet); -void __RPC_STUB IOpcSigningOptions_GetCertificateSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSigningOptions_GetSignaturePartName_Proxy( - IOpcSigningOptions* This, - IOpcPartUri **signaturePartName); -void __RPC_STUB IOpcSigningOptions_GetSignaturePartName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcSigningOptions_SetSignaturePartName_Proxy( - IOpcSigningOptions* This, - IOpcPartUri *signaturePartName); -void __RPC_STUB IOpcSigningOptions_SetSignaturePartName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcSigningOptions_INTERFACE_DEFINED__ */ @@ -5867,28 +4880,28 @@ typedef struct IOpcFactoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpcFactory* This, + IOpcFactory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpcFactory* This); + IOpcFactory *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpcFactory* This); + IOpcFactory *This); /*** IOpcFactory methods ***/ HRESULT (STDMETHODCALLTYPE *CreatePackageRootUri)( - IOpcFactory* This, + IOpcFactory *This, IOpcUri **rootUri); HRESULT (STDMETHODCALLTYPE *CreatePartUri)( - IOpcFactory* This, + IOpcFactory *This, LPCWSTR pwzUri, IOpcPartUri **partUri); HRESULT (STDMETHODCALLTYPE *CreateStreamOnFile)( - IOpcFactory* This, + IOpcFactory *This, LPCWSTR filename, OPC_STREAM_IO_MODE ioMode, LPSECURITY_ATTRIBUTES securityAttributes, @@ -5896,28 +4909,29 @@ typedef struct IOpcFactoryVtbl { IStream **stream); HRESULT (STDMETHODCALLTYPE *CreatePackage)( - IOpcFactory* This, + IOpcFactory *This, IOpcPackage **package); HRESULT (STDMETHODCALLTYPE *ReadPackageFromStream)( - IOpcFactory* This, + IOpcFactory *This, IStream *stream, OPC_READ_FLAGS flags, IOpcPackage **package); HRESULT (STDMETHODCALLTYPE *WritePackageToStream)( - IOpcFactory* This, + IOpcFactory *This, IOpcPackage *package, OPC_WRITE_FLAGS flags, IStream *stream); HRESULT (STDMETHODCALLTYPE *CreateDigitalSignatureManager)( - IOpcFactory* This, + IOpcFactory *This, IOpcPackage *package, IOpcDigitalSignatureManager **signatureManager); END_INTERFACE } IOpcFactoryVtbl; + interface IOpcFactory { CONST_VTBL IOpcFactoryVtbl* lpVtbl; }; @@ -5974,60 +4988,6 @@ static FORCEINLINE HRESULT IOpcFactory_CreateDigitalSignatureManager(IOpcFactory #endif -HRESULT STDMETHODCALLTYPE IOpcFactory_CreatePackageRootUri_Proxy( - IOpcFactory* This, - IOpcUri **rootUri); -void __RPC_STUB IOpcFactory_CreatePackageRootUri_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcFactory_CreatePartUri_Proxy( - IOpcFactory* This, - LPCWSTR pwzUri, - IOpcPartUri **partUri); -void __RPC_STUB IOpcFactory_CreatePartUri_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcFactory_CreatePackage_Proxy( - IOpcFactory* This, - IOpcPackage **package); -void __RPC_STUB IOpcFactory_CreatePackage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcFactory_ReadPackageFromStream_Proxy( - IOpcFactory* This, - IStream *stream, - OPC_READ_FLAGS flags, - IOpcPackage **package); -void __RPC_STUB IOpcFactory_ReadPackageFromStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcFactory_WritePackageToStream_Proxy( - IOpcFactory* This, - IOpcPackage *package, - OPC_WRITE_FLAGS flags, - IStream *stream); -void __RPC_STUB IOpcFactory_WritePackageToStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpcFactory_CreateDigitalSignatureManager_Proxy( - IOpcFactory* This, - IOpcPackage *package, - IOpcDigitalSignatureManager **signatureManager); -void __RPC_STUB IOpcFactory_CreateDigitalSignatureManager_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpcFactory_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/msxml.h b/lib/libc/include/any-windows-any/msxml.h index 13f1286214..23884b4ffb 100644 --- a/lib/libc/include/any-windows-any/msxml.h +++ b/lib/libc/include/any-windows-any/msxml.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/msxml.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/msxml.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/namedpipeapi.h b/lib/libc/include/any-windows-any/namedpipeapi.h index f5b2971161..0b59c37f6b 100644 --- a/lib/libc/include/any-windows-any/namedpipeapi.h +++ b/lib/libc/include/any-windows-any/namedpipeapi.h @@ -16,6 +16,9 @@ extern "C" { #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) WINADVAPI WINBOOL WINAPI ImpersonateNamedPipeClient (HANDLE hNamedPipe); +#endif + +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= _WIN32_WINNT_WIN10 WINBASEAPI WINBOOL WINAPI CreatePipe (PHANDLE hReadPipe, PHANDLE hWritePipe, LPSECURITY_ATTRIBUTES lpPipeAttributes, DWORD nSize); WINBASEAPI WINBOOL WINAPI ConnectNamedPipe (HANDLE hNamedPipe, LPOVERLAPPED lpOverlapped); WINBASEAPI WINBOOL WINAPI DisconnectNamedPipe (HANDLE hNamedPipe); diff --git a/lib/libc/include/any-windows-any/napcertrelyingparty.h b/lib/libc/include/any-windows-any/napcertrelyingparty.h index ae904ab37f..f078233cec 100644 --- a/lib/libc/include/any-windows-any/napcertrelyingparty.h +++ b/lib/libc/include/any-windows-any/napcertrelyingparty.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/napcertrelyingparty.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/napcertrelyingparty.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,6 +21,9 @@ #ifndef __INapCertRelyingParty_FWD_DEFINED__ #define __INapCertRelyingParty_FWD_DEFINED__ typedef interface INapCertRelyingParty INapCertRelyingParty; +#ifdef __cplusplus +interface INapCertRelyingParty; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -76,36 +80,37 @@ typedef struct INapCertRelyingPartyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INapCertRelyingParty* This, + INapCertRelyingParty *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INapCertRelyingParty* This); + INapCertRelyingParty *This); ULONG (STDMETHODCALLTYPE *Release)( - INapCertRelyingParty* This); + INapCertRelyingParty *This); /*** INapCertRelyingParty methods ***/ HRESULT (STDMETHODCALLTYPE *SubscribeCertByGroup)( - INapCertRelyingParty* This, + INapCertRelyingParty *This, EnforcementEntityId id, const BSTR subscriberName, const VARIANT *reserved, WINBOOL *certExists); HRESULT (STDMETHODCALLTYPE *UnSubscribeCertByGroup)( - INapCertRelyingParty* This, + INapCertRelyingParty *This, EnforcementEntityId id, const VARIANT *reserved); HRESULT (STDMETHODCALLTYPE *GetSubscribedRelyingParties)( - INapCertRelyingParty* This, + INapCertRelyingParty *This, EnforcementEntityCount *count, EnforcementEntityId **relyingParties); END_INTERFACE } INapCertRelyingPartyVtbl; + interface INapCertRelyingParty { CONST_VTBL INapCertRelyingPartyVtbl* lpVtbl; }; @@ -146,35 +151,6 @@ static FORCEINLINE HRESULT INapCertRelyingParty_GetSubscribedRelyingParties(INap #endif -HRESULT STDMETHODCALLTYPE INapCertRelyingParty_SubscribeCertByGroup_Proxy( - INapCertRelyingParty* This, - EnforcementEntityId id, - const BSTR subscriberName, - const VARIANT *reserved, - WINBOOL *certExists); -void __RPC_STUB INapCertRelyingParty_SubscribeCertByGroup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapCertRelyingParty_UnSubscribeCertByGroup_Proxy( - INapCertRelyingParty* This, - EnforcementEntityId id, - const VARIANT *reserved); -void __RPC_STUB INapCertRelyingParty_UnSubscribeCertByGroup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapCertRelyingParty_GetSubscribedRelyingParties_Proxy( - INapCertRelyingParty* This, - EnforcementEntityCount *count, - EnforcementEntityId **relyingParties); -void __RPC_STUB INapCertRelyingParty_GetSubscribedRelyingParties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INapCertRelyingParty_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/napcommon.h b/lib/libc/include/any-windows-any/napcommon.h index 9b5c7906ab..c8defd5ade 100644 --- a/lib/libc/include/any-windows-any/napcommon.h +++ b/lib/libc/include/any-windows-any/napcommon.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/napcommon.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/napcommon.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,21 +21,33 @@ #ifndef __INapComponentConfig_FWD_DEFINED__ #define __INapComponentConfig_FWD_DEFINED__ typedef interface INapComponentConfig INapComponentConfig; +#ifdef __cplusplus +interface INapComponentConfig; +#endif /* __cplusplus */ #endif #ifndef __INapComponentInfo_FWD_DEFINED__ #define __INapComponentInfo_FWD_DEFINED__ typedef interface INapComponentInfo INapComponentInfo; +#ifdef __cplusplus +interface INapComponentInfo; +#endif /* __cplusplus */ #endif #ifndef __INapComponentConfig2_FWD_DEFINED__ #define __INapComponentConfig2_FWD_DEFINED__ typedef interface INapComponentConfig2 INapComponentConfig2; +#ifdef __cplusplus +interface INapComponentConfig2; +#endif /* __cplusplus */ #endif #ifndef __INapComponentConfig3_FWD_DEFINED__ #define __INapComponentConfig3_FWD_DEFINED__ typedef interface INapComponentConfig3 INapComponentConfig3; +#ifdef __cplusplus +interface INapComponentConfig3; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -84,37 +97,38 @@ typedef struct INapComponentConfigVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INapComponentConfig* This, + INapComponentConfig *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INapComponentConfig* This); + INapComponentConfig *This); ULONG (STDMETHODCALLTYPE *Release)( - INapComponentConfig* This); + INapComponentConfig *This); /*** INapComponentConfig methods ***/ HRESULT (STDMETHODCALLTYPE *IsUISupported)( - INapComponentConfig* This, + INapComponentConfig *This, WINBOOL *isSupported); HRESULT (STDMETHODCALLTYPE *InvokeUI)( - INapComponentConfig* This, + INapComponentConfig *This, HWND hwndParent); HRESULT (STDMETHODCALLTYPE *GetConfig)( - INapComponentConfig* This, + INapComponentConfig *This, UINT16 *bCount, BYTE **data); HRESULT (STDMETHODCALLTYPE *SetConfig)( - INapComponentConfig* This, + INapComponentConfig *This, UINT16 bCount, BYTE *data); END_INTERFACE } INapComponentConfigVtbl; + interface INapComponentConfig { CONST_VTBL INapComponentConfigVtbl* lpVtbl; }; @@ -159,40 +173,6 @@ static FORCEINLINE HRESULT INapComponentConfig_SetConfig(INapComponentConfig* Th #endif -HRESULT STDMETHODCALLTYPE INapComponentConfig_IsUISupported_Proxy( - INapComponentConfig* This, - WINBOOL *isSupported); -void __RPC_STUB INapComponentConfig_IsUISupported_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapComponentConfig_InvokeUI_Proxy( - INapComponentConfig* This, - HWND hwndParent); -void __RPC_STUB INapComponentConfig_InvokeUI_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapComponentConfig_GetConfig_Proxy( - INapComponentConfig* This, - UINT16 *bCount, - BYTE **data); -void __RPC_STUB INapComponentConfig_GetConfig_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapComponentConfig_SetConfig_Proxy( - INapComponentConfig* This, - UINT16 bCount, - BYTE *data); -void __RPC_STUB INapComponentConfig_SetConfig_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INapComponentConfig_INTERFACE_DEFINED__ */ @@ -241,50 +221,51 @@ typedef struct INapComponentInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INapComponentInfo* This, + INapComponentInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INapComponentInfo* This); + INapComponentInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - INapComponentInfo* This); + INapComponentInfo *This); /*** INapComponentInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetFriendlyName)( - INapComponentInfo* This, + INapComponentInfo *This, MessageId *friendlyName); HRESULT (STDMETHODCALLTYPE *GetDescription)( - INapComponentInfo* This, + INapComponentInfo *This, MessageId *description); HRESULT (STDMETHODCALLTYPE *GetVendorName)( - INapComponentInfo* This, + INapComponentInfo *This, MessageId *vendorName); HRESULT (STDMETHODCALLTYPE *GetVersion)( - INapComponentInfo* This, + INapComponentInfo *This, MessageId *version); HRESULT (STDMETHODCALLTYPE *GetIcon)( - INapComponentInfo* This, + INapComponentInfo *This, CountedString **dllFilePath, UINT32 *iconResourceId); HRESULT (STDMETHODCALLTYPE *ConvertErrorCodeToMessageId)( - INapComponentInfo* This, + INapComponentInfo *This, HRESULT errorCode, MessageId *msgId); HRESULT (STDMETHODCALLTYPE *GetLocalizedString)( - INapComponentInfo* This, + INapComponentInfo *This, MessageId msgId, CountedString **string); END_INTERFACE } INapComponentInfoVtbl; + interface INapComponentInfo { CONST_VTBL INapComponentInfoVtbl* lpVtbl; }; @@ -341,65 +322,6 @@ static FORCEINLINE HRESULT INapComponentInfo_GetLocalizedString(INapComponentInf #endif -HRESULT STDMETHODCALLTYPE INapComponentInfo_GetFriendlyName_Proxy( - INapComponentInfo* This, - MessageId *friendlyName); -void __RPC_STUB INapComponentInfo_GetFriendlyName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapComponentInfo_GetDescription_Proxy( - INapComponentInfo* This, - MessageId *description); -void __RPC_STUB INapComponentInfo_GetDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapComponentInfo_GetVendorName_Proxy( - INapComponentInfo* This, - MessageId *vendorName); -void __RPC_STUB INapComponentInfo_GetVendorName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapComponentInfo_GetVersion_Proxy( - INapComponentInfo* This, - MessageId *version); -void __RPC_STUB INapComponentInfo_GetVersion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapComponentInfo_GetIcon_Proxy( - INapComponentInfo* This, - CountedString **dllFilePath, - UINT32 *iconResourceId); -void __RPC_STUB INapComponentInfo_GetIcon_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapComponentInfo_ConvertErrorCodeToMessageId_Proxy( - INapComponentInfo* This, - HRESULT errorCode, - MessageId *msgId); -void __RPC_STUB INapComponentInfo_ConvertErrorCodeToMessageId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapComponentInfo_GetLocalizedString_Proxy( - INapComponentInfo* This, - MessageId msgId, - CountedString **string); -void __RPC_STUB INapComponentInfo_GetLocalizedString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INapComponentInfo_INTERFACE_DEFINED__ */ @@ -440,48 +362,48 @@ typedef struct INapComponentConfig2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INapComponentConfig2* This, + INapComponentConfig2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INapComponentConfig2* This); + INapComponentConfig2 *This); ULONG (STDMETHODCALLTYPE *Release)( - INapComponentConfig2* This); + INapComponentConfig2 *This); /*** INapComponentConfig methods ***/ HRESULT (STDMETHODCALLTYPE *IsUISupported)( - INapComponentConfig2* This, + INapComponentConfig2 *This, WINBOOL *isSupported); HRESULT (STDMETHODCALLTYPE *InvokeUI)( - INapComponentConfig2* This, + INapComponentConfig2 *This, HWND hwndParent); HRESULT (STDMETHODCALLTYPE *GetConfig)( - INapComponentConfig2* This, + INapComponentConfig2 *This, UINT16 *bCount, BYTE **data); HRESULT (STDMETHODCALLTYPE *SetConfig)( - INapComponentConfig2* This, + INapComponentConfig2 *This, UINT16 bCount, BYTE *data); /*** INapComponentConfig2 methods ***/ HRESULT (STDMETHODCALLTYPE *IsRemoteConfigSupported)( - INapComponentConfig2* This, + INapComponentConfig2 *This, WINBOOL *isSupported, UINT8 *remoteConfigType); HRESULT (STDMETHODCALLTYPE *InvokeUIForMachine)( - INapComponentConfig2* This, + INapComponentConfig2 *This, HWND hwndParent, CountedString *machineName); HRESULT (STDMETHODCALLTYPE *InvokeUIFromConfigBlob)( - INapComponentConfig2* This, + INapComponentConfig2 *This, HWND hwndParent, UINT16 inbCount, BYTE *inData, @@ -491,6 +413,7 @@ typedef struct INapComponentConfig2Vtbl { END_INTERFACE } INapComponentConfig2Vtbl; + interface INapComponentConfig2 { CONST_VTBL INapComponentConfig2Vtbl* lpVtbl; }; @@ -549,37 +472,6 @@ static FORCEINLINE HRESULT INapComponentConfig2_InvokeUIFromConfigBlob(INapCompo #endif -HRESULT STDMETHODCALLTYPE INapComponentConfig2_IsRemoteConfigSupported_Proxy( - INapComponentConfig2* This, - WINBOOL *isSupported, - UINT8 *remoteConfigType); -void __RPC_STUB INapComponentConfig2_IsRemoteConfigSupported_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapComponentConfig2_InvokeUIForMachine_Proxy( - INapComponentConfig2* This, - HWND hwndParent, - CountedString *machineName); -void __RPC_STUB INapComponentConfig2_InvokeUIForMachine_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapComponentConfig2_InvokeUIFromConfigBlob_Proxy( - INapComponentConfig2* This, - HWND hwndParent, - UINT16 inbCount, - BYTE *inData, - UINT16 *outbCount, - BYTE **outdata, - WINBOOL *fConfigChanged); -void __RPC_STUB INapComponentConfig2_InvokeUIFromConfigBlob_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INapComponentConfig2_INTERFACE_DEFINED__ */ @@ -623,48 +515,48 @@ typedef struct INapComponentConfig3Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INapComponentConfig3* This, + INapComponentConfig3 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INapComponentConfig3* This); + INapComponentConfig3 *This); ULONG (STDMETHODCALLTYPE *Release)( - INapComponentConfig3* This); + INapComponentConfig3 *This); /*** INapComponentConfig methods ***/ HRESULT (STDMETHODCALLTYPE *IsUISupported)( - INapComponentConfig3* This, + INapComponentConfig3 *This, WINBOOL *isSupported); HRESULT (STDMETHODCALLTYPE *InvokeUI)( - INapComponentConfig3* This, + INapComponentConfig3 *This, HWND hwndParent); HRESULT (STDMETHODCALLTYPE *GetConfig)( - INapComponentConfig3* This, + INapComponentConfig3 *This, UINT16 *bCount, BYTE **data); HRESULT (STDMETHODCALLTYPE *SetConfig)( - INapComponentConfig3* This, + INapComponentConfig3 *This, UINT16 bCount, BYTE *data); /*** INapComponentConfig2 methods ***/ HRESULT (STDMETHODCALLTYPE *IsRemoteConfigSupported)( - INapComponentConfig3* This, + INapComponentConfig3 *This, WINBOOL *isSupported, UINT8 *remoteConfigType); HRESULT (STDMETHODCALLTYPE *InvokeUIForMachine)( - INapComponentConfig3* This, + INapComponentConfig3 *This, HWND hwndParent, CountedString *machineName); HRESULT (STDMETHODCALLTYPE *InvokeUIFromConfigBlob)( - INapComponentConfig3* This, + INapComponentConfig3 *This, HWND hwndParent, UINT16 inbCount, BYTE *inData, @@ -674,30 +566,31 @@ typedef struct INapComponentConfig3Vtbl { /*** INapComponentConfig3 methods ***/ HRESULT (STDMETHODCALLTYPE *NewConfig)( - INapComponentConfig3* This, + INapComponentConfig3 *This, UINT32 configID); HRESULT (STDMETHODCALLTYPE *DeleteConfig)( - INapComponentConfig3* This, + INapComponentConfig3 *This, UINT32 configID); HRESULT (STDMETHODCALLTYPE *DeleteAllConfig)( - INapComponentConfig3* This); + INapComponentConfig3 *This); HRESULT (STDMETHODCALLTYPE *GetConfigFromID)( - INapComponentConfig3* This, + INapComponentConfig3 *This, UINT32 configID, UINT16 *count, BYTE **outdata); HRESULT (STDMETHODCALLTYPE *SetConfigToID)( - INapComponentConfig3* This, + INapComponentConfig3 *This, UINT32 configID, UINT16 count, BYTE *data); END_INTERFACE } INapComponentConfig3Vtbl; + interface INapComponentConfig3 { CONST_VTBL INapComponentConfig3Vtbl* lpVtbl; }; @@ -778,49 +671,6 @@ static FORCEINLINE HRESULT INapComponentConfig3_SetConfigToID(INapComponentConfi #endif -HRESULT STDMETHODCALLTYPE INapComponentConfig3_NewConfig_Proxy( - INapComponentConfig3* This, - UINT32 configID); -void __RPC_STUB INapComponentConfig3_NewConfig_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapComponentConfig3_DeleteConfig_Proxy( - INapComponentConfig3* This, - UINT32 configID); -void __RPC_STUB INapComponentConfig3_DeleteConfig_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapComponentConfig3_DeleteAllConfig_Proxy( - INapComponentConfig3* This); -void __RPC_STUB INapComponentConfig3_DeleteAllConfig_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapComponentConfig3_GetConfigFromID_Proxy( - INapComponentConfig3* This, - UINT32 configID, - UINT16 *count, - BYTE **outdata); -void __RPC_STUB INapComponentConfig3_GetConfigFromID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapComponentConfig3_SetConfigToID_Proxy( - INapComponentConfig3* This, - UINT32 configID, - UINT16 count, - BYTE *data); -void __RPC_STUB INapComponentConfig3_SetConfigToID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INapComponentConfig3_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/napenforcementclient.h b/lib/libc/include/any-windows-any/napenforcementclient.h index 7e822e89b9..58a635d21d 100644 --- a/lib/libc/include/any-windows-any/napenforcementclient.h +++ b/lib/libc/include/any-windows-any/napenforcementclient.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/napenforcementclient.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/napenforcementclient.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,21 +21,33 @@ #ifndef __INapEnforcementClientBinding_FWD_DEFINED__ #define __INapEnforcementClientBinding_FWD_DEFINED__ typedef interface INapEnforcementClientBinding INapEnforcementClientBinding; +#ifdef __cplusplus +interface INapEnforcementClientBinding; +#endif /* __cplusplus */ #endif #ifndef __INapEnforcementClientCallback_FWD_DEFINED__ #define __INapEnforcementClientCallback_FWD_DEFINED__ typedef interface INapEnforcementClientCallback INapEnforcementClientCallback; +#ifdef __cplusplus +interface INapEnforcementClientCallback; +#endif /* __cplusplus */ #endif #ifndef __INapEnforcementClientConnection_FWD_DEFINED__ #define __INapEnforcementClientConnection_FWD_DEFINED__ typedef interface INapEnforcementClientConnection INapEnforcementClientConnection; +#ifdef __cplusplus +interface INapEnforcementClientConnection; +#endif /* __cplusplus */ #endif #ifndef __INapEnforcementClientConnection2_FWD_DEFINED__ #define __INapEnforcementClientConnection2_FWD_DEFINED__ typedef interface INapEnforcementClientConnection2 INapEnforcementClientConnection2; +#ifdef __cplusplus +interface INapEnforcementClientConnection2; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -52,21 +65,33 @@ extern "C" { #ifndef __INapEnforcementClientBinding_FWD_DEFINED__ #define __INapEnforcementClientBinding_FWD_DEFINED__ typedef interface INapEnforcementClientBinding INapEnforcementClientBinding; +#ifdef __cplusplus +interface INapEnforcementClientBinding; +#endif /* __cplusplus */ #endif #ifndef __INapEnforcementClientCallback_FWD_DEFINED__ #define __INapEnforcementClientCallback_FWD_DEFINED__ typedef interface INapEnforcementClientCallback INapEnforcementClientCallback; +#ifdef __cplusplus +interface INapEnforcementClientCallback; +#endif /* __cplusplus */ #endif #ifndef __INapEnforcementClientConnection_FWD_DEFINED__ #define __INapEnforcementClientConnection_FWD_DEFINED__ typedef interface INapEnforcementClientConnection INapEnforcementClientConnection; +#ifdef __cplusplus +interface INapEnforcementClientConnection; +#endif /* __cplusplus */ #endif #ifndef __INapEnforcementClientConnection2_FWD_DEFINED__ #define __INapEnforcementClientConnection2_FWD_DEFINED__ typedef interface INapEnforcementClientConnection2 INapEnforcementClientConnection2; +#ifdef __cplusplus +interface INapEnforcementClientConnection2; +#endif /* __cplusplus */ #endif /***************************************************************************** @@ -113,47 +138,48 @@ typedef struct INapEnforcementClientBindingVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INapEnforcementClientBinding* This, + INapEnforcementClientBinding *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INapEnforcementClientBinding* This); + INapEnforcementClientBinding *This); ULONG (STDMETHODCALLTYPE *Release)( - INapEnforcementClientBinding* This); + INapEnforcementClientBinding *This); /*** INapEnforcementClientBinding methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - INapEnforcementClientBinding* This, + INapEnforcementClientBinding *This, EnforcementEntityId id, INapEnforcementClientCallback *callback); HRESULT (STDMETHODCALLTYPE *Uninitialize)( - INapEnforcementClientBinding* This); + INapEnforcementClientBinding *This); HRESULT (STDMETHODCALLTYPE *CreateConnection)( - INapEnforcementClientBinding* This, + INapEnforcementClientBinding *This, INapEnforcementClientConnection **connection); HRESULT (STDMETHODCALLTYPE *GetSoHRequest)( - INapEnforcementClientBinding* This, + INapEnforcementClientBinding *This, INapEnforcementClientConnection *connection, WINBOOL *retriggerHint); HRESULT (STDMETHODCALLTYPE *ProcessSoHResponse)( - INapEnforcementClientBinding* This, + INapEnforcementClientBinding *This, INapEnforcementClientConnection *connection); HRESULT (STDMETHODCALLTYPE *NotifyConnectionStateDown)( - INapEnforcementClientBinding* This, + INapEnforcementClientBinding *This, INapEnforcementClientConnection *downCxn); HRESULT (STDMETHODCALLTYPE *NotifySoHChangeFailure)( - INapEnforcementClientBinding* This); + INapEnforcementClientBinding *This); END_INTERFACE } INapEnforcementClientBindingVtbl; + interface INapEnforcementClientBinding { CONST_VTBL INapEnforcementClientBindingVtbl* lpVtbl; }; @@ -210,62 +236,6 @@ static FORCEINLINE HRESULT INapEnforcementClientBinding_NotifySoHChangeFailure(I #endif -HRESULT STDMETHODCALLTYPE INapEnforcementClientBinding_Initialize_Proxy( - INapEnforcementClientBinding* This, - EnforcementEntityId id, - INapEnforcementClientCallback *callback); -void __RPC_STUB INapEnforcementClientBinding_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientBinding_Uninitialize_Proxy( - INapEnforcementClientBinding* This); -void __RPC_STUB INapEnforcementClientBinding_Uninitialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientBinding_CreateConnection_Proxy( - INapEnforcementClientBinding* This, - INapEnforcementClientConnection **connection); -void __RPC_STUB INapEnforcementClientBinding_CreateConnection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientBinding_GetSoHRequest_Proxy( - INapEnforcementClientBinding* This, - INapEnforcementClientConnection *connection, - WINBOOL *retriggerHint); -void __RPC_STUB INapEnforcementClientBinding_GetSoHRequest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientBinding_ProcessSoHResponse_Proxy( - INapEnforcementClientBinding* This, - INapEnforcementClientConnection *connection); -void __RPC_STUB INapEnforcementClientBinding_ProcessSoHResponse_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientBinding_NotifyConnectionStateDown_Proxy( - INapEnforcementClientBinding* This, - INapEnforcementClientConnection *downCxn); -void __RPC_STUB INapEnforcementClientBinding_NotifyConnectionStateDown_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientBinding_NotifySoHChangeFailure_Proxy( - INapEnforcementClientBinding* This); -void __RPC_STUB INapEnforcementClientBinding_NotifySoHChangeFailure_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INapEnforcementClientBinding_INTERFACE_DEFINED__ */ @@ -300,26 +270,27 @@ typedef struct INapEnforcementClientCallbackVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INapEnforcementClientCallback* This, + INapEnforcementClientCallback *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INapEnforcementClientCallback* This); + INapEnforcementClientCallback *This); ULONG (STDMETHODCALLTYPE *Release)( - INapEnforcementClientCallback* This); + INapEnforcementClientCallback *This); /*** INapEnforcementClientCallback methods ***/ HRESULT (STDMETHODCALLTYPE *NotifySoHChange)( - INapEnforcementClientCallback* This); + INapEnforcementClientCallback *This); HRESULT (STDMETHODCALLTYPE *GetConnections)( - INapEnforcementClientCallback* This, + INapEnforcementClientCallback *This, Connections **connections); END_INTERFACE } INapEnforcementClientCallbackVtbl; + interface INapEnforcementClientCallback { CONST_VTBL INapEnforcementClientCallbackVtbl* lpVtbl; }; @@ -356,21 +327,6 @@ static FORCEINLINE HRESULT INapEnforcementClientCallback_GetConnections(INapEnfo #endif -HRESULT STDMETHODCALLTYPE INapEnforcementClientCallback_NotifySoHChange_Proxy( - INapEnforcementClientCallback* This); -void __RPC_STUB INapEnforcementClientCallback_NotifySoHChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientCallback_GetConnections_Proxy( - INapEnforcementClientCallback* This, - Connections **connections); -void __RPC_STUB INapEnforcementClientCallback_GetConnections_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INapEnforcementClientCallback_INTERFACE_DEFINED__ */ @@ -462,99 +418,100 @@ typedef struct INapEnforcementClientConnectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INapEnforcementClientConnection* This, + INapEnforcementClientConnection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INapEnforcementClientConnection* This); + INapEnforcementClientConnection *This); ULONG (STDMETHODCALLTYPE *Release)( - INapEnforcementClientConnection* This); + INapEnforcementClientConnection *This); /*** INapEnforcementClientConnection methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - INapEnforcementClientConnection* This, + INapEnforcementClientConnection *This, EnforcementEntityId id); HRESULT (STDMETHODCALLTYPE *SetMaxSize)( - INapEnforcementClientConnection* This, + INapEnforcementClientConnection *This, ProtocolMaxSize maxSize); HRESULT (STDMETHODCALLTYPE *GetMaxSize)( - INapEnforcementClientConnection* This, + INapEnforcementClientConnection *This, ProtocolMaxSize *maxSize); HRESULT (STDMETHODCALLTYPE *SetFlags)( - INapEnforcementClientConnection* This, + INapEnforcementClientConnection *This, UINT8 flags); HRESULT (STDMETHODCALLTYPE *GetFlags)( - INapEnforcementClientConnection* This, + INapEnforcementClientConnection *This, UINT8 *flags); HRESULT (STDMETHODCALLTYPE *SetConnectionId)( - INapEnforcementClientConnection* This, + INapEnforcementClientConnection *This, const ConnectionId *connectionId); HRESULT (STDMETHODCALLTYPE *GetConnectionId)( - INapEnforcementClientConnection* This, + INapEnforcementClientConnection *This, ConnectionId **connectionId); HRESULT (STDMETHODCALLTYPE *GetCorrelationId)( - INapEnforcementClientConnection* This, + INapEnforcementClientConnection *This, CorrelationId *correlationId); HRESULT (STDMETHODCALLTYPE *GetStringCorrelationId)( - INapEnforcementClientConnection* This, + INapEnforcementClientConnection *This, StringCorrelationId **correlationId); HRESULT (STDMETHODCALLTYPE *SetCorrelationId)( - INapEnforcementClientConnection* This, + INapEnforcementClientConnection *This, CorrelationId correlationId); HRESULT (STDMETHODCALLTYPE *SetSoHRequest)( - INapEnforcementClientConnection* This, + INapEnforcementClientConnection *This, const NetworkSoHRequest *sohRequest); HRESULT (STDMETHODCALLTYPE *GetSoHRequest)( - INapEnforcementClientConnection* This, + INapEnforcementClientConnection *This, NetworkSoHRequest **sohRequest); HRESULT (STDMETHODCALLTYPE *SetSoHResponse)( - INapEnforcementClientConnection* This, + INapEnforcementClientConnection *This, const NetworkSoHResponse *sohResponse); HRESULT (STDMETHODCALLTYPE *GetSoHResponse)( - INapEnforcementClientConnection* This, + INapEnforcementClientConnection *This, NetworkSoHResponse **sohResponse); HRESULT (STDMETHODCALLTYPE *SetIsolationInfo)( - INapEnforcementClientConnection* This, + INapEnforcementClientConnection *This, const IsolationInfo *isolationInfo); HRESULT (STDMETHODCALLTYPE *GetIsolationInfo)( - INapEnforcementClientConnection* This, + INapEnforcementClientConnection *This, IsolationInfo **isolationInfo); HRESULT (STDMETHODCALLTYPE *SetPrivateData)( - INapEnforcementClientConnection* This, + INapEnforcementClientConnection *This, const PrivateData *privateData); HRESULT (STDMETHODCALLTYPE *GetPrivateData)( - INapEnforcementClientConnection* This, + INapEnforcementClientConnection *This, PrivateData **privateData); HRESULT (STDMETHODCALLTYPE *SetEnforcerPrivateData)( - INapEnforcementClientConnection* This, + INapEnforcementClientConnection *This, const PrivateData *privateData); HRESULT (STDMETHODCALLTYPE *GetEnforcerPrivateData)( - INapEnforcementClientConnection* This, + INapEnforcementClientConnection *This, PrivateData **privateData); END_INTERFACE } INapEnforcementClientConnectionVtbl; + interface INapEnforcementClientConnection { CONST_VTBL INapEnforcementClientConnectionVtbl* lpVtbl; }; @@ -663,166 +620,6 @@ static FORCEINLINE HRESULT INapEnforcementClientConnection_GetEnforcerPrivateDat #endif -HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_Initialize_Proxy( - INapEnforcementClientConnection* This, - EnforcementEntityId id); -void __RPC_STUB INapEnforcementClientConnection_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_SetMaxSize_Proxy( - INapEnforcementClientConnection* This, - ProtocolMaxSize maxSize); -void __RPC_STUB INapEnforcementClientConnection_SetMaxSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_GetMaxSize_Proxy( - INapEnforcementClientConnection* This, - ProtocolMaxSize *maxSize); -void __RPC_STUB INapEnforcementClientConnection_GetMaxSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_SetFlags_Proxy( - INapEnforcementClientConnection* This, - UINT8 flags); -void __RPC_STUB INapEnforcementClientConnection_SetFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_GetFlags_Proxy( - INapEnforcementClientConnection* This, - UINT8 *flags); -void __RPC_STUB INapEnforcementClientConnection_GetFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_SetConnectionId_Proxy( - INapEnforcementClientConnection* This, - const ConnectionId *connectionId); -void __RPC_STUB INapEnforcementClientConnection_SetConnectionId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_GetConnectionId_Proxy( - INapEnforcementClientConnection* This, - ConnectionId **connectionId); -void __RPC_STUB INapEnforcementClientConnection_GetConnectionId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_GetCorrelationId_Proxy( - INapEnforcementClientConnection* This, - CorrelationId *correlationId); -void __RPC_STUB INapEnforcementClientConnection_GetCorrelationId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_GetStringCorrelationId_Proxy( - INapEnforcementClientConnection* This, - StringCorrelationId **correlationId); -void __RPC_STUB INapEnforcementClientConnection_GetStringCorrelationId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_SetCorrelationId_Proxy( - INapEnforcementClientConnection* This, - CorrelationId correlationId); -void __RPC_STUB INapEnforcementClientConnection_SetCorrelationId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_SetSoHRequest_Proxy( - INapEnforcementClientConnection* This, - const NetworkSoHRequest *sohRequest); -void __RPC_STUB INapEnforcementClientConnection_SetSoHRequest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_GetSoHRequest_Proxy( - INapEnforcementClientConnection* This, - NetworkSoHRequest **sohRequest); -void __RPC_STUB INapEnforcementClientConnection_GetSoHRequest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_SetSoHResponse_Proxy( - INapEnforcementClientConnection* This, - const NetworkSoHResponse *sohResponse); -void __RPC_STUB INapEnforcementClientConnection_SetSoHResponse_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_GetSoHResponse_Proxy( - INapEnforcementClientConnection* This, - NetworkSoHResponse **sohResponse); -void __RPC_STUB INapEnforcementClientConnection_GetSoHResponse_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_SetIsolationInfo_Proxy( - INapEnforcementClientConnection* This, - const IsolationInfo *isolationInfo); -void __RPC_STUB INapEnforcementClientConnection_SetIsolationInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_GetIsolationInfo_Proxy( - INapEnforcementClientConnection* This, - IsolationInfo **isolationInfo); -void __RPC_STUB INapEnforcementClientConnection_GetIsolationInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_SetPrivateData_Proxy( - INapEnforcementClientConnection* This, - const PrivateData *privateData); -void __RPC_STUB INapEnforcementClientConnection_SetPrivateData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_GetPrivateData_Proxy( - INapEnforcementClientConnection* This, - PrivateData **privateData); -void __RPC_STUB INapEnforcementClientConnection_GetPrivateData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_SetEnforcerPrivateData_Proxy( - INapEnforcementClientConnection* This, - const PrivateData *privateData); -void __RPC_STUB INapEnforcementClientConnection_SetEnforcerPrivateData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_GetEnforcerPrivateData_Proxy( - INapEnforcementClientConnection* This, - PrivateData **privateData); -void __RPC_STUB INapEnforcementClientConnection_GetEnforcerPrivateData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INapEnforcementClientConnection_INTERFACE_DEFINED__ */ @@ -861,118 +658,119 @@ typedef struct INapEnforcementClientConnection2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INapEnforcementClientConnection2* This); + INapEnforcementClientConnection2 *This); ULONG (STDMETHODCALLTYPE *Release)( - INapEnforcementClientConnection2* This); + INapEnforcementClientConnection2 *This); /*** INapEnforcementClientConnection methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, EnforcementEntityId id); HRESULT (STDMETHODCALLTYPE *SetMaxSize)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, ProtocolMaxSize maxSize); HRESULT (STDMETHODCALLTYPE *GetMaxSize)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, ProtocolMaxSize *maxSize); HRESULT (STDMETHODCALLTYPE *SetFlags)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, UINT8 flags); HRESULT (STDMETHODCALLTYPE *GetFlags)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, UINT8 *flags); HRESULT (STDMETHODCALLTYPE *SetConnectionId)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, const ConnectionId *connectionId); HRESULT (STDMETHODCALLTYPE *GetConnectionId)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, ConnectionId **connectionId); HRESULT (STDMETHODCALLTYPE *GetCorrelationId)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, CorrelationId *correlationId); HRESULT (STDMETHODCALLTYPE *GetStringCorrelationId)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, StringCorrelationId **correlationId); HRESULT (STDMETHODCALLTYPE *SetCorrelationId)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, CorrelationId correlationId); HRESULT (STDMETHODCALLTYPE *SetSoHRequest)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, const NetworkSoHRequest *sohRequest); HRESULT (STDMETHODCALLTYPE *GetSoHRequest)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, NetworkSoHRequest **sohRequest); HRESULT (STDMETHODCALLTYPE *SetSoHResponse)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, const NetworkSoHResponse *sohResponse); HRESULT (STDMETHODCALLTYPE *GetSoHResponse)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, NetworkSoHResponse **sohResponse); HRESULT (STDMETHODCALLTYPE *SetIsolationInfo)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, const IsolationInfo *isolationInfo); HRESULT (STDMETHODCALLTYPE *GetIsolationInfo)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, IsolationInfo **isolationInfo); HRESULT (STDMETHODCALLTYPE *SetPrivateData)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, const PrivateData *privateData); HRESULT (STDMETHODCALLTYPE *GetPrivateData)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, PrivateData **privateData); HRESULT (STDMETHODCALLTYPE *SetEnforcerPrivateData)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, const PrivateData *privateData); HRESULT (STDMETHODCALLTYPE *GetEnforcerPrivateData)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, PrivateData **privateData); /*** INapEnforcementClientConnection2 methods ***/ HRESULT (STDMETHODCALLTYPE *SetIsolationInfoEx)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, const IsolationInfoEx *isolationInfo); HRESULT (STDMETHODCALLTYPE *GetIsolationInfoEx)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, IsolationInfoEx **isolationInfo); HRESULT (STDMETHODCALLTYPE *GetInstalledShvs)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, SystemHealthEntityCount *count, SystemHealthEntityId **ids); HRESULT (STDMETHODCALLTYPE *SetInstalledShvs)( - INapEnforcementClientConnection2* This, + INapEnforcementClientConnection2 *This, SystemHealthEntityCount count, SystemHealthEntityId *ids); END_INTERFACE } INapEnforcementClientConnection2Vtbl; + interface INapEnforcementClientConnection2 { CONST_VTBL INapEnforcementClientConnection2Vtbl* lpVtbl; }; @@ -1099,40 +897,6 @@ static FORCEINLINE HRESULT INapEnforcementClientConnection2_SetInstalledShvs(INa #endif -HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection2_SetIsolationInfoEx_Proxy( - INapEnforcementClientConnection2* This, - const IsolationInfoEx *isolationInfo); -void __RPC_STUB INapEnforcementClientConnection2_SetIsolationInfoEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection2_GetIsolationInfoEx_Proxy( - INapEnforcementClientConnection2* This, - IsolationInfoEx **isolationInfo); -void __RPC_STUB INapEnforcementClientConnection2_GetIsolationInfoEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection2_GetInstalledShvs_Proxy( - INapEnforcementClientConnection2* This, - SystemHealthEntityCount *count, - SystemHealthEntityId **ids); -void __RPC_STUB INapEnforcementClientConnection2_GetInstalledShvs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection2_SetInstalledShvs_Proxy( - INapEnforcementClientConnection2* This, - SystemHealthEntityCount count, - SystemHealthEntityId *ids); -void __RPC_STUB INapEnforcementClientConnection2_SetInstalledShvs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INapEnforcementClientConnection2_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/napmanagement.h b/lib/libc/include/any-windows-any/napmanagement.h index dfdbfb8cc3..f11306bd1d 100644 --- a/lib/libc/include/any-windows-any/napmanagement.h +++ b/lib/libc/include/any-windows-any/napmanagement.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/napmanagement.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/napmanagement.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,11 +21,17 @@ #ifndef __INapClientManagement_FWD_DEFINED__ #define __INapClientManagement_FWD_DEFINED__ typedef interface INapClientManagement INapClientManagement; +#ifdef __cplusplus +interface INapClientManagement; +#endif /* __cplusplus */ #endif #ifndef __INapClientManagement2_FWD_DEFINED__ #define __INapClientManagement2_FWD_DEFINED__ typedef interface INapClientManagement2 INapClientManagement2; +#ifdef __cplusplus +interface INapClientManagement2; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -91,57 +98,58 @@ typedef struct INapClientManagementVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INapClientManagement* This, + INapClientManagement *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INapClientManagement* This); + INapClientManagement *This); ULONG (STDMETHODCALLTYPE *Release)( - INapClientManagement* This); + INapClientManagement *This); /*** INapClientManagement methods ***/ HRESULT (STDMETHODCALLTYPE *GetNapClientInfo)( - INapClientManagement* This, + INapClientManagement *This, WINBOOL *isNapEnabled, CountedString **clientName, CountedString **clientDescription, CountedString **protocolVersion); HRESULT (STDMETHODCALLTYPE *GetSystemIsolationInfo)( - INapClientManagement* This, + INapClientManagement *This, IsolationInfo **isolationInfo, WINBOOL *unknownConnections); HRESULT (STDMETHODCALLTYPE *RegisterSystemHealthAgent)( - INapClientManagement* This, + INapClientManagement *This, const NapComponentRegistrationInfo *agent); HRESULT (STDMETHODCALLTYPE *UnregisterSystemHealthAgent)( - INapClientManagement* This, + INapClientManagement *This, SystemHealthEntityId id); HRESULT (STDMETHODCALLTYPE *RegisterEnforcementClient)( - INapClientManagement* This, + INapClientManagement *This, const NapComponentRegistrationInfo *enforcer); HRESULT (STDMETHODCALLTYPE *UnregisterEnforcementClient)( - INapClientManagement* This, + INapClientManagement *This, EnforcementEntityId id); HRESULT (STDMETHODCALLTYPE *GetRegisteredSystemHealthAgents)( - INapClientManagement* This, + INapClientManagement *This, SystemHealthEntityCount *count, NapComponentRegistrationInfo **agents); HRESULT (STDMETHODCALLTYPE *GetRegisteredEnforcementClients)( - INapClientManagement* This, + INapClientManagement *This, EnforcementEntityCount *count, NapComponentRegistrationInfo **enforcers); END_INTERFACE } INapClientManagementVtbl; + interface INapClientManagement { CONST_VTBL INapClientManagementVtbl* lpVtbl; }; @@ -202,76 +210,6 @@ static FORCEINLINE HRESULT INapClientManagement_GetRegisteredEnforcementClients( #endif -HRESULT STDMETHODCALLTYPE INapClientManagement_GetNapClientInfo_Proxy( - INapClientManagement* This, - WINBOOL *isNapEnabled, - CountedString **clientName, - CountedString **clientDescription, - CountedString **protocolVersion); -void __RPC_STUB INapClientManagement_GetNapClientInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapClientManagement_GetSystemIsolationInfo_Proxy( - INapClientManagement* This, - IsolationInfo **isolationInfo, - WINBOOL *unknownConnections); -void __RPC_STUB INapClientManagement_GetSystemIsolationInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapClientManagement_RegisterSystemHealthAgent_Proxy( - INapClientManagement* This, - const NapComponentRegistrationInfo *agent); -void __RPC_STUB INapClientManagement_RegisterSystemHealthAgent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapClientManagement_UnregisterSystemHealthAgent_Proxy( - INapClientManagement* This, - SystemHealthEntityId id); -void __RPC_STUB INapClientManagement_UnregisterSystemHealthAgent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapClientManagement_RegisterEnforcementClient_Proxy( - INapClientManagement* This, - const NapComponentRegistrationInfo *enforcer); -void __RPC_STUB INapClientManagement_RegisterEnforcementClient_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapClientManagement_UnregisterEnforcementClient_Proxy( - INapClientManagement* This, - EnforcementEntityId id); -void __RPC_STUB INapClientManagement_UnregisterEnforcementClient_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapClientManagement_GetRegisteredSystemHealthAgents_Proxy( - INapClientManagement* This, - SystemHealthEntityCount *count, - NapComponentRegistrationInfo **agents); -void __RPC_STUB INapClientManagement_GetRegisteredSystemHealthAgents_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapClientManagement_GetRegisteredEnforcementClients_Proxy( - INapClientManagement* This, - EnforcementEntityCount *count, - NapComponentRegistrationInfo **enforcers); -void __RPC_STUB INapClientManagement_GetRegisteredEnforcementClients_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INapClientManagement_INTERFACE_DEFINED__ */ @@ -300,63 +238,64 @@ typedef struct INapClientManagement2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INapClientManagement2* This, + INapClientManagement2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INapClientManagement2* This); + INapClientManagement2 *This); ULONG (STDMETHODCALLTYPE *Release)( - INapClientManagement2* This); + INapClientManagement2 *This); /*** INapClientManagement methods ***/ HRESULT (STDMETHODCALLTYPE *GetNapClientInfo)( - INapClientManagement2* This, + INapClientManagement2 *This, WINBOOL *isNapEnabled, CountedString **clientName, CountedString **clientDescription, CountedString **protocolVersion); HRESULT (STDMETHODCALLTYPE *GetSystemIsolationInfo)( - INapClientManagement2* This, + INapClientManagement2 *This, IsolationInfo **isolationInfo, WINBOOL *unknownConnections); HRESULT (STDMETHODCALLTYPE *RegisterSystemHealthAgent)( - INapClientManagement2* This, + INapClientManagement2 *This, const NapComponentRegistrationInfo *agent); HRESULT (STDMETHODCALLTYPE *UnregisterSystemHealthAgent)( - INapClientManagement2* This, + INapClientManagement2 *This, SystemHealthEntityId id); HRESULT (STDMETHODCALLTYPE *RegisterEnforcementClient)( - INapClientManagement2* This, + INapClientManagement2 *This, const NapComponentRegistrationInfo *enforcer); HRESULT (STDMETHODCALLTYPE *UnregisterEnforcementClient)( - INapClientManagement2* This, + INapClientManagement2 *This, EnforcementEntityId id); HRESULT (STDMETHODCALLTYPE *GetRegisteredSystemHealthAgents)( - INapClientManagement2* This, + INapClientManagement2 *This, SystemHealthEntityCount *count, NapComponentRegistrationInfo **agents); HRESULT (STDMETHODCALLTYPE *GetRegisteredEnforcementClients)( - INapClientManagement2* This, + INapClientManagement2 *This, EnforcementEntityCount *count, NapComponentRegistrationInfo **enforcers); /*** INapClientManagement2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetSystemIsolationInfoEx)( - INapClientManagement2* This, + INapClientManagement2 *This, IsolationInfoEx **isolationInfo, WINBOOL *unknownConnections); END_INTERFACE } INapClientManagement2Vtbl; + interface INapClientManagement2 { CONST_VTBL INapClientManagement2Vtbl* lpVtbl; }; @@ -423,15 +362,6 @@ static FORCEINLINE HRESULT INapClientManagement2_GetSystemIsolationInfoEx(INapCl #endif -HRESULT STDMETHODCALLTYPE INapClientManagement2_GetSystemIsolationInfoEx_Proxy( - INapClientManagement2* This, - IsolationInfoEx **isolationInfo, - WINBOOL *unknownConnections); -void __RPC_STUB INapClientManagement2_GetSystemIsolationInfoEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INapClientManagement2_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/napprotocol.h b/lib/libc/include/any-windows-any/napprotocol.h index 65df536447..a28302fea7 100644 --- a/lib/libc/include/any-windows-any/napprotocol.h +++ b/lib/libc/include/any-windows-any/napprotocol.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/napprotocol.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/napprotocol.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,11 +21,17 @@ #ifndef __INapSoHConstructor_FWD_DEFINED__ #define __INapSoHConstructor_FWD_DEFINED__ typedef interface INapSoHConstructor INapSoHConstructor; +#ifdef __cplusplus +interface INapSoHConstructor; +#endif /* __cplusplus */ #endif #ifndef __INapSoHProcessor_FWD_DEFINED__ #define __INapSoHProcessor_FWD_DEFINED__ typedef interface INapSoHProcessor INapSoHProcessor; +#ifdef __cplusplus +interface INapSoHProcessor; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -133,38 +140,39 @@ typedef struct INapSoHConstructorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INapSoHConstructor* This, + INapSoHConstructor *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INapSoHConstructor* This); + INapSoHConstructor *This); ULONG (STDMETHODCALLTYPE *Release)( - INapSoHConstructor* This); + INapSoHConstructor *This); /*** INapSoHConstructor methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - INapSoHConstructor* This, + INapSoHConstructor *This, SystemHealthEntityId id, WINBOOL isRequest); HRESULT (STDMETHODCALLTYPE *AppendAttribute)( - INapSoHConstructor* This, + INapSoHConstructor *This, SoHAttributeType type, const SoHAttributeValue *value); HRESULT (STDMETHODCALLTYPE *GetSoH)( - INapSoHConstructor* This, + INapSoHConstructor *This, SoH **soh); HRESULT (STDMETHODCALLTYPE *Validate)( - INapSoHConstructor* This, + INapSoHConstructor *This, const SoH *soh, WINBOOL isRequest); END_INTERFACE } INapSoHConstructorVtbl; + interface INapSoHConstructor { CONST_VTBL INapSoHConstructorVtbl* lpVtbl; }; @@ -209,41 +217,6 @@ static FORCEINLINE HRESULT INapSoHConstructor_Validate(INapSoHConstructor* This, #endif -HRESULT STDMETHODCALLTYPE INapSoHConstructor_Initialize_Proxy( - INapSoHConstructor* This, - SystemHealthEntityId id, - WINBOOL isRequest); -void __RPC_STUB INapSoHConstructor_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSoHConstructor_AppendAttribute_Proxy( - INapSoHConstructor* This, - SoHAttributeType type, - const SoHAttributeValue *value); -void __RPC_STUB INapSoHConstructor_AppendAttribute_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSoHConstructor_GetSoH_Proxy( - INapSoHConstructor* This, - SoH **soh); -void __RPC_STUB INapSoHConstructor_GetSoH_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSoHConstructor_Validate_Proxy( - INapSoHConstructor* This, - const SoH *soh, - WINBOOL isRequest); -void __RPC_STUB INapSoHConstructor_Validate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INapSoHConstructor_INTERFACE_DEFINED__ */ @@ -286,41 +259,42 @@ typedef struct INapSoHProcessorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INapSoHProcessor* This, + INapSoHProcessor *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INapSoHProcessor* This); + INapSoHProcessor *This); ULONG (STDMETHODCALLTYPE *Release)( - INapSoHProcessor* This); + INapSoHProcessor *This); /*** INapSoHProcessor methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - INapSoHProcessor* This, + INapSoHProcessor *This, const SoH *soh, WINBOOL isRequest, SystemHealthEntityId *id); HRESULT (STDMETHODCALLTYPE *FindNextAttribute)( - INapSoHProcessor* This, + INapSoHProcessor *This, UINT16 fromLocation, SoHAttributeType type, UINT16 *attributeLocation); HRESULT (STDMETHODCALLTYPE *GetAttribute)( - INapSoHProcessor* This, + INapSoHProcessor *This, UINT16 attributeLocation, SoHAttributeType *type, SoHAttributeValue **value); HRESULT (STDMETHODCALLTYPE *GetNumberOfAttributes)( - INapSoHProcessor* This, + INapSoHProcessor *This, UINT16 *attributeCount); END_INTERFACE } INapSoHProcessorVtbl; + interface INapSoHProcessor { CONST_VTBL INapSoHProcessorVtbl* lpVtbl; }; @@ -365,44 +339,6 @@ static FORCEINLINE HRESULT INapSoHProcessor_GetNumberOfAttributes(INapSoHProcess #endif -HRESULT STDMETHODCALLTYPE INapSoHProcessor_Initialize_Proxy( - INapSoHProcessor* This, - const SoH *soh, - WINBOOL isRequest, - SystemHealthEntityId *id); -void __RPC_STUB INapSoHProcessor_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSoHProcessor_FindNextAttribute_Proxy( - INapSoHProcessor* This, - UINT16 fromLocation, - SoHAttributeType type, - UINT16 *attributeLocation); -void __RPC_STUB INapSoHProcessor_FindNextAttribute_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSoHProcessor_GetAttribute_Proxy( - INapSoHProcessor* This, - UINT16 attributeLocation, - SoHAttributeType *type, - SoHAttributeValue **value); -void __RPC_STUB INapSoHProcessor_GetAttribute_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSoHProcessor_GetNumberOfAttributes_Proxy( - INapSoHProcessor* This, - UINT16 *attributeCount); -void __RPC_STUB INapSoHProcessor_GetNumberOfAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INapSoHProcessor_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/napservermanagement.h b/lib/libc/include/any-windows-any/napservermanagement.h index cdd950d5e2..78d37cd51b 100644 --- a/lib/libc/include/any-windows-any/napservermanagement.h +++ b/lib/libc/include/any-windows-any/napservermanagement.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/napservermanagement.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/napservermanagement.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,11 +21,17 @@ #ifndef __INapServerManagement_FWD_DEFINED__ #define __INapServerManagement_FWD_DEFINED__ typedef interface INapServerManagement INapServerManagement; +#ifdef __cplusplus +interface INapServerManagement; +#endif /* __cplusplus */ #endif #ifndef __INapServerInfo_FWD_DEFINED__ #define __INapServerInfo_FWD_DEFINED__ typedef interface INapServerInfo INapServerInfo; +#ifdef __cplusplus +interface INapServerInfo; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -42,11 +49,17 @@ extern "C" { #ifndef __INapServerInfo_FWD_DEFINED__ #define __INapServerInfo_FWD_DEFINED__ typedef interface INapServerInfo INapServerInfo; +#ifdef __cplusplus +interface INapServerInfo; +#endif /* __cplusplus */ #endif #ifndef __INapServerManagement_FWD_DEFINED__ #define __INapServerManagement_FWD_DEFINED__ typedef interface INapServerManagement INapServerManagement; +#ifdef __cplusplus +interface INapServerManagement; +#endif /* __cplusplus */ #endif EXTERN_C const CLSID CLSID_NapServerManagement; @@ -83,33 +96,34 @@ typedef struct INapServerManagementVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INapServerManagement* This, + INapServerManagement *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INapServerManagement* This); + INapServerManagement *This); ULONG (STDMETHODCALLTYPE *Release)( - INapServerManagement* This); + INapServerManagement *This); /*** INapServerManagement methods ***/ HRESULT (STDMETHODCALLTYPE *RegisterSystemHealthValidator)( - INapServerManagement* This, + INapServerManagement *This, const NapComponentRegistrationInfo *validator, const CLSID *validatorClsid); HRESULT (STDMETHODCALLTYPE *UnregisterSystemHealthValidator)( - INapServerManagement* This, + INapServerManagement *This, SystemHealthEntityId id); HRESULT (STDMETHODCALLTYPE *SetFailureCategoryMappings)( - INapServerManagement* This, + INapServerManagement *This, SystemHealthEntityId id, const FailureCategoryMapping mapping); END_INTERFACE } INapServerManagementVtbl; + interface INapServerManagement { CONST_VTBL INapServerManagementVtbl* lpVtbl; }; @@ -150,32 +164,6 @@ static FORCEINLINE HRESULT INapServerManagement_SetFailureCategoryMappings(INapS #endif -HRESULT STDMETHODCALLTYPE INapServerManagement_RegisterSystemHealthValidator_Proxy( - INapServerManagement* This, - const NapComponentRegistrationInfo *validator, - const CLSID *validatorClsid); -void __RPC_STUB INapServerManagement_RegisterSystemHealthValidator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapServerManagement_UnregisterSystemHealthValidator_Proxy( - INapServerManagement* This, - SystemHealthEntityId id); -void __RPC_STUB INapServerManagement_UnregisterSystemHealthValidator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapServerManagement_SetFailureCategoryMappings_Proxy( - INapServerManagement* This, - SystemHealthEntityId id, - const FailureCategoryMapping mapping); -void __RPC_STUB INapServerManagement_SetFailureCategoryMappings_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INapServerManagement_INTERFACE_DEFINED__ */ @@ -214,36 +202,37 @@ typedef struct INapServerInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INapServerInfo* This, + INapServerInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INapServerInfo* This); + INapServerInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - INapServerInfo* This); + INapServerInfo *This); /*** INapServerInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetNapServerInfo)( - INapServerInfo* This, + INapServerInfo *This, CountedString **serverName, CountedString **serverDescription, CountedString **protocolVersion); HRESULT (STDMETHODCALLTYPE *GetRegisteredSystemHealthValidators)( - INapServerInfo* This, + INapServerInfo *This, SystemHealthEntityCount *count, NapComponentRegistrationInfo **validators, CLSID **validatorClsids); HRESULT (STDMETHODCALLTYPE *GetFailureCategoryMappings)( - INapServerInfo* This, + INapServerInfo *This, SystemHealthEntityId id, FailureCategoryMapping *mapping); END_INTERFACE } INapServerInfoVtbl; + interface INapServerInfo { CONST_VTBL INapServerInfoVtbl* lpVtbl; }; @@ -284,35 +273,6 @@ static FORCEINLINE HRESULT INapServerInfo_GetFailureCategoryMappings(INapServerI #endif -HRESULT STDMETHODCALLTYPE INapServerInfo_GetNapServerInfo_Proxy( - INapServerInfo* This, - CountedString **serverName, - CountedString **serverDescription, - CountedString **protocolVersion); -void __RPC_STUB INapServerInfo_GetNapServerInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapServerInfo_GetRegisteredSystemHealthValidators_Proxy( - INapServerInfo* This, - SystemHealthEntityCount *count, - NapComponentRegistrationInfo **validators, - CLSID **validatorClsids); -void __RPC_STUB INapServerInfo_GetRegisteredSystemHealthValidators_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapServerInfo_GetFailureCategoryMappings_Proxy( - INapServerInfo* This, - SystemHealthEntityId id, - FailureCategoryMapping *mapping); -void __RPC_STUB INapServerInfo_GetFailureCategoryMappings_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INapServerInfo_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/napsystemhealthagent.h b/lib/libc/include/any-windows-any/napsystemhealthagent.h index fe8f6f4d4b..2d34aed8d9 100644 --- a/lib/libc/include/any-windows-any/napsystemhealthagent.h +++ b/lib/libc/include/any-windows-any/napsystemhealthagent.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/napsystemhealthagent.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/napsystemhealthagent.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,26 +21,41 @@ #ifndef __INapSystemHealthAgentBinding_FWD_DEFINED__ #define __INapSystemHealthAgentBinding_FWD_DEFINED__ typedef interface INapSystemHealthAgentBinding INapSystemHealthAgentBinding; +#ifdef __cplusplus +interface INapSystemHealthAgentBinding; +#endif /* __cplusplus */ #endif #ifndef __INapSystemHealthAgentBinding2_FWD_DEFINED__ #define __INapSystemHealthAgentBinding2_FWD_DEFINED__ typedef interface INapSystemHealthAgentBinding2 INapSystemHealthAgentBinding2; +#ifdef __cplusplus +interface INapSystemHealthAgentBinding2; +#endif /* __cplusplus */ #endif #ifndef __INapSystemHealthAgentCallback_FWD_DEFINED__ #define __INapSystemHealthAgentCallback_FWD_DEFINED__ typedef interface INapSystemHealthAgentCallback INapSystemHealthAgentCallback; +#ifdef __cplusplus +interface INapSystemHealthAgentCallback; +#endif /* __cplusplus */ #endif #ifndef __AsyncINapSystemHealthAgentCallback_FWD_DEFINED__ #define __AsyncINapSystemHealthAgentCallback_FWD_DEFINED__ typedef interface AsyncINapSystemHealthAgentCallback AsyncINapSystemHealthAgentCallback; +#ifdef __cplusplus +interface AsyncINapSystemHealthAgentCallback; +#endif /* __cplusplus */ #endif #ifndef __INapSystemHealthAgentRequest_FWD_DEFINED__ #define __INapSystemHealthAgentRequest_FWD_DEFINED__ typedef interface INapSystemHealthAgentRequest INapSystemHealthAgentRequest; +#ifdef __cplusplus +interface INapSystemHealthAgentRequest; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -57,21 +73,25 @@ extern "C" { #ifndef __INapSystemHealthAgentBinding_FWD_DEFINED__ #define __INapSystemHealthAgentBinding_FWD_DEFINED__ typedef interface INapSystemHealthAgentBinding INapSystemHealthAgentBinding; +#ifdef __cplusplus +interface INapSystemHealthAgentBinding; +#endif /* __cplusplus */ #endif #ifndef __INapSystemHealthAgentCallback_FWD_DEFINED__ #define __INapSystemHealthAgentCallback_FWD_DEFINED__ typedef interface INapSystemHealthAgentCallback INapSystemHealthAgentCallback; -#endif - -#ifndef __AsyncINapSystemHealthAgentCallback_FWD_DEFINED__ -#define __AsyncINapSystemHealthAgentCallback_FWD_DEFINED__ -typedef interface AsyncINapSystemHealthAgentCallback AsyncINapSystemHealthAgentCallback; +#ifdef __cplusplus +interface INapSystemHealthAgentCallback; +#endif /* __cplusplus */ #endif #ifndef __INapSystemHealthAgentRequest_FWD_DEFINED__ #define __INapSystemHealthAgentRequest_FWD_DEFINED__ typedef interface INapSystemHealthAgentRequest INapSystemHealthAgentRequest; +#ifdef __cplusplus +interface INapSystemHealthAgentRequest; +#endif /* __cplusplus */ #endif EXTERN_C const CLSID CLSID_NapSystemHealthAgentBinding; @@ -113,38 +133,39 @@ typedef struct INapSystemHealthAgentBindingVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INapSystemHealthAgentBinding* This, + INapSystemHealthAgentBinding *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INapSystemHealthAgentBinding* This); + INapSystemHealthAgentBinding *This); ULONG (STDMETHODCALLTYPE *Release)( - INapSystemHealthAgentBinding* This); + INapSystemHealthAgentBinding *This); /*** INapSystemHealthAgentBinding methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - INapSystemHealthAgentBinding* This, + INapSystemHealthAgentBinding *This, SystemHealthEntityId id, INapSystemHealthAgentCallback *callback); HRESULT (STDMETHODCALLTYPE *Uninitialize)( - INapSystemHealthAgentBinding* This); + INapSystemHealthAgentBinding *This); HRESULT (STDMETHODCALLTYPE *NotifySoHChange)( - INapSystemHealthAgentBinding* This); + INapSystemHealthAgentBinding *This); HRESULT (STDMETHODCALLTYPE *GetSystemIsolationInfo)( - INapSystemHealthAgentBinding* This, + INapSystemHealthAgentBinding *This, IsolationInfo **isolationInfo, WINBOOL *unknownConnections); HRESULT (STDMETHODCALLTYPE *FlushCache)( - INapSystemHealthAgentBinding* This); + INapSystemHealthAgentBinding *This); END_INTERFACE } INapSystemHealthAgentBindingVtbl; + interface INapSystemHealthAgentBinding { CONST_VTBL INapSystemHealthAgentBindingVtbl* lpVtbl; }; @@ -193,45 +214,6 @@ static FORCEINLINE HRESULT INapSystemHealthAgentBinding_FlushCache(INapSystemHea #endif -HRESULT STDMETHODCALLTYPE INapSystemHealthAgentBinding_Initialize_Proxy( - INapSystemHealthAgentBinding* This, - SystemHealthEntityId id, - INapSystemHealthAgentCallback *callback); -void __RPC_STUB INapSystemHealthAgentBinding_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSystemHealthAgentBinding_Uninitialize_Proxy( - INapSystemHealthAgentBinding* This); -void __RPC_STUB INapSystemHealthAgentBinding_Uninitialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSystemHealthAgentBinding_NotifySoHChange_Proxy( - INapSystemHealthAgentBinding* This); -void __RPC_STUB INapSystemHealthAgentBinding_NotifySoHChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSystemHealthAgentBinding_GetSystemIsolationInfo_Proxy( - INapSystemHealthAgentBinding* This, - IsolationInfo **isolationInfo, - WINBOOL *unknownConnections); -void __RPC_STUB INapSystemHealthAgentBinding_GetSystemIsolationInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSystemHealthAgentBinding_FlushCache_Proxy( - INapSystemHealthAgentBinding* This); -void __RPC_STUB INapSystemHealthAgentBinding_FlushCache_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INapSystemHealthAgentBinding_INTERFACE_DEFINED__ */ @@ -260,44 +242,45 @@ typedef struct INapSystemHealthAgentBinding2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INapSystemHealthAgentBinding2* This, + INapSystemHealthAgentBinding2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INapSystemHealthAgentBinding2* This); + INapSystemHealthAgentBinding2 *This); ULONG (STDMETHODCALLTYPE *Release)( - INapSystemHealthAgentBinding2* This); + INapSystemHealthAgentBinding2 *This); /*** INapSystemHealthAgentBinding methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - INapSystemHealthAgentBinding2* This, + INapSystemHealthAgentBinding2 *This, SystemHealthEntityId id, INapSystemHealthAgentCallback *callback); HRESULT (STDMETHODCALLTYPE *Uninitialize)( - INapSystemHealthAgentBinding2* This); + INapSystemHealthAgentBinding2 *This); HRESULT (STDMETHODCALLTYPE *NotifySoHChange)( - INapSystemHealthAgentBinding2* This); + INapSystemHealthAgentBinding2 *This); HRESULT (STDMETHODCALLTYPE *GetSystemIsolationInfo)( - INapSystemHealthAgentBinding2* This, + INapSystemHealthAgentBinding2 *This, IsolationInfo **isolationInfo, WINBOOL *unknownConnections); HRESULT (STDMETHODCALLTYPE *FlushCache)( - INapSystemHealthAgentBinding2* This); + INapSystemHealthAgentBinding2 *This); /*** INapSystemHealthAgentBinding2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetSystemIsolationInfoEx)( - INapSystemHealthAgentBinding2* This, + INapSystemHealthAgentBinding2 *This, IsolationInfoEx **isolationInfo, WINBOOL *unknownConnections); END_INTERFACE } INapSystemHealthAgentBinding2Vtbl; + interface INapSystemHealthAgentBinding2 { CONST_VTBL INapSystemHealthAgentBinding2Vtbl* lpVtbl; }; @@ -352,15 +335,6 @@ static FORCEINLINE HRESULT INapSystemHealthAgentBinding2_GetSystemIsolationInfoE #endif -HRESULT STDMETHODCALLTYPE INapSystemHealthAgentBinding2_GetSystemIsolationInfoEx_Proxy( - INapSystemHealthAgentBinding2* This, - IsolationInfoEx **isolationInfo, - WINBOOL *unknownConnections); -void __RPC_STUB INapSystemHealthAgentBinding2_GetSystemIsolationInfoEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INapSystemHealthAgentBinding2_INTERFACE_DEFINED__ */ @@ -405,44 +379,45 @@ typedef struct INapSystemHealthAgentCallbackVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INapSystemHealthAgentCallback* This, + INapSystemHealthAgentCallback *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INapSystemHealthAgentCallback* This); + INapSystemHealthAgentCallback *This); ULONG (STDMETHODCALLTYPE *Release)( - INapSystemHealthAgentCallback* This); + INapSystemHealthAgentCallback *This); /*** INapSystemHealthAgentCallback methods ***/ HRESULT (STDMETHODCALLTYPE *GetSoHRequest)( - INapSystemHealthAgentCallback* This, + INapSystemHealthAgentCallback *This, INapSystemHealthAgentRequest *request); HRESULT (STDMETHODCALLTYPE *ProcessSoHResponse)( - INapSystemHealthAgentCallback* This, + INapSystemHealthAgentCallback *This, INapSystemHealthAgentRequest *request); HRESULT (STDMETHODCALLTYPE *NotifySystemIsolationStateChange)( - INapSystemHealthAgentCallback* This); + INapSystemHealthAgentCallback *This); HRESULT (STDMETHODCALLTYPE *GetFixupInfo)( - INapSystemHealthAgentCallback* This, + INapSystemHealthAgentCallback *This, FixupInfo **info); HRESULT (STDMETHODCALLTYPE *CompareSoHRequests)( - INapSystemHealthAgentCallback* This, + INapSystemHealthAgentCallback *This, const SoHRequest *lhs, const SoHRequest *rhs, WINBOOL *isEqual); HRESULT (STDMETHODCALLTYPE *NotifyOrphanedSoHRequest)( - INapSystemHealthAgentCallback* This, + INapSystemHealthAgentCallback *This, const CorrelationId *correlationId); END_INTERFACE } INapSystemHealthAgentCallbackVtbl; + interface INapSystemHealthAgentCallback { CONST_VTBL INapSystemHealthAgentCallbackVtbl* lpVtbl; }; @@ -495,55 +470,6 @@ static FORCEINLINE HRESULT INapSystemHealthAgentCallback_NotifyOrphanedSoHReques #endif -HRESULT STDMETHODCALLTYPE INapSystemHealthAgentCallback_GetSoHRequest_Proxy( - INapSystemHealthAgentCallback* This, - INapSystemHealthAgentRequest *request); -void __RPC_STUB INapSystemHealthAgentCallback_GetSoHRequest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSystemHealthAgentCallback_ProcessSoHResponse_Proxy( - INapSystemHealthAgentCallback* This, - INapSystemHealthAgentRequest *request); -void __RPC_STUB INapSystemHealthAgentCallback_ProcessSoHResponse_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSystemHealthAgentCallback_NotifySystemIsolationStateChange_Proxy( - INapSystemHealthAgentCallback* This); -void __RPC_STUB INapSystemHealthAgentCallback_NotifySystemIsolationStateChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSystemHealthAgentCallback_GetFixupInfo_Proxy( - INapSystemHealthAgentCallback* This, - FixupInfo **info); -void __RPC_STUB INapSystemHealthAgentCallback_GetFixupInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSystemHealthAgentCallback_CompareSoHRequests_Proxy( - INapSystemHealthAgentCallback* This, - const SoHRequest *lhs, - const SoHRequest *rhs, - WINBOOL *isEqual); -void __RPC_STUB INapSystemHealthAgentCallback_CompareSoHRequests_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSystemHealthAgentCallback_NotifyOrphanedSoHRequest_Proxy( - INapSystemHealthAgentCallback* This, - const CorrelationId *correlationId); -void __RPC_STUB INapSystemHealthAgentCallback_NotifyOrphanedSoHRequest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INapSystemHealthAgentCallback_INTERFACE_DEFINED__ */ @@ -558,38 +484,38 @@ DEFINE_GUID(IID_AsyncINapSystemHealthAgentCallback, 0x860d8fd9, 0x0219, 0x43ea, MIDL_INTERFACE("860d8fd9-0219-43ea-ae7f-59611f4cc16a") AsyncINapSystemHealthAgentCallback : public IUnknown { - virtual void STDMETHODCALLTYPE Begin_GetSoHRequest( + virtual HRESULT STDMETHODCALLTYPE Begin_GetSoHRequest( INapSystemHealthAgentRequest *request) = 0; virtual HRESULT STDMETHODCALLTYPE Finish_GetSoHRequest( ) = 0; - virtual void STDMETHODCALLTYPE Begin_ProcessSoHResponse( + virtual HRESULT STDMETHODCALLTYPE Begin_ProcessSoHResponse( INapSystemHealthAgentRequest *request) = 0; virtual HRESULT STDMETHODCALLTYPE Finish_ProcessSoHResponse( ) = 0; - virtual void STDMETHODCALLTYPE Begin_NotifySystemIsolationStateChange( + virtual HRESULT STDMETHODCALLTYPE Begin_NotifySystemIsolationStateChange( ) = 0; virtual HRESULT STDMETHODCALLTYPE Finish_NotifySystemIsolationStateChange( ) = 0; - virtual void STDMETHODCALLTYPE Begin_GetFixupInfo( + virtual HRESULT STDMETHODCALLTYPE Begin_GetFixupInfo( ) = 0; virtual HRESULT STDMETHODCALLTYPE Finish_GetFixupInfo( FixupInfo **info) = 0; - virtual void STDMETHODCALLTYPE Begin_CompareSoHRequests( + virtual HRESULT STDMETHODCALLTYPE Begin_CompareSoHRequests( const SoHRequest *lhs, const SoHRequest *rhs) = 0; virtual HRESULT STDMETHODCALLTYPE Finish_CompareSoHRequests( WINBOOL *isEqual) = 0; - virtual void STDMETHODCALLTYPE Begin_NotifyOrphanedSoHRequest( + virtual HRESULT STDMETHODCALLTYPE Begin_NotifyOrphanedSoHRequest( const CorrelationId *correlationId) = 0; virtual HRESULT STDMETHODCALLTYPE Finish_NotifyOrphanedSoHRequest( @@ -605,62 +531,63 @@ typedef struct AsyncINapSystemHealthAgentCallbackVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - AsyncINapSystemHealthAgentCallback* This, + AsyncINapSystemHealthAgentCallback *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - AsyncINapSystemHealthAgentCallback* This); + AsyncINapSystemHealthAgentCallback *This); ULONG (STDMETHODCALLTYPE *Release)( - AsyncINapSystemHealthAgentCallback* This); + AsyncINapSystemHealthAgentCallback *This); - /*** INapSystemHealthAgentCallback methods ***/ - void (STDMETHODCALLTYPE *Begin_GetSoHRequest)( - AsyncINapSystemHealthAgentCallback* This, + /*** AsyncINapSystemHealthAgentCallback methods ***/ + HRESULT (STDMETHODCALLTYPE *Begin_GetSoHRequest)( + AsyncINapSystemHealthAgentCallback *This, INapSystemHealthAgentRequest *request); HRESULT (STDMETHODCALLTYPE *Finish_GetSoHRequest)( - AsyncINapSystemHealthAgentCallback* This); + AsyncINapSystemHealthAgentCallback *This); - void (STDMETHODCALLTYPE *Begin_ProcessSoHResponse)( - AsyncINapSystemHealthAgentCallback* This, + HRESULT (STDMETHODCALLTYPE *Begin_ProcessSoHResponse)( + AsyncINapSystemHealthAgentCallback *This, INapSystemHealthAgentRequest *request); HRESULT (STDMETHODCALLTYPE *Finish_ProcessSoHResponse)( - AsyncINapSystemHealthAgentCallback* This); + AsyncINapSystemHealthAgentCallback *This); - void (STDMETHODCALLTYPE *Begin_NotifySystemIsolationStateChange)( - AsyncINapSystemHealthAgentCallback* This); + HRESULT (STDMETHODCALLTYPE *Begin_NotifySystemIsolationStateChange)( + AsyncINapSystemHealthAgentCallback *This); HRESULT (STDMETHODCALLTYPE *Finish_NotifySystemIsolationStateChange)( - AsyncINapSystemHealthAgentCallback* This); + AsyncINapSystemHealthAgentCallback *This); - void (STDMETHODCALLTYPE *Begin_GetFixupInfo)( - AsyncINapSystemHealthAgentCallback* This); + HRESULT (STDMETHODCALLTYPE *Begin_GetFixupInfo)( + AsyncINapSystemHealthAgentCallback *This); HRESULT (STDMETHODCALLTYPE *Finish_GetFixupInfo)( - AsyncINapSystemHealthAgentCallback* This, + AsyncINapSystemHealthAgentCallback *This, FixupInfo **info); - void (STDMETHODCALLTYPE *Begin_CompareSoHRequests)( - AsyncINapSystemHealthAgentCallback* This, + HRESULT (STDMETHODCALLTYPE *Begin_CompareSoHRequests)( + AsyncINapSystemHealthAgentCallback *This, const SoHRequest *lhs, const SoHRequest *rhs); HRESULT (STDMETHODCALLTYPE *Finish_CompareSoHRequests)( - AsyncINapSystemHealthAgentCallback* This, + AsyncINapSystemHealthAgentCallback *This, WINBOOL *isEqual); - void (STDMETHODCALLTYPE *Begin_NotifyOrphanedSoHRequest)( - AsyncINapSystemHealthAgentCallback* This, + HRESULT (STDMETHODCALLTYPE *Begin_NotifyOrphanedSoHRequest)( + AsyncINapSystemHealthAgentCallback *This, const CorrelationId *correlationId); HRESULT (STDMETHODCALLTYPE *Finish_NotifyOrphanedSoHRequest)( - AsyncINapSystemHealthAgentCallback* This); + AsyncINapSystemHealthAgentCallback *This); END_INTERFACE } AsyncINapSystemHealthAgentCallbackVtbl; + interface AsyncINapSystemHealthAgentCallback { CONST_VTBL AsyncINapSystemHealthAgentCallbackVtbl* lpVtbl; }; @@ -671,7 +598,7 @@ interface AsyncINapSystemHealthAgentCallback { #define AsyncINapSystemHealthAgentCallback_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) #define AsyncINapSystemHealthAgentCallback_AddRef(This) (This)->lpVtbl->AddRef(This) #define AsyncINapSystemHealthAgentCallback_Release(This) (This)->lpVtbl->Release(This) -/*** INapSystemHealthAgentCallback methods ***/ +/*** AsyncINapSystemHealthAgentCallback methods ***/ #define AsyncINapSystemHealthAgentCallback_Begin_GetSoHRequest(This,request) (This)->lpVtbl->Begin_GetSoHRequest(This,request) #define AsyncINapSystemHealthAgentCallback_Finish_GetSoHRequest(This) (This)->lpVtbl->Finish_GetSoHRequest(This) #define AsyncINapSystemHealthAgentCallback_Begin_ProcessSoHResponse(This,request) (This)->lpVtbl->Begin_ProcessSoHResponse(This,request) @@ -695,41 +622,41 @@ static FORCEINLINE ULONG AsyncINapSystemHealthAgentCallback_AddRef(AsyncINapSyst static FORCEINLINE ULONG AsyncINapSystemHealthAgentCallback_Release(AsyncINapSystemHealthAgentCallback* This) { return This->lpVtbl->Release(This); } -/*** INapSystemHealthAgentCallback methods ***/ -static FORCEINLINE void Begin_AsyncINapSystemHealthAgentCallback_GetSoHRequest(AsyncINapSystemHealthAgentCallback* This,INapSystemHealthAgentRequest *request) { - This->lpVtbl->Begin_GetSoHRequest(This,request); +/*** AsyncINapSystemHealthAgentCallback methods ***/ +static FORCEINLINE HRESULT AsyncINapSystemHealthAgentCallback_Begin_GetSoHRequest(AsyncINapSystemHealthAgentCallback* This,INapSystemHealthAgentRequest *request) { + return This->lpVtbl->Begin_GetSoHRequest(This,request); } -static FORCEINLINE HRESULT Finish_AsyncINapSystemHealthAgentCallback_GetSoHRequest(AsyncINapSystemHealthAgentCallback* This) { +static FORCEINLINE HRESULT AsyncINapSystemHealthAgentCallback_Finish_GetSoHRequest(AsyncINapSystemHealthAgentCallback* This) { return This->lpVtbl->Finish_GetSoHRequest(This); } -static FORCEINLINE void Begin_AsyncINapSystemHealthAgentCallback_ProcessSoHResponse(AsyncINapSystemHealthAgentCallback* This,INapSystemHealthAgentRequest *request) { - This->lpVtbl->Begin_ProcessSoHResponse(This,request); +static FORCEINLINE HRESULT AsyncINapSystemHealthAgentCallback_Begin_ProcessSoHResponse(AsyncINapSystemHealthAgentCallback* This,INapSystemHealthAgentRequest *request) { + return This->lpVtbl->Begin_ProcessSoHResponse(This,request); } -static FORCEINLINE HRESULT Finish_AsyncINapSystemHealthAgentCallback_ProcessSoHResponse(AsyncINapSystemHealthAgentCallback* This) { +static FORCEINLINE HRESULT AsyncINapSystemHealthAgentCallback_Finish_ProcessSoHResponse(AsyncINapSystemHealthAgentCallback* This) { return This->lpVtbl->Finish_ProcessSoHResponse(This); } -static FORCEINLINE void Begin_AsyncINapSystemHealthAgentCallback_NotifySystemIsolationStateChange(AsyncINapSystemHealthAgentCallback* This) { - This->lpVtbl->Begin_NotifySystemIsolationStateChange(This); +static FORCEINLINE HRESULT AsyncINapSystemHealthAgentCallback_Begin_NotifySystemIsolationStateChange(AsyncINapSystemHealthAgentCallback* This) { + return This->lpVtbl->Begin_NotifySystemIsolationStateChange(This); } -static FORCEINLINE HRESULT Finish_AsyncINapSystemHealthAgentCallback_NotifySystemIsolationStateChange(AsyncINapSystemHealthAgentCallback* This) { +static FORCEINLINE HRESULT AsyncINapSystemHealthAgentCallback_Finish_NotifySystemIsolationStateChange(AsyncINapSystemHealthAgentCallback* This) { return This->lpVtbl->Finish_NotifySystemIsolationStateChange(This); } -static FORCEINLINE void Begin_AsyncINapSystemHealthAgentCallback_GetFixupInfo(AsyncINapSystemHealthAgentCallback* This) { - This->lpVtbl->Begin_GetFixupInfo(This,info); +static FORCEINLINE HRESULT AsyncINapSystemHealthAgentCallback_Begin_GetFixupInfo(AsyncINapSystemHealthAgentCallback* This) { + return This->lpVtbl->Begin_GetFixupInfo(This); } -static FORCEINLINE HRESULT Finish_AsyncINapSystemHealthAgentCallback_GetFixupInfo(AsyncINapSystemHealthAgentCallback* This,FixupInfo **info) { - return This->lpVtbl->Finish_GetFixupInfo(This); +static FORCEINLINE HRESULT AsyncINapSystemHealthAgentCallback_Finish_GetFixupInfo(AsyncINapSystemHealthAgentCallback* This,FixupInfo **info) { + return This->lpVtbl->Finish_GetFixupInfo(This,info); } -static FORCEINLINE void Begin_AsyncINapSystemHealthAgentCallback_CompareSoHRequests(AsyncINapSystemHealthAgentCallback* This,const SoHRequest *lhs,const SoHRequest *rhs) { - This->lpVtbl->Begin_CompareSoHRequests(This,lhs,rhs,isEqual); +static FORCEINLINE HRESULT AsyncINapSystemHealthAgentCallback_Begin_CompareSoHRequests(AsyncINapSystemHealthAgentCallback* This,const SoHRequest *lhs,const SoHRequest *rhs) { + return This->lpVtbl->Begin_CompareSoHRequests(This,lhs,rhs); } -static FORCEINLINE HRESULT Finish_AsyncINapSystemHealthAgentCallback_CompareSoHRequests(AsyncINapSystemHealthAgentCallback* This,WINBOOL *isEqual) { - return This->lpVtbl->Finish_CompareSoHRequests(This); +static FORCEINLINE HRESULT AsyncINapSystemHealthAgentCallback_Finish_CompareSoHRequests(AsyncINapSystemHealthAgentCallback* This,WINBOOL *isEqual) { + return This->lpVtbl->Finish_CompareSoHRequests(This,isEqual); } -static FORCEINLINE void Begin_AsyncINapSystemHealthAgentCallback_NotifyOrphanedSoHRequest(AsyncINapSystemHealthAgentCallback* This,const CorrelationId *correlationId) { - This->lpVtbl->Begin_NotifyOrphanedSoHRequest(This,correlationId); +static FORCEINLINE HRESULT AsyncINapSystemHealthAgentCallback_Begin_NotifyOrphanedSoHRequest(AsyncINapSystemHealthAgentCallback* This,const CorrelationId *correlationId) { + return This->lpVtbl->Begin_NotifyOrphanedSoHRequest(This,correlationId); } -static FORCEINLINE HRESULT Finish_AsyncINapSystemHealthAgentCallback_NotifyOrphanedSoHRequest(AsyncINapSystemHealthAgentCallback* This) { +static FORCEINLINE HRESULT AsyncINapSystemHealthAgentCallback_Finish_NotifyOrphanedSoHRequest(AsyncINapSystemHealthAgentCallback* This) { return This->lpVtbl->Finish_NotifyOrphanedSoHRequest(This); } #endif @@ -737,100 +664,6 @@ static FORCEINLINE HRESULT Finish_AsyncINapSystemHealthAgentCallback_NotifyOrpha #endif -HRESULT STDMETHODCALLTYPE AsyncINapSystemHealthAgentCallback_Begin_GetSoHRequest_Proxy( - INapSystemHealthAgentCallback* This, - INapSystemHealthAgentRequest *request); -void __RPC_STUB AsyncINapSystemHealthAgentCallback_Begin_GetSoHRequest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE AsyncINapSystemHealthAgentCallback_Finish_GetSoHRequest_Proxy( - INapSystemHealthAgentCallback* This, - INapSystemHealthAgentRequest *request); -void __RPC_STUB AsyncINapSystemHealthAgentCallback_Finish_GetSoHRequest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE AsyncINapSystemHealthAgentCallback_Begin_ProcessSoHResponse_Proxy( - INapSystemHealthAgentCallback* This, - INapSystemHealthAgentRequest *request); -void __RPC_STUB AsyncINapSystemHealthAgentCallback_Begin_ProcessSoHResponse_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE AsyncINapSystemHealthAgentCallback_Finish_ProcessSoHResponse_Proxy( - INapSystemHealthAgentCallback* This, - INapSystemHealthAgentRequest *request); -void __RPC_STUB AsyncINapSystemHealthAgentCallback_Finish_ProcessSoHResponse_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE AsyncINapSystemHealthAgentCallback_Begin_NotifySystemIsolationStateChange_Proxy( - INapSystemHealthAgentCallback* This); -void __RPC_STUB AsyncINapSystemHealthAgentCallback_Begin_NotifySystemIsolationStateChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE AsyncINapSystemHealthAgentCallback_Finish_NotifySystemIsolationStateChange_Proxy( - INapSystemHealthAgentCallback* This); -void __RPC_STUB AsyncINapSystemHealthAgentCallback_Finish_NotifySystemIsolationStateChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE AsyncINapSystemHealthAgentCallback_Begin_GetFixupInfo_Proxy( - INapSystemHealthAgentCallback* This); -void __RPC_STUB AsyncINapSystemHealthAgentCallback_Begin_GetFixupInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE AsyncINapSystemHealthAgentCallback_Finish_GetFixupInfo_Proxy( - INapSystemHealthAgentCallback* This); -void __RPC_STUB AsyncINapSystemHealthAgentCallback_Finish_GetFixupInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE AsyncINapSystemHealthAgentCallback_Begin_CompareSoHRequests_Proxy( - INapSystemHealthAgentCallback* This, - const SoHRequest *lhs, - const SoHRequest *rhs); -void __RPC_STUB AsyncINapSystemHealthAgentCallback_Begin_CompareSoHRequests_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE AsyncINapSystemHealthAgentCallback_Finish_CompareSoHRequests_Proxy( - INapSystemHealthAgentCallback* This, - const SoHRequest *lhs, - const SoHRequest *rhs); -void __RPC_STUB AsyncINapSystemHealthAgentCallback_Finish_CompareSoHRequests_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE AsyncINapSystemHealthAgentCallback_Begin_NotifyOrphanedSoHRequest_Proxy( - INapSystemHealthAgentCallback* This, - const CorrelationId *correlationId); -void __RPC_STUB AsyncINapSystemHealthAgentCallback_Begin_NotifyOrphanedSoHRequest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE AsyncINapSystemHealthAgentCallback_Finish_NotifyOrphanedSoHRequest_Proxy( - INapSystemHealthAgentCallback* This, - const CorrelationId *correlationId); -void __RPC_STUB AsyncINapSystemHealthAgentCallback_Finish_NotifyOrphanedSoHRequest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __AsyncINapSystemHealthAgentCallback_INTERFACE_DEFINED__ */ @@ -875,45 +708,46 @@ typedef struct INapSystemHealthAgentRequestVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INapSystemHealthAgentRequest* This, + INapSystemHealthAgentRequest *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INapSystemHealthAgentRequest* This); + INapSystemHealthAgentRequest *This); ULONG (STDMETHODCALLTYPE *Release)( - INapSystemHealthAgentRequest* This); + INapSystemHealthAgentRequest *This); /*** INapSystemHealthAgentRequest methods ***/ HRESULT (STDMETHODCALLTYPE *GetCorrelationId)( - INapSystemHealthAgentRequest* This, + INapSystemHealthAgentRequest *This, CorrelationId *correlationId); HRESULT (STDMETHODCALLTYPE *GetStringCorrelationId)( - INapSystemHealthAgentRequest* This, + INapSystemHealthAgentRequest *This, StringCorrelationId **correlationId); HRESULT (STDMETHODCALLTYPE *SetSoHRequest)( - INapSystemHealthAgentRequest* This, + INapSystemHealthAgentRequest *This, const SoHRequest *sohRequest, WINBOOL cacheSohForLaterUse); HRESULT (STDMETHODCALLTYPE *GetSoHRequest)( - INapSystemHealthAgentRequest* This, + INapSystemHealthAgentRequest *This, SoHRequest **sohRequest); HRESULT (STDMETHODCALLTYPE *GetSoHResponse)( - INapSystemHealthAgentRequest* This, + INapSystemHealthAgentRequest *This, SoHResponse **sohResponse, UINT8 *flags); HRESULT (STDMETHODCALLTYPE *GetCacheSoHFlag)( - INapSystemHealthAgentRequest* This, + INapSystemHealthAgentRequest *This, WINBOOL *cacheSohForLaterUse); END_INTERFACE } INapSystemHealthAgentRequestVtbl; + interface INapSystemHealthAgentRequest { CONST_VTBL INapSystemHealthAgentRequestVtbl* lpVtbl; }; @@ -966,56 +800,6 @@ static FORCEINLINE HRESULT INapSystemHealthAgentRequest_GetCacheSoHFlag(INapSyst #endif -HRESULT STDMETHODCALLTYPE INapSystemHealthAgentRequest_GetCorrelationId_Proxy( - INapSystemHealthAgentRequest* This, - CorrelationId *correlationId); -void __RPC_STUB INapSystemHealthAgentRequest_GetCorrelationId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSystemHealthAgentRequest_GetStringCorrelationId_Proxy( - INapSystemHealthAgentRequest* This, - StringCorrelationId **correlationId); -void __RPC_STUB INapSystemHealthAgentRequest_GetStringCorrelationId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSystemHealthAgentRequest_SetSoHRequest_Proxy( - INapSystemHealthAgentRequest* This, - const SoHRequest *sohRequest, - WINBOOL cacheSohForLaterUse); -void __RPC_STUB INapSystemHealthAgentRequest_SetSoHRequest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSystemHealthAgentRequest_GetSoHRequest_Proxy( - INapSystemHealthAgentRequest* This, - SoHRequest **sohRequest); -void __RPC_STUB INapSystemHealthAgentRequest_GetSoHRequest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSystemHealthAgentRequest_GetSoHResponse_Proxy( - INapSystemHealthAgentRequest* This, - SoHResponse **sohResponse, - UINT8 *flags); -void __RPC_STUB INapSystemHealthAgentRequest_GetSoHResponse_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSystemHealthAgentRequest_GetCacheSoHFlag_Proxy( - INapSystemHealthAgentRequest* This, - WINBOOL *cacheSohForLaterUse); -void __RPC_STUB INapSystemHealthAgentRequest_GetCacheSoHFlag_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INapSystemHealthAgentRequest_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/napsystemhealthvalidator.h b/lib/libc/include/any-windows-any/napsystemhealthvalidator.h index 78764a9c5c..c3e7bdf420 100644 --- a/lib/libc/include/any-windows-any/napsystemhealthvalidator.h +++ b/lib/libc/include/any-windows-any/napsystemhealthvalidator.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/napsystemhealthvalidator.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/napsystemhealthvalidator.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,26 +21,41 @@ #ifndef __INapSystemHealthValidator_FWD_DEFINED__ #define __INapSystemHealthValidator_FWD_DEFINED__ typedef interface INapSystemHealthValidator INapSystemHealthValidator; +#ifdef __cplusplus +interface INapSystemHealthValidator; +#endif /* __cplusplus */ #endif #ifndef __AsyncINapSystemHealthValidator_FWD_DEFINED__ #define __AsyncINapSystemHealthValidator_FWD_DEFINED__ typedef interface AsyncINapSystemHealthValidator AsyncINapSystemHealthValidator; +#ifdef __cplusplus +interface AsyncINapSystemHealthValidator; +#endif /* __cplusplus */ #endif #ifndef __INapServerCallback_FWD_DEFINED__ #define __INapServerCallback_FWD_DEFINED__ typedef interface INapServerCallback INapServerCallback; +#ifdef __cplusplus +interface INapServerCallback; +#endif /* __cplusplus */ #endif #ifndef __INapSystemHealthValidationRequest_FWD_DEFINED__ #define __INapSystemHealthValidationRequest_FWD_DEFINED__ typedef interface INapSystemHealthValidationRequest INapSystemHealthValidationRequest; +#ifdef __cplusplus +interface INapSystemHealthValidationRequest; +#endif /* __cplusplus */ #endif #ifndef __INapSystemHealthValidationRequest2_FWD_DEFINED__ #define __INapSystemHealthValidationRequest2_FWD_DEFINED__ typedef interface INapSystemHealthValidationRequest2 INapSystemHealthValidationRequest2; +#ifdef __cplusplus +interface INapSystemHealthValidationRequest2; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -57,21 +73,25 @@ extern "C" { #ifndef __INapServerCallback_FWD_DEFINED__ #define __INapServerCallback_FWD_DEFINED__ typedef interface INapServerCallback INapServerCallback; +#ifdef __cplusplus +interface INapServerCallback; +#endif /* __cplusplus */ #endif #ifndef __INapSystemHealthValidator_FWD_DEFINED__ #define __INapSystemHealthValidator_FWD_DEFINED__ typedef interface INapSystemHealthValidator INapSystemHealthValidator; -#endif - -#ifndef __AsyncINapSystemHealthValidator_FWD_DEFINED__ -#define __AsyncINapSystemHealthValidator_FWD_DEFINED__ -typedef interface AsyncINapSystemHealthValidator AsyncINapSystemHealthValidator; +#ifdef __cplusplus +interface INapSystemHealthValidator; +#endif /* __cplusplus */ #endif #ifndef __INapSystemHealthValidationRequest_FWD_DEFINED__ #define __INapSystemHealthValidationRequest_FWD_DEFINED__ typedef interface INapSystemHealthValidationRequest INapSystemHealthValidationRequest; +#ifdef __cplusplus +interface INapSystemHealthValidationRequest; +#endif /* __cplusplus */ #endif /***************************************************************************** @@ -100,25 +120,26 @@ typedef struct INapSystemHealthValidatorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INapSystemHealthValidator* This, + INapSystemHealthValidator *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INapSystemHealthValidator* This); + INapSystemHealthValidator *This); ULONG (STDMETHODCALLTYPE *Release)( - INapSystemHealthValidator* This); + INapSystemHealthValidator *This); /*** INapSystemHealthValidator methods ***/ HRESULT (STDMETHODCALLTYPE *Validate)( - INapSystemHealthValidator* This, + INapSystemHealthValidator *This, INapSystemHealthValidationRequest *request, UINT32 hintTimeOutInMsec, INapServerCallback *callback); END_INTERFACE } INapSystemHealthValidatorVtbl; + interface INapSystemHealthValidator { CONST_VTBL INapSystemHealthValidatorVtbl* lpVtbl; }; @@ -151,16 +172,6 @@ static FORCEINLINE HRESULT INapSystemHealthValidator_Validate(INapSystemHealthVa #endif -HRESULT STDMETHODCALLTYPE INapSystemHealthValidator_Validate_Proxy( - INapSystemHealthValidator* This, - INapSystemHealthValidationRequest *request, - UINT32 hintTimeOutInMsec, - INapServerCallback *callback); -void __RPC_STUB INapSystemHealthValidator_Validate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INapSystemHealthValidator_INTERFACE_DEFINED__ */ @@ -175,7 +186,7 @@ DEFINE_GUID(IID_AsyncINapSystemHealthValidator, 0x2516031a, 0xa391, 0x454d, 0xb5 MIDL_INTERFACE("2516031a-a391-454d-b53d-c5dc84c7f2db") AsyncINapSystemHealthValidator : public IUnknown { - virtual void STDMETHODCALLTYPE Begin_Validate( + virtual HRESULT STDMETHODCALLTYPE Begin_Validate( INapSystemHealthValidationRequest *request, UINT32 hintTimeOutInMsec, INapServerCallback *callback) = 0; @@ -193,28 +204,29 @@ typedef struct AsyncINapSystemHealthValidatorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - AsyncINapSystemHealthValidator* This, + AsyncINapSystemHealthValidator *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - AsyncINapSystemHealthValidator* This); + AsyncINapSystemHealthValidator *This); ULONG (STDMETHODCALLTYPE *Release)( - AsyncINapSystemHealthValidator* This); + AsyncINapSystemHealthValidator *This); - /*** INapSystemHealthValidator methods ***/ - void (STDMETHODCALLTYPE *Begin_Validate)( - AsyncINapSystemHealthValidator* This, + /*** AsyncINapSystemHealthValidator methods ***/ + HRESULT (STDMETHODCALLTYPE *Begin_Validate)( + AsyncINapSystemHealthValidator *This, INapSystemHealthValidationRequest *request, UINT32 hintTimeOutInMsec, INapServerCallback *callback); HRESULT (STDMETHODCALLTYPE *Finish_Validate)( - AsyncINapSystemHealthValidator* This); + AsyncINapSystemHealthValidator *This); END_INTERFACE } AsyncINapSystemHealthValidatorVtbl; + interface AsyncINapSystemHealthValidator { CONST_VTBL AsyncINapSystemHealthValidatorVtbl* lpVtbl; }; @@ -225,7 +237,7 @@ interface AsyncINapSystemHealthValidator { #define AsyncINapSystemHealthValidator_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) #define AsyncINapSystemHealthValidator_AddRef(This) (This)->lpVtbl->AddRef(This) #define AsyncINapSystemHealthValidator_Release(This) (This)->lpVtbl->Release(This) -/*** INapSystemHealthValidator methods ***/ +/*** AsyncINapSystemHealthValidator methods ***/ #define AsyncINapSystemHealthValidator_Begin_Validate(This,request,hintTimeOutInMsec,callback) (This)->lpVtbl->Begin_Validate(This,request,hintTimeOutInMsec,callback) #define AsyncINapSystemHealthValidator_Finish_Validate(This) (This)->lpVtbl->Finish_Validate(This) #else @@ -239,11 +251,11 @@ static FORCEINLINE ULONG AsyncINapSystemHealthValidator_AddRef(AsyncINapSystemHe static FORCEINLINE ULONG AsyncINapSystemHealthValidator_Release(AsyncINapSystemHealthValidator* This) { return This->lpVtbl->Release(This); } -/*** INapSystemHealthValidator methods ***/ -static FORCEINLINE void Begin_AsyncINapSystemHealthValidator_Validate(AsyncINapSystemHealthValidator* This,INapSystemHealthValidationRequest *request,UINT32 hintTimeOutInMsec,INapServerCallback *callback) { - This->lpVtbl->Begin_Validate(This,request,hintTimeOutInMsec,callback); +/*** AsyncINapSystemHealthValidator methods ***/ +static FORCEINLINE HRESULT AsyncINapSystemHealthValidator_Begin_Validate(AsyncINapSystemHealthValidator* This,INapSystemHealthValidationRequest *request,UINT32 hintTimeOutInMsec,INapServerCallback *callback) { + return This->lpVtbl->Begin_Validate(This,request,hintTimeOutInMsec,callback); } -static FORCEINLINE HRESULT Finish_AsyncINapSystemHealthValidator_Validate(AsyncINapSystemHealthValidator* This) { +static FORCEINLINE HRESULT AsyncINapSystemHealthValidator_Finish_Validate(AsyncINapSystemHealthValidator* This) { return This->lpVtbl->Finish_Validate(This); } #endif @@ -251,26 +263,6 @@ static FORCEINLINE HRESULT Finish_AsyncINapSystemHealthValidator_Validate(AsyncI #endif -HRESULT STDMETHODCALLTYPE AsyncINapSystemHealthValidator_Begin_Validate_Proxy( - INapSystemHealthValidator* This, - INapSystemHealthValidationRequest *request, - UINT32 hintTimeOutInMsec, - INapServerCallback *callback); -void __RPC_STUB AsyncINapSystemHealthValidator_Begin_Validate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE AsyncINapSystemHealthValidator_Finish_Validate_Proxy( - INapSystemHealthValidator* This, - INapSystemHealthValidationRequest *request, - UINT32 hintTimeOutInMsec, - INapServerCallback *callback); -void __RPC_STUB AsyncINapSystemHealthValidator_Finish_Validate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __AsyncINapSystemHealthValidator_INTERFACE_DEFINED__ */ @@ -299,24 +291,25 @@ typedef struct INapServerCallbackVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INapServerCallback* This, + INapServerCallback *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INapServerCallback* This); + INapServerCallback *This); ULONG (STDMETHODCALLTYPE *Release)( - INapServerCallback* This); + INapServerCallback *This); /*** INapServerCallback methods ***/ HRESULT (STDMETHODCALLTYPE *OnComplete)( - INapServerCallback* This, + INapServerCallback *This, INapSystemHealthValidationRequest *request, HRESULT errorCode); END_INTERFACE } INapServerCallbackVtbl; + interface INapServerCallback { CONST_VTBL INapServerCallbackVtbl* lpVtbl; }; @@ -349,15 +342,6 @@ static FORCEINLINE HRESULT INapServerCallback_OnComplete(INapServerCallback* Thi #endif -HRESULT STDMETHODCALLTYPE INapServerCallback_OnComplete_Proxy( - INapServerCallback* This, - INapSystemHealthValidationRequest *request, - HRESULT errorCode); -void __RPC_STUB INapServerCallback_OnComplete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INapServerCallback_INTERFACE_DEFINED__ */ @@ -407,52 +391,53 @@ typedef struct INapSystemHealthValidationRequestVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INapSystemHealthValidationRequest* This, + INapSystemHealthValidationRequest *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INapSystemHealthValidationRequest* This); + INapSystemHealthValidationRequest *This); ULONG (STDMETHODCALLTYPE *Release)( - INapSystemHealthValidationRequest* This); + INapSystemHealthValidationRequest *This); /*** INapSystemHealthValidationRequest methods ***/ HRESULT (STDMETHODCALLTYPE *GetCorrelationId)( - INapSystemHealthValidationRequest* This, + INapSystemHealthValidationRequest *This, CorrelationId *correlationId); HRESULT (STDMETHODCALLTYPE *GetStringCorrelationId)( - INapSystemHealthValidationRequest* This, + INapSystemHealthValidationRequest *This, StringCorrelationId **correlationId); HRESULT (STDMETHODCALLTYPE *GetMachineName)( - INapSystemHealthValidationRequest* This, + INapSystemHealthValidationRequest *This, CountedString **machineName); HRESULT (STDMETHODCALLTYPE *GetSoHRequest)( - INapSystemHealthValidationRequest* This, + INapSystemHealthValidationRequest *This, SoHRequest **sohRequest, WINBOOL *napSystemGenerated); HRESULT (STDMETHODCALLTYPE *SetSoHResponse)( - INapSystemHealthValidationRequest* This, + INapSystemHealthValidationRequest *This, const SoHResponse *sohResponse); HRESULT (STDMETHODCALLTYPE *GetSoHResponse)( - INapSystemHealthValidationRequest* This, + INapSystemHealthValidationRequest *This, SoHResponse **sohResponse); HRESULT (STDMETHODCALLTYPE *SetPrivateData)( - INapSystemHealthValidationRequest* This, + INapSystemHealthValidationRequest *This, const PrivateData *privateData); HRESULT (STDMETHODCALLTYPE *GetPrivateData)( - INapSystemHealthValidationRequest* This, + INapSystemHealthValidationRequest *This, PrivateData **privateData); END_INTERFACE } INapSystemHealthValidationRequestVtbl; + interface INapSystemHealthValidationRequest { CONST_VTBL INapSystemHealthValidationRequestVtbl* lpVtbl; }; @@ -513,71 +498,6 @@ static FORCEINLINE HRESULT INapSystemHealthValidationRequest_GetPrivateData(INap #endif -HRESULT STDMETHODCALLTYPE INapSystemHealthValidationRequest_GetCorrelationId_Proxy( - INapSystemHealthValidationRequest* This, - CorrelationId *correlationId); -void __RPC_STUB INapSystemHealthValidationRequest_GetCorrelationId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSystemHealthValidationRequest_GetStringCorrelationId_Proxy( - INapSystemHealthValidationRequest* This, - StringCorrelationId **correlationId); -void __RPC_STUB INapSystemHealthValidationRequest_GetStringCorrelationId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSystemHealthValidationRequest_GetMachineName_Proxy( - INapSystemHealthValidationRequest* This, - CountedString **machineName); -void __RPC_STUB INapSystemHealthValidationRequest_GetMachineName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSystemHealthValidationRequest_GetSoHRequest_Proxy( - INapSystemHealthValidationRequest* This, - SoHRequest **sohRequest, - WINBOOL *napSystemGenerated); -void __RPC_STUB INapSystemHealthValidationRequest_GetSoHRequest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSystemHealthValidationRequest_SetSoHResponse_Proxy( - INapSystemHealthValidationRequest* This, - const SoHResponse *sohResponse); -void __RPC_STUB INapSystemHealthValidationRequest_SetSoHResponse_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSystemHealthValidationRequest_GetSoHResponse_Proxy( - INapSystemHealthValidationRequest* This, - SoHResponse **sohResponse); -void __RPC_STUB INapSystemHealthValidationRequest_GetSoHResponse_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSystemHealthValidationRequest_SetPrivateData_Proxy( - INapSystemHealthValidationRequest* This, - const PrivateData *privateData); -void __RPC_STUB INapSystemHealthValidationRequest_SetPrivateData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INapSystemHealthValidationRequest_GetPrivateData_Proxy( - INapSystemHealthValidationRequest* This, - PrivateData **privateData); -void __RPC_STUB INapSystemHealthValidationRequest_GetPrivateData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INapSystemHealthValidationRequest_INTERFACE_DEFINED__ */ @@ -605,57 +525,58 @@ typedef struct INapSystemHealthValidationRequest2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INapSystemHealthValidationRequest2* This, + INapSystemHealthValidationRequest2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INapSystemHealthValidationRequest2* This); + INapSystemHealthValidationRequest2 *This); ULONG (STDMETHODCALLTYPE *Release)( - INapSystemHealthValidationRequest2* This); + INapSystemHealthValidationRequest2 *This); /*** INapSystemHealthValidationRequest methods ***/ HRESULT (STDMETHODCALLTYPE *GetCorrelationId)( - INapSystemHealthValidationRequest2* This, + INapSystemHealthValidationRequest2 *This, CorrelationId *correlationId); HRESULT (STDMETHODCALLTYPE *GetStringCorrelationId)( - INapSystemHealthValidationRequest2* This, + INapSystemHealthValidationRequest2 *This, StringCorrelationId **correlationId); HRESULT (STDMETHODCALLTYPE *GetMachineName)( - INapSystemHealthValidationRequest2* This, + INapSystemHealthValidationRequest2 *This, CountedString **machineName); HRESULT (STDMETHODCALLTYPE *GetSoHRequest)( - INapSystemHealthValidationRequest2* This, + INapSystemHealthValidationRequest2 *This, SoHRequest **sohRequest, WINBOOL *napSystemGenerated); HRESULT (STDMETHODCALLTYPE *SetSoHResponse)( - INapSystemHealthValidationRequest2* This, + INapSystemHealthValidationRequest2 *This, const SoHResponse *sohResponse); HRESULT (STDMETHODCALLTYPE *GetSoHResponse)( - INapSystemHealthValidationRequest2* This, + INapSystemHealthValidationRequest2 *This, SoHResponse **sohResponse); HRESULT (STDMETHODCALLTYPE *SetPrivateData)( - INapSystemHealthValidationRequest2* This, + INapSystemHealthValidationRequest2 *This, const PrivateData *privateData); HRESULT (STDMETHODCALLTYPE *GetPrivateData)( - INapSystemHealthValidationRequest2* This, + INapSystemHealthValidationRequest2 *This, PrivateData **privateData); /*** INapSystemHealthValidationRequest2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetConfigID)( - INapSystemHealthValidationRequest2* This, + INapSystemHealthValidationRequest2 *This, UINT32 *configID); END_INTERFACE } INapSystemHealthValidationRequest2Vtbl; + interface INapSystemHealthValidationRequest2 { CONST_VTBL INapSystemHealthValidationRequest2Vtbl* lpVtbl; }; @@ -722,14 +643,6 @@ static FORCEINLINE HRESULT INapSystemHealthValidationRequest2_GetConfigID(INapSy #endif -HRESULT STDMETHODCALLTYPE INapSystemHealthValidationRequest2_GetConfigID_Proxy( - INapSystemHealthValidationRequest2* This, - UINT32 *configID); -void __RPC_STUB INapSystemHealthValidationRequest2_GetConfigID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INapSystemHealthValidationRequest2_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/naptypes.h b/lib/libc/include/any-windows-any/naptypes.h index 2f2a02610e..ef33d7183c 100644 --- a/lib/libc/include/any-windows-any/naptypes.h +++ b/lib/libc/include/any-windows-any/naptypes.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/naptypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/naptypes.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/ncrypt.h b/lib/libc/include/any-windows-any/ncrypt.h index d850784c06..16a879dd2c 100644 --- a/lib/libc/include/any-windows-any/ncrypt.h +++ b/lib/libc/include/any-windows-any/ncrypt.h @@ -181,7 +181,7 @@ extern "C" { #define NCRYPT_REGISTER_NOTIFY_FLAG 0x1 #define NCRYPT_UNREGISTER_NOTIFY_FLAG 0x2 -#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= 0x0A00 #define NCRYPT_CIPHER_OPERATION BCRYPT_CIPHER_OPERATION #define NCRYPT_HASH_OPERATION BCRYPT_HASH_OPERATION #define NCRYPT_ASYMMETRIC_ENCRYPTION_OPERATION BCRYPT_ASYMMETRIC_ENCRYPTION_OPERATION diff --git a/lib/libc/include/any-windows-any/netfw.h b/lib/libc/include/any-windows-any/netfw.h index 20edc3ea33..d7797ce662 100644 --- a/lib/libc/include/any-windows-any/netfw.h +++ b/lib/libc/include/any-windows-any/netfw.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/netfw.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from include/netfw.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -89,6 +90,22 @@ interface INetFwRule; #endif /* __cplusplus */ #endif +#ifndef __INetFwRule2_FWD_DEFINED__ +#define __INetFwRule2_FWD_DEFINED__ +typedef interface INetFwRule2 INetFwRule2; +#ifdef __cplusplus +interface INetFwRule2; +#endif /* __cplusplus */ +#endif + +#ifndef __INetFwRule3_FWD_DEFINED__ +#define __INetFwRule3_FWD_DEFINED__ +typedef interface INetFwRule3 INetFwRule3; +#ifdef __cplusplus +interface INetFwRule3; +#endif /* __cplusplus */ +#endif + #ifndef __INetFwRules_FWD_DEFINED__ #define __INetFwRules_FWD_DEFINED__ typedef interface INetFwRules INetFwRules; @@ -2537,6 +2554,989 @@ static FORCEINLINE HRESULT INetFwRule_put_Action(INetFwRule* This,NET_FW_ACTION #endif /* __INetFwRule_INTERFACE_DEFINED__ */ +/***************************************************************************** + * INetFwRule2 interface + */ +#ifndef __INetFwRule2_INTERFACE_DEFINED__ +#define __INetFwRule2_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_INetFwRule2, 0x9c27c8da, 0x189b, 0x4dde, 0x89,0xf7, 0x8b,0x39,0xa3,0x16,0x78,0x2c); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("9c27c8da-189b-4dde-89f7-8b39a316782c") +INetFwRule2 : public INetFwRule +{ + virtual HRESULT STDMETHODCALLTYPE get_EdgeTraversalOptions( + LONG *lOptions) = 0; + + virtual HRESULT STDMETHODCALLTYPE put_EdgeTraversalOptions( + LONG lOptions) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(INetFwRule2, 0x9c27c8da, 0x189b, 0x4dde, 0x89,0xf7, 0x8b,0x39,0xa3,0x16,0x78,0x2c) +#endif +#else +typedef struct INetFwRule2Vtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + INetFwRule2 *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + INetFwRule2 *This); + + ULONG (STDMETHODCALLTYPE *Release)( + INetFwRule2 *This); + + /*** IDispatch methods ***/ + HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( + INetFwRule2 *This, + UINT *pctinfo); + + HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( + INetFwRule2 *This, + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo); + + HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( + INetFwRule2 *This, + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId); + + HRESULT (STDMETHODCALLTYPE *Invoke)( + INetFwRule2 *This, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr); + + /*** INetFwRule methods ***/ + HRESULT (STDMETHODCALLTYPE *get_Name)( + INetFwRule2 *This, + BSTR *name); + + HRESULT (STDMETHODCALLTYPE *put_Name)( + INetFwRule2 *This, + BSTR name); + + HRESULT (STDMETHODCALLTYPE *get_Description)( + INetFwRule2 *This, + BSTR *desc); + + HRESULT (STDMETHODCALLTYPE *put_Description)( + INetFwRule2 *This, + BSTR desc); + + HRESULT (STDMETHODCALLTYPE *get_ApplicationName)( + INetFwRule2 *This, + BSTR *imagename); + + HRESULT (STDMETHODCALLTYPE *put_ApplicationName)( + INetFwRule2 *This, + BSTR imagename); + + HRESULT (STDMETHODCALLTYPE *get_ServiceName)( + INetFwRule2 *This, + BSTR *service); + + HRESULT (STDMETHODCALLTYPE *put_ServiceName)( + INetFwRule2 *This, + BSTR service); + + HRESULT (STDMETHODCALLTYPE *get_Protocol)( + INetFwRule2 *This, + LONG *protocol); + + HRESULT (STDMETHODCALLTYPE *put_Protocol)( + INetFwRule2 *This, + LONG protocol); + + HRESULT (STDMETHODCALLTYPE *get_LocalPorts)( + INetFwRule2 *This, + BSTR *ports); + + HRESULT (STDMETHODCALLTYPE *put_LocalPorts)( + INetFwRule2 *This, + BSTR ports); + + HRESULT (STDMETHODCALLTYPE *get_RemotePorts)( + INetFwRule2 *This, + BSTR *ports); + + HRESULT (STDMETHODCALLTYPE *put_RemotePorts)( + INetFwRule2 *This, + BSTR ports); + + HRESULT (STDMETHODCALLTYPE *get_LocalAddresses)( + INetFwRule2 *This, + BSTR *address); + + HRESULT (STDMETHODCALLTYPE *put_LocalAddresses)( + INetFwRule2 *This, + BSTR address); + + HRESULT (STDMETHODCALLTYPE *get_RemoteAddresses)( + INetFwRule2 *This, + BSTR *address); + + HRESULT (STDMETHODCALLTYPE *put_RemoteAddresses)( + INetFwRule2 *This, + BSTR address); + + HRESULT (STDMETHODCALLTYPE *get_IcmpTypesAndCodes)( + INetFwRule2 *This, + BSTR *codes); + + HRESULT (STDMETHODCALLTYPE *put_IcmpTypesAndCodes)( + INetFwRule2 *This, + BSTR codes); + + HRESULT (STDMETHODCALLTYPE *get_Direction)( + INetFwRule2 *This, + NET_FW_RULE_DIRECTION *dir); + + HRESULT (STDMETHODCALLTYPE *put_Direction)( + INetFwRule2 *This, + NET_FW_RULE_DIRECTION dir); + + HRESULT (STDMETHODCALLTYPE *get_Interfaces)( + INetFwRule2 *This, + VARIANT *interfaces); + + HRESULT (STDMETHODCALLTYPE *put_Interfaces)( + INetFwRule2 *This, + VARIANT interfaces); + + HRESULT (STDMETHODCALLTYPE *get_InterfaceTypes)( + INetFwRule2 *This, + BSTR *types); + + HRESULT (STDMETHODCALLTYPE *put_InterfaceTypes)( + INetFwRule2 *This, + BSTR types); + + HRESULT (STDMETHODCALLTYPE *get_Enabled)( + INetFwRule2 *This, + VARIANT_BOOL *enabled); + + HRESULT (STDMETHODCALLTYPE *put_Enabled)( + INetFwRule2 *This, + VARIANT_BOOL enabled); + + HRESULT (STDMETHODCALLTYPE *get_Grouping)( + INetFwRule2 *This, + BSTR *context); + + HRESULT (STDMETHODCALLTYPE *put_Grouping)( + INetFwRule2 *This, + BSTR context); + + HRESULT (STDMETHODCALLTYPE *get_Profiles)( + INetFwRule2 *This, + LONG *profiles); + + HRESULT (STDMETHODCALLTYPE *put_Profiles)( + INetFwRule2 *This, + LONG profiles); + + HRESULT (STDMETHODCALLTYPE *get_EdgeTraversal)( + INetFwRule2 *This, + VARIANT_BOOL *enabled); + + HRESULT (STDMETHODCALLTYPE *put_EdgeTraversal)( + INetFwRule2 *This, + VARIANT_BOOL enabled); + + HRESULT (STDMETHODCALLTYPE *get_Action)( + INetFwRule2 *This, + NET_FW_ACTION *action); + + HRESULT (STDMETHODCALLTYPE *put_Action)( + INetFwRule2 *This, + NET_FW_ACTION action); + + /*** INetFwRule2 methods ***/ + HRESULT (STDMETHODCALLTYPE *get_EdgeTraversalOptions)( + INetFwRule2 *This, + LONG *lOptions); + + HRESULT (STDMETHODCALLTYPE *put_EdgeTraversalOptions)( + INetFwRule2 *This, + LONG lOptions); + + END_INTERFACE +} INetFwRule2Vtbl; + +interface INetFwRule2 { + CONST_VTBL INetFwRule2Vtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define INetFwRule2_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define INetFwRule2_AddRef(This) (This)->lpVtbl->AddRef(This) +#define INetFwRule2_Release(This) (This)->lpVtbl->Release(This) +/*** IDispatch methods ***/ +#define INetFwRule2_GetTypeInfoCount(This,pctinfo) (This)->lpVtbl->GetTypeInfoCount(This,pctinfo) +#define INetFwRule2_GetTypeInfo(This,iTInfo,lcid,ppTInfo) (This)->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo) +#define INetFwRule2_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) (This)->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) +#define INetFwRule2_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) (This)->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) +/*** INetFwRule methods ***/ +#define INetFwRule2_get_Name(This,name) (This)->lpVtbl->get_Name(This,name) +#define INetFwRule2_put_Name(This,name) (This)->lpVtbl->put_Name(This,name) +#define INetFwRule2_get_Description(This,desc) (This)->lpVtbl->get_Description(This,desc) +#define INetFwRule2_put_Description(This,desc) (This)->lpVtbl->put_Description(This,desc) +#define INetFwRule2_get_ApplicationName(This,imagename) (This)->lpVtbl->get_ApplicationName(This,imagename) +#define INetFwRule2_put_ApplicationName(This,imagename) (This)->lpVtbl->put_ApplicationName(This,imagename) +#define INetFwRule2_get_ServiceName(This,service) (This)->lpVtbl->get_ServiceName(This,service) +#define INetFwRule2_put_ServiceName(This,service) (This)->lpVtbl->put_ServiceName(This,service) +#define INetFwRule2_get_Protocol(This,protocol) (This)->lpVtbl->get_Protocol(This,protocol) +#define INetFwRule2_put_Protocol(This,protocol) (This)->lpVtbl->put_Protocol(This,protocol) +#define INetFwRule2_get_LocalPorts(This,ports) (This)->lpVtbl->get_LocalPorts(This,ports) +#define INetFwRule2_put_LocalPorts(This,ports) (This)->lpVtbl->put_LocalPorts(This,ports) +#define INetFwRule2_get_RemotePorts(This,ports) (This)->lpVtbl->get_RemotePorts(This,ports) +#define INetFwRule2_put_RemotePorts(This,ports) (This)->lpVtbl->put_RemotePorts(This,ports) +#define INetFwRule2_get_LocalAddresses(This,address) (This)->lpVtbl->get_LocalAddresses(This,address) +#define INetFwRule2_put_LocalAddresses(This,address) (This)->lpVtbl->put_LocalAddresses(This,address) +#define INetFwRule2_get_RemoteAddresses(This,address) (This)->lpVtbl->get_RemoteAddresses(This,address) +#define INetFwRule2_put_RemoteAddresses(This,address) (This)->lpVtbl->put_RemoteAddresses(This,address) +#define INetFwRule2_get_IcmpTypesAndCodes(This,codes) (This)->lpVtbl->get_IcmpTypesAndCodes(This,codes) +#define INetFwRule2_put_IcmpTypesAndCodes(This,codes) (This)->lpVtbl->put_IcmpTypesAndCodes(This,codes) +#define INetFwRule2_get_Direction(This,dir) (This)->lpVtbl->get_Direction(This,dir) +#define INetFwRule2_put_Direction(This,dir) (This)->lpVtbl->put_Direction(This,dir) +#define INetFwRule2_get_Interfaces(This,interfaces) (This)->lpVtbl->get_Interfaces(This,interfaces) +#define INetFwRule2_put_Interfaces(This,interfaces) (This)->lpVtbl->put_Interfaces(This,interfaces) +#define INetFwRule2_get_InterfaceTypes(This,types) (This)->lpVtbl->get_InterfaceTypes(This,types) +#define INetFwRule2_put_InterfaceTypes(This,types) (This)->lpVtbl->put_InterfaceTypes(This,types) +#define INetFwRule2_get_Enabled(This,enabled) (This)->lpVtbl->get_Enabled(This,enabled) +#define INetFwRule2_put_Enabled(This,enabled) (This)->lpVtbl->put_Enabled(This,enabled) +#define INetFwRule2_get_Grouping(This,context) (This)->lpVtbl->get_Grouping(This,context) +#define INetFwRule2_put_Grouping(This,context) (This)->lpVtbl->put_Grouping(This,context) +#define INetFwRule2_get_Profiles(This,profiles) (This)->lpVtbl->get_Profiles(This,profiles) +#define INetFwRule2_put_Profiles(This,profiles) (This)->lpVtbl->put_Profiles(This,profiles) +#define INetFwRule2_get_EdgeTraversal(This,enabled) (This)->lpVtbl->get_EdgeTraversal(This,enabled) +#define INetFwRule2_put_EdgeTraversal(This,enabled) (This)->lpVtbl->put_EdgeTraversal(This,enabled) +#define INetFwRule2_get_Action(This,action) (This)->lpVtbl->get_Action(This,action) +#define INetFwRule2_put_Action(This,action) (This)->lpVtbl->put_Action(This,action) +/*** INetFwRule2 methods ***/ +#define INetFwRule2_get_EdgeTraversalOptions(This,lOptions) (This)->lpVtbl->get_EdgeTraversalOptions(This,lOptions) +#define INetFwRule2_put_EdgeTraversalOptions(This,lOptions) (This)->lpVtbl->put_EdgeTraversalOptions(This,lOptions) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT INetFwRule2_QueryInterface(INetFwRule2* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG INetFwRule2_AddRef(INetFwRule2* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG INetFwRule2_Release(INetFwRule2* This) { + return This->lpVtbl->Release(This); +} +/*** IDispatch methods ***/ +static FORCEINLINE HRESULT INetFwRule2_GetTypeInfoCount(INetFwRule2* This,UINT *pctinfo) { + return This->lpVtbl->GetTypeInfoCount(This,pctinfo); +} +static FORCEINLINE HRESULT INetFwRule2_GetTypeInfo(INetFwRule2* This,UINT iTInfo,LCID lcid,ITypeInfo **ppTInfo) { + return This->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo); +} +static FORCEINLINE HRESULT INetFwRule2_GetIDsOfNames(INetFwRule2* This,REFIID riid,LPOLESTR *rgszNames,UINT cNames,LCID lcid,DISPID *rgDispId) { + return This->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId); +} +static FORCEINLINE HRESULT INetFwRule2_Invoke(INetFwRule2* This,DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) { + return This->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr); +} +/*** INetFwRule methods ***/ +static FORCEINLINE HRESULT INetFwRule2_get_Name(INetFwRule2* This,BSTR *name) { + return This->lpVtbl->get_Name(This,name); +} +static FORCEINLINE HRESULT INetFwRule2_put_Name(INetFwRule2* This,BSTR name) { + return This->lpVtbl->put_Name(This,name); +} +static FORCEINLINE HRESULT INetFwRule2_get_Description(INetFwRule2* This,BSTR *desc) { + return This->lpVtbl->get_Description(This,desc); +} +static FORCEINLINE HRESULT INetFwRule2_put_Description(INetFwRule2* This,BSTR desc) { + return This->lpVtbl->put_Description(This,desc); +} +static FORCEINLINE HRESULT INetFwRule2_get_ApplicationName(INetFwRule2* This,BSTR *imagename) { + return This->lpVtbl->get_ApplicationName(This,imagename); +} +static FORCEINLINE HRESULT INetFwRule2_put_ApplicationName(INetFwRule2* This,BSTR imagename) { + return This->lpVtbl->put_ApplicationName(This,imagename); +} +static FORCEINLINE HRESULT INetFwRule2_get_ServiceName(INetFwRule2* This,BSTR *service) { + return This->lpVtbl->get_ServiceName(This,service); +} +static FORCEINLINE HRESULT INetFwRule2_put_ServiceName(INetFwRule2* This,BSTR service) { + return This->lpVtbl->put_ServiceName(This,service); +} +static FORCEINLINE HRESULT INetFwRule2_get_Protocol(INetFwRule2* This,LONG *protocol) { + return This->lpVtbl->get_Protocol(This,protocol); +} +static FORCEINLINE HRESULT INetFwRule2_put_Protocol(INetFwRule2* This,LONG protocol) { + return This->lpVtbl->put_Protocol(This,protocol); +} +static FORCEINLINE HRESULT INetFwRule2_get_LocalPorts(INetFwRule2* This,BSTR *ports) { + return This->lpVtbl->get_LocalPorts(This,ports); +} +static FORCEINLINE HRESULT INetFwRule2_put_LocalPorts(INetFwRule2* This,BSTR ports) { + return This->lpVtbl->put_LocalPorts(This,ports); +} +static FORCEINLINE HRESULT INetFwRule2_get_RemotePorts(INetFwRule2* This,BSTR *ports) { + return This->lpVtbl->get_RemotePorts(This,ports); +} +static FORCEINLINE HRESULT INetFwRule2_put_RemotePorts(INetFwRule2* This,BSTR ports) { + return This->lpVtbl->put_RemotePorts(This,ports); +} +static FORCEINLINE HRESULT INetFwRule2_get_LocalAddresses(INetFwRule2* This,BSTR *address) { + return This->lpVtbl->get_LocalAddresses(This,address); +} +static FORCEINLINE HRESULT INetFwRule2_put_LocalAddresses(INetFwRule2* This,BSTR address) { + return This->lpVtbl->put_LocalAddresses(This,address); +} +static FORCEINLINE HRESULT INetFwRule2_get_RemoteAddresses(INetFwRule2* This,BSTR *address) { + return This->lpVtbl->get_RemoteAddresses(This,address); +} +static FORCEINLINE HRESULT INetFwRule2_put_RemoteAddresses(INetFwRule2* This,BSTR address) { + return This->lpVtbl->put_RemoteAddresses(This,address); +} +static FORCEINLINE HRESULT INetFwRule2_get_IcmpTypesAndCodes(INetFwRule2* This,BSTR *codes) { + return This->lpVtbl->get_IcmpTypesAndCodes(This,codes); +} +static FORCEINLINE HRESULT INetFwRule2_put_IcmpTypesAndCodes(INetFwRule2* This,BSTR codes) { + return This->lpVtbl->put_IcmpTypesAndCodes(This,codes); +} +static FORCEINLINE HRESULT INetFwRule2_get_Direction(INetFwRule2* This,NET_FW_RULE_DIRECTION *dir) { + return This->lpVtbl->get_Direction(This,dir); +} +static FORCEINLINE HRESULT INetFwRule2_put_Direction(INetFwRule2* This,NET_FW_RULE_DIRECTION dir) { + return This->lpVtbl->put_Direction(This,dir); +} +static FORCEINLINE HRESULT INetFwRule2_get_Interfaces(INetFwRule2* This,VARIANT *interfaces) { + return This->lpVtbl->get_Interfaces(This,interfaces); +} +static FORCEINLINE HRESULT INetFwRule2_put_Interfaces(INetFwRule2* This,VARIANT interfaces) { + return This->lpVtbl->put_Interfaces(This,interfaces); +} +static FORCEINLINE HRESULT INetFwRule2_get_InterfaceTypes(INetFwRule2* This,BSTR *types) { + return This->lpVtbl->get_InterfaceTypes(This,types); +} +static FORCEINLINE HRESULT INetFwRule2_put_InterfaceTypes(INetFwRule2* This,BSTR types) { + return This->lpVtbl->put_InterfaceTypes(This,types); +} +static FORCEINLINE HRESULT INetFwRule2_get_Enabled(INetFwRule2* This,VARIANT_BOOL *enabled) { + return This->lpVtbl->get_Enabled(This,enabled); +} +static FORCEINLINE HRESULT INetFwRule2_put_Enabled(INetFwRule2* This,VARIANT_BOOL enabled) { + return This->lpVtbl->put_Enabled(This,enabled); +} +static FORCEINLINE HRESULT INetFwRule2_get_Grouping(INetFwRule2* This,BSTR *context) { + return This->lpVtbl->get_Grouping(This,context); +} +static FORCEINLINE HRESULT INetFwRule2_put_Grouping(INetFwRule2* This,BSTR context) { + return This->lpVtbl->put_Grouping(This,context); +} +static FORCEINLINE HRESULT INetFwRule2_get_Profiles(INetFwRule2* This,LONG *profiles) { + return This->lpVtbl->get_Profiles(This,profiles); +} +static FORCEINLINE HRESULT INetFwRule2_put_Profiles(INetFwRule2* This,LONG profiles) { + return This->lpVtbl->put_Profiles(This,profiles); +} +static FORCEINLINE HRESULT INetFwRule2_get_EdgeTraversal(INetFwRule2* This,VARIANT_BOOL *enabled) { + return This->lpVtbl->get_EdgeTraversal(This,enabled); +} +static FORCEINLINE HRESULT INetFwRule2_put_EdgeTraversal(INetFwRule2* This,VARIANT_BOOL enabled) { + return This->lpVtbl->put_EdgeTraversal(This,enabled); +} +static FORCEINLINE HRESULT INetFwRule2_get_Action(INetFwRule2* This,NET_FW_ACTION *action) { + return This->lpVtbl->get_Action(This,action); +} +static FORCEINLINE HRESULT INetFwRule2_put_Action(INetFwRule2* This,NET_FW_ACTION action) { + return This->lpVtbl->put_Action(This,action); +} +/*** INetFwRule2 methods ***/ +static FORCEINLINE HRESULT INetFwRule2_get_EdgeTraversalOptions(INetFwRule2* This,LONG *lOptions) { + return This->lpVtbl->get_EdgeTraversalOptions(This,lOptions); +} +static FORCEINLINE HRESULT INetFwRule2_put_EdgeTraversalOptions(INetFwRule2* This,LONG lOptions) { + return This->lpVtbl->put_EdgeTraversalOptions(This,lOptions); +} +#endif +#endif + +#endif + + +#endif /* __INetFwRule2_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * INetFwRule3 interface + */ +#ifndef __INetFwRule3_INTERFACE_DEFINED__ +#define __INetFwRule3_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_INetFwRule3, 0xb21563ff, 0xd696, 0x4222, 0xab,0x46, 0x4e,0x89,0xb7,0x3a,0xb3,0x4a); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("b21563ff-d696-4222-ab46-4e89b73ab34a") +INetFwRule3 : public INetFwRule2 +{ + virtual HRESULT STDMETHODCALLTYPE get_LocalAppPackageId( + BSTR *wszPackageId) = 0; + + virtual HRESULT STDMETHODCALLTYPE put_LocalAppPackageId( + BSTR wszPackageId) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_LocalUserOwner( + BSTR *wszUserOwner) = 0; + + virtual HRESULT STDMETHODCALLTYPE put_LocalUserOwner( + BSTR wszUserOwner) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_LocalUserAuthorizedList( + BSTR *wszUserAuthList) = 0; + + virtual HRESULT STDMETHODCALLTYPE put_LocalUserAuthorizedList( + BSTR wszUserAuthList) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_RemoteUserAuthorizedList( + BSTR *wszUserAuthList) = 0; + + virtual HRESULT STDMETHODCALLTYPE put_RemoteUserAuthorizedList( + BSTR wszUserAuthList) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_RemoteMachineAuthorizedList( + BSTR *wszUserAuthList) = 0; + + virtual HRESULT STDMETHODCALLTYPE put_RemoteMachineAuthorizedList( + BSTR wszUserAuthList) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_SecureFlags( + LONG *lOptions) = 0; + + virtual HRESULT STDMETHODCALLTYPE put_SecureFlags( + LONG lOptions) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(INetFwRule3, 0xb21563ff, 0xd696, 0x4222, 0xab,0x46, 0x4e,0x89,0xb7,0x3a,0xb3,0x4a) +#endif +#else +typedef struct INetFwRule3Vtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + INetFwRule3 *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + INetFwRule3 *This); + + ULONG (STDMETHODCALLTYPE *Release)( + INetFwRule3 *This); + + /*** IDispatch methods ***/ + HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( + INetFwRule3 *This, + UINT *pctinfo); + + HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( + INetFwRule3 *This, + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo); + + HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( + INetFwRule3 *This, + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId); + + HRESULT (STDMETHODCALLTYPE *Invoke)( + INetFwRule3 *This, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr); + + /*** INetFwRule methods ***/ + HRESULT (STDMETHODCALLTYPE *get_Name)( + INetFwRule3 *This, + BSTR *name); + + HRESULT (STDMETHODCALLTYPE *put_Name)( + INetFwRule3 *This, + BSTR name); + + HRESULT (STDMETHODCALLTYPE *get_Description)( + INetFwRule3 *This, + BSTR *desc); + + HRESULT (STDMETHODCALLTYPE *put_Description)( + INetFwRule3 *This, + BSTR desc); + + HRESULT (STDMETHODCALLTYPE *get_ApplicationName)( + INetFwRule3 *This, + BSTR *imagename); + + HRESULT (STDMETHODCALLTYPE *put_ApplicationName)( + INetFwRule3 *This, + BSTR imagename); + + HRESULT (STDMETHODCALLTYPE *get_ServiceName)( + INetFwRule3 *This, + BSTR *service); + + HRESULT (STDMETHODCALLTYPE *put_ServiceName)( + INetFwRule3 *This, + BSTR service); + + HRESULT (STDMETHODCALLTYPE *get_Protocol)( + INetFwRule3 *This, + LONG *protocol); + + HRESULT (STDMETHODCALLTYPE *put_Protocol)( + INetFwRule3 *This, + LONG protocol); + + HRESULT (STDMETHODCALLTYPE *get_LocalPorts)( + INetFwRule3 *This, + BSTR *ports); + + HRESULT (STDMETHODCALLTYPE *put_LocalPorts)( + INetFwRule3 *This, + BSTR ports); + + HRESULT (STDMETHODCALLTYPE *get_RemotePorts)( + INetFwRule3 *This, + BSTR *ports); + + HRESULT (STDMETHODCALLTYPE *put_RemotePorts)( + INetFwRule3 *This, + BSTR ports); + + HRESULT (STDMETHODCALLTYPE *get_LocalAddresses)( + INetFwRule3 *This, + BSTR *address); + + HRESULT (STDMETHODCALLTYPE *put_LocalAddresses)( + INetFwRule3 *This, + BSTR address); + + HRESULT (STDMETHODCALLTYPE *get_RemoteAddresses)( + INetFwRule3 *This, + BSTR *address); + + HRESULT (STDMETHODCALLTYPE *put_RemoteAddresses)( + INetFwRule3 *This, + BSTR address); + + HRESULT (STDMETHODCALLTYPE *get_IcmpTypesAndCodes)( + INetFwRule3 *This, + BSTR *codes); + + HRESULT (STDMETHODCALLTYPE *put_IcmpTypesAndCodes)( + INetFwRule3 *This, + BSTR codes); + + HRESULT (STDMETHODCALLTYPE *get_Direction)( + INetFwRule3 *This, + NET_FW_RULE_DIRECTION *dir); + + HRESULT (STDMETHODCALLTYPE *put_Direction)( + INetFwRule3 *This, + NET_FW_RULE_DIRECTION dir); + + HRESULT (STDMETHODCALLTYPE *get_Interfaces)( + INetFwRule3 *This, + VARIANT *interfaces); + + HRESULT (STDMETHODCALLTYPE *put_Interfaces)( + INetFwRule3 *This, + VARIANT interfaces); + + HRESULT (STDMETHODCALLTYPE *get_InterfaceTypes)( + INetFwRule3 *This, + BSTR *types); + + HRESULT (STDMETHODCALLTYPE *put_InterfaceTypes)( + INetFwRule3 *This, + BSTR types); + + HRESULT (STDMETHODCALLTYPE *get_Enabled)( + INetFwRule3 *This, + VARIANT_BOOL *enabled); + + HRESULT (STDMETHODCALLTYPE *put_Enabled)( + INetFwRule3 *This, + VARIANT_BOOL enabled); + + HRESULT (STDMETHODCALLTYPE *get_Grouping)( + INetFwRule3 *This, + BSTR *context); + + HRESULT (STDMETHODCALLTYPE *put_Grouping)( + INetFwRule3 *This, + BSTR context); + + HRESULT (STDMETHODCALLTYPE *get_Profiles)( + INetFwRule3 *This, + LONG *profiles); + + HRESULT (STDMETHODCALLTYPE *put_Profiles)( + INetFwRule3 *This, + LONG profiles); + + HRESULT (STDMETHODCALLTYPE *get_EdgeTraversal)( + INetFwRule3 *This, + VARIANT_BOOL *enabled); + + HRESULT (STDMETHODCALLTYPE *put_EdgeTraversal)( + INetFwRule3 *This, + VARIANT_BOOL enabled); + + HRESULT (STDMETHODCALLTYPE *get_Action)( + INetFwRule3 *This, + NET_FW_ACTION *action); + + HRESULT (STDMETHODCALLTYPE *put_Action)( + INetFwRule3 *This, + NET_FW_ACTION action); + + /*** INetFwRule2 methods ***/ + HRESULT (STDMETHODCALLTYPE *get_EdgeTraversalOptions)( + INetFwRule3 *This, + LONG *lOptions); + + HRESULT (STDMETHODCALLTYPE *put_EdgeTraversalOptions)( + INetFwRule3 *This, + LONG lOptions); + + /*** INetFwRule3 methods ***/ + HRESULT (STDMETHODCALLTYPE *get_LocalAppPackageId)( + INetFwRule3 *This, + BSTR *wszPackageId); + + HRESULT (STDMETHODCALLTYPE *put_LocalAppPackageId)( + INetFwRule3 *This, + BSTR wszPackageId); + + HRESULT (STDMETHODCALLTYPE *get_LocalUserOwner)( + INetFwRule3 *This, + BSTR *wszUserOwner); + + HRESULT (STDMETHODCALLTYPE *put_LocalUserOwner)( + INetFwRule3 *This, + BSTR wszUserOwner); + + HRESULT (STDMETHODCALLTYPE *get_LocalUserAuthorizedList)( + INetFwRule3 *This, + BSTR *wszUserAuthList); + + HRESULT (STDMETHODCALLTYPE *put_LocalUserAuthorizedList)( + INetFwRule3 *This, + BSTR wszUserAuthList); + + HRESULT (STDMETHODCALLTYPE *get_RemoteUserAuthorizedList)( + INetFwRule3 *This, + BSTR *wszUserAuthList); + + HRESULT (STDMETHODCALLTYPE *put_RemoteUserAuthorizedList)( + INetFwRule3 *This, + BSTR wszUserAuthList); + + HRESULT (STDMETHODCALLTYPE *get_RemoteMachineAuthorizedList)( + INetFwRule3 *This, + BSTR *wszUserAuthList); + + HRESULT (STDMETHODCALLTYPE *put_RemoteMachineAuthorizedList)( + INetFwRule3 *This, + BSTR wszUserAuthList); + + HRESULT (STDMETHODCALLTYPE *get_SecureFlags)( + INetFwRule3 *This, + LONG *lOptions); + + HRESULT (STDMETHODCALLTYPE *put_SecureFlags)( + INetFwRule3 *This, + LONG lOptions); + + END_INTERFACE +} INetFwRule3Vtbl; + +interface INetFwRule3 { + CONST_VTBL INetFwRule3Vtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define INetFwRule3_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define INetFwRule3_AddRef(This) (This)->lpVtbl->AddRef(This) +#define INetFwRule3_Release(This) (This)->lpVtbl->Release(This) +/*** IDispatch methods ***/ +#define INetFwRule3_GetTypeInfoCount(This,pctinfo) (This)->lpVtbl->GetTypeInfoCount(This,pctinfo) +#define INetFwRule3_GetTypeInfo(This,iTInfo,lcid,ppTInfo) (This)->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo) +#define INetFwRule3_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) (This)->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) +#define INetFwRule3_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) (This)->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) +/*** INetFwRule methods ***/ +#define INetFwRule3_get_Name(This,name) (This)->lpVtbl->get_Name(This,name) +#define INetFwRule3_put_Name(This,name) (This)->lpVtbl->put_Name(This,name) +#define INetFwRule3_get_Description(This,desc) (This)->lpVtbl->get_Description(This,desc) +#define INetFwRule3_put_Description(This,desc) (This)->lpVtbl->put_Description(This,desc) +#define INetFwRule3_get_ApplicationName(This,imagename) (This)->lpVtbl->get_ApplicationName(This,imagename) +#define INetFwRule3_put_ApplicationName(This,imagename) (This)->lpVtbl->put_ApplicationName(This,imagename) +#define INetFwRule3_get_ServiceName(This,service) (This)->lpVtbl->get_ServiceName(This,service) +#define INetFwRule3_put_ServiceName(This,service) (This)->lpVtbl->put_ServiceName(This,service) +#define INetFwRule3_get_Protocol(This,protocol) (This)->lpVtbl->get_Protocol(This,protocol) +#define INetFwRule3_put_Protocol(This,protocol) (This)->lpVtbl->put_Protocol(This,protocol) +#define INetFwRule3_get_LocalPorts(This,ports) (This)->lpVtbl->get_LocalPorts(This,ports) +#define INetFwRule3_put_LocalPorts(This,ports) (This)->lpVtbl->put_LocalPorts(This,ports) +#define INetFwRule3_get_RemotePorts(This,ports) (This)->lpVtbl->get_RemotePorts(This,ports) +#define INetFwRule3_put_RemotePorts(This,ports) (This)->lpVtbl->put_RemotePorts(This,ports) +#define INetFwRule3_get_LocalAddresses(This,address) (This)->lpVtbl->get_LocalAddresses(This,address) +#define INetFwRule3_put_LocalAddresses(This,address) (This)->lpVtbl->put_LocalAddresses(This,address) +#define INetFwRule3_get_RemoteAddresses(This,address) (This)->lpVtbl->get_RemoteAddresses(This,address) +#define INetFwRule3_put_RemoteAddresses(This,address) (This)->lpVtbl->put_RemoteAddresses(This,address) +#define INetFwRule3_get_IcmpTypesAndCodes(This,codes) (This)->lpVtbl->get_IcmpTypesAndCodes(This,codes) +#define INetFwRule3_put_IcmpTypesAndCodes(This,codes) (This)->lpVtbl->put_IcmpTypesAndCodes(This,codes) +#define INetFwRule3_get_Direction(This,dir) (This)->lpVtbl->get_Direction(This,dir) +#define INetFwRule3_put_Direction(This,dir) (This)->lpVtbl->put_Direction(This,dir) +#define INetFwRule3_get_Interfaces(This,interfaces) (This)->lpVtbl->get_Interfaces(This,interfaces) +#define INetFwRule3_put_Interfaces(This,interfaces) (This)->lpVtbl->put_Interfaces(This,interfaces) +#define INetFwRule3_get_InterfaceTypes(This,types) (This)->lpVtbl->get_InterfaceTypes(This,types) +#define INetFwRule3_put_InterfaceTypes(This,types) (This)->lpVtbl->put_InterfaceTypes(This,types) +#define INetFwRule3_get_Enabled(This,enabled) (This)->lpVtbl->get_Enabled(This,enabled) +#define INetFwRule3_put_Enabled(This,enabled) (This)->lpVtbl->put_Enabled(This,enabled) +#define INetFwRule3_get_Grouping(This,context) (This)->lpVtbl->get_Grouping(This,context) +#define INetFwRule3_put_Grouping(This,context) (This)->lpVtbl->put_Grouping(This,context) +#define INetFwRule3_get_Profiles(This,profiles) (This)->lpVtbl->get_Profiles(This,profiles) +#define INetFwRule3_put_Profiles(This,profiles) (This)->lpVtbl->put_Profiles(This,profiles) +#define INetFwRule3_get_EdgeTraversal(This,enabled) (This)->lpVtbl->get_EdgeTraversal(This,enabled) +#define INetFwRule3_put_EdgeTraversal(This,enabled) (This)->lpVtbl->put_EdgeTraversal(This,enabled) +#define INetFwRule3_get_Action(This,action) (This)->lpVtbl->get_Action(This,action) +#define INetFwRule3_put_Action(This,action) (This)->lpVtbl->put_Action(This,action) +/*** INetFwRule2 methods ***/ +#define INetFwRule3_get_EdgeTraversalOptions(This,lOptions) (This)->lpVtbl->get_EdgeTraversalOptions(This,lOptions) +#define INetFwRule3_put_EdgeTraversalOptions(This,lOptions) (This)->lpVtbl->put_EdgeTraversalOptions(This,lOptions) +/*** INetFwRule3 methods ***/ +#define INetFwRule3_get_LocalAppPackageId(This,wszPackageId) (This)->lpVtbl->get_LocalAppPackageId(This,wszPackageId) +#define INetFwRule3_put_LocalAppPackageId(This,wszPackageId) (This)->lpVtbl->put_LocalAppPackageId(This,wszPackageId) +#define INetFwRule3_get_LocalUserOwner(This,wszUserOwner) (This)->lpVtbl->get_LocalUserOwner(This,wszUserOwner) +#define INetFwRule3_put_LocalUserOwner(This,wszUserOwner) (This)->lpVtbl->put_LocalUserOwner(This,wszUserOwner) +#define INetFwRule3_get_LocalUserAuthorizedList(This,wszUserAuthList) (This)->lpVtbl->get_LocalUserAuthorizedList(This,wszUserAuthList) +#define INetFwRule3_put_LocalUserAuthorizedList(This,wszUserAuthList) (This)->lpVtbl->put_LocalUserAuthorizedList(This,wszUserAuthList) +#define INetFwRule3_get_RemoteUserAuthorizedList(This,wszUserAuthList) (This)->lpVtbl->get_RemoteUserAuthorizedList(This,wszUserAuthList) +#define INetFwRule3_put_RemoteUserAuthorizedList(This,wszUserAuthList) (This)->lpVtbl->put_RemoteUserAuthorizedList(This,wszUserAuthList) +#define INetFwRule3_get_RemoteMachineAuthorizedList(This,wszUserAuthList) (This)->lpVtbl->get_RemoteMachineAuthorizedList(This,wszUserAuthList) +#define INetFwRule3_put_RemoteMachineAuthorizedList(This,wszUserAuthList) (This)->lpVtbl->put_RemoteMachineAuthorizedList(This,wszUserAuthList) +#define INetFwRule3_get_SecureFlags(This,lOptions) (This)->lpVtbl->get_SecureFlags(This,lOptions) +#define INetFwRule3_put_SecureFlags(This,lOptions) (This)->lpVtbl->put_SecureFlags(This,lOptions) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT INetFwRule3_QueryInterface(INetFwRule3* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG INetFwRule3_AddRef(INetFwRule3* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG INetFwRule3_Release(INetFwRule3* This) { + return This->lpVtbl->Release(This); +} +/*** IDispatch methods ***/ +static FORCEINLINE HRESULT INetFwRule3_GetTypeInfoCount(INetFwRule3* This,UINT *pctinfo) { + return This->lpVtbl->GetTypeInfoCount(This,pctinfo); +} +static FORCEINLINE HRESULT INetFwRule3_GetTypeInfo(INetFwRule3* This,UINT iTInfo,LCID lcid,ITypeInfo **ppTInfo) { + return This->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo); +} +static FORCEINLINE HRESULT INetFwRule3_GetIDsOfNames(INetFwRule3* This,REFIID riid,LPOLESTR *rgszNames,UINT cNames,LCID lcid,DISPID *rgDispId) { + return This->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId); +} +static FORCEINLINE HRESULT INetFwRule3_Invoke(INetFwRule3* This,DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) { + return This->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr); +} +/*** INetFwRule methods ***/ +static FORCEINLINE HRESULT INetFwRule3_get_Name(INetFwRule3* This,BSTR *name) { + return This->lpVtbl->get_Name(This,name); +} +static FORCEINLINE HRESULT INetFwRule3_put_Name(INetFwRule3* This,BSTR name) { + return This->lpVtbl->put_Name(This,name); +} +static FORCEINLINE HRESULT INetFwRule3_get_Description(INetFwRule3* This,BSTR *desc) { + return This->lpVtbl->get_Description(This,desc); +} +static FORCEINLINE HRESULT INetFwRule3_put_Description(INetFwRule3* This,BSTR desc) { + return This->lpVtbl->put_Description(This,desc); +} +static FORCEINLINE HRESULT INetFwRule3_get_ApplicationName(INetFwRule3* This,BSTR *imagename) { + return This->lpVtbl->get_ApplicationName(This,imagename); +} +static FORCEINLINE HRESULT INetFwRule3_put_ApplicationName(INetFwRule3* This,BSTR imagename) { + return This->lpVtbl->put_ApplicationName(This,imagename); +} +static FORCEINLINE HRESULT INetFwRule3_get_ServiceName(INetFwRule3* This,BSTR *service) { + return This->lpVtbl->get_ServiceName(This,service); +} +static FORCEINLINE HRESULT INetFwRule3_put_ServiceName(INetFwRule3* This,BSTR service) { + return This->lpVtbl->put_ServiceName(This,service); +} +static FORCEINLINE HRESULT INetFwRule3_get_Protocol(INetFwRule3* This,LONG *protocol) { + return This->lpVtbl->get_Protocol(This,protocol); +} +static FORCEINLINE HRESULT INetFwRule3_put_Protocol(INetFwRule3* This,LONG protocol) { + return This->lpVtbl->put_Protocol(This,protocol); +} +static FORCEINLINE HRESULT INetFwRule3_get_LocalPorts(INetFwRule3* This,BSTR *ports) { + return This->lpVtbl->get_LocalPorts(This,ports); +} +static FORCEINLINE HRESULT INetFwRule3_put_LocalPorts(INetFwRule3* This,BSTR ports) { + return This->lpVtbl->put_LocalPorts(This,ports); +} +static FORCEINLINE HRESULT INetFwRule3_get_RemotePorts(INetFwRule3* This,BSTR *ports) { + return This->lpVtbl->get_RemotePorts(This,ports); +} +static FORCEINLINE HRESULT INetFwRule3_put_RemotePorts(INetFwRule3* This,BSTR ports) { + return This->lpVtbl->put_RemotePorts(This,ports); +} +static FORCEINLINE HRESULT INetFwRule3_get_LocalAddresses(INetFwRule3* This,BSTR *address) { + return This->lpVtbl->get_LocalAddresses(This,address); +} +static FORCEINLINE HRESULT INetFwRule3_put_LocalAddresses(INetFwRule3* This,BSTR address) { + return This->lpVtbl->put_LocalAddresses(This,address); +} +static FORCEINLINE HRESULT INetFwRule3_get_RemoteAddresses(INetFwRule3* This,BSTR *address) { + return This->lpVtbl->get_RemoteAddresses(This,address); +} +static FORCEINLINE HRESULT INetFwRule3_put_RemoteAddresses(INetFwRule3* This,BSTR address) { + return This->lpVtbl->put_RemoteAddresses(This,address); +} +static FORCEINLINE HRESULT INetFwRule3_get_IcmpTypesAndCodes(INetFwRule3* This,BSTR *codes) { + return This->lpVtbl->get_IcmpTypesAndCodes(This,codes); +} +static FORCEINLINE HRESULT INetFwRule3_put_IcmpTypesAndCodes(INetFwRule3* This,BSTR codes) { + return This->lpVtbl->put_IcmpTypesAndCodes(This,codes); +} +static FORCEINLINE HRESULT INetFwRule3_get_Direction(INetFwRule3* This,NET_FW_RULE_DIRECTION *dir) { + return This->lpVtbl->get_Direction(This,dir); +} +static FORCEINLINE HRESULT INetFwRule3_put_Direction(INetFwRule3* This,NET_FW_RULE_DIRECTION dir) { + return This->lpVtbl->put_Direction(This,dir); +} +static FORCEINLINE HRESULT INetFwRule3_get_Interfaces(INetFwRule3* This,VARIANT *interfaces) { + return This->lpVtbl->get_Interfaces(This,interfaces); +} +static FORCEINLINE HRESULT INetFwRule3_put_Interfaces(INetFwRule3* This,VARIANT interfaces) { + return This->lpVtbl->put_Interfaces(This,interfaces); +} +static FORCEINLINE HRESULT INetFwRule3_get_InterfaceTypes(INetFwRule3* This,BSTR *types) { + return This->lpVtbl->get_InterfaceTypes(This,types); +} +static FORCEINLINE HRESULT INetFwRule3_put_InterfaceTypes(INetFwRule3* This,BSTR types) { + return This->lpVtbl->put_InterfaceTypes(This,types); +} +static FORCEINLINE HRESULT INetFwRule3_get_Enabled(INetFwRule3* This,VARIANT_BOOL *enabled) { + return This->lpVtbl->get_Enabled(This,enabled); +} +static FORCEINLINE HRESULT INetFwRule3_put_Enabled(INetFwRule3* This,VARIANT_BOOL enabled) { + return This->lpVtbl->put_Enabled(This,enabled); +} +static FORCEINLINE HRESULT INetFwRule3_get_Grouping(INetFwRule3* This,BSTR *context) { + return This->lpVtbl->get_Grouping(This,context); +} +static FORCEINLINE HRESULT INetFwRule3_put_Grouping(INetFwRule3* This,BSTR context) { + return This->lpVtbl->put_Grouping(This,context); +} +static FORCEINLINE HRESULT INetFwRule3_get_Profiles(INetFwRule3* This,LONG *profiles) { + return This->lpVtbl->get_Profiles(This,profiles); +} +static FORCEINLINE HRESULT INetFwRule3_put_Profiles(INetFwRule3* This,LONG profiles) { + return This->lpVtbl->put_Profiles(This,profiles); +} +static FORCEINLINE HRESULT INetFwRule3_get_EdgeTraversal(INetFwRule3* This,VARIANT_BOOL *enabled) { + return This->lpVtbl->get_EdgeTraversal(This,enabled); +} +static FORCEINLINE HRESULT INetFwRule3_put_EdgeTraversal(INetFwRule3* This,VARIANT_BOOL enabled) { + return This->lpVtbl->put_EdgeTraversal(This,enabled); +} +static FORCEINLINE HRESULT INetFwRule3_get_Action(INetFwRule3* This,NET_FW_ACTION *action) { + return This->lpVtbl->get_Action(This,action); +} +static FORCEINLINE HRESULT INetFwRule3_put_Action(INetFwRule3* This,NET_FW_ACTION action) { + return This->lpVtbl->put_Action(This,action); +} +/*** INetFwRule2 methods ***/ +static FORCEINLINE HRESULT INetFwRule3_get_EdgeTraversalOptions(INetFwRule3* This,LONG *lOptions) { + return This->lpVtbl->get_EdgeTraversalOptions(This,lOptions); +} +static FORCEINLINE HRESULT INetFwRule3_put_EdgeTraversalOptions(INetFwRule3* This,LONG lOptions) { + return This->lpVtbl->put_EdgeTraversalOptions(This,lOptions); +} +/*** INetFwRule3 methods ***/ +static FORCEINLINE HRESULT INetFwRule3_get_LocalAppPackageId(INetFwRule3* This,BSTR *wszPackageId) { + return This->lpVtbl->get_LocalAppPackageId(This,wszPackageId); +} +static FORCEINLINE HRESULT INetFwRule3_put_LocalAppPackageId(INetFwRule3* This,BSTR wszPackageId) { + return This->lpVtbl->put_LocalAppPackageId(This,wszPackageId); +} +static FORCEINLINE HRESULT INetFwRule3_get_LocalUserOwner(INetFwRule3* This,BSTR *wszUserOwner) { + return This->lpVtbl->get_LocalUserOwner(This,wszUserOwner); +} +static FORCEINLINE HRESULT INetFwRule3_put_LocalUserOwner(INetFwRule3* This,BSTR wszUserOwner) { + return This->lpVtbl->put_LocalUserOwner(This,wszUserOwner); +} +static FORCEINLINE HRESULT INetFwRule3_get_LocalUserAuthorizedList(INetFwRule3* This,BSTR *wszUserAuthList) { + return This->lpVtbl->get_LocalUserAuthorizedList(This,wszUserAuthList); +} +static FORCEINLINE HRESULT INetFwRule3_put_LocalUserAuthorizedList(INetFwRule3* This,BSTR wszUserAuthList) { + return This->lpVtbl->put_LocalUserAuthorizedList(This,wszUserAuthList); +} +static FORCEINLINE HRESULT INetFwRule3_get_RemoteUserAuthorizedList(INetFwRule3* This,BSTR *wszUserAuthList) { + return This->lpVtbl->get_RemoteUserAuthorizedList(This,wszUserAuthList); +} +static FORCEINLINE HRESULT INetFwRule3_put_RemoteUserAuthorizedList(INetFwRule3* This,BSTR wszUserAuthList) { + return This->lpVtbl->put_RemoteUserAuthorizedList(This,wszUserAuthList); +} +static FORCEINLINE HRESULT INetFwRule3_get_RemoteMachineAuthorizedList(INetFwRule3* This,BSTR *wszUserAuthList) { + return This->lpVtbl->get_RemoteMachineAuthorizedList(This,wszUserAuthList); +} +static FORCEINLINE HRESULT INetFwRule3_put_RemoteMachineAuthorizedList(INetFwRule3* This,BSTR wszUserAuthList) { + return This->lpVtbl->put_RemoteMachineAuthorizedList(This,wszUserAuthList); +} +static FORCEINLINE HRESULT INetFwRule3_get_SecureFlags(INetFwRule3* This,LONG *lOptions) { + return This->lpVtbl->get_SecureFlags(This,lOptions); +} +static FORCEINLINE HRESULT INetFwRule3_put_SecureFlags(INetFwRule3* This,LONG lOptions) { + return This->lpVtbl->put_SecureFlags(This,lOptions); +} +#endif +#endif + +#endif + + +#endif /* __INetFwRule3_INTERFACE_DEFINED__ */ + /***************************************************************************** * INetFwRules interface */ @@ -4250,6 +5250,30 @@ interface INetFwAuthorizedApplications; #endif /* __cplusplus */ #endif +#ifndef __INetFwServiceRestriction_FWD_DEFINED__ +#define __INetFwServiceRestriction_FWD_DEFINED__ +typedef interface INetFwServiceRestriction INetFwServiceRestriction; +#ifdef __cplusplus +interface INetFwServiceRestriction; +#endif /* __cplusplus */ +#endif + +#ifndef __INetFwRule_FWD_DEFINED__ +#define __INetFwRule_FWD_DEFINED__ +typedef interface INetFwRule INetFwRule; +#ifdef __cplusplus +interface INetFwRule; +#endif /* __cplusplus */ +#endif + +#ifndef __INetFwRules_FWD_DEFINED__ +#define __INetFwRules_FWD_DEFINED__ +typedef interface INetFwRules INetFwRules; +#ifdef __cplusplus +interface INetFwRules; +#endif /* __cplusplus */ +#endif + #ifndef __INetFwProfile_FWD_DEFINED__ #define __INetFwProfile_FWD_DEFINED__ typedef interface INetFwProfile INetFwProfile; @@ -4282,6 +5306,22 @@ interface INetFwMgr; #endif /* __cplusplus */ #endif +#ifndef __INetFwProduct_FWD_DEFINED__ +#define __INetFwProduct_FWD_DEFINED__ +typedef interface INetFwProduct INetFwProduct; +#ifdef __cplusplus +interface INetFwProduct; +#endif /* __cplusplus */ +#endif + +#ifndef __INetFwProducts_FWD_DEFINED__ +#define __INetFwProducts_FWD_DEFINED__ +typedef interface INetFwProducts INetFwProducts; +#ifdef __cplusplus +interface INetFwProducts; +#endif /* __cplusplus */ +#endif + /***************************************************************************** * NetFwOpenPort coclass */ diff --git a/lib/libc/include/any-windows-any/netlistmgr.h b/lib/libc/include/any-windows-any/netlistmgr.h index 2f570b00fd..eb275b5f59 100644 --- a/lib/libc/include/any-windows-any/netlistmgr.h +++ b/lib/libc/include/any-windows-any/netlistmgr.h @@ -1,68 +1,1708 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ -#ifndef _INC_NETLISTMGR -#define _INC_NETLISTMGR +/*** Autogenerated by WIDL 4.19 from include/netlistmgr.idl - Do not edit ***/ -#if (_WIN32_WINNT >= 0x0600) +#ifdef _WIN32 +#ifndef __REQUIRED_RPCNDR_H_VERSION__ +#define __REQUIRED_RPCNDR_H_VERSION__ 475 +#endif +#include +#include +#endif + +#ifndef COM_NO_WINDOWS_H +#include +#include +#endif + +#ifndef __netlistmgr_h__ +#define __netlistmgr_h__ + +/* Forward declarations */ + +#ifndef __INetworkCostManager_FWD_DEFINED__ +#define __INetworkCostManager_FWD_DEFINED__ +typedef interface INetworkCostManager INetworkCostManager; +#ifdef __cplusplus +interface INetworkCostManager; +#endif /* __cplusplus */ +#endif + +#ifndef __INetworkConnectionCost_FWD_DEFINED__ +#define __INetworkConnectionCost_FWD_DEFINED__ +typedef interface INetworkConnectionCost INetworkConnectionCost; +#ifdef __cplusplus +interface INetworkConnectionCost; +#endif /* __cplusplus */ +#endif + +#ifndef __INetworkCostManagerEvents_FWD_DEFINED__ +#define __INetworkCostManagerEvents_FWD_DEFINED__ +typedef interface INetworkCostManagerEvents INetworkCostManagerEvents; +#ifdef __cplusplus +interface INetworkCostManagerEvents; +#endif /* __cplusplus */ +#endif + +#ifndef __IEnumNetworks_FWD_DEFINED__ +#define __IEnumNetworks_FWD_DEFINED__ +typedef interface IEnumNetworks IEnumNetworks; +#ifdef __cplusplus +interface IEnumNetworks; +#endif /* __cplusplus */ +#endif + +#ifndef __IEnumNetworkConnections_FWD_DEFINED__ +#define __IEnumNetworkConnections_FWD_DEFINED__ +typedef interface IEnumNetworkConnections IEnumNetworkConnections; +#ifdef __cplusplus +interface IEnumNetworkConnections; +#endif /* __cplusplus */ +#endif + +#ifndef __INetworkListManager_FWD_DEFINED__ +#define __INetworkListManager_FWD_DEFINED__ +typedef interface INetworkListManager INetworkListManager; +#ifdef __cplusplus +interface INetworkListManager; +#endif /* __cplusplus */ +#endif + +#ifndef __NetworkListManager_FWD_DEFINED__ +#define __NetworkListManager_FWD_DEFINED__ +#ifdef __cplusplus +typedef class NetworkListManager NetworkListManager; +#else +typedef struct NetworkListManager NetworkListManager; +#endif /* defined __cplusplus */ +#endif /* defined __NetworkListManager_FWD_DEFINED__ */ + +#ifndef __INetworkListManagerEvents_FWD_DEFINED__ +#define __INetworkListManagerEvents_FWD_DEFINED__ +typedef interface INetworkListManagerEvents INetworkListManagerEvents; +#ifdef __cplusplus +interface INetworkListManagerEvents; +#endif /* __cplusplus */ +#endif + +#ifndef __INetworkConnectionEvents_FWD_DEFINED__ +#define __INetworkConnectionEvents_FWD_DEFINED__ +typedef interface INetworkConnectionEvents INetworkConnectionEvents; +#ifdef __cplusplus +interface INetworkConnectionEvents; +#endif /* __cplusplus */ +#endif + +#ifndef __INetworkConnection_FWD_DEFINED__ +#define __INetworkConnection_FWD_DEFINED__ +typedef interface INetworkConnection INetworkConnection; +#ifdef __cplusplus +interface INetworkConnection; +#endif /* __cplusplus */ +#endif + +#ifndef __INetwork_FWD_DEFINED__ +#define __INetwork_FWD_DEFINED__ +typedef interface INetwork INetwork; +#ifdef __cplusplus +interface INetwork; +#endif /* __cplusplus */ +#endif + +/* Headers for imported files */ + +#include +#include #ifdef __cplusplus extern "C" { #endif -typedef enum NLM_CONNECTION_PROPERTY_CHANGE { - NLM_CONNECTION_PROPERTY_CHANGE_AUTHENTICATION = 0x01 -} NLM_CONNECTION_PROPERTY_CHANGE; +#ifndef __IEnumNetworks_FWD_DEFINED__ +#define __IEnumNetworks_FWD_DEFINED__ +typedef interface IEnumNetworks IEnumNetworks; +#ifdef __cplusplus +interface IEnumNetworks; +#endif /* __cplusplus */ +#endif + +#ifndef __IEnumNetworkConnections_FWD_DEFINED__ +#define __IEnumNetworkConnections_FWD_DEFINED__ +typedef interface IEnumNetworkConnections IEnumNetworkConnections; +#ifdef __cplusplus +interface IEnumNetworkConnections; +#endif /* __cplusplus */ +#endif + +#ifndef __INetwork_FWD_DEFINED__ +#define __INetwork_FWD_DEFINED__ +typedef interface INetwork INetwork; +#ifdef __cplusplus +interface INetwork; +#endif /* __cplusplus */ +#endif + +#ifndef __INetworkConnection_FWD_DEFINED__ +#define __INetworkConnection_FWD_DEFINED__ +typedef interface INetworkConnection INetworkConnection; +#ifdef __cplusplus +interface INetworkConnection; +#endif /* __cplusplus */ +#endif + +#ifndef __INetworkCostManager_FWD_DEFINED__ +#define __INetworkCostManager_FWD_DEFINED__ +typedef interface INetworkCostManager INetworkCostManager; +#ifdef __cplusplus +interface INetworkCostManager; +#endif /* __cplusplus */ +#endif + +#ifndef __INetworkListManager_FWD_DEFINED__ +#define __INetworkListManager_FWD_DEFINED__ +typedef interface INetworkListManager INetworkListManager; +#ifdef __cplusplus +interface INetworkListManager; +#endif /* __cplusplus */ +#endif + +#ifndef __INetworkListManagerEvents_FWD_DEFINED__ +#define __INetworkListManagerEvents_FWD_DEFINED__ +typedef interface INetworkListManagerEvents INetworkListManagerEvents; +#ifdef __cplusplus +interface INetworkListManagerEvents; +#endif /* __cplusplus */ +#endif typedef enum NLM_CONNECTIVITY { - NLM_CONNECTIVITY_DISCONNECTED = 0x0000, - NLM_CONNECTIVITY_IPV4_NOTRAFFIC = 0x0001, - NLM_CONNECTIVITY_IPV6_NOTRAFFIC = 0x0002, - NLM_CONNECTIVITY_IPV4_SUBNET = 0x0010, - NLM_CONNECTIVITY_IPV4_LOCALNETWORK = 0x0020, - NLM_CONNECTIVITY_IPV4_INTERNET = 0x0040, - NLM_CONNECTIVITY_IPV6_SUBNET = 0x0100, - NLM_CONNECTIVITY_IPV6_LOCALNETWORK = 0x0200, - NLM_CONNECTIVITY_IPV6_INTERNET = 0x0400 + NLM_CONNECTIVITY_DISCONNECTED = 0x0, + NLM_CONNECTIVITY_IPV4_NOTRAFFIC = 0x1, + NLM_CONNECTIVITY_IPV6_NOTRAFFIC = 0x2, + NLM_CONNECTIVITY_IPV4_SUBNET = 0x10, + NLM_CONNECTIVITY_IPV4_LOCALNETWORK = 0x20, + NLM_CONNECTIVITY_IPV4_INTERNET = 0x40, + NLM_CONNECTIVITY_IPV6_SUBNET = 0x100, + NLM_CONNECTIVITY_IPV6_LOCALNETWORK = 0x200, + NLM_CONNECTIVITY_IPV6_INTERNET = 0x400 } NLM_CONNECTIVITY; - typedef enum NLM_DOMAIN_TYPE { - NLM_DOMAIN_TYPE_NON_DOMAIN_NETWORK = 0x0, - NLM_DOMAIN_TYPE_DOMAIN_NETWORK = 0x01, - NLM_DOMAIN_TYPE_DOMAIN_AUTHENTICATED = 0x02 + NLM_DOMAIN_TYPE_NON_DOMAIN_NETWORK = 0x0, + NLM_DOMAIN_TYPE_DOMAIN_NETWORK = 0x1, + NLM_DOMAIN_TYPE_DOMAIN_AUTHENTICATED = 0x2 } NLM_DOMAIN_TYPE; - typedef enum NLM_ENUM_NETWORK { - NLM_ENUM_NETWORK_CONNECTED = 0x01, - NLM_ENUM_NETWORK_DISCONNECTED = 0x02, - NLM_ENUM_NETWORK_ALL = 0x03 + NLM_ENUM_NETWORK_CONNECTED = 0x1, + NLM_ENUM_NETWORK_DISCONNECTED = 0x2, + NLM_ENUM_NETWORK_ALL = 0x3 } NLM_ENUM_NETWORK; +typedef enum NLM_CONNECTION_COST { + NLM_CONNECTION_COST_UNKNOWN = 0x0, + NLM_CONNECTION_COST_UNRESTRICTED = 0x1, + NLM_CONNECTION_COST_FIXED = 0x2, + NLM_CONNECTION_COST_VARIABLE = 0x4, + NLM_CONNECTION_COST_OVERDATALIMIT = 0x10000, + NLM_CONNECTION_COST_CONGESTED = 0x20000, + NLM_CONNECTION_COST_ROAMING = 0x40000, + NLM_CONNECTION_COST_APPROACHINGDATALIMIT = 0x80000 +} NLM_CONNECTION_COST; +typedef struct NLM_SOCKADDR { + BYTE data[128]; +} NLM_SOCKADDR; +#define NLM_UNKNOWN_DATAPLAN_STATUS (0xffffffff) + +typedef struct NLM_USAGE_DATA { + DWORD UsageInMegabytes; + FILETIME LastSyncTime; +} NLM_USAGE_DATA; +typedef struct NLM_DATAPLAN_STATUS { + GUID InterfaceGuid; + NLM_USAGE_DATA UsageData; + DWORD DataLimitInMegabytes; + DWORD InboundBandwidthInKbps; + DWORD OutboundBandwidthInKbps; + FILETIME NextBillingCycle; + DWORD MaxTransferSizeInMegabytes; + DWORD Reserved; +} NLM_DATAPLAN_STATUS; +/***************************************************************************** + * INetworkCostManager interface + */ +#ifndef __INetworkCostManager_INTERFACE_DEFINED__ +#define __INetworkCostManager_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_INetworkCostManager, 0xdcb00008, 0x570f, 0x4a9b, 0x8d,0x69, 0x19,0x9f,0xdb,0xa5,0x72,0x3b); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("dcb00008-570f-4a9b-8d69-199fdba5723b") +INetworkCostManager : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE GetCost( + DWORD *pCost, + NLM_SOCKADDR *pDestIPAddr) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetDataPlanStatus( + NLM_DATAPLAN_STATUS *pDataPlanStatus, + NLM_SOCKADDR *pDestIPAddr) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetDestinationAddresses( + UINT32 length, + NLM_SOCKADDR *pDestIPAddrList, + VARIANT_BOOL bAppend) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(INetworkCostManager, 0xdcb00008, 0x570f, 0x4a9b, 0x8d,0x69, 0x19,0x9f,0xdb,0xa5,0x72,0x3b) +#endif +#else +typedef struct INetworkCostManagerVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + INetworkCostManager *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + INetworkCostManager *This); + + ULONG (STDMETHODCALLTYPE *Release)( + INetworkCostManager *This); + + /*** INetworkCostManager methods ***/ + HRESULT (STDMETHODCALLTYPE *GetCost)( + INetworkCostManager *This, + DWORD *pCost, + NLM_SOCKADDR *pDestIPAddr); + + HRESULT (STDMETHODCALLTYPE *GetDataPlanStatus)( + INetworkCostManager *This, + NLM_DATAPLAN_STATUS *pDataPlanStatus, + NLM_SOCKADDR *pDestIPAddr); + + HRESULT (STDMETHODCALLTYPE *SetDestinationAddresses)( + INetworkCostManager *This, + UINT32 length, + NLM_SOCKADDR *pDestIPAddrList, + VARIANT_BOOL bAppend); + + END_INTERFACE +} INetworkCostManagerVtbl; + +interface INetworkCostManager { + CONST_VTBL INetworkCostManagerVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define INetworkCostManager_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define INetworkCostManager_AddRef(This) (This)->lpVtbl->AddRef(This) +#define INetworkCostManager_Release(This) (This)->lpVtbl->Release(This) +/*** INetworkCostManager methods ***/ +#define INetworkCostManager_GetCost(This,pCost,pDestIPAddr) (This)->lpVtbl->GetCost(This,pCost,pDestIPAddr) +#define INetworkCostManager_GetDataPlanStatus(This,pDataPlanStatus,pDestIPAddr) (This)->lpVtbl->GetDataPlanStatus(This,pDataPlanStatus,pDestIPAddr) +#define INetworkCostManager_SetDestinationAddresses(This,length,pDestIPAddrList,bAppend) (This)->lpVtbl->SetDestinationAddresses(This,length,pDestIPAddrList,bAppend) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT INetworkCostManager_QueryInterface(INetworkCostManager* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG INetworkCostManager_AddRef(INetworkCostManager* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG INetworkCostManager_Release(INetworkCostManager* This) { + return This->lpVtbl->Release(This); +} +/*** INetworkCostManager methods ***/ +static FORCEINLINE HRESULT INetworkCostManager_GetCost(INetworkCostManager* This,DWORD *pCost,NLM_SOCKADDR *pDestIPAddr) { + return This->lpVtbl->GetCost(This,pCost,pDestIPAddr); +} +static FORCEINLINE HRESULT INetworkCostManager_GetDataPlanStatus(INetworkCostManager* This,NLM_DATAPLAN_STATUS *pDataPlanStatus,NLM_SOCKADDR *pDestIPAddr) { + return This->lpVtbl->GetDataPlanStatus(This,pDataPlanStatus,pDestIPAddr); +} +static FORCEINLINE HRESULT INetworkCostManager_SetDestinationAddresses(INetworkCostManager* This,UINT32 length,NLM_SOCKADDR *pDestIPAddrList,VARIANT_BOOL bAppend) { + return This->lpVtbl->SetDestinationAddresses(This,length,pDestIPAddrList,bAppend); +} +#endif +#endif + +#endif + + +#endif /* __INetworkCostManager_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * INetworkConnectionCost interface + */ +#ifndef __INetworkConnectionCost_INTERFACE_DEFINED__ +#define __INetworkConnectionCost_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_INetworkConnectionCost, 0xdcb0000a, 0x570f, 0x4a9b, 0x8d,0x69, 0x19,0x9f,0xdb,0xa5,0x72,0x3b); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("dcb0000a-570f-4a9b-8d69-199fdba5723b") +INetworkConnectionCost : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE GetCost( + DWORD *pCost) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetDataPlanStatus( + NLM_DATAPLAN_STATUS *pDataPlanStatus) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(INetworkConnectionCost, 0xdcb0000a, 0x570f, 0x4a9b, 0x8d,0x69, 0x19,0x9f,0xdb,0xa5,0x72,0x3b) +#endif +#else +typedef struct INetworkConnectionCostVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + INetworkConnectionCost *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + INetworkConnectionCost *This); + + ULONG (STDMETHODCALLTYPE *Release)( + INetworkConnectionCost *This); + + /*** INetworkConnectionCost methods ***/ + HRESULT (STDMETHODCALLTYPE *GetCost)( + INetworkConnectionCost *This, + DWORD *pCost); + + HRESULT (STDMETHODCALLTYPE *GetDataPlanStatus)( + INetworkConnectionCost *This, + NLM_DATAPLAN_STATUS *pDataPlanStatus); + + END_INTERFACE +} INetworkConnectionCostVtbl; + +interface INetworkConnectionCost { + CONST_VTBL INetworkConnectionCostVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define INetworkConnectionCost_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define INetworkConnectionCost_AddRef(This) (This)->lpVtbl->AddRef(This) +#define INetworkConnectionCost_Release(This) (This)->lpVtbl->Release(This) +/*** INetworkConnectionCost methods ***/ +#define INetworkConnectionCost_GetCost(This,pCost) (This)->lpVtbl->GetCost(This,pCost) +#define INetworkConnectionCost_GetDataPlanStatus(This,pDataPlanStatus) (This)->lpVtbl->GetDataPlanStatus(This,pDataPlanStatus) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT INetworkConnectionCost_QueryInterface(INetworkConnectionCost* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG INetworkConnectionCost_AddRef(INetworkConnectionCost* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG INetworkConnectionCost_Release(INetworkConnectionCost* This) { + return This->lpVtbl->Release(This); +} +/*** INetworkConnectionCost methods ***/ +static FORCEINLINE HRESULT INetworkConnectionCost_GetCost(INetworkConnectionCost* This,DWORD *pCost) { + return This->lpVtbl->GetCost(This,pCost); +} +static FORCEINLINE HRESULT INetworkConnectionCost_GetDataPlanStatus(INetworkConnectionCost* This,NLM_DATAPLAN_STATUS *pDataPlanStatus) { + return This->lpVtbl->GetDataPlanStatus(This,pDataPlanStatus); +} +#endif +#endif + +#endif + + +#endif /* __INetworkConnectionCost_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * INetworkCostManagerEvents interface + */ +#ifndef __INetworkCostManagerEvents_INTERFACE_DEFINED__ +#define __INetworkCostManagerEvents_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_INetworkCostManagerEvents, 0xdcb00009, 0x570f, 0x4a9b, 0x8d,0x69, 0x19,0x9f,0xdb,0xa5,0x72,0x3b); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("dcb00009-570f-4a9b-8d69-199fdba5723b") +INetworkCostManagerEvents : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE CostChanged( + DWORD newCost, + NLM_SOCKADDR *pDestAddr) = 0; + + virtual HRESULT STDMETHODCALLTYPE DataPlanStatusChanged( + NLM_SOCKADDR *pDestAddr) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(INetworkCostManagerEvents, 0xdcb00009, 0x570f, 0x4a9b, 0x8d,0x69, 0x19,0x9f,0xdb,0xa5,0x72,0x3b) +#endif +#else +typedef struct INetworkCostManagerEventsVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + INetworkCostManagerEvents *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + INetworkCostManagerEvents *This); + + ULONG (STDMETHODCALLTYPE *Release)( + INetworkCostManagerEvents *This); + + /*** INetworkCostManagerEvents methods ***/ + HRESULT (STDMETHODCALLTYPE *CostChanged)( + INetworkCostManagerEvents *This, + DWORD newCost, + NLM_SOCKADDR *pDestAddr); + + HRESULT (STDMETHODCALLTYPE *DataPlanStatusChanged)( + INetworkCostManagerEvents *This, + NLM_SOCKADDR *pDestAddr); + + END_INTERFACE +} INetworkCostManagerEventsVtbl; + +interface INetworkCostManagerEvents { + CONST_VTBL INetworkCostManagerEventsVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define INetworkCostManagerEvents_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define INetworkCostManagerEvents_AddRef(This) (This)->lpVtbl->AddRef(This) +#define INetworkCostManagerEvents_Release(This) (This)->lpVtbl->Release(This) +/*** INetworkCostManagerEvents methods ***/ +#define INetworkCostManagerEvents_CostChanged(This,newCost,pDestAddr) (This)->lpVtbl->CostChanged(This,newCost,pDestAddr) +#define INetworkCostManagerEvents_DataPlanStatusChanged(This,pDestAddr) (This)->lpVtbl->DataPlanStatusChanged(This,pDestAddr) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT INetworkCostManagerEvents_QueryInterface(INetworkCostManagerEvents* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG INetworkCostManagerEvents_AddRef(INetworkCostManagerEvents* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG INetworkCostManagerEvents_Release(INetworkCostManagerEvents* This) { + return This->lpVtbl->Release(This); +} +/*** INetworkCostManagerEvents methods ***/ +static FORCEINLINE HRESULT INetworkCostManagerEvents_CostChanged(INetworkCostManagerEvents* This,DWORD newCost,NLM_SOCKADDR *pDestAddr) { + return This->lpVtbl->CostChanged(This,newCost,pDestAddr); +} +static FORCEINLINE HRESULT INetworkCostManagerEvents_DataPlanStatusChanged(INetworkCostManagerEvents* This,NLM_SOCKADDR *pDestAddr) { + return This->lpVtbl->DataPlanStatusChanged(This,pDestAddr); +} +#endif +#endif + +#endif + + +#endif /* __INetworkCostManagerEvents_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * IEnumNetworks interface + */ +#ifndef __IEnumNetworks_INTERFACE_DEFINED__ +#define __IEnumNetworks_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IEnumNetworks, 0xdcb00003, 0x570f, 0x4a9b, 0x8d,0x69, 0x19,0x9f,0xdb,0xa5,0x72,0x3b); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("dcb00003-570f-4a9b-8d69-199fdba5723b") +IEnumNetworks : public IDispatch +{ + virtual HRESULT STDMETHODCALLTYPE get__NewEnum( + IEnumVARIANT **ppEnumVar) = 0; + + virtual HRESULT STDMETHODCALLTYPE Next( + ULONG celt, + INetwork **rgelt, + ULONG *pceltFetched) = 0; + + virtual HRESULT STDMETHODCALLTYPE Skip( + ULONG celt) = 0; + + virtual HRESULT STDMETHODCALLTYPE Reset( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE Clone( + IEnumNetworks **ppEnumNetwork) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IEnumNetworks, 0xdcb00003, 0x570f, 0x4a9b, 0x8d,0x69, 0x19,0x9f,0xdb,0xa5,0x72,0x3b) +#endif +#else +typedef struct IEnumNetworksVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IEnumNetworks *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IEnumNetworks *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IEnumNetworks *This); + + /*** IDispatch methods ***/ + HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( + IEnumNetworks *This, + UINT *pctinfo); + + HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( + IEnumNetworks *This, + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo); + + HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( + IEnumNetworks *This, + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId); + + HRESULT (STDMETHODCALLTYPE *Invoke)( + IEnumNetworks *This, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr); + + /*** IEnumNetworks methods ***/ + HRESULT (STDMETHODCALLTYPE *get__NewEnum)( + IEnumNetworks *This, + IEnumVARIANT **ppEnumVar); + + HRESULT (STDMETHODCALLTYPE *Next)( + IEnumNetworks *This, + ULONG celt, + INetwork **rgelt, + ULONG *pceltFetched); + + HRESULT (STDMETHODCALLTYPE *Skip)( + IEnumNetworks *This, + ULONG celt); + + HRESULT (STDMETHODCALLTYPE *Reset)( + IEnumNetworks *This); + + HRESULT (STDMETHODCALLTYPE *Clone)( + IEnumNetworks *This, + IEnumNetworks **ppEnumNetwork); + + END_INTERFACE +} IEnumNetworksVtbl; + +interface IEnumNetworks { + CONST_VTBL IEnumNetworksVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IEnumNetworks_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IEnumNetworks_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IEnumNetworks_Release(This) (This)->lpVtbl->Release(This) +/*** IDispatch methods ***/ +#define IEnumNetworks_GetTypeInfoCount(This,pctinfo) (This)->lpVtbl->GetTypeInfoCount(This,pctinfo) +#define IEnumNetworks_GetTypeInfo(This,iTInfo,lcid,ppTInfo) (This)->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo) +#define IEnumNetworks_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) (This)->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) +#define IEnumNetworks_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) (This)->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) +/*** IEnumNetworks methods ***/ +#define IEnumNetworks_get__NewEnum(This,ppEnumVar) (This)->lpVtbl->get__NewEnum(This,ppEnumVar) +#define IEnumNetworks_Next(This,celt,rgelt,pceltFetched) (This)->lpVtbl->Next(This,celt,rgelt,pceltFetched) +#define IEnumNetworks_Skip(This,celt) (This)->lpVtbl->Skip(This,celt) +#define IEnumNetworks_Reset(This) (This)->lpVtbl->Reset(This) +#define IEnumNetworks_Clone(This,ppEnumNetwork) (This)->lpVtbl->Clone(This,ppEnumNetwork) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT IEnumNetworks_QueryInterface(IEnumNetworks* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG IEnumNetworks_AddRef(IEnumNetworks* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG IEnumNetworks_Release(IEnumNetworks* This) { + return This->lpVtbl->Release(This); +} +/*** IDispatch methods ***/ +static FORCEINLINE HRESULT IEnumNetworks_GetTypeInfoCount(IEnumNetworks* This,UINT *pctinfo) { + return This->lpVtbl->GetTypeInfoCount(This,pctinfo); +} +static FORCEINLINE HRESULT IEnumNetworks_GetTypeInfo(IEnumNetworks* This,UINT iTInfo,LCID lcid,ITypeInfo **ppTInfo) { + return This->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo); +} +static FORCEINLINE HRESULT IEnumNetworks_GetIDsOfNames(IEnumNetworks* This,REFIID riid,LPOLESTR *rgszNames,UINT cNames,LCID lcid,DISPID *rgDispId) { + return This->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId); +} +static FORCEINLINE HRESULT IEnumNetworks_Invoke(IEnumNetworks* This,DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) { + return This->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr); +} +/*** IEnumNetworks methods ***/ +static FORCEINLINE HRESULT IEnumNetworks_get__NewEnum(IEnumNetworks* This,IEnumVARIANT **ppEnumVar) { + return This->lpVtbl->get__NewEnum(This,ppEnumVar); +} +static FORCEINLINE HRESULT IEnumNetworks_Next(IEnumNetworks* This,ULONG celt,INetwork **rgelt,ULONG *pceltFetched) { + return This->lpVtbl->Next(This,celt,rgelt,pceltFetched); +} +static FORCEINLINE HRESULT IEnumNetworks_Skip(IEnumNetworks* This,ULONG celt) { + return This->lpVtbl->Skip(This,celt); +} +static FORCEINLINE HRESULT IEnumNetworks_Reset(IEnumNetworks* This) { + return This->lpVtbl->Reset(This); +} +static FORCEINLINE HRESULT IEnumNetworks_Clone(IEnumNetworks* This,IEnumNetworks **ppEnumNetwork) { + return This->lpVtbl->Clone(This,ppEnumNetwork); +} +#endif +#endif + +#endif + + +#endif /* __IEnumNetworks_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * IEnumNetworkConnections interface + */ +#ifndef __IEnumNetworkConnections_INTERFACE_DEFINED__ +#define __IEnumNetworkConnections_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IEnumNetworkConnections, 0xdcb00006, 0x570f, 0x4a9b, 0x8d,0x69, 0x19,0x9f,0xdb,0xa5,0x72,0x3b); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("dcb00006-570f-4a9b-8d69-199fdba5723b") +IEnumNetworkConnections : public IDispatch +{ + virtual HRESULT STDMETHODCALLTYPE get__NewEnum( + IEnumVARIANT **ppEnumVar) = 0; + + virtual HRESULT STDMETHODCALLTYPE Next( + ULONG celt, + INetworkConnection **rgelt, + ULONG *pceltFetched) = 0; + + virtual HRESULT STDMETHODCALLTYPE Skip( + ULONG celt) = 0; + + virtual HRESULT STDMETHODCALLTYPE Reset( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE Clone( + IEnumNetworkConnections **ppEnumNetwork) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IEnumNetworkConnections, 0xdcb00006, 0x570f, 0x4a9b, 0x8d,0x69, 0x19,0x9f,0xdb,0xa5,0x72,0x3b) +#endif +#else +typedef struct IEnumNetworkConnectionsVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IEnumNetworkConnections *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IEnumNetworkConnections *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IEnumNetworkConnections *This); + + /*** IDispatch methods ***/ + HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( + IEnumNetworkConnections *This, + UINT *pctinfo); + + HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( + IEnumNetworkConnections *This, + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo); + + HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( + IEnumNetworkConnections *This, + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId); + + HRESULT (STDMETHODCALLTYPE *Invoke)( + IEnumNetworkConnections *This, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr); + + /*** IEnumNetworkConnections methods ***/ + HRESULT (STDMETHODCALLTYPE *get__NewEnum)( + IEnumNetworkConnections *This, + IEnumVARIANT **ppEnumVar); + + HRESULT (STDMETHODCALLTYPE *Next)( + IEnumNetworkConnections *This, + ULONG celt, + INetworkConnection **rgelt, + ULONG *pceltFetched); + + HRESULT (STDMETHODCALLTYPE *Skip)( + IEnumNetworkConnections *This, + ULONG celt); + + HRESULT (STDMETHODCALLTYPE *Reset)( + IEnumNetworkConnections *This); + + HRESULT (STDMETHODCALLTYPE *Clone)( + IEnumNetworkConnections *This, + IEnumNetworkConnections **ppEnumNetwork); + + END_INTERFACE +} IEnumNetworkConnectionsVtbl; + +interface IEnumNetworkConnections { + CONST_VTBL IEnumNetworkConnectionsVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IEnumNetworkConnections_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IEnumNetworkConnections_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IEnumNetworkConnections_Release(This) (This)->lpVtbl->Release(This) +/*** IDispatch methods ***/ +#define IEnumNetworkConnections_GetTypeInfoCount(This,pctinfo) (This)->lpVtbl->GetTypeInfoCount(This,pctinfo) +#define IEnumNetworkConnections_GetTypeInfo(This,iTInfo,lcid,ppTInfo) (This)->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo) +#define IEnumNetworkConnections_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) (This)->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) +#define IEnumNetworkConnections_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) (This)->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) +/*** IEnumNetworkConnections methods ***/ +#define IEnumNetworkConnections_get__NewEnum(This,ppEnumVar) (This)->lpVtbl->get__NewEnum(This,ppEnumVar) +#define IEnumNetworkConnections_Next(This,celt,rgelt,pceltFetched) (This)->lpVtbl->Next(This,celt,rgelt,pceltFetched) +#define IEnumNetworkConnections_Skip(This,celt) (This)->lpVtbl->Skip(This,celt) +#define IEnumNetworkConnections_Reset(This) (This)->lpVtbl->Reset(This) +#define IEnumNetworkConnections_Clone(This,ppEnumNetwork) (This)->lpVtbl->Clone(This,ppEnumNetwork) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT IEnumNetworkConnections_QueryInterface(IEnumNetworkConnections* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG IEnumNetworkConnections_AddRef(IEnumNetworkConnections* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG IEnumNetworkConnections_Release(IEnumNetworkConnections* This) { + return This->lpVtbl->Release(This); +} +/*** IDispatch methods ***/ +static FORCEINLINE HRESULT IEnumNetworkConnections_GetTypeInfoCount(IEnumNetworkConnections* This,UINT *pctinfo) { + return This->lpVtbl->GetTypeInfoCount(This,pctinfo); +} +static FORCEINLINE HRESULT IEnumNetworkConnections_GetTypeInfo(IEnumNetworkConnections* This,UINT iTInfo,LCID lcid,ITypeInfo **ppTInfo) { + return This->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo); +} +static FORCEINLINE HRESULT IEnumNetworkConnections_GetIDsOfNames(IEnumNetworkConnections* This,REFIID riid,LPOLESTR *rgszNames,UINT cNames,LCID lcid,DISPID *rgDispId) { + return This->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId); +} +static FORCEINLINE HRESULT IEnumNetworkConnections_Invoke(IEnumNetworkConnections* This,DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) { + return This->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr); +} +/*** IEnumNetworkConnections methods ***/ +static FORCEINLINE HRESULT IEnumNetworkConnections_get__NewEnum(IEnumNetworkConnections* This,IEnumVARIANT **ppEnumVar) { + return This->lpVtbl->get__NewEnum(This,ppEnumVar); +} +static FORCEINLINE HRESULT IEnumNetworkConnections_Next(IEnumNetworkConnections* This,ULONG celt,INetworkConnection **rgelt,ULONG *pceltFetched) { + return This->lpVtbl->Next(This,celt,rgelt,pceltFetched); +} +static FORCEINLINE HRESULT IEnumNetworkConnections_Skip(IEnumNetworkConnections* This,ULONG celt) { + return This->lpVtbl->Skip(This,celt); +} +static FORCEINLINE HRESULT IEnumNetworkConnections_Reset(IEnumNetworkConnections* This) { + return This->lpVtbl->Reset(This); +} +static FORCEINLINE HRESULT IEnumNetworkConnections_Clone(IEnumNetworkConnections* This,IEnumNetworkConnections **ppEnumNetwork) { + return This->lpVtbl->Clone(This,ppEnumNetwork); +} +#endif +#endif + +#endif + + +#endif /* __IEnumNetworkConnections_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * INetworkListManager interface + */ +#ifndef __INetworkListManager_INTERFACE_DEFINED__ +#define __INetworkListManager_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_INetworkListManager, 0xdcb00000, 0x570f, 0x4a9b, 0x8d,0x69, 0x19,0x9f,0xdb,0xa5,0x72,0x3b); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("dcb00000-570f-4a9b-8d69-199fdba5723b") +INetworkListManager : public IDispatch +{ + virtual HRESULT STDMETHODCALLTYPE GetNetworks( + NLM_ENUM_NETWORK Flags, + IEnumNetworks **ppEnumNetwork) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetNetwork( + GUID gdNetworkId, + INetwork **ppNetwork) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetNetworkConnections( + IEnumNetworkConnections **ppEnum) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetNetworkConnection( + GUID gdNetworkConnectionId, + INetworkConnection **ppNetworkConnection) = 0; + + virtual HRESULT STDMETHODCALLTYPE IsConnectedToInternet( + VARIANT_BOOL *pbIsConnected) = 0; + + virtual HRESULT STDMETHODCALLTYPE IsConnected( + VARIANT_BOOL *pbIsConnected) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetConnectivity( + NLM_CONNECTIVITY *pConnectivity) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(INetworkListManager, 0xdcb00000, 0x570f, 0x4a9b, 0x8d,0x69, 0x19,0x9f,0xdb,0xa5,0x72,0x3b) +#endif +#else +typedef struct INetworkListManagerVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + INetworkListManager *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + INetworkListManager *This); + + ULONG (STDMETHODCALLTYPE *Release)( + INetworkListManager *This); + + /*** IDispatch methods ***/ + HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( + INetworkListManager *This, + UINT *pctinfo); + + HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( + INetworkListManager *This, + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo); + + HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( + INetworkListManager *This, + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId); + + HRESULT (STDMETHODCALLTYPE *Invoke)( + INetworkListManager *This, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr); + + /*** INetworkListManager methods ***/ + HRESULT (STDMETHODCALLTYPE *GetNetworks)( + INetworkListManager *This, + NLM_ENUM_NETWORK Flags, + IEnumNetworks **ppEnumNetwork); + + HRESULT (STDMETHODCALLTYPE *GetNetwork)( + INetworkListManager *This, + GUID gdNetworkId, + INetwork **ppNetwork); + + HRESULT (STDMETHODCALLTYPE *GetNetworkConnections)( + INetworkListManager *This, + IEnumNetworkConnections **ppEnum); + + HRESULT (STDMETHODCALLTYPE *GetNetworkConnection)( + INetworkListManager *This, + GUID gdNetworkConnectionId, + INetworkConnection **ppNetworkConnection); + + HRESULT (STDMETHODCALLTYPE *IsConnectedToInternet)( + INetworkListManager *This, + VARIANT_BOOL *pbIsConnected); + + HRESULT (STDMETHODCALLTYPE *IsConnected)( + INetworkListManager *This, + VARIANT_BOOL *pbIsConnected); + + HRESULT (STDMETHODCALLTYPE *GetConnectivity)( + INetworkListManager *This, + NLM_CONNECTIVITY *pConnectivity); + + END_INTERFACE +} INetworkListManagerVtbl; + +interface INetworkListManager { + CONST_VTBL INetworkListManagerVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define INetworkListManager_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define INetworkListManager_AddRef(This) (This)->lpVtbl->AddRef(This) +#define INetworkListManager_Release(This) (This)->lpVtbl->Release(This) +/*** IDispatch methods ***/ +#define INetworkListManager_GetTypeInfoCount(This,pctinfo) (This)->lpVtbl->GetTypeInfoCount(This,pctinfo) +#define INetworkListManager_GetTypeInfo(This,iTInfo,lcid,ppTInfo) (This)->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo) +#define INetworkListManager_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) (This)->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) +#define INetworkListManager_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) (This)->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) +/*** INetworkListManager methods ***/ +#define INetworkListManager_GetNetworks(This,Flags,ppEnumNetwork) (This)->lpVtbl->GetNetworks(This,Flags,ppEnumNetwork) +#define INetworkListManager_GetNetwork(This,gdNetworkId,ppNetwork) (This)->lpVtbl->GetNetwork(This,gdNetworkId,ppNetwork) +#define INetworkListManager_GetNetworkConnections(This,ppEnum) (This)->lpVtbl->GetNetworkConnections(This,ppEnum) +#define INetworkListManager_GetNetworkConnection(This,gdNetworkConnectionId,ppNetworkConnection) (This)->lpVtbl->GetNetworkConnection(This,gdNetworkConnectionId,ppNetworkConnection) +#define INetworkListManager_IsConnectedToInternet(This,pbIsConnected) (This)->lpVtbl->IsConnectedToInternet(This,pbIsConnected) +#define INetworkListManager_IsConnected(This,pbIsConnected) (This)->lpVtbl->IsConnected(This,pbIsConnected) +#define INetworkListManager_GetConnectivity(This,pConnectivity) (This)->lpVtbl->GetConnectivity(This,pConnectivity) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT INetworkListManager_QueryInterface(INetworkListManager* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG INetworkListManager_AddRef(INetworkListManager* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG INetworkListManager_Release(INetworkListManager* This) { + return This->lpVtbl->Release(This); +} +/*** IDispatch methods ***/ +static FORCEINLINE HRESULT INetworkListManager_GetTypeInfoCount(INetworkListManager* This,UINT *pctinfo) { + return This->lpVtbl->GetTypeInfoCount(This,pctinfo); +} +static FORCEINLINE HRESULT INetworkListManager_GetTypeInfo(INetworkListManager* This,UINT iTInfo,LCID lcid,ITypeInfo **ppTInfo) { + return This->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo); +} +static FORCEINLINE HRESULT INetworkListManager_GetIDsOfNames(INetworkListManager* This,REFIID riid,LPOLESTR *rgszNames,UINT cNames,LCID lcid,DISPID *rgDispId) { + return This->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId); +} +static FORCEINLINE HRESULT INetworkListManager_Invoke(INetworkListManager* This,DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) { + return This->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr); +} +/*** INetworkListManager methods ***/ +static FORCEINLINE HRESULT INetworkListManager_GetNetworks(INetworkListManager* This,NLM_ENUM_NETWORK Flags,IEnumNetworks **ppEnumNetwork) { + return This->lpVtbl->GetNetworks(This,Flags,ppEnumNetwork); +} +static FORCEINLINE HRESULT INetworkListManager_GetNetwork(INetworkListManager* This,GUID gdNetworkId,INetwork **ppNetwork) { + return This->lpVtbl->GetNetwork(This,gdNetworkId,ppNetwork); +} +static FORCEINLINE HRESULT INetworkListManager_GetNetworkConnections(INetworkListManager* This,IEnumNetworkConnections **ppEnum) { + return This->lpVtbl->GetNetworkConnections(This,ppEnum); +} +static FORCEINLINE HRESULT INetworkListManager_GetNetworkConnection(INetworkListManager* This,GUID gdNetworkConnectionId,INetworkConnection **ppNetworkConnection) { + return This->lpVtbl->GetNetworkConnection(This,gdNetworkConnectionId,ppNetworkConnection); +} +static FORCEINLINE HRESULT INetworkListManager_IsConnectedToInternet(INetworkListManager* This,VARIANT_BOOL *pbIsConnected) { + return This->lpVtbl->IsConnectedToInternet(This,pbIsConnected); +} +static FORCEINLINE HRESULT INetworkListManager_IsConnected(INetworkListManager* This,VARIANT_BOOL *pbIsConnected) { + return This->lpVtbl->IsConnected(This,pbIsConnected); +} +static FORCEINLINE HRESULT INetworkListManager_GetConnectivity(INetworkListManager* This,NLM_CONNECTIVITY *pConnectivity) { + return This->lpVtbl->GetConnectivity(This,pConnectivity); +} +#endif +#endif + +#endif + + +#endif /* __INetworkListManager_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * NetworkListManager coclass + */ + +DEFINE_GUID(CLSID_NetworkListManager, 0xdcb00c01, 0x570f, 0x4a9b, 0x8d,0x69, 0x19,0x9f,0xdb,0xa5,0x72,0x3b); + +#ifdef __cplusplus +class DECLSPEC_UUID("dcb00c01-570f-4a9b-8d69-199fdba5723b") NetworkListManager; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(NetworkListManager, 0xdcb00c01, 0x570f, 0x4a9b, 0x8d,0x69, 0x19,0x9f,0xdb,0xa5,0x72,0x3b) +#endif +#endif + +/***************************************************************************** + * INetworkListManagerEvents interface + */ +#ifndef __INetworkListManagerEvents_INTERFACE_DEFINED__ +#define __INetworkListManagerEvents_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_INetworkListManagerEvents, 0xdcb00001, 0x570f, 0x4a9b, 0x8d,0x69, 0x19,0x9f,0xdb,0xa5,0x72,0x3b); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("dcb00001-570f-4a9b-8d69-199fdba5723b") +INetworkListManagerEvents : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE ConnectivityChanged( + NLM_CONNECTIVITY newConnectivity) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(INetworkListManagerEvents, 0xdcb00001, 0x570f, 0x4a9b, 0x8d,0x69, 0x19,0x9f,0xdb,0xa5,0x72,0x3b) +#endif +#else +typedef struct INetworkListManagerEventsVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + INetworkListManagerEvents *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + INetworkListManagerEvents *This); + + ULONG (STDMETHODCALLTYPE *Release)( + INetworkListManagerEvents *This); + + /*** INetworkListManagerEvents methods ***/ + HRESULT (STDMETHODCALLTYPE *ConnectivityChanged)( + INetworkListManagerEvents *This, + NLM_CONNECTIVITY newConnectivity); + + END_INTERFACE +} INetworkListManagerEventsVtbl; + +interface INetworkListManagerEvents { + CONST_VTBL INetworkListManagerEventsVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define INetworkListManagerEvents_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define INetworkListManagerEvents_AddRef(This) (This)->lpVtbl->AddRef(This) +#define INetworkListManagerEvents_Release(This) (This)->lpVtbl->Release(This) +/*** INetworkListManagerEvents methods ***/ +#define INetworkListManagerEvents_ConnectivityChanged(This,newConnectivity) (This)->lpVtbl->ConnectivityChanged(This,newConnectivity) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT INetworkListManagerEvents_QueryInterface(INetworkListManagerEvents* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG INetworkListManagerEvents_AddRef(INetworkListManagerEvents* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG INetworkListManagerEvents_Release(INetworkListManagerEvents* This) { + return This->lpVtbl->Release(This); +} +/*** INetworkListManagerEvents methods ***/ +static FORCEINLINE HRESULT INetworkListManagerEvents_ConnectivityChanged(INetworkListManagerEvents* This,NLM_CONNECTIVITY newConnectivity) { + return This->lpVtbl->ConnectivityChanged(This,newConnectivity); +} +#endif +#endif + +#endif + + +#endif /* __INetworkListManagerEvents_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * INetworkConnectionEvents interface + */ +#ifndef __INetworkConnectionEvents_INTERFACE_DEFINED__ +#define __INetworkConnectionEvents_INTERFACE_DEFINED__ + +typedef enum NLM_CONNECTION_PROPERTY_CHANGE { + NLM_CONNECTION_PROPERTY_CHANGE_AUTHENTICATION = 1 +} NLM_CONNECTION_PROPERTY_CHANGE; +DEFINE_GUID(IID_INetworkConnectionEvents, 0xdcb00007, 0x570f, 0x4a9b, 0x8d,0x69, 0x19,0x9f,0xdb,0xa5,0x72,0x3b); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("dcb00007-570f-4a9b-8d69-199fdba5723b") +INetworkConnectionEvents : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE NetworkConnectionConnectivityChanged( + GUID connectionId, + NLM_CONNECTIVITY newConnectivity) = 0; + + virtual HRESULT STDMETHODCALLTYPE NetworkConnectionPropertyChanged( + GUID connectionId, + NLM_CONNECTION_PROPERTY_CHANGE flags) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(INetworkConnectionEvents, 0xdcb00007, 0x570f, 0x4a9b, 0x8d,0x69, 0x19,0x9f,0xdb,0xa5,0x72,0x3b) +#endif +#else +typedef struct INetworkConnectionEventsVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + INetworkConnectionEvents *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + INetworkConnectionEvents *This); + + ULONG (STDMETHODCALLTYPE *Release)( + INetworkConnectionEvents *This); + + /*** INetworkConnectionEvents methods ***/ + HRESULT (STDMETHODCALLTYPE *NetworkConnectionConnectivityChanged)( + INetworkConnectionEvents *This, + GUID connectionId, + NLM_CONNECTIVITY newConnectivity); + + HRESULT (STDMETHODCALLTYPE *NetworkConnectionPropertyChanged)( + INetworkConnectionEvents *This, + GUID connectionId, + NLM_CONNECTION_PROPERTY_CHANGE flags); + + END_INTERFACE +} INetworkConnectionEventsVtbl; + +interface INetworkConnectionEvents { + CONST_VTBL INetworkConnectionEventsVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define INetworkConnectionEvents_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define INetworkConnectionEvents_AddRef(This) (This)->lpVtbl->AddRef(This) +#define INetworkConnectionEvents_Release(This) (This)->lpVtbl->Release(This) +/*** INetworkConnectionEvents methods ***/ +#define INetworkConnectionEvents_NetworkConnectionConnectivityChanged(This,connectionId,newConnectivity) (This)->lpVtbl->NetworkConnectionConnectivityChanged(This,connectionId,newConnectivity) +#define INetworkConnectionEvents_NetworkConnectionPropertyChanged(This,connectionId,flags) (This)->lpVtbl->NetworkConnectionPropertyChanged(This,connectionId,flags) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT INetworkConnectionEvents_QueryInterface(INetworkConnectionEvents* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG INetworkConnectionEvents_AddRef(INetworkConnectionEvents* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG INetworkConnectionEvents_Release(INetworkConnectionEvents* This) { + return This->lpVtbl->Release(This); +} +/*** INetworkConnectionEvents methods ***/ +static FORCEINLINE HRESULT INetworkConnectionEvents_NetworkConnectionConnectivityChanged(INetworkConnectionEvents* This,GUID connectionId,NLM_CONNECTIVITY newConnectivity) { + return This->lpVtbl->NetworkConnectionConnectivityChanged(This,connectionId,newConnectivity); +} +static FORCEINLINE HRESULT INetworkConnectionEvents_NetworkConnectionPropertyChanged(INetworkConnectionEvents* This,GUID connectionId,NLM_CONNECTION_PROPERTY_CHANGE flags) { + return This->lpVtbl->NetworkConnectionPropertyChanged(This,connectionId,flags); +} +#endif +#endif + +#endif + + +#endif /* __INetworkConnectionEvents_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * INetworkConnection interface + */ +#ifndef __INetworkConnection_INTERFACE_DEFINED__ +#define __INetworkConnection_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_INetworkConnection, 0xdcb00005, 0x570f, 0x4a9b, 0x8d,0x69, 0x19,0x9f,0xdb,0xa5,0x72,0x3b); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("dcb00005-570f-4a9b-8d69-199fdba5723b") +INetworkConnection : public IDispatch +{ + virtual HRESULT STDMETHODCALLTYPE GetNetwork( + INetwork **ppNetwork) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_IsConnectedToInternet( + VARIANT_BOOL *pbIsConnected) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_IsConnected( + VARIANT_BOOL *pbIsConnected) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetConnectivity( + NLM_CONNECTIVITY *pConnectivity) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetConnectionId( + GUID *pgdConnectionId) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetAdapterId( + GUID *pgdAdapterId) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetDomainType( + NLM_DOMAIN_TYPE *pDomainType) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(INetworkConnection, 0xdcb00005, 0x570f, 0x4a9b, 0x8d,0x69, 0x19,0x9f,0xdb,0xa5,0x72,0x3b) +#endif +#else +typedef struct INetworkConnectionVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + INetworkConnection *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + INetworkConnection *This); + + ULONG (STDMETHODCALLTYPE *Release)( + INetworkConnection *This); + + /*** IDispatch methods ***/ + HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( + INetworkConnection *This, + UINT *pctinfo); + + HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( + INetworkConnection *This, + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo); + + HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( + INetworkConnection *This, + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId); + + HRESULT (STDMETHODCALLTYPE *Invoke)( + INetworkConnection *This, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr); + + /*** INetworkConnection methods ***/ + HRESULT (STDMETHODCALLTYPE *GetNetwork)( + INetworkConnection *This, + INetwork **ppNetwork); + + HRESULT (STDMETHODCALLTYPE *get_IsConnectedToInternet)( + INetworkConnection *This, + VARIANT_BOOL *pbIsConnected); + + HRESULT (STDMETHODCALLTYPE *get_IsConnected)( + INetworkConnection *This, + VARIANT_BOOL *pbIsConnected); + + HRESULT (STDMETHODCALLTYPE *GetConnectivity)( + INetworkConnection *This, + NLM_CONNECTIVITY *pConnectivity); + + HRESULT (STDMETHODCALLTYPE *GetConnectionId)( + INetworkConnection *This, + GUID *pgdConnectionId); + + HRESULT (STDMETHODCALLTYPE *GetAdapterId)( + INetworkConnection *This, + GUID *pgdAdapterId); + + HRESULT (STDMETHODCALLTYPE *GetDomainType)( + INetworkConnection *This, + NLM_DOMAIN_TYPE *pDomainType); + + END_INTERFACE +} INetworkConnectionVtbl; + +interface INetworkConnection { + CONST_VTBL INetworkConnectionVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define INetworkConnection_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define INetworkConnection_AddRef(This) (This)->lpVtbl->AddRef(This) +#define INetworkConnection_Release(This) (This)->lpVtbl->Release(This) +/*** IDispatch methods ***/ +#define INetworkConnection_GetTypeInfoCount(This,pctinfo) (This)->lpVtbl->GetTypeInfoCount(This,pctinfo) +#define INetworkConnection_GetTypeInfo(This,iTInfo,lcid,ppTInfo) (This)->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo) +#define INetworkConnection_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) (This)->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) +#define INetworkConnection_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) (This)->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) +/*** INetworkConnection methods ***/ +#define INetworkConnection_GetNetwork(This,ppNetwork) (This)->lpVtbl->GetNetwork(This,ppNetwork) +#define INetworkConnection_get_IsConnectedToInternet(This,pbIsConnected) (This)->lpVtbl->get_IsConnectedToInternet(This,pbIsConnected) +#define INetworkConnection_get_IsConnected(This,pbIsConnected) (This)->lpVtbl->get_IsConnected(This,pbIsConnected) +#define INetworkConnection_GetConnectivity(This,pConnectivity) (This)->lpVtbl->GetConnectivity(This,pConnectivity) +#define INetworkConnection_GetConnectionId(This,pgdConnectionId) (This)->lpVtbl->GetConnectionId(This,pgdConnectionId) +#define INetworkConnection_GetAdapterId(This,pgdAdapterId) (This)->lpVtbl->GetAdapterId(This,pgdAdapterId) +#define INetworkConnection_GetDomainType(This,pDomainType) (This)->lpVtbl->GetDomainType(This,pDomainType) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT INetworkConnection_QueryInterface(INetworkConnection* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG INetworkConnection_AddRef(INetworkConnection* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG INetworkConnection_Release(INetworkConnection* This) { + return This->lpVtbl->Release(This); +} +/*** IDispatch methods ***/ +static FORCEINLINE HRESULT INetworkConnection_GetTypeInfoCount(INetworkConnection* This,UINT *pctinfo) { + return This->lpVtbl->GetTypeInfoCount(This,pctinfo); +} +static FORCEINLINE HRESULT INetworkConnection_GetTypeInfo(INetworkConnection* This,UINT iTInfo,LCID lcid,ITypeInfo **ppTInfo) { + return This->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo); +} +static FORCEINLINE HRESULT INetworkConnection_GetIDsOfNames(INetworkConnection* This,REFIID riid,LPOLESTR *rgszNames,UINT cNames,LCID lcid,DISPID *rgDispId) { + return This->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId); +} +static FORCEINLINE HRESULT INetworkConnection_Invoke(INetworkConnection* This,DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) { + return This->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr); +} +/*** INetworkConnection methods ***/ +static FORCEINLINE HRESULT INetworkConnection_GetNetwork(INetworkConnection* This,INetwork **ppNetwork) { + return This->lpVtbl->GetNetwork(This,ppNetwork); +} +static FORCEINLINE HRESULT INetworkConnection_get_IsConnectedToInternet(INetworkConnection* This,VARIANT_BOOL *pbIsConnected) { + return This->lpVtbl->get_IsConnectedToInternet(This,pbIsConnected); +} +static FORCEINLINE HRESULT INetworkConnection_get_IsConnected(INetworkConnection* This,VARIANT_BOOL *pbIsConnected) { + return This->lpVtbl->get_IsConnected(This,pbIsConnected); +} +static FORCEINLINE HRESULT INetworkConnection_GetConnectivity(INetworkConnection* This,NLM_CONNECTIVITY *pConnectivity) { + return This->lpVtbl->GetConnectivity(This,pConnectivity); +} +static FORCEINLINE HRESULT INetworkConnection_GetConnectionId(INetworkConnection* This,GUID *pgdConnectionId) { + return This->lpVtbl->GetConnectionId(This,pgdConnectionId); +} +static FORCEINLINE HRESULT INetworkConnection_GetAdapterId(INetworkConnection* This,GUID *pgdAdapterId) { + return This->lpVtbl->GetAdapterId(This,pgdAdapterId); +} +static FORCEINLINE HRESULT INetworkConnection_GetDomainType(INetworkConnection* This,NLM_DOMAIN_TYPE *pDomainType) { + return This->lpVtbl->GetDomainType(This,pDomainType); +} +#endif +#endif + +#endif + + +#endif /* __INetworkConnection_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * INetwork interface + */ +#ifndef __INetwork_INTERFACE_DEFINED__ +#define __INetwork_INTERFACE_DEFINED__ typedef enum NLM_NETWORK_CATEGORY { - NLM_NETWORK_CATEGORY_PUBLIC = 0x00, - NLM_NETWORK_CATEGORY_PRIVATE = 0x01, - NLM_NETWORK_CATEGORY_DOMAIN_AUTHENTICATED = 0x02 + NLM_NETWORK_CATEGORY_PUBLIC = 0x0, + NLM_NETWORK_CATEGORY_PRIVATE = 0x1, + NLM_NETWORK_CATEGORY_DOMAIN_AUTHENTICATED = 0x2 } NLM_NETWORK_CATEGORY; +DEFINE_GUID(IID_INetwork, 0xdcb00002, 0x570f, 0x4a9b, 0x8d,0x69, 0x19,0x9f,0xdb,0xa5,0x72,0x3b); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("dcb00002-570f-4a9b-8d69-199fdba5723b") +INetwork : public IDispatch +{ + virtual HRESULT STDMETHODCALLTYPE GetName( + BSTR *pszNetworkName) = 0; -typedef enum _NLM_NETWORK_CLASS { - NLM_NETWORK_IDENTIFYING = 0x01, - NLM_NETWORK_IDENTIFIED = 0x02, - NLM_NETWORK_UNIDENTIFIED = 0x03 -} NLM_NETWORK_CLASS; + virtual HRESULT STDMETHODCALLTYPE SetName( + BSTR szNetworkNewName) = 0; -typedef enum NLM_NETWORK_PROPERTY_CHANGE { - NLM_NETWORK_PROPERTY_CHANGE_CONNECTION = 0x01, - NLM_NETWORK_PROPERTY_CHANGE_DESCRIPTION = 0x02, - NLM_NETWORK_PROPERTY_CHANGE_NAME = 0x04, - NLM_NETWORK_PROPERTY_CHANGE_CATEGORY_VALUE = 0x10 -} NLM_NETWORK_PROPERTY_CHANGE; + virtual HRESULT STDMETHODCALLTYPE GetDescription( + BSTR *pszDescription) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetDescription( + BSTR szDescription) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetNetworkId( + GUID *pgdGuidNetworkId) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetDomainType( + NLM_DOMAIN_TYPE *pNetworkType) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetNetworkConnections( + IEnumNetworkConnections **ppEnumNetworkConnection) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetTimeCreatedAndConnected( + DWORD *pdwLowDateTimeCreated, + DWORD *pdwHighDateTimeCreated, + DWORD *pdwLowDateTimeConnected, + DWORD *pdwHighDateTimeConnected) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_IsConnectedToInternet( + VARIANT_BOOL *pbIsConnected) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_IsConnected( + VARIANT_BOOL *pbIsConnected) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetConnectivity( + NLM_CONNECTIVITY *pConnectivity) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetCategory( + NLM_NETWORK_CATEGORY *pCategory) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetCategory( + NLM_NETWORK_CATEGORY NewCategory) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(INetwork, 0xdcb00002, 0x570f, 0x4a9b, 0x8d,0x69, 0x19,0x9f,0xdb,0xa5,0x72,0x3b) +#endif +#else +typedef struct INetworkVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + INetwork *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + INetwork *This); + + ULONG (STDMETHODCALLTYPE *Release)( + INetwork *This); + + /*** IDispatch methods ***/ + HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( + INetwork *This, + UINT *pctinfo); + + HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( + INetwork *This, + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo); + + HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( + INetwork *This, + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId); + + HRESULT (STDMETHODCALLTYPE *Invoke)( + INetwork *This, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr); + + /*** INetwork methods ***/ + HRESULT (STDMETHODCALLTYPE *GetName)( + INetwork *This, + BSTR *pszNetworkName); + + HRESULT (STDMETHODCALLTYPE *SetName)( + INetwork *This, + BSTR szNetworkNewName); + + HRESULT (STDMETHODCALLTYPE *GetDescription)( + INetwork *This, + BSTR *pszDescription); + + HRESULT (STDMETHODCALLTYPE *SetDescription)( + INetwork *This, + BSTR szDescription); + + HRESULT (STDMETHODCALLTYPE *GetNetworkId)( + INetwork *This, + GUID *pgdGuidNetworkId); + + HRESULT (STDMETHODCALLTYPE *GetDomainType)( + INetwork *This, + NLM_DOMAIN_TYPE *pNetworkType); + + HRESULT (STDMETHODCALLTYPE *GetNetworkConnections)( + INetwork *This, + IEnumNetworkConnections **ppEnumNetworkConnection); + + HRESULT (STDMETHODCALLTYPE *GetTimeCreatedAndConnected)( + INetwork *This, + DWORD *pdwLowDateTimeCreated, + DWORD *pdwHighDateTimeCreated, + DWORD *pdwLowDateTimeConnected, + DWORD *pdwHighDateTimeConnected); + + HRESULT (STDMETHODCALLTYPE *get_IsConnectedToInternet)( + INetwork *This, + VARIANT_BOOL *pbIsConnected); + + HRESULT (STDMETHODCALLTYPE *get_IsConnected)( + INetwork *This, + VARIANT_BOOL *pbIsConnected); + + HRESULT (STDMETHODCALLTYPE *GetConnectivity)( + INetwork *This, + NLM_CONNECTIVITY *pConnectivity); + + HRESULT (STDMETHODCALLTYPE *GetCategory)( + INetwork *This, + NLM_NETWORK_CATEGORY *pCategory); + + HRESULT (STDMETHODCALLTYPE *SetCategory)( + INetwork *This, + NLM_NETWORK_CATEGORY NewCategory); + + END_INTERFACE +} INetworkVtbl; + +interface INetwork { + CONST_VTBL INetworkVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define INetwork_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define INetwork_AddRef(This) (This)->lpVtbl->AddRef(This) +#define INetwork_Release(This) (This)->lpVtbl->Release(This) +/*** IDispatch methods ***/ +#define INetwork_GetTypeInfoCount(This,pctinfo) (This)->lpVtbl->GetTypeInfoCount(This,pctinfo) +#define INetwork_GetTypeInfo(This,iTInfo,lcid,ppTInfo) (This)->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo) +#define INetwork_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) (This)->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) +#define INetwork_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) (This)->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) +/*** INetwork methods ***/ +#define INetwork_GetName(This,pszNetworkName) (This)->lpVtbl->GetName(This,pszNetworkName) +#define INetwork_SetName(This,szNetworkNewName) (This)->lpVtbl->SetName(This,szNetworkNewName) +#define INetwork_GetDescription(This,pszDescription) (This)->lpVtbl->GetDescription(This,pszDescription) +#define INetwork_SetDescription(This,szDescription) (This)->lpVtbl->SetDescription(This,szDescription) +#define INetwork_GetNetworkId(This,pgdGuidNetworkId) (This)->lpVtbl->GetNetworkId(This,pgdGuidNetworkId) +#define INetwork_GetDomainType(This,pNetworkType) (This)->lpVtbl->GetDomainType(This,pNetworkType) +#define INetwork_GetNetworkConnections(This,ppEnumNetworkConnection) (This)->lpVtbl->GetNetworkConnections(This,ppEnumNetworkConnection) +#define INetwork_GetTimeCreatedAndConnected(This,pdwLowDateTimeCreated,pdwHighDateTimeCreated,pdwLowDateTimeConnected,pdwHighDateTimeConnected) (This)->lpVtbl->GetTimeCreatedAndConnected(This,pdwLowDateTimeCreated,pdwHighDateTimeCreated,pdwLowDateTimeConnected,pdwHighDateTimeConnected) +#define INetwork_get_IsConnectedToInternet(This,pbIsConnected) (This)->lpVtbl->get_IsConnectedToInternet(This,pbIsConnected) +#define INetwork_get_IsConnected(This,pbIsConnected) (This)->lpVtbl->get_IsConnected(This,pbIsConnected) +#define INetwork_GetConnectivity(This,pConnectivity) (This)->lpVtbl->GetConnectivity(This,pConnectivity) +#define INetwork_GetCategory(This,pCategory) (This)->lpVtbl->GetCategory(This,pCategory) +#define INetwork_SetCategory(This,NewCategory) (This)->lpVtbl->SetCategory(This,NewCategory) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT INetwork_QueryInterface(INetwork* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG INetwork_AddRef(INetwork* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG INetwork_Release(INetwork* This) { + return This->lpVtbl->Release(This); +} +/*** IDispatch methods ***/ +static FORCEINLINE HRESULT INetwork_GetTypeInfoCount(INetwork* This,UINT *pctinfo) { + return This->lpVtbl->GetTypeInfoCount(This,pctinfo); +} +static FORCEINLINE HRESULT INetwork_GetTypeInfo(INetwork* This,UINT iTInfo,LCID lcid,ITypeInfo **ppTInfo) { + return This->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo); +} +static FORCEINLINE HRESULT INetwork_GetIDsOfNames(INetwork* This,REFIID riid,LPOLESTR *rgszNames,UINT cNames,LCID lcid,DISPID *rgDispId) { + return This->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId); +} +static FORCEINLINE HRESULT INetwork_Invoke(INetwork* This,DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) { + return This->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr); +} +/*** INetwork methods ***/ +static FORCEINLINE HRESULT INetwork_GetName(INetwork* This,BSTR *pszNetworkName) { + return This->lpVtbl->GetName(This,pszNetworkName); +} +static FORCEINLINE HRESULT INetwork_SetName(INetwork* This,BSTR szNetworkNewName) { + return This->lpVtbl->SetName(This,szNetworkNewName); +} +static FORCEINLINE HRESULT INetwork_GetDescription(INetwork* This,BSTR *pszDescription) { + return This->lpVtbl->GetDescription(This,pszDescription); +} +static FORCEINLINE HRESULT INetwork_SetDescription(INetwork* This,BSTR szDescription) { + return This->lpVtbl->SetDescription(This,szDescription); +} +static FORCEINLINE HRESULT INetwork_GetNetworkId(INetwork* This,GUID *pgdGuidNetworkId) { + return This->lpVtbl->GetNetworkId(This,pgdGuidNetworkId); +} +static FORCEINLINE HRESULT INetwork_GetDomainType(INetwork* This,NLM_DOMAIN_TYPE *pNetworkType) { + return This->lpVtbl->GetDomainType(This,pNetworkType); +} +static FORCEINLINE HRESULT INetwork_GetNetworkConnections(INetwork* This,IEnumNetworkConnections **ppEnumNetworkConnection) { + return This->lpVtbl->GetNetworkConnections(This,ppEnumNetworkConnection); +} +static FORCEINLINE HRESULT INetwork_GetTimeCreatedAndConnected(INetwork* This,DWORD *pdwLowDateTimeCreated,DWORD *pdwHighDateTimeCreated,DWORD *pdwLowDateTimeConnected,DWORD *pdwHighDateTimeConnected) { + return This->lpVtbl->GetTimeCreatedAndConnected(This,pdwLowDateTimeCreated,pdwHighDateTimeCreated,pdwLowDateTimeConnected,pdwHighDateTimeConnected); +} +static FORCEINLINE HRESULT INetwork_get_IsConnectedToInternet(INetwork* This,VARIANT_BOOL *pbIsConnected) { + return This->lpVtbl->get_IsConnectedToInternet(This,pbIsConnected); +} +static FORCEINLINE HRESULT INetwork_get_IsConnected(INetwork* This,VARIANT_BOOL *pbIsConnected) { + return This->lpVtbl->get_IsConnected(This,pbIsConnected); +} +static FORCEINLINE HRESULT INetwork_GetConnectivity(INetwork* This,NLM_CONNECTIVITY *pConnectivity) { + return This->lpVtbl->GetConnectivity(This,pConnectivity); +} +static FORCEINLINE HRESULT INetwork_GetCategory(INetwork* This,NLM_NETWORK_CATEGORY *pCategory) { + return This->lpVtbl->GetCategory(This,pCategory); +} +static FORCEINLINE HRESULT INetwork_SetCategory(INetwork* This,NLM_NETWORK_CATEGORY NewCategory) { + return This->lpVtbl->SetCategory(This,NewCategory); +} +#endif +#endif + +#endif + + +#endif /* __INetwork_INTERFACE_DEFINED__ */ + +/* Begin additional prototypes for all interfaces */ + +ULONG __RPC_USER BSTR_UserSize (ULONG *, ULONG, BSTR *); +unsigned char * __RPC_USER BSTR_UserMarshal (ULONG *, unsigned char *, BSTR *); +unsigned char * __RPC_USER BSTR_UserUnmarshal(ULONG *, unsigned char *, BSTR *); +void __RPC_USER BSTR_UserFree (ULONG *, BSTR *); + +/* End additional prototypes */ #ifdef __cplusplus } #endif -#endif /*(_WIN32_WINNT >= 0x0600)*/ - -#endif /*_INC_NETLISTMGR*/ +#endif /* __netlistmgr_h__ */ diff --git a/lib/libc/include/any-windows-any/npapi.h b/lib/libc/include/any-windows-any/npapi.h index bcf565ca56..7439e8cd1a 100644 --- a/lib/libc/include/any-windows-any/npapi.h +++ b/lib/libc/include/any-windows-any/npapi.h @@ -12,20 +12,28 @@ typedef DWORD (WINAPI *PF_NPAddConnection)(LPNETRESOURCEW lpNetResource,LPWSTR l typedef DWORD (WINAPI *PF_NPAddConnection3)(HWND hwndOwner,LPNETRESOURCEW lpNetResource,LPWSTR lpPassword,LPWSTR lpUserName,DWORD dwFlags); typedef DWORD (WINAPI *PF_NPCancelConnection)(LPWSTR lpName,WINBOOL fForce); typedef DWORD (WINAPI *PF_NPGetConnection)(LPWSTR lpLocalName,LPWSTR lpRemoteName,LPDWORD lpnBufferLen); + +#define WNGETCON_CONNECTED 0x00000000 +#define WNGETCON_DISCONNECTED 0x00000001 + +typedef DWORD (WINAPI *PF_NPGetConnection3)(LPCWSTR lpLocalName,DWORD dwLevel,LPVOID lpBuffer,LPDWORD lpBufferSize); +typedef DWORD (WINAPI *PF_NPGetConnectionPerformance)(LPCWSTR lpRemoteName,LPNETCONNECTINFOSTRUCT lpNetConnectInfo); typedef DWORD (WINAPI *PF_NPGetUniversalName)(LPWSTR lpLocalPath,DWORD dwInfoLevel,LPVOID lpBuffer,LPDWORD lpnBufferSize); -typedef DWORD (WINAPI *PF_NPOpenEnum) (DWORD dwScope,DWORD dwType,DWORD dwUsage,LPNETRESOURCEW lpNetResource,LPHANDLE lphEnum); -typedef DWORD (WINAPI *PF_NPEnumResource) (HANDLE hEnum,LPDWORD lpcCount,LPVOID lpBuffer,LPDWORD lpBufferSize); +typedef DWORD (WINAPI *PF_NPOpenEnum)(DWORD dwScope,DWORD dwType,DWORD dwUsage,LPNETRESOURCEW lpNetResource,LPHANDLE lphEnum); +typedef DWORD (WINAPI *PF_NPEnumResource)(HANDLE hEnum,LPDWORD lpcCount,LPVOID lpBuffer,LPDWORD lpBufferSize); DWORD WINAPI NPAddConnection(LPNETRESOURCEW lpNetResource,LPWSTR lpPassword,LPWSTR lpUserName); DWORD WINAPI NPAddConnection3(HWND hwndOwner,LPNETRESOURCEW lpNetResource,LPTSTR lpPassword,LPTSTR lpUserName,DWORD dwFlags); DWORD WINAPI NPCancelConnection(LPWSTR lpName,WINBOOL fForce); DWORD WINAPI NPGetConnection(LPWSTR lpLocalName,LPWSTR lpRemoteName,LPDWORD lpnBufferLen); +DWORD WINAPI NPGetConnection3(LPCWSTR lpLocalName,DWORD dwLevel,LPVOID lpBuffer,LPDWORD lpBufferSize); +DWORD WINAPI NPGetConnectionPerformance(LPCWSTR lpRemoteName,LPNETCONNECTINFOSTRUCT lpNetConnectInfo); DWORD WINAPI NPGetUniversalName(LPWSTR lpLocalPath,DWORD dwInfoLevel,LPVOID lpBuffer,LPDWORD lpBufferSize); -DWORD WINAPI NPOpenEnum (DWORD dwScope,DWORD dwType,DWORD dwUsage,LPNETRESOURCEW lpNetResource,LPHANDLE lphEnum); -DWORD WINAPI NPEnumResource (HANDLE hEnum,LPDWORD lpcCount,LPVOID lpBuffer,LPDWORD lpBufferSize); -DWORD WINAPI NPCloseEnum (HANDLE hEnum); +DWORD WINAPI NPOpenEnum(DWORD dwScope,DWORD dwType,DWORD dwUsage,LPNETRESOURCEW lpNetResource,LPHANDLE lphEnum); +DWORD WINAPI NPEnumResource(HANDLE hEnum,LPDWORD lpcCount,LPVOID lpBuffer,LPDWORD lpBufferSize); +DWORD WINAPI NPCloseEnum(HANDLE hEnum); -typedef DWORD (*PF_NPCloseEnum) (HANDLE hEnum); +typedef DWORD (*PF_NPCloseEnum)(HANDLE hEnum); #define WNNC_SPEC_VERSION 0x00000001 #define WNNC_SPEC_VERSION51 0x00050001 @@ -42,6 +50,8 @@ typedef DWORD (*PF_NPCloseEnum) (HANDLE hEnum); #define WNNC_CON_CANCELCONNECTION 0x00000002 #define WNNC_CON_GETCONNECTIONS 0x00000004 #define WNNC_CON_ADDCONNECTION3 0x00000008 +#define WNNC_CON_GETPERFORMANCE 0x00000040 +#define WNNC_CON_DEFER 0x00000080 #define WNNC_DIALOG 0x00000008 #define WNNC_DLG_DEVICEMODE 0x00000001 @@ -49,6 +59,8 @@ typedef DWORD (*PF_NPCloseEnum) (HANDLE hEnum); #define WNNC_DLG_SEARCHDIALOG 0x00000040 #define WNNC_DLG_FORMATNETWORKNAME 0x00000080 #define WNNC_DLG_PERMISSIONEDITOR 0x00000100 +#define WNNC_DLG_GETRESOURCEPARENT 0x00000200 +#define WNNC_DLG_GETRESOURCEINFORMATION 0x00000800 #define WNNC_ADMIN 0x00000009 #define WNNC_ADM_GETDIRECTORYTYPE 0x00000001 @@ -57,6 +69,8 @@ typedef DWORD (*PF_NPCloseEnum) (HANDLE hEnum); #define WNNC_ENUMERATION 0x0000000B #define WNNC_ENUM_GLOBAL 0x00000001 #define WNNC_ENUM_LOCAL 0x00000002 +#define WNNC_ENUM_CONTEXT 0x00000004 +#define WNNC_ENUM_SHAREABLE 0x00000008 #define WNNC_START 0x0000000C #define WNNC_WAIT_FOR_START 0x00000001 @@ -81,12 +95,16 @@ DWORD WINAPI NPGetUser(LPWSTR lpName,LPWSTR lpUserName,LPDWORD lpnBufferLen); typedef DWORD (WINAPI *PF_NPDeviceMode)(HWND hParent); typedef DWORD (WINAPI *PF_NPSearchDialog)(HWND hwndParent,LPNETRESOURCEW lpNetResource,LPVOID lpBuffer,DWORD cbBuffer,LPDWORD lpnFlags); +typedef DWORD (WINAPI *PF_NPGetResourceParent)(LPNETRESOURCEW lpNetResource,LPVOID lpBuffer,LPDWORD lpBufferSize); +typedef DWORD (WINAPI *PF_NPGetResourceInformation)(LPNETRESOURCEW lpNetResource,LPVOID lpBuffer,LPDWORD lpBufferSize,LPWSTR *lplpSystem); typedef DWORD (WINAPI *PF_NPFormatNetworkName)(LPWSTR lpRemoteName,LPWSTR lpFormattedName,LPDWORD lpnLength,DWORD dwFlags,DWORD dwAveCharPerLine); typedef DWORD (WINAPI *PF_NPGetPropertyText)(DWORD iButton,DWORD nPropSel,LPWSTR lpName,LPWSTR lpButtonName,DWORD nButtonNameLen,DWORD nType); typedef DWORD (WINAPI *PF_NPPropertyDialog)(HWND hwndParent,DWORD iButtonDlg,DWORD nPropSel,LPWSTR lpFileName,DWORD nType); DWORD WINAPI NPDeviceMode(HWND hParent); DWORD WINAPI NPSearchDialog(HWND hwndParent,LPNETRESOURCEW lpNetResource,LPVOID lpBuffer,DWORD cbBuffer,LPDWORD lpnFlags); +DWORD WINAPI NPGetResourceParent(LPNETRESOURCEW lpNetResource,LPVOID lpBuffer,LPDWORD lpBufferSize); +DWORD WINAPI NPGetResourceInformation(LPNETRESOURCEW lpNetResource,LPVOID lpBuffer,LPDWORD lpBufferSize,LPWSTR *lplpSystem); DWORD WINAPI NPFormatNetworkName(LPWSTR lpRemoteName,LPWSTR lpFormattedName,LPDWORD lpnLength,DWORD dwFlags,DWORD dwAveCharPerLine); DWORD WINAPI NPGetPropertyText(DWORD iButton,DWORD nPropSel,LPWSTR lpName,LPWSTR lpButtonName,DWORD nButtonNameLen,DWORD nType); DWORD WINAPI NPPropertyDialog(HWND hwndParent,DWORD iButtonDlg,DWORD nPropSel,LPWSTR lpFileName,DWORD nType); diff --git a/lib/libc/include/any-windows-any/ntsecapi.h b/lib/libc/include/any-windows-any/ntsecapi.h index d409c02f6e..99fd3cbbfd 100644 --- a/lib/libc/include/any-windows-any/ntsecapi.h +++ b/lib/libc/include/any-windows-any/ntsecapi.h @@ -847,14 +847,14 @@ extern "C" { #define RtlEncryptMemory SystemFunction040 #define RtlDecryptMemory SystemFunction041 - BOOLEAN RtlGenRandom(PVOID RandomBuffer,ULONG RandomBufferLength); + BOOLEAN WINAPI RtlGenRandom(PVOID RandomBuffer,ULONG RandomBufferLength); #define RTL_ENCRYPT_MEMORY_SIZE 8 #define RTL_ENCRYPT_OPTION_CROSS_PROCESS 0x01 #define RTL_ENCRYPT_OPTION_SAME_LOGON 0x02 - NTSTATUS RtlEncryptMemory(PVOID Memory,ULONG MemorySize,ULONG OptionFlags); - NTSTATUS RtlDecryptMemory(PVOID Memory,ULONG MemorySize,ULONG OptionFlags); + NTSTATUS WINAPI RtlEncryptMemory(PVOID Memory,ULONG MemorySize,ULONG OptionFlags); + NTSTATUS WINAPI RtlDecryptMemory(PVOID Memory,ULONG MemorySize,ULONG OptionFlags); #define KERBEROS_VERSION 5 #define KERBEROS_REVISION 6 diff --git a/lib/libc/include/any-windows-any/oaidl.h b/lib/libc/include/any-windows-any/oaidl.h index 5ecfe5141b..243b8930b6 100644 --- a/lib/libc/include/any-windows-any/oaidl.h +++ b/lib/libc/include/any-windows-any/oaidl.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/oaidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/oaidl.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,101 +21,161 @@ #ifndef __ICreateTypeInfo_FWD_DEFINED__ #define __ICreateTypeInfo_FWD_DEFINED__ typedef interface ICreateTypeInfo ICreateTypeInfo; +#ifdef __cplusplus +interface ICreateTypeInfo; +#endif /* __cplusplus */ #endif #ifndef __ICreateTypeInfo2_FWD_DEFINED__ #define __ICreateTypeInfo2_FWD_DEFINED__ typedef interface ICreateTypeInfo2 ICreateTypeInfo2; +#ifdef __cplusplus +interface ICreateTypeInfo2; +#endif /* __cplusplus */ #endif #ifndef __ICreateTypeLib_FWD_DEFINED__ #define __ICreateTypeLib_FWD_DEFINED__ typedef interface ICreateTypeLib ICreateTypeLib; +#ifdef __cplusplus +interface ICreateTypeLib; +#endif /* __cplusplus */ #endif #ifndef __ICreateTypeLib2_FWD_DEFINED__ #define __ICreateTypeLib2_FWD_DEFINED__ typedef interface ICreateTypeLib2 ICreateTypeLib2; +#ifdef __cplusplus +interface ICreateTypeLib2; +#endif /* __cplusplus */ #endif #ifndef __IDispatch_FWD_DEFINED__ #define __IDispatch_FWD_DEFINED__ typedef interface IDispatch IDispatch; +#ifdef __cplusplus +interface IDispatch; +#endif /* __cplusplus */ #endif #ifndef __IEnumVARIANT_FWD_DEFINED__ #define __IEnumVARIANT_FWD_DEFINED__ typedef interface IEnumVARIANT IEnumVARIANT; +#ifdef __cplusplus +interface IEnumVARIANT; +#endif /* __cplusplus */ #endif #ifndef __ITypeComp_FWD_DEFINED__ #define __ITypeComp_FWD_DEFINED__ typedef interface ITypeComp ITypeComp; +#ifdef __cplusplus +interface ITypeComp; +#endif /* __cplusplus */ #endif #ifndef __ITypeInfo_FWD_DEFINED__ #define __ITypeInfo_FWD_DEFINED__ typedef interface ITypeInfo ITypeInfo; +#ifdef __cplusplus +interface ITypeInfo; +#endif /* __cplusplus */ #endif #ifndef __ITypeInfo2_FWD_DEFINED__ #define __ITypeInfo2_FWD_DEFINED__ typedef interface ITypeInfo2 ITypeInfo2; +#ifdef __cplusplus +interface ITypeInfo2; +#endif /* __cplusplus */ #endif #ifndef __ITypeLib_FWD_DEFINED__ #define __ITypeLib_FWD_DEFINED__ typedef interface ITypeLib ITypeLib; +#ifdef __cplusplus +interface ITypeLib; +#endif /* __cplusplus */ #endif #ifndef __ITypeLib2_FWD_DEFINED__ #define __ITypeLib2_FWD_DEFINED__ typedef interface ITypeLib2 ITypeLib2; +#ifdef __cplusplus +interface ITypeLib2; +#endif /* __cplusplus */ #endif #ifndef __ITypeChangeEvents_FWD_DEFINED__ #define __ITypeChangeEvents_FWD_DEFINED__ typedef interface ITypeChangeEvents ITypeChangeEvents; +#ifdef __cplusplus +interface ITypeChangeEvents; +#endif /* __cplusplus */ #endif #ifndef __IErrorInfo_FWD_DEFINED__ #define __IErrorInfo_FWD_DEFINED__ typedef interface IErrorInfo IErrorInfo; +#ifdef __cplusplus +interface IErrorInfo; +#endif /* __cplusplus */ #endif #ifndef __ICreateErrorInfo_FWD_DEFINED__ #define __ICreateErrorInfo_FWD_DEFINED__ typedef interface ICreateErrorInfo ICreateErrorInfo; +#ifdef __cplusplus +interface ICreateErrorInfo; +#endif /* __cplusplus */ #endif #ifndef __ISupportErrorInfo_FWD_DEFINED__ #define __ISupportErrorInfo_FWD_DEFINED__ typedef interface ISupportErrorInfo ISupportErrorInfo; +#ifdef __cplusplus +interface ISupportErrorInfo; +#endif /* __cplusplus */ #endif #ifndef __ITypeFactory_FWD_DEFINED__ #define __ITypeFactory_FWD_DEFINED__ typedef interface ITypeFactory ITypeFactory; +#ifdef __cplusplus +interface ITypeFactory; +#endif /* __cplusplus */ #endif #ifndef __ITypeMarshal_FWD_DEFINED__ #define __ITypeMarshal_FWD_DEFINED__ typedef interface ITypeMarshal ITypeMarshal; +#ifdef __cplusplus +interface ITypeMarshal; +#endif /* __cplusplus */ #endif #ifndef __IRecordInfo_FWD_DEFINED__ #define __IRecordInfo_FWD_DEFINED__ typedef interface IRecordInfo IRecordInfo; +#ifdef __cplusplus +interface IRecordInfo; +#endif /* __cplusplus */ #endif #ifndef __IErrorLog_FWD_DEFINED__ #define __IErrorLog_FWD_DEFINED__ typedef interface IErrorLog IErrorLog; +#ifdef __cplusplus +interface IErrorLog; +#endif /* __cplusplus */ #endif #ifndef __IPropertyBag_FWD_DEFINED__ #define __IPropertyBag_FWD_DEFINED__ typedef interface IPropertyBag IPropertyBag; +#ifdef __cplusplus +interface IPropertyBag; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -136,21 +197,33 @@ extern "C" { #ifndef __ICreateTypeInfo_FWD_DEFINED__ #define __ICreateTypeInfo_FWD_DEFINED__ typedef interface ICreateTypeInfo ICreateTypeInfo; +#ifdef __cplusplus +interface ICreateTypeInfo; +#endif /* __cplusplus */ #endif #ifndef __ICreateTypeInfo2_FWD_DEFINED__ #define __ICreateTypeInfo2_FWD_DEFINED__ typedef interface ICreateTypeInfo2 ICreateTypeInfo2; +#ifdef __cplusplus +interface ICreateTypeInfo2; +#endif /* __cplusplus */ #endif #ifndef __ICreateTypeLib_FWD_DEFINED__ #define __ICreateTypeLib_FWD_DEFINED__ typedef interface ICreateTypeLib ICreateTypeLib; +#ifdef __cplusplus +interface ICreateTypeLib; +#endif /* __cplusplus */ #endif #ifndef __ICreateTypeLib2_FWD_DEFINED__ #define __ICreateTypeLib2_FWD_DEFINED__ typedef interface ICreateTypeLib2 ICreateTypeLib2; +#ifdef __cplusplus +interface ICreateTypeLib2; +#endif /* __cplusplus */ #endif #endif @@ -159,16 +232,25 @@ typedef interface ICreateTypeLib2 ICreateTypeLib2; #ifndef __IDispatch_FWD_DEFINED__ #define __IDispatch_FWD_DEFINED__ typedef interface IDispatch IDispatch; +#ifdef __cplusplus +interface IDispatch; +#endif /* __cplusplus */ #endif #ifndef __IEnumVARIANT_FWD_DEFINED__ #define __IEnumVARIANT_FWD_DEFINED__ typedef interface IEnumVARIANT IEnumVARIANT; +#ifdef __cplusplus +interface IEnumVARIANT; +#endif /* __cplusplus */ #endif #ifndef __ITypeComp_FWD_DEFINED__ #define __ITypeComp_FWD_DEFINED__ typedef interface ITypeComp ITypeComp; +#ifdef __cplusplus +interface ITypeComp; +#endif /* __cplusplus */ #endif #endif @@ -177,56 +259,89 @@ typedef interface ITypeComp ITypeComp; #ifndef __ITypeInfo_FWD_DEFINED__ #define __ITypeInfo_FWD_DEFINED__ typedef interface ITypeInfo ITypeInfo; +#ifdef __cplusplus +interface ITypeInfo; +#endif /* __cplusplus */ #endif #ifndef __ITypeInfo2_FWD_DEFINED__ #define __ITypeInfo2_FWD_DEFINED__ typedef interface ITypeInfo2 ITypeInfo2; +#ifdef __cplusplus +interface ITypeInfo2; +#endif /* __cplusplus */ #endif #ifndef __ITypeLib_FWD_DEFINED__ #define __ITypeLib_FWD_DEFINED__ typedef interface ITypeLib ITypeLib; +#ifdef __cplusplus +interface ITypeLib; +#endif /* __cplusplus */ #endif #ifndef __ITypeLib2_FWD_DEFINED__ #define __ITypeLib2_FWD_DEFINED__ typedef interface ITypeLib2 ITypeLib2; +#ifdef __cplusplus +interface ITypeLib2; +#endif /* __cplusplus */ #endif #ifndef __ITypeChangeEvents_FWD_DEFINED__ #define __ITypeChangeEvents_FWD_DEFINED__ typedef interface ITypeChangeEvents ITypeChangeEvents; +#ifdef __cplusplus +interface ITypeChangeEvents; +#endif /* __cplusplus */ #endif #ifndef __IErrorInfo_FWD_DEFINED__ #define __IErrorInfo_FWD_DEFINED__ typedef interface IErrorInfo IErrorInfo; +#ifdef __cplusplus +interface IErrorInfo; +#endif /* __cplusplus */ #endif #ifndef __ICreateErrorInfo_FWD_DEFINED__ #define __ICreateErrorInfo_FWD_DEFINED__ typedef interface ICreateErrorInfo ICreateErrorInfo; +#ifdef __cplusplus +interface ICreateErrorInfo; +#endif /* __cplusplus */ #endif #ifndef __ISupportErrorInfo_FWD_DEFINED__ #define __ISupportErrorInfo_FWD_DEFINED__ typedef interface ISupportErrorInfo ISupportErrorInfo; +#ifdef __cplusplus +interface ISupportErrorInfo; +#endif /* __cplusplus */ #endif #ifndef __ITypeFactory_FWD_DEFINED__ #define __ITypeFactory_FWD_DEFINED__ typedef interface ITypeFactory ITypeFactory; +#ifdef __cplusplus +interface ITypeFactory; +#endif /* __cplusplus */ #endif #ifndef __ITypeMarshal_FWD_DEFINED__ #define __ITypeMarshal_FWD_DEFINED__ typedef interface ITypeMarshal ITypeMarshal; +#ifdef __cplusplus +interface ITypeMarshal; +#endif /* __cplusplus */ #endif #ifndef __IRecordInfo_FWD_DEFINED__ #define __IRecordInfo_FWD_DEFINED__ typedef interface IRecordInfo IRecordInfo; +#ifdef __cplusplus +interface IRecordInfo; +#endif /* __cplusplus */ #endif #endif @@ -440,7 +555,6 @@ struct tagVARIANT { } __VARIANT_NAME_1; }; - typedef VARIANT *LPVARIANT; typedef VARIANT VARIANTARG; typedef VARIANT *LPVARIANTARG; @@ -465,7 +579,6 @@ struct _wireBRECORD { byte *pRecord; }; - struct _wireVARIANT { DWORD clSize; DWORD rpcReserved; @@ -521,7 +634,6 @@ struct _wireVARIANT { } __C89_NAMELESSUNIONNAME; }; - typedef LONG DISPID; typedef DISPID MEMBERID; typedef DWORD HREFTYPE; @@ -924,126 +1036,127 @@ typedef struct ICreateTypeInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICreateTypeInfo* This, + ICreateTypeInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICreateTypeInfo* This); + ICreateTypeInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - ICreateTypeInfo* This); + ICreateTypeInfo *This); /*** ICreateTypeInfo methods ***/ HRESULT (STDMETHODCALLTYPE *SetGuid)( - ICreateTypeInfo* This, + ICreateTypeInfo *This, REFGUID guid); HRESULT (STDMETHODCALLTYPE *SetTypeFlags)( - ICreateTypeInfo* This, + ICreateTypeInfo *This, UINT uTypeFlags); HRESULT (STDMETHODCALLTYPE *SetDocString)( - ICreateTypeInfo* This, + ICreateTypeInfo *This, LPOLESTR pStrDoc); HRESULT (STDMETHODCALLTYPE *SetHelpContext)( - ICreateTypeInfo* This, + ICreateTypeInfo *This, DWORD dwHelpContext); HRESULT (STDMETHODCALLTYPE *SetVersion)( - ICreateTypeInfo* This, + ICreateTypeInfo *This, WORD wMajorVerNum, WORD wMinorVerNum); HRESULT (STDMETHODCALLTYPE *AddRefTypeInfo)( - ICreateTypeInfo* This, + ICreateTypeInfo *This, ITypeInfo *pTInfo, HREFTYPE *phRefType); HRESULT (STDMETHODCALLTYPE *AddFuncDesc)( - ICreateTypeInfo* This, + ICreateTypeInfo *This, UINT index, FUNCDESC *pFuncDesc); HRESULT (STDMETHODCALLTYPE *AddImplType)( - ICreateTypeInfo* This, + ICreateTypeInfo *This, UINT index, HREFTYPE hRefType); HRESULT (STDMETHODCALLTYPE *SetImplTypeFlags)( - ICreateTypeInfo* This, + ICreateTypeInfo *This, UINT index, INT implTypeFlags); HRESULT (STDMETHODCALLTYPE *SetAlignment)( - ICreateTypeInfo* This, + ICreateTypeInfo *This, WORD cbAlignment); HRESULT (STDMETHODCALLTYPE *SetSchema)( - ICreateTypeInfo* This, + ICreateTypeInfo *This, LPOLESTR pStrSchema); HRESULT (STDMETHODCALLTYPE *AddVarDesc)( - ICreateTypeInfo* This, + ICreateTypeInfo *This, UINT index, VARDESC *pVarDesc); HRESULT (STDMETHODCALLTYPE *SetFuncAndParamNames)( - ICreateTypeInfo* This, + ICreateTypeInfo *This, UINT index, LPOLESTR *rgszNames, UINT cNames); HRESULT (STDMETHODCALLTYPE *SetVarName)( - ICreateTypeInfo* This, + ICreateTypeInfo *This, UINT index, LPOLESTR szName); HRESULT (STDMETHODCALLTYPE *SetTypeDescAlias)( - ICreateTypeInfo* This, + ICreateTypeInfo *This, TYPEDESC *pTDescAlias); HRESULT (STDMETHODCALLTYPE *DefineFuncAsDllEntry)( - ICreateTypeInfo* This, + ICreateTypeInfo *This, UINT index, LPOLESTR szDllName, LPOLESTR szProcName); HRESULT (STDMETHODCALLTYPE *SetFuncDocString)( - ICreateTypeInfo* This, + ICreateTypeInfo *This, UINT index, LPOLESTR szDocString); HRESULT (STDMETHODCALLTYPE *SetVarDocString)( - ICreateTypeInfo* This, + ICreateTypeInfo *This, UINT index, LPOLESTR szDocString); HRESULT (STDMETHODCALLTYPE *SetFuncHelpContext)( - ICreateTypeInfo* This, + ICreateTypeInfo *This, UINT index, DWORD dwHelpContext); HRESULT (STDMETHODCALLTYPE *SetVarHelpContext)( - ICreateTypeInfo* This, + ICreateTypeInfo *This, UINT index, DWORD dwHelpContext); HRESULT (STDMETHODCALLTYPE *SetMops)( - ICreateTypeInfo* This, + ICreateTypeInfo *This, UINT index, BSTR bstrMops); HRESULT (STDMETHODCALLTYPE *SetTypeIdldesc)( - ICreateTypeInfo* This, + ICreateTypeInfo *This, IDLDESC *pIdlDesc); HRESULT (STDMETHODCALLTYPE *LayOut)( - ICreateTypeInfo* This); + ICreateTypeInfo *This); END_INTERFACE } ICreateTypeInfoVtbl; + interface ICreateTypeInfo { CONST_VTBL ICreateTypeInfoVtbl* lpVtbl; }; @@ -1164,205 +1277,6 @@ static FORCEINLINE HRESULT ICreateTypeInfo_LayOut(ICreateTypeInfo* This) { #endif -HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetGuid_Proxy( - ICreateTypeInfo* This, - REFGUID guid); -void __RPC_STUB ICreateTypeInfo_SetGuid_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetTypeFlags_Proxy( - ICreateTypeInfo* This, - UINT uTypeFlags); -void __RPC_STUB ICreateTypeInfo_SetTypeFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetDocString_Proxy( - ICreateTypeInfo* This, - LPOLESTR pStrDoc); -void __RPC_STUB ICreateTypeInfo_SetDocString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetHelpContext_Proxy( - ICreateTypeInfo* This, - DWORD dwHelpContext); -void __RPC_STUB ICreateTypeInfo_SetHelpContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetVersion_Proxy( - ICreateTypeInfo* This, - WORD wMajorVerNum, - WORD wMinorVerNum); -void __RPC_STUB ICreateTypeInfo_SetVersion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo_AddRefTypeInfo_Proxy( - ICreateTypeInfo* This, - ITypeInfo *pTInfo, - HREFTYPE *phRefType); -void __RPC_STUB ICreateTypeInfo_AddRefTypeInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo_AddFuncDesc_Proxy( - ICreateTypeInfo* This, - UINT index, - FUNCDESC *pFuncDesc); -void __RPC_STUB ICreateTypeInfo_AddFuncDesc_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo_AddImplType_Proxy( - ICreateTypeInfo* This, - UINT index, - HREFTYPE hRefType); -void __RPC_STUB ICreateTypeInfo_AddImplType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetImplTypeFlags_Proxy( - ICreateTypeInfo* This, - UINT index, - INT implTypeFlags); -void __RPC_STUB ICreateTypeInfo_SetImplTypeFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetAlignment_Proxy( - ICreateTypeInfo* This, - WORD cbAlignment); -void __RPC_STUB ICreateTypeInfo_SetAlignment_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetSchema_Proxy( - ICreateTypeInfo* This, - LPOLESTR pStrSchema); -void __RPC_STUB ICreateTypeInfo_SetSchema_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo_AddVarDesc_Proxy( - ICreateTypeInfo* This, - UINT index, - VARDESC *pVarDesc); -void __RPC_STUB ICreateTypeInfo_AddVarDesc_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetFuncAndParamNames_Proxy( - ICreateTypeInfo* This, - UINT index, - LPOLESTR *rgszNames, - UINT cNames); -void __RPC_STUB ICreateTypeInfo_SetFuncAndParamNames_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetVarName_Proxy( - ICreateTypeInfo* This, - UINT index, - LPOLESTR szName); -void __RPC_STUB ICreateTypeInfo_SetVarName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetTypeDescAlias_Proxy( - ICreateTypeInfo* This, - TYPEDESC *pTDescAlias); -void __RPC_STUB ICreateTypeInfo_SetTypeDescAlias_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo_DefineFuncAsDllEntry_Proxy( - ICreateTypeInfo* This, - UINT index, - LPOLESTR szDllName, - LPOLESTR szProcName); -void __RPC_STUB ICreateTypeInfo_DefineFuncAsDllEntry_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetFuncDocString_Proxy( - ICreateTypeInfo* This, - UINT index, - LPOLESTR szDocString); -void __RPC_STUB ICreateTypeInfo_SetFuncDocString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetVarDocString_Proxy( - ICreateTypeInfo* This, - UINT index, - LPOLESTR szDocString); -void __RPC_STUB ICreateTypeInfo_SetVarDocString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetFuncHelpContext_Proxy( - ICreateTypeInfo* This, - UINT index, - DWORD dwHelpContext); -void __RPC_STUB ICreateTypeInfo_SetFuncHelpContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetVarHelpContext_Proxy( - ICreateTypeInfo* This, - UINT index, - DWORD dwHelpContext); -void __RPC_STUB ICreateTypeInfo_SetVarHelpContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetMops_Proxy( - ICreateTypeInfo* This, - UINT index, - BSTR bstrMops); -void __RPC_STUB ICreateTypeInfo_SetMops_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetTypeIdldesc_Proxy( - ICreateTypeInfo* This, - IDLDESC *pIdlDesc); -void __RPC_STUB ICreateTypeInfo_SetTypeIdldesc_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo_LayOut_Proxy( - ICreateTypeInfo* This); -void __RPC_STUB ICreateTypeInfo_LayOut_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICreateTypeInfo_INTERFACE_DEFINED__ */ @@ -1448,199 +1362,200 @@ typedef struct ICreateTypeInfo2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICreateTypeInfo2* This); + ICreateTypeInfo2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ICreateTypeInfo2* This); + ICreateTypeInfo2 *This); /*** ICreateTypeInfo methods ***/ HRESULT (STDMETHODCALLTYPE *SetGuid)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, REFGUID guid); HRESULT (STDMETHODCALLTYPE *SetTypeFlags)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, UINT uTypeFlags); HRESULT (STDMETHODCALLTYPE *SetDocString)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, LPOLESTR pStrDoc); HRESULT (STDMETHODCALLTYPE *SetHelpContext)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, DWORD dwHelpContext); HRESULT (STDMETHODCALLTYPE *SetVersion)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, WORD wMajorVerNum, WORD wMinorVerNum); HRESULT (STDMETHODCALLTYPE *AddRefTypeInfo)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, ITypeInfo *pTInfo, HREFTYPE *phRefType); HRESULT (STDMETHODCALLTYPE *AddFuncDesc)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, UINT index, FUNCDESC *pFuncDesc); HRESULT (STDMETHODCALLTYPE *AddImplType)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, UINT index, HREFTYPE hRefType); HRESULT (STDMETHODCALLTYPE *SetImplTypeFlags)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, UINT index, INT implTypeFlags); HRESULT (STDMETHODCALLTYPE *SetAlignment)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, WORD cbAlignment); HRESULT (STDMETHODCALLTYPE *SetSchema)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, LPOLESTR pStrSchema); HRESULT (STDMETHODCALLTYPE *AddVarDesc)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, UINT index, VARDESC *pVarDesc); HRESULT (STDMETHODCALLTYPE *SetFuncAndParamNames)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, UINT index, LPOLESTR *rgszNames, UINT cNames); HRESULT (STDMETHODCALLTYPE *SetVarName)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, UINT index, LPOLESTR szName); HRESULT (STDMETHODCALLTYPE *SetTypeDescAlias)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, TYPEDESC *pTDescAlias); HRESULT (STDMETHODCALLTYPE *DefineFuncAsDllEntry)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, UINT index, LPOLESTR szDllName, LPOLESTR szProcName); HRESULT (STDMETHODCALLTYPE *SetFuncDocString)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, UINT index, LPOLESTR szDocString); HRESULT (STDMETHODCALLTYPE *SetVarDocString)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, UINT index, LPOLESTR szDocString); HRESULT (STDMETHODCALLTYPE *SetFuncHelpContext)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, UINT index, DWORD dwHelpContext); HRESULT (STDMETHODCALLTYPE *SetVarHelpContext)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, UINT index, DWORD dwHelpContext); HRESULT (STDMETHODCALLTYPE *SetMops)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, UINT index, BSTR bstrMops); HRESULT (STDMETHODCALLTYPE *SetTypeIdldesc)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, IDLDESC *pIdlDesc); HRESULT (STDMETHODCALLTYPE *LayOut)( - ICreateTypeInfo2* This); + ICreateTypeInfo2 *This); /*** ICreateTypeInfo2 methods ***/ HRESULT (STDMETHODCALLTYPE *DeleteFuncDesc)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, UINT index); HRESULT (STDMETHODCALLTYPE *DeleteFuncDescByMemId)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, MEMBERID memid, INVOKEKIND invKind); HRESULT (STDMETHODCALLTYPE *DeleteVarDesc)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, UINT index); HRESULT (STDMETHODCALLTYPE *DeleteVarDescByMemId)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, MEMBERID memid); HRESULT (STDMETHODCALLTYPE *DeleteImplType)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, UINT index); HRESULT (STDMETHODCALLTYPE *SetCustData)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, REFGUID guid, VARIANT *pVarVal); HRESULT (STDMETHODCALLTYPE *SetFuncCustData)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, UINT index, REFGUID guid, VARIANT *pVarVal); HRESULT (STDMETHODCALLTYPE *SetParamCustData)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, UINT indexFunc, UINT indexParam, REFGUID guid, VARIANT *pVarVal); HRESULT (STDMETHODCALLTYPE *SetVarCustData)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, UINT index, REFGUID guid, VARIANT *pVarVal); HRESULT (STDMETHODCALLTYPE *SetImplTypeCustData)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, UINT index, REFGUID guid, VARIANT *pVarVal); HRESULT (STDMETHODCALLTYPE *SetHelpStringContext)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, ULONG dwHelpStringContext); HRESULT (STDMETHODCALLTYPE *SetFuncHelpStringContext)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, UINT index, ULONG dwHelpStringContext); HRESULT (STDMETHODCALLTYPE *SetVarHelpStringContext)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, UINT index, ULONG dwHelpStringContext); HRESULT (STDMETHODCALLTYPE *Invalidate)( - ICreateTypeInfo2* This); + ICreateTypeInfo2 *This); HRESULT (STDMETHODCALLTYPE *SetName)( - ICreateTypeInfo2* This, + ICreateTypeInfo2 *This, LPOLESTR szName); END_INTERFACE } ICreateTypeInfo2Vtbl; + interface ICreateTypeInfo2 { CONST_VTBL ICreateTypeInfo2Vtbl* lpVtbl; }; @@ -1823,138 +1738,6 @@ static FORCEINLINE HRESULT ICreateTypeInfo2_SetName(ICreateTypeInfo2* This,LPOLE #endif -HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_DeleteFuncDesc_Proxy( - ICreateTypeInfo2* This, - UINT index); -void __RPC_STUB ICreateTypeInfo2_DeleteFuncDesc_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_DeleteFuncDescByMemId_Proxy( - ICreateTypeInfo2* This, - MEMBERID memid, - INVOKEKIND invKind); -void __RPC_STUB ICreateTypeInfo2_DeleteFuncDescByMemId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_DeleteVarDesc_Proxy( - ICreateTypeInfo2* This, - UINT index); -void __RPC_STUB ICreateTypeInfo2_DeleteVarDesc_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_DeleteVarDescByMemId_Proxy( - ICreateTypeInfo2* This, - MEMBERID memid); -void __RPC_STUB ICreateTypeInfo2_DeleteVarDescByMemId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_DeleteImplType_Proxy( - ICreateTypeInfo2* This, - UINT index); -void __RPC_STUB ICreateTypeInfo2_DeleteImplType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_SetCustData_Proxy( - ICreateTypeInfo2* This, - REFGUID guid, - VARIANT *pVarVal); -void __RPC_STUB ICreateTypeInfo2_SetCustData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_SetFuncCustData_Proxy( - ICreateTypeInfo2* This, - UINT index, - REFGUID guid, - VARIANT *pVarVal); -void __RPC_STUB ICreateTypeInfo2_SetFuncCustData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_SetParamCustData_Proxy( - ICreateTypeInfo2* This, - UINT indexFunc, - UINT indexParam, - REFGUID guid, - VARIANT *pVarVal); -void __RPC_STUB ICreateTypeInfo2_SetParamCustData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_SetVarCustData_Proxy( - ICreateTypeInfo2* This, - UINT index, - REFGUID guid, - VARIANT *pVarVal); -void __RPC_STUB ICreateTypeInfo2_SetVarCustData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_SetImplTypeCustData_Proxy( - ICreateTypeInfo2* This, - UINT index, - REFGUID guid, - VARIANT *pVarVal); -void __RPC_STUB ICreateTypeInfo2_SetImplTypeCustData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_SetHelpStringContext_Proxy( - ICreateTypeInfo2* This, - ULONG dwHelpStringContext); -void __RPC_STUB ICreateTypeInfo2_SetHelpStringContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_SetFuncHelpStringContext_Proxy( - ICreateTypeInfo2* This, - UINT index, - ULONG dwHelpStringContext); -void __RPC_STUB ICreateTypeInfo2_SetFuncHelpStringContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_SetVarHelpStringContext_Proxy( - ICreateTypeInfo2* This, - UINT index, - ULONG dwHelpStringContext); -void __RPC_STUB ICreateTypeInfo2_SetVarHelpStringContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_Invalidate_Proxy( - ICreateTypeInfo2* This); -void __RPC_STUB ICreateTypeInfo2_Invalidate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_SetName_Proxy( - ICreateTypeInfo2* This, - LPOLESTR szName); -void __RPC_STUB ICreateTypeInfo2_SetName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICreateTypeInfo2_INTERFACE_DEFINED__ */ @@ -2015,61 +1798,62 @@ typedef struct ICreateTypeLibVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICreateTypeLib* This, + ICreateTypeLib *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICreateTypeLib* This); + ICreateTypeLib *This); ULONG (STDMETHODCALLTYPE *Release)( - ICreateTypeLib* This); + ICreateTypeLib *This); /*** ICreateTypeLib methods ***/ HRESULT (STDMETHODCALLTYPE *CreateTypeInfo)( - ICreateTypeLib* This, + ICreateTypeLib *This, LPOLESTR szName, TYPEKIND tkind, ICreateTypeInfo **ppCTInfo); HRESULT (STDMETHODCALLTYPE *SetName)( - ICreateTypeLib* This, + ICreateTypeLib *This, LPOLESTR szName); HRESULT (STDMETHODCALLTYPE *SetVersion)( - ICreateTypeLib* This, + ICreateTypeLib *This, WORD wMajorVerNum, WORD wMinorVerNum); HRESULT (STDMETHODCALLTYPE *SetGuid)( - ICreateTypeLib* This, + ICreateTypeLib *This, REFGUID guid); HRESULT (STDMETHODCALLTYPE *SetDocString)( - ICreateTypeLib* This, + ICreateTypeLib *This, LPOLESTR szDoc); HRESULT (STDMETHODCALLTYPE *SetHelpFileName)( - ICreateTypeLib* This, + ICreateTypeLib *This, LPOLESTR szHelpFileName); HRESULT (STDMETHODCALLTYPE *SetHelpContext)( - ICreateTypeLib* This, + ICreateTypeLib *This, DWORD dwHelpContext); HRESULT (STDMETHODCALLTYPE *SetLcid)( - ICreateTypeLib* This, + ICreateTypeLib *This, LCID lcid); HRESULT (STDMETHODCALLTYPE *SetLibFlags)( - ICreateTypeLib* This, + ICreateTypeLib *This, UINT uLibFlags); HRESULT (STDMETHODCALLTYPE *SaveAllChanges)( - ICreateTypeLib* This); + ICreateTypeLib *This); END_INTERFACE } ICreateTypeLibVtbl; + interface ICreateTypeLib { CONST_VTBL ICreateTypeLibVtbl* lpVtbl; }; @@ -2138,88 +1922,6 @@ static FORCEINLINE HRESULT ICreateTypeLib_SaveAllChanges(ICreateTypeLib* This) { #endif -HRESULT STDMETHODCALLTYPE ICreateTypeLib_CreateTypeInfo_Proxy( - ICreateTypeLib* This, - LPOLESTR szName, - TYPEKIND tkind, - ICreateTypeInfo **ppCTInfo); -void __RPC_STUB ICreateTypeLib_CreateTypeInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeLib_SetName_Proxy( - ICreateTypeLib* This, - LPOLESTR szName); -void __RPC_STUB ICreateTypeLib_SetName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeLib_SetVersion_Proxy( - ICreateTypeLib* This, - WORD wMajorVerNum, - WORD wMinorVerNum); -void __RPC_STUB ICreateTypeLib_SetVersion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeLib_SetGuid_Proxy( - ICreateTypeLib* This, - REFGUID guid); -void __RPC_STUB ICreateTypeLib_SetGuid_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeLib_SetDocString_Proxy( - ICreateTypeLib* This, - LPOLESTR szDoc); -void __RPC_STUB ICreateTypeLib_SetDocString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeLib_SetHelpFileName_Proxy( - ICreateTypeLib* This, - LPOLESTR szHelpFileName); -void __RPC_STUB ICreateTypeLib_SetHelpFileName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeLib_SetHelpContext_Proxy( - ICreateTypeLib* This, - DWORD dwHelpContext); -void __RPC_STUB ICreateTypeLib_SetHelpContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeLib_SetLcid_Proxy( - ICreateTypeLib* This, - LCID lcid); -void __RPC_STUB ICreateTypeLib_SetLcid_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeLib_SetLibFlags_Proxy( - ICreateTypeLib* This, - UINT uLibFlags); -void __RPC_STUB ICreateTypeLib_SetLibFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeLib_SaveAllChanges_Proxy( - ICreateTypeLib* This); -void __RPC_STUB ICreateTypeLib_SaveAllChanges_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICreateTypeLib_INTERFACE_DEFINED__ */ @@ -2259,79 +1961,80 @@ typedef struct ICreateTypeLib2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICreateTypeLib2* This, + ICreateTypeLib2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICreateTypeLib2* This); + ICreateTypeLib2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ICreateTypeLib2* This); + ICreateTypeLib2 *This); /*** ICreateTypeLib methods ***/ HRESULT (STDMETHODCALLTYPE *CreateTypeInfo)( - ICreateTypeLib2* This, + ICreateTypeLib2 *This, LPOLESTR szName, TYPEKIND tkind, ICreateTypeInfo **ppCTInfo); HRESULT (STDMETHODCALLTYPE *SetName)( - ICreateTypeLib2* This, + ICreateTypeLib2 *This, LPOLESTR szName); HRESULT (STDMETHODCALLTYPE *SetVersion)( - ICreateTypeLib2* This, + ICreateTypeLib2 *This, WORD wMajorVerNum, WORD wMinorVerNum); HRESULT (STDMETHODCALLTYPE *SetGuid)( - ICreateTypeLib2* This, + ICreateTypeLib2 *This, REFGUID guid); HRESULT (STDMETHODCALLTYPE *SetDocString)( - ICreateTypeLib2* This, + ICreateTypeLib2 *This, LPOLESTR szDoc); HRESULT (STDMETHODCALLTYPE *SetHelpFileName)( - ICreateTypeLib2* This, + ICreateTypeLib2 *This, LPOLESTR szHelpFileName); HRESULT (STDMETHODCALLTYPE *SetHelpContext)( - ICreateTypeLib2* This, + ICreateTypeLib2 *This, DWORD dwHelpContext); HRESULT (STDMETHODCALLTYPE *SetLcid)( - ICreateTypeLib2* This, + ICreateTypeLib2 *This, LCID lcid); HRESULT (STDMETHODCALLTYPE *SetLibFlags)( - ICreateTypeLib2* This, + ICreateTypeLib2 *This, UINT uLibFlags); HRESULT (STDMETHODCALLTYPE *SaveAllChanges)( - ICreateTypeLib2* This); + ICreateTypeLib2 *This); /*** ICreateTypeLib2 methods ***/ HRESULT (STDMETHODCALLTYPE *DeleteTypeInfo)( - ICreateTypeLib2* This, + ICreateTypeLib2 *This, LPOLESTR szName); HRESULT (STDMETHODCALLTYPE *SetCustData)( - ICreateTypeLib2* This, + ICreateTypeLib2 *This, REFGUID guid, VARIANT *pVarVal); HRESULT (STDMETHODCALLTYPE *SetHelpStringContext)( - ICreateTypeLib2* This, + ICreateTypeLib2 *This, ULONG dwHelpStringContext); HRESULT (STDMETHODCALLTYPE *SetHelpStringDll)( - ICreateTypeLib2* This, + ICreateTypeLib2 *This, LPOLESTR szFileName); END_INTERFACE } ICreateTypeLib2Vtbl; + interface ICreateTypeLib2 { CONST_VTBL ICreateTypeLib2Vtbl* lpVtbl; }; @@ -2418,39 +2121,6 @@ static FORCEINLINE HRESULT ICreateTypeLib2_SetHelpStringDll(ICreateTypeLib2* Thi #endif -HRESULT STDMETHODCALLTYPE ICreateTypeLib2_DeleteTypeInfo_Proxy( - ICreateTypeLib2* This, - LPOLESTR szName); -void __RPC_STUB ICreateTypeLib2_DeleteTypeInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeLib2_SetCustData_Proxy( - ICreateTypeLib2* This, - REFGUID guid, - VARIANT *pVarVal); -void __RPC_STUB ICreateTypeLib2_SetCustData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeLib2_SetHelpStringContext_Proxy( - ICreateTypeLib2* This, - ULONG dwHelpStringContext); -void __RPC_STUB ICreateTypeLib2_SetHelpStringContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateTypeLib2_SetHelpStringDll_Proxy( - ICreateTypeLib2* This, - LPOLESTR szFileName); -void __RPC_STUB ICreateTypeLib2_SetHelpStringDll_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICreateTypeLib2_INTERFACE_DEFINED__ */ @@ -2523,29 +2193,29 @@ typedef struct IDispatchVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDispatch* This, + IDispatch *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDispatch* This); + IDispatch *This); ULONG (STDMETHODCALLTYPE *Release)( - IDispatch* This); + IDispatch *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IDispatch* This, + IDispatch *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IDispatch* This, + IDispatch *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IDispatch* This, + IDispatch *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2553,7 +2223,7 @@ typedef struct IDispatchVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IDispatch* This, + IDispatch *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2565,6 +2235,7 @@ typedef struct IDispatchVtbl { END_INTERFACE } IDispatchVtbl; + interface IDispatch { CONST_VTBL IDispatchVtbl* lpVtbl; }; @@ -2609,36 +2280,6 @@ static FORCEINLINE HRESULT IDispatch_Invoke(IDispatch* This,DISPID dispIdMember, #endif -HRESULT STDMETHODCALLTYPE IDispatch_GetTypeInfoCount_Proxy( - IDispatch* This, - UINT *pctinfo); -void __RPC_STUB IDispatch_GetTypeInfoCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDispatch_GetTypeInfo_Proxy( - IDispatch* This, - UINT iTInfo, - LCID lcid, - ITypeInfo **ppTInfo); -void __RPC_STUB IDispatch_GetTypeInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDispatch_GetIDsOfNames_Proxy( - IDispatch* This, - REFIID riid, - LPOLESTR *rgszNames, - UINT cNames, - LCID lcid, - DISPID *rgDispId); -void __RPC_STUB IDispatch_GetIDsOfNames_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE IDispatch_RemoteInvoke_Proxy( IDispatch* This, DISPID dispIdMember, @@ -2721,36 +2362,37 @@ typedef struct IEnumVARIANTVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumVARIANT* This, + IEnumVARIANT *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumVARIANT* This); + IEnumVARIANT *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumVARIANT* This); + IEnumVARIANT *This); /*** IEnumVARIANT methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumVARIANT* This, + IEnumVARIANT *This, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumVARIANT* This, + IEnumVARIANT *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumVARIANT* This); + IEnumVARIANT *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumVARIANT* This, + IEnumVARIANT *This, IEnumVARIANT **ppEnum); END_INTERFACE } IEnumVARIANTVtbl; + interface IEnumVARIANT { CONST_VTBL IEnumVARIANTVtbl* lpVtbl; }; @@ -2805,29 +2447,6 @@ void __RPC_STUB IEnumVARIANT_RemoteNext_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumVARIANT_Skip_Proxy( - IEnumVARIANT* This, - ULONG celt); -void __RPC_STUB IEnumVARIANT_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumVARIANT_Reset_Proxy( - IEnumVARIANT* This); -void __RPC_STUB IEnumVARIANT_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumVARIANT_Clone_Proxy( - IEnumVARIANT* This, - IEnumVARIANT **ppEnum); -void __RPC_STUB IEnumVARIANT_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IEnumVARIANT_Next_Proxy( IEnumVARIANT* This, ULONG celt, @@ -2895,19 +2514,19 @@ typedef struct ITypeCompVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITypeComp* This, + ITypeComp *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITypeComp* This); + ITypeComp *This); ULONG (STDMETHODCALLTYPE *Release)( - ITypeComp* This); + ITypeComp *This); /*** ITypeComp methods ***/ HRESULT (STDMETHODCALLTYPE *Bind)( - ITypeComp* This, + ITypeComp *This, LPOLESTR szName, ULONG lHashVal, WORD wFlags, @@ -2916,7 +2535,7 @@ typedef struct ITypeCompVtbl { BINDPTR *pBindPtr); HRESULT (STDMETHODCALLTYPE *BindType)( - ITypeComp* This, + ITypeComp *This, LPOLESTR szName, ULONG lHashVal, ITypeInfo **ppTInfo, @@ -2924,6 +2543,7 @@ typedef struct ITypeCompVtbl { END_INTERFACE } ITypeCompVtbl; + interface ITypeComp { CONST_VTBL ITypeCompVtbl* lpVtbl; }; @@ -3132,60 +2752,60 @@ typedef struct ITypeInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITypeInfo* This, + ITypeInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITypeInfo* This); + ITypeInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - ITypeInfo* This); + ITypeInfo *This); /*** ITypeInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeAttr)( - ITypeInfo* This, + ITypeInfo *This, TYPEATTR **ppTypeAttr); HRESULT (STDMETHODCALLTYPE *GetTypeComp)( - ITypeInfo* This, + ITypeInfo *This, ITypeComp **ppTComp); HRESULT (STDMETHODCALLTYPE *GetFuncDesc)( - ITypeInfo* This, + ITypeInfo *This, UINT index, FUNCDESC **ppFuncDesc); HRESULT (STDMETHODCALLTYPE *GetVarDesc)( - ITypeInfo* This, + ITypeInfo *This, UINT index, VARDESC **ppVarDesc); HRESULT (STDMETHODCALLTYPE *GetNames)( - ITypeInfo* This, + ITypeInfo *This, MEMBERID memid, BSTR *rgBstrNames, UINT cMaxNames, UINT *pcNames); HRESULT (STDMETHODCALLTYPE *GetRefTypeOfImplType)( - ITypeInfo* This, + ITypeInfo *This, UINT index, HREFTYPE *pRefType); HRESULT (STDMETHODCALLTYPE *GetImplTypeFlags)( - ITypeInfo* This, + ITypeInfo *This, UINT index, INT *pImplTypeFlags); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ITypeInfo* This, + ITypeInfo *This, LPOLESTR *rgszNames, UINT cNames, MEMBERID *pMemId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ITypeInfo* This, + ITypeInfo *This, PVOID pvInstance, MEMBERID memid, WORD wFlags, @@ -3195,7 +2815,7 @@ typedef struct ITypeInfoVtbl { UINT *puArgErr); HRESULT (STDMETHODCALLTYPE *GetDocumentation)( - ITypeInfo* This, + ITypeInfo *This, MEMBERID memid, BSTR *pBstrName, BSTR *pBstrDocString, @@ -3203,7 +2823,7 @@ typedef struct ITypeInfoVtbl { BSTR *pBstrHelpFile); HRESULT (STDMETHODCALLTYPE *GetDllEntry)( - ITypeInfo* This, + ITypeInfo *This, MEMBERID memid, INVOKEKIND invKind, BSTR *pBstrDllName, @@ -3211,46 +2831,47 @@ typedef struct ITypeInfoVtbl { WORD *pwOrdinal); HRESULT (STDMETHODCALLTYPE *GetRefTypeInfo)( - ITypeInfo* This, + ITypeInfo *This, HREFTYPE hRefType, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *AddressOfMember)( - ITypeInfo* This, + ITypeInfo *This, MEMBERID memid, INVOKEKIND invKind, PVOID *ppv); HRESULT (STDMETHODCALLTYPE *CreateInstance)( - ITypeInfo* This, + ITypeInfo *This, IUnknown *pUnkOuter, REFIID riid, PVOID *ppvObj); HRESULT (STDMETHODCALLTYPE *GetMops)( - ITypeInfo* This, + ITypeInfo *This, MEMBERID memid, BSTR *pBstrMops); HRESULT (STDMETHODCALLTYPE *GetContainingTypeLib)( - ITypeInfo* This, + ITypeInfo *This, ITypeLib **ppTLib, UINT *pIndex); void (STDMETHODCALLTYPE *ReleaseTypeAttr)( - ITypeInfo* This, + ITypeInfo *This, TYPEATTR *pTypeAttr); void (STDMETHODCALLTYPE *ReleaseFuncDesc)( - ITypeInfo* This, + ITypeInfo *This, FUNCDESC *pFuncDesc); void (STDMETHODCALLTYPE *ReleaseVarDesc)( - ITypeInfo* This, + ITypeInfo *This, VARDESC *pVarDesc); END_INTERFACE } ITypeInfoVtbl; + interface ITypeInfo { CONST_VTBL ITypeInfoVtbl* lpVtbl; }; @@ -3364,14 +2985,6 @@ void __RPC_STUB ITypeInfo_RemoteGetTypeAttr_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeInfo_GetTypeComp_Proxy( - ITypeInfo* This, - ITypeComp **ppTComp); -void __RPC_STUB ITypeInfo_GetTypeComp_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE ITypeInfo_RemoteGetFuncDesc_Proxy( ITypeInfo* This, UINT index, @@ -3403,24 +3016,6 @@ void __RPC_STUB ITypeInfo_RemoteGetNames_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeInfo_GetRefTypeOfImplType_Proxy( - ITypeInfo* This, - UINT index, - HREFTYPE *pRefType); -void __RPC_STUB ITypeInfo_GetRefTypeOfImplType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeInfo_GetImplTypeFlags_Proxy( - ITypeInfo* This, - UINT index, - INT *pImplTypeFlags); -void __RPC_STUB ITypeInfo_GetImplTypeFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE ITypeInfo_LocalGetIDsOfNames_Proxy( ITypeInfo* This); void __RPC_STUB ITypeInfo_LocalGetIDsOfNames_Stub( @@ -3461,15 +3056,6 @@ void __RPC_STUB ITypeInfo_RemoteGetDllEntry_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeInfo_GetRefTypeInfo_Proxy( - ITypeInfo* This, - HREFTYPE hRefType, - ITypeInfo **ppTInfo); -void __RPC_STUB ITypeInfo_GetRefTypeInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE ITypeInfo_LocalAddressOfMember_Proxy( ITypeInfo* This); void __RPC_STUB ITypeInfo_LocalAddressOfMember_Stub( @@ -3486,15 +3072,6 @@ void __RPC_STUB ITypeInfo_RemoteCreateInstance_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeInfo_GetMops_Proxy( - ITypeInfo* This, - MEMBERID memid, - BSTR *pBstrMops); -void __RPC_STUB ITypeInfo_GetMops_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE ITypeInfo_RemoteGetContainingTypeLib_Proxy( ITypeInfo* This, ITypeLib **ppTLib, @@ -3743,60 +3320,60 @@ typedef struct ITypeInfo2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITypeInfo2* This, + ITypeInfo2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITypeInfo2* This); + ITypeInfo2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ITypeInfo2* This); + ITypeInfo2 *This); /*** ITypeInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeAttr)( - ITypeInfo2* This, + ITypeInfo2 *This, TYPEATTR **ppTypeAttr); HRESULT (STDMETHODCALLTYPE *GetTypeComp)( - ITypeInfo2* This, + ITypeInfo2 *This, ITypeComp **ppTComp); HRESULT (STDMETHODCALLTYPE *GetFuncDesc)( - ITypeInfo2* This, + ITypeInfo2 *This, UINT index, FUNCDESC **ppFuncDesc); HRESULT (STDMETHODCALLTYPE *GetVarDesc)( - ITypeInfo2* This, + ITypeInfo2 *This, UINT index, VARDESC **ppVarDesc); HRESULT (STDMETHODCALLTYPE *GetNames)( - ITypeInfo2* This, + ITypeInfo2 *This, MEMBERID memid, BSTR *rgBstrNames, UINT cMaxNames, UINT *pcNames); HRESULT (STDMETHODCALLTYPE *GetRefTypeOfImplType)( - ITypeInfo2* This, + ITypeInfo2 *This, UINT index, HREFTYPE *pRefType); HRESULT (STDMETHODCALLTYPE *GetImplTypeFlags)( - ITypeInfo2* This, + ITypeInfo2 *This, UINT index, INT *pImplTypeFlags); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ITypeInfo2* This, + ITypeInfo2 *This, LPOLESTR *rgszNames, UINT cNames, MEMBERID *pMemId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ITypeInfo2* This, + ITypeInfo2 *This, PVOID pvInstance, MEMBERID memid, WORD wFlags, @@ -3806,7 +3383,7 @@ typedef struct ITypeInfo2Vtbl { UINT *puArgErr); HRESULT (STDMETHODCALLTYPE *GetDocumentation)( - ITypeInfo2* This, + ITypeInfo2 *This, MEMBERID memid, BSTR *pBstrName, BSTR *pBstrDocString, @@ -3814,7 +3391,7 @@ typedef struct ITypeInfo2Vtbl { BSTR *pBstrHelpFile); HRESULT (STDMETHODCALLTYPE *GetDllEntry)( - ITypeInfo2* This, + ITypeInfo2 *This, MEMBERID memid, INVOKEKIND invKind, BSTR *pBstrDllName, @@ -3822,96 +3399,96 @@ typedef struct ITypeInfo2Vtbl { WORD *pwOrdinal); HRESULT (STDMETHODCALLTYPE *GetRefTypeInfo)( - ITypeInfo2* This, + ITypeInfo2 *This, HREFTYPE hRefType, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *AddressOfMember)( - ITypeInfo2* This, + ITypeInfo2 *This, MEMBERID memid, INVOKEKIND invKind, PVOID *ppv); HRESULT (STDMETHODCALLTYPE *CreateInstance)( - ITypeInfo2* This, + ITypeInfo2 *This, IUnknown *pUnkOuter, REFIID riid, PVOID *ppvObj); HRESULT (STDMETHODCALLTYPE *GetMops)( - ITypeInfo2* This, + ITypeInfo2 *This, MEMBERID memid, BSTR *pBstrMops); HRESULT (STDMETHODCALLTYPE *GetContainingTypeLib)( - ITypeInfo2* This, + ITypeInfo2 *This, ITypeLib **ppTLib, UINT *pIndex); void (STDMETHODCALLTYPE *ReleaseTypeAttr)( - ITypeInfo2* This, + ITypeInfo2 *This, TYPEATTR *pTypeAttr); void (STDMETHODCALLTYPE *ReleaseFuncDesc)( - ITypeInfo2* This, + ITypeInfo2 *This, FUNCDESC *pFuncDesc); void (STDMETHODCALLTYPE *ReleaseVarDesc)( - ITypeInfo2* This, + ITypeInfo2 *This, VARDESC *pVarDesc); /*** ITypeInfo2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeKind)( - ITypeInfo2* This, + ITypeInfo2 *This, TYPEKIND *pTypeKind); HRESULT (STDMETHODCALLTYPE *GetTypeFlags)( - ITypeInfo2* This, + ITypeInfo2 *This, ULONG *pTypeFlags); HRESULT (STDMETHODCALLTYPE *GetFuncIndexOfMemId)( - ITypeInfo2* This, + ITypeInfo2 *This, MEMBERID memid, INVOKEKIND invKind, UINT *pFuncIndex); HRESULT (STDMETHODCALLTYPE *GetVarIndexOfMemId)( - ITypeInfo2* This, + ITypeInfo2 *This, MEMBERID memid, UINT *pVarIndex); HRESULT (STDMETHODCALLTYPE *GetCustData)( - ITypeInfo2* This, + ITypeInfo2 *This, REFGUID guid, VARIANT *pVarVal); HRESULT (STDMETHODCALLTYPE *GetFuncCustData)( - ITypeInfo2* This, + ITypeInfo2 *This, UINT index, REFGUID guid, VARIANT *pVarVal); HRESULT (STDMETHODCALLTYPE *GetParamCustData)( - ITypeInfo2* This, + ITypeInfo2 *This, UINT indexFunc, UINT indexParam, REFGUID guid, VARIANT *pVarVal); HRESULT (STDMETHODCALLTYPE *GetVarCustData)( - ITypeInfo2* This, + ITypeInfo2 *This, UINT index, REFGUID guid, VARIANT *pVarVal); HRESULT (STDMETHODCALLTYPE *GetImplTypeCustData)( - ITypeInfo2* This, + ITypeInfo2 *This, UINT index, REFGUID guid, VARIANT *pVarVal); HRESULT (STDMETHODCALLTYPE *GetDocumentation2)( - ITypeInfo2* This, + ITypeInfo2 *This, MEMBERID memid, LCID lcid, BSTR *pbstrHelpString, @@ -3919,32 +3496,33 @@ typedef struct ITypeInfo2Vtbl { BSTR *pbstrHelpStringDll); HRESULT (STDMETHODCALLTYPE *GetAllCustData)( - ITypeInfo2* This, + ITypeInfo2 *This, CUSTDATA *pCustData); HRESULT (STDMETHODCALLTYPE *GetAllFuncCustData)( - ITypeInfo2* This, + ITypeInfo2 *This, UINT index, CUSTDATA *pCustData); HRESULT (STDMETHODCALLTYPE *GetAllParamCustData)( - ITypeInfo2* This, + ITypeInfo2 *This, UINT indexFunc, UINT indexParam, CUSTDATA *pCustData); HRESULT (STDMETHODCALLTYPE *GetAllVarCustData)( - ITypeInfo2* This, + ITypeInfo2 *This, UINT index, CUSTDATA *pCustData); HRESULT (STDMETHODCALLTYPE *GetAllImplTypeCustData)( - ITypeInfo2* This, + ITypeInfo2 *This, UINT index, CUSTDATA *pCustData); END_INTERFACE } ITypeInfo2Vtbl; + interface ITypeInfo2 { CONST_VTBL ITypeInfo2Vtbl* lpVtbl; }; @@ -4111,91 +3689,6 @@ static FORCEINLINE HRESULT ITypeInfo2_GetAllImplTypeCustData(ITypeInfo2* This,UI #endif -HRESULT STDMETHODCALLTYPE ITypeInfo2_GetTypeKind_Proxy( - ITypeInfo2* This, - TYPEKIND *pTypeKind); -void __RPC_STUB ITypeInfo2_GetTypeKind_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeInfo2_GetTypeFlags_Proxy( - ITypeInfo2* This, - ULONG *pTypeFlags); -void __RPC_STUB ITypeInfo2_GetTypeFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeInfo2_GetFuncIndexOfMemId_Proxy( - ITypeInfo2* This, - MEMBERID memid, - INVOKEKIND invKind, - UINT *pFuncIndex); -void __RPC_STUB ITypeInfo2_GetFuncIndexOfMemId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeInfo2_GetVarIndexOfMemId_Proxy( - ITypeInfo2* This, - MEMBERID memid, - UINT *pVarIndex); -void __RPC_STUB ITypeInfo2_GetVarIndexOfMemId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeInfo2_GetCustData_Proxy( - ITypeInfo2* This, - REFGUID guid, - VARIANT *pVarVal); -void __RPC_STUB ITypeInfo2_GetCustData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeInfo2_GetFuncCustData_Proxy( - ITypeInfo2* This, - UINT index, - REFGUID guid, - VARIANT *pVarVal); -void __RPC_STUB ITypeInfo2_GetFuncCustData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeInfo2_GetParamCustData_Proxy( - ITypeInfo2* This, - UINT indexFunc, - UINT indexParam, - REFGUID guid, - VARIANT *pVarVal); -void __RPC_STUB ITypeInfo2_GetParamCustData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeInfo2_GetVarCustData_Proxy( - ITypeInfo2* This, - UINT index, - REFGUID guid, - VARIANT *pVarVal); -void __RPC_STUB ITypeInfo2_GetVarCustData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeInfo2_GetImplTypeCustData_Proxy( - ITypeInfo2* This, - UINT index, - REFGUID guid, - VARIANT *pVarVal); -void __RPC_STUB ITypeInfo2_GetImplTypeCustData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE ITypeInfo2_RemoteGetDocumentation2_Proxy( ITypeInfo2* This, MEMBERID memid, @@ -4209,51 +3702,6 @@ void __RPC_STUB ITypeInfo2_RemoteGetDocumentation2_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeInfo2_GetAllCustData_Proxy( - ITypeInfo2* This, - CUSTDATA *pCustData); -void __RPC_STUB ITypeInfo2_GetAllCustData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeInfo2_GetAllFuncCustData_Proxy( - ITypeInfo2* This, - UINT index, - CUSTDATA *pCustData); -void __RPC_STUB ITypeInfo2_GetAllFuncCustData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeInfo2_GetAllParamCustData_Proxy( - ITypeInfo2* This, - UINT indexFunc, - UINT indexParam, - CUSTDATA *pCustData); -void __RPC_STUB ITypeInfo2_GetAllParamCustData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeInfo2_GetAllVarCustData_Proxy( - ITypeInfo2* This, - UINT index, - CUSTDATA *pCustData); -void __RPC_STUB ITypeInfo2_GetAllVarCustData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeInfo2_GetAllImplTypeCustData_Proxy( - ITypeInfo2* This, - UINT index, - CUSTDATA *pCustData); -void __RPC_STUB ITypeInfo2_GetAllImplTypeCustData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK ITypeInfo2_GetDocumentation2_Proxy( ITypeInfo2* This, MEMBERID memid, @@ -4365,45 +3813,45 @@ typedef struct ITypeLibVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITypeLib* This, + ITypeLib *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITypeLib* This); + ITypeLib *This); ULONG (STDMETHODCALLTYPE *Release)( - ITypeLib* This); + ITypeLib *This); /*** ITypeLib methods ***/ UINT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ITypeLib* This); + ITypeLib *This); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ITypeLib* This, + ITypeLib *This, UINT index, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfoType)( - ITypeLib* This, + ITypeLib *This, UINT index, TYPEKIND *pTKind); HRESULT (STDMETHODCALLTYPE *GetTypeInfoOfGuid)( - ITypeLib* This, + ITypeLib *This, REFGUID guid, ITypeInfo **ppTinfo); HRESULT (STDMETHODCALLTYPE *GetLibAttr)( - ITypeLib* This, + ITypeLib *This, TLIBATTR **ppTLibAttr); HRESULT (STDMETHODCALLTYPE *GetTypeComp)( - ITypeLib* This, + ITypeLib *This, ITypeComp **ppTComp); HRESULT (STDMETHODCALLTYPE *GetDocumentation)( - ITypeLib* This, + ITypeLib *This, INT index, BSTR *pBstrName, BSTR *pBstrDocString, @@ -4411,13 +3859,13 @@ typedef struct ITypeLibVtbl { BSTR *pBstrHelpFile); HRESULT (STDMETHODCALLTYPE *IsName)( - ITypeLib* This, + ITypeLib *This, LPOLESTR szNameBuf, ULONG lHashVal, WINBOOL *pfName); HRESULT (STDMETHODCALLTYPE *FindName)( - ITypeLib* This, + ITypeLib *This, LPOLESTR szNameBuf, ULONG lHashVal, ITypeInfo **ppTInfo, @@ -4425,11 +3873,12 @@ typedef struct ITypeLibVtbl { USHORT *pcFound); void (STDMETHODCALLTYPE *ReleaseTLibAttr)( - ITypeLib* This, + ITypeLib *This, TLIBATTR *pTLibAttr); END_INTERFACE } ITypeLibVtbl; + interface ITypeLib { CONST_VTBL ITypeLibVtbl* lpVtbl; }; @@ -4506,33 +3955,6 @@ void __RPC_STUB ITypeLib_RemoteGetTypeInfoCount_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeLib_GetTypeInfo_Proxy( - ITypeLib* This, - UINT index, - ITypeInfo **ppTInfo); -void __RPC_STUB ITypeLib_GetTypeInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeLib_GetTypeInfoType_Proxy( - ITypeLib* This, - UINT index, - TYPEKIND *pTKind); -void __RPC_STUB ITypeLib_GetTypeInfoType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeLib_GetTypeInfoOfGuid_Proxy( - ITypeLib* This, - REFGUID guid, - ITypeInfo **ppTinfo); -void __RPC_STUB ITypeLib_GetTypeInfoOfGuid_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE ITypeLib_RemoteGetLibAttr_Proxy( ITypeLib* This, LPTLIBATTR *ppTLibAttr, @@ -4542,14 +3964,6 @@ void __RPC_STUB ITypeLib_RemoteGetLibAttr_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeLib_GetTypeComp_Proxy( - ITypeLib* This, - ITypeComp **ppTComp); -void __RPC_STUB ITypeLib_GetTypeComp_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE ITypeLib_RemoteGetDocumentation_Proxy( ITypeLib* This, INT index, @@ -4699,45 +4113,45 @@ typedef struct ITypeLib2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITypeLib2* This, + ITypeLib2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITypeLib2* This); + ITypeLib2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ITypeLib2* This); + ITypeLib2 *This); /*** ITypeLib methods ***/ UINT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ITypeLib2* This); + ITypeLib2 *This); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ITypeLib2* This, + ITypeLib2 *This, UINT index, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfoType)( - ITypeLib2* This, + ITypeLib2 *This, UINT index, TYPEKIND *pTKind); HRESULT (STDMETHODCALLTYPE *GetTypeInfoOfGuid)( - ITypeLib2* This, + ITypeLib2 *This, REFGUID guid, ITypeInfo **ppTinfo); HRESULT (STDMETHODCALLTYPE *GetLibAttr)( - ITypeLib2* This, + ITypeLib2 *This, TLIBATTR **ppTLibAttr); HRESULT (STDMETHODCALLTYPE *GetTypeComp)( - ITypeLib2* This, + ITypeLib2 *This, ITypeComp **ppTComp); HRESULT (STDMETHODCALLTYPE *GetDocumentation)( - ITypeLib2* This, + ITypeLib2 *This, INT index, BSTR *pBstrName, BSTR *pBstrDocString, @@ -4745,13 +4159,13 @@ typedef struct ITypeLib2Vtbl { BSTR *pBstrHelpFile); HRESULT (STDMETHODCALLTYPE *IsName)( - ITypeLib2* This, + ITypeLib2 *This, LPOLESTR szNameBuf, ULONG lHashVal, WINBOOL *pfName); HRESULT (STDMETHODCALLTYPE *FindName)( - ITypeLib2* This, + ITypeLib2 *This, LPOLESTR szNameBuf, ULONG lHashVal, ITypeInfo **ppTInfo, @@ -4759,22 +4173,22 @@ typedef struct ITypeLib2Vtbl { USHORT *pcFound); void (STDMETHODCALLTYPE *ReleaseTLibAttr)( - ITypeLib2* This, + ITypeLib2 *This, TLIBATTR *pTLibAttr); /*** ITypeLib2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetCustData)( - ITypeLib2* This, + ITypeLib2 *This, REFGUID guid, VARIANT *pVarVal); HRESULT (STDMETHODCALLTYPE *GetLibStatistics)( - ITypeLib2* This, + ITypeLib2 *This, ULONG *pcUniqueNames, ULONG *pcchUniqueNames); HRESULT (STDMETHODCALLTYPE *GetDocumentation2)( - ITypeLib2* This, + ITypeLib2 *This, INT index, LCID lcid, BSTR *pbstrHelpString, @@ -4782,11 +4196,12 @@ typedef struct ITypeLib2Vtbl { BSTR *pbstrHelpStringDll); HRESULT (STDMETHODCALLTYPE *GetAllCustData)( - ITypeLib2* This, + ITypeLib2 *This, CUSTDATA *pCustData); END_INTERFACE } ITypeLib2Vtbl; + interface ITypeLib2 { CONST_VTBL ITypeLib2Vtbl* lpVtbl; }; @@ -4873,15 +4288,6 @@ static FORCEINLINE HRESULT ITypeLib2_GetAllCustData(ITypeLib2* This,CUSTDATA *pC #endif -HRESULT STDMETHODCALLTYPE ITypeLib2_GetCustData_Proxy( - ITypeLib2* This, - REFGUID guid, - VARIANT *pVarVal); -void __RPC_STUB ITypeLib2_GetCustData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE ITypeLib2_RemoteGetLibStatistics_Proxy( ITypeLib2* This, ULONG *pcUniqueNames, @@ -4904,14 +4310,6 @@ void __RPC_STUB ITypeLib2_RemoteGetDocumentation2_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeLib2_GetAllCustData_Proxy( - ITypeLib2* This, - CUSTDATA *pCustData); -void __RPC_STUB ITypeLib2_GetAllCustData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK ITypeLib2_GetLibStatistics_Proxy( ITypeLib2* This, ULONG *pcUniqueNames, @@ -4984,32 +4382,33 @@ typedef struct ITypeChangeEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITypeChangeEvents* This, + ITypeChangeEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITypeChangeEvents* This); + ITypeChangeEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - ITypeChangeEvents* This); + ITypeChangeEvents *This); /*** ITypeChangeEvents methods ***/ HRESULT (STDMETHODCALLTYPE *RequestTypeChange)( - ITypeChangeEvents* This, + ITypeChangeEvents *This, CHANGEKIND changeKind, ITypeInfo *pTInfoBefore, LPOLESTR pStrName, INT *pfCancel); HRESULT (STDMETHODCALLTYPE *AfterTypeChange)( - ITypeChangeEvents* This, + ITypeChangeEvents *This, CHANGEKIND changeKind, ITypeInfo *pTInfoAfter, LPOLESTR pStrName); END_INTERFACE } ITypeChangeEventsVtbl; + interface ITypeChangeEvents { CONST_VTBL ITypeChangeEventsVtbl* lpVtbl; }; @@ -5046,27 +4445,6 @@ static FORCEINLINE HRESULT ITypeChangeEvents_AfterTypeChange(ITypeChangeEvents* #endif -HRESULT STDMETHODCALLTYPE ITypeChangeEvents_RequestTypeChange_Proxy( - ITypeChangeEvents* This, - CHANGEKIND changeKind, - ITypeInfo *pTInfoBefore, - LPOLESTR pStrName, - INT *pfCancel); -void __RPC_STUB ITypeChangeEvents_RequestTypeChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeChangeEvents_AfterTypeChange_Proxy( - ITypeChangeEvents* This, - CHANGEKIND changeKind, - ITypeInfo *pTInfoAfter, - LPOLESTR pStrName); -void __RPC_STUB ITypeChangeEvents_AfterTypeChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ITypeChangeEvents_INTERFACE_DEFINED__ */ @@ -5109,39 +4487,40 @@ typedef struct IErrorInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IErrorInfo* This, + IErrorInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IErrorInfo* This); + IErrorInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IErrorInfo* This); + IErrorInfo *This); /*** IErrorInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetGUID)( - IErrorInfo* This, + IErrorInfo *This, GUID *pGUID); HRESULT (STDMETHODCALLTYPE *GetSource)( - IErrorInfo* This, + IErrorInfo *This, BSTR *pBstrSource); HRESULT (STDMETHODCALLTYPE *GetDescription)( - IErrorInfo* This, + IErrorInfo *This, BSTR *pBstrDescription); HRESULT (STDMETHODCALLTYPE *GetHelpFile)( - IErrorInfo* This, + IErrorInfo *This, BSTR *pBstrHelpFile); HRESULT (STDMETHODCALLTYPE *GetHelpContext)( - IErrorInfo* This, + IErrorInfo *This, DWORD *pdwHelpContext); END_INTERFACE } IErrorInfoVtbl; + interface IErrorInfo { CONST_VTBL IErrorInfoVtbl* lpVtbl; }; @@ -5190,46 +4569,6 @@ static FORCEINLINE HRESULT IErrorInfo_GetHelpContext(IErrorInfo* This,DWORD *pdw #endif -HRESULT STDMETHODCALLTYPE IErrorInfo_GetGUID_Proxy( - IErrorInfo* This, - GUID *pGUID); -void __RPC_STUB IErrorInfo_GetGUID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IErrorInfo_GetSource_Proxy( - IErrorInfo* This, - BSTR *pBstrSource); -void __RPC_STUB IErrorInfo_GetSource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IErrorInfo_GetDescription_Proxy( - IErrorInfo* This, - BSTR *pBstrDescription); -void __RPC_STUB IErrorInfo_GetDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IErrorInfo_GetHelpFile_Proxy( - IErrorInfo* This, - BSTR *pBstrHelpFile); -void __RPC_STUB IErrorInfo_GetHelpFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IErrorInfo_GetHelpContext_Proxy( - IErrorInfo* This, - DWORD *pdwHelpContext); -void __RPC_STUB IErrorInfo_GetHelpContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IErrorInfo_INTERFACE_DEFINED__ */ @@ -5272,39 +4611,40 @@ typedef struct ICreateErrorInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICreateErrorInfo* This, + ICreateErrorInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICreateErrorInfo* This); + ICreateErrorInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - ICreateErrorInfo* This); + ICreateErrorInfo *This); /*** ICreateErrorInfo methods ***/ HRESULT (STDMETHODCALLTYPE *SetGUID)( - ICreateErrorInfo* This, + ICreateErrorInfo *This, REFGUID rguid); HRESULT (STDMETHODCALLTYPE *SetSource)( - ICreateErrorInfo* This, + ICreateErrorInfo *This, LPOLESTR szSource); HRESULT (STDMETHODCALLTYPE *SetDescription)( - ICreateErrorInfo* This, + ICreateErrorInfo *This, LPOLESTR szDescription); HRESULT (STDMETHODCALLTYPE *SetHelpFile)( - ICreateErrorInfo* This, + ICreateErrorInfo *This, LPOLESTR szHelpFile); HRESULT (STDMETHODCALLTYPE *SetHelpContext)( - ICreateErrorInfo* This, + ICreateErrorInfo *This, DWORD dwHelpContext); END_INTERFACE } ICreateErrorInfoVtbl; + interface ICreateErrorInfo { CONST_VTBL ICreateErrorInfoVtbl* lpVtbl; }; @@ -5353,46 +4693,6 @@ static FORCEINLINE HRESULT ICreateErrorInfo_SetHelpContext(ICreateErrorInfo* Thi #endif -HRESULT STDMETHODCALLTYPE ICreateErrorInfo_SetGUID_Proxy( - ICreateErrorInfo* This, - REFGUID rguid); -void __RPC_STUB ICreateErrorInfo_SetGUID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateErrorInfo_SetSource_Proxy( - ICreateErrorInfo* This, - LPOLESTR szSource); -void __RPC_STUB ICreateErrorInfo_SetSource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateErrorInfo_SetDescription_Proxy( - ICreateErrorInfo* This, - LPOLESTR szDescription); -void __RPC_STUB ICreateErrorInfo_SetDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateErrorInfo_SetHelpFile_Proxy( - ICreateErrorInfo* This, - LPOLESTR szHelpFile); -void __RPC_STUB ICreateErrorInfo_SetHelpFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICreateErrorInfo_SetHelpContext_Proxy( - ICreateErrorInfo* This, - DWORD dwHelpContext); -void __RPC_STUB ICreateErrorInfo_SetHelpContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICreateErrorInfo_INTERFACE_DEFINED__ */ @@ -5423,23 +4723,24 @@ typedef struct ISupportErrorInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISupportErrorInfo* This, + ISupportErrorInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISupportErrorInfo* This); + ISupportErrorInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - ISupportErrorInfo* This); + ISupportErrorInfo *This); /*** ISupportErrorInfo methods ***/ HRESULT (STDMETHODCALLTYPE *InterfaceSupportsErrorInfo)( - ISupportErrorInfo* This, + ISupportErrorInfo *This, REFIID riid); END_INTERFACE } ISupportErrorInfoVtbl; + interface ISupportErrorInfo { CONST_VTBL ISupportErrorInfoVtbl* lpVtbl; }; @@ -5472,14 +4773,6 @@ static FORCEINLINE HRESULT ISupportErrorInfo_InterfaceSupportsErrorInfo(ISupport #endif -HRESULT STDMETHODCALLTYPE ISupportErrorInfo_InterfaceSupportsErrorInfo_Proxy( - ISupportErrorInfo* This, - REFIID riid); -void __RPC_STUB ISupportErrorInfo_InterfaceSupportsErrorInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISupportErrorInfo_INTERFACE_DEFINED__ */ @@ -5510,25 +4803,26 @@ typedef struct ITypeFactoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITypeFactory* This, + ITypeFactory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITypeFactory* This); + ITypeFactory *This); ULONG (STDMETHODCALLTYPE *Release)( - ITypeFactory* This); + ITypeFactory *This); /*** ITypeFactory methods ***/ HRESULT (STDMETHODCALLTYPE *CreateFromTypeInfo)( - ITypeFactory* This, + ITypeFactory *This, ITypeInfo *pTypeInfo, REFIID riid, IUnknown **ppv); END_INTERFACE } ITypeFactoryVtbl; + interface ITypeFactory { CONST_VTBL ITypeFactoryVtbl* lpVtbl; }; @@ -5561,16 +4855,6 @@ static FORCEINLINE HRESULT ITypeFactory_CreateFromTypeInfo(ITypeFactory* This,IT #endif -HRESULT STDMETHODCALLTYPE ITypeFactory_CreateFromTypeInfo_Proxy( - ITypeFactory* This, - ITypeInfo *pTypeInfo, - REFIID riid, - IUnknown **ppv); -void __RPC_STUB ITypeFactory_CreateFromTypeInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ITypeFactory_INTERFACE_DEFINED__ */ @@ -5620,26 +4904,26 @@ typedef struct ITypeMarshalVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITypeMarshal* This, + ITypeMarshal *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITypeMarshal* This); + ITypeMarshal *This); ULONG (STDMETHODCALLTYPE *Release)( - ITypeMarshal* This); + ITypeMarshal *This); /*** ITypeMarshal methods ***/ HRESULT (STDMETHODCALLTYPE *Size)( - ITypeMarshal* This, + ITypeMarshal *This, PVOID pvType, DWORD dwDestContext, PVOID pvDestContext, ULONG *pSize); HRESULT (STDMETHODCALLTYPE *Marshal)( - ITypeMarshal* This, + ITypeMarshal *This, PVOID pvType, DWORD dwDestContext, PVOID pvDestContext, @@ -5648,7 +4932,7 @@ typedef struct ITypeMarshalVtbl { ULONG *pcbWritten); HRESULT (STDMETHODCALLTYPE *Unmarshal)( - ITypeMarshal* This, + ITypeMarshal *This, PVOID pvType, DWORD dwFlags, ULONG cbBufferLength, @@ -5656,11 +4940,12 @@ typedef struct ITypeMarshalVtbl { ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Free)( - ITypeMarshal* This, + ITypeMarshal *This, PVOID pvType); END_INTERFACE } ITypeMarshalVtbl; + interface ITypeMarshal { CONST_VTBL ITypeMarshalVtbl* lpVtbl; }; @@ -5705,50 +4990,6 @@ static FORCEINLINE HRESULT ITypeMarshal_Free(ITypeMarshal* This,PVOID pvType) { #endif -HRESULT STDMETHODCALLTYPE ITypeMarshal_Size_Proxy( - ITypeMarshal* This, - PVOID pvType, - DWORD dwDestContext, - PVOID pvDestContext, - ULONG *pSize); -void __RPC_STUB ITypeMarshal_Size_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeMarshal_Marshal_Proxy( - ITypeMarshal* This, - PVOID pvType, - DWORD dwDestContext, - PVOID pvDestContext, - ULONG cbBufferLength, - BYTE *pBuffer, - ULONG *pcbWritten); -void __RPC_STUB ITypeMarshal_Marshal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeMarshal_Unmarshal_Proxy( - ITypeMarshal* This, - PVOID pvType, - DWORD dwFlags, - ULONG cbBufferLength, - BYTE *pBuffer, - ULONG *pcbRead); -void __RPC_STUB ITypeMarshal_Unmarshal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITypeMarshal_Free_Proxy( - ITypeMarshal* This, - PVOID pvType); -void __RPC_STUB ITypeMarshal_Free_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ITypeMarshal_INTERFACE_DEFINED__ */ @@ -5838,96 +5079,97 @@ typedef struct IRecordInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IRecordInfo* This, + IRecordInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IRecordInfo* This); + IRecordInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IRecordInfo* This); + IRecordInfo *This); /*** IRecordInfo methods ***/ HRESULT (STDMETHODCALLTYPE *RecordInit)( - IRecordInfo* This, + IRecordInfo *This, PVOID pvNew); HRESULT (STDMETHODCALLTYPE *RecordClear)( - IRecordInfo* This, + IRecordInfo *This, PVOID pvExisting); HRESULT (STDMETHODCALLTYPE *RecordCopy)( - IRecordInfo* This, + IRecordInfo *This, PVOID pvExisting, PVOID pvNew); HRESULT (STDMETHODCALLTYPE *GetGuid)( - IRecordInfo* This, + IRecordInfo *This, GUID *pguid); HRESULT (STDMETHODCALLTYPE *GetName)( - IRecordInfo* This, + IRecordInfo *This, BSTR *pbstrName); HRESULT (STDMETHODCALLTYPE *GetSize)( - IRecordInfo* This, + IRecordInfo *This, ULONG *pcbSize); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IRecordInfo* This, + IRecordInfo *This, ITypeInfo **ppTypeInfo); HRESULT (STDMETHODCALLTYPE *GetField)( - IRecordInfo* This, + IRecordInfo *This, PVOID pvData, LPCOLESTR szFieldName, VARIANT *pvarField); HRESULT (STDMETHODCALLTYPE *GetFieldNoCopy)( - IRecordInfo* This, + IRecordInfo *This, PVOID pvData, LPCOLESTR szFieldName, VARIANT *pvarField, PVOID *ppvDataCArray); HRESULT (STDMETHODCALLTYPE *PutField)( - IRecordInfo* This, + IRecordInfo *This, ULONG wFlags, PVOID pvData, LPCOLESTR szFieldName, VARIANT *pvarField); HRESULT (STDMETHODCALLTYPE *PutFieldNoCopy)( - IRecordInfo* This, + IRecordInfo *This, ULONG wFlags, PVOID pvData, LPCOLESTR szFieldName, VARIANT *pvarField); HRESULT (STDMETHODCALLTYPE *GetFieldNames)( - IRecordInfo* This, + IRecordInfo *This, ULONG *pcNames, BSTR *rgBstrNames); WINBOOL (STDMETHODCALLTYPE *IsMatchingType)( - IRecordInfo* This, + IRecordInfo *This, IRecordInfo *pRecordInfo); PVOID (STDMETHODCALLTYPE *RecordCreate)( - IRecordInfo* This); + IRecordInfo *This); HRESULT (STDMETHODCALLTYPE *RecordCreateCopy)( - IRecordInfo* This, + IRecordInfo *This, PVOID pvSource, PVOID *ppvDest); HRESULT (STDMETHODCALLTYPE *RecordDestroy)( - IRecordInfo* This, + IRecordInfo *This, PVOID pvRecord); END_INTERFACE } IRecordInfoVtbl; + interface IRecordInfo { CONST_VTBL IRecordInfoVtbl* lpVtbl; }; @@ -6020,147 +5262,6 @@ static FORCEINLINE HRESULT IRecordInfo_RecordDestroy(IRecordInfo* This,PVOID pvR #endif -HRESULT STDMETHODCALLTYPE IRecordInfo_RecordInit_Proxy( - IRecordInfo* This, - PVOID pvNew); -void __RPC_STUB IRecordInfo_RecordInit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRecordInfo_RecordClear_Proxy( - IRecordInfo* This, - PVOID pvExisting); -void __RPC_STUB IRecordInfo_RecordClear_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRecordInfo_RecordCopy_Proxy( - IRecordInfo* This, - PVOID pvExisting, - PVOID pvNew); -void __RPC_STUB IRecordInfo_RecordCopy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRecordInfo_GetGuid_Proxy( - IRecordInfo* This, - GUID *pguid); -void __RPC_STUB IRecordInfo_GetGuid_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRecordInfo_GetName_Proxy( - IRecordInfo* This, - BSTR *pbstrName); -void __RPC_STUB IRecordInfo_GetName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRecordInfo_GetSize_Proxy( - IRecordInfo* This, - ULONG *pcbSize); -void __RPC_STUB IRecordInfo_GetSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRecordInfo_GetTypeInfo_Proxy( - IRecordInfo* This, - ITypeInfo **ppTypeInfo); -void __RPC_STUB IRecordInfo_GetTypeInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRecordInfo_GetField_Proxy( - IRecordInfo* This, - PVOID pvData, - LPCOLESTR szFieldName, - VARIANT *pvarField); -void __RPC_STUB IRecordInfo_GetField_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRecordInfo_GetFieldNoCopy_Proxy( - IRecordInfo* This, - PVOID pvData, - LPCOLESTR szFieldName, - VARIANT *pvarField, - PVOID *ppvDataCArray); -void __RPC_STUB IRecordInfo_GetFieldNoCopy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRecordInfo_PutField_Proxy( - IRecordInfo* This, - ULONG wFlags, - PVOID pvData, - LPCOLESTR szFieldName, - VARIANT *pvarField); -void __RPC_STUB IRecordInfo_PutField_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRecordInfo_PutFieldNoCopy_Proxy( - IRecordInfo* This, - ULONG wFlags, - PVOID pvData, - LPCOLESTR szFieldName, - VARIANT *pvarField); -void __RPC_STUB IRecordInfo_PutFieldNoCopy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRecordInfo_GetFieldNames_Proxy( - IRecordInfo* This, - ULONG *pcNames, - BSTR *rgBstrNames); -void __RPC_STUB IRecordInfo_GetFieldNames_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -WINBOOL STDMETHODCALLTYPE IRecordInfo_IsMatchingType_Proxy( - IRecordInfo* This, - IRecordInfo *pRecordInfo); -void __RPC_STUB IRecordInfo_IsMatchingType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -PVOID STDMETHODCALLTYPE IRecordInfo_RecordCreate_Proxy( - IRecordInfo* This); -void __RPC_STUB IRecordInfo_RecordCreate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRecordInfo_RecordCreateCopy_Proxy( - IRecordInfo* This, - PVOID pvSource, - PVOID *ppvDest); -void __RPC_STUB IRecordInfo_RecordCreateCopy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRecordInfo_RecordDestroy_Proxy( - IRecordInfo* This, - PVOID pvRecord); -void __RPC_STUB IRecordInfo_RecordDestroy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IRecordInfo_INTERFACE_DEFINED__ */ @@ -6192,24 +5293,25 @@ typedef struct IErrorLogVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IErrorLog* This, + IErrorLog *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IErrorLog* This); + IErrorLog *This); ULONG (STDMETHODCALLTYPE *Release)( - IErrorLog* This); + IErrorLog *This); /*** IErrorLog methods ***/ HRESULT (STDMETHODCALLTYPE *AddError)( - IErrorLog* This, + IErrorLog *This, LPCOLESTR pszPropName, EXCEPINFO *pExcepInfo); END_INTERFACE } IErrorLogVtbl; + interface IErrorLog { CONST_VTBL IErrorLogVtbl* lpVtbl; }; @@ -6242,15 +5344,6 @@ static FORCEINLINE HRESULT IErrorLog_AddError(IErrorLog* This,LPCOLESTR pszPropN #endif -HRESULT STDMETHODCALLTYPE IErrorLog_AddError_Proxy( - IErrorLog* This, - LPCOLESTR pszPropName, - EXCEPINFO *pExcepInfo); -void __RPC_STUB IErrorLog_AddError_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IErrorLog_INTERFACE_DEFINED__ */ @@ -6287,30 +5380,31 @@ typedef struct IPropertyBagVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertyBag* This, + IPropertyBag *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertyBag* This); + IPropertyBag *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertyBag* This); + IPropertyBag *This); /*** IPropertyBag methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - IPropertyBag* This, + IPropertyBag *This, LPCOLESTR pszPropName, VARIANT *pVar, IErrorLog *pErrorLog); HRESULT (STDMETHODCALLTYPE *Write)( - IPropertyBag* This, + IPropertyBag *This, LPCOLESTR pszPropName, VARIANT *pVar); END_INTERFACE } IPropertyBagVtbl; + interface IPropertyBag { CONST_VTBL IPropertyBagVtbl* lpVtbl; }; @@ -6359,15 +5453,6 @@ void __RPC_STUB IPropertyBag_RemoteRead_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyBag_Write_Proxy( - IPropertyBag* This, - LPCOLESTR pszPropName, - VARIANT *pVar); -void __RPC_STUB IPropertyBag_Write_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IPropertyBag_Read_Proxy( IPropertyBag* This, LPCOLESTR pszPropName, diff --git a/lib/libc/include/any-windows-any/objectarray.h b/lib/libc/include/any-windows-any/objectarray.h index 6479948a7a..20a3781d13 100644 --- a/lib/libc/include/any-windows-any/objectarray.h +++ b/lib/libc/include/any-windows-any/objectarray.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/objectarray.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from include/objectarray.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/objidlbase.h b/lib/libc/include/any-windows-any/objidlbase.h index 3ac1aaeb10..4510c46b41 100644 --- a/lib/libc/include/any-windows-any/objidlbase.h +++ b/lib/libc/include/any-windows-any/objidlbase.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/objidlbase.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/objidlbase.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,261 +21,417 @@ #ifndef __IMarshal_FWD_DEFINED__ #define __IMarshal_FWD_DEFINED__ typedef interface IMarshal IMarshal; +#ifdef __cplusplus +interface IMarshal; +#endif /* __cplusplus */ #endif #ifndef __INoMarshal_FWD_DEFINED__ #define __INoMarshal_FWD_DEFINED__ typedef interface INoMarshal INoMarshal; +#ifdef __cplusplus +interface INoMarshal; +#endif /* __cplusplus */ #endif #ifndef __IAgileObject_FWD_DEFINED__ #define __IAgileObject_FWD_DEFINED__ typedef interface IAgileObject IAgileObject; +#ifdef __cplusplus +interface IAgileObject; +#endif /* __cplusplus */ #endif #ifndef __IAgileReference_FWD_DEFINED__ #define __IAgileReference_FWD_DEFINED__ typedef interface IAgileReference IAgileReference; +#ifdef __cplusplus +interface IAgileReference; +#endif /* __cplusplus */ #endif #ifndef __IMarshal2_FWD_DEFINED__ #define __IMarshal2_FWD_DEFINED__ typedef interface IMarshal2 IMarshal2; +#ifdef __cplusplus +interface IMarshal2; +#endif /* __cplusplus */ #endif #ifndef __IMalloc_FWD_DEFINED__ #define __IMalloc_FWD_DEFINED__ typedef interface IMalloc IMalloc; +#ifdef __cplusplus +interface IMalloc; +#endif /* __cplusplus */ #endif #ifndef __IStdMarshalInfo_FWD_DEFINED__ #define __IStdMarshalInfo_FWD_DEFINED__ typedef interface IStdMarshalInfo IStdMarshalInfo; +#ifdef __cplusplus +interface IStdMarshalInfo; +#endif /* __cplusplus */ #endif #ifndef __IExternalConnection_FWD_DEFINED__ #define __IExternalConnection_FWD_DEFINED__ typedef interface IExternalConnection IExternalConnection; +#ifdef __cplusplus +interface IExternalConnection; +#endif /* __cplusplus */ #endif #ifndef __IMultiQI_FWD_DEFINED__ #define __IMultiQI_FWD_DEFINED__ typedef interface IMultiQI IMultiQI; +#ifdef __cplusplus +interface IMultiQI; +#endif /* __cplusplus */ #endif #ifndef __AsyncIMultiQI_FWD_DEFINED__ #define __AsyncIMultiQI_FWD_DEFINED__ typedef interface AsyncIMultiQI AsyncIMultiQI; +#ifdef __cplusplus +interface AsyncIMultiQI; +#endif /* __cplusplus */ #endif #ifndef __IInternalUnknown_FWD_DEFINED__ #define __IInternalUnknown_FWD_DEFINED__ typedef interface IInternalUnknown IInternalUnknown; +#ifdef __cplusplus +interface IInternalUnknown; +#endif /* __cplusplus */ #endif #ifndef __IEnumUnknown_FWD_DEFINED__ #define __IEnumUnknown_FWD_DEFINED__ typedef interface IEnumUnknown IEnumUnknown; +#ifdef __cplusplus +interface IEnumUnknown; +#endif /* __cplusplus */ #endif #ifndef __IEnumString_FWD_DEFINED__ #define __IEnumString_FWD_DEFINED__ typedef interface IEnumString IEnumString; +#ifdef __cplusplus +interface IEnumString; +#endif /* __cplusplus */ #endif #ifndef __ISequentialStream_FWD_DEFINED__ #define __ISequentialStream_FWD_DEFINED__ typedef interface ISequentialStream ISequentialStream; +#ifdef __cplusplus +interface ISequentialStream; +#endif /* __cplusplus */ #endif #ifndef __IStream_FWD_DEFINED__ #define __IStream_FWD_DEFINED__ typedef interface IStream IStream; +#ifdef __cplusplus +interface IStream; +#endif /* __cplusplus */ #endif #ifndef __IRpcChannelBuffer_FWD_DEFINED__ #define __IRpcChannelBuffer_FWD_DEFINED__ typedef interface IRpcChannelBuffer IRpcChannelBuffer; +#ifdef __cplusplus +interface IRpcChannelBuffer; +#endif /* __cplusplus */ #endif #ifndef __IRpcChannelBuffer2_FWD_DEFINED__ #define __IRpcChannelBuffer2_FWD_DEFINED__ typedef interface IRpcChannelBuffer2 IRpcChannelBuffer2; +#ifdef __cplusplus +interface IRpcChannelBuffer2; +#endif /* __cplusplus */ #endif #ifndef __IAsyncRpcChannelBuffer_FWD_DEFINED__ #define __IAsyncRpcChannelBuffer_FWD_DEFINED__ typedef interface IAsyncRpcChannelBuffer IAsyncRpcChannelBuffer; +#ifdef __cplusplus +interface IAsyncRpcChannelBuffer; +#endif /* __cplusplus */ #endif #ifndef __IRpcChannelBuffer3_FWD_DEFINED__ #define __IRpcChannelBuffer3_FWD_DEFINED__ typedef interface IRpcChannelBuffer3 IRpcChannelBuffer3; +#ifdef __cplusplus +interface IRpcChannelBuffer3; +#endif /* __cplusplus */ #endif #ifndef __IRpcSyntaxNegotiate_FWD_DEFINED__ #define __IRpcSyntaxNegotiate_FWD_DEFINED__ typedef interface IRpcSyntaxNegotiate IRpcSyntaxNegotiate; +#ifdef __cplusplus +interface IRpcSyntaxNegotiate; +#endif /* __cplusplus */ #endif #ifndef __IRpcProxyBuffer_FWD_DEFINED__ #define __IRpcProxyBuffer_FWD_DEFINED__ typedef interface IRpcProxyBuffer IRpcProxyBuffer; +#ifdef __cplusplus +interface IRpcProxyBuffer; +#endif /* __cplusplus */ #endif #ifndef __IRpcStubBuffer_FWD_DEFINED__ #define __IRpcStubBuffer_FWD_DEFINED__ typedef interface IRpcStubBuffer IRpcStubBuffer; +#ifdef __cplusplus +interface IRpcStubBuffer; +#endif /* __cplusplus */ #endif #ifndef __IPSFactoryBuffer_FWD_DEFINED__ #define __IPSFactoryBuffer_FWD_DEFINED__ typedef interface IPSFactoryBuffer IPSFactoryBuffer; +#ifdef __cplusplus +interface IPSFactoryBuffer; +#endif /* __cplusplus */ #endif #ifndef __IChannelHook_FWD_DEFINED__ #define __IChannelHook_FWD_DEFINED__ typedef interface IChannelHook IChannelHook; +#ifdef __cplusplus +interface IChannelHook; +#endif /* __cplusplus */ #endif #ifndef __IClientSecurity_FWD_DEFINED__ #define __IClientSecurity_FWD_DEFINED__ typedef interface IClientSecurity IClientSecurity; +#ifdef __cplusplus +interface IClientSecurity; +#endif /* __cplusplus */ #endif #ifndef __IServerSecurity_FWD_DEFINED__ #define __IServerSecurity_FWD_DEFINED__ typedef interface IServerSecurity IServerSecurity; +#ifdef __cplusplus +interface IServerSecurity; +#endif /* __cplusplus */ #endif #ifndef __IRpcOptions_FWD_DEFINED__ #define __IRpcOptions_FWD_DEFINED__ typedef interface IRpcOptions IRpcOptions; +#ifdef __cplusplus +interface IRpcOptions; +#endif /* __cplusplus */ #endif #ifndef __IGlobalOptions_FWD_DEFINED__ #define __IGlobalOptions_FWD_DEFINED__ typedef interface IGlobalOptions IGlobalOptions; +#ifdef __cplusplus +interface IGlobalOptions; +#endif /* __cplusplus */ #endif #ifndef __ISurrogate_FWD_DEFINED__ #define __ISurrogate_FWD_DEFINED__ typedef interface ISurrogate ISurrogate; +#ifdef __cplusplus +interface ISurrogate; +#endif /* __cplusplus */ #endif #ifndef __IGlobalInterfaceTable_FWD_DEFINED__ #define __IGlobalInterfaceTable_FWD_DEFINED__ typedef interface IGlobalInterfaceTable IGlobalInterfaceTable; +#ifdef __cplusplus +interface IGlobalInterfaceTable; +#endif /* __cplusplus */ #endif #ifndef __ISynchronize_FWD_DEFINED__ #define __ISynchronize_FWD_DEFINED__ typedef interface ISynchronize ISynchronize; +#ifdef __cplusplus +interface ISynchronize; +#endif /* __cplusplus */ #endif #ifndef __ISynchronizeHandle_FWD_DEFINED__ #define __ISynchronizeHandle_FWD_DEFINED__ typedef interface ISynchronizeHandle ISynchronizeHandle; +#ifdef __cplusplus +interface ISynchronizeHandle; +#endif /* __cplusplus */ #endif #ifndef __ISynchronizeEvent_FWD_DEFINED__ #define __ISynchronizeEvent_FWD_DEFINED__ typedef interface ISynchronizeEvent ISynchronizeEvent; +#ifdef __cplusplus +interface ISynchronizeEvent; +#endif /* __cplusplus */ #endif #ifndef __ISynchronizeContainer_FWD_DEFINED__ #define __ISynchronizeContainer_FWD_DEFINED__ typedef interface ISynchronizeContainer ISynchronizeContainer; +#ifdef __cplusplus +interface ISynchronizeContainer; +#endif /* __cplusplus */ #endif #ifndef __ISynchronizeMutex_FWD_DEFINED__ #define __ISynchronizeMutex_FWD_DEFINED__ typedef interface ISynchronizeMutex ISynchronizeMutex; +#ifdef __cplusplus +interface ISynchronizeMutex; +#endif /* __cplusplus */ #endif #ifndef __ICancelMethodCalls_FWD_DEFINED__ #define __ICancelMethodCalls_FWD_DEFINED__ typedef interface ICancelMethodCalls ICancelMethodCalls; +#ifdef __cplusplus +interface ICancelMethodCalls; +#endif /* __cplusplus */ #endif #ifndef __IAsyncManager_FWD_DEFINED__ #define __IAsyncManager_FWD_DEFINED__ typedef interface IAsyncManager IAsyncManager; +#ifdef __cplusplus +interface IAsyncManager; +#endif /* __cplusplus */ #endif #ifndef __ICallFactory_FWD_DEFINED__ #define __ICallFactory_FWD_DEFINED__ typedef interface ICallFactory ICallFactory; +#ifdef __cplusplus +interface ICallFactory; +#endif /* __cplusplus */ #endif #ifndef __IRpcHelper_FWD_DEFINED__ #define __IRpcHelper_FWD_DEFINED__ typedef interface IRpcHelper IRpcHelper; +#ifdef __cplusplus +interface IRpcHelper; +#endif /* __cplusplus */ #endif #ifndef __IReleaseMarshalBuffers_FWD_DEFINED__ #define __IReleaseMarshalBuffers_FWD_DEFINED__ typedef interface IReleaseMarshalBuffers IReleaseMarshalBuffers; +#ifdef __cplusplus +interface IReleaseMarshalBuffers; +#endif /* __cplusplus */ #endif #ifndef __IWaitMultiple_FWD_DEFINED__ #define __IWaitMultiple_FWD_DEFINED__ typedef interface IWaitMultiple IWaitMultiple; +#ifdef __cplusplus +interface IWaitMultiple; +#endif /* __cplusplus */ #endif #ifndef __IAddrTrackingControl_FWD_DEFINED__ #define __IAddrTrackingControl_FWD_DEFINED__ typedef interface IAddrTrackingControl IAddrTrackingControl; +#ifdef __cplusplus +interface IAddrTrackingControl; +#endif /* __cplusplus */ #endif #ifndef __IAddrExclusionControl_FWD_DEFINED__ #define __IAddrExclusionControl_FWD_DEFINED__ typedef interface IAddrExclusionControl IAddrExclusionControl; +#ifdef __cplusplus +interface IAddrExclusionControl; +#endif /* __cplusplus */ #endif #ifndef __IPipeByte_FWD_DEFINED__ #define __IPipeByte_FWD_DEFINED__ typedef interface IPipeByte IPipeByte; +#ifdef __cplusplus +interface IPipeByte; +#endif /* __cplusplus */ #endif #ifndef __IPipeLong_FWD_DEFINED__ #define __IPipeLong_FWD_DEFINED__ typedef interface IPipeLong IPipeLong; +#ifdef __cplusplus +interface IPipeLong; +#endif /* __cplusplus */ #endif #ifndef __IPipeDouble_FWD_DEFINED__ #define __IPipeDouble_FWD_DEFINED__ typedef interface IPipeDouble IPipeDouble; +#ifdef __cplusplus +interface IPipeDouble; +#endif /* __cplusplus */ #endif #ifndef __IEnumContextProps_FWD_DEFINED__ #define __IEnumContextProps_FWD_DEFINED__ typedef interface IEnumContextProps IEnumContextProps; +#ifdef __cplusplus +interface IEnumContextProps; +#endif /* __cplusplus */ #endif #ifndef __IContext_FWD_DEFINED__ #define __IContext_FWD_DEFINED__ typedef interface IContext IContext; +#ifdef __cplusplus +interface IContext; +#endif /* __cplusplus */ #endif #ifndef __IComThreadingInfo_FWD_DEFINED__ #define __IComThreadingInfo_FWD_DEFINED__ typedef interface IComThreadingInfo IComThreadingInfo; +#ifdef __cplusplus +interface IComThreadingInfo; +#endif /* __cplusplus */ #endif #ifndef __IProcessInitControl_FWD_DEFINED__ #define __IProcessInitControl_FWD_DEFINED__ typedef interface IProcessInitControl IProcessInitControl; +#ifdef __cplusplus +interface IProcessInitControl; +#endif /* __cplusplus */ #endif #ifndef __IFastRundown_FWD_DEFINED__ #define __IFastRundown_FWD_DEFINED__ typedef interface IFastRundown IFastRundown; +#ifdef __cplusplus +interface IFastRundown; +#endif /* __cplusplus */ #endif #ifndef __IMarshalingStream_FWD_DEFINED__ #define __IMarshalingStream_FWD_DEFINED__ typedef interface IMarshalingStream IMarshalingStream; +#ifdef __cplusplus +interface IMarshalingStream; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -311,21 +468,25 @@ extern "C" { #ifndef __IStream_FWD_DEFINED__ #define __IStream_FWD_DEFINED__ typedef interface IStream IStream; +#ifdef __cplusplus +interface IStream; +#endif /* __cplusplus */ #endif #ifndef __IEnumString_FWD_DEFINED__ #define __IEnumString_FWD_DEFINED__ typedef interface IEnumString IEnumString; +#ifdef __cplusplus +interface IEnumString; +#endif /* __cplusplus */ #endif #ifndef __IMultiQI_FWD_DEFINED__ #define __IMultiQI_FWD_DEFINED__ typedef interface IMultiQI IMultiQI; -#endif - -#ifndef __AsyncIMultiQI_FWD_DEFINED__ -#define __AsyncIMultiQI_FWD_DEFINED__ -typedef interface AsyncIMultiQI AsyncIMultiQI; +#ifdef __cplusplus +interface IMultiQI; +#endif /* __cplusplus */ #endif #endif @@ -334,16 +495,25 @@ typedef interface AsyncIMultiQI AsyncIMultiQI; #ifndef __IAsyncManager_FWD_DEFINED__ #define __IAsyncManager_FWD_DEFINED__ typedef interface IAsyncManager IAsyncManager; +#ifdef __cplusplus +interface IAsyncManager; +#endif /* __cplusplus */ #endif #ifndef __ICallFactory_FWD_DEFINED__ #define __ICallFactory_FWD_DEFINED__ typedef interface ICallFactory ICallFactory; +#ifdef __cplusplus +interface ICallFactory; +#endif /* __cplusplus */ #endif #ifndef __ISynchronize_FWD_DEFINED__ #define __ISynchronize_FWD_DEFINED__ typedef interface ISynchronize ISynchronize; +#ifdef __cplusplus +interface ISynchronize; +#endif /* __cplusplus */ #endif #endif @@ -413,19 +583,19 @@ typedef struct IMarshalVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMarshal* This, + IMarshal *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMarshal* This); + IMarshal *This); ULONG (STDMETHODCALLTYPE *Release)( - IMarshal* This); + IMarshal *This); /*** IMarshal methods ***/ HRESULT (STDMETHODCALLTYPE *GetUnmarshalClass)( - IMarshal* This, + IMarshal *This, REFIID riid, void *pv, DWORD dwDestContext, @@ -434,7 +604,7 @@ typedef struct IMarshalVtbl { CLSID *pCid); HRESULT (STDMETHODCALLTYPE *GetMarshalSizeMax)( - IMarshal* This, + IMarshal *This, REFIID riid, void *pv, DWORD dwDestContext, @@ -443,7 +613,7 @@ typedef struct IMarshalVtbl { DWORD *pSize); HRESULT (STDMETHODCALLTYPE *MarshalInterface)( - IMarshal* This, + IMarshal *This, IStream *pStm, REFIID riid, void *pv, @@ -452,21 +622,22 @@ typedef struct IMarshalVtbl { DWORD mshlflags); HRESULT (STDMETHODCALLTYPE *UnmarshalInterface)( - IMarshal* This, + IMarshal *This, IStream *pStm, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *ReleaseMarshalData)( - IMarshal* This, + IMarshal *This, IStream *pStm); HRESULT (STDMETHODCALLTYPE *DisconnectObject)( - IMarshal* This, + IMarshal *This, DWORD dwReserved); END_INTERFACE } IMarshalVtbl; + interface IMarshal { CONST_VTBL IMarshalVtbl* lpVtbl; }; @@ -519,71 +690,6 @@ static FORCEINLINE HRESULT IMarshal_DisconnectObject(IMarshal* This,DWORD dwRese #endif -HRESULT STDMETHODCALLTYPE IMarshal_GetUnmarshalClass_Proxy( - IMarshal* This, - REFIID riid, - void *pv, - DWORD dwDestContext, - void *pvDestContext, - DWORD mshlflags, - CLSID *pCid); -void __RPC_STUB IMarshal_GetUnmarshalClass_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMarshal_GetMarshalSizeMax_Proxy( - IMarshal* This, - REFIID riid, - void *pv, - DWORD dwDestContext, - void *pvDestContext, - DWORD mshlflags, - DWORD *pSize); -void __RPC_STUB IMarshal_GetMarshalSizeMax_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMarshal_MarshalInterface_Proxy( - IMarshal* This, - IStream *pStm, - REFIID riid, - void *pv, - DWORD dwDestContext, - void *pvDestContext, - DWORD mshlflags); -void __RPC_STUB IMarshal_MarshalInterface_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMarshal_UnmarshalInterface_Proxy( - IMarshal* This, - IStream *pStm, - REFIID riid, - void **ppv); -void __RPC_STUB IMarshal_UnmarshalInterface_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMarshal_ReleaseMarshalData_Proxy( - IMarshal* This, - IStream *pStm); -void __RPC_STUB IMarshal_ReleaseMarshalData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMarshal_DisconnectObject_Proxy( - IMarshal* This, - DWORD dwReserved); -void __RPC_STUB IMarshal_DisconnectObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMarshal_INTERFACE_DEFINED__ */ @@ -609,18 +715,19 @@ typedef struct INoMarshalVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INoMarshal* This, + INoMarshal *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INoMarshal* This); + INoMarshal *This); ULONG (STDMETHODCALLTYPE *Release)( - INoMarshal* This); + INoMarshal *This); END_INTERFACE } INoMarshalVtbl; + interface INoMarshal { CONST_VTBL INoMarshalVtbl* lpVtbl; }; @@ -672,18 +779,19 @@ typedef struct IAgileObjectVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAgileObject* This, + IAgileObject *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAgileObject* This); + IAgileObject *This); ULONG (STDMETHODCALLTYPE *Release)( - IAgileObject* This); + IAgileObject *This); END_INTERFACE } IAgileObjectVtbl; + interface IAgileObject { CONST_VTBL IAgileObjectVtbl* lpVtbl; }; @@ -738,24 +846,25 @@ typedef struct IAgileReferenceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAgileReference* This, + IAgileReference *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAgileReference* This); + IAgileReference *This); ULONG (STDMETHODCALLTYPE *Release)( - IAgileReference* This); + IAgileReference *This); /*** IAgileReference methods ***/ HRESULT (STDMETHODCALLTYPE *Resolve)( - IAgileReference* This, + IAgileReference *This, REFIID riid, void **ppv); END_INTERFACE } IAgileReferenceVtbl; + interface IAgileReference { CONST_VTBL IAgileReferenceVtbl* lpVtbl; }; @@ -788,15 +897,6 @@ static FORCEINLINE HRESULT IAgileReference_Resolve(IAgileReference* This,REFIID #endif -HRESULT STDMETHODCALLTYPE IAgileReference_Resolve_Proxy( - IAgileReference* This, - REFIID riid, - void **ppv); -void __RPC_STUB IAgileReference_Resolve_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAgileReference_INTERFACE_DEFINED__ */ @@ -825,19 +925,19 @@ typedef struct IMarshal2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMarshal2* This, + IMarshal2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMarshal2* This); + IMarshal2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IMarshal2* This); + IMarshal2 *This); /*** IMarshal methods ***/ HRESULT (STDMETHODCALLTYPE *GetUnmarshalClass)( - IMarshal2* This, + IMarshal2 *This, REFIID riid, void *pv, DWORD dwDestContext, @@ -846,7 +946,7 @@ typedef struct IMarshal2Vtbl { CLSID *pCid); HRESULT (STDMETHODCALLTYPE *GetMarshalSizeMax)( - IMarshal2* This, + IMarshal2 *This, REFIID riid, void *pv, DWORD dwDestContext, @@ -855,7 +955,7 @@ typedef struct IMarshal2Vtbl { DWORD *pSize); HRESULT (STDMETHODCALLTYPE *MarshalInterface)( - IMarshal2* This, + IMarshal2 *This, IStream *pStm, REFIID riid, void *pv, @@ -864,21 +964,22 @@ typedef struct IMarshal2Vtbl { DWORD mshlflags); HRESULT (STDMETHODCALLTYPE *UnmarshalInterface)( - IMarshal2* This, + IMarshal2 *This, IStream *pStm, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *ReleaseMarshalData)( - IMarshal2* This, + IMarshal2 *This, IStream *pStm); HRESULT (STDMETHODCALLTYPE *DisconnectObject)( - IMarshal2* This, + IMarshal2 *This, DWORD dwReserved); END_INTERFACE } IMarshal2Vtbl; + interface IMarshal2 { CONST_VTBL IMarshal2Vtbl* lpVtbl; }; @@ -977,43 +1078,44 @@ typedef struct IMallocVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMalloc* This, + IMalloc *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMalloc* This); + IMalloc *This); ULONG (STDMETHODCALLTYPE *Release)( - IMalloc* This); + IMalloc *This); /*** IMalloc methods ***/ void * (STDMETHODCALLTYPE *Alloc)( - IMalloc* This, + IMalloc *This, SIZE_T cb); void * (STDMETHODCALLTYPE *Realloc)( - IMalloc* This, + IMalloc *This, void *pv, SIZE_T cb); void (STDMETHODCALLTYPE *Free)( - IMalloc* This, + IMalloc *This, void *pv); SIZE_T (STDMETHODCALLTYPE *GetSize)( - IMalloc* This, + IMalloc *This, void *pv); int (STDMETHODCALLTYPE *DidAlloc)( - IMalloc* This, + IMalloc *This, void *pv); void (STDMETHODCALLTYPE *HeapMinimize)( - IMalloc* This); + IMalloc *This); END_INTERFACE } IMallocVtbl; + interface IMalloc { CONST_VTBL IMallocVtbl* lpVtbl; }; @@ -1066,54 +1168,6 @@ static FORCEINLINE void IMalloc_HeapMinimize(IMalloc* This) { #endif -void * STDMETHODCALLTYPE IMalloc_Alloc_Proxy( - IMalloc* This, - SIZE_T cb); -void __RPC_STUB IMalloc_Alloc_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -void * STDMETHODCALLTYPE IMalloc_Realloc_Proxy( - IMalloc* This, - void *pv, - SIZE_T cb); -void __RPC_STUB IMalloc_Realloc_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -void STDMETHODCALLTYPE IMalloc_Free_Proxy( - IMalloc* This, - void *pv); -void __RPC_STUB IMalloc_Free_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -SIZE_T STDMETHODCALLTYPE IMalloc_GetSize_Proxy( - IMalloc* This, - void *pv); -void __RPC_STUB IMalloc_GetSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -int STDMETHODCALLTYPE IMalloc_DidAlloc_Proxy( - IMalloc* This, - void *pv); -void __RPC_STUB IMalloc_DidAlloc_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -void STDMETHODCALLTYPE IMalloc_HeapMinimize_Proxy( - IMalloc* This); -void __RPC_STUB IMalloc_HeapMinimize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMalloc_INTERFACE_DEFINED__ */ @@ -1146,25 +1200,26 @@ typedef struct IStdMarshalInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IStdMarshalInfo* This, + IStdMarshalInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IStdMarshalInfo* This); + IStdMarshalInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IStdMarshalInfo* This); + IStdMarshalInfo *This); /*** IStdMarshalInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetClassForHandler)( - IStdMarshalInfo* This, + IStdMarshalInfo *This, DWORD dwDestContext, void *pvDestContext, CLSID *pClsid); END_INTERFACE } IStdMarshalInfoVtbl; + interface IStdMarshalInfo { CONST_VTBL IStdMarshalInfoVtbl* lpVtbl; }; @@ -1197,16 +1252,6 @@ static FORCEINLINE HRESULT IStdMarshalInfo_GetClassForHandler(IStdMarshalInfo* T #endif -HRESULT STDMETHODCALLTYPE IStdMarshalInfo_GetClassForHandler_Proxy( - IStdMarshalInfo* This, - DWORD dwDestContext, - void *pvDestContext, - CLSID *pClsid); -void __RPC_STUB IStdMarshalInfo_GetClassForHandler_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IStdMarshalInfo_INTERFACE_DEFINED__ */ @@ -1249,30 +1294,31 @@ typedef struct IExternalConnectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IExternalConnection* This, + IExternalConnection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IExternalConnection* This); + IExternalConnection *This); ULONG (STDMETHODCALLTYPE *Release)( - IExternalConnection* This); + IExternalConnection *This); /*** IExternalConnection methods ***/ DWORD (STDMETHODCALLTYPE *AddConnection)( - IExternalConnection* This, + IExternalConnection *This, DWORD extconn, DWORD reserved); DWORD (STDMETHODCALLTYPE *ReleaseConnection)( - IExternalConnection* This, + IExternalConnection *This, DWORD extconn, DWORD reserved, WINBOOL fLastReleaseCloses); END_INTERFACE } IExternalConnectionVtbl; + interface IExternalConnection { CONST_VTBL IExternalConnectionVtbl* lpVtbl; }; @@ -1309,25 +1355,6 @@ static FORCEINLINE DWORD IExternalConnection_ReleaseConnection(IExternalConnecti #endif -DWORD STDMETHODCALLTYPE IExternalConnection_AddConnection_Proxy( - IExternalConnection* This, - DWORD extconn, - DWORD reserved); -void __RPC_STUB IExternalConnection_AddConnection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -DWORD STDMETHODCALLTYPE IExternalConnection_ReleaseConnection_Proxy( - IExternalConnection* This, - DWORD extconn, - DWORD reserved, - WINBOOL fLastReleaseCloses); -void __RPC_STUB IExternalConnection_ReleaseConnection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IExternalConnection_INTERFACE_DEFINED__ */ @@ -1367,24 +1394,25 @@ typedef struct IMultiQIVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMultiQI* This, + IMultiQI *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMultiQI* This); + IMultiQI *This); ULONG (STDMETHODCALLTYPE *Release)( - IMultiQI* This); + IMultiQI *This); /*** IMultiQI methods ***/ HRESULT (STDMETHODCALLTYPE *QueryMultipleInterfaces)( - IMultiQI* This, + IMultiQI *This, ULONG cMQIs, MULTI_QI *pMQIs); END_INTERFACE } IMultiQIVtbl; + interface IMultiQI { CONST_VTBL IMultiQIVtbl* lpVtbl; }; @@ -1417,15 +1445,6 @@ static FORCEINLINE HRESULT IMultiQI_QueryMultipleInterfaces(IMultiQI* This,ULONG #endif -HRESULT STDMETHODCALLTYPE IMultiQI_QueryMultipleInterfaces_Proxy( - IMultiQI* This, - ULONG cMQIs, - MULTI_QI *pMQIs); -void __RPC_STUB IMultiQI_QueryMultipleInterfaces_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMultiQI_INTERFACE_DEFINED__ */ @@ -1440,7 +1459,7 @@ DEFINE_GUID(IID_AsyncIMultiQI, 0x000e0020, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00, MIDL_INTERFACE("000e0020-0000-0000-c000-000000000046") AsyncIMultiQI : public IUnknown { - virtual void STDMETHODCALLTYPE Begin_QueryMultipleInterfaces( + virtual HRESULT STDMETHODCALLTYPE Begin_QueryMultipleInterfaces( ULONG cMQIs, MULTI_QI *pMQIs) = 0; @@ -1457,28 +1476,29 @@ typedef struct AsyncIMultiQIVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - AsyncIMultiQI* This, + AsyncIMultiQI *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - AsyncIMultiQI* This); + AsyncIMultiQI *This); ULONG (STDMETHODCALLTYPE *Release)( - AsyncIMultiQI* This); + AsyncIMultiQI *This); - /*** IMultiQI methods ***/ - void (STDMETHODCALLTYPE *Begin_QueryMultipleInterfaces)( - AsyncIMultiQI* This, + /*** AsyncIMultiQI methods ***/ + HRESULT (STDMETHODCALLTYPE *Begin_QueryMultipleInterfaces)( + AsyncIMultiQI *This, ULONG cMQIs, MULTI_QI *pMQIs); HRESULT (STDMETHODCALLTYPE *Finish_QueryMultipleInterfaces)( - AsyncIMultiQI* This, + AsyncIMultiQI *This, MULTI_QI *pMQIs); END_INTERFACE } AsyncIMultiQIVtbl; + interface AsyncIMultiQI { CONST_VTBL AsyncIMultiQIVtbl* lpVtbl; }; @@ -1489,7 +1509,7 @@ interface AsyncIMultiQI { #define AsyncIMultiQI_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) #define AsyncIMultiQI_AddRef(This) (This)->lpVtbl->AddRef(This) #define AsyncIMultiQI_Release(This) (This)->lpVtbl->Release(This) -/*** IMultiQI methods ***/ +/*** AsyncIMultiQI methods ***/ #define AsyncIMultiQI_Begin_QueryMultipleInterfaces(This,cMQIs,pMQIs) (This)->lpVtbl->Begin_QueryMultipleInterfaces(This,cMQIs,pMQIs) #define AsyncIMultiQI_Finish_QueryMultipleInterfaces(This,pMQIs) (This)->lpVtbl->Finish_QueryMultipleInterfaces(This,pMQIs) #else @@ -1503,36 +1523,18 @@ static FORCEINLINE ULONG AsyncIMultiQI_AddRef(AsyncIMultiQI* This) { static FORCEINLINE ULONG AsyncIMultiQI_Release(AsyncIMultiQI* This) { return This->lpVtbl->Release(This); } -/*** IMultiQI methods ***/ -static FORCEINLINE void Begin_AsyncIMultiQI_QueryMultipleInterfaces(AsyncIMultiQI* This,ULONG cMQIs,MULTI_QI *pMQIs) { - This->lpVtbl->Begin_QueryMultipleInterfaces(This,cMQIs,pMQIs); +/*** AsyncIMultiQI methods ***/ +static FORCEINLINE HRESULT AsyncIMultiQI_Begin_QueryMultipleInterfaces(AsyncIMultiQI* This,ULONG cMQIs,MULTI_QI *pMQIs) { + return This->lpVtbl->Begin_QueryMultipleInterfaces(This,cMQIs,pMQIs); } -static FORCEINLINE HRESULT Finish_AsyncIMultiQI_QueryMultipleInterfaces(AsyncIMultiQI* This,MULTI_QI *pMQIs) { - return This->lpVtbl->Finish_QueryMultipleInterfaces(This); +static FORCEINLINE HRESULT AsyncIMultiQI_Finish_QueryMultipleInterfaces(AsyncIMultiQI* This,MULTI_QI *pMQIs) { + return This->lpVtbl->Finish_QueryMultipleInterfaces(This,pMQIs); } #endif #endif #endif -HRESULT STDMETHODCALLTYPE AsyncIMultiQI_Begin_QueryMultipleInterfaces_Proxy( - IMultiQI* This, - ULONG cMQIs, - MULTI_QI *pMQIs); -void __RPC_STUB AsyncIMultiQI_Begin_QueryMultipleInterfaces_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE AsyncIMultiQI_Finish_QueryMultipleInterfaces_Proxy( - IMultiQI* This, - ULONG cMQIs, - MULTI_QI *pMQIs); -void __RPC_STUB AsyncIMultiQI_Finish_QueryMultipleInterfaces_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __AsyncIMultiQI_INTERFACE_DEFINED__ */ @@ -1564,24 +1566,25 @@ typedef struct IInternalUnknownVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInternalUnknown* This, + IInternalUnknown *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInternalUnknown* This); + IInternalUnknown *This); ULONG (STDMETHODCALLTYPE *Release)( - IInternalUnknown* This); + IInternalUnknown *This); /*** IInternalUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInternalInterface)( - IInternalUnknown* This, + IInternalUnknown *This, REFIID riid, void **ppv); END_INTERFACE } IInternalUnknownVtbl; + interface IInternalUnknown { CONST_VTBL IInternalUnknownVtbl* lpVtbl; }; @@ -1614,15 +1617,6 @@ static FORCEINLINE HRESULT IInternalUnknown_QueryInternalInterface(IInternalUnkn #endif -HRESULT STDMETHODCALLTYPE IInternalUnknown_QueryInternalInterface_Proxy( - IInternalUnknown* This, - REFIID riid, - void **ppv); -void __RPC_STUB IInternalUnknown_QueryInternalInterface_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInternalUnknown_INTERFACE_DEFINED__ */ @@ -1666,36 +1660,37 @@ typedef struct IEnumUnknownVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumUnknown* This, + IEnumUnknown *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumUnknown* This); + IEnumUnknown *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumUnknown* This); + IEnumUnknown *This); /*** IEnumUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumUnknown* This, + IEnumUnknown *This, ULONG celt, IUnknown **rgelt, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumUnknown* This, + IEnumUnknown *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumUnknown* This); + IEnumUnknown *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumUnknown* This, + IEnumUnknown *This, IEnumUnknown **ppenum); END_INTERFACE } IEnumUnknownVtbl; + interface IEnumUnknown { CONST_VTBL IEnumUnknownVtbl* lpVtbl; }; @@ -1750,29 +1745,6 @@ void __RPC_STUB IEnumUnknown_RemoteNext_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumUnknown_Skip_Proxy( - IEnumUnknown* This, - ULONG celt); -void __RPC_STUB IEnumUnknown_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumUnknown_Reset_Proxy( - IEnumUnknown* This); -void __RPC_STUB IEnumUnknown_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumUnknown_Clone_Proxy( - IEnumUnknown* This, - IEnumUnknown **ppenum); -void __RPC_STUB IEnumUnknown_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IEnumUnknown_Next_Proxy( IEnumUnknown* This, ULONG celt, @@ -1824,36 +1796,37 @@ typedef struct IEnumStringVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumString* This, + IEnumString *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumString* This); + IEnumString *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumString* This); + IEnumString *This); /*** IEnumString methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumString* This, + IEnumString *This, ULONG celt, LPOLESTR *rgelt, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumString* This, + IEnumString *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumString* This); + IEnumString *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumString* This, + IEnumString *This, IEnumString **ppenum); END_INTERFACE } IEnumStringVtbl; + interface IEnumString { CONST_VTBL IEnumStringVtbl* lpVtbl; }; @@ -1908,29 +1881,6 @@ void __RPC_STUB IEnumString_RemoteNext_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumString_Skip_Proxy( - IEnumString* This, - ULONG celt); -void __RPC_STUB IEnumString_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumString_Reset_Proxy( - IEnumString* This); -void __RPC_STUB IEnumString_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumString_Clone_Proxy( - IEnumString* This, - IEnumString **ppenum); -void __RPC_STUB IEnumString_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IEnumString_Next_Proxy( IEnumString* This, ULONG celt, @@ -1976,31 +1926,32 @@ typedef struct ISequentialStreamVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISequentialStream* This, + ISequentialStream *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISequentialStream* This); + ISequentialStream *This); ULONG (STDMETHODCALLTYPE *Release)( - ISequentialStream* This); + ISequentialStream *This); /*** ISequentialStream methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - ISequentialStream* This, + ISequentialStream *This, void *pv, ULONG cb, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISequentialStream* This, + ISequentialStream *This, const void *pv, ULONG cb, ULONG *pcbWritten); END_INTERFACE } ISequentialStreamVtbl; + interface ISequentialStream { CONST_VTBL ISequentialStreamVtbl* lpVtbl; }; @@ -2174,77 +2125,78 @@ typedef struct IStreamVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IStream* This, + IStream *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IStream* This); + IStream *This); ULONG (STDMETHODCALLTYPE *Release)( - IStream* This); + IStream *This); /*** ISequentialStream methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - IStream* This, + IStream *This, void *pv, ULONG cb, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Write)( - IStream* This, + IStream *This, const void *pv, ULONG cb, ULONG *pcbWritten); /*** IStream methods ***/ HRESULT (STDMETHODCALLTYPE *Seek)( - IStream* This, + IStream *This, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition); HRESULT (STDMETHODCALLTYPE *SetSize)( - IStream* This, + IStream *This, ULARGE_INTEGER libNewSize); HRESULT (STDMETHODCALLTYPE *CopyTo)( - IStream* This, + IStream *This, IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten); HRESULT (STDMETHODCALLTYPE *Commit)( - IStream* This, + IStream *This, DWORD grfCommitFlags); HRESULT (STDMETHODCALLTYPE *Revert)( - IStream* This); + IStream *This); HRESULT (STDMETHODCALLTYPE *LockRegion)( - IStream* This, + IStream *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *UnlockRegion)( - IStream* This, + IStream *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *Stat)( - IStream* This, + IStream *This, STATSTG *pstatstg, DWORD grfStatFlag); HRESULT (STDMETHODCALLTYPE *Clone)( - IStream* This, + IStream *This, IStream **ppstm); END_INTERFACE } IStreamVtbl; + interface IStream { CONST_VTBL IStreamVtbl* lpVtbl; }; @@ -2329,14 +2281,6 @@ void __RPC_STUB IStream_RemoteSeek_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IStream_SetSize_Proxy( - IStream* This, - ULARGE_INTEGER libNewSize); -void __RPC_STUB IStream_SetSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE IStream_RemoteCopyTo_Proxy( IStream* This, IStream *pstm, @@ -2348,58 +2292,6 @@ void __RPC_STUB IStream_RemoteCopyTo_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IStream_Commit_Proxy( - IStream* This, - DWORD grfCommitFlags); -void __RPC_STUB IStream_Commit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IStream_Revert_Proxy( - IStream* This); -void __RPC_STUB IStream_Revert_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IStream_LockRegion_Proxy( - IStream* This, - ULARGE_INTEGER libOffset, - ULARGE_INTEGER cb, - DWORD dwLockType); -void __RPC_STUB IStream_LockRegion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IStream_UnlockRegion_Proxy( - IStream* This, - ULARGE_INTEGER libOffset, - ULARGE_INTEGER cb, - DWORD dwLockType); -void __RPC_STUB IStream_UnlockRegion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IStream_Stat_Proxy( - IStream* This, - STATSTG *pstatstg, - DWORD grfStatFlag); -void __RPC_STUB IStream_Stat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IStream_Clone_Proxy( - IStream* This, - IStream **ppstm); -void __RPC_STUB IStream_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IStream_Seek_Proxy( IStream* This, LARGE_INTEGER dlibMove, @@ -2479,41 +2371,42 @@ typedef struct IRpcChannelBufferVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IRpcChannelBuffer* This, + IRpcChannelBuffer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IRpcChannelBuffer* This); + IRpcChannelBuffer *This); ULONG (STDMETHODCALLTYPE *Release)( - IRpcChannelBuffer* This); + IRpcChannelBuffer *This); /*** IRpcChannelBuffer methods ***/ HRESULT (STDMETHODCALLTYPE *GetBuffer)( - IRpcChannelBuffer* This, + IRpcChannelBuffer *This, RPCOLEMESSAGE *pMessage, REFIID riid); HRESULT (STDMETHODCALLTYPE *SendReceive)( - IRpcChannelBuffer* This, + IRpcChannelBuffer *This, RPCOLEMESSAGE *pMessage, ULONG *pStatus); HRESULT (STDMETHODCALLTYPE *FreeBuffer)( - IRpcChannelBuffer* This, + IRpcChannelBuffer *This, RPCOLEMESSAGE *pMessage); HRESULT (STDMETHODCALLTYPE *GetDestCtx)( - IRpcChannelBuffer* This, + IRpcChannelBuffer *This, DWORD *pdwDestContext, void **ppvDestContext); HRESULT (STDMETHODCALLTYPE *IsConnected)( - IRpcChannelBuffer* This); + IRpcChannelBuffer *This); END_INTERFACE } IRpcChannelBufferVtbl; + interface IRpcChannelBuffer { CONST_VTBL IRpcChannelBufferVtbl* lpVtbl; }; @@ -2562,48 +2455,6 @@ static FORCEINLINE HRESULT IRpcChannelBuffer_IsConnected(IRpcChannelBuffer* This #endif -HRESULT STDMETHODCALLTYPE IRpcChannelBuffer_GetBuffer_Proxy( - IRpcChannelBuffer* This, - RPCOLEMESSAGE *pMessage, - REFIID riid); -void __RPC_STUB IRpcChannelBuffer_GetBuffer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRpcChannelBuffer_SendReceive_Proxy( - IRpcChannelBuffer* This, - RPCOLEMESSAGE *pMessage, - ULONG *pStatus); -void __RPC_STUB IRpcChannelBuffer_SendReceive_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRpcChannelBuffer_FreeBuffer_Proxy( - IRpcChannelBuffer* This, - RPCOLEMESSAGE *pMessage); -void __RPC_STUB IRpcChannelBuffer_FreeBuffer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRpcChannelBuffer_GetDestCtx_Proxy( - IRpcChannelBuffer* This, - DWORD *pdwDestContext, - void **ppvDestContext); -void __RPC_STUB IRpcChannelBuffer_GetDestCtx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRpcChannelBuffer_IsConnected_Proxy( - IRpcChannelBuffer* This); -void __RPC_STUB IRpcChannelBuffer_IsConnected_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IRpcChannelBuffer_INTERFACE_DEFINED__ */ @@ -2634,46 +2485,47 @@ typedef struct IRpcChannelBuffer2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IRpcChannelBuffer2* This, + IRpcChannelBuffer2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IRpcChannelBuffer2* This); + IRpcChannelBuffer2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IRpcChannelBuffer2* This); + IRpcChannelBuffer2 *This); /*** IRpcChannelBuffer methods ***/ HRESULT (STDMETHODCALLTYPE *GetBuffer)( - IRpcChannelBuffer2* This, + IRpcChannelBuffer2 *This, RPCOLEMESSAGE *pMessage, REFIID riid); HRESULT (STDMETHODCALLTYPE *SendReceive)( - IRpcChannelBuffer2* This, + IRpcChannelBuffer2 *This, RPCOLEMESSAGE *pMessage, ULONG *pStatus); HRESULT (STDMETHODCALLTYPE *FreeBuffer)( - IRpcChannelBuffer2* This, + IRpcChannelBuffer2 *This, RPCOLEMESSAGE *pMessage); HRESULT (STDMETHODCALLTYPE *GetDestCtx)( - IRpcChannelBuffer2* This, + IRpcChannelBuffer2 *This, DWORD *pdwDestContext, void **ppvDestContext); HRESULT (STDMETHODCALLTYPE *IsConnected)( - IRpcChannelBuffer2* This); + IRpcChannelBuffer2 *This); /*** IRpcChannelBuffer2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetProtocolVersion)( - IRpcChannelBuffer2* This, + IRpcChannelBuffer2 *This, DWORD *pdwVersion); END_INTERFACE } IRpcChannelBuffer2Vtbl; + interface IRpcChannelBuffer2 { CONST_VTBL IRpcChannelBuffer2Vtbl* lpVtbl; }; @@ -2728,14 +2580,6 @@ static FORCEINLINE HRESULT IRpcChannelBuffer2_GetProtocolVersion(IRpcChannelBuff #endif -HRESULT STDMETHODCALLTYPE IRpcChannelBuffer2_GetProtocolVersion_Proxy( - IRpcChannelBuffer2* This, - DWORD *pdwVersion); -void __RPC_STUB IRpcChannelBuffer2_GetProtocolVersion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IRpcChannelBuffer2_INTERFACE_DEFINED__ */ @@ -2775,64 +2619,65 @@ typedef struct IAsyncRpcChannelBufferVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAsyncRpcChannelBuffer* This, + IAsyncRpcChannelBuffer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAsyncRpcChannelBuffer* This); + IAsyncRpcChannelBuffer *This); ULONG (STDMETHODCALLTYPE *Release)( - IAsyncRpcChannelBuffer* This); + IAsyncRpcChannelBuffer *This); /*** IRpcChannelBuffer methods ***/ HRESULT (STDMETHODCALLTYPE *GetBuffer)( - IAsyncRpcChannelBuffer* This, + IAsyncRpcChannelBuffer *This, RPCOLEMESSAGE *pMessage, REFIID riid); HRESULT (STDMETHODCALLTYPE *SendReceive)( - IAsyncRpcChannelBuffer* This, + IAsyncRpcChannelBuffer *This, RPCOLEMESSAGE *pMessage, ULONG *pStatus); HRESULT (STDMETHODCALLTYPE *FreeBuffer)( - IAsyncRpcChannelBuffer* This, + IAsyncRpcChannelBuffer *This, RPCOLEMESSAGE *pMessage); HRESULT (STDMETHODCALLTYPE *GetDestCtx)( - IAsyncRpcChannelBuffer* This, + IAsyncRpcChannelBuffer *This, DWORD *pdwDestContext, void **ppvDestContext); HRESULT (STDMETHODCALLTYPE *IsConnected)( - IAsyncRpcChannelBuffer* This); + IAsyncRpcChannelBuffer *This); /*** IRpcChannelBuffer2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetProtocolVersion)( - IAsyncRpcChannelBuffer* This, + IAsyncRpcChannelBuffer *This, DWORD *pdwVersion); /*** IAsyncRpcChannelBuffer methods ***/ HRESULT (STDMETHODCALLTYPE *Send)( - IAsyncRpcChannelBuffer* This, + IAsyncRpcChannelBuffer *This, RPCOLEMESSAGE *pMsg, ISynchronize *pSync, ULONG *pulStatus); HRESULT (STDMETHODCALLTYPE *Receive)( - IAsyncRpcChannelBuffer* This, + IAsyncRpcChannelBuffer *This, RPCOLEMESSAGE *pMsg, ULONG *pulStatus); HRESULT (STDMETHODCALLTYPE *GetDestCtxEx)( - IAsyncRpcChannelBuffer* This, + IAsyncRpcChannelBuffer *This, RPCOLEMESSAGE *pMsg, DWORD *pdwDestContext, void **ppvDestContext); END_INTERFACE } IAsyncRpcChannelBufferVtbl; + interface IAsyncRpcChannelBuffer { CONST_VTBL IAsyncRpcChannelBufferVtbl* lpVtbl; }; @@ -2901,35 +2746,6 @@ static FORCEINLINE HRESULT IAsyncRpcChannelBuffer_GetDestCtxEx(IAsyncRpcChannelB #endif -HRESULT STDMETHODCALLTYPE IAsyncRpcChannelBuffer_Send_Proxy( - IAsyncRpcChannelBuffer* This, - RPCOLEMESSAGE *pMsg, - ISynchronize *pSync, - ULONG *pulStatus); -void __RPC_STUB IAsyncRpcChannelBuffer_Send_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAsyncRpcChannelBuffer_Receive_Proxy( - IAsyncRpcChannelBuffer* This, - RPCOLEMESSAGE *pMsg, - ULONG *pulStatus); -void __RPC_STUB IAsyncRpcChannelBuffer_Receive_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAsyncRpcChannelBuffer_GetDestCtxEx_Proxy( - IAsyncRpcChannelBuffer* This, - RPCOLEMESSAGE *pMsg, - DWORD *pdwDestContext, - void **ppvDestContext); -void __RPC_STUB IAsyncRpcChannelBuffer_GetDestCtxEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAsyncRpcChannelBuffer_INTERFACE_DEFINED__ */ @@ -2985,84 +2801,85 @@ typedef struct IRpcChannelBuffer3Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IRpcChannelBuffer3* This, + IRpcChannelBuffer3 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IRpcChannelBuffer3* This); + IRpcChannelBuffer3 *This); ULONG (STDMETHODCALLTYPE *Release)( - IRpcChannelBuffer3* This); + IRpcChannelBuffer3 *This); /*** IRpcChannelBuffer methods ***/ HRESULT (STDMETHODCALLTYPE *GetBuffer)( - IRpcChannelBuffer3* This, + IRpcChannelBuffer3 *This, RPCOLEMESSAGE *pMessage, REFIID riid); HRESULT (STDMETHODCALLTYPE *SendReceive)( - IRpcChannelBuffer3* This, + IRpcChannelBuffer3 *This, RPCOLEMESSAGE *pMessage, ULONG *pStatus); HRESULT (STDMETHODCALLTYPE *FreeBuffer)( - IRpcChannelBuffer3* This, + IRpcChannelBuffer3 *This, RPCOLEMESSAGE *pMessage); HRESULT (STDMETHODCALLTYPE *GetDestCtx)( - IRpcChannelBuffer3* This, + IRpcChannelBuffer3 *This, DWORD *pdwDestContext, void **ppvDestContext); HRESULT (STDMETHODCALLTYPE *IsConnected)( - IRpcChannelBuffer3* This); + IRpcChannelBuffer3 *This); /*** IRpcChannelBuffer2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetProtocolVersion)( - IRpcChannelBuffer3* This, + IRpcChannelBuffer3 *This, DWORD *pdwVersion); /*** IRpcChannelBuffer3 methods ***/ HRESULT (STDMETHODCALLTYPE *Send)( - IRpcChannelBuffer3* This, + IRpcChannelBuffer3 *This, RPCOLEMESSAGE *pMsg, ULONG *pulStatus); HRESULT (STDMETHODCALLTYPE *Receive)( - IRpcChannelBuffer3* This, + IRpcChannelBuffer3 *This, RPCOLEMESSAGE *pMsg, ULONG ulSize, ULONG *pulStatus); HRESULT (STDMETHODCALLTYPE *Cancel)( - IRpcChannelBuffer3* This, + IRpcChannelBuffer3 *This, RPCOLEMESSAGE *pMsg); HRESULT (STDMETHODCALLTYPE *GetCallContext)( - IRpcChannelBuffer3* This, + IRpcChannelBuffer3 *This, RPCOLEMESSAGE *pMsg, REFIID riid, void **pInterface); HRESULT (STDMETHODCALLTYPE *GetDestCtxEx)( - IRpcChannelBuffer3* This, + IRpcChannelBuffer3 *This, RPCOLEMESSAGE *pMsg, DWORD *pdwDestContext, void **ppvDestContext); HRESULT (STDMETHODCALLTYPE *GetState)( - IRpcChannelBuffer3* This, + IRpcChannelBuffer3 *This, RPCOLEMESSAGE *pMsg, DWORD *pState); HRESULT (STDMETHODCALLTYPE *RegisterAsync)( - IRpcChannelBuffer3* This, + IRpcChannelBuffer3 *This, RPCOLEMESSAGE *pMsg, IAsyncManager *pAsyncMgr); END_INTERFACE } IRpcChannelBuffer3Vtbl; + interface IRpcChannelBuffer3 { CONST_VTBL IRpcChannelBuffer3Vtbl* lpVtbl; }; @@ -3147,71 +2964,6 @@ static FORCEINLINE HRESULT IRpcChannelBuffer3_RegisterAsync(IRpcChannelBuffer3* #endif -HRESULT STDMETHODCALLTYPE IRpcChannelBuffer3_Send_Proxy( - IRpcChannelBuffer3* This, - RPCOLEMESSAGE *pMsg, - ULONG *pulStatus); -void __RPC_STUB IRpcChannelBuffer3_Send_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRpcChannelBuffer3_Receive_Proxy( - IRpcChannelBuffer3* This, - RPCOLEMESSAGE *pMsg, - ULONG ulSize, - ULONG *pulStatus); -void __RPC_STUB IRpcChannelBuffer3_Receive_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRpcChannelBuffer3_Cancel_Proxy( - IRpcChannelBuffer3* This, - RPCOLEMESSAGE *pMsg); -void __RPC_STUB IRpcChannelBuffer3_Cancel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRpcChannelBuffer3_GetCallContext_Proxy( - IRpcChannelBuffer3* This, - RPCOLEMESSAGE *pMsg, - REFIID riid, - void **pInterface); -void __RPC_STUB IRpcChannelBuffer3_GetCallContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRpcChannelBuffer3_GetDestCtxEx_Proxy( - IRpcChannelBuffer3* This, - RPCOLEMESSAGE *pMsg, - DWORD *pdwDestContext, - void **ppvDestContext); -void __RPC_STUB IRpcChannelBuffer3_GetDestCtxEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRpcChannelBuffer3_GetState_Proxy( - IRpcChannelBuffer3* This, - RPCOLEMESSAGE *pMsg, - DWORD *pState); -void __RPC_STUB IRpcChannelBuffer3_GetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRpcChannelBuffer3_RegisterAsync_Proxy( - IRpcChannelBuffer3* This, - RPCOLEMESSAGE *pMsg, - IAsyncManager *pAsyncMgr); -void __RPC_STUB IRpcChannelBuffer3_RegisterAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IRpcChannelBuffer3_INTERFACE_DEFINED__ */ @@ -3240,23 +2992,24 @@ typedef struct IRpcSyntaxNegotiateVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IRpcSyntaxNegotiate* This, + IRpcSyntaxNegotiate *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IRpcSyntaxNegotiate* This); + IRpcSyntaxNegotiate *This); ULONG (STDMETHODCALLTYPE *Release)( - IRpcSyntaxNegotiate* This); + IRpcSyntaxNegotiate *This); /*** IRpcSyntaxNegotiate methods ***/ HRESULT (STDMETHODCALLTYPE *NegotiateSyntax)( - IRpcSyntaxNegotiate* This, + IRpcSyntaxNegotiate *This, RPCOLEMESSAGE *pMsg); END_INTERFACE } IRpcSyntaxNegotiateVtbl; + interface IRpcSyntaxNegotiate { CONST_VTBL IRpcSyntaxNegotiateVtbl* lpVtbl; }; @@ -3289,14 +3042,6 @@ static FORCEINLINE HRESULT IRpcSyntaxNegotiate_NegotiateSyntax(IRpcSyntaxNegotia #endif -HRESULT STDMETHODCALLTYPE IRpcSyntaxNegotiate_NegotiateSyntax_Proxy( - IRpcSyntaxNegotiate* This, - RPCOLEMESSAGE *pMsg); -void __RPC_STUB IRpcSyntaxNegotiate_NegotiateSyntax_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IRpcSyntaxNegotiate_INTERFACE_DEFINED__ */ @@ -3328,26 +3073,27 @@ typedef struct IRpcProxyBufferVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IRpcProxyBuffer* This, + IRpcProxyBuffer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IRpcProxyBuffer* This); + IRpcProxyBuffer *This); ULONG (STDMETHODCALLTYPE *Release)( - IRpcProxyBuffer* This); + IRpcProxyBuffer *This); /*** IRpcProxyBuffer methods ***/ HRESULT (STDMETHODCALLTYPE *Connect)( - IRpcProxyBuffer* This, + IRpcProxyBuffer *This, IRpcChannelBuffer *pRpcChannelBuffer); void (STDMETHODCALLTYPE *Disconnect)( - IRpcProxyBuffer* This); + IRpcProxyBuffer *This); END_INTERFACE } IRpcProxyBufferVtbl; + interface IRpcProxyBuffer { CONST_VTBL IRpcProxyBufferVtbl* lpVtbl; }; @@ -3384,21 +3130,6 @@ static FORCEINLINE void IRpcProxyBuffer_Disconnect(IRpcProxyBuffer* This) { #endif -HRESULT STDMETHODCALLTYPE IRpcProxyBuffer_Connect_Proxy( - IRpcProxyBuffer* This, - IRpcChannelBuffer *pRpcChannelBuffer); -void __RPC_STUB IRpcProxyBuffer_Connect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -void STDMETHODCALLTYPE IRpcProxyBuffer_Disconnect_Proxy( - IRpcProxyBuffer* This); -void __RPC_STUB IRpcProxyBuffer_Disconnect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IRpcProxyBuffer_INTERFACE_DEFINED__ */ @@ -3448,46 +3179,47 @@ typedef struct IRpcStubBufferVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IRpcStubBuffer* This, + IRpcStubBuffer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IRpcStubBuffer* This); + IRpcStubBuffer *This); ULONG (STDMETHODCALLTYPE *Release)( - IRpcStubBuffer* This); + IRpcStubBuffer *This); /*** IRpcStubBuffer methods ***/ HRESULT (STDMETHODCALLTYPE *Connect)( - IRpcStubBuffer* This, + IRpcStubBuffer *This, IUnknown *pUnkServer); void (STDMETHODCALLTYPE *Disconnect)( - IRpcStubBuffer* This); + IRpcStubBuffer *This); HRESULT (STDMETHODCALLTYPE *Invoke)( - IRpcStubBuffer* This, + IRpcStubBuffer *This, RPCOLEMESSAGE *_prpcmsg, IRpcChannelBuffer *_pRpcChannelBuffer); IRpcStubBuffer * (STDMETHODCALLTYPE *IsIIDSupported)( - IRpcStubBuffer* This, + IRpcStubBuffer *This, REFIID riid); ULONG (STDMETHODCALLTYPE *CountRefs)( - IRpcStubBuffer* This); + IRpcStubBuffer *This); HRESULT (STDMETHODCALLTYPE *DebugServerQueryInterface)( - IRpcStubBuffer* This, + IRpcStubBuffer *This, void **ppv); void (STDMETHODCALLTYPE *DebugServerRelease)( - IRpcStubBuffer* This, + IRpcStubBuffer *This, void *pv); END_INTERFACE } IRpcStubBufferVtbl; + interface IRpcStubBuffer { CONST_VTBL IRpcStubBufferVtbl* lpVtbl; }; @@ -3544,61 +3276,6 @@ static FORCEINLINE void IRpcStubBuffer_DebugServerRelease(IRpcStubBuffer* This,v #endif -HRESULT STDMETHODCALLTYPE IRpcStubBuffer_Connect_Proxy( - IRpcStubBuffer* This, - IUnknown *pUnkServer); -void __RPC_STUB IRpcStubBuffer_Connect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -void STDMETHODCALLTYPE IRpcStubBuffer_Disconnect_Proxy( - IRpcStubBuffer* This); -void __RPC_STUB IRpcStubBuffer_Disconnect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRpcStubBuffer_Invoke_Proxy( - IRpcStubBuffer* This, - RPCOLEMESSAGE *_prpcmsg, - IRpcChannelBuffer *_pRpcChannelBuffer); -void __RPC_STUB IRpcStubBuffer_Invoke_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -IRpcStubBuffer * STDMETHODCALLTYPE IRpcStubBuffer_IsIIDSupported_Proxy( - IRpcStubBuffer* This, - REFIID riid); -void __RPC_STUB IRpcStubBuffer_IsIIDSupported_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -ULONG STDMETHODCALLTYPE IRpcStubBuffer_CountRefs_Proxy( - IRpcStubBuffer* This); -void __RPC_STUB IRpcStubBuffer_CountRefs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRpcStubBuffer_DebugServerQueryInterface_Proxy( - IRpcStubBuffer* This, - void **ppv); -void __RPC_STUB IRpcStubBuffer_DebugServerQueryInterface_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -void STDMETHODCALLTYPE IRpcStubBuffer_DebugServerRelease_Proxy( - IRpcStubBuffer* This, - void *pv); -void __RPC_STUB IRpcStubBuffer_DebugServerRelease_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IRpcStubBuffer_INTERFACE_DEFINED__ */ @@ -3635,32 +3312,33 @@ typedef struct IPSFactoryBufferVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPSFactoryBuffer* This, + IPSFactoryBuffer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPSFactoryBuffer* This); + IPSFactoryBuffer *This); ULONG (STDMETHODCALLTYPE *Release)( - IPSFactoryBuffer* This); + IPSFactoryBuffer *This); /*** IPSFactoryBuffer methods ***/ HRESULT (STDMETHODCALLTYPE *CreateProxy)( - IPSFactoryBuffer* This, + IPSFactoryBuffer *This, IUnknown *pUnkOuter, REFIID riid, IRpcProxyBuffer **ppProxy, void **ppv); HRESULT (STDMETHODCALLTYPE *CreateStub)( - IPSFactoryBuffer* This, + IPSFactoryBuffer *This, REFIID riid, IUnknown *pUnkServer, IRpcStubBuffer **ppStub); END_INTERFACE } IPSFactoryBufferVtbl; + interface IPSFactoryBuffer { CONST_VTBL IPSFactoryBufferVtbl* lpVtbl; }; @@ -3697,27 +3375,6 @@ static FORCEINLINE HRESULT IPSFactoryBuffer_CreateStub(IPSFactoryBuffer* This,RE #endif -HRESULT STDMETHODCALLTYPE IPSFactoryBuffer_CreateProxy_Proxy( - IPSFactoryBuffer* This, - IUnknown *pUnkOuter, - REFIID riid, - IRpcProxyBuffer **ppProxy, - void **ppv); -void __RPC_STUB IPSFactoryBuffer_CreateProxy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPSFactoryBuffer_CreateStub_Proxy( - IPSFactoryBuffer* This, - REFIID riid, - IUnknown *pUnkServer, - IRpcStubBuffer **ppStub); -void __RPC_STUB IPSFactoryBuffer_CreateStub_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPSFactoryBuffer_INTERFACE_DEFINED__ */ @@ -3794,32 +3451,32 @@ typedef struct IChannelHookVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IChannelHook* This, + IChannelHook *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IChannelHook* This); + IChannelHook *This); ULONG (STDMETHODCALLTYPE *Release)( - IChannelHook* This); + IChannelHook *This); /*** IChannelHook methods ***/ void (STDMETHODCALLTYPE *ClientGetSize)( - IChannelHook* This, + IChannelHook *This, REFGUID uExtent, REFIID riid, ULONG *pDataSize); void (STDMETHODCALLTYPE *ClientFillBuffer)( - IChannelHook* This, + IChannelHook *This, REFGUID uExtent, REFIID riid, ULONG *pDataSize, void *pDataBuffer); void (STDMETHODCALLTYPE *ClientNotify)( - IChannelHook* This, + IChannelHook *This, REFGUID uExtent, REFIID riid, ULONG cbDataSize, @@ -3828,7 +3485,7 @@ typedef struct IChannelHookVtbl { HRESULT hrFault); void (STDMETHODCALLTYPE *ServerNotify)( - IChannelHook* This, + IChannelHook *This, REFGUID uExtent, REFIID riid, ULONG cbDataSize, @@ -3836,14 +3493,14 @@ typedef struct IChannelHookVtbl { DWORD lDataRep); void (STDMETHODCALLTYPE *ServerGetSize)( - IChannelHook* This, + IChannelHook *This, REFGUID uExtent, REFIID riid, HRESULT hrFault, ULONG *pDataSize); void (STDMETHODCALLTYPE *ServerFillBuffer)( - IChannelHook* This, + IChannelHook *This, REFGUID uExtent, REFIID riid, ULONG *pDataSize, @@ -3852,6 +3509,7 @@ typedef struct IChannelHookVtbl { END_INTERFACE } IChannelHookVtbl; + interface IChannelHook { CONST_VTBL IChannelHookVtbl* lpVtbl; }; @@ -3904,75 +3562,6 @@ static FORCEINLINE void IChannelHook_ServerFillBuffer(IChannelHook* This,REFGUID #endif -void STDMETHODCALLTYPE IChannelHook_ClientGetSize_Proxy( - IChannelHook* This, - REFGUID uExtent, - REFIID riid, - ULONG *pDataSize); -void __RPC_STUB IChannelHook_ClientGetSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -void STDMETHODCALLTYPE IChannelHook_ClientFillBuffer_Proxy( - IChannelHook* This, - REFGUID uExtent, - REFIID riid, - ULONG *pDataSize, - void *pDataBuffer); -void __RPC_STUB IChannelHook_ClientFillBuffer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -void STDMETHODCALLTYPE IChannelHook_ClientNotify_Proxy( - IChannelHook* This, - REFGUID uExtent, - REFIID riid, - ULONG cbDataSize, - void *pDataBuffer, - DWORD lDataRep, - HRESULT hrFault); -void __RPC_STUB IChannelHook_ClientNotify_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -void STDMETHODCALLTYPE IChannelHook_ServerNotify_Proxy( - IChannelHook* This, - REFGUID uExtent, - REFIID riid, - ULONG cbDataSize, - void *pDataBuffer, - DWORD lDataRep); -void __RPC_STUB IChannelHook_ServerNotify_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -void STDMETHODCALLTYPE IChannelHook_ServerGetSize_Proxy( - IChannelHook* This, - REFGUID uExtent, - REFIID riid, - HRESULT hrFault, - ULONG *pDataSize); -void __RPC_STUB IChannelHook_ServerGetSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -void STDMETHODCALLTYPE IChannelHook_ServerFillBuffer_Proxy( - IChannelHook* This, - REFGUID uExtent, - REFIID riid, - ULONG *pDataSize, - void *pDataBuffer, - HRESULT hrFault); -void __RPC_STUB IChannelHook_ServerFillBuffer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IChannelHook_INTERFACE_DEFINED__ */ @@ -4071,19 +3660,19 @@ typedef struct IClientSecurityVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IClientSecurity* This, + IClientSecurity *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IClientSecurity* This); + IClientSecurity *This); ULONG (STDMETHODCALLTYPE *Release)( - IClientSecurity* This); + IClientSecurity *This); /*** IClientSecurity methods ***/ HRESULT (STDMETHODCALLTYPE *QueryBlanket)( - IClientSecurity* This, + IClientSecurity *This, IUnknown *pProxy, DWORD *pAuthnSvc, DWORD *pAuthzSvc, @@ -4094,7 +3683,7 @@ typedef struct IClientSecurityVtbl { DWORD *pCapabilites); HRESULT (STDMETHODCALLTYPE *SetBlanket)( - IClientSecurity* This, + IClientSecurity *This, IUnknown *pProxy, DWORD dwAuthnSvc, DWORD dwAuthzSvc, @@ -4105,12 +3694,13 @@ typedef struct IClientSecurityVtbl { DWORD dwCapabilities); HRESULT (STDMETHODCALLTYPE *CopyProxy)( - IClientSecurity* This, + IClientSecurity *This, IUnknown *pProxy, IUnknown **ppCopy); END_INTERFACE } IClientSecurityVtbl; + interface IClientSecurity { CONST_VTBL IClientSecurityVtbl* lpVtbl; }; @@ -4151,45 +3741,6 @@ static FORCEINLINE HRESULT IClientSecurity_CopyProxy(IClientSecurity* This,IUnkn #endif -HRESULT STDMETHODCALLTYPE IClientSecurity_QueryBlanket_Proxy( - IClientSecurity* This, - IUnknown *pProxy, - DWORD *pAuthnSvc, - DWORD *pAuthzSvc, - OLECHAR **pServerPrincName, - DWORD *pAuthnLevel, - DWORD *pImpLevel, - void **pAuthInfo, - DWORD *pCapabilites); -void __RPC_STUB IClientSecurity_QueryBlanket_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IClientSecurity_SetBlanket_Proxy( - IClientSecurity* This, - IUnknown *pProxy, - DWORD dwAuthnSvc, - DWORD dwAuthzSvc, - OLECHAR *pServerPrincName, - DWORD dwAuthnLevel, - DWORD dwImpLevel, - void *pAuthInfo, - DWORD dwCapabilities); -void __RPC_STUB IClientSecurity_SetBlanket_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IClientSecurity_CopyProxy_Proxy( - IClientSecurity* This, - IUnknown *pProxy, - IUnknown **ppCopy); -void __RPC_STUB IClientSecurity_CopyProxy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IClientSecurity_INTERFACE_DEFINED__ */ @@ -4235,19 +3786,19 @@ typedef struct IServerSecurityVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IServerSecurity* This, + IServerSecurity *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IServerSecurity* This); + IServerSecurity *This); ULONG (STDMETHODCALLTYPE *Release)( - IServerSecurity* This); + IServerSecurity *This); /*** IServerSecurity methods ***/ HRESULT (STDMETHODCALLTYPE *QueryBlanket)( - IServerSecurity* This, + IServerSecurity *This, DWORD *pAuthnSvc, DWORD *pAuthzSvc, OLECHAR **pServerPrincName, @@ -4257,16 +3808,17 @@ typedef struct IServerSecurityVtbl { DWORD *pCapabilities); HRESULT (STDMETHODCALLTYPE *ImpersonateClient)( - IServerSecurity* This); + IServerSecurity *This); HRESULT (STDMETHODCALLTYPE *RevertToSelf)( - IServerSecurity* This); + IServerSecurity *This); WINBOOL (STDMETHODCALLTYPE *IsImpersonating)( - IServerSecurity* This); + IServerSecurity *This); END_INTERFACE } IServerSecurityVtbl; + interface IServerSecurity { CONST_VTBL IServerSecurityVtbl* lpVtbl; }; @@ -4311,41 +3863,6 @@ static FORCEINLINE WINBOOL IServerSecurity_IsImpersonating(IServerSecurity* This #endif -HRESULT STDMETHODCALLTYPE IServerSecurity_QueryBlanket_Proxy( - IServerSecurity* This, - DWORD *pAuthnSvc, - DWORD *pAuthzSvc, - OLECHAR **pServerPrincName, - DWORD *pAuthnLevel, - DWORD *pImpLevel, - void **pPrivs, - DWORD *pCapabilities); -void __RPC_STUB IServerSecurity_QueryBlanket_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IServerSecurity_ImpersonateClient_Proxy( - IServerSecurity* This); -void __RPC_STUB IServerSecurity_ImpersonateClient_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IServerSecurity_RevertToSelf_Proxy( - IServerSecurity* This); -void __RPC_STUB IServerSecurity_RevertToSelf_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -WINBOOL STDMETHODCALLTYPE IServerSecurity_IsImpersonating_Proxy( - IServerSecurity* This); -void __RPC_STUB IServerSecurity_IsImpersonating_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IServerSecurity_INTERFACE_DEFINED__ */ @@ -4393,31 +3910,32 @@ typedef struct IRpcOptionsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IRpcOptions* This, + IRpcOptions *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IRpcOptions* This); + IRpcOptions *This); ULONG (STDMETHODCALLTYPE *Release)( - IRpcOptions* This); + IRpcOptions *This); /*** IRpcOptions methods ***/ HRESULT (STDMETHODCALLTYPE *Set)( - IRpcOptions* This, + IRpcOptions *This, IUnknown *pPrx, RPCOPT_PROPERTIES dwProperty, ULONG_PTR dwValue); HRESULT (STDMETHODCALLTYPE *Query)( - IRpcOptions* This, + IRpcOptions *This, IUnknown *pPrx, RPCOPT_PROPERTIES dwProperty, ULONG_PTR *pdwValue); END_INTERFACE } IRpcOptionsVtbl; + interface IRpcOptions { CONST_VTBL IRpcOptionsVtbl* lpVtbl; }; @@ -4454,26 +3972,6 @@ static FORCEINLINE HRESULT IRpcOptions_Query(IRpcOptions* This,IUnknown *pPrx,RP #endif -HRESULT STDMETHODCALLTYPE IRpcOptions_Set_Proxy( - IRpcOptions* This, - IUnknown *pPrx, - RPCOPT_PROPERTIES dwProperty, - ULONG_PTR dwValue); -void __RPC_STUB IRpcOptions_Set_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRpcOptions_Query_Proxy( - IRpcOptions* This, - IUnknown *pPrx, - RPCOPT_PROPERTIES dwProperty, - ULONG_PTR *pdwValue); -void __RPC_STUB IRpcOptions_Query_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IRpcOptions_INTERFACE_DEFINED__ */ @@ -4546,29 +4044,30 @@ typedef struct IGlobalOptionsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IGlobalOptions* This, + IGlobalOptions *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IGlobalOptions* This); + IGlobalOptions *This); ULONG (STDMETHODCALLTYPE *Release)( - IGlobalOptions* This); + IGlobalOptions *This); /*** IGlobalOptions methods ***/ HRESULT (STDMETHODCALLTYPE *Set)( - IGlobalOptions* This, + IGlobalOptions *This, GLOBALOPT_PROPERTIES dwProperty, ULONG_PTR dwValue); HRESULT (STDMETHODCALLTYPE *Query)( - IGlobalOptions* This, + IGlobalOptions *This, GLOBALOPT_PROPERTIES dwProperty, ULONG_PTR *pdwValue); END_INTERFACE } IGlobalOptionsVtbl; + interface IGlobalOptions { CONST_VTBL IGlobalOptionsVtbl* lpVtbl; }; @@ -4605,24 +4104,6 @@ static FORCEINLINE HRESULT IGlobalOptions_Query(IGlobalOptions* This,GLOBALOPT_P #endif -HRESULT STDMETHODCALLTYPE IGlobalOptions_Set_Proxy( - IGlobalOptions* This, - GLOBALOPT_PROPERTIES dwProperty, - ULONG_PTR dwValue); -void __RPC_STUB IGlobalOptions_Set_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IGlobalOptions_Query_Proxy( - IGlobalOptions* This, - GLOBALOPT_PROPERTIES dwProperty, - ULONG_PTR *pdwValue); -void __RPC_STUB IGlobalOptions_Query_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IGlobalOptions_INTERFACE_DEFINED__ */ @@ -4659,26 +4140,27 @@ typedef struct ISurrogateVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISurrogate* This, + ISurrogate *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISurrogate* This); + ISurrogate *This); ULONG (STDMETHODCALLTYPE *Release)( - ISurrogate* This); + ISurrogate *This); /*** ISurrogate methods ***/ HRESULT (STDMETHODCALLTYPE *LoadDllServer)( - ISurrogate* This, + ISurrogate *This, REFCLSID Clsid); HRESULT (STDMETHODCALLTYPE *FreeSurrogate)( - ISurrogate* This); + ISurrogate *This); END_INTERFACE } ISurrogateVtbl; + interface ISurrogate { CONST_VTBL ISurrogateVtbl* lpVtbl; }; @@ -4715,21 +4197,6 @@ static FORCEINLINE HRESULT ISurrogate_FreeSurrogate(ISurrogate* This) { #endif -HRESULT STDMETHODCALLTYPE ISurrogate_LoadDllServer_Proxy( - ISurrogate* This, - REFCLSID Clsid); -void __RPC_STUB ISurrogate_LoadDllServer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISurrogate_FreeSurrogate_Proxy( - ISurrogate* This); -void __RPC_STUB ISurrogate_FreeSurrogate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISurrogate_INTERFACE_DEFINED__ */ @@ -4770,35 +4237,36 @@ typedef struct IGlobalInterfaceTableVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IGlobalInterfaceTable* This, + IGlobalInterfaceTable *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IGlobalInterfaceTable* This); + IGlobalInterfaceTable *This); ULONG (STDMETHODCALLTYPE *Release)( - IGlobalInterfaceTable* This); + IGlobalInterfaceTable *This); /*** IGlobalInterfaceTable methods ***/ HRESULT (STDMETHODCALLTYPE *RegisterInterfaceInGlobal)( - IGlobalInterfaceTable* This, + IGlobalInterfaceTable *This, IUnknown *pUnk, REFIID riid, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *RevokeInterfaceFromGlobal)( - IGlobalInterfaceTable* This, + IGlobalInterfaceTable *This, DWORD dwCookie); HRESULT (STDMETHODCALLTYPE *GetInterfaceFromGlobal)( - IGlobalInterfaceTable* This, + IGlobalInterfaceTable *This, DWORD dwCookie, REFIID riid, void **ppv); END_INTERFACE } IGlobalInterfaceTableVtbl; + interface IGlobalInterfaceTable { CONST_VTBL IGlobalInterfaceTableVtbl* lpVtbl; }; @@ -4839,34 +4307,6 @@ static FORCEINLINE HRESULT IGlobalInterfaceTable_GetInterfaceFromGlobal(IGlobalI #endif -HRESULT STDMETHODCALLTYPE IGlobalInterfaceTable_RegisterInterfaceInGlobal_Proxy( - IGlobalInterfaceTable* This, - IUnknown *pUnk, - REFIID riid, - DWORD *pdwCookie); -void __RPC_STUB IGlobalInterfaceTable_RegisterInterfaceInGlobal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IGlobalInterfaceTable_RevokeInterfaceFromGlobal_Proxy( - IGlobalInterfaceTable* This, - DWORD dwCookie); -void __RPC_STUB IGlobalInterfaceTable_RevokeInterfaceFromGlobal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IGlobalInterfaceTable_GetInterfaceFromGlobal_Proxy( - IGlobalInterfaceTable* This, - DWORD dwCookie, - REFIID riid, - void **ppv); -void __RPC_STUB IGlobalInterfaceTable_GetInterfaceFromGlobal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IGlobalInterfaceTable_INTERFACE_DEFINED__ */ @@ -4904,30 +4344,31 @@ typedef struct ISynchronizeVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISynchronize* This, + ISynchronize *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISynchronize* This); + ISynchronize *This); ULONG (STDMETHODCALLTYPE *Release)( - ISynchronize* This); + ISynchronize *This); /*** ISynchronize methods ***/ HRESULT (STDMETHODCALLTYPE *Wait)( - ISynchronize* This, + ISynchronize *This, DWORD dwFlags, DWORD dwMilliseconds); HRESULT (STDMETHODCALLTYPE *Signal)( - ISynchronize* This); + ISynchronize *This); HRESULT (STDMETHODCALLTYPE *Reset)( - ISynchronize* This); + ISynchronize *This); END_INTERFACE } ISynchronizeVtbl; + interface ISynchronize { CONST_VTBL ISynchronizeVtbl* lpVtbl; }; @@ -4968,29 +4409,6 @@ static FORCEINLINE HRESULT ISynchronize_Reset(ISynchronize* This) { #endif -HRESULT STDMETHODCALLTYPE ISynchronize_Wait_Proxy( - ISynchronize* This, - DWORD dwFlags, - DWORD dwMilliseconds); -void __RPC_STUB ISynchronize_Wait_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISynchronize_Signal_Proxy( - ISynchronize* This); -void __RPC_STUB ISynchronize_Signal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISynchronize_Reset_Proxy( - ISynchronize* This); -void __RPC_STUB ISynchronize_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISynchronize_INTERFACE_DEFINED__ */ @@ -5019,23 +4437,24 @@ typedef struct ISynchronizeHandleVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISynchronizeHandle* This, + ISynchronizeHandle *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISynchronizeHandle* This); + ISynchronizeHandle *This); ULONG (STDMETHODCALLTYPE *Release)( - ISynchronizeHandle* This); + ISynchronizeHandle *This); /*** ISynchronizeHandle methods ***/ HRESULT (STDMETHODCALLTYPE *GetHandle)( - ISynchronizeHandle* This, + ISynchronizeHandle *This, HANDLE *ph); END_INTERFACE } ISynchronizeHandleVtbl; + interface ISynchronizeHandle { CONST_VTBL ISynchronizeHandleVtbl* lpVtbl; }; @@ -5068,14 +4487,6 @@ static FORCEINLINE HRESULT ISynchronizeHandle_GetHandle(ISynchronizeHandle* This #endif -HRESULT STDMETHODCALLTYPE ISynchronizeHandle_GetHandle_Proxy( - ISynchronizeHandle* This, - HANDLE *ph); -void __RPC_STUB ISynchronizeHandle_GetHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISynchronizeHandle_INTERFACE_DEFINED__ */ @@ -5104,28 +4515,29 @@ typedef struct ISynchronizeEventVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISynchronizeEvent* This, + ISynchronizeEvent *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISynchronizeEvent* This); + ISynchronizeEvent *This); ULONG (STDMETHODCALLTYPE *Release)( - ISynchronizeEvent* This); + ISynchronizeEvent *This); /*** ISynchronizeHandle methods ***/ HRESULT (STDMETHODCALLTYPE *GetHandle)( - ISynchronizeEvent* This, + ISynchronizeEvent *This, HANDLE *ph); /*** ISynchronizeEvent methods ***/ HRESULT (STDMETHODCALLTYPE *SetEventHandle)( - ISynchronizeEvent* This, + ISynchronizeEvent *This, HANDLE *ph); END_INTERFACE } ISynchronizeEventVtbl; + interface ISynchronizeEvent { CONST_VTBL ISynchronizeEventVtbl* lpVtbl; }; @@ -5164,14 +4576,6 @@ static FORCEINLINE HRESULT ISynchronizeEvent_SetEventHandle(ISynchronizeEvent* T #endif -HRESULT STDMETHODCALLTYPE ISynchronizeEvent_SetEventHandle_Proxy( - ISynchronizeEvent* This, - HANDLE *ph); -void __RPC_STUB ISynchronizeEvent_SetEventHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISynchronizeEvent_INTERFACE_DEFINED__ */ @@ -5205,29 +4609,30 @@ typedef struct ISynchronizeContainerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISynchronizeContainer* This, + ISynchronizeContainer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISynchronizeContainer* This); + ISynchronizeContainer *This); ULONG (STDMETHODCALLTYPE *Release)( - ISynchronizeContainer* This); + ISynchronizeContainer *This); /*** ISynchronizeContainer methods ***/ HRESULT (STDMETHODCALLTYPE *AddSynchronize)( - ISynchronizeContainer* This, + ISynchronizeContainer *This, ISynchronize *pSync); HRESULT (STDMETHODCALLTYPE *WaitMultiple)( - ISynchronizeContainer* This, + ISynchronizeContainer *This, DWORD dwFlags, DWORD dwTimeOut, ISynchronize **ppSync); END_INTERFACE } ISynchronizeContainerVtbl; + interface ISynchronizeContainer { CONST_VTBL ISynchronizeContainerVtbl* lpVtbl; }; @@ -5264,24 +4669,6 @@ static FORCEINLINE HRESULT ISynchronizeContainer_WaitMultiple(ISynchronizeContai #endif -HRESULT STDMETHODCALLTYPE ISynchronizeContainer_AddSynchronize_Proxy( - ISynchronizeContainer* This, - ISynchronize *pSync); -void __RPC_STUB ISynchronizeContainer_AddSynchronize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISynchronizeContainer_WaitMultiple_Proxy( - ISynchronizeContainer* This, - DWORD dwFlags, - DWORD dwTimeOut, - ISynchronize **ppSync); -void __RPC_STUB ISynchronizeContainer_WaitMultiple_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISynchronizeContainer_INTERFACE_DEFINED__ */ @@ -5310,34 +4697,35 @@ typedef struct ISynchronizeMutexVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISynchronizeMutex* This, + ISynchronizeMutex *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISynchronizeMutex* This); + ISynchronizeMutex *This); ULONG (STDMETHODCALLTYPE *Release)( - ISynchronizeMutex* This); + ISynchronizeMutex *This); /*** ISynchronize methods ***/ HRESULT (STDMETHODCALLTYPE *Wait)( - ISynchronizeMutex* This, + ISynchronizeMutex *This, DWORD dwFlags, DWORD dwMilliseconds); HRESULT (STDMETHODCALLTYPE *Signal)( - ISynchronizeMutex* This); + ISynchronizeMutex *This); HRESULT (STDMETHODCALLTYPE *Reset)( - ISynchronizeMutex* This); + ISynchronizeMutex *This); /*** ISynchronizeMutex methods ***/ HRESULT (STDMETHODCALLTYPE *ReleaseMutex)( - ISynchronizeMutex* This); + ISynchronizeMutex *This); END_INTERFACE } ISynchronizeMutexVtbl; + interface ISynchronizeMutex { CONST_VTBL ISynchronizeMutexVtbl* lpVtbl; }; @@ -5384,13 +4772,6 @@ static FORCEINLINE HRESULT ISynchronizeMutex_ReleaseMutex(ISynchronizeMutex* Thi #endif -HRESULT STDMETHODCALLTYPE ISynchronizeMutex_ReleaseMutex_Proxy( - ISynchronizeMutex* This); -void __RPC_STUB ISynchronizeMutex_ReleaseMutex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISynchronizeMutex_INTERFACE_DEFINED__ */ @@ -5424,26 +4805,27 @@ typedef struct ICancelMethodCallsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICancelMethodCalls* This, + ICancelMethodCalls *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICancelMethodCalls* This); + ICancelMethodCalls *This); ULONG (STDMETHODCALLTYPE *Release)( - ICancelMethodCalls* This); + ICancelMethodCalls *This); /*** ICancelMethodCalls methods ***/ HRESULT (STDMETHODCALLTYPE *Cancel)( - ICancelMethodCalls* This, + ICancelMethodCalls *This, ULONG ulSeconds); HRESULT (STDMETHODCALLTYPE *TestCancel)( - ICancelMethodCalls* This); + ICancelMethodCalls *This); END_INTERFACE } ICancelMethodCallsVtbl; + interface ICancelMethodCalls { CONST_VTBL ICancelMethodCallsVtbl* lpVtbl; }; @@ -5480,21 +4862,6 @@ static FORCEINLINE HRESULT ICancelMethodCalls_TestCancel(ICancelMethodCalls* Thi #endif -HRESULT STDMETHODCALLTYPE ICancelMethodCalls_Cancel_Proxy( - ICancelMethodCalls* This, - ULONG ulSeconds); -void __RPC_STUB ICancelMethodCalls_Cancel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICancelMethodCalls_TestCancel_Proxy( - ICancelMethodCalls* This); -void __RPC_STUB ICancelMethodCalls_TestCancel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICancelMethodCalls_INTERFACE_DEFINED__ */ @@ -5536,32 +4903,33 @@ typedef struct IAsyncManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAsyncManager* This, + IAsyncManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAsyncManager* This); + IAsyncManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IAsyncManager* This); + IAsyncManager *This); /*** IAsyncManager methods ***/ HRESULT (STDMETHODCALLTYPE *CompleteCall)( - IAsyncManager* This, + IAsyncManager *This, HRESULT Result); HRESULT (STDMETHODCALLTYPE *GetCallContext)( - IAsyncManager* This, + IAsyncManager *This, REFIID riid, void **pInterface); HRESULT (STDMETHODCALLTYPE *GetState)( - IAsyncManager* This, + IAsyncManager *This, ULONG *pulStateFlags); END_INTERFACE } IAsyncManagerVtbl; + interface IAsyncManager { CONST_VTBL IAsyncManagerVtbl* lpVtbl; }; @@ -5602,31 +4970,6 @@ static FORCEINLINE HRESULT IAsyncManager_GetState(IAsyncManager* This,ULONG *pul #endif -HRESULT STDMETHODCALLTYPE IAsyncManager_CompleteCall_Proxy( - IAsyncManager* This, - HRESULT Result); -void __RPC_STUB IAsyncManager_CompleteCall_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAsyncManager_GetCallContext_Proxy( - IAsyncManager* This, - REFIID riid, - void **pInterface); -void __RPC_STUB IAsyncManager_GetCallContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAsyncManager_GetState_Proxy( - IAsyncManager* This, - ULONG *pulStateFlags); -void __RPC_STUB IAsyncManager_GetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAsyncManager_INTERFACE_DEFINED__ */ @@ -5658,19 +5001,19 @@ typedef struct ICallFactoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICallFactory* This, + ICallFactory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICallFactory* This); + ICallFactory *This); ULONG (STDMETHODCALLTYPE *Release)( - ICallFactory* This); + ICallFactory *This); /*** ICallFactory methods ***/ HRESULT (STDMETHODCALLTYPE *CreateCall)( - ICallFactory* This, + ICallFactory *This, REFIID riid, IUnknown *pCtrlUnk, REFIID riid2, @@ -5678,6 +5021,7 @@ typedef struct ICallFactoryVtbl { END_INTERFACE } ICallFactoryVtbl; + interface ICallFactory { CONST_VTBL ICallFactoryVtbl* lpVtbl; }; @@ -5710,17 +5054,6 @@ static FORCEINLINE HRESULT ICallFactory_CreateCall(ICallFactory* This,REFIID rii #endif -HRESULT STDMETHODCALLTYPE ICallFactory_CreateCall_Proxy( - ICallFactory* This, - REFIID riid, - IUnknown *pCtrlUnk, - REFIID riid2, - IUnknown **ppv); -void __RPC_STUB ICallFactory_CreateCall_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICallFactory_INTERFACE_DEFINED__ */ @@ -5753,28 +5086,29 @@ typedef struct IRpcHelperVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IRpcHelper* This, + IRpcHelper *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IRpcHelper* This); + IRpcHelper *This); ULONG (STDMETHODCALLTYPE *Release)( - IRpcHelper* This); + IRpcHelper *This); /*** IRpcHelper methods ***/ HRESULT (STDMETHODCALLTYPE *GetDCOMProtocolVersion)( - IRpcHelper* This, + IRpcHelper *This, DWORD *pComVersion); HRESULT (STDMETHODCALLTYPE *GetIIDFromOBJREF)( - IRpcHelper* This, + IRpcHelper *This, void *pObjRef, IID **piid); END_INTERFACE } IRpcHelperVtbl; + interface IRpcHelper { CONST_VTBL IRpcHelperVtbl* lpVtbl; }; @@ -5811,23 +5145,6 @@ static FORCEINLINE HRESULT IRpcHelper_GetIIDFromOBJREF(IRpcHelper* This,void *pO #endif -HRESULT STDMETHODCALLTYPE IRpcHelper_GetDCOMProtocolVersion_Proxy( - IRpcHelper* This, - DWORD *pComVersion); -void __RPC_STUB IRpcHelper_GetDCOMProtocolVersion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRpcHelper_GetIIDFromOBJREF_Proxy( - IRpcHelper* This, - void *pObjRef, - IID **piid); -void __RPC_STUB IRpcHelper_GetIIDFromOBJREF_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IRpcHelper_INTERFACE_DEFINED__ */ @@ -5858,25 +5175,26 @@ typedef struct IReleaseMarshalBuffersVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IReleaseMarshalBuffers* This, + IReleaseMarshalBuffers *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IReleaseMarshalBuffers* This); + IReleaseMarshalBuffers *This); ULONG (STDMETHODCALLTYPE *Release)( - IReleaseMarshalBuffers* This); + IReleaseMarshalBuffers *This); /*** IReleaseMarshalBuffers methods ***/ HRESULT (STDMETHODCALLTYPE *ReleaseMarshalBuffer)( - IReleaseMarshalBuffers* This, + IReleaseMarshalBuffers *This, RPCOLEMESSAGE *pMsg, DWORD dwFlags, IUnknown *pChnl); END_INTERFACE } IReleaseMarshalBuffersVtbl; + interface IReleaseMarshalBuffers { CONST_VTBL IReleaseMarshalBuffersVtbl* lpVtbl; }; @@ -5909,16 +5227,6 @@ static FORCEINLINE HRESULT IReleaseMarshalBuffers_ReleaseMarshalBuffer(IReleaseM #endif -HRESULT STDMETHODCALLTYPE IReleaseMarshalBuffers_ReleaseMarshalBuffer_Proxy( - IReleaseMarshalBuffers* This, - RPCOLEMESSAGE *pMsg, - DWORD dwFlags, - IUnknown *pChnl); -void __RPC_STUB IReleaseMarshalBuffers_ReleaseMarshalBuffer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IReleaseMarshalBuffers_INTERFACE_DEFINED__ */ @@ -5951,28 +5259,29 @@ typedef struct IWaitMultipleVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWaitMultiple* This, + IWaitMultiple *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWaitMultiple* This); + IWaitMultiple *This); ULONG (STDMETHODCALLTYPE *Release)( - IWaitMultiple* This); + IWaitMultiple *This); /*** IWaitMultiple methods ***/ HRESULT (STDMETHODCALLTYPE *WaitMultiple)( - IWaitMultiple* This, + IWaitMultiple *This, DWORD timeout, ISynchronize **pSync); HRESULT (STDMETHODCALLTYPE *AddSynchronize)( - IWaitMultiple* This, + IWaitMultiple *This, ISynchronize *pSync); END_INTERFACE } IWaitMultipleVtbl; + interface IWaitMultiple { CONST_VTBL IWaitMultipleVtbl* lpVtbl; }; @@ -6009,23 +5318,6 @@ static FORCEINLINE HRESULT IWaitMultiple_AddSynchronize(IWaitMultiple* This,ISyn #endif -HRESULT STDMETHODCALLTYPE IWaitMultiple_WaitMultiple_Proxy( - IWaitMultiple* This, - DWORD timeout, - ISynchronize **pSync); -void __RPC_STUB IWaitMultiple_WaitMultiple_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWaitMultiple_AddSynchronize_Proxy( - IWaitMultiple* This, - ISynchronize *pSync); -void __RPC_STUB IWaitMultiple_AddSynchronize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWaitMultiple_INTERFACE_DEFINED__ */ @@ -6058,25 +5350,26 @@ typedef struct IAddrTrackingControlVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAddrTrackingControl* This, + IAddrTrackingControl *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAddrTrackingControl* This); + IAddrTrackingControl *This); ULONG (STDMETHODCALLTYPE *Release)( - IAddrTrackingControl* This); + IAddrTrackingControl *This); /*** IAddrTrackingControl methods ***/ HRESULT (STDMETHODCALLTYPE *EnableCOMDynamicAddrTracking)( - IAddrTrackingControl* This); + IAddrTrackingControl *This); HRESULT (STDMETHODCALLTYPE *DisableCOMDynamicAddrTracking)( - IAddrTrackingControl* This); + IAddrTrackingControl *This); END_INTERFACE } IAddrTrackingControlVtbl; + interface IAddrTrackingControl { CONST_VTBL IAddrTrackingControlVtbl* lpVtbl; }; @@ -6113,20 +5406,6 @@ static FORCEINLINE HRESULT IAddrTrackingControl_DisableCOMDynamicAddrTracking(IA #endif -HRESULT STDMETHODCALLTYPE IAddrTrackingControl_EnableCOMDynamicAddrTracking_Proxy( - IAddrTrackingControl* This); -void __RPC_STUB IAddrTrackingControl_EnableCOMDynamicAddrTracking_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAddrTrackingControl_DisableCOMDynamicAddrTracking_Proxy( - IAddrTrackingControl* This); -void __RPC_STUB IAddrTrackingControl_DisableCOMDynamicAddrTracking_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAddrTrackingControl_INTERFACE_DEFINED__ */ @@ -6160,28 +5439,29 @@ typedef struct IAddrExclusionControlVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAddrExclusionControl* This, + IAddrExclusionControl *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAddrExclusionControl* This); + IAddrExclusionControl *This); ULONG (STDMETHODCALLTYPE *Release)( - IAddrExclusionControl* This); + IAddrExclusionControl *This); /*** IAddrExclusionControl methods ***/ HRESULT (STDMETHODCALLTYPE *GetCurrentAddrExclusionList)( - IAddrExclusionControl* This, + IAddrExclusionControl *This, REFIID riid, void **ppEnumerator); HRESULT (STDMETHODCALLTYPE *UpdateAddrExclusionList)( - IAddrExclusionControl* This, + IAddrExclusionControl *This, IUnknown *pEnumerator); END_INTERFACE } IAddrExclusionControlVtbl; + interface IAddrExclusionControl { CONST_VTBL IAddrExclusionControlVtbl* lpVtbl; }; @@ -6218,23 +5498,6 @@ static FORCEINLINE HRESULT IAddrExclusionControl_UpdateAddrExclusionList(IAddrEx #endif -HRESULT STDMETHODCALLTYPE IAddrExclusionControl_GetCurrentAddrExclusionList_Proxy( - IAddrExclusionControl* This, - REFIID riid, - void **ppEnumerator); -void __RPC_STUB IAddrExclusionControl_GetCurrentAddrExclusionList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAddrExclusionControl_UpdateAddrExclusionList_Proxy( - IAddrExclusionControl* This, - IUnknown *pEnumerator); -void __RPC_STUB IAddrExclusionControl_UpdateAddrExclusionList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAddrExclusionControl_INTERFACE_DEFINED__ */ @@ -6269,30 +5532,31 @@ typedef struct IPipeByteVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPipeByte* This, + IPipeByte *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPipeByte* This); + IPipeByte *This); ULONG (STDMETHODCALLTYPE *Release)( - IPipeByte* This); + IPipeByte *This); /*** IPipeByte methods ***/ HRESULT (STDMETHODCALLTYPE *Pull)( - IPipeByte* This, + IPipeByte *This, BYTE *buf, ULONG cRequest, ULONG *pcReturned); HRESULT (STDMETHODCALLTYPE *Push)( - IPipeByte* This, + IPipeByte *This, BYTE *buf, ULONG cSent); END_INTERFACE } IPipeByteVtbl; + interface IPipeByte { CONST_VTBL IPipeByteVtbl* lpVtbl; }; @@ -6329,25 +5593,6 @@ static FORCEINLINE HRESULT IPipeByte_Push(IPipeByte* This,BYTE *buf,ULONG cSent) #endif -HRESULT STDMETHODCALLTYPE IPipeByte_Pull_Proxy( - IPipeByte* This, - BYTE *buf, - ULONG cRequest, - ULONG *pcReturned); -void __RPC_STUB IPipeByte_Pull_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPipeByte_Push_Proxy( - IPipeByte* This, - BYTE *buf, - ULONG cSent); -void __RPC_STUB IPipeByte_Push_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPipeByte_INTERFACE_DEFINED__ */ @@ -6382,30 +5627,31 @@ typedef struct IPipeLongVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPipeLong* This, + IPipeLong *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPipeLong* This); + IPipeLong *This); ULONG (STDMETHODCALLTYPE *Release)( - IPipeLong* This); + IPipeLong *This); /*** IPipeLong methods ***/ HRESULT (STDMETHODCALLTYPE *Pull)( - IPipeLong* This, + IPipeLong *This, LONG *buf, ULONG cRequest, ULONG *pcReturned); HRESULT (STDMETHODCALLTYPE *Push)( - IPipeLong* This, + IPipeLong *This, LONG *buf, ULONG cSent); END_INTERFACE } IPipeLongVtbl; + interface IPipeLong { CONST_VTBL IPipeLongVtbl* lpVtbl; }; @@ -6442,25 +5688,6 @@ static FORCEINLINE HRESULT IPipeLong_Push(IPipeLong* This,LONG *buf,ULONG cSent) #endif -HRESULT STDMETHODCALLTYPE IPipeLong_Pull_Proxy( - IPipeLong* This, - LONG *buf, - ULONG cRequest, - ULONG *pcReturned); -void __RPC_STUB IPipeLong_Pull_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPipeLong_Push_Proxy( - IPipeLong* This, - LONG *buf, - ULONG cSent); -void __RPC_STUB IPipeLong_Push_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPipeLong_INTERFACE_DEFINED__ */ @@ -6495,30 +5722,31 @@ typedef struct IPipeDoubleVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPipeDouble* This, + IPipeDouble *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPipeDouble* This); + IPipeDouble *This); ULONG (STDMETHODCALLTYPE *Release)( - IPipeDouble* This); + IPipeDouble *This); /*** IPipeDouble methods ***/ HRESULT (STDMETHODCALLTYPE *Pull)( - IPipeDouble* This, + IPipeDouble *This, DOUBLE *buf, ULONG cRequest, ULONG *pcReturned); HRESULT (STDMETHODCALLTYPE *Push)( - IPipeDouble* This, + IPipeDouble *This, DOUBLE *buf, ULONG cSent); END_INTERFACE } IPipeDoubleVtbl; + interface IPipeDouble { CONST_VTBL IPipeDoubleVtbl* lpVtbl; }; @@ -6555,25 +5783,6 @@ static FORCEINLINE HRESULT IPipeDouble_Push(IPipeDouble* This,DOUBLE *buf,ULONG #endif -HRESULT STDMETHODCALLTYPE IPipeDouble_Pull_Proxy( - IPipeDouble* This, - DOUBLE *buf, - ULONG cRequest, - ULONG *pcReturned); -void __RPC_STUB IPipeDouble_Pull_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPipeDouble_Push_Proxy( - IPipeDouble* This, - DOUBLE *buf, - ULONG cSent); -void __RPC_STUB IPipeDouble_Push_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPipeDouble_INTERFACE_DEFINED__ */ @@ -6628,40 +5837,41 @@ typedef struct IEnumContextPropsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumContextProps* This, + IEnumContextProps *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumContextProps* This); + IEnumContextProps *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumContextProps* This); + IEnumContextProps *This); /*** IEnumContextProps methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumContextProps* This, + IEnumContextProps *This, ULONG celt, ContextProperty *pContextProperties, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumContextProps* This, + IEnumContextProps *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumContextProps* This); + IEnumContextProps *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumContextProps* This, + IEnumContextProps *This, IEnumContextProps **ppEnumContextProps); HRESULT (STDMETHODCALLTYPE *Count)( - IEnumContextProps* This, + IEnumContextProps *This, ULONG *pcelt); END_INTERFACE } IEnumContextPropsVtbl; + interface IEnumContextProps { CONST_VTBL IEnumContextPropsVtbl* lpVtbl; }; @@ -6710,47 +5920,6 @@ static FORCEINLINE HRESULT IEnumContextProps_Count(IEnumContextProps* This,ULONG #endif -HRESULT STDMETHODCALLTYPE IEnumContextProps_Next_Proxy( - IEnumContextProps* This, - ULONG celt, - ContextProperty *pContextProperties, - ULONG *pceltFetched); -void __RPC_STUB IEnumContextProps_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumContextProps_Skip_Proxy( - IEnumContextProps* This, - ULONG celt); -void __RPC_STUB IEnumContextProps_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumContextProps_Reset_Proxy( - IEnumContextProps* This); -void __RPC_STUB IEnumContextProps_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumContextProps_Clone_Proxy( - IEnumContextProps* This, - IEnumContextProps **ppEnumContextProps); -void __RPC_STUB IEnumContextProps_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumContextProps_Count_Proxy( - IEnumContextProps* This, - ULONG *pcelt); -void __RPC_STUB IEnumContextProps_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumContextProps_INTERFACE_DEFINED__ */ @@ -6792,39 +5961,40 @@ typedef struct IContextVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IContext* This, + IContext *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IContext* This); + IContext *This); ULONG (STDMETHODCALLTYPE *Release)( - IContext* This); + IContext *This); /*** IContext methods ***/ HRESULT (STDMETHODCALLTYPE *SetProperty)( - IContext* This, + IContext *This, REFGUID rpolicyId, CPFLAGS flags, IUnknown *pUnk); HRESULT (STDMETHODCALLTYPE *RemoveProperty)( - IContext* This, + IContext *This, REFGUID rPolicyId); HRESULT (STDMETHODCALLTYPE *GetProperty)( - IContext* This, + IContext *This, REFGUID rGuid, CPFLAGS *pFlags, IUnknown **ppUnk); HRESULT (STDMETHODCALLTYPE *EnumContextProps)( - IContext* This, + IContext *This, IEnumContextProps **ppEnumContextProps); END_INTERFACE } IContextVtbl; + interface IContext { CONST_VTBL IContextVtbl* lpVtbl; }; @@ -6869,42 +6039,6 @@ static FORCEINLINE HRESULT IContext_EnumContextProps(IContext* This,IEnumContext #endif -HRESULT STDMETHODCALLTYPE IContext_SetProperty_Proxy( - IContext* This, - REFGUID rpolicyId, - CPFLAGS flags, - IUnknown *pUnk); -void __RPC_STUB IContext_SetProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IContext_RemoveProperty_Proxy( - IContext* This, - REFGUID rPolicyId); -void __RPC_STUB IContext_RemoveProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IContext_GetProperty_Proxy( - IContext* This, - REFGUID rGuid, - CPFLAGS *pFlags, - IUnknown **ppUnk); -void __RPC_STUB IContext_GetProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IContext_EnumContextProps_Proxy( - IContext* This, - IEnumContextProps **ppEnumContextProps); -void __RPC_STUB IContext_EnumContextProps_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IContext_INTERFACE_DEFINED__ */ @@ -6972,35 +6106,36 @@ typedef struct IComThreadingInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IComThreadingInfo* This, + IComThreadingInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IComThreadingInfo* This); + IComThreadingInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IComThreadingInfo* This); + IComThreadingInfo *This); /*** IComThreadingInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetCurrentApartmentType)( - IComThreadingInfo* This, + IComThreadingInfo *This, APTTYPE *pAptType); HRESULT (STDMETHODCALLTYPE *GetCurrentThreadType)( - IComThreadingInfo* This, + IComThreadingInfo *This, THDTYPE *pThreadType); HRESULT (STDMETHODCALLTYPE *GetCurrentLogicalThreadId)( - IComThreadingInfo* This, + IComThreadingInfo *This, GUID *pguidLogicalThreadId); HRESULT (STDMETHODCALLTYPE *SetCurrentLogicalThreadId)( - IComThreadingInfo* This, + IComThreadingInfo *This, REFGUID rguid); END_INTERFACE } IComThreadingInfoVtbl; + interface IComThreadingInfo { CONST_VTBL IComThreadingInfoVtbl* lpVtbl; }; @@ -7045,38 +6180,6 @@ static FORCEINLINE HRESULT IComThreadingInfo_SetCurrentLogicalThreadId(IComThrea #endif -HRESULT STDMETHODCALLTYPE IComThreadingInfo_GetCurrentApartmentType_Proxy( - IComThreadingInfo* This, - APTTYPE *pAptType); -void __RPC_STUB IComThreadingInfo_GetCurrentApartmentType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IComThreadingInfo_GetCurrentThreadType_Proxy( - IComThreadingInfo* This, - THDTYPE *pThreadType); -void __RPC_STUB IComThreadingInfo_GetCurrentThreadType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IComThreadingInfo_GetCurrentLogicalThreadId_Proxy( - IComThreadingInfo* This, - GUID *pguidLogicalThreadId); -void __RPC_STUB IComThreadingInfo_GetCurrentLogicalThreadId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IComThreadingInfo_SetCurrentLogicalThreadId_Proxy( - IComThreadingInfo* This, - REFGUID rguid); -void __RPC_STUB IComThreadingInfo_SetCurrentLogicalThreadId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IComThreadingInfo_INTERFACE_DEFINED__ */ @@ -7105,23 +6208,24 @@ typedef struct IProcessInitControlVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IProcessInitControl* This, + IProcessInitControl *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IProcessInitControl* This); + IProcessInitControl *This); ULONG (STDMETHODCALLTYPE *Release)( - IProcessInitControl* This); + IProcessInitControl *This); /*** IProcessInitControl methods ***/ HRESULT (STDMETHODCALLTYPE *ResetInitializerTimeout)( - IProcessInitControl* This, + IProcessInitControl *This, DWORD dwSecondsRemaining); END_INTERFACE } IProcessInitControlVtbl; + interface IProcessInitControl { CONST_VTBL IProcessInitControlVtbl* lpVtbl; }; @@ -7154,14 +6258,6 @@ static FORCEINLINE HRESULT IProcessInitControl_ResetInitializerTimeout(IProcessI #endif -HRESULT STDMETHODCALLTYPE IProcessInitControl_ResetInitializerTimeout_Proxy( - IProcessInitControl* This, - DWORD dwSecondsRemaining); -void __RPC_STUB IProcessInitControl_ResetInitializerTimeout_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IProcessInitControl_INTERFACE_DEFINED__ */ @@ -7187,18 +6283,19 @@ typedef struct IFastRundownVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFastRundown* This, + IFastRundown *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFastRundown* This); + IFastRundown *This); ULONG (STDMETHODCALLTYPE *Release)( - IFastRundown* This); + IFastRundown *This); END_INTERFACE } IFastRundownVtbl; + interface IFastRundown { CONST_VTBL IFastRundownVtbl* lpVtbl; }; @@ -7258,83 +6355,84 @@ typedef struct IMarshalingStreamVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMarshalingStream* This, + IMarshalingStream *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMarshalingStream* This); + IMarshalingStream *This); ULONG (STDMETHODCALLTYPE *Release)( - IMarshalingStream* This); + IMarshalingStream *This); /*** ISequentialStream methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - IMarshalingStream* This, + IMarshalingStream *This, void *pv, ULONG cb, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Write)( - IMarshalingStream* This, + IMarshalingStream *This, const void *pv, ULONG cb, ULONG *pcbWritten); /*** IStream methods ***/ HRESULT (STDMETHODCALLTYPE *Seek)( - IMarshalingStream* This, + IMarshalingStream *This, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition); HRESULT (STDMETHODCALLTYPE *SetSize)( - IMarshalingStream* This, + IMarshalingStream *This, ULARGE_INTEGER libNewSize); HRESULT (STDMETHODCALLTYPE *CopyTo)( - IMarshalingStream* This, + IMarshalingStream *This, IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten); HRESULT (STDMETHODCALLTYPE *Commit)( - IMarshalingStream* This, + IMarshalingStream *This, DWORD grfCommitFlags); HRESULT (STDMETHODCALLTYPE *Revert)( - IMarshalingStream* This); + IMarshalingStream *This); HRESULT (STDMETHODCALLTYPE *LockRegion)( - IMarshalingStream* This, + IMarshalingStream *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *UnlockRegion)( - IMarshalingStream* This, + IMarshalingStream *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *Stat)( - IMarshalingStream* This, + IMarshalingStream *This, STATSTG *pstatstg, DWORD grfStatFlag); HRESULT (STDMETHODCALLTYPE *Clone)( - IMarshalingStream* This, + IMarshalingStream *This, IStream **ppstm); /*** IMarshalingStream methods ***/ HRESULT (STDMETHODCALLTYPE *GetMarshalingContextAttribute)( - IMarshalingStream* This, + IMarshalingStream *This, CO_MARSHALING_CONTEXT_ATTRIBUTES attribute, ULONG_PTR *pAttributeValue); END_INTERFACE } IMarshalingStreamVtbl; + interface IMarshalingStream { CONST_VTBL IMarshalingStreamVtbl* lpVtbl; }; @@ -7415,15 +6513,6 @@ static FORCEINLINE HRESULT IMarshalingStream_GetMarshalingContextAttribute(IMars #endif -HRESULT STDMETHODCALLTYPE IMarshalingStream_GetMarshalingContextAttribute_Proxy( - IMarshalingStream* This, - CO_MARSHALING_CONTEXT_ATTRIBUTES attribute, - ULONG_PTR *pAttributeValue); -void __RPC_STUB IMarshalingStream_GetMarshalingContextAttribute_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMarshalingStream_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/ocidl.h b/lib/libc/include/any-windows-any/ocidl.h index 60218ea65e..a0f801a8dc 100644 --- a/lib/libc/include/any-windows-any/ocidl.h +++ b/lib/libc/include/any-windows-any/ocidl.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/ocidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/ocidl.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,201 +21,321 @@ #ifndef __IEnumConnections_FWD_DEFINED__ #define __IEnumConnections_FWD_DEFINED__ typedef interface IEnumConnections IEnumConnections; +#ifdef __cplusplus +interface IEnumConnections; +#endif /* __cplusplus */ #endif #ifndef __IConnectionPoint_FWD_DEFINED__ #define __IConnectionPoint_FWD_DEFINED__ typedef interface IConnectionPoint IConnectionPoint; +#ifdef __cplusplus +interface IConnectionPoint; +#endif /* __cplusplus */ #endif #ifndef __IEnumConnectionPoints_FWD_DEFINED__ #define __IEnumConnectionPoints_FWD_DEFINED__ typedef interface IEnumConnectionPoints IEnumConnectionPoints; +#ifdef __cplusplus +interface IEnumConnectionPoints; +#endif /* __cplusplus */ #endif #ifndef __IConnectionPointContainer_FWD_DEFINED__ #define __IConnectionPointContainer_FWD_DEFINED__ typedef interface IConnectionPointContainer IConnectionPointContainer; +#ifdef __cplusplus +interface IConnectionPointContainer; +#endif /* __cplusplus */ #endif #ifndef __IClassFactory2_FWD_DEFINED__ #define __IClassFactory2_FWD_DEFINED__ typedef interface IClassFactory2 IClassFactory2; +#ifdef __cplusplus +interface IClassFactory2; +#endif /* __cplusplus */ #endif #ifndef __IProvideClassInfo_FWD_DEFINED__ #define __IProvideClassInfo_FWD_DEFINED__ typedef interface IProvideClassInfo IProvideClassInfo; +#ifdef __cplusplus +interface IProvideClassInfo; +#endif /* __cplusplus */ #endif #ifndef __IProvideClassInfo2_FWD_DEFINED__ #define __IProvideClassInfo2_FWD_DEFINED__ typedef interface IProvideClassInfo2 IProvideClassInfo2; +#ifdef __cplusplus +interface IProvideClassInfo2; +#endif /* __cplusplus */ #endif #ifndef __IProvideMultipleClassInfo_FWD_DEFINED__ #define __IProvideMultipleClassInfo_FWD_DEFINED__ typedef interface IProvideMultipleClassInfo IProvideMultipleClassInfo; +#ifdef __cplusplus +interface IProvideMultipleClassInfo; +#endif /* __cplusplus */ #endif #ifndef __IOleControl_FWD_DEFINED__ #define __IOleControl_FWD_DEFINED__ typedef interface IOleControl IOleControl; +#ifdef __cplusplus +interface IOleControl; +#endif /* __cplusplus */ #endif #ifndef __IOleControlSite_FWD_DEFINED__ #define __IOleControlSite_FWD_DEFINED__ typedef interface IOleControlSite IOleControlSite; +#ifdef __cplusplus +interface IOleControlSite; +#endif /* __cplusplus */ #endif #ifndef __IPropertyPage_FWD_DEFINED__ #define __IPropertyPage_FWD_DEFINED__ typedef interface IPropertyPage IPropertyPage; +#ifdef __cplusplus +interface IPropertyPage; +#endif /* __cplusplus */ #endif #ifndef __IPropertyPage2_FWD_DEFINED__ #define __IPropertyPage2_FWD_DEFINED__ typedef interface IPropertyPage2 IPropertyPage2; +#ifdef __cplusplus +interface IPropertyPage2; +#endif /* __cplusplus */ #endif #ifndef __IPropertyPageSite_FWD_DEFINED__ #define __IPropertyPageSite_FWD_DEFINED__ typedef interface IPropertyPageSite IPropertyPageSite; +#ifdef __cplusplus +interface IPropertyPageSite; +#endif /* __cplusplus */ #endif #ifndef __IPropertyNotifySink_FWD_DEFINED__ #define __IPropertyNotifySink_FWD_DEFINED__ typedef interface IPropertyNotifySink IPropertyNotifySink; +#ifdef __cplusplus +interface IPropertyNotifySink; +#endif /* __cplusplus */ #endif #ifndef __ISpecifyPropertyPages_FWD_DEFINED__ #define __ISpecifyPropertyPages_FWD_DEFINED__ typedef interface ISpecifyPropertyPages ISpecifyPropertyPages; +#ifdef __cplusplus +interface ISpecifyPropertyPages; +#endif /* __cplusplus */ #endif #ifndef __IPersistMemory_FWD_DEFINED__ #define __IPersistMemory_FWD_DEFINED__ typedef interface IPersistMemory IPersistMemory; +#ifdef __cplusplus +interface IPersistMemory; +#endif /* __cplusplus */ #endif #ifndef __IPersistStreamInit_FWD_DEFINED__ #define __IPersistStreamInit_FWD_DEFINED__ typedef interface IPersistStreamInit IPersistStreamInit; +#ifdef __cplusplus +interface IPersistStreamInit; +#endif /* __cplusplus */ #endif #ifndef __IPersistPropertyBag_FWD_DEFINED__ #define __IPersistPropertyBag_FWD_DEFINED__ typedef interface IPersistPropertyBag IPersistPropertyBag; +#ifdef __cplusplus +interface IPersistPropertyBag; +#endif /* __cplusplus */ #endif #ifndef __ISimpleFrameSite_FWD_DEFINED__ #define __ISimpleFrameSite_FWD_DEFINED__ typedef interface ISimpleFrameSite ISimpleFrameSite; +#ifdef __cplusplus +interface ISimpleFrameSite; +#endif /* __cplusplus */ #endif #ifndef __IFont_FWD_DEFINED__ #define __IFont_FWD_DEFINED__ typedef interface IFont IFont; +#ifdef __cplusplus +interface IFont; +#endif /* __cplusplus */ #endif #ifndef __IPicture_FWD_DEFINED__ #define __IPicture_FWD_DEFINED__ typedef interface IPicture IPicture; +#ifdef __cplusplus +interface IPicture; +#endif /* __cplusplus */ #endif #ifndef __IPicture2_FWD_DEFINED__ #define __IPicture2_FWD_DEFINED__ typedef interface IPicture2 IPicture2; +#ifdef __cplusplus +interface IPicture2; +#endif /* __cplusplus */ #endif #ifndef __IFontEventsDisp_FWD_DEFINED__ #define __IFontEventsDisp_FWD_DEFINED__ typedef interface IFontEventsDisp IFontEventsDisp; +#ifdef __cplusplus +interface IFontEventsDisp; +#endif /* __cplusplus */ #endif #ifndef __IFontDisp_FWD_DEFINED__ #define __IFontDisp_FWD_DEFINED__ typedef interface IFontDisp IFontDisp; +#ifdef __cplusplus +interface IFontDisp; +#endif /* __cplusplus */ #endif #ifndef __IPictureDisp_FWD_DEFINED__ #define __IPictureDisp_FWD_DEFINED__ typedef interface IPictureDisp IPictureDisp; +#ifdef __cplusplus +interface IPictureDisp; +#endif /* __cplusplus */ #endif #ifndef __IOleInPlaceObjectWindowless_FWD_DEFINED__ #define __IOleInPlaceObjectWindowless_FWD_DEFINED__ typedef interface IOleInPlaceObjectWindowless IOleInPlaceObjectWindowless; +#ifdef __cplusplus +interface IOleInPlaceObjectWindowless; +#endif /* __cplusplus */ #endif #ifndef __IOleInPlaceSiteEx_FWD_DEFINED__ #define __IOleInPlaceSiteEx_FWD_DEFINED__ typedef interface IOleInPlaceSiteEx IOleInPlaceSiteEx; +#ifdef __cplusplus +interface IOleInPlaceSiteEx; +#endif /* __cplusplus */ #endif #ifndef __IOleInPlaceSiteWindowless_FWD_DEFINED__ #define __IOleInPlaceSiteWindowless_FWD_DEFINED__ typedef interface IOleInPlaceSiteWindowless IOleInPlaceSiteWindowless; +#ifdef __cplusplus +interface IOleInPlaceSiteWindowless; +#endif /* __cplusplus */ #endif #ifndef __IViewObjectEx_FWD_DEFINED__ #define __IViewObjectEx_FWD_DEFINED__ typedef interface IViewObjectEx IViewObjectEx; +#ifdef __cplusplus +interface IViewObjectEx; +#endif /* __cplusplus */ #endif #ifndef __IOleUndoUnit_FWD_DEFINED__ #define __IOleUndoUnit_FWD_DEFINED__ typedef interface IOleUndoUnit IOleUndoUnit; +#ifdef __cplusplus +interface IOleUndoUnit; +#endif /* __cplusplus */ #endif #ifndef __IOleParentUndoUnit_FWD_DEFINED__ #define __IOleParentUndoUnit_FWD_DEFINED__ typedef interface IOleParentUndoUnit IOleParentUndoUnit; +#ifdef __cplusplus +interface IOleParentUndoUnit; +#endif /* __cplusplus */ #endif #ifndef __IEnumOleUndoUnits_FWD_DEFINED__ #define __IEnumOleUndoUnits_FWD_DEFINED__ typedef interface IEnumOleUndoUnits IEnumOleUndoUnits; +#ifdef __cplusplus +interface IEnumOleUndoUnits; +#endif /* __cplusplus */ #endif #ifndef __IOleUndoManager_FWD_DEFINED__ #define __IOleUndoManager_FWD_DEFINED__ typedef interface IOleUndoManager IOleUndoManager; +#ifdef __cplusplus +interface IOleUndoManager; +#endif /* __cplusplus */ #endif #ifndef __IPointerInactive_FWD_DEFINED__ #define __IPointerInactive_FWD_DEFINED__ typedef interface IPointerInactive IPointerInactive; +#ifdef __cplusplus +interface IPointerInactive; +#endif /* __cplusplus */ #endif #ifndef __IObjectWithSite_FWD_DEFINED__ #define __IObjectWithSite_FWD_DEFINED__ typedef interface IObjectWithSite IObjectWithSite; +#ifdef __cplusplus +interface IObjectWithSite; +#endif /* __cplusplus */ #endif #ifndef __IPerPropertyBrowsing_FWD_DEFINED__ #define __IPerPropertyBrowsing_FWD_DEFINED__ typedef interface IPerPropertyBrowsing IPerPropertyBrowsing; +#ifdef __cplusplus +interface IPerPropertyBrowsing; +#endif /* __cplusplus */ #endif #ifndef __IPropertyBag2_FWD_DEFINED__ #define __IPropertyBag2_FWD_DEFINED__ typedef interface IPropertyBag2 IPropertyBag2; +#ifdef __cplusplus +interface IPropertyBag2; +#endif /* __cplusplus */ #endif #ifndef __IPersistPropertyBag2_FWD_DEFINED__ #define __IPersistPropertyBag2_FWD_DEFINED__ typedef interface IPersistPropertyBag2 IPersistPropertyBag2; +#ifdef __cplusplus +interface IPersistPropertyBag2; +#endif /* __cplusplus */ #endif #ifndef __IAdviseSinkEx_FWD_DEFINED__ #define __IAdviseSinkEx_FWD_DEFINED__ typedef interface IAdviseSinkEx IAdviseSinkEx; +#ifdef __cplusplus +interface IAdviseSinkEx; +#endif /* __cplusplus */ #endif #ifndef __IQuickActivate_FWD_DEFINED__ #define __IQuickActivate_FWD_DEFINED__ typedef interface IQuickActivate IQuickActivate; +#ifdef __cplusplus +interface IQuickActivate; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -241,21 +362,33 @@ extern "C" { #ifndef __IEnumConnections_FWD_DEFINED__ #define __IEnumConnections_FWD_DEFINED__ typedef interface IEnumConnections IEnumConnections; +#ifdef __cplusplus +interface IEnumConnections; +#endif /* __cplusplus */ #endif #ifndef __IEnumConnectionPoints_FWD_DEFINED__ #define __IEnumConnectionPoints_FWD_DEFINED__ typedef interface IEnumConnectionPoints IEnumConnectionPoints; +#ifdef __cplusplus +interface IEnumConnectionPoints; +#endif /* __cplusplus */ #endif #ifndef __IConnectionPoint_FWD_DEFINED__ #define __IConnectionPoint_FWD_DEFINED__ typedef interface IConnectionPoint IConnectionPoint; +#ifdef __cplusplus +interface IConnectionPoint; +#endif /* __cplusplus */ #endif #ifndef __IConnectionPointContainer_FWD_DEFINED__ #define __IConnectionPointContainer_FWD_DEFINED__ typedef interface IConnectionPointContainer IConnectionPointContainer; +#ifdef __cplusplus +interface IConnectionPointContainer; +#endif /* __cplusplus */ #endif #endif @@ -264,211 +397,337 @@ typedef interface IConnectionPointContainer IConnectionPointContainer; #ifndef __IBindHost_FWD_DEFINED__ #define __IBindHost_FWD_DEFINED__ typedef interface IBindHost IBindHost; +#ifdef __cplusplus +interface IBindHost; +#endif /* __cplusplus */ #endif #ifndef __IClassFactory2_FWD_DEFINED__ #define __IClassFactory2_FWD_DEFINED__ typedef interface IClassFactory2 IClassFactory2; +#ifdef __cplusplus +interface IClassFactory2; +#endif /* __cplusplus */ #endif #ifndef __IDropTarget_FWD_DEFINED__ #define __IDropTarget_FWD_DEFINED__ typedef interface IDropTarget IDropTarget; +#ifdef __cplusplus +interface IDropTarget; +#endif /* __cplusplus */ #endif #ifndef __IProvideClassInfo_FWD_DEFINED__ #define __IProvideClassInfo_FWD_DEFINED__ typedef interface IProvideClassInfo IProvideClassInfo; +#ifdef __cplusplus +interface IProvideClassInfo; +#endif /* __cplusplus */ #endif #ifndef __IProvideClassInfo2_FWD_DEFINED__ #define __IProvideClassInfo2_FWD_DEFINED__ typedef interface IProvideClassInfo2 IProvideClassInfo2; +#ifdef __cplusplus +interface IProvideClassInfo2; +#endif /* __cplusplus */ #endif #ifndef __IProvideMultipleClassInfo_FWD_DEFINED__ #define __IProvideMultipleClassInfo_FWD_DEFINED__ typedef interface IProvideMultipleClassInfo IProvideMultipleClassInfo; +#ifdef __cplusplus +interface IProvideMultipleClassInfo; +#endif /* __cplusplus */ #endif #ifndef __IOleClientSite_FWD_DEFINED__ #define __IOleClientSite_FWD_DEFINED__ typedef interface IOleClientSite IOleClientSite; +#ifdef __cplusplus +interface IOleClientSite; +#endif /* __cplusplus */ #endif #ifndef __IOleControl_FWD_DEFINED__ #define __IOleControl_FWD_DEFINED__ typedef interface IOleControl IOleControl; +#ifdef __cplusplus +interface IOleControl; +#endif /* __cplusplus */ #endif #ifndef __IOleControlSite_FWD_DEFINED__ #define __IOleControlSite_FWD_DEFINED__ typedef interface IOleControlSite IOleControlSite; +#ifdef __cplusplus +interface IOleControlSite; +#endif /* __cplusplus */ #endif #ifndef __IPropertyPage_FWD_DEFINED__ #define __IPropertyPage_FWD_DEFINED__ typedef interface IPropertyPage IPropertyPage; +#ifdef __cplusplus +interface IPropertyPage; +#endif /* __cplusplus */ #endif #ifndef __IPropertyPage2_FWD_DEFINED__ #define __IPropertyPage2_FWD_DEFINED__ typedef interface IPropertyPage2 IPropertyPage2; +#ifdef __cplusplus +interface IPropertyPage2; +#endif /* __cplusplus */ #endif #ifndef __IPropertyPageSite_FWD_DEFINED__ #define __IPropertyPageSite_FWD_DEFINED__ typedef interface IPropertyPageSite IPropertyPageSite; +#ifdef __cplusplus +interface IPropertyPageSite; +#endif /* __cplusplus */ #endif #ifndef __IPropertyNotifySink_FWD_DEFINED__ #define __IPropertyNotifySink_FWD_DEFINED__ typedef interface IPropertyNotifySink IPropertyNotifySink; +#ifdef __cplusplus +interface IPropertyNotifySink; +#endif /* __cplusplus */ #endif #ifndef __ISpecifyPropertyPages_FWD_DEFINED__ #define __ISpecifyPropertyPages_FWD_DEFINED__ typedef interface ISpecifyPropertyPages ISpecifyPropertyPages; +#ifdef __cplusplus +interface ISpecifyPropertyPages; +#endif /* __cplusplus */ #endif #ifndef __IPersistMemory_FWD_DEFINED__ #define __IPersistMemory_FWD_DEFINED__ typedef interface IPersistMemory IPersistMemory; +#ifdef __cplusplus +interface IPersistMemory; +#endif /* __cplusplus */ #endif #ifndef __IPersistStreamInit_FWD_DEFINED__ #define __IPersistStreamInit_FWD_DEFINED__ typedef interface IPersistStreamInit IPersistStreamInit; +#ifdef __cplusplus +interface IPersistStreamInit; +#endif /* __cplusplus */ #endif #ifndef __IPersistPropertyBag_FWD_DEFINED__ #define __IPersistPropertyBag_FWD_DEFINED__ typedef interface IPersistPropertyBag IPersistPropertyBag; +#ifdef __cplusplus +interface IPersistPropertyBag; +#endif /* __cplusplus */ #endif #ifndef __ISimpleFrameSite_FWD_DEFINED__ #define __ISimpleFrameSite_FWD_DEFINED__ typedef interface ISimpleFrameSite ISimpleFrameSite; +#ifdef __cplusplus +interface ISimpleFrameSite; +#endif /* __cplusplus */ #endif #ifndef __IFont_FWD_DEFINED__ #define __IFont_FWD_DEFINED__ typedef interface IFont IFont; +#ifdef __cplusplus +interface IFont; +#endif /* __cplusplus */ #endif #ifndef __IPicture_FWD_DEFINED__ #define __IPicture_FWD_DEFINED__ typedef interface IPicture IPicture; +#ifdef __cplusplus +interface IPicture; +#endif /* __cplusplus */ #endif #ifndef __IFontEventsDisp_FWD_DEFINED__ #define __IFontEventsDisp_FWD_DEFINED__ typedef interface IFontEventsDisp IFontEventsDisp; +#ifdef __cplusplus +interface IFontEventsDisp; +#endif /* __cplusplus */ #endif #ifndef __IFontDisp_FWD_DEFINED__ #define __IFontDisp_FWD_DEFINED__ typedef interface IFontDisp IFontDisp; +#ifdef __cplusplus +interface IFontDisp; +#endif /* __cplusplus */ #endif #ifndef __IPictureDisp_FWD_DEFINED__ #define __IPictureDisp_FWD_DEFINED__ typedef interface IPictureDisp IPictureDisp; +#ifdef __cplusplus +interface IPictureDisp; +#endif /* __cplusplus */ #endif #ifndef __IAdviseSinkEx_FWD_DEFINED__ #define __IAdviseSinkEx_FWD_DEFINED__ typedef interface IAdviseSinkEx IAdviseSinkEx; +#ifdef __cplusplus +interface IAdviseSinkEx; +#endif /* __cplusplus */ #endif #ifndef __IOleInPlaceObjectWindowless_FWD_DEFINED__ #define __IOleInPlaceObjectWindowless_FWD_DEFINED__ typedef interface IOleInPlaceObjectWindowless IOleInPlaceObjectWindowless; +#ifdef __cplusplus +interface IOleInPlaceObjectWindowless; +#endif /* __cplusplus */ #endif #ifndef __IOleInPlaceSite_FWD_DEFINED__ #define __IOleInPlaceSite_FWD_DEFINED__ typedef interface IOleInPlaceSite IOleInPlaceSite; +#ifdef __cplusplus +interface IOleInPlaceSite; +#endif /* __cplusplus */ #endif #ifndef __IOleInPlaceSiteEx_FWD_DEFINED__ #define __IOleInPlaceSiteEx_FWD_DEFINED__ typedef interface IOleInPlaceSiteEx IOleInPlaceSiteEx; +#ifdef __cplusplus +interface IOleInPlaceSiteEx; +#endif /* __cplusplus */ #endif #ifndef __IOleInPlaceSiteWindowless_FWD_DEFINED__ #define __IOleInPlaceSiteWindowless_FWD_DEFINED__ typedef interface IOleInPlaceSiteWindowless IOleInPlaceSiteWindowless; +#ifdef __cplusplus +interface IOleInPlaceSiteWindowless; +#endif /* __cplusplus */ #endif #ifndef __IViewObject2_FWD_DEFINED__ #define __IViewObject2_FWD_DEFINED__ typedef interface IViewObject2 IViewObject2; +#ifdef __cplusplus +interface IViewObject2; +#endif /* __cplusplus */ #endif #ifndef __IViewObjectEx_FWD_DEFINED__ #define __IViewObjectEx_FWD_DEFINED__ typedef interface IViewObjectEx IViewObjectEx; +#ifdef __cplusplus +interface IViewObjectEx; +#endif /* __cplusplus */ #endif #ifndef __IOleUndoUnit_FWD_DEFINED__ #define __IOleUndoUnit_FWD_DEFINED__ typedef interface IOleUndoUnit IOleUndoUnit; +#ifdef __cplusplus +interface IOleUndoUnit; +#endif /* __cplusplus */ #endif #ifndef __IOleParentUndoUnit_FWD_DEFINED__ #define __IOleParentUndoUnit_FWD_DEFINED__ typedef interface IOleParentUndoUnit IOleParentUndoUnit; +#ifdef __cplusplus +interface IOleParentUndoUnit; +#endif /* __cplusplus */ #endif #ifndef __IEnumOleUndoUnits_FWD_DEFINED__ #define __IEnumOleUndoUnits_FWD_DEFINED__ typedef interface IEnumOleUndoUnits IEnumOleUndoUnits; +#ifdef __cplusplus +interface IEnumOleUndoUnits; +#endif /* __cplusplus */ #endif #ifndef __IOleUndoManager_FWD_DEFINED__ #define __IOleUndoManager_FWD_DEFINED__ typedef interface IOleUndoManager IOleUndoManager; +#ifdef __cplusplus +interface IOleUndoManager; +#endif /* __cplusplus */ #endif #ifndef __IPointerInactive_FWD_DEFINED__ #define __IPointerInactive_FWD_DEFINED__ typedef interface IPointerInactive IPointerInactive; +#ifdef __cplusplus +interface IPointerInactive; +#endif /* __cplusplus */ #endif #ifndef __IObjectWithSite_FWD_DEFINED__ #define __IObjectWithSite_FWD_DEFINED__ typedef interface IObjectWithSite IObjectWithSite; +#ifdef __cplusplus +interface IObjectWithSite; +#endif /* __cplusplus */ #endif #ifndef __IErrorLog_FWD_DEFINED__ #define __IErrorLog_FWD_DEFINED__ typedef interface IErrorLog IErrorLog; +#ifdef __cplusplus +interface IErrorLog; +#endif /* __cplusplus */ #endif #ifndef __IPropertyBag_FWD_DEFINED__ #define __IPropertyBag_FWD_DEFINED__ typedef interface IPropertyBag IPropertyBag; +#ifdef __cplusplus +interface IPropertyBag; +#endif /* __cplusplus */ #endif #ifndef __IPerPropertyBrowsing_FWD_DEFINED__ #define __IPerPropertyBrowsing_FWD_DEFINED__ typedef interface IPerPropertyBrowsing IPerPropertyBrowsing; +#ifdef __cplusplus +interface IPerPropertyBrowsing; +#endif /* __cplusplus */ #endif #ifndef __IPropertyBag2_FWD_DEFINED__ #define __IPropertyBag2_FWD_DEFINED__ typedef interface IPropertyBag2 IPropertyBag2; +#ifdef __cplusplus +interface IPropertyBag2; +#endif /* __cplusplus */ #endif #ifndef __IPersistPropertyBag2_FWD_DEFINED__ #define __IPersistPropertyBag2_FWD_DEFINED__ typedef interface IPersistPropertyBag2 IPersistPropertyBag2; +#ifdef __cplusplus +interface IPersistPropertyBag2; +#endif /* __cplusplus */ #endif #ifndef __IQuickActivate_FWD_DEFINED__ #define __IQuickActivate_FWD_DEFINED__ typedef interface IQuickActivate IQuickActivate; +#ifdef __cplusplus +interface IQuickActivate; +#endif /* __cplusplus */ #endif #endif @@ -547,36 +806,37 @@ typedef struct IEnumConnectionsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumConnections* This, + IEnumConnections *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumConnections* This); + IEnumConnections *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumConnections* This); + IEnumConnections *This); /*** IEnumConnections methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumConnections* This, + IEnumConnections *This, ULONG cConnections, LPCONNECTDATA rgcd, ULONG *pcFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumConnections* This, + IEnumConnections *This, ULONG cConnections); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumConnections* This); + IEnumConnections *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumConnections* This, + IEnumConnections *This, IEnumConnections **ppEnum); END_INTERFACE } IEnumConnectionsVtbl; + interface IEnumConnections { CONST_VTBL IEnumConnectionsVtbl* lpVtbl; }; @@ -631,29 +891,6 @@ void __RPC_STUB IEnumConnections_RemoteNext_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumConnections_Skip_Proxy( - IEnumConnections* This, - ULONG cConnections); -void __RPC_STUB IEnumConnections_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumConnections_Reset_Proxy( - IEnumConnections* This); -void __RPC_STUB IEnumConnections_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumConnections_Clone_Proxy( - IEnumConnections* This, - IEnumConnections **ppEnum); -void __RPC_STUB IEnumConnections_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IEnumConnections_Next_Proxy( IEnumConnections* This, ULONG cConnections, @@ -708,40 +945,41 @@ typedef struct IConnectionPointVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IConnectionPoint* This, + IConnectionPoint *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IConnectionPoint* This); + IConnectionPoint *This); ULONG (STDMETHODCALLTYPE *Release)( - IConnectionPoint* This); + IConnectionPoint *This); /*** IConnectionPoint methods ***/ HRESULT (STDMETHODCALLTYPE *GetConnectionInterface)( - IConnectionPoint* This, + IConnectionPoint *This, IID *pIID); HRESULT (STDMETHODCALLTYPE *GetConnectionPointContainer)( - IConnectionPoint* This, + IConnectionPoint *This, IConnectionPointContainer **ppCPC); HRESULT (STDMETHODCALLTYPE *Advise)( - IConnectionPoint* This, + IConnectionPoint *This, IUnknown *pUnkSink, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *Unadvise)( - IConnectionPoint* This, + IConnectionPoint *This, DWORD dwCookie); HRESULT (STDMETHODCALLTYPE *EnumConnections)( - IConnectionPoint* This, + IConnectionPoint *This, IEnumConnections **ppEnum); END_INTERFACE } IConnectionPointVtbl; + interface IConnectionPoint { CONST_VTBL IConnectionPointVtbl* lpVtbl; }; @@ -790,47 +1028,6 @@ static FORCEINLINE HRESULT IConnectionPoint_EnumConnections(IConnectionPoint* Th #endif -HRESULT STDMETHODCALLTYPE IConnectionPoint_GetConnectionInterface_Proxy( - IConnectionPoint* This, - IID *pIID); -void __RPC_STUB IConnectionPoint_GetConnectionInterface_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IConnectionPoint_GetConnectionPointContainer_Proxy( - IConnectionPoint* This, - IConnectionPointContainer **ppCPC); -void __RPC_STUB IConnectionPoint_GetConnectionPointContainer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IConnectionPoint_Advise_Proxy( - IConnectionPoint* This, - IUnknown *pUnkSink, - DWORD *pdwCookie); -void __RPC_STUB IConnectionPoint_Advise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IConnectionPoint_Unadvise_Proxy( - IConnectionPoint* This, - DWORD dwCookie); -void __RPC_STUB IConnectionPoint_Unadvise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IConnectionPoint_EnumConnections_Proxy( - IConnectionPoint* This, - IEnumConnections **ppEnum); -void __RPC_STUB IConnectionPoint_EnumConnections_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IConnectionPoint_INTERFACE_DEFINED__ */ @@ -873,36 +1070,37 @@ typedef struct IEnumConnectionPointsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumConnectionPoints* This, + IEnumConnectionPoints *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumConnectionPoints* This); + IEnumConnectionPoints *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumConnectionPoints* This); + IEnumConnectionPoints *This); /*** IEnumConnectionPoints methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumConnectionPoints* This, + IEnumConnectionPoints *This, ULONG cConnections, LPCONNECTIONPOINT *ppCP, ULONG *pcFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumConnectionPoints* This, + IEnumConnectionPoints *This, ULONG cConnections); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumConnectionPoints* This); + IEnumConnectionPoints *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumConnectionPoints* This, + IEnumConnectionPoints *This, IEnumConnectionPoints **ppEnum); END_INTERFACE } IEnumConnectionPointsVtbl; + interface IEnumConnectionPoints { CONST_VTBL IEnumConnectionPointsVtbl* lpVtbl; }; @@ -957,29 +1155,6 @@ void __RPC_STUB IEnumConnectionPoints_RemoteNext_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumConnectionPoints_Skip_Proxy( - IEnumConnectionPoints* This, - ULONG cConnections); -void __RPC_STUB IEnumConnectionPoints_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumConnectionPoints_Reset_Proxy( - IEnumConnectionPoints* This); -void __RPC_STUB IEnumConnectionPoints_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumConnectionPoints_Clone_Proxy( - IEnumConnectionPoints* This, - IEnumConnectionPoints **ppEnum); -void __RPC_STUB IEnumConnectionPoints_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IEnumConnectionPoints_Next_Proxy( IEnumConnectionPoints* This, ULONG cConnections, @@ -1025,28 +1200,29 @@ typedef struct IConnectionPointContainerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IConnectionPointContainer* This, + IConnectionPointContainer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IConnectionPointContainer* This); + IConnectionPointContainer *This); ULONG (STDMETHODCALLTYPE *Release)( - IConnectionPointContainer* This); + IConnectionPointContainer *This); /*** IConnectionPointContainer methods ***/ HRESULT (STDMETHODCALLTYPE *EnumConnectionPoints)( - IConnectionPointContainer* This, + IConnectionPointContainer *This, IEnumConnectionPoints **ppEnum); HRESULT (STDMETHODCALLTYPE *FindConnectionPoint)( - IConnectionPointContainer* This, + IConnectionPointContainer *This, REFIID riid, IConnectionPoint **ppCP); END_INTERFACE } IConnectionPointContainerVtbl; + interface IConnectionPointContainer { CONST_VTBL IConnectionPointContainerVtbl* lpVtbl; }; @@ -1083,23 +1259,6 @@ static FORCEINLINE HRESULT IConnectionPointContainer_FindConnectionPoint(IConnec #endif -HRESULT STDMETHODCALLTYPE IConnectionPointContainer_EnumConnectionPoints_Proxy( - IConnectionPointContainer* This, - IEnumConnectionPoints **ppEnum); -void __RPC_STUB IConnectionPointContainer_EnumConnectionPoints_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IConnectionPointContainer_FindConnectionPoint_Proxy( - IConnectionPointContainer* This, - REFIID riid, - IConnectionPoint **ppCP); -void __RPC_STUB IConnectionPointContainer_FindConnectionPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IConnectionPointContainer_INTERFACE_DEFINED__ */ @@ -1151,39 +1310,39 @@ typedef struct IClassFactory2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IClassFactory2* This, + IClassFactory2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IClassFactory2* This); + IClassFactory2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IClassFactory2* This); + IClassFactory2 *This); /*** IClassFactory methods ***/ HRESULT (STDMETHODCALLTYPE *CreateInstance)( - IClassFactory2* This, + IClassFactory2 *This, IUnknown *pUnkOuter, REFIID riid, void **ppvObject); HRESULT (STDMETHODCALLTYPE *LockServer)( - IClassFactory2* This, + IClassFactory2 *This, WINBOOL fLock); /*** IClassFactory2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetLicInfo)( - IClassFactory2* This, + IClassFactory2 *This, LICINFO *pLicInfo); HRESULT (STDMETHODCALLTYPE *RequestLicKey)( - IClassFactory2* This, + IClassFactory2 *This, DWORD dwReserved, BSTR *pBstrKey); HRESULT (STDMETHODCALLTYPE *CreateInstanceLic)( - IClassFactory2* This, + IClassFactory2 *This, IUnknown *pUnkOuter, IUnknown *pUnkReserved, REFIID riid, @@ -1192,6 +1351,7 @@ typedef struct IClassFactory2Vtbl { END_INTERFACE } IClassFactory2Vtbl; + interface IClassFactory2 { CONST_VTBL IClassFactory2Vtbl* lpVtbl; }; @@ -1242,23 +1402,6 @@ static FORCEINLINE HRESULT IClassFactory2_CreateInstanceLic(IClassFactory2* This #endif -HRESULT STDMETHODCALLTYPE IClassFactory2_GetLicInfo_Proxy( - IClassFactory2* This, - LICINFO *pLicInfo); -void __RPC_STUB IClassFactory2_GetLicInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IClassFactory2_RequestLicKey_Proxy( - IClassFactory2* This, - DWORD dwReserved, - BSTR *pBstrKey); -void __RPC_STUB IClassFactory2_RequestLicKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE IClassFactory2_RemoteCreateInstanceLic_Proxy( IClassFactory2* This, REFIID riid, @@ -1311,23 +1454,24 @@ typedef struct IProvideClassInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IProvideClassInfo* This, + IProvideClassInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IProvideClassInfo* This); + IProvideClassInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IProvideClassInfo* This); + IProvideClassInfo *This); /*** IProvideClassInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetClassInfo)( - IProvideClassInfo* This, + IProvideClassInfo *This, ITypeInfo **ppTI); END_INTERFACE } IProvideClassInfoVtbl; + interface IProvideClassInfo { CONST_VTBL IProvideClassInfoVtbl* lpVtbl; }; @@ -1360,14 +1504,6 @@ static FORCEINLINE HRESULT IProvideClassInfo_GetClassInfo(IProvideClassInfo* Thi #endif -HRESULT STDMETHODCALLTYPE IProvideClassInfo_GetClassInfo_Proxy( - IProvideClassInfo* This, - ITypeInfo **ppTI); -void __RPC_STUB IProvideClassInfo_GetClassInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IProvideClassInfo_INTERFACE_DEFINED__ */ @@ -1403,29 +1539,30 @@ typedef struct IProvideClassInfo2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IProvideClassInfo2* This, + IProvideClassInfo2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IProvideClassInfo2* This); + IProvideClassInfo2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IProvideClassInfo2* This); + IProvideClassInfo2 *This); /*** IProvideClassInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetClassInfo)( - IProvideClassInfo2* This, + IProvideClassInfo2 *This, ITypeInfo **ppTI); /*** IProvideClassInfo2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetGUID)( - IProvideClassInfo2* This, + IProvideClassInfo2 *This, DWORD dwGuidKind, GUID *pGUID); END_INTERFACE } IProvideClassInfo2Vtbl; + interface IProvideClassInfo2 { CONST_VTBL IProvideClassInfo2Vtbl* lpVtbl; }; @@ -1464,15 +1601,6 @@ static FORCEINLINE HRESULT IProvideClassInfo2_GetGUID(IProvideClassInfo2* This,D #endif -HRESULT STDMETHODCALLTYPE IProvideClassInfo2_GetGUID_Proxy( - IProvideClassInfo2* This, - DWORD dwGuidKind, - GUID *pGUID); -void __RPC_STUB IProvideClassInfo2_GetGUID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IProvideClassInfo2_INTERFACE_DEFINED__ */ @@ -1519,34 +1647,34 @@ typedef struct IProvideMultipleClassInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IProvideMultipleClassInfo* This, + IProvideMultipleClassInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IProvideMultipleClassInfo* This); + IProvideMultipleClassInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IProvideMultipleClassInfo* This); + IProvideMultipleClassInfo *This); /*** IProvideClassInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetClassInfo)( - IProvideMultipleClassInfo* This, + IProvideMultipleClassInfo *This, ITypeInfo **ppTI); /*** IProvideClassInfo2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetGUID)( - IProvideMultipleClassInfo* This, + IProvideMultipleClassInfo *This, DWORD dwGuidKind, GUID *pGUID); /*** IProvideMultipleClassInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetMultiTypeInfoCount)( - IProvideMultipleClassInfo* This, + IProvideMultipleClassInfo *This, ULONG *pcti); HRESULT (STDMETHODCALLTYPE *GetInfoOfIndex)( - IProvideMultipleClassInfo* This, + IProvideMultipleClassInfo *This, ULONG iti, DWORD dwFlags, ITypeInfo **pptiCoClass, @@ -1557,6 +1685,7 @@ typedef struct IProvideMultipleClassInfoVtbl { END_INTERFACE } IProvideMultipleClassInfoVtbl; + interface IProvideMultipleClassInfo { CONST_VTBL IProvideMultipleClassInfoVtbl* lpVtbl; }; @@ -1605,28 +1734,6 @@ static FORCEINLINE HRESULT IProvideMultipleClassInfo_GetInfoOfIndex(IProvideMult #endif -HRESULT STDMETHODCALLTYPE IProvideMultipleClassInfo_GetMultiTypeInfoCount_Proxy( - IProvideMultipleClassInfo* This, - ULONG *pcti); -void __RPC_STUB IProvideMultipleClassInfo_GetMultiTypeInfoCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IProvideMultipleClassInfo_GetInfoOfIndex_Proxy( - IProvideMultipleClassInfo* This, - ULONG iti, - DWORD dwFlags, - ITypeInfo **pptiCoClass, - DWORD *pdwTIFlags, - ULONG *pcdispidReserved, - IID *piidPrimary, - IID *piidSource); -void __RPC_STUB IProvideMultipleClassInfo_GetInfoOfIndex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IProvideMultipleClassInfo_INTERFACE_DEFINED__ */ @@ -1680,35 +1787,36 @@ typedef struct IOleControlVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleControl* This, + IOleControl *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleControl* This); + IOleControl *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleControl* This); + IOleControl *This); /*** IOleControl methods ***/ HRESULT (STDMETHODCALLTYPE *GetControlInfo)( - IOleControl* This, + IOleControl *This, CONTROLINFO *pCI); HRESULT (STDMETHODCALLTYPE *OnMnemonic)( - IOleControl* This, + IOleControl *This, MSG *pMsg); HRESULT (STDMETHODCALLTYPE *OnAmbientPropertyChange)( - IOleControl* This, + IOleControl *This, DISPID dispID); HRESULT (STDMETHODCALLTYPE *FreezeEvents)( - IOleControl* This, + IOleControl *This, WINBOOL bFreeze); END_INTERFACE } IOleControlVtbl; + interface IOleControl { CONST_VTBL IOleControlVtbl* lpVtbl; }; @@ -1753,38 +1861,6 @@ static FORCEINLINE HRESULT IOleControl_FreezeEvents(IOleControl* This,WINBOOL bF #endif -HRESULT STDMETHODCALLTYPE IOleControl_GetControlInfo_Proxy( - IOleControl* This, - CONTROLINFO *pCI); -void __RPC_STUB IOleControl_GetControlInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleControl_OnMnemonic_Proxy( - IOleControl* This, - MSG *pMsg); -void __RPC_STUB IOleControl_OnMnemonic_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleControl_OnAmbientPropertyChange_Proxy( - IOleControl* This, - DISPID dispID); -void __RPC_STUB IOleControl_OnAmbientPropertyChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleControl_FreezeEvents_Proxy( - IOleControl* This, - WINBOOL bFreeze); -void __RPC_STUB IOleControl_FreezeEvents_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleControl_INTERFACE_DEFINED__ */ @@ -1851,48 +1927,49 @@ typedef struct IOleControlSiteVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleControlSite* This, + IOleControlSite *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleControlSite* This); + IOleControlSite *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleControlSite* This); + IOleControlSite *This); /*** IOleControlSite methods ***/ HRESULT (STDMETHODCALLTYPE *OnControlInfoChanged)( - IOleControlSite* This); + IOleControlSite *This); HRESULT (STDMETHODCALLTYPE *LockInPlaceActive)( - IOleControlSite* This, + IOleControlSite *This, WINBOOL fLock); HRESULT (STDMETHODCALLTYPE *GetExtendedControl)( - IOleControlSite* This, + IOleControlSite *This, IDispatch **ppDisp); HRESULT (STDMETHODCALLTYPE *TransformCoords)( - IOleControlSite* This, + IOleControlSite *This, POINTL *pPtlHimetric, POINTF *pPtfContainer, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)( - IOleControlSite* This, + IOleControlSite *This, MSG *pMsg, DWORD grfModifiers); HRESULT (STDMETHODCALLTYPE *OnFocus)( - IOleControlSite* This, + IOleControlSite *This, WINBOOL fGotFocus); HRESULT (STDMETHODCALLTYPE *ShowPropertyFrame)( - IOleControlSite* This); + IOleControlSite *This); END_INTERFACE } IOleControlSiteVtbl; + interface IOleControlSite { CONST_VTBL IOleControlSiteVtbl* lpVtbl; }; @@ -1949,63 +2026,6 @@ static FORCEINLINE HRESULT IOleControlSite_ShowPropertyFrame(IOleControlSite* Th #endif -HRESULT STDMETHODCALLTYPE IOleControlSite_OnControlInfoChanged_Proxy( - IOleControlSite* This); -void __RPC_STUB IOleControlSite_OnControlInfoChanged_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleControlSite_LockInPlaceActive_Proxy( - IOleControlSite* This, - WINBOOL fLock); -void __RPC_STUB IOleControlSite_LockInPlaceActive_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleControlSite_GetExtendedControl_Proxy( - IOleControlSite* This, - IDispatch **ppDisp); -void __RPC_STUB IOleControlSite_GetExtendedControl_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleControlSite_TransformCoords_Proxy( - IOleControlSite* This, - POINTL *pPtlHimetric, - POINTF *pPtfContainer, - DWORD dwFlags); -void __RPC_STUB IOleControlSite_TransformCoords_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleControlSite_TranslateAccelerator_Proxy( - IOleControlSite* This, - MSG *pMsg, - DWORD grfModifiers); -void __RPC_STUB IOleControlSite_TranslateAccelerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleControlSite_OnFocus_Proxy( - IOleControlSite* This, - WINBOOL fGotFocus); -void __RPC_STUB IOleControlSite_OnFocus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleControlSite_ShowPropertyFrame_Proxy( - IOleControlSite* This); -void __RPC_STUB IOleControlSite_ShowPropertyFrame_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleControlSite_INTERFACE_DEFINED__ */ @@ -2080,63 +2100,64 @@ typedef struct IPropertyPageVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertyPage* This, + IPropertyPage *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertyPage* This); + IPropertyPage *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertyPage* This); + IPropertyPage *This); /*** IPropertyPage methods ***/ HRESULT (STDMETHODCALLTYPE *SetPageSite)( - IPropertyPage* This, + IPropertyPage *This, IPropertyPageSite *pPageSite); HRESULT (STDMETHODCALLTYPE *Activate)( - IPropertyPage* This, + IPropertyPage *This, HWND hWndParent, LPCRECT pRect, WINBOOL bModal); HRESULT (STDMETHODCALLTYPE *Deactivate)( - IPropertyPage* This); + IPropertyPage *This); HRESULT (STDMETHODCALLTYPE *GetPageInfo)( - IPropertyPage* This, + IPropertyPage *This, PROPPAGEINFO *pPageInfo); HRESULT (STDMETHODCALLTYPE *SetObjects)( - IPropertyPage* This, + IPropertyPage *This, ULONG cObjects, IUnknown **ppUnk); HRESULT (STDMETHODCALLTYPE *Show)( - IPropertyPage* This, + IPropertyPage *This, UINT nCmdShow); HRESULT (STDMETHODCALLTYPE *Move)( - IPropertyPage* This, + IPropertyPage *This, LPCRECT pRect); HRESULT (STDMETHODCALLTYPE *IsPageDirty)( - IPropertyPage* This); + IPropertyPage *This); HRESULT (STDMETHODCALLTYPE *Apply)( - IPropertyPage* This); + IPropertyPage *This); HRESULT (STDMETHODCALLTYPE *Help)( - IPropertyPage* This, + IPropertyPage *This, LPCOLESTR pszHelpDir); HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)( - IPropertyPage* This, + IPropertyPage *This, MSG *pMsg); END_INTERFACE } IPropertyPageVtbl; + interface IPropertyPage { CONST_VTBL IPropertyPageVtbl* lpVtbl; }; @@ -2209,94 +2230,6 @@ static FORCEINLINE HRESULT IPropertyPage_TranslateAccelerator(IPropertyPage* Thi #endif -HRESULT STDMETHODCALLTYPE IPropertyPage_SetPageSite_Proxy( - IPropertyPage* This, - IPropertyPageSite *pPageSite); -void __RPC_STUB IPropertyPage_SetPageSite_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyPage_Activate_Proxy( - IPropertyPage* This, - HWND hWndParent, - LPCRECT pRect, - WINBOOL bModal); -void __RPC_STUB IPropertyPage_Activate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyPage_Deactivate_Proxy( - IPropertyPage* This); -void __RPC_STUB IPropertyPage_Deactivate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyPage_GetPageInfo_Proxy( - IPropertyPage* This, - PROPPAGEINFO *pPageInfo); -void __RPC_STUB IPropertyPage_GetPageInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyPage_SetObjects_Proxy( - IPropertyPage* This, - ULONG cObjects, - IUnknown **ppUnk); -void __RPC_STUB IPropertyPage_SetObjects_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyPage_Show_Proxy( - IPropertyPage* This, - UINT nCmdShow); -void __RPC_STUB IPropertyPage_Show_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyPage_Move_Proxy( - IPropertyPage* This, - LPCRECT pRect); -void __RPC_STUB IPropertyPage_Move_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyPage_IsPageDirty_Proxy( - IPropertyPage* This); -void __RPC_STUB IPropertyPage_IsPageDirty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyPage_Apply_Proxy( - IPropertyPage* This); -void __RPC_STUB IPropertyPage_Apply_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyPage_Help_Proxy( - IPropertyPage* This, - LPCOLESTR pszHelpDir); -void __RPC_STUB IPropertyPage_Help_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyPage_TranslateAccelerator_Proxy( - IPropertyPage* This, - MSG *pMsg); -void __RPC_STUB IPropertyPage_TranslateAccelerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPropertyPage_INTERFACE_DEFINED__ */ @@ -2327,68 +2260,69 @@ typedef struct IPropertyPage2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertyPage2* This, + IPropertyPage2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertyPage2* This); + IPropertyPage2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertyPage2* This); + IPropertyPage2 *This); /*** IPropertyPage methods ***/ HRESULT (STDMETHODCALLTYPE *SetPageSite)( - IPropertyPage2* This, + IPropertyPage2 *This, IPropertyPageSite *pPageSite); HRESULT (STDMETHODCALLTYPE *Activate)( - IPropertyPage2* This, + IPropertyPage2 *This, HWND hWndParent, LPCRECT pRect, WINBOOL bModal); HRESULT (STDMETHODCALLTYPE *Deactivate)( - IPropertyPage2* This); + IPropertyPage2 *This); HRESULT (STDMETHODCALLTYPE *GetPageInfo)( - IPropertyPage2* This, + IPropertyPage2 *This, PROPPAGEINFO *pPageInfo); HRESULT (STDMETHODCALLTYPE *SetObjects)( - IPropertyPage2* This, + IPropertyPage2 *This, ULONG cObjects, IUnknown **ppUnk); HRESULT (STDMETHODCALLTYPE *Show)( - IPropertyPage2* This, + IPropertyPage2 *This, UINT nCmdShow); HRESULT (STDMETHODCALLTYPE *Move)( - IPropertyPage2* This, + IPropertyPage2 *This, LPCRECT pRect); HRESULT (STDMETHODCALLTYPE *IsPageDirty)( - IPropertyPage2* This); + IPropertyPage2 *This); HRESULT (STDMETHODCALLTYPE *Apply)( - IPropertyPage2* This); + IPropertyPage2 *This); HRESULT (STDMETHODCALLTYPE *Help)( - IPropertyPage2* This, + IPropertyPage2 *This, LPCOLESTR pszHelpDir); HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)( - IPropertyPage2* This, + IPropertyPage2 *This, MSG *pMsg); /*** IPropertyPage2 methods ***/ HRESULT (STDMETHODCALLTYPE *EditProperty)( - IPropertyPage2* This, + IPropertyPage2 *This, DISPID dispID); END_INTERFACE } IPropertyPage2Vtbl; + interface IPropertyPage2 { CONST_VTBL IPropertyPage2Vtbl* lpVtbl; }; @@ -2467,14 +2401,6 @@ static FORCEINLINE HRESULT IPropertyPage2_EditProperty(IPropertyPage2* This,DISP #endif -HRESULT STDMETHODCALLTYPE IPropertyPage2_EditProperty_Proxy( - IPropertyPage2* This, - DISPID dispID); -void __RPC_STUB IPropertyPage2_EditProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPropertyPage2_INTERFACE_DEFINED__ */ @@ -2520,35 +2446,36 @@ typedef struct IPropertyPageSiteVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertyPageSite* This, + IPropertyPageSite *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertyPageSite* This); + IPropertyPageSite *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertyPageSite* This); + IPropertyPageSite *This); /*** IPropertyPageSite methods ***/ HRESULT (STDMETHODCALLTYPE *OnStatusChange)( - IPropertyPageSite* This, + IPropertyPageSite *This, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetLocaleID)( - IPropertyPageSite* This, + IPropertyPageSite *This, LCID *pLocaleID); HRESULT (STDMETHODCALLTYPE *GetPageContainer)( - IPropertyPageSite* This, + IPropertyPageSite *This, IUnknown **ppUnk); HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)( - IPropertyPageSite* This, + IPropertyPageSite *This, MSG *pMsg); END_INTERFACE } IPropertyPageSiteVtbl; + interface IPropertyPageSite { CONST_VTBL IPropertyPageSiteVtbl* lpVtbl; }; @@ -2593,38 +2520,6 @@ static FORCEINLINE HRESULT IPropertyPageSite_TranslateAccelerator(IPropertyPageS #endif -HRESULT STDMETHODCALLTYPE IPropertyPageSite_OnStatusChange_Proxy( - IPropertyPageSite* This, - DWORD dwFlags); -void __RPC_STUB IPropertyPageSite_OnStatusChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyPageSite_GetLocaleID_Proxy( - IPropertyPageSite* This, - LCID *pLocaleID); -void __RPC_STUB IPropertyPageSite_GetLocaleID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyPageSite_GetPageContainer_Proxy( - IPropertyPageSite* This, - IUnknown **ppUnk); -void __RPC_STUB IPropertyPageSite_GetPageContainer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyPageSite_TranslateAccelerator_Proxy( - IPropertyPageSite* This, - MSG *pMsg); -void __RPC_STUB IPropertyPageSite_TranslateAccelerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPropertyPageSite_INTERFACE_DEFINED__ */ @@ -2658,27 +2553,28 @@ typedef struct IPropertyNotifySinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertyNotifySink* This, + IPropertyNotifySink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertyNotifySink* This); + IPropertyNotifySink *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertyNotifySink* This); + IPropertyNotifySink *This); /*** IPropertyNotifySink methods ***/ HRESULT (STDMETHODCALLTYPE *OnChanged)( - IPropertyNotifySink* This, + IPropertyNotifySink *This, DISPID dispID); HRESULT (STDMETHODCALLTYPE *OnRequestEdit)( - IPropertyNotifySink* This, + IPropertyNotifySink *This, DISPID dispID); END_INTERFACE } IPropertyNotifySinkVtbl; + interface IPropertyNotifySink { CONST_VTBL IPropertyNotifySinkVtbl* lpVtbl; }; @@ -2715,22 +2611,6 @@ static FORCEINLINE HRESULT IPropertyNotifySink_OnRequestEdit(IPropertyNotifySink #endif -HRESULT STDMETHODCALLTYPE IPropertyNotifySink_OnChanged_Proxy( - IPropertyNotifySink* This, - DISPID dispID); -void __RPC_STUB IPropertyNotifySink_OnChanged_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyNotifySink_OnRequestEdit_Proxy( - IPropertyNotifySink* This, - DISPID dispID); -void __RPC_STUB IPropertyNotifySink_OnRequestEdit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPropertyNotifySink_INTERFACE_DEFINED__ */ @@ -2768,23 +2648,24 @@ typedef struct ISpecifyPropertyPagesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpecifyPropertyPages* This, + ISpecifyPropertyPages *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpecifyPropertyPages* This); + ISpecifyPropertyPages *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpecifyPropertyPages* This); + ISpecifyPropertyPages *This); /*** ISpecifyPropertyPages methods ***/ HRESULT (STDMETHODCALLTYPE *GetPages)( - ISpecifyPropertyPages* This, + ISpecifyPropertyPages *This, CAUUID *pPages); END_INTERFACE } ISpecifyPropertyPagesVtbl; + interface ISpecifyPropertyPages { CONST_VTBL ISpecifyPropertyPagesVtbl* lpVtbl; }; @@ -2817,14 +2698,6 @@ static FORCEINLINE HRESULT ISpecifyPropertyPages_GetPages(ISpecifyPropertyPages* #endif -HRESULT STDMETHODCALLTYPE ISpecifyPropertyPages_GetPages_Proxy( - ISpecifyPropertyPages* This, - CAUUID *pPages); -void __RPC_STUB ISpecifyPropertyPages_GetPages_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpecifyPropertyPages_INTERFACE_DEFINED__ */ @@ -2870,45 +2743,46 @@ typedef struct IPersistMemoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPersistMemory* This, + IPersistMemory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPersistMemory* This); + IPersistMemory *This); ULONG (STDMETHODCALLTYPE *Release)( - IPersistMemory* This); + IPersistMemory *This); /*** IPersist methods ***/ HRESULT (STDMETHODCALLTYPE *GetClassID)( - IPersistMemory* This, + IPersistMemory *This, CLSID *pClassID); /*** IPersistMemory methods ***/ HRESULT (STDMETHODCALLTYPE *IsDirty)( - IPersistMemory* This); + IPersistMemory *This); HRESULT (STDMETHODCALLTYPE *Load)( - IPersistMemory* This, + IPersistMemory *This, LPVOID pMem, ULONG cbSize); HRESULT (STDMETHODCALLTYPE *Save)( - IPersistMemory* This, + IPersistMemory *This, LPVOID pMem, WINBOOL fClearDirty, ULONG cbSize); HRESULT (STDMETHODCALLTYPE *GetSizeMax)( - IPersistMemory* This, + IPersistMemory *This, ULONG *pCbSize); HRESULT (STDMETHODCALLTYPE *InitNew)( - IPersistMemory* This); + IPersistMemory *This); END_INTERFACE } IPersistMemoryVtbl; + interface IPersistMemory { CONST_VTBL IPersistMemoryVtbl* lpVtbl; }; @@ -2963,13 +2837,6 @@ static FORCEINLINE HRESULT IPersistMemory_InitNew(IPersistMemory* This) { #endif -HRESULT STDMETHODCALLTYPE IPersistMemory_IsDirty_Proxy( - IPersistMemory* This); -void __RPC_STUB IPersistMemory_IsDirty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE IPersistMemory_RemoteLoad_Proxy( IPersistMemory* This, BYTE *pMem, @@ -2989,21 +2856,6 @@ void __RPC_STUB IPersistMemory_RemoteSave_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPersistMemory_GetSizeMax_Proxy( - IPersistMemory* This, - ULONG *pCbSize); -void __RPC_STUB IPersistMemory_GetSizeMax_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPersistMemory_InitNew_Proxy( - IPersistMemory* This); -void __RPC_STUB IPersistMemory_InitNew_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IPersistMemory_Load_Proxy( IPersistMemory* This, LPVOID pMem, @@ -3065,43 +2917,44 @@ typedef struct IPersistStreamInitVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPersistStreamInit* This, + IPersistStreamInit *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPersistStreamInit* This); + IPersistStreamInit *This); ULONG (STDMETHODCALLTYPE *Release)( - IPersistStreamInit* This); + IPersistStreamInit *This); /*** IPersist methods ***/ HRESULT (STDMETHODCALLTYPE *GetClassID)( - IPersistStreamInit* This, + IPersistStreamInit *This, CLSID *pClassID); /*** IPersistStreamInit methods ***/ HRESULT (STDMETHODCALLTYPE *IsDirty)( - IPersistStreamInit* This); + IPersistStreamInit *This); HRESULT (STDMETHODCALLTYPE *Load)( - IPersistStreamInit* This, + IPersistStreamInit *This, LPSTREAM pStm); HRESULT (STDMETHODCALLTYPE *Save)( - IPersistStreamInit* This, + IPersistStreamInit *This, LPSTREAM pStm, WINBOOL fClearDirty); HRESULT (STDMETHODCALLTYPE *GetSizeMax)( - IPersistStreamInit* This, + IPersistStreamInit *This, ULARGE_INTEGER *pCbSize); HRESULT (STDMETHODCALLTYPE *InitNew)( - IPersistStreamInit* This); + IPersistStreamInit *This); END_INTERFACE } IPersistStreamInitVtbl; + interface IPersistStreamInit { CONST_VTBL IPersistStreamInitVtbl* lpVtbl; }; @@ -3156,45 +3009,6 @@ static FORCEINLINE HRESULT IPersistStreamInit_InitNew(IPersistStreamInit* This) #endif -HRESULT STDMETHODCALLTYPE IPersistStreamInit_IsDirty_Proxy( - IPersistStreamInit* This); -void __RPC_STUB IPersistStreamInit_IsDirty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPersistStreamInit_Load_Proxy( - IPersistStreamInit* This, - LPSTREAM pStm); -void __RPC_STUB IPersistStreamInit_Load_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPersistStreamInit_Save_Proxy( - IPersistStreamInit* This, - LPSTREAM pStm, - WINBOOL fClearDirty); -void __RPC_STUB IPersistStreamInit_Save_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPersistStreamInit_GetSizeMax_Proxy( - IPersistStreamInit* This, - ULARGE_INTEGER *pCbSize); -void __RPC_STUB IPersistStreamInit_GetSizeMax_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPersistStreamInit_InitNew_Proxy( - IPersistStreamInit* This); -void __RPC_STUB IPersistStreamInit_InitNew_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPersistStreamInit_INTERFACE_DEFINED__ */ @@ -3234,38 +3048,39 @@ typedef struct IPersistPropertyBagVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPersistPropertyBag* This, + IPersistPropertyBag *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPersistPropertyBag* This); + IPersistPropertyBag *This); ULONG (STDMETHODCALLTYPE *Release)( - IPersistPropertyBag* This); + IPersistPropertyBag *This); /*** IPersist methods ***/ HRESULT (STDMETHODCALLTYPE *GetClassID)( - IPersistPropertyBag* This, + IPersistPropertyBag *This, CLSID *pClassID); /*** IPersistPropertyBag methods ***/ HRESULT (STDMETHODCALLTYPE *InitNew)( - IPersistPropertyBag* This); + IPersistPropertyBag *This); HRESULT (STDMETHODCALLTYPE *Load)( - IPersistPropertyBag* This, + IPersistPropertyBag *This, IPropertyBag *pPropBag, IErrorLog *pErrorLog); HRESULT (STDMETHODCALLTYPE *Save)( - IPersistPropertyBag* This, + IPersistPropertyBag *This, IPropertyBag *pPropBag, WINBOOL fClearDirty, WINBOOL fSaveAllProperties); END_INTERFACE } IPersistPropertyBagVtbl; + interface IPersistPropertyBag { CONST_VTBL IPersistPropertyBagVtbl* lpVtbl; }; @@ -3312,32 +3127,6 @@ static FORCEINLINE HRESULT IPersistPropertyBag_Save(IPersistPropertyBag* This,IP #endif -HRESULT STDMETHODCALLTYPE IPersistPropertyBag_InitNew_Proxy( - IPersistPropertyBag* This); -void __RPC_STUB IPersistPropertyBag_InitNew_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPersistPropertyBag_Load_Proxy( - IPersistPropertyBag* This, - IPropertyBag *pPropBag, - IErrorLog *pErrorLog); -void __RPC_STUB IPersistPropertyBag_Load_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPersistPropertyBag_Save_Proxy( - IPersistPropertyBag* This, - IPropertyBag *pPropBag, - WINBOOL fClearDirty, - WINBOOL fSaveAllProperties); -void __RPC_STUB IPersistPropertyBag_Save_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPersistPropertyBag_INTERFACE_DEFINED__ */ @@ -3381,19 +3170,19 @@ typedef struct ISimpleFrameSiteVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISimpleFrameSite* This, + ISimpleFrameSite *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISimpleFrameSite* This); + ISimpleFrameSite *This); ULONG (STDMETHODCALLTYPE *Release)( - ISimpleFrameSite* This); + ISimpleFrameSite *This); /*** ISimpleFrameSite methods ***/ HRESULT (STDMETHODCALLTYPE *PreMessageFilter)( - ISimpleFrameSite* This, + ISimpleFrameSite *This, HWND hWnd, UINT msg, WPARAM wp, @@ -3402,7 +3191,7 @@ typedef struct ISimpleFrameSiteVtbl { DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *PostMessageFilter)( - ISimpleFrameSite* This, + ISimpleFrameSite *This, HWND hWnd, UINT msg, WPARAM wp, @@ -3412,6 +3201,7 @@ typedef struct ISimpleFrameSiteVtbl { END_INTERFACE } ISimpleFrameSiteVtbl; + interface ISimpleFrameSite { CONST_VTBL ISimpleFrameSiteVtbl* lpVtbl; }; @@ -3448,32 +3238,6 @@ static FORCEINLINE HRESULT ISimpleFrameSite_PostMessageFilter(ISimpleFrameSite* #endif -HRESULT STDMETHODCALLTYPE ISimpleFrameSite_PreMessageFilter_Proxy( - ISimpleFrameSite* This, - HWND hWnd, - UINT msg, - WPARAM wp, - LPARAM lp, - LRESULT *plResult, - DWORD *pdwCookie); -void __RPC_STUB ISimpleFrameSite_PreMessageFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISimpleFrameSite_PostMessageFilter_Proxy( - ISimpleFrameSite* This, - HWND hWnd, - UINT msg, - WPARAM wp, - LPARAM lp, - LRESULT *plResult, - DWORD dwCookie); -void __RPC_STUB ISimpleFrameSite_PostMessageFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISimpleFrameSite_INTERFACE_DEFINED__ */ @@ -3582,116 +3346,117 @@ typedef struct IFontVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFont* This, + IFont *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFont* This); + IFont *This); ULONG (STDMETHODCALLTYPE *Release)( - IFont* This); + IFont *This); /*** IFont methods ***/ HRESULT (STDMETHODCALLTYPE *get_Name)( - IFont* This, + IFont *This, BSTR *pName); HRESULT (STDMETHODCALLTYPE *put_Name)( - IFont* This, + IFont *This, BSTR name); HRESULT (STDMETHODCALLTYPE *get_Size)( - IFont* This, + IFont *This, CY *pSize); HRESULT (STDMETHODCALLTYPE *put_Size)( - IFont* This, + IFont *This, CY size); HRESULT (STDMETHODCALLTYPE *get_Bold)( - IFont* This, + IFont *This, WINBOOL *pBold); HRESULT (STDMETHODCALLTYPE *put_Bold)( - IFont* This, + IFont *This, WINBOOL bold); HRESULT (STDMETHODCALLTYPE *get_Italic)( - IFont* This, + IFont *This, WINBOOL *pItalic); HRESULT (STDMETHODCALLTYPE *put_Italic)( - IFont* This, + IFont *This, WINBOOL italic); HRESULT (STDMETHODCALLTYPE *get_Underline)( - IFont* This, + IFont *This, WINBOOL *pUnderline); HRESULT (STDMETHODCALLTYPE *put_Underline)( - IFont* This, + IFont *This, WINBOOL underline); HRESULT (STDMETHODCALLTYPE *get_Strikethrough)( - IFont* This, + IFont *This, WINBOOL *pStrikethrough); HRESULT (STDMETHODCALLTYPE *put_Strikethrough)( - IFont* This, + IFont *This, WINBOOL strikethrough); HRESULT (STDMETHODCALLTYPE *get_Weight)( - IFont* This, + IFont *This, SHORT *pWeight); HRESULT (STDMETHODCALLTYPE *put_Weight)( - IFont* This, + IFont *This, SHORT weight); HRESULT (STDMETHODCALLTYPE *get_Charset)( - IFont* This, + IFont *This, SHORT *pCharset); HRESULT (STDMETHODCALLTYPE *put_Charset)( - IFont* This, + IFont *This, SHORT charset); HRESULT (STDMETHODCALLTYPE *get_hFont)( - IFont* This, + IFont *This, HFONT *phFont); HRESULT (STDMETHODCALLTYPE *Clone)( - IFont* This, + IFont *This, IFont **ppFont); HRESULT (STDMETHODCALLTYPE *IsEqual)( - IFont* This, + IFont *This, IFont *pFontOther); HRESULT (STDMETHODCALLTYPE *SetRatio)( - IFont* This, + IFont *This, LONG cyLogical, LONG cyHimetric); HRESULT (STDMETHODCALLTYPE *QueryTextMetrics)( - IFont* This, + IFont *This, TEXTMETRICOLE *pTM); HRESULT (STDMETHODCALLTYPE *AddRefHfont)( - IFont* This, + IFont *This, HFONT hFont); HRESULT (STDMETHODCALLTYPE *ReleaseHfont)( - IFont* This, + IFont *This, HFONT hFont); HRESULT (STDMETHODCALLTYPE *SetHdc)( - IFont* This, + IFont *This, HDC hDC); END_INTERFACE } IFontVtbl; + interface IFont { CONST_VTBL IFontVtbl* lpVtbl; }; @@ -3816,199 +3581,6 @@ static FORCEINLINE HRESULT IFont_SetHdc(IFont* This,HDC hDC) { #endif -HRESULT STDMETHODCALLTYPE IFont_get_Name_Proxy( - IFont* This, - BSTR *pName); -void __RPC_STUB IFont_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFont_put_Name_Proxy( - IFont* This, - BSTR name); -void __RPC_STUB IFont_put_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFont_get_Size_Proxy( - IFont* This, - CY *pSize); -void __RPC_STUB IFont_get_Size_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFont_put_Size_Proxy( - IFont* This, - CY size); -void __RPC_STUB IFont_put_Size_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFont_get_Bold_Proxy( - IFont* This, - WINBOOL *pBold); -void __RPC_STUB IFont_get_Bold_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFont_put_Bold_Proxy( - IFont* This, - WINBOOL bold); -void __RPC_STUB IFont_put_Bold_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFont_get_Italic_Proxy( - IFont* This, - WINBOOL *pItalic); -void __RPC_STUB IFont_get_Italic_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFont_put_Italic_Proxy( - IFont* This, - WINBOOL italic); -void __RPC_STUB IFont_put_Italic_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFont_get_Underline_Proxy( - IFont* This, - WINBOOL *pUnderline); -void __RPC_STUB IFont_get_Underline_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFont_put_Underline_Proxy( - IFont* This, - WINBOOL underline); -void __RPC_STUB IFont_put_Underline_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFont_get_Strikethrough_Proxy( - IFont* This, - WINBOOL *pStrikethrough); -void __RPC_STUB IFont_get_Strikethrough_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFont_put_Strikethrough_Proxy( - IFont* This, - WINBOOL strikethrough); -void __RPC_STUB IFont_put_Strikethrough_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFont_get_Weight_Proxy( - IFont* This, - SHORT *pWeight); -void __RPC_STUB IFont_get_Weight_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFont_put_Weight_Proxy( - IFont* This, - SHORT weight); -void __RPC_STUB IFont_put_Weight_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFont_get_Charset_Proxy( - IFont* This, - SHORT *pCharset); -void __RPC_STUB IFont_get_Charset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFont_put_Charset_Proxy( - IFont* This, - SHORT charset); -void __RPC_STUB IFont_put_Charset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFont_get_hFont_Proxy( - IFont* This, - HFONT *phFont); -void __RPC_STUB IFont_get_hFont_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFont_Clone_Proxy( - IFont* This, - IFont **ppFont); -void __RPC_STUB IFont_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFont_IsEqual_Proxy( - IFont* This, - IFont *pFontOther); -void __RPC_STUB IFont_IsEqual_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFont_SetRatio_Proxy( - IFont* This, - LONG cyLogical, - LONG cyHimetric); -void __RPC_STUB IFont_SetRatio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFont_QueryTextMetrics_Proxy( - IFont* This, - TEXTMETRICOLE *pTM); -void __RPC_STUB IFont_QueryTextMetrics_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFont_AddRefHfont_Proxy( - IFont* This, - HFONT hFont); -void __RPC_STUB IFont_AddRefHfont_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFont_ReleaseHfont_Proxy( - IFont* This, - HFONT hFont); -void __RPC_STUB IFont_ReleaseHfont_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFont_SetHdc_Proxy( - IFont* This, - HDC hDC); -void __RPC_STUB IFont_SetHdc_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFont_INTERFACE_DEFINED__ */ @@ -4102,39 +3674,39 @@ typedef struct IPictureVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPicture* This, + IPicture *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPicture* This); + IPicture *This); ULONG (STDMETHODCALLTYPE *Release)( - IPicture* This); + IPicture *This); /*** IPicture methods ***/ HRESULT (STDMETHODCALLTYPE *get_Handle)( - IPicture* This, + IPicture *This, OLE_HANDLE *pHandle); HRESULT (STDMETHODCALLTYPE *get_hPal)( - IPicture* This, + IPicture *This, OLE_HANDLE *phPal); HRESULT (STDMETHODCALLTYPE *get_Type)( - IPicture* This, + IPicture *This, SHORT *pType); HRESULT (STDMETHODCALLTYPE *get_Width)( - IPicture* This, + IPicture *This, OLE_XSIZE_HIMETRIC *pWidth); HRESULT (STDMETHODCALLTYPE *get_Height)( - IPicture* This, + IPicture *This, OLE_YSIZE_HIMETRIC *pHeight); HRESULT (STDMETHODCALLTYPE *Render)( - IPicture* This, + IPicture *This, HDC hDC, LONG x, LONG y, @@ -4147,42 +3719,43 @@ typedef struct IPictureVtbl { LPCRECT pRcWBounds); HRESULT (STDMETHODCALLTYPE *set_hPal)( - IPicture* This, + IPicture *This, OLE_HANDLE hPal); HRESULT (STDMETHODCALLTYPE *get_CurDC)( - IPicture* This, + IPicture *This, HDC *phDC); HRESULT (STDMETHODCALLTYPE *SelectPicture)( - IPicture* This, + IPicture *This, HDC hDCIn, HDC *phDCOut, OLE_HANDLE *phBmpOut); HRESULT (STDMETHODCALLTYPE *get_KeepOriginalFormat)( - IPicture* This, + IPicture *This, WINBOOL *pKeep); HRESULT (STDMETHODCALLTYPE *put_KeepOriginalFormat)( - IPicture* This, + IPicture *This, WINBOOL keep); HRESULT (STDMETHODCALLTYPE *PictureChanged)( - IPicture* This); + IPicture *This); HRESULT (STDMETHODCALLTYPE *SaveAsFile)( - IPicture* This, + IPicture *This, LPSTREAM pStream, WINBOOL fSaveMemCopy, LONG *pCbSize); HRESULT (STDMETHODCALLTYPE *get_Attributes)( - IPicture* This, + IPicture *This, DWORD *pDwAttr); END_INTERFACE } IPictureVtbl; + interface IPicture { CONST_VTBL IPictureVtbl* lpVtbl; }; @@ -4267,130 +3840,6 @@ static FORCEINLINE HRESULT IPicture_get_Attributes(IPicture* This,DWORD *pDwAttr #endif -HRESULT STDMETHODCALLTYPE IPicture_get_Handle_Proxy( - IPicture* This, - OLE_HANDLE *pHandle); -void __RPC_STUB IPicture_get_Handle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture_get_hPal_Proxy( - IPicture* This, - OLE_HANDLE *phPal); -void __RPC_STUB IPicture_get_hPal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture_get_Type_Proxy( - IPicture* This, - SHORT *pType); -void __RPC_STUB IPicture_get_Type_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture_get_Width_Proxy( - IPicture* This, - OLE_XSIZE_HIMETRIC *pWidth); -void __RPC_STUB IPicture_get_Width_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture_get_Height_Proxy( - IPicture* This, - OLE_YSIZE_HIMETRIC *pHeight); -void __RPC_STUB IPicture_get_Height_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture_Render_Proxy( - IPicture* This, - HDC hDC, - LONG x, - LONG y, - LONG cx, - LONG cy, - OLE_XPOS_HIMETRIC xSrc, - OLE_YPOS_HIMETRIC ySrc, - OLE_XSIZE_HIMETRIC cxSrc, - OLE_YSIZE_HIMETRIC cySrc, - LPCRECT pRcWBounds); -void __RPC_STUB IPicture_Render_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture_set_hPal_Proxy( - IPicture* This, - OLE_HANDLE hPal); -void __RPC_STUB IPicture_set_hPal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture_get_CurDC_Proxy( - IPicture* This, - HDC *phDC); -void __RPC_STUB IPicture_get_CurDC_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture_SelectPicture_Proxy( - IPicture* This, - HDC hDCIn, - HDC *phDCOut, - OLE_HANDLE *phBmpOut); -void __RPC_STUB IPicture_SelectPicture_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture_get_KeepOriginalFormat_Proxy( - IPicture* This, - WINBOOL *pKeep); -void __RPC_STUB IPicture_get_KeepOriginalFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture_put_KeepOriginalFormat_Proxy( - IPicture* This, - WINBOOL keep); -void __RPC_STUB IPicture_put_KeepOriginalFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture_PictureChanged_Proxy( - IPicture* This); -void __RPC_STUB IPicture_PictureChanged_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture_SaveAsFile_Proxy( - IPicture* This, - LPSTREAM pStream, - WINBOOL fSaveMemCopy, - LONG *pCbSize); -void __RPC_STUB IPicture_SaveAsFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture_get_Attributes_Proxy( - IPicture* This, - DWORD *pDwAttr); -void __RPC_STUB IPicture_get_Attributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPicture_INTERFACE_DEFINED__ */ @@ -4474,39 +3923,39 @@ typedef struct IPicture2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPicture2* This, + IPicture2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPicture2* This); + IPicture2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IPicture2* This); + IPicture2 *This); /*** IPicture2 methods ***/ HRESULT (STDMETHODCALLTYPE *get_Handle)( - IPicture2* This, + IPicture2 *This, HHANDLE *pHandle); HRESULT (STDMETHODCALLTYPE *get_hPal)( - IPicture2* This, + IPicture2 *This, HHANDLE *phPal); HRESULT (STDMETHODCALLTYPE *get_Type)( - IPicture2* This, + IPicture2 *This, SHORT *pType); HRESULT (STDMETHODCALLTYPE *get_Width)( - IPicture2* This, + IPicture2 *This, OLE_XSIZE_HIMETRIC *pWidth); HRESULT (STDMETHODCALLTYPE *get_Height)( - IPicture2* This, + IPicture2 *This, OLE_YSIZE_HIMETRIC *pHeight); HRESULT (STDMETHODCALLTYPE *Render)( - IPicture2* This, + IPicture2 *This, HDC hDC, LONG x, LONG y, @@ -4519,42 +3968,43 @@ typedef struct IPicture2Vtbl { LPCRECT pRcWBounds); HRESULT (STDMETHODCALLTYPE *set_hPal)( - IPicture2* This, + IPicture2 *This, HHANDLE hPal); HRESULT (STDMETHODCALLTYPE *get_CurDC)( - IPicture2* This, + IPicture2 *This, HDC *phDC); HRESULT (STDMETHODCALLTYPE *SelectPicture)( - IPicture2* This, + IPicture2 *This, HDC hDCIn, HDC *phDCOut, HHANDLE *phBmpOut); HRESULT (STDMETHODCALLTYPE *get_KeepOriginalFormat)( - IPicture2* This, + IPicture2 *This, WINBOOL *pKeep); HRESULT (STDMETHODCALLTYPE *put_KeepOriginalFormat)( - IPicture2* This, + IPicture2 *This, WINBOOL keep); HRESULT (STDMETHODCALLTYPE *PictureChanged)( - IPicture2* This); + IPicture2 *This); HRESULT (STDMETHODCALLTYPE *SaveAsFile)( - IPicture2* This, + IPicture2 *This, LPSTREAM pStream, WINBOOL fSaveMemCopy, LONG *pCbSize); HRESULT (STDMETHODCALLTYPE *get_Attributes)( - IPicture2* This, + IPicture2 *This, DWORD *pDwAttr); END_INTERFACE } IPicture2Vtbl; + interface IPicture2 { CONST_VTBL IPicture2Vtbl* lpVtbl; }; @@ -4639,130 +4089,6 @@ static FORCEINLINE HRESULT IPicture2_get_Attributes(IPicture2* This,DWORD *pDwAt #endif -HRESULT STDMETHODCALLTYPE IPicture2_get_Handle_Proxy( - IPicture2* This, - HHANDLE *pHandle); -void __RPC_STUB IPicture2_get_Handle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture2_get_hPal_Proxy( - IPicture2* This, - HHANDLE *phPal); -void __RPC_STUB IPicture2_get_hPal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture2_get_Type_Proxy( - IPicture2* This, - SHORT *pType); -void __RPC_STUB IPicture2_get_Type_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture2_get_Width_Proxy( - IPicture2* This, - OLE_XSIZE_HIMETRIC *pWidth); -void __RPC_STUB IPicture2_get_Width_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture2_get_Height_Proxy( - IPicture2* This, - OLE_YSIZE_HIMETRIC *pHeight); -void __RPC_STUB IPicture2_get_Height_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture2_Render_Proxy( - IPicture2* This, - HDC hDC, - LONG x, - LONG y, - LONG cx, - LONG cy, - OLE_XPOS_HIMETRIC xSrc, - OLE_YPOS_HIMETRIC ySrc, - OLE_XSIZE_HIMETRIC cxSrc, - OLE_YSIZE_HIMETRIC cySrc, - LPCRECT pRcWBounds); -void __RPC_STUB IPicture2_Render_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture2_set_hPal_Proxy( - IPicture2* This, - HHANDLE hPal); -void __RPC_STUB IPicture2_set_hPal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture2_get_CurDC_Proxy( - IPicture2* This, - HDC *phDC); -void __RPC_STUB IPicture2_get_CurDC_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture2_SelectPicture_Proxy( - IPicture2* This, - HDC hDCIn, - HDC *phDCOut, - HHANDLE *phBmpOut); -void __RPC_STUB IPicture2_SelectPicture_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture2_get_KeepOriginalFormat_Proxy( - IPicture2* This, - WINBOOL *pKeep); -void __RPC_STUB IPicture2_get_KeepOriginalFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture2_put_KeepOriginalFormat_Proxy( - IPicture2* This, - WINBOOL keep); -void __RPC_STUB IPicture2_put_KeepOriginalFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture2_PictureChanged_Proxy( - IPicture2* This); -void __RPC_STUB IPicture2_PictureChanged_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture2_SaveAsFile_Proxy( - IPicture2* This, - LPSTREAM pStream, - WINBOOL fSaveMemCopy, - LONG *pCbSize); -void __RPC_STUB IPicture2_SaveAsFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPicture2_get_Attributes_Proxy( - IPicture2* This, - DWORD *pDwAttr); -void __RPC_STUB IPicture2_get_Attributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPicture2_INTERFACE_DEFINED__ */ @@ -4789,29 +4115,29 @@ typedef struct IFontEventsDispVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFontEventsDisp* This, + IFontEventsDisp *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFontEventsDisp* This); + IFontEventsDisp *This); ULONG (STDMETHODCALLTYPE *Release)( - IFontEventsDisp* This); + IFontEventsDisp *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFontEventsDisp* This, + IFontEventsDisp *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFontEventsDisp* This, + IFontEventsDisp *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFontEventsDisp* This, + IFontEventsDisp *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -4819,7 +4145,7 @@ typedef struct IFontEventsDispVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFontEventsDisp* This, + IFontEventsDisp *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -4831,6 +4157,7 @@ typedef struct IFontEventsDispVtbl { END_INTERFACE } IFontEventsDispVtbl; + interface IFontEventsDisp { CONST_VTBL IFontEventsDispVtbl* lpVtbl; }; @@ -4901,29 +4228,29 @@ typedef struct IFontDispVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFontDisp* This, + IFontDisp *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFontDisp* This); + IFontDisp *This); ULONG (STDMETHODCALLTYPE *Release)( - IFontDisp* This); + IFontDisp *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFontDisp* This, + IFontDisp *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFontDisp* This, + IFontDisp *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFontDisp* This, + IFontDisp *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -4931,7 +4258,7 @@ typedef struct IFontDispVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFontDisp* This, + IFontDisp *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -4943,6 +4270,7 @@ typedef struct IFontDispVtbl { END_INTERFACE } IFontDispVtbl; + interface IFontDisp { CONST_VTBL IFontDispVtbl* lpVtbl; }; @@ -5013,29 +4341,29 @@ typedef struct IPictureDispVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPictureDisp* This, + IPictureDisp *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPictureDisp* This); + IPictureDisp *This); ULONG (STDMETHODCALLTYPE *Release)( - IPictureDisp* This); + IPictureDisp *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IPictureDisp* This, + IPictureDisp *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IPictureDisp* This, + IPictureDisp *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IPictureDisp* This, + IPictureDisp *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -5043,7 +4371,7 @@ typedef struct IPictureDispVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IPictureDisp* This, + IPictureDisp *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -5055,6 +4383,7 @@ typedef struct IPictureDispVtbl { END_INTERFACE } IPictureDispVtbl; + interface IPictureDisp { CONST_VTBL IPictureDispVtbl* lpVtbl; }; @@ -5135,54 +4464,55 @@ typedef struct IOleInPlaceObjectWindowlessVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleInPlaceObjectWindowless* This, + IOleInPlaceObjectWindowless *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleInPlaceObjectWindowless* This); + IOleInPlaceObjectWindowless *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleInPlaceObjectWindowless* This); + IOleInPlaceObjectWindowless *This); /*** IOleWindow methods ***/ HRESULT (STDMETHODCALLTYPE *GetWindow)( - IOleInPlaceObjectWindowless* This, + IOleInPlaceObjectWindowless *This, HWND *phwnd); HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)( - IOleInPlaceObjectWindowless* This, + IOleInPlaceObjectWindowless *This, WINBOOL fEnterMode); /*** IOleInPlaceObject methods ***/ HRESULT (STDMETHODCALLTYPE *InPlaceDeactivate)( - IOleInPlaceObjectWindowless* This); + IOleInPlaceObjectWindowless *This); HRESULT (STDMETHODCALLTYPE *UIDeactivate)( - IOleInPlaceObjectWindowless* This); + IOleInPlaceObjectWindowless *This); HRESULT (STDMETHODCALLTYPE *SetObjectRects)( - IOleInPlaceObjectWindowless* This, + IOleInPlaceObjectWindowless *This, LPCRECT lprcPosRect, LPCRECT lprcClipRect); HRESULT (STDMETHODCALLTYPE *ReactivateAndUndo)( - IOleInPlaceObjectWindowless* This); + IOleInPlaceObjectWindowless *This); /*** IOleInPlaceObjectWindowless methods ***/ HRESULT (STDMETHODCALLTYPE *OnWindowMessage)( - IOleInPlaceObjectWindowless* This, + IOleInPlaceObjectWindowless *This, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *plResult); HRESULT (STDMETHODCALLTYPE *GetDropTarget)( - IOleInPlaceObjectWindowless* This, + IOleInPlaceObjectWindowless *This, IDropTarget **ppDropTarget); END_INTERFACE } IOleInPlaceObjectWindowlessVtbl; + interface IOleInPlaceObjectWindowless { CONST_VTBL IOleInPlaceObjectWindowlessVtbl* lpVtbl; }; @@ -5247,25 +4577,6 @@ static FORCEINLINE HRESULT IOleInPlaceObjectWindowless_GetDropTarget(IOleInPlace #endif -HRESULT STDMETHODCALLTYPE IOleInPlaceObjectWindowless_OnWindowMessage_Proxy( - IOleInPlaceObjectWindowless* This, - UINT msg, - WPARAM wParam, - LPARAM lParam, - LRESULT *plResult); -void __RPC_STUB IOleInPlaceObjectWindowless_OnWindowMessage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceObjectWindowless_GetDropTarget_Proxy( - IOleInPlaceObjectWindowless* This, - IDropTarget **ppDropTarget); -void __RPC_STUB IOleInPlaceObjectWindowless_GetDropTarget_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleInPlaceObjectWindowless_INTERFACE_DEFINED__ */ @@ -5307,37 +4618,37 @@ typedef struct IOleInPlaceSiteExVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleInPlaceSiteEx* This, + IOleInPlaceSiteEx *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleInPlaceSiteEx* This); + IOleInPlaceSiteEx *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleInPlaceSiteEx* This); + IOleInPlaceSiteEx *This); /*** IOleWindow methods ***/ HRESULT (STDMETHODCALLTYPE *GetWindow)( - IOleInPlaceSiteEx* This, + IOleInPlaceSiteEx *This, HWND *phwnd); HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)( - IOleInPlaceSiteEx* This, + IOleInPlaceSiteEx *This, WINBOOL fEnterMode); /*** IOleInPlaceSite methods ***/ HRESULT (STDMETHODCALLTYPE *CanInPlaceActivate)( - IOleInPlaceSiteEx* This); + IOleInPlaceSiteEx *This); HRESULT (STDMETHODCALLTYPE *OnInPlaceActivate)( - IOleInPlaceSiteEx* This); + IOleInPlaceSiteEx *This); HRESULT (STDMETHODCALLTYPE *OnUIActivate)( - IOleInPlaceSiteEx* This); + IOleInPlaceSiteEx *This); HRESULT (STDMETHODCALLTYPE *GetWindowContext)( - IOleInPlaceSiteEx* This, + IOleInPlaceSiteEx *This, IOleInPlaceFrame **ppFrame, IOleInPlaceUIWindow **ppDoc, LPRECT lprcPosRect, @@ -5345,41 +4656,42 @@ typedef struct IOleInPlaceSiteExVtbl { LPOLEINPLACEFRAMEINFO lpFrameInfo); HRESULT (STDMETHODCALLTYPE *Scroll)( - IOleInPlaceSiteEx* This, + IOleInPlaceSiteEx *This, SIZE scrollExtant); HRESULT (STDMETHODCALLTYPE *OnUIDeactivate)( - IOleInPlaceSiteEx* This, + IOleInPlaceSiteEx *This, WINBOOL fUndoable); HRESULT (STDMETHODCALLTYPE *OnInPlaceDeactivate)( - IOleInPlaceSiteEx* This); + IOleInPlaceSiteEx *This); HRESULT (STDMETHODCALLTYPE *DiscardUndoState)( - IOleInPlaceSiteEx* This); + IOleInPlaceSiteEx *This); HRESULT (STDMETHODCALLTYPE *DeactivateAndUndo)( - IOleInPlaceSiteEx* This); + IOleInPlaceSiteEx *This); HRESULT (STDMETHODCALLTYPE *OnPosRectChange)( - IOleInPlaceSiteEx* This, + IOleInPlaceSiteEx *This, LPCRECT lprcPosRect); /*** IOleInPlaceSiteEx methods ***/ HRESULT (STDMETHODCALLTYPE *OnInPlaceActivateEx)( - IOleInPlaceSiteEx* This, + IOleInPlaceSiteEx *This, WINBOOL *pfNoRedraw, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *OnInPlaceDeactivateEx)( - IOleInPlaceSiteEx* This, + IOleInPlaceSiteEx *This, WINBOOL fNoRedraw); HRESULT (STDMETHODCALLTYPE *RequestUIActivate)( - IOleInPlaceSiteEx* This); + IOleInPlaceSiteEx *This); END_INTERFACE } IOleInPlaceSiteExVtbl; + interface IOleInPlaceSiteEx { CONST_VTBL IOleInPlaceSiteExVtbl* lpVtbl; }; @@ -5472,30 +4784,6 @@ static FORCEINLINE HRESULT IOleInPlaceSiteEx_RequestUIActivate(IOleInPlaceSiteEx #endif -HRESULT STDMETHODCALLTYPE IOleInPlaceSiteEx_OnInPlaceActivateEx_Proxy( - IOleInPlaceSiteEx* This, - WINBOOL *pfNoRedraw, - DWORD dwFlags); -void __RPC_STUB IOleInPlaceSiteEx_OnInPlaceActivateEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceSiteEx_OnInPlaceDeactivateEx_Proxy( - IOleInPlaceSiteEx* This, - WINBOOL fNoRedraw); -void __RPC_STUB IOleInPlaceSiteEx_OnInPlaceDeactivateEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceSiteEx_RequestUIActivate_Proxy( - IOleInPlaceSiteEx* This); -void __RPC_STUB IOleInPlaceSiteEx_RequestUIActivate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleInPlaceSiteEx_INTERFACE_DEFINED__ */ @@ -5575,37 +4863,37 @@ typedef struct IOleInPlaceSiteWindowlessVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleInPlaceSiteWindowless* This, + IOleInPlaceSiteWindowless *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleInPlaceSiteWindowless* This); + IOleInPlaceSiteWindowless *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleInPlaceSiteWindowless* This); + IOleInPlaceSiteWindowless *This); /*** IOleWindow methods ***/ HRESULT (STDMETHODCALLTYPE *GetWindow)( - IOleInPlaceSiteWindowless* This, + IOleInPlaceSiteWindowless *This, HWND *phwnd); HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)( - IOleInPlaceSiteWindowless* This, + IOleInPlaceSiteWindowless *This, WINBOOL fEnterMode); /*** IOleInPlaceSite methods ***/ HRESULT (STDMETHODCALLTYPE *CanInPlaceActivate)( - IOleInPlaceSiteWindowless* This); + IOleInPlaceSiteWindowless *This); HRESULT (STDMETHODCALLTYPE *OnInPlaceActivate)( - IOleInPlaceSiteWindowless* This); + IOleInPlaceSiteWindowless *This); HRESULT (STDMETHODCALLTYPE *OnUIActivate)( - IOleInPlaceSiteWindowless* This); + IOleInPlaceSiteWindowless *This); HRESULT (STDMETHODCALLTYPE *GetWindowContext)( - IOleInPlaceSiteWindowless* This, + IOleInPlaceSiteWindowless *This, IOleInPlaceFrame **ppFrame, IOleInPlaceUIWindow **ppDoc, LPRECT lprcPosRect, @@ -5613,90 +4901,90 @@ typedef struct IOleInPlaceSiteWindowlessVtbl { LPOLEINPLACEFRAMEINFO lpFrameInfo); HRESULT (STDMETHODCALLTYPE *Scroll)( - IOleInPlaceSiteWindowless* This, + IOleInPlaceSiteWindowless *This, SIZE scrollExtant); HRESULT (STDMETHODCALLTYPE *OnUIDeactivate)( - IOleInPlaceSiteWindowless* This, + IOleInPlaceSiteWindowless *This, WINBOOL fUndoable); HRESULT (STDMETHODCALLTYPE *OnInPlaceDeactivate)( - IOleInPlaceSiteWindowless* This); + IOleInPlaceSiteWindowless *This); HRESULT (STDMETHODCALLTYPE *DiscardUndoState)( - IOleInPlaceSiteWindowless* This); + IOleInPlaceSiteWindowless *This); HRESULT (STDMETHODCALLTYPE *DeactivateAndUndo)( - IOleInPlaceSiteWindowless* This); + IOleInPlaceSiteWindowless *This); HRESULT (STDMETHODCALLTYPE *OnPosRectChange)( - IOleInPlaceSiteWindowless* This, + IOleInPlaceSiteWindowless *This, LPCRECT lprcPosRect); /*** IOleInPlaceSiteEx methods ***/ HRESULT (STDMETHODCALLTYPE *OnInPlaceActivateEx)( - IOleInPlaceSiteWindowless* This, + IOleInPlaceSiteWindowless *This, WINBOOL *pfNoRedraw, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *OnInPlaceDeactivateEx)( - IOleInPlaceSiteWindowless* This, + IOleInPlaceSiteWindowless *This, WINBOOL fNoRedraw); HRESULT (STDMETHODCALLTYPE *RequestUIActivate)( - IOleInPlaceSiteWindowless* This); + IOleInPlaceSiteWindowless *This); /*** IOleInPlaceSiteWindowless methods ***/ HRESULT (STDMETHODCALLTYPE *CanWindowlessActivate)( - IOleInPlaceSiteWindowless* This); + IOleInPlaceSiteWindowless *This); HRESULT (STDMETHODCALLTYPE *GetCapture)( - IOleInPlaceSiteWindowless* This); + IOleInPlaceSiteWindowless *This); HRESULT (STDMETHODCALLTYPE *SetCapture)( - IOleInPlaceSiteWindowless* This, + IOleInPlaceSiteWindowless *This, WINBOOL fCapture); HRESULT (STDMETHODCALLTYPE *GetFocus)( - IOleInPlaceSiteWindowless* This); + IOleInPlaceSiteWindowless *This); HRESULT (STDMETHODCALLTYPE *SetFocus)( - IOleInPlaceSiteWindowless* This, + IOleInPlaceSiteWindowless *This, WINBOOL fFocus); HRESULT (STDMETHODCALLTYPE *GetDC)( - IOleInPlaceSiteWindowless* This, + IOleInPlaceSiteWindowless *This, LPCRECT pRect, DWORD grfFlags, HDC *phDC); HRESULT (STDMETHODCALLTYPE *ReleaseDC)( - IOleInPlaceSiteWindowless* This, + IOleInPlaceSiteWindowless *This, HDC hDC); HRESULT (STDMETHODCALLTYPE *InvalidateRect)( - IOleInPlaceSiteWindowless* This, + IOleInPlaceSiteWindowless *This, LPCRECT pRect, WINBOOL fErase); HRESULT (STDMETHODCALLTYPE *InvalidateRgn)( - IOleInPlaceSiteWindowless* This, + IOleInPlaceSiteWindowless *This, HRGN hRGN, WINBOOL fErase); HRESULT (STDMETHODCALLTYPE *ScrollRect)( - IOleInPlaceSiteWindowless* This, + IOleInPlaceSiteWindowless *This, INT dx, INT dy, LPCRECT pRectScroll, LPCRECT pRectClip); HRESULT (STDMETHODCALLTYPE *AdjustRect)( - IOleInPlaceSiteWindowless* This, + IOleInPlaceSiteWindowless *This, LPRECT prc); HRESULT (STDMETHODCALLTYPE *OnDefWindowMessage)( - IOleInPlaceSiteWindowless* This, + IOleInPlaceSiteWindowless *This, UINT msg, WPARAM wParam, LPARAM lParam, @@ -5704,6 +4992,7 @@ typedef struct IOleInPlaceSiteWindowlessVtbl { END_INTERFACE } IOleInPlaceSiteWindowlessVtbl; + interface IOleInPlaceSiteWindowless { CONST_VTBL IOleInPlaceSiteWindowlessVtbl* lpVtbl; }; @@ -5846,109 +5135,6 @@ static FORCEINLINE HRESULT IOleInPlaceSiteWindowless_OnDefWindowMessage(IOleInPl #endif -HRESULT STDMETHODCALLTYPE IOleInPlaceSiteWindowless_CanWindowlessActivate_Proxy( - IOleInPlaceSiteWindowless* This); -void __RPC_STUB IOleInPlaceSiteWindowless_CanWindowlessActivate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceSiteWindowless_GetCapture_Proxy( - IOleInPlaceSiteWindowless* This); -void __RPC_STUB IOleInPlaceSiteWindowless_GetCapture_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceSiteWindowless_SetCapture_Proxy( - IOleInPlaceSiteWindowless* This, - WINBOOL fCapture); -void __RPC_STUB IOleInPlaceSiteWindowless_SetCapture_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceSiteWindowless_GetFocus_Proxy( - IOleInPlaceSiteWindowless* This); -void __RPC_STUB IOleInPlaceSiteWindowless_GetFocus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceSiteWindowless_SetFocus_Proxy( - IOleInPlaceSiteWindowless* This, - WINBOOL fFocus); -void __RPC_STUB IOleInPlaceSiteWindowless_SetFocus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceSiteWindowless_GetDC_Proxy( - IOleInPlaceSiteWindowless* This, - LPCRECT pRect, - DWORD grfFlags, - HDC *phDC); -void __RPC_STUB IOleInPlaceSiteWindowless_GetDC_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceSiteWindowless_ReleaseDC_Proxy( - IOleInPlaceSiteWindowless* This, - HDC hDC); -void __RPC_STUB IOleInPlaceSiteWindowless_ReleaseDC_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceSiteWindowless_InvalidateRect_Proxy( - IOleInPlaceSiteWindowless* This, - LPCRECT pRect, - WINBOOL fErase); -void __RPC_STUB IOleInPlaceSiteWindowless_InvalidateRect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceSiteWindowless_InvalidateRgn_Proxy( - IOleInPlaceSiteWindowless* This, - HRGN hRGN, - WINBOOL fErase); -void __RPC_STUB IOleInPlaceSiteWindowless_InvalidateRgn_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceSiteWindowless_ScrollRect_Proxy( - IOleInPlaceSiteWindowless* This, - INT dx, - INT dy, - LPCRECT pRectScroll, - LPCRECT pRectClip); -void __RPC_STUB IOleInPlaceSiteWindowless_ScrollRect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceSiteWindowless_AdjustRect_Proxy( - IOleInPlaceSiteWindowless* This, - LPRECT prc); -void __RPC_STUB IOleInPlaceSiteWindowless_AdjustRect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceSiteWindowless_OnDefWindowMessage_Proxy( - IOleInPlaceSiteWindowless* This, - UINT msg, - WPARAM wParam, - LPARAM lParam, - LRESULT *plResult); -void __RPC_STUB IOleInPlaceSiteWindowless_OnDefWindowMessage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleInPlaceSiteWindowless_INTERFACE_DEFINED__ */ @@ -6046,19 +5232,19 @@ typedef struct IViewObjectExVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IViewObjectEx* This, + IViewObjectEx *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IViewObjectEx* This); + IViewObjectEx *This); ULONG (STDMETHODCALLTYPE *Release)( - IViewObjectEx* This); + IViewObjectEx *This); /*** IViewObject methods ***/ HRESULT (STDMETHODCALLTYPE *Draw)( - IViewObjectEx* This, + IViewObjectEx *This, DWORD dwDrawAspect, LONG lindex, void *pvAspect, @@ -6071,7 +5257,7 @@ typedef struct IViewObjectExVtbl { ULONG_PTR dwContinue); HRESULT (STDMETHODCALLTYPE *GetColorSet)( - IViewObjectEx* This, + IViewObjectEx *This, DWORD dwDrawAspect, LONG lindex, void *pvAspect, @@ -6080,31 +5266,31 @@ typedef struct IViewObjectExVtbl { LOGPALETTE **ppColorSet); HRESULT (STDMETHODCALLTYPE *Freeze)( - IViewObjectEx* This, + IViewObjectEx *This, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DWORD *pdwFreeze); HRESULT (STDMETHODCALLTYPE *Unfreeze)( - IViewObjectEx* This, + IViewObjectEx *This, DWORD dwFreeze); HRESULT (STDMETHODCALLTYPE *SetAdvise)( - IViewObjectEx* This, + IViewObjectEx *This, DWORD aspects, DWORD advf, IAdviseSink *pAdvSink); HRESULT (STDMETHODCALLTYPE *GetAdvise)( - IViewObjectEx* This, + IViewObjectEx *This, DWORD *pAspects, DWORD *pAdvf, IAdviseSink **ppAdvSink); /*** IViewObject2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetExtent)( - IViewObjectEx* This, + IViewObjectEx *This, DWORD dwDrawAspect, LONG lindex, DVTARGETDEVICE *ptd, @@ -6112,16 +5298,16 @@ typedef struct IViewObjectExVtbl { /*** IViewObjectEx methods ***/ HRESULT (STDMETHODCALLTYPE *GetRect)( - IViewObjectEx* This, + IViewObjectEx *This, DWORD dwAspect, LPRECTL pRect); HRESULT (STDMETHODCALLTYPE *GetViewStatus)( - IViewObjectEx* This, + IViewObjectEx *This, DWORD *pdwStatus); HRESULT (STDMETHODCALLTYPE *QueryHitPoint)( - IViewObjectEx* This, + IViewObjectEx *This, DWORD dwAspect, LPCRECT pRectBounds, POINT ptlLoc, @@ -6129,7 +5315,7 @@ typedef struct IViewObjectExVtbl { DWORD *pHitResult); HRESULT (STDMETHODCALLTYPE *QueryHitRect)( - IViewObjectEx* This, + IViewObjectEx *This, DWORD dwAspect, LPCRECT pRectBounds, LPCRECT pRectLoc, @@ -6137,7 +5323,7 @@ typedef struct IViewObjectExVtbl { DWORD *pHitResult); HRESULT (STDMETHODCALLTYPE *GetNaturalExtent)( - IViewObjectEx* This, + IViewObjectEx *This, DWORD dwAspect, LONG lindex, DVTARGETDEVICE *ptd, @@ -6147,6 +5333,7 @@ typedef struct IViewObjectExVtbl { END_INTERFACE } IViewObjectExVtbl; + interface IViewObjectEx { CONST_VTBL IViewObjectExVtbl* lpVtbl; }; @@ -6227,60 +5414,6 @@ static FORCEINLINE HRESULT IViewObjectEx_GetNaturalExtent(IViewObjectEx* This,DW #endif -HRESULT STDMETHODCALLTYPE IViewObjectEx_GetRect_Proxy( - IViewObjectEx* This, - DWORD dwAspect, - LPRECTL pRect); -void __RPC_STUB IViewObjectEx_GetRect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IViewObjectEx_GetViewStatus_Proxy( - IViewObjectEx* This, - DWORD *pdwStatus); -void __RPC_STUB IViewObjectEx_GetViewStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IViewObjectEx_QueryHitPoint_Proxy( - IViewObjectEx* This, - DWORD dwAspect, - LPCRECT pRectBounds, - POINT ptlLoc, - LONG lCloseHint, - DWORD *pHitResult); -void __RPC_STUB IViewObjectEx_QueryHitPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IViewObjectEx_QueryHitRect_Proxy( - IViewObjectEx* This, - DWORD dwAspect, - LPCRECT pRectBounds, - LPCRECT pRectLoc, - LONG lCloseHint, - DWORD *pHitResult); -void __RPC_STUB IViewObjectEx_QueryHitRect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IViewObjectEx_GetNaturalExtent_Proxy( - IViewObjectEx* This, - DWORD dwAspect, - LONG lindex, - DVTARGETDEVICE *ptd, - HDC hicTargetDev, - DVEXTENTINFO *pExtentInfo, - LPSIZEL pSizel); -void __RPC_STUB IViewObjectEx_GetNaturalExtent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IViewObjectEx_INTERFACE_DEFINED__ */ @@ -6321,35 +5454,36 @@ typedef struct IOleUndoUnitVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleUndoUnit* This, + IOleUndoUnit *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleUndoUnit* This); + IOleUndoUnit *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleUndoUnit* This); + IOleUndoUnit *This); /*** IOleUndoUnit methods ***/ HRESULT (STDMETHODCALLTYPE *Do)( - IOleUndoUnit* This, + IOleUndoUnit *This, IOleUndoManager *pUndoManager); HRESULT (STDMETHODCALLTYPE *GetDescription)( - IOleUndoUnit* This, + IOleUndoUnit *This, BSTR *pBstr); HRESULT (STDMETHODCALLTYPE *GetUnitType)( - IOleUndoUnit* This, + IOleUndoUnit *This, CLSID *pClsid, LONG *plID); HRESULT (STDMETHODCALLTYPE *OnNextAdd)( - IOleUndoUnit* This); + IOleUndoUnit *This); END_INTERFACE } IOleUndoUnitVtbl; + interface IOleUndoUnit { CONST_VTBL IOleUndoUnitVtbl* lpVtbl; }; @@ -6394,38 +5528,6 @@ static FORCEINLINE HRESULT IOleUndoUnit_OnNextAdd(IOleUndoUnit* This) { #endif -HRESULT STDMETHODCALLTYPE IOleUndoUnit_Do_Proxy( - IOleUndoUnit* This, - IOleUndoManager *pUndoManager); -void __RPC_STUB IOleUndoUnit_Do_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleUndoUnit_GetDescription_Proxy( - IOleUndoUnit* This, - BSTR *pBstr); -void __RPC_STUB IOleUndoUnit_GetDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleUndoUnit_GetUnitType_Proxy( - IOleUndoUnit* This, - CLSID *pClsid, - LONG *plID); -void __RPC_STUB IOleUndoUnit_GetUnitType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleUndoUnit_OnNextAdd_Proxy( - IOleUndoUnit* This); -void __RPC_STUB IOleUndoUnit_OnNextAdd_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleUndoUnit_INTERFACE_DEFINED__ */ @@ -6469,57 +5571,58 @@ typedef struct IOleParentUndoUnitVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleParentUndoUnit* This, + IOleParentUndoUnit *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleParentUndoUnit* This); + IOleParentUndoUnit *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleParentUndoUnit* This); + IOleParentUndoUnit *This); /*** IOleUndoUnit methods ***/ HRESULT (STDMETHODCALLTYPE *Do)( - IOleParentUndoUnit* This, + IOleParentUndoUnit *This, IOleUndoManager *pUndoManager); HRESULT (STDMETHODCALLTYPE *GetDescription)( - IOleParentUndoUnit* This, + IOleParentUndoUnit *This, BSTR *pBstr); HRESULT (STDMETHODCALLTYPE *GetUnitType)( - IOleParentUndoUnit* This, + IOleParentUndoUnit *This, CLSID *pClsid, LONG *plID); HRESULT (STDMETHODCALLTYPE *OnNextAdd)( - IOleParentUndoUnit* This); + IOleParentUndoUnit *This); /*** IOleParentUndoUnit methods ***/ HRESULT (STDMETHODCALLTYPE *Open)( - IOleParentUndoUnit* This, + IOleParentUndoUnit *This, IOleParentUndoUnit *pPUU); HRESULT (STDMETHODCALLTYPE *Close)( - IOleParentUndoUnit* This, + IOleParentUndoUnit *This, IOleParentUndoUnit *pPUU, WINBOOL fCommit); HRESULT (STDMETHODCALLTYPE *Add)( - IOleParentUndoUnit* This, + IOleParentUndoUnit *This, IOleUndoUnit *pUU); HRESULT (STDMETHODCALLTYPE *FindUnit)( - IOleParentUndoUnit* This, + IOleParentUndoUnit *This, IOleUndoUnit *pUU); HRESULT (STDMETHODCALLTYPE *GetParentState)( - IOleParentUndoUnit* This, + IOleParentUndoUnit *This, DWORD *pdwState); END_INTERFACE } IOleParentUndoUnitVtbl; + interface IOleParentUndoUnit { CONST_VTBL IOleParentUndoUnitVtbl* lpVtbl; }; @@ -6586,47 +5689,6 @@ static FORCEINLINE HRESULT IOleParentUndoUnit_GetParentState(IOleParentUndoUnit* #endif -HRESULT STDMETHODCALLTYPE IOleParentUndoUnit_Open_Proxy( - IOleParentUndoUnit* This, - IOleParentUndoUnit *pPUU); -void __RPC_STUB IOleParentUndoUnit_Open_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleParentUndoUnit_Close_Proxy( - IOleParentUndoUnit* This, - IOleParentUndoUnit *pPUU, - WINBOOL fCommit); -void __RPC_STUB IOleParentUndoUnit_Close_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleParentUndoUnit_Add_Proxy( - IOleParentUndoUnit* This, - IOleUndoUnit *pUU); -void __RPC_STUB IOleParentUndoUnit_Add_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleParentUndoUnit_FindUnit_Proxy( - IOleParentUndoUnit* This, - IOleUndoUnit *pUU); -void __RPC_STUB IOleParentUndoUnit_FindUnit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleParentUndoUnit_GetParentState_Proxy( - IOleParentUndoUnit* This, - DWORD *pdwState); -void __RPC_STUB IOleParentUndoUnit_GetParentState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleParentUndoUnit_INTERFACE_DEFINED__ */ @@ -6668,36 +5730,37 @@ typedef struct IEnumOleUndoUnitsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumOleUndoUnits* This, + IEnumOleUndoUnits *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumOleUndoUnits* This); + IEnumOleUndoUnits *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumOleUndoUnits* This); + IEnumOleUndoUnits *This); /*** IEnumOleUndoUnits methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumOleUndoUnits* This, + IEnumOleUndoUnits *This, ULONG cElt, IOleUndoUnit **rgElt, ULONG *pcEltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumOleUndoUnits* This, + IEnumOleUndoUnits *This, ULONG cElt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumOleUndoUnits* This); + IEnumOleUndoUnits *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumOleUndoUnits* This, + IEnumOleUndoUnits *This, IEnumOleUndoUnits **ppEnum); END_INTERFACE } IEnumOleUndoUnitsVtbl; + interface IEnumOleUndoUnits { CONST_VTBL IEnumOleUndoUnitsVtbl* lpVtbl; }; @@ -6752,29 +5815,6 @@ void __RPC_STUB IEnumOleUndoUnits_RemoteNext_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumOleUndoUnits_Skip_Proxy( - IEnumOleUndoUnits* This, - ULONG cElt); -void __RPC_STUB IEnumOleUndoUnits_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumOleUndoUnits_Reset_Proxy( - IEnumOleUndoUnits* This); -void __RPC_STUB IEnumOleUndoUnits_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumOleUndoUnits_Clone_Proxy( - IEnumOleUndoUnits* This, - IEnumOleUndoUnits **ppEnum); -void __RPC_STUB IEnumOleUndoUnits_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IEnumOleUndoUnits_Next_Proxy( IEnumOleUndoUnits* This, ULONG cElt, @@ -6851,68 +5891,69 @@ typedef struct IOleUndoManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleUndoManager* This, + IOleUndoManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleUndoManager* This); + IOleUndoManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleUndoManager* This); + IOleUndoManager *This); /*** IOleUndoManager methods ***/ HRESULT (STDMETHODCALLTYPE *Open)( - IOleUndoManager* This, + IOleUndoManager *This, IOleParentUndoUnit *pPUU); HRESULT (STDMETHODCALLTYPE *Close)( - IOleUndoManager* This, + IOleUndoManager *This, IOleParentUndoUnit *pPUU, WINBOOL fCommit); HRESULT (STDMETHODCALLTYPE *Add)( - IOleUndoManager* This, + IOleUndoManager *This, IOleUndoUnit *pUU); HRESULT (STDMETHODCALLTYPE *GetOpenParentState)( - IOleUndoManager* This, + IOleUndoManager *This, DWORD *pdwState); HRESULT (STDMETHODCALLTYPE *DiscardFrom)( - IOleUndoManager* This, + IOleUndoManager *This, IOleUndoUnit *pUU); HRESULT (STDMETHODCALLTYPE *UndoTo)( - IOleUndoManager* This, + IOleUndoManager *This, IOleUndoUnit *pUU); HRESULT (STDMETHODCALLTYPE *RedoTo)( - IOleUndoManager* This, + IOleUndoManager *This, IOleUndoUnit *pUU); HRESULT (STDMETHODCALLTYPE *EnumUndoable)( - IOleUndoManager* This, + IOleUndoManager *This, IEnumOleUndoUnits **ppEnum); HRESULT (STDMETHODCALLTYPE *EnumRedoable)( - IOleUndoManager* This, + IOleUndoManager *This, IEnumOleUndoUnits **ppEnum); HRESULT (STDMETHODCALLTYPE *GetLastUndoDescription)( - IOleUndoManager* This, + IOleUndoManager *This, BSTR *pBstr); HRESULT (STDMETHODCALLTYPE *GetLastRedoDescription)( - IOleUndoManager* This, + IOleUndoManager *This, BSTR *pBstr); HRESULT (STDMETHODCALLTYPE *Enable)( - IOleUndoManager* This, + IOleUndoManager *This, WINBOOL fEnable); END_INTERFACE } IOleUndoManagerVtbl; + interface IOleUndoManager { CONST_VTBL IOleUndoManagerVtbl* lpVtbl; }; @@ -6989,103 +6030,6 @@ static FORCEINLINE HRESULT IOleUndoManager_Enable(IOleUndoManager* This,WINBOOL #endif -HRESULT STDMETHODCALLTYPE IOleUndoManager_Open_Proxy( - IOleUndoManager* This, - IOleParentUndoUnit *pPUU); -void __RPC_STUB IOleUndoManager_Open_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleUndoManager_Close_Proxy( - IOleUndoManager* This, - IOleParentUndoUnit *pPUU, - WINBOOL fCommit); -void __RPC_STUB IOleUndoManager_Close_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleUndoManager_Add_Proxy( - IOleUndoManager* This, - IOleUndoUnit *pUU); -void __RPC_STUB IOleUndoManager_Add_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleUndoManager_GetOpenParentState_Proxy( - IOleUndoManager* This, - DWORD *pdwState); -void __RPC_STUB IOleUndoManager_GetOpenParentState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleUndoManager_DiscardFrom_Proxy( - IOleUndoManager* This, - IOleUndoUnit *pUU); -void __RPC_STUB IOleUndoManager_DiscardFrom_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleUndoManager_UndoTo_Proxy( - IOleUndoManager* This, - IOleUndoUnit *pUU); -void __RPC_STUB IOleUndoManager_UndoTo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleUndoManager_RedoTo_Proxy( - IOleUndoManager* This, - IOleUndoUnit *pUU); -void __RPC_STUB IOleUndoManager_RedoTo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleUndoManager_EnumUndoable_Proxy( - IOleUndoManager* This, - IEnumOleUndoUnits **ppEnum); -void __RPC_STUB IOleUndoManager_EnumUndoable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleUndoManager_EnumRedoable_Proxy( - IOleUndoManager* This, - IEnumOleUndoUnits **ppEnum); -void __RPC_STUB IOleUndoManager_EnumRedoable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleUndoManager_GetLastUndoDescription_Proxy( - IOleUndoManager* This, - BSTR *pBstr); -void __RPC_STUB IOleUndoManager_GetLastUndoDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleUndoManager_GetLastRedoDescription_Proxy( - IOleUndoManager* This, - BSTR *pBstr); -void __RPC_STUB IOleUndoManager_GetLastRedoDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleUndoManager_Enable_Proxy( - IOleUndoManager* This, - WINBOOL fEnable); -void __RPC_STUB IOleUndoManager_Enable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleUndoManager_INTERFACE_DEFINED__ */ @@ -7135,30 +6079,30 @@ typedef struct IPointerInactiveVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPointerInactive* This, + IPointerInactive *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPointerInactive* This); + IPointerInactive *This); ULONG (STDMETHODCALLTYPE *Release)( - IPointerInactive* This); + IPointerInactive *This); /*** IPointerInactive methods ***/ HRESULT (STDMETHODCALLTYPE *GetActivationPolicy)( - IPointerInactive* This, + IPointerInactive *This, DWORD *pdwPolicy); HRESULT (STDMETHODCALLTYPE *OnInactiveMouseMove)( - IPointerInactive* This, + IPointerInactive *This, LPCRECT pRectBounds, LONG x, LONG y, DWORD grfKeyState); HRESULT (STDMETHODCALLTYPE *OnInactiveSetCursor)( - IPointerInactive* This, + IPointerInactive *This, LPCRECT pRectBounds, LONG x, LONG y, @@ -7167,6 +6111,7 @@ typedef struct IPointerInactiveVtbl { END_INTERFACE } IPointerInactiveVtbl; + interface IPointerInactive { CONST_VTBL IPointerInactiveVtbl* lpVtbl; }; @@ -7207,37 +6152,6 @@ static FORCEINLINE HRESULT IPointerInactive_OnInactiveSetCursor(IPointerInactive #endif -HRESULT STDMETHODCALLTYPE IPointerInactive_GetActivationPolicy_Proxy( - IPointerInactive* This, - DWORD *pdwPolicy); -void __RPC_STUB IPointerInactive_GetActivationPolicy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPointerInactive_OnInactiveMouseMove_Proxy( - IPointerInactive* This, - LPCRECT pRectBounds, - LONG x, - LONG y, - DWORD grfKeyState); -void __RPC_STUB IPointerInactive_OnInactiveMouseMove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPointerInactive_OnInactiveSetCursor_Proxy( - IPointerInactive* This, - LPCRECT pRectBounds, - LONG x, - LONG y, - DWORD dwMouseMsg, - WINBOOL fSetAlways); -void __RPC_STUB IPointerInactive_OnInactiveSetCursor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPointerInactive_INTERFACE_DEFINED__ */ @@ -7272,28 +6186,29 @@ typedef struct IObjectWithSiteVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IObjectWithSite* This, + IObjectWithSite *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IObjectWithSite* This); + IObjectWithSite *This); ULONG (STDMETHODCALLTYPE *Release)( - IObjectWithSite* This); + IObjectWithSite *This); /*** IObjectWithSite methods ***/ HRESULT (STDMETHODCALLTYPE *SetSite)( - IObjectWithSite* This, + IObjectWithSite *This, IUnknown *pUnkSite); HRESULT (STDMETHODCALLTYPE *GetSite)( - IObjectWithSite* This, + IObjectWithSite *This, REFIID riid, void **ppvSite); END_INTERFACE } IObjectWithSiteVtbl; + interface IObjectWithSite { CONST_VTBL IObjectWithSiteVtbl* lpVtbl; }; @@ -7330,23 +6245,6 @@ static FORCEINLINE HRESULT IObjectWithSite_GetSite(IObjectWithSite* This,REFIID #endif -HRESULT STDMETHODCALLTYPE IObjectWithSite_SetSite_Proxy( - IObjectWithSite* This, - IUnknown *pUnkSite); -void __RPC_STUB IObjectWithSite_SetSite_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IObjectWithSite_GetSite_Proxy( - IObjectWithSite* This, - REFIID riid, - void **ppvSite); -void __RPC_STUB IObjectWithSite_GetSite_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IObjectWithSite_INTERFACE_DEFINED__ */ @@ -7408,41 +6306,42 @@ typedef struct IPerPropertyBrowsingVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPerPropertyBrowsing* This, + IPerPropertyBrowsing *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPerPropertyBrowsing* This); + IPerPropertyBrowsing *This); ULONG (STDMETHODCALLTYPE *Release)( - IPerPropertyBrowsing* This); + IPerPropertyBrowsing *This); /*** IPerPropertyBrowsing methods ***/ HRESULT (STDMETHODCALLTYPE *GetDisplayString)( - IPerPropertyBrowsing* This, + IPerPropertyBrowsing *This, DISPID dispID, BSTR *pBstr); HRESULT (STDMETHODCALLTYPE *MapPropertyToPage)( - IPerPropertyBrowsing* This, + IPerPropertyBrowsing *This, DISPID dispID, CLSID *pClsid); HRESULT (STDMETHODCALLTYPE *GetPredefinedStrings)( - IPerPropertyBrowsing* This, + IPerPropertyBrowsing *This, DISPID dispID, CALPOLESTR *pCaStringsOut, CADWORD *pCaCookiesOut); HRESULT (STDMETHODCALLTYPE *GetPredefinedValue)( - IPerPropertyBrowsing* This, + IPerPropertyBrowsing *This, DISPID dispID, DWORD dwCookie, VARIANT *pVarOut); END_INTERFACE } IPerPropertyBrowsingVtbl; + interface IPerPropertyBrowsing { CONST_VTBL IPerPropertyBrowsingVtbl* lpVtbl; }; @@ -7487,44 +6386,6 @@ static FORCEINLINE HRESULT IPerPropertyBrowsing_GetPredefinedValue(IPerPropertyB #endif -HRESULT STDMETHODCALLTYPE IPerPropertyBrowsing_GetDisplayString_Proxy( - IPerPropertyBrowsing* This, - DISPID dispID, - BSTR *pBstr); -void __RPC_STUB IPerPropertyBrowsing_GetDisplayString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPerPropertyBrowsing_MapPropertyToPage_Proxy( - IPerPropertyBrowsing* This, - DISPID dispID, - CLSID *pClsid); -void __RPC_STUB IPerPropertyBrowsing_MapPropertyToPage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPerPropertyBrowsing_GetPredefinedStrings_Proxy( - IPerPropertyBrowsing* This, - DISPID dispID, - CALPOLESTR *pCaStringsOut, - CADWORD *pCaCookiesOut); -void __RPC_STUB IPerPropertyBrowsing_GetPredefinedStrings_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPerPropertyBrowsing_GetPredefinedValue_Proxy( - IPerPropertyBrowsing* This, - DISPID dispID, - DWORD dwCookie, - VARIANT *pVarOut); -void __RPC_STUB IPerPropertyBrowsing_GetPredefinedValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPerPropertyBrowsing_INTERFACE_DEFINED__ */ @@ -7600,19 +6461,19 @@ typedef struct IPropertyBag2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertyBag2* This, + IPropertyBag2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertyBag2* This); + IPropertyBag2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertyBag2* This); + IPropertyBag2 *This); /*** IPropertyBag2 methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - IPropertyBag2* This, + IPropertyBag2 *This, ULONG cProperties, PROPBAG2 *pPropBag, IErrorLog *pErrLog, @@ -7620,24 +6481,24 @@ typedef struct IPropertyBag2Vtbl { HRESULT *phrError); HRESULT (STDMETHODCALLTYPE *Write)( - IPropertyBag2* This, + IPropertyBag2 *This, ULONG cProperties, PROPBAG2 *pPropBag, VARIANT *pvarValue); HRESULT (STDMETHODCALLTYPE *CountProperties)( - IPropertyBag2* This, + IPropertyBag2 *This, ULONG *pcProperties); HRESULT (STDMETHODCALLTYPE *GetPropertyInfo)( - IPropertyBag2* This, + IPropertyBag2 *This, ULONG iProperty, ULONG cProperties, PROPBAG2 *pPropBag, ULONG *pcProperties); HRESULT (STDMETHODCALLTYPE *LoadObject)( - IPropertyBag2* This, + IPropertyBag2 *This, LPCOLESTR pstrName, DWORD dwHint, IUnknown *pUnkObject, @@ -7645,6 +6506,7 @@ typedef struct IPropertyBag2Vtbl { END_INTERFACE } IPropertyBag2Vtbl; + interface IPropertyBag2 { CONST_VTBL IPropertyBag2Vtbl* lpVtbl; }; @@ -7693,58 +6555,6 @@ static FORCEINLINE HRESULT IPropertyBag2_LoadObject(IPropertyBag2* This,LPCOLEST #endif -HRESULT STDMETHODCALLTYPE IPropertyBag2_Read_Proxy( - IPropertyBag2* This, - ULONG cProperties, - PROPBAG2 *pPropBag, - IErrorLog *pErrLog, - VARIANT *pvarValue, - HRESULT *phrError); -void __RPC_STUB IPropertyBag2_Read_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyBag2_Write_Proxy( - IPropertyBag2* This, - ULONG cProperties, - PROPBAG2 *pPropBag, - VARIANT *pvarValue); -void __RPC_STUB IPropertyBag2_Write_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyBag2_CountProperties_Proxy( - IPropertyBag2* This, - ULONG *pcProperties); -void __RPC_STUB IPropertyBag2_CountProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyBag2_GetPropertyInfo_Proxy( - IPropertyBag2* This, - ULONG iProperty, - ULONG cProperties, - PROPBAG2 *pPropBag, - ULONG *pcProperties); -void __RPC_STUB IPropertyBag2_GetPropertyInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyBag2_LoadObject_Proxy( - IPropertyBag2* This, - LPCOLESTR pstrName, - DWORD dwHint, - IUnknown *pUnkObject, - IErrorLog *pErrLog); -void __RPC_STUB IPropertyBag2_LoadObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPropertyBag2_INTERFACE_DEFINED__ */ @@ -7789,41 +6599,42 @@ typedef struct IPersistPropertyBag2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPersistPropertyBag2* This, + IPersistPropertyBag2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPersistPropertyBag2* This); + IPersistPropertyBag2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IPersistPropertyBag2* This); + IPersistPropertyBag2 *This); /*** IPersist methods ***/ HRESULT (STDMETHODCALLTYPE *GetClassID)( - IPersistPropertyBag2* This, + IPersistPropertyBag2 *This, CLSID *pClassID); /*** IPersistPropertyBag2 methods ***/ HRESULT (STDMETHODCALLTYPE *InitNew)( - IPersistPropertyBag2* This); + IPersistPropertyBag2 *This); HRESULT (STDMETHODCALLTYPE *Load)( - IPersistPropertyBag2* This, + IPersistPropertyBag2 *This, IPropertyBag2 *pPropBag, IErrorLog *pErrLog); HRESULT (STDMETHODCALLTYPE *Save)( - IPersistPropertyBag2* This, + IPersistPropertyBag2 *This, IPropertyBag2 *pPropBag, WINBOOL fClearDirty, WINBOOL fSaveAllProperties); HRESULT (STDMETHODCALLTYPE *IsDirty)( - IPersistPropertyBag2* This); + IPersistPropertyBag2 *This); END_INTERFACE } IPersistPropertyBag2Vtbl; + interface IPersistPropertyBag2 { CONST_VTBL IPersistPropertyBag2Vtbl* lpVtbl; }; @@ -7874,39 +6685,6 @@ static FORCEINLINE HRESULT IPersistPropertyBag2_IsDirty(IPersistPropertyBag2* Th #endif -HRESULT STDMETHODCALLTYPE IPersistPropertyBag2_InitNew_Proxy( - IPersistPropertyBag2* This); -void __RPC_STUB IPersistPropertyBag2_InitNew_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPersistPropertyBag2_Load_Proxy( - IPersistPropertyBag2* This, - IPropertyBag2 *pPropBag, - IErrorLog *pErrLog); -void __RPC_STUB IPersistPropertyBag2_Load_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPersistPropertyBag2_Save_Proxy( - IPersistPropertyBag2* This, - IPropertyBag2 *pPropBag, - WINBOOL fClearDirty, - WINBOOL fSaveAllProperties); -void __RPC_STUB IPersistPropertyBag2_Save_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPersistPropertyBag2_IsDirty_Proxy( - IPersistPropertyBag2* This); -void __RPC_STUB IPersistPropertyBag2_IsDirty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPersistPropertyBag2_INTERFACE_DEFINED__ */ @@ -7939,44 +6717,45 @@ typedef struct IAdviseSinkExVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAdviseSinkEx* This, + IAdviseSinkEx *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAdviseSinkEx* This); + IAdviseSinkEx *This); ULONG (STDMETHODCALLTYPE *Release)( - IAdviseSinkEx* This); + IAdviseSinkEx *This); /*** IAdviseSink methods ***/ void (STDMETHODCALLTYPE *OnDataChange)( - IAdviseSinkEx* This, + IAdviseSinkEx *This, FORMATETC *pFormatetc, STGMEDIUM *pStgmed); void (STDMETHODCALLTYPE *OnViewChange)( - IAdviseSinkEx* This, + IAdviseSinkEx *This, DWORD dwAspect, LONG lindex); void (STDMETHODCALLTYPE *OnRename)( - IAdviseSinkEx* This, + IAdviseSinkEx *This, IMoniker *pmk); void (STDMETHODCALLTYPE *OnSave)( - IAdviseSinkEx* This); + IAdviseSinkEx *This); void (STDMETHODCALLTYPE *OnClose)( - IAdviseSinkEx* This); + IAdviseSinkEx *This); /*** IAdviseSinkEx methods ***/ void (STDMETHODCALLTYPE *OnViewStatusChange)( - IAdviseSinkEx* This, + IAdviseSinkEx *This, DWORD dwViewStatus); END_INTERFACE } IAdviseSinkExVtbl; + interface IAdviseSinkEx { CONST_VTBL IAdviseSinkExVtbl* lpVtbl; }; @@ -8125,32 +6904,33 @@ typedef struct IQuickActivateVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IQuickActivate* This, + IQuickActivate *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IQuickActivate* This); + IQuickActivate *This); ULONG (STDMETHODCALLTYPE *Release)( - IQuickActivate* This); + IQuickActivate *This); /*** IQuickActivate methods ***/ HRESULT (STDMETHODCALLTYPE *QuickActivate)( - IQuickActivate* This, + IQuickActivate *This, QACONTAINER *pQaContainer, QACONTROL *pQaControl); HRESULT (STDMETHODCALLTYPE *SetContentExtent)( - IQuickActivate* This, + IQuickActivate *This, LPSIZEL pSizel); HRESULT (STDMETHODCALLTYPE *GetContentExtent)( - IQuickActivate* This, + IQuickActivate *This, LPSIZEL pSizel); END_INTERFACE } IQuickActivateVtbl; + interface IQuickActivate { CONST_VTBL IQuickActivateVtbl* lpVtbl; }; @@ -8200,22 +6980,6 @@ void __RPC_STUB IQuickActivate_RemoteQuickActivate_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IQuickActivate_SetContentExtent_Proxy( - IQuickActivate* This, - LPSIZEL pSizel); -void __RPC_STUB IQuickActivate_SetContentExtent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IQuickActivate_GetContentExtent_Proxy( - IQuickActivate* This, - LPSIZEL pSizel); -void __RPC_STUB IQuickActivate_GetContentExtent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IQuickActivate_QuickActivate_Proxy( IQuickActivate* This, QACONTAINER *pQaContainer, diff --git a/lib/libc/include/any-windows-any/oleacc.h b/lib/libc/include/any-windows-any/oleacc.h index 36b5318f2f..7719fd37e3 100644 --- a/lib/libc/include/any-windows-any/oleacc.h +++ b/lib/libc/include/any-windows-any/oleacc.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/oleacc.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/oleacc.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,6 +21,9 @@ #ifndef __IAccessible_FWD_DEFINED__ #define __IAccessible_FWD_DEFINED__ typedef interface IAccessible IAccessible; +#ifdef __cplusplus +interface IAccessible; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -422,29 +426,29 @@ typedef struct IAccessibleVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAccessible* This, + IAccessible *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAccessible* This); + IAccessible *This); ULONG (STDMETHODCALLTYPE *Release)( - IAccessible* This); + IAccessible *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IAccessible* This, + IAccessible *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IAccessible* This, + IAccessible *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IAccessible* This, + IAccessible *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -452,7 +456,7 @@ typedef struct IAccessibleVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IAccessible* This, + IAccessible *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -464,79 +468,79 @@ typedef struct IAccessibleVtbl { /*** IAccessible methods ***/ HRESULT (STDMETHODCALLTYPE *get_accParent)( - IAccessible* This, + IAccessible *This, IDispatch **ppdispParent); HRESULT (STDMETHODCALLTYPE *get_accChildCount)( - IAccessible* This, + IAccessible *This, LONG *pcountChildren); HRESULT (STDMETHODCALLTYPE *get_accChild)( - IAccessible* This, + IAccessible *This, VARIANT varChildID, IDispatch **ppdispChild); HRESULT (STDMETHODCALLTYPE *get_accName)( - IAccessible* This, + IAccessible *This, VARIANT varID, BSTR *pszName); HRESULT (STDMETHODCALLTYPE *get_accValue)( - IAccessible* This, + IAccessible *This, VARIANT varID, BSTR *pszValue); HRESULT (STDMETHODCALLTYPE *get_accDescription)( - IAccessible* This, + IAccessible *This, VARIANT varID, BSTR *pszDescription); HRESULT (STDMETHODCALLTYPE *get_accRole)( - IAccessible* This, + IAccessible *This, VARIANT varID, VARIANT *pvarRole); HRESULT (STDMETHODCALLTYPE *get_accState)( - IAccessible* This, + IAccessible *This, VARIANT varID, VARIANT *pvarState); HRESULT (STDMETHODCALLTYPE *get_accHelp)( - IAccessible* This, + IAccessible *This, VARIANT varID, BSTR *pszHelp); HRESULT (STDMETHODCALLTYPE *get_accHelpTopic)( - IAccessible* This, + IAccessible *This, BSTR *pszHelpFile, VARIANT varID, LONG *pidTopic); HRESULT (STDMETHODCALLTYPE *get_accKeyboardShortcut)( - IAccessible* This, + IAccessible *This, VARIANT varID, BSTR *pszKeyboardShortcut); HRESULT (STDMETHODCALLTYPE *get_accFocus)( - IAccessible* This, + IAccessible *This, VARIANT *pvarID); HRESULT (STDMETHODCALLTYPE *get_accSelection)( - IAccessible* This, + IAccessible *This, VARIANT *pvarID); HRESULT (STDMETHODCALLTYPE *get_accDefaultAction)( - IAccessible* This, + IAccessible *This, VARIANT varID, BSTR *pszDefaultAction); HRESULT (STDMETHODCALLTYPE *accSelect)( - IAccessible* This, + IAccessible *This, LONG flagsSelect, VARIANT varID); HRESULT (STDMETHODCALLTYPE *accLocation)( - IAccessible* This, + IAccessible *This, LONG *pxLeft, LONG *pyTop, LONG *pcxWidth, @@ -544,33 +548,34 @@ typedef struct IAccessibleVtbl { VARIANT varID); HRESULT (STDMETHODCALLTYPE *accNavigate)( - IAccessible* This, + IAccessible *This, LONG navDir, VARIANT varStart, VARIANT *pvarEnd); HRESULT (STDMETHODCALLTYPE *accHitTest)( - IAccessible* This, + IAccessible *This, LONG xLeft, LONG yTop, VARIANT *pvarID); HRESULT (STDMETHODCALLTYPE *accDoDefaultAction)( - IAccessible* This, + IAccessible *This, VARIANT varID); HRESULT (STDMETHODCALLTYPE *put_accName)( - IAccessible* This, + IAccessible *This, VARIANT varID, BSTR pszName); HRESULT (STDMETHODCALLTYPE *put_accValue)( - IAccessible* This, + IAccessible *This, VARIANT varID, BSTR pszValue); END_INTERFACE } IAccessibleVtbl; + interface IAccessible { CONST_VTBL IAccessibleVtbl* lpVtbl; }; @@ -701,196 +706,6 @@ static FORCEINLINE HRESULT IAccessible_put_accValue(IAccessible* This,VARIANT va #endif -HRESULT STDMETHODCALLTYPE IAccessible_get_accParent_Proxy( - IAccessible* This, - IDispatch **ppdispParent); -void __RPC_STUB IAccessible_get_accParent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAccessible_get_accChildCount_Proxy( - IAccessible* This, - LONG *pcountChildren); -void __RPC_STUB IAccessible_get_accChildCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAccessible_get_accChild_Proxy( - IAccessible* This, - VARIANT varChildID, - IDispatch **ppdispChild); -void __RPC_STUB IAccessible_get_accChild_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAccessible_get_accName_Proxy( - IAccessible* This, - VARIANT varID, - BSTR *pszName); -void __RPC_STUB IAccessible_get_accName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAccessible_get_accValue_Proxy( - IAccessible* This, - VARIANT varID, - BSTR *pszValue); -void __RPC_STUB IAccessible_get_accValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAccessible_get_accDescription_Proxy( - IAccessible* This, - VARIANT varID, - BSTR *pszDescription); -void __RPC_STUB IAccessible_get_accDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAccessible_get_accRole_Proxy( - IAccessible* This, - VARIANT varID, - VARIANT *pvarRole); -void __RPC_STUB IAccessible_get_accRole_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAccessible_get_accState_Proxy( - IAccessible* This, - VARIANT varID, - VARIANT *pvarState); -void __RPC_STUB IAccessible_get_accState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAccessible_get_accHelp_Proxy( - IAccessible* This, - VARIANT varID, - BSTR *pszHelp); -void __RPC_STUB IAccessible_get_accHelp_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAccessible_get_accHelpTopic_Proxy( - IAccessible* This, - BSTR *pszHelpFile, - VARIANT varID, - LONG *pidTopic); -void __RPC_STUB IAccessible_get_accHelpTopic_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAccessible_get_accKeyboardShortcut_Proxy( - IAccessible* This, - VARIANT varID, - BSTR *pszKeyboardShortcut); -void __RPC_STUB IAccessible_get_accKeyboardShortcut_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAccessible_get_accFocus_Proxy( - IAccessible* This, - VARIANT *pvarID); -void __RPC_STUB IAccessible_get_accFocus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAccessible_get_accSelection_Proxy( - IAccessible* This, - VARIANT *pvarID); -void __RPC_STUB IAccessible_get_accSelection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAccessible_get_accDefaultAction_Proxy( - IAccessible* This, - VARIANT varID, - BSTR *pszDefaultAction); -void __RPC_STUB IAccessible_get_accDefaultAction_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAccessible_accSelect_Proxy( - IAccessible* This, - LONG flagsSelect, - VARIANT varID); -void __RPC_STUB IAccessible_accSelect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAccessible_accLocation_Proxy( - IAccessible* This, - LONG *pxLeft, - LONG *pyTop, - LONG *pcxWidth, - LONG *pcyHeight, - VARIANT varID); -void __RPC_STUB IAccessible_accLocation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAccessible_accNavigate_Proxy( - IAccessible* This, - LONG navDir, - VARIANT varStart, - VARIANT *pvarEnd); -void __RPC_STUB IAccessible_accNavigate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAccessible_accHitTest_Proxy( - IAccessible* This, - LONG xLeft, - LONG yTop, - VARIANT *pvarID); -void __RPC_STUB IAccessible_accHitTest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAccessible_accDoDefaultAction_Proxy( - IAccessible* This, - VARIANT varID); -void __RPC_STUB IAccessible_accDoDefaultAction_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAccessible_put_accName_Proxy( - IAccessible* This, - VARIANT varID, - BSTR pszName); -void __RPC_STUB IAccessible_put_accName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAccessible_put_accValue_Proxy( - IAccessible* This, - VARIANT varID, - BSTR pszValue); -void __RPC_STUB IAccessible_put_accValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAccessible_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/oleidl.h b/lib/libc/include/any-windows-any/oleidl.h index ffb815fe44..b9a9cac270 100644 --- a/lib/libc/include/any-windows-any/oleidl.h +++ b/lib/libc/include/any-windows-any/oleidl.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/oleidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/oleidl.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,116 +21,185 @@ #ifndef __IOleAdviseHolder_FWD_DEFINED__ #define __IOleAdviseHolder_FWD_DEFINED__ typedef interface IOleAdviseHolder IOleAdviseHolder; +#ifdef __cplusplus +interface IOleAdviseHolder; +#endif /* __cplusplus */ #endif #ifndef __IOleCache_FWD_DEFINED__ #define __IOleCache_FWD_DEFINED__ typedef interface IOleCache IOleCache; +#ifdef __cplusplus +interface IOleCache; +#endif /* __cplusplus */ #endif #ifndef __IOleCache2_FWD_DEFINED__ #define __IOleCache2_FWD_DEFINED__ typedef interface IOleCache2 IOleCache2; +#ifdef __cplusplus +interface IOleCache2; +#endif /* __cplusplus */ #endif #ifndef __IOleCacheControl_FWD_DEFINED__ #define __IOleCacheControl_FWD_DEFINED__ typedef interface IOleCacheControl IOleCacheControl; +#ifdef __cplusplus +interface IOleCacheControl; +#endif /* __cplusplus */ #endif #ifndef __IParseDisplayName_FWD_DEFINED__ #define __IParseDisplayName_FWD_DEFINED__ typedef interface IParseDisplayName IParseDisplayName; +#ifdef __cplusplus +interface IParseDisplayName; +#endif /* __cplusplus */ #endif #ifndef __IOleContainer_FWD_DEFINED__ #define __IOleContainer_FWD_DEFINED__ typedef interface IOleContainer IOleContainer; +#ifdef __cplusplus +interface IOleContainer; +#endif /* __cplusplus */ #endif #ifndef __IOleClientSite_FWD_DEFINED__ #define __IOleClientSite_FWD_DEFINED__ typedef interface IOleClientSite IOleClientSite; +#ifdef __cplusplus +interface IOleClientSite; +#endif /* __cplusplus */ #endif #ifndef __IOleObject_FWD_DEFINED__ #define __IOleObject_FWD_DEFINED__ typedef interface IOleObject IOleObject; +#ifdef __cplusplus +interface IOleObject; +#endif /* __cplusplus */ #endif #ifndef __IOleWindow_FWD_DEFINED__ #define __IOleWindow_FWD_DEFINED__ typedef interface IOleWindow IOleWindow; +#ifdef __cplusplus +interface IOleWindow; +#endif /* __cplusplus */ #endif #ifndef __IOleLink_FWD_DEFINED__ #define __IOleLink_FWD_DEFINED__ typedef interface IOleLink IOleLink; +#ifdef __cplusplus +interface IOleLink; +#endif /* __cplusplus */ #endif #ifndef __IOleItemContainer_FWD_DEFINED__ #define __IOleItemContainer_FWD_DEFINED__ typedef interface IOleItemContainer IOleItemContainer; +#ifdef __cplusplus +interface IOleItemContainer; +#endif /* __cplusplus */ #endif #ifndef __IOleInPlaceUIWindow_FWD_DEFINED__ #define __IOleInPlaceUIWindow_FWD_DEFINED__ typedef interface IOleInPlaceUIWindow IOleInPlaceUIWindow; +#ifdef __cplusplus +interface IOleInPlaceUIWindow; +#endif /* __cplusplus */ #endif #ifndef __IOleInPlaceActiveObject_FWD_DEFINED__ #define __IOleInPlaceActiveObject_FWD_DEFINED__ typedef interface IOleInPlaceActiveObject IOleInPlaceActiveObject; +#ifdef __cplusplus +interface IOleInPlaceActiveObject; +#endif /* __cplusplus */ #endif #ifndef __IOleInPlaceFrame_FWD_DEFINED__ #define __IOleInPlaceFrame_FWD_DEFINED__ typedef interface IOleInPlaceFrame IOleInPlaceFrame; +#ifdef __cplusplus +interface IOleInPlaceFrame; +#endif /* __cplusplus */ #endif #ifndef __IOleInPlaceObject_FWD_DEFINED__ #define __IOleInPlaceObject_FWD_DEFINED__ typedef interface IOleInPlaceObject IOleInPlaceObject; +#ifdef __cplusplus +interface IOleInPlaceObject; +#endif /* __cplusplus */ #endif #ifndef __IOleInPlaceSite_FWD_DEFINED__ #define __IOleInPlaceSite_FWD_DEFINED__ typedef interface IOleInPlaceSite IOleInPlaceSite; +#ifdef __cplusplus +interface IOleInPlaceSite; +#endif /* __cplusplus */ #endif #ifndef __IContinue_FWD_DEFINED__ #define __IContinue_FWD_DEFINED__ typedef interface IContinue IContinue; +#ifdef __cplusplus +interface IContinue; +#endif /* __cplusplus */ #endif #ifndef __IViewObject_FWD_DEFINED__ #define __IViewObject_FWD_DEFINED__ typedef interface IViewObject IViewObject; +#ifdef __cplusplus +interface IViewObject; +#endif /* __cplusplus */ #endif #ifndef __IViewObject2_FWD_DEFINED__ #define __IViewObject2_FWD_DEFINED__ typedef interface IViewObject2 IViewObject2; +#ifdef __cplusplus +interface IViewObject2; +#endif /* __cplusplus */ #endif #ifndef __IDropSource_FWD_DEFINED__ #define __IDropSource_FWD_DEFINED__ typedef interface IDropSource IDropSource; +#ifdef __cplusplus +interface IDropSource; +#endif /* __cplusplus */ #endif #ifndef __IDropTarget_FWD_DEFINED__ #define __IDropTarget_FWD_DEFINED__ typedef interface IDropTarget IDropTarget; +#ifdef __cplusplus +interface IDropTarget; +#endif /* __cplusplus */ #endif #ifndef __IDropSourceNotify_FWD_DEFINED__ #define __IDropSourceNotify_FWD_DEFINED__ typedef interface IDropSourceNotify IDropSourceNotify; +#ifdef __cplusplus +interface IDropSourceNotify; +#endif /* __cplusplus */ #endif #ifndef __IEnumOLEVERB_FWD_DEFINED__ #define __IEnumOLEVERB_FWD_DEFINED__ typedef interface IEnumOLEVERB IEnumOLEVERB; +#ifdef __cplusplus +interface IEnumOLEVERB; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -152,11 +222,17 @@ extern "C" { #ifndef __IOleInPlaceActiveObject_FWD_DEFINED__ #define __IOleInPlaceActiveObject_FWD_DEFINED__ typedef interface IOleInPlaceActiveObject IOleInPlaceActiveObject; +#ifdef __cplusplus +interface IOleInPlaceActiveObject; +#endif /* __cplusplus */ #endif #ifndef __IEnumOLEVERB_FWD_DEFINED__ #define __IEnumOLEVERB_FWD_DEFINED__ typedef interface IEnumOLEVERB IEnumOLEVERB; +#ifdef __cplusplus +interface IEnumOLEVERB; +#endif /* __cplusplus */ #endif @@ -202,42 +278,43 @@ typedef struct IOleAdviseHolderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleAdviseHolder* This, + IOleAdviseHolder *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleAdviseHolder* This); + IOleAdviseHolder *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleAdviseHolder* This); + IOleAdviseHolder *This); /*** IOleAdviseHolder methods ***/ HRESULT (STDMETHODCALLTYPE *Advise)( - IOleAdviseHolder* This, + IOleAdviseHolder *This, IAdviseSink *pAdvise, DWORD *pdwConnection); HRESULT (STDMETHODCALLTYPE *Unadvise)( - IOleAdviseHolder* This, + IOleAdviseHolder *This, DWORD dwConnection); HRESULT (STDMETHODCALLTYPE *EnumAdvise)( - IOleAdviseHolder* This, + IOleAdviseHolder *This, IEnumSTATDATA **ppenumAdvise); HRESULT (STDMETHODCALLTYPE *SendOnRename)( - IOleAdviseHolder* This, + IOleAdviseHolder *This, IMoniker *pmk); HRESULT (STDMETHODCALLTYPE *SendOnSave)( - IOleAdviseHolder* This); + IOleAdviseHolder *This); HRESULT (STDMETHODCALLTYPE *SendOnClose)( - IOleAdviseHolder* This); + IOleAdviseHolder *This); END_INTERFACE } IOleAdviseHolderVtbl; + interface IOleAdviseHolder { CONST_VTBL IOleAdviseHolderVtbl* lpVtbl; }; @@ -290,53 +367,6 @@ static FORCEINLINE HRESULT IOleAdviseHolder_SendOnClose(IOleAdviseHolder* This) #endif -HRESULT STDMETHODCALLTYPE IOleAdviseHolder_Advise_Proxy( - IOleAdviseHolder* This, - IAdviseSink *pAdvise, - DWORD *pdwConnection); -void __RPC_STUB IOleAdviseHolder_Advise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleAdviseHolder_Unadvise_Proxy( - IOleAdviseHolder* This, - DWORD dwConnection); -void __RPC_STUB IOleAdviseHolder_Unadvise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleAdviseHolder_EnumAdvise_Proxy( - IOleAdviseHolder* This, - IEnumSTATDATA **ppenumAdvise); -void __RPC_STUB IOleAdviseHolder_EnumAdvise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleAdviseHolder_SendOnRename_Proxy( - IOleAdviseHolder* This, - IMoniker *pmk); -void __RPC_STUB IOleAdviseHolder_SendOnRename_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleAdviseHolder_SendOnSave_Proxy( - IOleAdviseHolder* This); -void __RPC_STUB IOleAdviseHolder_SendOnSave_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleAdviseHolder_SendOnClose_Proxy( - IOleAdviseHolder* This); -void __RPC_STUB IOleAdviseHolder_SendOnClose_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleAdviseHolder_INTERFACE_DEFINED__ */ @@ -385,43 +415,44 @@ typedef struct IOleCacheVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleCache* This, + IOleCache *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleCache* This); + IOleCache *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleCache* This); + IOleCache *This); /*** IOleCache methods ***/ HRESULT (STDMETHODCALLTYPE *Cache)( - IOleCache* This, + IOleCache *This, FORMATETC *pformatetc, DWORD advf, DWORD *pdwConnection); HRESULT (STDMETHODCALLTYPE *Uncache)( - IOleCache* This, + IOleCache *This, DWORD dwConnection); HRESULT (STDMETHODCALLTYPE *EnumCache)( - IOleCache* This, + IOleCache *This, IEnumSTATDATA **ppenumSTATDATA); HRESULT (STDMETHODCALLTYPE *InitCache)( - IOleCache* This, + IOleCache *This, IDataObject *pDataObject); HRESULT (STDMETHODCALLTYPE *SetData)( - IOleCache* This, + IOleCache *This, FORMATETC *pformatetc, STGMEDIUM *pmedium, WINBOOL fRelease); END_INTERFACE } IOleCacheVtbl; + interface IOleCache { CONST_VTBL IOleCacheVtbl* lpVtbl; }; @@ -470,50 +501,6 @@ static FORCEINLINE HRESULT IOleCache_SetData(IOleCache* This,FORMATETC *pformate #endif -HRESULT STDMETHODCALLTYPE IOleCache_Cache_Proxy( - IOleCache* This, - FORMATETC *pformatetc, - DWORD advf, - DWORD *pdwConnection); -void __RPC_STUB IOleCache_Cache_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleCache_Uncache_Proxy( - IOleCache* This, - DWORD dwConnection); -void __RPC_STUB IOleCache_Uncache_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleCache_EnumCache_Proxy( - IOleCache* This, - IEnumSTATDATA **ppenumSTATDATA); -void __RPC_STUB IOleCache_EnumCache_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleCache_InitCache_Proxy( - IOleCache* This, - IDataObject *pDataObject); -void __RPC_STUB IOleCache_InitCache_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleCache_SetData_Proxy( - IOleCache* This, - FORMATETC *pformatetc, - STGMEDIUM *pmedium, - WINBOOL fRelease); -void __RPC_STUB IOleCache_SetData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleCache_INTERFACE_DEFINED__ */ @@ -573,54 +560,55 @@ typedef struct IOleCache2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleCache2* This, + IOleCache2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleCache2* This); + IOleCache2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleCache2* This); + IOleCache2 *This); /*** IOleCache methods ***/ HRESULT (STDMETHODCALLTYPE *Cache)( - IOleCache2* This, + IOleCache2 *This, FORMATETC *pformatetc, DWORD advf, DWORD *pdwConnection); HRESULT (STDMETHODCALLTYPE *Uncache)( - IOleCache2* This, + IOleCache2 *This, DWORD dwConnection); HRESULT (STDMETHODCALLTYPE *EnumCache)( - IOleCache2* This, + IOleCache2 *This, IEnumSTATDATA **ppenumSTATDATA); HRESULT (STDMETHODCALLTYPE *InitCache)( - IOleCache2* This, + IOleCache2 *This, IDataObject *pDataObject); HRESULT (STDMETHODCALLTYPE *SetData)( - IOleCache2* This, + IOleCache2 *This, FORMATETC *pformatetc, STGMEDIUM *pmedium, WINBOOL fRelease); /*** IOleCache2 methods ***/ HRESULT (STDMETHODCALLTYPE *UpdateCache)( - IOleCache2* This, + IOleCache2 *This, LPDATAOBJECT pDataObject, DWORD grfUpdf, LPVOID pReserved); HRESULT (STDMETHODCALLTYPE *DiscardCache)( - IOleCache2* This, + IOleCache2 *This, DWORD dwDiscardOptions); END_INTERFACE } IOleCache2Vtbl; + interface IOleCache2 { CONST_VTBL IOleCache2Vtbl* lpVtbl; }; @@ -689,14 +677,6 @@ void __RPC_STUB IOleCache2_RemoteUpdateCache_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleCache2_DiscardCache_Proxy( - IOleCache2* This, - DWORD dwDiscardOptions); -void __RPC_STUB IOleCache2_DiscardCache_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IOleCache2_UpdateCache_Proxy( IOleCache2* This, LPDATAOBJECT pDataObject, @@ -742,26 +722,27 @@ typedef struct IOleCacheControlVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleCacheControl* This, + IOleCacheControl *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleCacheControl* This); + IOleCacheControl *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleCacheControl* This); + IOleCacheControl *This); /*** IOleCacheControl methods ***/ HRESULT (STDMETHODCALLTYPE *OnRun)( - IOleCacheControl* This, + IOleCacheControl *This, LPDATAOBJECT pDataObject); HRESULT (STDMETHODCALLTYPE *OnStop)( - IOleCacheControl* This); + IOleCacheControl *This); END_INTERFACE } IOleCacheControlVtbl; + interface IOleCacheControl { CONST_VTBL IOleCacheControlVtbl* lpVtbl; }; @@ -798,21 +779,6 @@ static FORCEINLINE HRESULT IOleCacheControl_OnStop(IOleCacheControl* This) { #endif -HRESULT STDMETHODCALLTYPE IOleCacheControl_OnRun_Proxy( - IOleCacheControl* This, - LPDATAOBJECT pDataObject); -void __RPC_STUB IOleCacheControl_OnRun_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleCacheControl_OnStop_Proxy( - IOleCacheControl* This); -void __RPC_STUB IOleCacheControl_OnStop_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleCacheControl_INTERFACE_DEFINED__ */ @@ -846,19 +812,19 @@ typedef struct IParseDisplayNameVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IParseDisplayName* This, + IParseDisplayName *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IParseDisplayName* This); + IParseDisplayName *This); ULONG (STDMETHODCALLTYPE *Release)( - IParseDisplayName* This); + IParseDisplayName *This); /*** IParseDisplayName methods ***/ HRESULT (STDMETHODCALLTYPE *ParseDisplayName)( - IParseDisplayName* This, + IParseDisplayName *This, IBindCtx *pbc, LPOLESTR pszDisplayName, ULONG *pchEaten, @@ -866,6 +832,7 @@ typedef struct IParseDisplayNameVtbl { END_INTERFACE } IParseDisplayNameVtbl; + interface IParseDisplayName { CONST_VTBL IParseDisplayNameVtbl* lpVtbl; }; @@ -898,17 +865,6 @@ static FORCEINLINE HRESULT IParseDisplayName_ParseDisplayName(IParseDisplayName* #endif -HRESULT STDMETHODCALLTYPE IParseDisplayName_ParseDisplayName_Proxy( - IParseDisplayName* This, - IBindCtx *pbc, - LPOLESTR pszDisplayName, - ULONG *pchEaten, - IMoniker **ppmkOut); -void __RPC_STUB IParseDisplayName_ParseDisplayName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IParseDisplayName_INTERFACE_DEFINED__ */ @@ -943,19 +899,19 @@ typedef struct IOleContainerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleContainer* This, + IOleContainer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleContainer* This); + IOleContainer *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleContainer* This); + IOleContainer *This); /*** IParseDisplayName methods ***/ HRESULT (STDMETHODCALLTYPE *ParseDisplayName)( - IOleContainer* This, + IOleContainer *This, IBindCtx *pbc, LPOLESTR pszDisplayName, ULONG *pchEaten, @@ -963,16 +919,17 @@ typedef struct IOleContainerVtbl { /*** IOleContainer methods ***/ HRESULT (STDMETHODCALLTYPE *EnumObjects)( - IOleContainer* This, + IOleContainer *This, DWORD grfFlags, IEnumUnknown **ppenum); HRESULT (STDMETHODCALLTYPE *LockContainer)( - IOleContainer* This, + IOleContainer *This, WINBOOL fLock); END_INTERFACE } IOleContainerVtbl; + interface IOleContainer { CONST_VTBL IOleContainerVtbl* lpVtbl; }; @@ -1015,23 +972,6 @@ static FORCEINLINE HRESULT IOleContainer_LockContainer(IOleContainer* This,WINBO #endif -HRESULT STDMETHODCALLTYPE IOleContainer_EnumObjects_Proxy( - IOleContainer* This, - DWORD grfFlags, - IEnumUnknown **ppenum); -void __RPC_STUB IOleContainer_EnumObjects_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleContainer_LockContainer_Proxy( - IOleContainer* This, - WINBOOL fLock); -void __RPC_STUB IOleContainer_LockContainer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleContainer_INTERFACE_DEFINED__ */ @@ -1079,42 +1019,43 @@ typedef struct IOleClientSiteVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleClientSite* This, + IOleClientSite *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleClientSite* This); + IOleClientSite *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleClientSite* This); + IOleClientSite *This); /*** IOleClientSite methods ***/ HRESULT (STDMETHODCALLTYPE *SaveObject)( - IOleClientSite* This); + IOleClientSite *This); HRESULT (STDMETHODCALLTYPE *GetMoniker)( - IOleClientSite* This, + IOleClientSite *This, DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmk); HRESULT (STDMETHODCALLTYPE *GetContainer)( - IOleClientSite* This, + IOleClientSite *This, IOleContainer **ppContainer); HRESULT (STDMETHODCALLTYPE *ShowObject)( - IOleClientSite* This); + IOleClientSite *This); HRESULT (STDMETHODCALLTYPE *OnShowWindow)( - IOleClientSite* This, + IOleClientSite *This, WINBOOL fShow); HRESULT (STDMETHODCALLTYPE *RequestNewObjectLayout)( - IOleClientSite* This); + IOleClientSite *This); END_INTERFACE } IOleClientSiteVtbl; + interface IOleClientSite { CONST_VTBL IOleClientSiteVtbl* lpVtbl; }; @@ -1167,53 +1108,6 @@ static FORCEINLINE HRESULT IOleClientSite_RequestNewObjectLayout(IOleClientSite* #endif -HRESULT STDMETHODCALLTYPE IOleClientSite_SaveObject_Proxy( - IOleClientSite* This); -void __RPC_STUB IOleClientSite_SaveObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleClientSite_GetMoniker_Proxy( - IOleClientSite* This, - DWORD dwAssign, - DWORD dwWhichMoniker, - IMoniker **ppmk); -void __RPC_STUB IOleClientSite_GetMoniker_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleClientSite_GetContainer_Proxy( - IOleClientSite* This, - IOleContainer **ppContainer); -void __RPC_STUB IOleClientSite_GetContainer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleClientSite_ShowObject_Proxy( - IOleClientSite* This); -void __RPC_STUB IOleClientSite_ShowObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleClientSite_OnShowWindow_Proxy( - IOleClientSite* This, - WINBOOL fShow); -void __RPC_STUB IOleClientSite_OnShowWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleClientSite_RequestNewObjectLayout_Proxy( - IOleClientSite* This); -void __RPC_STUB IOleClientSite_RequestNewObjectLayout_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleClientSite_INTERFACE_DEFINED__ */ @@ -1370,58 +1264,58 @@ typedef struct IOleObjectVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleObject* This, + IOleObject *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleObject* This); + IOleObject *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleObject* This); + IOleObject *This); /*** IOleObject methods ***/ HRESULT (STDMETHODCALLTYPE *SetClientSite)( - IOleObject* This, + IOleObject *This, IOleClientSite *pClientSite); HRESULT (STDMETHODCALLTYPE *GetClientSite)( - IOleObject* This, + IOleObject *This, IOleClientSite **ppClientSite); HRESULT (STDMETHODCALLTYPE *SetHostNames)( - IOleObject* This, + IOleObject *This, LPCOLESTR szContainerApp, LPCOLESTR szContainerObj); HRESULT (STDMETHODCALLTYPE *Close)( - IOleObject* This, + IOleObject *This, DWORD dwSaveOption); HRESULT (STDMETHODCALLTYPE *SetMoniker)( - IOleObject* This, + IOleObject *This, DWORD dwWhichMoniker, IMoniker *pmk); HRESULT (STDMETHODCALLTYPE *GetMoniker)( - IOleObject* This, + IOleObject *This, DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmk); HRESULT (STDMETHODCALLTYPE *InitFromData)( - IOleObject* This, + IOleObject *This, IDataObject *pDataObject, WINBOOL fCreation, DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *GetClipboardData)( - IOleObject* This, + IOleObject *This, DWORD dwReserved, IDataObject **ppDataObject); HRESULT (STDMETHODCALLTYPE *DoVerb)( - IOleObject* This, + IOleObject *This, LONG iVerb, LPMSG lpmsg, IOleClientSite *pActiveSite, @@ -1430,58 +1324,59 @@ typedef struct IOleObjectVtbl { LPCRECT lprcPosRect); HRESULT (STDMETHODCALLTYPE *EnumVerbs)( - IOleObject* This, + IOleObject *This, IEnumOLEVERB **ppEnumOleVerb); HRESULT (STDMETHODCALLTYPE *Update)( - IOleObject* This); + IOleObject *This); HRESULT (STDMETHODCALLTYPE *IsUpToDate)( - IOleObject* This); + IOleObject *This); HRESULT (STDMETHODCALLTYPE *GetUserClassID)( - IOleObject* This, + IOleObject *This, CLSID *pClsid); HRESULT (STDMETHODCALLTYPE *GetUserType)( - IOleObject* This, + IOleObject *This, DWORD dwFormOfType, LPOLESTR *pszUserType); HRESULT (STDMETHODCALLTYPE *SetExtent)( - IOleObject* This, + IOleObject *This, DWORD dwDrawAspect, SIZEL *psizel); HRESULT (STDMETHODCALLTYPE *GetExtent)( - IOleObject* This, + IOleObject *This, DWORD dwDrawAspect, SIZEL *psizel); HRESULT (STDMETHODCALLTYPE *Advise)( - IOleObject* This, + IOleObject *This, IAdviseSink *pAdvSink, DWORD *pdwConnection); HRESULT (STDMETHODCALLTYPE *Unadvise)( - IOleObject* This, + IOleObject *This, DWORD dwConnection); HRESULT (STDMETHODCALLTYPE *EnumAdvise)( - IOleObject* This, + IOleObject *This, IEnumSTATDATA **ppenumAdvise); HRESULT (STDMETHODCALLTYPE *GetMiscStatus)( - IOleObject* This, + IOleObject *This, DWORD dwAspect, DWORD *pdwStatus); HRESULT (STDMETHODCALLTYPE *SetColorScheme)( - IOleObject* This, + IOleObject *This, LOGPALETTE *pLogpal); END_INTERFACE } IOleObjectVtbl; + interface IOleObject { CONST_VTBL IOleObjectVtbl* lpVtbl; }; @@ -1594,189 +1489,6 @@ static FORCEINLINE HRESULT IOleObject_SetColorScheme(IOleObject* This,LOGPALETTE #endif -HRESULT STDMETHODCALLTYPE IOleObject_SetClientSite_Proxy( - IOleObject* This, - IOleClientSite *pClientSite); -void __RPC_STUB IOleObject_SetClientSite_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleObject_GetClientSite_Proxy( - IOleObject* This, - IOleClientSite **ppClientSite); -void __RPC_STUB IOleObject_GetClientSite_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleObject_SetHostNames_Proxy( - IOleObject* This, - LPCOLESTR szContainerApp, - LPCOLESTR szContainerObj); -void __RPC_STUB IOleObject_SetHostNames_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleObject_Close_Proxy( - IOleObject* This, - DWORD dwSaveOption); -void __RPC_STUB IOleObject_Close_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleObject_SetMoniker_Proxy( - IOleObject* This, - DWORD dwWhichMoniker, - IMoniker *pmk); -void __RPC_STUB IOleObject_SetMoniker_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleObject_GetMoniker_Proxy( - IOleObject* This, - DWORD dwAssign, - DWORD dwWhichMoniker, - IMoniker **ppmk); -void __RPC_STUB IOleObject_GetMoniker_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleObject_InitFromData_Proxy( - IOleObject* This, - IDataObject *pDataObject, - WINBOOL fCreation, - DWORD dwReserved); -void __RPC_STUB IOleObject_InitFromData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleObject_GetClipboardData_Proxy( - IOleObject* This, - DWORD dwReserved, - IDataObject **ppDataObject); -void __RPC_STUB IOleObject_GetClipboardData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleObject_DoVerb_Proxy( - IOleObject* This, - LONG iVerb, - LPMSG lpmsg, - IOleClientSite *pActiveSite, - LONG lindex, - HWND hwndParent, - LPCRECT lprcPosRect); -void __RPC_STUB IOleObject_DoVerb_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleObject_EnumVerbs_Proxy( - IOleObject* This, - IEnumOLEVERB **ppEnumOleVerb); -void __RPC_STUB IOleObject_EnumVerbs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleObject_Update_Proxy( - IOleObject* This); -void __RPC_STUB IOleObject_Update_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleObject_IsUpToDate_Proxy( - IOleObject* This); -void __RPC_STUB IOleObject_IsUpToDate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleObject_GetUserClassID_Proxy( - IOleObject* This, - CLSID *pClsid); -void __RPC_STUB IOleObject_GetUserClassID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleObject_GetUserType_Proxy( - IOleObject* This, - DWORD dwFormOfType, - LPOLESTR *pszUserType); -void __RPC_STUB IOleObject_GetUserType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleObject_SetExtent_Proxy( - IOleObject* This, - DWORD dwDrawAspect, - SIZEL *psizel); -void __RPC_STUB IOleObject_SetExtent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleObject_GetExtent_Proxy( - IOleObject* This, - DWORD dwDrawAspect, - SIZEL *psizel); -void __RPC_STUB IOleObject_GetExtent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleObject_Advise_Proxy( - IOleObject* This, - IAdviseSink *pAdvSink, - DWORD *pdwConnection); -void __RPC_STUB IOleObject_Advise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleObject_Unadvise_Proxy( - IOleObject* This, - DWORD dwConnection); -void __RPC_STUB IOleObject_Unadvise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleObject_EnumAdvise_Proxy( - IOleObject* This, - IEnumSTATDATA **ppenumAdvise); -void __RPC_STUB IOleObject_EnumAdvise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleObject_GetMiscStatus_Proxy( - IOleObject* This, - DWORD dwAspect, - DWORD *pdwStatus); -void __RPC_STUB IOleObject_GetMiscStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleObject_SetColorScheme_Proxy( - IOleObject* This, - LOGPALETTE *pLogpal); -void __RPC_STUB IOleObject_SetColorScheme_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleObject_INTERFACE_DEFINED__ */ @@ -1846,27 +1558,28 @@ typedef struct IOleWindowVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleWindow* This, + IOleWindow *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleWindow* This); + IOleWindow *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleWindow* This); + IOleWindow *This); /*** IOleWindow methods ***/ HRESULT (STDMETHODCALLTYPE *GetWindow)( - IOleWindow* This, + IOleWindow *This, HWND *phwnd); HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)( - IOleWindow* This, + IOleWindow *This, WINBOOL fEnterMode); END_INTERFACE } IOleWindowVtbl; + interface IOleWindow { CONST_VTBL IOleWindowVtbl* lpVtbl; }; @@ -1903,22 +1616,6 @@ static FORCEINLINE HRESULT IOleWindow_ContextSensitiveHelp(IOleWindow* This,WINB #endif -HRESULT STDMETHODCALLTYPE IOleWindow_GetWindow_Proxy( - IOleWindow* This, - HWND *phwnd); -void __RPC_STUB IOleWindow_GetWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleWindow_ContextSensitiveHelp_Proxy( - IOleWindow* This, - WINBOOL fEnterMode); -void __RPC_STUB IOleWindow_ContextSensitiveHelp_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleWindow_INTERFACE_DEFINED__ */ @@ -1993,63 +1690,64 @@ typedef struct IOleLinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleLink* This, + IOleLink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleLink* This); + IOleLink *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleLink* This); + IOleLink *This); /*** IOleLink methods ***/ HRESULT (STDMETHODCALLTYPE *SetUpdateOptions)( - IOleLink* This, + IOleLink *This, DWORD dwUpdateOpt); HRESULT (STDMETHODCALLTYPE *GetUpdateOptions)( - IOleLink* This, + IOleLink *This, DWORD *pdwUpdateOpt); HRESULT (STDMETHODCALLTYPE *SetSourceMoniker)( - IOleLink* This, + IOleLink *This, IMoniker *pmk, REFCLSID rclsid); HRESULT (STDMETHODCALLTYPE *GetSourceMoniker)( - IOleLink* This, + IOleLink *This, IMoniker **ppmk); HRESULT (STDMETHODCALLTYPE *SetSourceDisplayName)( - IOleLink* This, + IOleLink *This, LPCOLESTR pszStatusText); HRESULT (STDMETHODCALLTYPE *GetSourceDisplayName)( - IOleLink* This, + IOleLink *This, LPOLESTR *ppszDisplayName); HRESULT (STDMETHODCALLTYPE *BindToSource)( - IOleLink* This, + IOleLink *This, DWORD bindflags, IBindCtx *pbc); HRESULT (STDMETHODCALLTYPE *BindIfRunning)( - IOleLink* This); + IOleLink *This); HRESULT (STDMETHODCALLTYPE *GetBoundSource)( - IOleLink* This, + IOleLink *This, IUnknown **ppunk); HRESULT (STDMETHODCALLTYPE *UnbindSource)( - IOleLink* This); + IOleLink *This); HRESULT (STDMETHODCALLTYPE *Update)( - IOleLink* This, + IOleLink *This, IBindCtx *pbc); END_INTERFACE } IOleLinkVtbl; + interface IOleLink { CONST_VTBL IOleLinkVtbl* lpVtbl; }; @@ -2122,94 +1820,6 @@ static FORCEINLINE HRESULT IOleLink_Update(IOleLink* This,IBindCtx *pbc) { #endif -HRESULT STDMETHODCALLTYPE IOleLink_SetUpdateOptions_Proxy( - IOleLink* This, - DWORD dwUpdateOpt); -void __RPC_STUB IOleLink_SetUpdateOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleLink_GetUpdateOptions_Proxy( - IOleLink* This, - DWORD *pdwUpdateOpt); -void __RPC_STUB IOleLink_GetUpdateOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleLink_SetSourceMoniker_Proxy( - IOleLink* This, - IMoniker *pmk, - REFCLSID rclsid); -void __RPC_STUB IOleLink_SetSourceMoniker_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleLink_GetSourceMoniker_Proxy( - IOleLink* This, - IMoniker **ppmk); -void __RPC_STUB IOleLink_GetSourceMoniker_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleLink_SetSourceDisplayName_Proxy( - IOleLink* This, - LPCOLESTR pszStatusText); -void __RPC_STUB IOleLink_SetSourceDisplayName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleLink_GetSourceDisplayName_Proxy( - IOleLink* This, - LPOLESTR *ppszDisplayName); -void __RPC_STUB IOleLink_GetSourceDisplayName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleLink_BindToSource_Proxy( - IOleLink* This, - DWORD bindflags, - IBindCtx *pbc); -void __RPC_STUB IOleLink_BindToSource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleLink_BindIfRunning_Proxy( - IOleLink* This); -void __RPC_STUB IOleLink_BindIfRunning_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleLink_GetBoundSource_Proxy( - IOleLink* This, - IUnknown **ppunk); -void __RPC_STUB IOleLink_GetBoundSource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleLink_UnbindSource_Proxy( - IOleLink* This); -void __RPC_STUB IOleLink_UnbindSource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleLink_Update_Proxy( - IOleLink* This, - IBindCtx *pbc); -void __RPC_STUB IOleLink_Update_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleLink_INTERFACE_DEFINED__ */ @@ -2267,19 +1877,19 @@ typedef struct IOleItemContainerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleItemContainer* This, + IOleItemContainer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleItemContainer* This); + IOleItemContainer *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleItemContainer* This); + IOleItemContainer *This); /*** IParseDisplayName methods ***/ HRESULT (STDMETHODCALLTYPE *ParseDisplayName)( - IOleItemContainer* This, + IOleItemContainer *This, IBindCtx *pbc, LPOLESTR pszDisplayName, ULONG *pchEaten, @@ -2287,17 +1897,17 @@ typedef struct IOleItemContainerVtbl { /*** IOleContainer methods ***/ HRESULT (STDMETHODCALLTYPE *EnumObjects)( - IOleItemContainer* This, + IOleItemContainer *This, DWORD grfFlags, IEnumUnknown **ppenum); HRESULT (STDMETHODCALLTYPE *LockContainer)( - IOleItemContainer* This, + IOleItemContainer *This, WINBOOL fLock); /*** IOleItemContainer methods ***/ HRESULT (STDMETHODCALLTYPE *GetObject)( - IOleItemContainer* This, + IOleItemContainer *This, LPOLESTR pszItem, DWORD dwSpeedNeeded, IBindCtx *pbc, @@ -2305,18 +1915,19 @@ typedef struct IOleItemContainerVtbl { void **ppvObject); HRESULT (STDMETHODCALLTYPE *GetObjectStorage)( - IOleItemContainer* This, + IOleItemContainer *This, LPOLESTR pszItem, IBindCtx *pbc, REFIID riid, void **ppvStorage); HRESULT (STDMETHODCALLTYPE *IsRunning)( - IOleItemContainer* This, + IOleItemContainer *This, LPOLESTR pszItem); END_INTERFACE } IOleItemContainerVtbl; + interface IOleItemContainer { CONST_VTBL IOleItemContainerVtbl* lpVtbl; }; @@ -2373,37 +1984,6 @@ static FORCEINLINE HRESULT IOleItemContainer_IsRunning(IOleItemContainer* This,L #endif -HRESULT STDMETHODCALLTYPE IOleItemContainer_GetObject_Proxy( - IOleItemContainer* This, - LPOLESTR pszItem, - DWORD dwSpeedNeeded, - IBindCtx *pbc, - REFIID riid, - void **ppvObject); -void __RPC_STUB IOleItemContainer_GetObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleItemContainer_GetObjectStorage_Proxy( - IOleItemContainer* This, - LPOLESTR pszItem, - IBindCtx *pbc, - REFIID riid, - void **ppvStorage); -void __RPC_STUB IOleItemContainer_GetObjectStorage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleItemContainer_IsRunning_Proxy( - IOleItemContainer* This, - LPOLESTR pszItem); -void __RPC_STUB IOleItemContainer_IsRunning_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleItemContainer_INTERFACE_DEFINED__ */ @@ -2447,45 +2027,46 @@ typedef struct IOleInPlaceUIWindowVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleInPlaceUIWindow* This, + IOleInPlaceUIWindow *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleInPlaceUIWindow* This); + IOleInPlaceUIWindow *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleInPlaceUIWindow* This); + IOleInPlaceUIWindow *This); /*** IOleWindow methods ***/ HRESULT (STDMETHODCALLTYPE *GetWindow)( - IOleInPlaceUIWindow* This, + IOleInPlaceUIWindow *This, HWND *phwnd); HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)( - IOleInPlaceUIWindow* This, + IOleInPlaceUIWindow *This, WINBOOL fEnterMode); /*** IOleInPlaceUIWindow methods ***/ HRESULT (STDMETHODCALLTYPE *GetBorder)( - IOleInPlaceUIWindow* This, + IOleInPlaceUIWindow *This, LPRECT lprectBorder); HRESULT (STDMETHODCALLTYPE *RequestBorderSpace)( - IOleInPlaceUIWindow* This, + IOleInPlaceUIWindow *This, LPCBORDERWIDTHS pborderwidths); HRESULT (STDMETHODCALLTYPE *SetBorderSpace)( - IOleInPlaceUIWindow* This, + IOleInPlaceUIWindow *This, LPCBORDERWIDTHS pborderwidths); HRESULT (STDMETHODCALLTYPE *SetActiveObject)( - IOleInPlaceUIWindow* This, + IOleInPlaceUIWindow *This, IOleInPlaceActiveObject *pActiveObject, LPCOLESTR pszObjName); END_INTERFACE } IOleInPlaceUIWindowVtbl; + interface IOleInPlaceUIWindow { CONST_VTBL IOleInPlaceUIWindowVtbl* lpVtbl; }; @@ -2540,39 +2121,6 @@ static FORCEINLINE HRESULT IOleInPlaceUIWindow_SetActiveObject(IOleInPlaceUIWind #endif -HRESULT STDMETHODCALLTYPE IOleInPlaceUIWindow_GetBorder_Proxy( - IOleInPlaceUIWindow* This, - LPRECT lprectBorder); -void __RPC_STUB IOleInPlaceUIWindow_GetBorder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceUIWindow_RequestBorderSpace_Proxy( - IOleInPlaceUIWindow* This, - LPCBORDERWIDTHS pborderwidths); -void __RPC_STUB IOleInPlaceUIWindow_RequestBorderSpace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceUIWindow_SetBorderSpace_Proxy( - IOleInPlaceUIWindow* This, - LPCBORDERWIDTHS pborderwidths); -void __RPC_STUB IOleInPlaceUIWindow_SetBorderSpace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceUIWindow_SetActiveObject_Proxy( - IOleInPlaceUIWindow* This, - IOleInPlaceActiveObject *pActiveObject, - LPCOLESTR pszObjName); -void __RPC_STUB IOleInPlaceUIWindow_SetActiveObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleInPlaceUIWindow_INTERFACE_DEFINED__ */ @@ -2617,50 +2165,51 @@ typedef struct IOleInPlaceActiveObjectVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleInPlaceActiveObject* This, + IOleInPlaceActiveObject *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleInPlaceActiveObject* This); + IOleInPlaceActiveObject *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleInPlaceActiveObject* This); + IOleInPlaceActiveObject *This); /*** IOleWindow methods ***/ HRESULT (STDMETHODCALLTYPE *GetWindow)( - IOleInPlaceActiveObject* This, + IOleInPlaceActiveObject *This, HWND *phwnd); HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)( - IOleInPlaceActiveObject* This, + IOleInPlaceActiveObject *This, WINBOOL fEnterMode); /*** IOleInPlaceActiveObject methods ***/ HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)( - IOleInPlaceActiveObject* This, + IOleInPlaceActiveObject *This, LPMSG lpmsg); HRESULT (STDMETHODCALLTYPE *OnFrameWindowActivate)( - IOleInPlaceActiveObject* This, + IOleInPlaceActiveObject *This, WINBOOL fActivate); HRESULT (STDMETHODCALLTYPE *OnDocWindowActivate)( - IOleInPlaceActiveObject* This, + IOleInPlaceActiveObject *This, WINBOOL fActivate); HRESULT (STDMETHODCALLTYPE *ResizeBorder)( - IOleInPlaceActiveObject* This, + IOleInPlaceActiveObject *This, LPCRECT prcBorder, IOleInPlaceUIWindow *pUIWindow, WINBOOL fFrameWindow); HRESULT (STDMETHODCALLTYPE *EnableModeless)( - IOleInPlaceActiveObject* This, + IOleInPlaceActiveObject *This, WINBOOL fEnable); END_INTERFACE } IOleInPlaceActiveObjectVtbl; + interface IOleInPlaceActiveObject { CONST_VTBL IOleInPlaceActiveObjectVtbl* lpVtbl; }; @@ -2726,22 +2275,6 @@ void __RPC_STUB IOleInPlaceActiveObject_RemoteTranslateAccelerator_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceActiveObject_OnFrameWindowActivate_Proxy( - IOleInPlaceActiveObject* This, - WINBOOL fActivate); -void __RPC_STUB IOleInPlaceActiveObject_OnFrameWindowActivate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceActiveObject_OnDocWindowActivate_Proxy( - IOleInPlaceActiveObject* This, - WINBOOL fActivate); -void __RPC_STUB IOleInPlaceActiveObject_OnDocWindowActivate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE IOleInPlaceActiveObject_RemoteResizeBorder_Proxy( IOleInPlaceActiveObject* This, LPCRECT prcBorder, @@ -2753,14 +2286,6 @@ void __RPC_STUB IOleInPlaceActiveObject_RemoteResizeBorder_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceActiveObject_EnableModeless_Proxy( - IOleInPlaceActiveObject* This, - WINBOOL fEnable); -void __RPC_STUB IOleInPlaceActiveObject_EnableModeless_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IOleInPlaceActiveObject_TranslateAccelerator_Proxy( IOleInPlaceActiveObject* This, LPMSG lpmsg); @@ -2842,74 +2367,75 @@ typedef struct IOleInPlaceFrameVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleInPlaceFrame* This, + IOleInPlaceFrame *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleInPlaceFrame* This); + IOleInPlaceFrame *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleInPlaceFrame* This); + IOleInPlaceFrame *This); /*** IOleWindow methods ***/ HRESULT (STDMETHODCALLTYPE *GetWindow)( - IOleInPlaceFrame* This, + IOleInPlaceFrame *This, HWND *phwnd); HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)( - IOleInPlaceFrame* This, + IOleInPlaceFrame *This, WINBOOL fEnterMode); /*** IOleInPlaceUIWindow methods ***/ HRESULT (STDMETHODCALLTYPE *GetBorder)( - IOleInPlaceFrame* This, + IOleInPlaceFrame *This, LPRECT lprectBorder); HRESULT (STDMETHODCALLTYPE *RequestBorderSpace)( - IOleInPlaceFrame* This, + IOleInPlaceFrame *This, LPCBORDERWIDTHS pborderwidths); HRESULT (STDMETHODCALLTYPE *SetBorderSpace)( - IOleInPlaceFrame* This, + IOleInPlaceFrame *This, LPCBORDERWIDTHS pborderwidths); HRESULT (STDMETHODCALLTYPE *SetActiveObject)( - IOleInPlaceFrame* This, + IOleInPlaceFrame *This, IOleInPlaceActiveObject *pActiveObject, LPCOLESTR pszObjName); /*** IOleInPlaceFrame methods ***/ HRESULT (STDMETHODCALLTYPE *InsertMenus)( - IOleInPlaceFrame* This, + IOleInPlaceFrame *This, HMENU hmenuShared, LPOLEMENUGROUPWIDTHS lpMenuWidths); HRESULT (STDMETHODCALLTYPE *SetMenu)( - IOleInPlaceFrame* This, + IOleInPlaceFrame *This, HMENU hmenuShared, HOLEMENU holemenu, HWND hwndActiveObject); HRESULT (STDMETHODCALLTYPE *RemoveMenus)( - IOleInPlaceFrame* This, + IOleInPlaceFrame *This, HMENU hmenuShared); HRESULT (STDMETHODCALLTYPE *SetStatusText)( - IOleInPlaceFrame* This, + IOleInPlaceFrame *This, LPCOLESTR pszStatusText); HRESULT (STDMETHODCALLTYPE *EnableModeless)( - IOleInPlaceFrame* This, + IOleInPlaceFrame *This, WINBOOL fEnable); HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)( - IOleInPlaceFrame* This, + IOleInPlaceFrame *This, LPMSG lpmsg, WORD wID); END_INTERFACE } IOleInPlaceFrameVtbl; + interface IOleInPlaceFrame { CONST_VTBL IOleInPlaceFrameVtbl* lpVtbl; }; @@ -2990,58 +2516,6 @@ static FORCEINLINE HRESULT IOleInPlaceFrame_TranslateAccelerator(IOleInPlaceFram #endif -HRESULT STDMETHODCALLTYPE IOleInPlaceFrame_InsertMenus_Proxy( - IOleInPlaceFrame* This, - HMENU hmenuShared, - LPOLEMENUGROUPWIDTHS lpMenuWidths); -void __RPC_STUB IOleInPlaceFrame_InsertMenus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceFrame_SetMenu_Proxy( - IOleInPlaceFrame* This, - HMENU hmenuShared, - HOLEMENU holemenu, - HWND hwndActiveObject); -void __RPC_STUB IOleInPlaceFrame_SetMenu_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceFrame_RemoveMenus_Proxy( - IOleInPlaceFrame* This, - HMENU hmenuShared); -void __RPC_STUB IOleInPlaceFrame_RemoveMenus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceFrame_SetStatusText_Proxy( - IOleInPlaceFrame* This, - LPCOLESTR pszStatusText); -void __RPC_STUB IOleInPlaceFrame_SetStatusText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceFrame_EnableModeless_Proxy( - IOleInPlaceFrame* This, - WINBOOL fEnable); -void __RPC_STUB IOleInPlaceFrame_EnableModeless_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceFrame_TranslateAccelerator_Proxy( - IOleInPlaceFrame* This, - LPMSG lpmsg, - WORD wID); -void __RPC_STUB IOleInPlaceFrame_TranslateAccelerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleInPlaceFrame_INTERFACE_DEFINED__ */ @@ -3082,42 +2556,43 @@ typedef struct IOleInPlaceObjectVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleInPlaceObject* This, + IOleInPlaceObject *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleInPlaceObject* This); + IOleInPlaceObject *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleInPlaceObject* This); + IOleInPlaceObject *This); /*** IOleWindow methods ***/ HRESULT (STDMETHODCALLTYPE *GetWindow)( - IOleInPlaceObject* This, + IOleInPlaceObject *This, HWND *phwnd); HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)( - IOleInPlaceObject* This, + IOleInPlaceObject *This, WINBOOL fEnterMode); /*** IOleInPlaceObject methods ***/ HRESULT (STDMETHODCALLTYPE *InPlaceDeactivate)( - IOleInPlaceObject* This); + IOleInPlaceObject *This); HRESULT (STDMETHODCALLTYPE *UIDeactivate)( - IOleInPlaceObject* This); + IOleInPlaceObject *This); HRESULT (STDMETHODCALLTYPE *SetObjectRects)( - IOleInPlaceObject* This, + IOleInPlaceObject *This, LPCRECT lprcPosRect, LPCRECT lprcClipRect); HRESULT (STDMETHODCALLTYPE *ReactivateAndUndo)( - IOleInPlaceObject* This); + IOleInPlaceObject *This); END_INTERFACE } IOleInPlaceObjectVtbl; + interface IOleInPlaceObject { CONST_VTBL IOleInPlaceObjectVtbl* lpVtbl; }; @@ -3172,36 +2647,6 @@ static FORCEINLINE HRESULT IOleInPlaceObject_ReactivateAndUndo(IOleInPlaceObject #endif -HRESULT STDMETHODCALLTYPE IOleInPlaceObject_InPlaceDeactivate_Proxy( - IOleInPlaceObject* This); -void __RPC_STUB IOleInPlaceObject_InPlaceDeactivate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceObject_UIDeactivate_Proxy( - IOleInPlaceObject* This); -void __RPC_STUB IOleInPlaceObject_UIDeactivate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceObject_SetObjectRects_Proxy( - IOleInPlaceObject* This, - LPCRECT lprcPosRect, - LPCRECT lprcClipRect); -void __RPC_STUB IOleInPlaceObject_SetObjectRects_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceObject_ReactivateAndUndo_Proxy( - IOleInPlaceObject* This); -void __RPC_STUB IOleInPlaceObject_ReactivateAndUndo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleInPlaceObject_INTERFACE_DEFINED__ */ @@ -3263,37 +2708,37 @@ typedef struct IOleInPlaceSiteVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOleInPlaceSite* This, + IOleInPlaceSite *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOleInPlaceSite* This); + IOleInPlaceSite *This); ULONG (STDMETHODCALLTYPE *Release)( - IOleInPlaceSite* This); + IOleInPlaceSite *This); /*** IOleWindow methods ***/ HRESULT (STDMETHODCALLTYPE *GetWindow)( - IOleInPlaceSite* This, + IOleInPlaceSite *This, HWND *phwnd); HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)( - IOleInPlaceSite* This, + IOleInPlaceSite *This, WINBOOL fEnterMode); /*** IOleInPlaceSite methods ***/ HRESULT (STDMETHODCALLTYPE *CanInPlaceActivate)( - IOleInPlaceSite* This); + IOleInPlaceSite *This); HRESULT (STDMETHODCALLTYPE *OnInPlaceActivate)( - IOleInPlaceSite* This); + IOleInPlaceSite *This); HRESULT (STDMETHODCALLTYPE *OnUIActivate)( - IOleInPlaceSite* This); + IOleInPlaceSite *This); HRESULT (STDMETHODCALLTYPE *GetWindowContext)( - IOleInPlaceSite* This, + IOleInPlaceSite *This, IOleInPlaceFrame **ppFrame, IOleInPlaceUIWindow **ppDoc, LPRECT lprcPosRect, @@ -3301,28 +2746,29 @@ typedef struct IOleInPlaceSiteVtbl { LPOLEINPLACEFRAMEINFO lpFrameInfo); HRESULT (STDMETHODCALLTYPE *Scroll)( - IOleInPlaceSite* This, + IOleInPlaceSite *This, SIZE scrollExtant); HRESULT (STDMETHODCALLTYPE *OnUIDeactivate)( - IOleInPlaceSite* This, + IOleInPlaceSite *This, WINBOOL fUndoable); HRESULT (STDMETHODCALLTYPE *OnInPlaceDeactivate)( - IOleInPlaceSite* This); + IOleInPlaceSite *This); HRESULT (STDMETHODCALLTYPE *DiscardUndoState)( - IOleInPlaceSite* This); + IOleInPlaceSite *This); HRESULT (STDMETHODCALLTYPE *DeactivateAndUndo)( - IOleInPlaceSite* This); + IOleInPlaceSite *This); HRESULT (STDMETHODCALLTYPE *OnPosRectChange)( - IOleInPlaceSite* This, + IOleInPlaceSite *This, LPCRECT lprcPosRect); END_INTERFACE } IOleInPlaceSiteVtbl; + interface IOleInPlaceSite { CONST_VTBL IOleInPlaceSiteVtbl* lpVtbl; }; @@ -3401,84 +2847,6 @@ static FORCEINLINE HRESULT IOleInPlaceSite_OnPosRectChange(IOleInPlaceSite* This #endif -HRESULT STDMETHODCALLTYPE IOleInPlaceSite_CanInPlaceActivate_Proxy( - IOleInPlaceSite* This); -void __RPC_STUB IOleInPlaceSite_CanInPlaceActivate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceSite_OnInPlaceActivate_Proxy( - IOleInPlaceSite* This); -void __RPC_STUB IOleInPlaceSite_OnInPlaceActivate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceSite_OnUIActivate_Proxy( - IOleInPlaceSite* This); -void __RPC_STUB IOleInPlaceSite_OnUIActivate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceSite_GetWindowContext_Proxy( - IOleInPlaceSite* This, - IOleInPlaceFrame **ppFrame, - IOleInPlaceUIWindow **ppDoc, - LPRECT lprcPosRect, - LPRECT lprcClipRect, - LPOLEINPLACEFRAMEINFO lpFrameInfo); -void __RPC_STUB IOleInPlaceSite_GetWindowContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceSite_Scroll_Proxy( - IOleInPlaceSite* This, - SIZE scrollExtant); -void __RPC_STUB IOleInPlaceSite_Scroll_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceSite_OnUIDeactivate_Proxy( - IOleInPlaceSite* This, - WINBOOL fUndoable); -void __RPC_STUB IOleInPlaceSite_OnUIDeactivate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceSite_OnInPlaceDeactivate_Proxy( - IOleInPlaceSite* This); -void __RPC_STUB IOleInPlaceSite_OnInPlaceDeactivate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceSite_DiscardUndoState_Proxy( - IOleInPlaceSite* This); -void __RPC_STUB IOleInPlaceSite_DiscardUndoState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceSite_DeactivateAndUndo_Proxy( - IOleInPlaceSite* This); -void __RPC_STUB IOleInPlaceSite_DeactivateAndUndo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOleInPlaceSite_OnPosRectChange_Proxy( - IOleInPlaceSite* This, - LPCRECT lprcPosRect); -void __RPC_STUB IOleInPlaceSite_OnPosRectChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOleInPlaceSite_INTERFACE_DEFINED__ */ @@ -3507,22 +2875,23 @@ typedef struct IContinueVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IContinue* This, + IContinue *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IContinue* This); + IContinue *This); ULONG (STDMETHODCALLTYPE *Release)( - IContinue* This); + IContinue *This); /*** IContinue methods ***/ HRESULT (STDMETHODCALLTYPE *FContinue)( - IContinue* This); + IContinue *This); END_INTERFACE } IContinueVtbl; + interface IContinue { CONST_VTBL IContinueVtbl* lpVtbl; }; @@ -3555,13 +2924,6 @@ static FORCEINLINE HRESULT IContinue_FContinue(IContinue* This) { #endif -HRESULT STDMETHODCALLTYPE IContinue_FContinue_Proxy( - IContinue* This); -void __RPC_STUB IContinue_FContinue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IContinue_INTERFACE_DEFINED__ */ @@ -3628,19 +2990,19 @@ typedef struct IViewObjectVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IViewObject* This, + IViewObject *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IViewObject* This); + IViewObject *This); ULONG (STDMETHODCALLTYPE *Release)( - IViewObject* This); + IViewObject *This); /*** IViewObject methods ***/ HRESULT (STDMETHODCALLTYPE *Draw)( - IViewObject* This, + IViewObject *This, DWORD dwDrawAspect, LONG lindex, void *pvAspect, @@ -3653,7 +3015,7 @@ typedef struct IViewObjectVtbl { ULONG_PTR dwContinue); HRESULT (STDMETHODCALLTYPE *GetColorSet)( - IViewObject* This, + IViewObject *This, DWORD dwDrawAspect, LONG lindex, void *pvAspect, @@ -3662,30 +3024,31 @@ typedef struct IViewObjectVtbl { LOGPALETTE **ppColorSet); HRESULT (STDMETHODCALLTYPE *Freeze)( - IViewObject* This, + IViewObject *This, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DWORD *pdwFreeze); HRESULT (STDMETHODCALLTYPE *Unfreeze)( - IViewObject* This, + IViewObject *This, DWORD dwFreeze); HRESULT (STDMETHODCALLTYPE *SetAdvise)( - IViewObject* This, + IViewObject *This, DWORD aspects, DWORD advf, IAdviseSink *pAdvSink); HRESULT (STDMETHODCALLTYPE *GetAdvise)( - IViewObject* This, + IViewObject *This, DWORD *pAspects, DWORD *pAdvf, IAdviseSink **ppAdvSink); END_INTERFACE } IViewObjectVtbl; + interface IViewObject { CONST_VTBL IViewObjectVtbl* lpVtbl; }; @@ -3778,24 +3141,6 @@ void __RPC_STUB IViewObject_RemoteFreeze_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IViewObject_Unfreeze_Proxy( - IViewObject* This, - DWORD dwFreeze); -void __RPC_STUB IViewObject_Unfreeze_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IViewObject_SetAdvise_Proxy( - IViewObject* This, - DWORD aspects, - DWORD advf, - IAdviseSink *pAdvSink); -void __RPC_STUB IViewObject_SetAdvise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE IViewObject_RemoteGetAdvise_Proxy( IViewObject* This, DWORD *pAspects, @@ -3900,19 +3245,19 @@ typedef struct IViewObject2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IViewObject2* This, + IViewObject2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IViewObject2* This); + IViewObject2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IViewObject2* This); + IViewObject2 *This); /*** IViewObject methods ***/ HRESULT (STDMETHODCALLTYPE *Draw)( - IViewObject2* This, + IViewObject2 *This, DWORD dwDrawAspect, LONG lindex, void *pvAspect, @@ -3925,7 +3270,7 @@ typedef struct IViewObject2Vtbl { ULONG_PTR dwContinue); HRESULT (STDMETHODCALLTYPE *GetColorSet)( - IViewObject2* This, + IViewObject2 *This, DWORD dwDrawAspect, LONG lindex, void *pvAspect, @@ -3934,31 +3279,31 @@ typedef struct IViewObject2Vtbl { LOGPALETTE **ppColorSet); HRESULT (STDMETHODCALLTYPE *Freeze)( - IViewObject2* This, + IViewObject2 *This, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DWORD *pdwFreeze); HRESULT (STDMETHODCALLTYPE *Unfreeze)( - IViewObject2* This, + IViewObject2 *This, DWORD dwFreeze); HRESULT (STDMETHODCALLTYPE *SetAdvise)( - IViewObject2* This, + IViewObject2 *This, DWORD aspects, DWORD advf, IAdviseSink *pAdvSink); HRESULT (STDMETHODCALLTYPE *GetAdvise)( - IViewObject2* This, + IViewObject2 *This, DWORD *pAspects, DWORD *pAdvf, IAdviseSink **ppAdvSink); /*** IViewObject2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetExtent)( - IViewObject2* This, + IViewObject2 *This, DWORD dwDrawAspect, LONG lindex, DVTARGETDEVICE *ptd, @@ -3966,6 +3311,7 @@ typedef struct IViewObject2Vtbl { END_INTERFACE } IViewObject2Vtbl; + interface IViewObject2 { CONST_VTBL IViewObject2Vtbl* lpVtbl; }; @@ -4024,17 +3370,6 @@ static FORCEINLINE HRESULT IViewObject2_GetExtent(IViewObject2* This,DWORD dwDra #endif -HRESULT STDMETHODCALLTYPE IViewObject2_GetExtent_Proxy( - IViewObject2* This, - DWORD dwDrawAspect, - LONG lindex, - DVTARGETDEVICE *ptd, - LPSIZEL lpsizel); -void __RPC_STUB IViewObject2_GetExtent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IViewObject2_INTERFACE_DEFINED__ */ @@ -4069,28 +3404,29 @@ typedef struct IDropSourceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDropSource* This, + IDropSource *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDropSource* This); + IDropSource *This); ULONG (STDMETHODCALLTYPE *Release)( - IDropSource* This); + IDropSource *This); /*** IDropSource methods ***/ HRESULT (STDMETHODCALLTYPE *QueryContinueDrag)( - IDropSource* This, + IDropSource *This, WINBOOL fEscapePressed, DWORD grfKeyState); HRESULT (STDMETHODCALLTYPE *GiveFeedback)( - IDropSource* This, + IDropSource *This, DWORD dwEffect); END_INTERFACE } IDropSourceVtbl; + interface IDropSource { CONST_VTBL IDropSourceVtbl* lpVtbl; }; @@ -4127,23 +3463,6 @@ static FORCEINLINE HRESULT IDropSource_GiveFeedback(IDropSource* This,DWORD dwEf #endif -HRESULT STDMETHODCALLTYPE IDropSource_QueryContinueDrag_Proxy( - IDropSource* This, - WINBOOL fEscapePressed, - DWORD grfKeyState); -void __RPC_STUB IDropSource_QueryContinueDrag_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDropSource_GiveFeedback_Proxy( - IDropSource* This, - DWORD dwEffect); -void __RPC_STUB IDropSource_GiveFeedback_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDropSource_INTERFACE_DEFINED__ */ @@ -4219,35 +3538,35 @@ typedef struct IDropTargetVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDropTarget* This, + IDropTarget *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDropTarget* This); + IDropTarget *This); ULONG (STDMETHODCALLTYPE *Release)( - IDropTarget* This); + IDropTarget *This); /*** IDropTarget methods ***/ HRESULT (STDMETHODCALLTYPE *DragEnter)( - IDropTarget* This, + IDropTarget *This, IDataObject *pDataObj, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect); HRESULT (STDMETHODCALLTYPE *DragOver)( - IDropTarget* This, + IDropTarget *This, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect); HRESULT (STDMETHODCALLTYPE *DragLeave)( - IDropTarget* This); + IDropTarget *This); HRESULT (STDMETHODCALLTYPE *Drop)( - IDropTarget* This, + IDropTarget *This, IDataObject *pDataObj, DWORD grfKeyState, POINTL pt, @@ -4255,6 +3574,7 @@ typedef struct IDropTargetVtbl { END_INTERFACE } IDropTargetVtbl; + interface IDropTarget { CONST_VTBL IDropTargetVtbl* lpVtbl; }; @@ -4299,45 +3619,6 @@ static FORCEINLINE HRESULT IDropTarget_Drop(IDropTarget* This,IDataObject *pData #endif -HRESULT STDMETHODCALLTYPE IDropTarget_DragEnter_Proxy( - IDropTarget* This, - IDataObject *pDataObj, - DWORD grfKeyState, - POINTL pt, - DWORD *pdwEffect); -void __RPC_STUB IDropTarget_DragEnter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDropTarget_DragOver_Proxy( - IDropTarget* This, - DWORD grfKeyState, - POINTL pt, - DWORD *pdwEffect); -void __RPC_STUB IDropTarget_DragOver_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDropTarget_DragLeave_Proxy( - IDropTarget* This); -void __RPC_STUB IDropTarget_DragLeave_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDropTarget_Drop_Proxy( - IDropTarget* This, - IDataObject *pDataObj, - DWORD grfKeyState, - POINTL pt, - DWORD *pdwEffect); -void __RPC_STUB IDropTarget_Drop_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDropTarget_INTERFACE_DEFINED__ */ @@ -4369,26 +3650,27 @@ typedef struct IDropSourceNotifyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDropSourceNotify* This, + IDropSourceNotify *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDropSourceNotify* This); + IDropSourceNotify *This); ULONG (STDMETHODCALLTYPE *Release)( - IDropSourceNotify* This); + IDropSourceNotify *This); /*** IDropSourceNotify methods ***/ HRESULT (STDMETHODCALLTYPE *DragEnterTarget)( - IDropSourceNotify* This, + IDropSourceNotify *This, HWND hwndTarget); HRESULT (STDMETHODCALLTYPE *DragLeaveTarget)( - IDropSourceNotify* This); + IDropSourceNotify *This); END_INTERFACE } IDropSourceNotifyVtbl; + interface IDropSourceNotify { CONST_VTBL IDropSourceNotifyVtbl* lpVtbl; }; @@ -4425,21 +3707,6 @@ static FORCEINLINE HRESULT IDropSourceNotify_DragLeaveTarget(IDropSourceNotify* #endif -HRESULT STDMETHODCALLTYPE IDropSourceNotify_DragEnterTarget_Proxy( - IDropSourceNotify* This, - HWND hwndTarget); -void __RPC_STUB IDropSourceNotify_DragEnterTarget_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDropSourceNotify_DragLeaveTarget_Proxy( - IDropSourceNotify* This); -void __RPC_STUB IDropSourceNotify_DragLeaveTarget_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDropSourceNotify_INTERFACE_DEFINED__ */ @@ -4496,36 +3763,37 @@ typedef struct IEnumOLEVERBVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumOLEVERB* This, + IEnumOLEVERB *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumOLEVERB* This); + IEnumOLEVERB *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumOLEVERB* This); + IEnumOLEVERB *This); /*** IEnumOLEVERB methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumOLEVERB* This, + IEnumOLEVERB *This, ULONG celt, LPOLEVERB rgelt, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumOLEVERB* This, + IEnumOLEVERB *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumOLEVERB* This); + IEnumOLEVERB *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumOLEVERB* This, + IEnumOLEVERB *This, IEnumOLEVERB **ppenum); END_INTERFACE } IEnumOLEVERBVtbl; + interface IEnumOLEVERB { CONST_VTBL IEnumOLEVERBVtbl* lpVtbl; }; @@ -4580,29 +3848,6 @@ void __RPC_STUB IEnumOLEVERB_RemoteNext_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumOLEVERB_Skip_Proxy( - IEnumOLEVERB* This, - ULONG celt); -void __RPC_STUB IEnumOLEVERB_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumOLEVERB_Reset_Proxy( - IEnumOLEVERB* This); -void __RPC_STUB IEnumOLEVERB_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumOLEVERB_Clone_Proxy( - IEnumOLEVERB* This, - IEnumOLEVERB **ppenum); -void __RPC_STUB IEnumOLEVERB_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IEnumOLEVERB_Next_Proxy( IEnumOLEVERB* This, ULONG celt, diff --git a/lib/libc/include/any-windows-any/optary.h b/lib/libc/include/any-windows-any/optary.h index 96d8e49a3e..f3021d67ed 100644 --- a/lib/libc/include/any-windows-any/optary.h +++ b/lib/libc/include/any-windows-any/optary.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/optary.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from include/optary.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -145,7 +146,7 @@ static FORCEINLINE HRESULT IOptionArray_SetOption(IOptionArray* This,DWORD dwOpt #ifndef __IHtmlLoadOptions_INTERFACE_DEFINED__ #define __IHtmlLoadOptions_INTERFACE_DEFINED__ -typedef enum __WIDL_optary_generated_name_00000002 { +typedef enum __WIDL_optary_generated_name_0000000E { HTMLLOADOPTION_CODEPAGE = 0, HTMLLOADOPTION_INETSHORTCUTPATH = 1, HTMLLOADOPTION_HYPERLINK = 2, diff --git a/lib/libc/include/any-windows-any/portabledevicetypes.h b/lib/libc/include/any-windows-any/portabledevicetypes.h index e275638e72..af05861616 100644 --- a/lib/libc/include/any-windows-any/portabledevicetypes.h +++ b/lib/libc/include/any-windows-any/portabledevicetypes.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/portabledevicetypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/portabledevicetypes.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,21 +21,33 @@ #ifndef __IPortableDeviceValues_FWD_DEFINED__ #define __IPortableDeviceValues_FWD_DEFINED__ typedef interface IPortableDeviceValues IPortableDeviceValues; +#ifdef __cplusplus +interface IPortableDeviceValues; +#endif /* __cplusplus */ #endif #ifndef __IPortableDeviceKeyCollection_FWD_DEFINED__ #define __IPortableDeviceKeyCollection_FWD_DEFINED__ typedef interface IPortableDeviceKeyCollection IPortableDeviceKeyCollection; +#ifdef __cplusplus +interface IPortableDeviceKeyCollection; +#endif /* __cplusplus */ #endif #ifndef __IPortableDevicePropVariantCollection_FWD_DEFINED__ #define __IPortableDevicePropVariantCollection_FWD_DEFINED__ typedef interface IPortableDevicePropVariantCollection IPortableDevicePropVariantCollection; +#ifdef __cplusplus +interface IPortableDevicePropVariantCollection; +#endif /* __cplusplus */ #endif #ifndef __IPortableDeviceValuesCollection_FWD_DEFINED__ #define __IPortableDeviceValuesCollection_FWD_DEFINED__ typedef interface IPortableDeviceValuesCollection IPortableDeviceValuesCollection; +#ifdef __cplusplus +interface IPortableDeviceValuesCollection; +#endif /* __cplusplus */ #endif #ifndef __PortableDeviceValues_FWD_DEFINED__ @@ -59,16 +72,25 @@ extern "C" { #ifndef __IPortableDeviceKeyCollection_FWD_DEFINED__ #define __IPortableDeviceKeyCollection_FWD_DEFINED__ typedef interface IPortableDeviceKeyCollection IPortableDeviceKeyCollection; +#ifdef __cplusplus +interface IPortableDeviceKeyCollection; +#endif /* __cplusplus */ #endif #ifndef __IPortableDevicePropVariantCollection_FWD_DEFINED__ #define __IPortableDevicePropVariantCollection_FWD_DEFINED__ typedef interface IPortableDevicePropVariantCollection IPortableDevicePropVariantCollection; +#ifdef __cplusplus +interface IPortableDevicePropVariantCollection; +#endif /* __cplusplus */ #endif #ifndef __IPortableDeviceValuesCollection_FWD_DEFINED__ #define __IPortableDeviceValuesCollection_FWD_DEFINED__ typedef interface IPortableDeviceValuesCollection IPortableDeviceValuesCollection; +#ifdef __cplusplus +interface IPortableDeviceValuesCollection; +#endif /* __cplusplus */ #endif /***************************************************************************** @@ -250,216 +272,217 @@ typedef struct IPortableDeviceValuesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPortableDeviceValues* This); + IPortableDeviceValues *This); ULONG (STDMETHODCALLTYPE *Release)( - IPortableDeviceValues* This); + IPortableDeviceValues *This); /*** IPortableDeviceValues methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, DWORD *pcelt); HRESULT (STDMETHODCALLTYPE *GetAt)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, const DWORD index, PROPERTYKEY *pKey, PROPVARIANT *pValue); HRESULT (STDMETHODCALLTYPE *SetValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, const PROPVARIANT *pValue); HRESULT (STDMETHODCALLTYPE *GetValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, PROPVARIANT *pValue); HRESULT (STDMETHODCALLTYPE *SetStringValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, LPCWSTR Value); HRESULT (STDMETHODCALLTYPE *GetStringValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, LPWSTR *pValue); HRESULT (STDMETHODCALLTYPE *SetUnsignedIntegerValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, const ULONG Value); HRESULT (STDMETHODCALLTYPE *GetUnsignedIntegerValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, ULONG *pValue); HRESULT (STDMETHODCALLTYPE *SetSignedIntegerValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, const LONG Value); HRESULT (STDMETHODCALLTYPE *GetSignedIntegerValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, LONG *pValue); HRESULT (STDMETHODCALLTYPE *SetUnsignedLargeIntegerValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, const ULONGLONG Value); HRESULT (STDMETHODCALLTYPE *GetUnsignedLargeIntegerValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, ULONGLONG *pValue); HRESULT (STDMETHODCALLTYPE *SetSignedLargeIntegerValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, const LONGLONG Value); HRESULT (STDMETHODCALLTYPE *GetSignedLargeIntegerValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, LONGLONG *pValue); HRESULT (STDMETHODCALLTYPE *SetFloatValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, const FLOAT Value); HRESULT (STDMETHODCALLTYPE *GetFloatValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, FLOAT *pValue); HRESULT (STDMETHODCALLTYPE *SetErrorValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, const HRESULT Value); HRESULT (STDMETHODCALLTYPE *GetErrorValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, HRESULT *pValue); HRESULT (STDMETHODCALLTYPE *SetKeyValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, REFPROPERTYKEY Value); HRESULT (STDMETHODCALLTYPE *GetKeyValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, PROPERTYKEY *pValue); HRESULT (STDMETHODCALLTYPE *SetBoolValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, const WINBOOL Value); HRESULT (STDMETHODCALLTYPE *GetBoolValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, WINBOOL *pValue); HRESULT (STDMETHODCALLTYPE *SetIUnknownValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, IUnknown *pValue); HRESULT (STDMETHODCALLTYPE *GetIUnknownValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, IUnknown **ppValue); HRESULT (STDMETHODCALLTYPE *SetGuidValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, REFGUID Value); HRESULT (STDMETHODCALLTYPE *GetGuidValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, GUID *pValue); HRESULT (STDMETHODCALLTYPE *SetBufferValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, BYTE *pValue, DWORD cbValue); HRESULT (STDMETHODCALLTYPE *GetBufferValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, BYTE **ppValue, DWORD *pcbValue); HRESULT (STDMETHODCALLTYPE *SetIPortableDeviceValuesValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, IPortableDeviceValues *pValue); HRESULT (STDMETHODCALLTYPE *GetIPortableDeviceValuesValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, IPortableDeviceValues **ppValue); HRESULT (STDMETHODCALLTYPE *SetIPortableDevicePropVariantCollectionValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, IPortableDevicePropVariantCollection *pValue); HRESULT (STDMETHODCALLTYPE *GetIPortableDevicePropVariantCollectionValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, IPortableDevicePropVariantCollection **ppValue); HRESULT (STDMETHODCALLTYPE *SetIPortableDeviceKeyCollectionValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, IPortableDeviceKeyCollection *pValue); HRESULT (STDMETHODCALLTYPE *GetIPortableDeviceKeyCollectionValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, IPortableDeviceKeyCollection **ppValue); HRESULT (STDMETHODCALLTYPE *SetIPortableDeviceValuesCollectionValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, IPortableDeviceValuesCollection *pValue); HRESULT (STDMETHODCALLTYPE *GetIPortableDeviceValuesCollectionValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key, IPortableDeviceValuesCollection **ppValue); HRESULT (STDMETHODCALLTYPE *RemoveValue)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, REFPROPERTYKEY key); HRESULT (STDMETHODCALLTYPE *CopyValuesFromPropertyStore)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, IPropertyStore *pStore); HRESULT (STDMETHODCALLTYPE *CopyValuesToPropertyStore)( - IPortableDeviceValues* This, + IPortableDeviceValues *This, IPropertyStore *pStore); HRESULT (STDMETHODCALLTYPE *Clear)( - IPortableDeviceValues* This); + IPortableDeviceValues *This); END_INTERFACE } IPortableDeviceValuesVtbl; + interface IPortableDeviceValues { CONST_VTBL IPortableDeviceValuesVtbl* lpVtbl; }; @@ -648,363 +671,6 @@ static FORCEINLINE HRESULT IPortableDeviceValues_Clear(IPortableDeviceValues* Th #endif -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetCount_Proxy( - IPortableDeviceValues* This, - DWORD *pcelt); -void __RPC_STUB IPortableDeviceValues_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetAt_Proxy( - IPortableDeviceValues* This, - const DWORD index, - PROPERTYKEY *pKey, - PROPVARIANT *pValue); -void __RPC_STUB IPortableDeviceValues_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - const PROPVARIANT *pValue); -void __RPC_STUB IPortableDeviceValues_SetValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - PROPVARIANT *pValue); -void __RPC_STUB IPortableDeviceValues_GetValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetStringValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - LPCWSTR Value); -void __RPC_STUB IPortableDeviceValues_SetStringValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetStringValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - LPWSTR *pValue); -void __RPC_STUB IPortableDeviceValues_GetStringValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetUnsignedIntegerValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - const ULONG Value); -void __RPC_STUB IPortableDeviceValues_SetUnsignedIntegerValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetUnsignedIntegerValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - ULONG *pValue); -void __RPC_STUB IPortableDeviceValues_GetUnsignedIntegerValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetSignedIntegerValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - const LONG Value); -void __RPC_STUB IPortableDeviceValues_SetSignedIntegerValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetSignedIntegerValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - LONG *pValue); -void __RPC_STUB IPortableDeviceValues_GetSignedIntegerValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetUnsignedLargeIntegerValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - const ULONGLONG Value); -void __RPC_STUB IPortableDeviceValues_SetUnsignedLargeIntegerValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetUnsignedLargeIntegerValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - ULONGLONG *pValue); -void __RPC_STUB IPortableDeviceValues_GetUnsignedLargeIntegerValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetSignedLargeIntegerValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - const LONGLONG Value); -void __RPC_STUB IPortableDeviceValues_SetSignedLargeIntegerValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetSignedLargeIntegerValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - LONGLONG *pValue); -void __RPC_STUB IPortableDeviceValues_GetSignedLargeIntegerValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetFloatValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - const FLOAT Value); -void __RPC_STUB IPortableDeviceValues_SetFloatValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetFloatValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - FLOAT *pValue); -void __RPC_STUB IPortableDeviceValues_GetFloatValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetErrorValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - const HRESULT Value); -void __RPC_STUB IPortableDeviceValues_SetErrorValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetErrorValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - HRESULT *pValue); -void __RPC_STUB IPortableDeviceValues_GetErrorValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetKeyValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - REFPROPERTYKEY Value); -void __RPC_STUB IPortableDeviceValues_SetKeyValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetKeyValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - PROPERTYKEY *pValue); -void __RPC_STUB IPortableDeviceValues_GetKeyValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetBoolValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - const WINBOOL Value); -void __RPC_STUB IPortableDeviceValues_SetBoolValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetBoolValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - WINBOOL *pValue); -void __RPC_STUB IPortableDeviceValues_GetBoolValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetIUnknownValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - IUnknown *pValue); -void __RPC_STUB IPortableDeviceValues_SetIUnknownValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetIUnknownValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - IUnknown **ppValue); -void __RPC_STUB IPortableDeviceValues_GetIUnknownValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetGuidValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - REFGUID Value); -void __RPC_STUB IPortableDeviceValues_SetGuidValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetGuidValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - GUID *pValue); -void __RPC_STUB IPortableDeviceValues_GetGuidValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetBufferValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - BYTE *pValue, - DWORD cbValue); -void __RPC_STUB IPortableDeviceValues_SetBufferValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetBufferValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - BYTE **ppValue, - DWORD *pcbValue); -void __RPC_STUB IPortableDeviceValues_GetBufferValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetIPortableDeviceValuesValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - IPortableDeviceValues *pValue); -void __RPC_STUB IPortableDeviceValues_SetIPortableDeviceValuesValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetIPortableDeviceValuesValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - IPortableDeviceValues **ppValue); -void __RPC_STUB IPortableDeviceValues_GetIPortableDeviceValuesValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetIPortableDevicePropVariantCollectionValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - IPortableDevicePropVariantCollection *pValue); -void __RPC_STUB IPortableDeviceValues_SetIPortableDevicePropVariantCollectionValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetIPortableDevicePropVariantCollectionValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - IPortableDevicePropVariantCollection **ppValue); -void __RPC_STUB IPortableDeviceValues_GetIPortableDevicePropVariantCollectionValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetIPortableDeviceKeyCollectionValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - IPortableDeviceKeyCollection *pValue); -void __RPC_STUB IPortableDeviceValues_SetIPortableDeviceKeyCollectionValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetIPortableDeviceKeyCollectionValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - IPortableDeviceKeyCollection **ppValue); -void __RPC_STUB IPortableDeviceValues_GetIPortableDeviceKeyCollectionValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetIPortableDeviceValuesCollectionValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - IPortableDeviceValuesCollection *pValue); -void __RPC_STUB IPortableDeviceValues_SetIPortableDeviceValuesCollectionValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetIPortableDeviceValuesCollectionValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key, - IPortableDeviceValuesCollection **ppValue); -void __RPC_STUB IPortableDeviceValues_GetIPortableDeviceValuesCollectionValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_RemoveValue_Proxy( - IPortableDeviceValues* This, - REFPROPERTYKEY key); -void __RPC_STUB IPortableDeviceValues_RemoveValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_CopyValuesFromPropertyStore_Proxy( - IPortableDeviceValues* This, - IPropertyStore *pStore); -void __RPC_STUB IPortableDeviceValues_CopyValuesFromPropertyStore_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_CopyValuesToPropertyStore_Proxy( - IPortableDeviceValues* This, - IPropertyStore *pStore); -void __RPC_STUB IPortableDeviceValues_CopyValuesToPropertyStore_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValues_Clear_Proxy( - IPortableDeviceValues* This); -void __RPC_STUB IPortableDeviceValues_Clear_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPortableDeviceValues_INTERFACE_DEFINED__ */ @@ -1045,39 +711,40 @@ typedef struct IPortableDeviceKeyCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPortableDeviceKeyCollection* This, + IPortableDeviceKeyCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPortableDeviceKeyCollection* This); + IPortableDeviceKeyCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - IPortableDeviceKeyCollection* This); + IPortableDeviceKeyCollection *This); /*** IPortableDeviceKeyCollection methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IPortableDeviceKeyCollection* This, + IPortableDeviceKeyCollection *This, DWORD *pcElems); HRESULT (STDMETHODCALLTYPE *GetAt)( - IPortableDeviceKeyCollection* This, + IPortableDeviceKeyCollection *This, const DWORD dwIndex, PROPERTYKEY *pKey); HRESULT (STDMETHODCALLTYPE *Add)( - IPortableDeviceKeyCollection* This, + IPortableDeviceKeyCollection *This, REFPROPERTYKEY Key); HRESULT (STDMETHODCALLTYPE *Clear)( - IPortableDeviceKeyCollection* This); + IPortableDeviceKeyCollection *This); HRESULT (STDMETHODCALLTYPE *RemoveAt)( - IPortableDeviceKeyCollection* This, + IPortableDeviceKeyCollection *This, const DWORD dwIndex); END_INTERFACE } IPortableDeviceKeyCollectionVtbl; + interface IPortableDeviceKeyCollection { CONST_VTBL IPortableDeviceKeyCollectionVtbl* lpVtbl; }; @@ -1126,46 +793,6 @@ static FORCEINLINE HRESULT IPortableDeviceKeyCollection_RemoveAt(IPortableDevice #endif -HRESULT STDMETHODCALLTYPE IPortableDeviceKeyCollection_GetCount_Proxy( - IPortableDeviceKeyCollection* This, - DWORD *pcElems); -void __RPC_STUB IPortableDeviceKeyCollection_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceKeyCollection_GetAt_Proxy( - IPortableDeviceKeyCollection* This, - const DWORD dwIndex, - PROPERTYKEY *pKey); -void __RPC_STUB IPortableDeviceKeyCollection_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceKeyCollection_Add_Proxy( - IPortableDeviceKeyCollection* This, - REFPROPERTYKEY Key); -void __RPC_STUB IPortableDeviceKeyCollection_Add_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceKeyCollection_Clear_Proxy( - IPortableDeviceKeyCollection* This); -void __RPC_STUB IPortableDeviceKeyCollection_Clear_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceKeyCollection_RemoveAt_Proxy( - IPortableDeviceKeyCollection* This, - const DWORD dwIndex); -void __RPC_STUB IPortableDeviceKeyCollection_RemoveAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPortableDeviceKeyCollection_INTERFACE_DEFINED__ */ @@ -1212,47 +839,48 @@ typedef struct IPortableDevicePropVariantCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPortableDevicePropVariantCollection* This, + IPortableDevicePropVariantCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPortableDevicePropVariantCollection* This); + IPortableDevicePropVariantCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - IPortableDevicePropVariantCollection* This); + IPortableDevicePropVariantCollection *This); /*** IPortableDevicePropVariantCollection methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IPortableDevicePropVariantCollection* This, + IPortableDevicePropVariantCollection *This, DWORD *pcElems); HRESULT (STDMETHODCALLTYPE *GetAt)( - IPortableDevicePropVariantCollection* This, + IPortableDevicePropVariantCollection *This, const DWORD dwIndex, PROPVARIANT *pValue); HRESULT (STDMETHODCALLTYPE *Add)( - IPortableDevicePropVariantCollection* This, + IPortableDevicePropVariantCollection *This, const PROPVARIANT *pValue); HRESULT (STDMETHODCALLTYPE *GetType)( - IPortableDevicePropVariantCollection* This, + IPortableDevicePropVariantCollection *This, VARTYPE *pvt); HRESULT (STDMETHODCALLTYPE *ChangeType)( - IPortableDevicePropVariantCollection* This, + IPortableDevicePropVariantCollection *This, const VARTYPE vt); HRESULT (STDMETHODCALLTYPE *Clear)( - IPortableDevicePropVariantCollection* This); + IPortableDevicePropVariantCollection *This); HRESULT (STDMETHODCALLTYPE *RemoveAt)( - IPortableDevicePropVariantCollection* This, + IPortableDevicePropVariantCollection *This, const DWORD dwIndex); END_INTERFACE } IPortableDevicePropVariantCollectionVtbl; + interface IPortableDevicePropVariantCollection { CONST_VTBL IPortableDevicePropVariantCollectionVtbl* lpVtbl; }; @@ -1309,62 +937,6 @@ static FORCEINLINE HRESULT IPortableDevicePropVariantCollection_RemoveAt(IPortab #endif -HRESULT STDMETHODCALLTYPE IPortableDevicePropVariantCollection_GetCount_Proxy( - IPortableDevicePropVariantCollection* This, - DWORD *pcElems); -void __RPC_STUB IPortableDevicePropVariantCollection_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDevicePropVariantCollection_GetAt_Proxy( - IPortableDevicePropVariantCollection* This, - const DWORD dwIndex, - PROPVARIANT *pValue); -void __RPC_STUB IPortableDevicePropVariantCollection_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDevicePropVariantCollection_Add_Proxy( - IPortableDevicePropVariantCollection* This, - const PROPVARIANT *pValue); -void __RPC_STUB IPortableDevicePropVariantCollection_Add_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDevicePropVariantCollection_GetType_Proxy( - IPortableDevicePropVariantCollection* This, - VARTYPE *pvt); -void __RPC_STUB IPortableDevicePropVariantCollection_GetType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDevicePropVariantCollection_ChangeType_Proxy( - IPortableDevicePropVariantCollection* This, - const VARTYPE vt); -void __RPC_STUB IPortableDevicePropVariantCollection_ChangeType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDevicePropVariantCollection_Clear_Proxy( - IPortableDevicePropVariantCollection* This); -void __RPC_STUB IPortableDevicePropVariantCollection_Clear_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDevicePropVariantCollection_RemoveAt_Proxy( - IPortableDevicePropVariantCollection* This, - const DWORD dwIndex); -void __RPC_STUB IPortableDevicePropVariantCollection_RemoveAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPortableDevicePropVariantCollection_INTERFACE_DEFINED__ */ @@ -1405,39 +977,40 @@ typedef struct IPortableDeviceValuesCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPortableDeviceValuesCollection* This, + IPortableDeviceValuesCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPortableDeviceValuesCollection* This); + IPortableDeviceValuesCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - IPortableDeviceValuesCollection* This); + IPortableDeviceValuesCollection *This); /*** IPortableDeviceValuesCollection methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IPortableDeviceValuesCollection* This, + IPortableDeviceValuesCollection *This, DWORD *pcElems); HRESULT (STDMETHODCALLTYPE *GetAt)( - IPortableDeviceValuesCollection* This, + IPortableDeviceValuesCollection *This, DWORD dwIndex, IPortableDeviceValues **ppValues); HRESULT (STDMETHODCALLTYPE *Add)( - IPortableDeviceValuesCollection* This, + IPortableDeviceValuesCollection *This, IPortableDeviceValues *pValues); HRESULT (STDMETHODCALLTYPE *Clear)( - IPortableDeviceValuesCollection* This); + IPortableDeviceValuesCollection *This); HRESULT (STDMETHODCALLTYPE *RemoveAt)( - IPortableDeviceValuesCollection* This, + IPortableDeviceValuesCollection *This, const DWORD dwIndex); END_INTERFACE } IPortableDeviceValuesCollectionVtbl; + interface IPortableDeviceValuesCollection { CONST_VTBL IPortableDeviceValuesCollectionVtbl* lpVtbl; }; @@ -1486,46 +1059,6 @@ static FORCEINLINE HRESULT IPortableDeviceValuesCollection_RemoveAt(IPortableDev #endif -HRESULT STDMETHODCALLTYPE IPortableDeviceValuesCollection_GetCount_Proxy( - IPortableDeviceValuesCollection* This, - DWORD *pcElems); -void __RPC_STUB IPortableDeviceValuesCollection_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValuesCollection_GetAt_Proxy( - IPortableDeviceValuesCollection* This, - DWORD dwIndex, - IPortableDeviceValues **ppValues); -void __RPC_STUB IPortableDeviceValuesCollection_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValuesCollection_Add_Proxy( - IPortableDeviceValuesCollection* This, - IPortableDeviceValues *pValues); -void __RPC_STUB IPortableDeviceValuesCollection_Add_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValuesCollection_Clear_Proxy( - IPortableDeviceValuesCollection* This); -void __RPC_STUB IPortableDeviceValuesCollection_Clear_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPortableDeviceValuesCollection_RemoveAt_Proxy( - IPortableDeviceValuesCollection* This, - const DWORD dwIndex); -void __RPC_STUB IPortableDeviceValuesCollection_RemoveAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPortableDeviceValuesCollection_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/process.h b/lib/libc/include/any-windows-any/process.h index bf1004ed0f..d96be28ccb 100644 --- a/lib/libc/include/any-windows-any/process.h +++ b/lib/libc/include/any-windows-any/process.h @@ -29,9 +29,12 @@ extern "C" { #define _WAIT_GRANDCHILD 1 #endif - _CRTIMP uintptr_t __cdecl _beginthread(void (__cdecl *_StartAddress) (void *),unsigned _StackSize,void *_ArgList); + typedef void (__cdecl *_beginthread_proc_type)(void *); + typedef unsigned (__stdcall *_beginthreadex_proc_type)(void *); + + _CRTIMP uintptr_t __cdecl _beginthread(_beginthread_proc_type _StartAddress,unsigned _StackSize,void *_ArgList); _CRTIMP void __cdecl _endthread(void) __MINGW_ATTRIB_NORETURN; - _CRTIMP uintptr_t __cdecl _beginthreadex(void *_Security,unsigned _StackSize,unsigned (__stdcall *_StartAddress) (void *),void *_ArgList,unsigned _InitFlag,unsigned *_ThrdAddr); + _CRTIMP uintptr_t __cdecl _beginthreadex(void *_Security,unsigned _StackSize,_beginthreadex_proc_type _StartAddress,void *_ArgList,unsigned _InitFlag,unsigned *_ThrdAddr); _CRTIMP void __cdecl _endthreadex(unsigned _Retval) __MINGW_ATTRIB_NORETURN; #ifndef _CRT_TERMINATE_DEFINED @@ -180,20 +183,20 @@ extern "C" { stupid warnings, define them in POSIX way. This is save, because those methods do not return in success case, so that the return value is not really dependent to its scalar width. */ - int __cdecl execv(const char *_Filename,char *const _ArgList[]) __MINGW_ATTRIB_DEPRECATED_MSVC2005; - int __cdecl execve(const char *_Filename,char *const _ArgList[],char *const _Env[]) __MINGW_ATTRIB_DEPRECATED_MSVC2005; - int __cdecl execvp(const char *_Filename,char *const _ArgList[]) __MINGW_ATTRIB_DEPRECATED_MSVC2005; - int __cdecl execvpe(const char *_Filename,char *const _ArgList[],char *const _Env[]) __MINGW_ATTRIB_DEPRECATED_MSVC2005; + _CRTIMP int __cdecl execv(const char *_Filename,char *const _ArgList[]) __MINGW_ATTRIB_DEPRECATED_MSVC2005; + _CRTIMP int __cdecl execve(const char *_Filename,char *const _ArgList[],char *const _Env[]) __MINGW_ATTRIB_DEPRECATED_MSVC2005; + _CRTIMP int __cdecl execvp(const char *_Filename,char *const _ArgList[]) __MINGW_ATTRIB_DEPRECATED_MSVC2005; + _CRTIMP int __cdecl execvpe(const char *_Filename,char *const _ArgList[],char *const _Env[]) __MINGW_ATTRIB_DEPRECATED_MSVC2005; #else - intptr_t __cdecl execv(const char *_Filename,char *const _ArgList[]) __MINGW_ATTRIB_DEPRECATED_MSVC2005; - intptr_t __cdecl execve(const char *_Filename,char *const _ArgList[],char *const _Env[]) __MINGW_ATTRIB_DEPRECATED_MSVC2005; - intptr_t __cdecl execvp(const char *_Filename,char *const _ArgList[]) __MINGW_ATTRIB_DEPRECATED_MSVC2005; - intptr_t __cdecl execvpe(const char *_Filename,char *const _ArgList[],char *const _Env[]) __MINGW_ATTRIB_DEPRECATED_MSVC2005; + _CRTIMP intptr_t __cdecl execv(const char *_Filename,char *const _ArgList[]) __MINGW_ATTRIB_DEPRECATED_MSVC2005; + _CRTIMP intptr_t __cdecl execve(const char *_Filename,char *const _ArgList[],char *const _Env[]) __MINGW_ATTRIB_DEPRECATED_MSVC2005; + _CRTIMP intptr_t __cdecl execvp(const char *_Filename,char *const _ArgList[]) __MINGW_ATTRIB_DEPRECATED_MSVC2005; + _CRTIMP intptr_t __cdecl execvpe(const char *_Filename,char *const _ArgList[],char *const _Env[]) __MINGW_ATTRIB_DEPRECATED_MSVC2005; #endif - intptr_t __cdecl spawnv(int,const char *_Filename,char *const _ArgList[]) __MINGW_ATTRIB_DEPRECATED_MSVC2005; - intptr_t __cdecl spawnve(int,const char *_Filename,char *const _ArgList[],char *const _Env[]) __MINGW_ATTRIB_DEPRECATED_MSVC2005; - intptr_t __cdecl spawnvp(int,const char *_Filename,char *const _ArgList[]) __MINGW_ATTRIB_DEPRECATED_MSVC2005; - intptr_t __cdecl spawnvpe(int,const char *_Filename,char *const _ArgList[],char *const _Env[]) __MINGW_ATTRIB_DEPRECATED_MSVC2005; + _CRTIMP intptr_t __cdecl spawnv(int,const char *_Filename,char *const _ArgList[]) __MINGW_ATTRIB_DEPRECATED_MSVC2005; + _CRTIMP intptr_t __cdecl spawnve(int,const char *_Filename,char *const _ArgList[],char *const _Env[]) __MINGW_ATTRIB_DEPRECATED_MSVC2005; + _CRTIMP intptr_t __cdecl spawnvp(int,const char *_Filename,char *const _ArgList[]) __MINGW_ATTRIB_DEPRECATED_MSVC2005; + _CRTIMP intptr_t __cdecl spawnvpe(int,const char *_Filename,char *const _ArgList[],char *const _Env[]) __MINGW_ATTRIB_DEPRECATED_MSVC2005; #endif #ifdef __cplusplus diff --git a/lib/libc/include/any-windows-any/processenv.h b/lib/libc/include/any-windows-any/processenv.h index 7fb0b011e0..81c54366fc 100644 --- a/lib/libc/include/any-windows-any/processenv.h +++ b/lib/libc/include/any-windows-any/processenv.h @@ -15,32 +15,14 @@ extern "C" { #endif #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) - WINBASEAPI LPCH WINAPI GetEnvironmentStrings (VOID); - WINBASEAPI LPWCH WINAPI GetEnvironmentStringsW (VOID); WINBASEAPI WINBOOL WINAPI SetEnvironmentStringsW (LPWCH NewEnvironment); #ifdef UNICODE -#define GetEnvironmentStrings GetEnvironmentStringsW #define SetEnvironmentStrings SetEnvironmentStringsW -#else -#define GetEnvironmentStringsA GetEnvironmentStrings #endif - WINBASEAPI WINBOOL WINAPI FreeEnvironmentStringsA (LPCH penv); - WINBASEAPI WINBOOL WINAPI FreeEnvironmentStringsW (LPWCH penv); - WINBASEAPI HANDLE WINAPI GetStdHandle (DWORD nStdHandle); - WINBASEAPI WINBOOL WINAPI SetStdHandle (DWORD nStdHandle, HANDLE hHandle); -#if _WIN32_WINNT >= 0x0600 - WINBASEAPI WINBOOL WINAPI SetStdHandleEx (DWORD nStdHandle, HANDLE hHandle, PHANDLE phPrevValue); -#endif WINBASEAPI LPSTR WINAPI GetCommandLineA (VOID); WINBASEAPI LPWSTR WINAPI GetCommandLineW (VOID); - WINBASEAPI DWORD WINAPI GetEnvironmentVariableA (LPCSTR lpName, LPSTR lpBuffer, DWORD nSize); - WINBASEAPI DWORD WINAPI GetEnvironmentVariableW (LPCWSTR lpName, LPWSTR lpBuffer, DWORD nSize); - WINBASEAPI WINBOOL WINAPI SetEnvironmentVariableA (LPCSTR lpName, LPCSTR lpValue); - WINBASEAPI WINBOOL WINAPI SetEnvironmentVariableW (LPCWSTR lpName, LPCWSTR lpValue); - WINBASEAPI DWORD WINAPI ExpandEnvironmentStringsA (LPCSTR lpSrc, LPSTR lpDst, DWORD nSize); - WINBASEAPI DWORD WINAPI ExpandEnvironmentStringsW (LPCWSTR lpSrc, LPWSTR lpDst, DWORD nSize); WINBASEAPI WINBOOL WINAPI SetCurrentDirectoryA (LPCSTR lpPathName); WINBASEAPI WINBOOL WINAPI SetCurrentDirectoryW (LPCWSTR lpPathName); WINBASEAPI DWORD WINAPI GetCurrentDirectoryA (DWORD nBufferLength, LPSTR lpBuffer); @@ -50,14 +32,42 @@ extern "C" { WINBASEAPI WINBOOL WINAPI NeedCurrentDirectoryForExePathA (LPCSTR ExeName); WINBASEAPI WINBOOL WINAPI NeedCurrentDirectoryForExePathW (LPCWSTR ExeName); -#define ExpandEnvironmentStrings __MINGW_NAME_AW(ExpandEnvironmentStrings) -#define FreeEnvironmentStrings __MINGW_NAME_AW(FreeEnvironmentStrings) #define GetCommandLine __MINGW_NAME_AW(GetCommandLine) #define GetCurrentDirectory __MINGW_NAME_AW(GetCurrentDirectory) -#define GetEnvironmentVariable __MINGW_NAME_AW(GetEnvironmentVariable) #define NeedCurrentDirectoryForExePath __MINGW_NAME_AW(NeedCurrentDirectoryForExePath) #define SearchPath __MINGW_NAME_AW(SearchPath) #define SetCurrentDirectory __MINGW_NAME_AW(SetCurrentDirectory) + +#endif + +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= _WIN32_WINNT_WIN10 + + WINBASEAPI LPCH WINAPI GetEnvironmentStrings (VOID); + WINBASEAPI LPWCH WINAPI GetEnvironmentStringsW (VOID); + +#ifdef UNICODE +#define GetEnvironmentStrings GetEnvironmentStringsW +#else +#define GetEnvironmentStringsA GetEnvironmentStrings +#endif + + WINBASEAPI HANDLE WINAPI GetStdHandle (DWORD nStdHandle); + WINBASEAPI DWORD WINAPI ExpandEnvironmentStringsA (LPCSTR lpSrc, LPSTR lpDst, DWORD nSize); + WINBASEAPI DWORD WINAPI ExpandEnvironmentStringsW (LPCWSTR lpSrc, LPWSTR lpDst, DWORD nSize); + WINBASEAPI WINBOOL WINAPI FreeEnvironmentStringsA (LPCH penv); + WINBASEAPI WINBOOL WINAPI FreeEnvironmentStringsW (LPWCH penv); + WINBASEAPI DWORD WINAPI GetEnvironmentVariableA (LPCSTR lpName, LPSTR lpBuffer, DWORD nSize); + WINBASEAPI DWORD WINAPI GetEnvironmentVariableW (LPCWSTR lpName, LPWSTR lpBuffer, DWORD nSize); + WINBASEAPI WINBOOL WINAPI SetEnvironmentVariableA (LPCSTR lpName, LPCSTR lpValue); + WINBASEAPI WINBOOL WINAPI SetEnvironmentVariableW (LPCWSTR lpName, LPCWSTR lpValue); + WINBASEAPI WINBOOL WINAPI SetStdHandle (DWORD nStdHandle, HANDLE hHandle); +#if _WIN32_WINNT >= 0x0600 + WINBASEAPI WINBOOL WINAPI SetStdHandleEx (DWORD nStdHandle, HANDLE hHandle, PHANDLE phPrevValue); +#endif + +#define ExpandEnvironmentStrings __MINGW_NAME_AW(ExpandEnvironmentStrings) +#define FreeEnvironmentStrings __MINGW_NAME_AW(FreeEnvironmentStrings) +#define GetEnvironmentVariable __MINGW_NAME_AW(GetEnvironmentVariable) #define SetEnvironmentVariable __MINGW_NAME_AW(SetEnvironmentVariable) #endif diff --git a/lib/libc/include/any-windows-any/processthreadsapi.h b/lib/libc/include/any-windows-any/processthreadsapi.h index c4629f75f9..7adafcd284 100644 --- a/lib/libc/include/any-windows-any/processthreadsapi.h +++ b/lib/libc/include/any-windows-any/processthreadsapi.h @@ -23,6 +23,31 @@ extern "C" { #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || defined(WINSTORECOMPAT) WINBASEAPI WINBOOL WINAPI TerminateProcess (HANDLE hProcess, UINT uExitCode); #endif +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= _WIN32_WINNT_WIN10 + WINBASEAPI HANDLE WINAPI OpenProcess (DWORD dwDesiredAccess, WINBOOL bInheritHandle, DWORD dwProcessId); + + WINBASEAPI DWORD WINAPI QueueUserAPC (PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData); + WINBASEAPI WINBOOL WINAPI GetProcessTimes (HANDLE hProcess, LPFILETIME lpCreationTime, LPFILETIME lpExitTime, LPFILETIME lpKernelTime, LPFILETIME lpUserTime); + WINBASEAPI DECLSPEC_NORETURN VOID WINAPI ExitProcess (UINT uExitCode); + WINBASEAPI WINBOOL WINAPI GetExitCodeProcess (HANDLE hProcess, LPDWORD lpExitCode); + WINBASEAPI WINBOOL WINAPI SwitchToThread (VOID); + WINBASEAPI HANDLE WINAPI OpenThread (DWORD dwDesiredAccess, WINBOOL bInheritHandle, DWORD dwThreadId); + WINBASEAPI WINBOOL WINAPI SetThreadPriorityBoost (HANDLE hThread, WINBOOL bDisablePriorityBoost); + WINBASEAPI WINBOOL WINAPI GetThreadPriorityBoost (HANDLE hThread, PBOOL pDisablePriorityBoost); + WINADVAPI WINBOOL APIENTRY SetThreadToken (PHANDLE Thread, HANDLE Token); + WINADVAPI WINBOOL WINAPI OpenProcessToken (HANDLE ProcessHandle, DWORD DesiredAccess, PHANDLE TokenHandle); + WINADVAPI WINBOOL WINAPI OpenThreadToken (HANDLE ThreadHandle, DWORD DesiredAccess, WINBOOL OpenAsSelf, PHANDLE TokenHandle); + WINBASEAPI WINBOOL WINAPI SetPriorityClass (HANDLE hProcess, DWORD dwPriorityClass); + WINBASEAPI DWORD WINAPI GetPriorityClass (HANDLE hProcess); + WINBASEAPI DWORD WINAPI GetProcessId (HANDLE Process); + WINBASEAPI DWORD WINAPI GetThreadId (HANDLE Thread); + WINBASEAPI WINBOOL WINAPI GetThreadContext (HANDLE hThread, LPCONTEXT lpContext); + WINBASEAPI WINBOOL WINAPI FlushInstructionCache (HANDLE hProcess, LPCVOID lpBaseAddress, SIZE_T dwSize); + WINBASEAPI WINBOOL WINAPI GetThreadTimes (HANDLE hThread, LPFILETIME lpCreationTime, LPFILETIME lpExitTime, LPFILETIME lpKernelTime, LPFILETIME lpUserTime); + WINBASEAPI DWORD WINAPI GetCurrentProcessorNumber (VOID); + +#endif + #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) typedef struct _PROCESS_INFORMATION { @@ -32,6 +57,8 @@ WINBASEAPI WINBOOL WINAPI TerminateProcess (HANDLE hProcess, UINT uExitCode); DWORD dwThreadId; } PROCESS_INFORMATION, *PPROCESS_INFORMATION, *LPPROCESS_INFORMATION; + typedef struct _PROC_THREAD_ATTRIBUTE_LIST *PPROC_THREAD_ATTRIBUTE_LIST, *LPPROC_THREAD_ATTRIBUTE_LIST; + typedef struct _STARTUPINFOA { DWORD cb; LPSTR lpReserved; @@ -77,38 +104,16 @@ WINBASEAPI WINBOOL WINAPI TerminateProcess (HANDLE hProcess, UINT uExitCode); __MINGW_TYPEDEF_AW(STARTUPINFO) __MINGW_TYPEDEF_AW(LPSTARTUPINFO) - typedef struct _PROC_THREAD_ATTRIBUTE_LIST *PPROC_THREAD_ATTRIBUTE_LIST, *LPPROC_THREAD_ATTRIBUTE_LIST; - - WINBASEAPI DWORD WINAPI QueueUserAPC (PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData); - WINBASEAPI WINBOOL WINAPI GetProcessTimes (HANDLE hProcess, LPFILETIME lpCreationTime, LPFILETIME lpExitTime, LPFILETIME lpKernelTime, LPFILETIME lpUserTime); - WINBASEAPI DECLSPEC_NORETURN VOID WINAPI ExitProcess (UINT uExitCode); - WINBASEAPI WINBOOL WINAPI GetExitCodeProcess (HANDLE hProcess, LPDWORD lpExitCode); - WINBASEAPI WINBOOL WINAPI SwitchToThread (VOID); WINBASEAPI HANDLE WINAPI CreateRemoteThread (HANDLE hProcess, LPSECURITY_ATTRIBUTES lpThreadAttributes, SIZE_T dwStackSize, LPTHREAD_START_ROUTINE lpStartAddress, LPVOID lpParameter, DWORD dwCreationFlags, LPDWORD lpThreadId); - WINBASEAPI HANDLE WINAPI OpenThread (DWORD dwDesiredAccess, WINBOOL bInheritHandle, DWORD dwThreadId); - WINBASEAPI WINBOOL WINAPI SetThreadPriorityBoost (HANDLE hThread, WINBOOL bDisablePriorityBoost); - WINBASEAPI WINBOOL WINAPI GetThreadPriorityBoost (HANDLE hThread, PBOOL pDisablePriorityBoost); WINBASEAPI WINBOOL WINAPI TerminateThread (HANDLE hThread, DWORD dwExitCode); WINBASEAPI WINBOOL WINAPI SetProcessShutdownParameters (DWORD dwLevel, DWORD dwFlags); WINBASEAPI DWORD WINAPI GetProcessVersion (DWORD ProcessId); WINBASEAPI VOID WINAPI GetStartupInfoW (LPSTARTUPINFOW lpStartupInfo); - WINADVAPI WINBOOL APIENTRY SetThreadToken (PHANDLE Thread, HANDLE Token); - WINADVAPI WINBOOL WINAPI OpenProcessToken (HANDLE ProcessHandle, DWORD DesiredAccess, PHANDLE TokenHandle); - WINADVAPI WINBOOL WINAPI OpenThreadToken (HANDLE ThreadHandle, DWORD DesiredAccess, WINBOOL OpenAsSelf, PHANDLE TokenHandle); - WINBASEAPI WINBOOL WINAPI SetPriorityClass (HANDLE hProcess, DWORD dwPriorityClass); WINBASEAPI WINBOOL WINAPI SetThreadStackGuarantee (PULONG StackSizeInBytes); - WINBASEAPI DWORD WINAPI GetPriorityClass (HANDLE hProcess); WINBASEAPI WINBOOL WINAPI ProcessIdToSessionId (DWORD dwProcessId, DWORD *pSessionId); - WINBASEAPI DWORD WINAPI GetProcessId (HANDLE Process); - WINBASEAPI DWORD WINAPI GetThreadId (HANDLE Thread); WINBASEAPI HANDLE WINAPI CreateRemoteThreadEx (HANDLE hProcess, LPSECURITY_ATTRIBUTES lpThreadAttributes, SIZE_T dwStackSize, LPTHREAD_START_ROUTINE lpStartAddress, LPVOID lpParameter, DWORD dwCreationFlags, LPPROC_THREAD_ATTRIBUTE_LIST lpAttributeList, LPDWORD lpThreadId); - WINBASEAPI WINBOOL WINAPI GetThreadContext (HANDLE hThread, LPCONTEXT lpContext); WINBASEAPI WINBOOL WINAPI SetThreadContext (HANDLE hThread, CONST CONTEXT *lpContext); - WINBASEAPI WINBOOL WINAPI FlushInstructionCache (HANDLE hProcess, LPCVOID lpBaseAddress, SIZE_T dwSize); - WINBASEAPI WINBOOL WINAPI GetThreadTimes (HANDLE hThread, LPFILETIME lpCreationTime, LPFILETIME lpExitTime, LPFILETIME lpKernelTime, LPFILETIME lpUserTime); - WINBASEAPI HANDLE WINAPI OpenProcess (DWORD dwDesiredAccess, WINBOOL bInheritHandle, DWORD dwProcessId); WINBASEAPI WINBOOL WINAPI GetProcessHandleCount (HANDLE hProcess, PDWORD pdwHandleCount); - WINBASEAPI DWORD WINAPI GetCurrentProcessorNumber (VOID); #ifdef UNICODE #define GetStartupInfo GetStartupInfoW @@ -147,8 +152,31 @@ WINBASEAPI WINBOOL WINAPI TerminateProcess (HANDLE hProcess, UINT uExitCode); WINBASEAPI VOID WINAPI GetCurrentThreadStackLimits (PULONG_PTR LowLimit, PULONG_PTR HighLimit); WINBASEAPI WINBOOL WINAPI SetProcessMitigationPolicy (PROCESS_MITIGATION_POLICY MitigationPolicy, PVOID lpBuffer, SIZE_T dwLength); WINBASEAPI WINBOOL WINAPI GetProcessMitigationPolicy (HANDLE hProcess, PROCESS_MITIGATION_POLICY MitigationPolicy, PVOID lpBuffer, SIZE_T dwLength); + + FORCEINLINE HANDLE GetCurrentProcessToken (VOID) + { + return (HANDLE)(LONG_PTR) (-4); + } + FORCEINLINE HANDLE GetCurrentThreadToken (VOID) + { + return (HANDLE)(LONG_PTR) (-5); + } + FORCEINLINE HANDLE GetCurrentThreadEffectiveToken (VOID) + { + return (HANDLE)(LONG_PTR) (-6); + } + + typedef struct _MEMORY_PRIORITY_INFORMATION { + ULONG MemoryPriority; + } MEMORY_PRIORITY_INFORMATION, *PMEMORY_PRIORITY_INFORMATION; #endif +#define MEMORY_PRIORITY_VERY_LOW 1 +#define MEMORY_PRIORITY_LOW 2 +#define MEMORY_PRIORITY_MEDIUM 3 +#define MEMORY_PRIORITY_BELOW_NORMAL 4 +#define MEMORY_PRIORITY_NORMAL 5 + #endif #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP) diff --git a/lib/libc/include/any-windows-any/propidl.h b/lib/libc/include/any-windows-any/propidl.h index a8e551ca68..b5287e9a12 100644 --- a/lib/libc/include/any-windows-any/propidl.h +++ b/lib/libc/include/any-windows-any/propidl.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/propidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/propidl.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,21 +21,33 @@ #ifndef __IPropertyStorage_FWD_DEFINED__ #define __IPropertyStorage_FWD_DEFINED__ typedef interface IPropertyStorage IPropertyStorage; +#ifdef __cplusplus +interface IPropertyStorage; +#endif /* __cplusplus */ #endif #ifndef __IPropertySetStorage_FWD_DEFINED__ #define __IPropertySetStorage_FWD_DEFINED__ typedef interface IPropertySetStorage IPropertySetStorage; +#ifdef __cplusplus +interface IPropertySetStorage; +#endif /* __cplusplus */ #endif #ifndef __IEnumSTATPROPSTG_FWD_DEFINED__ #define __IEnumSTATPROPSTG_FWD_DEFINED__ typedef interface IEnumSTATPROPSTG IEnumSTATPROPSTG; +#ifdef __cplusplus +interface IEnumSTATPROPSTG; +#endif /* __cplusplus */ #endif #ifndef __IEnumSTATPROPSETSTG_FWD_DEFINED__ #define __IEnumSTATPROPSETSTG_FWD_DEFINED__ typedef interface IEnumSTATPROPSETSTG IEnumSTATPROPSETSTG; +#ifdef __cplusplus +interface IEnumSTATPROPSETSTG; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -59,16 +72,25 @@ extern "C" { #ifndef __IPropertyStorage_FWD_DEFINED__ #define __IPropertyStorage_FWD_DEFINED__ typedef interface IPropertyStorage IPropertyStorage; +#ifdef __cplusplus +interface IPropertyStorage; +#endif /* __cplusplus */ #endif #ifndef __IEnumSTATPROPSTG_FWD_DEFINED__ #define __IEnumSTATPROPSTG_FWD_DEFINED__ typedef interface IEnumSTATPROPSTG IEnumSTATPROPSTG; +#ifdef __cplusplus +interface IEnumSTATPROPSTG; +#endif /* __cplusplus */ #endif #ifndef __IEnumSTATPROPSETSTG_FWD_DEFINED__ #define __IEnumSTATPROPSETSTG_FWD_DEFINED__ typedef interface IEnumSTATPROPSETSTG IEnumSTATPROPSETSTG; +#ifdef __cplusplus +interface IEnumSTATPROPSETSTG; +#endif /* __cplusplus */ #endif @@ -282,7 +304,6 @@ struct tag_inner_PROPVARIANT { PROPVARIANT *pvarVal; } __C89_NAMELESSUNIONNAME; }; - DECIMAL decVal; }; }; @@ -390,7 +411,6 @@ enum PIDMSI_STATUS_VALUE { PIDMSI_STATUS_FINAL = 8, PIDMSI_STATUS_OTHER = 0x7fff }; - #endif #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) @@ -403,7 +423,7 @@ enum PIDMSI_STATUS_VALUE { typedef struct tagPROPSPEC { ULONG ulKind; - __C89_NAMELESS union { + union { PROPID propid; LPOLESTR lpwstr; } DUMMYUNIONNAME; @@ -500,79 +520,80 @@ typedef struct IPropertyStorageVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertyStorage* This, + IPropertyStorage *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertyStorage* This); + IPropertyStorage *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertyStorage* This); + IPropertyStorage *This); /*** IPropertyStorage methods ***/ HRESULT (STDMETHODCALLTYPE *ReadMultiple)( - IPropertyStorage* This, + IPropertyStorage *This, ULONG cpspec, const PROPSPEC rgpspec[], PROPVARIANT rgpropvar[]); HRESULT (STDMETHODCALLTYPE *WriteMultiple)( - IPropertyStorage* This, + IPropertyStorage *This, ULONG cpspec, const PROPSPEC rgpspec[], const PROPVARIANT rgpropvar[], PROPID propidNameFirst); HRESULT (STDMETHODCALLTYPE *DeleteMultiple)( - IPropertyStorage* This, + IPropertyStorage *This, ULONG cpspec, const PROPSPEC rgpspec[]); HRESULT (STDMETHODCALLTYPE *ReadPropertyNames)( - IPropertyStorage* This, + IPropertyStorage *This, ULONG cpropid, const PROPID rgpropid[], LPOLESTR rglpwstrName[]); HRESULT (STDMETHODCALLTYPE *WritePropertyNames)( - IPropertyStorage* This, + IPropertyStorage *This, ULONG cpropid, const PROPID rgpropid[], const LPOLESTR rglpwstrName[]); HRESULT (STDMETHODCALLTYPE *DeletePropertyNames)( - IPropertyStorage* This, + IPropertyStorage *This, ULONG cpropid, const PROPID rgpropid[]); HRESULT (STDMETHODCALLTYPE *Commit)( - IPropertyStorage* This, + IPropertyStorage *This, DWORD grfCommitFlags); HRESULT (STDMETHODCALLTYPE *Revert)( - IPropertyStorage* This); + IPropertyStorage *This); HRESULT (STDMETHODCALLTYPE *Enum)( - IPropertyStorage* This, + IPropertyStorage *This, IEnumSTATPROPSTG **ppenum); HRESULT (STDMETHODCALLTYPE *SetTimes)( - IPropertyStorage* This, + IPropertyStorage *This, const FILETIME *pctime, const FILETIME *patime, const FILETIME *pmtime); HRESULT (STDMETHODCALLTYPE *SetClass)( - IPropertyStorage* This, + IPropertyStorage *This, REFCLSID clsid); HRESULT (STDMETHODCALLTYPE *Stat)( - IPropertyStorage* This, + IPropertyStorage *This, STATPROPSETSTG *pstatpsstg); END_INTERFACE } IPropertyStorageVtbl; + interface IPropertyStorage { CONST_VTBL IPropertyStorageVtbl* lpVtbl; }; @@ -649,114 +670,6 @@ static FORCEINLINE HRESULT IPropertyStorage_Stat(IPropertyStorage* This,STATPROP #endif -HRESULT STDMETHODCALLTYPE IPropertyStorage_ReadMultiple_Proxy( - IPropertyStorage* This, - ULONG cpspec, - const PROPSPEC rgpspec[], - PROPVARIANT rgpropvar[]); -void __RPC_STUB IPropertyStorage_ReadMultiple_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyStorage_WriteMultiple_Proxy( - IPropertyStorage* This, - ULONG cpspec, - const PROPSPEC rgpspec[], - const PROPVARIANT rgpropvar[], - PROPID propidNameFirst); -void __RPC_STUB IPropertyStorage_WriteMultiple_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyStorage_DeleteMultiple_Proxy( - IPropertyStorage* This, - ULONG cpspec, - const PROPSPEC rgpspec[]); -void __RPC_STUB IPropertyStorage_DeleteMultiple_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyStorage_ReadPropertyNames_Proxy( - IPropertyStorage* This, - ULONG cpropid, - const PROPID rgpropid[], - LPOLESTR rglpwstrName[]); -void __RPC_STUB IPropertyStorage_ReadPropertyNames_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyStorage_WritePropertyNames_Proxy( - IPropertyStorage* This, - ULONG cpropid, - const PROPID rgpropid[], - const LPOLESTR rglpwstrName[]); -void __RPC_STUB IPropertyStorage_WritePropertyNames_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyStorage_DeletePropertyNames_Proxy( - IPropertyStorage* This, - ULONG cpropid, - const PROPID rgpropid[]); -void __RPC_STUB IPropertyStorage_DeletePropertyNames_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyStorage_Commit_Proxy( - IPropertyStorage* This, - DWORD grfCommitFlags); -void __RPC_STUB IPropertyStorage_Commit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyStorage_Revert_Proxy( - IPropertyStorage* This); -void __RPC_STUB IPropertyStorage_Revert_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyStorage_Enum_Proxy( - IPropertyStorage* This, - IEnumSTATPROPSTG **ppenum); -void __RPC_STUB IPropertyStorage_Enum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyStorage_SetTimes_Proxy( - IPropertyStorage* This, - const FILETIME *pctime, - const FILETIME *patime, - const FILETIME *pmtime); -void __RPC_STUB IPropertyStorage_SetTimes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyStorage_SetClass_Proxy( - IPropertyStorage* This, - REFCLSID clsid); -void __RPC_STUB IPropertyStorage_SetClass_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyStorage_Stat_Proxy( - IPropertyStorage* This, - STATPROPSETSTG *pstatpsstg); -void __RPC_STUB IPropertyStorage_Stat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPropertyStorage_INTERFACE_DEFINED__ */ @@ -802,19 +715,19 @@ typedef struct IPropertySetStorageVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertySetStorage* This, + IPropertySetStorage *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertySetStorage* This); + IPropertySetStorage *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertySetStorage* This); + IPropertySetStorage *This); /*** IPropertySetStorage methods ***/ HRESULT (STDMETHODCALLTYPE *Create)( - IPropertySetStorage* This, + IPropertySetStorage *This, REFFMTID rfmtid, const CLSID *pclsid, DWORD grfFlags, @@ -822,21 +735,22 @@ typedef struct IPropertySetStorageVtbl { IPropertyStorage **ppprstg); HRESULT (STDMETHODCALLTYPE *Open)( - IPropertySetStorage* This, + IPropertySetStorage *This, REFFMTID rfmtid, DWORD grfMode, IPropertyStorage **ppprstg); HRESULT (STDMETHODCALLTYPE *Delete)( - IPropertySetStorage* This, + IPropertySetStorage *This, REFFMTID rfmtid); HRESULT (STDMETHODCALLTYPE *Enum)( - IPropertySetStorage* This, + IPropertySetStorage *This, IEnumSTATPROPSETSTG **ppenum); END_INTERFACE } IPropertySetStorageVtbl; + interface IPropertySetStorage { CONST_VTBL IPropertySetStorageVtbl* lpVtbl; }; @@ -881,44 +795,6 @@ static FORCEINLINE HRESULT IPropertySetStorage_Enum(IPropertySetStorage* This,IE #endif -HRESULT STDMETHODCALLTYPE IPropertySetStorage_Create_Proxy( - IPropertySetStorage* This, - REFFMTID rfmtid, - const CLSID *pclsid, - DWORD grfFlags, - DWORD grfMode, - IPropertyStorage **ppprstg); -void __RPC_STUB IPropertySetStorage_Create_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertySetStorage_Open_Proxy( - IPropertySetStorage* This, - REFFMTID rfmtid, - DWORD grfMode, - IPropertyStorage **ppprstg); -void __RPC_STUB IPropertySetStorage_Open_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertySetStorage_Delete_Proxy( - IPropertySetStorage* This, - REFFMTID rfmtid); -void __RPC_STUB IPropertySetStorage_Delete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertySetStorage_Enum_Proxy( - IPropertySetStorage* This, - IEnumSTATPROPSETSTG **ppenum); -void __RPC_STUB IPropertySetStorage_Enum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPropertySetStorage_INTERFACE_DEFINED__ */ @@ -960,36 +836,37 @@ typedef struct IEnumSTATPROPSTGVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumSTATPROPSTG* This, + IEnumSTATPROPSTG *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumSTATPROPSTG* This); + IEnumSTATPROPSTG *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumSTATPROPSTG* This); + IEnumSTATPROPSTG *This); /*** IEnumSTATPROPSTG methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumSTATPROPSTG* This, + IEnumSTATPROPSTG *This, ULONG celt, STATPROPSTG *rgelt, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumSTATPROPSTG* This, + IEnumSTATPROPSTG *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumSTATPROPSTG* This); + IEnumSTATPROPSTG *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumSTATPROPSTG* This, + IEnumSTATPROPSTG *This, IEnumSTATPROPSTG **ppenum); END_INTERFACE } IEnumSTATPROPSTGVtbl; + interface IEnumSTATPROPSTG { CONST_VTBL IEnumSTATPROPSTGVtbl* lpVtbl; }; @@ -1044,29 +921,6 @@ void __RPC_STUB IEnumSTATPROPSTG_RemoteNext_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumSTATPROPSTG_Skip_Proxy( - IEnumSTATPROPSTG* This, - ULONG celt); -void __RPC_STUB IEnumSTATPROPSTG_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumSTATPROPSTG_Reset_Proxy( - IEnumSTATPROPSTG* This); -void __RPC_STUB IEnumSTATPROPSTG_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumSTATPROPSTG_Clone_Proxy( - IEnumSTATPROPSTG* This, - IEnumSTATPROPSTG **ppenum); -void __RPC_STUB IEnumSTATPROPSTG_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IEnumSTATPROPSTG_Next_Proxy( IEnumSTATPROPSTG* This, ULONG celt, @@ -1118,36 +972,37 @@ typedef struct IEnumSTATPROPSETSTGVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumSTATPROPSETSTG* This, + IEnumSTATPROPSETSTG *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumSTATPROPSETSTG* This); + IEnumSTATPROPSETSTG *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumSTATPROPSETSTG* This); + IEnumSTATPROPSETSTG *This); /*** IEnumSTATPROPSETSTG methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumSTATPROPSETSTG* This, + IEnumSTATPROPSETSTG *This, ULONG celt, STATPROPSETSTG *rgelt, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumSTATPROPSETSTG* This, + IEnumSTATPROPSETSTG *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumSTATPROPSETSTG* This); + IEnumSTATPROPSETSTG *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumSTATPROPSETSTG* This, + IEnumSTATPROPSETSTG *This, IEnumSTATPROPSETSTG **ppenum); END_INTERFACE } IEnumSTATPROPSETSTGVtbl; + interface IEnumSTATPROPSETSTG { CONST_VTBL IEnumSTATPROPSETSTGVtbl* lpVtbl; }; @@ -1202,29 +1057,6 @@ void __RPC_STUB IEnumSTATPROPSETSTG_RemoteNext_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumSTATPROPSETSTG_Skip_Proxy( - IEnumSTATPROPSETSTG* This, - ULONG celt); -void __RPC_STUB IEnumSTATPROPSETSTG_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumSTATPROPSETSTG_Reset_Proxy( - IEnumSTATPROPSETSTG* This); -void __RPC_STUB IEnumSTATPROPSETSTG_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumSTATPROPSETSTG_Clone_Proxy( - IEnumSTATPROPSETSTG* This, - IEnumSTATPROPSETSTG **ppenum); -void __RPC_STUB IEnumSTATPROPSETSTG_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IEnumSTATPROPSETSTG_Next_Proxy( IEnumSTATPROPSETSTG* This, ULONG celt, diff --git a/lib/libc/include/any-windows-any/propsys.h b/lib/libc/include/any-windows-any/propsys.h index 088e9981f2..c5aadddf79 100644 --- a/lib/libc/include/any-windows-any/propsys.h +++ b/lib/libc/include/any-windows-any/propsys.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/propsys.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/propsys.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,126 +21,201 @@ #ifndef __IInitializeWithFile_FWD_DEFINED__ #define __IInitializeWithFile_FWD_DEFINED__ typedef interface IInitializeWithFile IInitializeWithFile; +#ifdef __cplusplus +interface IInitializeWithFile; +#endif /* __cplusplus */ #endif #ifndef __IInitializeWithStream_FWD_DEFINED__ #define __IInitializeWithStream_FWD_DEFINED__ typedef interface IInitializeWithStream IInitializeWithStream; +#ifdef __cplusplus +interface IInitializeWithStream; +#endif /* __cplusplus */ #endif #ifndef __IPropertyStore_FWD_DEFINED__ #define __IPropertyStore_FWD_DEFINED__ typedef interface IPropertyStore IPropertyStore; +#ifdef __cplusplus +interface IPropertyStore; +#endif /* __cplusplus */ #endif #ifndef __INamedPropertyStore_FWD_DEFINED__ #define __INamedPropertyStore_FWD_DEFINED__ typedef interface INamedPropertyStore INamedPropertyStore; +#ifdef __cplusplus +interface INamedPropertyStore; +#endif /* __cplusplus */ #endif #ifndef __IObjectWithPropertyKey_FWD_DEFINED__ #define __IObjectWithPropertyKey_FWD_DEFINED__ typedef interface IObjectWithPropertyKey IObjectWithPropertyKey; +#ifdef __cplusplus +interface IObjectWithPropertyKey; +#endif /* __cplusplus */ #endif #ifndef __IPropertyChange_FWD_DEFINED__ #define __IPropertyChange_FWD_DEFINED__ typedef interface IPropertyChange IPropertyChange; +#ifdef __cplusplus +interface IPropertyChange; +#endif /* __cplusplus */ #endif #ifndef __IPropertyChangeArray_FWD_DEFINED__ #define __IPropertyChangeArray_FWD_DEFINED__ typedef interface IPropertyChangeArray IPropertyChangeArray; +#ifdef __cplusplus +interface IPropertyChangeArray; +#endif /* __cplusplus */ #endif #ifndef __IPropertyStoreCapabilities_FWD_DEFINED__ #define __IPropertyStoreCapabilities_FWD_DEFINED__ typedef interface IPropertyStoreCapabilities IPropertyStoreCapabilities; +#ifdef __cplusplus +interface IPropertyStoreCapabilities; +#endif /* __cplusplus */ #endif #ifndef __IPropertyStoreCache_FWD_DEFINED__ #define __IPropertyStoreCache_FWD_DEFINED__ typedef interface IPropertyStoreCache IPropertyStoreCache; +#ifdef __cplusplus +interface IPropertyStoreCache; +#endif /* __cplusplus */ #endif #ifndef __IPropertyEnumType_FWD_DEFINED__ #define __IPropertyEnumType_FWD_DEFINED__ typedef interface IPropertyEnumType IPropertyEnumType; +#ifdef __cplusplus +interface IPropertyEnumType; +#endif /* __cplusplus */ #endif #ifndef __IPropertyEnumType2_FWD_DEFINED__ #define __IPropertyEnumType2_FWD_DEFINED__ typedef interface IPropertyEnumType2 IPropertyEnumType2; +#ifdef __cplusplus +interface IPropertyEnumType2; +#endif /* __cplusplus */ #endif #ifndef __IPropertyEnumTypeList_FWD_DEFINED__ #define __IPropertyEnumTypeList_FWD_DEFINED__ typedef interface IPropertyEnumTypeList IPropertyEnumTypeList; +#ifdef __cplusplus +interface IPropertyEnumTypeList; +#endif /* __cplusplus */ #endif #ifndef __IPropertyDescription_FWD_DEFINED__ #define __IPropertyDescription_FWD_DEFINED__ typedef interface IPropertyDescription IPropertyDescription; +#ifdef __cplusplus +interface IPropertyDescription; +#endif /* __cplusplus */ #endif #ifndef __IPropertyDescription2_FWD_DEFINED__ #define __IPropertyDescription2_FWD_DEFINED__ typedef interface IPropertyDescription2 IPropertyDescription2; +#ifdef __cplusplus +interface IPropertyDescription2; +#endif /* __cplusplus */ #endif #ifndef __IPropertyDescriptionAliasInfo_FWD_DEFINED__ #define __IPropertyDescriptionAliasInfo_FWD_DEFINED__ typedef interface IPropertyDescriptionAliasInfo IPropertyDescriptionAliasInfo; +#ifdef __cplusplus +interface IPropertyDescriptionAliasInfo; +#endif /* __cplusplus */ #endif #ifndef __IPropertyDescriptionSearchInfo_FWD_DEFINED__ #define __IPropertyDescriptionSearchInfo_FWD_DEFINED__ typedef interface IPropertyDescriptionSearchInfo IPropertyDescriptionSearchInfo; +#ifdef __cplusplus +interface IPropertyDescriptionSearchInfo; +#endif /* __cplusplus */ #endif #ifndef __IPropertyDescriptionRelatedPropertyInfo_FWD_DEFINED__ #define __IPropertyDescriptionRelatedPropertyInfo_FWD_DEFINED__ typedef interface IPropertyDescriptionRelatedPropertyInfo IPropertyDescriptionRelatedPropertyInfo; +#ifdef __cplusplus +interface IPropertyDescriptionRelatedPropertyInfo; +#endif /* __cplusplus */ #endif #ifndef __IPropertySystem_FWD_DEFINED__ #define __IPropertySystem_FWD_DEFINED__ typedef interface IPropertySystem IPropertySystem; +#ifdef __cplusplus +interface IPropertySystem; +#endif /* __cplusplus */ #endif #ifndef __IPropertyDescriptionList_FWD_DEFINED__ #define __IPropertyDescriptionList_FWD_DEFINED__ typedef interface IPropertyDescriptionList IPropertyDescriptionList; +#ifdef __cplusplus +interface IPropertyDescriptionList; +#endif /* __cplusplus */ #endif #ifndef __IPropertyStoreFactory_FWD_DEFINED__ #define __IPropertyStoreFactory_FWD_DEFINED__ typedef interface IPropertyStoreFactory IPropertyStoreFactory; +#ifdef __cplusplus +interface IPropertyStoreFactory; +#endif /* __cplusplus */ #endif #ifndef __IDelayedPropertyStoreFactory_FWD_DEFINED__ #define __IDelayedPropertyStoreFactory_FWD_DEFINED__ typedef interface IDelayedPropertyStoreFactory IDelayedPropertyStoreFactory; +#ifdef __cplusplus +interface IDelayedPropertyStoreFactory; +#endif /* __cplusplus */ #endif #ifndef __IPersistSerializedPropStorage_FWD_DEFINED__ #define __IPersistSerializedPropStorage_FWD_DEFINED__ typedef interface IPersistSerializedPropStorage IPersistSerializedPropStorage; +#ifdef __cplusplus +interface IPersistSerializedPropStorage; +#endif /* __cplusplus */ #endif #ifndef __IPersistSerializedPropStorage2_FWD_DEFINED__ #define __IPersistSerializedPropStorage2_FWD_DEFINED__ typedef interface IPersistSerializedPropStorage2 IPersistSerializedPropStorage2; +#ifdef __cplusplus +interface IPersistSerializedPropStorage2; +#endif /* __cplusplus */ #endif #ifndef __IPropertySystemChangeNotify_FWD_DEFINED__ #define __IPropertySystemChangeNotify_FWD_DEFINED__ typedef interface IPropertySystemChangeNotify IPropertySystemChangeNotify; +#ifdef __cplusplus +interface IPropertySystemChangeNotify; +#endif /* __cplusplus */ #endif #ifndef __ICreateObject_FWD_DEFINED__ #define __ICreateObject_FWD_DEFINED__ typedef interface ICreateObject ICreateObject; +#ifdef __cplusplus +interface ICreateObject; +#endif /* __cplusplus */ #endif #ifndef __InMemoryPropertyStore_FWD_DEFINED__ @@ -221,24 +297,25 @@ typedef struct IInitializeWithFileVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInitializeWithFile* This, + IInitializeWithFile *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInitializeWithFile* This); + IInitializeWithFile *This); ULONG (STDMETHODCALLTYPE *Release)( - IInitializeWithFile* This); + IInitializeWithFile *This); /*** IInitializeWithFile methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IInitializeWithFile* This, + IInitializeWithFile *This, LPCWSTR pszFilePath, DWORD grfMode); END_INTERFACE } IInitializeWithFileVtbl; + interface IInitializeWithFile { CONST_VTBL IInitializeWithFileVtbl* lpVtbl; }; @@ -271,15 +348,6 @@ static FORCEINLINE HRESULT IInitializeWithFile_Initialize(IInitializeWithFile* T #endif -HRESULT STDMETHODCALLTYPE IInitializeWithFile_Initialize_Proxy( - IInitializeWithFile* This, - LPCWSTR pszFilePath, - DWORD grfMode); -void __RPC_STUB IInitializeWithFile_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInitializeWithFile_INTERFACE_DEFINED__ */ @@ -309,24 +377,25 @@ typedef struct IInitializeWithStreamVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInitializeWithStream* This, + IInitializeWithStream *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInitializeWithStream* This); + IInitializeWithStream *This); ULONG (STDMETHODCALLTYPE *Release)( - IInitializeWithStream* This); + IInitializeWithStream *This); /*** IInitializeWithStream methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IInitializeWithStream* This, + IInitializeWithStream *This, IStream *pstream, DWORD grfMode); END_INTERFACE } IInitializeWithStreamVtbl; + interface IInitializeWithStream { CONST_VTBL IInitializeWithStreamVtbl* lpVtbl; }; @@ -421,41 +490,42 @@ typedef struct IPropertyStoreVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertyStore* This, + IPropertyStore *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertyStore* This); + IPropertyStore *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertyStore* This); + IPropertyStore *This); /*** IPropertyStore methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IPropertyStore* This, + IPropertyStore *This, DWORD *cProps); HRESULT (STDMETHODCALLTYPE *GetAt)( - IPropertyStore* This, + IPropertyStore *This, DWORD iProp, PROPERTYKEY *pkey); HRESULT (STDMETHODCALLTYPE *GetValue)( - IPropertyStore* This, + IPropertyStore *This, REFPROPERTYKEY key, PROPVARIANT *pv); HRESULT (STDMETHODCALLTYPE *SetValue)( - IPropertyStore* This, + IPropertyStore *This, REFPROPERTYKEY key, REFPROPVARIANT propvar); HRESULT (STDMETHODCALLTYPE *Commit)( - IPropertyStore* This); + IPropertyStore *This); END_INTERFACE } IPropertyStoreVtbl; + interface IPropertyStore { CONST_VTBL IPropertyStoreVtbl* lpVtbl; }; @@ -504,48 +574,6 @@ static FORCEINLINE HRESULT IPropertyStore_Commit(IPropertyStore* This) { #endif -HRESULT STDMETHODCALLTYPE IPropertyStore_GetCount_Proxy( - IPropertyStore* This, - DWORD *cProps); -void __RPC_STUB IPropertyStore_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyStore_GetAt_Proxy( - IPropertyStore* This, - DWORD iProp, - PROPERTYKEY *pkey); -void __RPC_STUB IPropertyStore_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyStore_GetValue_Proxy( - IPropertyStore* This, - REFPROPERTYKEY key, - PROPVARIANT *pv); -void __RPC_STUB IPropertyStore_GetValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyStore_SetValue_Proxy( - IPropertyStore* This, - REFPROPERTYKEY key, - REFPROPVARIANT propvar); -void __RPC_STUB IPropertyStore_SetValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyStore_Commit_Proxy( - IPropertyStore* This); -void __RPC_STUB IPropertyStore_Commit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPropertyStore_INTERFACE_DEFINED__ */ @@ -590,38 +618,39 @@ typedef struct INamedPropertyStoreVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INamedPropertyStore* This, + INamedPropertyStore *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INamedPropertyStore* This); + INamedPropertyStore *This); ULONG (STDMETHODCALLTYPE *Release)( - INamedPropertyStore* This); + INamedPropertyStore *This); /*** INamedPropertyStore methods ***/ HRESULT (STDMETHODCALLTYPE *GetNamedValue)( - INamedPropertyStore* This, + INamedPropertyStore *This, LPCWSTR pszName, PROPVARIANT *ppropvar); HRESULT (STDMETHODCALLTYPE *SetNamedValue)( - INamedPropertyStore* This, + INamedPropertyStore *This, LPCWSTR pszName, REFPROPVARIANT propvar); HRESULT (STDMETHODCALLTYPE *GetNameCount)( - INamedPropertyStore* This, + INamedPropertyStore *This, DWORD *pdwCount); HRESULT (STDMETHODCALLTYPE *GetNameAt)( - INamedPropertyStore* This, + INamedPropertyStore *This, DWORD iProp, BSTR *pbstrName); END_INTERFACE } INamedPropertyStoreVtbl; + interface INamedPropertyStore { CONST_VTBL INamedPropertyStoreVtbl* lpVtbl; }; @@ -666,41 +695,6 @@ static FORCEINLINE HRESULT INamedPropertyStore_GetNameAt(INamedPropertyStore* Th #endif -HRESULT STDMETHODCALLTYPE INamedPropertyStore_GetNamedValue_Proxy( - INamedPropertyStore* This, - LPCWSTR pszName, - PROPVARIANT *ppropvar); -void __RPC_STUB INamedPropertyStore_GetNamedValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INamedPropertyStore_SetNamedValue_Proxy( - INamedPropertyStore* This, - LPCWSTR pszName, - REFPROPVARIANT propvar); -void __RPC_STUB INamedPropertyStore_SetNamedValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INamedPropertyStore_GetNameCount_Proxy( - INamedPropertyStore* This, - DWORD *pdwCount); -void __RPC_STUB INamedPropertyStore_GetNameCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INamedPropertyStore_GetNameAt_Proxy( - INamedPropertyStore* This, - DWORD iProp, - BSTR *pbstrName); -void __RPC_STUB INamedPropertyStore_GetNameAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INamedPropertyStore_INTERFACE_DEFINED__ */ @@ -748,27 +742,28 @@ typedef struct IObjectWithPropertyKeyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IObjectWithPropertyKey* This, + IObjectWithPropertyKey *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IObjectWithPropertyKey* This); + IObjectWithPropertyKey *This); ULONG (STDMETHODCALLTYPE *Release)( - IObjectWithPropertyKey* This); + IObjectWithPropertyKey *This); /*** IObjectWithPropertyKey methods ***/ HRESULT (STDMETHODCALLTYPE *SetPropertyKey)( - IObjectWithPropertyKey* This, + IObjectWithPropertyKey *This, REFPROPERTYKEY key); HRESULT (STDMETHODCALLTYPE *GetPropertyKey)( - IObjectWithPropertyKey* This, + IObjectWithPropertyKey *This, PROPERTYKEY *pkey); END_INTERFACE } IObjectWithPropertyKeyVtbl; + interface IObjectWithPropertyKey { CONST_VTBL IObjectWithPropertyKeyVtbl* lpVtbl; }; @@ -805,22 +800,6 @@ static FORCEINLINE HRESULT IObjectWithPropertyKey_GetPropertyKey(IObjectWithProp #endif -HRESULT STDMETHODCALLTYPE IObjectWithPropertyKey_SetPropertyKey_Proxy( - IObjectWithPropertyKey* This, - REFPROPERTYKEY key); -void __RPC_STUB IObjectWithPropertyKey_SetPropertyKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IObjectWithPropertyKey_GetPropertyKey_Proxy( - IObjectWithPropertyKey* This, - PROPERTYKEY *pkey); -void __RPC_STUB IObjectWithPropertyKey_GetPropertyKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IObjectWithPropertyKey_INTERFACE_DEFINED__ */ @@ -856,33 +835,34 @@ typedef struct IPropertyChangeVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertyChange* This, + IPropertyChange *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertyChange* This); + IPropertyChange *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertyChange* This); + IPropertyChange *This); /*** IObjectWithPropertyKey methods ***/ HRESULT (STDMETHODCALLTYPE *SetPropertyKey)( - IPropertyChange* This, + IPropertyChange *This, REFPROPERTYKEY key); HRESULT (STDMETHODCALLTYPE *GetPropertyKey)( - IPropertyChange* This, + IPropertyChange *This, PROPERTYKEY *pkey); /*** IPropertyChange methods ***/ HRESULT (STDMETHODCALLTYPE *ApplyToPropVariant)( - IPropertyChange* This, + IPropertyChange *This, REFPROPVARIANT propvarIn, PROPVARIANT *ppropvarOut); END_INTERFACE } IPropertyChangeVtbl; + interface IPropertyChange { CONST_VTBL IPropertyChangeVtbl* lpVtbl; }; @@ -925,15 +905,6 @@ static FORCEINLINE HRESULT IPropertyChange_ApplyToPropVariant(IPropertyChange* T #endif -HRESULT STDMETHODCALLTYPE IPropertyChange_ApplyToPropVariant_Proxy( - IPropertyChange* This, - REFPROPVARIANT propvarIn, - PROPVARIANT *ppropvarOut); -void __RPC_STUB IPropertyChange_ApplyToPropVariant_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPropertyChange_INTERFACE_DEFINED__ */ @@ -983,50 +954,51 @@ typedef struct IPropertyChangeArrayVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertyChangeArray* This, + IPropertyChangeArray *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertyChangeArray* This); + IPropertyChangeArray *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertyChangeArray* This); + IPropertyChangeArray *This); /*** IPropertyChangeArray methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IPropertyChangeArray* This, + IPropertyChangeArray *This, UINT *pcOperations); HRESULT (STDMETHODCALLTYPE *GetAt)( - IPropertyChangeArray* This, + IPropertyChangeArray *This, UINT iIndex, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *InsertAt)( - IPropertyChangeArray* This, + IPropertyChangeArray *This, UINT iIndex, IPropertyChange *ppropChange); HRESULT (STDMETHODCALLTYPE *Append)( - IPropertyChangeArray* This, + IPropertyChangeArray *This, IPropertyChange *ppropChange); HRESULT (STDMETHODCALLTYPE *AppendOrReplace)( - IPropertyChangeArray* This, + IPropertyChangeArray *This, IPropertyChange *ppropChange); HRESULT (STDMETHODCALLTYPE *RemoveAt)( - IPropertyChangeArray* This, + IPropertyChangeArray *This, UINT iIndex); HRESULT (STDMETHODCALLTYPE *IsKeyInArray)( - IPropertyChangeArray* This, + IPropertyChangeArray *This, REFPROPERTYKEY key); END_INTERFACE } IPropertyChangeArrayVtbl; + interface IPropertyChangeArray { CONST_VTBL IPropertyChangeArrayVtbl* lpVtbl; }; @@ -1083,65 +1055,6 @@ static FORCEINLINE HRESULT IPropertyChangeArray_IsKeyInArray(IPropertyChangeArra #endif -HRESULT STDMETHODCALLTYPE IPropertyChangeArray_GetCount_Proxy( - IPropertyChangeArray* This, - UINT *pcOperations); -void __RPC_STUB IPropertyChangeArray_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyChangeArray_GetAt_Proxy( - IPropertyChangeArray* This, - UINT iIndex, - REFIID riid, - void **ppv); -void __RPC_STUB IPropertyChangeArray_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyChangeArray_InsertAt_Proxy( - IPropertyChangeArray* This, - UINT iIndex, - IPropertyChange *ppropChange); -void __RPC_STUB IPropertyChangeArray_InsertAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyChangeArray_Append_Proxy( - IPropertyChangeArray* This, - IPropertyChange *ppropChange); -void __RPC_STUB IPropertyChangeArray_Append_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyChangeArray_AppendOrReplace_Proxy( - IPropertyChangeArray* This, - IPropertyChange *ppropChange); -void __RPC_STUB IPropertyChangeArray_AppendOrReplace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyChangeArray_RemoveAt_Proxy( - IPropertyChangeArray* This, - UINT iIndex); -void __RPC_STUB IPropertyChangeArray_RemoveAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyChangeArray_IsKeyInArray_Proxy( - IPropertyChangeArray* This, - REFPROPERTYKEY key); -void __RPC_STUB IPropertyChangeArray_IsKeyInArray_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPropertyChangeArray_INTERFACE_DEFINED__ */ @@ -1170,23 +1083,24 @@ typedef struct IPropertyStoreCapabilitiesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertyStoreCapabilities* This, + IPropertyStoreCapabilities *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertyStoreCapabilities* This); + IPropertyStoreCapabilities *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertyStoreCapabilities* This); + IPropertyStoreCapabilities *This); /*** IPropertyStoreCapabilities methods ***/ HRESULT (STDMETHODCALLTYPE *IsPropertyWritable)( - IPropertyStoreCapabilities* This, + IPropertyStoreCapabilities *This, REFPROPERTYKEY key); END_INTERFACE } IPropertyStoreCapabilitiesVtbl; + interface IPropertyStoreCapabilities { CONST_VTBL IPropertyStoreCapabilitiesVtbl* lpVtbl; }; @@ -1219,14 +1133,6 @@ static FORCEINLINE HRESULT IPropertyStoreCapabilities_IsPropertyWritable(IProper #endif -HRESULT STDMETHODCALLTYPE IPropertyStoreCapabilities_IsPropertyWritable_Proxy( - IPropertyStoreCapabilities* This, - REFPROPERTYKEY key); -void __RPC_STUB IPropertyStoreCapabilities_IsPropertyWritable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPropertyStoreCapabilities_INTERFACE_DEFINED__ */ @@ -1277,64 +1183,65 @@ typedef struct IPropertyStoreCacheVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertyStoreCache* This, + IPropertyStoreCache *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertyStoreCache* This); + IPropertyStoreCache *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertyStoreCache* This); + IPropertyStoreCache *This); /*** IPropertyStore methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IPropertyStoreCache* This, + IPropertyStoreCache *This, DWORD *cProps); HRESULT (STDMETHODCALLTYPE *GetAt)( - IPropertyStoreCache* This, + IPropertyStoreCache *This, DWORD iProp, PROPERTYKEY *pkey); HRESULT (STDMETHODCALLTYPE *GetValue)( - IPropertyStoreCache* This, + IPropertyStoreCache *This, REFPROPERTYKEY key, PROPVARIANT *pv); HRESULT (STDMETHODCALLTYPE *SetValue)( - IPropertyStoreCache* This, + IPropertyStoreCache *This, REFPROPERTYKEY key, REFPROPVARIANT propvar); HRESULT (STDMETHODCALLTYPE *Commit)( - IPropertyStoreCache* This); + IPropertyStoreCache *This); /*** IPropertyStoreCache methods ***/ HRESULT (STDMETHODCALLTYPE *GetState)( - IPropertyStoreCache* This, + IPropertyStoreCache *This, REFPROPERTYKEY key, PSC_STATE *pstate); HRESULT (STDMETHODCALLTYPE *GetValueAndState)( - IPropertyStoreCache* This, + IPropertyStoreCache *This, REFPROPERTYKEY key, PROPVARIANT *ppropvar, PSC_STATE *pstate); HRESULT (STDMETHODCALLTYPE *SetState)( - IPropertyStoreCache* This, + IPropertyStoreCache *This, REFPROPERTYKEY key, PSC_STATE state); HRESULT (STDMETHODCALLTYPE *SetValueAndState)( - IPropertyStoreCache* This, + IPropertyStoreCache *This, REFPROPERTYKEY key, const PROPVARIANT *ppropvar, PSC_STATE state); END_INTERFACE } IPropertyStoreCacheVtbl; + interface IPropertyStoreCache { CONST_VTBL IPropertyStoreCacheVtbl* lpVtbl; }; @@ -1401,44 +1308,6 @@ static FORCEINLINE HRESULT IPropertyStoreCache_SetValueAndState(IPropertyStoreCa #endif -HRESULT STDMETHODCALLTYPE IPropertyStoreCache_GetState_Proxy( - IPropertyStoreCache* This, - REFPROPERTYKEY key, - PSC_STATE *pstate); -void __RPC_STUB IPropertyStoreCache_GetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyStoreCache_GetValueAndState_Proxy( - IPropertyStoreCache* This, - REFPROPERTYKEY key, - PROPVARIANT *ppropvar, - PSC_STATE *pstate); -void __RPC_STUB IPropertyStoreCache_GetValueAndState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyStoreCache_SetState_Proxy( - IPropertyStoreCache* This, - REFPROPERTYKEY key, - PSC_STATE state); -void __RPC_STUB IPropertyStoreCache_SetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyStoreCache_SetValueAndState_Proxy( - IPropertyStoreCache* This, - REFPROPERTYKEY key, - const PROPVARIANT *ppropvar, - PSC_STATE state); -void __RPC_STUB IPropertyStoreCache_SetValueAndState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPropertyStoreCache_INTERFACE_DEFINED__ */ @@ -1486,39 +1355,40 @@ typedef struct IPropertyEnumTypeVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertyEnumType* This, + IPropertyEnumType *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertyEnumType* This); + IPropertyEnumType *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertyEnumType* This); + IPropertyEnumType *This); /*** IPropertyEnumType methods ***/ HRESULT (STDMETHODCALLTYPE *GetEnumType)( - IPropertyEnumType* This, + IPropertyEnumType *This, PROPENUMTYPE *penumtype); HRESULT (STDMETHODCALLTYPE *GetValue)( - IPropertyEnumType* This, + IPropertyEnumType *This, PROPVARIANT *ppropvar); HRESULT (STDMETHODCALLTYPE *GetRangeMinValue)( - IPropertyEnumType* This, + IPropertyEnumType *This, PROPVARIANT *ppropvarMin); HRESULT (STDMETHODCALLTYPE *GetRangeSetValue)( - IPropertyEnumType* This, + IPropertyEnumType *This, PROPVARIANT *ppropvarSet); HRESULT (STDMETHODCALLTYPE *GetDisplayText)( - IPropertyEnumType* This, + IPropertyEnumType *This, LPWSTR *ppszDisplay); END_INTERFACE } IPropertyEnumTypeVtbl; + interface IPropertyEnumType { CONST_VTBL IPropertyEnumTypeVtbl* lpVtbl; }; @@ -1567,46 +1437,6 @@ static FORCEINLINE HRESULT IPropertyEnumType_GetDisplayText(IPropertyEnumType* T #endif -HRESULT STDMETHODCALLTYPE IPropertyEnumType_GetEnumType_Proxy( - IPropertyEnumType* This, - PROPENUMTYPE *penumtype); -void __RPC_STUB IPropertyEnumType_GetEnumType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyEnumType_GetValue_Proxy( - IPropertyEnumType* This, - PROPVARIANT *ppropvar); -void __RPC_STUB IPropertyEnumType_GetValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyEnumType_GetRangeMinValue_Proxy( - IPropertyEnumType* This, - PROPVARIANT *ppropvarMin); -void __RPC_STUB IPropertyEnumType_GetRangeMinValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyEnumType_GetRangeSetValue_Proxy( - IPropertyEnumType* This, - PROPVARIANT *ppropvarSet); -void __RPC_STUB IPropertyEnumType_GetRangeSetValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyEnumType_GetDisplayText_Proxy( - IPropertyEnumType* This, - LPWSTR *ppszDisplay); -void __RPC_STUB IPropertyEnumType_GetDisplayText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPropertyEnumType_INTERFACE_DEFINED__ */ @@ -1635,44 +1465,45 @@ typedef struct IPropertyEnumType2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertyEnumType2* This, + IPropertyEnumType2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertyEnumType2* This); + IPropertyEnumType2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertyEnumType2* This); + IPropertyEnumType2 *This); /*** IPropertyEnumType methods ***/ HRESULT (STDMETHODCALLTYPE *GetEnumType)( - IPropertyEnumType2* This, + IPropertyEnumType2 *This, PROPENUMTYPE *penumtype); HRESULT (STDMETHODCALLTYPE *GetValue)( - IPropertyEnumType2* This, + IPropertyEnumType2 *This, PROPVARIANT *ppropvar); HRESULT (STDMETHODCALLTYPE *GetRangeMinValue)( - IPropertyEnumType2* This, + IPropertyEnumType2 *This, PROPVARIANT *ppropvarMin); HRESULT (STDMETHODCALLTYPE *GetRangeSetValue)( - IPropertyEnumType2* This, + IPropertyEnumType2 *This, PROPVARIANT *ppropvarSet); HRESULT (STDMETHODCALLTYPE *GetDisplayText)( - IPropertyEnumType2* This, + IPropertyEnumType2 *This, LPWSTR *ppszDisplay); /*** IPropertyEnumType2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetImageReference)( - IPropertyEnumType2* This, + IPropertyEnumType2 *This, LPWSTR *ppszImageRes); END_INTERFACE } IPropertyEnumType2Vtbl; + interface IPropertyEnumType2 { CONST_VTBL IPropertyEnumType2Vtbl* lpVtbl; }; @@ -1727,14 +1558,6 @@ static FORCEINLINE HRESULT IPropertyEnumType2_GetImageReference(IPropertyEnumTyp #endif -HRESULT STDMETHODCALLTYPE IPropertyEnumType2_GetImageReference_Proxy( - IPropertyEnumType2* This, - LPWSTR *ppszImageRes); -void __RPC_STUB IPropertyEnumType2_GetImageReference_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPropertyEnumType2_INTERFACE_DEFINED__ */ @@ -1777,40 +1600,41 @@ typedef struct IPropertyEnumTypeListVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertyEnumTypeList* This, + IPropertyEnumTypeList *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertyEnumTypeList* This); + IPropertyEnumTypeList *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertyEnumTypeList* This); + IPropertyEnumTypeList *This); /*** IPropertyEnumTypeList methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IPropertyEnumTypeList* This, + IPropertyEnumTypeList *This, UINT *pctypes); HRESULT (STDMETHODCALLTYPE *GetAt)( - IPropertyEnumTypeList* This, + IPropertyEnumTypeList *This, UINT itype, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetConditionAt)( - IPropertyEnumTypeList* This, + IPropertyEnumTypeList *This, UINT nIndex, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *FindMatchingIndex)( - IPropertyEnumTypeList* This, + IPropertyEnumTypeList *This, REFPROPVARIANT propvarCmp, UINT *pnIndex); END_INTERFACE } IPropertyEnumTypeListVtbl; + interface IPropertyEnumTypeList { CONST_VTBL IPropertyEnumTypeListVtbl* lpVtbl; }; @@ -1855,43 +1679,6 @@ static FORCEINLINE HRESULT IPropertyEnumTypeList_FindMatchingIndex(IPropertyEnum #endif -HRESULT STDMETHODCALLTYPE IPropertyEnumTypeList_GetCount_Proxy( - IPropertyEnumTypeList* This, - UINT *pctypes); -void __RPC_STUB IPropertyEnumTypeList_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyEnumTypeList_GetAt_Proxy( - IPropertyEnumTypeList* This, - UINT itype, - REFIID riid, - void **ppv); -void __RPC_STUB IPropertyEnumTypeList_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyEnumTypeList_GetConditionAt_Proxy( - IPropertyEnumTypeList* This, - UINT nIndex, - REFIID riid, - void **ppv); -void __RPC_STUB IPropertyEnumTypeList_GetConditionAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyEnumTypeList_FindMatchingIndex_Proxy( - IPropertyEnumTypeList* This, - REFPROPVARIANT propvarCmp, - UINT *pnIndex); -void __RPC_STUB IPropertyEnumTypeList_FindMatchingIndex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPropertyEnumTypeList_INTERFACE_DEFINED__ */ @@ -2107,112 +1894,113 @@ typedef struct IPropertyDescriptionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertyDescription* This, + IPropertyDescription *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertyDescription* This); + IPropertyDescription *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertyDescription* This); + IPropertyDescription *This); /*** IPropertyDescription methods ***/ HRESULT (STDMETHODCALLTYPE *GetPropertyKey)( - IPropertyDescription* This, + IPropertyDescription *This, PROPERTYKEY *pkey); HRESULT (STDMETHODCALLTYPE *GetCanonicalName)( - IPropertyDescription* This, + IPropertyDescription *This, LPWSTR *ppszName); HRESULT (STDMETHODCALLTYPE *GetPropertyType)( - IPropertyDescription* This, + IPropertyDescription *This, VARTYPE *pvartype); HRESULT (STDMETHODCALLTYPE *GetDisplayName)( - IPropertyDescription* This, + IPropertyDescription *This, LPWSTR *ppszName); HRESULT (STDMETHODCALLTYPE *GetEditInvitation)( - IPropertyDescription* This, + IPropertyDescription *This, LPWSTR *ppszInvite); HRESULT (STDMETHODCALLTYPE *GetTypeFlags)( - IPropertyDescription* This, + IPropertyDescription *This, PROPDESC_TYPE_FLAGS mask, PROPDESC_TYPE_FLAGS *ppdtFlags); HRESULT (STDMETHODCALLTYPE *GetViewFlags)( - IPropertyDescription* This, + IPropertyDescription *This, PROPDESC_VIEW_FLAGS *ppdvFlags); HRESULT (STDMETHODCALLTYPE *GetDefaultColumnWidth)( - IPropertyDescription* This, + IPropertyDescription *This, UINT *pcxChars); HRESULT (STDMETHODCALLTYPE *GetDisplayType)( - IPropertyDescription* This, + IPropertyDescription *This, PROPDESC_DISPLAYTYPE *pdisplaytype); HRESULT (STDMETHODCALLTYPE *GetColumnState)( - IPropertyDescription* This, + IPropertyDescription *This, SHCOLSTATEF *pcsFlags); HRESULT (STDMETHODCALLTYPE *GetGroupingRange)( - IPropertyDescription* This, + IPropertyDescription *This, PROPDESC_GROUPING_RANGE *pgr); HRESULT (STDMETHODCALLTYPE *GetRelativeDescriptionType)( - IPropertyDescription* This, + IPropertyDescription *This, PROPDESC_RELATIVEDESCRIPTION_TYPE *prdt); HRESULT (STDMETHODCALLTYPE *GetRelativeDescription)( - IPropertyDescription* This, + IPropertyDescription *This, REFPROPVARIANT propvar1, REFPROPVARIANT propvar2, LPWSTR *ppszDesc1, LPWSTR *ppszDesc2); HRESULT (STDMETHODCALLTYPE *GetSortDescription)( - IPropertyDescription* This, + IPropertyDescription *This, PROPDESC_SORTDESCRIPTION *psd); HRESULT (STDMETHODCALLTYPE *GetSortDescriptionLabel)( - IPropertyDescription* This, + IPropertyDescription *This, WINBOOL fDescending, LPWSTR *ppszDescription); HRESULT (STDMETHODCALLTYPE *GetAggregationType)( - IPropertyDescription* This, + IPropertyDescription *This, PROPDESC_AGGREGATION_TYPE *paggtype); HRESULT (STDMETHODCALLTYPE *GetConditionType)( - IPropertyDescription* This, + IPropertyDescription *This, PROPDESC_CONDITION_TYPE *pcontype, CONDITION_OPERATION *popDefault); HRESULT (STDMETHODCALLTYPE *GetEnumTypeList)( - IPropertyDescription* This, + IPropertyDescription *This, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *CoerceToCanonicalValue)( - IPropertyDescription* This, + IPropertyDescription *This, PROPVARIANT *ppropvar); HRESULT (STDMETHODCALLTYPE *FormatForDisplay)( - IPropertyDescription* This, + IPropertyDescription *This, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS pdfFlags, LPWSTR *ppszDisplay); HRESULT (STDMETHODCALLTYPE *IsValueCanonical)( - IPropertyDescription* This, + IPropertyDescription *This, REFPROPVARIANT propvar); END_INTERFACE } IPropertyDescriptionVtbl; + interface IPropertyDescription { CONST_VTBL IPropertyDescriptionVtbl* lpVtbl; }; @@ -2325,157 +2113,6 @@ static FORCEINLINE HRESULT IPropertyDescription_IsValueCanonical(IPropertyDescri #endif -HRESULT STDMETHODCALLTYPE IPropertyDescription_GetPropertyKey_Proxy( - IPropertyDescription* This, - PROPERTYKEY *pkey); -void __RPC_STUB IPropertyDescription_GetPropertyKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyDescription_GetCanonicalName_Proxy( - IPropertyDescription* This, - LPWSTR *ppszName); -void __RPC_STUB IPropertyDescription_GetCanonicalName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyDescription_GetPropertyType_Proxy( - IPropertyDescription* This, - VARTYPE *pvartype); -void __RPC_STUB IPropertyDescription_GetPropertyType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyDescription_GetDisplayName_Proxy( - IPropertyDescription* This, - LPWSTR *ppszName); -void __RPC_STUB IPropertyDescription_GetDisplayName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyDescription_GetEditInvitation_Proxy( - IPropertyDescription* This, - LPWSTR *ppszInvite); -void __RPC_STUB IPropertyDescription_GetEditInvitation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyDescription_GetTypeFlags_Proxy( - IPropertyDescription* This, - PROPDESC_TYPE_FLAGS mask, - PROPDESC_TYPE_FLAGS *ppdtFlags); -void __RPC_STUB IPropertyDescription_GetTypeFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyDescription_GetViewFlags_Proxy( - IPropertyDescription* This, - PROPDESC_VIEW_FLAGS *ppdvFlags); -void __RPC_STUB IPropertyDescription_GetViewFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyDescription_GetDefaultColumnWidth_Proxy( - IPropertyDescription* This, - UINT *pcxChars); -void __RPC_STUB IPropertyDescription_GetDefaultColumnWidth_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyDescription_GetDisplayType_Proxy( - IPropertyDescription* This, - PROPDESC_DISPLAYTYPE *pdisplaytype); -void __RPC_STUB IPropertyDescription_GetDisplayType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyDescription_GetColumnState_Proxy( - IPropertyDescription* This, - SHCOLSTATEF *pcsFlags); -void __RPC_STUB IPropertyDescription_GetColumnState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyDescription_GetGroupingRange_Proxy( - IPropertyDescription* This, - PROPDESC_GROUPING_RANGE *pgr); -void __RPC_STUB IPropertyDescription_GetGroupingRange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyDescription_GetRelativeDescriptionType_Proxy( - IPropertyDescription* This, - PROPDESC_RELATIVEDESCRIPTION_TYPE *prdt); -void __RPC_STUB IPropertyDescription_GetRelativeDescriptionType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyDescription_GetRelativeDescription_Proxy( - IPropertyDescription* This, - REFPROPVARIANT propvar1, - REFPROPVARIANT propvar2, - LPWSTR *ppszDesc1, - LPWSTR *ppszDesc2); -void __RPC_STUB IPropertyDescription_GetRelativeDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyDescription_GetSortDescription_Proxy( - IPropertyDescription* This, - PROPDESC_SORTDESCRIPTION *psd); -void __RPC_STUB IPropertyDescription_GetSortDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyDescription_GetSortDescriptionLabel_Proxy( - IPropertyDescription* This, - WINBOOL fDescending, - LPWSTR *ppszDescription); -void __RPC_STUB IPropertyDescription_GetSortDescriptionLabel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyDescription_GetAggregationType_Proxy( - IPropertyDescription* This, - PROPDESC_AGGREGATION_TYPE *paggtype); -void __RPC_STUB IPropertyDescription_GetAggregationType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyDescription_GetConditionType_Proxy( - IPropertyDescription* This, - PROPDESC_CONDITION_TYPE *pcontype, - CONDITION_OPERATION *popDefault); -void __RPC_STUB IPropertyDescription_GetConditionType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyDescription_GetEnumTypeList_Proxy( - IPropertyDescription* This, - REFIID riid, - void **ppv); -void __RPC_STUB IPropertyDescription_GetEnumTypeList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE IPropertyDescription_RemoteCoerceToCanonicalValue_Proxy( IPropertyDescription* This, REFPROPVARIANT propvar, @@ -2485,24 +2122,6 @@ void __RPC_STUB IPropertyDescription_RemoteCoerceToCanonicalValue_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyDescription_FormatForDisplay_Proxy( - IPropertyDescription* This, - REFPROPVARIANT propvar, - PROPDESC_FORMAT_FLAGS pdfFlags, - LPWSTR *ppszDisplay); -void __RPC_STUB IPropertyDescription_FormatForDisplay_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyDescription_IsValueCanonical_Proxy( - IPropertyDescription* This, - REFPROPVARIANT propvar); -void __RPC_STUB IPropertyDescription_IsValueCanonical_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IPropertyDescription_CoerceToCanonicalValue_Proxy( IPropertyDescription* This, PROPVARIANT *ppropvar); @@ -2539,118 +2158,119 @@ typedef struct IPropertyDescription2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertyDescription2* This, + IPropertyDescription2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertyDescription2* This); + IPropertyDescription2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertyDescription2* This); + IPropertyDescription2 *This); /*** IPropertyDescription methods ***/ HRESULT (STDMETHODCALLTYPE *GetPropertyKey)( - IPropertyDescription2* This, + IPropertyDescription2 *This, PROPERTYKEY *pkey); HRESULT (STDMETHODCALLTYPE *GetCanonicalName)( - IPropertyDescription2* This, + IPropertyDescription2 *This, LPWSTR *ppszName); HRESULT (STDMETHODCALLTYPE *GetPropertyType)( - IPropertyDescription2* This, + IPropertyDescription2 *This, VARTYPE *pvartype); HRESULT (STDMETHODCALLTYPE *GetDisplayName)( - IPropertyDescription2* This, + IPropertyDescription2 *This, LPWSTR *ppszName); HRESULT (STDMETHODCALLTYPE *GetEditInvitation)( - IPropertyDescription2* This, + IPropertyDescription2 *This, LPWSTR *ppszInvite); HRESULT (STDMETHODCALLTYPE *GetTypeFlags)( - IPropertyDescription2* This, + IPropertyDescription2 *This, PROPDESC_TYPE_FLAGS mask, PROPDESC_TYPE_FLAGS *ppdtFlags); HRESULT (STDMETHODCALLTYPE *GetViewFlags)( - IPropertyDescription2* This, + IPropertyDescription2 *This, PROPDESC_VIEW_FLAGS *ppdvFlags); HRESULT (STDMETHODCALLTYPE *GetDefaultColumnWidth)( - IPropertyDescription2* This, + IPropertyDescription2 *This, UINT *pcxChars); HRESULT (STDMETHODCALLTYPE *GetDisplayType)( - IPropertyDescription2* This, + IPropertyDescription2 *This, PROPDESC_DISPLAYTYPE *pdisplaytype); HRESULT (STDMETHODCALLTYPE *GetColumnState)( - IPropertyDescription2* This, + IPropertyDescription2 *This, SHCOLSTATEF *pcsFlags); HRESULT (STDMETHODCALLTYPE *GetGroupingRange)( - IPropertyDescription2* This, + IPropertyDescription2 *This, PROPDESC_GROUPING_RANGE *pgr); HRESULT (STDMETHODCALLTYPE *GetRelativeDescriptionType)( - IPropertyDescription2* This, + IPropertyDescription2 *This, PROPDESC_RELATIVEDESCRIPTION_TYPE *prdt); HRESULT (STDMETHODCALLTYPE *GetRelativeDescription)( - IPropertyDescription2* This, + IPropertyDescription2 *This, REFPROPVARIANT propvar1, REFPROPVARIANT propvar2, LPWSTR *ppszDesc1, LPWSTR *ppszDesc2); HRESULT (STDMETHODCALLTYPE *GetSortDescription)( - IPropertyDescription2* This, + IPropertyDescription2 *This, PROPDESC_SORTDESCRIPTION *psd); HRESULT (STDMETHODCALLTYPE *GetSortDescriptionLabel)( - IPropertyDescription2* This, + IPropertyDescription2 *This, WINBOOL fDescending, LPWSTR *ppszDescription); HRESULT (STDMETHODCALLTYPE *GetAggregationType)( - IPropertyDescription2* This, + IPropertyDescription2 *This, PROPDESC_AGGREGATION_TYPE *paggtype); HRESULT (STDMETHODCALLTYPE *GetConditionType)( - IPropertyDescription2* This, + IPropertyDescription2 *This, PROPDESC_CONDITION_TYPE *pcontype, CONDITION_OPERATION *popDefault); HRESULT (STDMETHODCALLTYPE *GetEnumTypeList)( - IPropertyDescription2* This, + IPropertyDescription2 *This, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *CoerceToCanonicalValue)( - IPropertyDescription2* This, + IPropertyDescription2 *This, PROPVARIANT *ppropvar); HRESULT (STDMETHODCALLTYPE *FormatForDisplay)( - IPropertyDescription2* This, + IPropertyDescription2 *This, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS pdfFlags, LPWSTR *ppszDisplay); HRESULT (STDMETHODCALLTYPE *IsValueCanonical)( - IPropertyDescription2* This, + IPropertyDescription2 *This, REFPROPVARIANT propvar); /*** IPropertyDescription2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetImageReferenceForValue)( - IPropertyDescription2* This, + IPropertyDescription2 *This, REFPROPVARIANT propvar, LPWSTR *ppszImageRes); END_INTERFACE } IPropertyDescription2Vtbl; + interface IPropertyDescription2 { CONST_VTBL IPropertyDescription2Vtbl* lpVtbl; }; @@ -2769,15 +2389,6 @@ static FORCEINLINE HRESULT IPropertyDescription2_GetImageReferenceForValue(IProp #endif -HRESULT STDMETHODCALLTYPE IPropertyDescription2_GetImageReferenceForValue_Proxy( - IPropertyDescription2* This, - REFPROPVARIANT propvar, - LPWSTR *ppszImageRes); -void __RPC_STUB IPropertyDescription2_GetImageReferenceForValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPropertyDescription2_INTERFACE_DEFINED__ */ @@ -2811,123 +2422,124 @@ typedef struct IPropertyDescriptionAliasInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertyDescriptionAliasInfo* This, + IPropertyDescriptionAliasInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertyDescriptionAliasInfo* This); + IPropertyDescriptionAliasInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertyDescriptionAliasInfo* This); + IPropertyDescriptionAliasInfo *This); /*** IPropertyDescription methods ***/ HRESULT (STDMETHODCALLTYPE *GetPropertyKey)( - IPropertyDescriptionAliasInfo* This, + IPropertyDescriptionAliasInfo *This, PROPERTYKEY *pkey); HRESULT (STDMETHODCALLTYPE *GetCanonicalName)( - IPropertyDescriptionAliasInfo* This, + IPropertyDescriptionAliasInfo *This, LPWSTR *ppszName); HRESULT (STDMETHODCALLTYPE *GetPropertyType)( - IPropertyDescriptionAliasInfo* This, + IPropertyDescriptionAliasInfo *This, VARTYPE *pvartype); HRESULT (STDMETHODCALLTYPE *GetDisplayName)( - IPropertyDescriptionAliasInfo* This, + IPropertyDescriptionAliasInfo *This, LPWSTR *ppszName); HRESULT (STDMETHODCALLTYPE *GetEditInvitation)( - IPropertyDescriptionAliasInfo* This, + IPropertyDescriptionAliasInfo *This, LPWSTR *ppszInvite); HRESULT (STDMETHODCALLTYPE *GetTypeFlags)( - IPropertyDescriptionAliasInfo* This, + IPropertyDescriptionAliasInfo *This, PROPDESC_TYPE_FLAGS mask, PROPDESC_TYPE_FLAGS *ppdtFlags); HRESULT (STDMETHODCALLTYPE *GetViewFlags)( - IPropertyDescriptionAliasInfo* This, + IPropertyDescriptionAliasInfo *This, PROPDESC_VIEW_FLAGS *ppdvFlags); HRESULT (STDMETHODCALLTYPE *GetDefaultColumnWidth)( - IPropertyDescriptionAliasInfo* This, + IPropertyDescriptionAliasInfo *This, UINT *pcxChars); HRESULT (STDMETHODCALLTYPE *GetDisplayType)( - IPropertyDescriptionAliasInfo* This, + IPropertyDescriptionAliasInfo *This, PROPDESC_DISPLAYTYPE *pdisplaytype); HRESULT (STDMETHODCALLTYPE *GetColumnState)( - IPropertyDescriptionAliasInfo* This, + IPropertyDescriptionAliasInfo *This, SHCOLSTATEF *pcsFlags); HRESULT (STDMETHODCALLTYPE *GetGroupingRange)( - IPropertyDescriptionAliasInfo* This, + IPropertyDescriptionAliasInfo *This, PROPDESC_GROUPING_RANGE *pgr); HRESULT (STDMETHODCALLTYPE *GetRelativeDescriptionType)( - IPropertyDescriptionAliasInfo* This, + IPropertyDescriptionAliasInfo *This, PROPDESC_RELATIVEDESCRIPTION_TYPE *prdt); HRESULT (STDMETHODCALLTYPE *GetRelativeDescription)( - IPropertyDescriptionAliasInfo* This, + IPropertyDescriptionAliasInfo *This, REFPROPVARIANT propvar1, REFPROPVARIANT propvar2, LPWSTR *ppszDesc1, LPWSTR *ppszDesc2); HRESULT (STDMETHODCALLTYPE *GetSortDescription)( - IPropertyDescriptionAliasInfo* This, + IPropertyDescriptionAliasInfo *This, PROPDESC_SORTDESCRIPTION *psd); HRESULT (STDMETHODCALLTYPE *GetSortDescriptionLabel)( - IPropertyDescriptionAliasInfo* This, + IPropertyDescriptionAliasInfo *This, WINBOOL fDescending, LPWSTR *ppszDescription); HRESULT (STDMETHODCALLTYPE *GetAggregationType)( - IPropertyDescriptionAliasInfo* This, + IPropertyDescriptionAliasInfo *This, PROPDESC_AGGREGATION_TYPE *paggtype); HRESULT (STDMETHODCALLTYPE *GetConditionType)( - IPropertyDescriptionAliasInfo* This, + IPropertyDescriptionAliasInfo *This, PROPDESC_CONDITION_TYPE *pcontype, CONDITION_OPERATION *popDefault); HRESULT (STDMETHODCALLTYPE *GetEnumTypeList)( - IPropertyDescriptionAliasInfo* This, + IPropertyDescriptionAliasInfo *This, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *CoerceToCanonicalValue)( - IPropertyDescriptionAliasInfo* This, + IPropertyDescriptionAliasInfo *This, PROPVARIANT *ppropvar); HRESULT (STDMETHODCALLTYPE *FormatForDisplay)( - IPropertyDescriptionAliasInfo* This, + IPropertyDescriptionAliasInfo *This, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS pdfFlags, LPWSTR *ppszDisplay); HRESULT (STDMETHODCALLTYPE *IsValueCanonical)( - IPropertyDescriptionAliasInfo* This, + IPropertyDescriptionAliasInfo *This, REFPROPVARIANT propvar); /*** IPropertyDescriptionAliasInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetSortByAlias)( - IPropertyDescriptionAliasInfo* This, + IPropertyDescriptionAliasInfo *This, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetAdditionalSortByAliases)( - IPropertyDescriptionAliasInfo* This, + IPropertyDescriptionAliasInfo *This, REFIID riid, void **ppv); END_INTERFACE } IPropertyDescriptionAliasInfoVtbl; + interface IPropertyDescriptionAliasInfo { CONST_VTBL IPropertyDescriptionAliasInfoVtbl* lpVtbl; }; @@ -3050,24 +2662,6 @@ static FORCEINLINE HRESULT IPropertyDescriptionAliasInfo_GetAdditionalSortByAlia #endif -HRESULT STDMETHODCALLTYPE IPropertyDescriptionAliasInfo_GetSortByAlias_Proxy( - IPropertyDescriptionAliasInfo* This, - REFIID riid, - void **ppv); -void __RPC_STUB IPropertyDescriptionAliasInfo_GetSortByAlias_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyDescriptionAliasInfo_GetAdditionalSortByAliases_Proxy( - IPropertyDescriptionAliasInfo* This, - REFIID riid, - void **ppv); -void __RPC_STUB IPropertyDescriptionAliasInfo_GetAdditionalSortByAliases_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPropertyDescriptionAliasInfo_INTERFACE_DEFINED__ */ @@ -3125,129 +2719,130 @@ typedef struct IPropertyDescriptionSearchInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertyDescriptionSearchInfo* This); + IPropertyDescriptionSearchInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertyDescriptionSearchInfo* This); + IPropertyDescriptionSearchInfo *This); /*** IPropertyDescription methods ***/ HRESULT (STDMETHODCALLTYPE *GetPropertyKey)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, PROPERTYKEY *pkey); HRESULT (STDMETHODCALLTYPE *GetCanonicalName)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, LPWSTR *ppszName); HRESULT (STDMETHODCALLTYPE *GetPropertyType)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, VARTYPE *pvartype); HRESULT (STDMETHODCALLTYPE *GetDisplayName)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, LPWSTR *ppszName); HRESULT (STDMETHODCALLTYPE *GetEditInvitation)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, LPWSTR *ppszInvite); HRESULT (STDMETHODCALLTYPE *GetTypeFlags)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, PROPDESC_TYPE_FLAGS mask, PROPDESC_TYPE_FLAGS *ppdtFlags); HRESULT (STDMETHODCALLTYPE *GetViewFlags)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, PROPDESC_VIEW_FLAGS *ppdvFlags); HRESULT (STDMETHODCALLTYPE *GetDefaultColumnWidth)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, UINT *pcxChars); HRESULT (STDMETHODCALLTYPE *GetDisplayType)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, PROPDESC_DISPLAYTYPE *pdisplaytype); HRESULT (STDMETHODCALLTYPE *GetColumnState)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, SHCOLSTATEF *pcsFlags); HRESULT (STDMETHODCALLTYPE *GetGroupingRange)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, PROPDESC_GROUPING_RANGE *pgr); HRESULT (STDMETHODCALLTYPE *GetRelativeDescriptionType)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, PROPDESC_RELATIVEDESCRIPTION_TYPE *prdt); HRESULT (STDMETHODCALLTYPE *GetRelativeDescription)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, REFPROPVARIANT propvar1, REFPROPVARIANT propvar2, LPWSTR *ppszDesc1, LPWSTR *ppszDesc2); HRESULT (STDMETHODCALLTYPE *GetSortDescription)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, PROPDESC_SORTDESCRIPTION *psd); HRESULT (STDMETHODCALLTYPE *GetSortDescriptionLabel)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, WINBOOL fDescending, LPWSTR *ppszDescription); HRESULT (STDMETHODCALLTYPE *GetAggregationType)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, PROPDESC_AGGREGATION_TYPE *paggtype); HRESULT (STDMETHODCALLTYPE *GetConditionType)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, PROPDESC_CONDITION_TYPE *pcontype, CONDITION_OPERATION *popDefault); HRESULT (STDMETHODCALLTYPE *GetEnumTypeList)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *CoerceToCanonicalValue)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, PROPVARIANT *ppropvar); HRESULT (STDMETHODCALLTYPE *FormatForDisplay)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS pdfFlags, LPWSTR *ppszDisplay); HRESULT (STDMETHODCALLTYPE *IsValueCanonical)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, REFPROPVARIANT propvar); /*** IPropertyDescriptionSearchInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetSearchInfoFlags)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, PROPDESC_SEARCHINFO_FLAGS *ppdsiFlags); HRESULT (STDMETHODCALLTYPE *GetColumnIndexType)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, PROPDESC_COLUMNINDEX_TYPE *ppdciType); HRESULT (STDMETHODCALLTYPE *GetProjectionString)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, LPWSTR *ppszProjection); HRESULT (STDMETHODCALLTYPE *GetMaxSize)( - IPropertyDescriptionSearchInfo* This, + IPropertyDescriptionSearchInfo *This, UINT *pcbMaxSize); END_INTERFACE } IPropertyDescriptionSearchInfoVtbl; + interface IPropertyDescriptionSearchInfo { CONST_VTBL IPropertyDescriptionSearchInfoVtbl* lpVtbl; }; @@ -3378,38 +2973,6 @@ static FORCEINLINE HRESULT IPropertyDescriptionSearchInfo_GetMaxSize(IPropertyDe #endif -HRESULT STDMETHODCALLTYPE IPropertyDescriptionSearchInfo_GetSearchInfoFlags_Proxy( - IPropertyDescriptionSearchInfo* This, - PROPDESC_SEARCHINFO_FLAGS *ppdsiFlags); -void __RPC_STUB IPropertyDescriptionSearchInfo_GetSearchInfoFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyDescriptionSearchInfo_GetColumnIndexType_Proxy( - IPropertyDescriptionSearchInfo* This, - PROPDESC_COLUMNINDEX_TYPE *ppdciType); -void __RPC_STUB IPropertyDescriptionSearchInfo_GetColumnIndexType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyDescriptionSearchInfo_GetProjectionString_Proxy( - IPropertyDescriptionSearchInfo* This, - LPWSTR *ppszProjection); -void __RPC_STUB IPropertyDescriptionSearchInfo_GetProjectionString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyDescriptionSearchInfo_GetMaxSize_Proxy( - IPropertyDescriptionSearchInfo* This, - UINT *pcbMaxSize); -void __RPC_STUB IPropertyDescriptionSearchInfo_GetMaxSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPropertyDescriptionSearchInfo_INTERFACE_DEFINED__ */ @@ -3440,119 +3003,120 @@ typedef struct IPropertyDescriptionRelatedPropertyInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertyDescriptionRelatedPropertyInfo* This, + IPropertyDescriptionRelatedPropertyInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertyDescriptionRelatedPropertyInfo* This); + IPropertyDescriptionRelatedPropertyInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertyDescriptionRelatedPropertyInfo* This); + IPropertyDescriptionRelatedPropertyInfo *This); /*** IPropertyDescription methods ***/ HRESULT (STDMETHODCALLTYPE *GetPropertyKey)( - IPropertyDescriptionRelatedPropertyInfo* This, + IPropertyDescriptionRelatedPropertyInfo *This, PROPERTYKEY *pkey); HRESULT (STDMETHODCALLTYPE *GetCanonicalName)( - IPropertyDescriptionRelatedPropertyInfo* This, + IPropertyDescriptionRelatedPropertyInfo *This, LPWSTR *ppszName); HRESULT (STDMETHODCALLTYPE *GetPropertyType)( - IPropertyDescriptionRelatedPropertyInfo* This, + IPropertyDescriptionRelatedPropertyInfo *This, VARTYPE *pvartype); HRESULT (STDMETHODCALLTYPE *GetDisplayName)( - IPropertyDescriptionRelatedPropertyInfo* This, + IPropertyDescriptionRelatedPropertyInfo *This, LPWSTR *ppszName); HRESULT (STDMETHODCALLTYPE *GetEditInvitation)( - IPropertyDescriptionRelatedPropertyInfo* This, + IPropertyDescriptionRelatedPropertyInfo *This, LPWSTR *ppszInvite); HRESULT (STDMETHODCALLTYPE *GetTypeFlags)( - IPropertyDescriptionRelatedPropertyInfo* This, + IPropertyDescriptionRelatedPropertyInfo *This, PROPDESC_TYPE_FLAGS mask, PROPDESC_TYPE_FLAGS *ppdtFlags); HRESULT (STDMETHODCALLTYPE *GetViewFlags)( - IPropertyDescriptionRelatedPropertyInfo* This, + IPropertyDescriptionRelatedPropertyInfo *This, PROPDESC_VIEW_FLAGS *ppdvFlags); HRESULT (STDMETHODCALLTYPE *GetDefaultColumnWidth)( - IPropertyDescriptionRelatedPropertyInfo* This, + IPropertyDescriptionRelatedPropertyInfo *This, UINT *pcxChars); HRESULT (STDMETHODCALLTYPE *GetDisplayType)( - IPropertyDescriptionRelatedPropertyInfo* This, + IPropertyDescriptionRelatedPropertyInfo *This, PROPDESC_DISPLAYTYPE *pdisplaytype); HRESULT (STDMETHODCALLTYPE *GetColumnState)( - IPropertyDescriptionRelatedPropertyInfo* This, + IPropertyDescriptionRelatedPropertyInfo *This, SHCOLSTATEF *pcsFlags); HRESULT (STDMETHODCALLTYPE *GetGroupingRange)( - IPropertyDescriptionRelatedPropertyInfo* This, + IPropertyDescriptionRelatedPropertyInfo *This, PROPDESC_GROUPING_RANGE *pgr); HRESULT (STDMETHODCALLTYPE *GetRelativeDescriptionType)( - IPropertyDescriptionRelatedPropertyInfo* This, + IPropertyDescriptionRelatedPropertyInfo *This, PROPDESC_RELATIVEDESCRIPTION_TYPE *prdt); HRESULT (STDMETHODCALLTYPE *GetRelativeDescription)( - IPropertyDescriptionRelatedPropertyInfo* This, + IPropertyDescriptionRelatedPropertyInfo *This, REFPROPVARIANT propvar1, REFPROPVARIANT propvar2, LPWSTR *ppszDesc1, LPWSTR *ppszDesc2); HRESULT (STDMETHODCALLTYPE *GetSortDescription)( - IPropertyDescriptionRelatedPropertyInfo* This, + IPropertyDescriptionRelatedPropertyInfo *This, PROPDESC_SORTDESCRIPTION *psd); HRESULT (STDMETHODCALLTYPE *GetSortDescriptionLabel)( - IPropertyDescriptionRelatedPropertyInfo* This, + IPropertyDescriptionRelatedPropertyInfo *This, WINBOOL fDescending, LPWSTR *ppszDescription); HRESULT (STDMETHODCALLTYPE *GetAggregationType)( - IPropertyDescriptionRelatedPropertyInfo* This, + IPropertyDescriptionRelatedPropertyInfo *This, PROPDESC_AGGREGATION_TYPE *paggtype); HRESULT (STDMETHODCALLTYPE *GetConditionType)( - IPropertyDescriptionRelatedPropertyInfo* This, + IPropertyDescriptionRelatedPropertyInfo *This, PROPDESC_CONDITION_TYPE *pcontype, CONDITION_OPERATION *popDefault); HRESULT (STDMETHODCALLTYPE *GetEnumTypeList)( - IPropertyDescriptionRelatedPropertyInfo* This, + IPropertyDescriptionRelatedPropertyInfo *This, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *CoerceToCanonicalValue)( - IPropertyDescriptionRelatedPropertyInfo* This, + IPropertyDescriptionRelatedPropertyInfo *This, PROPVARIANT *ppropvar); HRESULT (STDMETHODCALLTYPE *FormatForDisplay)( - IPropertyDescriptionRelatedPropertyInfo* This, + IPropertyDescriptionRelatedPropertyInfo *This, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS pdfFlags, LPWSTR *ppszDisplay); HRESULT (STDMETHODCALLTYPE *IsValueCanonical)( - IPropertyDescriptionRelatedPropertyInfo* This, + IPropertyDescriptionRelatedPropertyInfo *This, REFPROPVARIANT propvar); /*** IPropertyDescriptionRelatedPropertyInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetRelatedProperty)( - IPropertyDescriptionRelatedPropertyInfo* This, + IPropertyDescriptionRelatedPropertyInfo *This, LPCWSTR pszRelationshipName, REFIID riid, void **ppv); END_INTERFACE } IPropertyDescriptionRelatedPropertyInfoVtbl; + interface IPropertyDescriptionRelatedPropertyInfo { CONST_VTBL IPropertyDescriptionRelatedPropertyInfoVtbl* lpVtbl; }; @@ -3671,16 +3235,6 @@ static FORCEINLINE HRESULT IPropertyDescriptionRelatedPropertyInfo_GetRelatedPro #endif -HRESULT STDMETHODCALLTYPE IPropertyDescriptionRelatedPropertyInfo_GetRelatedProperty_Proxy( - IPropertyDescriptionRelatedPropertyInfo* This, - LPCWSTR pszRelationshipName, - REFIID riid, - void **ppv); -void __RPC_STUB IPropertyDescriptionRelatedPropertyInfo_GetRelatedProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPropertyDescriptionRelatedPropertyInfo_INTERFACE_DEFINED__ */ @@ -3758,43 +3312,43 @@ typedef struct IPropertySystemVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertySystem* This, + IPropertySystem *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertySystem* This); + IPropertySystem *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertySystem* This); + IPropertySystem *This); /*** IPropertySystem methods ***/ HRESULT (STDMETHODCALLTYPE *GetPropertyDescription)( - IPropertySystem* This, + IPropertySystem *This, REFPROPERTYKEY propkey, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetPropertyDescriptionByName)( - IPropertySystem* This, + IPropertySystem *This, LPCWSTR pszCanonicalName, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetPropertyDescriptionListFromString)( - IPropertySystem* This, + IPropertySystem *This, LPCWSTR pszPropList, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *EnumeratePropertyDescriptions)( - IPropertySystem* This, + IPropertySystem *This, PROPDESC_ENUMFILTER filterOn, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *FormatForDisplay)( - IPropertySystem* This, + IPropertySystem *This, REFPROPERTYKEY key, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS pdff, @@ -3802,25 +3356,26 @@ typedef struct IPropertySystemVtbl { DWORD cchText); HRESULT (STDMETHODCALLTYPE *FormatForDisplayAlloc)( - IPropertySystem* This, + IPropertySystem *This, REFPROPERTYKEY key, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS pdff, LPWSTR *ppszDisplay); HRESULT (STDMETHODCALLTYPE *RegisterPropertySchema)( - IPropertySystem* This, + IPropertySystem *This, LPCWSTR pszPath); HRESULT (STDMETHODCALLTYPE *UnregisterPropertySchema)( - IPropertySystem* This, + IPropertySystem *This, LPCWSTR pszPath); HRESULT (STDMETHODCALLTYPE *RefreshPropertySchema)( - IPropertySystem* This); + IPropertySystem *This); END_INTERFACE } IPropertySystemVtbl; + interface IPropertySystem { CONST_VTBL IPropertySystemVtbl* lpVtbl; }; @@ -3885,92 +3440,6 @@ static FORCEINLINE HRESULT IPropertySystem_RefreshPropertySchema(IPropertySystem #endif -HRESULT STDMETHODCALLTYPE IPropertySystem_GetPropertyDescription_Proxy( - IPropertySystem* This, - REFPROPERTYKEY propkey, - REFIID riid, - void **ppv); -void __RPC_STUB IPropertySystem_GetPropertyDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertySystem_GetPropertyDescriptionByName_Proxy( - IPropertySystem* This, - LPCWSTR pszCanonicalName, - REFIID riid, - void **ppv); -void __RPC_STUB IPropertySystem_GetPropertyDescriptionByName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertySystem_GetPropertyDescriptionListFromString_Proxy( - IPropertySystem* This, - LPCWSTR pszPropList, - REFIID riid, - void **ppv); -void __RPC_STUB IPropertySystem_GetPropertyDescriptionListFromString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertySystem_EnumeratePropertyDescriptions_Proxy( - IPropertySystem* This, - PROPDESC_ENUMFILTER filterOn, - REFIID riid, - void **ppv); -void __RPC_STUB IPropertySystem_EnumeratePropertyDescriptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertySystem_FormatForDisplay_Proxy( - IPropertySystem* This, - REFPROPERTYKEY key, - REFPROPVARIANT propvar, - PROPDESC_FORMAT_FLAGS pdff, - LPWSTR pszText, - DWORD cchText); -void __RPC_STUB IPropertySystem_FormatForDisplay_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertySystem_FormatForDisplayAlloc_Proxy( - IPropertySystem* This, - REFPROPERTYKEY key, - REFPROPVARIANT propvar, - PROPDESC_FORMAT_FLAGS pdff, - LPWSTR *ppszDisplay); -void __RPC_STUB IPropertySystem_FormatForDisplayAlloc_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertySystem_RegisterPropertySchema_Proxy( - IPropertySystem* This, - LPCWSTR pszPath); -void __RPC_STUB IPropertySystem_RegisterPropertySchema_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertySystem_UnregisterPropertySchema_Proxy( - IPropertySystem* This, - LPCWSTR pszPath); -void __RPC_STUB IPropertySystem_UnregisterPropertySchema_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertySystem_RefreshPropertySchema_Proxy( - IPropertySystem* This); -void __RPC_STUB IPropertySystem_RefreshPropertySchema_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPropertySystem_INTERFACE_DEFINED__ */ @@ -4004,29 +3473,30 @@ typedef struct IPropertyDescriptionListVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertyDescriptionList* This, + IPropertyDescriptionList *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertyDescriptionList* This); + IPropertyDescriptionList *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertyDescriptionList* This); + IPropertyDescriptionList *This); /*** IPropertyDescriptionList methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IPropertyDescriptionList* This, + IPropertyDescriptionList *This, UINT *pcElem); HRESULT (STDMETHODCALLTYPE *GetAt)( - IPropertyDescriptionList* This, + IPropertyDescriptionList *This, UINT iElem, REFIID riid, void **ppv); END_INTERFACE } IPropertyDescriptionListVtbl; + interface IPropertyDescriptionList { CONST_VTBL IPropertyDescriptionListVtbl* lpVtbl; }; @@ -4063,24 +3533,6 @@ static FORCEINLINE HRESULT IPropertyDescriptionList_GetAt(IPropertyDescriptionLi #endif -HRESULT STDMETHODCALLTYPE IPropertyDescriptionList_GetCount_Proxy( - IPropertyDescriptionList* This, - UINT *pcElem); -void __RPC_STUB IPropertyDescriptionList_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyDescriptionList_GetAt_Proxy( - IPropertyDescriptionList* This, - UINT iElem, - REFIID riid, - void **ppv); -void __RPC_STUB IPropertyDescriptionList_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPropertyDescriptionList_INTERFACE_DEFINED__ */ @@ -4119,26 +3571,26 @@ typedef struct IPropertyStoreFactoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertyStoreFactory* This, + IPropertyStoreFactory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertyStoreFactory* This); + IPropertyStoreFactory *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertyStoreFactory* This); + IPropertyStoreFactory *This); /*** IPropertyStoreFactory methods ***/ HRESULT (STDMETHODCALLTYPE *GetPropertyStore)( - IPropertyStoreFactory* This, + IPropertyStoreFactory *This, GETPROPERTYSTOREFLAGS flags, IUnknown *pUnkFactory, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetPropertyStoreForKeys)( - IPropertyStoreFactory* This, + IPropertyStoreFactory *This, const PROPERTYKEY *rgKeys, UINT cKeys, GETPROPERTYSTOREFLAGS flags, @@ -4147,6 +3599,7 @@ typedef struct IPropertyStoreFactoryVtbl { END_INTERFACE } IPropertyStoreFactoryVtbl; + interface IPropertyStoreFactory { CONST_VTBL IPropertyStoreFactoryVtbl* lpVtbl; }; @@ -4183,29 +3636,6 @@ static FORCEINLINE HRESULT IPropertyStoreFactory_GetPropertyStoreForKeys(IProper #endif -HRESULT STDMETHODCALLTYPE IPropertyStoreFactory_GetPropertyStore_Proxy( - IPropertyStoreFactory* This, - GETPROPERTYSTOREFLAGS flags, - IUnknown *pUnkFactory, - REFIID riid, - void **ppv); -void __RPC_STUB IPropertyStoreFactory_GetPropertyStore_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyStoreFactory_GetPropertyStoreForKeys_Proxy( - IPropertyStoreFactory* This, - const PROPERTYKEY *rgKeys, - UINT cKeys, - GETPROPERTYSTOREFLAGS flags, - REFIID riid, - void **ppv); -void __RPC_STUB IPropertyStoreFactory_GetPropertyStoreForKeys_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPropertyStoreFactory_INTERFACE_DEFINED__ */ @@ -4237,26 +3667,26 @@ typedef struct IDelayedPropertyStoreFactoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDelayedPropertyStoreFactory* This, + IDelayedPropertyStoreFactory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDelayedPropertyStoreFactory* This); + IDelayedPropertyStoreFactory *This); ULONG (STDMETHODCALLTYPE *Release)( - IDelayedPropertyStoreFactory* This); + IDelayedPropertyStoreFactory *This); /*** IPropertyStoreFactory methods ***/ HRESULT (STDMETHODCALLTYPE *GetPropertyStore)( - IDelayedPropertyStoreFactory* This, + IDelayedPropertyStoreFactory *This, GETPROPERTYSTOREFLAGS flags, IUnknown *pUnkFactory, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetPropertyStoreForKeys)( - IDelayedPropertyStoreFactory* This, + IDelayedPropertyStoreFactory *This, const PROPERTYKEY *rgKeys, UINT cKeys, GETPROPERTYSTOREFLAGS flags, @@ -4265,7 +3695,7 @@ typedef struct IDelayedPropertyStoreFactoryVtbl { /*** IDelayedPropertyStoreFactory methods ***/ HRESULT (STDMETHODCALLTYPE *GetDelayedPropertyStore)( - IDelayedPropertyStoreFactory* This, + IDelayedPropertyStoreFactory *This, GETPROPERTYSTOREFLAGS flags, DWORD dwStoreId, REFIID riid, @@ -4273,6 +3703,7 @@ typedef struct IDelayedPropertyStoreFactoryVtbl { END_INTERFACE } IDelayedPropertyStoreFactoryVtbl; + interface IDelayedPropertyStoreFactory { CONST_VTBL IDelayedPropertyStoreFactoryVtbl* lpVtbl; }; @@ -4315,17 +3746,6 @@ static FORCEINLINE HRESULT IDelayedPropertyStoreFactory_GetDelayedPropertyStore( #endif -HRESULT STDMETHODCALLTYPE IDelayedPropertyStoreFactory_GetDelayedPropertyStore_Proxy( - IDelayedPropertyStoreFactory* This, - GETPROPERTYSTOREFLAGS flags, - DWORD dwStoreId, - REFIID riid, - void **ppv); -void __RPC_STUB IDelayedPropertyStoreFactory_GetDelayedPropertyStore_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDelayedPropertyStoreFactory_INTERFACE_DEFINED__ */ @@ -4336,7 +3756,6 @@ enum _PERSIST_SPROPSTORE_FLAGS { FPSPS_TREAT_NEW_VALUES_AS_DIRTY = 0x2 }; - typedef int PERSIST_SPROPSTORE_FLAGS; typedef struct tagSERIALIZEDPROPSTORAGE SERIALIZEDPROPSTORAGE; typedef SERIALIZEDPROPSTORAGE *PUSERIALIZEDPROPSTORAGE; @@ -4374,33 +3793,34 @@ typedef struct IPersistSerializedPropStorageVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPersistSerializedPropStorage* This, + IPersistSerializedPropStorage *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPersistSerializedPropStorage* This); + IPersistSerializedPropStorage *This); ULONG (STDMETHODCALLTYPE *Release)( - IPersistSerializedPropStorage* This); + IPersistSerializedPropStorage *This); /*** IPersistSerializedPropStorage methods ***/ HRESULT (STDMETHODCALLTYPE *SetFlags)( - IPersistSerializedPropStorage* This, + IPersistSerializedPropStorage *This, PERSIST_SPROPSTORE_FLAGS flags); HRESULT (STDMETHODCALLTYPE *SetPropertyStorage)( - IPersistSerializedPropStorage* This, + IPersistSerializedPropStorage *This, PCUSERIALIZEDPROPSTORAGE psps, DWORD cb); HRESULT (STDMETHODCALLTYPE *GetPropertyStorage)( - IPersistSerializedPropStorage* This, + IPersistSerializedPropStorage *This, SERIALIZEDPROPSTORAGE **ppsps, DWORD *pcb); END_INTERFACE } IPersistSerializedPropStorageVtbl; + interface IPersistSerializedPropStorage { CONST_VTBL IPersistSerializedPropStorageVtbl* lpVtbl; }; @@ -4441,32 +3861,6 @@ static FORCEINLINE HRESULT IPersistSerializedPropStorage_GetPropertyStorage(IPer #endif -HRESULT STDMETHODCALLTYPE IPersistSerializedPropStorage_SetFlags_Proxy( - IPersistSerializedPropStorage* This, - PERSIST_SPROPSTORE_FLAGS flags); -void __RPC_STUB IPersistSerializedPropStorage_SetFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPersistSerializedPropStorage_SetPropertyStorage_Proxy( - IPersistSerializedPropStorage* This, - PCUSERIALIZEDPROPSTORAGE psps, - DWORD cb); -void __RPC_STUB IPersistSerializedPropStorage_SetPropertyStorage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPersistSerializedPropStorage_GetPropertyStorage_Proxy( - IPersistSerializedPropStorage* This, - SERIALIZEDPROPSTORAGE **ppsps, - DWORD *pcb); -void __RPC_STUB IPersistSerializedPropStorage_GetPropertyStorage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPersistSerializedPropStorage_INTERFACE_DEFINED__ */ @@ -4500,44 +3894,45 @@ typedef struct IPersistSerializedPropStorage2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPersistSerializedPropStorage2* This, + IPersistSerializedPropStorage2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPersistSerializedPropStorage2* This); + IPersistSerializedPropStorage2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IPersistSerializedPropStorage2* This); + IPersistSerializedPropStorage2 *This); /*** IPersistSerializedPropStorage methods ***/ HRESULT (STDMETHODCALLTYPE *SetFlags)( - IPersistSerializedPropStorage2* This, + IPersistSerializedPropStorage2 *This, PERSIST_SPROPSTORE_FLAGS flags); HRESULT (STDMETHODCALLTYPE *SetPropertyStorage)( - IPersistSerializedPropStorage2* This, + IPersistSerializedPropStorage2 *This, PCUSERIALIZEDPROPSTORAGE psps, DWORD cb); HRESULT (STDMETHODCALLTYPE *GetPropertyStorage)( - IPersistSerializedPropStorage2* This, + IPersistSerializedPropStorage2 *This, SERIALIZEDPROPSTORAGE **ppsps, DWORD *pcb); /*** IPersistSerializedPropStorage2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetPropertyStorageSize)( - IPersistSerializedPropStorage2* This, + IPersistSerializedPropStorage2 *This, DWORD *pcb); HRESULT (STDMETHODCALLTYPE *GetPropertyStorageBuffer)( - IPersistSerializedPropStorage2* This, + IPersistSerializedPropStorage2 *This, SERIALIZEDPROPSTORAGE *psps, DWORD cb, DWORD *pcbWritten); END_INTERFACE } IPersistSerializedPropStorage2Vtbl; + interface IPersistSerializedPropStorage2 { CONST_VTBL IPersistSerializedPropStorage2Vtbl* lpVtbl; }; @@ -4588,24 +3983,6 @@ static FORCEINLINE HRESULT IPersistSerializedPropStorage2_GetPropertyStorageBuff #endif -HRESULT STDMETHODCALLTYPE IPersistSerializedPropStorage2_GetPropertyStorageSize_Proxy( - IPersistSerializedPropStorage2* This, - DWORD *pcb); -void __RPC_STUB IPersistSerializedPropStorage2_GetPropertyStorageSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPersistSerializedPropStorage2_GetPropertyStorageBuffer_Proxy( - IPersistSerializedPropStorage2* This, - SERIALIZEDPROPSTORAGE *psps, - DWORD cb, - DWORD *pcbWritten); -void __RPC_STUB IPersistSerializedPropStorage2_GetPropertyStorageBuffer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPersistSerializedPropStorage2_INTERFACE_DEFINED__ */ @@ -4634,22 +4011,23 @@ typedef struct IPropertySystemChangeNotifyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertySystemChangeNotify* This, + IPropertySystemChangeNotify *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertySystemChangeNotify* This); + IPropertySystemChangeNotify *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertySystemChangeNotify* This); + IPropertySystemChangeNotify *This); /*** IPropertySystemChangeNotify methods ***/ HRESULT (STDMETHODCALLTYPE *SchemaRefreshed)( - IPropertySystemChangeNotify* This); + IPropertySystemChangeNotify *This); END_INTERFACE } IPropertySystemChangeNotifyVtbl; + interface IPropertySystemChangeNotify { CONST_VTBL IPropertySystemChangeNotifyVtbl* lpVtbl; }; @@ -4682,13 +4060,6 @@ static FORCEINLINE HRESULT IPropertySystemChangeNotify_SchemaRefreshed(IProperty #endif -HRESULT STDMETHODCALLTYPE IPropertySystemChangeNotify_SchemaRefreshed_Proxy( - IPropertySystemChangeNotify* This); -void __RPC_STUB IPropertySystemChangeNotify_SchemaRefreshed_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPropertySystemChangeNotify_INTERFACE_DEFINED__ */ @@ -4720,19 +4091,19 @@ typedef struct ICreateObjectVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICreateObject* This, + ICreateObject *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICreateObject* This); + ICreateObject *This); ULONG (STDMETHODCALLTYPE *Release)( - ICreateObject* This); + ICreateObject *This); /*** ICreateObject methods ***/ HRESULT (STDMETHODCALLTYPE *CreateObject)( - ICreateObject* This, + ICreateObject *This, REFCLSID clsid, IUnknown *pUnkOuter, REFIID riid, @@ -4740,6 +4111,7 @@ typedef struct ICreateObjectVtbl { END_INTERFACE } ICreateObjectVtbl; + interface ICreateObject { CONST_VTBL ICreateObjectVtbl* lpVtbl; }; @@ -4772,17 +4144,6 @@ static FORCEINLINE HRESULT ICreateObject_CreateObject(ICreateObject* This,REFCLS #endif -HRESULT STDMETHODCALLTYPE ICreateObject_CreateObject_Proxy( - ICreateObject* This, - REFCLSID clsid, - IUnknown *pUnkOuter, - REFIID riid, - void **ppv); -void __RPC_STUB ICreateObject_CreateObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICreateObject_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/psdk_inc/intrin-impl.h b/lib/libc/include/any-windows-any/psdk_inc/intrin-impl.h index 591d9994ba..072a98f6f0 100644 --- a/lib/libc/include/any-windows-any/psdk_inc/intrin-impl.h +++ b/lib/libc/include/any-windows-any/psdk_inc/intrin-impl.h @@ -1938,6 +1938,34 @@ __buildmov(__movsd, unsigned __LONG32, "d") #define __INTRINSIC_DEFINED___movsd #endif /* __INTRINSIC_PROLOG */ +/* GCC 8 has already defined _xgetbv, Clang 9 has _xgetbv defined as a macro + * redirecting to the __builtin_ia32_xgetbv builtin. */ +#if (!defined(__GNUC__) || __GNUC__ < 8) && !defined(_xgetbv) +/* NOTE: This should be in immintrin.h */ +#if __INTRINSIC_PROLOG(_xgetbv) +unsigned __int64 _xgetbv(unsigned int); +#if !__has_builtin(_xgetbv) +__INTRINSICS_USEINLINE +unsigned __int64 _xgetbv(unsigned int index) +{ +#if defined(__x86_64__) || defined(_AMD64_) + unsigned __int64 val1, val2; +#else + unsigned __LONG32 val1, val2; +#endif /* defined(__x86_64__) || defined(_AMD64_) */ + + __asm__ __volatile__( + "xgetbv" + : "=a" (val1), "=d" (val2) + : "c" (index)); + + return (((unsigned __int64)val2) << 32) | val1; +} +#endif +#define __INTRINSIC_DEFINED__xgetbv +#endif /* __INTRINSIC_PROLOG */ +#endif /* __GNUC__ < 8 */ + #endif /* defined(__x86_64__) || defined(_AMD64_) || defined(__i386__) || defined(_X86_) */ /* ***************************************************** */ diff --git a/lib/libc/include/any-windows-any/pthread_signal.h b/lib/libc/include/any-windows-any/pthread_signal.h index c6a2ae1b0b..8c13666797 100644 --- a/lib/libc/include/any-windows-any/pthread_signal.h +++ b/lib/libc/include/any-windows-any/pthread_signal.h @@ -1,3 +1,3 @@ -/* Dummy header, which gets overriden, if winpthread library gets installed. */ +/* Dummy header, which gets overridden, if winpthread library gets installed. */ diff --git a/lib/libc/include/any-windows-any/pthread_time.h b/lib/libc/include/any-windows-any/pthread_time.h index aa2b24e85d..e740b43e45 100644 --- a/lib/libc/include/any-windows-any/pthread_time.h +++ b/lib/libc/include/any-windows-any/pthread_time.h @@ -1 +1 @@ -/* Dummy header, which gets overriden, if winpthread library gets installed. */ +/* Dummy header, which gets overridden, if winpthread library gets installed. */ diff --git a/lib/libc/include/any-windows-any/pthread_unistd.h b/lib/libc/include/any-windows-any/pthread_unistd.h index c6a2ae1b0b..8c13666797 100644 --- a/lib/libc/include/any-windows-any/pthread_unistd.h +++ b/lib/libc/include/any-windows-any/pthread_unistd.h @@ -1,3 +1,3 @@ -/* Dummy header, which gets overriden, if winpthread library gets installed. */ +/* Dummy header, which gets overridden, if winpthread library gets installed. */ diff --git a/lib/libc/include/any-windows-any/qedit.h b/lib/libc/include/any-windows-any/qedit.h index 01f14447a4..9ed7ddd509 100644 --- a/lib/libc/include/any-windows-any/qedit.h +++ b/lib/libc/include/any-windows-any/qedit.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from direct-x/include/qedit.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from direct-x/include/qedit.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -738,12 +739,12 @@ static FORCEINLINE HRESULT IMediaLocator_AddFoundLocation(IMediaLocator* This,BS #endif /* __IMediaLocator_INTERFACE_DEFINED__ */ -typedef struct __WIDL_qedit_generated_name_0000001E { +typedef struct __WIDL_qedit_generated_name_0000002B { BSTR name; DISPID dispID; LONG nValues; } DEXTER_PARAM; -typedef struct __WIDL_qedit_generated_name_0000001F { +typedef struct __WIDL_qedit_generated_name_0000002C { VARIANT v; REFERENCE_TIME rt; DWORD dwInterp; @@ -1154,7 +1155,7 @@ interface IAMTimelineSrc; #endif /* __cplusplus */ #endif -typedef enum __WIDL_qedit_generated_name_00000020 { +typedef enum __WIDL_qedit_generated_name_0000002D { TIMELINE_MAJOR_TYPE_COMPOSITE = 1, TIMELINE_MAJOR_TYPE_TRACK = 2, TIMELINE_MAJOR_TYPE_SOURCE = 4, diff --git a/lib/libc/include/any-windows-any/qnetwork.h b/lib/libc/include/any-windows-any/qnetwork.h index 710bcefdf0..decead339e 100644 --- a/lib/libc/include/any-windows-any/qnetwork.h +++ b/lib/libc/include/any-windows-any/qnetwork.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from direct-x/include/qnetwork.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from direct-x/include/qnetwork.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,11 +21,17 @@ #ifndef __IAMMediaContent_FWD_DEFINED__ #define __IAMMediaContent_FWD_DEFINED__ typedef interface IAMMediaContent IAMMediaContent; +#ifdef __cplusplus +interface IAMMediaContent; +#endif /* __cplusplus */ #endif #ifndef __IAMNetworkStatus_FWD_DEFINED__ #define __IAMNetworkStatus_FWD_DEFINED__ typedef interface IAMNetworkStatus IAMNetworkStatus; +#ifdef __cplusplus +interface IAMNetworkStatus; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -97,29 +104,29 @@ typedef struct IAMMediaContentVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAMMediaContent* This, + IAMMediaContent *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAMMediaContent* This); + IAMMediaContent *This); ULONG (STDMETHODCALLTYPE *Release)( - IAMMediaContent* This); + IAMMediaContent *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IAMMediaContent* This, + IAMMediaContent *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IAMMediaContent* This, + IAMMediaContent *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IAMMediaContent* This, + IAMMediaContent *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -127,7 +134,7 @@ typedef struct IAMMediaContentVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IAMMediaContent* This, + IAMMediaContent *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -139,59 +146,60 @@ typedef struct IAMMediaContentVtbl { /*** IAMMediaContent methods ***/ HRESULT (STDMETHODCALLTYPE *get_AuthorName)( - IAMMediaContent* This, + IAMMediaContent *This, BSTR *pbstrAuthorName); HRESULT (STDMETHODCALLTYPE *get_Title)( - IAMMediaContent* This, + IAMMediaContent *This, BSTR *pbstrTitle); HRESULT (STDMETHODCALLTYPE *get_Rating)( - IAMMediaContent* This, + IAMMediaContent *This, BSTR *pbstrRating); HRESULT (STDMETHODCALLTYPE *get_Description)( - IAMMediaContent* This, + IAMMediaContent *This, BSTR *pbstrDescription); HRESULT (STDMETHODCALLTYPE *get_Copyright)( - IAMMediaContent* This, + IAMMediaContent *This, BSTR *pbstrCopyright); HRESULT (STDMETHODCALLTYPE *get_BaseURL)( - IAMMediaContent* This, + IAMMediaContent *This, BSTR *pbstrBaseURL); HRESULT (STDMETHODCALLTYPE *get_LogoURL)( - IAMMediaContent* This, + IAMMediaContent *This, BSTR *pbstrLogoURL); HRESULT (STDMETHODCALLTYPE *get_LogoIconURL)( - IAMMediaContent* This, + IAMMediaContent *This, BSTR *pbstrLogoURL); HRESULT (STDMETHODCALLTYPE *get_WatermarkURL)( - IAMMediaContent* This, + IAMMediaContent *This, BSTR *pbstrWatermarkURL); HRESULT (STDMETHODCALLTYPE *get_MoreInfoURL)( - IAMMediaContent* This, + IAMMediaContent *This, BSTR *pbstrMoreInfoURL); HRESULT (STDMETHODCALLTYPE *get_MoreInfoBannerImage)( - IAMMediaContent* This, + IAMMediaContent *This, BSTR *pbstrMoreInfoBannerImage); HRESULT (STDMETHODCALLTYPE *get_MoreInfoBannerURL)( - IAMMediaContent* This, + IAMMediaContent *This, BSTR *pbstrMoreInfoBannerURL); HRESULT (STDMETHODCALLTYPE *get_MoreInfoText)( - IAMMediaContent* This, + IAMMediaContent *This, BSTR *pbstrMoreInfoText); END_INTERFACE } IAMMediaContentVtbl; + interface IAMMediaContent { CONST_VTBL IAMMediaContentVtbl* lpVtbl; }; @@ -290,110 +298,6 @@ static FORCEINLINE HRESULT IAMMediaContent_get_MoreInfoText(IAMMediaContent* Thi #endif -HRESULT STDMETHODCALLTYPE IAMMediaContent_get_AuthorName_Proxy( - IAMMediaContent* This, - BSTR *pbstrAuthorName); -void __RPC_STUB IAMMediaContent_get_AuthorName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMMediaContent_get_Title_Proxy( - IAMMediaContent* This, - BSTR *pbstrTitle); -void __RPC_STUB IAMMediaContent_get_Title_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMMediaContent_get_Rating_Proxy( - IAMMediaContent* This, - BSTR *pbstrRating); -void __RPC_STUB IAMMediaContent_get_Rating_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMMediaContent_get_Description_Proxy( - IAMMediaContent* This, - BSTR *pbstrDescription); -void __RPC_STUB IAMMediaContent_get_Description_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMMediaContent_get_Copyright_Proxy( - IAMMediaContent* This, - BSTR *pbstrCopyright); -void __RPC_STUB IAMMediaContent_get_Copyright_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMMediaContent_get_BaseURL_Proxy( - IAMMediaContent* This, - BSTR *pbstrBaseURL); -void __RPC_STUB IAMMediaContent_get_BaseURL_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMMediaContent_get_LogoURL_Proxy( - IAMMediaContent* This, - BSTR *pbstrLogoURL); -void __RPC_STUB IAMMediaContent_get_LogoURL_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMMediaContent_get_LogoIconURL_Proxy( - IAMMediaContent* This, - BSTR *pbstrLogoURL); -void __RPC_STUB IAMMediaContent_get_LogoIconURL_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMMediaContent_get_WatermarkURL_Proxy( - IAMMediaContent* This, - BSTR *pbstrWatermarkURL); -void __RPC_STUB IAMMediaContent_get_WatermarkURL_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMMediaContent_get_MoreInfoURL_Proxy( - IAMMediaContent* This, - BSTR *pbstrMoreInfoURL); -void __RPC_STUB IAMMediaContent_get_MoreInfoURL_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMMediaContent_get_MoreInfoBannerImage_Proxy( - IAMMediaContent* This, - BSTR *pbstrMoreInfoBannerImage); -void __RPC_STUB IAMMediaContent_get_MoreInfoBannerImage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMMediaContent_get_MoreInfoBannerURL_Proxy( - IAMMediaContent* This, - BSTR *pbstrMoreInfoBannerURL); -void __RPC_STUB IAMMediaContent_get_MoreInfoBannerURL_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMMediaContent_get_MoreInfoText_Proxy( - IAMMediaContent* This, - BSTR *pbstrMoreInfoText); -void __RPC_STUB IAMMediaContent_get_MoreInfoText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAMMediaContent_INTERFACE_DEFINED__ */ @@ -439,29 +343,29 @@ typedef struct IAMNetworkStatusVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAMNetworkStatus* This, + IAMNetworkStatus *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAMNetworkStatus* This); + IAMNetworkStatus *This); ULONG (STDMETHODCALLTYPE *Release)( - IAMNetworkStatus* This); + IAMNetworkStatus *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IAMNetworkStatus* This, + IAMNetworkStatus *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IAMNetworkStatus* This, + IAMNetworkStatus *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IAMNetworkStatus* This, + IAMNetworkStatus *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -469,7 +373,7 @@ typedef struct IAMNetworkStatusVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IAMNetworkStatus* This, + IAMNetworkStatus *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -481,35 +385,36 @@ typedef struct IAMNetworkStatusVtbl { /*** IAMNetworkStatus methods ***/ HRESULT (STDMETHODCALLTYPE *get_ReceivedPackets)( - IAMNetworkStatus* This, + IAMNetworkStatus *This, LONG *pReceivedPackets); HRESULT (STDMETHODCALLTYPE *get_RecoveredPackets)( - IAMNetworkStatus* This, + IAMNetworkStatus *This, LONG *pRecoveredPackets); HRESULT (STDMETHODCALLTYPE *get_LostPackets)( - IAMNetworkStatus* This, + IAMNetworkStatus *This, LONG *pLostPackets); HRESULT (STDMETHODCALLTYPE *get_ReceptionQuality)( - IAMNetworkStatus* This, + IAMNetworkStatus *This, LONG *pReceptionQuality); HRESULT (STDMETHODCALLTYPE *get_BufferingCount)( - IAMNetworkStatus* This, + IAMNetworkStatus *This, LONG *pBufferingCount); HRESULT (STDMETHODCALLTYPE *get_IsBroadcast)( - IAMNetworkStatus* This, + IAMNetworkStatus *This, VARIANT_BOOL *pIsBroadcast); HRESULT (STDMETHODCALLTYPE *get_BufferingProgress)( - IAMNetworkStatus* This, + IAMNetworkStatus *This, LONG *pBufferingProgress); END_INTERFACE } IAMNetworkStatusVtbl; + interface IAMNetworkStatus { CONST_VTBL IAMNetworkStatusVtbl* lpVtbl; }; @@ -584,62 +489,6 @@ static FORCEINLINE HRESULT IAMNetworkStatus_get_BufferingProgress(IAMNetworkStat #endif -HRESULT STDMETHODCALLTYPE IAMNetworkStatus_get_ReceivedPackets_Proxy( - IAMNetworkStatus* This, - LONG *pReceivedPackets); -void __RPC_STUB IAMNetworkStatus_get_ReceivedPackets_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMNetworkStatus_get_RecoveredPackets_Proxy( - IAMNetworkStatus* This, - LONG *pRecoveredPackets); -void __RPC_STUB IAMNetworkStatus_get_RecoveredPackets_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMNetworkStatus_get_LostPackets_Proxy( - IAMNetworkStatus* This, - LONG *pLostPackets); -void __RPC_STUB IAMNetworkStatus_get_LostPackets_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMNetworkStatus_get_ReceptionQuality_Proxy( - IAMNetworkStatus* This, - LONG *pReceptionQuality); -void __RPC_STUB IAMNetworkStatus_get_ReceptionQuality_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMNetworkStatus_get_BufferingCount_Proxy( - IAMNetworkStatus* This, - LONG *pBufferingCount); -void __RPC_STUB IAMNetworkStatus_get_BufferingCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMNetworkStatus_get_IsBroadcast_Proxy( - IAMNetworkStatus* This, - VARIANT_BOOL *pIsBroadcast); -void __RPC_STUB IAMNetworkStatus_get_IsBroadcast_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMNetworkStatus_get_BufferingProgress_Proxy( - IAMNetworkStatus* This, - LONG *pBufferingProgress); -void __RPC_STUB IAMNetworkStatus_get_BufferingProgress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAMNetworkStatus_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/regbag.h b/lib/libc/include/any-windows-any/regbag.h index de3200651a..56f8b34490 100644 --- a/lib/libc/include/any-windows-any/regbag.h +++ b/lib/libc/include/any-windows-any/regbag.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/regbag.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/regbag.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,6 +21,9 @@ #ifndef __ICreatePropBagOnRegKey_FWD_DEFINED__ #define __ICreatePropBagOnRegKey_FWD_DEFINED__ typedef interface ICreatePropBagOnRegKey ICreatePropBagOnRegKey; +#ifdef __cplusplus +interface ICreatePropBagOnRegKey; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -64,19 +68,19 @@ typedef struct ICreatePropBagOnRegKeyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICreatePropBagOnRegKey* This, + ICreatePropBagOnRegKey *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICreatePropBagOnRegKey* This); + ICreatePropBagOnRegKey *This); ULONG (STDMETHODCALLTYPE *Release)( - ICreatePropBagOnRegKey* This); + ICreatePropBagOnRegKey *This); /*** ICreatePropBagOnRegKey methods ***/ HRESULT (STDMETHODCALLTYPE *Create)( - ICreatePropBagOnRegKey* This, + ICreatePropBagOnRegKey *This, HKEY hkey, LPCOLESTR subkey, DWORD ulOptions, @@ -86,6 +90,7 @@ typedef struct ICreatePropBagOnRegKeyVtbl { END_INTERFACE } ICreatePropBagOnRegKeyVtbl; + interface ICreatePropBagOnRegKey { CONST_VTBL ICreatePropBagOnRegKeyVtbl* lpVtbl; }; @@ -118,19 +123,6 @@ static FORCEINLINE HRESULT ICreatePropBagOnRegKey_Create(ICreatePropBagOnRegKey* #endif -HRESULT STDMETHODCALLTYPE ICreatePropBagOnRegKey_Create_Proxy( - ICreatePropBagOnRegKey* This, - HKEY hkey, - LPCOLESTR subkey, - DWORD ulOptions, - DWORD samDesired, - REFIID iid, - LPVOID *ppBag); -void __RPC_STUB ICreatePropBagOnRegKey_Create_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICreatePropBagOnRegKey_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/rpcndr.h b/lib/libc/include/any-windows-any/rpcndr.h index 52de4ad5a3..92d5741362 100644 --- a/lib/libc/include/any-windows-any/rpcndr.h +++ b/lib/libc/include/any-windows-any/rpcndr.h @@ -111,7 +111,7 @@ extern "C" { #ifndef __MIDL_user_allocate_free_DEFINED__ #define __MIDL_user_allocate_free_DEFINED__ - void *__RPC_USER MIDL_user_allocate(SIZE_T); + void *__RPC_USER MIDL_user_allocate(size_t); void __RPC_USER MIDL_user_free(void *); #endif diff --git a/lib/libc/include/any-windows-any/sal.h b/lib/libc/include/any-windows-any/sal.h index 0a2df8b4e8..6915a81b92 100644 --- a/lib/libc/include/any-windows-any/sal.h +++ b/lib/libc/include/any-windows-any/sal.h @@ -17,94 +17,105 @@ #define __checkReturn __inner_checkReturn -/* Pointer parameters */ +/* Input parameters */ #define _In_ -#define _Out_ -#define _Inout_ -#define _In_z_ -#define _Inout_z_ -#define _In_reads_(s) -#define _In_reads_bytes_(s) -#define _In_reads_z_(s) -#define _In_reads_or_z_(s) -#define _Out_writes_(s) -#define _Out_writes_bytes_(s) -#define _Out_writes_z_(s) -#define _Inout_updates_(s) -#define _Inout_updates_bytes_(s) -#define _Inout_updates_z_(s) -#define _Out_writes_to_(s,c) -#define _Out_writes_bytes_to_(s, c) -#define _Out_writes_all_(s) -#define _Out_writes_bytes_all_(s) -#define _Inout_updates_to_(s, c) -#define _Inout_updates_bytes_to_(s, c) -#define _Inout_updates_all_(s) -#define _Inout_updates_bytes_all_(s) -#define _In_reads_to_ptr_(p) -#define _In_reads_to_ptr_z_(p) -#define _Out_writes_to_ptr_(p) -#define _Out_writes_to_ptr_z(p) - -/* Optional pointer parameters */ -#define __in_opt -#define __out_opt -#define __inout_opt #define _In_opt_ -#define _Out_opt_ -#define _Inout_opt_ +#define _In_z_ #define _In_opt_z_ -#define _Inout_opt_z_ +#define _In_reads_(s) #define _In_reads_opt_(s) +#define _In_reads_bytes_(s) #define _In_reads_bytes_opt_(s) +#define _In_reads_z_(s) #define _In_reads_opt_z_(s) - -#define _Out_writes_opt_(s) -#define _Out_writes_opt_z_(s) -#define _Inout_updates_opt_(s) -#define _Inout_updates_bytes_opt_(s) -#define _Inout_updates_opt_z_(s) -#define _Out_writes_to_opt_(s, c) -#define _Out_writes_bytes_to_opt_(s, c) -#define _Out_writes_all_opt_(s) -#define _Out_writes_bytes_all_opt_(s) - -#define _Inout_updates_to_opt_(s, c) -#define _Inout_updates_bytes_to_opt_(s, c) -#define _Inout_updates_all_opt_(s) -#define _Inout_updates_bytes_all_opt_(s) +#define _In_reads_or_z_(s) +#define _In_reads_or_z_opt_(s) +#define _In_reads_to_ptr_(p) #define _In_reads_to_ptr_opt_(p) +#define _In_reads_to_ptr_z_(p) #define _In_reads_to_ptr_opt_z_(p) + +/* Output parameters */ +#define _Out_ +#define _Out_opt_ +#define _Out_writes_(s) +#define _Out_writes_opt_(s) +#define _Out_writes_bytes_(s) +#define _Out_writes_bytes_opt_(s) +#define _Out_writes_z_(s) +#define _Out_writes_opt_z_(s) +#define _Out_writes_to_(s, c) +#define _Out_writes_to_opt_(s, c) +#define _Out_writes_all_(s) +#define _Out_writes_all_opt_(s) +#define _Out_writes_bytes_to_(s, c) +#define _Out_writes_bytes_to_opt_(s, c) +#define _Out_writes_bytes_all_(s) +#define _Out_writes_bytes_all_opt_(s) +#define _Out_writes_to_ptr_(p) #define _Out_writes_to_ptr_opt_(p) +#define _Out_writes_to_ptr_z_(p) #define _Out_writes_to_ptr_opt_z_(p) -/* Output pointer parameters */ +/* Inout parameters */ +#define _Inout_ +#define _Inout_opt_ +#define _Inout_z_ +#define _Inout_opt_z_ +#define _Inout_updates_(s) +#define _Inout_updates_opt_(s) +#define _Inout_updates_z_(s) +#define _Inout_updates_opt_z_(s) +#define _Inout_updates_to_(s, c) +#define _Inout_updates_to_opt_(s, c) +#define _Inout_updates_all_(s) +#define _Inout_updates_all_opt_(s) +#define _Inout_updates_bytes_(s) +#define _Inout_updates_bytes_opt_(s) +#define _Inout_updates_bytes_to_(s, c) +#define _Inout_updates_bytes_to_opt_(s, c) +#define _Inout_updates_bytes_all_(s) +#define _Inout_updates_bytes_all_opt_(s) + +/* Pointer to pointer parameters */ #define _Outptr_ -#define _Outptr_opt_ #define _Outptr_result_maybenull_ +#define _Outptr_opt_ #define _Outptr_opt_result_maybenull_ #define _Outptr_result_z_ #define _Outptr_opt_result_z_ #define _Outptr_result_maybenull_z_ #define _Outptr_opt_result_maybenull_z_ -#define _COM_Outptr_ -#define _COM_Outptr_opt_ -#define _COM_Outptr_result_maybenull_ -#define _COM_Outptr_opt_result_maybenull_ -#define _Outptr_result_buffer_(s) -#define _Outptr_result_bytebuffer_(s) -#define _Outptr_opt_result_buffer_(s) -#define _Outptr_opt_result_bytebuffer_(s) -#define _Outptr_result_buffer_to_(s, c) -#define _Outptr_result_bytebuffer_to_(s, c) -#define _Outptr_result_bytebuffer_maybenull_(s) -#define _Outptr_opt_result_buffer_to_(s, c) -#define _Outptr_opt_result_bytebuffer_to_(s, c) -#define _Result_nullonfailure_ -#define _Result_zeroonfailure_ #define _Outptr_result_nullonfailure_ #define _Outptr_opt_result_nullonfailure_ -#define _Outref_result_nullonfailure_ +#define _COM_Outptr_ +#define _COM_Outptr_result_maybenull_ +#define _COM_Outptr_opt_ +#define _COM_Outptr_opt_result_maybenull_ +#define _Outptr_result_buffer_(s) +#define _Outptr_opt_result_buffer_(s) +#define _Outptr_result_buffer_to_(s, c) +#define _Outptr_opt_result_buffer_to_(s, c) +#define _Outptr_result_buffer_all_(s) +#define _Outptr_opt_result_buffer_all_(s) +#define _Outptr_result_buffer_maybenull_(s) +#define _Outptr_opt_result_buffer_maybenull_(s) +#define _Outptr_result_buffer_to_maybenull_(s, c) +#define _Outptr_opt_result_buffer_to_maybenull_(s, c) +#define _Outptr_result_buffer_all_maybenull_(s) +#define _Outptr_opt_result_buffer_all_maybenull_(s) +#define _Outptr_result_bytebuffer_(s) +#define _Outptr_opt_result_bytebuffer_(s) +#define _Outptr_result_bytebuffer_to_(s, c) +#define _Outptr_opt_result_bytebuffer_to_(s, c) +#define _Outptr_result_bytebuffer_all_(s) +#define _Outptr_opt_result_bytebuffer_all_(s) +#define _Outptr_result_bytebuffer_maybenull_(s) +#define _Outptr_opt_result_bytebuffer_maybenull_(s) +#define _Outptr_result_bytebuffer_to_maybenull_(s, c) +#define _Outptr_opt_result_bytebuffer_to_maybenull_(s, c) +#define _Outptr_result_bytebuffer_all_maybenull_(s) +#define _Outptr_opt_result_bytebuffer_all_maybenull_(s) /* Output reference parameters */ #define _Outref_ @@ -121,23 +132,39 @@ #define _Outref_result_bytebuffer_to_maybenull_(s, c) #define _Outref_result_buffer_all_maybenull_(s) #define _Outref_result_bytebuffer_all_maybenull_(s) +#define _Outref_result_nullonfailure_ +#define _Result_nullonfailure_ +#define _Result_zeroonfailure_ /* Return values */ #define _Ret_z_ -#define _Ret_writes_(s) -#define _Ret_writes_bytes_(s) -#define _Ret_writes_z_(s) -#define _Ret_writes_bytes_to_(s, c) -#define _Ret_writes_maybenull_(s) -#define _Ret_writes_to_maybenull_(s, c) -#define _Ret_writes_maybenull_z_(s) -#define _Ret_maybenull_ #define _Ret_maybenull_z_ -#define _Ret_null_ #define _Ret_notnull_ -#define _Ret_writes_bytes_to_(s, c) +#define _Ret_maybenull_ +#define _Ret_null_ +#define _Ret_valid_ +#define _Ret_writes_(s) +#define _Ret_writes_z_(s) +#define _Ret_writes_bytes_(s) +#define _Ret_writes_maybenull_(s) +#define _Ret_writes_maybenull_z_(s) #define _Ret_writes_bytes_maybenull_(s) +#define _Ret_writes_to_(s, c) +#define _Ret_writes_bytes_to_(s, c) +#define _Ret_writes_to_maybenull_(s, c) #define _Ret_writes_bytes_to_maybenull_(s, c) +#define _Points_to_data_ +#define _Literal_ +#define _Notliteral_ +#define _Deref_ret_range_(l,u) +#define _Unchanged_(e) +#define _Pre_satisfies_(c) +#define _Post_satisfies_(c) + +/* Optional pointer parameters */ +#define __in_opt +#define __out_opt +#define __inout_opt /* Other common annotations */ #define _In_range_(low, hi) @@ -227,14 +254,42 @@ #define __out #endif +#define __bcount(size) +#define __ecount(size) + #define __in_bcount(size) +#define __in_bcount_nz(size) +#define __in_bcount_z(size) #define __in_ecount(size) +#define __in_ecount_nz(size) +#define __in_ecount_z(size) #define __out_bcount(size) +#define __out_bcount_nz(size) +#define __out_bcount_z(size) +#define __out_bcount_full(size) +#define __out_bcount_full_z(size) #define __out_bcount_part(size, length) +#define __out_bcount_part_z(size, length) #define __out_ecount(size) +#define __out_ecount_nz(size) +#define __out_ecount_z(size) +#define __out_ecount_full(size) +#define __out_ecount_full_z(size) +#define __out_ecount_part(size, length) +#define __out_ecount_part_z(size, length) #define __inout +#define __inout_bcount(size) +#define __inout_bcount_nz(size) +#define __inout_bcount_z(size) +#define __inout_bcount_full(size) +#define __inout_bcount_part(size, length) +#define __inout_ecount(size) +#define __inout_ecount_nz(size) +#define __inout_ecount_z(size) +#define __inout_ecount_full(size) +#define __inout_ecount_part(size, length) #define __deref_out_ecount(size) diff --git a/lib/libc/include/any-windows-any/sapi51.h b/lib/libc/include/any-windows-any/sapi51.h index e3ffbff4fc..0592443139 100644 --- a/lib/libc/include/any-windows-any/sapi51.h +++ b/lib/libc/include/any-windows-any/sapi51.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/sapi51.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/sapi51.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,396 +21,633 @@ #ifndef __ISpNotifySource_FWD_DEFINED__ #define __ISpNotifySource_FWD_DEFINED__ typedef interface ISpNotifySource ISpNotifySource; +#ifdef __cplusplus +interface ISpNotifySource; +#endif /* __cplusplus */ #endif #ifndef __ISpNotifySink_FWD_DEFINED__ #define __ISpNotifySink_FWD_DEFINED__ typedef interface ISpNotifySink ISpNotifySink; +#ifdef __cplusplus +interface ISpNotifySink; +#endif /* __cplusplus */ #endif #ifndef __ISpNotifyTranslator_FWD_DEFINED__ #define __ISpNotifyTranslator_FWD_DEFINED__ typedef interface ISpNotifyTranslator ISpNotifyTranslator; +#ifdef __cplusplus +interface ISpNotifyTranslator; +#endif /* __cplusplus */ #endif #ifndef __ISpDataKey_FWD_DEFINED__ #define __ISpDataKey_FWD_DEFINED__ typedef interface ISpDataKey ISpDataKey; +#ifdef __cplusplus +interface ISpDataKey; +#endif /* __cplusplus */ #endif #ifndef __ISpObjectWithToken_FWD_DEFINED__ #define __ISpObjectWithToken_FWD_DEFINED__ typedef interface ISpObjectWithToken ISpObjectWithToken; +#ifdef __cplusplus +interface ISpObjectWithToken; +#endif /* __cplusplus */ #endif #ifndef __IEnumSpObjectTokens_FWD_DEFINED__ #define __IEnumSpObjectTokens_FWD_DEFINED__ typedef interface IEnumSpObjectTokens IEnumSpObjectTokens; +#ifdef __cplusplus +interface IEnumSpObjectTokens; +#endif /* __cplusplus */ #endif #ifndef __ISpRegDataKey_FWD_DEFINED__ #define __ISpRegDataKey_FWD_DEFINED__ typedef interface ISpRegDataKey ISpRegDataKey; +#ifdef __cplusplus +interface ISpRegDataKey; +#endif /* __cplusplus */ #endif #ifndef __ISpObjectTokenCategory_FWD_DEFINED__ #define __ISpObjectTokenCategory_FWD_DEFINED__ typedef interface ISpObjectTokenCategory ISpObjectTokenCategory; +#ifdef __cplusplus +interface ISpObjectTokenCategory; +#endif /* __cplusplus */ #endif #ifndef __ISpObjectToken_FWD_DEFINED__ #define __ISpObjectToken_FWD_DEFINED__ typedef interface ISpObjectToken ISpObjectToken; +#ifdef __cplusplus +interface ISpObjectToken; +#endif /* __cplusplus */ #endif #ifndef __ISpObjectTokenInit_FWD_DEFINED__ #define __ISpObjectTokenInit_FWD_DEFINED__ typedef interface ISpObjectTokenInit ISpObjectTokenInit; +#ifdef __cplusplus +interface ISpObjectTokenInit; +#endif /* __cplusplus */ #endif #ifndef __ISpResourceManager_FWD_DEFINED__ #define __ISpResourceManager_FWD_DEFINED__ typedef interface ISpResourceManager ISpResourceManager; +#ifdef __cplusplus +interface ISpResourceManager; +#endif /* __cplusplus */ #endif #ifndef __ISpEventSource_FWD_DEFINED__ #define __ISpEventSource_FWD_DEFINED__ typedef interface ISpEventSource ISpEventSource; +#ifdef __cplusplus +interface ISpEventSource; +#endif /* __cplusplus */ #endif #ifndef __ISpEventSink_FWD_DEFINED__ #define __ISpEventSink_FWD_DEFINED__ typedef interface ISpEventSink ISpEventSink; +#ifdef __cplusplus +interface ISpEventSink; +#endif /* __cplusplus */ #endif #ifndef __ISpStreamFormat_FWD_DEFINED__ #define __ISpStreamFormat_FWD_DEFINED__ typedef interface ISpStreamFormat ISpStreamFormat; +#ifdef __cplusplus +interface ISpStreamFormat; +#endif /* __cplusplus */ #endif #ifndef __ISpStream_FWD_DEFINED__ #define __ISpStream_FWD_DEFINED__ typedef interface ISpStream ISpStream; +#ifdef __cplusplus +interface ISpStream; +#endif /* __cplusplus */ #endif #ifndef __ISpStreamFormatConverter_FWD_DEFINED__ #define __ISpStreamFormatConverter_FWD_DEFINED__ typedef interface ISpStreamFormatConverter ISpStreamFormatConverter; +#ifdef __cplusplus +interface ISpStreamFormatConverter; +#endif /* __cplusplus */ #endif #ifndef __ISpAudio_FWD_DEFINED__ #define __ISpAudio_FWD_DEFINED__ typedef interface ISpAudio ISpAudio; +#ifdef __cplusplus +interface ISpAudio; +#endif /* __cplusplus */ #endif #ifndef __ISpMMSysAudio_FWD_DEFINED__ #define __ISpMMSysAudio_FWD_DEFINED__ typedef interface ISpMMSysAudio ISpMMSysAudio; +#ifdef __cplusplus +interface ISpMMSysAudio; +#endif /* __cplusplus */ #endif #ifndef __ISpTranscript_FWD_DEFINED__ #define __ISpTranscript_FWD_DEFINED__ typedef interface ISpTranscript ISpTranscript; +#ifdef __cplusplus +interface ISpTranscript; +#endif /* __cplusplus */ #endif #ifndef __ISpLexicon_FWD_DEFINED__ #define __ISpLexicon_FWD_DEFINED__ typedef interface ISpLexicon ISpLexicon; +#ifdef __cplusplus +interface ISpLexicon; +#endif /* __cplusplus */ #endif #ifndef __ISpContainerLexicon_FWD_DEFINED__ #define __ISpContainerLexicon_FWD_DEFINED__ typedef interface ISpContainerLexicon ISpContainerLexicon; +#ifdef __cplusplus +interface ISpContainerLexicon; +#endif /* __cplusplus */ #endif #ifndef __ISpPhoneConverter_FWD_DEFINED__ #define __ISpPhoneConverter_FWD_DEFINED__ typedef interface ISpPhoneConverter ISpPhoneConverter; +#ifdef __cplusplus +interface ISpPhoneConverter; +#endif /* __cplusplus */ #endif #ifndef __ISpVoice_FWD_DEFINED__ #define __ISpVoice_FWD_DEFINED__ typedef interface ISpVoice ISpVoice; +#ifdef __cplusplus +interface ISpVoice; +#endif /* __cplusplus */ #endif #ifndef __ISpPhrase_FWD_DEFINED__ #define __ISpPhrase_FWD_DEFINED__ typedef interface ISpPhrase ISpPhrase; +#ifdef __cplusplus +interface ISpPhrase; +#endif /* __cplusplus */ #endif #ifndef __ISpPhraseAlt_FWD_DEFINED__ #define __ISpPhraseAlt_FWD_DEFINED__ typedef interface ISpPhraseAlt ISpPhraseAlt; +#ifdef __cplusplus +interface ISpPhraseAlt; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoResult_FWD_DEFINED__ #define __ISpRecoResult_FWD_DEFINED__ typedef interface ISpRecoResult ISpRecoResult; +#ifdef __cplusplus +interface ISpRecoResult; +#endif /* __cplusplus */ #endif #ifndef __ISpGrammarBuilder_FWD_DEFINED__ #define __ISpGrammarBuilder_FWD_DEFINED__ typedef interface ISpGrammarBuilder ISpGrammarBuilder; +#ifdef __cplusplus +interface ISpGrammarBuilder; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoGrammar_FWD_DEFINED__ #define __ISpRecoGrammar_FWD_DEFINED__ typedef interface ISpRecoGrammar ISpRecoGrammar; +#ifdef __cplusplus +interface ISpRecoGrammar; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoContext_FWD_DEFINED__ #define __ISpRecoContext_FWD_DEFINED__ typedef interface ISpRecoContext ISpRecoContext; +#ifdef __cplusplus +interface ISpRecoContext; +#endif /* __cplusplus */ #endif #ifndef __ISpProperties_FWD_DEFINED__ #define __ISpProperties_FWD_DEFINED__ typedef interface ISpProperties ISpProperties; +#ifdef __cplusplus +interface ISpProperties; +#endif /* __cplusplus */ #endif #ifndef __ISpRecognizer_FWD_DEFINED__ #define __ISpRecognizer_FWD_DEFINED__ typedef interface ISpRecognizer ISpRecognizer; +#ifdef __cplusplus +interface ISpRecognizer; +#endif /* __cplusplus */ #endif #ifndef __ISpeechDataKey_FWD_DEFINED__ #define __ISpeechDataKey_FWD_DEFINED__ typedef interface ISpeechDataKey ISpeechDataKey; +#ifdef __cplusplus +interface ISpeechDataKey; +#endif /* __cplusplus */ #endif #ifndef __ISpeechObjectToken_FWD_DEFINED__ #define __ISpeechObjectToken_FWD_DEFINED__ typedef interface ISpeechObjectToken ISpeechObjectToken; +#ifdef __cplusplus +interface ISpeechObjectToken; +#endif /* __cplusplus */ #endif #ifndef __ISpeechObjectTokens_FWD_DEFINED__ #define __ISpeechObjectTokens_FWD_DEFINED__ typedef interface ISpeechObjectTokens ISpeechObjectTokens; +#ifdef __cplusplus +interface ISpeechObjectTokens; +#endif /* __cplusplus */ #endif #ifndef __ISpeechObjectTokenCategory_FWD_DEFINED__ #define __ISpeechObjectTokenCategory_FWD_DEFINED__ typedef interface ISpeechObjectTokenCategory ISpeechObjectTokenCategory; +#ifdef __cplusplus +interface ISpeechObjectTokenCategory; +#endif /* __cplusplus */ #endif #ifndef __ISpeechAudioFormat_FWD_DEFINED__ #define __ISpeechAudioFormat_FWD_DEFINED__ typedef interface ISpeechAudioFormat ISpeechAudioFormat; +#ifdef __cplusplus +interface ISpeechAudioFormat; +#endif /* __cplusplus */ #endif #ifndef __ISpeechBaseStream_FWD_DEFINED__ #define __ISpeechBaseStream_FWD_DEFINED__ typedef interface ISpeechBaseStream ISpeechBaseStream; +#ifdef __cplusplus +interface ISpeechBaseStream; +#endif /* __cplusplus */ #endif #ifndef __ISpeechAudio_FWD_DEFINED__ #define __ISpeechAudio_FWD_DEFINED__ typedef interface ISpeechAudio ISpeechAudio; +#ifdef __cplusplus +interface ISpeechAudio; +#endif /* __cplusplus */ #endif #ifndef __ISpeechMMSysAudio_FWD_DEFINED__ #define __ISpeechMMSysAudio_FWD_DEFINED__ typedef interface ISpeechMMSysAudio ISpeechMMSysAudio; +#ifdef __cplusplus +interface ISpeechMMSysAudio; +#endif /* __cplusplus */ #endif #ifndef __ISpeechFileStream_FWD_DEFINED__ #define __ISpeechFileStream_FWD_DEFINED__ typedef interface ISpeechFileStream ISpeechFileStream; +#ifdef __cplusplus +interface ISpeechFileStream; +#endif /* __cplusplus */ #endif #ifndef __ISpeechCustomStream_FWD_DEFINED__ #define __ISpeechCustomStream_FWD_DEFINED__ typedef interface ISpeechCustomStream ISpeechCustomStream; +#ifdef __cplusplus +interface ISpeechCustomStream; +#endif /* __cplusplus */ #endif #ifndef __ISpeechMemoryStream_FWD_DEFINED__ #define __ISpeechMemoryStream_FWD_DEFINED__ typedef interface ISpeechMemoryStream ISpeechMemoryStream; +#ifdef __cplusplus +interface ISpeechMemoryStream; +#endif /* __cplusplus */ #endif #ifndef __ISpeechAudioStatus_FWD_DEFINED__ #define __ISpeechAudioStatus_FWD_DEFINED__ typedef interface ISpeechAudioStatus ISpeechAudioStatus; +#ifdef __cplusplus +interface ISpeechAudioStatus; +#endif /* __cplusplus */ #endif #ifndef __ISpeechAudioBufferInfo_FWD_DEFINED__ #define __ISpeechAudioBufferInfo_FWD_DEFINED__ typedef interface ISpeechAudioBufferInfo ISpeechAudioBufferInfo; +#ifdef __cplusplus +interface ISpeechAudioBufferInfo; +#endif /* __cplusplus */ #endif #ifndef __ISpeechWaveFormatEx_FWD_DEFINED__ #define __ISpeechWaveFormatEx_FWD_DEFINED__ typedef interface ISpeechWaveFormatEx ISpeechWaveFormatEx; +#ifdef __cplusplus +interface ISpeechWaveFormatEx; +#endif /* __cplusplus */ #endif #ifndef __ISpeechVoice_FWD_DEFINED__ #define __ISpeechVoice_FWD_DEFINED__ typedef interface ISpeechVoice ISpeechVoice; +#ifdef __cplusplus +interface ISpeechVoice; +#endif /* __cplusplus */ #endif #ifndef __ISpeechVoiceStatus_FWD_DEFINED__ #define __ISpeechVoiceStatus_FWD_DEFINED__ typedef interface ISpeechVoiceStatus ISpeechVoiceStatus; +#ifdef __cplusplus +interface ISpeechVoiceStatus; +#endif /* __cplusplus */ #endif #ifndef ___ISpeechVoiceEvents_FWD_DEFINED__ #define ___ISpeechVoiceEvents_FWD_DEFINED__ typedef interface _ISpeechVoiceEvents _ISpeechVoiceEvents; +#ifdef __cplusplus +interface _ISpeechVoiceEvents; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecognizer_FWD_DEFINED__ #define __ISpeechRecognizer_FWD_DEFINED__ typedef interface ISpeechRecognizer ISpeechRecognizer; +#ifdef __cplusplus +interface ISpeechRecognizer; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecognizerStatus_FWD_DEFINED__ #define __ISpeechRecognizerStatus_FWD_DEFINED__ typedef interface ISpeechRecognizerStatus ISpeechRecognizerStatus; +#ifdef __cplusplus +interface ISpeechRecognizerStatus; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoContext_FWD_DEFINED__ #define __ISpeechRecoContext_FWD_DEFINED__ typedef interface ISpeechRecoContext ISpeechRecoContext; +#ifdef __cplusplus +interface ISpeechRecoContext; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoGrammar_FWD_DEFINED__ #define __ISpeechRecoGrammar_FWD_DEFINED__ typedef interface ISpeechRecoGrammar ISpeechRecoGrammar; +#ifdef __cplusplus +interface ISpeechRecoGrammar; +#endif /* __cplusplus */ #endif #ifndef ___ISpeechRecoContextEvents_FWD_DEFINED__ #define ___ISpeechRecoContextEvents_FWD_DEFINED__ typedef interface _ISpeechRecoContextEvents _ISpeechRecoContextEvents; +#ifdef __cplusplus +interface _ISpeechRecoContextEvents; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRule_FWD_DEFINED__ #define __ISpeechGrammarRule_FWD_DEFINED__ typedef interface ISpeechGrammarRule ISpeechGrammarRule; +#ifdef __cplusplus +interface ISpeechGrammarRule; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRules_FWD_DEFINED__ #define __ISpeechGrammarRules_FWD_DEFINED__ typedef interface ISpeechGrammarRules ISpeechGrammarRules; +#ifdef __cplusplus +interface ISpeechGrammarRules; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRuleState_FWD_DEFINED__ #define __ISpeechGrammarRuleState_FWD_DEFINED__ typedef interface ISpeechGrammarRuleState ISpeechGrammarRuleState; +#ifdef __cplusplus +interface ISpeechGrammarRuleState; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRuleStateTransitions_FWD_DEFINED__ #define __ISpeechGrammarRuleStateTransitions_FWD_DEFINED__ typedef interface ISpeechGrammarRuleStateTransitions ISpeechGrammarRuleStateTransitions; +#ifdef __cplusplus +interface ISpeechGrammarRuleStateTransitions; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRuleStateTransition_FWD_DEFINED__ #define __ISpeechGrammarRuleStateTransition_FWD_DEFINED__ typedef interface ISpeechGrammarRuleStateTransition ISpeechGrammarRuleStateTransition; +#ifdef __cplusplus +interface ISpeechGrammarRuleStateTransition; +#endif /* __cplusplus */ #endif #ifndef __ISpeechTextSelectionInformation_FWD_DEFINED__ #define __ISpeechTextSelectionInformation_FWD_DEFINED__ typedef interface ISpeechTextSelectionInformation ISpeechTextSelectionInformation; +#ifdef __cplusplus +interface ISpeechTextSelectionInformation; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoResult_FWD_DEFINED__ #define __ISpeechRecoResult_FWD_DEFINED__ typedef interface ISpeechRecoResult ISpeechRecoResult; +#ifdef __cplusplus +interface ISpeechRecoResult; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseInfoBuilder_FWD_DEFINED__ #define __ISpeechPhraseInfoBuilder_FWD_DEFINED__ typedef interface ISpeechPhraseInfoBuilder ISpeechPhraseInfoBuilder; +#ifdef __cplusplus +interface ISpeechPhraseInfoBuilder; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoResultTimes_FWD_DEFINED__ #define __ISpeechRecoResultTimes_FWD_DEFINED__ typedef interface ISpeechRecoResultTimes ISpeechRecoResultTimes; +#ifdef __cplusplus +interface ISpeechRecoResultTimes; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseAlternate_FWD_DEFINED__ #define __ISpeechPhraseAlternate_FWD_DEFINED__ typedef interface ISpeechPhraseAlternate ISpeechPhraseAlternate; +#ifdef __cplusplus +interface ISpeechPhraseAlternate; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseAlternates_FWD_DEFINED__ #define __ISpeechPhraseAlternates_FWD_DEFINED__ typedef interface ISpeechPhraseAlternates ISpeechPhraseAlternates; +#ifdef __cplusplus +interface ISpeechPhraseAlternates; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseInfo_FWD_DEFINED__ #define __ISpeechPhraseInfo_FWD_DEFINED__ typedef interface ISpeechPhraseInfo ISpeechPhraseInfo; +#ifdef __cplusplus +interface ISpeechPhraseInfo; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseElement_FWD_DEFINED__ #define __ISpeechPhraseElement_FWD_DEFINED__ typedef interface ISpeechPhraseElement ISpeechPhraseElement; +#ifdef __cplusplus +interface ISpeechPhraseElement; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseElements_FWD_DEFINED__ #define __ISpeechPhraseElements_FWD_DEFINED__ typedef interface ISpeechPhraseElements ISpeechPhraseElements; +#ifdef __cplusplus +interface ISpeechPhraseElements; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseReplacement_FWD_DEFINED__ #define __ISpeechPhraseReplacement_FWD_DEFINED__ typedef interface ISpeechPhraseReplacement ISpeechPhraseReplacement; +#ifdef __cplusplus +interface ISpeechPhraseReplacement; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseReplacements_FWD_DEFINED__ #define __ISpeechPhraseReplacements_FWD_DEFINED__ typedef interface ISpeechPhraseReplacements ISpeechPhraseReplacements; +#ifdef __cplusplus +interface ISpeechPhraseReplacements; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseProperty_FWD_DEFINED__ #define __ISpeechPhraseProperty_FWD_DEFINED__ typedef interface ISpeechPhraseProperty ISpeechPhraseProperty; +#ifdef __cplusplus +interface ISpeechPhraseProperty; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseProperties_FWD_DEFINED__ #define __ISpeechPhraseProperties_FWD_DEFINED__ typedef interface ISpeechPhraseProperties ISpeechPhraseProperties; +#ifdef __cplusplus +interface ISpeechPhraseProperties; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseRule_FWD_DEFINED__ #define __ISpeechPhraseRule_FWD_DEFINED__ typedef interface ISpeechPhraseRule ISpeechPhraseRule; +#ifdef __cplusplus +interface ISpeechPhraseRule; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseRules_FWD_DEFINED__ #define __ISpeechPhraseRules_FWD_DEFINED__ typedef interface ISpeechPhraseRules ISpeechPhraseRules; +#ifdef __cplusplus +interface ISpeechPhraseRules; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexiconWords_FWD_DEFINED__ #define __ISpeechLexiconWords_FWD_DEFINED__ typedef interface ISpeechLexiconWords ISpeechLexiconWords; +#ifdef __cplusplus +interface ISpeechLexiconWords; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexicon_FWD_DEFINED__ #define __ISpeechLexicon_FWD_DEFINED__ typedef interface ISpeechLexicon ISpeechLexicon; +#ifdef __cplusplus +interface ISpeechLexicon; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexiconWord_FWD_DEFINED__ #define __ISpeechLexiconWord_FWD_DEFINED__ typedef interface ISpeechLexiconWord ISpeechLexiconWord; +#ifdef __cplusplus +interface ISpeechLexiconWord; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexiconPronunciations_FWD_DEFINED__ #define __ISpeechLexiconPronunciations_FWD_DEFINED__ typedef interface ISpeechLexiconPronunciations ISpeechLexiconPronunciations; +#ifdef __cplusplus +interface ISpeechLexiconPronunciations; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexiconPronunciation_FWD_DEFINED__ #define __ISpeechLexiconPronunciation_FWD_DEFINED__ typedef interface ISpeechLexiconPronunciation ISpeechLexiconPronunciation; +#ifdef __cplusplus +interface ISpeechLexiconPronunciation; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhoneConverter_FWD_DEFINED__ #define __ISpeechPhoneConverter_FWD_DEFINED__ typedef interface ISpeechPhoneConverter ISpeechPhoneConverter; +#ifdef __cplusplus +interface ISpeechPhoneConverter; +#endif /* __cplusplus */ #endif #ifndef __SpNotifyTranslator_FWD_DEFINED__ @@ -672,126 +910,201 @@ typedef struct WAVEFORMATEX { #ifndef __ISpNotifySource_FWD_DEFINED__ #define __ISpNotifySource_FWD_DEFINED__ typedef interface ISpNotifySource ISpNotifySource; +#ifdef __cplusplus +interface ISpNotifySource; +#endif /* __cplusplus */ #endif #ifndef __ISpNotifySink_FWD_DEFINED__ #define __ISpNotifySink_FWD_DEFINED__ typedef interface ISpNotifySink ISpNotifySink; +#ifdef __cplusplus +interface ISpNotifySink; +#endif /* __cplusplus */ #endif #ifndef __ISpNotifyTranslator_FWD_DEFINED__ #define __ISpNotifyTranslator_FWD_DEFINED__ typedef interface ISpNotifyTranslator ISpNotifyTranslator; +#ifdef __cplusplus +interface ISpNotifyTranslator; +#endif /* __cplusplus */ #endif #ifndef __ISpDataKey_FWD_DEFINED__ #define __ISpDataKey_FWD_DEFINED__ typedef interface ISpDataKey ISpDataKey; +#ifdef __cplusplus +interface ISpDataKey; +#endif /* __cplusplus */ #endif #ifndef __ISpObjectTokenCategory_FWD_DEFINED__ #define __ISpObjectTokenCategory_FWD_DEFINED__ typedef interface ISpObjectTokenCategory ISpObjectTokenCategory; +#ifdef __cplusplus +interface ISpObjectTokenCategory; +#endif /* __cplusplus */ #endif #ifndef __ISpObjectToken_FWD_DEFINED__ #define __ISpObjectToken_FWD_DEFINED__ typedef interface ISpObjectToken ISpObjectToken; +#ifdef __cplusplus +interface ISpObjectToken; +#endif /* __cplusplus */ #endif #ifndef __IEnumSpObjectTokens_FWD_DEFINED__ #define __IEnumSpObjectTokens_FWD_DEFINED__ typedef interface IEnumSpObjectTokens IEnumSpObjectTokens; +#ifdef __cplusplus +interface IEnumSpObjectTokens; +#endif /* __cplusplus */ #endif #ifndef __ISpObjectWithToken_FWD_DEFINED__ #define __ISpObjectWithToken_FWD_DEFINED__ typedef interface ISpObjectWithToken ISpObjectWithToken; +#ifdef __cplusplus +interface ISpObjectWithToken; +#endif /* __cplusplus */ #endif #ifndef __ISpResourceManager_FWD_DEFINED__ #define __ISpResourceManager_FWD_DEFINED__ typedef interface ISpResourceManager ISpResourceManager; +#ifdef __cplusplus +interface ISpResourceManager; +#endif /* __cplusplus */ #endif #ifndef __ISpEventSource_FWD_DEFINED__ #define __ISpEventSource_FWD_DEFINED__ typedef interface ISpEventSource ISpEventSource; +#ifdef __cplusplus +interface ISpEventSource; +#endif /* __cplusplus */ #endif #ifndef __ISpEventSink_FWD_DEFINED__ #define __ISpEventSink_FWD_DEFINED__ typedef interface ISpEventSink ISpEventSink; +#ifdef __cplusplus +interface ISpEventSink; +#endif /* __cplusplus */ #endif #ifndef __ISpStreamFormat_FWD_DEFINED__ #define __ISpStreamFormat_FWD_DEFINED__ typedef interface ISpStreamFormat ISpStreamFormat; +#ifdef __cplusplus +interface ISpStreamFormat; +#endif /* __cplusplus */ #endif #ifndef __ISpStream_FWD_DEFINED__ #define __ISpStream_FWD_DEFINED__ typedef interface ISpStream ISpStream; +#ifdef __cplusplus +interface ISpStream; +#endif /* __cplusplus */ #endif #ifndef __ISpStreamFormatConverter_FWD_DEFINED__ #define __ISpStreamFormatConverter_FWD_DEFINED__ typedef interface ISpStreamFormatConverter ISpStreamFormatConverter; +#ifdef __cplusplus +interface ISpStreamFormatConverter; +#endif /* __cplusplus */ #endif #ifndef __ISpAudio_FWD_DEFINED__ #define __ISpAudio_FWD_DEFINED__ typedef interface ISpAudio ISpAudio; +#ifdef __cplusplus +interface ISpAudio; +#endif /* __cplusplus */ #endif #ifndef __ISpMMSysAudio_FWD_DEFINED__ #define __ISpMMSysAudio_FWD_DEFINED__ typedef interface ISpMMSysAudio ISpMMSysAudio; +#ifdef __cplusplus +interface ISpMMSysAudio; +#endif /* __cplusplus */ #endif #ifndef __ISpTranscript_FWD_DEFINED__ #define __ISpTranscript_FWD_DEFINED__ typedef interface ISpTranscript ISpTranscript; +#ifdef __cplusplus +interface ISpTranscript; +#endif /* __cplusplus */ #endif #ifndef __ISpVoice_FWD_DEFINED__ #define __ISpVoice_FWD_DEFINED__ typedef interface ISpVoice ISpVoice; +#ifdef __cplusplus +interface ISpVoice; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoResult_FWD_DEFINED__ #define __ISpRecoResult_FWD_DEFINED__ typedef interface ISpRecoResult ISpRecoResult; +#ifdef __cplusplus +interface ISpRecoResult; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoContext_FWD_DEFINED__ #define __ISpRecoContext_FWD_DEFINED__ typedef interface ISpRecoContext ISpRecoContext; +#ifdef __cplusplus +interface ISpRecoContext; +#endif /* __cplusplus */ #endif #ifndef __ISpRecognizer_FWD_DEFINED__ #define __ISpRecognizer_FWD_DEFINED__ typedef interface ISpRecognizer ISpRecognizer; +#ifdef __cplusplus +interface ISpRecognizer; +#endif /* __cplusplus */ #endif #ifndef __ISpProperties_FWD_DEFINED__ #define __ISpProperties_FWD_DEFINED__ typedef interface ISpProperties ISpProperties; +#ifdef __cplusplus +interface ISpProperties; +#endif /* __cplusplus */ #endif #ifndef __ISpLexicon_FWD_DEFINED__ #define __ISpLexicon_FWD_DEFINED__ typedef interface ISpLexicon ISpLexicon; +#ifdef __cplusplus +interface ISpLexicon; +#endif /* __cplusplus */ #endif #ifndef __ISpPhoneConverter_FWD_DEFINED__ #define __ISpPhoneConverter_FWD_DEFINED__ typedef interface ISpPhoneConverter ISpPhoneConverter; +#ifdef __cplusplus +interface ISpPhoneConverter; +#endif /* __cplusplus */ #endif #ifndef __ISpPhrase_FWD_DEFINED__ #define __ISpPhrase_FWD_DEFINED__ typedef interface ISpPhrase ISpPhrase; +#ifdef __cplusplus +interface ISpPhrase; +#endif /* __cplusplus */ #endif typedef enum SPDATAKEYLOCATION { @@ -1151,52 +1464,53 @@ typedef struct ISpNotifySourceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpNotifySource* This, + ISpNotifySource *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpNotifySource* This); + ISpNotifySource *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpNotifySource* This); + ISpNotifySource *This); /*** ISpNotifySource methods ***/ HRESULT (STDMETHODCALLTYPE *SetNotifySink)( - ISpNotifySource* This, + ISpNotifySource *This, ISpNotifySink *pNotifySink); HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)( - ISpNotifySource* This, + ISpNotifySource *This, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)( - ISpNotifySource* This, + ISpNotifySource *This, SPNOTIFYCALLBACK *pfnCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)( - ISpNotifySource* This, + ISpNotifySource *This, ISpNotifyCallback *pSpCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)( - ISpNotifySource* This); + ISpNotifySource *This); HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)( - ISpNotifySource* This, + ISpNotifySource *This, DWORD dwMilliseconds); HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)( - ISpNotifySource* This); + ISpNotifySource *This); END_INTERFACE } ISpNotifySourceVtbl; + interface ISpNotifySource { CONST_VTBL ISpNotifySourceVtbl* lpVtbl; }; @@ -1253,14 +1567,6 @@ static FORCEINLINE HANDLE ISpNotifySource_GetNotifyEventHandle(ISpNotifySource* #endif -HRESULT STDMETHODCALLTYPE ISpNotifySource_SetNotifySink_Proxy( - ISpNotifySource* This, - ISpNotifySink *pNotifySink); -void __RPC_STUB ISpNotifySource_SetNotifySink_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpNotifySource_INTERFACE_DEFINED__ */ @@ -1288,22 +1594,23 @@ typedef struct ISpNotifySinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpNotifySink* This, + ISpNotifySink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpNotifySink* This); + ISpNotifySink *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpNotifySink* This); + ISpNotifySink *This); /*** ISpNotifySink methods ***/ HRESULT (STDMETHODCALLTYPE *Notify)( - ISpNotifySink* This); + ISpNotifySink *This); END_INTERFACE } ISpNotifySinkVtbl; + interface ISpNotifySink { CONST_VTBL ISpNotifySinkVtbl* lpVtbl; }; @@ -1336,13 +1643,6 @@ static FORCEINLINE HRESULT ISpNotifySink_Notify(ISpNotifySink* This) { #endif -HRESULT STDMETHODCALLTYPE ISpNotifySink_Notify_Proxy( - ISpNotifySink* This); -void __RPC_STUB ISpNotifySink_Notify_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpNotifySink_INTERFACE_DEFINED__ */ @@ -1393,54 +1693,55 @@ typedef struct ISpNotifyTranslatorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpNotifyTranslator* This, + ISpNotifyTranslator *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpNotifyTranslator* This); + ISpNotifyTranslator *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpNotifyTranslator* This); + ISpNotifyTranslator *This); /*** ISpNotifySink methods ***/ HRESULT (STDMETHODCALLTYPE *Notify)( - ISpNotifyTranslator* This); + ISpNotifyTranslator *This); /*** ISpNotifyTranslator methods ***/ HRESULT (STDMETHODCALLTYPE *InitWindowMessage)( - ISpNotifyTranslator* This, + ISpNotifyTranslator *This, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *InitCallback)( - ISpNotifyTranslator* This, + ISpNotifyTranslator *This, SPNOTIFYCALLBACK *pfnCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *InitSpNotifyCallback)( - ISpNotifyTranslator* This, + ISpNotifyTranslator *This, ISpNotifyCallback *pSpCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *InitWin32Event)( - ISpNotifyTranslator* This, + ISpNotifyTranslator *This, HANDLE hEvent, WINBOOL fCloseHandleOnRelease); HRESULT (STDMETHODCALLTYPE *Wait)( - ISpNotifyTranslator* This, + ISpNotifyTranslator *This, DWORD dwMilliseconds); HANDLE (STDMETHODCALLTYPE *GetEventHandle)( - ISpNotifyTranslator* This); + ISpNotifyTranslator *This); END_INTERFACE } ISpNotifyTranslatorVtbl; + interface ISpNotifyTranslator { CONST_VTBL ISpNotifyTranslatorVtbl* lpVtbl; }; @@ -1499,61 +1800,6 @@ static FORCEINLINE HANDLE ISpNotifyTranslator_GetEventHandle(ISpNotifyTranslator #endif -HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_InitWindowMessage_Proxy( - ISpNotifyTranslator* This, - HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam); -void __RPC_STUB ISpNotifyTranslator_InitWindowMessage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_InitCallback_Proxy( - ISpNotifyTranslator* This, - SPNOTIFYCALLBACK *pfnCallback, - WPARAM wParam, - LPARAM lParam); -void __RPC_STUB ISpNotifyTranslator_InitCallback_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_InitSpNotifyCallback_Proxy( - ISpNotifyTranslator* This, - ISpNotifyCallback *pSpCallback, - WPARAM wParam, - LPARAM lParam); -void __RPC_STUB ISpNotifyTranslator_InitSpNotifyCallback_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_InitWin32Event_Proxy( - ISpNotifyTranslator* This, - HANDLE hEvent, - WINBOOL fCloseHandleOnRelease); -void __RPC_STUB ISpNotifyTranslator_InitWin32Event_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_Wait_Proxy( - ISpNotifyTranslator* This, - DWORD dwMilliseconds); -void __RPC_STUB ISpNotifyTranslator_Wait_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HANDLE STDMETHODCALLTYPE ISpNotifyTranslator_GetEventHandle_Proxy( - ISpNotifyTranslator* This); -void __RPC_STUB ISpNotifyTranslator_GetEventHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpNotifyTranslator_INTERFACE_DEFINED__ */ @@ -1626,79 +1872,80 @@ typedef struct ISpDataKeyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpDataKey* This, + ISpDataKey *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpDataKey* This); + ISpDataKey *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpDataKey* This); + ISpDataKey *This); /*** ISpDataKey methods ***/ HRESULT (STDMETHODCALLTYPE *SetData)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszValueName, ULONG cbData, const BYTE *pData); HRESULT (STDMETHODCALLTYPE *GetData)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszValueName, ULONG *pcbData, BYTE *pData); HRESULT (STDMETHODCALLTYPE *SetStringValue)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszValueName, LPCWSTR pszValue); HRESULT (STDMETHODCALLTYPE *GetStringValue)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszValueName, LPWSTR *ppszValue); HRESULT (STDMETHODCALLTYPE *SetDWORD)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszValueName, DWORD dwValue); HRESULT (STDMETHODCALLTYPE *GetDWORD)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszValueName, DWORD *pdwValue); HRESULT (STDMETHODCALLTYPE *OpenKey)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszSubKeyName, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *CreateKey)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszSubKey, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *DeleteKey)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszSubKey); HRESULT (STDMETHODCALLTYPE *DeleteValue)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszValueName); HRESULT (STDMETHODCALLTYPE *EnumKeys)( - ISpDataKey* This, + ISpDataKey *This, ULONG Index, LPWSTR *ppszSubKeyName); HRESULT (STDMETHODCALLTYPE *EnumValues)( - ISpDataKey* This, + ISpDataKey *This, ULONG Index, LPWSTR *ppszValueName); END_INTERFACE } ISpDataKeyVtbl; + interface ISpDataKey { CONST_VTBL ISpDataKeyVtbl* lpVtbl; }; @@ -1775,114 +2022,6 @@ static FORCEINLINE HRESULT ISpDataKey_EnumValues(ISpDataKey* This,ULONG Index,LP #endif -HRESULT STDMETHODCALLTYPE ISpDataKey_SetData_Proxy( - ISpDataKey* This, - LPCWSTR pszValueName, - ULONG cbData, - const BYTE *pData); -void __RPC_STUB ISpDataKey_SetData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_GetData_Proxy( - ISpDataKey* This, - LPCWSTR pszValueName, - ULONG *pcbData, - BYTE *pData); -void __RPC_STUB ISpDataKey_GetData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_SetStringValue_Proxy( - ISpDataKey* This, - LPCWSTR pszValueName, - LPCWSTR pszValue); -void __RPC_STUB ISpDataKey_SetStringValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_GetStringValue_Proxy( - ISpDataKey* This, - LPCWSTR pszValueName, - LPWSTR *ppszValue); -void __RPC_STUB ISpDataKey_GetStringValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_SetDWORD_Proxy( - ISpDataKey* This, - LPCWSTR pszValueName, - DWORD dwValue); -void __RPC_STUB ISpDataKey_SetDWORD_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_GetDWORD_Proxy( - ISpDataKey* This, - LPCWSTR pszValueName, - DWORD *pdwValue); -void __RPC_STUB ISpDataKey_GetDWORD_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_OpenKey_Proxy( - ISpDataKey* This, - LPCWSTR pszSubKeyName, - ISpDataKey **ppSubKey); -void __RPC_STUB ISpDataKey_OpenKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_CreateKey_Proxy( - ISpDataKey* This, - LPCWSTR pszSubKey, - ISpDataKey **ppSubKey); -void __RPC_STUB ISpDataKey_CreateKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_DeleteKey_Proxy( - ISpDataKey* This, - LPCWSTR pszSubKey); -void __RPC_STUB ISpDataKey_DeleteKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_DeleteValue_Proxy( - ISpDataKey* This, - LPCWSTR pszValueName); -void __RPC_STUB ISpDataKey_DeleteValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_EnumKeys_Proxy( - ISpDataKey* This, - ULONG Index, - LPWSTR *ppszSubKeyName); -void __RPC_STUB ISpDataKey_EnumKeys_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_EnumValues_Proxy( - ISpDataKey* This, - ULONG Index, - LPWSTR *ppszValueName); -void __RPC_STUB ISpDataKey_EnumValues_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpDataKey_INTERFACE_DEFINED__ */ @@ -1913,27 +2052,28 @@ typedef struct ISpObjectWithTokenVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpObjectWithToken* This, + ISpObjectWithToken *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpObjectWithToken* This); + ISpObjectWithToken *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpObjectWithToken* This); + ISpObjectWithToken *This); /*** ISpObjectWithToken methods ***/ HRESULT (STDMETHODCALLTYPE *SetObjectToken)( - ISpObjectWithToken* This, + ISpObjectWithToken *This, ISpObjectToken *pToken); HRESULT (STDMETHODCALLTYPE *GetObjectToken)( - ISpObjectWithToken* This, + ISpObjectWithToken *This, ISpObjectToken **ppToken); END_INTERFACE } ISpObjectWithTokenVtbl; + interface ISpObjectWithToken { CONST_VTBL ISpObjectWithTokenVtbl* lpVtbl; }; @@ -1970,22 +2110,6 @@ static FORCEINLINE HRESULT ISpObjectWithToken_GetObjectToken(ISpObjectWithToken* #endif -HRESULT STDMETHODCALLTYPE ISpObjectWithToken_SetObjectToken_Proxy( - ISpObjectWithToken* This, - ISpObjectToken *pToken); -void __RPC_STUB ISpObjectWithToken_SetObjectToken_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectWithToken_GetObjectToken_Proxy( - ISpObjectWithToken* This, - ISpObjectToken **ppToken); -void __RPC_STUB ISpObjectWithToken_GetObjectToken_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpObjectWithToken_INTERFACE_DEFINED__ */ @@ -2031,45 +2155,46 @@ typedef struct IEnumSpObjectTokensVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumSpObjectTokens* This, + IEnumSpObjectTokens *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumSpObjectTokens* This); + IEnumSpObjectTokens *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumSpObjectTokens* This); + IEnumSpObjectTokens *This); /*** IEnumSpObjectTokens methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumSpObjectTokens* This, + IEnumSpObjectTokens *This, ULONG celt, ISpObjectToken **pelt, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumSpObjectTokens* This, + IEnumSpObjectTokens *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumSpObjectTokens* This); + IEnumSpObjectTokens *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumSpObjectTokens* This, + IEnumSpObjectTokens *This, IEnumSpObjectTokens **ppEnum); HRESULT (STDMETHODCALLTYPE *Item)( - IEnumSpObjectTokens* This, + IEnumSpObjectTokens *This, ULONG Index, ISpObjectToken **ppToken); HRESULT (STDMETHODCALLTYPE *GetCount)( - IEnumSpObjectTokens* This, + IEnumSpObjectTokens *This, ULONG *pCount); END_INTERFACE } IEnumSpObjectTokensVtbl; + interface IEnumSpObjectTokens { CONST_VTBL IEnumSpObjectTokensVtbl* lpVtbl; }; @@ -2122,56 +2247,6 @@ static FORCEINLINE HRESULT IEnumSpObjectTokens_GetCount(IEnumSpObjectTokens* Thi #endif -HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Next_Proxy( - IEnumSpObjectTokens* This, - ULONG celt, - ISpObjectToken **pelt, - ULONG *pceltFetched); -void __RPC_STUB IEnumSpObjectTokens_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Skip_Proxy( - IEnumSpObjectTokens* This, - ULONG celt); -void __RPC_STUB IEnumSpObjectTokens_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Reset_Proxy( - IEnumSpObjectTokens* This); -void __RPC_STUB IEnumSpObjectTokens_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Clone_Proxy( - IEnumSpObjectTokens* This, - IEnumSpObjectTokens **ppEnum); -void __RPC_STUB IEnumSpObjectTokens_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Item_Proxy( - IEnumSpObjectTokens* This, - ULONG Index, - ISpObjectToken **ppToken); -void __RPC_STUB IEnumSpObjectTokens_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_GetCount_Proxy( - IEnumSpObjectTokens* This, - ULONG *pCount); -void __RPC_STUB IEnumSpObjectTokens_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumSpObjectTokens_INTERFACE_DEFINED__ */ @@ -2200,85 +2275,86 @@ typedef struct ISpRegDataKeyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRegDataKey* This, + ISpRegDataKey *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRegDataKey* This); + ISpRegDataKey *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRegDataKey* This); + ISpRegDataKey *This); /*** ISpDataKey methods ***/ HRESULT (STDMETHODCALLTYPE *SetData)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszValueName, ULONG cbData, const BYTE *pData); HRESULT (STDMETHODCALLTYPE *GetData)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszValueName, ULONG *pcbData, BYTE *pData); HRESULT (STDMETHODCALLTYPE *SetStringValue)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszValueName, LPCWSTR pszValue); HRESULT (STDMETHODCALLTYPE *GetStringValue)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszValueName, LPWSTR *ppszValue); HRESULT (STDMETHODCALLTYPE *SetDWORD)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszValueName, DWORD dwValue); HRESULT (STDMETHODCALLTYPE *GetDWORD)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszValueName, DWORD *pdwValue); HRESULT (STDMETHODCALLTYPE *OpenKey)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszSubKeyName, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *CreateKey)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszSubKey, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *DeleteKey)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszSubKey); HRESULT (STDMETHODCALLTYPE *DeleteValue)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszValueName); HRESULT (STDMETHODCALLTYPE *EnumKeys)( - ISpRegDataKey* This, + ISpRegDataKey *This, ULONG Index, LPWSTR *ppszSubKeyName); HRESULT (STDMETHODCALLTYPE *EnumValues)( - ISpRegDataKey* This, + ISpRegDataKey *This, ULONG Index, LPWSTR *ppszValueName); /*** ISpRegDataKey methods ***/ HRESULT (STDMETHODCALLTYPE *SetKey)( - ISpRegDataKey* This, + ISpRegDataKey *This, HKEY hkey, WINBOOL fReadOnly); END_INTERFACE } ISpRegDataKeyVtbl; + interface ISpRegDataKey { CONST_VTBL ISpRegDataKeyVtbl* lpVtbl; }; @@ -2407,108 +2483,109 @@ typedef struct ISpObjectTokenCategoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpObjectTokenCategory* This); + ISpObjectTokenCategory *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpObjectTokenCategory* This); + ISpObjectTokenCategory *This); /*** ISpDataKey methods ***/ HRESULT (STDMETHODCALLTYPE *SetData)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszValueName, ULONG cbData, const BYTE *pData); HRESULT (STDMETHODCALLTYPE *GetData)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszValueName, ULONG *pcbData, BYTE *pData); HRESULT (STDMETHODCALLTYPE *SetStringValue)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszValueName, LPCWSTR pszValue); HRESULT (STDMETHODCALLTYPE *GetStringValue)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszValueName, LPWSTR *ppszValue); HRESULT (STDMETHODCALLTYPE *SetDWORD)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszValueName, DWORD dwValue); HRESULT (STDMETHODCALLTYPE *GetDWORD)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszValueName, DWORD *pdwValue); HRESULT (STDMETHODCALLTYPE *OpenKey)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszSubKeyName, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *CreateKey)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszSubKey, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *DeleteKey)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszSubKey); HRESULT (STDMETHODCALLTYPE *DeleteValue)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszValueName); HRESULT (STDMETHODCALLTYPE *EnumKeys)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, ULONG Index, LPWSTR *ppszSubKeyName); HRESULT (STDMETHODCALLTYPE *EnumValues)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, ULONG Index, LPWSTR *ppszValueName); /*** ISpObjectTokenCategory methods ***/ HRESULT (STDMETHODCALLTYPE *SetId)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszCategoryId, WINBOOL fCreateIfNotExist); HRESULT (STDMETHODCALLTYPE *GetId)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPWSTR *ppszCoMemCategoryId); HRESULT (STDMETHODCALLTYPE *GetDataKey)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, SPDATAKEYLOCATION spdkl, ISpDataKey **ppDataKey); HRESULT (STDMETHODCALLTYPE *EnumTokens)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pzsReqAttribs, LPCWSTR pszOptAttribs, IEnumSpObjectTokens **ppEnum); HRESULT (STDMETHODCALLTYPE *SetDefaultTokenId)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszTokenId); HRESULT (STDMETHODCALLTYPE *GetDefaultTokenId)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPWSTR *ppszCoMemTokenId); END_INTERFACE } ISpObjectTokenCategoryVtbl; + interface ISpObjectTokenCategory { CONST_VTBL ISpObjectTokenCategoryVtbl* lpVtbl; }; @@ -2611,58 +2688,6 @@ static FORCEINLINE HRESULT ISpObjectTokenCategory_GetDefaultTokenId(ISpObjectTok #endif -HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_SetId_Proxy( - ISpObjectTokenCategory* This, - LPCWSTR pszCategoryId, - WINBOOL fCreateIfNotExist); -void __RPC_STUB ISpObjectTokenCategory_SetId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_GetId_Proxy( - ISpObjectTokenCategory* This, - LPWSTR *ppszCoMemCategoryId); -void __RPC_STUB ISpObjectTokenCategory_GetId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_GetDataKey_Proxy( - ISpObjectTokenCategory* This, - SPDATAKEYLOCATION spdkl, - ISpDataKey **ppDataKey); -void __RPC_STUB ISpObjectTokenCategory_GetDataKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_EnumTokens_Proxy( - ISpObjectTokenCategory* This, - LPCWSTR pzsReqAttribs, - LPCWSTR pszOptAttribs, - IEnumSpObjectTokens **ppEnum); -void __RPC_STUB ISpObjectTokenCategory_EnumTokens_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_SetDefaultTokenId_Proxy( - ISpObjectTokenCategory* This, - LPCWSTR pszTokenId); -void __RPC_STUB ISpObjectTokenCategory_SetDefaultTokenId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_GetDefaultTokenId_Proxy( - ISpObjectTokenCategory* This, - LPWSTR *ppszCoMemTokenId); -void __RPC_STUB ISpObjectTokenCategory_GetDefaultTokenId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpObjectTokenCategory_INTERFACE_DEFINED__ */ @@ -2738,101 +2763,101 @@ typedef struct ISpObjectTokenVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpObjectToken* This, + ISpObjectToken *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpObjectToken* This); + ISpObjectToken *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpObjectToken* This); + ISpObjectToken *This); /*** ISpDataKey methods ***/ HRESULT (STDMETHODCALLTYPE *SetData)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszValueName, ULONG cbData, const BYTE *pData); HRESULT (STDMETHODCALLTYPE *GetData)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszValueName, ULONG *pcbData, BYTE *pData); HRESULT (STDMETHODCALLTYPE *SetStringValue)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszValueName, LPCWSTR pszValue); HRESULT (STDMETHODCALLTYPE *GetStringValue)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszValueName, LPWSTR *ppszValue); HRESULT (STDMETHODCALLTYPE *SetDWORD)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszValueName, DWORD dwValue); HRESULT (STDMETHODCALLTYPE *GetDWORD)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszValueName, DWORD *pdwValue); HRESULT (STDMETHODCALLTYPE *OpenKey)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszSubKeyName, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *CreateKey)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszSubKey, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *DeleteKey)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszSubKey); HRESULT (STDMETHODCALLTYPE *DeleteValue)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszValueName); HRESULT (STDMETHODCALLTYPE *EnumKeys)( - ISpObjectToken* This, + ISpObjectToken *This, ULONG Index, LPWSTR *ppszSubKeyName); HRESULT (STDMETHODCALLTYPE *EnumValues)( - ISpObjectToken* This, + ISpObjectToken *This, ULONG Index, LPWSTR *ppszValueName); /*** ISpObjectToken methods ***/ HRESULT (STDMETHODCALLTYPE *SetId)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszCategoryId, LPCWSTR pszTokenId, WINBOOL fCreateIfNotExist); HRESULT (STDMETHODCALLTYPE *GetId)( - ISpObjectToken* This, + ISpObjectToken *This, LPWSTR *ppszCoMemTokenId); HRESULT (STDMETHODCALLTYPE *GetCategory)( - ISpObjectToken* This, + ISpObjectToken *This, ISpObjectTokenCategory **ppTokenCategory); HRESULT (STDMETHODCALLTYPE *CreateInstance)( - ISpObjectToken* This, + ISpObjectToken *This, IUnknown *pUnkOuter, DWORD dwClsContext, REFIID riid, void **ppvObject); HRESULT (STDMETHODCALLTYPE *GetStorageFileName)( - ISpObjectToken* This, + ISpObjectToken *This, REFCLSID clsidCaller, LPCWSTR pszValueName, LPCWSTR pszFileNameSpecifier, @@ -2840,17 +2865,17 @@ typedef struct ISpObjectTokenVtbl { LPWSTR *ppszFilePath); HRESULT (STDMETHODCALLTYPE *RemoveStorageFileName)( - ISpObjectToken* This, + ISpObjectToken *This, REFCLSID clsidCaller, LPCWSTR pszKeyName, WINBOOL fDeleteFile); HRESULT (STDMETHODCALLTYPE *Remove)( - ISpObjectToken* This, + ISpObjectToken *This, const CLSID *pclsidCaller); HRESULT (STDMETHODCALLTYPE *IsUISupported)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszTypeOfUI, void *pvExtraData, ULONG cbExtraData, @@ -2858,7 +2883,7 @@ typedef struct ISpObjectTokenVtbl { WINBOOL *pfSupported); HRESULT (STDMETHODCALLTYPE *DisplayUI)( - ISpObjectToken* This, + ISpObjectToken *This, HWND hwndParent, LPCWSTR pszTitle, LPCWSTR pszTypeOfUI, @@ -2867,12 +2892,13 @@ typedef struct ISpObjectTokenVtbl { IUnknown *punkObject); HRESULT (STDMETHODCALLTYPE *MatchesAttributes)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszAttributes, WINBOOL *pfMatches); END_INTERFACE } ISpObjectTokenVtbl; + interface ISpObjectToken { CONST_VTBL ISpObjectTokenVtbl* lpVtbl; }; @@ -2991,82 +3017,6 @@ static FORCEINLINE HRESULT ISpObjectToken_MatchesAttributes(ISpObjectToken* This #endif -HRESULT STDMETHODCALLTYPE ISpObjectToken_SetId_Proxy( - ISpObjectToken* This, - LPCWSTR pszCategoryId, - LPCWSTR pszTokenId, - WINBOOL fCreateIfNotExist); -void __RPC_STUB ISpObjectToken_SetId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectToken_GetId_Proxy( - ISpObjectToken* This, - LPWSTR *ppszCoMemTokenId); -void __RPC_STUB ISpObjectToken_GetId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectToken_GetCategory_Proxy( - ISpObjectToken* This, - ISpObjectTokenCategory **ppTokenCategory); -void __RPC_STUB ISpObjectToken_GetCategory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectToken_CreateInstance_Proxy( - ISpObjectToken* This, - IUnknown *pUnkOuter, - DWORD dwClsContext, - REFIID riid, - void **ppvObject); -void __RPC_STUB ISpObjectToken_CreateInstance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectToken_GetStorageFileName_Proxy( - ISpObjectToken* This, - REFCLSID clsidCaller, - LPCWSTR pszValueName, - LPCWSTR pszFileNameSpecifier, - ULONG nFolder, - LPWSTR *ppszFilePath); -void __RPC_STUB ISpObjectToken_GetStorageFileName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectToken_RemoveStorageFileName_Proxy( - ISpObjectToken* This, - REFCLSID clsidCaller, - LPCWSTR pszKeyName, - WINBOOL fDeleteFile); -void __RPC_STUB ISpObjectToken_RemoveStorageFileName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectToken_Remove_Proxy( - ISpObjectToken* This, - const CLSID *pclsidCaller); -void __RPC_STUB ISpObjectToken_Remove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectToken_MatchesAttributes_Proxy( - ISpObjectToken* This, - LPCWSTR pszAttributes, - WINBOOL *pfMatches); -void __RPC_STUB ISpObjectToken_MatchesAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpObjectToken_INTERFACE_DEFINED__ */ @@ -3096,101 +3046,101 @@ typedef struct ISpObjectTokenInitVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpObjectTokenInit* This); + ISpObjectTokenInit *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpObjectTokenInit* This); + ISpObjectTokenInit *This); /*** ISpDataKey methods ***/ HRESULT (STDMETHODCALLTYPE *SetData)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszValueName, ULONG cbData, const BYTE *pData); HRESULT (STDMETHODCALLTYPE *GetData)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszValueName, ULONG *pcbData, BYTE *pData); HRESULT (STDMETHODCALLTYPE *SetStringValue)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszValueName, LPCWSTR pszValue); HRESULT (STDMETHODCALLTYPE *GetStringValue)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszValueName, LPWSTR *ppszValue); HRESULT (STDMETHODCALLTYPE *SetDWORD)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszValueName, DWORD dwValue); HRESULT (STDMETHODCALLTYPE *GetDWORD)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszValueName, DWORD *pdwValue); HRESULT (STDMETHODCALLTYPE *OpenKey)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszSubKeyName, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *CreateKey)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszSubKey, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *DeleteKey)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszSubKey); HRESULT (STDMETHODCALLTYPE *DeleteValue)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszValueName); HRESULT (STDMETHODCALLTYPE *EnumKeys)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, ULONG Index, LPWSTR *ppszSubKeyName); HRESULT (STDMETHODCALLTYPE *EnumValues)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, ULONG Index, LPWSTR *ppszValueName); /*** ISpObjectToken methods ***/ HRESULT (STDMETHODCALLTYPE *SetId)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszCategoryId, LPCWSTR pszTokenId, WINBOOL fCreateIfNotExist); HRESULT (STDMETHODCALLTYPE *GetId)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPWSTR *ppszCoMemTokenId); HRESULT (STDMETHODCALLTYPE *GetCategory)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, ISpObjectTokenCategory **ppTokenCategory); HRESULT (STDMETHODCALLTYPE *CreateInstance)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, IUnknown *pUnkOuter, DWORD dwClsContext, REFIID riid, void **ppvObject); HRESULT (STDMETHODCALLTYPE *GetStorageFileName)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, REFCLSID clsidCaller, LPCWSTR pszValueName, LPCWSTR pszFileNameSpecifier, @@ -3198,17 +3148,17 @@ typedef struct ISpObjectTokenInitVtbl { LPWSTR *ppszFilePath); HRESULT (STDMETHODCALLTYPE *RemoveStorageFileName)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, REFCLSID clsidCaller, LPCWSTR pszKeyName, WINBOOL fDeleteFile); HRESULT (STDMETHODCALLTYPE *Remove)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, const CLSID *pclsidCaller); HRESULT (STDMETHODCALLTYPE *IsUISupported)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszTypeOfUI, void *pvExtraData, ULONG cbExtraData, @@ -3216,7 +3166,7 @@ typedef struct ISpObjectTokenInitVtbl { WINBOOL *pfSupported); HRESULT (STDMETHODCALLTYPE *DisplayUI)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, HWND hwndParent, LPCWSTR pszTitle, LPCWSTR pszTypeOfUI, @@ -3225,19 +3175,20 @@ typedef struct ISpObjectTokenInitVtbl { IUnknown *punkObject); HRESULT (STDMETHODCALLTYPE *MatchesAttributes)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszAttributes, WINBOOL *pfMatches); /*** ISpObjectTokenInit methods ***/ HRESULT (STDMETHODCALLTYPE *InitFromDataKey)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszCategoryId, LPCWSTR pszTokenId, ISpDataKey *pDataKey); END_INTERFACE } ISpObjectTokenInitVtbl; + interface ISpObjectTokenInit { CONST_VTBL ISpObjectTokenInitVtbl* lpVtbl; }; @@ -3362,16 +3313,6 @@ static FORCEINLINE HRESULT ISpObjectTokenInit_InitFromDataKey(ISpObjectTokenInit #endif -HRESULT STDMETHODCALLTYPE ISpObjectTokenInit_InitFromDataKey_Proxy( - ISpObjectTokenInit* This, - LPCWSTR pszCategoryId, - LPCWSTR pszTokenId, - ISpDataKey *pDataKey); -void __RPC_STUB ISpObjectTokenInit_InitFromDataKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpObjectTokenInit_INTERFACE_DEFINED__ */ @@ -3407,31 +3348,31 @@ typedef struct ISpResourceManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpResourceManager* This, + ISpResourceManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpResourceManager* This); + ISpResourceManager *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpResourceManager* This); + ISpResourceManager *This); /*** IServiceProvider methods ***/ HRESULT (STDMETHODCALLTYPE *QueryService)( - ISpResourceManager* This, + ISpResourceManager *This, REFGUID guidService, REFIID riid, void **ppvObject); /*** ISpResourceManager methods ***/ HRESULT (STDMETHODCALLTYPE *SetObject)( - ISpResourceManager* This, + ISpResourceManager *This, REFGUID guidServiceId, IUnknown *pUnkObject); HRESULT (STDMETHODCALLTYPE *GetObject)( - ISpResourceManager* This, + ISpResourceManager *This, REFGUID guidServiceId, REFCLSID ObjectCLSID, REFIID ObjectIID, @@ -3440,6 +3381,7 @@ typedef struct ISpResourceManagerVtbl { END_INTERFACE } ISpResourceManagerVtbl; + interface ISpResourceManager { CONST_VTBL ISpResourceManagerVtbl* lpVtbl; }; @@ -3482,27 +3424,6 @@ static FORCEINLINE HRESULT ISpResourceManager_GetObject(ISpResourceManager* This #endif -HRESULT STDMETHODCALLTYPE ISpResourceManager_SetObject_Proxy( - ISpResourceManager* This, - REFGUID guidServiceId, - IUnknown *pUnkObject); -void __RPC_STUB ISpResourceManager_SetObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpResourceManager_GetObject_Proxy( - ISpResourceManager* This, - REFGUID guidServiceId, - REFCLSID ObjectCLSID, - REFIID ObjectIID, - WINBOOL fReleaseWhenLastExternalRefReleased, - void **ppObject); -void __RPC_STUB ISpResourceManager_GetObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpResourceManager_INTERFACE_DEFINED__ */ @@ -3597,68 +3518,69 @@ typedef struct ISpEventSourceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpEventSource* This, + ISpEventSource *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpEventSource* This); + ISpEventSource *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpEventSource* This); + ISpEventSource *This); /*** ISpNotifySource methods ***/ HRESULT (STDMETHODCALLTYPE *SetNotifySink)( - ISpEventSource* This, + ISpEventSource *This, ISpNotifySink *pNotifySink); HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)( - ISpEventSource* This, + ISpEventSource *This, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)( - ISpEventSource* This, + ISpEventSource *This, SPNOTIFYCALLBACK *pfnCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)( - ISpEventSource* This, + ISpEventSource *This, ISpNotifyCallback *pSpCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)( - ISpEventSource* This); + ISpEventSource *This); HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)( - ISpEventSource* This, + ISpEventSource *This, DWORD dwMilliseconds); HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)( - ISpEventSource* This); + ISpEventSource *This); /*** ISpEventSource methods ***/ HRESULT (STDMETHODCALLTYPE *SetInterest)( - ISpEventSource* This, + ISpEventSource *This, ULONGLONG ullEventInterest, ULONGLONG ullQueuedInterest); HRESULT (STDMETHODCALLTYPE *GetEvents)( - ISpEventSource* This, + ISpEventSource *This, ULONG ulCount, SPEVENT *pEventArray, ULONG *pulFetched); HRESULT (STDMETHODCALLTYPE *GetInfo)( - ISpEventSource* This, + ISpEventSource *This, SPEVENTSOURCEINFO *pInfo); END_INTERFACE } ISpEventSourceVtbl; + interface ISpEventSource { CONST_VTBL ISpEventSourceVtbl* lpVtbl; }; @@ -3729,33 +3651,6 @@ static FORCEINLINE HRESULT ISpEventSource_GetInfo(ISpEventSource* This,SPEVENTSO #endif -HRESULT STDMETHODCALLTYPE ISpEventSource_SetInterest_Proxy( - ISpEventSource* This, - ULONGLONG ullEventInterest, - ULONGLONG ullQueuedInterest); -void __RPC_STUB ISpEventSource_SetInterest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpEventSource_GetEvents_Proxy( - ISpEventSource* This, - ULONG ulCount, - SPEVENT *pEventArray, - ULONG *pulFetched); -void __RPC_STUB ISpEventSource_GetEvents_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpEventSource_GetInfo_Proxy( - ISpEventSource* This, - SPEVENTSOURCEINFO *pInfo); -void __RPC_STUB ISpEventSource_GetInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpEventSource_INTERFACE_DEFINED__ */ @@ -3787,28 +3682,29 @@ typedef struct ISpEventSinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpEventSink* This, + ISpEventSink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpEventSink* This); + ISpEventSink *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpEventSink* This); + ISpEventSink *This); /*** ISpEventSink methods ***/ HRESULT (STDMETHODCALLTYPE *AddEvents)( - ISpEventSink* This, + ISpEventSink *This, const SPEVENT *pEventArray, ULONG ulCount); HRESULT (STDMETHODCALLTYPE *GetEventInterest)( - ISpEventSink* This, + ISpEventSink *This, ULONGLONG *pullEventInterest); END_INTERFACE } ISpEventSinkVtbl; + interface ISpEventSink { CONST_VTBL ISpEventSinkVtbl* lpVtbl; }; @@ -3845,23 +3741,6 @@ static FORCEINLINE HRESULT ISpEventSink_GetEventInterest(ISpEventSink* This,ULON #endif -HRESULT STDMETHODCALLTYPE ISpEventSink_AddEvents_Proxy( - ISpEventSink* This, - const SPEVENT *pEventArray, - ULONG ulCount); -void __RPC_STUB ISpEventSink_AddEvents_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpEventSink_GetEventInterest_Proxy( - ISpEventSink* This, - ULONGLONG *pullEventInterest); -void __RPC_STUB ISpEventSink_GetEventInterest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpEventSink_INTERFACE_DEFINED__ */ @@ -3890,83 +3769,84 @@ typedef struct ISpStreamFormatVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpStreamFormat* This, + ISpStreamFormat *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpStreamFormat* This); + ISpStreamFormat *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpStreamFormat* This); + ISpStreamFormat *This); /*** ISequentialStream methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - ISpStreamFormat* This, + ISpStreamFormat *This, void *pv, ULONG cb, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpStreamFormat* This, + ISpStreamFormat *This, const void *pv, ULONG cb, ULONG *pcbWritten); /*** IStream methods ***/ HRESULT (STDMETHODCALLTYPE *Seek)( - ISpStreamFormat* This, + ISpStreamFormat *This, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition); HRESULT (STDMETHODCALLTYPE *SetSize)( - ISpStreamFormat* This, + ISpStreamFormat *This, ULARGE_INTEGER libNewSize); HRESULT (STDMETHODCALLTYPE *CopyTo)( - ISpStreamFormat* This, + ISpStreamFormat *This, IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpStreamFormat* This, + ISpStreamFormat *This, DWORD grfCommitFlags); HRESULT (STDMETHODCALLTYPE *Revert)( - ISpStreamFormat* This); + ISpStreamFormat *This); HRESULT (STDMETHODCALLTYPE *LockRegion)( - ISpStreamFormat* This, + ISpStreamFormat *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *UnlockRegion)( - ISpStreamFormat* This, + ISpStreamFormat *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *Stat)( - ISpStreamFormat* This, + ISpStreamFormat *This, STATSTG *pstatstg, DWORD grfStatFlag); HRESULT (STDMETHODCALLTYPE *Clone)( - ISpStreamFormat* This, + ISpStreamFormat *This, IStream **ppstm); /*** ISpStreamFormat methods ***/ HRESULT (STDMETHODCALLTYPE *GetFormat)( - ISpStreamFormat* This, + ISpStreamFormat *This, GUID *pguidFormatId, WAVEFORMATEX **ppCoMemWaveFormatEx); END_INTERFACE } ISpStreamFormatVtbl; + interface ISpStreamFormat { CONST_VTBL ISpStreamFormatVtbl* lpVtbl; }; @@ -4047,15 +3927,6 @@ static FORCEINLINE HRESULT ISpStreamFormat_GetFormat(ISpStreamFormat* This,GUID #endif -HRESULT STDMETHODCALLTYPE ISpStreamFormat_GetFormat_Proxy( - ISpStreamFormat* This, - GUID *pguidFormatId, - WAVEFORMATEX **ppCoMemWaveFormatEx); -void __RPC_STUB ISpStreamFormat_GetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpStreamFormat_INTERFACE_DEFINED__ */ @@ -4098,94 +3969,94 @@ typedef struct ISpStreamVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpStream* This, + ISpStream *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpStream* This); + ISpStream *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpStream* This); + ISpStream *This); /*** ISequentialStream methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - ISpStream* This, + ISpStream *This, void *pv, ULONG cb, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpStream* This, + ISpStream *This, const void *pv, ULONG cb, ULONG *pcbWritten); /*** IStream methods ***/ HRESULT (STDMETHODCALLTYPE *Seek)( - ISpStream* This, + ISpStream *This, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition); HRESULT (STDMETHODCALLTYPE *SetSize)( - ISpStream* This, + ISpStream *This, ULARGE_INTEGER libNewSize); HRESULT (STDMETHODCALLTYPE *CopyTo)( - ISpStream* This, + ISpStream *This, IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpStream* This, + ISpStream *This, DWORD grfCommitFlags); HRESULT (STDMETHODCALLTYPE *Revert)( - ISpStream* This); + ISpStream *This); HRESULT (STDMETHODCALLTYPE *LockRegion)( - ISpStream* This, + ISpStream *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *UnlockRegion)( - ISpStream* This, + ISpStream *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *Stat)( - ISpStream* This, + ISpStream *This, STATSTG *pstatstg, DWORD grfStatFlag); HRESULT (STDMETHODCALLTYPE *Clone)( - ISpStream* This, + ISpStream *This, IStream **ppstm); /*** ISpStreamFormat methods ***/ HRESULT (STDMETHODCALLTYPE *GetFormat)( - ISpStream* This, + ISpStream *This, GUID *pguidFormatId, WAVEFORMATEX **ppCoMemWaveFormatEx); /*** ISpStream methods ***/ HRESULT (STDMETHODCALLTYPE *SetBaseStream)( - ISpStream* This, + ISpStream *This, IStream *pStream, REFGUID rguidFormat, const WAVEFORMATEX *pWaveFormatEx); HRESULT (STDMETHODCALLTYPE *GetBaseStream)( - ISpStream* This, + ISpStream *This, IStream **ppStream); HRESULT (STDMETHODCALLTYPE *BindToFile)( - ISpStream* This, + ISpStream *This, LPCWSTR pszFileName, SPFILEMODE eMode, const GUID *pFormatId, @@ -4193,10 +4064,11 @@ typedef struct ISpStreamVtbl { ULONGLONG ullEventInterest); HRESULT (STDMETHODCALLTYPE *Close)( - ISpStream* This); + ISpStream *This); END_INTERFACE } ISpStreamVtbl; + interface ISpStream { CONST_VTBL ISpStreamVtbl* lpVtbl; }; @@ -4295,43 +4167,6 @@ static FORCEINLINE HRESULT ISpStream_Close(ISpStream* This) { #endif -HRESULT STDMETHODCALLTYPE ISpStream_SetBaseStream_Proxy( - ISpStream* This, - IStream *pStream, - REFGUID rguidFormat, - const WAVEFORMATEX *pWaveFormatEx); -void __RPC_STUB ISpStream_SetBaseStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpStream_GetBaseStream_Proxy( - ISpStream* This, - IStream **ppStream); -void __RPC_STUB ISpStream_GetBaseStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpStream_BindToFile_Proxy( - ISpStream* This, - LPCWSTR pszFileName, - SPFILEMODE eMode, - const GUID *pFormatId, - const WAVEFORMATEX *pWaveFormatEx, - ULONGLONG ullEventInterest); -void __RPC_STUB ISpStream_BindToFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpStream_Close_Proxy( - ISpStream* This); -void __RPC_STUB ISpStream_Close_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpStream_INTERFACE_DEFINED__ */ @@ -4379,112 +4214,113 @@ typedef struct ISpStreamFormatConverterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpStreamFormatConverter* This); + ISpStreamFormatConverter *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpStreamFormatConverter* This); + ISpStreamFormatConverter *This); /*** ISequentialStream methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, void *pv, ULONG cb, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, const void *pv, ULONG cb, ULONG *pcbWritten); /*** IStream methods ***/ HRESULT (STDMETHODCALLTYPE *Seek)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition); HRESULT (STDMETHODCALLTYPE *SetSize)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, ULARGE_INTEGER libNewSize); HRESULT (STDMETHODCALLTYPE *CopyTo)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, DWORD grfCommitFlags); HRESULT (STDMETHODCALLTYPE *Revert)( - ISpStreamFormatConverter* This); + ISpStreamFormatConverter *This); HRESULT (STDMETHODCALLTYPE *LockRegion)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *UnlockRegion)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *Stat)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, STATSTG *pstatstg, DWORD grfStatFlag); HRESULT (STDMETHODCALLTYPE *Clone)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, IStream **ppstm); /*** ISpStreamFormat methods ***/ HRESULT (STDMETHODCALLTYPE *GetFormat)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, GUID *pguidFormatId, WAVEFORMATEX **ppCoMemWaveFormatEx); /*** ISpStreamFormatConverter methods ***/ HRESULT (STDMETHODCALLTYPE *SetBaseStream)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, ISpStreamFormat *pStream, WINBOOL fSetFormatToBaseStreamFormat, WINBOOL fWriteToBaseStream); HRESULT (STDMETHODCALLTYPE *GetBaseStream)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, ISpStreamFormat **ppStream); HRESULT (STDMETHODCALLTYPE *SetFormat)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, REFGUID rguidFormatIdOfConvertedStream, const WAVEFORMATEX *pWaveFormatExOfConvertedStream); HRESULT (STDMETHODCALLTYPE *ResetSeekPosition)( - ISpStreamFormatConverter* This); + ISpStreamFormatConverter *This); HRESULT (STDMETHODCALLTYPE *ScaleConvertedToBaseOffset)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, ULONGLONG ullOffsetConvertedStream, ULONGLONG *pullOffsetBaseStream); HRESULT (STDMETHODCALLTYPE *ScaleBaseToConvertedOffset)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, ULONGLONG ullOffsetBaseStream, ULONGLONG *pullOffsetConvertedStream); END_INTERFACE } ISpStreamFormatConverterVtbl; + interface ISpStreamFormatConverter { CONST_VTBL ISpStreamFormatConverterVtbl* lpVtbl; }; @@ -4591,58 +4427,6 @@ static FORCEINLINE HRESULT ISpStreamFormatConverter_ScaleBaseToConvertedOffset(I #endif -HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_SetBaseStream_Proxy( - ISpStreamFormatConverter* This, - ISpStreamFormat *pStream, - WINBOOL fSetFormatToBaseStreamFormat, - WINBOOL fWriteToBaseStream); -void __RPC_STUB ISpStreamFormatConverter_SetBaseStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_GetBaseStream_Proxy( - ISpStreamFormatConverter* This, - ISpStreamFormat **ppStream); -void __RPC_STUB ISpStreamFormatConverter_GetBaseStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_SetFormat_Proxy( - ISpStreamFormatConverter* This, - REFGUID rguidFormatIdOfConvertedStream, - const WAVEFORMATEX *pWaveFormatExOfConvertedStream); -void __RPC_STUB ISpStreamFormatConverter_SetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_ResetSeekPosition_Proxy( - ISpStreamFormatConverter* This); -void __RPC_STUB ISpStreamFormatConverter_ResetSeekPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_ScaleConvertedToBaseOffset_Proxy( - ISpStreamFormatConverter* This, - ULONGLONG ullOffsetConvertedStream, - ULONGLONG *pullOffsetBaseStream); -void __RPC_STUB ISpStreamFormatConverter_ScaleConvertedToBaseOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_ScaleBaseToConvertedOffset_Proxy( - ISpStreamFormatConverter* This, - ULONGLONG ullOffsetBaseStream, - ULONGLONG *pullOffsetConvertedStream); -void __RPC_STUB ISpStreamFormatConverter_ScaleBaseToConvertedOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpStreamFormatConverter_INTERFACE_DEFINED__ */ @@ -4717,130 +4501,131 @@ typedef struct ISpAudioVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpAudio* This, + ISpAudio *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpAudio* This); + ISpAudio *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpAudio* This); + ISpAudio *This); /*** ISequentialStream methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - ISpAudio* This, + ISpAudio *This, void *pv, ULONG cb, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpAudio* This, + ISpAudio *This, const void *pv, ULONG cb, ULONG *pcbWritten); /*** IStream methods ***/ HRESULT (STDMETHODCALLTYPE *Seek)( - ISpAudio* This, + ISpAudio *This, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition); HRESULT (STDMETHODCALLTYPE *SetSize)( - ISpAudio* This, + ISpAudio *This, ULARGE_INTEGER libNewSize); HRESULT (STDMETHODCALLTYPE *CopyTo)( - ISpAudio* This, + ISpAudio *This, IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpAudio* This, + ISpAudio *This, DWORD grfCommitFlags); HRESULT (STDMETHODCALLTYPE *Revert)( - ISpAudio* This); + ISpAudio *This); HRESULT (STDMETHODCALLTYPE *LockRegion)( - ISpAudio* This, + ISpAudio *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *UnlockRegion)( - ISpAudio* This, + ISpAudio *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *Stat)( - ISpAudio* This, + ISpAudio *This, STATSTG *pstatstg, DWORD grfStatFlag); HRESULT (STDMETHODCALLTYPE *Clone)( - ISpAudio* This, + ISpAudio *This, IStream **ppstm); /*** ISpStreamFormat methods ***/ HRESULT (STDMETHODCALLTYPE *GetFormat)( - ISpAudio* This, + ISpAudio *This, GUID *pguidFormatId, WAVEFORMATEX **ppCoMemWaveFormatEx); /*** ISpAudio methods ***/ HRESULT (STDMETHODCALLTYPE *SetState)( - ISpAudio* This, + ISpAudio *This, SPAUDIOSTATE NewState, ULONGLONG ullReserved); HRESULT (STDMETHODCALLTYPE *SetFormat)( - ISpAudio* This, + ISpAudio *This, REFGUID rguidFmtId, const WAVEFORMATEX *pWaveFormatEx); HRESULT (STDMETHODCALLTYPE *GetStatus)( - ISpAudio* This, + ISpAudio *This, SPAUDIOSTATUS *pStatus); HRESULT (STDMETHODCALLTYPE *SetBufferInfo)( - ISpAudio* This, + ISpAudio *This, const SPAUDIOBUFFERINFO *pBuffInfo); HRESULT (STDMETHODCALLTYPE *GetBufferInfo)( - ISpAudio* This, + ISpAudio *This, SPAUDIOBUFFERINFO *pBuffInfo); HRESULT (STDMETHODCALLTYPE *GetDefaultFormat)( - ISpAudio* This, + ISpAudio *This, GUID *pFormatId, WAVEFORMATEX **ppCoMemWaveFormatEx); HANDLE (STDMETHODCALLTYPE *EventHandle)( - ISpAudio* This); + ISpAudio *This); HRESULT (STDMETHODCALLTYPE *GetVolumeLevel)( - ISpAudio* This, + ISpAudio *This, ULONG *pLevel); HRESULT (STDMETHODCALLTYPE *SetVolumeLevel)( - ISpAudio* This, + ISpAudio *This, ULONG Level); HRESULT (STDMETHODCALLTYPE *GetBufferNotifySize)( - ISpAudio* This, + ISpAudio *This, ULONG *pcbSize); HRESULT (STDMETHODCALLTYPE *SetBufferNotifySize)( - ISpAudio* This, + ISpAudio *This, ULONG cbSize); END_INTERFACE } ISpAudioVtbl; + interface ISpAudio { CONST_VTBL ISpAudioVtbl* lpVtbl; }; @@ -4967,96 +4752,6 @@ static FORCEINLINE HRESULT ISpAudio_SetBufferNotifySize(ISpAudio* This,ULONG cbS #endif -HRESULT STDMETHODCALLTYPE ISpAudio_SetState_Proxy( - ISpAudio* This, - SPAUDIOSTATE NewState, - ULONGLONG ullReserved); -void __RPC_STUB ISpAudio_SetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_SetFormat_Proxy( - ISpAudio* This, - REFGUID rguidFmtId, - const WAVEFORMATEX *pWaveFormatEx); -void __RPC_STUB ISpAudio_SetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_GetStatus_Proxy( - ISpAudio* This, - SPAUDIOSTATUS *pStatus); -void __RPC_STUB ISpAudio_GetStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_SetBufferInfo_Proxy( - ISpAudio* This, - const SPAUDIOBUFFERINFO *pBuffInfo); -void __RPC_STUB ISpAudio_SetBufferInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_GetBufferInfo_Proxy( - ISpAudio* This, - SPAUDIOBUFFERINFO *pBuffInfo); -void __RPC_STUB ISpAudio_GetBufferInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_GetDefaultFormat_Proxy( - ISpAudio* This, - GUID *pFormatId, - WAVEFORMATEX **ppCoMemWaveFormatEx); -void __RPC_STUB ISpAudio_GetDefaultFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HANDLE STDMETHODCALLTYPE ISpAudio_EventHandle_Proxy( - ISpAudio* This); -void __RPC_STUB ISpAudio_EventHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_GetVolumeLevel_Proxy( - ISpAudio* This, - ULONG *pLevel); -void __RPC_STUB ISpAudio_GetVolumeLevel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_SetVolumeLevel_Proxy( - ISpAudio* This, - ULONG Level); -void __RPC_STUB ISpAudio_SetVolumeLevel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_GetBufferNotifySize_Proxy( - ISpAudio* This, - ULONG *pcbSize); -void __RPC_STUB ISpAudio_GetBufferNotifySize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_SetBufferNotifySize_Proxy( - ISpAudio* This, - ULONG cbSize); -void __RPC_STUB ISpAudio_SetBufferNotifySize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpAudio_INTERFACE_DEFINED__ */ @@ -5096,151 +4791,152 @@ typedef struct ISpMMSysAudioVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpMMSysAudio* This); + ISpMMSysAudio *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpMMSysAudio* This); + ISpMMSysAudio *This); /*** ISequentialStream methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, void *pv, ULONG cb, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, const void *pv, ULONG cb, ULONG *pcbWritten); /*** IStream methods ***/ HRESULT (STDMETHODCALLTYPE *Seek)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition); HRESULT (STDMETHODCALLTYPE *SetSize)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, ULARGE_INTEGER libNewSize); HRESULT (STDMETHODCALLTYPE *CopyTo)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, DWORD grfCommitFlags); HRESULT (STDMETHODCALLTYPE *Revert)( - ISpMMSysAudio* This); + ISpMMSysAudio *This); HRESULT (STDMETHODCALLTYPE *LockRegion)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *UnlockRegion)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *Stat)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, STATSTG *pstatstg, DWORD grfStatFlag); HRESULT (STDMETHODCALLTYPE *Clone)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, IStream **ppstm); /*** ISpStreamFormat methods ***/ HRESULT (STDMETHODCALLTYPE *GetFormat)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, GUID *pguidFormatId, WAVEFORMATEX **ppCoMemWaveFormatEx); /*** ISpAudio methods ***/ HRESULT (STDMETHODCALLTYPE *SetState)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, SPAUDIOSTATE NewState, ULONGLONG ullReserved); HRESULT (STDMETHODCALLTYPE *SetFormat)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, REFGUID rguidFmtId, const WAVEFORMATEX *pWaveFormatEx); HRESULT (STDMETHODCALLTYPE *GetStatus)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, SPAUDIOSTATUS *pStatus); HRESULT (STDMETHODCALLTYPE *SetBufferInfo)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, const SPAUDIOBUFFERINFO *pBuffInfo); HRESULT (STDMETHODCALLTYPE *GetBufferInfo)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, SPAUDIOBUFFERINFO *pBuffInfo); HRESULT (STDMETHODCALLTYPE *GetDefaultFormat)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, GUID *pFormatId, WAVEFORMATEX **ppCoMemWaveFormatEx); HANDLE (STDMETHODCALLTYPE *EventHandle)( - ISpMMSysAudio* This); + ISpMMSysAudio *This); HRESULT (STDMETHODCALLTYPE *GetVolumeLevel)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, ULONG *pLevel); HRESULT (STDMETHODCALLTYPE *SetVolumeLevel)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, ULONG Level); HRESULT (STDMETHODCALLTYPE *GetBufferNotifySize)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, ULONG *pcbSize); HRESULT (STDMETHODCALLTYPE *SetBufferNotifySize)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, ULONG cbSize); /*** ISpMMSysAudio methods ***/ HRESULT (STDMETHODCALLTYPE *GetDeviceId)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, UINT *puDeviceId); HRESULT (STDMETHODCALLTYPE *SetDeviceId)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, UINT uDeviceId); HRESULT (STDMETHODCALLTYPE *GetMMHandle)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, void **pHandle); HRESULT (STDMETHODCALLTYPE *GetLineId)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, UINT *puLineId); HRESULT (STDMETHODCALLTYPE *SetLineId)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, UINT uLineId); END_INTERFACE } ISpMMSysAudioVtbl; + interface ISpMMSysAudio { CONST_VTBL ISpMMSysAudioVtbl* lpVtbl; }; @@ -5389,46 +5085,6 @@ static FORCEINLINE HRESULT ISpMMSysAudio_SetLineId(ISpMMSysAudio* This,UINT uLin #endif -HRESULT STDMETHODCALLTYPE ISpMMSysAudio_GetDeviceId_Proxy( - ISpMMSysAudio* This, - UINT *puDeviceId); -void __RPC_STUB ISpMMSysAudio_GetDeviceId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpMMSysAudio_SetDeviceId_Proxy( - ISpMMSysAudio* This, - UINT uDeviceId); -void __RPC_STUB ISpMMSysAudio_SetDeviceId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpMMSysAudio_GetMMHandle_Proxy( - ISpMMSysAudio* This, - void **pHandle); -void __RPC_STUB ISpMMSysAudio_GetMMHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpMMSysAudio_GetLineId_Proxy( - ISpMMSysAudio* This, - UINT *puLineId); -void __RPC_STUB ISpMMSysAudio_GetLineId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpMMSysAudio_SetLineId_Proxy( - ISpMMSysAudio* This, - UINT uLineId); -void __RPC_STUB ISpMMSysAudio_SetLineId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpMMSysAudio_INTERFACE_DEFINED__ */ @@ -5459,27 +5115,28 @@ typedef struct ISpTranscriptVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpTranscript* This, + ISpTranscript *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpTranscript* This); + ISpTranscript *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpTranscript* This); + ISpTranscript *This); /*** ISpTranscript methods ***/ HRESULT (STDMETHODCALLTYPE *GetTranscript)( - ISpTranscript* This, + ISpTranscript *This, LPWSTR *ppszTranscript); HRESULT (STDMETHODCALLTYPE *AppendTranscript)( - ISpTranscript* This, + ISpTranscript *This, LPCWSTR pszTranscript); END_INTERFACE } ISpTranscriptVtbl; + interface ISpTranscript { CONST_VTBL ISpTranscriptVtbl* lpVtbl; }; @@ -5516,22 +5173,6 @@ static FORCEINLINE HRESULT ISpTranscript_AppendTranscript(ISpTranscript* This,LP #endif -HRESULT STDMETHODCALLTYPE ISpTranscript_GetTranscript_Proxy( - ISpTranscript* This, - LPWSTR *ppszTranscript); -void __RPC_STUB ISpTranscript_GetTranscript_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpTranscript_AppendTranscript_Proxy( - ISpTranscript* This, - LPCWSTR pszTranscript); -void __RPC_STUB ISpTranscript_AppendTranscript_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpTranscript_INTERFACE_DEFINED__ */ @@ -5566,7 +5207,6 @@ struct SPPHRASERULE { float SREngineConfidence; signed char Confidence; }; - struct SPPHRASEPROPERTY { LPCWSTR pszName; __C89_NAMELESS union { @@ -5586,7 +5226,6 @@ struct SPPHRASEPROPERTY { float SREngineConfidence; signed char Confidence; }; - typedef struct SPPHRASEREPLACEMENT { BYTE bDisplayAttributes; LPCWSTR pszReplacementText; @@ -5702,50 +5341,50 @@ typedef struct ISpLexiconVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpLexicon* This, + ISpLexicon *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpLexicon* This); + ISpLexicon *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpLexicon* This); + ISpLexicon *This); /*** ISpLexicon methods ***/ HRESULT (STDMETHODCALLTYPE *GetPronunciations)( - ISpLexicon* This, + ISpLexicon *This, LPCWSTR pszWord, WORD LangID, DWORD dwFlags, SPWORDPRONUNCIATIONLIST *pWordPronunciationList); HRESULT (STDMETHODCALLTYPE *AddPronunciation)( - ISpLexicon* This, + ISpLexicon *This, LPCWSTR pszWord, WORD LangID, SPPARTOFSPEECH ePartOfSpeech, PCSPPHONEID pszPronunciation); HRESULT (STDMETHODCALLTYPE *RemovePronunciation)( - ISpLexicon* This, + ISpLexicon *This, LPCWSTR pszWord, WORD LangID, SPPARTOFSPEECH ePartOfSpeech, PCSPPHONEID pszPronunciation); HRESULT (STDMETHODCALLTYPE *GetGeneration)( - ISpLexicon* This, + ISpLexicon *This, DWORD *pdwGeneration); HRESULT (STDMETHODCALLTYPE *GetGenerationChange)( - ISpLexicon* This, + ISpLexicon *This, DWORD dwFlags, DWORD *pdwGeneration, SPWORDLIST *pWordList); HRESULT (STDMETHODCALLTYPE *GetWords)( - ISpLexicon* This, + ISpLexicon *This, DWORD dwFlags, DWORD *pdwGeneration, DWORD *pdwCookie, @@ -5753,6 +5392,7 @@ typedef struct ISpLexiconVtbl { END_INTERFACE } ISpLexiconVtbl; + interface ISpLexicon { CONST_VTBL ISpLexiconVtbl* lpVtbl; }; @@ -5805,68 +5445,6 @@ static FORCEINLINE HRESULT ISpLexicon_GetWords(ISpLexicon* This,DWORD dwFlags,DW #endif -HRESULT STDMETHODCALLTYPE ISpLexicon_GetPronunciations_Proxy( - ISpLexicon* This, - LPCWSTR pszWord, - WORD LangID, - DWORD dwFlags, - SPWORDPRONUNCIATIONLIST *pWordPronunciationList); -void __RPC_STUB ISpLexicon_GetPronunciations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpLexicon_AddPronunciation_Proxy( - ISpLexicon* This, - LPCWSTR pszWord, - WORD LangID, - SPPARTOFSPEECH ePartOfSpeech, - PCSPPHONEID pszPronunciation); -void __RPC_STUB ISpLexicon_AddPronunciation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpLexicon_RemovePronunciation_Proxy( - ISpLexicon* This, - LPCWSTR pszWord, - WORD LangID, - SPPARTOFSPEECH ePartOfSpeech, - PCSPPHONEID pszPronunciation); -void __RPC_STUB ISpLexicon_RemovePronunciation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpLexicon_GetGeneration_Proxy( - ISpLexicon* This, - DWORD *pdwGeneration); -void __RPC_STUB ISpLexicon_GetGeneration_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpLexicon_GetGenerationChange_Proxy( - ISpLexicon* This, - DWORD dwFlags, - DWORD *pdwGeneration, - SPWORDLIST *pWordList); -void __RPC_STUB ISpLexicon_GetGenerationChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpLexicon_GetWords_Proxy( - ISpLexicon* This, - DWORD dwFlags, - DWORD *pdwGeneration, - DWORD *pdwCookie, - SPWORDLIST *pWordList); -void __RPC_STUB ISpLexicon_GetWords_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpLexicon_INTERFACE_DEFINED__ */ @@ -5895,50 +5473,50 @@ typedef struct ISpContainerLexiconVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpContainerLexicon* This, + ISpContainerLexicon *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpContainerLexicon* This); + ISpContainerLexicon *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpContainerLexicon* This); + ISpContainerLexicon *This); /*** ISpLexicon methods ***/ HRESULT (STDMETHODCALLTYPE *GetPronunciations)( - ISpContainerLexicon* This, + ISpContainerLexicon *This, LPCWSTR pszWord, WORD LangID, DWORD dwFlags, SPWORDPRONUNCIATIONLIST *pWordPronunciationList); HRESULT (STDMETHODCALLTYPE *AddPronunciation)( - ISpContainerLexicon* This, + ISpContainerLexicon *This, LPCWSTR pszWord, WORD LangID, SPPARTOFSPEECH ePartOfSpeech, PCSPPHONEID pszPronunciation); HRESULT (STDMETHODCALLTYPE *RemovePronunciation)( - ISpContainerLexicon* This, + ISpContainerLexicon *This, LPCWSTR pszWord, WORD LangID, SPPARTOFSPEECH ePartOfSpeech, PCSPPHONEID pszPronunciation); HRESULT (STDMETHODCALLTYPE *GetGeneration)( - ISpContainerLexicon* This, + ISpContainerLexicon *This, DWORD *pdwGeneration); HRESULT (STDMETHODCALLTYPE *GetGenerationChange)( - ISpContainerLexicon* This, + ISpContainerLexicon *This, DWORD dwFlags, DWORD *pdwGeneration, SPWORDLIST *pWordList); HRESULT (STDMETHODCALLTYPE *GetWords)( - ISpContainerLexicon* This, + ISpContainerLexicon *This, DWORD dwFlags, DWORD *pdwGeneration, DWORD *pdwCookie, @@ -5946,12 +5524,13 @@ typedef struct ISpContainerLexiconVtbl { /*** ISpContainerLexicon methods ***/ HRESULT (STDMETHODCALLTYPE *AddLexicon)( - ISpContainerLexicon* This, + ISpContainerLexicon *This, ISpLexicon *pAddLexicon, DWORD dwFlags); END_INTERFACE } ISpContainerLexiconVtbl; + interface ISpContainerLexicon { CONST_VTBL ISpContainerLexiconVtbl* lpVtbl; }; @@ -6010,15 +5589,6 @@ static FORCEINLINE HRESULT ISpContainerLexicon_AddLexicon(ISpContainerLexicon* T #endif -HRESULT STDMETHODCALLTYPE ISpContainerLexicon_AddLexicon_Proxy( - ISpContainerLexicon* This, - ISpLexicon *pAddLexicon, - DWORD dwFlags); -void __RPC_STUB ISpContainerLexicon_AddLexicon_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpContainerLexicon_INTERFACE_DEFINED__ */ @@ -6051,38 +5621,39 @@ typedef struct ISpPhoneConverterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpPhoneConverter* This, + ISpPhoneConverter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpPhoneConverter* This); + ISpPhoneConverter *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpPhoneConverter* This); + ISpPhoneConverter *This); /*** ISpObjectWithToken methods ***/ HRESULT (STDMETHODCALLTYPE *SetObjectToken)( - ISpPhoneConverter* This, + ISpPhoneConverter *This, ISpObjectToken *pToken); HRESULT (STDMETHODCALLTYPE *GetObjectToken)( - ISpPhoneConverter* This, + ISpPhoneConverter *This, ISpObjectToken **ppToken); /*** ISpPhoneConverter methods ***/ HRESULT (STDMETHODCALLTYPE *PhoneToId)( - ISpPhoneConverter* This, + ISpPhoneConverter *This, LPCWSTR pszPhone, SPPHONEID *pId); HRESULT (STDMETHODCALLTYPE *IdToPhone)( - ISpPhoneConverter* This, + ISpPhoneConverter *This, PCSPPHONEID pId, WCHAR *pszPhone); END_INTERFACE } ISpPhoneConverterVtbl; + interface ISpPhoneConverter { CONST_VTBL ISpPhoneConverterVtbl* lpVtbl; }; @@ -6129,24 +5700,6 @@ static FORCEINLINE HRESULT ISpPhoneConverter_IdToPhone(ISpPhoneConverter* This,P #endif -HRESULT STDMETHODCALLTYPE ISpPhoneConverter_PhoneToId_Proxy( - ISpPhoneConverter* This, - LPCWSTR pszPhone, - SPPHONEID *pId); -void __RPC_STUB ISpPhoneConverter_PhoneToId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhoneConverter_IdToPhone_Proxy( - ISpPhoneConverter* This, - PCSPPHONEID pId, - WCHAR *pszPhone); -void __RPC_STUB ISpPhoneConverter_IdToPhone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpPhoneConverter_INTERFACE_DEFINED__ */ @@ -6311,173 +5864,173 @@ typedef struct ISpVoiceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpVoice* This, + ISpVoice *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpVoice* This); + ISpVoice *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpVoice* This); + ISpVoice *This); /*** ISpNotifySource methods ***/ HRESULT (STDMETHODCALLTYPE *SetNotifySink)( - ISpVoice* This, + ISpVoice *This, ISpNotifySink *pNotifySink); HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)( - ISpVoice* This, + ISpVoice *This, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)( - ISpVoice* This, + ISpVoice *This, SPNOTIFYCALLBACK *pfnCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)( - ISpVoice* This, + ISpVoice *This, ISpNotifyCallback *pSpCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)( - ISpVoice* This); + ISpVoice *This); HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)( - ISpVoice* This, + ISpVoice *This, DWORD dwMilliseconds); HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)( - ISpVoice* This); + ISpVoice *This); /*** ISpEventSource methods ***/ HRESULT (STDMETHODCALLTYPE *SetInterest)( - ISpVoice* This, + ISpVoice *This, ULONGLONG ullEventInterest, ULONGLONG ullQueuedInterest); HRESULT (STDMETHODCALLTYPE *GetEvents)( - ISpVoice* This, + ISpVoice *This, ULONG ulCount, SPEVENT *pEventArray, ULONG *pulFetched); HRESULT (STDMETHODCALLTYPE *GetInfo)( - ISpVoice* This, + ISpVoice *This, SPEVENTSOURCEINFO *pInfo); /*** ISpVoice methods ***/ HRESULT (STDMETHODCALLTYPE *SetOutput)( - ISpVoice* This, + ISpVoice *This, IUnknown *pUnkOutput, WINBOOL fAllowFormatChanges); HRESULT (STDMETHODCALLTYPE *GetOutputObjectToken)( - ISpVoice* This, + ISpVoice *This, ISpObjectToken **ppObjectToken); HRESULT (STDMETHODCALLTYPE *GetOutputStream)( - ISpVoice* This, + ISpVoice *This, ISpStreamFormat **ppStream); HRESULT (STDMETHODCALLTYPE *Pause)( - ISpVoice* This); + ISpVoice *This); HRESULT (STDMETHODCALLTYPE *Resume)( - ISpVoice* This); + ISpVoice *This); HRESULT (STDMETHODCALLTYPE *SetVoice)( - ISpVoice* This, + ISpVoice *This, ISpObjectToken *pToken); HRESULT (STDMETHODCALLTYPE *GetVoice)( - ISpVoice* This, + ISpVoice *This, ISpObjectToken **ppToken); HRESULT (STDMETHODCALLTYPE *Speak)( - ISpVoice* This, + ISpVoice *This, LPCWSTR pwcs, DWORD dwFlags, ULONG *pulStreamNumber); HRESULT (STDMETHODCALLTYPE *SpeakStream)( - ISpVoice* This, + ISpVoice *This, IStream *pStream, DWORD dwFlags, ULONG *pulStreamNumber); HRESULT (STDMETHODCALLTYPE *GetStatus)( - ISpVoice* This, + ISpVoice *This, SPVOICESTATUS *pStatus, LPWSTR *ppszLastBookmark); HRESULT (STDMETHODCALLTYPE *Skip)( - ISpVoice* This, + ISpVoice *This, LPCWSTR pItemType, LONG lNumItems, ULONG *pulNumSkipped); HRESULT (STDMETHODCALLTYPE *SetPriority)( - ISpVoice* This, + ISpVoice *This, SPVPRIORITY ePriority); HRESULT (STDMETHODCALLTYPE *GetPriority)( - ISpVoice* This, + ISpVoice *This, SPVPRIORITY *pePriority); HRESULT (STDMETHODCALLTYPE *SetAlertBoundary)( - ISpVoice* This, + ISpVoice *This, SPEVENTENUM eBoundary); HRESULT (STDMETHODCALLTYPE *GetAlertBoundary)( - ISpVoice* This, + ISpVoice *This, SPEVENTENUM *peBoundary); HRESULT (STDMETHODCALLTYPE *SetRate)( - ISpVoice* This, + ISpVoice *This, LONG RateAdjust); HRESULT (STDMETHODCALLTYPE *GetRate)( - ISpVoice* This, + ISpVoice *This, LONG *pRateAdjust); HRESULT (STDMETHODCALLTYPE *SetVolume)( - ISpVoice* This, + ISpVoice *This, USHORT usVolume); HRESULT (STDMETHODCALLTYPE *GetVolume)( - ISpVoice* This, + ISpVoice *This, USHORT *pusVolume); HRESULT (STDMETHODCALLTYPE *WaitUntilDone)( - ISpVoice* This, + ISpVoice *This, ULONG msTimeout); HRESULT (STDMETHODCALLTYPE *SetSyncSpeakTimeout)( - ISpVoice* This, + ISpVoice *This, ULONG msTimeout); HRESULT (STDMETHODCALLTYPE *GetSyncSpeakTimeout)( - ISpVoice* This, + ISpVoice *This, ULONG *pmsTimeout); HANDLE (STDMETHODCALLTYPE *SpeakCompleteEvent)( - ISpVoice* This); + ISpVoice *This); HRESULT (STDMETHODCALLTYPE *IsUISupported)( - ISpVoice* This, + ISpVoice *This, LPCWSTR pszTypeOfUI, void *pvExtraData, ULONG cbExtraData, WINBOOL *pfSupported); HRESULT (STDMETHODCALLTYPE *DisplayUI)( - ISpVoice* This, + ISpVoice *This, HWND hwndParent, LPCWSTR pszTitle, LPCWSTR pszTypeOfUI, @@ -6486,6 +6039,7 @@ typedef struct ISpVoiceVtbl { END_INTERFACE } ISpVoiceVtbl; + interface ISpVoice { CONST_VTBL ISpVoiceVtbl* lpVtbl; }; @@ -6658,188 +6212,6 @@ static FORCEINLINE HRESULT ISpVoice_DisplayUI(ISpVoice* This,HWND hwndParent,LPC #endif -HRESULT STDMETHODCALLTYPE ISpVoice_SetOutput_Proxy( - ISpVoice* This, - IUnknown *pUnkOutput, - WINBOOL fAllowFormatChanges); -void __RPC_STUB ISpVoice_SetOutput_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetOutputObjectToken_Proxy( - ISpVoice* This, - ISpObjectToken **ppObjectToken); -void __RPC_STUB ISpVoice_GetOutputObjectToken_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetOutputStream_Proxy( - ISpVoice* This, - ISpStreamFormat **ppStream); -void __RPC_STUB ISpVoice_GetOutputStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_Pause_Proxy( - ISpVoice* This); -void __RPC_STUB ISpVoice_Pause_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_Resume_Proxy( - ISpVoice* This); -void __RPC_STUB ISpVoice_Resume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_SetVoice_Proxy( - ISpVoice* This, - ISpObjectToken *pToken); -void __RPC_STUB ISpVoice_SetVoice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetVoice_Proxy( - ISpVoice* This, - ISpObjectToken **ppToken); -void __RPC_STUB ISpVoice_GetVoice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_Speak_Proxy( - ISpVoice* This, - LPCWSTR pwcs, - DWORD dwFlags, - ULONG *pulStreamNumber); -void __RPC_STUB ISpVoice_Speak_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_SpeakStream_Proxy( - ISpVoice* This, - IStream *pStream, - DWORD dwFlags, - ULONG *pulStreamNumber); -void __RPC_STUB ISpVoice_SpeakStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetStatus_Proxy( - ISpVoice* This, - SPVOICESTATUS *pStatus, - LPWSTR *ppszLastBookmark); -void __RPC_STUB ISpVoice_GetStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_Skip_Proxy( - ISpVoice* This, - LPCWSTR pItemType, - LONG lNumItems, - ULONG *pulNumSkipped); -void __RPC_STUB ISpVoice_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_SetPriority_Proxy( - ISpVoice* This, - SPVPRIORITY ePriority); -void __RPC_STUB ISpVoice_SetPriority_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetPriority_Proxy( - ISpVoice* This, - SPVPRIORITY *pePriority); -void __RPC_STUB ISpVoice_GetPriority_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_SetAlertBoundary_Proxy( - ISpVoice* This, - SPEVENTENUM eBoundary); -void __RPC_STUB ISpVoice_SetAlertBoundary_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetAlertBoundary_Proxy( - ISpVoice* This, - SPEVENTENUM *peBoundary); -void __RPC_STUB ISpVoice_GetAlertBoundary_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_SetRate_Proxy( - ISpVoice* This, - LONG RateAdjust); -void __RPC_STUB ISpVoice_SetRate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetRate_Proxy( - ISpVoice* This, - LONG *pRateAdjust); -void __RPC_STUB ISpVoice_GetRate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_SetVolume_Proxy( - ISpVoice* This, - USHORT usVolume); -void __RPC_STUB ISpVoice_SetVolume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetVolume_Proxy( - ISpVoice* This, - USHORT *pusVolume); -void __RPC_STUB ISpVoice_GetVolume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_WaitUntilDone_Proxy( - ISpVoice* This, - ULONG msTimeout); -void __RPC_STUB ISpVoice_WaitUntilDone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_SetSyncSpeakTimeout_Proxy( - ISpVoice* This, - ULONG msTimeout); -void __RPC_STUB ISpVoice_SetSyncSpeakTimeout_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetSyncSpeakTimeout_Proxy( - ISpVoice* This, - ULONG *pmsTimeout); -void __RPC_STUB ISpVoice_GetSyncSpeakTimeout_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpVoice_INTERFACE_DEFINED__ */ @@ -6880,27 +6252,27 @@ typedef struct ISpPhraseVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpPhrase* This, + ISpPhrase *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpPhrase* This); + ISpPhrase *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpPhrase* This); + ISpPhrase *This); /*** ISpPhrase methods ***/ HRESULT (STDMETHODCALLTYPE *GetPhrase)( - ISpPhrase* This, + ISpPhrase *This, SPPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)( - ISpPhrase* This, + ISpPhrase *This, SPSERIALIZEDPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetText)( - ISpPhrase* This, + ISpPhrase *This, ULONG ulStart, ULONG ulCount, WINBOOL fUseTextReplacements, @@ -6908,11 +6280,12 @@ typedef struct ISpPhraseVtbl { BYTE *pbDisplayAttributes); HRESULT (STDMETHODCALLTYPE *Discard)( - ISpPhrase* This, + ISpPhrase *This, DWORD dwValueTypes); END_INTERFACE } ISpPhraseVtbl; + interface ISpPhrase { CONST_VTBL ISpPhraseVtbl* lpVtbl; }; @@ -6957,42 +6330,6 @@ static FORCEINLINE HRESULT ISpPhrase_Discard(ISpPhrase* This,DWORD dwValueTypes) #endif -HRESULT STDMETHODCALLTYPE ISpPhrase_GetPhrase_Proxy( - ISpPhrase* This, - SPPHRASE **ppCoMemPhrase); -void __RPC_STUB ISpPhrase_GetPhrase_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhrase_GetSerializedPhrase_Proxy( - ISpPhrase* This, - SPSERIALIZEDPHRASE **ppCoMemPhrase); -void __RPC_STUB ISpPhrase_GetSerializedPhrase_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhrase_GetText_Proxy( - ISpPhrase* This, - ULONG ulStart, - ULONG ulCount, - WINBOOL fUseTextReplacements, - LPWSTR *ppszCoMemText, - BYTE *pbDisplayAttributes); -void __RPC_STUB ISpPhrase_GetText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhrase_Discard_Proxy( - ISpPhrase* This, - DWORD dwValueTypes); -void __RPC_STUB ISpPhrase_Discard_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpPhrase_INTERFACE_DEFINED__ */ @@ -7026,27 +6363,27 @@ typedef struct ISpPhraseAltVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpPhraseAlt* This, + ISpPhraseAlt *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpPhraseAlt* This); + ISpPhraseAlt *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpPhraseAlt* This); + ISpPhraseAlt *This); /*** ISpPhrase methods ***/ HRESULT (STDMETHODCALLTYPE *GetPhrase)( - ISpPhraseAlt* This, + ISpPhraseAlt *This, SPPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)( - ISpPhraseAlt* This, + ISpPhraseAlt *This, SPSERIALIZEDPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetText)( - ISpPhraseAlt* This, + ISpPhraseAlt *This, ULONG ulStart, ULONG ulCount, WINBOOL fUseTextReplacements, @@ -7054,22 +6391,23 @@ typedef struct ISpPhraseAltVtbl { BYTE *pbDisplayAttributes); HRESULT (STDMETHODCALLTYPE *Discard)( - ISpPhraseAlt* This, + ISpPhraseAlt *This, DWORD dwValueTypes); /*** ISpPhraseAlt methods ***/ HRESULT (STDMETHODCALLTYPE *GetAltInfo)( - ISpPhraseAlt* This, + ISpPhraseAlt *This, ISpPhrase **ppParent, ULONG *pulStartElementInParent, ULONG *pcElementsInParent, ULONG *pcElementsInAlt); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpPhraseAlt* This); + ISpPhraseAlt *This); END_INTERFACE } ISpPhraseAltVtbl; + interface ISpPhraseAlt { CONST_VTBL ISpPhraseAltVtbl* lpVtbl; }; @@ -7124,24 +6462,6 @@ static FORCEINLINE HRESULT ISpPhraseAlt_Commit(ISpPhraseAlt* This) { #endif -HRESULT STDMETHODCALLTYPE ISpPhraseAlt_GetAltInfo_Proxy( - ISpPhraseAlt* This, - ISpPhrase **ppParent, - ULONG *pulStartElementInParent, - ULONG *pcElementsInParent, - ULONG *pcElementsInAlt); -void __RPC_STUB ISpPhraseAlt_GetAltInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhraseAlt_Commit_Proxy( - ISpPhraseAlt* This); -void __RPC_STUB ISpPhraseAlt_Commit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpPhraseAlt_INTERFACE_DEFINED__ */ @@ -7206,27 +6526,27 @@ typedef struct ISpRecoResultVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRecoResult* This, + ISpRecoResult *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRecoResult* This); + ISpRecoResult *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRecoResult* This); + ISpRecoResult *This); /*** ISpPhrase methods ***/ HRESULT (STDMETHODCALLTYPE *GetPhrase)( - ISpRecoResult* This, + ISpRecoResult *This, SPPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)( - ISpRecoResult* This, + ISpRecoResult *This, SPSERIALIZEDPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetText)( - ISpRecoResult* This, + ISpRecoResult *This, ULONG ulStart, ULONG ulCount, WINBOOL fUseTextReplacements, @@ -7234,16 +6554,16 @@ typedef struct ISpRecoResultVtbl { BYTE *pbDisplayAttributes); HRESULT (STDMETHODCALLTYPE *Discard)( - ISpRecoResult* This, + ISpRecoResult *This, DWORD dwValueTypes); /*** ISpRecoResult methods ***/ HRESULT (STDMETHODCALLTYPE *GetResultTimes)( - ISpRecoResult* This, + ISpRecoResult *This, SPRECORESULTTIMES *pTimes); HRESULT (STDMETHODCALLTYPE *GetAlternates)( - ISpRecoResult* This, + ISpRecoResult *This, ULONG ulStartElement, ULONG cElements, ULONG ulRequestCount, @@ -7251,33 +6571,34 @@ typedef struct ISpRecoResultVtbl { ULONG *pcPhrasesReturned); HRESULT (STDMETHODCALLTYPE *GetAudio)( - ISpRecoResult* This, + ISpRecoResult *This, ULONG ulStartElement, ULONG cElements, ISpStreamFormat **ppStream); HRESULT (STDMETHODCALLTYPE *SpeakAudio)( - ISpRecoResult* This, + ISpRecoResult *This, ULONG ulStartElement, ULONG cElements, DWORD dwFlags, ULONG *pulStreamNumber); HRESULT (STDMETHODCALLTYPE *Serialize)( - ISpRecoResult* This, + ISpRecoResult *This, SPSERIALIZEDRESULT **ppCoMemSerializedResult); HRESULT (STDMETHODCALLTYPE *ScaleAudio)( - ISpRecoResult* This, + ISpRecoResult *This, const GUID *pAudioFormatId, const WAVEFORMATEX *pWaveFormatEx); HRESULT (STDMETHODCALLTYPE *GetRecoContext)( - ISpRecoResult* This, + ISpRecoResult *This, ISpRecoContext **ppRecoContext); END_INTERFACE } ISpRecoResultVtbl; + interface ISpRecoResult { CONST_VTBL ISpRecoResultVtbl* lpVtbl; }; @@ -7352,72 +6673,6 @@ static FORCEINLINE HRESULT ISpRecoResult_GetRecoContext(ISpRecoResult* This,ISpR #endif -HRESULT STDMETHODCALLTYPE ISpRecoResult_GetResultTimes_Proxy( - ISpRecoResult* This, - SPRECORESULTTIMES *pTimes); -void __RPC_STUB ISpRecoResult_GetResultTimes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoResult_GetAlternates_Proxy( - ISpRecoResult* This, - ULONG ulStartElement, - ULONG cElements, - ULONG ulRequestCount, - ISpPhraseAlt **ppPhrases, - ULONG *pcPhrasesReturned); -void __RPC_STUB ISpRecoResult_GetAlternates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoResult_GetAudio_Proxy( - ISpRecoResult* This, - ULONG ulStartElement, - ULONG cElements, - ISpStreamFormat **ppStream); -void __RPC_STUB ISpRecoResult_GetAudio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoResult_SpeakAudio_Proxy( - ISpRecoResult* This, - ULONG ulStartElement, - ULONG cElements, - DWORD dwFlags, - ULONG *pulStreamNumber); -void __RPC_STUB ISpRecoResult_SpeakAudio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoResult_Serialize_Proxy( - ISpRecoResult* This, - SPSERIALIZEDRESULT **ppCoMemSerializedResult); -void __RPC_STUB ISpRecoResult_Serialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoResult_ScaleAudio_Proxy( - ISpRecoResult* This, - const GUID *pAudioFormatId, - const WAVEFORMATEX *pWaveFormatEx); -void __RPC_STUB ISpRecoResult_ScaleAudio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoResult_GetRecoContext_Proxy( - ISpRecoResult* This, - ISpRecoContext **ppRecoContext); -void __RPC_STUB ISpRecoResult_GetRecoContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpRecoResult_INTERFACE_DEFINED__ */ @@ -7535,23 +6790,23 @@ typedef struct ISpGrammarBuilderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpGrammarBuilder* This); + ISpGrammarBuilder *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpGrammarBuilder* This); + ISpGrammarBuilder *This); /*** ISpGrammarBuilder methods ***/ HRESULT (STDMETHODCALLTYPE *ResetGrammar)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, WORD NewLanguage); HRESULT (STDMETHODCALLTYPE *GetRule)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, LPCWSTR pszRuleName, DWORD dwRuleId, DWORD dwAttributes, @@ -7559,16 +6814,16 @@ typedef struct ISpGrammarBuilderVtbl { SPSTATEHANDLE *phInitialState); HRESULT (STDMETHODCALLTYPE *ClearRule)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, SPSTATEHANDLE hState); HRESULT (STDMETHODCALLTYPE *CreateNewState)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, SPSTATEHANDLE hState, SPSTATEHANDLE *phState); HRESULT (STDMETHODCALLTYPE *AddWordTransition)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, SPSTATEHANDLE hFromState, SPSTATEHANDLE hToState, LPCWSTR psz, @@ -7578,7 +6833,7 @@ typedef struct ISpGrammarBuilderVtbl { const SPPROPERTYINFO *pPropInfo); HRESULT (STDMETHODCALLTYPE *AddRuleTransition)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, SPSTATEHANDLE hFromState, SPSTATEHANDLE hToState, SPSTATEHANDLE hRule, @@ -7586,17 +6841,18 @@ typedef struct ISpGrammarBuilderVtbl { const SPPROPERTYINFO *pPropInfo); HRESULT (STDMETHODCALLTYPE *AddResource)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, SPSTATEHANDLE hRuleState, LPCWSTR pszResourceName, LPCWSTR pszResourceValue); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, DWORD dwReserved); END_INTERFACE } ISpGrammarBuilderVtbl; + interface ISpGrammarBuilder { CONST_VTBL ISpGrammarBuilderVtbl* lpVtbl; }; @@ -7657,87 +6913,6 @@ static FORCEINLINE HRESULT ISpGrammarBuilder_Commit(ISpGrammarBuilder* This,DWOR #endif -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_ResetGrammar_Proxy( - ISpGrammarBuilder* This, - WORD NewLanguage); -void __RPC_STUB ISpGrammarBuilder_ResetGrammar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_GetRule_Proxy( - ISpGrammarBuilder* This, - LPCWSTR pszRuleName, - DWORD dwRuleId, - DWORD dwAttributes, - WINBOOL fCreateIfNotExist, - SPSTATEHANDLE *phInitialState); -void __RPC_STUB ISpGrammarBuilder_GetRule_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_ClearRule_Proxy( - ISpGrammarBuilder* This, - SPSTATEHANDLE hState); -void __RPC_STUB ISpGrammarBuilder_ClearRule_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_CreateNewState_Proxy( - ISpGrammarBuilder* This, - SPSTATEHANDLE hState, - SPSTATEHANDLE *phState); -void __RPC_STUB ISpGrammarBuilder_CreateNewState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_AddWordTransition_Proxy( - ISpGrammarBuilder* This, - SPSTATEHANDLE hFromState, - SPSTATEHANDLE hToState, - LPCWSTR psz, - LPCWSTR pszSeparators, - SPGRAMMARWORDTYPE eWordType, - float Weight, - const SPPROPERTYINFO *pPropInfo); -void __RPC_STUB ISpGrammarBuilder_AddWordTransition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_AddRuleTransition_Proxy( - ISpGrammarBuilder* This, - SPSTATEHANDLE hFromState, - SPSTATEHANDLE hToState, - SPSTATEHANDLE hRule, - float Weight, - const SPPROPERTYINFO *pPropInfo); -void __RPC_STUB ISpGrammarBuilder_AddRuleTransition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_AddResource_Proxy( - ISpGrammarBuilder* This, - SPSTATEHANDLE hRuleState, - LPCWSTR pszResourceName, - LPCWSTR pszResourceValue); -void __RPC_STUB ISpGrammarBuilder_AddResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_Commit_Proxy( - ISpGrammarBuilder* This, - DWORD dwReserved); -void __RPC_STUB ISpGrammarBuilder_Commit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpGrammarBuilder_INTERFACE_DEFINED__ */ @@ -7840,23 +7015,23 @@ typedef struct ISpRecoGrammarVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRecoGrammar* This); + ISpRecoGrammar *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRecoGrammar* This); + ISpRecoGrammar *This); /*** ISpGrammarBuilder methods ***/ HRESULT (STDMETHODCALLTYPE *ResetGrammar)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, WORD NewLanguage); HRESULT (STDMETHODCALLTYPE *GetRule)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, LPCWSTR pszRuleName, DWORD dwRuleId, DWORD dwAttributes, @@ -7864,16 +7039,16 @@ typedef struct ISpRecoGrammarVtbl { SPSTATEHANDLE *phInitialState); HRESULT (STDMETHODCALLTYPE *ClearRule)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, SPSTATEHANDLE hState); HRESULT (STDMETHODCALLTYPE *CreateNewState)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, SPSTATEHANDLE hState, SPSTATEHANDLE *phState); HRESULT (STDMETHODCALLTYPE *AddWordTransition)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, SPSTATEHANDLE hFromState, SPSTATEHANDLE hToState, LPCWSTR psz, @@ -7883,7 +7058,7 @@ typedef struct ISpRecoGrammarVtbl { const SPPROPERTYINFO *pPropInfo); HRESULT (STDMETHODCALLTYPE *AddRuleTransition)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, SPSTATEHANDLE hFromState, SPSTATEHANDLE hToState, SPSTATEHANDLE hRule, @@ -7891,37 +7066,37 @@ typedef struct ISpRecoGrammarVtbl { const SPPROPERTYINFO *pPropInfo); HRESULT (STDMETHODCALLTYPE *AddResource)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, SPSTATEHANDLE hRuleState, LPCWSTR pszResourceName, LPCWSTR pszResourceValue); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, DWORD dwReserved); /*** ISpRecoGrammar methods ***/ HRESULT (STDMETHODCALLTYPE *GetGrammarId)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, ULONGLONG *pullGrammarId); HRESULT (STDMETHODCALLTYPE *GetRecoContext)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, ISpRecoContext **ppRecoCtxt); HRESULT (STDMETHODCALLTYPE *LoadCmdFromFile)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, LPCWSTR pszFileName, SPLOADOPTIONS Options); HRESULT (STDMETHODCALLTYPE *LoadCmdFromObject)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, REFCLSID rcid, LPCWSTR pszGrammarName, SPLOADOPTIONS Options); HRESULT (STDMETHODCALLTYPE *LoadCmdFromResource)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, HMODULE hModule, LPCWSTR pszResourceName, LPCWSTR pszResourceType, @@ -7929,12 +7104,12 @@ typedef struct ISpRecoGrammarVtbl { SPLOADOPTIONS Options); HRESULT (STDMETHODCALLTYPE *LoadCmdFromMemory)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, const SPBINARYGRAMMAR *pGrammar, SPLOADOPTIONS Options); HRESULT (STDMETHODCALLTYPE *LoadCmdFromProprietaryGrammar)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, REFGUID rguidParam, LPCWSTR pszStringParam, const void *pvDataPrarm, @@ -7942,58 +7117,59 @@ typedef struct ISpRecoGrammarVtbl { SPLOADOPTIONS Options); HRESULT (STDMETHODCALLTYPE *SetRuleState)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, LPCWSTR pszName, void *pReserved, SPRULESTATE NewState); HRESULT (STDMETHODCALLTYPE *SetRuleIdState)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, ULONG ulRuleId, SPRULESTATE NewState); HRESULT (STDMETHODCALLTYPE *LoadDictation)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, LPCWSTR pszTopicName, SPLOADOPTIONS Options); HRESULT (STDMETHODCALLTYPE *UnloadDictation)( - ISpRecoGrammar* This); + ISpRecoGrammar *This); HRESULT (STDMETHODCALLTYPE *SetDictationState)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, SPRULESTATE NewState); HRESULT (STDMETHODCALLTYPE *SetWordSequenceData)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, const WCHAR *pText, ULONG cchText, const SPTEXTSELECTIONINFO *pInfo); HRESULT (STDMETHODCALLTYPE *SetTextSelection)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, const SPTEXTSELECTIONINFO *pInfo); HRESULT (STDMETHODCALLTYPE *IsPronounceable)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, LPCWSTR pszWord, SPWORDPRONOUNCEABLE *pWordPronounceable); HRESULT (STDMETHODCALLTYPE *SetGrammarState)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, SPGRAMMARSTATE eGrammarState); HRESULT (STDMETHODCALLTYPE *SaveCmd)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, IStream *pStream, LPWSTR *ppszCoMemErrorText); HRESULT (STDMETHODCALLTYPE *GetGrammarState)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, SPGRAMMARSTATE *peGrammarState); END_INTERFACE } ISpRecoGrammarVtbl; + interface ISpRecoGrammar { CONST_VTBL ISpRecoGrammarVtbl* lpVtbl; }; @@ -8128,169 +7304,6 @@ static FORCEINLINE HRESULT ISpRecoGrammar_GetGrammarState(ISpRecoGrammar* This,S #endif -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_GetGrammarId_Proxy( - ISpRecoGrammar* This, - ULONGLONG *pullGrammarId); -void __RPC_STUB ISpRecoGrammar_GetGrammarId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_GetRecoContext_Proxy( - ISpRecoGrammar* This, - ISpRecoContext **ppRecoCtxt); -void __RPC_STUB ISpRecoGrammar_GetRecoContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromFile_Proxy( - ISpRecoGrammar* This, - LPCWSTR pszFileName, - SPLOADOPTIONS Options); -void __RPC_STUB ISpRecoGrammar_LoadCmdFromFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromObject_Proxy( - ISpRecoGrammar* This, - REFCLSID rcid, - LPCWSTR pszGrammarName, - SPLOADOPTIONS Options); -void __RPC_STUB ISpRecoGrammar_LoadCmdFromObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromResource_Proxy( - ISpRecoGrammar* This, - HMODULE hModule, - LPCWSTR pszResourceName, - LPCWSTR pszResourceType, - WORD wLanguage, - SPLOADOPTIONS Options); -void __RPC_STUB ISpRecoGrammar_LoadCmdFromResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromMemory_Proxy( - ISpRecoGrammar* This, - const SPBINARYGRAMMAR *pGrammar, - SPLOADOPTIONS Options); -void __RPC_STUB ISpRecoGrammar_LoadCmdFromMemory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromProprietaryGrammar_Proxy( - ISpRecoGrammar* This, - REFGUID rguidParam, - LPCWSTR pszStringParam, - const void *pvDataPrarm, - ULONG cbDataSize, - SPLOADOPTIONS Options); -void __RPC_STUB ISpRecoGrammar_LoadCmdFromProprietaryGrammar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetRuleState_Proxy( - ISpRecoGrammar* This, - LPCWSTR pszName, - void *pReserved, - SPRULESTATE NewState); -void __RPC_STUB ISpRecoGrammar_SetRuleState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetRuleIdState_Proxy( - ISpRecoGrammar* This, - ULONG ulRuleId, - SPRULESTATE NewState); -void __RPC_STUB ISpRecoGrammar_SetRuleIdState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadDictation_Proxy( - ISpRecoGrammar* This, - LPCWSTR pszTopicName, - SPLOADOPTIONS Options); -void __RPC_STUB ISpRecoGrammar_LoadDictation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_UnloadDictation_Proxy( - ISpRecoGrammar* This); -void __RPC_STUB ISpRecoGrammar_UnloadDictation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetDictationState_Proxy( - ISpRecoGrammar* This, - SPRULESTATE NewState); -void __RPC_STUB ISpRecoGrammar_SetDictationState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetWordSequenceData_Proxy( - ISpRecoGrammar* This, - const WCHAR *pText, - ULONG cchText, - const SPTEXTSELECTIONINFO *pInfo); -void __RPC_STUB ISpRecoGrammar_SetWordSequenceData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetTextSelection_Proxy( - ISpRecoGrammar* This, - const SPTEXTSELECTIONINFO *pInfo); -void __RPC_STUB ISpRecoGrammar_SetTextSelection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_IsPronounceable_Proxy( - ISpRecoGrammar* This, - LPCWSTR pszWord, - SPWORDPRONOUNCEABLE *pWordPronounceable); -void __RPC_STUB ISpRecoGrammar_IsPronounceable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetGrammarState_Proxy( - ISpRecoGrammar* This, - SPGRAMMARSTATE eGrammarState); -void __RPC_STUB ISpRecoGrammar_SetGrammarState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SaveCmd_Proxy( - ISpRecoGrammar* This, - IStream *pStream, - LPWSTR *ppszCoMemErrorText); -void __RPC_STUB ISpRecoGrammar_SaveCmd_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_GetGrammarState_Proxy( - ISpRecoGrammar* This, - SPGRAMMARSTATE *peGrammarState); -void __RPC_STUB ISpRecoGrammar_GetGrammarState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpRecoGrammar_INTERFACE_DEFINED__ */ @@ -8393,151 +7406,152 @@ typedef struct ISpRecoContextVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRecoContext* This, + ISpRecoContext *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRecoContext* This); + ISpRecoContext *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRecoContext* This); + ISpRecoContext *This); /*** ISpNotifySource methods ***/ HRESULT (STDMETHODCALLTYPE *SetNotifySink)( - ISpRecoContext* This, + ISpRecoContext *This, ISpNotifySink *pNotifySink); HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)( - ISpRecoContext* This, + ISpRecoContext *This, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)( - ISpRecoContext* This, + ISpRecoContext *This, SPNOTIFYCALLBACK *pfnCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)( - ISpRecoContext* This, + ISpRecoContext *This, ISpNotifyCallback *pSpCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)( - ISpRecoContext* This); + ISpRecoContext *This); HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)( - ISpRecoContext* This, + ISpRecoContext *This, DWORD dwMilliseconds); HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)( - ISpRecoContext* This); + ISpRecoContext *This); /*** ISpEventSource methods ***/ HRESULT (STDMETHODCALLTYPE *SetInterest)( - ISpRecoContext* This, + ISpRecoContext *This, ULONGLONG ullEventInterest, ULONGLONG ullQueuedInterest); HRESULT (STDMETHODCALLTYPE *GetEvents)( - ISpRecoContext* This, + ISpRecoContext *This, ULONG ulCount, SPEVENT *pEventArray, ULONG *pulFetched); HRESULT (STDMETHODCALLTYPE *GetInfo)( - ISpRecoContext* This, + ISpRecoContext *This, SPEVENTSOURCEINFO *pInfo); /*** ISpRecoContext methods ***/ HRESULT (STDMETHODCALLTYPE *GetRecognizer)( - ISpRecoContext* This, + ISpRecoContext *This, ISpRecognizer **ppRecognizer); HRESULT (STDMETHODCALLTYPE *CreateGrammar)( - ISpRecoContext* This, + ISpRecoContext *This, ULONGLONG ullGrammarId, ISpRecoGrammar **ppGrammar); HRESULT (STDMETHODCALLTYPE *GetStatus)( - ISpRecoContext* This, + ISpRecoContext *This, SPRECOCONTEXTSTATUS *pStatus); HRESULT (STDMETHODCALLTYPE *GetMaxAlternates)( - ISpRecoContext* This, + ISpRecoContext *This, ULONG *pcAlternates); HRESULT (STDMETHODCALLTYPE *SetMaxAlternates)( - ISpRecoContext* This, + ISpRecoContext *This, ULONG cAlternates); HRESULT (STDMETHODCALLTYPE *SetAudioOptions)( - ISpRecoContext* This, + ISpRecoContext *This, SPAUDIOOPTIONS Options, const GUID *pAudioFormatId, const WAVEFORMATEX *pWaveFormatEx); HRESULT (STDMETHODCALLTYPE *GetAudioOptions)( - ISpRecoContext* This, + ISpRecoContext *This, SPAUDIOOPTIONS *pOptions, GUID *pAudioFormatId, WAVEFORMATEX **ppCoMemWFEX); HRESULT (STDMETHODCALLTYPE *DeserializeResult)( - ISpRecoContext* This, + ISpRecoContext *This, const SPSERIALIZEDRESULT *pSerializedResult, ISpRecoResult **ppResult); HRESULT (STDMETHODCALLTYPE *Bookmark)( - ISpRecoContext* This, + ISpRecoContext *This, SPBOOKMARKOPTIONS Options, ULONGLONG ullStreamPosition, LPARAM lparamEvent); HRESULT (STDMETHODCALLTYPE *SetAdaptationData)( - ISpRecoContext* This, + ISpRecoContext *This, LPCWSTR pAdaptationData, const ULONG cch); HRESULT (STDMETHODCALLTYPE *Pause)( - ISpRecoContext* This, + ISpRecoContext *This, DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *Resume)( - ISpRecoContext* This, + ISpRecoContext *This, DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *SetVoice)( - ISpRecoContext* This, + ISpRecoContext *This, ISpVoice *pVoice, WINBOOL fAllowFormatChanges); HRESULT (STDMETHODCALLTYPE *GetVoice)( - ISpRecoContext* This, + ISpRecoContext *This, ISpVoice **ppVoice); HRESULT (STDMETHODCALLTYPE *SetVoicePurgeEvent)( - ISpRecoContext* This, + ISpRecoContext *This, ULONGLONG ullEventInterest); HRESULT (STDMETHODCALLTYPE *GetVoicePurgeEvent)( - ISpRecoContext* This, + ISpRecoContext *This, ULONGLONG *pullEventInterest); HRESULT (STDMETHODCALLTYPE *SetContextState)( - ISpRecoContext* This, + ISpRecoContext *This, SPCONTEXTSTATE eContextState); HRESULT (STDMETHODCALLTYPE *GetContextState)( - ISpRecoContext* This, + ISpRecoContext *This, SPCONTEXTSTATE *peContextState); END_INTERFACE } ISpRecoContextVtbl; + interface ISpRecoContext { CONST_VTBL ISpRecoContextVtbl* lpVtbl; }; @@ -8682,160 +7696,6 @@ static FORCEINLINE HRESULT ISpRecoContext_GetContextState(ISpRecoContext* This,S #endif -HRESULT STDMETHODCALLTYPE ISpRecoContext_GetRecognizer_Proxy( - ISpRecoContext* This, - ISpRecognizer **ppRecognizer); -void __RPC_STUB ISpRecoContext_GetRecognizer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_CreateGrammar_Proxy( - ISpRecoContext* This, - ULONGLONG ullGrammarId, - ISpRecoGrammar **ppGrammar); -void __RPC_STUB ISpRecoContext_CreateGrammar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_GetStatus_Proxy( - ISpRecoContext* This, - SPRECOCONTEXTSTATUS *pStatus); -void __RPC_STUB ISpRecoContext_GetStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_GetMaxAlternates_Proxy( - ISpRecoContext* This, - ULONG *pcAlternates); -void __RPC_STUB ISpRecoContext_GetMaxAlternates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_SetMaxAlternates_Proxy( - ISpRecoContext* This, - ULONG cAlternates); -void __RPC_STUB ISpRecoContext_SetMaxAlternates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_SetAudioOptions_Proxy( - ISpRecoContext* This, - SPAUDIOOPTIONS Options, - const GUID *pAudioFormatId, - const WAVEFORMATEX *pWaveFormatEx); -void __RPC_STUB ISpRecoContext_SetAudioOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_GetAudioOptions_Proxy( - ISpRecoContext* This, - SPAUDIOOPTIONS *pOptions, - GUID *pAudioFormatId, - WAVEFORMATEX **ppCoMemWFEX); -void __RPC_STUB ISpRecoContext_GetAudioOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_DeserializeResult_Proxy( - ISpRecoContext* This, - const SPSERIALIZEDRESULT *pSerializedResult, - ISpRecoResult **ppResult); -void __RPC_STUB ISpRecoContext_DeserializeResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_Bookmark_Proxy( - ISpRecoContext* This, - SPBOOKMARKOPTIONS Options, - ULONGLONG ullStreamPosition, - LPARAM lparamEvent); -void __RPC_STUB ISpRecoContext_Bookmark_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_SetAdaptationData_Proxy( - ISpRecoContext* This, - LPCWSTR pAdaptationData, - const ULONG cch); -void __RPC_STUB ISpRecoContext_SetAdaptationData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_Pause_Proxy( - ISpRecoContext* This, - DWORD dwReserved); -void __RPC_STUB ISpRecoContext_Pause_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_Resume_Proxy( - ISpRecoContext* This, - DWORD dwReserved); -void __RPC_STUB ISpRecoContext_Resume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_SetVoice_Proxy( - ISpRecoContext* This, - ISpVoice *pVoice, - WINBOOL fAllowFormatChanges); -void __RPC_STUB ISpRecoContext_SetVoice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_GetVoice_Proxy( - ISpRecoContext* This, - ISpVoice **ppVoice); -void __RPC_STUB ISpRecoContext_GetVoice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_SetVoicePurgeEvent_Proxy( - ISpRecoContext* This, - ULONGLONG ullEventInterest); -void __RPC_STUB ISpRecoContext_SetVoicePurgeEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_GetVoicePurgeEvent_Proxy( - ISpRecoContext* This, - ULONGLONG *pullEventInterest); -void __RPC_STUB ISpRecoContext_GetVoicePurgeEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_SetContextState_Proxy( - ISpRecoContext* This, - SPCONTEXTSTATE eContextState); -void __RPC_STUB ISpRecoContext_SetContextState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_GetContextState_Proxy( - ISpRecoContext* This, - SPCONTEXTSTATE *peContextState); -void __RPC_STUB ISpRecoContext_GetContextState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpRecoContext_INTERFACE_DEFINED__ */ @@ -8876,39 +7736,40 @@ typedef struct ISpPropertiesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpProperties* This, + ISpProperties *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpProperties* This); + ISpProperties *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpProperties* This); + ISpProperties *This); /*** ISpProperties methods ***/ HRESULT (STDMETHODCALLTYPE *SetPropertyNum)( - ISpProperties* This, + ISpProperties *This, LPCWSTR pName, LONG lValue); HRESULT (STDMETHODCALLTYPE *GetPropertyNum)( - ISpProperties* This, + ISpProperties *This, LPCWSTR pName, LONG *plValue); HRESULT (STDMETHODCALLTYPE *SetPropertyString)( - ISpProperties* This, + ISpProperties *This, LPCWSTR pName, LPCWSTR pValue); HRESULT (STDMETHODCALLTYPE *GetPropertyString)( - ISpProperties* This, + ISpProperties *This, LPCWSTR pName, LPWSTR *ppCoMemValue); END_INTERFACE } ISpPropertiesVtbl; + interface ISpProperties { CONST_VTBL ISpPropertiesVtbl* lpVtbl; }; @@ -8953,42 +7814,6 @@ static FORCEINLINE HRESULT ISpProperties_GetPropertyString(ISpProperties* This,L #endif -HRESULT STDMETHODCALLTYPE ISpProperties_SetPropertyNum_Proxy( - ISpProperties* This, - LPCWSTR pName, - LONG lValue); -void __RPC_STUB ISpProperties_SetPropertyNum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpProperties_GetPropertyNum_Proxy( - ISpProperties* This, - LPCWSTR pName, - LONG *plValue); -void __RPC_STUB ISpProperties_GetPropertyNum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpProperties_SetPropertyString_Proxy( - ISpProperties* This, - LPCWSTR pName, - LPCWSTR pValue); -void __RPC_STUB ISpProperties_SetPropertyString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpProperties_GetPropertyString_Proxy( - ISpProperties* This, - LPCWSTR pName, - LPWSTR *ppCoMemValue); -void __RPC_STUB ISpProperties_GetPropertyString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpProperties_INTERFACE_DEFINED__ */ @@ -9094,101 +7919,101 @@ typedef struct ISpRecognizerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRecognizer* This, + ISpRecognizer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRecognizer* This); + ISpRecognizer *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRecognizer* This); + ISpRecognizer *This); /*** ISpProperties methods ***/ HRESULT (STDMETHODCALLTYPE *SetPropertyNum)( - ISpRecognizer* This, + ISpRecognizer *This, LPCWSTR pName, LONG lValue); HRESULT (STDMETHODCALLTYPE *GetPropertyNum)( - ISpRecognizer* This, + ISpRecognizer *This, LPCWSTR pName, LONG *plValue); HRESULT (STDMETHODCALLTYPE *SetPropertyString)( - ISpRecognizer* This, + ISpRecognizer *This, LPCWSTR pName, LPCWSTR pValue); HRESULT (STDMETHODCALLTYPE *GetPropertyString)( - ISpRecognizer* This, + ISpRecognizer *This, LPCWSTR pName, LPWSTR *ppCoMemValue); /*** ISpRecognizer methods ***/ HRESULT (STDMETHODCALLTYPE *SetRecognizer)( - ISpRecognizer* This, + ISpRecognizer *This, ISpObjectToken *pRecognizer); HRESULT (STDMETHODCALLTYPE *GetRecognizer)( - ISpRecognizer* This, + ISpRecognizer *This, ISpObjectToken **ppRecognizer); HRESULT (STDMETHODCALLTYPE *SetInput)( - ISpRecognizer* This, + ISpRecognizer *This, IUnknown *pUnkInput, WINBOOL fAllowFormatChanges); HRESULT (STDMETHODCALLTYPE *GetInputObjectToken)( - ISpRecognizer* This, + ISpRecognizer *This, ISpObjectToken **ppToken); HRESULT (STDMETHODCALLTYPE *GetInputStream)( - ISpRecognizer* This, + ISpRecognizer *This, ISpStreamFormat **ppStream); HRESULT (STDMETHODCALLTYPE *CreateRecoContext)( - ISpRecognizer* This, + ISpRecognizer *This, ISpRecoContext **ppNewCtxt); HRESULT (STDMETHODCALLTYPE *GetRecoProfile)( - ISpRecognizer* This, + ISpRecognizer *This, ISpObjectToken **ppToken); HRESULT (STDMETHODCALLTYPE *SetRecoProfile)( - ISpRecognizer* This, + ISpRecognizer *This, ISpObjectToken *pToken); HRESULT (STDMETHODCALLTYPE *IsSharedInstance)( - ISpRecognizer* This); + ISpRecognizer *This); HRESULT (STDMETHODCALLTYPE *GetRecoState)( - ISpRecognizer* This, + ISpRecognizer *This, SPRECOSTATE *pState); HRESULT (STDMETHODCALLTYPE *SetRecoState)( - ISpRecognizer* This, + ISpRecognizer *This, SPRECOSTATE NewState); HRESULT (STDMETHODCALLTYPE *GetStatus)( - ISpRecognizer* This, + ISpRecognizer *This, SPRECOGNIZERSTATUS *pStatus); HRESULT (STDMETHODCALLTYPE *GetFormat)( - ISpRecognizer* This, + ISpRecognizer *This, SPSTREAMFORMATTYPE WaveFormatType, GUID *pFormatId, WAVEFORMATEX **ppCoMemWFEX); HRESULT (STDMETHODCALLTYPE *IsUISupported)( - ISpRecognizer* This, + ISpRecognizer *This, LPCWSTR pszTypeOfUI, void *pvExtraData, ULONG cbExtraData, WINBOOL *pfSupported); HRESULT (STDMETHODCALLTYPE *DisplayUI)( - ISpRecognizer* This, + ISpRecognizer *This, HWND hwndParent, LPCWSTR pszTitle, LPCWSTR pszTypeOfUI, @@ -9196,11 +8021,12 @@ typedef struct ISpRecognizerVtbl { ULONG cbExtraData); HRESULT (STDMETHODCALLTYPE *EmulateRecognition)( - ISpRecognizer* This, + ISpRecognizer *This, ISpPhrase *pPhrase); END_INTERFACE } ISpRecognizerVtbl; + interface ISpRecognizer { CONST_VTBL ISpRecognizerVtbl* lpVtbl; }; @@ -9311,120 +8137,6 @@ static FORCEINLINE HRESULT ISpRecognizer_EmulateRecognition(ISpRecognizer* This, #endif -HRESULT STDMETHODCALLTYPE ISpRecognizer_SetRecognizer_Proxy( - ISpRecognizer* This, - ISpObjectToken *pRecognizer); -void __RPC_STUB ISpRecognizer_SetRecognizer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_GetRecognizer_Proxy( - ISpRecognizer* This, - ISpObjectToken **ppRecognizer); -void __RPC_STUB ISpRecognizer_GetRecognizer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_SetInput_Proxy( - ISpRecognizer* This, - IUnknown *pUnkInput, - WINBOOL fAllowFormatChanges); -void __RPC_STUB ISpRecognizer_SetInput_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_GetInputObjectToken_Proxy( - ISpRecognizer* This, - ISpObjectToken **ppToken); -void __RPC_STUB ISpRecognizer_GetInputObjectToken_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_GetInputStream_Proxy( - ISpRecognizer* This, - ISpStreamFormat **ppStream); -void __RPC_STUB ISpRecognizer_GetInputStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_CreateRecoContext_Proxy( - ISpRecognizer* This, - ISpRecoContext **ppNewCtxt); -void __RPC_STUB ISpRecognizer_CreateRecoContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_GetRecoProfile_Proxy( - ISpRecognizer* This, - ISpObjectToken **ppToken); -void __RPC_STUB ISpRecognizer_GetRecoProfile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_SetRecoProfile_Proxy( - ISpRecognizer* This, - ISpObjectToken *pToken); -void __RPC_STUB ISpRecognizer_SetRecoProfile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_IsSharedInstance_Proxy( - ISpRecognizer* This); -void __RPC_STUB ISpRecognizer_IsSharedInstance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_GetRecoState_Proxy( - ISpRecognizer* This, - SPRECOSTATE *pState); -void __RPC_STUB ISpRecognizer_GetRecoState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_SetRecoState_Proxy( - ISpRecognizer* This, - SPRECOSTATE NewState); -void __RPC_STUB ISpRecognizer_SetRecoState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_GetStatus_Proxy( - ISpRecognizer* This, - SPRECOGNIZERSTATUS *pStatus); -void __RPC_STUB ISpRecognizer_GetStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_GetFormat_Proxy( - ISpRecognizer* This, - SPSTREAMFORMATTYPE WaveFormatType, - GUID *pFormatId, - WAVEFORMATEX **ppCoMemWFEX); -void __RPC_STUB ISpRecognizer_GetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_EmulateRecognition_Proxy( - ISpRecognizer* This, - ISpPhrase *pPhrase); -void __RPC_STUB ISpRecognizer_EmulateRecognition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpRecognizer_INTERFACE_DEFINED__ */ @@ -9434,231 +8146,369 @@ DEFINE_GUID(LIBID_SpeechLib, 0xc866ca3a, 0x32f7, 0x11d2, 0x96,0x02, 0x00,0xc0,0x #ifndef __ISpeechDataKey_FWD_DEFINED__ #define __ISpeechDataKey_FWD_DEFINED__ typedef interface ISpeechDataKey ISpeechDataKey; +#ifdef __cplusplus +interface ISpeechDataKey; +#endif /* __cplusplus */ #endif #ifndef __ISpeechObjectToken_FWD_DEFINED__ #define __ISpeechObjectToken_FWD_DEFINED__ typedef interface ISpeechObjectToken ISpeechObjectToken; +#ifdef __cplusplus +interface ISpeechObjectToken; +#endif /* __cplusplus */ #endif #ifndef __ISpeechObjectTokens_FWD_DEFINED__ #define __ISpeechObjectTokens_FWD_DEFINED__ typedef interface ISpeechObjectTokens ISpeechObjectTokens; +#ifdef __cplusplus +interface ISpeechObjectTokens; +#endif /* __cplusplus */ #endif #ifndef __ISpeechObjectTokenCategory_FWD_DEFINED__ #define __ISpeechObjectTokenCategory_FWD_DEFINED__ typedef interface ISpeechObjectTokenCategory ISpeechObjectTokenCategory; +#ifdef __cplusplus +interface ISpeechObjectTokenCategory; +#endif /* __cplusplus */ #endif #ifndef __ISpeechAudioBufferInfo_FWD_DEFINED__ #define __ISpeechAudioBufferInfo_FWD_DEFINED__ typedef interface ISpeechAudioBufferInfo ISpeechAudioBufferInfo; +#ifdef __cplusplus +interface ISpeechAudioBufferInfo; +#endif /* __cplusplus */ #endif #ifndef __ISpeechAudioStatus_FWD_DEFINED__ #define __ISpeechAudioStatus_FWD_DEFINED__ typedef interface ISpeechAudioStatus ISpeechAudioStatus; +#ifdef __cplusplus +interface ISpeechAudioStatus; +#endif /* __cplusplus */ #endif #ifndef __ISpeechAudioFormat_FWD_DEFINED__ #define __ISpeechAudioFormat_FWD_DEFINED__ typedef interface ISpeechAudioFormat ISpeechAudioFormat; +#ifdef __cplusplus +interface ISpeechAudioFormat; +#endif /* __cplusplus */ #endif #ifndef __ISpeechWaveFormatEx_FWD_DEFINED__ #define __ISpeechWaveFormatEx_FWD_DEFINED__ typedef interface ISpeechWaveFormatEx ISpeechWaveFormatEx; +#ifdef __cplusplus +interface ISpeechWaveFormatEx; +#endif /* __cplusplus */ #endif #ifndef __ISpeechBaseStream_FWD_DEFINED__ #define __ISpeechBaseStream_FWD_DEFINED__ typedef interface ISpeechBaseStream ISpeechBaseStream; +#ifdef __cplusplus +interface ISpeechBaseStream; +#endif /* __cplusplus */ #endif #ifndef __ISpeechFileStream_FWD_DEFINED__ #define __ISpeechFileStream_FWD_DEFINED__ typedef interface ISpeechFileStream ISpeechFileStream; +#ifdef __cplusplus +interface ISpeechFileStream; +#endif /* __cplusplus */ #endif #ifndef __ISpeechMemoryStream_FWD_DEFINED__ #define __ISpeechMemoryStream_FWD_DEFINED__ typedef interface ISpeechMemoryStream ISpeechMemoryStream; +#ifdef __cplusplus +interface ISpeechMemoryStream; +#endif /* __cplusplus */ #endif #ifndef __ISpeechCustomStream_FWD_DEFINED__ #define __ISpeechCustomStream_FWD_DEFINED__ typedef interface ISpeechCustomStream ISpeechCustomStream; +#ifdef __cplusplus +interface ISpeechCustomStream; +#endif /* __cplusplus */ #endif #ifndef __ISpeechAudio_FWD_DEFINED__ #define __ISpeechAudio_FWD_DEFINED__ typedef interface ISpeechAudio ISpeechAudio; +#ifdef __cplusplus +interface ISpeechAudio; +#endif /* __cplusplus */ #endif #ifndef __ISpeechMMSysAudio_FWD_DEFINED__ #define __ISpeechMMSysAudio_FWD_DEFINED__ typedef interface ISpeechMMSysAudio ISpeechMMSysAudio; +#ifdef __cplusplus +interface ISpeechMMSysAudio; +#endif /* __cplusplus */ #endif #ifndef __ISpeechVoice_FWD_DEFINED__ #define __ISpeechVoice_FWD_DEFINED__ typedef interface ISpeechVoice ISpeechVoice; +#ifdef __cplusplus +interface ISpeechVoice; +#endif /* __cplusplus */ #endif #ifndef __ISpeechVoiceStatus_FWD_DEFINED__ #define __ISpeechVoiceStatus_FWD_DEFINED__ typedef interface ISpeechVoiceStatus ISpeechVoiceStatus; +#ifdef __cplusplus +interface ISpeechVoiceStatus; +#endif /* __cplusplus */ #endif #ifndef ___ISpeechVoiceEvents_FWD_DEFINED__ #define ___ISpeechVoiceEvents_FWD_DEFINED__ typedef interface _ISpeechVoiceEvents _ISpeechVoiceEvents; +#ifdef __cplusplus +interface _ISpeechVoiceEvents; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecognizer_FWD_DEFINED__ #define __ISpeechRecognizer_FWD_DEFINED__ typedef interface ISpeechRecognizer ISpeechRecognizer; +#ifdef __cplusplus +interface ISpeechRecognizer; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecognizerStatus_FWD_DEFINED__ #define __ISpeechRecognizerStatus_FWD_DEFINED__ typedef interface ISpeechRecognizerStatus ISpeechRecognizerStatus; +#ifdef __cplusplus +interface ISpeechRecognizerStatus; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoContext_FWD_DEFINED__ #define __ISpeechRecoContext_FWD_DEFINED__ typedef interface ISpeechRecoContext ISpeechRecoContext; +#ifdef __cplusplus +interface ISpeechRecoContext; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoGrammar_FWD_DEFINED__ #define __ISpeechRecoGrammar_FWD_DEFINED__ typedef interface ISpeechRecoGrammar ISpeechRecoGrammar; +#ifdef __cplusplus +interface ISpeechRecoGrammar; +#endif /* __cplusplus */ #endif #ifndef ___ISpeechRecoContextEvents_FWD_DEFINED__ #define ___ISpeechRecoContextEvents_FWD_DEFINED__ typedef interface _ISpeechRecoContextEvents _ISpeechRecoContextEvents; +#ifdef __cplusplus +interface _ISpeechRecoContextEvents; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRule_FWD_DEFINED__ #define __ISpeechGrammarRule_FWD_DEFINED__ typedef interface ISpeechGrammarRule ISpeechGrammarRule; +#ifdef __cplusplus +interface ISpeechGrammarRule; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRules_FWD_DEFINED__ #define __ISpeechGrammarRules_FWD_DEFINED__ typedef interface ISpeechGrammarRules ISpeechGrammarRules; +#ifdef __cplusplus +interface ISpeechGrammarRules; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRuleState_FWD_DEFINED__ #define __ISpeechGrammarRuleState_FWD_DEFINED__ typedef interface ISpeechGrammarRuleState ISpeechGrammarRuleState; +#ifdef __cplusplus +interface ISpeechGrammarRuleState; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRuleStateTransition_FWD_DEFINED__ #define __ISpeechGrammarRuleStateTransition_FWD_DEFINED__ typedef interface ISpeechGrammarRuleStateTransition ISpeechGrammarRuleStateTransition; +#ifdef __cplusplus +interface ISpeechGrammarRuleStateTransition; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRuleStateTransitions_FWD_DEFINED__ #define __ISpeechGrammarRuleStateTransitions_FWD_DEFINED__ typedef interface ISpeechGrammarRuleStateTransitions ISpeechGrammarRuleStateTransitions; +#ifdef __cplusplus +interface ISpeechGrammarRuleStateTransitions; +#endif /* __cplusplus */ #endif #ifndef __ISpeechTextSelectionInformation_FWD_DEFINED__ #define __ISpeechTextSelectionInformation_FWD_DEFINED__ typedef interface ISpeechTextSelectionInformation ISpeechTextSelectionInformation; +#ifdef __cplusplus +interface ISpeechTextSelectionInformation; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoResult_FWD_DEFINED__ #define __ISpeechRecoResult_FWD_DEFINED__ typedef interface ISpeechRecoResult ISpeechRecoResult; +#ifdef __cplusplus +interface ISpeechRecoResult; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoResultTimes_FWD_DEFINED__ #define __ISpeechRecoResultTimes_FWD_DEFINED__ typedef interface ISpeechRecoResultTimes ISpeechRecoResultTimes; +#ifdef __cplusplus +interface ISpeechRecoResultTimes; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseAlternate_FWD_DEFINED__ #define __ISpeechPhraseAlternate_FWD_DEFINED__ typedef interface ISpeechPhraseAlternate ISpeechPhraseAlternate; +#ifdef __cplusplus +interface ISpeechPhraseAlternate; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseAlternates_FWD_DEFINED__ #define __ISpeechPhraseAlternates_FWD_DEFINED__ typedef interface ISpeechPhraseAlternates ISpeechPhraseAlternates; +#ifdef __cplusplus +interface ISpeechPhraseAlternates; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseInfo_FWD_DEFINED__ #define __ISpeechPhraseInfo_FWD_DEFINED__ typedef interface ISpeechPhraseInfo ISpeechPhraseInfo; +#ifdef __cplusplus +interface ISpeechPhraseInfo; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseElement_FWD_DEFINED__ #define __ISpeechPhraseElement_FWD_DEFINED__ typedef interface ISpeechPhraseElement ISpeechPhraseElement; +#ifdef __cplusplus +interface ISpeechPhraseElement; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseElements_FWD_DEFINED__ #define __ISpeechPhraseElements_FWD_DEFINED__ typedef interface ISpeechPhraseElements ISpeechPhraseElements; +#ifdef __cplusplus +interface ISpeechPhraseElements; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseReplacement_FWD_DEFINED__ #define __ISpeechPhraseReplacement_FWD_DEFINED__ typedef interface ISpeechPhraseReplacement ISpeechPhraseReplacement; +#ifdef __cplusplus +interface ISpeechPhraseReplacement; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseReplacements_FWD_DEFINED__ #define __ISpeechPhraseReplacements_FWD_DEFINED__ typedef interface ISpeechPhraseReplacements ISpeechPhraseReplacements; +#ifdef __cplusplus +interface ISpeechPhraseReplacements; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseProperty_FWD_DEFINED__ #define __ISpeechPhraseProperty_FWD_DEFINED__ typedef interface ISpeechPhraseProperty ISpeechPhraseProperty; +#ifdef __cplusplus +interface ISpeechPhraseProperty; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseProperties_FWD_DEFINED__ #define __ISpeechPhraseProperties_FWD_DEFINED__ typedef interface ISpeechPhraseProperties ISpeechPhraseProperties; +#ifdef __cplusplus +interface ISpeechPhraseProperties; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseRule_FWD_DEFINED__ #define __ISpeechPhraseRule_FWD_DEFINED__ typedef interface ISpeechPhraseRule ISpeechPhraseRule; +#ifdef __cplusplus +interface ISpeechPhraseRule; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseRules_FWD_DEFINED__ #define __ISpeechPhraseRules_FWD_DEFINED__ typedef interface ISpeechPhraseRules ISpeechPhraseRules; +#ifdef __cplusplus +interface ISpeechPhraseRules; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexicon_FWD_DEFINED__ #define __ISpeechLexicon_FWD_DEFINED__ typedef interface ISpeechLexicon ISpeechLexicon; +#ifdef __cplusplus +interface ISpeechLexicon; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexiconWords_FWD_DEFINED__ #define __ISpeechLexiconWords_FWD_DEFINED__ typedef interface ISpeechLexiconWords ISpeechLexiconWords; +#ifdef __cplusplus +interface ISpeechLexiconWords; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexiconWord_FWD_DEFINED__ #define __ISpeechLexiconWord_FWD_DEFINED__ typedef interface ISpeechLexiconWord ISpeechLexiconWord; +#ifdef __cplusplus +interface ISpeechLexiconWord; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexiconPronunciations_FWD_DEFINED__ #define __ISpeechLexiconPronunciations_FWD_DEFINED__ typedef interface ISpeechLexiconPronunciations ISpeechLexiconPronunciations; +#ifdef __cplusplus +interface ISpeechLexiconPronunciations; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexiconPronunciation_FWD_DEFINED__ #define __ISpeechLexiconPronunciation_FWD_DEFINED__ typedef interface ISpeechLexiconPronunciation ISpeechLexiconPronunciation; +#ifdef __cplusplus +interface ISpeechLexiconPronunciation; +#endif /* __cplusplus */ #endif typedef LONG SpeechLanguageId; @@ -9790,29 +8640,29 @@ typedef struct ISpeechDataKeyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechDataKey* This, + ISpeechDataKey *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechDataKey* This); + ISpeechDataKey *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechDataKey* This); + ISpeechDataKey *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechDataKey* This, + ISpeechDataKey *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechDataKey* This, + ISpeechDataKey *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechDataKey* This, + ISpeechDataKey *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -9820,7 +8670,7 @@ typedef struct ISpeechDataKeyVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechDataKey* This, + ISpeechDataKey *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -9832,65 +8682,66 @@ typedef struct ISpeechDataKeyVtbl { /*** ISpeechDataKey methods ***/ HRESULT (STDMETHODCALLTYPE *SetBinaryValue)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR ValueName, VARIANT Value); HRESULT (STDMETHODCALLTYPE *GetBinaryValue)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR ValueName, VARIANT *Value); HRESULT (STDMETHODCALLTYPE *SetStringValue)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR ValueName, const BSTR Value); HRESULT (STDMETHODCALLTYPE *GetStringValue)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR ValueName, BSTR *Value); HRESULT (STDMETHODCALLTYPE *SetLongValue)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR ValueName, LONG Value); HRESULT (STDMETHODCALLTYPE *GetLongValue)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR ValueName, LONG *Value); HRESULT (STDMETHODCALLTYPE *OpenKey)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR SubKeyName, ISpeechDataKey **SubKey); HRESULT (STDMETHODCALLTYPE *CreateKey)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR SubKeyName, ISpeechDataKey **SubKey); HRESULT (STDMETHODCALLTYPE *DeleteKey)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR SubKeyName); HRESULT (STDMETHODCALLTYPE *DeleteValue)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR ValueName); HRESULT (STDMETHODCALLTYPE *EnumKeys)( - ISpeechDataKey* This, + ISpeechDataKey *This, LONG Index, BSTR *SubKeyName); HRESULT (STDMETHODCALLTYPE *EnumValues)( - ISpeechDataKey* This, + ISpeechDataKey *This, LONG Index, BSTR *ValueName); END_INTERFACE } ISpeechDataKeyVtbl; + interface ISpeechDataKey { CONST_VTBL ISpeechDataKeyVtbl* lpVtbl; }; @@ -9985,112 +8836,6 @@ static FORCEINLINE HRESULT ISpeechDataKey_EnumValues(ISpeechDataKey* This,LONG I #endif -HRESULT STDMETHODCALLTYPE ISpeechDataKey_SetBinaryValue_Proxy( - ISpeechDataKey* This, - const BSTR ValueName, - VARIANT Value); -void __RPC_STUB ISpeechDataKey_SetBinaryValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_GetBinaryValue_Proxy( - ISpeechDataKey* This, - const BSTR ValueName, - VARIANT *Value); -void __RPC_STUB ISpeechDataKey_GetBinaryValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_SetStringValue_Proxy( - ISpeechDataKey* This, - const BSTR ValueName, - const BSTR Value); -void __RPC_STUB ISpeechDataKey_SetStringValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_GetStringValue_Proxy( - ISpeechDataKey* This, - const BSTR ValueName, - BSTR *Value); -void __RPC_STUB ISpeechDataKey_GetStringValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_SetLongValue_Proxy( - ISpeechDataKey* This, - const BSTR ValueName, - LONG Value); -void __RPC_STUB ISpeechDataKey_SetLongValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_GetLongValue_Proxy( - ISpeechDataKey* This, - const BSTR ValueName, - LONG *Value); -void __RPC_STUB ISpeechDataKey_GetLongValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_OpenKey_Proxy( - ISpeechDataKey* This, - const BSTR SubKeyName, - ISpeechDataKey **SubKey); -void __RPC_STUB ISpeechDataKey_OpenKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_CreateKey_Proxy( - ISpeechDataKey* This, - const BSTR SubKeyName, - ISpeechDataKey **SubKey); -void __RPC_STUB ISpeechDataKey_CreateKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_DeleteKey_Proxy( - ISpeechDataKey* This, - const BSTR SubKeyName); -void __RPC_STUB ISpeechDataKey_DeleteKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_DeleteValue_Proxy( - ISpeechDataKey* This, - const BSTR ValueName); -void __RPC_STUB ISpeechDataKey_DeleteValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_EnumKeys_Proxy( - ISpeechDataKey* This, - LONG Index, - BSTR *SubKeyName); -void __RPC_STUB ISpeechDataKey_EnumKeys_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_EnumValues_Proxy( - ISpeechDataKey* This, - LONG Index, - BSTR *ValueName); -void __RPC_STUB ISpeechDataKey_EnumValues_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechDataKey_INTERFACE_DEFINED__ */ @@ -10174,29 +8919,29 @@ typedef struct ISpeechObjectTokenVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechObjectToken* This); + ISpeechObjectToken *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechObjectToken* This); + ISpeechObjectToken *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -10204,7 +8949,7 @@ typedef struct ISpeechObjectTokenVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -10216,45 +8961,45 @@ typedef struct ISpeechObjectTokenVtbl { /*** ISpeechObjectToken methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, BSTR *ObjectId); HRESULT (STDMETHODCALLTYPE *get_DataKey)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, ISpeechDataKey **DataKey); HRESULT (STDMETHODCALLTYPE *get_Category)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, ISpeechObjectTokenCategory **Category); HRESULT (STDMETHODCALLTYPE *GetDescription)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, LONG Locale, BSTR *Description); HRESULT (STDMETHODCALLTYPE *SetId)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, BSTR Id, BSTR CategoryID, VARIANT_BOOL CreateIfNotExist); HRESULT (STDMETHODCALLTYPE *GetAttribute)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, BSTR AttributeName, BSTR *AttributeValue); HRESULT (STDMETHODCALLTYPE *CreateInstance)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, IUnknown *pUnkOuter, SpeechTokenContext ClsContext, IUnknown **Object); HRESULT (STDMETHODCALLTYPE *Remove)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, BSTR ObjectStorageCLSID); HRESULT (STDMETHODCALLTYPE *GetStorageFileName)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, BSTR ObjectStorageCLSID, BSTR KeyName, BSTR FileName, @@ -10262,20 +9007,20 @@ typedef struct ISpeechObjectTokenVtbl { BSTR *FilePath); HRESULT (STDMETHODCALLTYPE *RemoveStorageFileName)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, BSTR ObjectStorageCLSID, BSTR KeyName, VARIANT_BOOL DeleteFile); HRESULT (STDMETHODCALLTYPE *IsUISupported)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, const BSTR TypeOfUI, const VARIANT *ExtraData, IUnknown *Object, VARIANT_BOOL *Supported); HRESULT (STDMETHODCALLTYPE *DisplayUI)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, LONG hWnd, BSTR Title, const BSTR TypeOfUI, @@ -10283,12 +9028,13 @@ typedef struct ISpeechObjectTokenVtbl { IUnknown *Object); HRESULT (STDMETHODCALLTYPE *MatchesAttributes)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, BSTR Attributes, VARIANT_BOOL *Matches); END_INTERFACE } ISpeechObjectTokenVtbl; + interface ISpeechObjectToken { CONST_VTBL ISpeechObjectTokenVtbl* lpVtbl; }; @@ -10387,130 +9133,6 @@ static FORCEINLINE HRESULT ISpeechObjectToken_MatchesAttributes(ISpeechObjectTok #endif -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_get_Id_Proxy( - ISpeechObjectToken* This, - BSTR *ObjectId); -void __RPC_STUB ISpeechObjectToken_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_get_DataKey_Proxy( - ISpeechObjectToken* This, - ISpeechDataKey **DataKey); -void __RPC_STUB ISpeechObjectToken_get_DataKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_get_Category_Proxy( - ISpeechObjectToken* This, - ISpeechObjectTokenCategory **Category); -void __RPC_STUB ISpeechObjectToken_get_Category_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_GetDescription_Proxy( - ISpeechObjectToken* This, - LONG Locale, - BSTR *Description); -void __RPC_STUB ISpeechObjectToken_GetDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_SetId_Proxy( - ISpeechObjectToken* This, - BSTR Id, - BSTR CategoryID, - VARIANT_BOOL CreateIfNotExist); -void __RPC_STUB ISpeechObjectToken_SetId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_GetAttribute_Proxy( - ISpeechObjectToken* This, - BSTR AttributeName, - BSTR *AttributeValue); -void __RPC_STUB ISpeechObjectToken_GetAttribute_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_CreateInstance_Proxy( - ISpeechObjectToken* This, - IUnknown *pUnkOuter, - SpeechTokenContext ClsContext, - IUnknown **Object); -void __RPC_STUB ISpeechObjectToken_CreateInstance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_Remove_Proxy( - ISpeechObjectToken* This, - BSTR ObjectStorageCLSID); -void __RPC_STUB ISpeechObjectToken_Remove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_GetStorageFileName_Proxy( - ISpeechObjectToken* This, - BSTR ObjectStorageCLSID, - BSTR KeyName, - BSTR FileName, - SpeechTokenShellFolder Folder, - BSTR *FilePath); -void __RPC_STUB ISpeechObjectToken_GetStorageFileName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_RemoveStorageFileName_Proxy( - ISpeechObjectToken* This, - BSTR ObjectStorageCLSID, - BSTR KeyName, - VARIANT_BOOL DeleteFile); -void __RPC_STUB ISpeechObjectToken_RemoveStorageFileName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_IsUISupported_Proxy( - ISpeechObjectToken* This, - const BSTR TypeOfUI, - const VARIANT *ExtraData, - IUnknown *Object, - VARIANT_BOOL *Supported); -void __RPC_STUB ISpeechObjectToken_IsUISupported_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_DisplayUI_Proxy( - ISpeechObjectToken* This, - LONG hWnd, - BSTR Title, - const BSTR TypeOfUI, - const VARIANT *ExtraData, - IUnknown *Object); -void __RPC_STUB ISpeechObjectToken_DisplayUI_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_MatchesAttributes_Proxy( - ISpeechObjectToken* This, - BSTR Attributes, - VARIANT_BOOL *Matches); -void __RPC_STUB ISpeechObjectToken_MatchesAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechObjectToken_INTERFACE_DEFINED__ */ @@ -10545,29 +9167,29 @@ typedef struct ISpeechObjectTokensVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechObjectTokens* This, + ISpeechObjectTokens *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechObjectTokens* This); + ISpeechObjectTokens *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechObjectTokens* This); + ISpeechObjectTokens *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechObjectTokens* This, + ISpeechObjectTokens *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechObjectTokens* This, + ISpeechObjectTokens *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechObjectTokens* This, + ISpeechObjectTokens *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -10575,7 +9197,7 @@ typedef struct ISpeechObjectTokensVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechObjectTokens* This, + ISpeechObjectTokens *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -10587,20 +9209,21 @@ typedef struct ISpeechObjectTokensVtbl { /*** ISpeechObjectTokens methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechObjectTokens* This, + ISpeechObjectTokens *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechObjectTokens* This, + ISpeechObjectTokens *This, LONG Index, ISpeechObjectToken **Token); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechObjectTokens* This, + ISpeechObjectTokens *This, IUnknown **ppEnumVARIANT); END_INTERFACE } ISpeechObjectTokensVtbl; + interface ISpeechObjectTokens { CONST_VTBL ISpeechObjectTokensVtbl* lpVtbl; }; @@ -10659,31 +9282,6 @@ static FORCEINLINE HRESULT ISpeechObjectTokens_get__NewEnum(ISpeechObjectTokens* #endif -HRESULT STDMETHODCALLTYPE ISpeechObjectTokens_get_Count_Proxy( - ISpeechObjectTokens* This, - LONG *Count); -void __RPC_STUB ISpeechObjectTokens_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectTokens_Item_Proxy( - ISpeechObjectTokens* This, - LONG Index, - ISpeechObjectToken **Token); -void __RPC_STUB ISpeechObjectTokens_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectTokens_get__NewEnum_Proxy( - ISpeechObjectTokens* This, - IUnknown **ppEnumVARIANT); -void __RPC_STUB ISpeechObjectTokens_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechObjectTokens_INTERFACE_DEFINED__ */ @@ -10730,29 +9328,29 @@ typedef struct ISpeechObjectTokenCategoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechObjectTokenCategory* This); + ISpeechObjectTokenCategory *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechObjectTokenCategory* This); + ISpeechObjectTokenCategory *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -10760,7 +9358,7 @@ typedef struct ISpeechObjectTokenCategoryVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -10772,35 +9370,36 @@ typedef struct ISpeechObjectTokenCategoryVtbl { /*** ISpeechObjectTokenCategory methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, BSTR *Id); HRESULT (STDMETHODCALLTYPE *put_Default)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, const BSTR TokenId); HRESULT (STDMETHODCALLTYPE *get_Default)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, BSTR *TokenId); HRESULT (STDMETHODCALLTYPE *SetId)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, const BSTR Id, VARIANT_BOOL CreateIfNotExist); HRESULT (STDMETHODCALLTYPE *GetDataKey)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, SpeechDataKeyLocation Location, ISpeechDataKey **DataKey); HRESULT (STDMETHODCALLTYPE *EnumerateTokens)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, BSTR RequiredAttributes, BSTR OptionalAttributes, ISpeechObjectTokens **Tokens); END_INTERFACE } ISpeechObjectTokenCategoryVtbl; + interface ISpeechObjectTokenCategory { CONST_VTBL ISpeechObjectTokenCategoryVtbl* lpVtbl; }; @@ -10871,58 +9470,6 @@ static FORCEINLINE HRESULT ISpeechObjectTokenCategory_EnumerateTokens(ISpeechObj #endif -HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_get_Id_Proxy( - ISpeechObjectTokenCategory* This, - BSTR *Id); -void __RPC_STUB ISpeechObjectTokenCategory_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_put_Default_Proxy( - ISpeechObjectTokenCategory* This, - const BSTR TokenId); -void __RPC_STUB ISpeechObjectTokenCategory_put_Default_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_get_Default_Proxy( - ISpeechObjectTokenCategory* This, - BSTR *TokenId); -void __RPC_STUB ISpeechObjectTokenCategory_get_Default_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_SetId_Proxy( - ISpeechObjectTokenCategory* This, - const BSTR Id, - VARIANT_BOOL CreateIfNotExist); -void __RPC_STUB ISpeechObjectTokenCategory_SetId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_GetDataKey_Proxy( - ISpeechObjectTokenCategory* This, - SpeechDataKeyLocation Location, - ISpeechDataKey **DataKey); -void __RPC_STUB ISpeechObjectTokenCategory_GetDataKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_EnumerateTokens_Proxy( - ISpeechObjectTokenCategory* This, - BSTR RequiredAttributes, - BSTR OptionalAttributes, - ISpeechObjectTokens **Tokens); -void __RPC_STUB ISpeechObjectTokenCategory_EnumerateTokens_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechObjectTokenCategory_INTERFACE_DEFINED__ */ @@ -11185,29 +9732,29 @@ typedef struct ISpeechAudioFormatVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechAudioFormat* This); + ISpeechAudioFormat *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechAudioFormat* This); + ISpeechAudioFormat *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -11215,7 +9762,7 @@ typedef struct ISpeechAudioFormatVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -11227,31 +9774,32 @@ typedef struct ISpeechAudioFormatVtbl { /*** ISpeechAudioFormat methods ***/ HRESULT (STDMETHODCALLTYPE *get_Type)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, SpeechAudioFormatType *AudioFormat); HRESULT (STDMETHODCALLTYPE *put_Type)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, SpeechAudioFormatType AudioFormat); HRESULT (STDMETHODCALLTYPE *get_Guid)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, BSTR *Guid); HRESULT (STDMETHODCALLTYPE *put_Guid)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, BSTR Guid); HRESULT (STDMETHODCALLTYPE *GetWaveFormatEx)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, ISpeechWaveFormatEx **SpeechWaveFormatEx); HRESULT (STDMETHODCALLTYPE *SetWaveFormatEx)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, ISpeechWaveFormatEx *SpeechWaveFormatEx); END_INTERFACE } ISpeechAudioFormatVtbl; + interface ISpeechAudioFormat { CONST_VTBL ISpeechAudioFormatVtbl* lpVtbl; }; @@ -11322,54 +9870,6 @@ static FORCEINLINE HRESULT ISpeechAudioFormat_SetWaveFormatEx(ISpeechAudioFormat #endif -HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_get_Type_Proxy( - ISpeechAudioFormat* This, - SpeechAudioFormatType *AudioFormat); -void __RPC_STUB ISpeechAudioFormat_get_Type_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_put_Type_Proxy( - ISpeechAudioFormat* This, - SpeechAudioFormatType AudioFormat); -void __RPC_STUB ISpeechAudioFormat_put_Type_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_get_Guid_Proxy( - ISpeechAudioFormat* This, - BSTR *Guid); -void __RPC_STUB ISpeechAudioFormat_get_Guid_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_put_Guid_Proxy( - ISpeechAudioFormat* This, - BSTR Guid); -void __RPC_STUB ISpeechAudioFormat_put_Guid_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_GetWaveFormatEx_Proxy( - ISpeechAudioFormat* This, - ISpeechWaveFormatEx **SpeechWaveFormatEx); -void __RPC_STUB ISpeechAudioFormat_GetWaveFormatEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_SetWaveFormatEx_Proxy( - ISpeechAudioFormat* This, - ISpeechWaveFormatEx *SpeechWaveFormatEx); -void __RPC_STUB ISpeechAudioFormat_SetWaveFormatEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechAudioFormat_INTERFACE_DEFINED__ */ @@ -11414,29 +9914,29 @@ typedef struct ISpeechBaseStreamVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechBaseStream* This); + ISpeechBaseStream *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechBaseStream* This); + ISpeechBaseStream *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -11444,7 +9944,7 @@ typedef struct ISpeechBaseStreamVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -11456,32 +9956,33 @@ typedef struct ISpeechBaseStreamVtbl { /*** ISpeechBaseStream methods ***/ HRESULT (STDMETHODCALLTYPE *get_Format)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, ISpeechAudioFormat **AudioFormat); HRESULT (STDMETHODCALLTYPE *putref_Format)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, ISpeechAudioFormat *AudioFormat); HRESULT (STDMETHODCALLTYPE *Read)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, VARIANT *Buffer, LONG NumberOfBytes, LONG *BytesRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, VARIANT Buffer, LONG *BytesWritten); HRESULT (STDMETHODCALLTYPE *Seek)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, VARIANT Position, SpeechStreamSeekPositionType Origin, VARIANT *NewPosition); END_INTERFACE } ISpeechBaseStreamVtbl; + interface ISpeechBaseStream { CONST_VTBL ISpeechBaseStreamVtbl* lpVtbl; }; @@ -11548,51 +10049,6 @@ static FORCEINLINE HRESULT ISpeechBaseStream_Seek(ISpeechBaseStream* This,VARIAN #endif -HRESULT STDMETHODCALLTYPE ISpeechBaseStream_get_Format_Proxy( - ISpeechBaseStream* This, - ISpeechAudioFormat **AudioFormat); -void __RPC_STUB ISpeechBaseStream_get_Format_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechBaseStream_putref_Format_Proxy( - ISpeechBaseStream* This, - ISpeechAudioFormat *AudioFormat); -void __RPC_STUB ISpeechBaseStream_putref_Format_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechBaseStream_Read_Proxy( - ISpeechBaseStream* This, - VARIANT *Buffer, - LONG NumberOfBytes, - LONG *BytesRead); -void __RPC_STUB ISpeechBaseStream_Read_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechBaseStream_Write_Proxy( - ISpeechBaseStream* This, - VARIANT Buffer, - LONG *BytesWritten); -void __RPC_STUB ISpeechBaseStream_Write_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechBaseStream_Seek_Proxy( - ISpeechBaseStream* This, - VARIANT Position, - SpeechStreamSeekPositionType Origin, - VARIANT *NewPosition); -void __RPC_STUB ISpeechBaseStream_Seek_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechBaseStream_INTERFACE_DEFINED__ */ @@ -11644,29 +10100,29 @@ typedef struct ISpeechAudioVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechAudio* This, + ISpeechAudio *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechAudio* This); + ISpeechAudio *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechAudio* This); + ISpeechAudio *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechAudio* This, + ISpeechAudio *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechAudio* This, + ISpeechAudio *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechAudio* This, + ISpeechAudio *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -11674,7 +10130,7 @@ typedef struct ISpeechAudioVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechAudio* This, + ISpeechAudio *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -11686,69 +10142,70 @@ typedef struct ISpeechAudioVtbl { /*** ISpeechBaseStream methods ***/ HRESULT (STDMETHODCALLTYPE *get_Format)( - ISpeechAudio* This, + ISpeechAudio *This, ISpeechAudioFormat **AudioFormat); HRESULT (STDMETHODCALLTYPE *putref_Format)( - ISpeechAudio* This, + ISpeechAudio *This, ISpeechAudioFormat *AudioFormat); HRESULT (STDMETHODCALLTYPE *Read)( - ISpeechAudio* This, + ISpeechAudio *This, VARIANT *Buffer, LONG NumberOfBytes, LONG *BytesRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpeechAudio* This, + ISpeechAudio *This, VARIANT Buffer, LONG *BytesWritten); HRESULT (STDMETHODCALLTYPE *Seek)( - ISpeechAudio* This, + ISpeechAudio *This, VARIANT Position, SpeechStreamSeekPositionType Origin, VARIANT *NewPosition); /*** ISpeechAudio methods ***/ HRESULT (STDMETHODCALLTYPE *get_Status)( - ISpeechAudio* This, + ISpeechAudio *This, ISpeechAudioStatus **Status); HRESULT (STDMETHODCALLTYPE *get_BufferInfo)( - ISpeechAudio* This, + ISpeechAudio *This, ISpeechAudioBufferInfo **BufferInfo); HRESULT (STDMETHODCALLTYPE *get_DefaultFormat)( - ISpeechAudio* This, + ISpeechAudio *This, ISpeechAudioFormat **StreamFormat); HRESULT (STDMETHODCALLTYPE *get_Volume)( - ISpeechAudio* This, + ISpeechAudio *This, LONG *Volume); HRESULT (STDMETHODCALLTYPE *put_Volume)( - ISpeechAudio* This, + ISpeechAudio *This, LONG Volume); HRESULT (STDMETHODCALLTYPE *get_BufferNotifySize)( - ISpeechAudio* This, + ISpeechAudio *This, LONG *BufferNotifySize); HRESULT (STDMETHODCALLTYPE *put_BufferNotifySize)( - ISpeechAudio* This, + ISpeechAudio *This, LONG BufferNotifySize); HRESULT (STDMETHODCALLTYPE *get_EventHandle)( - ISpeechAudio* This, + ISpeechAudio *This, LONG *EventHandle); HRESULT (STDMETHODCALLTYPE *SetState)( - ISpeechAudio* This, + ISpeechAudio *This, SpeechAudioState State); END_INTERFACE } ISpeechAudioVtbl; + interface ISpeechAudio { CONST_VTBL ISpeechAudioVtbl* lpVtbl; }; @@ -11853,78 +10310,6 @@ static FORCEINLINE HRESULT ISpeechAudio_SetState(ISpeechAudio* This,SpeechAudioS #endif -HRESULT STDMETHODCALLTYPE ISpeechAudio_get_Status_Proxy( - ISpeechAudio* This, - ISpeechAudioStatus **Status); -void __RPC_STUB ISpeechAudio_get_Status_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudio_get_BufferInfo_Proxy( - ISpeechAudio* This, - ISpeechAudioBufferInfo **BufferInfo); -void __RPC_STUB ISpeechAudio_get_BufferInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudio_get_DefaultFormat_Proxy( - ISpeechAudio* This, - ISpeechAudioFormat **StreamFormat); -void __RPC_STUB ISpeechAudio_get_DefaultFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudio_get_Volume_Proxy( - ISpeechAudio* This, - LONG *Volume); -void __RPC_STUB ISpeechAudio_get_Volume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudio_put_Volume_Proxy( - ISpeechAudio* This, - LONG Volume); -void __RPC_STUB ISpeechAudio_put_Volume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudio_get_BufferNotifySize_Proxy( - ISpeechAudio* This, - LONG *BufferNotifySize); -void __RPC_STUB ISpeechAudio_get_BufferNotifySize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudio_put_BufferNotifySize_Proxy( - ISpeechAudio* This, - LONG BufferNotifySize); -void __RPC_STUB ISpeechAudio_put_BufferNotifySize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudio_get_EventHandle_Proxy( - ISpeechAudio* This, - LONG *EventHandle); -void __RPC_STUB ISpeechAudio_get_EventHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudio_SetState_Proxy( - ISpeechAudio* This, - SpeechAudioState State); -void __RPC_STUB ISpeechAudio_SetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechAudio_INTERFACE_DEFINED__ */ @@ -11964,29 +10349,29 @@ typedef struct ISpeechMMSysAudioVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechMMSysAudio* This); + ISpeechMMSysAudio *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechMMSysAudio* This); + ISpeechMMSysAudio *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -11994,7 +10379,7 @@ typedef struct ISpeechMMSysAudioVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -12006,90 +10391,91 @@ typedef struct ISpeechMMSysAudioVtbl { /*** ISpeechBaseStream methods ***/ HRESULT (STDMETHODCALLTYPE *get_Format)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, ISpeechAudioFormat **AudioFormat); HRESULT (STDMETHODCALLTYPE *putref_Format)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, ISpeechAudioFormat *AudioFormat); HRESULT (STDMETHODCALLTYPE *Read)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, VARIANT *Buffer, LONG NumberOfBytes, LONG *BytesRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, VARIANT Buffer, LONG *BytesWritten); HRESULT (STDMETHODCALLTYPE *Seek)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, VARIANT Position, SpeechStreamSeekPositionType Origin, VARIANT *NewPosition); /*** ISpeechAudio methods ***/ HRESULT (STDMETHODCALLTYPE *get_Status)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, ISpeechAudioStatus **Status); HRESULT (STDMETHODCALLTYPE *get_BufferInfo)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, ISpeechAudioBufferInfo **BufferInfo); HRESULT (STDMETHODCALLTYPE *get_DefaultFormat)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, ISpeechAudioFormat **StreamFormat); HRESULT (STDMETHODCALLTYPE *get_Volume)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG *Volume); HRESULT (STDMETHODCALLTYPE *put_Volume)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG Volume); HRESULT (STDMETHODCALLTYPE *get_BufferNotifySize)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG *BufferNotifySize); HRESULT (STDMETHODCALLTYPE *put_BufferNotifySize)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG BufferNotifySize); HRESULT (STDMETHODCALLTYPE *get_EventHandle)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG *EventHandle); HRESULT (STDMETHODCALLTYPE *SetState)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, SpeechAudioState State); /*** ISpeechMMSysAudio methods ***/ HRESULT (STDMETHODCALLTYPE *get_DeviceId)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG *DeviceId); HRESULT (STDMETHODCALLTYPE *put_DeviceId)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG DeviceId); HRESULT (STDMETHODCALLTYPE *get_LineId)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG *LineId); HRESULT (STDMETHODCALLTYPE *put_LineId)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG LineId); HRESULT (STDMETHODCALLTYPE *get_MMHandle)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG *Handle); END_INTERFACE } ISpeechMMSysAudioVtbl; + interface ISpeechMMSysAudio { CONST_VTBL ISpeechMMSysAudioVtbl* lpVtbl; }; @@ -12216,46 +10602,6 @@ static FORCEINLINE HRESULT ISpeechMMSysAudio_get_MMHandle(ISpeechMMSysAudio* Thi #endif -HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_get_DeviceId_Proxy( - ISpeechMMSysAudio* This, - LONG *DeviceId); -void __RPC_STUB ISpeechMMSysAudio_get_DeviceId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_put_DeviceId_Proxy( - ISpeechMMSysAudio* This, - LONG DeviceId); -void __RPC_STUB ISpeechMMSysAudio_put_DeviceId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_get_LineId_Proxy( - ISpeechMMSysAudio* This, - LONG *LineId); -void __RPC_STUB ISpeechMMSysAudio_get_LineId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_put_LineId_Proxy( - ISpeechMMSysAudio* This, - LONG LineId); -void __RPC_STUB ISpeechMMSysAudio_put_LineId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_get_MMHandle_Proxy( - ISpeechMMSysAudio* This, - LONG *Handle); -void __RPC_STUB ISpeechMMSysAudio_get_MMHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechMMSysAudio_INTERFACE_DEFINED__ */ @@ -12288,29 +10634,29 @@ typedef struct ISpeechFileStreamVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechFileStream* This, + ISpeechFileStream *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechFileStream* This); + ISpeechFileStream *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechFileStream* This); + ISpeechFileStream *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechFileStream* This, + ISpeechFileStream *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechFileStream* This, + ISpeechFileStream *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechFileStream* This, + ISpeechFileStream *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -12318,7 +10664,7 @@ typedef struct ISpeechFileStreamVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechFileStream* This, + ISpeechFileStream *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -12330,42 +10676,43 @@ typedef struct ISpeechFileStreamVtbl { /*** ISpeechBaseStream methods ***/ HRESULT (STDMETHODCALLTYPE *get_Format)( - ISpeechFileStream* This, + ISpeechFileStream *This, ISpeechAudioFormat **AudioFormat); HRESULT (STDMETHODCALLTYPE *putref_Format)( - ISpeechFileStream* This, + ISpeechFileStream *This, ISpeechAudioFormat *AudioFormat); HRESULT (STDMETHODCALLTYPE *Read)( - ISpeechFileStream* This, + ISpeechFileStream *This, VARIANT *Buffer, LONG NumberOfBytes, LONG *BytesRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpeechFileStream* This, + ISpeechFileStream *This, VARIANT Buffer, LONG *BytesWritten); HRESULT (STDMETHODCALLTYPE *Seek)( - ISpeechFileStream* This, + ISpeechFileStream *This, VARIANT Position, SpeechStreamSeekPositionType Origin, VARIANT *NewPosition); /*** ISpeechFileStream methods ***/ HRESULT (STDMETHODCALLTYPE *Open)( - ISpeechFileStream* This, + ISpeechFileStream *This, BSTR FileName, SpeechStreamFileMode FileMode, VARIANT_BOOL DoEvents); HRESULT (STDMETHODCALLTYPE *Close)( - ISpeechFileStream* This); + ISpeechFileStream *This); END_INTERFACE } ISpeechFileStreamVtbl; + interface ISpeechFileStream { CONST_VTBL ISpeechFileStreamVtbl* lpVtbl; }; @@ -12442,23 +10789,6 @@ static FORCEINLINE HRESULT ISpeechFileStream_Close(ISpeechFileStream* This) { #endif -HRESULT STDMETHODCALLTYPE ISpeechFileStream_Open_Proxy( - ISpeechFileStream* This, - BSTR FileName, - SpeechStreamFileMode FileMode, - VARIANT_BOOL DoEvents); -void __RPC_STUB ISpeechFileStream_Open_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechFileStream_Close_Proxy( - ISpeechFileStream* This); -void __RPC_STUB ISpeechFileStream_Close_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechFileStream_INTERFACE_DEFINED__ */ @@ -12489,29 +10819,29 @@ typedef struct ISpeechCustomStreamVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechCustomStream* This); + ISpeechCustomStream *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechCustomStream* This); + ISpeechCustomStream *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -12519,7 +10849,7 @@ typedef struct ISpeechCustomStreamVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -12531,41 +10861,42 @@ typedef struct ISpeechCustomStreamVtbl { /*** ISpeechBaseStream methods ***/ HRESULT (STDMETHODCALLTYPE *get_Format)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, ISpeechAudioFormat **AudioFormat); HRESULT (STDMETHODCALLTYPE *putref_Format)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, ISpeechAudioFormat *AudioFormat); HRESULT (STDMETHODCALLTYPE *Read)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, VARIANT *Buffer, LONG NumberOfBytes, LONG *BytesRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, VARIANT Buffer, LONG *BytesWritten); HRESULT (STDMETHODCALLTYPE *Seek)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, VARIANT Position, SpeechStreamSeekPositionType Origin, VARIANT *NewPosition); /*** ISpeechCustomStream methods ***/ HRESULT (STDMETHODCALLTYPE *get_BaseStream)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, IUnknown **ppUnkStream); HRESULT (STDMETHODCALLTYPE *putref_BaseStream)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, IUnknown *pUnkStream); END_INTERFACE } ISpeechCustomStreamVtbl; + interface ISpeechCustomStream { CONST_VTBL ISpeechCustomStreamVtbl* lpVtbl; }; @@ -12642,22 +10973,6 @@ static FORCEINLINE HRESULT ISpeechCustomStream_putref_BaseStream(ISpeechCustomSt #endif -HRESULT STDMETHODCALLTYPE ISpeechCustomStream_get_BaseStream_Proxy( - ISpeechCustomStream* This, - IUnknown **ppUnkStream); -void __RPC_STUB ISpeechCustomStream_get_BaseStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechCustomStream_putref_BaseStream_Proxy( - ISpeechCustomStream* This, - IUnknown *pUnkStream); -void __RPC_STUB ISpeechCustomStream_putref_BaseStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechCustomStream_INTERFACE_DEFINED__ */ @@ -12688,29 +11003,29 @@ typedef struct ISpeechMemoryStreamVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechMemoryStream* This); + ISpeechMemoryStream *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechMemoryStream* This); + ISpeechMemoryStream *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -12718,7 +11033,7 @@ typedef struct ISpeechMemoryStreamVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -12730,41 +11045,42 @@ typedef struct ISpeechMemoryStreamVtbl { /*** ISpeechBaseStream methods ***/ HRESULT (STDMETHODCALLTYPE *get_Format)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, ISpeechAudioFormat **AudioFormat); HRESULT (STDMETHODCALLTYPE *putref_Format)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, ISpeechAudioFormat *AudioFormat); HRESULT (STDMETHODCALLTYPE *Read)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, VARIANT *Buffer, LONG NumberOfBytes, LONG *BytesRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, VARIANT Buffer, LONG *BytesWritten); HRESULT (STDMETHODCALLTYPE *Seek)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, VARIANT Position, SpeechStreamSeekPositionType Origin, VARIANT *NewPosition); /*** ISpeechMemoryStream methods ***/ HRESULT (STDMETHODCALLTYPE *SetData)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, VARIANT Data); HRESULT (STDMETHODCALLTYPE *GetData)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, VARIANT *pData); END_INTERFACE } ISpeechMemoryStreamVtbl; + interface ISpeechMemoryStream { CONST_VTBL ISpeechMemoryStreamVtbl* lpVtbl; }; @@ -12841,22 +11157,6 @@ static FORCEINLINE HRESULT ISpeechMemoryStream_GetData(ISpeechMemoryStream* This #endif -HRESULT STDMETHODCALLTYPE ISpeechMemoryStream_SetData_Proxy( - ISpeechMemoryStream* This, - VARIANT Data); -void __RPC_STUB ISpeechMemoryStream_SetData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechMemoryStream_GetData_Proxy( - ISpeechMemoryStream* This, - VARIANT *pData); -void __RPC_STUB ISpeechMemoryStream_GetData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechMemoryStream_INTERFACE_DEFINED__ */ @@ -12896,29 +11196,29 @@ typedef struct ISpeechAudioStatusVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechAudioStatus* This); + ISpeechAudioStatus *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechAudioStatus* This); + ISpeechAudioStatus *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -12926,7 +11226,7 @@ typedef struct ISpeechAudioStatusVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -12938,27 +11238,28 @@ typedef struct ISpeechAudioStatusVtbl { /*** ISpeechAudioStatus methods ***/ HRESULT (STDMETHODCALLTYPE *get_FreeBufferSpace)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, LONG *FreeBufferSpace); HRESULT (STDMETHODCALLTYPE *get_NonBlockingIO)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, LONG *NonBlockingIO); HRESULT (STDMETHODCALLTYPE *get_State)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, SpeechAudioState *State); HRESULT (STDMETHODCALLTYPE *get_CurrentSeekPosition)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, VARIANT *CurrentSeekPosition); HRESULT (STDMETHODCALLTYPE *get_CurrentDevicePosition)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, VARIANT *CurrentDevicePosition); END_INTERFACE } ISpeechAudioStatusVtbl; + interface ISpeechAudioStatus { CONST_VTBL ISpeechAudioStatusVtbl* lpVtbl; }; @@ -13025,46 +11326,6 @@ static FORCEINLINE HRESULT ISpeechAudioStatus_get_CurrentDevicePosition(ISpeechA #endif -HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_FreeBufferSpace_Proxy( - ISpeechAudioStatus* This, - LONG *FreeBufferSpace); -void __RPC_STUB ISpeechAudioStatus_get_FreeBufferSpace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_NonBlockingIO_Proxy( - ISpeechAudioStatus* This, - LONG *NonBlockingIO); -void __RPC_STUB ISpeechAudioStatus_get_NonBlockingIO_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_State_Proxy( - ISpeechAudioStatus* This, - SpeechAudioState *State); -void __RPC_STUB ISpeechAudioStatus_get_State_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_CurrentSeekPosition_Proxy( - ISpeechAudioStatus* This, - VARIANT *CurrentSeekPosition); -void __RPC_STUB ISpeechAudioStatus_get_CurrentSeekPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_CurrentDevicePosition_Proxy( - ISpeechAudioStatus* This, - VARIANT *CurrentDevicePosition); -void __RPC_STUB ISpeechAudioStatus_get_CurrentDevicePosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechAudioStatus_INTERFACE_DEFINED__ */ @@ -13107,29 +11368,29 @@ typedef struct ISpeechAudioBufferInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechAudioBufferInfo* This); + ISpeechAudioBufferInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechAudioBufferInfo* This); + ISpeechAudioBufferInfo *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -13137,7 +11398,7 @@ typedef struct ISpeechAudioBufferInfoVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -13149,31 +11410,32 @@ typedef struct ISpeechAudioBufferInfoVtbl { /*** ISpeechAudioBufferInfo methods ***/ HRESULT (STDMETHODCALLTYPE *get_MinNotification)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, LONG *MinNotification); HRESULT (STDMETHODCALLTYPE *put_MinNotification)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, LONG MinNotification); HRESULT (STDMETHODCALLTYPE *get_BufferSize)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, LONG *BufferSize); HRESULT (STDMETHODCALLTYPE *put_BufferSize)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, LONG BufferSize); HRESULT (STDMETHODCALLTYPE *get_EventBias)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, LONG *EventBias); HRESULT (STDMETHODCALLTYPE *put_EventBias)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, LONG EventBias); END_INTERFACE } ISpeechAudioBufferInfoVtbl; + interface ISpeechAudioBufferInfo { CONST_VTBL ISpeechAudioBufferInfoVtbl* lpVtbl; }; @@ -13244,54 +11506,6 @@ static FORCEINLINE HRESULT ISpeechAudioBufferInfo_put_EventBias(ISpeechAudioBuff #endif -HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_get_MinNotification_Proxy( - ISpeechAudioBufferInfo* This, - LONG *MinNotification); -void __RPC_STUB ISpeechAudioBufferInfo_get_MinNotification_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_put_MinNotification_Proxy( - ISpeechAudioBufferInfo* This, - LONG MinNotification); -void __RPC_STUB ISpeechAudioBufferInfo_put_MinNotification_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_get_BufferSize_Proxy( - ISpeechAudioBufferInfo* This, - LONG *BufferSize); -void __RPC_STUB ISpeechAudioBufferInfo_get_BufferSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_put_BufferSize_Proxy( - ISpeechAudioBufferInfo* This, - LONG BufferSize); -void __RPC_STUB ISpeechAudioBufferInfo_put_BufferSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_get_EventBias_Proxy( - ISpeechAudioBufferInfo* This, - LONG *EventBias); -void __RPC_STUB ISpeechAudioBufferInfo_get_EventBias_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_put_EventBias_Proxy( - ISpeechAudioBufferInfo* This, - LONG EventBias); -void __RPC_STUB ISpeechAudioBufferInfo_put_EventBias_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechAudioBufferInfo_INTERFACE_DEFINED__ */ @@ -13358,29 +11572,29 @@ typedef struct ISpeechWaveFormatExVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechWaveFormatEx* This); + ISpeechWaveFormatEx *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechWaveFormatEx* This); + ISpeechWaveFormatEx *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -13388,7 +11602,7 @@ typedef struct ISpeechWaveFormatExVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -13400,63 +11614,64 @@ typedef struct ISpeechWaveFormatExVtbl { /*** ISpeechWaveFormatEx methods ***/ HRESULT (STDMETHODCALLTYPE *get_FormatTag)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, short *FormatTag); HRESULT (STDMETHODCALLTYPE *put_FormatTag)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, short FormatTag); HRESULT (STDMETHODCALLTYPE *get_Channels)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, short *Channels); HRESULT (STDMETHODCALLTYPE *put_Channels)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, short Channels); HRESULT (STDMETHODCALLTYPE *get_SamplesPerSec)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, LONG *SamplesPerSec); HRESULT (STDMETHODCALLTYPE *put_SamplesPerSec)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, LONG SamplesPerSec); HRESULT (STDMETHODCALLTYPE *get_AvgBytesPerSec)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, LONG *AvgBytesPerSec); HRESULT (STDMETHODCALLTYPE *put_AvgBytesPerSec)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, LONG AvgBytesPerSec); HRESULT (STDMETHODCALLTYPE *get_BlockAlign)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, short *BlockAlign); HRESULT (STDMETHODCALLTYPE *put_BlockAlign)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, short BlockAlign); HRESULT (STDMETHODCALLTYPE *get_BitsPerSample)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, short *BitsPerSample); HRESULT (STDMETHODCALLTYPE *put_BitsPerSample)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, short BitsPerSample); HRESULT (STDMETHODCALLTYPE *get_ExtraData)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, VARIANT *ExtraData); HRESULT (STDMETHODCALLTYPE *put_ExtraData)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, VARIANT ExtraData); END_INTERFACE } ISpeechWaveFormatExVtbl; + interface ISpeechWaveFormatEx { CONST_VTBL ISpeechWaveFormatExVtbl* lpVtbl; }; @@ -13559,118 +11774,6 @@ static FORCEINLINE HRESULT ISpeechWaveFormatEx_put_ExtraData(ISpeechWaveFormatEx #endif -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_FormatTag_Proxy( - ISpeechWaveFormatEx* This, - short *FormatTag); -void __RPC_STUB ISpeechWaveFormatEx_get_FormatTag_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_FormatTag_Proxy( - ISpeechWaveFormatEx* This, - short FormatTag); -void __RPC_STUB ISpeechWaveFormatEx_put_FormatTag_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_Channels_Proxy( - ISpeechWaveFormatEx* This, - short *Channels); -void __RPC_STUB ISpeechWaveFormatEx_get_Channels_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_Channels_Proxy( - ISpeechWaveFormatEx* This, - short Channels); -void __RPC_STUB ISpeechWaveFormatEx_put_Channels_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_SamplesPerSec_Proxy( - ISpeechWaveFormatEx* This, - LONG *SamplesPerSec); -void __RPC_STUB ISpeechWaveFormatEx_get_SamplesPerSec_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_SamplesPerSec_Proxy( - ISpeechWaveFormatEx* This, - LONG SamplesPerSec); -void __RPC_STUB ISpeechWaveFormatEx_put_SamplesPerSec_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_AvgBytesPerSec_Proxy( - ISpeechWaveFormatEx* This, - LONG *AvgBytesPerSec); -void __RPC_STUB ISpeechWaveFormatEx_get_AvgBytesPerSec_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_AvgBytesPerSec_Proxy( - ISpeechWaveFormatEx* This, - LONG AvgBytesPerSec); -void __RPC_STUB ISpeechWaveFormatEx_put_AvgBytesPerSec_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_BlockAlign_Proxy( - ISpeechWaveFormatEx* This, - short *BlockAlign); -void __RPC_STUB ISpeechWaveFormatEx_get_BlockAlign_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_BlockAlign_Proxy( - ISpeechWaveFormatEx* This, - short BlockAlign); -void __RPC_STUB ISpeechWaveFormatEx_put_BlockAlign_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_BitsPerSample_Proxy( - ISpeechWaveFormatEx* This, - short *BitsPerSample); -void __RPC_STUB ISpeechWaveFormatEx_get_BitsPerSample_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_BitsPerSample_Proxy( - ISpeechWaveFormatEx* This, - short BitsPerSample); -void __RPC_STUB ISpeechWaveFormatEx_put_BitsPerSample_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_ExtraData_Proxy( - ISpeechWaveFormatEx* This, - VARIANT *ExtraData); -void __RPC_STUB ISpeechWaveFormatEx_get_ExtraData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_ExtraData_Proxy( - ISpeechWaveFormatEx* This, - VARIANT ExtraData); -void __RPC_STUB ISpeechWaveFormatEx_put_ExtraData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechWaveFormatEx_INTERFACE_DEFINED__ */ @@ -13807,29 +11910,29 @@ typedef struct ISpeechVoiceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechVoice* This, + ISpeechVoice *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechVoice* This); + ISpeechVoice *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechVoice* This); + ISpeechVoice *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechVoice* This, + ISpeechVoice *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechVoice* This, + ISpeechVoice *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechVoice* This, + ISpeechVoice *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -13837,7 +11940,7 @@ typedef struct ISpeechVoiceVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechVoice* This, + ISpeechVoice *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -13849,142 +11952,142 @@ typedef struct ISpeechVoiceVtbl { /*** ISpeechVoice methods ***/ HRESULT (STDMETHODCALLTYPE *get_Status)( - ISpeechVoice* This, + ISpeechVoice *This, ISpeechVoiceStatus **Status); HRESULT (STDMETHODCALLTYPE *get_Voice)( - ISpeechVoice* This, + ISpeechVoice *This, ISpeechObjectToken **Voice); HRESULT (STDMETHODCALLTYPE *putref_Voice)( - ISpeechVoice* This, + ISpeechVoice *This, ISpeechObjectToken *Voice); HRESULT (STDMETHODCALLTYPE *get_AudioOutput)( - ISpeechVoice* This, + ISpeechVoice *This, ISpeechObjectToken **AudioOutput); HRESULT (STDMETHODCALLTYPE *putref_AudioOutput)( - ISpeechVoice* This, + ISpeechVoice *This, ISpeechObjectToken *AudioOutput); HRESULT (STDMETHODCALLTYPE *get_AudioOutputStream)( - ISpeechVoice* This, + ISpeechVoice *This, ISpeechBaseStream **AudioOutputStream); HRESULT (STDMETHODCALLTYPE *putref_AudioOutputStream)( - ISpeechVoice* This, + ISpeechVoice *This, ISpeechBaseStream *AudioOutputStream); HRESULT (STDMETHODCALLTYPE *get_Rate)( - ISpeechVoice* This, + ISpeechVoice *This, LONG *Rate); HRESULT (STDMETHODCALLTYPE *put_Rate)( - ISpeechVoice* This, + ISpeechVoice *This, LONG Rate); HRESULT (STDMETHODCALLTYPE *get_Volume)( - ISpeechVoice* This, + ISpeechVoice *This, LONG *Volume); HRESULT (STDMETHODCALLTYPE *put_Volume)( - ISpeechVoice* This, + ISpeechVoice *This, LONG Volume); HRESULT (STDMETHODCALLTYPE *put_AllowAudioOutputFormatChangesOnNextSet)( - ISpeechVoice* This, + ISpeechVoice *This, VARIANT_BOOL Allow); HRESULT (STDMETHODCALLTYPE *get_AllowAudioOutputFormatChangesOnNextSet)( - ISpeechVoice* This, + ISpeechVoice *This, VARIANT_BOOL *Allow); HRESULT (STDMETHODCALLTYPE *get_EventInterests)( - ISpeechVoice* This, + ISpeechVoice *This, SpeechVoiceEvents *EventInterestFlags); HRESULT (STDMETHODCALLTYPE *put_EventInterests)( - ISpeechVoice* This, + ISpeechVoice *This, SpeechVoiceEvents EventInterestFlags); HRESULT (STDMETHODCALLTYPE *put_Priority)( - ISpeechVoice* This, + ISpeechVoice *This, SpeechVoicePriority Priority); HRESULT (STDMETHODCALLTYPE *get_Priority)( - ISpeechVoice* This, + ISpeechVoice *This, SpeechVoicePriority *Priority); HRESULT (STDMETHODCALLTYPE *put_AlertBoundary)( - ISpeechVoice* This, + ISpeechVoice *This, SpeechVoiceEvents Boundary); HRESULT (STDMETHODCALLTYPE *get_AlertBoundary)( - ISpeechVoice* This, + ISpeechVoice *This, SpeechVoiceEvents *Boundary); HRESULT (STDMETHODCALLTYPE *put_SynchronousSpeakTimeout)( - ISpeechVoice* This, + ISpeechVoice *This, LONG msTimeout); HRESULT (STDMETHODCALLTYPE *get_SynchronousSpeakTimeout)( - ISpeechVoice* This, + ISpeechVoice *This, LONG *msTimeout); HRESULT (STDMETHODCALLTYPE *Speak)( - ISpeechVoice* This, + ISpeechVoice *This, BSTR Text, SpeechVoiceSpeakFlags Flags, LONG *StreamNumber); HRESULT (STDMETHODCALLTYPE *SpeakStream)( - ISpeechVoice* This, + ISpeechVoice *This, ISpeechBaseStream *Stream, SpeechVoiceSpeakFlags Flags, LONG *StreamNumber); HRESULT (STDMETHODCALLTYPE *Pause)( - ISpeechVoice* This); + ISpeechVoice *This); HRESULT (STDMETHODCALLTYPE *Resume)( - ISpeechVoice* This); + ISpeechVoice *This); HRESULT (STDMETHODCALLTYPE *Skip)( - ISpeechVoice* This, + ISpeechVoice *This, const BSTR Type, LONG NumItems, LONG *NumSkipped); HRESULT (STDMETHODCALLTYPE *GetVoices)( - ISpeechVoice* This, + ISpeechVoice *This, BSTR RequiredAttributes, BSTR OptionalAttributes, ISpeechObjectTokens **ObjectTokens); HRESULT (STDMETHODCALLTYPE *GetAudioOutputs)( - ISpeechVoice* This, + ISpeechVoice *This, BSTR RequiredAttributes, BSTR OptionalAttributes, ISpeechObjectTokens **ObjectTokens); HRESULT (STDMETHODCALLTYPE *WaitUntilDone)( - ISpeechVoice* This, + ISpeechVoice *This, LONG msTimeout, VARIANT_BOOL *Done); HRESULT (STDMETHODCALLTYPE *SpeakCompleteEvent)( - ISpeechVoice* This, + ISpeechVoice *This, LONG *Handle); HRESULT (STDMETHODCALLTYPE *IsUISupported)( - ISpeechVoice* This, + ISpeechVoice *This, const BSTR TypeOfUI, const VARIANT *ExtraData, VARIANT_BOOL *Supported); HRESULT (STDMETHODCALLTYPE *DisplayUI)( - ISpeechVoice* This, + ISpeechVoice *This, LONG hWndParent, BSTR Title, const BSTR TypeOfUI, @@ -13992,6 +12095,7 @@ typedef struct ISpeechVoiceVtbl { END_INTERFACE } ISpeechVoiceVtbl; + interface ISpeechVoice { CONST_VTBL ISpeechVoiceVtbl* lpVtbl; }; @@ -14166,276 +12270,6 @@ static FORCEINLINE HRESULT ISpeechVoice_DisplayUI(ISpeechVoice* This,LONG hWndPa #endif -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Status_Proxy( - ISpeechVoice* This, - ISpeechVoiceStatus **Status); -void __RPC_STUB ISpeechVoice_get_Status_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Voice_Proxy( - ISpeechVoice* This, - ISpeechObjectToken **Voice); -void __RPC_STUB ISpeechVoice_get_Voice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_putref_Voice_Proxy( - ISpeechVoice* This, - ISpeechObjectToken *Voice); -void __RPC_STUB ISpeechVoice_putref_Voice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_AudioOutput_Proxy( - ISpeechVoice* This, - ISpeechObjectToken **AudioOutput); -void __RPC_STUB ISpeechVoice_get_AudioOutput_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_putref_AudioOutput_Proxy( - ISpeechVoice* This, - ISpeechObjectToken *AudioOutput); -void __RPC_STUB ISpeechVoice_putref_AudioOutput_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_AudioOutputStream_Proxy( - ISpeechVoice* This, - ISpeechBaseStream **AudioOutputStream); -void __RPC_STUB ISpeechVoice_get_AudioOutputStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_putref_AudioOutputStream_Proxy( - ISpeechVoice* This, - ISpeechBaseStream *AudioOutputStream); -void __RPC_STUB ISpeechVoice_putref_AudioOutputStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Rate_Proxy( - ISpeechVoice* This, - LONG *Rate); -void __RPC_STUB ISpeechVoice_get_Rate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_put_Rate_Proxy( - ISpeechVoice* This, - LONG Rate); -void __RPC_STUB ISpeechVoice_put_Rate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Volume_Proxy( - ISpeechVoice* This, - LONG *Volume); -void __RPC_STUB ISpeechVoice_get_Volume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_put_Volume_Proxy( - ISpeechVoice* This, - LONG Volume); -void __RPC_STUB ISpeechVoice_put_Volume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_put_AllowAudioOutputFormatChangesOnNextSet_Proxy( - ISpeechVoice* This, - VARIANT_BOOL Allow); -void __RPC_STUB ISpeechVoice_put_AllowAudioOutputFormatChangesOnNextSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_AllowAudioOutputFormatChangesOnNextSet_Proxy( - ISpeechVoice* This, - VARIANT_BOOL *Allow); -void __RPC_STUB ISpeechVoice_get_AllowAudioOutputFormatChangesOnNextSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_EventInterests_Proxy( - ISpeechVoice* This, - SpeechVoiceEvents *EventInterestFlags); -void __RPC_STUB ISpeechVoice_get_EventInterests_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_put_EventInterests_Proxy( - ISpeechVoice* This, - SpeechVoiceEvents EventInterestFlags); -void __RPC_STUB ISpeechVoice_put_EventInterests_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_put_Priority_Proxy( - ISpeechVoice* This, - SpeechVoicePriority Priority); -void __RPC_STUB ISpeechVoice_put_Priority_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Priority_Proxy( - ISpeechVoice* This, - SpeechVoicePriority *Priority); -void __RPC_STUB ISpeechVoice_get_Priority_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_put_AlertBoundary_Proxy( - ISpeechVoice* This, - SpeechVoiceEvents Boundary); -void __RPC_STUB ISpeechVoice_put_AlertBoundary_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_AlertBoundary_Proxy( - ISpeechVoice* This, - SpeechVoiceEvents *Boundary); -void __RPC_STUB ISpeechVoice_get_AlertBoundary_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_put_SynchronousSpeakTimeout_Proxy( - ISpeechVoice* This, - LONG msTimeout); -void __RPC_STUB ISpeechVoice_put_SynchronousSpeakTimeout_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_SynchronousSpeakTimeout_Proxy( - ISpeechVoice* This, - LONG *msTimeout); -void __RPC_STUB ISpeechVoice_get_SynchronousSpeakTimeout_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_Speak_Proxy( - ISpeechVoice* This, - BSTR Text, - SpeechVoiceSpeakFlags Flags, - LONG *StreamNumber); -void __RPC_STUB ISpeechVoice_Speak_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_SpeakStream_Proxy( - ISpeechVoice* This, - ISpeechBaseStream *Stream, - SpeechVoiceSpeakFlags Flags, - LONG *StreamNumber); -void __RPC_STUB ISpeechVoice_SpeakStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_Pause_Proxy( - ISpeechVoice* This); -void __RPC_STUB ISpeechVoice_Pause_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_Resume_Proxy( - ISpeechVoice* This); -void __RPC_STUB ISpeechVoice_Resume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_Skip_Proxy( - ISpeechVoice* This, - const BSTR Type, - LONG NumItems, - LONG *NumSkipped); -void __RPC_STUB ISpeechVoice_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_GetVoices_Proxy( - ISpeechVoice* This, - BSTR RequiredAttributes, - BSTR OptionalAttributes, - ISpeechObjectTokens **ObjectTokens); -void __RPC_STUB ISpeechVoice_GetVoices_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_GetAudioOutputs_Proxy( - ISpeechVoice* This, - BSTR RequiredAttributes, - BSTR OptionalAttributes, - ISpeechObjectTokens **ObjectTokens); -void __RPC_STUB ISpeechVoice_GetAudioOutputs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_WaitUntilDone_Proxy( - ISpeechVoice* This, - LONG msTimeout, - VARIANT_BOOL *Done); -void __RPC_STUB ISpeechVoice_WaitUntilDone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_SpeakCompleteEvent_Proxy( - ISpeechVoice* This, - LONG *Handle); -void __RPC_STUB ISpeechVoice_SpeakCompleteEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_IsUISupported_Proxy( - ISpeechVoice* This, - const BSTR TypeOfUI, - const VARIANT *ExtraData, - VARIANT_BOOL *Supported); -void __RPC_STUB ISpeechVoice_IsUISupported_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_DisplayUI_Proxy( - ISpeechVoice* This, - LONG hWndParent, - BSTR Title, - const BSTR TypeOfUI, - const VARIANT *ExtraData); -void __RPC_STUB ISpeechVoice_DisplayUI_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechVoice_INTERFACE_DEFINED__ */ @@ -14496,29 +12330,29 @@ typedef struct ISpeechVoiceStatusVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechVoiceStatus* This); + ISpeechVoiceStatus *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechVoiceStatus* This); + ISpeechVoiceStatus *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -14526,7 +12360,7 @@ typedef struct ISpeechVoiceStatusVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -14538,55 +12372,56 @@ typedef struct ISpeechVoiceStatusVtbl { /*** ISpeechVoiceStatus methods ***/ HRESULT (STDMETHODCALLTYPE *get_CurrentStreamNumber)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, LONG *StreamNumber); HRESULT (STDMETHODCALLTYPE *get_LastStreamNumberQueued)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, LONG *StreamNumber); HRESULT (STDMETHODCALLTYPE *get_LastHResult)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, LONG *HResult); HRESULT (STDMETHODCALLTYPE *get_RunningState)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, SpeechRunState *State); HRESULT (STDMETHODCALLTYPE *get_InputWordPosition)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, LONG *Position); HRESULT (STDMETHODCALLTYPE *get_InputWordLength)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, LONG *Length); HRESULT (STDMETHODCALLTYPE *get_InputSentencePosition)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, LONG *Position); HRESULT (STDMETHODCALLTYPE *get_InputSentenceLength)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, LONG *Length); HRESULT (STDMETHODCALLTYPE *get_LastBookmark)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, BSTR *Bookmark); HRESULT (STDMETHODCALLTYPE *get_LastBookmarkId)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, LONG *BookmarkId); HRESULT (STDMETHODCALLTYPE *get_PhonemeId)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, short *PhoneId); HRESULT (STDMETHODCALLTYPE *get_VisemeId)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, short *VisemeId); END_INTERFACE } ISpeechVoiceStatusVtbl; + interface ISpeechVoiceStatus { CONST_VTBL ISpeechVoiceStatusVtbl* lpVtbl; }; @@ -14681,102 +12516,6 @@ static FORCEINLINE HRESULT ISpeechVoiceStatus_get_VisemeId(ISpeechVoiceStatus* T #endif -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_CurrentStreamNumber_Proxy( - ISpeechVoiceStatus* This, - LONG *StreamNumber); -void __RPC_STUB ISpeechVoiceStatus_get_CurrentStreamNumber_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_LastStreamNumberQueued_Proxy( - ISpeechVoiceStatus* This, - LONG *StreamNumber); -void __RPC_STUB ISpeechVoiceStatus_get_LastStreamNumberQueued_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_LastHResult_Proxy( - ISpeechVoiceStatus* This, - LONG *HResult); -void __RPC_STUB ISpeechVoiceStatus_get_LastHResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_RunningState_Proxy( - ISpeechVoiceStatus* This, - SpeechRunState *State); -void __RPC_STUB ISpeechVoiceStatus_get_RunningState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_InputWordPosition_Proxy( - ISpeechVoiceStatus* This, - LONG *Position); -void __RPC_STUB ISpeechVoiceStatus_get_InputWordPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_InputWordLength_Proxy( - ISpeechVoiceStatus* This, - LONG *Length); -void __RPC_STUB ISpeechVoiceStatus_get_InputWordLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_InputSentencePosition_Proxy( - ISpeechVoiceStatus* This, - LONG *Position); -void __RPC_STUB ISpeechVoiceStatus_get_InputSentencePosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_InputSentenceLength_Proxy( - ISpeechVoiceStatus* This, - LONG *Length); -void __RPC_STUB ISpeechVoiceStatus_get_InputSentenceLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_LastBookmark_Proxy( - ISpeechVoiceStatus* This, - BSTR *Bookmark); -void __RPC_STUB ISpeechVoiceStatus_get_LastBookmark_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_LastBookmarkId_Proxy( - ISpeechVoiceStatus* This, - LONG *BookmarkId); -void __RPC_STUB ISpeechVoiceStatus_get_LastBookmarkId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_PhonemeId_Proxy( - ISpeechVoiceStatus* This, - short *PhoneId); -void __RPC_STUB ISpeechVoiceStatus_get_PhonemeId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_VisemeId_Proxy( - ISpeechVoiceStatus* This, - short *VisemeId); -void __RPC_STUB ISpeechVoiceStatus_get_VisemeId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechVoiceStatus_INTERFACE_DEFINED__ */ @@ -15270,29 +13009,29 @@ typedef struct _ISpeechVoiceEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - _ISpeechVoiceEvents* This, + _ISpeechVoiceEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - _ISpeechVoiceEvents* This); + _ISpeechVoiceEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - _ISpeechVoiceEvents* This); + _ISpeechVoiceEvents *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - _ISpeechVoiceEvents* This, + _ISpeechVoiceEvents *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - _ISpeechVoiceEvents* This, + _ISpeechVoiceEvents *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - _ISpeechVoiceEvents* This, + _ISpeechVoiceEvents *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -15300,7 +13039,7 @@ typedef struct _ISpeechVoiceEventsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - _ISpeechVoiceEvents* This, + _ISpeechVoiceEvents *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -15312,6 +13051,7 @@ typedef struct _ISpeechVoiceEventsVtbl { END_INTERFACE } _ISpeechVoiceEventsVtbl; + interface _ISpeechVoiceEvents { CONST_VTBL _ISpeechVoiceEventsVtbl* lpVtbl; }; @@ -15479,29 +13219,29 @@ typedef struct ISpeechRecognizerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechRecognizer* This); + ISpeechRecognizer *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechRecognizer* This); + ISpeechRecognizer *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -15509,7 +13249,7 @@ typedef struct ISpeechRecognizerVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -15521,133 +13261,134 @@ typedef struct ISpeechRecognizerVtbl { /*** ISpeechRecognizer methods ***/ HRESULT (STDMETHODCALLTYPE *putref_Recognizer)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechObjectToken *Recognizer); HRESULT (STDMETHODCALLTYPE *get_Recognizer)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechObjectToken **Recognizer); HRESULT (STDMETHODCALLTYPE *put_AllowAudioInputFormatChangesOnNextSet)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, VARIANT_BOOL Allow); HRESULT (STDMETHODCALLTYPE *get_AllowAudioInputFormatChangesOnNextSet)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, VARIANT_BOOL *Allow); HRESULT (STDMETHODCALLTYPE *putref_AudioInput)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechObjectToken *AudioInput); HRESULT (STDMETHODCALLTYPE *get_AudioInput)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechObjectToken **AudioInput); HRESULT (STDMETHODCALLTYPE *putref_AudioInputStream)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechBaseStream *AudioInputStream); HRESULT (STDMETHODCALLTYPE *get_AudioInputStream)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechBaseStream **AudioInputStream); HRESULT (STDMETHODCALLTYPE *get_IsShared)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, VARIANT_BOOL *Shared); HRESULT (STDMETHODCALLTYPE *put_State)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, SpeechRecognizerState State); HRESULT (STDMETHODCALLTYPE *get_State)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, SpeechRecognizerState *State); HRESULT (STDMETHODCALLTYPE *get_Status)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechRecognizerStatus **Status); HRESULT (STDMETHODCALLTYPE *putref_Profile)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechObjectToken *Profile); HRESULT (STDMETHODCALLTYPE *get_Profile)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechObjectToken **Profile); HRESULT (STDMETHODCALLTYPE *EmulateRecognition)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, VARIANT TextElements, VARIANT *ElementDisplayAttributes, LONG LanguageId); HRESULT (STDMETHODCALLTYPE *CreateRecoContext)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechRecoContext **NewContext); HRESULT (STDMETHODCALLTYPE *GetFormat)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, SpeechFormatType Type, ISpeechAudioFormat **Format); HRESULT (STDMETHODCALLTYPE *SetPropertyNumber)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, const BSTR Name, LONG Value, VARIANT_BOOL *Supported); HRESULT (STDMETHODCALLTYPE *GetPropertyNumber)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, const BSTR Name, LONG *Value, VARIANT_BOOL *Supported); HRESULT (STDMETHODCALLTYPE *SetPropertyString)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, const BSTR Name, const BSTR Value, VARIANT_BOOL *Supported); HRESULT (STDMETHODCALLTYPE *GetPropertyString)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, const BSTR Name, BSTR *Value, VARIANT_BOOL *Supported); HRESULT (STDMETHODCALLTYPE *IsUISupported)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, const BSTR TypeOfUI, const VARIANT *ExtraData, VARIANT_BOOL *Supported); HRESULT (STDMETHODCALLTYPE *DisplayUI)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, LONG hWndParent, BSTR Title, const BSTR TypeOfUI, const VARIANT *ExtraData); HRESULT (STDMETHODCALLTYPE *GetRecognizers)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, BSTR RequiredAttributes, BSTR OptionalAttributes, ISpeechObjectTokens **ObjectTokens); HRESULT (STDMETHODCALLTYPE *GetAudioInputs)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, BSTR RequiredAttributes, BSTR OptionalAttributes, ISpeechObjectTokens **ObjectTokens); HRESULT (STDMETHODCALLTYPE *GetProfiles)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, BSTR RequiredAttributes, BSTR OptionalAttributes, ISpeechObjectTokens **ObjectTokens); END_INTERFACE } ISpeechRecognizerVtbl; + interface ISpeechRecognizer { CONST_VTBL ISpeechRecognizerVtbl* lpVtbl; }; @@ -15798,236 +13539,6 @@ static FORCEINLINE HRESULT ISpeechRecognizer_GetProfiles(ISpeechRecognizer* This #endif -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_putref_Recognizer_Proxy( - ISpeechRecognizer* This, - ISpeechObjectToken *Recognizer); -void __RPC_STUB ISpeechRecognizer_putref_Recognizer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_Recognizer_Proxy( - ISpeechRecognizer* This, - ISpeechObjectToken **Recognizer); -void __RPC_STUB ISpeechRecognizer_get_Recognizer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_put_AllowAudioInputFormatChangesOnNextSet_Proxy( - ISpeechRecognizer* This, - VARIANT_BOOL Allow); -void __RPC_STUB ISpeechRecognizer_put_AllowAudioInputFormatChangesOnNextSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_AllowAudioInputFormatChangesOnNextSet_Proxy( - ISpeechRecognizer* This, - VARIANT_BOOL *Allow); -void __RPC_STUB ISpeechRecognizer_get_AllowAudioInputFormatChangesOnNextSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_putref_AudioInput_Proxy( - ISpeechRecognizer* This, - ISpeechObjectToken *AudioInput); -void __RPC_STUB ISpeechRecognizer_putref_AudioInput_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_AudioInput_Proxy( - ISpeechRecognizer* This, - ISpeechObjectToken **AudioInput); -void __RPC_STUB ISpeechRecognizer_get_AudioInput_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_putref_AudioInputStream_Proxy( - ISpeechRecognizer* This, - ISpeechBaseStream *AudioInputStream); -void __RPC_STUB ISpeechRecognizer_putref_AudioInputStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_AudioInputStream_Proxy( - ISpeechRecognizer* This, - ISpeechBaseStream **AudioInputStream); -void __RPC_STUB ISpeechRecognizer_get_AudioInputStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_IsShared_Proxy( - ISpeechRecognizer* This, - VARIANT_BOOL *Shared); -void __RPC_STUB ISpeechRecognizer_get_IsShared_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_put_State_Proxy( - ISpeechRecognizer* This, - SpeechRecognizerState State); -void __RPC_STUB ISpeechRecognizer_put_State_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_State_Proxy( - ISpeechRecognizer* This, - SpeechRecognizerState *State); -void __RPC_STUB ISpeechRecognizer_get_State_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_Status_Proxy( - ISpeechRecognizer* This, - ISpeechRecognizerStatus **Status); -void __RPC_STUB ISpeechRecognizer_get_Status_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_putref_Profile_Proxy( - ISpeechRecognizer* This, - ISpeechObjectToken *Profile); -void __RPC_STUB ISpeechRecognizer_putref_Profile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_Profile_Proxy( - ISpeechRecognizer* This, - ISpeechObjectToken **Profile); -void __RPC_STUB ISpeechRecognizer_get_Profile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_EmulateRecognition_Proxy( - ISpeechRecognizer* This, - VARIANT TextElements, - VARIANT *ElementDisplayAttributes, - LONG LanguageId); -void __RPC_STUB ISpeechRecognizer_EmulateRecognition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_CreateRecoContext_Proxy( - ISpeechRecognizer* This, - ISpeechRecoContext **NewContext); -void __RPC_STUB ISpeechRecognizer_CreateRecoContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetFormat_Proxy( - ISpeechRecognizer* This, - SpeechFormatType Type, - ISpeechAudioFormat **Format); -void __RPC_STUB ISpeechRecognizer_GetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_SetPropertyNumber_Proxy( - ISpeechRecognizer* This, - const BSTR Name, - LONG Value, - VARIANT_BOOL *Supported); -void __RPC_STUB ISpeechRecognizer_SetPropertyNumber_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetPropertyNumber_Proxy( - ISpeechRecognizer* This, - const BSTR Name, - LONG *Value, - VARIANT_BOOL *Supported); -void __RPC_STUB ISpeechRecognizer_GetPropertyNumber_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_SetPropertyString_Proxy( - ISpeechRecognizer* This, - const BSTR Name, - const BSTR Value, - VARIANT_BOOL *Supported); -void __RPC_STUB ISpeechRecognizer_SetPropertyString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetPropertyString_Proxy( - ISpeechRecognizer* This, - const BSTR Name, - BSTR *Value, - VARIANT_BOOL *Supported); -void __RPC_STUB ISpeechRecognizer_GetPropertyString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_IsUISupported_Proxy( - ISpeechRecognizer* This, - const BSTR TypeOfUI, - const VARIANT *ExtraData, - VARIANT_BOOL *Supported); -void __RPC_STUB ISpeechRecognizer_IsUISupported_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_DisplayUI_Proxy( - ISpeechRecognizer* This, - LONG hWndParent, - BSTR Title, - const BSTR TypeOfUI, - const VARIANT *ExtraData); -void __RPC_STUB ISpeechRecognizer_DisplayUI_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetRecognizers_Proxy( - ISpeechRecognizer* This, - BSTR RequiredAttributes, - BSTR OptionalAttributes, - ISpeechObjectTokens **ObjectTokens); -void __RPC_STUB ISpeechRecognizer_GetRecognizers_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetAudioInputs_Proxy( - ISpeechRecognizer* This, - BSTR RequiredAttributes, - BSTR OptionalAttributes, - ISpeechObjectTokens **ObjectTokens); -void __RPC_STUB ISpeechRecognizer_GetAudioInputs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetProfiles_Proxy( - ISpeechRecognizer* This, - BSTR RequiredAttributes, - BSTR OptionalAttributes, - ISpeechObjectTokens **ObjectTokens); -void __RPC_STUB ISpeechRecognizer_GetProfiles_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechRecognizer_INTERFACE_DEFINED__ */ @@ -16070,29 +13581,29 @@ typedef struct ISpeechRecognizerStatusVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechRecognizerStatus* This); + ISpeechRecognizerStatus *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechRecognizerStatus* This); + ISpeechRecognizerStatus *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -16100,7 +13611,7 @@ typedef struct ISpeechRecognizerStatusVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -16112,31 +13623,32 @@ typedef struct ISpeechRecognizerStatusVtbl { /*** ISpeechRecognizerStatus methods ***/ HRESULT (STDMETHODCALLTYPE *get_AudioStatus)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, ISpeechAudioStatus **AudioStatus); HRESULT (STDMETHODCALLTYPE *get_CurrentStreamPosition)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, VARIANT *pCurrentStreamPos); HRESULT (STDMETHODCALLTYPE *get_CurrentStreamNumber)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, LONG *StreamNumber); HRESULT (STDMETHODCALLTYPE *get_NumberOfActiveRules)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, LONG *NumberOfActiveRules); HRESULT (STDMETHODCALLTYPE *get_ClsidEngine)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, BSTR *ClsidEngine); HRESULT (STDMETHODCALLTYPE *get_SupportedLanguages)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, VARIANT *SupportedLanguages); END_INTERFACE } ISpeechRecognizerStatusVtbl; + interface ISpeechRecognizerStatus { CONST_VTBL ISpeechRecognizerStatusVtbl* lpVtbl; }; @@ -16207,54 +13719,6 @@ static FORCEINLINE HRESULT ISpeechRecognizerStatus_get_SupportedLanguages(ISpeec #endif -HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_AudioStatus_Proxy( - ISpeechRecognizerStatus* This, - ISpeechAudioStatus **AudioStatus); -void __RPC_STUB ISpeechRecognizerStatus_get_AudioStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_CurrentStreamPosition_Proxy( - ISpeechRecognizerStatus* This, - VARIANT *pCurrentStreamPos); -void __RPC_STUB ISpeechRecognizerStatus_get_CurrentStreamPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_CurrentStreamNumber_Proxy( - ISpeechRecognizerStatus* This, - LONG *StreamNumber); -void __RPC_STUB ISpeechRecognizerStatus_get_CurrentStreamNumber_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_NumberOfActiveRules_Proxy( - ISpeechRecognizerStatus* This, - LONG *NumberOfActiveRules); -void __RPC_STUB ISpeechRecognizerStatus_get_NumberOfActiveRules_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_ClsidEngine_Proxy( - ISpeechRecognizerStatus* This, - BSTR *ClsidEngine); -void __RPC_STUB ISpeechRecognizerStatus_get_ClsidEngine_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_SupportedLanguages_Proxy( - ISpeechRecognizerStatus* This, - VARIANT *SupportedLanguages); -void __RPC_STUB ISpeechRecognizerStatus_get_SupportedLanguages_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechRecognizerStatus_INTERFACE_DEFINED__ */ @@ -16358,29 +13822,29 @@ typedef struct ISpeechRecoContextVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechRecoContext* This); + ISpeechRecoContext *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechRecoContext* This); + ISpeechRecoContext *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -16388,7 +13852,7 @@ typedef struct ISpeechRecoContextVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -16400,109 +13864,110 @@ typedef struct ISpeechRecoContextVtbl { /*** ISpeechRecoContext methods ***/ HRESULT (STDMETHODCALLTYPE *get_Recognizer)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, ISpeechRecognizer **Recognizer); HRESULT (STDMETHODCALLTYPE *get_AudioInputInterferenceStatus)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechInterference *Interference); HRESULT (STDMETHODCALLTYPE *get_RequestedUIType)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, BSTR *UIType); HRESULT (STDMETHODCALLTYPE *putref_Voice)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, ISpeechVoice *Voice); HRESULT (STDMETHODCALLTYPE *get_Voice)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, ISpeechVoice **Voice); HRESULT (STDMETHODCALLTYPE *put_AllowVoiceFormatMatchingOnNextSet)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, VARIANT_BOOL Allow); HRESULT (STDMETHODCALLTYPE *get_AllowVoiceFormatMatchingOnNextSet)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, VARIANT_BOOL *pAllow); HRESULT (STDMETHODCALLTYPE *put_VoicePurgeEvent)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechRecoEvents EventInterest); HRESULT (STDMETHODCALLTYPE *get_VoicePurgeEvent)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechRecoEvents *EventInterest); HRESULT (STDMETHODCALLTYPE *put_EventInterests)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechRecoEvents EventInterest); HRESULT (STDMETHODCALLTYPE *get_EventInterests)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechRecoEvents *EventInterest); HRESULT (STDMETHODCALLTYPE *put_CmdMaxAlternates)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, LONG MaxAlternates); HRESULT (STDMETHODCALLTYPE *get_CmdMaxAlternates)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, LONG *MaxAlternates); HRESULT (STDMETHODCALLTYPE *put_State)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechRecoContextState State); HRESULT (STDMETHODCALLTYPE *get_State)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechRecoContextState *State); HRESULT (STDMETHODCALLTYPE *put_RetainedAudio)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechRetainedAudioOptions Option); HRESULT (STDMETHODCALLTYPE *get_RetainedAudio)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechRetainedAudioOptions *Option); HRESULT (STDMETHODCALLTYPE *putref_RetainedAudioFormat)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, ISpeechAudioFormat *Format); HRESULT (STDMETHODCALLTYPE *get_RetainedAudioFormat)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, ISpeechAudioFormat **Format); HRESULT (STDMETHODCALLTYPE *Pause)( - ISpeechRecoContext* This); + ISpeechRecoContext *This); HRESULT (STDMETHODCALLTYPE *Resume)( - ISpeechRecoContext* This); + ISpeechRecoContext *This); HRESULT (STDMETHODCALLTYPE *CreateGrammar)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, VARIANT GrammarId, ISpeechRecoGrammar **Grammar); HRESULT (STDMETHODCALLTYPE *CreateResultFromMemory)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, VARIANT *ResultBlock, ISpeechRecoResult **Result); HRESULT (STDMETHODCALLTYPE *Bookmark)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechBookmarkOptions Options, VARIANT StreamPos, VARIANT BookmarkId); HRESULT (STDMETHODCALLTYPE *SetAdaptationData)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, BSTR AdaptationString); END_INTERFACE } ISpeechRecoContextVtbl; + interface ISpeechRecoContext { CONST_VTBL ISpeechRecoContextVtbl* lpVtbl; }; @@ -16649,208 +14114,6 @@ static FORCEINLINE HRESULT ISpeechRecoContext_SetAdaptationData(ISpeechRecoConte #endif -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_Recognizer_Proxy( - ISpeechRecoContext* This, - ISpeechRecognizer **Recognizer); -void __RPC_STUB ISpeechRecoContext_get_Recognizer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_AudioInputInterferenceStatus_Proxy( - ISpeechRecoContext* This, - SpeechInterference *Interference); -void __RPC_STUB ISpeechRecoContext_get_AudioInputInterferenceStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_RequestedUIType_Proxy( - ISpeechRecoContext* This, - BSTR *UIType); -void __RPC_STUB ISpeechRecoContext_get_RequestedUIType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_putref_Voice_Proxy( - ISpeechRecoContext* This, - ISpeechVoice *Voice); -void __RPC_STUB ISpeechRecoContext_putref_Voice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_Voice_Proxy( - ISpeechRecoContext* This, - ISpeechVoice **Voice); -void __RPC_STUB ISpeechRecoContext_get_Voice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_AllowVoiceFormatMatchingOnNextSet_Proxy( - ISpeechRecoContext* This, - VARIANT_BOOL Allow); -void __RPC_STUB ISpeechRecoContext_put_AllowVoiceFormatMatchingOnNextSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_AllowVoiceFormatMatchingOnNextSet_Proxy( - ISpeechRecoContext* This, - VARIANT_BOOL *pAllow); -void __RPC_STUB ISpeechRecoContext_get_AllowVoiceFormatMatchingOnNextSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_VoicePurgeEvent_Proxy( - ISpeechRecoContext* This, - SpeechRecoEvents EventInterest); -void __RPC_STUB ISpeechRecoContext_put_VoicePurgeEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_VoicePurgeEvent_Proxy( - ISpeechRecoContext* This, - SpeechRecoEvents *EventInterest); -void __RPC_STUB ISpeechRecoContext_get_VoicePurgeEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_EventInterests_Proxy( - ISpeechRecoContext* This, - SpeechRecoEvents EventInterest); -void __RPC_STUB ISpeechRecoContext_put_EventInterests_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_EventInterests_Proxy( - ISpeechRecoContext* This, - SpeechRecoEvents *EventInterest); -void __RPC_STUB ISpeechRecoContext_get_EventInterests_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_CmdMaxAlternates_Proxy( - ISpeechRecoContext* This, - LONG MaxAlternates); -void __RPC_STUB ISpeechRecoContext_put_CmdMaxAlternates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_CmdMaxAlternates_Proxy( - ISpeechRecoContext* This, - LONG *MaxAlternates); -void __RPC_STUB ISpeechRecoContext_get_CmdMaxAlternates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_State_Proxy( - ISpeechRecoContext* This, - SpeechRecoContextState State); -void __RPC_STUB ISpeechRecoContext_put_State_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_State_Proxy( - ISpeechRecoContext* This, - SpeechRecoContextState *State); -void __RPC_STUB ISpeechRecoContext_get_State_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_RetainedAudio_Proxy( - ISpeechRecoContext* This, - SpeechRetainedAudioOptions Option); -void __RPC_STUB ISpeechRecoContext_put_RetainedAudio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_RetainedAudio_Proxy( - ISpeechRecoContext* This, - SpeechRetainedAudioOptions *Option); -void __RPC_STUB ISpeechRecoContext_get_RetainedAudio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_putref_RetainedAudioFormat_Proxy( - ISpeechRecoContext* This, - ISpeechAudioFormat *Format); -void __RPC_STUB ISpeechRecoContext_putref_RetainedAudioFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_RetainedAudioFormat_Proxy( - ISpeechRecoContext* This, - ISpeechAudioFormat **Format); -void __RPC_STUB ISpeechRecoContext_get_RetainedAudioFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_Pause_Proxy( - ISpeechRecoContext* This); -void __RPC_STUB ISpeechRecoContext_Pause_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_Resume_Proxy( - ISpeechRecoContext* This); -void __RPC_STUB ISpeechRecoContext_Resume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_CreateGrammar_Proxy( - ISpeechRecoContext* This, - VARIANT GrammarId, - ISpeechRecoGrammar **Grammar); -void __RPC_STUB ISpeechRecoContext_CreateGrammar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_CreateResultFromMemory_Proxy( - ISpeechRecoContext* This, - VARIANT *ResultBlock, - ISpeechRecoResult **Result); -void __RPC_STUB ISpeechRecoContext_CreateResultFromMemory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_Bookmark_Proxy( - ISpeechRecoContext* This, - SpeechBookmarkOptions Options, - VARIANT StreamPos, - VARIANT BookmarkId); -void __RPC_STUB ISpeechRecoContext_Bookmark_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_SetAdaptationData_Proxy( - ISpeechRecoContext* This, - BSTR AdaptationString); -void __RPC_STUB ISpeechRecoContext_SetAdaptationData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechRecoContext_INTERFACE_DEFINED__ */ @@ -16949,29 +14212,29 @@ typedef struct ISpeechRecoGrammarVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechRecoGrammar* This); + ISpeechRecoGrammar *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechRecoGrammar* This); + ISpeechRecoGrammar *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -16979,7 +14242,7 @@ typedef struct ISpeechRecoGrammarVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -16991,42 +14254,42 @@ typedef struct ISpeechRecoGrammarVtbl { /*** ISpeechRecoGrammar methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, VARIANT *Id); HRESULT (STDMETHODCALLTYPE *get_RecoContext)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, ISpeechRecoContext **RecoContext); HRESULT (STDMETHODCALLTYPE *put_State)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, SpeechGrammarState State); HRESULT (STDMETHODCALLTYPE *get_State)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, SpeechGrammarState *State); HRESULT (STDMETHODCALLTYPE *get_Rules)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, ISpeechGrammarRules **Rules); HRESULT (STDMETHODCALLTYPE *Reset)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, SpeechLanguageId NewLanguage); HRESULT (STDMETHODCALLTYPE *CmdLoadFromFile)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, const BSTR FileName, SpeechLoadOption LoadOption); HRESULT (STDMETHODCALLTYPE *CmdLoadFromObject)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, const BSTR ClassId, const BSTR GrammarName, SpeechLoadOption LoadOption); HRESULT (STDMETHODCALLTYPE *CmdLoadFromResource)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, LONG hModule, VARIANT ResourceName, VARIANT ResourceType, @@ -17034,56 +14297,57 @@ typedef struct ISpeechRecoGrammarVtbl { SpeechLoadOption LoadOption); HRESULT (STDMETHODCALLTYPE *CmdLoadFromMemory)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, VARIANT GrammarData, SpeechLoadOption LoadOption); HRESULT (STDMETHODCALLTYPE *CmdLoadFromProprietaryGrammar)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, const BSTR ProprietaryGuid, const BSTR ProprietaryString, VARIANT ProprietaryData, SpeechLoadOption LoadOption); HRESULT (STDMETHODCALLTYPE *CmdSetRuleState)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, const BSTR Name, SpeechRuleState State); HRESULT (STDMETHODCALLTYPE *CmdSetRuleIdState)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, LONG RuleId, SpeechRuleState State); HRESULT (STDMETHODCALLTYPE *DictationLoad)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, const BSTR TopicName, SpeechLoadOption LoadOption); HRESULT (STDMETHODCALLTYPE *DictationUnload)( - ISpeechRecoGrammar* This); + ISpeechRecoGrammar *This); HRESULT (STDMETHODCALLTYPE *DictationSetState)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, SpeechRuleState State); HRESULT (STDMETHODCALLTYPE *SetWordSequenceData)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, const BSTR Text, LONG TextLength, ISpeechTextSelectionInformation *Info); HRESULT (STDMETHODCALLTYPE *SetTextSelection)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, ISpeechTextSelectionInformation *Info); HRESULT (STDMETHODCALLTYPE *IsPronounceable)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, const BSTR Word, SpeechWordPronounceable *WordPronounceable); END_INTERFACE } ISpeechRecoGrammarVtbl; + interface ISpeechRecoGrammar { CONST_VTBL ISpeechRecoGrammarVtbl* lpVtbl; }; @@ -17206,174 +14470,6 @@ static FORCEINLINE HRESULT ISpeechRecoGrammar_IsPronounceable(ISpeechRecoGrammar #endif -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_get_Id_Proxy( - ISpeechRecoGrammar* This, - VARIANT *Id); -void __RPC_STUB ISpeechRecoGrammar_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_get_RecoContext_Proxy( - ISpeechRecoGrammar* This, - ISpeechRecoContext **RecoContext); -void __RPC_STUB ISpeechRecoGrammar_get_RecoContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_put_State_Proxy( - ISpeechRecoGrammar* This, - SpeechGrammarState State); -void __RPC_STUB ISpeechRecoGrammar_put_State_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_get_State_Proxy( - ISpeechRecoGrammar* This, - SpeechGrammarState *State); -void __RPC_STUB ISpeechRecoGrammar_get_State_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_get_Rules_Proxy( - ISpeechRecoGrammar* This, - ISpeechGrammarRules **Rules); -void __RPC_STUB ISpeechRecoGrammar_get_Rules_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_Reset_Proxy( - ISpeechRecoGrammar* This, - SpeechLanguageId NewLanguage); -void __RPC_STUB ISpeechRecoGrammar_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromFile_Proxy( - ISpeechRecoGrammar* This, - const BSTR FileName, - SpeechLoadOption LoadOption); -void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromObject_Proxy( - ISpeechRecoGrammar* This, - const BSTR ClassId, - const BSTR GrammarName, - SpeechLoadOption LoadOption); -void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromResource_Proxy( - ISpeechRecoGrammar* This, - LONG hModule, - VARIANT ResourceName, - VARIANT ResourceType, - SpeechLanguageId LanguageId, - SpeechLoadOption LoadOption); -void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromMemory_Proxy( - ISpeechRecoGrammar* This, - VARIANT GrammarData, - SpeechLoadOption LoadOption); -void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromMemory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromProprietaryGrammar_Proxy( - ISpeechRecoGrammar* This, - const BSTR ProprietaryGuid, - const BSTR ProprietaryString, - VARIANT ProprietaryData, - SpeechLoadOption LoadOption); -void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromProprietaryGrammar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdSetRuleState_Proxy( - ISpeechRecoGrammar* This, - const BSTR Name, - SpeechRuleState State); -void __RPC_STUB ISpeechRecoGrammar_CmdSetRuleState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdSetRuleIdState_Proxy( - ISpeechRecoGrammar* This, - LONG RuleId, - SpeechRuleState State); -void __RPC_STUB ISpeechRecoGrammar_CmdSetRuleIdState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_DictationLoad_Proxy( - ISpeechRecoGrammar* This, - const BSTR TopicName, - SpeechLoadOption LoadOption); -void __RPC_STUB ISpeechRecoGrammar_DictationLoad_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_DictationUnload_Proxy( - ISpeechRecoGrammar* This); -void __RPC_STUB ISpeechRecoGrammar_DictationUnload_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_DictationSetState_Proxy( - ISpeechRecoGrammar* This, - SpeechRuleState State); -void __RPC_STUB ISpeechRecoGrammar_DictationSetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_SetWordSequenceData_Proxy( - ISpeechRecoGrammar* This, - const BSTR Text, - LONG TextLength, - ISpeechTextSelectionInformation *Info); -void __RPC_STUB ISpeechRecoGrammar_SetWordSequenceData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_SetTextSelection_Proxy( - ISpeechRecoGrammar* This, - ISpeechTextSelectionInformation *Info); -void __RPC_STUB ISpeechRecoGrammar_SetTextSelection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_IsPronounceable_Proxy( - ISpeechRecoGrammar* This, - const BSTR Word, - SpeechWordPronounceable *WordPronounceable); -void __RPC_STUB ISpeechRecoGrammar_IsPronounceable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechRecoGrammar_INTERFACE_DEFINED__ */ @@ -17398,29 +14494,29 @@ typedef struct _ISpeechRecoContextEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - _ISpeechRecoContextEvents* This, + _ISpeechRecoContextEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - _ISpeechRecoContextEvents* This); + _ISpeechRecoContextEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - _ISpeechRecoContextEvents* This); + _ISpeechRecoContextEvents *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - _ISpeechRecoContextEvents* This, + _ISpeechRecoContextEvents *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - _ISpeechRecoContextEvents* This, + _ISpeechRecoContextEvents *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - _ISpeechRecoContextEvents* This, + _ISpeechRecoContextEvents *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -17428,7 +14524,7 @@ typedef struct _ISpeechRecoContextEventsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - _ISpeechRecoContextEvents* This, + _ISpeechRecoContextEvents *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -17440,6 +14536,7 @@ typedef struct _ISpeechRecoContextEventsVtbl { END_INTERFACE } _ISpeechRecoContextEventsVtbl; + interface _ISpeechRecoContextEvents { CONST_VTBL _ISpeechRecoContextEventsVtbl* lpVtbl; }; @@ -17529,29 +14626,29 @@ typedef struct ISpeechGrammarRuleVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechGrammarRule* This); + ISpeechGrammarRule *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechGrammarRule* This); + ISpeechGrammarRule *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -17559,7 +14656,7 @@ typedef struct ISpeechGrammarRuleVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -17571,35 +14668,36 @@ typedef struct ISpeechGrammarRuleVtbl { /*** ISpeechGrammarRule methods ***/ HRESULT (STDMETHODCALLTYPE *get_Attributes)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, SpeechRuleAttributes *Attributes); HRESULT (STDMETHODCALLTYPE *get_InitialState)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, ISpeechGrammarRuleState **State); HRESULT (STDMETHODCALLTYPE *get_Name)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, BSTR *Name); HRESULT (STDMETHODCALLTYPE *get_Id)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, LONG *Id); HRESULT (STDMETHODCALLTYPE *Clear)( - ISpeechGrammarRule* This); + ISpeechGrammarRule *This); HRESULT (STDMETHODCALLTYPE *AddResource)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, const BSTR ResourceName, const BSTR ResourceValue); HRESULT (STDMETHODCALLTYPE *AddState)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, ISpeechGrammarRuleState **State); END_INTERFACE } ISpeechGrammarRuleVtbl; + interface ISpeechGrammarRule { CONST_VTBL ISpeechGrammarRuleVtbl* lpVtbl; }; @@ -17674,62 +14772,6 @@ static FORCEINLINE HRESULT ISpeechGrammarRule_AddState(ISpeechGrammarRule* This, #endif -HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_get_Attributes_Proxy( - ISpeechGrammarRule* This, - SpeechRuleAttributes *Attributes); -void __RPC_STUB ISpeechGrammarRule_get_Attributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_get_InitialState_Proxy( - ISpeechGrammarRule* This, - ISpeechGrammarRuleState **State); -void __RPC_STUB ISpeechGrammarRule_get_InitialState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_get_Name_Proxy( - ISpeechGrammarRule* This, - BSTR *Name); -void __RPC_STUB ISpeechGrammarRule_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_get_Id_Proxy( - ISpeechGrammarRule* This, - LONG *Id); -void __RPC_STUB ISpeechGrammarRule_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_Clear_Proxy( - ISpeechGrammarRule* This); -void __RPC_STUB ISpeechGrammarRule_Clear_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_AddResource_Proxy( - ISpeechGrammarRule* This, - const BSTR ResourceName, - const BSTR ResourceValue); -void __RPC_STUB ISpeechGrammarRule_AddResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_AddState_Proxy( - ISpeechGrammarRule* This, - ISpeechGrammarRuleState **State); -void __RPC_STUB ISpeechGrammarRule_AddState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechGrammarRule_INTERFACE_DEFINED__ */ @@ -17784,29 +14826,29 @@ typedef struct ISpeechGrammarRulesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechGrammarRules* This); + ISpeechGrammarRules *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechGrammarRules* This); + ISpeechGrammarRules *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -17814,7 +14856,7 @@ typedef struct ISpeechGrammarRulesVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -17826,44 +14868,45 @@ typedef struct ISpeechGrammarRulesVtbl { /*** ISpeechGrammarRules methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *FindRule)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, VARIANT RuleNameOrId, ISpeechGrammarRule **Rule); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, LONG Index, ISpeechGrammarRule **Rule); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, IUnknown **EnumVARIANT); HRESULT (STDMETHODCALLTYPE *get_Dynamic)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, VARIANT_BOOL *Dynamic); HRESULT (STDMETHODCALLTYPE *Add)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, BSTR RuleName, SpeechRuleAttributes Attributes, LONG RuleId, ISpeechGrammarRule **Rule); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpeechGrammarRules* This); + ISpeechGrammarRules *This); HRESULT (STDMETHODCALLTYPE *CommitAndSave)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, BSTR *ErrorText, VARIANT *SaveStream); END_INTERFACE } ISpeechGrammarRulesVtbl; + interface ISpeechGrammarRules { CONST_VTBL ISpeechGrammarRulesVtbl* lpVtbl; }; @@ -17942,75 +14985,6 @@ static FORCEINLINE HRESULT ISpeechGrammarRules_CommitAndSave(ISpeechGrammarRules #endif -HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_get_Count_Proxy( - ISpeechGrammarRules* This, - LONG *Count); -void __RPC_STUB ISpeechGrammarRules_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_FindRule_Proxy( - ISpeechGrammarRules* This, - VARIANT RuleNameOrId, - ISpeechGrammarRule **Rule); -void __RPC_STUB ISpeechGrammarRules_FindRule_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_Item_Proxy( - ISpeechGrammarRules* This, - LONG Index, - ISpeechGrammarRule **Rule); -void __RPC_STUB ISpeechGrammarRules_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_get__NewEnum_Proxy( - ISpeechGrammarRules* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechGrammarRules_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_get_Dynamic_Proxy( - ISpeechGrammarRules* This, - VARIANT_BOOL *Dynamic); -void __RPC_STUB ISpeechGrammarRules_get_Dynamic_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_Add_Proxy( - ISpeechGrammarRules* This, - BSTR RuleName, - SpeechRuleAttributes Attributes, - LONG RuleId, - ISpeechGrammarRule **Rule); -void __RPC_STUB ISpeechGrammarRules_Add_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_Commit_Proxy( - ISpeechGrammarRules* This); -void __RPC_STUB ISpeechGrammarRules_Commit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_CommitAndSave_Proxy( - ISpeechGrammarRules* This, - BSTR *ErrorText, - VARIANT *SaveStream); -void __RPC_STUB ISpeechGrammarRules_CommitAndSave_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechGrammarRules_INTERFACE_DEFINED__ */ @@ -18067,29 +15041,29 @@ typedef struct ISpeechGrammarRuleStateVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechGrammarRuleState* This); + ISpeechGrammarRuleState *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechGrammarRuleState* This); + ISpeechGrammarRuleState *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -18097,7 +15071,7 @@ typedef struct ISpeechGrammarRuleStateVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -18109,15 +15083,15 @@ typedef struct ISpeechGrammarRuleStateVtbl { /*** ISpeechGrammarRuleState methods ***/ HRESULT (STDMETHODCALLTYPE *get_Rule)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, ISpeechGrammarRule **Rule); HRESULT (STDMETHODCALLTYPE *get_Transitions)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, ISpeechGrammarRuleStateTransitions **Transitions); HRESULT (STDMETHODCALLTYPE *AddWordTransition)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, ISpeechGrammarRuleState *DestState, const BSTR Words, const BSTR Separators, @@ -18128,7 +15102,7 @@ typedef struct ISpeechGrammarRuleStateVtbl { float Weight); HRESULT (STDMETHODCALLTYPE *AddRuleTransition)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, ISpeechGrammarRuleState *DestinationState, ISpeechGrammarRule *Rule, const BSTR PropertyName, @@ -18137,7 +15111,7 @@ typedef struct ISpeechGrammarRuleStateVtbl { float Weight); HRESULT (STDMETHODCALLTYPE *AddSpecialTransition)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, ISpeechGrammarRuleState *DestinationState, SpeechSpecialTransitionType Type, const BSTR PropertyName, @@ -18147,6 +15121,7 @@ typedef struct ISpeechGrammarRuleStateVtbl { END_INTERFACE } ISpeechGrammarRuleStateVtbl; + interface ISpeechGrammarRuleState { CONST_VTBL ISpeechGrammarRuleStateVtbl* lpVtbl; }; @@ -18213,63 +15188,6 @@ static FORCEINLINE HRESULT ISpeechGrammarRuleState_AddSpecialTransition(ISpeechG #endif -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_get_Rule_Proxy( - ISpeechGrammarRuleState* This, - ISpeechGrammarRule **Rule); -void __RPC_STUB ISpeechGrammarRuleState_get_Rule_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_get_Transitions_Proxy( - ISpeechGrammarRuleState* This, - ISpeechGrammarRuleStateTransitions **Transitions); -void __RPC_STUB ISpeechGrammarRuleState_get_Transitions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_AddWordTransition_Proxy( - ISpeechGrammarRuleState* This, - ISpeechGrammarRuleState *DestState, - const BSTR Words, - const BSTR Separators, - SpeechGrammarWordType Type, - const BSTR PropertyName, - LONG PropertyId, - VARIANT *PropertyValue, - float Weight); -void __RPC_STUB ISpeechGrammarRuleState_AddWordTransition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_AddRuleTransition_Proxy( - ISpeechGrammarRuleState* This, - ISpeechGrammarRuleState *DestinationState, - ISpeechGrammarRule *Rule, - const BSTR PropertyName, - LONG PropertyId, - VARIANT *PropertyValue, - float Weight); -void __RPC_STUB ISpeechGrammarRuleState_AddRuleTransition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_AddSpecialTransition_Proxy( - ISpeechGrammarRuleState* This, - ISpeechGrammarRuleState *DestinationState, - SpeechSpecialTransitionType Type, - const BSTR PropertyName, - LONG PropertyId, - VARIANT *PropertyValue, - float Weight); -void __RPC_STUB ISpeechGrammarRuleState_AddSpecialTransition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechGrammarRuleState_INTERFACE_DEFINED__ */ @@ -18304,29 +15222,29 @@ typedef struct ISpeechGrammarRuleStateTransitionsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechGrammarRuleStateTransitions* This, + ISpeechGrammarRuleStateTransitions *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechGrammarRuleStateTransitions* This); + ISpeechGrammarRuleStateTransitions *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechGrammarRuleStateTransitions* This); + ISpeechGrammarRuleStateTransitions *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechGrammarRuleStateTransitions* This, + ISpeechGrammarRuleStateTransitions *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechGrammarRuleStateTransitions* This, + ISpeechGrammarRuleStateTransitions *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechGrammarRuleStateTransitions* This, + ISpeechGrammarRuleStateTransitions *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -18334,7 +15252,7 @@ typedef struct ISpeechGrammarRuleStateTransitionsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechGrammarRuleStateTransitions* This, + ISpeechGrammarRuleStateTransitions *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -18346,20 +15264,21 @@ typedef struct ISpeechGrammarRuleStateTransitionsVtbl { /*** ISpeechGrammarRuleStateTransitions methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechGrammarRuleStateTransitions* This, + ISpeechGrammarRuleStateTransitions *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechGrammarRuleStateTransitions* This, + ISpeechGrammarRuleStateTransitions *This, LONG Index, ISpeechGrammarRuleStateTransition **Transition); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechGrammarRuleStateTransitions* This, + ISpeechGrammarRuleStateTransitions *This, IUnknown **EnumVARIANT); END_INTERFACE } ISpeechGrammarRuleStateTransitionsVtbl; + interface ISpeechGrammarRuleStateTransitions { CONST_VTBL ISpeechGrammarRuleStateTransitionsVtbl* lpVtbl; }; @@ -18418,31 +15337,6 @@ static FORCEINLINE HRESULT ISpeechGrammarRuleStateTransitions_get__NewEnum(ISpee #endif -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransitions_get_Count_Proxy( - ISpeechGrammarRuleStateTransitions* This, - LONG *Count); -void __RPC_STUB ISpeechGrammarRuleStateTransitions_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransitions_Item_Proxy( - ISpeechGrammarRuleStateTransitions* This, - LONG Index, - ISpeechGrammarRuleStateTransition **Transition); -void __RPC_STUB ISpeechGrammarRuleStateTransitions_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransitions_get__NewEnum_Proxy( - ISpeechGrammarRuleStateTransitions* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechGrammarRuleStateTransitions_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechGrammarRuleStateTransitions_INTERFACE_DEFINED__ */ @@ -18491,29 +15385,29 @@ typedef struct ISpeechGrammarRuleStateTransitionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechGrammarRuleStateTransition* This); + ISpeechGrammarRuleStateTransition *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechGrammarRuleStateTransition* This); + ISpeechGrammarRuleStateTransition *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -18521,7 +15415,7 @@ typedef struct ISpeechGrammarRuleStateTransitionVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -18533,39 +15427,40 @@ typedef struct ISpeechGrammarRuleStateTransitionVtbl { /*** ISpeechGrammarRuleStateTransition methods ***/ HRESULT (STDMETHODCALLTYPE *get_Type)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, SpeechGrammarRuleStateTransitionType *Type); HRESULT (STDMETHODCALLTYPE *get_Text)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, BSTR *Text); HRESULT (STDMETHODCALLTYPE *get_Rule)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, ISpeechGrammarRule **Rule); HRESULT (STDMETHODCALLTYPE *get_Weight)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, VARIANT *Weight); HRESULT (STDMETHODCALLTYPE *get_PropertyName)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, BSTR *PropertyName); HRESULT (STDMETHODCALLTYPE *get_PropertyId)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, LONG *PropertyId); HRESULT (STDMETHODCALLTYPE *get_PropertyValue)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, VARIANT *PropertyValue); HRESULT (STDMETHODCALLTYPE *get_NextState)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, ISpeechGrammarRuleState **NextState); END_INTERFACE } ISpeechGrammarRuleStateTransitionVtbl; + interface ISpeechGrammarRuleStateTransition { CONST_VTBL ISpeechGrammarRuleStateTransitionVtbl* lpVtbl; }; @@ -18644,70 +15539,6 @@ static FORCEINLINE HRESULT ISpeechGrammarRuleStateTransition_get_NextState(ISpee #endif -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_Type_Proxy( - ISpeechGrammarRuleStateTransition* This, - SpeechGrammarRuleStateTransitionType *Type); -void __RPC_STUB ISpeechGrammarRuleStateTransition_get_Type_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_Text_Proxy( - ISpeechGrammarRuleStateTransition* This, - BSTR *Text); -void __RPC_STUB ISpeechGrammarRuleStateTransition_get_Text_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_Rule_Proxy( - ISpeechGrammarRuleStateTransition* This, - ISpeechGrammarRule **Rule); -void __RPC_STUB ISpeechGrammarRuleStateTransition_get_Rule_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_Weight_Proxy( - ISpeechGrammarRuleStateTransition* This, - VARIANT *Weight); -void __RPC_STUB ISpeechGrammarRuleStateTransition_get_Weight_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_PropertyName_Proxy( - ISpeechGrammarRuleStateTransition* This, - BSTR *PropertyName); -void __RPC_STUB ISpeechGrammarRuleStateTransition_get_PropertyName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_PropertyId_Proxy( - ISpeechGrammarRuleStateTransition* This, - LONG *PropertyId); -void __RPC_STUB ISpeechGrammarRuleStateTransition_get_PropertyId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_PropertyValue_Proxy( - ISpeechGrammarRuleStateTransition* This, - VARIANT *PropertyValue); -void __RPC_STUB ISpeechGrammarRuleStateTransition_get_PropertyValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_NextState_Proxy( - ISpeechGrammarRuleStateTransition* This, - ISpeechGrammarRuleState **NextState); -void __RPC_STUB ISpeechGrammarRuleStateTransition_get_NextState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechGrammarRuleStateTransition_INTERFACE_DEFINED__ */ @@ -18756,29 +15587,29 @@ typedef struct ISpeechTextSelectionInformationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechTextSelectionInformation* This); + ISpeechTextSelectionInformation *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechTextSelectionInformation* This); + ISpeechTextSelectionInformation *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -18786,7 +15617,7 @@ typedef struct ISpeechTextSelectionInformationVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -18798,39 +15629,40 @@ typedef struct ISpeechTextSelectionInformationVtbl { /*** ISpeechTextSelectionInformation methods ***/ HRESULT (STDMETHODCALLTYPE *put_ActiveOffset)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, LONG ActiveOffset); HRESULT (STDMETHODCALLTYPE *get_ActiveOffset)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, LONG *ActiveOffset); HRESULT (STDMETHODCALLTYPE *put_ActiveLength)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, LONG ActiveLength); HRESULT (STDMETHODCALLTYPE *get_ActiveLength)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, LONG *ActiveLength); HRESULT (STDMETHODCALLTYPE *put_SelectionOffset)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, LONG SelectionOffset); HRESULT (STDMETHODCALLTYPE *get_SelectionOffset)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, LONG *SelectionOffset); HRESULT (STDMETHODCALLTYPE *put_SelectionLength)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, LONG SelectionLength); HRESULT (STDMETHODCALLTYPE *get_SelectionLength)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, LONG *SelectionLength); END_INTERFACE } ISpeechTextSelectionInformationVtbl; + interface ISpeechTextSelectionInformation { CONST_VTBL ISpeechTextSelectionInformationVtbl* lpVtbl; }; @@ -18909,70 +15741,6 @@ static FORCEINLINE HRESULT ISpeechTextSelectionInformation_get_SelectionLength(I #endif -HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_put_ActiveOffset_Proxy( - ISpeechTextSelectionInformation* This, - LONG ActiveOffset); -void __RPC_STUB ISpeechTextSelectionInformation_put_ActiveOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_get_ActiveOffset_Proxy( - ISpeechTextSelectionInformation* This, - LONG *ActiveOffset); -void __RPC_STUB ISpeechTextSelectionInformation_get_ActiveOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_put_ActiveLength_Proxy( - ISpeechTextSelectionInformation* This, - LONG ActiveLength); -void __RPC_STUB ISpeechTextSelectionInformation_put_ActiveLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_get_ActiveLength_Proxy( - ISpeechTextSelectionInformation* This, - LONG *ActiveLength); -void __RPC_STUB ISpeechTextSelectionInformation_get_ActiveLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_put_SelectionOffset_Proxy( - ISpeechTextSelectionInformation* This, - LONG SelectionOffset); -void __RPC_STUB ISpeechTextSelectionInformation_put_SelectionOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_get_SelectionOffset_Proxy( - ISpeechTextSelectionInformation* This, - LONG *SelectionOffset); -void __RPC_STUB ISpeechTextSelectionInformation_get_SelectionOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_put_SelectionLength_Proxy( - ISpeechTextSelectionInformation* This, - LONG SelectionLength); -void __RPC_STUB ISpeechTextSelectionInformation_put_SelectionLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_get_SelectionLength_Proxy( - ISpeechTextSelectionInformation* This, - LONG *SelectionLength); -void __RPC_STUB ISpeechTextSelectionInformation_get_SelectionLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechTextSelectionInformation_INTERFACE_DEFINED__ */ @@ -19035,29 +15803,29 @@ typedef struct ISpeechRecoResultVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechRecoResult* This); + ISpeechRecoResult *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechRecoResult* This); + ISpeechRecoResult *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -19065,7 +15833,7 @@ typedef struct ISpeechRecoResultVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -19077,55 +15845,56 @@ typedef struct ISpeechRecoResultVtbl { /*** ISpeechRecoResult methods ***/ HRESULT (STDMETHODCALLTYPE *get_RecoContext)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, ISpeechRecoContext **RecoContext); HRESULT (STDMETHODCALLTYPE *get_Times)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, ISpeechRecoResultTimes **Times); HRESULT (STDMETHODCALLTYPE *putref_AudioFormat)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, ISpeechAudioFormat *Format); HRESULT (STDMETHODCALLTYPE *get_AudioFormat)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, ISpeechAudioFormat **Format); HRESULT (STDMETHODCALLTYPE *get_PhraseInfo)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, ISpeechPhraseInfo **PhraseInfo); HRESULT (STDMETHODCALLTYPE *Alternates)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, LONG RequestCount, LONG StartElement, LONG Elements, ISpeechPhraseAlternates **Alternates); HRESULT (STDMETHODCALLTYPE *Audio)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, LONG StartElement, LONG Elements, ISpeechMemoryStream **Stream); HRESULT (STDMETHODCALLTYPE *SpeakAudio)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, LONG StartElement, LONG Elements, SpeechVoiceSpeakFlags Flags, LONG *StreamNumber); HRESULT (STDMETHODCALLTYPE *SaveToMemory)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, VARIANT *ResultBlock); HRESULT (STDMETHODCALLTYPE *DiscardResultInfo)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, SpeechDiscardType ValueTypes); END_INTERFACE } ISpeechRecoResultVtbl; + interface ISpeechRecoResult { CONST_VTBL ISpeechRecoResultVtbl* lpVtbl; }; @@ -19212,94 +15981,6 @@ static FORCEINLINE HRESULT ISpeechRecoResult_DiscardResultInfo(ISpeechRecoResult #endif -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_get_RecoContext_Proxy( - ISpeechRecoResult* This, - ISpeechRecoContext **RecoContext); -void __RPC_STUB ISpeechRecoResult_get_RecoContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_get_Times_Proxy( - ISpeechRecoResult* This, - ISpeechRecoResultTimes **Times); -void __RPC_STUB ISpeechRecoResult_get_Times_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_putref_AudioFormat_Proxy( - ISpeechRecoResult* This, - ISpeechAudioFormat *Format); -void __RPC_STUB ISpeechRecoResult_putref_AudioFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_get_AudioFormat_Proxy( - ISpeechRecoResult* This, - ISpeechAudioFormat **Format); -void __RPC_STUB ISpeechRecoResult_get_AudioFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_get_PhraseInfo_Proxy( - ISpeechRecoResult* This, - ISpeechPhraseInfo **PhraseInfo); -void __RPC_STUB ISpeechRecoResult_get_PhraseInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_Alternates_Proxy( - ISpeechRecoResult* This, - LONG RequestCount, - LONG StartElement, - LONG Elements, - ISpeechPhraseAlternates **Alternates); -void __RPC_STUB ISpeechRecoResult_Alternates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_Audio_Proxy( - ISpeechRecoResult* This, - LONG StartElement, - LONG Elements, - ISpeechMemoryStream **Stream); -void __RPC_STUB ISpeechRecoResult_Audio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_SpeakAudio_Proxy( - ISpeechRecoResult* This, - LONG StartElement, - LONG Elements, - SpeechVoiceSpeakFlags Flags, - LONG *StreamNumber); -void __RPC_STUB ISpeechRecoResult_SpeakAudio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_SaveToMemory_Proxy( - ISpeechRecoResult* This, - VARIANT *ResultBlock); -void __RPC_STUB ISpeechRecoResult_SaveToMemory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_DiscardResultInfo_Proxy( - ISpeechRecoResult* This, - SpeechDiscardType ValueTypes); -void __RPC_STUB ISpeechRecoResult_DiscardResultInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechRecoResult_INTERFACE_DEFINED__ */ @@ -19328,29 +16009,29 @@ typedef struct ISpeechPhraseInfoBuilderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseInfoBuilder* This, + ISpeechPhraseInfoBuilder *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseInfoBuilder* This); + ISpeechPhraseInfoBuilder *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseInfoBuilder* This); + ISpeechPhraseInfoBuilder *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseInfoBuilder* This, + ISpeechPhraseInfoBuilder *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseInfoBuilder* This, + ISpeechPhraseInfoBuilder *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseInfoBuilder* This, + ISpeechPhraseInfoBuilder *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -19358,7 +16039,7 @@ typedef struct ISpeechPhraseInfoBuilderVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseInfoBuilder* This, + ISpeechPhraseInfoBuilder *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -19370,12 +16051,13 @@ typedef struct ISpeechPhraseInfoBuilderVtbl { /*** ISpeechPhraseInfoBuilder methods ***/ HRESULT (STDMETHODCALLTYPE *RestorePhraseFromMemory)( - ISpeechPhraseInfoBuilder* This, + ISpeechPhraseInfoBuilder *This, VARIANT *PhraseInMemory, ISpeechPhraseInfo **PhraseInfo); END_INTERFACE } ISpeechPhraseInfoBuilderVtbl; + interface ISpeechPhraseInfoBuilder { CONST_VTBL ISpeechPhraseInfoBuilderVtbl* lpVtbl; }; @@ -19426,15 +16108,6 @@ static FORCEINLINE HRESULT ISpeechPhraseInfoBuilder_RestorePhraseFromMemory(ISpe #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfoBuilder_RestorePhraseFromMemory_Proxy( - ISpeechPhraseInfoBuilder* This, - VARIANT *PhraseInMemory, - ISpeechPhraseInfo **PhraseInfo); -void __RPC_STUB ISpeechPhraseInfoBuilder_RestorePhraseFromMemory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseInfoBuilder_INTERFACE_DEFINED__ */ @@ -19471,29 +16144,29 @@ typedef struct ISpeechRecoResultTimesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechRecoResultTimes* This); + ISpeechRecoResultTimes *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechRecoResultTimes* This); + ISpeechRecoResultTimes *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -19501,7 +16174,7 @@ typedef struct ISpeechRecoResultTimesVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -19513,23 +16186,24 @@ typedef struct ISpeechRecoResultTimesVtbl { /*** ISpeechRecoResultTimes methods ***/ HRESULT (STDMETHODCALLTYPE *get_StreamTime)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, VARIANT *Time); HRESULT (STDMETHODCALLTYPE *get_Length)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, VARIANT *Length); HRESULT (STDMETHODCALLTYPE *get_TickCount)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, LONG *TickCount); HRESULT (STDMETHODCALLTYPE *get_OffsetFromStart)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, VARIANT *OffsetFromStart); END_INTERFACE } ISpeechRecoResultTimesVtbl; + interface ISpeechRecoResultTimes { CONST_VTBL ISpeechRecoResultTimesVtbl* lpVtbl; }; @@ -19592,38 +16266,6 @@ static FORCEINLINE HRESULT ISpeechRecoResultTimes_get_OffsetFromStart(ISpeechRec #endif -HRESULT STDMETHODCALLTYPE ISpeechRecoResultTimes_get_StreamTime_Proxy( - ISpeechRecoResultTimes* This, - VARIANT *Time); -void __RPC_STUB ISpeechRecoResultTimes_get_StreamTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultTimes_get_Length_Proxy( - ISpeechRecoResultTimes* This, - VARIANT *Length); -void __RPC_STUB ISpeechRecoResultTimes_get_Length_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultTimes_get_TickCount_Proxy( - ISpeechRecoResultTimes* This, - LONG *TickCount); -void __RPC_STUB ISpeechRecoResultTimes_get_TickCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultTimes_get_OffsetFromStart_Proxy( - ISpeechRecoResultTimes* This, - VARIANT *OffsetFromStart); -void __RPC_STUB ISpeechRecoResultTimes_get_OffsetFromStart_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechRecoResultTimes_INTERFACE_DEFINED__ */ @@ -19663,29 +16305,29 @@ typedef struct ISpeechPhraseAlternateVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseAlternate* This); + ISpeechPhraseAlternate *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseAlternate* This); + ISpeechPhraseAlternate *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -19693,7 +16335,7 @@ typedef struct ISpeechPhraseAlternateVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -19705,26 +16347,27 @@ typedef struct ISpeechPhraseAlternateVtbl { /*** ISpeechPhraseAlternate methods ***/ HRESULT (STDMETHODCALLTYPE *get_RecoResult)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, ISpeechRecoResult **RecoResult); HRESULT (STDMETHODCALLTYPE *get_StartElementInResult)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, LONG *StartElement); HRESULT (STDMETHODCALLTYPE *get_NumberOfElementsInResult)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, LONG *NumberOfElements); HRESULT (STDMETHODCALLTYPE *get_PhraseInfo)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, ISpeechPhraseInfo **PhraseInfo); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpeechPhraseAlternate* This); + ISpeechPhraseAlternate *This); END_INTERFACE } ISpeechPhraseAlternateVtbl; + interface ISpeechPhraseAlternate { CONST_VTBL ISpeechPhraseAlternateVtbl* lpVtbl; }; @@ -19791,45 +16434,6 @@ static FORCEINLINE HRESULT ISpeechPhraseAlternate_Commit(ISpeechPhraseAlternate* #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_get_RecoResult_Proxy( - ISpeechPhraseAlternate* This, - ISpeechRecoResult **RecoResult); -void __RPC_STUB ISpeechPhraseAlternate_get_RecoResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_get_StartElementInResult_Proxy( - ISpeechPhraseAlternate* This, - LONG *StartElement); -void __RPC_STUB ISpeechPhraseAlternate_get_StartElementInResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_get_NumberOfElementsInResult_Proxy( - ISpeechPhraseAlternate* This, - LONG *NumberOfElements); -void __RPC_STUB ISpeechPhraseAlternate_get_NumberOfElementsInResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_get_PhraseInfo_Proxy( - ISpeechPhraseAlternate* This, - ISpeechPhraseInfo **PhraseInfo); -void __RPC_STUB ISpeechPhraseAlternate_get_PhraseInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_Commit_Proxy( - ISpeechPhraseAlternate* This); -void __RPC_STUB ISpeechPhraseAlternate_Commit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseAlternate_INTERFACE_DEFINED__ */ @@ -19864,29 +16468,29 @@ typedef struct ISpeechPhraseAlternatesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseAlternates* This, + ISpeechPhraseAlternates *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseAlternates* This); + ISpeechPhraseAlternates *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseAlternates* This); + ISpeechPhraseAlternates *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseAlternates* This, + ISpeechPhraseAlternates *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseAlternates* This, + ISpeechPhraseAlternates *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseAlternates* This, + ISpeechPhraseAlternates *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -19894,7 +16498,7 @@ typedef struct ISpeechPhraseAlternatesVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseAlternates* This, + ISpeechPhraseAlternates *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -19906,20 +16510,21 @@ typedef struct ISpeechPhraseAlternatesVtbl { /*** ISpeechPhraseAlternates methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechPhraseAlternates* This, + ISpeechPhraseAlternates *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechPhraseAlternates* This, + ISpeechPhraseAlternates *This, LONG Index, ISpeechPhraseAlternate **PhraseAlternate); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechPhraseAlternates* This, + ISpeechPhraseAlternates *This, IUnknown **EnumVARIANT); END_INTERFACE } ISpeechPhraseAlternatesVtbl; + interface ISpeechPhraseAlternates { CONST_VTBL ISpeechPhraseAlternatesVtbl* lpVtbl; }; @@ -19978,31 +16583,6 @@ static FORCEINLINE HRESULT ISpeechPhraseAlternates_get__NewEnum(ISpeechPhraseAlt #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternates_get_Count_Proxy( - ISpeechPhraseAlternates* This, - LONG *Count); -void __RPC_STUB ISpeechPhraseAlternates_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternates_Item_Proxy( - ISpeechPhraseAlternates* This, - LONG Index, - ISpeechPhraseAlternate **PhraseAlternate); -void __RPC_STUB ISpeechPhraseAlternates_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternates_get__NewEnum_Proxy( - ISpeechPhraseAlternates* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechPhraseAlternates_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseAlternates_INTERFACE_DEFINED__ */ @@ -20081,29 +16661,29 @@ typedef struct ISpeechPhraseInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseInfo* This); + ISpeechPhraseInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseInfo* This); + ISpeechPhraseInfo *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -20111,7 +16691,7 @@ typedef struct ISpeechPhraseInfoVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -20123,70 +16703,70 @@ typedef struct ISpeechPhraseInfoVtbl { /*** ISpeechPhraseInfo methods ***/ HRESULT (STDMETHODCALLTYPE *get_LanguageId)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, LONG *LanguageId); HRESULT (STDMETHODCALLTYPE *get_GrammarId)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, VARIANT *GrammarId); HRESULT (STDMETHODCALLTYPE *get_StartTime)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, VARIANT *StartTime); HRESULT (STDMETHODCALLTYPE *get_AudioStreamPosition)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, VARIANT *AudioStreamPosition); HRESULT (STDMETHODCALLTYPE *get_AudioSizeBytes)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, LONG *pAudioSizeBytes); HRESULT (STDMETHODCALLTYPE *get_RetainedSizeBytes)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, LONG *RetainedSizeBytes); HRESULT (STDMETHODCALLTYPE *get_AudioSizeTime)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, LONG *AudioSizeTime); HRESULT (STDMETHODCALLTYPE *get_Rule)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, ISpeechPhraseRule **Rule); HRESULT (STDMETHODCALLTYPE *get_Properties)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, ISpeechPhraseProperties **Properties); HRESULT (STDMETHODCALLTYPE *get_Elements)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, ISpeechPhraseElements **Elements); HRESULT (STDMETHODCALLTYPE *get_Replacements)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, ISpeechPhraseReplacements **Replacements); HRESULT (STDMETHODCALLTYPE *get_EngineId)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, BSTR *EngineIdGuid); HRESULT (STDMETHODCALLTYPE *get_EnginePrivateData)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, VARIANT *PrivateData); HRESULT (STDMETHODCALLTYPE *SaveToMemory)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, VARIANT *PhraseBlock); HRESULT (STDMETHODCALLTYPE *GetText)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, LONG StartElement, LONG Elements, VARIANT_BOOL UseReplacements, BSTR *Text); HRESULT (STDMETHODCALLTYPE *GetDisplayAttributes)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, LONG StartElement, LONG Elements, VARIANT_BOOL UseReplacements, @@ -20194,6 +16774,7 @@ typedef struct ISpeechPhraseInfoVtbl { END_INTERFACE } ISpeechPhraseInfoVtbl; + interface ISpeechPhraseInfo { CONST_VTBL ISpeechPhraseInfoVtbl* lpVtbl; }; @@ -20304,140 +16885,6 @@ static FORCEINLINE HRESULT ISpeechPhraseInfo_GetDisplayAttributes(ISpeechPhraseI #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_LanguageId_Proxy( - ISpeechPhraseInfo* This, - LONG *LanguageId); -void __RPC_STUB ISpeechPhraseInfo_get_LanguageId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_GrammarId_Proxy( - ISpeechPhraseInfo* This, - VARIANT *GrammarId); -void __RPC_STUB ISpeechPhraseInfo_get_GrammarId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_StartTime_Proxy( - ISpeechPhraseInfo* This, - VARIANT *StartTime); -void __RPC_STUB ISpeechPhraseInfo_get_StartTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_AudioStreamPosition_Proxy( - ISpeechPhraseInfo* This, - VARIANT *AudioStreamPosition); -void __RPC_STUB ISpeechPhraseInfo_get_AudioStreamPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_AudioSizeBytes_Proxy( - ISpeechPhraseInfo* This, - LONG *pAudioSizeBytes); -void __RPC_STUB ISpeechPhraseInfo_get_AudioSizeBytes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_RetainedSizeBytes_Proxy( - ISpeechPhraseInfo* This, - LONG *RetainedSizeBytes); -void __RPC_STUB ISpeechPhraseInfo_get_RetainedSizeBytes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_AudioSizeTime_Proxy( - ISpeechPhraseInfo* This, - LONG *AudioSizeTime); -void __RPC_STUB ISpeechPhraseInfo_get_AudioSizeTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_Rule_Proxy( - ISpeechPhraseInfo* This, - ISpeechPhraseRule **Rule); -void __RPC_STUB ISpeechPhraseInfo_get_Rule_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_Properties_Proxy( - ISpeechPhraseInfo* This, - ISpeechPhraseProperties **Properties); -void __RPC_STUB ISpeechPhraseInfo_get_Properties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_Elements_Proxy( - ISpeechPhraseInfo* This, - ISpeechPhraseElements **Elements); -void __RPC_STUB ISpeechPhraseInfo_get_Elements_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_Replacements_Proxy( - ISpeechPhraseInfo* This, - ISpeechPhraseReplacements **Replacements); -void __RPC_STUB ISpeechPhraseInfo_get_Replacements_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_EngineId_Proxy( - ISpeechPhraseInfo* This, - BSTR *EngineIdGuid); -void __RPC_STUB ISpeechPhraseInfo_get_EngineId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_EnginePrivateData_Proxy( - ISpeechPhraseInfo* This, - VARIANT *PrivateData); -void __RPC_STUB ISpeechPhraseInfo_get_EnginePrivateData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_SaveToMemory_Proxy( - ISpeechPhraseInfo* This, - VARIANT *PhraseBlock); -void __RPC_STUB ISpeechPhraseInfo_SaveToMemory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_GetText_Proxy( - ISpeechPhraseInfo* This, - LONG StartElement, - LONG Elements, - VARIANT_BOOL UseReplacements, - BSTR *Text); -void __RPC_STUB ISpeechPhraseInfo_GetText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_GetDisplayAttributes_Proxy( - ISpeechPhraseInfo* This, - LONG StartElement, - LONG Elements, - VARIANT_BOOL UseReplacements, - SpeechDisplayAttributes *DisplayAttributes); -void __RPC_STUB ISpeechPhraseInfo_GetDisplayAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseInfo_INTERFACE_DEFINED__ */ @@ -20501,29 +16948,29 @@ typedef struct ISpeechPhraseElementVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseElement* This); + ISpeechPhraseElement *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseElement* This); + ISpeechPhraseElement *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -20531,7 +16978,7 @@ typedef struct ISpeechPhraseElementVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -20543,59 +16990,60 @@ typedef struct ISpeechPhraseElementVtbl { /*** ISpeechPhraseElement methods ***/ HRESULT (STDMETHODCALLTYPE *get_AudioTimeOffset)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, LONG *AudioTimeOffset); HRESULT (STDMETHODCALLTYPE *get_AudioSizeTime)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, LONG *AudioSizeTime); HRESULT (STDMETHODCALLTYPE *get_AudioStreamOffset)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, LONG *AudioStreamOffset); HRESULT (STDMETHODCALLTYPE *get_AudioSizeBytes)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, LONG *AudioSizeBytes); HRESULT (STDMETHODCALLTYPE *get_RetainedStreamOffset)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, LONG *RetainedStreamOffset); HRESULT (STDMETHODCALLTYPE *get_RetainedSizeBytes)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, LONG *RetainedSizeBytes); HRESULT (STDMETHODCALLTYPE *get_DisplayText)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, BSTR *DisplayText); HRESULT (STDMETHODCALLTYPE *get_LexicalForm)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, BSTR *LexicalForm); HRESULT (STDMETHODCALLTYPE *get_Pronunciation)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, VARIANT *Pronunciation); HRESULT (STDMETHODCALLTYPE *get_DisplayAttributes)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, SpeechDisplayAttributes *DisplayAttributes); HRESULT (STDMETHODCALLTYPE *get_RequiredConfidence)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, SpeechEngineConfidence *RequiredConfidence); HRESULT (STDMETHODCALLTYPE *get_ActualConfidence)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, SpeechEngineConfidence *ActualConfidence); HRESULT (STDMETHODCALLTYPE *get_EngineConfidence)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, float *EngineConfidence); END_INTERFACE } ISpeechPhraseElementVtbl; + interface ISpeechPhraseElement { CONST_VTBL ISpeechPhraseElementVtbl* lpVtbl; }; @@ -20694,110 +17142,6 @@ static FORCEINLINE HRESULT ISpeechPhraseElement_get_EngineConfidence(ISpeechPhra #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_AudioTimeOffset_Proxy( - ISpeechPhraseElement* This, - LONG *AudioTimeOffset); -void __RPC_STUB ISpeechPhraseElement_get_AudioTimeOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_AudioSizeTime_Proxy( - ISpeechPhraseElement* This, - LONG *AudioSizeTime); -void __RPC_STUB ISpeechPhraseElement_get_AudioSizeTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_AudioStreamOffset_Proxy( - ISpeechPhraseElement* This, - LONG *AudioStreamOffset); -void __RPC_STUB ISpeechPhraseElement_get_AudioStreamOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_AudioSizeBytes_Proxy( - ISpeechPhraseElement* This, - LONG *AudioSizeBytes); -void __RPC_STUB ISpeechPhraseElement_get_AudioSizeBytes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_RetainedStreamOffset_Proxy( - ISpeechPhraseElement* This, - LONG *RetainedStreamOffset); -void __RPC_STUB ISpeechPhraseElement_get_RetainedStreamOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_RetainedSizeBytes_Proxy( - ISpeechPhraseElement* This, - LONG *RetainedSizeBytes); -void __RPC_STUB ISpeechPhraseElement_get_RetainedSizeBytes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_DisplayText_Proxy( - ISpeechPhraseElement* This, - BSTR *DisplayText); -void __RPC_STUB ISpeechPhraseElement_get_DisplayText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_LexicalForm_Proxy( - ISpeechPhraseElement* This, - BSTR *LexicalForm); -void __RPC_STUB ISpeechPhraseElement_get_LexicalForm_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_Pronunciation_Proxy( - ISpeechPhraseElement* This, - VARIANT *Pronunciation); -void __RPC_STUB ISpeechPhraseElement_get_Pronunciation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_DisplayAttributes_Proxy( - ISpeechPhraseElement* This, - SpeechDisplayAttributes *DisplayAttributes); -void __RPC_STUB ISpeechPhraseElement_get_DisplayAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_RequiredConfidence_Proxy( - ISpeechPhraseElement* This, - SpeechEngineConfidence *RequiredConfidence); -void __RPC_STUB ISpeechPhraseElement_get_RequiredConfidence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_ActualConfidence_Proxy( - ISpeechPhraseElement* This, - SpeechEngineConfidence *ActualConfidence); -void __RPC_STUB ISpeechPhraseElement_get_ActualConfidence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_EngineConfidence_Proxy( - ISpeechPhraseElement* This, - float *EngineConfidence); -void __RPC_STUB ISpeechPhraseElement_get_EngineConfidence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseElement_INTERFACE_DEFINED__ */ @@ -20832,29 +17176,29 @@ typedef struct ISpeechPhraseElementsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseElements* This, + ISpeechPhraseElements *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseElements* This); + ISpeechPhraseElements *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseElements* This); + ISpeechPhraseElements *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseElements* This, + ISpeechPhraseElements *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseElements* This, + ISpeechPhraseElements *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseElements* This, + ISpeechPhraseElements *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -20862,7 +17206,7 @@ typedef struct ISpeechPhraseElementsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseElements* This, + ISpeechPhraseElements *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -20874,20 +17218,21 @@ typedef struct ISpeechPhraseElementsVtbl { /*** ISpeechPhraseElements methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechPhraseElements* This, + ISpeechPhraseElements *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechPhraseElements* This, + ISpeechPhraseElements *This, LONG Index, ISpeechPhraseElement **Element); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechPhraseElements* This, + ISpeechPhraseElements *This, IUnknown **EnumVARIANT); END_INTERFACE } ISpeechPhraseElementsVtbl; + interface ISpeechPhraseElements { CONST_VTBL ISpeechPhraseElementsVtbl* lpVtbl; }; @@ -20946,31 +17291,6 @@ static FORCEINLINE HRESULT ISpeechPhraseElements_get__NewEnum(ISpeechPhraseEleme #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseElements_get_Count_Proxy( - ISpeechPhraseElements* This, - LONG *Count); -void __RPC_STUB ISpeechPhraseElements_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElements_Item_Proxy( - ISpeechPhraseElements* This, - LONG Index, - ISpeechPhraseElement **Element); -void __RPC_STUB ISpeechPhraseElements_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElements_get__NewEnum_Proxy( - ISpeechPhraseElements* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechPhraseElements_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseElements_INTERFACE_DEFINED__ */ @@ -21007,29 +17327,29 @@ typedef struct ISpeechPhraseReplacementVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseReplacement* This); + ISpeechPhraseReplacement *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseReplacement* This); + ISpeechPhraseReplacement *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -21037,7 +17357,7 @@ typedef struct ISpeechPhraseReplacementVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -21049,23 +17369,24 @@ typedef struct ISpeechPhraseReplacementVtbl { /*** ISpeechPhraseReplacement methods ***/ HRESULT (STDMETHODCALLTYPE *get_DisplayAttributes)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, SpeechDisplayAttributes *DisplayAttributes); HRESULT (STDMETHODCALLTYPE *get_Text)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, BSTR *Text); HRESULT (STDMETHODCALLTYPE *get_FirstElement)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, LONG *FirstElement); HRESULT (STDMETHODCALLTYPE *get_NumberOfElements)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, LONG *NumberOfElements); END_INTERFACE } ISpeechPhraseReplacementVtbl; + interface ISpeechPhraseReplacement { CONST_VTBL ISpeechPhraseReplacementVtbl* lpVtbl; }; @@ -21128,38 +17449,6 @@ static FORCEINLINE HRESULT ISpeechPhraseReplacement_get_NumberOfElements(ISpeech #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacement_get_DisplayAttributes_Proxy( - ISpeechPhraseReplacement* This, - SpeechDisplayAttributes *DisplayAttributes); -void __RPC_STUB ISpeechPhraseReplacement_get_DisplayAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacement_get_Text_Proxy( - ISpeechPhraseReplacement* This, - BSTR *Text); -void __RPC_STUB ISpeechPhraseReplacement_get_Text_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacement_get_FirstElement_Proxy( - ISpeechPhraseReplacement* This, - LONG *FirstElement); -void __RPC_STUB ISpeechPhraseReplacement_get_FirstElement_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacement_get_NumberOfElements_Proxy( - ISpeechPhraseReplacement* This, - LONG *NumberOfElements); -void __RPC_STUB ISpeechPhraseReplacement_get_NumberOfElements_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseReplacement_INTERFACE_DEFINED__ */ @@ -21194,29 +17483,29 @@ typedef struct ISpeechPhraseReplacementsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseReplacements* This, + ISpeechPhraseReplacements *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseReplacements* This); + ISpeechPhraseReplacements *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseReplacements* This); + ISpeechPhraseReplacements *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseReplacements* This, + ISpeechPhraseReplacements *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseReplacements* This, + ISpeechPhraseReplacements *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseReplacements* This, + ISpeechPhraseReplacements *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -21224,7 +17513,7 @@ typedef struct ISpeechPhraseReplacementsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseReplacements* This, + ISpeechPhraseReplacements *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -21236,20 +17525,21 @@ typedef struct ISpeechPhraseReplacementsVtbl { /*** ISpeechPhraseReplacements methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechPhraseReplacements* This, + ISpeechPhraseReplacements *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechPhraseReplacements* This, + ISpeechPhraseReplacements *This, LONG Index, ISpeechPhraseReplacement **Reps); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechPhraseReplacements* This, + ISpeechPhraseReplacements *This, IUnknown **EnumVARIANT); END_INTERFACE } ISpeechPhraseReplacementsVtbl; + interface ISpeechPhraseReplacements { CONST_VTBL ISpeechPhraseReplacementsVtbl* lpVtbl; }; @@ -21308,31 +17598,6 @@ static FORCEINLINE HRESULT ISpeechPhraseReplacements_get__NewEnum(ISpeechPhraseR #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacements_get_Count_Proxy( - ISpeechPhraseReplacements* This, - LONG *Count); -void __RPC_STUB ISpeechPhraseReplacements_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacements_Item_Proxy( - ISpeechPhraseReplacements* This, - LONG Index, - ISpeechPhraseReplacement **Reps); -void __RPC_STUB ISpeechPhraseReplacements_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacements_get__NewEnum_Proxy( - ISpeechPhraseReplacements* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechPhraseReplacements_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseReplacements_INTERFACE_DEFINED__ */ @@ -21384,29 +17649,29 @@ typedef struct ISpeechPhrasePropertyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseProperty* This); + ISpeechPhraseProperty *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseProperty* This); + ISpeechPhraseProperty *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -21414,7 +17679,7 @@ typedef struct ISpeechPhrasePropertyVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -21426,43 +17691,44 @@ typedef struct ISpeechPhrasePropertyVtbl { /*** ISpeechPhraseProperty methods ***/ HRESULT (STDMETHODCALLTYPE *get_Name)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, BSTR *Name); HRESULT (STDMETHODCALLTYPE *get_Id)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, LONG *Id); HRESULT (STDMETHODCALLTYPE *get_Value)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, VARIANT *Value); HRESULT (STDMETHODCALLTYPE *get_FirstElement)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, LONG *FirstElement); HRESULT (STDMETHODCALLTYPE *get_NumberOfElements)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, LONG *NumberOfElements); HRESULT (STDMETHODCALLTYPE *get_EngineConfidence)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, float *Confidence); HRESULT (STDMETHODCALLTYPE *get_Confidence)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, SpeechEngineConfidence *Confidence); HRESULT (STDMETHODCALLTYPE *get_Parent)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, ISpeechPhraseProperty **ParentProperty); HRESULT (STDMETHODCALLTYPE *get_Children)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, ISpeechPhraseProperties **Children); END_INTERFACE } ISpeechPhrasePropertyVtbl; + interface ISpeechPhraseProperty { CONST_VTBL ISpeechPhrasePropertyVtbl* lpVtbl; }; @@ -21545,78 +17811,6 @@ static FORCEINLINE HRESULT ISpeechPhraseProperty_get_Children(ISpeechPhrasePrope #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Name_Proxy( - ISpeechPhraseProperty* This, - BSTR *Name); -void __RPC_STUB ISpeechPhraseProperty_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Id_Proxy( - ISpeechPhraseProperty* This, - LONG *Id); -void __RPC_STUB ISpeechPhraseProperty_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Value_Proxy( - ISpeechPhraseProperty* This, - VARIANT *Value); -void __RPC_STUB ISpeechPhraseProperty_get_Value_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_FirstElement_Proxy( - ISpeechPhraseProperty* This, - LONG *FirstElement); -void __RPC_STUB ISpeechPhraseProperty_get_FirstElement_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_NumberOfElements_Proxy( - ISpeechPhraseProperty* This, - LONG *NumberOfElements); -void __RPC_STUB ISpeechPhraseProperty_get_NumberOfElements_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_EngineConfidence_Proxy( - ISpeechPhraseProperty* This, - float *Confidence); -void __RPC_STUB ISpeechPhraseProperty_get_EngineConfidence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Confidence_Proxy( - ISpeechPhraseProperty* This, - SpeechEngineConfidence *Confidence); -void __RPC_STUB ISpeechPhraseProperty_get_Confidence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Parent_Proxy( - ISpeechPhraseProperty* This, - ISpeechPhraseProperty **ParentProperty); -void __RPC_STUB ISpeechPhraseProperty_get_Parent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Children_Proxy( - ISpeechPhraseProperty* This, - ISpeechPhraseProperties **Children); -void __RPC_STUB ISpeechPhraseProperty_get_Children_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseProperty_INTERFACE_DEFINED__ */ @@ -21651,29 +17845,29 @@ typedef struct ISpeechPhrasePropertiesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseProperties* This, + ISpeechPhraseProperties *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseProperties* This); + ISpeechPhraseProperties *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseProperties* This); + ISpeechPhraseProperties *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseProperties* This, + ISpeechPhraseProperties *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseProperties* This, + ISpeechPhraseProperties *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseProperties* This, + ISpeechPhraseProperties *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -21681,7 +17875,7 @@ typedef struct ISpeechPhrasePropertiesVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseProperties* This, + ISpeechPhraseProperties *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -21693,20 +17887,21 @@ typedef struct ISpeechPhrasePropertiesVtbl { /*** ISpeechPhraseProperties methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechPhraseProperties* This, + ISpeechPhraseProperties *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechPhraseProperties* This, + ISpeechPhraseProperties *This, LONG Index, ISpeechPhraseProperty **Property); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechPhraseProperties* This, + ISpeechPhraseProperties *This, IUnknown **EnumVARIANT); END_INTERFACE } ISpeechPhrasePropertiesVtbl; + interface ISpeechPhraseProperties { CONST_VTBL ISpeechPhrasePropertiesVtbl* lpVtbl; }; @@ -21765,31 +17960,6 @@ static FORCEINLINE HRESULT ISpeechPhraseProperties_get__NewEnum(ISpeechPhrasePro #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperties_get_Count_Proxy( - ISpeechPhraseProperties* This, - LONG *Count); -void __RPC_STUB ISpeechPhraseProperties_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperties_Item_Proxy( - ISpeechPhraseProperties* This, - LONG Index, - ISpeechPhraseProperty **Property); -void __RPC_STUB ISpeechPhraseProperties_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperties_get__NewEnum_Proxy( - ISpeechPhraseProperties* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechPhraseProperties_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseProperties_INTERFACE_DEFINED__ */ @@ -21838,29 +18008,29 @@ typedef struct ISpeechPhraseRuleVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseRule* This); + ISpeechPhraseRule *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseRule* This); + ISpeechPhraseRule *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -21868,7 +18038,7 @@ typedef struct ISpeechPhraseRuleVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -21880,39 +18050,40 @@ typedef struct ISpeechPhraseRuleVtbl { /*** ISpeechPhraseRule methods ***/ HRESULT (STDMETHODCALLTYPE *get_Name)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, BSTR *Name); HRESULT (STDMETHODCALLTYPE *get_Id)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, LONG *Id); HRESULT (STDMETHODCALLTYPE *get_FirstElement)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, LONG *FirstElement); HRESULT (STDMETHODCALLTYPE *get_NumberOfElements)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, LONG *NumberOfElements); HRESULT (STDMETHODCALLTYPE *get_Parent)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, ISpeechPhraseRule **Parent); HRESULT (STDMETHODCALLTYPE *get_Children)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, ISpeechPhraseRules **Children); HRESULT (STDMETHODCALLTYPE *get_Confidence)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, SpeechEngineConfidence *ActualConfidence); HRESULT (STDMETHODCALLTYPE *get_EngineConfidence)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, float *EngineConfidence); END_INTERFACE } ISpeechPhraseRuleVtbl; + interface ISpeechPhraseRule { CONST_VTBL ISpeechPhraseRuleVtbl* lpVtbl; }; @@ -21991,70 +18162,6 @@ static FORCEINLINE HRESULT ISpeechPhraseRule_get_EngineConfidence(ISpeechPhraseR #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Name_Proxy( - ISpeechPhraseRule* This, - BSTR *Name); -void __RPC_STUB ISpeechPhraseRule_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Id_Proxy( - ISpeechPhraseRule* This, - LONG *Id); -void __RPC_STUB ISpeechPhraseRule_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_FirstElement_Proxy( - ISpeechPhraseRule* This, - LONG *FirstElement); -void __RPC_STUB ISpeechPhraseRule_get_FirstElement_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_NumberOfElements_Proxy( - ISpeechPhraseRule* This, - LONG *NumberOfElements); -void __RPC_STUB ISpeechPhraseRule_get_NumberOfElements_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Parent_Proxy( - ISpeechPhraseRule* This, - ISpeechPhraseRule **Parent); -void __RPC_STUB ISpeechPhraseRule_get_Parent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Children_Proxy( - ISpeechPhraseRule* This, - ISpeechPhraseRules **Children); -void __RPC_STUB ISpeechPhraseRule_get_Children_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Confidence_Proxy( - ISpeechPhraseRule* This, - SpeechEngineConfidence *ActualConfidence); -void __RPC_STUB ISpeechPhraseRule_get_Confidence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_EngineConfidence_Proxy( - ISpeechPhraseRule* This, - float *EngineConfidence); -void __RPC_STUB ISpeechPhraseRule_get_EngineConfidence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseRule_INTERFACE_DEFINED__ */ @@ -22089,29 +18196,29 @@ typedef struct ISpeechPhraseRulesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseRules* This, + ISpeechPhraseRules *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseRules* This); + ISpeechPhraseRules *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseRules* This); + ISpeechPhraseRules *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseRules* This, + ISpeechPhraseRules *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseRules* This, + ISpeechPhraseRules *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseRules* This, + ISpeechPhraseRules *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -22119,7 +18226,7 @@ typedef struct ISpeechPhraseRulesVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseRules* This, + ISpeechPhraseRules *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -22131,20 +18238,21 @@ typedef struct ISpeechPhraseRulesVtbl { /*** ISpeechPhraseRules methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechPhraseRules* This, + ISpeechPhraseRules *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechPhraseRules* This, + ISpeechPhraseRules *This, LONG Index, ISpeechPhraseRule **Rule); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechPhraseRules* This, + ISpeechPhraseRules *This, IUnknown **EnumVARIANT); END_INTERFACE } ISpeechPhraseRulesVtbl; + interface ISpeechPhraseRules { CONST_VTBL ISpeechPhraseRulesVtbl* lpVtbl; }; @@ -22203,31 +18311,6 @@ static FORCEINLINE HRESULT ISpeechPhraseRules_get__NewEnum(ISpeechPhraseRules* T #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseRules_get_Count_Proxy( - ISpeechPhraseRules* This, - LONG *Count); -void __RPC_STUB ISpeechPhraseRules_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRules_Item_Proxy( - ISpeechPhraseRules* This, - LONG Index, - ISpeechPhraseRule **Rule); -void __RPC_STUB ISpeechPhraseRules_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRules_get__NewEnum_Proxy( - ISpeechPhraseRules* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechPhraseRules_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseRules_INTERFACE_DEFINED__ */ @@ -22262,29 +18345,29 @@ typedef struct ISpeechLexiconWordsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechLexiconWords* This, + ISpeechLexiconWords *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechLexiconWords* This); + ISpeechLexiconWords *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechLexiconWords* This); + ISpeechLexiconWords *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechLexiconWords* This, + ISpeechLexiconWords *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechLexiconWords* This, + ISpeechLexiconWords *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechLexiconWords* This, + ISpeechLexiconWords *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -22292,7 +18375,7 @@ typedef struct ISpeechLexiconWordsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechLexiconWords* This, + ISpeechLexiconWords *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -22304,20 +18387,21 @@ typedef struct ISpeechLexiconWordsVtbl { /*** ISpeechLexiconWords methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechLexiconWords* This, + ISpeechLexiconWords *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechLexiconWords* This, + ISpeechLexiconWords *This, LONG Index, ISpeechLexiconWord **Word); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechLexiconWords* This, + ISpeechLexiconWords *This, IUnknown **EnumVARIANT); END_INTERFACE } ISpeechLexiconWordsVtbl; + interface ISpeechLexiconWords { CONST_VTBL ISpeechLexiconWordsVtbl* lpVtbl; }; @@ -22376,31 +18460,6 @@ static FORCEINLINE HRESULT ISpeechLexiconWords_get__NewEnum(ISpeechLexiconWords* #endif -HRESULT STDMETHODCALLTYPE ISpeechLexiconWords_get_Count_Proxy( - ISpeechLexiconWords* This, - LONG *Count); -void __RPC_STUB ISpeechLexiconWords_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconWords_Item_Proxy( - ISpeechLexiconWords* This, - LONG Index, - ISpeechLexiconWord **Word); -void __RPC_STUB ISpeechLexiconWords_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconWords_get__NewEnum_Proxy( - ISpeechLexiconWords* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechLexiconWords_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechLexiconWords_INTERFACE_DEFINED__ */ @@ -22467,29 +18526,29 @@ typedef struct ISpeechLexiconVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechLexicon* This, + ISpeechLexicon *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechLexicon* This); + ISpeechLexicon *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechLexicon* This); + ISpeechLexicon *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechLexicon* This, + ISpeechLexicon *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechLexicon* This, + ISpeechLexicon *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechLexicon* This, + ISpeechLexicon *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -22497,7 +18556,7 @@ typedef struct ISpeechLexiconVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechLexicon* This, + ISpeechLexicon *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -22509,57 +18568,58 @@ typedef struct ISpeechLexiconVtbl { /*** ISpeechLexicon methods ***/ HRESULT (STDMETHODCALLTYPE *get_GenerationId)( - ISpeechLexicon* This, + ISpeechLexicon *This, LONG *GenerationId); HRESULT (STDMETHODCALLTYPE *GetWords)( - ISpeechLexicon* This, + ISpeechLexicon *This, SpeechLexiconType Flags, LONG *GenerationID, ISpeechLexiconWords **Words); HRESULT (STDMETHODCALLTYPE *AddPronunciation)( - ISpeechLexicon* This, + ISpeechLexicon *This, BSTR bstrWord, SpeechLanguageId LangId, SpeechPartOfSpeech PartOfSpeech, BSTR bstrPronunciation); HRESULT (STDMETHODCALLTYPE *AddPronunciationByPhoneIds)( - ISpeechLexicon* This, + ISpeechLexicon *This, BSTR bstrWord, SpeechLanguageId LangId, SpeechPartOfSpeech PartOfSpeech, VARIANT *PhoneIds); HRESULT (STDMETHODCALLTYPE *RemovePronunciation)( - ISpeechLexicon* This, + ISpeechLexicon *This, BSTR bstrWord, SpeechLanguageId LangId, SpeechPartOfSpeech PartOfSpeech, BSTR bstrPronunciation); HRESULT (STDMETHODCALLTYPE *RemovePronunciationByPhoneIds)( - ISpeechLexicon* This, + ISpeechLexicon *This, BSTR bstrWord, SpeechLanguageId LangId, SpeechPartOfSpeech PartOfSpeech, VARIANT *PhoneIds); HRESULT (STDMETHODCALLTYPE *GetPronunciations)( - ISpeechLexicon* This, + ISpeechLexicon *This, BSTR bstrWord, SpeechLanguageId LangId, SpeechLexiconType TypeFlags, ISpeechLexiconPronunciations **ppPronunciations); HRESULT (STDMETHODCALLTYPE *GetGenerationChange)( - ISpeechLexicon* This, + ISpeechLexicon *This, LONG *GenerationID, ISpeechLexiconWords **ppWords); END_INTERFACE } ISpeechLexiconVtbl; + interface ISpeechLexicon { CONST_VTBL ISpeechLexiconVtbl* lpVtbl; }; @@ -22638,88 +18698,6 @@ static FORCEINLINE HRESULT ISpeechLexicon_GetGenerationChange(ISpeechLexicon* Th #endif -HRESULT STDMETHODCALLTYPE ISpeechLexicon_get_GenerationId_Proxy( - ISpeechLexicon* This, - LONG *GenerationId); -void __RPC_STUB ISpeechLexicon_get_GenerationId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexicon_GetWords_Proxy( - ISpeechLexicon* This, - SpeechLexiconType Flags, - LONG *GenerationID, - ISpeechLexiconWords **Words); -void __RPC_STUB ISpeechLexicon_GetWords_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexicon_AddPronunciation_Proxy( - ISpeechLexicon* This, - BSTR bstrWord, - SpeechLanguageId LangId, - SpeechPartOfSpeech PartOfSpeech, - BSTR bstrPronunciation); -void __RPC_STUB ISpeechLexicon_AddPronunciation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexicon_AddPronunciationByPhoneIds_Proxy( - ISpeechLexicon* This, - BSTR bstrWord, - SpeechLanguageId LangId, - SpeechPartOfSpeech PartOfSpeech, - VARIANT *PhoneIds); -void __RPC_STUB ISpeechLexicon_AddPronunciationByPhoneIds_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexicon_RemovePronunciation_Proxy( - ISpeechLexicon* This, - BSTR bstrWord, - SpeechLanguageId LangId, - SpeechPartOfSpeech PartOfSpeech, - BSTR bstrPronunciation); -void __RPC_STUB ISpeechLexicon_RemovePronunciation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexicon_RemovePronunciationByPhoneIds_Proxy( - ISpeechLexicon* This, - BSTR bstrWord, - SpeechLanguageId LangId, - SpeechPartOfSpeech PartOfSpeech, - VARIANT *PhoneIds); -void __RPC_STUB ISpeechLexicon_RemovePronunciationByPhoneIds_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexicon_GetPronunciations_Proxy( - ISpeechLexicon* This, - BSTR bstrWord, - SpeechLanguageId LangId, - SpeechLexiconType TypeFlags, - ISpeechLexiconPronunciations **ppPronunciations); -void __RPC_STUB ISpeechLexicon_GetPronunciations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexicon_GetGenerationChange_Proxy( - ISpeechLexicon* This, - LONG *GenerationID, - ISpeechLexiconWords **ppWords); -void __RPC_STUB ISpeechLexicon_GetGenerationChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechLexicon_INTERFACE_DEFINED__ */ @@ -22756,29 +18734,29 @@ typedef struct ISpeechLexiconWordVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechLexiconWord* This); + ISpeechLexiconWord *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechLexiconWord* This); + ISpeechLexiconWord *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -22786,7 +18764,7 @@ typedef struct ISpeechLexiconWordVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -22798,23 +18776,24 @@ typedef struct ISpeechLexiconWordVtbl { /*** ISpeechLexiconWord methods ***/ HRESULT (STDMETHODCALLTYPE *get_LangId)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, SpeechLanguageId *LangId); HRESULT (STDMETHODCALLTYPE *get_Type)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, SpeechWordType *WordType); HRESULT (STDMETHODCALLTYPE *get_Word)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, BSTR *Word); HRESULT (STDMETHODCALLTYPE *get_Pronunciations)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, ISpeechLexiconPronunciations **Pronunciations); END_INTERFACE } ISpeechLexiconWordVtbl; + interface ISpeechLexiconWord { CONST_VTBL ISpeechLexiconWordVtbl* lpVtbl; }; @@ -22877,38 +18856,6 @@ static FORCEINLINE HRESULT ISpeechLexiconWord_get_Pronunciations(ISpeechLexiconW #endif -HRESULT STDMETHODCALLTYPE ISpeechLexiconWord_get_LangId_Proxy( - ISpeechLexiconWord* This, - SpeechLanguageId *LangId); -void __RPC_STUB ISpeechLexiconWord_get_LangId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconWord_get_Type_Proxy( - ISpeechLexiconWord* This, - SpeechWordType *WordType); -void __RPC_STUB ISpeechLexiconWord_get_Type_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconWord_get_Word_Proxy( - ISpeechLexiconWord* This, - BSTR *Word); -void __RPC_STUB ISpeechLexiconWord_get_Word_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconWord_get_Pronunciations_Proxy( - ISpeechLexiconWord* This, - ISpeechLexiconPronunciations **Pronunciations); -void __RPC_STUB ISpeechLexiconWord_get_Pronunciations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechLexiconWord_INTERFACE_DEFINED__ */ @@ -22943,29 +18890,29 @@ typedef struct ISpeechLexiconPronunciationsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechLexiconPronunciations* This, + ISpeechLexiconPronunciations *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechLexiconPronunciations* This); + ISpeechLexiconPronunciations *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechLexiconPronunciations* This); + ISpeechLexiconPronunciations *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechLexiconPronunciations* This, + ISpeechLexiconPronunciations *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechLexiconPronunciations* This, + ISpeechLexiconPronunciations *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechLexiconPronunciations* This, + ISpeechLexiconPronunciations *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -22973,7 +18920,7 @@ typedef struct ISpeechLexiconPronunciationsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechLexiconPronunciations* This, + ISpeechLexiconPronunciations *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -22985,20 +18932,21 @@ typedef struct ISpeechLexiconPronunciationsVtbl { /*** ISpeechLexiconPronunciations methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechLexiconPronunciations* This, + ISpeechLexiconPronunciations *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechLexiconPronunciations* This, + ISpeechLexiconPronunciations *This, LONG Index, ISpeechLexiconPronunciation **Pronunciation); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechLexiconPronunciations* This, + ISpeechLexiconPronunciations *This, IUnknown **EnumVARIANT); END_INTERFACE } ISpeechLexiconPronunciationsVtbl; + interface ISpeechLexiconPronunciations { CONST_VTBL ISpeechLexiconPronunciationsVtbl* lpVtbl; }; @@ -23057,31 +19005,6 @@ static FORCEINLINE HRESULT ISpeechLexiconPronunciations_get__NewEnum(ISpeechLexi #endif -HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciations_get_Count_Proxy( - ISpeechLexiconPronunciations* This, - LONG *Count); -void __RPC_STUB ISpeechLexiconPronunciations_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciations_Item_Proxy( - ISpeechLexiconPronunciations* This, - LONG Index, - ISpeechLexiconPronunciation **Pronunciation); -void __RPC_STUB ISpeechLexiconPronunciations_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciations_get__NewEnum_Proxy( - ISpeechLexiconPronunciations* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechLexiconPronunciations_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechLexiconPronunciations_INTERFACE_DEFINED__ */ @@ -23121,29 +19044,29 @@ typedef struct ISpeechLexiconPronunciationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechLexiconPronunciation* This); + ISpeechLexiconPronunciation *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechLexiconPronunciation* This); + ISpeechLexiconPronunciation *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -23151,7 +19074,7 @@ typedef struct ISpeechLexiconPronunciationVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -23163,27 +19086,28 @@ typedef struct ISpeechLexiconPronunciationVtbl { /*** ISpeechLexiconPronunciation methods ***/ HRESULT (STDMETHODCALLTYPE *get_Type)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, SpeechLexiconType *LexiconType); HRESULT (STDMETHODCALLTYPE *get_LangId)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, SpeechLanguageId *LangId); HRESULT (STDMETHODCALLTYPE *get_PartOfSpeech)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, SpeechPartOfSpeech *PartOfSpeech); HRESULT (STDMETHODCALLTYPE *get_PhoneIds)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, VARIANT *PhoneIds); HRESULT (STDMETHODCALLTYPE *get_Symbolic)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, BSTR *Symbolic); END_INTERFACE } ISpeechLexiconPronunciationVtbl; + interface ISpeechLexiconPronunciation { CONST_VTBL ISpeechLexiconPronunciationVtbl* lpVtbl; }; @@ -23250,46 +19174,6 @@ static FORCEINLINE HRESULT ISpeechLexiconPronunciation_get_Symbolic(ISpeechLexic #endif -HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_Type_Proxy( - ISpeechLexiconPronunciation* This, - SpeechLexiconType *LexiconType); -void __RPC_STUB ISpeechLexiconPronunciation_get_Type_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_LangId_Proxy( - ISpeechLexiconPronunciation* This, - SpeechLanguageId *LangId); -void __RPC_STUB ISpeechLexiconPronunciation_get_LangId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_PartOfSpeech_Proxy( - ISpeechLexiconPronunciation* This, - SpeechPartOfSpeech *PartOfSpeech); -void __RPC_STUB ISpeechLexiconPronunciation_get_PartOfSpeech_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_PhoneIds_Proxy( - ISpeechLexiconPronunciation* This, - VARIANT *PhoneIds); -void __RPC_STUB ISpeechLexiconPronunciation_get_PhoneIds_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_Symbolic_Proxy( - ISpeechLexiconPronunciation* This, - BSTR *Symbolic); -void __RPC_STUB ISpeechLexiconPronunciation_get_Symbolic_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechLexiconPronunciation_INTERFACE_DEFINED__ */ @@ -23328,29 +19212,29 @@ typedef struct ISpeechPhoneConverterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhoneConverter* This); + ISpeechPhoneConverter *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhoneConverter* This); + ISpeechPhoneConverter *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -23358,7 +19242,7 @@ typedef struct ISpeechPhoneConverterVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -23370,25 +19254,26 @@ typedef struct ISpeechPhoneConverterVtbl { /*** ISpeechPhoneConverter methods ***/ HRESULT (STDMETHODCALLTYPE *get_LanguageId)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, SpeechLanguageId *LanguageId); HRESULT (STDMETHODCALLTYPE *put_LanguageId)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, SpeechLanguageId LanguageId); HRESULT (STDMETHODCALLTYPE *PhoneToId)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, const BSTR Phonemes, VARIANT *IdArray); HRESULT (STDMETHODCALLTYPE *IdToPhone)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, const VARIANT IdArray, BSTR *Phonemes); END_INTERFACE } ISpeechPhoneConverterVtbl; + interface ISpeechPhoneConverter { CONST_VTBL ISpeechPhoneConverterVtbl* lpVtbl; }; @@ -23451,40 +19336,6 @@ static FORCEINLINE HRESULT ISpeechPhoneConverter_IdToPhone(ISpeechPhoneConverter #endif -HRESULT STDMETHODCALLTYPE ISpeechPhoneConverter_get_LanguageId_Proxy( - ISpeechPhoneConverter* This, - SpeechLanguageId *LanguageId); -void __RPC_STUB ISpeechPhoneConverter_get_LanguageId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhoneConverter_put_LanguageId_Proxy( - ISpeechPhoneConverter* This, - SpeechLanguageId LanguageId); -void __RPC_STUB ISpeechPhoneConverter_put_LanguageId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhoneConverter_PhoneToId_Proxy( - ISpeechPhoneConverter* This, - const BSTR Phonemes, - VARIANT *IdArray); -void __RPC_STUB ISpeechPhoneConverter_PhoneToId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhoneConverter_IdToPhone_Proxy( - ISpeechPhoneConverter* This, - const VARIANT IdArray, - BSTR *Phonemes); -void __RPC_STUB ISpeechPhoneConverter_IdToPhone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhoneConverter_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/sapi53.h b/lib/libc/include/any-windows-any/sapi53.h index 1abbd5a6c2..f71a72ad05 100644 --- a/lib/libc/include/any-windows-any/sapi53.h +++ b/lib/libc/include/any-windows-any/sapi53.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/sapi53.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/sapi53.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,486 +21,777 @@ #ifndef __ISpNotifySource_FWD_DEFINED__ #define __ISpNotifySource_FWD_DEFINED__ typedef interface ISpNotifySource ISpNotifySource; +#ifdef __cplusplus +interface ISpNotifySource; +#endif /* __cplusplus */ #endif #ifndef __ISpNotifySink_FWD_DEFINED__ #define __ISpNotifySink_FWD_DEFINED__ typedef interface ISpNotifySink ISpNotifySink; +#ifdef __cplusplus +interface ISpNotifySink; +#endif /* __cplusplus */ #endif #ifndef __ISpNotifyTranslator_FWD_DEFINED__ #define __ISpNotifyTranslator_FWD_DEFINED__ typedef interface ISpNotifyTranslator ISpNotifyTranslator; +#ifdef __cplusplus +interface ISpNotifyTranslator; +#endif /* __cplusplus */ #endif #ifndef __ISpDataKey_FWD_DEFINED__ #define __ISpDataKey_FWD_DEFINED__ typedef interface ISpDataKey ISpDataKey; +#ifdef __cplusplus +interface ISpDataKey; +#endif /* __cplusplus */ #endif #ifndef __ISpObjectWithToken_FWD_DEFINED__ #define __ISpObjectWithToken_FWD_DEFINED__ typedef interface ISpObjectWithToken ISpObjectWithToken; +#ifdef __cplusplus +interface ISpObjectWithToken; +#endif /* __cplusplus */ #endif #ifndef __IEnumSpObjectTokens_FWD_DEFINED__ #define __IEnumSpObjectTokens_FWD_DEFINED__ typedef interface IEnumSpObjectTokens IEnumSpObjectTokens; +#ifdef __cplusplus +interface IEnumSpObjectTokens; +#endif /* __cplusplus */ #endif #ifndef __ISpRegDataKey_FWD_DEFINED__ #define __ISpRegDataKey_FWD_DEFINED__ typedef interface ISpRegDataKey ISpRegDataKey; +#ifdef __cplusplus +interface ISpRegDataKey; +#endif /* __cplusplus */ #endif #ifndef __ISpObjectTokenCategory_FWD_DEFINED__ #define __ISpObjectTokenCategory_FWD_DEFINED__ typedef interface ISpObjectTokenCategory ISpObjectTokenCategory; +#ifdef __cplusplus +interface ISpObjectTokenCategory; +#endif /* __cplusplus */ #endif #ifndef __ISpObjectToken_FWD_DEFINED__ #define __ISpObjectToken_FWD_DEFINED__ typedef interface ISpObjectToken ISpObjectToken; +#ifdef __cplusplus +interface ISpObjectToken; +#endif /* __cplusplus */ #endif #ifndef __ISpObjectTokenInit_FWD_DEFINED__ #define __ISpObjectTokenInit_FWD_DEFINED__ typedef interface ISpObjectTokenInit ISpObjectTokenInit; +#ifdef __cplusplus +interface ISpObjectTokenInit; +#endif /* __cplusplus */ #endif #ifndef __ISpResourceManager_FWD_DEFINED__ #define __ISpResourceManager_FWD_DEFINED__ typedef interface ISpResourceManager ISpResourceManager; +#ifdef __cplusplus +interface ISpResourceManager; +#endif /* __cplusplus */ #endif #ifndef __ISpEventSource_FWD_DEFINED__ #define __ISpEventSource_FWD_DEFINED__ typedef interface ISpEventSource ISpEventSource; +#ifdef __cplusplus +interface ISpEventSource; +#endif /* __cplusplus */ #endif #ifndef __ISpEventSource2_FWD_DEFINED__ #define __ISpEventSource2_FWD_DEFINED__ typedef interface ISpEventSource2 ISpEventSource2; +#ifdef __cplusplus +interface ISpEventSource2; +#endif /* __cplusplus */ #endif #ifndef __ISpEventSink_FWD_DEFINED__ #define __ISpEventSink_FWD_DEFINED__ typedef interface ISpEventSink ISpEventSink; +#ifdef __cplusplus +interface ISpEventSink; +#endif /* __cplusplus */ #endif #ifndef __ISpStreamFormat_FWD_DEFINED__ #define __ISpStreamFormat_FWD_DEFINED__ typedef interface ISpStreamFormat ISpStreamFormat; +#ifdef __cplusplus +interface ISpStreamFormat; +#endif /* __cplusplus */ #endif #ifndef __ISpStream_FWD_DEFINED__ #define __ISpStream_FWD_DEFINED__ typedef interface ISpStream ISpStream; +#ifdef __cplusplus +interface ISpStream; +#endif /* __cplusplus */ #endif #ifndef __ISpStreamFormatConverter_FWD_DEFINED__ #define __ISpStreamFormatConverter_FWD_DEFINED__ typedef interface ISpStreamFormatConverter ISpStreamFormatConverter; +#ifdef __cplusplus +interface ISpStreamFormatConverter; +#endif /* __cplusplus */ #endif #ifndef __ISpAudio_FWD_DEFINED__ #define __ISpAudio_FWD_DEFINED__ typedef interface ISpAudio ISpAudio; +#ifdef __cplusplus +interface ISpAudio; +#endif /* __cplusplus */ #endif #ifndef __ISpMMSysAudio_FWD_DEFINED__ #define __ISpMMSysAudio_FWD_DEFINED__ typedef interface ISpMMSysAudio ISpMMSysAudio; +#ifdef __cplusplus +interface ISpMMSysAudio; +#endif /* __cplusplus */ #endif #ifndef __ISpTranscript_FWD_DEFINED__ #define __ISpTranscript_FWD_DEFINED__ typedef interface ISpTranscript ISpTranscript; +#ifdef __cplusplus +interface ISpTranscript; +#endif /* __cplusplus */ #endif #ifndef __ISpLexicon_FWD_DEFINED__ #define __ISpLexicon_FWD_DEFINED__ typedef interface ISpLexicon ISpLexicon; +#ifdef __cplusplus +interface ISpLexicon; +#endif /* __cplusplus */ #endif #ifndef __ISpContainerLexicon_FWD_DEFINED__ #define __ISpContainerLexicon_FWD_DEFINED__ typedef interface ISpContainerLexicon ISpContainerLexicon; +#ifdef __cplusplus +interface ISpContainerLexicon; +#endif /* __cplusplus */ #endif #ifndef __ISpShortcut_FWD_DEFINED__ #define __ISpShortcut_FWD_DEFINED__ typedef interface ISpShortcut ISpShortcut; +#ifdef __cplusplus +interface ISpShortcut; +#endif /* __cplusplus */ #endif #ifndef __ISpPhoneConverter_FWD_DEFINED__ #define __ISpPhoneConverter_FWD_DEFINED__ typedef interface ISpPhoneConverter ISpPhoneConverter; +#ifdef __cplusplus +interface ISpPhoneConverter; +#endif /* __cplusplus */ #endif #ifndef __ISpPhoneticAlphabetConverter_FWD_DEFINED__ #define __ISpPhoneticAlphabetConverter_FWD_DEFINED__ typedef interface ISpPhoneticAlphabetConverter ISpPhoneticAlphabetConverter; +#ifdef __cplusplus +interface ISpPhoneticAlphabetConverter; +#endif /* __cplusplus */ #endif #ifndef __ISpPhoneticAlphabetSelection_FWD_DEFINED__ #define __ISpPhoneticAlphabetSelection_FWD_DEFINED__ typedef interface ISpPhoneticAlphabetSelection ISpPhoneticAlphabetSelection; +#ifdef __cplusplus +interface ISpPhoneticAlphabetSelection; +#endif /* __cplusplus */ #endif #ifndef __ISpVoice_FWD_DEFINED__ #define __ISpVoice_FWD_DEFINED__ typedef interface ISpVoice ISpVoice; +#ifdef __cplusplus +interface ISpVoice; +#endif /* __cplusplus */ #endif #ifndef __ISpPhrase_FWD_DEFINED__ #define __ISpPhrase_FWD_DEFINED__ typedef interface ISpPhrase ISpPhrase; +#ifdef __cplusplus +interface ISpPhrase; +#endif /* __cplusplus */ #endif #ifndef __ISpPhraseAlt_FWD_DEFINED__ #define __ISpPhraseAlt_FWD_DEFINED__ typedef interface ISpPhraseAlt ISpPhraseAlt; +#ifdef __cplusplus +interface ISpPhraseAlt; +#endif /* __cplusplus */ #endif #ifndef __ISpPhrase2_FWD_DEFINED__ #define __ISpPhrase2_FWD_DEFINED__ typedef interface ISpPhrase2 ISpPhrase2; +#ifdef __cplusplus +interface ISpPhrase2; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoResult_FWD_DEFINED__ #define __ISpRecoResult_FWD_DEFINED__ typedef interface ISpRecoResult ISpRecoResult; +#ifdef __cplusplus +interface ISpRecoResult; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoResult2_FWD_DEFINED__ #define __ISpRecoResult2_FWD_DEFINED__ typedef interface ISpRecoResult2 ISpRecoResult2; +#ifdef __cplusplus +interface ISpRecoResult2; +#endif /* __cplusplus */ #endif #ifndef __ISpXMLRecoResult_FWD_DEFINED__ #define __ISpXMLRecoResult_FWD_DEFINED__ typedef interface ISpXMLRecoResult ISpXMLRecoResult; +#ifdef __cplusplus +interface ISpXMLRecoResult; +#endif /* __cplusplus */ #endif #ifndef __ISpGrammarBuilder_FWD_DEFINED__ #define __ISpGrammarBuilder_FWD_DEFINED__ typedef interface ISpGrammarBuilder ISpGrammarBuilder; +#ifdef __cplusplus +interface ISpGrammarBuilder; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoGrammar_FWD_DEFINED__ #define __ISpRecoGrammar_FWD_DEFINED__ typedef interface ISpRecoGrammar ISpRecoGrammar; +#ifdef __cplusplus +interface ISpRecoGrammar; +#endif /* __cplusplus */ #endif #ifndef __ISpGrammarBuilder2_FWD_DEFINED__ #define __ISpGrammarBuilder2_FWD_DEFINED__ typedef interface ISpGrammarBuilder2 ISpGrammarBuilder2; +#ifdef __cplusplus +interface ISpGrammarBuilder2; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoGrammar2_FWD_DEFINED__ #define __ISpRecoGrammar2_FWD_DEFINED__ typedef interface ISpRecoGrammar2 ISpRecoGrammar2; +#ifdef __cplusplus +interface ISpRecoGrammar2; +#endif /* __cplusplus */ #endif #ifndef __ISpeechResourceLoader_FWD_DEFINED__ #define __ISpeechResourceLoader_FWD_DEFINED__ typedef interface ISpeechResourceLoader ISpeechResourceLoader; +#ifdef __cplusplus +interface ISpeechResourceLoader; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoContext_FWD_DEFINED__ #define __ISpRecoContext_FWD_DEFINED__ typedef interface ISpRecoContext ISpRecoContext; +#ifdef __cplusplus +interface ISpRecoContext; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoContext2_FWD_DEFINED__ #define __ISpRecoContext2_FWD_DEFINED__ typedef interface ISpRecoContext2 ISpRecoContext2; +#ifdef __cplusplus +interface ISpRecoContext2; +#endif /* __cplusplus */ #endif #ifndef __ISpProperties_FWD_DEFINED__ #define __ISpProperties_FWD_DEFINED__ typedef interface ISpProperties ISpProperties; +#ifdef __cplusplus +interface ISpProperties; +#endif /* __cplusplus */ #endif #ifndef __ISpRecognizer_FWD_DEFINED__ #define __ISpRecognizer_FWD_DEFINED__ typedef interface ISpRecognizer ISpRecognizer; +#ifdef __cplusplus +interface ISpRecognizer; +#endif /* __cplusplus */ #endif #ifndef __ISpSerializeState_FWD_DEFINED__ #define __ISpSerializeState_FWD_DEFINED__ typedef interface ISpSerializeState ISpSerializeState; +#ifdef __cplusplus +interface ISpSerializeState; +#endif /* __cplusplus */ #endif #ifndef __ISpRecognizer2_FWD_DEFINED__ #define __ISpRecognizer2_FWD_DEFINED__ typedef interface ISpRecognizer2 ISpRecognizer2; +#ifdef __cplusplus +interface ISpRecognizer2; +#endif /* __cplusplus */ #endif #ifndef __ISpEnginePronunciation_FWD_DEFINED__ #define __ISpEnginePronunciation_FWD_DEFINED__ typedef interface ISpEnginePronunciation ISpEnginePronunciation; +#ifdef __cplusplus +interface ISpEnginePronunciation; +#endif /* __cplusplus */ #endif #ifndef __ISpDisplayAlternates_FWD_DEFINED__ #define __ISpDisplayAlternates_FWD_DEFINED__ typedef interface ISpDisplayAlternates ISpDisplayAlternates; +#ifdef __cplusplus +interface ISpDisplayAlternates; +#endif /* __cplusplus */ #endif #ifndef __ISpeechDataKey_FWD_DEFINED__ #define __ISpeechDataKey_FWD_DEFINED__ typedef interface ISpeechDataKey ISpeechDataKey; +#ifdef __cplusplus +interface ISpeechDataKey; +#endif /* __cplusplus */ #endif #ifndef __ISpeechObjectToken_FWD_DEFINED__ #define __ISpeechObjectToken_FWD_DEFINED__ typedef interface ISpeechObjectToken ISpeechObjectToken; +#ifdef __cplusplus +interface ISpeechObjectToken; +#endif /* __cplusplus */ #endif #ifndef __ISpeechObjectTokens_FWD_DEFINED__ #define __ISpeechObjectTokens_FWD_DEFINED__ typedef interface ISpeechObjectTokens ISpeechObjectTokens; +#ifdef __cplusplus +interface ISpeechObjectTokens; +#endif /* __cplusplus */ #endif #ifndef __ISpeechObjectTokenCategory_FWD_DEFINED__ #define __ISpeechObjectTokenCategory_FWD_DEFINED__ typedef interface ISpeechObjectTokenCategory ISpeechObjectTokenCategory; +#ifdef __cplusplus +interface ISpeechObjectTokenCategory; +#endif /* __cplusplus */ #endif #ifndef __ISpeechAudioFormat_FWD_DEFINED__ #define __ISpeechAudioFormat_FWD_DEFINED__ typedef interface ISpeechAudioFormat ISpeechAudioFormat; +#ifdef __cplusplus +interface ISpeechAudioFormat; +#endif /* __cplusplus */ #endif #ifndef __ISpeechBaseStream_FWD_DEFINED__ #define __ISpeechBaseStream_FWD_DEFINED__ typedef interface ISpeechBaseStream ISpeechBaseStream; +#ifdef __cplusplus +interface ISpeechBaseStream; +#endif /* __cplusplus */ #endif #ifndef __ISpeechAudio_FWD_DEFINED__ #define __ISpeechAudio_FWD_DEFINED__ typedef interface ISpeechAudio ISpeechAudio; +#ifdef __cplusplus +interface ISpeechAudio; +#endif /* __cplusplus */ #endif #ifndef __ISpeechMMSysAudio_FWD_DEFINED__ #define __ISpeechMMSysAudio_FWD_DEFINED__ typedef interface ISpeechMMSysAudio ISpeechMMSysAudio; +#ifdef __cplusplus +interface ISpeechMMSysAudio; +#endif /* __cplusplus */ #endif #ifndef __ISpeechFileStream_FWD_DEFINED__ #define __ISpeechFileStream_FWD_DEFINED__ typedef interface ISpeechFileStream ISpeechFileStream; +#ifdef __cplusplus +interface ISpeechFileStream; +#endif /* __cplusplus */ #endif #ifndef __ISpeechCustomStream_FWD_DEFINED__ #define __ISpeechCustomStream_FWD_DEFINED__ typedef interface ISpeechCustomStream ISpeechCustomStream; +#ifdef __cplusplus +interface ISpeechCustomStream; +#endif /* __cplusplus */ #endif #ifndef __ISpeechMemoryStream_FWD_DEFINED__ #define __ISpeechMemoryStream_FWD_DEFINED__ typedef interface ISpeechMemoryStream ISpeechMemoryStream; +#ifdef __cplusplus +interface ISpeechMemoryStream; +#endif /* __cplusplus */ #endif #ifndef __ISpeechAudioStatus_FWD_DEFINED__ #define __ISpeechAudioStatus_FWD_DEFINED__ typedef interface ISpeechAudioStatus ISpeechAudioStatus; +#ifdef __cplusplus +interface ISpeechAudioStatus; +#endif /* __cplusplus */ #endif #ifndef __ISpeechAudioBufferInfo_FWD_DEFINED__ #define __ISpeechAudioBufferInfo_FWD_DEFINED__ typedef interface ISpeechAudioBufferInfo ISpeechAudioBufferInfo; +#ifdef __cplusplus +interface ISpeechAudioBufferInfo; +#endif /* __cplusplus */ #endif #ifndef __ISpeechWaveFormatEx_FWD_DEFINED__ #define __ISpeechWaveFormatEx_FWD_DEFINED__ typedef interface ISpeechWaveFormatEx ISpeechWaveFormatEx; +#ifdef __cplusplus +interface ISpeechWaveFormatEx; +#endif /* __cplusplus */ #endif #ifndef __ISpeechVoice_FWD_DEFINED__ #define __ISpeechVoice_FWD_DEFINED__ typedef interface ISpeechVoice ISpeechVoice; +#ifdef __cplusplus +interface ISpeechVoice; +#endif /* __cplusplus */ #endif #ifndef __ISpeechVoiceStatus_FWD_DEFINED__ #define __ISpeechVoiceStatus_FWD_DEFINED__ typedef interface ISpeechVoiceStatus ISpeechVoiceStatus; +#ifdef __cplusplus +interface ISpeechVoiceStatus; +#endif /* __cplusplus */ #endif #ifndef ___ISpeechVoiceEvents_FWD_DEFINED__ #define ___ISpeechVoiceEvents_FWD_DEFINED__ typedef interface _ISpeechVoiceEvents _ISpeechVoiceEvents; +#ifdef __cplusplus +interface _ISpeechVoiceEvents; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecognizer_FWD_DEFINED__ #define __ISpeechRecognizer_FWD_DEFINED__ typedef interface ISpeechRecognizer ISpeechRecognizer; +#ifdef __cplusplus +interface ISpeechRecognizer; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecognizerStatus_FWD_DEFINED__ #define __ISpeechRecognizerStatus_FWD_DEFINED__ typedef interface ISpeechRecognizerStatus ISpeechRecognizerStatus; +#ifdef __cplusplus +interface ISpeechRecognizerStatus; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoContext_FWD_DEFINED__ #define __ISpeechRecoContext_FWD_DEFINED__ typedef interface ISpeechRecoContext ISpeechRecoContext; +#ifdef __cplusplus +interface ISpeechRecoContext; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoGrammar_FWD_DEFINED__ #define __ISpeechRecoGrammar_FWD_DEFINED__ typedef interface ISpeechRecoGrammar ISpeechRecoGrammar; +#ifdef __cplusplus +interface ISpeechRecoGrammar; +#endif /* __cplusplus */ #endif #ifndef ___ISpeechRecoContextEvents_FWD_DEFINED__ #define ___ISpeechRecoContextEvents_FWD_DEFINED__ typedef interface _ISpeechRecoContextEvents _ISpeechRecoContextEvents; +#ifdef __cplusplus +interface _ISpeechRecoContextEvents; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRule_FWD_DEFINED__ #define __ISpeechGrammarRule_FWD_DEFINED__ typedef interface ISpeechGrammarRule ISpeechGrammarRule; +#ifdef __cplusplus +interface ISpeechGrammarRule; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRules_FWD_DEFINED__ #define __ISpeechGrammarRules_FWD_DEFINED__ typedef interface ISpeechGrammarRules ISpeechGrammarRules; +#ifdef __cplusplus +interface ISpeechGrammarRules; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRuleState_FWD_DEFINED__ #define __ISpeechGrammarRuleState_FWD_DEFINED__ typedef interface ISpeechGrammarRuleState ISpeechGrammarRuleState; +#ifdef __cplusplus +interface ISpeechGrammarRuleState; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRuleStateTransitions_FWD_DEFINED__ #define __ISpeechGrammarRuleStateTransitions_FWD_DEFINED__ typedef interface ISpeechGrammarRuleStateTransitions ISpeechGrammarRuleStateTransitions; +#ifdef __cplusplus +interface ISpeechGrammarRuleStateTransitions; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRuleStateTransition_FWD_DEFINED__ #define __ISpeechGrammarRuleStateTransition_FWD_DEFINED__ typedef interface ISpeechGrammarRuleStateTransition ISpeechGrammarRuleStateTransition; +#ifdef __cplusplus +interface ISpeechGrammarRuleStateTransition; +#endif /* __cplusplus */ #endif #ifndef __ISpeechTextSelectionInformation_FWD_DEFINED__ #define __ISpeechTextSelectionInformation_FWD_DEFINED__ typedef interface ISpeechTextSelectionInformation ISpeechTextSelectionInformation; +#ifdef __cplusplus +interface ISpeechTextSelectionInformation; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoResult_FWD_DEFINED__ #define __ISpeechRecoResult_FWD_DEFINED__ typedef interface ISpeechRecoResult ISpeechRecoResult; +#ifdef __cplusplus +interface ISpeechRecoResult; +#endif /* __cplusplus */ #endif #ifndef __ISpeechXMLRecoResult_FWD_DEFINED__ #define __ISpeechXMLRecoResult_FWD_DEFINED__ typedef interface ISpeechXMLRecoResult ISpeechXMLRecoResult; +#ifdef __cplusplus +interface ISpeechXMLRecoResult; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoResult2_FWD_DEFINED__ #define __ISpeechRecoResult2_FWD_DEFINED__ typedef interface ISpeechRecoResult2 ISpeechRecoResult2; +#ifdef __cplusplus +interface ISpeechRecoResult2; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoResultDispatch_FWD_DEFINED__ #define __ISpeechRecoResultDispatch_FWD_DEFINED__ typedef interface ISpeechRecoResultDispatch ISpeechRecoResultDispatch; +#ifdef __cplusplus +interface ISpeechRecoResultDispatch; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseInfoBuilder_FWD_DEFINED__ #define __ISpeechPhraseInfoBuilder_FWD_DEFINED__ typedef interface ISpeechPhraseInfoBuilder ISpeechPhraseInfoBuilder; +#ifdef __cplusplus +interface ISpeechPhraseInfoBuilder; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoResultTimes_FWD_DEFINED__ #define __ISpeechRecoResultTimes_FWD_DEFINED__ typedef interface ISpeechRecoResultTimes ISpeechRecoResultTimes; +#ifdef __cplusplus +interface ISpeechRecoResultTimes; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseAlternate_FWD_DEFINED__ #define __ISpeechPhraseAlternate_FWD_DEFINED__ typedef interface ISpeechPhraseAlternate ISpeechPhraseAlternate; +#ifdef __cplusplus +interface ISpeechPhraseAlternate; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseAlternates_FWD_DEFINED__ #define __ISpeechPhraseAlternates_FWD_DEFINED__ typedef interface ISpeechPhraseAlternates ISpeechPhraseAlternates; +#ifdef __cplusplus +interface ISpeechPhraseAlternates; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseInfo_FWD_DEFINED__ #define __ISpeechPhraseInfo_FWD_DEFINED__ typedef interface ISpeechPhraseInfo ISpeechPhraseInfo; +#ifdef __cplusplus +interface ISpeechPhraseInfo; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseElement_FWD_DEFINED__ #define __ISpeechPhraseElement_FWD_DEFINED__ typedef interface ISpeechPhraseElement ISpeechPhraseElement; +#ifdef __cplusplus +interface ISpeechPhraseElement; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseElements_FWD_DEFINED__ #define __ISpeechPhraseElements_FWD_DEFINED__ typedef interface ISpeechPhraseElements ISpeechPhraseElements; +#ifdef __cplusplus +interface ISpeechPhraseElements; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseReplacement_FWD_DEFINED__ #define __ISpeechPhraseReplacement_FWD_DEFINED__ typedef interface ISpeechPhraseReplacement ISpeechPhraseReplacement; +#ifdef __cplusplus +interface ISpeechPhraseReplacement; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseReplacements_FWD_DEFINED__ #define __ISpeechPhraseReplacements_FWD_DEFINED__ typedef interface ISpeechPhraseReplacements ISpeechPhraseReplacements; +#ifdef __cplusplus +interface ISpeechPhraseReplacements; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseProperty_FWD_DEFINED__ #define __ISpeechPhraseProperty_FWD_DEFINED__ typedef interface ISpeechPhraseProperty ISpeechPhraseProperty; +#ifdef __cplusplus +interface ISpeechPhraseProperty; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseProperties_FWD_DEFINED__ #define __ISpeechPhraseProperties_FWD_DEFINED__ typedef interface ISpeechPhraseProperties ISpeechPhraseProperties; +#ifdef __cplusplus +interface ISpeechPhraseProperties; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseRule_FWD_DEFINED__ #define __ISpeechPhraseRule_FWD_DEFINED__ typedef interface ISpeechPhraseRule ISpeechPhraseRule; +#ifdef __cplusplus +interface ISpeechPhraseRule; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseRules_FWD_DEFINED__ #define __ISpeechPhraseRules_FWD_DEFINED__ typedef interface ISpeechPhraseRules ISpeechPhraseRules; +#ifdef __cplusplus +interface ISpeechPhraseRules; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexiconWords_FWD_DEFINED__ #define __ISpeechLexiconWords_FWD_DEFINED__ typedef interface ISpeechLexiconWords ISpeechLexiconWords; +#ifdef __cplusplus +interface ISpeechLexiconWords; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexicon_FWD_DEFINED__ #define __ISpeechLexicon_FWD_DEFINED__ typedef interface ISpeechLexicon ISpeechLexicon; +#ifdef __cplusplus +interface ISpeechLexicon; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexiconWord_FWD_DEFINED__ #define __ISpeechLexiconWord_FWD_DEFINED__ typedef interface ISpeechLexiconWord ISpeechLexiconWord; +#ifdef __cplusplus +interface ISpeechLexiconWord; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexiconPronunciations_FWD_DEFINED__ #define __ISpeechLexiconPronunciations_FWD_DEFINED__ typedef interface ISpeechLexiconPronunciations ISpeechLexiconPronunciations; +#ifdef __cplusplus +interface ISpeechLexiconPronunciations; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexiconPronunciation_FWD_DEFINED__ #define __ISpeechLexiconPronunciation_FWD_DEFINED__ typedef interface ISpeechLexiconPronunciation ISpeechLexiconPronunciation; +#ifdef __cplusplus +interface ISpeechLexiconPronunciation; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhoneConverter_FWD_DEFINED__ #define __ISpeechPhoneConverter_FWD_DEFINED__ typedef interface ISpeechPhoneConverter ISpeechPhoneConverter; +#ifdef __cplusplus +interface ISpeechPhoneConverter; +#endif /* __cplusplus */ #endif #ifndef __SpNotifyTranslator_FWD_DEFINED__ @@ -780,161 +1072,257 @@ typedef struct WAVEFORMATEX { #ifndef __ISpNotifySource_FWD_DEFINED__ #define __ISpNotifySource_FWD_DEFINED__ typedef interface ISpNotifySource ISpNotifySource; +#ifdef __cplusplus +interface ISpNotifySource; +#endif /* __cplusplus */ #endif #ifndef __ISpNotifySink_FWD_DEFINED__ #define __ISpNotifySink_FWD_DEFINED__ typedef interface ISpNotifySink ISpNotifySink; +#ifdef __cplusplus +interface ISpNotifySink; +#endif /* __cplusplus */ #endif #ifndef __ISpNotifyTranslator_FWD_DEFINED__ #define __ISpNotifyTranslator_FWD_DEFINED__ typedef interface ISpNotifyTranslator ISpNotifyTranslator; +#ifdef __cplusplus +interface ISpNotifyTranslator; +#endif /* __cplusplus */ #endif #ifndef __ISpDataKey_FWD_DEFINED__ #define __ISpDataKey_FWD_DEFINED__ typedef interface ISpDataKey ISpDataKey; +#ifdef __cplusplus +interface ISpDataKey; +#endif /* __cplusplus */ #endif #ifndef __ISpObjectTokenCategory_FWD_DEFINED__ #define __ISpObjectTokenCategory_FWD_DEFINED__ typedef interface ISpObjectTokenCategory ISpObjectTokenCategory; +#ifdef __cplusplus +interface ISpObjectTokenCategory; +#endif /* __cplusplus */ #endif #ifndef __ISpObjectToken_FWD_DEFINED__ #define __ISpObjectToken_FWD_DEFINED__ typedef interface ISpObjectToken ISpObjectToken; +#ifdef __cplusplus +interface ISpObjectToken; +#endif /* __cplusplus */ #endif #ifndef __IEnumSpObjectTokens_FWD_DEFINED__ #define __IEnumSpObjectTokens_FWD_DEFINED__ typedef interface IEnumSpObjectTokens IEnumSpObjectTokens; +#ifdef __cplusplus +interface IEnumSpObjectTokens; +#endif /* __cplusplus */ #endif #ifndef __ISpObjectWithToken_FWD_DEFINED__ #define __ISpObjectWithToken_FWD_DEFINED__ typedef interface ISpObjectWithToken ISpObjectWithToken; +#ifdef __cplusplus +interface ISpObjectWithToken; +#endif /* __cplusplus */ #endif #ifndef __ISpResourceManager_FWD_DEFINED__ #define __ISpResourceManager_FWD_DEFINED__ typedef interface ISpResourceManager ISpResourceManager; +#ifdef __cplusplus +interface ISpResourceManager; +#endif /* __cplusplus */ #endif #ifndef __ISpEventSource_FWD_DEFINED__ #define __ISpEventSource_FWD_DEFINED__ typedef interface ISpEventSource ISpEventSource; +#ifdef __cplusplus +interface ISpEventSource; +#endif /* __cplusplus */ #endif #ifndef __ISpEventSink_FWD_DEFINED__ #define __ISpEventSink_FWD_DEFINED__ typedef interface ISpEventSink ISpEventSink; +#ifdef __cplusplus +interface ISpEventSink; +#endif /* __cplusplus */ #endif #ifndef __ISpStreamFormat_FWD_DEFINED__ #define __ISpStreamFormat_FWD_DEFINED__ typedef interface ISpStreamFormat ISpStreamFormat; +#ifdef __cplusplus +interface ISpStreamFormat; +#endif /* __cplusplus */ #endif #ifndef __ISpStream_FWD_DEFINED__ #define __ISpStream_FWD_DEFINED__ typedef interface ISpStream ISpStream; +#ifdef __cplusplus +interface ISpStream; +#endif /* __cplusplus */ #endif #ifndef __ISpStreamFormatConverter_FWD_DEFINED__ #define __ISpStreamFormatConverter_FWD_DEFINED__ typedef interface ISpStreamFormatConverter ISpStreamFormatConverter; +#ifdef __cplusplus +interface ISpStreamFormatConverter; +#endif /* __cplusplus */ #endif #ifndef __ISpAudio_FWD_DEFINED__ #define __ISpAudio_FWD_DEFINED__ typedef interface ISpAudio ISpAudio; +#ifdef __cplusplus +interface ISpAudio; +#endif /* __cplusplus */ #endif #ifndef __ISpMMSysAudio_FWD_DEFINED__ #define __ISpMMSysAudio_FWD_DEFINED__ typedef interface ISpMMSysAudio ISpMMSysAudio; +#ifdef __cplusplus +interface ISpMMSysAudio; +#endif /* __cplusplus */ #endif #ifndef __ISpTranscript_FWD_DEFINED__ #define __ISpTranscript_FWD_DEFINED__ typedef interface ISpTranscript ISpTranscript; +#ifdef __cplusplus +interface ISpTranscript; +#endif /* __cplusplus */ #endif #ifndef __ISpVoice_FWD_DEFINED__ #define __ISpVoice_FWD_DEFINED__ typedef interface ISpVoice ISpVoice; +#ifdef __cplusplus +interface ISpVoice; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoResult_FWD_DEFINED__ #define __ISpRecoResult_FWD_DEFINED__ typedef interface ISpRecoResult ISpRecoResult; +#ifdef __cplusplus +interface ISpRecoResult; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoContext_FWD_DEFINED__ #define __ISpRecoContext_FWD_DEFINED__ typedef interface ISpRecoContext ISpRecoContext; +#ifdef __cplusplus +interface ISpRecoContext; +#endif /* __cplusplus */ #endif #ifndef __ISpRecognizer_FWD_DEFINED__ #define __ISpRecognizer_FWD_DEFINED__ typedef interface ISpRecognizer ISpRecognizer; +#ifdef __cplusplus +interface ISpRecognizer; +#endif /* __cplusplus */ #endif #ifndef __ISpProperties_FWD_DEFINED__ #define __ISpProperties_FWD_DEFINED__ typedef interface ISpProperties ISpProperties; +#ifdef __cplusplus +interface ISpProperties; +#endif /* __cplusplus */ #endif #ifndef __ISpLexicon_FWD_DEFINED__ #define __ISpLexicon_FWD_DEFINED__ typedef interface ISpLexicon ISpLexicon; +#ifdef __cplusplus +interface ISpLexicon; +#endif /* __cplusplus */ #endif #ifndef __ISpPhoneConverter_FWD_DEFINED__ #define __ISpPhoneConverter_FWD_DEFINED__ typedef interface ISpPhoneConverter ISpPhoneConverter; +#ifdef __cplusplus +interface ISpPhoneConverter; +#endif /* __cplusplus */ #endif #ifndef __ISpPhrase_FWD_DEFINED__ #define __ISpPhrase_FWD_DEFINED__ typedef interface ISpPhrase ISpPhrase; +#ifdef __cplusplus +interface ISpPhrase; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoContext2_FWD_DEFINED__ #define __ISpRecoContext2_FWD_DEFINED__ typedef interface ISpRecoContext2 ISpRecoContext2; +#ifdef __cplusplus +interface ISpRecoContext2; +#endif /* __cplusplus */ #endif #ifndef __ISpRecognizer2_FWD_DEFINED__ #define __ISpRecognizer2_FWD_DEFINED__ typedef interface ISpRecognizer2 ISpRecognizer2; +#ifdef __cplusplus +interface ISpRecognizer2; +#endif /* __cplusplus */ #endif #ifndef __ISpShortcut_FWD_DEFINED__ #define __ISpShortcut_FWD_DEFINED__ typedef interface ISpShortcut ISpShortcut; +#ifdef __cplusplus +interface ISpShortcut; +#endif /* __cplusplus */ #endif #ifndef __ISpPhoneticAlphabetConverter_FWD_DEFINED__ #define __ISpPhoneticAlphabetConverter_FWD_DEFINED__ typedef interface ISpPhoneticAlphabetConverter ISpPhoneticAlphabetConverter; +#ifdef __cplusplus +interface ISpPhoneticAlphabetConverter; +#endif /* __cplusplus */ #endif #ifndef __ISpPhoneticAlphabetSelection_FWD_DEFINED__ #define __ISpPhoneticAlphabetSelection_FWD_DEFINED__ typedef interface ISpPhoneticAlphabetSelection ISpPhoneticAlphabetSelection; +#ifdef __cplusplus +interface ISpPhoneticAlphabetSelection; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoGrammar2_FWD_DEFINED__ #define __ISpRecoGrammar2_FWD_DEFINED__ typedef interface ISpRecoGrammar2 ISpRecoGrammar2; +#ifdef __cplusplus +interface ISpRecoGrammar2; +#endif /* __cplusplus */ #endif #ifndef __ISpeechResourceLoader_FWD_DEFINED__ #define __ISpeechResourceLoader_FWD_DEFINED__ typedef interface ISpeechResourceLoader ISpeechResourceLoader; +#ifdef __cplusplus +interface ISpeechResourceLoader; +#endif /* __cplusplus */ #endif typedef enum SPDATAKEYLOCATION { @@ -1331,52 +1719,53 @@ typedef struct ISpNotifySourceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpNotifySource* This, + ISpNotifySource *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpNotifySource* This); + ISpNotifySource *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpNotifySource* This); + ISpNotifySource *This); /*** ISpNotifySource methods ***/ HRESULT (STDMETHODCALLTYPE *SetNotifySink)( - ISpNotifySource* This, + ISpNotifySource *This, ISpNotifySink *pNotifySink); HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)( - ISpNotifySource* This, + ISpNotifySource *This, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)( - ISpNotifySource* This, + ISpNotifySource *This, SPNOTIFYCALLBACK *pfnCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)( - ISpNotifySource* This, + ISpNotifySource *This, ISpNotifyCallback *pSpCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)( - ISpNotifySource* This); + ISpNotifySource *This); HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)( - ISpNotifySource* This, + ISpNotifySource *This, DWORD dwMilliseconds); HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)( - ISpNotifySource* This); + ISpNotifySource *This); END_INTERFACE } ISpNotifySourceVtbl; + interface ISpNotifySource { CONST_VTBL ISpNotifySourceVtbl* lpVtbl; }; @@ -1433,14 +1822,6 @@ static FORCEINLINE HANDLE ISpNotifySource_GetNotifyEventHandle(ISpNotifySource* #endif -HRESULT STDMETHODCALLTYPE ISpNotifySource_SetNotifySink_Proxy( - ISpNotifySource* This, - ISpNotifySink *pNotifySink); -void __RPC_STUB ISpNotifySource_SetNotifySink_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpNotifySource_INTERFACE_DEFINED__ */ @@ -1468,22 +1849,23 @@ typedef struct ISpNotifySinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpNotifySink* This, + ISpNotifySink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpNotifySink* This); + ISpNotifySink *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpNotifySink* This); + ISpNotifySink *This); /*** ISpNotifySink methods ***/ HRESULT (STDMETHODCALLTYPE *Notify)( - ISpNotifySink* This); + ISpNotifySink *This); END_INTERFACE } ISpNotifySinkVtbl; + interface ISpNotifySink { CONST_VTBL ISpNotifySinkVtbl* lpVtbl; }; @@ -1516,13 +1898,6 @@ static FORCEINLINE HRESULT ISpNotifySink_Notify(ISpNotifySink* This) { #endif -HRESULT STDMETHODCALLTYPE ISpNotifySink_Notify_Proxy( - ISpNotifySink* This); -void __RPC_STUB ISpNotifySink_Notify_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpNotifySink_INTERFACE_DEFINED__ */ @@ -1573,54 +1948,55 @@ typedef struct ISpNotifyTranslatorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpNotifyTranslator* This, + ISpNotifyTranslator *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpNotifyTranslator* This); + ISpNotifyTranslator *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpNotifyTranslator* This); + ISpNotifyTranslator *This); /*** ISpNotifySink methods ***/ HRESULT (STDMETHODCALLTYPE *Notify)( - ISpNotifyTranslator* This); + ISpNotifyTranslator *This); /*** ISpNotifyTranslator methods ***/ HRESULT (STDMETHODCALLTYPE *InitWindowMessage)( - ISpNotifyTranslator* This, + ISpNotifyTranslator *This, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *InitCallback)( - ISpNotifyTranslator* This, + ISpNotifyTranslator *This, SPNOTIFYCALLBACK *pfnCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *InitSpNotifyCallback)( - ISpNotifyTranslator* This, + ISpNotifyTranslator *This, ISpNotifyCallback *pSpCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *InitWin32Event)( - ISpNotifyTranslator* This, + ISpNotifyTranslator *This, HANDLE hEvent, WINBOOL fCloseHandleOnRelease); HRESULT (STDMETHODCALLTYPE *Wait)( - ISpNotifyTranslator* This, + ISpNotifyTranslator *This, DWORD dwMilliseconds); HANDLE (STDMETHODCALLTYPE *GetEventHandle)( - ISpNotifyTranslator* This); + ISpNotifyTranslator *This); END_INTERFACE } ISpNotifyTranslatorVtbl; + interface ISpNotifyTranslator { CONST_VTBL ISpNotifyTranslatorVtbl* lpVtbl; }; @@ -1679,61 +2055,6 @@ static FORCEINLINE HANDLE ISpNotifyTranslator_GetEventHandle(ISpNotifyTranslator #endif -HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_InitWindowMessage_Proxy( - ISpNotifyTranslator* This, - HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam); -void __RPC_STUB ISpNotifyTranslator_InitWindowMessage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_InitCallback_Proxy( - ISpNotifyTranslator* This, - SPNOTIFYCALLBACK *pfnCallback, - WPARAM wParam, - LPARAM lParam); -void __RPC_STUB ISpNotifyTranslator_InitCallback_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_InitSpNotifyCallback_Proxy( - ISpNotifyTranslator* This, - ISpNotifyCallback *pSpCallback, - WPARAM wParam, - LPARAM lParam); -void __RPC_STUB ISpNotifyTranslator_InitSpNotifyCallback_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_InitWin32Event_Proxy( - ISpNotifyTranslator* This, - HANDLE hEvent, - WINBOOL fCloseHandleOnRelease); -void __RPC_STUB ISpNotifyTranslator_InitWin32Event_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_Wait_Proxy( - ISpNotifyTranslator* This, - DWORD dwMilliseconds); -void __RPC_STUB ISpNotifyTranslator_Wait_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HANDLE STDMETHODCALLTYPE ISpNotifyTranslator_GetEventHandle_Proxy( - ISpNotifyTranslator* This); -void __RPC_STUB ISpNotifyTranslator_GetEventHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpNotifyTranslator_INTERFACE_DEFINED__ */ @@ -1806,79 +2127,80 @@ typedef struct ISpDataKeyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpDataKey* This, + ISpDataKey *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpDataKey* This); + ISpDataKey *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpDataKey* This); + ISpDataKey *This); /*** ISpDataKey methods ***/ HRESULT (STDMETHODCALLTYPE *SetData)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszValueName, ULONG cbData, const BYTE *pData); HRESULT (STDMETHODCALLTYPE *GetData)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszValueName, ULONG *pcbData, BYTE *pData); HRESULT (STDMETHODCALLTYPE *SetStringValue)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszValueName, LPCWSTR pszValue); HRESULT (STDMETHODCALLTYPE *GetStringValue)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszValueName, LPWSTR *ppszValue); HRESULT (STDMETHODCALLTYPE *SetDWORD)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszValueName, DWORD dwValue); HRESULT (STDMETHODCALLTYPE *GetDWORD)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszValueName, DWORD *pdwValue); HRESULT (STDMETHODCALLTYPE *OpenKey)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszSubKeyName, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *CreateKey)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszSubKey, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *DeleteKey)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszSubKey); HRESULT (STDMETHODCALLTYPE *DeleteValue)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszValueName); HRESULT (STDMETHODCALLTYPE *EnumKeys)( - ISpDataKey* This, + ISpDataKey *This, ULONG Index, LPWSTR *ppszSubKeyName); HRESULT (STDMETHODCALLTYPE *EnumValues)( - ISpDataKey* This, + ISpDataKey *This, ULONG Index, LPWSTR *ppszValueName); END_INTERFACE } ISpDataKeyVtbl; + interface ISpDataKey { CONST_VTBL ISpDataKeyVtbl* lpVtbl; }; @@ -1955,114 +2277,6 @@ static FORCEINLINE HRESULT ISpDataKey_EnumValues(ISpDataKey* This,ULONG Index,LP #endif -HRESULT STDMETHODCALLTYPE ISpDataKey_SetData_Proxy( - ISpDataKey* This, - LPCWSTR pszValueName, - ULONG cbData, - const BYTE *pData); -void __RPC_STUB ISpDataKey_SetData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_GetData_Proxy( - ISpDataKey* This, - LPCWSTR pszValueName, - ULONG *pcbData, - BYTE *pData); -void __RPC_STUB ISpDataKey_GetData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_SetStringValue_Proxy( - ISpDataKey* This, - LPCWSTR pszValueName, - LPCWSTR pszValue); -void __RPC_STUB ISpDataKey_SetStringValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_GetStringValue_Proxy( - ISpDataKey* This, - LPCWSTR pszValueName, - LPWSTR *ppszValue); -void __RPC_STUB ISpDataKey_GetStringValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_SetDWORD_Proxy( - ISpDataKey* This, - LPCWSTR pszValueName, - DWORD dwValue); -void __RPC_STUB ISpDataKey_SetDWORD_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_GetDWORD_Proxy( - ISpDataKey* This, - LPCWSTR pszValueName, - DWORD *pdwValue); -void __RPC_STUB ISpDataKey_GetDWORD_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_OpenKey_Proxy( - ISpDataKey* This, - LPCWSTR pszSubKeyName, - ISpDataKey **ppSubKey); -void __RPC_STUB ISpDataKey_OpenKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_CreateKey_Proxy( - ISpDataKey* This, - LPCWSTR pszSubKey, - ISpDataKey **ppSubKey); -void __RPC_STUB ISpDataKey_CreateKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_DeleteKey_Proxy( - ISpDataKey* This, - LPCWSTR pszSubKey); -void __RPC_STUB ISpDataKey_DeleteKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_DeleteValue_Proxy( - ISpDataKey* This, - LPCWSTR pszValueName); -void __RPC_STUB ISpDataKey_DeleteValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_EnumKeys_Proxy( - ISpDataKey* This, - ULONG Index, - LPWSTR *ppszSubKeyName); -void __RPC_STUB ISpDataKey_EnumKeys_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_EnumValues_Proxy( - ISpDataKey* This, - ULONG Index, - LPWSTR *ppszValueName); -void __RPC_STUB ISpDataKey_EnumValues_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpDataKey_INTERFACE_DEFINED__ */ @@ -2093,27 +2307,28 @@ typedef struct ISpObjectWithTokenVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpObjectWithToken* This, + ISpObjectWithToken *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpObjectWithToken* This); + ISpObjectWithToken *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpObjectWithToken* This); + ISpObjectWithToken *This); /*** ISpObjectWithToken methods ***/ HRESULT (STDMETHODCALLTYPE *SetObjectToken)( - ISpObjectWithToken* This, + ISpObjectWithToken *This, ISpObjectToken *pToken); HRESULT (STDMETHODCALLTYPE *GetObjectToken)( - ISpObjectWithToken* This, + ISpObjectWithToken *This, ISpObjectToken **ppToken); END_INTERFACE } ISpObjectWithTokenVtbl; + interface ISpObjectWithToken { CONST_VTBL ISpObjectWithTokenVtbl* lpVtbl; }; @@ -2150,22 +2365,6 @@ static FORCEINLINE HRESULT ISpObjectWithToken_GetObjectToken(ISpObjectWithToken* #endif -HRESULT STDMETHODCALLTYPE ISpObjectWithToken_SetObjectToken_Proxy( - ISpObjectWithToken* This, - ISpObjectToken *pToken); -void __RPC_STUB ISpObjectWithToken_SetObjectToken_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectWithToken_GetObjectToken_Proxy( - ISpObjectWithToken* This, - ISpObjectToken **ppToken); -void __RPC_STUB ISpObjectWithToken_GetObjectToken_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpObjectWithToken_INTERFACE_DEFINED__ */ @@ -2211,45 +2410,46 @@ typedef struct IEnumSpObjectTokensVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumSpObjectTokens* This, + IEnumSpObjectTokens *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumSpObjectTokens* This); + IEnumSpObjectTokens *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumSpObjectTokens* This); + IEnumSpObjectTokens *This); /*** IEnumSpObjectTokens methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumSpObjectTokens* This, + IEnumSpObjectTokens *This, ULONG celt, ISpObjectToken **pelt, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumSpObjectTokens* This, + IEnumSpObjectTokens *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumSpObjectTokens* This); + IEnumSpObjectTokens *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumSpObjectTokens* This, + IEnumSpObjectTokens *This, IEnumSpObjectTokens **ppEnum); HRESULT (STDMETHODCALLTYPE *Item)( - IEnumSpObjectTokens* This, + IEnumSpObjectTokens *This, ULONG Index, ISpObjectToken **ppToken); HRESULT (STDMETHODCALLTYPE *GetCount)( - IEnumSpObjectTokens* This, + IEnumSpObjectTokens *This, ULONG *pCount); END_INTERFACE } IEnumSpObjectTokensVtbl; + interface IEnumSpObjectTokens { CONST_VTBL IEnumSpObjectTokensVtbl* lpVtbl; }; @@ -2302,56 +2502,6 @@ static FORCEINLINE HRESULT IEnumSpObjectTokens_GetCount(IEnumSpObjectTokens* Thi #endif -HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Next_Proxy( - IEnumSpObjectTokens* This, - ULONG celt, - ISpObjectToken **pelt, - ULONG *pceltFetched); -void __RPC_STUB IEnumSpObjectTokens_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Skip_Proxy( - IEnumSpObjectTokens* This, - ULONG celt); -void __RPC_STUB IEnumSpObjectTokens_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Reset_Proxy( - IEnumSpObjectTokens* This); -void __RPC_STUB IEnumSpObjectTokens_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Clone_Proxy( - IEnumSpObjectTokens* This, - IEnumSpObjectTokens **ppEnum); -void __RPC_STUB IEnumSpObjectTokens_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Item_Proxy( - IEnumSpObjectTokens* This, - ULONG Index, - ISpObjectToken **ppToken); -void __RPC_STUB IEnumSpObjectTokens_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_GetCount_Proxy( - IEnumSpObjectTokens* This, - ULONG *pCount); -void __RPC_STUB IEnumSpObjectTokens_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumSpObjectTokens_INTERFACE_DEFINED__ */ @@ -2380,85 +2530,86 @@ typedef struct ISpRegDataKeyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRegDataKey* This, + ISpRegDataKey *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRegDataKey* This); + ISpRegDataKey *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRegDataKey* This); + ISpRegDataKey *This); /*** ISpDataKey methods ***/ HRESULT (STDMETHODCALLTYPE *SetData)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszValueName, ULONG cbData, const BYTE *pData); HRESULT (STDMETHODCALLTYPE *GetData)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszValueName, ULONG *pcbData, BYTE *pData); HRESULT (STDMETHODCALLTYPE *SetStringValue)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszValueName, LPCWSTR pszValue); HRESULT (STDMETHODCALLTYPE *GetStringValue)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszValueName, LPWSTR *ppszValue); HRESULT (STDMETHODCALLTYPE *SetDWORD)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszValueName, DWORD dwValue); HRESULT (STDMETHODCALLTYPE *GetDWORD)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszValueName, DWORD *pdwValue); HRESULT (STDMETHODCALLTYPE *OpenKey)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszSubKeyName, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *CreateKey)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszSubKey, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *DeleteKey)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszSubKey); HRESULT (STDMETHODCALLTYPE *DeleteValue)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszValueName); HRESULT (STDMETHODCALLTYPE *EnumKeys)( - ISpRegDataKey* This, + ISpRegDataKey *This, ULONG Index, LPWSTR *ppszSubKeyName); HRESULT (STDMETHODCALLTYPE *EnumValues)( - ISpRegDataKey* This, + ISpRegDataKey *This, ULONG Index, LPWSTR *ppszValueName); /*** ISpRegDataKey methods ***/ HRESULT (STDMETHODCALLTYPE *SetKey)( - ISpRegDataKey* This, + ISpRegDataKey *This, HKEY hkey, WINBOOL fReadOnly); END_INTERFACE } ISpRegDataKeyVtbl; + interface ISpRegDataKey { CONST_VTBL ISpRegDataKeyVtbl* lpVtbl; }; @@ -2587,108 +2738,109 @@ typedef struct ISpObjectTokenCategoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpObjectTokenCategory* This); + ISpObjectTokenCategory *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpObjectTokenCategory* This); + ISpObjectTokenCategory *This); /*** ISpDataKey methods ***/ HRESULT (STDMETHODCALLTYPE *SetData)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszValueName, ULONG cbData, const BYTE *pData); HRESULT (STDMETHODCALLTYPE *GetData)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszValueName, ULONG *pcbData, BYTE *pData); HRESULT (STDMETHODCALLTYPE *SetStringValue)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszValueName, LPCWSTR pszValue); HRESULT (STDMETHODCALLTYPE *GetStringValue)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszValueName, LPWSTR *ppszValue); HRESULT (STDMETHODCALLTYPE *SetDWORD)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszValueName, DWORD dwValue); HRESULT (STDMETHODCALLTYPE *GetDWORD)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszValueName, DWORD *pdwValue); HRESULT (STDMETHODCALLTYPE *OpenKey)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszSubKeyName, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *CreateKey)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszSubKey, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *DeleteKey)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszSubKey); HRESULT (STDMETHODCALLTYPE *DeleteValue)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszValueName); HRESULT (STDMETHODCALLTYPE *EnumKeys)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, ULONG Index, LPWSTR *ppszSubKeyName); HRESULT (STDMETHODCALLTYPE *EnumValues)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, ULONG Index, LPWSTR *ppszValueName); /*** ISpObjectTokenCategory methods ***/ HRESULT (STDMETHODCALLTYPE *SetId)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszCategoryId, WINBOOL fCreateIfNotExist); HRESULT (STDMETHODCALLTYPE *GetId)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPWSTR *ppszCoMemCategoryId); HRESULT (STDMETHODCALLTYPE *GetDataKey)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, SPDATAKEYLOCATION spdkl, ISpDataKey **ppDataKey); HRESULT (STDMETHODCALLTYPE *EnumTokens)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pzsReqAttribs, LPCWSTR pszOptAttribs, IEnumSpObjectTokens **ppEnum); HRESULT (STDMETHODCALLTYPE *SetDefaultTokenId)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszTokenId); HRESULT (STDMETHODCALLTYPE *GetDefaultTokenId)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPWSTR *ppszCoMemTokenId); END_INTERFACE } ISpObjectTokenCategoryVtbl; + interface ISpObjectTokenCategory { CONST_VTBL ISpObjectTokenCategoryVtbl* lpVtbl; }; @@ -2791,58 +2943,6 @@ static FORCEINLINE HRESULT ISpObjectTokenCategory_GetDefaultTokenId(ISpObjectTok #endif -HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_SetId_Proxy( - ISpObjectTokenCategory* This, - LPCWSTR pszCategoryId, - WINBOOL fCreateIfNotExist); -void __RPC_STUB ISpObjectTokenCategory_SetId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_GetId_Proxy( - ISpObjectTokenCategory* This, - LPWSTR *ppszCoMemCategoryId); -void __RPC_STUB ISpObjectTokenCategory_GetId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_GetDataKey_Proxy( - ISpObjectTokenCategory* This, - SPDATAKEYLOCATION spdkl, - ISpDataKey **ppDataKey); -void __RPC_STUB ISpObjectTokenCategory_GetDataKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_EnumTokens_Proxy( - ISpObjectTokenCategory* This, - LPCWSTR pzsReqAttribs, - LPCWSTR pszOptAttribs, - IEnumSpObjectTokens **ppEnum); -void __RPC_STUB ISpObjectTokenCategory_EnumTokens_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_SetDefaultTokenId_Proxy( - ISpObjectTokenCategory* This, - LPCWSTR pszTokenId); -void __RPC_STUB ISpObjectTokenCategory_SetDefaultTokenId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_GetDefaultTokenId_Proxy( - ISpObjectTokenCategory* This, - LPWSTR *ppszCoMemTokenId); -void __RPC_STUB ISpObjectTokenCategory_GetDefaultTokenId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpObjectTokenCategory_INTERFACE_DEFINED__ */ @@ -2918,101 +3018,101 @@ typedef struct ISpObjectTokenVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpObjectToken* This, + ISpObjectToken *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpObjectToken* This); + ISpObjectToken *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpObjectToken* This); + ISpObjectToken *This); /*** ISpDataKey methods ***/ HRESULT (STDMETHODCALLTYPE *SetData)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszValueName, ULONG cbData, const BYTE *pData); HRESULT (STDMETHODCALLTYPE *GetData)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszValueName, ULONG *pcbData, BYTE *pData); HRESULT (STDMETHODCALLTYPE *SetStringValue)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszValueName, LPCWSTR pszValue); HRESULT (STDMETHODCALLTYPE *GetStringValue)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszValueName, LPWSTR *ppszValue); HRESULT (STDMETHODCALLTYPE *SetDWORD)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszValueName, DWORD dwValue); HRESULT (STDMETHODCALLTYPE *GetDWORD)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszValueName, DWORD *pdwValue); HRESULT (STDMETHODCALLTYPE *OpenKey)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszSubKeyName, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *CreateKey)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszSubKey, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *DeleteKey)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszSubKey); HRESULT (STDMETHODCALLTYPE *DeleteValue)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszValueName); HRESULT (STDMETHODCALLTYPE *EnumKeys)( - ISpObjectToken* This, + ISpObjectToken *This, ULONG Index, LPWSTR *ppszSubKeyName); HRESULT (STDMETHODCALLTYPE *EnumValues)( - ISpObjectToken* This, + ISpObjectToken *This, ULONG Index, LPWSTR *ppszValueName); /*** ISpObjectToken methods ***/ HRESULT (STDMETHODCALLTYPE *SetId)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszCategoryId, LPCWSTR pszTokenId, WINBOOL fCreateIfNotExist); HRESULT (STDMETHODCALLTYPE *GetId)( - ISpObjectToken* This, + ISpObjectToken *This, LPWSTR *ppszCoMemTokenId); HRESULT (STDMETHODCALLTYPE *GetCategory)( - ISpObjectToken* This, + ISpObjectToken *This, ISpObjectTokenCategory **ppTokenCategory); HRESULT (STDMETHODCALLTYPE *CreateInstance)( - ISpObjectToken* This, + ISpObjectToken *This, IUnknown *pUnkOuter, DWORD dwClsContext, REFIID riid, void **ppvObject); HRESULT (STDMETHODCALLTYPE *GetStorageFileName)( - ISpObjectToken* This, + ISpObjectToken *This, REFCLSID clsidCaller, LPCWSTR pszValueName, LPCWSTR pszFileNameSpecifier, @@ -3020,17 +3120,17 @@ typedef struct ISpObjectTokenVtbl { LPWSTR *ppszFilePath); HRESULT (STDMETHODCALLTYPE *RemoveStorageFileName)( - ISpObjectToken* This, + ISpObjectToken *This, REFCLSID clsidCaller, LPCWSTR pszKeyName, WINBOOL fDeleteFile); HRESULT (STDMETHODCALLTYPE *Remove)( - ISpObjectToken* This, + ISpObjectToken *This, const CLSID *pclsidCaller); HRESULT (STDMETHODCALLTYPE *IsUISupported)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszTypeOfUI, void *pvExtraData, ULONG cbExtraData, @@ -3038,7 +3138,7 @@ typedef struct ISpObjectTokenVtbl { WINBOOL *pfSupported); HRESULT (STDMETHODCALLTYPE *DisplayUI)( - ISpObjectToken* This, + ISpObjectToken *This, HWND hwndParent, LPCWSTR pszTitle, LPCWSTR pszTypeOfUI, @@ -3047,12 +3147,13 @@ typedef struct ISpObjectTokenVtbl { IUnknown *punkObject); HRESULT (STDMETHODCALLTYPE *MatchesAttributes)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszAttributes, WINBOOL *pfMatches); END_INTERFACE } ISpObjectTokenVtbl; + interface ISpObjectToken { CONST_VTBL ISpObjectTokenVtbl* lpVtbl; }; @@ -3171,82 +3272,6 @@ static FORCEINLINE HRESULT ISpObjectToken_MatchesAttributes(ISpObjectToken* This #endif -HRESULT STDMETHODCALLTYPE ISpObjectToken_SetId_Proxy( - ISpObjectToken* This, - LPCWSTR pszCategoryId, - LPCWSTR pszTokenId, - WINBOOL fCreateIfNotExist); -void __RPC_STUB ISpObjectToken_SetId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectToken_GetId_Proxy( - ISpObjectToken* This, - LPWSTR *ppszCoMemTokenId); -void __RPC_STUB ISpObjectToken_GetId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectToken_GetCategory_Proxy( - ISpObjectToken* This, - ISpObjectTokenCategory **ppTokenCategory); -void __RPC_STUB ISpObjectToken_GetCategory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectToken_CreateInstance_Proxy( - ISpObjectToken* This, - IUnknown *pUnkOuter, - DWORD dwClsContext, - REFIID riid, - void **ppvObject); -void __RPC_STUB ISpObjectToken_CreateInstance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectToken_GetStorageFileName_Proxy( - ISpObjectToken* This, - REFCLSID clsidCaller, - LPCWSTR pszValueName, - LPCWSTR pszFileNameSpecifier, - ULONG nFolder, - LPWSTR *ppszFilePath); -void __RPC_STUB ISpObjectToken_GetStorageFileName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectToken_RemoveStorageFileName_Proxy( - ISpObjectToken* This, - REFCLSID clsidCaller, - LPCWSTR pszKeyName, - WINBOOL fDeleteFile); -void __RPC_STUB ISpObjectToken_RemoveStorageFileName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectToken_Remove_Proxy( - ISpObjectToken* This, - const CLSID *pclsidCaller); -void __RPC_STUB ISpObjectToken_Remove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectToken_MatchesAttributes_Proxy( - ISpObjectToken* This, - LPCWSTR pszAttributes, - WINBOOL *pfMatches); -void __RPC_STUB ISpObjectToken_MatchesAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpObjectToken_INTERFACE_DEFINED__ */ @@ -3276,101 +3301,101 @@ typedef struct ISpObjectTokenInitVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpObjectTokenInit* This); + ISpObjectTokenInit *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpObjectTokenInit* This); + ISpObjectTokenInit *This); /*** ISpDataKey methods ***/ HRESULT (STDMETHODCALLTYPE *SetData)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszValueName, ULONG cbData, const BYTE *pData); HRESULT (STDMETHODCALLTYPE *GetData)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszValueName, ULONG *pcbData, BYTE *pData); HRESULT (STDMETHODCALLTYPE *SetStringValue)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszValueName, LPCWSTR pszValue); HRESULT (STDMETHODCALLTYPE *GetStringValue)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszValueName, LPWSTR *ppszValue); HRESULT (STDMETHODCALLTYPE *SetDWORD)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszValueName, DWORD dwValue); HRESULT (STDMETHODCALLTYPE *GetDWORD)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszValueName, DWORD *pdwValue); HRESULT (STDMETHODCALLTYPE *OpenKey)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszSubKeyName, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *CreateKey)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszSubKey, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *DeleteKey)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszSubKey); HRESULT (STDMETHODCALLTYPE *DeleteValue)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszValueName); HRESULT (STDMETHODCALLTYPE *EnumKeys)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, ULONG Index, LPWSTR *ppszSubKeyName); HRESULT (STDMETHODCALLTYPE *EnumValues)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, ULONG Index, LPWSTR *ppszValueName); /*** ISpObjectToken methods ***/ HRESULT (STDMETHODCALLTYPE *SetId)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszCategoryId, LPCWSTR pszTokenId, WINBOOL fCreateIfNotExist); HRESULT (STDMETHODCALLTYPE *GetId)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPWSTR *ppszCoMemTokenId); HRESULT (STDMETHODCALLTYPE *GetCategory)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, ISpObjectTokenCategory **ppTokenCategory); HRESULT (STDMETHODCALLTYPE *CreateInstance)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, IUnknown *pUnkOuter, DWORD dwClsContext, REFIID riid, void **ppvObject); HRESULT (STDMETHODCALLTYPE *GetStorageFileName)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, REFCLSID clsidCaller, LPCWSTR pszValueName, LPCWSTR pszFileNameSpecifier, @@ -3378,17 +3403,17 @@ typedef struct ISpObjectTokenInitVtbl { LPWSTR *ppszFilePath); HRESULT (STDMETHODCALLTYPE *RemoveStorageFileName)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, REFCLSID clsidCaller, LPCWSTR pszKeyName, WINBOOL fDeleteFile); HRESULT (STDMETHODCALLTYPE *Remove)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, const CLSID *pclsidCaller); HRESULT (STDMETHODCALLTYPE *IsUISupported)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszTypeOfUI, void *pvExtraData, ULONG cbExtraData, @@ -3396,7 +3421,7 @@ typedef struct ISpObjectTokenInitVtbl { WINBOOL *pfSupported); HRESULT (STDMETHODCALLTYPE *DisplayUI)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, HWND hwndParent, LPCWSTR pszTitle, LPCWSTR pszTypeOfUI, @@ -3405,19 +3430,20 @@ typedef struct ISpObjectTokenInitVtbl { IUnknown *punkObject); HRESULT (STDMETHODCALLTYPE *MatchesAttributes)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszAttributes, WINBOOL *pfMatches); /*** ISpObjectTokenInit methods ***/ HRESULT (STDMETHODCALLTYPE *InitFromDataKey)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszCategoryId, LPCWSTR pszTokenId, ISpDataKey *pDataKey); END_INTERFACE } ISpObjectTokenInitVtbl; + interface ISpObjectTokenInit { CONST_VTBL ISpObjectTokenInitVtbl* lpVtbl; }; @@ -3542,16 +3568,6 @@ static FORCEINLINE HRESULT ISpObjectTokenInit_InitFromDataKey(ISpObjectTokenInit #endif -HRESULT STDMETHODCALLTYPE ISpObjectTokenInit_InitFromDataKey_Proxy( - ISpObjectTokenInit* This, - LPCWSTR pszCategoryId, - LPCWSTR pszTokenId, - ISpDataKey *pDataKey); -void __RPC_STUB ISpObjectTokenInit_InitFromDataKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpObjectTokenInit_INTERFACE_DEFINED__ */ @@ -3587,31 +3603,31 @@ typedef struct ISpResourceManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpResourceManager* This, + ISpResourceManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpResourceManager* This); + ISpResourceManager *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpResourceManager* This); + ISpResourceManager *This); /*** IServiceProvider methods ***/ HRESULT (STDMETHODCALLTYPE *QueryService)( - ISpResourceManager* This, + ISpResourceManager *This, REFGUID guidService, REFIID riid, void **ppvObject); /*** ISpResourceManager methods ***/ HRESULT (STDMETHODCALLTYPE *SetObject)( - ISpResourceManager* This, + ISpResourceManager *This, REFGUID guidServiceId, IUnknown *pUnkObject); HRESULT (STDMETHODCALLTYPE *GetObject)( - ISpResourceManager* This, + ISpResourceManager *This, REFGUID guidServiceId, REFCLSID ObjectCLSID, REFIID ObjectIID, @@ -3620,6 +3636,7 @@ typedef struct ISpResourceManagerVtbl { END_INTERFACE } ISpResourceManagerVtbl; + interface ISpResourceManager { CONST_VTBL ISpResourceManagerVtbl* lpVtbl; }; @@ -3662,27 +3679,6 @@ static FORCEINLINE HRESULT ISpResourceManager_GetObject(ISpResourceManager* This #endif -HRESULT STDMETHODCALLTYPE ISpResourceManager_SetObject_Proxy( - ISpResourceManager* This, - REFGUID guidServiceId, - IUnknown *pUnkObject); -void __RPC_STUB ISpResourceManager_SetObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpResourceManager_GetObject_Proxy( - ISpResourceManager* This, - REFGUID guidServiceId, - REFCLSID ObjectCLSID, - REFIID ObjectIID, - WINBOOL fReleaseWhenLastExternalRefReleased, - void **ppObject); -void __RPC_STUB ISpResourceManager_GetObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpResourceManager_INTERFACE_DEFINED__ */ @@ -3798,68 +3794,69 @@ typedef struct ISpEventSourceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpEventSource* This, + ISpEventSource *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpEventSource* This); + ISpEventSource *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpEventSource* This); + ISpEventSource *This); /*** ISpNotifySource methods ***/ HRESULT (STDMETHODCALLTYPE *SetNotifySink)( - ISpEventSource* This, + ISpEventSource *This, ISpNotifySink *pNotifySink); HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)( - ISpEventSource* This, + ISpEventSource *This, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)( - ISpEventSource* This, + ISpEventSource *This, SPNOTIFYCALLBACK *pfnCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)( - ISpEventSource* This, + ISpEventSource *This, ISpNotifyCallback *pSpCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)( - ISpEventSource* This); + ISpEventSource *This); HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)( - ISpEventSource* This, + ISpEventSource *This, DWORD dwMilliseconds); HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)( - ISpEventSource* This); + ISpEventSource *This); /*** ISpEventSource methods ***/ HRESULT (STDMETHODCALLTYPE *SetInterest)( - ISpEventSource* This, + ISpEventSource *This, ULONGLONG ullEventInterest, ULONGLONG ullQueuedInterest); HRESULT (STDMETHODCALLTYPE *GetEvents)( - ISpEventSource* This, + ISpEventSource *This, ULONG ulCount, SPEVENT *pEventArray, ULONG *pulFetched); HRESULT (STDMETHODCALLTYPE *GetInfo)( - ISpEventSource* This, + ISpEventSource *This, SPEVENTSOURCEINFO *pInfo); END_INTERFACE } ISpEventSourceVtbl; + interface ISpEventSource { CONST_VTBL ISpEventSourceVtbl* lpVtbl; }; @@ -3930,33 +3927,6 @@ static FORCEINLINE HRESULT ISpEventSource_GetInfo(ISpEventSource* This,SPEVENTSO #endif -HRESULT STDMETHODCALLTYPE ISpEventSource_SetInterest_Proxy( - ISpEventSource* This, - ULONGLONG ullEventInterest, - ULONGLONG ullQueuedInterest); -void __RPC_STUB ISpEventSource_SetInterest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpEventSource_GetEvents_Proxy( - ISpEventSource* This, - ULONG ulCount, - SPEVENT *pEventArray, - ULONG *pulFetched); -void __RPC_STUB ISpEventSource_GetEvents_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpEventSource_GetInfo_Proxy( - ISpEventSource* This, - SPEVENTSOURCEINFO *pInfo); -void __RPC_STUB ISpEventSource_GetInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpEventSource_INTERFACE_DEFINED__ */ @@ -3986,75 +3956,76 @@ typedef struct ISpEventSource2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpEventSource2* This, + ISpEventSource2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpEventSource2* This); + ISpEventSource2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpEventSource2* This); + ISpEventSource2 *This); /*** ISpNotifySource methods ***/ HRESULT (STDMETHODCALLTYPE *SetNotifySink)( - ISpEventSource2* This, + ISpEventSource2 *This, ISpNotifySink *pNotifySink); HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)( - ISpEventSource2* This, + ISpEventSource2 *This, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)( - ISpEventSource2* This, + ISpEventSource2 *This, SPNOTIFYCALLBACK *pfnCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)( - ISpEventSource2* This, + ISpEventSource2 *This, ISpNotifyCallback *pSpCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)( - ISpEventSource2* This); + ISpEventSource2 *This); HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)( - ISpEventSource2* This, + ISpEventSource2 *This, DWORD dwMilliseconds); HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)( - ISpEventSource2* This); + ISpEventSource2 *This); /*** ISpEventSource methods ***/ HRESULT (STDMETHODCALLTYPE *SetInterest)( - ISpEventSource2* This, + ISpEventSource2 *This, ULONGLONG ullEventInterest, ULONGLONG ullQueuedInterest); HRESULT (STDMETHODCALLTYPE *GetEvents)( - ISpEventSource2* This, + ISpEventSource2 *This, ULONG ulCount, SPEVENT *pEventArray, ULONG *pulFetched); HRESULT (STDMETHODCALLTYPE *GetInfo)( - ISpEventSource2* This, + ISpEventSource2 *This, SPEVENTSOURCEINFO *pInfo); /*** ISpEventSource2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetEventsEx)( - ISpEventSource2* This, + ISpEventSource2 *This, ULONG ulCount, SPEVENTEX *pEventArray, ULONG *pulFetched); END_INTERFACE } ISpEventSource2Vtbl; + interface ISpEventSource2 { CONST_VTBL ISpEventSource2Vtbl* lpVtbl; }; @@ -4131,16 +4102,6 @@ static FORCEINLINE HRESULT ISpEventSource2_GetEventsEx(ISpEventSource2* This,ULO #endif -HRESULT STDMETHODCALLTYPE ISpEventSource2_GetEventsEx_Proxy( - ISpEventSource2* This, - ULONG ulCount, - SPEVENTEX *pEventArray, - ULONG *pulFetched); -void __RPC_STUB ISpEventSource2_GetEventsEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpEventSource2_INTERFACE_DEFINED__ */ @@ -4172,28 +4133,29 @@ typedef struct ISpEventSinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpEventSink* This, + ISpEventSink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpEventSink* This); + ISpEventSink *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpEventSink* This); + ISpEventSink *This); /*** ISpEventSink methods ***/ HRESULT (STDMETHODCALLTYPE *AddEvents)( - ISpEventSink* This, + ISpEventSink *This, const SPEVENT *pEventArray, ULONG ulCount); HRESULT (STDMETHODCALLTYPE *GetEventInterest)( - ISpEventSink* This, + ISpEventSink *This, ULONGLONG *pullEventInterest); END_INTERFACE } ISpEventSinkVtbl; + interface ISpEventSink { CONST_VTBL ISpEventSinkVtbl* lpVtbl; }; @@ -4230,23 +4192,6 @@ static FORCEINLINE HRESULT ISpEventSink_GetEventInterest(ISpEventSink* This,ULON #endif -HRESULT STDMETHODCALLTYPE ISpEventSink_AddEvents_Proxy( - ISpEventSink* This, - const SPEVENT *pEventArray, - ULONG ulCount); -void __RPC_STUB ISpEventSink_AddEvents_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpEventSink_GetEventInterest_Proxy( - ISpEventSink* This, - ULONGLONG *pullEventInterest); -void __RPC_STUB ISpEventSink_GetEventInterest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpEventSink_INTERFACE_DEFINED__ */ @@ -4275,83 +4220,84 @@ typedef struct ISpStreamFormatVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpStreamFormat* This, + ISpStreamFormat *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpStreamFormat* This); + ISpStreamFormat *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpStreamFormat* This); + ISpStreamFormat *This); /*** ISequentialStream methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - ISpStreamFormat* This, + ISpStreamFormat *This, void *pv, ULONG cb, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpStreamFormat* This, + ISpStreamFormat *This, const void *pv, ULONG cb, ULONG *pcbWritten); /*** IStream methods ***/ HRESULT (STDMETHODCALLTYPE *Seek)( - ISpStreamFormat* This, + ISpStreamFormat *This, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition); HRESULT (STDMETHODCALLTYPE *SetSize)( - ISpStreamFormat* This, + ISpStreamFormat *This, ULARGE_INTEGER libNewSize); HRESULT (STDMETHODCALLTYPE *CopyTo)( - ISpStreamFormat* This, + ISpStreamFormat *This, IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpStreamFormat* This, + ISpStreamFormat *This, DWORD grfCommitFlags); HRESULT (STDMETHODCALLTYPE *Revert)( - ISpStreamFormat* This); + ISpStreamFormat *This); HRESULT (STDMETHODCALLTYPE *LockRegion)( - ISpStreamFormat* This, + ISpStreamFormat *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *UnlockRegion)( - ISpStreamFormat* This, + ISpStreamFormat *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *Stat)( - ISpStreamFormat* This, + ISpStreamFormat *This, STATSTG *pstatstg, DWORD grfStatFlag); HRESULT (STDMETHODCALLTYPE *Clone)( - ISpStreamFormat* This, + ISpStreamFormat *This, IStream **ppstm); /*** ISpStreamFormat methods ***/ HRESULT (STDMETHODCALLTYPE *GetFormat)( - ISpStreamFormat* This, + ISpStreamFormat *This, GUID *pguidFormatId, WAVEFORMATEX **ppCoMemWaveFormatEx); END_INTERFACE } ISpStreamFormatVtbl; + interface ISpStreamFormat { CONST_VTBL ISpStreamFormatVtbl* lpVtbl; }; @@ -4432,15 +4378,6 @@ static FORCEINLINE HRESULT ISpStreamFormat_GetFormat(ISpStreamFormat* This,GUID #endif -HRESULT STDMETHODCALLTYPE ISpStreamFormat_GetFormat_Proxy( - ISpStreamFormat* This, - GUID *pguidFormatId, - WAVEFORMATEX **ppCoMemWaveFormatEx); -void __RPC_STUB ISpStreamFormat_GetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpStreamFormat_INTERFACE_DEFINED__ */ @@ -4483,94 +4420,94 @@ typedef struct ISpStreamVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpStream* This, + ISpStream *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpStream* This); + ISpStream *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpStream* This); + ISpStream *This); /*** ISequentialStream methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - ISpStream* This, + ISpStream *This, void *pv, ULONG cb, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpStream* This, + ISpStream *This, const void *pv, ULONG cb, ULONG *pcbWritten); /*** IStream methods ***/ HRESULT (STDMETHODCALLTYPE *Seek)( - ISpStream* This, + ISpStream *This, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition); HRESULT (STDMETHODCALLTYPE *SetSize)( - ISpStream* This, + ISpStream *This, ULARGE_INTEGER libNewSize); HRESULT (STDMETHODCALLTYPE *CopyTo)( - ISpStream* This, + ISpStream *This, IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpStream* This, + ISpStream *This, DWORD grfCommitFlags); HRESULT (STDMETHODCALLTYPE *Revert)( - ISpStream* This); + ISpStream *This); HRESULT (STDMETHODCALLTYPE *LockRegion)( - ISpStream* This, + ISpStream *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *UnlockRegion)( - ISpStream* This, + ISpStream *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *Stat)( - ISpStream* This, + ISpStream *This, STATSTG *pstatstg, DWORD grfStatFlag); HRESULT (STDMETHODCALLTYPE *Clone)( - ISpStream* This, + ISpStream *This, IStream **ppstm); /*** ISpStreamFormat methods ***/ HRESULT (STDMETHODCALLTYPE *GetFormat)( - ISpStream* This, + ISpStream *This, GUID *pguidFormatId, WAVEFORMATEX **ppCoMemWaveFormatEx); /*** ISpStream methods ***/ HRESULT (STDMETHODCALLTYPE *SetBaseStream)( - ISpStream* This, + ISpStream *This, IStream *pStream, REFGUID rguidFormat, const WAVEFORMATEX *pWaveFormatEx); HRESULT (STDMETHODCALLTYPE *GetBaseStream)( - ISpStream* This, + ISpStream *This, IStream **ppStream); HRESULT (STDMETHODCALLTYPE *BindToFile)( - ISpStream* This, + ISpStream *This, LPCWSTR pszFileName, SPFILEMODE eMode, const GUID *pFormatId, @@ -4578,10 +4515,11 @@ typedef struct ISpStreamVtbl { ULONGLONG ullEventInterest); HRESULT (STDMETHODCALLTYPE *Close)( - ISpStream* This); + ISpStream *This); END_INTERFACE } ISpStreamVtbl; + interface ISpStream { CONST_VTBL ISpStreamVtbl* lpVtbl; }; @@ -4680,43 +4618,6 @@ static FORCEINLINE HRESULT ISpStream_Close(ISpStream* This) { #endif -HRESULT STDMETHODCALLTYPE ISpStream_SetBaseStream_Proxy( - ISpStream* This, - IStream *pStream, - REFGUID rguidFormat, - const WAVEFORMATEX *pWaveFormatEx); -void __RPC_STUB ISpStream_SetBaseStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpStream_GetBaseStream_Proxy( - ISpStream* This, - IStream **ppStream); -void __RPC_STUB ISpStream_GetBaseStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpStream_BindToFile_Proxy( - ISpStream* This, - LPCWSTR pszFileName, - SPFILEMODE eMode, - const GUID *pFormatId, - const WAVEFORMATEX *pWaveFormatEx, - ULONGLONG ullEventInterest); -void __RPC_STUB ISpStream_BindToFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpStream_Close_Proxy( - ISpStream* This); -void __RPC_STUB ISpStream_Close_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpStream_INTERFACE_DEFINED__ */ @@ -4764,112 +4665,113 @@ typedef struct ISpStreamFormatConverterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpStreamFormatConverter* This); + ISpStreamFormatConverter *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpStreamFormatConverter* This); + ISpStreamFormatConverter *This); /*** ISequentialStream methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, void *pv, ULONG cb, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, const void *pv, ULONG cb, ULONG *pcbWritten); /*** IStream methods ***/ HRESULT (STDMETHODCALLTYPE *Seek)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition); HRESULT (STDMETHODCALLTYPE *SetSize)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, ULARGE_INTEGER libNewSize); HRESULT (STDMETHODCALLTYPE *CopyTo)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, DWORD grfCommitFlags); HRESULT (STDMETHODCALLTYPE *Revert)( - ISpStreamFormatConverter* This); + ISpStreamFormatConverter *This); HRESULT (STDMETHODCALLTYPE *LockRegion)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *UnlockRegion)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *Stat)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, STATSTG *pstatstg, DWORD grfStatFlag); HRESULT (STDMETHODCALLTYPE *Clone)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, IStream **ppstm); /*** ISpStreamFormat methods ***/ HRESULT (STDMETHODCALLTYPE *GetFormat)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, GUID *pguidFormatId, WAVEFORMATEX **ppCoMemWaveFormatEx); /*** ISpStreamFormatConverter methods ***/ HRESULT (STDMETHODCALLTYPE *SetBaseStream)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, ISpStreamFormat *pStream, WINBOOL fSetFormatToBaseStreamFormat, WINBOOL fWriteToBaseStream); HRESULT (STDMETHODCALLTYPE *GetBaseStream)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, ISpStreamFormat **ppStream); HRESULT (STDMETHODCALLTYPE *SetFormat)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, REFGUID rguidFormatIdOfConvertedStream, const WAVEFORMATEX *pWaveFormatExOfConvertedStream); HRESULT (STDMETHODCALLTYPE *ResetSeekPosition)( - ISpStreamFormatConverter* This); + ISpStreamFormatConverter *This); HRESULT (STDMETHODCALLTYPE *ScaleConvertedToBaseOffset)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, ULONGLONG ullOffsetConvertedStream, ULONGLONG *pullOffsetBaseStream); HRESULT (STDMETHODCALLTYPE *ScaleBaseToConvertedOffset)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, ULONGLONG ullOffsetBaseStream, ULONGLONG *pullOffsetConvertedStream); END_INTERFACE } ISpStreamFormatConverterVtbl; + interface ISpStreamFormatConverter { CONST_VTBL ISpStreamFormatConverterVtbl* lpVtbl; }; @@ -4976,58 +4878,6 @@ static FORCEINLINE HRESULT ISpStreamFormatConverter_ScaleBaseToConvertedOffset(I #endif -HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_SetBaseStream_Proxy( - ISpStreamFormatConverter* This, - ISpStreamFormat *pStream, - WINBOOL fSetFormatToBaseStreamFormat, - WINBOOL fWriteToBaseStream); -void __RPC_STUB ISpStreamFormatConverter_SetBaseStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_GetBaseStream_Proxy( - ISpStreamFormatConverter* This, - ISpStreamFormat **ppStream); -void __RPC_STUB ISpStreamFormatConverter_GetBaseStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_SetFormat_Proxy( - ISpStreamFormatConverter* This, - REFGUID rguidFormatIdOfConvertedStream, - const WAVEFORMATEX *pWaveFormatExOfConvertedStream); -void __RPC_STUB ISpStreamFormatConverter_SetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_ResetSeekPosition_Proxy( - ISpStreamFormatConverter* This); -void __RPC_STUB ISpStreamFormatConverter_ResetSeekPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_ScaleConvertedToBaseOffset_Proxy( - ISpStreamFormatConverter* This, - ULONGLONG ullOffsetConvertedStream, - ULONGLONG *pullOffsetBaseStream); -void __RPC_STUB ISpStreamFormatConverter_ScaleConvertedToBaseOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_ScaleBaseToConvertedOffset_Proxy( - ISpStreamFormatConverter* This, - ULONGLONG ullOffsetBaseStream, - ULONGLONG *pullOffsetConvertedStream); -void __RPC_STUB ISpStreamFormatConverter_ScaleBaseToConvertedOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpStreamFormatConverter_INTERFACE_DEFINED__ */ @@ -5102,130 +4952,131 @@ typedef struct ISpAudioVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpAudio* This, + ISpAudio *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpAudio* This); + ISpAudio *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpAudio* This); + ISpAudio *This); /*** ISequentialStream methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - ISpAudio* This, + ISpAudio *This, void *pv, ULONG cb, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpAudio* This, + ISpAudio *This, const void *pv, ULONG cb, ULONG *pcbWritten); /*** IStream methods ***/ HRESULT (STDMETHODCALLTYPE *Seek)( - ISpAudio* This, + ISpAudio *This, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition); HRESULT (STDMETHODCALLTYPE *SetSize)( - ISpAudio* This, + ISpAudio *This, ULARGE_INTEGER libNewSize); HRESULT (STDMETHODCALLTYPE *CopyTo)( - ISpAudio* This, + ISpAudio *This, IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpAudio* This, + ISpAudio *This, DWORD grfCommitFlags); HRESULT (STDMETHODCALLTYPE *Revert)( - ISpAudio* This); + ISpAudio *This); HRESULT (STDMETHODCALLTYPE *LockRegion)( - ISpAudio* This, + ISpAudio *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *UnlockRegion)( - ISpAudio* This, + ISpAudio *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *Stat)( - ISpAudio* This, + ISpAudio *This, STATSTG *pstatstg, DWORD grfStatFlag); HRESULT (STDMETHODCALLTYPE *Clone)( - ISpAudio* This, + ISpAudio *This, IStream **ppstm); /*** ISpStreamFormat methods ***/ HRESULT (STDMETHODCALLTYPE *GetFormat)( - ISpAudio* This, + ISpAudio *This, GUID *pguidFormatId, WAVEFORMATEX **ppCoMemWaveFormatEx); /*** ISpAudio methods ***/ HRESULT (STDMETHODCALLTYPE *SetState)( - ISpAudio* This, + ISpAudio *This, SPAUDIOSTATE NewState, ULONGLONG ullReserved); HRESULT (STDMETHODCALLTYPE *SetFormat)( - ISpAudio* This, + ISpAudio *This, REFGUID rguidFmtId, const WAVEFORMATEX *pWaveFormatEx); HRESULT (STDMETHODCALLTYPE *GetStatus)( - ISpAudio* This, + ISpAudio *This, SPAUDIOSTATUS *pStatus); HRESULT (STDMETHODCALLTYPE *SetBufferInfo)( - ISpAudio* This, + ISpAudio *This, const SPAUDIOBUFFERINFO *pBuffInfo); HRESULT (STDMETHODCALLTYPE *GetBufferInfo)( - ISpAudio* This, + ISpAudio *This, SPAUDIOBUFFERINFO *pBuffInfo); HRESULT (STDMETHODCALLTYPE *GetDefaultFormat)( - ISpAudio* This, + ISpAudio *This, GUID *pFormatId, WAVEFORMATEX **ppCoMemWaveFormatEx); HANDLE (STDMETHODCALLTYPE *EventHandle)( - ISpAudio* This); + ISpAudio *This); HRESULT (STDMETHODCALLTYPE *GetVolumeLevel)( - ISpAudio* This, + ISpAudio *This, ULONG *pLevel); HRESULT (STDMETHODCALLTYPE *SetVolumeLevel)( - ISpAudio* This, + ISpAudio *This, ULONG Level); HRESULT (STDMETHODCALLTYPE *GetBufferNotifySize)( - ISpAudio* This, + ISpAudio *This, ULONG *pcbSize); HRESULT (STDMETHODCALLTYPE *SetBufferNotifySize)( - ISpAudio* This, + ISpAudio *This, ULONG cbSize); END_INTERFACE } ISpAudioVtbl; + interface ISpAudio { CONST_VTBL ISpAudioVtbl* lpVtbl; }; @@ -5352,96 +5203,6 @@ static FORCEINLINE HRESULT ISpAudio_SetBufferNotifySize(ISpAudio* This,ULONG cbS #endif -HRESULT STDMETHODCALLTYPE ISpAudio_SetState_Proxy( - ISpAudio* This, - SPAUDIOSTATE NewState, - ULONGLONG ullReserved); -void __RPC_STUB ISpAudio_SetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_SetFormat_Proxy( - ISpAudio* This, - REFGUID rguidFmtId, - const WAVEFORMATEX *pWaveFormatEx); -void __RPC_STUB ISpAudio_SetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_GetStatus_Proxy( - ISpAudio* This, - SPAUDIOSTATUS *pStatus); -void __RPC_STUB ISpAudio_GetStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_SetBufferInfo_Proxy( - ISpAudio* This, - const SPAUDIOBUFFERINFO *pBuffInfo); -void __RPC_STUB ISpAudio_SetBufferInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_GetBufferInfo_Proxy( - ISpAudio* This, - SPAUDIOBUFFERINFO *pBuffInfo); -void __RPC_STUB ISpAudio_GetBufferInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_GetDefaultFormat_Proxy( - ISpAudio* This, - GUID *pFormatId, - WAVEFORMATEX **ppCoMemWaveFormatEx); -void __RPC_STUB ISpAudio_GetDefaultFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HANDLE STDMETHODCALLTYPE ISpAudio_EventHandle_Proxy( - ISpAudio* This); -void __RPC_STUB ISpAudio_EventHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_GetVolumeLevel_Proxy( - ISpAudio* This, - ULONG *pLevel); -void __RPC_STUB ISpAudio_GetVolumeLevel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_SetVolumeLevel_Proxy( - ISpAudio* This, - ULONG Level); -void __RPC_STUB ISpAudio_SetVolumeLevel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_GetBufferNotifySize_Proxy( - ISpAudio* This, - ULONG *pcbSize); -void __RPC_STUB ISpAudio_GetBufferNotifySize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_SetBufferNotifySize_Proxy( - ISpAudio* This, - ULONG cbSize); -void __RPC_STUB ISpAudio_SetBufferNotifySize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpAudio_INTERFACE_DEFINED__ */ @@ -5481,151 +5242,152 @@ typedef struct ISpMMSysAudioVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpMMSysAudio* This); + ISpMMSysAudio *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpMMSysAudio* This); + ISpMMSysAudio *This); /*** ISequentialStream methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, void *pv, ULONG cb, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, const void *pv, ULONG cb, ULONG *pcbWritten); /*** IStream methods ***/ HRESULT (STDMETHODCALLTYPE *Seek)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition); HRESULT (STDMETHODCALLTYPE *SetSize)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, ULARGE_INTEGER libNewSize); HRESULT (STDMETHODCALLTYPE *CopyTo)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, DWORD grfCommitFlags); HRESULT (STDMETHODCALLTYPE *Revert)( - ISpMMSysAudio* This); + ISpMMSysAudio *This); HRESULT (STDMETHODCALLTYPE *LockRegion)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *UnlockRegion)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *Stat)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, STATSTG *pstatstg, DWORD grfStatFlag); HRESULT (STDMETHODCALLTYPE *Clone)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, IStream **ppstm); /*** ISpStreamFormat methods ***/ HRESULT (STDMETHODCALLTYPE *GetFormat)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, GUID *pguidFormatId, WAVEFORMATEX **ppCoMemWaveFormatEx); /*** ISpAudio methods ***/ HRESULT (STDMETHODCALLTYPE *SetState)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, SPAUDIOSTATE NewState, ULONGLONG ullReserved); HRESULT (STDMETHODCALLTYPE *SetFormat)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, REFGUID rguidFmtId, const WAVEFORMATEX *pWaveFormatEx); HRESULT (STDMETHODCALLTYPE *GetStatus)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, SPAUDIOSTATUS *pStatus); HRESULT (STDMETHODCALLTYPE *SetBufferInfo)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, const SPAUDIOBUFFERINFO *pBuffInfo); HRESULT (STDMETHODCALLTYPE *GetBufferInfo)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, SPAUDIOBUFFERINFO *pBuffInfo); HRESULT (STDMETHODCALLTYPE *GetDefaultFormat)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, GUID *pFormatId, WAVEFORMATEX **ppCoMemWaveFormatEx); HANDLE (STDMETHODCALLTYPE *EventHandle)( - ISpMMSysAudio* This); + ISpMMSysAudio *This); HRESULT (STDMETHODCALLTYPE *GetVolumeLevel)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, ULONG *pLevel); HRESULT (STDMETHODCALLTYPE *SetVolumeLevel)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, ULONG Level); HRESULT (STDMETHODCALLTYPE *GetBufferNotifySize)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, ULONG *pcbSize); HRESULT (STDMETHODCALLTYPE *SetBufferNotifySize)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, ULONG cbSize); /*** ISpMMSysAudio methods ***/ HRESULT (STDMETHODCALLTYPE *GetDeviceId)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, UINT *puDeviceId); HRESULT (STDMETHODCALLTYPE *SetDeviceId)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, UINT uDeviceId); HRESULT (STDMETHODCALLTYPE *GetMMHandle)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, void **pHandle); HRESULT (STDMETHODCALLTYPE *GetLineId)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, UINT *puLineId); HRESULT (STDMETHODCALLTYPE *SetLineId)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, UINT uLineId); END_INTERFACE } ISpMMSysAudioVtbl; + interface ISpMMSysAudio { CONST_VTBL ISpMMSysAudioVtbl* lpVtbl; }; @@ -5774,46 +5536,6 @@ static FORCEINLINE HRESULT ISpMMSysAudio_SetLineId(ISpMMSysAudio* This,UINT uLin #endif -HRESULT STDMETHODCALLTYPE ISpMMSysAudio_GetDeviceId_Proxy( - ISpMMSysAudio* This, - UINT *puDeviceId); -void __RPC_STUB ISpMMSysAudio_GetDeviceId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpMMSysAudio_SetDeviceId_Proxy( - ISpMMSysAudio* This, - UINT uDeviceId); -void __RPC_STUB ISpMMSysAudio_SetDeviceId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpMMSysAudio_GetMMHandle_Proxy( - ISpMMSysAudio* This, - void **pHandle); -void __RPC_STUB ISpMMSysAudio_GetMMHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpMMSysAudio_GetLineId_Proxy( - ISpMMSysAudio* This, - UINT *puLineId); -void __RPC_STUB ISpMMSysAudio_GetLineId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpMMSysAudio_SetLineId_Proxy( - ISpMMSysAudio* This, - UINT uLineId); -void __RPC_STUB ISpMMSysAudio_SetLineId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpMMSysAudio_INTERFACE_DEFINED__ */ @@ -5844,27 +5566,28 @@ typedef struct ISpTranscriptVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpTranscript* This, + ISpTranscript *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpTranscript* This); + ISpTranscript *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpTranscript* This); + ISpTranscript *This); /*** ISpTranscript methods ***/ HRESULT (STDMETHODCALLTYPE *GetTranscript)( - ISpTranscript* This, + ISpTranscript *This, LPWSTR *ppszTranscript); HRESULT (STDMETHODCALLTYPE *AppendTranscript)( - ISpTranscript* This, + ISpTranscript *This, LPCWSTR pszTranscript); END_INTERFACE } ISpTranscriptVtbl; + interface ISpTranscript { CONST_VTBL ISpTranscriptVtbl* lpVtbl; }; @@ -5901,22 +5624,6 @@ static FORCEINLINE HRESULT ISpTranscript_AppendTranscript(ISpTranscript* This,LP #endif -HRESULT STDMETHODCALLTYPE ISpTranscript_GetTranscript_Proxy( - ISpTranscript* This, - LPWSTR *ppszTranscript); -void __RPC_STUB ISpTranscript_GetTranscript_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpTranscript_AppendTranscript_Proxy( - ISpTranscript* This, - LPCWSTR pszTranscript); -void __RPC_STUB ISpTranscript_AppendTranscript_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpTranscript_INTERFACE_DEFINED__ */ @@ -5951,7 +5658,6 @@ struct SPPHRASERULE { float SREngineConfidence; signed char Confidence; }; - struct SPPHRASEPROPERTY { LPCWSTR pszName; __C89_NAMELESS union { @@ -5971,7 +5677,6 @@ struct SPPHRASEPROPERTY { float SREngineConfidence; signed char Confidence; }; - typedef struct SPPHRASEREPLACEMENT { BYTE bDisplayAttributes; LPCWSTR pszReplacementText; @@ -6128,50 +5833,50 @@ typedef struct ISpLexiconVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpLexicon* This, + ISpLexicon *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpLexicon* This); + ISpLexicon *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpLexicon* This); + ISpLexicon *This); /*** ISpLexicon methods ***/ HRESULT (STDMETHODCALLTYPE *GetPronunciations)( - ISpLexicon* This, + ISpLexicon *This, LPCWSTR pszWord, WORD LangID, DWORD dwFlags, SPWORDPRONUNCIATIONLIST *pWordPronunciationList); HRESULT (STDMETHODCALLTYPE *AddPronunciation)( - ISpLexicon* This, + ISpLexicon *This, LPCWSTR pszWord, WORD LangID, SPPARTOFSPEECH ePartOfSpeech, PCSPPHONEID pszPronunciation); HRESULT (STDMETHODCALLTYPE *RemovePronunciation)( - ISpLexicon* This, + ISpLexicon *This, LPCWSTR pszWord, WORD LangID, SPPARTOFSPEECH ePartOfSpeech, PCSPPHONEID pszPronunciation); HRESULT (STDMETHODCALLTYPE *GetGeneration)( - ISpLexicon* This, + ISpLexicon *This, DWORD *pdwGeneration); HRESULT (STDMETHODCALLTYPE *GetGenerationChange)( - ISpLexicon* This, + ISpLexicon *This, DWORD dwFlags, DWORD *pdwGeneration, SPWORDLIST *pWordList); HRESULT (STDMETHODCALLTYPE *GetWords)( - ISpLexicon* This, + ISpLexicon *This, DWORD dwFlags, DWORD *pdwGeneration, DWORD *pdwCookie, @@ -6179,6 +5884,7 @@ typedef struct ISpLexiconVtbl { END_INTERFACE } ISpLexiconVtbl; + interface ISpLexicon { CONST_VTBL ISpLexiconVtbl* lpVtbl; }; @@ -6231,68 +5937,6 @@ static FORCEINLINE HRESULT ISpLexicon_GetWords(ISpLexicon* This,DWORD dwFlags,DW #endif -HRESULT STDMETHODCALLTYPE ISpLexicon_GetPronunciations_Proxy( - ISpLexicon* This, - LPCWSTR pszWord, - WORD LangID, - DWORD dwFlags, - SPWORDPRONUNCIATIONLIST *pWordPronunciationList); -void __RPC_STUB ISpLexicon_GetPronunciations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpLexicon_AddPronunciation_Proxy( - ISpLexicon* This, - LPCWSTR pszWord, - WORD LangID, - SPPARTOFSPEECH ePartOfSpeech, - PCSPPHONEID pszPronunciation); -void __RPC_STUB ISpLexicon_AddPronunciation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpLexicon_RemovePronunciation_Proxy( - ISpLexicon* This, - LPCWSTR pszWord, - WORD LangID, - SPPARTOFSPEECH ePartOfSpeech, - PCSPPHONEID pszPronunciation); -void __RPC_STUB ISpLexicon_RemovePronunciation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpLexicon_GetGeneration_Proxy( - ISpLexicon* This, - DWORD *pdwGeneration); -void __RPC_STUB ISpLexicon_GetGeneration_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpLexicon_GetGenerationChange_Proxy( - ISpLexicon* This, - DWORD dwFlags, - DWORD *pdwGeneration, - SPWORDLIST *pWordList); -void __RPC_STUB ISpLexicon_GetGenerationChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpLexicon_GetWords_Proxy( - ISpLexicon* This, - DWORD dwFlags, - DWORD *pdwGeneration, - DWORD *pdwCookie, - SPWORDLIST *pWordList); -void __RPC_STUB ISpLexicon_GetWords_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpLexicon_INTERFACE_DEFINED__ */ @@ -6321,50 +5965,50 @@ typedef struct ISpContainerLexiconVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpContainerLexicon* This, + ISpContainerLexicon *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpContainerLexicon* This); + ISpContainerLexicon *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpContainerLexicon* This); + ISpContainerLexicon *This); /*** ISpLexicon methods ***/ HRESULT (STDMETHODCALLTYPE *GetPronunciations)( - ISpContainerLexicon* This, + ISpContainerLexicon *This, LPCWSTR pszWord, WORD LangID, DWORD dwFlags, SPWORDPRONUNCIATIONLIST *pWordPronunciationList); HRESULT (STDMETHODCALLTYPE *AddPronunciation)( - ISpContainerLexicon* This, + ISpContainerLexicon *This, LPCWSTR pszWord, WORD LangID, SPPARTOFSPEECH ePartOfSpeech, PCSPPHONEID pszPronunciation); HRESULT (STDMETHODCALLTYPE *RemovePronunciation)( - ISpContainerLexicon* This, + ISpContainerLexicon *This, LPCWSTR pszWord, WORD LangID, SPPARTOFSPEECH ePartOfSpeech, PCSPPHONEID pszPronunciation); HRESULT (STDMETHODCALLTYPE *GetGeneration)( - ISpContainerLexicon* This, + ISpContainerLexicon *This, DWORD *pdwGeneration); HRESULT (STDMETHODCALLTYPE *GetGenerationChange)( - ISpContainerLexicon* This, + ISpContainerLexicon *This, DWORD dwFlags, DWORD *pdwGeneration, SPWORDLIST *pWordList); HRESULT (STDMETHODCALLTYPE *GetWords)( - ISpContainerLexicon* This, + ISpContainerLexicon *This, DWORD dwFlags, DWORD *pdwGeneration, DWORD *pdwCookie, @@ -6372,12 +6016,13 @@ typedef struct ISpContainerLexiconVtbl { /*** ISpContainerLexicon methods ***/ HRESULT (STDMETHODCALLTYPE *AddLexicon)( - ISpContainerLexicon* This, + ISpContainerLexicon *This, ISpLexicon *pAddLexicon, DWORD dwFlags); END_INTERFACE } ISpContainerLexiconVtbl; + interface ISpContainerLexicon { CONST_VTBL ISpContainerLexiconVtbl* lpVtbl; }; @@ -6436,15 +6081,6 @@ static FORCEINLINE HRESULT ISpContainerLexicon_AddLexicon(ISpContainerLexicon* T #endif -HRESULT STDMETHODCALLTYPE ISpContainerLexicon_AddLexicon_Proxy( - ISpContainerLexicon* This, - ISpLexicon *pAddLexicon, - DWORD dwFlags); -void __RPC_STUB ISpContainerLexicon_AddLexicon_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpContainerLexicon_INTERFACE_DEFINED__ */ @@ -6518,64 +6154,65 @@ typedef struct ISpShortcutVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpShortcut* This, + ISpShortcut *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpShortcut* This); + ISpShortcut *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpShortcut* This); + ISpShortcut *This); /*** ISpShortcut methods ***/ HRESULT (STDMETHODCALLTYPE *AddShortcut)( - ISpShortcut* This, + ISpShortcut *This, LPCWSTR pszDisplay, WORD LangID, LPCWSTR pszSpoken, SPSHORTCUTTYPE shType); HRESULT (STDMETHODCALLTYPE *RemoveShortcut)( - ISpShortcut* This, + ISpShortcut *This, LPCWSTR pszDisplay, WORD LangID, LPCWSTR pszSpoken, SPSHORTCUTTYPE shType); HRESULT (STDMETHODCALLTYPE *GetShortcuts)( - ISpShortcut* This, + ISpShortcut *This, WORD LangID, SPSHORTCUTPAIRLIST *pShortcutpairList); HRESULT (STDMETHODCALLTYPE *GetGeneration)( - ISpShortcut* This, + ISpShortcut *This, DWORD *pdwGeneration); HRESULT (STDMETHODCALLTYPE *GetWordsFromGenerationChange)( - ISpShortcut* This, + ISpShortcut *This, DWORD *pdwGeneration, SPWORDLIST *pWordList); HRESULT (STDMETHODCALLTYPE *GetWords)( - ISpShortcut* This, + ISpShortcut *This, DWORD *pdwGeneration, DWORD *pdwCookie, SPWORDLIST *pWordList); HRESULT (STDMETHODCALLTYPE *GetShortcutsForGeneration)( - ISpShortcut* This, + ISpShortcut *This, DWORD *pdwGeneration, DWORD *pdwCookie, SPSHORTCUTPAIRLIST *pShortcutpairList); HRESULT (STDMETHODCALLTYPE *GetGenerationChange)( - ISpShortcut* This, + ISpShortcut *This, DWORD *pdwGeneration, SPSHORTCUTPAIRLIST *pShortcutpairList); END_INTERFACE } ISpShortcutVtbl; + interface ISpShortcut { CONST_VTBL ISpShortcutVtbl* lpVtbl; }; @@ -6636,83 +6273,6 @@ static FORCEINLINE HRESULT ISpShortcut_GetGenerationChange(ISpShortcut* This,DWO #endif -HRESULT STDMETHODCALLTYPE ISpShortcut_AddShortcut_Proxy( - ISpShortcut* This, - LPCWSTR pszDisplay, - WORD LangID, - LPCWSTR pszSpoken, - SPSHORTCUTTYPE shType); -void __RPC_STUB ISpShortcut_AddShortcut_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpShortcut_RemoveShortcut_Proxy( - ISpShortcut* This, - LPCWSTR pszDisplay, - WORD LangID, - LPCWSTR pszSpoken, - SPSHORTCUTTYPE shType); -void __RPC_STUB ISpShortcut_RemoveShortcut_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpShortcut_GetShortcuts_Proxy( - ISpShortcut* This, - WORD LangID, - SPSHORTCUTPAIRLIST *pShortcutpairList); -void __RPC_STUB ISpShortcut_GetShortcuts_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpShortcut_GetGeneration_Proxy( - ISpShortcut* This, - DWORD *pdwGeneration); -void __RPC_STUB ISpShortcut_GetGeneration_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpShortcut_GetWordsFromGenerationChange_Proxy( - ISpShortcut* This, - DWORD *pdwGeneration, - SPWORDLIST *pWordList); -void __RPC_STUB ISpShortcut_GetWordsFromGenerationChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpShortcut_GetWords_Proxy( - ISpShortcut* This, - DWORD *pdwGeneration, - DWORD *pdwCookie, - SPWORDLIST *pWordList); -void __RPC_STUB ISpShortcut_GetWords_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpShortcut_GetShortcutsForGeneration_Proxy( - ISpShortcut* This, - DWORD *pdwGeneration, - DWORD *pdwCookie, - SPSHORTCUTPAIRLIST *pShortcutpairList); -void __RPC_STUB ISpShortcut_GetShortcutsForGeneration_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpShortcut_GetGenerationChange_Proxy( - ISpShortcut* This, - DWORD *pdwGeneration, - SPSHORTCUTPAIRLIST *pShortcutpairList); -void __RPC_STUB ISpShortcut_GetGenerationChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpShortcut_INTERFACE_DEFINED__ */ @@ -6745,38 +6305,39 @@ typedef struct ISpPhoneConverterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpPhoneConverter* This, + ISpPhoneConverter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpPhoneConverter* This); + ISpPhoneConverter *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpPhoneConverter* This); + ISpPhoneConverter *This); /*** ISpObjectWithToken methods ***/ HRESULT (STDMETHODCALLTYPE *SetObjectToken)( - ISpPhoneConverter* This, + ISpPhoneConverter *This, ISpObjectToken *pToken); HRESULT (STDMETHODCALLTYPE *GetObjectToken)( - ISpPhoneConverter* This, + ISpPhoneConverter *This, ISpObjectToken **ppToken); /*** ISpPhoneConverter methods ***/ HRESULT (STDMETHODCALLTYPE *PhoneToId)( - ISpPhoneConverter* This, + ISpPhoneConverter *This, LPCWSTR pszPhone, SPPHONEID *pId); HRESULT (STDMETHODCALLTYPE *IdToPhone)( - ISpPhoneConverter* This, + ISpPhoneConverter *This, PCSPPHONEID pId, WCHAR *pszPhone); END_INTERFACE } ISpPhoneConverterVtbl; + interface ISpPhoneConverter { CONST_VTBL ISpPhoneConverterVtbl* lpVtbl; }; @@ -6823,24 +6384,6 @@ static FORCEINLINE HRESULT ISpPhoneConverter_IdToPhone(ISpPhoneConverter* This,P #endif -HRESULT STDMETHODCALLTYPE ISpPhoneConverter_PhoneToId_Proxy( - ISpPhoneConverter* This, - LPCWSTR pszPhone, - SPPHONEID *pId); -void __RPC_STUB ISpPhoneConverter_PhoneToId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhoneConverter_IdToPhone_Proxy( - ISpPhoneConverter* This, - PCSPPHONEID pId, - WCHAR *pszPhone); -void __RPC_STUB ISpPhoneConverter_IdToPhone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpPhoneConverter_INTERFACE_DEFINED__ */ @@ -6886,45 +6429,46 @@ typedef struct ISpPhoneticAlphabetConverterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpPhoneticAlphabetConverter* This, + ISpPhoneticAlphabetConverter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpPhoneticAlphabetConverter* This); + ISpPhoneticAlphabetConverter *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpPhoneticAlphabetConverter* This); + ISpPhoneticAlphabetConverter *This); /*** ISpPhoneticAlphabetConverter methods ***/ HRESULT (STDMETHODCALLTYPE *GetLangId)( - ISpPhoneticAlphabetConverter* This, + ISpPhoneticAlphabetConverter *This, WORD *pLangID); HRESULT (STDMETHODCALLTYPE *SetLangId)( - ISpPhoneticAlphabetConverter* This, + ISpPhoneticAlphabetConverter *This, WORD LangID); HRESULT (STDMETHODCALLTYPE *SAPI2UPS)( - ISpPhoneticAlphabetConverter* This, + ISpPhoneticAlphabetConverter *This, const SPPHONEID *pszSAPIId, SPPHONEID *pszUPSId, DWORD cMaxLength); HRESULT (STDMETHODCALLTYPE *UPS2SAPI)( - ISpPhoneticAlphabetConverter* This, + ISpPhoneticAlphabetConverter *This, const SPPHONEID *pszUPSId, SPPHONEID *pszSAPIId, DWORD cMaxLength); HRESULT (STDMETHODCALLTYPE *GetMaxConvertLength)( - ISpPhoneticAlphabetConverter* This, + ISpPhoneticAlphabetConverter *This, DWORD cSrcLength, WINBOOL bSAPI2UPS, DWORD *pcMaxDestLength); END_INTERFACE } ISpPhoneticAlphabetConverterVtbl; + interface ISpPhoneticAlphabetConverter { CONST_VTBL ISpPhoneticAlphabetConverterVtbl* lpVtbl; }; @@ -6973,52 +6517,6 @@ static FORCEINLINE HRESULT ISpPhoneticAlphabetConverter_GetMaxConvertLength(ISpP #endif -HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetConverter_GetLangId_Proxy( - ISpPhoneticAlphabetConverter* This, - WORD *pLangID); -void __RPC_STUB ISpPhoneticAlphabetConverter_GetLangId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetConverter_SetLangId_Proxy( - ISpPhoneticAlphabetConverter* This, - WORD LangID); -void __RPC_STUB ISpPhoneticAlphabetConverter_SetLangId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetConverter_SAPI2UPS_Proxy( - ISpPhoneticAlphabetConverter* This, - const SPPHONEID *pszSAPIId, - SPPHONEID *pszUPSId, - DWORD cMaxLength); -void __RPC_STUB ISpPhoneticAlphabetConverter_SAPI2UPS_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetConverter_UPS2SAPI_Proxy( - ISpPhoneticAlphabetConverter* This, - const SPPHONEID *pszUPSId, - SPPHONEID *pszSAPIId, - DWORD cMaxLength); -void __RPC_STUB ISpPhoneticAlphabetConverter_UPS2SAPI_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetConverter_GetMaxConvertLength_Proxy( - ISpPhoneticAlphabetConverter* This, - DWORD cSrcLength, - WINBOOL bSAPI2UPS, - DWORD *pcMaxDestLength); -void __RPC_STUB ISpPhoneticAlphabetConverter_GetMaxConvertLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpPhoneticAlphabetConverter_INTERFACE_DEFINED__ */ @@ -7049,27 +6547,28 @@ typedef struct ISpPhoneticAlphabetSelectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpPhoneticAlphabetSelection* This, + ISpPhoneticAlphabetSelection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpPhoneticAlphabetSelection* This); + ISpPhoneticAlphabetSelection *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpPhoneticAlphabetSelection* This); + ISpPhoneticAlphabetSelection *This); /*** ISpPhoneticAlphabetSelection methods ***/ HRESULT (STDMETHODCALLTYPE *IsAlphabetUPS)( - ISpPhoneticAlphabetSelection* This, + ISpPhoneticAlphabetSelection *This, WINBOOL *pfIsUPS); HRESULT (STDMETHODCALLTYPE *SetAlphabetToUPS)( - ISpPhoneticAlphabetSelection* This, + ISpPhoneticAlphabetSelection *This, WINBOOL fForceUPS); END_INTERFACE } ISpPhoneticAlphabetSelectionVtbl; + interface ISpPhoneticAlphabetSelection { CONST_VTBL ISpPhoneticAlphabetSelectionVtbl* lpVtbl; }; @@ -7106,22 +6605,6 @@ static FORCEINLINE HRESULT ISpPhoneticAlphabetSelection_SetAlphabetToUPS(ISpPhon #endif -HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetSelection_IsAlphabetUPS_Proxy( - ISpPhoneticAlphabetSelection* This, - WINBOOL *pfIsUPS); -void __RPC_STUB ISpPhoneticAlphabetSelection_IsAlphabetUPS_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetSelection_SetAlphabetToUPS_Proxy( - ISpPhoneticAlphabetSelection* This, - WINBOOL fForceUPS); -void __RPC_STUB ISpPhoneticAlphabetSelection_SetAlphabetToUPS_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpPhoneticAlphabetSelection_INTERFACE_DEFINED__ */ @@ -7290,173 +6773,173 @@ typedef struct ISpVoiceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpVoice* This, + ISpVoice *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpVoice* This); + ISpVoice *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpVoice* This); + ISpVoice *This); /*** ISpNotifySource methods ***/ HRESULT (STDMETHODCALLTYPE *SetNotifySink)( - ISpVoice* This, + ISpVoice *This, ISpNotifySink *pNotifySink); HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)( - ISpVoice* This, + ISpVoice *This, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)( - ISpVoice* This, + ISpVoice *This, SPNOTIFYCALLBACK *pfnCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)( - ISpVoice* This, + ISpVoice *This, ISpNotifyCallback *pSpCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)( - ISpVoice* This); + ISpVoice *This); HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)( - ISpVoice* This, + ISpVoice *This, DWORD dwMilliseconds); HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)( - ISpVoice* This); + ISpVoice *This); /*** ISpEventSource methods ***/ HRESULT (STDMETHODCALLTYPE *SetInterest)( - ISpVoice* This, + ISpVoice *This, ULONGLONG ullEventInterest, ULONGLONG ullQueuedInterest); HRESULT (STDMETHODCALLTYPE *GetEvents)( - ISpVoice* This, + ISpVoice *This, ULONG ulCount, SPEVENT *pEventArray, ULONG *pulFetched); HRESULT (STDMETHODCALLTYPE *GetInfo)( - ISpVoice* This, + ISpVoice *This, SPEVENTSOURCEINFO *pInfo); /*** ISpVoice methods ***/ HRESULT (STDMETHODCALLTYPE *SetOutput)( - ISpVoice* This, + ISpVoice *This, IUnknown *pUnkOutput, WINBOOL fAllowFormatChanges); HRESULT (STDMETHODCALLTYPE *GetOutputObjectToken)( - ISpVoice* This, + ISpVoice *This, ISpObjectToken **ppObjectToken); HRESULT (STDMETHODCALLTYPE *GetOutputStream)( - ISpVoice* This, + ISpVoice *This, ISpStreamFormat **ppStream); HRESULT (STDMETHODCALLTYPE *Pause)( - ISpVoice* This); + ISpVoice *This); HRESULT (STDMETHODCALLTYPE *Resume)( - ISpVoice* This); + ISpVoice *This); HRESULT (STDMETHODCALLTYPE *SetVoice)( - ISpVoice* This, + ISpVoice *This, ISpObjectToken *pToken); HRESULT (STDMETHODCALLTYPE *GetVoice)( - ISpVoice* This, + ISpVoice *This, ISpObjectToken **ppToken); HRESULT (STDMETHODCALLTYPE *Speak)( - ISpVoice* This, + ISpVoice *This, LPCWSTR pwcs, DWORD dwFlags, ULONG *pulStreamNumber); HRESULT (STDMETHODCALLTYPE *SpeakStream)( - ISpVoice* This, + ISpVoice *This, IStream *pStream, DWORD dwFlags, ULONG *pulStreamNumber); HRESULT (STDMETHODCALLTYPE *GetStatus)( - ISpVoice* This, + ISpVoice *This, SPVOICESTATUS *pStatus, LPWSTR *ppszLastBookmark); HRESULT (STDMETHODCALLTYPE *Skip)( - ISpVoice* This, + ISpVoice *This, LPCWSTR pItemType, LONG lNumItems, ULONG *pulNumSkipped); HRESULT (STDMETHODCALLTYPE *SetPriority)( - ISpVoice* This, + ISpVoice *This, SPVPRIORITY ePriority); HRESULT (STDMETHODCALLTYPE *GetPriority)( - ISpVoice* This, + ISpVoice *This, SPVPRIORITY *pePriority); HRESULT (STDMETHODCALLTYPE *SetAlertBoundary)( - ISpVoice* This, + ISpVoice *This, SPEVENTENUM eBoundary); HRESULT (STDMETHODCALLTYPE *GetAlertBoundary)( - ISpVoice* This, + ISpVoice *This, SPEVENTENUM *peBoundary); HRESULT (STDMETHODCALLTYPE *SetRate)( - ISpVoice* This, + ISpVoice *This, LONG RateAdjust); HRESULT (STDMETHODCALLTYPE *GetRate)( - ISpVoice* This, + ISpVoice *This, LONG *pRateAdjust); HRESULT (STDMETHODCALLTYPE *SetVolume)( - ISpVoice* This, + ISpVoice *This, USHORT usVolume); HRESULT (STDMETHODCALLTYPE *GetVolume)( - ISpVoice* This, + ISpVoice *This, USHORT *pusVolume); HRESULT (STDMETHODCALLTYPE *WaitUntilDone)( - ISpVoice* This, + ISpVoice *This, ULONG msTimeout); HRESULT (STDMETHODCALLTYPE *SetSyncSpeakTimeout)( - ISpVoice* This, + ISpVoice *This, ULONG msTimeout); HRESULT (STDMETHODCALLTYPE *GetSyncSpeakTimeout)( - ISpVoice* This, + ISpVoice *This, ULONG *pmsTimeout); HANDLE (STDMETHODCALLTYPE *SpeakCompleteEvent)( - ISpVoice* This); + ISpVoice *This); HRESULT (STDMETHODCALLTYPE *IsUISupported)( - ISpVoice* This, + ISpVoice *This, LPCWSTR pszTypeOfUI, void *pvExtraData, ULONG cbExtraData, WINBOOL *pfSupported); HRESULT (STDMETHODCALLTYPE *DisplayUI)( - ISpVoice* This, + ISpVoice *This, HWND hwndParent, LPCWSTR pszTitle, LPCWSTR pszTypeOfUI, @@ -7465,6 +6948,7 @@ typedef struct ISpVoiceVtbl { END_INTERFACE } ISpVoiceVtbl; + interface ISpVoice { CONST_VTBL ISpVoiceVtbl* lpVtbl; }; @@ -7637,188 +7121,6 @@ static FORCEINLINE HRESULT ISpVoice_DisplayUI(ISpVoice* This,HWND hwndParent,LPC #endif -HRESULT STDMETHODCALLTYPE ISpVoice_SetOutput_Proxy( - ISpVoice* This, - IUnknown *pUnkOutput, - WINBOOL fAllowFormatChanges); -void __RPC_STUB ISpVoice_SetOutput_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetOutputObjectToken_Proxy( - ISpVoice* This, - ISpObjectToken **ppObjectToken); -void __RPC_STUB ISpVoice_GetOutputObjectToken_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetOutputStream_Proxy( - ISpVoice* This, - ISpStreamFormat **ppStream); -void __RPC_STUB ISpVoice_GetOutputStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_Pause_Proxy( - ISpVoice* This); -void __RPC_STUB ISpVoice_Pause_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_Resume_Proxy( - ISpVoice* This); -void __RPC_STUB ISpVoice_Resume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_SetVoice_Proxy( - ISpVoice* This, - ISpObjectToken *pToken); -void __RPC_STUB ISpVoice_SetVoice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetVoice_Proxy( - ISpVoice* This, - ISpObjectToken **ppToken); -void __RPC_STUB ISpVoice_GetVoice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_Speak_Proxy( - ISpVoice* This, - LPCWSTR pwcs, - DWORD dwFlags, - ULONG *pulStreamNumber); -void __RPC_STUB ISpVoice_Speak_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_SpeakStream_Proxy( - ISpVoice* This, - IStream *pStream, - DWORD dwFlags, - ULONG *pulStreamNumber); -void __RPC_STUB ISpVoice_SpeakStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetStatus_Proxy( - ISpVoice* This, - SPVOICESTATUS *pStatus, - LPWSTR *ppszLastBookmark); -void __RPC_STUB ISpVoice_GetStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_Skip_Proxy( - ISpVoice* This, - LPCWSTR pItemType, - LONG lNumItems, - ULONG *pulNumSkipped); -void __RPC_STUB ISpVoice_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_SetPriority_Proxy( - ISpVoice* This, - SPVPRIORITY ePriority); -void __RPC_STUB ISpVoice_SetPriority_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetPriority_Proxy( - ISpVoice* This, - SPVPRIORITY *pePriority); -void __RPC_STUB ISpVoice_GetPriority_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_SetAlertBoundary_Proxy( - ISpVoice* This, - SPEVENTENUM eBoundary); -void __RPC_STUB ISpVoice_SetAlertBoundary_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetAlertBoundary_Proxy( - ISpVoice* This, - SPEVENTENUM *peBoundary); -void __RPC_STUB ISpVoice_GetAlertBoundary_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_SetRate_Proxy( - ISpVoice* This, - LONG RateAdjust); -void __RPC_STUB ISpVoice_SetRate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetRate_Proxy( - ISpVoice* This, - LONG *pRateAdjust); -void __RPC_STUB ISpVoice_GetRate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_SetVolume_Proxy( - ISpVoice* This, - USHORT usVolume); -void __RPC_STUB ISpVoice_SetVolume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetVolume_Proxy( - ISpVoice* This, - USHORT *pusVolume); -void __RPC_STUB ISpVoice_GetVolume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_WaitUntilDone_Proxy( - ISpVoice* This, - ULONG msTimeout); -void __RPC_STUB ISpVoice_WaitUntilDone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_SetSyncSpeakTimeout_Proxy( - ISpVoice* This, - ULONG msTimeout); -void __RPC_STUB ISpVoice_SetSyncSpeakTimeout_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetSyncSpeakTimeout_Proxy( - ISpVoice* This, - ULONG *pmsTimeout); -void __RPC_STUB ISpVoice_GetSyncSpeakTimeout_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpVoice_INTERFACE_DEFINED__ */ @@ -7859,27 +7161,27 @@ typedef struct ISpPhraseVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpPhrase* This, + ISpPhrase *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpPhrase* This); + ISpPhrase *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpPhrase* This); + ISpPhrase *This); /*** ISpPhrase methods ***/ HRESULT (STDMETHODCALLTYPE *GetPhrase)( - ISpPhrase* This, + ISpPhrase *This, SPPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)( - ISpPhrase* This, + ISpPhrase *This, SPSERIALIZEDPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetText)( - ISpPhrase* This, + ISpPhrase *This, ULONG ulStart, ULONG ulCount, WINBOOL fUseTextReplacements, @@ -7887,11 +7189,12 @@ typedef struct ISpPhraseVtbl { BYTE *pbDisplayAttributes); HRESULT (STDMETHODCALLTYPE *Discard)( - ISpPhrase* This, + ISpPhrase *This, DWORD dwValueTypes); END_INTERFACE } ISpPhraseVtbl; + interface ISpPhrase { CONST_VTBL ISpPhraseVtbl* lpVtbl; }; @@ -7936,42 +7239,6 @@ static FORCEINLINE HRESULT ISpPhrase_Discard(ISpPhrase* This,DWORD dwValueTypes) #endif -HRESULT STDMETHODCALLTYPE ISpPhrase_GetPhrase_Proxy( - ISpPhrase* This, - SPPHRASE **ppCoMemPhrase); -void __RPC_STUB ISpPhrase_GetPhrase_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhrase_GetSerializedPhrase_Proxy( - ISpPhrase* This, - SPSERIALIZEDPHRASE **ppCoMemPhrase); -void __RPC_STUB ISpPhrase_GetSerializedPhrase_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhrase_GetText_Proxy( - ISpPhrase* This, - ULONG ulStart, - ULONG ulCount, - WINBOOL fUseTextReplacements, - LPWSTR *ppszCoMemText, - BYTE *pbDisplayAttributes); -void __RPC_STUB ISpPhrase_GetText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhrase_Discard_Proxy( - ISpPhrase* This, - DWORD dwValueTypes); -void __RPC_STUB ISpPhrase_Discard_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpPhrase_INTERFACE_DEFINED__ */ @@ -8005,27 +7272,27 @@ typedef struct ISpPhraseAltVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpPhraseAlt* This, + ISpPhraseAlt *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpPhraseAlt* This); + ISpPhraseAlt *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpPhraseAlt* This); + ISpPhraseAlt *This); /*** ISpPhrase methods ***/ HRESULT (STDMETHODCALLTYPE *GetPhrase)( - ISpPhraseAlt* This, + ISpPhraseAlt *This, SPPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)( - ISpPhraseAlt* This, + ISpPhraseAlt *This, SPSERIALIZEDPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetText)( - ISpPhraseAlt* This, + ISpPhraseAlt *This, ULONG ulStart, ULONG ulCount, WINBOOL fUseTextReplacements, @@ -8033,22 +7300,23 @@ typedef struct ISpPhraseAltVtbl { BYTE *pbDisplayAttributes); HRESULT (STDMETHODCALLTYPE *Discard)( - ISpPhraseAlt* This, + ISpPhraseAlt *This, DWORD dwValueTypes); /*** ISpPhraseAlt methods ***/ HRESULT (STDMETHODCALLTYPE *GetAltInfo)( - ISpPhraseAlt* This, + ISpPhraseAlt *This, ISpPhrase **ppParent, ULONG *pulStartElementInParent, ULONG *pcElementsInParent, ULONG *pcElementsInAlt); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpPhraseAlt* This); + ISpPhraseAlt *This); END_INTERFACE } ISpPhraseAltVtbl; + interface ISpPhraseAlt { CONST_VTBL ISpPhraseAltVtbl* lpVtbl; }; @@ -8103,24 +7371,6 @@ static FORCEINLINE HRESULT ISpPhraseAlt_Commit(ISpPhraseAlt* This) { #endif -HRESULT STDMETHODCALLTYPE ISpPhraseAlt_GetAltInfo_Proxy( - ISpPhraseAlt* This, - ISpPhrase **ppParent, - ULONG *pulStartElementInParent, - ULONG *pcElementsInParent, - ULONG *pcElementsInAlt); -void __RPC_STUB ISpPhraseAlt_GetAltInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhraseAlt_Commit_Proxy( - ISpPhraseAlt* This); -void __RPC_STUB ISpPhraseAlt_Commit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpPhraseAlt_INTERFACE_DEFINED__ */ @@ -8161,27 +7411,27 @@ typedef struct ISpPhrase2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpPhrase2* This, + ISpPhrase2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpPhrase2* This); + ISpPhrase2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpPhrase2* This); + ISpPhrase2 *This); /*** ISpPhrase methods ***/ HRESULT (STDMETHODCALLTYPE *GetPhrase)( - ISpPhrase2* This, + ISpPhrase2 *This, SPPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)( - ISpPhrase2* This, + ISpPhrase2 *This, SPSERIALIZEDPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetText)( - ISpPhrase2* This, + ISpPhrase2 *This, ULONG ulStart, ULONG ulCount, WINBOOL fUseTextReplacements, @@ -8189,27 +7439,28 @@ typedef struct ISpPhrase2Vtbl { BYTE *pbDisplayAttributes); HRESULT (STDMETHODCALLTYPE *Discard)( - ISpPhrase2* This, + ISpPhrase2 *This, DWORD dwValueTypes); /*** ISpPhrase2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetXMLResult)( - ISpPhrase2* This, + ISpPhrase2 *This, LPWSTR *ppszCoMemXMLResult, SPXMLRESULTOPTIONS Options); HRESULT (STDMETHODCALLTYPE *GetXMLErrorInfo)( - ISpPhrase2* This, + ISpPhrase2 *This, SPSEMANTICERRORINFO *pSemanticErrorInfo); HRESULT (STDMETHODCALLTYPE *GetAudio)( - ISpPhrase2* This, + ISpPhrase2 *This, ULONG ulStartElement, ULONG cElements, ISpStreamFormat **ppStream); END_INTERFACE } ISpPhrase2Vtbl; + interface ISpPhrase2 { CONST_VTBL ISpPhrase2Vtbl* lpVtbl; }; @@ -8268,33 +7519,6 @@ static FORCEINLINE HRESULT ISpPhrase2_GetAudio(ISpPhrase2* This,ULONG ulStartEle #endif -HRESULT STDMETHODCALLTYPE ISpPhrase2_GetXMLResult_Proxy( - ISpPhrase2* This, - LPWSTR *ppszCoMemXMLResult, - SPXMLRESULTOPTIONS Options); -void __RPC_STUB ISpPhrase2_GetXMLResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhrase2_GetXMLErrorInfo_Proxy( - ISpPhrase2* This, - SPSEMANTICERRORINFO *pSemanticErrorInfo); -void __RPC_STUB ISpPhrase2_GetXMLErrorInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhrase2_GetAudio_Proxy( - ISpPhrase2* This, - ULONG ulStartElement, - ULONG cElements, - ISpStreamFormat **ppStream); -void __RPC_STUB ISpPhrase2_GetAudio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpPhrase2_INTERFACE_DEFINED__ */ @@ -8359,27 +7583,27 @@ typedef struct ISpRecoResultVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRecoResult* This, + ISpRecoResult *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRecoResult* This); + ISpRecoResult *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRecoResult* This); + ISpRecoResult *This); /*** ISpPhrase methods ***/ HRESULT (STDMETHODCALLTYPE *GetPhrase)( - ISpRecoResult* This, + ISpRecoResult *This, SPPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)( - ISpRecoResult* This, + ISpRecoResult *This, SPSERIALIZEDPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetText)( - ISpRecoResult* This, + ISpRecoResult *This, ULONG ulStart, ULONG ulCount, WINBOOL fUseTextReplacements, @@ -8387,16 +7611,16 @@ typedef struct ISpRecoResultVtbl { BYTE *pbDisplayAttributes); HRESULT (STDMETHODCALLTYPE *Discard)( - ISpRecoResult* This, + ISpRecoResult *This, DWORD dwValueTypes); /*** ISpRecoResult methods ***/ HRESULT (STDMETHODCALLTYPE *GetResultTimes)( - ISpRecoResult* This, + ISpRecoResult *This, SPRECORESULTTIMES *pTimes); HRESULT (STDMETHODCALLTYPE *GetAlternates)( - ISpRecoResult* This, + ISpRecoResult *This, ULONG ulStartElement, ULONG cElements, ULONG ulRequestCount, @@ -8404,33 +7628,34 @@ typedef struct ISpRecoResultVtbl { ULONG *pcPhrasesReturned); HRESULT (STDMETHODCALLTYPE *GetAudio)( - ISpRecoResult* This, + ISpRecoResult *This, ULONG ulStartElement, ULONG cElements, ISpStreamFormat **ppStream); HRESULT (STDMETHODCALLTYPE *SpeakAudio)( - ISpRecoResult* This, + ISpRecoResult *This, ULONG ulStartElement, ULONG cElements, DWORD dwFlags, ULONG *pulStreamNumber); HRESULT (STDMETHODCALLTYPE *Serialize)( - ISpRecoResult* This, + ISpRecoResult *This, SPSERIALIZEDRESULT **ppCoMemSerializedResult); HRESULT (STDMETHODCALLTYPE *ScaleAudio)( - ISpRecoResult* This, + ISpRecoResult *This, const GUID *pAudioFormatId, const WAVEFORMATEX *pWaveFormatEx); HRESULT (STDMETHODCALLTYPE *GetRecoContext)( - ISpRecoResult* This, + ISpRecoResult *This, ISpRecoContext **ppRecoContext); END_INTERFACE } ISpRecoResultVtbl; + interface ISpRecoResult { CONST_VTBL ISpRecoResultVtbl* lpVtbl; }; @@ -8505,72 +7730,6 @@ static FORCEINLINE HRESULT ISpRecoResult_GetRecoContext(ISpRecoResult* This,ISpR #endif -HRESULT STDMETHODCALLTYPE ISpRecoResult_GetResultTimes_Proxy( - ISpRecoResult* This, - SPRECORESULTTIMES *pTimes); -void __RPC_STUB ISpRecoResult_GetResultTimes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoResult_GetAlternates_Proxy( - ISpRecoResult* This, - ULONG ulStartElement, - ULONG cElements, - ULONG ulRequestCount, - ISpPhraseAlt **ppPhrases, - ULONG *pcPhrasesReturned); -void __RPC_STUB ISpRecoResult_GetAlternates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoResult_GetAudio_Proxy( - ISpRecoResult* This, - ULONG ulStartElement, - ULONG cElements, - ISpStreamFormat **ppStream); -void __RPC_STUB ISpRecoResult_GetAudio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoResult_SpeakAudio_Proxy( - ISpRecoResult* This, - ULONG ulStartElement, - ULONG cElements, - DWORD dwFlags, - ULONG *pulStreamNumber); -void __RPC_STUB ISpRecoResult_SpeakAudio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoResult_Serialize_Proxy( - ISpRecoResult* This, - SPSERIALIZEDRESULT **ppCoMemSerializedResult); -void __RPC_STUB ISpRecoResult_Serialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoResult_ScaleAudio_Proxy( - ISpRecoResult* This, - const GUID *pAudioFormatId, - const WAVEFORMATEX *pWaveFormatEx); -void __RPC_STUB ISpRecoResult_ScaleAudio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoResult_GetRecoContext_Proxy( - ISpRecoResult* This, - ISpRecoContext **ppRecoContext); -void __RPC_STUB ISpRecoResult_GetRecoContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpRecoResult_INTERFACE_DEFINED__ */ @@ -8614,27 +7773,27 @@ typedef struct ISpRecoResult2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRecoResult2* This, + ISpRecoResult2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRecoResult2* This); + ISpRecoResult2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRecoResult2* This); + ISpRecoResult2 *This); /*** ISpPhrase methods ***/ HRESULT (STDMETHODCALLTYPE *GetPhrase)( - ISpRecoResult2* This, + ISpRecoResult2 *This, SPPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)( - ISpRecoResult2* This, + ISpRecoResult2 *This, SPSERIALIZEDPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetText)( - ISpRecoResult2* This, + ISpRecoResult2 *This, ULONG ulStart, ULONG ulCount, WINBOOL fUseTextReplacements, @@ -8642,16 +7801,16 @@ typedef struct ISpRecoResult2Vtbl { BYTE *pbDisplayAttributes); HRESULT (STDMETHODCALLTYPE *Discard)( - ISpRecoResult2* This, + ISpRecoResult2 *This, DWORD dwValueTypes); /*** ISpRecoResult methods ***/ HRESULT (STDMETHODCALLTYPE *GetResultTimes)( - ISpRecoResult2* This, + ISpRecoResult2 *This, SPRECORESULTTIMES *pTimes); HRESULT (STDMETHODCALLTYPE *GetAlternates)( - ISpRecoResult2* This, + ISpRecoResult2 *This, ULONG ulStartElement, ULONG cElements, ULONG ulRequestCount, @@ -8659,51 +7818,52 @@ typedef struct ISpRecoResult2Vtbl { ULONG *pcPhrasesReturned); HRESULT (STDMETHODCALLTYPE *GetAudio)( - ISpRecoResult2* This, + ISpRecoResult2 *This, ULONG ulStartElement, ULONG cElements, ISpStreamFormat **ppStream); HRESULT (STDMETHODCALLTYPE *SpeakAudio)( - ISpRecoResult2* This, + ISpRecoResult2 *This, ULONG ulStartElement, ULONG cElements, DWORD dwFlags, ULONG *pulStreamNumber); HRESULT (STDMETHODCALLTYPE *Serialize)( - ISpRecoResult2* This, + ISpRecoResult2 *This, SPSERIALIZEDRESULT **ppCoMemSerializedResult); HRESULT (STDMETHODCALLTYPE *ScaleAudio)( - ISpRecoResult2* This, + ISpRecoResult2 *This, const GUID *pAudioFormatId, const WAVEFORMATEX *pWaveFormatEx); HRESULT (STDMETHODCALLTYPE *GetRecoContext)( - ISpRecoResult2* This, + ISpRecoResult2 *This, ISpRecoContext **ppRecoContext); /*** ISpRecoResult2 methods ***/ HRESULT (STDMETHODCALLTYPE *CommitAlternate)( - ISpRecoResult2* This, + ISpRecoResult2 *This, ISpPhraseAlt *pPhraseAlt, ISpRecoResult **ppNewResult); HRESULT (STDMETHODCALLTYPE *CommitText)( - ISpRecoResult2* This, + ISpRecoResult2 *This, ULONG ulStartElement, ULONG cElements, LPCWSTR pszCorrectedData, DWORD eCommitFlags); HRESULT (STDMETHODCALLTYPE *SetTextFeedback)( - ISpRecoResult2* This, + ISpRecoResult2 *This, LPCWSTR pszFeedback, WINBOOL fSuccessful); END_INTERFACE } ISpRecoResult2Vtbl; + interface ISpRecoResult2 { CONST_VTBL ISpRecoResult2Vtbl* lpVtbl; }; @@ -8792,35 +7952,6 @@ static FORCEINLINE HRESULT ISpRecoResult2_SetTextFeedback(ISpRecoResult2* This,L #endif -HRESULT STDMETHODCALLTYPE ISpRecoResult2_CommitAlternate_Proxy( - ISpRecoResult2* This, - ISpPhraseAlt *pPhraseAlt, - ISpRecoResult **ppNewResult); -void __RPC_STUB ISpRecoResult2_CommitAlternate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoResult2_CommitText_Proxy( - ISpRecoResult2* This, - ULONG ulStartElement, - ULONG cElements, - LPCWSTR pszCorrectedData, - DWORD eCommitFlags); -void __RPC_STUB ISpRecoResult2_CommitText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoResult2_SetTextFeedback_Proxy( - ISpRecoResult2* This, - LPCWSTR pszFeedback, - WINBOOL fSuccessful); -void __RPC_STUB ISpRecoResult2_SetTextFeedback_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpRecoResult2_INTERFACE_DEFINED__ */ @@ -8852,27 +7983,27 @@ typedef struct ISpXMLRecoResultVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpXMLRecoResult* This); + ISpXMLRecoResult *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpXMLRecoResult* This); + ISpXMLRecoResult *This); /*** ISpPhrase methods ***/ HRESULT (STDMETHODCALLTYPE *GetPhrase)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, SPPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, SPSERIALIZEDPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetText)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, ULONG ulStart, ULONG ulCount, WINBOOL fUseTextReplacements, @@ -8880,16 +8011,16 @@ typedef struct ISpXMLRecoResultVtbl { BYTE *pbDisplayAttributes); HRESULT (STDMETHODCALLTYPE *Discard)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, DWORD dwValueTypes); /*** ISpRecoResult methods ***/ HRESULT (STDMETHODCALLTYPE *GetResultTimes)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, SPRECORESULTTIMES *pTimes); HRESULT (STDMETHODCALLTYPE *GetAlternates)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, ULONG ulStartElement, ULONG cElements, ULONG ulRequestCount, @@ -8897,43 +8028,44 @@ typedef struct ISpXMLRecoResultVtbl { ULONG *pcPhrasesReturned); HRESULT (STDMETHODCALLTYPE *GetAudio)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, ULONG ulStartElement, ULONG cElements, ISpStreamFormat **ppStream); HRESULT (STDMETHODCALLTYPE *SpeakAudio)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, ULONG ulStartElement, ULONG cElements, DWORD dwFlags, ULONG *pulStreamNumber); HRESULT (STDMETHODCALLTYPE *Serialize)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, SPSERIALIZEDRESULT **ppCoMemSerializedResult); HRESULT (STDMETHODCALLTYPE *ScaleAudio)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, const GUID *pAudioFormatId, const WAVEFORMATEX *pWaveFormatEx); HRESULT (STDMETHODCALLTYPE *GetRecoContext)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, ISpRecoContext **ppRecoContext); /*** ISpXMLRecoResult methods ***/ HRESULT (STDMETHODCALLTYPE *GetXMLResult)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, LPWSTR *ppszCoMemXMLResult, SPXMLRESULTOPTIONS Options); HRESULT (STDMETHODCALLTYPE *GetXMLErrorInfo)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, SPSEMANTICERRORINFO *pSemanticErrorInfo); END_INTERFACE } ISpXMLRecoResultVtbl; + interface ISpXMLRecoResult { CONST_VTBL ISpXMLRecoResultVtbl* lpVtbl; }; @@ -9018,23 +8150,6 @@ static FORCEINLINE HRESULT ISpXMLRecoResult_GetXMLErrorInfo(ISpXMLRecoResult* Th #endif -HRESULT STDMETHODCALLTYPE ISpXMLRecoResult_GetXMLResult_Proxy( - ISpXMLRecoResult* This, - LPWSTR *ppszCoMemXMLResult, - SPXMLRESULTOPTIONS Options); -void __RPC_STUB ISpXMLRecoResult_GetXMLResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpXMLRecoResult_GetXMLErrorInfo_Proxy( - ISpXMLRecoResult* This, - SPSEMANTICERRORINFO *pSemanticErrorInfo); -void __RPC_STUB ISpXMLRecoResult_GetXMLErrorInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpXMLRecoResult_INTERFACE_DEFINED__ */ @@ -9156,23 +8271,23 @@ typedef struct ISpGrammarBuilderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpGrammarBuilder* This); + ISpGrammarBuilder *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpGrammarBuilder* This); + ISpGrammarBuilder *This); /*** ISpGrammarBuilder methods ***/ HRESULT (STDMETHODCALLTYPE *ResetGrammar)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, WORD NewLanguage); HRESULT (STDMETHODCALLTYPE *GetRule)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, LPCWSTR pszRuleName, DWORD dwRuleId, DWORD dwAttributes, @@ -9180,16 +8295,16 @@ typedef struct ISpGrammarBuilderVtbl { SPSTATEHANDLE *phInitialState); HRESULT (STDMETHODCALLTYPE *ClearRule)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, SPSTATEHANDLE hState); HRESULT (STDMETHODCALLTYPE *CreateNewState)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, SPSTATEHANDLE hState, SPSTATEHANDLE *phState); HRESULT (STDMETHODCALLTYPE *AddWordTransition)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, SPSTATEHANDLE hFromState, SPSTATEHANDLE hToState, LPCWSTR psz, @@ -9199,7 +8314,7 @@ typedef struct ISpGrammarBuilderVtbl { const SPPROPERTYINFO *pPropInfo); HRESULT (STDMETHODCALLTYPE *AddRuleTransition)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, SPSTATEHANDLE hFromState, SPSTATEHANDLE hToState, SPSTATEHANDLE hRule, @@ -9207,17 +8322,18 @@ typedef struct ISpGrammarBuilderVtbl { const SPPROPERTYINFO *pPropInfo); HRESULT (STDMETHODCALLTYPE *AddResource)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, SPSTATEHANDLE hRuleState, LPCWSTR pszResourceName, LPCWSTR pszResourceValue); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, DWORD dwReserved); END_INTERFACE } ISpGrammarBuilderVtbl; + interface ISpGrammarBuilder { CONST_VTBL ISpGrammarBuilderVtbl* lpVtbl; }; @@ -9278,87 +8394,6 @@ static FORCEINLINE HRESULT ISpGrammarBuilder_Commit(ISpGrammarBuilder* This,DWOR #endif -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_ResetGrammar_Proxy( - ISpGrammarBuilder* This, - WORD NewLanguage); -void __RPC_STUB ISpGrammarBuilder_ResetGrammar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_GetRule_Proxy( - ISpGrammarBuilder* This, - LPCWSTR pszRuleName, - DWORD dwRuleId, - DWORD dwAttributes, - WINBOOL fCreateIfNotExist, - SPSTATEHANDLE *phInitialState); -void __RPC_STUB ISpGrammarBuilder_GetRule_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_ClearRule_Proxy( - ISpGrammarBuilder* This, - SPSTATEHANDLE hState); -void __RPC_STUB ISpGrammarBuilder_ClearRule_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_CreateNewState_Proxy( - ISpGrammarBuilder* This, - SPSTATEHANDLE hState, - SPSTATEHANDLE *phState); -void __RPC_STUB ISpGrammarBuilder_CreateNewState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_AddWordTransition_Proxy( - ISpGrammarBuilder* This, - SPSTATEHANDLE hFromState, - SPSTATEHANDLE hToState, - LPCWSTR psz, - LPCWSTR pszSeparators, - SPGRAMMARWORDTYPE eWordType, - float Weight, - const SPPROPERTYINFO *pPropInfo); -void __RPC_STUB ISpGrammarBuilder_AddWordTransition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_AddRuleTransition_Proxy( - ISpGrammarBuilder* This, - SPSTATEHANDLE hFromState, - SPSTATEHANDLE hToState, - SPSTATEHANDLE hRule, - float Weight, - const SPPROPERTYINFO *pPropInfo); -void __RPC_STUB ISpGrammarBuilder_AddRuleTransition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_AddResource_Proxy( - ISpGrammarBuilder* This, - SPSTATEHANDLE hRuleState, - LPCWSTR pszResourceName, - LPCWSTR pszResourceValue); -void __RPC_STUB ISpGrammarBuilder_AddResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_Commit_Proxy( - ISpGrammarBuilder* This, - DWORD dwReserved); -void __RPC_STUB ISpGrammarBuilder_Commit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpGrammarBuilder_INTERFACE_DEFINED__ */ @@ -9461,23 +8496,23 @@ typedef struct ISpRecoGrammarVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRecoGrammar* This); + ISpRecoGrammar *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRecoGrammar* This); + ISpRecoGrammar *This); /*** ISpGrammarBuilder methods ***/ HRESULT (STDMETHODCALLTYPE *ResetGrammar)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, WORD NewLanguage); HRESULT (STDMETHODCALLTYPE *GetRule)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, LPCWSTR pszRuleName, DWORD dwRuleId, DWORD dwAttributes, @@ -9485,16 +8520,16 @@ typedef struct ISpRecoGrammarVtbl { SPSTATEHANDLE *phInitialState); HRESULT (STDMETHODCALLTYPE *ClearRule)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, SPSTATEHANDLE hState); HRESULT (STDMETHODCALLTYPE *CreateNewState)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, SPSTATEHANDLE hState, SPSTATEHANDLE *phState); HRESULT (STDMETHODCALLTYPE *AddWordTransition)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, SPSTATEHANDLE hFromState, SPSTATEHANDLE hToState, LPCWSTR psz, @@ -9504,7 +8539,7 @@ typedef struct ISpRecoGrammarVtbl { const SPPROPERTYINFO *pPropInfo); HRESULT (STDMETHODCALLTYPE *AddRuleTransition)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, SPSTATEHANDLE hFromState, SPSTATEHANDLE hToState, SPSTATEHANDLE hRule, @@ -9512,37 +8547,37 @@ typedef struct ISpRecoGrammarVtbl { const SPPROPERTYINFO *pPropInfo); HRESULT (STDMETHODCALLTYPE *AddResource)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, SPSTATEHANDLE hRuleState, LPCWSTR pszResourceName, LPCWSTR pszResourceValue); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, DWORD dwReserved); /*** ISpRecoGrammar methods ***/ HRESULT (STDMETHODCALLTYPE *GetGrammarId)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, ULONGLONG *pullGrammarId); HRESULT (STDMETHODCALLTYPE *GetRecoContext)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, ISpRecoContext **ppRecoCtxt); HRESULT (STDMETHODCALLTYPE *LoadCmdFromFile)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, LPCWSTR pszFileName, SPLOADOPTIONS Options); HRESULT (STDMETHODCALLTYPE *LoadCmdFromObject)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, REFCLSID rcid, LPCWSTR pszGrammarName, SPLOADOPTIONS Options); HRESULT (STDMETHODCALLTYPE *LoadCmdFromResource)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, HMODULE hModule, LPCWSTR pszResourceName, LPCWSTR pszResourceType, @@ -9550,12 +8585,12 @@ typedef struct ISpRecoGrammarVtbl { SPLOADOPTIONS Options); HRESULT (STDMETHODCALLTYPE *LoadCmdFromMemory)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, const SPBINARYGRAMMAR *pGrammar, SPLOADOPTIONS Options); HRESULT (STDMETHODCALLTYPE *LoadCmdFromProprietaryGrammar)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, REFGUID rguidParam, LPCWSTR pszStringParam, const void *pvDataPrarm, @@ -9563,58 +8598,59 @@ typedef struct ISpRecoGrammarVtbl { SPLOADOPTIONS Options); HRESULT (STDMETHODCALLTYPE *SetRuleState)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, LPCWSTR pszName, void *pReserved, SPRULESTATE NewState); HRESULT (STDMETHODCALLTYPE *SetRuleIdState)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, ULONG ulRuleId, SPRULESTATE NewState); HRESULT (STDMETHODCALLTYPE *LoadDictation)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, LPCWSTR pszTopicName, SPLOADOPTIONS Options); HRESULT (STDMETHODCALLTYPE *UnloadDictation)( - ISpRecoGrammar* This); + ISpRecoGrammar *This); HRESULT (STDMETHODCALLTYPE *SetDictationState)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, SPRULESTATE NewState); HRESULT (STDMETHODCALLTYPE *SetWordSequenceData)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, const WCHAR *pText, ULONG cchText, const SPTEXTSELECTIONINFO *pInfo); HRESULT (STDMETHODCALLTYPE *SetTextSelection)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, const SPTEXTSELECTIONINFO *pInfo); HRESULT (STDMETHODCALLTYPE *IsPronounceable)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, LPCWSTR pszWord, SPWORDPRONOUNCEABLE *pWordPronounceable); HRESULT (STDMETHODCALLTYPE *SetGrammarState)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, SPGRAMMARSTATE eGrammarState); HRESULT (STDMETHODCALLTYPE *SaveCmd)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, IStream *pStream, LPWSTR *ppszCoMemErrorText); HRESULT (STDMETHODCALLTYPE *GetGrammarState)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, SPGRAMMARSTATE *peGrammarState); END_INTERFACE } ISpRecoGrammarVtbl; + interface ISpRecoGrammar { CONST_VTBL ISpRecoGrammarVtbl* lpVtbl; }; @@ -9749,169 +8785,6 @@ static FORCEINLINE HRESULT ISpRecoGrammar_GetGrammarState(ISpRecoGrammar* This,S #endif -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_GetGrammarId_Proxy( - ISpRecoGrammar* This, - ULONGLONG *pullGrammarId); -void __RPC_STUB ISpRecoGrammar_GetGrammarId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_GetRecoContext_Proxy( - ISpRecoGrammar* This, - ISpRecoContext **ppRecoCtxt); -void __RPC_STUB ISpRecoGrammar_GetRecoContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromFile_Proxy( - ISpRecoGrammar* This, - LPCWSTR pszFileName, - SPLOADOPTIONS Options); -void __RPC_STUB ISpRecoGrammar_LoadCmdFromFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromObject_Proxy( - ISpRecoGrammar* This, - REFCLSID rcid, - LPCWSTR pszGrammarName, - SPLOADOPTIONS Options); -void __RPC_STUB ISpRecoGrammar_LoadCmdFromObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromResource_Proxy( - ISpRecoGrammar* This, - HMODULE hModule, - LPCWSTR pszResourceName, - LPCWSTR pszResourceType, - WORD wLanguage, - SPLOADOPTIONS Options); -void __RPC_STUB ISpRecoGrammar_LoadCmdFromResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromMemory_Proxy( - ISpRecoGrammar* This, - const SPBINARYGRAMMAR *pGrammar, - SPLOADOPTIONS Options); -void __RPC_STUB ISpRecoGrammar_LoadCmdFromMemory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromProprietaryGrammar_Proxy( - ISpRecoGrammar* This, - REFGUID rguidParam, - LPCWSTR pszStringParam, - const void *pvDataPrarm, - ULONG cbDataSize, - SPLOADOPTIONS Options); -void __RPC_STUB ISpRecoGrammar_LoadCmdFromProprietaryGrammar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetRuleState_Proxy( - ISpRecoGrammar* This, - LPCWSTR pszName, - void *pReserved, - SPRULESTATE NewState); -void __RPC_STUB ISpRecoGrammar_SetRuleState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetRuleIdState_Proxy( - ISpRecoGrammar* This, - ULONG ulRuleId, - SPRULESTATE NewState); -void __RPC_STUB ISpRecoGrammar_SetRuleIdState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadDictation_Proxy( - ISpRecoGrammar* This, - LPCWSTR pszTopicName, - SPLOADOPTIONS Options); -void __RPC_STUB ISpRecoGrammar_LoadDictation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_UnloadDictation_Proxy( - ISpRecoGrammar* This); -void __RPC_STUB ISpRecoGrammar_UnloadDictation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetDictationState_Proxy( - ISpRecoGrammar* This, - SPRULESTATE NewState); -void __RPC_STUB ISpRecoGrammar_SetDictationState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetWordSequenceData_Proxy( - ISpRecoGrammar* This, - const WCHAR *pText, - ULONG cchText, - const SPTEXTSELECTIONINFO *pInfo); -void __RPC_STUB ISpRecoGrammar_SetWordSequenceData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetTextSelection_Proxy( - ISpRecoGrammar* This, - const SPTEXTSELECTIONINFO *pInfo); -void __RPC_STUB ISpRecoGrammar_SetTextSelection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_IsPronounceable_Proxy( - ISpRecoGrammar* This, - LPCWSTR pszWord, - SPWORDPRONOUNCEABLE *pWordPronounceable); -void __RPC_STUB ISpRecoGrammar_IsPronounceable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetGrammarState_Proxy( - ISpRecoGrammar* This, - SPGRAMMARSTATE eGrammarState); -void __RPC_STUB ISpRecoGrammar_SetGrammarState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SaveCmd_Proxy( - ISpRecoGrammar* This, - IStream *pStream, - LPWSTR *ppszCoMemErrorText); -void __RPC_STUB ISpRecoGrammar_SaveCmd_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_GetGrammarState_Proxy( - ISpRecoGrammar* This, - SPGRAMMARSTATE *peGrammarState); -void __RPC_STUB ISpRecoGrammar_GetGrammarState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpRecoGrammar_INTERFACE_DEFINED__ */ @@ -9957,30 +8830,31 @@ typedef struct ISpGrammarBuilder2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpGrammarBuilder2* This, + ISpGrammarBuilder2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpGrammarBuilder2* This); + ISpGrammarBuilder2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpGrammarBuilder2* This); + ISpGrammarBuilder2 *This); /*** ISpGrammarBuilder2 methods ***/ HRESULT (STDMETHODCALLTYPE *AddTextSubset)( - ISpGrammarBuilder2* This, + ISpGrammarBuilder2 *This, SPSTATEHANDLE hFromState, SPSTATEHANDLE hToState, LPCWSTR psz, SPMATCHINGMODE eMatchMode); HRESULT (STDMETHODCALLTYPE *SetPhoneticAlphabet)( - ISpGrammarBuilder2* This, + ISpGrammarBuilder2 *This, PHONETICALPHABET phoneticALphabet); END_INTERFACE } ISpGrammarBuilder2Vtbl; + interface ISpGrammarBuilder2 { CONST_VTBL ISpGrammarBuilder2Vtbl* lpVtbl; }; @@ -10017,25 +8891,6 @@ static FORCEINLINE HRESULT ISpGrammarBuilder2_SetPhoneticAlphabet(ISpGrammarBuil #endif -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder2_AddTextSubset_Proxy( - ISpGrammarBuilder2* This, - SPSTATEHANDLE hFromState, - SPSTATEHANDLE hToState, - LPCWSTR psz, - SPMATCHINGMODE eMatchMode); -void __RPC_STUB ISpGrammarBuilder2_AddTextSubset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder2_SetPhoneticAlphabet_Proxy( - ISpGrammarBuilder2* This, - PHONETICALPHABET phoneticALphabet); -void __RPC_STUB ISpGrammarBuilder2_SetPhoneticAlphabet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpGrammarBuilder2_INTERFACE_DEFINED__ */ @@ -10096,62 +8951,63 @@ typedef struct ISpRecoGrammar2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRecoGrammar2* This, + ISpRecoGrammar2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRecoGrammar2* This); + ISpRecoGrammar2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRecoGrammar2* This); + ISpRecoGrammar2 *This); /*** ISpRecoGrammar2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetRules)( - ISpRecoGrammar2* This, + ISpRecoGrammar2 *This, SPRULE **ppCoMemRules, UINT *puNumRules); HRESULT (STDMETHODCALLTYPE *LoadCmdFromFile2)( - ISpRecoGrammar2* This, + ISpRecoGrammar2 *This, LPCWSTR pszFileName, SPLOADOPTIONS Options, LPCWSTR pszSharingUri, LPCWSTR pszBaseUri); HRESULT (STDMETHODCALLTYPE *LoadCmdFromMemory2)( - ISpRecoGrammar2* This, + ISpRecoGrammar2 *This, const SPBINARYGRAMMAR *pGrammar, SPLOADOPTIONS Options, LPCWSTR pszSharingUri, LPCWSTR pszBaseUri); HRESULT (STDMETHODCALLTYPE *SetRulePriority)( - ISpRecoGrammar2* This, + ISpRecoGrammar2 *This, LPCWSTR pszRuleName, ULONG ulRuleId, int nRulePriority); HRESULT (STDMETHODCALLTYPE *SetRuleWeight)( - ISpRecoGrammar2* This, + ISpRecoGrammar2 *This, LPCWSTR pszRuleName, ULONG ulRuleId, float flWeight); HRESULT (STDMETHODCALLTYPE *SetDictationWeight)( - ISpRecoGrammar2* This, + ISpRecoGrammar2 *This, float flWeight); HRESULT (STDMETHODCALLTYPE *SetGrammarLoader)( - ISpRecoGrammar2* This, + ISpRecoGrammar2 *This, ISpeechResourceLoader *pLoader); HRESULT (STDMETHODCALLTYPE *SetSMLSecurityManager)( - ISpRecoGrammar2* This, + ISpRecoGrammar2 *This, IInternetSecurityManager *pSMLSecurityManager); END_INTERFACE } ISpRecoGrammar2Vtbl; + interface ISpRecoGrammar2 { CONST_VTBL ISpRecoGrammar2Vtbl* lpVtbl; }; @@ -10212,81 +9068,6 @@ static FORCEINLINE HRESULT ISpRecoGrammar2_SetSMLSecurityManager(ISpRecoGrammar2 #endif -HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_GetRules_Proxy( - ISpRecoGrammar2* This, - SPRULE **ppCoMemRules, - UINT *puNumRules); -void __RPC_STUB ISpRecoGrammar2_GetRules_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_LoadCmdFromFile2_Proxy( - ISpRecoGrammar2* This, - LPCWSTR pszFileName, - SPLOADOPTIONS Options, - LPCWSTR pszSharingUri, - LPCWSTR pszBaseUri); -void __RPC_STUB ISpRecoGrammar2_LoadCmdFromFile2_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_LoadCmdFromMemory2_Proxy( - ISpRecoGrammar2* This, - const SPBINARYGRAMMAR *pGrammar, - SPLOADOPTIONS Options, - LPCWSTR pszSharingUri, - LPCWSTR pszBaseUri); -void __RPC_STUB ISpRecoGrammar2_LoadCmdFromMemory2_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_SetRulePriority_Proxy( - ISpRecoGrammar2* This, - LPCWSTR pszRuleName, - ULONG ulRuleId, - int nRulePriority); -void __RPC_STUB ISpRecoGrammar2_SetRulePriority_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_SetRuleWeight_Proxy( - ISpRecoGrammar2* This, - LPCWSTR pszRuleName, - ULONG ulRuleId, - float flWeight); -void __RPC_STUB ISpRecoGrammar2_SetRuleWeight_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_SetDictationWeight_Proxy( - ISpRecoGrammar2* This, - float flWeight); -void __RPC_STUB ISpRecoGrammar2_SetDictationWeight_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_SetGrammarLoader_Proxy( - ISpRecoGrammar2* This, - ISpeechResourceLoader *pLoader); -void __RPC_STUB ISpRecoGrammar2_SetGrammarLoader_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_SetSMLSecurityManager_Proxy( - ISpRecoGrammar2* This, - IInternetSecurityManager *pSMLSecurityManager); -void __RPC_STUB ISpRecoGrammar2_SetSMLSecurityManager_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpRecoGrammar2_INTERFACE_DEFINED__ */ @@ -10328,29 +9109,29 @@ typedef struct ISpeechResourceLoaderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechResourceLoader* This, + ISpeechResourceLoader *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechResourceLoader* This); + ISpeechResourceLoader *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechResourceLoader* This); + ISpeechResourceLoader *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechResourceLoader* This, + ISpeechResourceLoader *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechResourceLoader* This, + ISpeechResourceLoader *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechResourceLoader* This, + ISpeechResourceLoader *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -10358,7 +9139,7 @@ typedef struct ISpeechResourceLoaderVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechResourceLoader* This, + ISpeechResourceLoader *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -10370,7 +9151,7 @@ typedef struct ISpeechResourceLoaderVtbl { /*** ISpeechResourceLoader methods ***/ HRESULT (STDMETHODCALLTYPE *LoadResource)( - ISpeechResourceLoader* This, + ISpeechResourceLoader *This, BSTR bstrResourceUri, VARIANT_BOOL fAlwaysReload, IUnknown **pStream, @@ -10379,18 +9160,19 @@ typedef struct ISpeechResourceLoaderVtbl { BSTR *pbstrRedirectUrl); HRESULT (STDMETHODCALLTYPE *GetLocalCopy)( - ISpeechResourceLoader* This, + ISpeechResourceLoader *This, BSTR bstrResourceUri, BSTR *pbstrLocalPath, BSTR *pbstrMIMEType, BSTR *pbstrRedirectUrl); HRESULT (STDMETHODCALLTYPE *ReleaseLocalCopy)( - ISpeechResourceLoader* This, + ISpeechResourceLoader *This, BSTR pbstrLocalPath); END_INTERFACE } ISpeechResourceLoaderVtbl; + interface ISpeechResourceLoader { CONST_VTBL ISpeechResourceLoaderVtbl* lpVtbl; }; @@ -10449,38 +9231,6 @@ static FORCEINLINE HRESULT ISpeechResourceLoader_ReleaseLocalCopy(ISpeechResourc #endif -HRESULT STDMETHODCALLTYPE ISpeechResourceLoader_LoadResource_Proxy( - ISpeechResourceLoader* This, - BSTR bstrResourceUri, - VARIANT_BOOL fAlwaysReload, - IUnknown **pStream, - BSTR *pbstrMIMEType, - VARIANT_BOOL *pfModified, - BSTR *pbstrRedirectUrl); -void __RPC_STUB ISpeechResourceLoader_LoadResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechResourceLoader_GetLocalCopy_Proxy( - ISpeechResourceLoader* This, - BSTR bstrResourceUri, - BSTR *pbstrLocalPath, - BSTR *pbstrMIMEType, - BSTR *pbstrRedirectUrl); -void __RPC_STUB ISpeechResourceLoader_GetLocalCopy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechResourceLoader_ReleaseLocalCopy_Proxy( - ISpeechResourceLoader* This, - BSTR pbstrLocalPath); -void __RPC_STUB ISpeechResourceLoader_ReleaseLocalCopy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechResourceLoader_INTERFACE_DEFINED__ */ @@ -10585,151 +9335,152 @@ typedef struct ISpRecoContextVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRecoContext* This, + ISpRecoContext *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRecoContext* This); + ISpRecoContext *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRecoContext* This); + ISpRecoContext *This); /*** ISpNotifySource methods ***/ HRESULT (STDMETHODCALLTYPE *SetNotifySink)( - ISpRecoContext* This, + ISpRecoContext *This, ISpNotifySink *pNotifySink); HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)( - ISpRecoContext* This, + ISpRecoContext *This, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)( - ISpRecoContext* This, + ISpRecoContext *This, SPNOTIFYCALLBACK *pfnCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)( - ISpRecoContext* This, + ISpRecoContext *This, ISpNotifyCallback *pSpCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)( - ISpRecoContext* This); + ISpRecoContext *This); HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)( - ISpRecoContext* This, + ISpRecoContext *This, DWORD dwMilliseconds); HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)( - ISpRecoContext* This); + ISpRecoContext *This); /*** ISpEventSource methods ***/ HRESULT (STDMETHODCALLTYPE *SetInterest)( - ISpRecoContext* This, + ISpRecoContext *This, ULONGLONG ullEventInterest, ULONGLONG ullQueuedInterest); HRESULT (STDMETHODCALLTYPE *GetEvents)( - ISpRecoContext* This, + ISpRecoContext *This, ULONG ulCount, SPEVENT *pEventArray, ULONG *pulFetched); HRESULT (STDMETHODCALLTYPE *GetInfo)( - ISpRecoContext* This, + ISpRecoContext *This, SPEVENTSOURCEINFO *pInfo); /*** ISpRecoContext methods ***/ HRESULT (STDMETHODCALLTYPE *GetRecognizer)( - ISpRecoContext* This, + ISpRecoContext *This, ISpRecognizer **ppRecognizer); HRESULT (STDMETHODCALLTYPE *CreateGrammar)( - ISpRecoContext* This, + ISpRecoContext *This, ULONGLONG ullGrammarId, ISpRecoGrammar **ppGrammar); HRESULT (STDMETHODCALLTYPE *GetStatus)( - ISpRecoContext* This, + ISpRecoContext *This, SPRECOCONTEXTSTATUS *pStatus); HRESULT (STDMETHODCALLTYPE *GetMaxAlternates)( - ISpRecoContext* This, + ISpRecoContext *This, ULONG *pcAlternates); HRESULT (STDMETHODCALLTYPE *SetMaxAlternates)( - ISpRecoContext* This, + ISpRecoContext *This, ULONG cAlternates); HRESULT (STDMETHODCALLTYPE *SetAudioOptions)( - ISpRecoContext* This, + ISpRecoContext *This, SPAUDIOOPTIONS Options, const GUID *pAudioFormatId, const WAVEFORMATEX *pWaveFormatEx); HRESULT (STDMETHODCALLTYPE *GetAudioOptions)( - ISpRecoContext* This, + ISpRecoContext *This, SPAUDIOOPTIONS *pOptions, GUID *pAudioFormatId, WAVEFORMATEX **ppCoMemWFEX); HRESULT (STDMETHODCALLTYPE *DeserializeResult)( - ISpRecoContext* This, + ISpRecoContext *This, const SPSERIALIZEDRESULT *pSerializedResult, ISpRecoResult **ppResult); HRESULT (STDMETHODCALLTYPE *Bookmark)( - ISpRecoContext* This, + ISpRecoContext *This, SPBOOKMARKOPTIONS Options, ULONGLONG ullStreamPosition, LPARAM lparamEvent); HRESULT (STDMETHODCALLTYPE *SetAdaptationData)( - ISpRecoContext* This, + ISpRecoContext *This, LPCWSTR pAdaptationData, const ULONG cch); HRESULT (STDMETHODCALLTYPE *Pause)( - ISpRecoContext* This, + ISpRecoContext *This, DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *Resume)( - ISpRecoContext* This, + ISpRecoContext *This, DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *SetVoice)( - ISpRecoContext* This, + ISpRecoContext *This, ISpVoice *pVoice, WINBOOL fAllowFormatChanges); HRESULT (STDMETHODCALLTYPE *GetVoice)( - ISpRecoContext* This, + ISpRecoContext *This, ISpVoice **ppVoice); HRESULT (STDMETHODCALLTYPE *SetVoicePurgeEvent)( - ISpRecoContext* This, + ISpRecoContext *This, ULONGLONG ullEventInterest); HRESULT (STDMETHODCALLTYPE *GetVoicePurgeEvent)( - ISpRecoContext* This, + ISpRecoContext *This, ULONGLONG *pullEventInterest); HRESULT (STDMETHODCALLTYPE *SetContextState)( - ISpRecoContext* This, + ISpRecoContext *This, SPCONTEXTSTATE eContextState); HRESULT (STDMETHODCALLTYPE *GetContextState)( - ISpRecoContext* This, + ISpRecoContext *This, SPCONTEXTSTATE *peContextState); END_INTERFACE } ISpRecoContextVtbl; + interface ISpRecoContext { CONST_VTBL ISpRecoContextVtbl* lpVtbl; }; @@ -10874,160 +9625,6 @@ static FORCEINLINE HRESULT ISpRecoContext_GetContextState(ISpRecoContext* This,S #endif -HRESULT STDMETHODCALLTYPE ISpRecoContext_GetRecognizer_Proxy( - ISpRecoContext* This, - ISpRecognizer **ppRecognizer); -void __RPC_STUB ISpRecoContext_GetRecognizer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_CreateGrammar_Proxy( - ISpRecoContext* This, - ULONGLONG ullGrammarId, - ISpRecoGrammar **ppGrammar); -void __RPC_STUB ISpRecoContext_CreateGrammar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_GetStatus_Proxy( - ISpRecoContext* This, - SPRECOCONTEXTSTATUS *pStatus); -void __RPC_STUB ISpRecoContext_GetStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_GetMaxAlternates_Proxy( - ISpRecoContext* This, - ULONG *pcAlternates); -void __RPC_STUB ISpRecoContext_GetMaxAlternates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_SetMaxAlternates_Proxy( - ISpRecoContext* This, - ULONG cAlternates); -void __RPC_STUB ISpRecoContext_SetMaxAlternates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_SetAudioOptions_Proxy( - ISpRecoContext* This, - SPAUDIOOPTIONS Options, - const GUID *pAudioFormatId, - const WAVEFORMATEX *pWaveFormatEx); -void __RPC_STUB ISpRecoContext_SetAudioOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_GetAudioOptions_Proxy( - ISpRecoContext* This, - SPAUDIOOPTIONS *pOptions, - GUID *pAudioFormatId, - WAVEFORMATEX **ppCoMemWFEX); -void __RPC_STUB ISpRecoContext_GetAudioOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_DeserializeResult_Proxy( - ISpRecoContext* This, - const SPSERIALIZEDRESULT *pSerializedResult, - ISpRecoResult **ppResult); -void __RPC_STUB ISpRecoContext_DeserializeResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_Bookmark_Proxy( - ISpRecoContext* This, - SPBOOKMARKOPTIONS Options, - ULONGLONG ullStreamPosition, - LPARAM lparamEvent); -void __RPC_STUB ISpRecoContext_Bookmark_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_SetAdaptationData_Proxy( - ISpRecoContext* This, - LPCWSTR pAdaptationData, - const ULONG cch); -void __RPC_STUB ISpRecoContext_SetAdaptationData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_Pause_Proxy( - ISpRecoContext* This, - DWORD dwReserved); -void __RPC_STUB ISpRecoContext_Pause_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_Resume_Proxy( - ISpRecoContext* This, - DWORD dwReserved); -void __RPC_STUB ISpRecoContext_Resume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_SetVoice_Proxy( - ISpRecoContext* This, - ISpVoice *pVoice, - WINBOOL fAllowFormatChanges); -void __RPC_STUB ISpRecoContext_SetVoice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_GetVoice_Proxy( - ISpRecoContext* This, - ISpVoice **ppVoice); -void __RPC_STUB ISpRecoContext_GetVoice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_SetVoicePurgeEvent_Proxy( - ISpRecoContext* This, - ULONGLONG ullEventInterest); -void __RPC_STUB ISpRecoContext_SetVoicePurgeEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_GetVoicePurgeEvent_Proxy( - ISpRecoContext* This, - ULONGLONG *pullEventInterest); -void __RPC_STUB ISpRecoContext_GetVoicePurgeEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_SetContextState_Proxy( - ISpRecoContext* This, - SPCONTEXTSTATE eContextState); -void __RPC_STUB ISpRecoContext_SetContextState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_GetContextState_Proxy( - ISpRecoContext* This, - SPCONTEXTSTATE *peContextState); -void __RPC_STUB ISpRecoContext_GetContextState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpRecoContext_INTERFACE_DEFINED__ */ @@ -11094,27 +9691,27 @@ typedef struct ISpRecoContext2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRecoContext2* This, + ISpRecoContext2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRecoContext2* This); + ISpRecoContext2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRecoContext2* This); + ISpRecoContext2 *This); /*** ISpRecoContext2 methods ***/ HRESULT (STDMETHODCALLTYPE *SetGrammarOptions)( - ISpRecoContext2* This, + ISpRecoContext2 *This, DWORD eGrammarOptions); HRESULT (STDMETHODCALLTYPE *GetGrammarOptions)( - ISpRecoContext2* This, + ISpRecoContext2 *This, DWORD *peGrammarOptions); HRESULT (STDMETHODCALLTYPE *SetAdaptationData2)( - ISpRecoContext2* This, + ISpRecoContext2 *This, LPCWSTR pAdaptationData, const ULONG cch, LPCWSTR pTopicName, @@ -11123,6 +9720,7 @@ typedef struct ISpRecoContext2Vtbl { END_INTERFACE } ISpRecoContext2Vtbl; + interface ISpRecoContext2 { CONST_VTBL ISpRecoContext2Vtbl* lpVtbl; }; @@ -11163,34 +9761,6 @@ static FORCEINLINE HRESULT ISpRecoContext2_SetAdaptationData2(ISpRecoContext2* T #endif -HRESULT STDMETHODCALLTYPE ISpRecoContext2_SetGrammarOptions_Proxy( - ISpRecoContext2* This, - DWORD eGrammarOptions); -void __RPC_STUB ISpRecoContext2_SetGrammarOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext2_GetGrammarOptions_Proxy( - ISpRecoContext2* This, - DWORD *peGrammarOptions); -void __RPC_STUB ISpRecoContext2_GetGrammarOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext2_SetAdaptationData2_Proxy( - ISpRecoContext2* This, - LPCWSTR pAdaptationData, - const ULONG cch, - LPCWSTR pTopicName, - DWORD eAdaptationSettings, - SPADAPTATIONRELEVANCE eRelevance); -void __RPC_STUB ISpRecoContext2_SetAdaptationData2_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpRecoContext2_INTERFACE_DEFINED__ */ @@ -11231,39 +9801,40 @@ typedef struct ISpPropertiesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpProperties* This, + ISpProperties *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpProperties* This); + ISpProperties *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpProperties* This); + ISpProperties *This); /*** ISpProperties methods ***/ HRESULT (STDMETHODCALLTYPE *SetPropertyNum)( - ISpProperties* This, + ISpProperties *This, LPCWSTR pName, LONG lValue); HRESULT (STDMETHODCALLTYPE *GetPropertyNum)( - ISpProperties* This, + ISpProperties *This, LPCWSTR pName, LONG *plValue); HRESULT (STDMETHODCALLTYPE *SetPropertyString)( - ISpProperties* This, + ISpProperties *This, LPCWSTR pName, LPCWSTR pValue); HRESULT (STDMETHODCALLTYPE *GetPropertyString)( - ISpProperties* This, + ISpProperties *This, LPCWSTR pName, LPWSTR *ppCoMemValue); END_INTERFACE } ISpPropertiesVtbl; + interface ISpProperties { CONST_VTBL ISpPropertiesVtbl* lpVtbl; }; @@ -11308,42 +9879,6 @@ static FORCEINLINE HRESULT ISpProperties_GetPropertyString(ISpProperties* This,L #endif -HRESULT STDMETHODCALLTYPE ISpProperties_SetPropertyNum_Proxy( - ISpProperties* This, - LPCWSTR pName, - LONG lValue); -void __RPC_STUB ISpProperties_SetPropertyNum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpProperties_GetPropertyNum_Proxy( - ISpProperties* This, - LPCWSTR pName, - LONG *plValue); -void __RPC_STUB ISpProperties_GetPropertyNum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpProperties_SetPropertyString_Proxy( - ISpProperties* This, - LPCWSTR pName, - LPCWSTR pValue); -void __RPC_STUB ISpProperties_SetPropertyString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpProperties_GetPropertyString_Proxy( - ISpProperties* This, - LPCWSTR pName, - LPWSTR *ppCoMemValue); -void __RPC_STUB ISpProperties_GetPropertyString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpProperties_INTERFACE_DEFINED__ */ @@ -11449,101 +9984,101 @@ typedef struct ISpRecognizerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRecognizer* This, + ISpRecognizer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRecognizer* This); + ISpRecognizer *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRecognizer* This); + ISpRecognizer *This); /*** ISpProperties methods ***/ HRESULT (STDMETHODCALLTYPE *SetPropertyNum)( - ISpRecognizer* This, + ISpRecognizer *This, LPCWSTR pName, LONG lValue); HRESULT (STDMETHODCALLTYPE *GetPropertyNum)( - ISpRecognizer* This, + ISpRecognizer *This, LPCWSTR pName, LONG *plValue); HRESULT (STDMETHODCALLTYPE *SetPropertyString)( - ISpRecognizer* This, + ISpRecognizer *This, LPCWSTR pName, LPCWSTR pValue); HRESULT (STDMETHODCALLTYPE *GetPropertyString)( - ISpRecognizer* This, + ISpRecognizer *This, LPCWSTR pName, LPWSTR *ppCoMemValue); /*** ISpRecognizer methods ***/ HRESULT (STDMETHODCALLTYPE *SetRecognizer)( - ISpRecognizer* This, + ISpRecognizer *This, ISpObjectToken *pRecognizer); HRESULT (STDMETHODCALLTYPE *GetRecognizer)( - ISpRecognizer* This, + ISpRecognizer *This, ISpObjectToken **ppRecognizer); HRESULT (STDMETHODCALLTYPE *SetInput)( - ISpRecognizer* This, + ISpRecognizer *This, IUnknown *pUnkInput, WINBOOL fAllowFormatChanges); HRESULT (STDMETHODCALLTYPE *GetInputObjectToken)( - ISpRecognizer* This, + ISpRecognizer *This, ISpObjectToken **ppToken); HRESULT (STDMETHODCALLTYPE *GetInputStream)( - ISpRecognizer* This, + ISpRecognizer *This, ISpStreamFormat **ppStream); HRESULT (STDMETHODCALLTYPE *CreateRecoContext)( - ISpRecognizer* This, + ISpRecognizer *This, ISpRecoContext **ppNewCtxt); HRESULT (STDMETHODCALLTYPE *GetRecoProfile)( - ISpRecognizer* This, + ISpRecognizer *This, ISpObjectToken **ppToken); HRESULT (STDMETHODCALLTYPE *SetRecoProfile)( - ISpRecognizer* This, + ISpRecognizer *This, ISpObjectToken *pToken); HRESULT (STDMETHODCALLTYPE *IsSharedInstance)( - ISpRecognizer* This); + ISpRecognizer *This); HRESULT (STDMETHODCALLTYPE *GetRecoState)( - ISpRecognizer* This, + ISpRecognizer *This, SPRECOSTATE *pState); HRESULT (STDMETHODCALLTYPE *SetRecoState)( - ISpRecognizer* This, + ISpRecognizer *This, SPRECOSTATE NewState); HRESULT (STDMETHODCALLTYPE *GetStatus)( - ISpRecognizer* This, + ISpRecognizer *This, SPRECOGNIZERSTATUS *pStatus); HRESULT (STDMETHODCALLTYPE *GetFormat)( - ISpRecognizer* This, + ISpRecognizer *This, SPSTREAMFORMATTYPE WaveFormatType, GUID *pFormatId, WAVEFORMATEX **ppCoMemWFEX); HRESULT (STDMETHODCALLTYPE *IsUISupported)( - ISpRecognizer* This, + ISpRecognizer *This, LPCWSTR pszTypeOfUI, void *pvExtraData, ULONG cbExtraData, WINBOOL *pfSupported); HRESULT (STDMETHODCALLTYPE *DisplayUI)( - ISpRecognizer* This, + ISpRecognizer *This, HWND hwndParent, LPCWSTR pszTitle, LPCWSTR pszTypeOfUI, @@ -11551,11 +10086,12 @@ typedef struct ISpRecognizerVtbl { ULONG cbExtraData); HRESULT (STDMETHODCALLTYPE *EmulateRecognition)( - ISpRecognizer* This, + ISpRecognizer *This, ISpPhrase *pPhrase); END_INTERFACE } ISpRecognizerVtbl; + interface ISpRecognizer { CONST_VTBL ISpRecognizerVtbl* lpVtbl; }; @@ -11666,120 +10202,6 @@ static FORCEINLINE HRESULT ISpRecognizer_EmulateRecognition(ISpRecognizer* This, #endif -HRESULT STDMETHODCALLTYPE ISpRecognizer_SetRecognizer_Proxy( - ISpRecognizer* This, - ISpObjectToken *pRecognizer); -void __RPC_STUB ISpRecognizer_SetRecognizer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_GetRecognizer_Proxy( - ISpRecognizer* This, - ISpObjectToken **ppRecognizer); -void __RPC_STUB ISpRecognizer_GetRecognizer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_SetInput_Proxy( - ISpRecognizer* This, - IUnknown *pUnkInput, - WINBOOL fAllowFormatChanges); -void __RPC_STUB ISpRecognizer_SetInput_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_GetInputObjectToken_Proxy( - ISpRecognizer* This, - ISpObjectToken **ppToken); -void __RPC_STUB ISpRecognizer_GetInputObjectToken_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_GetInputStream_Proxy( - ISpRecognizer* This, - ISpStreamFormat **ppStream); -void __RPC_STUB ISpRecognizer_GetInputStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_CreateRecoContext_Proxy( - ISpRecognizer* This, - ISpRecoContext **ppNewCtxt); -void __RPC_STUB ISpRecognizer_CreateRecoContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_GetRecoProfile_Proxy( - ISpRecognizer* This, - ISpObjectToken **ppToken); -void __RPC_STUB ISpRecognizer_GetRecoProfile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_SetRecoProfile_Proxy( - ISpRecognizer* This, - ISpObjectToken *pToken); -void __RPC_STUB ISpRecognizer_SetRecoProfile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_IsSharedInstance_Proxy( - ISpRecognizer* This); -void __RPC_STUB ISpRecognizer_IsSharedInstance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_GetRecoState_Proxy( - ISpRecognizer* This, - SPRECOSTATE *pState); -void __RPC_STUB ISpRecognizer_GetRecoState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_SetRecoState_Proxy( - ISpRecognizer* This, - SPRECOSTATE NewState); -void __RPC_STUB ISpRecognizer_SetRecoState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_GetStatus_Proxy( - ISpRecognizer* This, - SPRECOGNIZERSTATUS *pStatus); -void __RPC_STUB ISpRecognizer_GetStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_GetFormat_Proxy( - ISpRecognizer* This, - SPSTREAMFORMATTYPE WaveFormatType, - GUID *pFormatId, - WAVEFORMATEX **ppCoMemWFEX); -void __RPC_STUB ISpRecognizer_GetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_EmulateRecognition_Proxy( - ISpRecognizer* This, - ISpPhrase *pPhrase); -void __RPC_STUB ISpRecognizer_EmulateRecognition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpRecognizer_INTERFACE_DEFINED__ */ @@ -11814,31 +10236,32 @@ typedef struct ISpSerializeStateVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpSerializeState* This, + ISpSerializeState *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpSerializeState* This); + ISpSerializeState *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpSerializeState* This); + ISpSerializeState *This); /*** ISpSerializeState methods ***/ HRESULT (STDMETHODCALLTYPE *GetSerializedState)( - ISpSerializeState* This, + ISpSerializeState *This, BYTE **ppbData, ULONG *pulSize, DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *SetSerializedState)( - ISpSerializeState* This, + ISpSerializeState *This, BYTE *pbData, ULONG ulSize, DWORD dwReserved); END_INTERFACE } ISpSerializeStateVtbl; + interface ISpSerializeState { CONST_VTBL ISpSerializeStateVtbl* lpVtbl; }; @@ -11875,26 +10298,6 @@ static FORCEINLINE HRESULT ISpSerializeState_SetSerializedState(ISpSerializeStat #endif -HRESULT STDMETHODCALLTYPE ISpSerializeState_GetSerializedState_Proxy( - ISpSerializeState* This, - BYTE **ppbData, - ULONG *pulSize, - DWORD dwReserved); -void __RPC_STUB ISpSerializeState_GetSerializedState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpSerializeState_SetSerializedState_Proxy( - ISpSerializeState* This, - BYTE *pbData, - ULONG ulSize, - DWORD dwReserved); -void __RPC_STUB ISpSerializeState_SetSerializedState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpSerializeState_INTERFACE_DEFINED__ */ @@ -11930,32 +10333,33 @@ typedef struct ISpRecognizer2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRecognizer2* This, + ISpRecognizer2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRecognizer2* This); + ISpRecognizer2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRecognizer2* This); + ISpRecognizer2 *This); /*** ISpRecognizer2 methods ***/ HRESULT (STDMETHODCALLTYPE *EmulateRecognitionEx)( - ISpRecognizer2* This, + ISpRecognizer2 *This, ISpPhrase *pPhrase, DWORD dwCompareFlags); HRESULT (STDMETHODCALLTYPE *SetTrainingState)( - ISpRecognizer2* This, + ISpRecognizer2 *This, WINBOOL fDoingTraining, WINBOOL fAdaptFromTrainingData); HRESULT (STDMETHODCALLTYPE *ResetAcousticModelAdaptation)( - ISpRecognizer2* This); + ISpRecognizer2 *This); END_INTERFACE } ISpRecognizer2Vtbl; + interface ISpRecognizer2 { CONST_VTBL ISpRecognizer2Vtbl* lpVtbl; }; @@ -11996,31 +10400,6 @@ static FORCEINLINE HRESULT ISpRecognizer2_ResetAcousticModelAdaptation(ISpRecogn #endif -HRESULT STDMETHODCALLTYPE ISpRecognizer2_EmulateRecognitionEx_Proxy( - ISpRecognizer2* This, - ISpPhrase *pPhrase, - DWORD dwCompareFlags); -void __RPC_STUB ISpRecognizer2_EmulateRecognitionEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer2_SetTrainingState_Proxy( - ISpRecognizer2* This, - WINBOOL fDoingTraining, - WINBOOL fAdaptFromTrainingData); -void __RPC_STUB ISpRecognizer2_SetTrainingState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer2_ResetAcousticModelAdaptation_Proxy( - ISpRecognizer2* This); -void __RPC_STUB ISpRecognizer2_ResetAcousticModelAdaptation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpRecognizer2_INTERFACE_DEFINED__ */ @@ -12063,19 +10442,19 @@ typedef struct ISpEnginePronunciationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpEnginePronunciation* This, + ISpEnginePronunciation *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpEnginePronunciation* This); + ISpEnginePronunciation *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpEnginePronunciation* This); + ISpEnginePronunciation *This); /*** ISpEnginePronunciation methods ***/ HRESULT (STDMETHODCALLTYPE *Normalize)( - ISpEnginePronunciation* This, + ISpEnginePronunciation *This, LPCWSTR pszWord, LPCWSTR pszLeftContext, LPCWSTR pszRightContext, @@ -12083,7 +10462,7 @@ typedef struct ISpEnginePronunciationVtbl { SPNORMALIZATIONLIST *pNormalizationList); HRESULT (STDMETHODCALLTYPE *GetPronunciations)( - ISpEnginePronunciation* This, + ISpEnginePronunciation *This, LPCWSTR pszWord, LPCWSTR pszLeftContext, LPCWSTR pszRightContext, @@ -12092,6 +10471,7 @@ typedef struct ISpEnginePronunciationVtbl { END_INTERFACE } ISpEnginePronunciationVtbl; + interface ISpEnginePronunciation { CONST_VTBL ISpEnginePronunciationVtbl* lpVtbl; }; @@ -12128,30 +10508,6 @@ static FORCEINLINE HRESULT ISpEnginePronunciation_GetPronunciations(ISpEnginePro #endif -HRESULT STDMETHODCALLTYPE ISpEnginePronunciation_Normalize_Proxy( - ISpEnginePronunciation* This, - LPCWSTR pszWord, - LPCWSTR pszLeftContext, - LPCWSTR pszRightContext, - WORD LangID, - SPNORMALIZATIONLIST *pNormalizationList); -void __RPC_STUB ISpEnginePronunciation_Normalize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpEnginePronunciation_GetPronunciations_Proxy( - ISpEnginePronunciation* This, - LPCWSTR pszWord, - LPCWSTR pszLeftContext, - LPCWSTR pszRightContext, - WORD LangID, - SPWORDPRONUNCIATIONLIST *pEnginePronunciationList); -void __RPC_STUB ISpEnginePronunciation_GetPronunciations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpEnginePronunciation_INTERFACE_DEFINED__ */ @@ -12194,30 +10550,31 @@ typedef struct ISpDisplayAlternatesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpDisplayAlternates* This, + ISpDisplayAlternates *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpDisplayAlternates* This); + ISpDisplayAlternates *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpDisplayAlternates* This); + ISpDisplayAlternates *This); /*** ISpDisplayAlternates methods ***/ HRESULT (STDMETHODCALLTYPE *GetDisplayAlternates)( - ISpDisplayAlternates* This, + ISpDisplayAlternates *This, const SPDISPLAYPHRASE *pPhrase, ULONG cRequestCount, SPDISPLAYPHRASE **ppCoMemPhrases, ULONG *pcPhrasesReturned); HRESULT (STDMETHODCALLTYPE *SetFullStopTrailSpace)( - ISpDisplayAlternates* This, + ISpDisplayAlternates *This, ULONG ulTrailSpace); END_INTERFACE } ISpDisplayAlternatesVtbl; + interface ISpDisplayAlternates { CONST_VTBL ISpDisplayAlternatesVtbl* lpVtbl; }; @@ -12254,25 +10611,6 @@ static FORCEINLINE HRESULT ISpDisplayAlternates_SetFullStopTrailSpace(ISpDisplay #endif -HRESULT STDMETHODCALLTYPE ISpDisplayAlternates_GetDisplayAlternates_Proxy( - ISpDisplayAlternates* This, - const SPDISPLAYPHRASE *pPhrase, - ULONG cRequestCount, - SPDISPLAYPHRASE **ppCoMemPhrases, - ULONG *pcPhrasesReturned); -void __RPC_STUB ISpDisplayAlternates_GetDisplayAlternates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDisplayAlternates_SetFullStopTrailSpace_Proxy( - ISpDisplayAlternates* This, - ULONG ulTrailSpace); -void __RPC_STUB ISpDisplayAlternates_SetFullStopTrailSpace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpDisplayAlternates_INTERFACE_DEFINED__ */ @@ -12282,236 +10620,377 @@ DEFINE_GUID(LIBID_SpeechLib, 0xc866ca3a, 0x32f7, 0x11d2, 0x96,0x02, 0x00,0xc0,0x #ifndef __ISpeechDataKey_FWD_DEFINED__ #define __ISpeechDataKey_FWD_DEFINED__ typedef interface ISpeechDataKey ISpeechDataKey; +#ifdef __cplusplus +interface ISpeechDataKey; +#endif /* __cplusplus */ #endif #ifndef __ISpeechObjectToken_FWD_DEFINED__ #define __ISpeechObjectToken_FWD_DEFINED__ typedef interface ISpeechObjectToken ISpeechObjectToken; +#ifdef __cplusplus +interface ISpeechObjectToken; +#endif /* __cplusplus */ #endif #ifndef __ISpeechObjectTokens_FWD_DEFINED__ #define __ISpeechObjectTokens_FWD_DEFINED__ typedef interface ISpeechObjectTokens ISpeechObjectTokens; +#ifdef __cplusplus +interface ISpeechObjectTokens; +#endif /* __cplusplus */ #endif #ifndef __ISpeechObjectTokenCategory_FWD_DEFINED__ #define __ISpeechObjectTokenCategory_FWD_DEFINED__ typedef interface ISpeechObjectTokenCategory ISpeechObjectTokenCategory; +#ifdef __cplusplus +interface ISpeechObjectTokenCategory; +#endif /* __cplusplus */ #endif #ifndef __ISpeechAudioBufferInfo_FWD_DEFINED__ #define __ISpeechAudioBufferInfo_FWD_DEFINED__ typedef interface ISpeechAudioBufferInfo ISpeechAudioBufferInfo; +#ifdef __cplusplus +interface ISpeechAudioBufferInfo; +#endif /* __cplusplus */ #endif #ifndef __ISpeechAudioStatus_FWD_DEFINED__ #define __ISpeechAudioStatus_FWD_DEFINED__ typedef interface ISpeechAudioStatus ISpeechAudioStatus; +#ifdef __cplusplus +interface ISpeechAudioStatus; +#endif /* __cplusplus */ #endif #ifndef __ISpeechAudioFormat_FWD_DEFINED__ #define __ISpeechAudioFormat_FWD_DEFINED__ typedef interface ISpeechAudioFormat ISpeechAudioFormat; +#ifdef __cplusplus +interface ISpeechAudioFormat; +#endif /* __cplusplus */ #endif #ifndef __ISpeechWaveFormatEx_FWD_DEFINED__ #define __ISpeechWaveFormatEx_FWD_DEFINED__ typedef interface ISpeechWaveFormatEx ISpeechWaveFormatEx; +#ifdef __cplusplus +interface ISpeechWaveFormatEx; +#endif /* __cplusplus */ #endif #ifndef __ISpeechBaseStream_FWD_DEFINED__ #define __ISpeechBaseStream_FWD_DEFINED__ typedef interface ISpeechBaseStream ISpeechBaseStream; +#ifdef __cplusplus +interface ISpeechBaseStream; +#endif /* __cplusplus */ #endif #ifndef __ISpeechFileStream_FWD_DEFINED__ #define __ISpeechFileStream_FWD_DEFINED__ typedef interface ISpeechFileStream ISpeechFileStream; +#ifdef __cplusplus +interface ISpeechFileStream; +#endif /* __cplusplus */ #endif #ifndef __ISpeechMemoryStream_FWD_DEFINED__ #define __ISpeechMemoryStream_FWD_DEFINED__ typedef interface ISpeechMemoryStream ISpeechMemoryStream; +#ifdef __cplusplus +interface ISpeechMemoryStream; +#endif /* __cplusplus */ #endif #ifndef __ISpeechCustomStream_FWD_DEFINED__ #define __ISpeechCustomStream_FWD_DEFINED__ typedef interface ISpeechCustomStream ISpeechCustomStream; +#ifdef __cplusplus +interface ISpeechCustomStream; +#endif /* __cplusplus */ #endif #ifndef __ISpeechAudio_FWD_DEFINED__ #define __ISpeechAudio_FWD_DEFINED__ typedef interface ISpeechAudio ISpeechAudio; +#ifdef __cplusplus +interface ISpeechAudio; +#endif /* __cplusplus */ #endif #ifndef __ISpeechMMSysAudio_FWD_DEFINED__ #define __ISpeechMMSysAudio_FWD_DEFINED__ typedef interface ISpeechMMSysAudio ISpeechMMSysAudio; +#ifdef __cplusplus +interface ISpeechMMSysAudio; +#endif /* __cplusplus */ #endif #ifndef __ISpeechVoice_FWD_DEFINED__ #define __ISpeechVoice_FWD_DEFINED__ typedef interface ISpeechVoice ISpeechVoice; +#ifdef __cplusplus +interface ISpeechVoice; +#endif /* __cplusplus */ #endif #ifndef __ISpeechVoiceStatus_FWD_DEFINED__ #define __ISpeechVoiceStatus_FWD_DEFINED__ typedef interface ISpeechVoiceStatus ISpeechVoiceStatus; +#ifdef __cplusplus +interface ISpeechVoiceStatus; +#endif /* __cplusplus */ #endif #ifndef ___ISpeechVoiceEvents_FWD_DEFINED__ #define ___ISpeechVoiceEvents_FWD_DEFINED__ typedef interface _ISpeechVoiceEvents _ISpeechVoiceEvents; +#ifdef __cplusplus +interface _ISpeechVoiceEvents; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecognizer_FWD_DEFINED__ #define __ISpeechRecognizer_FWD_DEFINED__ typedef interface ISpeechRecognizer ISpeechRecognizer; +#ifdef __cplusplus +interface ISpeechRecognizer; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecognizerStatus_FWD_DEFINED__ #define __ISpeechRecognizerStatus_FWD_DEFINED__ typedef interface ISpeechRecognizerStatus ISpeechRecognizerStatus; +#ifdef __cplusplus +interface ISpeechRecognizerStatus; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoContext_FWD_DEFINED__ #define __ISpeechRecoContext_FWD_DEFINED__ typedef interface ISpeechRecoContext ISpeechRecoContext; +#ifdef __cplusplus +interface ISpeechRecoContext; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoGrammar_FWD_DEFINED__ #define __ISpeechRecoGrammar_FWD_DEFINED__ typedef interface ISpeechRecoGrammar ISpeechRecoGrammar; +#ifdef __cplusplus +interface ISpeechRecoGrammar; +#endif /* __cplusplus */ #endif #ifndef ___ISpeechRecoContextEvents_FWD_DEFINED__ #define ___ISpeechRecoContextEvents_FWD_DEFINED__ typedef interface _ISpeechRecoContextEvents _ISpeechRecoContextEvents; +#ifdef __cplusplus +interface _ISpeechRecoContextEvents; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRule_FWD_DEFINED__ #define __ISpeechGrammarRule_FWD_DEFINED__ typedef interface ISpeechGrammarRule ISpeechGrammarRule; +#ifdef __cplusplus +interface ISpeechGrammarRule; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRules_FWD_DEFINED__ #define __ISpeechGrammarRules_FWD_DEFINED__ typedef interface ISpeechGrammarRules ISpeechGrammarRules; +#ifdef __cplusplus +interface ISpeechGrammarRules; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRuleState_FWD_DEFINED__ #define __ISpeechGrammarRuleState_FWD_DEFINED__ typedef interface ISpeechGrammarRuleState ISpeechGrammarRuleState; +#ifdef __cplusplus +interface ISpeechGrammarRuleState; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRuleStateTransition_FWD_DEFINED__ #define __ISpeechGrammarRuleStateTransition_FWD_DEFINED__ typedef interface ISpeechGrammarRuleStateTransition ISpeechGrammarRuleStateTransition; +#ifdef __cplusplus +interface ISpeechGrammarRuleStateTransition; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRuleStateTransitions_FWD_DEFINED__ #define __ISpeechGrammarRuleStateTransitions_FWD_DEFINED__ typedef interface ISpeechGrammarRuleStateTransitions ISpeechGrammarRuleStateTransitions; +#ifdef __cplusplus +interface ISpeechGrammarRuleStateTransitions; +#endif /* __cplusplus */ #endif #ifndef __ISpeechTextSelectionInformation_FWD_DEFINED__ #define __ISpeechTextSelectionInformation_FWD_DEFINED__ typedef interface ISpeechTextSelectionInformation ISpeechTextSelectionInformation; +#ifdef __cplusplus +interface ISpeechTextSelectionInformation; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoResult_FWD_DEFINED__ #define __ISpeechRecoResult_FWD_DEFINED__ typedef interface ISpeechRecoResult ISpeechRecoResult; +#ifdef __cplusplus +interface ISpeechRecoResult; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoResult2_FWD_DEFINED__ #define __ISpeechRecoResult2_FWD_DEFINED__ typedef interface ISpeechRecoResult2 ISpeechRecoResult2; +#ifdef __cplusplus +interface ISpeechRecoResult2; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoResultTimes_FWD_DEFINED__ #define __ISpeechRecoResultTimes_FWD_DEFINED__ typedef interface ISpeechRecoResultTimes ISpeechRecoResultTimes; +#ifdef __cplusplus +interface ISpeechRecoResultTimes; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseAlternate_FWD_DEFINED__ #define __ISpeechPhraseAlternate_FWD_DEFINED__ typedef interface ISpeechPhraseAlternate ISpeechPhraseAlternate; +#ifdef __cplusplus +interface ISpeechPhraseAlternate; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseAlternates_FWD_DEFINED__ #define __ISpeechPhraseAlternates_FWD_DEFINED__ typedef interface ISpeechPhraseAlternates ISpeechPhraseAlternates; +#ifdef __cplusplus +interface ISpeechPhraseAlternates; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseInfo_FWD_DEFINED__ #define __ISpeechPhraseInfo_FWD_DEFINED__ typedef interface ISpeechPhraseInfo ISpeechPhraseInfo; +#ifdef __cplusplus +interface ISpeechPhraseInfo; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseElement_FWD_DEFINED__ #define __ISpeechPhraseElement_FWD_DEFINED__ typedef interface ISpeechPhraseElement ISpeechPhraseElement; +#ifdef __cplusplus +interface ISpeechPhraseElement; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseElements_FWD_DEFINED__ #define __ISpeechPhraseElements_FWD_DEFINED__ typedef interface ISpeechPhraseElements ISpeechPhraseElements; +#ifdef __cplusplus +interface ISpeechPhraseElements; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseReplacement_FWD_DEFINED__ #define __ISpeechPhraseReplacement_FWD_DEFINED__ typedef interface ISpeechPhraseReplacement ISpeechPhraseReplacement; +#ifdef __cplusplus +interface ISpeechPhraseReplacement; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseReplacements_FWD_DEFINED__ #define __ISpeechPhraseReplacements_FWD_DEFINED__ typedef interface ISpeechPhraseReplacements ISpeechPhraseReplacements; +#ifdef __cplusplus +interface ISpeechPhraseReplacements; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseProperty_FWD_DEFINED__ #define __ISpeechPhraseProperty_FWD_DEFINED__ typedef interface ISpeechPhraseProperty ISpeechPhraseProperty; +#ifdef __cplusplus +interface ISpeechPhraseProperty; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseProperties_FWD_DEFINED__ #define __ISpeechPhraseProperties_FWD_DEFINED__ typedef interface ISpeechPhraseProperties ISpeechPhraseProperties; +#ifdef __cplusplus +interface ISpeechPhraseProperties; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseRule_FWD_DEFINED__ #define __ISpeechPhraseRule_FWD_DEFINED__ typedef interface ISpeechPhraseRule ISpeechPhraseRule; +#ifdef __cplusplus +interface ISpeechPhraseRule; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseRules_FWD_DEFINED__ #define __ISpeechPhraseRules_FWD_DEFINED__ typedef interface ISpeechPhraseRules ISpeechPhraseRules; +#ifdef __cplusplus +interface ISpeechPhraseRules; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexicon_FWD_DEFINED__ #define __ISpeechLexicon_FWD_DEFINED__ typedef interface ISpeechLexicon ISpeechLexicon; +#ifdef __cplusplus +interface ISpeechLexicon; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexiconWords_FWD_DEFINED__ #define __ISpeechLexiconWords_FWD_DEFINED__ typedef interface ISpeechLexiconWords ISpeechLexiconWords; +#ifdef __cplusplus +interface ISpeechLexiconWords; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexiconWord_FWD_DEFINED__ #define __ISpeechLexiconWord_FWD_DEFINED__ typedef interface ISpeechLexiconWord ISpeechLexiconWord; +#ifdef __cplusplus +interface ISpeechLexiconWord; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexiconPronunciations_FWD_DEFINED__ #define __ISpeechLexiconPronunciations_FWD_DEFINED__ typedef interface ISpeechLexiconPronunciations ISpeechLexiconPronunciations; +#ifdef __cplusplus +interface ISpeechLexiconPronunciations; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexiconPronunciation_FWD_DEFINED__ #define __ISpeechLexiconPronunciation_FWD_DEFINED__ typedef interface ISpeechLexiconPronunciation ISpeechLexiconPronunciation; +#ifdef __cplusplus +interface ISpeechLexiconPronunciation; +#endif /* __cplusplus */ #endif typedef LONG SpeechLanguageId; @@ -12643,29 +11122,29 @@ typedef struct ISpeechDataKeyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechDataKey* This, + ISpeechDataKey *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechDataKey* This); + ISpeechDataKey *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechDataKey* This); + ISpeechDataKey *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechDataKey* This, + ISpeechDataKey *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechDataKey* This, + ISpeechDataKey *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechDataKey* This, + ISpeechDataKey *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -12673,7 +11152,7 @@ typedef struct ISpeechDataKeyVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechDataKey* This, + ISpeechDataKey *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -12685,65 +11164,66 @@ typedef struct ISpeechDataKeyVtbl { /*** ISpeechDataKey methods ***/ HRESULT (STDMETHODCALLTYPE *SetBinaryValue)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR ValueName, VARIANT Value); HRESULT (STDMETHODCALLTYPE *GetBinaryValue)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR ValueName, VARIANT *Value); HRESULT (STDMETHODCALLTYPE *SetStringValue)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR ValueName, const BSTR Value); HRESULT (STDMETHODCALLTYPE *GetStringValue)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR ValueName, BSTR *Value); HRESULT (STDMETHODCALLTYPE *SetLongValue)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR ValueName, LONG Value); HRESULT (STDMETHODCALLTYPE *GetLongValue)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR ValueName, LONG *Value); HRESULT (STDMETHODCALLTYPE *OpenKey)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR SubKeyName, ISpeechDataKey **SubKey); HRESULT (STDMETHODCALLTYPE *CreateKey)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR SubKeyName, ISpeechDataKey **SubKey); HRESULT (STDMETHODCALLTYPE *DeleteKey)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR SubKeyName); HRESULT (STDMETHODCALLTYPE *DeleteValue)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR ValueName); HRESULT (STDMETHODCALLTYPE *EnumKeys)( - ISpeechDataKey* This, + ISpeechDataKey *This, LONG Index, BSTR *SubKeyName); HRESULT (STDMETHODCALLTYPE *EnumValues)( - ISpeechDataKey* This, + ISpeechDataKey *This, LONG Index, BSTR *ValueName); END_INTERFACE } ISpeechDataKeyVtbl; + interface ISpeechDataKey { CONST_VTBL ISpeechDataKeyVtbl* lpVtbl; }; @@ -12838,112 +11318,6 @@ static FORCEINLINE HRESULT ISpeechDataKey_EnumValues(ISpeechDataKey* This,LONG I #endif -HRESULT STDMETHODCALLTYPE ISpeechDataKey_SetBinaryValue_Proxy( - ISpeechDataKey* This, - const BSTR ValueName, - VARIANT Value); -void __RPC_STUB ISpeechDataKey_SetBinaryValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_GetBinaryValue_Proxy( - ISpeechDataKey* This, - const BSTR ValueName, - VARIANT *Value); -void __RPC_STUB ISpeechDataKey_GetBinaryValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_SetStringValue_Proxy( - ISpeechDataKey* This, - const BSTR ValueName, - const BSTR Value); -void __RPC_STUB ISpeechDataKey_SetStringValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_GetStringValue_Proxy( - ISpeechDataKey* This, - const BSTR ValueName, - BSTR *Value); -void __RPC_STUB ISpeechDataKey_GetStringValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_SetLongValue_Proxy( - ISpeechDataKey* This, - const BSTR ValueName, - LONG Value); -void __RPC_STUB ISpeechDataKey_SetLongValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_GetLongValue_Proxy( - ISpeechDataKey* This, - const BSTR ValueName, - LONG *Value); -void __RPC_STUB ISpeechDataKey_GetLongValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_OpenKey_Proxy( - ISpeechDataKey* This, - const BSTR SubKeyName, - ISpeechDataKey **SubKey); -void __RPC_STUB ISpeechDataKey_OpenKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_CreateKey_Proxy( - ISpeechDataKey* This, - const BSTR SubKeyName, - ISpeechDataKey **SubKey); -void __RPC_STUB ISpeechDataKey_CreateKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_DeleteKey_Proxy( - ISpeechDataKey* This, - const BSTR SubKeyName); -void __RPC_STUB ISpeechDataKey_DeleteKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_DeleteValue_Proxy( - ISpeechDataKey* This, - const BSTR ValueName); -void __RPC_STUB ISpeechDataKey_DeleteValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_EnumKeys_Proxy( - ISpeechDataKey* This, - LONG Index, - BSTR *SubKeyName); -void __RPC_STUB ISpeechDataKey_EnumKeys_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_EnumValues_Proxy( - ISpeechDataKey* This, - LONG Index, - BSTR *ValueName); -void __RPC_STUB ISpeechDataKey_EnumValues_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechDataKey_INTERFACE_DEFINED__ */ @@ -13027,29 +11401,29 @@ typedef struct ISpeechObjectTokenVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechObjectToken* This); + ISpeechObjectToken *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechObjectToken* This); + ISpeechObjectToken *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -13057,7 +11431,7 @@ typedef struct ISpeechObjectTokenVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -13069,45 +11443,45 @@ typedef struct ISpeechObjectTokenVtbl { /*** ISpeechObjectToken methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, BSTR *ObjectId); HRESULT (STDMETHODCALLTYPE *get_DataKey)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, ISpeechDataKey **DataKey); HRESULT (STDMETHODCALLTYPE *get_Category)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, ISpeechObjectTokenCategory **Category); HRESULT (STDMETHODCALLTYPE *GetDescription)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, LONG Locale, BSTR *Description); HRESULT (STDMETHODCALLTYPE *SetId)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, BSTR Id, BSTR CategoryID, VARIANT_BOOL CreateIfNotExist); HRESULT (STDMETHODCALLTYPE *GetAttribute)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, BSTR AttributeName, BSTR *AttributeValue); HRESULT (STDMETHODCALLTYPE *CreateInstance)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, IUnknown *pUnkOuter, SpeechTokenContext ClsContext, IUnknown **Object); HRESULT (STDMETHODCALLTYPE *Remove)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, BSTR ObjectStorageCLSID); HRESULT (STDMETHODCALLTYPE *GetStorageFileName)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, BSTR ObjectStorageCLSID, BSTR KeyName, BSTR FileName, @@ -13115,20 +11489,20 @@ typedef struct ISpeechObjectTokenVtbl { BSTR *FilePath); HRESULT (STDMETHODCALLTYPE *RemoveStorageFileName)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, BSTR ObjectStorageCLSID, BSTR KeyName, VARIANT_BOOL DeleteFile); HRESULT (STDMETHODCALLTYPE *IsUISupported)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, const BSTR TypeOfUI, const VARIANT *ExtraData, IUnknown *Object, VARIANT_BOOL *Supported); HRESULT (STDMETHODCALLTYPE *DisplayUI)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, LONG hWnd, BSTR Title, const BSTR TypeOfUI, @@ -13136,12 +11510,13 @@ typedef struct ISpeechObjectTokenVtbl { IUnknown *Object); HRESULT (STDMETHODCALLTYPE *MatchesAttributes)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, BSTR Attributes, VARIANT_BOOL *Matches); END_INTERFACE } ISpeechObjectTokenVtbl; + interface ISpeechObjectToken { CONST_VTBL ISpeechObjectTokenVtbl* lpVtbl; }; @@ -13240,130 +11615,6 @@ static FORCEINLINE HRESULT ISpeechObjectToken_MatchesAttributes(ISpeechObjectTok #endif -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_get_Id_Proxy( - ISpeechObjectToken* This, - BSTR *ObjectId); -void __RPC_STUB ISpeechObjectToken_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_get_DataKey_Proxy( - ISpeechObjectToken* This, - ISpeechDataKey **DataKey); -void __RPC_STUB ISpeechObjectToken_get_DataKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_get_Category_Proxy( - ISpeechObjectToken* This, - ISpeechObjectTokenCategory **Category); -void __RPC_STUB ISpeechObjectToken_get_Category_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_GetDescription_Proxy( - ISpeechObjectToken* This, - LONG Locale, - BSTR *Description); -void __RPC_STUB ISpeechObjectToken_GetDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_SetId_Proxy( - ISpeechObjectToken* This, - BSTR Id, - BSTR CategoryID, - VARIANT_BOOL CreateIfNotExist); -void __RPC_STUB ISpeechObjectToken_SetId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_GetAttribute_Proxy( - ISpeechObjectToken* This, - BSTR AttributeName, - BSTR *AttributeValue); -void __RPC_STUB ISpeechObjectToken_GetAttribute_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_CreateInstance_Proxy( - ISpeechObjectToken* This, - IUnknown *pUnkOuter, - SpeechTokenContext ClsContext, - IUnknown **Object); -void __RPC_STUB ISpeechObjectToken_CreateInstance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_Remove_Proxy( - ISpeechObjectToken* This, - BSTR ObjectStorageCLSID); -void __RPC_STUB ISpeechObjectToken_Remove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_GetStorageFileName_Proxy( - ISpeechObjectToken* This, - BSTR ObjectStorageCLSID, - BSTR KeyName, - BSTR FileName, - SpeechTokenShellFolder Folder, - BSTR *FilePath); -void __RPC_STUB ISpeechObjectToken_GetStorageFileName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_RemoveStorageFileName_Proxy( - ISpeechObjectToken* This, - BSTR ObjectStorageCLSID, - BSTR KeyName, - VARIANT_BOOL DeleteFile); -void __RPC_STUB ISpeechObjectToken_RemoveStorageFileName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_IsUISupported_Proxy( - ISpeechObjectToken* This, - const BSTR TypeOfUI, - const VARIANT *ExtraData, - IUnknown *Object, - VARIANT_BOOL *Supported); -void __RPC_STUB ISpeechObjectToken_IsUISupported_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_DisplayUI_Proxy( - ISpeechObjectToken* This, - LONG hWnd, - BSTR Title, - const BSTR TypeOfUI, - const VARIANT *ExtraData, - IUnknown *Object); -void __RPC_STUB ISpeechObjectToken_DisplayUI_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_MatchesAttributes_Proxy( - ISpeechObjectToken* This, - BSTR Attributes, - VARIANT_BOOL *Matches); -void __RPC_STUB ISpeechObjectToken_MatchesAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechObjectToken_INTERFACE_DEFINED__ */ @@ -13398,29 +11649,29 @@ typedef struct ISpeechObjectTokensVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechObjectTokens* This, + ISpeechObjectTokens *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechObjectTokens* This); + ISpeechObjectTokens *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechObjectTokens* This); + ISpeechObjectTokens *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechObjectTokens* This, + ISpeechObjectTokens *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechObjectTokens* This, + ISpeechObjectTokens *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechObjectTokens* This, + ISpeechObjectTokens *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -13428,7 +11679,7 @@ typedef struct ISpeechObjectTokensVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechObjectTokens* This, + ISpeechObjectTokens *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -13440,20 +11691,21 @@ typedef struct ISpeechObjectTokensVtbl { /*** ISpeechObjectTokens methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechObjectTokens* This, + ISpeechObjectTokens *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechObjectTokens* This, + ISpeechObjectTokens *This, LONG Index, ISpeechObjectToken **Token); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechObjectTokens* This, + ISpeechObjectTokens *This, IUnknown **ppEnumVARIANT); END_INTERFACE } ISpeechObjectTokensVtbl; + interface ISpeechObjectTokens { CONST_VTBL ISpeechObjectTokensVtbl* lpVtbl; }; @@ -13512,31 +11764,6 @@ static FORCEINLINE HRESULT ISpeechObjectTokens_get__NewEnum(ISpeechObjectTokens* #endif -HRESULT STDMETHODCALLTYPE ISpeechObjectTokens_get_Count_Proxy( - ISpeechObjectTokens* This, - LONG *Count); -void __RPC_STUB ISpeechObjectTokens_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectTokens_Item_Proxy( - ISpeechObjectTokens* This, - LONG Index, - ISpeechObjectToken **Token); -void __RPC_STUB ISpeechObjectTokens_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectTokens_get__NewEnum_Proxy( - ISpeechObjectTokens* This, - IUnknown **ppEnumVARIANT); -void __RPC_STUB ISpeechObjectTokens_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechObjectTokens_INTERFACE_DEFINED__ */ @@ -13583,29 +11810,29 @@ typedef struct ISpeechObjectTokenCategoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechObjectTokenCategory* This); + ISpeechObjectTokenCategory *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechObjectTokenCategory* This); + ISpeechObjectTokenCategory *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -13613,7 +11840,7 @@ typedef struct ISpeechObjectTokenCategoryVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -13625,35 +11852,36 @@ typedef struct ISpeechObjectTokenCategoryVtbl { /*** ISpeechObjectTokenCategory methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, BSTR *Id); HRESULT (STDMETHODCALLTYPE *put_Default)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, const BSTR TokenId); HRESULT (STDMETHODCALLTYPE *get_Default)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, BSTR *TokenId); HRESULT (STDMETHODCALLTYPE *SetId)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, const BSTR Id, VARIANT_BOOL CreateIfNotExist); HRESULT (STDMETHODCALLTYPE *GetDataKey)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, SpeechDataKeyLocation Location, ISpeechDataKey **DataKey); HRESULT (STDMETHODCALLTYPE *EnumerateTokens)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, BSTR RequiredAttributes, BSTR OptionalAttributes, ISpeechObjectTokens **Tokens); END_INTERFACE } ISpeechObjectTokenCategoryVtbl; + interface ISpeechObjectTokenCategory { CONST_VTBL ISpeechObjectTokenCategoryVtbl* lpVtbl; }; @@ -13724,58 +11952,6 @@ static FORCEINLINE HRESULT ISpeechObjectTokenCategory_EnumerateTokens(ISpeechObj #endif -HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_get_Id_Proxy( - ISpeechObjectTokenCategory* This, - BSTR *Id); -void __RPC_STUB ISpeechObjectTokenCategory_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_put_Default_Proxy( - ISpeechObjectTokenCategory* This, - const BSTR TokenId); -void __RPC_STUB ISpeechObjectTokenCategory_put_Default_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_get_Default_Proxy( - ISpeechObjectTokenCategory* This, - BSTR *TokenId); -void __RPC_STUB ISpeechObjectTokenCategory_get_Default_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_SetId_Proxy( - ISpeechObjectTokenCategory* This, - const BSTR Id, - VARIANT_BOOL CreateIfNotExist); -void __RPC_STUB ISpeechObjectTokenCategory_SetId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_GetDataKey_Proxy( - ISpeechObjectTokenCategory* This, - SpeechDataKeyLocation Location, - ISpeechDataKey **DataKey); -void __RPC_STUB ISpeechObjectTokenCategory_GetDataKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_EnumerateTokens_Proxy( - ISpeechObjectTokenCategory* This, - BSTR RequiredAttributes, - BSTR OptionalAttributes, - ISpeechObjectTokens **Tokens); -void __RPC_STUB ISpeechObjectTokenCategory_EnumerateTokens_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechObjectTokenCategory_INTERFACE_DEFINED__ */ @@ -14042,29 +12218,29 @@ typedef struct ISpeechAudioFormatVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechAudioFormat* This); + ISpeechAudioFormat *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechAudioFormat* This); + ISpeechAudioFormat *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -14072,7 +12248,7 @@ typedef struct ISpeechAudioFormatVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -14084,31 +12260,32 @@ typedef struct ISpeechAudioFormatVtbl { /*** ISpeechAudioFormat methods ***/ HRESULT (STDMETHODCALLTYPE *get_Type)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, SpeechAudioFormatType *AudioFormat); HRESULT (STDMETHODCALLTYPE *put_Type)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, SpeechAudioFormatType AudioFormat); HRESULT (STDMETHODCALLTYPE *get_Guid)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, BSTR *Guid); HRESULT (STDMETHODCALLTYPE *put_Guid)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, BSTR Guid); HRESULT (STDMETHODCALLTYPE *GetWaveFormatEx)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, ISpeechWaveFormatEx **SpeechWaveFormatEx); HRESULT (STDMETHODCALLTYPE *SetWaveFormatEx)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, ISpeechWaveFormatEx *SpeechWaveFormatEx); END_INTERFACE } ISpeechAudioFormatVtbl; + interface ISpeechAudioFormat { CONST_VTBL ISpeechAudioFormatVtbl* lpVtbl; }; @@ -14179,54 +12356,6 @@ static FORCEINLINE HRESULT ISpeechAudioFormat_SetWaveFormatEx(ISpeechAudioFormat #endif -HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_get_Type_Proxy( - ISpeechAudioFormat* This, - SpeechAudioFormatType *AudioFormat); -void __RPC_STUB ISpeechAudioFormat_get_Type_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_put_Type_Proxy( - ISpeechAudioFormat* This, - SpeechAudioFormatType AudioFormat); -void __RPC_STUB ISpeechAudioFormat_put_Type_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_get_Guid_Proxy( - ISpeechAudioFormat* This, - BSTR *Guid); -void __RPC_STUB ISpeechAudioFormat_get_Guid_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_put_Guid_Proxy( - ISpeechAudioFormat* This, - BSTR Guid); -void __RPC_STUB ISpeechAudioFormat_put_Guid_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_GetWaveFormatEx_Proxy( - ISpeechAudioFormat* This, - ISpeechWaveFormatEx **SpeechWaveFormatEx); -void __RPC_STUB ISpeechAudioFormat_GetWaveFormatEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_SetWaveFormatEx_Proxy( - ISpeechAudioFormat* This, - ISpeechWaveFormatEx *SpeechWaveFormatEx); -void __RPC_STUB ISpeechAudioFormat_SetWaveFormatEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechAudioFormat_INTERFACE_DEFINED__ */ @@ -14271,29 +12400,29 @@ typedef struct ISpeechBaseStreamVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechBaseStream* This); + ISpeechBaseStream *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechBaseStream* This); + ISpeechBaseStream *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -14301,7 +12430,7 @@ typedef struct ISpeechBaseStreamVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -14313,32 +12442,33 @@ typedef struct ISpeechBaseStreamVtbl { /*** ISpeechBaseStream methods ***/ HRESULT (STDMETHODCALLTYPE *get_Format)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, ISpeechAudioFormat **AudioFormat); HRESULT (STDMETHODCALLTYPE *putref_Format)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, ISpeechAudioFormat *AudioFormat); HRESULT (STDMETHODCALLTYPE *Read)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, VARIANT *Buffer, LONG NumberOfBytes, LONG *BytesRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, VARIANT Buffer, LONG *BytesWritten); HRESULT (STDMETHODCALLTYPE *Seek)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, VARIANT Position, SpeechStreamSeekPositionType Origin, VARIANT *NewPosition); END_INTERFACE } ISpeechBaseStreamVtbl; + interface ISpeechBaseStream { CONST_VTBL ISpeechBaseStreamVtbl* lpVtbl; }; @@ -14405,51 +12535,6 @@ static FORCEINLINE HRESULT ISpeechBaseStream_Seek(ISpeechBaseStream* This,VARIAN #endif -HRESULT STDMETHODCALLTYPE ISpeechBaseStream_get_Format_Proxy( - ISpeechBaseStream* This, - ISpeechAudioFormat **AudioFormat); -void __RPC_STUB ISpeechBaseStream_get_Format_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechBaseStream_putref_Format_Proxy( - ISpeechBaseStream* This, - ISpeechAudioFormat *AudioFormat); -void __RPC_STUB ISpeechBaseStream_putref_Format_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechBaseStream_Read_Proxy( - ISpeechBaseStream* This, - VARIANT *Buffer, - LONG NumberOfBytes, - LONG *BytesRead); -void __RPC_STUB ISpeechBaseStream_Read_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechBaseStream_Write_Proxy( - ISpeechBaseStream* This, - VARIANT Buffer, - LONG *BytesWritten); -void __RPC_STUB ISpeechBaseStream_Write_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechBaseStream_Seek_Proxy( - ISpeechBaseStream* This, - VARIANT Position, - SpeechStreamSeekPositionType Origin, - VARIANT *NewPosition); -void __RPC_STUB ISpeechBaseStream_Seek_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechBaseStream_INTERFACE_DEFINED__ */ @@ -14501,29 +12586,29 @@ typedef struct ISpeechAudioVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechAudio* This, + ISpeechAudio *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechAudio* This); + ISpeechAudio *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechAudio* This); + ISpeechAudio *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechAudio* This, + ISpeechAudio *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechAudio* This, + ISpeechAudio *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechAudio* This, + ISpeechAudio *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -14531,7 +12616,7 @@ typedef struct ISpeechAudioVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechAudio* This, + ISpeechAudio *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -14543,69 +12628,70 @@ typedef struct ISpeechAudioVtbl { /*** ISpeechBaseStream methods ***/ HRESULT (STDMETHODCALLTYPE *get_Format)( - ISpeechAudio* This, + ISpeechAudio *This, ISpeechAudioFormat **AudioFormat); HRESULT (STDMETHODCALLTYPE *putref_Format)( - ISpeechAudio* This, + ISpeechAudio *This, ISpeechAudioFormat *AudioFormat); HRESULT (STDMETHODCALLTYPE *Read)( - ISpeechAudio* This, + ISpeechAudio *This, VARIANT *Buffer, LONG NumberOfBytes, LONG *BytesRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpeechAudio* This, + ISpeechAudio *This, VARIANT Buffer, LONG *BytesWritten); HRESULT (STDMETHODCALLTYPE *Seek)( - ISpeechAudio* This, + ISpeechAudio *This, VARIANT Position, SpeechStreamSeekPositionType Origin, VARIANT *NewPosition); /*** ISpeechAudio methods ***/ HRESULT (STDMETHODCALLTYPE *get_Status)( - ISpeechAudio* This, + ISpeechAudio *This, ISpeechAudioStatus **Status); HRESULT (STDMETHODCALLTYPE *get_BufferInfo)( - ISpeechAudio* This, + ISpeechAudio *This, ISpeechAudioBufferInfo **BufferInfo); HRESULT (STDMETHODCALLTYPE *get_DefaultFormat)( - ISpeechAudio* This, + ISpeechAudio *This, ISpeechAudioFormat **StreamFormat); HRESULT (STDMETHODCALLTYPE *get_Volume)( - ISpeechAudio* This, + ISpeechAudio *This, LONG *Volume); HRESULT (STDMETHODCALLTYPE *put_Volume)( - ISpeechAudio* This, + ISpeechAudio *This, LONG Volume); HRESULT (STDMETHODCALLTYPE *get_BufferNotifySize)( - ISpeechAudio* This, + ISpeechAudio *This, LONG *BufferNotifySize); HRESULT (STDMETHODCALLTYPE *put_BufferNotifySize)( - ISpeechAudio* This, + ISpeechAudio *This, LONG BufferNotifySize); HRESULT (STDMETHODCALLTYPE *get_EventHandle)( - ISpeechAudio* This, + ISpeechAudio *This, LONG *EventHandle); HRESULT (STDMETHODCALLTYPE *SetState)( - ISpeechAudio* This, + ISpeechAudio *This, SpeechAudioState State); END_INTERFACE } ISpeechAudioVtbl; + interface ISpeechAudio { CONST_VTBL ISpeechAudioVtbl* lpVtbl; }; @@ -14710,78 +12796,6 @@ static FORCEINLINE HRESULT ISpeechAudio_SetState(ISpeechAudio* This,SpeechAudioS #endif -HRESULT STDMETHODCALLTYPE ISpeechAudio_get_Status_Proxy( - ISpeechAudio* This, - ISpeechAudioStatus **Status); -void __RPC_STUB ISpeechAudio_get_Status_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudio_get_BufferInfo_Proxy( - ISpeechAudio* This, - ISpeechAudioBufferInfo **BufferInfo); -void __RPC_STUB ISpeechAudio_get_BufferInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudio_get_DefaultFormat_Proxy( - ISpeechAudio* This, - ISpeechAudioFormat **StreamFormat); -void __RPC_STUB ISpeechAudio_get_DefaultFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudio_get_Volume_Proxy( - ISpeechAudio* This, - LONG *Volume); -void __RPC_STUB ISpeechAudio_get_Volume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudio_put_Volume_Proxy( - ISpeechAudio* This, - LONG Volume); -void __RPC_STUB ISpeechAudio_put_Volume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudio_get_BufferNotifySize_Proxy( - ISpeechAudio* This, - LONG *BufferNotifySize); -void __RPC_STUB ISpeechAudio_get_BufferNotifySize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudio_put_BufferNotifySize_Proxy( - ISpeechAudio* This, - LONG BufferNotifySize); -void __RPC_STUB ISpeechAudio_put_BufferNotifySize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudio_get_EventHandle_Proxy( - ISpeechAudio* This, - LONG *EventHandle); -void __RPC_STUB ISpeechAudio_get_EventHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudio_SetState_Proxy( - ISpeechAudio* This, - SpeechAudioState State); -void __RPC_STUB ISpeechAudio_SetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechAudio_INTERFACE_DEFINED__ */ @@ -14821,29 +12835,29 @@ typedef struct ISpeechMMSysAudioVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechMMSysAudio* This); + ISpeechMMSysAudio *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechMMSysAudio* This); + ISpeechMMSysAudio *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -14851,7 +12865,7 @@ typedef struct ISpeechMMSysAudioVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -14863,90 +12877,91 @@ typedef struct ISpeechMMSysAudioVtbl { /*** ISpeechBaseStream methods ***/ HRESULT (STDMETHODCALLTYPE *get_Format)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, ISpeechAudioFormat **AudioFormat); HRESULT (STDMETHODCALLTYPE *putref_Format)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, ISpeechAudioFormat *AudioFormat); HRESULT (STDMETHODCALLTYPE *Read)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, VARIANT *Buffer, LONG NumberOfBytes, LONG *BytesRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, VARIANT Buffer, LONG *BytesWritten); HRESULT (STDMETHODCALLTYPE *Seek)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, VARIANT Position, SpeechStreamSeekPositionType Origin, VARIANT *NewPosition); /*** ISpeechAudio methods ***/ HRESULT (STDMETHODCALLTYPE *get_Status)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, ISpeechAudioStatus **Status); HRESULT (STDMETHODCALLTYPE *get_BufferInfo)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, ISpeechAudioBufferInfo **BufferInfo); HRESULT (STDMETHODCALLTYPE *get_DefaultFormat)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, ISpeechAudioFormat **StreamFormat); HRESULT (STDMETHODCALLTYPE *get_Volume)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG *Volume); HRESULT (STDMETHODCALLTYPE *put_Volume)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG Volume); HRESULT (STDMETHODCALLTYPE *get_BufferNotifySize)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG *BufferNotifySize); HRESULT (STDMETHODCALLTYPE *put_BufferNotifySize)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG BufferNotifySize); HRESULT (STDMETHODCALLTYPE *get_EventHandle)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG *EventHandle); HRESULT (STDMETHODCALLTYPE *SetState)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, SpeechAudioState State); /*** ISpeechMMSysAudio methods ***/ HRESULT (STDMETHODCALLTYPE *get_DeviceId)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG *DeviceId); HRESULT (STDMETHODCALLTYPE *put_DeviceId)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG DeviceId); HRESULT (STDMETHODCALLTYPE *get_LineId)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG *LineId); HRESULT (STDMETHODCALLTYPE *put_LineId)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG LineId); HRESULT (STDMETHODCALLTYPE *get_MMHandle)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG *Handle); END_INTERFACE } ISpeechMMSysAudioVtbl; + interface ISpeechMMSysAudio { CONST_VTBL ISpeechMMSysAudioVtbl* lpVtbl; }; @@ -15073,46 +13088,6 @@ static FORCEINLINE HRESULT ISpeechMMSysAudio_get_MMHandle(ISpeechMMSysAudio* Thi #endif -HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_get_DeviceId_Proxy( - ISpeechMMSysAudio* This, - LONG *DeviceId); -void __RPC_STUB ISpeechMMSysAudio_get_DeviceId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_put_DeviceId_Proxy( - ISpeechMMSysAudio* This, - LONG DeviceId); -void __RPC_STUB ISpeechMMSysAudio_put_DeviceId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_get_LineId_Proxy( - ISpeechMMSysAudio* This, - LONG *LineId); -void __RPC_STUB ISpeechMMSysAudio_get_LineId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_put_LineId_Proxy( - ISpeechMMSysAudio* This, - LONG LineId); -void __RPC_STUB ISpeechMMSysAudio_put_LineId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_get_MMHandle_Proxy( - ISpeechMMSysAudio* This, - LONG *Handle); -void __RPC_STUB ISpeechMMSysAudio_get_MMHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechMMSysAudio_INTERFACE_DEFINED__ */ @@ -15145,29 +13120,29 @@ typedef struct ISpeechFileStreamVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechFileStream* This, + ISpeechFileStream *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechFileStream* This); + ISpeechFileStream *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechFileStream* This); + ISpeechFileStream *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechFileStream* This, + ISpeechFileStream *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechFileStream* This, + ISpeechFileStream *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechFileStream* This, + ISpeechFileStream *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -15175,7 +13150,7 @@ typedef struct ISpeechFileStreamVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechFileStream* This, + ISpeechFileStream *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -15187,42 +13162,43 @@ typedef struct ISpeechFileStreamVtbl { /*** ISpeechBaseStream methods ***/ HRESULT (STDMETHODCALLTYPE *get_Format)( - ISpeechFileStream* This, + ISpeechFileStream *This, ISpeechAudioFormat **AudioFormat); HRESULT (STDMETHODCALLTYPE *putref_Format)( - ISpeechFileStream* This, + ISpeechFileStream *This, ISpeechAudioFormat *AudioFormat); HRESULT (STDMETHODCALLTYPE *Read)( - ISpeechFileStream* This, + ISpeechFileStream *This, VARIANT *Buffer, LONG NumberOfBytes, LONG *BytesRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpeechFileStream* This, + ISpeechFileStream *This, VARIANT Buffer, LONG *BytesWritten); HRESULT (STDMETHODCALLTYPE *Seek)( - ISpeechFileStream* This, + ISpeechFileStream *This, VARIANT Position, SpeechStreamSeekPositionType Origin, VARIANT *NewPosition); /*** ISpeechFileStream methods ***/ HRESULT (STDMETHODCALLTYPE *Open)( - ISpeechFileStream* This, + ISpeechFileStream *This, BSTR FileName, SpeechStreamFileMode FileMode, VARIANT_BOOL DoEvents); HRESULT (STDMETHODCALLTYPE *Close)( - ISpeechFileStream* This); + ISpeechFileStream *This); END_INTERFACE } ISpeechFileStreamVtbl; + interface ISpeechFileStream { CONST_VTBL ISpeechFileStreamVtbl* lpVtbl; }; @@ -15299,23 +13275,6 @@ static FORCEINLINE HRESULT ISpeechFileStream_Close(ISpeechFileStream* This) { #endif -HRESULT STDMETHODCALLTYPE ISpeechFileStream_Open_Proxy( - ISpeechFileStream* This, - BSTR FileName, - SpeechStreamFileMode FileMode, - VARIANT_BOOL DoEvents); -void __RPC_STUB ISpeechFileStream_Open_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechFileStream_Close_Proxy( - ISpeechFileStream* This); -void __RPC_STUB ISpeechFileStream_Close_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechFileStream_INTERFACE_DEFINED__ */ @@ -15346,29 +13305,29 @@ typedef struct ISpeechCustomStreamVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechCustomStream* This); + ISpeechCustomStream *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechCustomStream* This); + ISpeechCustomStream *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -15376,7 +13335,7 @@ typedef struct ISpeechCustomStreamVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -15388,41 +13347,42 @@ typedef struct ISpeechCustomStreamVtbl { /*** ISpeechBaseStream methods ***/ HRESULT (STDMETHODCALLTYPE *get_Format)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, ISpeechAudioFormat **AudioFormat); HRESULT (STDMETHODCALLTYPE *putref_Format)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, ISpeechAudioFormat *AudioFormat); HRESULT (STDMETHODCALLTYPE *Read)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, VARIANT *Buffer, LONG NumberOfBytes, LONG *BytesRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, VARIANT Buffer, LONG *BytesWritten); HRESULT (STDMETHODCALLTYPE *Seek)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, VARIANT Position, SpeechStreamSeekPositionType Origin, VARIANT *NewPosition); /*** ISpeechCustomStream methods ***/ HRESULT (STDMETHODCALLTYPE *get_BaseStream)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, IUnknown **ppUnkStream); HRESULT (STDMETHODCALLTYPE *putref_BaseStream)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, IUnknown *pUnkStream); END_INTERFACE } ISpeechCustomStreamVtbl; + interface ISpeechCustomStream { CONST_VTBL ISpeechCustomStreamVtbl* lpVtbl; }; @@ -15499,22 +13459,6 @@ static FORCEINLINE HRESULT ISpeechCustomStream_putref_BaseStream(ISpeechCustomSt #endif -HRESULT STDMETHODCALLTYPE ISpeechCustomStream_get_BaseStream_Proxy( - ISpeechCustomStream* This, - IUnknown **ppUnkStream); -void __RPC_STUB ISpeechCustomStream_get_BaseStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechCustomStream_putref_BaseStream_Proxy( - ISpeechCustomStream* This, - IUnknown *pUnkStream); -void __RPC_STUB ISpeechCustomStream_putref_BaseStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechCustomStream_INTERFACE_DEFINED__ */ @@ -15545,29 +13489,29 @@ typedef struct ISpeechMemoryStreamVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechMemoryStream* This); + ISpeechMemoryStream *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechMemoryStream* This); + ISpeechMemoryStream *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -15575,7 +13519,7 @@ typedef struct ISpeechMemoryStreamVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -15587,41 +13531,42 @@ typedef struct ISpeechMemoryStreamVtbl { /*** ISpeechBaseStream methods ***/ HRESULT (STDMETHODCALLTYPE *get_Format)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, ISpeechAudioFormat **AudioFormat); HRESULT (STDMETHODCALLTYPE *putref_Format)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, ISpeechAudioFormat *AudioFormat); HRESULT (STDMETHODCALLTYPE *Read)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, VARIANT *Buffer, LONG NumberOfBytes, LONG *BytesRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, VARIANT Buffer, LONG *BytesWritten); HRESULT (STDMETHODCALLTYPE *Seek)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, VARIANT Position, SpeechStreamSeekPositionType Origin, VARIANT *NewPosition); /*** ISpeechMemoryStream methods ***/ HRESULT (STDMETHODCALLTYPE *SetData)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, VARIANT Data); HRESULT (STDMETHODCALLTYPE *GetData)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, VARIANT *pData); END_INTERFACE } ISpeechMemoryStreamVtbl; + interface ISpeechMemoryStream { CONST_VTBL ISpeechMemoryStreamVtbl* lpVtbl; }; @@ -15698,22 +13643,6 @@ static FORCEINLINE HRESULT ISpeechMemoryStream_GetData(ISpeechMemoryStream* This #endif -HRESULT STDMETHODCALLTYPE ISpeechMemoryStream_SetData_Proxy( - ISpeechMemoryStream* This, - VARIANT Data); -void __RPC_STUB ISpeechMemoryStream_SetData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechMemoryStream_GetData_Proxy( - ISpeechMemoryStream* This, - VARIANT *pData); -void __RPC_STUB ISpeechMemoryStream_GetData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechMemoryStream_INTERFACE_DEFINED__ */ @@ -15753,29 +13682,29 @@ typedef struct ISpeechAudioStatusVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechAudioStatus* This); + ISpeechAudioStatus *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechAudioStatus* This); + ISpeechAudioStatus *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -15783,7 +13712,7 @@ typedef struct ISpeechAudioStatusVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -15795,27 +13724,28 @@ typedef struct ISpeechAudioStatusVtbl { /*** ISpeechAudioStatus methods ***/ HRESULT (STDMETHODCALLTYPE *get_FreeBufferSpace)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, LONG *FreeBufferSpace); HRESULT (STDMETHODCALLTYPE *get_NonBlockingIO)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, LONG *NonBlockingIO); HRESULT (STDMETHODCALLTYPE *get_State)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, SpeechAudioState *State); HRESULT (STDMETHODCALLTYPE *get_CurrentSeekPosition)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, VARIANT *CurrentSeekPosition); HRESULT (STDMETHODCALLTYPE *get_CurrentDevicePosition)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, VARIANT *CurrentDevicePosition); END_INTERFACE } ISpeechAudioStatusVtbl; + interface ISpeechAudioStatus { CONST_VTBL ISpeechAudioStatusVtbl* lpVtbl; }; @@ -15882,46 +13812,6 @@ static FORCEINLINE HRESULT ISpeechAudioStatus_get_CurrentDevicePosition(ISpeechA #endif -HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_FreeBufferSpace_Proxy( - ISpeechAudioStatus* This, - LONG *FreeBufferSpace); -void __RPC_STUB ISpeechAudioStatus_get_FreeBufferSpace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_NonBlockingIO_Proxy( - ISpeechAudioStatus* This, - LONG *NonBlockingIO); -void __RPC_STUB ISpeechAudioStatus_get_NonBlockingIO_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_State_Proxy( - ISpeechAudioStatus* This, - SpeechAudioState *State); -void __RPC_STUB ISpeechAudioStatus_get_State_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_CurrentSeekPosition_Proxy( - ISpeechAudioStatus* This, - VARIANT *CurrentSeekPosition); -void __RPC_STUB ISpeechAudioStatus_get_CurrentSeekPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_CurrentDevicePosition_Proxy( - ISpeechAudioStatus* This, - VARIANT *CurrentDevicePosition); -void __RPC_STUB ISpeechAudioStatus_get_CurrentDevicePosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechAudioStatus_INTERFACE_DEFINED__ */ @@ -15964,29 +13854,29 @@ typedef struct ISpeechAudioBufferInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechAudioBufferInfo* This); + ISpeechAudioBufferInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechAudioBufferInfo* This); + ISpeechAudioBufferInfo *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -15994,7 +13884,7 @@ typedef struct ISpeechAudioBufferInfoVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -16006,31 +13896,32 @@ typedef struct ISpeechAudioBufferInfoVtbl { /*** ISpeechAudioBufferInfo methods ***/ HRESULT (STDMETHODCALLTYPE *get_MinNotification)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, LONG *MinNotification); HRESULT (STDMETHODCALLTYPE *put_MinNotification)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, LONG MinNotification); HRESULT (STDMETHODCALLTYPE *get_BufferSize)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, LONG *BufferSize); HRESULT (STDMETHODCALLTYPE *put_BufferSize)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, LONG BufferSize); HRESULT (STDMETHODCALLTYPE *get_EventBias)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, LONG *EventBias); HRESULT (STDMETHODCALLTYPE *put_EventBias)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, LONG EventBias); END_INTERFACE } ISpeechAudioBufferInfoVtbl; + interface ISpeechAudioBufferInfo { CONST_VTBL ISpeechAudioBufferInfoVtbl* lpVtbl; }; @@ -16101,54 +13992,6 @@ static FORCEINLINE HRESULT ISpeechAudioBufferInfo_put_EventBias(ISpeechAudioBuff #endif -HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_get_MinNotification_Proxy( - ISpeechAudioBufferInfo* This, - LONG *MinNotification); -void __RPC_STUB ISpeechAudioBufferInfo_get_MinNotification_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_put_MinNotification_Proxy( - ISpeechAudioBufferInfo* This, - LONG MinNotification); -void __RPC_STUB ISpeechAudioBufferInfo_put_MinNotification_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_get_BufferSize_Proxy( - ISpeechAudioBufferInfo* This, - LONG *BufferSize); -void __RPC_STUB ISpeechAudioBufferInfo_get_BufferSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_put_BufferSize_Proxy( - ISpeechAudioBufferInfo* This, - LONG BufferSize); -void __RPC_STUB ISpeechAudioBufferInfo_put_BufferSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_get_EventBias_Proxy( - ISpeechAudioBufferInfo* This, - LONG *EventBias); -void __RPC_STUB ISpeechAudioBufferInfo_get_EventBias_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_put_EventBias_Proxy( - ISpeechAudioBufferInfo* This, - LONG EventBias); -void __RPC_STUB ISpeechAudioBufferInfo_put_EventBias_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechAudioBufferInfo_INTERFACE_DEFINED__ */ @@ -16215,29 +14058,29 @@ typedef struct ISpeechWaveFormatExVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechWaveFormatEx* This); + ISpeechWaveFormatEx *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechWaveFormatEx* This); + ISpeechWaveFormatEx *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -16245,7 +14088,7 @@ typedef struct ISpeechWaveFormatExVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -16257,63 +14100,64 @@ typedef struct ISpeechWaveFormatExVtbl { /*** ISpeechWaveFormatEx methods ***/ HRESULT (STDMETHODCALLTYPE *get_FormatTag)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, short *FormatTag); HRESULT (STDMETHODCALLTYPE *put_FormatTag)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, short FormatTag); HRESULT (STDMETHODCALLTYPE *get_Channels)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, short *Channels); HRESULT (STDMETHODCALLTYPE *put_Channels)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, short Channels); HRESULT (STDMETHODCALLTYPE *get_SamplesPerSec)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, LONG *SamplesPerSec); HRESULT (STDMETHODCALLTYPE *put_SamplesPerSec)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, LONG SamplesPerSec); HRESULT (STDMETHODCALLTYPE *get_AvgBytesPerSec)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, LONG *AvgBytesPerSec); HRESULT (STDMETHODCALLTYPE *put_AvgBytesPerSec)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, LONG AvgBytesPerSec); HRESULT (STDMETHODCALLTYPE *get_BlockAlign)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, short *BlockAlign); HRESULT (STDMETHODCALLTYPE *put_BlockAlign)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, short BlockAlign); HRESULT (STDMETHODCALLTYPE *get_BitsPerSample)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, short *BitsPerSample); HRESULT (STDMETHODCALLTYPE *put_BitsPerSample)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, short BitsPerSample); HRESULT (STDMETHODCALLTYPE *get_ExtraData)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, VARIANT *ExtraData); HRESULT (STDMETHODCALLTYPE *put_ExtraData)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, VARIANT ExtraData); END_INTERFACE } ISpeechWaveFormatExVtbl; + interface ISpeechWaveFormatEx { CONST_VTBL ISpeechWaveFormatExVtbl* lpVtbl; }; @@ -16416,118 +14260,6 @@ static FORCEINLINE HRESULT ISpeechWaveFormatEx_put_ExtraData(ISpeechWaveFormatEx #endif -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_FormatTag_Proxy( - ISpeechWaveFormatEx* This, - short *FormatTag); -void __RPC_STUB ISpeechWaveFormatEx_get_FormatTag_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_FormatTag_Proxy( - ISpeechWaveFormatEx* This, - short FormatTag); -void __RPC_STUB ISpeechWaveFormatEx_put_FormatTag_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_Channels_Proxy( - ISpeechWaveFormatEx* This, - short *Channels); -void __RPC_STUB ISpeechWaveFormatEx_get_Channels_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_Channels_Proxy( - ISpeechWaveFormatEx* This, - short Channels); -void __RPC_STUB ISpeechWaveFormatEx_put_Channels_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_SamplesPerSec_Proxy( - ISpeechWaveFormatEx* This, - LONG *SamplesPerSec); -void __RPC_STUB ISpeechWaveFormatEx_get_SamplesPerSec_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_SamplesPerSec_Proxy( - ISpeechWaveFormatEx* This, - LONG SamplesPerSec); -void __RPC_STUB ISpeechWaveFormatEx_put_SamplesPerSec_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_AvgBytesPerSec_Proxy( - ISpeechWaveFormatEx* This, - LONG *AvgBytesPerSec); -void __RPC_STUB ISpeechWaveFormatEx_get_AvgBytesPerSec_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_AvgBytesPerSec_Proxy( - ISpeechWaveFormatEx* This, - LONG AvgBytesPerSec); -void __RPC_STUB ISpeechWaveFormatEx_put_AvgBytesPerSec_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_BlockAlign_Proxy( - ISpeechWaveFormatEx* This, - short *BlockAlign); -void __RPC_STUB ISpeechWaveFormatEx_get_BlockAlign_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_BlockAlign_Proxy( - ISpeechWaveFormatEx* This, - short BlockAlign); -void __RPC_STUB ISpeechWaveFormatEx_put_BlockAlign_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_BitsPerSample_Proxy( - ISpeechWaveFormatEx* This, - short *BitsPerSample); -void __RPC_STUB ISpeechWaveFormatEx_get_BitsPerSample_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_BitsPerSample_Proxy( - ISpeechWaveFormatEx* This, - short BitsPerSample); -void __RPC_STUB ISpeechWaveFormatEx_put_BitsPerSample_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_ExtraData_Proxy( - ISpeechWaveFormatEx* This, - VARIANT *ExtraData); -void __RPC_STUB ISpeechWaveFormatEx_get_ExtraData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_ExtraData_Proxy( - ISpeechWaveFormatEx* This, - VARIANT ExtraData); -void __RPC_STUB ISpeechWaveFormatEx_put_ExtraData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechWaveFormatEx_INTERFACE_DEFINED__ */ @@ -16664,29 +14396,29 @@ typedef struct ISpeechVoiceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechVoice* This, + ISpeechVoice *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechVoice* This); + ISpeechVoice *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechVoice* This); + ISpeechVoice *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechVoice* This, + ISpeechVoice *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechVoice* This, + ISpeechVoice *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechVoice* This, + ISpeechVoice *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -16694,7 +14426,7 @@ typedef struct ISpeechVoiceVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechVoice* This, + ISpeechVoice *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -16706,142 +14438,142 @@ typedef struct ISpeechVoiceVtbl { /*** ISpeechVoice methods ***/ HRESULT (STDMETHODCALLTYPE *get_Status)( - ISpeechVoice* This, + ISpeechVoice *This, ISpeechVoiceStatus **Status); HRESULT (STDMETHODCALLTYPE *get_Voice)( - ISpeechVoice* This, + ISpeechVoice *This, ISpeechObjectToken **Voice); HRESULT (STDMETHODCALLTYPE *putref_Voice)( - ISpeechVoice* This, + ISpeechVoice *This, ISpeechObjectToken *Voice); HRESULT (STDMETHODCALLTYPE *get_AudioOutput)( - ISpeechVoice* This, + ISpeechVoice *This, ISpeechObjectToken **AudioOutput); HRESULT (STDMETHODCALLTYPE *putref_AudioOutput)( - ISpeechVoice* This, + ISpeechVoice *This, ISpeechObjectToken *AudioOutput); HRESULT (STDMETHODCALLTYPE *get_AudioOutputStream)( - ISpeechVoice* This, + ISpeechVoice *This, ISpeechBaseStream **AudioOutputStream); HRESULT (STDMETHODCALLTYPE *putref_AudioOutputStream)( - ISpeechVoice* This, + ISpeechVoice *This, ISpeechBaseStream *AudioOutputStream); HRESULT (STDMETHODCALLTYPE *get_Rate)( - ISpeechVoice* This, + ISpeechVoice *This, LONG *Rate); HRESULT (STDMETHODCALLTYPE *put_Rate)( - ISpeechVoice* This, + ISpeechVoice *This, LONG Rate); HRESULT (STDMETHODCALLTYPE *get_Volume)( - ISpeechVoice* This, + ISpeechVoice *This, LONG *Volume); HRESULT (STDMETHODCALLTYPE *put_Volume)( - ISpeechVoice* This, + ISpeechVoice *This, LONG Volume); HRESULT (STDMETHODCALLTYPE *put_AllowAudioOutputFormatChangesOnNextSet)( - ISpeechVoice* This, + ISpeechVoice *This, VARIANT_BOOL Allow); HRESULT (STDMETHODCALLTYPE *get_AllowAudioOutputFormatChangesOnNextSet)( - ISpeechVoice* This, + ISpeechVoice *This, VARIANT_BOOL *Allow); HRESULT (STDMETHODCALLTYPE *get_EventInterests)( - ISpeechVoice* This, + ISpeechVoice *This, SpeechVoiceEvents *EventInterestFlags); HRESULT (STDMETHODCALLTYPE *put_EventInterests)( - ISpeechVoice* This, + ISpeechVoice *This, SpeechVoiceEvents EventInterestFlags); HRESULT (STDMETHODCALLTYPE *put_Priority)( - ISpeechVoice* This, + ISpeechVoice *This, SpeechVoicePriority Priority); HRESULT (STDMETHODCALLTYPE *get_Priority)( - ISpeechVoice* This, + ISpeechVoice *This, SpeechVoicePriority *Priority); HRESULT (STDMETHODCALLTYPE *put_AlertBoundary)( - ISpeechVoice* This, + ISpeechVoice *This, SpeechVoiceEvents Boundary); HRESULT (STDMETHODCALLTYPE *get_AlertBoundary)( - ISpeechVoice* This, + ISpeechVoice *This, SpeechVoiceEvents *Boundary); HRESULT (STDMETHODCALLTYPE *put_SynchronousSpeakTimeout)( - ISpeechVoice* This, + ISpeechVoice *This, LONG msTimeout); HRESULT (STDMETHODCALLTYPE *get_SynchronousSpeakTimeout)( - ISpeechVoice* This, + ISpeechVoice *This, LONG *msTimeout); HRESULT (STDMETHODCALLTYPE *Speak)( - ISpeechVoice* This, + ISpeechVoice *This, BSTR Text, SpeechVoiceSpeakFlags Flags, LONG *StreamNumber); HRESULT (STDMETHODCALLTYPE *SpeakStream)( - ISpeechVoice* This, + ISpeechVoice *This, ISpeechBaseStream *Stream, SpeechVoiceSpeakFlags Flags, LONG *StreamNumber); HRESULT (STDMETHODCALLTYPE *Pause)( - ISpeechVoice* This); + ISpeechVoice *This); HRESULT (STDMETHODCALLTYPE *Resume)( - ISpeechVoice* This); + ISpeechVoice *This); HRESULT (STDMETHODCALLTYPE *Skip)( - ISpeechVoice* This, + ISpeechVoice *This, const BSTR Type, LONG NumItems, LONG *NumSkipped); HRESULT (STDMETHODCALLTYPE *GetVoices)( - ISpeechVoice* This, + ISpeechVoice *This, BSTR RequiredAttributes, BSTR OptionalAttributes, ISpeechObjectTokens **ObjectTokens); HRESULT (STDMETHODCALLTYPE *GetAudioOutputs)( - ISpeechVoice* This, + ISpeechVoice *This, BSTR RequiredAttributes, BSTR OptionalAttributes, ISpeechObjectTokens **ObjectTokens); HRESULT (STDMETHODCALLTYPE *WaitUntilDone)( - ISpeechVoice* This, + ISpeechVoice *This, LONG msTimeout, VARIANT_BOOL *Done); HRESULT (STDMETHODCALLTYPE *SpeakCompleteEvent)( - ISpeechVoice* This, + ISpeechVoice *This, LONG *Handle); HRESULT (STDMETHODCALLTYPE *IsUISupported)( - ISpeechVoice* This, + ISpeechVoice *This, const BSTR TypeOfUI, const VARIANT *ExtraData, VARIANT_BOOL *Supported); HRESULT (STDMETHODCALLTYPE *DisplayUI)( - ISpeechVoice* This, + ISpeechVoice *This, LONG hWndParent, BSTR Title, const BSTR TypeOfUI, @@ -16849,6 +14581,7 @@ typedef struct ISpeechVoiceVtbl { END_INTERFACE } ISpeechVoiceVtbl; + interface ISpeechVoice { CONST_VTBL ISpeechVoiceVtbl* lpVtbl; }; @@ -17023,276 +14756,6 @@ static FORCEINLINE HRESULT ISpeechVoice_DisplayUI(ISpeechVoice* This,LONG hWndPa #endif -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Status_Proxy( - ISpeechVoice* This, - ISpeechVoiceStatus **Status); -void __RPC_STUB ISpeechVoice_get_Status_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Voice_Proxy( - ISpeechVoice* This, - ISpeechObjectToken **Voice); -void __RPC_STUB ISpeechVoice_get_Voice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_putref_Voice_Proxy( - ISpeechVoice* This, - ISpeechObjectToken *Voice); -void __RPC_STUB ISpeechVoice_putref_Voice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_AudioOutput_Proxy( - ISpeechVoice* This, - ISpeechObjectToken **AudioOutput); -void __RPC_STUB ISpeechVoice_get_AudioOutput_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_putref_AudioOutput_Proxy( - ISpeechVoice* This, - ISpeechObjectToken *AudioOutput); -void __RPC_STUB ISpeechVoice_putref_AudioOutput_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_AudioOutputStream_Proxy( - ISpeechVoice* This, - ISpeechBaseStream **AudioOutputStream); -void __RPC_STUB ISpeechVoice_get_AudioOutputStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_putref_AudioOutputStream_Proxy( - ISpeechVoice* This, - ISpeechBaseStream *AudioOutputStream); -void __RPC_STUB ISpeechVoice_putref_AudioOutputStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Rate_Proxy( - ISpeechVoice* This, - LONG *Rate); -void __RPC_STUB ISpeechVoice_get_Rate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_put_Rate_Proxy( - ISpeechVoice* This, - LONG Rate); -void __RPC_STUB ISpeechVoice_put_Rate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Volume_Proxy( - ISpeechVoice* This, - LONG *Volume); -void __RPC_STUB ISpeechVoice_get_Volume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_put_Volume_Proxy( - ISpeechVoice* This, - LONG Volume); -void __RPC_STUB ISpeechVoice_put_Volume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_put_AllowAudioOutputFormatChangesOnNextSet_Proxy( - ISpeechVoice* This, - VARIANT_BOOL Allow); -void __RPC_STUB ISpeechVoice_put_AllowAudioOutputFormatChangesOnNextSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_AllowAudioOutputFormatChangesOnNextSet_Proxy( - ISpeechVoice* This, - VARIANT_BOOL *Allow); -void __RPC_STUB ISpeechVoice_get_AllowAudioOutputFormatChangesOnNextSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_EventInterests_Proxy( - ISpeechVoice* This, - SpeechVoiceEvents *EventInterestFlags); -void __RPC_STUB ISpeechVoice_get_EventInterests_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_put_EventInterests_Proxy( - ISpeechVoice* This, - SpeechVoiceEvents EventInterestFlags); -void __RPC_STUB ISpeechVoice_put_EventInterests_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_put_Priority_Proxy( - ISpeechVoice* This, - SpeechVoicePriority Priority); -void __RPC_STUB ISpeechVoice_put_Priority_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Priority_Proxy( - ISpeechVoice* This, - SpeechVoicePriority *Priority); -void __RPC_STUB ISpeechVoice_get_Priority_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_put_AlertBoundary_Proxy( - ISpeechVoice* This, - SpeechVoiceEvents Boundary); -void __RPC_STUB ISpeechVoice_put_AlertBoundary_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_AlertBoundary_Proxy( - ISpeechVoice* This, - SpeechVoiceEvents *Boundary); -void __RPC_STUB ISpeechVoice_get_AlertBoundary_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_put_SynchronousSpeakTimeout_Proxy( - ISpeechVoice* This, - LONG msTimeout); -void __RPC_STUB ISpeechVoice_put_SynchronousSpeakTimeout_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_SynchronousSpeakTimeout_Proxy( - ISpeechVoice* This, - LONG *msTimeout); -void __RPC_STUB ISpeechVoice_get_SynchronousSpeakTimeout_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_Speak_Proxy( - ISpeechVoice* This, - BSTR Text, - SpeechVoiceSpeakFlags Flags, - LONG *StreamNumber); -void __RPC_STUB ISpeechVoice_Speak_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_SpeakStream_Proxy( - ISpeechVoice* This, - ISpeechBaseStream *Stream, - SpeechVoiceSpeakFlags Flags, - LONG *StreamNumber); -void __RPC_STUB ISpeechVoice_SpeakStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_Pause_Proxy( - ISpeechVoice* This); -void __RPC_STUB ISpeechVoice_Pause_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_Resume_Proxy( - ISpeechVoice* This); -void __RPC_STUB ISpeechVoice_Resume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_Skip_Proxy( - ISpeechVoice* This, - const BSTR Type, - LONG NumItems, - LONG *NumSkipped); -void __RPC_STUB ISpeechVoice_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_GetVoices_Proxy( - ISpeechVoice* This, - BSTR RequiredAttributes, - BSTR OptionalAttributes, - ISpeechObjectTokens **ObjectTokens); -void __RPC_STUB ISpeechVoice_GetVoices_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_GetAudioOutputs_Proxy( - ISpeechVoice* This, - BSTR RequiredAttributes, - BSTR OptionalAttributes, - ISpeechObjectTokens **ObjectTokens); -void __RPC_STUB ISpeechVoice_GetAudioOutputs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_WaitUntilDone_Proxy( - ISpeechVoice* This, - LONG msTimeout, - VARIANT_BOOL *Done); -void __RPC_STUB ISpeechVoice_WaitUntilDone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_SpeakCompleteEvent_Proxy( - ISpeechVoice* This, - LONG *Handle); -void __RPC_STUB ISpeechVoice_SpeakCompleteEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_IsUISupported_Proxy( - ISpeechVoice* This, - const BSTR TypeOfUI, - const VARIANT *ExtraData, - VARIANT_BOOL *Supported); -void __RPC_STUB ISpeechVoice_IsUISupported_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_DisplayUI_Proxy( - ISpeechVoice* This, - LONG hWndParent, - BSTR Title, - const BSTR TypeOfUI, - const VARIANT *ExtraData); -void __RPC_STUB ISpeechVoice_DisplayUI_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechVoice_INTERFACE_DEFINED__ */ @@ -17353,29 +14816,29 @@ typedef struct ISpeechVoiceStatusVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechVoiceStatus* This); + ISpeechVoiceStatus *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechVoiceStatus* This); + ISpeechVoiceStatus *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -17383,7 +14846,7 @@ typedef struct ISpeechVoiceStatusVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -17395,55 +14858,56 @@ typedef struct ISpeechVoiceStatusVtbl { /*** ISpeechVoiceStatus methods ***/ HRESULT (STDMETHODCALLTYPE *get_CurrentStreamNumber)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, LONG *StreamNumber); HRESULT (STDMETHODCALLTYPE *get_LastStreamNumberQueued)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, LONG *StreamNumber); HRESULT (STDMETHODCALLTYPE *get_LastHResult)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, LONG *HResult); HRESULT (STDMETHODCALLTYPE *get_RunningState)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, SpeechRunState *State); HRESULT (STDMETHODCALLTYPE *get_InputWordPosition)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, LONG *Position); HRESULT (STDMETHODCALLTYPE *get_InputWordLength)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, LONG *Length); HRESULT (STDMETHODCALLTYPE *get_InputSentencePosition)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, LONG *Position); HRESULT (STDMETHODCALLTYPE *get_InputSentenceLength)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, LONG *Length); HRESULT (STDMETHODCALLTYPE *get_LastBookmark)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, BSTR *Bookmark); HRESULT (STDMETHODCALLTYPE *get_LastBookmarkId)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, LONG *BookmarkId); HRESULT (STDMETHODCALLTYPE *get_PhonemeId)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, short *PhoneId); HRESULT (STDMETHODCALLTYPE *get_VisemeId)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, short *VisemeId); END_INTERFACE } ISpeechVoiceStatusVtbl; + interface ISpeechVoiceStatus { CONST_VTBL ISpeechVoiceStatusVtbl* lpVtbl; }; @@ -17538,102 +15002,6 @@ static FORCEINLINE HRESULT ISpeechVoiceStatus_get_VisemeId(ISpeechVoiceStatus* T #endif -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_CurrentStreamNumber_Proxy( - ISpeechVoiceStatus* This, - LONG *StreamNumber); -void __RPC_STUB ISpeechVoiceStatus_get_CurrentStreamNumber_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_LastStreamNumberQueued_Proxy( - ISpeechVoiceStatus* This, - LONG *StreamNumber); -void __RPC_STUB ISpeechVoiceStatus_get_LastStreamNumberQueued_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_LastHResult_Proxy( - ISpeechVoiceStatus* This, - LONG *HResult); -void __RPC_STUB ISpeechVoiceStatus_get_LastHResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_RunningState_Proxy( - ISpeechVoiceStatus* This, - SpeechRunState *State); -void __RPC_STUB ISpeechVoiceStatus_get_RunningState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_InputWordPosition_Proxy( - ISpeechVoiceStatus* This, - LONG *Position); -void __RPC_STUB ISpeechVoiceStatus_get_InputWordPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_InputWordLength_Proxy( - ISpeechVoiceStatus* This, - LONG *Length); -void __RPC_STUB ISpeechVoiceStatus_get_InputWordLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_InputSentencePosition_Proxy( - ISpeechVoiceStatus* This, - LONG *Position); -void __RPC_STUB ISpeechVoiceStatus_get_InputSentencePosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_InputSentenceLength_Proxy( - ISpeechVoiceStatus* This, - LONG *Length); -void __RPC_STUB ISpeechVoiceStatus_get_InputSentenceLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_LastBookmark_Proxy( - ISpeechVoiceStatus* This, - BSTR *Bookmark); -void __RPC_STUB ISpeechVoiceStatus_get_LastBookmark_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_LastBookmarkId_Proxy( - ISpeechVoiceStatus* This, - LONG *BookmarkId); -void __RPC_STUB ISpeechVoiceStatus_get_LastBookmarkId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_PhonemeId_Proxy( - ISpeechVoiceStatus* This, - short *PhoneId); -void __RPC_STUB ISpeechVoiceStatus_get_PhonemeId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_VisemeId_Proxy( - ISpeechVoiceStatus* This, - short *VisemeId); -void __RPC_STUB ISpeechVoiceStatus_get_VisemeId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechVoiceStatus_INTERFACE_DEFINED__ */ @@ -18150,29 +15518,29 @@ typedef struct _ISpeechVoiceEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - _ISpeechVoiceEvents* This, + _ISpeechVoiceEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - _ISpeechVoiceEvents* This); + _ISpeechVoiceEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - _ISpeechVoiceEvents* This); + _ISpeechVoiceEvents *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - _ISpeechVoiceEvents* This, + _ISpeechVoiceEvents *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - _ISpeechVoiceEvents* This, + _ISpeechVoiceEvents *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - _ISpeechVoiceEvents* This, + _ISpeechVoiceEvents *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -18180,7 +15548,7 @@ typedef struct _ISpeechVoiceEventsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - _ISpeechVoiceEvents* This, + _ISpeechVoiceEvents *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -18192,6 +15560,7 @@ typedef struct _ISpeechVoiceEventsVtbl { END_INTERFACE } _ISpeechVoiceEventsVtbl; + interface _ISpeechVoiceEvents { CONST_VTBL _ISpeechVoiceEventsVtbl* lpVtbl; }; @@ -18359,29 +15728,29 @@ typedef struct ISpeechRecognizerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechRecognizer* This); + ISpeechRecognizer *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechRecognizer* This); + ISpeechRecognizer *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -18389,7 +15758,7 @@ typedef struct ISpeechRecognizerVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -18401,133 +15770,134 @@ typedef struct ISpeechRecognizerVtbl { /*** ISpeechRecognizer methods ***/ HRESULT (STDMETHODCALLTYPE *putref_Recognizer)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechObjectToken *Recognizer); HRESULT (STDMETHODCALLTYPE *get_Recognizer)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechObjectToken **Recognizer); HRESULT (STDMETHODCALLTYPE *put_AllowAudioInputFormatChangesOnNextSet)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, VARIANT_BOOL Allow); HRESULT (STDMETHODCALLTYPE *get_AllowAudioInputFormatChangesOnNextSet)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, VARIANT_BOOL *Allow); HRESULT (STDMETHODCALLTYPE *putref_AudioInput)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechObjectToken *AudioInput); HRESULT (STDMETHODCALLTYPE *get_AudioInput)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechObjectToken **AudioInput); HRESULT (STDMETHODCALLTYPE *putref_AudioInputStream)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechBaseStream *AudioInputStream); HRESULT (STDMETHODCALLTYPE *get_AudioInputStream)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechBaseStream **AudioInputStream); HRESULT (STDMETHODCALLTYPE *get_IsShared)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, VARIANT_BOOL *Shared); HRESULT (STDMETHODCALLTYPE *put_State)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, SpeechRecognizerState State); HRESULT (STDMETHODCALLTYPE *get_State)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, SpeechRecognizerState *State); HRESULT (STDMETHODCALLTYPE *get_Status)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechRecognizerStatus **Status); HRESULT (STDMETHODCALLTYPE *putref_Profile)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechObjectToken *Profile); HRESULT (STDMETHODCALLTYPE *get_Profile)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechObjectToken **Profile); HRESULT (STDMETHODCALLTYPE *EmulateRecognition)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, VARIANT TextElements, VARIANT *ElementDisplayAttributes, LONG LanguageId); HRESULT (STDMETHODCALLTYPE *CreateRecoContext)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechRecoContext **NewContext); HRESULT (STDMETHODCALLTYPE *GetFormat)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, SpeechFormatType Type, ISpeechAudioFormat **Format); HRESULT (STDMETHODCALLTYPE *SetPropertyNumber)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, const BSTR Name, LONG Value, VARIANT_BOOL *Supported); HRESULT (STDMETHODCALLTYPE *GetPropertyNumber)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, const BSTR Name, LONG *Value, VARIANT_BOOL *Supported); HRESULT (STDMETHODCALLTYPE *SetPropertyString)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, const BSTR Name, const BSTR Value, VARIANT_BOOL *Supported); HRESULT (STDMETHODCALLTYPE *GetPropertyString)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, const BSTR Name, BSTR *Value, VARIANT_BOOL *Supported); HRESULT (STDMETHODCALLTYPE *IsUISupported)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, const BSTR TypeOfUI, const VARIANT *ExtraData, VARIANT_BOOL *Supported); HRESULT (STDMETHODCALLTYPE *DisplayUI)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, LONG hWndParent, BSTR Title, const BSTR TypeOfUI, const VARIANT *ExtraData); HRESULT (STDMETHODCALLTYPE *GetRecognizers)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, BSTR RequiredAttributes, BSTR OptionalAttributes, ISpeechObjectTokens **ObjectTokens); HRESULT (STDMETHODCALLTYPE *GetAudioInputs)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, BSTR RequiredAttributes, BSTR OptionalAttributes, ISpeechObjectTokens **ObjectTokens); HRESULT (STDMETHODCALLTYPE *GetProfiles)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, BSTR RequiredAttributes, BSTR OptionalAttributes, ISpeechObjectTokens **ObjectTokens); END_INTERFACE } ISpeechRecognizerVtbl; + interface ISpeechRecognizer { CONST_VTBL ISpeechRecognizerVtbl* lpVtbl; }; @@ -18678,236 +16048,6 @@ static FORCEINLINE HRESULT ISpeechRecognizer_GetProfiles(ISpeechRecognizer* This #endif -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_putref_Recognizer_Proxy( - ISpeechRecognizer* This, - ISpeechObjectToken *Recognizer); -void __RPC_STUB ISpeechRecognizer_putref_Recognizer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_Recognizer_Proxy( - ISpeechRecognizer* This, - ISpeechObjectToken **Recognizer); -void __RPC_STUB ISpeechRecognizer_get_Recognizer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_put_AllowAudioInputFormatChangesOnNextSet_Proxy( - ISpeechRecognizer* This, - VARIANT_BOOL Allow); -void __RPC_STUB ISpeechRecognizer_put_AllowAudioInputFormatChangesOnNextSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_AllowAudioInputFormatChangesOnNextSet_Proxy( - ISpeechRecognizer* This, - VARIANT_BOOL *Allow); -void __RPC_STUB ISpeechRecognizer_get_AllowAudioInputFormatChangesOnNextSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_putref_AudioInput_Proxy( - ISpeechRecognizer* This, - ISpeechObjectToken *AudioInput); -void __RPC_STUB ISpeechRecognizer_putref_AudioInput_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_AudioInput_Proxy( - ISpeechRecognizer* This, - ISpeechObjectToken **AudioInput); -void __RPC_STUB ISpeechRecognizer_get_AudioInput_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_putref_AudioInputStream_Proxy( - ISpeechRecognizer* This, - ISpeechBaseStream *AudioInputStream); -void __RPC_STUB ISpeechRecognizer_putref_AudioInputStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_AudioInputStream_Proxy( - ISpeechRecognizer* This, - ISpeechBaseStream **AudioInputStream); -void __RPC_STUB ISpeechRecognizer_get_AudioInputStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_IsShared_Proxy( - ISpeechRecognizer* This, - VARIANT_BOOL *Shared); -void __RPC_STUB ISpeechRecognizer_get_IsShared_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_put_State_Proxy( - ISpeechRecognizer* This, - SpeechRecognizerState State); -void __RPC_STUB ISpeechRecognizer_put_State_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_State_Proxy( - ISpeechRecognizer* This, - SpeechRecognizerState *State); -void __RPC_STUB ISpeechRecognizer_get_State_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_Status_Proxy( - ISpeechRecognizer* This, - ISpeechRecognizerStatus **Status); -void __RPC_STUB ISpeechRecognizer_get_Status_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_putref_Profile_Proxy( - ISpeechRecognizer* This, - ISpeechObjectToken *Profile); -void __RPC_STUB ISpeechRecognizer_putref_Profile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_Profile_Proxy( - ISpeechRecognizer* This, - ISpeechObjectToken **Profile); -void __RPC_STUB ISpeechRecognizer_get_Profile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_EmulateRecognition_Proxy( - ISpeechRecognizer* This, - VARIANT TextElements, - VARIANT *ElementDisplayAttributes, - LONG LanguageId); -void __RPC_STUB ISpeechRecognizer_EmulateRecognition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_CreateRecoContext_Proxy( - ISpeechRecognizer* This, - ISpeechRecoContext **NewContext); -void __RPC_STUB ISpeechRecognizer_CreateRecoContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetFormat_Proxy( - ISpeechRecognizer* This, - SpeechFormatType Type, - ISpeechAudioFormat **Format); -void __RPC_STUB ISpeechRecognizer_GetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_SetPropertyNumber_Proxy( - ISpeechRecognizer* This, - const BSTR Name, - LONG Value, - VARIANT_BOOL *Supported); -void __RPC_STUB ISpeechRecognizer_SetPropertyNumber_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetPropertyNumber_Proxy( - ISpeechRecognizer* This, - const BSTR Name, - LONG *Value, - VARIANT_BOOL *Supported); -void __RPC_STUB ISpeechRecognizer_GetPropertyNumber_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_SetPropertyString_Proxy( - ISpeechRecognizer* This, - const BSTR Name, - const BSTR Value, - VARIANT_BOOL *Supported); -void __RPC_STUB ISpeechRecognizer_SetPropertyString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetPropertyString_Proxy( - ISpeechRecognizer* This, - const BSTR Name, - BSTR *Value, - VARIANT_BOOL *Supported); -void __RPC_STUB ISpeechRecognizer_GetPropertyString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_IsUISupported_Proxy( - ISpeechRecognizer* This, - const BSTR TypeOfUI, - const VARIANT *ExtraData, - VARIANT_BOOL *Supported); -void __RPC_STUB ISpeechRecognizer_IsUISupported_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_DisplayUI_Proxy( - ISpeechRecognizer* This, - LONG hWndParent, - BSTR Title, - const BSTR TypeOfUI, - const VARIANT *ExtraData); -void __RPC_STUB ISpeechRecognizer_DisplayUI_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetRecognizers_Proxy( - ISpeechRecognizer* This, - BSTR RequiredAttributes, - BSTR OptionalAttributes, - ISpeechObjectTokens **ObjectTokens); -void __RPC_STUB ISpeechRecognizer_GetRecognizers_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetAudioInputs_Proxy( - ISpeechRecognizer* This, - BSTR RequiredAttributes, - BSTR OptionalAttributes, - ISpeechObjectTokens **ObjectTokens); -void __RPC_STUB ISpeechRecognizer_GetAudioInputs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetProfiles_Proxy( - ISpeechRecognizer* This, - BSTR RequiredAttributes, - BSTR OptionalAttributes, - ISpeechObjectTokens **ObjectTokens); -void __RPC_STUB ISpeechRecognizer_GetProfiles_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechRecognizer_INTERFACE_DEFINED__ */ @@ -18950,29 +16090,29 @@ typedef struct ISpeechRecognizerStatusVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechRecognizerStatus* This); + ISpeechRecognizerStatus *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechRecognizerStatus* This); + ISpeechRecognizerStatus *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -18980,7 +16120,7 @@ typedef struct ISpeechRecognizerStatusVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -18992,31 +16132,32 @@ typedef struct ISpeechRecognizerStatusVtbl { /*** ISpeechRecognizerStatus methods ***/ HRESULT (STDMETHODCALLTYPE *get_AudioStatus)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, ISpeechAudioStatus **AudioStatus); HRESULT (STDMETHODCALLTYPE *get_CurrentStreamPosition)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, VARIANT *pCurrentStreamPos); HRESULT (STDMETHODCALLTYPE *get_CurrentStreamNumber)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, LONG *StreamNumber); HRESULT (STDMETHODCALLTYPE *get_NumberOfActiveRules)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, LONG *NumberOfActiveRules); HRESULT (STDMETHODCALLTYPE *get_ClsidEngine)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, BSTR *ClsidEngine); HRESULT (STDMETHODCALLTYPE *get_SupportedLanguages)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, VARIANT *SupportedLanguages); END_INTERFACE } ISpeechRecognizerStatusVtbl; + interface ISpeechRecognizerStatus { CONST_VTBL ISpeechRecognizerStatusVtbl* lpVtbl; }; @@ -19087,54 +16228,6 @@ static FORCEINLINE HRESULT ISpeechRecognizerStatus_get_SupportedLanguages(ISpeec #endif -HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_AudioStatus_Proxy( - ISpeechRecognizerStatus* This, - ISpeechAudioStatus **AudioStatus); -void __RPC_STUB ISpeechRecognizerStatus_get_AudioStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_CurrentStreamPosition_Proxy( - ISpeechRecognizerStatus* This, - VARIANT *pCurrentStreamPos); -void __RPC_STUB ISpeechRecognizerStatus_get_CurrentStreamPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_CurrentStreamNumber_Proxy( - ISpeechRecognizerStatus* This, - LONG *StreamNumber); -void __RPC_STUB ISpeechRecognizerStatus_get_CurrentStreamNumber_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_NumberOfActiveRules_Proxy( - ISpeechRecognizerStatus* This, - LONG *NumberOfActiveRules); -void __RPC_STUB ISpeechRecognizerStatus_get_NumberOfActiveRules_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_ClsidEngine_Proxy( - ISpeechRecognizerStatus* This, - BSTR *ClsidEngine); -void __RPC_STUB ISpeechRecognizerStatus_get_ClsidEngine_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_SupportedLanguages_Proxy( - ISpeechRecognizerStatus* This, - VARIANT *SupportedLanguages); -void __RPC_STUB ISpeechRecognizerStatus_get_SupportedLanguages_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechRecognizerStatus_INTERFACE_DEFINED__ */ @@ -19238,29 +16331,29 @@ typedef struct ISpeechRecoContextVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechRecoContext* This); + ISpeechRecoContext *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechRecoContext* This); + ISpeechRecoContext *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -19268,7 +16361,7 @@ typedef struct ISpeechRecoContextVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -19280,109 +16373,110 @@ typedef struct ISpeechRecoContextVtbl { /*** ISpeechRecoContext methods ***/ HRESULT (STDMETHODCALLTYPE *get_Recognizer)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, ISpeechRecognizer **Recognizer); HRESULT (STDMETHODCALLTYPE *get_AudioInputInterferenceStatus)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechInterference *Interference); HRESULT (STDMETHODCALLTYPE *get_RequestedUIType)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, BSTR *UIType); HRESULT (STDMETHODCALLTYPE *putref_Voice)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, ISpeechVoice *Voice); HRESULT (STDMETHODCALLTYPE *get_Voice)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, ISpeechVoice **Voice); HRESULT (STDMETHODCALLTYPE *put_AllowVoiceFormatMatchingOnNextSet)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, VARIANT_BOOL Allow); HRESULT (STDMETHODCALLTYPE *get_AllowVoiceFormatMatchingOnNextSet)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, VARIANT_BOOL *pAllow); HRESULT (STDMETHODCALLTYPE *put_VoicePurgeEvent)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechRecoEvents EventInterest); HRESULT (STDMETHODCALLTYPE *get_VoicePurgeEvent)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechRecoEvents *EventInterest); HRESULT (STDMETHODCALLTYPE *put_EventInterests)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechRecoEvents EventInterest); HRESULT (STDMETHODCALLTYPE *get_EventInterests)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechRecoEvents *EventInterest); HRESULT (STDMETHODCALLTYPE *put_CmdMaxAlternates)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, LONG MaxAlternates); HRESULT (STDMETHODCALLTYPE *get_CmdMaxAlternates)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, LONG *MaxAlternates); HRESULT (STDMETHODCALLTYPE *put_State)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechRecoContextState State); HRESULT (STDMETHODCALLTYPE *get_State)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechRecoContextState *State); HRESULT (STDMETHODCALLTYPE *put_RetainedAudio)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechRetainedAudioOptions Option); HRESULT (STDMETHODCALLTYPE *get_RetainedAudio)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechRetainedAudioOptions *Option); HRESULT (STDMETHODCALLTYPE *putref_RetainedAudioFormat)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, ISpeechAudioFormat *Format); HRESULT (STDMETHODCALLTYPE *get_RetainedAudioFormat)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, ISpeechAudioFormat **Format); HRESULT (STDMETHODCALLTYPE *Pause)( - ISpeechRecoContext* This); + ISpeechRecoContext *This); HRESULT (STDMETHODCALLTYPE *Resume)( - ISpeechRecoContext* This); + ISpeechRecoContext *This); HRESULT (STDMETHODCALLTYPE *CreateGrammar)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, VARIANT GrammarId, ISpeechRecoGrammar **Grammar); HRESULT (STDMETHODCALLTYPE *CreateResultFromMemory)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, VARIANT *ResultBlock, ISpeechRecoResult **Result); HRESULT (STDMETHODCALLTYPE *Bookmark)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechBookmarkOptions Options, VARIANT StreamPos, VARIANT BookmarkId); HRESULT (STDMETHODCALLTYPE *SetAdaptationData)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, BSTR AdaptationString); END_INTERFACE } ISpeechRecoContextVtbl; + interface ISpeechRecoContext { CONST_VTBL ISpeechRecoContextVtbl* lpVtbl; }; @@ -19529,208 +16623,6 @@ static FORCEINLINE HRESULT ISpeechRecoContext_SetAdaptationData(ISpeechRecoConte #endif -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_Recognizer_Proxy( - ISpeechRecoContext* This, - ISpeechRecognizer **Recognizer); -void __RPC_STUB ISpeechRecoContext_get_Recognizer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_AudioInputInterferenceStatus_Proxy( - ISpeechRecoContext* This, - SpeechInterference *Interference); -void __RPC_STUB ISpeechRecoContext_get_AudioInputInterferenceStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_RequestedUIType_Proxy( - ISpeechRecoContext* This, - BSTR *UIType); -void __RPC_STUB ISpeechRecoContext_get_RequestedUIType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_putref_Voice_Proxy( - ISpeechRecoContext* This, - ISpeechVoice *Voice); -void __RPC_STUB ISpeechRecoContext_putref_Voice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_Voice_Proxy( - ISpeechRecoContext* This, - ISpeechVoice **Voice); -void __RPC_STUB ISpeechRecoContext_get_Voice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_AllowVoiceFormatMatchingOnNextSet_Proxy( - ISpeechRecoContext* This, - VARIANT_BOOL Allow); -void __RPC_STUB ISpeechRecoContext_put_AllowVoiceFormatMatchingOnNextSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_AllowVoiceFormatMatchingOnNextSet_Proxy( - ISpeechRecoContext* This, - VARIANT_BOOL *pAllow); -void __RPC_STUB ISpeechRecoContext_get_AllowVoiceFormatMatchingOnNextSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_VoicePurgeEvent_Proxy( - ISpeechRecoContext* This, - SpeechRecoEvents EventInterest); -void __RPC_STUB ISpeechRecoContext_put_VoicePurgeEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_VoicePurgeEvent_Proxy( - ISpeechRecoContext* This, - SpeechRecoEvents *EventInterest); -void __RPC_STUB ISpeechRecoContext_get_VoicePurgeEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_EventInterests_Proxy( - ISpeechRecoContext* This, - SpeechRecoEvents EventInterest); -void __RPC_STUB ISpeechRecoContext_put_EventInterests_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_EventInterests_Proxy( - ISpeechRecoContext* This, - SpeechRecoEvents *EventInterest); -void __RPC_STUB ISpeechRecoContext_get_EventInterests_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_CmdMaxAlternates_Proxy( - ISpeechRecoContext* This, - LONG MaxAlternates); -void __RPC_STUB ISpeechRecoContext_put_CmdMaxAlternates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_CmdMaxAlternates_Proxy( - ISpeechRecoContext* This, - LONG *MaxAlternates); -void __RPC_STUB ISpeechRecoContext_get_CmdMaxAlternates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_State_Proxy( - ISpeechRecoContext* This, - SpeechRecoContextState State); -void __RPC_STUB ISpeechRecoContext_put_State_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_State_Proxy( - ISpeechRecoContext* This, - SpeechRecoContextState *State); -void __RPC_STUB ISpeechRecoContext_get_State_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_RetainedAudio_Proxy( - ISpeechRecoContext* This, - SpeechRetainedAudioOptions Option); -void __RPC_STUB ISpeechRecoContext_put_RetainedAudio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_RetainedAudio_Proxy( - ISpeechRecoContext* This, - SpeechRetainedAudioOptions *Option); -void __RPC_STUB ISpeechRecoContext_get_RetainedAudio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_putref_RetainedAudioFormat_Proxy( - ISpeechRecoContext* This, - ISpeechAudioFormat *Format); -void __RPC_STUB ISpeechRecoContext_putref_RetainedAudioFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_RetainedAudioFormat_Proxy( - ISpeechRecoContext* This, - ISpeechAudioFormat **Format); -void __RPC_STUB ISpeechRecoContext_get_RetainedAudioFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_Pause_Proxy( - ISpeechRecoContext* This); -void __RPC_STUB ISpeechRecoContext_Pause_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_Resume_Proxy( - ISpeechRecoContext* This); -void __RPC_STUB ISpeechRecoContext_Resume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_CreateGrammar_Proxy( - ISpeechRecoContext* This, - VARIANT GrammarId, - ISpeechRecoGrammar **Grammar); -void __RPC_STUB ISpeechRecoContext_CreateGrammar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_CreateResultFromMemory_Proxy( - ISpeechRecoContext* This, - VARIANT *ResultBlock, - ISpeechRecoResult **Result); -void __RPC_STUB ISpeechRecoContext_CreateResultFromMemory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_Bookmark_Proxy( - ISpeechRecoContext* This, - SpeechBookmarkOptions Options, - VARIANT StreamPos, - VARIANT BookmarkId); -void __RPC_STUB ISpeechRecoContext_Bookmark_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_SetAdaptationData_Proxy( - ISpeechRecoContext* This, - BSTR AdaptationString); -void __RPC_STUB ISpeechRecoContext_SetAdaptationData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechRecoContext_INTERFACE_DEFINED__ */ @@ -19829,29 +16721,29 @@ typedef struct ISpeechRecoGrammarVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechRecoGrammar* This); + ISpeechRecoGrammar *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechRecoGrammar* This); + ISpeechRecoGrammar *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -19859,7 +16751,7 @@ typedef struct ISpeechRecoGrammarVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -19871,42 +16763,42 @@ typedef struct ISpeechRecoGrammarVtbl { /*** ISpeechRecoGrammar methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, VARIANT *Id); HRESULT (STDMETHODCALLTYPE *get_RecoContext)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, ISpeechRecoContext **RecoContext); HRESULT (STDMETHODCALLTYPE *put_State)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, SpeechGrammarState State); HRESULT (STDMETHODCALLTYPE *get_State)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, SpeechGrammarState *State); HRESULT (STDMETHODCALLTYPE *get_Rules)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, ISpeechGrammarRules **Rules); HRESULT (STDMETHODCALLTYPE *Reset)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, SpeechLanguageId NewLanguage); HRESULT (STDMETHODCALLTYPE *CmdLoadFromFile)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, const BSTR FileName, SpeechLoadOption LoadOption); HRESULT (STDMETHODCALLTYPE *CmdLoadFromObject)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, const BSTR ClassId, const BSTR GrammarName, SpeechLoadOption LoadOption); HRESULT (STDMETHODCALLTYPE *CmdLoadFromResource)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, LONG hModule, VARIANT ResourceName, VARIANT ResourceType, @@ -19914,56 +16806,57 @@ typedef struct ISpeechRecoGrammarVtbl { SpeechLoadOption LoadOption); HRESULT (STDMETHODCALLTYPE *CmdLoadFromMemory)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, VARIANT GrammarData, SpeechLoadOption LoadOption); HRESULT (STDMETHODCALLTYPE *CmdLoadFromProprietaryGrammar)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, const BSTR ProprietaryGuid, const BSTR ProprietaryString, VARIANT ProprietaryData, SpeechLoadOption LoadOption); HRESULT (STDMETHODCALLTYPE *CmdSetRuleState)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, const BSTR Name, SpeechRuleState State); HRESULT (STDMETHODCALLTYPE *CmdSetRuleIdState)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, LONG RuleId, SpeechRuleState State); HRESULT (STDMETHODCALLTYPE *DictationLoad)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, const BSTR TopicName, SpeechLoadOption LoadOption); HRESULT (STDMETHODCALLTYPE *DictationUnload)( - ISpeechRecoGrammar* This); + ISpeechRecoGrammar *This); HRESULT (STDMETHODCALLTYPE *DictationSetState)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, SpeechRuleState State); HRESULT (STDMETHODCALLTYPE *SetWordSequenceData)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, const BSTR Text, LONG TextLength, ISpeechTextSelectionInformation *Info); HRESULT (STDMETHODCALLTYPE *SetTextSelection)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, ISpeechTextSelectionInformation *Info); HRESULT (STDMETHODCALLTYPE *IsPronounceable)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, const BSTR Word, SpeechWordPronounceable *WordPronounceable); END_INTERFACE } ISpeechRecoGrammarVtbl; + interface ISpeechRecoGrammar { CONST_VTBL ISpeechRecoGrammarVtbl* lpVtbl; }; @@ -20086,174 +16979,6 @@ static FORCEINLINE HRESULT ISpeechRecoGrammar_IsPronounceable(ISpeechRecoGrammar #endif -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_get_Id_Proxy( - ISpeechRecoGrammar* This, - VARIANT *Id); -void __RPC_STUB ISpeechRecoGrammar_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_get_RecoContext_Proxy( - ISpeechRecoGrammar* This, - ISpeechRecoContext **RecoContext); -void __RPC_STUB ISpeechRecoGrammar_get_RecoContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_put_State_Proxy( - ISpeechRecoGrammar* This, - SpeechGrammarState State); -void __RPC_STUB ISpeechRecoGrammar_put_State_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_get_State_Proxy( - ISpeechRecoGrammar* This, - SpeechGrammarState *State); -void __RPC_STUB ISpeechRecoGrammar_get_State_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_get_Rules_Proxy( - ISpeechRecoGrammar* This, - ISpeechGrammarRules **Rules); -void __RPC_STUB ISpeechRecoGrammar_get_Rules_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_Reset_Proxy( - ISpeechRecoGrammar* This, - SpeechLanguageId NewLanguage); -void __RPC_STUB ISpeechRecoGrammar_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromFile_Proxy( - ISpeechRecoGrammar* This, - const BSTR FileName, - SpeechLoadOption LoadOption); -void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromObject_Proxy( - ISpeechRecoGrammar* This, - const BSTR ClassId, - const BSTR GrammarName, - SpeechLoadOption LoadOption); -void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromResource_Proxy( - ISpeechRecoGrammar* This, - LONG hModule, - VARIANT ResourceName, - VARIANT ResourceType, - SpeechLanguageId LanguageId, - SpeechLoadOption LoadOption); -void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromMemory_Proxy( - ISpeechRecoGrammar* This, - VARIANT GrammarData, - SpeechLoadOption LoadOption); -void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromMemory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromProprietaryGrammar_Proxy( - ISpeechRecoGrammar* This, - const BSTR ProprietaryGuid, - const BSTR ProprietaryString, - VARIANT ProprietaryData, - SpeechLoadOption LoadOption); -void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromProprietaryGrammar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdSetRuleState_Proxy( - ISpeechRecoGrammar* This, - const BSTR Name, - SpeechRuleState State); -void __RPC_STUB ISpeechRecoGrammar_CmdSetRuleState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdSetRuleIdState_Proxy( - ISpeechRecoGrammar* This, - LONG RuleId, - SpeechRuleState State); -void __RPC_STUB ISpeechRecoGrammar_CmdSetRuleIdState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_DictationLoad_Proxy( - ISpeechRecoGrammar* This, - const BSTR TopicName, - SpeechLoadOption LoadOption); -void __RPC_STUB ISpeechRecoGrammar_DictationLoad_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_DictationUnload_Proxy( - ISpeechRecoGrammar* This); -void __RPC_STUB ISpeechRecoGrammar_DictationUnload_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_DictationSetState_Proxy( - ISpeechRecoGrammar* This, - SpeechRuleState State); -void __RPC_STUB ISpeechRecoGrammar_DictationSetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_SetWordSequenceData_Proxy( - ISpeechRecoGrammar* This, - const BSTR Text, - LONG TextLength, - ISpeechTextSelectionInformation *Info); -void __RPC_STUB ISpeechRecoGrammar_SetWordSequenceData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_SetTextSelection_Proxy( - ISpeechRecoGrammar* This, - ISpeechTextSelectionInformation *Info); -void __RPC_STUB ISpeechRecoGrammar_SetTextSelection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_IsPronounceable_Proxy( - ISpeechRecoGrammar* This, - const BSTR Word, - SpeechWordPronounceable *WordPronounceable); -void __RPC_STUB ISpeechRecoGrammar_IsPronounceable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechRecoGrammar_INTERFACE_DEFINED__ */ @@ -20278,29 +17003,29 @@ typedef struct _ISpeechRecoContextEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - _ISpeechRecoContextEvents* This, + _ISpeechRecoContextEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - _ISpeechRecoContextEvents* This); + _ISpeechRecoContextEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - _ISpeechRecoContextEvents* This); + _ISpeechRecoContextEvents *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - _ISpeechRecoContextEvents* This, + _ISpeechRecoContextEvents *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - _ISpeechRecoContextEvents* This, + _ISpeechRecoContextEvents *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - _ISpeechRecoContextEvents* This, + _ISpeechRecoContextEvents *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -20308,7 +17033,7 @@ typedef struct _ISpeechRecoContextEventsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - _ISpeechRecoContextEvents* This, + _ISpeechRecoContextEvents *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -20320,6 +17045,7 @@ typedef struct _ISpeechRecoContextEventsVtbl { END_INTERFACE } _ISpeechRecoContextEventsVtbl; + interface _ISpeechRecoContextEvents { CONST_VTBL _ISpeechRecoContextEventsVtbl* lpVtbl; }; @@ -20409,29 +17135,29 @@ typedef struct ISpeechGrammarRuleVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechGrammarRule* This); + ISpeechGrammarRule *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechGrammarRule* This); + ISpeechGrammarRule *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -20439,7 +17165,7 @@ typedef struct ISpeechGrammarRuleVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -20451,35 +17177,36 @@ typedef struct ISpeechGrammarRuleVtbl { /*** ISpeechGrammarRule methods ***/ HRESULT (STDMETHODCALLTYPE *get_Attributes)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, SpeechRuleAttributes *Attributes); HRESULT (STDMETHODCALLTYPE *get_InitialState)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, ISpeechGrammarRuleState **State); HRESULT (STDMETHODCALLTYPE *get_Name)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, BSTR *Name); HRESULT (STDMETHODCALLTYPE *get_Id)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, LONG *Id); HRESULT (STDMETHODCALLTYPE *Clear)( - ISpeechGrammarRule* This); + ISpeechGrammarRule *This); HRESULT (STDMETHODCALLTYPE *AddResource)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, const BSTR ResourceName, const BSTR ResourceValue); HRESULT (STDMETHODCALLTYPE *AddState)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, ISpeechGrammarRuleState **State); END_INTERFACE } ISpeechGrammarRuleVtbl; + interface ISpeechGrammarRule { CONST_VTBL ISpeechGrammarRuleVtbl* lpVtbl; }; @@ -20554,62 +17281,6 @@ static FORCEINLINE HRESULT ISpeechGrammarRule_AddState(ISpeechGrammarRule* This, #endif -HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_get_Attributes_Proxy( - ISpeechGrammarRule* This, - SpeechRuleAttributes *Attributes); -void __RPC_STUB ISpeechGrammarRule_get_Attributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_get_InitialState_Proxy( - ISpeechGrammarRule* This, - ISpeechGrammarRuleState **State); -void __RPC_STUB ISpeechGrammarRule_get_InitialState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_get_Name_Proxy( - ISpeechGrammarRule* This, - BSTR *Name); -void __RPC_STUB ISpeechGrammarRule_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_get_Id_Proxy( - ISpeechGrammarRule* This, - LONG *Id); -void __RPC_STUB ISpeechGrammarRule_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_Clear_Proxy( - ISpeechGrammarRule* This); -void __RPC_STUB ISpeechGrammarRule_Clear_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_AddResource_Proxy( - ISpeechGrammarRule* This, - const BSTR ResourceName, - const BSTR ResourceValue); -void __RPC_STUB ISpeechGrammarRule_AddResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_AddState_Proxy( - ISpeechGrammarRule* This, - ISpeechGrammarRuleState **State); -void __RPC_STUB ISpeechGrammarRule_AddState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechGrammarRule_INTERFACE_DEFINED__ */ @@ -20664,29 +17335,29 @@ typedef struct ISpeechGrammarRulesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechGrammarRules* This); + ISpeechGrammarRules *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechGrammarRules* This); + ISpeechGrammarRules *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -20694,7 +17365,7 @@ typedef struct ISpeechGrammarRulesVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -20706,44 +17377,45 @@ typedef struct ISpeechGrammarRulesVtbl { /*** ISpeechGrammarRules methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *FindRule)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, VARIANT RuleNameOrId, ISpeechGrammarRule **Rule); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, LONG Index, ISpeechGrammarRule **Rule); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, IUnknown **EnumVARIANT); HRESULT (STDMETHODCALLTYPE *get_Dynamic)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, VARIANT_BOOL *Dynamic); HRESULT (STDMETHODCALLTYPE *Add)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, BSTR RuleName, SpeechRuleAttributes Attributes, LONG RuleId, ISpeechGrammarRule **Rule); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpeechGrammarRules* This); + ISpeechGrammarRules *This); HRESULT (STDMETHODCALLTYPE *CommitAndSave)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, BSTR *ErrorText, VARIANT *SaveStream); END_INTERFACE } ISpeechGrammarRulesVtbl; + interface ISpeechGrammarRules { CONST_VTBL ISpeechGrammarRulesVtbl* lpVtbl; }; @@ -20822,75 +17494,6 @@ static FORCEINLINE HRESULT ISpeechGrammarRules_CommitAndSave(ISpeechGrammarRules #endif -HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_get_Count_Proxy( - ISpeechGrammarRules* This, - LONG *Count); -void __RPC_STUB ISpeechGrammarRules_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_FindRule_Proxy( - ISpeechGrammarRules* This, - VARIANT RuleNameOrId, - ISpeechGrammarRule **Rule); -void __RPC_STUB ISpeechGrammarRules_FindRule_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_Item_Proxy( - ISpeechGrammarRules* This, - LONG Index, - ISpeechGrammarRule **Rule); -void __RPC_STUB ISpeechGrammarRules_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_get__NewEnum_Proxy( - ISpeechGrammarRules* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechGrammarRules_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_get_Dynamic_Proxy( - ISpeechGrammarRules* This, - VARIANT_BOOL *Dynamic); -void __RPC_STUB ISpeechGrammarRules_get_Dynamic_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_Add_Proxy( - ISpeechGrammarRules* This, - BSTR RuleName, - SpeechRuleAttributes Attributes, - LONG RuleId, - ISpeechGrammarRule **Rule); -void __RPC_STUB ISpeechGrammarRules_Add_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_Commit_Proxy( - ISpeechGrammarRules* This); -void __RPC_STUB ISpeechGrammarRules_Commit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_CommitAndSave_Proxy( - ISpeechGrammarRules* This, - BSTR *ErrorText, - VARIANT *SaveStream); -void __RPC_STUB ISpeechGrammarRules_CommitAndSave_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechGrammarRules_INTERFACE_DEFINED__ */ @@ -20947,29 +17550,29 @@ typedef struct ISpeechGrammarRuleStateVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechGrammarRuleState* This); + ISpeechGrammarRuleState *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechGrammarRuleState* This); + ISpeechGrammarRuleState *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -20977,7 +17580,7 @@ typedef struct ISpeechGrammarRuleStateVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -20989,15 +17592,15 @@ typedef struct ISpeechGrammarRuleStateVtbl { /*** ISpeechGrammarRuleState methods ***/ HRESULT (STDMETHODCALLTYPE *get_Rule)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, ISpeechGrammarRule **Rule); HRESULT (STDMETHODCALLTYPE *get_Transitions)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, ISpeechGrammarRuleStateTransitions **Transitions); HRESULT (STDMETHODCALLTYPE *AddWordTransition)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, ISpeechGrammarRuleState *DestState, const BSTR Words, const BSTR Separators, @@ -21008,7 +17611,7 @@ typedef struct ISpeechGrammarRuleStateVtbl { float Weight); HRESULT (STDMETHODCALLTYPE *AddRuleTransition)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, ISpeechGrammarRuleState *DestinationState, ISpeechGrammarRule *Rule, const BSTR PropertyName, @@ -21017,7 +17620,7 @@ typedef struct ISpeechGrammarRuleStateVtbl { float Weight); HRESULT (STDMETHODCALLTYPE *AddSpecialTransition)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, ISpeechGrammarRuleState *DestinationState, SpeechSpecialTransitionType Type, const BSTR PropertyName, @@ -21027,6 +17630,7 @@ typedef struct ISpeechGrammarRuleStateVtbl { END_INTERFACE } ISpeechGrammarRuleStateVtbl; + interface ISpeechGrammarRuleState { CONST_VTBL ISpeechGrammarRuleStateVtbl* lpVtbl; }; @@ -21093,63 +17697,6 @@ static FORCEINLINE HRESULT ISpeechGrammarRuleState_AddSpecialTransition(ISpeechG #endif -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_get_Rule_Proxy( - ISpeechGrammarRuleState* This, - ISpeechGrammarRule **Rule); -void __RPC_STUB ISpeechGrammarRuleState_get_Rule_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_get_Transitions_Proxy( - ISpeechGrammarRuleState* This, - ISpeechGrammarRuleStateTransitions **Transitions); -void __RPC_STUB ISpeechGrammarRuleState_get_Transitions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_AddWordTransition_Proxy( - ISpeechGrammarRuleState* This, - ISpeechGrammarRuleState *DestState, - const BSTR Words, - const BSTR Separators, - SpeechGrammarWordType Type, - const BSTR PropertyName, - LONG PropertyId, - VARIANT *PropertyValue, - float Weight); -void __RPC_STUB ISpeechGrammarRuleState_AddWordTransition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_AddRuleTransition_Proxy( - ISpeechGrammarRuleState* This, - ISpeechGrammarRuleState *DestinationState, - ISpeechGrammarRule *Rule, - const BSTR PropertyName, - LONG PropertyId, - VARIANT *PropertyValue, - float Weight); -void __RPC_STUB ISpeechGrammarRuleState_AddRuleTransition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_AddSpecialTransition_Proxy( - ISpeechGrammarRuleState* This, - ISpeechGrammarRuleState *DestinationState, - SpeechSpecialTransitionType Type, - const BSTR PropertyName, - LONG PropertyId, - VARIANT *PropertyValue, - float Weight); -void __RPC_STUB ISpeechGrammarRuleState_AddSpecialTransition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechGrammarRuleState_INTERFACE_DEFINED__ */ @@ -21184,29 +17731,29 @@ typedef struct ISpeechGrammarRuleStateTransitionsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechGrammarRuleStateTransitions* This, + ISpeechGrammarRuleStateTransitions *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechGrammarRuleStateTransitions* This); + ISpeechGrammarRuleStateTransitions *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechGrammarRuleStateTransitions* This); + ISpeechGrammarRuleStateTransitions *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechGrammarRuleStateTransitions* This, + ISpeechGrammarRuleStateTransitions *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechGrammarRuleStateTransitions* This, + ISpeechGrammarRuleStateTransitions *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechGrammarRuleStateTransitions* This, + ISpeechGrammarRuleStateTransitions *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -21214,7 +17761,7 @@ typedef struct ISpeechGrammarRuleStateTransitionsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechGrammarRuleStateTransitions* This, + ISpeechGrammarRuleStateTransitions *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -21226,20 +17773,21 @@ typedef struct ISpeechGrammarRuleStateTransitionsVtbl { /*** ISpeechGrammarRuleStateTransitions methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechGrammarRuleStateTransitions* This, + ISpeechGrammarRuleStateTransitions *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechGrammarRuleStateTransitions* This, + ISpeechGrammarRuleStateTransitions *This, LONG Index, ISpeechGrammarRuleStateTransition **Transition); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechGrammarRuleStateTransitions* This, + ISpeechGrammarRuleStateTransitions *This, IUnknown **EnumVARIANT); END_INTERFACE } ISpeechGrammarRuleStateTransitionsVtbl; + interface ISpeechGrammarRuleStateTransitions { CONST_VTBL ISpeechGrammarRuleStateTransitionsVtbl* lpVtbl; }; @@ -21298,31 +17846,6 @@ static FORCEINLINE HRESULT ISpeechGrammarRuleStateTransitions_get__NewEnum(ISpee #endif -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransitions_get_Count_Proxy( - ISpeechGrammarRuleStateTransitions* This, - LONG *Count); -void __RPC_STUB ISpeechGrammarRuleStateTransitions_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransitions_Item_Proxy( - ISpeechGrammarRuleStateTransitions* This, - LONG Index, - ISpeechGrammarRuleStateTransition **Transition); -void __RPC_STUB ISpeechGrammarRuleStateTransitions_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransitions_get__NewEnum_Proxy( - ISpeechGrammarRuleStateTransitions* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechGrammarRuleStateTransitions_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechGrammarRuleStateTransitions_INTERFACE_DEFINED__ */ @@ -21371,29 +17894,29 @@ typedef struct ISpeechGrammarRuleStateTransitionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechGrammarRuleStateTransition* This); + ISpeechGrammarRuleStateTransition *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechGrammarRuleStateTransition* This); + ISpeechGrammarRuleStateTransition *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -21401,7 +17924,7 @@ typedef struct ISpeechGrammarRuleStateTransitionVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -21413,39 +17936,40 @@ typedef struct ISpeechGrammarRuleStateTransitionVtbl { /*** ISpeechGrammarRuleStateTransition methods ***/ HRESULT (STDMETHODCALLTYPE *get_Type)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, SpeechGrammarRuleStateTransitionType *Type); HRESULT (STDMETHODCALLTYPE *get_Text)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, BSTR *Text); HRESULT (STDMETHODCALLTYPE *get_Rule)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, ISpeechGrammarRule **Rule); HRESULT (STDMETHODCALLTYPE *get_Weight)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, VARIANT *Weight); HRESULT (STDMETHODCALLTYPE *get_PropertyName)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, BSTR *PropertyName); HRESULT (STDMETHODCALLTYPE *get_PropertyId)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, LONG *PropertyId); HRESULT (STDMETHODCALLTYPE *get_PropertyValue)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, VARIANT *PropertyValue); HRESULT (STDMETHODCALLTYPE *get_NextState)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, ISpeechGrammarRuleState **NextState); END_INTERFACE } ISpeechGrammarRuleStateTransitionVtbl; + interface ISpeechGrammarRuleStateTransition { CONST_VTBL ISpeechGrammarRuleStateTransitionVtbl* lpVtbl; }; @@ -21524,70 +18048,6 @@ static FORCEINLINE HRESULT ISpeechGrammarRuleStateTransition_get_NextState(ISpee #endif -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_Type_Proxy( - ISpeechGrammarRuleStateTransition* This, - SpeechGrammarRuleStateTransitionType *Type); -void __RPC_STUB ISpeechGrammarRuleStateTransition_get_Type_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_Text_Proxy( - ISpeechGrammarRuleStateTransition* This, - BSTR *Text); -void __RPC_STUB ISpeechGrammarRuleStateTransition_get_Text_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_Rule_Proxy( - ISpeechGrammarRuleStateTransition* This, - ISpeechGrammarRule **Rule); -void __RPC_STUB ISpeechGrammarRuleStateTransition_get_Rule_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_Weight_Proxy( - ISpeechGrammarRuleStateTransition* This, - VARIANT *Weight); -void __RPC_STUB ISpeechGrammarRuleStateTransition_get_Weight_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_PropertyName_Proxy( - ISpeechGrammarRuleStateTransition* This, - BSTR *PropertyName); -void __RPC_STUB ISpeechGrammarRuleStateTransition_get_PropertyName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_PropertyId_Proxy( - ISpeechGrammarRuleStateTransition* This, - LONG *PropertyId); -void __RPC_STUB ISpeechGrammarRuleStateTransition_get_PropertyId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_PropertyValue_Proxy( - ISpeechGrammarRuleStateTransition* This, - VARIANT *PropertyValue); -void __RPC_STUB ISpeechGrammarRuleStateTransition_get_PropertyValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_NextState_Proxy( - ISpeechGrammarRuleStateTransition* This, - ISpeechGrammarRuleState **NextState); -void __RPC_STUB ISpeechGrammarRuleStateTransition_get_NextState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechGrammarRuleStateTransition_INTERFACE_DEFINED__ */ @@ -21636,29 +18096,29 @@ typedef struct ISpeechTextSelectionInformationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechTextSelectionInformation* This); + ISpeechTextSelectionInformation *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechTextSelectionInformation* This); + ISpeechTextSelectionInformation *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -21666,7 +18126,7 @@ typedef struct ISpeechTextSelectionInformationVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -21678,39 +18138,40 @@ typedef struct ISpeechTextSelectionInformationVtbl { /*** ISpeechTextSelectionInformation methods ***/ HRESULT (STDMETHODCALLTYPE *put_ActiveOffset)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, LONG ActiveOffset); HRESULT (STDMETHODCALLTYPE *get_ActiveOffset)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, LONG *ActiveOffset); HRESULT (STDMETHODCALLTYPE *put_ActiveLength)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, LONG ActiveLength); HRESULT (STDMETHODCALLTYPE *get_ActiveLength)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, LONG *ActiveLength); HRESULT (STDMETHODCALLTYPE *put_SelectionOffset)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, LONG SelectionOffset); HRESULT (STDMETHODCALLTYPE *get_SelectionOffset)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, LONG *SelectionOffset); HRESULT (STDMETHODCALLTYPE *put_SelectionLength)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, LONG SelectionLength); HRESULT (STDMETHODCALLTYPE *get_SelectionLength)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, LONG *SelectionLength); END_INTERFACE } ISpeechTextSelectionInformationVtbl; + interface ISpeechTextSelectionInformation { CONST_VTBL ISpeechTextSelectionInformationVtbl* lpVtbl; }; @@ -21789,70 +18250,6 @@ static FORCEINLINE HRESULT ISpeechTextSelectionInformation_get_SelectionLength(I #endif -HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_put_ActiveOffset_Proxy( - ISpeechTextSelectionInformation* This, - LONG ActiveOffset); -void __RPC_STUB ISpeechTextSelectionInformation_put_ActiveOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_get_ActiveOffset_Proxy( - ISpeechTextSelectionInformation* This, - LONG *ActiveOffset); -void __RPC_STUB ISpeechTextSelectionInformation_get_ActiveOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_put_ActiveLength_Proxy( - ISpeechTextSelectionInformation* This, - LONG ActiveLength); -void __RPC_STUB ISpeechTextSelectionInformation_put_ActiveLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_get_ActiveLength_Proxy( - ISpeechTextSelectionInformation* This, - LONG *ActiveLength); -void __RPC_STUB ISpeechTextSelectionInformation_get_ActiveLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_put_SelectionOffset_Proxy( - ISpeechTextSelectionInformation* This, - LONG SelectionOffset); -void __RPC_STUB ISpeechTextSelectionInformation_put_SelectionOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_get_SelectionOffset_Proxy( - ISpeechTextSelectionInformation* This, - LONG *SelectionOffset); -void __RPC_STUB ISpeechTextSelectionInformation_get_SelectionOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_put_SelectionLength_Proxy( - ISpeechTextSelectionInformation* This, - LONG SelectionLength); -void __RPC_STUB ISpeechTextSelectionInformation_put_SelectionLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_get_SelectionLength_Proxy( - ISpeechTextSelectionInformation* This, - LONG *SelectionLength); -void __RPC_STUB ISpeechTextSelectionInformation_get_SelectionLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechTextSelectionInformation_INTERFACE_DEFINED__ */ @@ -21915,29 +18312,29 @@ typedef struct ISpeechRecoResultVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechRecoResult* This); + ISpeechRecoResult *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechRecoResult* This); + ISpeechRecoResult *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -21945,7 +18342,7 @@ typedef struct ISpeechRecoResultVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -21957,55 +18354,56 @@ typedef struct ISpeechRecoResultVtbl { /*** ISpeechRecoResult methods ***/ HRESULT (STDMETHODCALLTYPE *get_RecoContext)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, ISpeechRecoContext **RecoContext); HRESULT (STDMETHODCALLTYPE *get_Times)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, ISpeechRecoResultTimes **Times); HRESULT (STDMETHODCALLTYPE *putref_AudioFormat)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, ISpeechAudioFormat *Format); HRESULT (STDMETHODCALLTYPE *get_AudioFormat)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, ISpeechAudioFormat **Format); HRESULT (STDMETHODCALLTYPE *get_PhraseInfo)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, ISpeechPhraseInfo **PhraseInfo); HRESULT (STDMETHODCALLTYPE *Alternates)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, LONG RequestCount, LONG StartElement, LONG Elements, ISpeechPhraseAlternates **Alternates); HRESULT (STDMETHODCALLTYPE *Audio)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, LONG StartElement, LONG Elements, ISpeechMemoryStream **Stream); HRESULT (STDMETHODCALLTYPE *SpeakAudio)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, LONG StartElement, LONG Elements, SpeechVoiceSpeakFlags Flags, LONG *StreamNumber); HRESULT (STDMETHODCALLTYPE *SaveToMemory)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, VARIANT *ResultBlock); HRESULT (STDMETHODCALLTYPE *DiscardResultInfo)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, SpeechDiscardType ValueTypes); END_INTERFACE } ISpeechRecoResultVtbl; + interface ISpeechRecoResult { CONST_VTBL ISpeechRecoResultVtbl* lpVtbl; }; @@ -22092,94 +18490,6 @@ static FORCEINLINE HRESULT ISpeechRecoResult_DiscardResultInfo(ISpeechRecoResult #endif -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_get_RecoContext_Proxy( - ISpeechRecoResult* This, - ISpeechRecoContext **RecoContext); -void __RPC_STUB ISpeechRecoResult_get_RecoContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_get_Times_Proxy( - ISpeechRecoResult* This, - ISpeechRecoResultTimes **Times); -void __RPC_STUB ISpeechRecoResult_get_Times_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_putref_AudioFormat_Proxy( - ISpeechRecoResult* This, - ISpeechAudioFormat *Format); -void __RPC_STUB ISpeechRecoResult_putref_AudioFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_get_AudioFormat_Proxy( - ISpeechRecoResult* This, - ISpeechAudioFormat **Format); -void __RPC_STUB ISpeechRecoResult_get_AudioFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_get_PhraseInfo_Proxy( - ISpeechRecoResult* This, - ISpeechPhraseInfo **PhraseInfo); -void __RPC_STUB ISpeechRecoResult_get_PhraseInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_Alternates_Proxy( - ISpeechRecoResult* This, - LONG RequestCount, - LONG StartElement, - LONG Elements, - ISpeechPhraseAlternates **Alternates); -void __RPC_STUB ISpeechRecoResult_Alternates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_Audio_Proxy( - ISpeechRecoResult* This, - LONG StartElement, - LONG Elements, - ISpeechMemoryStream **Stream); -void __RPC_STUB ISpeechRecoResult_Audio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_SpeakAudio_Proxy( - ISpeechRecoResult* This, - LONG StartElement, - LONG Elements, - SpeechVoiceSpeakFlags Flags, - LONG *StreamNumber); -void __RPC_STUB ISpeechRecoResult_SpeakAudio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_SaveToMemory_Proxy( - ISpeechRecoResult* This, - VARIANT *ResultBlock); -void __RPC_STUB ISpeechRecoResult_SaveToMemory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_DiscardResultInfo_Proxy( - ISpeechRecoResult* This, - SpeechDiscardType ValueTypes); -void __RPC_STUB ISpeechRecoResult_DiscardResultInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechRecoResult_INTERFACE_DEFINED__ */ @@ -22216,29 +18526,29 @@ typedef struct ISpeechXMLRecoResultVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechXMLRecoResult* This); + ISpeechXMLRecoResult *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechXMLRecoResult* This); + ISpeechXMLRecoResult *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -22246,7 +18556,7 @@ typedef struct ISpeechXMLRecoResultVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -22258,61 +18568,61 @@ typedef struct ISpeechXMLRecoResultVtbl { /*** ISpeechRecoResult methods ***/ HRESULT (STDMETHODCALLTYPE *get_RecoContext)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, ISpeechRecoContext **RecoContext); HRESULT (STDMETHODCALLTYPE *get_Times)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, ISpeechRecoResultTimes **Times); HRESULT (STDMETHODCALLTYPE *putref_AudioFormat)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, ISpeechAudioFormat *Format); HRESULT (STDMETHODCALLTYPE *get_AudioFormat)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, ISpeechAudioFormat **Format); HRESULT (STDMETHODCALLTYPE *get_PhraseInfo)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, ISpeechPhraseInfo **PhraseInfo); HRESULT (STDMETHODCALLTYPE *Alternates)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, LONG RequestCount, LONG StartElement, LONG Elements, ISpeechPhraseAlternates **Alternates); HRESULT (STDMETHODCALLTYPE *Audio)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, LONG StartElement, LONG Elements, ISpeechMemoryStream **Stream); HRESULT (STDMETHODCALLTYPE *SpeakAudio)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, LONG StartElement, LONG Elements, SpeechVoiceSpeakFlags Flags, LONG *StreamNumber); HRESULT (STDMETHODCALLTYPE *SaveToMemory)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, VARIANT *ResultBlock); HRESULT (STDMETHODCALLTYPE *DiscardResultInfo)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, SpeechDiscardType ValueTypes); /*** ISpeechXMLRecoResult methods ***/ HRESULT (STDMETHODCALLTYPE *GetXMLResult)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, SPXMLRESULTOPTIONS Options, BSTR *pResult); HRESULT (STDMETHODCALLTYPE *GetXMLErrorInfo)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, LONG *LineNumber, BSTR *ScriptLine, BSTR *Source, @@ -22322,6 +18632,7 @@ typedef struct ISpeechXMLRecoResultVtbl { END_INTERFACE } ISpeechXMLRecoResultVtbl; + interface ISpeechXMLRecoResult { CONST_VTBL ISpeechXMLRecoResultVtbl* lpVtbl; }; @@ -22418,28 +18729,6 @@ static FORCEINLINE HRESULT ISpeechXMLRecoResult_GetXMLErrorInfo(ISpeechXMLRecoRe #endif -HRESULT STDMETHODCALLTYPE ISpeechXMLRecoResult_GetXMLResult_Proxy( - ISpeechXMLRecoResult* This, - SPXMLRESULTOPTIONS Options, - BSTR *pResult); -void __RPC_STUB ISpeechXMLRecoResult_GetXMLResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechXMLRecoResult_GetXMLErrorInfo_Proxy( - ISpeechXMLRecoResult* This, - LONG *LineNumber, - BSTR *ScriptLine, - BSTR *Source, - BSTR *Description, - LONG *ResultCode, - VARIANT_BOOL *IsError); -void __RPC_STUB ISpeechXMLRecoResult_GetXMLErrorInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechXMLRecoResult_INTERFACE_DEFINED__ */ @@ -22468,29 +18757,29 @@ typedef struct ISpeechRecoResult2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechRecoResult2* This); + ISpeechRecoResult2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechRecoResult2* This); + ISpeechRecoResult2 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -22498,7 +18787,7 @@ typedef struct ISpeechRecoResult2Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -22510,61 +18799,62 @@ typedef struct ISpeechRecoResult2Vtbl { /*** ISpeechRecoResult methods ***/ HRESULT (STDMETHODCALLTYPE *get_RecoContext)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, ISpeechRecoContext **RecoContext); HRESULT (STDMETHODCALLTYPE *get_Times)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, ISpeechRecoResultTimes **Times); HRESULT (STDMETHODCALLTYPE *putref_AudioFormat)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, ISpeechAudioFormat *Format); HRESULT (STDMETHODCALLTYPE *get_AudioFormat)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, ISpeechAudioFormat **Format); HRESULT (STDMETHODCALLTYPE *get_PhraseInfo)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, ISpeechPhraseInfo **PhraseInfo); HRESULT (STDMETHODCALLTYPE *Alternates)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, LONG RequestCount, LONG StartElement, LONG Elements, ISpeechPhraseAlternates **Alternates); HRESULT (STDMETHODCALLTYPE *Audio)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, LONG StartElement, LONG Elements, ISpeechMemoryStream **Stream); HRESULT (STDMETHODCALLTYPE *SpeakAudio)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, LONG StartElement, LONG Elements, SpeechVoiceSpeakFlags Flags, LONG *StreamNumber); HRESULT (STDMETHODCALLTYPE *SaveToMemory)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, VARIANT *ResultBlock); HRESULT (STDMETHODCALLTYPE *DiscardResultInfo)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, SpeechDiscardType ValueTypes); /*** ISpeechRecoResult2 methods ***/ HRESULT (STDMETHODCALLTYPE *SetTextFeedback)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, BSTR Feedback, VARIANT_BOOL WasSuccessful); END_INTERFACE } ISpeechRecoResult2Vtbl; + interface ISpeechRecoResult2 { CONST_VTBL ISpeechRecoResult2Vtbl* lpVtbl; }; @@ -22657,15 +18947,6 @@ static FORCEINLINE HRESULT ISpeechRecoResult2_SetTextFeedback(ISpeechRecoResult2 #endif -HRESULT STDMETHODCALLTYPE ISpeechRecoResult2_SetTextFeedback_Proxy( - ISpeechRecoResult2* This, - BSTR Feedback, - VARIANT_BOOL WasSuccessful); -void __RPC_STUB ISpeechRecoResult2_SetTextFeedback_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechRecoResult2_INTERFACE_DEFINED__ */ @@ -22744,29 +19025,29 @@ typedef struct ISpeechRecoResultDispatchVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechRecoResultDispatch* This); + ISpeechRecoResultDispatch *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechRecoResultDispatch* This); + ISpeechRecoResultDispatch *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -22774,7 +19055,7 @@ typedef struct ISpeechRecoResultDispatchVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -22786,60 +19067,60 @@ typedef struct ISpeechRecoResultDispatchVtbl { /*** ISpeechRecoResultDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *get_RecoContext)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, ISpeechRecoContext **RecoContext); HRESULT (STDMETHODCALLTYPE *get_Times)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, ISpeechRecoResultTimes **Times); HRESULT (STDMETHODCALLTYPE *putref_AudioFormat)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, ISpeechAudioFormat *Format); HRESULT (STDMETHODCALLTYPE *get_AudioFormat)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, ISpeechAudioFormat **Format); HRESULT (STDMETHODCALLTYPE *get_PhraseInfo)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, ISpeechPhraseInfo **PhraseInfo); HRESULT (STDMETHODCALLTYPE *Alternates)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, LONG RequestCount, LONG StartElement, LONG Elements, ISpeechPhraseAlternates **Alternates); HRESULT (STDMETHODCALLTYPE *Audio)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, LONG StartElement, LONG Elements, ISpeechMemoryStream **Stream); HRESULT (STDMETHODCALLTYPE *SpeakAudio)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, LONG StartElement, LONG Elements, SpeechVoiceSpeakFlags Flags, LONG *StreamNumber); HRESULT (STDMETHODCALLTYPE *SaveToMemory)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, VARIANT *ResultBlock); HRESULT (STDMETHODCALLTYPE *DiscardResultInfo)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, SpeechDiscardType ValueTypes); HRESULT (STDMETHODCALLTYPE *GetXMLResult)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, SPXMLRESULTOPTIONS Options, BSTR *pResult); HRESULT (STDMETHODCALLTYPE *GetXMLErrorInfo)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, LONG *LineNumber, BSTR *ScriptLine, BSTR *Source, @@ -22848,12 +19129,13 @@ typedef struct ISpeechRecoResultDispatchVtbl { VARIANT_BOOL *IsError); HRESULT (STDMETHODCALLTYPE *SetTextFeedback)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, BSTR Feedback, VARIANT_BOOL WasSuccessful); END_INTERFACE } ISpeechRecoResultDispatchVtbl; + interface ISpeechRecoResultDispatch { CONST_VTBL ISpeechRecoResultDispatchVtbl* lpVtbl; }; @@ -22952,125 +19234,6 @@ static FORCEINLINE HRESULT ISpeechRecoResultDispatch_SetTextFeedback(ISpeechReco #endif -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_get_RecoContext_Proxy( - ISpeechRecoResultDispatch* This, - ISpeechRecoContext **RecoContext); -void __RPC_STUB ISpeechRecoResultDispatch_get_RecoContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_get_Times_Proxy( - ISpeechRecoResultDispatch* This, - ISpeechRecoResultTimes **Times); -void __RPC_STUB ISpeechRecoResultDispatch_get_Times_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_putref_AudioFormat_Proxy( - ISpeechRecoResultDispatch* This, - ISpeechAudioFormat *Format); -void __RPC_STUB ISpeechRecoResultDispatch_putref_AudioFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_get_AudioFormat_Proxy( - ISpeechRecoResultDispatch* This, - ISpeechAudioFormat **Format); -void __RPC_STUB ISpeechRecoResultDispatch_get_AudioFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_get_PhraseInfo_Proxy( - ISpeechRecoResultDispatch* This, - ISpeechPhraseInfo **PhraseInfo); -void __RPC_STUB ISpeechRecoResultDispatch_get_PhraseInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_Alternates_Proxy( - ISpeechRecoResultDispatch* This, - LONG RequestCount, - LONG StartElement, - LONG Elements, - ISpeechPhraseAlternates **Alternates); -void __RPC_STUB ISpeechRecoResultDispatch_Alternates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_Audio_Proxy( - ISpeechRecoResultDispatch* This, - LONG StartElement, - LONG Elements, - ISpeechMemoryStream **Stream); -void __RPC_STUB ISpeechRecoResultDispatch_Audio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_SpeakAudio_Proxy( - ISpeechRecoResultDispatch* This, - LONG StartElement, - LONG Elements, - SpeechVoiceSpeakFlags Flags, - LONG *StreamNumber); -void __RPC_STUB ISpeechRecoResultDispatch_SpeakAudio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_SaveToMemory_Proxy( - ISpeechRecoResultDispatch* This, - VARIANT *ResultBlock); -void __RPC_STUB ISpeechRecoResultDispatch_SaveToMemory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_DiscardResultInfo_Proxy( - ISpeechRecoResultDispatch* This, - SpeechDiscardType ValueTypes); -void __RPC_STUB ISpeechRecoResultDispatch_DiscardResultInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_GetXMLResult_Proxy( - ISpeechRecoResultDispatch* This, - SPXMLRESULTOPTIONS Options, - BSTR *pResult); -void __RPC_STUB ISpeechRecoResultDispatch_GetXMLResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_GetXMLErrorInfo_Proxy( - ISpeechRecoResultDispatch* This, - LONG *LineNumber, - BSTR *ScriptLine, - BSTR *Source, - BSTR *Description, - HRESULT *ResultCode, - VARIANT_BOOL *IsError); -void __RPC_STUB ISpeechRecoResultDispatch_GetXMLErrorInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_SetTextFeedback_Proxy( - ISpeechRecoResultDispatch* This, - BSTR Feedback, - VARIANT_BOOL WasSuccessful); -void __RPC_STUB ISpeechRecoResultDispatch_SetTextFeedback_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechRecoResultDispatch_INTERFACE_DEFINED__ */ @@ -23099,29 +19262,29 @@ typedef struct ISpeechPhraseInfoBuilderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseInfoBuilder* This, + ISpeechPhraseInfoBuilder *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseInfoBuilder* This); + ISpeechPhraseInfoBuilder *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseInfoBuilder* This); + ISpeechPhraseInfoBuilder *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseInfoBuilder* This, + ISpeechPhraseInfoBuilder *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseInfoBuilder* This, + ISpeechPhraseInfoBuilder *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseInfoBuilder* This, + ISpeechPhraseInfoBuilder *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -23129,7 +19292,7 @@ typedef struct ISpeechPhraseInfoBuilderVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseInfoBuilder* This, + ISpeechPhraseInfoBuilder *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -23141,12 +19304,13 @@ typedef struct ISpeechPhraseInfoBuilderVtbl { /*** ISpeechPhraseInfoBuilder methods ***/ HRESULT (STDMETHODCALLTYPE *RestorePhraseFromMemory)( - ISpeechPhraseInfoBuilder* This, + ISpeechPhraseInfoBuilder *This, VARIANT *PhraseInMemory, ISpeechPhraseInfo **PhraseInfo); END_INTERFACE } ISpeechPhraseInfoBuilderVtbl; + interface ISpeechPhraseInfoBuilder { CONST_VTBL ISpeechPhraseInfoBuilderVtbl* lpVtbl; }; @@ -23197,15 +19361,6 @@ static FORCEINLINE HRESULT ISpeechPhraseInfoBuilder_RestorePhraseFromMemory(ISpe #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfoBuilder_RestorePhraseFromMemory_Proxy( - ISpeechPhraseInfoBuilder* This, - VARIANT *PhraseInMemory, - ISpeechPhraseInfo **PhraseInfo); -void __RPC_STUB ISpeechPhraseInfoBuilder_RestorePhraseFromMemory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseInfoBuilder_INTERFACE_DEFINED__ */ @@ -23242,29 +19397,29 @@ typedef struct ISpeechRecoResultTimesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechRecoResultTimes* This); + ISpeechRecoResultTimes *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechRecoResultTimes* This); + ISpeechRecoResultTimes *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -23272,7 +19427,7 @@ typedef struct ISpeechRecoResultTimesVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -23284,23 +19439,24 @@ typedef struct ISpeechRecoResultTimesVtbl { /*** ISpeechRecoResultTimes methods ***/ HRESULT (STDMETHODCALLTYPE *get_StreamTime)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, VARIANT *Time); HRESULT (STDMETHODCALLTYPE *get_Length)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, VARIANT *Length); HRESULT (STDMETHODCALLTYPE *get_TickCount)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, LONG *TickCount); HRESULT (STDMETHODCALLTYPE *get_OffsetFromStart)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, VARIANT *OffsetFromStart); END_INTERFACE } ISpeechRecoResultTimesVtbl; + interface ISpeechRecoResultTimes { CONST_VTBL ISpeechRecoResultTimesVtbl* lpVtbl; }; @@ -23363,38 +19519,6 @@ static FORCEINLINE HRESULT ISpeechRecoResultTimes_get_OffsetFromStart(ISpeechRec #endif -HRESULT STDMETHODCALLTYPE ISpeechRecoResultTimes_get_StreamTime_Proxy( - ISpeechRecoResultTimes* This, - VARIANT *Time); -void __RPC_STUB ISpeechRecoResultTimes_get_StreamTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultTimes_get_Length_Proxy( - ISpeechRecoResultTimes* This, - VARIANT *Length); -void __RPC_STUB ISpeechRecoResultTimes_get_Length_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultTimes_get_TickCount_Proxy( - ISpeechRecoResultTimes* This, - LONG *TickCount); -void __RPC_STUB ISpeechRecoResultTimes_get_TickCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultTimes_get_OffsetFromStart_Proxy( - ISpeechRecoResultTimes* This, - VARIANT *OffsetFromStart); -void __RPC_STUB ISpeechRecoResultTimes_get_OffsetFromStart_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechRecoResultTimes_INTERFACE_DEFINED__ */ @@ -23434,29 +19558,29 @@ typedef struct ISpeechPhraseAlternateVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseAlternate* This); + ISpeechPhraseAlternate *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseAlternate* This); + ISpeechPhraseAlternate *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -23464,7 +19588,7 @@ typedef struct ISpeechPhraseAlternateVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -23476,26 +19600,27 @@ typedef struct ISpeechPhraseAlternateVtbl { /*** ISpeechPhraseAlternate methods ***/ HRESULT (STDMETHODCALLTYPE *get_RecoResult)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, ISpeechRecoResult **RecoResult); HRESULT (STDMETHODCALLTYPE *get_StartElementInResult)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, LONG *StartElement); HRESULT (STDMETHODCALLTYPE *get_NumberOfElementsInResult)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, LONG *NumberOfElements); HRESULT (STDMETHODCALLTYPE *get_PhraseInfo)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, ISpeechPhraseInfo **PhraseInfo); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpeechPhraseAlternate* This); + ISpeechPhraseAlternate *This); END_INTERFACE } ISpeechPhraseAlternateVtbl; + interface ISpeechPhraseAlternate { CONST_VTBL ISpeechPhraseAlternateVtbl* lpVtbl; }; @@ -23562,45 +19687,6 @@ static FORCEINLINE HRESULT ISpeechPhraseAlternate_Commit(ISpeechPhraseAlternate* #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_get_RecoResult_Proxy( - ISpeechPhraseAlternate* This, - ISpeechRecoResult **RecoResult); -void __RPC_STUB ISpeechPhraseAlternate_get_RecoResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_get_StartElementInResult_Proxy( - ISpeechPhraseAlternate* This, - LONG *StartElement); -void __RPC_STUB ISpeechPhraseAlternate_get_StartElementInResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_get_NumberOfElementsInResult_Proxy( - ISpeechPhraseAlternate* This, - LONG *NumberOfElements); -void __RPC_STUB ISpeechPhraseAlternate_get_NumberOfElementsInResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_get_PhraseInfo_Proxy( - ISpeechPhraseAlternate* This, - ISpeechPhraseInfo **PhraseInfo); -void __RPC_STUB ISpeechPhraseAlternate_get_PhraseInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_Commit_Proxy( - ISpeechPhraseAlternate* This); -void __RPC_STUB ISpeechPhraseAlternate_Commit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseAlternate_INTERFACE_DEFINED__ */ @@ -23635,29 +19721,29 @@ typedef struct ISpeechPhraseAlternatesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseAlternates* This, + ISpeechPhraseAlternates *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseAlternates* This); + ISpeechPhraseAlternates *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseAlternates* This); + ISpeechPhraseAlternates *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseAlternates* This, + ISpeechPhraseAlternates *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseAlternates* This, + ISpeechPhraseAlternates *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseAlternates* This, + ISpeechPhraseAlternates *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -23665,7 +19751,7 @@ typedef struct ISpeechPhraseAlternatesVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseAlternates* This, + ISpeechPhraseAlternates *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -23677,20 +19763,21 @@ typedef struct ISpeechPhraseAlternatesVtbl { /*** ISpeechPhraseAlternates methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechPhraseAlternates* This, + ISpeechPhraseAlternates *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechPhraseAlternates* This, + ISpeechPhraseAlternates *This, LONG Index, ISpeechPhraseAlternate **PhraseAlternate); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechPhraseAlternates* This, + ISpeechPhraseAlternates *This, IUnknown **EnumVARIANT); END_INTERFACE } ISpeechPhraseAlternatesVtbl; + interface ISpeechPhraseAlternates { CONST_VTBL ISpeechPhraseAlternatesVtbl* lpVtbl; }; @@ -23749,31 +19836,6 @@ static FORCEINLINE HRESULT ISpeechPhraseAlternates_get__NewEnum(ISpeechPhraseAlt #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternates_get_Count_Proxy( - ISpeechPhraseAlternates* This, - LONG *Count); -void __RPC_STUB ISpeechPhraseAlternates_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternates_Item_Proxy( - ISpeechPhraseAlternates* This, - LONG Index, - ISpeechPhraseAlternate **PhraseAlternate); -void __RPC_STUB ISpeechPhraseAlternates_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternates_get__NewEnum_Proxy( - ISpeechPhraseAlternates* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechPhraseAlternates_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseAlternates_INTERFACE_DEFINED__ */ @@ -23852,29 +19914,29 @@ typedef struct ISpeechPhraseInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseInfo* This); + ISpeechPhraseInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseInfo* This); + ISpeechPhraseInfo *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -23882,7 +19944,7 @@ typedef struct ISpeechPhraseInfoVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -23894,70 +19956,70 @@ typedef struct ISpeechPhraseInfoVtbl { /*** ISpeechPhraseInfo methods ***/ HRESULT (STDMETHODCALLTYPE *get_LanguageId)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, LONG *LanguageId); HRESULT (STDMETHODCALLTYPE *get_GrammarId)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, VARIANT *GrammarId); HRESULT (STDMETHODCALLTYPE *get_StartTime)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, VARIANT *StartTime); HRESULT (STDMETHODCALLTYPE *get_AudioStreamPosition)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, VARIANT *AudioStreamPosition); HRESULT (STDMETHODCALLTYPE *get_AudioSizeBytes)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, LONG *pAudioSizeBytes); HRESULT (STDMETHODCALLTYPE *get_RetainedSizeBytes)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, LONG *RetainedSizeBytes); HRESULT (STDMETHODCALLTYPE *get_AudioSizeTime)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, LONG *AudioSizeTime); HRESULT (STDMETHODCALLTYPE *get_Rule)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, ISpeechPhraseRule **Rule); HRESULT (STDMETHODCALLTYPE *get_Properties)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, ISpeechPhraseProperties **Properties); HRESULT (STDMETHODCALLTYPE *get_Elements)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, ISpeechPhraseElements **Elements); HRESULT (STDMETHODCALLTYPE *get_Replacements)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, ISpeechPhraseReplacements **Replacements); HRESULT (STDMETHODCALLTYPE *get_EngineId)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, BSTR *EngineIdGuid); HRESULT (STDMETHODCALLTYPE *get_EnginePrivateData)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, VARIANT *PrivateData); HRESULT (STDMETHODCALLTYPE *SaveToMemory)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, VARIANT *PhraseBlock); HRESULT (STDMETHODCALLTYPE *GetText)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, LONG StartElement, LONG Elements, VARIANT_BOOL UseReplacements, BSTR *Text); HRESULT (STDMETHODCALLTYPE *GetDisplayAttributes)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, LONG StartElement, LONG Elements, VARIANT_BOOL UseReplacements, @@ -23965,6 +20027,7 @@ typedef struct ISpeechPhraseInfoVtbl { END_INTERFACE } ISpeechPhraseInfoVtbl; + interface ISpeechPhraseInfo { CONST_VTBL ISpeechPhraseInfoVtbl* lpVtbl; }; @@ -24075,140 +20138,6 @@ static FORCEINLINE HRESULT ISpeechPhraseInfo_GetDisplayAttributes(ISpeechPhraseI #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_LanguageId_Proxy( - ISpeechPhraseInfo* This, - LONG *LanguageId); -void __RPC_STUB ISpeechPhraseInfo_get_LanguageId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_GrammarId_Proxy( - ISpeechPhraseInfo* This, - VARIANT *GrammarId); -void __RPC_STUB ISpeechPhraseInfo_get_GrammarId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_StartTime_Proxy( - ISpeechPhraseInfo* This, - VARIANT *StartTime); -void __RPC_STUB ISpeechPhraseInfo_get_StartTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_AudioStreamPosition_Proxy( - ISpeechPhraseInfo* This, - VARIANT *AudioStreamPosition); -void __RPC_STUB ISpeechPhraseInfo_get_AudioStreamPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_AudioSizeBytes_Proxy( - ISpeechPhraseInfo* This, - LONG *pAudioSizeBytes); -void __RPC_STUB ISpeechPhraseInfo_get_AudioSizeBytes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_RetainedSizeBytes_Proxy( - ISpeechPhraseInfo* This, - LONG *RetainedSizeBytes); -void __RPC_STUB ISpeechPhraseInfo_get_RetainedSizeBytes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_AudioSizeTime_Proxy( - ISpeechPhraseInfo* This, - LONG *AudioSizeTime); -void __RPC_STUB ISpeechPhraseInfo_get_AudioSizeTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_Rule_Proxy( - ISpeechPhraseInfo* This, - ISpeechPhraseRule **Rule); -void __RPC_STUB ISpeechPhraseInfo_get_Rule_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_Properties_Proxy( - ISpeechPhraseInfo* This, - ISpeechPhraseProperties **Properties); -void __RPC_STUB ISpeechPhraseInfo_get_Properties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_Elements_Proxy( - ISpeechPhraseInfo* This, - ISpeechPhraseElements **Elements); -void __RPC_STUB ISpeechPhraseInfo_get_Elements_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_Replacements_Proxy( - ISpeechPhraseInfo* This, - ISpeechPhraseReplacements **Replacements); -void __RPC_STUB ISpeechPhraseInfo_get_Replacements_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_EngineId_Proxy( - ISpeechPhraseInfo* This, - BSTR *EngineIdGuid); -void __RPC_STUB ISpeechPhraseInfo_get_EngineId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_EnginePrivateData_Proxy( - ISpeechPhraseInfo* This, - VARIANT *PrivateData); -void __RPC_STUB ISpeechPhraseInfo_get_EnginePrivateData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_SaveToMemory_Proxy( - ISpeechPhraseInfo* This, - VARIANT *PhraseBlock); -void __RPC_STUB ISpeechPhraseInfo_SaveToMemory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_GetText_Proxy( - ISpeechPhraseInfo* This, - LONG StartElement, - LONG Elements, - VARIANT_BOOL UseReplacements, - BSTR *Text); -void __RPC_STUB ISpeechPhraseInfo_GetText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_GetDisplayAttributes_Proxy( - ISpeechPhraseInfo* This, - LONG StartElement, - LONG Elements, - VARIANT_BOOL UseReplacements, - SpeechDisplayAttributes *DisplayAttributes); -void __RPC_STUB ISpeechPhraseInfo_GetDisplayAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseInfo_INTERFACE_DEFINED__ */ @@ -24272,29 +20201,29 @@ typedef struct ISpeechPhraseElementVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseElement* This); + ISpeechPhraseElement *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseElement* This); + ISpeechPhraseElement *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -24302,7 +20231,7 @@ typedef struct ISpeechPhraseElementVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -24314,59 +20243,60 @@ typedef struct ISpeechPhraseElementVtbl { /*** ISpeechPhraseElement methods ***/ HRESULT (STDMETHODCALLTYPE *get_AudioTimeOffset)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, LONG *AudioTimeOffset); HRESULT (STDMETHODCALLTYPE *get_AudioSizeTime)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, LONG *AudioSizeTime); HRESULT (STDMETHODCALLTYPE *get_AudioStreamOffset)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, LONG *AudioStreamOffset); HRESULT (STDMETHODCALLTYPE *get_AudioSizeBytes)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, LONG *AudioSizeBytes); HRESULT (STDMETHODCALLTYPE *get_RetainedStreamOffset)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, LONG *RetainedStreamOffset); HRESULT (STDMETHODCALLTYPE *get_RetainedSizeBytes)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, LONG *RetainedSizeBytes); HRESULT (STDMETHODCALLTYPE *get_DisplayText)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, BSTR *DisplayText); HRESULT (STDMETHODCALLTYPE *get_LexicalForm)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, BSTR *LexicalForm); HRESULT (STDMETHODCALLTYPE *get_Pronunciation)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, VARIANT *Pronunciation); HRESULT (STDMETHODCALLTYPE *get_DisplayAttributes)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, SpeechDisplayAttributes *DisplayAttributes); HRESULT (STDMETHODCALLTYPE *get_RequiredConfidence)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, SpeechEngineConfidence *RequiredConfidence); HRESULT (STDMETHODCALLTYPE *get_ActualConfidence)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, SpeechEngineConfidence *ActualConfidence); HRESULT (STDMETHODCALLTYPE *get_EngineConfidence)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, float *EngineConfidence); END_INTERFACE } ISpeechPhraseElementVtbl; + interface ISpeechPhraseElement { CONST_VTBL ISpeechPhraseElementVtbl* lpVtbl; }; @@ -24465,110 +20395,6 @@ static FORCEINLINE HRESULT ISpeechPhraseElement_get_EngineConfidence(ISpeechPhra #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_AudioTimeOffset_Proxy( - ISpeechPhraseElement* This, - LONG *AudioTimeOffset); -void __RPC_STUB ISpeechPhraseElement_get_AudioTimeOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_AudioSizeTime_Proxy( - ISpeechPhraseElement* This, - LONG *AudioSizeTime); -void __RPC_STUB ISpeechPhraseElement_get_AudioSizeTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_AudioStreamOffset_Proxy( - ISpeechPhraseElement* This, - LONG *AudioStreamOffset); -void __RPC_STUB ISpeechPhraseElement_get_AudioStreamOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_AudioSizeBytes_Proxy( - ISpeechPhraseElement* This, - LONG *AudioSizeBytes); -void __RPC_STUB ISpeechPhraseElement_get_AudioSizeBytes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_RetainedStreamOffset_Proxy( - ISpeechPhraseElement* This, - LONG *RetainedStreamOffset); -void __RPC_STUB ISpeechPhraseElement_get_RetainedStreamOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_RetainedSizeBytes_Proxy( - ISpeechPhraseElement* This, - LONG *RetainedSizeBytes); -void __RPC_STUB ISpeechPhraseElement_get_RetainedSizeBytes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_DisplayText_Proxy( - ISpeechPhraseElement* This, - BSTR *DisplayText); -void __RPC_STUB ISpeechPhraseElement_get_DisplayText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_LexicalForm_Proxy( - ISpeechPhraseElement* This, - BSTR *LexicalForm); -void __RPC_STUB ISpeechPhraseElement_get_LexicalForm_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_Pronunciation_Proxy( - ISpeechPhraseElement* This, - VARIANT *Pronunciation); -void __RPC_STUB ISpeechPhraseElement_get_Pronunciation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_DisplayAttributes_Proxy( - ISpeechPhraseElement* This, - SpeechDisplayAttributes *DisplayAttributes); -void __RPC_STUB ISpeechPhraseElement_get_DisplayAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_RequiredConfidence_Proxy( - ISpeechPhraseElement* This, - SpeechEngineConfidence *RequiredConfidence); -void __RPC_STUB ISpeechPhraseElement_get_RequiredConfidence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_ActualConfidence_Proxy( - ISpeechPhraseElement* This, - SpeechEngineConfidence *ActualConfidence); -void __RPC_STUB ISpeechPhraseElement_get_ActualConfidence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_EngineConfidence_Proxy( - ISpeechPhraseElement* This, - float *EngineConfidence); -void __RPC_STUB ISpeechPhraseElement_get_EngineConfidence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseElement_INTERFACE_DEFINED__ */ @@ -24603,29 +20429,29 @@ typedef struct ISpeechPhraseElementsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseElements* This, + ISpeechPhraseElements *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseElements* This); + ISpeechPhraseElements *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseElements* This); + ISpeechPhraseElements *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseElements* This, + ISpeechPhraseElements *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseElements* This, + ISpeechPhraseElements *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseElements* This, + ISpeechPhraseElements *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -24633,7 +20459,7 @@ typedef struct ISpeechPhraseElementsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseElements* This, + ISpeechPhraseElements *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -24645,20 +20471,21 @@ typedef struct ISpeechPhraseElementsVtbl { /*** ISpeechPhraseElements methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechPhraseElements* This, + ISpeechPhraseElements *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechPhraseElements* This, + ISpeechPhraseElements *This, LONG Index, ISpeechPhraseElement **Element); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechPhraseElements* This, + ISpeechPhraseElements *This, IUnknown **EnumVARIANT); END_INTERFACE } ISpeechPhraseElementsVtbl; + interface ISpeechPhraseElements { CONST_VTBL ISpeechPhraseElementsVtbl* lpVtbl; }; @@ -24717,31 +20544,6 @@ static FORCEINLINE HRESULT ISpeechPhraseElements_get__NewEnum(ISpeechPhraseEleme #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseElements_get_Count_Proxy( - ISpeechPhraseElements* This, - LONG *Count); -void __RPC_STUB ISpeechPhraseElements_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElements_Item_Proxy( - ISpeechPhraseElements* This, - LONG Index, - ISpeechPhraseElement **Element); -void __RPC_STUB ISpeechPhraseElements_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElements_get__NewEnum_Proxy( - ISpeechPhraseElements* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechPhraseElements_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseElements_INTERFACE_DEFINED__ */ @@ -24778,29 +20580,29 @@ typedef struct ISpeechPhraseReplacementVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseReplacement* This); + ISpeechPhraseReplacement *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseReplacement* This); + ISpeechPhraseReplacement *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -24808,7 +20610,7 @@ typedef struct ISpeechPhraseReplacementVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -24820,23 +20622,24 @@ typedef struct ISpeechPhraseReplacementVtbl { /*** ISpeechPhraseReplacement methods ***/ HRESULT (STDMETHODCALLTYPE *get_DisplayAttributes)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, SpeechDisplayAttributes *DisplayAttributes); HRESULT (STDMETHODCALLTYPE *get_Text)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, BSTR *Text); HRESULT (STDMETHODCALLTYPE *get_FirstElement)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, LONG *FirstElement); HRESULT (STDMETHODCALLTYPE *get_NumberOfElements)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, LONG *NumberOfElements); END_INTERFACE } ISpeechPhraseReplacementVtbl; + interface ISpeechPhraseReplacement { CONST_VTBL ISpeechPhraseReplacementVtbl* lpVtbl; }; @@ -24899,38 +20702,6 @@ static FORCEINLINE HRESULT ISpeechPhraseReplacement_get_NumberOfElements(ISpeech #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacement_get_DisplayAttributes_Proxy( - ISpeechPhraseReplacement* This, - SpeechDisplayAttributes *DisplayAttributes); -void __RPC_STUB ISpeechPhraseReplacement_get_DisplayAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacement_get_Text_Proxy( - ISpeechPhraseReplacement* This, - BSTR *Text); -void __RPC_STUB ISpeechPhraseReplacement_get_Text_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacement_get_FirstElement_Proxy( - ISpeechPhraseReplacement* This, - LONG *FirstElement); -void __RPC_STUB ISpeechPhraseReplacement_get_FirstElement_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacement_get_NumberOfElements_Proxy( - ISpeechPhraseReplacement* This, - LONG *NumberOfElements); -void __RPC_STUB ISpeechPhraseReplacement_get_NumberOfElements_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseReplacement_INTERFACE_DEFINED__ */ @@ -24965,29 +20736,29 @@ typedef struct ISpeechPhraseReplacementsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseReplacements* This, + ISpeechPhraseReplacements *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseReplacements* This); + ISpeechPhraseReplacements *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseReplacements* This); + ISpeechPhraseReplacements *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseReplacements* This, + ISpeechPhraseReplacements *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseReplacements* This, + ISpeechPhraseReplacements *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseReplacements* This, + ISpeechPhraseReplacements *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -24995,7 +20766,7 @@ typedef struct ISpeechPhraseReplacementsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseReplacements* This, + ISpeechPhraseReplacements *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -25007,20 +20778,21 @@ typedef struct ISpeechPhraseReplacementsVtbl { /*** ISpeechPhraseReplacements methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechPhraseReplacements* This, + ISpeechPhraseReplacements *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechPhraseReplacements* This, + ISpeechPhraseReplacements *This, LONG Index, ISpeechPhraseReplacement **Reps); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechPhraseReplacements* This, + ISpeechPhraseReplacements *This, IUnknown **EnumVARIANT); END_INTERFACE } ISpeechPhraseReplacementsVtbl; + interface ISpeechPhraseReplacements { CONST_VTBL ISpeechPhraseReplacementsVtbl* lpVtbl; }; @@ -25079,31 +20851,6 @@ static FORCEINLINE HRESULT ISpeechPhraseReplacements_get__NewEnum(ISpeechPhraseR #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacements_get_Count_Proxy( - ISpeechPhraseReplacements* This, - LONG *Count); -void __RPC_STUB ISpeechPhraseReplacements_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacements_Item_Proxy( - ISpeechPhraseReplacements* This, - LONG Index, - ISpeechPhraseReplacement **Reps); -void __RPC_STUB ISpeechPhraseReplacements_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacements_get__NewEnum_Proxy( - ISpeechPhraseReplacements* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechPhraseReplacements_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseReplacements_INTERFACE_DEFINED__ */ @@ -25155,29 +20902,29 @@ typedef struct ISpeechPhrasePropertyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseProperty* This); + ISpeechPhraseProperty *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseProperty* This); + ISpeechPhraseProperty *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -25185,7 +20932,7 @@ typedef struct ISpeechPhrasePropertyVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -25197,43 +20944,44 @@ typedef struct ISpeechPhrasePropertyVtbl { /*** ISpeechPhraseProperty methods ***/ HRESULT (STDMETHODCALLTYPE *get_Name)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, BSTR *Name); HRESULT (STDMETHODCALLTYPE *get_Id)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, LONG *Id); HRESULT (STDMETHODCALLTYPE *get_Value)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, VARIANT *Value); HRESULT (STDMETHODCALLTYPE *get_FirstElement)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, LONG *FirstElement); HRESULT (STDMETHODCALLTYPE *get_NumberOfElements)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, LONG *NumberOfElements); HRESULT (STDMETHODCALLTYPE *get_EngineConfidence)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, float *Confidence); HRESULT (STDMETHODCALLTYPE *get_Confidence)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, SpeechEngineConfidence *Confidence); HRESULT (STDMETHODCALLTYPE *get_Parent)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, ISpeechPhraseProperty **ParentProperty); HRESULT (STDMETHODCALLTYPE *get_Children)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, ISpeechPhraseProperties **Children); END_INTERFACE } ISpeechPhrasePropertyVtbl; + interface ISpeechPhraseProperty { CONST_VTBL ISpeechPhrasePropertyVtbl* lpVtbl; }; @@ -25316,78 +21064,6 @@ static FORCEINLINE HRESULT ISpeechPhraseProperty_get_Children(ISpeechPhrasePrope #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Name_Proxy( - ISpeechPhraseProperty* This, - BSTR *Name); -void __RPC_STUB ISpeechPhraseProperty_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Id_Proxy( - ISpeechPhraseProperty* This, - LONG *Id); -void __RPC_STUB ISpeechPhraseProperty_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Value_Proxy( - ISpeechPhraseProperty* This, - VARIANT *Value); -void __RPC_STUB ISpeechPhraseProperty_get_Value_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_FirstElement_Proxy( - ISpeechPhraseProperty* This, - LONG *FirstElement); -void __RPC_STUB ISpeechPhraseProperty_get_FirstElement_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_NumberOfElements_Proxy( - ISpeechPhraseProperty* This, - LONG *NumberOfElements); -void __RPC_STUB ISpeechPhraseProperty_get_NumberOfElements_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_EngineConfidence_Proxy( - ISpeechPhraseProperty* This, - float *Confidence); -void __RPC_STUB ISpeechPhraseProperty_get_EngineConfidence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Confidence_Proxy( - ISpeechPhraseProperty* This, - SpeechEngineConfidence *Confidence); -void __RPC_STUB ISpeechPhraseProperty_get_Confidence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Parent_Proxy( - ISpeechPhraseProperty* This, - ISpeechPhraseProperty **ParentProperty); -void __RPC_STUB ISpeechPhraseProperty_get_Parent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Children_Proxy( - ISpeechPhraseProperty* This, - ISpeechPhraseProperties **Children); -void __RPC_STUB ISpeechPhraseProperty_get_Children_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseProperty_INTERFACE_DEFINED__ */ @@ -25422,29 +21098,29 @@ typedef struct ISpeechPhrasePropertiesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseProperties* This, + ISpeechPhraseProperties *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseProperties* This); + ISpeechPhraseProperties *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseProperties* This); + ISpeechPhraseProperties *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseProperties* This, + ISpeechPhraseProperties *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseProperties* This, + ISpeechPhraseProperties *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseProperties* This, + ISpeechPhraseProperties *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -25452,7 +21128,7 @@ typedef struct ISpeechPhrasePropertiesVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseProperties* This, + ISpeechPhraseProperties *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -25464,20 +21140,21 @@ typedef struct ISpeechPhrasePropertiesVtbl { /*** ISpeechPhraseProperties methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechPhraseProperties* This, + ISpeechPhraseProperties *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechPhraseProperties* This, + ISpeechPhraseProperties *This, LONG Index, ISpeechPhraseProperty **Property); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechPhraseProperties* This, + ISpeechPhraseProperties *This, IUnknown **EnumVARIANT); END_INTERFACE } ISpeechPhrasePropertiesVtbl; + interface ISpeechPhraseProperties { CONST_VTBL ISpeechPhrasePropertiesVtbl* lpVtbl; }; @@ -25536,31 +21213,6 @@ static FORCEINLINE HRESULT ISpeechPhraseProperties_get__NewEnum(ISpeechPhrasePro #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperties_get_Count_Proxy( - ISpeechPhraseProperties* This, - LONG *Count); -void __RPC_STUB ISpeechPhraseProperties_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperties_Item_Proxy( - ISpeechPhraseProperties* This, - LONG Index, - ISpeechPhraseProperty **Property); -void __RPC_STUB ISpeechPhraseProperties_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperties_get__NewEnum_Proxy( - ISpeechPhraseProperties* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechPhraseProperties_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseProperties_INTERFACE_DEFINED__ */ @@ -25609,29 +21261,29 @@ typedef struct ISpeechPhraseRuleVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseRule* This); + ISpeechPhraseRule *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseRule* This); + ISpeechPhraseRule *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -25639,7 +21291,7 @@ typedef struct ISpeechPhraseRuleVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -25651,39 +21303,40 @@ typedef struct ISpeechPhraseRuleVtbl { /*** ISpeechPhraseRule methods ***/ HRESULT (STDMETHODCALLTYPE *get_Name)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, BSTR *Name); HRESULT (STDMETHODCALLTYPE *get_Id)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, LONG *Id); HRESULT (STDMETHODCALLTYPE *get_FirstElement)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, LONG *FirstElement); HRESULT (STDMETHODCALLTYPE *get_NumberOfElements)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, LONG *NumberOfElements); HRESULT (STDMETHODCALLTYPE *get_Parent)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, ISpeechPhraseRule **Parent); HRESULT (STDMETHODCALLTYPE *get_Children)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, ISpeechPhraseRules **Children); HRESULT (STDMETHODCALLTYPE *get_Confidence)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, SpeechEngineConfidence *ActualConfidence); HRESULT (STDMETHODCALLTYPE *get_EngineConfidence)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, float *EngineConfidence); END_INTERFACE } ISpeechPhraseRuleVtbl; + interface ISpeechPhraseRule { CONST_VTBL ISpeechPhraseRuleVtbl* lpVtbl; }; @@ -25762,70 +21415,6 @@ static FORCEINLINE HRESULT ISpeechPhraseRule_get_EngineConfidence(ISpeechPhraseR #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Name_Proxy( - ISpeechPhraseRule* This, - BSTR *Name); -void __RPC_STUB ISpeechPhraseRule_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Id_Proxy( - ISpeechPhraseRule* This, - LONG *Id); -void __RPC_STUB ISpeechPhraseRule_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_FirstElement_Proxy( - ISpeechPhraseRule* This, - LONG *FirstElement); -void __RPC_STUB ISpeechPhraseRule_get_FirstElement_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_NumberOfElements_Proxy( - ISpeechPhraseRule* This, - LONG *NumberOfElements); -void __RPC_STUB ISpeechPhraseRule_get_NumberOfElements_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Parent_Proxy( - ISpeechPhraseRule* This, - ISpeechPhraseRule **Parent); -void __RPC_STUB ISpeechPhraseRule_get_Parent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Children_Proxy( - ISpeechPhraseRule* This, - ISpeechPhraseRules **Children); -void __RPC_STUB ISpeechPhraseRule_get_Children_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Confidence_Proxy( - ISpeechPhraseRule* This, - SpeechEngineConfidence *ActualConfidence); -void __RPC_STUB ISpeechPhraseRule_get_Confidence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_EngineConfidence_Proxy( - ISpeechPhraseRule* This, - float *EngineConfidence); -void __RPC_STUB ISpeechPhraseRule_get_EngineConfidence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseRule_INTERFACE_DEFINED__ */ @@ -25860,29 +21449,29 @@ typedef struct ISpeechPhraseRulesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseRules* This, + ISpeechPhraseRules *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseRules* This); + ISpeechPhraseRules *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseRules* This); + ISpeechPhraseRules *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseRules* This, + ISpeechPhraseRules *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseRules* This, + ISpeechPhraseRules *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseRules* This, + ISpeechPhraseRules *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -25890,7 +21479,7 @@ typedef struct ISpeechPhraseRulesVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseRules* This, + ISpeechPhraseRules *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -25902,20 +21491,21 @@ typedef struct ISpeechPhraseRulesVtbl { /*** ISpeechPhraseRules methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechPhraseRules* This, + ISpeechPhraseRules *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechPhraseRules* This, + ISpeechPhraseRules *This, LONG Index, ISpeechPhraseRule **Rule); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechPhraseRules* This, + ISpeechPhraseRules *This, IUnknown **EnumVARIANT); END_INTERFACE } ISpeechPhraseRulesVtbl; + interface ISpeechPhraseRules { CONST_VTBL ISpeechPhraseRulesVtbl* lpVtbl; }; @@ -25974,31 +21564,6 @@ static FORCEINLINE HRESULT ISpeechPhraseRules_get__NewEnum(ISpeechPhraseRules* T #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseRules_get_Count_Proxy( - ISpeechPhraseRules* This, - LONG *Count); -void __RPC_STUB ISpeechPhraseRules_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRules_Item_Proxy( - ISpeechPhraseRules* This, - LONG Index, - ISpeechPhraseRule **Rule); -void __RPC_STUB ISpeechPhraseRules_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRules_get__NewEnum_Proxy( - ISpeechPhraseRules* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechPhraseRules_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseRules_INTERFACE_DEFINED__ */ @@ -26033,29 +21598,29 @@ typedef struct ISpeechLexiconWordsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechLexiconWords* This, + ISpeechLexiconWords *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechLexiconWords* This); + ISpeechLexiconWords *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechLexiconWords* This); + ISpeechLexiconWords *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechLexiconWords* This, + ISpeechLexiconWords *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechLexiconWords* This, + ISpeechLexiconWords *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechLexiconWords* This, + ISpeechLexiconWords *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -26063,7 +21628,7 @@ typedef struct ISpeechLexiconWordsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechLexiconWords* This, + ISpeechLexiconWords *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -26075,20 +21640,21 @@ typedef struct ISpeechLexiconWordsVtbl { /*** ISpeechLexiconWords methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechLexiconWords* This, + ISpeechLexiconWords *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechLexiconWords* This, + ISpeechLexiconWords *This, LONG Index, ISpeechLexiconWord **Word); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechLexiconWords* This, + ISpeechLexiconWords *This, IUnknown **EnumVARIANT); END_INTERFACE } ISpeechLexiconWordsVtbl; + interface ISpeechLexiconWords { CONST_VTBL ISpeechLexiconWordsVtbl* lpVtbl; }; @@ -26147,31 +21713,6 @@ static FORCEINLINE HRESULT ISpeechLexiconWords_get__NewEnum(ISpeechLexiconWords* #endif -HRESULT STDMETHODCALLTYPE ISpeechLexiconWords_get_Count_Proxy( - ISpeechLexiconWords* This, - LONG *Count); -void __RPC_STUB ISpeechLexiconWords_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconWords_Item_Proxy( - ISpeechLexiconWords* This, - LONG Index, - ISpeechLexiconWord **Word); -void __RPC_STUB ISpeechLexiconWords_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconWords_get__NewEnum_Proxy( - ISpeechLexiconWords* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechLexiconWords_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechLexiconWords_INTERFACE_DEFINED__ */ @@ -26238,29 +21779,29 @@ typedef struct ISpeechLexiconVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechLexicon* This, + ISpeechLexicon *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechLexicon* This); + ISpeechLexicon *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechLexicon* This); + ISpeechLexicon *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechLexicon* This, + ISpeechLexicon *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechLexicon* This, + ISpeechLexicon *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechLexicon* This, + ISpeechLexicon *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -26268,7 +21809,7 @@ typedef struct ISpeechLexiconVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechLexicon* This, + ISpeechLexicon *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -26280,57 +21821,58 @@ typedef struct ISpeechLexiconVtbl { /*** ISpeechLexicon methods ***/ HRESULT (STDMETHODCALLTYPE *get_GenerationId)( - ISpeechLexicon* This, + ISpeechLexicon *This, LONG *GenerationId); HRESULT (STDMETHODCALLTYPE *GetWords)( - ISpeechLexicon* This, + ISpeechLexicon *This, SpeechLexiconType Flags, LONG *GenerationID, ISpeechLexiconWords **Words); HRESULT (STDMETHODCALLTYPE *AddPronunciation)( - ISpeechLexicon* This, + ISpeechLexicon *This, BSTR bstrWord, SpeechLanguageId LangId, SpeechPartOfSpeech PartOfSpeech, BSTR bstrPronunciation); HRESULT (STDMETHODCALLTYPE *AddPronunciationByPhoneIds)( - ISpeechLexicon* This, + ISpeechLexicon *This, BSTR bstrWord, SpeechLanguageId LangId, SpeechPartOfSpeech PartOfSpeech, VARIANT *PhoneIds); HRESULT (STDMETHODCALLTYPE *RemovePronunciation)( - ISpeechLexicon* This, + ISpeechLexicon *This, BSTR bstrWord, SpeechLanguageId LangId, SpeechPartOfSpeech PartOfSpeech, BSTR bstrPronunciation); HRESULT (STDMETHODCALLTYPE *RemovePronunciationByPhoneIds)( - ISpeechLexicon* This, + ISpeechLexicon *This, BSTR bstrWord, SpeechLanguageId LangId, SpeechPartOfSpeech PartOfSpeech, VARIANT *PhoneIds); HRESULT (STDMETHODCALLTYPE *GetPronunciations)( - ISpeechLexicon* This, + ISpeechLexicon *This, BSTR bstrWord, SpeechLanguageId LangId, SpeechLexiconType TypeFlags, ISpeechLexiconPronunciations **ppPronunciations); HRESULT (STDMETHODCALLTYPE *GetGenerationChange)( - ISpeechLexicon* This, + ISpeechLexicon *This, LONG *GenerationID, ISpeechLexiconWords **ppWords); END_INTERFACE } ISpeechLexiconVtbl; + interface ISpeechLexicon { CONST_VTBL ISpeechLexiconVtbl* lpVtbl; }; @@ -26409,88 +21951,6 @@ static FORCEINLINE HRESULT ISpeechLexicon_GetGenerationChange(ISpeechLexicon* Th #endif -HRESULT STDMETHODCALLTYPE ISpeechLexicon_get_GenerationId_Proxy( - ISpeechLexicon* This, - LONG *GenerationId); -void __RPC_STUB ISpeechLexicon_get_GenerationId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexicon_GetWords_Proxy( - ISpeechLexicon* This, - SpeechLexiconType Flags, - LONG *GenerationID, - ISpeechLexiconWords **Words); -void __RPC_STUB ISpeechLexicon_GetWords_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexicon_AddPronunciation_Proxy( - ISpeechLexicon* This, - BSTR bstrWord, - SpeechLanguageId LangId, - SpeechPartOfSpeech PartOfSpeech, - BSTR bstrPronunciation); -void __RPC_STUB ISpeechLexicon_AddPronunciation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexicon_AddPronunciationByPhoneIds_Proxy( - ISpeechLexicon* This, - BSTR bstrWord, - SpeechLanguageId LangId, - SpeechPartOfSpeech PartOfSpeech, - VARIANT *PhoneIds); -void __RPC_STUB ISpeechLexicon_AddPronunciationByPhoneIds_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexicon_RemovePronunciation_Proxy( - ISpeechLexicon* This, - BSTR bstrWord, - SpeechLanguageId LangId, - SpeechPartOfSpeech PartOfSpeech, - BSTR bstrPronunciation); -void __RPC_STUB ISpeechLexicon_RemovePronunciation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexicon_RemovePronunciationByPhoneIds_Proxy( - ISpeechLexicon* This, - BSTR bstrWord, - SpeechLanguageId LangId, - SpeechPartOfSpeech PartOfSpeech, - VARIANT *PhoneIds); -void __RPC_STUB ISpeechLexicon_RemovePronunciationByPhoneIds_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexicon_GetPronunciations_Proxy( - ISpeechLexicon* This, - BSTR bstrWord, - SpeechLanguageId LangId, - SpeechLexiconType TypeFlags, - ISpeechLexiconPronunciations **ppPronunciations); -void __RPC_STUB ISpeechLexicon_GetPronunciations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexicon_GetGenerationChange_Proxy( - ISpeechLexicon* This, - LONG *GenerationID, - ISpeechLexiconWords **ppWords); -void __RPC_STUB ISpeechLexicon_GetGenerationChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechLexicon_INTERFACE_DEFINED__ */ @@ -26527,29 +21987,29 @@ typedef struct ISpeechLexiconWordVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechLexiconWord* This); + ISpeechLexiconWord *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechLexiconWord* This); + ISpeechLexiconWord *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -26557,7 +22017,7 @@ typedef struct ISpeechLexiconWordVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -26569,23 +22029,24 @@ typedef struct ISpeechLexiconWordVtbl { /*** ISpeechLexiconWord methods ***/ HRESULT (STDMETHODCALLTYPE *get_LangId)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, SpeechLanguageId *LangId); HRESULT (STDMETHODCALLTYPE *get_Type)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, SpeechWordType *WordType); HRESULT (STDMETHODCALLTYPE *get_Word)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, BSTR *Word); HRESULT (STDMETHODCALLTYPE *get_Pronunciations)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, ISpeechLexiconPronunciations **Pronunciations); END_INTERFACE } ISpeechLexiconWordVtbl; + interface ISpeechLexiconWord { CONST_VTBL ISpeechLexiconWordVtbl* lpVtbl; }; @@ -26648,38 +22109,6 @@ static FORCEINLINE HRESULT ISpeechLexiconWord_get_Pronunciations(ISpeechLexiconW #endif -HRESULT STDMETHODCALLTYPE ISpeechLexiconWord_get_LangId_Proxy( - ISpeechLexiconWord* This, - SpeechLanguageId *LangId); -void __RPC_STUB ISpeechLexiconWord_get_LangId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconWord_get_Type_Proxy( - ISpeechLexiconWord* This, - SpeechWordType *WordType); -void __RPC_STUB ISpeechLexiconWord_get_Type_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconWord_get_Word_Proxy( - ISpeechLexiconWord* This, - BSTR *Word); -void __RPC_STUB ISpeechLexiconWord_get_Word_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconWord_get_Pronunciations_Proxy( - ISpeechLexiconWord* This, - ISpeechLexiconPronunciations **Pronunciations); -void __RPC_STUB ISpeechLexiconWord_get_Pronunciations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechLexiconWord_INTERFACE_DEFINED__ */ @@ -26714,29 +22143,29 @@ typedef struct ISpeechLexiconPronunciationsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechLexiconPronunciations* This, + ISpeechLexiconPronunciations *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechLexiconPronunciations* This); + ISpeechLexiconPronunciations *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechLexiconPronunciations* This); + ISpeechLexiconPronunciations *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechLexiconPronunciations* This, + ISpeechLexiconPronunciations *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechLexiconPronunciations* This, + ISpeechLexiconPronunciations *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechLexiconPronunciations* This, + ISpeechLexiconPronunciations *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -26744,7 +22173,7 @@ typedef struct ISpeechLexiconPronunciationsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechLexiconPronunciations* This, + ISpeechLexiconPronunciations *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -26756,20 +22185,21 @@ typedef struct ISpeechLexiconPronunciationsVtbl { /*** ISpeechLexiconPronunciations methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechLexiconPronunciations* This, + ISpeechLexiconPronunciations *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechLexiconPronunciations* This, + ISpeechLexiconPronunciations *This, LONG Index, ISpeechLexiconPronunciation **Pronunciation); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechLexiconPronunciations* This, + ISpeechLexiconPronunciations *This, IUnknown **EnumVARIANT); END_INTERFACE } ISpeechLexiconPronunciationsVtbl; + interface ISpeechLexiconPronunciations { CONST_VTBL ISpeechLexiconPronunciationsVtbl* lpVtbl; }; @@ -26828,31 +22258,6 @@ static FORCEINLINE HRESULT ISpeechLexiconPronunciations_get__NewEnum(ISpeechLexi #endif -HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciations_get_Count_Proxy( - ISpeechLexiconPronunciations* This, - LONG *Count); -void __RPC_STUB ISpeechLexiconPronunciations_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciations_Item_Proxy( - ISpeechLexiconPronunciations* This, - LONG Index, - ISpeechLexiconPronunciation **Pronunciation); -void __RPC_STUB ISpeechLexiconPronunciations_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciations_get__NewEnum_Proxy( - ISpeechLexiconPronunciations* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechLexiconPronunciations_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechLexiconPronunciations_INTERFACE_DEFINED__ */ @@ -26892,29 +22297,29 @@ typedef struct ISpeechLexiconPronunciationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechLexiconPronunciation* This); + ISpeechLexiconPronunciation *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechLexiconPronunciation* This); + ISpeechLexiconPronunciation *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -26922,7 +22327,7 @@ typedef struct ISpeechLexiconPronunciationVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -26934,27 +22339,28 @@ typedef struct ISpeechLexiconPronunciationVtbl { /*** ISpeechLexiconPronunciation methods ***/ HRESULT (STDMETHODCALLTYPE *get_Type)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, SpeechLexiconType *LexiconType); HRESULT (STDMETHODCALLTYPE *get_LangId)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, SpeechLanguageId *LangId); HRESULT (STDMETHODCALLTYPE *get_PartOfSpeech)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, SpeechPartOfSpeech *PartOfSpeech); HRESULT (STDMETHODCALLTYPE *get_PhoneIds)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, VARIANT *PhoneIds); HRESULT (STDMETHODCALLTYPE *get_Symbolic)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, BSTR *Symbolic); END_INTERFACE } ISpeechLexiconPronunciationVtbl; + interface ISpeechLexiconPronunciation { CONST_VTBL ISpeechLexiconPronunciationVtbl* lpVtbl; }; @@ -27021,46 +22427,6 @@ static FORCEINLINE HRESULT ISpeechLexiconPronunciation_get_Symbolic(ISpeechLexic #endif -HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_Type_Proxy( - ISpeechLexiconPronunciation* This, - SpeechLexiconType *LexiconType); -void __RPC_STUB ISpeechLexiconPronunciation_get_Type_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_LangId_Proxy( - ISpeechLexiconPronunciation* This, - SpeechLanguageId *LangId); -void __RPC_STUB ISpeechLexiconPronunciation_get_LangId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_PartOfSpeech_Proxy( - ISpeechLexiconPronunciation* This, - SpeechPartOfSpeech *PartOfSpeech); -void __RPC_STUB ISpeechLexiconPronunciation_get_PartOfSpeech_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_PhoneIds_Proxy( - ISpeechLexiconPronunciation* This, - VARIANT *PhoneIds); -void __RPC_STUB ISpeechLexiconPronunciation_get_PhoneIds_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_Symbolic_Proxy( - ISpeechLexiconPronunciation* This, - BSTR *Symbolic); -void __RPC_STUB ISpeechLexiconPronunciation_get_Symbolic_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechLexiconPronunciation_INTERFACE_DEFINED__ */ @@ -27099,29 +22465,29 @@ typedef struct ISpeechPhoneConverterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhoneConverter* This); + ISpeechPhoneConverter *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhoneConverter* This); + ISpeechPhoneConverter *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -27129,7 +22495,7 @@ typedef struct ISpeechPhoneConverterVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -27141,25 +22507,26 @@ typedef struct ISpeechPhoneConverterVtbl { /*** ISpeechPhoneConverter methods ***/ HRESULT (STDMETHODCALLTYPE *get_LanguageId)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, SpeechLanguageId *LanguageId); HRESULT (STDMETHODCALLTYPE *put_LanguageId)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, SpeechLanguageId LanguageId); HRESULT (STDMETHODCALLTYPE *PhoneToId)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, const BSTR Phonemes, VARIANT *IdArray); HRESULT (STDMETHODCALLTYPE *IdToPhone)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, const VARIANT IdArray, BSTR *Phonemes); END_INTERFACE } ISpeechPhoneConverterVtbl; + interface ISpeechPhoneConverter { CONST_VTBL ISpeechPhoneConverterVtbl* lpVtbl; }; @@ -27222,40 +22589,6 @@ static FORCEINLINE HRESULT ISpeechPhoneConverter_IdToPhone(ISpeechPhoneConverter #endif -HRESULT STDMETHODCALLTYPE ISpeechPhoneConverter_get_LanguageId_Proxy( - ISpeechPhoneConverter* This, - SpeechLanguageId *LanguageId); -void __RPC_STUB ISpeechPhoneConverter_get_LanguageId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhoneConverter_put_LanguageId_Proxy( - ISpeechPhoneConverter* This, - SpeechLanguageId LanguageId); -void __RPC_STUB ISpeechPhoneConverter_put_LanguageId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhoneConverter_PhoneToId_Proxy( - ISpeechPhoneConverter* This, - const BSTR Phonemes, - VARIANT *IdArray); -void __RPC_STUB ISpeechPhoneConverter_PhoneToId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhoneConverter_IdToPhone_Proxy( - ISpeechPhoneConverter* This, - const VARIANT IdArray, - BSTR *Phonemes); -void __RPC_STUB ISpeechPhoneConverter_IdToPhone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhoneConverter_INTERFACE_DEFINED__ */ @@ -27626,16 +22959,25 @@ __CRT_UUID_DECL(SpMemoryStream, 0x5fb7ef7d, 0xdff4, 0x468a, 0xb6,0xb7, 0x2f,0xcb #ifndef __ISpXMLRecoResult_FWD_DEFINED__ #define __ISpXMLRecoResult_FWD_DEFINED__ typedef interface ISpXMLRecoResult ISpXMLRecoResult; +#ifdef __cplusplus +interface ISpXMLRecoResult; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoGrammar2_FWD_DEFINED__ #define __ISpRecoGrammar2_FWD_DEFINED__ typedef interface ISpRecoGrammar2 ISpRecoGrammar2; +#ifdef __cplusplus +interface ISpRecoGrammar2; +#endif /* __cplusplus */ #endif #ifndef __ISpeechResourceLoader_FWD_DEFINED__ #define __ISpeechResourceLoader_FWD_DEFINED__ typedef interface ISpeechResourceLoader ISpeechResourceLoader; +#ifdef __cplusplus +interface ISpeechResourceLoader; +#endif /* __cplusplus */ #endif /* Begin additional prototypes for all interfaces */ diff --git a/lib/libc/include/any-windows-any/sapi54.h b/lib/libc/include/any-windows-any/sapi54.h index fa79ca6256..0a9cf7cf50 100644 --- a/lib/libc/include/any-windows-any/sapi54.h +++ b/lib/libc/include/any-windows-any/sapi54.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/sapi54.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/sapi54.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,496 +21,793 @@ #ifndef __ISpNotifySource_FWD_DEFINED__ #define __ISpNotifySource_FWD_DEFINED__ typedef interface ISpNotifySource ISpNotifySource; +#ifdef __cplusplus +interface ISpNotifySource; +#endif /* __cplusplus */ #endif #ifndef __ISpNotifySink_FWD_DEFINED__ #define __ISpNotifySink_FWD_DEFINED__ typedef interface ISpNotifySink ISpNotifySink; +#ifdef __cplusplus +interface ISpNotifySink; +#endif /* __cplusplus */ #endif #ifndef __ISpNotifyTranslator_FWD_DEFINED__ #define __ISpNotifyTranslator_FWD_DEFINED__ typedef interface ISpNotifyTranslator ISpNotifyTranslator; +#ifdef __cplusplus +interface ISpNotifyTranslator; +#endif /* __cplusplus */ #endif #ifndef __ISpDataKey_FWD_DEFINED__ #define __ISpDataKey_FWD_DEFINED__ typedef interface ISpDataKey ISpDataKey; +#ifdef __cplusplus +interface ISpDataKey; +#endif /* __cplusplus */ #endif #ifndef __ISpObjectWithToken_FWD_DEFINED__ #define __ISpObjectWithToken_FWD_DEFINED__ typedef interface ISpObjectWithToken ISpObjectWithToken; +#ifdef __cplusplus +interface ISpObjectWithToken; +#endif /* __cplusplus */ #endif #ifndef __IEnumSpObjectTokens_FWD_DEFINED__ #define __IEnumSpObjectTokens_FWD_DEFINED__ typedef interface IEnumSpObjectTokens IEnumSpObjectTokens; +#ifdef __cplusplus +interface IEnumSpObjectTokens; +#endif /* __cplusplus */ #endif #ifndef __ISpRegDataKey_FWD_DEFINED__ #define __ISpRegDataKey_FWD_DEFINED__ typedef interface ISpRegDataKey ISpRegDataKey; +#ifdef __cplusplus +interface ISpRegDataKey; +#endif /* __cplusplus */ #endif #ifndef __ISpObjectTokenCategory_FWD_DEFINED__ #define __ISpObjectTokenCategory_FWD_DEFINED__ typedef interface ISpObjectTokenCategory ISpObjectTokenCategory; +#ifdef __cplusplus +interface ISpObjectTokenCategory; +#endif /* __cplusplus */ #endif #ifndef __ISpObjectToken_FWD_DEFINED__ #define __ISpObjectToken_FWD_DEFINED__ typedef interface ISpObjectToken ISpObjectToken; +#ifdef __cplusplus +interface ISpObjectToken; +#endif /* __cplusplus */ #endif #ifndef __ISpObjectTokenInit_FWD_DEFINED__ #define __ISpObjectTokenInit_FWD_DEFINED__ typedef interface ISpObjectTokenInit ISpObjectTokenInit; +#ifdef __cplusplus +interface ISpObjectTokenInit; +#endif /* __cplusplus */ #endif #ifndef __ISpResourceManager_FWD_DEFINED__ #define __ISpResourceManager_FWD_DEFINED__ typedef interface ISpResourceManager ISpResourceManager; +#ifdef __cplusplus +interface ISpResourceManager; +#endif /* __cplusplus */ #endif #ifndef __ISpEventSource_FWD_DEFINED__ #define __ISpEventSource_FWD_DEFINED__ typedef interface ISpEventSource ISpEventSource; +#ifdef __cplusplus +interface ISpEventSource; +#endif /* __cplusplus */ #endif #ifndef __ISpEventSource2_FWD_DEFINED__ #define __ISpEventSource2_FWD_DEFINED__ typedef interface ISpEventSource2 ISpEventSource2; +#ifdef __cplusplus +interface ISpEventSource2; +#endif /* __cplusplus */ #endif #ifndef __ISpEventSink_FWD_DEFINED__ #define __ISpEventSink_FWD_DEFINED__ typedef interface ISpEventSink ISpEventSink; +#ifdef __cplusplus +interface ISpEventSink; +#endif /* __cplusplus */ #endif #ifndef __ISpStreamFormat_FWD_DEFINED__ #define __ISpStreamFormat_FWD_DEFINED__ typedef interface ISpStreamFormat ISpStreamFormat; +#ifdef __cplusplus +interface ISpStreamFormat; +#endif /* __cplusplus */ #endif #ifndef __ISpStream_FWD_DEFINED__ #define __ISpStream_FWD_DEFINED__ typedef interface ISpStream ISpStream; +#ifdef __cplusplus +interface ISpStream; +#endif /* __cplusplus */ #endif #ifndef __ISpStreamFormatConverter_FWD_DEFINED__ #define __ISpStreamFormatConverter_FWD_DEFINED__ typedef interface ISpStreamFormatConverter ISpStreamFormatConverter; +#ifdef __cplusplus +interface ISpStreamFormatConverter; +#endif /* __cplusplus */ #endif #ifndef __ISpAudio_FWD_DEFINED__ #define __ISpAudio_FWD_DEFINED__ typedef interface ISpAudio ISpAudio; +#ifdef __cplusplus +interface ISpAudio; +#endif /* __cplusplus */ #endif #ifndef __ISpMMSysAudio_FWD_DEFINED__ #define __ISpMMSysAudio_FWD_DEFINED__ typedef interface ISpMMSysAudio ISpMMSysAudio; +#ifdef __cplusplus +interface ISpMMSysAudio; +#endif /* __cplusplus */ #endif #ifndef __ISpTranscript_FWD_DEFINED__ #define __ISpTranscript_FWD_DEFINED__ typedef interface ISpTranscript ISpTranscript; +#ifdef __cplusplus +interface ISpTranscript; +#endif /* __cplusplus */ #endif #ifndef __ISpLexicon_FWD_DEFINED__ #define __ISpLexicon_FWD_DEFINED__ typedef interface ISpLexicon ISpLexicon; +#ifdef __cplusplus +interface ISpLexicon; +#endif /* __cplusplus */ #endif #ifndef __ISpContainerLexicon_FWD_DEFINED__ #define __ISpContainerLexicon_FWD_DEFINED__ typedef interface ISpContainerLexicon ISpContainerLexicon; +#ifdef __cplusplus +interface ISpContainerLexicon; +#endif /* __cplusplus */ #endif #ifndef __ISpShortcut_FWD_DEFINED__ #define __ISpShortcut_FWD_DEFINED__ typedef interface ISpShortcut ISpShortcut; +#ifdef __cplusplus +interface ISpShortcut; +#endif /* __cplusplus */ #endif #ifndef __ISpPhoneConverter_FWD_DEFINED__ #define __ISpPhoneConverter_FWD_DEFINED__ typedef interface ISpPhoneConverter ISpPhoneConverter; +#ifdef __cplusplus +interface ISpPhoneConverter; +#endif /* __cplusplus */ #endif #ifndef __ISpPhoneticAlphabetConverter_FWD_DEFINED__ #define __ISpPhoneticAlphabetConverter_FWD_DEFINED__ typedef interface ISpPhoneticAlphabetConverter ISpPhoneticAlphabetConverter; +#ifdef __cplusplus +interface ISpPhoneticAlphabetConverter; +#endif /* __cplusplus */ #endif #ifndef __ISpPhoneticAlphabetSelection_FWD_DEFINED__ #define __ISpPhoneticAlphabetSelection_FWD_DEFINED__ typedef interface ISpPhoneticAlphabetSelection ISpPhoneticAlphabetSelection; +#ifdef __cplusplus +interface ISpPhoneticAlphabetSelection; +#endif /* __cplusplus */ #endif #ifndef __ISpVoice_FWD_DEFINED__ #define __ISpVoice_FWD_DEFINED__ typedef interface ISpVoice ISpVoice; +#ifdef __cplusplus +interface ISpVoice; +#endif /* __cplusplus */ #endif #ifndef __ISpPhrase_FWD_DEFINED__ #define __ISpPhrase_FWD_DEFINED__ typedef interface ISpPhrase ISpPhrase; +#ifdef __cplusplus +interface ISpPhrase; +#endif /* __cplusplus */ #endif #ifndef __ISpPhraseAlt_FWD_DEFINED__ #define __ISpPhraseAlt_FWD_DEFINED__ typedef interface ISpPhraseAlt ISpPhraseAlt; +#ifdef __cplusplus +interface ISpPhraseAlt; +#endif /* __cplusplus */ #endif #ifndef __ISpPhrase2_FWD_DEFINED__ #define __ISpPhrase2_FWD_DEFINED__ typedef interface ISpPhrase2 ISpPhrase2; +#ifdef __cplusplus +interface ISpPhrase2; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoResult_FWD_DEFINED__ #define __ISpRecoResult_FWD_DEFINED__ typedef interface ISpRecoResult ISpRecoResult; +#ifdef __cplusplus +interface ISpRecoResult; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoResult2_FWD_DEFINED__ #define __ISpRecoResult2_FWD_DEFINED__ typedef interface ISpRecoResult2 ISpRecoResult2; +#ifdef __cplusplus +interface ISpRecoResult2; +#endif /* __cplusplus */ #endif #ifndef __ISpXMLRecoResult_FWD_DEFINED__ #define __ISpXMLRecoResult_FWD_DEFINED__ typedef interface ISpXMLRecoResult ISpXMLRecoResult; +#ifdef __cplusplus +interface ISpXMLRecoResult; +#endif /* __cplusplus */ #endif #ifndef __ISpGrammarBuilder_FWD_DEFINED__ #define __ISpGrammarBuilder_FWD_DEFINED__ typedef interface ISpGrammarBuilder ISpGrammarBuilder; +#ifdef __cplusplus +interface ISpGrammarBuilder; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoGrammar_FWD_DEFINED__ #define __ISpRecoGrammar_FWD_DEFINED__ typedef interface ISpRecoGrammar ISpRecoGrammar; +#ifdef __cplusplus +interface ISpRecoGrammar; +#endif /* __cplusplus */ #endif #ifndef __ISpGrammarBuilder2_FWD_DEFINED__ #define __ISpGrammarBuilder2_FWD_DEFINED__ typedef interface ISpGrammarBuilder2 ISpGrammarBuilder2; +#ifdef __cplusplus +interface ISpGrammarBuilder2; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoGrammar2_FWD_DEFINED__ #define __ISpRecoGrammar2_FWD_DEFINED__ typedef interface ISpRecoGrammar2 ISpRecoGrammar2; +#ifdef __cplusplus +interface ISpRecoGrammar2; +#endif /* __cplusplus */ #endif #ifndef __ISpeechResourceLoader_FWD_DEFINED__ #define __ISpeechResourceLoader_FWD_DEFINED__ typedef interface ISpeechResourceLoader ISpeechResourceLoader; +#ifdef __cplusplus +interface ISpeechResourceLoader; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoContext_FWD_DEFINED__ #define __ISpRecoContext_FWD_DEFINED__ typedef interface ISpRecoContext ISpRecoContext; +#ifdef __cplusplus +interface ISpRecoContext; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoContext2_FWD_DEFINED__ #define __ISpRecoContext2_FWD_DEFINED__ typedef interface ISpRecoContext2 ISpRecoContext2; +#ifdef __cplusplus +interface ISpRecoContext2; +#endif /* __cplusplus */ #endif #ifndef __ISpProperties_FWD_DEFINED__ #define __ISpProperties_FWD_DEFINED__ typedef interface ISpProperties ISpProperties; +#ifdef __cplusplus +interface ISpProperties; +#endif /* __cplusplus */ #endif #ifndef __ISpRecognizer_FWD_DEFINED__ #define __ISpRecognizer_FWD_DEFINED__ typedef interface ISpRecognizer ISpRecognizer; +#ifdef __cplusplus +interface ISpRecognizer; +#endif /* __cplusplus */ #endif #ifndef __ISpSerializeState_FWD_DEFINED__ #define __ISpSerializeState_FWD_DEFINED__ typedef interface ISpSerializeState ISpSerializeState; +#ifdef __cplusplus +interface ISpSerializeState; +#endif /* __cplusplus */ #endif #ifndef __ISpRecognizer2_FWD_DEFINED__ #define __ISpRecognizer2_FWD_DEFINED__ typedef interface ISpRecognizer2 ISpRecognizer2; +#ifdef __cplusplus +interface ISpRecognizer2; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoCategory_FWD_DEFINED__ #define __ISpRecoCategory_FWD_DEFINED__ typedef interface ISpRecoCategory ISpRecoCategory; +#ifdef __cplusplus +interface ISpRecoCategory; +#endif /* __cplusplus */ #endif #ifndef __ISpRecognizer3_FWD_DEFINED__ #define __ISpRecognizer3_FWD_DEFINED__ typedef interface ISpRecognizer3 ISpRecognizer3; +#ifdef __cplusplus +interface ISpRecognizer3; +#endif /* __cplusplus */ #endif #ifndef __ISpEnginePronunciation_FWD_DEFINED__ #define __ISpEnginePronunciation_FWD_DEFINED__ typedef interface ISpEnginePronunciation ISpEnginePronunciation; +#ifdef __cplusplus +interface ISpEnginePronunciation; +#endif /* __cplusplus */ #endif #ifndef __ISpDisplayAlternates_FWD_DEFINED__ #define __ISpDisplayAlternates_FWD_DEFINED__ typedef interface ISpDisplayAlternates ISpDisplayAlternates; +#ifdef __cplusplus +interface ISpDisplayAlternates; +#endif /* __cplusplus */ #endif #ifndef __ISpeechDataKey_FWD_DEFINED__ #define __ISpeechDataKey_FWD_DEFINED__ typedef interface ISpeechDataKey ISpeechDataKey; +#ifdef __cplusplus +interface ISpeechDataKey; +#endif /* __cplusplus */ #endif #ifndef __ISpeechObjectToken_FWD_DEFINED__ #define __ISpeechObjectToken_FWD_DEFINED__ typedef interface ISpeechObjectToken ISpeechObjectToken; +#ifdef __cplusplus +interface ISpeechObjectToken; +#endif /* __cplusplus */ #endif #ifndef __ISpeechObjectTokens_FWD_DEFINED__ #define __ISpeechObjectTokens_FWD_DEFINED__ typedef interface ISpeechObjectTokens ISpeechObjectTokens; +#ifdef __cplusplus +interface ISpeechObjectTokens; +#endif /* __cplusplus */ #endif #ifndef __ISpeechObjectTokenCategory_FWD_DEFINED__ #define __ISpeechObjectTokenCategory_FWD_DEFINED__ typedef interface ISpeechObjectTokenCategory ISpeechObjectTokenCategory; +#ifdef __cplusplus +interface ISpeechObjectTokenCategory; +#endif /* __cplusplus */ #endif #ifndef __ISpeechAudioFormat_FWD_DEFINED__ #define __ISpeechAudioFormat_FWD_DEFINED__ typedef interface ISpeechAudioFormat ISpeechAudioFormat; +#ifdef __cplusplus +interface ISpeechAudioFormat; +#endif /* __cplusplus */ #endif #ifndef __ISpeechBaseStream_FWD_DEFINED__ #define __ISpeechBaseStream_FWD_DEFINED__ typedef interface ISpeechBaseStream ISpeechBaseStream; +#ifdef __cplusplus +interface ISpeechBaseStream; +#endif /* __cplusplus */ #endif #ifndef __ISpeechAudio_FWD_DEFINED__ #define __ISpeechAudio_FWD_DEFINED__ typedef interface ISpeechAudio ISpeechAudio; +#ifdef __cplusplus +interface ISpeechAudio; +#endif /* __cplusplus */ #endif #ifndef __ISpeechMMSysAudio_FWD_DEFINED__ #define __ISpeechMMSysAudio_FWD_DEFINED__ typedef interface ISpeechMMSysAudio ISpeechMMSysAudio; +#ifdef __cplusplus +interface ISpeechMMSysAudio; +#endif /* __cplusplus */ #endif #ifndef __ISpeechFileStream_FWD_DEFINED__ #define __ISpeechFileStream_FWD_DEFINED__ typedef interface ISpeechFileStream ISpeechFileStream; +#ifdef __cplusplus +interface ISpeechFileStream; +#endif /* __cplusplus */ #endif #ifndef __ISpeechCustomStream_FWD_DEFINED__ #define __ISpeechCustomStream_FWD_DEFINED__ typedef interface ISpeechCustomStream ISpeechCustomStream; +#ifdef __cplusplus +interface ISpeechCustomStream; +#endif /* __cplusplus */ #endif #ifndef __ISpeechMemoryStream_FWD_DEFINED__ #define __ISpeechMemoryStream_FWD_DEFINED__ typedef interface ISpeechMemoryStream ISpeechMemoryStream; +#ifdef __cplusplus +interface ISpeechMemoryStream; +#endif /* __cplusplus */ #endif #ifndef __ISpeechAudioStatus_FWD_DEFINED__ #define __ISpeechAudioStatus_FWD_DEFINED__ typedef interface ISpeechAudioStatus ISpeechAudioStatus; +#ifdef __cplusplus +interface ISpeechAudioStatus; +#endif /* __cplusplus */ #endif #ifndef __ISpeechAudioBufferInfo_FWD_DEFINED__ #define __ISpeechAudioBufferInfo_FWD_DEFINED__ typedef interface ISpeechAudioBufferInfo ISpeechAudioBufferInfo; +#ifdef __cplusplus +interface ISpeechAudioBufferInfo; +#endif /* __cplusplus */ #endif #ifndef __ISpeechWaveFormatEx_FWD_DEFINED__ #define __ISpeechWaveFormatEx_FWD_DEFINED__ typedef interface ISpeechWaveFormatEx ISpeechWaveFormatEx; +#ifdef __cplusplus +interface ISpeechWaveFormatEx; +#endif /* __cplusplus */ #endif #ifndef __ISpeechVoice_FWD_DEFINED__ #define __ISpeechVoice_FWD_DEFINED__ typedef interface ISpeechVoice ISpeechVoice; +#ifdef __cplusplus +interface ISpeechVoice; +#endif /* __cplusplus */ #endif #ifndef __ISpeechVoiceStatus_FWD_DEFINED__ #define __ISpeechVoiceStatus_FWD_DEFINED__ typedef interface ISpeechVoiceStatus ISpeechVoiceStatus; +#ifdef __cplusplus +interface ISpeechVoiceStatus; +#endif /* __cplusplus */ #endif #ifndef ___ISpeechVoiceEvents_FWD_DEFINED__ #define ___ISpeechVoiceEvents_FWD_DEFINED__ typedef interface _ISpeechVoiceEvents _ISpeechVoiceEvents; +#ifdef __cplusplus +interface _ISpeechVoiceEvents; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecognizer_FWD_DEFINED__ #define __ISpeechRecognizer_FWD_DEFINED__ typedef interface ISpeechRecognizer ISpeechRecognizer; +#ifdef __cplusplus +interface ISpeechRecognizer; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecognizerStatus_FWD_DEFINED__ #define __ISpeechRecognizerStatus_FWD_DEFINED__ typedef interface ISpeechRecognizerStatus ISpeechRecognizerStatus; +#ifdef __cplusplus +interface ISpeechRecognizerStatus; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoContext_FWD_DEFINED__ #define __ISpeechRecoContext_FWD_DEFINED__ typedef interface ISpeechRecoContext ISpeechRecoContext; +#ifdef __cplusplus +interface ISpeechRecoContext; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoGrammar_FWD_DEFINED__ #define __ISpeechRecoGrammar_FWD_DEFINED__ typedef interface ISpeechRecoGrammar ISpeechRecoGrammar; +#ifdef __cplusplus +interface ISpeechRecoGrammar; +#endif /* __cplusplus */ #endif #ifndef ___ISpeechRecoContextEvents_FWD_DEFINED__ #define ___ISpeechRecoContextEvents_FWD_DEFINED__ typedef interface _ISpeechRecoContextEvents _ISpeechRecoContextEvents; +#ifdef __cplusplus +interface _ISpeechRecoContextEvents; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRule_FWD_DEFINED__ #define __ISpeechGrammarRule_FWD_DEFINED__ typedef interface ISpeechGrammarRule ISpeechGrammarRule; +#ifdef __cplusplus +interface ISpeechGrammarRule; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRules_FWD_DEFINED__ #define __ISpeechGrammarRules_FWD_DEFINED__ typedef interface ISpeechGrammarRules ISpeechGrammarRules; +#ifdef __cplusplus +interface ISpeechGrammarRules; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRuleState_FWD_DEFINED__ #define __ISpeechGrammarRuleState_FWD_DEFINED__ typedef interface ISpeechGrammarRuleState ISpeechGrammarRuleState; +#ifdef __cplusplus +interface ISpeechGrammarRuleState; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRuleStateTransitions_FWD_DEFINED__ #define __ISpeechGrammarRuleStateTransitions_FWD_DEFINED__ typedef interface ISpeechGrammarRuleStateTransitions ISpeechGrammarRuleStateTransitions; +#ifdef __cplusplus +interface ISpeechGrammarRuleStateTransitions; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRuleStateTransition_FWD_DEFINED__ #define __ISpeechGrammarRuleStateTransition_FWD_DEFINED__ typedef interface ISpeechGrammarRuleStateTransition ISpeechGrammarRuleStateTransition; +#ifdef __cplusplus +interface ISpeechGrammarRuleStateTransition; +#endif /* __cplusplus */ #endif #ifndef __ISpeechTextSelectionInformation_FWD_DEFINED__ #define __ISpeechTextSelectionInformation_FWD_DEFINED__ typedef interface ISpeechTextSelectionInformation ISpeechTextSelectionInformation; +#ifdef __cplusplus +interface ISpeechTextSelectionInformation; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoResult_FWD_DEFINED__ #define __ISpeechRecoResult_FWD_DEFINED__ typedef interface ISpeechRecoResult ISpeechRecoResult; +#ifdef __cplusplus +interface ISpeechRecoResult; +#endif /* __cplusplus */ #endif #ifndef __ISpeechXMLRecoResult_FWD_DEFINED__ #define __ISpeechXMLRecoResult_FWD_DEFINED__ typedef interface ISpeechXMLRecoResult ISpeechXMLRecoResult; +#ifdef __cplusplus +interface ISpeechXMLRecoResult; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoResult2_FWD_DEFINED__ #define __ISpeechRecoResult2_FWD_DEFINED__ typedef interface ISpeechRecoResult2 ISpeechRecoResult2; +#ifdef __cplusplus +interface ISpeechRecoResult2; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoResultDispatch_FWD_DEFINED__ #define __ISpeechRecoResultDispatch_FWD_DEFINED__ typedef interface ISpeechRecoResultDispatch ISpeechRecoResultDispatch; +#ifdef __cplusplus +interface ISpeechRecoResultDispatch; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseInfoBuilder_FWD_DEFINED__ #define __ISpeechPhraseInfoBuilder_FWD_DEFINED__ typedef interface ISpeechPhraseInfoBuilder ISpeechPhraseInfoBuilder; +#ifdef __cplusplus +interface ISpeechPhraseInfoBuilder; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoResultTimes_FWD_DEFINED__ #define __ISpeechRecoResultTimes_FWD_DEFINED__ typedef interface ISpeechRecoResultTimes ISpeechRecoResultTimes; +#ifdef __cplusplus +interface ISpeechRecoResultTimes; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseAlternate_FWD_DEFINED__ #define __ISpeechPhraseAlternate_FWD_DEFINED__ typedef interface ISpeechPhraseAlternate ISpeechPhraseAlternate; +#ifdef __cplusplus +interface ISpeechPhraseAlternate; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseAlternates_FWD_DEFINED__ #define __ISpeechPhraseAlternates_FWD_DEFINED__ typedef interface ISpeechPhraseAlternates ISpeechPhraseAlternates; +#ifdef __cplusplus +interface ISpeechPhraseAlternates; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseInfo_FWD_DEFINED__ #define __ISpeechPhraseInfo_FWD_DEFINED__ typedef interface ISpeechPhraseInfo ISpeechPhraseInfo; +#ifdef __cplusplus +interface ISpeechPhraseInfo; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseElement_FWD_DEFINED__ #define __ISpeechPhraseElement_FWD_DEFINED__ typedef interface ISpeechPhraseElement ISpeechPhraseElement; +#ifdef __cplusplus +interface ISpeechPhraseElement; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseElements_FWD_DEFINED__ #define __ISpeechPhraseElements_FWD_DEFINED__ typedef interface ISpeechPhraseElements ISpeechPhraseElements; +#ifdef __cplusplus +interface ISpeechPhraseElements; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseReplacement_FWD_DEFINED__ #define __ISpeechPhraseReplacement_FWD_DEFINED__ typedef interface ISpeechPhraseReplacement ISpeechPhraseReplacement; +#ifdef __cplusplus +interface ISpeechPhraseReplacement; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseReplacements_FWD_DEFINED__ #define __ISpeechPhraseReplacements_FWD_DEFINED__ typedef interface ISpeechPhraseReplacements ISpeechPhraseReplacements; +#ifdef __cplusplus +interface ISpeechPhraseReplacements; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseProperty_FWD_DEFINED__ #define __ISpeechPhraseProperty_FWD_DEFINED__ typedef interface ISpeechPhraseProperty ISpeechPhraseProperty; +#ifdef __cplusplus +interface ISpeechPhraseProperty; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseProperties_FWD_DEFINED__ #define __ISpeechPhraseProperties_FWD_DEFINED__ typedef interface ISpeechPhraseProperties ISpeechPhraseProperties; +#ifdef __cplusplus +interface ISpeechPhraseProperties; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseRule_FWD_DEFINED__ #define __ISpeechPhraseRule_FWD_DEFINED__ typedef interface ISpeechPhraseRule ISpeechPhraseRule; +#ifdef __cplusplus +interface ISpeechPhraseRule; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseRules_FWD_DEFINED__ #define __ISpeechPhraseRules_FWD_DEFINED__ typedef interface ISpeechPhraseRules ISpeechPhraseRules; +#ifdef __cplusplus +interface ISpeechPhraseRules; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexiconWords_FWD_DEFINED__ #define __ISpeechLexiconWords_FWD_DEFINED__ typedef interface ISpeechLexiconWords ISpeechLexiconWords; +#ifdef __cplusplus +interface ISpeechLexiconWords; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexicon_FWD_DEFINED__ #define __ISpeechLexicon_FWD_DEFINED__ typedef interface ISpeechLexicon ISpeechLexicon; +#ifdef __cplusplus +interface ISpeechLexicon; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexiconWord_FWD_DEFINED__ #define __ISpeechLexiconWord_FWD_DEFINED__ typedef interface ISpeechLexiconWord ISpeechLexiconWord; +#ifdef __cplusplus +interface ISpeechLexiconWord; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexiconPronunciations_FWD_DEFINED__ #define __ISpeechLexiconPronunciations_FWD_DEFINED__ typedef interface ISpeechLexiconPronunciations ISpeechLexiconPronunciations; +#ifdef __cplusplus +interface ISpeechLexiconPronunciations; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexiconPronunciation_FWD_DEFINED__ #define __ISpeechLexiconPronunciation_FWD_DEFINED__ typedef interface ISpeechLexiconPronunciation ISpeechLexiconPronunciation; +#ifdef __cplusplus +interface ISpeechLexiconPronunciation; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhoneConverter_FWD_DEFINED__ #define __ISpeechPhoneConverter_FWD_DEFINED__ typedef interface ISpeechPhoneConverter ISpeechPhoneConverter; +#ifdef __cplusplus +interface ISpeechPhoneConverter; +#endif /* __cplusplus */ #endif #ifndef __SpNotifyTranslator_FWD_DEFINED__ @@ -790,166 +1088,265 @@ typedef struct WAVEFORMATEX { #ifndef __ISpNotifySource_FWD_DEFINED__ #define __ISpNotifySource_FWD_DEFINED__ typedef interface ISpNotifySource ISpNotifySource; +#ifdef __cplusplus +interface ISpNotifySource; +#endif /* __cplusplus */ #endif #ifndef __ISpNotifySink_FWD_DEFINED__ #define __ISpNotifySink_FWD_DEFINED__ typedef interface ISpNotifySink ISpNotifySink; +#ifdef __cplusplus +interface ISpNotifySink; +#endif /* __cplusplus */ #endif #ifndef __ISpNotifyTranslator_FWD_DEFINED__ #define __ISpNotifyTranslator_FWD_DEFINED__ typedef interface ISpNotifyTranslator ISpNotifyTranslator; +#ifdef __cplusplus +interface ISpNotifyTranslator; +#endif /* __cplusplus */ #endif #ifndef __ISpDataKey_FWD_DEFINED__ #define __ISpDataKey_FWD_DEFINED__ typedef interface ISpDataKey ISpDataKey; +#ifdef __cplusplus +interface ISpDataKey; +#endif /* __cplusplus */ #endif #ifndef __ISpObjectTokenCategory_FWD_DEFINED__ #define __ISpObjectTokenCategory_FWD_DEFINED__ typedef interface ISpObjectTokenCategory ISpObjectTokenCategory; +#ifdef __cplusplus +interface ISpObjectTokenCategory; +#endif /* __cplusplus */ #endif #ifndef __ISpObjectToken_FWD_DEFINED__ #define __ISpObjectToken_FWD_DEFINED__ typedef interface ISpObjectToken ISpObjectToken; +#ifdef __cplusplus +interface ISpObjectToken; +#endif /* __cplusplus */ #endif #ifndef __IEnumSpObjectTokens_FWD_DEFINED__ #define __IEnumSpObjectTokens_FWD_DEFINED__ typedef interface IEnumSpObjectTokens IEnumSpObjectTokens; +#ifdef __cplusplus +interface IEnumSpObjectTokens; +#endif /* __cplusplus */ #endif #ifndef __ISpObjectWithToken_FWD_DEFINED__ #define __ISpObjectWithToken_FWD_DEFINED__ typedef interface ISpObjectWithToken ISpObjectWithToken; +#ifdef __cplusplus +interface ISpObjectWithToken; +#endif /* __cplusplus */ #endif #ifndef __ISpResourceManager_FWD_DEFINED__ #define __ISpResourceManager_FWD_DEFINED__ typedef interface ISpResourceManager ISpResourceManager; +#ifdef __cplusplus +interface ISpResourceManager; +#endif /* __cplusplus */ #endif #ifndef __ISpEventSource_FWD_DEFINED__ #define __ISpEventSource_FWD_DEFINED__ typedef interface ISpEventSource ISpEventSource; +#ifdef __cplusplus +interface ISpEventSource; +#endif /* __cplusplus */ #endif #ifndef __ISpEventSink_FWD_DEFINED__ #define __ISpEventSink_FWD_DEFINED__ typedef interface ISpEventSink ISpEventSink; +#ifdef __cplusplus +interface ISpEventSink; +#endif /* __cplusplus */ #endif #ifndef __ISpStreamFormat_FWD_DEFINED__ #define __ISpStreamFormat_FWD_DEFINED__ typedef interface ISpStreamFormat ISpStreamFormat; +#ifdef __cplusplus +interface ISpStreamFormat; +#endif /* __cplusplus */ #endif #ifndef __ISpStream_FWD_DEFINED__ #define __ISpStream_FWD_DEFINED__ typedef interface ISpStream ISpStream; +#ifdef __cplusplus +interface ISpStream; +#endif /* __cplusplus */ #endif #ifndef __ISpStreamFormatConverter_FWD_DEFINED__ #define __ISpStreamFormatConverter_FWD_DEFINED__ typedef interface ISpStreamFormatConverter ISpStreamFormatConverter; +#ifdef __cplusplus +interface ISpStreamFormatConverter; +#endif /* __cplusplus */ #endif #ifndef __ISpAudio_FWD_DEFINED__ #define __ISpAudio_FWD_DEFINED__ typedef interface ISpAudio ISpAudio; +#ifdef __cplusplus +interface ISpAudio; +#endif /* __cplusplus */ #endif #ifndef __ISpMMSysAudio_FWD_DEFINED__ #define __ISpMMSysAudio_FWD_DEFINED__ typedef interface ISpMMSysAudio ISpMMSysAudio; +#ifdef __cplusplus +interface ISpMMSysAudio; +#endif /* __cplusplus */ #endif #ifndef __ISpTranscript_FWD_DEFINED__ #define __ISpTranscript_FWD_DEFINED__ typedef interface ISpTranscript ISpTranscript; +#ifdef __cplusplus +interface ISpTranscript; +#endif /* __cplusplus */ #endif #ifndef __ISpVoice_FWD_DEFINED__ #define __ISpVoice_FWD_DEFINED__ typedef interface ISpVoice ISpVoice; +#ifdef __cplusplus +interface ISpVoice; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoResult_FWD_DEFINED__ #define __ISpRecoResult_FWD_DEFINED__ typedef interface ISpRecoResult ISpRecoResult; +#ifdef __cplusplus +interface ISpRecoResult; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoContext_FWD_DEFINED__ #define __ISpRecoContext_FWD_DEFINED__ typedef interface ISpRecoContext ISpRecoContext; +#ifdef __cplusplus +interface ISpRecoContext; +#endif /* __cplusplus */ #endif #ifndef __ISpRecognizer_FWD_DEFINED__ #define __ISpRecognizer_FWD_DEFINED__ typedef interface ISpRecognizer ISpRecognizer; +#ifdef __cplusplus +interface ISpRecognizer; +#endif /* __cplusplus */ #endif #ifndef __ISpProperties_FWD_DEFINED__ #define __ISpProperties_FWD_DEFINED__ typedef interface ISpProperties ISpProperties; +#ifdef __cplusplus +interface ISpProperties; +#endif /* __cplusplus */ #endif #ifndef __ISpLexicon_FWD_DEFINED__ #define __ISpLexicon_FWD_DEFINED__ typedef interface ISpLexicon ISpLexicon; +#ifdef __cplusplus +interface ISpLexicon; +#endif /* __cplusplus */ #endif #ifndef __ISpPhoneConverter_FWD_DEFINED__ #define __ISpPhoneConverter_FWD_DEFINED__ typedef interface ISpPhoneConverter ISpPhoneConverter; +#ifdef __cplusplus +interface ISpPhoneConverter; +#endif /* __cplusplus */ #endif #ifndef __ISpPhrase_FWD_DEFINED__ #define __ISpPhrase_FWD_DEFINED__ typedef interface ISpPhrase ISpPhrase; +#ifdef __cplusplus +interface ISpPhrase; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoContext2_FWD_DEFINED__ #define __ISpRecoContext2_FWD_DEFINED__ typedef interface ISpRecoContext2 ISpRecoContext2; +#ifdef __cplusplus +interface ISpRecoContext2; +#endif /* __cplusplus */ #endif #ifndef __ISpRecognizer2_FWD_DEFINED__ #define __ISpRecognizer2_FWD_DEFINED__ typedef interface ISpRecognizer2 ISpRecognizer2; +#ifdef __cplusplus +interface ISpRecognizer2; +#endif /* __cplusplus */ #endif #ifndef __ISpShortcut_FWD_DEFINED__ #define __ISpShortcut_FWD_DEFINED__ typedef interface ISpShortcut ISpShortcut; +#ifdef __cplusplus +interface ISpShortcut; +#endif /* __cplusplus */ #endif #ifndef __ISpPhoneticAlphabetConverter_FWD_DEFINED__ #define __ISpPhoneticAlphabetConverter_FWD_DEFINED__ typedef interface ISpPhoneticAlphabetConverter ISpPhoneticAlphabetConverter; +#ifdef __cplusplus +interface ISpPhoneticAlphabetConverter; +#endif /* __cplusplus */ #endif #ifndef __ISpPhoneticAlphabetSelection_FWD_DEFINED__ #define __ISpPhoneticAlphabetSelection_FWD_DEFINED__ typedef interface ISpPhoneticAlphabetSelection ISpPhoneticAlphabetSelection; +#ifdef __cplusplus +interface ISpPhoneticAlphabetSelection; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoGrammar2_FWD_DEFINED__ #define __ISpRecoGrammar2_FWD_DEFINED__ typedef interface ISpRecoGrammar2 ISpRecoGrammar2; +#ifdef __cplusplus +interface ISpRecoGrammar2; +#endif /* __cplusplus */ #endif #ifndef __ISpeechResourceLoader_FWD_DEFINED__ #define __ISpeechResourceLoader_FWD_DEFINED__ typedef interface ISpeechResourceLoader ISpeechResourceLoader; +#ifdef __cplusplus +interface ISpeechResourceLoader; +#endif /* __cplusplus */ #endif #ifndef __ISpRecognizer3_FWD_DEFINED__ #define __ISpRecognizer3_FWD_DEFINED__ typedef interface ISpRecognizer3 ISpRecognizer3; +#ifdef __cplusplus +interface ISpRecognizer3; +#endif /* __cplusplus */ #endif typedef enum SPDATAKEYLOCATION { @@ -1346,52 +1743,53 @@ typedef struct ISpNotifySourceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpNotifySource* This, + ISpNotifySource *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpNotifySource* This); + ISpNotifySource *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpNotifySource* This); + ISpNotifySource *This); /*** ISpNotifySource methods ***/ HRESULT (STDMETHODCALLTYPE *SetNotifySink)( - ISpNotifySource* This, + ISpNotifySource *This, ISpNotifySink *pNotifySink); HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)( - ISpNotifySource* This, + ISpNotifySource *This, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)( - ISpNotifySource* This, + ISpNotifySource *This, SPNOTIFYCALLBACK *pfnCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)( - ISpNotifySource* This, + ISpNotifySource *This, ISpNotifyCallback *pSpCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)( - ISpNotifySource* This); + ISpNotifySource *This); HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)( - ISpNotifySource* This, + ISpNotifySource *This, DWORD dwMilliseconds); HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)( - ISpNotifySource* This); + ISpNotifySource *This); END_INTERFACE } ISpNotifySourceVtbl; + interface ISpNotifySource { CONST_VTBL ISpNotifySourceVtbl* lpVtbl; }; @@ -1448,14 +1846,6 @@ static FORCEINLINE HANDLE ISpNotifySource_GetNotifyEventHandle(ISpNotifySource* #endif -HRESULT STDMETHODCALLTYPE ISpNotifySource_SetNotifySink_Proxy( - ISpNotifySource* This, - ISpNotifySink *pNotifySink); -void __RPC_STUB ISpNotifySource_SetNotifySink_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpNotifySource_INTERFACE_DEFINED__ */ @@ -1483,22 +1873,23 @@ typedef struct ISpNotifySinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpNotifySink* This, + ISpNotifySink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpNotifySink* This); + ISpNotifySink *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpNotifySink* This); + ISpNotifySink *This); /*** ISpNotifySink methods ***/ HRESULT (STDMETHODCALLTYPE *Notify)( - ISpNotifySink* This); + ISpNotifySink *This); END_INTERFACE } ISpNotifySinkVtbl; + interface ISpNotifySink { CONST_VTBL ISpNotifySinkVtbl* lpVtbl; }; @@ -1531,13 +1922,6 @@ static FORCEINLINE HRESULT ISpNotifySink_Notify(ISpNotifySink* This) { #endif -HRESULT STDMETHODCALLTYPE ISpNotifySink_Notify_Proxy( - ISpNotifySink* This); -void __RPC_STUB ISpNotifySink_Notify_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpNotifySink_INTERFACE_DEFINED__ */ @@ -1588,54 +1972,55 @@ typedef struct ISpNotifyTranslatorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpNotifyTranslator* This, + ISpNotifyTranslator *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpNotifyTranslator* This); + ISpNotifyTranslator *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpNotifyTranslator* This); + ISpNotifyTranslator *This); /*** ISpNotifySink methods ***/ HRESULT (STDMETHODCALLTYPE *Notify)( - ISpNotifyTranslator* This); + ISpNotifyTranslator *This); /*** ISpNotifyTranslator methods ***/ HRESULT (STDMETHODCALLTYPE *InitWindowMessage)( - ISpNotifyTranslator* This, + ISpNotifyTranslator *This, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *InitCallback)( - ISpNotifyTranslator* This, + ISpNotifyTranslator *This, SPNOTIFYCALLBACK *pfnCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *InitSpNotifyCallback)( - ISpNotifyTranslator* This, + ISpNotifyTranslator *This, ISpNotifyCallback *pSpCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *InitWin32Event)( - ISpNotifyTranslator* This, + ISpNotifyTranslator *This, HANDLE hEvent, WINBOOL fCloseHandleOnRelease); HRESULT (STDMETHODCALLTYPE *Wait)( - ISpNotifyTranslator* This, + ISpNotifyTranslator *This, DWORD dwMilliseconds); HANDLE (STDMETHODCALLTYPE *GetEventHandle)( - ISpNotifyTranslator* This); + ISpNotifyTranslator *This); END_INTERFACE } ISpNotifyTranslatorVtbl; + interface ISpNotifyTranslator { CONST_VTBL ISpNotifyTranslatorVtbl* lpVtbl; }; @@ -1694,61 +2079,6 @@ static FORCEINLINE HANDLE ISpNotifyTranslator_GetEventHandle(ISpNotifyTranslator #endif -HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_InitWindowMessage_Proxy( - ISpNotifyTranslator* This, - HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam); -void __RPC_STUB ISpNotifyTranslator_InitWindowMessage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_InitCallback_Proxy( - ISpNotifyTranslator* This, - SPNOTIFYCALLBACK *pfnCallback, - WPARAM wParam, - LPARAM lParam); -void __RPC_STUB ISpNotifyTranslator_InitCallback_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_InitSpNotifyCallback_Proxy( - ISpNotifyTranslator* This, - ISpNotifyCallback *pSpCallback, - WPARAM wParam, - LPARAM lParam); -void __RPC_STUB ISpNotifyTranslator_InitSpNotifyCallback_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_InitWin32Event_Proxy( - ISpNotifyTranslator* This, - HANDLE hEvent, - WINBOOL fCloseHandleOnRelease); -void __RPC_STUB ISpNotifyTranslator_InitWin32Event_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_Wait_Proxy( - ISpNotifyTranslator* This, - DWORD dwMilliseconds); -void __RPC_STUB ISpNotifyTranslator_Wait_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HANDLE STDMETHODCALLTYPE ISpNotifyTranslator_GetEventHandle_Proxy( - ISpNotifyTranslator* This); -void __RPC_STUB ISpNotifyTranslator_GetEventHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpNotifyTranslator_INTERFACE_DEFINED__ */ @@ -1821,79 +2151,80 @@ typedef struct ISpDataKeyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpDataKey* This, + ISpDataKey *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpDataKey* This); + ISpDataKey *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpDataKey* This); + ISpDataKey *This); /*** ISpDataKey methods ***/ HRESULT (STDMETHODCALLTYPE *SetData)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszValueName, ULONG cbData, const BYTE *pData); HRESULT (STDMETHODCALLTYPE *GetData)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszValueName, ULONG *pcbData, BYTE *pData); HRESULT (STDMETHODCALLTYPE *SetStringValue)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszValueName, LPCWSTR pszValue); HRESULT (STDMETHODCALLTYPE *GetStringValue)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszValueName, LPWSTR *ppszValue); HRESULT (STDMETHODCALLTYPE *SetDWORD)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszValueName, DWORD dwValue); HRESULT (STDMETHODCALLTYPE *GetDWORD)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszValueName, DWORD *pdwValue); HRESULT (STDMETHODCALLTYPE *OpenKey)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszSubKeyName, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *CreateKey)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszSubKey, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *DeleteKey)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszSubKey); HRESULT (STDMETHODCALLTYPE *DeleteValue)( - ISpDataKey* This, + ISpDataKey *This, LPCWSTR pszValueName); HRESULT (STDMETHODCALLTYPE *EnumKeys)( - ISpDataKey* This, + ISpDataKey *This, ULONG Index, LPWSTR *ppszSubKeyName); HRESULT (STDMETHODCALLTYPE *EnumValues)( - ISpDataKey* This, + ISpDataKey *This, ULONG Index, LPWSTR *ppszValueName); END_INTERFACE } ISpDataKeyVtbl; + interface ISpDataKey { CONST_VTBL ISpDataKeyVtbl* lpVtbl; }; @@ -1970,114 +2301,6 @@ static FORCEINLINE HRESULT ISpDataKey_EnumValues(ISpDataKey* This,ULONG Index,LP #endif -HRESULT STDMETHODCALLTYPE ISpDataKey_SetData_Proxy( - ISpDataKey* This, - LPCWSTR pszValueName, - ULONG cbData, - const BYTE *pData); -void __RPC_STUB ISpDataKey_SetData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_GetData_Proxy( - ISpDataKey* This, - LPCWSTR pszValueName, - ULONG *pcbData, - BYTE *pData); -void __RPC_STUB ISpDataKey_GetData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_SetStringValue_Proxy( - ISpDataKey* This, - LPCWSTR pszValueName, - LPCWSTR pszValue); -void __RPC_STUB ISpDataKey_SetStringValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_GetStringValue_Proxy( - ISpDataKey* This, - LPCWSTR pszValueName, - LPWSTR *ppszValue); -void __RPC_STUB ISpDataKey_GetStringValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_SetDWORD_Proxy( - ISpDataKey* This, - LPCWSTR pszValueName, - DWORD dwValue); -void __RPC_STUB ISpDataKey_SetDWORD_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_GetDWORD_Proxy( - ISpDataKey* This, - LPCWSTR pszValueName, - DWORD *pdwValue); -void __RPC_STUB ISpDataKey_GetDWORD_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_OpenKey_Proxy( - ISpDataKey* This, - LPCWSTR pszSubKeyName, - ISpDataKey **ppSubKey); -void __RPC_STUB ISpDataKey_OpenKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_CreateKey_Proxy( - ISpDataKey* This, - LPCWSTR pszSubKey, - ISpDataKey **ppSubKey); -void __RPC_STUB ISpDataKey_CreateKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_DeleteKey_Proxy( - ISpDataKey* This, - LPCWSTR pszSubKey); -void __RPC_STUB ISpDataKey_DeleteKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_DeleteValue_Proxy( - ISpDataKey* This, - LPCWSTR pszValueName); -void __RPC_STUB ISpDataKey_DeleteValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_EnumKeys_Proxy( - ISpDataKey* This, - ULONG Index, - LPWSTR *ppszSubKeyName); -void __RPC_STUB ISpDataKey_EnumKeys_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDataKey_EnumValues_Proxy( - ISpDataKey* This, - ULONG Index, - LPWSTR *ppszValueName); -void __RPC_STUB ISpDataKey_EnumValues_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpDataKey_INTERFACE_DEFINED__ */ @@ -2108,27 +2331,28 @@ typedef struct ISpObjectWithTokenVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpObjectWithToken* This, + ISpObjectWithToken *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpObjectWithToken* This); + ISpObjectWithToken *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpObjectWithToken* This); + ISpObjectWithToken *This); /*** ISpObjectWithToken methods ***/ HRESULT (STDMETHODCALLTYPE *SetObjectToken)( - ISpObjectWithToken* This, + ISpObjectWithToken *This, ISpObjectToken *pToken); HRESULT (STDMETHODCALLTYPE *GetObjectToken)( - ISpObjectWithToken* This, + ISpObjectWithToken *This, ISpObjectToken **ppToken); END_INTERFACE } ISpObjectWithTokenVtbl; + interface ISpObjectWithToken { CONST_VTBL ISpObjectWithTokenVtbl* lpVtbl; }; @@ -2165,22 +2389,6 @@ static FORCEINLINE HRESULT ISpObjectWithToken_GetObjectToken(ISpObjectWithToken* #endif -HRESULT STDMETHODCALLTYPE ISpObjectWithToken_SetObjectToken_Proxy( - ISpObjectWithToken* This, - ISpObjectToken *pToken); -void __RPC_STUB ISpObjectWithToken_SetObjectToken_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectWithToken_GetObjectToken_Proxy( - ISpObjectWithToken* This, - ISpObjectToken **ppToken); -void __RPC_STUB ISpObjectWithToken_GetObjectToken_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpObjectWithToken_INTERFACE_DEFINED__ */ @@ -2226,45 +2434,46 @@ typedef struct IEnumSpObjectTokensVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumSpObjectTokens* This, + IEnumSpObjectTokens *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumSpObjectTokens* This); + IEnumSpObjectTokens *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumSpObjectTokens* This); + IEnumSpObjectTokens *This); /*** IEnumSpObjectTokens methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumSpObjectTokens* This, + IEnumSpObjectTokens *This, ULONG celt, ISpObjectToken **pelt, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumSpObjectTokens* This, + IEnumSpObjectTokens *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumSpObjectTokens* This); + IEnumSpObjectTokens *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumSpObjectTokens* This, + IEnumSpObjectTokens *This, IEnumSpObjectTokens **ppEnum); HRESULT (STDMETHODCALLTYPE *Item)( - IEnumSpObjectTokens* This, + IEnumSpObjectTokens *This, ULONG Index, ISpObjectToken **ppToken); HRESULT (STDMETHODCALLTYPE *GetCount)( - IEnumSpObjectTokens* This, + IEnumSpObjectTokens *This, ULONG *pCount); END_INTERFACE } IEnumSpObjectTokensVtbl; + interface IEnumSpObjectTokens { CONST_VTBL IEnumSpObjectTokensVtbl* lpVtbl; }; @@ -2317,56 +2526,6 @@ static FORCEINLINE HRESULT IEnumSpObjectTokens_GetCount(IEnumSpObjectTokens* Thi #endif -HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Next_Proxy( - IEnumSpObjectTokens* This, - ULONG celt, - ISpObjectToken **pelt, - ULONG *pceltFetched); -void __RPC_STUB IEnumSpObjectTokens_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Skip_Proxy( - IEnumSpObjectTokens* This, - ULONG celt); -void __RPC_STUB IEnumSpObjectTokens_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Reset_Proxy( - IEnumSpObjectTokens* This); -void __RPC_STUB IEnumSpObjectTokens_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Clone_Proxy( - IEnumSpObjectTokens* This, - IEnumSpObjectTokens **ppEnum); -void __RPC_STUB IEnumSpObjectTokens_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Item_Proxy( - IEnumSpObjectTokens* This, - ULONG Index, - ISpObjectToken **ppToken); -void __RPC_STUB IEnumSpObjectTokens_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_GetCount_Proxy( - IEnumSpObjectTokens* This, - ULONG *pCount); -void __RPC_STUB IEnumSpObjectTokens_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumSpObjectTokens_INTERFACE_DEFINED__ */ @@ -2395,85 +2554,86 @@ typedef struct ISpRegDataKeyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRegDataKey* This, + ISpRegDataKey *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRegDataKey* This); + ISpRegDataKey *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRegDataKey* This); + ISpRegDataKey *This); /*** ISpDataKey methods ***/ HRESULT (STDMETHODCALLTYPE *SetData)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszValueName, ULONG cbData, const BYTE *pData); HRESULT (STDMETHODCALLTYPE *GetData)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszValueName, ULONG *pcbData, BYTE *pData); HRESULT (STDMETHODCALLTYPE *SetStringValue)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszValueName, LPCWSTR pszValue); HRESULT (STDMETHODCALLTYPE *GetStringValue)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszValueName, LPWSTR *ppszValue); HRESULT (STDMETHODCALLTYPE *SetDWORD)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszValueName, DWORD dwValue); HRESULT (STDMETHODCALLTYPE *GetDWORD)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszValueName, DWORD *pdwValue); HRESULT (STDMETHODCALLTYPE *OpenKey)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszSubKeyName, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *CreateKey)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszSubKey, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *DeleteKey)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszSubKey); HRESULT (STDMETHODCALLTYPE *DeleteValue)( - ISpRegDataKey* This, + ISpRegDataKey *This, LPCWSTR pszValueName); HRESULT (STDMETHODCALLTYPE *EnumKeys)( - ISpRegDataKey* This, + ISpRegDataKey *This, ULONG Index, LPWSTR *ppszSubKeyName); HRESULT (STDMETHODCALLTYPE *EnumValues)( - ISpRegDataKey* This, + ISpRegDataKey *This, ULONG Index, LPWSTR *ppszValueName); /*** ISpRegDataKey methods ***/ HRESULT (STDMETHODCALLTYPE *SetKey)( - ISpRegDataKey* This, + ISpRegDataKey *This, HKEY hkey, WINBOOL fReadOnly); END_INTERFACE } ISpRegDataKeyVtbl; + interface ISpRegDataKey { CONST_VTBL ISpRegDataKeyVtbl* lpVtbl; }; @@ -2602,108 +2762,109 @@ typedef struct ISpObjectTokenCategoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpObjectTokenCategory* This); + ISpObjectTokenCategory *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpObjectTokenCategory* This); + ISpObjectTokenCategory *This); /*** ISpDataKey methods ***/ HRESULT (STDMETHODCALLTYPE *SetData)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszValueName, ULONG cbData, const BYTE *pData); HRESULT (STDMETHODCALLTYPE *GetData)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszValueName, ULONG *pcbData, BYTE *pData); HRESULT (STDMETHODCALLTYPE *SetStringValue)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszValueName, LPCWSTR pszValue); HRESULT (STDMETHODCALLTYPE *GetStringValue)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszValueName, LPWSTR *ppszValue); HRESULT (STDMETHODCALLTYPE *SetDWORD)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszValueName, DWORD dwValue); HRESULT (STDMETHODCALLTYPE *GetDWORD)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszValueName, DWORD *pdwValue); HRESULT (STDMETHODCALLTYPE *OpenKey)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszSubKeyName, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *CreateKey)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszSubKey, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *DeleteKey)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszSubKey); HRESULT (STDMETHODCALLTYPE *DeleteValue)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszValueName); HRESULT (STDMETHODCALLTYPE *EnumKeys)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, ULONG Index, LPWSTR *ppszSubKeyName); HRESULT (STDMETHODCALLTYPE *EnumValues)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, ULONG Index, LPWSTR *ppszValueName); /*** ISpObjectTokenCategory methods ***/ HRESULT (STDMETHODCALLTYPE *SetId)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszCategoryId, WINBOOL fCreateIfNotExist); HRESULT (STDMETHODCALLTYPE *GetId)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPWSTR *ppszCoMemCategoryId); HRESULT (STDMETHODCALLTYPE *GetDataKey)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, SPDATAKEYLOCATION spdkl, ISpDataKey **ppDataKey); HRESULT (STDMETHODCALLTYPE *EnumTokens)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pzsReqAttribs, LPCWSTR pszOptAttribs, IEnumSpObjectTokens **ppEnum); HRESULT (STDMETHODCALLTYPE *SetDefaultTokenId)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPCWSTR pszTokenId); HRESULT (STDMETHODCALLTYPE *GetDefaultTokenId)( - ISpObjectTokenCategory* This, + ISpObjectTokenCategory *This, LPWSTR *ppszCoMemTokenId); END_INTERFACE } ISpObjectTokenCategoryVtbl; + interface ISpObjectTokenCategory { CONST_VTBL ISpObjectTokenCategoryVtbl* lpVtbl; }; @@ -2806,58 +2967,6 @@ static FORCEINLINE HRESULT ISpObjectTokenCategory_GetDefaultTokenId(ISpObjectTok #endif -HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_SetId_Proxy( - ISpObjectTokenCategory* This, - LPCWSTR pszCategoryId, - WINBOOL fCreateIfNotExist); -void __RPC_STUB ISpObjectTokenCategory_SetId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_GetId_Proxy( - ISpObjectTokenCategory* This, - LPWSTR *ppszCoMemCategoryId); -void __RPC_STUB ISpObjectTokenCategory_GetId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_GetDataKey_Proxy( - ISpObjectTokenCategory* This, - SPDATAKEYLOCATION spdkl, - ISpDataKey **ppDataKey); -void __RPC_STUB ISpObjectTokenCategory_GetDataKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_EnumTokens_Proxy( - ISpObjectTokenCategory* This, - LPCWSTR pzsReqAttribs, - LPCWSTR pszOptAttribs, - IEnumSpObjectTokens **ppEnum); -void __RPC_STUB ISpObjectTokenCategory_EnumTokens_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_SetDefaultTokenId_Proxy( - ISpObjectTokenCategory* This, - LPCWSTR pszTokenId); -void __RPC_STUB ISpObjectTokenCategory_SetDefaultTokenId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_GetDefaultTokenId_Proxy( - ISpObjectTokenCategory* This, - LPWSTR *ppszCoMemTokenId); -void __RPC_STUB ISpObjectTokenCategory_GetDefaultTokenId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpObjectTokenCategory_INTERFACE_DEFINED__ */ @@ -2933,101 +3042,101 @@ typedef struct ISpObjectTokenVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpObjectToken* This, + ISpObjectToken *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpObjectToken* This); + ISpObjectToken *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpObjectToken* This); + ISpObjectToken *This); /*** ISpDataKey methods ***/ HRESULT (STDMETHODCALLTYPE *SetData)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszValueName, ULONG cbData, const BYTE *pData); HRESULT (STDMETHODCALLTYPE *GetData)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszValueName, ULONG *pcbData, BYTE *pData); HRESULT (STDMETHODCALLTYPE *SetStringValue)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszValueName, LPCWSTR pszValue); HRESULT (STDMETHODCALLTYPE *GetStringValue)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszValueName, LPWSTR *ppszValue); HRESULT (STDMETHODCALLTYPE *SetDWORD)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszValueName, DWORD dwValue); HRESULT (STDMETHODCALLTYPE *GetDWORD)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszValueName, DWORD *pdwValue); HRESULT (STDMETHODCALLTYPE *OpenKey)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszSubKeyName, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *CreateKey)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszSubKey, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *DeleteKey)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszSubKey); HRESULT (STDMETHODCALLTYPE *DeleteValue)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszValueName); HRESULT (STDMETHODCALLTYPE *EnumKeys)( - ISpObjectToken* This, + ISpObjectToken *This, ULONG Index, LPWSTR *ppszSubKeyName); HRESULT (STDMETHODCALLTYPE *EnumValues)( - ISpObjectToken* This, + ISpObjectToken *This, ULONG Index, LPWSTR *ppszValueName); /*** ISpObjectToken methods ***/ HRESULT (STDMETHODCALLTYPE *SetId)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszCategoryId, LPCWSTR pszTokenId, WINBOOL fCreateIfNotExist); HRESULT (STDMETHODCALLTYPE *GetId)( - ISpObjectToken* This, + ISpObjectToken *This, LPWSTR *ppszCoMemTokenId); HRESULT (STDMETHODCALLTYPE *GetCategory)( - ISpObjectToken* This, + ISpObjectToken *This, ISpObjectTokenCategory **ppTokenCategory); HRESULT (STDMETHODCALLTYPE *CreateInstance)( - ISpObjectToken* This, + ISpObjectToken *This, IUnknown *pUnkOuter, DWORD dwClsContext, REFIID riid, void **ppvObject); HRESULT (STDMETHODCALLTYPE *GetStorageFileName)( - ISpObjectToken* This, + ISpObjectToken *This, REFCLSID clsidCaller, LPCWSTR pszValueName, LPCWSTR pszFileNameSpecifier, @@ -3035,17 +3144,17 @@ typedef struct ISpObjectTokenVtbl { LPWSTR *ppszFilePath); HRESULT (STDMETHODCALLTYPE *RemoveStorageFileName)( - ISpObjectToken* This, + ISpObjectToken *This, REFCLSID clsidCaller, LPCWSTR pszKeyName, WINBOOL fDeleteFile); HRESULT (STDMETHODCALLTYPE *Remove)( - ISpObjectToken* This, + ISpObjectToken *This, const CLSID *pclsidCaller); HRESULT (STDMETHODCALLTYPE *IsUISupported)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszTypeOfUI, void *pvExtraData, ULONG cbExtraData, @@ -3053,7 +3162,7 @@ typedef struct ISpObjectTokenVtbl { WINBOOL *pfSupported); HRESULT (STDMETHODCALLTYPE *DisplayUI)( - ISpObjectToken* This, + ISpObjectToken *This, HWND hwndParent, LPCWSTR pszTitle, LPCWSTR pszTypeOfUI, @@ -3062,12 +3171,13 @@ typedef struct ISpObjectTokenVtbl { IUnknown *punkObject); HRESULT (STDMETHODCALLTYPE *MatchesAttributes)( - ISpObjectToken* This, + ISpObjectToken *This, LPCWSTR pszAttributes, WINBOOL *pfMatches); END_INTERFACE } ISpObjectTokenVtbl; + interface ISpObjectToken { CONST_VTBL ISpObjectTokenVtbl* lpVtbl; }; @@ -3186,82 +3296,6 @@ static FORCEINLINE HRESULT ISpObjectToken_MatchesAttributes(ISpObjectToken* This #endif -HRESULT STDMETHODCALLTYPE ISpObjectToken_SetId_Proxy( - ISpObjectToken* This, - LPCWSTR pszCategoryId, - LPCWSTR pszTokenId, - WINBOOL fCreateIfNotExist); -void __RPC_STUB ISpObjectToken_SetId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectToken_GetId_Proxy( - ISpObjectToken* This, - LPWSTR *ppszCoMemTokenId); -void __RPC_STUB ISpObjectToken_GetId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectToken_GetCategory_Proxy( - ISpObjectToken* This, - ISpObjectTokenCategory **ppTokenCategory); -void __RPC_STUB ISpObjectToken_GetCategory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectToken_CreateInstance_Proxy( - ISpObjectToken* This, - IUnknown *pUnkOuter, - DWORD dwClsContext, - REFIID riid, - void **ppvObject); -void __RPC_STUB ISpObjectToken_CreateInstance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectToken_GetStorageFileName_Proxy( - ISpObjectToken* This, - REFCLSID clsidCaller, - LPCWSTR pszValueName, - LPCWSTR pszFileNameSpecifier, - ULONG nFolder, - LPWSTR *ppszFilePath); -void __RPC_STUB ISpObjectToken_GetStorageFileName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectToken_RemoveStorageFileName_Proxy( - ISpObjectToken* This, - REFCLSID clsidCaller, - LPCWSTR pszKeyName, - WINBOOL fDeleteFile); -void __RPC_STUB ISpObjectToken_RemoveStorageFileName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectToken_Remove_Proxy( - ISpObjectToken* This, - const CLSID *pclsidCaller); -void __RPC_STUB ISpObjectToken_Remove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpObjectToken_MatchesAttributes_Proxy( - ISpObjectToken* This, - LPCWSTR pszAttributes, - WINBOOL *pfMatches); -void __RPC_STUB ISpObjectToken_MatchesAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpObjectToken_INTERFACE_DEFINED__ */ @@ -3291,101 +3325,101 @@ typedef struct ISpObjectTokenInitVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpObjectTokenInit* This); + ISpObjectTokenInit *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpObjectTokenInit* This); + ISpObjectTokenInit *This); /*** ISpDataKey methods ***/ HRESULT (STDMETHODCALLTYPE *SetData)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszValueName, ULONG cbData, const BYTE *pData); HRESULT (STDMETHODCALLTYPE *GetData)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszValueName, ULONG *pcbData, BYTE *pData); HRESULT (STDMETHODCALLTYPE *SetStringValue)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszValueName, LPCWSTR pszValue); HRESULT (STDMETHODCALLTYPE *GetStringValue)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszValueName, LPWSTR *ppszValue); HRESULT (STDMETHODCALLTYPE *SetDWORD)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszValueName, DWORD dwValue); HRESULT (STDMETHODCALLTYPE *GetDWORD)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszValueName, DWORD *pdwValue); HRESULT (STDMETHODCALLTYPE *OpenKey)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszSubKeyName, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *CreateKey)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszSubKey, ISpDataKey **ppSubKey); HRESULT (STDMETHODCALLTYPE *DeleteKey)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszSubKey); HRESULT (STDMETHODCALLTYPE *DeleteValue)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszValueName); HRESULT (STDMETHODCALLTYPE *EnumKeys)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, ULONG Index, LPWSTR *ppszSubKeyName); HRESULT (STDMETHODCALLTYPE *EnumValues)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, ULONG Index, LPWSTR *ppszValueName); /*** ISpObjectToken methods ***/ HRESULT (STDMETHODCALLTYPE *SetId)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszCategoryId, LPCWSTR pszTokenId, WINBOOL fCreateIfNotExist); HRESULT (STDMETHODCALLTYPE *GetId)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPWSTR *ppszCoMemTokenId); HRESULT (STDMETHODCALLTYPE *GetCategory)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, ISpObjectTokenCategory **ppTokenCategory); HRESULT (STDMETHODCALLTYPE *CreateInstance)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, IUnknown *pUnkOuter, DWORD dwClsContext, REFIID riid, void **ppvObject); HRESULT (STDMETHODCALLTYPE *GetStorageFileName)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, REFCLSID clsidCaller, LPCWSTR pszValueName, LPCWSTR pszFileNameSpecifier, @@ -3393,17 +3427,17 @@ typedef struct ISpObjectTokenInitVtbl { LPWSTR *ppszFilePath); HRESULT (STDMETHODCALLTYPE *RemoveStorageFileName)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, REFCLSID clsidCaller, LPCWSTR pszKeyName, WINBOOL fDeleteFile); HRESULT (STDMETHODCALLTYPE *Remove)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, const CLSID *pclsidCaller); HRESULT (STDMETHODCALLTYPE *IsUISupported)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszTypeOfUI, void *pvExtraData, ULONG cbExtraData, @@ -3411,7 +3445,7 @@ typedef struct ISpObjectTokenInitVtbl { WINBOOL *pfSupported); HRESULT (STDMETHODCALLTYPE *DisplayUI)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, HWND hwndParent, LPCWSTR pszTitle, LPCWSTR pszTypeOfUI, @@ -3420,19 +3454,20 @@ typedef struct ISpObjectTokenInitVtbl { IUnknown *punkObject); HRESULT (STDMETHODCALLTYPE *MatchesAttributes)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszAttributes, WINBOOL *pfMatches); /*** ISpObjectTokenInit methods ***/ HRESULT (STDMETHODCALLTYPE *InitFromDataKey)( - ISpObjectTokenInit* This, + ISpObjectTokenInit *This, LPCWSTR pszCategoryId, LPCWSTR pszTokenId, ISpDataKey *pDataKey); END_INTERFACE } ISpObjectTokenInitVtbl; + interface ISpObjectTokenInit { CONST_VTBL ISpObjectTokenInitVtbl* lpVtbl; }; @@ -3557,16 +3592,6 @@ static FORCEINLINE HRESULT ISpObjectTokenInit_InitFromDataKey(ISpObjectTokenInit #endif -HRESULT STDMETHODCALLTYPE ISpObjectTokenInit_InitFromDataKey_Proxy( - ISpObjectTokenInit* This, - LPCWSTR pszCategoryId, - LPCWSTR pszTokenId, - ISpDataKey *pDataKey); -void __RPC_STUB ISpObjectTokenInit_InitFromDataKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpObjectTokenInit_INTERFACE_DEFINED__ */ @@ -3602,31 +3627,31 @@ typedef struct ISpResourceManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpResourceManager* This, + ISpResourceManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpResourceManager* This); + ISpResourceManager *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpResourceManager* This); + ISpResourceManager *This); /*** IServiceProvider methods ***/ HRESULT (STDMETHODCALLTYPE *QueryService)( - ISpResourceManager* This, + ISpResourceManager *This, REFGUID guidService, REFIID riid, void **ppvObject); /*** ISpResourceManager methods ***/ HRESULT (STDMETHODCALLTYPE *SetObject)( - ISpResourceManager* This, + ISpResourceManager *This, REFGUID guidServiceId, IUnknown *pUnkObject); HRESULT (STDMETHODCALLTYPE *GetObject)( - ISpResourceManager* This, + ISpResourceManager *This, REFGUID guidServiceId, REFCLSID ObjectCLSID, REFIID ObjectIID, @@ -3635,6 +3660,7 @@ typedef struct ISpResourceManagerVtbl { END_INTERFACE } ISpResourceManagerVtbl; + interface ISpResourceManager { CONST_VTBL ISpResourceManagerVtbl* lpVtbl; }; @@ -3677,27 +3703,6 @@ static FORCEINLINE HRESULT ISpResourceManager_GetObject(ISpResourceManager* This #endif -HRESULT STDMETHODCALLTYPE ISpResourceManager_SetObject_Proxy( - ISpResourceManager* This, - REFGUID guidServiceId, - IUnknown *pUnkObject); -void __RPC_STUB ISpResourceManager_SetObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpResourceManager_GetObject_Proxy( - ISpResourceManager* This, - REFGUID guidServiceId, - REFCLSID ObjectCLSID, - REFIID ObjectIID, - WINBOOL fReleaseWhenLastExternalRefReleased, - void **ppObject); -void __RPC_STUB ISpResourceManager_GetObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpResourceManager_INTERFACE_DEFINED__ */ @@ -3813,68 +3818,69 @@ typedef struct ISpEventSourceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpEventSource* This, + ISpEventSource *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpEventSource* This); + ISpEventSource *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpEventSource* This); + ISpEventSource *This); /*** ISpNotifySource methods ***/ HRESULT (STDMETHODCALLTYPE *SetNotifySink)( - ISpEventSource* This, + ISpEventSource *This, ISpNotifySink *pNotifySink); HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)( - ISpEventSource* This, + ISpEventSource *This, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)( - ISpEventSource* This, + ISpEventSource *This, SPNOTIFYCALLBACK *pfnCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)( - ISpEventSource* This, + ISpEventSource *This, ISpNotifyCallback *pSpCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)( - ISpEventSource* This); + ISpEventSource *This); HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)( - ISpEventSource* This, + ISpEventSource *This, DWORD dwMilliseconds); HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)( - ISpEventSource* This); + ISpEventSource *This); /*** ISpEventSource methods ***/ HRESULT (STDMETHODCALLTYPE *SetInterest)( - ISpEventSource* This, + ISpEventSource *This, ULONGLONG ullEventInterest, ULONGLONG ullQueuedInterest); HRESULT (STDMETHODCALLTYPE *GetEvents)( - ISpEventSource* This, + ISpEventSource *This, ULONG ulCount, SPEVENT *pEventArray, ULONG *pulFetched); HRESULT (STDMETHODCALLTYPE *GetInfo)( - ISpEventSource* This, + ISpEventSource *This, SPEVENTSOURCEINFO *pInfo); END_INTERFACE } ISpEventSourceVtbl; + interface ISpEventSource { CONST_VTBL ISpEventSourceVtbl* lpVtbl; }; @@ -3945,33 +3951,6 @@ static FORCEINLINE HRESULT ISpEventSource_GetInfo(ISpEventSource* This,SPEVENTSO #endif -HRESULT STDMETHODCALLTYPE ISpEventSource_SetInterest_Proxy( - ISpEventSource* This, - ULONGLONG ullEventInterest, - ULONGLONG ullQueuedInterest); -void __RPC_STUB ISpEventSource_SetInterest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpEventSource_GetEvents_Proxy( - ISpEventSource* This, - ULONG ulCount, - SPEVENT *pEventArray, - ULONG *pulFetched); -void __RPC_STUB ISpEventSource_GetEvents_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpEventSource_GetInfo_Proxy( - ISpEventSource* This, - SPEVENTSOURCEINFO *pInfo); -void __RPC_STUB ISpEventSource_GetInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpEventSource_INTERFACE_DEFINED__ */ @@ -4001,75 +3980,76 @@ typedef struct ISpEventSource2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpEventSource2* This, + ISpEventSource2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpEventSource2* This); + ISpEventSource2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpEventSource2* This); + ISpEventSource2 *This); /*** ISpNotifySource methods ***/ HRESULT (STDMETHODCALLTYPE *SetNotifySink)( - ISpEventSource2* This, + ISpEventSource2 *This, ISpNotifySink *pNotifySink); HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)( - ISpEventSource2* This, + ISpEventSource2 *This, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)( - ISpEventSource2* This, + ISpEventSource2 *This, SPNOTIFYCALLBACK *pfnCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)( - ISpEventSource2* This, + ISpEventSource2 *This, ISpNotifyCallback *pSpCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)( - ISpEventSource2* This); + ISpEventSource2 *This); HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)( - ISpEventSource2* This, + ISpEventSource2 *This, DWORD dwMilliseconds); HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)( - ISpEventSource2* This); + ISpEventSource2 *This); /*** ISpEventSource methods ***/ HRESULT (STDMETHODCALLTYPE *SetInterest)( - ISpEventSource2* This, + ISpEventSource2 *This, ULONGLONG ullEventInterest, ULONGLONG ullQueuedInterest); HRESULT (STDMETHODCALLTYPE *GetEvents)( - ISpEventSource2* This, + ISpEventSource2 *This, ULONG ulCount, SPEVENT *pEventArray, ULONG *pulFetched); HRESULT (STDMETHODCALLTYPE *GetInfo)( - ISpEventSource2* This, + ISpEventSource2 *This, SPEVENTSOURCEINFO *pInfo); /*** ISpEventSource2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetEventsEx)( - ISpEventSource2* This, + ISpEventSource2 *This, ULONG ulCount, SPEVENTEX *pEventArray, ULONG *pulFetched); END_INTERFACE } ISpEventSource2Vtbl; + interface ISpEventSource2 { CONST_VTBL ISpEventSource2Vtbl* lpVtbl; }; @@ -4146,16 +4126,6 @@ static FORCEINLINE HRESULT ISpEventSource2_GetEventsEx(ISpEventSource2* This,ULO #endif -HRESULT STDMETHODCALLTYPE ISpEventSource2_GetEventsEx_Proxy( - ISpEventSource2* This, - ULONG ulCount, - SPEVENTEX *pEventArray, - ULONG *pulFetched); -void __RPC_STUB ISpEventSource2_GetEventsEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpEventSource2_INTERFACE_DEFINED__ */ @@ -4187,28 +4157,29 @@ typedef struct ISpEventSinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpEventSink* This, + ISpEventSink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpEventSink* This); + ISpEventSink *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpEventSink* This); + ISpEventSink *This); /*** ISpEventSink methods ***/ HRESULT (STDMETHODCALLTYPE *AddEvents)( - ISpEventSink* This, + ISpEventSink *This, const SPEVENT *pEventArray, ULONG ulCount); HRESULT (STDMETHODCALLTYPE *GetEventInterest)( - ISpEventSink* This, + ISpEventSink *This, ULONGLONG *pullEventInterest); END_INTERFACE } ISpEventSinkVtbl; + interface ISpEventSink { CONST_VTBL ISpEventSinkVtbl* lpVtbl; }; @@ -4245,23 +4216,6 @@ static FORCEINLINE HRESULT ISpEventSink_GetEventInterest(ISpEventSink* This,ULON #endif -HRESULT STDMETHODCALLTYPE ISpEventSink_AddEvents_Proxy( - ISpEventSink* This, - const SPEVENT *pEventArray, - ULONG ulCount); -void __RPC_STUB ISpEventSink_AddEvents_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpEventSink_GetEventInterest_Proxy( - ISpEventSink* This, - ULONGLONG *pullEventInterest); -void __RPC_STUB ISpEventSink_GetEventInterest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpEventSink_INTERFACE_DEFINED__ */ @@ -4290,83 +4244,84 @@ typedef struct ISpStreamFormatVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpStreamFormat* This, + ISpStreamFormat *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpStreamFormat* This); + ISpStreamFormat *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpStreamFormat* This); + ISpStreamFormat *This); /*** ISequentialStream methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - ISpStreamFormat* This, + ISpStreamFormat *This, void *pv, ULONG cb, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpStreamFormat* This, + ISpStreamFormat *This, const void *pv, ULONG cb, ULONG *pcbWritten); /*** IStream methods ***/ HRESULT (STDMETHODCALLTYPE *Seek)( - ISpStreamFormat* This, + ISpStreamFormat *This, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition); HRESULT (STDMETHODCALLTYPE *SetSize)( - ISpStreamFormat* This, + ISpStreamFormat *This, ULARGE_INTEGER libNewSize); HRESULT (STDMETHODCALLTYPE *CopyTo)( - ISpStreamFormat* This, + ISpStreamFormat *This, IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpStreamFormat* This, + ISpStreamFormat *This, DWORD grfCommitFlags); HRESULT (STDMETHODCALLTYPE *Revert)( - ISpStreamFormat* This); + ISpStreamFormat *This); HRESULT (STDMETHODCALLTYPE *LockRegion)( - ISpStreamFormat* This, + ISpStreamFormat *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *UnlockRegion)( - ISpStreamFormat* This, + ISpStreamFormat *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *Stat)( - ISpStreamFormat* This, + ISpStreamFormat *This, STATSTG *pstatstg, DWORD grfStatFlag); HRESULT (STDMETHODCALLTYPE *Clone)( - ISpStreamFormat* This, + ISpStreamFormat *This, IStream **ppstm); /*** ISpStreamFormat methods ***/ HRESULT (STDMETHODCALLTYPE *GetFormat)( - ISpStreamFormat* This, + ISpStreamFormat *This, GUID *pguidFormatId, WAVEFORMATEX **ppCoMemWaveFormatEx); END_INTERFACE } ISpStreamFormatVtbl; + interface ISpStreamFormat { CONST_VTBL ISpStreamFormatVtbl* lpVtbl; }; @@ -4447,15 +4402,6 @@ static FORCEINLINE HRESULT ISpStreamFormat_GetFormat(ISpStreamFormat* This,GUID #endif -HRESULT STDMETHODCALLTYPE ISpStreamFormat_GetFormat_Proxy( - ISpStreamFormat* This, - GUID *pguidFormatId, - WAVEFORMATEX **ppCoMemWaveFormatEx); -void __RPC_STUB ISpStreamFormat_GetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpStreamFormat_INTERFACE_DEFINED__ */ @@ -4498,94 +4444,94 @@ typedef struct ISpStreamVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpStream* This, + ISpStream *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpStream* This); + ISpStream *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpStream* This); + ISpStream *This); /*** ISequentialStream methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - ISpStream* This, + ISpStream *This, void *pv, ULONG cb, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpStream* This, + ISpStream *This, const void *pv, ULONG cb, ULONG *pcbWritten); /*** IStream methods ***/ HRESULT (STDMETHODCALLTYPE *Seek)( - ISpStream* This, + ISpStream *This, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition); HRESULT (STDMETHODCALLTYPE *SetSize)( - ISpStream* This, + ISpStream *This, ULARGE_INTEGER libNewSize); HRESULT (STDMETHODCALLTYPE *CopyTo)( - ISpStream* This, + ISpStream *This, IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpStream* This, + ISpStream *This, DWORD grfCommitFlags); HRESULT (STDMETHODCALLTYPE *Revert)( - ISpStream* This); + ISpStream *This); HRESULT (STDMETHODCALLTYPE *LockRegion)( - ISpStream* This, + ISpStream *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *UnlockRegion)( - ISpStream* This, + ISpStream *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *Stat)( - ISpStream* This, + ISpStream *This, STATSTG *pstatstg, DWORD grfStatFlag); HRESULT (STDMETHODCALLTYPE *Clone)( - ISpStream* This, + ISpStream *This, IStream **ppstm); /*** ISpStreamFormat methods ***/ HRESULT (STDMETHODCALLTYPE *GetFormat)( - ISpStream* This, + ISpStream *This, GUID *pguidFormatId, WAVEFORMATEX **ppCoMemWaveFormatEx); /*** ISpStream methods ***/ HRESULT (STDMETHODCALLTYPE *SetBaseStream)( - ISpStream* This, + ISpStream *This, IStream *pStream, REFGUID rguidFormat, const WAVEFORMATEX *pWaveFormatEx); HRESULT (STDMETHODCALLTYPE *GetBaseStream)( - ISpStream* This, + ISpStream *This, IStream **ppStream); HRESULT (STDMETHODCALLTYPE *BindToFile)( - ISpStream* This, + ISpStream *This, LPCWSTR pszFileName, SPFILEMODE eMode, const GUID *pFormatId, @@ -4593,10 +4539,11 @@ typedef struct ISpStreamVtbl { ULONGLONG ullEventInterest); HRESULT (STDMETHODCALLTYPE *Close)( - ISpStream* This); + ISpStream *This); END_INTERFACE } ISpStreamVtbl; + interface ISpStream { CONST_VTBL ISpStreamVtbl* lpVtbl; }; @@ -4695,43 +4642,6 @@ static FORCEINLINE HRESULT ISpStream_Close(ISpStream* This) { #endif -HRESULT STDMETHODCALLTYPE ISpStream_SetBaseStream_Proxy( - ISpStream* This, - IStream *pStream, - REFGUID rguidFormat, - const WAVEFORMATEX *pWaveFormatEx); -void __RPC_STUB ISpStream_SetBaseStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpStream_GetBaseStream_Proxy( - ISpStream* This, - IStream **ppStream); -void __RPC_STUB ISpStream_GetBaseStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpStream_BindToFile_Proxy( - ISpStream* This, - LPCWSTR pszFileName, - SPFILEMODE eMode, - const GUID *pFormatId, - const WAVEFORMATEX *pWaveFormatEx, - ULONGLONG ullEventInterest); -void __RPC_STUB ISpStream_BindToFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpStream_Close_Proxy( - ISpStream* This); -void __RPC_STUB ISpStream_Close_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpStream_INTERFACE_DEFINED__ */ @@ -4779,112 +4689,113 @@ typedef struct ISpStreamFormatConverterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpStreamFormatConverter* This); + ISpStreamFormatConverter *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpStreamFormatConverter* This); + ISpStreamFormatConverter *This); /*** ISequentialStream methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, void *pv, ULONG cb, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, const void *pv, ULONG cb, ULONG *pcbWritten); /*** IStream methods ***/ HRESULT (STDMETHODCALLTYPE *Seek)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition); HRESULT (STDMETHODCALLTYPE *SetSize)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, ULARGE_INTEGER libNewSize); HRESULT (STDMETHODCALLTYPE *CopyTo)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, DWORD grfCommitFlags); HRESULT (STDMETHODCALLTYPE *Revert)( - ISpStreamFormatConverter* This); + ISpStreamFormatConverter *This); HRESULT (STDMETHODCALLTYPE *LockRegion)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *UnlockRegion)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *Stat)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, STATSTG *pstatstg, DWORD grfStatFlag); HRESULT (STDMETHODCALLTYPE *Clone)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, IStream **ppstm); /*** ISpStreamFormat methods ***/ HRESULT (STDMETHODCALLTYPE *GetFormat)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, GUID *pguidFormatId, WAVEFORMATEX **ppCoMemWaveFormatEx); /*** ISpStreamFormatConverter methods ***/ HRESULT (STDMETHODCALLTYPE *SetBaseStream)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, ISpStreamFormat *pStream, WINBOOL fSetFormatToBaseStreamFormat, WINBOOL fWriteToBaseStream); HRESULT (STDMETHODCALLTYPE *GetBaseStream)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, ISpStreamFormat **ppStream); HRESULT (STDMETHODCALLTYPE *SetFormat)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, REFGUID rguidFormatIdOfConvertedStream, const WAVEFORMATEX *pWaveFormatExOfConvertedStream); HRESULT (STDMETHODCALLTYPE *ResetSeekPosition)( - ISpStreamFormatConverter* This); + ISpStreamFormatConverter *This); HRESULT (STDMETHODCALLTYPE *ScaleConvertedToBaseOffset)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, ULONGLONG ullOffsetConvertedStream, ULONGLONG *pullOffsetBaseStream); HRESULT (STDMETHODCALLTYPE *ScaleBaseToConvertedOffset)( - ISpStreamFormatConverter* This, + ISpStreamFormatConverter *This, ULONGLONG ullOffsetBaseStream, ULONGLONG *pullOffsetConvertedStream); END_INTERFACE } ISpStreamFormatConverterVtbl; + interface ISpStreamFormatConverter { CONST_VTBL ISpStreamFormatConverterVtbl* lpVtbl; }; @@ -4991,58 +4902,6 @@ static FORCEINLINE HRESULT ISpStreamFormatConverter_ScaleBaseToConvertedOffset(I #endif -HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_SetBaseStream_Proxy( - ISpStreamFormatConverter* This, - ISpStreamFormat *pStream, - WINBOOL fSetFormatToBaseStreamFormat, - WINBOOL fWriteToBaseStream); -void __RPC_STUB ISpStreamFormatConverter_SetBaseStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_GetBaseStream_Proxy( - ISpStreamFormatConverter* This, - ISpStreamFormat **ppStream); -void __RPC_STUB ISpStreamFormatConverter_GetBaseStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_SetFormat_Proxy( - ISpStreamFormatConverter* This, - REFGUID rguidFormatIdOfConvertedStream, - const WAVEFORMATEX *pWaveFormatExOfConvertedStream); -void __RPC_STUB ISpStreamFormatConverter_SetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_ResetSeekPosition_Proxy( - ISpStreamFormatConverter* This); -void __RPC_STUB ISpStreamFormatConverter_ResetSeekPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_ScaleConvertedToBaseOffset_Proxy( - ISpStreamFormatConverter* This, - ULONGLONG ullOffsetConvertedStream, - ULONGLONG *pullOffsetBaseStream); -void __RPC_STUB ISpStreamFormatConverter_ScaleConvertedToBaseOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_ScaleBaseToConvertedOffset_Proxy( - ISpStreamFormatConverter* This, - ULONGLONG ullOffsetBaseStream, - ULONGLONG *pullOffsetConvertedStream); -void __RPC_STUB ISpStreamFormatConverter_ScaleBaseToConvertedOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpStreamFormatConverter_INTERFACE_DEFINED__ */ @@ -5117,130 +4976,131 @@ typedef struct ISpAudioVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpAudio* This, + ISpAudio *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpAudio* This); + ISpAudio *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpAudio* This); + ISpAudio *This); /*** ISequentialStream methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - ISpAudio* This, + ISpAudio *This, void *pv, ULONG cb, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpAudio* This, + ISpAudio *This, const void *pv, ULONG cb, ULONG *pcbWritten); /*** IStream methods ***/ HRESULT (STDMETHODCALLTYPE *Seek)( - ISpAudio* This, + ISpAudio *This, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition); HRESULT (STDMETHODCALLTYPE *SetSize)( - ISpAudio* This, + ISpAudio *This, ULARGE_INTEGER libNewSize); HRESULT (STDMETHODCALLTYPE *CopyTo)( - ISpAudio* This, + ISpAudio *This, IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpAudio* This, + ISpAudio *This, DWORD grfCommitFlags); HRESULT (STDMETHODCALLTYPE *Revert)( - ISpAudio* This); + ISpAudio *This); HRESULT (STDMETHODCALLTYPE *LockRegion)( - ISpAudio* This, + ISpAudio *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *UnlockRegion)( - ISpAudio* This, + ISpAudio *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *Stat)( - ISpAudio* This, + ISpAudio *This, STATSTG *pstatstg, DWORD grfStatFlag); HRESULT (STDMETHODCALLTYPE *Clone)( - ISpAudio* This, + ISpAudio *This, IStream **ppstm); /*** ISpStreamFormat methods ***/ HRESULT (STDMETHODCALLTYPE *GetFormat)( - ISpAudio* This, + ISpAudio *This, GUID *pguidFormatId, WAVEFORMATEX **ppCoMemWaveFormatEx); /*** ISpAudio methods ***/ HRESULT (STDMETHODCALLTYPE *SetState)( - ISpAudio* This, + ISpAudio *This, SPAUDIOSTATE NewState, ULONGLONG ullReserved); HRESULT (STDMETHODCALLTYPE *SetFormat)( - ISpAudio* This, + ISpAudio *This, REFGUID rguidFmtId, const WAVEFORMATEX *pWaveFormatEx); HRESULT (STDMETHODCALLTYPE *GetStatus)( - ISpAudio* This, + ISpAudio *This, SPAUDIOSTATUS *pStatus); HRESULT (STDMETHODCALLTYPE *SetBufferInfo)( - ISpAudio* This, + ISpAudio *This, const SPAUDIOBUFFERINFO *pBuffInfo); HRESULT (STDMETHODCALLTYPE *GetBufferInfo)( - ISpAudio* This, + ISpAudio *This, SPAUDIOBUFFERINFO *pBuffInfo); HRESULT (STDMETHODCALLTYPE *GetDefaultFormat)( - ISpAudio* This, + ISpAudio *This, GUID *pFormatId, WAVEFORMATEX **ppCoMemWaveFormatEx); HANDLE (STDMETHODCALLTYPE *EventHandle)( - ISpAudio* This); + ISpAudio *This); HRESULT (STDMETHODCALLTYPE *GetVolumeLevel)( - ISpAudio* This, + ISpAudio *This, ULONG *pLevel); HRESULT (STDMETHODCALLTYPE *SetVolumeLevel)( - ISpAudio* This, + ISpAudio *This, ULONG Level); HRESULT (STDMETHODCALLTYPE *GetBufferNotifySize)( - ISpAudio* This, + ISpAudio *This, ULONG *pcbSize); HRESULT (STDMETHODCALLTYPE *SetBufferNotifySize)( - ISpAudio* This, + ISpAudio *This, ULONG cbSize); END_INTERFACE } ISpAudioVtbl; + interface ISpAudio { CONST_VTBL ISpAudioVtbl* lpVtbl; }; @@ -5367,96 +5227,6 @@ static FORCEINLINE HRESULT ISpAudio_SetBufferNotifySize(ISpAudio* This,ULONG cbS #endif -HRESULT STDMETHODCALLTYPE ISpAudio_SetState_Proxy( - ISpAudio* This, - SPAUDIOSTATE NewState, - ULONGLONG ullReserved); -void __RPC_STUB ISpAudio_SetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_SetFormat_Proxy( - ISpAudio* This, - REFGUID rguidFmtId, - const WAVEFORMATEX *pWaveFormatEx); -void __RPC_STUB ISpAudio_SetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_GetStatus_Proxy( - ISpAudio* This, - SPAUDIOSTATUS *pStatus); -void __RPC_STUB ISpAudio_GetStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_SetBufferInfo_Proxy( - ISpAudio* This, - const SPAUDIOBUFFERINFO *pBuffInfo); -void __RPC_STUB ISpAudio_SetBufferInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_GetBufferInfo_Proxy( - ISpAudio* This, - SPAUDIOBUFFERINFO *pBuffInfo); -void __RPC_STUB ISpAudio_GetBufferInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_GetDefaultFormat_Proxy( - ISpAudio* This, - GUID *pFormatId, - WAVEFORMATEX **ppCoMemWaveFormatEx); -void __RPC_STUB ISpAudio_GetDefaultFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HANDLE STDMETHODCALLTYPE ISpAudio_EventHandle_Proxy( - ISpAudio* This); -void __RPC_STUB ISpAudio_EventHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_GetVolumeLevel_Proxy( - ISpAudio* This, - ULONG *pLevel); -void __RPC_STUB ISpAudio_GetVolumeLevel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_SetVolumeLevel_Proxy( - ISpAudio* This, - ULONG Level); -void __RPC_STUB ISpAudio_SetVolumeLevel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_GetBufferNotifySize_Proxy( - ISpAudio* This, - ULONG *pcbSize); -void __RPC_STUB ISpAudio_GetBufferNotifySize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpAudio_SetBufferNotifySize_Proxy( - ISpAudio* This, - ULONG cbSize); -void __RPC_STUB ISpAudio_SetBufferNotifySize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpAudio_INTERFACE_DEFINED__ */ @@ -5496,151 +5266,152 @@ typedef struct ISpMMSysAudioVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpMMSysAudio* This); + ISpMMSysAudio *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpMMSysAudio* This); + ISpMMSysAudio *This); /*** ISequentialStream methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, void *pv, ULONG cb, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, const void *pv, ULONG cb, ULONG *pcbWritten); /*** IStream methods ***/ HRESULT (STDMETHODCALLTYPE *Seek)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition); HRESULT (STDMETHODCALLTYPE *SetSize)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, ULARGE_INTEGER libNewSize); HRESULT (STDMETHODCALLTYPE *CopyTo)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, DWORD grfCommitFlags); HRESULT (STDMETHODCALLTYPE *Revert)( - ISpMMSysAudio* This); + ISpMMSysAudio *This); HRESULT (STDMETHODCALLTYPE *LockRegion)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *UnlockRegion)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *Stat)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, STATSTG *pstatstg, DWORD grfStatFlag); HRESULT (STDMETHODCALLTYPE *Clone)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, IStream **ppstm); /*** ISpStreamFormat methods ***/ HRESULT (STDMETHODCALLTYPE *GetFormat)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, GUID *pguidFormatId, WAVEFORMATEX **ppCoMemWaveFormatEx); /*** ISpAudio methods ***/ HRESULT (STDMETHODCALLTYPE *SetState)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, SPAUDIOSTATE NewState, ULONGLONG ullReserved); HRESULT (STDMETHODCALLTYPE *SetFormat)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, REFGUID rguidFmtId, const WAVEFORMATEX *pWaveFormatEx); HRESULT (STDMETHODCALLTYPE *GetStatus)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, SPAUDIOSTATUS *pStatus); HRESULT (STDMETHODCALLTYPE *SetBufferInfo)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, const SPAUDIOBUFFERINFO *pBuffInfo); HRESULT (STDMETHODCALLTYPE *GetBufferInfo)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, SPAUDIOBUFFERINFO *pBuffInfo); HRESULT (STDMETHODCALLTYPE *GetDefaultFormat)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, GUID *pFormatId, WAVEFORMATEX **ppCoMemWaveFormatEx); HANDLE (STDMETHODCALLTYPE *EventHandle)( - ISpMMSysAudio* This); + ISpMMSysAudio *This); HRESULT (STDMETHODCALLTYPE *GetVolumeLevel)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, ULONG *pLevel); HRESULT (STDMETHODCALLTYPE *SetVolumeLevel)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, ULONG Level); HRESULT (STDMETHODCALLTYPE *GetBufferNotifySize)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, ULONG *pcbSize); HRESULT (STDMETHODCALLTYPE *SetBufferNotifySize)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, ULONG cbSize); /*** ISpMMSysAudio methods ***/ HRESULT (STDMETHODCALLTYPE *GetDeviceId)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, UINT *puDeviceId); HRESULT (STDMETHODCALLTYPE *SetDeviceId)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, UINT uDeviceId); HRESULT (STDMETHODCALLTYPE *GetMMHandle)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, void **pHandle); HRESULT (STDMETHODCALLTYPE *GetLineId)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, UINT *puLineId); HRESULT (STDMETHODCALLTYPE *SetLineId)( - ISpMMSysAudio* This, + ISpMMSysAudio *This, UINT uLineId); END_INTERFACE } ISpMMSysAudioVtbl; + interface ISpMMSysAudio { CONST_VTBL ISpMMSysAudioVtbl* lpVtbl; }; @@ -5789,46 +5560,6 @@ static FORCEINLINE HRESULT ISpMMSysAudio_SetLineId(ISpMMSysAudio* This,UINT uLin #endif -HRESULT STDMETHODCALLTYPE ISpMMSysAudio_GetDeviceId_Proxy( - ISpMMSysAudio* This, - UINT *puDeviceId); -void __RPC_STUB ISpMMSysAudio_GetDeviceId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpMMSysAudio_SetDeviceId_Proxy( - ISpMMSysAudio* This, - UINT uDeviceId); -void __RPC_STUB ISpMMSysAudio_SetDeviceId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpMMSysAudio_GetMMHandle_Proxy( - ISpMMSysAudio* This, - void **pHandle); -void __RPC_STUB ISpMMSysAudio_GetMMHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpMMSysAudio_GetLineId_Proxy( - ISpMMSysAudio* This, - UINT *puLineId); -void __RPC_STUB ISpMMSysAudio_GetLineId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpMMSysAudio_SetLineId_Proxy( - ISpMMSysAudio* This, - UINT uLineId); -void __RPC_STUB ISpMMSysAudio_SetLineId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpMMSysAudio_INTERFACE_DEFINED__ */ @@ -5859,27 +5590,28 @@ typedef struct ISpTranscriptVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpTranscript* This, + ISpTranscript *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpTranscript* This); + ISpTranscript *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpTranscript* This); + ISpTranscript *This); /*** ISpTranscript methods ***/ HRESULT (STDMETHODCALLTYPE *GetTranscript)( - ISpTranscript* This, + ISpTranscript *This, LPWSTR *ppszTranscript); HRESULT (STDMETHODCALLTYPE *AppendTranscript)( - ISpTranscript* This, + ISpTranscript *This, LPCWSTR pszTranscript); END_INTERFACE } ISpTranscriptVtbl; + interface ISpTranscript { CONST_VTBL ISpTranscriptVtbl* lpVtbl; }; @@ -5916,22 +5648,6 @@ static FORCEINLINE HRESULT ISpTranscript_AppendTranscript(ISpTranscript* This,LP #endif -HRESULT STDMETHODCALLTYPE ISpTranscript_GetTranscript_Proxy( - ISpTranscript* This, - LPWSTR *ppszTranscript); -void __RPC_STUB ISpTranscript_GetTranscript_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpTranscript_AppendTranscript_Proxy( - ISpTranscript* This, - LPCWSTR pszTranscript); -void __RPC_STUB ISpTranscript_AppendTranscript_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpTranscript_INTERFACE_DEFINED__ */ @@ -5966,7 +5682,6 @@ struct SPPHRASERULE { float SREngineConfidence; signed char Confidence; }; - struct SPPHRASEPROPERTY { LPCWSTR pszName; __C89_NAMELESS union { @@ -5986,7 +5701,6 @@ struct SPPHRASEPROPERTY { float SREngineConfidence; signed char Confidence; }; - typedef struct SPPHRASEREPLACEMENT { BYTE bDisplayAttributes; LPCWSTR pszReplacementText; @@ -6172,50 +5886,50 @@ typedef struct ISpLexiconVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpLexicon* This, + ISpLexicon *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpLexicon* This); + ISpLexicon *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpLexicon* This); + ISpLexicon *This); /*** ISpLexicon methods ***/ HRESULT (STDMETHODCALLTYPE *GetPronunciations)( - ISpLexicon* This, + ISpLexicon *This, LPCWSTR pszWord, WORD LangID, DWORD dwFlags, SPWORDPRONUNCIATIONLIST *pWordPronunciationList); HRESULT (STDMETHODCALLTYPE *AddPronunciation)( - ISpLexicon* This, + ISpLexicon *This, LPCWSTR pszWord, WORD LangID, SPPARTOFSPEECH ePartOfSpeech, PCSPPHONEID pszPronunciation); HRESULT (STDMETHODCALLTYPE *RemovePronunciation)( - ISpLexicon* This, + ISpLexicon *This, LPCWSTR pszWord, WORD LangID, SPPARTOFSPEECH ePartOfSpeech, PCSPPHONEID pszPronunciation); HRESULT (STDMETHODCALLTYPE *GetGeneration)( - ISpLexicon* This, + ISpLexicon *This, DWORD *pdwGeneration); HRESULT (STDMETHODCALLTYPE *GetGenerationChange)( - ISpLexicon* This, + ISpLexicon *This, DWORD dwFlags, DWORD *pdwGeneration, SPWORDLIST *pWordList); HRESULT (STDMETHODCALLTYPE *GetWords)( - ISpLexicon* This, + ISpLexicon *This, DWORD dwFlags, DWORD *pdwGeneration, DWORD *pdwCookie, @@ -6223,6 +5937,7 @@ typedef struct ISpLexiconVtbl { END_INTERFACE } ISpLexiconVtbl; + interface ISpLexicon { CONST_VTBL ISpLexiconVtbl* lpVtbl; }; @@ -6275,68 +5990,6 @@ static FORCEINLINE HRESULT ISpLexicon_GetWords(ISpLexicon* This,DWORD dwFlags,DW #endif -HRESULT STDMETHODCALLTYPE ISpLexicon_GetPronunciations_Proxy( - ISpLexicon* This, - LPCWSTR pszWord, - WORD LangID, - DWORD dwFlags, - SPWORDPRONUNCIATIONLIST *pWordPronunciationList); -void __RPC_STUB ISpLexicon_GetPronunciations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpLexicon_AddPronunciation_Proxy( - ISpLexicon* This, - LPCWSTR pszWord, - WORD LangID, - SPPARTOFSPEECH ePartOfSpeech, - PCSPPHONEID pszPronunciation); -void __RPC_STUB ISpLexicon_AddPronunciation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpLexicon_RemovePronunciation_Proxy( - ISpLexicon* This, - LPCWSTR pszWord, - WORD LangID, - SPPARTOFSPEECH ePartOfSpeech, - PCSPPHONEID pszPronunciation); -void __RPC_STUB ISpLexicon_RemovePronunciation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpLexicon_GetGeneration_Proxy( - ISpLexicon* This, - DWORD *pdwGeneration); -void __RPC_STUB ISpLexicon_GetGeneration_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpLexicon_GetGenerationChange_Proxy( - ISpLexicon* This, - DWORD dwFlags, - DWORD *pdwGeneration, - SPWORDLIST *pWordList); -void __RPC_STUB ISpLexicon_GetGenerationChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpLexicon_GetWords_Proxy( - ISpLexicon* This, - DWORD dwFlags, - DWORD *pdwGeneration, - DWORD *pdwCookie, - SPWORDLIST *pWordList); -void __RPC_STUB ISpLexicon_GetWords_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpLexicon_INTERFACE_DEFINED__ */ @@ -6365,50 +6018,50 @@ typedef struct ISpContainerLexiconVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpContainerLexicon* This, + ISpContainerLexicon *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpContainerLexicon* This); + ISpContainerLexicon *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpContainerLexicon* This); + ISpContainerLexicon *This); /*** ISpLexicon methods ***/ HRESULT (STDMETHODCALLTYPE *GetPronunciations)( - ISpContainerLexicon* This, + ISpContainerLexicon *This, LPCWSTR pszWord, WORD LangID, DWORD dwFlags, SPWORDPRONUNCIATIONLIST *pWordPronunciationList); HRESULT (STDMETHODCALLTYPE *AddPronunciation)( - ISpContainerLexicon* This, + ISpContainerLexicon *This, LPCWSTR pszWord, WORD LangID, SPPARTOFSPEECH ePartOfSpeech, PCSPPHONEID pszPronunciation); HRESULT (STDMETHODCALLTYPE *RemovePronunciation)( - ISpContainerLexicon* This, + ISpContainerLexicon *This, LPCWSTR pszWord, WORD LangID, SPPARTOFSPEECH ePartOfSpeech, PCSPPHONEID pszPronunciation); HRESULT (STDMETHODCALLTYPE *GetGeneration)( - ISpContainerLexicon* This, + ISpContainerLexicon *This, DWORD *pdwGeneration); HRESULT (STDMETHODCALLTYPE *GetGenerationChange)( - ISpContainerLexicon* This, + ISpContainerLexicon *This, DWORD dwFlags, DWORD *pdwGeneration, SPWORDLIST *pWordList); HRESULT (STDMETHODCALLTYPE *GetWords)( - ISpContainerLexicon* This, + ISpContainerLexicon *This, DWORD dwFlags, DWORD *pdwGeneration, DWORD *pdwCookie, @@ -6416,12 +6069,13 @@ typedef struct ISpContainerLexiconVtbl { /*** ISpContainerLexicon methods ***/ HRESULT (STDMETHODCALLTYPE *AddLexicon)( - ISpContainerLexicon* This, + ISpContainerLexicon *This, ISpLexicon *pAddLexicon, DWORD dwFlags); END_INTERFACE } ISpContainerLexiconVtbl; + interface ISpContainerLexicon { CONST_VTBL ISpContainerLexiconVtbl* lpVtbl; }; @@ -6480,15 +6134,6 @@ static FORCEINLINE HRESULT ISpContainerLexicon_AddLexicon(ISpContainerLexicon* T #endif -HRESULT STDMETHODCALLTYPE ISpContainerLexicon_AddLexicon_Proxy( - ISpContainerLexicon* This, - ISpLexicon *pAddLexicon, - DWORD dwFlags); -void __RPC_STUB ISpContainerLexicon_AddLexicon_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpContainerLexicon_INTERFACE_DEFINED__ */ @@ -6562,64 +6207,65 @@ typedef struct ISpShortcutVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpShortcut* This, + ISpShortcut *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpShortcut* This); + ISpShortcut *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpShortcut* This); + ISpShortcut *This); /*** ISpShortcut methods ***/ HRESULT (STDMETHODCALLTYPE *AddShortcut)( - ISpShortcut* This, + ISpShortcut *This, LPCWSTR pszDisplay, WORD LangID, LPCWSTR pszSpoken, SPSHORTCUTTYPE shType); HRESULT (STDMETHODCALLTYPE *RemoveShortcut)( - ISpShortcut* This, + ISpShortcut *This, LPCWSTR pszDisplay, WORD LangID, LPCWSTR pszSpoken, SPSHORTCUTTYPE shType); HRESULT (STDMETHODCALLTYPE *GetShortcuts)( - ISpShortcut* This, + ISpShortcut *This, WORD LangID, SPSHORTCUTPAIRLIST *pShortcutpairList); HRESULT (STDMETHODCALLTYPE *GetGeneration)( - ISpShortcut* This, + ISpShortcut *This, DWORD *pdwGeneration); HRESULT (STDMETHODCALLTYPE *GetWordsFromGenerationChange)( - ISpShortcut* This, + ISpShortcut *This, DWORD *pdwGeneration, SPWORDLIST *pWordList); HRESULT (STDMETHODCALLTYPE *GetWords)( - ISpShortcut* This, + ISpShortcut *This, DWORD *pdwGeneration, DWORD *pdwCookie, SPWORDLIST *pWordList); HRESULT (STDMETHODCALLTYPE *GetShortcutsForGeneration)( - ISpShortcut* This, + ISpShortcut *This, DWORD *pdwGeneration, DWORD *pdwCookie, SPSHORTCUTPAIRLIST *pShortcutpairList); HRESULT (STDMETHODCALLTYPE *GetGenerationChange)( - ISpShortcut* This, + ISpShortcut *This, DWORD *pdwGeneration, SPSHORTCUTPAIRLIST *pShortcutpairList); END_INTERFACE } ISpShortcutVtbl; + interface ISpShortcut { CONST_VTBL ISpShortcutVtbl* lpVtbl; }; @@ -6680,83 +6326,6 @@ static FORCEINLINE HRESULT ISpShortcut_GetGenerationChange(ISpShortcut* This,DWO #endif -HRESULT STDMETHODCALLTYPE ISpShortcut_AddShortcut_Proxy( - ISpShortcut* This, - LPCWSTR pszDisplay, - WORD LangID, - LPCWSTR pszSpoken, - SPSHORTCUTTYPE shType); -void __RPC_STUB ISpShortcut_AddShortcut_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpShortcut_RemoveShortcut_Proxy( - ISpShortcut* This, - LPCWSTR pszDisplay, - WORD LangID, - LPCWSTR pszSpoken, - SPSHORTCUTTYPE shType); -void __RPC_STUB ISpShortcut_RemoveShortcut_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpShortcut_GetShortcuts_Proxy( - ISpShortcut* This, - WORD LangID, - SPSHORTCUTPAIRLIST *pShortcutpairList); -void __RPC_STUB ISpShortcut_GetShortcuts_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpShortcut_GetGeneration_Proxy( - ISpShortcut* This, - DWORD *pdwGeneration); -void __RPC_STUB ISpShortcut_GetGeneration_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpShortcut_GetWordsFromGenerationChange_Proxy( - ISpShortcut* This, - DWORD *pdwGeneration, - SPWORDLIST *pWordList); -void __RPC_STUB ISpShortcut_GetWordsFromGenerationChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpShortcut_GetWords_Proxy( - ISpShortcut* This, - DWORD *pdwGeneration, - DWORD *pdwCookie, - SPWORDLIST *pWordList); -void __RPC_STUB ISpShortcut_GetWords_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpShortcut_GetShortcutsForGeneration_Proxy( - ISpShortcut* This, - DWORD *pdwGeneration, - DWORD *pdwCookie, - SPSHORTCUTPAIRLIST *pShortcutpairList); -void __RPC_STUB ISpShortcut_GetShortcutsForGeneration_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpShortcut_GetGenerationChange_Proxy( - ISpShortcut* This, - DWORD *pdwGeneration, - SPSHORTCUTPAIRLIST *pShortcutpairList); -void __RPC_STUB ISpShortcut_GetGenerationChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpShortcut_INTERFACE_DEFINED__ */ @@ -6789,38 +6358,39 @@ typedef struct ISpPhoneConverterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpPhoneConverter* This, + ISpPhoneConverter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpPhoneConverter* This); + ISpPhoneConverter *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpPhoneConverter* This); + ISpPhoneConverter *This); /*** ISpObjectWithToken methods ***/ HRESULT (STDMETHODCALLTYPE *SetObjectToken)( - ISpPhoneConverter* This, + ISpPhoneConverter *This, ISpObjectToken *pToken); HRESULT (STDMETHODCALLTYPE *GetObjectToken)( - ISpPhoneConverter* This, + ISpPhoneConverter *This, ISpObjectToken **ppToken); /*** ISpPhoneConverter methods ***/ HRESULT (STDMETHODCALLTYPE *PhoneToId)( - ISpPhoneConverter* This, + ISpPhoneConverter *This, LPCWSTR pszPhone, SPPHONEID *pId); HRESULT (STDMETHODCALLTYPE *IdToPhone)( - ISpPhoneConverter* This, + ISpPhoneConverter *This, PCSPPHONEID pId, WCHAR *pszPhone); END_INTERFACE } ISpPhoneConverterVtbl; + interface ISpPhoneConverter { CONST_VTBL ISpPhoneConverterVtbl* lpVtbl; }; @@ -6867,24 +6437,6 @@ static FORCEINLINE HRESULT ISpPhoneConverter_IdToPhone(ISpPhoneConverter* This,P #endif -HRESULT STDMETHODCALLTYPE ISpPhoneConverter_PhoneToId_Proxy( - ISpPhoneConverter* This, - LPCWSTR pszPhone, - SPPHONEID *pId); -void __RPC_STUB ISpPhoneConverter_PhoneToId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhoneConverter_IdToPhone_Proxy( - ISpPhoneConverter* This, - PCSPPHONEID pId, - WCHAR *pszPhone); -void __RPC_STUB ISpPhoneConverter_IdToPhone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpPhoneConverter_INTERFACE_DEFINED__ */ @@ -6930,45 +6482,46 @@ typedef struct ISpPhoneticAlphabetConverterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpPhoneticAlphabetConverter* This, + ISpPhoneticAlphabetConverter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpPhoneticAlphabetConverter* This); + ISpPhoneticAlphabetConverter *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpPhoneticAlphabetConverter* This); + ISpPhoneticAlphabetConverter *This); /*** ISpPhoneticAlphabetConverter methods ***/ HRESULT (STDMETHODCALLTYPE *GetLangId)( - ISpPhoneticAlphabetConverter* This, + ISpPhoneticAlphabetConverter *This, WORD *pLangID); HRESULT (STDMETHODCALLTYPE *SetLangId)( - ISpPhoneticAlphabetConverter* This, + ISpPhoneticAlphabetConverter *This, WORD LangID); HRESULT (STDMETHODCALLTYPE *SAPI2UPS)( - ISpPhoneticAlphabetConverter* This, + ISpPhoneticAlphabetConverter *This, const SPPHONEID *pszSAPIId, SPPHONEID *pszUPSId, DWORD cMaxLength); HRESULT (STDMETHODCALLTYPE *UPS2SAPI)( - ISpPhoneticAlphabetConverter* This, + ISpPhoneticAlphabetConverter *This, const SPPHONEID *pszUPSId, SPPHONEID *pszSAPIId, DWORD cMaxLength); HRESULT (STDMETHODCALLTYPE *GetMaxConvertLength)( - ISpPhoneticAlphabetConverter* This, + ISpPhoneticAlphabetConverter *This, DWORD cSrcLength, WINBOOL bSAPI2UPS, DWORD *pcMaxDestLength); END_INTERFACE } ISpPhoneticAlphabetConverterVtbl; + interface ISpPhoneticAlphabetConverter { CONST_VTBL ISpPhoneticAlphabetConverterVtbl* lpVtbl; }; @@ -7017,52 +6570,6 @@ static FORCEINLINE HRESULT ISpPhoneticAlphabetConverter_GetMaxConvertLength(ISpP #endif -HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetConverter_GetLangId_Proxy( - ISpPhoneticAlphabetConverter* This, - WORD *pLangID); -void __RPC_STUB ISpPhoneticAlphabetConverter_GetLangId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetConverter_SetLangId_Proxy( - ISpPhoneticAlphabetConverter* This, - WORD LangID); -void __RPC_STUB ISpPhoneticAlphabetConverter_SetLangId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetConverter_SAPI2UPS_Proxy( - ISpPhoneticAlphabetConverter* This, - const SPPHONEID *pszSAPIId, - SPPHONEID *pszUPSId, - DWORD cMaxLength); -void __RPC_STUB ISpPhoneticAlphabetConverter_SAPI2UPS_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetConverter_UPS2SAPI_Proxy( - ISpPhoneticAlphabetConverter* This, - const SPPHONEID *pszUPSId, - SPPHONEID *pszSAPIId, - DWORD cMaxLength); -void __RPC_STUB ISpPhoneticAlphabetConverter_UPS2SAPI_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetConverter_GetMaxConvertLength_Proxy( - ISpPhoneticAlphabetConverter* This, - DWORD cSrcLength, - WINBOOL bSAPI2UPS, - DWORD *pcMaxDestLength); -void __RPC_STUB ISpPhoneticAlphabetConverter_GetMaxConvertLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpPhoneticAlphabetConverter_INTERFACE_DEFINED__ */ @@ -7093,27 +6600,28 @@ typedef struct ISpPhoneticAlphabetSelectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpPhoneticAlphabetSelection* This, + ISpPhoneticAlphabetSelection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpPhoneticAlphabetSelection* This); + ISpPhoneticAlphabetSelection *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpPhoneticAlphabetSelection* This); + ISpPhoneticAlphabetSelection *This); /*** ISpPhoneticAlphabetSelection methods ***/ HRESULT (STDMETHODCALLTYPE *IsAlphabetUPS)( - ISpPhoneticAlphabetSelection* This, + ISpPhoneticAlphabetSelection *This, WINBOOL *pfIsUPS); HRESULT (STDMETHODCALLTYPE *SetAlphabetToUPS)( - ISpPhoneticAlphabetSelection* This, + ISpPhoneticAlphabetSelection *This, WINBOOL fForceUPS); END_INTERFACE } ISpPhoneticAlphabetSelectionVtbl; + interface ISpPhoneticAlphabetSelection { CONST_VTBL ISpPhoneticAlphabetSelectionVtbl* lpVtbl; }; @@ -7150,22 +6658,6 @@ static FORCEINLINE HRESULT ISpPhoneticAlphabetSelection_SetAlphabetToUPS(ISpPhon #endif -HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetSelection_IsAlphabetUPS_Proxy( - ISpPhoneticAlphabetSelection* This, - WINBOOL *pfIsUPS); -void __RPC_STUB ISpPhoneticAlphabetSelection_IsAlphabetUPS_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetSelection_SetAlphabetToUPS_Proxy( - ISpPhoneticAlphabetSelection* This, - WINBOOL fForceUPS); -void __RPC_STUB ISpPhoneticAlphabetSelection_SetAlphabetToUPS_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpPhoneticAlphabetSelection_INTERFACE_DEFINED__ */ @@ -7334,173 +6826,173 @@ typedef struct ISpVoiceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpVoice* This, + ISpVoice *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpVoice* This); + ISpVoice *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpVoice* This); + ISpVoice *This); /*** ISpNotifySource methods ***/ HRESULT (STDMETHODCALLTYPE *SetNotifySink)( - ISpVoice* This, + ISpVoice *This, ISpNotifySink *pNotifySink); HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)( - ISpVoice* This, + ISpVoice *This, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)( - ISpVoice* This, + ISpVoice *This, SPNOTIFYCALLBACK *pfnCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)( - ISpVoice* This, + ISpVoice *This, ISpNotifyCallback *pSpCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)( - ISpVoice* This); + ISpVoice *This); HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)( - ISpVoice* This, + ISpVoice *This, DWORD dwMilliseconds); HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)( - ISpVoice* This); + ISpVoice *This); /*** ISpEventSource methods ***/ HRESULT (STDMETHODCALLTYPE *SetInterest)( - ISpVoice* This, + ISpVoice *This, ULONGLONG ullEventInterest, ULONGLONG ullQueuedInterest); HRESULT (STDMETHODCALLTYPE *GetEvents)( - ISpVoice* This, + ISpVoice *This, ULONG ulCount, SPEVENT *pEventArray, ULONG *pulFetched); HRESULT (STDMETHODCALLTYPE *GetInfo)( - ISpVoice* This, + ISpVoice *This, SPEVENTSOURCEINFO *pInfo); /*** ISpVoice methods ***/ HRESULT (STDMETHODCALLTYPE *SetOutput)( - ISpVoice* This, + ISpVoice *This, IUnknown *pUnkOutput, WINBOOL fAllowFormatChanges); HRESULT (STDMETHODCALLTYPE *GetOutputObjectToken)( - ISpVoice* This, + ISpVoice *This, ISpObjectToken **ppObjectToken); HRESULT (STDMETHODCALLTYPE *GetOutputStream)( - ISpVoice* This, + ISpVoice *This, ISpStreamFormat **ppStream); HRESULT (STDMETHODCALLTYPE *Pause)( - ISpVoice* This); + ISpVoice *This); HRESULT (STDMETHODCALLTYPE *Resume)( - ISpVoice* This); + ISpVoice *This); HRESULT (STDMETHODCALLTYPE *SetVoice)( - ISpVoice* This, + ISpVoice *This, ISpObjectToken *pToken); HRESULT (STDMETHODCALLTYPE *GetVoice)( - ISpVoice* This, + ISpVoice *This, ISpObjectToken **ppToken); HRESULT (STDMETHODCALLTYPE *Speak)( - ISpVoice* This, + ISpVoice *This, LPCWSTR pwcs, DWORD dwFlags, ULONG *pulStreamNumber); HRESULT (STDMETHODCALLTYPE *SpeakStream)( - ISpVoice* This, + ISpVoice *This, IStream *pStream, DWORD dwFlags, ULONG *pulStreamNumber); HRESULT (STDMETHODCALLTYPE *GetStatus)( - ISpVoice* This, + ISpVoice *This, SPVOICESTATUS *pStatus, LPWSTR *ppszLastBookmark); HRESULT (STDMETHODCALLTYPE *Skip)( - ISpVoice* This, + ISpVoice *This, LPCWSTR pItemType, LONG lNumItems, ULONG *pulNumSkipped); HRESULT (STDMETHODCALLTYPE *SetPriority)( - ISpVoice* This, + ISpVoice *This, SPVPRIORITY ePriority); HRESULT (STDMETHODCALLTYPE *GetPriority)( - ISpVoice* This, + ISpVoice *This, SPVPRIORITY *pePriority); HRESULT (STDMETHODCALLTYPE *SetAlertBoundary)( - ISpVoice* This, + ISpVoice *This, SPEVENTENUM eBoundary); HRESULT (STDMETHODCALLTYPE *GetAlertBoundary)( - ISpVoice* This, + ISpVoice *This, SPEVENTENUM *peBoundary); HRESULT (STDMETHODCALLTYPE *SetRate)( - ISpVoice* This, + ISpVoice *This, LONG RateAdjust); HRESULT (STDMETHODCALLTYPE *GetRate)( - ISpVoice* This, + ISpVoice *This, LONG *pRateAdjust); HRESULT (STDMETHODCALLTYPE *SetVolume)( - ISpVoice* This, + ISpVoice *This, USHORT usVolume); HRESULT (STDMETHODCALLTYPE *GetVolume)( - ISpVoice* This, + ISpVoice *This, USHORT *pusVolume); HRESULT (STDMETHODCALLTYPE *WaitUntilDone)( - ISpVoice* This, + ISpVoice *This, ULONG msTimeout); HRESULT (STDMETHODCALLTYPE *SetSyncSpeakTimeout)( - ISpVoice* This, + ISpVoice *This, ULONG msTimeout); HRESULT (STDMETHODCALLTYPE *GetSyncSpeakTimeout)( - ISpVoice* This, + ISpVoice *This, ULONG *pmsTimeout); HANDLE (STDMETHODCALLTYPE *SpeakCompleteEvent)( - ISpVoice* This); + ISpVoice *This); HRESULT (STDMETHODCALLTYPE *IsUISupported)( - ISpVoice* This, + ISpVoice *This, LPCWSTR pszTypeOfUI, void *pvExtraData, ULONG cbExtraData, WINBOOL *pfSupported); HRESULT (STDMETHODCALLTYPE *DisplayUI)( - ISpVoice* This, + ISpVoice *This, HWND hwndParent, LPCWSTR pszTitle, LPCWSTR pszTypeOfUI, @@ -7509,6 +7001,7 @@ typedef struct ISpVoiceVtbl { END_INTERFACE } ISpVoiceVtbl; + interface ISpVoice { CONST_VTBL ISpVoiceVtbl* lpVtbl; }; @@ -7681,188 +7174,6 @@ static FORCEINLINE HRESULT ISpVoice_DisplayUI(ISpVoice* This,HWND hwndParent,LPC #endif -HRESULT STDMETHODCALLTYPE ISpVoice_SetOutput_Proxy( - ISpVoice* This, - IUnknown *pUnkOutput, - WINBOOL fAllowFormatChanges); -void __RPC_STUB ISpVoice_SetOutput_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetOutputObjectToken_Proxy( - ISpVoice* This, - ISpObjectToken **ppObjectToken); -void __RPC_STUB ISpVoice_GetOutputObjectToken_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetOutputStream_Proxy( - ISpVoice* This, - ISpStreamFormat **ppStream); -void __RPC_STUB ISpVoice_GetOutputStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_Pause_Proxy( - ISpVoice* This); -void __RPC_STUB ISpVoice_Pause_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_Resume_Proxy( - ISpVoice* This); -void __RPC_STUB ISpVoice_Resume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_SetVoice_Proxy( - ISpVoice* This, - ISpObjectToken *pToken); -void __RPC_STUB ISpVoice_SetVoice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetVoice_Proxy( - ISpVoice* This, - ISpObjectToken **ppToken); -void __RPC_STUB ISpVoice_GetVoice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_Speak_Proxy( - ISpVoice* This, - LPCWSTR pwcs, - DWORD dwFlags, - ULONG *pulStreamNumber); -void __RPC_STUB ISpVoice_Speak_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_SpeakStream_Proxy( - ISpVoice* This, - IStream *pStream, - DWORD dwFlags, - ULONG *pulStreamNumber); -void __RPC_STUB ISpVoice_SpeakStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetStatus_Proxy( - ISpVoice* This, - SPVOICESTATUS *pStatus, - LPWSTR *ppszLastBookmark); -void __RPC_STUB ISpVoice_GetStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_Skip_Proxy( - ISpVoice* This, - LPCWSTR pItemType, - LONG lNumItems, - ULONG *pulNumSkipped); -void __RPC_STUB ISpVoice_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_SetPriority_Proxy( - ISpVoice* This, - SPVPRIORITY ePriority); -void __RPC_STUB ISpVoice_SetPriority_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetPriority_Proxy( - ISpVoice* This, - SPVPRIORITY *pePriority); -void __RPC_STUB ISpVoice_GetPriority_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_SetAlertBoundary_Proxy( - ISpVoice* This, - SPEVENTENUM eBoundary); -void __RPC_STUB ISpVoice_SetAlertBoundary_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetAlertBoundary_Proxy( - ISpVoice* This, - SPEVENTENUM *peBoundary); -void __RPC_STUB ISpVoice_GetAlertBoundary_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_SetRate_Proxy( - ISpVoice* This, - LONG RateAdjust); -void __RPC_STUB ISpVoice_SetRate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetRate_Proxy( - ISpVoice* This, - LONG *pRateAdjust); -void __RPC_STUB ISpVoice_GetRate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_SetVolume_Proxy( - ISpVoice* This, - USHORT usVolume); -void __RPC_STUB ISpVoice_SetVolume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetVolume_Proxy( - ISpVoice* This, - USHORT *pusVolume); -void __RPC_STUB ISpVoice_GetVolume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_WaitUntilDone_Proxy( - ISpVoice* This, - ULONG msTimeout); -void __RPC_STUB ISpVoice_WaitUntilDone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_SetSyncSpeakTimeout_Proxy( - ISpVoice* This, - ULONG msTimeout); -void __RPC_STUB ISpVoice_SetSyncSpeakTimeout_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpVoice_GetSyncSpeakTimeout_Proxy( - ISpVoice* This, - ULONG *pmsTimeout); -void __RPC_STUB ISpVoice_GetSyncSpeakTimeout_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpVoice_INTERFACE_DEFINED__ */ @@ -7903,27 +7214,27 @@ typedef struct ISpPhraseVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpPhrase* This, + ISpPhrase *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpPhrase* This); + ISpPhrase *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpPhrase* This); + ISpPhrase *This); /*** ISpPhrase methods ***/ HRESULT (STDMETHODCALLTYPE *GetPhrase)( - ISpPhrase* This, + ISpPhrase *This, SPPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)( - ISpPhrase* This, + ISpPhrase *This, SPSERIALIZEDPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetText)( - ISpPhrase* This, + ISpPhrase *This, ULONG ulStart, ULONG ulCount, WINBOOL fUseTextReplacements, @@ -7931,11 +7242,12 @@ typedef struct ISpPhraseVtbl { BYTE *pbDisplayAttributes); HRESULT (STDMETHODCALLTYPE *Discard)( - ISpPhrase* This, + ISpPhrase *This, DWORD dwValueTypes); END_INTERFACE } ISpPhraseVtbl; + interface ISpPhrase { CONST_VTBL ISpPhraseVtbl* lpVtbl; }; @@ -7980,42 +7292,6 @@ static FORCEINLINE HRESULT ISpPhrase_Discard(ISpPhrase* This,DWORD dwValueTypes) #endif -HRESULT STDMETHODCALLTYPE ISpPhrase_GetPhrase_Proxy( - ISpPhrase* This, - SPPHRASE **ppCoMemPhrase); -void __RPC_STUB ISpPhrase_GetPhrase_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhrase_GetSerializedPhrase_Proxy( - ISpPhrase* This, - SPSERIALIZEDPHRASE **ppCoMemPhrase); -void __RPC_STUB ISpPhrase_GetSerializedPhrase_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhrase_GetText_Proxy( - ISpPhrase* This, - ULONG ulStart, - ULONG ulCount, - WINBOOL fUseTextReplacements, - LPWSTR *ppszCoMemText, - BYTE *pbDisplayAttributes); -void __RPC_STUB ISpPhrase_GetText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhrase_Discard_Proxy( - ISpPhrase* This, - DWORD dwValueTypes); -void __RPC_STUB ISpPhrase_Discard_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpPhrase_INTERFACE_DEFINED__ */ @@ -8049,27 +7325,27 @@ typedef struct ISpPhraseAltVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpPhraseAlt* This, + ISpPhraseAlt *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpPhraseAlt* This); + ISpPhraseAlt *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpPhraseAlt* This); + ISpPhraseAlt *This); /*** ISpPhrase methods ***/ HRESULT (STDMETHODCALLTYPE *GetPhrase)( - ISpPhraseAlt* This, + ISpPhraseAlt *This, SPPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)( - ISpPhraseAlt* This, + ISpPhraseAlt *This, SPSERIALIZEDPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetText)( - ISpPhraseAlt* This, + ISpPhraseAlt *This, ULONG ulStart, ULONG ulCount, WINBOOL fUseTextReplacements, @@ -8077,22 +7353,23 @@ typedef struct ISpPhraseAltVtbl { BYTE *pbDisplayAttributes); HRESULT (STDMETHODCALLTYPE *Discard)( - ISpPhraseAlt* This, + ISpPhraseAlt *This, DWORD dwValueTypes); /*** ISpPhraseAlt methods ***/ HRESULT (STDMETHODCALLTYPE *GetAltInfo)( - ISpPhraseAlt* This, + ISpPhraseAlt *This, ISpPhrase **ppParent, ULONG *pulStartElementInParent, ULONG *pcElementsInParent, ULONG *pcElementsInAlt); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpPhraseAlt* This); + ISpPhraseAlt *This); END_INTERFACE } ISpPhraseAltVtbl; + interface ISpPhraseAlt { CONST_VTBL ISpPhraseAltVtbl* lpVtbl; }; @@ -8147,24 +7424,6 @@ static FORCEINLINE HRESULT ISpPhraseAlt_Commit(ISpPhraseAlt* This) { #endif -HRESULT STDMETHODCALLTYPE ISpPhraseAlt_GetAltInfo_Proxy( - ISpPhraseAlt* This, - ISpPhrase **ppParent, - ULONG *pulStartElementInParent, - ULONG *pcElementsInParent, - ULONG *pcElementsInAlt); -void __RPC_STUB ISpPhraseAlt_GetAltInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhraseAlt_Commit_Proxy( - ISpPhraseAlt* This); -void __RPC_STUB ISpPhraseAlt_Commit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpPhraseAlt_INTERFACE_DEFINED__ */ @@ -8205,27 +7464,27 @@ typedef struct ISpPhrase2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpPhrase2* This, + ISpPhrase2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpPhrase2* This); + ISpPhrase2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpPhrase2* This); + ISpPhrase2 *This); /*** ISpPhrase methods ***/ HRESULT (STDMETHODCALLTYPE *GetPhrase)( - ISpPhrase2* This, + ISpPhrase2 *This, SPPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)( - ISpPhrase2* This, + ISpPhrase2 *This, SPSERIALIZEDPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetText)( - ISpPhrase2* This, + ISpPhrase2 *This, ULONG ulStart, ULONG ulCount, WINBOOL fUseTextReplacements, @@ -8233,27 +7492,28 @@ typedef struct ISpPhrase2Vtbl { BYTE *pbDisplayAttributes); HRESULT (STDMETHODCALLTYPE *Discard)( - ISpPhrase2* This, + ISpPhrase2 *This, DWORD dwValueTypes); /*** ISpPhrase2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetXMLResult)( - ISpPhrase2* This, + ISpPhrase2 *This, LPWSTR *ppszCoMemXMLResult, SPXMLRESULTOPTIONS Options); HRESULT (STDMETHODCALLTYPE *GetXMLErrorInfo)( - ISpPhrase2* This, + ISpPhrase2 *This, SPSEMANTICERRORINFO *pSemanticErrorInfo); HRESULT (STDMETHODCALLTYPE *GetAudio)( - ISpPhrase2* This, + ISpPhrase2 *This, ULONG ulStartElement, ULONG cElements, ISpStreamFormat **ppStream); END_INTERFACE } ISpPhrase2Vtbl; + interface ISpPhrase2 { CONST_VTBL ISpPhrase2Vtbl* lpVtbl; }; @@ -8312,33 +7572,6 @@ static FORCEINLINE HRESULT ISpPhrase2_GetAudio(ISpPhrase2* This,ULONG ulStartEle #endif -HRESULT STDMETHODCALLTYPE ISpPhrase2_GetXMLResult_Proxy( - ISpPhrase2* This, - LPWSTR *ppszCoMemXMLResult, - SPXMLRESULTOPTIONS Options); -void __RPC_STUB ISpPhrase2_GetXMLResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhrase2_GetXMLErrorInfo_Proxy( - ISpPhrase2* This, - SPSEMANTICERRORINFO *pSemanticErrorInfo); -void __RPC_STUB ISpPhrase2_GetXMLErrorInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpPhrase2_GetAudio_Proxy( - ISpPhrase2* This, - ULONG ulStartElement, - ULONG cElements, - ISpStreamFormat **ppStream); -void __RPC_STUB ISpPhrase2_GetAudio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpPhrase2_INTERFACE_DEFINED__ */ @@ -8403,27 +7636,27 @@ typedef struct ISpRecoResultVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRecoResult* This, + ISpRecoResult *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRecoResult* This); + ISpRecoResult *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRecoResult* This); + ISpRecoResult *This); /*** ISpPhrase methods ***/ HRESULT (STDMETHODCALLTYPE *GetPhrase)( - ISpRecoResult* This, + ISpRecoResult *This, SPPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)( - ISpRecoResult* This, + ISpRecoResult *This, SPSERIALIZEDPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetText)( - ISpRecoResult* This, + ISpRecoResult *This, ULONG ulStart, ULONG ulCount, WINBOOL fUseTextReplacements, @@ -8431,16 +7664,16 @@ typedef struct ISpRecoResultVtbl { BYTE *pbDisplayAttributes); HRESULT (STDMETHODCALLTYPE *Discard)( - ISpRecoResult* This, + ISpRecoResult *This, DWORD dwValueTypes); /*** ISpRecoResult methods ***/ HRESULT (STDMETHODCALLTYPE *GetResultTimes)( - ISpRecoResult* This, + ISpRecoResult *This, SPRECORESULTTIMES *pTimes); HRESULT (STDMETHODCALLTYPE *GetAlternates)( - ISpRecoResult* This, + ISpRecoResult *This, ULONG ulStartElement, ULONG cElements, ULONG ulRequestCount, @@ -8448,33 +7681,34 @@ typedef struct ISpRecoResultVtbl { ULONG *pcPhrasesReturned); HRESULT (STDMETHODCALLTYPE *GetAudio)( - ISpRecoResult* This, + ISpRecoResult *This, ULONG ulStartElement, ULONG cElements, ISpStreamFormat **ppStream); HRESULT (STDMETHODCALLTYPE *SpeakAudio)( - ISpRecoResult* This, + ISpRecoResult *This, ULONG ulStartElement, ULONG cElements, DWORD dwFlags, ULONG *pulStreamNumber); HRESULT (STDMETHODCALLTYPE *Serialize)( - ISpRecoResult* This, + ISpRecoResult *This, SPSERIALIZEDRESULT **ppCoMemSerializedResult); HRESULT (STDMETHODCALLTYPE *ScaleAudio)( - ISpRecoResult* This, + ISpRecoResult *This, const GUID *pAudioFormatId, const WAVEFORMATEX *pWaveFormatEx); HRESULT (STDMETHODCALLTYPE *GetRecoContext)( - ISpRecoResult* This, + ISpRecoResult *This, ISpRecoContext **ppRecoContext); END_INTERFACE } ISpRecoResultVtbl; + interface ISpRecoResult { CONST_VTBL ISpRecoResultVtbl* lpVtbl; }; @@ -8549,72 +7783,6 @@ static FORCEINLINE HRESULT ISpRecoResult_GetRecoContext(ISpRecoResult* This,ISpR #endif -HRESULT STDMETHODCALLTYPE ISpRecoResult_GetResultTimes_Proxy( - ISpRecoResult* This, - SPRECORESULTTIMES *pTimes); -void __RPC_STUB ISpRecoResult_GetResultTimes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoResult_GetAlternates_Proxy( - ISpRecoResult* This, - ULONG ulStartElement, - ULONG cElements, - ULONG ulRequestCount, - ISpPhraseAlt **ppPhrases, - ULONG *pcPhrasesReturned); -void __RPC_STUB ISpRecoResult_GetAlternates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoResult_GetAudio_Proxy( - ISpRecoResult* This, - ULONG ulStartElement, - ULONG cElements, - ISpStreamFormat **ppStream); -void __RPC_STUB ISpRecoResult_GetAudio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoResult_SpeakAudio_Proxy( - ISpRecoResult* This, - ULONG ulStartElement, - ULONG cElements, - DWORD dwFlags, - ULONG *pulStreamNumber); -void __RPC_STUB ISpRecoResult_SpeakAudio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoResult_Serialize_Proxy( - ISpRecoResult* This, - SPSERIALIZEDRESULT **ppCoMemSerializedResult); -void __RPC_STUB ISpRecoResult_Serialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoResult_ScaleAudio_Proxy( - ISpRecoResult* This, - const GUID *pAudioFormatId, - const WAVEFORMATEX *pWaveFormatEx); -void __RPC_STUB ISpRecoResult_ScaleAudio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoResult_GetRecoContext_Proxy( - ISpRecoResult* This, - ISpRecoContext **ppRecoContext); -void __RPC_STUB ISpRecoResult_GetRecoContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpRecoResult_INTERFACE_DEFINED__ */ @@ -8658,27 +7826,27 @@ typedef struct ISpRecoResult2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRecoResult2* This, + ISpRecoResult2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRecoResult2* This); + ISpRecoResult2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRecoResult2* This); + ISpRecoResult2 *This); /*** ISpPhrase methods ***/ HRESULT (STDMETHODCALLTYPE *GetPhrase)( - ISpRecoResult2* This, + ISpRecoResult2 *This, SPPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)( - ISpRecoResult2* This, + ISpRecoResult2 *This, SPSERIALIZEDPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetText)( - ISpRecoResult2* This, + ISpRecoResult2 *This, ULONG ulStart, ULONG ulCount, WINBOOL fUseTextReplacements, @@ -8686,16 +7854,16 @@ typedef struct ISpRecoResult2Vtbl { BYTE *pbDisplayAttributes); HRESULT (STDMETHODCALLTYPE *Discard)( - ISpRecoResult2* This, + ISpRecoResult2 *This, DWORD dwValueTypes); /*** ISpRecoResult methods ***/ HRESULT (STDMETHODCALLTYPE *GetResultTimes)( - ISpRecoResult2* This, + ISpRecoResult2 *This, SPRECORESULTTIMES *pTimes); HRESULT (STDMETHODCALLTYPE *GetAlternates)( - ISpRecoResult2* This, + ISpRecoResult2 *This, ULONG ulStartElement, ULONG cElements, ULONG ulRequestCount, @@ -8703,51 +7871,52 @@ typedef struct ISpRecoResult2Vtbl { ULONG *pcPhrasesReturned); HRESULT (STDMETHODCALLTYPE *GetAudio)( - ISpRecoResult2* This, + ISpRecoResult2 *This, ULONG ulStartElement, ULONG cElements, ISpStreamFormat **ppStream); HRESULT (STDMETHODCALLTYPE *SpeakAudio)( - ISpRecoResult2* This, + ISpRecoResult2 *This, ULONG ulStartElement, ULONG cElements, DWORD dwFlags, ULONG *pulStreamNumber); HRESULT (STDMETHODCALLTYPE *Serialize)( - ISpRecoResult2* This, + ISpRecoResult2 *This, SPSERIALIZEDRESULT **ppCoMemSerializedResult); HRESULT (STDMETHODCALLTYPE *ScaleAudio)( - ISpRecoResult2* This, + ISpRecoResult2 *This, const GUID *pAudioFormatId, const WAVEFORMATEX *pWaveFormatEx); HRESULT (STDMETHODCALLTYPE *GetRecoContext)( - ISpRecoResult2* This, + ISpRecoResult2 *This, ISpRecoContext **ppRecoContext); /*** ISpRecoResult2 methods ***/ HRESULT (STDMETHODCALLTYPE *CommitAlternate)( - ISpRecoResult2* This, + ISpRecoResult2 *This, ISpPhraseAlt *pPhraseAlt, ISpRecoResult **ppNewResult); HRESULT (STDMETHODCALLTYPE *CommitText)( - ISpRecoResult2* This, + ISpRecoResult2 *This, ULONG ulStartElement, ULONG cElements, LPCWSTR pszCorrectedData, DWORD eCommitFlags); HRESULT (STDMETHODCALLTYPE *SetTextFeedback)( - ISpRecoResult2* This, + ISpRecoResult2 *This, LPCWSTR pszFeedback, WINBOOL fSuccessful); END_INTERFACE } ISpRecoResult2Vtbl; + interface ISpRecoResult2 { CONST_VTBL ISpRecoResult2Vtbl* lpVtbl; }; @@ -8836,35 +8005,6 @@ static FORCEINLINE HRESULT ISpRecoResult2_SetTextFeedback(ISpRecoResult2* This,L #endif -HRESULT STDMETHODCALLTYPE ISpRecoResult2_CommitAlternate_Proxy( - ISpRecoResult2* This, - ISpPhraseAlt *pPhraseAlt, - ISpRecoResult **ppNewResult); -void __RPC_STUB ISpRecoResult2_CommitAlternate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoResult2_CommitText_Proxy( - ISpRecoResult2* This, - ULONG ulStartElement, - ULONG cElements, - LPCWSTR pszCorrectedData, - DWORD eCommitFlags); -void __RPC_STUB ISpRecoResult2_CommitText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoResult2_SetTextFeedback_Proxy( - ISpRecoResult2* This, - LPCWSTR pszFeedback, - WINBOOL fSuccessful); -void __RPC_STUB ISpRecoResult2_SetTextFeedback_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpRecoResult2_INTERFACE_DEFINED__ */ @@ -8896,27 +8036,27 @@ typedef struct ISpXMLRecoResultVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpXMLRecoResult* This); + ISpXMLRecoResult *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpXMLRecoResult* This); + ISpXMLRecoResult *This); /*** ISpPhrase methods ***/ HRESULT (STDMETHODCALLTYPE *GetPhrase)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, SPPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, SPSERIALIZEDPHRASE **ppCoMemPhrase); HRESULT (STDMETHODCALLTYPE *GetText)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, ULONG ulStart, ULONG ulCount, WINBOOL fUseTextReplacements, @@ -8924,16 +8064,16 @@ typedef struct ISpXMLRecoResultVtbl { BYTE *pbDisplayAttributes); HRESULT (STDMETHODCALLTYPE *Discard)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, DWORD dwValueTypes); /*** ISpRecoResult methods ***/ HRESULT (STDMETHODCALLTYPE *GetResultTimes)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, SPRECORESULTTIMES *pTimes); HRESULT (STDMETHODCALLTYPE *GetAlternates)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, ULONG ulStartElement, ULONG cElements, ULONG ulRequestCount, @@ -8941,43 +8081,44 @@ typedef struct ISpXMLRecoResultVtbl { ULONG *pcPhrasesReturned); HRESULT (STDMETHODCALLTYPE *GetAudio)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, ULONG ulStartElement, ULONG cElements, ISpStreamFormat **ppStream); HRESULT (STDMETHODCALLTYPE *SpeakAudio)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, ULONG ulStartElement, ULONG cElements, DWORD dwFlags, ULONG *pulStreamNumber); HRESULT (STDMETHODCALLTYPE *Serialize)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, SPSERIALIZEDRESULT **ppCoMemSerializedResult); HRESULT (STDMETHODCALLTYPE *ScaleAudio)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, const GUID *pAudioFormatId, const WAVEFORMATEX *pWaveFormatEx); HRESULT (STDMETHODCALLTYPE *GetRecoContext)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, ISpRecoContext **ppRecoContext); /*** ISpXMLRecoResult methods ***/ HRESULT (STDMETHODCALLTYPE *GetXMLResult)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, LPWSTR *ppszCoMemXMLResult, SPXMLRESULTOPTIONS Options); HRESULT (STDMETHODCALLTYPE *GetXMLErrorInfo)( - ISpXMLRecoResult* This, + ISpXMLRecoResult *This, SPSEMANTICERRORINFO *pSemanticErrorInfo); END_INTERFACE } ISpXMLRecoResultVtbl; + interface ISpXMLRecoResult { CONST_VTBL ISpXMLRecoResultVtbl* lpVtbl; }; @@ -9062,23 +8203,6 @@ static FORCEINLINE HRESULT ISpXMLRecoResult_GetXMLErrorInfo(ISpXMLRecoResult* Th #endif -HRESULT STDMETHODCALLTYPE ISpXMLRecoResult_GetXMLResult_Proxy( - ISpXMLRecoResult* This, - LPWSTR *ppszCoMemXMLResult, - SPXMLRESULTOPTIONS Options); -void __RPC_STUB ISpXMLRecoResult_GetXMLResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpXMLRecoResult_GetXMLErrorInfo_Proxy( - ISpXMLRecoResult* This, - SPSEMANTICERRORINFO *pSemanticErrorInfo); -void __RPC_STUB ISpXMLRecoResult_GetXMLErrorInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpXMLRecoResult_INTERFACE_DEFINED__ */ @@ -9200,23 +8324,23 @@ typedef struct ISpGrammarBuilderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpGrammarBuilder* This); + ISpGrammarBuilder *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpGrammarBuilder* This); + ISpGrammarBuilder *This); /*** ISpGrammarBuilder methods ***/ HRESULT (STDMETHODCALLTYPE *ResetGrammar)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, WORD NewLanguage); HRESULT (STDMETHODCALLTYPE *GetRule)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, LPCWSTR pszRuleName, DWORD dwRuleId, DWORD dwAttributes, @@ -9224,16 +8348,16 @@ typedef struct ISpGrammarBuilderVtbl { SPSTATEHANDLE *phInitialState); HRESULT (STDMETHODCALLTYPE *ClearRule)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, SPSTATEHANDLE hState); HRESULT (STDMETHODCALLTYPE *CreateNewState)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, SPSTATEHANDLE hState, SPSTATEHANDLE *phState); HRESULT (STDMETHODCALLTYPE *AddWordTransition)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, SPSTATEHANDLE hFromState, SPSTATEHANDLE hToState, LPCWSTR psz, @@ -9243,7 +8367,7 @@ typedef struct ISpGrammarBuilderVtbl { const SPPROPERTYINFO *pPropInfo); HRESULT (STDMETHODCALLTYPE *AddRuleTransition)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, SPSTATEHANDLE hFromState, SPSTATEHANDLE hToState, SPSTATEHANDLE hRule, @@ -9251,17 +8375,18 @@ typedef struct ISpGrammarBuilderVtbl { const SPPROPERTYINFO *pPropInfo); HRESULT (STDMETHODCALLTYPE *AddResource)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, SPSTATEHANDLE hRuleState, LPCWSTR pszResourceName, LPCWSTR pszResourceValue); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpGrammarBuilder* This, + ISpGrammarBuilder *This, DWORD dwReserved); END_INTERFACE } ISpGrammarBuilderVtbl; + interface ISpGrammarBuilder { CONST_VTBL ISpGrammarBuilderVtbl* lpVtbl; }; @@ -9322,87 +8447,6 @@ static FORCEINLINE HRESULT ISpGrammarBuilder_Commit(ISpGrammarBuilder* This,DWOR #endif -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_ResetGrammar_Proxy( - ISpGrammarBuilder* This, - WORD NewLanguage); -void __RPC_STUB ISpGrammarBuilder_ResetGrammar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_GetRule_Proxy( - ISpGrammarBuilder* This, - LPCWSTR pszRuleName, - DWORD dwRuleId, - DWORD dwAttributes, - WINBOOL fCreateIfNotExist, - SPSTATEHANDLE *phInitialState); -void __RPC_STUB ISpGrammarBuilder_GetRule_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_ClearRule_Proxy( - ISpGrammarBuilder* This, - SPSTATEHANDLE hState); -void __RPC_STUB ISpGrammarBuilder_ClearRule_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_CreateNewState_Proxy( - ISpGrammarBuilder* This, - SPSTATEHANDLE hState, - SPSTATEHANDLE *phState); -void __RPC_STUB ISpGrammarBuilder_CreateNewState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_AddWordTransition_Proxy( - ISpGrammarBuilder* This, - SPSTATEHANDLE hFromState, - SPSTATEHANDLE hToState, - LPCWSTR psz, - LPCWSTR pszSeparators, - SPGRAMMARWORDTYPE eWordType, - float Weight, - const SPPROPERTYINFO *pPropInfo); -void __RPC_STUB ISpGrammarBuilder_AddWordTransition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_AddRuleTransition_Proxy( - ISpGrammarBuilder* This, - SPSTATEHANDLE hFromState, - SPSTATEHANDLE hToState, - SPSTATEHANDLE hRule, - float Weight, - const SPPROPERTYINFO *pPropInfo); -void __RPC_STUB ISpGrammarBuilder_AddRuleTransition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_AddResource_Proxy( - ISpGrammarBuilder* This, - SPSTATEHANDLE hRuleState, - LPCWSTR pszResourceName, - LPCWSTR pszResourceValue); -void __RPC_STUB ISpGrammarBuilder_AddResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_Commit_Proxy( - ISpGrammarBuilder* This, - DWORD dwReserved); -void __RPC_STUB ISpGrammarBuilder_Commit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpGrammarBuilder_INTERFACE_DEFINED__ */ @@ -9505,23 +8549,23 @@ typedef struct ISpRecoGrammarVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRecoGrammar* This); + ISpRecoGrammar *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRecoGrammar* This); + ISpRecoGrammar *This); /*** ISpGrammarBuilder methods ***/ HRESULT (STDMETHODCALLTYPE *ResetGrammar)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, WORD NewLanguage); HRESULT (STDMETHODCALLTYPE *GetRule)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, LPCWSTR pszRuleName, DWORD dwRuleId, DWORD dwAttributes, @@ -9529,16 +8573,16 @@ typedef struct ISpRecoGrammarVtbl { SPSTATEHANDLE *phInitialState); HRESULT (STDMETHODCALLTYPE *ClearRule)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, SPSTATEHANDLE hState); HRESULT (STDMETHODCALLTYPE *CreateNewState)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, SPSTATEHANDLE hState, SPSTATEHANDLE *phState); HRESULT (STDMETHODCALLTYPE *AddWordTransition)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, SPSTATEHANDLE hFromState, SPSTATEHANDLE hToState, LPCWSTR psz, @@ -9548,7 +8592,7 @@ typedef struct ISpRecoGrammarVtbl { const SPPROPERTYINFO *pPropInfo); HRESULT (STDMETHODCALLTYPE *AddRuleTransition)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, SPSTATEHANDLE hFromState, SPSTATEHANDLE hToState, SPSTATEHANDLE hRule, @@ -9556,37 +8600,37 @@ typedef struct ISpRecoGrammarVtbl { const SPPROPERTYINFO *pPropInfo); HRESULT (STDMETHODCALLTYPE *AddResource)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, SPSTATEHANDLE hRuleState, LPCWSTR pszResourceName, LPCWSTR pszResourceValue); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, DWORD dwReserved); /*** ISpRecoGrammar methods ***/ HRESULT (STDMETHODCALLTYPE *GetGrammarId)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, ULONGLONG *pullGrammarId); HRESULT (STDMETHODCALLTYPE *GetRecoContext)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, ISpRecoContext **ppRecoCtxt); HRESULT (STDMETHODCALLTYPE *LoadCmdFromFile)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, LPCWSTR pszFileName, SPLOADOPTIONS Options); HRESULT (STDMETHODCALLTYPE *LoadCmdFromObject)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, REFCLSID rcid, LPCWSTR pszGrammarName, SPLOADOPTIONS Options); HRESULT (STDMETHODCALLTYPE *LoadCmdFromResource)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, HMODULE hModule, LPCWSTR pszResourceName, LPCWSTR pszResourceType, @@ -9594,12 +8638,12 @@ typedef struct ISpRecoGrammarVtbl { SPLOADOPTIONS Options); HRESULT (STDMETHODCALLTYPE *LoadCmdFromMemory)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, const SPBINARYGRAMMAR *pGrammar, SPLOADOPTIONS Options); HRESULT (STDMETHODCALLTYPE *LoadCmdFromProprietaryGrammar)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, REFGUID rguidParam, LPCWSTR pszStringParam, const void *pvDataPrarm, @@ -9607,58 +8651,59 @@ typedef struct ISpRecoGrammarVtbl { SPLOADOPTIONS Options); HRESULT (STDMETHODCALLTYPE *SetRuleState)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, LPCWSTR pszName, void *pReserved, SPRULESTATE NewState); HRESULT (STDMETHODCALLTYPE *SetRuleIdState)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, ULONG ulRuleId, SPRULESTATE NewState); HRESULT (STDMETHODCALLTYPE *LoadDictation)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, LPCWSTR pszTopicName, SPLOADOPTIONS Options); HRESULT (STDMETHODCALLTYPE *UnloadDictation)( - ISpRecoGrammar* This); + ISpRecoGrammar *This); HRESULT (STDMETHODCALLTYPE *SetDictationState)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, SPRULESTATE NewState); HRESULT (STDMETHODCALLTYPE *SetWordSequenceData)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, const WCHAR *pText, ULONG cchText, const SPTEXTSELECTIONINFO *pInfo); HRESULT (STDMETHODCALLTYPE *SetTextSelection)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, const SPTEXTSELECTIONINFO *pInfo); HRESULT (STDMETHODCALLTYPE *IsPronounceable)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, LPCWSTR pszWord, SPWORDPRONOUNCEABLE *pWordPronounceable); HRESULT (STDMETHODCALLTYPE *SetGrammarState)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, SPGRAMMARSTATE eGrammarState); HRESULT (STDMETHODCALLTYPE *SaveCmd)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, IStream *pStream, LPWSTR *ppszCoMemErrorText); HRESULT (STDMETHODCALLTYPE *GetGrammarState)( - ISpRecoGrammar* This, + ISpRecoGrammar *This, SPGRAMMARSTATE *peGrammarState); END_INTERFACE } ISpRecoGrammarVtbl; + interface ISpRecoGrammar { CONST_VTBL ISpRecoGrammarVtbl* lpVtbl; }; @@ -9793,169 +8838,6 @@ static FORCEINLINE HRESULT ISpRecoGrammar_GetGrammarState(ISpRecoGrammar* This,S #endif -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_GetGrammarId_Proxy( - ISpRecoGrammar* This, - ULONGLONG *pullGrammarId); -void __RPC_STUB ISpRecoGrammar_GetGrammarId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_GetRecoContext_Proxy( - ISpRecoGrammar* This, - ISpRecoContext **ppRecoCtxt); -void __RPC_STUB ISpRecoGrammar_GetRecoContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromFile_Proxy( - ISpRecoGrammar* This, - LPCWSTR pszFileName, - SPLOADOPTIONS Options); -void __RPC_STUB ISpRecoGrammar_LoadCmdFromFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromObject_Proxy( - ISpRecoGrammar* This, - REFCLSID rcid, - LPCWSTR pszGrammarName, - SPLOADOPTIONS Options); -void __RPC_STUB ISpRecoGrammar_LoadCmdFromObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromResource_Proxy( - ISpRecoGrammar* This, - HMODULE hModule, - LPCWSTR pszResourceName, - LPCWSTR pszResourceType, - WORD wLanguage, - SPLOADOPTIONS Options); -void __RPC_STUB ISpRecoGrammar_LoadCmdFromResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromMemory_Proxy( - ISpRecoGrammar* This, - const SPBINARYGRAMMAR *pGrammar, - SPLOADOPTIONS Options); -void __RPC_STUB ISpRecoGrammar_LoadCmdFromMemory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromProprietaryGrammar_Proxy( - ISpRecoGrammar* This, - REFGUID rguidParam, - LPCWSTR pszStringParam, - const void *pvDataPrarm, - ULONG cbDataSize, - SPLOADOPTIONS Options); -void __RPC_STUB ISpRecoGrammar_LoadCmdFromProprietaryGrammar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetRuleState_Proxy( - ISpRecoGrammar* This, - LPCWSTR pszName, - void *pReserved, - SPRULESTATE NewState); -void __RPC_STUB ISpRecoGrammar_SetRuleState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetRuleIdState_Proxy( - ISpRecoGrammar* This, - ULONG ulRuleId, - SPRULESTATE NewState); -void __RPC_STUB ISpRecoGrammar_SetRuleIdState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadDictation_Proxy( - ISpRecoGrammar* This, - LPCWSTR pszTopicName, - SPLOADOPTIONS Options); -void __RPC_STUB ISpRecoGrammar_LoadDictation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_UnloadDictation_Proxy( - ISpRecoGrammar* This); -void __RPC_STUB ISpRecoGrammar_UnloadDictation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetDictationState_Proxy( - ISpRecoGrammar* This, - SPRULESTATE NewState); -void __RPC_STUB ISpRecoGrammar_SetDictationState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetWordSequenceData_Proxy( - ISpRecoGrammar* This, - const WCHAR *pText, - ULONG cchText, - const SPTEXTSELECTIONINFO *pInfo); -void __RPC_STUB ISpRecoGrammar_SetWordSequenceData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetTextSelection_Proxy( - ISpRecoGrammar* This, - const SPTEXTSELECTIONINFO *pInfo); -void __RPC_STUB ISpRecoGrammar_SetTextSelection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_IsPronounceable_Proxy( - ISpRecoGrammar* This, - LPCWSTR pszWord, - SPWORDPRONOUNCEABLE *pWordPronounceable); -void __RPC_STUB ISpRecoGrammar_IsPronounceable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetGrammarState_Proxy( - ISpRecoGrammar* This, - SPGRAMMARSTATE eGrammarState); -void __RPC_STUB ISpRecoGrammar_SetGrammarState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SaveCmd_Proxy( - ISpRecoGrammar* This, - IStream *pStream, - LPWSTR *ppszCoMemErrorText); -void __RPC_STUB ISpRecoGrammar_SaveCmd_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar_GetGrammarState_Proxy( - ISpRecoGrammar* This, - SPGRAMMARSTATE *peGrammarState); -void __RPC_STUB ISpRecoGrammar_GetGrammarState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpRecoGrammar_INTERFACE_DEFINED__ */ @@ -10001,30 +8883,31 @@ typedef struct ISpGrammarBuilder2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpGrammarBuilder2* This, + ISpGrammarBuilder2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpGrammarBuilder2* This); + ISpGrammarBuilder2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpGrammarBuilder2* This); + ISpGrammarBuilder2 *This); /*** ISpGrammarBuilder2 methods ***/ HRESULT (STDMETHODCALLTYPE *AddTextSubset)( - ISpGrammarBuilder2* This, + ISpGrammarBuilder2 *This, SPSTATEHANDLE hFromState, SPSTATEHANDLE hToState, LPCWSTR psz, SPMATCHINGMODE eMatchMode); HRESULT (STDMETHODCALLTYPE *SetPhoneticAlphabet)( - ISpGrammarBuilder2* This, + ISpGrammarBuilder2 *This, PHONETICALPHABET phoneticALphabet); END_INTERFACE } ISpGrammarBuilder2Vtbl; + interface ISpGrammarBuilder2 { CONST_VTBL ISpGrammarBuilder2Vtbl* lpVtbl; }; @@ -10061,25 +8944,6 @@ static FORCEINLINE HRESULT ISpGrammarBuilder2_SetPhoneticAlphabet(ISpGrammarBuil #endif -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder2_AddTextSubset_Proxy( - ISpGrammarBuilder2* This, - SPSTATEHANDLE hFromState, - SPSTATEHANDLE hToState, - LPCWSTR psz, - SPMATCHINGMODE eMatchMode); -void __RPC_STUB ISpGrammarBuilder2_AddTextSubset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpGrammarBuilder2_SetPhoneticAlphabet_Proxy( - ISpGrammarBuilder2* This, - PHONETICALPHABET phoneticALphabet); -void __RPC_STUB ISpGrammarBuilder2_SetPhoneticAlphabet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpGrammarBuilder2_INTERFACE_DEFINED__ */ @@ -10140,62 +9004,63 @@ typedef struct ISpRecoGrammar2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRecoGrammar2* This, + ISpRecoGrammar2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRecoGrammar2* This); + ISpRecoGrammar2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRecoGrammar2* This); + ISpRecoGrammar2 *This); /*** ISpRecoGrammar2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetRules)( - ISpRecoGrammar2* This, + ISpRecoGrammar2 *This, SPRULE **ppCoMemRules, UINT *puNumRules); HRESULT (STDMETHODCALLTYPE *LoadCmdFromFile2)( - ISpRecoGrammar2* This, + ISpRecoGrammar2 *This, LPCWSTR pszFileName, SPLOADOPTIONS Options, LPCWSTR pszSharingUri, LPCWSTR pszBaseUri); HRESULT (STDMETHODCALLTYPE *LoadCmdFromMemory2)( - ISpRecoGrammar2* This, + ISpRecoGrammar2 *This, const SPBINARYGRAMMAR *pGrammar, SPLOADOPTIONS Options, LPCWSTR pszSharingUri, LPCWSTR pszBaseUri); HRESULT (STDMETHODCALLTYPE *SetRulePriority)( - ISpRecoGrammar2* This, + ISpRecoGrammar2 *This, LPCWSTR pszRuleName, ULONG ulRuleId, int nRulePriority); HRESULT (STDMETHODCALLTYPE *SetRuleWeight)( - ISpRecoGrammar2* This, + ISpRecoGrammar2 *This, LPCWSTR pszRuleName, ULONG ulRuleId, float flWeight); HRESULT (STDMETHODCALLTYPE *SetDictationWeight)( - ISpRecoGrammar2* This, + ISpRecoGrammar2 *This, float flWeight); HRESULT (STDMETHODCALLTYPE *SetGrammarLoader)( - ISpRecoGrammar2* This, + ISpRecoGrammar2 *This, ISpeechResourceLoader *pLoader); HRESULT (STDMETHODCALLTYPE *SetSMLSecurityManager)( - ISpRecoGrammar2* This, + ISpRecoGrammar2 *This, IInternetSecurityManager *pSMLSecurityManager); END_INTERFACE } ISpRecoGrammar2Vtbl; + interface ISpRecoGrammar2 { CONST_VTBL ISpRecoGrammar2Vtbl* lpVtbl; }; @@ -10256,81 +9121,6 @@ static FORCEINLINE HRESULT ISpRecoGrammar2_SetSMLSecurityManager(ISpRecoGrammar2 #endif -HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_GetRules_Proxy( - ISpRecoGrammar2* This, - SPRULE **ppCoMemRules, - UINT *puNumRules); -void __RPC_STUB ISpRecoGrammar2_GetRules_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_LoadCmdFromFile2_Proxy( - ISpRecoGrammar2* This, - LPCWSTR pszFileName, - SPLOADOPTIONS Options, - LPCWSTR pszSharingUri, - LPCWSTR pszBaseUri); -void __RPC_STUB ISpRecoGrammar2_LoadCmdFromFile2_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_LoadCmdFromMemory2_Proxy( - ISpRecoGrammar2* This, - const SPBINARYGRAMMAR *pGrammar, - SPLOADOPTIONS Options, - LPCWSTR pszSharingUri, - LPCWSTR pszBaseUri); -void __RPC_STUB ISpRecoGrammar2_LoadCmdFromMemory2_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_SetRulePriority_Proxy( - ISpRecoGrammar2* This, - LPCWSTR pszRuleName, - ULONG ulRuleId, - int nRulePriority); -void __RPC_STUB ISpRecoGrammar2_SetRulePriority_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_SetRuleWeight_Proxy( - ISpRecoGrammar2* This, - LPCWSTR pszRuleName, - ULONG ulRuleId, - float flWeight); -void __RPC_STUB ISpRecoGrammar2_SetRuleWeight_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_SetDictationWeight_Proxy( - ISpRecoGrammar2* This, - float flWeight); -void __RPC_STUB ISpRecoGrammar2_SetDictationWeight_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_SetGrammarLoader_Proxy( - ISpRecoGrammar2* This, - ISpeechResourceLoader *pLoader); -void __RPC_STUB ISpRecoGrammar2_SetGrammarLoader_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_SetSMLSecurityManager_Proxy( - ISpRecoGrammar2* This, - IInternetSecurityManager *pSMLSecurityManager); -void __RPC_STUB ISpRecoGrammar2_SetSMLSecurityManager_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpRecoGrammar2_INTERFACE_DEFINED__ */ @@ -10372,29 +9162,29 @@ typedef struct ISpeechResourceLoaderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechResourceLoader* This, + ISpeechResourceLoader *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechResourceLoader* This); + ISpeechResourceLoader *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechResourceLoader* This); + ISpeechResourceLoader *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechResourceLoader* This, + ISpeechResourceLoader *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechResourceLoader* This, + ISpeechResourceLoader *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechResourceLoader* This, + ISpeechResourceLoader *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -10402,7 +9192,7 @@ typedef struct ISpeechResourceLoaderVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechResourceLoader* This, + ISpeechResourceLoader *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -10414,7 +9204,7 @@ typedef struct ISpeechResourceLoaderVtbl { /*** ISpeechResourceLoader methods ***/ HRESULT (STDMETHODCALLTYPE *LoadResource)( - ISpeechResourceLoader* This, + ISpeechResourceLoader *This, BSTR bstrResourceUri, VARIANT_BOOL fAlwaysReload, IUnknown **pStream, @@ -10423,18 +9213,19 @@ typedef struct ISpeechResourceLoaderVtbl { BSTR *pbstrRedirectUrl); HRESULT (STDMETHODCALLTYPE *GetLocalCopy)( - ISpeechResourceLoader* This, + ISpeechResourceLoader *This, BSTR bstrResourceUri, BSTR *pbstrLocalPath, BSTR *pbstrMIMEType, BSTR *pbstrRedirectUrl); HRESULT (STDMETHODCALLTYPE *ReleaseLocalCopy)( - ISpeechResourceLoader* This, + ISpeechResourceLoader *This, BSTR pbstrLocalPath); END_INTERFACE } ISpeechResourceLoaderVtbl; + interface ISpeechResourceLoader { CONST_VTBL ISpeechResourceLoaderVtbl* lpVtbl; }; @@ -10493,38 +9284,6 @@ static FORCEINLINE HRESULT ISpeechResourceLoader_ReleaseLocalCopy(ISpeechResourc #endif -HRESULT STDMETHODCALLTYPE ISpeechResourceLoader_LoadResource_Proxy( - ISpeechResourceLoader* This, - BSTR bstrResourceUri, - VARIANT_BOOL fAlwaysReload, - IUnknown **pStream, - BSTR *pbstrMIMEType, - VARIANT_BOOL *pfModified, - BSTR *pbstrRedirectUrl); -void __RPC_STUB ISpeechResourceLoader_LoadResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechResourceLoader_GetLocalCopy_Proxy( - ISpeechResourceLoader* This, - BSTR bstrResourceUri, - BSTR *pbstrLocalPath, - BSTR *pbstrMIMEType, - BSTR *pbstrRedirectUrl); -void __RPC_STUB ISpeechResourceLoader_GetLocalCopy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechResourceLoader_ReleaseLocalCopy_Proxy( - ISpeechResourceLoader* This, - BSTR pbstrLocalPath); -void __RPC_STUB ISpeechResourceLoader_ReleaseLocalCopy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechResourceLoader_INTERFACE_DEFINED__ */ @@ -10629,151 +9388,152 @@ typedef struct ISpRecoContextVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRecoContext* This, + ISpRecoContext *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRecoContext* This); + ISpRecoContext *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRecoContext* This); + ISpRecoContext *This); /*** ISpNotifySource methods ***/ HRESULT (STDMETHODCALLTYPE *SetNotifySink)( - ISpRecoContext* This, + ISpRecoContext *This, ISpNotifySink *pNotifySink); HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)( - ISpRecoContext* This, + ISpRecoContext *This, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)( - ISpRecoContext* This, + ISpRecoContext *This, SPNOTIFYCALLBACK *pfnCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)( - ISpRecoContext* This, + ISpRecoContext *This, ISpNotifyCallback *pSpCallback, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)( - ISpRecoContext* This); + ISpRecoContext *This); HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)( - ISpRecoContext* This, + ISpRecoContext *This, DWORD dwMilliseconds); HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)( - ISpRecoContext* This); + ISpRecoContext *This); /*** ISpEventSource methods ***/ HRESULT (STDMETHODCALLTYPE *SetInterest)( - ISpRecoContext* This, + ISpRecoContext *This, ULONGLONG ullEventInterest, ULONGLONG ullQueuedInterest); HRESULT (STDMETHODCALLTYPE *GetEvents)( - ISpRecoContext* This, + ISpRecoContext *This, ULONG ulCount, SPEVENT *pEventArray, ULONG *pulFetched); HRESULT (STDMETHODCALLTYPE *GetInfo)( - ISpRecoContext* This, + ISpRecoContext *This, SPEVENTSOURCEINFO *pInfo); /*** ISpRecoContext methods ***/ HRESULT (STDMETHODCALLTYPE *GetRecognizer)( - ISpRecoContext* This, + ISpRecoContext *This, ISpRecognizer **ppRecognizer); HRESULT (STDMETHODCALLTYPE *CreateGrammar)( - ISpRecoContext* This, + ISpRecoContext *This, ULONGLONG ullGrammarId, ISpRecoGrammar **ppGrammar); HRESULT (STDMETHODCALLTYPE *GetStatus)( - ISpRecoContext* This, + ISpRecoContext *This, SPRECOCONTEXTSTATUS *pStatus); HRESULT (STDMETHODCALLTYPE *GetMaxAlternates)( - ISpRecoContext* This, + ISpRecoContext *This, ULONG *pcAlternates); HRESULT (STDMETHODCALLTYPE *SetMaxAlternates)( - ISpRecoContext* This, + ISpRecoContext *This, ULONG cAlternates); HRESULT (STDMETHODCALLTYPE *SetAudioOptions)( - ISpRecoContext* This, + ISpRecoContext *This, SPAUDIOOPTIONS Options, const GUID *pAudioFormatId, const WAVEFORMATEX *pWaveFormatEx); HRESULT (STDMETHODCALLTYPE *GetAudioOptions)( - ISpRecoContext* This, + ISpRecoContext *This, SPAUDIOOPTIONS *pOptions, GUID *pAudioFormatId, WAVEFORMATEX **ppCoMemWFEX); HRESULT (STDMETHODCALLTYPE *DeserializeResult)( - ISpRecoContext* This, + ISpRecoContext *This, const SPSERIALIZEDRESULT *pSerializedResult, ISpRecoResult **ppResult); HRESULT (STDMETHODCALLTYPE *Bookmark)( - ISpRecoContext* This, + ISpRecoContext *This, SPBOOKMARKOPTIONS Options, ULONGLONG ullStreamPosition, LPARAM lparamEvent); HRESULT (STDMETHODCALLTYPE *SetAdaptationData)( - ISpRecoContext* This, + ISpRecoContext *This, LPCWSTR pAdaptationData, const ULONG cch); HRESULT (STDMETHODCALLTYPE *Pause)( - ISpRecoContext* This, + ISpRecoContext *This, DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *Resume)( - ISpRecoContext* This, + ISpRecoContext *This, DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *SetVoice)( - ISpRecoContext* This, + ISpRecoContext *This, ISpVoice *pVoice, WINBOOL fAllowFormatChanges); HRESULT (STDMETHODCALLTYPE *GetVoice)( - ISpRecoContext* This, + ISpRecoContext *This, ISpVoice **ppVoice); HRESULT (STDMETHODCALLTYPE *SetVoicePurgeEvent)( - ISpRecoContext* This, + ISpRecoContext *This, ULONGLONG ullEventInterest); HRESULT (STDMETHODCALLTYPE *GetVoicePurgeEvent)( - ISpRecoContext* This, + ISpRecoContext *This, ULONGLONG *pullEventInterest); HRESULT (STDMETHODCALLTYPE *SetContextState)( - ISpRecoContext* This, + ISpRecoContext *This, SPCONTEXTSTATE eContextState); HRESULT (STDMETHODCALLTYPE *GetContextState)( - ISpRecoContext* This, + ISpRecoContext *This, SPCONTEXTSTATE *peContextState); END_INTERFACE } ISpRecoContextVtbl; + interface ISpRecoContext { CONST_VTBL ISpRecoContextVtbl* lpVtbl; }; @@ -10918,160 +9678,6 @@ static FORCEINLINE HRESULT ISpRecoContext_GetContextState(ISpRecoContext* This,S #endif -HRESULT STDMETHODCALLTYPE ISpRecoContext_GetRecognizer_Proxy( - ISpRecoContext* This, - ISpRecognizer **ppRecognizer); -void __RPC_STUB ISpRecoContext_GetRecognizer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_CreateGrammar_Proxy( - ISpRecoContext* This, - ULONGLONG ullGrammarId, - ISpRecoGrammar **ppGrammar); -void __RPC_STUB ISpRecoContext_CreateGrammar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_GetStatus_Proxy( - ISpRecoContext* This, - SPRECOCONTEXTSTATUS *pStatus); -void __RPC_STUB ISpRecoContext_GetStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_GetMaxAlternates_Proxy( - ISpRecoContext* This, - ULONG *pcAlternates); -void __RPC_STUB ISpRecoContext_GetMaxAlternates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_SetMaxAlternates_Proxy( - ISpRecoContext* This, - ULONG cAlternates); -void __RPC_STUB ISpRecoContext_SetMaxAlternates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_SetAudioOptions_Proxy( - ISpRecoContext* This, - SPAUDIOOPTIONS Options, - const GUID *pAudioFormatId, - const WAVEFORMATEX *pWaveFormatEx); -void __RPC_STUB ISpRecoContext_SetAudioOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_GetAudioOptions_Proxy( - ISpRecoContext* This, - SPAUDIOOPTIONS *pOptions, - GUID *pAudioFormatId, - WAVEFORMATEX **ppCoMemWFEX); -void __RPC_STUB ISpRecoContext_GetAudioOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_DeserializeResult_Proxy( - ISpRecoContext* This, - const SPSERIALIZEDRESULT *pSerializedResult, - ISpRecoResult **ppResult); -void __RPC_STUB ISpRecoContext_DeserializeResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_Bookmark_Proxy( - ISpRecoContext* This, - SPBOOKMARKOPTIONS Options, - ULONGLONG ullStreamPosition, - LPARAM lparamEvent); -void __RPC_STUB ISpRecoContext_Bookmark_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_SetAdaptationData_Proxy( - ISpRecoContext* This, - LPCWSTR pAdaptationData, - const ULONG cch); -void __RPC_STUB ISpRecoContext_SetAdaptationData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_Pause_Proxy( - ISpRecoContext* This, - DWORD dwReserved); -void __RPC_STUB ISpRecoContext_Pause_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_Resume_Proxy( - ISpRecoContext* This, - DWORD dwReserved); -void __RPC_STUB ISpRecoContext_Resume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_SetVoice_Proxy( - ISpRecoContext* This, - ISpVoice *pVoice, - WINBOOL fAllowFormatChanges); -void __RPC_STUB ISpRecoContext_SetVoice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_GetVoice_Proxy( - ISpRecoContext* This, - ISpVoice **ppVoice); -void __RPC_STUB ISpRecoContext_GetVoice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_SetVoicePurgeEvent_Proxy( - ISpRecoContext* This, - ULONGLONG ullEventInterest); -void __RPC_STUB ISpRecoContext_SetVoicePurgeEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_GetVoicePurgeEvent_Proxy( - ISpRecoContext* This, - ULONGLONG *pullEventInterest); -void __RPC_STUB ISpRecoContext_GetVoicePurgeEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_SetContextState_Proxy( - ISpRecoContext* This, - SPCONTEXTSTATE eContextState); -void __RPC_STUB ISpRecoContext_SetContextState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext_GetContextState_Proxy( - ISpRecoContext* This, - SPCONTEXTSTATE *peContextState); -void __RPC_STUB ISpRecoContext_GetContextState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpRecoContext_INTERFACE_DEFINED__ */ @@ -11138,27 +9744,27 @@ typedef struct ISpRecoContext2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRecoContext2* This, + ISpRecoContext2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRecoContext2* This); + ISpRecoContext2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRecoContext2* This); + ISpRecoContext2 *This); /*** ISpRecoContext2 methods ***/ HRESULT (STDMETHODCALLTYPE *SetGrammarOptions)( - ISpRecoContext2* This, + ISpRecoContext2 *This, DWORD eGrammarOptions); HRESULT (STDMETHODCALLTYPE *GetGrammarOptions)( - ISpRecoContext2* This, + ISpRecoContext2 *This, DWORD *peGrammarOptions); HRESULT (STDMETHODCALLTYPE *SetAdaptationData2)( - ISpRecoContext2* This, + ISpRecoContext2 *This, LPCWSTR pAdaptationData, const ULONG cch, LPCWSTR pTopicName, @@ -11167,6 +9773,7 @@ typedef struct ISpRecoContext2Vtbl { END_INTERFACE } ISpRecoContext2Vtbl; + interface ISpRecoContext2 { CONST_VTBL ISpRecoContext2Vtbl* lpVtbl; }; @@ -11207,34 +9814,6 @@ static FORCEINLINE HRESULT ISpRecoContext2_SetAdaptationData2(ISpRecoContext2* T #endif -HRESULT STDMETHODCALLTYPE ISpRecoContext2_SetGrammarOptions_Proxy( - ISpRecoContext2* This, - DWORD eGrammarOptions); -void __RPC_STUB ISpRecoContext2_SetGrammarOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext2_GetGrammarOptions_Proxy( - ISpRecoContext2* This, - DWORD *peGrammarOptions); -void __RPC_STUB ISpRecoContext2_GetGrammarOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecoContext2_SetAdaptationData2_Proxy( - ISpRecoContext2* This, - LPCWSTR pAdaptationData, - const ULONG cch, - LPCWSTR pTopicName, - DWORD eAdaptationSettings, - SPADAPTATIONRELEVANCE eRelevance); -void __RPC_STUB ISpRecoContext2_SetAdaptationData2_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpRecoContext2_INTERFACE_DEFINED__ */ @@ -11275,39 +9854,40 @@ typedef struct ISpPropertiesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpProperties* This, + ISpProperties *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpProperties* This); + ISpProperties *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpProperties* This); + ISpProperties *This); /*** ISpProperties methods ***/ HRESULT (STDMETHODCALLTYPE *SetPropertyNum)( - ISpProperties* This, + ISpProperties *This, LPCWSTR pName, LONG lValue); HRESULT (STDMETHODCALLTYPE *GetPropertyNum)( - ISpProperties* This, + ISpProperties *This, LPCWSTR pName, LONG *plValue); HRESULT (STDMETHODCALLTYPE *SetPropertyString)( - ISpProperties* This, + ISpProperties *This, LPCWSTR pName, LPCWSTR pValue); HRESULT (STDMETHODCALLTYPE *GetPropertyString)( - ISpProperties* This, + ISpProperties *This, LPCWSTR pName, LPWSTR *ppCoMemValue); END_INTERFACE } ISpPropertiesVtbl; + interface ISpProperties { CONST_VTBL ISpPropertiesVtbl* lpVtbl; }; @@ -11352,42 +9932,6 @@ static FORCEINLINE HRESULT ISpProperties_GetPropertyString(ISpProperties* This,L #endif -HRESULT STDMETHODCALLTYPE ISpProperties_SetPropertyNum_Proxy( - ISpProperties* This, - LPCWSTR pName, - LONG lValue); -void __RPC_STUB ISpProperties_SetPropertyNum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpProperties_GetPropertyNum_Proxy( - ISpProperties* This, - LPCWSTR pName, - LONG *plValue); -void __RPC_STUB ISpProperties_GetPropertyNum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpProperties_SetPropertyString_Proxy( - ISpProperties* This, - LPCWSTR pName, - LPCWSTR pValue); -void __RPC_STUB ISpProperties_SetPropertyString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpProperties_GetPropertyString_Proxy( - ISpProperties* This, - LPCWSTR pName, - LPWSTR *ppCoMemValue); -void __RPC_STUB ISpProperties_GetPropertyString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpProperties_INTERFACE_DEFINED__ */ @@ -11500,101 +10044,101 @@ typedef struct ISpRecognizerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRecognizer* This, + ISpRecognizer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRecognizer* This); + ISpRecognizer *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRecognizer* This); + ISpRecognizer *This); /*** ISpProperties methods ***/ HRESULT (STDMETHODCALLTYPE *SetPropertyNum)( - ISpRecognizer* This, + ISpRecognizer *This, LPCWSTR pName, LONG lValue); HRESULT (STDMETHODCALLTYPE *GetPropertyNum)( - ISpRecognizer* This, + ISpRecognizer *This, LPCWSTR pName, LONG *plValue); HRESULT (STDMETHODCALLTYPE *SetPropertyString)( - ISpRecognizer* This, + ISpRecognizer *This, LPCWSTR pName, LPCWSTR pValue); HRESULT (STDMETHODCALLTYPE *GetPropertyString)( - ISpRecognizer* This, + ISpRecognizer *This, LPCWSTR pName, LPWSTR *ppCoMemValue); /*** ISpRecognizer methods ***/ HRESULT (STDMETHODCALLTYPE *SetRecognizer)( - ISpRecognizer* This, + ISpRecognizer *This, ISpObjectToken *pRecognizer); HRESULT (STDMETHODCALLTYPE *GetRecognizer)( - ISpRecognizer* This, + ISpRecognizer *This, ISpObjectToken **ppRecognizer); HRESULT (STDMETHODCALLTYPE *SetInput)( - ISpRecognizer* This, + ISpRecognizer *This, IUnknown *pUnkInput, WINBOOL fAllowFormatChanges); HRESULT (STDMETHODCALLTYPE *GetInputObjectToken)( - ISpRecognizer* This, + ISpRecognizer *This, ISpObjectToken **ppToken); HRESULT (STDMETHODCALLTYPE *GetInputStream)( - ISpRecognizer* This, + ISpRecognizer *This, ISpStreamFormat **ppStream); HRESULT (STDMETHODCALLTYPE *CreateRecoContext)( - ISpRecognizer* This, + ISpRecognizer *This, ISpRecoContext **ppNewCtxt); HRESULT (STDMETHODCALLTYPE *GetRecoProfile)( - ISpRecognizer* This, + ISpRecognizer *This, ISpObjectToken **ppToken); HRESULT (STDMETHODCALLTYPE *SetRecoProfile)( - ISpRecognizer* This, + ISpRecognizer *This, ISpObjectToken *pToken); HRESULT (STDMETHODCALLTYPE *IsSharedInstance)( - ISpRecognizer* This); + ISpRecognizer *This); HRESULT (STDMETHODCALLTYPE *GetRecoState)( - ISpRecognizer* This, + ISpRecognizer *This, SPRECOSTATE *pState); HRESULT (STDMETHODCALLTYPE *SetRecoState)( - ISpRecognizer* This, + ISpRecognizer *This, SPRECOSTATE NewState); HRESULT (STDMETHODCALLTYPE *GetStatus)( - ISpRecognizer* This, + ISpRecognizer *This, SPRECOGNIZERSTATUS *pStatus); HRESULT (STDMETHODCALLTYPE *GetFormat)( - ISpRecognizer* This, + ISpRecognizer *This, SPSTREAMFORMATTYPE WaveFormatType, GUID *pFormatId, WAVEFORMATEX **ppCoMemWFEX); HRESULT (STDMETHODCALLTYPE *IsUISupported)( - ISpRecognizer* This, + ISpRecognizer *This, LPCWSTR pszTypeOfUI, void *pvExtraData, ULONG cbExtraData, WINBOOL *pfSupported); HRESULT (STDMETHODCALLTYPE *DisplayUI)( - ISpRecognizer* This, + ISpRecognizer *This, HWND hwndParent, LPCWSTR pszTitle, LPCWSTR pszTypeOfUI, @@ -11602,11 +10146,12 @@ typedef struct ISpRecognizerVtbl { ULONG cbExtraData); HRESULT (STDMETHODCALLTYPE *EmulateRecognition)( - ISpRecognizer* This, + ISpRecognizer *This, ISpPhrase *pPhrase); END_INTERFACE } ISpRecognizerVtbl; + interface ISpRecognizer { CONST_VTBL ISpRecognizerVtbl* lpVtbl; }; @@ -11717,120 +10262,6 @@ static FORCEINLINE HRESULT ISpRecognizer_EmulateRecognition(ISpRecognizer* This, #endif -HRESULT STDMETHODCALLTYPE ISpRecognizer_SetRecognizer_Proxy( - ISpRecognizer* This, - ISpObjectToken *pRecognizer); -void __RPC_STUB ISpRecognizer_SetRecognizer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_GetRecognizer_Proxy( - ISpRecognizer* This, - ISpObjectToken **ppRecognizer); -void __RPC_STUB ISpRecognizer_GetRecognizer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_SetInput_Proxy( - ISpRecognizer* This, - IUnknown *pUnkInput, - WINBOOL fAllowFormatChanges); -void __RPC_STUB ISpRecognizer_SetInput_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_GetInputObjectToken_Proxy( - ISpRecognizer* This, - ISpObjectToken **ppToken); -void __RPC_STUB ISpRecognizer_GetInputObjectToken_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_GetInputStream_Proxy( - ISpRecognizer* This, - ISpStreamFormat **ppStream); -void __RPC_STUB ISpRecognizer_GetInputStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_CreateRecoContext_Proxy( - ISpRecognizer* This, - ISpRecoContext **ppNewCtxt); -void __RPC_STUB ISpRecognizer_CreateRecoContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_GetRecoProfile_Proxy( - ISpRecognizer* This, - ISpObjectToken **ppToken); -void __RPC_STUB ISpRecognizer_GetRecoProfile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_SetRecoProfile_Proxy( - ISpRecognizer* This, - ISpObjectToken *pToken); -void __RPC_STUB ISpRecognizer_SetRecoProfile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_IsSharedInstance_Proxy( - ISpRecognizer* This); -void __RPC_STUB ISpRecognizer_IsSharedInstance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_GetRecoState_Proxy( - ISpRecognizer* This, - SPRECOSTATE *pState); -void __RPC_STUB ISpRecognizer_GetRecoState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_SetRecoState_Proxy( - ISpRecognizer* This, - SPRECOSTATE NewState); -void __RPC_STUB ISpRecognizer_SetRecoState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_GetStatus_Proxy( - ISpRecognizer* This, - SPRECOGNIZERSTATUS *pStatus); -void __RPC_STUB ISpRecognizer_GetStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_GetFormat_Proxy( - ISpRecognizer* This, - SPSTREAMFORMATTYPE WaveFormatType, - GUID *pFormatId, - WAVEFORMATEX **ppCoMemWFEX); -void __RPC_STUB ISpRecognizer_GetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer_EmulateRecognition_Proxy( - ISpRecognizer* This, - ISpPhrase *pPhrase); -void __RPC_STUB ISpRecognizer_EmulateRecognition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpRecognizer_INTERFACE_DEFINED__ */ @@ -11865,31 +10296,32 @@ typedef struct ISpSerializeStateVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpSerializeState* This, + ISpSerializeState *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpSerializeState* This); + ISpSerializeState *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpSerializeState* This); + ISpSerializeState *This); /*** ISpSerializeState methods ***/ HRESULT (STDMETHODCALLTYPE *GetSerializedState)( - ISpSerializeState* This, + ISpSerializeState *This, BYTE **ppbData, ULONG *pulSize, DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *SetSerializedState)( - ISpSerializeState* This, + ISpSerializeState *This, BYTE *pbData, ULONG ulSize, DWORD dwReserved); END_INTERFACE } ISpSerializeStateVtbl; + interface ISpSerializeState { CONST_VTBL ISpSerializeStateVtbl* lpVtbl; }; @@ -11926,26 +10358,6 @@ static FORCEINLINE HRESULT ISpSerializeState_SetSerializedState(ISpSerializeStat #endif -HRESULT STDMETHODCALLTYPE ISpSerializeState_GetSerializedState_Proxy( - ISpSerializeState* This, - BYTE **ppbData, - ULONG *pulSize, - DWORD dwReserved); -void __RPC_STUB ISpSerializeState_GetSerializedState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpSerializeState_SetSerializedState_Proxy( - ISpSerializeState* This, - BYTE *pbData, - ULONG ulSize, - DWORD dwReserved); -void __RPC_STUB ISpSerializeState_SetSerializedState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpSerializeState_INTERFACE_DEFINED__ */ @@ -11981,32 +10393,33 @@ typedef struct ISpRecognizer2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRecognizer2* This, + ISpRecognizer2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRecognizer2* This); + ISpRecognizer2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRecognizer2* This); + ISpRecognizer2 *This); /*** ISpRecognizer2 methods ***/ HRESULT (STDMETHODCALLTYPE *EmulateRecognitionEx)( - ISpRecognizer2* This, + ISpRecognizer2 *This, ISpPhrase *pPhrase, DWORD dwCompareFlags); HRESULT (STDMETHODCALLTYPE *SetTrainingState)( - ISpRecognizer2* This, + ISpRecognizer2 *This, WINBOOL fDoingTraining, WINBOOL fAdaptFromTrainingData); HRESULT (STDMETHODCALLTYPE *ResetAcousticModelAdaptation)( - ISpRecognizer2* This); + ISpRecognizer2 *This); END_INTERFACE } ISpRecognizer2Vtbl; + interface ISpRecognizer2 { CONST_VTBL ISpRecognizer2Vtbl* lpVtbl; }; @@ -12047,31 +10460,6 @@ static FORCEINLINE HRESULT ISpRecognizer2_ResetAcousticModelAdaptation(ISpRecogn #endif -HRESULT STDMETHODCALLTYPE ISpRecognizer2_EmulateRecognitionEx_Proxy( - ISpRecognizer2* This, - ISpPhrase *pPhrase, - DWORD dwCompareFlags); -void __RPC_STUB ISpRecognizer2_EmulateRecognitionEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer2_SetTrainingState_Proxy( - ISpRecognizer2* This, - WINBOOL fDoingTraining, - WINBOOL fAdaptFromTrainingData); -void __RPC_STUB ISpRecognizer2_SetTrainingState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer2_ResetAcousticModelAdaptation_Proxy( - ISpRecognizer2* This); -void __RPC_STUB ISpRecognizer2_ResetAcousticModelAdaptation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpRecognizer2_INTERFACE_DEFINED__ */ @@ -12099,23 +10487,24 @@ typedef struct ISpRecoCategoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRecoCategory* This, + ISpRecoCategory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRecoCategory* This); + ISpRecoCategory *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRecoCategory* This); + ISpRecoCategory *This); /*** ISpRecoCategory methods ***/ HRESULT (STDMETHODCALLTYPE *GetType)( - ISpRecoCategory* This, + ISpRecoCategory *This, SPCATEGORYTYPE *peCategoryType); END_INTERFACE } ISpRecoCategoryVtbl; + interface ISpRecoCategory { CONST_VTBL ISpRecoCategoryVtbl* lpVtbl; }; @@ -12148,14 +10537,6 @@ static FORCEINLINE HRESULT ISpRecoCategory_GetType(ISpRecoCategory* This,SPCATEG #endif -HRESULT STDMETHODCALLTYPE ISpRecoCategory_GetType_Proxy( - ISpRecoCategory* This, - SPCATEGORYTYPE *peCategoryType); -void __RPC_STUB ISpRecoCategory_GetType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpRecoCategory_INTERFACE_DEFINED__ */ @@ -12190,32 +10571,33 @@ typedef struct ISpRecognizer3Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpRecognizer3* This, + ISpRecognizer3 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpRecognizer3* This); + ISpRecognizer3 *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpRecognizer3* This); + ISpRecognizer3 *This); /*** ISpRecognizer3 methods ***/ HRESULT (STDMETHODCALLTYPE *GetCategory)( - ISpRecognizer3* This, + ISpRecognizer3 *This, SPCATEGORYTYPE categoryType, ISpRecoCategory **ppCategory); HRESULT (STDMETHODCALLTYPE *SetActiveCategory)( - ISpRecognizer3* This, + ISpRecognizer3 *This, ISpRecoCategory *pCategory); HRESULT (STDMETHODCALLTYPE *GetActiveCategory)( - ISpRecognizer3* This, + ISpRecognizer3 *This, ISpRecoCategory **ppCategory); END_INTERFACE } ISpRecognizer3Vtbl; + interface ISpRecognizer3 { CONST_VTBL ISpRecognizer3Vtbl* lpVtbl; }; @@ -12256,31 +10638,6 @@ static FORCEINLINE HRESULT ISpRecognizer3_GetActiveCategory(ISpRecognizer3* This #endif -HRESULT STDMETHODCALLTYPE ISpRecognizer3_GetCategory_Proxy( - ISpRecognizer3* This, - SPCATEGORYTYPE categoryType, - ISpRecoCategory **ppCategory); -void __RPC_STUB ISpRecognizer3_GetCategory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer3_SetActiveCategory_Proxy( - ISpRecognizer3* This, - ISpRecoCategory *pCategory); -void __RPC_STUB ISpRecognizer3_SetActiveCategory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpRecognizer3_GetActiveCategory_Proxy( - ISpRecognizer3* This, - ISpRecoCategory **ppCategory); -void __RPC_STUB ISpRecognizer3_GetActiveCategory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpRecognizer3_INTERFACE_DEFINED__ */ @@ -12323,19 +10680,19 @@ typedef struct ISpEnginePronunciationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpEnginePronunciation* This, + ISpEnginePronunciation *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpEnginePronunciation* This); + ISpEnginePronunciation *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpEnginePronunciation* This); + ISpEnginePronunciation *This); /*** ISpEnginePronunciation methods ***/ HRESULT (STDMETHODCALLTYPE *Normalize)( - ISpEnginePronunciation* This, + ISpEnginePronunciation *This, LPCWSTR pszWord, LPCWSTR pszLeftContext, LPCWSTR pszRightContext, @@ -12343,7 +10700,7 @@ typedef struct ISpEnginePronunciationVtbl { SPNORMALIZATIONLIST *pNormalizationList); HRESULT (STDMETHODCALLTYPE *GetPronunciations)( - ISpEnginePronunciation* This, + ISpEnginePronunciation *This, LPCWSTR pszWord, LPCWSTR pszLeftContext, LPCWSTR pszRightContext, @@ -12352,6 +10709,7 @@ typedef struct ISpEnginePronunciationVtbl { END_INTERFACE } ISpEnginePronunciationVtbl; + interface ISpEnginePronunciation { CONST_VTBL ISpEnginePronunciationVtbl* lpVtbl; }; @@ -12388,30 +10746,6 @@ static FORCEINLINE HRESULT ISpEnginePronunciation_GetPronunciations(ISpEnginePro #endif -HRESULT STDMETHODCALLTYPE ISpEnginePronunciation_Normalize_Proxy( - ISpEnginePronunciation* This, - LPCWSTR pszWord, - LPCWSTR pszLeftContext, - LPCWSTR pszRightContext, - WORD LangID, - SPNORMALIZATIONLIST *pNormalizationList); -void __RPC_STUB ISpEnginePronunciation_Normalize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpEnginePronunciation_GetPronunciations_Proxy( - ISpEnginePronunciation* This, - LPCWSTR pszWord, - LPCWSTR pszLeftContext, - LPCWSTR pszRightContext, - WORD LangID, - SPWORDPRONUNCIATIONLIST *pEnginePronunciationList); -void __RPC_STUB ISpEnginePronunciation_GetPronunciations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpEnginePronunciation_INTERFACE_DEFINED__ */ @@ -12454,30 +10788,31 @@ typedef struct ISpDisplayAlternatesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpDisplayAlternates* This, + ISpDisplayAlternates *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpDisplayAlternates* This); + ISpDisplayAlternates *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpDisplayAlternates* This); + ISpDisplayAlternates *This); /*** ISpDisplayAlternates methods ***/ HRESULT (STDMETHODCALLTYPE *GetDisplayAlternates)( - ISpDisplayAlternates* This, + ISpDisplayAlternates *This, const SPDISPLAYPHRASE *pPhrase, ULONG cRequestCount, SPDISPLAYPHRASE **ppCoMemPhrases, ULONG *pcPhrasesReturned); HRESULT (STDMETHODCALLTYPE *SetFullStopTrailSpace)( - ISpDisplayAlternates* This, + ISpDisplayAlternates *This, ULONG ulTrailSpace); END_INTERFACE } ISpDisplayAlternatesVtbl; + interface ISpDisplayAlternates { CONST_VTBL ISpDisplayAlternatesVtbl* lpVtbl; }; @@ -12514,25 +10849,6 @@ static FORCEINLINE HRESULT ISpDisplayAlternates_SetFullStopTrailSpace(ISpDisplay #endif -HRESULT STDMETHODCALLTYPE ISpDisplayAlternates_GetDisplayAlternates_Proxy( - ISpDisplayAlternates* This, - const SPDISPLAYPHRASE *pPhrase, - ULONG cRequestCount, - SPDISPLAYPHRASE **ppCoMemPhrases, - ULONG *pcPhrasesReturned); -void __RPC_STUB ISpDisplayAlternates_GetDisplayAlternates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpDisplayAlternates_SetFullStopTrailSpace_Proxy( - ISpDisplayAlternates* This, - ULONG ulTrailSpace); -void __RPC_STUB ISpDisplayAlternates_SetFullStopTrailSpace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpDisplayAlternates_INTERFACE_DEFINED__ */ @@ -12542,236 +10858,377 @@ DEFINE_GUID(LIBID_SpeechLib, 0xc866ca3a, 0x32f7, 0x11d2, 0x96,0x02, 0x00,0xc0,0x #ifndef __ISpeechDataKey_FWD_DEFINED__ #define __ISpeechDataKey_FWD_DEFINED__ typedef interface ISpeechDataKey ISpeechDataKey; +#ifdef __cplusplus +interface ISpeechDataKey; +#endif /* __cplusplus */ #endif #ifndef __ISpeechObjectToken_FWD_DEFINED__ #define __ISpeechObjectToken_FWD_DEFINED__ typedef interface ISpeechObjectToken ISpeechObjectToken; +#ifdef __cplusplus +interface ISpeechObjectToken; +#endif /* __cplusplus */ #endif #ifndef __ISpeechObjectTokens_FWD_DEFINED__ #define __ISpeechObjectTokens_FWD_DEFINED__ typedef interface ISpeechObjectTokens ISpeechObjectTokens; +#ifdef __cplusplus +interface ISpeechObjectTokens; +#endif /* __cplusplus */ #endif #ifndef __ISpeechObjectTokenCategory_FWD_DEFINED__ #define __ISpeechObjectTokenCategory_FWD_DEFINED__ typedef interface ISpeechObjectTokenCategory ISpeechObjectTokenCategory; +#ifdef __cplusplus +interface ISpeechObjectTokenCategory; +#endif /* __cplusplus */ #endif #ifndef __ISpeechAudioBufferInfo_FWD_DEFINED__ #define __ISpeechAudioBufferInfo_FWD_DEFINED__ typedef interface ISpeechAudioBufferInfo ISpeechAudioBufferInfo; +#ifdef __cplusplus +interface ISpeechAudioBufferInfo; +#endif /* __cplusplus */ #endif #ifndef __ISpeechAudioStatus_FWD_DEFINED__ #define __ISpeechAudioStatus_FWD_DEFINED__ typedef interface ISpeechAudioStatus ISpeechAudioStatus; +#ifdef __cplusplus +interface ISpeechAudioStatus; +#endif /* __cplusplus */ #endif #ifndef __ISpeechAudioFormat_FWD_DEFINED__ #define __ISpeechAudioFormat_FWD_DEFINED__ typedef interface ISpeechAudioFormat ISpeechAudioFormat; +#ifdef __cplusplus +interface ISpeechAudioFormat; +#endif /* __cplusplus */ #endif #ifndef __ISpeechWaveFormatEx_FWD_DEFINED__ #define __ISpeechWaveFormatEx_FWD_DEFINED__ typedef interface ISpeechWaveFormatEx ISpeechWaveFormatEx; +#ifdef __cplusplus +interface ISpeechWaveFormatEx; +#endif /* __cplusplus */ #endif #ifndef __ISpeechBaseStream_FWD_DEFINED__ #define __ISpeechBaseStream_FWD_DEFINED__ typedef interface ISpeechBaseStream ISpeechBaseStream; +#ifdef __cplusplus +interface ISpeechBaseStream; +#endif /* __cplusplus */ #endif #ifndef __ISpeechFileStream_FWD_DEFINED__ #define __ISpeechFileStream_FWD_DEFINED__ typedef interface ISpeechFileStream ISpeechFileStream; +#ifdef __cplusplus +interface ISpeechFileStream; +#endif /* __cplusplus */ #endif #ifndef __ISpeechMemoryStream_FWD_DEFINED__ #define __ISpeechMemoryStream_FWD_DEFINED__ typedef interface ISpeechMemoryStream ISpeechMemoryStream; +#ifdef __cplusplus +interface ISpeechMemoryStream; +#endif /* __cplusplus */ #endif #ifndef __ISpeechCustomStream_FWD_DEFINED__ #define __ISpeechCustomStream_FWD_DEFINED__ typedef interface ISpeechCustomStream ISpeechCustomStream; +#ifdef __cplusplus +interface ISpeechCustomStream; +#endif /* __cplusplus */ #endif #ifndef __ISpeechAudio_FWD_DEFINED__ #define __ISpeechAudio_FWD_DEFINED__ typedef interface ISpeechAudio ISpeechAudio; +#ifdef __cplusplus +interface ISpeechAudio; +#endif /* __cplusplus */ #endif #ifndef __ISpeechMMSysAudio_FWD_DEFINED__ #define __ISpeechMMSysAudio_FWD_DEFINED__ typedef interface ISpeechMMSysAudio ISpeechMMSysAudio; +#ifdef __cplusplus +interface ISpeechMMSysAudio; +#endif /* __cplusplus */ #endif #ifndef __ISpeechVoice_FWD_DEFINED__ #define __ISpeechVoice_FWD_DEFINED__ typedef interface ISpeechVoice ISpeechVoice; +#ifdef __cplusplus +interface ISpeechVoice; +#endif /* __cplusplus */ #endif #ifndef __ISpeechVoiceStatus_FWD_DEFINED__ #define __ISpeechVoiceStatus_FWD_DEFINED__ typedef interface ISpeechVoiceStatus ISpeechVoiceStatus; +#ifdef __cplusplus +interface ISpeechVoiceStatus; +#endif /* __cplusplus */ #endif #ifndef ___ISpeechVoiceEvents_FWD_DEFINED__ #define ___ISpeechVoiceEvents_FWD_DEFINED__ typedef interface _ISpeechVoiceEvents _ISpeechVoiceEvents; +#ifdef __cplusplus +interface _ISpeechVoiceEvents; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecognizer_FWD_DEFINED__ #define __ISpeechRecognizer_FWD_DEFINED__ typedef interface ISpeechRecognizer ISpeechRecognizer; +#ifdef __cplusplus +interface ISpeechRecognizer; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecognizerStatus_FWD_DEFINED__ #define __ISpeechRecognizerStatus_FWD_DEFINED__ typedef interface ISpeechRecognizerStatus ISpeechRecognizerStatus; +#ifdef __cplusplus +interface ISpeechRecognizerStatus; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoContext_FWD_DEFINED__ #define __ISpeechRecoContext_FWD_DEFINED__ typedef interface ISpeechRecoContext ISpeechRecoContext; +#ifdef __cplusplus +interface ISpeechRecoContext; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoGrammar_FWD_DEFINED__ #define __ISpeechRecoGrammar_FWD_DEFINED__ typedef interface ISpeechRecoGrammar ISpeechRecoGrammar; +#ifdef __cplusplus +interface ISpeechRecoGrammar; +#endif /* __cplusplus */ #endif #ifndef ___ISpeechRecoContextEvents_FWD_DEFINED__ #define ___ISpeechRecoContextEvents_FWD_DEFINED__ typedef interface _ISpeechRecoContextEvents _ISpeechRecoContextEvents; +#ifdef __cplusplus +interface _ISpeechRecoContextEvents; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRule_FWD_DEFINED__ #define __ISpeechGrammarRule_FWD_DEFINED__ typedef interface ISpeechGrammarRule ISpeechGrammarRule; +#ifdef __cplusplus +interface ISpeechGrammarRule; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRules_FWD_DEFINED__ #define __ISpeechGrammarRules_FWD_DEFINED__ typedef interface ISpeechGrammarRules ISpeechGrammarRules; +#ifdef __cplusplus +interface ISpeechGrammarRules; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRuleState_FWD_DEFINED__ #define __ISpeechGrammarRuleState_FWD_DEFINED__ typedef interface ISpeechGrammarRuleState ISpeechGrammarRuleState; +#ifdef __cplusplus +interface ISpeechGrammarRuleState; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRuleStateTransition_FWD_DEFINED__ #define __ISpeechGrammarRuleStateTransition_FWD_DEFINED__ typedef interface ISpeechGrammarRuleStateTransition ISpeechGrammarRuleStateTransition; +#ifdef __cplusplus +interface ISpeechGrammarRuleStateTransition; +#endif /* __cplusplus */ #endif #ifndef __ISpeechGrammarRuleStateTransitions_FWD_DEFINED__ #define __ISpeechGrammarRuleStateTransitions_FWD_DEFINED__ typedef interface ISpeechGrammarRuleStateTransitions ISpeechGrammarRuleStateTransitions; +#ifdef __cplusplus +interface ISpeechGrammarRuleStateTransitions; +#endif /* __cplusplus */ #endif #ifndef __ISpeechTextSelectionInformation_FWD_DEFINED__ #define __ISpeechTextSelectionInformation_FWD_DEFINED__ typedef interface ISpeechTextSelectionInformation ISpeechTextSelectionInformation; +#ifdef __cplusplus +interface ISpeechTextSelectionInformation; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoResult_FWD_DEFINED__ #define __ISpeechRecoResult_FWD_DEFINED__ typedef interface ISpeechRecoResult ISpeechRecoResult; +#ifdef __cplusplus +interface ISpeechRecoResult; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoResult2_FWD_DEFINED__ #define __ISpeechRecoResult2_FWD_DEFINED__ typedef interface ISpeechRecoResult2 ISpeechRecoResult2; +#ifdef __cplusplus +interface ISpeechRecoResult2; +#endif /* __cplusplus */ #endif #ifndef __ISpeechRecoResultTimes_FWD_DEFINED__ #define __ISpeechRecoResultTimes_FWD_DEFINED__ typedef interface ISpeechRecoResultTimes ISpeechRecoResultTimes; +#ifdef __cplusplus +interface ISpeechRecoResultTimes; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseAlternate_FWD_DEFINED__ #define __ISpeechPhraseAlternate_FWD_DEFINED__ typedef interface ISpeechPhraseAlternate ISpeechPhraseAlternate; +#ifdef __cplusplus +interface ISpeechPhraseAlternate; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseAlternates_FWD_DEFINED__ #define __ISpeechPhraseAlternates_FWD_DEFINED__ typedef interface ISpeechPhraseAlternates ISpeechPhraseAlternates; +#ifdef __cplusplus +interface ISpeechPhraseAlternates; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseInfo_FWD_DEFINED__ #define __ISpeechPhraseInfo_FWD_DEFINED__ typedef interface ISpeechPhraseInfo ISpeechPhraseInfo; +#ifdef __cplusplus +interface ISpeechPhraseInfo; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseElement_FWD_DEFINED__ #define __ISpeechPhraseElement_FWD_DEFINED__ typedef interface ISpeechPhraseElement ISpeechPhraseElement; +#ifdef __cplusplus +interface ISpeechPhraseElement; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseElements_FWD_DEFINED__ #define __ISpeechPhraseElements_FWD_DEFINED__ typedef interface ISpeechPhraseElements ISpeechPhraseElements; +#ifdef __cplusplus +interface ISpeechPhraseElements; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseReplacement_FWD_DEFINED__ #define __ISpeechPhraseReplacement_FWD_DEFINED__ typedef interface ISpeechPhraseReplacement ISpeechPhraseReplacement; +#ifdef __cplusplus +interface ISpeechPhraseReplacement; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseReplacements_FWD_DEFINED__ #define __ISpeechPhraseReplacements_FWD_DEFINED__ typedef interface ISpeechPhraseReplacements ISpeechPhraseReplacements; +#ifdef __cplusplus +interface ISpeechPhraseReplacements; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseProperty_FWD_DEFINED__ #define __ISpeechPhraseProperty_FWD_DEFINED__ typedef interface ISpeechPhraseProperty ISpeechPhraseProperty; +#ifdef __cplusplus +interface ISpeechPhraseProperty; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseProperties_FWD_DEFINED__ #define __ISpeechPhraseProperties_FWD_DEFINED__ typedef interface ISpeechPhraseProperties ISpeechPhraseProperties; +#ifdef __cplusplus +interface ISpeechPhraseProperties; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseRule_FWD_DEFINED__ #define __ISpeechPhraseRule_FWD_DEFINED__ typedef interface ISpeechPhraseRule ISpeechPhraseRule; +#ifdef __cplusplus +interface ISpeechPhraseRule; +#endif /* __cplusplus */ #endif #ifndef __ISpeechPhraseRules_FWD_DEFINED__ #define __ISpeechPhraseRules_FWD_DEFINED__ typedef interface ISpeechPhraseRules ISpeechPhraseRules; +#ifdef __cplusplus +interface ISpeechPhraseRules; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexicon_FWD_DEFINED__ #define __ISpeechLexicon_FWD_DEFINED__ typedef interface ISpeechLexicon ISpeechLexicon; +#ifdef __cplusplus +interface ISpeechLexicon; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexiconWords_FWD_DEFINED__ #define __ISpeechLexiconWords_FWD_DEFINED__ typedef interface ISpeechLexiconWords ISpeechLexiconWords; +#ifdef __cplusplus +interface ISpeechLexiconWords; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexiconWord_FWD_DEFINED__ #define __ISpeechLexiconWord_FWD_DEFINED__ typedef interface ISpeechLexiconWord ISpeechLexiconWord; +#ifdef __cplusplus +interface ISpeechLexiconWord; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexiconPronunciations_FWD_DEFINED__ #define __ISpeechLexiconPronunciations_FWD_DEFINED__ typedef interface ISpeechLexiconPronunciations ISpeechLexiconPronunciations; +#ifdef __cplusplus +interface ISpeechLexiconPronunciations; +#endif /* __cplusplus */ #endif #ifndef __ISpeechLexiconPronunciation_FWD_DEFINED__ #define __ISpeechLexiconPronunciation_FWD_DEFINED__ typedef interface ISpeechLexiconPronunciation ISpeechLexiconPronunciation; +#ifdef __cplusplus +interface ISpeechLexiconPronunciation; +#endif /* __cplusplus */ #endif typedef LONG SpeechLanguageId; @@ -12903,29 +11360,29 @@ typedef struct ISpeechDataKeyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechDataKey* This, + ISpeechDataKey *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechDataKey* This); + ISpeechDataKey *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechDataKey* This); + ISpeechDataKey *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechDataKey* This, + ISpeechDataKey *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechDataKey* This, + ISpeechDataKey *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechDataKey* This, + ISpeechDataKey *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -12933,7 +11390,7 @@ typedef struct ISpeechDataKeyVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechDataKey* This, + ISpeechDataKey *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -12945,65 +11402,66 @@ typedef struct ISpeechDataKeyVtbl { /*** ISpeechDataKey methods ***/ HRESULT (STDMETHODCALLTYPE *SetBinaryValue)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR ValueName, VARIANT Value); HRESULT (STDMETHODCALLTYPE *GetBinaryValue)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR ValueName, VARIANT *Value); HRESULT (STDMETHODCALLTYPE *SetStringValue)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR ValueName, const BSTR Value); HRESULT (STDMETHODCALLTYPE *GetStringValue)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR ValueName, BSTR *Value); HRESULT (STDMETHODCALLTYPE *SetLongValue)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR ValueName, LONG Value); HRESULT (STDMETHODCALLTYPE *GetLongValue)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR ValueName, LONG *Value); HRESULT (STDMETHODCALLTYPE *OpenKey)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR SubKeyName, ISpeechDataKey **SubKey); HRESULT (STDMETHODCALLTYPE *CreateKey)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR SubKeyName, ISpeechDataKey **SubKey); HRESULT (STDMETHODCALLTYPE *DeleteKey)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR SubKeyName); HRESULT (STDMETHODCALLTYPE *DeleteValue)( - ISpeechDataKey* This, + ISpeechDataKey *This, const BSTR ValueName); HRESULT (STDMETHODCALLTYPE *EnumKeys)( - ISpeechDataKey* This, + ISpeechDataKey *This, LONG Index, BSTR *SubKeyName); HRESULT (STDMETHODCALLTYPE *EnumValues)( - ISpeechDataKey* This, + ISpeechDataKey *This, LONG Index, BSTR *ValueName); END_INTERFACE } ISpeechDataKeyVtbl; + interface ISpeechDataKey { CONST_VTBL ISpeechDataKeyVtbl* lpVtbl; }; @@ -13098,112 +11556,6 @@ static FORCEINLINE HRESULT ISpeechDataKey_EnumValues(ISpeechDataKey* This,LONG I #endif -HRESULT STDMETHODCALLTYPE ISpeechDataKey_SetBinaryValue_Proxy( - ISpeechDataKey* This, - const BSTR ValueName, - VARIANT Value); -void __RPC_STUB ISpeechDataKey_SetBinaryValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_GetBinaryValue_Proxy( - ISpeechDataKey* This, - const BSTR ValueName, - VARIANT *Value); -void __RPC_STUB ISpeechDataKey_GetBinaryValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_SetStringValue_Proxy( - ISpeechDataKey* This, - const BSTR ValueName, - const BSTR Value); -void __RPC_STUB ISpeechDataKey_SetStringValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_GetStringValue_Proxy( - ISpeechDataKey* This, - const BSTR ValueName, - BSTR *Value); -void __RPC_STUB ISpeechDataKey_GetStringValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_SetLongValue_Proxy( - ISpeechDataKey* This, - const BSTR ValueName, - LONG Value); -void __RPC_STUB ISpeechDataKey_SetLongValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_GetLongValue_Proxy( - ISpeechDataKey* This, - const BSTR ValueName, - LONG *Value); -void __RPC_STUB ISpeechDataKey_GetLongValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_OpenKey_Proxy( - ISpeechDataKey* This, - const BSTR SubKeyName, - ISpeechDataKey **SubKey); -void __RPC_STUB ISpeechDataKey_OpenKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_CreateKey_Proxy( - ISpeechDataKey* This, - const BSTR SubKeyName, - ISpeechDataKey **SubKey); -void __RPC_STUB ISpeechDataKey_CreateKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_DeleteKey_Proxy( - ISpeechDataKey* This, - const BSTR SubKeyName); -void __RPC_STUB ISpeechDataKey_DeleteKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_DeleteValue_Proxy( - ISpeechDataKey* This, - const BSTR ValueName); -void __RPC_STUB ISpeechDataKey_DeleteValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_EnumKeys_Proxy( - ISpeechDataKey* This, - LONG Index, - BSTR *SubKeyName); -void __RPC_STUB ISpeechDataKey_EnumKeys_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechDataKey_EnumValues_Proxy( - ISpeechDataKey* This, - LONG Index, - BSTR *ValueName); -void __RPC_STUB ISpeechDataKey_EnumValues_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechDataKey_INTERFACE_DEFINED__ */ @@ -13287,29 +11639,29 @@ typedef struct ISpeechObjectTokenVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechObjectToken* This); + ISpeechObjectToken *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechObjectToken* This); + ISpeechObjectToken *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -13317,7 +11669,7 @@ typedef struct ISpeechObjectTokenVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -13329,45 +11681,45 @@ typedef struct ISpeechObjectTokenVtbl { /*** ISpeechObjectToken methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, BSTR *ObjectId); HRESULT (STDMETHODCALLTYPE *get_DataKey)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, ISpeechDataKey **DataKey); HRESULT (STDMETHODCALLTYPE *get_Category)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, ISpeechObjectTokenCategory **Category); HRESULT (STDMETHODCALLTYPE *GetDescription)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, LONG Locale, BSTR *Description); HRESULT (STDMETHODCALLTYPE *SetId)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, BSTR Id, BSTR CategoryID, VARIANT_BOOL CreateIfNotExist); HRESULT (STDMETHODCALLTYPE *GetAttribute)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, BSTR AttributeName, BSTR *AttributeValue); HRESULT (STDMETHODCALLTYPE *CreateInstance)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, IUnknown *pUnkOuter, SpeechTokenContext ClsContext, IUnknown **Object); HRESULT (STDMETHODCALLTYPE *Remove)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, BSTR ObjectStorageCLSID); HRESULT (STDMETHODCALLTYPE *GetStorageFileName)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, BSTR ObjectStorageCLSID, BSTR KeyName, BSTR FileName, @@ -13375,20 +11727,20 @@ typedef struct ISpeechObjectTokenVtbl { BSTR *FilePath); HRESULT (STDMETHODCALLTYPE *RemoveStorageFileName)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, BSTR ObjectStorageCLSID, BSTR KeyName, VARIANT_BOOL DeleteFile); HRESULT (STDMETHODCALLTYPE *IsUISupported)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, const BSTR TypeOfUI, const VARIANT *ExtraData, IUnknown *Object, VARIANT_BOOL *Supported); HRESULT (STDMETHODCALLTYPE *DisplayUI)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, LONG hWnd, BSTR Title, const BSTR TypeOfUI, @@ -13396,12 +11748,13 @@ typedef struct ISpeechObjectTokenVtbl { IUnknown *Object); HRESULT (STDMETHODCALLTYPE *MatchesAttributes)( - ISpeechObjectToken* This, + ISpeechObjectToken *This, BSTR Attributes, VARIANT_BOOL *Matches); END_INTERFACE } ISpeechObjectTokenVtbl; + interface ISpeechObjectToken { CONST_VTBL ISpeechObjectTokenVtbl* lpVtbl; }; @@ -13500,130 +11853,6 @@ static FORCEINLINE HRESULT ISpeechObjectToken_MatchesAttributes(ISpeechObjectTok #endif -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_get_Id_Proxy( - ISpeechObjectToken* This, - BSTR *ObjectId); -void __RPC_STUB ISpeechObjectToken_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_get_DataKey_Proxy( - ISpeechObjectToken* This, - ISpeechDataKey **DataKey); -void __RPC_STUB ISpeechObjectToken_get_DataKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_get_Category_Proxy( - ISpeechObjectToken* This, - ISpeechObjectTokenCategory **Category); -void __RPC_STUB ISpeechObjectToken_get_Category_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_GetDescription_Proxy( - ISpeechObjectToken* This, - LONG Locale, - BSTR *Description); -void __RPC_STUB ISpeechObjectToken_GetDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_SetId_Proxy( - ISpeechObjectToken* This, - BSTR Id, - BSTR CategoryID, - VARIANT_BOOL CreateIfNotExist); -void __RPC_STUB ISpeechObjectToken_SetId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_GetAttribute_Proxy( - ISpeechObjectToken* This, - BSTR AttributeName, - BSTR *AttributeValue); -void __RPC_STUB ISpeechObjectToken_GetAttribute_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_CreateInstance_Proxy( - ISpeechObjectToken* This, - IUnknown *pUnkOuter, - SpeechTokenContext ClsContext, - IUnknown **Object); -void __RPC_STUB ISpeechObjectToken_CreateInstance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_Remove_Proxy( - ISpeechObjectToken* This, - BSTR ObjectStorageCLSID); -void __RPC_STUB ISpeechObjectToken_Remove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_GetStorageFileName_Proxy( - ISpeechObjectToken* This, - BSTR ObjectStorageCLSID, - BSTR KeyName, - BSTR FileName, - SpeechTokenShellFolder Folder, - BSTR *FilePath); -void __RPC_STUB ISpeechObjectToken_GetStorageFileName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_RemoveStorageFileName_Proxy( - ISpeechObjectToken* This, - BSTR ObjectStorageCLSID, - BSTR KeyName, - VARIANT_BOOL DeleteFile); -void __RPC_STUB ISpeechObjectToken_RemoveStorageFileName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_IsUISupported_Proxy( - ISpeechObjectToken* This, - const BSTR TypeOfUI, - const VARIANT *ExtraData, - IUnknown *Object, - VARIANT_BOOL *Supported); -void __RPC_STUB ISpeechObjectToken_IsUISupported_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_DisplayUI_Proxy( - ISpeechObjectToken* This, - LONG hWnd, - BSTR Title, - const BSTR TypeOfUI, - const VARIANT *ExtraData, - IUnknown *Object); -void __RPC_STUB ISpeechObjectToken_DisplayUI_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectToken_MatchesAttributes_Proxy( - ISpeechObjectToken* This, - BSTR Attributes, - VARIANT_BOOL *Matches); -void __RPC_STUB ISpeechObjectToken_MatchesAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechObjectToken_INTERFACE_DEFINED__ */ @@ -13658,29 +11887,29 @@ typedef struct ISpeechObjectTokensVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechObjectTokens* This, + ISpeechObjectTokens *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechObjectTokens* This); + ISpeechObjectTokens *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechObjectTokens* This); + ISpeechObjectTokens *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechObjectTokens* This, + ISpeechObjectTokens *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechObjectTokens* This, + ISpeechObjectTokens *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechObjectTokens* This, + ISpeechObjectTokens *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -13688,7 +11917,7 @@ typedef struct ISpeechObjectTokensVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechObjectTokens* This, + ISpeechObjectTokens *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -13700,20 +11929,21 @@ typedef struct ISpeechObjectTokensVtbl { /*** ISpeechObjectTokens methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechObjectTokens* This, + ISpeechObjectTokens *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechObjectTokens* This, + ISpeechObjectTokens *This, LONG Index, ISpeechObjectToken **Token); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechObjectTokens* This, + ISpeechObjectTokens *This, IUnknown **ppEnumVARIANT); END_INTERFACE } ISpeechObjectTokensVtbl; + interface ISpeechObjectTokens { CONST_VTBL ISpeechObjectTokensVtbl* lpVtbl; }; @@ -13772,31 +12002,6 @@ static FORCEINLINE HRESULT ISpeechObjectTokens_get__NewEnum(ISpeechObjectTokens* #endif -HRESULT STDMETHODCALLTYPE ISpeechObjectTokens_get_Count_Proxy( - ISpeechObjectTokens* This, - LONG *Count); -void __RPC_STUB ISpeechObjectTokens_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectTokens_Item_Proxy( - ISpeechObjectTokens* This, - LONG Index, - ISpeechObjectToken **Token); -void __RPC_STUB ISpeechObjectTokens_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectTokens_get__NewEnum_Proxy( - ISpeechObjectTokens* This, - IUnknown **ppEnumVARIANT); -void __RPC_STUB ISpeechObjectTokens_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechObjectTokens_INTERFACE_DEFINED__ */ @@ -13843,29 +12048,29 @@ typedef struct ISpeechObjectTokenCategoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechObjectTokenCategory* This); + ISpeechObjectTokenCategory *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechObjectTokenCategory* This); + ISpeechObjectTokenCategory *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -13873,7 +12078,7 @@ typedef struct ISpeechObjectTokenCategoryVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -13885,35 +12090,36 @@ typedef struct ISpeechObjectTokenCategoryVtbl { /*** ISpeechObjectTokenCategory methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, BSTR *Id); HRESULT (STDMETHODCALLTYPE *put_Default)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, const BSTR TokenId); HRESULT (STDMETHODCALLTYPE *get_Default)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, BSTR *TokenId); HRESULT (STDMETHODCALLTYPE *SetId)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, const BSTR Id, VARIANT_BOOL CreateIfNotExist); HRESULT (STDMETHODCALLTYPE *GetDataKey)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, SpeechDataKeyLocation Location, ISpeechDataKey **DataKey); HRESULT (STDMETHODCALLTYPE *EnumerateTokens)( - ISpeechObjectTokenCategory* This, + ISpeechObjectTokenCategory *This, BSTR RequiredAttributes, BSTR OptionalAttributes, ISpeechObjectTokens **Tokens); END_INTERFACE } ISpeechObjectTokenCategoryVtbl; + interface ISpeechObjectTokenCategory { CONST_VTBL ISpeechObjectTokenCategoryVtbl* lpVtbl; }; @@ -13984,58 +12190,6 @@ static FORCEINLINE HRESULT ISpeechObjectTokenCategory_EnumerateTokens(ISpeechObj #endif -HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_get_Id_Proxy( - ISpeechObjectTokenCategory* This, - BSTR *Id); -void __RPC_STUB ISpeechObjectTokenCategory_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_put_Default_Proxy( - ISpeechObjectTokenCategory* This, - const BSTR TokenId); -void __RPC_STUB ISpeechObjectTokenCategory_put_Default_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_get_Default_Proxy( - ISpeechObjectTokenCategory* This, - BSTR *TokenId); -void __RPC_STUB ISpeechObjectTokenCategory_get_Default_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_SetId_Proxy( - ISpeechObjectTokenCategory* This, - const BSTR Id, - VARIANT_BOOL CreateIfNotExist); -void __RPC_STUB ISpeechObjectTokenCategory_SetId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_GetDataKey_Proxy( - ISpeechObjectTokenCategory* This, - SpeechDataKeyLocation Location, - ISpeechDataKey **DataKey); -void __RPC_STUB ISpeechObjectTokenCategory_GetDataKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_EnumerateTokens_Proxy( - ISpeechObjectTokenCategory* This, - BSTR RequiredAttributes, - BSTR OptionalAttributes, - ISpeechObjectTokens **Tokens); -void __RPC_STUB ISpeechObjectTokenCategory_EnumerateTokens_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechObjectTokenCategory_INTERFACE_DEFINED__ */ @@ -14302,29 +12456,29 @@ typedef struct ISpeechAudioFormatVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechAudioFormat* This); + ISpeechAudioFormat *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechAudioFormat* This); + ISpeechAudioFormat *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -14332,7 +12486,7 @@ typedef struct ISpeechAudioFormatVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -14344,31 +12498,32 @@ typedef struct ISpeechAudioFormatVtbl { /*** ISpeechAudioFormat methods ***/ HRESULT (STDMETHODCALLTYPE *get_Type)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, SpeechAudioFormatType *AudioFormat); HRESULT (STDMETHODCALLTYPE *put_Type)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, SpeechAudioFormatType AudioFormat); HRESULT (STDMETHODCALLTYPE *get_Guid)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, BSTR *Guid); HRESULT (STDMETHODCALLTYPE *put_Guid)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, BSTR Guid); HRESULT (STDMETHODCALLTYPE *GetWaveFormatEx)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, ISpeechWaveFormatEx **SpeechWaveFormatEx); HRESULT (STDMETHODCALLTYPE *SetWaveFormatEx)( - ISpeechAudioFormat* This, + ISpeechAudioFormat *This, ISpeechWaveFormatEx *SpeechWaveFormatEx); END_INTERFACE } ISpeechAudioFormatVtbl; + interface ISpeechAudioFormat { CONST_VTBL ISpeechAudioFormatVtbl* lpVtbl; }; @@ -14439,54 +12594,6 @@ static FORCEINLINE HRESULT ISpeechAudioFormat_SetWaveFormatEx(ISpeechAudioFormat #endif -HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_get_Type_Proxy( - ISpeechAudioFormat* This, - SpeechAudioFormatType *AudioFormat); -void __RPC_STUB ISpeechAudioFormat_get_Type_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_put_Type_Proxy( - ISpeechAudioFormat* This, - SpeechAudioFormatType AudioFormat); -void __RPC_STUB ISpeechAudioFormat_put_Type_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_get_Guid_Proxy( - ISpeechAudioFormat* This, - BSTR *Guid); -void __RPC_STUB ISpeechAudioFormat_get_Guid_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_put_Guid_Proxy( - ISpeechAudioFormat* This, - BSTR Guid); -void __RPC_STUB ISpeechAudioFormat_put_Guid_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_GetWaveFormatEx_Proxy( - ISpeechAudioFormat* This, - ISpeechWaveFormatEx **SpeechWaveFormatEx); -void __RPC_STUB ISpeechAudioFormat_GetWaveFormatEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_SetWaveFormatEx_Proxy( - ISpeechAudioFormat* This, - ISpeechWaveFormatEx *SpeechWaveFormatEx); -void __RPC_STUB ISpeechAudioFormat_SetWaveFormatEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechAudioFormat_INTERFACE_DEFINED__ */ @@ -14531,29 +12638,29 @@ typedef struct ISpeechBaseStreamVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechBaseStream* This); + ISpeechBaseStream *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechBaseStream* This); + ISpeechBaseStream *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -14561,7 +12668,7 @@ typedef struct ISpeechBaseStreamVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -14573,32 +12680,33 @@ typedef struct ISpeechBaseStreamVtbl { /*** ISpeechBaseStream methods ***/ HRESULT (STDMETHODCALLTYPE *get_Format)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, ISpeechAudioFormat **AudioFormat); HRESULT (STDMETHODCALLTYPE *putref_Format)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, ISpeechAudioFormat *AudioFormat); HRESULT (STDMETHODCALLTYPE *Read)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, VARIANT *Buffer, LONG NumberOfBytes, LONG *BytesRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, VARIANT Buffer, LONG *BytesWritten); HRESULT (STDMETHODCALLTYPE *Seek)( - ISpeechBaseStream* This, + ISpeechBaseStream *This, VARIANT Position, SpeechStreamSeekPositionType Origin, VARIANT *NewPosition); END_INTERFACE } ISpeechBaseStreamVtbl; + interface ISpeechBaseStream { CONST_VTBL ISpeechBaseStreamVtbl* lpVtbl; }; @@ -14665,51 +12773,6 @@ static FORCEINLINE HRESULT ISpeechBaseStream_Seek(ISpeechBaseStream* This,VARIAN #endif -HRESULT STDMETHODCALLTYPE ISpeechBaseStream_get_Format_Proxy( - ISpeechBaseStream* This, - ISpeechAudioFormat **AudioFormat); -void __RPC_STUB ISpeechBaseStream_get_Format_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechBaseStream_putref_Format_Proxy( - ISpeechBaseStream* This, - ISpeechAudioFormat *AudioFormat); -void __RPC_STUB ISpeechBaseStream_putref_Format_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechBaseStream_Read_Proxy( - ISpeechBaseStream* This, - VARIANT *Buffer, - LONG NumberOfBytes, - LONG *BytesRead); -void __RPC_STUB ISpeechBaseStream_Read_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechBaseStream_Write_Proxy( - ISpeechBaseStream* This, - VARIANT Buffer, - LONG *BytesWritten); -void __RPC_STUB ISpeechBaseStream_Write_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechBaseStream_Seek_Proxy( - ISpeechBaseStream* This, - VARIANT Position, - SpeechStreamSeekPositionType Origin, - VARIANT *NewPosition); -void __RPC_STUB ISpeechBaseStream_Seek_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechBaseStream_INTERFACE_DEFINED__ */ @@ -14761,29 +12824,29 @@ typedef struct ISpeechAudioVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechAudio* This, + ISpeechAudio *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechAudio* This); + ISpeechAudio *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechAudio* This); + ISpeechAudio *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechAudio* This, + ISpeechAudio *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechAudio* This, + ISpeechAudio *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechAudio* This, + ISpeechAudio *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -14791,7 +12854,7 @@ typedef struct ISpeechAudioVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechAudio* This, + ISpeechAudio *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -14803,69 +12866,70 @@ typedef struct ISpeechAudioVtbl { /*** ISpeechBaseStream methods ***/ HRESULT (STDMETHODCALLTYPE *get_Format)( - ISpeechAudio* This, + ISpeechAudio *This, ISpeechAudioFormat **AudioFormat); HRESULT (STDMETHODCALLTYPE *putref_Format)( - ISpeechAudio* This, + ISpeechAudio *This, ISpeechAudioFormat *AudioFormat); HRESULT (STDMETHODCALLTYPE *Read)( - ISpeechAudio* This, + ISpeechAudio *This, VARIANT *Buffer, LONG NumberOfBytes, LONG *BytesRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpeechAudio* This, + ISpeechAudio *This, VARIANT Buffer, LONG *BytesWritten); HRESULT (STDMETHODCALLTYPE *Seek)( - ISpeechAudio* This, + ISpeechAudio *This, VARIANT Position, SpeechStreamSeekPositionType Origin, VARIANT *NewPosition); /*** ISpeechAudio methods ***/ HRESULT (STDMETHODCALLTYPE *get_Status)( - ISpeechAudio* This, + ISpeechAudio *This, ISpeechAudioStatus **Status); HRESULT (STDMETHODCALLTYPE *get_BufferInfo)( - ISpeechAudio* This, + ISpeechAudio *This, ISpeechAudioBufferInfo **BufferInfo); HRESULT (STDMETHODCALLTYPE *get_DefaultFormat)( - ISpeechAudio* This, + ISpeechAudio *This, ISpeechAudioFormat **StreamFormat); HRESULT (STDMETHODCALLTYPE *get_Volume)( - ISpeechAudio* This, + ISpeechAudio *This, LONG *Volume); HRESULT (STDMETHODCALLTYPE *put_Volume)( - ISpeechAudio* This, + ISpeechAudio *This, LONG Volume); HRESULT (STDMETHODCALLTYPE *get_BufferNotifySize)( - ISpeechAudio* This, + ISpeechAudio *This, LONG *BufferNotifySize); HRESULT (STDMETHODCALLTYPE *put_BufferNotifySize)( - ISpeechAudio* This, + ISpeechAudio *This, LONG BufferNotifySize); HRESULT (STDMETHODCALLTYPE *get_EventHandle)( - ISpeechAudio* This, + ISpeechAudio *This, LONG *EventHandle); HRESULT (STDMETHODCALLTYPE *SetState)( - ISpeechAudio* This, + ISpeechAudio *This, SpeechAudioState State); END_INTERFACE } ISpeechAudioVtbl; + interface ISpeechAudio { CONST_VTBL ISpeechAudioVtbl* lpVtbl; }; @@ -14970,78 +13034,6 @@ static FORCEINLINE HRESULT ISpeechAudio_SetState(ISpeechAudio* This,SpeechAudioS #endif -HRESULT STDMETHODCALLTYPE ISpeechAudio_get_Status_Proxy( - ISpeechAudio* This, - ISpeechAudioStatus **Status); -void __RPC_STUB ISpeechAudio_get_Status_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudio_get_BufferInfo_Proxy( - ISpeechAudio* This, - ISpeechAudioBufferInfo **BufferInfo); -void __RPC_STUB ISpeechAudio_get_BufferInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudio_get_DefaultFormat_Proxy( - ISpeechAudio* This, - ISpeechAudioFormat **StreamFormat); -void __RPC_STUB ISpeechAudio_get_DefaultFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudio_get_Volume_Proxy( - ISpeechAudio* This, - LONG *Volume); -void __RPC_STUB ISpeechAudio_get_Volume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudio_put_Volume_Proxy( - ISpeechAudio* This, - LONG Volume); -void __RPC_STUB ISpeechAudio_put_Volume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudio_get_BufferNotifySize_Proxy( - ISpeechAudio* This, - LONG *BufferNotifySize); -void __RPC_STUB ISpeechAudio_get_BufferNotifySize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudio_put_BufferNotifySize_Proxy( - ISpeechAudio* This, - LONG BufferNotifySize); -void __RPC_STUB ISpeechAudio_put_BufferNotifySize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudio_get_EventHandle_Proxy( - ISpeechAudio* This, - LONG *EventHandle); -void __RPC_STUB ISpeechAudio_get_EventHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudio_SetState_Proxy( - ISpeechAudio* This, - SpeechAudioState State); -void __RPC_STUB ISpeechAudio_SetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechAudio_INTERFACE_DEFINED__ */ @@ -15081,29 +13073,29 @@ typedef struct ISpeechMMSysAudioVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechMMSysAudio* This); + ISpeechMMSysAudio *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechMMSysAudio* This); + ISpeechMMSysAudio *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -15111,7 +13103,7 @@ typedef struct ISpeechMMSysAudioVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -15123,90 +13115,91 @@ typedef struct ISpeechMMSysAudioVtbl { /*** ISpeechBaseStream methods ***/ HRESULT (STDMETHODCALLTYPE *get_Format)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, ISpeechAudioFormat **AudioFormat); HRESULT (STDMETHODCALLTYPE *putref_Format)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, ISpeechAudioFormat *AudioFormat); HRESULT (STDMETHODCALLTYPE *Read)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, VARIANT *Buffer, LONG NumberOfBytes, LONG *BytesRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, VARIANT Buffer, LONG *BytesWritten); HRESULT (STDMETHODCALLTYPE *Seek)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, VARIANT Position, SpeechStreamSeekPositionType Origin, VARIANT *NewPosition); /*** ISpeechAudio methods ***/ HRESULT (STDMETHODCALLTYPE *get_Status)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, ISpeechAudioStatus **Status); HRESULT (STDMETHODCALLTYPE *get_BufferInfo)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, ISpeechAudioBufferInfo **BufferInfo); HRESULT (STDMETHODCALLTYPE *get_DefaultFormat)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, ISpeechAudioFormat **StreamFormat); HRESULT (STDMETHODCALLTYPE *get_Volume)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG *Volume); HRESULT (STDMETHODCALLTYPE *put_Volume)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG Volume); HRESULT (STDMETHODCALLTYPE *get_BufferNotifySize)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG *BufferNotifySize); HRESULT (STDMETHODCALLTYPE *put_BufferNotifySize)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG BufferNotifySize); HRESULT (STDMETHODCALLTYPE *get_EventHandle)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG *EventHandle); HRESULT (STDMETHODCALLTYPE *SetState)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, SpeechAudioState State); /*** ISpeechMMSysAudio methods ***/ HRESULT (STDMETHODCALLTYPE *get_DeviceId)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG *DeviceId); HRESULT (STDMETHODCALLTYPE *put_DeviceId)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG DeviceId); HRESULT (STDMETHODCALLTYPE *get_LineId)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG *LineId); HRESULT (STDMETHODCALLTYPE *put_LineId)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG LineId); HRESULT (STDMETHODCALLTYPE *get_MMHandle)( - ISpeechMMSysAudio* This, + ISpeechMMSysAudio *This, LONG *Handle); END_INTERFACE } ISpeechMMSysAudioVtbl; + interface ISpeechMMSysAudio { CONST_VTBL ISpeechMMSysAudioVtbl* lpVtbl; }; @@ -15333,46 +13326,6 @@ static FORCEINLINE HRESULT ISpeechMMSysAudio_get_MMHandle(ISpeechMMSysAudio* Thi #endif -HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_get_DeviceId_Proxy( - ISpeechMMSysAudio* This, - LONG *DeviceId); -void __RPC_STUB ISpeechMMSysAudio_get_DeviceId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_put_DeviceId_Proxy( - ISpeechMMSysAudio* This, - LONG DeviceId); -void __RPC_STUB ISpeechMMSysAudio_put_DeviceId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_get_LineId_Proxy( - ISpeechMMSysAudio* This, - LONG *LineId); -void __RPC_STUB ISpeechMMSysAudio_get_LineId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_put_LineId_Proxy( - ISpeechMMSysAudio* This, - LONG LineId); -void __RPC_STUB ISpeechMMSysAudio_put_LineId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_get_MMHandle_Proxy( - ISpeechMMSysAudio* This, - LONG *Handle); -void __RPC_STUB ISpeechMMSysAudio_get_MMHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechMMSysAudio_INTERFACE_DEFINED__ */ @@ -15405,29 +13358,29 @@ typedef struct ISpeechFileStreamVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechFileStream* This, + ISpeechFileStream *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechFileStream* This); + ISpeechFileStream *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechFileStream* This); + ISpeechFileStream *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechFileStream* This, + ISpeechFileStream *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechFileStream* This, + ISpeechFileStream *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechFileStream* This, + ISpeechFileStream *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -15435,7 +13388,7 @@ typedef struct ISpeechFileStreamVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechFileStream* This, + ISpeechFileStream *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -15447,42 +13400,43 @@ typedef struct ISpeechFileStreamVtbl { /*** ISpeechBaseStream methods ***/ HRESULT (STDMETHODCALLTYPE *get_Format)( - ISpeechFileStream* This, + ISpeechFileStream *This, ISpeechAudioFormat **AudioFormat); HRESULT (STDMETHODCALLTYPE *putref_Format)( - ISpeechFileStream* This, + ISpeechFileStream *This, ISpeechAudioFormat *AudioFormat); HRESULT (STDMETHODCALLTYPE *Read)( - ISpeechFileStream* This, + ISpeechFileStream *This, VARIANT *Buffer, LONG NumberOfBytes, LONG *BytesRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpeechFileStream* This, + ISpeechFileStream *This, VARIANT Buffer, LONG *BytesWritten); HRESULT (STDMETHODCALLTYPE *Seek)( - ISpeechFileStream* This, + ISpeechFileStream *This, VARIANT Position, SpeechStreamSeekPositionType Origin, VARIANT *NewPosition); /*** ISpeechFileStream methods ***/ HRESULT (STDMETHODCALLTYPE *Open)( - ISpeechFileStream* This, + ISpeechFileStream *This, BSTR FileName, SpeechStreamFileMode FileMode, VARIANT_BOOL DoEvents); HRESULT (STDMETHODCALLTYPE *Close)( - ISpeechFileStream* This); + ISpeechFileStream *This); END_INTERFACE } ISpeechFileStreamVtbl; + interface ISpeechFileStream { CONST_VTBL ISpeechFileStreamVtbl* lpVtbl; }; @@ -15559,23 +13513,6 @@ static FORCEINLINE HRESULT ISpeechFileStream_Close(ISpeechFileStream* This) { #endif -HRESULT STDMETHODCALLTYPE ISpeechFileStream_Open_Proxy( - ISpeechFileStream* This, - BSTR FileName, - SpeechStreamFileMode FileMode, - VARIANT_BOOL DoEvents); -void __RPC_STUB ISpeechFileStream_Open_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechFileStream_Close_Proxy( - ISpeechFileStream* This); -void __RPC_STUB ISpeechFileStream_Close_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechFileStream_INTERFACE_DEFINED__ */ @@ -15606,29 +13543,29 @@ typedef struct ISpeechCustomStreamVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechCustomStream* This); + ISpeechCustomStream *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechCustomStream* This); + ISpeechCustomStream *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -15636,7 +13573,7 @@ typedef struct ISpeechCustomStreamVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -15648,41 +13585,42 @@ typedef struct ISpeechCustomStreamVtbl { /*** ISpeechBaseStream methods ***/ HRESULT (STDMETHODCALLTYPE *get_Format)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, ISpeechAudioFormat **AudioFormat); HRESULT (STDMETHODCALLTYPE *putref_Format)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, ISpeechAudioFormat *AudioFormat); HRESULT (STDMETHODCALLTYPE *Read)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, VARIANT *Buffer, LONG NumberOfBytes, LONG *BytesRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, VARIANT Buffer, LONG *BytesWritten); HRESULT (STDMETHODCALLTYPE *Seek)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, VARIANT Position, SpeechStreamSeekPositionType Origin, VARIANT *NewPosition); /*** ISpeechCustomStream methods ***/ HRESULT (STDMETHODCALLTYPE *get_BaseStream)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, IUnknown **ppUnkStream); HRESULT (STDMETHODCALLTYPE *putref_BaseStream)( - ISpeechCustomStream* This, + ISpeechCustomStream *This, IUnknown *pUnkStream); END_INTERFACE } ISpeechCustomStreamVtbl; + interface ISpeechCustomStream { CONST_VTBL ISpeechCustomStreamVtbl* lpVtbl; }; @@ -15759,22 +13697,6 @@ static FORCEINLINE HRESULT ISpeechCustomStream_putref_BaseStream(ISpeechCustomSt #endif -HRESULT STDMETHODCALLTYPE ISpeechCustomStream_get_BaseStream_Proxy( - ISpeechCustomStream* This, - IUnknown **ppUnkStream); -void __RPC_STUB ISpeechCustomStream_get_BaseStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechCustomStream_putref_BaseStream_Proxy( - ISpeechCustomStream* This, - IUnknown *pUnkStream); -void __RPC_STUB ISpeechCustomStream_putref_BaseStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechCustomStream_INTERFACE_DEFINED__ */ @@ -15805,29 +13727,29 @@ typedef struct ISpeechMemoryStreamVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechMemoryStream* This); + ISpeechMemoryStream *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechMemoryStream* This); + ISpeechMemoryStream *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -15835,7 +13757,7 @@ typedef struct ISpeechMemoryStreamVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -15847,41 +13769,42 @@ typedef struct ISpeechMemoryStreamVtbl { /*** ISpeechBaseStream methods ***/ HRESULT (STDMETHODCALLTYPE *get_Format)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, ISpeechAudioFormat **AudioFormat); HRESULT (STDMETHODCALLTYPE *putref_Format)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, ISpeechAudioFormat *AudioFormat); HRESULT (STDMETHODCALLTYPE *Read)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, VARIANT *Buffer, LONG NumberOfBytes, LONG *BytesRead); HRESULT (STDMETHODCALLTYPE *Write)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, VARIANT Buffer, LONG *BytesWritten); HRESULT (STDMETHODCALLTYPE *Seek)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, VARIANT Position, SpeechStreamSeekPositionType Origin, VARIANT *NewPosition); /*** ISpeechMemoryStream methods ***/ HRESULT (STDMETHODCALLTYPE *SetData)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, VARIANT Data); HRESULT (STDMETHODCALLTYPE *GetData)( - ISpeechMemoryStream* This, + ISpeechMemoryStream *This, VARIANT *pData); END_INTERFACE } ISpeechMemoryStreamVtbl; + interface ISpeechMemoryStream { CONST_VTBL ISpeechMemoryStreamVtbl* lpVtbl; }; @@ -15958,22 +13881,6 @@ static FORCEINLINE HRESULT ISpeechMemoryStream_GetData(ISpeechMemoryStream* This #endif -HRESULT STDMETHODCALLTYPE ISpeechMemoryStream_SetData_Proxy( - ISpeechMemoryStream* This, - VARIANT Data); -void __RPC_STUB ISpeechMemoryStream_SetData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechMemoryStream_GetData_Proxy( - ISpeechMemoryStream* This, - VARIANT *pData); -void __RPC_STUB ISpeechMemoryStream_GetData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechMemoryStream_INTERFACE_DEFINED__ */ @@ -16013,29 +13920,29 @@ typedef struct ISpeechAudioStatusVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechAudioStatus* This); + ISpeechAudioStatus *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechAudioStatus* This); + ISpeechAudioStatus *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -16043,7 +13950,7 @@ typedef struct ISpeechAudioStatusVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -16055,27 +13962,28 @@ typedef struct ISpeechAudioStatusVtbl { /*** ISpeechAudioStatus methods ***/ HRESULT (STDMETHODCALLTYPE *get_FreeBufferSpace)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, LONG *FreeBufferSpace); HRESULT (STDMETHODCALLTYPE *get_NonBlockingIO)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, LONG *NonBlockingIO); HRESULT (STDMETHODCALLTYPE *get_State)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, SpeechAudioState *State); HRESULT (STDMETHODCALLTYPE *get_CurrentSeekPosition)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, VARIANT *CurrentSeekPosition); HRESULT (STDMETHODCALLTYPE *get_CurrentDevicePosition)( - ISpeechAudioStatus* This, + ISpeechAudioStatus *This, VARIANT *CurrentDevicePosition); END_INTERFACE } ISpeechAudioStatusVtbl; + interface ISpeechAudioStatus { CONST_VTBL ISpeechAudioStatusVtbl* lpVtbl; }; @@ -16142,46 +14050,6 @@ static FORCEINLINE HRESULT ISpeechAudioStatus_get_CurrentDevicePosition(ISpeechA #endif -HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_FreeBufferSpace_Proxy( - ISpeechAudioStatus* This, - LONG *FreeBufferSpace); -void __RPC_STUB ISpeechAudioStatus_get_FreeBufferSpace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_NonBlockingIO_Proxy( - ISpeechAudioStatus* This, - LONG *NonBlockingIO); -void __RPC_STUB ISpeechAudioStatus_get_NonBlockingIO_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_State_Proxy( - ISpeechAudioStatus* This, - SpeechAudioState *State); -void __RPC_STUB ISpeechAudioStatus_get_State_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_CurrentSeekPosition_Proxy( - ISpeechAudioStatus* This, - VARIANT *CurrentSeekPosition); -void __RPC_STUB ISpeechAudioStatus_get_CurrentSeekPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_CurrentDevicePosition_Proxy( - ISpeechAudioStatus* This, - VARIANT *CurrentDevicePosition); -void __RPC_STUB ISpeechAudioStatus_get_CurrentDevicePosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechAudioStatus_INTERFACE_DEFINED__ */ @@ -16224,29 +14092,29 @@ typedef struct ISpeechAudioBufferInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechAudioBufferInfo* This); + ISpeechAudioBufferInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechAudioBufferInfo* This); + ISpeechAudioBufferInfo *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -16254,7 +14122,7 @@ typedef struct ISpeechAudioBufferInfoVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -16266,31 +14134,32 @@ typedef struct ISpeechAudioBufferInfoVtbl { /*** ISpeechAudioBufferInfo methods ***/ HRESULT (STDMETHODCALLTYPE *get_MinNotification)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, LONG *MinNotification); HRESULT (STDMETHODCALLTYPE *put_MinNotification)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, LONG MinNotification); HRESULT (STDMETHODCALLTYPE *get_BufferSize)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, LONG *BufferSize); HRESULT (STDMETHODCALLTYPE *put_BufferSize)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, LONG BufferSize); HRESULT (STDMETHODCALLTYPE *get_EventBias)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, LONG *EventBias); HRESULT (STDMETHODCALLTYPE *put_EventBias)( - ISpeechAudioBufferInfo* This, + ISpeechAudioBufferInfo *This, LONG EventBias); END_INTERFACE } ISpeechAudioBufferInfoVtbl; + interface ISpeechAudioBufferInfo { CONST_VTBL ISpeechAudioBufferInfoVtbl* lpVtbl; }; @@ -16361,54 +14230,6 @@ static FORCEINLINE HRESULT ISpeechAudioBufferInfo_put_EventBias(ISpeechAudioBuff #endif -HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_get_MinNotification_Proxy( - ISpeechAudioBufferInfo* This, - LONG *MinNotification); -void __RPC_STUB ISpeechAudioBufferInfo_get_MinNotification_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_put_MinNotification_Proxy( - ISpeechAudioBufferInfo* This, - LONG MinNotification); -void __RPC_STUB ISpeechAudioBufferInfo_put_MinNotification_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_get_BufferSize_Proxy( - ISpeechAudioBufferInfo* This, - LONG *BufferSize); -void __RPC_STUB ISpeechAudioBufferInfo_get_BufferSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_put_BufferSize_Proxy( - ISpeechAudioBufferInfo* This, - LONG BufferSize); -void __RPC_STUB ISpeechAudioBufferInfo_put_BufferSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_get_EventBias_Proxy( - ISpeechAudioBufferInfo* This, - LONG *EventBias); -void __RPC_STUB ISpeechAudioBufferInfo_get_EventBias_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_put_EventBias_Proxy( - ISpeechAudioBufferInfo* This, - LONG EventBias); -void __RPC_STUB ISpeechAudioBufferInfo_put_EventBias_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechAudioBufferInfo_INTERFACE_DEFINED__ */ @@ -16475,29 +14296,29 @@ typedef struct ISpeechWaveFormatExVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechWaveFormatEx* This); + ISpeechWaveFormatEx *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechWaveFormatEx* This); + ISpeechWaveFormatEx *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -16505,7 +14326,7 @@ typedef struct ISpeechWaveFormatExVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -16517,63 +14338,64 @@ typedef struct ISpeechWaveFormatExVtbl { /*** ISpeechWaveFormatEx methods ***/ HRESULT (STDMETHODCALLTYPE *get_FormatTag)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, short *FormatTag); HRESULT (STDMETHODCALLTYPE *put_FormatTag)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, short FormatTag); HRESULT (STDMETHODCALLTYPE *get_Channels)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, short *Channels); HRESULT (STDMETHODCALLTYPE *put_Channels)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, short Channels); HRESULT (STDMETHODCALLTYPE *get_SamplesPerSec)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, LONG *SamplesPerSec); HRESULT (STDMETHODCALLTYPE *put_SamplesPerSec)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, LONG SamplesPerSec); HRESULT (STDMETHODCALLTYPE *get_AvgBytesPerSec)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, LONG *AvgBytesPerSec); HRESULT (STDMETHODCALLTYPE *put_AvgBytesPerSec)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, LONG AvgBytesPerSec); HRESULT (STDMETHODCALLTYPE *get_BlockAlign)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, short *BlockAlign); HRESULT (STDMETHODCALLTYPE *put_BlockAlign)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, short BlockAlign); HRESULT (STDMETHODCALLTYPE *get_BitsPerSample)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, short *BitsPerSample); HRESULT (STDMETHODCALLTYPE *put_BitsPerSample)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, short BitsPerSample); HRESULT (STDMETHODCALLTYPE *get_ExtraData)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, VARIANT *ExtraData); HRESULT (STDMETHODCALLTYPE *put_ExtraData)( - ISpeechWaveFormatEx* This, + ISpeechWaveFormatEx *This, VARIANT ExtraData); END_INTERFACE } ISpeechWaveFormatExVtbl; + interface ISpeechWaveFormatEx { CONST_VTBL ISpeechWaveFormatExVtbl* lpVtbl; }; @@ -16676,118 +14498,6 @@ static FORCEINLINE HRESULT ISpeechWaveFormatEx_put_ExtraData(ISpeechWaveFormatEx #endif -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_FormatTag_Proxy( - ISpeechWaveFormatEx* This, - short *FormatTag); -void __RPC_STUB ISpeechWaveFormatEx_get_FormatTag_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_FormatTag_Proxy( - ISpeechWaveFormatEx* This, - short FormatTag); -void __RPC_STUB ISpeechWaveFormatEx_put_FormatTag_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_Channels_Proxy( - ISpeechWaveFormatEx* This, - short *Channels); -void __RPC_STUB ISpeechWaveFormatEx_get_Channels_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_Channels_Proxy( - ISpeechWaveFormatEx* This, - short Channels); -void __RPC_STUB ISpeechWaveFormatEx_put_Channels_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_SamplesPerSec_Proxy( - ISpeechWaveFormatEx* This, - LONG *SamplesPerSec); -void __RPC_STUB ISpeechWaveFormatEx_get_SamplesPerSec_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_SamplesPerSec_Proxy( - ISpeechWaveFormatEx* This, - LONG SamplesPerSec); -void __RPC_STUB ISpeechWaveFormatEx_put_SamplesPerSec_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_AvgBytesPerSec_Proxy( - ISpeechWaveFormatEx* This, - LONG *AvgBytesPerSec); -void __RPC_STUB ISpeechWaveFormatEx_get_AvgBytesPerSec_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_AvgBytesPerSec_Proxy( - ISpeechWaveFormatEx* This, - LONG AvgBytesPerSec); -void __RPC_STUB ISpeechWaveFormatEx_put_AvgBytesPerSec_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_BlockAlign_Proxy( - ISpeechWaveFormatEx* This, - short *BlockAlign); -void __RPC_STUB ISpeechWaveFormatEx_get_BlockAlign_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_BlockAlign_Proxy( - ISpeechWaveFormatEx* This, - short BlockAlign); -void __RPC_STUB ISpeechWaveFormatEx_put_BlockAlign_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_BitsPerSample_Proxy( - ISpeechWaveFormatEx* This, - short *BitsPerSample); -void __RPC_STUB ISpeechWaveFormatEx_get_BitsPerSample_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_BitsPerSample_Proxy( - ISpeechWaveFormatEx* This, - short BitsPerSample); -void __RPC_STUB ISpeechWaveFormatEx_put_BitsPerSample_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_ExtraData_Proxy( - ISpeechWaveFormatEx* This, - VARIANT *ExtraData); -void __RPC_STUB ISpeechWaveFormatEx_get_ExtraData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_ExtraData_Proxy( - ISpeechWaveFormatEx* This, - VARIANT ExtraData); -void __RPC_STUB ISpeechWaveFormatEx_put_ExtraData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechWaveFormatEx_INTERFACE_DEFINED__ */ @@ -16924,29 +14634,29 @@ typedef struct ISpeechVoiceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechVoice* This, + ISpeechVoice *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechVoice* This); + ISpeechVoice *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechVoice* This); + ISpeechVoice *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechVoice* This, + ISpeechVoice *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechVoice* This, + ISpeechVoice *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechVoice* This, + ISpeechVoice *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -16954,7 +14664,7 @@ typedef struct ISpeechVoiceVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechVoice* This, + ISpeechVoice *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -16966,142 +14676,142 @@ typedef struct ISpeechVoiceVtbl { /*** ISpeechVoice methods ***/ HRESULT (STDMETHODCALLTYPE *get_Status)( - ISpeechVoice* This, + ISpeechVoice *This, ISpeechVoiceStatus **Status); HRESULT (STDMETHODCALLTYPE *get_Voice)( - ISpeechVoice* This, + ISpeechVoice *This, ISpeechObjectToken **Voice); HRESULT (STDMETHODCALLTYPE *putref_Voice)( - ISpeechVoice* This, + ISpeechVoice *This, ISpeechObjectToken *Voice); HRESULT (STDMETHODCALLTYPE *get_AudioOutput)( - ISpeechVoice* This, + ISpeechVoice *This, ISpeechObjectToken **AudioOutput); HRESULT (STDMETHODCALLTYPE *putref_AudioOutput)( - ISpeechVoice* This, + ISpeechVoice *This, ISpeechObjectToken *AudioOutput); HRESULT (STDMETHODCALLTYPE *get_AudioOutputStream)( - ISpeechVoice* This, + ISpeechVoice *This, ISpeechBaseStream **AudioOutputStream); HRESULT (STDMETHODCALLTYPE *putref_AudioOutputStream)( - ISpeechVoice* This, + ISpeechVoice *This, ISpeechBaseStream *AudioOutputStream); HRESULT (STDMETHODCALLTYPE *get_Rate)( - ISpeechVoice* This, + ISpeechVoice *This, LONG *Rate); HRESULT (STDMETHODCALLTYPE *put_Rate)( - ISpeechVoice* This, + ISpeechVoice *This, LONG Rate); HRESULT (STDMETHODCALLTYPE *get_Volume)( - ISpeechVoice* This, + ISpeechVoice *This, LONG *Volume); HRESULT (STDMETHODCALLTYPE *put_Volume)( - ISpeechVoice* This, + ISpeechVoice *This, LONG Volume); HRESULT (STDMETHODCALLTYPE *put_AllowAudioOutputFormatChangesOnNextSet)( - ISpeechVoice* This, + ISpeechVoice *This, VARIANT_BOOL Allow); HRESULT (STDMETHODCALLTYPE *get_AllowAudioOutputFormatChangesOnNextSet)( - ISpeechVoice* This, + ISpeechVoice *This, VARIANT_BOOL *Allow); HRESULT (STDMETHODCALLTYPE *get_EventInterests)( - ISpeechVoice* This, + ISpeechVoice *This, SpeechVoiceEvents *EventInterestFlags); HRESULT (STDMETHODCALLTYPE *put_EventInterests)( - ISpeechVoice* This, + ISpeechVoice *This, SpeechVoiceEvents EventInterestFlags); HRESULT (STDMETHODCALLTYPE *put_Priority)( - ISpeechVoice* This, + ISpeechVoice *This, SpeechVoicePriority Priority); HRESULT (STDMETHODCALLTYPE *get_Priority)( - ISpeechVoice* This, + ISpeechVoice *This, SpeechVoicePriority *Priority); HRESULT (STDMETHODCALLTYPE *put_AlertBoundary)( - ISpeechVoice* This, + ISpeechVoice *This, SpeechVoiceEvents Boundary); HRESULT (STDMETHODCALLTYPE *get_AlertBoundary)( - ISpeechVoice* This, + ISpeechVoice *This, SpeechVoiceEvents *Boundary); HRESULT (STDMETHODCALLTYPE *put_SynchronousSpeakTimeout)( - ISpeechVoice* This, + ISpeechVoice *This, LONG msTimeout); HRESULT (STDMETHODCALLTYPE *get_SynchronousSpeakTimeout)( - ISpeechVoice* This, + ISpeechVoice *This, LONG *msTimeout); HRESULT (STDMETHODCALLTYPE *Speak)( - ISpeechVoice* This, + ISpeechVoice *This, BSTR Text, SpeechVoiceSpeakFlags Flags, LONG *StreamNumber); HRESULT (STDMETHODCALLTYPE *SpeakStream)( - ISpeechVoice* This, + ISpeechVoice *This, ISpeechBaseStream *Stream, SpeechVoiceSpeakFlags Flags, LONG *StreamNumber); HRESULT (STDMETHODCALLTYPE *Pause)( - ISpeechVoice* This); + ISpeechVoice *This); HRESULT (STDMETHODCALLTYPE *Resume)( - ISpeechVoice* This); + ISpeechVoice *This); HRESULT (STDMETHODCALLTYPE *Skip)( - ISpeechVoice* This, + ISpeechVoice *This, const BSTR Type, LONG NumItems, LONG *NumSkipped); HRESULT (STDMETHODCALLTYPE *GetVoices)( - ISpeechVoice* This, + ISpeechVoice *This, BSTR RequiredAttributes, BSTR OptionalAttributes, ISpeechObjectTokens **ObjectTokens); HRESULT (STDMETHODCALLTYPE *GetAudioOutputs)( - ISpeechVoice* This, + ISpeechVoice *This, BSTR RequiredAttributes, BSTR OptionalAttributes, ISpeechObjectTokens **ObjectTokens); HRESULT (STDMETHODCALLTYPE *WaitUntilDone)( - ISpeechVoice* This, + ISpeechVoice *This, LONG msTimeout, VARIANT_BOOL *Done); HRESULT (STDMETHODCALLTYPE *SpeakCompleteEvent)( - ISpeechVoice* This, + ISpeechVoice *This, LONG *Handle); HRESULT (STDMETHODCALLTYPE *IsUISupported)( - ISpeechVoice* This, + ISpeechVoice *This, const BSTR TypeOfUI, const VARIANT *ExtraData, VARIANT_BOOL *Supported); HRESULT (STDMETHODCALLTYPE *DisplayUI)( - ISpeechVoice* This, + ISpeechVoice *This, LONG hWndParent, BSTR Title, const BSTR TypeOfUI, @@ -17109,6 +14819,7 @@ typedef struct ISpeechVoiceVtbl { END_INTERFACE } ISpeechVoiceVtbl; + interface ISpeechVoice { CONST_VTBL ISpeechVoiceVtbl* lpVtbl; }; @@ -17283,276 +14994,6 @@ static FORCEINLINE HRESULT ISpeechVoice_DisplayUI(ISpeechVoice* This,LONG hWndPa #endif -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Status_Proxy( - ISpeechVoice* This, - ISpeechVoiceStatus **Status); -void __RPC_STUB ISpeechVoice_get_Status_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Voice_Proxy( - ISpeechVoice* This, - ISpeechObjectToken **Voice); -void __RPC_STUB ISpeechVoice_get_Voice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_putref_Voice_Proxy( - ISpeechVoice* This, - ISpeechObjectToken *Voice); -void __RPC_STUB ISpeechVoice_putref_Voice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_AudioOutput_Proxy( - ISpeechVoice* This, - ISpeechObjectToken **AudioOutput); -void __RPC_STUB ISpeechVoice_get_AudioOutput_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_putref_AudioOutput_Proxy( - ISpeechVoice* This, - ISpeechObjectToken *AudioOutput); -void __RPC_STUB ISpeechVoice_putref_AudioOutput_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_AudioOutputStream_Proxy( - ISpeechVoice* This, - ISpeechBaseStream **AudioOutputStream); -void __RPC_STUB ISpeechVoice_get_AudioOutputStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_putref_AudioOutputStream_Proxy( - ISpeechVoice* This, - ISpeechBaseStream *AudioOutputStream); -void __RPC_STUB ISpeechVoice_putref_AudioOutputStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Rate_Proxy( - ISpeechVoice* This, - LONG *Rate); -void __RPC_STUB ISpeechVoice_get_Rate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_put_Rate_Proxy( - ISpeechVoice* This, - LONG Rate); -void __RPC_STUB ISpeechVoice_put_Rate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Volume_Proxy( - ISpeechVoice* This, - LONG *Volume); -void __RPC_STUB ISpeechVoice_get_Volume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_put_Volume_Proxy( - ISpeechVoice* This, - LONG Volume); -void __RPC_STUB ISpeechVoice_put_Volume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_put_AllowAudioOutputFormatChangesOnNextSet_Proxy( - ISpeechVoice* This, - VARIANT_BOOL Allow); -void __RPC_STUB ISpeechVoice_put_AllowAudioOutputFormatChangesOnNextSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_AllowAudioOutputFormatChangesOnNextSet_Proxy( - ISpeechVoice* This, - VARIANT_BOOL *Allow); -void __RPC_STUB ISpeechVoice_get_AllowAudioOutputFormatChangesOnNextSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_EventInterests_Proxy( - ISpeechVoice* This, - SpeechVoiceEvents *EventInterestFlags); -void __RPC_STUB ISpeechVoice_get_EventInterests_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_put_EventInterests_Proxy( - ISpeechVoice* This, - SpeechVoiceEvents EventInterestFlags); -void __RPC_STUB ISpeechVoice_put_EventInterests_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_put_Priority_Proxy( - ISpeechVoice* This, - SpeechVoicePriority Priority); -void __RPC_STUB ISpeechVoice_put_Priority_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Priority_Proxy( - ISpeechVoice* This, - SpeechVoicePriority *Priority); -void __RPC_STUB ISpeechVoice_get_Priority_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_put_AlertBoundary_Proxy( - ISpeechVoice* This, - SpeechVoiceEvents Boundary); -void __RPC_STUB ISpeechVoice_put_AlertBoundary_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_AlertBoundary_Proxy( - ISpeechVoice* This, - SpeechVoiceEvents *Boundary); -void __RPC_STUB ISpeechVoice_get_AlertBoundary_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_put_SynchronousSpeakTimeout_Proxy( - ISpeechVoice* This, - LONG msTimeout); -void __RPC_STUB ISpeechVoice_put_SynchronousSpeakTimeout_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_get_SynchronousSpeakTimeout_Proxy( - ISpeechVoice* This, - LONG *msTimeout); -void __RPC_STUB ISpeechVoice_get_SynchronousSpeakTimeout_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_Speak_Proxy( - ISpeechVoice* This, - BSTR Text, - SpeechVoiceSpeakFlags Flags, - LONG *StreamNumber); -void __RPC_STUB ISpeechVoice_Speak_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_SpeakStream_Proxy( - ISpeechVoice* This, - ISpeechBaseStream *Stream, - SpeechVoiceSpeakFlags Flags, - LONG *StreamNumber); -void __RPC_STUB ISpeechVoice_SpeakStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_Pause_Proxy( - ISpeechVoice* This); -void __RPC_STUB ISpeechVoice_Pause_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_Resume_Proxy( - ISpeechVoice* This); -void __RPC_STUB ISpeechVoice_Resume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_Skip_Proxy( - ISpeechVoice* This, - const BSTR Type, - LONG NumItems, - LONG *NumSkipped); -void __RPC_STUB ISpeechVoice_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_GetVoices_Proxy( - ISpeechVoice* This, - BSTR RequiredAttributes, - BSTR OptionalAttributes, - ISpeechObjectTokens **ObjectTokens); -void __RPC_STUB ISpeechVoice_GetVoices_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_GetAudioOutputs_Proxy( - ISpeechVoice* This, - BSTR RequiredAttributes, - BSTR OptionalAttributes, - ISpeechObjectTokens **ObjectTokens); -void __RPC_STUB ISpeechVoice_GetAudioOutputs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_WaitUntilDone_Proxy( - ISpeechVoice* This, - LONG msTimeout, - VARIANT_BOOL *Done); -void __RPC_STUB ISpeechVoice_WaitUntilDone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_SpeakCompleteEvent_Proxy( - ISpeechVoice* This, - LONG *Handle); -void __RPC_STUB ISpeechVoice_SpeakCompleteEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_IsUISupported_Proxy( - ISpeechVoice* This, - const BSTR TypeOfUI, - const VARIANT *ExtraData, - VARIANT_BOOL *Supported); -void __RPC_STUB ISpeechVoice_IsUISupported_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoice_DisplayUI_Proxy( - ISpeechVoice* This, - LONG hWndParent, - BSTR Title, - const BSTR TypeOfUI, - const VARIANT *ExtraData); -void __RPC_STUB ISpeechVoice_DisplayUI_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechVoice_INTERFACE_DEFINED__ */ @@ -17613,29 +15054,29 @@ typedef struct ISpeechVoiceStatusVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechVoiceStatus* This); + ISpeechVoiceStatus *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechVoiceStatus* This); + ISpeechVoiceStatus *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -17643,7 +15084,7 @@ typedef struct ISpeechVoiceStatusVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -17655,55 +15096,56 @@ typedef struct ISpeechVoiceStatusVtbl { /*** ISpeechVoiceStatus methods ***/ HRESULT (STDMETHODCALLTYPE *get_CurrentStreamNumber)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, LONG *StreamNumber); HRESULT (STDMETHODCALLTYPE *get_LastStreamNumberQueued)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, LONG *StreamNumber); HRESULT (STDMETHODCALLTYPE *get_LastHResult)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, LONG *HResult); HRESULT (STDMETHODCALLTYPE *get_RunningState)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, SpeechRunState *State); HRESULT (STDMETHODCALLTYPE *get_InputWordPosition)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, LONG *Position); HRESULT (STDMETHODCALLTYPE *get_InputWordLength)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, LONG *Length); HRESULT (STDMETHODCALLTYPE *get_InputSentencePosition)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, LONG *Position); HRESULT (STDMETHODCALLTYPE *get_InputSentenceLength)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, LONG *Length); HRESULT (STDMETHODCALLTYPE *get_LastBookmark)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, BSTR *Bookmark); HRESULT (STDMETHODCALLTYPE *get_LastBookmarkId)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, LONG *BookmarkId); HRESULT (STDMETHODCALLTYPE *get_PhonemeId)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, short *PhoneId); HRESULT (STDMETHODCALLTYPE *get_VisemeId)( - ISpeechVoiceStatus* This, + ISpeechVoiceStatus *This, short *VisemeId); END_INTERFACE } ISpeechVoiceStatusVtbl; + interface ISpeechVoiceStatus { CONST_VTBL ISpeechVoiceStatusVtbl* lpVtbl; }; @@ -17798,102 +15240,6 @@ static FORCEINLINE HRESULT ISpeechVoiceStatus_get_VisemeId(ISpeechVoiceStatus* T #endif -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_CurrentStreamNumber_Proxy( - ISpeechVoiceStatus* This, - LONG *StreamNumber); -void __RPC_STUB ISpeechVoiceStatus_get_CurrentStreamNumber_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_LastStreamNumberQueued_Proxy( - ISpeechVoiceStatus* This, - LONG *StreamNumber); -void __RPC_STUB ISpeechVoiceStatus_get_LastStreamNumberQueued_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_LastHResult_Proxy( - ISpeechVoiceStatus* This, - LONG *HResult); -void __RPC_STUB ISpeechVoiceStatus_get_LastHResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_RunningState_Proxy( - ISpeechVoiceStatus* This, - SpeechRunState *State); -void __RPC_STUB ISpeechVoiceStatus_get_RunningState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_InputWordPosition_Proxy( - ISpeechVoiceStatus* This, - LONG *Position); -void __RPC_STUB ISpeechVoiceStatus_get_InputWordPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_InputWordLength_Proxy( - ISpeechVoiceStatus* This, - LONG *Length); -void __RPC_STUB ISpeechVoiceStatus_get_InputWordLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_InputSentencePosition_Proxy( - ISpeechVoiceStatus* This, - LONG *Position); -void __RPC_STUB ISpeechVoiceStatus_get_InputSentencePosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_InputSentenceLength_Proxy( - ISpeechVoiceStatus* This, - LONG *Length); -void __RPC_STUB ISpeechVoiceStatus_get_InputSentenceLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_LastBookmark_Proxy( - ISpeechVoiceStatus* This, - BSTR *Bookmark); -void __RPC_STUB ISpeechVoiceStatus_get_LastBookmark_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_LastBookmarkId_Proxy( - ISpeechVoiceStatus* This, - LONG *BookmarkId); -void __RPC_STUB ISpeechVoiceStatus_get_LastBookmarkId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_PhonemeId_Proxy( - ISpeechVoiceStatus* This, - short *PhoneId); -void __RPC_STUB ISpeechVoiceStatus_get_PhonemeId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_VisemeId_Proxy( - ISpeechVoiceStatus* This, - short *VisemeId); -void __RPC_STUB ISpeechVoiceStatus_get_VisemeId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechVoiceStatus_INTERFACE_DEFINED__ */ @@ -18410,29 +15756,29 @@ typedef struct _ISpeechVoiceEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - _ISpeechVoiceEvents* This, + _ISpeechVoiceEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - _ISpeechVoiceEvents* This); + _ISpeechVoiceEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - _ISpeechVoiceEvents* This); + _ISpeechVoiceEvents *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - _ISpeechVoiceEvents* This, + _ISpeechVoiceEvents *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - _ISpeechVoiceEvents* This, + _ISpeechVoiceEvents *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - _ISpeechVoiceEvents* This, + _ISpeechVoiceEvents *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -18440,7 +15786,7 @@ typedef struct _ISpeechVoiceEventsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - _ISpeechVoiceEvents* This, + _ISpeechVoiceEvents *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -18452,6 +15798,7 @@ typedef struct _ISpeechVoiceEventsVtbl { END_INTERFACE } _ISpeechVoiceEventsVtbl; + interface _ISpeechVoiceEvents { CONST_VTBL _ISpeechVoiceEventsVtbl* lpVtbl; }; @@ -18619,29 +15966,29 @@ typedef struct ISpeechRecognizerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechRecognizer* This); + ISpeechRecognizer *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechRecognizer* This); + ISpeechRecognizer *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -18649,7 +15996,7 @@ typedef struct ISpeechRecognizerVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -18661,133 +16008,134 @@ typedef struct ISpeechRecognizerVtbl { /*** ISpeechRecognizer methods ***/ HRESULT (STDMETHODCALLTYPE *putref_Recognizer)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechObjectToken *Recognizer); HRESULT (STDMETHODCALLTYPE *get_Recognizer)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechObjectToken **Recognizer); HRESULT (STDMETHODCALLTYPE *put_AllowAudioInputFormatChangesOnNextSet)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, VARIANT_BOOL Allow); HRESULT (STDMETHODCALLTYPE *get_AllowAudioInputFormatChangesOnNextSet)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, VARIANT_BOOL *Allow); HRESULT (STDMETHODCALLTYPE *putref_AudioInput)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechObjectToken *AudioInput); HRESULT (STDMETHODCALLTYPE *get_AudioInput)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechObjectToken **AudioInput); HRESULT (STDMETHODCALLTYPE *putref_AudioInputStream)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechBaseStream *AudioInputStream); HRESULT (STDMETHODCALLTYPE *get_AudioInputStream)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechBaseStream **AudioInputStream); HRESULT (STDMETHODCALLTYPE *get_IsShared)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, VARIANT_BOOL *Shared); HRESULT (STDMETHODCALLTYPE *put_State)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, SpeechRecognizerState State); HRESULT (STDMETHODCALLTYPE *get_State)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, SpeechRecognizerState *State); HRESULT (STDMETHODCALLTYPE *get_Status)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechRecognizerStatus **Status); HRESULT (STDMETHODCALLTYPE *putref_Profile)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechObjectToken *Profile); HRESULT (STDMETHODCALLTYPE *get_Profile)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechObjectToken **Profile); HRESULT (STDMETHODCALLTYPE *EmulateRecognition)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, VARIANT TextElements, VARIANT *ElementDisplayAttributes, LONG LanguageId); HRESULT (STDMETHODCALLTYPE *CreateRecoContext)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, ISpeechRecoContext **NewContext); HRESULT (STDMETHODCALLTYPE *GetFormat)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, SpeechFormatType Type, ISpeechAudioFormat **Format); HRESULT (STDMETHODCALLTYPE *SetPropertyNumber)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, const BSTR Name, LONG Value, VARIANT_BOOL *Supported); HRESULT (STDMETHODCALLTYPE *GetPropertyNumber)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, const BSTR Name, LONG *Value, VARIANT_BOOL *Supported); HRESULT (STDMETHODCALLTYPE *SetPropertyString)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, const BSTR Name, const BSTR Value, VARIANT_BOOL *Supported); HRESULT (STDMETHODCALLTYPE *GetPropertyString)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, const BSTR Name, BSTR *Value, VARIANT_BOOL *Supported); HRESULT (STDMETHODCALLTYPE *IsUISupported)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, const BSTR TypeOfUI, const VARIANT *ExtraData, VARIANT_BOOL *Supported); HRESULT (STDMETHODCALLTYPE *DisplayUI)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, LONG hWndParent, BSTR Title, const BSTR TypeOfUI, const VARIANT *ExtraData); HRESULT (STDMETHODCALLTYPE *GetRecognizers)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, BSTR RequiredAttributes, BSTR OptionalAttributes, ISpeechObjectTokens **ObjectTokens); HRESULT (STDMETHODCALLTYPE *GetAudioInputs)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, BSTR RequiredAttributes, BSTR OptionalAttributes, ISpeechObjectTokens **ObjectTokens); HRESULT (STDMETHODCALLTYPE *GetProfiles)( - ISpeechRecognizer* This, + ISpeechRecognizer *This, BSTR RequiredAttributes, BSTR OptionalAttributes, ISpeechObjectTokens **ObjectTokens); END_INTERFACE } ISpeechRecognizerVtbl; + interface ISpeechRecognizer { CONST_VTBL ISpeechRecognizerVtbl* lpVtbl; }; @@ -18938,236 +16286,6 @@ static FORCEINLINE HRESULT ISpeechRecognizer_GetProfiles(ISpeechRecognizer* This #endif -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_putref_Recognizer_Proxy( - ISpeechRecognizer* This, - ISpeechObjectToken *Recognizer); -void __RPC_STUB ISpeechRecognizer_putref_Recognizer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_Recognizer_Proxy( - ISpeechRecognizer* This, - ISpeechObjectToken **Recognizer); -void __RPC_STUB ISpeechRecognizer_get_Recognizer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_put_AllowAudioInputFormatChangesOnNextSet_Proxy( - ISpeechRecognizer* This, - VARIANT_BOOL Allow); -void __RPC_STUB ISpeechRecognizer_put_AllowAudioInputFormatChangesOnNextSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_AllowAudioInputFormatChangesOnNextSet_Proxy( - ISpeechRecognizer* This, - VARIANT_BOOL *Allow); -void __RPC_STUB ISpeechRecognizer_get_AllowAudioInputFormatChangesOnNextSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_putref_AudioInput_Proxy( - ISpeechRecognizer* This, - ISpeechObjectToken *AudioInput); -void __RPC_STUB ISpeechRecognizer_putref_AudioInput_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_AudioInput_Proxy( - ISpeechRecognizer* This, - ISpeechObjectToken **AudioInput); -void __RPC_STUB ISpeechRecognizer_get_AudioInput_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_putref_AudioInputStream_Proxy( - ISpeechRecognizer* This, - ISpeechBaseStream *AudioInputStream); -void __RPC_STUB ISpeechRecognizer_putref_AudioInputStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_AudioInputStream_Proxy( - ISpeechRecognizer* This, - ISpeechBaseStream **AudioInputStream); -void __RPC_STUB ISpeechRecognizer_get_AudioInputStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_IsShared_Proxy( - ISpeechRecognizer* This, - VARIANT_BOOL *Shared); -void __RPC_STUB ISpeechRecognizer_get_IsShared_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_put_State_Proxy( - ISpeechRecognizer* This, - SpeechRecognizerState State); -void __RPC_STUB ISpeechRecognizer_put_State_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_State_Proxy( - ISpeechRecognizer* This, - SpeechRecognizerState *State); -void __RPC_STUB ISpeechRecognizer_get_State_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_Status_Proxy( - ISpeechRecognizer* This, - ISpeechRecognizerStatus **Status); -void __RPC_STUB ISpeechRecognizer_get_Status_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_putref_Profile_Proxy( - ISpeechRecognizer* This, - ISpeechObjectToken *Profile); -void __RPC_STUB ISpeechRecognizer_putref_Profile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_Profile_Proxy( - ISpeechRecognizer* This, - ISpeechObjectToken **Profile); -void __RPC_STUB ISpeechRecognizer_get_Profile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_EmulateRecognition_Proxy( - ISpeechRecognizer* This, - VARIANT TextElements, - VARIANT *ElementDisplayAttributes, - LONG LanguageId); -void __RPC_STUB ISpeechRecognizer_EmulateRecognition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_CreateRecoContext_Proxy( - ISpeechRecognizer* This, - ISpeechRecoContext **NewContext); -void __RPC_STUB ISpeechRecognizer_CreateRecoContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetFormat_Proxy( - ISpeechRecognizer* This, - SpeechFormatType Type, - ISpeechAudioFormat **Format); -void __RPC_STUB ISpeechRecognizer_GetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_SetPropertyNumber_Proxy( - ISpeechRecognizer* This, - const BSTR Name, - LONG Value, - VARIANT_BOOL *Supported); -void __RPC_STUB ISpeechRecognizer_SetPropertyNumber_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetPropertyNumber_Proxy( - ISpeechRecognizer* This, - const BSTR Name, - LONG *Value, - VARIANT_BOOL *Supported); -void __RPC_STUB ISpeechRecognizer_GetPropertyNumber_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_SetPropertyString_Proxy( - ISpeechRecognizer* This, - const BSTR Name, - const BSTR Value, - VARIANT_BOOL *Supported); -void __RPC_STUB ISpeechRecognizer_SetPropertyString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetPropertyString_Proxy( - ISpeechRecognizer* This, - const BSTR Name, - BSTR *Value, - VARIANT_BOOL *Supported); -void __RPC_STUB ISpeechRecognizer_GetPropertyString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_IsUISupported_Proxy( - ISpeechRecognizer* This, - const BSTR TypeOfUI, - const VARIANT *ExtraData, - VARIANT_BOOL *Supported); -void __RPC_STUB ISpeechRecognizer_IsUISupported_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_DisplayUI_Proxy( - ISpeechRecognizer* This, - LONG hWndParent, - BSTR Title, - const BSTR TypeOfUI, - const VARIANT *ExtraData); -void __RPC_STUB ISpeechRecognizer_DisplayUI_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetRecognizers_Proxy( - ISpeechRecognizer* This, - BSTR RequiredAttributes, - BSTR OptionalAttributes, - ISpeechObjectTokens **ObjectTokens); -void __RPC_STUB ISpeechRecognizer_GetRecognizers_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetAudioInputs_Proxy( - ISpeechRecognizer* This, - BSTR RequiredAttributes, - BSTR OptionalAttributes, - ISpeechObjectTokens **ObjectTokens); -void __RPC_STUB ISpeechRecognizer_GetAudioInputs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetProfiles_Proxy( - ISpeechRecognizer* This, - BSTR RequiredAttributes, - BSTR OptionalAttributes, - ISpeechObjectTokens **ObjectTokens); -void __RPC_STUB ISpeechRecognizer_GetProfiles_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechRecognizer_INTERFACE_DEFINED__ */ @@ -19210,29 +16328,29 @@ typedef struct ISpeechRecognizerStatusVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechRecognizerStatus* This); + ISpeechRecognizerStatus *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechRecognizerStatus* This); + ISpeechRecognizerStatus *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -19240,7 +16358,7 @@ typedef struct ISpeechRecognizerStatusVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -19252,31 +16370,32 @@ typedef struct ISpeechRecognizerStatusVtbl { /*** ISpeechRecognizerStatus methods ***/ HRESULT (STDMETHODCALLTYPE *get_AudioStatus)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, ISpeechAudioStatus **AudioStatus); HRESULT (STDMETHODCALLTYPE *get_CurrentStreamPosition)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, VARIANT *pCurrentStreamPos); HRESULT (STDMETHODCALLTYPE *get_CurrentStreamNumber)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, LONG *StreamNumber); HRESULT (STDMETHODCALLTYPE *get_NumberOfActiveRules)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, LONG *NumberOfActiveRules); HRESULT (STDMETHODCALLTYPE *get_ClsidEngine)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, BSTR *ClsidEngine); HRESULT (STDMETHODCALLTYPE *get_SupportedLanguages)( - ISpeechRecognizerStatus* This, + ISpeechRecognizerStatus *This, VARIANT *SupportedLanguages); END_INTERFACE } ISpeechRecognizerStatusVtbl; + interface ISpeechRecognizerStatus { CONST_VTBL ISpeechRecognizerStatusVtbl* lpVtbl; }; @@ -19347,54 +16466,6 @@ static FORCEINLINE HRESULT ISpeechRecognizerStatus_get_SupportedLanguages(ISpeec #endif -HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_AudioStatus_Proxy( - ISpeechRecognizerStatus* This, - ISpeechAudioStatus **AudioStatus); -void __RPC_STUB ISpeechRecognizerStatus_get_AudioStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_CurrentStreamPosition_Proxy( - ISpeechRecognizerStatus* This, - VARIANT *pCurrentStreamPos); -void __RPC_STUB ISpeechRecognizerStatus_get_CurrentStreamPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_CurrentStreamNumber_Proxy( - ISpeechRecognizerStatus* This, - LONG *StreamNumber); -void __RPC_STUB ISpeechRecognizerStatus_get_CurrentStreamNumber_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_NumberOfActiveRules_Proxy( - ISpeechRecognizerStatus* This, - LONG *NumberOfActiveRules); -void __RPC_STUB ISpeechRecognizerStatus_get_NumberOfActiveRules_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_ClsidEngine_Proxy( - ISpeechRecognizerStatus* This, - BSTR *ClsidEngine); -void __RPC_STUB ISpeechRecognizerStatus_get_ClsidEngine_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_SupportedLanguages_Proxy( - ISpeechRecognizerStatus* This, - VARIANT *SupportedLanguages); -void __RPC_STUB ISpeechRecognizerStatus_get_SupportedLanguages_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechRecognizerStatus_INTERFACE_DEFINED__ */ @@ -19498,29 +16569,29 @@ typedef struct ISpeechRecoContextVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechRecoContext* This); + ISpeechRecoContext *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechRecoContext* This); + ISpeechRecoContext *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -19528,7 +16599,7 @@ typedef struct ISpeechRecoContextVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -19540,109 +16611,110 @@ typedef struct ISpeechRecoContextVtbl { /*** ISpeechRecoContext methods ***/ HRESULT (STDMETHODCALLTYPE *get_Recognizer)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, ISpeechRecognizer **Recognizer); HRESULT (STDMETHODCALLTYPE *get_AudioInputInterferenceStatus)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechInterference *Interference); HRESULT (STDMETHODCALLTYPE *get_RequestedUIType)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, BSTR *UIType); HRESULT (STDMETHODCALLTYPE *putref_Voice)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, ISpeechVoice *Voice); HRESULT (STDMETHODCALLTYPE *get_Voice)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, ISpeechVoice **Voice); HRESULT (STDMETHODCALLTYPE *put_AllowVoiceFormatMatchingOnNextSet)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, VARIANT_BOOL Allow); HRESULT (STDMETHODCALLTYPE *get_AllowVoiceFormatMatchingOnNextSet)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, VARIANT_BOOL *pAllow); HRESULT (STDMETHODCALLTYPE *put_VoicePurgeEvent)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechRecoEvents EventInterest); HRESULT (STDMETHODCALLTYPE *get_VoicePurgeEvent)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechRecoEvents *EventInterest); HRESULT (STDMETHODCALLTYPE *put_EventInterests)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechRecoEvents EventInterest); HRESULT (STDMETHODCALLTYPE *get_EventInterests)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechRecoEvents *EventInterest); HRESULT (STDMETHODCALLTYPE *put_CmdMaxAlternates)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, LONG MaxAlternates); HRESULT (STDMETHODCALLTYPE *get_CmdMaxAlternates)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, LONG *MaxAlternates); HRESULT (STDMETHODCALLTYPE *put_State)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechRecoContextState State); HRESULT (STDMETHODCALLTYPE *get_State)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechRecoContextState *State); HRESULT (STDMETHODCALLTYPE *put_RetainedAudio)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechRetainedAudioOptions Option); HRESULT (STDMETHODCALLTYPE *get_RetainedAudio)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechRetainedAudioOptions *Option); HRESULT (STDMETHODCALLTYPE *putref_RetainedAudioFormat)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, ISpeechAudioFormat *Format); HRESULT (STDMETHODCALLTYPE *get_RetainedAudioFormat)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, ISpeechAudioFormat **Format); HRESULT (STDMETHODCALLTYPE *Pause)( - ISpeechRecoContext* This); + ISpeechRecoContext *This); HRESULT (STDMETHODCALLTYPE *Resume)( - ISpeechRecoContext* This); + ISpeechRecoContext *This); HRESULT (STDMETHODCALLTYPE *CreateGrammar)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, VARIANT GrammarId, ISpeechRecoGrammar **Grammar); HRESULT (STDMETHODCALLTYPE *CreateResultFromMemory)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, VARIANT *ResultBlock, ISpeechRecoResult **Result); HRESULT (STDMETHODCALLTYPE *Bookmark)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, SpeechBookmarkOptions Options, VARIANT StreamPos, VARIANT BookmarkId); HRESULT (STDMETHODCALLTYPE *SetAdaptationData)( - ISpeechRecoContext* This, + ISpeechRecoContext *This, BSTR AdaptationString); END_INTERFACE } ISpeechRecoContextVtbl; + interface ISpeechRecoContext { CONST_VTBL ISpeechRecoContextVtbl* lpVtbl; }; @@ -19789,208 +16861,6 @@ static FORCEINLINE HRESULT ISpeechRecoContext_SetAdaptationData(ISpeechRecoConte #endif -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_Recognizer_Proxy( - ISpeechRecoContext* This, - ISpeechRecognizer **Recognizer); -void __RPC_STUB ISpeechRecoContext_get_Recognizer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_AudioInputInterferenceStatus_Proxy( - ISpeechRecoContext* This, - SpeechInterference *Interference); -void __RPC_STUB ISpeechRecoContext_get_AudioInputInterferenceStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_RequestedUIType_Proxy( - ISpeechRecoContext* This, - BSTR *UIType); -void __RPC_STUB ISpeechRecoContext_get_RequestedUIType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_putref_Voice_Proxy( - ISpeechRecoContext* This, - ISpeechVoice *Voice); -void __RPC_STUB ISpeechRecoContext_putref_Voice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_Voice_Proxy( - ISpeechRecoContext* This, - ISpeechVoice **Voice); -void __RPC_STUB ISpeechRecoContext_get_Voice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_AllowVoiceFormatMatchingOnNextSet_Proxy( - ISpeechRecoContext* This, - VARIANT_BOOL Allow); -void __RPC_STUB ISpeechRecoContext_put_AllowVoiceFormatMatchingOnNextSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_AllowVoiceFormatMatchingOnNextSet_Proxy( - ISpeechRecoContext* This, - VARIANT_BOOL *pAllow); -void __RPC_STUB ISpeechRecoContext_get_AllowVoiceFormatMatchingOnNextSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_VoicePurgeEvent_Proxy( - ISpeechRecoContext* This, - SpeechRecoEvents EventInterest); -void __RPC_STUB ISpeechRecoContext_put_VoicePurgeEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_VoicePurgeEvent_Proxy( - ISpeechRecoContext* This, - SpeechRecoEvents *EventInterest); -void __RPC_STUB ISpeechRecoContext_get_VoicePurgeEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_EventInterests_Proxy( - ISpeechRecoContext* This, - SpeechRecoEvents EventInterest); -void __RPC_STUB ISpeechRecoContext_put_EventInterests_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_EventInterests_Proxy( - ISpeechRecoContext* This, - SpeechRecoEvents *EventInterest); -void __RPC_STUB ISpeechRecoContext_get_EventInterests_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_CmdMaxAlternates_Proxy( - ISpeechRecoContext* This, - LONG MaxAlternates); -void __RPC_STUB ISpeechRecoContext_put_CmdMaxAlternates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_CmdMaxAlternates_Proxy( - ISpeechRecoContext* This, - LONG *MaxAlternates); -void __RPC_STUB ISpeechRecoContext_get_CmdMaxAlternates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_State_Proxy( - ISpeechRecoContext* This, - SpeechRecoContextState State); -void __RPC_STUB ISpeechRecoContext_put_State_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_State_Proxy( - ISpeechRecoContext* This, - SpeechRecoContextState *State); -void __RPC_STUB ISpeechRecoContext_get_State_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_RetainedAudio_Proxy( - ISpeechRecoContext* This, - SpeechRetainedAudioOptions Option); -void __RPC_STUB ISpeechRecoContext_put_RetainedAudio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_RetainedAudio_Proxy( - ISpeechRecoContext* This, - SpeechRetainedAudioOptions *Option); -void __RPC_STUB ISpeechRecoContext_get_RetainedAudio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_putref_RetainedAudioFormat_Proxy( - ISpeechRecoContext* This, - ISpeechAudioFormat *Format); -void __RPC_STUB ISpeechRecoContext_putref_RetainedAudioFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_RetainedAudioFormat_Proxy( - ISpeechRecoContext* This, - ISpeechAudioFormat **Format); -void __RPC_STUB ISpeechRecoContext_get_RetainedAudioFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_Pause_Proxy( - ISpeechRecoContext* This); -void __RPC_STUB ISpeechRecoContext_Pause_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_Resume_Proxy( - ISpeechRecoContext* This); -void __RPC_STUB ISpeechRecoContext_Resume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_CreateGrammar_Proxy( - ISpeechRecoContext* This, - VARIANT GrammarId, - ISpeechRecoGrammar **Grammar); -void __RPC_STUB ISpeechRecoContext_CreateGrammar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_CreateResultFromMemory_Proxy( - ISpeechRecoContext* This, - VARIANT *ResultBlock, - ISpeechRecoResult **Result); -void __RPC_STUB ISpeechRecoContext_CreateResultFromMemory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_Bookmark_Proxy( - ISpeechRecoContext* This, - SpeechBookmarkOptions Options, - VARIANT StreamPos, - VARIANT BookmarkId); -void __RPC_STUB ISpeechRecoContext_Bookmark_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoContext_SetAdaptationData_Proxy( - ISpeechRecoContext* This, - BSTR AdaptationString); -void __RPC_STUB ISpeechRecoContext_SetAdaptationData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechRecoContext_INTERFACE_DEFINED__ */ @@ -20089,29 +16959,29 @@ typedef struct ISpeechRecoGrammarVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechRecoGrammar* This); + ISpeechRecoGrammar *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechRecoGrammar* This); + ISpeechRecoGrammar *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -20119,7 +16989,7 @@ typedef struct ISpeechRecoGrammarVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -20131,42 +17001,42 @@ typedef struct ISpeechRecoGrammarVtbl { /*** ISpeechRecoGrammar methods ***/ HRESULT (STDMETHODCALLTYPE *get_Id)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, VARIANT *Id); HRESULT (STDMETHODCALLTYPE *get_RecoContext)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, ISpeechRecoContext **RecoContext); HRESULT (STDMETHODCALLTYPE *put_State)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, SpeechGrammarState State); HRESULT (STDMETHODCALLTYPE *get_State)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, SpeechGrammarState *State); HRESULT (STDMETHODCALLTYPE *get_Rules)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, ISpeechGrammarRules **Rules); HRESULT (STDMETHODCALLTYPE *Reset)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, SpeechLanguageId NewLanguage); HRESULT (STDMETHODCALLTYPE *CmdLoadFromFile)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, const BSTR FileName, SpeechLoadOption LoadOption); HRESULT (STDMETHODCALLTYPE *CmdLoadFromObject)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, const BSTR ClassId, const BSTR GrammarName, SpeechLoadOption LoadOption); HRESULT (STDMETHODCALLTYPE *CmdLoadFromResource)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, LONG hModule, VARIANT ResourceName, VARIANT ResourceType, @@ -20174,56 +17044,57 @@ typedef struct ISpeechRecoGrammarVtbl { SpeechLoadOption LoadOption); HRESULT (STDMETHODCALLTYPE *CmdLoadFromMemory)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, VARIANT GrammarData, SpeechLoadOption LoadOption); HRESULT (STDMETHODCALLTYPE *CmdLoadFromProprietaryGrammar)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, const BSTR ProprietaryGuid, const BSTR ProprietaryString, VARIANT ProprietaryData, SpeechLoadOption LoadOption); HRESULT (STDMETHODCALLTYPE *CmdSetRuleState)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, const BSTR Name, SpeechRuleState State); HRESULT (STDMETHODCALLTYPE *CmdSetRuleIdState)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, LONG RuleId, SpeechRuleState State); HRESULT (STDMETHODCALLTYPE *DictationLoad)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, const BSTR TopicName, SpeechLoadOption LoadOption); HRESULT (STDMETHODCALLTYPE *DictationUnload)( - ISpeechRecoGrammar* This); + ISpeechRecoGrammar *This); HRESULT (STDMETHODCALLTYPE *DictationSetState)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, SpeechRuleState State); HRESULT (STDMETHODCALLTYPE *SetWordSequenceData)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, const BSTR Text, LONG TextLength, ISpeechTextSelectionInformation *Info); HRESULT (STDMETHODCALLTYPE *SetTextSelection)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, ISpeechTextSelectionInformation *Info); HRESULT (STDMETHODCALLTYPE *IsPronounceable)( - ISpeechRecoGrammar* This, + ISpeechRecoGrammar *This, const BSTR Word, SpeechWordPronounceable *WordPronounceable); END_INTERFACE } ISpeechRecoGrammarVtbl; + interface ISpeechRecoGrammar { CONST_VTBL ISpeechRecoGrammarVtbl* lpVtbl; }; @@ -20346,174 +17217,6 @@ static FORCEINLINE HRESULT ISpeechRecoGrammar_IsPronounceable(ISpeechRecoGrammar #endif -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_get_Id_Proxy( - ISpeechRecoGrammar* This, - VARIANT *Id); -void __RPC_STUB ISpeechRecoGrammar_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_get_RecoContext_Proxy( - ISpeechRecoGrammar* This, - ISpeechRecoContext **RecoContext); -void __RPC_STUB ISpeechRecoGrammar_get_RecoContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_put_State_Proxy( - ISpeechRecoGrammar* This, - SpeechGrammarState State); -void __RPC_STUB ISpeechRecoGrammar_put_State_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_get_State_Proxy( - ISpeechRecoGrammar* This, - SpeechGrammarState *State); -void __RPC_STUB ISpeechRecoGrammar_get_State_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_get_Rules_Proxy( - ISpeechRecoGrammar* This, - ISpeechGrammarRules **Rules); -void __RPC_STUB ISpeechRecoGrammar_get_Rules_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_Reset_Proxy( - ISpeechRecoGrammar* This, - SpeechLanguageId NewLanguage); -void __RPC_STUB ISpeechRecoGrammar_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromFile_Proxy( - ISpeechRecoGrammar* This, - const BSTR FileName, - SpeechLoadOption LoadOption); -void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromObject_Proxy( - ISpeechRecoGrammar* This, - const BSTR ClassId, - const BSTR GrammarName, - SpeechLoadOption LoadOption); -void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromResource_Proxy( - ISpeechRecoGrammar* This, - LONG hModule, - VARIANT ResourceName, - VARIANT ResourceType, - SpeechLanguageId LanguageId, - SpeechLoadOption LoadOption); -void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromMemory_Proxy( - ISpeechRecoGrammar* This, - VARIANT GrammarData, - SpeechLoadOption LoadOption); -void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromMemory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromProprietaryGrammar_Proxy( - ISpeechRecoGrammar* This, - const BSTR ProprietaryGuid, - const BSTR ProprietaryString, - VARIANT ProprietaryData, - SpeechLoadOption LoadOption); -void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromProprietaryGrammar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdSetRuleState_Proxy( - ISpeechRecoGrammar* This, - const BSTR Name, - SpeechRuleState State); -void __RPC_STUB ISpeechRecoGrammar_CmdSetRuleState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdSetRuleIdState_Proxy( - ISpeechRecoGrammar* This, - LONG RuleId, - SpeechRuleState State); -void __RPC_STUB ISpeechRecoGrammar_CmdSetRuleIdState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_DictationLoad_Proxy( - ISpeechRecoGrammar* This, - const BSTR TopicName, - SpeechLoadOption LoadOption); -void __RPC_STUB ISpeechRecoGrammar_DictationLoad_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_DictationUnload_Proxy( - ISpeechRecoGrammar* This); -void __RPC_STUB ISpeechRecoGrammar_DictationUnload_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_DictationSetState_Proxy( - ISpeechRecoGrammar* This, - SpeechRuleState State); -void __RPC_STUB ISpeechRecoGrammar_DictationSetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_SetWordSequenceData_Proxy( - ISpeechRecoGrammar* This, - const BSTR Text, - LONG TextLength, - ISpeechTextSelectionInformation *Info); -void __RPC_STUB ISpeechRecoGrammar_SetWordSequenceData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_SetTextSelection_Proxy( - ISpeechRecoGrammar* This, - ISpeechTextSelectionInformation *Info); -void __RPC_STUB ISpeechRecoGrammar_SetTextSelection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_IsPronounceable_Proxy( - ISpeechRecoGrammar* This, - const BSTR Word, - SpeechWordPronounceable *WordPronounceable); -void __RPC_STUB ISpeechRecoGrammar_IsPronounceable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechRecoGrammar_INTERFACE_DEFINED__ */ @@ -20538,29 +17241,29 @@ typedef struct _ISpeechRecoContextEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - _ISpeechRecoContextEvents* This, + _ISpeechRecoContextEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - _ISpeechRecoContextEvents* This); + _ISpeechRecoContextEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - _ISpeechRecoContextEvents* This); + _ISpeechRecoContextEvents *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - _ISpeechRecoContextEvents* This, + _ISpeechRecoContextEvents *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - _ISpeechRecoContextEvents* This, + _ISpeechRecoContextEvents *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - _ISpeechRecoContextEvents* This, + _ISpeechRecoContextEvents *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -20568,7 +17271,7 @@ typedef struct _ISpeechRecoContextEventsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - _ISpeechRecoContextEvents* This, + _ISpeechRecoContextEvents *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -20580,6 +17283,7 @@ typedef struct _ISpeechRecoContextEventsVtbl { END_INTERFACE } _ISpeechRecoContextEventsVtbl; + interface _ISpeechRecoContextEvents { CONST_VTBL _ISpeechRecoContextEventsVtbl* lpVtbl; }; @@ -20669,29 +17373,29 @@ typedef struct ISpeechGrammarRuleVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechGrammarRule* This); + ISpeechGrammarRule *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechGrammarRule* This); + ISpeechGrammarRule *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -20699,7 +17403,7 @@ typedef struct ISpeechGrammarRuleVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -20711,35 +17415,36 @@ typedef struct ISpeechGrammarRuleVtbl { /*** ISpeechGrammarRule methods ***/ HRESULT (STDMETHODCALLTYPE *get_Attributes)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, SpeechRuleAttributes *Attributes); HRESULT (STDMETHODCALLTYPE *get_InitialState)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, ISpeechGrammarRuleState **State); HRESULT (STDMETHODCALLTYPE *get_Name)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, BSTR *Name); HRESULT (STDMETHODCALLTYPE *get_Id)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, LONG *Id); HRESULT (STDMETHODCALLTYPE *Clear)( - ISpeechGrammarRule* This); + ISpeechGrammarRule *This); HRESULT (STDMETHODCALLTYPE *AddResource)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, const BSTR ResourceName, const BSTR ResourceValue); HRESULT (STDMETHODCALLTYPE *AddState)( - ISpeechGrammarRule* This, + ISpeechGrammarRule *This, ISpeechGrammarRuleState **State); END_INTERFACE } ISpeechGrammarRuleVtbl; + interface ISpeechGrammarRule { CONST_VTBL ISpeechGrammarRuleVtbl* lpVtbl; }; @@ -20814,62 +17519,6 @@ static FORCEINLINE HRESULT ISpeechGrammarRule_AddState(ISpeechGrammarRule* This, #endif -HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_get_Attributes_Proxy( - ISpeechGrammarRule* This, - SpeechRuleAttributes *Attributes); -void __RPC_STUB ISpeechGrammarRule_get_Attributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_get_InitialState_Proxy( - ISpeechGrammarRule* This, - ISpeechGrammarRuleState **State); -void __RPC_STUB ISpeechGrammarRule_get_InitialState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_get_Name_Proxy( - ISpeechGrammarRule* This, - BSTR *Name); -void __RPC_STUB ISpeechGrammarRule_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_get_Id_Proxy( - ISpeechGrammarRule* This, - LONG *Id); -void __RPC_STUB ISpeechGrammarRule_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_Clear_Proxy( - ISpeechGrammarRule* This); -void __RPC_STUB ISpeechGrammarRule_Clear_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_AddResource_Proxy( - ISpeechGrammarRule* This, - const BSTR ResourceName, - const BSTR ResourceValue); -void __RPC_STUB ISpeechGrammarRule_AddResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_AddState_Proxy( - ISpeechGrammarRule* This, - ISpeechGrammarRuleState **State); -void __RPC_STUB ISpeechGrammarRule_AddState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechGrammarRule_INTERFACE_DEFINED__ */ @@ -20924,29 +17573,29 @@ typedef struct ISpeechGrammarRulesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechGrammarRules* This); + ISpeechGrammarRules *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechGrammarRules* This); + ISpeechGrammarRules *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -20954,7 +17603,7 @@ typedef struct ISpeechGrammarRulesVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -20966,44 +17615,45 @@ typedef struct ISpeechGrammarRulesVtbl { /*** ISpeechGrammarRules methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *FindRule)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, VARIANT RuleNameOrId, ISpeechGrammarRule **Rule); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, LONG Index, ISpeechGrammarRule **Rule); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, IUnknown **EnumVARIANT); HRESULT (STDMETHODCALLTYPE *get_Dynamic)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, VARIANT_BOOL *Dynamic); HRESULT (STDMETHODCALLTYPE *Add)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, BSTR RuleName, SpeechRuleAttributes Attributes, LONG RuleId, ISpeechGrammarRule **Rule); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpeechGrammarRules* This); + ISpeechGrammarRules *This); HRESULT (STDMETHODCALLTYPE *CommitAndSave)( - ISpeechGrammarRules* This, + ISpeechGrammarRules *This, BSTR *ErrorText, VARIANT *SaveStream); END_INTERFACE } ISpeechGrammarRulesVtbl; + interface ISpeechGrammarRules { CONST_VTBL ISpeechGrammarRulesVtbl* lpVtbl; }; @@ -21082,75 +17732,6 @@ static FORCEINLINE HRESULT ISpeechGrammarRules_CommitAndSave(ISpeechGrammarRules #endif -HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_get_Count_Proxy( - ISpeechGrammarRules* This, - LONG *Count); -void __RPC_STUB ISpeechGrammarRules_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_FindRule_Proxy( - ISpeechGrammarRules* This, - VARIANT RuleNameOrId, - ISpeechGrammarRule **Rule); -void __RPC_STUB ISpeechGrammarRules_FindRule_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_Item_Proxy( - ISpeechGrammarRules* This, - LONG Index, - ISpeechGrammarRule **Rule); -void __RPC_STUB ISpeechGrammarRules_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_get__NewEnum_Proxy( - ISpeechGrammarRules* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechGrammarRules_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_get_Dynamic_Proxy( - ISpeechGrammarRules* This, - VARIANT_BOOL *Dynamic); -void __RPC_STUB ISpeechGrammarRules_get_Dynamic_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_Add_Proxy( - ISpeechGrammarRules* This, - BSTR RuleName, - SpeechRuleAttributes Attributes, - LONG RuleId, - ISpeechGrammarRule **Rule); -void __RPC_STUB ISpeechGrammarRules_Add_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_Commit_Proxy( - ISpeechGrammarRules* This); -void __RPC_STUB ISpeechGrammarRules_Commit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_CommitAndSave_Proxy( - ISpeechGrammarRules* This, - BSTR *ErrorText, - VARIANT *SaveStream); -void __RPC_STUB ISpeechGrammarRules_CommitAndSave_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechGrammarRules_INTERFACE_DEFINED__ */ @@ -21207,29 +17788,29 @@ typedef struct ISpeechGrammarRuleStateVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechGrammarRuleState* This); + ISpeechGrammarRuleState *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechGrammarRuleState* This); + ISpeechGrammarRuleState *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -21237,7 +17818,7 @@ typedef struct ISpeechGrammarRuleStateVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -21249,15 +17830,15 @@ typedef struct ISpeechGrammarRuleStateVtbl { /*** ISpeechGrammarRuleState methods ***/ HRESULT (STDMETHODCALLTYPE *get_Rule)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, ISpeechGrammarRule **Rule); HRESULT (STDMETHODCALLTYPE *get_Transitions)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, ISpeechGrammarRuleStateTransitions **Transitions); HRESULT (STDMETHODCALLTYPE *AddWordTransition)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, ISpeechGrammarRuleState *DestState, const BSTR Words, const BSTR Separators, @@ -21268,7 +17849,7 @@ typedef struct ISpeechGrammarRuleStateVtbl { float Weight); HRESULT (STDMETHODCALLTYPE *AddRuleTransition)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, ISpeechGrammarRuleState *DestinationState, ISpeechGrammarRule *Rule, const BSTR PropertyName, @@ -21277,7 +17858,7 @@ typedef struct ISpeechGrammarRuleStateVtbl { float Weight); HRESULT (STDMETHODCALLTYPE *AddSpecialTransition)( - ISpeechGrammarRuleState* This, + ISpeechGrammarRuleState *This, ISpeechGrammarRuleState *DestinationState, SpeechSpecialTransitionType Type, const BSTR PropertyName, @@ -21287,6 +17868,7 @@ typedef struct ISpeechGrammarRuleStateVtbl { END_INTERFACE } ISpeechGrammarRuleStateVtbl; + interface ISpeechGrammarRuleState { CONST_VTBL ISpeechGrammarRuleStateVtbl* lpVtbl; }; @@ -21353,63 +17935,6 @@ static FORCEINLINE HRESULT ISpeechGrammarRuleState_AddSpecialTransition(ISpeechG #endif -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_get_Rule_Proxy( - ISpeechGrammarRuleState* This, - ISpeechGrammarRule **Rule); -void __RPC_STUB ISpeechGrammarRuleState_get_Rule_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_get_Transitions_Proxy( - ISpeechGrammarRuleState* This, - ISpeechGrammarRuleStateTransitions **Transitions); -void __RPC_STUB ISpeechGrammarRuleState_get_Transitions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_AddWordTransition_Proxy( - ISpeechGrammarRuleState* This, - ISpeechGrammarRuleState *DestState, - const BSTR Words, - const BSTR Separators, - SpeechGrammarWordType Type, - const BSTR PropertyName, - LONG PropertyId, - VARIANT *PropertyValue, - float Weight); -void __RPC_STUB ISpeechGrammarRuleState_AddWordTransition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_AddRuleTransition_Proxy( - ISpeechGrammarRuleState* This, - ISpeechGrammarRuleState *DestinationState, - ISpeechGrammarRule *Rule, - const BSTR PropertyName, - LONG PropertyId, - VARIANT *PropertyValue, - float Weight); -void __RPC_STUB ISpeechGrammarRuleState_AddRuleTransition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_AddSpecialTransition_Proxy( - ISpeechGrammarRuleState* This, - ISpeechGrammarRuleState *DestinationState, - SpeechSpecialTransitionType Type, - const BSTR PropertyName, - LONG PropertyId, - VARIANT *PropertyValue, - float Weight); -void __RPC_STUB ISpeechGrammarRuleState_AddSpecialTransition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechGrammarRuleState_INTERFACE_DEFINED__ */ @@ -21444,29 +17969,29 @@ typedef struct ISpeechGrammarRuleStateTransitionsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechGrammarRuleStateTransitions* This, + ISpeechGrammarRuleStateTransitions *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechGrammarRuleStateTransitions* This); + ISpeechGrammarRuleStateTransitions *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechGrammarRuleStateTransitions* This); + ISpeechGrammarRuleStateTransitions *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechGrammarRuleStateTransitions* This, + ISpeechGrammarRuleStateTransitions *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechGrammarRuleStateTransitions* This, + ISpeechGrammarRuleStateTransitions *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechGrammarRuleStateTransitions* This, + ISpeechGrammarRuleStateTransitions *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -21474,7 +17999,7 @@ typedef struct ISpeechGrammarRuleStateTransitionsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechGrammarRuleStateTransitions* This, + ISpeechGrammarRuleStateTransitions *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -21486,20 +18011,21 @@ typedef struct ISpeechGrammarRuleStateTransitionsVtbl { /*** ISpeechGrammarRuleStateTransitions methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechGrammarRuleStateTransitions* This, + ISpeechGrammarRuleStateTransitions *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechGrammarRuleStateTransitions* This, + ISpeechGrammarRuleStateTransitions *This, LONG Index, ISpeechGrammarRuleStateTransition **Transition); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechGrammarRuleStateTransitions* This, + ISpeechGrammarRuleStateTransitions *This, IUnknown **EnumVARIANT); END_INTERFACE } ISpeechGrammarRuleStateTransitionsVtbl; + interface ISpeechGrammarRuleStateTransitions { CONST_VTBL ISpeechGrammarRuleStateTransitionsVtbl* lpVtbl; }; @@ -21558,31 +18084,6 @@ static FORCEINLINE HRESULT ISpeechGrammarRuleStateTransitions_get__NewEnum(ISpee #endif -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransitions_get_Count_Proxy( - ISpeechGrammarRuleStateTransitions* This, - LONG *Count); -void __RPC_STUB ISpeechGrammarRuleStateTransitions_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransitions_Item_Proxy( - ISpeechGrammarRuleStateTransitions* This, - LONG Index, - ISpeechGrammarRuleStateTransition **Transition); -void __RPC_STUB ISpeechGrammarRuleStateTransitions_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransitions_get__NewEnum_Proxy( - ISpeechGrammarRuleStateTransitions* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechGrammarRuleStateTransitions_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechGrammarRuleStateTransitions_INTERFACE_DEFINED__ */ @@ -21631,29 +18132,29 @@ typedef struct ISpeechGrammarRuleStateTransitionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechGrammarRuleStateTransition* This); + ISpeechGrammarRuleStateTransition *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechGrammarRuleStateTransition* This); + ISpeechGrammarRuleStateTransition *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -21661,7 +18162,7 @@ typedef struct ISpeechGrammarRuleStateTransitionVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -21673,39 +18174,40 @@ typedef struct ISpeechGrammarRuleStateTransitionVtbl { /*** ISpeechGrammarRuleStateTransition methods ***/ HRESULT (STDMETHODCALLTYPE *get_Type)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, SpeechGrammarRuleStateTransitionType *Type); HRESULT (STDMETHODCALLTYPE *get_Text)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, BSTR *Text); HRESULT (STDMETHODCALLTYPE *get_Rule)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, ISpeechGrammarRule **Rule); HRESULT (STDMETHODCALLTYPE *get_Weight)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, VARIANT *Weight); HRESULT (STDMETHODCALLTYPE *get_PropertyName)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, BSTR *PropertyName); HRESULT (STDMETHODCALLTYPE *get_PropertyId)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, LONG *PropertyId); HRESULT (STDMETHODCALLTYPE *get_PropertyValue)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, VARIANT *PropertyValue); HRESULT (STDMETHODCALLTYPE *get_NextState)( - ISpeechGrammarRuleStateTransition* This, + ISpeechGrammarRuleStateTransition *This, ISpeechGrammarRuleState **NextState); END_INTERFACE } ISpeechGrammarRuleStateTransitionVtbl; + interface ISpeechGrammarRuleStateTransition { CONST_VTBL ISpeechGrammarRuleStateTransitionVtbl* lpVtbl; }; @@ -21784,70 +18286,6 @@ static FORCEINLINE HRESULT ISpeechGrammarRuleStateTransition_get_NextState(ISpee #endif -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_Type_Proxy( - ISpeechGrammarRuleStateTransition* This, - SpeechGrammarRuleStateTransitionType *Type); -void __RPC_STUB ISpeechGrammarRuleStateTransition_get_Type_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_Text_Proxy( - ISpeechGrammarRuleStateTransition* This, - BSTR *Text); -void __RPC_STUB ISpeechGrammarRuleStateTransition_get_Text_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_Rule_Proxy( - ISpeechGrammarRuleStateTransition* This, - ISpeechGrammarRule **Rule); -void __RPC_STUB ISpeechGrammarRuleStateTransition_get_Rule_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_Weight_Proxy( - ISpeechGrammarRuleStateTransition* This, - VARIANT *Weight); -void __RPC_STUB ISpeechGrammarRuleStateTransition_get_Weight_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_PropertyName_Proxy( - ISpeechGrammarRuleStateTransition* This, - BSTR *PropertyName); -void __RPC_STUB ISpeechGrammarRuleStateTransition_get_PropertyName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_PropertyId_Proxy( - ISpeechGrammarRuleStateTransition* This, - LONG *PropertyId); -void __RPC_STUB ISpeechGrammarRuleStateTransition_get_PropertyId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_PropertyValue_Proxy( - ISpeechGrammarRuleStateTransition* This, - VARIANT *PropertyValue); -void __RPC_STUB ISpeechGrammarRuleStateTransition_get_PropertyValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_NextState_Proxy( - ISpeechGrammarRuleStateTransition* This, - ISpeechGrammarRuleState **NextState); -void __RPC_STUB ISpeechGrammarRuleStateTransition_get_NextState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechGrammarRuleStateTransition_INTERFACE_DEFINED__ */ @@ -21896,29 +18334,29 @@ typedef struct ISpeechTextSelectionInformationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechTextSelectionInformation* This); + ISpeechTextSelectionInformation *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechTextSelectionInformation* This); + ISpeechTextSelectionInformation *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -21926,7 +18364,7 @@ typedef struct ISpeechTextSelectionInformationVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -21938,39 +18376,40 @@ typedef struct ISpeechTextSelectionInformationVtbl { /*** ISpeechTextSelectionInformation methods ***/ HRESULT (STDMETHODCALLTYPE *put_ActiveOffset)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, LONG ActiveOffset); HRESULT (STDMETHODCALLTYPE *get_ActiveOffset)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, LONG *ActiveOffset); HRESULT (STDMETHODCALLTYPE *put_ActiveLength)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, LONG ActiveLength); HRESULT (STDMETHODCALLTYPE *get_ActiveLength)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, LONG *ActiveLength); HRESULT (STDMETHODCALLTYPE *put_SelectionOffset)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, LONG SelectionOffset); HRESULT (STDMETHODCALLTYPE *get_SelectionOffset)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, LONG *SelectionOffset); HRESULT (STDMETHODCALLTYPE *put_SelectionLength)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, LONG SelectionLength); HRESULT (STDMETHODCALLTYPE *get_SelectionLength)( - ISpeechTextSelectionInformation* This, + ISpeechTextSelectionInformation *This, LONG *SelectionLength); END_INTERFACE } ISpeechTextSelectionInformationVtbl; + interface ISpeechTextSelectionInformation { CONST_VTBL ISpeechTextSelectionInformationVtbl* lpVtbl; }; @@ -22049,70 +18488,6 @@ static FORCEINLINE HRESULT ISpeechTextSelectionInformation_get_SelectionLength(I #endif -HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_put_ActiveOffset_Proxy( - ISpeechTextSelectionInformation* This, - LONG ActiveOffset); -void __RPC_STUB ISpeechTextSelectionInformation_put_ActiveOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_get_ActiveOffset_Proxy( - ISpeechTextSelectionInformation* This, - LONG *ActiveOffset); -void __RPC_STUB ISpeechTextSelectionInformation_get_ActiveOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_put_ActiveLength_Proxy( - ISpeechTextSelectionInformation* This, - LONG ActiveLength); -void __RPC_STUB ISpeechTextSelectionInformation_put_ActiveLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_get_ActiveLength_Proxy( - ISpeechTextSelectionInformation* This, - LONG *ActiveLength); -void __RPC_STUB ISpeechTextSelectionInformation_get_ActiveLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_put_SelectionOffset_Proxy( - ISpeechTextSelectionInformation* This, - LONG SelectionOffset); -void __RPC_STUB ISpeechTextSelectionInformation_put_SelectionOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_get_SelectionOffset_Proxy( - ISpeechTextSelectionInformation* This, - LONG *SelectionOffset); -void __RPC_STUB ISpeechTextSelectionInformation_get_SelectionOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_put_SelectionLength_Proxy( - ISpeechTextSelectionInformation* This, - LONG SelectionLength); -void __RPC_STUB ISpeechTextSelectionInformation_put_SelectionLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_get_SelectionLength_Proxy( - ISpeechTextSelectionInformation* This, - LONG *SelectionLength); -void __RPC_STUB ISpeechTextSelectionInformation_get_SelectionLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechTextSelectionInformation_INTERFACE_DEFINED__ */ @@ -22175,29 +18550,29 @@ typedef struct ISpeechRecoResultVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechRecoResult* This); + ISpeechRecoResult *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechRecoResult* This); + ISpeechRecoResult *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -22205,7 +18580,7 @@ typedef struct ISpeechRecoResultVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -22217,55 +18592,56 @@ typedef struct ISpeechRecoResultVtbl { /*** ISpeechRecoResult methods ***/ HRESULT (STDMETHODCALLTYPE *get_RecoContext)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, ISpeechRecoContext **RecoContext); HRESULT (STDMETHODCALLTYPE *get_Times)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, ISpeechRecoResultTimes **Times); HRESULT (STDMETHODCALLTYPE *putref_AudioFormat)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, ISpeechAudioFormat *Format); HRESULT (STDMETHODCALLTYPE *get_AudioFormat)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, ISpeechAudioFormat **Format); HRESULT (STDMETHODCALLTYPE *get_PhraseInfo)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, ISpeechPhraseInfo **PhraseInfo); HRESULT (STDMETHODCALLTYPE *Alternates)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, LONG RequestCount, LONG StartElement, LONG Elements, ISpeechPhraseAlternates **Alternates); HRESULT (STDMETHODCALLTYPE *Audio)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, LONG StartElement, LONG Elements, ISpeechMemoryStream **Stream); HRESULT (STDMETHODCALLTYPE *SpeakAudio)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, LONG StartElement, LONG Elements, SpeechVoiceSpeakFlags Flags, LONG *StreamNumber); HRESULT (STDMETHODCALLTYPE *SaveToMemory)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, VARIANT *ResultBlock); HRESULT (STDMETHODCALLTYPE *DiscardResultInfo)( - ISpeechRecoResult* This, + ISpeechRecoResult *This, SpeechDiscardType ValueTypes); END_INTERFACE } ISpeechRecoResultVtbl; + interface ISpeechRecoResult { CONST_VTBL ISpeechRecoResultVtbl* lpVtbl; }; @@ -22352,94 +18728,6 @@ static FORCEINLINE HRESULT ISpeechRecoResult_DiscardResultInfo(ISpeechRecoResult #endif -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_get_RecoContext_Proxy( - ISpeechRecoResult* This, - ISpeechRecoContext **RecoContext); -void __RPC_STUB ISpeechRecoResult_get_RecoContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_get_Times_Proxy( - ISpeechRecoResult* This, - ISpeechRecoResultTimes **Times); -void __RPC_STUB ISpeechRecoResult_get_Times_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_putref_AudioFormat_Proxy( - ISpeechRecoResult* This, - ISpeechAudioFormat *Format); -void __RPC_STUB ISpeechRecoResult_putref_AudioFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_get_AudioFormat_Proxy( - ISpeechRecoResult* This, - ISpeechAudioFormat **Format); -void __RPC_STUB ISpeechRecoResult_get_AudioFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_get_PhraseInfo_Proxy( - ISpeechRecoResult* This, - ISpeechPhraseInfo **PhraseInfo); -void __RPC_STUB ISpeechRecoResult_get_PhraseInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_Alternates_Proxy( - ISpeechRecoResult* This, - LONG RequestCount, - LONG StartElement, - LONG Elements, - ISpeechPhraseAlternates **Alternates); -void __RPC_STUB ISpeechRecoResult_Alternates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_Audio_Proxy( - ISpeechRecoResult* This, - LONG StartElement, - LONG Elements, - ISpeechMemoryStream **Stream); -void __RPC_STUB ISpeechRecoResult_Audio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_SpeakAudio_Proxy( - ISpeechRecoResult* This, - LONG StartElement, - LONG Elements, - SpeechVoiceSpeakFlags Flags, - LONG *StreamNumber); -void __RPC_STUB ISpeechRecoResult_SpeakAudio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_SaveToMemory_Proxy( - ISpeechRecoResult* This, - VARIANT *ResultBlock); -void __RPC_STUB ISpeechRecoResult_SaveToMemory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResult_DiscardResultInfo_Proxy( - ISpeechRecoResult* This, - SpeechDiscardType ValueTypes); -void __RPC_STUB ISpeechRecoResult_DiscardResultInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechRecoResult_INTERFACE_DEFINED__ */ @@ -22476,29 +18764,29 @@ typedef struct ISpeechXMLRecoResultVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechXMLRecoResult* This); + ISpeechXMLRecoResult *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechXMLRecoResult* This); + ISpeechXMLRecoResult *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -22506,7 +18794,7 @@ typedef struct ISpeechXMLRecoResultVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -22518,61 +18806,61 @@ typedef struct ISpeechXMLRecoResultVtbl { /*** ISpeechRecoResult methods ***/ HRESULT (STDMETHODCALLTYPE *get_RecoContext)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, ISpeechRecoContext **RecoContext); HRESULT (STDMETHODCALLTYPE *get_Times)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, ISpeechRecoResultTimes **Times); HRESULT (STDMETHODCALLTYPE *putref_AudioFormat)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, ISpeechAudioFormat *Format); HRESULT (STDMETHODCALLTYPE *get_AudioFormat)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, ISpeechAudioFormat **Format); HRESULT (STDMETHODCALLTYPE *get_PhraseInfo)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, ISpeechPhraseInfo **PhraseInfo); HRESULT (STDMETHODCALLTYPE *Alternates)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, LONG RequestCount, LONG StartElement, LONG Elements, ISpeechPhraseAlternates **Alternates); HRESULT (STDMETHODCALLTYPE *Audio)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, LONG StartElement, LONG Elements, ISpeechMemoryStream **Stream); HRESULT (STDMETHODCALLTYPE *SpeakAudio)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, LONG StartElement, LONG Elements, SpeechVoiceSpeakFlags Flags, LONG *StreamNumber); HRESULT (STDMETHODCALLTYPE *SaveToMemory)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, VARIANT *ResultBlock); HRESULT (STDMETHODCALLTYPE *DiscardResultInfo)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, SpeechDiscardType ValueTypes); /*** ISpeechXMLRecoResult methods ***/ HRESULT (STDMETHODCALLTYPE *GetXMLResult)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, SPXMLRESULTOPTIONS Options, BSTR *pResult); HRESULT (STDMETHODCALLTYPE *GetXMLErrorInfo)( - ISpeechXMLRecoResult* This, + ISpeechXMLRecoResult *This, LONG *LineNumber, BSTR *ScriptLine, BSTR *Source, @@ -22582,6 +18870,7 @@ typedef struct ISpeechXMLRecoResultVtbl { END_INTERFACE } ISpeechXMLRecoResultVtbl; + interface ISpeechXMLRecoResult { CONST_VTBL ISpeechXMLRecoResultVtbl* lpVtbl; }; @@ -22678,28 +18967,6 @@ static FORCEINLINE HRESULT ISpeechXMLRecoResult_GetXMLErrorInfo(ISpeechXMLRecoRe #endif -HRESULT STDMETHODCALLTYPE ISpeechXMLRecoResult_GetXMLResult_Proxy( - ISpeechXMLRecoResult* This, - SPXMLRESULTOPTIONS Options, - BSTR *pResult); -void __RPC_STUB ISpeechXMLRecoResult_GetXMLResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechXMLRecoResult_GetXMLErrorInfo_Proxy( - ISpeechXMLRecoResult* This, - LONG *LineNumber, - BSTR *ScriptLine, - BSTR *Source, - BSTR *Description, - LONG *ResultCode, - VARIANT_BOOL *IsError); -void __RPC_STUB ISpeechXMLRecoResult_GetXMLErrorInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechXMLRecoResult_INTERFACE_DEFINED__ */ @@ -22728,29 +18995,29 @@ typedef struct ISpeechRecoResult2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechRecoResult2* This); + ISpeechRecoResult2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechRecoResult2* This); + ISpeechRecoResult2 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -22758,7 +19025,7 @@ typedef struct ISpeechRecoResult2Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -22770,61 +19037,62 @@ typedef struct ISpeechRecoResult2Vtbl { /*** ISpeechRecoResult methods ***/ HRESULT (STDMETHODCALLTYPE *get_RecoContext)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, ISpeechRecoContext **RecoContext); HRESULT (STDMETHODCALLTYPE *get_Times)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, ISpeechRecoResultTimes **Times); HRESULT (STDMETHODCALLTYPE *putref_AudioFormat)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, ISpeechAudioFormat *Format); HRESULT (STDMETHODCALLTYPE *get_AudioFormat)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, ISpeechAudioFormat **Format); HRESULT (STDMETHODCALLTYPE *get_PhraseInfo)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, ISpeechPhraseInfo **PhraseInfo); HRESULT (STDMETHODCALLTYPE *Alternates)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, LONG RequestCount, LONG StartElement, LONG Elements, ISpeechPhraseAlternates **Alternates); HRESULT (STDMETHODCALLTYPE *Audio)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, LONG StartElement, LONG Elements, ISpeechMemoryStream **Stream); HRESULT (STDMETHODCALLTYPE *SpeakAudio)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, LONG StartElement, LONG Elements, SpeechVoiceSpeakFlags Flags, LONG *StreamNumber); HRESULT (STDMETHODCALLTYPE *SaveToMemory)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, VARIANT *ResultBlock); HRESULT (STDMETHODCALLTYPE *DiscardResultInfo)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, SpeechDiscardType ValueTypes); /*** ISpeechRecoResult2 methods ***/ HRESULT (STDMETHODCALLTYPE *SetTextFeedback)( - ISpeechRecoResult2* This, + ISpeechRecoResult2 *This, BSTR Feedback, VARIANT_BOOL WasSuccessful); END_INTERFACE } ISpeechRecoResult2Vtbl; + interface ISpeechRecoResult2 { CONST_VTBL ISpeechRecoResult2Vtbl* lpVtbl; }; @@ -22917,15 +19185,6 @@ static FORCEINLINE HRESULT ISpeechRecoResult2_SetTextFeedback(ISpeechRecoResult2 #endif -HRESULT STDMETHODCALLTYPE ISpeechRecoResult2_SetTextFeedback_Proxy( - ISpeechRecoResult2* This, - BSTR Feedback, - VARIANT_BOOL WasSuccessful); -void __RPC_STUB ISpeechRecoResult2_SetTextFeedback_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechRecoResult2_INTERFACE_DEFINED__ */ @@ -23004,29 +19263,29 @@ typedef struct ISpeechRecoResultDispatchVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechRecoResultDispatch* This); + ISpeechRecoResultDispatch *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechRecoResultDispatch* This); + ISpeechRecoResultDispatch *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -23034,7 +19293,7 @@ typedef struct ISpeechRecoResultDispatchVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -23046,60 +19305,60 @@ typedef struct ISpeechRecoResultDispatchVtbl { /*** ISpeechRecoResultDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *get_RecoContext)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, ISpeechRecoContext **RecoContext); HRESULT (STDMETHODCALLTYPE *get_Times)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, ISpeechRecoResultTimes **Times); HRESULT (STDMETHODCALLTYPE *putref_AudioFormat)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, ISpeechAudioFormat *Format); HRESULT (STDMETHODCALLTYPE *get_AudioFormat)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, ISpeechAudioFormat **Format); HRESULT (STDMETHODCALLTYPE *get_PhraseInfo)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, ISpeechPhraseInfo **PhraseInfo); HRESULT (STDMETHODCALLTYPE *Alternates)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, LONG RequestCount, LONG StartElement, LONG Elements, ISpeechPhraseAlternates **Alternates); HRESULT (STDMETHODCALLTYPE *Audio)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, LONG StartElement, LONG Elements, ISpeechMemoryStream **Stream); HRESULT (STDMETHODCALLTYPE *SpeakAudio)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, LONG StartElement, LONG Elements, SpeechVoiceSpeakFlags Flags, LONG *StreamNumber); HRESULT (STDMETHODCALLTYPE *SaveToMemory)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, VARIANT *ResultBlock); HRESULT (STDMETHODCALLTYPE *DiscardResultInfo)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, SpeechDiscardType ValueTypes); HRESULT (STDMETHODCALLTYPE *GetXMLResult)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, SPXMLRESULTOPTIONS Options, BSTR *pResult); HRESULT (STDMETHODCALLTYPE *GetXMLErrorInfo)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, LONG *LineNumber, BSTR *ScriptLine, BSTR *Source, @@ -23108,12 +19367,13 @@ typedef struct ISpeechRecoResultDispatchVtbl { VARIANT_BOOL *IsError); HRESULT (STDMETHODCALLTYPE *SetTextFeedback)( - ISpeechRecoResultDispatch* This, + ISpeechRecoResultDispatch *This, BSTR Feedback, VARIANT_BOOL WasSuccessful); END_INTERFACE } ISpeechRecoResultDispatchVtbl; + interface ISpeechRecoResultDispatch { CONST_VTBL ISpeechRecoResultDispatchVtbl* lpVtbl; }; @@ -23212,125 +19472,6 @@ static FORCEINLINE HRESULT ISpeechRecoResultDispatch_SetTextFeedback(ISpeechReco #endif -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_get_RecoContext_Proxy( - ISpeechRecoResultDispatch* This, - ISpeechRecoContext **RecoContext); -void __RPC_STUB ISpeechRecoResultDispatch_get_RecoContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_get_Times_Proxy( - ISpeechRecoResultDispatch* This, - ISpeechRecoResultTimes **Times); -void __RPC_STUB ISpeechRecoResultDispatch_get_Times_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_putref_AudioFormat_Proxy( - ISpeechRecoResultDispatch* This, - ISpeechAudioFormat *Format); -void __RPC_STUB ISpeechRecoResultDispatch_putref_AudioFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_get_AudioFormat_Proxy( - ISpeechRecoResultDispatch* This, - ISpeechAudioFormat **Format); -void __RPC_STUB ISpeechRecoResultDispatch_get_AudioFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_get_PhraseInfo_Proxy( - ISpeechRecoResultDispatch* This, - ISpeechPhraseInfo **PhraseInfo); -void __RPC_STUB ISpeechRecoResultDispatch_get_PhraseInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_Alternates_Proxy( - ISpeechRecoResultDispatch* This, - LONG RequestCount, - LONG StartElement, - LONG Elements, - ISpeechPhraseAlternates **Alternates); -void __RPC_STUB ISpeechRecoResultDispatch_Alternates_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_Audio_Proxy( - ISpeechRecoResultDispatch* This, - LONG StartElement, - LONG Elements, - ISpeechMemoryStream **Stream); -void __RPC_STUB ISpeechRecoResultDispatch_Audio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_SpeakAudio_Proxy( - ISpeechRecoResultDispatch* This, - LONG StartElement, - LONG Elements, - SpeechVoiceSpeakFlags Flags, - LONG *StreamNumber); -void __RPC_STUB ISpeechRecoResultDispatch_SpeakAudio_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_SaveToMemory_Proxy( - ISpeechRecoResultDispatch* This, - VARIANT *ResultBlock); -void __RPC_STUB ISpeechRecoResultDispatch_SaveToMemory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_DiscardResultInfo_Proxy( - ISpeechRecoResultDispatch* This, - SpeechDiscardType ValueTypes); -void __RPC_STUB ISpeechRecoResultDispatch_DiscardResultInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_GetXMLResult_Proxy( - ISpeechRecoResultDispatch* This, - SPXMLRESULTOPTIONS Options, - BSTR *pResult); -void __RPC_STUB ISpeechRecoResultDispatch_GetXMLResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_GetXMLErrorInfo_Proxy( - ISpeechRecoResultDispatch* This, - LONG *LineNumber, - BSTR *ScriptLine, - BSTR *Source, - BSTR *Description, - HRESULT *ResultCode, - VARIANT_BOOL *IsError); -void __RPC_STUB ISpeechRecoResultDispatch_GetXMLErrorInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_SetTextFeedback_Proxy( - ISpeechRecoResultDispatch* This, - BSTR Feedback, - VARIANT_BOOL WasSuccessful); -void __RPC_STUB ISpeechRecoResultDispatch_SetTextFeedback_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechRecoResultDispatch_INTERFACE_DEFINED__ */ @@ -23359,29 +19500,29 @@ typedef struct ISpeechPhraseInfoBuilderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseInfoBuilder* This, + ISpeechPhraseInfoBuilder *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseInfoBuilder* This); + ISpeechPhraseInfoBuilder *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseInfoBuilder* This); + ISpeechPhraseInfoBuilder *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseInfoBuilder* This, + ISpeechPhraseInfoBuilder *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseInfoBuilder* This, + ISpeechPhraseInfoBuilder *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseInfoBuilder* This, + ISpeechPhraseInfoBuilder *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -23389,7 +19530,7 @@ typedef struct ISpeechPhraseInfoBuilderVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseInfoBuilder* This, + ISpeechPhraseInfoBuilder *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -23401,12 +19542,13 @@ typedef struct ISpeechPhraseInfoBuilderVtbl { /*** ISpeechPhraseInfoBuilder methods ***/ HRESULT (STDMETHODCALLTYPE *RestorePhraseFromMemory)( - ISpeechPhraseInfoBuilder* This, + ISpeechPhraseInfoBuilder *This, VARIANT *PhraseInMemory, ISpeechPhraseInfo **PhraseInfo); END_INTERFACE } ISpeechPhraseInfoBuilderVtbl; + interface ISpeechPhraseInfoBuilder { CONST_VTBL ISpeechPhraseInfoBuilderVtbl* lpVtbl; }; @@ -23457,15 +19599,6 @@ static FORCEINLINE HRESULT ISpeechPhraseInfoBuilder_RestorePhraseFromMemory(ISpe #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfoBuilder_RestorePhraseFromMemory_Proxy( - ISpeechPhraseInfoBuilder* This, - VARIANT *PhraseInMemory, - ISpeechPhraseInfo **PhraseInfo); -void __RPC_STUB ISpeechPhraseInfoBuilder_RestorePhraseFromMemory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseInfoBuilder_INTERFACE_DEFINED__ */ @@ -23502,29 +19635,29 @@ typedef struct ISpeechRecoResultTimesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechRecoResultTimes* This); + ISpeechRecoResultTimes *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechRecoResultTimes* This); + ISpeechRecoResultTimes *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -23532,7 +19665,7 @@ typedef struct ISpeechRecoResultTimesVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -23544,23 +19677,24 @@ typedef struct ISpeechRecoResultTimesVtbl { /*** ISpeechRecoResultTimes methods ***/ HRESULT (STDMETHODCALLTYPE *get_StreamTime)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, VARIANT *Time); HRESULT (STDMETHODCALLTYPE *get_Length)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, VARIANT *Length); HRESULT (STDMETHODCALLTYPE *get_TickCount)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, LONG *TickCount); HRESULT (STDMETHODCALLTYPE *get_OffsetFromStart)( - ISpeechRecoResultTimes* This, + ISpeechRecoResultTimes *This, VARIANT *OffsetFromStart); END_INTERFACE } ISpeechRecoResultTimesVtbl; + interface ISpeechRecoResultTimes { CONST_VTBL ISpeechRecoResultTimesVtbl* lpVtbl; }; @@ -23623,38 +19757,6 @@ static FORCEINLINE HRESULT ISpeechRecoResultTimes_get_OffsetFromStart(ISpeechRec #endif -HRESULT STDMETHODCALLTYPE ISpeechRecoResultTimes_get_StreamTime_Proxy( - ISpeechRecoResultTimes* This, - VARIANT *Time); -void __RPC_STUB ISpeechRecoResultTimes_get_StreamTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultTimes_get_Length_Proxy( - ISpeechRecoResultTimes* This, - VARIANT *Length); -void __RPC_STUB ISpeechRecoResultTimes_get_Length_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultTimes_get_TickCount_Proxy( - ISpeechRecoResultTimes* This, - LONG *TickCount); -void __RPC_STUB ISpeechRecoResultTimes_get_TickCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechRecoResultTimes_get_OffsetFromStart_Proxy( - ISpeechRecoResultTimes* This, - VARIANT *OffsetFromStart); -void __RPC_STUB ISpeechRecoResultTimes_get_OffsetFromStart_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechRecoResultTimes_INTERFACE_DEFINED__ */ @@ -23694,29 +19796,29 @@ typedef struct ISpeechPhraseAlternateVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseAlternate* This); + ISpeechPhraseAlternate *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseAlternate* This); + ISpeechPhraseAlternate *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -23724,7 +19826,7 @@ typedef struct ISpeechPhraseAlternateVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -23736,26 +19838,27 @@ typedef struct ISpeechPhraseAlternateVtbl { /*** ISpeechPhraseAlternate methods ***/ HRESULT (STDMETHODCALLTYPE *get_RecoResult)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, ISpeechRecoResult **RecoResult); HRESULT (STDMETHODCALLTYPE *get_StartElementInResult)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, LONG *StartElement); HRESULT (STDMETHODCALLTYPE *get_NumberOfElementsInResult)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, LONG *NumberOfElements); HRESULT (STDMETHODCALLTYPE *get_PhraseInfo)( - ISpeechPhraseAlternate* This, + ISpeechPhraseAlternate *This, ISpeechPhraseInfo **PhraseInfo); HRESULT (STDMETHODCALLTYPE *Commit)( - ISpeechPhraseAlternate* This); + ISpeechPhraseAlternate *This); END_INTERFACE } ISpeechPhraseAlternateVtbl; + interface ISpeechPhraseAlternate { CONST_VTBL ISpeechPhraseAlternateVtbl* lpVtbl; }; @@ -23822,45 +19925,6 @@ static FORCEINLINE HRESULT ISpeechPhraseAlternate_Commit(ISpeechPhraseAlternate* #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_get_RecoResult_Proxy( - ISpeechPhraseAlternate* This, - ISpeechRecoResult **RecoResult); -void __RPC_STUB ISpeechPhraseAlternate_get_RecoResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_get_StartElementInResult_Proxy( - ISpeechPhraseAlternate* This, - LONG *StartElement); -void __RPC_STUB ISpeechPhraseAlternate_get_StartElementInResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_get_NumberOfElementsInResult_Proxy( - ISpeechPhraseAlternate* This, - LONG *NumberOfElements); -void __RPC_STUB ISpeechPhraseAlternate_get_NumberOfElementsInResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_get_PhraseInfo_Proxy( - ISpeechPhraseAlternate* This, - ISpeechPhraseInfo **PhraseInfo); -void __RPC_STUB ISpeechPhraseAlternate_get_PhraseInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_Commit_Proxy( - ISpeechPhraseAlternate* This); -void __RPC_STUB ISpeechPhraseAlternate_Commit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseAlternate_INTERFACE_DEFINED__ */ @@ -23895,29 +19959,29 @@ typedef struct ISpeechPhraseAlternatesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseAlternates* This, + ISpeechPhraseAlternates *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseAlternates* This); + ISpeechPhraseAlternates *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseAlternates* This); + ISpeechPhraseAlternates *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseAlternates* This, + ISpeechPhraseAlternates *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseAlternates* This, + ISpeechPhraseAlternates *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseAlternates* This, + ISpeechPhraseAlternates *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -23925,7 +19989,7 @@ typedef struct ISpeechPhraseAlternatesVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseAlternates* This, + ISpeechPhraseAlternates *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -23937,20 +20001,21 @@ typedef struct ISpeechPhraseAlternatesVtbl { /*** ISpeechPhraseAlternates methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechPhraseAlternates* This, + ISpeechPhraseAlternates *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechPhraseAlternates* This, + ISpeechPhraseAlternates *This, LONG Index, ISpeechPhraseAlternate **PhraseAlternate); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechPhraseAlternates* This, + ISpeechPhraseAlternates *This, IUnknown **EnumVARIANT); END_INTERFACE } ISpeechPhraseAlternatesVtbl; + interface ISpeechPhraseAlternates { CONST_VTBL ISpeechPhraseAlternatesVtbl* lpVtbl; }; @@ -24009,31 +20074,6 @@ static FORCEINLINE HRESULT ISpeechPhraseAlternates_get__NewEnum(ISpeechPhraseAlt #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternates_get_Count_Proxy( - ISpeechPhraseAlternates* This, - LONG *Count); -void __RPC_STUB ISpeechPhraseAlternates_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternates_Item_Proxy( - ISpeechPhraseAlternates* This, - LONG Index, - ISpeechPhraseAlternate **PhraseAlternate); -void __RPC_STUB ISpeechPhraseAlternates_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternates_get__NewEnum_Proxy( - ISpeechPhraseAlternates* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechPhraseAlternates_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseAlternates_INTERFACE_DEFINED__ */ @@ -24112,29 +20152,29 @@ typedef struct ISpeechPhraseInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseInfo* This); + ISpeechPhraseInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseInfo* This); + ISpeechPhraseInfo *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -24142,7 +20182,7 @@ typedef struct ISpeechPhraseInfoVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -24154,70 +20194,70 @@ typedef struct ISpeechPhraseInfoVtbl { /*** ISpeechPhraseInfo methods ***/ HRESULT (STDMETHODCALLTYPE *get_LanguageId)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, LONG *LanguageId); HRESULT (STDMETHODCALLTYPE *get_GrammarId)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, VARIANT *GrammarId); HRESULT (STDMETHODCALLTYPE *get_StartTime)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, VARIANT *StartTime); HRESULT (STDMETHODCALLTYPE *get_AudioStreamPosition)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, VARIANT *AudioStreamPosition); HRESULT (STDMETHODCALLTYPE *get_AudioSizeBytes)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, LONG *pAudioSizeBytes); HRESULT (STDMETHODCALLTYPE *get_RetainedSizeBytes)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, LONG *RetainedSizeBytes); HRESULT (STDMETHODCALLTYPE *get_AudioSizeTime)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, LONG *AudioSizeTime); HRESULT (STDMETHODCALLTYPE *get_Rule)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, ISpeechPhraseRule **Rule); HRESULT (STDMETHODCALLTYPE *get_Properties)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, ISpeechPhraseProperties **Properties); HRESULT (STDMETHODCALLTYPE *get_Elements)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, ISpeechPhraseElements **Elements); HRESULT (STDMETHODCALLTYPE *get_Replacements)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, ISpeechPhraseReplacements **Replacements); HRESULT (STDMETHODCALLTYPE *get_EngineId)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, BSTR *EngineIdGuid); HRESULT (STDMETHODCALLTYPE *get_EnginePrivateData)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, VARIANT *PrivateData); HRESULT (STDMETHODCALLTYPE *SaveToMemory)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, VARIANT *PhraseBlock); HRESULT (STDMETHODCALLTYPE *GetText)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, LONG StartElement, LONG Elements, VARIANT_BOOL UseReplacements, BSTR *Text); HRESULT (STDMETHODCALLTYPE *GetDisplayAttributes)( - ISpeechPhraseInfo* This, + ISpeechPhraseInfo *This, LONG StartElement, LONG Elements, VARIANT_BOOL UseReplacements, @@ -24225,6 +20265,7 @@ typedef struct ISpeechPhraseInfoVtbl { END_INTERFACE } ISpeechPhraseInfoVtbl; + interface ISpeechPhraseInfo { CONST_VTBL ISpeechPhraseInfoVtbl* lpVtbl; }; @@ -24335,140 +20376,6 @@ static FORCEINLINE HRESULT ISpeechPhraseInfo_GetDisplayAttributes(ISpeechPhraseI #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_LanguageId_Proxy( - ISpeechPhraseInfo* This, - LONG *LanguageId); -void __RPC_STUB ISpeechPhraseInfo_get_LanguageId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_GrammarId_Proxy( - ISpeechPhraseInfo* This, - VARIANT *GrammarId); -void __RPC_STUB ISpeechPhraseInfo_get_GrammarId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_StartTime_Proxy( - ISpeechPhraseInfo* This, - VARIANT *StartTime); -void __RPC_STUB ISpeechPhraseInfo_get_StartTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_AudioStreamPosition_Proxy( - ISpeechPhraseInfo* This, - VARIANT *AudioStreamPosition); -void __RPC_STUB ISpeechPhraseInfo_get_AudioStreamPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_AudioSizeBytes_Proxy( - ISpeechPhraseInfo* This, - LONG *pAudioSizeBytes); -void __RPC_STUB ISpeechPhraseInfo_get_AudioSizeBytes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_RetainedSizeBytes_Proxy( - ISpeechPhraseInfo* This, - LONG *RetainedSizeBytes); -void __RPC_STUB ISpeechPhraseInfo_get_RetainedSizeBytes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_AudioSizeTime_Proxy( - ISpeechPhraseInfo* This, - LONG *AudioSizeTime); -void __RPC_STUB ISpeechPhraseInfo_get_AudioSizeTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_Rule_Proxy( - ISpeechPhraseInfo* This, - ISpeechPhraseRule **Rule); -void __RPC_STUB ISpeechPhraseInfo_get_Rule_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_Properties_Proxy( - ISpeechPhraseInfo* This, - ISpeechPhraseProperties **Properties); -void __RPC_STUB ISpeechPhraseInfo_get_Properties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_Elements_Proxy( - ISpeechPhraseInfo* This, - ISpeechPhraseElements **Elements); -void __RPC_STUB ISpeechPhraseInfo_get_Elements_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_Replacements_Proxy( - ISpeechPhraseInfo* This, - ISpeechPhraseReplacements **Replacements); -void __RPC_STUB ISpeechPhraseInfo_get_Replacements_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_EngineId_Proxy( - ISpeechPhraseInfo* This, - BSTR *EngineIdGuid); -void __RPC_STUB ISpeechPhraseInfo_get_EngineId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_EnginePrivateData_Proxy( - ISpeechPhraseInfo* This, - VARIANT *PrivateData); -void __RPC_STUB ISpeechPhraseInfo_get_EnginePrivateData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_SaveToMemory_Proxy( - ISpeechPhraseInfo* This, - VARIANT *PhraseBlock); -void __RPC_STUB ISpeechPhraseInfo_SaveToMemory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_GetText_Proxy( - ISpeechPhraseInfo* This, - LONG StartElement, - LONG Elements, - VARIANT_BOOL UseReplacements, - BSTR *Text); -void __RPC_STUB ISpeechPhraseInfo_GetText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_GetDisplayAttributes_Proxy( - ISpeechPhraseInfo* This, - LONG StartElement, - LONG Elements, - VARIANT_BOOL UseReplacements, - SpeechDisplayAttributes *DisplayAttributes); -void __RPC_STUB ISpeechPhraseInfo_GetDisplayAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseInfo_INTERFACE_DEFINED__ */ @@ -24532,29 +20439,29 @@ typedef struct ISpeechPhraseElementVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseElement* This); + ISpeechPhraseElement *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseElement* This); + ISpeechPhraseElement *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -24562,7 +20469,7 @@ typedef struct ISpeechPhraseElementVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -24574,59 +20481,60 @@ typedef struct ISpeechPhraseElementVtbl { /*** ISpeechPhraseElement methods ***/ HRESULT (STDMETHODCALLTYPE *get_AudioTimeOffset)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, LONG *AudioTimeOffset); HRESULT (STDMETHODCALLTYPE *get_AudioSizeTime)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, LONG *AudioSizeTime); HRESULT (STDMETHODCALLTYPE *get_AudioStreamOffset)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, LONG *AudioStreamOffset); HRESULT (STDMETHODCALLTYPE *get_AudioSizeBytes)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, LONG *AudioSizeBytes); HRESULT (STDMETHODCALLTYPE *get_RetainedStreamOffset)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, LONG *RetainedStreamOffset); HRESULT (STDMETHODCALLTYPE *get_RetainedSizeBytes)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, LONG *RetainedSizeBytes); HRESULT (STDMETHODCALLTYPE *get_DisplayText)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, BSTR *DisplayText); HRESULT (STDMETHODCALLTYPE *get_LexicalForm)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, BSTR *LexicalForm); HRESULT (STDMETHODCALLTYPE *get_Pronunciation)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, VARIANT *Pronunciation); HRESULT (STDMETHODCALLTYPE *get_DisplayAttributes)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, SpeechDisplayAttributes *DisplayAttributes); HRESULT (STDMETHODCALLTYPE *get_RequiredConfidence)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, SpeechEngineConfidence *RequiredConfidence); HRESULT (STDMETHODCALLTYPE *get_ActualConfidence)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, SpeechEngineConfidence *ActualConfidence); HRESULT (STDMETHODCALLTYPE *get_EngineConfidence)( - ISpeechPhraseElement* This, + ISpeechPhraseElement *This, float *EngineConfidence); END_INTERFACE } ISpeechPhraseElementVtbl; + interface ISpeechPhraseElement { CONST_VTBL ISpeechPhraseElementVtbl* lpVtbl; }; @@ -24725,110 +20633,6 @@ static FORCEINLINE HRESULT ISpeechPhraseElement_get_EngineConfidence(ISpeechPhra #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_AudioTimeOffset_Proxy( - ISpeechPhraseElement* This, - LONG *AudioTimeOffset); -void __RPC_STUB ISpeechPhraseElement_get_AudioTimeOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_AudioSizeTime_Proxy( - ISpeechPhraseElement* This, - LONG *AudioSizeTime); -void __RPC_STUB ISpeechPhraseElement_get_AudioSizeTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_AudioStreamOffset_Proxy( - ISpeechPhraseElement* This, - LONG *AudioStreamOffset); -void __RPC_STUB ISpeechPhraseElement_get_AudioStreamOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_AudioSizeBytes_Proxy( - ISpeechPhraseElement* This, - LONG *AudioSizeBytes); -void __RPC_STUB ISpeechPhraseElement_get_AudioSizeBytes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_RetainedStreamOffset_Proxy( - ISpeechPhraseElement* This, - LONG *RetainedStreamOffset); -void __RPC_STUB ISpeechPhraseElement_get_RetainedStreamOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_RetainedSizeBytes_Proxy( - ISpeechPhraseElement* This, - LONG *RetainedSizeBytes); -void __RPC_STUB ISpeechPhraseElement_get_RetainedSizeBytes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_DisplayText_Proxy( - ISpeechPhraseElement* This, - BSTR *DisplayText); -void __RPC_STUB ISpeechPhraseElement_get_DisplayText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_LexicalForm_Proxy( - ISpeechPhraseElement* This, - BSTR *LexicalForm); -void __RPC_STUB ISpeechPhraseElement_get_LexicalForm_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_Pronunciation_Proxy( - ISpeechPhraseElement* This, - VARIANT *Pronunciation); -void __RPC_STUB ISpeechPhraseElement_get_Pronunciation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_DisplayAttributes_Proxy( - ISpeechPhraseElement* This, - SpeechDisplayAttributes *DisplayAttributes); -void __RPC_STUB ISpeechPhraseElement_get_DisplayAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_RequiredConfidence_Proxy( - ISpeechPhraseElement* This, - SpeechEngineConfidence *RequiredConfidence); -void __RPC_STUB ISpeechPhraseElement_get_RequiredConfidence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_ActualConfidence_Proxy( - ISpeechPhraseElement* This, - SpeechEngineConfidence *ActualConfidence); -void __RPC_STUB ISpeechPhraseElement_get_ActualConfidence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_EngineConfidence_Proxy( - ISpeechPhraseElement* This, - float *EngineConfidence); -void __RPC_STUB ISpeechPhraseElement_get_EngineConfidence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseElement_INTERFACE_DEFINED__ */ @@ -24863,29 +20667,29 @@ typedef struct ISpeechPhraseElementsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseElements* This, + ISpeechPhraseElements *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseElements* This); + ISpeechPhraseElements *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseElements* This); + ISpeechPhraseElements *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseElements* This, + ISpeechPhraseElements *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseElements* This, + ISpeechPhraseElements *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseElements* This, + ISpeechPhraseElements *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -24893,7 +20697,7 @@ typedef struct ISpeechPhraseElementsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseElements* This, + ISpeechPhraseElements *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -24905,20 +20709,21 @@ typedef struct ISpeechPhraseElementsVtbl { /*** ISpeechPhraseElements methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechPhraseElements* This, + ISpeechPhraseElements *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechPhraseElements* This, + ISpeechPhraseElements *This, LONG Index, ISpeechPhraseElement **Element); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechPhraseElements* This, + ISpeechPhraseElements *This, IUnknown **EnumVARIANT); END_INTERFACE } ISpeechPhraseElementsVtbl; + interface ISpeechPhraseElements { CONST_VTBL ISpeechPhraseElementsVtbl* lpVtbl; }; @@ -24977,31 +20782,6 @@ static FORCEINLINE HRESULT ISpeechPhraseElements_get__NewEnum(ISpeechPhraseEleme #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseElements_get_Count_Proxy( - ISpeechPhraseElements* This, - LONG *Count); -void __RPC_STUB ISpeechPhraseElements_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElements_Item_Proxy( - ISpeechPhraseElements* This, - LONG Index, - ISpeechPhraseElement **Element); -void __RPC_STUB ISpeechPhraseElements_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseElements_get__NewEnum_Proxy( - ISpeechPhraseElements* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechPhraseElements_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseElements_INTERFACE_DEFINED__ */ @@ -25038,29 +20818,29 @@ typedef struct ISpeechPhraseReplacementVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseReplacement* This); + ISpeechPhraseReplacement *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseReplacement* This); + ISpeechPhraseReplacement *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -25068,7 +20848,7 @@ typedef struct ISpeechPhraseReplacementVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -25080,23 +20860,24 @@ typedef struct ISpeechPhraseReplacementVtbl { /*** ISpeechPhraseReplacement methods ***/ HRESULT (STDMETHODCALLTYPE *get_DisplayAttributes)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, SpeechDisplayAttributes *DisplayAttributes); HRESULT (STDMETHODCALLTYPE *get_Text)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, BSTR *Text); HRESULT (STDMETHODCALLTYPE *get_FirstElement)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, LONG *FirstElement); HRESULT (STDMETHODCALLTYPE *get_NumberOfElements)( - ISpeechPhraseReplacement* This, + ISpeechPhraseReplacement *This, LONG *NumberOfElements); END_INTERFACE } ISpeechPhraseReplacementVtbl; + interface ISpeechPhraseReplacement { CONST_VTBL ISpeechPhraseReplacementVtbl* lpVtbl; }; @@ -25159,38 +20940,6 @@ static FORCEINLINE HRESULT ISpeechPhraseReplacement_get_NumberOfElements(ISpeech #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacement_get_DisplayAttributes_Proxy( - ISpeechPhraseReplacement* This, - SpeechDisplayAttributes *DisplayAttributes); -void __RPC_STUB ISpeechPhraseReplacement_get_DisplayAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacement_get_Text_Proxy( - ISpeechPhraseReplacement* This, - BSTR *Text); -void __RPC_STUB ISpeechPhraseReplacement_get_Text_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacement_get_FirstElement_Proxy( - ISpeechPhraseReplacement* This, - LONG *FirstElement); -void __RPC_STUB ISpeechPhraseReplacement_get_FirstElement_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacement_get_NumberOfElements_Proxy( - ISpeechPhraseReplacement* This, - LONG *NumberOfElements); -void __RPC_STUB ISpeechPhraseReplacement_get_NumberOfElements_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseReplacement_INTERFACE_DEFINED__ */ @@ -25225,29 +20974,29 @@ typedef struct ISpeechPhraseReplacementsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseReplacements* This, + ISpeechPhraseReplacements *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseReplacements* This); + ISpeechPhraseReplacements *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseReplacements* This); + ISpeechPhraseReplacements *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseReplacements* This, + ISpeechPhraseReplacements *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseReplacements* This, + ISpeechPhraseReplacements *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseReplacements* This, + ISpeechPhraseReplacements *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -25255,7 +21004,7 @@ typedef struct ISpeechPhraseReplacementsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseReplacements* This, + ISpeechPhraseReplacements *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -25267,20 +21016,21 @@ typedef struct ISpeechPhraseReplacementsVtbl { /*** ISpeechPhraseReplacements methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechPhraseReplacements* This, + ISpeechPhraseReplacements *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechPhraseReplacements* This, + ISpeechPhraseReplacements *This, LONG Index, ISpeechPhraseReplacement **Reps); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechPhraseReplacements* This, + ISpeechPhraseReplacements *This, IUnknown **EnumVARIANT); END_INTERFACE } ISpeechPhraseReplacementsVtbl; + interface ISpeechPhraseReplacements { CONST_VTBL ISpeechPhraseReplacementsVtbl* lpVtbl; }; @@ -25339,31 +21089,6 @@ static FORCEINLINE HRESULT ISpeechPhraseReplacements_get__NewEnum(ISpeechPhraseR #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacements_get_Count_Proxy( - ISpeechPhraseReplacements* This, - LONG *Count); -void __RPC_STUB ISpeechPhraseReplacements_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacements_Item_Proxy( - ISpeechPhraseReplacements* This, - LONG Index, - ISpeechPhraseReplacement **Reps); -void __RPC_STUB ISpeechPhraseReplacements_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacements_get__NewEnum_Proxy( - ISpeechPhraseReplacements* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechPhraseReplacements_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseReplacements_INTERFACE_DEFINED__ */ @@ -25415,29 +21140,29 @@ typedef struct ISpeechPhrasePropertyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseProperty* This); + ISpeechPhraseProperty *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseProperty* This); + ISpeechPhraseProperty *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -25445,7 +21170,7 @@ typedef struct ISpeechPhrasePropertyVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -25457,43 +21182,44 @@ typedef struct ISpeechPhrasePropertyVtbl { /*** ISpeechPhraseProperty methods ***/ HRESULT (STDMETHODCALLTYPE *get_Name)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, BSTR *Name); HRESULT (STDMETHODCALLTYPE *get_Id)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, LONG *Id); HRESULT (STDMETHODCALLTYPE *get_Value)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, VARIANT *Value); HRESULT (STDMETHODCALLTYPE *get_FirstElement)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, LONG *FirstElement); HRESULT (STDMETHODCALLTYPE *get_NumberOfElements)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, LONG *NumberOfElements); HRESULT (STDMETHODCALLTYPE *get_EngineConfidence)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, float *Confidence); HRESULT (STDMETHODCALLTYPE *get_Confidence)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, SpeechEngineConfidence *Confidence); HRESULT (STDMETHODCALLTYPE *get_Parent)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, ISpeechPhraseProperty **ParentProperty); HRESULT (STDMETHODCALLTYPE *get_Children)( - ISpeechPhraseProperty* This, + ISpeechPhraseProperty *This, ISpeechPhraseProperties **Children); END_INTERFACE } ISpeechPhrasePropertyVtbl; + interface ISpeechPhraseProperty { CONST_VTBL ISpeechPhrasePropertyVtbl* lpVtbl; }; @@ -25576,78 +21302,6 @@ static FORCEINLINE HRESULT ISpeechPhraseProperty_get_Children(ISpeechPhrasePrope #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Name_Proxy( - ISpeechPhraseProperty* This, - BSTR *Name); -void __RPC_STUB ISpeechPhraseProperty_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Id_Proxy( - ISpeechPhraseProperty* This, - LONG *Id); -void __RPC_STUB ISpeechPhraseProperty_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Value_Proxy( - ISpeechPhraseProperty* This, - VARIANT *Value); -void __RPC_STUB ISpeechPhraseProperty_get_Value_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_FirstElement_Proxy( - ISpeechPhraseProperty* This, - LONG *FirstElement); -void __RPC_STUB ISpeechPhraseProperty_get_FirstElement_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_NumberOfElements_Proxy( - ISpeechPhraseProperty* This, - LONG *NumberOfElements); -void __RPC_STUB ISpeechPhraseProperty_get_NumberOfElements_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_EngineConfidence_Proxy( - ISpeechPhraseProperty* This, - float *Confidence); -void __RPC_STUB ISpeechPhraseProperty_get_EngineConfidence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Confidence_Proxy( - ISpeechPhraseProperty* This, - SpeechEngineConfidence *Confidence); -void __RPC_STUB ISpeechPhraseProperty_get_Confidence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Parent_Proxy( - ISpeechPhraseProperty* This, - ISpeechPhraseProperty **ParentProperty); -void __RPC_STUB ISpeechPhraseProperty_get_Parent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Children_Proxy( - ISpeechPhraseProperty* This, - ISpeechPhraseProperties **Children); -void __RPC_STUB ISpeechPhraseProperty_get_Children_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseProperty_INTERFACE_DEFINED__ */ @@ -25682,29 +21336,29 @@ typedef struct ISpeechPhrasePropertiesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseProperties* This, + ISpeechPhraseProperties *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseProperties* This); + ISpeechPhraseProperties *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseProperties* This); + ISpeechPhraseProperties *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseProperties* This, + ISpeechPhraseProperties *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseProperties* This, + ISpeechPhraseProperties *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseProperties* This, + ISpeechPhraseProperties *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -25712,7 +21366,7 @@ typedef struct ISpeechPhrasePropertiesVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseProperties* This, + ISpeechPhraseProperties *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -25724,20 +21378,21 @@ typedef struct ISpeechPhrasePropertiesVtbl { /*** ISpeechPhraseProperties methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechPhraseProperties* This, + ISpeechPhraseProperties *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechPhraseProperties* This, + ISpeechPhraseProperties *This, LONG Index, ISpeechPhraseProperty **Property); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechPhraseProperties* This, + ISpeechPhraseProperties *This, IUnknown **EnumVARIANT); END_INTERFACE } ISpeechPhrasePropertiesVtbl; + interface ISpeechPhraseProperties { CONST_VTBL ISpeechPhrasePropertiesVtbl* lpVtbl; }; @@ -25796,31 +21451,6 @@ static FORCEINLINE HRESULT ISpeechPhraseProperties_get__NewEnum(ISpeechPhrasePro #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperties_get_Count_Proxy( - ISpeechPhraseProperties* This, - LONG *Count); -void __RPC_STUB ISpeechPhraseProperties_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperties_Item_Proxy( - ISpeechPhraseProperties* This, - LONG Index, - ISpeechPhraseProperty **Property); -void __RPC_STUB ISpeechPhraseProperties_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseProperties_get__NewEnum_Proxy( - ISpeechPhraseProperties* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechPhraseProperties_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseProperties_INTERFACE_DEFINED__ */ @@ -25869,29 +21499,29 @@ typedef struct ISpeechPhraseRuleVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseRule* This); + ISpeechPhraseRule *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseRule* This); + ISpeechPhraseRule *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -25899,7 +21529,7 @@ typedef struct ISpeechPhraseRuleVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -25911,39 +21541,40 @@ typedef struct ISpeechPhraseRuleVtbl { /*** ISpeechPhraseRule methods ***/ HRESULT (STDMETHODCALLTYPE *get_Name)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, BSTR *Name); HRESULT (STDMETHODCALLTYPE *get_Id)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, LONG *Id); HRESULT (STDMETHODCALLTYPE *get_FirstElement)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, LONG *FirstElement); HRESULT (STDMETHODCALLTYPE *get_NumberOfElements)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, LONG *NumberOfElements); HRESULT (STDMETHODCALLTYPE *get_Parent)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, ISpeechPhraseRule **Parent); HRESULT (STDMETHODCALLTYPE *get_Children)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, ISpeechPhraseRules **Children); HRESULT (STDMETHODCALLTYPE *get_Confidence)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, SpeechEngineConfidence *ActualConfidence); HRESULT (STDMETHODCALLTYPE *get_EngineConfidence)( - ISpeechPhraseRule* This, + ISpeechPhraseRule *This, float *EngineConfidence); END_INTERFACE } ISpeechPhraseRuleVtbl; + interface ISpeechPhraseRule { CONST_VTBL ISpeechPhraseRuleVtbl* lpVtbl; }; @@ -26022,70 +21653,6 @@ static FORCEINLINE HRESULT ISpeechPhraseRule_get_EngineConfidence(ISpeechPhraseR #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Name_Proxy( - ISpeechPhraseRule* This, - BSTR *Name); -void __RPC_STUB ISpeechPhraseRule_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Id_Proxy( - ISpeechPhraseRule* This, - LONG *Id); -void __RPC_STUB ISpeechPhraseRule_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_FirstElement_Proxy( - ISpeechPhraseRule* This, - LONG *FirstElement); -void __RPC_STUB ISpeechPhraseRule_get_FirstElement_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_NumberOfElements_Proxy( - ISpeechPhraseRule* This, - LONG *NumberOfElements); -void __RPC_STUB ISpeechPhraseRule_get_NumberOfElements_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Parent_Proxy( - ISpeechPhraseRule* This, - ISpeechPhraseRule **Parent); -void __RPC_STUB ISpeechPhraseRule_get_Parent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Children_Proxy( - ISpeechPhraseRule* This, - ISpeechPhraseRules **Children); -void __RPC_STUB ISpeechPhraseRule_get_Children_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Confidence_Proxy( - ISpeechPhraseRule* This, - SpeechEngineConfidence *ActualConfidence); -void __RPC_STUB ISpeechPhraseRule_get_Confidence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_EngineConfidence_Proxy( - ISpeechPhraseRule* This, - float *EngineConfidence); -void __RPC_STUB ISpeechPhraseRule_get_EngineConfidence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseRule_INTERFACE_DEFINED__ */ @@ -26120,29 +21687,29 @@ typedef struct ISpeechPhraseRulesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhraseRules* This, + ISpeechPhraseRules *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhraseRules* This); + ISpeechPhraseRules *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhraseRules* This); + ISpeechPhraseRules *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhraseRules* This, + ISpeechPhraseRules *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhraseRules* This, + ISpeechPhraseRules *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhraseRules* This, + ISpeechPhraseRules *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -26150,7 +21717,7 @@ typedef struct ISpeechPhraseRulesVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhraseRules* This, + ISpeechPhraseRules *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -26162,20 +21729,21 @@ typedef struct ISpeechPhraseRulesVtbl { /*** ISpeechPhraseRules methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechPhraseRules* This, + ISpeechPhraseRules *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechPhraseRules* This, + ISpeechPhraseRules *This, LONG Index, ISpeechPhraseRule **Rule); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechPhraseRules* This, + ISpeechPhraseRules *This, IUnknown **EnumVARIANT); END_INTERFACE } ISpeechPhraseRulesVtbl; + interface ISpeechPhraseRules { CONST_VTBL ISpeechPhraseRulesVtbl* lpVtbl; }; @@ -26234,31 +21802,6 @@ static FORCEINLINE HRESULT ISpeechPhraseRules_get__NewEnum(ISpeechPhraseRules* T #endif -HRESULT STDMETHODCALLTYPE ISpeechPhraseRules_get_Count_Proxy( - ISpeechPhraseRules* This, - LONG *Count); -void __RPC_STUB ISpeechPhraseRules_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRules_Item_Proxy( - ISpeechPhraseRules* This, - LONG Index, - ISpeechPhraseRule **Rule); -void __RPC_STUB ISpeechPhraseRules_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhraseRules_get__NewEnum_Proxy( - ISpeechPhraseRules* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechPhraseRules_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhraseRules_INTERFACE_DEFINED__ */ @@ -26293,29 +21836,29 @@ typedef struct ISpeechLexiconWordsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechLexiconWords* This, + ISpeechLexiconWords *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechLexiconWords* This); + ISpeechLexiconWords *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechLexiconWords* This); + ISpeechLexiconWords *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechLexiconWords* This, + ISpeechLexiconWords *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechLexiconWords* This, + ISpeechLexiconWords *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechLexiconWords* This, + ISpeechLexiconWords *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -26323,7 +21866,7 @@ typedef struct ISpeechLexiconWordsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechLexiconWords* This, + ISpeechLexiconWords *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -26335,20 +21878,21 @@ typedef struct ISpeechLexiconWordsVtbl { /*** ISpeechLexiconWords methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechLexiconWords* This, + ISpeechLexiconWords *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechLexiconWords* This, + ISpeechLexiconWords *This, LONG Index, ISpeechLexiconWord **Word); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechLexiconWords* This, + ISpeechLexiconWords *This, IUnknown **EnumVARIANT); END_INTERFACE } ISpeechLexiconWordsVtbl; + interface ISpeechLexiconWords { CONST_VTBL ISpeechLexiconWordsVtbl* lpVtbl; }; @@ -26407,31 +21951,6 @@ static FORCEINLINE HRESULT ISpeechLexiconWords_get__NewEnum(ISpeechLexiconWords* #endif -HRESULT STDMETHODCALLTYPE ISpeechLexiconWords_get_Count_Proxy( - ISpeechLexiconWords* This, - LONG *Count); -void __RPC_STUB ISpeechLexiconWords_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconWords_Item_Proxy( - ISpeechLexiconWords* This, - LONG Index, - ISpeechLexiconWord **Word); -void __RPC_STUB ISpeechLexiconWords_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconWords_get__NewEnum_Proxy( - ISpeechLexiconWords* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechLexiconWords_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechLexiconWords_INTERFACE_DEFINED__ */ @@ -26498,29 +22017,29 @@ typedef struct ISpeechLexiconVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechLexicon* This, + ISpeechLexicon *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechLexicon* This); + ISpeechLexicon *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechLexicon* This); + ISpeechLexicon *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechLexicon* This, + ISpeechLexicon *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechLexicon* This, + ISpeechLexicon *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechLexicon* This, + ISpeechLexicon *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -26528,7 +22047,7 @@ typedef struct ISpeechLexiconVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechLexicon* This, + ISpeechLexicon *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -26540,57 +22059,58 @@ typedef struct ISpeechLexiconVtbl { /*** ISpeechLexicon methods ***/ HRESULT (STDMETHODCALLTYPE *get_GenerationId)( - ISpeechLexicon* This, + ISpeechLexicon *This, LONG *GenerationId); HRESULT (STDMETHODCALLTYPE *GetWords)( - ISpeechLexicon* This, + ISpeechLexicon *This, SpeechLexiconType Flags, LONG *GenerationID, ISpeechLexiconWords **Words); HRESULT (STDMETHODCALLTYPE *AddPronunciation)( - ISpeechLexicon* This, + ISpeechLexicon *This, BSTR bstrWord, SpeechLanguageId LangId, SpeechPartOfSpeech PartOfSpeech, BSTR bstrPronunciation); HRESULT (STDMETHODCALLTYPE *AddPronunciationByPhoneIds)( - ISpeechLexicon* This, + ISpeechLexicon *This, BSTR bstrWord, SpeechLanguageId LangId, SpeechPartOfSpeech PartOfSpeech, VARIANT *PhoneIds); HRESULT (STDMETHODCALLTYPE *RemovePronunciation)( - ISpeechLexicon* This, + ISpeechLexicon *This, BSTR bstrWord, SpeechLanguageId LangId, SpeechPartOfSpeech PartOfSpeech, BSTR bstrPronunciation); HRESULT (STDMETHODCALLTYPE *RemovePronunciationByPhoneIds)( - ISpeechLexicon* This, + ISpeechLexicon *This, BSTR bstrWord, SpeechLanguageId LangId, SpeechPartOfSpeech PartOfSpeech, VARIANT *PhoneIds); HRESULT (STDMETHODCALLTYPE *GetPronunciations)( - ISpeechLexicon* This, + ISpeechLexicon *This, BSTR bstrWord, SpeechLanguageId LangId, SpeechLexiconType TypeFlags, ISpeechLexiconPronunciations **ppPronunciations); HRESULT (STDMETHODCALLTYPE *GetGenerationChange)( - ISpeechLexicon* This, + ISpeechLexicon *This, LONG *GenerationID, ISpeechLexiconWords **ppWords); END_INTERFACE } ISpeechLexiconVtbl; + interface ISpeechLexicon { CONST_VTBL ISpeechLexiconVtbl* lpVtbl; }; @@ -26669,88 +22189,6 @@ static FORCEINLINE HRESULT ISpeechLexicon_GetGenerationChange(ISpeechLexicon* Th #endif -HRESULT STDMETHODCALLTYPE ISpeechLexicon_get_GenerationId_Proxy( - ISpeechLexicon* This, - LONG *GenerationId); -void __RPC_STUB ISpeechLexicon_get_GenerationId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexicon_GetWords_Proxy( - ISpeechLexicon* This, - SpeechLexiconType Flags, - LONG *GenerationID, - ISpeechLexiconWords **Words); -void __RPC_STUB ISpeechLexicon_GetWords_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexicon_AddPronunciation_Proxy( - ISpeechLexicon* This, - BSTR bstrWord, - SpeechLanguageId LangId, - SpeechPartOfSpeech PartOfSpeech, - BSTR bstrPronunciation); -void __RPC_STUB ISpeechLexicon_AddPronunciation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexicon_AddPronunciationByPhoneIds_Proxy( - ISpeechLexicon* This, - BSTR bstrWord, - SpeechLanguageId LangId, - SpeechPartOfSpeech PartOfSpeech, - VARIANT *PhoneIds); -void __RPC_STUB ISpeechLexicon_AddPronunciationByPhoneIds_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexicon_RemovePronunciation_Proxy( - ISpeechLexicon* This, - BSTR bstrWord, - SpeechLanguageId LangId, - SpeechPartOfSpeech PartOfSpeech, - BSTR bstrPronunciation); -void __RPC_STUB ISpeechLexicon_RemovePronunciation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexicon_RemovePronunciationByPhoneIds_Proxy( - ISpeechLexicon* This, - BSTR bstrWord, - SpeechLanguageId LangId, - SpeechPartOfSpeech PartOfSpeech, - VARIANT *PhoneIds); -void __RPC_STUB ISpeechLexicon_RemovePronunciationByPhoneIds_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexicon_GetPronunciations_Proxy( - ISpeechLexicon* This, - BSTR bstrWord, - SpeechLanguageId LangId, - SpeechLexiconType TypeFlags, - ISpeechLexiconPronunciations **ppPronunciations); -void __RPC_STUB ISpeechLexicon_GetPronunciations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexicon_GetGenerationChange_Proxy( - ISpeechLexicon* This, - LONG *GenerationID, - ISpeechLexiconWords **ppWords); -void __RPC_STUB ISpeechLexicon_GetGenerationChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechLexicon_INTERFACE_DEFINED__ */ @@ -26787,29 +22225,29 @@ typedef struct ISpeechLexiconWordVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechLexiconWord* This); + ISpeechLexiconWord *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechLexiconWord* This); + ISpeechLexiconWord *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -26817,7 +22255,7 @@ typedef struct ISpeechLexiconWordVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -26829,23 +22267,24 @@ typedef struct ISpeechLexiconWordVtbl { /*** ISpeechLexiconWord methods ***/ HRESULT (STDMETHODCALLTYPE *get_LangId)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, SpeechLanguageId *LangId); HRESULT (STDMETHODCALLTYPE *get_Type)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, SpeechWordType *WordType); HRESULT (STDMETHODCALLTYPE *get_Word)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, BSTR *Word); HRESULT (STDMETHODCALLTYPE *get_Pronunciations)( - ISpeechLexiconWord* This, + ISpeechLexiconWord *This, ISpeechLexiconPronunciations **Pronunciations); END_INTERFACE } ISpeechLexiconWordVtbl; + interface ISpeechLexiconWord { CONST_VTBL ISpeechLexiconWordVtbl* lpVtbl; }; @@ -26908,38 +22347,6 @@ static FORCEINLINE HRESULT ISpeechLexiconWord_get_Pronunciations(ISpeechLexiconW #endif -HRESULT STDMETHODCALLTYPE ISpeechLexiconWord_get_LangId_Proxy( - ISpeechLexiconWord* This, - SpeechLanguageId *LangId); -void __RPC_STUB ISpeechLexiconWord_get_LangId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconWord_get_Type_Proxy( - ISpeechLexiconWord* This, - SpeechWordType *WordType); -void __RPC_STUB ISpeechLexiconWord_get_Type_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconWord_get_Word_Proxy( - ISpeechLexiconWord* This, - BSTR *Word); -void __RPC_STUB ISpeechLexiconWord_get_Word_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconWord_get_Pronunciations_Proxy( - ISpeechLexiconWord* This, - ISpeechLexiconPronunciations **Pronunciations); -void __RPC_STUB ISpeechLexiconWord_get_Pronunciations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechLexiconWord_INTERFACE_DEFINED__ */ @@ -26974,29 +22381,29 @@ typedef struct ISpeechLexiconPronunciationsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechLexiconPronunciations* This, + ISpeechLexiconPronunciations *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechLexiconPronunciations* This); + ISpeechLexiconPronunciations *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechLexiconPronunciations* This); + ISpeechLexiconPronunciations *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechLexiconPronunciations* This, + ISpeechLexiconPronunciations *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechLexiconPronunciations* This, + ISpeechLexiconPronunciations *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechLexiconPronunciations* This, + ISpeechLexiconPronunciations *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -27004,7 +22411,7 @@ typedef struct ISpeechLexiconPronunciationsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechLexiconPronunciations* This, + ISpeechLexiconPronunciations *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -27016,20 +22423,21 @@ typedef struct ISpeechLexiconPronunciationsVtbl { /*** ISpeechLexiconPronunciations methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - ISpeechLexiconPronunciations* This, + ISpeechLexiconPronunciations *This, LONG *Count); HRESULT (STDMETHODCALLTYPE *Item)( - ISpeechLexiconPronunciations* This, + ISpeechLexiconPronunciations *This, LONG Index, ISpeechLexiconPronunciation **Pronunciation); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISpeechLexiconPronunciations* This, + ISpeechLexiconPronunciations *This, IUnknown **EnumVARIANT); END_INTERFACE } ISpeechLexiconPronunciationsVtbl; + interface ISpeechLexiconPronunciations { CONST_VTBL ISpeechLexiconPronunciationsVtbl* lpVtbl; }; @@ -27088,31 +22496,6 @@ static FORCEINLINE HRESULT ISpeechLexiconPronunciations_get__NewEnum(ISpeechLexi #endif -HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciations_get_Count_Proxy( - ISpeechLexiconPronunciations* This, - LONG *Count); -void __RPC_STUB ISpeechLexiconPronunciations_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciations_Item_Proxy( - ISpeechLexiconPronunciations* This, - LONG Index, - ISpeechLexiconPronunciation **Pronunciation); -void __RPC_STUB ISpeechLexiconPronunciations_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciations_get__NewEnum_Proxy( - ISpeechLexiconPronunciations* This, - IUnknown **EnumVARIANT); -void __RPC_STUB ISpeechLexiconPronunciations_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechLexiconPronunciations_INTERFACE_DEFINED__ */ @@ -27152,29 +22535,29 @@ typedef struct ISpeechLexiconPronunciationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechLexiconPronunciation* This); + ISpeechLexiconPronunciation *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechLexiconPronunciation* This); + ISpeechLexiconPronunciation *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -27182,7 +22565,7 @@ typedef struct ISpeechLexiconPronunciationVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -27194,27 +22577,28 @@ typedef struct ISpeechLexiconPronunciationVtbl { /*** ISpeechLexiconPronunciation methods ***/ HRESULT (STDMETHODCALLTYPE *get_Type)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, SpeechLexiconType *LexiconType); HRESULT (STDMETHODCALLTYPE *get_LangId)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, SpeechLanguageId *LangId); HRESULT (STDMETHODCALLTYPE *get_PartOfSpeech)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, SpeechPartOfSpeech *PartOfSpeech); HRESULT (STDMETHODCALLTYPE *get_PhoneIds)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, VARIANT *PhoneIds); HRESULT (STDMETHODCALLTYPE *get_Symbolic)( - ISpeechLexiconPronunciation* This, + ISpeechLexiconPronunciation *This, BSTR *Symbolic); END_INTERFACE } ISpeechLexiconPronunciationVtbl; + interface ISpeechLexiconPronunciation { CONST_VTBL ISpeechLexiconPronunciationVtbl* lpVtbl; }; @@ -27281,46 +22665,6 @@ static FORCEINLINE HRESULT ISpeechLexiconPronunciation_get_Symbolic(ISpeechLexic #endif -HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_Type_Proxy( - ISpeechLexiconPronunciation* This, - SpeechLexiconType *LexiconType); -void __RPC_STUB ISpeechLexiconPronunciation_get_Type_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_LangId_Proxy( - ISpeechLexiconPronunciation* This, - SpeechLanguageId *LangId); -void __RPC_STUB ISpeechLexiconPronunciation_get_LangId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_PartOfSpeech_Proxy( - ISpeechLexiconPronunciation* This, - SpeechPartOfSpeech *PartOfSpeech); -void __RPC_STUB ISpeechLexiconPronunciation_get_PartOfSpeech_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_PhoneIds_Proxy( - ISpeechLexiconPronunciation* This, - VARIANT *PhoneIds); -void __RPC_STUB ISpeechLexiconPronunciation_get_PhoneIds_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_Symbolic_Proxy( - ISpeechLexiconPronunciation* This, - BSTR *Symbolic); -void __RPC_STUB ISpeechLexiconPronunciation_get_Symbolic_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechLexiconPronunciation_INTERFACE_DEFINED__ */ @@ -27359,29 +22703,29 @@ typedef struct ISpeechPhoneConverterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISpeechPhoneConverter* This); + ISpeechPhoneConverter *This); ULONG (STDMETHODCALLTYPE *Release)( - ISpeechPhoneConverter* This); + ISpeechPhoneConverter *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -27389,7 +22733,7 @@ typedef struct ISpeechPhoneConverterVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -27401,25 +22745,26 @@ typedef struct ISpeechPhoneConverterVtbl { /*** ISpeechPhoneConverter methods ***/ HRESULT (STDMETHODCALLTYPE *get_LanguageId)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, SpeechLanguageId *LanguageId); HRESULT (STDMETHODCALLTYPE *put_LanguageId)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, SpeechLanguageId LanguageId); HRESULT (STDMETHODCALLTYPE *PhoneToId)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, const BSTR Phonemes, VARIANT *IdArray); HRESULT (STDMETHODCALLTYPE *IdToPhone)( - ISpeechPhoneConverter* This, + ISpeechPhoneConverter *This, const VARIANT IdArray, BSTR *Phonemes); END_INTERFACE } ISpeechPhoneConverterVtbl; + interface ISpeechPhoneConverter { CONST_VTBL ISpeechPhoneConverterVtbl* lpVtbl; }; @@ -27482,40 +22827,6 @@ static FORCEINLINE HRESULT ISpeechPhoneConverter_IdToPhone(ISpeechPhoneConverter #endif -HRESULT STDMETHODCALLTYPE ISpeechPhoneConverter_get_LanguageId_Proxy( - ISpeechPhoneConverter* This, - SpeechLanguageId *LanguageId); -void __RPC_STUB ISpeechPhoneConverter_get_LanguageId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhoneConverter_put_LanguageId_Proxy( - ISpeechPhoneConverter* This, - SpeechLanguageId LanguageId); -void __RPC_STUB ISpeechPhoneConverter_put_LanguageId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhoneConverter_PhoneToId_Proxy( - ISpeechPhoneConverter* This, - const BSTR Phonemes, - VARIANT *IdArray); -void __RPC_STUB ISpeechPhoneConverter_PhoneToId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISpeechPhoneConverter_IdToPhone_Proxy( - ISpeechPhoneConverter* This, - const VARIANT IdArray, - BSTR *Phonemes); -void __RPC_STUB ISpeechPhoneConverter_IdToPhone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISpeechPhoneConverter_INTERFACE_DEFINED__ */ @@ -27886,16 +23197,25 @@ __CRT_UUID_DECL(SpMemoryStream, 0x5fb7ef7d, 0xdff4, 0x468a, 0xb6,0xb7, 0x2f,0xcb #ifndef __ISpXMLRecoResult_FWD_DEFINED__ #define __ISpXMLRecoResult_FWD_DEFINED__ typedef interface ISpXMLRecoResult ISpXMLRecoResult; +#ifdef __cplusplus +interface ISpXMLRecoResult; +#endif /* __cplusplus */ #endif #ifndef __ISpRecoGrammar2_FWD_DEFINED__ #define __ISpRecoGrammar2_FWD_DEFINED__ typedef interface ISpRecoGrammar2 ISpRecoGrammar2; +#ifdef __cplusplus +interface ISpRecoGrammar2; +#endif /* __cplusplus */ #endif #ifndef __ISpeechResourceLoader_FWD_DEFINED__ #define __ISpeechResourceLoader_FWD_DEFINED__ typedef interface ISpeechResourceLoader ISpeechResourceLoader; +#ifdef __cplusplus +interface ISpeechResourceLoader; +#endif /* __cplusplus */ #endif /* Begin additional prototypes for all interfaces */ diff --git a/lib/libc/include/any-windows-any/sdkddkver.h b/lib/libc/include/any-windows-any/sdkddkver.h index d86073c163..c2e626cba2 100644 --- a/lib/libc/include/any-windows-any/sdkddkver.h +++ b/lib/libc/include/any-windows-any/sdkddkver.h @@ -11,166 +11,171 @@ #define _INC_SDKDDKVER /* _WIN32_WINNT */ -#define _WIN32_WINNT_NT4 0x0400 -#define _WIN32_WINNT_WIN2K 0x0500 -#define _WIN32_WINNT_WINXP 0x0501 -#define _WIN32_WINNT_WS03 0x0502 -#define _WIN32_WINNT_WIN6 0x0600 -#define _WIN32_WINNT_VISTA 0x0600 -#define _WIN32_WINNT_WS08 0x0600 -#define _WIN32_WINNT_LONGHORN 0x0600 -#define _WIN32_WINNT_WIN7 0x0601 -#define _WIN32_WINNT_WIN8 0x0602 -#define _WIN32_WINNT_WINBLUE 0x0603 -#define _WIN32_WINNT_WINTHRESHOLD 0x0A00 -#define _WIN32_WINNT_WIN10 0x0A00 +#define _WIN32_WINNT_NT4 0x0400 +#define _WIN32_WINNT_WIN2K 0x0500 +#define _WIN32_WINNT_WINXP 0x0501 +#define _WIN32_WINNT_WS03 0x0502 +#define _WIN32_WINNT_WIN6 0x0600 +#define _WIN32_WINNT_VISTA 0x0600 +#define _WIN32_WINNT_WS08 0x0600 +#define _WIN32_WINNT_LONGHORN 0x0600 +#define _WIN32_WINNT_WIN7 0x0601 +#define _WIN32_WINNT_WIN8 0x0602 +#define _WIN32_WINNT_WINBLUE 0x0603 +#define _WIN32_WINNT_WINTHRESHOLD 0x0A00 +#define _WIN32_WINNT_WIN10 0x0A00 /* _WIN32_IE */ -#define _WIN32_IE_IE20 0x0200 -#define _WIN32_IE_IE30 0x0300 -#define _WIN32_IE_IE302 0x0302 -#define _WIN32_IE_IE40 0x0400 -#define _WIN32_IE_IE401 0x0401 -#define _WIN32_IE_IE50 0x0500 -#define _WIN32_IE_IE501 0x0501 -#define _WIN32_IE_IE55 0x0550 -#define _WIN32_IE_IE60 0x0600 -#define _WIN32_IE_IE60SP1 0x0601 -#define _WIN32_IE_IE60SP2 0x0603 -#define _WIN32_IE_IE70 0x0700 -#define _WIN32_IE_IE80 0x0800 -#define _WIN32_IE_IE90 0x0900 -#define _WIN32_IE_IE100 0x0a00 +#define _WIN32_IE_IE20 0x0200 +#define _WIN32_IE_IE30 0x0300 +#define _WIN32_IE_IE302 0x0302 +#define _WIN32_IE_IE40 0x0400 +#define _WIN32_IE_IE401 0x0401 +#define _WIN32_IE_IE50 0x0500 +#define _WIN32_IE_IE501 0x0501 +#define _WIN32_IE_IE55 0x0550 +#define _WIN32_IE_IE60 0x0600 +#define _WIN32_IE_IE60SP1 0x0601 +#define _WIN32_IE_IE60SP2 0x0603 +#define _WIN32_IE_IE70 0x0700 +#define _WIN32_IE_IE80 0x0800 +#define _WIN32_IE_IE90 0x0900 +#define _WIN32_IE_IE100 0x0a00 +#define _WIN32_IE_IE110 0x0A00 -/* Mappings Between IE Version and Windows Version */ -#define _WIN32_IE_NT4 _WIN32_IE_IE20 -#define _WIN32_IE_NT4SP1 _WIN32_IE_IE20 -#define _WIN32_IE_NT4SP2 _WIN32_IE_IE20 -#define _WIN32_IE_NT4SP3 _WIN32_IE_IE302 -#define _WIN32_IE_NT4SP4 _WIN32_IE_IE401 -#define _WIN32_IE_NT4SP5 _WIN32_IE_IE401 -#define _WIN32_IE_NT4SP6 _WIN32_IE_IE50 -#define _WIN32_IE_WIN98 _WIN32_IE_IE401 -#define _WIN32_IE_WIN98SE _WIN32_IE_IE50 -#define _WIN32_IE_WINME _WIN32_IE_IE55 -#define _WIN32_IE_WIN2K _WIN32_IE_IE501 -#define _WIN32_IE_WIN2KSP1 _WIN32_IE_IE501 -#define _WIN32_IE_WIN2KSP2 _WIN32_IE_IE501 -#define _WIN32_IE_WIN2KSP3 _WIN32_IE_IE501 -#define _WIN32_IE_WIN2KSP4 _WIN32_IE_IE501 -#define _WIN32_IE_XP _WIN32_IE_IE60 -#define _WIN32_IE_XPSP1 _WIN32_IE_IE60SP1 -#define _WIN32_IE_XPSP2 _WIN32_IE_IE60SP2 -#define _WIN32_IE_WS03 0x0602 -#define _WIN32_IE_WS03SP1 _WIN32_IE_IE60SP2 -#define _WIN32_IE_WIN6 _WIN32_IE_IE70 -#define _WIN32_IE_LONGHORN _WIN32_IE_IE70 -#define _WIN32_IE_WIN7 _WIN32_IE_IE80 -#define _WIN32_IE_WIN8 _WIN32_IE_IE100 -#define _WIN32_IE_WINBLUE _WIN32_IE_IE100 +/* Mappings Between IE Version and Windows Version */ +#define _WIN32_IE_NT4 _WIN32_IE_IE20 +#define _WIN32_IE_NT4SP1 _WIN32_IE_IE20 +#define _WIN32_IE_NT4SP2 _WIN32_IE_IE20 +#define _WIN32_IE_NT4SP3 _WIN32_IE_IE302 +#define _WIN32_IE_NT4SP4 _WIN32_IE_IE401 +#define _WIN32_IE_NT4SP5 _WIN32_IE_IE401 +#define _WIN32_IE_NT4SP6 _WIN32_IE_IE50 +#define _WIN32_IE_WIN98 _WIN32_IE_IE401 +#define _WIN32_IE_WIN98SE _WIN32_IE_IE50 +#define _WIN32_IE_WINME _WIN32_IE_IE55 +#define _WIN32_IE_WIN2K _WIN32_IE_IE501 +#define _WIN32_IE_WIN2KSP1 _WIN32_IE_IE501 +#define _WIN32_IE_WIN2KSP2 _WIN32_IE_IE501 +#define _WIN32_IE_WIN2KSP3 _WIN32_IE_IE501 +#define _WIN32_IE_WIN2KSP4 _WIN32_IE_IE501 +#define _WIN32_IE_XP _WIN32_IE_IE60 +#define _WIN32_IE_XPSP1 _WIN32_IE_IE60SP1 +#define _WIN32_IE_XPSP2 _WIN32_IE_IE60SP2 +#define _WIN32_IE_WS03 0x0602 +#define _WIN32_IE_WS03SP1 _WIN32_IE_IE60SP2 +#define _WIN32_IE_WIN6 _WIN32_IE_IE70 +#define _WIN32_IE_LONGHORN _WIN32_IE_IE70 +#define _WIN32_IE_WIN7 _WIN32_IE_IE80 +#define _WIN32_IE_WIN8 _WIN32_IE_IE100 +#define _WIN32_IE_WINBLUE _WIN32_IE_IE100 +#define _WIN32_IE_WINTHRESHOLD _WIN32_IE_IE110 +#define _WIN32_IE_WIN10 _WIN32_IE_IE110 /* NTDDI_VERSION */ #ifndef NTDDI_WIN2K -#define NTDDI_WIN2K 0x05000000 +#define NTDDI_WIN2K 0x05000000 #endif #ifndef NTDDI_WIN2KSP1 -#define NTDDI_WIN2KSP1 0x05000100 +#define NTDDI_WIN2KSP1 0x05000100 #endif #ifndef NTDDI_WIN2KSP2 -#define NTDDI_WIN2KSP2 0x05000200 +#define NTDDI_WIN2KSP2 0x05000200 #endif #ifndef NTDDI_WIN2KSP3 -#define NTDDI_WIN2KSP3 0x05000300 +#define NTDDI_WIN2KSP3 0x05000300 #endif #ifndef NTDDI_WIN2KSP4 -#define NTDDI_WIN2KSP4 0x05000400 +#define NTDDI_WIN2KSP4 0x05000400 #endif #ifndef NTDDI_WINXP -#define NTDDI_WINXP 0x05010000 +#define NTDDI_WINXP 0x05010000 #endif #ifndef NTDDI_WINXPSP1 -#define NTDDI_WINXPSP1 0x05010100 +#define NTDDI_WINXPSP1 0x05010100 #endif #ifndef NTDDI_WINXPSP2 -#define NTDDI_WINXPSP2 0x05010200 +#define NTDDI_WINXPSP2 0x05010200 #endif #ifndef NTDDI_WINXPSP3 -#define NTDDI_WINXPSP3 0x05010300 +#define NTDDI_WINXPSP3 0x05010300 #endif #ifndef NTDDI_WINXPSP4 -#define NTDDI_WINXPSP4 0x05010400 +#define NTDDI_WINXPSP4 0x05010400 #endif -#define NTDDI_WS03 0x05020000 -#define NTDDI_WS03SP1 0x05020100 -#define NTDDI_WS03SP2 0x05020200 -#define NTDDI_WS03SP3 0x05020300 -#define NTDDI_WS03SP4 0x05020400 +#define NTDDI_WS03 0x05020000 +#define NTDDI_WS03SP1 0x05020100 +#define NTDDI_WS03SP2 0x05020200 +#define NTDDI_WS03SP3 0x05020300 +#define NTDDI_WS03SP4 0x05020400 -#define NTDDI_WIN6 0x06000000 -#define NTDDI_WIN6SP1 0x06000100 -#define NTDDI_WIN6SP2 0x06000200 -#define NTDDI_WIN6SP3 0x06000300 -#define NTDDI_WIN6SP4 0x06000400 +#define NTDDI_WIN6 0x06000000 +#define NTDDI_WIN6SP1 0x06000100 +#define NTDDI_WIN6SP2 0x06000200 +#define NTDDI_WIN6SP3 0x06000300 +#define NTDDI_WIN6SP4 0x06000400 -#define NTDDI_VISTA NTDDI_WIN6 -#define NTDDI_VISTASP1 NTDDI_WIN6SP1 -#define NTDDI_VISTASP2 NTDDI_WIN6SP2 -#define NTDDI_VISTASP3 NTDDI_WIN6SP3 -#define NTDDI_VISTASP4 NTDDI_WIN6SP4 -#define NTDDI_LONGHORN NTDDI_VISTA +#define NTDDI_VISTA NTDDI_WIN6 +#define NTDDI_VISTASP1 NTDDI_WIN6SP1 +#define NTDDI_VISTASP2 NTDDI_WIN6SP2 +#define NTDDI_VISTASP3 NTDDI_WIN6SP3 +#define NTDDI_VISTASP4 NTDDI_WIN6SP4 +#define NTDDI_LONGHORN NTDDI_VISTA -#define NTDDI_WS08 NTDDI_WIN6SP1 -#define NTDDI_WS08SP2 NTDDI_WIN6SP2 -#define NTDDI_WS08SP3 NTDDI_WIN6SP3 -#define NTDDI_WS08SP4 NTDDI_WIN6SP4 - -#define NTDDI_WIN7 0x06010000 -#define NTDDI_WIN8 0x06020000 -#define NTDDI_WINBLUE 0x06030000 -#define NTDDI_WINTHRESHOLD 0x0A000000 -#define NTDDI_WIN10 0x0A000000 -#define NTDDI_WIN10_TH2 0x0A000001 -#define NTDDI_WIN10_RS1 0x0A000002 -#define NTDDI_WIN10_RS2 0x0A000003 -#define NTDDI_WIN10_RS3 0x0A000004 +#define NTDDI_WS08 NTDDI_WIN6SP1 +#define NTDDI_WS08SP2 NTDDI_WIN6SP2 +#define NTDDI_WS08SP3 NTDDI_WIN6SP3 +#define NTDDI_WS08SP4 NTDDI_WIN6SP4 +#define NTDDI_WIN7 0x06010000 +#define NTDDI_WIN8 0x06020000 +#define NTDDI_WINBLUE 0x06030000 +#define NTDDI_WINTHRESHOLD 0x0A000000 +#define NTDDI_WIN10 0x0A000000 +#define NTDDI_WIN10_TH2 0x0A000001 +#define NTDDI_WIN10_RS1 0x0A000002 +#define NTDDI_WIN10_RS2 0x0A000003 +#define NTDDI_WIN10_RS3 0x0A000004 +#define NTDDI_WIN10_RS4 0x0A000005 +#define NTDDI_WIN10_RS5 0x0A000006 +#define NTDDI_WIN10_19H1 0x0A000007 /* Version Fields in NTDDI_VERSION */ -#define OSVERSION_MASK 0xFFFF0000U -#define SPVERSION_MASK 0x0000FF00 -#define SUBVERSION_MASK 0x000000FF +#define OSVERSION_MASK 0xFFFF0000U +#define SPVERSION_MASK 0x0000FF00 +#define SUBVERSION_MASK 0x000000FF /* Macros to Extract Version Fields From NTDDI_VERSION */ -#define OSVER(Version) ((Version) & OSVERSION_MASK) -#define SPVER(Version) (((Version) & SPVERSION_MASK) >> 8) -#define SUBVER(Version) (((Version) & SUBVERSION_MASK)) +#define OSVER(Version) ((Version) & OSVERSION_MASK) +#define SPVER(Version) (((Version) & SPVERSION_MASK) >> 8) +#define SUBVER(Version) (((Version) & SUBVERSION_MASK)) /* Macros to get the NTDDI for a given WIN32 */ -#define NTDDI_VERSION_FROM_WIN32_WINNT2(Version) Version##0000 -#define NTDDI_VERSION_FROM_WIN32_WINNT(Version) NTDDI_VERSION_FROM_WIN32_WINNT2(Version) +#define NTDDI_VERSION_FROM_WIN32_WINNT2(Version) Version##0000 +#define NTDDI_VERSION_FROM_WIN32_WINNT(Version) NTDDI_VERSION_FROM_WIN32_WINNT2(Version) /* Select Default WIN32_WINNT Value */ #if !defined(_WIN32_WINNT) && !defined(_CHICAGO_) -#define _WIN32_WINNT _WIN32_WINNT_WS03 +#define _WIN32_WINNT _WIN32_WINNT_WS03 #endif /* Choose NTDDI Version */ #ifndef NTDDI_VERSION #ifdef _WIN32_WINNT -#define NTDDI_VERSION NTDDI_VERSION_FROM_WIN32_WINNT(_WIN32_WINNT) +#define NTDDI_VERSION NTDDI_VERSION_FROM_WIN32_WINNT(_WIN32_WINNT) #else -#define NTDDI_VERSION NTDDI_WS03 +#define NTDDI_VERSION NTDDI_WS03 #endif #endif /* Choose WINVER Value */ #ifndef WINVER #ifdef _WIN32_WINNT -#define WINVER _WIN32_WINNT +#define WINVER _WIN32_WINNT #else -#define WINVER 0x0502 +#define WINVER 0x0502 #endif #endif @@ -178,24 +183,24 @@ #ifndef _WIN32_IE #ifdef _WIN32_WINNT #if (_WIN32_WINNT <= _WIN32_WINNT_NT4) -#define _WIN32_IE _WIN32_IE_IE50 +#define _WIN32_IE _WIN32_IE_IE50 #elif (_WIN32_WINNT <= _WIN32_WINNT_WIN2K) -#define _WIN32_IE _WIN32_IE_IE501 +#define _WIN32_IE _WIN32_IE_IE501 #elif (_WIN32_WINNT <= _WIN32_WINNT_WINXP) -#define _WIN32_IE _WIN32_IE_IE60 +#define _WIN32_IE _WIN32_IE_IE60 #elif (_WIN32_WINNT <= _WIN32_WINNT_WS03) -#define _WIN32_IE _WIN32_IE_WS03 +#define _WIN32_IE _WIN32_IE_WS03 #elif (_WIN32_WINNT <= _WIN32_WINNT_VISTA) -#define _WIN32_IE _WIN32_IE_LONGHORN +#define _WIN32_IE _WIN32_IE_LONGHORN #elif (_WIN32_WINNT <= _WIN32_WINNT_WIN7) -#define _WIN32_IE _WIN32_IE_WIN7 +#define _WIN32_IE _WIN32_IE_WIN7 #elif (_WIN32_WINNT <= _WIN32_WINNT_WIN8) -#define _WIN32_IE _WIN32_IE_WIN8 +#define _WIN32_IE _WIN32_IE_WIN8 #else -#define _WIN32_IE 0x0a00 +#define _WIN32_IE 0x0a00 #endif #else -#define _WIN32_IE 0x0700 +#define _WIN32_IE 0x0700 #endif #endif diff --git a/lib/libc/include/any-windows-any/sec_api/conio_s.h b/lib/libc/include/any-windows-any/sec_api/conio_s.h index 2fe2a50d22..bcc7564617 100644 --- a/lib/libc/include/any-windows-any/sec_api/conio_s.h +++ b/lib/libc/include/any-windows-any/sec_api/conio_s.h @@ -9,8 +9,6 @@ #include -#if defined(MINGW_HAS_SECURE_API) - #if defined(__LIBMSVCRT__) /* When building mingw-w64, this should be blank. */ #define _SECIMP @@ -52,4 +50,3 @@ extern "C" { #endif #endif -#endif diff --git a/lib/libc/include/any-windows-any/sec_api/crtdbg_s.h b/lib/libc/include/any-windows-any/sec_api/crtdbg_s.h index 33d020f0ba..4916438110 100644 --- a/lib/libc/include/any-windows-any/sec_api/crtdbg_s.h +++ b/lib/libc/include/any-windows-any/sec_api/crtdbg_s.h @@ -9,11 +9,7 @@ #include -#if defined(MINGW_HAS_SECURE_API) - #define _dupenv_s_dbg(ps1,size,s2,t,f,l) _dupenv_s(ps1,size,s2) #define _wdupenv_s_dbg(ps1,size,s2,t,f,l) _wdupenv_s(ps1,size,s2) #endif - -#endif diff --git a/lib/libc/include/any-windows-any/sec_api/mbstring_s.h b/lib/libc/include/any-windows-any/sec_api/mbstring_s.h index 71eab2ff84..44e86b7b1c 100644 --- a/lib/libc/include/any-windows-any/sec_api/mbstring_s.h +++ b/lib/libc/include/any-windows-any/sec_api/mbstring_s.h @@ -8,8 +8,6 @@ #include -#if defined(MINGW_HAS_SECURE_API) - #ifdef __cplusplus extern "C" { #endif @@ -52,4 +50,3 @@ extern "C" { #endif #endif -#endif diff --git a/lib/libc/include/any-windows-any/sec_api/search_s.h b/lib/libc/include/any-windows-any/sec_api/search_s.h index aee3b38b3c..4f0dbdf776 100644 --- a/lib/libc/include/any-windows-any/sec_api/search_s.h +++ b/lib/libc/include/any-windows-any/sec_api/search_s.h @@ -8,8 +8,6 @@ #include -#if defined(MINGW_HAS_SECURE_API) - #ifdef __cplusplus extern "C" { #endif @@ -27,4 +25,3 @@ extern "C" { #endif #endif -#endif diff --git a/lib/libc/include/any-windows-any/sec_api/stdio_s.h b/lib/libc/include/any-windows-any/sec_api/stdio_s.h index c14427ac5c..2dbc3fb182 100644 --- a/lib/libc/include/any-windows-any/sec_api/stdio_s.h +++ b/lib/libc/include/any-windows-any/sec_api/stdio_s.h @@ -8,8 +8,6 @@ #include -#if defined(MINGW_HAS_SECURE_API) - #if defined(__LIBMSVCRT__) /* When building mingw-w64, this should be blank. */ #define _SECIMP @@ -29,7 +27,7 @@ extern "C" { size_t __cdecl fread_s(void *_DstBuf,size_t _DstSize,size_t _ElementSize,size_t _Count,FILE *_File); -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT int __cdecl __stdio_common_vsprintf_s(unsigned __int64 _Options, char *_Str, size_t _Len, const char *_Format, _locale_t _Locale, va_list _ArgList); int __cdecl __stdio_common_vsprintf_p(unsigned __int64 _Options, char *_Str, size_t _Len, const char *_Format, _locale_t _Locale, va_list _ArgList); int __cdecl __stdio_common_vsnprintf_s(unsigned __int64 _Options, char *_Str, size_t _Len, size_t _MaxCount, const char *_Format, _locale_t _Locale, va_list _ArgList); @@ -467,7 +465,7 @@ extern "C" { __builtin_va_end(_ArgList); return _Ret; } -#else /* __MSVCRT_VERSION__ >= 0x1400 */ +#else /* _UCRT */ int __cdecl fprintf_s(FILE *_File,const char *_Format,...); _CRTIMP int __cdecl _fscanf_s_l(FILE *_File,const char *_Format,_locale_t _Locale,...); int __cdecl printf_s(const char *_Format,...); @@ -532,7 +530,7 @@ extern "C" { _CRTIMP int __cdecl _snprintf_c_l(char *_DstBuf,size_t _MaxCount,const char *_Format,_locale_t _Locale,...); _CRTIMP int __cdecl _vsnprintf_l(char *_DstBuf,size_t _MaxCount,const char *_Format,_locale_t _Locale,va_list _ArgList); _CRTIMP int __cdecl _vsnprintf_c_l(char *_DstBuf,size_t _MaxCount,const char *,_locale_t _Locale,va_list _ArgList); -#endif /* __MSVCRT_VERSION__ < 0x1400 */ +#endif /* !_UCRT */ __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_3(int,vsnprintf_s,char,_DstBuf,size_t,_MaxCount,const char*,_Format,va_list,_ArgList) __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_3(int,_vsnprintf_s,char,_DstBuf,size_t,_MaxCount,const char*,_Format,va_list,_ArgList) @@ -555,7 +553,7 @@ extern "C" { _CRTIMP wchar_t *__cdecl _getws_s(wchar_t *_Str,size_t _SizeInWords); __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(wchar_t*,_getws_s,wchar_t,_DstBuf) -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT int __cdecl __stdio_common_vswprintf_s(unsigned __int64 _Options, wchar_t *_Str, size_t _Len, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); int __cdecl __stdio_common_vsnwprintf_s(unsigned __int64 _Options, wchar_t *_Str, size_t _Len, size_t _MaxCount, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); int __cdecl __stdio_common_vfwprintf_s(unsigned __int64 _Options, FILE *_File, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); @@ -735,7 +733,7 @@ extern "C" { __builtin_va_end(_ArgList); return _Ret; } -#else /* __MSVCRT_VERSION__ >= 0x1400 */ +#else /* _UCRT */ int __cdecl fwprintf_s(FILE *_File,const wchar_t *_Format,...); int __cdecl wprintf_s(const wchar_t *_Format,...); int __cdecl vfwprintf_s(FILE *_File,const wchar_t *_Format,va_list _ArgList); @@ -764,7 +762,7 @@ extern "C" { _CRTIMP int __cdecl _snwscanf_s(const wchar_t *_Src,size_t _MaxCount,const wchar_t *_Format,...); _CRTIMP int __cdecl _snwscanf_s_l(const wchar_t *_Src,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); _CRTIMP int __cdecl _wscanf_s_l(const wchar_t *_Format,_locale_t _Locale,...); -#endif /* __MSVCRT_VERSION__ < 0x1400 */ +#endif /* !_UCRT */ __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2(int, vswprintf_s, wchar_t, _Dst, const wchar_t*, _Format, va_list, _ArgList) __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1_ARGLIST(int,swprintf_s,vswprintf_s,wchar_t,_Dst,const wchar_t*,_Format) @@ -777,7 +775,7 @@ extern "C" { _CRTIMP errno_t __cdecl _wtmpnam_s(wchar_t *_DstBuf,size_t _SizeInWords); __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(errno_t,_wtmpnam_s,wchar_t,_DstBuf) -#if __MSVCRT_VERSION__ < 0x1400 +#ifndef _UCRT _CRTIMP int __cdecl _fwprintf_p(FILE *_File,const wchar_t *_Format,...); _CRTIMP int __cdecl _wprintf_p(const wchar_t *_Format,...); _CRTIMP int __cdecl _vfwprintf_p(FILE *_File,const wchar_t *_Format,va_list _ArgList); @@ -810,7 +808,7 @@ extern "C" { _CRTIMP int __cdecl _swscanf_l(const wchar_t *_Src,const wchar_t *_Format,_locale_t _Locale,...); _CRTIMP int __cdecl _snwscanf_l(const wchar_t *_Src,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); _CRTIMP int __cdecl _wscanf_l(const wchar_t *_Format,_locale_t _Locale,...); -#endif /* __MSVCRT_VERSION__ < 0x1400 */ +#endif /* !_UCRT */ #endif /* _WSTDIO_S_DEFINED */ #endif /* _STDIO_S_DEFINED */ @@ -821,4 +819,3 @@ extern "C" { } #endif #endif -#endif diff --git a/lib/libc/include/any-windows-any/sec_api/stdlib_s.h b/lib/libc/include/any-windows-any/sec_api/stdlib_s.h index cad1db767f..02117b46bc 100644 --- a/lib/libc/include/any-windows-any/sec_api/stdlib_s.h +++ b/lib/libc/include/any-windows-any/sec_api/stdlib_s.h @@ -8,8 +8,6 @@ #include -#if defined(MINGW_HAS_SECURE_API) - #ifdef __cplusplus extern "C" { #endif @@ -27,17 +25,6 @@ extern "C" { _CRTIMP errno_t __cdecl wcstombs_s(size_t *_PtNumOfCharConverted,char *_Dst,size_t _DstSizeInBytes,const wchar_t *_Src,size_t _MaxCountInBytes); _CRTIMP errno_t __cdecl _wcstombs_s_l(size_t *_PtNumOfCharConverted,char *_Dst,size_t _DstSizeInBytes,const wchar_t *_Src,size_t _MaxCountInBytes,_locale_t _Locale); -#ifndef _WSTDLIB_S_DEFINED -#define _WSTDLIB_S_DEFINED - _CRTIMP errno_t __cdecl _itow_s (int _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); - _CRTIMP errno_t __cdecl _ltow_s (long _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); - _CRTIMP errno_t __cdecl _ultow_s (unsigned long _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); - _CRTIMP errno_t __cdecl _wgetenv_s(size_t *_ReturnSize,wchar_t *_DstBuf,size_t _DstSizeInWords,const wchar_t *_VarName); - _CRTIMP errno_t __cdecl _wdupenv_s(wchar_t **_Buffer,size_t *_BufferSizeInWords,const wchar_t *_VarName); - _CRTIMP errno_t __cdecl _i64tow_s(__int64 _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); - _CRTIMP errno_t __cdecl _ui64tow_s(unsigned __int64 _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); -#endif - #ifndef _POSIX_ _CRTIMP errno_t __cdecl _ecvt_s(char *_DstBuf,size_t _Size,double _Val,int _NumOfDights,int *_PtDec,int *_PtSign); _CRTIMP errno_t __cdecl _fcvt_s(char *_DstBuf,size_t _Size,double _Val,int _NumOfDec,int *_PtDec,int *_PtSign); @@ -49,17 +36,6 @@ extern "C" { _CRTIMP errno_t __cdecl _splitpath_s(const char *_FullPath,char *_Drive,size_t _DriveSize,char *_Dir,size_t _DirSize,char *_Filename,size_t _FilenameSize,char *_Ext,size_t _ExtSize); __DEFINE_CPP_OVERLOAD_SECURE_FUNC_SPLITPATH(errno_t,_splitpath_s,char,_Dest) -#ifndef _WSTDLIBP_S_DEFINED -#define _WSTDLIBP_S_DEFINED - _CRTIMP errno_t __cdecl _wmakepath_s(wchar_t *_PathResult,size_t _SizeInWords,const wchar_t *_Drive,const wchar_t *_Dir,const wchar_t *_Filename,const wchar_t *_Ext); - _CRTIMP errno_t __cdecl _wputenv_s(const wchar_t *_Name,const wchar_t *_Value); - _CRTIMP errno_t __cdecl _wsearchenv_s(const wchar_t *_Filename,const wchar_t *_EnvVar,wchar_t *_ResultPath,size_t _SizeInWords); - - _CRTIMP errno_t __cdecl _wsplitpath_s(const wchar_t *_FullPath,wchar_t *_Drive,size_t _DriveSizeInWords,wchar_t *_Dir,size_t _DirSizeInWords,wchar_t *_Filename,size_t _FilenameSizeInWords,wchar_t *_Ext,size_t _ExtSizeInWords); - __DEFINE_CPP_OVERLOAD_SECURE_FUNC_SPLITPATH(errno_t,_wsplitpath_s,wchar_t,_Dest) - -#endif - #ifndef _QSORT_S_DEFINED #define _QSORT_S_DEFINED _CRTIMP void __cdecl qsort_s(void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(void *,const void *,const void *),void *_Context); @@ -72,4 +48,3 @@ extern "C" { #endif #endif -#endif diff --git a/lib/libc/include/any-windows-any/sec_api/stralign_s.h b/lib/libc/include/any-windows-any/sec_api/stralign_s.h index ffda6a0787..8c69eefce7 100644 --- a/lib/libc/include/any-windows-any/sec_api/stralign_s.h +++ b/lib/libc/include/any-windows-any/sec_api/stralign_s.h @@ -8,8 +8,6 @@ #include -#if defined(MINGW_HAS_SECURE_API) - #ifdef __cplusplus extern "C" { #endif @@ -27,4 +25,3 @@ extern "C" { } #endif #endif -#endif diff --git a/lib/libc/include/any-windows-any/sec_api/string_s.h b/lib/libc/include/any-windows-any/sec_api/string_s.h index 42000fb81a..8f29587b49 100644 --- a/lib/libc/include/any-windows-any/sec_api/string_s.h +++ b/lib/libc/include/any-windows-any/sec_api/string_s.h @@ -8,8 +8,6 @@ #include -#if defined(MINGW_HAS_SECURE_API) - #if defined(__LIBMSVCRT__) /* When building mingw-w64, this should be blank. */ #define _SECIMP @@ -54,9 +52,13 @@ extern "C" { _CRTIMP errno_t __cdecl _wcsnset_s(wchar_t *_Dst,size_t _DstSizeInWords,wchar_t _Val,size_t _MaxCount); _CRTIMP errno_t __cdecl _wcsset_s(wchar_t *_Str,size_t _SizeInWords,wchar_t _Val); _CRTIMP errno_t __cdecl _wcslwr_s(wchar_t *_Str,size_t _SizeInWords); + __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(errno_t, _wcslwr_s, wchar_t, _Str) _CRTIMP errno_t __cdecl _wcslwr_s_l(wchar_t *_Str,size_t _SizeInWords,_locale_t _Locale); + __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _wcslwr_s_l, wchar_t, _Str, _locale_t, _Locale) _CRTIMP errno_t __cdecl _wcsupr_s(wchar_t *_Str,size_t _Size); + __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(errno_t, _wcsupr_s, wchar_t, _Str) _CRTIMP errno_t __cdecl _wcsupr_s_l(wchar_t *_Str,size_t _Size,_locale_t _Locale); + __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _wcsupr_s_l, wchar_t, _Str, _locale_t, _Locale) _CRTIMP errno_t __cdecl wcscpy_s(wchar_t *_Dst, rsize_t _SizeInWords, const wchar_t *_Src); __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, wcscpy_s, wchar_t, _Dest, const wchar_t *, _Source) @@ -82,4 +84,3 @@ extern "C" { } #endif #endif -#endif diff --git a/lib/libc/include/any-windows-any/sec_api/sys/timeb_s.h b/lib/libc/include/any-windows-any/sec_api/sys/timeb_s.h index f635d32b65..c564960371 100644 --- a/lib/libc/include/any-windows-any/sec_api/sys/timeb_s.h +++ b/lib/libc/include/any-windows-any/sec_api/sys/timeb_s.h @@ -13,14 +13,13 @@ extern "C" { #endif -#if defined(MINGW_HAS_SECURE_API) - - _CRTIMP errno_t __cdecl _ftime_s(struct __timeb32 *_Time); + _CRTIMP errno_t __cdecl _ftime32_s(struct __timeb32 *_Time); _CRTIMP errno_t __cdecl _ftime64_s(struct __timeb64 *_Time); #ifndef _USE_32BIT_TIME_T #define _ftime_s _ftime64_s -#endif +#else +#define _ftime_s _ftime32_s #endif #ifdef __cplusplus diff --git a/lib/libc/include/any-windows-any/sec_api/tchar_s.h b/lib/libc/include/any-windows-any/sec_api/tchar_s.h index 1dd61365a2..4f2afd4250 100644 --- a/lib/libc/include/any-windows-any/sec_api/tchar_s.h +++ b/lib/libc/include/any-windows-any/sec_api/tchar_s.h @@ -8,8 +8,6 @@ #include -#if defined(MINGW_HAS_SECURE_API) - #ifdef __cplusplus extern "C" { #endif @@ -263,4 +261,3 @@ extern "C" { } #endif #endif -#endif diff --git a/lib/libc/include/any-windows-any/sec_api/wchar_s.h b/lib/libc/include/any-windows-any/sec_api/wchar_s.h index c36c4bbf07..3afd83e3a4 100644 --- a/lib/libc/include/any-windows-any/sec_api/wchar_s.h +++ b/lib/libc/include/any-windows-any/sec_api/wchar_s.h @@ -8,8 +8,6 @@ #include -#if defined(MINGW_HAS_SECURE_API) - #if defined(__LIBMSVCRT__) /* When building mingw-w64, this should be blank. */ #define _SECIMP @@ -45,7 +43,7 @@ extern "C" { _CRTIMP wchar_t *__cdecl _getws_s(wchar_t *_Str,size_t _SizeInWords); __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(wchar_t*,_getws_s,wchar_t,_DstBuf) -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT int __cdecl __stdio_common_vswprintf_s(unsigned __int64 _Options, wchar_t *_Str, size_t _Len, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); int __cdecl __stdio_common_vsnwprintf_s(unsigned __int64 _Options, wchar_t *_Str, size_t _Len, size_t _MaxCount, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); int __cdecl __stdio_common_vfwprintf_s(unsigned __int64 _Options, FILE *_File, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); @@ -225,7 +223,7 @@ extern "C" { __builtin_va_end(_ArgList); return _Ret; } -#else /* __MSVCRT_VERSION__ >= 0x1400 */ +#else /* _UCRT */ int __cdecl fwprintf_s(FILE *_File,const wchar_t *_Format,...); int __cdecl wprintf_s(const wchar_t *_Format,...); int __cdecl vfwprintf_s(FILE *_File,const wchar_t *_Format,va_list _ArgList); @@ -254,7 +252,7 @@ extern "C" { _CRTIMP int __cdecl _snwscanf_s(const wchar_t *_Src,size_t _MaxCount,const wchar_t *_Format,...); _CRTIMP int __cdecl _snwscanf_s_l(const wchar_t *_Src,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); _CRTIMP int __cdecl _wscanf_s_l(const wchar_t *_Format,_locale_t _Locale,...); -#endif /* __MSVCRT_VERSION__ < 0x1400 */ +#endif /* !_UCRT */ __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2(int, vswprintf_s, wchar_t, _Dst, const wchar_t*, _Format, va_list, _ArgList) __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1_ARGLIST(int,swprintf_s,vswprintf_s,wchar_t,_Dst,const wchar_t*,_Format) @@ -268,42 +266,6 @@ extern "C" { __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(errno_t,_wtmpnam_s,wchar_t,_DstBuf) #endif /* _WSTDIO_S_DEFINED */ -#ifndef _WSTDLIB_S_DEFINED -#define _WSTDLIB_S_DEFINED - _CRTIMP errno_t __cdecl _itow_s (int _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); - __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(errno_t,_itow_s,int,_Val,wchar_t,_DstBuf,int,_Radix) - - _CRTIMP errno_t __cdecl _ltow_s (long _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); - __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(errno_t,_ltow_s,long,_Val,wchar_t,_DstBuf,int,_Radix) - - _CRTIMP errno_t __cdecl _ultow_s (unsigned long _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); - __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(errno_t,_ultow_s,unsigned long,_Val,wchar_t,_DstBuf,int,_Radix) - - _CRTIMP errno_t __cdecl _wgetenv_s(size_t *_ReturnSize,wchar_t *_DstBuf,size_t _DstSizeInWords,const wchar_t *_VarName); - __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(errno_t,_wgetenv_s,size_t*,_ReturnSize,wchar_t,_DstBuf,const wchar_t*,_VarName) - - _CRTIMP errno_t __cdecl _wdupenv_s(wchar_t **_Buffer,size_t *_BufferSizeInWords,const wchar_t *_VarName); - _CRTIMP errno_t __cdecl _i64tow_s(__int64 _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); - _CRTIMP errno_t __cdecl _ui64tow_s(unsigned __int64 _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); -#endif - -#ifndef _POSIX_ -#ifndef _WSTDLIBP_S_DEFINED -#define _WSTDLIBP_S_DEFINED - _CRTIMP errno_t __cdecl _wmakepath_s(wchar_t *_PathResult,size_t _SizeInWords,const wchar_t *_Drive,const wchar_t *_Dir,const wchar_t *_Filename,const wchar_t *_Ext); - __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_4(errno_t,_wmakepath_s,wchar_t,_PathResult,const wchar_t*,_Drive,const wchar_t*,_Dir,const wchar_t*,_Filename,const wchar_t*,_Ext) - - _CRTIMP errno_t __cdecl _wputenv_s(const wchar_t *_Name,const wchar_t *_Value); - - _CRTIMP errno_t __cdecl _wsearchenv_s(const wchar_t *_Filename,const wchar_t *_EnvVar,wchar_t *_ResultPath,size_t _SizeInWords); - __DEFINE_CPP_OVERLOAD_SECURE_FUNC_2_0(errno_t,_wsearchenv_s,const wchar_t*,_Filename,const wchar_t*,_EnvVar,wchar_t,_ResultPath) - - _CRTIMP errno_t __cdecl _wsplitpath_s(const wchar_t *_FullPath,wchar_t *_Drive,size_t _DriveSizeInWords,wchar_t *_Dir,size_t _DirSizeInWords,wchar_t *_Filename,size_t _FilenameSizeInWords,wchar_t *_Ext,size_t _ExtSizeInWords); - __DEFINE_CPP_OVERLOAD_SECURE_FUNC_SPLITPATH(errno_t,_wsplitpath_s,wchar_t,_Dest) - -#endif -#endif - #ifndef _WSTRING_S_DEFINED #define _WSTRING_S_DEFINED _CRTIMP wchar_t *__cdecl wcstok_s(wchar_t *_Str,const wchar_t *_Delim,wchar_t **_Context); @@ -312,9 +274,13 @@ extern "C" { _CRTIMP errno_t __cdecl _wcsnset_s(wchar_t *_Dst,size_t _DstSizeInWords,wchar_t _Val,size_t _MaxCount); _CRTIMP errno_t __cdecl _wcsset_s(wchar_t *_Str,size_t _SizeInWords,wchar_t _Val); _CRTIMP errno_t __cdecl _wcslwr_s(wchar_t *_Str,size_t _SizeInWords); + __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(errno_t, _wcslwr_s, wchar_t, _Str) _CRTIMP errno_t __cdecl _wcslwr_s_l(wchar_t *_Str,size_t _SizeInWords,_locale_t _Locale); + __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _wcslwr_s_l, wchar_t, _Str, _locale_t, _Locale) _CRTIMP errno_t __cdecl _wcsupr_s(wchar_t *_Str,size_t _Size); + __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(errno_t, _wcsupr_s, wchar_t, _Str) _CRTIMP errno_t __cdecl _wcsupr_s_l(wchar_t *_Str,size_t _Size,_locale_t _Locale); + __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _wcsupr_s_l, wchar_t, _Str, _locale_t, _Locale) _CRTIMP errno_t __cdecl wcscat_s(wchar_t *_Dst, rsize_t _DstSize, const wchar_t *_Src); __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, wcscat_s, wchar_t, _Dest, const wchar_t *, _Source) @@ -369,4 +335,3 @@ __CRT_INLINE errno_t __cdecl _wctime_s(wchar_t *_Buffer,size_t _SizeInWords,cons #endif #endif -#endif diff --git a/lib/libc/include/any-windows-any/securitybaseapi.h b/lib/libc/include/any-windows-any/securitybaseapi.h index d3d6460bae..70d461b2aa 100644 --- a/lib/libc/include/any-windows-any/securitybaseapi.h +++ b/lib/libc/include/any-windows-any/securitybaseapi.h @@ -183,6 +183,11 @@ extern "C" { #endif #endif +#if _WIN32_WINNT >= 0x0A00 + WINADVAPI LONG WINAPI CveEventWrite (PCWSTR CveId, PCWSTR AdditionalDetails); + WINADVAPI WINBOOL WINAPI DeriveCapabilitySidsFromName(LPCWSTR CapName, PSID** CapabilityGroupSids, DWORD* CapabilityGroupSidCount, PSID** CapabilitySids, DWORD* CapabilitySidCount); +#endif + #ifdef __cplusplus } #endif diff --git a/lib/libc/include/any-windows-any/sensorsapi.h b/lib/libc/include/any-windows-any/sensorsapi.h index 65d36eba5e..2d598c008c 100644 --- a/lib/libc/include/any-windows-any/sensorsapi.h +++ b/lib/libc/include/any-windows-any/sensorsapi.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/sensorsapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/sensorsapi.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,31 +21,49 @@ #ifndef __ISensorManager_FWD_DEFINED__ #define __ISensorManager_FWD_DEFINED__ typedef interface ISensorManager ISensorManager; +#ifdef __cplusplus +interface ISensorManager; +#endif /* __cplusplus */ #endif #ifndef __ISensorCollection_FWD_DEFINED__ #define __ISensorCollection_FWD_DEFINED__ typedef interface ISensorCollection ISensorCollection; +#ifdef __cplusplus +interface ISensorCollection; +#endif /* __cplusplus */ #endif #ifndef __ISensor_FWD_DEFINED__ #define __ISensor_FWD_DEFINED__ typedef interface ISensor ISensor; +#ifdef __cplusplus +interface ISensor; +#endif /* __cplusplus */ #endif #ifndef __ISensorDataReport_FWD_DEFINED__ #define __ISensorDataReport_FWD_DEFINED__ typedef interface ISensorDataReport ISensorDataReport; +#ifdef __cplusplus +interface ISensorDataReport; +#endif /* __cplusplus */ #endif #ifndef __ISensorManagerEvents_FWD_DEFINED__ #define __ISensorManagerEvents_FWD_DEFINED__ typedef interface ISensorManagerEvents ISensorManagerEvents; +#ifdef __cplusplus +interface ISensorManagerEvents; +#endif /* __cplusplus */ #endif #ifndef __ISensorEvents_FWD_DEFINED__ #define __ISensorEvents_FWD_DEFINED__ typedef interface ISensorEvents ISensorEvents; +#ifdef __cplusplus +interface ISensorEvents; +#endif /* __cplusplus */ #endif #ifndef __SensorManager_FWD_DEFINED__ @@ -95,26 +114,41 @@ typedef REFGUID REFSENSOR_ID; #ifndef __ISensorCollection_FWD_DEFINED__ #define __ISensorCollection_FWD_DEFINED__ typedef interface ISensorCollection ISensorCollection; +#ifdef __cplusplus +interface ISensorCollection; +#endif /* __cplusplus */ #endif #ifndef __ISensor_FWD_DEFINED__ #define __ISensor_FWD_DEFINED__ typedef interface ISensor ISensor; +#ifdef __cplusplus +interface ISensor; +#endif /* __cplusplus */ #endif #ifndef __ISensorDataReport_FWD_DEFINED__ #define __ISensorDataReport_FWD_DEFINED__ typedef interface ISensorDataReport ISensorDataReport; +#ifdef __cplusplus +interface ISensorDataReport; +#endif /* __cplusplus */ #endif #ifndef __ISensorManagerEvents_FWD_DEFINED__ #define __ISensorManagerEvents_FWD_DEFINED__ typedef interface ISensorManagerEvents ISensorManagerEvents; +#ifdef __cplusplus +interface ISensorManagerEvents; +#endif /* __cplusplus */ #endif #ifndef __ISensorEvents_FWD_DEFINED__ #define __ISensorEvents_FWD_DEFINED__ typedef interface ISensorEvents ISensorEvents; +#ifdef __cplusplus +interface ISensorEvents; +#endif /* __cplusplus */ #endif /***************************************************************************** @@ -158,44 +192,45 @@ typedef struct ISensorManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISensorManager* This, + ISensorManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISensorManager* This); + ISensorManager *This); ULONG (STDMETHODCALLTYPE *Release)( - ISensorManager* This); + ISensorManager *This); /*** ISensorManager methods ***/ HRESULT (STDMETHODCALLTYPE *GetSensorsByCategory)( - ISensorManager* This, + ISensorManager *This, REFSENSOR_CATEGORY_ID sensorCategory, ISensorCollection **ppSensorsFound); HRESULT (STDMETHODCALLTYPE *GetSensorsByType)( - ISensorManager* This, + ISensorManager *This, REFSENSOR_TYPE_ID sensorType, ISensorCollection **ppSensorsFound); HRESULT (STDMETHODCALLTYPE *GetSensorByID)( - ISensorManager* This, + ISensorManager *This, REFSENSOR_ID sensorID, ISensor **ppSensor); HRESULT (STDMETHODCALLTYPE *SetEventSink)( - ISensorManager* This, + ISensorManager *This, ISensorManagerEvents *pEvents); HRESULT (STDMETHODCALLTYPE *RequestPermissions)( - ISensorManager* This, + ISensorManager *This, HWND hParent, ISensorCollection *pSensors, WINBOOL fModal); END_INTERFACE } ISensorManagerVtbl; + interface ISensorManager { CONST_VTBL ISensorManagerVtbl* lpVtbl; }; @@ -244,51 +279,6 @@ static FORCEINLINE HRESULT ISensorManager_RequestPermissions(ISensorManager* Thi #endif -HRESULT STDMETHODCALLTYPE ISensorManager_GetSensorsByCategory_Proxy( - ISensorManager* This, - REFSENSOR_CATEGORY_ID sensorCategory, - ISensorCollection **ppSensorsFound); -void __RPC_STUB ISensorManager_GetSensorsByCategory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensorManager_GetSensorsByType_Proxy( - ISensorManager* This, - REFSENSOR_TYPE_ID sensorType, - ISensorCollection **ppSensorsFound); -void __RPC_STUB ISensorManager_GetSensorsByType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensorManager_GetSensorByID_Proxy( - ISensorManager* This, - REFSENSOR_ID sensorID, - ISensor **ppSensor); -void __RPC_STUB ISensorManager_GetSensorByID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensorManager_SetEventSink_Proxy( - ISensorManager* This, - ISensorManagerEvents *pEvents); -void __RPC_STUB ISensorManager_SetEventSink_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensorManager_RequestPermissions_Proxy( - ISensorManager* This, - HWND hParent, - ISensorCollection *pSensors, - WINBOOL fModal); -void __RPC_STUB ISensorManager_RequestPermissions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISensorManager_INTERFACE_DEFINED__ */ @@ -332,43 +322,44 @@ typedef struct ISensorCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISensorCollection* This, + ISensorCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISensorCollection* This); + ISensorCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - ISensorCollection* This); + ISensorCollection *This); /*** ISensorCollection methods ***/ HRESULT (STDMETHODCALLTYPE *GetAt)( - ISensorCollection* This, + ISensorCollection *This, ULONG ulIndex, ISensor **ppSensor); HRESULT (STDMETHODCALLTYPE *GetCount)( - ISensorCollection* This, + ISensorCollection *This, ULONG *pCount); HRESULT (STDMETHODCALLTYPE *Add)( - ISensorCollection* This, + ISensorCollection *This, ISensor *pSensor); HRESULT (STDMETHODCALLTYPE *Remove)( - ISensorCollection* This, + ISensorCollection *This, ISensor *pSensor); HRESULT (STDMETHODCALLTYPE *RemoveByID)( - ISensorCollection* This, + ISensorCollection *This, REFSENSOR_ID sensorID); HRESULT (STDMETHODCALLTYPE *Clear)( - ISensorCollection* This); + ISensorCollection *This); END_INTERFACE } ISensorCollectionVtbl; + interface ISensorCollection { CONST_VTBL ISensorCollectionVtbl* lpVtbl; }; @@ -421,54 +412,6 @@ static FORCEINLINE HRESULT ISensorCollection_Clear(ISensorCollection* This) { #endif -HRESULT STDMETHODCALLTYPE ISensorCollection_GetAt_Proxy( - ISensorCollection* This, - ULONG ulIndex, - ISensor **ppSensor); -void __RPC_STUB ISensorCollection_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensorCollection_GetCount_Proxy( - ISensorCollection* This, - ULONG *pCount); -void __RPC_STUB ISensorCollection_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensorCollection_Add_Proxy( - ISensorCollection* This, - ISensor *pSensor); -void __RPC_STUB ISensorCollection_Add_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensorCollection_Remove_Proxy( - ISensorCollection* This, - ISensor *pSensor); -void __RPC_STUB ISensorCollection_Remove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensorCollection_RemoveByID_Proxy( - ISensorCollection* This, - REFSENSOR_ID sensorID); -void __RPC_STUB ISensorCollection_RemoveByID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensorCollection_Clear_Proxy( - ISensorCollection* This); -void __RPC_STUB ISensorCollection_Clear_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISensorCollection_INTERFACE_DEFINED__ */ @@ -545,86 +488,87 @@ typedef struct ISensorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISensor* This, + ISensor *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISensor* This); + ISensor *This); ULONG (STDMETHODCALLTYPE *Release)( - ISensor* This); + ISensor *This); /*** ISensor methods ***/ HRESULT (STDMETHODCALLTYPE *GetID)( - ISensor* This, + ISensor *This, SENSOR_ID *pID); HRESULT (STDMETHODCALLTYPE *GetCategory)( - ISensor* This, + ISensor *This, SENSOR_CATEGORY_ID *pSensorCategory); HRESULT (STDMETHODCALLTYPE *GetType)( - ISensor* This, + ISensor *This, SENSOR_TYPE_ID *pSensorType); HRESULT (STDMETHODCALLTYPE *GetFriendlyName)( - ISensor* This, + ISensor *This, BSTR *pFriendlyName); HRESULT (STDMETHODCALLTYPE *GetProperty)( - ISensor* This, + ISensor *This, REFPROPERTYKEY key, PROPVARIANT *pProperty); HRESULT (STDMETHODCALLTYPE *GetProperties)( - ISensor* This, + ISensor *This, IPortableDeviceKeyCollection *pKeys, IPortableDeviceValues **ppProperties); HRESULT (STDMETHODCALLTYPE *GetSupportedDataFields)( - ISensor* This, + ISensor *This, IPortableDeviceKeyCollection **ppDataFields); HRESULT (STDMETHODCALLTYPE *SetProperties)( - ISensor* This, + ISensor *This, IPortableDeviceValues *pProperties, IPortableDeviceValues **ppResults); HRESULT (STDMETHODCALLTYPE *SupportsDataField)( - ISensor* This, + ISensor *This, REFPROPERTYKEY key, VARIANT_BOOL *pIsSupported); HRESULT (STDMETHODCALLTYPE *GetState)( - ISensor* This, + ISensor *This, SensorState *pState); HRESULT (STDMETHODCALLTYPE *GetData)( - ISensor* This, + ISensor *This, ISensorDataReport **ppDataReport); HRESULT (STDMETHODCALLTYPE *SupportsEvent)( - ISensor* This, + ISensor *This, REFGUID eventGuid, VARIANT_BOOL *pIsSupported); HRESULT (STDMETHODCALLTYPE *GetEventInterest)( - ISensor* This, + ISensor *This, GUID **ppValues, ULONG *pCount); HRESULT (STDMETHODCALLTYPE *SetEventInterest)( - ISensor* This, + ISensor *This, GUID *pValues, ULONG count); HRESULT (STDMETHODCALLTYPE *SetEventSink)( - ISensor* This, + ISensor *This, ISensorEvents *pEvents); END_INTERFACE } ISensorVtbl; + interface ISensor { CONST_VTBL ISensorVtbl* lpVtbl; }; @@ -713,133 +657,6 @@ static FORCEINLINE HRESULT ISensor_SetEventSink(ISensor* This,ISensorEvents *pEv #endif -HRESULT STDMETHODCALLTYPE ISensor_GetID_Proxy( - ISensor* This, - SENSOR_ID *pID); -void __RPC_STUB ISensor_GetID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensor_GetCategory_Proxy( - ISensor* This, - SENSOR_CATEGORY_ID *pSensorCategory); -void __RPC_STUB ISensor_GetCategory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensor_GetType_Proxy( - ISensor* This, - SENSOR_TYPE_ID *pSensorType); -void __RPC_STUB ISensor_GetType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensor_GetFriendlyName_Proxy( - ISensor* This, - BSTR *pFriendlyName); -void __RPC_STUB ISensor_GetFriendlyName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensor_GetProperty_Proxy( - ISensor* This, - REFPROPERTYKEY key, - PROPVARIANT *pProperty); -void __RPC_STUB ISensor_GetProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensor_GetProperties_Proxy( - ISensor* This, - IPortableDeviceKeyCollection *pKeys, - IPortableDeviceValues **ppProperties); -void __RPC_STUB ISensor_GetProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensor_GetSupportedDataFields_Proxy( - ISensor* This, - IPortableDeviceKeyCollection **ppDataFields); -void __RPC_STUB ISensor_GetSupportedDataFields_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensor_SetProperties_Proxy( - ISensor* This, - IPortableDeviceValues *pProperties, - IPortableDeviceValues **ppResults); -void __RPC_STUB ISensor_SetProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensor_SupportsDataField_Proxy( - ISensor* This, - REFPROPERTYKEY key, - VARIANT_BOOL *pIsSupported); -void __RPC_STUB ISensor_SupportsDataField_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensor_GetState_Proxy( - ISensor* This, - SensorState *pState); -void __RPC_STUB ISensor_GetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensor_GetData_Proxy( - ISensor* This, - ISensorDataReport **ppDataReport); -void __RPC_STUB ISensor_GetData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensor_SupportsEvent_Proxy( - ISensor* This, - REFGUID eventGuid, - VARIANT_BOOL *pIsSupported); -void __RPC_STUB ISensor_SupportsEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensor_GetEventInterest_Proxy( - ISensor* This, - GUID **ppValues, - ULONG *pCount); -void __RPC_STUB ISensor_GetEventInterest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensor_SetEventInterest_Proxy( - ISensor* This, - GUID *pValues, - ULONG count); -void __RPC_STUB ISensor_SetEventInterest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensor_SetEventSink_Proxy( - ISensor* This, - ISensorEvents *pEvents); -void __RPC_STUB ISensor_SetEventSink_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISensor_INTERFACE_DEFINED__ */ @@ -875,33 +692,34 @@ typedef struct ISensorDataReportVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISensorDataReport* This, + ISensorDataReport *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISensorDataReport* This); + ISensorDataReport *This); ULONG (STDMETHODCALLTYPE *Release)( - ISensorDataReport* This); + ISensorDataReport *This); /*** ISensorDataReport methods ***/ HRESULT (STDMETHODCALLTYPE *GetTimestamp)( - ISensorDataReport* This, + ISensorDataReport *This, SYSTEMTIME *pTimeStamp); HRESULT (STDMETHODCALLTYPE *GetSensorValue)( - ISensorDataReport* This, + ISensorDataReport *This, REFPROPERTYKEY pKey, PROPVARIANT *pValue); HRESULT (STDMETHODCALLTYPE *GetSensorValues)( - ISensorDataReport* This, + ISensorDataReport *This, IPortableDeviceKeyCollection *pKeys, IPortableDeviceValues **ppValues); END_INTERFACE } ISensorDataReportVtbl; + interface ISensorDataReport { CONST_VTBL ISensorDataReportVtbl* lpVtbl; }; @@ -942,32 +760,6 @@ static FORCEINLINE HRESULT ISensorDataReport_GetSensorValues(ISensorDataReport* #endif -HRESULT STDMETHODCALLTYPE ISensorDataReport_GetTimestamp_Proxy( - ISensorDataReport* This, - SYSTEMTIME *pTimeStamp); -void __RPC_STUB ISensorDataReport_GetTimestamp_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensorDataReport_GetSensorValue_Proxy( - ISensorDataReport* This, - REFPROPERTYKEY pKey, - PROPVARIANT *pValue); -void __RPC_STUB ISensorDataReport_GetSensorValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensorDataReport_GetSensorValues_Proxy( - ISensorDataReport* This, - IPortableDeviceKeyCollection *pKeys, - IPortableDeviceValues **ppValues); -void __RPC_STUB ISensorDataReport_GetSensorValues_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISensorDataReport_INTERFACE_DEFINED__ */ @@ -996,24 +788,25 @@ typedef struct ISensorManagerEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISensorManagerEvents* This, + ISensorManagerEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISensorManagerEvents* This); + ISensorManagerEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - ISensorManagerEvents* This); + ISensorManagerEvents *This); /*** ISensorManagerEvents methods ***/ HRESULT (STDMETHODCALLTYPE *OnSensorEnter)( - ISensorManagerEvents* This, + ISensorManagerEvents *This, ISensor *pSensor, SensorState state); END_INTERFACE } ISensorManagerEventsVtbl; + interface ISensorManagerEvents { CONST_VTBL ISensorManagerEventsVtbl* lpVtbl; }; @@ -1046,15 +839,6 @@ static FORCEINLINE HRESULT ISensorManagerEvents_OnSensorEnter(ISensorManagerEven #endif -HRESULT STDMETHODCALLTYPE ISensorManagerEvents_OnSensorEnter_Proxy( - ISensorManagerEvents* This, - ISensor *pSensor, - SensorState state); -void __RPC_STUB ISensorManagerEvents_OnSensorEnter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISensorManagerEvents_INTERFACE_DEFINED__ */ @@ -1095,39 +879,40 @@ typedef struct ISensorEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISensorEvents* This, + ISensorEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISensorEvents* This); + ISensorEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - ISensorEvents* This); + ISensorEvents *This); /*** ISensorEvents methods ***/ HRESULT (STDMETHODCALLTYPE *OnStateChanged)( - ISensorEvents* This, + ISensorEvents *This, ISensor *pSensor, SensorState state); HRESULT (STDMETHODCALLTYPE *OnDataUpdated)( - ISensorEvents* This, + ISensorEvents *This, ISensor *pSensor, ISensorDataReport *pNewData); HRESULT (STDMETHODCALLTYPE *OnEvent)( - ISensorEvents* This, + ISensorEvents *This, ISensor *pSensor, REFGUID eventID, IPortableDeviceValues *pEventData); HRESULT (STDMETHODCALLTYPE *OnLeave)( - ISensorEvents* This, + ISensorEvents *This, REFSENSOR_ID ID); END_INTERFACE } ISensorEventsVtbl; + interface ISensorEvents { CONST_VTBL ISensorEventsVtbl* lpVtbl; }; @@ -1172,42 +957,6 @@ static FORCEINLINE HRESULT ISensorEvents_OnLeave(ISensorEvents* This,REFSENSOR_I #endif -HRESULT STDMETHODCALLTYPE ISensorEvents_OnStateChanged_Proxy( - ISensorEvents* This, - ISensor *pSensor, - SensorState state); -void __RPC_STUB ISensorEvents_OnStateChanged_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensorEvents_OnDataUpdated_Proxy( - ISensorEvents* This, - ISensor *pSensor, - ISensorDataReport *pNewData); -void __RPC_STUB ISensorEvents_OnDataUpdated_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensorEvents_OnEvent_Proxy( - ISensorEvents* This, - ISensor *pSensor, - REFGUID eventID, - IPortableDeviceValues *pEventData); -void __RPC_STUB ISensorEvents_OnEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISensorEvents_OnLeave_Proxy( - ISensorEvents* This, - REFSENSOR_ID ID); -void __RPC_STUB ISensorEvents_OnLeave_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISensorEvents_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/servprov.h b/lib/libc/include/any-windows-any/servprov.h index b4f93b616f..b13a5c4691 100644 --- a/lib/libc/include/any-windows-any/servprov.h +++ b/lib/libc/include/any-windows-any/servprov.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/servprov.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/servprov.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,6 +21,9 @@ #ifndef __IServiceProvider_FWD_DEFINED__ #define __IServiceProvider_FWD_DEFINED__ typedef interface IServiceProvider IServiceProvider; +#ifdef __cplusplus +interface IServiceProvider; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -43,6 +47,9 @@ extern "C" { #ifndef __IServiceProvider_FWD_DEFINED__ #define __IServiceProvider_FWD_DEFINED__ typedef interface IServiceProvider IServiceProvider; +#ifdef __cplusplus +interface IServiceProvider; +#endif /* __cplusplus */ #endif @@ -94,25 +101,26 @@ typedef struct IServiceProviderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IServiceProvider* This, + IServiceProvider *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IServiceProvider* This); + IServiceProvider *This); ULONG (STDMETHODCALLTYPE *Release)( - IServiceProvider* This); + IServiceProvider *This); /*** IServiceProvider methods ***/ HRESULT (STDMETHODCALLTYPE *QueryService)( - IServiceProvider* This, + IServiceProvider *This, REFGUID guidService, REFIID riid, void **ppvObject); END_INTERFACE } IServiceProviderVtbl; + interface IServiceProvider { CONST_VTBL IServiceProviderVtbl* lpVtbl; }; diff --git a/lib/libc/include/any-windows-any/setjmp.h b/lib/libc/include/any-windows-any/setjmp.h index fc79f10919..276e9c2b17 100644 --- a/lib/libc/include/any-windows-any/setjmp.h +++ b/lib/libc/include/any-windows-any/setjmp.h @@ -200,35 +200,50 @@ extern "C" { #define _JMP_BUF_DEFINED #endif +_CRTIMP __MINGW_ATTRIB_NORETURN __attribute__ ((__nothrow__)) void __cdecl longjmp(jmp_buf _Buf,int _Value); + void * __cdecl __attribute__ ((__nothrow__)) mingw_getsp (void); +#pragma push_macro("__has_builtin") +#ifndef __has_builtin + #define __has_builtin(x) 0 +#endif + #if !defined(USE_NO_MINGW_SETJMP_TWO_ARGS) -# if __MSVCRT_VERSION__ >= 0x1400 +# ifdef _UCRT # ifdef _WIN64 # define _setjmp __intrinsic_setjmpex # else # define _setjmp __intrinsic_setjmp # endif +# elif defined(__aarch64__) + // ARM64 msvcrt.dll lacks _setjmp, only has _setjmpex. +# define _setjmp _setjmpex # endif # ifndef _INC_SETJMPEX # if defined(_X86_) || defined(__i386__) # define setjmp(BUF) _setjmp3((BUF), NULL) -# elif defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__) +# elif defined(_ARM_) || defined(__arm__) || ((defined(_ARM64_) || defined(__aarch64__)) && (!defined(__SEH__) || !__has_builtin(__builtin_sponentry))) # define setjmp(BUF) __mingw_setjmp((BUF)) # define longjmp __mingw_longjmp int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) __mingw_setjmp(jmp_buf _Buf); -# else -# if (__MINGW_GCC_VERSION < 40702) + __MINGW_ATTRIB_NORETURN __attribute__ ((__nothrow__)) void __mingw_longjmp(jmp_buf _Buf,int _Value); +# elif defined(__SEH__) +# if defined(__aarch64__) || defined(_ARM64_) +# define setjmp(BUF) _setjmp((BUF), __builtin_sponentry()) +# elif (__MINGW_GCC_VERSION < 40702) # define setjmp(BUF) _setjmp((BUF), mingw_getsp()) # else # define setjmp(BUF) _setjmp((BUF), __builtin_frame_address (0)) # endif +# else +# define setjmp(BUF) _setjmp((BUF), NULL) # endif int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp(jmp_buf _Buf, void *_Ctx); int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp3(jmp_buf _Buf, void *_Ctx); # else # undef setjmp -# ifdef _WIN64 +# ifdef __SEH__ # if (__MINGW_GCC_VERSION < 40702) # define setjmp(BUF) _setjmpex((BUF), mingw_getsp()) # define setjmpex(BUF) _setjmpex((BUF), mingw_getsp()) @@ -252,8 +267,7 @@ void * __cdecl __attribute__ ((__nothrow__)) mingw_getsp (void); int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) setjmp(jmp_buf _Buf); #endif - __MINGW_ATTRIB_NORETURN __attribute__ ((__nothrow__)) void __cdecl ms_longjmp(jmp_buf _Buf,int _Value)/* throw(...)*/; - __MINGW_ATTRIB_NORETURN __attribute__ ((__nothrow__)) void __cdecl longjmp(jmp_buf _Buf,int _Value); +#pragma pop_macro("__has_builtin") #ifdef __cplusplus } diff --git a/lib/libc/include/any-windows-any/shellscalingapi.h b/lib/libc/include/any-windows-any/shellscalingapi.h new file mode 100644 index 0000000000..797c460209 --- /dev/null +++ b/lib/libc/include/any-windows-any/shellscalingapi.h @@ -0,0 +1,80 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#ifndef _SHELLSCALINGAPI_H_ +#define _SHELLSCALINGAPI_H_ + +#include +#include + +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) + +#ifndef SCALING_ENUMS_DECLARED +typedef enum { + SCF_VALUE_NONE = 0x00, + SCF_SCALE = 0x01, + SCF_PHYSICAL = 0x02 +} SCALE_CHANGE_FLAGS; +DEFINE_ENUM_FLAG_OPERATORS(SCALE_CHANGE_FLAGS); + +typedef enum { + DEVICE_PRIMARY = 0, + DEVICE_IMMERSIVE = 1 +} DISPLAY_DEVICE_TYPE; + +#define SCALING_ENUMS_DECLARED +#endif /* SCALING_ENUMS_DECLARED */ + +#if NTDDI_VERSION >= NTDDI_WIN8 +STDAPI_(DEVICE_SCALE_FACTOR) GetScaleFactorForDevice(DISPLAY_DEVICE_TYPE deviceType); +STDAPI RegisterScaleChangeNotifications(DISPLAY_DEVICE_TYPE displayDevice, HWND hwndNotify, UINT uMsgNotify, + DWORD *pdwCookie); +STDAPI RevokeScaleChangeNotifications(DISPLAY_DEVICE_TYPE displayDevice, DWORD dwCookie); +#endif /* NTDDI_VERSION >= NTDDI_WIN8 */ + +#ifndef DPI_ENUMS_DECLARED +typedef enum MONITOR_DPI_TYPE { + MDT_EFFECTIVE_DPI = 0, + MDT_ANGULAR_DPI = 1, + MDT_RAW_DPI = 2, + MDT_DEFAULT = MDT_EFFECTIVE_DPI +} MONITOR_DPI_TYPE; + +typedef enum PROCESS_DPI_AWARENESS { + PROCESS_DPI_UNAWARE = 0, + PROCESS_SYSTEM_DPI_AWARE = 1, + PROCESS_PER_MONITOR_DPI_AWARE = 2 +} PROCESS_DPI_AWARENESS; + +#define DPI_ENUMS_DECLARED +#endif /* DPI_ENUMS_DECLARED */ + +#if NTDDI_VERSION >= NTDDI_WINBLUE +STDAPI GetScaleFactorForMonitor(HMONITOR hMon, DEVICE_SCALE_FACTOR *pScale); +STDAPI RegisterScaleChangeEvent(HANDLE hEvent, DWORD_PTR *pdwCookie); +STDAPI UnregisterScaleChangeEvent(DWORD_PTR dwCookie); + +STDAPI GetDpiForMonitor(HMONITOR hmonitor, MONITOR_DPI_TYPE dpiType, UINT *dpiX, UINT *dpiY); +STDAPI GetProcessDpiAwareness(HANDLE hprocess, PROCESS_DPI_AWARENESS *value); +STDAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS value); +#endif /* NTDDI_VERSION >= NTDDI_WINBLUE */ + +#if NTDDI_VERSION >= NTDDI_WINTHRESHOLD +#ifndef SHELL_UI_COMPONENT_ENUMS_DECLARED +typedef enum { + SHELL_UI_COMPONENT_TASKBARS = 0, + SHELL_UI_COMPONENT_NOTIFICATIONAREA = 1, + SHELL_UI_COMPONENT_DESKBAND = 2 +} SHELL_UI_COMPONENT; + +#define SHELL_UI_COMPONENT_ENUMS_DECLARED +#endif /* SHELL_UI_COMPONENT_ENUMS_DECLARED */ + +UINT WINAPI GetDpiForShellUIComponent(SHELL_UI_COMPONENT component); +#endif /* NTDDI_VERSION >= NTDDI_WINTHRESHOLD */ + +#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ +#endif /* _SHELLSCALINGAPI_H_ */ diff --git a/lib/libc/include/any-windows-any/shldisp.h b/lib/libc/include/any-windows-any/shldisp.h index cb99924243..3ade29f12f 100644 --- a/lib/libc/include/any-windows-any/shldisp.h +++ b/lib/libc/include/any-windows-any/shldisp.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/shldisp.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/shldisp.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,11 +21,17 @@ #ifndef __IFolderViewOC_FWD_DEFINED__ #define __IFolderViewOC_FWD_DEFINED__ typedef interface IFolderViewOC IFolderViewOC; +#ifdef __cplusplus +interface IFolderViewOC; +#endif /* __cplusplus */ #endif #ifndef __DShellFolderViewEvents_FWD_DEFINED__ #define __DShellFolderViewEvents_FWD_DEFINED__ typedef interface DShellFolderViewEvents DShellFolderViewEvents; +#ifdef __cplusplus +interface DShellFolderViewEvents; +#endif /* __cplusplus */ #endif #ifndef __ShellFolderViewOC_FWD_DEFINED__ @@ -39,31 +46,49 @@ typedef struct ShellFolderViewOC ShellFolderViewOC; #ifndef __DFConstraint_FWD_DEFINED__ #define __DFConstraint_FWD_DEFINED__ typedef interface DFConstraint DFConstraint; +#ifdef __cplusplus +interface DFConstraint; +#endif /* __cplusplus */ #endif #ifndef __Folder_FWD_DEFINED__ #define __Folder_FWD_DEFINED__ typedef interface Folder Folder; +#ifdef __cplusplus +interface Folder; +#endif /* __cplusplus */ #endif #ifndef __Folder2_FWD_DEFINED__ #define __Folder2_FWD_DEFINED__ typedef interface Folder2 Folder2; +#ifdef __cplusplus +interface Folder2; +#endif /* __cplusplus */ #endif #ifndef __Folder3_FWD_DEFINED__ #define __Folder3_FWD_DEFINED__ typedef interface Folder3 Folder3; +#ifdef __cplusplus +interface Folder3; +#endif /* __cplusplus */ #endif #ifndef __FolderItem_FWD_DEFINED__ #define __FolderItem_FWD_DEFINED__ typedef interface FolderItem FolderItem; +#ifdef __cplusplus +interface FolderItem; +#endif /* __cplusplus */ #endif #ifndef __FolderItem2_FWD_DEFINED__ #define __FolderItem2_FWD_DEFINED__ typedef interface FolderItem2 FolderItem2; +#ifdef __cplusplus +interface FolderItem2; +#endif /* __cplusplus */ #endif #ifndef __ShellFolderItem_FWD_DEFINED__ @@ -78,36 +103,57 @@ typedef struct ShellFolderItem ShellFolderItem; #ifndef __FolderItems_FWD_DEFINED__ #define __FolderItems_FWD_DEFINED__ typedef interface FolderItems FolderItems; +#ifdef __cplusplus +interface FolderItems; +#endif /* __cplusplus */ #endif #ifndef __FolderItems2_FWD_DEFINED__ #define __FolderItems2_FWD_DEFINED__ typedef interface FolderItems2 FolderItems2; +#ifdef __cplusplus +interface FolderItems2; +#endif /* __cplusplus */ #endif #ifndef __FolderItems3_FWD_DEFINED__ #define __FolderItems3_FWD_DEFINED__ typedef interface FolderItems3 FolderItems3; +#ifdef __cplusplus +interface FolderItems3; +#endif /* __cplusplus */ #endif #ifndef __FolderItemVerb_FWD_DEFINED__ #define __FolderItemVerb_FWD_DEFINED__ typedef interface FolderItemVerb FolderItemVerb; +#ifdef __cplusplus +interface FolderItemVerb; +#endif /* __cplusplus */ #endif #ifndef __FolderItemVerbs_FWD_DEFINED__ #define __FolderItemVerbs_FWD_DEFINED__ typedef interface FolderItemVerbs FolderItemVerbs; +#ifdef __cplusplus +interface FolderItemVerbs; +#endif /* __cplusplus */ #endif #ifndef __IShellLinkDual_FWD_DEFINED__ #define __IShellLinkDual_FWD_DEFINED__ typedef interface IShellLinkDual IShellLinkDual; +#ifdef __cplusplus +interface IShellLinkDual; +#endif /* __cplusplus */ #endif #ifndef __IShellLinkDual2_FWD_DEFINED__ #define __IShellLinkDual2_FWD_DEFINED__ typedef interface IShellLinkDual2 IShellLinkDual2; +#ifdef __cplusplus +interface IShellLinkDual2; +#endif /* __cplusplus */ #endif #ifndef __ShellLinkObject_FWD_DEFINED__ @@ -122,16 +168,25 @@ typedef struct ShellLinkObject ShellLinkObject; #ifndef __IShellFolderViewDual_FWD_DEFINED__ #define __IShellFolderViewDual_FWD_DEFINED__ typedef interface IShellFolderViewDual IShellFolderViewDual; +#ifdef __cplusplus +interface IShellFolderViewDual; +#endif /* __cplusplus */ #endif #ifndef __IShellFolderViewDual2_FWD_DEFINED__ #define __IShellFolderViewDual2_FWD_DEFINED__ typedef interface IShellFolderViewDual2 IShellFolderViewDual2; +#ifdef __cplusplus +interface IShellFolderViewDual2; +#endif /* __cplusplus */ #endif #ifndef __IShellFolderViewDual3_FWD_DEFINED__ #define __IShellFolderViewDual3_FWD_DEFINED__ typedef interface IShellFolderViewDual3 IShellFolderViewDual3; +#ifdef __cplusplus +interface IShellFolderViewDual3; +#endif /* __cplusplus */ #endif #ifndef __ShellFolderView_FWD_DEFINED__ @@ -146,31 +201,49 @@ typedef struct ShellFolderView ShellFolderView; #ifndef __IShellDispatch_FWD_DEFINED__ #define __IShellDispatch_FWD_DEFINED__ typedef interface IShellDispatch IShellDispatch; +#ifdef __cplusplus +interface IShellDispatch; +#endif /* __cplusplus */ #endif #ifndef __IShellDispatch2_FWD_DEFINED__ #define __IShellDispatch2_FWD_DEFINED__ typedef interface IShellDispatch2 IShellDispatch2; +#ifdef __cplusplus +interface IShellDispatch2; +#endif /* __cplusplus */ #endif #ifndef __IShellDispatch3_FWD_DEFINED__ #define __IShellDispatch3_FWD_DEFINED__ typedef interface IShellDispatch3 IShellDispatch3; +#ifdef __cplusplus +interface IShellDispatch3; +#endif /* __cplusplus */ #endif #ifndef __IShellDispatch4_FWD_DEFINED__ #define __IShellDispatch4_FWD_DEFINED__ typedef interface IShellDispatch4 IShellDispatch4; +#ifdef __cplusplus +interface IShellDispatch4; +#endif /* __cplusplus */ #endif #ifndef __IShellDispatch5_FWD_DEFINED__ #define __IShellDispatch5_FWD_DEFINED__ typedef interface IShellDispatch5 IShellDispatch5; +#ifdef __cplusplus +interface IShellDispatch5; +#endif /* __cplusplus */ #endif #ifndef __IShellDispatch6_FWD_DEFINED__ #define __IShellDispatch6_FWD_DEFINED__ typedef interface IShellDispatch6 IShellDispatch6; +#ifdef __cplusplus +interface IShellDispatch6; +#endif /* __cplusplus */ #endif #ifndef __Shell_FWD_DEFINED__ @@ -194,6 +267,9 @@ typedef struct ShellDispatchInproc ShellDispatchInproc; #ifndef __IFileSearchBand_FWD_DEFINED__ #define __IFileSearchBand_FWD_DEFINED__ typedef interface IFileSearchBand IFileSearchBand; +#ifdef __cplusplus +interface IFileSearchBand; +#endif /* __cplusplus */ #endif #ifndef __FileSearchBand_FWD_DEFINED__ @@ -208,31 +284,49 @@ typedef struct FileSearchBand FileSearchBand; #ifndef __IWebWizardHost_FWD_DEFINED__ #define __IWebWizardHost_FWD_DEFINED__ typedef interface IWebWizardHost IWebWizardHost; +#ifdef __cplusplus +interface IWebWizardHost; +#endif /* __cplusplus */ #endif #ifndef __INewWDEvents_FWD_DEFINED__ #define __INewWDEvents_FWD_DEFINED__ typedef interface INewWDEvents INewWDEvents; +#ifdef __cplusplus +interface INewWDEvents; +#endif /* __cplusplus */ #endif #ifndef __IAutoComplete_FWD_DEFINED__ #define __IAutoComplete_FWD_DEFINED__ typedef interface IAutoComplete IAutoComplete; +#ifdef __cplusplus +interface IAutoComplete; +#endif /* __cplusplus */ #endif #ifndef __IAutoComplete2_FWD_DEFINED__ #define __IAutoComplete2_FWD_DEFINED__ typedef interface IAutoComplete2 IAutoComplete2; +#ifdef __cplusplus +interface IAutoComplete2; +#endif /* __cplusplus */ #endif #ifndef __IEnumACString_FWD_DEFINED__ #define __IEnumACString_FWD_DEFINED__ typedef interface IEnumACString IEnumACString; +#ifdef __cplusplus +interface IEnumACString; +#endif /* __cplusplus */ #endif #ifndef __IDataObjectAsyncCapability_FWD_DEFINED__ #define __IDataObjectAsyncCapability_FWD_DEFINED__ typedef interface IDataObjectAsyncCapability IDataObjectAsyncCapability; +#ifdef __cplusplus +interface IDataObjectAsyncCapability; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -249,31 +343,49 @@ extern "C" { #ifndef __DShellFolderViewEvents_FWD_DEFINED__ #define __DShellFolderViewEvents_FWD_DEFINED__ typedef interface DShellFolderViewEvents DShellFolderViewEvents; +#ifdef __cplusplus +interface DShellFolderViewEvents; +#endif /* __cplusplus */ #endif #ifndef __IAutoComplete_FWD_DEFINED__ #define __IAutoComplete_FWD_DEFINED__ typedef interface IAutoComplete IAutoComplete; +#ifdef __cplusplus +interface IAutoComplete; +#endif /* __cplusplus */ #endif #ifndef __FolderItem_FWD_DEFINED__ #define __FolderItem_FWD_DEFINED__ typedef interface FolderItem FolderItem; +#ifdef __cplusplus +interface FolderItem; +#endif /* __cplusplus */ #endif #ifndef __FolderItems_FWD_DEFINED__ #define __FolderItems_FWD_DEFINED__ typedef interface FolderItems FolderItems; +#ifdef __cplusplus +interface FolderItems; +#endif /* __cplusplus */ #endif #ifndef __FolderItemVerb_FWD_DEFINED__ #define __FolderItemVerb_FWD_DEFINED__ typedef interface FolderItemVerb FolderItemVerb; +#ifdef __cplusplus +interface FolderItemVerb; +#endif /* __cplusplus */ #endif #ifndef __FolderItemVerbs_FWD_DEFINED__ #define __FolderItemVerbs_FWD_DEFINED__ typedef interface FolderItemVerbs FolderItemVerbs; +#ifdef __cplusplus +interface FolderItemVerbs; +#endif /* __cplusplus */ #endif @@ -303,29 +415,29 @@ typedef struct IFolderViewOCVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFolderViewOC* This, + IFolderViewOC *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFolderViewOC* This); + IFolderViewOC *This); ULONG (STDMETHODCALLTYPE *Release)( - IFolderViewOC* This); + IFolderViewOC *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFolderViewOC* This, + IFolderViewOC *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFolderViewOC* This, + IFolderViewOC *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFolderViewOC* This, + IFolderViewOC *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -333,7 +445,7 @@ typedef struct IFolderViewOCVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFolderViewOC* This, + IFolderViewOC *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -345,11 +457,12 @@ typedef struct IFolderViewOCVtbl { /*** IFolderViewOC methods ***/ HRESULT (STDMETHODCALLTYPE *SetFolderView)( - IFolderViewOC* This, + IFolderViewOC *This, IDispatch *pdisp); END_INTERFACE } IFolderViewOCVtbl; + interface IFolderViewOC { CONST_VTBL IFolderViewOCVtbl* lpVtbl; }; @@ -400,14 +513,6 @@ static FORCEINLINE HRESULT IFolderViewOC_SetFolderView(IFolderViewOC* This,IDisp #endif -HRESULT STDMETHODCALLTYPE IFolderViewOC_SetFolderView_Proxy( - IFolderViewOC* This, - IDispatch *pdisp); -void __RPC_STUB IFolderViewOC_SetFolderView_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFolderViewOC_INTERFACE_DEFINED__ */ @@ -432,29 +537,29 @@ typedef struct DShellFolderViewEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - DShellFolderViewEvents* This, + DShellFolderViewEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - DShellFolderViewEvents* This); + DShellFolderViewEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - DShellFolderViewEvents* This); + DShellFolderViewEvents *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - DShellFolderViewEvents* This, + DShellFolderViewEvents *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - DShellFolderViewEvents* This, + DShellFolderViewEvents *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - DShellFolderViewEvents* This, + DShellFolderViewEvents *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -462,7 +567,7 @@ typedef struct DShellFolderViewEventsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - DShellFolderViewEvents* This, + DShellFolderViewEvents *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -474,6 +579,7 @@ typedef struct DShellFolderViewEventsVtbl { END_INTERFACE } DShellFolderViewEventsVtbl; + interface DShellFolderViewEvents { CONST_VTBL DShellFolderViewEventsVtbl* lpVtbl; }; @@ -560,29 +666,29 @@ typedef struct DFConstraintVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - DFConstraint* This, + DFConstraint *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - DFConstraint* This); + DFConstraint *This); ULONG (STDMETHODCALLTYPE *Release)( - DFConstraint* This); + DFConstraint *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - DFConstraint* This, + DFConstraint *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - DFConstraint* This, + DFConstraint *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - DFConstraint* This, + DFConstraint *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -590,7 +696,7 @@ typedef struct DFConstraintVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - DFConstraint* This, + DFConstraint *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -602,15 +708,16 @@ typedef struct DFConstraintVtbl { /*** DFConstraint methods ***/ HRESULT (STDMETHODCALLTYPE *get_Name)( - DFConstraint* This, + DFConstraint *This, BSTR *pbs); HRESULT (STDMETHODCALLTYPE *get_Value)( - DFConstraint* This, + DFConstraint *This, VARIANT *pv); END_INTERFACE } DFConstraintVtbl; + interface DFConstraint { CONST_VTBL DFConstraintVtbl* lpVtbl; }; @@ -665,22 +772,6 @@ static FORCEINLINE HRESULT DFConstraint_get_Value(DFConstraint* This,VARIANT *pv #endif -HRESULT STDMETHODCALLTYPE DFConstraint_get_Name_Proxy( - DFConstraint* This, - BSTR *pbs); -void __RPC_STUB DFConstraint_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE DFConstraint_get_Value_Proxy( - DFConstraint* This, - VARIANT *pv); -void __RPC_STUB DFConstraint_get_Value_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __DFConstraint_INTERFACE_DEFINED__ */ @@ -741,29 +832,29 @@ typedef struct FolderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - Folder* This, + Folder *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - Folder* This); + Folder *This); ULONG (STDMETHODCALLTYPE *Release)( - Folder* This); + Folder *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - Folder* This, + Folder *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - Folder* This, + Folder *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - Folder* This, + Folder *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -771,7 +862,7 @@ typedef struct FolderVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - Folder* This, + Folder *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -783,53 +874,54 @@ typedef struct FolderVtbl { /*** Folder methods ***/ HRESULT (STDMETHODCALLTYPE *get_Title)( - Folder* This, + Folder *This, BSTR *pbs); HRESULT (STDMETHODCALLTYPE *get_Application)( - Folder* This, + Folder *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Parent)( - Folder* This, + Folder *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_ParentFolder)( - Folder* This, + Folder *This, Folder **ppsf); HRESULT (STDMETHODCALLTYPE *Items)( - Folder* This, + Folder *This, FolderItems **ppid); HRESULT (STDMETHODCALLTYPE *ParseName)( - Folder* This, + Folder *This, BSTR bName, FolderItem **ppid); HRESULT (STDMETHODCALLTYPE *NewFolder)( - Folder* This, + Folder *This, BSTR bName, VARIANT vOptions); HRESULT (STDMETHODCALLTYPE *MoveHere)( - Folder* This, + Folder *This, VARIANT vItem, VARIANT vOptions); HRESULT (STDMETHODCALLTYPE *CopyHere)( - Folder* This, + Folder *This, VARIANT vItem, VARIANT vOptions); HRESULT (STDMETHODCALLTYPE *GetDetailsOf)( - Folder* This, + Folder *This, VARIANT vItem, int iColumn, BSTR *pbs); END_INTERFACE } FolderVtbl; + interface Folder { CONST_VTBL FolderVtbl* lpVtbl; }; @@ -916,92 +1008,6 @@ static FORCEINLINE HRESULT Folder_GetDetailsOf(Folder* This,VARIANT vItem,int iC #endif -HRESULT STDMETHODCALLTYPE Folder_get_Title_Proxy( - Folder* This, - BSTR *pbs); -void __RPC_STUB Folder_get_Title_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE Folder_get_Application_Proxy( - Folder* This, - IDispatch **ppid); -void __RPC_STUB Folder_get_Application_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE Folder_get_Parent_Proxy( - Folder* This, - IDispatch **ppid); -void __RPC_STUB Folder_get_Parent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE Folder_get_ParentFolder_Proxy( - Folder* This, - Folder **ppsf); -void __RPC_STUB Folder_get_ParentFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE Folder_Items_Proxy( - Folder* This, - FolderItems **ppid); -void __RPC_STUB Folder_Items_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE Folder_ParseName_Proxy( - Folder* This, - BSTR bName, - FolderItem **ppid); -void __RPC_STUB Folder_ParseName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE Folder_NewFolder_Proxy( - Folder* This, - BSTR bName, - VARIANT vOptions); -void __RPC_STUB Folder_NewFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE Folder_MoveHere_Proxy( - Folder* This, - VARIANT vItem, - VARIANT vOptions); -void __RPC_STUB Folder_MoveHere_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE Folder_CopyHere_Proxy( - Folder* This, - VARIANT vItem, - VARIANT vOptions); -void __RPC_STUB Folder_CopyHere_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE Folder_GetDetailsOf_Proxy( - Folder* This, - VARIANT vItem, - int iColumn, - BSTR *pbs); -void __RPC_STUB Folder_GetDetailsOf_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __Folder_INTERFACE_DEFINED__ */ @@ -1041,29 +1047,29 @@ typedef struct Folder2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - Folder2* This, + Folder2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - Folder2* This); + Folder2 *This); ULONG (STDMETHODCALLTYPE *Release)( - Folder2* This); + Folder2 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - Folder2* This, + Folder2 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - Folder2* This, + Folder2 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - Folder2* This, + Folder2 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1071,7 +1077,7 @@ typedef struct Folder2Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - Folder2* This, + Folder2 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1083,72 +1089,73 @@ typedef struct Folder2Vtbl { /*** Folder methods ***/ HRESULT (STDMETHODCALLTYPE *get_Title)( - Folder2* This, + Folder2 *This, BSTR *pbs); HRESULT (STDMETHODCALLTYPE *get_Application)( - Folder2* This, + Folder2 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Parent)( - Folder2* This, + Folder2 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_ParentFolder)( - Folder2* This, + Folder2 *This, Folder **ppsf); HRESULT (STDMETHODCALLTYPE *Items)( - Folder2* This, + Folder2 *This, FolderItems **ppid); HRESULT (STDMETHODCALLTYPE *ParseName)( - Folder2* This, + Folder2 *This, BSTR bName, FolderItem **ppid); HRESULT (STDMETHODCALLTYPE *NewFolder)( - Folder2* This, + Folder2 *This, BSTR bName, VARIANT vOptions); HRESULT (STDMETHODCALLTYPE *MoveHere)( - Folder2* This, + Folder2 *This, VARIANT vItem, VARIANT vOptions); HRESULT (STDMETHODCALLTYPE *CopyHere)( - Folder2* This, + Folder2 *This, VARIANT vItem, VARIANT vOptions); HRESULT (STDMETHODCALLTYPE *GetDetailsOf)( - Folder2* This, + Folder2 *This, VARIANT vItem, int iColumn, BSTR *pbs); /*** Folder2 methods ***/ HRESULT (STDMETHODCALLTYPE *get_Self)( - Folder2* This, + Folder2 *This, FolderItem **ppfi); HRESULT (STDMETHODCALLTYPE *get_OfflineStatus)( - Folder2* This, + Folder2 *This, LONG *pul); HRESULT (STDMETHODCALLTYPE *Synchronize)( - Folder2* This); + Folder2 *This); HRESULT (STDMETHODCALLTYPE *get_HaveToShowWebViewBarricade)( - Folder2* This, + Folder2 *This, VARIANT_BOOL *pbHaveToShowWebViewBarricade); HRESULT (STDMETHODCALLTYPE *DismissedWebViewBarricade)( - Folder2* This); + Folder2 *This); END_INTERFACE } Folder2Vtbl; + interface Folder2 { CONST_VTBL Folder2Vtbl* lpVtbl; }; @@ -1257,44 +1264,6 @@ static FORCEINLINE HRESULT Folder2_DismissedWebViewBarricade(Folder2* This) { #endif -HRESULT STDMETHODCALLTYPE Folder2_get_Self_Proxy( - Folder2* This, - FolderItem **ppfi); -void __RPC_STUB Folder2_get_Self_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE Folder2_get_OfflineStatus_Proxy( - Folder2* This, - LONG *pul); -void __RPC_STUB Folder2_get_OfflineStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE Folder2_Synchronize_Proxy( - Folder2* This); -void __RPC_STUB Folder2_Synchronize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE Folder2_get_HaveToShowWebViewBarricade_Proxy( - Folder2* This, - VARIANT_BOOL *pbHaveToShowWebViewBarricade); -void __RPC_STUB Folder2_get_HaveToShowWebViewBarricade_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE Folder2_DismissedWebViewBarricade_Proxy( - Folder2* This); -void __RPC_STUB Folder2_DismissedWebViewBarricade_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __Folder2_INTERFACE_DEFINED__ */ @@ -1332,29 +1301,29 @@ typedef struct Folder3Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - Folder3* This, + Folder3 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - Folder3* This); + Folder3 *This); ULONG (STDMETHODCALLTYPE *Release)( - Folder3* This); + Folder3 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - Folder3* This, + Folder3 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - Folder3* This, + Folder3 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - Folder3* This, + Folder3 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1362,7 +1331,7 @@ typedef struct Folder3Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - Folder3* This, + Folder3 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1374,81 +1343,82 @@ typedef struct Folder3Vtbl { /*** Folder methods ***/ HRESULT (STDMETHODCALLTYPE *get_Title)( - Folder3* This, + Folder3 *This, BSTR *pbs); HRESULT (STDMETHODCALLTYPE *get_Application)( - Folder3* This, + Folder3 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Parent)( - Folder3* This, + Folder3 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_ParentFolder)( - Folder3* This, + Folder3 *This, Folder **ppsf); HRESULT (STDMETHODCALLTYPE *Items)( - Folder3* This, + Folder3 *This, FolderItems **ppid); HRESULT (STDMETHODCALLTYPE *ParseName)( - Folder3* This, + Folder3 *This, BSTR bName, FolderItem **ppid); HRESULT (STDMETHODCALLTYPE *NewFolder)( - Folder3* This, + Folder3 *This, BSTR bName, VARIANT vOptions); HRESULT (STDMETHODCALLTYPE *MoveHere)( - Folder3* This, + Folder3 *This, VARIANT vItem, VARIANT vOptions); HRESULT (STDMETHODCALLTYPE *CopyHere)( - Folder3* This, + Folder3 *This, VARIANT vItem, VARIANT vOptions); HRESULT (STDMETHODCALLTYPE *GetDetailsOf)( - Folder3* This, + Folder3 *This, VARIANT vItem, int iColumn, BSTR *pbs); /*** Folder2 methods ***/ HRESULT (STDMETHODCALLTYPE *get_Self)( - Folder3* This, + Folder3 *This, FolderItem **ppfi); HRESULT (STDMETHODCALLTYPE *get_OfflineStatus)( - Folder3* This, + Folder3 *This, LONG *pul); HRESULT (STDMETHODCALLTYPE *Synchronize)( - Folder3* This); + Folder3 *This); HRESULT (STDMETHODCALLTYPE *get_HaveToShowWebViewBarricade)( - Folder3* This, + Folder3 *This, VARIANT_BOOL *pbHaveToShowWebViewBarricade); HRESULT (STDMETHODCALLTYPE *DismissedWebViewBarricade)( - Folder3* This); + Folder3 *This); /*** Folder3 methods ***/ HRESULT (STDMETHODCALLTYPE *get_ShowWebViewBarricade)( - Folder3* This, + Folder3 *This, VARIANT_BOOL *pbShowWebViewBarricade); HRESULT (STDMETHODCALLTYPE *put_ShowWebViewBarricade)( - Folder3* This, + Folder3 *This, VARIANT_BOOL bShowWebViewBarricade); END_INTERFACE } Folder3Vtbl; + interface Folder3 { CONST_VTBL Folder3Vtbl* lpVtbl; }; @@ -1567,22 +1537,6 @@ static FORCEINLINE HRESULT Folder3_put_ShowWebViewBarricade(Folder3* This,VARIAN #endif -HRESULT STDMETHODCALLTYPE Folder3_get_ShowWebViewBarricade_Proxy( - Folder3* This, - VARIANT_BOOL *pbShowWebViewBarricade); -void __RPC_STUB Folder3_get_ShowWebViewBarricade_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE Folder3_put_ShowWebViewBarricade_Proxy( - Folder3* This, - VARIANT_BOOL bShowWebViewBarricade); -void __RPC_STUB Folder3_put_ShowWebViewBarricade_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __Folder3_INTERFACE_DEFINED__ */ @@ -1659,29 +1613,29 @@ typedef struct FolderItemVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - FolderItem* This, + FolderItem *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - FolderItem* This); + FolderItem *This); ULONG (STDMETHODCALLTYPE *Release)( - FolderItem* This); + FolderItem *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - FolderItem* This, + FolderItem *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - FolderItem* This, + FolderItem *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - FolderItem* This, + FolderItem *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1689,7 +1643,7 @@ typedef struct FolderItemVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - FolderItem* This, + FolderItem *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1701,75 +1655,76 @@ typedef struct FolderItemVtbl { /*** FolderItem methods ***/ HRESULT (STDMETHODCALLTYPE *get_Application)( - FolderItem* This, + FolderItem *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Parent)( - FolderItem* This, + FolderItem *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Name)( - FolderItem* This, + FolderItem *This, BSTR *pbs); HRESULT (STDMETHODCALLTYPE *put_Name)( - FolderItem* This, + FolderItem *This, BSTR bs); HRESULT (STDMETHODCALLTYPE *get_Path)( - FolderItem* This, + FolderItem *This, BSTR *pbs); HRESULT (STDMETHODCALLTYPE *get_GetLink)( - FolderItem* This, + FolderItem *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_GetFolder)( - FolderItem* This, + FolderItem *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_IsLink)( - FolderItem* This, + FolderItem *This, VARIANT_BOOL *pb); HRESULT (STDMETHODCALLTYPE *get_IsFolder)( - FolderItem* This, + FolderItem *This, VARIANT_BOOL *pb); HRESULT (STDMETHODCALLTYPE *get_IsFileSystem)( - FolderItem* This, + FolderItem *This, VARIANT_BOOL *pb); HRESULT (STDMETHODCALLTYPE *get_IsBrowsable)( - FolderItem* This, + FolderItem *This, VARIANT_BOOL *pb); HRESULT (STDMETHODCALLTYPE *get_ModifyDate)( - FolderItem* This, + FolderItem *This, DATE *pdt); HRESULT (STDMETHODCALLTYPE *put_ModifyDate)( - FolderItem* This, + FolderItem *This, DATE dt); HRESULT (STDMETHODCALLTYPE *get_Size)( - FolderItem* This, + FolderItem *This, LONG *pul); HRESULT (STDMETHODCALLTYPE *get_Type)( - FolderItem* This, + FolderItem *This, BSTR *pbs); HRESULT (STDMETHODCALLTYPE *Verbs)( - FolderItem* This, + FolderItem *This, FolderItemVerbs **ppfic); HRESULT (STDMETHODCALLTYPE *InvokeVerb)( - FolderItem* This, + FolderItem *This, VARIANT vVerb); END_INTERFACE } FolderItemVtbl; + interface FolderItem { CONST_VTBL FolderItemVtbl* lpVtbl; }; @@ -1884,142 +1839,6 @@ static FORCEINLINE HRESULT FolderItem_InvokeVerb(FolderItem* This,VARIANT vVerb) #endif -HRESULT STDMETHODCALLTYPE FolderItem_get_Application_Proxy( - FolderItem* This, - IDispatch **ppid); -void __RPC_STUB FolderItem_get_Application_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItem_get_Parent_Proxy( - FolderItem* This, - IDispatch **ppid); -void __RPC_STUB FolderItem_get_Parent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItem_get_Name_Proxy( - FolderItem* This, - BSTR *pbs); -void __RPC_STUB FolderItem_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItem_put_Name_Proxy( - FolderItem* This, - BSTR bs); -void __RPC_STUB FolderItem_put_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItem_get_Path_Proxy( - FolderItem* This, - BSTR *pbs); -void __RPC_STUB FolderItem_get_Path_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItem_get_GetLink_Proxy( - FolderItem* This, - IDispatch **ppid); -void __RPC_STUB FolderItem_get_GetLink_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItem_get_GetFolder_Proxy( - FolderItem* This, - IDispatch **ppid); -void __RPC_STUB FolderItem_get_GetFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItem_get_IsLink_Proxy( - FolderItem* This, - VARIANT_BOOL *pb); -void __RPC_STUB FolderItem_get_IsLink_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItem_get_IsFolder_Proxy( - FolderItem* This, - VARIANT_BOOL *pb); -void __RPC_STUB FolderItem_get_IsFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItem_get_IsFileSystem_Proxy( - FolderItem* This, - VARIANT_BOOL *pb); -void __RPC_STUB FolderItem_get_IsFileSystem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItem_get_IsBrowsable_Proxy( - FolderItem* This, - VARIANT_BOOL *pb); -void __RPC_STUB FolderItem_get_IsBrowsable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItem_get_ModifyDate_Proxy( - FolderItem* This, - DATE *pdt); -void __RPC_STUB FolderItem_get_ModifyDate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItem_put_ModifyDate_Proxy( - FolderItem* This, - DATE dt); -void __RPC_STUB FolderItem_put_ModifyDate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItem_get_Size_Proxy( - FolderItem* This, - LONG *pul); -void __RPC_STUB FolderItem_get_Size_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItem_get_Type_Proxy( - FolderItem* This, - BSTR *pbs); -void __RPC_STUB FolderItem_get_Type_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItem_Verbs_Proxy( - FolderItem* This, - FolderItemVerbs **ppfic); -void __RPC_STUB FolderItem_Verbs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItem_InvokeVerb_Proxy( - FolderItem* This, - VARIANT vVerb); -void __RPC_STUB FolderItem_InvokeVerb_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __FolderItem_INTERFACE_DEFINED__ */ @@ -2052,29 +1871,29 @@ typedef struct FolderItem2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - FolderItem2* This, + FolderItem2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - FolderItem2* This); + FolderItem2 *This); ULONG (STDMETHODCALLTYPE *Release)( - FolderItem2* This); + FolderItem2 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - FolderItem2* This, + FolderItem2 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - FolderItem2* This, + FolderItem2 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - FolderItem2* This, + FolderItem2 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2082,7 +1901,7 @@ typedef struct FolderItem2Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - FolderItem2* This, + FolderItem2 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2094,86 +1913,87 @@ typedef struct FolderItem2Vtbl { /*** FolderItem methods ***/ HRESULT (STDMETHODCALLTYPE *get_Application)( - FolderItem2* This, + FolderItem2 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Parent)( - FolderItem2* This, + FolderItem2 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Name)( - FolderItem2* This, + FolderItem2 *This, BSTR *pbs); HRESULT (STDMETHODCALLTYPE *put_Name)( - FolderItem2* This, + FolderItem2 *This, BSTR bs); HRESULT (STDMETHODCALLTYPE *get_Path)( - FolderItem2* This, + FolderItem2 *This, BSTR *pbs); HRESULT (STDMETHODCALLTYPE *get_GetLink)( - FolderItem2* This, + FolderItem2 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_GetFolder)( - FolderItem2* This, + FolderItem2 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_IsLink)( - FolderItem2* This, + FolderItem2 *This, VARIANT_BOOL *pb); HRESULT (STDMETHODCALLTYPE *get_IsFolder)( - FolderItem2* This, + FolderItem2 *This, VARIANT_BOOL *pb); HRESULT (STDMETHODCALLTYPE *get_IsFileSystem)( - FolderItem2* This, + FolderItem2 *This, VARIANT_BOOL *pb); HRESULT (STDMETHODCALLTYPE *get_IsBrowsable)( - FolderItem2* This, + FolderItem2 *This, VARIANT_BOOL *pb); HRESULT (STDMETHODCALLTYPE *get_ModifyDate)( - FolderItem2* This, + FolderItem2 *This, DATE *pdt); HRESULT (STDMETHODCALLTYPE *put_ModifyDate)( - FolderItem2* This, + FolderItem2 *This, DATE dt); HRESULT (STDMETHODCALLTYPE *get_Size)( - FolderItem2* This, + FolderItem2 *This, LONG *pul); HRESULT (STDMETHODCALLTYPE *get_Type)( - FolderItem2* This, + FolderItem2 *This, BSTR *pbs); HRESULT (STDMETHODCALLTYPE *Verbs)( - FolderItem2* This, + FolderItem2 *This, FolderItemVerbs **ppfic); HRESULT (STDMETHODCALLTYPE *InvokeVerb)( - FolderItem2* This, + FolderItem2 *This, VARIANT vVerb); /*** FolderItem2 methods ***/ HRESULT (STDMETHODCALLTYPE *InvokeVerbEx)( - FolderItem2* This, + FolderItem2 *This, VARIANT vVerb, VARIANT vArgs); HRESULT (STDMETHODCALLTYPE *ExtendedProperty)( - FolderItem2* This, + FolderItem2 *This, BSTR bstrPropName, VARIANT *pvRet); END_INTERFACE } FolderItem2Vtbl; + interface FolderItem2 { CONST_VTBL FolderItem2Vtbl* lpVtbl; }; @@ -2298,24 +2118,6 @@ static FORCEINLINE HRESULT FolderItem2_ExtendedProperty(FolderItem2* This,BSTR b #endif -HRESULT STDMETHODCALLTYPE FolderItem2_InvokeVerbEx_Proxy( - FolderItem2* This, - VARIANT vVerb, - VARIANT vArgs); -void __RPC_STUB FolderItem2_InvokeVerbEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItem2_ExtendedProperty_Proxy( - FolderItem2* This, - BSTR bstrPropName, - VARIANT *pvRet); -void __RPC_STUB FolderItem2_ExtendedProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __FolderItem2_INTERFACE_DEFINED__ */ @@ -2369,29 +2171,29 @@ typedef struct FolderItemsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - FolderItems* This, + FolderItems *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - FolderItems* This); + FolderItems *This); ULONG (STDMETHODCALLTYPE *Release)( - FolderItems* This); + FolderItems *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - FolderItems* This, + FolderItems *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - FolderItems* This, + FolderItems *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - FolderItems* This, + FolderItems *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2399,7 +2201,7 @@ typedef struct FolderItemsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - FolderItems* This, + FolderItems *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2411,28 +2213,29 @@ typedef struct FolderItemsVtbl { /*** FolderItems methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - FolderItems* This, + FolderItems *This, LONG *plCount); HRESULT (STDMETHODCALLTYPE *get_Application)( - FolderItems* This, + FolderItems *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Parent)( - FolderItems* This, + FolderItems *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *Item)( - FolderItems* This, + FolderItems *This, VARIANT index, FolderItem **ppid); HRESULT (STDMETHODCALLTYPE *_NewEnum)( - FolderItems* This, + FolderItems *This, IUnknown **ppunk); END_INTERFACE } FolderItemsVtbl; + interface FolderItems { CONST_VTBL FolderItemsVtbl* lpVtbl; }; @@ -2499,47 +2302,6 @@ static FORCEINLINE HRESULT FolderItems__NewEnum(FolderItems* This,IUnknown **ppu #endif -HRESULT STDMETHODCALLTYPE FolderItems_get_Count_Proxy( - FolderItems* This, - LONG *plCount); -void __RPC_STUB FolderItems_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItems_get_Application_Proxy( - FolderItems* This, - IDispatch **ppid); -void __RPC_STUB FolderItems_get_Application_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItems_get_Parent_Proxy( - FolderItems* This, - IDispatch **ppid); -void __RPC_STUB FolderItems_get_Parent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItems_Item_Proxy( - FolderItems* This, - VARIANT index, - FolderItem **ppid); -void __RPC_STUB FolderItems_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItems__NewEnum_Proxy( - FolderItems* This, - IUnknown **ppunk); -void __RPC_STUB FolderItems__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __FolderItems_INTERFACE_DEFINED__ */ @@ -2568,29 +2330,29 @@ typedef struct FolderItems2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - FolderItems2* This, + FolderItems2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - FolderItems2* This); + FolderItems2 *This); ULONG (STDMETHODCALLTYPE *Release)( - FolderItems2* This); + FolderItems2 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - FolderItems2* This, + FolderItems2 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - FolderItems2* This, + FolderItems2 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - FolderItems2* This, + FolderItems2 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2598,7 +2360,7 @@ typedef struct FolderItems2Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - FolderItems2* This, + FolderItems2 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2610,34 +2372,35 @@ typedef struct FolderItems2Vtbl { /*** FolderItems methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - FolderItems2* This, + FolderItems2 *This, LONG *plCount); HRESULT (STDMETHODCALLTYPE *get_Application)( - FolderItems2* This, + FolderItems2 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Parent)( - FolderItems2* This, + FolderItems2 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *Item)( - FolderItems2* This, + FolderItems2 *This, VARIANT index, FolderItem **ppid); HRESULT (STDMETHODCALLTYPE *_NewEnum)( - FolderItems2* This, + FolderItems2 *This, IUnknown **ppunk); /*** FolderItems2 methods ***/ HRESULT (STDMETHODCALLTYPE *InvokeVerbEx)( - FolderItems2* This, + FolderItems2 *This, VARIANT vVerb, VARIANT vArgs); END_INTERFACE } FolderItems2Vtbl; + interface FolderItems2 { CONST_VTBL FolderItems2Vtbl* lpVtbl; }; @@ -2710,15 +2473,6 @@ static FORCEINLINE HRESULT FolderItems2_InvokeVerbEx(FolderItems2* This,VARIANT #endif -HRESULT STDMETHODCALLTYPE FolderItems2_InvokeVerbEx_Proxy( - FolderItems2* This, - VARIANT vVerb, - VARIANT vArgs); -void __RPC_STUB FolderItems2_InvokeVerbEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __FolderItems2_INTERFACE_DEFINED__ */ @@ -2750,29 +2504,29 @@ typedef struct FolderItems3Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - FolderItems3* This, + FolderItems3 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - FolderItems3* This); + FolderItems3 *This); ULONG (STDMETHODCALLTYPE *Release)( - FolderItems3* This); + FolderItems3 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - FolderItems3* This, + FolderItems3 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - FolderItems3* This, + FolderItems3 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - FolderItems3* This, + FolderItems3 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2780,7 +2534,7 @@ typedef struct FolderItems3Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - FolderItems3* This, + FolderItems3 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2792,44 +2546,45 @@ typedef struct FolderItems3Vtbl { /*** FolderItems methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - FolderItems3* This, + FolderItems3 *This, LONG *plCount); HRESULT (STDMETHODCALLTYPE *get_Application)( - FolderItems3* This, + FolderItems3 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Parent)( - FolderItems3* This, + FolderItems3 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *Item)( - FolderItems3* This, + FolderItems3 *This, VARIANT index, FolderItem **ppid); HRESULT (STDMETHODCALLTYPE *_NewEnum)( - FolderItems3* This, + FolderItems3 *This, IUnknown **ppunk); /*** FolderItems2 methods ***/ HRESULT (STDMETHODCALLTYPE *InvokeVerbEx)( - FolderItems3* This, + FolderItems3 *This, VARIANT vVerb, VARIANT vArgs); /*** FolderItems3 methods ***/ HRESULT (STDMETHODCALLTYPE *Filter)( - FolderItems3* This, + FolderItems3 *This, LONG grfFlags, BSTR bstrFileSpec); HRESULT (STDMETHODCALLTYPE *get_Verbs)( - FolderItems3* This, + FolderItems3 *This, FolderItemVerbs **ppfic); END_INTERFACE } FolderItems3Vtbl; + interface FolderItems3 { CONST_VTBL FolderItems3Vtbl* lpVtbl; }; @@ -2912,23 +2667,6 @@ static FORCEINLINE HRESULT FolderItems3_get_Verbs(FolderItems3* This,FolderItemV #endif -HRESULT STDMETHODCALLTYPE FolderItems3_Filter_Proxy( - FolderItems3* This, - LONG grfFlags, - BSTR bstrFileSpec); -void __RPC_STUB FolderItems3_Filter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItems3_get_Verbs_Proxy( - FolderItems3* This, - FolderItemVerbs **ppfic); -void __RPC_STUB FolderItems3_get_Verbs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __FolderItems3_INTERFACE_DEFINED__ */ @@ -2965,29 +2703,29 @@ typedef struct FolderItemVerbVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - FolderItemVerb* This, + FolderItemVerb *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - FolderItemVerb* This); + FolderItemVerb *This); ULONG (STDMETHODCALLTYPE *Release)( - FolderItemVerb* This); + FolderItemVerb *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - FolderItemVerb* This, + FolderItemVerb *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - FolderItemVerb* This, + FolderItemVerb *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - FolderItemVerb* This, + FolderItemVerb *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2995,7 +2733,7 @@ typedef struct FolderItemVerbVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - FolderItemVerb* This, + FolderItemVerb *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -3007,22 +2745,23 @@ typedef struct FolderItemVerbVtbl { /*** FolderItemVerb methods ***/ HRESULT (STDMETHODCALLTYPE *get_Application)( - FolderItemVerb* This, + FolderItemVerb *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Parent)( - FolderItemVerb* This, + FolderItemVerb *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Name)( - FolderItemVerb* This, + FolderItemVerb *This, BSTR *pbs); HRESULT (STDMETHODCALLTYPE *DoIt)( - FolderItemVerb* This); + FolderItemVerb *This); END_INTERFACE } FolderItemVerbVtbl; + interface FolderItemVerb { CONST_VTBL FolderItemVerbVtbl* lpVtbl; }; @@ -3085,37 +2824,6 @@ static FORCEINLINE HRESULT FolderItemVerb_DoIt(FolderItemVerb* This) { #endif -HRESULT STDMETHODCALLTYPE FolderItemVerb_get_Application_Proxy( - FolderItemVerb* This, - IDispatch **ppid); -void __RPC_STUB FolderItemVerb_get_Application_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItemVerb_get_Parent_Proxy( - FolderItemVerb* This, - IDispatch **ppid); -void __RPC_STUB FolderItemVerb_get_Parent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItemVerb_get_Name_Proxy( - FolderItemVerb* This, - BSTR *pbs); -void __RPC_STUB FolderItemVerb_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItemVerb_DoIt_Proxy( - FolderItemVerb* This); -void __RPC_STUB FolderItemVerb_DoIt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __FolderItemVerb_INTERFACE_DEFINED__ */ @@ -3156,29 +2864,29 @@ typedef struct FolderItemVerbsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - FolderItemVerbs* This, + FolderItemVerbs *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - FolderItemVerbs* This); + FolderItemVerbs *This); ULONG (STDMETHODCALLTYPE *Release)( - FolderItemVerbs* This); + FolderItemVerbs *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - FolderItemVerbs* This, + FolderItemVerbs *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - FolderItemVerbs* This, + FolderItemVerbs *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - FolderItemVerbs* This, + FolderItemVerbs *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -3186,7 +2894,7 @@ typedef struct FolderItemVerbsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - FolderItemVerbs* This, + FolderItemVerbs *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -3198,28 +2906,29 @@ typedef struct FolderItemVerbsVtbl { /*** FolderItemVerbs methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - FolderItemVerbs* This, + FolderItemVerbs *This, LONG *plCount); HRESULT (STDMETHODCALLTYPE *get_Application)( - FolderItemVerbs* This, + FolderItemVerbs *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Parent)( - FolderItemVerbs* This, + FolderItemVerbs *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *Item)( - FolderItemVerbs* This, + FolderItemVerbs *This, VARIANT index, FolderItemVerb **ppid); HRESULT (STDMETHODCALLTYPE *_NewEnum)( - FolderItemVerbs* This, + FolderItemVerbs *This, IUnknown **ppunk); END_INTERFACE } FolderItemVerbsVtbl; + interface FolderItemVerbs { CONST_VTBL FolderItemVerbsVtbl* lpVtbl; }; @@ -3286,47 +2995,6 @@ static FORCEINLINE HRESULT FolderItemVerbs__NewEnum(FolderItemVerbs* This,IUnkno #endif -HRESULT STDMETHODCALLTYPE FolderItemVerbs_get_Count_Proxy( - FolderItemVerbs* This, - LONG *plCount); -void __RPC_STUB FolderItemVerbs_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItemVerbs_get_Application_Proxy( - FolderItemVerbs* This, - IDispatch **ppid); -void __RPC_STUB FolderItemVerbs_get_Application_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItemVerbs_get_Parent_Proxy( - FolderItemVerbs* This, - IDispatch **ppid); -void __RPC_STUB FolderItemVerbs_get_Parent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItemVerbs_Item_Proxy( - FolderItemVerbs* This, - VARIANT index, - FolderItemVerb **ppid); -void __RPC_STUB FolderItemVerbs_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE FolderItemVerbs__NewEnum_Proxy( - FolderItemVerbs* This, - IUnknown **ppunk); -void __RPC_STUB FolderItemVerbs__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __FolderItemVerbs_INTERFACE_DEFINED__ */ @@ -3401,29 +3069,29 @@ typedef struct IShellLinkDualVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellLinkDual* This, + IShellLinkDual *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellLinkDual* This); + IShellLinkDual *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellLinkDual* This); + IShellLinkDual *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IShellLinkDual* This, + IShellLinkDual *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IShellLinkDual* This, + IShellLinkDual *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IShellLinkDual* This, + IShellLinkDual *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -3431,7 +3099,7 @@ typedef struct IShellLinkDualVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IShellLinkDual* This, + IShellLinkDual *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -3443,73 +3111,74 @@ typedef struct IShellLinkDualVtbl { /*** IShellLinkDual methods ***/ HRESULT (STDMETHODCALLTYPE *get_Path)( - IShellLinkDual* This, + IShellLinkDual *This, BSTR *pbs); HRESULT (STDMETHODCALLTYPE *put_Path)( - IShellLinkDual* This, + IShellLinkDual *This, BSTR bs); HRESULT (STDMETHODCALLTYPE *get_Description)( - IShellLinkDual* This, + IShellLinkDual *This, BSTR *pbs); HRESULT (STDMETHODCALLTYPE *put_Description)( - IShellLinkDual* This, + IShellLinkDual *This, BSTR bs); HRESULT (STDMETHODCALLTYPE *get_WorkingDirectory)( - IShellLinkDual* This, + IShellLinkDual *This, BSTR *pbs); HRESULT (STDMETHODCALLTYPE *put_WorkingDirectory)( - IShellLinkDual* This, + IShellLinkDual *This, BSTR bs); HRESULT (STDMETHODCALLTYPE *get_Arguments)( - IShellLinkDual* This, + IShellLinkDual *This, BSTR *pbs); HRESULT (STDMETHODCALLTYPE *put_Arguments)( - IShellLinkDual* This, + IShellLinkDual *This, BSTR bs); HRESULT (STDMETHODCALLTYPE *get_Hotkey)( - IShellLinkDual* This, + IShellLinkDual *This, int *piHK); HRESULT (STDMETHODCALLTYPE *put_Hotkey)( - IShellLinkDual* This, + IShellLinkDual *This, int iHK); HRESULT (STDMETHODCALLTYPE *get_ShowCommand)( - IShellLinkDual* This, + IShellLinkDual *This, int *piShowCommand); HRESULT (STDMETHODCALLTYPE *put_ShowCommand)( - IShellLinkDual* This, + IShellLinkDual *This, int iShowCommand); HRESULT (STDMETHODCALLTYPE *Resolve)( - IShellLinkDual* This, + IShellLinkDual *This, int fFlags); HRESULT (STDMETHODCALLTYPE *GetIconLocation)( - IShellLinkDual* This, + IShellLinkDual *This, BSTR *pbs, int *piIcon); HRESULT (STDMETHODCALLTYPE *SetIconLocation)( - IShellLinkDual* This, + IShellLinkDual *This, BSTR bs, int iIcon); HRESULT (STDMETHODCALLTYPE *Save)( - IShellLinkDual* This, + IShellLinkDual *This, VARIANT vWhere); END_INTERFACE } IShellLinkDualVtbl; + interface IShellLinkDual { CONST_VTBL IShellLinkDualVtbl* lpVtbl; }; @@ -3620,136 +3289,6 @@ static FORCEINLINE HRESULT IShellLinkDual_Save(IShellLinkDual* This,VARIANT vWhe #endif -HRESULT STDMETHODCALLTYPE IShellLinkDual_get_Path_Proxy( - IShellLinkDual* This, - BSTR *pbs); -void __RPC_STUB IShellLinkDual_get_Path_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkDual_put_Path_Proxy( - IShellLinkDual* This, - BSTR bs); -void __RPC_STUB IShellLinkDual_put_Path_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkDual_get_Description_Proxy( - IShellLinkDual* This, - BSTR *pbs); -void __RPC_STUB IShellLinkDual_get_Description_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkDual_put_Description_Proxy( - IShellLinkDual* This, - BSTR bs); -void __RPC_STUB IShellLinkDual_put_Description_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkDual_get_WorkingDirectory_Proxy( - IShellLinkDual* This, - BSTR *pbs); -void __RPC_STUB IShellLinkDual_get_WorkingDirectory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkDual_put_WorkingDirectory_Proxy( - IShellLinkDual* This, - BSTR bs); -void __RPC_STUB IShellLinkDual_put_WorkingDirectory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkDual_get_Arguments_Proxy( - IShellLinkDual* This, - BSTR *pbs); -void __RPC_STUB IShellLinkDual_get_Arguments_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkDual_put_Arguments_Proxy( - IShellLinkDual* This, - BSTR bs); -void __RPC_STUB IShellLinkDual_put_Arguments_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkDual_get_Hotkey_Proxy( - IShellLinkDual* This, - int *piHK); -void __RPC_STUB IShellLinkDual_get_Hotkey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkDual_put_Hotkey_Proxy( - IShellLinkDual* This, - int iHK); -void __RPC_STUB IShellLinkDual_put_Hotkey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkDual_get_ShowCommand_Proxy( - IShellLinkDual* This, - int *piShowCommand); -void __RPC_STUB IShellLinkDual_get_ShowCommand_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkDual_put_ShowCommand_Proxy( - IShellLinkDual* This, - int iShowCommand); -void __RPC_STUB IShellLinkDual_put_ShowCommand_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkDual_Resolve_Proxy( - IShellLinkDual* This, - int fFlags); -void __RPC_STUB IShellLinkDual_Resolve_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkDual_GetIconLocation_Proxy( - IShellLinkDual* This, - BSTR *pbs, - int *piIcon); -void __RPC_STUB IShellLinkDual_GetIconLocation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkDual_SetIconLocation_Proxy( - IShellLinkDual* This, - BSTR bs, - int iIcon); -void __RPC_STUB IShellLinkDual_SetIconLocation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkDual_Save_Proxy( - IShellLinkDual* This, - VARIANT vWhere); -void __RPC_STUB IShellLinkDual_Save_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellLinkDual_INTERFACE_DEFINED__ */ @@ -3777,29 +3316,29 @@ typedef struct IShellLinkDual2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellLinkDual2* This, + IShellLinkDual2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellLinkDual2* This); + IShellLinkDual2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellLinkDual2* This); + IShellLinkDual2 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IShellLinkDual2* This, + IShellLinkDual2 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IShellLinkDual2* This, + IShellLinkDual2 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IShellLinkDual2* This, + IShellLinkDual2 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -3807,7 +3346,7 @@ typedef struct IShellLinkDual2Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IShellLinkDual2* This, + IShellLinkDual2 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -3819,78 +3358,79 @@ typedef struct IShellLinkDual2Vtbl { /*** IShellLinkDual methods ***/ HRESULT (STDMETHODCALLTYPE *get_Path)( - IShellLinkDual2* This, + IShellLinkDual2 *This, BSTR *pbs); HRESULT (STDMETHODCALLTYPE *put_Path)( - IShellLinkDual2* This, + IShellLinkDual2 *This, BSTR bs); HRESULT (STDMETHODCALLTYPE *get_Description)( - IShellLinkDual2* This, + IShellLinkDual2 *This, BSTR *pbs); HRESULT (STDMETHODCALLTYPE *put_Description)( - IShellLinkDual2* This, + IShellLinkDual2 *This, BSTR bs); HRESULT (STDMETHODCALLTYPE *get_WorkingDirectory)( - IShellLinkDual2* This, + IShellLinkDual2 *This, BSTR *pbs); HRESULT (STDMETHODCALLTYPE *put_WorkingDirectory)( - IShellLinkDual2* This, + IShellLinkDual2 *This, BSTR bs); HRESULT (STDMETHODCALLTYPE *get_Arguments)( - IShellLinkDual2* This, + IShellLinkDual2 *This, BSTR *pbs); HRESULT (STDMETHODCALLTYPE *put_Arguments)( - IShellLinkDual2* This, + IShellLinkDual2 *This, BSTR bs); HRESULT (STDMETHODCALLTYPE *get_Hotkey)( - IShellLinkDual2* This, + IShellLinkDual2 *This, int *piHK); HRESULT (STDMETHODCALLTYPE *put_Hotkey)( - IShellLinkDual2* This, + IShellLinkDual2 *This, int iHK); HRESULT (STDMETHODCALLTYPE *get_ShowCommand)( - IShellLinkDual2* This, + IShellLinkDual2 *This, int *piShowCommand); HRESULT (STDMETHODCALLTYPE *put_ShowCommand)( - IShellLinkDual2* This, + IShellLinkDual2 *This, int iShowCommand); HRESULT (STDMETHODCALLTYPE *Resolve)( - IShellLinkDual2* This, + IShellLinkDual2 *This, int fFlags); HRESULT (STDMETHODCALLTYPE *GetIconLocation)( - IShellLinkDual2* This, + IShellLinkDual2 *This, BSTR *pbs, int *piIcon); HRESULT (STDMETHODCALLTYPE *SetIconLocation)( - IShellLinkDual2* This, + IShellLinkDual2 *This, BSTR bs, int iIcon); HRESULT (STDMETHODCALLTYPE *Save)( - IShellLinkDual2* This, + IShellLinkDual2 *This, VARIANT vWhere); /*** IShellLinkDual2 methods ***/ HRESULT (STDMETHODCALLTYPE *get_Target)( - IShellLinkDual2* This, + IShellLinkDual2 *This, FolderItem **ppfi); END_INTERFACE } IShellLinkDual2Vtbl; + interface IShellLinkDual2 { CONST_VTBL IShellLinkDual2Vtbl* lpVtbl; }; @@ -4007,14 +3547,6 @@ static FORCEINLINE HRESULT IShellLinkDual2_get_Target(IShellLinkDual2* This,Fold #endif -HRESULT STDMETHODCALLTYPE IShellLinkDual2_get_Target_Proxy( - IShellLinkDual2* This, - FolderItem **ppfi); -void __RPC_STUB IShellLinkDual2_get_Target_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellLinkDual2_INTERFACE_DEFINED__ */ @@ -4083,29 +3615,29 @@ typedef struct IShellFolderViewDualVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellFolderViewDual* This, + IShellFolderViewDual *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellFolderViewDual* This); + IShellFolderViewDual *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellFolderViewDual* This); + IShellFolderViewDual *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IShellFolderViewDual* This, + IShellFolderViewDual *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IShellFolderViewDual* This, + IShellFolderViewDual *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IShellFolderViewDual* This, + IShellFolderViewDual *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -4113,7 +3645,7 @@ typedef struct IShellFolderViewDualVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IShellFolderViewDual* This, + IShellFolderViewDual *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -4125,47 +3657,48 @@ typedef struct IShellFolderViewDualVtbl { /*** IShellFolderViewDual methods ***/ HRESULT (STDMETHODCALLTYPE *get_Application)( - IShellFolderViewDual* This, + IShellFolderViewDual *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Parent)( - IShellFolderViewDual* This, + IShellFolderViewDual *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Folder)( - IShellFolderViewDual* This, + IShellFolderViewDual *This, Folder **ppid); HRESULT (STDMETHODCALLTYPE *SelectedItems)( - IShellFolderViewDual* This, + IShellFolderViewDual *This, FolderItems **ppid); HRESULT (STDMETHODCALLTYPE *get_FocusedItem)( - IShellFolderViewDual* This, + IShellFolderViewDual *This, FolderItem **ppid); HRESULT (STDMETHODCALLTYPE *SelectItem)( - IShellFolderViewDual* This, + IShellFolderViewDual *This, VARIANT *pvfi, int dwFlags); HRESULT (STDMETHODCALLTYPE *PopupItemMenu)( - IShellFolderViewDual* This, + IShellFolderViewDual *This, FolderItem *pfi, VARIANT vx, VARIANT vy, BSTR *pbs); HRESULT (STDMETHODCALLTYPE *get_Script)( - IShellFolderViewDual* This, + IShellFolderViewDual *This, IDispatch **ppDisp); HRESULT (STDMETHODCALLTYPE *get_ViewOptions)( - IShellFolderViewDual* This, + IShellFolderViewDual *This, LONG *plViewOptions); END_INTERFACE } IShellFolderViewDualVtbl; + interface IShellFolderViewDual { CONST_VTBL IShellFolderViewDualVtbl* lpVtbl; }; @@ -4248,82 +3781,6 @@ static FORCEINLINE HRESULT IShellFolderViewDual_get_ViewOptions(IShellFolderView #endif -HRESULT STDMETHODCALLTYPE IShellFolderViewDual_get_Application_Proxy( - IShellFolderViewDual* This, - IDispatch **ppid); -void __RPC_STUB IShellFolderViewDual_get_Application_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolderViewDual_get_Parent_Proxy( - IShellFolderViewDual* This, - IDispatch **ppid); -void __RPC_STUB IShellFolderViewDual_get_Parent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolderViewDual_get_Folder_Proxy( - IShellFolderViewDual* This, - Folder **ppid); -void __RPC_STUB IShellFolderViewDual_get_Folder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolderViewDual_SelectedItems_Proxy( - IShellFolderViewDual* This, - FolderItems **ppid); -void __RPC_STUB IShellFolderViewDual_SelectedItems_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolderViewDual_get_FocusedItem_Proxy( - IShellFolderViewDual* This, - FolderItem **ppid); -void __RPC_STUB IShellFolderViewDual_get_FocusedItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolderViewDual_SelectItem_Proxy( - IShellFolderViewDual* This, - VARIANT *pvfi, - int dwFlags); -void __RPC_STUB IShellFolderViewDual_SelectItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolderViewDual_PopupItemMenu_Proxy( - IShellFolderViewDual* This, - FolderItem *pfi, - VARIANT vx, - VARIANT vy, - BSTR *pbs); -void __RPC_STUB IShellFolderViewDual_PopupItemMenu_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolderViewDual_get_Script_Proxy( - IShellFolderViewDual* This, - IDispatch **ppDisp); -void __RPC_STUB IShellFolderViewDual_get_Script_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolderViewDual_get_ViewOptions_Proxy( - IShellFolderViewDual* This, - LONG *plViewOptions); -void __RPC_STUB IShellFolderViewDual_get_ViewOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellFolderViewDual_INTERFACE_DEFINED__ */ @@ -4357,29 +3814,29 @@ typedef struct IShellFolderViewDual2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellFolderViewDual2* This, + IShellFolderViewDual2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellFolderViewDual2* This); + IShellFolderViewDual2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellFolderViewDual2* This); + IShellFolderViewDual2 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IShellFolderViewDual2* This, + IShellFolderViewDual2 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IShellFolderViewDual2* This, + IShellFolderViewDual2 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IShellFolderViewDual2* This, + IShellFolderViewDual2 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -4387,7 +3844,7 @@ typedef struct IShellFolderViewDual2Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IShellFolderViewDual2* This, + IShellFolderViewDual2 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -4399,60 +3856,61 @@ typedef struct IShellFolderViewDual2Vtbl { /*** IShellFolderViewDual methods ***/ HRESULT (STDMETHODCALLTYPE *get_Application)( - IShellFolderViewDual2* This, + IShellFolderViewDual2 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Parent)( - IShellFolderViewDual2* This, + IShellFolderViewDual2 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Folder)( - IShellFolderViewDual2* This, + IShellFolderViewDual2 *This, Folder **ppid); HRESULT (STDMETHODCALLTYPE *SelectedItems)( - IShellFolderViewDual2* This, + IShellFolderViewDual2 *This, FolderItems **ppid); HRESULT (STDMETHODCALLTYPE *get_FocusedItem)( - IShellFolderViewDual2* This, + IShellFolderViewDual2 *This, FolderItem **ppid); HRESULT (STDMETHODCALLTYPE *SelectItem)( - IShellFolderViewDual2* This, + IShellFolderViewDual2 *This, VARIANT *pvfi, int dwFlags); HRESULT (STDMETHODCALLTYPE *PopupItemMenu)( - IShellFolderViewDual2* This, + IShellFolderViewDual2 *This, FolderItem *pfi, VARIANT vx, VARIANT vy, BSTR *pbs); HRESULT (STDMETHODCALLTYPE *get_Script)( - IShellFolderViewDual2* This, + IShellFolderViewDual2 *This, IDispatch **ppDisp); HRESULT (STDMETHODCALLTYPE *get_ViewOptions)( - IShellFolderViewDual2* This, + IShellFolderViewDual2 *This, LONG *plViewOptions); /*** IShellFolderViewDual2 methods ***/ HRESULT (STDMETHODCALLTYPE *get_CurrentViewMode)( - IShellFolderViewDual2* This, + IShellFolderViewDual2 *This, UINT *pViewMode); HRESULT (STDMETHODCALLTYPE *put_CurrentViewMode)( - IShellFolderViewDual2* This, + IShellFolderViewDual2 *This, UINT ViewMode); HRESULT (STDMETHODCALLTYPE *SelectItemRelative)( - IShellFolderViewDual2* This, + IShellFolderViewDual2 *This, int iRelative); END_INTERFACE } IShellFolderViewDual2Vtbl; + interface IShellFolderViewDual2 { CONST_VTBL IShellFolderViewDual2Vtbl* lpVtbl; }; @@ -4549,30 +4007,6 @@ static FORCEINLINE HRESULT IShellFolderViewDual2_SelectItemRelative(IShellFolder #endif -HRESULT STDMETHODCALLTYPE IShellFolderViewDual2_get_CurrentViewMode_Proxy( - IShellFolderViewDual2* This, - UINT *pViewMode); -void __RPC_STUB IShellFolderViewDual2_get_CurrentViewMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolderViewDual2_put_CurrentViewMode_Proxy( - IShellFolderViewDual2* This, - UINT ViewMode); -void __RPC_STUB IShellFolderViewDual2_put_CurrentViewMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolderViewDual2_SelectItemRelative_Proxy( - IShellFolderViewDual2* This, - int iRelative); -void __RPC_STUB IShellFolderViewDual2_SelectItemRelative_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellFolderViewDual2_INTERFACE_DEFINED__ */ @@ -4624,29 +4058,29 @@ typedef struct IShellFolderViewDual3Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellFolderViewDual3* This); + IShellFolderViewDual3 *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellFolderViewDual3* This); + IShellFolderViewDual3 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -4654,7 +4088,7 @@ typedef struct IShellFolderViewDual3Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -4666,97 +4100,98 @@ typedef struct IShellFolderViewDual3Vtbl { /*** IShellFolderViewDual methods ***/ HRESULT (STDMETHODCALLTYPE *get_Application)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Parent)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Folder)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, Folder **ppid); HRESULT (STDMETHODCALLTYPE *SelectedItems)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, FolderItems **ppid); HRESULT (STDMETHODCALLTYPE *get_FocusedItem)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, FolderItem **ppid); HRESULT (STDMETHODCALLTYPE *SelectItem)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, VARIANT *pvfi, int dwFlags); HRESULT (STDMETHODCALLTYPE *PopupItemMenu)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, FolderItem *pfi, VARIANT vx, VARIANT vy, BSTR *pbs); HRESULT (STDMETHODCALLTYPE *get_Script)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, IDispatch **ppDisp); HRESULT (STDMETHODCALLTYPE *get_ViewOptions)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, LONG *plViewOptions); /*** IShellFolderViewDual2 methods ***/ HRESULT (STDMETHODCALLTYPE *get_CurrentViewMode)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, UINT *pViewMode); HRESULT (STDMETHODCALLTYPE *put_CurrentViewMode)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, UINT ViewMode); HRESULT (STDMETHODCALLTYPE *SelectItemRelative)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, int iRelative); /*** IShellFolderViewDual3 methods ***/ HRESULT (STDMETHODCALLTYPE *get_GroupBy)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, BSTR *pbstrGroupBy); HRESULT (STDMETHODCALLTYPE *put_GroupBy)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, BSTR bstrGroupBy); HRESULT (STDMETHODCALLTYPE *get_FolderFlags)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, DWORD *pdwFlags); HRESULT (STDMETHODCALLTYPE *put_FolderFlags)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *get_SortColumns)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, BSTR *pbstrSortColumns); HRESULT (STDMETHODCALLTYPE *put_SortColumns)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, BSTR bstrSortColumns); HRESULT (STDMETHODCALLTYPE *put_IconSize)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, int iIconSize); HRESULT (STDMETHODCALLTYPE *get_IconSize)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, int *piIconSize); HRESULT (STDMETHODCALLTYPE *FilterView)( - IShellFolderViewDual3* This, + IShellFolderViewDual3 *This, BSTR bstrFilterText); END_INTERFACE } IShellFolderViewDual3Vtbl; + interface IShellFolderViewDual3 { CONST_VTBL IShellFolderViewDual3Vtbl* lpVtbl; }; @@ -4891,78 +4326,6 @@ static FORCEINLINE HRESULT IShellFolderViewDual3_FilterView(IShellFolderViewDual #endif -HRESULT STDMETHODCALLTYPE IShellFolderViewDual3_get_GroupBy_Proxy( - IShellFolderViewDual3* This, - BSTR *pbstrGroupBy); -void __RPC_STUB IShellFolderViewDual3_get_GroupBy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolderViewDual3_put_GroupBy_Proxy( - IShellFolderViewDual3* This, - BSTR bstrGroupBy); -void __RPC_STUB IShellFolderViewDual3_put_GroupBy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolderViewDual3_get_FolderFlags_Proxy( - IShellFolderViewDual3* This, - DWORD *pdwFlags); -void __RPC_STUB IShellFolderViewDual3_get_FolderFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolderViewDual3_put_FolderFlags_Proxy( - IShellFolderViewDual3* This, - DWORD dwFlags); -void __RPC_STUB IShellFolderViewDual3_put_FolderFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolderViewDual3_get_SortColumns_Proxy( - IShellFolderViewDual3* This, - BSTR *pbstrSortColumns); -void __RPC_STUB IShellFolderViewDual3_get_SortColumns_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolderViewDual3_put_SortColumns_Proxy( - IShellFolderViewDual3* This, - BSTR bstrSortColumns); -void __RPC_STUB IShellFolderViewDual3_put_SortColumns_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolderViewDual3_put_IconSize_Proxy( - IShellFolderViewDual3* This, - int iIconSize); -void __RPC_STUB IShellFolderViewDual3_put_IconSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolderViewDual3_get_IconSize_Proxy( - IShellFolderViewDual3* This, - int *piIconSize); -void __RPC_STUB IShellFolderViewDual3_get_IconSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolderViewDual3_FilterView_Proxy( - IShellFolderViewDual3* This, - BSTR bstrFilterText); -void __RPC_STUB IShellFolderViewDual3_FilterView_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellFolderViewDual3_INTERFACE_DEFINED__ */ @@ -5083,29 +4446,29 @@ typedef struct IShellDispatchVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellDispatch* This, + IShellDispatch *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellDispatch* This); + IShellDispatch *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellDispatch* This); + IShellDispatch *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IShellDispatch* This, + IShellDispatch *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IShellDispatch* This, + IShellDispatch *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IShellDispatch* This, + IShellDispatch *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -5113,7 +4476,7 @@ typedef struct IShellDispatchVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IShellDispatch* This, + IShellDispatch *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -5125,20 +4488,20 @@ typedef struct IShellDispatchVtbl { /*** IShellDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *get_Application)( - IShellDispatch* This, + IShellDispatch *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Parent)( - IShellDispatch* This, + IShellDispatch *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *NameSpace)( - IShellDispatch* This, + IShellDispatch *This, VARIANT vDir, Folder **ppsdf); HRESULT (STDMETHODCALLTYPE *BrowseForFolder)( - IShellDispatch* This, + IShellDispatch *This, LONG Hwnd, BSTR Title, LONG Options, @@ -5146,68 +4509,69 @@ typedef struct IShellDispatchVtbl { Folder **ppsdf); HRESULT (STDMETHODCALLTYPE *Windows)( - IShellDispatch* This, + IShellDispatch *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *Open)( - IShellDispatch* This, + IShellDispatch *This, VARIANT vDir); HRESULT (STDMETHODCALLTYPE *Explore)( - IShellDispatch* This, + IShellDispatch *This, VARIANT vDir); HRESULT (STDMETHODCALLTYPE *MinimizeAll)( - IShellDispatch* This); + IShellDispatch *This); HRESULT (STDMETHODCALLTYPE *UndoMinimizeALL)( - IShellDispatch* This); + IShellDispatch *This); HRESULT (STDMETHODCALLTYPE *FileRun)( - IShellDispatch* This); + IShellDispatch *This); HRESULT (STDMETHODCALLTYPE *CascadeWindows)( - IShellDispatch* This); + IShellDispatch *This); HRESULT (STDMETHODCALLTYPE *TileVertically)( - IShellDispatch* This); + IShellDispatch *This); HRESULT (STDMETHODCALLTYPE *TileHorizontally)( - IShellDispatch* This); + IShellDispatch *This); HRESULT (STDMETHODCALLTYPE *ShutdownWindows)( - IShellDispatch* This); + IShellDispatch *This); HRESULT (STDMETHODCALLTYPE *Suspend)( - IShellDispatch* This); + IShellDispatch *This); HRESULT (STDMETHODCALLTYPE *EjectPC)( - IShellDispatch* This); + IShellDispatch *This); HRESULT (STDMETHODCALLTYPE *SetTime)( - IShellDispatch* This); + IShellDispatch *This); HRESULT (STDMETHODCALLTYPE *TrayProperties)( - IShellDispatch* This); + IShellDispatch *This); HRESULT (STDMETHODCALLTYPE *Help)( - IShellDispatch* This); + IShellDispatch *This); HRESULT (STDMETHODCALLTYPE *FindFiles)( - IShellDispatch* This); + IShellDispatch *This); HRESULT (STDMETHODCALLTYPE *FindComputer)( - IShellDispatch* This); + IShellDispatch *This); HRESULT (STDMETHODCALLTYPE *RefreshMenu)( - IShellDispatch* This); + IShellDispatch *This); HRESULT (STDMETHODCALLTYPE *ControlPanelItem)( - IShellDispatch* This, + IShellDispatch *This, BSTR bstrDir); END_INTERFACE } IShellDispatchVtbl; + interface IShellDispatch { CONST_VTBL IShellDispatchVtbl* lpVtbl; }; @@ -5346,180 +4710,6 @@ static FORCEINLINE HRESULT IShellDispatch_ControlPanelItem(IShellDispatch* This, #endif -HRESULT STDMETHODCALLTYPE IShellDispatch_get_Application_Proxy( - IShellDispatch* This, - IDispatch **ppid); -void __RPC_STUB IShellDispatch_get_Application_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch_get_Parent_Proxy( - IShellDispatch* This, - IDispatch **ppid); -void __RPC_STUB IShellDispatch_get_Parent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch_NameSpace_Proxy( - IShellDispatch* This, - VARIANT vDir, - Folder **ppsdf); -void __RPC_STUB IShellDispatch_NameSpace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch_BrowseForFolder_Proxy( - IShellDispatch* This, - LONG Hwnd, - BSTR Title, - LONG Options, - VARIANT RootFolder, - Folder **ppsdf); -void __RPC_STUB IShellDispatch_BrowseForFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch_Windows_Proxy( - IShellDispatch* This, - IDispatch **ppid); -void __RPC_STUB IShellDispatch_Windows_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch_Open_Proxy( - IShellDispatch* This, - VARIANT vDir); -void __RPC_STUB IShellDispatch_Open_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch_Explore_Proxy( - IShellDispatch* This, - VARIANT vDir); -void __RPC_STUB IShellDispatch_Explore_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch_MinimizeAll_Proxy( - IShellDispatch* This); -void __RPC_STUB IShellDispatch_MinimizeAll_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch_UndoMinimizeALL_Proxy( - IShellDispatch* This); -void __RPC_STUB IShellDispatch_UndoMinimizeALL_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch_FileRun_Proxy( - IShellDispatch* This); -void __RPC_STUB IShellDispatch_FileRun_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch_CascadeWindows_Proxy( - IShellDispatch* This); -void __RPC_STUB IShellDispatch_CascadeWindows_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch_TileVertically_Proxy( - IShellDispatch* This); -void __RPC_STUB IShellDispatch_TileVertically_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch_TileHorizontally_Proxy( - IShellDispatch* This); -void __RPC_STUB IShellDispatch_TileHorizontally_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch_ShutdownWindows_Proxy( - IShellDispatch* This); -void __RPC_STUB IShellDispatch_ShutdownWindows_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch_Suspend_Proxy( - IShellDispatch* This); -void __RPC_STUB IShellDispatch_Suspend_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch_EjectPC_Proxy( - IShellDispatch* This); -void __RPC_STUB IShellDispatch_EjectPC_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch_SetTime_Proxy( - IShellDispatch* This); -void __RPC_STUB IShellDispatch_SetTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch_TrayProperties_Proxy( - IShellDispatch* This); -void __RPC_STUB IShellDispatch_TrayProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch_Help_Proxy( - IShellDispatch* This); -void __RPC_STUB IShellDispatch_Help_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch_FindFiles_Proxy( - IShellDispatch* This); -void __RPC_STUB IShellDispatch_FindFiles_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch_FindComputer_Proxy( - IShellDispatch* This); -void __RPC_STUB IShellDispatch_FindComputer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch_RefreshMenu_Proxy( - IShellDispatch* This); -void __RPC_STUB IShellDispatch_RefreshMenu_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch_ControlPanelItem_Proxy( - IShellDispatch* This, - BSTR bstrDir); -void __RPC_STUB IShellDispatch_ControlPanelItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellDispatch_INTERFACE_DEFINED__ */ @@ -5588,29 +4778,29 @@ typedef struct IShellDispatch2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellDispatch2* This, + IShellDispatch2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellDispatch2* This); + IShellDispatch2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellDispatch2* This); + IShellDispatch2 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IShellDispatch2* This, + IShellDispatch2 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IShellDispatch2* This, + IShellDispatch2 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IShellDispatch2* This, + IShellDispatch2 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -5618,7 +4808,7 @@ typedef struct IShellDispatch2Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IShellDispatch2* This, + IShellDispatch2 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -5630,20 +4820,20 @@ typedef struct IShellDispatch2Vtbl { /*** IShellDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *get_Application)( - IShellDispatch2* This, + IShellDispatch2 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Parent)( - IShellDispatch2* This, + IShellDispatch2 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *NameSpace)( - IShellDispatch2* This, + IShellDispatch2 *This, VARIANT vDir, Folder **ppsdf); HRESULT (STDMETHODCALLTYPE *BrowseForFolder)( - IShellDispatch2* This, + IShellDispatch2 *This, LONG Hwnd, BSTR Title, LONG Options, @@ -5651,75 +4841,75 @@ typedef struct IShellDispatch2Vtbl { Folder **ppsdf); HRESULT (STDMETHODCALLTYPE *Windows)( - IShellDispatch2* This, + IShellDispatch2 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *Open)( - IShellDispatch2* This, + IShellDispatch2 *This, VARIANT vDir); HRESULT (STDMETHODCALLTYPE *Explore)( - IShellDispatch2* This, + IShellDispatch2 *This, VARIANT vDir); HRESULT (STDMETHODCALLTYPE *MinimizeAll)( - IShellDispatch2* This); + IShellDispatch2 *This); HRESULT (STDMETHODCALLTYPE *UndoMinimizeALL)( - IShellDispatch2* This); + IShellDispatch2 *This); HRESULT (STDMETHODCALLTYPE *FileRun)( - IShellDispatch2* This); + IShellDispatch2 *This); HRESULT (STDMETHODCALLTYPE *CascadeWindows)( - IShellDispatch2* This); + IShellDispatch2 *This); HRESULT (STDMETHODCALLTYPE *TileVertically)( - IShellDispatch2* This); + IShellDispatch2 *This); HRESULT (STDMETHODCALLTYPE *TileHorizontally)( - IShellDispatch2* This); + IShellDispatch2 *This); HRESULT (STDMETHODCALLTYPE *ShutdownWindows)( - IShellDispatch2* This); + IShellDispatch2 *This); HRESULT (STDMETHODCALLTYPE *Suspend)( - IShellDispatch2* This); + IShellDispatch2 *This); HRESULT (STDMETHODCALLTYPE *EjectPC)( - IShellDispatch2* This); + IShellDispatch2 *This); HRESULT (STDMETHODCALLTYPE *SetTime)( - IShellDispatch2* This); + IShellDispatch2 *This); HRESULT (STDMETHODCALLTYPE *TrayProperties)( - IShellDispatch2* This); + IShellDispatch2 *This); HRESULT (STDMETHODCALLTYPE *Help)( - IShellDispatch2* This); + IShellDispatch2 *This); HRESULT (STDMETHODCALLTYPE *FindFiles)( - IShellDispatch2* This); + IShellDispatch2 *This); HRESULT (STDMETHODCALLTYPE *FindComputer)( - IShellDispatch2* This); + IShellDispatch2 *This); HRESULT (STDMETHODCALLTYPE *RefreshMenu)( - IShellDispatch2* This); + IShellDispatch2 *This); HRESULT (STDMETHODCALLTYPE *ControlPanelItem)( - IShellDispatch2* This, + IShellDispatch2 *This, BSTR bstrDir); /*** IShellDispatch2 methods ***/ HRESULT (STDMETHODCALLTYPE *IsRestricted)( - IShellDispatch2* This, + IShellDispatch2 *This, BSTR Group, BSTR Restriction, LONG *plRestrictValue); HRESULT (STDMETHODCALLTYPE *ShellExecute)( - IShellDispatch2* This, + IShellDispatch2 *This, BSTR File, VARIANT vArgs, VARIANT vDir, @@ -5727,46 +4917,47 @@ typedef struct IShellDispatch2Vtbl { VARIANT vShow); HRESULT (STDMETHODCALLTYPE *FindPrinter)( - IShellDispatch2* This, + IShellDispatch2 *This, BSTR name, BSTR location, BSTR model); HRESULT (STDMETHODCALLTYPE *GetSystemInformation)( - IShellDispatch2* This, + IShellDispatch2 *This, BSTR name, VARIANT *pv); HRESULT (STDMETHODCALLTYPE *ServiceStart)( - IShellDispatch2* This, + IShellDispatch2 *This, BSTR ServiceName, VARIANT Persistent, VARIANT *pSuccess); HRESULT (STDMETHODCALLTYPE *ServiceStop)( - IShellDispatch2* This, + IShellDispatch2 *This, BSTR ServiceName, VARIANT Persistent, VARIANT *pSuccess); HRESULT (STDMETHODCALLTYPE *IsServiceRunning)( - IShellDispatch2* This, + IShellDispatch2 *This, BSTR ServiceName, VARIANT *pRunning); HRESULT (STDMETHODCALLTYPE *CanStartStopService)( - IShellDispatch2* This, + IShellDispatch2 *This, BSTR ServiceName, VARIANT *pCanStartStop); HRESULT (STDMETHODCALLTYPE *ShowBrowserBar)( - IShellDispatch2* This, + IShellDispatch2 *This, BSTR bstrClsid, VARIANT bShow, VARIANT *pSuccess); END_INTERFACE } IShellDispatch2Vtbl; + interface IShellDispatch2 { CONST_VTBL IShellDispatch2Vtbl* lpVtbl; }; @@ -5943,95 +5134,6 @@ static FORCEINLINE HRESULT IShellDispatch2_ShowBrowserBar(IShellDispatch2* This, #endif -HRESULT STDMETHODCALLTYPE IShellDispatch2_IsRestricted_Proxy( - IShellDispatch2* This, - BSTR Group, - BSTR Restriction, - LONG *plRestrictValue); -void __RPC_STUB IShellDispatch2_IsRestricted_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch2_ShellExecute_Proxy( - IShellDispatch2* This, - BSTR File, - VARIANT vArgs, - VARIANT vDir, - VARIANT vOperation, - VARIANT vShow); -void __RPC_STUB IShellDispatch2_ShellExecute_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch2_FindPrinter_Proxy( - IShellDispatch2* This, - BSTR name, - BSTR location, - BSTR model); -void __RPC_STUB IShellDispatch2_FindPrinter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch2_GetSystemInformation_Proxy( - IShellDispatch2* This, - BSTR name, - VARIANT *pv); -void __RPC_STUB IShellDispatch2_GetSystemInformation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch2_ServiceStart_Proxy( - IShellDispatch2* This, - BSTR ServiceName, - VARIANT Persistent, - VARIANT *pSuccess); -void __RPC_STUB IShellDispatch2_ServiceStart_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch2_ServiceStop_Proxy( - IShellDispatch2* This, - BSTR ServiceName, - VARIANT Persistent, - VARIANT *pSuccess); -void __RPC_STUB IShellDispatch2_ServiceStop_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch2_IsServiceRunning_Proxy( - IShellDispatch2* This, - BSTR ServiceName, - VARIANT *pRunning); -void __RPC_STUB IShellDispatch2_IsServiceRunning_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch2_CanStartStopService_Proxy( - IShellDispatch2* This, - BSTR ServiceName, - VARIANT *pCanStartStop); -void __RPC_STUB IShellDispatch2_CanStartStopService_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch2_ShowBrowserBar_Proxy( - IShellDispatch2* This, - BSTR bstrClsid, - VARIANT bShow, - VARIANT *pSuccess); -void __RPC_STUB IShellDispatch2_ShowBrowserBar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellDispatch2_INTERFACE_DEFINED__ */ @@ -6060,29 +5162,29 @@ typedef struct IShellDispatch3Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellDispatch3* This, + IShellDispatch3 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellDispatch3* This); + IShellDispatch3 *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellDispatch3* This); + IShellDispatch3 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IShellDispatch3* This, + IShellDispatch3 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IShellDispatch3* This, + IShellDispatch3 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IShellDispatch3* This, + IShellDispatch3 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -6090,7 +5192,7 @@ typedef struct IShellDispatch3Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IShellDispatch3* This, + IShellDispatch3 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -6102,20 +5204,20 @@ typedef struct IShellDispatch3Vtbl { /*** IShellDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *get_Application)( - IShellDispatch3* This, + IShellDispatch3 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Parent)( - IShellDispatch3* This, + IShellDispatch3 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *NameSpace)( - IShellDispatch3* This, + IShellDispatch3 *This, VARIANT vDir, Folder **ppsdf); HRESULT (STDMETHODCALLTYPE *BrowseForFolder)( - IShellDispatch3* This, + IShellDispatch3 *This, LONG Hwnd, BSTR Title, LONG Options, @@ -6123,75 +5225,75 @@ typedef struct IShellDispatch3Vtbl { Folder **ppsdf); HRESULT (STDMETHODCALLTYPE *Windows)( - IShellDispatch3* This, + IShellDispatch3 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *Open)( - IShellDispatch3* This, + IShellDispatch3 *This, VARIANT vDir); HRESULT (STDMETHODCALLTYPE *Explore)( - IShellDispatch3* This, + IShellDispatch3 *This, VARIANT vDir); HRESULT (STDMETHODCALLTYPE *MinimizeAll)( - IShellDispatch3* This); + IShellDispatch3 *This); HRESULT (STDMETHODCALLTYPE *UndoMinimizeALL)( - IShellDispatch3* This); + IShellDispatch3 *This); HRESULT (STDMETHODCALLTYPE *FileRun)( - IShellDispatch3* This); + IShellDispatch3 *This); HRESULT (STDMETHODCALLTYPE *CascadeWindows)( - IShellDispatch3* This); + IShellDispatch3 *This); HRESULT (STDMETHODCALLTYPE *TileVertically)( - IShellDispatch3* This); + IShellDispatch3 *This); HRESULT (STDMETHODCALLTYPE *TileHorizontally)( - IShellDispatch3* This); + IShellDispatch3 *This); HRESULT (STDMETHODCALLTYPE *ShutdownWindows)( - IShellDispatch3* This); + IShellDispatch3 *This); HRESULT (STDMETHODCALLTYPE *Suspend)( - IShellDispatch3* This); + IShellDispatch3 *This); HRESULT (STDMETHODCALLTYPE *EjectPC)( - IShellDispatch3* This); + IShellDispatch3 *This); HRESULT (STDMETHODCALLTYPE *SetTime)( - IShellDispatch3* This); + IShellDispatch3 *This); HRESULT (STDMETHODCALLTYPE *TrayProperties)( - IShellDispatch3* This); + IShellDispatch3 *This); HRESULT (STDMETHODCALLTYPE *Help)( - IShellDispatch3* This); + IShellDispatch3 *This); HRESULT (STDMETHODCALLTYPE *FindFiles)( - IShellDispatch3* This); + IShellDispatch3 *This); HRESULT (STDMETHODCALLTYPE *FindComputer)( - IShellDispatch3* This); + IShellDispatch3 *This); HRESULT (STDMETHODCALLTYPE *RefreshMenu)( - IShellDispatch3* This); + IShellDispatch3 *This); HRESULT (STDMETHODCALLTYPE *ControlPanelItem)( - IShellDispatch3* This, + IShellDispatch3 *This, BSTR bstrDir); /*** IShellDispatch2 methods ***/ HRESULT (STDMETHODCALLTYPE *IsRestricted)( - IShellDispatch3* This, + IShellDispatch3 *This, BSTR Group, BSTR Restriction, LONG *plRestrictValue); HRESULT (STDMETHODCALLTYPE *ShellExecute)( - IShellDispatch3* This, + IShellDispatch3 *This, BSTR File, VARIANT vArgs, VARIANT vDir, @@ -6199,52 +5301,53 @@ typedef struct IShellDispatch3Vtbl { VARIANT vShow); HRESULT (STDMETHODCALLTYPE *FindPrinter)( - IShellDispatch3* This, + IShellDispatch3 *This, BSTR name, BSTR location, BSTR model); HRESULT (STDMETHODCALLTYPE *GetSystemInformation)( - IShellDispatch3* This, + IShellDispatch3 *This, BSTR name, VARIANT *pv); HRESULT (STDMETHODCALLTYPE *ServiceStart)( - IShellDispatch3* This, + IShellDispatch3 *This, BSTR ServiceName, VARIANT Persistent, VARIANT *pSuccess); HRESULT (STDMETHODCALLTYPE *ServiceStop)( - IShellDispatch3* This, + IShellDispatch3 *This, BSTR ServiceName, VARIANT Persistent, VARIANT *pSuccess); HRESULT (STDMETHODCALLTYPE *IsServiceRunning)( - IShellDispatch3* This, + IShellDispatch3 *This, BSTR ServiceName, VARIANT *pRunning); HRESULT (STDMETHODCALLTYPE *CanStartStopService)( - IShellDispatch3* This, + IShellDispatch3 *This, BSTR ServiceName, VARIANT *pCanStartStop); HRESULT (STDMETHODCALLTYPE *ShowBrowserBar)( - IShellDispatch3* This, + IShellDispatch3 *This, BSTR bstrClsid, VARIANT bShow, VARIANT *pSuccess); /*** IShellDispatch3 methods ***/ HRESULT (STDMETHODCALLTYPE *AddToRecent)( - IShellDispatch3* This, + IShellDispatch3 *This, VARIANT varFile, BSTR bstrCategory); END_INTERFACE } IShellDispatch3Vtbl; + interface IShellDispatch3 { CONST_VTBL IShellDispatch3Vtbl* lpVtbl; }; @@ -6427,15 +5530,6 @@ static FORCEINLINE HRESULT IShellDispatch3_AddToRecent(IShellDispatch3* This,VAR #endif -HRESULT STDMETHODCALLTYPE IShellDispatch3_AddToRecent_Proxy( - IShellDispatch3* This, - VARIANT varFile, - BSTR bstrCategory); -void __RPC_STUB IShellDispatch3_AddToRecent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellDispatch3_INTERFACE_DEFINED__ */ @@ -6474,29 +5568,29 @@ typedef struct IShellDispatch4Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellDispatch4* This, + IShellDispatch4 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellDispatch4* This); + IShellDispatch4 *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellDispatch4* This); + IShellDispatch4 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IShellDispatch4* This, + IShellDispatch4 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IShellDispatch4* This, + IShellDispatch4 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IShellDispatch4* This, + IShellDispatch4 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -6504,7 +5598,7 @@ typedef struct IShellDispatch4Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IShellDispatch4* This, + IShellDispatch4 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -6516,20 +5610,20 @@ typedef struct IShellDispatch4Vtbl { /*** IShellDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *get_Application)( - IShellDispatch4* This, + IShellDispatch4 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Parent)( - IShellDispatch4* This, + IShellDispatch4 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *NameSpace)( - IShellDispatch4* This, + IShellDispatch4 *This, VARIANT vDir, Folder **ppsdf); HRESULT (STDMETHODCALLTYPE *BrowseForFolder)( - IShellDispatch4* This, + IShellDispatch4 *This, LONG Hwnd, BSTR Title, LONG Options, @@ -6537,75 +5631,75 @@ typedef struct IShellDispatch4Vtbl { Folder **ppsdf); HRESULT (STDMETHODCALLTYPE *Windows)( - IShellDispatch4* This, + IShellDispatch4 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *Open)( - IShellDispatch4* This, + IShellDispatch4 *This, VARIANT vDir); HRESULT (STDMETHODCALLTYPE *Explore)( - IShellDispatch4* This, + IShellDispatch4 *This, VARIANT vDir); HRESULT (STDMETHODCALLTYPE *MinimizeAll)( - IShellDispatch4* This); + IShellDispatch4 *This); HRESULT (STDMETHODCALLTYPE *UndoMinimizeALL)( - IShellDispatch4* This); + IShellDispatch4 *This); HRESULT (STDMETHODCALLTYPE *FileRun)( - IShellDispatch4* This); + IShellDispatch4 *This); HRESULT (STDMETHODCALLTYPE *CascadeWindows)( - IShellDispatch4* This); + IShellDispatch4 *This); HRESULT (STDMETHODCALLTYPE *TileVertically)( - IShellDispatch4* This); + IShellDispatch4 *This); HRESULT (STDMETHODCALLTYPE *TileHorizontally)( - IShellDispatch4* This); + IShellDispatch4 *This); HRESULT (STDMETHODCALLTYPE *ShutdownWindows)( - IShellDispatch4* This); + IShellDispatch4 *This); HRESULT (STDMETHODCALLTYPE *Suspend)( - IShellDispatch4* This); + IShellDispatch4 *This); HRESULT (STDMETHODCALLTYPE *EjectPC)( - IShellDispatch4* This); + IShellDispatch4 *This); HRESULT (STDMETHODCALLTYPE *SetTime)( - IShellDispatch4* This); + IShellDispatch4 *This); HRESULT (STDMETHODCALLTYPE *TrayProperties)( - IShellDispatch4* This); + IShellDispatch4 *This); HRESULT (STDMETHODCALLTYPE *Help)( - IShellDispatch4* This); + IShellDispatch4 *This); HRESULT (STDMETHODCALLTYPE *FindFiles)( - IShellDispatch4* This); + IShellDispatch4 *This); HRESULT (STDMETHODCALLTYPE *FindComputer)( - IShellDispatch4* This); + IShellDispatch4 *This); HRESULT (STDMETHODCALLTYPE *RefreshMenu)( - IShellDispatch4* This); + IShellDispatch4 *This); HRESULT (STDMETHODCALLTYPE *ControlPanelItem)( - IShellDispatch4* This, + IShellDispatch4 *This, BSTR bstrDir); /*** IShellDispatch2 methods ***/ HRESULT (STDMETHODCALLTYPE *IsRestricted)( - IShellDispatch4* This, + IShellDispatch4 *This, BSTR Group, BSTR Restriction, LONG *plRestrictValue); HRESULT (STDMETHODCALLTYPE *ShellExecute)( - IShellDispatch4* This, + IShellDispatch4 *This, BSTR File, VARIANT vArgs, VARIANT vDir, @@ -6613,69 +5707,70 @@ typedef struct IShellDispatch4Vtbl { VARIANT vShow); HRESULT (STDMETHODCALLTYPE *FindPrinter)( - IShellDispatch4* This, + IShellDispatch4 *This, BSTR name, BSTR location, BSTR model); HRESULT (STDMETHODCALLTYPE *GetSystemInformation)( - IShellDispatch4* This, + IShellDispatch4 *This, BSTR name, VARIANT *pv); HRESULT (STDMETHODCALLTYPE *ServiceStart)( - IShellDispatch4* This, + IShellDispatch4 *This, BSTR ServiceName, VARIANT Persistent, VARIANT *pSuccess); HRESULT (STDMETHODCALLTYPE *ServiceStop)( - IShellDispatch4* This, + IShellDispatch4 *This, BSTR ServiceName, VARIANT Persistent, VARIANT *pSuccess); HRESULT (STDMETHODCALLTYPE *IsServiceRunning)( - IShellDispatch4* This, + IShellDispatch4 *This, BSTR ServiceName, VARIANT *pRunning); HRESULT (STDMETHODCALLTYPE *CanStartStopService)( - IShellDispatch4* This, + IShellDispatch4 *This, BSTR ServiceName, VARIANT *pCanStartStop); HRESULT (STDMETHODCALLTYPE *ShowBrowserBar)( - IShellDispatch4* This, + IShellDispatch4 *This, BSTR bstrClsid, VARIANT bShow, VARIANT *pSuccess); /*** IShellDispatch3 methods ***/ HRESULT (STDMETHODCALLTYPE *AddToRecent)( - IShellDispatch4* This, + IShellDispatch4 *This, VARIANT varFile, BSTR bstrCategory); /*** IShellDispatch4 methods ***/ HRESULT (STDMETHODCALLTYPE *WindowsSecurity)( - IShellDispatch4* This); + IShellDispatch4 *This); HRESULT (STDMETHODCALLTYPE *ToggleDesktop)( - IShellDispatch4* This); + IShellDispatch4 *This); HRESULT (STDMETHODCALLTYPE *ExplorerPolicy)( - IShellDispatch4* This, + IShellDispatch4 *This, BSTR bstrPolicyName, VARIANT *pValue); HRESULT (STDMETHODCALLTYPE *GetSetting)( - IShellDispatch4* This, + IShellDispatch4 *This, LONG lSetting, VARIANT_BOOL *pResult); END_INTERFACE } IShellDispatch4Vtbl; + interface IShellDispatch4 { CONST_VTBL IShellDispatch4Vtbl* lpVtbl; }; @@ -6876,38 +5971,6 @@ static FORCEINLINE HRESULT IShellDispatch4_GetSetting(IShellDispatch4* This,LONG #endif -HRESULT STDMETHODCALLTYPE IShellDispatch4_WindowsSecurity_Proxy( - IShellDispatch4* This); -void __RPC_STUB IShellDispatch4_WindowsSecurity_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch4_ToggleDesktop_Proxy( - IShellDispatch4* This); -void __RPC_STUB IShellDispatch4_ToggleDesktop_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch4_ExplorerPolicy_Proxy( - IShellDispatch4* This, - BSTR bstrPolicyName, - VARIANT *pValue); -void __RPC_STUB IShellDispatch4_ExplorerPolicy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellDispatch4_GetSetting_Proxy( - IShellDispatch4* This, - LONG lSetting, - VARIANT_BOOL *pResult); -void __RPC_STUB IShellDispatch4_GetSetting_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellDispatch4_INTERFACE_DEFINED__ */ @@ -6935,29 +5998,29 @@ typedef struct IShellDispatch5Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellDispatch5* This, + IShellDispatch5 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellDispatch5* This); + IShellDispatch5 *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellDispatch5* This); + IShellDispatch5 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IShellDispatch5* This, + IShellDispatch5 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IShellDispatch5* This, + IShellDispatch5 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IShellDispatch5* This, + IShellDispatch5 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -6965,7 +6028,7 @@ typedef struct IShellDispatch5Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IShellDispatch5* This, + IShellDispatch5 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -6977,20 +6040,20 @@ typedef struct IShellDispatch5Vtbl { /*** IShellDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *get_Application)( - IShellDispatch5* This, + IShellDispatch5 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Parent)( - IShellDispatch5* This, + IShellDispatch5 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *NameSpace)( - IShellDispatch5* This, + IShellDispatch5 *This, VARIANT vDir, Folder **ppsdf); HRESULT (STDMETHODCALLTYPE *BrowseForFolder)( - IShellDispatch5* This, + IShellDispatch5 *This, LONG Hwnd, BSTR Title, LONG Options, @@ -6998,75 +6061,75 @@ typedef struct IShellDispatch5Vtbl { Folder **ppsdf); HRESULT (STDMETHODCALLTYPE *Windows)( - IShellDispatch5* This, + IShellDispatch5 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *Open)( - IShellDispatch5* This, + IShellDispatch5 *This, VARIANT vDir); HRESULT (STDMETHODCALLTYPE *Explore)( - IShellDispatch5* This, + IShellDispatch5 *This, VARIANT vDir); HRESULT (STDMETHODCALLTYPE *MinimizeAll)( - IShellDispatch5* This); + IShellDispatch5 *This); HRESULT (STDMETHODCALLTYPE *UndoMinimizeALL)( - IShellDispatch5* This); + IShellDispatch5 *This); HRESULT (STDMETHODCALLTYPE *FileRun)( - IShellDispatch5* This); + IShellDispatch5 *This); HRESULT (STDMETHODCALLTYPE *CascadeWindows)( - IShellDispatch5* This); + IShellDispatch5 *This); HRESULT (STDMETHODCALLTYPE *TileVertically)( - IShellDispatch5* This); + IShellDispatch5 *This); HRESULT (STDMETHODCALLTYPE *TileHorizontally)( - IShellDispatch5* This); + IShellDispatch5 *This); HRESULT (STDMETHODCALLTYPE *ShutdownWindows)( - IShellDispatch5* This); + IShellDispatch5 *This); HRESULT (STDMETHODCALLTYPE *Suspend)( - IShellDispatch5* This); + IShellDispatch5 *This); HRESULT (STDMETHODCALLTYPE *EjectPC)( - IShellDispatch5* This); + IShellDispatch5 *This); HRESULT (STDMETHODCALLTYPE *SetTime)( - IShellDispatch5* This); + IShellDispatch5 *This); HRESULT (STDMETHODCALLTYPE *TrayProperties)( - IShellDispatch5* This); + IShellDispatch5 *This); HRESULT (STDMETHODCALLTYPE *Help)( - IShellDispatch5* This); + IShellDispatch5 *This); HRESULT (STDMETHODCALLTYPE *FindFiles)( - IShellDispatch5* This); + IShellDispatch5 *This); HRESULT (STDMETHODCALLTYPE *FindComputer)( - IShellDispatch5* This); + IShellDispatch5 *This); HRESULT (STDMETHODCALLTYPE *RefreshMenu)( - IShellDispatch5* This); + IShellDispatch5 *This); HRESULT (STDMETHODCALLTYPE *ControlPanelItem)( - IShellDispatch5* This, + IShellDispatch5 *This, BSTR bstrDir); /*** IShellDispatch2 methods ***/ HRESULT (STDMETHODCALLTYPE *IsRestricted)( - IShellDispatch5* This, + IShellDispatch5 *This, BSTR Group, BSTR Restriction, LONG *plRestrictValue); HRESULT (STDMETHODCALLTYPE *ShellExecute)( - IShellDispatch5* This, + IShellDispatch5 *This, BSTR File, VARIANT vArgs, VARIANT vDir, @@ -7074,73 +6137,74 @@ typedef struct IShellDispatch5Vtbl { VARIANT vShow); HRESULT (STDMETHODCALLTYPE *FindPrinter)( - IShellDispatch5* This, + IShellDispatch5 *This, BSTR name, BSTR location, BSTR model); HRESULT (STDMETHODCALLTYPE *GetSystemInformation)( - IShellDispatch5* This, + IShellDispatch5 *This, BSTR name, VARIANT *pv); HRESULT (STDMETHODCALLTYPE *ServiceStart)( - IShellDispatch5* This, + IShellDispatch5 *This, BSTR ServiceName, VARIANT Persistent, VARIANT *pSuccess); HRESULT (STDMETHODCALLTYPE *ServiceStop)( - IShellDispatch5* This, + IShellDispatch5 *This, BSTR ServiceName, VARIANT Persistent, VARIANT *pSuccess); HRESULT (STDMETHODCALLTYPE *IsServiceRunning)( - IShellDispatch5* This, + IShellDispatch5 *This, BSTR ServiceName, VARIANT *pRunning); HRESULT (STDMETHODCALLTYPE *CanStartStopService)( - IShellDispatch5* This, + IShellDispatch5 *This, BSTR ServiceName, VARIANT *pCanStartStop); HRESULT (STDMETHODCALLTYPE *ShowBrowserBar)( - IShellDispatch5* This, + IShellDispatch5 *This, BSTR bstrClsid, VARIANT bShow, VARIANT *pSuccess); /*** IShellDispatch3 methods ***/ HRESULT (STDMETHODCALLTYPE *AddToRecent)( - IShellDispatch5* This, + IShellDispatch5 *This, VARIANT varFile, BSTR bstrCategory); /*** IShellDispatch4 methods ***/ HRESULT (STDMETHODCALLTYPE *WindowsSecurity)( - IShellDispatch5* This); + IShellDispatch5 *This); HRESULT (STDMETHODCALLTYPE *ToggleDesktop)( - IShellDispatch5* This); + IShellDispatch5 *This); HRESULT (STDMETHODCALLTYPE *ExplorerPolicy)( - IShellDispatch5* This, + IShellDispatch5 *This, BSTR bstrPolicyName, VARIANT *pValue); HRESULT (STDMETHODCALLTYPE *GetSetting)( - IShellDispatch5* This, + IShellDispatch5 *This, LONG lSetting, VARIANT_BOOL *pResult); /*** IShellDispatch5 methods ***/ HRESULT (STDMETHODCALLTYPE *WindowSwitcher)( - IShellDispatch5* This); + IShellDispatch5 *This); END_INTERFACE } IShellDispatch5Vtbl; + interface IShellDispatch5 { CONST_VTBL IShellDispatch5Vtbl* lpVtbl; }; @@ -7347,13 +6411,6 @@ static FORCEINLINE HRESULT IShellDispatch5_WindowSwitcher(IShellDispatch5* This) #endif -HRESULT STDMETHODCALLTYPE IShellDispatch5_WindowSwitcher_Proxy( - IShellDispatch5* This); -void __RPC_STUB IShellDispatch5_WindowSwitcher_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellDispatch5_INTERFACE_DEFINED__ */ @@ -7382,29 +6439,29 @@ typedef struct IShellDispatch6Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellDispatch6* This, + IShellDispatch6 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellDispatch6* This); + IShellDispatch6 *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellDispatch6* This); + IShellDispatch6 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IShellDispatch6* This, + IShellDispatch6 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IShellDispatch6* This, + IShellDispatch6 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IShellDispatch6* This, + IShellDispatch6 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -7412,7 +6469,7 @@ typedef struct IShellDispatch6Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IShellDispatch6* This, + IShellDispatch6 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -7424,20 +6481,20 @@ typedef struct IShellDispatch6Vtbl { /*** IShellDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *get_Application)( - IShellDispatch6* This, + IShellDispatch6 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *get_Parent)( - IShellDispatch6* This, + IShellDispatch6 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *NameSpace)( - IShellDispatch6* This, + IShellDispatch6 *This, VARIANT vDir, Folder **ppsdf); HRESULT (STDMETHODCALLTYPE *BrowseForFolder)( - IShellDispatch6* This, + IShellDispatch6 *This, LONG Hwnd, BSTR Title, LONG Options, @@ -7445,75 +6502,75 @@ typedef struct IShellDispatch6Vtbl { Folder **ppsdf); HRESULT (STDMETHODCALLTYPE *Windows)( - IShellDispatch6* This, + IShellDispatch6 *This, IDispatch **ppid); HRESULT (STDMETHODCALLTYPE *Open)( - IShellDispatch6* This, + IShellDispatch6 *This, VARIANT vDir); HRESULT (STDMETHODCALLTYPE *Explore)( - IShellDispatch6* This, + IShellDispatch6 *This, VARIANT vDir); HRESULT (STDMETHODCALLTYPE *MinimizeAll)( - IShellDispatch6* This); + IShellDispatch6 *This); HRESULT (STDMETHODCALLTYPE *UndoMinimizeALL)( - IShellDispatch6* This); + IShellDispatch6 *This); HRESULT (STDMETHODCALLTYPE *FileRun)( - IShellDispatch6* This); + IShellDispatch6 *This); HRESULT (STDMETHODCALLTYPE *CascadeWindows)( - IShellDispatch6* This); + IShellDispatch6 *This); HRESULT (STDMETHODCALLTYPE *TileVertically)( - IShellDispatch6* This); + IShellDispatch6 *This); HRESULT (STDMETHODCALLTYPE *TileHorizontally)( - IShellDispatch6* This); + IShellDispatch6 *This); HRESULT (STDMETHODCALLTYPE *ShutdownWindows)( - IShellDispatch6* This); + IShellDispatch6 *This); HRESULT (STDMETHODCALLTYPE *Suspend)( - IShellDispatch6* This); + IShellDispatch6 *This); HRESULT (STDMETHODCALLTYPE *EjectPC)( - IShellDispatch6* This); + IShellDispatch6 *This); HRESULT (STDMETHODCALLTYPE *SetTime)( - IShellDispatch6* This); + IShellDispatch6 *This); HRESULT (STDMETHODCALLTYPE *TrayProperties)( - IShellDispatch6* This); + IShellDispatch6 *This); HRESULT (STDMETHODCALLTYPE *Help)( - IShellDispatch6* This); + IShellDispatch6 *This); HRESULT (STDMETHODCALLTYPE *FindFiles)( - IShellDispatch6* This); + IShellDispatch6 *This); HRESULT (STDMETHODCALLTYPE *FindComputer)( - IShellDispatch6* This); + IShellDispatch6 *This); HRESULT (STDMETHODCALLTYPE *RefreshMenu)( - IShellDispatch6* This); + IShellDispatch6 *This); HRESULT (STDMETHODCALLTYPE *ControlPanelItem)( - IShellDispatch6* This, + IShellDispatch6 *This, BSTR bstrDir); /*** IShellDispatch2 methods ***/ HRESULT (STDMETHODCALLTYPE *IsRestricted)( - IShellDispatch6* This, + IShellDispatch6 *This, BSTR Group, BSTR Restriction, LONG *plRestrictValue); HRESULT (STDMETHODCALLTYPE *ShellExecute)( - IShellDispatch6* This, + IShellDispatch6 *This, BSTR File, VARIANT vArgs, VARIANT vDir, @@ -7521,77 +6578,78 @@ typedef struct IShellDispatch6Vtbl { VARIANT vShow); HRESULT (STDMETHODCALLTYPE *FindPrinter)( - IShellDispatch6* This, + IShellDispatch6 *This, BSTR name, BSTR location, BSTR model); HRESULT (STDMETHODCALLTYPE *GetSystemInformation)( - IShellDispatch6* This, + IShellDispatch6 *This, BSTR name, VARIANT *pv); HRESULT (STDMETHODCALLTYPE *ServiceStart)( - IShellDispatch6* This, + IShellDispatch6 *This, BSTR ServiceName, VARIANT Persistent, VARIANT *pSuccess); HRESULT (STDMETHODCALLTYPE *ServiceStop)( - IShellDispatch6* This, + IShellDispatch6 *This, BSTR ServiceName, VARIANT Persistent, VARIANT *pSuccess); HRESULT (STDMETHODCALLTYPE *IsServiceRunning)( - IShellDispatch6* This, + IShellDispatch6 *This, BSTR ServiceName, VARIANT *pRunning); HRESULT (STDMETHODCALLTYPE *CanStartStopService)( - IShellDispatch6* This, + IShellDispatch6 *This, BSTR ServiceName, VARIANT *pCanStartStop); HRESULT (STDMETHODCALLTYPE *ShowBrowserBar)( - IShellDispatch6* This, + IShellDispatch6 *This, BSTR bstrClsid, VARIANT bShow, VARIANT *pSuccess); /*** IShellDispatch3 methods ***/ HRESULT (STDMETHODCALLTYPE *AddToRecent)( - IShellDispatch6* This, + IShellDispatch6 *This, VARIANT varFile, BSTR bstrCategory); /*** IShellDispatch4 methods ***/ HRESULT (STDMETHODCALLTYPE *WindowsSecurity)( - IShellDispatch6* This); + IShellDispatch6 *This); HRESULT (STDMETHODCALLTYPE *ToggleDesktop)( - IShellDispatch6* This); + IShellDispatch6 *This); HRESULT (STDMETHODCALLTYPE *ExplorerPolicy)( - IShellDispatch6* This, + IShellDispatch6 *This, BSTR bstrPolicyName, VARIANT *pValue); HRESULT (STDMETHODCALLTYPE *GetSetting)( - IShellDispatch6* This, + IShellDispatch6 *This, LONG lSetting, VARIANT_BOOL *pResult); /*** IShellDispatch5 methods ***/ HRESULT (STDMETHODCALLTYPE *WindowSwitcher)( - IShellDispatch6* This); + IShellDispatch6 *This); /*** IShellDispatch6 methods ***/ HRESULT (STDMETHODCALLTYPE *SearchCommand)( - IShellDispatch6* This); + IShellDispatch6 *This); END_INTERFACE } IShellDispatch6Vtbl; + interface IShellDispatch6 { CONST_VTBL IShellDispatch6Vtbl* lpVtbl; }; @@ -7804,13 +6862,6 @@ static FORCEINLINE HRESULT IShellDispatch6_SearchCommand(IShellDispatch6* This) #endif -HRESULT STDMETHODCALLTYPE IShellDispatch6_SearchCommand_Proxy( - IShellDispatch6* This); -void __RPC_STUB IShellDispatch6_SearchCommand_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellDispatch6_INTERFACE_DEFINED__ */ @@ -7920,29 +6971,29 @@ typedef struct IFileSearchBandVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFileSearchBand* This, + IFileSearchBand *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFileSearchBand* This); + IFileSearchBand *This); ULONG (STDMETHODCALLTYPE *Release)( - IFileSearchBand* This); + IFileSearchBand *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFileSearchBand* This, + IFileSearchBand *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFileSearchBand* This, + IFileSearchBand *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFileSearchBand* This, + IFileSearchBand *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -7950,7 +7001,7 @@ typedef struct IFileSearchBandVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IFileSearchBand* This, + IFileSearchBand *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -7962,29 +7013,30 @@ typedef struct IFileSearchBandVtbl { /*** IFileSearchBand methods ***/ HRESULT (STDMETHODCALLTYPE *SetFocus)( - IFileSearchBand* This); + IFileSearchBand *This); HRESULT (STDMETHODCALLTYPE *SetSearchParameters)( - IFileSearchBand* This, + IFileSearchBand *This, BSTR *pbstrSearchID, VARIANT_BOOL bNavToResults, VARIANT *pvarScope, VARIANT *pvarQueryFile); HRESULT (STDMETHODCALLTYPE *get_SearchID)( - IFileSearchBand* This, + IFileSearchBand *This, BSTR *pbstrSearchID); HRESULT (STDMETHODCALLTYPE *get_Scope)( - IFileSearchBand* This, + IFileSearchBand *This, VARIANT *pvarScope); HRESULT (STDMETHODCALLTYPE *get_QueryFile)( - IFileSearchBand* This, + IFileSearchBand *This, VARIANT *pvarFile); END_INTERFACE } IFileSearchBandVtbl; + interface IFileSearchBand { CONST_VTBL IFileSearchBandVtbl* lpVtbl; }; @@ -8051,48 +7103,6 @@ static FORCEINLINE HRESULT IFileSearchBand_get_QueryFile(IFileSearchBand* This,V #endif -HRESULT STDMETHODCALLTYPE IFileSearchBand_SetFocus_Proxy( - IFileSearchBand* This); -void __RPC_STUB IFileSearchBand_SetFocus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileSearchBand_SetSearchParameters_Proxy( - IFileSearchBand* This, - BSTR *pbstrSearchID, - VARIANT_BOOL bNavToResults, - VARIANT *pvarScope, - VARIANT *pvarQueryFile); -void __RPC_STUB IFileSearchBand_SetSearchParameters_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileSearchBand_get_SearchID_Proxy( - IFileSearchBand* This, - BSTR *pbstrSearchID); -void __RPC_STUB IFileSearchBand_get_SearchID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileSearchBand_get_Scope_Proxy( - IFileSearchBand* This, - VARIANT *pvarScope); -void __RPC_STUB IFileSearchBand_get_Scope_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileSearchBand_get_QueryFile_Proxy( - IFileSearchBand* This, - VARIANT *pvarFile); -void __RPC_STUB IFileSearchBand_get_QueryFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFileSearchBand_INTERFACE_DEFINED__ */ @@ -8162,29 +7172,29 @@ typedef struct IWebWizardHostVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWebWizardHost* This, + IWebWizardHost *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWebWizardHost* This); + IWebWizardHost *This); ULONG (STDMETHODCALLTYPE *Release)( - IWebWizardHost* This); + IWebWizardHost *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWebWizardHost* This, + IWebWizardHost *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWebWizardHost* This, + IWebWizardHost *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWebWizardHost* This, + IWebWizardHost *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -8192,7 +7202,7 @@ typedef struct IWebWizardHostVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWebWizardHost* This, + IWebWizardHost *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -8204,45 +7214,46 @@ typedef struct IWebWizardHostVtbl { /*** IWebWizardHost methods ***/ HRESULT (STDMETHODCALLTYPE *FinalBack)( - IWebWizardHost* This); + IWebWizardHost *This); HRESULT (STDMETHODCALLTYPE *FinalNext)( - IWebWizardHost* This); + IWebWizardHost *This); HRESULT (STDMETHODCALLTYPE *Cancel)( - IWebWizardHost* This); + IWebWizardHost *This); HRESULT (STDMETHODCALLTYPE *put_Caption)( - IWebWizardHost* This, + IWebWizardHost *This, BSTR bstrCaption); HRESULT (STDMETHODCALLTYPE *get_Caption)( - IWebWizardHost* This, + IWebWizardHost *This, BSTR *pbstrCaption); HRESULT (STDMETHODCALLTYPE *put_Property)( - IWebWizardHost* This, + IWebWizardHost *This, BSTR bstrPropertyName, VARIANT *pvProperty); HRESULT (STDMETHODCALLTYPE *get_Property)( - IWebWizardHost* This, + IWebWizardHost *This, BSTR bstrPropertyName, VARIANT *pvProperty); HRESULT (STDMETHODCALLTYPE *SetWizardButtons)( - IWebWizardHost* This, + IWebWizardHost *This, VARIANT_BOOL vfEnableBack, VARIANT_BOOL vfEnableNext, VARIANT_BOOL vfLastPage); HRESULT (STDMETHODCALLTYPE *SetHeaderText)( - IWebWizardHost* This, + IWebWizardHost *This, BSTR bstrHeaderTitle, BSTR bstrHeaderSubtitle); END_INTERFACE } IWebWizardHostVtbl; + interface IWebWizardHost { CONST_VTBL IWebWizardHostVtbl* lpVtbl; }; @@ -8325,80 +7336,6 @@ static FORCEINLINE HRESULT IWebWizardHost_SetHeaderText(IWebWizardHost* This,BST #endif -HRESULT STDMETHODCALLTYPE IWebWizardHost_FinalBack_Proxy( - IWebWizardHost* This); -void __RPC_STUB IWebWizardHost_FinalBack_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebWizardHost_FinalNext_Proxy( - IWebWizardHost* This); -void __RPC_STUB IWebWizardHost_FinalNext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebWizardHost_Cancel_Proxy( - IWebWizardHost* This); -void __RPC_STUB IWebWizardHost_Cancel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebWizardHost_put_Caption_Proxy( - IWebWizardHost* This, - BSTR bstrCaption); -void __RPC_STUB IWebWizardHost_put_Caption_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebWizardHost_get_Caption_Proxy( - IWebWizardHost* This, - BSTR *pbstrCaption); -void __RPC_STUB IWebWizardHost_get_Caption_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebWizardHost_put_Property_Proxy( - IWebWizardHost* This, - BSTR bstrPropertyName, - VARIANT *pvProperty); -void __RPC_STUB IWebWizardHost_put_Property_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebWizardHost_get_Property_Proxy( - IWebWizardHost* This, - BSTR bstrPropertyName, - VARIANT *pvProperty); -void __RPC_STUB IWebWizardHost_get_Property_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebWizardHost_SetWizardButtons_Proxy( - IWebWizardHost* This, - VARIANT_BOOL vfEnableBack, - VARIANT_BOOL vfEnableNext, - VARIANT_BOOL vfLastPage); -void __RPC_STUB IWebWizardHost_SetWizardButtons_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebWizardHost_SetHeaderText_Proxy( - IWebWizardHost* This, - BSTR bstrHeaderTitle, - BSTR bstrHeaderSubtitle); -void __RPC_STUB IWebWizardHost_SetHeaderText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWebWizardHost_INTERFACE_DEFINED__ */ @@ -8427,29 +7364,29 @@ typedef struct INewWDEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INewWDEvents* This, + INewWDEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INewWDEvents* This); + INewWDEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - INewWDEvents* This); + INewWDEvents *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - INewWDEvents* This, + INewWDEvents *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - INewWDEvents* This, + INewWDEvents *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - INewWDEvents* This, + INewWDEvents *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -8457,7 +7394,7 @@ typedef struct INewWDEventsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - INewWDEvents* This, + INewWDEvents *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -8469,51 +7406,52 @@ typedef struct INewWDEventsVtbl { /*** IWebWizardHost methods ***/ HRESULT (STDMETHODCALLTYPE *FinalBack)( - INewWDEvents* This); + INewWDEvents *This); HRESULT (STDMETHODCALLTYPE *FinalNext)( - INewWDEvents* This); + INewWDEvents *This); HRESULT (STDMETHODCALLTYPE *Cancel)( - INewWDEvents* This); + INewWDEvents *This); HRESULT (STDMETHODCALLTYPE *put_Caption)( - INewWDEvents* This, + INewWDEvents *This, BSTR bstrCaption); HRESULT (STDMETHODCALLTYPE *get_Caption)( - INewWDEvents* This, + INewWDEvents *This, BSTR *pbstrCaption); HRESULT (STDMETHODCALLTYPE *put_Property)( - INewWDEvents* This, + INewWDEvents *This, BSTR bstrPropertyName, VARIANT *pvProperty); HRESULT (STDMETHODCALLTYPE *get_Property)( - INewWDEvents* This, + INewWDEvents *This, BSTR bstrPropertyName, VARIANT *pvProperty); HRESULT (STDMETHODCALLTYPE *SetWizardButtons)( - INewWDEvents* This, + INewWDEvents *This, VARIANT_BOOL vfEnableBack, VARIANT_BOOL vfEnableNext, VARIANT_BOOL vfLastPage); HRESULT (STDMETHODCALLTYPE *SetHeaderText)( - INewWDEvents* This, + INewWDEvents *This, BSTR bstrHeaderTitle, BSTR bstrHeaderSubtitle); /*** INewWDEvents methods ***/ HRESULT (STDMETHODCALLTYPE *PassportAuthenticate)( - INewWDEvents* This, + INewWDEvents *This, BSTR bstrSignInUrl, VARIANT_BOOL *pvfAuthenitcated); END_INTERFACE } INewWDEventsVtbl; + interface INewWDEvents { CONST_VTBL INewWDEventsVtbl* lpVtbl; }; @@ -8602,15 +7540,6 @@ static FORCEINLINE HRESULT INewWDEvents_PassportAuthenticate(INewWDEvents* This, #endif -HRESULT STDMETHODCALLTYPE INewWDEvents_PassportAuthenticate_Proxy( - INewWDEvents* This, - BSTR bstrSignInUrl, - VARIANT_BOOL *pvfAuthenitcated); -void __RPC_STUB INewWDEvents_PassportAuthenticate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INewWDEvents_INTERFACE_DEFINED__ */ @@ -8645,30 +7574,31 @@ typedef struct IAutoCompleteVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAutoComplete* This, + IAutoComplete *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAutoComplete* This); + IAutoComplete *This); ULONG (STDMETHODCALLTYPE *Release)( - IAutoComplete* This); + IAutoComplete *This); /*** IAutoComplete methods ***/ HRESULT (STDMETHODCALLTYPE *Init)( - IAutoComplete* This, + IAutoComplete *This, HWND hwndEdit, IUnknown *punkACL, LPCWSTR pwszRegKeyPath, LPCWSTR pwszQuickComplete); HRESULT (STDMETHODCALLTYPE *Enable)( - IAutoComplete* This, + IAutoComplete *This, WINBOOL fEnable); END_INTERFACE } IAutoCompleteVtbl; + interface IAutoComplete { CONST_VTBL IAutoCompleteVtbl* lpVtbl; }; @@ -8705,25 +7635,6 @@ static FORCEINLINE HRESULT IAutoComplete_Enable(IAutoComplete* This,WINBOOL fEna #endif -HRESULT STDMETHODCALLTYPE IAutoComplete_Init_Proxy( - IAutoComplete* This, - HWND hwndEdit, - IUnknown *punkACL, - LPCWSTR pwszRegKeyPath, - LPCWSTR pwszQuickComplete); -void __RPC_STUB IAutoComplete_Init_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAutoComplete_Enable_Proxy( - IAutoComplete* This, - WINBOOL fEnable); -void __RPC_STUB IAutoComplete_Enable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAutoComplete_INTERFACE_DEFINED__ */ @@ -8767,39 +7678,40 @@ typedef struct IAutoComplete2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAutoComplete2* This, + IAutoComplete2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAutoComplete2* This); + IAutoComplete2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IAutoComplete2* This); + IAutoComplete2 *This); /*** IAutoComplete methods ***/ HRESULT (STDMETHODCALLTYPE *Init)( - IAutoComplete2* This, + IAutoComplete2 *This, HWND hwndEdit, IUnknown *punkACL, LPCWSTR pwszRegKeyPath, LPCWSTR pwszQuickComplete); HRESULT (STDMETHODCALLTYPE *Enable)( - IAutoComplete2* This, + IAutoComplete2 *This, WINBOOL fEnable); /*** IAutoComplete2 methods ***/ HRESULT (STDMETHODCALLTYPE *SetOptions)( - IAutoComplete2* This, + IAutoComplete2 *This, DWORD dwFlag); HRESULT (STDMETHODCALLTYPE *GetOptions)( - IAutoComplete2* This, + IAutoComplete2 *This, DWORD *pdwFlag); END_INTERFACE } IAutoComplete2Vtbl; + interface IAutoComplete2 { CONST_VTBL IAutoComplete2Vtbl* lpVtbl; }; @@ -8846,22 +7758,6 @@ static FORCEINLINE HRESULT IAutoComplete2_GetOptions(IAutoComplete2* This,DWORD #endif -HRESULT STDMETHODCALLTYPE IAutoComplete2_SetOptions_Proxy( - IAutoComplete2* This, - DWORD dwFlag); -void __RPC_STUB IAutoComplete2_SetOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAutoComplete2_GetOptions_Proxy( - IAutoComplete2* This, - DWORD *pdwFlag); -void __RPC_STUB IAutoComplete2_GetOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAutoComplete2_INTERFACE_DEFINED__ */ @@ -8905,51 +7801,52 @@ typedef struct IEnumACStringVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumACString* This, + IEnumACString *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumACString* This); + IEnumACString *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumACString* This); + IEnumACString *This); /*** IEnumString methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumACString* This, + IEnumACString *This, ULONG celt, LPOLESTR *rgelt, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumACString* This, + IEnumACString *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumACString* This); + IEnumACString *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumACString* This, + IEnumACString *This, IEnumString **ppenum); /*** IEnumACString methods ***/ HRESULT (STDMETHODCALLTYPE *NextItem)( - IEnumACString* This, + IEnumACString *This, LPWSTR pszUrl, ULONG cchMax, ULONG *pulSortIndex); HRESULT (STDMETHODCALLTYPE *SetEnumOptions)( - IEnumACString* This, + IEnumACString *This, DWORD dwOptions); HRESULT (STDMETHODCALLTYPE *GetEnumOptions)( - IEnumACString* This, + IEnumACString *This, DWORD *pdwOptions); END_INTERFACE } IEnumACStringVtbl; + interface IEnumACString { CONST_VTBL IEnumACStringVtbl* lpVtbl; }; @@ -9008,32 +7905,6 @@ static FORCEINLINE HRESULT IEnumACString_GetEnumOptions(IEnumACString* This,DWOR #endif -HRESULT STDMETHODCALLTYPE IEnumACString_NextItem_Proxy( - IEnumACString* This, - LPWSTR pszUrl, - ULONG cchMax, - ULONG *pulSortIndex); -void __RPC_STUB IEnumACString_NextItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumACString_SetEnumOptions_Proxy( - IEnumACString* This, - DWORD dwOptions); -void __RPC_STUB IEnumACString_SetEnumOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumACString_GetEnumOptions_Proxy( - IEnumACString* This, - DWORD *pdwOptions); -void __RPC_STUB IEnumACString_GetEnumOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumACString_INTERFACE_DEFINED__ */ @@ -9075,41 +7946,42 @@ typedef struct IDataObjectAsyncCapabilityVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDataObjectAsyncCapability* This, + IDataObjectAsyncCapability *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDataObjectAsyncCapability* This); + IDataObjectAsyncCapability *This); ULONG (STDMETHODCALLTYPE *Release)( - IDataObjectAsyncCapability* This); + IDataObjectAsyncCapability *This); /*** IDataObjectAsyncCapability methods ***/ HRESULT (STDMETHODCALLTYPE *SetAsyncMode)( - IDataObjectAsyncCapability* This, + IDataObjectAsyncCapability *This, WINBOOL fDoOpAsync); HRESULT (STDMETHODCALLTYPE *GetAsyncMode)( - IDataObjectAsyncCapability* This, + IDataObjectAsyncCapability *This, WINBOOL *pfIsOpAsync); HRESULT (STDMETHODCALLTYPE *StartOperation)( - IDataObjectAsyncCapability* This, + IDataObjectAsyncCapability *This, IBindCtx *pbcReserved); HRESULT (STDMETHODCALLTYPE *InOperation)( - IDataObjectAsyncCapability* This, + IDataObjectAsyncCapability *This, WINBOOL *pfInAsyncOp); HRESULT (STDMETHODCALLTYPE *EndOperation)( - IDataObjectAsyncCapability* This, + IDataObjectAsyncCapability *This, HRESULT hResult, IBindCtx *pbcReserved, DWORD dwEffects); END_INTERFACE } IDataObjectAsyncCapabilityVtbl; + interface IDataObjectAsyncCapability { CONST_VTBL IDataObjectAsyncCapabilityVtbl* lpVtbl; }; @@ -9158,48 +8030,6 @@ static FORCEINLINE HRESULT IDataObjectAsyncCapability_EndOperation(IDataObjectAs #endif -HRESULT STDMETHODCALLTYPE IDataObjectAsyncCapability_SetAsyncMode_Proxy( - IDataObjectAsyncCapability* This, - WINBOOL fDoOpAsync); -void __RPC_STUB IDataObjectAsyncCapability_SetAsyncMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDataObjectAsyncCapability_GetAsyncMode_Proxy( - IDataObjectAsyncCapability* This, - WINBOOL *pfIsOpAsync); -void __RPC_STUB IDataObjectAsyncCapability_GetAsyncMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDataObjectAsyncCapability_StartOperation_Proxy( - IDataObjectAsyncCapability* This, - IBindCtx *pbcReserved); -void __RPC_STUB IDataObjectAsyncCapability_StartOperation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDataObjectAsyncCapability_InOperation_Proxy( - IDataObjectAsyncCapability* This, - WINBOOL *pfInAsyncOp); -void __RPC_STUB IDataObjectAsyncCapability_InOperation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDataObjectAsyncCapability_EndOperation_Proxy( - IDataObjectAsyncCapability* This, - HRESULT hResult, - IBindCtx *pbcReserved, - DWORD dwEffects); -void __RPC_STUB IDataObjectAsyncCapability_EndOperation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDataObjectAsyncCapability_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/shlguid.h b/lib/libc/include/any-windows-any/shlguid.h index 85ca843e09..badd527f49 100644 --- a/lib/libc/include/any-windows-any/shlguid.h +++ b/lib/libc/include/any-windows-any/shlguid.h @@ -233,6 +233,7 @@ DEFINE_GUID (FMTID_DRM, 0xaeac19e4, 0x89ae, 0x4508, 0xb9, 0xb7, 0xbb, 0x86, 0x7a #define PIDVSI_STREAM_NUMBER 0x0000000b #define PSGUID_AUDIO {0x64440490, 0x4c8b, 0x11d1, 0x8b, 0x70, 0x8, 0x0, 0x36, 0xb1, 0x1a, 0x3} +DEFINE_GUID (FMTID_AudioSummaryInformation, 0x64440490, 0x4c8b, 0x11d1, 0x8b, 0x70, 0x8, 0x0, 0x36, 0xb1, 0x1a, 0x3); #define PIDASI_FORMAT 0x00000002 #define PIDASI_TIMELENGTH 0x00000003 @@ -269,6 +270,8 @@ DEFINE_GUID (FMTID_DRM, 0xaeac19e4, 0x89ae, 0x4508, 0xb9, 0xb7, 0xbb, 0x86, 0x7a DEFINE_GUID (FMTID_Volume, 0x9b174b35, 0x40ff, 0x11d2, 0xa2, 0x7e, 0x0, 0xc0, 0x4f, 0xc3, 0x8, 0x71); DEFINE_GUID (FMTID_Query, 0x49691c90, 0x7e17, 0x101a, 0xa9, 0x1c, 0x08, 0x00, 0x2b, 0x2e, 0xcd, 0xa9); +DEFINE_GUID (FMTID_MediaFileSummaryInformation, 0x64440492, 0x4c8b, 0x11d1, 0x8b, 0x70, 0x08, 0x00, 0x36, 0xb1, 0x1a, 0x03); +DEFINE_GUID (FMTID_ImageSummaryInformation, 0x6444048f, 0x4c8b, 0x11d1, 0x8b, 0x70, 0x8, 0x00, 0x36, 0xb1, 0x1a, 0x03); DEFINE_GUID (CLSID_HWShellExecute, 0xffb8655f, 0x81b9, 0x4fce, 0xb8, 0x9c, 0x9a, 0x6b, 0xa7, 0x6d, 0x13, 0xe7); DEFINE_GUID (CLSID_DragDropHelper, 0x4657278a, 0x411b, 0x11d2, 0x83, 0x9a, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); DEFINE_GUID (CLSID_CAnchorBrowsePropertyPage, 0x3050f3bb, 0x98b5, 0x11cf, 0xbb, 0x82, 0x00, 0xaa, 0x00, 0xbd, 0xce, 0x0b); diff --git a/lib/libc/include/any-windows-any/shobjidl.h b/lib/libc/include/any-windows-any/shobjidl.h index b0ea2e9082..7c60452a91 100644 --- a/lib/libc/include/any-windows-any/shobjidl.h +++ b/lib/libc/include/any-windows-any/shobjidl.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/shobjidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/shobjidl.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,1011 +21,1617 @@ #ifndef __IContextMenu_FWD_DEFINED__ #define __IContextMenu_FWD_DEFINED__ typedef interface IContextMenu IContextMenu; +#ifdef __cplusplus +interface IContextMenu; +#endif /* __cplusplus */ #endif #ifndef __IContextMenu2_FWD_DEFINED__ #define __IContextMenu2_FWD_DEFINED__ typedef interface IContextMenu2 IContextMenu2; +#ifdef __cplusplus +interface IContextMenu2; +#endif /* __cplusplus */ #endif #ifndef __IContextMenu3_FWD_DEFINED__ #define __IContextMenu3_FWD_DEFINED__ typedef interface IContextMenu3 IContextMenu3; +#ifdef __cplusplus +interface IContextMenu3; +#endif /* __cplusplus */ #endif #ifndef __IExecuteCommand_FWD_DEFINED__ #define __IExecuteCommand_FWD_DEFINED__ typedef interface IExecuteCommand IExecuteCommand; +#ifdef __cplusplus +interface IExecuteCommand; +#endif /* __cplusplus */ #endif #ifndef __IPersistFolder_FWD_DEFINED__ #define __IPersistFolder_FWD_DEFINED__ typedef interface IPersistFolder IPersistFolder; +#ifdef __cplusplus +interface IPersistFolder; +#endif /* __cplusplus */ #endif #ifndef __IRunnableTask_FWD_DEFINED__ #define __IRunnableTask_FWD_DEFINED__ typedef interface IRunnableTask IRunnableTask; +#ifdef __cplusplus +interface IRunnableTask; +#endif /* __cplusplus */ #endif #ifndef __IShellTaskScheduler_FWD_DEFINED__ #define __IShellTaskScheduler_FWD_DEFINED__ typedef interface IShellTaskScheduler IShellTaskScheduler; +#ifdef __cplusplus +interface IShellTaskScheduler; +#endif /* __cplusplus */ #endif #ifndef __IQueryCodePage_FWD_DEFINED__ #define __IQueryCodePage_FWD_DEFINED__ typedef interface IQueryCodePage IQueryCodePage; +#ifdef __cplusplus +interface IQueryCodePage; +#endif /* __cplusplus */ #endif #ifndef __IPersistFolder2_FWD_DEFINED__ #define __IPersistFolder2_FWD_DEFINED__ typedef interface IPersistFolder2 IPersistFolder2; +#ifdef __cplusplus +interface IPersistFolder2; +#endif /* __cplusplus */ #endif #ifndef __IPersistFolder3_FWD_DEFINED__ #define __IPersistFolder3_FWD_DEFINED__ typedef interface IPersistFolder3 IPersistFolder3; +#ifdef __cplusplus +interface IPersistFolder3; +#endif /* __cplusplus */ #endif #ifndef __IPersistIDList_FWD_DEFINED__ #define __IPersistIDList_FWD_DEFINED__ typedef interface IPersistIDList IPersistIDList; +#ifdef __cplusplus +interface IPersistIDList; +#endif /* __cplusplus */ #endif #ifndef __IEnumIDList_FWD_DEFINED__ #define __IEnumIDList_FWD_DEFINED__ typedef interface IEnumIDList IEnumIDList; +#ifdef __cplusplus +interface IEnumIDList; +#endif /* __cplusplus */ #endif #ifndef __IEnumFullIDList_FWD_DEFINED__ #define __IEnumFullIDList_FWD_DEFINED__ typedef interface IEnumFullIDList IEnumFullIDList; +#ifdef __cplusplus +interface IEnumFullIDList; +#endif /* __cplusplus */ #endif #ifndef __IObjectWithFolderEnumMode_FWD_DEFINED__ #define __IObjectWithFolderEnumMode_FWD_DEFINED__ typedef interface IObjectWithFolderEnumMode IObjectWithFolderEnumMode; +#ifdef __cplusplus +interface IObjectWithFolderEnumMode; +#endif /* __cplusplus */ #endif #ifndef __IParseAndCreateItem_FWD_DEFINED__ #define __IParseAndCreateItem_FWD_DEFINED__ typedef interface IParseAndCreateItem IParseAndCreateItem; +#ifdef __cplusplus +interface IParseAndCreateItem; +#endif /* __cplusplus */ #endif #ifndef __IShellFolder_FWD_DEFINED__ #define __IShellFolder_FWD_DEFINED__ typedef interface IShellFolder IShellFolder; +#ifdef __cplusplus +interface IShellFolder; +#endif /* __cplusplus */ #endif #ifndef __IEnumExtraSearch_FWD_DEFINED__ #define __IEnumExtraSearch_FWD_DEFINED__ typedef interface IEnumExtraSearch IEnumExtraSearch; +#ifdef __cplusplus +interface IEnumExtraSearch; +#endif /* __cplusplus */ #endif #ifndef __IShellFolder2_FWD_DEFINED__ #define __IShellFolder2_FWD_DEFINED__ typedef interface IShellFolder2 IShellFolder2; +#ifdef __cplusplus +interface IShellFolder2; +#endif /* __cplusplus */ #endif #ifndef __IFolderViewOptions_FWD_DEFINED__ #define __IFolderViewOptions_FWD_DEFINED__ typedef interface IFolderViewOptions IFolderViewOptions; +#ifdef __cplusplus +interface IFolderViewOptions; +#endif /* __cplusplus */ #endif #ifndef __IShellView_FWD_DEFINED__ #define __IShellView_FWD_DEFINED__ typedef interface IShellView IShellView; +#ifdef __cplusplus +interface IShellView; +#endif /* __cplusplus */ #endif #ifndef __IShellView2_FWD_DEFINED__ #define __IShellView2_FWD_DEFINED__ typedef interface IShellView2 IShellView2; +#ifdef __cplusplus +interface IShellView2; +#endif /* __cplusplus */ #endif #ifndef __IShellView3_FWD_DEFINED__ #define __IShellView3_FWD_DEFINED__ typedef interface IShellView3 IShellView3; +#ifdef __cplusplus +interface IShellView3; +#endif /* __cplusplus */ #endif #ifndef __IFolderView_FWD_DEFINED__ #define __IFolderView_FWD_DEFINED__ typedef interface IFolderView IFolderView; +#ifdef __cplusplus +interface IFolderView; +#endif /* __cplusplus */ #endif #ifndef __ISearchBoxInfo_FWD_DEFINED__ #define __ISearchBoxInfo_FWD_DEFINED__ typedef interface ISearchBoxInfo ISearchBoxInfo; +#ifdef __cplusplus +interface ISearchBoxInfo; +#endif /* __cplusplus */ #endif #ifndef __IFolderView2_FWD_DEFINED__ #define __IFolderView2_FWD_DEFINED__ typedef interface IFolderView2 IFolderView2; +#ifdef __cplusplus +interface IFolderView2; +#endif /* __cplusplus */ #endif #ifndef __IFolderViewSettings_FWD_DEFINED__ #define __IFolderViewSettings_FWD_DEFINED__ typedef interface IFolderViewSettings IFolderViewSettings; +#ifdef __cplusplus +interface IFolderViewSettings; +#endif /* __cplusplus */ #endif #ifndef __IPreviewHandlerVisuals_FWD_DEFINED__ #define __IPreviewHandlerVisuals_FWD_DEFINED__ typedef interface IPreviewHandlerVisuals IPreviewHandlerVisuals; +#ifdef __cplusplus +interface IPreviewHandlerVisuals; +#endif /* __cplusplus */ #endif #ifndef __IVisualProperties_FWD_DEFINED__ #define __IVisualProperties_FWD_DEFINED__ typedef interface IVisualProperties IVisualProperties; +#ifdef __cplusplus +interface IVisualProperties; +#endif /* __cplusplus */ #endif #ifndef __ICommDlgBrowser_FWD_DEFINED__ #define __ICommDlgBrowser_FWD_DEFINED__ typedef interface ICommDlgBrowser ICommDlgBrowser; +#ifdef __cplusplus +interface ICommDlgBrowser; +#endif /* __cplusplus */ #endif #ifndef __ICommDlgBrowser2_FWD_DEFINED__ #define __ICommDlgBrowser2_FWD_DEFINED__ typedef interface ICommDlgBrowser2 ICommDlgBrowser2; +#ifdef __cplusplus +interface ICommDlgBrowser2; +#endif /* __cplusplus */ #endif #ifndef __ICommDlgBrowser3_FWD_DEFINED__ #define __ICommDlgBrowser3_FWD_DEFINED__ typedef interface ICommDlgBrowser3 ICommDlgBrowser3; +#ifdef __cplusplus +interface ICommDlgBrowser3; +#endif /* __cplusplus */ #endif #ifndef __IColumnManager_FWD_DEFINED__ #define __IColumnManager_FWD_DEFINED__ typedef interface IColumnManager IColumnManager; +#ifdef __cplusplus +interface IColumnManager; +#endif /* __cplusplus */ #endif #ifndef __IFolderFilterSite_FWD_DEFINED__ #define __IFolderFilterSite_FWD_DEFINED__ typedef interface IFolderFilterSite IFolderFilterSite; +#ifdef __cplusplus +interface IFolderFilterSite; +#endif /* __cplusplus */ #endif #ifndef __IFolderFilter_FWD_DEFINED__ #define __IFolderFilter_FWD_DEFINED__ typedef interface IFolderFilter IFolderFilter; +#ifdef __cplusplus +interface IFolderFilter; +#endif /* __cplusplus */ #endif #ifndef __IInputObjectSite_FWD_DEFINED__ #define __IInputObjectSite_FWD_DEFINED__ typedef interface IInputObjectSite IInputObjectSite; +#ifdef __cplusplus +interface IInputObjectSite; +#endif /* __cplusplus */ #endif #ifndef __IInputObject_FWD_DEFINED__ #define __IInputObject_FWD_DEFINED__ typedef interface IInputObject IInputObject; +#ifdef __cplusplus +interface IInputObject; +#endif /* __cplusplus */ #endif #ifndef __IInputObject2_FWD_DEFINED__ #define __IInputObject2_FWD_DEFINED__ typedef interface IInputObject2 IInputObject2; +#ifdef __cplusplus +interface IInputObject2; +#endif /* __cplusplus */ #endif #ifndef __IShellIcon_FWD_DEFINED__ #define __IShellIcon_FWD_DEFINED__ typedef interface IShellIcon IShellIcon; +#ifdef __cplusplus +interface IShellIcon; +#endif /* __cplusplus */ #endif #ifndef __IShellBrowser_FWD_DEFINED__ #define __IShellBrowser_FWD_DEFINED__ typedef interface IShellBrowser IShellBrowser; +#ifdef __cplusplus +interface IShellBrowser; +#endif /* __cplusplus */ #endif #ifndef __IProfferService_FWD_DEFINED__ #define __IProfferService_FWD_DEFINED__ typedef interface IProfferService IProfferService; +#ifdef __cplusplus +interface IProfferService; +#endif /* __cplusplus */ #endif #ifndef __IShellItem_FWD_DEFINED__ #define __IShellItem_FWD_DEFINED__ typedef interface IShellItem IShellItem; +#ifdef __cplusplus +interface IShellItem; +#endif /* __cplusplus */ #endif #ifndef __IShellItem2_FWD_DEFINED__ #define __IShellItem2_FWD_DEFINED__ typedef interface IShellItem2 IShellItem2; +#ifdef __cplusplus +interface IShellItem2; +#endif /* __cplusplus */ #endif #ifndef __IShellItemImageFactory_FWD_DEFINED__ #define __IShellItemImageFactory_FWD_DEFINED__ typedef interface IShellItemImageFactory IShellItemImageFactory; +#ifdef __cplusplus +interface IShellItemImageFactory; +#endif /* __cplusplus */ #endif #ifndef __IUserAccountChangeCallback_FWD_DEFINED__ #define __IUserAccountChangeCallback_FWD_DEFINED__ typedef interface IUserAccountChangeCallback IUserAccountChangeCallback; +#ifdef __cplusplus +interface IUserAccountChangeCallback; +#endif /* __cplusplus */ #endif #ifndef __IEnumShellItems_FWD_DEFINED__ #define __IEnumShellItems_FWD_DEFINED__ typedef interface IEnumShellItems IEnumShellItems; +#ifdef __cplusplus +interface IEnumShellItems; +#endif /* __cplusplus */ #endif #ifndef __ITransferAdviseSink_FWD_DEFINED__ #define __ITransferAdviseSink_FWD_DEFINED__ typedef interface ITransferAdviseSink ITransferAdviseSink; +#ifdef __cplusplus +interface ITransferAdviseSink; +#endif /* __cplusplus */ #endif #ifndef __ITransferSource_FWD_DEFINED__ #define __ITransferSource_FWD_DEFINED__ typedef interface ITransferSource ITransferSource; +#ifdef __cplusplus +interface ITransferSource; +#endif /* __cplusplus */ #endif #ifndef __IEnumResources_FWD_DEFINED__ #define __IEnumResources_FWD_DEFINED__ typedef interface IEnumResources IEnumResources; +#ifdef __cplusplus +interface IEnumResources; +#endif /* __cplusplus */ #endif #ifndef __IShellItemResources_FWD_DEFINED__ #define __IShellItemResources_FWD_DEFINED__ typedef interface IShellItemResources IShellItemResources; +#ifdef __cplusplus +interface IShellItemResources; +#endif /* __cplusplus */ #endif #ifndef __ITransferDestination_FWD_DEFINED__ #define __ITransferDestination_FWD_DEFINED__ typedef interface ITransferDestination ITransferDestination; +#ifdef __cplusplus +interface ITransferDestination; +#endif /* __cplusplus */ #endif #ifndef __IStreamAsync_FWD_DEFINED__ #define __IStreamAsync_FWD_DEFINED__ typedef interface IStreamAsync IStreamAsync; +#ifdef __cplusplus +interface IStreamAsync; +#endif /* __cplusplus */ #endif #ifndef __IStreamUnbufferedInfo_FWD_DEFINED__ #define __IStreamUnbufferedInfo_FWD_DEFINED__ typedef interface IStreamUnbufferedInfo IStreamUnbufferedInfo; +#ifdef __cplusplus +interface IStreamUnbufferedInfo; +#endif /* __cplusplus */ #endif #ifndef __IFileOperationProgressSink_FWD_DEFINED__ #define __IFileOperationProgressSink_FWD_DEFINED__ typedef interface IFileOperationProgressSink IFileOperationProgressSink; +#ifdef __cplusplus +interface IFileOperationProgressSink; +#endif /* __cplusplus */ #endif #ifndef __IShellItemArray_FWD_DEFINED__ #define __IShellItemArray_FWD_DEFINED__ typedef interface IShellItemArray IShellItemArray; +#ifdef __cplusplus +interface IShellItemArray; +#endif /* __cplusplus */ #endif #ifndef __IInitializeWithItem_FWD_DEFINED__ #define __IInitializeWithItem_FWD_DEFINED__ typedef interface IInitializeWithItem IInitializeWithItem; +#ifdef __cplusplus +interface IInitializeWithItem; +#endif /* __cplusplus */ #endif #ifndef __IObjectWithSelection_FWD_DEFINED__ #define __IObjectWithSelection_FWD_DEFINED__ typedef interface IObjectWithSelection IObjectWithSelection; +#ifdef __cplusplus +interface IObjectWithSelection; +#endif /* __cplusplus */ #endif #ifndef __IObjectWithBackReferences_FWD_DEFINED__ #define __IObjectWithBackReferences_FWD_DEFINED__ typedef interface IObjectWithBackReferences IObjectWithBackReferences; +#ifdef __cplusplus +interface IObjectWithBackReferences; +#endif /* __cplusplus */ #endif #ifndef __IPropertyUI_FWD_DEFINED__ #define __IPropertyUI_FWD_DEFINED__ typedef interface IPropertyUI IPropertyUI; +#ifdef __cplusplus +interface IPropertyUI; +#endif /* __cplusplus */ #endif #ifndef __ICategoryProvider_FWD_DEFINED__ #define __ICategoryProvider_FWD_DEFINED__ typedef interface ICategoryProvider ICategoryProvider; +#ifdef __cplusplus +interface ICategoryProvider; +#endif /* __cplusplus */ #endif #ifndef __ICategorizer_FWD_DEFINED__ #define __ICategorizer_FWD_DEFINED__ typedef interface ICategorizer ICategorizer; +#ifdef __cplusplus +interface ICategorizer; +#endif /* __cplusplus */ #endif #ifndef __IDropTargetHelper_FWD_DEFINED__ #define __IDropTargetHelper_FWD_DEFINED__ typedef interface IDropTargetHelper IDropTargetHelper; +#ifdef __cplusplus +interface IDropTargetHelper; +#endif /* __cplusplus */ #endif #ifndef __IDragSourceHelper_FWD_DEFINED__ #define __IDragSourceHelper_FWD_DEFINED__ typedef interface IDragSourceHelper IDragSourceHelper; +#ifdef __cplusplus +interface IDragSourceHelper; +#endif /* __cplusplus */ #endif #ifndef __IDragSourceHelper2_FWD_DEFINED__ #define __IDragSourceHelper2_FWD_DEFINED__ typedef interface IDragSourceHelper2 IDragSourceHelper2; +#ifdef __cplusplus +interface IDragSourceHelper2; +#endif /* __cplusplus */ #endif #ifndef __IShellLinkA_FWD_DEFINED__ #define __IShellLinkA_FWD_DEFINED__ typedef interface IShellLinkA IShellLinkA; +#ifdef __cplusplus +interface IShellLinkA; +#endif /* __cplusplus */ #endif #ifndef __IShellLinkW_FWD_DEFINED__ #define __IShellLinkW_FWD_DEFINED__ typedef interface IShellLinkW IShellLinkW; +#ifdef __cplusplus +interface IShellLinkW; +#endif /* __cplusplus */ #endif #ifndef __IShellLinkDataList_FWD_DEFINED__ #define __IShellLinkDataList_FWD_DEFINED__ typedef interface IShellLinkDataList IShellLinkDataList; +#ifdef __cplusplus +interface IShellLinkDataList; +#endif /* __cplusplus */ #endif #ifndef __IResolveShellLink_FWD_DEFINED__ #define __IResolveShellLink_FWD_DEFINED__ typedef interface IResolveShellLink IResolveShellLink; +#ifdef __cplusplus +interface IResolveShellLink; +#endif /* __cplusplus */ #endif #ifndef __IActionProgressDialog_FWD_DEFINED__ #define __IActionProgressDialog_FWD_DEFINED__ typedef interface IActionProgressDialog IActionProgressDialog; +#ifdef __cplusplus +interface IActionProgressDialog; +#endif /* __cplusplus */ #endif #ifndef __IHWEventHandler_FWD_DEFINED__ #define __IHWEventHandler_FWD_DEFINED__ typedef interface IHWEventHandler IHWEventHandler; +#ifdef __cplusplus +interface IHWEventHandler; +#endif /* __cplusplus */ #endif #ifndef __IHWEventHandler2_FWD_DEFINED__ #define __IHWEventHandler2_FWD_DEFINED__ typedef interface IHWEventHandler2 IHWEventHandler2; +#ifdef __cplusplus +interface IHWEventHandler2; +#endif /* __cplusplus */ #endif #ifndef __IQueryCancelAutoPlay_FWD_DEFINED__ #define __IQueryCancelAutoPlay_FWD_DEFINED__ typedef interface IQueryCancelAutoPlay IQueryCancelAutoPlay; +#ifdef __cplusplus +interface IQueryCancelAutoPlay; +#endif /* __cplusplus */ #endif #ifndef __IDynamicHWHandler_FWD_DEFINED__ #define __IDynamicHWHandler_FWD_DEFINED__ typedef interface IDynamicHWHandler IDynamicHWHandler; +#ifdef __cplusplus +interface IDynamicHWHandler; +#endif /* __cplusplus */ #endif #ifndef __IActionProgress_FWD_DEFINED__ #define __IActionProgress_FWD_DEFINED__ typedef interface IActionProgress IActionProgress; +#ifdef __cplusplus +interface IActionProgress; +#endif /* __cplusplus */ #endif #ifndef __IShellExtInit_FWD_DEFINED__ #define __IShellExtInit_FWD_DEFINED__ typedef interface IShellExtInit IShellExtInit; +#ifdef __cplusplus +interface IShellExtInit; +#endif /* __cplusplus */ #endif #ifndef __IShellPropSheetExt_FWD_DEFINED__ #define __IShellPropSheetExt_FWD_DEFINED__ typedef interface IShellPropSheetExt IShellPropSheetExt; +#ifdef __cplusplus +interface IShellPropSheetExt; +#endif /* __cplusplus */ #endif #ifndef __IRemoteComputer_FWD_DEFINED__ #define __IRemoteComputer_FWD_DEFINED__ typedef interface IRemoteComputer IRemoteComputer; +#ifdef __cplusplus +interface IRemoteComputer; +#endif /* __cplusplus */ #endif #ifndef __IQueryContinue_FWD_DEFINED__ #define __IQueryContinue_FWD_DEFINED__ typedef interface IQueryContinue IQueryContinue; +#ifdef __cplusplus +interface IQueryContinue; +#endif /* __cplusplus */ #endif #ifndef __IObjectWithCancelEvent_FWD_DEFINED__ #define __IObjectWithCancelEvent_FWD_DEFINED__ typedef interface IObjectWithCancelEvent IObjectWithCancelEvent; +#ifdef __cplusplus +interface IObjectWithCancelEvent; +#endif /* __cplusplus */ #endif #ifndef __IUserNotification_FWD_DEFINED__ #define __IUserNotification_FWD_DEFINED__ typedef interface IUserNotification IUserNotification; +#ifdef __cplusplus +interface IUserNotification; +#endif /* __cplusplus */ #endif #ifndef __IUserNotificationCallback_FWD_DEFINED__ #define __IUserNotificationCallback_FWD_DEFINED__ typedef interface IUserNotificationCallback IUserNotificationCallback; +#ifdef __cplusplus +interface IUserNotificationCallback; +#endif /* __cplusplus */ #endif #ifndef __IUserNotification2_FWD_DEFINED__ #define __IUserNotification2_FWD_DEFINED__ typedef interface IUserNotification2 IUserNotification2; +#ifdef __cplusplus +interface IUserNotification2; +#endif /* __cplusplus */ #endif #ifndef __IItemNameLimits_FWD_DEFINED__ #define __IItemNameLimits_FWD_DEFINED__ typedef interface IItemNameLimits IItemNameLimits; +#ifdef __cplusplus +interface IItemNameLimits; +#endif /* __cplusplus */ #endif #ifndef __ISearchFolderItemFactory_FWD_DEFINED__ #define __ISearchFolderItemFactory_FWD_DEFINED__ typedef interface ISearchFolderItemFactory ISearchFolderItemFactory; +#ifdef __cplusplus +interface ISearchFolderItemFactory; +#endif /* __cplusplus */ #endif #ifndef __IExtractImage_FWD_DEFINED__ #define __IExtractImage_FWD_DEFINED__ typedef interface IExtractImage IExtractImage; +#ifdef __cplusplus +interface IExtractImage; +#endif /* __cplusplus */ #endif #ifndef __IExtractImage2_FWD_DEFINED__ #define __IExtractImage2_FWD_DEFINED__ typedef interface IExtractImage2 IExtractImage2; +#ifdef __cplusplus +interface IExtractImage2; +#endif /* __cplusplus */ #endif #ifndef __IThumbnailHandlerFactory_FWD_DEFINED__ #define __IThumbnailHandlerFactory_FWD_DEFINED__ typedef interface IThumbnailHandlerFactory IThumbnailHandlerFactory; +#ifdef __cplusplus +interface IThumbnailHandlerFactory; +#endif /* __cplusplus */ #endif #ifndef __IParentAndItem_FWD_DEFINED__ #define __IParentAndItem_FWD_DEFINED__ typedef interface IParentAndItem IParentAndItem; +#ifdef __cplusplus +interface IParentAndItem; +#endif /* __cplusplus */ #endif #ifndef __IDockingWindow_FWD_DEFINED__ #define __IDockingWindow_FWD_DEFINED__ typedef interface IDockingWindow IDockingWindow; +#ifdef __cplusplus +interface IDockingWindow; +#endif /* __cplusplus */ #endif #ifndef __IDeskBand_FWD_DEFINED__ #define __IDeskBand_FWD_DEFINED__ typedef interface IDeskBand IDeskBand; +#ifdef __cplusplus +interface IDeskBand; +#endif /* __cplusplus */ #endif #ifndef __IDeskBandInfo_FWD_DEFINED__ #define __IDeskBandInfo_FWD_DEFINED__ typedef interface IDeskBandInfo IDeskBandInfo; +#ifdef __cplusplus +interface IDeskBandInfo; +#endif /* __cplusplus */ #endif #ifndef __IDeskBand2_FWD_DEFINED__ #define __IDeskBand2_FWD_DEFINED__ typedef interface IDeskBand2 IDeskBand2; +#ifdef __cplusplus +interface IDeskBand2; +#endif /* __cplusplus */ #endif #ifndef __ITaskbarList_FWD_DEFINED__ #define __ITaskbarList_FWD_DEFINED__ typedef interface ITaskbarList ITaskbarList; +#ifdef __cplusplus +interface ITaskbarList; +#endif /* __cplusplus */ #endif #ifndef __ITaskbarList2_FWD_DEFINED__ #define __ITaskbarList2_FWD_DEFINED__ typedef interface ITaskbarList2 ITaskbarList2; +#ifdef __cplusplus +interface ITaskbarList2; +#endif /* __cplusplus */ #endif #ifndef __ITaskbarList3_FWD_DEFINED__ #define __ITaskbarList3_FWD_DEFINED__ typedef interface ITaskbarList3 ITaskbarList3; +#ifdef __cplusplus +interface ITaskbarList3; +#endif /* __cplusplus */ #endif #ifndef __ITaskbarList4_FWD_DEFINED__ #define __ITaskbarList4_FWD_DEFINED__ typedef interface ITaskbarList4 ITaskbarList4; +#ifdef __cplusplus +interface ITaskbarList4; +#endif /* __cplusplus */ #endif #ifndef __IStartMenuPinnedList_FWD_DEFINED__ #define __IStartMenuPinnedList_FWD_DEFINED__ typedef interface IStartMenuPinnedList IStartMenuPinnedList; +#ifdef __cplusplus +interface IStartMenuPinnedList; +#endif /* __cplusplus */ #endif #ifndef __ICDBurn_FWD_DEFINED__ #define __ICDBurn_FWD_DEFINED__ typedef interface ICDBurn ICDBurn; +#ifdef __cplusplus +interface ICDBurn; +#endif /* __cplusplus */ #endif #ifndef __IWizardSite_FWD_DEFINED__ #define __IWizardSite_FWD_DEFINED__ typedef interface IWizardSite IWizardSite; +#ifdef __cplusplus +interface IWizardSite; +#endif /* __cplusplus */ #endif #ifndef __IWizardExtension_FWD_DEFINED__ #define __IWizardExtension_FWD_DEFINED__ typedef interface IWizardExtension IWizardExtension; +#ifdef __cplusplus +interface IWizardExtension; +#endif /* __cplusplus */ #endif #ifndef __IWebWizardExtension_FWD_DEFINED__ #define __IWebWizardExtension_FWD_DEFINED__ typedef interface IWebWizardExtension IWebWizardExtension; +#ifdef __cplusplus +interface IWebWizardExtension; +#endif /* __cplusplus */ #endif #ifndef __IPublishingWizard_FWD_DEFINED__ #define __IPublishingWizard_FWD_DEFINED__ typedef interface IPublishingWizard IPublishingWizard; +#ifdef __cplusplus +interface IPublishingWizard; +#endif /* __cplusplus */ #endif #ifndef __IFolderViewHost_FWD_DEFINED__ #define __IFolderViewHost_FWD_DEFINED__ typedef interface IFolderViewHost IFolderViewHost; +#ifdef __cplusplus +interface IFolderViewHost; +#endif /* __cplusplus */ #endif #ifndef __IExplorerBrowserEvents_FWD_DEFINED__ #define __IExplorerBrowserEvents_FWD_DEFINED__ typedef interface IExplorerBrowserEvents IExplorerBrowserEvents; +#ifdef __cplusplus +interface IExplorerBrowserEvents; +#endif /* __cplusplus */ #endif #ifndef __IExplorerBrowser_FWD_DEFINED__ #define __IExplorerBrowser_FWD_DEFINED__ typedef interface IExplorerBrowser IExplorerBrowser; +#ifdef __cplusplus +interface IExplorerBrowser; +#endif /* __cplusplus */ #endif #ifndef __IAccessibleObject_FWD_DEFINED__ #define __IAccessibleObject_FWD_DEFINED__ typedef interface IAccessibleObject IAccessibleObject; +#ifdef __cplusplus +interface IAccessibleObject; +#endif /* __cplusplus */ #endif #ifndef __IResultsFolder_FWD_DEFINED__ #define __IResultsFolder_FWD_DEFINED__ typedef interface IResultsFolder IResultsFolder; +#ifdef __cplusplus +interface IResultsFolder; +#endif /* __cplusplus */ #endif #ifndef __IEnumObjects_FWD_DEFINED__ #define __IEnumObjects_FWD_DEFINED__ typedef interface IEnumObjects IEnumObjects; +#ifdef __cplusplus +interface IEnumObjects; +#endif /* __cplusplus */ #endif #ifndef __IOperationsProgressDialog_FWD_DEFINED__ #define __IOperationsProgressDialog_FWD_DEFINED__ typedef interface IOperationsProgressDialog IOperationsProgressDialog; +#ifdef __cplusplus +interface IOperationsProgressDialog; +#endif /* __cplusplus */ #endif #ifndef __IIOCancelInformation_FWD_DEFINED__ #define __IIOCancelInformation_FWD_DEFINED__ typedef interface IIOCancelInformation IIOCancelInformation; +#ifdef __cplusplus +interface IIOCancelInformation; +#endif /* __cplusplus */ #endif #ifndef __IFileOperation_FWD_DEFINED__ #define __IFileOperation_FWD_DEFINED__ typedef interface IFileOperation IFileOperation; +#ifdef __cplusplus +interface IFileOperation; +#endif /* __cplusplus */ #endif #ifndef __IObjectProvider_FWD_DEFINED__ #define __IObjectProvider_FWD_DEFINED__ typedef interface IObjectProvider IObjectProvider; +#ifdef __cplusplus +interface IObjectProvider; +#endif /* __cplusplus */ #endif #ifndef __INamespaceWalkCB_FWD_DEFINED__ #define __INamespaceWalkCB_FWD_DEFINED__ typedef interface INamespaceWalkCB INamespaceWalkCB; +#ifdef __cplusplus +interface INamespaceWalkCB; +#endif /* __cplusplus */ #endif #ifndef __INamespaceWalkCB2_FWD_DEFINED__ #define __INamespaceWalkCB2_FWD_DEFINED__ typedef interface INamespaceWalkCB2 INamespaceWalkCB2; +#ifdef __cplusplus +interface INamespaceWalkCB2; +#endif /* __cplusplus */ #endif #ifndef __INamespaceWalk_FWD_DEFINED__ #define __INamespaceWalk_FWD_DEFINED__ typedef interface INamespaceWalk INamespaceWalk; +#ifdef __cplusplus +interface INamespaceWalk; +#endif /* __cplusplus */ #endif #ifndef __IAutoCompleteDropDown_FWD_DEFINED__ #define __IAutoCompleteDropDown_FWD_DEFINED__ typedef interface IAutoCompleteDropDown IAutoCompleteDropDown; +#ifdef __cplusplus +interface IAutoCompleteDropDown; +#endif /* __cplusplus */ #endif #ifndef __IBandSite_FWD_DEFINED__ #define __IBandSite_FWD_DEFINED__ typedef interface IBandSite IBandSite; +#ifdef __cplusplus +interface IBandSite; +#endif /* __cplusplus */ #endif #ifndef __IModalWindow_FWD_DEFINED__ #define __IModalWindow_FWD_DEFINED__ typedef interface IModalWindow IModalWindow; +#ifdef __cplusplus +interface IModalWindow; +#endif /* __cplusplus */ #endif #ifndef __ICDBurnExt_FWD_DEFINED__ #define __ICDBurnExt_FWD_DEFINED__ typedef interface ICDBurnExt ICDBurnExt; +#ifdef __cplusplus +interface ICDBurnExt; +#endif /* __cplusplus */ #endif #ifndef __IContextMenuSite_FWD_DEFINED__ #define __IContextMenuSite_FWD_DEFINED__ typedef interface IContextMenuSite IContextMenuSite; +#ifdef __cplusplus +interface IContextMenuSite; +#endif /* __cplusplus */ #endif #ifndef __IEnumReadyCallback_FWD_DEFINED__ #define __IEnumReadyCallback_FWD_DEFINED__ typedef interface IEnumReadyCallback IEnumReadyCallback; +#ifdef __cplusplus +interface IEnumReadyCallback; +#endif /* __cplusplus */ #endif #ifndef __IEnumerableView_FWD_DEFINED__ #define __IEnumerableView_FWD_DEFINED__ typedef interface IEnumerableView IEnumerableView; +#ifdef __cplusplus +interface IEnumerableView; +#endif /* __cplusplus */ #endif #ifndef __IInsertItem_FWD_DEFINED__ #define __IInsertItem_FWD_DEFINED__ typedef interface IInsertItem IInsertItem; +#ifdef __cplusplus +interface IInsertItem; +#endif /* __cplusplus */ #endif #ifndef __IMenuBand_FWD_DEFINED__ #define __IMenuBand_FWD_DEFINED__ typedef interface IMenuBand IMenuBand; +#ifdef __cplusplus +interface IMenuBand; +#endif /* __cplusplus */ #endif #ifndef __IFolderBandPriv_FWD_DEFINED__ #define __IFolderBandPriv_FWD_DEFINED__ typedef interface IFolderBandPriv IFolderBandPriv; +#ifdef __cplusplus +interface IFolderBandPriv; +#endif /* __cplusplus */ #endif #ifndef __IRegTreeItem_FWD_DEFINED__ #define __IRegTreeItem_FWD_DEFINED__ typedef interface IRegTreeItem IRegTreeItem; +#ifdef __cplusplus +interface IRegTreeItem; +#endif /* __cplusplus */ #endif #ifndef __IImageRecompress_FWD_DEFINED__ #define __IImageRecompress_FWD_DEFINED__ typedef interface IImageRecompress IImageRecompress; +#ifdef __cplusplus +interface IImageRecompress; +#endif /* __cplusplus */ #endif #ifndef __IDeskBar_FWD_DEFINED__ #define __IDeskBar_FWD_DEFINED__ typedef interface IDeskBar IDeskBar; +#ifdef __cplusplus +interface IDeskBar; +#endif /* __cplusplus */ #endif #ifndef __IMenuPopup_FWD_DEFINED__ #define __IMenuPopup_FWD_DEFINED__ typedef interface IMenuPopup IMenuPopup; +#ifdef __cplusplus +interface IMenuPopup; +#endif /* __cplusplus */ #endif #ifndef __IFileIsInUse_FWD_DEFINED__ #define __IFileIsInUse_FWD_DEFINED__ typedef interface IFileIsInUse IFileIsInUse; +#ifdef __cplusplus +interface IFileIsInUse; +#endif /* __cplusplus */ #endif #ifndef __IFileDialogEvents_FWD_DEFINED__ #define __IFileDialogEvents_FWD_DEFINED__ typedef interface IFileDialogEvents IFileDialogEvents; +#ifdef __cplusplus +interface IFileDialogEvents; +#endif /* __cplusplus */ #endif #ifndef __IFileDialog_FWD_DEFINED__ #define __IFileDialog_FWD_DEFINED__ typedef interface IFileDialog IFileDialog; +#ifdef __cplusplus +interface IFileDialog; +#endif /* __cplusplus */ #endif #ifndef __IFileSaveDialog_FWD_DEFINED__ #define __IFileSaveDialog_FWD_DEFINED__ typedef interface IFileSaveDialog IFileSaveDialog; +#ifdef __cplusplus +interface IFileSaveDialog; +#endif /* __cplusplus */ #endif #ifndef __IFileOpenDialog_FWD_DEFINED__ #define __IFileOpenDialog_FWD_DEFINED__ typedef interface IFileOpenDialog IFileOpenDialog; +#ifdef __cplusplus +interface IFileOpenDialog; +#endif /* __cplusplus */ #endif #ifndef __IFileDialogCustomize_FWD_DEFINED__ #define __IFileDialogCustomize_FWD_DEFINED__ typedef interface IFileDialogCustomize IFileDialogCustomize; +#ifdef __cplusplus +interface IFileDialogCustomize; +#endif /* __cplusplus */ #endif #ifndef __IFileDialogControlEvents_FWD_DEFINED__ #define __IFileDialogControlEvents_FWD_DEFINED__ typedef interface IFileDialogControlEvents IFileDialogControlEvents; +#ifdef __cplusplus +interface IFileDialogControlEvents; +#endif /* __cplusplus */ #endif #ifndef __IFileDialog2_FWD_DEFINED__ #define __IFileDialog2_FWD_DEFINED__ typedef interface IFileDialog2 IFileDialog2; +#ifdef __cplusplus +interface IFileDialog2; +#endif /* __cplusplus */ #endif #ifndef __IApplicationAssociationRegistration_FWD_DEFINED__ #define __IApplicationAssociationRegistration_FWD_DEFINED__ typedef interface IApplicationAssociationRegistration IApplicationAssociationRegistration; +#ifdef __cplusplus +interface IApplicationAssociationRegistration; +#endif /* __cplusplus */ #endif #ifndef __IApplicationAssociationRegistrationUI_FWD_DEFINED__ #define __IApplicationAssociationRegistrationUI_FWD_DEFINED__ typedef interface IApplicationAssociationRegistrationUI IApplicationAssociationRegistrationUI; +#ifdef __cplusplus +interface IApplicationAssociationRegistrationUI; +#endif /* __cplusplus */ #endif #ifndef __IDelegateFolder_FWD_DEFINED__ #define __IDelegateFolder_FWD_DEFINED__ typedef interface IDelegateFolder IDelegateFolder; +#ifdef __cplusplus +interface IDelegateFolder; +#endif /* __cplusplus */ #endif #ifndef __IBrowserFrameOptions_FWD_DEFINED__ #define __IBrowserFrameOptions_FWD_DEFINED__ typedef interface IBrowserFrameOptions IBrowserFrameOptions; +#ifdef __cplusplus +interface IBrowserFrameOptions; +#endif /* __cplusplus */ #endif #ifndef __INewWindowManager_FWD_DEFINED__ #define __INewWindowManager_FWD_DEFINED__ typedef interface INewWindowManager INewWindowManager; +#ifdef __cplusplus +interface INewWindowManager; +#endif /* __cplusplus */ #endif #ifndef __IAttachmentExecute_FWD_DEFINED__ #define __IAttachmentExecute_FWD_DEFINED__ typedef interface IAttachmentExecute IAttachmentExecute; +#ifdef __cplusplus +interface IAttachmentExecute; +#endif /* __cplusplus */ #endif #ifndef __IShellMenuCallback_FWD_DEFINED__ #define __IShellMenuCallback_FWD_DEFINED__ typedef interface IShellMenuCallback IShellMenuCallback; +#ifdef __cplusplus +interface IShellMenuCallback; +#endif /* __cplusplus */ #endif #ifndef __IShellMenu_FWD_DEFINED__ #define __IShellMenu_FWD_DEFINED__ typedef interface IShellMenu IShellMenu; +#ifdef __cplusplus +interface IShellMenu; +#endif /* __cplusplus */ #endif #ifndef __IShellRunDll_FWD_DEFINED__ #define __IShellRunDll_FWD_DEFINED__ typedef interface IShellRunDll IShellRunDll; +#ifdef __cplusplus +interface IShellRunDll; +#endif /* __cplusplus */ #endif #ifndef __IKnownFolder_FWD_DEFINED__ #define __IKnownFolder_FWD_DEFINED__ typedef interface IKnownFolder IKnownFolder; +#ifdef __cplusplus +interface IKnownFolder; +#endif /* __cplusplus */ #endif #ifndef __IKnownFolderManager_FWD_DEFINED__ #define __IKnownFolderManager_FWD_DEFINED__ typedef interface IKnownFolderManager IKnownFolderManager; +#ifdef __cplusplus +interface IKnownFolderManager; +#endif /* __cplusplus */ #endif #ifndef __ISharingConfigurationManager_FWD_DEFINED__ #define __ISharingConfigurationManager_FWD_DEFINED__ typedef interface ISharingConfigurationManager ISharingConfigurationManager; +#ifdef __cplusplus +interface ISharingConfigurationManager; +#endif /* __cplusplus */ #endif #ifndef __IPreviousVersionsInfo_FWD_DEFINED__ #define __IPreviousVersionsInfo_FWD_DEFINED__ typedef interface IPreviousVersionsInfo IPreviousVersionsInfo; +#ifdef __cplusplus +interface IPreviousVersionsInfo; +#endif /* __cplusplus */ #endif #ifndef __IRelatedItem_FWD_DEFINED__ #define __IRelatedItem_FWD_DEFINED__ typedef interface IRelatedItem IRelatedItem; +#ifdef __cplusplus +interface IRelatedItem; +#endif /* __cplusplus */ #endif #ifndef __IIdentityName_FWD_DEFINED__ #define __IIdentityName_FWD_DEFINED__ typedef interface IIdentityName IIdentityName; +#ifdef __cplusplus +interface IIdentityName; +#endif /* __cplusplus */ #endif #ifndef __IDelegateItem_FWD_DEFINED__ #define __IDelegateItem_FWD_DEFINED__ typedef interface IDelegateItem IDelegateItem; +#ifdef __cplusplus +interface IDelegateItem; +#endif /* __cplusplus */ #endif #ifndef __ICurrentItem_FWD_DEFINED__ #define __ICurrentItem_FWD_DEFINED__ typedef interface ICurrentItem ICurrentItem; +#ifdef __cplusplus +interface ICurrentItem; +#endif /* __cplusplus */ #endif #ifndef __ITransferMediumItem_FWD_DEFINED__ #define __ITransferMediumItem_FWD_DEFINED__ typedef interface ITransferMediumItem ITransferMediumItem; +#ifdef __cplusplus +interface ITransferMediumItem; +#endif /* __cplusplus */ #endif #ifndef __IUseToBrowseItem_FWD_DEFINED__ #define __IUseToBrowseItem_FWD_DEFINED__ typedef interface IUseToBrowseItem IUseToBrowseItem; +#ifdef __cplusplus +interface IUseToBrowseItem; +#endif /* __cplusplus */ #endif #ifndef __IDisplayItem_FWD_DEFINED__ #define __IDisplayItem_FWD_DEFINED__ typedef interface IDisplayItem IDisplayItem; +#ifdef __cplusplus +interface IDisplayItem; +#endif /* __cplusplus */ #endif #ifndef __IViewStateIdentityItem_FWD_DEFINED__ #define __IViewStateIdentityItem_FWD_DEFINED__ typedef interface IViewStateIdentityItem IViewStateIdentityItem; +#ifdef __cplusplus +interface IViewStateIdentityItem; +#endif /* __cplusplus */ #endif #ifndef __IPreviewItem_FWD_DEFINED__ #define __IPreviewItem_FWD_DEFINED__ typedef interface IPreviewItem IPreviewItem; +#ifdef __cplusplus +interface IPreviewItem; +#endif /* __cplusplus */ #endif #ifndef __IDestinationStreamFactory_FWD_DEFINED__ #define __IDestinationStreamFactory_FWD_DEFINED__ typedef interface IDestinationStreamFactory IDestinationStreamFactory; +#ifdef __cplusplus +interface IDestinationStreamFactory; +#endif /* __cplusplus */ #endif #ifndef __INewMenuClient_FWD_DEFINED__ #define __INewMenuClient_FWD_DEFINED__ typedef interface INewMenuClient INewMenuClient; +#ifdef __cplusplus +interface INewMenuClient; +#endif /* __cplusplus */ #endif #ifndef __IInitializeWithBindCtx_FWD_DEFINED__ #define __IInitializeWithBindCtx_FWD_DEFINED__ typedef interface IInitializeWithBindCtx IInitializeWithBindCtx; +#ifdef __cplusplus +interface IInitializeWithBindCtx; +#endif /* __cplusplus */ #endif #ifndef __IShellItemFilter_FWD_DEFINED__ #define __IShellItemFilter_FWD_DEFINED__ typedef interface IShellItemFilter IShellItemFilter; +#ifdef __cplusplus +interface IShellItemFilter; +#endif /* __cplusplus */ #endif #ifndef __INameSpaceTreeControl_FWD_DEFINED__ #define __INameSpaceTreeControl_FWD_DEFINED__ typedef interface INameSpaceTreeControl INameSpaceTreeControl; +#ifdef __cplusplus +interface INameSpaceTreeControl; +#endif /* __cplusplus */ #endif #ifndef __INameSpaceTreeControl2_FWD_DEFINED__ #define __INameSpaceTreeControl2_FWD_DEFINED__ typedef interface INameSpaceTreeControl2 INameSpaceTreeControl2; +#ifdef __cplusplus +interface INameSpaceTreeControl2; +#endif /* __cplusplus */ #endif #ifndef __INameSpaceTreeControlEvents_FWD_DEFINED__ #define __INameSpaceTreeControlEvents_FWD_DEFINED__ typedef interface INameSpaceTreeControlEvents INameSpaceTreeControlEvents; +#ifdef __cplusplus +interface INameSpaceTreeControlEvents; +#endif /* __cplusplus */ #endif #ifndef __INameSpaceTreeControlDropHandler_FWD_DEFINED__ #define __INameSpaceTreeControlDropHandler_FWD_DEFINED__ typedef interface INameSpaceTreeControlDropHandler INameSpaceTreeControlDropHandler; +#ifdef __cplusplus +interface INameSpaceTreeControlDropHandler; +#endif /* __cplusplus */ #endif #ifndef __INameSpaceTreeAccessible_FWD_DEFINED__ #define __INameSpaceTreeAccessible_FWD_DEFINED__ typedef interface INameSpaceTreeAccessible INameSpaceTreeAccessible; +#ifdef __cplusplus +interface INameSpaceTreeAccessible; +#endif /* __cplusplus */ #endif #ifndef __INameSpaceTreeControlCustomDraw_FWD_DEFINED__ #define __INameSpaceTreeControlCustomDraw_FWD_DEFINED__ typedef interface INameSpaceTreeControlCustomDraw INameSpaceTreeControlCustomDraw; +#ifdef __cplusplus +interface INameSpaceTreeControlCustomDraw; +#endif /* __cplusplus */ #endif #ifndef __INameSpaceTreeControlFolderCapabilities_FWD_DEFINED__ #define __INameSpaceTreeControlFolderCapabilities_FWD_DEFINED__ typedef interface INameSpaceTreeControlFolderCapabilities INameSpaceTreeControlFolderCapabilities; +#ifdef __cplusplus +interface INameSpaceTreeControlFolderCapabilities; +#endif /* __cplusplus */ #endif #ifndef __IPreviewHandler_FWD_DEFINED__ #define __IPreviewHandler_FWD_DEFINED__ typedef interface IPreviewHandler IPreviewHandler; +#ifdef __cplusplus +interface IPreviewHandler; +#endif /* __cplusplus */ #endif #ifndef __IPreviewHandlerFrame_FWD_DEFINED__ #define __IPreviewHandlerFrame_FWD_DEFINED__ typedef interface IPreviewHandlerFrame IPreviewHandlerFrame; +#ifdef __cplusplus +interface IPreviewHandlerFrame; +#endif /* __cplusplus */ #endif #ifndef __ITrayDeskBand_FWD_DEFINED__ #define __ITrayDeskBand_FWD_DEFINED__ typedef interface ITrayDeskBand ITrayDeskBand; +#ifdef __cplusplus +interface ITrayDeskBand; +#endif /* __cplusplus */ #endif #ifndef __IBandHost_FWD_DEFINED__ #define __IBandHost_FWD_DEFINED__ typedef interface IBandHost IBandHost; +#ifdef __cplusplus +interface IBandHost; +#endif /* __cplusplus */ #endif #ifndef __IExplorerPaneVisibility_FWD_DEFINED__ #define __IExplorerPaneVisibility_FWD_DEFINED__ typedef interface IExplorerPaneVisibility IExplorerPaneVisibility; +#ifdef __cplusplus +interface IExplorerPaneVisibility; +#endif /* __cplusplus */ #endif #ifndef __IContextMenuCB_FWD_DEFINED__ #define __IContextMenuCB_FWD_DEFINED__ typedef interface IContextMenuCB IContextMenuCB; +#ifdef __cplusplus +interface IContextMenuCB; +#endif /* __cplusplus */ #endif #ifndef __IDefaultExtractIconInit_FWD_DEFINED__ #define __IDefaultExtractIconInit_FWD_DEFINED__ typedef interface IDefaultExtractIconInit IDefaultExtractIconInit; +#ifdef __cplusplus +interface IDefaultExtractIconInit; +#endif /* __cplusplus */ #endif #ifndef __IExplorerCommand_FWD_DEFINED__ #define __IExplorerCommand_FWD_DEFINED__ typedef interface IExplorerCommand IExplorerCommand; +#ifdef __cplusplus +interface IExplorerCommand; +#endif /* __cplusplus */ #endif #ifndef __IExplorerCommandState_FWD_DEFINED__ #define __IExplorerCommandState_FWD_DEFINED__ typedef interface IExplorerCommandState IExplorerCommandState; +#ifdef __cplusplus +interface IExplorerCommandState; +#endif /* __cplusplus */ #endif #ifndef __IInitializeCommand_FWD_DEFINED__ #define __IInitializeCommand_FWD_DEFINED__ typedef interface IInitializeCommand IInitializeCommand; +#ifdef __cplusplus +interface IInitializeCommand; +#endif /* __cplusplus */ #endif #ifndef __IEnumExplorerCommand_FWD_DEFINED__ #define __IEnumExplorerCommand_FWD_DEFINED__ typedef interface IEnumExplorerCommand IEnumExplorerCommand; +#ifdef __cplusplus +interface IEnumExplorerCommand; +#endif /* __cplusplus */ #endif #ifndef __IExplorerCommandProvider_FWD_DEFINED__ #define __IExplorerCommandProvider_FWD_DEFINED__ typedef interface IExplorerCommandProvider IExplorerCommandProvider; +#ifdef __cplusplus +interface IExplorerCommandProvider; +#endif /* __cplusplus */ #endif #ifndef __IInitializeNetworkFolder_FWD_DEFINED__ #define __IInitializeNetworkFolder_FWD_DEFINED__ typedef interface IInitializeNetworkFolder IInitializeNetworkFolder; +#ifdef __cplusplus +interface IInitializeNetworkFolder; +#endif /* __cplusplus */ #endif #ifndef __IOpenControlPanel_FWD_DEFINED__ #define __IOpenControlPanel_FWD_DEFINED__ typedef interface IOpenControlPanel IOpenControlPanel; +#ifdef __cplusplus +interface IOpenControlPanel; +#endif /* __cplusplus */ #endif #ifndef __IComputerInfoChangeNotify_FWD_DEFINED__ #define __IComputerInfoChangeNotify_FWD_DEFINED__ typedef interface IComputerInfoChangeNotify IComputerInfoChangeNotify; +#ifdef __cplusplus +interface IComputerInfoChangeNotify; +#endif /* __cplusplus */ #endif #ifndef __IFileSystemBindData_FWD_DEFINED__ #define __IFileSystemBindData_FWD_DEFINED__ typedef interface IFileSystemBindData IFileSystemBindData; +#ifdef __cplusplus +interface IFileSystemBindData; +#endif /* __cplusplus */ #endif #ifndef __IFileSystemBindData2_FWD_DEFINED__ #define __IFileSystemBindData2_FWD_DEFINED__ typedef interface IFileSystemBindData2 IFileSystemBindData2; +#ifdef __cplusplus +interface IFileSystemBindData2; +#endif /* __cplusplus */ #endif #ifndef __ICustomDestinationList_FWD_DEFINED__ #define __ICustomDestinationList_FWD_DEFINED__ typedef interface ICustomDestinationList ICustomDestinationList; +#ifdef __cplusplus +interface ICustomDestinationList; +#endif /* __cplusplus */ #endif #ifndef __IApplicationDestinations_FWD_DEFINED__ #define __IApplicationDestinations_FWD_DEFINED__ typedef interface IApplicationDestinations IApplicationDestinations; +#ifdef __cplusplus +interface IApplicationDestinations; +#endif /* __cplusplus */ #endif #ifndef __IApplicationDocumentLists_FWD_DEFINED__ #define __IApplicationDocumentLists_FWD_DEFINED__ typedef interface IApplicationDocumentLists IApplicationDocumentLists; +#ifdef __cplusplus +interface IApplicationDocumentLists; +#endif /* __cplusplus */ #endif #ifndef __IObjectWithAppUserModelID_FWD_DEFINED__ #define __IObjectWithAppUserModelID_FWD_DEFINED__ typedef interface IObjectWithAppUserModelID IObjectWithAppUserModelID; +#ifdef __cplusplus +interface IObjectWithAppUserModelID; +#endif /* __cplusplus */ #endif #ifndef __IObjectWithProgID_FWD_DEFINED__ #define __IObjectWithProgID_FWD_DEFINED__ typedef interface IObjectWithProgID IObjectWithProgID; +#ifdef __cplusplus +interface IObjectWithProgID; +#endif /* __cplusplus */ #endif #ifndef __IUpdateIDList_FWD_DEFINED__ #define __IUpdateIDList_FWD_DEFINED__ typedef interface IUpdateIDList IUpdateIDList; +#ifdef __cplusplus +interface IUpdateIDList; +#endif /* __cplusplus */ #endif #ifndef __IDesktopGadget_FWD_DEFINED__ #define __IDesktopGadget_FWD_DEFINED__ typedef interface IDesktopGadget IDesktopGadget; +#ifdef __cplusplus +interface IDesktopGadget; +#endif /* __cplusplus */ #endif #ifndef __IDesktopWallpaper_FWD_DEFINED__ #define __IDesktopWallpaper_FWD_DEFINED__ typedef interface IDesktopWallpaper IDesktopWallpaper; +#ifdef __cplusplus +interface IDesktopWallpaper; +#endif /* __cplusplus */ #endif #ifndef __IHomeGroup_FWD_DEFINED__ #define __IHomeGroup_FWD_DEFINED__ typedef interface IHomeGroup IHomeGroup; +#ifdef __cplusplus +interface IHomeGroup; +#endif /* __cplusplus */ #endif #ifndef __IInitializeWithPropertyStore_FWD_DEFINED__ #define __IInitializeWithPropertyStore_FWD_DEFINED__ typedef interface IInitializeWithPropertyStore IInitializeWithPropertyStore; +#ifdef __cplusplus +interface IInitializeWithPropertyStore; +#endif /* __cplusplus */ #endif #ifndef __IOpenSearchSource_FWD_DEFINED__ #define __IOpenSearchSource_FWD_DEFINED__ typedef interface IOpenSearchSource IOpenSearchSource; +#ifdef __cplusplus +interface IOpenSearchSource; +#endif /* __cplusplus */ #endif #ifndef __IShellLibrary_FWD_DEFINED__ #define __IShellLibrary_FWD_DEFINED__ typedef interface IShellLibrary IShellLibrary; +#ifdef __cplusplus +interface IShellLibrary; +#endif /* __cplusplus */ #endif #ifndef __IPlaybackManagerEvents_FWD_DEFINED__ #define __IPlaybackManagerEvents_FWD_DEFINED__ typedef interface IPlaybackManagerEvents IPlaybackManagerEvents; +#ifdef __cplusplus +interface IPlaybackManagerEvents; +#endif /* __cplusplus */ #endif #ifndef __IPlaybackManager_FWD_DEFINED__ #define __IPlaybackManager_FWD_DEFINED__ typedef interface IPlaybackManager IPlaybackManager; +#ifdef __cplusplus +interface IPlaybackManager; +#endif /* __cplusplus */ #endif #ifndef __IDefaultFolderMenuInitialize_FWD_DEFINED__ #define __IDefaultFolderMenuInitialize_FWD_DEFINED__ typedef interface IDefaultFolderMenuInitialize IDefaultFolderMenuInitialize; +#ifdef __cplusplus +interface IDefaultFolderMenuInitialize; +#endif /* __cplusplus */ #endif #ifndef __IApplicationActivationManager_FWD_DEFINED__ #define __IApplicationActivationManager_FWD_DEFINED__ typedef interface IApplicationActivationManager IApplicationActivationManager; +#ifdef __cplusplus +interface IApplicationActivationManager; +#endif /* __cplusplus */ #endif #ifndef __DesktopWallpaper_FWD_DEFINED__ @@ -1642,101 +2249,161 @@ typedef struct ExecuteFolder ExecuteFolder; #ifndef __IAssocHandlerInvoker_FWD_DEFINED__ #define __IAssocHandlerInvoker_FWD_DEFINED__ typedef interface IAssocHandlerInvoker IAssocHandlerInvoker; +#ifdef __cplusplus +interface IAssocHandlerInvoker; +#endif /* __cplusplus */ #endif #ifndef __IAssocHandler_FWD_DEFINED__ #define __IAssocHandler_FWD_DEFINED__ typedef interface IAssocHandler IAssocHandler; +#ifdef __cplusplus +interface IAssocHandler; +#endif /* __cplusplus */ #endif #ifndef __IEnumAssocHandlers_FWD_DEFINED__ #define __IEnumAssocHandlers_FWD_DEFINED__ typedef interface IEnumAssocHandlers IEnumAssocHandlers; +#ifdef __cplusplus +interface IEnumAssocHandlers; +#endif /* __cplusplus */ #endif #ifndef __IDataObjectProvider_FWD_DEFINED__ #define __IDataObjectProvider_FWD_DEFINED__ typedef interface IDataObjectProvider IDataObjectProvider; +#ifdef __cplusplus +interface IDataObjectProvider; +#endif /* __cplusplus */ #endif #ifndef __IDataTransferManagerInterop_FWD_DEFINED__ #define __IDataTransferManagerInterop_FWD_DEFINED__ typedef interface IDataTransferManagerInterop IDataTransferManagerInterop; +#ifdef __cplusplus +interface IDataTransferManagerInterop; +#endif /* __cplusplus */ #endif #ifndef __IFrameworkInputPaneHandler_FWD_DEFINED__ #define __IFrameworkInputPaneHandler_FWD_DEFINED__ typedef interface IFrameworkInputPaneHandler IFrameworkInputPaneHandler; +#ifdef __cplusplus +interface IFrameworkInputPaneHandler; +#endif /* __cplusplus */ #endif #ifndef __IFrameworkInputPane_FWD_DEFINED__ #define __IFrameworkInputPane_FWD_DEFINED__ typedef interface IFrameworkInputPane IFrameworkInputPane; +#ifdef __cplusplus +interface IFrameworkInputPane; +#endif /* __cplusplus */ #endif #ifndef __ISearchableApplication_FWD_DEFINED__ #define __ISearchableApplication_FWD_DEFINED__ typedef interface ISearchableApplication ISearchableApplication; +#ifdef __cplusplus +interface ISearchableApplication; +#endif /* __cplusplus */ #endif #ifndef __IAccessibilityDockingServiceCallback_FWD_DEFINED__ #define __IAccessibilityDockingServiceCallback_FWD_DEFINED__ typedef interface IAccessibilityDockingServiceCallback IAccessibilityDockingServiceCallback; +#ifdef __cplusplus +interface IAccessibilityDockingServiceCallback; +#endif /* __cplusplus */ #endif #ifndef __IAccessibilityDockingService_FWD_DEFINED__ #define __IAccessibilityDockingService_FWD_DEFINED__ typedef interface IAccessibilityDockingService IAccessibilityDockingService; +#ifdef __cplusplus +interface IAccessibilityDockingService; +#endif /* __cplusplus */ #endif #ifndef __IAppVisibilityEvents_FWD_DEFINED__ #define __IAppVisibilityEvents_FWD_DEFINED__ typedef interface IAppVisibilityEvents IAppVisibilityEvents; +#ifdef __cplusplus +interface IAppVisibilityEvents; +#endif /* __cplusplus */ #endif #ifndef __IAppVisibility_FWD_DEFINED__ #define __IAppVisibility_FWD_DEFINED__ typedef interface IAppVisibility IAppVisibility; +#ifdef __cplusplus +interface IAppVisibility; +#endif /* __cplusplus */ #endif #ifndef __IPackageExecutionStateChangeNotification_FWD_DEFINED__ #define __IPackageExecutionStateChangeNotification_FWD_DEFINED__ typedef interface IPackageExecutionStateChangeNotification IPackageExecutionStateChangeNotification; +#ifdef __cplusplus +interface IPackageExecutionStateChangeNotification; +#endif /* __cplusplus */ #endif #ifndef __IPackageDebugSettings_FWD_DEFINED__ #define __IPackageDebugSettings_FWD_DEFINED__ typedef interface IPackageDebugSettings IPackageDebugSettings; +#ifdef __cplusplus +interface IPackageDebugSettings; +#endif /* __cplusplus */ #endif #ifndef __IExecuteCommandApplicationHostEnvironment_FWD_DEFINED__ #define __IExecuteCommandApplicationHostEnvironment_FWD_DEFINED__ typedef interface IExecuteCommandApplicationHostEnvironment IExecuteCommandApplicationHostEnvironment; +#ifdef __cplusplus +interface IExecuteCommandApplicationHostEnvironment; +#endif /* __cplusplus */ #endif #ifndef __IExecuteCommandHost_FWD_DEFINED__ #define __IExecuteCommandHost_FWD_DEFINED__ typedef interface IExecuteCommandHost IExecuteCommandHost; +#ifdef __cplusplus +interface IExecuteCommandHost; +#endif /* __cplusplus */ #endif #ifndef __IApplicationDesignModeSettings_FWD_DEFINED__ #define __IApplicationDesignModeSettings_FWD_DEFINED__ typedef interface IApplicationDesignModeSettings IApplicationDesignModeSettings; +#ifdef __cplusplus +interface IApplicationDesignModeSettings; +#endif /* __cplusplus */ #endif #ifndef __IInitializeWithWindow_FWD_DEFINED__ #define __IInitializeWithWindow_FWD_DEFINED__ typedef interface IInitializeWithWindow IInitializeWithWindow; +#ifdef __cplusplus +interface IInitializeWithWindow; +#endif /* __cplusplus */ #endif #ifndef __IHandlerInfo_FWD_DEFINED__ #define __IHandlerInfo_FWD_DEFINED__ typedef interface IHandlerInfo IHandlerInfo; +#ifdef __cplusplus +interface IHandlerInfo; +#endif /* __cplusplus */ #endif #ifndef __IHandlerActivationHost_FWD_DEFINED__ #define __IHandlerActivationHost_FWD_DEFINED__ typedef interface IHandlerActivationHost IHandlerActivationHost; +#ifdef __cplusplus +interface IHandlerActivationHost; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -1927,19 +2594,19 @@ typedef struct IContextMenuVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IContextMenu* This, + IContextMenu *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IContextMenu* This); + IContextMenu *This); ULONG (STDMETHODCALLTYPE *Release)( - IContextMenu* This); + IContextMenu *This); /*** IContextMenu methods ***/ HRESULT (STDMETHODCALLTYPE *QueryContextMenu)( - IContextMenu* This, + IContextMenu *This, HMENU hmenu, UINT indexMenu, UINT idCmdFirst, @@ -1947,11 +2614,11 @@ typedef struct IContextMenuVtbl { UINT uFlags); HRESULT (STDMETHODCALLTYPE *InvokeCommand)( - IContextMenu* This, + IContextMenu *This, CMINVOKECOMMANDINFO *pici); HRESULT (STDMETHODCALLTYPE *GetCommandString)( - IContextMenu* This, + IContextMenu *This, UINT_PTR idCmd, UINT uType, UINT *pReserved, @@ -1960,6 +2627,7 @@ typedef struct IContextMenuVtbl { END_INTERFACE } IContextMenuVtbl; + interface IContextMenu { CONST_VTBL IContextMenuVtbl* lpVtbl; }; @@ -2000,38 +2668,6 @@ static FORCEINLINE HRESULT IContextMenu_GetCommandString(IContextMenu* This,UINT #endif -HRESULT STDMETHODCALLTYPE IContextMenu_QueryContextMenu_Proxy( - IContextMenu* This, - HMENU hmenu, - UINT indexMenu, - UINT idCmdFirst, - UINT idCmdLast, - UINT uFlags); -void __RPC_STUB IContextMenu_QueryContextMenu_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IContextMenu_InvokeCommand_Proxy( - IContextMenu* This, - CMINVOKECOMMANDINFO *pici); -void __RPC_STUB IContextMenu_InvokeCommand_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IContextMenu_GetCommandString_Proxy( - IContextMenu* This, - UINT_PTR idCmd, - UINT uType, - UINT *pReserved, - CHAR *pszName, - UINT cchMax); -void __RPC_STUB IContextMenu_GetCommandString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IContextMenu_INTERFACE_DEFINED__ */ @@ -2063,19 +2699,19 @@ typedef struct IContextMenu2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IContextMenu2* This, + IContextMenu2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IContextMenu2* This); + IContextMenu2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IContextMenu2* This); + IContextMenu2 *This); /*** IContextMenu methods ***/ HRESULT (STDMETHODCALLTYPE *QueryContextMenu)( - IContextMenu2* This, + IContextMenu2 *This, HMENU hmenu, UINT indexMenu, UINT idCmdFirst, @@ -2083,11 +2719,11 @@ typedef struct IContextMenu2Vtbl { UINT uFlags); HRESULT (STDMETHODCALLTYPE *InvokeCommand)( - IContextMenu2* This, + IContextMenu2 *This, CMINVOKECOMMANDINFO *pici); HRESULT (STDMETHODCALLTYPE *GetCommandString)( - IContextMenu2* This, + IContextMenu2 *This, UINT_PTR idCmd, UINT uType, UINT *pReserved, @@ -2096,13 +2732,14 @@ typedef struct IContextMenu2Vtbl { /*** IContextMenu2 methods ***/ HRESULT (STDMETHODCALLTYPE *HandleMenuMsg)( - IContextMenu2* This, + IContextMenu2 *This, UINT uMsg, WPARAM wParam, LPARAM lParam); END_INTERFACE } IContextMenu2Vtbl; + interface IContextMenu2 { CONST_VTBL IContextMenu2Vtbl* lpVtbl; }; @@ -2149,16 +2786,6 @@ static FORCEINLINE HRESULT IContextMenu2_HandleMenuMsg(IContextMenu2* This,UINT #endif -HRESULT STDMETHODCALLTYPE IContextMenu2_HandleMenuMsg_Proxy( - IContextMenu2* This, - UINT uMsg, - WPARAM wParam, - LPARAM lParam); -void __RPC_STUB IContextMenu2_HandleMenuMsg_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IContextMenu2_INTERFACE_DEFINED__ */ @@ -2191,19 +2818,19 @@ typedef struct IContextMenu3Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IContextMenu3* This, + IContextMenu3 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IContextMenu3* This); + IContextMenu3 *This); ULONG (STDMETHODCALLTYPE *Release)( - IContextMenu3* This); + IContextMenu3 *This); /*** IContextMenu methods ***/ HRESULT (STDMETHODCALLTYPE *QueryContextMenu)( - IContextMenu3* This, + IContextMenu3 *This, HMENU hmenu, UINT indexMenu, UINT idCmdFirst, @@ -2211,11 +2838,11 @@ typedef struct IContextMenu3Vtbl { UINT uFlags); HRESULT (STDMETHODCALLTYPE *InvokeCommand)( - IContextMenu3* This, + IContextMenu3 *This, CMINVOKECOMMANDINFO *pici); HRESULT (STDMETHODCALLTYPE *GetCommandString)( - IContextMenu3* This, + IContextMenu3 *This, UINT_PTR idCmd, UINT uType, UINT *pReserved, @@ -2224,14 +2851,14 @@ typedef struct IContextMenu3Vtbl { /*** IContextMenu2 methods ***/ HRESULT (STDMETHODCALLTYPE *HandleMenuMsg)( - IContextMenu3* This, + IContextMenu3 *This, UINT uMsg, WPARAM wParam, LPARAM lParam); /*** IContextMenu3 methods ***/ HRESULT (STDMETHODCALLTYPE *HandleMenuMsg2)( - IContextMenu3* This, + IContextMenu3 *This, UINT uMsg, WPARAM wParam, LPARAM lParam, @@ -2239,6 +2866,7 @@ typedef struct IContextMenu3Vtbl { END_INTERFACE } IContextMenu3Vtbl; + interface IContextMenu3 { CONST_VTBL IContextMenu3Vtbl* lpVtbl; }; @@ -2291,17 +2919,6 @@ static FORCEINLINE HRESULT IContextMenu3_HandleMenuMsg2(IContextMenu3* This,UINT #endif -HRESULT STDMETHODCALLTYPE IContextMenu3_HandleMenuMsg2_Proxy( - IContextMenu3* This, - UINT uMsg, - WPARAM wParam, - LPARAM lParam, - LRESULT *plResult); -void __RPC_STUB IContextMenu3_HandleMenuMsg2_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IContextMenu3_INTERFACE_DEFINED__ */ @@ -2349,46 +2966,47 @@ typedef struct IExecuteCommandVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IExecuteCommand* This, + IExecuteCommand *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IExecuteCommand* This); + IExecuteCommand *This); ULONG (STDMETHODCALLTYPE *Release)( - IExecuteCommand* This); + IExecuteCommand *This); /*** IExecuteCommand methods ***/ HRESULT (STDMETHODCALLTYPE *SetKeyState)( - IExecuteCommand* This, + IExecuteCommand *This, DWORD grfKeyState); HRESULT (STDMETHODCALLTYPE *SetParameters)( - IExecuteCommand* This, + IExecuteCommand *This, LPCWSTR pszParameters); HRESULT (STDMETHODCALLTYPE *SetPosition)( - IExecuteCommand* This, + IExecuteCommand *This, POINT pt); HRESULT (STDMETHODCALLTYPE *SetShowWindow)( - IExecuteCommand* This, + IExecuteCommand *This, int nShow); HRESULT (STDMETHODCALLTYPE *SetNoShowUI)( - IExecuteCommand* This, + IExecuteCommand *This, WINBOOL fNoShowUI); HRESULT (STDMETHODCALLTYPE *SetDirectory)( - IExecuteCommand* This, + IExecuteCommand *This, LPCWSTR pszDirectory); HRESULT (STDMETHODCALLTYPE *Execute)( - IExecuteCommand* This); + IExecuteCommand *This); END_INTERFACE } IExecuteCommandVtbl; + interface IExecuteCommand { CONST_VTBL IExecuteCommandVtbl* lpVtbl; }; @@ -2445,61 +3063,6 @@ static FORCEINLINE HRESULT IExecuteCommand_Execute(IExecuteCommand* This) { #endif -HRESULT STDMETHODCALLTYPE IExecuteCommand_SetKeyState_Proxy( - IExecuteCommand* This, - DWORD grfKeyState); -void __RPC_STUB IExecuteCommand_SetKeyState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExecuteCommand_SetParameters_Proxy( - IExecuteCommand* This, - LPCWSTR pszParameters); -void __RPC_STUB IExecuteCommand_SetParameters_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExecuteCommand_SetPosition_Proxy( - IExecuteCommand* This, - POINT pt); -void __RPC_STUB IExecuteCommand_SetPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExecuteCommand_SetShowWindow_Proxy( - IExecuteCommand* This, - int nShow); -void __RPC_STUB IExecuteCommand_SetShowWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExecuteCommand_SetNoShowUI_Proxy( - IExecuteCommand* This, - WINBOOL fNoShowUI); -void __RPC_STUB IExecuteCommand_SetNoShowUI_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExecuteCommand_SetDirectory_Proxy( - IExecuteCommand* This, - LPCWSTR pszDirectory); -void __RPC_STUB IExecuteCommand_SetDirectory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExecuteCommand_Execute_Proxy( - IExecuteCommand* This); -void __RPC_STUB IExecuteCommand_Execute_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IExecuteCommand_INTERFACE_DEFINED__ */ @@ -2528,28 +3091,29 @@ typedef struct IPersistFolderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPersistFolder* This, + IPersistFolder *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPersistFolder* This); + IPersistFolder *This); ULONG (STDMETHODCALLTYPE *Release)( - IPersistFolder* This); + IPersistFolder *This); /*** IPersist methods ***/ HRESULT (STDMETHODCALLTYPE *GetClassID)( - IPersistFolder* This, + IPersistFolder *This, CLSID *pClassID); /*** IPersistFolder methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IPersistFolder* This, + IPersistFolder *This, PCIDLIST_ABSOLUTE pidl); END_INTERFACE } IPersistFolderVtbl; + interface IPersistFolder { CONST_VTBL IPersistFolderVtbl* lpVtbl; }; @@ -2588,14 +3152,6 @@ static FORCEINLINE HRESULT IPersistFolder_Initialize(IPersistFolder* This,PCIDLI #endif -HRESULT STDMETHODCALLTYPE IPersistFolder_Initialize_Proxy( - IPersistFolder* This, - PCIDLIST_ABSOLUTE pidl); -void __RPC_STUB IPersistFolder_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPersistFolder_INTERFACE_DEFINED__ */ @@ -2643,35 +3199,36 @@ typedef struct IRunnableTaskVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IRunnableTask* This, + IRunnableTask *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IRunnableTask* This); + IRunnableTask *This); ULONG (STDMETHODCALLTYPE *Release)( - IRunnableTask* This); + IRunnableTask *This); /*** IRunnableTask methods ***/ HRESULT (STDMETHODCALLTYPE *Run)( - IRunnableTask* This); + IRunnableTask *This); HRESULT (STDMETHODCALLTYPE *Kill)( - IRunnableTask* This, + IRunnableTask *This, WINBOOL bWait); HRESULT (STDMETHODCALLTYPE *Suspend)( - IRunnableTask* This); + IRunnableTask *This); HRESULT (STDMETHODCALLTYPE *Resume)( - IRunnableTask* This); + IRunnableTask *This); ULONG (STDMETHODCALLTYPE *IsRunning)( - IRunnableTask* This); + IRunnableTask *This); END_INTERFACE } IRunnableTaskVtbl; + interface IRunnableTask { CONST_VTBL IRunnableTaskVtbl* lpVtbl; }; @@ -2720,42 +3277,6 @@ static FORCEINLINE ULONG IRunnableTask_IsRunning(IRunnableTask* This) { #endif -HRESULT STDMETHODCALLTYPE IRunnableTask_Run_Proxy( - IRunnableTask* This); -void __RPC_STUB IRunnableTask_Run_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRunnableTask_Kill_Proxy( - IRunnableTask* This, - WINBOOL bWait); -void __RPC_STUB IRunnableTask_Kill_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRunnableTask_Suspend_Proxy( - IRunnableTask* This); -void __RPC_STUB IRunnableTask_Suspend_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRunnableTask_Resume_Proxy( - IRunnableTask* This); -void __RPC_STUB IRunnableTask_Resume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -ULONG STDMETHODCALLTYPE IRunnableTask_IsRunning_Proxy( - IRunnableTask* This); -void __RPC_STUB IRunnableTask_IsRunning_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IRunnableTask_INTERFACE_DEFINED__ */ @@ -2815,41 +3336,42 @@ typedef struct IShellTaskSchedulerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellTaskScheduler* This, + IShellTaskScheduler *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellTaskScheduler* This); + IShellTaskScheduler *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellTaskScheduler* This); + IShellTaskScheduler *This); /*** IShellTaskScheduler methods ***/ HRESULT (STDMETHODCALLTYPE *AddTask)( - IShellTaskScheduler* This, + IShellTaskScheduler *This, IRunnableTask *prt, REFTASKOWNERID rtoid, DWORD_PTR lParam, DWORD dwPriority); HRESULT (STDMETHODCALLTYPE *RemoveTasks)( - IShellTaskScheduler* This, + IShellTaskScheduler *This, REFTASKOWNERID rtoid, DWORD_PTR lParam, WINBOOL bWaitIfRunning); UINT (STDMETHODCALLTYPE *CountTasks)( - IShellTaskScheduler* This, + IShellTaskScheduler *This, REFTASKOWNERID rtoid); HRESULT (STDMETHODCALLTYPE *Status)( - IShellTaskScheduler* This, + IShellTaskScheduler *This, DWORD dwReleaseStatus, DWORD dwThreadTimeout); END_INTERFACE } IShellTaskSchedulerVtbl; + interface IShellTaskScheduler { CONST_VTBL IShellTaskSchedulerVtbl* lpVtbl; }; @@ -2894,44 +3416,6 @@ static FORCEINLINE HRESULT IShellTaskScheduler_Status(IShellTaskScheduler* This, #endif -HRESULT STDMETHODCALLTYPE IShellTaskScheduler_AddTask_Proxy( - IShellTaskScheduler* This, - IRunnableTask *prt, - REFTASKOWNERID rtoid, - DWORD_PTR lParam, - DWORD dwPriority); -void __RPC_STUB IShellTaskScheduler_AddTask_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellTaskScheduler_RemoveTasks_Proxy( - IShellTaskScheduler* This, - REFTASKOWNERID rtoid, - DWORD_PTR lParam, - WINBOOL bWaitIfRunning); -void __RPC_STUB IShellTaskScheduler_RemoveTasks_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -UINT STDMETHODCALLTYPE IShellTaskScheduler_CountTasks_Proxy( - IShellTaskScheduler* This, - REFTASKOWNERID rtoid); -void __RPC_STUB IShellTaskScheduler_CountTasks_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellTaskScheduler_Status_Proxy( - IShellTaskScheduler* This, - DWORD dwReleaseStatus, - DWORD dwThreadTimeout); -void __RPC_STUB IShellTaskScheduler_Status_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellTaskScheduler_INTERFACE_DEFINED__ */ @@ -2965,27 +3449,28 @@ typedef struct IQueryCodePageVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IQueryCodePage* This, + IQueryCodePage *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IQueryCodePage* This); + IQueryCodePage *This); ULONG (STDMETHODCALLTYPE *Release)( - IQueryCodePage* This); + IQueryCodePage *This); /*** IQueryCodePage methods ***/ HRESULT (STDMETHODCALLTYPE *GetCodePage)( - IQueryCodePage* This, + IQueryCodePage *This, UINT *puiCodePage); HRESULT (STDMETHODCALLTYPE *SetCodePage)( - IQueryCodePage* This, + IQueryCodePage *This, UINT uiCodePage); END_INTERFACE } IQueryCodePageVtbl; + interface IQueryCodePage { CONST_VTBL IQueryCodePageVtbl* lpVtbl; }; @@ -3022,22 +3507,6 @@ static FORCEINLINE HRESULT IQueryCodePage_SetCodePage(IQueryCodePage* This,UINT #endif -HRESULT STDMETHODCALLTYPE IQueryCodePage_GetCodePage_Proxy( - IQueryCodePage* This, - UINT *puiCodePage); -void __RPC_STUB IQueryCodePage_GetCodePage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IQueryCodePage_SetCodePage_Proxy( - IQueryCodePage* This, - UINT uiCodePage); -void __RPC_STUB IQueryCodePage_SetCodePage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IQueryCodePage_INTERFACE_DEFINED__ */ @@ -3066,33 +3535,34 @@ typedef struct IPersistFolder2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPersistFolder2* This, + IPersistFolder2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPersistFolder2* This); + IPersistFolder2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IPersistFolder2* This); + IPersistFolder2 *This); /*** IPersist methods ***/ HRESULT (STDMETHODCALLTYPE *GetClassID)( - IPersistFolder2* This, + IPersistFolder2 *This, CLSID *pClassID); /*** IPersistFolder methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IPersistFolder2* This, + IPersistFolder2 *This, PCIDLIST_ABSOLUTE pidl); /*** IPersistFolder2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetCurFolder)( - IPersistFolder2* This, + IPersistFolder2 *This, PIDLIST_ABSOLUTE *ppidl); END_INTERFACE } IPersistFolder2Vtbl; + interface IPersistFolder2 { CONST_VTBL IPersistFolder2Vtbl* lpVtbl; }; @@ -3137,14 +3607,6 @@ static FORCEINLINE HRESULT IPersistFolder2_GetCurFolder(IPersistFolder2* This,PI #endif -HRESULT STDMETHODCALLTYPE IPersistFolder2_GetCurFolder_Proxy( - IPersistFolder2* This, - PIDLIST_ABSOLUTE *ppidl); -void __RPC_STUB IPersistFolder2_GetCurFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPersistFolder2_INTERFACE_DEFINED__ */ @@ -3190,44 +3652,45 @@ typedef struct IPersistFolder3Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPersistFolder3* This, + IPersistFolder3 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPersistFolder3* This); + IPersistFolder3 *This); ULONG (STDMETHODCALLTYPE *Release)( - IPersistFolder3* This); + IPersistFolder3 *This); /*** IPersist methods ***/ HRESULT (STDMETHODCALLTYPE *GetClassID)( - IPersistFolder3* This, + IPersistFolder3 *This, CLSID *pClassID); /*** IPersistFolder methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IPersistFolder3* This, + IPersistFolder3 *This, PCIDLIST_ABSOLUTE pidl); /*** IPersistFolder2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetCurFolder)( - IPersistFolder3* This, + IPersistFolder3 *This, PIDLIST_ABSOLUTE *ppidl); /*** IPersistFolder3 methods ***/ HRESULT (STDMETHODCALLTYPE *InitializeEx)( - IPersistFolder3* This, + IPersistFolder3 *This, IBindCtx *pbc, PCIDLIST_ABSOLUTE pidlRoot, const PERSIST_FOLDER_TARGET_INFO *ppfti); HRESULT (STDMETHODCALLTYPE *GetFolderTargetInfo)( - IPersistFolder3* This, + IPersistFolder3 *This, PERSIST_FOLDER_TARGET_INFO *ppfti); END_INTERFACE } IPersistFolder3Vtbl; + interface IPersistFolder3 { CONST_VTBL IPersistFolder3Vtbl* lpVtbl; }; @@ -3282,24 +3745,6 @@ static FORCEINLINE HRESULT IPersistFolder3_GetFolderTargetInfo(IPersistFolder3* #endif -HRESULT STDMETHODCALLTYPE IPersistFolder3_InitializeEx_Proxy( - IPersistFolder3* This, - IBindCtx *pbc, - PCIDLIST_ABSOLUTE pidlRoot, - const PERSIST_FOLDER_TARGET_INFO *ppfti); -void __RPC_STUB IPersistFolder3_InitializeEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPersistFolder3_GetFolderTargetInfo_Proxy( - IPersistFolder3* This, - PERSIST_FOLDER_TARGET_INFO *ppfti); -void __RPC_STUB IPersistFolder3_GetFolderTargetInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPersistFolder3_INTERFACE_DEFINED__ */ @@ -3331,32 +3776,33 @@ typedef struct IPersistIDListVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPersistIDList* This, + IPersistIDList *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPersistIDList* This); + IPersistIDList *This); ULONG (STDMETHODCALLTYPE *Release)( - IPersistIDList* This); + IPersistIDList *This); /*** IPersist methods ***/ HRESULT (STDMETHODCALLTYPE *GetClassID)( - IPersistIDList* This, + IPersistIDList *This, CLSID *pClassID); /*** IPersistIDList methods ***/ HRESULT (STDMETHODCALLTYPE *SetIDList)( - IPersistIDList* This, + IPersistIDList *This, PCIDLIST_ABSOLUTE pidl); HRESULT (STDMETHODCALLTYPE *GetIDList)( - IPersistIDList* This, + IPersistIDList *This, PIDLIST_ABSOLUTE *ppidl); END_INTERFACE } IPersistIDListVtbl; + interface IPersistIDList { CONST_VTBL IPersistIDListVtbl* lpVtbl; }; @@ -3399,22 +3845,6 @@ static FORCEINLINE HRESULT IPersistIDList_GetIDList(IPersistIDList* This,PIDLIST #endif -HRESULT STDMETHODCALLTYPE IPersistIDList_SetIDList_Proxy( - IPersistIDList* This, - PCIDLIST_ABSOLUTE pidl); -void __RPC_STUB IPersistIDList_SetIDList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPersistIDList_GetIDList_Proxy( - IPersistIDList* This, - PIDLIST_ABSOLUTE *ppidl); -void __RPC_STUB IPersistIDList_GetIDList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPersistIDList_INTERFACE_DEFINED__ */ @@ -3454,36 +3884,37 @@ typedef struct IEnumIDListVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumIDList* This, + IEnumIDList *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumIDList* This); + IEnumIDList *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumIDList* This); + IEnumIDList *This); /*** IEnumIDList methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumIDList* This, + IEnumIDList *This, ULONG celt, PITEMID_CHILD *rgelt, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumIDList* This, + IEnumIDList *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumIDList* This); + IEnumIDList *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumIDList* This, + IEnumIDList *This, IEnumIDList **ppenum); END_INTERFACE } IEnumIDListVtbl; + interface IEnumIDList { CONST_VTBL IEnumIDListVtbl* lpVtbl; }; @@ -3538,29 +3969,6 @@ void __RPC_STUB IEnumIDList_RemoteNext_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumIDList_Skip_Proxy( - IEnumIDList* This, - ULONG celt); -void __RPC_STUB IEnumIDList_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumIDList_Reset_Proxy( - IEnumIDList* This); -void __RPC_STUB IEnumIDList_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumIDList_Clone_Proxy( - IEnumIDList* This, - IEnumIDList **ppenum); -void __RPC_STUB IEnumIDList_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IEnumIDList_Next_Proxy( IEnumIDList* This, ULONG celt, @@ -3611,36 +4019,37 @@ typedef struct IEnumFullIDListVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumFullIDList* This, + IEnumFullIDList *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumFullIDList* This); + IEnumFullIDList *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumFullIDList* This); + IEnumFullIDList *This); /*** IEnumFullIDList methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumFullIDList* This, + IEnumFullIDList *This, ULONG celt, PIDLIST_ABSOLUTE *rgelt, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumFullIDList* This, + IEnumFullIDList *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumFullIDList* This); + IEnumFullIDList *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumFullIDList* This, + IEnumFullIDList *This, IEnumFullIDList **ppenum); END_INTERFACE } IEnumFullIDListVtbl; + interface IEnumFullIDList { CONST_VTBL IEnumFullIDListVtbl* lpVtbl; }; @@ -3695,29 +4104,6 @@ void __RPC_STUB IEnumFullIDList_RemoteNext_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumFullIDList_Skip_Proxy( - IEnumFullIDList* This, - ULONG celt); -void __RPC_STUB IEnumFullIDList_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumFullIDList_Reset_Proxy( - IEnumFullIDList* This); -void __RPC_STUB IEnumFullIDList_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumFullIDList_Clone_Proxy( - IEnumFullIDList* This, - IEnumFullIDList **ppenum); -void __RPC_STUB IEnumFullIDList_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IEnumFullIDList_Next_Proxy( IEnumFullIDList* This, ULONG celt, @@ -3740,7 +4126,6 @@ enum _SHGDNF { SHGDN_FORPARSING = 0x8000 }; - typedef DWORD SHGDNF; enum _SHCONTF { @@ -3759,7 +4144,6 @@ enum _SHCONTF { SHCONTF_INCLUDESUPERHIDDEN = 0x10000 }; - typedef DWORD SHCONTF; #define SHCIDS_ALLFIELDS __MSABI_LONG(0x80000000) @@ -3874,27 +4258,28 @@ typedef struct IObjectWithFolderEnumModeVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IObjectWithFolderEnumMode* This, + IObjectWithFolderEnumMode *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IObjectWithFolderEnumMode* This); + IObjectWithFolderEnumMode *This); ULONG (STDMETHODCALLTYPE *Release)( - IObjectWithFolderEnumMode* This); + IObjectWithFolderEnumMode *This); /*** IObjectWithFolderEnumMode methods ***/ HRESULT (STDMETHODCALLTYPE *SetMode)( - IObjectWithFolderEnumMode* This, + IObjectWithFolderEnumMode *This, FOLDER_ENUM_MODE feMode); HRESULT (STDMETHODCALLTYPE *GetMode)( - IObjectWithFolderEnumMode* This, + IObjectWithFolderEnumMode *This, FOLDER_ENUM_MODE *pfeMode); END_INTERFACE } IObjectWithFolderEnumModeVtbl; + interface IObjectWithFolderEnumMode { CONST_VTBL IObjectWithFolderEnumModeVtbl* lpVtbl; }; @@ -3931,22 +4316,6 @@ static FORCEINLINE HRESULT IObjectWithFolderEnumMode_GetMode(IObjectWithFolderEn #endif -HRESULT STDMETHODCALLTYPE IObjectWithFolderEnumMode_SetMode_Proxy( - IObjectWithFolderEnumMode* This, - FOLDER_ENUM_MODE feMode); -void __RPC_STUB IObjectWithFolderEnumMode_SetMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IObjectWithFolderEnumMode_GetMode_Proxy( - IObjectWithFolderEnumMode* This, - FOLDER_ENUM_MODE *pfeMode); -void __RPC_STUB IObjectWithFolderEnumMode_GetMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IObjectWithFolderEnumMode_INTERFACE_DEFINED__ */ @@ -3961,6 +4330,9 @@ void __RPC_STUB IObjectWithFolderEnumMode_GetMode_Stub( #ifndef __IShellItem_FWD_DEFINED__ #define __IShellItem_FWD_DEFINED__ typedef interface IShellItem IShellItem; +#ifdef __cplusplus +interface IShellItem; +#endif /* __cplusplus */ #endif @@ -3992,28 +4364,29 @@ typedef struct IParseAndCreateItemVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IParseAndCreateItem* This, + IParseAndCreateItem *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IParseAndCreateItem* This); + IParseAndCreateItem *This); ULONG (STDMETHODCALLTYPE *Release)( - IParseAndCreateItem* This); + IParseAndCreateItem *This); /*** IParseAndCreateItem methods ***/ HRESULT (STDMETHODCALLTYPE *SetItem)( - IParseAndCreateItem* This, + IParseAndCreateItem *This, IShellItem *psi); HRESULT (STDMETHODCALLTYPE *GetItem)( - IParseAndCreateItem* This, + IParseAndCreateItem *This, REFIID riid, void **ppv); END_INTERFACE } IParseAndCreateItemVtbl; + interface IParseAndCreateItem { CONST_VTBL IParseAndCreateItemVtbl* lpVtbl; }; @@ -4050,23 +4423,6 @@ static FORCEINLINE HRESULT IParseAndCreateItem_GetItem(IParseAndCreateItem* This #endif -HRESULT STDMETHODCALLTYPE IParseAndCreateItem_SetItem_Proxy( - IParseAndCreateItem* This, - IShellItem *psi); -void __RPC_STUB IParseAndCreateItem_SetItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IParseAndCreateItem_GetItem_Proxy( - IParseAndCreateItem* This, - REFIID riid, - void **ppv); -void __RPC_STUB IParseAndCreateItem_GetItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IParseAndCreateItem_INTERFACE_DEFINED__ */ @@ -4077,6 +4433,9 @@ void __RPC_STUB IParseAndCreateItem_GetItem_Stub( #ifndef __IShellFolder_FWD_DEFINED__ #define __IShellFolder_FWD_DEFINED__ typedef interface IShellFolder IShellFolder; +#ifdef __cplusplus +interface IShellFolder; +#endif /* __cplusplus */ #endif @@ -4161,19 +4520,19 @@ typedef struct IShellFolderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellFolder* This, + IShellFolder *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellFolder* This); + IShellFolder *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellFolder* This); + IShellFolder *This); /*** IShellFolder methods ***/ HRESULT (STDMETHODCALLTYPE *ParseDisplayName)( - IShellFolder* This, + IShellFolder *This, HWND hwnd, IBindCtx *pbc, LPWSTR pszDisplayName, @@ -4182,45 +4541,45 @@ typedef struct IShellFolderVtbl { ULONG *pdwAttributes); HRESULT (STDMETHODCALLTYPE *EnumObjects)( - IShellFolder* This, + IShellFolder *This, HWND hwnd, SHCONTF grfFlags, IEnumIDList **ppenumIDList); HRESULT (STDMETHODCALLTYPE *BindToObject)( - IShellFolder* This, + IShellFolder *This, PCUIDLIST_RELATIVE pidl, IBindCtx *pbc, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *BindToStorage)( - IShellFolder* This, + IShellFolder *This, PCUIDLIST_RELATIVE pidl, IBindCtx *pbc, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *CompareIDs)( - IShellFolder* This, + IShellFolder *This, LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2); HRESULT (STDMETHODCALLTYPE *CreateViewObject)( - IShellFolder* This, + IShellFolder *This, HWND hwndOwner, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetAttributesOf)( - IShellFolder* This, + IShellFolder *This, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, SFGAOF *rgfInOut); HRESULT (STDMETHODCALLTYPE *GetUIObjectOf)( - IShellFolder* This, + IShellFolder *This, HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, @@ -4229,13 +4588,13 @@ typedef struct IShellFolderVtbl { void **ppv); HRESULT (STDMETHODCALLTYPE *GetDisplayNameOf)( - IShellFolder* This, + IShellFolder *This, PCUITEMID_CHILD pidl, SHGDNF uFlags, STRRET *pName); HRESULT (STDMETHODCALLTYPE *SetNameOf)( - IShellFolder* This, + IShellFolder *This, HWND hwnd, PCUITEMID_CHILD pidl, LPCWSTR pszName, @@ -4244,6 +4603,7 @@ typedef struct IShellFolderVtbl { END_INTERFACE } IShellFolderVtbl; + interface IShellFolder { CONST_VTBL IShellFolderVtbl* lpVtbl; }; @@ -4312,104 +4672,6 @@ static FORCEINLINE HRESULT IShellFolder_SetNameOf(IShellFolder* This,HWND hwnd,P #endif -HRESULT STDMETHODCALLTYPE IShellFolder_ParseDisplayName_Proxy( - IShellFolder* This, - HWND hwnd, - IBindCtx *pbc, - LPWSTR pszDisplayName, - ULONG *pchEaten, - PIDLIST_RELATIVE *ppidl, - ULONG *pdwAttributes); -void __RPC_STUB IShellFolder_ParseDisplayName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolder_EnumObjects_Proxy( - IShellFolder* This, - HWND hwnd, - SHCONTF grfFlags, - IEnumIDList **ppenumIDList); -void __RPC_STUB IShellFolder_EnumObjects_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolder_BindToObject_Proxy( - IShellFolder* This, - PCUIDLIST_RELATIVE pidl, - IBindCtx *pbc, - REFIID riid, - void **ppv); -void __RPC_STUB IShellFolder_BindToObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolder_BindToStorage_Proxy( - IShellFolder* This, - PCUIDLIST_RELATIVE pidl, - IBindCtx *pbc, - REFIID riid, - void **ppv); -void __RPC_STUB IShellFolder_BindToStorage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolder_CompareIDs_Proxy( - IShellFolder* This, - LPARAM lParam, - PCUIDLIST_RELATIVE pidl1, - PCUIDLIST_RELATIVE pidl2); -void __RPC_STUB IShellFolder_CompareIDs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolder_CreateViewObject_Proxy( - IShellFolder* This, - HWND hwndOwner, - REFIID riid, - void **ppv); -void __RPC_STUB IShellFolder_CreateViewObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolder_GetAttributesOf_Proxy( - IShellFolder* This, - UINT cidl, - PCUITEMID_CHILD_ARRAY apidl, - SFGAOF *rgfInOut); -void __RPC_STUB IShellFolder_GetAttributesOf_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolder_GetUIObjectOf_Proxy( - IShellFolder* This, - HWND hwndOwner, - UINT cidl, - PCUITEMID_CHILD_ARRAY apidl, - REFIID riid, - UINT *rgfReserved, - void **ppv); -void __RPC_STUB IShellFolder_GetUIObjectOf_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolder_GetDisplayNameOf_Proxy( - IShellFolder* This, - PCUITEMID_CHILD pidl, - SHGDNF uFlags, - STRRET *pName); -void __RPC_STUB IShellFolder_GetDisplayNameOf_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE IShellFolder_RemoteSetNameOf_Proxy( IShellFolder* This, HWND hwnd, @@ -4483,36 +4745,37 @@ typedef struct IEnumExtraSearchVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumExtraSearch* This, + IEnumExtraSearch *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumExtraSearch* This); + IEnumExtraSearch *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumExtraSearch* This); + IEnumExtraSearch *This); /*** IEnumExtraSearch methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumExtraSearch* This, + IEnumExtraSearch *This, ULONG celt, EXTRASEARCH *rgelt, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumExtraSearch* This, + IEnumExtraSearch *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumExtraSearch* This); + IEnumExtraSearch *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumExtraSearch* This, + IEnumExtraSearch *This, IEnumExtraSearch **ppenum); END_INTERFACE } IEnumExtraSearchVtbl; + interface IEnumExtraSearch { CONST_VTBL IEnumExtraSearchVtbl* lpVtbl; }; @@ -4557,39 +4820,6 @@ static FORCEINLINE HRESULT IEnumExtraSearch_Clone(IEnumExtraSearch* This,IEnumEx #endif -HRESULT STDMETHODCALLTYPE IEnumExtraSearch_Next_Proxy( - IEnumExtraSearch* This, - ULONG celt, - EXTRASEARCH *rgelt, - ULONG *pceltFetched); -void __RPC_STUB IEnumExtraSearch_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumExtraSearch_Skip_Proxy( - IEnumExtraSearch* This, - ULONG celt); -void __RPC_STUB IEnumExtraSearch_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumExtraSearch_Reset_Proxy( - IEnumExtraSearch* This); -void __RPC_STUB IEnumExtraSearch_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumExtraSearch_Clone_Proxy( - IEnumExtraSearch* This, - IEnumExtraSearch **ppenum); -void __RPC_STUB IEnumExtraSearch_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumExtraSearch_INTERFACE_DEFINED__ */ @@ -4645,19 +4875,19 @@ typedef struct IShellFolder2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellFolder2* This, + IShellFolder2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellFolder2* This); + IShellFolder2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellFolder2* This); + IShellFolder2 *This); /*** IShellFolder methods ***/ HRESULT (STDMETHODCALLTYPE *ParseDisplayName)( - IShellFolder2* This, + IShellFolder2 *This, HWND hwnd, IBindCtx *pbc, LPWSTR pszDisplayName, @@ -4666,45 +4896,45 @@ typedef struct IShellFolder2Vtbl { ULONG *pdwAttributes); HRESULT (STDMETHODCALLTYPE *EnumObjects)( - IShellFolder2* This, + IShellFolder2 *This, HWND hwnd, SHCONTF grfFlags, IEnumIDList **ppenumIDList); HRESULT (STDMETHODCALLTYPE *BindToObject)( - IShellFolder2* This, + IShellFolder2 *This, PCUIDLIST_RELATIVE pidl, IBindCtx *pbc, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *BindToStorage)( - IShellFolder2* This, + IShellFolder2 *This, PCUIDLIST_RELATIVE pidl, IBindCtx *pbc, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *CompareIDs)( - IShellFolder2* This, + IShellFolder2 *This, LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2); HRESULT (STDMETHODCALLTYPE *CreateViewObject)( - IShellFolder2* This, + IShellFolder2 *This, HWND hwndOwner, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetAttributesOf)( - IShellFolder2* This, + IShellFolder2 *This, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, SFGAOF *rgfInOut); HRESULT (STDMETHODCALLTYPE *GetUIObjectOf)( - IShellFolder2* This, + IShellFolder2 *This, HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, @@ -4713,13 +4943,13 @@ typedef struct IShellFolder2Vtbl { void **ppv); HRESULT (STDMETHODCALLTYPE *GetDisplayNameOf)( - IShellFolder2* This, + IShellFolder2 *This, PCUITEMID_CHILD pidl, SHGDNF uFlags, STRRET *pName); HRESULT (STDMETHODCALLTYPE *SetNameOf)( - IShellFolder2* This, + IShellFolder2 *This, HWND hwnd, PCUITEMID_CHILD pidl, LPCWSTR pszName, @@ -4728,43 +4958,44 @@ typedef struct IShellFolder2Vtbl { /*** IShellFolder2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetDefaultSearchGUID)( - IShellFolder2* This, + IShellFolder2 *This, GUID *pguid); HRESULT (STDMETHODCALLTYPE *EnumSearches)( - IShellFolder2* This, + IShellFolder2 *This, IEnumExtraSearch **ppenum); HRESULT (STDMETHODCALLTYPE *GetDefaultColumn)( - IShellFolder2* This, + IShellFolder2 *This, DWORD dwRes, ULONG *pSort, ULONG *pDisplay); HRESULT (STDMETHODCALLTYPE *GetDefaultColumnState)( - IShellFolder2* This, + IShellFolder2 *This, UINT iColumn, SHCOLSTATEF *pcsFlags); HRESULT (STDMETHODCALLTYPE *GetDetailsEx)( - IShellFolder2* This, + IShellFolder2 *This, PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv); HRESULT (STDMETHODCALLTYPE *GetDetailsOf)( - IShellFolder2* This, + IShellFolder2 *This, PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd); HRESULT (STDMETHODCALLTYPE *MapColumnToSCID)( - IShellFolder2* This, + IShellFolder2 *This, UINT iColumn, SHCOLUMNID *pscid); END_INTERFACE } IShellFolder2Vtbl; + interface IShellFolder2 { CONST_VTBL IShellFolder2Vtbl* lpVtbl; }; @@ -4863,70 +5094,6 @@ static FORCEINLINE HRESULT IShellFolder2_MapColumnToSCID(IShellFolder2* This,UIN #endif -HRESULT STDMETHODCALLTYPE IShellFolder2_GetDefaultSearchGUID_Proxy( - IShellFolder2* This, - GUID *pguid); -void __RPC_STUB IShellFolder2_GetDefaultSearchGUID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolder2_EnumSearches_Proxy( - IShellFolder2* This, - IEnumExtraSearch **ppenum); -void __RPC_STUB IShellFolder2_EnumSearches_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolder2_GetDefaultColumn_Proxy( - IShellFolder2* This, - DWORD dwRes, - ULONG *pSort, - ULONG *pDisplay); -void __RPC_STUB IShellFolder2_GetDefaultColumn_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolder2_GetDefaultColumnState_Proxy( - IShellFolder2* This, - UINT iColumn, - SHCOLSTATEF *pcsFlags); -void __RPC_STUB IShellFolder2_GetDefaultColumnState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolder2_GetDetailsEx_Proxy( - IShellFolder2* This, - PCUITEMID_CHILD pidl, - const SHCOLUMNID *pscid, - VARIANT *pv); -void __RPC_STUB IShellFolder2_GetDetailsEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolder2_GetDetailsOf_Proxy( - IShellFolder2* This, - PCUITEMID_CHILD pidl, - UINT iColumn, - SHELLDETAILS *psd); -void __RPC_STUB IShellFolder2_GetDetailsOf_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellFolder2_MapColumnToSCID_Proxy( - IShellFolder2* This, - UINT iColumn, - SHCOLUMNID *pscid); -void __RPC_STUB IShellFolder2_MapColumnToSCID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellFolder2_INTERFACE_DEFINED__ */ @@ -5045,28 +5212,29 @@ typedef struct IFolderViewOptionsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFolderViewOptions* This, + IFolderViewOptions *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFolderViewOptions* This); + IFolderViewOptions *This); ULONG (STDMETHODCALLTYPE *Release)( - IFolderViewOptions* This); + IFolderViewOptions *This); /*** IFolderViewOptions methods ***/ HRESULT (STDMETHODCALLTYPE *SetFolderViewOptions)( - IFolderViewOptions* This, + IFolderViewOptions *This, FOLDERVIEWOPTIONS fvoMask, FOLDERVIEWOPTIONS fvoFlags); HRESULT (STDMETHODCALLTYPE *GetFolderViewOptions)( - IFolderViewOptions* This, + IFolderViewOptions *This, FOLDERVIEWOPTIONS *pfvoFlags); END_INTERFACE } IFolderViewOptionsVtbl; + interface IFolderViewOptions { CONST_VTBL IFolderViewOptionsVtbl* lpVtbl; }; @@ -5103,23 +5271,6 @@ static FORCEINLINE HRESULT IFolderViewOptions_GetFolderViewOptions(IFolderViewOp #endif -HRESULT STDMETHODCALLTYPE IFolderViewOptions_SetFolderViewOptions_Proxy( - IFolderViewOptions* This, - FOLDERVIEWOPTIONS fvoMask, - FOLDERVIEWOPTIONS fvoFlags); -void __RPC_STUB IFolderViewOptions_SetFolderViewOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderViewOptions_GetFolderViewOptions_Proxy( - IFolderViewOptions* This, - FOLDERVIEWOPTIONS *pfvoFlags); -void __RPC_STUB IFolderViewOptions_GetFolderViewOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFolderViewOptions_INTERFACE_DEFINED__ */ @@ -5177,6 +5328,9 @@ typedef LPFNADDPROPSHEETPAGE LPFNSVADDPROPSHEETPAGE; #ifndef __IShellBrowser_FWD_DEFINED__ #define __IShellBrowser_FWD_DEFINED__ typedef interface IShellBrowser IShellBrowser; +#ifdef __cplusplus +interface IShellBrowser; +#endif /* __cplusplus */ #endif @@ -5243,43 +5397,43 @@ typedef struct IShellViewVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellView* This, + IShellView *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellView* This); + IShellView *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellView* This); + IShellView *This); /*** IOleWindow methods ***/ HRESULT (STDMETHODCALLTYPE *GetWindow)( - IShellView* This, + IShellView *This, HWND *phwnd); HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)( - IShellView* This, + IShellView *This, WINBOOL fEnterMode); /*** IShellView methods ***/ HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)( - IShellView* This, + IShellView *This, MSG *pmsg); HRESULT (STDMETHODCALLTYPE *EnableModeless)( - IShellView* This, + IShellView *This, WINBOOL fEnable); HRESULT (STDMETHODCALLTYPE *UIActivate)( - IShellView* This, + IShellView *This, UINT uState); HRESULT (STDMETHODCALLTYPE *Refresh)( - IShellView* This); + IShellView *This); HRESULT (STDMETHODCALLTYPE *CreateViewWindow)( - IShellView* This, + IShellView *This, IShellView *psvPrevious, LPCFOLDERSETTINGS pfs, IShellBrowser *psb, @@ -5287,34 +5441,35 @@ typedef struct IShellViewVtbl { HWND *phWnd); HRESULT (STDMETHODCALLTYPE *DestroyViewWindow)( - IShellView* This); + IShellView *This); HRESULT (STDMETHODCALLTYPE *GetCurrentInfo)( - IShellView* This, + IShellView *This, LPFOLDERSETTINGS pfs); HRESULT (STDMETHODCALLTYPE *AddPropertySheetPages)( - IShellView* This, + IShellView *This, DWORD dwReserved, LPFNSVADDPROPSHEETPAGE pfn, LPARAM lparam); HRESULT (STDMETHODCALLTYPE *SaveViewState)( - IShellView* This); + IShellView *This); HRESULT (STDMETHODCALLTYPE *SelectItem)( - IShellView* This, + IShellView *This, PCUITEMID_CHILD pidlItem, SVSIF uFlags); HRESULT (STDMETHODCALLTYPE *GetItemObject)( - IShellView* This, + IShellView *This, UINT uItem, REFIID riid, void **ppv); END_INTERFACE } IShellViewVtbl; + interface IShellView { CONST_VTBL IShellViewVtbl* lpVtbl; }; @@ -5397,90 +5552,6 @@ static FORCEINLINE HRESULT IShellView_GetItemObject(IShellView* This,UINT uItem, #endif -HRESULT STDMETHODCALLTYPE IShellView_TranslateAccelerator_Proxy( - IShellView* This, - MSG *pmsg); -void __RPC_STUB IShellView_TranslateAccelerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellView_EnableModeless_Proxy( - IShellView* This, - WINBOOL fEnable); -void __RPC_STUB IShellView_EnableModeless_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellView_UIActivate_Proxy( - IShellView* This, - UINT uState); -void __RPC_STUB IShellView_UIActivate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellView_Refresh_Proxy( - IShellView* This); -void __RPC_STUB IShellView_Refresh_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellView_CreateViewWindow_Proxy( - IShellView* This, - IShellView *psvPrevious, - LPCFOLDERSETTINGS pfs, - IShellBrowser *psb, - RECT *prcView, - HWND *phWnd); -void __RPC_STUB IShellView_CreateViewWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellView_DestroyViewWindow_Proxy( - IShellView* This); -void __RPC_STUB IShellView_DestroyViewWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellView_GetCurrentInfo_Proxy( - IShellView* This, - LPFOLDERSETTINGS pfs); -void __RPC_STUB IShellView_GetCurrentInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellView_SaveViewState_Proxy( - IShellView* This); -void __RPC_STUB IShellView_SaveViewState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellView_SelectItem_Proxy( - IShellView* This, - PCUITEMID_CHILD pidlItem, - SVSIF uFlags); -void __RPC_STUB IShellView_SelectItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellView_GetItemObject_Proxy( - IShellView* This, - UINT uItem, - REFIID riid, - void **ppv); -void __RPC_STUB IShellView_GetItemObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellView_INTERFACE_DEFINED__ */ @@ -5540,43 +5611,43 @@ typedef struct IShellView2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellView2* This, + IShellView2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellView2* This); + IShellView2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellView2* This); + IShellView2 *This); /*** IOleWindow methods ***/ HRESULT (STDMETHODCALLTYPE *GetWindow)( - IShellView2* This, + IShellView2 *This, HWND *phwnd); HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)( - IShellView2* This, + IShellView2 *This, WINBOOL fEnterMode); /*** IShellView methods ***/ HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)( - IShellView2* This, + IShellView2 *This, MSG *pmsg); HRESULT (STDMETHODCALLTYPE *EnableModeless)( - IShellView2* This, + IShellView2 *This, WINBOOL fEnable); HRESULT (STDMETHODCALLTYPE *UIActivate)( - IShellView2* This, + IShellView2 *This, UINT uState); HRESULT (STDMETHODCALLTYPE *Refresh)( - IShellView2* This); + IShellView2 *This); HRESULT (STDMETHODCALLTYPE *CreateViewWindow)( - IShellView2* This, + IShellView2 *This, IShellView *psvPrevious, LPCFOLDERSETTINGS pfs, IShellBrowser *psb, @@ -5584,54 +5655,55 @@ typedef struct IShellView2Vtbl { HWND *phWnd); HRESULT (STDMETHODCALLTYPE *DestroyViewWindow)( - IShellView2* This); + IShellView2 *This); HRESULT (STDMETHODCALLTYPE *GetCurrentInfo)( - IShellView2* This, + IShellView2 *This, LPFOLDERSETTINGS pfs); HRESULT (STDMETHODCALLTYPE *AddPropertySheetPages)( - IShellView2* This, + IShellView2 *This, DWORD dwReserved, LPFNSVADDPROPSHEETPAGE pfn, LPARAM lparam); HRESULT (STDMETHODCALLTYPE *SaveViewState)( - IShellView2* This); + IShellView2 *This); HRESULT (STDMETHODCALLTYPE *SelectItem)( - IShellView2* This, + IShellView2 *This, PCUITEMID_CHILD pidlItem, SVSIF uFlags); HRESULT (STDMETHODCALLTYPE *GetItemObject)( - IShellView2* This, + IShellView2 *This, UINT uItem, REFIID riid, void **ppv); /*** IShellView2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetView)( - IShellView2* This, + IShellView2 *This, SHELLVIEWID *pvid, ULONG uView); HRESULT (STDMETHODCALLTYPE *CreateViewWindow2)( - IShellView2* This, + IShellView2 *This, LPSV2CVW2_PARAMS lpParams); HRESULT (STDMETHODCALLTYPE *HandleRename)( - IShellView2* This, + IShellView2 *This, PCUITEMID_CHILD pidlNew); HRESULT (STDMETHODCALLTYPE *SelectAndPositionItem)( - IShellView2* This, + IShellView2 *This, PCUITEMID_CHILD pidlItem, UINT uFlags, POINT *ppt); END_INTERFACE } IShellView2Vtbl; + interface IShellView2 { CONST_VTBL IShellView2Vtbl* lpVtbl; }; @@ -5732,41 +5804,6 @@ static FORCEINLINE HRESULT IShellView2_SelectAndPositionItem(IShellView2* This,P #endif -HRESULT STDMETHODCALLTYPE IShellView2_GetView_Proxy( - IShellView2* This, - SHELLVIEWID *pvid, - ULONG uView); -void __RPC_STUB IShellView2_GetView_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellView2_CreateViewWindow2_Proxy( - IShellView2* This, - LPSV2CVW2_PARAMS lpParams); -void __RPC_STUB IShellView2_CreateViewWindow2_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellView2_HandleRename_Proxy( - IShellView2* This, - PCUITEMID_CHILD pidlNew); -void __RPC_STUB IShellView2_HandleRename_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellView2_SelectAndPositionItem_Proxy( - IShellView2* This, - PCUITEMID_CHILD pidlItem, - UINT uFlags, - POINT *ppt); -void __RPC_STUB IShellView2_SelectAndPositionItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellView2_INTERFACE_DEFINED__ */ @@ -5785,7 +5822,6 @@ enum _SV3CVW3_FLAGS { SV3CVW3_FORCEFOLDERFLAGS = 0x4 }; - typedef DWORD SV3CVW3_FLAGS; DEFINE_GUID(IID_IShellView3, 0xec39fa88, 0xf8af, 0x41c5, 0x84,0x21, 0x38,0xbe,0xd2,0x8f,0x46,0x73); @@ -5814,43 +5850,43 @@ typedef struct IShellView3Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellView3* This, + IShellView3 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellView3* This); + IShellView3 *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellView3* This); + IShellView3 *This); /*** IOleWindow methods ***/ HRESULT (STDMETHODCALLTYPE *GetWindow)( - IShellView3* This, + IShellView3 *This, HWND *phwnd); HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)( - IShellView3* This, + IShellView3 *This, WINBOOL fEnterMode); /*** IShellView methods ***/ HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)( - IShellView3* This, + IShellView3 *This, MSG *pmsg); HRESULT (STDMETHODCALLTYPE *EnableModeless)( - IShellView3* This, + IShellView3 *This, WINBOOL fEnable); HRESULT (STDMETHODCALLTYPE *UIActivate)( - IShellView3* This, + IShellView3 *This, UINT uState); HRESULT (STDMETHODCALLTYPE *Refresh)( - IShellView3* This); + IShellView3 *This); HRESULT (STDMETHODCALLTYPE *CreateViewWindow)( - IShellView3* This, + IShellView3 *This, IShellView *psvPrevious, LPCFOLDERSETTINGS pfs, IShellBrowser *psb, @@ -5858,55 +5894,55 @@ typedef struct IShellView3Vtbl { HWND *phWnd); HRESULT (STDMETHODCALLTYPE *DestroyViewWindow)( - IShellView3* This); + IShellView3 *This); HRESULT (STDMETHODCALLTYPE *GetCurrentInfo)( - IShellView3* This, + IShellView3 *This, LPFOLDERSETTINGS pfs); HRESULT (STDMETHODCALLTYPE *AddPropertySheetPages)( - IShellView3* This, + IShellView3 *This, DWORD dwReserved, LPFNSVADDPROPSHEETPAGE pfn, LPARAM lparam); HRESULT (STDMETHODCALLTYPE *SaveViewState)( - IShellView3* This); + IShellView3 *This); HRESULT (STDMETHODCALLTYPE *SelectItem)( - IShellView3* This, + IShellView3 *This, PCUITEMID_CHILD pidlItem, SVSIF uFlags); HRESULT (STDMETHODCALLTYPE *GetItemObject)( - IShellView3* This, + IShellView3 *This, UINT uItem, REFIID riid, void **ppv); /*** IShellView2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetView)( - IShellView3* This, + IShellView3 *This, SHELLVIEWID *pvid, ULONG uView); HRESULT (STDMETHODCALLTYPE *CreateViewWindow2)( - IShellView3* This, + IShellView3 *This, LPSV2CVW2_PARAMS lpParams); HRESULT (STDMETHODCALLTYPE *HandleRename)( - IShellView3* This, + IShellView3 *This, PCUITEMID_CHILD pidlNew); HRESULT (STDMETHODCALLTYPE *SelectAndPositionItem)( - IShellView3* This, + IShellView3 *This, PCUITEMID_CHILD pidlItem, UINT uFlags, POINT *ppt); /*** IShellView3 methods ***/ HRESULT (STDMETHODCALLTYPE *CreateViewWindow3)( - IShellView3* This, + IShellView3 *This, IShellBrowser *psbOwner, IShellView *psvPrev, SV3CVW3_FLAGS dwViewFlags, @@ -5919,6 +5955,7 @@ typedef struct IShellView3Vtbl { END_INTERFACE } IShellView3Vtbl; + interface IShellView3 { CONST_VTBL IShellView3Vtbl* lpVtbl; }; @@ -6025,22 +6062,6 @@ static FORCEINLINE HRESULT IShellView3_CreateViewWindow3(IShellView3* This,IShel #endif -HRESULT STDMETHODCALLTYPE IShellView3_CreateViewWindow3_Proxy( - IShellView3* This, - IShellBrowser *psbOwner, - IShellView *psvPrev, - SV3CVW3_FLAGS dwViewFlags, - FOLDERFLAGS dwMask, - FOLDERFLAGS dwFlags, - FOLDERVIEWMODE fvMode, - const SHELLVIEWID *pvid, - const RECT *prcView, - HWND *phwndView); -void __RPC_STUB IShellView3_CreateViewWindow3_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellView3_INTERFACE_DEFINED__ */ @@ -6122,77 +6143,77 @@ typedef struct IFolderViewVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFolderView* This, + IFolderView *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFolderView* This); + IFolderView *This); ULONG (STDMETHODCALLTYPE *Release)( - IFolderView* This); + IFolderView *This); /*** IFolderView methods ***/ HRESULT (STDMETHODCALLTYPE *GetCurrentViewMode)( - IFolderView* This, + IFolderView *This, UINT *pViewMode); HRESULT (STDMETHODCALLTYPE *SetCurrentViewMode)( - IFolderView* This, + IFolderView *This, UINT ViewMode); HRESULT (STDMETHODCALLTYPE *GetFolder)( - IFolderView* This, + IFolderView *This, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *Item)( - IFolderView* This, + IFolderView *This, int iItemIndex, PITEMID_CHILD *ppidl); HRESULT (STDMETHODCALLTYPE *ItemCount)( - IFolderView* This, + IFolderView *This, UINT uFlags, int *pcItems); HRESULT (STDMETHODCALLTYPE *Items)( - IFolderView* This, + IFolderView *This, UINT uFlags, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetSelectionMarkedItem)( - IFolderView* This, + IFolderView *This, int *piItem); HRESULT (STDMETHODCALLTYPE *GetFocusedItem)( - IFolderView* This, + IFolderView *This, int *piItem); HRESULT (STDMETHODCALLTYPE *GetItemPosition)( - IFolderView* This, + IFolderView *This, PCUITEMID_CHILD pidl, POINT *ppt); HRESULT (STDMETHODCALLTYPE *GetSpacing)( - IFolderView* This, + IFolderView *This, POINT *ppt); HRESULT (STDMETHODCALLTYPE *GetDefaultSpacing)( - IFolderView* This, + IFolderView *This, POINT *ppt); HRESULT (STDMETHODCALLTYPE *GetAutoArrange)( - IFolderView* This); + IFolderView *This); HRESULT (STDMETHODCALLTYPE *SelectItem)( - IFolderView* This, + IFolderView *This, int iItem, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *SelectAndPositionItems)( - IFolderView* This, + IFolderView *This, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, POINT *apt, @@ -6200,6 +6221,7 @@ typedef struct IFolderViewVtbl { END_INTERFACE } IFolderViewVtbl; + interface IFolderView { CONST_VTBL IFolderViewVtbl* lpVtbl; }; @@ -6284,127 +6306,6 @@ static FORCEINLINE HRESULT IFolderView_SelectAndPositionItems(IFolderView* This, #endif -HRESULT STDMETHODCALLTYPE IFolderView_GetCurrentViewMode_Proxy( - IFolderView* This, - UINT *pViewMode); -void __RPC_STUB IFolderView_GetCurrentViewMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView_SetCurrentViewMode_Proxy( - IFolderView* This, - UINT ViewMode); -void __RPC_STUB IFolderView_SetCurrentViewMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView_GetFolder_Proxy( - IFolderView* This, - REFIID riid, - void **ppv); -void __RPC_STUB IFolderView_GetFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView_Item_Proxy( - IFolderView* This, - int iItemIndex, - PITEMID_CHILD *ppidl); -void __RPC_STUB IFolderView_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView_ItemCount_Proxy( - IFolderView* This, - UINT uFlags, - int *pcItems); -void __RPC_STUB IFolderView_ItemCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView_Items_Proxy( - IFolderView* This, - UINT uFlags, - REFIID riid, - void **ppv); -void __RPC_STUB IFolderView_Items_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView_GetSelectionMarkedItem_Proxy( - IFolderView* This, - int *piItem); -void __RPC_STUB IFolderView_GetSelectionMarkedItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView_GetFocusedItem_Proxy( - IFolderView* This, - int *piItem); -void __RPC_STUB IFolderView_GetFocusedItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView_GetItemPosition_Proxy( - IFolderView* This, - PCUITEMID_CHILD pidl, - POINT *ppt); -void __RPC_STUB IFolderView_GetItemPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView_GetSpacing_Proxy( - IFolderView* This, - POINT *ppt); -void __RPC_STUB IFolderView_GetSpacing_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView_GetDefaultSpacing_Proxy( - IFolderView* This, - POINT *ppt); -void __RPC_STUB IFolderView_GetDefaultSpacing_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView_GetAutoArrange_Proxy( - IFolderView* This); -void __RPC_STUB IFolderView_GetAutoArrange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView_SelectItem_Proxy( - IFolderView* This, - int iItem, - DWORD dwFlags); -void __RPC_STUB IFolderView_SelectItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView_SelectAndPositionItems_Proxy( - IFolderView* This, - UINT cidl, - PCUITEMID_CHILD_ARRAY apidl, - POINT *apt, - DWORD dwFlags); -void __RPC_STUB IFolderView_SelectAndPositionItems_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFolderView_INTERFACE_DEFINED__ */ @@ -6440,28 +6341,29 @@ typedef struct ISearchBoxInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISearchBoxInfo* This, + ISearchBoxInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISearchBoxInfo* This); + ISearchBoxInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - ISearchBoxInfo* This); + ISearchBoxInfo *This); /*** ISearchBoxInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetCondition)( - ISearchBoxInfo* This, + ISearchBoxInfo *This, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetText)( - ISearchBoxInfo* This, + ISearchBoxInfo *This, LPWSTR *ppsz); END_INTERFACE } ISearchBoxInfoVtbl; + interface ISearchBoxInfo { CONST_VTBL ISearchBoxInfoVtbl* lpVtbl; }; @@ -6498,23 +6400,6 @@ static FORCEINLINE HRESULT ISearchBoxInfo_GetText(ISearchBoxInfo* This,LPWSTR *p #endif -HRESULT STDMETHODCALLTYPE ISearchBoxInfo_GetCondition_Proxy( - ISearchBoxInfo* This, - REFIID riid, - void **ppv); -void __RPC_STUB ISearchBoxInfo_GetCondition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchBoxInfo_GetText_Proxy( - ISearchBoxInfo* This, - LPWSTR *ppsz); -void __RPC_STUB ISearchBoxInfo_GetText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISearchBoxInfo_INTERFACE_DEFINED__ */ @@ -6526,7 +6411,6 @@ enum tagSORTDIRECTION { SORT_DESCENDING = -1, SORT_ASCENDING = 1 }; - #endif typedef int SORTDIRECTION; @@ -6543,6 +6427,9 @@ typedef enum FVTEXTTYPE { #ifndef __IShellItemArray_FWD_DEFINED__ #define __IShellItemArray_FWD_DEFINED__ typedef interface IShellItemArray IShellItemArray; +#ifdef __cplusplus +interface IShellItemArray; +#endif /* __cplusplus */ #endif @@ -6669,77 +6556,77 @@ typedef struct IFolderView2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFolderView2* This, + IFolderView2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFolderView2* This); + IFolderView2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IFolderView2* This); + IFolderView2 *This); /*** IFolderView methods ***/ HRESULT (STDMETHODCALLTYPE *GetCurrentViewMode)( - IFolderView2* This, + IFolderView2 *This, UINT *pViewMode); HRESULT (STDMETHODCALLTYPE *SetCurrentViewMode)( - IFolderView2* This, + IFolderView2 *This, UINT ViewMode); HRESULT (STDMETHODCALLTYPE *GetFolder)( - IFolderView2* This, + IFolderView2 *This, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *Item)( - IFolderView2* This, + IFolderView2 *This, int iItemIndex, PITEMID_CHILD *ppidl); HRESULT (STDMETHODCALLTYPE *ItemCount)( - IFolderView2* This, + IFolderView2 *This, UINT uFlags, int *pcItems); HRESULT (STDMETHODCALLTYPE *Items)( - IFolderView2* This, + IFolderView2 *This, UINT uFlags, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetSelectionMarkedItem)( - IFolderView2* This, + IFolderView2 *This, int *piItem); HRESULT (STDMETHODCALLTYPE *GetFocusedItem)( - IFolderView2* This, + IFolderView2 *This, int *piItem); HRESULT (STDMETHODCALLTYPE *GetItemPosition)( - IFolderView2* This, + IFolderView2 *This, PCUITEMID_CHILD pidl, POINT *ppt); HRESULT (STDMETHODCALLTYPE *GetSpacing)( - IFolderView2* This, + IFolderView2 *This, POINT *ppt); HRESULT (STDMETHODCALLTYPE *GetDefaultSpacing)( - IFolderView2* This, + IFolderView2 *This, POINT *ppt); HRESULT (STDMETHODCALLTYPE *GetAutoArrange)( - IFolderView2* This); + IFolderView2 *This); HRESULT (STDMETHODCALLTYPE *SelectItem)( - IFolderView2* This, + IFolderView2 *This, int iItem, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *SelectAndPositionItems)( - IFolderView2* This, + IFolderView2 *This, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, POINT *apt, @@ -6747,126 +6634,127 @@ typedef struct IFolderView2Vtbl { /*** IFolderView2 methods ***/ HRESULT (STDMETHODCALLTYPE *SetGroupBy)( - IFolderView2* This, + IFolderView2 *This, REFPROPERTYKEY key, WINBOOL fAscending); HRESULT (STDMETHODCALLTYPE *GetGroupBy)( - IFolderView2* This, + IFolderView2 *This, PROPERTYKEY *pkey, WINBOOL *pfAscending); HRESULT (STDMETHODCALLTYPE *SetViewProperty)( - IFolderView2* This, + IFolderView2 *This, PCUITEMID_CHILD pidl, REFPROPERTYKEY propkey, REFPROPVARIANT propvar); HRESULT (STDMETHODCALLTYPE *GetViewProperty)( - IFolderView2* This, + IFolderView2 *This, PCUITEMID_CHILD pidl, REFPROPERTYKEY propkey, PROPVARIANT *ppropvar); HRESULT (STDMETHODCALLTYPE *SetTileViewProperties)( - IFolderView2* This, + IFolderView2 *This, PCUITEMID_CHILD pidl, LPCWSTR pszPropList); HRESULT (STDMETHODCALLTYPE *SetExtendedTileViewProperties)( - IFolderView2* This, + IFolderView2 *This, PCUITEMID_CHILD pidl, LPCWSTR pszPropList); HRESULT (STDMETHODCALLTYPE *SetText)( - IFolderView2* This, + IFolderView2 *This, FVTEXTTYPE iType, LPCWSTR pwszText); HRESULT (STDMETHODCALLTYPE *SetCurrentFolderFlags)( - IFolderView2* This, + IFolderView2 *This, DWORD dwMask, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetCurrentFolderFlags)( - IFolderView2* This, + IFolderView2 *This, DWORD *pdwFlags); HRESULT (STDMETHODCALLTYPE *GetSortColumnCount)( - IFolderView2* This, + IFolderView2 *This, int *pcColumns); HRESULT (STDMETHODCALLTYPE *SetSortColumns)( - IFolderView2* This, + IFolderView2 *This, const SORTCOLUMN *rgSortColumns, int cColumns); HRESULT (STDMETHODCALLTYPE *GetSortColumns)( - IFolderView2* This, + IFolderView2 *This, SORTCOLUMN *rgSortColumns, int cColumns); HRESULT (STDMETHODCALLTYPE *GetItem)( - IFolderView2* This, + IFolderView2 *This, int iItem, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetVisibleItem)( - IFolderView2* This, + IFolderView2 *This, int iStart, WINBOOL fPrevious, int *piItem); HRESULT (STDMETHODCALLTYPE *GetSelectedItem)( - IFolderView2* This, + IFolderView2 *This, int iStart, int *piItem); HRESULT (STDMETHODCALLTYPE *GetSelection)( - IFolderView2* This, + IFolderView2 *This, WINBOOL fNoneImpliesFolder, IShellItemArray **ppsia); HRESULT (STDMETHODCALLTYPE *GetSelectionState)( - IFolderView2* This, + IFolderView2 *This, PCUITEMID_CHILD pidl, DWORD *pdwFlags); HRESULT (STDMETHODCALLTYPE *InvokeVerbOnSelection)( - IFolderView2* This, + IFolderView2 *This, LPCSTR pszVerb); HRESULT (STDMETHODCALLTYPE *SetViewModeAndIconSize)( - IFolderView2* This, + IFolderView2 *This, FOLDERVIEWMODE uViewMode, int iImageSize); HRESULT (STDMETHODCALLTYPE *GetViewModeAndIconSize)( - IFolderView2* This, + IFolderView2 *This, FOLDERVIEWMODE *puViewMode, int *piImageSize); HRESULT (STDMETHODCALLTYPE *SetGroupSubsetCount)( - IFolderView2* This, + IFolderView2 *This, UINT cVisibleRows); HRESULT (STDMETHODCALLTYPE *GetGroupSubsetCount)( - IFolderView2* This, + IFolderView2 *This, UINT *pcVisibleRows); HRESULT (STDMETHODCALLTYPE *SetRedraw)( - IFolderView2* This, + IFolderView2 *This, WINBOOL fRedrawOn); HRESULT (STDMETHODCALLTYPE *IsMoveInSameFolder)( - IFolderView2* This); + IFolderView2 *This); HRESULT (STDMETHODCALLTYPE *DoRename)( - IFolderView2* This); + IFolderView2 *This); END_INTERFACE } IFolderView2Vtbl; + interface IFolderView2 { CONST_VTBL IFolderView2Vtbl* lpVtbl; }; @@ -7053,15 +6941,6 @@ static FORCEINLINE HRESULT IFolderView2_DoRename(IFolderView2* This) { #endif -HRESULT STDMETHODCALLTYPE IFolderView2_SetGroupBy_Proxy( - IFolderView2* This, - REFPROPERTYKEY key, - WINBOOL fAscending); -void __RPC_STUB IFolderView2_SetGroupBy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE IFolderView2_RemoteGetGroupBy_Proxy( IFolderView2* This, PROPERTYKEY *pkey, @@ -7071,207 +6950,6 @@ void __RPC_STUB IFolderView2_RemoteGetGroupBy_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView2_SetViewProperty_Proxy( - IFolderView2* This, - PCUITEMID_CHILD pidl, - REFPROPERTYKEY propkey, - REFPROPVARIANT propvar); -void __RPC_STUB IFolderView2_SetViewProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView2_GetViewProperty_Proxy( - IFolderView2* This, - PCUITEMID_CHILD pidl, - REFPROPERTYKEY propkey, - PROPVARIANT *ppropvar); -void __RPC_STUB IFolderView2_GetViewProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView2_SetTileViewProperties_Proxy( - IFolderView2* This, - PCUITEMID_CHILD pidl, - LPCWSTR pszPropList); -void __RPC_STUB IFolderView2_SetTileViewProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView2_SetExtendedTileViewProperties_Proxy( - IFolderView2* This, - PCUITEMID_CHILD pidl, - LPCWSTR pszPropList); -void __RPC_STUB IFolderView2_SetExtendedTileViewProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView2_SetText_Proxy( - IFolderView2* This, - FVTEXTTYPE iType, - LPCWSTR pwszText); -void __RPC_STUB IFolderView2_SetText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView2_SetCurrentFolderFlags_Proxy( - IFolderView2* This, - DWORD dwMask, - DWORD dwFlags); -void __RPC_STUB IFolderView2_SetCurrentFolderFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView2_GetCurrentFolderFlags_Proxy( - IFolderView2* This, - DWORD *pdwFlags); -void __RPC_STUB IFolderView2_GetCurrentFolderFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView2_GetSortColumnCount_Proxy( - IFolderView2* This, - int *pcColumns); -void __RPC_STUB IFolderView2_GetSortColumnCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView2_SetSortColumns_Proxy( - IFolderView2* This, - const SORTCOLUMN *rgSortColumns, - int cColumns); -void __RPC_STUB IFolderView2_SetSortColumns_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView2_GetSortColumns_Proxy( - IFolderView2* This, - SORTCOLUMN *rgSortColumns, - int cColumns); -void __RPC_STUB IFolderView2_GetSortColumns_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView2_GetItem_Proxy( - IFolderView2* This, - int iItem, - REFIID riid, - void **ppv); -void __RPC_STUB IFolderView2_GetItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView2_GetVisibleItem_Proxy( - IFolderView2* This, - int iStart, - WINBOOL fPrevious, - int *piItem); -void __RPC_STUB IFolderView2_GetVisibleItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView2_GetSelectedItem_Proxy( - IFolderView2* This, - int iStart, - int *piItem); -void __RPC_STUB IFolderView2_GetSelectedItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView2_GetSelection_Proxy( - IFolderView2* This, - WINBOOL fNoneImpliesFolder, - IShellItemArray **ppsia); -void __RPC_STUB IFolderView2_GetSelection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView2_GetSelectionState_Proxy( - IFolderView2* This, - PCUITEMID_CHILD pidl, - DWORD *pdwFlags); -void __RPC_STUB IFolderView2_GetSelectionState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView2_InvokeVerbOnSelection_Proxy( - IFolderView2* This, - LPCSTR pszVerb); -void __RPC_STUB IFolderView2_InvokeVerbOnSelection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView2_SetViewModeAndIconSize_Proxy( - IFolderView2* This, - FOLDERVIEWMODE uViewMode, - int iImageSize); -void __RPC_STUB IFolderView2_SetViewModeAndIconSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView2_GetViewModeAndIconSize_Proxy( - IFolderView2* This, - FOLDERVIEWMODE *puViewMode, - int *piImageSize); -void __RPC_STUB IFolderView2_GetViewModeAndIconSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView2_SetGroupSubsetCount_Proxy( - IFolderView2* This, - UINT cVisibleRows); -void __RPC_STUB IFolderView2_SetGroupSubsetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView2_GetGroupSubsetCount_Proxy( - IFolderView2* This, - UINT *pcVisibleRows); -void __RPC_STUB IFolderView2_GetGroupSubsetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView2_SetRedraw_Proxy( - IFolderView2* This, - WINBOOL fRedrawOn); -void __RPC_STUB IFolderView2_SetRedraw_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView2_IsMoveInSameFolder_Proxy( - IFolderView2* This); -void __RPC_STUB IFolderView2_IsMoveInSameFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderView2_DoRename_Proxy( - IFolderView2* This); -void __RPC_STUB IFolderView2_DoRename_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IFolderView2_GetGroupBy_Proxy( IFolderView2* This, PROPERTYKEY *pkey, @@ -7332,52 +7010,53 @@ typedef struct IFolderViewSettingsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFolderViewSettings* This, + IFolderViewSettings *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFolderViewSettings* This); + IFolderViewSettings *This); ULONG (STDMETHODCALLTYPE *Release)( - IFolderViewSettings* This); + IFolderViewSettings *This); /*** IFolderViewSettings methods ***/ HRESULT (STDMETHODCALLTYPE *GetColumnPropertyList)( - IFolderViewSettings* This, + IFolderViewSettings *This, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetGroupByProperty)( - IFolderViewSettings* This, + IFolderViewSettings *This, PROPERTYKEY *pkey, WINBOOL *pfGroupAscending); HRESULT (STDMETHODCALLTYPE *GetViewMode)( - IFolderViewSettings* This, + IFolderViewSettings *This, FOLDERLOGICALVIEWMODE *plvm); HRESULT (STDMETHODCALLTYPE *GetIconSize)( - IFolderViewSettings* This, + IFolderViewSettings *This, UINT *puIconSize); HRESULT (STDMETHODCALLTYPE *GetFolderFlags)( - IFolderViewSettings* This, + IFolderViewSettings *This, FOLDERFLAGS *pfolderMask, FOLDERFLAGS *pfolderFlags); HRESULT (STDMETHODCALLTYPE *GetSortColumns)( - IFolderViewSettings* This, + IFolderViewSettings *This, SORTCOLUMN *rgSortColumns, UINT cColumnsIn, UINT *pcColumnsOut); HRESULT (STDMETHODCALLTYPE *GetGroupSubsetCount)( - IFolderViewSettings* This, + IFolderViewSettings *This, UINT *pcVisibleRows); END_INTERFACE } IFolderViewSettingsVtbl; + interface IFolderViewSettings { CONST_VTBL IFolderViewSettingsVtbl* lpVtbl; }; @@ -7434,67 +7113,6 @@ static FORCEINLINE HRESULT IFolderViewSettings_GetGroupSubsetCount(IFolderViewSe #endif -HRESULT STDMETHODCALLTYPE IFolderViewSettings_GetColumnPropertyList_Proxy( - IFolderViewSettings* This, - REFIID riid, - void **ppv); -void __RPC_STUB IFolderViewSettings_GetColumnPropertyList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderViewSettings_GetGroupByProperty_Proxy( - IFolderViewSettings* This, - PROPERTYKEY *pkey, - WINBOOL *pfGroupAscending); -void __RPC_STUB IFolderViewSettings_GetGroupByProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderViewSettings_GetViewMode_Proxy( - IFolderViewSettings* This, - FOLDERLOGICALVIEWMODE *plvm); -void __RPC_STUB IFolderViewSettings_GetViewMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderViewSettings_GetIconSize_Proxy( - IFolderViewSettings* This, - UINT *puIconSize); -void __RPC_STUB IFolderViewSettings_GetIconSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderViewSettings_GetFolderFlags_Proxy( - IFolderViewSettings* This, - FOLDERFLAGS *pfolderMask, - FOLDERFLAGS *pfolderFlags); -void __RPC_STUB IFolderViewSettings_GetFolderFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderViewSettings_GetSortColumns_Proxy( - IFolderViewSettings* This, - SORTCOLUMN *rgSortColumns, - UINT cColumnsIn, - UINT *pcColumnsOut); -void __RPC_STUB IFolderViewSettings_GetSortColumns_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderViewSettings_GetGroupSubsetCount_Proxy( - IFolderViewSettings* This, - UINT *pcVisibleRows); -void __RPC_STUB IFolderViewSettings_GetGroupSubsetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFolderViewSettings_INTERFACE_DEFINED__ */ @@ -7532,31 +7150,32 @@ typedef struct IPreviewHandlerVisualsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPreviewHandlerVisuals* This, + IPreviewHandlerVisuals *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPreviewHandlerVisuals* This); + IPreviewHandlerVisuals *This); ULONG (STDMETHODCALLTYPE *Release)( - IPreviewHandlerVisuals* This); + IPreviewHandlerVisuals *This); /*** IPreviewHandlerVisuals methods ***/ HRESULT (STDMETHODCALLTYPE *SetBackgroundColor)( - IPreviewHandlerVisuals* This, + IPreviewHandlerVisuals *This, COLORREF color); HRESULT (STDMETHODCALLTYPE *SetFont)( - IPreviewHandlerVisuals* This, + IPreviewHandlerVisuals *This, const LOGFONTW *plf); HRESULT (STDMETHODCALLTYPE *SetTextColor)( - IPreviewHandlerVisuals* This, + IPreviewHandlerVisuals *This, COLORREF color); END_INTERFACE } IPreviewHandlerVisualsVtbl; + interface IPreviewHandlerVisuals { CONST_VTBL IPreviewHandlerVisualsVtbl* lpVtbl; }; @@ -7597,30 +7216,6 @@ static FORCEINLINE HRESULT IPreviewHandlerVisuals_SetTextColor(IPreviewHandlerVi #endif -HRESULT STDMETHODCALLTYPE IPreviewHandlerVisuals_SetBackgroundColor_Proxy( - IPreviewHandlerVisuals* This, - COLORREF color); -void __RPC_STUB IPreviewHandlerVisuals_SetBackgroundColor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPreviewHandlerVisuals_SetFont_Proxy( - IPreviewHandlerVisuals* This, - const LOGFONTW *plf); -void __RPC_STUB IPreviewHandlerVisuals_SetFont_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPreviewHandlerVisuals_SetTextColor_Proxy( - IPreviewHandlerVisuals* This, - COLORREF color); -void __RPC_STUB IPreviewHandlerVisuals_SetTextColor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPreviewHandlerVisuals_INTERFACE_DEFINED__ */ @@ -7690,56 +7285,57 @@ typedef struct IVisualPropertiesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IVisualProperties* This, + IVisualProperties *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IVisualProperties* This); + IVisualProperties *This); ULONG (STDMETHODCALLTYPE *Release)( - IVisualProperties* This); + IVisualProperties *This); /*** IVisualProperties methods ***/ HRESULT (STDMETHODCALLTYPE *SetWatermark)( - IVisualProperties* This, + IVisualProperties *This, HBITMAP hbmp, VPWATERMARKFLAGS vpwf); HRESULT (STDMETHODCALLTYPE *SetColor)( - IVisualProperties* This, + IVisualProperties *This, VPCOLORFLAGS vpcf, COLORREF cr); HRESULT (STDMETHODCALLTYPE *GetColor)( - IVisualProperties* This, + IVisualProperties *This, VPCOLORFLAGS vpcf, COLORREF *pcr); HRESULT (STDMETHODCALLTYPE *SetItemHeight)( - IVisualProperties* This, + IVisualProperties *This, int cyItemInPixels); HRESULT (STDMETHODCALLTYPE *GetItemHeight)( - IVisualProperties* This, + IVisualProperties *This, int *cyItemInPixels); HRESULT (STDMETHODCALLTYPE *SetFont)( - IVisualProperties* This, + IVisualProperties *This, const LOGFONTW *plf, WINBOOL bRedraw); HRESULT (STDMETHODCALLTYPE *GetFont)( - IVisualProperties* This, + IVisualProperties *This, LOGFONTW *plf); HRESULT (STDMETHODCALLTYPE *SetTheme)( - IVisualProperties* This, + IVisualProperties *This, LPCWSTR pszSubAppName, LPCWSTR pszSubIdList); END_INTERFACE } IVisualPropertiesVtbl; + interface IVisualProperties { CONST_VTBL IVisualPropertiesVtbl* lpVtbl; }; @@ -7800,75 +7396,6 @@ static FORCEINLINE HRESULT IVisualProperties_SetTheme(IVisualProperties* This,LP #endif -HRESULT STDMETHODCALLTYPE IVisualProperties_SetWatermark_Proxy( - IVisualProperties* This, - HBITMAP hbmp, - VPWATERMARKFLAGS vpwf); -void __RPC_STUB IVisualProperties_SetWatermark_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVisualProperties_SetColor_Proxy( - IVisualProperties* This, - VPCOLORFLAGS vpcf, - COLORREF cr); -void __RPC_STUB IVisualProperties_SetColor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVisualProperties_GetColor_Proxy( - IVisualProperties* This, - VPCOLORFLAGS vpcf, - COLORREF *pcr); -void __RPC_STUB IVisualProperties_GetColor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVisualProperties_SetItemHeight_Proxy( - IVisualProperties* This, - int cyItemInPixels); -void __RPC_STUB IVisualProperties_SetItemHeight_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVisualProperties_GetItemHeight_Proxy( - IVisualProperties* This, - int *cyItemInPixels); -void __RPC_STUB IVisualProperties_GetItemHeight_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVisualProperties_SetFont_Proxy( - IVisualProperties* This, - const LOGFONTW *plf, - WINBOOL bRedraw); -void __RPC_STUB IVisualProperties_SetFont_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVisualProperties_GetFont_Proxy( - IVisualProperties* This, - LOGFONTW *plf); -void __RPC_STUB IVisualProperties_GetFont_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVisualProperties_SetTheme_Proxy( - IVisualProperties* This, - LPCWSTR pszSubAppName, - LPCWSTR pszSubIdList); -void __RPC_STUB IVisualProperties_SetTheme_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IVisualProperties_INTERFACE_DEFINED__ */ @@ -7912,33 +7439,34 @@ typedef struct ICommDlgBrowserVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICommDlgBrowser* This, + ICommDlgBrowser *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICommDlgBrowser* This); + ICommDlgBrowser *This); ULONG (STDMETHODCALLTYPE *Release)( - ICommDlgBrowser* This); + ICommDlgBrowser *This); /*** ICommDlgBrowser methods ***/ HRESULT (STDMETHODCALLTYPE *OnDefaultCommand)( - ICommDlgBrowser* This, + ICommDlgBrowser *This, IShellView *ppshv); HRESULT (STDMETHODCALLTYPE *OnStateChange)( - ICommDlgBrowser* This, + ICommDlgBrowser *This, IShellView *ppshv, ULONG uChange); HRESULT (STDMETHODCALLTYPE *IncludeObject)( - ICommDlgBrowser* This, + ICommDlgBrowser *This, IShellView *ppshv, PCUITEMID_CHILD pidl); END_INTERFACE } ICommDlgBrowserVtbl; + interface ICommDlgBrowser { CONST_VTBL ICommDlgBrowserVtbl* lpVtbl; }; @@ -7979,32 +7507,6 @@ static FORCEINLINE HRESULT ICommDlgBrowser_IncludeObject(ICommDlgBrowser* This,I #endif -HRESULT STDMETHODCALLTYPE ICommDlgBrowser_OnDefaultCommand_Proxy( - ICommDlgBrowser* This, - IShellView *ppshv); -void __RPC_STUB ICommDlgBrowser_OnDefaultCommand_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICommDlgBrowser_OnStateChange_Proxy( - ICommDlgBrowser* This, - IShellView *ppshv, - ULONG uChange); -void __RPC_STUB ICommDlgBrowser_OnStateChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICommDlgBrowser_IncludeObject_Proxy( - ICommDlgBrowser* This, - IShellView *ppshv, - PCUITEMID_CHILD pidl); -void __RPC_STUB ICommDlgBrowser_IncludeObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICommDlgBrowser_INTERFACE_DEFINED__ */ @@ -8058,49 +7560,50 @@ typedef struct ICommDlgBrowser2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICommDlgBrowser2* This, + ICommDlgBrowser2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICommDlgBrowser2* This); + ICommDlgBrowser2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ICommDlgBrowser2* This); + ICommDlgBrowser2 *This); /*** ICommDlgBrowser methods ***/ HRESULT (STDMETHODCALLTYPE *OnDefaultCommand)( - ICommDlgBrowser2* This, + ICommDlgBrowser2 *This, IShellView *ppshv); HRESULT (STDMETHODCALLTYPE *OnStateChange)( - ICommDlgBrowser2* This, + ICommDlgBrowser2 *This, IShellView *ppshv, ULONG uChange); HRESULT (STDMETHODCALLTYPE *IncludeObject)( - ICommDlgBrowser2* This, + ICommDlgBrowser2 *This, IShellView *ppshv, PCUITEMID_CHILD pidl); /*** ICommDlgBrowser2 methods ***/ HRESULT (STDMETHODCALLTYPE *Notify)( - ICommDlgBrowser2* This, + ICommDlgBrowser2 *This, IShellView *ppshv, DWORD dwNotifyType); HRESULT (STDMETHODCALLTYPE *GetDefaultMenuText)( - ICommDlgBrowser2* This, + ICommDlgBrowser2 *This, IShellView *ppshv, LPWSTR pszText, int cchMax); HRESULT (STDMETHODCALLTYPE *GetViewFlags)( - ICommDlgBrowser2* This, + ICommDlgBrowser2 *This, DWORD *pdwFlags); END_INTERFACE } ICommDlgBrowser2Vtbl; + interface ICommDlgBrowser2 { CONST_VTBL ICommDlgBrowser2Vtbl* lpVtbl; }; @@ -8155,33 +7658,6 @@ static FORCEINLINE HRESULT ICommDlgBrowser2_GetViewFlags(ICommDlgBrowser2* This, #endif -HRESULT STDMETHODCALLTYPE ICommDlgBrowser2_Notify_Proxy( - ICommDlgBrowser2* This, - IShellView *ppshv, - DWORD dwNotifyType); -void __RPC_STUB ICommDlgBrowser2_Notify_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICommDlgBrowser2_GetDefaultMenuText_Proxy( - ICommDlgBrowser2* This, - IShellView *ppshv, - LPWSTR pszText, - int cchMax); -void __RPC_STUB ICommDlgBrowser2_GetDefaultMenuText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICommDlgBrowser2_GetViewFlags_Proxy( - ICommDlgBrowser2* This, - DWORD *pdwFlags); -void __RPC_STUB ICommDlgBrowser2_GetViewFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICommDlgBrowser2_INTERFACE_DEFINED__ */ @@ -8220,64 +7696,65 @@ typedef struct ICommDlgBrowser3Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICommDlgBrowser3* This, + ICommDlgBrowser3 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICommDlgBrowser3* This); + ICommDlgBrowser3 *This); ULONG (STDMETHODCALLTYPE *Release)( - ICommDlgBrowser3* This); + ICommDlgBrowser3 *This); /*** ICommDlgBrowser methods ***/ HRESULT (STDMETHODCALLTYPE *OnDefaultCommand)( - ICommDlgBrowser3* This, + ICommDlgBrowser3 *This, IShellView *ppshv); HRESULT (STDMETHODCALLTYPE *OnStateChange)( - ICommDlgBrowser3* This, + ICommDlgBrowser3 *This, IShellView *ppshv, ULONG uChange); HRESULT (STDMETHODCALLTYPE *IncludeObject)( - ICommDlgBrowser3* This, + ICommDlgBrowser3 *This, IShellView *ppshv, PCUITEMID_CHILD pidl); /*** ICommDlgBrowser2 methods ***/ HRESULT (STDMETHODCALLTYPE *Notify)( - ICommDlgBrowser3* This, + ICommDlgBrowser3 *This, IShellView *ppshv, DWORD dwNotifyType); HRESULT (STDMETHODCALLTYPE *GetDefaultMenuText)( - ICommDlgBrowser3* This, + ICommDlgBrowser3 *This, IShellView *ppshv, LPWSTR pszText, int cchMax); HRESULT (STDMETHODCALLTYPE *GetViewFlags)( - ICommDlgBrowser3* This, + ICommDlgBrowser3 *This, DWORD *pdwFlags); /*** ICommDlgBrowser3 methods ***/ HRESULT (STDMETHODCALLTYPE *OnColumnClicked)( - ICommDlgBrowser3* This, + ICommDlgBrowser3 *This, IShellView *ppshv, int iColumn); HRESULT (STDMETHODCALLTYPE *GetCurrentFilter)( - ICommDlgBrowser3* This, + ICommDlgBrowser3 *This, LPWSTR pszFileSpec, int cchFileSpec); HRESULT (STDMETHODCALLTYPE *OnPreViewCreated)( - ICommDlgBrowser3* This, + ICommDlgBrowser3 *This, IShellView *ppshv); END_INTERFACE } ICommDlgBrowser3Vtbl; + interface ICommDlgBrowser3 { CONST_VTBL ICommDlgBrowser3Vtbl* lpVtbl; }; @@ -8346,32 +7823,6 @@ static FORCEINLINE HRESULT ICommDlgBrowser3_OnPreViewCreated(ICommDlgBrowser3* T #endif -HRESULT STDMETHODCALLTYPE ICommDlgBrowser3_OnColumnClicked_Proxy( - ICommDlgBrowser3* This, - IShellView *ppshv, - int iColumn); -void __RPC_STUB ICommDlgBrowser3_OnColumnClicked_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICommDlgBrowser3_GetCurrentFilter_Proxy( - ICommDlgBrowser3* This, - LPWSTR pszFileSpec, - int cchFileSpec); -void __RPC_STUB ICommDlgBrowser3_GetCurrentFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICommDlgBrowser3_OnPreViewCreated_Proxy( - ICommDlgBrowser3* This, - IShellView *ppshv); -void __RPC_STUB ICommDlgBrowser3_OnPreViewCreated_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICommDlgBrowser3_INTERFACE_DEFINED__ */ @@ -8460,45 +7911,46 @@ typedef struct IColumnManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IColumnManager* This, + IColumnManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IColumnManager* This); + IColumnManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IColumnManager* This); + IColumnManager *This); /*** IColumnManager methods ***/ HRESULT (STDMETHODCALLTYPE *SetColumnInfo)( - IColumnManager* This, + IColumnManager *This, REFPROPERTYKEY propkey, const CM_COLUMNINFO *pcmci); HRESULT (STDMETHODCALLTYPE *GetColumnInfo)( - IColumnManager* This, + IColumnManager *This, REFPROPERTYKEY propkey, CM_COLUMNINFO *pcmci); HRESULT (STDMETHODCALLTYPE *GetColumnCount)( - IColumnManager* This, + IColumnManager *This, CM_ENUM_FLAGS dwFlags, UINT *puCount); HRESULT (STDMETHODCALLTYPE *GetColumns)( - IColumnManager* This, + IColumnManager *This, CM_ENUM_FLAGS dwFlags, PROPERTYKEY *rgkeyOrder, UINT cColumns); HRESULT (STDMETHODCALLTYPE *SetColumns)( - IColumnManager* This, + IColumnManager *This, const PROPERTYKEY *rgkeyOrder, UINT cVisible); END_INTERFACE } IColumnManagerVtbl; + interface IColumnManager { CONST_VTBL IColumnManagerVtbl* lpVtbl; }; @@ -8547,52 +7999,6 @@ static FORCEINLINE HRESULT IColumnManager_SetColumns(IColumnManager* This,const #endif -HRESULT STDMETHODCALLTYPE IColumnManager_SetColumnInfo_Proxy( - IColumnManager* This, - REFPROPERTYKEY propkey, - const CM_COLUMNINFO *pcmci); -void __RPC_STUB IColumnManager_SetColumnInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IColumnManager_GetColumnInfo_Proxy( - IColumnManager* This, - REFPROPERTYKEY propkey, - CM_COLUMNINFO *pcmci); -void __RPC_STUB IColumnManager_GetColumnInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IColumnManager_GetColumnCount_Proxy( - IColumnManager* This, - CM_ENUM_FLAGS dwFlags, - UINT *puCount); -void __RPC_STUB IColumnManager_GetColumnCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IColumnManager_GetColumns_Proxy( - IColumnManager* This, - CM_ENUM_FLAGS dwFlags, - PROPERTYKEY *rgkeyOrder, - UINT cColumns); -void __RPC_STUB IColumnManager_GetColumns_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IColumnManager_SetColumns_Proxy( - IColumnManager* This, - const PROPERTYKEY *rgkeyOrder, - UINT cVisible); -void __RPC_STUB IColumnManager_SetColumns_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IColumnManager_INTERFACE_DEFINED__ */ @@ -8622,23 +8028,24 @@ typedef struct IFolderFilterSiteVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFolderFilterSite* This, + IFolderFilterSite *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFolderFilterSite* This); + IFolderFilterSite *This); ULONG (STDMETHODCALLTYPE *Release)( - IFolderFilterSite* This); + IFolderFilterSite *This); /*** IFolderFilterSite methods ***/ HRESULT (STDMETHODCALLTYPE *SetFilter)( - IFolderFilterSite* This, + IFolderFilterSite *This, IUnknown *punk); END_INTERFACE } IFolderFilterSiteVtbl; + interface IFolderFilterSite { CONST_VTBL IFolderFilterSiteVtbl* lpVtbl; }; @@ -8671,14 +8078,6 @@ static FORCEINLINE HRESULT IFolderFilterSite_SetFilter(IFolderFilterSite* This,I #endif -HRESULT STDMETHODCALLTYPE IFolderFilterSite_SetFilter_Proxy( - IFolderFilterSite* This, - IUnknown *punk); -void __RPC_STUB IFolderFilterSite_SetFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFolderFilterSite_INTERFACE_DEFINED__ */ @@ -8715,25 +8114,25 @@ typedef struct IFolderFilterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFolderFilter* This, + IFolderFilter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFolderFilter* This); + IFolderFilter *This); ULONG (STDMETHODCALLTYPE *Release)( - IFolderFilter* This); + IFolderFilter *This); /*** IFolderFilter methods ***/ HRESULT (STDMETHODCALLTYPE *ShouldShow)( - IFolderFilter* This, + IFolderFilter *This, IShellFolder *psf, PCIDLIST_ABSOLUTE pidlFolder, PCUITEMID_CHILD pidlItem); HRESULT (STDMETHODCALLTYPE *GetEnumFlags)( - IFolderFilter* This, + IFolderFilter *This, IShellFolder *psf, PCIDLIST_ABSOLUTE pidlFolder, HWND *phwnd, @@ -8741,6 +8140,7 @@ typedef struct IFolderFilterVtbl { END_INTERFACE } IFolderFilterVtbl; + interface IFolderFilter { CONST_VTBL IFolderFilterVtbl* lpVtbl; }; @@ -8777,27 +8177,6 @@ static FORCEINLINE HRESULT IFolderFilter_GetEnumFlags(IFolderFilter* This,IShell #endif -HRESULT STDMETHODCALLTYPE IFolderFilter_ShouldShow_Proxy( - IFolderFilter* This, - IShellFolder *psf, - PCIDLIST_ABSOLUTE pidlFolder, - PCUITEMID_CHILD pidlItem); -void __RPC_STUB IFolderFilter_ShouldShow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderFilter_GetEnumFlags_Proxy( - IFolderFilter* This, - IShellFolder *psf, - PCIDLIST_ABSOLUTE pidlFolder, - HWND *phwnd, - DWORD *pgrfFlags); -void __RPC_STUB IFolderFilter_GetEnumFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFolderFilter_INTERFACE_DEFINED__ */ @@ -8827,24 +8206,25 @@ typedef struct IInputObjectSiteVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInputObjectSite* This, + IInputObjectSite *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInputObjectSite* This); + IInputObjectSite *This); ULONG (STDMETHODCALLTYPE *Release)( - IInputObjectSite* This); + IInputObjectSite *This); /*** IInputObjectSite methods ***/ HRESULT (STDMETHODCALLTYPE *OnFocusChangeIS)( - IInputObjectSite* This, + IInputObjectSite *This, IUnknown *punkObj, WINBOOL fSetFocus); END_INTERFACE } IInputObjectSiteVtbl; + interface IInputObjectSite { CONST_VTBL IInputObjectSiteVtbl* lpVtbl; }; @@ -8877,15 +8257,6 @@ static FORCEINLINE HRESULT IInputObjectSite_OnFocusChangeIS(IInputObjectSite* Th #endif -HRESULT STDMETHODCALLTYPE IInputObjectSite_OnFocusChangeIS_Proxy( - IInputObjectSite* This, - IUnknown *punkObj, - WINBOOL fSetFocus); -void __RPC_STUB IInputObjectSite_OnFocusChangeIS_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInputObjectSite_INTERFACE_DEFINED__ */ @@ -8921,31 +8292,32 @@ typedef struct IInputObjectVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInputObject* This, + IInputObject *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInputObject* This); + IInputObject *This); ULONG (STDMETHODCALLTYPE *Release)( - IInputObject* This); + IInputObject *This); /*** IInputObject methods ***/ HRESULT (STDMETHODCALLTYPE *UIActivateIO)( - IInputObject* This, + IInputObject *This, WINBOOL fActivate, MSG *pMsg); HRESULT (STDMETHODCALLTYPE *HasFocusIO)( - IInputObject* This); + IInputObject *This); HRESULT (STDMETHODCALLTYPE *TranslateAcceleratorIO)( - IInputObject* This, + IInputObject *This, MSG *pMsg); END_INTERFACE } IInputObjectVtbl; + interface IInputObject { CONST_VTBL IInputObjectVtbl* lpVtbl; }; @@ -8986,30 +8358,6 @@ static FORCEINLINE HRESULT IInputObject_TranslateAcceleratorIO(IInputObject* Thi #endif -HRESULT STDMETHODCALLTYPE IInputObject_UIActivateIO_Proxy( - IInputObject* This, - WINBOOL fActivate, - MSG *pMsg); -void __RPC_STUB IInputObject_UIActivateIO_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInputObject_HasFocusIO_Proxy( - IInputObject* This); -void __RPC_STUB IInputObject_HasFocusIO_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInputObject_TranslateAcceleratorIO_Proxy( - IInputObject* This, - MSG *pMsg); -void __RPC_STUB IInputObject_TranslateAcceleratorIO_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInputObject_INTERFACE_DEFINED__ */ @@ -9038,36 +8386,37 @@ typedef struct IInputObject2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInputObject2* This, + IInputObject2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInputObject2* This); + IInputObject2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IInputObject2* This); + IInputObject2 *This); /*** IInputObject methods ***/ HRESULT (STDMETHODCALLTYPE *UIActivateIO)( - IInputObject2* This, + IInputObject2 *This, WINBOOL fActivate, MSG *pMsg); HRESULT (STDMETHODCALLTYPE *HasFocusIO)( - IInputObject2* This); + IInputObject2 *This); HRESULT (STDMETHODCALLTYPE *TranslateAcceleratorIO)( - IInputObject2* This, + IInputObject2 *This, MSG *pMsg); /*** IInputObject2 methods ***/ HRESULT (STDMETHODCALLTYPE *TranslateAcceleratorGlobal)( - IInputObject2* This, + IInputObject2 *This, MSG *pMsg); END_INTERFACE } IInputObject2Vtbl; + interface IInputObject2 { CONST_VTBL IInputObject2Vtbl* lpVtbl; }; @@ -9114,14 +8463,6 @@ static FORCEINLINE HRESULT IInputObject2_TranslateAcceleratorGlobal(IInputObject #endif -HRESULT STDMETHODCALLTYPE IInputObject2_TranslateAcceleratorGlobal_Proxy( - IInputObject2* This, - MSG *pMsg); -void __RPC_STUB IInputObject2_TranslateAcceleratorGlobal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInputObject2_INTERFACE_DEFINED__ */ @@ -9152,25 +8493,26 @@ typedef struct IShellIconVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellIcon* This, + IShellIcon *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellIcon* This); + IShellIcon *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellIcon* This); + IShellIcon *This); /*** IShellIcon methods ***/ HRESULT (STDMETHODCALLTYPE *GetIconOf)( - IShellIcon* This, + IShellIcon *This, PCUITEMID_CHILD pidl, UINT flags, int *pIconIndex); END_INTERFACE } IShellIconVtbl; + interface IShellIcon { CONST_VTBL IShellIconVtbl* lpVtbl; }; @@ -9203,16 +8545,6 @@ static FORCEINLINE HRESULT IShellIcon_GetIconOf(IShellIcon* This,PCUITEMID_CHILD #endif -HRESULT STDMETHODCALLTYPE IShellIcon_GetIconOf_Proxy( - IShellIcon* This, - PCUITEMID_CHILD pidl, - UINT flags, - int *pIconIndex); -void __RPC_STUB IShellIcon_GetIconOf_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellIcon_INTERFACE_DEFINED__ */ @@ -9347,71 +8679,71 @@ typedef struct IShellBrowserVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellBrowser* This, + IShellBrowser *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellBrowser* This); + IShellBrowser *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellBrowser* This); + IShellBrowser *This); /*** IOleWindow methods ***/ HRESULT (STDMETHODCALLTYPE *GetWindow)( - IShellBrowser* This, + IShellBrowser *This, HWND *phwnd); HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)( - IShellBrowser* This, + IShellBrowser *This, WINBOOL fEnterMode); /*** IShellBrowser methods ***/ HRESULT (STDMETHODCALLTYPE *InsertMenusSB)( - IShellBrowser* This, + IShellBrowser *This, HMENU hmenuShared, LPOLEMENUGROUPWIDTHS lpMenuWidths); HRESULT (STDMETHODCALLTYPE *SetMenuSB)( - IShellBrowser* This, + IShellBrowser *This, HMENU hmenuShared, HOLEMENU holemenuRes, HWND hwndActiveObject); HRESULT (STDMETHODCALLTYPE *RemoveMenusSB)( - IShellBrowser* This, + IShellBrowser *This, HMENU hmenuShared); HRESULT (STDMETHODCALLTYPE *SetStatusTextSB)( - IShellBrowser* This, + IShellBrowser *This, LPCWSTR pszStatusText); HRESULT (STDMETHODCALLTYPE *EnableModelessSB)( - IShellBrowser* This, + IShellBrowser *This, WINBOOL fEnable); HRESULT (STDMETHODCALLTYPE *TranslateAcceleratorSB)( - IShellBrowser* This, + IShellBrowser *This, MSG *pmsg, WORD wID); HRESULT (STDMETHODCALLTYPE *BrowseObject)( - IShellBrowser* This, + IShellBrowser *This, PCUIDLIST_RELATIVE pidl, UINT wFlags); HRESULT (STDMETHODCALLTYPE *GetViewStateStream)( - IShellBrowser* This, + IShellBrowser *This, DWORD grfMode, IStream **ppStrm); HRESULT (STDMETHODCALLTYPE *GetControlWindow)( - IShellBrowser* This, + IShellBrowser *This, UINT id, HWND *phwnd); HRESULT (STDMETHODCALLTYPE *SendControlMsg)( - IShellBrowser* This, + IShellBrowser *This, UINT id, UINT uMsg, WPARAM wParam, @@ -9419,21 +8751,22 @@ typedef struct IShellBrowserVtbl { LRESULT *pret); HRESULT (STDMETHODCALLTYPE *QueryActiveShellView)( - IShellBrowser* This, + IShellBrowser *This, IShellView **ppshv); HRESULT (STDMETHODCALLTYPE *OnViewWindowActive)( - IShellBrowser* This, + IShellBrowser *This, IShellView *pshv); HRESULT (STDMETHODCALLTYPE *SetToolbarItems)( - IShellBrowser* This, + IShellBrowser *This, LPTBBUTTONSB lpButtons, UINT nButtons, UINT uFlags); END_INTERFACE } IShellBrowserVtbl; + interface IShellBrowser { CONST_VTBL IShellBrowserVtbl* lpVtbl; }; @@ -9524,101 +8857,6 @@ static FORCEINLINE HRESULT IShellBrowser_SetToolbarItems(IShellBrowser* This,LPT #endif -HRESULT STDMETHODCALLTYPE IShellBrowser_InsertMenusSB_Proxy( - IShellBrowser* This, - HMENU hmenuShared, - LPOLEMENUGROUPWIDTHS lpMenuWidths); -void __RPC_STUB IShellBrowser_InsertMenusSB_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellBrowser_SetMenuSB_Proxy( - IShellBrowser* This, - HMENU hmenuShared, - HOLEMENU holemenuRes, - HWND hwndActiveObject); -void __RPC_STUB IShellBrowser_SetMenuSB_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellBrowser_RemoveMenusSB_Proxy( - IShellBrowser* This, - HMENU hmenuShared); -void __RPC_STUB IShellBrowser_RemoveMenusSB_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellBrowser_SetStatusTextSB_Proxy( - IShellBrowser* This, - LPCWSTR pszStatusText); -void __RPC_STUB IShellBrowser_SetStatusTextSB_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellBrowser_EnableModelessSB_Proxy( - IShellBrowser* This, - WINBOOL fEnable); -void __RPC_STUB IShellBrowser_EnableModelessSB_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellBrowser_TranslateAcceleratorSB_Proxy( - IShellBrowser* This, - MSG *pmsg, - WORD wID); -void __RPC_STUB IShellBrowser_TranslateAcceleratorSB_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellBrowser_BrowseObject_Proxy( - IShellBrowser* This, - PCUIDLIST_RELATIVE pidl, - UINT wFlags); -void __RPC_STUB IShellBrowser_BrowseObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellBrowser_GetViewStateStream_Proxy( - IShellBrowser* This, - DWORD grfMode, - IStream **ppStrm); -void __RPC_STUB IShellBrowser_GetViewStateStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellBrowser_GetControlWindow_Proxy( - IShellBrowser* This, - UINT id, - HWND *phwnd); -void __RPC_STUB IShellBrowser_GetControlWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellBrowser_QueryActiveShellView_Proxy( - IShellBrowser* This, - IShellView **ppshv); -void __RPC_STUB IShellBrowser_QueryActiveShellView_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellBrowser_OnViewWindowActive_Proxy( - IShellBrowser* This, - IShellView *pshv); -void __RPC_STUB IShellBrowser_OnViewWindowActive_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellBrowser_INTERFACE_DEFINED__ */ @@ -9654,29 +8892,30 @@ typedef struct IProfferServiceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IProfferService* This, + IProfferService *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IProfferService* This); + IProfferService *This); ULONG (STDMETHODCALLTYPE *Release)( - IProfferService* This); + IProfferService *This); /*** IProfferService methods ***/ HRESULT (STDMETHODCALLTYPE *ProfferService)( - IProfferService* This, + IProfferService *This, REFGUID guidService, IServiceProvider *psp, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *RevokeService)( - IProfferService* This, + IProfferService *This, DWORD dwCookie); END_INTERFACE } IProfferServiceVtbl; + interface IProfferService { CONST_VTBL IProfferServiceVtbl* lpVtbl; }; @@ -9713,24 +8952,6 @@ static FORCEINLINE HRESULT IProfferService_RevokeService(IProfferService* This,D #endif -HRESULT STDMETHODCALLTYPE IProfferService_ProfferService_Proxy( - IProfferService* This, - REFGUID guidService, - IServiceProvider *psp, - DWORD *pdwCookie); -void __RPC_STUB IProfferService_ProfferService_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IProfferService_RevokeService_Proxy( - IProfferService* This, - DWORD dwCookie); -void __RPC_STUB IProfferService_RevokeService_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IProfferService_INTERFACE_DEFINED__ */ @@ -9765,7 +8986,6 @@ enum _SICHINTF { SICHINT_TEST_FILESYSPATH_IF_NOT_EQUAL = 0x20000000 }; - typedef DWORD SICHINTF; DEFINE_GUID(IID_IShellItem, 0x43826d1e, 0xe718, 0x42ee, 0xbc,0x55, 0xa1,0xe2,0x61,0xc3,0x7b,0xfe); @@ -9805,46 +9025,47 @@ typedef struct IShellItemVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellItem* This, + IShellItem *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellItem* This); + IShellItem *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellItem* This); + IShellItem *This); /*** IShellItem methods ***/ HRESULT (STDMETHODCALLTYPE *BindToHandler)( - IShellItem* This, + IShellItem *This, IBindCtx *pbc, REFGUID bhid, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetParent)( - IShellItem* This, + IShellItem *This, IShellItem **ppsi); HRESULT (STDMETHODCALLTYPE *GetDisplayName)( - IShellItem* This, + IShellItem *This, SIGDN sigdnName, LPWSTR *ppszName); HRESULT (STDMETHODCALLTYPE *GetAttributes)( - IShellItem* This, + IShellItem *This, SFGAOF sfgaoMask, SFGAOF *psfgaoAttribs); HRESULT (STDMETHODCALLTYPE *Compare)( - IShellItem* This, + IShellItem *This, IShellItem *psi, SICHINTF hint, int *piOrder); END_INTERFACE } IShellItemVtbl; + interface IShellItem { CONST_VTBL IShellItemVtbl* lpVtbl; }; @@ -9893,53 +9114,6 @@ static FORCEINLINE HRESULT IShellItem_Compare(IShellItem* This,IShellItem *psi,S #endif -HRESULT STDMETHODCALLTYPE IShellItem_BindToHandler_Proxy( - IShellItem* This, - IBindCtx *pbc, - REFGUID bhid, - REFIID riid, - void **ppv); -void __RPC_STUB IShellItem_BindToHandler_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItem_GetParent_Proxy( - IShellItem* This, - IShellItem **ppsi); -void __RPC_STUB IShellItem_GetParent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItem_GetDisplayName_Proxy( - IShellItem* This, - SIGDN sigdnName, - LPWSTR *ppszName); -void __RPC_STUB IShellItem_GetDisplayName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItem_GetAttributes_Proxy( - IShellItem* This, - SFGAOF sfgaoMask, - SFGAOF *psfgaoAttribs); -void __RPC_STUB IShellItem_GetAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItem_Compare_Proxy( - IShellItem* This, - IShellItem *psi, - SICHINTF hint, - int *piOrder); -void __RPC_STUB IShellItem_Compare_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellItem_INTERFACE_DEFINED__ */ @@ -10060,60 +9234,60 @@ typedef struct IShellItem2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellItem2* This, + IShellItem2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellItem2* This); + IShellItem2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellItem2* This); + IShellItem2 *This); /*** IShellItem methods ***/ HRESULT (STDMETHODCALLTYPE *BindToHandler)( - IShellItem2* This, + IShellItem2 *This, IBindCtx *pbc, REFGUID bhid, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetParent)( - IShellItem2* This, + IShellItem2 *This, IShellItem **ppsi); HRESULT (STDMETHODCALLTYPE *GetDisplayName)( - IShellItem2* This, + IShellItem2 *This, SIGDN sigdnName, LPWSTR *ppszName); HRESULT (STDMETHODCALLTYPE *GetAttributes)( - IShellItem2* This, + IShellItem2 *This, SFGAOF sfgaoMask, SFGAOF *psfgaoAttribs); HRESULT (STDMETHODCALLTYPE *Compare)( - IShellItem2* This, + IShellItem2 *This, IShellItem *psi, SICHINTF hint, int *piOrder); /*** IShellItem2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetPropertyStore)( - IShellItem2* This, + IShellItem2 *This, GETPROPERTYSTOREFLAGS flags, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetPropertyStoreWithCreateObject)( - IShellItem2* This, + IShellItem2 *This, GETPROPERTYSTOREFLAGS flags, IUnknown *punkCreateObject, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetPropertyStoreForKeys)( - IShellItem2* This, + IShellItem2 *This, const PROPERTYKEY *rgKeys, UINT cKeys, GETPROPERTYSTOREFLAGS flags, @@ -10121,57 +9295,58 @@ typedef struct IShellItem2Vtbl { void **ppv); HRESULT (STDMETHODCALLTYPE *GetPropertyDescriptionList)( - IShellItem2* This, + IShellItem2 *This, REFPROPERTYKEY keyType, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *Update)( - IShellItem2* This, + IShellItem2 *This, IBindCtx *pbc); HRESULT (STDMETHODCALLTYPE *GetProperty)( - IShellItem2* This, + IShellItem2 *This, REFPROPERTYKEY key, PROPVARIANT *ppropvar); HRESULT (STDMETHODCALLTYPE *GetCLSID)( - IShellItem2* This, + IShellItem2 *This, REFPROPERTYKEY key, CLSID *pclsid); HRESULT (STDMETHODCALLTYPE *GetFileTime)( - IShellItem2* This, + IShellItem2 *This, REFPROPERTYKEY key, FILETIME *pft); HRESULT (STDMETHODCALLTYPE *GetInt32)( - IShellItem2* This, + IShellItem2 *This, REFPROPERTYKEY key, int *pi); HRESULT (STDMETHODCALLTYPE *GetString)( - IShellItem2* This, + IShellItem2 *This, REFPROPERTYKEY key, LPWSTR *ppsz); HRESULT (STDMETHODCALLTYPE *GetUInt32)( - IShellItem2* This, + IShellItem2 *This, REFPROPERTYKEY key, ULONG *pui); HRESULT (STDMETHODCALLTYPE *GetUInt64)( - IShellItem2* This, + IShellItem2 *This, REFPROPERTYKEY key, ULONGLONG *pull); HRESULT (STDMETHODCALLTYPE *GetBool)( - IShellItem2* This, + IShellItem2 *This, REFPROPERTYKEY key, WINBOOL *pf); END_INTERFACE } IShellItem2Vtbl; + interface IShellItem2 { CONST_VTBL IShellItem2Vtbl* lpVtbl; }; @@ -10274,129 +9449,6 @@ static FORCEINLINE HRESULT IShellItem2_GetBool(IShellItem2* This,REFPROPERTYKEY #endif -HRESULT STDMETHODCALLTYPE IShellItem2_GetPropertyStore_Proxy( - IShellItem2* This, - GETPROPERTYSTOREFLAGS flags, - REFIID riid, - void **ppv); -void __RPC_STUB IShellItem2_GetPropertyStore_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItem2_GetPropertyStoreWithCreateObject_Proxy( - IShellItem2* This, - GETPROPERTYSTOREFLAGS flags, - IUnknown *punkCreateObject, - REFIID riid, - void **ppv); -void __RPC_STUB IShellItem2_GetPropertyStoreWithCreateObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItem2_GetPropertyStoreForKeys_Proxy( - IShellItem2* This, - const PROPERTYKEY *rgKeys, - UINT cKeys, - GETPROPERTYSTOREFLAGS flags, - REFIID riid, - void **ppv); -void __RPC_STUB IShellItem2_GetPropertyStoreForKeys_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItem2_GetPropertyDescriptionList_Proxy( - IShellItem2* This, - REFPROPERTYKEY keyType, - REFIID riid, - void **ppv); -void __RPC_STUB IShellItem2_GetPropertyDescriptionList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItem2_Update_Proxy( - IShellItem2* This, - IBindCtx *pbc); -void __RPC_STUB IShellItem2_Update_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItem2_GetProperty_Proxy( - IShellItem2* This, - REFPROPERTYKEY key, - PROPVARIANT *ppropvar); -void __RPC_STUB IShellItem2_GetProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItem2_GetCLSID_Proxy( - IShellItem2* This, - REFPROPERTYKEY key, - CLSID *pclsid); -void __RPC_STUB IShellItem2_GetCLSID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItem2_GetFileTime_Proxy( - IShellItem2* This, - REFPROPERTYKEY key, - FILETIME *pft); -void __RPC_STUB IShellItem2_GetFileTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItem2_GetInt32_Proxy( - IShellItem2* This, - REFPROPERTYKEY key, - int *pi); -void __RPC_STUB IShellItem2_GetInt32_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItem2_GetString_Proxy( - IShellItem2* This, - REFPROPERTYKEY key, - LPWSTR *ppsz); -void __RPC_STUB IShellItem2_GetString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItem2_GetUInt32_Proxy( - IShellItem2* This, - REFPROPERTYKEY key, - ULONG *pui); -void __RPC_STUB IShellItem2_GetUInt32_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItem2_GetUInt64_Proxy( - IShellItem2* This, - REFPROPERTYKEY key, - ULONGLONG *pull); -void __RPC_STUB IShellItem2_GetUInt64_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItem2_GetBool_Proxy( - IShellItem2* This, - REFPROPERTYKEY key, - WINBOOL *pf); -void __RPC_STUB IShellItem2_GetBool_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellItem2_INTERFACE_DEFINED__ */ @@ -10414,7 +9466,6 @@ enum _SIIGBF { SIIGBF_SCALEUP = 0x100 }; - typedef int SIIGBF; /***************************************************************************** @@ -10443,25 +9494,26 @@ typedef struct IShellItemImageFactoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellItemImageFactory* This, + IShellItemImageFactory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellItemImageFactory* This); + IShellItemImageFactory *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellItemImageFactory* This); + IShellItemImageFactory *This); /*** IShellItemImageFactory methods ***/ HRESULT (STDMETHODCALLTYPE *GetImage)( - IShellItemImageFactory* This, + IShellItemImageFactory *This, SIZE size, SIIGBF flags, HBITMAP *phbm); END_INTERFACE } IShellItemImageFactoryVtbl; + interface IShellItemImageFactory { CONST_VTBL IShellItemImageFactoryVtbl* lpVtbl; }; @@ -10494,16 +9546,6 @@ static FORCEINLINE HRESULT IShellItemImageFactory_GetImage(IShellItemImageFactor #endif -HRESULT STDMETHODCALLTYPE IShellItemImageFactory_GetImage_Proxy( - IShellItemImageFactory* This, - SIZE size, - SIIGBF flags, - HBITMAP *phbm); -void __RPC_STUB IShellItemImageFactory_GetImage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellItemImageFactory_INTERFACE_DEFINED__ */ @@ -10532,23 +9574,24 @@ typedef struct IUserAccountChangeCallbackVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IUserAccountChangeCallback* This, + IUserAccountChangeCallback *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IUserAccountChangeCallback* This); + IUserAccountChangeCallback *This); ULONG (STDMETHODCALLTYPE *Release)( - IUserAccountChangeCallback* This); + IUserAccountChangeCallback *This); /*** IUserAccountChangeCallback methods ***/ HRESULT (STDMETHODCALLTYPE *OnPictureChange)( - IUserAccountChangeCallback* This, + IUserAccountChangeCallback *This, LPCWSTR pszUserName); END_INTERFACE } IUserAccountChangeCallbackVtbl; + interface IUserAccountChangeCallback { CONST_VTBL IUserAccountChangeCallbackVtbl* lpVtbl; }; @@ -10581,14 +9624,6 @@ static FORCEINLINE HRESULT IUserAccountChangeCallback_OnPictureChange(IUserAccou #endif -HRESULT STDMETHODCALLTYPE IUserAccountChangeCallback_OnPictureChange_Proxy( - IUserAccountChangeCallback* This, - LPCWSTR pszUserName); -void __RPC_STUB IUserAccountChangeCallback_OnPictureChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IUserAccountChangeCallback_INTERFACE_DEFINED__ */ @@ -10628,36 +9663,37 @@ typedef struct IEnumShellItemsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumShellItems* This, + IEnumShellItems *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumShellItems* This); + IEnumShellItems *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumShellItems* This); + IEnumShellItems *This); /*** IEnumShellItems methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumShellItems* This, + IEnumShellItems *This, ULONG celt, IShellItem **rgelt, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumShellItems* This, + IEnumShellItems *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumShellItems* This); + IEnumShellItems *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumShellItems* This, + IEnumShellItems *This, IEnumShellItems **ppenum); END_INTERFACE } IEnumShellItemsVtbl; + interface IEnumShellItems { CONST_VTBL IEnumShellItemsVtbl* lpVtbl; }; @@ -10712,29 +9748,6 @@ void __RPC_STUB IEnumShellItems_RemoteNext_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumShellItems_Skip_Proxy( - IEnumShellItems* This, - ULONG celt); -void __RPC_STUB IEnumShellItems_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumShellItems_Reset_Proxy( - IEnumShellItems* This); -void __RPC_STUB IEnumShellItems_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumShellItems_Clone_Proxy( - IEnumShellItems* This, - IEnumShellItems **ppenum); -void __RPC_STUB IEnumShellItems_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IEnumShellItems_Next_Proxy( IEnumShellItems* This, ULONG celt, @@ -10779,7 +9792,6 @@ enum _TRANSFER_SOURCE_FLAGS { TSF_SUSPEND_SHELLEVENTS = 0x800 }; - typedef DWORD TRANSFER_SOURCE_FLAGS; #if _WIN32_IE >= _WIN32_IE_IE70 @@ -10796,7 +9808,6 @@ enum _TRANSFER_ADVISE_STATE { TS_INDETERMINATE = 0x4 }; - typedef DWORD TRANSFER_ADVISE_STATE; DEFINE_GUID(IID_ITransferAdviseSink, 0xd594d0d8, 0x8da7, 0x457b, 0xb3,0xb4, 0xce,0x5d,0xba,0xac,0x0b,0x88); @@ -10850,19 +9861,19 @@ typedef struct ITransferAdviseSinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITransferAdviseSink* This, + ITransferAdviseSink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITransferAdviseSink* This); + ITransferAdviseSink *This); ULONG (STDMETHODCALLTYPE *Release)( - ITransferAdviseSink* This); + ITransferAdviseSink *This); /*** ITransferAdviseSink methods ***/ HRESULT (STDMETHODCALLTYPE *UpdateProgress)( - ITransferAdviseSink* This, + ITransferAdviseSink *This, ULONGLONG ullSizeCurrent, ULONGLONG ullSizeTotal, int nFilesCurrent, @@ -10871,21 +9882,21 @@ typedef struct ITransferAdviseSinkVtbl { int nFoldersTotal); HRESULT (STDMETHODCALLTYPE *UpdateTransferState)( - ITransferAdviseSink* This, + ITransferAdviseSink *This, TRANSFER_ADVISE_STATE ts); HRESULT (STDMETHODCALLTYPE *ConfirmOverwrite)( - ITransferAdviseSink* This, + ITransferAdviseSink *This, IShellItem *psiSource, IShellItem *psiDestParent, LPCWSTR pszName); HRESULT (STDMETHODCALLTYPE *ConfirmEncryptionLoss)( - ITransferAdviseSink* This, + ITransferAdviseSink *This, IShellItem *psiSource); HRESULT (STDMETHODCALLTYPE *FileFailure)( - ITransferAdviseSink* This, + ITransferAdviseSink *This, IShellItem *psi, LPCWSTR pszItem, HRESULT hrError, @@ -10893,19 +9904,20 @@ typedef struct ITransferAdviseSinkVtbl { ULONG cchRename); HRESULT (STDMETHODCALLTYPE *SubStreamFailure)( - ITransferAdviseSink* This, + ITransferAdviseSink *This, IShellItem *psi, LPCWSTR pszStreamName, HRESULT hrError); HRESULT (STDMETHODCALLTYPE *PropertyFailure)( - ITransferAdviseSink* This, + ITransferAdviseSink *This, IShellItem *psi, const PROPERTYKEY *pkey, HRESULT hrError); END_INTERFACE } ITransferAdviseSinkVtbl; + interface ITransferAdviseSink { CONST_VTBL ITransferAdviseSinkVtbl* lpVtbl; }; @@ -10962,77 +9974,6 @@ static FORCEINLINE HRESULT ITransferAdviseSink_PropertyFailure(ITransferAdviseSi #endif -HRESULT STDMETHODCALLTYPE ITransferAdviseSink_UpdateProgress_Proxy( - ITransferAdviseSink* This, - ULONGLONG ullSizeCurrent, - ULONGLONG ullSizeTotal, - int nFilesCurrent, - int nFilesTotal, - int nFoldersCurrent, - int nFoldersTotal); -void __RPC_STUB ITransferAdviseSink_UpdateProgress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITransferAdviseSink_UpdateTransferState_Proxy( - ITransferAdviseSink* This, - TRANSFER_ADVISE_STATE ts); -void __RPC_STUB ITransferAdviseSink_UpdateTransferState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITransferAdviseSink_ConfirmOverwrite_Proxy( - ITransferAdviseSink* This, - IShellItem *psiSource, - IShellItem *psiDestParent, - LPCWSTR pszName); -void __RPC_STUB ITransferAdviseSink_ConfirmOverwrite_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITransferAdviseSink_ConfirmEncryptionLoss_Proxy( - ITransferAdviseSink* This, - IShellItem *psiSource); -void __RPC_STUB ITransferAdviseSink_ConfirmEncryptionLoss_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITransferAdviseSink_FileFailure_Proxy( - ITransferAdviseSink* This, - IShellItem *psi, - LPCWSTR pszItem, - HRESULT hrError, - LPWSTR pszRename, - ULONG cchRename); -void __RPC_STUB ITransferAdviseSink_FileFailure_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITransferAdviseSink_SubStreamFailure_Proxy( - ITransferAdviseSink* This, - IShellItem *psi, - LPCWSTR pszStreamName, - HRESULT hrError); -void __RPC_STUB ITransferAdviseSink_SubStreamFailure_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITransferAdviseSink_PropertyFailure_Proxy( - ITransferAdviseSink* This, - IShellItem *psi, - const PROPERTYKEY *pkey, - HRESULT hrError); -void __RPC_STUB ITransferAdviseSink_PropertyFailure_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ITransferAdviseSink_INTERFACE_DEFINED__ */ @@ -11121,39 +10062,39 @@ typedef struct ITransferSourceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITransferSource* This, + ITransferSource *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITransferSource* This); + ITransferSource *This); ULONG (STDMETHODCALLTYPE *Release)( - ITransferSource* This); + ITransferSource *This); /*** ITransferSource methods ***/ HRESULT (STDMETHODCALLTYPE *Advise)( - ITransferSource* This, + ITransferSource *This, ITransferAdviseSink *psink, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *Unadvise)( - ITransferSource* This, + ITransferSource *This, DWORD dwCookie); HRESULT (STDMETHODCALLTYPE *SetProperties)( - ITransferSource* This, + ITransferSource *This, IPropertyChangeArray *pproparray); HRESULT (STDMETHODCALLTYPE *OpenItem)( - ITransferSource* This, + ITransferSource *This, IShellItem *psi, TRANSFER_SOURCE_FLAGS flags, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *MoveItem)( - ITransferSource* This, + ITransferSource *This, IShellItem *psi, IShellItem *psiParentDst, LPCWSTR pszNameDst, @@ -11161,26 +10102,26 @@ typedef struct ITransferSourceVtbl { IShellItem **ppsiNew); HRESULT (STDMETHODCALLTYPE *RecycleItem)( - ITransferSource* This, + ITransferSource *This, IShellItem *psiSource, IShellItem *psiParentDest, TRANSFER_SOURCE_FLAGS flags, IShellItem **ppsiNewDest); HRESULT (STDMETHODCALLTYPE *RemoveItem)( - ITransferSource* This, + ITransferSource *This, IShellItem *psiSource, TRANSFER_SOURCE_FLAGS flags); HRESULT (STDMETHODCALLTYPE *RenameItem)( - ITransferSource* This, + ITransferSource *This, IShellItem *psiSource, LPCWSTR pszNewName, TRANSFER_SOURCE_FLAGS flags, IShellItem **ppsiNewDest); HRESULT (STDMETHODCALLTYPE *LinkItem)( - ITransferSource* This, + ITransferSource *This, IShellItem *psiSource, IShellItem *psiParentDest, LPCWSTR pszNewName, @@ -11188,26 +10129,27 @@ typedef struct ITransferSourceVtbl { IShellItem **ppsiNewDest); HRESULT (STDMETHODCALLTYPE *ApplyPropertiesToItem)( - ITransferSource* This, + ITransferSource *This, IShellItem *psiSource, IShellItem **ppsiNew); HRESULT (STDMETHODCALLTYPE *GetDefaultDestinationName)( - ITransferSource* This, + ITransferSource *This, IShellItem *psiSource, IShellItem *psiParentDest, LPWSTR *ppszDestinationName); HRESULT (STDMETHODCALLTYPE *EnterFolder)( - ITransferSource* This, + ITransferSource *This, IShellItem *psiChildFolderDest); HRESULT (STDMETHODCALLTYPE *LeaveFolder)( - ITransferSource* This, + ITransferSource *This, IShellItem *psiChildFolderDest); END_INTERFACE } ITransferSourceVtbl; + interface ITransferSource { CONST_VTBL ITransferSourceVtbl* lpVtbl; }; @@ -11288,132 +10230,6 @@ static FORCEINLINE HRESULT ITransferSource_LeaveFolder(ITransferSource* This,ISh #endif -HRESULT STDMETHODCALLTYPE ITransferSource_Advise_Proxy( - ITransferSource* This, - ITransferAdviseSink *psink, - DWORD *pdwCookie); -void __RPC_STUB ITransferSource_Advise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITransferSource_Unadvise_Proxy( - ITransferSource* This, - DWORD dwCookie); -void __RPC_STUB ITransferSource_Unadvise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITransferSource_SetProperties_Proxy( - ITransferSource* This, - IPropertyChangeArray *pproparray); -void __RPC_STUB ITransferSource_SetProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITransferSource_OpenItem_Proxy( - ITransferSource* This, - IShellItem *psi, - TRANSFER_SOURCE_FLAGS flags, - REFIID riid, - void **ppv); -void __RPC_STUB ITransferSource_OpenItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITransferSource_MoveItem_Proxy( - ITransferSource* This, - IShellItem *psi, - IShellItem *psiParentDst, - LPCWSTR pszNameDst, - TRANSFER_SOURCE_FLAGS flags, - IShellItem **ppsiNew); -void __RPC_STUB ITransferSource_MoveItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITransferSource_RecycleItem_Proxy( - ITransferSource* This, - IShellItem *psiSource, - IShellItem *psiParentDest, - TRANSFER_SOURCE_FLAGS flags, - IShellItem **ppsiNewDest); -void __RPC_STUB ITransferSource_RecycleItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITransferSource_RemoveItem_Proxy( - ITransferSource* This, - IShellItem *psiSource, - TRANSFER_SOURCE_FLAGS flags); -void __RPC_STUB ITransferSource_RemoveItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITransferSource_RenameItem_Proxy( - ITransferSource* This, - IShellItem *psiSource, - LPCWSTR pszNewName, - TRANSFER_SOURCE_FLAGS flags, - IShellItem **ppsiNewDest); -void __RPC_STUB ITransferSource_RenameItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITransferSource_LinkItem_Proxy( - ITransferSource* This, - IShellItem *psiSource, - IShellItem *psiParentDest, - LPCWSTR pszNewName, - TRANSFER_SOURCE_FLAGS flags, - IShellItem **ppsiNewDest); -void __RPC_STUB ITransferSource_LinkItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITransferSource_ApplyPropertiesToItem_Proxy( - ITransferSource* This, - IShellItem *psiSource, - IShellItem **ppsiNew); -void __RPC_STUB ITransferSource_ApplyPropertiesToItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITransferSource_GetDefaultDestinationName_Proxy( - ITransferSource* This, - IShellItem *psiSource, - IShellItem *psiParentDest, - LPWSTR *ppszDestinationName); -void __RPC_STUB ITransferSource_GetDefaultDestinationName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITransferSource_EnterFolder_Proxy( - ITransferSource* This, - IShellItem *psiChildFolderDest); -void __RPC_STUB ITransferSource_EnterFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITransferSource_LeaveFolder_Proxy( - ITransferSource* This, - IShellItem *psiChildFolderDest); -void __RPC_STUB ITransferSource_LeaveFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ITransferSource_INTERFACE_DEFINED__ */ @@ -11459,36 +10275,37 @@ typedef struct IEnumResourcesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumResources* This, + IEnumResources *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumResources* This); + IEnumResources *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumResources* This); + IEnumResources *This); /*** IEnumResources methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumResources* This, + IEnumResources *This, ULONG celt, SHELL_ITEM_RESOURCE *psir, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumResources* This, + IEnumResources *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumResources* This); + IEnumResources *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumResources* This, + IEnumResources *This, IEnumResources **ppenumr); END_INTERFACE } IEnumResourcesVtbl; + interface IEnumResources { CONST_VTBL IEnumResourcesVtbl* lpVtbl; }; @@ -11533,39 +10350,6 @@ static FORCEINLINE HRESULT IEnumResources_Clone(IEnumResources* This,IEnumResour #endif -HRESULT STDMETHODCALLTYPE IEnumResources_Next_Proxy( - IEnumResources* This, - ULONG celt, - SHELL_ITEM_RESOURCE *psir, - ULONG *pceltFetched); -void __RPC_STUB IEnumResources_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumResources_Skip_Proxy( - IEnumResources* This, - ULONG celt); -void __RPC_STUB IEnumResources_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumResources_Reset_Proxy( - IEnumResources* This); -void __RPC_STUB IEnumResources_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumResources_Clone_Proxy( - IEnumResources* This, - IEnumResources **ppenumr); -void __RPC_STUB IEnumResources_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumResources_INTERFACE_DEFINED__ */ @@ -11630,67 +10414,68 @@ typedef struct IShellItemResourcesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellItemResources* This, + IShellItemResources *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellItemResources* This); + IShellItemResources *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellItemResources* This); + IShellItemResources *This); /*** IShellItemResources methods ***/ HRESULT (STDMETHODCALLTYPE *GetAttributes)( - IShellItemResources* This, + IShellItemResources *This, DWORD *pdwAttributes); HRESULT (STDMETHODCALLTYPE *GetSize)( - IShellItemResources* This, + IShellItemResources *This, ULONGLONG *pullSize); HRESULT (STDMETHODCALLTYPE *GetTimes)( - IShellItemResources* This, + IShellItemResources *This, FILETIME *pftCreation, FILETIME *pftWrite, FILETIME *pftAccess); HRESULT (STDMETHODCALLTYPE *SetTimes)( - IShellItemResources* This, + IShellItemResources *This, const FILETIME *pftCreation, const FILETIME *pftWrite, const FILETIME *pftAccess); HRESULT (STDMETHODCALLTYPE *GetResourceDescription)( - IShellItemResources* This, + IShellItemResources *This, const SHELL_ITEM_RESOURCE *pcsir, LPWSTR *ppszDescription); HRESULT (STDMETHODCALLTYPE *EnumResources)( - IShellItemResources* This, + IShellItemResources *This, IEnumResources **ppenumr); HRESULT (STDMETHODCALLTYPE *SupportsResource)( - IShellItemResources* This, + IShellItemResources *This, const SHELL_ITEM_RESOURCE *pcsir); HRESULT (STDMETHODCALLTYPE *OpenResource)( - IShellItemResources* This, + IShellItemResources *This, const SHELL_ITEM_RESOURCE *pcsir, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *CreateResource)( - IShellItemResources* This, + IShellItemResources *This, const SHELL_ITEM_RESOURCE *pcsir, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *MarkForDelete)( - IShellItemResources* This); + IShellItemResources *This); END_INTERFACE } IShellItemResourcesVtbl; + interface IShellItemResources { CONST_VTBL IShellItemResourcesVtbl* lpVtbl; }; @@ -11759,94 +10544,6 @@ static FORCEINLINE HRESULT IShellItemResources_MarkForDelete(IShellItemResources #endif -HRESULT STDMETHODCALLTYPE IShellItemResources_GetAttributes_Proxy( - IShellItemResources* This, - DWORD *pdwAttributes); -void __RPC_STUB IShellItemResources_GetAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItemResources_GetSize_Proxy( - IShellItemResources* This, - ULONGLONG *pullSize); -void __RPC_STUB IShellItemResources_GetSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItemResources_GetTimes_Proxy( - IShellItemResources* This, - FILETIME *pftCreation, - FILETIME *pftWrite, - FILETIME *pftAccess); -void __RPC_STUB IShellItemResources_GetTimes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItemResources_SetTimes_Proxy( - IShellItemResources* This, - const FILETIME *pftCreation, - const FILETIME *pftWrite, - const FILETIME *pftAccess); -void __RPC_STUB IShellItemResources_SetTimes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItemResources_GetResourceDescription_Proxy( - IShellItemResources* This, - const SHELL_ITEM_RESOURCE *pcsir, - LPWSTR *ppszDescription); -void __RPC_STUB IShellItemResources_GetResourceDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItemResources_EnumResources_Proxy( - IShellItemResources* This, - IEnumResources **ppenumr); -void __RPC_STUB IShellItemResources_EnumResources_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItemResources_SupportsResource_Proxy( - IShellItemResources* This, - const SHELL_ITEM_RESOURCE *pcsir); -void __RPC_STUB IShellItemResources_SupportsResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItemResources_OpenResource_Proxy( - IShellItemResources* This, - const SHELL_ITEM_RESOURCE *pcsir, - REFIID riid, - void **ppv); -void __RPC_STUB IShellItemResources_OpenResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItemResources_CreateResource_Proxy( - IShellItemResources* This, - const SHELL_ITEM_RESOURCE *pcsir, - REFIID riid, - void **ppv); -void __RPC_STUB IShellItemResources_CreateResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItemResources_MarkForDelete_Proxy( - IShellItemResources* This); -void __RPC_STUB IShellItemResources_MarkForDelete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellItemResources_INTERFACE_DEFINED__ */ @@ -11889,28 +10586,28 @@ typedef struct ITransferDestinationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITransferDestination* This, + ITransferDestination *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITransferDestination* This); + ITransferDestination *This); ULONG (STDMETHODCALLTYPE *Release)( - ITransferDestination* This); + ITransferDestination *This); /*** ITransferDestination methods ***/ HRESULT (STDMETHODCALLTYPE *Advise)( - ITransferDestination* This, + ITransferDestination *This, ITransferAdviseSink *psink, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *Unadvise)( - ITransferDestination* This, + ITransferDestination *This, DWORD dwCookie); HRESULT (STDMETHODCALLTYPE *CreateItem)( - ITransferDestination* This, + ITransferDestination *This, LPCWSTR pszName, DWORD dwAttributes, ULONGLONG ullSize, @@ -11922,6 +10619,7 @@ typedef struct ITransferDestinationVtbl { END_INTERFACE } ITransferDestinationVtbl; + interface ITransferDestination { CONST_VTBL ITransferDestinationVtbl* lpVtbl; }; @@ -11962,38 +10660,6 @@ static FORCEINLINE HRESULT ITransferDestination_CreateItem(ITransferDestination* #endif -HRESULT STDMETHODCALLTYPE ITransferDestination_Advise_Proxy( - ITransferDestination* This, - ITransferAdviseSink *psink, - DWORD *pdwCookie); -void __RPC_STUB ITransferDestination_Advise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITransferDestination_Unadvise_Proxy( - ITransferDestination* This, - DWORD dwCookie); -void __RPC_STUB ITransferDestination_Unadvise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITransferDestination_CreateItem_Proxy( - ITransferDestination* This, - LPCWSTR pszName, - DWORD dwAttributes, - ULONGLONG ullSize, - TRANSFER_SOURCE_FLAGS flags, - REFIID riidItem, - void **ppvItem, - REFIID riidResources, - void **ppvResources); -void __RPC_STUB ITransferDestination_CreateItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ITransferDestination_INTERFACE_DEFINED__ */ @@ -12054,101 +10720,102 @@ typedef struct IStreamAsyncVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IStreamAsync* This, + IStreamAsync *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IStreamAsync* This); + IStreamAsync *This); ULONG (STDMETHODCALLTYPE *Release)( - IStreamAsync* This); + IStreamAsync *This); /*** ISequentialStream methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - IStreamAsync* This, + IStreamAsync *This, void *pv, ULONG cb, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Write)( - IStreamAsync* This, + IStreamAsync *This, const void *pv, ULONG cb, ULONG *pcbWritten); /*** IStream methods ***/ HRESULT (STDMETHODCALLTYPE *Seek)( - IStreamAsync* This, + IStreamAsync *This, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition); HRESULT (STDMETHODCALLTYPE *SetSize)( - IStreamAsync* This, + IStreamAsync *This, ULARGE_INTEGER libNewSize); HRESULT (STDMETHODCALLTYPE *CopyTo)( - IStreamAsync* This, + IStreamAsync *This, IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten); HRESULT (STDMETHODCALLTYPE *Commit)( - IStreamAsync* This, + IStreamAsync *This, DWORD grfCommitFlags); HRESULT (STDMETHODCALLTYPE *Revert)( - IStreamAsync* This); + IStreamAsync *This); HRESULT (STDMETHODCALLTYPE *LockRegion)( - IStreamAsync* This, + IStreamAsync *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *UnlockRegion)( - IStreamAsync* This, + IStreamAsync *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *Stat)( - IStreamAsync* This, + IStreamAsync *This, STATSTG *pstatstg, DWORD grfStatFlag); HRESULT (STDMETHODCALLTYPE *Clone)( - IStreamAsync* This, + IStreamAsync *This, IStream **ppstm); /*** IStreamAsync methods ***/ HRESULT (STDMETHODCALLTYPE *ReadAsync)( - IStreamAsync* This, + IStreamAsync *This, void *pv, DWORD cb, LPDWORD pcbRead, LPOVERLAPPED lpOverlapped); HRESULT (STDMETHODCALLTYPE *WriteAsync)( - IStreamAsync* This, + IStreamAsync *This, const void *lpBuffer, DWORD cb, LPDWORD pcbWritten, LPOVERLAPPED lpOverlapped); HRESULT (STDMETHODCALLTYPE *OverlappedResult)( - IStreamAsync* This, + IStreamAsync *This, LPOVERLAPPED lpOverlapped, LPDWORD lpNumberOfBytesTransferred, WINBOOL bWait); HRESULT (STDMETHODCALLTYPE *CancelIo)( - IStreamAsync* This); + IStreamAsync *This); END_INTERFACE } IStreamAsyncVtbl; + interface IStreamAsync { CONST_VTBL IStreamAsyncVtbl* lpVtbl; }; @@ -12241,45 +10908,6 @@ static FORCEINLINE HRESULT IStreamAsync_CancelIo(IStreamAsync* This) { #endif -HRESULT STDMETHODCALLTYPE IStreamAsync_ReadAsync_Proxy( - IStreamAsync* This, - void *pv, - DWORD cb, - LPDWORD pcbRead, - LPOVERLAPPED lpOverlapped); -void __RPC_STUB IStreamAsync_ReadAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IStreamAsync_WriteAsync_Proxy( - IStreamAsync* This, - const void *lpBuffer, - DWORD cb, - LPDWORD pcbWritten, - LPOVERLAPPED lpOverlapped); -void __RPC_STUB IStreamAsync_WriteAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IStreamAsync_OverlappedResult_Proxy( - IStreamAsync* This, - LPOVERLAPPED lpOverlapped, - LPDWORD lpNumberOfBytesTransferred, - WINBOOL bWait); -void __RPC_STUB IStreamAsync_OverlappedResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IStreamAsync_CancelIo_Proxy( - IStreamAsync* This); -void __RPC_STUB IStreamAsync_CancelIo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IStreamAsync_INTERFACE_DEFINED__ */ @@ -12308,23 +10936,24 @@ typedef struct IStreamUnbufferedInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IStreamUnbufferedInfo* This, + IStreamUnbufferedInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IStreamUnbufferedInfo* This); + IStreamUnbufferedInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IStreamUnbufferedInfo* This); + IStreamUnbufferedInfo *This); /*** IStreamUnbufferedInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetSectorSize)( - IStreamUnbufferedInfo* This, + IStreamUnbufferedInfo *This, ULONG *pcbSectorSize); END_INTERFACE } IStreamUnbufferedInfoVtbl; + interface IStreamUnbufferedInfo { CONST_VTBL IStreamUnbufferedInfoVtbl* lpVtbl; }; @@ -12357,14 +10986,6 @@ static FORCEINLINE HRESULT IStreamUnbufferedInfo_GetSectorSize(IStreamUnbuffered #endif -HRESULT STDMETHODCALLTYPE IStreamUnbufferedInfo_GetSectorSize_Proxy( - IStreamUnbufferedInfo* This, - ULONG *pcbSectorSize); -void __RPC_STUB IStreamUnbufferedInfo_GetSectorSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IStreamUnbufferedInfo_INTERFACE_DEFINED__ */ @@ -12474,32 +11095,32 @@ typedef struct IFileOperationProgressSinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFileOperationProgressSink* This, + IFileOperationProgressSink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFileOperationProgressSink* This); + IFileOperationProgressSink *This); ULONG (STDMETHODCALLTYPE *Release)( - IFileOperationProgressSink* This); + IFileOperationProgressSink *This); /*** IFileOperationProgressSink methods ***/ HRESULT (STDMETHODCALLTYPE *StartOperations)( - IFileOperationProgressSink* This); + IFileOperationProgressSink *This); HRESULT (STDMETHODCALLTYPE *FinishOperations)( - IFileOperationProgressSink* This, + IFileOperationProgressSink *This, HRESULT hrResult); HRESULT (STDMETHODCALLTYPE *PreRenameItem)( - IFileOperationProgressSink* This, + IFileOperationProgressSink *This, DWORD dwFlags, IShellItem *psiItem, LPCWSTR pszNewName); HRESULT (STDMETHODCALLTYPE *PostRenameItem)( - IFileOperationProgressSink* This, + IFileOperationProgressSink *This, DWORD dwFlags, IShellItem *psiItem, LPCWSTR pszNewName, @@ -12507,14 +11128,14 @@ typedef struct IFileOperationProgressSinkVtbl { IShellItem *psiNewlyCreated); HRESULT (STDMETHODCALLTYPE *PreMoveItem)( - IFileOperationProgressSink* This, + IFileOperationProgressSink *This, DWORD dwFlags, IShellItem *psiItem, IShellItem *psiDestinationFolder, LPCWSTR pszNewName); HRESULT (STDMETHODCALLTYPE *PostMoveItem)( - IFileOperationProgressSink* This, + IFileOperationProgressSink *This, DWORD dwFlags, IShellItem *psiItem, IShellItem *psiDestinationFolder, @@ -12523,14 +11144,14 @@ typedef struct IFileOperationProgressSinkVtbl { IShellItem *psiNewlyCreated); HRESULT (STDMETHODCALLTYPE *PreCopyItem)( - IFileOperationProgressSink* This, + IFileOperationProgressSink *This, DWORD dwFlags, IShellItem *psiItem, IShellItem *psiDestinationFolder, LPCWSTR pszNewName); HRESULT (STDMETHODCALLTYPE *PostCopyItem)( - IFileOperationProgressSink* This, + IFileOperationProgressSink *This, DWORD dwFlags, IShellItem *psiItem, IShellItem *psiDestinationFolder, @@ -12539,25 +11160,25 @@ typedef struct IFileOperationProgressSinkVtbl { IShellItem *psiNewlyCreated); HRESULT (STDMETHODCALLTYPE *PreDeleteItem)( - IFileOperationProgressSink* This, + IFileOperationProgressSink *This, DWORD dwFlags, IShellItem *psiItem); HRESULT (STDMETHODCALLTYPE *PostDeleteItem)( - IFileOperationProgressSink* This, + IFileOperationProgressSink *This, DWORD dwFlags, IShellItem *psiItem, HRESULT hrDelete, IShellItem *psiNewlyCreated); HRESULT (STDMETHODCALLTYPE *PreNewItem)( - IFileOperationProgressSink* This, + IFileOperationProgressSink *This, DWORD dwFlags, IShellItem *psiDestinationFolder, LPCWSTR pszNewName); HRESULT (STDMETHODCALLTYPE *PostNewItem)( - IFileOperationProgressSink* This, + IFileOperationProgressSink *This, DWORD dwFlags, IShellItem *psiDestinationFolder, LPCWSTR pszNewName, @@ -12567,21 +11188,22 @@ typedef struct IFileOperationProgressSinkVtbl { IShellItem *psiNewItem); HRESULT (STDMETHODCALLTYPE *UpdateProgress)( - IFileOperationProgressSink* This, + IFileOperationProgressSink *This, UINT iWorkTotal, UINT iWorkSoFar); HRESULT (STDMETHODCALLTYPE *ResetTimer)( - IFileOperationProgressSink* This); + IFileOperationProgressSink *This); HRESULT (STDMETHODCALLTYPE *PauseTimer)( - IFileOperationProgressSink* This); + IFileOperationProgressSink *This); HRESULT (STDMETHODCALLTYPE *ResumeTimer)( - IFileOperationProgressSink* This); + IFileOperationProgressSink *This); END_INTERFACE } IFileOperationProgressSinkVtbl; + interface IFileOperationProgressSink { CONST_VTBL IFileOperationProgressSinkVtbl* lpVtbl; }; @@ -12674,165 +11296,6 @@ static FORCEINLINE HRESULT IFileOperationProgressSink_ResumeTimer(IFileOperation #endif -HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_StartOperations_Proxy( - IFileOperationProgressSink* This); -void __RPC_STUB IFileOperationProgressSink_StartOperations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_FinishOperations_Proxy( - IFileOperationProgressSink* This, - HRESULT hrResult); -void __RPC_STUB IFileOperationProgressSink_FinishOperations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_PreRenameItem_Proxy( - IFileOperationProgressSink* This, - DWORD dwFlags, - IShellItem *psiItem, - LPCWSTR pszNewName); -void __RPC_STUB IFileOperationProgressSink_PreRenameItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_PostRenameItem_Proxy( - IFileOperationProgressSink* This, - DWORD dwFlags, - IShellItem *psiItem, - LPCWSTR pszNewName, - HRESULT hrRename, - IShellItem *psiNewlyCreated); -void __RPC_STUB IFileOperationProgressSink_PostRenameItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_PreMoveItem_Proxy( - IFileOperationProgressSink* This, - DWORD dwFlags, - IShellItem *psiItem, - IShellItem *psiDestinationFolder, - LPCWSTR pszNewName); -void __RPC_STUB IFileOperationProgressSink_PreMoveItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_PostMoveItem_Proxy( - IFileOperationProgressSink* This, - DWORD dwFlags, - IShellItem *psiItem, - IShellItem *psiDestinationFolder, - LPCWSTR pszNewName, - HRESULT hrMove, - IShellItem *psiNewlyCreated); -void __RPC_STUB IFileOperationProgressSink_PostMoveItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_PreCopyItem_Proxy( - IFileOperationProgressSink* This, - DWORD dwFlags, - IShellItem *psiItem, - IShellItem *psiDestinationFolder, - LPCWSTR pszNewName); -void __RPC_STUB IFileOperationProgressSink_PreCopyItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_PostCopyItem_Proxy( - IFileOperationProgressSink* This, - DWORD dwFlags, - IShellItem *psiItem, - IShellItem *psiDestinationFolder, - LPCWSTR pszNewName, - HRESULT hrCopy, - IShellItem *psiNewlyCreated); -void __RPC_STUB IFileOperationProgressSink_PostCopyItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_PreDeleteItem_Proxy( - IFileOperationProgressSink* This, - DWORD dwFlags, - IShellItem *psiItem); -void __RPC_STUB IFileOperationProgressSink_PreDeleteItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_PostDeleteItem_Proxy( - IFileOperationProgressSink* This, - DWORD dwFlags, - IShellItem *psiItem, - HRESULT hrDelete, - IShellItem *psiNewlyCreated); -void __RPC_STUB IFileOperationProgressSink_PostDeleteItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_PreNewItem_Proxy( - IFileOperationProgressSink* This, - DWORD dwFlags, - IShellItem *psiDestinationFolder, - LPCWSTR pszNewName); -void __RPC_STUB IFileOperationProgressSink_PreNewItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_PostNewItem_Proxy( - IFileOperationProgressSink* This, - DWORD dwFlags, - IShellItem *psiDestinationFolder, - LPCWSTR pszNewName, - LPCWSTR pszTemplateName, - DWORD dwFileAttributes, - HRESULT hrNew, - IShellItem *psiNewItem); -void __RPC_STUB IFileOperationProgressSink_PostNewItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_UpdateProgress_Proxy( - IFileOperationProgressSink* This, - UINT iWorkTotal, - UINT iWorkSoFar); -void __RPC_STUB IFileOperationProgressSink_UpdateProgress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_ResetTimer_Proxy( - IFileOperationProgressSink* This); -void __RPC_STUB IFileOperationProgressSink_ResetTimer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_PauseTimer_Proxy( - IFileOperationProgressSink* This); -void __RPC_STUB IFileOperationProgressSink_PauseTimer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_ResumeTimer_Proxy( - IFileOperationProgressSink* This); -void __RPC_STUB IFileOperationProgressSink_ResumeTimer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFileOperationProgressSink_INTERFACE_DEFINED__ */ @@ -12900,57 +11363,58 @@ typedef struct IShellItemArrayVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellItemArray* This, + IShellItemArray *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellItemArray* This); + IShellItemArray *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellItemArray* This); + IShellItemArray *This); /*** IShellItemArray methods ***/ HRESULT (STDMETHODCALLTYPE *BindToHandler)( - IShellItemArray* This, + IShellItemArray *This, IBindCtx *pbc, REFGUID bhid, REFIID riid, void **ppvOut); HRESULT (STDMETHODCALLTYPE *GetPropertyStore)( - IShellItemArray* This, + IShellItemArray *This, GETPROPERTYSTOREFLAGS flags, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetPropertyDescriptionList)( - IShellItemArray* This, + IShellItemArray *This, REFPROPERTYKEY keyType, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetAttributes)( - IShellItemArray* This, + IShellItemArray *This, SIATTRIBFLAGS AttribFlags, SFGAOF sfgaoMask, SFGAOF *psfgaoAttribs); HRESULT (STDMETHODCALLTYPE *GetCount)( - IShellItemArray* This, + IShellItemArray *This, DWORD *pdwNumItems); HRESULT (STDMETHODCALLTYPE *GetItemAt)( - IShellItemArray* This, + IShellItemArray *This, DWORD dwIndex, IShellItem **ppsi); HRESULT (STDMETHODCALLTYPE *EnumItems)( - IShellItemArray* This, + IShellItemArray *This, IEnumShellItems **ppenumShellItems); END_INTERFACE } IShellItemArrayVtbl; + interface IShellItemArray { CONST_VTBL IShellItemArrayVtbl* lpVtbl; }; @@ -13007,72 +11471,6 @@ static FORCEINLINE HRESULT IShellItemArray_EnumItems(IShellItemArray* This,IEnum #endif -HRESULT STDMETHODCALLTYPE IShellItemArray_BindToHandler_Proxy( - IShellItemArray* This, - IBindCtx *pbc, - REFGUID bhid, - REFIID riid, - void **ppvOut); -void __RPC_STUB IShellItemArray_BindToHandler_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItemArray_GetPropertyStore_Proxy( - IShellItemArray* This, - GETPROPERTYSTOREFLAGS flags, - REFIID riid, - void **ppv); -void __RPC_STUB IShellItemArray_GetPropertyStore_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItemArray_GetPropertyDescriptionList_Proxy( - IShellItemArray* This, - REFPROPERTYKEY keyType, - REFIID riid, - void **ppv); -void __RPC_STUB IShellItemArray_GetPropertyDescriptionList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItemArray_GetAttributes_Proxy( - IShellItemArray* This, - SIATTRIBFLAGS AttribFlags, - SFGAOF sfgaoMask, - SFGAOF *psfgaoAttribs); -void __RPC_STUB IShellItemArray_GetAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItemArray_GetCount_Proxy( - IShellItemArray* This, - DWORD *pdwNumItems); -void __RPC_STUB IShellItemArray_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItemArray_GetItemAt_Proxy( - IShellItemArray* This, - DWORD dwIndex, - IShellItem **ppsi); -void __RPC_STUB IShellItemArray_GetItemAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItemArray_EnumItems_Proxy( - IShellItemArray* This, - IEnumShellItems **ppenumShellItems); -void __RPC_STUB IShellItemArray_EnumItems_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellItemArray_INTERFACE_DEFINED__ */ @@ -13109,24 +11507,25 @@ typedef struct IInitializeWithItemVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInitializeWithItem* This, + IInitializeWithItem *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInitializeWithItem* This); + IInitializeWithItem *This); ULONG (STDMETHODCALLTYPE *Release)( - IInitializeWithItem* This); + IInitializeWithItem *This); /*** IInitializeWithItem methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IInitializeWithItem* This, + IInitializeWithItem *This, IShellItem *psi, DWORD grfMode); END_INTERFACE } IInitializeWithItemVtbl; + interface IInitializeWithItem { CONST_VTBL IInitializeWithItemVtbl* lpVtbl; }; @@ -13159,15 +11558,6 @@ static FORCEINLINE HRESULT IInitializeWithItem_Initialize(IInitializeWithItem* T #endif -HRESULT STDMETHODCALLTYPE IInitializeWithItem_Initialize_Proxy( - IInitializeWithItem* This, - IShellItem *psi, - DWORD grfMode); -void __RPC_STUB IInitializeWithItem_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInitializeWithItem_INTERFACE_DEFINED__ */ @@ -13200,28 +11590,29 @@ typedef struct IObjectWithSelectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IObjectWithSelection* This, + IObjectWithSelection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IObjectWithSelection* This); + IObjectWithSelection *This); ULONG (STDMETHODCALLTYPE *Release)( - IObjectWithSelection* This); + IObjectWithSelection *This); /*** IObjectWithSelection methods ***/ HRESULT (STDMETHODCALLTYPE *SetSelection)( - IObjectWithSelection* This, + IObjectWithSelection *This, IShellItemArray *psia); HRESULT (STDMETHODCALLTYPE *GetSelection)( - IObjectWithSelection* This, + IObjectWithSelection *This, REFIID riid, void **ppv); END_INTERFACE } IObjectWithSelectionVtbl; + interface IObjectWithSelection { CONST_VTBL IObjectWithSelectionVtbl* lpVtbl; }; @@ -13258,23 +11649,6 @@ static FORCEINLINE HRESULT IObjectWithSelection_GetSelection(IObjectWithSelectio #endif -HRESULT STDMETHODCALLTYPE IObjectWithSelection_SetSelection_Proxy( - IObjectWithSelection* This, - IShellItemArray *psia); -void __RPC_STUB IObjectWithSelection_SetSelection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IObjectWithSelection_GetSelection_Proxy( - IObjectWithSelection* This, - REFIID riid, - void **ppv); -void __RPC_STUB IObjectWithSelection_GetSelection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IObjectWithSelection_INTERFACE_DEFINED__ */ @@ -13303,22 +11677,23 @@ typedef struct IObjectWithBackReferencesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IObjectWithBackReferences* This, + IObjectWithBackReferences *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IObjectWithBackReferences* This); + IObjectWithBackReferences *This); ULONG (STDMETHODCALLTYPE *Release)( - IObjectWithBackReferences* This); + IObjectWithBackReferences *This); /*** IObjectWithBackReferences methods ***/ HRESULT (STDMETHODCALLTYPE *RemoveBackReferences)( - IObjectWithBackReferences* This); + IObjectWithBackReferences *This); END_INTERFACE } IObjectWithBackReferencesVtbl; + interface IObjectWithBackReferences { CONST_VTBL IObjectWithBackReferencesVtbl* lpVtbl; }; @@ -13351,13 +11726,6 @@ static FORCEINLINE HRESULT IObjectWithBackReferences_RemoveBackReferences(IObjec #endif -HRESULT STDMETHODCALLTYPE IObjectWithBackReferences_RemoveBackReferences_Proxy( - IObjectWithBackReferences* This); -void __RPC_STUB IObjectWithBackReferences_RemoveBackReferences_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IObjectWithBackReferences_INTERFACE_DEFINED__ */ @@ -13367,7 +11735,6 @@ enum _PROPERTYUI_NAME_FLAGS { PUIFNF_MNEMONIC = 0x1 }; - typedef DWORD PROPERTYUI_NAME_FLAGS; enum _PROPERTYUI_FLAGS { @@ -13376,7 +11743,6 @@ enum _PROPERTYUI_FLAGS { PUIF_NOLABELININFOTIP = 0x2 }; - typedef DWORD PROPERTYUI_FLAGS; enum _PROPERTYUI_FORMAT_FLAGS { @@ -13387,7 +11753,6 @@ enum _PROPERTYUI_FORMAT_FLAGS { PUIFFDF_FRIENDLYDATE = 0x8 }; - typedef DWORD PROPERTYUI_FORMAT_FLAGS; /***************************************************************************** @@ -13461,33 +11826,33 @@ typedef struct IPropertyUIVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPropertyUI* This, + IPropertyUI *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPropertyUI* This); + IPropertyUI *This); ULONG (STDMETHODCALLTYPE *Release)( - IPropertyUI* This); + IPropertyUI *This); /*** IPropertyUI methods ***/ HRESULT (STDMETHODCALLTYPE *ParsePropertyName)( - IPropertyUI* This, + IPropertyUI *This, LPCWSTR pszName, FMTID *pfmtid, PROPID *ppid, ULONG *pchEaten); HRESULT (STDMETHODCALLTYPE *GetCannonicalName)( - IPropertyUI* This, + IPropertyUI *This, REFFMTID fmtid, PROPID pid, LPWSTR pwszText, DWORD cchText); HRESULT (STDMETHODCALLTYPE *GetDisplayName)( - IPropertyUI* This, + IPropertyUI *This, REFFMTID fmtid, PROPID pid, PROPERTYUI_NAME_FLAGS flags, @@ -13495,26 +11860,26 @@ typedef struct IPropertyUIVtbl { DWORD cchText); HRESULT (STDMETHODCALLTYPE *GetPropertyDescription)( - IPropertyUI* This, + IPropertyUI *This, REFFMTID fmtid, PROPID pid, LPWSTR pwszText, DWORD cchText); HRESULT (STDMETHODCALLTYPE *GetDefaultWidth)( - IPropertyUI* This, + IPropertyUI *This, REFFMTID fmtid, PROPID pid, ULONG *pcxChars); HRESULT (STDMETHODCALLTYPE *GetFlags)( - IPropertyUI* This, + IPropertyUI *This, REFFMTID fmtid, PROPID pid, PROPERTYUI_FLAGS *pflags); HRESULT (STDMETHODCALLTYPE *FormatForDisplay)( - IPropertyUI* This, + IPropertyUI *This, REFFMTID fmtid, PROPID pid, const PROPVARIANT *ppropvar, @@ -13523,7 +11888,7 @@ typedef struct IPropertyUIVtbl { DWORD cchText); HRESULT (STDMETHODCALLTYPE *GetHelpInfo)( - IPropertyUI* This, + IPropertyUI *This, REFFMTID fmtid, PROPID pid, LPWSTR pwszHelpFile, @@ -13532,6 +11897,7 @@ typedef struct IPropertyUIVtbl { END_INTERFACE } IPropertyUIVtbl; + interface IPropertyUI { CONST_VTBL IPropertyUIVtbl* lpVtbl; }; @@ -13592,96 +11958,6 @@ static FORCEINLINE HRESULT IPropertyUI_GetHelpInfo(IPropertyUI* This,REFFMTID fm #endif -HRESULT STDMETHODCALLTYPE IPropertyUI_ParsePropertyName_Proxy( - IPropertyUI* This, - LPCWSTR pszName, - FMTID *pfmtid, - PROPID *ppid, - ULONG *pchEaten); -void __RPC_STUB IPropertyUI_ParsePropertyName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyUI_GetCannonicalName_Proxy( - IPropertyUI* This, - REFFMTID fmtid, - PROPID pid, - LPWSTR pwszText, - DWORD cchText); -void __RPC_STUB IPropertyUI_GetCannonicalName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyUI_GetDisplayName_Proxy( - IPropertyUI* This, - REFFMTID fmtid, - PROPID pid, - PROPERTYUI_NAME_FLAGS flags, - LPWSTR pwszText, - DWORD cchText); -void __RPC_STUB IPropertyUI_GetDisplayName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyUI_GetPropertyDescription_Proxy( - IPropertyUI* This, - REFFMTID fmtid, - PROPID pid, - LPWSTR pwszText, - DWORD cchText); -void __RPC_STUB IPropertyUI_GetPropertyDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyUI_GetDefaultWidth_Proxy( - IPropertyUI* This, - REFFMTID fmtid, - PROPID pid, - ULONG *pcxChars); -void __RPC_STUB IPropertyUI_GetDefaultWidth_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyUI_GetFlags_Proxy( - IPropertyUI* This, - REFFMTID fmtid, - PROPID pid, - PROPERTYUI_FLAGS *pflags); -void __RPC_STUB IPropertyUI_GetFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyUI_FormatForDisplay_Proxy( - IPropertyUI* This, - REFFMTID fmtid, - PROPID pid, - const PROPVARIANT *ppropvar, - PROPERTYUI_FORMAT_FLAGS puiff, - LPWSTR pwszText, - DWORD cchText); -void __RPC_STUB IPropertyUI_FormatForDisplay_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPropertyUI_GetHelpInfo_Proxy( - IPropertyUI* This, - REFFMTID fmtid, - PROPID pid, - LPWSTR pwszHelpFile, - DWORD cch, - UINT *puHelpID); -void __RPC_STUB IPropertyUI_GetHelpInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPropertyUI_INTERFACE_DEFINED__ */ @@ -13738,49 +12014,50 @@ typedef struct ICategoryProviderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICategoryProvider* This, + ICategoryProvider *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICategoryProvider* This); + ICategoryProvider *This); ULONG (STDMETHODCALLTYPE *Release)( - ICategoryProvider* This); + ICategoryProvider *This); /*** ICategoryProvider methods ***/ HRESULT (STDMETHODCALLTYPE *CanCategorizeOnSCID)( - ICategoryProvider* This, + ICategoryProvider *This, const SHCOLUMNID *pscid); HRESULT (STDMETHODCALLTYPE *GetDefaultCategory)( - ICategoryProvider* This, + ICategoryProvider *This, GUID *pguid, SHCOLUMNID *pscid); HRESULT (STDMETHODCALLTYPE *GetCategoryForSCID)( - ICategoryProvider* This, + ICategoryProvider *This, const SHCOLUMNID *pscid, GUID *pguid); HRESULT (STDMETHODCALLTYPE *EnumCategories)( - ICategoryProvider* This, + ICategoryProvider *This, IEnumGUID **penum); HRESULT (STDMETHODCALLTYPE *GetCategoryName)( - ICategoryProvider* This, + ICategoryProvider *This, const GUID *pguid, LPWSTR pszName, UINT cch); HRESULT (STDMETHODCALLTYPE *CreateCategory)( - ICategoryProvider* This, + ICategoryProvider *This, const GUID *pguid, REFIID riid, void **ppv); END_INTERFACE } ICategoryProviderVtbl; + interface ICategoryProvider { CONST_VTBL ICategoryProviderVtbl* lpVtbl; }; @@ -13833,60 +12110,6 @@ static FORCEINLINE HRESULT ICategoryProvider_CreateCategory(ICategoryProvider* T #endif -HRESULT STDMETHODCALLTYPE ICategoryProvider_CanCategorizeOnSCID_Proxy( - ICategoryProvider* This, - const SHCOLUMNID *pscid); -void __RPC_STUB ICategoryProvider_CanCategorizeOnSCID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICategoryProvider_GetDefaultCategory_Proxy( - ICategoryProvider* This, - GUID *pguid, - SHCOLUMNID *pscid); -void __RPC_STUB ICategoryProvider_GetDefaultCategory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICategoryProvider_GetCategoryForSCID_Proxy( - ICategoryProvider* This, - const SHCOLUMNID *pscid, - GUID *pguid); -void __RPC_STUB ICategoryProvider_GetCategoryForSCID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICategoryProvider_EnumCategories_Proxy( - ICategoryProvider* This, - IEnumGUID **penum); -void __RPC_STUB ICategoryProvider_EnumCategories_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICategoryProvider_GetCategoryName_Proxy( - ICategoryProvider* This, - const GUID *pguid, - LPWSTR pszName, - UINT cch); -void __RPC_STUB ICategoryProvider_GetCategoryName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICategoryProvider_CreateCategory_Proxy( - ICategoryProvider* This, - const GUID *pguid, - REFIID riid, - void **ppv); -void __RPC_STUB ICategoryProvider_CreateCategory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICategoryProvider_INTERFACE_DEFINED__ */ @@ -13955,41 +12178,42 @@ typedef struct ICategorizerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICategorizer* This, + ICategorizer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICategorizer* This); + ICategorizer *This); ULONG (STDMETHODCALLTYPE *Release)( - ICategorizer* This); + ICategorizer *This); /*** ICategorizer methods ***/ HRESULT (STDMETHODCALLTYPE *GetDescription)( - ICategorizer* This, + ICategorizer *This, LPWSTR pszDesc, UINT cch); HRESULT (STDMETHODCALLTYPE *GetCategory)( - ICategorizer* This, + ICategorizer *This, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgCategoryIds); HRESULT (STDMETHODCALLTYPE *GetCategoryInfo)( - ICategorizer* This, + ICategorizer *This, DWORD dwCategoryId, CATEGORY_INFO *pci); HRESULT (STDMETHODCALLTYPE *CompareCategory)( - ICategorizer* This, + ICategorizer *This, CATSORT_FLAGS csfFlags, DWORD dwCategoryId1, DWORD dwCategoryId2); END_INTERFACE } ICategorizerVtbl; + interface ICategorizer { CONST_VTBL ICategorizerVtbl* lpVtbl; }; @@ -14034,44 +12258,6 @@ static FORCEINLINE HRESULT ICategorizer_CompareCategory(ICategorizer* This,CATSO #endif -HRESULT STDMETHODCALLTYPE ICategorizer_GetDescription_Proxy( - ICategorizer* This, - LPWSTR pszDesc, - UINT cch); -void __RPC_STUB ICategorizer_GetDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICategorizer_GetCategory_Proxy( - ICategorizer* This, - UINT cidl, - PCUITEMID_CHILD_ARRAY apidl, - DWORD *rgCategoryIds); -void __RPC_STUB ICategorizer_GetCategory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICategorizer_GetCategoryInfo_Proxy( - ICategorizer* This, - DWORD dwCategoryId, - CATEGORY_INFO *pci); -void __RPC_STUB ICategorizer_GetCategoryInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICategorizer_CompareCategory_Proxy( - ICategorizer* This, - CATSORT_FLAGS csfFlags, - DWORD dwCategoryId1, - DWORD dwCategoryId2); -void __RPC_STUB ICategorizer_CompareCategory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICategorizer_INTERFACE_DEFINED__ */ @@ -14130,44 +12316,45 @@ typedef struct IDropTargetHelperVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDropTargetHelper* This, + IDropTargetHelper *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDropTargetHelper* This); + IDropTargetHelper *This); ULONG (STDMETHODCALLTYPE *Release)( - IDropTargetHelper* This); + IDropTargetHelper *This); /*** IDropTargetHelper methods ***/ HRESULT (STDMETHODCALLTYPE *DragEnter)( - IDropTargetHelper* This, + IDropTargetHelper *This, HWND hwndTarget, IDataObject *pDataObject, POINT *ppt, DWORD dwEffect); HRESULT (STDMETHODCALLTYPE *DragLeave)( - IDropTargetHelper* This); + IDropTargetHelper *This); HRESULT (STDMETHODCALLTYPE *DragOver)( - IDropTargetHelper* This, + IDropTargetHelper *This, POINT *ppt, DWORD dwEffect); HRESULT (STDMETHODCALLTYPE *Drop)( - IDropTargetHelper* This, + IDropTargetHelper *This, IDataObject *pDataObject, POINT *ppt, DWORD dwEffect); HRESULT (STDMETHODCALLTYPE *Show)( - IDropTargetHelper* This, + IDropTargetHelper *This, WINBOOL fShow); END_INTERFACE } IDropTargetHelperVtbl; + interface IDropTargetHelper { CONST_VTBL IDropTargetHelperVtbl* lpVtbl; }; @@ -14216,51 +12403,6 @@ static FORCEINLINE HRESULT IDropTargetHelper_Show(IDropTargetHelper* This,WINBOO #endif -HRESULT STDMETHODCALLTYPE IDropTargetHelper_DragEnter_Proxy( - IDropTargetHelper* This, - HWND hwndTarget, - IDataObject *pDataObject, - POINT *ppt, - DWORD dwEffect); -void __RPC_STUB IDropTargetHelper_DragEnter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDropTargetHelper_DragLeave_Proxy( - IDropTargetHelper* This); -void __RPC_STUB IDropTargetHelper_DragLeave_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDropTargetHelper_DragOver_Proxy( - IDropTargetHelper* This, - POINT *ppt, - DWORD dwEffect); -void __RPC_STUB IDropTargetHelper_DragOver_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDropTargetHelper_Drop_Proxy( - IDropTargetHelper* This, - IDataObject *pDataObject, - POINT *ppt, - DWORD dwEffect); -void __RPC_STUB IDropTargetHelper_Drop_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDropTargetHelper_Show_Proxy( - IDropTargetHelper* This, - WINBOOL fShow); -void __RPC_STUB IDropTargetHelper_Show_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDropTargetHelper_INTERFACE_DEFINED__ */ @@ -14295,30 +12437,31 @@ typedef struct IDragSourceHelperVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDragSourceHelper* This, + IDragSourceHelper *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDragSourceHelper* This); + IDragSourceHelper *This); ULONG (STDMETHODCALLTYPE *Release)( - IDragSourceHelper* This); + IDragSourceHelper *This); /*** IDragSourceHelper methods ***/ HRESULT (STDMETHODCALLTYPE *InitializeFromBitmap)( - IDragSourceHelper* This, + IDragSourceHelper *This, LPSHDRAGIMAGE pshdi, IDataObject *pDataObject); HRESULT (STDMETHODCALLTYPE *InitializeFromWindow)( - IDragSourceHelper* This, + IDragSourceHelper *This, HWND hwnd, POINT *ppt, IDataObject *pDataObject); END_INTERFACE } IDragSourceHelperVtbl; + interface IDragSourceHelper { CONST_VTBL IDragSourceHelperVtbl* lpVtbl; }; @@ -14355,25 +12498,6 @@ static FORCEINLINE HRESULT IDragSourceHelper_InitializeFromWindow(IDragSourceHel #endif -HRESULT STDMETHODCALLTYPE IDragSourceHelper_InitializeFromBitmap_Proxy( - IDragSourceHelper* This, - LPSHDRAGIMAGE pshdi, - IDataObject *pDataObject); -void __RPC_STUB IDragSourceHelper_InitializeFromBitmap_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDragSourceHelper_InitializeFromWindow_Proxy( - IDragSourceHelper* This, - HWND hwnd, - POINT *ppt, - IDataObject *pDataObject); -void __RPC_STUB IDragSourceHelper_InitializeFromWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDragSourceHelper_INTERFACE_DEFINED__ */ @@ -14409,35 +12533,36 @@ typedef struct IDragSourceHelper2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDragSourceHelper2* This, + IDragSourceHelper2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDragSourceHelper2* This); + IDragSourceHelper2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IDragSourceHelper2* This); + IDragSourceHelper2 *This); /*** IDragSourceHelper methods ***/ HRESULT (STDMETHODCALLTYPE *InitializeFromBitmap)( - IDragSourceHelper2* This, + IDragSourceHelper2 *This, LPSHDRAGIMAGE pshdi, IDataObject *pDataObject); HRESULT (STDMETHODCALLTYPE *InitializeFromWindow)( - IDragSourceHelper2* This, + IDragSourceHelper2 *This, HWND hwnd, POINT *ppt, IDataObject *pDataObject); /*** IDragSourceHelper2 methods ***/ HRESULT (STDMETHODCALLTYPE *SetFlags)( - IDragSourceHelper2* This, + IDragSourceHelper2 *This, DWORD dwFlags); END_INTERFACE } IDragSourceHelper2Vtbl; + interface IDragSourceHelper2 { CONST_VTBL IDragSourceHelper2Vtbl* lpVtbl; }; @@ -14480,14 +12605,6 @@ static FORCEINLINE HRESULT IDragSourceHelper2_SetFlags(IDragSourceHelper2* This, #endif -HRESULT STDMETHODCALLTYPE IDragSourceHelper2_SetFlags_Proxy( - IDragSourceHelper2* This, - DWORD dwFlags); -void __RPC_STUB IDragSourceHelper2_SetFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDragSourceHelper2_INTERFACE_DEFINED__ */ @@ -14608,102 +12725,103 @@ typedef struct IShellLinkAVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellLinkA* This, + IShellLinkA *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellLinkA* This); + IShellLinkA *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellLinkA* This); + IShellLinkA *This); /*** IShellLinkA methods ***/ HRESULT (STDMETHODCALLTYPE *GetPath)( - IShellLinkA* This, + IShellLinkA *This, LPSTR pszFile, int cch, WIN32_FIND_DATAA *pfd, DWORD fFlags); HRESULT (STDMETHODCALLTYPE *GetIDList)( - IShellLinkA* This, + IShellLinkA *This, PIDLIST_ABSOLUTE *ppidl); HRESULT (STDMETHODCALLTYPE *SetIDList)( - IShellLinkA* This, + IShellLinkA *This, PCIDLIST_ABSOLUTE pidl); HRESULT (STDMETHODCALLTYPE *GetDescription)( - IShellLinkA* This, + IShellLinkA *This, LPSTR pszName, int cch); HRESULT (STDMETHODCALLTYPE *SetDescription)( - IShellLinkA* This, + IShellLinkA *This, LPCSTR pszName); HRESULT (STDMETHODCALLTYPE *GetWorkingDirectory)( - IShellLinkA* This, + IShellLinkA *This, LPSTR pszDir, int cch); HRESULT (STDMETHODCALLTYPE *SetWorkingDirectory)( - IShellLinkA* This, + IShellLinkA *This, LPCSTR pszDir); HRESULT (STDMETHODCALLTYPE *GetArguments)( - IShellLinkA* This, + IShellLinkA *This, LPSTR pszArgs, int cch); HRESULT (STDMETHODCALLTYPE *SetArguments)( - IShellLinkA* This, + IShellLinkA *This, LPCSTR pszArgs); HRESULT (STDMETHODCALLTYPE *GetHotkey)( - IShellLinkA* This, + IShellLinkA *This, WORD *pwHotkey); HRESULT (STDMETHODCALLTYPE *SetHotkey)( - IShellLinkA* This, + IShellLinkA *This, WORD wHotkey); HRESULT (STDMETHODCALLTYPE *GetShowCmd)( - IShellLinkA* This, + IShellLinkA *This, int *piShowCmd); HRESULT (STDMETHODCALLTYPE *SetShowCmd)( - IShellLinkA* This, + IShellLinkA *This, int iShowCmd); HRESULT (STDMETHODCALLTYPE *GetIconLocation)( - IShellLinkA* This, + IShellLinkA *This, LPSTR pszIconPath, int cch, int *piIcon); HRESULT (STDMETHODCALLTYPE *SetIconLocation)( - IShellLinkA* This, + IShellLinkA *This, LPCSTR pszIconPath, int iIcon); HRESULT (STDMETHODCALLTYPE *SetRelativePath)( - IShellLinkA* This, + IShellLinkA *This, LPCSTR pszPathRel, DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *Resolve)( - IShellLinkA* This, + IShellLinkA *This, HWND hwnd, DWORD fFlags); HRESULT (STDMETHODCALLTYPE *SetPath)( - IShellLinkA* This, + IShellLinkA *This, LPCSTR pszFile); END_INTERFACE } IShellLinkAVtbl; + interface IShellLinkA { CONST_VTBL IShellLinkAVtbl* lpVtbl; }; @@ -14804,161 +12922,6 @@ static FORCEINLINE HRESULT IShellLinkA_SetPath(IShellLinkA* This,LPCSTR pszFile) #endif -HRESULT STDMETHODCALLTYPE IShellLinkA_GetPath_Proxy( - IShellLinkA* This, - LPSTR pszFile, - int cch, - WIN32_FIND_DATAA *pfd, - DWORD fFlags); -void __RPC_STUB IShellLinkA_GetPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkA_GetIDList_Proxy( - IShellLinkA* This, - PIDLIST_ABSOLUTE *ppidl); -void __RPC_STUB IShellLinkA_GetIDList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkA_SetIDList_Proxy( - IShellLinkA* This, - PCIDLIST_ABSOLUTE pidl); -void __RPC_STUB IShellLinkA_SetIDList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkA_GetDescription_Proxy( - IShellLinkA* This, - LPSTR pszName, - int cch); -void __RPC_STUB IShellLinkA_GetDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkA_SetDescription_Proxy( - IShellLinkA* This, - LPCSTR pszName); -void __RPC_STUB IShellLinkA_SetDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkA_GetWorkingDirectory_Proxy( - IShellLinkA* This, - LPSTR pszDir, - int cch); -void __RPC_STUB IShellLinkA_GetWorkingDirectory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkA_SetWorkingDirectory_Proxy( - IShellLinkA* This, - LPCSTR pszDir); -void __RPC_STUB IShellLinkA_SetWorkingDirectory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkA_GetArguments_Proxy( - IShellLinkA* This, - LPSTR pszArgs, - int cch); -void __RPC_STUB IShellLinkA_GetArguments_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkA_SetArguments_Proxy( - IShellLinkA* This, - LPCSTR pszArgs); -void __RPC_STUB IShellLinkA_SetArguments_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkA_GetHotkey_Proxy( - IShellLinkA* This, - WORD *pwHotkey); -void __RPC_STUB IShellLinkA_GetHotkey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkA_SetHotkey_Proxy( - IShellLinkA* This, - WORD wHotkey); -void __RPC_STUB IShellLinkA_SetHotkey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkA_GetShowCmd_Proxy( - IShellLinkA* This, - int *piShowCmd); -void __RPC_STUB IShellLinkA_GetShowCmd_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkA_SetShowCmd_Proxy( - IShellLinkA* This, - int iShowCmd); -void __RPC_STUB IShellLinkA_SetShowCmd_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkA_GetIconLocation_Proxy( - IShellLinkA* This, - LPSTR pszIconPath, - int cch, - int *piIcon); -void __RPC_STUB IShellLinkA_GetIconLocation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkA_SetIconLocation_Proxy( - IShellLinkA* This, - LPCSTR pszIconPath, - int iIcon); -void __RPC_STUB IShellLinkA_SetIconLocation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkA_SetRelativePath_Proxy( - IShellLinkA* This, - LPCSTR pszPathRel, - DWORD dwReserved); -void __RPC_STUB IShellLinkA_SetRelativePath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkA_Resolve_Proxy( - IShellLinkA* This, - HWND hwnd, - DWORD fFlags); -void __RPC_STUB IShellLinkA_Resolve_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkA_SetPath_Proxy( - IShellLinkA* This, - LPCSTR pszFile); -void __RPC_STUB IShellLinkA_SetPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellLinkA_INTERFACE_DEFINED__ */ @@ -15049,102 +13012,103 @@ typedef struct IShellLinkWVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellLinkW* This, + IShellLinkW *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellLinkW* This); + IShellLinkW *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellLinkW* This); + IShellLinkW *This); /*** IShellLinkW methods ***/ HRESULT (STDMETHODCALLTYPE *GetPath)( - IShellLinkW* This, + IShellLinkW *This, LPWSTR pszFile, int cch, WIN32_FIND_DATAW *pfd, DWORD fFlags); HRESULT (STDMETHODCALLTYPE *GetIDList)( - IShellLinkW* This, + IShellLinkW *This, PIDLIST_ABSOLUTE *ppidl); HRESULT (STDMETHODCALLTYPE *SetIDList)( - IShellLinkW* This, + IShellLinkW *This, PCIDLIST_ABSOLUTE pidl); HRESULT (STDMETHODCALLTYPE *GetDescription)( - IShellLinkW* This, + IShellLinkW *This, LPWSTR pszName, int cch); HRESULT (STDMETHODCALLTYPE *SetDescription)( - IShellLinkW* This, + IShellLinkW *This, LPCWSTR pszName); HRESULT (STDMETHODCALLTYPE *GetWorkingDirectory)( - IShellLinkW* This, + IShellLinkW *This, LPWSTR pszDir, int cch); HRESULT (STDMETHODCALLTYPE *SetWorkingDirectory)( - IShellLinkW* This, + IShellLinkW *This, LPCWSTR pszDir); HRESULT (STDMETHODCALLTYPE *GetArguments)( - IShellLinkW* This, + IShellLinkW *This, LPWSTR pszArgs, int cch); HRESULT (STDMETHODCALLTYPE *SetArguments)( - IShellLinkW* This, + IShellLinkW *This, LPCWSTR pszArgs); HRESULT (STDMETHODCALLTYPE *GetHotkey)( - IShellLinkW* This, + IShellLinkW *This, WORD *pwHotkey); HRESULT (STDMETHODCALLTYPE *SetHotkey)( - IShellLinkW* This, + IShellLinkW *This, WORD wHotkey); HRESULT (STDMETHODCALLTYPE *GetShowCmd)( - IShellLinkW* This, + IShellLinkW *This, int *piShowCmd); HRESULT (STDMETHODCALLTYPE *SetShowCmd)( - IShellLinkW* This, + IShellLinkW *This, int iShowCmd); HRESULT (STDMETHODCALLTYPE *GetIconLocation)( - IShellLinkW* This, + IShellLinkW *This, LPWSTR pszIconPath, int cch, int *piIcon); HRESULT (STDMETHODCALLTYPE *SetIconLocation)( - IShellLinkW* This, + IShellLinkW *This, LPCWSTR pszIconPath, int iIcon); HRESULT (STDMETHODCALLTYPE *SetRelativePath)( - IShellLinkW* This, + IShellLinkW *This, LPCWSTR pszPathRel, DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *Resolve)( - IShellLinkW* This, + IShellLinkW *This, HWND hwnd, DWORD fFlags); HRESULT (STDMETHODCALLTYPE *SetPath)( - IShellLinkW* This, + IShellLinkW *This, LPCWSTR pszFile); END_INTERFACE } IShellLinkWVtbl; + interface IShellLinkW { CONST_VTBL IShellLinkWVtbl* lpVtbl; }; @@ -15245,161 +13209,6 @@ static FORCEINLINE HRESULT IShellLinkW_SetPath(IShellLinkW* This,LPCWSTR pszFile #endif -HRESULT STDMETHODCALLTYPE IShellLinkW_GetPath_Proxy( - IShellLinkW* This, - LPWSTR pszFile, - int cch, - WIN32_FIND_DATAW *pfd, - DWORD fFlags); -void __RPC_STUB IShellLinkW_GetPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkW_GetIDList_Proxy( - IShellLinkW* This, - PIDLIST_ABSOLUTE *ppidl); -void __RPC_STUB IShellLinkW_GetIDList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkW_SetIDList_Proxy( - IShellLinkW* This, - PCIDLIST_ABSOLUTE pidl); -void __RPC_STUB IShellLinkW_SetIDList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkW_GetDescription_Proxy( - IShellLinkW* This, - LPWSTR pszName, - int cch); -void __RPC_STUB IShellLinkW_GetDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkW_SetDescription_Proxy( - IShellLinkW* This, - LPCWSTR pszName); -void __RPC_STUB IShellLinkW_SetDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkW_GetWorkingDirectory_Proxy( - IShellLinkW* This, - LPWSTR pszDir, - int cch); -void __RPC_STUB IShellLinkW_GetWorkingDirectory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkW_SetWorkingDirectory_Proxy( - IShellLinkW* This, - LPCWSTR pszDir); -void __RPC_STUB IShellLinkW_SetWorkingDirectory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkW_GetArguments_Proxy( - IShellLinkW* This, - LPWSTR pszArgs, - int cch); -void __RPC_STUB IShellLinkW_GetArguments_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkW_SetArguments_Proxy( - IShellLinkW* This, - LPCWSTR pszArgs); -void __RPC_STUB IShellLinkW_SetArguments_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkW_GetHotkey_Proxy( - IShellLinkW* This, - WORD *pwHotkey); -void __RPC_STUB IShellLinkW_GetHotkey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkW_SetHotkey_Proxy( - IShellLinkW* This, - WORD wHotkey); -void __RPC_STUB IShellLinkW_SetHotkey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkW_GetShowCmd_Proxy( - IShellLinkW* This, - int *piShowCmd); -void __RPC_STUB IShellLinkW_GetShowCmd_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkW_SetShowCmd_Proxy( - IShellLinkW* This, - int iShowCmd); -void __RPC_STUB IShellLinkW_SetShowCmd_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkW_GetIconLocation_Proxy( - IShellLinkW* This, - LPWSTR pszIconPath, - int cch, - int *piIcon); -void __RPC_STUB IShellLinkW_GetIconLocation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkW_SetIconLocation_Proxy( - IShellLinkW* This, - LPCWSTR pszIconPath, - int iIcon); -void __RPC_STUB IShellLinkW_SetIconLocation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkW_SetRelativePath_Proxy( - IShellLinkW* This, - LPCWSTR pszPathRel, - DWORD dwReserved); -void __RPC_STUB IShellLinkW_SetRelativePath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkW_Resolve_Proxy( - IShellLinkW* This, - HWND hwnd, - DWORD fFlags); -void __RPC_STUB IShellLinkW_Resolve_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkW_SetPath_Proxy( - IShellLinkW* This, - LPCWSTR pszFile); -void __RPC_STUB IShellLinkW_SetPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellLinkW_INTERFACE_DEFINED__ */ @@ -15441,40 +13250,41 @@ typedef struct IShellLinkDataListVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellLinkDataList* This, + IShellLinkDataList *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellLinkDataList* This); + IShellLinkDataList *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellLinkDataList* This); + IShellLinkDataList *This); /*** IShellLinkDataList methods ***/ HRESULT (STDMETHODCALLTYPE *AddDataBlock)( - IShellLinkDataList* This, + IShellLinkDataList *This, void *pDataBlock); HRESULT (STDMETHODCALLTYPE *CopyDataBlock)( - IShellLinkDataList* This, + IShellLinkDataList *This, DWORD dwSig, void **ppDataBlock); HRESULT (STDMETHODCALLTYPE *RemoveDataBlock)( - IShellLinkDataList* This, + IShellLinkDataList *This, DWORD dwSig); HRESULT (STDMETHODCALLTYPE *GetFlags)( - IShellLinkDataList* This, + IShellLinkDataList *This, DWORD *pdwFlags); HRESULT (STDMETHODCALLTYPE *SetFlags)( - IShellLinkDataList* This, + IShellLinkDataList *This, DWORD dwFlags); END_INTERFACE } IShellLinkDataListVtbl; + interface IShellLinkDataList { CONST_VTBL IShellLinkDataListVtbl* lpVtbl; }; @@ -15523,30 +13333,6 @@ static FORCEINLINE HRESULT IShellLinkDataList_SetFlags(IShellLinkDataList* This, #endif -HRESULT STDMETHODCALLTYPE IShellLinkDataList_RemoveDataBlock_Proxy( - IShellLinkDataList* This, - DWORD dwSig); -void __RPC_STUB IShellLinkDataList_RemoveDataBlock_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkDataList_GetFlags_Proxy( - IShellLinkDataList* This, - DWORD *pdwFlags); -void __RPC_STUB IShellLinkDataList_GetFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLinkDataList_SetFlags_Proxy( - IShellLinkDataList* This, - DWORD dwFlags); -void __RPC_STUB IShellLinkDataList_SetFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellLinkDataList_INTERFACE_DEFINED__ */ @@ -15577,25 +13363,26 @@ typedef struct IResolveShellLinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IResolveShellLink* This, + IResolveShellLink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IResolveShellLink* This); + IResolveShellLink *This); ULONG (STDMETHODCALLTYPE *Release)( - IResolveShellLink* This); + IResolveShellLink *This); /*** IResolveShellLink methods ***/ HRESULT (STDMETHODCALLTYPE *ResolveShellLink)( - IResolveShellLink* This, + IResolveShellLink *This, IUnknown *punkLink, HWND hwnd, DWORD fFlags); END_INTERFACE } IResolveShellLinkVtbl; + interface IResolveShellLink { CONST_VTBL IResolveShellLinkVtbl* lpVtbl; }; @@ -15628,16 +13415,6 @@ static FORCEINLINE HRESULT IResolveShellLink_ResolveShellLink(IResolveShellLink* #endif -HRESULT STDMETHODCALLTYPE IResolveShellLink_ResolveShellLink_Proxy( - IResolveShellLink* This, - IUnknown *punkLink, - HWND hwnd, - DWORD fFlags); -void __RPC_STUB IResolveShellLink_ResolveShellLink_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IResolveShellLink_INTERFACE_DEFINED__ */ @@ -15654,7 +13431,6 @@ enum _SPINITF { SPINITF_NOMINIMIZE = 0x8 }; - typedef DWORD SPINITF; DEFINE_GUID(IID_IActionProgressDialog, 0x49ff1172, 0xeadc, 0x446d, 0x92,0x85, 0x15,0x64,0x53,0xa6,0x43,0x1c); @@ -15680,28 +13456,29 @@ typedef struct IActionProgressDialogVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActionProgressDialog* This, + IActionProgressDialog *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActionProgressDialog* This); + IActionProgressDialog *This); ULONG (STDMETHODCALLTYPE *Release)( - IActionProgressDialog* This); + IActionProgressDialog *This); /*** IActionProgressDialog methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IActionProgressDialog* This, + IActionProgressDialog *This, SPINITF flags, LPCWSTR pszTitle, LPCWSTR pszCancel); HRESULT (STDMETHODCALLTYPE *Stop)( - IActionProgressDialog* This); + IActionProgressDialog *This); END_INTERFACE } IActionProgressDialogVtbl; + interface IActionProgressDialog { CONST_VTBL IActionProgressDialogVtbl* lpVtbl; }; @@ -15738,23 +13515,6 @@ static FORCEINLINE HRESULT IActionProgressDialog_Stop(IActionProgressDialog* Thi #endif -HRESULT STDMETHODCALLTYPE IActionProgressDialog_Initialize_Proxy( - IActionProgressDialog* This, - SPINITF flags, - LPCWSTR pszTitle, - LPCWSTR pszCancel); -void __RPC_STUB IActionProgressDialog_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActionProgressDialog_Stop_Proxy( - IActionProgressDialog* This); -void __RPC_STUB IActionProgressDialog_Stop_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActionProgressDialog_INTERFACE_DEFINED__ */ @@ -15795,29 +13555,29 @@ typedef struct IHWEventHandlerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IHWEventHandler* This, + IHWEventHandler *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IHWEventHandler* This); + IHWEventHandler *This); ULONG (STDMETHODCALLTYPE *Release)( - IHWEventHandler* This); + IHWEventHandler *This); /*** IHWEventHandler methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IHWEventHandler* This, + IHWEventHandler *This, LPCWSTR pszParams); HRESULT (STDMETHODCALLTYPE *HandleEvent)( - IHWEventHandler* This, + IHWEventHandler *This, LPCWSTR pszDeviceID, LPCWSTR pszAltDeviceID, LPCWSTR pszEventType); HRESULT (STDMETHODCALLTYPE *HandleEventWithContent)( - IHWEventHandler* This, + IHWEventHandler *This, LPCWSTR pszDeviceID, LPCWSTR pszAltDeviceID, LPCWSTR pszEventType, @@ -15826,6 +13586,7 @@ typedef struct IHWEventHandlerVtbl { END_INTERFACE } IHWEventHandlerVtbl; + interface IHWEventHandler { CONST_VTBL IHWEventHandlerVtbl* lpVtbl; }; @@ -15866,36 +13627,6 @@ static FORCEINLINE HRESULT IHWEventHandler_HandleEventWithContent(IHWEventHandle #endif -HRESULT STDMETHODCALLTYPE IHWEventHandler_Initialize_Proxy( - IHWEventHandler* This, - LPCWSTR pszParams); -void __RPC_STUB IHWEventHandler_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IHWEventHandler_HandleEvent_Proxy( - IHWEventHandler* This, - LPCWSTR pszDeviceID, - LPCWSTR pszAltDeviceID, - LPCWSTR pszEventType); -void __RPC_STUB IHWEventHandler_HandleEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IHWEventHandler_HandleEventWithContent_Proxy( - IHWEventHandler* This, - LPCWSTR pszDeviceID, - LPCWSTR pszAltDeviceID, - LPCWSTR pszEventType, - LPCWSTR pszContentTypeHandler, - IDataObject *pdataobject); -void __RPC_STUB IHWEventHandler_HandleEventWithContent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IHWEventHandler_INTERFACE_DEFINED__ */ @@ -15927,29 +13658,29 @@ typedef struct IHWEventHandler2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IHWEventHandler2* This, + IHWEventHandler2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IHWEventHandler2* This); + IHWEventHandler2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IHWEventHandler2* This); + IHWEventHandler2 *This); /*** IHWEventHandler methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IHWEventHandler2* This, + IHWEventHandler2 *This, LPCWSTR pszParams); HRESULT (STDMETHODCALLTYPE *HandleEvent)( - IHWEventHandler2* This, + IHWEventHandler2 *This, LPCWSTR pszDeviceID, LPCWSTR pszAltDeviceID, LPCWSTR pszEventType); HRESULT (STDMETHODCALLTYPE *HandleEventWithContent)( - IHWEventHandler2* This, + IHWEventHandler2 *This, LPCWSTR pszDeviceID, LPCWSTR pszAltDeviceID, LPCWSTR pszEventType, @@ -15958,7 +13689,7 @@ typedef struct IHWEventHandler2Vtbl { /*** IHWEventHandler2 methods ***/ HRESULT (STDMETHODCALLTYPE *HandleEventWithHWND)( - IHWEventHandler2* This, + IHWEventHandler2 *This, LPCWSTR pszDeviceID, LPCWSTR pszAltDeviceID, LPCWSTR pszEventType, @@ -15966,6 +13697,7 @@ typedef struct IHWEventHandler2Vtbl { END_INTERFACE } IHWEventHandler2Vtbl; + interface IHWEventHandler2 { CONST_VTBL IHWEventHandler2Vtbl* lpVtbl; }; @@ -16012,17 +13744,6 @@ static FORCEINLINE HRESULT IHWEventHandler2_HandleEventWithHWND(IHWEventHandler2 #endif -HRESULT STDMETHODCALLTYPE IHWEventHandler2_HandleEventWithHWND_Proxy( - IHWEventHandler2* This, - LPCWSTR pszDeviceID, - LPCWSTR pszAltDeviceID, - LPCWSTR pszEventType, - HWND hwndOwner); -void __RPC_STUB IHWEventHandler2_HandleEventWithHWND_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IHWEventHandler2_INTERFACE_DEFINED__ */ @@ -16082,19 +13803,19 @@ typedef struct IQueryCancelAutoPlayVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IQueryCancelAutoPlay* This, + IQueryCancelAutoPlay *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IQueryCancelAutoPlay* This); + IQueryCancelAutoPlay *This); ULONG (STDMETHODCALLTYPE *Release)( - IQueryCancelAutoPlay* This); + IQueryCancelAutoPlay *This); /*** IQueryCancelAutoPlay methods ***/ HRESULT (STDMETHODCALLTYPE *AllowAutoPlay)( - IQueryCancelAutoPlay* This, + IQueryCancelAutoPlay *This, LPCWSTR pszPath, DWORD dwContentType, LPCWSTR pszLabel, @@ -16102,6 +13823,7 @@ typedef struct IQueryCancelAutoPlayVtbl { END_INTERFACE } IQueryCancelAutoPlayVtbl; + interface IQueryCancelAutoPlay { CONST_VTBL IQueryCancelAutoPlayVtbl* lpVtbl; }; @@ -16134,17 +13856,6 @@ static FORCEINLINE HRESULT IQueryCancelAutoPlay_AllowAutoPlay(IQueryCancelAutoPl #endif -HRESULT STDMETHODCALLTYPE IQueryCancelAutoPlay_AllowAutoPlay_Proxy( - IQueryCancelAutoPlay* This, - LPCWSTR pszPath, - DWORD dwContentType, - LPCWSTR pszLabel, - DWORD dwSerialNumber); -void __RPC_STUB IQueryCancelAutoPlay_AllowAutoPlay_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IQueryCancelAutoPlay_INTERFACE_DEFINED__ */ @@ -16176,25 +13887,26 @@ typedef struct IDynamicHWHandlerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDynamicHWHandler* This, + IDynamicHWHandler *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDynamicHWHandler* This); + IDynamicHWHandler *This); ULONG (STDMETHODCALLTYPE *Release)( - IDynamicHWHandler* This); + IDynamicHWHandler *This); /*** IDynamicHWHandler methods ***/ HRESULT (STDMETHODCALLTYPE *GetDynamicInfo)( - IDynamicHWHandler* This, + IDynamicHWHandler *This, LPCWSTR pszDeviceID, DWORD dwContentType, LPWSTR *ppszAction); END_INTERFACE } IDynamicHWHandlerVtbl; + interface IDynamicHWHandler { CONST_VTBL IDynamicHWHandlerVtbl* lpVtbl; }; @@ -16227,16 +13939,6 @@ static FORCEINLINE HRESULT IDynamicHWHandler_GetDynamicInfo(IDynamicHWHandler* T #endif -HRESULT STDMETHODCALLTYPE IDynamicHWHandler_GetDynamicInfo_Proxy( - IDynamicHWHandler* This, - LPCWSTR pszDeviceID, - DWORD dwContentType, - LPWSTR *ppszAction); -void __RPC_STUB IDynamicHWHandler_GetDynamicInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDynamicHWHandler_INTERFACE_DEFINED__ */ @@ -16256,7 +13958,6 @@ enum _SPBEGINF { SPBEGINF_NOCANCELBUTTON = 0x40 }; - typedef DWORD SPBEGINF; typedef enum _SPACTION { @@ -16318,45 +14019,46 @@ typedef struct IActionProgressVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IActionProgress* This, + IActionProgress *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IActionProgress* This); + IActionProgress *This); ULONG (STDMETHODCALLTYPE *Release)( - IActionProgress* This); + IActionProgress *This); /*** IActionProgress methods ***/ HRESULT (STDMETHODCALLTYPE *Begin)( - IActionProgress* This, + IActionProgress *This, SPACTION action, SPBEGINF flags); HRESULT (STDMETHODCALLTYPE *UpdateProgress)( - IActionProgress* This, + IActionProgress *This, ULONGLONG ulCompleted, ULONGLONG ulTotal); HRESULT (STDMETHODCALLTYPE *UpdateText)( - IActionProgress* This, + IActionProgress *This, SPTEXT sptext, LPCWSTR pszText, WINBOOL fMayCompact); HRESULT (STDMETHODCALLTYPE *QueryCancel)( - IActionProgress* This, + IActionProgress *This, WINBOOL *pfCancelled); HRESULT (STDMETHODCALLTYPE *ResetCancel)( - IActionProgress* This); + IActionProgress *This); HRESULT (STDMETHODCALLTYPE *End)( - IActionProgress* This); + IActionProgress *This); END_INTERFACE } IActionProgressVtbl; + interface IActionProgress { CONST_VTBL IActionProgressVtbl* lpVtbl; }; @@ -16409,56 +14111,6 @@ static FORCEINLINE HRESULT IActionProgress_End(IActionProgress* This) { #endif -HRESULT STDMETHODCALLTYPE IActionProgress_Begin_Proxy( - IActionProgress* This, - SPACTION action, - SPBEGINF flags); -void __RPC_STUB IActionProgress_Begin_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActionProgress_UpdateProgress_Proxy( - IActionProgress* This, - ULONGLONG ulCompleted, - ULONGLONG ulTotal); -void __RPC_STUB IActionProgress_UpdateProgress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActionProgress_UpdateText_Proxy( - IActionProgress* This, - SPTEXT sptext, - LPCWSTR pszText, - WINBOOL fMayCompact); -void __RPC_STUB IActionProgress_UpdateText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActionProgress_QueryCancel_Proxy( - IActionProgress* This, - WINBOOL *pfCancelled); -void __RPC_STUB IActionProgress_QueryCancel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActionProgress_ResetCancel_Proxy( - IActionProgress* This); -void __RPC_STUB IActionProgress_ResetCancel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IActionProgress_End_Proxy( - IActionProgress* This); -void __RPC_STUB IActionProgress_End_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IActionProgress_INTERFACE_DEFINED__ */ @@ -16489,25 +14141,26 @@ typedef struct IShellExtInitVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellExtInit* This, + IShellExtInit *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellExtInit* This); + IShellExtInit *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellExtInit* This); + IShellExtInit *This); /*** IShellExtInit methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IShellExtInit* This, + IShellExtInit *This, PCIDLIST_ABSOLUTE pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID); END_INTERFACE } IShellExtInitVtbl; + interface IShellExtInit { CONST_VTBL IShellExtInitVtbl* lpVtbl; }; @@ -16540,16 +14193,6 @@ static FORCEINLINE HRESULT IShellExtInit_Initialize(IShellExtInit* This,PCIDLIST #endif -HRESULT STDMETHODCALLTYPE IShellExtInit_Initialize_Proxy( - IShellExtInit* This, - PCIDLIST_ABSOLUTE pidlFolder, - IDataObject *pdtobj, - HKEY hkeyProgID); -void __RPC_STUB IShellExtInit_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellExtInit_INTERFACE_DEFINED__ */ @@ -16565,7 +14208,6 @@ enum _EXPPS { EXPPS_FILETYPES = 0x1 }; - typedef UINT EXPPS; DEFINE_GUID(IID_IShellPropSheetExt, 0x000214e9, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46); @@ -16592,30 +14234,31 @@ typedef struct IShellPropSheetExtVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellPropSheetExt* This, + IShellPropSheetExt *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellPropSheetExt* This); + IShellPropSheetExt *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellPropSheetExt* This); + IShellPropSheetExt *This); /*** IShellPropSheetExt methods ***/ HRESULT (STDMETHODCALLTYPE *AddPages)( - IShellPropSheetExt* This, + IShellPropSheetExt *This, LPFNSVADDPROPSHEETPAGE pfnAddPage, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *ReplacePage)( - IShellPropSheetExt* This, + IShellPropSheetExt *This, EXPPS uPageID, LPFNSVADDPROPSHEETPAGE pfnReplaceWith, LPARAM lParam); END_INTERFACE } IShellPropSheetExtVtbl; + interface IShellPropSheetExt { CONST_VTBL IShellPropSheetExtVtbl* lpVtbl; }; @@ -16652,25 +14295,6 @@ static FORCEINLINE HRESULT IShellPropSheetExt_ReplacePage(IShellPropSheetExt* Th #endif -HRESULT STDMETHODCALLTYPE IShellPropSheetExt_AddPages_Proxy( - IShellPropSheetExt* This, - LPFNSVADDPROPSHEETPAGE pfnAddPage, - LPARAM lParam); -void __RPC_STUB IShellPropSheetExt_AddPages_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellPropSheetExt_ReplacePage_Proxy( - IShellPropSheetExt* This, - EXPPS uPageID, - LPFNSVADDPROPSHEETPAGE pfnReplaceWith, - LPARAM lParam); -void __RPC_STUB IShellPropSheetExt_ReplacePage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellPropSheetExt_INTERFACE_DEFINED__ */ @@ -16701,24 +14325,25 @@ typedef struct IRemoteComputerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IRemoteComputer* This, + IRemoteComputer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IRemoteComputer* This); + IRemoteComputer *This); ULONG (STDMETHODCALLTYPE *Release)( - IRemoteComputer* This); + IRemoteComputer *This); /*** IRemoteComputer methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IRemoteComputer* This, + IRemoteComputer *This, LPCWSTR pszMachine, WINBOOL bEnumerating); END_INTERFACE } IRemoteComputerVtbl; + interface IRemoteComputer { CONST_VTBL IRemoteComputerVtbl* lpVtbl; }; @@ -16751,15 +14376,6 @@ static FORCEINLINE HRESULT IRemoteComputer_Initialize(IRemoteComputer* This,LPCW #endif -HRESULT STDMETHODCALLTYPE IRemoteComputer_Initialize_Proxy( - IRemoteComputer* This, - LPCWSTR pszMachine, - WINBOOL bEnumerating); -void __RPC_STUB IRemoteComputer_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IRemoteComputer_INTERFACE_DEFINED__ */ @@ -16788,22 +14404,23 @@ typedef struct IQueryContinueVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IQueryContinue* This, + IQueryContinue *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IQueryContinue* This); + IQueryContinue *This); ULONG (STDMETHODCALLTYPE *Release)( - IQueryContinue* This); + IQueryContinue *This); /*** IQueryContinue methods ***/ HRESULT (STDMETHODCALLTYPE *QueryContinue)( - IQueryContinue* This); + IQueryContinue *This); END_INTERFACE } IQueryContinueVtbl; + interface IQueryContinue { CONST_VTBL IQueryContinueVtbl* lpVtbl; }; @@ -16836,13 +14453,6 @@ static FORCEINLINE HRESULT IQueryContinue_QueryContinue(IQueryContinue* This) { #endif -HRESULT STDMETHODCALLTYPE IQueryContinue_QueryContinue_Proxy( - IQueryContinue* This); -void __RPC_STUB IQueryContinue_QueryContinue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IQueryContinue_INTERFACE_DEFINED__ */ @@ -16871,23 +14481,24 @@ typedef struct IObjectWithCancelEventVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IObjectWithCancelEvent* This, + IObjectWithCancelEvent *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IObjectWithCancelEvent* This); + IObjectWithCancelEvent *This); ULONG (STDMETHODCALLTYPE *Release)( - IObjectWithCancelEvent* This); + IObjectWithCancelEvent *This); /*** IObjectWithCancelEvent methods ***/ HRESULT (STDMETHODCALLTYPE *GetCancelEvent)( - IObjectWithCancelEvent* This, + IObjectWithCancelEvent *This, HANDLE *phEvent); END_INTERFACE } IObjectWithCancelEventVtbl; + interface IObjectWithCancelEvent { CONST_VTBL IObjectWithCancelEventVtbl* lpVtbl; }; @@ -16920,14 +14531,6 @@ static FORCEINLINE HRESULT IObjectWithCancelEvent_GetCancelEvent(IObjectWithCanc #endif -HRESULT STDMETHODCALLTYPE IObjectWithCancelEvent_GetCancelEvent_Proxy( - IObjectWithCancelEvent* This, - HANDLE *phEvent); -void __RPC_STUB IObjectWithCancelEvent_GetCancelEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IObjectWithCancelEvent_INTERFACE_DEFINED__ */ @@ -16974,45 +14577,46 @@ typedef struct IUserNotificationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IUserNotification* This, + IUserNotification *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IUserNotification* This); + IUserNotification *This); ULONG (STDMETHODCALLTYPE *Release)( - IUserNotification* This); + IUserNotification *This); /*** IUserNotification methods ***/ HRESULT (STDMETHODCALLTYPE *SetBalloonInfo)( - IUserNotification* This, + IUserNotification *This, LPCWSTR pszTitle, LPCWSTR pszText, DWORD dwInfoFlags); HRESULT (STDMETHODCALLTYPE *SetBalloonRetry)( - IUserNotification* This, + IUserNotification *This, DWORD dwShowTime, DWORD dwInterval, UINT cRetryCount); HRESULT (STDMETHODCALLTYPE *SetIconInfo)( - IUserNotification* This, + IUserNotification *This, HICON hIcon, LPCWSTR pszToolTip); HRESULT (STDMETHODCALLTYPE *Show)( - IUserNotification* This, + IUserNotification *This, IQueryContinue *pqc, DWORD dwContinuePollInterval); HRESULT (STDMETHODCALLTYPE *PlaySound)( - IUserNotification* This, + IUserNotification *This, LPCWSTR pszSoundName); END_INTERFACE } IUserNotificationVtbl; + interface IUserNotification { CONST_VTBL IUserNotificationVtbl* lpVtbl; }; @@ -17061,52 +14665,6 @@ static FORCEINLINE HRESULT IUserNotification_PlaySound(IUserNotification* This,L #endif -HRESULT STDMETHODCALLTYPE IUserNotification_SetBalloonInfo_Proxy( - IUserNotification* This, - LPCWSTR pszTitle, - LPCWSTR pszText, - DWORD dwInfoFlags); -void __RPC_STUB IUserNotification_SetBalloonInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUserNotification_SetBalloonRetry_Proxy( - IUserNotification* This, - DWORD dwShowTime, - DWORD dwInterval, - UINT cRetryCount); -void __RPC_STUB IUserNotification_SetBalloonRetry_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUserNotification_SetIconInfo_Proxy( - IUserNotification* This, - HICON hIcon, - LPCWSTR pszToolTip); -void __RPC_STUB IUserNotification_SetIconInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUserNotification_Show_Proxy( - IUserNotification* This, - IQueryContinue *pqc, - DWORD dwContinuePollInterval); -void __RPC_STUB IUserNotification_Show_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUserNotification_PlaySound_Proxy( - IUserNotification* This, - LPCWSTR pszSoundName); -void __RPC_STUB IUserNotification_PlaySound_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IUserNotification_INTERFACE_DEFINED__ */ @@ -17141,31 +14699,32 @@ typedef struct IUserNotificationCallbackVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IUserNotificationCallback* This, + IUserNotificationCallback *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IUserNotificationCallback* This); + IUserNotificationCallback *This); ULONG (STDMETHODCALLTYPE *Release)( - IUserNotificationCallback* This); + IUserNotificationCallback *This); /*** IUserNotificationCallback methods ***/ HRESULT (STDMETHODCALLTYPE *OnBalloonUserClick)( - IUserNotificationCallback* This, + IUserNotificationCallback *This, POINT *pt); HRESULT (STDMETHODCALLTYPE *OnLeftClick)( - IUserNotificationCallback* This, + IUserNotificationCallback *This, POINT *pt); HRESULT (STDMETHODCALLTYPE *OnContextMenu)( - IUserNotificationCallback* This, + IUserNotificationCallback *This, POINT *pt); END_INTERFACE } IUserNotificationCallbackVtbl; + interface IUserNotificationCallback { CONST_VTBL IUserNotificationCallbackVtbl* lpVtbl; }; @@ -17206,30 +14765,6 @@ static FORCEINLINE HRESULT IUserNotificationCallback_OnContextMenu(IUserNotifica #endif -HRESULT STDMETHODCALLTYPE IUserNotificationCallback_OnBalloonUserClick_Proxy( - IUserNotificationCallback* This, - POINT *pt); -void __RPC_STUB IUserNotificationCallback_OnBalloonUserClick_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUserNotificationCallback_OnLeftClick_Proxy( - IUserNotificationCallback* This, - POINT *pt); -void __RPC_STUB IUserNotificationCallback_OnLeftClick_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUserNotificationCallback_OnContextMenu_Proxy( - IUserNotificationCallback* This, - POINT *pt); -void __RPC_STUB IUserNotificationCallback_OnContextMenu_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IUserNotificationCallback_INTERFACE_DEFINED__ */ @@ -17277,46 +14812,47 @@ typedef struct IUserNotification2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IUserNotification2* This, + IUserNotification2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IUserNotification2* This); + IUserNotification2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IUserNotification2* This); + IUserNotification2 *This); /*** IUserNotification2 methods ***/ HRESULT (STDMETHODCALLTYPE *SetBalloonInfo)( - IUserNotification2* This, + IUserNotification2 *This, LPCWSTR pszTitle, LPCWSTR pszText, DWORD dwInfoFlags); HRESULT (STDMETHODCALLTYPE *SetBalloonRetry)( - IUserNotification2* This, + IUserNotification2 *This, DWORD dwShowTime, DWORD dwInterval, UINT cRetryCount); HRESULT (STDMETHODCALLTYPE *SetIconInfo)( - IUserNotification2* This, + IUserNotification2 *This, HICON hIcon, LPCWSTR pszToolTip); HRESULT (STDMETHODCALLTYPE *Show)( - IUserNotification2* This, + IUserNotification2 *This, IQueryContinue *pqc, DWORD dwContinuePollInterval, IUserNotificationCallback *pSink); HRESULT (STDMETHODCALLTYPE *PlaySound)( - IUserNotification2* This, + IUserNotification2 *This, LPCWSTR pszSoundName); END_INTERFACE } IUserNotification2Vtbl; + interface IUserNotification2 { CONST_VTBL IUserNotification2Vtbl* lpVtbl; }; @@ -17365,53 +14901,6 @@ static FORCEINLINE HRESULT IUserNotification2_PlaySound(IUserNotification2* This #endif -HRESULT STDMETHODCALLTYPE IUserNotification2_SetBalloonInfo_Proxy( - IUserNotification2* This, - LPCWSTR pszTitle, - LPCWSTR pszText, - DWORD dwInfoFlags); -void __RPC_STUB IUserNotification2_SetBalloonInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUserNotification2_SetBalloonRetry_Proxy( - IUserNotification2* This, - DWORD dwShowTime, - DWORD dwInterval, - UINT cRetryCount); -void __RPC_STUB IUserNotification2_SetBalloonRetry_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUserNotification2_SetIconInfo_Proxy( - IUserNotification2* This, - HICON hIcon, - LPCWSTR pszToolTip); -void __RPC_STUB IUserNotification2_SetIconInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUserNotification2_Show_Proxy( - IUserNotification2* This, - IQueryContinue *pqc, - DWORD dwContinuePollInterval, - IUserNotificationCallback *pSink); -void __RPC_STUB IUserNotification2_Show_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUserNotification2_PlaySound_Proxy( - IUserNotification2* This, - LPCWSTR pszSoundName); -void __RPC_STUB IUserNotification2_PlaySound_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IUserNotification2_INTERFACE_DEFINED__ */ @@ -17445,29 +14934,30 @@ typedef struct IItemNameLimitsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IItemNameLimits* This, + IItemNameLimits *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IItemNameLimits* This); + IItemNameLimits *This); ULONG (STDMETHODCALLTYPE *Release)( - IItemNameLimits* This); + IItemNameLimits *This); /*** IItemNameLimits methods ***/ HRESULT (STDMETHODCALLTYPE *GetValidCharacters)( - IItemNameLimits* This, + IItemNameLimits *This, LPWSTR *ppwszValidChars, LPWSTR *ppwszInvalidChars); HRESULT (STDMETHODCALLTYPE *GetMaxLength)( - IItemNameLimits* This, + IItemNameLimits *This, LPCWSTR pszName, int *piMaxNameLen); END_INTERFACE } IItemNameLimitsVtbl; + interface IItemNameLimits { CONST_VTBL IItemNameLimitsVtbl* lpVtbl; }; @@ -17504,24 +14994,6 @@ static FORCEINLINE HRESULT IItemNameLimits_GetMaxLength(IItemNameLimits* This,LP #endif -HRESULT STDMETHODCALLTYPE IItemNameLimits_GetValidCharacters_Proxy( - IItemNameLimits* This, - LPWSTR *ppwszValidChars, - LPWSTR *ppwszInvalidChars); -void __RPC_STUB IItemNameLimits_GetValidCharacters_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IItemNameLimits_GetMaxLength_Proxy( - IItemNameLimits* This, - LPCWSTR pszName, - int *piMaxNameLen); -void __RPC_STUB IItemNameLimits_GetMaxLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IItemNameLimits_INTERFACE_DEFINED__ */ @@ -17530,6 +15002,9 @@ void __RPC_STUB IItemNameLimits_GetMaxLength_Stub( #ifndef __ICondition_FWD_DEFINED__ #define __ICondition_FWD_DEFINED__ typedef interface ICondition ICondition; +#ifdef __cplusplus +interface ICondition; +#endif /* __cplusplus */ #endif @@ -17594,71 +15069,72 @@ typedef struct ISearchFolderItemFactoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISearchFolderItemFactory* This, + ISearchFolderItemFactory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISearchFolderItemFactory* This); + ISearchFolderItemFactory *This); ULONG (STDMETHODCALLTYPE *Release)( - ISearchFolderItemFactory* This); + ISearchFolderItemFactory *This); /*** ISearchFolderItemFactory methods ***/ HRESULT (STDMETHODCALLTYPE *SetDisplayName)( - ISearchFolderItemFactory* This, + ISearchFolderItemFactory *This, LPCWSTR pszDisplayName); HRESULT (STDMETHODCALLTYPE *SetFolderTypeID)( - ISearchFolderItemFactory* This, + ISearchFolderItemFactory *This, FOLDERTYPEID ftid); HRESULT (STDMETHODCALLTYPE *SetFolderLogicalViewMode)( - ISearchFolderItemFactory* This, + ISearchFolderItemFactory *This, FOLDERLOGICALVIEWMODE flvm); HRESULT (STDMETHODCALLTYPE *SetIconSize)( - ISearchFolderItemFactory* This, + ISearchFolderItemFactory *This, int iIconSize); HRESULT (STDMETHODCALLTYPE *SetVisibleColumns)( - ISearchFolderItemFactory* This, + ISearchFolderItemFactory *This, UINT cVisibleColumns, PROPERTYKEY *rgKey); HRESULT (STDMETHODCALLTYPE *SetSortColumns)( - ISearchFolderItemFactory* This, + ISearchFolderItemFactory *This, UINT cSortColumns, SORTCOLUMN *rgSortColumns); HRESULT (STDMETHODCALLTYPE *SetGroupColumn)( - ISearchFolderItemFactory* This, + ISearchFolderItemFactory *This, REFPROPERTYKEY keyGroup); HRESULT (STDMETHODCALLTYPE *SetStacks)( - ISearchFolderItemFactory* This, + ISearchFolderItemFactory *This, UINT cStackKeys, PROPERTYKEY *rgStackKeys); HRESULT (STDMETHODCALLTYPE *SetScope)( - ISearchFolderItemFactory* This, + ISearchFolderItemFactory *This, IShellItemArray *psiaScope); HRESULT (STDMETHODCALLTYPE *SetCondition)( - ISearchFolderItemFactory* This, + ISearchFolderItemFactory *This, ICondition *pCondition); HRESULT (STDMETHODCALLTYPE *GetShellItem)( - ISearchFolderItemFactory* This, + ISearchFolderItemFactory *This, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetIDList)( - ISearchFolderItemFactory* This, + ISearchFolderItemFactory *This, PIDLIST_ABSOLUTE *ppidl); END_INTERFACE } ISearchFolderItemFactoryVtbl; + interface ISearchFolderItemFactory { CONST_VTBL ISearchFolderItemFactoryVtbl* lpVtbl; }; @@ -17735,106 +15211,6 @@ static FORCEINLINE HRESULT ISearchFolderItemFactory_GetIDList(ISearchFolderItemF #endif -HRESULT STDMETHODCALLTYPE ISearchFolderItemFactory_SetDisplayName_Proxy( - ISearchFolderItemFactory* This, - LPCWSTR pszDisplayName); -void __RPC_STUB ISearchFolderItemFactory_SetDisplayName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchFolderItemFactory_SetFolderTypeID_Proxy( - ISearchFolderItemFactory* This, - FOLDERTYPEID ftid); -void __RPC_STUB ISearchFolderItemFactory_SetFolderTypeID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchFolderItemFactory_SetFolderLogicalViewMode_Proxy( - ISearchFolderItemFactory* This, - FOLDERLOGICALVIEWMODE flvm); -void __RPC_STUB ISearchFolderItemFactory_SetFolderLogicalViewMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchFolderItemFactory_SetIconSize_Proxy( - ISearchFolderItemFactory* This, - int iIconSize); -void __RPC_STUB ISearchFolderItemFactory_SetIconSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchFolderItemFactory_SetVisibleColumns_Proxy( - ISearchFolderItemFactory* This, - UINT cVisibleColumns, - PROPERTYKEY *rgKey); -void __RPC_STUB ISearchFolderItemFactory_SetVisibleColumns_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchFolderItemFactory_SetSortColumns_Proxy( - ISearchFolderItemFactory* This, - UINT cSortColumns, - SORTCOLUMN *rgSortColumns); -void __RPC_STUB ISearchFolderItemFactory_SetSortColumns_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchFolderItemFactory_SetGroupColumn_Proxy( - ISearchFolderItemFactory* This, - REFPROPERTYKEY keyGroup); -void __RPC_STUB ISearchFolderItemFactory_SetGroupColumn_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchFolderItemFactory_SetStacks_Proxy( - ISearchFolderItemFactory* This, - UINT cStackKeys, - PROPERTYKEY *rgStackKeys); -void __RPC_STUB ISearchFolderItemFactory_SetStacks_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchFolderItemFactory_SetScope_Proxy( - ISearchFolderItemFactory* This, - IShellItemArray *psiaScope); -void __RPC_STUB ISearchFolderItemFactory_SetScope_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchFolderItemFactory_SetCondition_Proxy( - ISearchFolderItemFactory* This, - ICondition *pCondition); -void __RPC_STUB ISearchFolderItemFactory_SetCondition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchFolderItemFactory_GetShellItem_Proxy( - ISearchFolderItemFactory* This, - REFIID riid, - void **ppv); -void __RPC_STUB ISearchFolderItemFactory_GetShellItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISearchFolderItemFactory_GetIDList_Proxy( - ISearchFolderItemFactory* This, - PIDLIST_ABSOLUTE *ppidl); -void __RPC_STUB ISearchFolderItemFactory_GetIDList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISearchFolderItemFactory_INTERFACE_DEFINED__ */ @@ -17888,19 +15264,19 @@ typedef struct IExtractImageVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IExtractImage* This, + IExtractImage *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IExtractImage* This); + IExtractImage *This); ULONG (STDMETHODCALLTYPE *Release)( - IExtractImage* This); + IExtractImage *This); /*** IExtractImage methods ***/ HRESULT (STDMETHODCALLTYPE *GetLocation)( - IExtractImage* This, + IExtractImage *This, LPWSTR pszPathBuffer, DWORD cch, DWORD *pdwPriority, @@ -17909,11 +15285,12 @@ typedef struct IExtractImageVtbl { DWORD *pdwFlags); HRESULT (STDMETHODCALLTYPE *Extract)( - IExtractImage* This, + IExtractImage *This, HBITMAP *phBmpThumbnail); END_INTERFACE } IExtractImageVtbl; + interface IExtractImage { CONST_VTBL IExtractImageVtbl* lpVtbl; }; @@ -17950,27 +15327,6 @@ static FORCEINLINE HRESULT IExtractImage_Extract(IExtractImage* This,HBITMAP *ph #endif -HRESULT STDMETHODCALLTYPE IExtractImage_GetLocation_Proxy( - IExtractImage* This, - LPWSTR pszPathBuffer, - DWORD cch, - DWORD *pdwPriority, - const SIZE *prgSize, - DWORD dwRecClrDepth, - DWORD *pdwFlags); -void __RPC_STUB IExtractImage_GetLocation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExtractImage_Extract_Proxy( - IExtractImage* This, - HBITMAP *phBmpThumbnail); -void __RPC_STUB IExtractImage_Extract_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IExtractImage_INTERFACE_DEFINED__ */ @@ -18000,19 +15356,19 @@ typedef struct IExtractImage2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IExtractImage2* This, + IExtractImage2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IExtractImage2* This); + IExtractImage2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IExtractImage2* This); + IExtractImage2 *This); /*** IExtractImage methods ***/ HRESULT (STDMETHODCALLTYPE *GetLocation)( - IExtractImage2* This, + IExtractImage2 *This, LPWSTR pszPathBuffer, DWORD cch, DWORD *pdwPriority, @@ -18021,16 +15377,17 @@ typedef struct IExtractImage2Vtbl { DWORD *pdwFlags); HRESULT (STDMETHODCALLTYPE *Extract)( - IExtractImage2* This, + IExtractImage2 *This, HBITMAP *phBmpThumbnail); /*** IExtractImage2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetDateStamp)( - IExtractImage2* This, + IExtractImage2 *This, FILETIME *pDateStamp); END_INTERFACE } IExtractImage2Vtbl; + interface IExtractImage2 { CONST_VTBL IExtractImage2Vtbl* lpVtbl; }; @@ -18073,14 +15430,6 @@ static FORCEINLINE HRESULT IExtractImage2_GetDateStamp(IExtractImage2* This,FILE #endif -HRESULT STDMETHODCALLTYPE IExtractImage2_GetDateStamp_Proxy( - IExtractImage2* This, - FILETIME *pDateStamp); -void __RPC_STUB IExtractImage2_GetDateStamp_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IExtractImage2_INTERFACE_DEFINED__ */ @@ -18113,19 +15462,19 @@ typedef struct IThumbnailHandlerFactoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IThumbnailHandlerFactory* This, + IThumbnailHandlerFactory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IThumbnailHandlerFactory* This); + IThumbnailHandlerFactory *This); ULONG (STDMETHODCALLTYPE *Release)( - IThumbnailHandlerFactory* This); + IThumbnailHandlerFactory *This); /*** IThumbnailHandlerFactory methods ***/ HRESULT (STDMETHODCALLTYPE *GetThumbnailHandler)( - IThumbnailHandlerFactory* This, + IThumbnailHandlerFactory *This, PCUITEMID_CHILD pidlChild, IBindCtx *pbc, REFIID riid, @@ -18133,6 +15482,7 @@ typedef struct IThumbnailHandlerFactoryVtbl { END_INTERFACE } IThumbnailHandlerFactoryVtbl; + interface IThumbnailHandlerFactory { CONST_VTBL IThumbnailHandlerFactoryVtbl* lpVtbl; }; @@ -18165,17 +15515,6 @@ static FORCEINLINE HRESULT IThumbnailHandlerFactory_GetThumbnailHandler(IThumbna #endif -HRESULT STDMETHODCALLTYPE IThumbnailHandlerFactory_GetThumbnailHandler_Proxy( - IThumbnailHandlerFactory* This, - PCUITEMID_CHILD pidlChild, - IBindCtx *pbc, - REFIID riid, - void **ppv); -void __RPC_STUB IThumbnailHandlerFactory_GetThumbnailHandler_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IThumbnailHandlerFactory_INTERFACE_DEFINED__ */ @@ -18211,31 +15550,32 @@ typedef struct IParentAndItemVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IParentAndItem* This, + IParentAndItem *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IParentAndItem* This); + IParentAndItem *This); ULONG (STDMETHODCALLTYPE *Release)( - IParentAndItem* This); + IParentAndItem *This); /*** IParentAndItem methods ***/ HRESULT (STDMETHODCALLTYPE *SetParentAndItem)( - IParentAndItem* This, + IParentAndItem *This, PCIDLIST_ABSOLUTE pidlParent, IShellFolder *psf, PCUITEMID_CHILD pidlChild); HRESULT (STDMETHODCALLTYPE *GetParentAndItem)( - IParentAndItem* This, + IParentAndItem *This, PIDLIST_ABSOLUTE *ppidlParent, IShellFolder **ppsf, PITEMID_CHILD *ppidlChild); END_INTERFACE } IParentAndItemVtbl; + interface IParentAndItem { CONST_VTBL IParentAndItemVtbl* lpVtbl; }; @@ -18272,16 +15612,6 @@ static FORCEINLINE HRESULT IParentAndItem_GetParentAndItem(IParentAndItem* This, #endif -HRESULT STDMETHODCALLTYPE IParentAndItem_SetParentAndItem_Proxy( - IParentAndItem* This, - PCIDLIST_ABSOLUTE pidlParent, - IShellFolder *psf, - PCUITEMID_CHILD pidlChild); -void __RPC_STUB IParentAndItem_SetParentAndItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE IParentAndItem_RemoteGetParentAndItem_Proxy( IParentAndItem* This, PIDLIST_ABSOLUTE *ppidlParent, @@ -18338,42 +15668,43 @@ typedef struct IDockingWindowVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDockingWindow* This, + IDockingWindow *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDockingWindow* This); + IDockingWindow *This); ULONG (STDMETHODCALLTYPE *Release)( - IDockingWindow* This); + IDockingWindow *This); /*** IOleWindow methods ***/ HRESULT (STDMETHODCALLTYPE *GetWindow)( - IDockingWindow* This, + IDockingWindow *This, HWND *phwnd); HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)( - IDockingWindow* This, + IDockingWindow *This, WINBOOL fEnterMode); /*** IDockingWindow methods ***/ HRESULT (STDMETHODCALLTYPE *ShowDW)( - IDockingWindow* This, + IDockingWindow *This, WINBOOL fShow); HRESULT (STDMETHODCALLTYPE *CloseDW)( - IDockingWindow* This, + IDockingWindow *This, DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *ResizeBorderDW)( - IDockingWindow* This, + IDockingWindow *This, LPCRECT prcBorder, IUnknown *punkToolbarSite, WINBOOL fReserved); END_INTERFACE } IDockingWindowVtbl; + interface IDockingWindow { CONST_VTBL IDockingWindowVtbl* lpVtbl; }; @@ -18424,32 +15755,6 @@ static FORCEINLINE HRESULT IDockingWindow_ResizeBorderDW(IDockingWindow* This,LP #endif -HRESULT STDMETHODCALLTYPE IDockingWindow_ShowDW_Proxy( - IDockingWindow* This, - WINBOOL fShow); -void __RPC_STUB IDockingWindow_ShowDW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDockingWindow_CloseDW_Proxy( - IDockingWindow* This, - DWORD dwReserved); -void __RPC_STUB IDockingWindow_CloseDW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDockingWindow_ResizeBorderDW_Proxy( - IDockingWindow* This, - LPCRECT prcBorder, - IUnknown *punkToolbarSite, - WINBOOL fReserved); -void __RPC_STUB IDockingWindow_ResizeBorderDW_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDockingWindow_INTERFACE_DEFINED__ */ @@ -18508,7 +15813,6 @@ enum tagDESKBANDCID { DBID_PERMITAUTOHIDE = 7 }; - #define DBPC_SELECTFIRST (DWORD)-1 #define DBPC_SELECTLAST (DWORD)-2 @@ -18540,49 +15844,50 @@ typedef struct IDeskBandVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDeskBand* This, + IDeskBand *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDeskBand* This); + IDeskBand *This); ULONG (STDMETHODCALLTYPE *Release)( - IDeskBand* This); + IDeskBand *This); /*** IOleWindow methods ***/ HRESULT (STDMETHODCALLTYPE *GetWindow)( - IDeskBand* This, + IDeskBand *This, HWND *phwnd); HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)( - IDeskBand* This, + IDeskBand *This, WINBOOL fEnterMode); /*** IDockingWindow methods ***/ HRESULT (STDMETHODCALLTYPE *ShowDW)( - IDeskBand* This, + IDeskBand *This, WINBOOL fShow); HRESULT (STDMETHODCALLTYPE *CloseDW)( - IDeskBand* This, + IDeskBand *This, DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *ResizeBorderDW)( - IDeskBand* This, + IDeskBand *This, LPCRECT prcBorder, IUnknown *punkToolbarSite, WINBOOL fReserved); /*** IDeskBand methods ***/ HRESULT (STDMETHODCALLTYPE *GetBandInfo)( - IDeskBand* This, + IDeskBand *This, DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi); END_INTERFACE } IDeskBandVtbl; + interface IDeskBand { CONST_VTBL IDeskBandVtbl* lpVtbl; }; @@ -18639,16 +15944,6 @@ static FORCEINLINE HRESULT IDeskBand_GetBandInfo(IDeskBand* This,DWORD dwBandID, #endif -HRESULT STDMETHODCALLTYPE IDeskBand_GetBandInfo_Proxy( - IDeskBand* This, - DWORD dwBandID, - DWORD dwViewMode, - DESKBANDINFO *pdbi); -void __RPC_STUB IDeskBand_GetBandInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDeskBand_INTERFACE_DEFINED__ */ @@ -18680,25 +15975,26 @@ typedef struct IDeskBandInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDeskBandInfo* This, + IDeskBandInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDeskBandInfo* This); + IDeskBandInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IDeskBandInfo* This); + IDeskBandInfo *This); /*** IDeskBandInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetDefaultBandWidth)( - IDeskBandInfo* This, + IDeskBandInfo *This, DWORD dwBandID, DWORD dwViewMode, int *pnWidth); END_INTERFACE } IDeskBandInfoVtbl; + interface IDeskBandInfo { CONST_VTBL IDeskBandInfoVtbl* lpVtbl; }; @@ -18731,16 +16027,6 @@ static FORCEINLINE HRESULT IDeskBandInfo_GetDefaultBandWidth(IDeskBandInfo* This #endif -HRESULT STDMETHODCALLTYPE IDeskBandInfo_GetDefaultBandWidth_Proxy( - IDeskBandInfo* This, - DWORD dwBandID, - DWORD dwViewMode, - int *pnWidth); -void __RPC_STUB IDeskBandInfo_GetDefaultBandWidth_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDeskBandInfo_INTERFACE_DEFINED__ */ @@ -18775,62 +16061,63 @@ typedef struct IDeskBand2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDeskBand2* This, + IDeskBand2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDeskBand2* This); + IDeskBand2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IDeskBand2* This); + IDeskBand2 *This); /*** IOleWindow methods ***/ HRESULT (STDMETHODCALLTYPE *GetWindow)( - IDeskBand2* This, + IDeskBand2 *This, HWND *phwnd); HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)( - IDeskBand2* This, + IDeskBand2 *This, WINBOOL fEnterMode); /*** IDockingWindow methods ***/ HRESULT (STDMETHODCALLTYPE *ShowDW)( - IDeskBand2* This, + IDeskBand2 *This, WINBOOL fShow); HRESULT (STDMETHODCALLTYPE *CloseDW)( - IDeskBand2* This, + IDeskBand2 *This, DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *ResizeBorderDW)( - IDeskBand2* This, + IDeskBand2 *This, LPCRECT prcBorder, IUnknown *punkToolbarSite, WINBOOL fReserved); /*** IDeskBand methods ***/ HRESULT (STDMETHODCALLTYPE *GetBandInfo)( - IDeskBand2* This, + IDeskBand2 *This, DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi); /*** IDeskBand2 methods ***/ HRESULT (STDMETHODCALLTYPE *CanRenderComposited)( - IDeskBand2* This, + IDeskBand2 *This, WINBOOL *pfCanRenderComposited); HRESULT (STDMETHODCALLTYPE *SetCompositionState)( - IDeskBand2* This, + IDeskBand2 *This, WINBOOL fCompositionEnabled); HRESULT (STDMETHODCALLTYPE *GetCompositionState)( - IDeskBand2* This, + IDeskBand2 *This, WINBOOL *pfCompositionEnabled); END_INTERFACE } IDeskBand2Vtbl; + interface IDeskBand2 { CONST_VTBL IDeskBand2Vtbl* lpVtbl; }; @@ -18901,30 +16188,6 @@ static FORCEINLINE HRESULT IDeskBand2_GetCompositionState(IDeskBand2* This,WINBO #endif -HRESULT STDMETHODCALLTYPE IDeskBand2_CanRenderComposited_Proxy( - IDeskBand2* This, - WINBOOL *pfCanRenderComposited); -void __RPC_STUB IDeskBand2_CanRenderComposited_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDeskBand2_SetCompositionState_Proxy( - IDeskBand2* This, - WINBOOL fCompositionEnabled); -void __RPC_STUB IDeskBand2_SetCompositionState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDeskBand2_GetCompositionState_Proxy( - IDeskBand2* This, - WINBOOL *pfCompositionEnabled); -void __RPC_STUB IDeskBand2_GetCompositionState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDeskBand2_INTERFACE_DEFINED__ */ @@ -18966,38 +16229,39 @@ typedef struct ITaskbarListVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITaskbarList* This, + ITaskbarList *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITaskbarList* This); + ITaskbarList *This); ULONG (STDMETHODCALLTYPE *Release)( - ITaskbarList* This); + ITaskbarList *This); /*** ITaskbarList methods ***/ HRESULT (STDMETHODCALLTYPE *HrInit)( - ITaskbarList* This); + ITaskbarList *This); HRESULT (STDMETHODCALLTYPE *AddTab)( - ITaskbarList* This, + ITaskbarList *This, HWND hwnd); HRESULT (STDMETHODCALLTYPE *DeleteTab)( - ITaskbarList* This, + ITaskbarList *This, HWND hwnd); HRESULT (STDMETHODCALLTYPE *ActivateTab)( - ITaskbarList* This, + ITaskbarList *This, HWND hwnd); HRESULT (STDMETHODCALLTYPE *SetActiveAlt)( - ITaskbarList* This, + ITaskbarList *This, HWND hwnd); END_INTERFACE } ITaskbarListVtbl; + interface ITaskbarList { CONST_VTBL ITaskbarListVtbl* lpVtbl; }; @@ -19046,45 +16310,6 @@ static FORCEINLINE HRESULT ITaskbarList_SetActiveAlt(ITaskbarList* This,HWND hwn #endif -HRESULT STDMETHODCALLTYPE ITaskbarList_HrInit_Proxy( - ITaskbarList* This); -void __RPC_STUB ITaskbarList_HrInit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITaskbarList_AddTab_Proxy( - ITaskbarList* This, - HWND hwnd); -void __RPC_STUB ITaskbarList_AddTab_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITaskbarList_DeleteTab_Proxy( - ITaskbarList* This, - HWND hwnd); -void __RPC_STUB ITaskbarList_DeleteTab_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITaskbarList_ActivateTab_Proxy( - ITaskbarList* This, - HWND hwnd); -void __RPC_STUB ITaskbarList_ActivateTab_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITaskbarList_SetActiveAlt_Proxy( - ITaskbarList* This, - HWND hwnd); -void __RPC_STUB ITaskbarList_SetActiveAlt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ITaskbarList_INTERFACE_DEFINED__ */ @@ -19114,44 +16339,45 @@ typedef struct ITaskbarList2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITaskbarList2* This, + ITaskbarList2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITaskbarList2* This); + ITaskbarList2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ITaskbarList2* This); + ITaskbarList2 *This); /*** ITaskbarList methods ***/ HRESULT (STDMETHODCALLTYPE *HrInit)( - ITaskbarList2* This); + ITaskbarList2 *This); HRESULT (STDMETHODCALLTYPE *AddTab)( - ITaskbarList2* This, + ITaskbarList2 *This, HWND hwnd); HRESULT (STDMETHODCALLTYPE *DeleteTab)( - ITaskbarList2* This, + ITaskbarList2 *This, HWND hwnd); HRESULT (STDMETHODCALLTYPE *ActivateTab)( - ITaskbarList2* This, + ITaskbarList2 *This, HWND hwnd); HRESULT (STDMETHODCALLTYPE *SetActiveAlt)( - ITaskbarList2* This, + ITaskbarList2 *This, HWND hwnd); /*** ITaskbarList2 methods ***/ HRESULT (STDMETHODCALLTYPE *MarkFullscreenWindow)( - ITaskbarList2* This, + ITaskbarList2 *This, HWND hwnd, WINBOOL fFullscreen); END_INTERFACE } ITaskbarList2Vtbl; + interface ITaskbarList2 { CONST_VTBL ITaskbarList2Vtbl* lpVtbl; }; @@ -19206,15 +16432,6 @@ static FORCEINLINE HRESULT ITaskbarList2_MarkFullscreenWindow(ITaskbarList2* Thi #endif -HRESULT STDMETHODCALLTYPE ITaskbarList2_MarkFullscreenWindow_Proxy( - ITaskbarList2* This, - HWND hwnd, - WINBOOL fFullscreen); -void __RPC_STUB ITaskbarList2_MarkFullscreenWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ITaskbarList2_INTERFACE_DEFINED__ */ @@ -19341,109 +16558,110 @@ typedef struct ITaskbarList3Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITaskbarList3* This, + ITaskbarList3 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITaskbarList3* This); + ITaskbarList3 *This); ULONG (STDMETHODCALLTYPE *Release)( - ITaskbarList3* This); + ITaskbarList3 *This); /*** ITaskbarList methods ***/ HRESULT (STDMETHODCALLTYPE *HrInit)( - ITaskbarList3* This); + ITaskbarList3 *This); HRESULT (STDMETHODCALLTYPE *AddTab)( - ITaskbarList3* This, + ITaskbarList3 *This, HWND hwnd); HRESULT (STDMETHODCALLTYPE *DeleteTab)( - ITaskbarList3* This, + ITaskbarList3 *This, HWND hwnd); HRESULT (STDMETHODCALLTYPE *ActivateTab)( - ITaskbarList3* This, + ITaskbarList3 *This, HWND hwnd); HRESULT (STDMETHODCALLTYPE *SetActiveAlt)( - ITaskbarList3* This, + ITaskbarList3 *This, HWND hwnd); /*** ITaskbarList2 methods ***/ HRESULT (STDMETHODCALLTYPE *MarkFullscreenWindow)( - ITaskbarList3* This, + ITaskbarList3 *This, HWND hwnd, WINBOOL fFullscreen); /*** ITaskbarList3 methods ***/ HRESULT (STDMETHODCALLTYPE *SetProgressValue)( - ITaskbarList3* This, + ITaskbarList3 *This, HWND hwnd, ULONGLONG ullCompleted, ULONGLONG ullTotal); HRESULT (STDMETHODCALLTYPE *SetProgressState)( - ITaskbarList3* This, + ITaskbarList3 *This, HWND hwnd, TBPFLAG tbpFlags); HRESULT (STDMETHODCALLTYPE *RegisterTab)( - ITaskbarList3* This, + ITaskbarList3 *This, HWND hwndTab, HWND hwndMDI); HRESULT (STDMETHODCALLTYPE *UnregisterTab)( - ITaskbarList3* This, + ITaskbarList3 *This, HWND hwndTab); HRESULT (STDMETHODCALLTYPE *SetTabOrder)( - ITaskbarList3* This, + ITaskbarList3 *This, HWND hwndTab, HWND hwndInsertBefore); HRESULT (STDMETHODCALLTYPE *SetTabActive)( - ITaskbarList3* This, + ITaskbarList3 *This, HWND hwndTab, HWND hwndMDI, DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *ThumbBarAddButtons)( - ITaskbarList3* This, + ITaskbarList3 *This, HWND hwnd, UINT cButtons, LPTHUMBBUTTON pButton); HRESULT (STDMETHODCALLTYPE *ThumbBarUpdateButtons)( - ITaskbarList3* This, + ITaskbarList3 *This, HWND hwnd, UINT cButtons, LPTHUMBBUTTON pButton); HRESULT (STDMETHODCALLTYPE *ThumbBarSetImageList)( - ITaskbarList3* This, + ITaskbarList3 *This, HWND hwnd, HIMAGELIST himl); HRESULT (STDMETHODCALLTYPE *SetOverlayIcon)( - ITaskbarList3* This, + ITaskbarList3 *This, HWND hwnd, HICON hIcon, LPCWSTR pszDescription); HRESULT (STDMETHODCALLTYPE *SetThumbnailTooltip)( - ITaskbarList3* This, + ITaskbarList3 *This, HWND hwnd, LPCWSTR pszTip); HRESULT (STDMETHODCALLTYPE *SetThumbnailClip)( - ITaskbarList3* This, + ITaskbarList3 *This, HWND hwnd, RECT *prcClip); END_INTERFACE } ITaskbarList3Vtbl; + interface ITaskbarList3 { CONST_VTBL ITaskbarList3Vtbl* lpVtbl; }; @@ -19548,118 +16766,6 @@ static FORCEINLINE HRESULT ITaskbarList3_SetThumbnailClip(ITaskbarList3* This,HW #endif -HRESULT STDMETHODCALLTYPE ITaskbarList3_SetProgressValue_Proxy( - ITaskbarList3* This, - HWND hwnd, - ULONGLONG ullCompleted, - ULONGLONG ullTotal); -void __RPC_STUB ITaskbarList3_SetProgressValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITaskbarList3_SetProgressState_Proxy( - ITaskbarList3* This, - HWND hwnd, - TBPFLAG tbpFlags); -void __RPC_STUB ITaskbarList3_SetProgressState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITaskbarList3_RegisterTab_Proxy( - ITaskbarList3* This, - HWND hwndTab, - HWND hwndMDI); -void __RPC_STUB ITaskbarList3_RegisterTab_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITaskbarList3_UnregisterTab_Proxy( - ITaskbarList3* This, - HWND hwndTab); -void __RPC_STUB ITaskbarList3_UnregisterTab_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITaskbarList3_SetTabOrder_Proxy( - ITaskbarList3* This, - HWND hwndTab, - HWND hwndInsertBefore); -void __RPC_STUB ITaskbarList3_SetTabOrder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITaskbarList3_SetTabActive_Proxy( - ITaskbarList3* This, - HWND hwndTab, - HWND hwndMDI, - DWORD dwReserved); -void __RPC_STUB ITaskbarList3_SetTabActive_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITaskbarList3_ThumbBarAddButtons_Proxy( - ITaskbarList3* This, - HWND hwnd, - UINT cButtons, - LPTHUMBBUTTON pButton); -void __RPC_STUB ITaskbarList3_ThumbBarAddButtons_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITaskbarList3_ThumbBarUpdateButtons_Proxy( - ITaskbarList3* This, - HWND hwnd, - UINT cButtons, - LPTHUMBBUTTON pButton); -void __RPC_STUB ITaskbarList3_ThumbBarUpdateButtons_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITaskbarList3_ThumbBarSetImageList_Proxy( - ITaskbarList3* This, - HWND hwnd, - HIMAGELIST himl); -void __RPC_STUB ITaskbarList3_ThumbBarSetImageList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITaskbarList3_SetOverlayIcon_Proxy( - ITaskbarList3* This, - HWND hwnd, - HICON hIcon, - LPCWSTR pszDescription); -void __RPC_STUB ITaskbarList3_SetOverlayIcon_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITaskbarList3_SetThumbnailTooltip_Proxy( - ITaskbarList3* This, - HWND hwnd, - LPCWSTR pszTip); -void __RPC_STUB ITaskbarList3_SetThumbnailTooltip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITaskbarList3_SetThumbnailClip_Proxy( - ITaskbarList3* This, - HWND hwnd, - RECT *prcClip); -void __RPC_STUB ITaskbarList3_SetThumbnailClip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ITaskbarList3_INTERFACE_DEFINED__ */ @@ -19699,115 +16805,116 @@ typedef struct ITaskbarList4Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITaskbarList4* This, + ITaskbarList4 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITaskbarList4* This); + ITaskbarList4 *This); ULONG (STDMETHODCALLTYPE *Release)( - ITaskbarList4* This); + ITaskbarList4 *This); /*** ITaskbarList methods ***/ HRESULT (STDMETHODCALLTYPE *HrInit)( - ITaskbarList4* This); + ITaskbarList4 *This); HRESULT (STDMETHODCALLTYPE *AddTab)( - ITaskbarList4* This, + ITaskbarList4 *This, HWND hwnd); HRESULT (STDMETHODCALLTYPE *DeleteTab)( - ITaskbarList4* This, + ITaskbarList4 *This, HWND hwnd); HRESULT (STDMETHODCALLTYPE *ActivateTab)( - ITaskbarList4* This, + ITaskbarList4 *This, HWND hwnd); HRESULT (STDMETHODCALLTYPE *SetActiveAlt)( - ITaskbarList4* This, + ITaskbarList4 *This, HWND hwnd); /*** ITaskbarList2 methods ***/ HRESULT (STDMETHODCALLTYPE *MarkFullscreenWindow)( - ITaskbarList4* This, + ITaskbarList4 *This, HWND hwnd, WINBOOL fFullscreen); /*** ITaskbarList3 methods ***/ HRESULT (STDMETHODCALLTYPE *SetProgressValue)( - ITaskbarList4* This, + ITaskbarList4 *This, HWND hwnd, ULONGLONG ullCompleted, ULONGLONG ullTotal); HRESULT (STDMETHODCALLTYPE *SetProgressState)( - ITaskbarList4* This, + ITaskbarList4 *This, HWND hwnd, TBPFLAG tbpFlags); HRESULT (STDMETHODCALLTYPE *RegisterTab)( - ITaskbarList4* This, + ITaskbarList4 *This, HWND hwndTab, HWND hwndMDI); HRESULT (STDMETHODCALLTYPE *UnregisterTab)( - ITaskbarList4* This, + ITaskbarList4 *This, HWND hwndTab); HRESULT (STDMETHODCALLTYPE *SetTabOrder)( - ITaskbarList4* This, + ITaskbarList4 *This, HWND hwndTab, HWND hwndInsertBefore); HRESULT (STDMETHODCALLTYPE *SetTabActive)( - ITaskbarList4* This, + ITaskbarList4 *This, HWND hwndTab, HWND hwndMDI, DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *ThumbBarAddButtons)( - ITaskbarList4* This, + ITaskbarList4 *This, HWND hwnd, UINT cButtons, LPTHUMBBUTTON pButton); HRESULT (STDMETHODCALLTYPE *ThumbBarUpdateButtons)( - ITaskbarList4* This, + ITaskbarList4 *This, HWND hwnd, UINT cButtons, LPTHUMBBUTTON pButton); HRESULT (STDMETHODCALLTYPE *ThumbBarSetImageList)( - ITaskbarList4* This, + ITaskbarList4 *This, HWND hwnd, HIMAGELIST himl); HRESULT (STDMETHODCALLTYPE *SetOverlayIcon)( - ITaskbarList4* This, + ITaskbarList4 *This, HWND hwnd, HICON hIcon, LPCWSTR pszDescription); HRESULT (STDMETHODCALLTYPE *SetThumbnailTooltip)( - ITaskbarList4* This, + ITaskbarList4 *This, HWND hwnd, LPCWSTR pszTip); HRESULT (STDMETHODCALLTYPE *SetThumbnailClip)( - ITaskbarList4* This, + ITaskbarList4 *This, HWND hwnd, RECT *prcClip); /*** ITaskbarList4 methods ***/ HRESULT (STDMETHODCALLTYPE *SetTabProperties)( - ITaskbarList4* This, + ITaskbarList4 *This, HWND hwndTab, STPFLAG stpFlags); END_INTERFACE } ITaskbarList4Vtbl; + interface ITaskbarList4 { CONST_VTBL ITaskbarList4Vtbl* lpVtbl; }; @@ -19918,15 +17025,6 @@ static FORCEINLINE HRESULT ITaskbarList4_SetTabProperties(ITaskbarList4* This,HW #endif -HRESULT STDMETHODCALLTYPE ITaskbarList4_SetTabProperties_Proxy( - ITaskbarList4* This, - HWND hwndTab, - STPFLAG stpFlags); -void __RPC_STUB ITaskbarList4_SetTabProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ITaskbarList4_INTERFACE_DEFINED__ */ @@ -19955,23 +17053,24 @@ typedef struct IStartMenuPinnedListVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IStartMenuPinnedList* This, + IStartMenuPinnedList *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IStartMenuPinnedList* This); + IStartMenuPinnedList *This); ULONG (STDMETHODCALLTYPE *Release)( - IStartMenuPinnedList* This); + IStartMenuPinnedList *This); /*** IStartMenuPinnedList methods ***/ HRESULT (STDMETHODCALLTYPE *RemoveFromList)( - IStartMenuPinnedList* This, + IStartMenuPinnedList *This, IShellItem *pitem); END_INTERFACE } IStartMenuPinnedListVtbl; + interface IStartMenuPinnedList { CONST_VTBL IStartMenuPinnedListVtbl* lpVtbl; }; @@ -20004,14 +17103,6 @@ static FORCEINLINE HRESULT IStartMenuPinnedList_RemoveFromList(IStartMenuPinnedL #endif -HRESULT STDMETHODCALLTYPE IStartMenuPinnedList_RemoveFromList_Proxy( - IStartMenuPinnedList* This, - IShellItem *pitem); -void __RPC_STUB IStartMenuPinnedList_RemoveFromList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IStartMenuPinnedList_INTERFACE_DEFINED__ */ @@ -20047,32 +17138,33 @@ typedef struct ICDBurnVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICDBurn* This, + ICDBurn *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICDBurn* This); + ICDBurn *This); ULONG (STDMETHODCALLTYPE *Release)( - ICDBurn* This); + ICDBurn *This); /*** ICDBurn methods ***/ HRESULT (STDMETHODCALLTYPE *GetRecorderDriveLetter)( - ICDBurn* This, + ICDBurn *This, LPWSTR pszDrive, UINT cch); HRESULT (STDMETHODCALLTYPE *Burn)( - ICDBurn* This, + ICDBurn *This, HWND hwnd); HRESULT (STDMETHODCALLTYPE *HasRecordableDrive)( - ICDBurn* This, + ICDBurn *This, WINBOOL *pfHasRecorder); END_INTERFACE } ICDBurnVtbl; + interface ICDBurn { CONST_VTBL ICDBurnVtbl* lpVtbl; }; @@ -20113,31 +17205,6 @@ static FORCEINLINE HRESULT ICDBurn_HasRecordableDrive(ICDBurn* This,WINBOOL *pfH #endif -HRESULT STDMETHODCALLTYPE ICDBurn_GetRecorderDriveLetter_Proxy( - ICDBurn* This, - LPWSTR pszDrive, - UINT cch); -void __RPC_STUB ICDBurn_GetRecorderDriveLetter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICDBurn_Burn_Proxy( - ICDBurn* This, - HWND hwnd); -void __RPC_STUB ICDBurn_Burn_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICDBurn_HasRecordableDrive_Proxy( - ICDBurn* This, - WINBOOL *pfHasRecorder); -void __RPC_STUB ICDBurn_HasRecordableDrive_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICDBurn_INTERFACE_DEFINED__ */ @@ -20175,31 +17242,32 @@ typedef struct IWizardSiteVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWizardSite* This, + IWizardSite *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWizardSite* This); + IWizardSite *This); ULONG (STDMETHODCALLTYPE *Release)( - IWizardSite* This); + IWizardSite *This); /*** IWizardSite methods ***/ HRESULT (STDMETHODCALLTYPE *GetPreviousPage)( - IWizardSite* This, + IWizardSite *This, HPROPSHEETPAGE *phpage); HRESULT (STDMETHODCALLTYPE *GetNextPage)( - IWizardSite* This, + IWizardSite *This, HPROPSHEETPAGE *phpage); HRESULT (STDMETHODCALLTYPE *GetCancelledPage)( - IWizardSite* This, + IWizardSite *This, HPROPSHEETPAGE *phpage); END_INTERFACE } IWizardSiteVtbl; + interface IWizardSite { CONST_VTBL IWizardSiteVtbl* lpVtbl; }; @@ -20240,30 +17308,6 @@ static FORCEINLINE HRESULT IWizardSite_GetCancelledPage(IWizardSite* This,HPROPS #endif -HRESULT STDMETHODCALLTYPE IWizardSite_GetPreviousPage_Proxy( - IWizardSite* This, - HPROPSHEETPAGE *phpage); -void __RPC_STUB IWizardSite_GetPreviousPage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWizardSite_GetNextPage_Proxy( - IWizardSite* This, - HPROPSHEETPAGE *phpage); -void __RPC_STUB IWizardSite_GetNextPage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWizardSite_GetCancelledPage_Proxy( - IWizardSite* This, - HPROPSHEETPAGE *phpage); -void __RPC_STUB IWizardSite_GetCancelledPage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWizardSite_INTERFACE_DEFINED__ */ @@ -20302,33 +17346,34 @@ typedef struct IWizardExtensionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWizardExtension* This, + IWizardExtension *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWizardExtension* This); + IWizardExtension *This); ULONG (STDMETHODCALLTYPE *Release)( - IWizardExtension* This); + IWizardExtension *This); /*** IWizardExtension methods ***/ HRESULT (STDMETHODCALLTYPE *AddPages)( - IWizardExtension* This, + IWizardExtension *This, HPROPSHEETPAGE *aPages, UINT cPages, UINT *pnPagesAdded); HRESULT (STDMETHODCALLTYPE *GetFirstPage)( - IWizardExtension* This, + IWizardExtension *This, HPROPSHEETPAGE *phpage); HRESULT (STDMETHODCALLTYPE *GetLastPage)( - IWizardExtension* This, + IWizardExtension *This, HPROPSHEETPAGE *phpage); END_INTERFACE } IWizardExtensionVtbl; + interface IWizardExtension { CONST_VTBL IWizardExtensionVtbl* lpVtbl; }; @@ -20369,32 +17414,6 @@ static FORCEINLINE HRESULT IWizardExtension_GetLastPage(IWizardExtension* This,H #endif -HRESULT STDMETHODCALLTYPE IWizardExtension_AddPages_Proxy( - IWizardExtension* This, - HPROPSHEETPAGE *aPages, - UINT cPages, - UINT *pnPagesAdded); -void __RPC_STUB IWizardExtension_AddPages_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWizardExtension_GetFirstPage_Proxy( - IWizardExtension* This, - HPROPSHEETPAGE *phpage); -void __RPC_STUB IWizardExtension_GetFirstPage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWizardExtension_GetLastPage_Proxy( - IWizardExtension* This, - HPROPSHEETPAGE *phpage); -void __RPC_STUB IWizardExtension_GetLastPage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWizardExtension_INTERFACE_DEFINED__ */ @@ -20426,42 +17445,43 @@ typedef struct IWebWizardExtensionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWebWizardExtension* This, + IWebWizardExtension *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWebWizardExtension* This); + IWebWizardExtension *This); ULONG (STDMETHODCALLTYPE *Release)( - IWebWizardExtension* This); + IWebWizardExtension *This); /*** IWizardExtension methods ***/ HRESULT (STDMETHODCALLTYPE *AddPages)( - IWebWizardExtension* This, + IWebWizardExtension *This, HPROPSHEETPAGE *aPages, UINT cPages, UINT *pnPagesAdded); HRESULT (STDMETHODCALLTYPE *GetFirstPage)( - IWebWizardExtension* This, + IWebWizardExtension *This, HPROPSHEETPAGE *phpage); HRESULT (STDMETHODCALLTYPE *GetLastPage)( - IWebWizardExtension* This, + IWebWizardExtension *This, HPROPSHEETPAGE *phpage); /*** IWebWizardExtension methods ***/ HRESULT (STDMETHODCALLTYPE *SetInitialURL)( - IWebWizardExtension* This, + IWebWizardExtension *This, LPCWSTR pszURL); HRESULT (STDMETHODCALLTYPE *SetErrorURL)( - IWebWizardExtension* This, + IWebWizardExtension *This, LPCWSTR pszErrorURL); END_INTERFACE } IWebWizardExtensionVtbl; + interface IWebWizardExtension { CONST_VTBL IWebWizardExtensionVtbl* lpVtbl; }; @@ -20512,22 +17532,6 @@ static FORCEINLINE HRESULT IWebWizardExtension_SetErrorURL(IWebWizardExtension* #endif -HRESULT STDMETHODCALLTYPE IWebWizardExtension_SetInitialURL_Proxy( - IWebWizardExtension* This, - LPCWSTR pszURL); -void __RPC_STUB IWebWizardExtension_SetInitialURL_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWebWizardExtension_SetErrorURL_Proxy( - IWebWizardExtension* This, - LPCWSTR pszErrorURL); -void __RPC_STUB IWebWizardExtension_SetErrorURL_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWebWizardExtension_INTERFACE_DEFINED__ */ @@ -20546,6 +17550,9 @@ void __RPC_STUB IWebWizardExtension_SetErrorURL_Stub( #ifndef __IXMLDOMDocument_FWD_DEFINED__ #define __IXMLDOMDocument_FWD_DEFINED__ typedef interface IXMLDOMDocument IXMLDOMDocument; +#ifdef __cplusplus +interface IXMLDOMDocument; +#endif /* __cplusplus */ #endif @@ -20579,45 +17586,46 @@ typedef struct IPublishingWizardVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPublishingWizard* This, + IPublishingWizard *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPublishingWizard* This); + IPublishingWizard *This); ULONG (STDMETHODCALLTYPE *Release)( - IPublishingWizard* This); + IPublishingWizard *This); /*** IWizardExtension methods ***/ HRESULT (STDMETHODCALLTYPE *AddPages)( - IPublishingWizard* This, + IPublishingWizard *This, HPROPSHEETPAGE *aPages, UINT cPages, UINT *pnPagesAdded); HRESULT (STDMETHODCALLTYPE *GetFirstPage)( - IPublishingWizard* This, + IPublishingWizard *This, HPROPSHEETPAGE *phpage); HRESULT (STDMETHODCALLTYPE *GetLastPage)( - IPublishingWizard* This, + IPublishingWizard *This, HPROPSHEETPAGE *phpage); /*** IPublishingWizard methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IPublishingWizard* This, + IPublishingWizard *This, IDataObject *pdo, DWORD dwOptions, LPCWSTR pszServiceScope); HRESULT (STDMETHODCALLTYPE *GetTransferManifest)( - IPublishingWizard* This, + IPublishingWizard *This, HRESULT *phrFromTransfer, IXMLDOMDocument **pdocManifest); END_INTERFACE } IPublishingWizardVtbl; + interface IPublishingWizard { CONST_VTBL IPublishingWizardVtbl* lpVtbl; }; @@ -20668,25 +17676,6 @@ static FORCEINLINE HRESULT IPublishingWizard_GetTransferManifest(IPublishingWiza #endif -HRESULT STDMETHODCALLTYPE IPublishingWizard_Initialize_Proxy( - IPublishingWizard* This, - IDataObject *pdo, - DWORD dwOptions, - LPCWSTR pszServiceScope); -void __RPC_STUB IPublishingWizard_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPublishingWizard_GetTransferManifest_Proxy( - IPublishingWizard* This, - HRESULT *phrFromTransfer, - IXMLDOMDocument **pdocManifest); -void __RPC_STUB IPublishingWizard_GetTransferManifest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPublishingWizard_INTERFACE_DEFINED__ */ @@ -20717,25 +17706,26 @@ typedef struct IFolderViewHostVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFolderViewHost* This, + IFolderViewHost *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFolderViewHost* This); + IFolderViewHost *This); ULONG (STDMETHODCALLTYPE *Release)( - IFolderViewHost* This); + IFolderViewHost *This); /*** IFolderViewHost methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IFolderViewHost* This, + IFolderViewHost *This, HWND hwndParent, IDataObject *pdo, RECT *prc); END_INTERFACE } IFolderViewHostVtbl; + interface IFolderViewHost { CONST_VTBL IFolderViewHostVtbl* lpVtbl; }; @@ -20768,16 +17758,6 @@ static FORCEINLINE HRESULT IFolderViewHost_Initialize(IFolderViewHost* This,HWND #endif -HRESULT STDMETHODCALLTYPE IFolderViewHost_Initialize_Proxy( - IFolderViewHost* This, - HWND hwndParent, - IDataObject *pdo, - RECT *prc); -void __RPC_STUB IFolderViewHost_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFolderViewHost_INTERFACE_DEFINED__ */ @@ -20816,35 +17796,36 @@ typedef struct IExplorerBrowserEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IExplorerBrowserEvents* This, + IExplorerBrowserEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IExplorerBrowserEvents* This); + IExplorerBrowserEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - IExplorerBrowserEvents* This); + IExplorerBrowserEvents *This); /*** IExplorerBrowserEvents methods ***/ HRESULT (STDMETHODCALLTYPE *OnNavigationPending)( - IExplorerBrowserEvents* This, + IExplorerBrowserEvents *This, PCIDLIST_ABSOLUTE pidlFolder); HRESULT (STDMETHODCALLTYPE *OnViewCreated)( - IExplorerBrowserEvents* This, + IExplorerBrowserEvents *This, IShellView *psv); HRESULT (STDMETHODCALLTYPE *OnNavigationComplete)( - IExplorerBrowserEvents* This, + IExplorerBrowserEvents *This, PCIDLIST_ABSOLUTE pidlFolder); HRESULT (STDMETHODCALLTYPE *OnNavigationFailed)( - IExplorerBrowserEvents* This, + IExplorerBrowserEvents *This, PCIDLIST_ABSOLUTE pidlFolder); END_INTERFACE } IExplorerBrowserEventsVtbl; + interface IExplorerBrowserEvents { CONST_VTBL IExplorerBrowserEventsVtbl* lpVtbl; }; @@ -20889,38 +17870,6 @@ static FORCEINLINE HRESULT IExplorerBrowserEvents_OnNavigationFailed(IExplorerBr #endif -HRESULT STDMETHODCALLTYPE IExplorerBrowserEvents_OnNavigationPending_Proxy( - IExplorerBrowserEvents* This, - PCIDLIST_ABSOLUTE pidlFolder); -void __RPC_STUB IExplorerBrowserEvents_OnNavigationPending_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExplorerBrowserEvents_OnViewCreated_Proxy( - IExplorerBrowserEvents* This, - IShellView *psv); -void __RPC_STUB IExplorerBrowserEvents_OnViewCreated_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExplorerBrowserEvents_OnNavigationComplete_Proxy( - IExplorerBrowserEvents* This, - PCIDLIST_ABSOLUTE pidlFolder); -void __RPC_STUB IExplorerBrowserEvents_OnNavigationComplete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExplorerBrowserEvents_OnNavigationFailed_Proxy( - IExplorerBrowserEvents* This, - PCIDLIST_ABSOLUTE pidlFolder); -void __RPC_STUB IExplorerBrowserEvents_OnNavigationFailed_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IExplorerBrowserEvents_INTERFACE_DEFINED__ */ @@ -21021,85 +17970,86 @@ typedef struct IExplorerBrowserVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IExplorerBrowser* This, + IExplorerBrowser *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IExplorerBrowser* This); + IExplorerBrowser *This); ULONG (STDMETHODCALLTYPE *Release)( - IExplorerBrowser* This); + IExplorerBrowser *This); /*** IExplorerBrowser methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IExplorerBrowser* This, + IExplorerBrowser *This, HWND hwndParent, const RECT *prc, const FOLDERSETTINGS *pfs); HRESULT (STDMETHODCALLTYPE *Destroy)( - IExplorerBrowser* This); + IExplorerBrowser *This); HRESULT (STDMETHODCALLTYPE *SetRect)( - IExplorerBrowser* This, + IExplorerBrowser *This, HDWP *phdwp, RECT rcBrowser); HRESULT (STDMETHODCALLTYPE *SetPropertyBag)( - IExplorerBrowser* This, + IExplorerBrowser *This, LPCWSTR pszPropertyBag); HRESULT (STDMETHODCALLTYPE *SetEmptyText)( - IExplorerBrowser* This, + IExplorerBrowser *This, LPCWSTR pszEmptyText); HRESULT (STDMETHODCALLTYPE *SetFolderSettings)( - IExplorerBrowser* This, + IExplorerBrowser *This, const FOLDERSETTINGS *pfs); HRESULT (STDMETHODCALLTYPE *Advise)( - IExplorerBrowser* This, + IExplorerBrowser *This, IExplorerBrowserEvents *psbe, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *Unadvise)( - IExplorerBrowser* This, + IExplorerBrowser *This, DWORD dwCookie); HRESULT (STDMETHODCALLTYPE *SetOptions)( - IExplorerBrowser* This, + IExplorerBrowser *This, EXPLORER_BROWSER_OPTIONS dwFlag); HRESULT (STDMETHODCALLTYPE *GetOptions)( - IExplorerBrowser* This, + IExplorerBrowser *This, EXPLORER_BROWSER_OPTIONS *pdwFlag); HRESULT (STDMETHODCALLTYPE *BrowseToIDList)( - IExplorerBrowser* This, + IExplorerBrowser *This, PCUIDLIST_RELATIVE pidl, UINT uFlags); HRESULT (STDMETHODCALLTYPE *BrowseToObject)( - IExplorerBrowser* This, + IExplorerBrowser *This, IUnknown *punk, UINT uFlags); HRESULT (STDMETHODCALLTYPE *FillFromObject)( - IExplorerBrowser* This, + IExplorerBrowser *This, IUnknown *punk, EXPLORER_BROWSER_FILL_FLAGS dwFlags); HRESULT (STDMETHODCALLTYPE *RemoveAll)( - IExplorerBrowser* This); + IExplorerBrowser *This); HRESULT (STDMETHODCALLTYPE *GetCurrentView)( - IExplorerBrowser* This, + IExplorerBrowser *This, REFIID riid, void **ppv); END_INTERFACE } IExplorerBrowserVtbl; + interface IExplorerBrowser { CONST_VTBL IExplorerBrowserVtbl* lpVtbl; }; @@ -21188,113 +18138,6 @@ static FORCEINLINE HRESULT IExplorerBrowser_GetCurrentView(IExplorerBrowser* Thi #endif -HRESULT STDMETHODCALLTYPE IExplorerBrowser_Destroy_Proxy( - IExplorerBrowser* This); -void __RPC_STUB IExplorerBrowser_Destroy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExplorerBrowser_SetPropertyBag_Proxy( - IExplorerBrowser* This, - LPCWSTR pszPropertyBag); -void __RPC_STUB IExplorerBrowser_SetPropertyBag_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExplorerBrowser_SetEmptyText_Proxy( - IExplorerBrowser* This, - LPCWSTR pszEmptyText); -void __RPC_STUB IExplorerBrowser_SetEmptyText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExplorerBrowser_SetFolderSettings_Proxy( - IExplorerBrowser* This, - const FOLDERSETTINGS *pfs); -void __RPC_STUB IExplorerBrowser_SetFolderSettings_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExplorerBrowser_Advise_Proxy( - IExplorerBrowser* This, - IExplorerBrowserEvents *psbe, - DWORD *pdwCookie); -void __RPC_STUB IExplorerBrowser_Advise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExplorerBrowser_Unadvise_Proxy( - IExplorerBrowser* This, - DWORD dwCookie); -void __RPC_STUB IExplorerBrowser_Unadvise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExplorerBrowser_SetOptions_Proxy( - IExplorerBrowser* This, - EXPLORER_BROWSER_OPTIONS dwFlag); -void __RPC_STUB IExplorerBrowser_SetOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExplorerBrowser_GetOptions_Proxy( - IExplorerBrowser* This, - EXPLORER_BROWSER_OPTIONS *pdwFlag); -void __RPC_STUB IExplorerBrowser_GetOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExplorerBrowser_BrowseToIDList_Proxy( - IExplorerBrowser* This, - PCUIDLIST_RELATIVE pidl, - UINT uFlags); -void __RPC_STUB IExplorerBrowser_BrowseToIDList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExplorerBrowser_BrowseToObject_Proxy( - IExplorerBrowser* This, - IUnknown *punk, - UINT uFlags); -void __RPC_STUB IExplorerBrowser_BrowseToObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExplorerBrowser_FillFromObject_Proxy( - IExplorerBrowser* This, - IUnknown *punk, - EXPLORER_BROWSER_FILL_FLAGS dwFlags); -void __RPC_STUB IExplorerBrowser_FillFromObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExplorerBrowser_RemoveAll_Proxy( - IExplorerBrowser* This); -void __RPC_STUB IExplorerBrowser_RemoveAll_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExplorerBrowser_GetCurrentView_Proxy( - IExplorerBrowser* This, - REFIID riid, - void **ppv); -void __RPC_STUB IExplorerBrowser_GetCurrentView_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IExplorerBrowser_INTERFACE_DEFINED__ */ @@ -21323,23 +18166,24 @@ typedef struct IAccessibleObjectVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAccessibleObject* This, + IAccessibleObject *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAccessibleObject* This); + IAccessibleObject *This); ULONG (STDMETHODCALLTYPE *Release)( - IAccessibleObject* This); + IAccessibleObject *This); /*** IAccessibleObject methods ***/ HRESULT (STDMETHODCALLTYPE *SetAccessibleName)( - IAccessibleObject* This, + IAccessibleObject *This, LPCWSTR pszName); END_INTERFACE } IAccessibleObjectVtbl; + interface IAccessibleObject { CONST_VTBL IAccessibleObjectVtbl* lpVtbl; }; @@ -21372,14 +18216,6 @@ static FORCEINLINE HRESULT IAccessibleObject_SetAccessibleName(IAccessibleObject #endif -HRESULT STDMETHODCALLTYPE IAccessibleObject_SetAccessibleName_Proxy( - IAccessibleObject* This, - LPCWSTR pszName); -void __RPC_STUB IAccessibleObject_SetAccessibleName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAccessibleObject_INTERFACE_DEFINED__ */ @@ -21422,39 +18258,40 @@ typedef struct IResultsFolderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IResultsFolder* This, + IResultsFolder *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IResultsFolder* This); + IResultsFolder *This); ULONG (STDMETHODCALLTYPE *Release)( - IResultsFolder* This); + IResultsFolder *This); /*** IResultsFolder methods ***/ HRESULT (STDMETHODCALLTYPE *AddItem)( - IResultsFolder* This, + IResultsFolder *This, IShellItem *psi); HRESULT (STDMETHODCALLTYPE *AddIDList)( - IResultsFolder* This, + IResultsFolder *This, PCIDLIST_ABSOLUTE pidl, PITEMID_CHILD *ppidlAdded); HRESULT (STDMETHODCALLTYPE *RemoveItem)( - IResultsFolder* This, + IResultsFolder *This, IShellItem *psi); HRESULT (STDMETHODCALLTYPE *RemoveIDList)( - IResultsFolder* This, + IResultsFolder *This, PCIDLIST_ABSOLUTE pidl); HRESULT (STDMETHODCALLTYPE *RemoveAll)( - IResultsFolder* This); + IResultsFolder *This); END_INTERFACE } IResultsFolderVtbl; + interface IResultsFolder { CONST_VTBL IResultsFolderVtbl* lpVtbl; }; @@ -21503,14 +18340,6 @@ static FORCEINLINE HRESULT IResultsFolder_RemoveAll(IResultsFolder* This) { #endif -HRESULT STDMETHODCALLTYPE IResultsFolder_AddItem_Proxy( - IResultsFolder* This, - IShellItem *psi); -void __RPC_STUB IResultsFolder_AddItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE IResultsFolder_RemoteAddIDList_Proxy( IResultsFolder* This, PCIDLIST_ABSOLUTE pidl, @@ -21520,29 +18349,6 @@ void __RPC_STUB IResultsFolder_RemoteAddIDList_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IResultsFolder_RemoveItem_Proxy( - IResultsFolder* This, - IShellItem *psi); -void __RPC_STUB IResultsFolder_RemoveItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IResultsFolder_RemoveIDList_Proxy( - IResultsFolder* This, - PCIDLIST_ABSOLUTE pidl); -void __RPC_STUB IResultsFolder_RemoveIDList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IResultsFolder_RemoveAll_Proxy( - IResultsFolder* This); -void __RPC_STUB IResultsFolder_RemoveAll_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IResultsFolder_AddIDList_Proxy( IResultsFolder* This, PCIDLIST_ABSOLUTE pidl, @@ -21591,37 +18397,38 @@ typedef struct IEnumObjectsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumObjects* This, + IEnumObjects *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumObjects* This); + IEnumObjects *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumObjects* This); + IEnumObjects *This); /*** IEnumObjects methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumObjects* This, + IEnumObjects *This, ULONG celt, REFIID riid, void **rgelt, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumObjects* This, + IEnumObjects *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumObjects* This); + IEnumObjects *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumObjects* This, + IEnumObjects *This, IEnumObjects **ppenum); END_INTERFACE } IEnumObjectsVtbl; + interface IEnumObjects { CONST_VTBL IEnumObjectsVtbl* lpVtbl; }; @@ -21677,29 +18484,6 @@ void __RPC_STUB IEnumObjects_RemoteNext_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumObjects_Skip_Proxy( - IEnumObjects* This, - ULONG celt); -void __RPC_STUB IEnumObjects_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumObjects_Reset_Proxy( - IEnumObjects* This); -void __RPC_STUB IEnumObjects_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumObjects_Clone_Proxy( - IEnumObjects* This, - IEnumObjects **ppenum); -void __RPC_STUB IEnumObjects_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IEnumObjects_Next_Proxy( IEnumObjects* This, ULONG celt, @@ -21726,7 +18510,6 @@ enum _OPPROGDLGF { OPPROGDLG_DONTDISPLAYLOCATIONS = 0x1000 }; - typedef DWORD OPPROGDLGF; /***************************************************************************** @@ -21744,7 +18527,6 @@ enum _PDMODE { PDM_INDETERMINATE = 0x10 }; - typedef DWORD PDMODE; typedef enum PDOPSTATUS { @@ -21812,35 +18594,35 @@ typedef struct IOperationsProgressDialogVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOperationsProgressDialog* This, + IOperationsProgressDialog *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOperationsProgressDialog* This); + IOperationsProgressDialog *This); ULONG (STDMETHODCALLTYPE *Release)( - IOperationsProgressDialog* This); + IOperationsProgressDialog *This); /*** IOperationsProgressDialog methods ***/ HRESULT (STDMETHODCALLTYPE *StartProgressDialog)( - IOperationsProgressDialog* This, + IOperationsProgressDialog *This, HWND hwndOwner, OPPROGDLGF flags); HRESULT (STDMETHODCALLTYPE *StopProgressDialog)( - IOperationsProgressDialog* This); + IOperationsProgressDialog *This); HRESULT (STDMETHODCALLTYPE *SetOperation)( - IOperationsProgressDialog* This, + IOperationsProgressDialog *This, SPACTION action); HRESULT (STDMETHODCALLTYPE *SetMode)( - IOperationsProgressDialog* This, + IOperationsProgressDialog *This, PDMODE mode); HRESULT (STDMETHODCALLTYPE *UpdateProgress)( - IOperationsProgressDialog* This, + IOperationsProgressDialog *This, ULONGLONG ullPointsCurrent, ULONGLONG ullPointsTotal, ULONGLONG ullSizeCurrent, @@ -21849,31 +18631,32 @@ typedef struct IOperationsProgressDialogVtbl { ULONGLONG ullItemsTotal); HRESULT (STDMETHODCALLTYPE *UpdateLocations)( - IOperationsProgressDialog* This, + IOperationsProgressDialog *This, IShellItem *psiSource, IShellItem *psiTarget, IShellItem *psiItem); HRESULT (STDMETHODCALLTYPE *ResetTimer)( - IOperationsProgressDialog* This); + IOperationsProgressDialog *This); HRESULT (STDMETHODCALLTYPE *PauseTimer)( - IOperationsProgressDialog* This); + IOperationsProgressDialog *This); HRESULT (STDMETHODCALLTYPE *ResumeTimer)( - IOperationsProgressDialog* This); + IOperationsProgressDialog *This); HRESULT (STDMETHODCALLTYPE *GetMilliseconds)( - IOperationsProgressDialog* This, + IOperationsProgressDialog *This, ULONGLONG *pullElapsed, ULONGLONG *pullRemaining); HRESULT (STDMETHODCALLTYPE *GetOperationStatus)( - IOperationsProgressDialog* This, + IOperationsProgressDialog *This, PDOPSTATUS *popstatus); END_INTERFACE } IOperationsProgressDialogVtbl; + interface IOperationsProgressDialog { CONST_VTBL IOperationsProgressDialogVtbl* lpVtbl; }; @@ -21946,99 +18729,6 @@ static FORCEINLINE HRESULT IOperationsProgressDialog_GetOperationStatus(IOperati #endif -HRESULT STDMETHODCALLTYPE IOperationsProgressDialog_StartProgressDialog_Proxy( - IOperationsProgressDialog* This, - HWND hwndOwner, - OPPROGDLGF flags); -void __RPC_STUB IOperationsProgressDialog_StartProgressDialog_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOperationsProgressDialog_StopProgressDialog_Proxy( - IOperationsProgressDialog* This); -void __RPC_STUB IOperationsProgressDialog_StopProgressDialog_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOperationsProgressDialog_SetOperation_Proxy( - IOperationsProgressDialog* This, - SPACTION action); -void __RPC_STUB IOperationsProgressDialog_SetOperation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOperationsProgressDialog_SetMode_Proxy( - IOperationsProgressDialog* This, - PDMODE mode); -void __RPC_STUB IOperationsProgressDialog_SetMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOperationsProgressDialog_UpdateProgress_Proxy( - IOperationsProgressDialog* This, - ULONGLONG ullPointsCurrent, - ULONGLONG ullPointsTotal, - ULONGLONG ullSizeCurrent, - ULONGLONG ullSizeTotal, - ULONGLONG ullItemsCurrent, - ULONGLONG ullItemsTotal); -void __RPC_STUB IOperationsProgressDialog_UpdateProgress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOperationsProgressDialog_UpdateLocations_Proxy( - IOperationsProgressDialog* This, - IShellItem *psiSource, - IShellItem *psiTarget, - IShellItem *psiItem); -void __RPC_STUB IOperationsProgressDialog_UpdateLocations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOperationsProgressDialog_ResetTimer_Proxy( - IOperationsProgressDialog* This); -void __RPC_STUB IOperationsProgressDialog_ResetTimer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOperationsProgressDialog_PauseTimer_Proxy( - IOperationsProgressDialog* This); -void __RPC_STUB IOperationsProgressDialog_PauseTimer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOperationsProgressDialog_ResumeTimer_Proxy( - IOperationsProgressDialog* This); -void __RPC_STUB IOperationsProgressDialog_ResumeTimer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOperationsProgressDialog_GetMilliseconds_Proxy( - IOperationsProgressDialog* This, - ULONGLONG *pullElapsed, - ULONGLONG *pullRemaining); -void __RPC_STUB IOperationsProgressDialog_GetMilliseconds_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOperationsProgressDialog_GetOperationStatus_Proxy( - IOperationsProgressDialog* This, - PDOPSTATUS *popstatus); -void __RPC_STUB IOperationsProgressDialog_GetOperationStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOperationsProgressDialog_INTERFACE_DEFINED__ */ @@ -22072,29 +18762,30 @@ typedef struct IIOCancelInformationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IIOCancelInformation* This, + IIOCancelInformation *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IIOCancelInformation* This); + IIOCancelInformation *This); ULONG (STDMETHODCALLTYPE *Release)( - IIOCancelInformation* This); + IIOCancelInformation *This); /*** IIOCancelInformation methods ***/ HRESULT (STDMETHODCALLTYPE *SetCancelInformation)( - IIOCancelInformation* This, + IIOCancelInformation *This, DWORD dwThreadID, UINT uMsgCancel); HRESULT (STDMETHODCALLTYPE *GetCancelInformation)( - IIOCancelInformation* This, + IIOCancelInformation *This, DWORD *pdwThreadID, UINT *puMsgCancel); END_INTERFACE } IIOCancelInformationVtbl; + interface IIOCancelInformation { CONST_VTBL IIOCancelInformationVtbl* lpVtbl; }; @@ -22131,24 +18822,6 @@ static FORCEINLINE HRESULT IIOCancelInformation_GetCancelInformation(IIOCancelIn #endif -HRESULT STDMETHODCALLTYPE IIOCancelInformation_SetCancelInformation_Proxy( - IIOCancelInformation* This, - DWORD dwThreadID, - UINT uMsgCancel); -void __RPC_STUB IIOCancelInformation_SetCancelInformation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IIOCancelInformation_GetCancelInformation_Proxy( - IIOCancelInformation* This, - DWORD *pdwThreadID, - UINT *puMsgCancel); -void __RPC_STUB IIOCancelInformation_GetCancelInformation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IIOCancelInformation_INTERFACE_DEFINED__ */ @@ -22268,100 +18941,100 @@ typedef struct IFileOperationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFileOperation* This, + IFileOperation *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFileOperation* This); + IFileOperation *This); ULONG (STDMETHODCALLTYPE *Release)( - IFileOperation* This); + IFileOperation *This); /*** IFileOperation methods ***/ HRESULT (STDMETHODCALLTYPE *Advise)( - IFileOperation* This, + IFileOperation *This, IFileOperationProgressSink *pfops, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *Unadvise)( - IFileOperation* This, + IFileOperation *This, DWORD dwCookie); HRESULT (STDMETHODCALLTYPE *SetOperationFlags)( - IFileOperation* This, + IFileOperation *This, DWORD dwOperationFlags); HRESULT (STDMETHODCALLTYPE *SetProgressMessage)( - IFileOperation* This, + IFileOperation *This, LPCWSTR pszMessage); HRESULT (STDMETHODCALLTYPE *SetProgressDialog)( - IFileOperation* This, + IFileOperation *This, IOperationsProgressDialog *popd); HRESULT (STDMETHODCALLTYPE *SetProperties)( - IFileOperation* This, + IFileOperation *This, IPropertyChangeArray *pproparray); HRESULT (STDMETHODCALLTYPE *SetOwnerWindow)( - IFileOperation* This, + IFileOperation *This, HWND hwndOwner); HRESULT (STDMETHODCALLTYPE *ApplyPropertiesToItem)( - IFileOperation* This, + IFileOperation *This, IShellItem *psiItem); HRESULT (STDMETHODCALLTYPE *ApplyPropertiesToItems)( - IFileOperation* This, + IFileOperation *This, IUnknown *punkItems); HRESULT (STDMETHODCALLTYPE *RenameItem)( - IFileOperation* This, + IFileOperation *This, IShellItem *psiItem, LPCWSTR pszNewName, IFileOperationProgressSink *pfopsItem); HRESULT (STDMETHODCALLTYPE *RenameItems)( - IFileOperation* This, + IFileOperation *This, IUnknown *pUnkItems, LPCWSTR pszNewName); HRESULT (STDMETHODCALLTYPE *MoveItem)( - IFileOperation* This, + IFileOperation *This, IShellItem *psiItem, IShellItem *psiDestinationFolder, LPCWSTR pszNewName, IFileOperationProgressSink *pfopsItem); HRESULT (STDMETHODCALLTYPE *MoveItems)( - IFileOperation* This, + IFileOperation *This, IUnknown *punkItems, IShellItem *psiDestinationFolder); HRESULT (STDMETHODCALLTYPE *CopyItem)( - IFileOperation* This, + IFileOperation *This, IShellItem *psiItem, IShellItem *psiDestinationFolder, LPCWSTR pszCopyName, IFileOperationProgressSink *pfopsItem); HRESULT (STDMETHODCALLTYPE *CopyItems)( - IFileOperation* This, + IFileOperation *This, IUnknown *punkItems, IShellItem *psiDestinationFolder); HRESULT (STDMETHODCALLTYPE *DeleteItem)( - IFileOperation* This, + IFileOperation *This, IShellItem *psiItem, IFileOperationProgressSink *pfopsItem); HRESULT (STDMETHODCALLTYPE *DeleteItems)( - IFileOperation* This, + IFileOperation *This, IUnknown *punkItems); HRESULT (STDMETHODCALLTYPE *NewItem)( - IFileOperation* This, + IFileOperation *This, IShellItem *psiDestinationFolder, DWORD dwFileAttributes, LPCWSTR pszName, @@ -22369,14 +19042,15 @@ typedef struct IFileOperationVtbl { IFileOperationProgressSink *pfopsItem); HRESULT (STDMETHODCALLTYPE *PerformOperations)( - IFileOperation* This); + IFileOperation *This); HRESULT (STDMETHODCALLTYPE *GetAnyOperationsAborted)( - IFileOperation* This, + IFileOperation *This, WINBOOL *pfAnyOperationsAborted); END_INTERFACE } IFileOperationVtbl; + interface IFileOperation { CONST_VTBL IFileOperationVtbl* lpVtbl; }; @@ -22485,182 +19159,6 @@ static FORCEINLINE HRESULT IFileOperation_GetAnyOperationsAborted(IFileOperation #endif -HRESULT STDMETHODCALLTYPE IFileOperation_Advise_Proxy( - IFileOperation* This, - IFileOperationProgressSink *pfops, - DWORD *pdwCookie); -void __RPC_STUB IFileOperation_Advise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperation_Unadvise_Proxy( - IFileOperation* This, - DWORD dwCookie); -void __RPC_STUB IFileOperation_Unadvise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperation_SetOperationFlags_Proxy( - IFileOperation* This, - DWORD dwOperationFlags); -void __RPC_STUB IFileOperation_SetOperationFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperation_SetProgressMessage_Proxy( - IFileOperation* This, - LPCWSTR pszMessage); -void __RPC_STUB IFileOperation_SetProgressMessage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperation_SetProgressDialog_Proxy( - IFileOperation* This, - IOperationsProgressDialog *popd); -void __RPC_STUB IFileOperation_SetProgressDialog_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperation_SetProperties_Proxy( - IFileOperation* This, - IPropertyChangeArray *pproparray); -void __RPC_STUB IFileOperation_SetProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperation_SetOwnerWindow_Proxy( - IFileOperation* This, - HWND hwndOwner); -void __RPC_STUB IFileOperation_SetOwnerWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperation_ApplyPropertiesToItem_Proxy( - IFileOperation* This, - IShellItem *psiItem); -void __RPC_STUB IFileOperation_ApplyPropertiesToItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperation_ApplyPropertiesToItems_Proxy( - IFileOperation* This, - IUnknown *punkItems); -void __RPC_STUB IFileOperation_ApplyPropertiesToItems_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperation_RenameItem_Proxy( - IFileOperation* This, - IShellItem *psiItem, - LPCWSTR pszNewName, - IFileOperationProgressSink *pfopsItem); -void __RPC_STUB IFileOperation_RenameItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperation_RenameItems_Proxy( - IFileOperation* This, - IUnknown *pUnkItems, - LPCWSTR pszNewName); -void __RPC_STUB IFileOperation_RenameItems_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperation_MoveItem_Proxy( - IFileOperation* This, - IShellItem *psiItem, - IShellItem *psiDestinationFolder, - LPCWSTR pszNewName, - IFileOperationProgressSink *pfopsItem); -void __RPC_STUB IFileOperation_MoveItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperation_MoveItems_Proxy( - IFileOperation* This, - IUnknown *punkItems, - IShellItem *psiDestinationFolder); -void __RPC_STUB IFileOperation_MoveItems_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperation_CopyItem_Proxy( - IFileOperation* This, - IShellItem *psiItem, - IShellItem *psiDestinationFolder, - LPCWSTR pszCopyName, - IFileOperationProgressSink *pfopsItem); -void __RPC_STUB IFileOperation_CopyItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperation_CopyItems_Proxy( - IFileOperation* This, - IUnknown *punkItems, - IShellItem *psiDestinationFolder); -void __RPC_STUB IFileOperation_CopyItems_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperation_DeleteItem_Proxy( - IFileOperation* This, - IShellItem *psiItem, - IFileOperationProgressSink *pfopsItem); -void __RPC_STUB IFileOperation_DeleteItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperation_DeleteItems_Proxy( - IFileOperation* This, - IUnknown *punkItems); -void __RPC_STUB IFileOperation_DeleteItems_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperation_NewItem_Proxy( - IFileOperation* This, - IShellItem *psiDestinationFolder, - DWORD dwFileAttributes, - LPCWSTR pszName, - LPCWSTR pszTemplateName, - IFileOperationProgressSink *pfopsItem); -void __RPC_STUB IFileOperation_NewItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperation_PerformOperations_Proxy( - IFileOperation* This); -void __RPC_STUB IFileOperation_PerformOperations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOperation_GetAnyOperationsAborted_Proxy( - IFileOperation* This, - WINBOOL *pfAnyOperationsAborted); -void __RPC_STUB IFileOperation_GetAnyOperationsAborted_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFileOperation_INTERFACE_DEFINED__ */ @@ -22691,25 +19189,26 @@ typedef struct IObjectProviderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IObjectProvider* This, + IObjectProvider *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IObjectProvider* This); + IObjectProvider *This); ULONG (STDMETHODCALLTYPE *Release)( - IObjectProvider* This); + IObjectProvider *This); /*** IObjectProvider methods ***/ HRESULT (STDMETHODCALLTYPE *QueryObject)( - IObjectProvider* This, + IObjectProvider *This, REFGUID guidObject, REFIID riid, void **ppvOut); END_INTERFACE } IObjectProviderVtbl; + interface IObjectProvider { CONST_VTBL IObjectProviderVtbl* lpVtbl; }; @@ -22742,16 +19241,6 @@ static FORCEINLINE HRESULT IObjectProvider_QueryObject(IObjectProvider* This,REF #endif -HRESULT STDMETHODCALLTYPE IObjectProvider_QueryObject_Proxy( - IObjectProvider* This, - REFGUID guidObject, - REFIID riid, - void **ppvOut); -void __RPC_STUB IObjectProvider_QueryObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IObjectProvider_INTERFACE_DEFINED__ */ @@ -22794,39 +19283,40 @@ typedef struct INamespaceWalkCBVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INamespaceWalkCB* This, + INamespaceWalkCB *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INamespaceWalkCB* This); + INamespaceWalkCB *This); ULONG (STDMETHODCALLTYPE *Release)( - INamespaceWalkCB* This); + INamespaceWalkCB *This); /*** INamespaceWalkCB methods ***/ HRESULT (STDMETHODCALLTYPE *FoundItem)( - INamespaceWalkCB* This, + INamespaceWalkCB *This, IShellFolder *psf, PCUITEMID_CHILD pidl); HRESULT (STDMETHODCALLTYPE *EnterFolder)( - INamespaceWalkCB* This, + INamespaceWalkCB *This, IShellFolder *psf, PCUITEMID_CHILD pidl); HRESULT (STDMETHODCALLTYPE *LeaveFolder)( - INamespaceWalkCB* This, + INamespaceWalkCB *This, IShellFolder *psf, PCUITEMID_CHILD pidl); HRESULT (STDMETHODCALLTYPE *InitializeProgressDialog)( - INamespaceWalkCB* This, + INamespaceWalkCB *This, LPWSTR *ppszTitle, LPWSTR *ppszCancel); END_INTERFACE } INamespaceWalkCBVtbl; + interface INamespaceWalkCB { CONST_VTBL INamespaceWalkCBVtbl* lpVtbl; }; @@ -22871,42 +19361,6 @@ static FORCEINLINE HRESULT INamespaceWalkCB_InitializeProgressDialog(INamespaceW #endif -HRESULT STDMETHODCALLTYPE INamespaceWalkCB_FoundItem_Proxy( - INamespaceWalkCB* This, - IShellFolder *psf, - PCUITEMID_CHILD pidl); -void __RPC_STUB INamespaceWalkCB_FoundItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INamespaceWalkCB_EnterFolder_Proxy( - INamespaceWalkCB* This, - IShellFolder *psf, - PCUITEMID_CHILD pidl); -void __RPC_STUB INamespaceWalkCB_EnterFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INamespaceWalkCB_LeaveFolder_Proxy( - INamespaceWalkCB* This, - IShellFolder *psf, - PCUITEMID_CHILD pidl); -void __RPC_STUB INamespaceWalkCB_LeaveFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INamespaceWalkCB_InitializeProgressDialog_Proxy( - INamespaceWalkCB* This, - LPWSTR *ppszTitle, - LPWSTR *ppszCancel); -void __RPC_STUB INamespaceWalkCB_InitializeProgressDialog_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INamespaceWalkCB_INTERFACE_DEFINED__ */ @@ -22936,44 +19390,45 @@ typedef struct INamespaceWalkCB2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INamespaceWalkCB2* This, + INamespaceWalkCB2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INamespaceWalkCB2* This); + INamespaceWalkCB2 *This); ULONG (STDMETHODCALLTYPE *Release)( - INamespaceWalkCB2* This); + INamespaceWalkCB2 *This); /*** INamespaceWalkCB methods ***/ HRESULT (STDMETHODCALLTYPE *FoundItem)( - INamespaceWalkCB2* This, + INamespaceWalkCB2 *This, IShellFolder *psf, PCUITEMID_CHILD pidl); HRESULT (STDMETHODCALLTYPE *EnterFolder)( - INamespaceWalkCB2* This, + INamespaceWalkCB2 *This, IShellFolder *psf, PCUITEMID_CHILD pidl); HRESULT (STDMETHODCALLTYPE *LeaveFolder)( - INamespaceWalkCB2* This, + INamespaceWalkCB2 *This, IShellFolder *psf, PCUITEMID_CHILD pidl); HRESULT (STDMETHODCALLTYPE *InitializeProgressDialog)( - INamespaceWalkCB2* This, + INamespaceWalkCB2 *This, LPWSTR *ppszTitle, LPWSTR *ppszCancel); /*** INamespaceWalkCB2 methods ***/ HRESULT (STDMETHODCALLTYPE *WalkComplete)( - INamespaceWalkCB2* This, + INamespaceWalkCB2 *This, HRESULT hr); END_INTERFACE } INamespaceWalkCB2Vtbl; + interface INamespaceWalkCB2 { CONST_VTBL INamespaceWalkCB2Vtbl* lpVtbl; }; @@ -23024,14 +19479,6 @@ static FORCEINLINE HRESULT INamespaceWalkCB2_WalkComplete(INamespaceWalkCB2* Thi #endif -HRESULT STDMETHODCALLTYPE INamespaceWalkCB2_WalkComplete_Proxy( - INamespaceWalkCB2* This, - HRESULT hr); -void __RPC_STUB INamespaceWalkCB2_WalkComplete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INamespaceWalkCB2_INTERFACE_DEFINED__ */ @@ -23093,31 +19540,32 @@ typedef struct INamespaceWalkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INamespaceWalk* This, + INamespaceWalk *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INamespaceWalk* This); + INamespaceWalk *This); ULONG (STDMETHODCALLTYPE *Release)( - INamespaceWalk* This); + INamespaceWalk *This); /*** INamespaceWalk methods ***/ HRESULT (STDMETHODCALLTYPE *Walk)( - INamespaceWalk* This, + INamespaceWalk *This, IUnknown *punkToWalk, DWORD dwFlags, int cDepth, INamespaceWalkCB *pnswcb); HRESULT (STDMETHODCALLTYPE *GetIDArrayResult)( - INamespaceWalk* This, + INamespaceWalk *This, UINT *pcItems, PIDLIST_ABSOLUTE **prgpidl); END_INTERFACE } INamespaceWalkVtbl; + interface INamespaceWalk { CONST_VTBL INamespaceWalkVtbl* lpVtbl; }; @@ -23154,26 +19602,6 @@ static FORCEINLINE HRESULT INamespaceWalk_GetIDArrayResult(INamespaceWalk* This, #endif -HRESULT STDMETHODCALLTYPE INamespaceWalk_Walk_Proxy( - INamespaceWalk* This, - IUnknown *punkToWalk, - DWORD dwFlags, - int cDepth, - INamespaceWalkCB *pnswcb); -void __RPC_STUB INamespaceWalk_Walk_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INamespaceWalk_GetIDArrayResult_Proxy( - INamespaceWalk* This, - UINT *pcItems, - PIDLIST_ABSOLUTE **prgpidl); -void __RPC_STUB INamespaceWalk_GetIDArrayResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INamespaceWalk_INTERFACE_DEFINED__ */ @@ -23233,27 +19661,28 @@ typedef struct IAutoCompleteDropDownVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAutoCompleteDropDown* This, + IAutoCompleteDropDown *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAutoCompleteDropDown* This); + IAutoCompleteDropDown *This); ULONG (STDMETHODCALLTYPE *Release)( - IAutoCompleteDropDown* This); + IAutoCompleteDropDown *This); /*** IAutoCompleteDropDown methods ***/ HRESULT (STDMETHODCALLTYPE *GetDropDownStatus)( - IAutoCompleteDropDown* This, + IAutoCompleteDropDown *This, DWORD *pdwFlags, LPWSTR *ppwszString); HRESULT (STDMETHODCALLTYPE *ResetEnumerator)( - IAutoCompleteDropDown* This); + IAutoCompleteDropDown *This); END_INTERFACE } IAutoCompleteDropDownVtbl; + interface IAutoCompleteDropDown { CONST_VTBL IAutoCompleteDropDownVtbl* lpVtbl; }; @@ -23290,22 +19719,6 @@ static FORCEINLINE HRESULT IAutoCompleteDropDown_ResetEnumerator(IAutoCompleteDr #endif -HRESULT STDMETHODCALLTYPE IAutoCompleteDropDown_GetDropDownStatus_Proxy( - IAutoCompleteDropDown* This, - DWORD *pdwFlags, - LPWSTR *ppwszString); -void __RPC_STUB IAutoCompleteDropDown_GetDropDownStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAutoCompleteDropDown_ResetEnumerator_Proxy( - IAutoCompleteDropDown* This); -void __RPC_STUB IAutoCompleteDropDown_ResetEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAutoCompleteDropDown_INTERFACE_DEFINED__ */ @@ -23322,7 +19735,6 @@ enum tagBANDSITECID { BSID_BANDREMOVED = 1 }; - #define BSIM_STATE 0x00000001 #define BSIM_STYLE 0x00000002 @@ -23402,28 +19814,28 @@ typedef struct IBandSiteVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IBandSite* This, + IBandSite *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IBandSite* This); + IBandSite *This); ULONG (STDMETHODCALLTYPE *Release)( - IBandSite* This); + IBandSite *This); /*** IBandSite methods ***/ HRESULT (STDMETHODCALLTYPE *AddBand)( - IBandSite* This, + IBandSite *This, IUnknown *punk); HRESULT (STDMETHODCALLTYPE *EnumBands)( - IBandSite* This, + IBandSite *This, UINT uBand, DWORD *pdwBandID); HRESULT (STDMETHODCALLTYPE *QueryBand)( - IBandSite* This, + IBandSite *This, DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, @@ -23431,31 +19843,32 @@ typedef struct IBandSiteVtbl { int cchName); HRESULT (STDMETHODCALLTYPE *SetBandState)( - IBandSite* This, + IBandSite *This, DWORD dwBandID, DWORD dwMask, DWORD dwState); HRESULT (STDMETHODCALLTYPE *RemoveBand)( - IBandSite* This, + IBandSite *This, DWORD dwBandID); HRESULT (STDMETHODCALLTYPE *GetBandObject)( - IBandSite* This, + IBandSite *This, DWORD dwBandID, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *SetBandSiteInfo)( - IBandSite* This, + IBandSite *This, const BANDSITEINFO *pbsinfo); HRESULT (STDMETHODCALLTYPE *GetBandSiteInfo)( - IBandSite* This, + IBandSite *This, BANDSITEINFO *pbsinfo); END_INTERFACE } IBandSiteVtbl; + interface IBandSite { CONST_VTBL IBandSiteVtbl* lpVtbl; }; @@ -23516,23 +19929,6 @@ static FORCEINLINE HRESULT IBandSite_GetBandSiteInfo(IBandSite* This,BANDSITEINF #endif -HRESULT STDMETHODCALLTYPE IBandSite_AddBand_Proxy( - IBandSite* This, - IUnknown *punk); -void __RPC_STUB IBandSite_AddBand_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IBandSite_EnumBands_Proxy( - IBandSite* This, - UINT uBand, - DWORD *pdwBandID); -void __RPC_STUB IBandSite_EnumBands_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE IBandSite_RemoteQueryBand_Proxy( IBandSite* This, DWORD dwBandID, @@ -23545,50 +19941,6 @@ void __RPC_STUB IBandSite_RemoteQueryBand_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IBandSite_SetBandState_Proxy( - IBandSite* This, - DWORD dwBandID, - DWORD dwMask, - DWORD dwState); -void __RPC_STUB IBandSite_SetBandState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IBandSite_RemoveBand_Proxy( - IBandSite* This, - DWORD dwBandID); -void __RPC_STUB IBandSite_RemoveBand_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IBandSite_GetBandObject_Proxy( - IBandSite* This, - DWORD dwBandID, - REFIID riid, - void **ppv); -void __RPC_STUB IBandSite_GetBandObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IBandSite_SetBandSiteInfo_Proxy( - IBandSite* This, - const BANDSITEINFO *pbsinfo); -void __RPC_STUB IBandSite_SetBandSiteInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IBandSite_GetBandSiteInfo_Proxy( - IBandSite* This, - BANDSITEINFO *pbsinfo); -void __RPC_STUB IBandSite_GetBandSiteInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IBandSite_QueryBand_Proxy( IBandSite* This, DWORD dwBandID, @@ -23631,23 +19983,24 @@ typedef struct IModalWindowVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IModalWindow* This, + IModalWindow *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IModalWindow* This); + IModalWindow *This); ULONG (STDMETHODCALLTYPE *Release)( - IModalWindow* This); + IModalWindow *This); /*** IModalWindow methods ***/ HRESULT (STDMETHODCALLTYPE *Show)( - IModalWindow* This, + IModalWindow *This, HWND hwndOwner); END_INTERFACE } IModalWindowVtbl; + interface IModalWindow { CONST_VTBL IModalWindowVtbl* lpVtbl; }; @@ -23706,7 +20059,6 @@ enum tagCDBURNINGEXTENSIONRET { CDBE_RET_STOPWIZARD = 0x2 }; - #define SID_CDWizardHost IID_ICDBurnExt enum _CDBE_ACTIONS { @@ -23715,7 +20067,6 @@ enum _CDBE_ACTIONS { CDBE_TYPE_ALL = (int)0xffffffff }; - typedef DWORD CDBE_ACTIONS; /***************************************************************************** @@ -23742,23 +20093,24 @@ typedef struct ICDBurnExtVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICDBurnExt* This, + ICDBurnExt *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICDBurnExt* This); + ICDBurnExt *This); ULONG (STDMETHODCALLTYPE *Release)( - ICDBurnExt* This); + ICDBurnExt *This); /*** ICDBurnExt methods ***/ HRESULT (STDMETHODCALLTYPE *GetSupportedActionTypes)( - ICDBurnExt* This, + ICDBurnExt *This, CDBE_ACTIONS *pdwActions); END_INTERFACE } ICDBurnExtVtbl; + interface ICDBurnExt { CONST_VTBL ICDBurnExtVtbl* lpVtbl; }; @@ -23791,14 +20143,6 @@ static FORCEINLINE HRESULT ICDBurnExt_GetSupportedActionTypes(ICDBurnExt* This,C #endif -HRESULT STDMETHODCALLTYPE ICDBurnExt_GetSupportedActionTypes_Proxy( - ICDBurnExt* This, - CDBE_ACTIONS *pdwActions); -void __RPC_STUB ICDBurnExt_GetSupportedActionTypes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICDBurnExt_INTERFACE_DEFINED__ */ @@ -23829,25 +20173,26 @@ typedef struct IContextMenuSiteVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IContextMenuSite* This, + IContextMenuSite *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IContextMenuSite* This); + IContextMenuSite *This); ULONG (STDMETHODCALLTYPE *Release)( - IContextMenuSite* This); + IContextMenuSite *This); /*** IContextMenuSite methods ***/ HRESULT (STDMETHODCALLTYPE *DoContextMenuPopup)( - IContextMenuSite* This, + IContextMenuSite *This, IUnknown *punkContextMenu, UINT fFlags, POINT pt); END_INTERFACE } IContextMenuSiteVtbl; + interface IContextMenuSite { CONST_VTBL IContextMenuSiteVtbl* lpVtbl; }; @@ -23880,16 +20225,6 @@ static FORCEINLINE HRESULT IContextMenuSite_DoContextMenuPopup(IContextMenuSite* #endif -HRESULT STDMETHODCALLTYPE IContextMenuSite_DoContextMenuPopup_Proxy( - IContextMenuSite* This, - IUnknown *punkContextMenu, - UINT fFlags, - POINT pt); -void __RPC_STUB IContextMenuSite_DoContextMenuPopup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IContextMenuSite_INTERFACE_DEFINED__ */ @@ -23918,22 +20253,23 @@ typedef struct IEnumReadyCallbackVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumReadyCallback* This, + IEnumReadyCallback *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumReadyCallback* This); + IEnumReadyCallback *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumReadyCallback* This); + IEnumReadyCallback *This); /*** IEnumReadyCallback methods ***/ HRESULT (STDMETHODCALLTYPE *EnumReady)( - IEnumReadyCallback* This); + IEnumReadyCallback *This); END_INTERFACE } IEnumReadyCallbackVtbl; + interface IEnumReadyCallback { CONST_VTBL IEnumReadyCallbackVtbl* lpVtbl; }; @@ -23966,13 +20302,6 @@ static FORCEINLINE HRESULT IEnumReadyCallback_EnumReady(IEnumReadyCallback* This #endif -HRESULT STDMETHODCALLTYPE IEnumReadyCallback_EnumReady_Proxy( - IEnumReadyCallback* This); -void __RPC_STUB IEnumReadyCallback_EnumReady_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumReadyCallback_INTERFACE_DEFINED__ */ @@ -24006,29 +20335,30 @@ typedef struct IEnumerableViewVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumerableView* This, + IEnumerableView *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumerableView* This); + IEnumerableView *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumerableView* This); + IEnumerableView *This); /*** IEnumerableView methods ***/ HRESULT (STDMETHODCALLTYPE *SetEnumReadyCallback)( - IEnumerableView* This, + IEnumerableView *This, IEnumReadyCallback *percb); HRESULT (STDMETHODCALLTYPE *CreateEnumIDListFromContents)( - IEnumerableView* This, + IEnumerableView *This, PCIDLIST_ABSOLUTE pidlFolder, DWORD dwEnumFlags, IEnumIDList **ppEnumIDList); END_INTERFACE } IEnumerableViewVtbl; + interface IEnumerableView { CONST_VTBL IEnumerableViewVtbl* lpVtbl; }; @@ -24065,24 +20395,6 @@ static FORCEINLINE HRESULT IEnumerableView_CreateEnumIDListFromContents(IEnumera #endif -HRESULT STDMETHODCALLTYPE IEnumerableView_SetEnumReadyCallback_Proxy( - IEnumerableView* This, - IEnumReadyCallback *percb); -void __RPC_STUB IEnumerableView_SetEnumReadyCallback_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumerableView_CreateEnumIDListFromContents_Proxy( - IEnumerableView* This, - PCIDLIST_ABSOLUTE pidlFolder, - DWORD dwEnumFlags, - IEnumIDList **ppEnumIDList); -void __RPC_STUB IEnumerableView_CreateEnumIDListFromContents_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumerableView_INTERFACE_DEFINED__ */ @@ -24113,23 +20425,24 @@ typedef struct IInsertItemVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInsertItem* This, + IInsertItem *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInsertItem* This); + IInsertItem *This); ULONG (STDMETHODCALLTYPE *Release)( - IInsertItem* This); + IInsertItem *This); /*** IInsertItem methods ***/ HRESULT (STDMETHODCALLTYPE *InsertItem)( - IInsertItem* This, + IInsertItem *This, PCUIDLIST_RELATIVE pidl); END_INTERFACE } IInsertItemVtbl; + interface IInsertItem { CONST_VTBL IInsertItemVtbl* lpVtbl; }; @@ -24162,14 +20475,6 @@ static FORCEINLINE HRESULT IInsertItem_InsertItem(IInsertItem* This,PCUIDLIST_RE #endif -HRESULT STDMETHODCALLTYPE IInsertItem_InsertItem_Proxy( - IInsertItem* This, - PCUIDLIST_RELATIVE pidl); -void __RPC_STUB IInsertItem_InsertItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInsertItem_INTERFACE_DEFINED__ */ @@ -24184,7 +20489,6 @@ enum tagMENUBANDHANDLERCID { MBHANDCID_PIDLSELECT = 0 }; - DEFINE_GUID(IID_IMenuBand, 0x568804cd, 0xcbd7, 0x11d0, 0x98,0x16, 0x00,0xc0,0x4f,0xd9,0x19,0x72); #if defined(__cplusplus) && !defined(CINTERFACE) MIDL_INTERFACE("568804cd-cbd7-11d0-9816-00c04fd91972") @@ -24207,28 +20511,29 @@ typedef struct IMenuBandVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMenuBand* This, + IMenuBand *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMenuBand* This); + IMenuBand *This); ULONG (STDMETHODCALLTYPE *Release)( - IMenuBand* This); + IMenuBand *This); /*** IMenuBand methods ***/ HRESULT (STDMETHODCALLTYPE *IsMenuMessage)( - IMenuBand* This, + IMenuBand *This, MSG *pmsg); HRESULT (STDMETHODCALLTYPE *TranslateMenuMessage)( - IMenuBand* This, + IMenuBand *This, MSG *pmsg, LRESULT *plRet); END_INTERFACE } IMenuBandVtbl; + interface IMenuBand { CONST_VTBL IMenuBandVtbl* lpVtbl; }; @@ -24265,23 +20570,6 @@ static FORCEINLINE HRESULT IMenuBand_TranslateMenuMessage(IMenuBand* This,MSG *p #endif -HRESULT STDMETHODCALLTYPE IMenuBand_IsMenuMessage_Proxy( - IMenuBand* This, - MSG *pmsg); -void __RPC_STUB IMenuBand_IsMenuMessage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMenuBand_TranslateMenuMessage_Proxy( - IMenuBand* This, - MSG *pmsg, - LRESULT *plRet); -void __RPC_STUB IMenuBand_TranslateMenuMessage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMenuBand_INTERFACE_DEFINED__ */ @@ -24319,35 +20607,36 @@ typedef struct IFolderBandPrivVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFolderBandPriv* This, + IFolderBandPriv *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFolderBandPriv* This); + IFolderBandPriv *This); ULONG (STDMETHODCALLTYPE *Release)( - IFolderBandPriv* This); + IFolderBandPriv *This); /*** IFolderBandPriv methods ***/ HRESULT (STDMETHODCALLTYPE *SetCascade)( - IFolderBandPriv* This, + IFolderBandPriv *This, WINBOOL fCascade); HRESULT (STDMETHODCALLTYPE *SetAccelerators)( - IFolderBandPriv* This, + IFolderBandPriv *This, WINBOOL fAccelerators); HRESULT (STDMETHODCALLTYPE *SetNoIcons)( - IFolderBandPriv* This, + IFolderBandPriv *This, WINBOOL fNoIcons); HRESULT (STDMETHODCALLTYPE *SetNoText)( - IFolderBandPriv* This, + IFolderBandPriv *This, WINBOOL fNoText); END_INTERFACE } IFolderBandPrivVtbl; + interface IFolderBandPriv { CONST_VTBL IFolderBandPrivVtbl* lpVtbl; }; @@ -24392,38 +20681,6 @@ static FORCEINLINE HRESULT IFolderBandPriv_SetNoText(IFolderBandPriv* This,WINBO #endif -HRESULT STDMETHODCALLTYPE IFolderBandPriv_SetCascade_Proxy( - IFolderBandPriv* This, - WINBOOL fCascade); -void __RPC_STUB IFolderBandPriv_SetCascade_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderBandPriv_SetAccelerators_Proxy( - IFolderBandPriv* This, - WINBOOL fAccelerators); -void __RPC_STUB IFolderBandPriv_SetAccelerators_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderBandPriv_SetNoIcons_Proxy( - IFolderBandPriv* This, - WINBOOL fNoIcons); -void __RPC_STUB IFolderBandPriv_SetNoIcons_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFolderBandPriv_SetNoText_Proxy( - IFolderBandPriv* This, - WINBOOL fNoText); -void __RPC_STUB IFolderBandPriv_SetNoText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFolderBandPriv_INTERFACE_DEFINED__ */ @@ -24455,27 +20712,28 @@ typedef struct IRegTreeItemVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IRegTreeItem* This, + IRegTreeItem *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IRegTreeItem* This); + IRegTreeItem *This); ULONG (STDMETHODCALLTYPE *Release)( - IRegTreeItem* This); + IRegTreeItem *This); /*** IRegTreeItem methods ***/ HRESULT (STDMETHODCALLTYPE *GetCheckState)( - IRegTreeItem* This, + IRegTreeItem *This, WINBOOL *pbCheck); HRESULT (STDMETHODCALLTYPE *SetCheckState)( - IRegTreeItem* This, + IRegTreeItem *This, WINBOOL bCheck); END_INTERFACE } IRegTreeItemVtbl; + interface IRegTreeItem { CONST_VTBL IRegTreeItemVtbl* lpVtbl; }; @@ -24512,22 +20770,6 @@ static FORCEINLINE HRESULT IRegTreeItem_SetCheckState(IRegTreeItem* This,WINBOOL #endif -HRESULT STDMETHODCALLTYPE IRegTreeItem_GetCheckState_Proxy( - IRegTreeItem* This, - WINBOOL *pbCheck); -void __RPC_STUB IRegTreeItem_GetCheckState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRegTreeItem_SetCheckState_Proxy( - IRegTreeItem* This, - WINBOOL bCheck); -void __RPC_STUB IRegTreeItem_SetCheckState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IRegTreeItem_INTERFACE_DEFINED__ */ @@ -24561,19 +20803,19 @@ typedef struct IImageRecompressVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IImageRecompress* This, + IImageRecompress *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IImageRecompress* This); + IImageRecompress *This); ULONG (STDMETHODCALLTYPE *Release)( - IImageRecompress* This); + IImageRecompress *This); /*** IImageRecompress methods ***/ HRESULT (STDMETHODCALLTYPE *RecompressImage)( - IImageRecompress* This, + IImageRecompress *This, IShellItem *psi, int cx, int cy, @@ -24583,6 +20825,7 @@ typedef struct IImageRecompressVtbl { END_INTERFACE } IImageRecompressVtbl; + interface IImageRecompress { CONST_VTBL IImageRecompressVtbl* lpVtbl; }; @@ -24615,19 +20858,6 @@ static FORCEINLINE HRESULT IImageRecompress_RecompressImage(IImageRecompress* Th #endif -HRESULT STDMETHODCALLTYPE IImageRecompress_RecompressImage_Proxy( - IImageRecompress* This, - IShellItem *psi, - int cx, - int cy, - int iQuality, - IStorage *pstg, - IStream **ppstrmOut); -void __RPC_STUB IImageRecompress_RecompressImage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IImageRecompress_INTERFACE_DEFINED__ */ @@ -24663,40 +20893,41 @@ typedef struct IDeskBarVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDeskBar* This, + IDeskBar *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDeskBar* This); + IDeskBar *This); ULONG (STDMETHODCALLTYPE *Release)( - IDeskBar* This); + IDeskBar *This); /*** IOleWindow methods ***/ HRESULT (STDMETHODCALLTYPE *GetWindow)( - IDeskBar* This, + IDeskBar *This, HWND *phwnd); HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)( - IDeskBar* This, + IDeskBar *This, WINBOOL fEnterMode); /*** IDeskBar methods ***/ HRESULT (STDMETHODCALLTYPE *SetClient)( - IDeskBar* This, + IDeskBar *This, IUnknown *punkClient); HRESULT (STDMETHODCALLTYPE *GetClient)( - IDeskBar* This, + IDeskBar *This, IUnknown **ppunkClient); HRESULT (STDMETHODCALLTYPE *OnPosRectChangeDB)( - IDeskBar* This, + IDeskBar *This, RECT *prc); END_INTERFACE } IDeskBarVtbl; + interface IDeskBar { CONST_VTBL IDeskBarVtbl* lpVtbl; }; @@ -24747,30 +20978,6 @@ static FORCEINLINE HRESULT IDeskBar_OnPosRectChangeDB(IDeskBar* This,RECT *prc) #endif -HRESULT STDMETHODCALLTYPE IDeskBar_SetClient_Proxy( - IDeskBar* This, - IUnknown *punkClient); -void __RPC_STUB IDeskBar_SetClient_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDeskBar_GetClient_Proxy( - IDeskBar* This, - IUnknown **ppunkClient); -void __RPC_STUB IDeskBar_GetClient_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDeskBar_OnPosRectChangeDB_Proxy( - IDeskBar* This, - RECT *prc); -void __RPC_STUB IDeskBar_OnPosRectChangeDB_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDeskBar_INTERFACE_DEFINED__ */ @@ -24790,7 +20997,6 @@ enum tagMENUPOPUPSELECT { MPOS_CHILDTRACKING = 5 }; - enum tagMENUPOPUPPOPUPFLAGS { MPPF_SETFOCUS = 0x1, MPPF_INITIALSELECT = 0x2, @@ -24808,7 +21014,6 @@ enum tagMENUPOPUPPOPUPFLAGS { MPPF_ALIGN_RIGHT = 0x4000000 }; - typedef int MP_POPUPFLAGS; DEFINE_GUID(IID_IMenuPopup, 0xd1e7afeb, 0x6a2e, 0x11d0, 0x8c,0x78, 0x00,0xc0,0x4f,0xd9,0x18,0xb4); @@ -24838,56 +21043,57 @@ typedef struct IMenuPopupVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMenuPopup* This, + IMenuPopup *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMenuPopup* This); + IMenuPopup *This); ULONG (STDMETHODCALLTYPE *Release)( - IMenuPopup* This); + IMenuPopup *This); /*** IOleWindow methods ***/ HRESULT (STDMETHODCALLTYPE *GetWindow)( - IMenuPopup* This, + IMenuPopup *This, HWND *phwnd); HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)( - IMenuPopup* This, + IMenuPopup *This, WINBOOL fEnterMode); /*** IDeskBar methods ***/ HRESULT (STDMETHODCALLTYPE *SetClient)( - IMenuPopup* This, + IMenuPopup *This, IUnknown *punkClient); HRESULT (STDMETHODCALLTYPE *GetClient)( - IMenuPopup* This, + IMenuPopup *This, IUnknown **ppunkClient); HRESULT (STDMETHODCALLTYPE *OnPosRectChangeDB)( - IMenuPopup* This, + IMenuPopup *This, RECT *prc); /*** IMenuPopup methods ***/ HRESULT (STDMETHODCALLTYPE *Popup)( - IMenuPopup* This, + IMenuPopup *This, POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags); HRESULT (STDMETHODCALLTYPE *OnSelect)( - IMenuPopup* This, + IMenuPopup *This, DWORD dwSelectType); HRESULT (STDMETHODCALLTYPE *SetSubMenu)( - IMenuPopup* This, + IMenuPopup *This, IMenuPopup *pmp, WINBOOL fSet); END_INTERFACE } IMenuPopupVtbl; + interface IMenuPopup { CONST_VTBL IMenuPopupVtbl* lpVtbl; }; @@ -24952,33 +21158,6 @@ static FORCEINLINE HRESULT IMenuPopup_SetSubMenu(IMenuPopup* This,IMenuPopup *pm #endif -HRESULT STDMETHODCALLTYPE IMenuPopup_Popup_Proxy( - IMenuPopup* This, - POINTL *ppt, - RECTL *prcExclude, - MP_POPUPFLAGS dwFlags); -void __RPC_STUB IMenuPopup_Popup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMenuPopup_OnSelect_Proxy( - IMenuPopup* This, - DWORD dwSelectType); -void __RPC_STUB IMenuPopup_OnSelect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMenuPopup_SetSubMenu_Proxy( - IMenuPopup* This, - IMenuPopup *pmp, - WINBOOL fSet); -void __RPC_STUB IMenuPopup_SetSubMenu_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMenuPopup_INTERFACE_DEFINED__ */ @@ -25030,38 +21209,39 @@ typedef struct IFileIsInUseVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFileIsInUse* This, + IFileIsInUse *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFileIsInUse* This); + IFileIsInUse *This); ULONG (STDMETHODCALLTYPE *Release)( - IFileIsInUse* This); + IFileIsInUse *This); /*** IFileIsInUse methods ***/ HRESULT (STDMETHODCALLTYPE *GetAppName)( - IFileIsInUse* This, + IFileIsInUse *This, LPWSTR *ppszName); HRESULT (STDMETHODCALLTYPE *GetUsage)( - IFileIsInUse* This, + IFileIsInUse *This, FILE_USAGE_TYPE *pfut); HRESULT (STDMETHODCALLTYPE *GetCapabilities)( - IFileIsInUse* This, + IFileIsInUse *This, DWORD *pdwCapFlags); HRESULT (STDMETHODCALLTYPE *GetSwitchToHWND)( - IFileIsInUse* This, + IFileIsInUse *This, HWND *phwnd); HRESULT (STDMETHODCALLTYPE *CloseFile)( - IFileIsInUse* This); + IFileIsInUse *This); END_INTERFACE } IFileIsInUseVtbl; + interface IFileIsInUse { CONST_VTBL IFileIsInUseVtbl* lpVtbl; }; @@ -25110,45 +21290,6 @@ static FORCEINLINE HRESULT IFileIsInUse_CloseFile(IFileIsInUse* This) { #endif -HRESULT STDMETHODCALLTYPE IFileIsInUse_GetAppName_Proxy( - IFileIsInUse* This, - LPWSTR *ppszName); -void __RPC_STUB IFileIsInUse_GetAppName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileIsInUse_GetUsage_Proxy( - IFileIsInUse* This, - FILE_USAGE_TYPE *pfut); -void __RPC_STUB IFileIsInUse_GetUsage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileIsInUse_GetCapabilities_Proxy( - IFileIsInUse* This, - DWORD *pdwCapFlags); -void __RPC_STUB IFileIsInUse_GetCapabilities_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileIsInUse_GetSwitchToHWND_Proxy( - IFileIsInUse* This, - HWND *phwnd); -void __RPC_STUB IFileIsInUse_GetSwitchToHWND_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileIsInUse_CloseFile_Proxy( - IFileIsInUse* This); -void __RPC_STUB IFileIsInUse_CloseFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFileIsInUse_INTERFACE_DEFINED__ */ @@ -25156,6 +21297,9 @@ void __RPC_STUB IFileIsInUse_CloseFile_Stub( #ifndef __IFileDialog_FWD_DEFINED__ #define __IFileDialog_FWD_DEFINED__ typedef interface IFileDialog IFileDialog; +#ifdef __cplusplus +interface IFileDialog; +#endif /* __cplusplus */ #endif @@ -25223,52 +21367,53 @@ typedef struct IFileDialogEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFileDialogEvents* This, + IFileDialogEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFileDialogEvents* This); + IFileDialogEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - IFileDialogEvents* This); + IFileDialogEvents *This); /*** IFileDialogEvents methods ***/ HRESULT (STDMETHODCALLTYPE *OnFileOk)( - IFileDialogEvents* This, + IFileDialogEvents *This, IFileDialog *pfd); HRESULT (STDMETHODCALLTYPE *OnFolderChanging)( - IFileDialogEvents* This, + IFileDialogEvents *This, IFileDialog *pfd, IShellItem *psiFolder); HRESULT (STDMETHODCALLTYPE *OnFolderChange)( - IFileDialogEvents* This, + IFileDialogEvents *This, IFileDialog *pfd); HRESULT (STDMETHODCALLTYPE *OnSelectionChange)( - IFileDialogEvents* This, + IFileDialogEvents *This, IFileDialog *pfd); HRESULT (STDMETHODCALLTYPE *OnShareViolation)( - IFileDialogEvents* This, + IFileDialogEvents *This, IFileDialog *pfd, IShellItem *psi, FDE_SHAREVIOLATION_RESPONSE *pResponse); HRESULT (STDMETHODCALLTYPE *OnTypeChange)( - IFileDialogEvents* This, + IFileDialogEvents *This, IFileDialog *pfd); HRESULT (STDMETHODCALLTYPE *OnOverwrite)( - IFileDialogEvents* This, + IFileDialogEvents *This, IFileDialog *pfd, IShellItem *psi, FDE_OVERWRITE_RESPONSE *pResponse); END_INTERFACE } IFileDialogEventsVtbl; + interface IFileDialogEvents { CONST_VTBL IFileDialogEventsVtbl* lpVtbl; }; @@ -25325,67 +21470,6 @@ static FORCEINLINE HRESULT IFileDialogEvents_OnOverwrite(IFileDialogEvents* This #endif -HRESULT STDMETHODCALLTYPE IFileDialogEvents_OnFileOk_Proxy( - IFileDialogEvents* This, - IFileDialog *pfd); -void __RPC_STUB IFileDialogEvents_OnFileOk_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogEvents_OnFolderChanging_Proxy( - IFileDialogEvents* This, - IFileDialog *pfd, - IShellItem *psiFolder); -void __RPC_STUB IFileDialogEvents_OnFolderChanging_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogEvents_OnFolderChange_Proxy( - IFileDialogEvents* This, - IFileDialog *pfd); -void __RPC_STUB IFileDialogEvents_OnFolderChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogEvents_OnSelectionChange_Proxy( - IFileDialogEvents* This, - IFileDialog *pfd); -void __RPC_STUB IFileDialogEvents_OnSelectionChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogEvents_OnShareViolation_Proxy( - IFileDialogEvents* This, - IFileDialog *pfd, - IShellItem *psi, - FDE_SHAREVIOLATION_RESPONSE *pResponse); -void __RPC_STUB IFileDialogEvents_OnShareViolation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogEvents_OnTypeChange_Proxy( - IFileDialogEvents* This, - IFileDialog *pfd); -void __RPC_STUB IFileDialogEvents_OnTypeChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogEvents_OnOverwrite_Proxy( - IFileDialogEvents* This, - IFileDialog *pfd, - IShellItem *psi, - FDE_OVERWRITE_RESPONSE *pResponse); -void __RPC_STUB IFileDialogEvents_OnOverwrite_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFileDialogEvents_INTERFACE_DEFINED__ */ @@ -25393,6 +21477,9 @@ void __RPC_STUB IFileDialogEvents_OnOverwrite_Stub( #ifndef __IShellItemFilter_FWD_DEFINED__ #define __IShellItemFilter_FWD_DEFINED__ typedef interface IShellItemFilter IShellItemFilter; +#ifdef __cplusplus +interface IShellItemFilter; +#endif /* __cplusplus */ #endif @@ -25423,10 +21510,10 @@ enum _FILEOPENDIALOGOPTIONS { FOS_DONTADDTORECENT = 0x2000000, FOS_FORCESHOWHIDDEN = 0x10000000, FOS_DEFAULTNOMINIMODE = 0x20000000, - FOS_FORCEPREVIEWPANEON = 0x40000000 + FOS_FORCEPREVIEWPANEON = 0x40000000, + FOS_SUPPORTSTREAMABLEITEMS = 0x80000000 }; - typedef DWORD FILEOPENDIALOGOPTIONS; DEFINE_GUID(IID_IFileDialog, 0x42f85136, 0xdb7e, 0x439c, 0x85,0xf1, 0xe4,0x07,0x5d,0x13,0x5f,0xc8); @@ -25516,118 +21603,119 @@ typedef struct IFileDialogVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFileDialog* This, + IFileDialog *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFileDialog* This); + IFileDialog *This); ULONG (STDMETHODCALLTYPE *Release)( - IFileDialog* This); + IFileDialog *This); /*** IModalWindow methods ***/ HRESULT (STDMETHODCALLTYPE *Show)( - IFileDialog* This, + IFileDialog *This, HWND hwndOwner); /*** IFileDialog methods ***/ HRESULT (STDMETHODCALLTYPE *SetFileTypes)( - IFileDialog* This, + IFileDialog *This, UINT cFileTypes, const COMDLG_FILTERSPEC *rgFilterSpec); HRESULT (STDMETHODCALLTYPE *SetFileTypeIndex)( - IFileDialog* This, + IFileDialog *This, UINT iFileType); HRESULT (STDMETHODCALLTYPE *GetFileTypeIndex)( - IFileDialog* This, + IFileDialog *This, UINT *piFileType); HRESULT (STDMETHODCALLTYPE *Advise)( - IFileDialog* This, + IFileDialog *This, IFileDialogEvents *pfde, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *Unadvise)( - IFileDialog* This, + IFileDialog *This, DWORD dwCookie); HRESULT (STDMETHODCALLTYPE *SetOptions)( - IFileDialog* This, + IFileDialog *This, FILEOPENDIALOGOPTIONS fos); HRESULT (STDMETHODCALLTYPE *GetOptions)( - IFileDialog* This, + IFileDialog *This, FILEOPENDIALOGOPTIONS *pfos); HRESULT (STDMETHODCALLTYPE *SetDefaultFolder)( - IFileDialog* This, + IFileDialog *This, IShellItem *psi); HRESULT (STDMETHODCALLTYPE *SetFolder)( - IFileDialog* This, + IFileDialog *This, IShellItem *psi); HRESULT (STDMETHODCALLTYPE *GetFolder)( - IFileDialog* This, + IFileDialog *This, IShellItem **ppsi); HRESULT (STDMETHODCALLTYPE *GetCurrentSelection)( - IFileDialog* This, + IFileDialog *This, IShellItem **ppsi); HRESULT (STDMETHODCALLTYPE *SetFileName)( - IFileDialog* This, + IFileDialog *This, LPCWSTR pszName); HRESULT (STDMETHODCALLTYPE *GetFileName)( - IFileDialog* This, + IFileDialog *This, LPWSTR *pszName); HRESULT (STDMETHODCALLTYPE *SetTitle)( - IFileDialog* This, + IFileDialog *This, LPCWSTR pszTitle); HRESULT (STDMETHODCALLTYPE *SetOkButtonLabel)( - IFileDialog* This, + IFileDialog *This, LPCWSTR pszText); HRESULT (STDMETHODCALLTYPE *SetFileNameLabel)( - IFileDialog* This, + IFileDialog *This, LPCWSTR pszLabel); HRESULT (STDMETHODCALLTYPE *GetResult)( - IFileDialog* This, + IFileDialog *This, IShellItem **ppsi); HRESULT (STDMETHODCALLTYPE *AddPlace)( - IFileDialog* This, + IFileDialog *This, IShellItem *psi, FDAP fdap); HRESULT (STDMETHODCALLTYPE *SetDefaultExtension)( - IFileDialog* This, + IFileDialog *This, LPCWSTR pszDefaultExtension); HRESULT (STDMETHODCALLTYPE *Close)( - IFileDialog* This, + IFileDialog *This, HRESULT hr); HRESULT (STDMETHODCALLTYPE *SetClientGuid)( - IFileDialog* This, + IFileDialog *This, REFGUID guid); HRESULT (STDMETHODCALLTYPE *ClearClientData)( - IFileDialog* This); + IFileDialog *This); HRESULT (STDMETHODCALLTYPE *SetFilter)( - IFileDialog* This, + IFileDialog *This, IShellItemFilter *pFilter); END_INTERFACE } IFileDialogVtbl; + interface IFileDialog { CONST_VTBL IFileDialogVtbl* lpVtbl; }; @@ -25754,192 +21842,6 @@ static FORCEINLINE HRESULT IFileDialog_SetFilter(IFileDialog* This,IShellItemFil #endif -HRESULT STDMETHODCALLTYPE IFileDialog_SetFileTypes_Proxy( - IFileDialog* This, - UINT cFileTypes, - const COMDLG_FILTERSPEC *rgFilterSpec); -void __RPC_STUB IFileDialog_SetFileTypes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialog_SetFileTypeIndex_Proxy( - IFileDialog* This, - UINT iFileType); -void __RPC_STUB IFileDialog_SetFileTypeIndex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialog_GetFileTypeIndex_Proxy( - IFileDialog* This, - UINT *piFileType); -void __RPC_STUB IFileDialog_GetFileTypeIndex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialog_Advise_Proxy( - IFileDialog* This, - IFileDialogEvents *pfde, - DWORD *pdwCookie); -void __RPC_STUB IFileDialog_Advise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialog_Unadvise_Proxy( - IFileDialog* This, - DWORD dwCookie); -void __RPC_STUB IFileDialog_Unadvise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialog_SetOptions_Proxy( - IFileDialog* This, - FILEOPENDIALOGOPTIONS fos); -void __RPC_STUB IFileDialog_SetOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialog_GetOptions_Proxy( - IFileDialog* This, - FILEOPENDIALOGOPTIONS *pfos); -void __RPC_STUB IFileDialog_GetOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialog_SetDefaultFolder_Proxy( - IFileDialog* This, - IShellItem *psi); -void __RPC_STUB IFileDialog_SetDefaultFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialog_SetFolder_Proxy( - IFileDialog* This, - IShellItem *psi); -void __RPC_STUB IFileDialog_SetFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialog_GetFolder_Proxy( - IFileDialog* This, - IShellItem **ppsi); -void __RPC_STUB IFileDialog_GetFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialog_GetCurrentSelection_Proxy( - IFileDialog* This, - IShellItem **ppsi); -void __RPC_STUB IFileDialog_GetCurrentSelection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialog_SetFileName_Proxy( - IFileDialog* This, - LPCWSTR pszName); -void __RPC_STUB IFileDialog_SetFileName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialog_GetFileName_Proxy( - IFileDialog* This, - LPWSTR *pszName); -void __RPC_STUB IFileDialog_GetFileName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialog_SetTitle_Proxy( - IFileDialog* This, - LPCWSTR pszTitle); -void __RPC_STUB IFileDialog_SetTitle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialog_SetOkButtonLabel_Proxy( - IFileDialog* This, - LPCWSTR pszText); -void __RPC_STUB IFileDialog_SetOkButtonLabel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialog_SetFileNameLabel_Proxy( - IFileDialog* This, - LPCWSTR pszLabel); -void __RPC_STUB IFileDialog_SetFileNameLabel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialog_GetResult_Proxy( - IFileDialog* This, - IShellItem **ppsi); -void __RPC_STUB IFileDialog_GetResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialog_AddPlace_Proxy( - IFileDialog* This, - IShellItem *psi, - FDAP fdap); -void __RPC_STUB IFileDialog_AddPlace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialog_SetDefaultExtension_Proxy( - IFileDialog* This, - LPCWSTR pszDefaultExtension); -void __RPC_STUB IFileDialog_SetDefaultExtension_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialog_Close_Proxy( - IFileDialog* This, - HRESULT hr); -void __RPC_STUB IFileDialog_Close_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialog_SetClientGuid_Proxy( - IFileDialog* This, - REFGUID guid); -void __RPC_STUB IFileDialog_SetClientGuid_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialog_ClearClientData_Proxy( - IFileDialog* This); -void __RPC_STUB IFileDialog_ClearClientData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialog_SetFilter_Proxy( - IFileDialog* This, - IShellItemFilter *pFilter); -void __RPC_STUB IFileDialog_SetFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFileDialog_INTERFACE_DEFINED__ */ @@ -25984,136 +21886,136 @@ typedef struct IFileSaveDialogVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFileSaveDialog* This, + IFileSaveDialog *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFileSaveDialog* This); + IFileSaveDialog *This); ULONG (STDMETHODCALLTYPE *Release)( - IFileSaveDialog* This); + IFileSaveDialog *This); /*** IModalWindow methods ***/ HRESULT (STDMETHODCALLTYPE *Show)( - IFileSaveDialog* This, + IFileSaveDialog *This, HWND hwndOwner); /*** IFileDialog methods ***/ HRESULT (STDMETHODCALLTYPE *SetFileTypes)( - IFileSaveDialog* This, + IFileSaveDialog *This, UINT cFileTypes, const COMDLG_FILTERSPEC *rgFilterSpec); HRESULT (STDMETHODCALLTYPE *SetFileTypeIndex)( - IFileSaveDialog* This, + IFileSaveDialog *This, UINT iFileType); HRESULT (STDMETHODCALLTYPE *GetFileTypeIndex)( - IFileSaveDialog* This, + IFileSaveDialog *This, UINT *piFileType); HRESULT (STDMETHODCALLTYPE *Advise)( - IFileSaveDialog* This, + IFileSaveDialog *This, IFileDialogEvents *pfde, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *Unadvise)( - IFileSaveDialog* This, + IFileSaveDialog *This, DWORD dwCookie); HRESULT (STDMETHODCALLTYPE *SetOptions)( - IFileSaveDialog* This, + IFileSaveDialog *This, FILEOPENDIALOGOPTIONS fos); HRESULT (STDMETHODCALLTYPE *GetOptions)( - IFileSaveDialog* This, + IFileSaveDialog *This, FILEOPENDIALOGOPTIONS *pfos); HRESULT (STDMETHODCALLTYPE *SetDefaultFolder)( - IFileSaveDialog* This, + IFileSaveDialog *This, IShellItem *psi); HRESULT (STDMETHODCALLTYPE *SetFolder)( - IFileSaveDialog* This, + IFileSaveDialog *This, IShellItem *psi); HRESULT (STDMETHODCALLTYPE *GetFolder)( - IFileSaveDialog* This, + IFileSaveDialog *This, IShellItem **ppsi); HRESULT (STDMETHODCALLTYPE *GetCurrentSelection)( - IFileSaveDialog* This, + IFileSaveDialog *This, IShellItem **ppsi); HRESULT (STDMETHODCALLTYPE *SetFileName)( - IFileSaveDialog* This, + IFileSaveDialog *This, LPCWSTR pszName); HRESULT (STDMETHODCALLTYPE *GetFileName)( - IFileSaveDialog* This, + IFileSaveDialog *This, LPWSTR *pszName); HRESULT (STDMETHODCALLTYPE *SetTitle)( - IFileSaveDialog* This, + IFileSaveDialog *This, LPCWSTR pszTitle); HRESULT (STDMETHODCALLTYPE *SetOkButtonLabel)( - IFileSaveDialog* This, + IFileSaveDialog *This, LPCWSTR pszText); HRESULT (STDMETHODCALLTYPE *SetFileNameLabel)( - IFileSaveDialog* This, + IFileSaveDialog *This, LPCWSTR pszLabel); HRESULT (STDMETHODCALLTYPE *GetResult)( - IFileSaveDialog* This, + IFileSaveDialog *This, IShellItem **ppsi); HRESULT (STDMETHODCALLTYPE *AddPlace)( - IFileSaveDialog* This, + IFileSaveDialog *This, IShellItem *psi, FDAP fdap); HRESULT (STDMETHODCALLTYPE *SetDefaultExtension)( - IFileSaveDialog* This, + IFileSaveDialog *This, LPCWSTR pszDefaultExtension); HRESULT (STDMETHODCALLTYPE *Close)( - IFileSaveDialog* This, + IFileSaveDialog *This, HRESULT hr); HRESULT (STDMETHODCALLTYPE *SetClientGuid)( - IFileSaveDialog* This, + IFileSaveDialog *This, REFGUID guid); HRESULT (STDMETHODCALLTYPE *ClearClientData)( - IFileSaveDialog* This); + IFileSaveDialog *This); HRESULT (STDMETHODCALLTYPE *SetFilter)( - IFileSaveDialog* This, + IFileSaveDialog *This, IShellItemFilter *pFilter); /*** IFileSaveDialog methods ***/ HRESULT (STDMETHODCALLTYPE *SetSaveAsItem)( - IFileSaveDialog* This, + IFileSaveDialog *This, IShellItem *psi); HRESULT (STDMETHODCALLTYPE *SetProperties)( - IFileSaveDialog* This, + IFileSaveDialog *This, IPropertyStore *pStore); HRESULT (STDMETHODCALLTYPE *SetCollectedProperties)( - IFileSaveDialog* This, + IFileSaveDialog *This, IPropertyDescriptionList *pList, WINBOOL fAppendDefault); HRESULT (STDMETHODCALLTYPE *GetProperties)( - IFileSaveDialog* This, + IFileSaveDialog *This, IPropertyStore **ppStore); HRESULT (STDMETHODCALLTYPE *ApplyProperties)( - IFileSaveDialog* This, + IFileSaveDialog *This, IShellItem *psi, IPropertyStore *pStore, HWND hwnd, @@ -26121,6 +22023,7 @@ typedef struct IFileSaveDialogVtbl { END_INTERFACE } IFileSaveDialogVtbl; + interface IFileSaveDialog { CONST_VTBL IFileSaveDialogVtbl* lpVtbl; }; @@ -26269,50 +22172,6 @@ static FORCEINLINE HRESULT IFileSaveDialog_ApplyProperties(IFileSaveDialog* This #endif -HRESULT STDMETHODCALLTYPE IFileSaveDialog_SetSaveAsItem_Proxy( - IFileSaveDialog* This, - IShellItem *psi); -void __RPC_STUB IFileSaveDialog_SetSaveAsItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileSaveDialog_SetProperties_Proxy( - IFileSaveDialog* This, - IPropertyStore *pStore); -void __RPC_STUB IFileSaveDialog_SetProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileSaveDialog_SetCollectedProperties_Proxy( - IFileSaveDialog* This, - IPropertyDescriptionList *pList, - WINBOOL fAppendDefault); -void __RPC_STUB IFileSaveDialog_SetCollectedProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileSaveDialog_GetProperties_Proxy( - IFileSaveDialog* This, - IPropertyStore **ppStore); -void __RPC_STUB IFileSaveDialog_GetProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileSaveDialog_ApplyProperties_Proxy( - IFileSaveDialog* This, - IShellItem *psi, - IPropertyStore *pStore, - HWND hwnd, - IFileOperationProgressSink *pSink); -void __RPC_STUB IFileSaveDialog_ApplyProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFileSaveDialog_INTERFACE_DEFINED__ */ @@ -26344,127 +22203,128 @@ typedef struct IFileOpenDialogVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFileOpenDialog* This, + IFileOpenDialog *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFileOpenDialog* This); + IFileOpenDialog *This); ULONG (STDMETHODCALLTYPE *Release)( - IFileOpenDialog* This); + IFileOpenDialog *This); /*** IModalWindow methods ***/ HRESULT (STDMETHODCALLTYPE *Show)( - IFileOpenDialog* This, + IFileOpenDialog *This, HWND hwndOwner); /*** IFileDialog methods ***/ HRESULT (STDMETHODCALLTYPE *SetFileTypes)( - IFileOpenDialog* This, + IFileOpenDialog *This, UINT cFileTypes, const COMDLG_FILTERSPEC *rgFilterSpec); HRESULT (STDMETHODCALLTYPE *SetFileTypeIndex)( - IFileOpenDialog* This, + IFileOpenDialog *This, UINT iFileType); HRESULT (STDMETHODCALLTYPE *GetFileTypeIndex)( - IFileOpenDialog* This, + IFileOpenDialog *This, UINT *piFileType); HRESULT (STDMETHODCALLTYPE *Advise)( - IFileOpenDialog* This, + IFileOpenDialog *This, IFileDialogEvents *pfde, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *Unadvise)( - IFileOpenDialog* This, + IFileOpenDialog *This, DWORD dwCookie); HRESULT (STDMETHODCALLTYPE *SetOptions)( - IFileOpenDialog* This, + IFileOpenDialog *This, FILEOPENDIALOGOPTIONS fos); HRESULT (STDMETHODCALLTYPE *GetOptions)( - IFileOpenDialog* This, + IFileOpenDialog *This, FILEOPENDIALOGOPTIONS *pfos); HRESULT (STDMETHODCALLTYPE *SetDefaultFolder)( - IFileOpenDialog* This, + IFileOpenDialog *This, IShellItem *psi); HRESULT (STDMETHODCALLTYPE *SetFolder)( - IFileOpenDialog* This, + IFileOpenDialog *This, IShellItem *psi); HRESULT (STDMETHODCALLTYPE *GetFolder)( - IFileOpenDialog* This, + IFileOpenDialog *This, IShellItem **ppsi); HRESULT (STDMETHODCALLTYPE *GetCurrentSelection)( - IFileOpenDialog* This, + IFileOpenDialog *This, IShellItem **ppsi); HRESULT (STDMETHODCALLTYPE *SetFileName)( - IFileOpenDialog* This, + IFileOpenDialog *This, LPCWSTR pszName); HRESULT (STDMETHODCALLTYPE *GetFileName)( - IFileOpenDialog* This, + IFileOpenDialog *This, LPWSTR *pszName); HRESULT (STDMETHODCALLTYPE *SetTitle)( - IFileOpenDialog* This, + IFileOpenDialog *This, LPCWSTR pszTitle); HRESULT (STDMETHODCALLTYPE *SetOkButtonLabel)( - IFileOpenDialog* This, + IFileOpenDialog *This, LPCWSTR pszText); HRESULT (STDMETHODCALLTYPE *SetFileNameLabel)( - IFileOpenDialog* This, + IFileOpenDialog *This, LPCWSTR pszLabel); HRESULT (STDMETHODCALLTYPE *GetResult)( - IFileOpenDialog* This, + IFileOpenDialog *This, IShellItem **ppsi); HRESULT (STDMETHODCALLTYPE *AddPlace)( - IFileOpenDialog* This, + IFileOpenDialog *This, IShellItem *psi, FDAP fdap); HRESULT (STDMETHODCALLTYPE *SetDefaultExtension)( - IFileOpenDialog* This, + IFileOpenDialog *This, LPCWSTR pszDefaultExtension); HRESULT (STDMETHODCALLTYPE *Close)( - IFileOpenDialog* This, + IFileOpenDialog *This, HRESULT hr); HRESULT (STDMETHODCALLTYPE *SetClientGuid)( - IFileOpenDialog* This, + IFileOpenDialog *This, REFGUID guid); HRESULT (STDMETHODCALLTYPE *ClearClientData)( - IFileOpenDialog* This); + IFileOpenDialog *This); HRESULT (STDMETHODCALLTYPE *SetFilter)( - IFileOpenDialog* This, + IFileOpenDialog *This, IShellItemFilter *pFilter); /*** IFileOpenDialog methods ***/ HRESULT (STDMETHODCALLTYPE *GetResults)( - IFileOpenDialog* This, + IFileOpenDialog *This, IShellItemArray **ppenum); HRESULT (STDMETHODCALLTYPE *GetSelectedItems)( - IFileOpenDialog* This, + IFileOpenDialog *This, IShellItemArray **ppsai); END_INTERFACE } IFileOpenDialogVtbl; + interface IFileOpenDialog { CONST_VTBL IFileOpenDialogVtbl* lpVtbl; }; @@ -26601,22 +22461,6 @@ static FORCEINLINE HRESULT IFileOpenDialog_GetSelectedItems(IFileOpenDialog* Thi #endif -HRESULT STDMETHODCALLTYPE IFileOpenDialog_GetResults_Proxy( - IFileOpenDialog* This, - IShellItemArray **ppenum); -void __RPC_STUB IFileOpenDialog_GetResults_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileOpenDialog_GetSelectedItems_Proxy( - IFileOpenDialog* This, - IShellItemArray **ppsai); -void __RPC_STUB IFileOpenDialog_GetSelectedItems_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFileOpenDialog_INTERFACE_DEFINED__ */ @@ -26757,151 +22601,152 @@ typedef struct IFileDialogCustomizeVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFileDialogCustomize* This); + IFileDialogCustomize *This); ULONG (STDMETHODCALLTYPE *Release)( - IFileDialogCustomize* This); + IFileDialogCustomize *This); /*** IFileDialogCustomize methods ***/ HRESULT (STDMETHODCALLTYPE *EnableOpenDropDown)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl); HRESULT (STDMETHODCALLTYPE *AddMenu)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl, LPCWSTR pszLabel); HRESULT (STDMETHODCALLTYPE *AddPushButton)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl, LPCWSTR pszLabel); HRESULT (STDMETHODCALLTYPE *AddComboBox)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl); HRESULT (STDMETHODCALLTYPE *AddRadioButtonList)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl); HRESULT (STDMETHODCALLTYPE *AddCheckButton)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl, LPCWSTR pszLabel, WINBOOL bChecked); HRESULT (STDMETHODCALLTYPE *AddEditBox)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl, LPCWSTR pszText); HRESULT (STDMETHODCALLTYPE *AddSeparator)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl); HRESULT (STDMETHODCALLTYPE *AddText)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl, LPCWSTR pszText); HRESULT (STDMETHODCALLTYPE *SetControlLabel)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl, LPCWSTR pszLabel); HRESULT (STDMETHODCALLTYPE *GetControlState)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl, CDCONTROLSTATEF *pdwState); HRESULT (STDMETHODCALLTYPE *SetControlState)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl, CDCONTROLSTATEF dwState); HRESULT (STDMETHODCALLTYPE *GetEditBoxText)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl, WCHAR **ppszText); HRESULT (STDMETHODCALLTYPE *SetEditBoxText)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl, LPCWSTR pszText); HRESULT (STDMETHODCALLTYPE *GetCheckButtonState)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl, WINBOOL *pbChecked); HRESULT (STDMETHODCALLTYPE *SetCheckButtonState)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl, WINBOOL bChecked); HRESULT (STDMETHODCALLTYPE *AddControlItem)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl, DWORD dwIDItem, LPCWSTR pszLabel); HRESULT (STDMETHODCALLTYPE *RemoveControlItem)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl, DWORD dwIDItem); HRESULT (STDMETHODCALLTYPE *RemoveAllControlItems)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl); HRESULT (STDMETHODCALLTYPE *GetControlItemState)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl, DWORD dwIDItem, CDCONTROLSTATEF *pdwState); HRESULT (STDMETHODCALLTYPE *SetControlItemState)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl, DWORD dwIDItem, CDCONTROLSTATEF dwState); HRESULT (STDMETHODCALLTYPE *GetSelectedControlItem)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl, DWORD *pdwIDItem); HRESULT (STDMETHODCALLTYPE *SetSelectedControlItem)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl, DWORD dwIDItem); HRESULT (STDMETHODCALLTYPE *StartVisualGroup)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl, LPCWSTR pszLabel); HRESULT (STDMETHODCALLTYPE *EndVisualGroup)( - IFileDialogCustomize* This); + IFileDialogCustomize *This); HRESULT (STDMETHODCALLTYPE *MakeProminent)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl); HRESULT (STDMETHODCALLTYPE *SetControlItemText)( - IFileDialogCustomize* This, + IFileDialogCustomize *This, DWORD dwIDCtl, DWORD dwIDItem, LPCWSTR pszLabel); END_INTERFACE } IFileDialogCustomizeVtbl; + interface IFileDialogCustomize { CONST_VTBL IFileDialogCustomizeVtbl* lpVtbl; }; @@ -27038,246 +22883,6 @@ static FORCEINLINE HRESULT IFileDialogCustomize_SetControlItemText(IFileDialogCu #endif -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_EnableOpenDropDown_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl); -void __RPC_STUB IFileDialogCustomize_EnableOpenDropDown_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_AddMenu_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl, - LPCWSTR pszLabel); -void __RPC_STUB IFileDialogCustomize_AddMenu_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_AddPushButton_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl, - LPCWSTR pszLabel); -void __RPC_STUB IFileDialogCustomize_AddPushButton_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_AddComboBox_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl); -void __RPC_STUB IFileDialogCustomize_AddComboBox_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_AddRadioButtonList_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl); -void __RPC_STUB IFileDialogCustomize_AddRadioButtonList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_AddCheckButton_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl, - LPCWSTR pszLabel, - WINBOOL bChecked); -void __RPC_STUB IFileDialogCustomize_AddCheckButton_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_AddEditBox_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl, - LPCWSTR pszText); -void __RPC_STUB IFileDialogCustomize_AddEditBox_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_AddSeparator_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl); -void __RPC_STUB IFileDialogCustomize_AddSeparator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_AddText_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl, - LPCWSTR pszText); -void __RPC_STUB IFileDialogCustomize_AddText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_SetControlLabel_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl, - LPCWSTR pszLabel); -void __RPC_STUB IFileDialogCustomize_SetControlLabel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_GetControlState_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl, - CDCONTROLSTATEF *pdwState); -void __RPC_STUB IFileDialogCustomize_GetControlState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_SetControlState_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl, - CDCONTROLSTATEF dwState); -void __RPC_STUB IFileDialogCustomize_SetControlState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_GetEditBoxText_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl, - WCHAR **ppszText); -void __RPC_STUB IFileDialogCustomize_GetEditBoxText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_SetEditBoxText_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl, - LPCWSTR pszText); -void __RPC_STUB IFileDialogCustomize_SetEditBoxText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_GetCheckButtonState_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl, - WINBOOL *pbChecked); -void __RPC_STUB IFileDialogCustomize_GetCheckButtonState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_SetCheckButtonState_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl, - WINBOOL bChecked); -void __RPC_STUB IFileDialogCustomize_SetCheckButtonState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_AddControlItem_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl, - DWORD dwIDItem, - LPCWSTR pszLabel); -void __RPC_STUB IFileDialogCustomize_AddControlItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_RemoveControlItem_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl, - DWORD dwIDItem); -void __RPC_STUB IFileDialogCustomize_RemoveControlItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_RemoveAllControlItems_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl); -void __RPC_STUB IFileDialogCustomize_RemoveAllControlItems_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_GetControlItemState_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl, - DWORD dwIDItem, - CDCONTROLSTATEF *pdwState); -void __RPC_STUB IFileDialogCustomize_GetControlItemState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_SetControlItemState_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl, - DWORD dwIDItem, - CDCONTROLSTATEF dwState); -void __RPC_STUB IFileDialogCustomize_SetControlItemState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_GetSelectedControlItem_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl, - DWORD *pdwIDItem); -void __RPC_STUB IFileDialogCustomize_GetSelectedControlItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_SetSelectedControlItem_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl, - DWORD dwIDItem); -void __RPC_STUB IFileDialogCustomize_SetSelectedControlItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_StartVisualGroup_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl, - LPCWSTR pszLabel); -void __RPC_STUB IFileDialogCustomize_StartVisualGroup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_EndVisualGroup_Proxy( - IFileDialogCustomize* This); -void __RPC_STUB IFileDialogCustomize_EndVisualGroup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_MakeProminent_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl); -void __RPC_STUB IFileDialogCustomize_MakeProminent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogCustomize_SetControlItemText_Proxy( - IFileDialogCustomize* This, - DWORD dwIDCtl, - DWORD dwIDItem, - LPCWSTR pszLabel); -void __RPC_STUB IFileDialogCustomize_SetControlItemText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFileDialogCustomize_INTERFACE_DEFINED__ */ @@ -27321,41 +22926,42 @@ typedef struct IFileDialogControlEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFileDialogControlEvents* This, + IFileDialogControlEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFileDialogControlEvents* This); + IFileDialogControlEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - IFileDialogControlEvents* This); + IFileDialogControlEvents *This); /*** IFileDialogControlEvents methods ***/ HRESULT (STDMETHODCALLTYPE *OnItemSelected)( - IFileDialogControlEvents* This, + IFileDialogControlEvents *This, IFileDialogCustomize *pfdc, DWORD dwIDCtl, DWORD dwIDItem); HRESULT (STDMETHODCALLTYPE *OnButtonClicked)( - IFileDialogControlEvents* This, + IFileDialogControlEvents *This, IFileDialogCustomize *pfdc, DWORD dwIDCtl); HRESULT (STDMETHODCALLTYPE *OnCheckButtonToggled)( - IFileDialogControlEvents* This, + IFileDialogControlEvents *This, IFileDialogCustomize *pfdc, DWORD dwIDCtl, WINBOOL bChecked); HRESULT (STDMETHODCALLTYPE *OnControlActivating)( - IFileDialogControlEvents* This, + IFileDialogControlEvents *This, IFileDialogCustomize *pfdc, DWORD dwIDCtl); END_INTERFACE } IFileDialogControlEventsVtbl; + interface IFileDialogControlEvents { CONST_VTBL IFileDialogControlEventsVtbl* lpVtbl; }; @@ -27400,44 +23006,6 @@ static FORCEINLINE HRESULT IFileDialogControlEvents_OnControlActivating(IFileDia #endif -HRESULT STDMETHODCALLTYPE IFileDialogControlEvents_OnItemSelected_Proxy( - IFileDialogControlEvents* This, - IFileDialogCustomize *pfdc, - DWORD dwIDCtl, - DWORD dwIDItem); -void __RPC_STUB IFileDialogControlEvents_OnItemSelected_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogControlEvents_OnButtonClicked_Proxy( - IFileDialogControlEvents* This, - IFileDialogCustomize *pfdc, - DWORD dwIDCtl); -void __RPC_STUB IFileDialogControlEvents_OnButtonClicked_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogControlEvents_OnCheckButtonToggled_Proxy( - IFileDialogControlEvents* This, - IFileDialogCustomize *pfdc, - DWORD dwIDCtl, - WINBOOL bChecked); -void __RPC_STUB IFileDialogControlEvents_OnCheckButtonToggled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialogControlEvents_OnControlActivating_Proxy( - IFileDialogControlEvents* This, - IFileDialogCustomize *pfdc, - DWORD dwIDCtl); -void __RPC_STUB IFileDialogControlEvents_OnControlActivating_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFileDialogControlEvents_INTERFACE_DEFINED__ */ @@ -27469,127 +23037,128 @@ typedef struct IFileDialog2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFileDialog2* This, + IFileDialog2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFileDialog2* This); + IFileDialog2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IFileDialog2* This); + IFileDialog2 *This); /*** IModalWindow methods ***/ HRESULT (STDMETHODCALLTYPE *Show)( - IFileDialog2* This, + IFileDialog2 *This, HWND hwndOwner); /*** IFileDialog methods ***/ HRESULT (STDMETHODCALLTYPE *SetFileTypes)( - IFileDialog2* This, + IFileDialog2 *This, UINT cFileTypes, const COMDLG_FILTERSPEC *rgFilterSpec); HRESULT (STDMETHODCALLTYPE *SetFileTypeIndex)( - IFileDialog2* This, + IFileDialog2 *This, UINT iFileType); HRESULT (STDMETHODCALLTYPE *GetFileTypeIndex)( - IFileDialog2* This, + IFileDialog2 *This, UINT *piFileType); HRESULT (STDMETHODCALLTYPE *Advise)( - IFileDialog2* This, + IFileDialog2 *This, IFileDialogEvents *pfde, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *Unadvise)( - IFileDialog2* This, + IFileDialog2 *This, DWORD dwCookie); HRESULT (STDMETHODCALLTYPE *SetOptions)( - IFileDialog2* This, + IFileDialog2 *This, FILEOPENDIALOGOPTIONS fos); HRESULT (STDMETHODCALLTYPE *GetOptions)( - IFileDialog2* This, + IFileDialog2 *This, FILEOPENDIALOGOPTIONS *pfos); HRESULT (STDMETHODCALLTYPE *SetDefaultFolder)( - IFileDialog2* This, + IFileDialog2 *This, IShellItem *psi); HRESULT (STDMETHODCALLTYPE *SetFolder)( - IFileDialog2* This, + IFileDialog2 *This, IShellItem *psi); HRESULT (STDMETHODCALLTYPE *GetFolder)( - IFileDialog2* This, + IFileDialog2 *This, IShellItem **ppsi); HRESULT (STDMETHODCALLTYPE *GetCurrentSelection)( - IFileDialog2* This, + IFileDialog2 *This, IShellItem **ppsi); HRESULT (STDMETHODCALLTYPE *SetFileName)( - IFileDialog2* This, + IFileDialog2 *This, LPCWSTR pszName); HRESULT (STDMETHODCALLTYPE *GetFileName)( - IFileDialog2* This, + IFileDialog2 *This, LPWSTR *pszName); HRESULT (STDMETHODCALLTYPE *SetTitle)( - IFileDialog2* This, + IFileDialog2 *This, LPCWSTR pszTitle); HRESULT (STDMETHODCALLTYPE *SetOkButtonLabel)( - IFileDialog2* This, + IFileDialog2 *This, LPCWSTR pszText); HRESULT (STDMETHODCALLTYPE *SetFileNameLabel)( - IFileDialog2* This, + IFileDialog2 *This, LPCWSTR pszLabel); HRESULT (STDMETHODCALLTYPE *GetResult)( - IFileDialog2* This, + IFileDialog2 *This, IShellItem **ppsi); HRESULT (STDMETHODCALLTYPE *AddPlace)( - IFileDialog2* This, + IFileDialog2 *This, IShellItem *psi, FDAP fdap); HRESULT (STDMETHODCALLTYPE *SetDefaultExtension)( - IFileDialog2* This, + IFileDialog2 *This, LPCWSTR pszDefaultExtension); HRESULT (STDMETHODCALLTYPE *Close)( - IFileDialog2* This, + IFileDialog2 *This, HRESULT hr); HRESULT (STDMETHODCALLTYPE *SetClientGuid)( - IFileDialog2* This, + IFileDialog2 *This, REFGUID guid); HRESULT (STDMETHODCALLTYPE *ClearClientData)( - IFileDialog2* This); + IFileDialog2 *This); HRESULT (STDMETHODCALLTYPE *SetFilter)( - IFileDialog2* This, + IFileDialog2 *This, IShellItemFilter *pFilter); /*** IFileDialog2 methods ***/ HRESULT (STDMETHODCALLTYPE *SetCancelButtonLabel)( - IFileDialog2* This, + IFileDialog2 *This, LPCWSTR pszLabel); HRESULT (STDMETHODCALLTYPE *SetNavigationRoot)( - IFileDialog2* This, + IFileDialog2 *This, IShellItem *psi); END_INTERFACE } IFileDialog2Vtbl; + interface IFileDialog2 { CONST_VTBL IFileDialog2Vtbl* lpVtbl; }; @@ -27726,22 +23295,6 @@ static FORCEINLINE HRESULT IFileDialog2_SetNavigationRoot(IFileDialog2* This,ISh #endif -HRESULT STDMETHODCALLTYPE IFileDialog2_SetCancelButtonLabel_Proxy( - IFileDialog2* This, - LPCWSTR pszLabel); -void __RPC_STUB IFileDialog2_SetCancelButtonLabel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileDialog2_SetNavigationRoot_Proxy( - IFileDialog2* This, - IShellItem *psi); -void __RPC_STUB IFileDialog2_SetNavigationRoot_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFileDialog2_INTERFACE_DEFINED__ */ @@ -27809,26 +23362,26 @@ typedef struct IApplicationAssociationRegistrationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IApplicationAssociationRegistration* This, + IApplicationAssociationRegistration *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IApplicationAssociationRegistration* This); + IApplicationAssociationRegistration *This); ULONG (STDMETHODCALLTYPE *Release)( - IApplicationAssociationRegistration* This); + IApplicationAssociationRegistration *This); /*** IApplicationAssociationRegistration methods ***/ HRESULT (STDMETHODCALLTYPE *QueryCurrentDefault)( - IApplicationAssociationRegistration* This, + IApplicationAssociationRegistration *This, LPCWSTR pszQuery, ASSOCIATIONTYPE atQueryType, ASSOCIATIONLEVEL alQueryLevel, LPWSTR *ppszAssociation); HRESULT (STDMETHODCALLTYPE *QueryAppIsDefault)( - IApplicationAssociationRegistration* This, + IApplicationAssociationRegistration *This, LPCWSTR pszQuery, ASSOCIATIONTYPE atQueryType, ASSOCIATIONLEVEL alQueryLevel, @@ -27836,26 +23389,27 @@ typedef struct IApplicationAssociationRegistrationVtbl { WINBOOL *pfDefault); HRESULT (STDMETHODCALLTYPE *QueryAppIsDefaultAll)( - IApplicationAssociationRegistration* This, + IApplicationAssociationRegistration *This, ASSOCIATIONLEVEL alQueryLevel, LPCWSTR pszAppRegistryName, WINBOOL *pfDefault); HRESULT (STDMETHODCALLTYPE *SetAppAsDefault)( - IApplicationAssociationRegistration* This, + IApplicationAssociationRegistration *This, LPCWSTR pszAppRegistryName, LPCWSTR pszSet, ASSOCIATIONTYPE atSetType); HRESULT (STDMETHODCALLTYPE *SetAppAsDefaultAll)( - IApplicationAssociationRegistration* This, + IApplicationAssociationRegistration *This, LPCWSTR pszAppRegistryName); HRESULT (STDMETHODCALLTYPE *ClearUserAssociations)( - IApplicationAssociationRegistration* This); + IApplicationAssociationRegistration *This); END_INTERFACE } IApplicationAssociationRegistrationVtbl; + interface IApplicationAssociationRegistration { CONST_VTBL IApplicationAssociationRegistrationVtbl* lpVtbl; }; @@ -27908,64 +23462,6 @@ static FORCEINLINE HRESULT IApplicationAssociationRegistration_ClearUserAssociat #endif -HRESULT STDMETHODCALLTYPE IApplicationAssociationRegistration_QueryCurrentDefault_Proxy( - IApplicationAssociationRegistration* This, - LPCWSTR pszQuery, - ASSOCIATIONTYPE atQueryType, - ASSOCIATIONLEVEL alQueryLevel, - LPWSTR *ppszAssociation); -void __RPC_STUB IApplicationAssociationRegistration_QueryCurrentDefault_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationAssociationRegistration_QueryAppIsDefault_Proxy( - IApplicationAssociationRegistration* This, - LPCWSTR pszQuery, - ASSOCIATIONTYPE atQueryType, - ASSOCIATIONLEVEL alQueryLevel, - LPCWSTR pszAppRegistryName, - WINBOOL *pfDefault); -void __RPC_STUB IApplicationAssociationRegistration_QueryAppIsDefault_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationAssociationRegistration_QueryAppIsDefaultAll_Proxy( - IApplicationAssociationRegistration* This, - ASSOCIATIONLEVEL alQueryLevel, - LPCWSTR pszAppRegistryName, - WINBOOL *pfDefault); -void __RPC_STUB IApplicationAssociationRegistration_QueryAppIsDefaultAll_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationAssociationRegistration_SetAppAsDefault_Proxy( - IApplicationAssociationRegistration* This, - LPCWSTR pszAppRegistryName, - LPCWSTR pszSet, - ASSOCIATIONTYPE atSetType); -void __RPC_STUB IApplicationAssociationRegistration_SetAppAsDefault_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationAssociationRegistration_SetAppAsDefaultAll_Proxy( - IApplicationAssociationRegistration* This, - LPCWSTR pszAppRegistryName); -void __RPC_STUB IApplicationAssociationRegistration_SetAppAsDefaultAll_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationAssociationRegistration_ClearUserAssociations_Proxy( - IApplicationAssociationRegistration* This); -void __RPC_STUB IApplicationAssociationRegistration_ClearUserAssociations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IApplicationAssociationRegistration_INTERFACE_DEFINED__ */ @@ -27996,23 +23492,24 @@ typedef struct IApplicationAssociationRegistrationUIVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IApplicationAssociationRegistrationUI* This, + IApplicationAssociationRegistrationUI *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IApplicationAssociationRegistrationUI* This); + IApplicationAssociationRegistrationUI *This); ULONG (STDMETHODCALLTYPE *Release)( - IApplicationAssociationRegistrationUI* This); + IApplicationAssociationRegistrationUI *This); /*** IApplicationAssociationRegistrationUI methods ***/ HRESULT (STDMETHODCALLTYPE *LaunchAdvancedAssociationUI)( - IApplicationAssociationRegistrationUI* This, + IApplicationAssociationRegistrationUI *This, LPCWSTR pszAppRegistryName); END_INTERFACE } IApplicationAssociationRegistrationUIVtbl; + interface IApplicationAssociationRegistrationUI { CONST_VTBL IApplicationAssociationRegistrationUIVtbl* lpVtbl; }; @@ -28045,14 +23542,6 @@ static FORCEINLINE HRESULT IApplicationAssociationRegistrationUI_LaunchAdvancedA #endif -HRESULT STDMETHODCALLTYPE IApplicationAssociationRegistrationUI_LaunchAdvancedAssociationUI_Proxy( - IApplicationAssociationRegistrationUI* This, - LPCWSTR pszAppRegistryName); -void __RPC_STUB IApplicationAssociationRegistrationUI_LaunchAdvancedAssociationUI_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IApplicationAssociationRegistrationUI_INTERFACE_DEFINED__ */ @@ -28094,23 +23583,24 @@ typedef struct IDelegateFolderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDelegateFolder* This, + IDelegateFolder *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDelegateFolder* This); + IDelegateFolder *This); ULONG (STDMETHODCALLTYPE *Release)( - IDelegateFolder* This); + IDelegateFolder *This); /*** IDelegateFolder methods ***/ HRESULT (STDMETHODCALLTYPE *SetItemAlloc)( - IDelegateFolder* This, + IDelegateFolder *This, IMalloc *pmalloc); END_INTERFACE } IDelegateFolderVtbl; + interface IDelegateFolder { CONST_VTBL IDelegateFolderVtbl* lpVtbl; }; @@ -28143,14 +23633,6 @@ static FORCEINLINE HRESULT IDelegateFolder_SetItemAlloc(IDelegateFolder* This,IM #endif -HRESULT STDMETHODCALLTYPE IDelegateFolder_SetItemAlloc_Proxy( - IDelegateFolder* This, - IMalloc *pmalloc); -void __RPC_STUB IDelegateFolder_SetItemAlloc_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDelegateFolder_INTERFACE_DEFINED__ */ @@ -28187,7 +23669,6 @@ enum _BROWSERFRAMEOPTIONS { BFO_QUERY_ALL = (int)0xffffffff }; - typedef DWORD BROWSERFRAMEOPTIONS; DEFINE_GUID(IID_IBrowserFrameOptions, 0x10df43c8, 0x1dbe, 0x11d3, 0x8b,0x34, 0x00,0x60,0x97,0xdf,0x5b,0xd4); @@ -28209,24 +23690,25 @@ typedef struct IBrowserFrameOptionsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IBrowserFrameOptions* This, + IBrowserFrameOptions *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IBrowserFrameOptions* This); + IBrowserFrameOptions *This); ULONG (STDMETHODCALLTYPE *Release)( - IBrowserFrameOptions* This); + IBrowserFrameOptions *This); /*** IBrowserFrameOptions methods ***/ HRESULT (STDMETHODCALLTYPE *GetFrameOptions)( - IBrowserFrameOptions* This, + IBrowserFrameOptions *This, BROWSERFRAMEOPTIONS dwMask, BROWSERFRAMEOPTIONS *pdwOptions); END_INTERFACE } IBrowserFrameOptionsVtbl; + interface IBrowserFrameOptions { CONST_VTBL IBrowserFrameOptionsVtbl* lpVtbl; }; @@ -28259,15 +23741,6 @@ static FORCEINLINE HRESULT IBrowserFrameOptions_GetFrameOptions(IBrowserFrameOpt #endif -HRESULT STDMETHODCALLTYPE IBrowserFrameOptions_GetFrameOptions_Proxy( - IBrowserFrameOptions* This, - BROWSERFRAMEOPTIONS dwMask, - BROWSERFRAMEOPTIONS *pdwOptions); -void __RPC_STUB IBrowserFrameOptions_GetFrameOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IBrowserFrameOptions_INTERFACE_DEFINED__ */ @@ -28325,19 +23798,19 @@ typedef struct INewWindowManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INewWindowManager* This, + INewWindowManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INewWindowManager* This); + INewWindowManager *This); ULONG (STDMETHODCALLTYPE *Release)( - INewWindowManager* This); + INewWindowManager *This); /*** INewWindowManager methods ***/ HRESULT (STDMETHODCALLTYPE *EvaluateNewWindow)( - INewWindowManager* This, + INewWindowManager *This, LPCWSTR pszUrl, LPCWSTR pszName, LPCWSTR pszUrlContext, @@ -28348,6 +23821,7 @@ typedef struct INewWindowManagerVtbl { END_INTERFACE } INewWindowManagerVtbl; + interface INewWindowManager { CONST_VTBL INewWindowManagerVtbl* lpVtbl; }; @@ -28380,20 +23854,6 @@ static FORCEINLINE HRESULT INewWindowManager_EvaluateNewWindow(INewWindowManager #endif -HRESULT STDMETHODCALLTYPE INewWindowManager_EvaluateNewWindow_Proxy( - INewWindowManager* This, - LPCWSTR pszUrl, - LPCWSTR pszName, - LPCWSTR pszUrlContext, - LPCWSTR pszFeatures, - WINBOOL fReplace, - DWORD dwFlags, - DWORD dwUserActionTime); -void __RPC_STUB INewWindowManager_EvaluateNewWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INewWindowManager_INTERFACE_DEFINED__ */ @@ -28472,68 +23932,69 @@ typedef struct IAttachmentExecuteVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAttachmentExecute* This, + IAttachmentExecute *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAttachmentExecute* This); + IAttachmentExecute *This); ULONG (STDMETHODCALLTYPE *Release)( - IAttachmentExecute* This); + IAttachmentExecute *This); /*** IAttachmentExecute methods ***/ HRESULT (STDMETHODCALLTYPE *SetClientTitle)( - IAttachmentExecute* This, + IAttachmentExecute *This, LPCWSTR pszTitle); HRESULT (STDMETHODCALLTYPE *SetClientGuid)( - IAttachmentExecute* This, + IAttachmentExecute *This, REFGUID guid); HRESULT (STDMETHODCALLTYPE *SetLocalPath)( - IAttachmentExecute* This, + IAttachmentExecute *This, LPCWSTR pszLocalPath); HRESULT (STDMETHODCALLTYPE *SetFileName)( - IAttachmentExecute* This, + IAttachmentExecute *This, LPCWSTR pszFileName); HRESULT (STDMETHODCALLTYPE *SetSource)( - IAttachmentExecute* This, + IAttachmentExecute *This, LPCWSTR pszSource); HRESULT (STDMETHODCALLTYPE *SetReferrer)( - IAttachmentExecute* This, + IAttachmentExecute *This, LPCWSTR pszReferrer); HRESULT (STDMETHODCALLTYPE *CheckPolicy)( - IAttachmentExecute* This); + IAttachmentExecute *This); HRESULT (STDMETHODCALLTYPE *Prompt)( - IAttachmentExecute* This, + IAttachmentExecute *This, HWND hwnd, ATTACHMENT_PROMPT prompt, ATTACHMENT_ACTION *paction); HRESULT (STDMETHODCALLTYPE *Save)( - IAttachmentExecute* This); + IAttachmentExecute *This); HRESULT (STDMETHODCALLTYPE *Execute)( - IAttachmentExecute* This, + IAttachmentExecute *This, HWND hwnd, LPCWSTR pszVerb, HANDLE *phProcess); HRESULT (STDMETHODCALLTYPE *SaveWithUI)( - IAttachmentExecute* This, + IAttachmentExecute *This, HWND hwnd); HRESULT (STDMETHODCALLTYPE *ClearClientState)( - IAttachmentExecute* This); + IAttachmentExecute *This); END_INTERFACE } IAttachmentExecuteVtbl; + interface IAttachmentExecute { CONST_VTBL IAttachmentExecuteVtbl* lpVtbl; }; @@ -28610,103 +24071,6 @@ static FORCEINLINE HRESULT IAttachmentExecute_ClearClientState(IAttachmentExecut #endif -HRESULT STDMETHODCALLTYPE IAttachmentExecute_SetClientTitle_Proxy( - IAttachmentExecute* This, - LPCWSTR pszTitle); -void __RPC_STUB IAttachmentExecute_SetClientTitle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAttachmentExecute_SetClientGuid_Proxy( - IAttachmentExecute* This, - REFGUID guid); -void __RPC_STUB IAttachmentExecute_SetClientGuid_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAttachmentExecute_SetLocalPath_Proxy( - IAttachmentExecute* This, - LPCWSTR pszLocalPath); -void __RPC_STUB IAttachmentExecute_SetLocalPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAttachmentExecute_SetFileName_Proxy( - IAttachmentExecute* This, - LPCWSTR pszFileName); -void __RPC_STUB IAttachmentExecute_SetFileName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAttachmentExecute_SetSource_Proxy( - IAttachmentExecute* This, - LPCWSTR pszSource); -void __RPC_STUB IAttachmentExecute_SetSource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAttachmentExecute_SetReferrer_Proxy( - IAttachmentExecute* This, - LPCWSTR pszReferrer); -void __RPC_STUB IAttachmentExecute_SetReferrer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAttachmentExecute_CheckPolicy_Proxy( - IAttachmentExecute* This); -void __RPC_STUB IAttachmentExecute_CheckPolicy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAttachmentExecute_Prompt_Proxy( - IAttachmentExecute* This, - HWND hwnd, - ATTACHMENT_PROMPT prompt, - ATTACHMENT_ACTION *paction); -void __RPC_STUB IAttachmentExecute_Prompt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAttachmentExecute_Save_Proxy( - IAttachmentExecute* This); -void __RPC_STUB IAttachmentExecute_Save_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAttachmentExecute_Execute_Proxy( - IAttachmentExecute* This, - HWND hwnd, - LPCWSTR pszVerb, - HANDLE *phProcess); -void __RPC_STUB IAttachmentExecute_Execute_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAttachmentExecute_SaveWithUI_Proxy( - IAttachmentExecute* This, - HWND hwnd); -void __RPC_STUB IAttachmentExecute_SaveWithUI_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAttachmentExecute_ClearClientState_Proxy( - IAttachmentExecute* This); -void __RPC_STUB IAttachmentExecute_ClearClientState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAttachmentExecute_INTERFACE_DEFINED__ */ @@ -28757,13 +24121,11 @@ enum tagSMINFOMASK { SMIM_ICON = 0x4 }; - enum tagSMINFOTYPE { SMIT_SEPARATOR = 0x1, SMIT_STRING = 0x2 }; - enum tagSMINFOFLAGS { SMIF_ICON = 0x1, SMIF_ACCELERATOR = 0x2, @@ -28780,7 +24142,6 @@ enum tagSMINFOFLAGS { SMIF_NEW = 0x2000 }; - #define SMC_INITMENU 0x00000001 #define SMC_CREATE 0x00000002 #define SMC_EXITMENU 0x00000003 @@ -28844,19 +24205,19 @@ typedef struct IShellMenuCallbackVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellMenuCallback* This, + IShellMenuCallback *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellMenuCallback* This); + IShellMenuCallback *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellMenuCallback* This); + IShellMenuCallback *This); /*** IShellMenuCallback methods ***/ HRESULT (STDMETHODCALLTYPE *CallbackSM)( - IShellMenuCallback* This, + IShellMenuCallback *This, LPSMDATA psmd, UINT uMsg, WPARAM wParam, @@ -28864,6 +24225,7 @@ typedef struct IShellMenuCallbackVtbl { END_INTERFACE } IShellMenuCallbackVtbl; + interface IShellMenuCallback { CONST_VTBL IShellMenuCallbackVtbl* lpVtbl; }; @@ -28896,17 +24258,6 @@ static FORCEINLINE HRESULT IShellMenuCallback_CallbackSM(IShellMenuCallback* Thi #endif -HRESULT STDMETHODCALLTYPE IShellMenuCallback_CallbackSM_Proxy( - IShellMenuCallback* This, - LPSMDATA psmd, - UINT uMsg, - WPARAM wParam, - LPARAM lParam); -void __RPC_STUB IShellMenuCallback_CallbackSM_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellMenuCallback_INTERFACE_DEFINED__ */ @@ -28999,73 +24350,74 @@ typedef struct IShellMenuVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellMenu* This, + IShellMenu *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellMenu* This); + IShellMenu *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellMenu* This); + IShellMenu *This); /*** IShellMenu methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IShellMenu* This, + IShellMenu *This, IShellMenuCallback *psmc, UINT uId, UINT uIdAncestor, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetMenuInfo)( - IShellMenu* This, + IShellMenu *This, IShellMenuCallback **ppsmc, UINT *puId, UINT *puIdAncestor, DWORD *pdwFlags); HRESULT (STDMETHODCALLTYPE *SetShellFolder)( - IShellMenu* This, + IShellMenu *This, IShellFolder *psf, PCIDLIST_ABSOLUTE pidlFolder, HKEY hKey, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetShellFolder)( - IShellMenu* This, + IShellMenu *This, DWORD *pdwFlags, PIDLIST_ABSOLUTE *ppidl, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *SetMenu)( - IShellMenu* This, + IShellMenu *This, HMENU hmenu, HWND hwnd, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetMenu)( - IShellMenu* This, + IShellMenu *This, HMENU *phmenu, HWND *phwnd, DWORD *pdwFlags); HRESULT (STDMETHODCALLTYPE *InvalidateItem)( - IShellMenu* This, + IShellMenu *This, LPSMDATA psmd, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetState)( - IShellMenu* This, + IShellMenu *This, LPSMDATA psmd); HRESULT (STDMETHODCALLTYPE *SetMenuToolbar)( - IShellMenu* This, + IShellMenu *This, IUnknown *punk, DWORD dwFlags); END_INTERFACE } IShellMenuVtbl; + interface IShellMenu { CONST_VTBL IShellMenuVtbl* lpVtbl; }; @@ -29130,96 +24482,6 @@ static FORCEINLINE HRESULT IShellMenu_SetMenuToolbar(IShellMenu* This,IUnknown * #endif -HRESULT STDMETHODCALLTYPE IShellMenu_Initialize_Proxy( - IShellMenu* This, - IShellMenuCallback *psmc, - UINT uId, - UINT uIdAncestor, - DWORD dwFlags); -void __RPC_STUB IShellMenu_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellMenu_GetMenuInfo_Proxy( - IShellMenu* This, - IShellMenuCallback **ppsmc, - UINT *puId, - UINT *puIdAncestor, - DWORD *pdwFlags); -void __RPC_STUB IShellMenu_GetMenuInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellMenu_SetShellFolder_Proxy( - IShellMenu* This, - IShellFolder *psf, - PCIDLIST_ABSOLUTE pidlFolder, - HKEY hKey, - DWORD dwFlags); -void __RPC_STUB IShellMenu_SetShellFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellMenu_GetShellFolder_Proxy( - IShellMenu* This, - DWORD *pdwFlags, - PIDLIST_ABSOLUTE *ppidl, - REFIID riid, - void **ppv); -void __RPC_STUB IShellMenu_GetShellFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellMenu_SetMenu_Proxy( - IShellMenu* This, - HMENU hmenu, - HWND hwnd, - DWORD dwFlags); -void __RPC_STUB IShellMenu_SetMenu_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellMenu_GetMenu_Proxy( - IShellMenu* This, - HMENU *phmenu, - HWND *phwnd, - DWORD *pdwFlags); -void __RPC_STUB IShellMenu_GetMenu_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellMenu_InvalidateItem_Proxy( - IShellMenu* This, - LPSMDATA psmd, - DWORD dwFlags); -void __RPC_STUB IShellMenu_InvalidateItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellMenu_GetState_Proxy( - IShellMenu* This, - LPSMDATA psmd); -void __RPC_STUB IShellMenu_GetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellMenu_SetMenuToolbar_Proxy( - IShellMenu* This, - IUnknown *punk, - DWORD dwFlags); -void __RPC_STUB IShellMenu_SetMenuToolbar_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellMenu_INTERFACE_DEFINED__ */ @@ -29249,23 +24511,24 @@ typedef struct IShellRunDllVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellRunDll* This, + IShellRunDll *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellRunDll* This); + IShellRunDll *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellRunDll* This); + IShellRunDll *This); /*** IShellRunDll methods ***/ HRESULT (STDMETHODCALLTYPE *Run)( - IShellRunDll* This, + IShellRunDll *This, LPCWSTR pszArgs); END_INTERFACE } IShellRunDllVtbl; + interface IShellRunDll { CONST_VTBL IShellRunDllVtbl* lpVtbl; }; @@ -29298,14 +24561,6 @@ static FORCEINLINE HRESULT IShellRunDll_Run(IShellRunDll* This,LPCWSTR pszArgs) #endif -HRESULT STDMETHODCALLTYPE IShellRunDll_Run_Proxy( - IShellRunDll* This, - LPCWSTR pszArgs); -void __RPC_STUB IShellRunDll_Run_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellRunDll_INTERFACE_DEFINED__ */ @@ -29326,7 +24581,6 @@ enum _KF_DEFINITION_FLAGS { KFDF_PUBLISHEXPANDEDPATH = 0x20 }; - typedef DWORD KF_DEFINITION_FLAGS; enum _KF_REDIRECT_FLAGS { @@ -29343,7 +24597,6 @@ enum _KF_REDIRECT_FLAGS { KF_REDIRECT_EXCLUDE_ALL_KNOWN_SUBFOLDERS = 0x800 }; - typedef DWORD KF_REDIRECT_FLAGS; enum _KF_REDIRECTION_CAPABILITIES { @@ -29355,7 +24608,6 @@ enum _KF_REDIRECTION_CAPABILITIES { KF_REDIRECTION_CAPABILITIES_DENY_PERMISSIONS = 0x400 }; - typedef DWORD KF_REDIRECTION_CAPABILITIES; typedef struct KNOWNFOLDER_DEFINITION { @@ -29427,60 +24679,61 @@ typedef struct IKnownFolderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IKnownFolder* This, + IKnownFolder *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IKnownFolder* This); + IKnownFolder *This); ULONG (STDMETHODCALLTYPE *Release)( - IKnownFolder* This); + IKnownFolder *This); /*** IKnownFolder methods ***/ HRESULT (STDMETHODCALLTYPE *GetId)( - IKnownFolder* This, + IKnownFolder *This, KNOWNFOLDERID *pkfid); HRESULT (STDMETHODCALLTYPE *GetCategory)( - IKnownFolder* This, + IKnownFolder *This, KF_CATEGORY *pCategory); HRESULT (STDMETHODCALLTYPE *GetShellItem)( - IKnownFolder* This, + IKnownFolder *This, DWORD dwFlags, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetPath)( - IKnownFolder* This, + IKnownFolder *This, DWORD dwFlags, LPWSTR *ppszPath); HRESULT (STDMETHODCALLTYPE *SetPath)( - IKnownFolder* This, + IKnownFolder *This, DWORD dwFlags, LPCWSTR pszPath); HRESULT (STDMETHODCALLTYPE *GetIDList)( - IKnownFolder* This, + IKnownFolder *This, DWORD dwFlags, PIDLIST_ABSOLUTE *ppidl); HRESULT (STDMETHODCALLTYPE *GetFolderType)( - IKnownFolder* This, + IKnownFolder *This, FOLDERTYPEID *pftid); HRESULT (STDMETHODCALLTYPE *GetRedirectionCapabilities)( - IKnownFolder* This, + IKnownFolder *This, KF_REDIRECTION_CAPABILITIES *pCapabilities); HRESULT (STDMETHODCALLTYPE *GetFolderDefinition)( - IKnownFolder* This, + IKnownFolder *This, KNOWNFOLDER_DEFINITION *pKFD); END_INTERFACE } IKnownFolderVtbl; + interface IKnownFolder { CONST_VTBL IKnownFolderVtbl* lpVtbl; }; @@ -29545,83 +24798,6 @@ static FORCEINLINE HRESULT IKnownFolder_GetFolderDefinition(IKnownFolder* This,K #endif -HRESULT STDMETHODCALLTYPE IKnownFolder_GetId_Proxy( - IKnownFolder* This, - KNOWNFOLDERID *pkfid); -void __RPC_STUB IKnownFolder_GetId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IKnownFolder_GetCategory_Proxy( - IKnownFolder* This, - KF_CATEGORY *pCategory); -void __RPC_STUB IKnownFolder_GetCategory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IKnownFolder_GetShellItem_Proxy( - IKnownFolder* This, - DWORD dwFlags, - REFIID riid, - void **ppv); -void __RPC_STUB IKnownFolder_GetShellItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IKnownFolder_GetPath_Proxy( - IKnownFolder* This, - DWORD dwFlags, - LPWSTR *ppszPath); -void __RPC_STUB IKnownFolder_GetPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IKnownFolder_SetPath_Proxy( - IKnownFolder* This, - DWORD dwFlags, - LPCWSTR pszPath); -void __RPC_STUB IKnownFolder_SetPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IKnownFolder_GetIDList_Proxy( - IKnownFolder* This, - DWORD dwFlags, - PIDLIST_ABSOLUTE *ppidl); -void __RPC_STUB IKnownFolder_GetIDList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IKnownFolder_GetFolderType_Proxy( - IKnownFolder* This, - FOLDERTYPEID *pftid); -void __RPC_STUB IKnownFolder_GetFolderType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IKnownFolder_GetRedirectionCapabilities_Proxy( - IKnownFolder* This, - KF_REDIRECTION_CAPABILITIES *pCapabilities); -void __RPC_STUB IKnownFolder_GetRedirectionCapabilities_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IKnownFolder_GetFolderDefinition_Proxy( - IKnownFolder* This, - KNOWNFOLDER_DEFINITION *pKFD); -void __RPC_STUB IKnownFolder_GetFolderDefinition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IKnownFolder_INTERFACE_DEFINED__ */ @@ -29697,64 +24873,64 @@ typedef struct IKnownFolderManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IKnownFolderManager* This, + IKnownFolderManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IKnownFolderManager* This); + IKnownFolderManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IKnownFolderManager* This); + IKnownFolderManager *This); /*** IKnownFolderManager methods ***/ HRESULT (STDMETHODCALLTYPE *FolderIdFromCsidl)( - IKnownFolderManager* This, + IKnownFolderManager *This, int nCsidl, KNOWNFOLDERID *pfid); HRESULT (STDMETHODCALLTYPE *FolderIdToCsidl)( - IKnownFolderManager* This, + IKnownFolderManager *This, REFKNOWNFOLDERID rfid, int *pnCsidl); HRESULT (STDMETHODCALLTYPE *GetFolderIds)( - IKnownFolderManager* This, + IKnownFolderManager *This, KNOWNFOLDERID **ppKFId, UINT *pCount); HRESULT (STDMETHODCALLTYPE *GetFolder)( - IKnownFolderManager* This, + IKnownFolderManager *This, REFKNOWNFOLDERID rfid, IKnownFolder **ppkf); HRESULT (STDMETHODCALLTYPE *GetFolderByName)( - IKnownFolderManager* This, + IKnownFolderManager *This, LPCWSTR pszCanonicalName, IKnownFolder **ppkf); HRESULT (STDMETHODCALLTYPE *RegisterFolder)( - IKnownFolderManager* This, + IKnownFolderManager *This, REFKNOWNFOLDERID rfid, const KNOWNFOLDER_DEFINITION *pKFD); HRESULT (STDMETHODCALLTYPE *UnregisterFolder)( - IKnownFolderManager* This, + IKnownFolderManager *This, REFKNOWNFOLDERID rfid); HRESULT (STDMETHODCALLTYPE *FindFolderFromPath)( - IKnownFolderManager* This, + IKnownFolderManager *This, LPCWSTR pszPath, FFFP_MODE mode, IKnownFolder **ppkf); HRESULT (STDMETHODCALLTYPE *FindFolderFromIDList)( - IKnownFolderManager* This, + IKnownFolderManager *This, PCIDLIST_ABSOLUTE pidl, IKnownFolder **ppkf); HRESULT (STDMETHODCALLTYPE *Redirect)( - IKnownFolderManager* This, + IKnownFolderManager *This, REFKNOWNFOLDERID rfid, HWND hwnd, KF_REDIRECT_FLAGS flags, @@ -29765,6 +24941,7 @@ typedef struct IKnownFolderManagerVtbl { END_INTERFACE } IKnownFolderManagerVtbl; + interface IKnownFolderManager { CONST_VTBL IKnownFolderManagerVtbl* lpVtbl; }; @@ -29833,87 +25010,6 @@ static FORCEINLINE HRESULT IKnownFolderManager_Redirect(IKnownFolderManager* Thi #endif -HRESULT STDMETHODCALLTYPE IKnownFolderManager_FolderIdFromCsidl_Proxy( - IKnownFolderManager* This, - int nCsidl, - KNOWNFOLDERID *pfid); -void __RPC_STUB IKnownFolderManager_FolderIdFromCsidl_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IKnownFolderManager_FolderIdToCsidl_Proxy( - IKnownFolderManager* This, - REFKNOWNFOLDERID rfid, - int *pnCsidl); -void __RPC_STUB IKnownFolderManager_FolderIdToCsidl_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IKnownFolderManager_GetFolderIds_Proxy( - IKnownFolderManager* This, - KNOWNFOLDERID **ppKFId, - UINT *pCount); -void __RPC_STUB IKnownFolderManager_GetFolderIds_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IKnownFolderManager_GetFolder_Proxy( - IKnownFolderManager* This, - REFKNOWNFOLDERID rfid, - IKnownFolder **ppkf); -void __RPC_STUB IKnownFolderManager_GetFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IKnownFolderManager_GetFolderByName_Proxy( - IKnownFolderManager* This, - LPCWSTR pszCanonicalName, - IKnownFolder **ppkf); -void __RPC_STUB IKnownFolderManager_GetFolderByName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IKnownFolderManager_RegisterFolder_Proxy( - IKnownFolderManager* This, - REFKNOWNFOLDERID rfid, - const KNOWNFOLDER_DEFINITION *pKFD); -void __RPC_STUB IKnownFolderManager_RegisterFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IKnownFolderManager_UnregisterFolder_Proxy( - IKnownFolderManager* This, - REFKNOWNFOLDERID rfid); -void __RPC_STUB IKnownFolderManager_UnregisterFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IKnownFolderManager_FindFolderFromPath_Proxy( - IKnownFolderManager* This, - LPCWSTR pszPath, - FFFP_MODE mode, - IKnownFolder **ppkf); -void __RPC_STUB IKnownFolderManager_FindFolderFromPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IKnownFolderManager_FindFolderFromIDList_Proxy( - IKnownFolderManager* This, - PCIDLIST_ABSOLUTE pidl, - IKnownFolder **ppkf); -void __RPC_STUB IKnownFolderManager_FindFolderFromIDList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE IKnownFolderManager_RemoteRedirect_Proxy( IKnownFolderManager* This, REFKNOWNFOLDERID rfid, @@ -30020,46 +25116,47 @@ typedef struct ISharingConfigurationManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISharingConfigurationManager* This, + ISharingConfigurationManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISharingConfigurationManager* This); + ISharingConfigurationManager *This); ULONG (STDMETHODCALLTYPE *Release)( - ISharingConfigurationManager* This); + ISharingConfigurationManager *This); /*** ISharingConfigurationManager methods ***/ HRESULT (STDMETHODCALLTYPE *CreateShare)( - ISharingConfigurationManager* This, + ISharingConfigurationManager *This, DEF_SHARE_ID dsid, SHARE_ROLE role); HRESULT (STDMETHODCALLTYPE *DeleteShare)( - ISharingConfigurationManager* This, + ISharingConfigurationManager *This, DEF_SHARE_ID dsid); HRESULT (STDMETHODCALLTYPE *ShareExists)( - ISharingConfigurationManager* This, + ISharingConfigurationManager *This, DEF_SHARE_ID dsid); HRESULT (STDMETHODCALLTYPE *GetSharePermissions)( - ISharingConfigurationManager* This, + ISharingConfigurationManager *This, DEF_SHARE_ID dsid, SHARE_ROLE *pRole); HRESULT (STDMETHODCALLTYPE *SharePrinters)( - ISharingConfigurationManager* This); + ISharingConfigurationManager *This); HRESULT (STDMETHODCALLTYPE *StopSharingPrinters)( - ISharingConfigurationManager* This); + ISharingConfigurationManager *This); HRESULT (STDMETHODCALLTYPE *ArePrintersShared)( - ISharingConfigurationManager* This); + ISharingConfigurationManager *This); END_INTERFACE } ISharingConfigurationManagerVtbl; + interface ISharingConfigurationManager { CONST_VTBL ISharingConfigurationManagerVtbl* lpVtbl; }; @@ -30116,61 +25213,6 @@ static FORCEINLINE HRESULT ISharingConfigurationManager_ArePrintersShared(IShari #endif -HRESULT STDMETHODCALLTYPE ISharingConfigurationManager_CreateShare_Proxy( - ISharingConfigurationManager* This, - DEF_SHARE_ID dsid, - SHARE_ROLE role); -void __RPC_STUB ISharingConfigurationManager_CreateShare_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISharingConfigurationManager_DeleteShare_Proxy( - ISharingConfigurationManager* This, - DEF_SHARE_ID dsid); -void __RPC_STUB ISharingConfigurationManager_DeleteShare_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISharingConfigurationManager_ShareExists_Proxy( - ISharingConfigurationManager* This, - DEF_SHARE_ID dsid); -void __RPC_STUB ISharingConfigurationManager_ShareExists_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISharingConfigurationManager_GetSharePermissions_Proxy( - ISharingConfigurationManager* This, - DEF_SHARE_ID dsid, - SHARE_ROLE *pRole); -void __RPC_STUB ISharingConfigurationManager_GetSharePermissions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISharingConfigurationManager_SharePrinters_Proxy( - ISharingConfigurationManager* This); -void __RPC_STUB ISharingConfigurationManager_SharePrinters_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISharingConfigurationManager_StopSharingPrinters_Proxy( - ISharingConfigurationManager* This); -void __RPC_STUB ISharingConfigurationManager_StopSharingPrinters_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISharingConfigurationManager_ArePrintersShared_Proxy( - ISharingConfigurationManager* This); -void __RPC_STUB ISharingConfigurationManager_ArePrintersShared_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISharingConfigurationManager_INTERFACE_DEFINED__ */ @@ -30202,25 +25244,26 @@ typedef struct IPreviousVersionsInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPreviousVersionsInfo* This, + IPreviousVersionsInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPreviousVersionsInfo* This); + IPreviousVersionsInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IPreviousVersionsInfo* This); + IPreviousVersionsInfo *This); /*** IPreviousVersionsInfo methods ***/ HRESULT (STDMETHODCALLTYPE *AreSnapshotsAvailable)( - IPreviousVersionsInfo* This, + IPreviousVersionsInfo *This, LPCWSTR pszPath, WINBOOL fOkToBeSlow, WINBOOL *pfAvailable); END_INTERFACE } IPreviousVersionsInfoVtbl; + interface IPreviousVersionsInfo { CONST_VTBL IPreviousVersionsInfoVtbl* lpVtbl; }; @@ -30253,16 +25296,6 @@ static FORCEINLINE HRESULT IPreviousVersionsInfo_AreSnapshotsAvailable(IPrevious #endif -HRESULT STDMETHODCALLTYPE IPreviousVersionsInfo_AreSnapshotsAvailable_Proxy( - IPreviousVersionsInfo* This, - LPCWSTR pszPath, - WINBOOL fOkToBeSlow, - WINBOOL *pfAvailable); -void __RPC_STUB IPreviousVersionsInfo_AreSnapshotsAvailable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPreviousVersionsInfo_INTERFACE_DEFINED__ */ @@ -30295,27 +25328,28 @@ typedef struct IRelatedItemVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IRelatedItem* This, + IRelatedItem *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IRelatedItem* This); + IRelatedItem *This); ULONG (STDMETHODCALLTYPE *Release)( - IRelatedItem* This); + IRelatedItem *This); /*** IRelatedItem methods ***/ HRESULT (STDMETHODCALLTYPE *GetItemIDList)( - IRelatedItem* This, + IRelatedItem *This, PIDLIST_ABSOLUTE *ppidl); HRESULT (STDMETHODCALLTYPE *GetItem)( - IRelatedItem* This, + IRelatedItem *This, IShellItem **ppsi); END_INTERFACE } IRelatedItemVtbl; + interface IRelatedItem { CONST_VTBL IRelatedItemVtbl* lpVtbl; }; @@ -30352,22 +25386,6 @@ static FORCEINLINE HRESULT IRelatedItem_GetItem(IRelatedItem* This,IShellItem ** #endif -HRESULT STDMETHODCALLTYPE IRelatedItem_GetItemIDList_Proxy( - IRelatedItem* This, - PIDLIST_ABSOLUTE *ppidl); -void __RPC_STUB IRelatedItem_GetItemIDList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IRelatedItem_GetItem_Proxy( - IRelatedItem* This, - IShellItem **ppsi); -void __RPC_STUB IRelatedItem_GetItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IRelatedItem_INTERFACE_DEFINED__ */ @@ -30393,27 +25411,28 @@ typedef struct IIdentityNameVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IIdentityName* This, + IIdentityName *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IIdentityName* This); + IIdentityName *This); ULONG (STDMETHODCALLTYPE *Release)( - IIdentityName* This); + IIdentityName *This); /*** IRelatedItem methods ***/ HRESULT (STDMETHODCALLTYPE *GetItemIDList)( - IIdentityName* This, + IIdentityName *This, PIDLIST_ABSOLUTE *ppidl); HRESULT (STDMETHODCALLTYPE *GetItem)( - IIdentityName* This, + IIdentityName *This, IShellItem **ppsi); END_INTERFACE } IIdentityNameVtbl; + interface IIdentityName { CONST_VTBL IIdentityNameVtbl* lpVtbl; }; @@ -30475,27 +25494,28 @@ typedef struct IDelegateItemVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDelegateItem* This, + IDelegateItem *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDelegateItem* This); + IDelegateItem *This); ULONG (STDMETHODCALLTYPE *Release)( - IDelegateItem* This); + IDelegateItem *This); /*** IRelatedItem methods ***/ HRESULT (STDMETHODCALLTYPE *GetItemIDList)( - IDelegateItem* This, + IDelegateItem *This, PIDLIST_ABSOLUTE *ppidl); HRESULT (STDMETHODCALLTYPE *GetItem)( - IDelegateItem* This, + IDelegateItem *This, IShellItem **ppsi); END_INTERFACE } IDelegateItemVtbl; + interface IDelegateItem { CONST_VTBL IDelegateItemVtbl* lpVtbl; }; @@ -30557,27 +25577,28 @@ typedef struct ICurrentItemVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICurrentItem* This, + ICurrentItem *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICurrentItem* This); + ICurrentItem *This); ULONG (STDMETHODCALLTYPE *Release)( - ICurrentItem* This); + ICurrentItem *This); /*** IRelatedItem methods ***/ HRESULT (STDMETHODCALLTYPE *GetItemIDList)( - ICurrentItem* This, + ICurrentItem *This, PIDLIST_ABSOLUTE *ppidl); HRESULT (STDMETHODCALLTYPE *GetItem)( - ICurrentItem* This, + ICurrentItem *This, IShellItem **ppsi); END_INTERFACE } ICurrentItemVtbl; + interface ICurrentItem { CONST_VTBL ICurrentItemVtbl* lpVtbl; }; @@ -30639,27 +25660,28 @@ typedef struct ITransferMediumItemVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITransferMediumItem* This, + ITransferMediumItem *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITransferMediumItem* This); + ITransferMediumItem *This); ULONG (STDMETHODCALLTYPE *Release)( - ITransferMediumItem* This); + ITransferMediumItem *This); /*** IRelatedItem methods ***/ HRESULT (STDMETHODCALLTYPE *GetItemIDList)( - ITransferMediumItem* This, + ITransferMediumItem *This, PIDLIST_ABSOLUTE *ppidl); HRESULT (STDMETHODCALLTYPE *GetItem)( - ITransferMediumItem* This, + ITransferMediumItem *This, IShellItem **ppsi); END_INTERFACE } ITransferMediumItemVtbl; + interface ITransferMediumItem { CONST_VTBL ITransferMediumItemVtbl* lpVtbl; }; @@ -30721,27 +25743,28 @@ typedef struct IUseToBrowseItemVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IUseToBrowseItem* This, + IUseToBrowseItem *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IUseToBrowseItem* This); + IUseToBrowseItem *This); ULONG (STDMETHODCALLTYPE *Release)( - IUseToBrowseItem* This); + IUseToBrowseItem *This); /*** IRelatedItem methods ***/ HRESULT (STDMETHODCALLTYPE *GetItemIDList)( - IUseToBrowseItem* This, + IUseToBrowseItem *This, PIDLIST_ABSOLUTE *ppidl); HRESULT (STDMETHODCALLTYPE *GetItem)( - IUseToBrowseItem* This, + IUseToBrowseItem *This, IShellItem **ppsi); END_INTERFACE } IUseToBrowseItemVtbl; + interface IUseToBrowseItem { CONST_VTBL IUseToBrowseItemVtbl* lpVtbl; }; @@ -30803,27 +25826,28 @@ typedef struct IDisplayItemVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDisplayItem* This, + IDisplayItem *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDisplayItem* This); + IDisplayItem *This); ULONG (STDMETHODCALLTYPE *Release)( - IDisplayItem* This); + IDisplayItem *This); /*** IRelatedItem methods ***/ HRESULT (STDMETHODCALLTYPE *GetItemIDList)( - IDisplayItem* This, + IDisplayItem *This, PIDLIST_ABSOLUTE *ppidl); HRESULT (STDMETHODCALLTYPE *GetItem)( - IDisplayItem* This, + IDisplayItem *This, IShellItem **ppsi); END_INTERFACE } IDisplayItemVtbl; + interface IDisplayItem { CONST_VTBL IDisplayItemVtbl* lpVtbl; }; @@ -30885,27 +25909,28 @@ typedef struct IViewStateIdentityItemVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IViewStateIdentityItem* This, + IViewStateIdentityItem *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IViewStateIdentityItem* This); + IViewStateIdentityItem *This); ULONG (STDMETHODCALLTYPE *Release)( - IViewStateIdentityItem* This); + IViewStateIdentityItem *This); /*** IRelatedItem methods ***/ HRESULT (STDMETHODCALLTYPE *GetItemIDList)( - IViewStateIdentityItem* This, + IViewStateIdentityItem *This, PIDLIST_ABSOLUTE *ppidl); HRESULT (STDMETHODCALLTYPE *GetItem)( - IViewStateIdentityItem* This, + IViewStateIdentityItem *This, IShellItem **ppsi); END_INTERFACE } IViewStateIdentityItemVtbl; + interface IViewStateIdentityItem { CONST_VTBL IViewStateIdentityItemVtbl* lpVtbl; }; @@ -30967,27 +25992,28 @@ typedef struct IPreviewItemVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPreviewItem* This, + IPreviewItem *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPreviewItem* This); + IPreviewItem *This); ULONG (STDMETHODCALLTYPE *Release)( - IPreviewItem* This); + IPreviewItem *This); /*** IRelatedItem methods ***/ HRESULT (STDMETHODCALLTYPE *GetItemIDList)( - IPreviewItem* This, + IPreviewItem *This, PIDLIST_ABSOLUTE *ppidl); HRESULT (STDMETHODCALLTYPE *GetItem)( - IPreviewItem* This, + IPreviewItem *This, IShellItem **ppsi); END_INTERFACE } IPreviewItemVtbl; + interface IPreviewItem { CONST_VTBL IPreviewItemVtbl* lpVtbl; }; @@ -31053,23 +26079,24 @@ typedef struct IDestinationStreamFactoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDestinationStreamFactory* This, + IDestinationStreamFactory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDestinationStreamFactory* This); + IDestinationStreamFactory *This); ULONG (STDMETHODCALLTYPE *Release)( - IDestinationStreamFactory* This); + IDestinationStreamFactory *This); /*** IDestinationStreamFactory methods ***/ HRESULT (STDMETHODCALLTYPE *GetDestinationStream)( - IDestinationStreamFactory* This, + IDestinationStreamFactory *This, IStream **ppstm); END_INTERFACE } IDestinationStreamFactoryVtbl; + interface IDestinationStreamFactory { CONST_VTBL IDestinationStreamFactoryVtbl* lpVtbl; }; @@ -31102,14 +26129,6 @@ static FORCEINLINE HRESULT IDestinationStreamFactory_GetDestinationStream(IDesti #endif -HRESULT STDMETHODCALLTYPE IDestinationStreamFactory_GetDestinationStream_Proxy( - IDestinationStreamFactory* This, - IStream **ppstm); -void __RPC_STUB IDestinationStreamFactory_GetDestinationStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDestinationStreamFactory_INTERFACE_DEFINED__ */ @@ -31120,7 +26139,6 @@ enum _NMCII_FLAGS { NMCII_FOLDERS = 0x2 }; - typedef int NMCII_FLAGS; enum _NMCSAEI_FLAGS { @@ -31128,7 +26146,6 @@ enum _NMCSAEI_FLAGS { NMCSAEI_EDIT = 0x1 }; - typedef int NMCSAEI_FLAGS; /***************************************************************************** @@ -31159,28 +26176,29 @@ typedef struct INewMenuClientVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INewMenuClient* This, + INewMenuClient *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INewMenuClient* This); + INewMenuClient *This); ULONG (STDMETHODCALLTYPE *Release)( - INewMenuClient* This); + INewMenuClient *This); /*** INewMenuClient methods ***/ HRESULT (STDMETHODCALLTYPE *IncludeItems)( - INewMenuClient* This, + INewMenuClient *This, NMCII_FLAGS *pflags); HRESULT (STDMETHODCALLTYPE *SelectAndEditItem)( - INewMenuClient* This, + INewMenuClient *This, PCIDLIST_ABSOLUTE pidlItem, NMCSAEI_FLAGS flags); END_INTERFACE } INewMenuClientVtbl; + interface INewMenuClient { CONST_VTBL INewMenuClientVtbl* lpVtbl; }; @@ -31217,23 +26235,6 @@ static FORCEINLINE HRESULT INewMenuClient_SelectAndEditItem(INewMenuClient* This #endif -HRESULT STDMETHODCALLTYPE INewMenuClient_IncludeItems_Proxy( - INewMenuClient* This, - NMCII_FLAGS *pflags); -void __RPC_STUB INewMenuClient_IncludeItems_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INewMenuClient_SelectAndEditItem_Proxy( - INewMenuClient* This, - PCIDLIST_ABSOLUTE pidlItem, - NMCSAEI_FLAGS flags); -void __RPC_STUB INewMenuClient_SelectAndEditItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INewMenuClient_INTERFACE_DEFINED__ */ @@ -31267,23 +26268,24 @@ typedef struct IInitializeWithBindCtxVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInitializeWithBindCtx* This, + IInitializeWithBindCtx *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInitializeWithBindCtx* This); + IInitializeWithBindCtx *This); ULONG (STDMETHODCALLTYPE *Release)( - IInitializeWithBindCtx* This); + IInitializeWithBindCtx *This); /*** IInitializeWithBindCtx methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IInitializeWithBindCtx* This, + IInitializeWithBindCtx *This, IBindCtx *pbc); END_INTERFACE } IInitializeWithBindCtxVtbl; + interface IInitializeWithBindCtx { CONST_VTBL IInitializeWithBindCtxVtbl* lpVtbl; }; @@ -31316,14 +26318,6 @@ static FORCEINLINE HRESULT IInitializeWithBindCtx_Initialize(IInitializeWithBind #endif -HRESULT STDMETHODCALLTYPE IInitializeWithBindCtx_Initialize_Proxy( - IInitializeWithBindCtx* This, - IBindCtx *pbc); -void __RPC_STUB IInitializeWithBindCtx_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInitializeWithBindCtx_INTERFACE_DEFINED__ */ @@ -31356,28 +26350,29 @@ typedef struct IShellItemFilterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellItemFilter* This, + IShellItemFilter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellItemFilter* This); + IShellItemFilter *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellItemFilter* This); + IShellItemFilter *This); /*** IShellItemFilter methods ***/ HRESULT (STDMETHODCALLTYPE *IncludeItem)( - IShellItemFilter* This, + IShellItemFilter *This, IShellItem *psi); HRESULT (STDMETHODCALLTYPE *GetEnumFlagsForItem)( - IShellItemFilter* This, + IShellItemFilter *This, IShellItem *psi, SHCONTF *pgrfFlags); END_INTERFACE } IShellItemFilterVtbl; + interface IShellItemFilter { CONST_VTBL IShellItemFilterVtbl* lpVtbl; }; @@ -31414,23 +26409,6 @@ static FORCEINLINE HRESULT IShellItemFilter_GetEnumFlagsForItem(IShellItemFilter #endif -HRESULT STDMETHODCALLTYPE IShellItemFilter_IncludeItem_Proxy( - IShellItemFilter* This, - IShellItem *psi); -void __RPC_STUB IShellItemFilter_IncludeItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellItemFilter_GetEnumFlagsForItem_Proxy( - IShellItemFilter* This, - IShellItem *psi, - SHCONTF *pgrfFlags); -void __RPC_STUB IShellItemFilter_GetEnumFlagsForItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellItemFilter_INTERFACE_DEFINED__ */ @@ -31475,7 +26453,6 @@ enum _NSTCSTYLE { NSTCS_SHOWREFRESHBUTTON = (int)0x80000000 }; - typedef DWORD NSTCSTYLE; enum _NSTCROOTSTYLE { @@ -31484,7 +26461,6 @@ enum _NSTCROOTSTYLE { NSTCRS_EXPANDED = 0x2 }; - typedef DWORD NSTCROOTSTYLE; enum _NSTCITEMSTATE { @@ -31496,7 +26472,6 @@ enum _NSTCITEMSTATE { NSTCIS_SELECTEDNOEXPAND = 0x10 }; - typedef DWORD NSTCITEMSTATE; typedef enum NSTCGNI { @@ -31602,41 +26577,41 @@ typedef struct INameSpaceTreeControlVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INameSpaceTreeControl* This, + INameSpaceTreeControl *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INameSpaceTreeControl* This); + INameSpaceTreeControl *This); ULONG (STDMETHODCALLTYPE *Release)( - INameSpaceTreeControl* This); + INameSpaceTreeControl *This); /*** INameSpaceTreeControl methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - INameSpaceTreeControl* This, + INameSpaceTreeControl *This, HWND hwndParent, RECT *prc, NSTCSTYLE nsctsFlags); HRESULT (STDMETHODCALLTYPE *TreeAdvise)( - INameSpaceTreeControl* This, + INameSpaceTreeControl *This, IUnknown *punk, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *TreeUnadvise)( - INameSpaceTreeControl* This, + INameSpaceTreeControl *This, DWORD dwCookie); HRESULT (STDMETHODCALLTYPE *AppendRoot)( - INameSpaceTreeControl* This, + INameSpaceTreeControl *This, IShellItem *psiRoot, SHCONTF grfEnumFlags, NSTCROOTSTYLE grfRootStyle, IShellItemFilter *pif); HRESULT (STDMETHODCALLTYPE *InsertRoot)( - INameSpaceTreeControl* This, + INameSpaceTreeControl *This, int iIndex, IShellItem *psiRoot, SHCONTF grfEnumFlags, @@ -31644,71 +26619,72 @@ typedef struct INameSpaceTreeControlVtbl { IShellItemFilter *pif); HRESULT (STDMETHODCALLTYPE *RemoveRoot)( - INameSpaceTreeControl* This, + INameSpaceTreeControl *This, IShellItem *psiRoot); HRESULT (STDMETHODCALLTYPE *RemoveAllRoots)( - INameSpaceTreeControl* This); + INameSpaceTreeControl *This); HRESULT (STDMETHODCALLTYPE *GetRootItems)( - INameSpaceTreeControl* This, + INameSpaceTreeControl *This, IShellItemArray **ppsiaRootItems); HRESULT (STDMETHODCALLTYPE *SetItemState)( - INameSpaceTreeControl* This, + INameSpaceTreeControl *This, IShellItem *psi, NSTCITEMSTATE nstcisMask, NSTCITEMSTATE nstcisFlags); HRESULT (STDMETHODCALLTYPE *GetItemState)( - INameSpaceTreeControl* This, + INameSpaceTreeControl *This, IShellItem *psi, NSTCITEMSTATE nstcisMask, NSTCITEMSTATE *pnstcisFlags); HRESULT (STDMETHODCALLTYPE *GetSelectedItems)( - INameSpaceTreeControl* This, + INameSpaceTreeControl *This, IShellItemArray **psiaItems); HRESULT (STDMETHODCALLTYPE *GetItemCustomState)( - INameSpaceTreeControl* This, + INameSpaceTreeControl *This, IShellItem *psi, int *piStateNumber); HRESULT (STDMETHODCALLTYPE *SetItemCustomState)( - INameSpaceTreeControl* This, + INameSpaceTreeControl *This, IShellItem *psi, int iStateNumber); HRESULT (STDMETHODCALLTYPE *EnsureItemVisible)( - INameSpaceTreeControl* This, + INameSpaceTreeControl *This, IShellItem *psi); HRESULT (STDMETHODCALLTYPE *SetTheme)( - INameSpaceTreeControl* This, + INameSpaceTreeControl *This, LPCWSTR pszTheme); HRESULT (STDMETHODCALLTYPE *GetNextItem)( - INameSpaceTreeControl* This, + INameSpaceTreeControl *This, IShellItem *psi, NSTCGNI nstcgi, IShellItem **ppsiNext); HRESULT (STDMETHODCALLTYPE *HitTest)( - INameSpaceTreeControl* This, + INameSpaceTreeControl *This, POINT *ppt, IShellItem **ppsiOut); HRESULT (STDMETHODCALLTYPE *GetItemRect)( - INameSpaceTreeControl* This, + INameSpaceTreeControl *This, IShellItem *psi, RECT *prect); HRESULT (STDMETHODCALLTYPE *CollapseAll)( - INameSpaceTreeControl* This); + INameSpaceTreeControl *This); END_INTERFACE } INameSpaceTreeControlVtbl; + interface INameSpaceTreeControl { CONST_VTBL INameSpaceTreeControlVtbl* lpVtbl; }; @@ -31813,176 +26789,6 @@ static FORCEINLINE HRESULT INameSpaceTreeControl_CollapseAll(INameSpaceTreeContr #endif -HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_Initialize_Proxy( - INameSpaceTreeControl* This, - HWND hwndParent, - RECT *prc, - NSTCSTYLE nsctsFlags); -void __RPC_STUB INameSpaceTreeControl_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_TreeAdvise_Proxy( - INameSpaceTreeControl* This, - IUnknown *punk, - DWORD *pdwCookie); -void __RPC_STUB INameSpaceTreeControl_TreeAdvise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_TreeUnadvise_Proxy( - INameSpaceTreeControl* This, - DWORD dwCookie); -void __RPC_STUB INameSpaceTreeControl_TreeUnadvise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_AppendRoot_Proxy( - INameSpaceTreeControl* This, - IShellItem *psiRoot, - SHCONTF grfEnumFlags, - NSTCROOTSTYLE grfRootStyle, - IShellItemFilter *pif); -void __RPC_STUB INameSpaceTreeControl_AppendRoot_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_InsertRoot_Proxy( - INameSpaceTreeControl* This, - int iIndex, - IShellItem *psiRoot, - SHCONTF grfEnumFlags, - NSTCROOTSTYLE grfRootStyle, - IShellItemFilter *pif); -void __RPC_STUB INameSpaceTreeControl_InsertRoot_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_RemoveRoot_Proxy( - INameSpaceTreeControl* This, - IShellItem *psiRoot); -void __RPC_STUB INameSpaceTreeControl_RemoveRoot_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_RemoveAllRoots_Proxy( - INameSpaceTreeControl* This); -void __RPC_STUB INameSpaceTreeControl_RemoveAllRoots_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_GetRootItems_Proxy( - INameSpaceTreeControl* This, - IShellItemArray **ppsiaRootItems); -void __RPC_STUB INameSpaceTreeControl_GetRootItems_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_SetItemState_Proxy( - INameSpaceTreeControl* This, - IShellItem *psi, - NSTCITEMSTATE nstcisMask, - NSTCITEMSTATE nstcisFlags); -void __RPC_STUB INameSpaceTreeControl_SetItemState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_GetItemState_Proxy( - INameSpaceTreeControl* This, - IShellItem *psi, - NSTCITEMSTATE nstcisMask, - NSTCITEMSTATE *pnstcisFlags); -void __RPC_STUB INameSpaceTreeControl_GetItemState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_GetSelectedItems_Proxy( - INameSpaceTreeControl* This, - IShellItemArray **psiaItems); -void __RPC_STUB INameSpaceTreeControl_GetSelectedItems_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_GetItemCustomState_Proxy( - INameSpaceTreeControl* This, - IShellItem *psi, - int *piStateNumber); -void __RPC_STUB INameSpaceTreeControl_GetItemCustomState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_SetItemCustomState_Proxy( - INameSpaceTreeControl* This, - IShellItem *psi, - int iStateNumber); -void __RPC_STUB INameSpaceTreeControl_SetItemCustomState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_EnsureItemVisible_Proxy( - INameSpaceTreeControl* This, - IShellItem *psi); -void __RPC_STUB INameSpaceTreeControl_EnsureItemVisible_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_SetTheme_Proxy( - INameSpaceTreeControl* This, - LPCWSTR pszTheme); -void __RPC_STUB INameSpaceTreeControl_SetTheme_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_GetNextItem_Proxy( - INameSpaceTreeControl* This, - IShellItem *psi, - NSTCGNI nstcgi, - IShellItem **ppsiNext); -void __RPC_STUB INameSpaceTreeControl_GetNextItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_HitTest_Proxy( - INameSpaceTreeControl* This, - POINT *ppt, - IShellItem **ppsiOut); -void __RPC_STUB INameSpaceTreeControl_HitTest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_GetItemRect_Proxy( - INameSpaceTreeControl* This, - IShellItem *psi, - RECT *prect); -void __RPC_STUB INameSpaceTreeControl_GetItemRect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_CollapseAll_Proxy( - INameSpaceTreeControl* This); -void __RPC_STUB INameSpaceTreeControl_CollapseAll_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INameSpaceTreeControl_INTERFACE_DEFINED__ */ @@ -32036,41 +26842,41 @@ typedef struct INameSpaceTreeControl2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INameSpaceTreeControl2* This, + INameSpaceTreeControl2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INameSpaceTreeControl2* This); + INameSpaceTreeControl2 *This); ULONG (STDMETHODCALLTYPE *Release)( - INameSpaceTreeControl2* This); + INameSpaceTreeControl2 *This); /*** INameSpaceTreeControl methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - INameSpaceTreeControl2* This, + INameSpaceTreeControl2 *This, HWND hwndParent, RECT *prc, NSTCSTYLE nsctsFlags); HRESULT (STDMETHODCALLTYPE *TreeAdvise)( - INameSpaceTreeControl2* This, + INameSpaceTreeControl2 *This, IUnknown *punk, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *TreeUnadvise)( - INameSpaceTreeControl2* This, + INameSpaceTreeControl2 *This, DWORD dwCookie); HRESULT (STDMETHODCALLTYPE *AppendRoot)( - INameSpaceTreeControl2* This, + INameSpaceTreeControl2 *This, IShellItem *psiRoot, SHCONTF grfEnumFlags, NSTCROOTSTYLE grfRootStyle, IShellItemFilter *pif); HRESULT (STDMETHODCALLTYPE *InsertRoot)( - INameSpaceTreeControl2* This, + INameSpaceTreeControl2 *This, int iIndex, IShellItem *psiRoot, SHCONTF grfEnumFlags, @@ -32078,92 +26884,93 @@ typedef struct INameSpaceTreeControl2Vtbl { IShellItemFilter *pif); HRESULT (STDMETHODCALLTYPE *RemoveRoot)( - INameSpaceTreeControl2* This, + INameSpaceTreeControl2 *This, IShellItem *psiRoot); HRESULT (STDMETHODCALLTYPE *RemoveAllRoots)( - INameSpaceTreeControl2* This); + INameSpaceTreeControl2 *This); HRESULT (STDMETHODCALLTYPE *GetRootItems)( - INameSpaceTreeControl2* This, + INameSpaceTreeControl2 *This, IShellItemArray **ppsiaRootItems); HRESULT (STDMETHODCALLTYPE *SetItemState)( - INameSpaceTreeControl2* This, + INameSpaceTreeControl2 *This, IShellItem *psi, NSTCITEMSTATE nstcisMask, NSTCITEMSTATE nstcisFlags); HRESULT (STDMETHODCALLTYPE *GetItemState)( - INameSpaceTreeControl2* This, + INameSpaceTreeControl2 *This, IShellItem *psi, NSTCITEMSTATE nstcisMask, NSTCITEMSTATE *pnstcisFlags); HRESULT (STDMETHODCALLTYPE *GetSelectedItems)( - INameSpaceTreeControl2* This, + INameSpaceTreeControl2 *This, IShellItemArray **psiaItems); HRESULT (STDMETHODCALLTYPE *GetItemCustomState)( - INameSpaceTreeControl2* This, + INameSpaceTreeControl2 *This, IShellItem *psi, int *piStateNumber); HRESULT (STDMETHODCALLTYPE *SetItemCustomState)( - INameSpaceTreeControl2* This, + INameSpaceTreeControl2 *This, IShellItem *psi, int iStateNumber); HRESULT (STDMETHODCALLTYPE *EnsureItemVisible)( - INameSpaceTreeControl2* This, + INameSpaceTreeControl2 *This, IShellItem *psi); HRESULT (STDMETHODCALLTYPE *SetTheme)( - INameSpaceTreeControl2* This, + INameSpaceTreeControl2 *This, LPCWSTR pszTheme); HRESULT (STDMETHODCALLTYPE *GetNextItem)( - INameSpaceTreeControl2* This, + INameSpaceTreeControl2 *This, IShellItem *psi, NSTCGNI nstcgi, IShellItem **ppsiNext); HRESULT (STDMETHODCALLTYPE *HitTest)( - INameSpaceTreeControl2* This, + INameSpaceTreeControl2 *This, POINT *ppt, IShellItem **ppsiOut); HRESULT (STDMETHODCALLTYPE *GetItemRect)( - INameSpaceTreeControl2* This, + INameSpaceTreeControl2 *This, IShellItem *psi, RECT *prect); HRESULT (STDMETHODCALLTYPE *CollapseAll)( - INameSpaceTreeControl2* This); + INameSpaceTreeControl2 *This); /*** INameSpaceTreeControl2 methods ***/ HRESULT (STDMETHODCALLTYPE *SetControlStyle)( - INameSpaceTreeControl2* This, + INameSpaceTreeControl2 *This, NSTCSTYLE nstcsMask, NSTCSTYLE nstcsStyle); HRESULT (STDMETHODCALLTYPE *GetControlStyle)( - INameSpaceTreeControl2* This, + INameSpaceTreeControl2 *This, NSTCSTYLE nstcsMask, NSTCSTYLE *pnstcsStyle); HRESULT (STDMETHODCALLTYPE *SetControlStyle2)( - INameSpaceTreeControl2* This, + INameSpaceTreeControl2 *This, NSTCSTYLE2 nstcsMask, NSTCSTYLE2 nstcsStyle); HRESULT (STDMETHODCALLTYPE *GetControlStyle2)( - INameSpaceTreeControl2* This, + INameSpaceTreeControl2 *This, NSTCSTYLE2 nstcsMask, NSTCSTYLE2 *pnstcsStyle); END_INTERFACE } INameSpaceTreeControl2Vtbl; + interface INameSpaceTreeControl2 { CONST_VTBL INameSpaceTreeControl2Vtbl* lpVtbl; }; @@ -32286,42 +27093,6 @@ static FORCEINLINE HRESULT INameSpaceTreeControl2_GetControlStyle2(INameSpaceTre #endif -HRESULT STDMETHODCALLTYPE INameSpaceTreeControl2_SetControlStyle_Proxy( - INameSpaceTreeControl2* This, - NSTCSTYLE nstcsMask, - NSTCSTYLE nstcsStyle); -void __RPC_STUB INameSpaceTreeControl2_SetControlStyle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControl2_GetControlStyle_Proxy( - INameSpaceTreeControl2* This, - NSTCSTYLE nstcsMask, - NSTCSTYLE *pnstcsStyle); -void __RPC_STUB INameSpaceTreeControl2_GetControlStyle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControl2_SetControlStyle2_Proxy( - INameSpaceTreeControl2* This, - NSTCSTYLE2 nstcsMask, - NSTCSTYLE2 nstcsStyle); -void __RPC_STUB INameSpaceTreeControl2_SetControlStyle2_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControl2_GetControlStyle2_Proxy( - INameSpaceTreeControl2* This, - NSTCSTYLE2 nstcsMask, - NSTCSTYLE2 *pnstcsStyle); -void __RPC_STUB INameSpaceTreeControl2_GetControlStyle2_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INameSpaceTreeControl2_INTERFACE_DEFINED__ */ @@ -32352,7 +27123,6 @@ enum _NSTCEHITTEST { NSTCEHT_ONITEMTABBUTTON = 0x1000 }; - typedef DWORD NSTCEHITTEST; enum _NSTCECLICKTYPE { @@ -32363,7 +27133,6 @@ enum _NSTCECLICKTYPE { NSTCECT_DBLCLICK = 0x4 }; - typedef DWORD NSTCECLICKTYPE; DEFINE_GUID(IID_INameSpaceTreeControlEvents, 0x93d77985, 0xb3d8, 0x4484, 0x83,0x18, 0x67,0x2c,0xdd,0xa0,0x02,0xce); @@ -32454,110 +27223,111 @@ typedef struct INameSpaceTreeControlEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INameSpaceTreeControlEvents* This, + INameSpaceTreeControlEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INameSpaceTreeControlEvents* This); + INameSpaceTreeControlEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - INameSpaceTreeControlEvents* This); + INameSpaceTreeControlEvents *This); /*** INameSpaceTreeControlEvents methods ***/ HRESULT (STDMETHODCALLTYPE *OnItemClick)( - INameSpaceTreeControlEvents* This, + INameSpaceTreeControlEvents *This, IShellItem *psi, NSTCEHITTEST nstceHitTest, NSTCECLICKTYPE nstceClickType); HRESULT (STDMETHODCALLTYPE *OnPropertyItemCommit)( - INameSpaceTreeControlEvents* This, + INameSpaceTreeControlEvents *This, IShellItem *psi); HRESULT (STDMETHODCALLTYPE *OnItemStateChanging)( - INameSpaceTreeControlEvents* This, + INameSpaceTreeControlEvents *This, IShellItem *psi, NSTCITEMSTATE nstcisMask, NSTCITEMSTATE nstcisState); HRESULT (STDMETHODCALLTYPE *OnItemStateChanged)( - INameSpaceTreeControlEvents* This, + INameSpaceTreeControlEvents *This, IShellItem *psi, NSTCITEMSTATE nstcisMask, NSTCITEMSTATE nstcisState); HRESULT (STDMETHODCALLTYPE *OnSelectionChanged)( - INameSpaceTreeControlEvents* This, + INameSpaceTreeControlEvents *This, IShellItemArray *psiaSelection); HRESULT (STDMETHODCALLTYPE *OnKeyboardInput)( - INameSpaceTreeControlEvents* This, + INameSpaceTreeControlEvents *This, UINT uMsg, WPARAM wParam, LPARAM lParam); HRESULT (STDMETHODCALLTYPE *OnBeforeExpand)( - INameSpaceTreeControlEvents* This, + INameSpaceTreeControlEvents *This, IShellItem *psi); HRESULT (STDMETHODCALLTYPE *OnAfterExpand)( - INameSpaceTreeControlEvents* This, + INameSpaceTreeControlEvents *This, IShellItem *psi); HRESULT (STDMETHODCALLTYPE *OnBeginLabelEdit)( - INameSpaceTreeControlEvents* This, + INameSpaceTreeControlEvents *This, IShellItem *psi); HRESULT (STDMETHODCALLTYPE *OnEndLabelEdit)( - INameSpaceTreeControlEvents* This, + INameSpaceTreeControlEvents *This, IShellItem *psi); HRESULT (STDMETHODCALLTYPE *OnGetToolTip)( - INameSpaceTreeControlEvents* This, + INameSpaceTreeControlEvents *This, IShellItem *psi, LPWSTR pszTip, int cchTip); HRESULT (STDMETHODCALLTYPE *OnBeforeItemDelete)( - INameSpaceTreeControlEvents* This, + INameSpaceTreeControlEvents *This, IShellItem *psi); HRESULT (STDMETHODCALLTYPE *OnItemAdded)( - INameSpaceTreeControlEvents* This, + INameSpaceTreeControlEvents *This, IShellItem *psi, WINBOOL fIsRoot); HRESULT (STDMETHODCALLTYPE *OnItemDeleted)( - INameSpaceTreeControlEvents* This, + INameSpaceTreeControlEvents *This, IShellItem *psi, WINBOOL fIsRoot); HRESULT (STDMETHODCALLTYPE *OnBeforeContextMenu)( - INameSpaceTreeControlEvents* This, + INameSpaceTreeControlEvents *This, IShellItem *psi, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *OnAfterContextMenu)( - INameSpaceTreeControlEvents* This, + INameSpaceTreeControlEvents *This, IShellItem *psi, IContextMenu *pcmIn, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *OnBeforeStateImageChange)( - INameSpaceTreeControlEvents* This, + INameSpaceTreeControlEvents *This, IShellItem *psi); HRESULT (STDMETHODCALLTYPE *OnGetDefaultIconIndex)( - INameSpaceTreeControlEvents* This, + INameSpaceTreeControlEvents *This, IShellItem *psi, int *piDefaultIcon, int *piOpenIcon); END_INTERFACE } INameSpaceTreeControlEventsVtbl; + interface INameSpaceTreeControlEvents { CONST_VTBL INameSpaceTreeControlEventsVtbl* lpVtbl; }; @@ -32658,169 +27428,6 @@ static FORCEINLINE HRESULT INameSpaceTreeControlEvents_OnGetDefaultIconIndex(INa #endif -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnItemClick_Proxy( - INameSpaceTreeControlEvents* This, - IShellItem *psi, - NSTCEHITTEST nstceHitTest, - NSTCECLICKTYPE nstceClickType); -void __RPC_STUB INameSpaceTreeControlEvents_OnItemClick_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnPropertyItemCommit_Proxy( - INameSpaceTreeControlEvents* This, - IShellItem *psi); -void __RPC_STUB INameSpaceTreeControlEvents_OnPropertyItemCommit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnItemStateChanging_Proxy( - INameSpaceTreeControlEvents* This, - IShellItem *psi, - NSTCITEMSTATE nstcisMask, - NSTCITEMSTATE nstcisState); -void __RPC_STUB INameSpaceTreeControlEvents_OnItemStateChanging_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnItemStateChanged_Proxy( - INameSpaceTreeControlEvents* This, - IShellItem *psi, - NSTCITEMSTATE nstcisMask, - NSTCITEMSTATE nstcisState); -void __RPC_STUB INameSpaceTreeControlEvents_OnItemStateChanged_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnSelectionChanged_Proxy( - INameSpaceTreeControlEvents* This, - IShellItemArray *psiaSelection); -void __RPC_STUB INameSpaceTreeControlEvents_OnSelectionChanged_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnKeyboardInput_Proxy( - INameSpaceTreeControlEvents* This, - UINT uMsg, - WPARAM wParam, - LPARAM lParam); -void __RPC_STUB INameSpaceTreeControlEvents_OnKeyboardInput_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnBeforeExpand_Proxy( - INameSpaceTreeControlEvents* This, - IShellItem *psi); -void __RPC_STUB INameSpaceTreeControlEvents_OnBeforeExpand_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnAfterExpand_Proxy( - INameSpaceTreeControlEvents* This, - IShellItem *psi); -void __RPC_STUB INameSpaceTreeControlEvents_OnAfterExpand_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnBeginLabelEdit_Proxy( - INameSpaceTreeControlEvents* This, - IShellItem *psi); -void __RPC_STUB INameSpaceTreeControlEvents_OnBeginLabelEdit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnEndLabelEdit_Proxy( - INameSpaceTreeControlEvents* This, - IShellItem *psi); -void __RPC_STUB INameSpaceTreeControlEvents_OnEndLabelEdit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnGetToolTip_Proxy( - INameSpaceTreeControlEvents* This, - IShellItem *psi, - LPWSTR pszTip, - int cchTip); -void __RPC_STUB INameSpaceTreeControlEvents_OnGetToolTip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnBeforeItemDelete_Proxy( - INameSpaceTreeControlEvents* This, - IShellItem *psi); -void __RPC_STUB INameSpaceTreeControlEvents_OnBeforeItemDelete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnItemAdded_Proxy( - INameSpaceTreeControlEvents* This, - IShellItem *psi, - WINBOOL fIsRoot); -void __RPC_STUB INameSpaceTreeControlEvents_OnItemAdded_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnItemDeleted_Proxy( - INameSpaceTreeControlEvents* This, - IShellItem *psi, - WINBOOL fIsRoot); -void __RPC_STUB INameSpaceTreeControlEvents_OnItemDeleted_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnBeforeContextMenu_Proxy( - INameSpaceTreeControlEvents* This, - IShellItem *psi, - REFIID riid, - void **ppv); -void __RPC_STUB INameSpaceTreeControlEvents_OnBeforeContextMenu_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnAfterContextMenu_Proxy( - INameSpaceTreeControlEvents* This, - IShellItem *psi, - IContextMenu *pcmIn, - REFIID riid, - void **ppv); -void __RPC_STUB INameSpaceTreeControlEvents_OnAfterContextMenu_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnBeforeStateImageChange_Proxy( - INameSpaceTreeControlEvents* This, - IShellItem *psi); -void __RPC_STUB INameSpaceTreeControlEvents_OnBeforeStateImageChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnGetDefaultIconIndex_Proxy( - INameSpaceTreeControlEvents* This, - IShellItem *psi, - int *piDefaultIcon, - int *piOpenIcon); -void __RPC_STUB INameSpaceTreeControlEvents_OnGetDefaultIconIndex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INameSpaceTreeControlEvents_INTERFACE_DEFINED__ */ @@ -32883,19 +27490,19 @@ typedef struct INameSpaceTreeControlDropHandlerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INameSpaceTreeControlDropHandler* This, + INameSpaceTreeControlDropHandler *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INameSpaceTreeControlDropHandler* This); + INameSpaceTreeControlDropHandler *This); ULONG (STDMETHODCALLTYPE *Release)( - INameSpaceTreeControlDropHandler* This); + INameSpaceTreeControlDropHandler *This); /*** INameSpaceTreeControlDropHandler methods ***/ HRESULT (STDMETHODCALLTYPE *OnDragEnter)( - INameSpaceTreeControlDropHandler* This, + INameSpaceTreeControlDropHandler *This, IShellItem *psiOver, IShellItemArray *psiaData, WINBOOL fOutsideSource, @@ -32903,21 +27510,21 @@ typedef struct INameSpaceTreeControlDropHandlerVtbl { DWORD *pdwEffect); HRESULT (STDMETHODCALLTYPE *OnDragOver)( - INameSpaceTreeControlDropHandler* This, + INameSpaceTreeControlDropHandler *This, IShellItem *psiOver, IShellItemArray *psiaData, DWORD grfKeyState, DWORD *pdwEffect); HRESULT (STDMETHODCALLTYPE *OnDragPosition)( - INameSpaceTreeControlDropHandler* This, + INameSpaceTreeControlDropHandler *This, IShellItem *psiOver, IShellItemArray *psiaData, int iNewPosition, int iOldPosition); HRESULT (STDMETHODCALLTYPE *OnDrop)( - INameSpaceTreeControlDropHandler* This, + INameSpaceTreeControlDropHandler *This, IShellItem *psiOver, IShellItemArray *psiaData, int iPosition, @@ -32925,18 +27532,19 @@ typedef struct INameSpaceTreeControlDropHandlerVtbl { DWORD *pdwEffect); HRESULT (STDMETHODCALLTYPE *OnDropPosition)( - INameSpaceTreeControlDropHandler* This, + INameSpaceTreeControlDropHandler *This, IShellItem *psiOver, IShellItemArray *psiaData, int iNewPosition, int iOldPosition); HRESULT (STDMETHODCALLTYPE *OnDragLeave)( - INameSpaceTreeControlDropHandler* This, + INameSpaceTreeControlDropHandler *This, IShellItem *psiOver); END_INTERFACE } INameSpaceTreeControlDropHandlerVtbl; + interface INameSpaceTreeControlDropHandler { CONST_VTBL INameSpaceTreeControlDropHandlerVtbl* lpVtbl; }; @@ -32989,71 +27597,6 @@ static FORCEINLINE HRESULT INameSpaceTreeControlDropHandler_OnDragLeave(INameSpa #endif -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlDropHandler_OnDragEnter_Proxy( - INameSpaceTreeControlDropHandler* This, - IShellItem *psiOver, - IShellItemArray *psiaData, - WINBOOL fOutsideSource, - DWORD grfKeyState, - DWORD *pdwEffect); -void __RPC_STUB INameSpaceTreeControlDropHandler_OnDragEnter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlDropHandler_OnDragOver_Proxy( - INameSpaceTreeControlDropHandler* This, - IShellItem *psiOver, - IShellItemArray *psiaData, - DWORD grfKeyState, - DWORD *pdwEffect); -void __RPC_STUB INameSpaceTreeControlDropHandler_OnDragOver_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlDropHandler_OnDragPosition_Proxy( - INameSpaceTreeControlDropHandler* This, - IShellItem *psiOver, - IShellItemArray *psiaData, - int iNewPosition, - int iOldPosition); -void __RPC_STUB INameSpaceTreeControlDropHandler_OnDragPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlDropHandler_OnDrop_Proxy( - INameSpaceTreeControlDropHandler* This, - IShellItem *psiOver, - IShellItemArray *psiaData, - int iPosition, - DWORD grfKeyState, - DWORD *pdwEffect); -void __RPC_STUB INameSpaceTreeControlDropHandler_OnDrop_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlDropHandler_OnDropPosition_Proxy( - INameSpaceTreeControlDropHandler* This, - IShellItem *psiOver, - IShellItemArray *psiaData, - int iNewPosition, - int iOldPosition); -void __RPC_STUB INameSpaceTreeControlDropHandler_OnDropPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlDropHandler_OnDragLeave_Proxy( - INameSpaceTreeControlDropHandler* This, - IShellItem *psiOver); -void __RPC_STUB INameSpaceTreeControlDropHandler_OnDragLeave_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INameSpaceTreeControlDropHandler_INTERFACE_DEFINED__ */ @@ -33090,33 +27633,34 @@ typedef struct INameSpaceTreeAccessibleVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INameSpaceTreeAccessible* This, + INameSpaceTreeAccessible *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INameSpaceTreeAccessible* This); + INameSpaceTreeAccessible *This); ULONG (STDMETHODCALLTYPE *Release)( - INameSpaceTreeAccessible* This); + INameSpaceTreeAccessible *This); /*** INameSpaceTreeAccessible methods ***/ HRESULT (STDMETHODCALLTYPE *OnGetDefaultAccessibilityAction)( - INameSpaceTreeAccessible* This, + INameSpaceTreeAccessible *This, IShellItem *psi, BSTR *pbstrDefaultAction); HRESULT (STDMETHODCALLTYPE *OnDoDefaultAccessibilityAction)( - INameSpaceTreeAccessible* This, + INameSpaceTreeAccessible *This, IShellItem *psi); HRESULT (STDMETHODCALLTYPE *OnGetAccessibilityRole)( - INameSpaceTreeAccessible* This, + INameSpaceTreeAccessible *This, IShellItem *psi, VARIANT *pvarRole); END_INTERFACE } INameSpaceTreeAccessibleVtbl; + interface INameSpaceTreeAccessible { CONST_VTBL INameSpaceTreeAccessibleVtbl* lpVtbl; }; @@ -33157,32 +27701,6 @@ static FORCEINLINE HRESULT INameSpaceTreeAccessible_OnGetAccessibilityRole(IName #endif -HRESULT STDMETHODCALLTYPE INameSpaceTreeAccessible_OnGetDefaultAccessibilityAction_Proxy( - INameSpaceTreeAccessible* This, - IShellItem *psi, - BSTR *pbstrDefaultAction); -void __RPC_STUB INameSpaceTreeAccessible_OnGetDefaultAccessibilityAction_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeAccessible_OnDoDefaultAccessibilityAction_Proxy( - INameSpaceTreeAccessible* This, - IShellItem *psi); -void __RPC_STUB INameSpaceTreeAccessible_OnDoDefaultAccessibilityAction_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeAccessible_OnGetAccessibilityRole_Proxy( - INameSpaceTreeAccessible* This, - IShellItem *psi, - VARIANT *pvarRole); -void __RPC_STUB INameSpaceTreeAccessible_OnGetAccessibilityRole_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INameSpaceTreeAccessible_INTERFACE_DEFINED__ */ @@ -33241,30 +27759,30 @@ typedef struct INameSpaceTreeControlCustomDrawVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INameSpaceTreeControlCustomDraw* This, + INameSpaceTreeControlCustomDraw *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INameSpaceTreeControlCustomDraw* This); + INameSpaceTreeControlCustomDraw *This); ULONG (STDMETHODCALLTYPE *Release)( - INameSpaceTreeControlCustomDraw* This); + INameSpaceTreeControlCustomDraw *This); /*** INameSpaceTreeControlCustomDraw methods ***/ HRESULT (STDMETHODCALLTYPE *PrePaint)( - INameSpaceTreeControlCustomDraw* This, + INameSpaceTreeControlCustomDraw *This, HDC hdc, RECT *prc, LRESULT *plres); HRESULT (STDMETHODCALLTYPE *PostPaint)( - INameSpaceTreeControlCustomDraw* This, + INameSpaceTreeControlCustomDraw *This, HDC hdc, RECT *prc); HRESULT (STDMETHODCALLTYPE *ItemPrePaint)( - INameSpaceTreeControlCustomDraw* This, + INameSpaceTreeControlCustomDraw *This, HDC hdc, RECT *prc, NSTCCUSTOMDRAW *pnstccdItem, @@ -33273,13 +27791,14 @@ typedef struct INameSpaceTreeControlCustomDrawVtbl { LRESULT *plres); HRESULT (STDMETHODCALLTYPE *ItemPostPaint)( - INameSpaceTreeControlCustomDraw* This, + INameSpaceTreeControlCustomDraw *This, HDC hdc, RECT *prc, NSTCCUSTOMDRAW *pnstccdItem); END_INTERFACE } INameSpaceTreeControlCustomDrawVtbl; + interface INameSpaceTreeControlCustomDraw { CONST_VTBL INameSpaceTreeControlCustomDrawVtbl* lpVtbl; }; @@ -33324,48 +27843,6 @@ static FORCEINLINE HRESULT INameSpaceTreeControlCustomDraw_ItemPostPaint(INameSp #endif -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlCustomDraw_PrePaint_Proxy( - INameSpaceTreeControlCustomDraw* This, - HDC hdc, - RECT *prc, - LRESULT *plres); -void __RPC_STUB INameSpaceTreeControlCustomDraw_PrePaint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlCustomDraw_PostPaint_Proxy( - INameSpaceTreeControlCustomDraw* This, - HDC hdc, - RECT *prc); -void __RPC_STUB INameSpaceTreeControlCustomDraw_PostPaint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlCustomDraw_ItemPrePaint_Proxy( - INameSpaceTreeControlCustomDraw* This, - HDC hdc, - RECT *prc, - NSTCCUSTOMDRAW *pnstccdItem, - COLORREF *pclrText, - COLORREF *pclrTextBk, - LRESULT *plres); -void __RPC_STUB INameSpaceTreeControlCustomDraw_ItemPrePaint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlCustomDraw_ItemPostPaint_Proxy( - INameSpaceTreeControlCustomDraw* This, - HDC hdc, - RECT *prc, - NSTCCUSTOMDRAW *pnstccdItem); -void __RPC_STUB INameSpaceTreeControlCustomDraw_ItemPostPaint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INameSpaceTreeControlCustomDraw_INTERFACE_DEFINED__ */ @@ -33404,24 +27881,25 @@ typedef struct INameSpaceTreeControlFolderCapabilitiesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - INameSpaceTreeControlFolderCapabilities* This, + INameSpaceTreeControlFolderCapabilities *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - INameSpaceTreeControlFolderCapabilities* This); + INameSpaceTreeControlFolderCapabilities *This); ULONG (STDMETHODCALLTYPE *Release)( - INameSpaceTreeControlFolderCapabilities* This); + INameSpaceTreeControlFolderCapabilities *This); /*** INameSpaceTreeControlFolderCapabilities methods ***/ HRESULT (STDMETHODCALLTYPE *GetFolderCapabilities)( - INameSpaceTreeControlFolderCapabilities* This, + INameSpaceTreeControlFolderCapabilities *This, NSTCFOLDERCAPABILITIES nfcMask, NSTCFOLDERCAPABILITIES *pnfcValue); END_INTERFACE } INameSpaceTreeControlFolderCapabilitiesVtbl; + interface INameSpaceTreeControlFolderCapabilities { CONST_VTBL INameSpaceTreeControlFolderCapabilitiesVtbl* lpVtbl; }; @@ -33454,15 +27932,6 @@ static FORCEINLINE HRESULT INameSpaceTreeControlFolderCapabilities_GetFolderCapa #endif -HRESULT STDMETHODCALLTYPE INameSpaceTreeControlFolderCapabilities_GetFolderCapabilities_Proxy( - INameSpaceTreeControlFolderCapabilities* This, - NSTCFOLDERCAPABILITIES nfcMask, - NSTCFOLDERCAPABILITIES *pnfcValue); -void __RPC_STUB INameSpaceTreeControlFolderCapabilities_GetFolderCapabilities_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __INameSpaceTreeControlFolderCapabilities_INTERFACE_DEFINED__ */ @@ -33516,45 +27985,46 @@ typedef struct IPreviewHandlerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPreviewHandler* This, + IPreviewHandler *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPreviewHandler* This); + IPreviewHandler *This); ULONG (STDMETHODCALLTYPE *Release)( - IPreviewHandler* This); + IPreviewHandler *This); /*** IPreviewHandler methods ***/ HRESULT (STDMETHODCALLTYPE *SetWindow)( - IPreviewHandler* This, + IPreviewHandler *This, HWND hwnd, const RECT *prc); HRESULT (STDMETHODCALLTYPE *SetRect)( - IPreviewHandler* This, + IPreviewHandler *This, const RECT *prc); HRESULT (STDMETHODCALLTYPE *DoPreview)( - IPreviewHandler* This); + IPreviewHandler *This); HRESULT (STDMETHODCALLTYPE *Unload)( - IPreviewHandler* This); + IPreviewHandler *This); HRESULT (STDMETHODCALLTYPE *SetFocus)( - IPreviewHandler* This); + IPreviewHandler *This); HRESULT (STDMETHODCALLTYPE *QueryFocus)( - IPreviewHandler* This, + IPreviewHandler *This, HWND *phwnd); HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)( - IPreviewHandler* This, + IPreviewHandler *This, MSG *pmsg); END_INTERFACE } IPreviewHandlerVtbl; + interface IPreviewHandler { CONST_VTBL IPreviewHandlerVtbl* lpVtbl; }; @@ -33611,60 +28081,6 @@ static FORCEINLINE HRESULT IPreviewHandler_TranslateAccelerator(IPreviewHandler* #endif -HRESULT STDMETHODCALLTYPE IPreviewHandler_SetWindow_Proxy( - IPreviewHandler* This, - HWND hwnd, - const RECT *prc); -void __RPC_STUB IPreviewHandler_SetWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPreviewHandler_SetRect_Proxy( - IPreviewHandler* This, - const RECT *prc); -void __RPC_STUB IPreviewHandler_SetRect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPreviewHandler_DoPreview_Proxy( - IPreviewHandler* This); -void __RPC_STUB IPreviewHandler_DoPreview_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPreviewHandler_Unload_Proxy( - IPreviewHandler* This); -void __RPC_STUB IPreviewHandler_Unload_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPreviewHandler_SetFocus_Proxy( - IPreviewHandler* This); -void __RPC_STUB IPreviewHandler_SetFocus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPreviewHandler_QueryFocus_Proxy( - IPreviewHandler* This, - HWND *phwnd); -void __RPC_STUB IPreviewHandler_QueryFocus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPreviewHandler_TranslateAccelerator_Proxy( - IPreviewHandler* This, - MSG *pmsg); -void __RPC_STUB IPreviewHandler_TranslateAccelerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPreviewHandler_INTERFACE_DEFINED__ */ @@ -33701,27 +28117,28 @@ typedef struct IPreviewHandlerFrameVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPreviewHandlerFrame* This, + IPreviewHandlerFrame *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPreviewHandlerFrame* This); + IPreviewHandlerFrame *This); ULONG (STDMETHODCALLTYPE *Release)( - IPreviewHandlerFrame* This); + IPreviewHandlerFrame *This); /*** IPreviewHandlerFrame methods ***/ HRESULT (STDMETHODCALLTYPE *GetWindowContext)( - IPreviewHandlerFrame* This, + IPreviewHandlerFrame *This, PREVIEWHANDLERFRAMEINFO *pinfo); HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)( - IPreviewHandlerFrame* This, + IPreviewHandlerFrame *This, MSG *pmsg); END_INTERFACE } IPreviewHandlerFrameVtbl; + interface IPreviewHandlerFrame { CONST_VTBL IPreviewHandlerFrameVtbl* lpVtbl; }; @@ -33758,22 +28175,6 @@ static FORCEINLINE HRESULT IPreviewHandlerFrame_TranslateAccelerator(IPreviewHan #endif -HRESULT STDMETHODCALLTYPE IPreviewHandlerFrame_GetWindowContext_Proxy( - IPreviewHandlerFrame* This, - PREVIEWHANDLERFRAMEINFO *pinfo); -void __RPC_STUB IPreviewHandlerFrame_GetWindowContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPreviewHandlerFrame_TranslateAccelerator_Proxy( - IPreviewHandlerFrame* This, - MSG *pmsg); -void __RPC_STUB IPreviewHandlerFrame_TranslateAccelerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPreviewHandlerFrame_INTERFACE_DEFINED__ */ @@ -33812,34 +28213,35 @@ typedef struct ITrayDeskBandVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITrayDeskBand* This, + ITrayDeskBand *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITrayDeskBand* This); + ITrayDeskBand *This); ULONG (STDMETHODCALLTYPE *Release)( - ITrayDeskBand* This); + ITrayDeskBand *This); /*** ITrayDeskBand methods ***/ HRESULT (STDMETHODCALLTYPE *ShowDeskBand)( - ITrayDeskBand* This, + ITrayDeskBand *This, REFCLSID clsid); HRESULT (STDMETHODCALLTYPE *HideDeskBand)( - ITrayDeskBand* This, + ITrayDeskBand *This, REFCLSID clsid); HRESULT (STDMETHODCALLTYPE *IsDeskBandShown)( - ITrayDeskBand* This, + ITrayDeskBand *This, REFCLSID clsid); HRESULT (STDMETHODCALLTYPE *DeskBandRegistrationChanged)( - ITrayDeskBand* This); + ITrayDeskBand *This); END_INTERFACE } ITrayDeskBandVtbl; + interface ITrayDeskBand { CONST_VTBL ITrayDeskBandVtbl* lpVtbl; }; @@ -33884,37 +28286,6 @@ static FORCEINLINE HRESULT ITrayDeskBand_DeskBandRegistrationChanged(ITrayDeskBa #endif -HRESULT STDMETHODCALLTYPE ITrayDeskBand_ShowDeskBand_Proxy( - ITrayDeskBand* This, - REFCLSID clsid); -void __RPC_STUB ITrayDeskBand_ShowDeskBand_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITrayDeskBand_HideDeskBand_Proxy( - ITrayDeskBand* This, - REFCLSID clsid); -void __RPC_STUB ITrayDeskBand_HideDeskBand_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITrayDeskBand_IsDeskBandShown_Proxy( - ITrayDeskBand* This, - REFCLSID clsid); -void __RPC_STUB ITrayDeskBand_IsDeskBandShown_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITrayDeskBand_DeskBandRegistrationChanged_Proxy( - ITrayDeskBand* This); -void __RPC_STUB ITrayDeskBand_DeskBandRegistrationChanged_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ITrayDeskBand_INTERFACE_DEFINED__ */ @@ -33954,19 +28325,19 @@ typedef struct IBandHostVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IBandHost* This, + IBandHost *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IBandHost* This); + IBandHost *This); ULONG (STDMETHODCALLTYPE *Release)( - IBandHost* This); + IBandHost *This); /*** IBandHost methods ***/ HRESULT (STDMETHODCALLTYPE *CreateBand)( - IBandHost* This, + IBandHost *This, REFCLSID rclsidBand, WINBOOL fAvailable, WINBOOL fVisible, @@ -33974,16 +28345,17 @@ typedef struct IBandHostVtbl { void **ppv); HRESULT (STDMETHODCALLTYPE *SetBandAvailability)( - IBandHost* This, + IBandHost *This, REFCLSID rclsidBand, WINBOOL fAvailable); HRESULT (STDMETHODCALLTYPE *DestroyBand)( - IBandHost* This, + IBandHost *This, REFCLSID rclsidBand); END_INTERFACE } IBandHostVtbl; + interface IBandHost { CONST_VTBL IBandHostVtbl* lpVtbl; }; @@ -34024,35 +28396,6 @@ static FORCEINLINE HRESULT IBandHost_DestroyBand(IBandHost* This,REFCLSID rclsid #endif -HRESULT STDMETHODCALLTYPE IBandHost_CreateBand_Proxy( - IBandHost* This, - REFCLSID rclsidBand, - WINBOOL fAvailable, - WINBOOL fVisible, - REFIID riid, - void **ppv); -void __RPC_STUB IBandHost_CreateBand_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IBandHost_SetBandAvailability_Proxy( - IBandHost* This, - REFCLSID rclsidBand, - WINBOOL fAvailable); -void __RPC_STUB IBandHost_SetBandAvailability_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IBandHost_DestroyBand_Proxy( - IBandHost* This, - REFCLSID rclsidBand); -void __RPC_STUB IBandHost_DestroyBand_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IBandHost_INTERFACE_DEFINED__ */ @@ -34086,7 +28429,6 @@ enum _EXPLORERPANESTATE { EPS_FORCE = 0x20000 }; - typedef DWORD EXPLORERPANESTATE; DEFINE_GUID(IID_IExplorerPaneVisibility, 0xe07010ec, 0xbc17, 0x44c0, 0x97,0xb0, 0x46,0xc7,0xc9,0x5b,0x9e,0xdc); @@ -34108,24 +28450,25 @@ typedef struct IExplorerPaneVisibilityVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IExplorerPaneVisibility* This, + IExplorerPaneVisibility *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IExplorerPaneVisibility* This); + IExplorerPaneVisibility *This); ULONG (STDMETHODCALLTYPE *Release)( - IExplorerPaneVisibility* This); + IExplorerPaneVisibility *This); /*** IExplorerPaneVisibility methods ***/ HRESULT (STDMETHODCALLTYPE *GetPaneState)( - IExplorerPaneVisibility* This, + IExplorerPaneVisibility *This, REFEXPLORERPANE ep, EXPLORERPANESTATE *peps); END_INTERFACE } IExplorerPaneVisibilityVtbl; + interface IExplorerPaneVisibility { CONST_VTBL IExplorerPaneVisibilityVtbl* lpVtbl; }; @@ -34158,15 +28501,6 @@ static FORCEINLINE HRESULT IExplorerPaneVisibility_GetPaneState(IExplorerPaneVis #endif -HRESULT STDMETHODCALLTYPE IExplorerPaneVisibility_GetPaneState_Proxy( - IExplorerPaneVisibility* This, - REFEXPLORERPANE ep, - EXPLORERPANESTATE *peps); -void __RPC_STUB IExplorerPaneVisibility_GetPaneState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IExplorerPaneVisibility_INTERFACE_DEFINED__ */ @@ -34202,19 +28536,19 @@ typedef struct IContextMenuCBVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IContextMenuCB* This, + IContextMenuCB *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IContextMenuCB* This); + IContextMenuCB *This); ULONG (STDMETHODCALLTYPE *Release)( - IContextMenuCB* This); + IContextMenuCB *This); /*** IContextMenuCB methods ***/ HRESULT (STDMETHODCALLTYPE *CallBack)( - IContextMenuCB* This, + IContextMenuCB *This, IShellFolder *psf, HWND hwndOwner, IDataObject *pdtobj, @@ -34224,6 +28558,7 @@ typedef struct IContextMenuCBVtbl { END_INTERFACE } IContextMenuCBVtbl; + interface IContextMenuCB { CONST_VTBL IContextMenuCBVtbl* lpVtbl; }; @@ -34256,19 +28591,6 @@ static FORCEINLINE HRESULT IContextMenuCB_CallBack(IContextMenuCB* This,IShellFo #endif -HRESULT STDMETHODCALLTYPE IContextMenuCB_CallBack_Proxy( - IContextMenuCB* This, - IShellFolder *psf, - HWND hwndOwner, - IDataObject *pdtobj, - UINT uMsg, - WPARAM wParam, - LPARAM lParam); -void __RPC_STUB IContextMenuCB_CallBack_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IContextMenuCB_INTERFACE_DEFINED__ */ @@ -34317,47 +28639,48 @@ typedef struct IDefaultExtractIconInitVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDefaultExtractIconInit* This, + IDefaultExtractIconInit *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDefaultExtractIconInit* This); + IDefaultExtractIconInit *This); ULONG (STDMETHODCALLTYPE *Release)( - IDefaultExtractIconInit* This); + IDefaultExtractIconInit *This); /*** IDefaultExtractIconInit methods ***/ HRESULT (STDMETHODCALLTYPE *SetFlags)( - IDefaultExtractIconInit* This, + IDefaultExtractIconInit *This, UINT uFlags); HRESULT (STDMETHODCALLTYPE *SetKey)( - IDefaultExtractIconInit* This, + IDefaultExtractIconInit *This, HKEY hkey); HRESULT (STDMETHODCALLTYPE *SetNormalIcon)( - IDefaultExtractIconInit* This, + IDefaultExtractIconInit *This, LPCWSTR pszFile, int iIcon); HRESULT (STDMETHODCALLTYPE *SetOpenIcon)( - IDefaultExtractIconInit* This, + IDefaultExtractIconInit *This, LPCWSTR pszFile, int iIcon); HRESULT (STDMETHODCALLTYPE *SetShortcutIcon)( - IDefaultExtractIconInit* This, + IDefaultExtractIconInit *This, LPCWSTR pszFile, int iIcon); HRESULT (STDMETHODCALLTYPE *SetDefaultIcon)( - IDefaultExtractIconInit* This, + IDefaultExtractIconInit *This, LPCWSTR pszFile, int iIcon); END_INTERFACE } IDefaultExtractIconInitVtbl; + interface IDefaultExtractIconInit { CONST_VTBL IDefaultExtractIconInitVtbl* lpVtbl; }; @@ -34410,58 +28733,6 @@ static FORCEINLINE HRESULT IDefaultExtractIconInit_SetDefaultIcon(IDefaultExtrac #endif -HRESULT STDMETHODCALLTYPE IDefaultExtractIconInit_SetFlags_Proxy( - IDefaultExtractIconInit* This, - UINT uFlags); -void __RPC_STUB IDefaultExtractIconInit_SetFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDefaultExtractIconInit_SetKey_Proxy( - IDefaultExtractIconInit* This, - HKEY hkey); -void __RPC_STUB IDefaultExtractIconInit_SetKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDefaultExtractIconInit_SetNormalIcon_Proxy( - IDefaultExtractIconInit* This, - LPCWSTR pszFile, - int iIcon); -void __RPC_STUB IDefaultExtractIconInit_SetNormalIcon_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDefaultExtractIconInit_SetOpenIcon_Proxy( - IDefaultExtractIconInit* This, - LPCWSTR pszFile, - int iIcon); -void __RPC_STUB IDefaultExtractIconInit_SetOpenIcon_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDefaultExtractIconInit_SetShortcutIcon_Proxy( - IDefaultExtractIconInit* This, - LPCWSTR pszFile, - int iIcon); -void __RPC_STUB IDefaultExtractIconInit_SetShortcutIcon_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDefaultExtractIconInit_SetDefaultIcon_Proxy( - IDefaultExtractIconInit* This, - LPCWSTR pszFile, - int iIcon); -void __RPC_STUB IDefaultExtractIconInit_SetDefaultIcon_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDefaultExtractIconInit_INTERFACE_DEFINED__ */ @@ -34471,6 +28742,9 @@ STDAPI SHCreateDefaultExtractIcon(REFIID riid, void **ppv); #ifndef __IEnumExplorerCommand_FWD_DEFINED__ #define __IEnumExplorerCommand_FWD_DEFINED__ typedef interface IEnumExplorerCommand IEnumExplorerCommand; +#ifdef __cplusplus +interface IEnumExplorerCommand; +#endif /* __cplusplus */ #endif @@ -34489,7 +28763,6 @@ enum _EXPCMDSTATE { ECS_RADIOCHECK = 0x10 }; - typedef DWORD EXPCMDSTATE; enum _EXPCMDFLAGS { @@ -34506,7 +28779,6 @@ enum _EXPCMDFLAGS { ECF_AUTOMENUICONS = 0x200 }; - typedef DWORD EXPCMDFLAGS; DEFINE_GUID(IID_IExplorerCommand, 0xa08ce4d0, 0xfa25, 0x44ab, 0xb5,0x7c, 0xc7,0xb1,0xc3,0x23,0xe0,0xb9); @@ -34554,57 +28826,58 @@ typedef struct IExplorerCommandVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IExplorerCommand* This, + IExplorerCommand *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IExplorerCommand* This); + IExplorerCommand *This); ULONG (STDMETHODCALLTYPE *Release)( - IExplorerCommand* This); + IExplorerCommand *This); /*** IExplorerCommand methods ***/ HRESULT (STDMETHODCALLTYPE *GetTitle)( - IExplorerCommand* This, + IExplorerCommand *This, IShellItemArray *psiItemArray, LPWSTR *ppszName); HRESULT (STDMETHODCALLTYPE *GetIcon)( - IExplorerCommand* This, + IExplorerCommand *This, IShellItemArray *psiItemArray, LPWSTR *ppszIcon); HRESULT (STDMETHODCALLTYPE *GetToolTip)( - IExplorerCommand* This, + IExplorerCommand *This, IShellItemArray *psiItemArray, LPWSTR *ppszInfotip); HRESULT (STDMETHODCALLTYPE *GetCanonicalName)( - IExplorerCommand* This, + IExplorerCommand *This, GUID *pguidCommandName); HRESULT (STDMETHODCALLTYPE *GetState)( - IExplorerCommand* This, + IExplorerCommand *This, IShellItemArray *psiItemArray, WINBOOL fOkToBeSlow, EXPCMDSTATE *pCmdState); HRESULT (STDMETHODCALLTYPE *Invoke)( - IExplorerCommand* This, + IExplorerCommand *This, IShellItemArray *psiItemArray, IBindCtx *pbc); HRESULT (STDMETHODCALLTYPE *GetFlags)( - IExplorerCommand* This, + IExplorerCommand *This, EXPCMDFLAGS *pFlags); HRESULT (STDMETHODCALLTYPE *EnumSubCommands)( - IExplorerCommand* This, + IExplorerCommand *This, IEnumExplorerCommand **ppEnum); END_INTERFACE } IExplorerCommandVtbl; + interface IExplorerCommand { CONST_VTBL IExplorerCommandVtbl* lpVtbl; }; @@ -34665,76 +28938,6 @@ static FORCEINLINE HRESULT IExplorerCommand_EnumSubCommands(IExplorerCommand* Th #endif -HRESULT STDMETHODCALLTYPE IExplorerCommand_GetTitle_Proxy( - IExplorerCommand* This, - IShellItemArray *psiItemArray, - LPWSTR *ppszName); -void __RPC_STUB IExplorerCommand_GetTitle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExplorerCommand_GetIcon_Proxy( - IExplorerCommand* This, - IShellItemArray *psiItemArray, - LPWSTR *ppszIcon); -void __RPC_STUB IExplorerCommand_GetIcon_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExplorerCommand_GetToolTip_Proxy( - IExplorerCommand* This, - IShellItemArray *psiItemArray, - LPWSTR *ppszInfotip); -void __RPC_STUB IExplorerCommand_GetToolTip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExplorerCommand_GetCanonicalName_Proxy( - IExplorerCommand* This, - GUID *pguidCommandName); -void __RPC_STUB IExplorerCommand_GetCanonicalName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExplorerCommand_GetState_Proxy( - IExplorerCommand* This, - IShellItemArray *psiItemArray, - WINBOOL fOkToBeSlow, - EXPCMDSTATE *pCmdState); -void __RPC_STUB IExplorerCommand_GetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExplorerCommand_Invoke_Proxy( - IExplorerCommand* This, - IShellItemArray *psiItemArray, - IBindCtx *pbc); -void __RPC_STUB IExplorerCommand_Invoke_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExplorerCommand_GetFlags_Proxy( - IExplorerCommand* This, - EXPCMDFLAGS *pFlags); -void __RPC_STUB IExplorerCommand_GetFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExplorerCommand_EnumSubCommands_Proxy( - IExplorerCommand* This, - IEnumExplorerCommand **ppEnum); -void __RPC_STUB IExplorerCommand_EnumSubCommands_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IExplorerCommand_INTERFACE_DEFINED__ */ @@ -34765,25 +28968,26 @@ typedef struct IExplorerCommandStateVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IExplorerCommandState* This, + IExplorerCommandState *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IExplorerCommandState* This); + IExplorerCommandState *This); ULONG (STDMETHODCALLTYPE *Release)( - IExplorerCommandState* This); + IExplorerCommandState *This); /*** IExplorerCommandState methods ***/ HRESULT (STDMETHODCALLTYPE *GetState)( - IExplorerCommandState* This, + IExplorerCommandState *This, IShellItemArray *psiItemArray, WINBOOL fOkToBeSlow, EXPCMDSTATE *pCmdState); END_INTERFACE } IExplorerCommandStateVtbl; + interface IExplorerCommandState { CONST_VTBL IExplorerCommandStateVtbl* lpVtbl; }; @@ -34816,16 +29020,6 @@ static FORCEINLINE HRESULT IExplorerCommandState_GetState(IExplorerCommandState* #endif -HRESULT STDMETHODCALLTYPE IExplorerCommandState_GetState_Proxy( - IExplorerCommandState* This, - IShellItemArray *psiItemArray, - WINBOOL fOkToBeSlow, - EXPCMDSTATE *pCmdState); -void __RPC_STUB IExplorerCommandState_GetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IExplorerCommandState_INTERFACE_DEFINED__ */ @@ -34855,24 +29049,25 @@ typedef struct IInitializeCommandVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInitializeCommand* This, + IInitializeCommand *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInitializeCommand* This); + IInitializeCommand *This); ULONG (STDMETHODCALLTYPE *Release)( - IInitializeCommand* This); + IInitializeCommand *This); /*** IInitializeCommand methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IInitializeCommand* This, + IInitializeCommand *This, LPCWSTR pszCommandName, IPropertyBag *ppb); END_INTERFACE } IInitializeCommandVtbl; + interface IInitializeCommand { CONST_VTBL IInitializeCommandVtbl* lpVtbl; }; @@ -34905,15 +29100,6 @@ static FORCEINLINE HRESULT IInitializeCommand_Initialize(IInitializeCommand* Thi #endif -HRESULT STDMETHODCALLTYPE IInitializeCommand_Initialize_Proxy( - IInitializeCommand* This, - LPCWSTR pszCommandName, - IPropertyBag *ppb); -void __RPC_STUB IInitializeCommand_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInitializeCommand_INTERFACE_DEFINED__ */ @@ -34953,36 +29139,37 @@ typedef struct IEnumExplorerCommandVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumExplorerCommand* This, + IEnumExplorerCommand *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumExplorerCommand* This); + IEnumExplorerCommand *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumExplorerCommand* This); + IEnumExplorerCommand *This); /*** IEnumExplorerCommand methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumExplorerCommand* This, + IEnumExplorerCommand *This, ULONG celt, IExplorerCommand **pUICommand, ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumExplorerCommand* This, + IEnumExplorerCommand *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumExplorerCommand* This); + IEnumExplorerCommand *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumExplorerCommand* This, + IEnumExplorerCommand *This, IEnumExplorerCommand **ppenum); END_INTERFACE } IEnumExplorerCommandVtbl; + interface IEnumExplorerCommand { CONST_VTBL IEnumExplorerCommandVtbl* lpVtbl; }; @@ -35037,29 +29224,6 @@ void __RPC_STUB IEnumExplorerCommand_RemoteNext_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumExplorerCommand_Skip_Proxy( - IEnumExplorerCommand* This, - ULONG celt); -void __RPC_STUB IEnumExplorerCommand_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumExplorerCommand_Reset_Proxy( - IEnumExplorerCommand* This); -void __RPC_STUB IEnumExplorerCommand_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumExplorerCommand_Clone_Proxy( - IEnumExplorerCommand* This, - IEnumExplorerCommand **ppenum); -void __RPC_STUB IEnumExplorerCommand_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IEnumExplorerCommand_Next_Proxy( IEnumExplorerCommand* This, ULONG celt, @@ -35105,31 +29269,32 @@ typedef struct IExplorerCommandProviderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IExplorerCommandProvider* This, + IExplorerCommandProvider *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IExplorerCommandProvider* This); + IExplorerCommandProvider *This); ULONG (STDMETHODCALLTYPE *Release)( - IExplorerCommandProvider* This); + IExplorerCommandProvider *This); /*** IExplorerCommandProvider methods ***/ HRESULT (STDMETHODCALLTYPE *GetCommands)( - IExplorerCommandProvider* This, + IExplorerCommandProvider *This, IUnknown *punkSite, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetCommand)( - IExplorerCommandProvider* This, + IExplorerCommandProvider *This, REFGUID rguidCommandId, REFIID riid, void **ppv); END_INTERFACE } IExplorerCommandProviderVtbl; + interface IExplorerCommandProvider { CONST_VTBL IExplorerCommandProviderVtbl* lpVtbl; }; @@ -35166,26 +29331,6 @@ static FORCEINLINE HRESULT IExplorerCommandProvider_GetCommand(IExplorerCommandP #endif -HRESULT STDMETHODCALLTYPE IExplorerCommandProvider_GetCommands_Proxy( - IExplorerCommandProvider* This, - IUnknown *punkSite, - REFIID riid, - void **ppv); -void __RPC_STUB IExplorerCommandProvider_GetCommands_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IExplorerCommandProvider_GetCommand_Proxy( - IExplorerCommandProvider* This, - REFGUID rguidCommandId, - REFIID riid, - void **ppv); -void __RPC_STUB IExplorerCommandProvider_GetCommand_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IExplorerCommandProvider_INTERFACE_DEFINED__ */ @@ -35220,19 +29365,19 @@ typedef struct IInitializeNetworkFolderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInitializeNetworkFolder* This, + IInitializeNetworkFolder *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInitializeNetworkFolder* This); + IInitializeNetworkFolder *This); ULONG (STDMETHODCALLTYPE *Release)( - IInitializeNetworkFolder* This); + IInitializeNetworkFolder *This); /*** IInitializeNetworkFolder methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IInitializeNetworkFolder* This, + IInitializeNetworkFolder *This, PCIDLIST_ABSOLUTE pidl, PCIDLIST_ABSOLUTE pidlTarget, UINT uDisplayType, @@ -35241,6 +29386,7 @@ typedef struct IInitializeNetworkFolderVtbl { END_INTERFACE } IInitializeNetworkFolderVtbl; + interface IInitializeNetworkFolder { CONST_VTBL IInitializeNetworkFolderVtbl* lpVtbl; }; @@ -35273,18 +29419,6 @@ static FORCEINLINE HRESULT IInitializeNetworkFolder_Initialize(IInitializeNetwor #endif -HRESULT STDMETHODCALLTYPE IInitializeNetworkFolder_Initialize_Proxy( - IInitializeNetworkFolder* This, - PCIDLIST_ABSOLUTE pidl, - PCIDLIST_ABSOLUTE pidlTarget, - UINT uDisplayType, - LPCWSTR pszResName, - LPCWSTR pszProvider); -void __RPC_STUB IInitializeNetworkFolder_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInitializeNetworkFolder_INTERFACE_DEFINED__ */ @@ -35330,35 +29464,36 @@ typedef struct IOpenControlPanelVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpenControlPanel* This, + IOpenControlPanel *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpenControlPanel* This); + IOpenControlPanel *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpenControlPanel* This); + IOpenControlPanel *This); /*** IOpenControlPanel methods ***/ HRESULT (STDMETHODCALLTYPE *Open)( - IOpenControlPanel* This, + IOpenControlPanel *This, LPCWSTR pszName, LPCWSTR pszPage, IUnknown *punkSite); HRESULT (STDMETHODCALLTYPE *GetPath)( - IOpenControlPanel* This, + IOpenControlPanel *This, LPCWSTR pszName, LPWSTR pszPath, UINT cchPath); HRESULT (STDMETHODCALLTYPE *GetCurrentView)( - IOpenControlPanel* This, + IOpenControlPanel *This, CPVIEW *pView); END_INTERFACE } IOpenControlPanelVtbl; + interface IOpenControlPanel { CONST_VTBL IOpenControlPanelVtbl* lpVtbl; }; @@ -35399,34 +29534,6 @@ static FORCEINLINE HRESULT IOpenControlPanel_GetCurrentView(IOpenControlPanel* T #endif -HRESULT STDMETHODCALLTYPE IOpenControlPanel_Open_Proxy( - IOpenControlPanel* This, - LPCWSTR pszName, - LPCWSTR pszPage, - IUnknown *punkSite); -void __RPC_STUB IOpenControlPanel_Open_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpenControlPanel_GetPath_Proxy( - IOpenControlPanel* This, - LPCWSTR pszName, - LPWSTR pszPath, - UINT cchPath); -void __RPC_STUB IOpenControlPanel_GetPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOpenControlPanel_GetCurrentView_Proxy( - IOpenControlPanel* This, - CPVIEW *pView); -void __RPC_STUB IOpenControlPanel_GetCurrentView_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpenControlPanel_INTERFACE_DEFINED__ */ @@ -35455,22 +29562,23 @@ typedef struct IComputerInfoChangeNotifyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IComputerInfoChangeNotify* This, + IComputerInfoChangeNotify *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IComputerInfoChangeNotify* This); + IComputerInfoChangeNotify *This); ULONG (STDMETHODCALLTYPE *Release)( - IComputerInfoChangeNotify* This); + IComputerInfoChangeNotify *This); /*** IComputerInfoChangeNotify methods ***/ HRESULT (STDMETHODCALLTYPE *ComputerInfoChanged)( - IComputerInfoChangeNotify* This); + IComputerInfoChangeNotify *This); END_INTERFACE } IComputerInfoChangeNotifyVtbl; + interface IComputerInfoChangeNotify { CONST_VTBL IComputerInfoChangeNotifyVtbl* lpVtbl; }; @@ -35503,13 +29611,6 @@ static FORCEINLINE HRESULT IComputerInfoChangeNotify_ComputerInfoChanged(IComput #endif -HRESULT STDMETHODCALLTYPE IComputerInfoChangeNotify_ComputerInfoChanged_Proxy( - IComputerInfoChangeNotify* This); -void __RPC_STUB IComputerInfoChangeNotify_ComputerInfoChanged_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IComputerInfoChangeNotify_INTERFACE_DEFINED__ */ @@ -35543,27 +29644,28 @@ typedef struct IFileSystemBindDataVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFileSystemBindData* This, + IFileSystemBindData *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFileSystemBindData* This); + IFileSystemBindData *This); ULONG (STDMETHODCALLTYPE *Release)( - IFileSystemBindData* This); + IFileSystemBindData *This); /*** IFileSystemBindData methods ***/ HRESULT (STDMETHODCALLTYPE *SetFindData)( - IFileSystemBindData* This, + IFileSystemBindData *This, const WIN32_FIND_DATAW *pfd); HRESULT (STDMETHODCALLTYPE *GetFindData)( - IFileSystemBindData* This, + IFileSystemBindData *This, WIN32_FIND_DATAW *pfd); END_INTERFACE } IFileSystemBindDataVtbl; + interface IFileSystemBindData { CONST_VTBL IFileSystemBindDataVtbl* lpVtbl; }; @@ -35600,22 +29702,6 @@ static FORCEINLINE HRESULT IFileSystemBindData_GetFindData(IFileSystemBindData* #endif -HRESULT STDMETHODCALLTYPE IFileSystemBindData_SetFindData_Proxy( - IFileSystemBindData* This, - const WIN32_FIND_DATAW *pfd); -void __RPC_STUB IFileSystemBindData_SetFindData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileSystemBindData_GetFindData_Proxy( - IFileSystemBindData* This, - WIN32_FIND_DATAW *pfd); -void __RPC_STUB IFileSystemBindData_GetFindData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFileSystemBindData_INTERFACE_DEFINED__ */ @@ -35653,44 +29739,45 @@ typedef struct IFileSystemBindData2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFileSystemBindData2* This, + IFileSystemBindData2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFileSystemBindData2* This); + IFileSystemBindData2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IFileSystemBindData2* This); + IFileSystemBindData2 *This); /*** IFileSystemBindData methods ***/ HRESULT (STDMETHODCALLTYPE *SetFindData)( - IFileSystemBindData2* This, + IFileSystemBindData2 *This, const WIN32_FIND_DATAW *pfd); HRESULT (STDMETHODCALLTYPE *GetFindData)( - IFileSystemBindData2* This, + IFileSystemBindData2 *This, WIN32_FIND_DATAW *pfd); /*** IFileSystemBindData2 methods ***/ HRESULT (STDMETHODCALLTYPE *SetFileID)( - IFileSystemBindData2* This, + IFileSystemBindData2 *This, LARGE_INTEGER liFileID); HRESULT (STDMETHODCALLTYPE *GetFileID)( - IFileSystemBindData2* This, + IFileSystemBindData2 *This, LARGE_INTEGER *pliFileID); HRESULT (STDMETHODCALLTYPE *SetJunctionCLSID)( - IFileSystemBindData2* This, + IFileSystemBindData2 *This, REFCLSID clsid); HRESULT (STDMETHODCALLTYPE *GetJunctionCLSID)( - IFileSystemBindData2* This, + IFileSystemBindData2 *This, CLSID *pclsid); END_INTERFACE } IFileSystemBindData2Vtbl; + interface IFileSystemBindData2 { CONST_VTBL IFileSystemBindData2Vtbl* lpVtbl; }; @@ -35745,38 +29832,6 @@ static FORCEINLINE HRESULT IFileSystemBindData2_GetJunctionCLSID(IFileSystemBind #endif -HRESULT STDMETHODCALLTYPE IFileSystemBindData2_SetFileID_Proxy( - IFileSystemBindData2* This, - LARGE_INTEGER liFileID); -void __RPC_STUB IFileSystemBindData2_SetFileID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileSystemBindData2_GetFileID_Proxy( - IFileSystemBindData2* This, - LARGE_INTEGER *pliFileID); -void __RPC_STUB IFileSystemBindData2_GetFileID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileSystemBindData2_SetJunctionCLSID_Proxy( - IFileSystemBindData2* This, - REFCLSID clsid); -void __RPC_STUB IFileSystemBindData2_SetJunctionCLSID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileSystemBindData2_GetJunctionCLSID_Proxy( - IFileSystemBindData2* This, - CLSID *pclsid); -void __RPC_STUB IFileSystemBindData2_GetJunctionCLSID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFileSystemBindData2_INTERFACE_DEFINED__ */ @@ -35839,57 +29894,58 @@ typedef struct ICustomDestinationListVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICustomDestinationList* This, + ICustomDestinationList *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICustomDestinationList* This); + ICustomDestinationList *This); ULONG (STDMETHODCALLTYPE *Release)( - ICustomDestinationList* This); + ICustomDestinationList *This); /*** ICustomDestinationList methods ***/ HRESULT (STDMETHODCALLTYPE *SetAppID)( - ICustomDestinationList* This, + ICustomDestinationList *This, LPCWSTR pszAppID); HRESULT (STDMETHODCALLTYPE *BeginList)( - ICustomDestinationList* This, + ICustomDestinationList *This, UINT *pcMinSlots, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *AppendCategory)( - ICustomDestinationList* This, + ICustomDestinationList *This, LPCWSTR pszCategory, IObjectArray *poa); HRESULT (STDMETHODCALLTYPE *AppendKnownCategory)( - ICustomDestinationList* This, + ICustomDestinationList *This, KNOWNDESTCATEGORY category); HRESULT (STDMETHODCALLTYPE *AddUserTasks)( - ICustomDestinationList* This, + ICustomDestinationList *This, IObjectArray *poa); HRESULT (STDMETHODCALLTYPE *CommitList)( - ICustomDestinationList* This); + ICustomDestinationList *This); HRESULT (STDMETHODCALLTYPE *GetRemovedDestinations)( - ICustomDestinationList* This, + ICustomDestinationList *This, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *DeleteList)( - ICustomDestinationList* This, + ICustomDestinationList *This, LPCWSTR pszAppID); HRESULT (STDMETHODCALLTYPE *AbortList)( - ICustomDestinationList* This); + ICustomDestinationList *This); END_INTERFACE } ICustomDestinationListVtbl; + interface ICustomDestinationList { CONST_VTBL ICustomDestinationListVtbl* lpVtbl; }; @@ -35954,80 +30010,6 @@ static FORCEINLINE HRESULT ICustomDestinationList_AbortList(ICustomDestinationLi #endif -HRESULT STDMETHODCALLTYPE ICustomDestinationList_SetAppID_Proxy( - ICustomDestinationList* This, - LPCWSTR pszAppID); -void __RPC_STUB ICustomDestinationList_SetAppID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICustomDestinationList_BeginList_Proxy( - ICustomDestinationList* This, - UINT *pcMinSlots, - REFIID riid, - void **ppv); -void __RPC_STUB ICustomDestinationList_BeginList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICustomDestinationList_AppendCategory_Proxy( - ICustomDestinationList* This, - LPCWSTR pszCategory, - IObjectArray *poa); -void __RPC_STUB ICustomDestinationList_AppendCategory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICustomDestinationList_AppendKnownCategory_Proxy( - ICustomDestinationList* This, - KNOWNDESTCATEGORY category); -void __RPC_STUB ICustomDestinationList_AppendKnownCategory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICustomDestinationList_AddUserTasks_Proxy( - ICustomDestinationList* This, - IObjectArray *poa); -void __RPC_STUB ICustomDestinationList_AddUserTasks_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICustomDestinationList_CommitList_Proxy( - ICustomDestinationList* This); -void __RPC_STUB ICustomDestinationList_CommitList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICustomDestinationList_GetRemovedDestinations_Proxy( - ICustomDestinationList* This, - REFIID riid, - void **ppv); -void __RPC_STUB ICustomDestinationList_GetRemovedDestinations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICustomDestinationList_DeleteList_Proxy( - ICustomDestinationList* This, - LPCWSTR pszAppID); -void __RPC_STUB ICustomDestinationList_DeleteList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICustomDestinationList_AbortList_Proxy( - ICustomDestinationList* This); -void __RPC_STUB ICustomDestinationList_AbortList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICustomDestinationList_INTERFACE_DEFINED__ */ @@ -36062,30 +30044,31 @@ typedef struct IApplicationDestinationsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IApplicationDestinations* This, + IApplicationDestinations *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IApplicationDestinations* This); + IApplicationDestinations *This); ULONG (STDMETHODCALLTYPE *Release)( - IApplicationDestinations* This); + IApplicationDestinations *This); /*** IApplicationDestinations methods ***/ HRESULT (STDMETHODCALLTYPE *SetAppID)( - IApplicationDestinations* This, + IApplicationDestinations *This, LPCWSTR pszAppID); HRESULT (STDMETHODCALLTYPE *RemoveDestination)( - IApplicationDestinations* This, + IApplicationDestinations *This, IUnknown *punk); HRESULT (STDMETHODCALLTYPE *RemoveAllDestinations)( - IApplicationDestinations* This); + IApplicationDestinations *This); END_INTERFACE } IApplicationDestinationsVtbl; + interface IApplicationDestinations { CONST_VTBL IApplicationDestinationsVtbl* lpVtbl; }; @@ -36126,29 +30109,6 @@ static FORCEINLINE HRESULT IApplicationDestinations_RemoveAllDestinations(IAppli #endif -HRESULT STDMETHODCALLTYPE IApplicationDestinations_SetAppID_Proxy( - IApplicationDestinations* This, - LPCWSTR pszAppID); -void __RPC_STUB IApplicationDestinations_SetAppID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationDestinations_RemoveDestination_Proxy( - IApplicationDestinations* This, - IUnknown *punk); -void __RPC_STUB IApplicationDestinations_RemoveDestination_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationDestinations_RemoveAllDestinations_Proxy( - IApplicationDestinations* This); -void __RPC_STUB IApplicationDestinations_RemoveAllDestinations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IApplicationDestinations_INTERFACE_DEFINED__ */ @@ -36188,23 +30148,23 @@ typedef struct IApplicationDocumentListsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IApplicationDocumentLists* This, + IApplicationDocumentLists *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IApplicationDocumentLists* This); + IApplicationDocumentLists *This); ULONG (STDMETHODCALLTYPE *Release)( - IApplicationDocumentLists* This); + IApplicationDocumentLists *This); /*** IApplicationDocumentLists methods ***/ HRESULT (STDMETHODCALLTYPE *SetAppID)( - IApplicationDocumentLists* This, + IApplicationDocumentLists *This, LPCWSTR pszAppID); HRESULT (STDMETHODCALLTYPE *GetList)( - IApplicationDocumentLists* This, + IApplicationDocumentLists *This, APPDOCLISTTYPE listtype, UINT cItemsDesired, REFIID riid, @@ -36212,6 +30172,7 @@ typedef struct IApplicationDocumentListsVtbl { END_INTERFACE } IApplicationDocumentListsVtbl; + interface IApplicationDocumentLists { CONST_VTBL IApplicationDocumentListsVtbl* lpVtbl; }; @@ -36248,25 +30209,6 @@ static FORCEINLINE HRESULT IApplicationDocumentLists_GetList(IApplicationDocumen #endif -HRESULT STDMETHODCALLTYPE IApplicationDocumentLists_SetAppID_Proxy( - IApplicationDocumentLists* This, - LPCWSTR pszAppID); -void __RPC_STUB IApplicationDocumentLists_SetAppID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationDocumentLists_GetList_Proxy( - IApplicationDocumentLists* This, - APPDOCLISTTYPE listtype, - UINT cItemsDesired, - REFIID riid, - void **ppv); -void __RPC_STUB IApplicationDocumentLists_GetList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IApplicationDocumentLists_INTERFACE_DEFINED__ */ @@ -36298,27 +30240,28 @@ typedef struct IObjectWithAppUserModelIDVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IObjectWithAppUserModelID* This, + IObjectWithAppUserModelID *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IObjectWithAppUserModelID* This); + IObjectWithAppUserModelID *This); ULONG (STDMETHODCALLTYPE *Release)( - IObjectWithAppUserModelID* This); + IObjectWithAppUserModelID *This); /*** IObjectWithAppUserModelID methods ***/ HRESULT (STDMETHODCALLTYPE *SetAppID)( - IObjectWithAppUserModelID* This, + IObjectWithAppUserModelID *This, LPCWSTR pszAppID); HRESULT (STDMETHODCALLTYPE *GetAppID)( - IObjectWithAppUserModelID* This, + IObjectWithAppUserModelID *This, LPWSTR *ppszAppID); END_INTERFACE } IObjectWithAppUserModelIDVtbl; + interface IObjectWithAppUserModelID { CONST_VTBL IObjectWithAppUserModelIDVtbl* lpVtbl; }; @@ -36355,22 +30298,6 @@ static FORCEINLINE HRESULT IObjectWithAppUserModelID_GetAppID(IObjectWithAppUser #endif -HRESULT STDMETHODCALLTYPE IObjectWithAppUserModelID_SetAppID_Proxy( - IObjectWithAppUserModelID* This, - LPCWSTR pszAppID); -void __RPC_STUB IObjectWithAppUserModelID_SetAppID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IObjectWithAppUserModelID_GetAppID_Proxy( - IObjectWithAppUserModelID* This, - LPWSTR *ppszAppID); -void __RPC_STUB IObjectWithAppUserModelID_GetAppID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IObjectWithAppUserModelID_INTERFACE_DEFINED__ */ @@ -36402,27 +30329,28 @@ typedef struct IObjectWithProgIDVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IObjectWithProgID* This, + IObjectWithProgID *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IObjectWithProgID* This); + IObjectWithProgID *This); ULONG (STDMETHODCALLTYPE *Release)( - IObjectWithProgID* This); + IObjectWithProgID *This); /*** IObjectWithProgID methods ***/ HRESULT (STDMETHODCALLTYPE *SetProgID)( - IObjectWithProgID* This, + IObjectWithProgID *This, LPCWSTR pszProgID); HRESULT (STDMETHODCALLTYPE *GetProgID)( - IObjectWithProgID* This, + IObjectWithProgID *This, LPWSTR *ppszProgID); END_INTERFACE } IObjectWithProgIDVtbl; + interface IObjectWithProgID { CONST_VTBL IObjectWithProgIDVtbl* lpVtbl; }; @@ -36459,22 +30387,6 @@ static FORCEINLINE HRESULT IObjectWithProgID_GetProgID(IObjectWithProgID* This,L #endif -HRESULT STDMETHODCALLTYPE IObjectWithProgID_SetProgID_Proxy( - IObjectWithProgID* This, - LPCWSTR pszProgID); -void __RPC_STUB IObjectWithProgID_SetProgID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IObjectWithProgID_GetProgID_Proxy( - IObjectWithProgID* This, - LPWSTR *ppszProgID); -void __RPC_STUB IObjectWithProgID_GetProgID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IObjectWithProgID_INTERFACE_DEFINED__ */ @@ -36505,25 +30417,26 @@ typedef struct IUpdateIDListVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IUpdateIDList* This, + IUpdateIDList *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IUpdateIDList* This); + IUpdateIDList *This); ULONG (STDMETHODCALLTYPE *Release)( - IUpdateIDList* This); + IUpdateIDList *This); /*** IUpdateIDList methods ***/ HRESULT (STDMETHODCALLTYPE *Update)( - IUpdateIDList* This, + IUpdateIDList *This, IBindCtx *pbc, PCUITEMID_CHILD pidlIn, PITEMID_CHILD *ppidlOut); END_INTERFACE } IUpdateIDListVtbl; + interface IUpdateIDList { CONST_VTBL IUpdateIDListVtbl* lpVtbl; }; @@ -36556,16 +30469,6 @@ static FORCEINLINE HRESULT IUpdateIDList_Update(IUpdateIDList* This,IBindCtx *pb #endif -HRESULT STDMETHODCALLTYPE IUpdateIDList_Update_Proxy( - IUpdateIDList* This, - IBindCtx *pbc, - PCUITEMID_CHILD pidlIn, - PITEMID_CHILD *ppidlOut); -void __RPC_STUB IUpdateIDList_Update_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IUpdateIDList_INTERFACE_DEFINED__ */ @@ -36598,23 +30501,24 @@ typedef struct IDesktopGadgetVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDesktopGadget* This, + IDesktopGadget *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDesktopGadget* This); + IDesktopGadget *This); ULONG (STDMETHODCALLTYPE *Release)( - IDesktopGadget* This); + IDesktopGadget *This); /*** IDesktopGadget methods ***/ HRESULT (STDMETHODCALLTYPE *RunGadget)( - IDesktopGadget* This, + IDesktopGadget *This, LPCWSTR gadgetPath); END_INTERFACE } IDesktopGadgetVtbl; + interface IDesktopGadget { CONST_VTBL IDesktopGadgetVtbl* lpVtbl; }; @@ -36647,14 +30551,6 @@ static FORCEINLINE HRESULT IDesktopGadget_RunGadget(IDesktopGadget* This,LPCWSTR #endif -HRESULT STDMETHODCALLTYPE IDesktopGadget_RunGadget_Proxy( - IDesktopGadget* This, - LPCWSTR gadgetPath); -void __RPC_STUB IDesktopGadget_RunGadget_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDesktopGadget_INTERFACE_DEFINED__ */ @@ -36764,90 +30660,91 @@ typedef struct IDesktopWallpaperVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDesktopWallpaper* This, + IDesktopWallpaper *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDesktopWallpaper* This); + IDesktopWallpaper *This); ULONG (STDMETHODCALLTYPE *Release)( - IDesktopWallpaper* This); + IDesktopWallpaper *This); /*** IDesktopWallpaper methods ***/ HRESULT (STDMETHODCALLTYPE *SetWallpaper)( - IDesktopWallpaper* This, + IDesktopWallpaper *This, LPCWSTR monitorID, LPCWSTR wallpaper); HRESULT (STDMETHODCALLTYPE *GetWallpaper)( - IDesktopWallpaper* This, + IDesktopWallpaper *This, LPCWSTR monitorID, LPWSTR *wallpaper); HRESULT (STDMETHODCALLTYPE *GetMonitorDevicePathAt)( - IDesktopWallpaper* This, + IDesktopWallpaper *This, UINT monitorIndex, LPWSTR *monitorID); HRESULT (STDMETHODCALLTYPE *GetMonitorDevicePathCount)( - IDesktopWallpaper* This, + IDesktopWallpaper *This, UINT *count); HRESULT (STDMETHODCALLTYPE *GetMonitorRECT)( - IDesktopWallpaper* This, + IDesktopWallpaper *This, LPCWSTR monitorID, RECT *displayRect); HRESULT (STDMETHODCALLTYPE *SetBackgroundColor)( - IDesktopWallpaper* This, + IDesktopWallpaper *This, COLORREF color); HRESULT (STDMETHODCALLTYPE *GetBackgroundColor)( - IDesktopWallpaper* This, + IDesktopWallpaper *This, COLORREF *color); HRESULT (STDMETHODCALLTYPE *SetPosition)( - IDesktopWallpaper* This, + IDesktopWallpaper *This, DESKTOP_WALLPAPER_POSITION position); HRESULT (STDMETHODCALLTYPE *GetPosition)( - IDesktopWallpaper* This, + IDesktopWallpaper *This, DESKTOP_WALLPAPER_POSITION *position); HRESULT (STDMETHODCALLTYPE *SetSlideshow)( - IDesktopWallpaper* This, + IDesktopWallpaper *This, IShellItemArray *items); HRESULT (STDMETHODCALLTYPE *GetSlideshow)( - IDesktopWallpaper* This, + IDesktopWallpaper *This, IShellItemArray **items); HRESULT (STDMETHODCALLTYPE *SetSlideshowOptions)( - IDesktopWallpaper* This, + IDesktopWallpaper *This, DESKTOP_SLIDESHOW_OPTIONS options, UINT slideshowTick); HRESULT (STDMETHODCALLTYPE *GetSlideshowOptions)( - IDesktopWallpaper* This, + IDesktopWallpaper *This, DESKTOP_SLIDESHOW_OPTIONS *options, UINT *slideshowTick); HRESULT (STDMETHODCALLTYPE *AdvanceSlideshow)( - IDesktopWallpaper* This, + IDesktopWallpaper *This, LPCWSTR monitorID, DESKTOP_SLIDESHOW_DIRECTION direction); HRESULT (STDMETHODCALLTYPE *GetStatus)( - IDesktopWallpaper* This, + IDesktopWallpaper *This, DESKTOP_SLIDESHOW_STATE *state); HRESULT (STDMETHODCALLTYPE *Enable)( - IDesktopWallpaper* This, + IDesktopWallpaper *This, WINBOOL enable); END_INTERFACE } IDesktopWallpaperVtbl; + interface IDesktopWallpaper { CONST_VTBL IDesktopWallpaperVtbl* lpVtbl; }; @@ -36940,141 +30837,6 @@ static FORCEINLINE HRESULT IDesktopWallpaper_Enable(IDesktopWallpaper* This,WINB #endif -HRESULT STDMETHODCALLTYPE IDesktopWallpaper_SetWallpaper_Proxy( - IDesktopWallpaper* This, - LPCWSTR monitorID, - LPCWSTR wallpaper); -void __RPC_STUB IDesktopWallpaper_SetWallpaper_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDesktopWallpaper_GetWallpaper_Proxy( - IDesktopWallpaper* This, - LPCWSTR monitorID, - LPWSTR *wallpaper); -void __RPC_STUB IDesktopWallpaper_GetWallpaper_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDesktopWallpaper_GetMonitorDevicePathAt_Proxy( - IDesktopWallpaper* This, - UINT monitorIndex, - LPWSTR *monitorID); -void __RPC_STUB IDesktopWallpaper_GetMonitorDevicePathAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDesktopWallpaper_GetMonitorDevicePathCount_Proxy( - IDesktopWallpaper* This, - UINT *count); -void __RPC_STUB IDesktopWallpaper_GetMonitorDevicePathCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDesktopWallpaper_GetMonitorRECT_Proxy( - IDesktopWallpaper* This, - LPCWSTR monitorID, - RECT *displayRect); -void __RPC_STUB IDesktopWallpaper_GetMonitorRECT_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDesktopWallpaper_SetBackgroundColor_Proxy( - IDesktopWallpaper* This, - COLORREF color); -void __RPC_STUB IDesktopWallpaper_SetBackgroundColor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDesktopWallpaper_GetBackgroundColor_Proxy( - IDesktopWallpaper* This, - COLORREF *color); -void __RPC_STUB IDesktopWallpaper_GetBackgroundColor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDesktopWallpaper_SetPosition_Proxy( - IDesktopWallpaper* This, - DESKTOP_WALLPAPER_POSITION position); -void __RPC_STUB IDesktopWallpaper_SetPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDesktopWallpaper_GetPosition_Proxy( - IDesktopWallpaper* This, - DESKTOP_WALLPAPER_POSITION *position); -void __RPC_STUB IDesktopWallpaper_GetPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDesktopWallpaper_SetSlideshow_Proxy( - IDesktopWallpaper* This, - IShellItemArray *items); -void __RPC_STUB IDesktopWallpaper_SetSlideshow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDesktopWallpaper_GetSlideshow_Proxy( - IDesktopWallpaper* This, - IShellItemArray **items); -void __RPC_STUB IDesktopWallpaper_GetSlideshow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDesktopWallpaper_SetSlideshowOptions_Proxy( - IDesktopWallpaper* This, - DESKTOP_SLIDESHOW_OPTIONS options, - UINT slideshowTick); -void __RPC_STUB IDesktopWallpaper_SetSlideshowOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDesktopWallpaper_GetSlideshowOptions_Proxy( - IDesktopWallpaper* This, - DESKTOP_SLIDESHOW_OPTIONS *options, - UINT *slideshowTick); -void __RPC_STUB IDesktopWallpaper_GetSlideshowOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDesktopWallpaper_AdvanceSlideshow_Proxy( - IDesktopWallpaper* This, - LPCWSTR monitorID, - DESKTOP_SLIDESHOW_DIRECTION direction); -void __RPC_STUB IDesktopWallpaper_AdvanceSlideshow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDesktopWallpaper_GetStatus_Proxy( - IDesktopWallpaper* This, - DESKTOP_SLIDESHOW_STATE *state); -void __RPC_STUB IDesktopWallpaper_GetStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDesktopWallpaper_Enable_Proxy( - IDesktopWallpaper* This, - WINBOOL enable); -void __RPC_STUB IDesktopWallpaper_Enable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDesktopWallpaper_INTERFACE_DEFINED__ */ @@ -37122,28 +30884,29 @@ typedef struct IHomeGroupVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IHomeGroup* This, + IHomeGroup *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IHomeGroup* This); + IHomeGroup *This); ULONG (STDMETHODCALLTYPE *Release)( - IHomeGroup* This); + IHomeGroup *This); /*** IHomeGroup methods ***/ HRESULT (STDMETHODCALLTYPE *IsMember)( - IHomeGroup* This, + IHomeGroup *This, WINBOOL *member); HRESULT (STDMETHODCALLTYPE *ShowSharingWizard)( - IHomeGroup* This, + IHomeGroup *This, HWND owner, HOMEGROUPSHARINGCHOICES *sharingchoices); END_INTERFACE } IHomeGroupVtbl; + interface IHomeGroup { CONST_VTBL IHomeGroupVtbl* lpVtbl; }; @@ -37180,23 +30943,6 @@ static FORCEINLINE HRESULT IHomeGroup_ShowSharingWizard(IHomeGroup* This,HWND ow #endif -HRESULT STDMETHODCALLTYPE IHomeGroup_IsMember_Proxy( - IHomeGroup* This, - WINBOOL *member); -void __RPC_STUB IHomeGroup_IsMember_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IHomeGroup_ShowSharingWizard_Proxy( - IHomeGroup* This, - HWND owner, - HOMEGROUPSHARINGCHOICES *sharingchoices); -void __RPC_STUB IHomeGroup_ShowSharingWizard_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IHomeGroup_INTERFACE_DEFINED__ */ @@ -37225,23 +30971,24 @@ typedef struct IInitializeWithPropertyStoreVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInitializeWithPropertyStore* This, + IInitializeWithPropertyStore *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInitializeWithPropertyStore* This); + IInitializeWithPropertyStore *This); ULONG (STDMETHODCALLTYPE *Release)( - IInitializeWithPropertyStore* This); + IInitializeWithPropertyStore *This); /*** IInitializeWithPropertyStore methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IInitializeWithPropertyStore* This, + IInitializeWithPropertyStore *This, IPropertyStore *pps); END_INTERFACE } IInitializeWithPropertyStoreVtbl; + interface IInitializeWithPropertyStore { CONST_VTBL IInitializeWithPropertyStoreVtbl* lpVtbl; }; @@ -37274,14 +31021,6 @@ static FORCEINLINE HRESULT IInitializeWithPropertyStore_Initialize(IInitializeWi #endif -HRESULT STDMETHODCALLTYPE IInitializeWithPropertyStore_Initialize_Proxy( - IInitializeWithPropertyStore* This, - IPropertyStore *pps); -void __RPC_STUB IInitializeWithPropertyStore_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInitializeWithPropertyStore_INTERFACE_DEFINED__ */ @@ -37315,19 +31054,19 @@ typedef struct IOpenSearchSourceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOpenSearchSource* This, + IOpenSearchSource *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOpenSearchSource* This); + IOpenSearchSource *This); ULONG (STDMETHODCALLTYPE *Release)( - IOpenSearchSource* This); + IOpenSearchSource *This); /*** IOpenSearchSource methods ***/ HRESULT (STDMETHODCALLTYPE *GetResults)( - IOpenSearchSource* This, + IOpenSearchSource *This, HWND hwnd, LPCWSTR pszQuery, DWORD dwStartIndex, @@ -37337,6 +31076,7 @@ typedef struct IOpenSearchSourceVtbl { END_INTERFACE } IOpenSearchSourceVtbl; + interface IOpenSearchSource { CONST_VTBL IOpenSearchSourceVtbl* lpVtbl; }; @@ -37369,19 +31109,6 @@ static FORCEINLINE HRESULT IOpenSearchSource_GetResults(IOpenSearchSource* This, #endif -HRESULT STDMETHODCALLTYPE IOpenSearchSource_GetResults_Proxy( - IOpenSearchSource* This, - HWND hwnd, - LPCWSTR pszQuery, - DWORD dwStartIndex, - DWORD dwCount, - REFIID riid, - void **ppv); -void __RPC_STUB IOpenSearchSource_GetResults_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOpenSearchSource_INTERFACE_DEFINED__ */ @@ -37503,96 +31230,96 @@ typedef struct IShellLibraryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IShellLibrary* This, + IShellLibrary *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IShellLibrary* This); + IShellLibrary *This); ULONG (STDMETHODCALLTYPE *Release)( - IShellLibrary* This); + IShellLibrary *This); /*** IShellLibrary methods ***/ HRESULT (STDMETHODCALLTYPE *LoadLibraryFromItem)( - IShellLibrary* This, + IShellLibrary *This, IShellItem *psiLibrary, DWORD grfMode); HRESULT (STDMETHODCALLTYPE *LoadLibraryFromKnownFolder)( - IShellLibrary* This, + IShellLibrary *This, REFKNOWNFOLDERID kfidLibrary, DWORD grfMode); HRESULT (STDMETHODCALLTYPE *AddFolder)( - IShellLibrary* This, + IShellLibrary *This, IShellItem *psiLocation); HRESULT (STDMETHODCALLTYPE *RemoveFolder)( - IShellLibrary* This, + IShellLibrary *This, IShellItem *psiLocation); HRESULT (STDMETHODCALLTYPE *GetFolders)( - IShellLibrary* This, + IShellLibrary *This, LIBRARYFOLDERFILTER lff, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *ResolveFolder)( - IShellLibrary* This, + IShellLibrary *This, IShellItem *psiFolderToResolve, DWORD dwTimeout, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetDefaultSaveFolder)( - IShellLibrary* This, + IShellLibrary *This, DEFAULTSAVEFOLDERTYPE dsft, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *SetDefaultSaveFolder)( - IShellLibrary* This, + IShellLibrary *This, DEFAULTSAVEFOLDERTYPE dsft, IShellItem *psi); HRESULT (STDMETHODCALLTYPE *GetOptions)( - IShellLibrary* This, + IShellLibrary *This, LIBRARYOPTIONFLAGS *plofOptions); HRESULT (STDMETHODCALLTYPE *SetOptions)( - IShellLibrary* This, + IShellLibrary *This, LIBRARYOPTIONFLAGS lofMask, LIBRARYOPTIONFLAGS lofOptions); HRESULT (STDMETHODCALLTYPE *GetFolderType)( - IShellLibrary* This, + IShellLibrary *This, FOLDERTYPEID *pftid); HRESULT (STDMETHODCALLTYPE *SetFolderType)( - IShellLibrary* This, + IShellLibrary *This, REFFOLDERTYPEID ftid); HRESULT (STDMETHODCALLTYPE *GetIcon)( - IShellLibrary* This, + IShellLibrary *This, LPWSTR *ppszIcon); HRESULT (STDMETHODCALLTYPE *SetIcon)( - IShellLibrary* This, + IShellLibrary *This, LPCWSTR pszIcon); HRESULT (STDMETHODCALLTYPE *Commit)( - IShellLibrary* This); + IShellLibrary *This); HRESULT (STDMETHODCALLTYPE *Save)( - IShellLibrary* This, + IShellLibrary *This, IShellItem *psiFolderToSaveIn, LPCWSTR pszLibraryName, LIBRARYSAVEFLAGS lsf, IShellItem **ppsiSavedTo); HRESULT (STDMETHODCALLTYPE *SaveInKnownFolder)( - IShellLibrary* This, + IShellLibrary *This, REFKNOWNFOLDERID kfidToSaveIn, LPCWSTR pszLibraryName, LIBRARYSAVEFLAGS lsf, @@ -37600,6 +31327,7 @@ typedef struct IShellLibraryVtbl { END_INTERFACE } IShellLibraryVtbl; + interface IShellLibrary { CONST_VTBL IShellLibraryVtbl* lpVtbl; }; @@ -37696,158 +31424,6 @@ static FORCEINLINE HRESULT IShellLibrary_SaveInKnownFolder(IShellLibrary* This,R #endif -HRESULT STDMETHODCALLTYPE IShellLibrary_LoadLibraryFromItem_Proxy( - IShellLibrary* This, - IShellItem *psiLibrary, - DWORD grfMode); -void __RPC_STUB IShellLibrary_LoadLibraryFromItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLibrary_LoadLibraryFromKnownFolder_Proxy( - IShellLibrary* This, - REFKNOWNFOLDERID kfidLibrary, - DWORD grfMode); -void __RPC_STUB IShellLibrary_LoadLibraryFromKnownFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLibrary_AddFolder_Proxy( - IShellLibrary* This, - IShellItem *psiLocation); -void __RPC_STUB IShellLibrary_AddFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLibrary_RemoveFolder_Proxy( - IShellLibrary* This, - IShellItem *psiLocation); -void __RPC_STUB IShellLibrary_RemoveFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLibrary_GetFolders_Proxy( - IShellLibrary* This, - LIBRARYFOLDERFILTER lff, - REFIID riid, - void **ppv); -void __RPC_STUB IShellLibrary_GetFolders_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLibrary_ResolveFolder_Proxy( - IShellLibrary* This, - IShellItem *psiFolderToResolve, - DWORD dwTimeout, - REFIID riid, - void **ppv); -void __RPC_STUB IShellLibrary_ResolveFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLibrary_GetDefaultSaveFolder_Proxy( - IShellLibrary* This, - DEFAULTSAVEFOLDERTYPE dsft, - REFIID riid, - void **ppv); -void __RPC_STUB IShellLibrary_GetDefaultSaveFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLibrary_SetDefaultSaveFolder_Proxy( - IShellLibrary* This, - DEFAULTSAVEFOLDERTYPE dsft, - IShellItem *psi); -void __RPC_STUB IShellLibrary_SetDefaultSaveFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLibrary_GetOptions_Proxy( - IShellLibrary* This, - LIBRARYOPTIONFLAGS *plofOptions); -void __RPC_STUB IShellLibrary_GetOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLibrary_SetOptions_Proxy( - IShellLibrary* This, - LIBRARYOPTIONFLAGS lofMask, - LIBRARYOPTIONFLAGS lofOptions); -void __RPC_STUB IShellLibrary_SetOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLibrary_GetFolderType_Proxy( - IShellLibrary* This, - FOLDERTYPEID *pftid); -void __RPC_STUB IShellLibrary_GetFolderType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLibrary_SetFolderType_Proxy( - IShellLibrary* This, - REFFOLDERTYPEID ftid); -void __RPC_STUB IShellLibrary_SetFolderType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLibrary_GetIcon_Proxy( - IShellLibrary* This, - LPWSTR *ppszIcon); -void __RPC_STUB IShellLibrary_GetIcon_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLibrary_SetIcon_Proxy( - IShellLibrary* This, - LPCWSTR pszIcon); -void __RPC_STUB IShellLibrary_SetIcon_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLibrary_Commit_Proxy( - IShellLibrary* This); -void __RPC_STUB IShellLibrary_Commit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLibrary_Save_Proxy( - IShellLibrary* This, - IShellItem *psiFolderToSaveIn, - LPCWSTR pszLibraryName, - LIBRARYSAVEFLAGS lsf, - IShellItem **ppsiSavedTo); -void __RPC_STUB IShellLibrary_Save_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IShellLibrary_SaveInKnownFolder_Proxy( - IShellLibrary* This, - REFKNOWNFOLDERID kfidToSaveIn, - LPCWSTR pszLibraryName, - LIBRARYSAVEFLAGS lsf, - IShellItem **ppsiSavedTo); -void __RPC_STUB IShellLibrary_SaveInKnownFolder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IShellLibrary_INTERFACE_DEFINED__ */ @@ -37882,24 +31458,25 @@ typedef struct IPlaybackManagerEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPlaybackManagerEvents* This, + IPlaybackManagerEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPlaybackManagerEvents* This); + IPlaybackManagerEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - IPlaybackManagerEvents* This); + IPlaybackManagerEvents *This); /*** IPlaybackManagerEvents methods ***/ HRESULT (STDMETHODCALLTYPE *OnPlaybackManagerEvent)( - IPlaybackManagerEvents* This, + IPlaybackManagerEvents *This, DWORD dwSessionId, PBM_EVENT mediaEvent); END_INTERFACE } IPlaybackManagerEventsVtbl; + interface IPlaybackManagerEvents { CONST_VTBL IPlaybackManagerEventsVtbl* lpVtbl; }; @@ -37932,15 +31509,6 @@ static FORCEINLINE HRESULT IPlaybackManagerEvents_OnPlaybackManagerEvent(IPlayba #endif -HRESULT STDMETHODCALLTYPE IPlaybackManagerEvents_OnPlaybackManagerEvent_Proxy( - IPlaybackManagerEvents* This, - DWORD dwSessionId, - PBM_EVENT mediaEvent); -void __RPC_STUB IPlaybackManagerEvents_OnPlaybackManagerEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPlaybackManagerEvents_INTERFACE_DEFINED__ */ @@ -37995,35 +31563,36 @@ typedef struct IPlaybackManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPlaybackManager* This, + IPlaybackManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPlaybackManager* This); + IPlaybackManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IPlaybackManager* This); + IPlaybackManager *This); /*** IPlaybackManager methods ***/ HRESULT (STDMETHODCALLTYPE *Advise)( - IPlaybackManager* This, + IPlaybackManager *This, PBM_SESSION_TYPE type, IPlaybackManagerEvents *pEvents, DWORD *pdwSessionId); HRESULT (STDMETHODCALLTYPE *Unadvise)( - IPlaybackManager* This, + IPlaybackManager *This, DWORD dwSessionId); HRESULT (STDMETHODCALLTYPE *ChangeSessionState)( - IPlaybackManager* This, + IPlaybackManager *This, DWORD dwSessionId, PBM_PLAY_STATE state, PBM_MUTE_STATE mute); END_INTERFACE } IPlaybackManagerVtbl; + interface IPlaybackManager { CONST_VTBL IPlaybackManagerVtbl* lpVtbl; }; @@ -38064,34 +31633,6 @@ static FORCEINLINE HRESULT IPlaybackManager_ChangeSessionState(IPlaybackManager* #endif -HRESULT STDMETHODCALLTYPE IPlaybackManager_Advise_Proxy( - IPlaybackManager* This, - PBM_SESSION_TYPE type, - IPlaybackManagerEvents *pEvents, - DWORD *pdwSessionId); -void __RPC_STUB IPlaybackManager_Advise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPlaybackManager_Unadvise_Proxy( - IPlaybackManager* This, - DWORD dwSessionId); -void __RPC_STUB IPlaybackManager_Unadvise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPlaybackManager_ChangeSessionState_Proxy( - IPlaybackManager* This, - DWORD dwSessionId, - PBM_PLAY_STATE state, - PBM_MUTE_STATE mute); -void __RPC_STUB IPlaybackManager_ChangeSessionState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPlaybackManager_INTERFACE_DEFINED__ */ @@ -38152,19 +31693,19 @@ typedef struct IDefaultFolderMenuInitializeVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDefaultFolderMenuInitialize* This, + IDefaultFolderMenuInitialize *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDefaultFolderMenuInitialize* This); + IDefaultFolderMenuInitialize *This); ULONG (STDMETHODCALLTYPE *Release)( - IDefaultFolderMenuInitialize* This); + IDefaultFolderMenuInitialize *This); /*** IDefaultFolderMenuInitialize methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IDefaultFolderMenuInitialize* This, + IDefaultFolderMenuInitialize *This, HWND hwnd, IContextMenuCB *pcmcb, PCIDLIST_ABSOLUTE pidlFolder, @@ -38176,20 +31717,21 @@ typedef struct IDefaultFolderMenuInitializeVtbl { const HKEY *aKeys); HRESULT (STDMETHODCALLTYPE *SetMenuRestrictions)( - IDefaultFolderMenuInitialize* This, + IDefaultFolderMenuInitialize *This, DEFAULT_FOLDER_MENU_RESTRICTIONS dfmrValues); HRESULT (STDMETHODCALLTYPE *GetMenuRestrictions)( - IDefaultFolderMenuInitialize* This, + IDefaultFolderMenuInitialize *This, DEFAULT_FOLDER_MENU_RESTRICTIONS dfmrMask, DEFAULT_FOLDER_MENU_RESTRICTIONS *pdfmrValues); HRESULT (STDMETHODCALLTYPE *SetHandlerClsid)( - IDefaultFolderMenuInitialize* This, + IDefaultFolderMenuInitialize *This, REFCLSID rclsid); END_INTERFACE } IDefaultFolderMenuInitializeVtbl; + interface IDefaultFolderMenuInitialize { CONST_VTBL IDefaultFolderMenuInitializeVtbl* lpVtbl; }; @@ -38234,47 +31776,6 @@ static FORCEINLINE HRESULT IDefaultFolderMenuInitialize_SetHandlerClsid(IDefault #endif -HRESULT STDMETHODCALLTYPE IDefaultFolderMenuInitialize_Initialize_Proxy( - IDefaultFolderMenuInitialize* This, - HWND hwnd, - IContextMenuCB *pcmcb, - PCIDLIST_ABSOLUTE pidlFolder, - IShellFolder *psf, - UINT cidl, - PCUITEMID_CHILD_ARRAY apidl, - IUnknown *punkAssociation, - UINT cKeys, - const HKEY *aKeys); -void __RPC_STUB IDefaultFolderMenuInitialize_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDefaultFolderMenuInitialize_SetMenuRestrictions_Proxy( - IDefaultFolderMenuInitialize* This, - DEFAULT_FOLDER_MENU_RESTRICTIONS dfmrValues); -void __RPC_STUB IDefaultFolderMenuInitialize_SetMenuRestrictions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDefaultFolderMenuInitialize_GetMenuRestrictions_Proxy( - IDefaultFolderMenuInitialize* This, - DEFAULT_FOLDER_MENU_RESTRICTIONS dfmrMask, - DEFAULT_FOLDER_MENU_RESTRICTIONS *pdfmrValues); -void __RPC_STUB IDefaultFolderMenuInitialize_GetMenuRestrictions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDefaultFolderMenuInitialize_SetHandlerClsid_Proxy( - IDefaultFolderMenuInitialize* This, - REFCLSID rclsid); -void __RPC_STUB IDefaultFolderMenuInitialize_SetHandlerClsid_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDefaultFolderMenuInitialize_INTERFACE_DEFINED__ */ @@ -38327,39 +31828,40 @@ typedef struct IApplicationActivationManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IApplicationActivationManager* This, + IApplicationActivationManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IApplicationActivationManager* This); + IApplicationActivationManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IApplicationActivationManager* This); + IApplicationActivationManager *This); /*** IApplicationActivationManager methods ***/ HRESULT (STDMETHODCALLTYPE *ActivateApplication)( - IApplicationActivationManager* This, + IApplicationActivationManager *This, LPCWSTR appUserModelId, LPCWSTR arguments, ACTIVATEOPTIONS options, DWORD *processId); HRESULT (STDMETHODCALLTYPE *ActivateForFile)( - IApplicationActivationManager* This, + IApplicationActivationManager *This, LPCWSTR appUserModelId, IShellItemArray *itemArray, LPCWSTR verb, DWORD *processId); HRESULT (STDMETHODCALLTYPE *ActivateForProtocol)( - IApplicationActivationManager* This, + IApplicationActivationManager *This, LPCWSTR appUserModelId, IShellItemArray *itemArray, DWORD *processId); END_INTERFACE } IApplicationActivationManagerVtbl; + interface IApplicationActivationManager { CONST_VTBL IApplicationActivationManagerVtbl* lpVtbl; }; @@ -38400,38 +31902,6 @@ static FORCEINLINE HRESULT IApplicationActivationManager_ActivateForProtocol(IAp #endif -HRESULT STDMETHODCALLTYPE IApplicationActivationManager_ActivateApplication_Proxy( - IApplicationActivationManager* This, - LPCWSTR appUserModelId, - LPCWSTR arguments, - ACTIVATEOPTIONS options, - DWORD *processId); -void __RPC_STUB IApplicationActivationManager_ActivateApplication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationActivationManager_ActivateForFile_Proxy( - IApplicationActivationManager* This, - LPCWSTR appUserModelId, - IShellItemArray *itemArray, - LPCWSTR verb, - DWORD *processId); -void __RPC_STUB IApplicationActivationManager_ActivateForFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationActivationManager_ActivateForProtocol_Proxy( - IApplicationActivationManager* This, - LPCWSTR appUserModelId, - IShellItemArray *itemArray, - DWORD *processId); -void __RPC_STUB IApplicationActivationManager_ActivateForProtocol_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IApplicationActivationManager_INTERFACE_DEFINED__ */ @@ -39493,25 +32963,26 @@ typedef struct IAssocHandlerInvokerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAssocHandlerInvoker* This, + IAssocHandlerInvoker *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAssocHandlerInvoker* This); + IAssocHandlerInvoker *This); ULONG (STDMETHODCALLTYPE *Release)( - IAssocHandlerInvoker* This); + IAssocHandlerInvoker *This); /*** IAssocHandlerInvoker methods ***/ HRESULT (STDMETHODCALLTYPE *SupportsSelection)( - IAssocHandlerInvoker* This); + IAssocHandlerInvoker *This); HRESULT (STDMETHODCALLTYPE *Invoke)( - IAssocHandlerInvoker* This); + IAssocHandlerInvoker *This); END_INTERFACE } IAssocHandlerInvokerVtbl; + interface IAssocHandlerInvoker { CONST_VTBL IAssocHandlerInvokerVtbl* lpVtbl; }; @@ -39548,20 +33019,6 @@ static FORCEINLINE HRESULT IAssocHandlerInvoker_Invoke(IAssocHandlerInvoker* Thi #endif -HRESULT STDMETHODCALLTYPE IAssocHandlerInvoker_SupportsSelection_Proxy( - IAssocHandlerInvoker* This); -void __RPC_STUB IAssocHandlerInvoker_SupportsSelection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAssocHandlerInvoker_Invoke_Proxy( - IAssocHandlerInvoker* This); -void __RPC_STUB IAssocHandlerInvoker_Invoke_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAssocHandlerInvoker_INTERFACE_DEFINED__ */ @@ -39610,48 +33067,49 @@ typedef struct IAssocHandlerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAssocHandler* This, + IAssocHandler *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAssocHandler* This); + IAssocHandler *This); ULONG (STDMETHODCALLTYPE *Release)( - IAssocHandler* This); + IAssocHandler *This); /*** IAssocHandler methods ***/ HRESULT (STDMETHODCALLTYPE *GetName)( - IAssocHandler* This, + IAssocHandler *This, LPWSTR *ppsz); HRESULT (STDMETHODCALLTYPE *GetUIName)( - IAssocHandler* This, + IAssocHandler *This, LPWSTR *ppsz); HRESULT (STDMETHODCALLTYPE *GetIconLocation)( - IAssocHandler* This, + IAssocHandler *This, LPWSTR *ppszPath, int *pIndex); HRESULT (STDMETHODCALLTYPE *IsRecommended)( - IAssocHandler* This); + IAssocHandler *This); HRESULT (STDMETHODCALLTYPE *MakeDefault)( - IAssocHandler* This, + IAssocHandler *This, LPCWSTR pszDescription); HRESULT (STDMETHODCALLTYPE *Invoke)( - IAssocHandler* This, + IAssocHandler *This, IDataObject *pdo); HRESULT (STDMETHODCALLTYPE *CreateInvoker)( - IAssocHandler* This, + IAssocHandler *This, IDataObject *pdo, IAssocHandlerInvoker **ppInvoker); END_INTERFACE } IAssocHandlerVtbl; + interface IAssocHandler { CONST_VTBL IAssocHandlerVtbl* lpVtbl; }; @@ -39708,63 +33166,6 @@ static FORCEINLINE HRESULT IAssocHandler_CreateInvoker(IAssocHandler* This,IData #endif -HRESULT STDMETHODCALLTYPE IAssocHandler_GetName_Proxy( - IAssocHandler* This, - LPWSTR *ppsz); -void __RPC_STUB IAssocHandler_GetName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAssocHandler_GetUIName_Proxy( - IAssocHandler* This, - LPWSTR *ppsz); -void __RPC_STUB IAssocHandler_GetUIName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAssocHandler_GetIconLocation_Proxy( - IAssocHandler* This, - LPWSTR *ppszPath, - int *pIndex); -void __RPC_STUB IAssocHandler_GetIconLocation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAssocHandler_IsRecommended_Proxy( - IAssocHandler* This); -void __RPC_STUB IAssocHandler_IsRecommended_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAssocHandler_MakeDefault_Proxy( - IAssocHandler* This, - LPCWSTR pszDescription); -void __RPC_STUB IAssocHandler_MakeDefault_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAssocHandler_Invoke_Proxy( - IAssocHandler* This, - IDataObject *pdo); -void __RPC_STUB IAssocHandler_Invoke_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAssocHandler_CreateInvoker_Proxy( - IAssocHandler* This, - IDataObject *pdo, - IAssocHandlerInvoker **ppInvoker); -void __RPC_STUB IAssocHandler_CreateInvoker_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAssocHandler_INTERFACE_DEFINED__ */ @@ -39795,25 +33196,26 @@ typedef struct IEnumAssocHandlersVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumAssocHandlers* This, + IEnumAssocHandlers *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumAssocHandlers* This); + IEnumAssocHandlers *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumAssocHandlers* This); + IEnumAssocHandlers *This); /*** IEnumAssocHandlers methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumAssocHandlers* This, + IEnumAssocHandlers *This, ULONG celt, IAssocHandler **rgelt, ULONG *pceltFetched); END_INTERFACE } IEnumAssocHandlersVtbl; + interface IEnumAssocHandlers { CONST_VTBL IEnumAssocHandlersVtbl* lpVtbl; }; @@ -39846,16 +33248,6 @@ static FORCEINLINE HRESULT IEnumAssocHandlers_Next(IEnumAssocHandlers* This,ULON #endif -HRESULT STDMETHODCALLTYPE IEnumAssocHandlers_Next_Proxy( - IEnumAssocHandlers* This, - ULONG celt, - IAssocHandler **rgelt, - ULONG *pceltFetched); -void __RPC_STUB IEnumAssocHandlers_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumAssocHandlers_INTERFACE_DEFINED__ */ @@ -39902,27 +33294,28 @@ typedef struct IDataObjectProviderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDataObjectProvider* This, + IDataObjectProvider *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDataObjectProvider* This); + IDataObjectProvider *This); ULONG (STDMETHODCALLTYPE *Release)( - IDataObjectProvider* This); + IDataObjectProvider *This); /*** IDataObjectProvider methods ***/ HRESULT (STDMETHODCALLTYPE *GetDataObject)( - IDataObjectProvider* This, + IDataObjectProvider *This, IDataObject **dataObject); HRESULT (STDMETHODCALLTYPE *SetDataObject)( - IDataObjectProvider* This, + IDataObjectProvider *This, IDataObject *dataObject); END_INTERFACE } IDataObjectProviderVtbl; + interface IDataObjectProvider { CONST_VTBL IDataObjectProviderVtbl* lpVtbl; }; @@ -39959,14 +33352,6 @@ static FORCEINLINE HRESULT IDataObjectProvider_SetDataObject(IDataObjectProvider #endif -HRESULT STDMETHODCALLTYPE IDataObjectProvider_GetDataObject_Proxy( - IDataObjectProvider* This, - IDataObject **dataObject); -void __RPC_STUB IDataObjectProvider_GetDataObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDataObjectProvider_INTERFACE_DEFINED__ */ @@ -40000,29 +33385,30 @@ typedef struct IDataTransferManagerInteropVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDataTransferManagerInterop* This, + IDataTransferManagerInterop *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDataTransferManagerInterop* This); + IDataTransferManagerInterop *This); ULONG (STDMETHODCALLTYPE *Release)( - IDataTransferManagerInterop* This); + IDataTransferManagerInterop *This); /*** IDataTransferManagerInterop methods ***/ HRESULT (STDMETHODCALLTYPE *GetForWindow)( - IDataTransferManagerInterop* This, + IDataTransferManagerInterop *This, HWND appWindow, REFIID riid, void **dataTransferManager); HRESULT (STDMETHODCALLTYPE *ShowShareUIForWindow)( - IDataTransferManagerInterop* This, + IDataTransferManagerInterop *This, HWND appWindow); END_INTERFACE } IDataTransferManagerInteropVtbl; + interface IDataTransferManagerInterop { CONST_VTBL IDataTransferManagerInteropVtbl* lpVtbl; }; @@ -40059,24 +33445,6 @@ static FORCEINLINE HRESULT IDataTransferManagerInterop_ShowShareUIForWindow(IDat #endif -HRESULT STDMETHODCALLTYPE IDataTransferManagerInterop_GetForWindow_Proxy( - IDataTransferManagerInterop* This, - HWND appWindow, - REFIID riid, - void **dataTransferManager); -void __RPC_STUB IDataTransferManagerInterop_GetForWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDataTransferManagerInterop_ShowShareUIForWindow_Proxy( - IDataTransferManagerInterop* This, - HWND appWindow); -void __RPC_STUB IDataTransferManagerInterop_ShowShareUIForWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDataTransferManagerInterop_INTERFACE_DEFINED__ */ @@ -40109,28 +33477,29 @@ typedef struct IFrameworkInputPaneHandlerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFrameworkInputPaneHandler* This, + IFrameworkInputPaneHandler *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFrameworkInputPaneHandler* This); + IFrameworkInputPaneHandler *This); ULONG (STDMETHODCALLTYPE *Release)( - IFrameworkInputPaneHandler* This); + IFrameworkInputPaneHandler *This); /*** IFrameworkInputPaneHandler methods ***/ HRESULT (STDMETHODCALLTYPE *Showing)( - IFrameworkInputPaneHandler* This, + IFrameworkInputPaneHandler *This, RECT *prcInputPaneScreenLocation, WINBOOL fEnsureFocusedElementInView); HRESULT (STDMETHODCALLTYPE *Hiding)( - IFrameworkInputPaneHandler* This, + IFrameworkInputPaneHandler *This, WINBOOL fEnsureFocusedElementInView); END_INTERFACE } IFrameworkInputPaneHandlerVtbl; + interface IFrameworkInputPaneHandler { CONST_VTBL IFrameworkInputPaneHandlerVtbl* lpVtbl; }; @@ -40167,23 +33536,6 @@ static FORCEINLINE HRESULT IFrameworkInputPaneHandler_Hiding(IFrameworkInputPane #endif -HRESULT STDMETHODCALLTYPE IFrameworkInputPaneHandler_Showing_Proxy( - IFrameworkInputPaneHandler* This, - RECT *prcInputPaneScreenLocation, - WINBOOL fEnsureFocusedElementInView); -void __RPC_STUB IFrameworkInputPaneHandler_Showing_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFrameworkInputPaneHandler_Hiding_Proxy( - IFrameworkInputPaneHandler* This, - WINBOOL fEnsureFocusedElementInView); -void __RPC_STUB IFrameworkInputPaneHandler_Hiding_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFrameworkInputPaneHandler_INTERFACE_DEFINED__ */ @@ -40225,39 +33577,40 @@ typedef struct IFrameworkInputPaneVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFrameworkInputPane* This, + IFrameworkInputPane *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFrameworkInputPane* This); + IFrameworkInputPane *This); ULONG (STDMETHODCALLTYPE *Release)( - IFrameworkInputPane* This); + IFrameworkInputPane *This); /*** IFrameworkInputPane methods ***/ HRESULT (STDMETHODCALLTYPE *Advise)( - IFrameworkInputPane* This, + IFrameworkInputPane *This, IUnknown *pWindow, IFrameworkInputPaneHandler *pHandler, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *AdviseWithHWND)( - IFrameworkInputPane* This, + IFrameworkInputPane *This, HWND hwnd, IFrameworkInputPaneHandler *pHandler, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *Unadvise)( - IFrameworkInputPane* This, + IFrameworkInputPane *This, DWORD dwCookie); HRESULT (STDMETHODCALLTYPE *Location)( - IFrameworkInputPane* This, + IFrameworkInputPane *This, RECT *prcInputPaneScreenLocation); END_INTERFACE } IFrameworkInputPaneVtbl; + interface IFrameworkInputPane { CONST_VTBL IFrameworkInputPaneVtbl* lpVtbl; }; @@ -40302,42 +33655,6 @@ static FORCEINLINE HRESULT IFrameworkInputPane_Location(IFrameworkInputPane* Thi #endif -HRESULT STDMETHODCALLTYPE IFrameworkInputPane_Advise_Proxy( - IFrameworkInputPane* This, - IUnknown *pWindow, - IFrameworkInputPaneHandler *pHandler, - DWORD *pdwCookie); -void __RPC_STUB IFrameworkInputPane_Advise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFrameworkInputPane_AdviseWithHWND_Proxy( - IFrameworkInputPane* This, - HWND hwnd, - IFrameworkInputPaneHandler *pHandler, - DWORD *pdwCookie); -void __RPC_STUB IFrameworkInputPane_AdviseWithHWND_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFrameworkInputPane_Unadvise_Proxy( - IFrameworkInputPane* This, - DWORD dwCookie); -void __RPC_STUB IFrameworkInputPane_Unadvise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFrameworkInputPane_Location_Proxy( - IFrameworkInputPane* This, - RECT *prcInputPaneScreenLocation); -void __RPC_STUB IFrameworkInputPane_Location_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFrameworkInputPane_INTERFACE_DEFINED__ */ @@ -40387,23 +33704,24 @@ typedef struct ISearchableApplicationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISearchableApplication* This, + ISearchableApplication *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISearchableApplication* This); + ISearchableApplication *This); ULONG (STDMETHODCALLTYPE *Release)( - ISearchableApplication* This); + ISearchableApplication *This); /*** ISearchableApplication methods ***/ HRESULT (STDMETHODCALLTYPE *GetSearchWindow)( - ISearchableApplication* This, + ISearchableApplication *This, HWND *hwnd); END_INTERFACE } ISearchableApplicationVtbl; + interface ISearchableApplication { CONST_VTBL ISearchableApplicationVtbl* lpVtbl; }; @@ -40436,14 +33754,6 @@ static FORCEINLINE HRESULT ISearchableApplication_GetSearchWindow(ISearchableApp #endif -HRESULT STDMETHODCALLTYPE ISearchableApplication_GetSearchWindow_Proxy( - ISearchableApplication* This, - HWND *hwnd); -void __RPC_STUB ISearchableApplication_GetSearchWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISearchableApplication_INTERFACE_DEFINED__ */ @@ -40477,23 +33787,24 @@ typedef struct IAccessibilityDockingServiceCallbackVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAccessibilityDockingServiceCallback* This, + IAccessibilityDockingServiceCallback *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAccessibilityDockingServiceCallback* This); + IAccessibilityDockingServiceCallback *This); ULONG (STDMETHODCALLTYPE *Release)( - IAccessibilityDockingServiceCallback* This); + IAccessibilityDockingServiceCallback *This); /*** IAccessibilityDockingServiceCallback methods ***/ HRESULT (STDMETHODCALLTYPE *Undocked)( - IAccessibilityDockingServiceCallback* This, + IAccessibilityDockingServiceCallback *This, UNDOCK_REASON undockReason); END_INTERFACE } IAccessibilityDockingServiceCallbackVtbl; + interface IAccessibilityDockingServiceCallback { CONST_VTBL IAccessibilityDockingServiceCallbackVtbl* lpVtbl; }; @@ -40526,14 +33837,6 @@ static FORCEINLINE HRESULT IAccessibilityDockingServiceCallback_Undocked(IAccess #endif -HRESULT STDMETHODCALLTYPE IAccessibilityDockingServiceCallback_Undocked_Proxy( - IAccessibilityDockingServiceCallback* This, - UNDOCK_REASON undockReason); -void __RPC_STUB IAccessibilityDockingServiceCallback_Undocked_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAccessibilityDockingServiceCallback_INTERFACE_DEFINED__ */ @@ -40573,36 +33876,37 @@ typedef struct IAccessibilityDockingServiceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAccessibilityDockingService* This, + IAccessibilityDockingService *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAccessibilityDockingService* This); + IAccessibilityDockingService *This); ULONG (STDMETHODCALLTYPE *Release)( - IAccessibilityDockingService* This); + IAccessibilityDockingService *This); /*** IAccessibilityDockingService methods ***/ HRESULT (STDMETHODCALLTYPE *GetAvailableSize)( - IAccessibilityDockingService* This, + IAccessibilityDockingService *This, HMONITOR hMonitor, UINT *pcxFixed, UINT *pcyMax); HRESULT (STDMETHODCALLTYPE *DockWindow)( - IAccessibilityDockingService* This, + IAccessibilityDockingService *This, HWND hwnd, HMONITOR hMonitor, UINT cyRequested, IAccessibilityDockingServiceCallback *pCallback); HRESULT (STDMETHODCALLTYPE *UndockWindow)( - IAccessibilityDockingService* This, + IAccessibilityDockingService *This, HWND hwnd); END_INTERFACE } IAccessibilityDockingServiceVtbl; + interface IAccessibilityDockingService { CONST_VTBL IAccessibilityDockingServiceVtbl* lpVtbl; }; @@ -40643,35 +33947,6 @@ static FORCEINLINE HRESULT IAccessibilityDockingService_UndockWindow(IAccessibil #endif -HRESULT STDMETHODCALLTYPE IAccessibilityDockingService_GetAvailableSize_Proxy( - IAccessibilityDockingService* This, - HMONITOR hMonitor, - UINT *pcxFixed, - UINT *pcyMax); -void __RPC_STUB IAccessibilityDockingService_GetAvailableSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAccessibilityDockingService_DockWindow_Proxy( - IAccessibilityDockingService* This, - HWND hwnd, - HMONITOR hMonitor, - UINT cyRequested, - IAccessibilityDockingServiceCallback *pCallback); -void __RPC_STUB IAccessibilityDockingService_DockWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAccessibilityDockingService_UndockWindow_Proxy( - IAccessibilityDockingService* This, - HWND hwnd); -void __RPC_STUB IAccessibilityDockingService_UndockWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAccessibilityDockingService_INTERFACE_DEFINED__ */ @@ -40711,29 +33986,30 @@ typedef struct IAppVisibilityEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAppVisibilityEvents* This, + IAppVisibilityEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAppVisibilityEvents* This); + IAppVisibilityEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - IAppVisibilityEvents* This); + IAppVisibilityEvents *This); /*** IAppVisibilityEvents methods ***/ HRESULT (STDMETHODCALLTYPE *AppVisibilityOnMonitorChanged)( - IAppVisibilityEvents* This, + IAppVisibilityEvents *This, HMONITOR hMonitor, MONITOR_APP_VISIBILITY previousMode, MONITOR_APP_VISIBILITY currentMode); HRESULT (STDMETHODCALLTYPE *LauncherVisibilityChange)( - IAppVisibilityEvents* This, + IAppVisibilityEvents *This, WINBOOL currentVisibleState); END_INTERFACE } IAppVisibilityEventsVtbl; + interface IAppVisibilityEvents { CONST_VTBL IAppVisibilityEventsVtbl* lpVtbl; }; @@ -40770,24 +34046,6 @@ static FORCEINLINE HRESULT IAppVisibilityEvents_LauncherVisibilityChange(IAppVis #endif -HRESULT STDMETHODCALLTYPE IAppVisibilityEvents_AppVisibilityOnMonitorChanged_Proxy( - IAppVisibilityEvents* This, - HMONITOR hMonitor, - MONITOR_APP_VISIBILITY previousMode, - MONITOR_APP_VISIBILITY currentMode); -void __RPC_STUB IAppVisibilityEvents_AppVisibilityOnMonitorChanged_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAppVisibilityEvents_LauncherVisibilityChange_Proxy( - IAppVisibilityEvents* This, - WINBOOL currentVisibleState); -void __RPC_STUB IAppVisibilityEvents_LauncherVisibilityChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAppVisibilityEvents_INTERFACE_DEFINED__ */ @@ -40827,37 +34085,38 @@ typedef struct IAppVisibilityVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAppVisibility* This, + IAppVisibility *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAppVisibility* This); + IAppVisibility *This); ULONG (STDMETHODCALLTYPE *Release)( - IAppVisibility* This); + IAppVisibility *This); /*** IAppVisibility methods ***/ HRESULT (STDMETHODCALLTYPE *GetAppVisibilityOnMonitor)( - IAppVisibility* This, + IAppVisibility *This, HMONITOR hMonitor, MONITOR_APP_VISIBILITY *pMode); HRESULT (STDMETHODCALLTYPE *IsLauncherVisible)( - IAppVisibility* This, + IAppVisibility *This, WINBOOL *pfVisible); HRESULT (STDMETHODCALLTYPE *Advise)( - IAppVisibility* This, + IAppVisibility *This, IAppVisibilityEvents *pCallback, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *Unadvise)( - IAppVisibility* This, + IAppVisibility *This, DWORD dwCookie); END_INTERFACE } IAppVisibilityVtbl; + interface IAppVisibility { CONST_VTBL IAppVisibilityVtbl* lpVtbl; }; @@ -40902,40 +34161,6 @@ static FORCEINLINE HRESULT IAppVisibility_Unadvise(IAppVisibility* This,DWORD dw #endif -HRESULT STDMETHODCALLTYPE IAppVisibility_GetAppVisibilityOnMonitor_Proxy( - IAppVisibility* This, - HMONITOR hMonitor, - MONITOR_APP_VISIBILITY *pMode); -void __RPC_STUB IAppVisibility_GetAppVisibilityOnMonitor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAppVisibility_IsLauncherVisible_Proxy( - IAppVisibility* This, - WINBOOL *pfVisible); -void __RPC_STUB IAppVisibility_IsLauncherVisible_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAppVisibility_Advise_Proxy( - IAppVisibility* This, - IAppVisibilityEvents *pCallback, - DWORD *pdwCookie); -void __RPC_STUB IAppVisibility_Advise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAppVisibility_Unadvise_Proxy( - IAppVisibility* This, - DWORD dwCookie); -void __RPC_STUB IAppVisibility_Unadvise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAppVisibility_INTERFACE_DEFINED__ */ @@ -40977,24 +34202,25 @@ typedef struct IPackageExecutionStateChangeNotificationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPackageExecutionStateChangeNotification* This, + IPackageExecutionStateChangeNotification *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPackageExecutionStateChangeNotification* This); + IPackageExecutionStateChangeNotification *This); ULONG (STDMETHODCALLTYPE *Release)( - IPackageExecutionStateChangeNotification* This); + IPackageExecutionStateChangeNotification *This); /*** IPackageExecutionStateChangeNotification methods ***/ HRESULT (STDMETHODCALLTYPE *OnStateChanged)( - IPackageExecutionStateChangeNotification* This, + IPackageExecutionStateChangeNotification *This, LPCWSTR pszPackageFullName, PACKAGE_EXECUTION_STATE pesNewState); END_INTERFACE } IPackageExecutionStateChangeNotificationVtbl; + interface IPackageExecutionStateChangeNotification { CONST_VTBL IPackageExecutionStateChangeNotificationVtbl* lpVtbl; }; @@ -41027,15 +34253,6 @@ static FORCEINLINE HRESULT IPackageExecutionStateChangeNotification_OnStateChang #endif -HRESULT STDMETHODCALLTYPE IPackageExecutionStateChangeNotification_OnStateChanged_Proxy( - IPackageExecutionStateChangeNotification* This, - LPCWSTR pszPackageFullName, - PACKAGE_EXECUTION_STATE pesNewState); -void __RPC_STUB IPackageExecutionStateChangeNotification_OnStateChanged_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPackageExecutionStateChangeNotification_INTERFACE_DEFINED__ */ @@ -41115,88 +34332,89 @@ typedef struct IPackageDebugSettingsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPackageDebugSettings* This, + IPackageDebugSettings *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPackageDebugSettings* This); + IPackageDebugSettings *This); ULONG (STDMETHODCALLTYPE *Release)( - IPackageDebugSettings* This); + IPackageDebugSettings *This); /*** IPackageDebugSettings methods ***/ HRESULT (STDMETHODCALLTYPE *EnableDebugging)( - IPackageDebugSettings* This, + IPackageDebugSettings *This, LPCWSTR packageFullName, LPCWSTR debuggerCommandLine, PZZWSTR environment); HRESULT (STDMETHODCALLTYPE *DisableDebugging)( - IPackageDebugSettings* This, + IPackageDebugSettings *This, LPCWSTR packageFullName); HRESULT (STDMETHODCALLTYPE *Suspend)( - IPackageDebugSettings* This, + IPackageDebugSettings *This, LPCWSTR packageFullName); HRESULT (STDMETHODCALLTYPE *Resume)( - IPackageDebugSettings* This, + IPackageDebugSettings *This, LPCWSTR packageFullName); HRESULT (STDMETHODCALLTYPE *TerminateAllProcesses)( - IPackageDebugSettings* This, + IPackageDebugSettings *This, LPCWSTR packageFullName); HRESULT (STDMETHODCALLTYPE *SetTargetSessionId)( - IPackageDebugSettings* This, + IPackageDebugSettings *This, ULONG sessionId); HRESULT (STDMETHODCALLTYPE *EnumerateBackgroundTasks)( - IPackageDebugSettings* This, + IPackageDebugSettings *This, LPCWSTR packageFullName, ULONG *taskCount, LPCGUID *taskIds, LPCWSTR **taskNames); HRESULT (STDMETHODCALLTYPE *ActivateBackgroundTask)( - IPackageDebugSettings* This, + IPackageDebugSettings *This, LPCGUID taskId); HRESULT (STDMETHODCALLTYPE *StartServicing)( - IPackageDebugSettings* This, + IPackageDebugSettings *This, LPCWSTR packageFullName); HRESULT (STDMETHODCALLTYPE *StopServicing)( - IPackageDebugSettings* This, + IPackageDebugSettings *This, LPCWSTR packageFullName); HRESULT (STDMETHODCALLTYPE *StartSessionRedirection)( - IPackageDebugSettings* This, + IPackageDebugSettings *This, LPCWSTR packageFullName, ULONG sessionId); HRESULT (STDMETHODCALLTYPE *StopSessionRedirection)( - IPackageDebugSettings* This, + IPackageDebugSettings *This, LPCWSTR packageFullName); HRESULT (STDMETHODCALLTYPE *GetPackageExecutionState)( - IPackageDebugSettings* This, + IPackageDebugSettings *This, LPCWSTR packageFullName, PACKAGE_EXECUTION_STATE *packageExecutionState); HRESULT (STDMETHODCALLTYPE *RegisterForPackageStateChanges)( - IPackageDebugSettings* This, + IPackageDebugSettings *This, LPCWSTR packageFullName, IPackageExecutionStateChangeNotification *pPackageExecutionStateChangeNotification, DWORD *pdwCookie); HRESULT (STDMETHODCALLTYPE *UnregisterForPackageStateChanges)( - IPackageDebugSettings* This, + IPackageDebugSettings *This, DWORD dwCookie); END_INTERFACE } IPackageDebugSettingsVtbl; + interface IPackageDebugSettings { CONST_VTBL IPackageDebugSettingsVtbl* lpVtbl; }; @@ -41285,135 +34503,6 @@ static FORCEINLINE HRESULT IPackageDebugSettings_UnregisterForPackageStateChange #endif -HRESULT STDMETHODCALLTYPE IPackageDebugSettings_EnableDebugging_Proxy( - IPackageDebugSettings* This, - LPCWSTR packageFullName, - LPCWSTR debuggerCommandLine, - PZZWSTR environment); -void __RPC_STUB IPackageDebugSettings_EnableDebugging_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPackageDebugSettings_DisableDebugging_Proxy( - IPackageDebugSettings* This, - LPCWSTR packageFullName); -void __RPC_STUB IPackageDebugSettings_DisableDebugging_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPackageDebugSettings_Suspend_Proxy( - IPackageDebugSettings* This, - LPCWSTR packageFullName); -void __RPC_STUB IPackageDebugSettings_Suspend_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPackageDebugSettings_Resume_Proxy( - IPackageDebugSettings* This, - LPCWSTR packageFullName); -void __RPC_STUB IPackageDebugSettings_Resume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPackageDebugSettings_TerminateAllProcesses_Proxy( - IPackageDebugSettings* This, - LPCWSTR packageFullName); -void __RPC_STUB IPackageDebugSettings_TerminateAllProcesses_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPackageDebugSettings_SetTargetSessionId_Proxy( - IPackageDebugSettings* This, - ULONG sessionId); -void __RPC_STUB IPackageDebugSettings_SetTargetSessionId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPackageDebugSettings_EnumerateBackgroundTasks_Proxy( - IPackageDebugSettings* This, - LPCWSTR packageFullName, - ULONG *taskCount, - LPCGUID *taskIds, - LPCWSTR **taskNames); -void __RPC_STUB IPackageDebugSettings_EnumerateBackgroundTasks_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPackageDebugSettings_ActivateBackgroundTask_Proxy( - IPackageDebugSettings* This, - LPCGUID taskId); -void __RPC_STUB IPackageDebugSettings_ActivateBackgroundTask_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPackageDebugSettings_StartServicing_Proxy( - IPackageDebugSettings* This, - LPCWSTR packageFullName); -void __RPC_STUB IPackageDebugSettings_StartServicing_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPackageDebugSettings_StopServicing_Proxy( - IPackageDebugSettings* This, - LPCWSTR packageFullName); -void __RPC_STUB IPackageDebugSettings_StopServicing_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPackageDebugSettings_StartSessionRedirection_Proxy( - IPackageDebugSettings* This, - LPCWSTR packageFullName, - ULONG sessionId); -void __RPC_STUB IPackageDebugSettings_StartSessionRedirection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPackageDebugSettings_StopSessionRedirection_Proxy( - IPackageDebugSettings* This, - LPCWSTR packageFullName); -void __RPC_STUB IPackageDebugSettings_StopSessionRedirection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPackageDebugSettings_GetPackageExecutionState_Proxy( - IPackageDebugSettings* This, - LPCWSTR packageFullName, - PACKAGE_EXECUTION_STATE *packageExecutionState); -void __RPC_STUB IPackageDebugSettings_GetPackageExecutionState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPackageDebugSettings_RegisterForPackageStateChanges_Proxy( - IPackageDebugSettings* This, - LPCWSTR packageFullName, - IPackageExecutionStateChangeNotification *pPackageExecutionStateChangeNotification, - DWORD *pdwCookie); -void __RPC_STUB IPackageDebugSettings_RegisterForPackageStateChanges_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPackageDebugSettings_UnregisterForPackageStateChanges_Proxy( - IPackageDebugSettings* This, - DWORD dwCookie); -void __RPC_STUB IPackageDebugSettings_UnregisterForPackageStateChanges_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPackageDebugSettings_INTERFACE_DEFINED__ */ @@ -41447,23 +34536,24 @@ typedef struct IExecuteCommandApplicationHostEnvironmentVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IExecuteCommandApplicationHostEnvironment* This, + IExecuteCommandApplicationHostEnvironment *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IExecuteCommandApplicationHostEnvironment* This); + IExecuteCommandApplicationHostEnvironment *This); ULONG (STDMETHODCALLTYPE *Release)( - IExecuteCommandApplicationHostEnvironment* This); + IExecuteCommandApplicationHostEnvironment *This); /*** IExecuteCommandApplicationHostEnvironment methods ***/ HRESULT (STDMETHODCALLTYPE *GetValue)( - IExecuteCommandApplicationHostEnvironment* This, + IExecuteCommandApplicationHostEnvironment *This, AHE_TYPE *pahe); END_INTERFACE } IExecuteCommandApplicationHostEnvironmentVtbl; + interface IExecuteCommandApplicationHostEnvironment { CONST_VTBL IExecuteCommandApplicationHostEnvironmentVtbl* lpVtbl; }; @@ -41496,14 +34586,6 @@ static FORCEINLINE HRESULT IExecuteCommandApplicationHostEnvironment_GetValue(IE #endif -HRESULT STDMETHODCALLTYPE IExecuteCommandApplicationHostEnvironment_GetValue_Proxy( - IExecuteCommandApplicationHostEnvironment* This, - AHE_TYPE *pahe); -void __RPC_STUB IExecuteCommandApplicationHostEnvironment_GetValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IExecuteCommandApplicationHostEnvironment_INTERFACE_DEFINED__ */ @@ -41538,23 +34620,24 @@ typedef struct IExecuteCommandHostVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IExecuteCommandHost* This, + IExecuteCommandHost *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IExecuteCommandHost* This); + IExecuteCommandHost *This); ULONG (STDMETHODCALLTYPE *Release)( - IExecuteCommandHost* This); + IExecuteCommandHost *This); /*** IExecuteCommandHost methods ***/ HRESULT (STDMETHODCALLTYPE *GetUIMode)( - IExecuteCommandHost* This, + IExecuteCommandHost *This, EC_HOST_UI_MODE *pUIMode); END_INTERFACE } IExecuteCommandHostVtbl; + interface IExecuteCommandHost { CONST_VTBL IExecuteCommandHostVtbl* lpVtbl; }; @@ -41587,14 +34670,6 @@ static FORCEINLINE HRESULT IExecuteCommandHost_GetUIMode(IExecuteCommandHost* Th #endif -HRESULT STDMETHODCALLTYPE IExecuteCommandHost_GetUIMode_Proxy( - IExecuteCommandHost* This, - EC_HOST_UI_MODE *pUIMode); -void __RPC_STUB IExecuteCommandHost_GetUIMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IExecuteCommandHost_INTERFACE_DEFINED__ */ @@ -41656,46 +34731,47 @@ typedef struct IApplicationDesignModeSettingsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IApplicationDesignModeSettings* This, + IApplicationDesignModeSettings *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IApplicationDesignModeSettings* This); + IApplicationDesignModeSettings *This); ULONG (STDMETHODCALLTYPE *Release)( - IApplicationDesignModeSettings* This); + IApplicationDesignModeSettings *This); /*** IApplicationDesignModeSettings methods ***/ HRESULT (STDMETHODCALLTYPE *SetNativeDisplaySize)( - IApplicationDesignModeSettings* This, + IApplicationDesignModeSettings *This, SIZE sizeNativeDisplay); HRESULT (STDMETHODCALLTYPE *SetScaleFactor)( - IApplicationDesignModeSettings* This, + IApplicationDesignModeSettings *This, DEVICE_SCALE_FACTOR scaleFactor); HRESULT (STDMETHODCALLTYPE *SetApplicationViewState)( - IApplicationDesignModeSettings* This, + IApplicationDesignModeSettings *This, APPLICATION_VIEW_STATE viewState); HRESULT (STDMETHODCALLTYPE *ComputeApplicationSize)( - IApplicationDesignModeSettings* This, + IApplicationDesignModeSettings *This, SIZE *psizeApplication); HRESULT (STDMETHODCALLTYPE *IsApplicationViewStateSupported)( - IApplicationDesignModeSettings* This, + IApplicationDesignModeSettings *This, APPLICATION_VIEW_STATE viewState, SIZE sizeNativeDisplay, DEVICE_SCALE_FACTOR scaleFactor, WINBOOL *pfSupported); HRESULT (STDMETHODCALLTYPE *TriggerEdgeGesture)( - IApplicationDesignModeSettings* This, + IApplicationDesignModeSettings *This, EDGE_GESTURE_KIND edgeGestureKind); END_INTERFACE } IApplicationDesignModeSettingsVtbl; + interface IApplicationDesignModeSettings { CONST_VTBL IApplicationDesignModeSettingsVtbl* lpVtbl; }; @@ -41748,57 +34824,6 @@ static FORCEINLINE HRESULT IApplicationDesignModeSettings_TriggerEdgeGesture(IAp #endif -HRESULT STDMETHODCALLTYPE IApplicationDesignModeSettings_SetNativeDisplaySize_Proxy( - IApplicationDesignModeSettings* This, - SIZE sizeNativeDisplay); -void __RPC_STUB IApplicationDesignModeSettings_SetNativeDisplaySize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationDesignModeSettings_SetScaleFactor_Proxy( - IApplicationDesignModeSettings* This, - DEVICE_SCALE_FACTOR scaleFactor); -void __RPC_STUB IApplicationDesignModeSettings_SetScaleFactor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationDesignModeSettings_SetApplicationViewState_Proxy( - IApplicationDesignModeSettings* This, - APPLICATION_VIEW_STATE viewState); -void __RPC_STUB IApplicationDesignModeSettings_SetApplicationViewState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationDesignModeSettings_ComputeApplicationSize_Proxy( - IApplicationDesignModeSettings* This, - SIZE *psizeApplication); -void __RPC_STUB IApplicationDesignModeSettings_ComputeApplicationSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationDesignModeSettings_IsApplicationViewStateSupported_Proxy( - IApplicationDesignModeSettings* This, - APPLICATION_VIEW_STATE viewState, - SIZE sizeNativeDisplay, - DEVICE_SCALE_FACTOR scaleFactor, - WINBOOL *pfSupported); -void __RPC_STUB IApplicationDesignModeSettings_IsApplicationViewStateSupported_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IApplicationDesignModeSettings_TriggerEdgeGesture_Proxy( - IApplicationDesignModeSettings* This, - EDGE_GESTURE_KIND edgeGestureKind); -void __RPC_STUB IApplicationDesignModeSettings_TriggerEdgeGesture_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IApplicationDesignModeSettings_INTERFACE_DEFINED__ */ @@ -41827,23 +34852,24 @@ typedef struct IInitializeWithWindowVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInitializeWithWindow* This, + IInitializeWithWindow *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInitializeWithWindow* This); + IInitializeWithWindow *This); ULONG (STDMETHODCALLTYPE *Release)( - IInitializeWithWindow* This); + IInitializeWithWindow *This); /*** IInitializeWithWindow methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IInitializeWithWindow* This, + IInitializeWithWindow *This, HWND hwnd); END_INTERFACE } IInitializeWithWindowVtbl; + interface IInitializeWithWindow { CONST_VTBL IInitializeWithWindowVtbl* lpVtbl; }; @@ -41876,14 +34902,6 @@ static FORCEINLINE HRESULT IInitializeWithWindow_Initialize(IInitializeWithWindo #endif -HRESULT STDMETHODCALLTYPE IInitializeWithWindow_Initialize_Proxy( - IInitializeWithWindow* This, - HWND hwnd); -void __RPC_STUB IInitializeWithWindow_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInitializeWithWindow_INTERFACE_DEFINED__ */ @@ -41918,31 +34936,32 @@ typedef struct IHandlerInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IHandlerInfo* This, + IHandlerInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IHandlerInfo* This); + IHandlerInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IHandlerInfo* This); + IHandlerInfo *This); /*** IHandlerInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetApplicationDisplayName)( - IHandlerInfo* This, + IHandlerInfo *This, LPWSTR *value); HRESULT (STDMETHODCALLTYPE *GetApplicationPublisher)( - IHandlerInfo* This, + IHandlerInfo *This, LPWSTR *value); HRESULT (STDMETHODCALLTYPE *GetApplicationIconReference)( - IHandlerInfo* This, + IHandlerInfo *This, LPWSTR *value); END_INTERFACE } IHandlerInfoVtbl; + interface IHandlerInfo { CONST_VTBL IHandlerInfoVtbl* lpVtbl; }; @@ -41983,30 +35002,6 @@ static FORCEINLINE HRESULT IHandlerInfo_GetApplicationIconReference(IHandlerInfo #endif -HRESULT STDMETHODCALLTYPE IHandlerInfo_GetApplicationDisplayName_Proxy( - IHandlerInfo* This, - LPWSTR *value); -void __RPC_STUB IHandlerInfo_GetApplicationDisplayName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IHandlerInfo_GetApplicationPublisher_Proxy( - IHandlerInfo* This, - LPWSTR *value); -void __RPC_STUB IHandlerInfo_GetApplicationPublisher_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IHandlerInfo_GetApplicationIconReference_Proxy( - IHandlerInfo* This, - LPWSTR *value); -void __RPC_STUB IHandlerInfo_GetApplicationIconReference_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IHandlerInfo_INTERFACE_DEFINED__ */ @@ -42042,31 +35037,32 @@ typedef struct IHandlerActivationHostVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IHandlerActivationHost* This, + IHandlerActivationHost *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IHandlerActivationHost* This); + IHandlerActivationHost *This); ULONG (STDMETHODCALLTYPE *Release)( - IHandlerActivationHost* This); + IHandlerActivationHost *This); /*** IHandlerActivationHost methods ***/ HRESULT (STDMETHODCALLTYPE *BeforeCoCreateInstance)( - IHandlerActivationHost* This, + IHandlerActivationHost *This, REFCLSID clsidHandler, IShellItemArray *itemsBeingActivated, IHandlerInfo *handlerInfo); HRESULT (STDMETHODCALLTYPE *BeforeCreateProcess)( - IHandlerActivationHost* This, + IHandlerActivationHost *This, LPCWSTR applicationPath, LPCWSTR commandLine, IHandlerInfo *handlerInfo); END_INTERFACE } IHandlerActivationHostVtbl; + interface IHandlerActivationHost { CONST_VTBL IHandlerActivationHostVtbl* lpVtbl; }; @@ -42103,26 +35099,6 @@ static FORCEINLINE HRESULT IHandlerActivationHost_BeforeCreateProcess(IHandlerAc #endif -HRESULT STDMETHODCALLTYPE IHandlerActivationHost_BeforeCoCreateInstance_Proxy( - IHandlerActivationHost* This, - REFCLSID clsidHandler, - IShellItemArray *itemsBeingActivated, - IHandlerInfo *handlerInfo); -void __RPC_STUB IHandlerActivationHost_BeforeCoCreateInstance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IHandlerActivationHost_BeforeCreateProcess_Proxy( - IHandlerActivationHost* This, - LPCWSTR applicationPath, - LPCWSTR commandLine, - IHandlerInfo *handlerInfo); -void __RPC_STUB IHandlerActivationHost_BeforeCreateProcess_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IHandlerActivationHost_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/shtypes.h b/lib/libc/include/any-windows-any/shtypes.h index 8398c461e0..cd11186700 100644 --- a/lib/libc/include/any-windows-any/shtypes.h +++ b/lib/libc/include/any-windows-any/shtypes.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/shtypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.5 from shtypes.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -328,9 +329,23 @@ typedef PROPERTYKEY SHCOLUMNID; typedef const SHCOLUMNID *LPCSHCOLUMNID; typedef enum DEVICE_SCALE_FACTOR { + DEVICE_SCALE_FACTOR_INVALID = 0, SCALE_100_PERCENT = 100, + SCALE_120_PERCENT = 120, + SCALE_125_PERCENT = 125, SCALE_140_PERCENT = 140, - SCALE_180_PERCENT = 180 + SCALE_150_PERCENT = 150, + SCALE_160_PERCENT = 160, + SCALE_175_PERCENT = 175, + SCALE_180_PERCENT = 180, + SCALE_200_PERCENT = 200, + SCALE_225_PERCENT = 225, + SCALE_250_PERCENT = 250, + SCALE_300_PERCENT = 300, + SCALE_350_PERCENT = 350, + SCALE_400_PERCENT = 400, + SCALE_450_PERCENT = 450, + SCALE_500_PERCENT = 500 } DEVICE_SCALE_FACTOR; /* Begin additional prototypes for all interfaces */ diff --git a/lib/libc/include/any-windows-any/specstrings.h b/lib/libc/include/any-windows-any/specstrings.h index bcb9fc3c81..f2636a4977 100644 --- a/lib/libc/include/any-windows-any/specstrings.h +++ b/lib/libc/include/any-windows-any/specstrings.h @@ -285,6 +285,8 @@ extern "C" { #define __encoded_pointer +#define _Post_equals_last_error_ + #ifndef __fallthrough #define __fallthrough #endif diff --git a/lib/libc/include/any-windows-any/stdio.h b/lib/libc/include/any-windows-any/stdio.h index d981f7017c..4e201e9184 100644 --- a/lib/libc/include/any-windows-any/stdio.h +++ b/lib/libc/include/any-windows-any/stdio.h @@ -8,8 +8,6 @@ #include -#include <_mingw_print_push.h> - #pragma pack(push,_CRT_PACKING) #ifdef __cplusplus @@ -136,7 +134,7 @@ extern FILE (* __MINGW_IMP_SYMBOL(_iob))[]; /* A pointer to an array of FILE */ #define _TWO_DIGIT_EXPONENT 0x1 -#if !defined(_UCRTBASE_STDIO_DEFINED) && __MSVCRT_VERSION__ >= 0x1400 +#if !defined(_UCRTBASE_STDIO_DEFINED) && defined(_UCRT) #define _UCRTBASE_STDIO_DEFINED #define UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION (0x0001) @@ -149,15 +147,20 @@ extern FILE (* __MINGW_IMP_SYMBOL(_iob))[]; /* A pointer to an array of FILE */ #define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) #define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) -// Default wide printfs and scanfs to the standard mode +// Default wide printfs and scanfs to the legacy wide mode. Only code built +// with -D__USE_MINGW_ANSI_STDIO=1 will expect the standard behaviour. #ifndef UCRTBASE_PRINTF_DEFAULT_WIDE -#define UCRTBASE_PRINTF_DEFAULT_WIDE 0 +#define UCRTBASE_PRINTF_DEFAULT_WIDE UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS #endif #ifndef UCRTBASE_SCANF_DEFAULT_WIDE -#define UCRTBASE_SCANF_DEFAULT_WIDE 0 +#define UCRTBASE_SCANF_DEFAULT_WIDE UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS #endif #endif +#if __MINGW_FORTIFY_LEVEL > 0 +__mingw_bos_declare; +#endif + #ifndef _STDIO_DEFINED extern __attribute__((__format__ (gnu_scanf, 2, 3))) __MINGW_ATTRIB_NONNULL(2) @@ -210,7 +213,7 @@ extern __attribute__((__format__ (gnu_printf, 2, 0))) __attribute__((nonnull (1,2))) int __cdecl __mingw_vasprintf(char ** __restrict__ , const char * __restrict__ , va_list) __MINGW_NOTHROW; -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT int __cdecl __stdio_common_vsprintf(unsigned __int64 options, char *str, size_t len, const char *format, _locale_t locale, va_list valist); int __cdecl __stdio_common_vfprintf(unsigned __int64 options, FILE *file, const char *format, _locale_t locale, va_list valist); int __cdecl __stdio_common_vsscanf(unsigned __int64 options, const char *input, size_t length, const char *format, _locale_t locale, va_list valist); @@ -223,7 +226,7 @@ extern #if defined(__clang__) #define __MINGW_PRINTF_FORMAT printf #define __MINGW_SCANF_FORMAT scanf -#elif defined(__USE_MINGW_ANSI_STDIO) +#elif defined(_UCRT) || __USE_MINGW_ANSI_STDIO #define __MINGW_PRINTF_FORMAT gnu_printf #define __MINGW_SCANF_FORMAT gnu_scanf #else @@ -351,6 +354,23 @@ int printf (const char *__format, ...) return __retval; } +#if __MINGW_FORTIFY_VA_ARG + +__mingw_bos_ovr +__attribute__((__format__ (gnu_printf, 2, 3))) __MINGW_ATTRIB_NONNULL(2) +int sprintf (char *__stream, const char *__format, ...) +{ + if (__mingw_bos_known(__stream)) { + int __retval = __mingw_snprintf( __stream, __mingw_bos(__stream, 1), __format, __builtin_va_arg_pack() ); + if (__retval >= 0) + __mingw_bos_ptr_chk(__stream, (size_t)__retval + 1, 1); + return __retval; + } + return __mingw_sprintf( __stream, __format, __builtin_va_arg_pack() ); +} + +#else /* !__MINGW_FORTIFY_VA_ARG */ + __mingw_ovr __attribute__((__format__ (gnu_printf, 2, 3))) __MINGW_ATTRIB_NONNULL(2) int sprintf (char *__stream, const char *__format, ...) @@ -362,6 +382,8 @@ int sprintf (char *__stream, const char *__format, ...) return __retval; } +#endif /* __MINGW_FORTIFY_VA_ARG */ + __mingw_ovr __attribute__((__format__ (gnu_printf, 2, 0))) __MINGW_ATTRIB_NONNULL(2) int vfprintf (FILE *__stream, const char *__format, __builtin_va_list __local_argv) @@ -376,13 +398,34 @@ int vprintf (const char *__format, __builtin_va_list __local_argv) return __mingw_vfprintf( stdout, __format, __local_argv ); } -__mingw_ovr +__mingw_bos_ovr __attribute__((__format__ (gnu_printf, 2, 0))) __MINGW_ATTRIB_NONNULL(2) int vsprintf (char *__stream, const char *__format, __builtin_va_list __local_argv) { +#if __MINGW_FORTIFY_LEVEL > 0 + if (__mingw_bos_known(__stream)) { + int __retval = __mingw_vsnprintf( __stream, __mingw_bos(__stream, 1), __format, __local_argv ); + if (__retval >= 0) + __mingw_bos_ptr_chk(__stream, (size_t)__retval + 1, 1); + return __retval; + } +#endif return __mingw_vsprintf( __stream, __format, __local_argv ); } /* #ifndef __NO_ISOCEXT */ /* externs in libmingwex.a */ + +#if __MINGW_FORTIFY_VA_ARG + +__mingw_bos_ovr +__attribute__((__format__ (gnu_printf, 3, 4))) __MINGW_ATTRIB_NONNULL(3) +int snprintf (char *__stream, size_t __n, const char *__format, ...) +{ + __mingw_bos_ptr_chk_warn(__stream, __n, 1); + return __mingw_snprintf( __stream, __n, __format, __builtin_va_arg_pack() ); +} + +#else /* !__MINGW_FORTIFY_VA_ARG */ + __mingw_ovr __attribute__((__format__ (gnu_printf, 3, 4))) __MINGW_ATTRIB_NONNULL(3) int snprintf (char *__stream, size_t __n, const char *__format, ...) @@ -394,10 +437,15 @@ int snprintf (char *__stream, size_t __n, const char *__format, ...) return __retval; } -__mingw_ovr +#endif /* __MINGW_FORTIFY_VA_ARG */ + +__mingw_bos_ovr __attribute__((__format__ (gnu_printf, 3, 0))) __MINGW_ATTRIB_NONNULL(3) int vsnprintf (char *__stream, size_t __n, const char *__format, __builtin_va_list __local_argv) { +#if __MINGW_FORTIFY_LEVEL > 0 + __mingw_bos_ptr_chk_warn(__stream, __n, 1); +#endif return __mingw_vsnprintf( __stream, __n, __format, __local_argv ); } @@ -419,7 +467,7 @@ int vsnprintf (char *__stream, size_t __n, const char *__format, __builtin_va_li /* * Default configuration: simply direct all calls to MSVCRT... */ -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wshadow" @@ -565,7 +613,7 @@ int vsnprintf (char *__stream, size_t __n, const char *__format, __builtin_va_li #endif #endif /* __NO_ISOCEXT */ -#endif /* __MSVCRT_VERSION__ >= 0x1400 */ +#endif /* _UCRT */ #endif /* __USE_MINGW_ANSI_STDIO */ _CRTIMP int __cdecl _filbuf(FILE *_File); @@ -611,10 +659,9 @@ int vsnprintf (char *__stream, size_t __n, const char *__format, __builtin_va_li /* Shouldn't be any fseeko32 in glibc, 32bit to 64bit casting should be fine */ /* int fseeko32(FILE* stream, _off_t offset, int whence);*/ /* fseeko32 redirects to fseeko64 */ -#if __MSVCRT_VERSION__ >= 0x1400 - // Mark these as _CRTIMP to avoid trying to link in the mingwex versions. _CRTIMP int __cdecl _fseeki64(FILE *_File,__int64 _Offset,int _Origin); _CRTIMP __int64 __cdecl _ftelli64(FILE *_File); +#ifdef _UCRT __mingw_static_ovr int fseeko(FILE *_File, _off_t _Offset, int _Origin) { return fseek(_File, _Offset, _Origin); } @@ -628,8 +675,6 @@ int vsnprintf (char *__stream, size_t __n, const char *__format, __builtin_va_li return _ftelli64(_File); } #else - __MINGW_EXTENSION int __cdecl _fseeki64(FILE *_File,__int64 _Offset,int _Origin); - __MINGW_EXTENSION __int64 __cdecl _ftelli64(FILE *_File); int fseeko64(FILE* stream, _off64_t offset, int whence); int fseeko(FILE* stream, _off_t offset, int whence); /* Returns truncated 64bit off_t */ @@ -687,7 +732,7 @@ int vsnprintf (char *__stream, size_t __n, const char *__format, __builtin_va_li _CRTIMP unsigned int __cdecl _set_output_format(unsigned int _Format); _CRTIMP unsigned int __cdecl _get_output_format(void); int __cdecl setvbuf(FILE * __restrict__ _File,char * __restrict__ _Buf,int _Mode,size_t _Size); -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT __mingw_ovr int __cdecl _scprintf(const char * __restrict__ _Format,...) { @@ -716,7 +761,7 @@ int vsnprintf (char *__stream, size_t __n, const char *__format, __builtin_va_li char *__cdecl tmpnam(char *_Buffer); int __cdecl ungetc(int _Ch,FILE *_File); -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT __attribute__((__format__ (__MINGW_PRINTF_FORMAT, 3, 0))) __MINGW_ATTRIB_NONNULL(3) int __cdecl _vsnprintf(char * __restrict__ _Dest,size_t _Count,const char * __restrict__ _Format,va_list _Args) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; __mingw_ovr @@ -737,9 +782,49 @@ int vsnprintf (char *__stream, size_t __n, const char *__format, __builtin_va_li _CRTIMP int __cdecl _vsnprintf(char * __restrict__ _Dest,size_t _Count,const char * __restrict__ _Format,va_list _Args) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; #endif -#if !defined (__USE_MINGW_ANSI_STDIO) || __USE_MINGW_ANSI_STDIO == 0 +#if __MINGW_FORTIFY_LEVEL > 0 -#if __MSVCRT_VERSION__ >= 0x1400 +char * __cdecl __gets_chk(char *, size_t); +char * __cdecl __mingw_call_gets_warn(char *) __MINGW_ASM_CALL(gets) + __attribute__((__warning__("Using gets() is always unsafe - use fgets() instead"))); +char * __cdecl __mingw_call_fgets(char * __restrict__, int, FILE * __restrict__) __MINGW_ASM_CALL(fgets); +size_t __cdecl __mingw_call_fread(void * __restrict__, size_t, size_t, FILE * __restrict__) __MINGW_ASM_CALL(fread); +char * __cdecl __mingw_call_tmpnam(char *) __MINGW_ASM_CALL(tmpnam); + +__mingw_bos_extern_ovr +char * gets(char * __dst) +{ + if (__mingw_bos_known(__dst)) + return __gets_chk(__dst, __mingw_bos(__dst, 1)); + return __mingw_call_gets_warn(__dst); +} + +__mingw_bos_extern_ovr +char * fgets(char * __restrict__ __dst, int __n, FILE * __restrict__ __f) +{ + __mingw_bos_ptr_chk_warn(__dst, __n, 1); + return __mingw_call_fgets(__dst, __n, __f); +} + +__mingw_bos_extern_ovr +size_t fread(void * __restrict__ __dst, size_t __sz, size_t __n, FILE * __restrict__ __f) +{ + __mingw_bos_ptr_chk_warn(__dst, __sz * __n, 0); + return __mingw_call_fread(__dst, __sz, __n, __f); +} + +__mingw_bos_extern_ovr +char * tmpnam(char * __dst) +{ + __mingw_bos_ptr_chk_warn(__dst, L_tmpnam, 1); + return __mingw_call_tmpnam(__dst); +} + +#endif /* __MINGW_FORTIFY_LEVEL > 0 */ + +#if __USE_MINGW_ANSI_STDIO == 0 + +#ifdef _UCRT #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wshadow" @@ -770,10 +855,13 @@ int vsnprintf (char *__stream, size_t __n, const char *__format, __builtin_va_li int __cdecl __ms_vsnprintf(char * __restrict__ d,size_t n,const char * __restrict__ format,va_list arg) __MINGW_ATTRIB_DEPRECATED_MSVC2005 __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - __mingw_ovr + __mingw_bos_ovr __attribute__((__format__ (ms_printf, 3, 0))) __MINGW_ATTRIB_NONNULL(3) int vsnprintf (char * __restrict__ __stream, size_t __n, const char * __restrict__ __format, va_list __local_argv) { +#if __MINGW_FORTIFY_LEVEL > 0 + __mingw_bos_ptr_chk_warn(__stream, __n, 1); +#endif return __ms_vsnprintf (__stream, __n, __format, __local_argv); } @@ -781,6 +869,18 @@ int vsnprintf (char *__stream, size_t __n, const char *__format, __builtin_va_li int __cdecl __ms_snprintf(char * __restrict__ s, size_t n, const char * __restrict__ format, ...); #ifndef __NO_ISOCEXT +#if __MINGW_FORTIFY_VA_ARG + +__mingw_bos_ovr +__attribute__((__format__ (ms_printf, 3, 4))) __MINGW_ATTRIB_NONNULL(3) +int snprintf (char * __restrict__ __stream, size_t __n, const char * __restrict__ __format, ...) +{ + __mingw_bos_ptr_chk_warn(__stream, __n, 1); + return __ms_snprintf(__stream, __n, __format, __builtin_va_arg_pack()); +} + +#else /* !__MINGW_FORTIFY_VA_ARG */ + __mingw_ovr __attribute__((__format__ (ms_printf, 3, 4))) __MINGW_ATTRIB_NONNULL(3) int snprintf (char * __restrict__ __stream, size_t __n, const char * __restrict__ __format, ...) @@ -791,17 +891,57 @@ int snprintf (char * __restrict__ __stream, size_t __n, const char * __restrict_ __builtin_va_end( __local_argv ); return __retval; } + +#endif /* !__MINGW_FORTIFY_VA_ARG */ #endif /* !__NO_ISOCEXT */ +#if __MINGW_FORTIFY_VA_ARG + +int __cdecl __mingw_call_ms_sprintf(char * __restrict__, const char * __restrict__, ...) __MINGW_ASM_CALL(sprintf); + +__mingw_bos_extern_ovr +__attribute__((__format__ (ms_printf, 2, 3))) __MINGW_ATTRIB_NONNULL(2) +int sprintf (char * __restrict__ __stream, const char * __restrict__ __format, ...) +{ + if (__mingw_bos_known(__stream)) { + int __retval = __ms_snprintf( __stream, __mingw_bos(__stream, 1), __format, __builtin_va_arg_pack() ); + if (__retval >= 0) + __mingw_bos_ptr_chk(__stream, (size_t)__retval + 1, 1); + return __retval; + } + return __mingw_call_ms_sprintf( __stream, __format, __builtin_va_arg_pack() ); +} + +#endif /* __MINGW_FORTIFY_VA_ARG */ + +#if __MINGW_FORTIFY_LEVEL > 0 + +int __cdecl __mingw_call_ms_vsprintf(char * __restrict__, const char * __restrict__, va_list) __MINGW_ASM_CALL(vsprintf); + +__mingw_bos_extern_ovr +__attribute__((__format__ (ms_printf, 2, 0))) __MINGW_ATTRIB_NONNULL(2) +int vsprintf (char * __restrict__ __stream, const char * __restrict__ __format, va_list __local_argv) +{ + if (__mingw_bos_known(__stream)) { + int __retval = __ms_vsnprintf( __stream, __mingw_bos(__stream, 1), __format, __local_argv ); + if (__retval >= 0) + __mingw_bos_ptr_chk(__stream, (size_t)__retval + 1, 1); + return __retval; + } + return __mingw_call_ms_vsprintf( __stream, __format, __local_argv ); +} + +#endif /* __MINGW_FORTIFY_LEVEL > 0 */ + #pragma pop_macro ("vsnprintf") #pragma pop_macro ("snprintf") #ifdef __GNUC__ #pragma GCC diagnostic pop #endif -#endif /* __MSVCRT_VERSION__ >= 0x1400 */ +#endif /* _UCRT */ #endif /* __USE_MINGW_ANSI_STDIO */ -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT __mingw_ovr int __cdecl _vscprintf(const char * __restrict__ _Format,va_list _ArgList) { @@ -809,7 +949,7 @@ int snprintf (char * __restrict__ __stream, size_t __n, const char * __restrict_ } #else _CRTIMP int __cdecl _vscprintf(const char * __restrict__ _Format,va_list _ArgList); -#endif /* __MSVCRT_VERSION__ >= 0x1400 */ +#endif /* _UCRT */ _CRTIMP int __cdecl _set_printf_count_output(int _Value); _CRTIMP int __cdecl _get_printf_count_output(void); @@ -847,7 +987,7 @@ int snprintf (char * __restrict__ __stream, size_t __n, const char * __restrict_ /* __attribute__((__format__ (gnu_wprintf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2) int __cdecl __mingw_vswprintf(wchar_t * __restrict__ , const wchar_t * __restrict__ ,va_list); -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT int __cdecl __stdio_common_vswprintf(unsigned __int64 options, wchar_t *str, size_t len, const wchar_t *format, _locale_t locale, va_list valist); int __cdecl __stdio_common_vfwprintf(unsigned __int64 options, FILE *file, const wchar_t *format, _locale_t locale, va_list valist); int __cdecl __stdio_common_vswscanf(unsigned __int64 options, const wchar_t *input, size_t length, const wchar_t *format, _locale_t locale, va_list valist); @@ -954,6 +1094,19 @@ int vwprintf (const wchar_t *__format, __builtin_va_list __local_argv) } #ifndef __NO_ISOCEXT /* externs in libmingwex.a */ + +#if __MINGW_FORTIFY_VA_ARG + +__mingw_bos_ovr +/* __attribute__((__format__ (gnu_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3) +int snwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, ...) +{ + __mingw_bos_ptr_chk_warn(__stream, __n * sizeof(wchar_t), 1); + return __mingw_snwprintf( __stream, __n, __format, __builtin_va_arg_pack() ); +} + +#else /* !__MINGW_FORTIFY_VA_ARG */ + __mingw_ovr /* __attribute__((__format__ (gnu_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3) int snwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, ...) @@ -965,17 +1118,22 @@ int snwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, ...) return __retval; } -__mingw_ovr +#endif /* __MINGW_FORTIFY_VA_ARG */ + +__mingw_bos_ovr /* __attribute__((__format__ (gnu_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3) int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builtin_va_list __local_argv) { +#if __MINGW_FORTIFY_LEVEL > 0 + __mingw_bos_ptr_chk_warn(__stream, __n * sizeof(wchar_t), 1); +#endif return __mingw_vsnwprintf( __stream, __n, __format, __local_argv ); } #endif /* __NO_ISOCEXT */ #else /* !__USE_MINGW_ANSI_STDIO */ -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT __mingw_ovr int __cdecl fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN { @@ -1092,7 +1250,7 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti int __cdecl wprintf(const wchar_t * __restrict__ _Format,...); int __cdecl vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList); int __cdecl vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList); -#endif /* __MSVCRT_VERSION__ >= 0x1400 */ +#endif /* _UCRT */ #endif /* __USE_MINGW_ANSI_STDIO */ #ifndef WEOF @@ -1119,7 +1277,7 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti _CRTIMP wchar_t *__cdecl _getws(wchar_t *_String) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP int __cdecl _putws(const wchar_t *_Str); -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT __mingw_ovr int __cdecl _scwprintf(const wchar_t * __restrict__ _Format,...) { @@ -1142,7 +1300,7 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti } int __cdecl _vsnwprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; -#if !defined (__USE_MINGW_ANSI_STDIO) || __USE_MINGW_ANSI_STDIO == 0 +#if __USE_MINGW_ANSI_STDIO == 0 __mingw_ovr int snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...) { @@ -1192,7 +1350,7 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti #ifndef __NO_ISOCEXT /* externs in libmingwex.a */ -#if !defined (__USE_MINGW_ANSI_STDIO) || __USE_MINGW_ANSI_STDIO == 0 +#if __USE_MINGW_ANSI_STDIO == 0 #pragma push_macro("snwprintf") #pragma push_macro("vsnwprintf") # undef snwprintf @@ -1221,7 +1379,7 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti #endif /* ! __NO_ISOCEXT */ _CRTIMP int __cdecl _swprintf(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Format,...); _CRTIMP int __cdecl _vswprintf(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Format,va_list _Args); -#endif /* __MSVCRT_VERSION__ >= 0x1400 */ +#endif /* _UCRT */ #ifndef RC_INVOKED #include @@ -1274,7 +1432,7 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti #define _STDIO_DEFINED #endif -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT _CRTIMP int __cdecl _fgetc_nolock(FILE *_File); _CRTIMP int __cdecl _fputc_nolock(int _Char, FILE *_File); _CRTIMP int __cdecl _getc_nolock(FILE *_File); @@ -1399,6 +1557,4 @@ void __cdecl __mingw_str_free(void *ptr); #include -#include <_mingw_print_pop.h> - #endif diff --git a/lib/libc/include/any-windows-any/stdlib.h b/lib/libc/include/any-windows-any/stdlib.h index 4d9c1d9676..7d758f30fa 100644 --- a/lib/libc/include/any-windows-any/stdlib.h +++ b/lib/libc/include/any-windows-any/stdlib.h @@ -6,10 +6,11 @@ #ifndef _INC_STDLIB #define _INC_STDLIB -#include +#include +#include #include -#if defined (__USE_MINGW_ANSI_STDIO) && ((__USE_MINGW_ANSI_STDIO + 0) != 0) && !defined (__USE_MINGW_STRTOX) +#if __USE_MINGW_ANSI_STDIO && !defined (__USE_MINGW_STRTOX) #define __USE_MINGW_STRTOX 1 #endif @@ -111,7 +112,7 @@ extern "C" { extern int __mb_cur_max; #define __mb_cur_max __mb_cur_max #else -#if __MSVCRT_VERSION__ < 0x1400 +#ifndef _UCRT extern int * __MINGW_IMP_SYMBOL(__mb_cur_max); #endif #define __mb_cur_max (___mb_cur_max_func()) @@ -163,7 +164,7 @@ _CRTIMP int __cdecl ___mb_cur_max_func(void); extern char *_sys_errlist[]; extern int _sys_nerr; #else -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT _CRTIMP char **__cdecl __sys_errlist(void); _CRTIMP int *__cdecl __sys_nerr(void); #define _sys_nerr (*__sys_nerr()) @@ -171,14 +172,14 @@ _CRTIMP int __cdecl ___mb_cur_max_func(void); #else extern __declspec(dllimport) char *_sys_errlist[1]; extern __declspec(dllimport) int _sys_nerr; -#endif /* __MSVCRT_VERSION__ < 0x1400 */ +#endif /* !_UCRT */ #endif /* We have a fallback definition of __p___argv and __p__fmode for msvcrt versions that lack it. */ _CRTIMP char ***__cdecl __p___argv(void); _CRTIMP int *__cdecl __p__fmode(void); -#if (defined(_X86_) && !defined(__x86_64)) || (__MSVCRT_VERSION__ >= 0x1400) +#if (defined(_X86_) && !defined(__x86_64)) || defined(_UCRT) _CRTIMP int *__cdecl __p___argc(void); _CRTIMP wchar_t ***__cdecl __p___wargv(void); _CRTIMP char ***__cdecl __p__environ(void); @@ -245,7 +246,7 @@ _CRTIMP int __cdecl ___mb_cur_max_func(void); extern unsigned int _winminor; #endif -#elif __MSVCRT_VERSION__ >= 0x1400 +#elif defined(_UCRT) #ifndef __argc #define __argc (* __p___argc()) @@ -275,7 +276,7 @@ _CRTIMP int __cdecl ___mb_cur_max_func(void); #define _wpgmptr (* __p__wpgmptr()) #endif -#else /* __MSVCRT_VERSION__ >= 0x1400 */ +#else /* _UCRT */ #ifndef __argc extern int * __MINGW_IMP_SYMBOL(__argc); @@ -291,6 +292,32 @@ _CRTIMP int __cdecl ___mb_cur_max_func(void); #endif #ifndef _POSIX_ +#if (defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__)) + /* The plain msvcrt.dll for arm/aarch64 (and msvcr120_app.dll for arm) lacks + * _environ/_wenviron, but has these functions instead. */ + _CRTIMP void __cdecl _get_environ(char ***); + _CRTIMP void __cdecl _get_wenviron(wchar_t ***); + + static __inline char **__get_environ_ptr(void) { + char **__ptr; + _get_environ(&__ptr); + return __ptr; + } + + static __inline wchar_t **__get_wenviron_ptr(void) { + wchar_t **__ptr; + _get_wenviron(&__ptr); + return __ptr; + } + +#ifndef _environ +#define _environ (__get_environ_ptr()) +#endif + +#ifndef _wenviron +#define _wenviron (__get_wenviron_ptr()) +#endif +#else /* ARM/ARM64 */ #ifndef _environ extern char *** __MINGW_IMP_SYMBOL(_environ); #define _environ (* __MINGW_IMP_SYMBOL(_environ)) @@ -300,6 +327,7 @@ _CRTIMP int __cdecl ___mb_cur_max_func(void); extern wchar_t *** __MINGW_IMP_SYMBOL(_wenviron); #define _wenviron (* __MINGW_IMP_SYMBOL(_wenviron)) #endif +#endif /* !ARM/ARM64 */ #endif /* !_POSIX_ */ #ifndef _pgmptr @@ -337,7 +365,7 @@ _CRTIMP int __cdecl ___mb_cur_max_func(void); #define _winminor (* __MINGW_IMP_SYMBOL(_winminor)) #endif -#endif /* !_MSVCRT_ && __MSVCRT_VERSION__ < 0x1400 */ +#endif /* !_MSVCRT_ && !_UCRT */ errno_t __cdecl _get_osplatform(unsigned int *_Value); errno_t __cdecl _get_osver(unsigned int *_Value); @@ -470,8 +498,8 @@ float __cdecl __MINGW_NOTHROW strtof(const char * __restrict__ _Str,char ** __re /* libmingwex.a provides a c99-compliant strtod() exported as __strtod() */ extern double __cdecl __MINGW_NOTHROW __strtod (const char * __restrict__ , char ** __restrict__); -// The ucrtbase version of strtod is C99 compliant, so we don't need to redirect it to the mingw version. -#if !defined(__USE_MINGW_STRTOX) && __MSVCRT_VERSION__ < 0x1400 +// The UCRT version of strtod is C99 compliant, so we don't need to redirect it to the mingw version. +#if !defined(__USE_MINGW_STRTOX) && !defined(_UCRT) #define strtod __strtod #endif /* !defined(__USE_MINGW_STRTOX) */ #endif /* __NO_ISOCEXT */ diff --git a/lib/libc/include/any-windows-any/string.h b/lib/libc/include/any-windows-any/string.h index c8c8018731..49027c18db 100644 --- a/lib/libc/include/any-windows-any/string.h +++ b/lib/libc/include/any-windows-any/string.h @@ -188,4 +188,98 @@ extern "C" { #endif #include + +#if __MINGW_FORTIFY_LEVEL > 0 +#ifdef __cplusplus +extern "C" { +#endif + +__mingw_bos_declare; + +__mingw_bos_extern_ovr +void * memcpy(void * __restrict__ __dst, const void * __restrict__ __src, size_t __n) +{ + return __builtin___memcpy_chk(__dst, __src, __n, __mingw_bos(__dst, 0)); +} + +__mingw_bos_extern_ovr +void * memset(void * __dst, int __val, size_t __n) +{ + return __builtin___memset_chk(__dst, __val, __n, __mingw_bos(__dst, 0)); +} + +__mingw_bos_extern_ovr +void * memmove(void * __dst, const void * __src, size_t __n) +{ + return __builtin___memmove_chk(__dst, __src, __n, __mingw_bos(__dst, 0)); +} + +#ifdef _GNU_SOURCE +__mingw_bos_extern_ovr +void * mempcpy(void * __dst, const void * __src, size_t __n) +{ + return __builtin___mempcpy_chk(__dst, __src, __n, __mingw_bos(__dst, 0)); +} +#endif /* _GNU_SOURCE */ + +__mingw_bos_extern_ovr +char * strcpy(char * __restrict__ __dst, const char * __restrict__ __src) +{ + return __builtin___strcpy_chk(__dst, __src, __mingw_bos(__dst, 1)); +} + +__mingw_bos_extern_ovr +char * strcat(char * __restrict__ __dst, const char * __restrict__ __src) +{ + return __builtin___strcat_chk(__dst, __src, __mingw_bos(__dst, 1)); +} + +__mingw_bos_extern_ovr +char * strncpy(char * __restrict__ __dst, const char * __restrict__ __src, size_t __n) +{ + return __builtin___strncpy_chk(__dst, __src, __n, __mingw_bos(__dst, 1)); +} + +__mingw_bos_extern_ovr +char * strncat(char * __restrict__ __dst, const char * __restrict__ __src, size_t __n) +{ + return __builtin___strncat_chk(__dst, __src, __n, __mingw_bos(__dst, 1)); +} + +_SECIMP errno_t __cdecl __mingw_call_memcpy_s(void *, size_t, const void *, size_t) __MINGW_ASM_CRT_CALL(memcpy_s); +wchar_t * __cdecl __mingw_call_wcscpy(wchar_t * __restrict__, const wchar_t * __restrict__) __MINGW_ASM_CALL(wcscpy); +wchar_t * __cdecl __mingw_call_wcscat(wchar_t * __restrict__, const wchar_t * __restrict__) __MINGW_ASM_CALL(wcscat); + +__mingw_bos_extern_ovr +errno_t memcpy_s(void * __dst, size_t __os, const void * __src, size_t __n) +{ + __mingw_bos_ptr_chk_warn(__dst, __os, 0); + return __mingw_call_memcpy_s(__dst, __os, __src, __n); +} + +__mingw_bos_extern_ovr +wchar_t * wcscpy(wchar_t * __restrict__ __dst, const wchar_t * __restrict__ __src) +{ + if (__mingw_bos_known(__dst)) { + __mingw_bos_cond_chk(!wcscpy_s(__dst, __mingw_bos(__dst, 1) / sizeof(wchar_t), __src)); + return __dst; + } + return __mingw_call_wcscpy(__dst, __src); +} + +__mingw_bos_extern_ovr +wchar_t * wcscat(wchar_t * __restrict__ __dst, const wchar_t * __restrict__ __src) +{ + if (__mingw_bos_known(__dst)) { + __mingw_bos_cond_chk(!wcscat_s(__dst, __mingw_bos(__dst, 1) / sizeof(wchar_t), __src)); + return __dst; + } + return __mingw_call_wcscat(__dst, __src); +} + +#ifdef __cplusplus +} +#endif +#endif /* __MINGW_FORTIFY_LEVEL > 0 */ + #endif diff --git a/lib/libc/include/any-windows-any/strmif.h b/lib/libc/include/any-windows-any/strmif.h index 4aaeb8079c..00c93afb3d 100644 --- a/lib/libc/include/any-windows-any/strmif.h +++ b/lib/libc/include/any-windows-any/strmif.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/strmif.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/strmif.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,291 +21,465 @@ #ifndef __ICreateDevEnum_FWD_DEFINED__ #define __ICreateDevEnum_FWD_DEFINED__ typedef interface ICreateDevEnum ICreateDevEnum; +#ifdef __cplusplus +interface ICreateDevEnum; +#endif /* __cplusplus */ #endif #ifndef __IPin_FWD_DEFINED__ #define __IPin_FWD_DEFINED__ typedef interface IPin IPin; +#ifdef __cplusplus +interface IPin; +#endif /* __cplusplus */ #endif #ifndef __IEnumPins_FWD_DEFINED__ #define __IEnumPins_FWD_DEFINED__ typedef interface IEnumPins IEnumPins; +#ifdef __cplusplus +interface IEnumPins; +#endif /* __cplusplus */ #endif #ifndef __IEnumMediaTypes_FWD_DEFINED__ #define __IEnumMediaTypes_FWD_DEFINED__ typedef interface IEnumMediaTypes IEnumMediaTypes; +#ifdef __cplusplus +interface IEnumMediaTypes; +#endif /* __cplusplus */ #endif #ifndef __IFilterGraph_FWD_DEFINED__ #define __IFilterGraph_FWD_DEFINED__ typedef interface IFilterGraph IFilterGraph; +#ifdef __cplusplus +interface IFilterGraph; +#endif /* __cplusplus */ #endif #ifndef __IEnumFilters_FWD_DEFINED__ #define __IEnumFilters_FWD_DEFINED__ typedef interface IEnumFilters IEnumFilters; +#ifdef __cplusplus +interface IEnumFilters; +#endif /* __cplusplus */ #endif #ifndef __IMediaFilter_FWD_DEFINED__ #define __IMediaFilter_FWD_DEFINED__ typedef interface IMediaFilter IMediaFilter; +#ifdef __cplusplus +interface IMediaFilter; +#endif /* __cplusplus */ #endif #ifndef __IBaseFilter_FWD_DEFINED__ #define __IBaseFilter_FWD_DEFINED__ typedef interface IBaseFilter IBaseFilter; +#ifdef __cplusplus +interface IBaseFilter; +#endif /* __cplusplus */ #endif #ifndef __IReferenceClock_FWD_DEFINED__ #define __IReferenceClock_FWD_DEFINED__ typedef interface IReferenceClock IReferenceClock; +#ifdef __cplusplus +interface IReferenceClock; +#endif /* __cplusplus */ #endif #ifndef __IReferenceClockTimerControl_FWD_DEFINED__ #define __IReferenceClockTimerControl_FWD_DEFINED__ typedef interface IReferenceClockTimerControl IReferenceClockTimerControl; +#ifdef __cplusplus +interface IReferenceClockTimerControl; +#endif /* __cplusplus */ #endif #ifndef __IReferenceClock2_FWD_DEFINED__ #define __IReferenceClock2_FWD_DEFINED__ typedef interface IReferenceClock2 IReferenceClock2; +#ifdef __cplusplus +interface IReferenceClock2; +#endif /* __cplusplus */ #endif #ifndef __IMediaSample_FWD_DEFINED__ #define __IMediaSample_FWD_DEFINED__ typedef interface IMediaSample IMediaSample; +#ifdef __cplusplus +interface IMediaSample; +#endif /* __cplusplus */ #endif #ifndef __IMediaSample2_FWD_DEFINED__ #define __IMediaSample2_FWD_DEFINED__ typedef interface IMediaSample2 IMediaSample2; +#ifdef __cplusplus +interface IMediaSample2; +#endif /* __cplusplus */ #endif #ifndef __IMediaSample2Config_FWD_DEFINED__ #define __IMediaSample2Config_FWD_DEFINED__ typedef interface IMediaSample2Config IMediaSample2Config; +#ifdef __cplusplus +interface IMediaSample2Config; +#endif /* __cplusplus */ #endif #ifndef __IMemAllocator_FWD_DEFINED__ #define __IMemAllocator_FWD_DEFINED__ typedef interface IMemAllocator IMemAllocator; +#ifdef __cplusplus +interface IMemAllocator; +#endif /* __cplusplus */ #endif #ifndef __IMemAllocatorCallbackTemp_FWD_DEFINED__ #define __IMemAllocatorCallbackTemp_FWD_DEFINED__ typedef interface IMemAllocatorCallbackTemp IMemAllocatorCallbackTemp; +#ifdef __cplusplus +interface IMemAllocatorCallbackTemp; +#endif /* __cplusplus */ #endif #ifndef __IMemAllocatorNotifyCallbackTemp_FWD_DEFINED__ #define __IMemAllocatorNotifyCallbackTemp_FWD_DEFINED__ typedef interface IMemAllocatorNotifyCallbackTemp IMemAllocatorNotifyCallbackTemp; +#ifdef __cplusplus +interface IMemAllocatorNotifyCallbackTemp; +#endif /* __cplusplus */ #endif #ifndef __IMemInputPin_FWD_DEFINED__ #define __IMemInputPin_FWD_DEFINED__ typedef interface IMemInputPin IMemInputPin; +#ifdef __cplusplus +interface IMemInputPin; +#endif /* __cplusplus */ #endif #ifndef __IAMovieSetup_FWD_DEFINED__ #define __IAMovieSetup_FWD_DEFINED__ typedef interface IAMovieSetup IAMovieSetup; +#ifdef __cplusplus +interface IAMovieSetup; +#endif /* __cplusplus */ #endif #ifndef __IMediaSeeking_FWD_DEFINED__ #define __IMediaSeeking_FWD_DEFINED__ typedef interface IMediaSeeking IMediaSeeking; +#ifdef __cplusplus +interface IMediaSeeking; +#endif /* __cplusplus */ #endif #ifndef __IEnumRegFilters_FWD_DEFINED__ #define __IEnumRegFilters_FWD_DEFINED__ typedef interface IEnumRegFilters IEnumRegFilters; +#ifdef __cplusplus +interface IEnumRegFilters; +#endif /* __cplusplus */ #endif #ifndef __IFilterMapper_FWD_DEFINED__ #define __IFilterMapper_FWD_DEFINED__ typedef interface IFilterMapper IFilterMapper; +#ifdef __cplusplus +interface IFilterMapper; +#endif /* __cplusplus */ #endif #ifndef __IFilterMapper2_FWD_DEFINED__ #define __IFilterMapper2_FWD_DEFINED__ typedef interface IFilterMapper2 IFilterMapper2; +#ifdef __cplusplus +interface IFilterMapper2; +#endif /* __cplusplus */ #endif #ifndef __IFilterMapper3_FWD_DEFINED__ #define __IFilterMapper3_FWD_DEFINED__ typedef interface IFilterMapper3 IFilterMapper3; +#ifdef __cplusplus +interface IFilterMapper3; +#endif /* __cplusplus */ #endif #ifndef __IQualityControl_FWD_DEFINED__ #define __IQualityControl_FWD_DEFINED__ typedef interface IQualityControl IQualityControl; +#ifdef __cplusplus +interface IQualityControl; +#endif /* __cplusplus */ #endif #ifndef __IOverlayNotify_FWD_DEFINED__ #define __IOverlayNotify_FWD_DEFINED__ typedef interface IOverlayNotify IOverlayNotify; +#ifdef __cplusplus +interface IOverlayNotify; +#endif /* __cplusplus */ #endif #ifndef __IOverlayNotify2_FWD_DEFINED__ #define __IOverlayNotify2_FWD_DEFINED__ typedef interface IOverlayNotify2 IOverlayNotify2; +#ifdef __cplusplus +interface IOverlayNotify2; +#endif /* __cplusplus */ #endif #ifndef __IOverlay_FWD_DEFINED__ #define __IOverlay_FWD_DEFINED__ typedef interface IOverlay IOverlay; +#ifdef __cplusplus +interface IOverlay; +#endif /* __cplusplus */ #endif #ifndef __IMediaEventSink_FWD_DEFINED__ #define __IMediaEventSink_FWD_DEFINED__ typedef interface IMediaEventSink IMediaEventSink; +#ifdef __cplusplus +interface IMediaEventSink; +#endif /* __cplusplus */ #endif #ifndef __IFileSourceFilter_FWD_DEFINED__ #define __IFileSourceFilter_FWD_DEFINED__ typedef interface IFileSourceFilter IFileSourceFilter; +#ifdef __cplusplus +interface IFileSourceFilter; +#endif /* __cplusplus */ #endif #ifndef __IFileSinkFilter_FWD_DEFINED__ #define __IFileSinkFilter_FWD_DEFINED__ typedef interface IFileSinkFilter IFileSinkFilter; +#ifdef __cplusplus +interface IFileSinkFilter; +#endif /* __cplusplus */ #endif #ifndef __IFileSinkFilter2_FWD_DEFINED__ #define __IFileSinkFilter2_FWD_DEFINED__ typedef interface IFileSinkFilter2 IFileSinkFilter2; +#ifdef __cplusplus +interface IFileSinkFilter2; +#endif /* __cplusplus */ #endif #ifndef __IGraphBuilder_FWD_DEFINED__ #define __IGraphBuilder_FWD_DEFINED__ typedef interface IGraphBuilder IGraphBuilder; +#ifdef __cplusplus +interface IGraphBuilder; +#endif /* __cplusplus */ #endif #ifndef __ICaptureGraphBuilder_FWD_DEFINED__ #define __ICaptureGraphBuilder_FWD_DEFINED__ typedef interface ICaptureGraphBuilder ICaptureGraphBuilder; +#ifdef __cplusplus +interface ICaptureGraphBuilder; +#endif /* __cplusplus */ #endif #ifndef __IAMCopyCaptureFileProgress_FWD_DEFINED__ #define __IAMCopyCaptureFileProgress_FWD_DEFINED__ typedef interface IAMCopyCaptureFileProgress IAMCopyCaptureFileProgress; +#ifdef __cplusplus +interface IAMCopyCaptureFileProgress; +#endif /* __cplusplus */ #endif #ifndef __ICaptureGraphBuilder2_FWD_DEFINED__ #define __ICaptureGraphBuilder2_FWD_DEFINED__ typedef interface ICaptureGraphBuilder2 ICaptureGraphBuilder2; +#ifdef __cplusplus +interface ICaptureGraphBuilder2; +#endif /* __cplusplus */ #endif #ifndef __IConfigAviMux_FWD_DEFINED__ #define __IConfigAviMux_FWD_DEFINED__ typedef interface IConfigAviMux IConfigAviMux; +#ifdef __cplusplus +interface IConfigAviMux; +#endif /* __cplusplus */ #endif #ifndef __IConfigInterleaving_FWD_DEFINED__ #define __IConfigInterleaving_FWD_DEFINED__ typedef interface IConfigInterleaving IConfigInterleaving; +#ifdef __cplusplus +interface IConfigInterleaving; +#endif /* __cplusplus */ #endif #ifndef __IAMClockSlave_FWD_DEFINED__ #define __IAMClockSlave_FWD_DEFINED__ typedef interface IAMClockSlave IAMClockSlave; +#ifdef __cplusplus +interface IAMClockSlave; +#endif /* __cplusplus */ #endif #ifndef __IAMCertifiedOutputProtection_FWD_DEFINED__ #define __IAMCertifiedOutputProtection_FWD_DEFINED__ typedef interface IAMCertifiedOutputProtection IAMCertifiedOutputProtection; +#ifdef __cplusplus +interface IAMCertifiedOutputProtection; +#endif /* __cplusplus */ #endif #ifndef __IFilterGraph2_FWD_DEFINED__ #define __IFilterGraph2_FWD_DEFINED__ typedef interface IFilterGraph2 IFilterGraph2; +#ifdef __cplusplus +interface IFilterGraph2; +#endif /* __cplusplus */ #endif #ifndef __IStreamBuilder_FWD_DEFINED__ #define __IStreamBuilder_FWD_DEFINED__ typedef interface IStreamBuilder IStreamBuilder; +#ifdef __cplusplus +interface IStreamBuilder; +#endif /* __cplusplus */ #endif #ifndef __IAMStreamConfig_FWD_DEFINED__ #define __IAMStreamConfig_FWD_DEFINED__ typedef interface IAMStreamConfig IAMStreamConfig; +#ifdef __cplusplus +interface IAMStreamConfig; +#endif /* __cplusplus */ #endif #ifndef __IAMVideoProcAmp_FWD_DEFINED__ #define __IAMVideoProcAmp_FWD_DEFINED__ typedef interface IAMVideoProcAmp IAMVideoProcAmp; +#ifdef __cplusplus +interface IAMVideoProcAmp; +#endif /* __cplusplus */ #endif #ifndef __IAsyncReader_FWD_DEFINED__ #define __IAsyncReader_FWD_DEFINED__ typedef interface IAsyncReader IAsyncReader; +#ifdef __cplusplus +interface IAsyncReader; +#endif /* __cplusplus */ #endif #ifndef __IGraphVersion_FWD_DEFINED__ #define __IGraphVersion_FWD_DEFINED__ typedef interface IGraphVersion IGraphVersion; +#ifdef __cplusplus +interface IGraphVersion; +#endif /* __cplusplus */ #endif #ifndef __IResourceConsumer_FWD_DEFINED__ #define __IResourceConsumer_FWD_DEFINED__ typedef interface IResourceConsumer IResourceConsumer; +#ifdef __cplusplus +interface IResourceConsumer; +#endif /* __cplusplus */ #endif #ifndef __IResourceManager_FWD_DEFINED__ #define __IResourceManager_FWD_DEFINED__ typedef interface IResourceManager IResourceManager; +#ifdef __cplusplus +interface IResourceManager; +#endif /* __cplusplus */ #endif #ifndef __IAMStreamControl_FWD_DEFINED__ #define __IAMStreamControl_FWD_DEFINED__ typedef interface IAMStreamControl IAMStreamControl; +#ifdef __cplusplus +interface IAMStreamControl; +#endif /* __cplusplus */ #endif #ifndef __IKsPropertySet_FWD_DEFINED__ #define __IKsPropertySet_FWD_DEFINED__ typedef interface IKsPropertySet IKsPropertySet; +#ifdef __cplusplus +interface IKsPropertySet; +#endif /* __cplusplus */ #endif #ifndef __IMediaPropertyBag_FWD_DEFINED__ #define __IMediaPropertyBag_FWD_DEFINED__ typedef interface IMediaPropertyBag IMediaPropertyBag; +#ifdef __cplusplus +interface IMediaPropertyBag; +#endif /* __cplusplus */ #endif #ifndef __IPersistMediaPropertyBag_FWD_DEFINED__ #define __IPersistMediaPropertyBag_FWD_DEFINED__ typedef interface IPersistMediaPropertyBag IPersistMediaPropertyBag; +#ifdef __cplusplus +interface IPersistMediaPropertyBag; +#endif /* __cplusplus */ #endif #ifndef __ISeekingPassThru_FWD_DEFINED__ #define __ISeekingPassThru_FWD_DEFINED__ typedef interface ISeekingPassThru ISeekingPassThru; +#ifdef __cplusplus +interface ISeekingPassThru; +#endif /* __cplusplus */ #endif #ifndef __IAMFilterMiscFlags_FWD_DEFINED__ #define __IAMFilterMiscFlags_FWD_DEFINED__ typedef interface IAMFilterMiscFlags IAMFilterMiscFlags; +#ifdef __cplusplus +interface IAMFilterMiscFlags; +#endif /* __cplusplus */ #endif #ifndef __IAMGraphBuilderCallback_FWD_DEFINED__ #define __IAMGraphBuilderCallback_FWD_DEFINED__ typedef interface IAMGraphBuilderCallback IAMGraphBuilderCallback; +#ifdef __cplusplus +interface IAMGraphBuilderCallback; +#endif /* __cplusplus */ #endif #ifndef __IAMVfwCaptureDialogs_FWD_DEFINED__ #define __IAMVfwCaptureDialogs_FWD_DEFINED__ typedef interface IAMVfwCaptureDialogs IAMVfwCaptureDialogs; +#ifdef __cplusplus +interface IAMVfwCaptureDialogs; +#endif /* __cplusplus */ #endif #ifndef __IAMAsyncReaderTimestampScaling_FWD_DEFINED__ #define __IAMAsyncReaderTimestampScaling_FWD_DEFINED__ typedef interface IAMAsyncReaderTimestampScaling IAMAsyncReaderTimestampScaling; +#ifdef __cplusplus +interface IAMAsyncReaderTimestampScaling; +#endif /* __cplusplus */ #endif #ifndef __IAMPluginControl_FWD_DEFINED__ #define __IAMPluginControl_FWD_DEFINED__ typedef interface IAMPluginControl IAMPluginControl; +#ifdef __cplusplus +interface IAMPluginControl; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -363,25 +538,26 @@ typedef struct ICreateDevEnumVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICreateDevEnum* This, + ICreateDevEnum *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICreateDevEnum* This); + ICreateDevEnum *This); ULONG (STDMETHODCALLTYPE *Release)( - ICreateDevEnum* This); + ICreateDevEnum *This); /*** ICreateDevEnum methods ***/ HRESULT (STDMETHODCALLTYPE *CreateClassEnumerator)( - ICreateDevEnum* This, + ICreateDevEnum *This, REFCLSID clsidDeviceClass, IEnumMoniker **ppEnumMoniker, DWORD dwFlags); END_INTERFACE } ICreateDevEnumVtbl; + interface ICreateDevEnum { CONST_VTBL ICreateDevEnumVtbl* lpVtbl; }; @@ -414,16 +590,6 @@ static FORCEINLINE HRESULT ICreateDevEnum_CreateClassEnumerator(ICreateDevEnum* #endif -HRESULT STDMETHODCALLTYPE ICreateDevEnum_CreateClassEnumerator_Proxy( - ICreateDevEnum* This, - REFCLSID clsidDeviceClass, - IEnumMoniker **ppEnumMoniker, - DWORD dwFlags); -void __RPC_STUB ICreateDevEnum_CreateClassEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICreateDevEnum_INTERFACE_DEFINED__ */ @@ -486,71 +652,113 @@ typedef struct _AllocatorProperties { #ifndef __IAMovieSetup_FWD_DEFINED__ #define __IAMovieSetup_FWD_DEFINED__ typedef interface IAMovieSetup IAMovieSetup; +#ifdef __cplusplus +interface IAMovieSetup; +#endif /* __cplusplus */ #endif #ifndef __IEnumFilters_FWD_DEFINED__ #define __IEnumFilters_FWD_DEFINED__ typedef interface IEnumFilters IEnumFilters; +#ifdef __cplusplus +interface IEnumFilters; +#endif /* __cplusplus */ #endif #ifndef __IEnumMediaTypes_FWD_DEFINED__ #define __IEnumMediaTypes_FWD_DEFINED__ typedef interface IEnumMediaTypes IEnumMediaTypes; +#ifdef __cplusplus +interface IEnumMediaTypes; +#endif /* __cplusplus */ #endif #ifndef __IEnumPins_FWD_DEFINED__ #define __IEnumPins_FWD_DEFINED__ typedef interface IEnumPins IEnumPins; +#ifdef __cplusplus +interface IEnumPins; +#endif /* __cplusplus */ #endif #ifndef __IBaseFilter_FWD_DEFINED__ #define __IBaseFilter_FWD_DEFINED__ typedef interface IBaseFilter IBaseFilter; +#ifdef __cplusplus +interface IBaseFilter; +#endif /* __cplusplus */ #endif #ifndef __IFilterGraph_FWD_DEFINED__ #define __IFilterGraph_FWD_DEFINED__ typedef interface IFilterGraph IFilterGraph; +#ifdef __cplusplus +interface IFilterGraph; +#endif /* __cplusplus */ #endif #ifndef __IMediaFilter_FWD_DEFINED__ #define __IMediaFilter_FWD_DEFINED__ typedef interface IMediaFilter IMediaFilter; +#ifdef __cplusplus +interface IMediaFilter; +#endif /* __cplusplus */ #endif #ifndef __IMediaSample_FWD_DEFINED__ #define __IMediaSample_FWD_DEFINED__ typedef interface IMediaSample IMediaSample; +#ifdef __cplusplus +interface IMediaSample; +#endif /* __cplusplus */ #endif #ifndef __IMemAllocator_FWD_DEFINED__ #define __IMemAllocator_FWD_DEFINED__ typedef interface IMemAllocator IMemAllocator; +#ifdef __cplusplus +interface IMemAllocator; +#endif /* __cplusplus */ #endif #ifndef __IMemAllocatorCallbackTemp_FWD_DEFINED__ #define __IMemAllocatorCallbackTemp_FWD_DEFINED__ typedef interface IMemAllocatorCallbackTemp IMemAllocatorCallbackTemp; +#ifdef __cplusplus +interface IMemAllocatorCallbackTemp; +#endif /* __cplusplus */ #endif #ifndef __IMemAllocatorNotifyCallbackTemp_FWD_DEFINED__ #define __IMemAllocatorNotifyCallbackTemp_FWD_DEFINED__ typedef interface IMemAllocatorNotifyCallbackTemp IMemAllocatorNotifyCallbackTemp; +#ifdef __cplusplus +interface IMemAllocatorNotifyCallbackTemp; +#endif /* __cplusplus */ #endif #ifndef __IMemInputPin_FWD_DEFINED__ #define __IMemInputPin_FWD_DEFINED__ typedef interface IMemInputPin IMemInputPin; +#ifdef __cplusplus +interface IMemInputPin; +#endif /* __cplusplus */ #endif #ifndef __IPin_FWD_DEFINED__ #define __IPin_FWD_DEFINED__ typedef interface IPin IPin; +#ifdef __cplusplus +interface IPin; +#endif /* __cplusplus */ #endif #ifndef __IReferenceClock_FWD_DEFINED__ #define __IReferenceClock_FWD_DEFINED__ typedef interface IReferenceClock IReferenceClock; +#ifdef __cplusplus +interface IReferenceClock; +#endif /* __cplusplus */ #endif @@ -631,80 +839,81 @@ typedef struct IPinVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPin* This, + IPin *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPin* This); + IPin *This); ULONG (STDMETHODCALLTYPE *Release)( - IPin* This); + IPin *This); /*** IPin methods ***/ HRESULT (STDMETHODCALLTYPE *Connect)( - IPin* This, + IPin *This, IPin *pReceivePin, const AM_MEDIA_TYPE *pmt); HRESULT (STDMETHODCALLTYPE *ReceiveConnection)( - IPin* This, + IPin *This, IPin *pConnector, const AM_MEDIA_TYPE *pmt); HRESULT (STDMETHODCALLTYPE *Disconnect)( - IPin* This); + IPin *This); HRESULT (STDMETHODCALLTYPE *ConnectedTo)( - IPin* This, + IPin *This, IPin **pPin); HRESULT (STDMETHODCALLTYPE *ConnectionMediaType)( - IPin* This, + IPin *This, AM_MEDIA_TYPE *pmt); HRESULT (STDMETHODCALLTYPE *QueryPinInfo)( - IPin* This, + IPin *This, PIN_INFO *pInfo); HRESULT (STDMETHODCALLTYPE *QueryDirection)( - IPin* This, + IPin *This, PIN_DIRECTION *pPinDir); HRESULT (STDMETHODCALLTYPE *QueryId)( - IPin* This, + IPin *This, LPWSTR *Id); HRESULT (STDMETHODCALLTYPE *QueryAccept)( - IPin* This, + IPin *This, const AM_MEDIA_TYPE *pmt); HRESULT (STDMETHODCALLTYPE *EnumMediaTypes)( - IPin* This, + IPin *This, IEnumMediaTypes **ppEnum); HRESULT (STDMETHODCALLTYPE *QueryInternalConnections)( - IPin* This, + IPin *This, IPin **apPin, ULONG *nPin); HRESULT (STDMETHODCALLTYPE *EndOfStream)( - IPin* This); + IPin *This); HRESULT (STDMETHODCALLTYPE *BeginFlush)( - IPin* This); + IPin *This); HRESULT (STDMETHODCALLTYPE *EndFlush)( - IPin* This); + IPin *This); HRESULT (STDMETHODCALLTYPE *NewSegment)( - IPin* This, + IPin *This, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate); END_INTERFACE } IPinVtbl; + interface IPin { CONST_VTBL IPinVtbl* lpVtbl; }; @@ -793,127 +1002,6 @@ static FORCEINLINE HRESULT IPin_NewSegment(IPin* This,REFERENCE_TIME tStart,REFE #endif -HRESULT STDMETHODCALLTYPE IPin_Connect_Proxy( - IPin* This, - IPin *pReceivePin, - const AM_MEDIA_TYPE *pmt); -void __RPC_STUB IPin_Connect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPin_ReceiveConnection_Proxy( - IPin* This, - IPin *pConnector, - const AM_MEDIA_TYPE *pmt); -void __RPC_STUB IPin_ReceiveConnection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPin_Disconnect_Proxy( - IPin* This); -void __RPC_STUB IPin_Disconnect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPin_ConnectedTo_Proxy( - IPin* This, - IPin **pPin); -void __RPC_STUB IPin_ConnectedTo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPin_ConnectionMediaType_Proxy( - IPin* This, - AM_MEDIA_TYPE *pmt); -void __RPC_STUB IPin_ConnectionMediaType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPin_QueryPinInfo_Proxy( - IPin* This, - PIN_INFO *pInfo); -void __RPC_STUB IPin_QueryPinInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPin_QueryDirection_Proxy( - IPin* This, - PIN_DIRECTION *pPinDir); -void __RPC_STUB IPin_QueryDirection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPin_QueryId_Proxy( - IPin* This, - LPWSTR *Id); -void __RPC_STUB IPin_QueryId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPin_QueryAccept_Proxy( - IPin* This, - const AM_MEDIA_TYPE *pmt); -void __RPC_STUB IPin_QueryAccept_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPin_EnumMediaTypes_Proxy( - IPin* This, - IEnumMediaTypes **ppEnum); -void __RPC_STUB IPin_EnumMediaTypes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPin_QueryInternalConnections_Proxy( - IPin* This, - IPin **apPin, - ULONG *nPin); -void __RPC_STUB IPin_QueryInternalConnections_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPin_EndOfStream_Proxy( - IPin* This); -void __RPC_STUB IPin_EndOfStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPin_BeginFlush_Proxy( - IPin* This); -void __RPC_STUB IPin_BeginFlush_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPin_EndFlush_Proxy( - IPin* This); -void __RPC_STUB IPin_EndFlush_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPin_NewSegment_Proxy( - IPin* This, - REFERENCE_TIME tStart, - REFERENCE_TIME tStop, - double dRate); -void __RPC_STUB IPin_NewSegment_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPin_INTERFACE_DEFINED__ */ @@ -954,36 +1042,37 @@ typedef struct IEnumPinsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumPins* This, + IEnumPins *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumPins* This); + IEnumPins *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumPins* This); + IEnumPins *This); /*** IEnumPins methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumPins* This, + IEnumPins *This, ULONG cPins, IPin **ppPins, ULONG *pcFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumPins* This, + IEnumPins *This, ULONG cPins); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumPins* This); + IEnumPins *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumPins* This, + IEnumPins *This, IEnumPins **ppEnum); END_INTERFACE } IEnumPinsVtbl; + interface IEnumPins { CONST_VTBL IEnumPinsVtbl* lpVtbl; }; @@ -1028,39 +1117,6 @@ static FORCEINLINE HRESULT IEnumPins_Clone(IEnumPins* This,IEnumPins **ppEnum) { #endif -HRESULT STDMETHODCALLTYPE IEnumPins_Next_Proxy( - IEnumPins* This, - ULONG cPins, - IPin **ppPins, - ULONG *pcFetched); -void __RPC_STUB IEnumPins_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumPins_Skip_Proxy( - IEnumPins* This, - ULONG cPins); -void __RPC_STUB IEnumPins_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumPins_Reset_Proxy( - IEnumPins* This); -void __RPC_STUB IEnumPins_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumPins_Clone_Proxy( - IEnumPins* This, - IEnumPins **ppEnum); -void __RPC_STUB IEnumPins_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumPins_INTERFACE_DEFINED__ */ @@ -1101,36 +1157,37 @@ typedef struct IEnumMediaTypesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumMediaTypes* This, + IEnumMediaTypes *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumMediaTypes* This); + IEnumMediaTypes *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumMediaTypes* This); + IEnumMediaTypes *This); /*** IEnumMediaTypes methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumMediaTypes* This, + IEnumMediaTypes *This, ULONG cMediaTypes, AM_MEDIA_TYPE **ppMediaTypes, ULONG *pcFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumMediaTypes* This, + IEnumMediaTypes *This, ULONG cMediaTypes); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumMediaTypes* This); + IEnumMediaTypes *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumMediaTypes* This, + IEnumMediaTypes *This, IEnumMediaTypes **ppEnum); END_INTERFACE } IEnumMediaTypesVtbl; + interface IEnumMediaTypes { CONST_VTBL IEnumMediaTypesVtbl* lpVtbl; }; @@ -1175,39 +1232,6 @@ static FORCEINLINE HRESULT IEnumMediaTypes_Clone(IEnumMediaTypes* This,IEnumMedi #endif -HRESULT STDMETHODCALLTYPE IEnumMediaTypes_Next_Proxy( - IEnumMediaTypes* This, - ULONG cMediaTypes, - AM_MEDIA_TYPE **ppMediaTypes, - ULONG *pcFetched); -void __RPC_STUB IEnumMediaTypes_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumMediaTypes_Skip_Proxy( - IEnumMediaTypes* This, - ULONG cMediaTypes); -void __RPC_STUB IEnumMediaTypes_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumMediaTypes_Reset_Proxy( - IEnumMediaTypes* This); -void __RPC_STUB IEnumMediaTypes_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumMediaTypes_Clone_Proxy( - IEnumMediaTypes* This, - IEnumMediaTypes **ppEnum); -void __RPC_STUB IEnumMediaTypes_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumMediaTypes_INTERFACE_DEFINED__ */ @@ -1262,54 +1286,55 @@ typedef struct IFilterGraphVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFilterGraph* This, + IFilterGraph *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFilterGraph* This); + IFilterGraph *This); ULONG (STDMETHODCALLTYPE *Release)( - IFilterGraph* This); + IFilterGraph *This); /*** IFilterGraph methods ***/ HRESULT (STDMETHODCALLTYPE *AddFilter)( - IFilterGraph* This, + IFilterGraph *This, IBaseFilter *pFilter, LPCWSTR pName); HRESULT (STDMETHODCALLTYPE *RemoveFilter)( - IFilterGraph* This, + IFilterGraph *This, IBaseFilter *pFilter); HRESULT (STDMETHODCALLTYPE *EnumFilters)( - IFilterGraph* This, + IFilterGraph *This, IEnumFilters **ppEnum); HRESULT (STDMETHODCALLTYPE *FindFilterByName)( - IFilterGraph* This, + IFilterGraph *This, LPCWSTR pName, IBaseFilter **ppFilter); HRESULT (STDMETHODCALLTYPE *ConnectDirect)( - IFilterGraph* This, + IFilterGraph *This, IPin *ppinOut, IPin *ppinIn, const AM_MEDIA_TYPE *pmt); HRESULT (STDMETHODCALLTYPE *Reconnect)( - IFilterGraph* This, + IFilterGraph *This, IPin *ppin); HRESULT (STDMETHODCALLTYPE *Disconnect)( - IFilterGraph* This, + IFilterGraph *This, IPin *ppin); HRESULT (STDMETHODCALLTYPE *SetDefaultSyncSource)( - IFilterGraph* This); + IFilterGraph *This); END_INTERFACE } IFilterGraphVtbl; + interface IFilterGraph { CONST_VTBL IFilterGraphVtbl* lpVtbl; }; @@ -1370,73 +1395,6 @@ static FORCEINLINE HRESULT IFilterGraph_SetDefaultSyncSource(IFilterGraph* This) #endif -HRESULT STDMETHODCALLTYPE IFilterGraph_AddFilter_Proxy( - IFilterGraph* This, - IBaseFilter *pFilter, - LPCWSTR pName); -void __RPC_STUB IFilterGraph_AddFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFilterGraph_RemoveFilter_Proxy( - IFilterGraph* This, - IBaseFilter *pFilter); -void __RPC_STUB IFilterGraph_RemoveFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFilterGraph_EnumFilters_Proxy( - IFilterGraph* This, - IEnumFilters **ppEnum); -void __RPC_STUB IFilterGraph_EnumFilters_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFilterGraph_FindFilterByName_Proxy( - IFilterGraph* This, - LPCWSTR pName, - IBaseFilter **ppFilter); -void __RPC_STUB IFilterGraph_FindFilterByName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFilterGraph_ConnectDirect_Proxy( - IFilterGraph* This, - IPin *ppinOut, - IPin *ppinIn, - const AM_MEDIA_TYPE *pmt); -void __RPC_STUB IFilterGraph_ConnectDirect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFilterGraph_Reconnect_Proxy( - IFilterGraph* This, - IPin *ppin); -void __RPC_STUB IFilterGraph_Reconnect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFilterGraph_Disconnect_Proxy( - IFilterGraph* This, - IPin *ppin); -void __RPC_STUB IFilterGraph_Disconnect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFilterGraph_SetDefaultSyncSource_Proxy( - IFilterGraph* This); -void __RPC_STUB IFilterGraph_SetDefaultSyncSource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFilterGraph_INTERFACE_DEFINED__ */ @@ -1477,36 +1435,37 @@ typedef struct IEnumFiltersVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumFilters* This, + IEnumFilters *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumFilters* This); + IEnumFilters *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumFilters* This); + IEnumFilters *This); /*** IEnumFilters methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumFilters* This, + IEnumFilters *This, ULONG cFilters, IBaseFilter **ppFilter, ULONG *pcFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumFilters* This, + IEnumFilters *This, ULONG cFilters); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumFilters* This); + IEnumFilters *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumFilters* This, + IEnumFilters *This, IEnumFilters **ppEnum); END_INTERFACE } IEnumFiltersVtbl; + interface IEnumFilters { CONST_VTBL IEnumFiltersVtbl* lpVtbl; }; @@ -1551,39 +1510,6 @@ static FORCEINLINE HRESULT IEnumFilters_Clone(IEnumFilters* This,IEnumFilters ** #endif -HRESULT STDMETHODCALLTYPE IEnumFilters_Next_Proxy( - IEnumFilters* This, - ULONG cFilters, - IBaseFilter **ppFilter, - ULONG *pcFetched); -void __RPC_STUB IEnumFilters_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumFilters_Skip_Proxy( - IEnumFilters* This, - ULONG cFilters); -void __RPC_STUB IEnumFilters_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumFilters_Reset_Proxy( - IEnumFilters* This); -void __RPC_STUB IEnumFilters_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumFilters_Clone_Proxy( - IEnumFilters* This, - IEnumFilters **ppEnum); -void __RPC_STUB IEnumFilters_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumFilters_INTERFACE_DEFINED__ */ @@ -1635,47 +1561,48 @@ typedef struct IMediaFilterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMediaFilter* This, + IMediaFilter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMediaFilter* This); + IMediaFilter *This); ULONG (STDMETHODCALLTYPE *Release)( - IMediaFilter* This); + IMediaFilter *This); /*** IPersist methods ***/ HRESULT (STDMETHODCALLTYPE *GetClassID)( - IMediaFilter* This, + IMediaFilter *This, CLSID *pClassID); /*** IMediaFilter methods ***/ HRESULT (STDMETHODCALLTYPE *Stop)( - IMediaFilter* This); + IMediaFilter *This); HRESULT (STDMETHODCALLTYPE *Pause)( - IMediaFilter* This); + IMediaFilter *This); HRESULT (STDMETHODCALLTYPE *Run)( - IMediaFilter* This, + IMediaFilter *This, REFERENCE_TIME tStart); HRESULT (STDMETHODCALLTYPE *GetState)( - IMediaFilter* This, + IMediaFilter *This, DWORD dwMilliSecsTimeout, FILTER_STATE *State); HRESULT (STDMETHODCALLTYPE *SetSyncSource)( - IMediaFilter* This, + IMediaFilter *This, IReferenceClock *pClock); HRESULT (STDMETHODCALLTYPE *GetSyncSource)( - IMediaFilter* This, + IMediaFilter *This, IReferenceClock **pClock); END_INTERFACE } IMediaFilterVtbl; + interface IMediaFilter { CONST_VTBL IMediaFilterVtbl* lpVtbl; }; @@ -1734,53 +1661,6 @@ static FORCEINLINE HRESULT IMediaFilter_GetSyncSource(IMediaFilter* This,IRefere #endif -HRESULT STDMETHODCALLTYPE IMediaFilter_Stop_Proxy( - IMediaFilter* This); -void __RPC_STUB IMediaFilter_Stop_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaFilter_Pause_Proxy( - IMediaFilter* This); -void __RPC_STUB IMediaFilter_Pause_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaFilter_Run_Proxy( - IMediaFilter* This, - REFERENCE_TIME tStart); -void __RPC_STUB IMediaFilter_Run_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaFilter_GetState_Proxy( - IMediaFilter* This, - DWORD dwMilliSecsTimeout, - FILTER_STATE *State); -void __RPC_STUB IMediaFilter_GetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaFilter_SetSyncSource_Proxy( - IMediaFilter* This, - IReferenceClock *pClock); -void __RPC_STUB IMediaFilter_SetSyncSource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaFilter_GetSyncSource_Proxy( - IMediaFilter* This, - IReferenceClock **pClock); -void __RPC_STUB IMediaFilter_GetSyncSource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMediaFilter_INTERFACE_DEFINED__ */ @@ -1829,70 +1709,71 @@ typedef struct IBaseFilterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IBaseFilter* This, + IBaseFilter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IBaseFilter* This); + IBaseFilter *This); ULONG (STDMETHODCALLTYPE *Release)( - IBaseFilter* This); + IBaseFilter *This); /*** IPersist methods ***/ HRESULT (STDMETHODCALLTYPE *GetClassID)( - IBaseFilter* This, + IBaseFilter *This, CLSID *pClassID); /*** IMediaFilter methods ***/ HRESULT (STDMETHODCALLTYPE *Stop)( - IBaseFilter* This); + IBaseFilter *This); HRESULT (STDMETHODCALLTYPE *Pause)( - IBaseFilter* This); + IBaseFilter *This); HRESULT (STDMETHODCALLTYPE *Run)( - IBaseFilter* This, + IBaseFilter *This, REFERENCE_TIME tStart); HRESULT (STDMETHODCALLTYPE *GetState)( - IBaseFilter* This, + IBaseFilter *This, DWORD dwMilliSecsTimeout, FILTER_STATE *State); HRESULT (STDMETHODCALLTYPE *SetSyncSource)( - IBaseFilter* This, + IBaseFilter *This, IReferenceClock *pClock); HRESULT (STDMETHODCALLTYPE *GetSyncSource)( - IBaseFilter* This, + IBaseFilter *This, IReferenceClock **pClock); /*** IBaseFilter methods ***/ HRESULT (STDMETHODCALLTYPE *EnumPins)( - IBaseFilter* This, + IBaseFilter *This, IEnumPins **ppEnum); HRESULT (STDMETHODCALLTYPE *FindPin)( - IBaseFilter* This, + IBaseFilter *This, LPCWSTR Id, IPin **ppPin); HRESULT (STDMETHODCALLTYPE *QueryFilterInfo)( - IBaseFilter* This, + IBaseFilter *This, FILTER_INFO *pInfo); HRESULT (STDMETHODCALLTYPE *JoinFilterGraph)( - IBaseFilter* This, + IBaseFilter *This, IFilterGraph *pGraph, LPCWSTR pName); HRESULT (STDMETHODCALLTYPE *QueryVendorInfo)( - IBaseFilter* This, + IBaseFilter *This, LPWSTR *pVendorInfo); END_INTERFACE } IBaseFilterVtbl; + interface IBaseFilter { CONST_VTBL IBaseFilterVtbl* lpVtbl; }; @@ -1973,48 +1854,6 @@ static FORCEINLINE HRESULT IBaseFilter_QueryVendorInfo(IBaseFilter* This,LPWSTR #endif -HRESULT STDMETHODCALLTYPE IBaseFilter_EnumPins_Proxy( - IBaseFilter* This, - IEnumPins **ppEnum); -void __RPC_STUB IBaseFilter_EnumPins_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IBaseFilter_FindPin_Proxy( - IBaseFilter* This, - LPCWSTR Id, - IPin **ppPin); -void __RPC_STUB IBaseFilter_FindPin_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IBaseFilter_QueryFilterInfo_Proxy( - IBaseFilter* This, - FILTER_INFO *pInfo); -void __RPC_STUB IBaseFilter_QueryFilterInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IBaseFilter_JoinFilterGraph_Proxy( - IBaseFilter* This, - IFilterGraph *pGraph, - LPCWSTR pName); -void __RPC_STUB IBaseFilter_JoinFilterGraph_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IBaseFilter_QueryVendorInfo_Proxy( - IBaseFilter* This, - LPWSTR *pVendorInfo); -void __RPC_STUB IBaseFilter_QueryVendorInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IBaseFilter_INTERFACE_DEFINED__ */ @@ -2059,41 +1898,42 @@ typedef struct IReferenceClockVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IReferenceClock* This, + IReferenceClock *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IReferenceClock* This); + IReferenceClock *This); ULONG (STDMETHODCALLTYPE *Release)( - IReferenceClock* This); + IReferenceClock *This); /*** IReferenceClock methods ***/ HRESULT (STDMETHODCALLTYPE *GetTime)( - IReferenceClock* This, + IReferenceClock *This, REFERENCE_TIME *pTime); HRESULT (STDMETHODCALLTYPE *AdviseTime)( - IReferenceClock* This, + IReferenceClock *This, REFERENCE_TIME baseTime, REFERENCE_TIME streamTime, HEVENT hEvent, DWORD_PTR *pdwAdviseCookie); HRESULT (STDMETHODCALLTYPE *AdvisePeriodic)( - IReferenceClock* This, + IReferenceClock *This, REFERENCE_TIME startTime, REFERENCE_TIME periodTime, HSEMAPHORE hSemaphore, DWORD_PTR *pdwAdviseCookie); HRESULT (STDMETHODCALLTYPE *Unadvise)( - IReferenceClock* This, + IReferenceClock *This, DWORD_PTR dwAdviseCookie); END_INTERFACE } IReferenceClockVtbl; + interface IReferenceClock { CONST_VTBL IReferenceClockVtbl* lpVtbl; }; @@ -2138,44 +1978,6 @@ static FORCEINLINE HRESULT IReferenceClock_Unadvise(IReferenceClock* This,DWORD_ #endif -HRESULT STDMETHODCALLTYPE IReferenceClock_GetTime_Proxy( - IReferenceClock* This, - REFERENCE_TIME *pTime); -void __RPC_STUB IReferenceClock_GetTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IReferenceClock_AdviseTime_Proxy( - IReferenceClock* This, - REFERENCE_TIME baseTime, - REFERENCE_TIME streamTime, - HEVENT hEvent, - DWORD_PTR *pdwAdviseCookie); -void __RPC_STUB IReferenceClock_AdviseTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IReferenceClock_AdvisePeriodic_Proxy( - IReferenceClock* This, - REFERENCE_TIME startTime, - REFERENCE_TIME periodTime, - HSEMAPHORE hSemaphore, - DWORD_PTR *pdwAdviseCookie); -void __RPC_STUB IReferenceClock_AdvisePeriodic_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IReferenceClock_Unadvise_Proxy( - IReferenceClock* This, - DWORD_PTR dwAdviseCookie); -void __RPC_STUB IReferenceClock_Unadvise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IReferenceClock_INTERFACE_DEFINED__ */ @@ -2208,27 +2010,28 @@ typedef struct IReferenceClockTimerControlVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IReferenceClockTimerControl* This, + IReferenceClockTimerControl *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IReferenceClockTimerControl* This); + IReferenceClockTimerControl *This); ULONG (STDMETHODCALLTYPE *Release)( - IReferenceClockTimerControl* This); + IReferenceClockTimerControl *This); /*** IReferenceClockTimerControl methods ***/ HRESULT (STDMETHODCALLTYPE *SetDefaultTimerResolution)( - IReferenceClockTimerControl* This, + IReferenceClockTimerControl *This, REFERENCE_TIME timerResolution); HRESULT (STDMETHODCALLTYPE *GetDefaultTimerResolution)( - IReferenceClockTimerControl* This, + IReferenceClockTimerControl *This, REFERENCE_TIME *pTimerResolution); END_INTERFACE } IReferenceClockTimerControlVtbl; + interface IReferenceClockTimerControl { CONST_VTBL IReferenceClockTimerControlVtbl* lpVtbl; }; @@ -2265,22 +2068,6 @@ static FORCEINLINE HRESULT IReferenceClockTimerControl_GetDefaultTimerResolution #endif -HRESULT STDMETHODCALLTYPE IReferenceClockTimerControl_SetDefaultTimerResolution_Proxy( - IReferenceClockTimerControl* This, - REFERENCE_TIME timerResolution); -void __RPC_STUB IReferenceClockTimerControl_SetDefaultTimerResolution_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IReferenceClockTimerControl_GetDefaultTimerResolution_Proxy( - IReferenceClockTimerControl* This, - REFERENCE_TIME *pTimerResolution); -void __RPC_STUB IReferenceClockTimerControl_GetDefaultTimerResolution_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IReferenceClockTimerControl_INTERFACE_DEFINED__ */ @@ -2306,41 +2093,42 @@ typedef struct IReferenceClock2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IReferenceClock2* This, + IReferenceClock2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IReferenceClock2* This); + IReferenceClock2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IReferenceClock2* This); + IReferenceClock2 *This); /*** IReferenceClock methods ***/ HRESULT (STDMETHODCALLTYPE *GetTime)( - IReferenceClock2* This, + IReferenceClock2 *This, REFERENCE_TIME *pTime); HRESULT (STDMETHODCALLTYPE *AdviseTime)( - IReferenceClock2* This, + IReferenceClock2 *This, REFERENCE_TIME baseTime, REFERENCE_TIME streamTime, HEVENT hEvent, DWORD_PTR *pdwAdviseCookie); HRESULT (STDMETHODCALLTYPE *AdvisePeriodic)( - IReferenceClock2* This, + IReferenceClock2 *This, REFERENCE_TIME startTime, REFERENCE_TIME periodTime, HSEMAPHORE hSemaphore, DWORD_PTR *pdwAdviseCookie); HRESULT (STDMETHODCALLTYPE *Unadvise)( - IReferenceClock2* This, + IReferenceClock2 *This, DWORD_PTR dwAdviseCookie); END_INTERFACE } IReferenceClock2Vtbl; + interface IReferenceClock2 { CONST_VTBL IReferenceClock2Vtbl* lpVtbl; }; @@ -2463,82 +2251,83 @@ typedef struct IMediaSampleVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMediaSample* This, + IMediaSample *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMediaSample* This); + IMediaSample *This); ULONG (STDMETHODCALLTYPE *Release)( - IMediaSample* This); + IMediaSample *This); /*** IMediaSample methods ***/ HRESULT (STDMETHODCALLTYPE *GetPointer)( - IMediaSample* This, + IMediaSample *This, BYTE **ppBuffer); LONG (STDMETHODCALLTYPE *GetSize)( - IMediaSample* This); + IMediaSample *This); HRESULT (STDMETHODCALLTYPE *GetTime)( - IMediaSample* This, + IMediaSample *This, REFERENCE_TIME *pTimeStart, REFERENCE_TIME *pTimeEnd); HRESULT (STDMETHODCALLTYPE *SetTime)( - IMediaSample* This, + IMediaSample *This, REFERENCE_TIME *pTimeStart, REFERENCE_TIME *pTimeEnd); HRESULT (STDMETHODCALLTYPE *IsSyncPoint)( - IMediaSample* This); + IMediaSample *This); HRESULT (STDMETHODCALLTYPE *SetSyncPoint)( - IMediaSample* This, + IMediaSample *This, WINBOOL bIsSyncPoint); HRESULT (STDMETHODCALLTYPE *IsPreroll)( - IMediaSample* This); + IMediaSample *This); HRESULT (STDMETHODCALLTYPE *SetPreroll)( - IMediaSample* This, + IMediaSample *This, WINBOOL bIsPreroll); LONG (STDMETHODCALLTYPE *GetActualDataLength)( - IMediaSample* This); + IMediaSample *This); HRESULT (STDMETHODCALLTYPE *SetActualDataLength)( - IMediaSample* This, + IMediaSample *This, LONG a); HRESULT (STDMETHODCALLTYPE *GetMediaType)( - IMediaSample* This, + IMediaSample *This, AM_MEDIA_TYPE **ppMediaType); HRESULT (STDMETHODCALLTYPE *SetMediaType)( - IMediaSample* This, + IMediaSample *This, AM_MEDIA_TYPE *pMediaType); HRESULT (STDMETHODCALLTYPE *IsDiscontinuity)( - IMediaSample* This); + IMediaSample *This); HRESULT (STDMETHODCALLTYPE *SetDiscontinuity)( - IMediaSample* This, + IMediaSample *This, WINBOOL bDiscontinuity); HRESULT (STDMETHODCALLTYPE *GetMediaTime)( - IMediaSample* This, + IMediaSample *This, LONGLONG *pTimeStart, LONGLONG *pTimeEnd); HRESULT (STDMETHODCALLTYPE *SetMediaTime)( - IMediaSample* This, + IMediaSample *This, LONGLONG *pTimeStart, LONGLONG *pTimeEnd); END_INTERFACE } IMediaSampleVtbl; + interface IMediaSample { CONST_VTBL IMediaSampleVtbl* lpVtbl; }; @@ -2631,133 +2420,6 @@ static FORCEINLINE HRESULT IMediaSample_SetMediaTime(IMediaSample* This,LONGLONG #endif -HRESULT STDMETHODCALLTYPE IMediaSample_GetPointer_Proxy( - IMediaSample* This, - BYTE **ppBuffer); -void __RPC_STUB IMediaSample_GetPointer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -LONG STDMETHODCALLTYPE IMediaSample_GetSize_Proxy( - IMediaSample* This); -void __RPC_STUB IMediaSample_GetSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSample_GetTime_Proxy( - IMediaSample* This, - REFERENCE_TIME *pTimeStart, - REFERENCE_TIME *pTimeEnd); -void __RPC_STUB IMediaSample_GetTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSample_SetTime_Proxy( - IMediaSample* This, - REFERENCE_TIME *pTimeStart, - REFERENCE_TIME *pTimeEnd); -void __RPC_STUB IMediaSample_SetTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSample_IsSyncPoint_Proxy( - IMediaSample* This); -void __RPC_STUB IMediaSample_IsSyncPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSample_SetSyncPoint_Proxy( - IMediaSample* This, - WINBOOL bIsSyncPoint); -void __RPC_STUB IMediaSample_SetSyncPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSample_IsPreroll_Proxy( - IMediaSample* This); -void __RPC_STUB IMediaSample_IsPreroll_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSample_SetPreroll_Proxy( - IMediaSample* This, - WINBOOL bIsPreroll); -void __RPC_STUB IMediaSample_SetPreroll_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -LONG STDMETHODCALLTYPE IMediaSample_GetActualDataLength_Proxy( - IMediaSample* This); -void __RPC_STUB IMediaSample_GetActualDataLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSample_SetActualDataLength_Proxy( - IMediaSample* This, - LONG a); -void __RPC_STUB IMediaSample_SetActualDataLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSample_GetMediaType_Proxy( - IMediaSample* This, - AM_MEDIA_TYPE **ppMediaType); -void __RPC_STUB IMediaSample_GetMediaType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSample_SetMediaType_Proxy( - IMediaSample* This, - AM_MEDIA_TYPE *pMediaType); -void __RPC_STUB IMediaSample_SetMediaType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSample_IsDiscontinuity_Proxy( - IMediaSample* This); -void __RPC_STUB IMediaSample_IsDiscontinuity_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSample_SetDiscontinuity_Proxy( - IMediaSample* This, - WINBOOL bDiscontinuity); -void __RPC_STUB IMediaSample_SetDiscontinuity_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSample_GetMediaTime_Proxy( - IMediaSample* This, - LONGLONG *pTimeStart, - LONGLONG *pTimeEnd); -void __RPC_STUB IMediaSample_GetMediaTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSample_SetMediaTime_Proxy( - IMediaSample* This, - LONGLONG *pTimeStart, - LONGLONG *pTimeEnd); -void __RPC_STUB IMediaSample_SetMediaTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMediaSample_INTERFACE_DEFINED__ */ @@ -2777,7 +2439,6 @@ enum tagAM_SAMPLE_PROPERTY_FLAGS { AM_STREAM_CONTROL = 1 }; - typedef struct tagAM_SAMPLE2_PROPERTIES { DWORD cbData; DWORD dwTypeSpecificFlags; @@ -2820,93 +2481,94 @@ typedef struct IMediaSample2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMediaSample2* This, + IMediaSample2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMediaSample2* This); + IMediaSample2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IMediaSample2* This); + IMediaSample2 *This); /*** IMediaSample methods ***/ HRESULT (STDMETHODCALLTYPE *GetPointer)( - IMediaSample2* This, + IMediaSample2 *This, BYTE **ppBuffer); LONG (STDMETHODCALLTYPE *GetSize)( - IMediaSample2* This); + IMediaSample2 *This); HRESULT (STDMETHODCALLTYPE *GetTime)( - IMediaSample2* This, + IMediaSample2 *This, REFERENCE_TIME *pTimeStart, REFERENCE_TIME *pTimeEnd); HRESULT (STDMETHODCALLTYPE *SetTime)( - IMediaSample2* This, + IMediaSample2 *This, REFERENCE_TIME *pTimeStart, REFERENCE_TIME *pTimeEnd); HRESULT (STDMETHODCALLTYPE *IsSyncPoint)( - IMediaSample2* This); + IMediaSample2 *This); HRESULT (STDMETHODCALLTYPE *SetSyncPoint)( - IMediaSample2* This, + IMediaSample2 *This, WINBOOL bIsSyncPoint); HRESULT (STDMETHODCALLTYPE *IsPreroll)( - IMediaSample2* This); + IMediaSample2 *This); HRESULT (STDMETHODCALLTYPE *SetPreroll)( - IMediaSample2* This, + IMediaSample2 *This, WINBOOL bIsPreroll); LONG (STDMETHODCALLTYPE *GetActualDataLength)( - IMediaSample2* This); + IMediaSample2 *This); HRESULT (STDMETHODCALLTYPE *SetActualDataLength)( - IMediaSample2* This, + IMediaSample2 *This, LONG a); HRESULT (STDMETHODCALLTYPE *GetMediaType)( - IMediaSample2* This, + IMediaSample2 *This, AM_MEDIA_TYPE **ppMediaType); HRESULT (STDMETHODCALLTYPE *SetMediaType)( - IMediaSample2* This, + IMediaSample2 *This, AM_MEDIA_TYPE *pMediaType); HRESULT (STDMETHODCALLTYPE *IsDiscontinuity)( - IMediaSample2* This); + IMediaSample2 *This); HRESULT (STDMETHODCALLTYPE *SetDiscontinuity)( - IMediaSample2* This, + IMediaSample2 *This, WINBOOL bDiscontinuity); HRESULT (STDMETHODCALLTYPE *GetMediaTime)( - IMediaSample2* This, + IMediaSample2 *This, LONGLONG *pTimeStart, LONGLONG *pTimeEnd); HRESULT (STDMETHODCALLTYPE *SetMediaTime)( - IMediaSample2* This, + IMediaSample2 *This, LONGLONG *pTimeStart, LONGLONG *pTimeEnd); /*** IMediaSample2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetProperties)( - IMediaSample2* This, + IMediaSample2 *This, DWORD cbProperties, BYTE *pbProperties); HRESULT (STDMETHODCALLTYPE *SetProperties)( - IMediaSample2* This, + IMediaSample2 *This, DWORD cbProperties, const BYTE *pbProperties); END_INTERFACE } IMediaSample2Vtbl; + interface IMediaSample2 { CONST_VTBL IMediaSample2Vtbl* lpVtbl; }; @@ -3009,24 +2671,6 @@ static FORCEINLINE HRESULT IMediaSample2_SetProperties(IMediaSample2* This,DWORD #endif -HRESULT STDMETHODCALLTYPE IMediaSample2_GetProperties_Proxy( - IMediaSample2* This, - DWORD cbProperties, - BYTE *pbProperties); -void __RPC_STUB IMediaSample2_GetProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSample2_SetProperties_Proxy( - IMediaSample2* This, - DWORD cbProperties, - const BYTE *pbProperties); -void __RPC_STUB IMediaSample2_SetProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMediaSample2_INTERFACE_DEFINED__ */ @@ -3056,23 +2700,24 @@ typedef struct IMediaSample2ConfigVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMediaSample2Config* This, + IMediaSample2Config *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMediaSample2Config* This); + IMediaSample2Config *This); ULONG (STDMETHODCALLTYPE *Release)( - IMediaSample2Config* This); + IMediaSample2Config *This); /*** IMediaSample2Config methods ***/ HRESULT (STDMETHODCALLTYPE *GetSurface)( - IMediaSample2Config* This, + IMediaSample2Config *This, IUnknown **ppDirect3DSurface9); END_INTERFACE } IMediaSample2ConfigVtbl; + interface IMediaSample2Config { CONST_VTBL IMediaSample2ConfigVtbl* lpVtbl; }; @@ -3105,14 +2750,6 @@ static FORCEINLINE HRESULT IMediaSample2Config_GetSurface(IMediaSample2Config* T #endif -HRESULT STDMETHODCALLTYPE IMediaSample2Config_GetSurface_Proxy( - IMediaSample2Config* This, - IUnknown **ppDirect3DSurface9); -void __RPC_STUB IMediaSample2Config_GetSurface_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMediaSample2Config_INTERFACE_DEFINED__ */ @@ -3165,45 +2802,46 @@ typedef struct IMemAllocatorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMemAllocator* This, + IMemAllocator *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMemAllocator* This); + IMemAllocator *This); ULONG (STDMETHODCALLTYPE *Release)( - IMemAllocator* This); + IMemAllocator *This); /*** IMemAllocator methods ***/ HRESULT (STDMETHODCALLTYPE *SetProperties)( - IMemAllocator* This, + IMemAllocator *This, ALLOCATOR_PROPERTIES *pRequest, ALLOCATOR_PROPERTIES *pActual); HRESULT (STDMETHODCALLTYPE *GetProperties)( - IMemAllocator* This, + IMemAllocator *This, ALLOCATOR_PROPERTIES *pProps); HRESULT (STDMETHODCALLTYPE *Commit)( - IMemAllocator* This); + IMemAllocator *This); HRESULT (STDMETHODCALLTYPE *Decommit)( - IMemAllocator* This); + IMemAllocator *This); HRESULT (STDMETHODCALLTYPE *GetBuffer)( - IMemAllocator* This, + IMemAllocator *This, IMediaSample **ppBuffer, REFERENCE_TIME *pStartTime, REFERENCE_TIME *pEndTime, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *ReleaseBuffer)( - IMemAllocator* This, + IMemAllocator *This, IMediaSample *pBuffer); END_INTERFACE } IMemAllocatorVtbl; + interface IMemAllocator { CONST_VTBL IMemAllocatorVtbl* lpVtbl; }; @@ -3256,56 +2894,6 @@ static FORCEINLINE HRESULT IMemAllocator_ReleaseBuffer(IMemAllocator* This,IMedi #endif -HRESULT STDMETHODCALLTYPE IMemAllocator_SetProperties_Proxy( - IMemAllocator* This, - ALLOCATOR_PROPERTIES *pRequest, - ALLOCATOR_PROPERTIES *pActual); -void __RPC_STUB IMemAllocator_SetProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMemAllocator_GetProperties_Proxy( - IMemAllocator* This, - ALLOCATOR_PROPERTIES *pProps); -void __RPC_STUB IMemAllocator_GetProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMemAllocator_Commit_Proxy( - IMemAllocator* This); -void __RPC_STUB IMemAllocator_Commit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMemAllocator_Decommit_Proxy( - IMemAllocator* This); -void __RPC_STUB IMemAllocator_Decommit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMemAllocator_GetBuffer_Proxy( - IMemAllocator* This, - IMediaSample **ppBuffer, - REFERENCE_TIME *pStartTime, - REFERENCE_TIME *pEndTime, - DWORD dwFlags); -void __RPC_STUB IMemAllocator_GetBuffer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMemAllocator_ReleaseBuffer_Proxy( - IMemAllocator* This, - IMediaSample *pBuffer); -void __RPC_STUB IMemAllocator_ReleaseBuffer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMemAllocator_INTERFACE_DEFINED__ */ @@ -3338,54 +2926,55 @@ typedef struct IMemAllocatorCallbackTempVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMemAllocatorCallbackTemp* This, + IMemAllocatorCallbackTemp *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMemAllocatorCallbackTemp* This); + IMemAllocatorCallbackTemp *This); ULONG (STDMETHODCALLTYPE *Release)( - IMemAllocatorCallbackTemp* This); + IMemAllocatorCallbackTemp *This); /*** IMemAllocator methods ***/ HRESULT (STDMETHODCALLTYPE *SetProperties)( - IMemAllocatorCallbackTemp* This, + IMemAllocatorCallbackTemp *This, ALLOCATOR_PROPERTIES *pRequest, ALLOCATOR_PROPERTIES *pActual); HRESULT (STDMETHODCALLTYPE *GetProperties)( - IMemAllocatorCallbackTemp* This, + IMemAllocatorCallbackTemp *This, ALLOCATOR_PROPERTIES *pProps); HRESULT (STDMETHODCALLTYPE *Commit)( - IMemAllocatorCallbackTemp* This); + IMemAllocatorCallbackTemp *This); HRESULT (STDMETHODCALLTYPE *Decommit)( - IMemAllocatorCallbackTemp* This); + IMemAllocatorCallbackTemp *This); HRESULT (STDMETHODCALLTYPE *GetBuffer)( - IMemAllocatorCallbackTemp* This, + IMemAllocatorCallbackTemp *This, IMediaSample **ppBuffer, REFERENCE_TIME *pStartTime, REFERENCE_TIME *pEndTime, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *ReleaseBuffer)( - IMemAllocatorCallbackTemp* This, + IMemAllocatorCallbackTemp *This, IMediaSample *pBuffer); /*** IMemAllocatorCallbackTemp methods ***/ HRESULT (STDMETHODCALLTYPE *SetNotify)( - IMemAllocatorCallbackTemp* This, + IMemAllocatorCallbackTemp *This, IMemAllocatorNotifyCallbackTemp *pNotify); HRESULT (STDMETHODCALLTYPE *GetFreeCount)( - IMemAllocatorCallbackTemp* This, + IMemAllocatorCallbackTemp *This, LONG *plBuffersFree); END_INTERFACE } IMemAllocatorCallbackTempVtbl; + interface IMemAllocatorCallbackTemp { CONST_VTBL IMemAllocatorCallbackTempVtbl* lpVtbl; }; @@ -3448,22 +3037,6 @@ static FORCEINLINE HRESULT IMemAllocatorCallbackTemp_GetFreeCount(IMemAllocatorC #endif -HRESULT STDMETHODCALLTYPE IMemAllocatorCallbackTemp_SetNotify_Proxy( - IMemAllocatorCallbackTemp* This, - IMemAllocatorNotifyCallbackTemp *pNotify); -void __RPC_STUB IMemAllocatorCallbackTemp_SetNotify_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMemAllocatorCallbackTemp_GetFreeCount_Proxy( - IMemAllocatorCallbackTemp* This, - LONG *plBuffersFree); -void __RPC_STUB IMemAllocatorCallbackTemp_GetFreeCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMemAllocatorCallbackTemp_INTERFACE_DEFINED__ */ @@ -3492,22 +3065,23 @@ typedef struct IMemAllocatorNotifyCallbackTempVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMemAllocatorNotifyCallbackTemp* This, + IMemAllocatorNotifyCallbackTemp *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMemAllocatorNotifyCallbackTemp* This); + IMemAllocatorNotifyCallbackTemp *This); ULONG (STDMETHODCALLTYPE *Release)( - IMemAllocatorNotifyCallbackTemp* This); + IMemAllocatorNotifyCallbackTemp *This); /*** IMemAllocatorNotifyCallbackTemp methods ***/ HRESULT (STDMETHODCALLTYPE *NotifyRelease)( - IMemAllocatorNotifyCallbackTemp* This); + IMemAllocatorNotifyCallbackTemp *This); END_INTERFACE } IMemAllocatorNotifyCallbackTempVtbl; + interface IMemAllocatorNotifyCallbackTemp { CONST_VTBL IMemAllocatorNotifyCallbackTempVtbl* lpVtbl; }; @@ -3540,13 +3114,6 @@ static FORCEINLINE HRESULT IMemAllocatorNotifyCallbackTemp_NotifyRelease(IMemAll #endif -HRESULT STDMETHODCALLTYPE IMemAllocatorNotifyCallbackTemp_NotifyRelease_Proxy( - IMemAllocatorNotifyCallbackTemp* This); -void __RPC_STUB IMemAllocatorNotifyCallbackTemp_NotifyRelease_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMemAllocatorNotifyCallbackTemp_INTERFACE_DEFINED__ */ @@ -3593,45 +3160,46 @@ typedef struct IMemInputPinVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMemInputPin* This, + IMemInputPin *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMemInputPin* This); + IMemInputPin *This); ULONG (STDMETHODCALLTYPE *Release)( - IMemInputPin* This); + IMemInputPin *This); /*** IMemInputPin methods ***/ HRESULT (STDMETHODCALLTYPE *GetAllocator)( - IMemInputPin* This, + IMemInputPin *This, IMemAllocator **ppAllocator); HRESULT (STDMETHODCALLTYPE *NotifyAllocator)( - IMemInputPin* This, + IMemInputPin *This, IMemAllocator *pAllocator, WINBOOL bReadOnly); HRESULT (STDMETHODCALLTYPE *GetAllocatorRequirements)( - IMemInputPin* This, + IMemInputPin *This, ALLOCATOR_PROPERTIES *pProps); HRESULT (STDMETHODCALLTYPE *Receive)( - IMemInputPin* This, + IMemInputPin *This, IMediaSample *pSample); HRESULT (STDMETHODCALLTYPE *ReceiveMultiple)( - IMemInputPin* This, + IMemInputPin *This, IMediaSample **pSamples, LONG nSamples, LONG *nSamplesProcessed); HRESULT (STDMETHODCALLTYPE *ReceiveCanBlock)( - IMemInputPin* This); + IMemInputPin *This); END_INTERFACE } IMemInputPinVtbl; + interface IMemInputPin { CONST_VTBL IMemInputPinVtbl* lpVtbl; }; @@ -3684,56 +3252,6 @@ static FORCEINLINE HRESULT IMemInputPin_ReceiveCanBlock(IMemInputPin* This) { #endif -HRESULT STDMETHODCALLTYPE IMemInputPin_GetAllocator_Proxy( - IMemInputPin* This, - IMemAllocator **ppAllocator); -void __RPC_STUB IMemInputPin_GetAllocator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMemInputPin_NotifyAllocator_Proxy( - IMemInputPin* This, - IMemAllocator *pAllocator, - WINBOOL bReadOnly); -void __RPC_STUB IMemInputPin_NotifyAllocator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMemInputPin_GetAllocatorRequirements_Proxy( - IMemInputPin* This, - ALLOCATOR_PROPERTIES *pProps); -void __RPC_STUB IMemInputPin_GetAllocatorRequirements_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMemInputPin_Receive_Proxy( - IMemInputPin* This, - IMediaSample *pSample); -void __RPC_STUB IMemInputPin_Receive_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMemInputPin_ReceiveMultiple_Proxy( - IMemInputPin* This, - IMediaSample **pSamples, - LONG nSamples, - LONG *nSamplesProcessed); -void __RPC_STUB IMemInputPin_ReceiveMultiple_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMemInputPin_ReceiveCanBlock_Proxy( - IMemInputPin* This); -void __RPC_STUB IMemInputPin_ReceiveCanBlock_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMemInputPin_INTERFACE_DEFINED__ */ @@ -3766,25 +3284,26 @@ typedef struct IAMovieSetupVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAMovieSetup* This, + IAMovieSetup *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAMovieSetup* This); + IAMovieSetup *This); ULONG (STDMETHODCALLTYPE *Release)( - IAMovieSetup* This); + IAMovieSetup *This); /*** IAMovieSetup methods ***/ HRESULT (STDMETHODCALLTYPE *Register)( - IAMovieSetup* This); + IAMovieSetup *This); HRESULT (STDMETHODCALLTYPE *Unregister)( - IAMovieSetup* This); + IAMovieSetup *This); END_INTERFACE } IAMovieSetupVtbl; + interface IAMovieSetup { CONST_VTBL IAMovieSetupVtbl* lpVtbl; }; @@ -3821,20 +3340,6 @@ static FORCEINLINE HRESULT IAMovieSetup_Unregister(IAMovieSetup* This) { #endif -HRESULT STDMETHODCALLTYPE IAMovieSetup_Register_Proxy( - IAMovieSetup* This); -void __RPC_STUB IAMovieSetup_Register_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMovieSetup_Unregister_Proxy( - IAMovieSetup* This); -void __RPC_STUB IAMovieSetup_Unregister_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAMovieSetup_INTERFACE_DEFINED__ */ @@ -3944,95 +3449,96 @@ typedef struct IMediaSeekingVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMediaSeeking* This, + IMediaSeeking *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMediaSeeking* This); + IMediaSeeking *This); ULONG (STDMETHODCALLTYPE *Release)( - IMediaSeeking* This); + IMediaSeeking *This); /*** IMediaSeeking methods ***/ HRESULT (STDMETHODCALLTYPE *GetCapabilities)( - IMediaSeeking* This, + IMediaSeeking *This, DWORD *pCapabilities); HRESULT (STDMETHODCALLTYPE *CheckCapabilities)( - IMediaSeeking* This, + IMediaSeeking *This, DWORD *pCapabilities); HRESULT (STDMETHODCALLTYPE *IsFormatSupported)( - IMediaSeeking* This, + IMediaSeeking *This, const GUID *pFormat); HRESULT (STDMETHODCALLTYPE *QueryPreferredFormat)( - IMediaSeeking* This, + IMediaSeeking *This, GUID *pFormat); HRESULT (STDMETHODCALLTYPE *GetTimeFormat)( - IMediaSeeking* This, + IMediaSeeking *This, GUID *pFormat); HRESULT (STDMETHODCALLTYPE *IsUsingTimeFormat)( - IMediaSeeking* This, + IMediaSeeking *This, const GUID *pFormat); HRESULT (STDMETHODCALLTYPE *SetTimeFormat)( - IMediaSeeking* This, + IMediaSeeking *This, const GUID *pFormat); HRESULT (STDMETHODCALLTYPE *GetDuration)( - IMediaSeeking* This, + IMediaSeeking *This, LONGLONG *pDuration); HRESULT (STDMETHODCALLTYPE *GetStopPosition)( - IMediaSeeking* This, + IMediaSeeking *This, LONGLONG *pStop); HRESULT (STDMETHODCALLTYPE *GetCurrentPosition)( - IMediaSeeking* This, + IMediaSeeking *This, LONGLONG *pCurrent); HRESULT (STDMETHODCALLTYPE *ConvertTimeFormat)( - IMediaSeeking* This, + IMediaSeeking *This, LONGLONG *pTarget, const GUID *pTargetFormat, LONGLONG Source, const GUID *pSourceFormat); HRESULT (STDMETHODCALLTYPE *SetPositions)( - IMediaSeeking* This, + IMediaSeeking *This, LONGLONG *pCurrent, DWORD dwCurrentFlags, LONGLONG *pStop, DWORD dwStopFlags); HRESULT (STDMETHODCALLTYPE *GetPositions)( - IMediaSeeking* This, + IMediaSeeking *This, LONGLONG *pCurrent, LONGLONG *pStop); HRESULT (STDMETHODCALLTYPE *GetAvailable)( - IMediaSeeking* This, + IMediaSeeking *This, LONGLONG *pEarliest, LONGLONG *pLatest); HRESULT (STDMETHODCALLTYPE *SetRate)( - IMediaSeeking* This, + IMediaSeeking *This, double dRate); HRESULT (STDMETHODCALLTYPE *GetRate)( - IMediaSeeking* This, + IMediaSeeking *This, double *pdRate); HRESULT (STDMETHODCALLTYPE *GetPreroll)( - IMediaSeeking* This, + IMediaSeeking *This, LONGLONG *pllPreroll); END_INTERFACE } IMediaSeekingVtbl; + interface IMediaSeeking { CONST_VTBL IMediaSeekingVtbl* lpVtbl; }; @@ -4129,150 +3635,6 @@ static FORCEINLINE HRESULT IMediaSeeking_GetPreroll(IMediaSeeking* This,LONGLONG #endif -HRESULT STDMETHODCALLTYPE IMediaSeeking_GetCapabilities_Proxy( - IMediaSeeking* This, - DWORD *pCapabilities); -void __RPC_STUB IMediaSeeking_GetCapabilities_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSeeking_CheckCapabilities_Proxy( - IMediaSeeking* This, - DWORD *pCapabilities); -void __RPC_STUB IMediaSeeking_CheckCapabilities_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSeeking_IsFormatSupported_Proxy( - IMediaSeeking* This, - const GUID *pFormat); -void __RPC_STUB IMediaSeeking_IsFormatSupported_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSeeking_QueryPreferredFormat_Proxy( - IMediaSeeking* This, - GUID *pFormat); -void __RPC_STUB IMediaSeeking_QueryPreferredFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSeeking_GetTimeFormat_Proxy( - IMediaSeeking* This, - GUID *pFormat); -void __RPC_STUB IMediaSeeking_GetTimeFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSeeking_IsUsingTimeFormat_Proxy( - IMediaSeeking* This, - const GUID *pFormat); -void __RPC_STUB IMediaSeeking_IsUsingTimeFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSeeking_SetTimeFormat_Proxy( - IMediaSeeking* This, - const GUID *pFormat); -void __RPC_STUB IMediaSeeking_SetTimeFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSeeking_GetDuration_Proxy( - IMediaSeeking* This, - LONGLONG *pDuration); -void __RPC_STUB IMediaSeeking_GetDuration_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSeeking_GetStopPosition_Proxy( - IMediaSeeking* This, - LONGLONG *pStop); -void __RPC_STUB IMediaSeeking_GetStopPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSeeking_GetCurrentPosition_Proxy( - IMediaSeeking* This, - LONGLONG *pCurrent); -void __RPC_STUB IMediaSeeking_GetCurrentPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSeeking_ConvertTimeFormat_Proxy( - IMediaSeeking* This, - LONGLONG *pTarget, - const GUID *pTargetFormat, - LONGLONG Source, - const GUID *pSourceFormat); -void __RPC_STUB IMediaSeeking_ConvertTimeFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSeeking_SetPositions_Proxy( - IMediaSeeking* This, - LONGLONG *pCurrent, - DWORD dwCurrentFlags, - LONGLONG *pStop, - DWORD dwStopFlags); -void __RPC_STUB IMediaSeeking_SetPositions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSeeking_GetPositions_Proxy( - IMediaSeeking* This, - LONGLONG *pCurrent, - LONGLONG *pStop); -void __RPC_STUB IMediaSeeking_GetPositions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSeeking_GetAvailable_Proxy( - IMediaSeeking* This, - LONGLONG *pEarliest, - LONGLONG *pLatest); -void __RPC_STUB IMediaSeeking_GetAvailable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSeeking_SetRate_Proxy( - IMediaSeeking* This, - double dRate); -void __RPC_STUB IMediaSeeking_SetRate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSeeking_GetRate_Proxy( - IMediaSeeking* This, - double *pdRate); -void __RPC_STUB IMediaSeeking_GetRate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMediaSeeking_GetPreroll_Proxy( - IMediaSeeking* This, - LONGLONG *pllPreroll); -void __RPC_STUB IMediaSeeking_GetPreroll_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMediaSeeking_INTERFACE_DEFINED__ */ @@ -4286,276 +3648,441 @@ enum tagAM_MEDIAEVENT_FLAGS { #ifndef __IAMAnalogVideoDecoder_FWD_DEFINED__ #define __IAMAnalogVideoDecoder_FWD_DEFINED__ typedef interface IAMAnalogVideoDecoder IAMAnalogVideoDecoder; +#ifdef __cplusplus +interface IAMAnalogVideoDecoder; +#endif /* __cplusplus */ #endif #ifndef __IAMAnalogVideoEncoder_FWD_DEFINED__ #define __IAMAnalogVideoEncoder_FWD_DEFINED__ typedef interface IAMAnalogVideoEncoder IAMAnalogVideoEncoder; +#ifdef __cplusplus +interface IAMAnalogVideoEncoder; +#endif /* __cplusplus */ #endif #ifndef __IAMAudioInputMixer_FWD_DEFINED__ #define __IAMAudioInputMixer_FWD_DEFINED__ typedef interface IAMAudioInputMixer IAMAudioInputMixer; +#ifdef __cplusplus +interface IAMAudioInputMixer; +#endif /* __cplusplus */ #endif #ifndef __IAMAudioRendererStats_FWD_DEFINED__ #define __IAMAudioRendererStats_FWD_DEFINED__ typedef interface IAMAudioRendererStats IAMAudioRendererStats; +#ifdef __cplusplus +interface IAMAudioRendererStats; +#endif /* __cplusplus */ #endif #ifndef __IAMBufferNegotiation_FWD_DEFINED__ #define __IAMBufferNegotiation_FWD_DEFINED__ typedef interface IAMBufferNegotiation IAMBufferNegotiation; +#ifdef __cplusplus +interface IAMBufferNegotiation; +#endif /* __cplusplus */ #endif #ifndef __IAMCameraControl_FWD_DEFINED__ #define __IAMCameraControl_FWD_DEFINED__ typedef interface IAMCameraControl IAMCameraControl; +#ifdef __cplusplus +interface IAMCameraControl; +#endif /* __cplusplus */ #endif #ifndef __IAMCertifiedOutputProtection_FWD_DEFINED__ #define __IAMCertifiedOutputProtection_FWD_DEFINED__ typedef interface IAMCertifiedOutputProtection IAMCertifiedOutputProtection; +#ifdef __cplusplus +interface IAMCertifiedOutputProtection; +#endif /* __cplusplus */ #endif #ifndef __IAMClockSlave_FWD_DEFINED__ #define __IAMClockSlave_FWD_DEFINED__ typedef interface IAMClockSlave IAMClockSlave; +#ifdef __cplusplus +interface IAMClockSlave; +#endif /* __cplusplus */ #endif #ifndef __IAMCopyCaptureFileProgress_FWD_DEFINED__ #define __IAMCopyCaptureFileProgress_FWD_DEFINED__ typedef interface IAMCopyCaptureFileProgress IAMCopyCaptureFileProgress; +#ifdef __cplusplus +interface IAMCopyCaptureFileProgress; +#endif /* __cplusplus */ #endif #ifndef __IAMCrossbar_FWD_DEFINED__ #define __IAMCrossbar_FWD_DEFINED__ typedef interface IAMCrossbar IAMCrossbar; +#ifdef __cplusplus +interface IAMCrossbar; +#endif /* __cplusplus */ #endif #ifndef __IAMDevMemoryAllocator_FWD_DEFINED__ #define __IAMDevMemoryAllocator_FWD_DEFINED__ typedef interface IAMDevMemoryAllocator IAMDevMemoryAllocator; +#ifdef __cplusplus +interface IAMDevMemoryAllocator; +#endif /* __cplusplus */ #endif #ifndef __IAMDevMemoryControl_FWD_DEFINED__ #define __IAMDevMemoryControl_FWD_DEFINED__ typedef interface IAMDevMemoryControl IAMDevMemoryControl; +#ifdef __cplusplus +interface IAMDevMemoryControl; +#endif /* __cplusplus */ #endif #ifndef __IAMDroppedFrames_FWD_DEFINED__ #define __IAMDroppedFrames_FWD_DEFINED__ typedef interface IAMDroppedFrames IAMDroppedFrames; +#ifdef __cplusplus +interface IAMDroppedFrames; +#endif /* __cplusplus */ #endif #ifndef __IAMExtDevice_FWD_DEFINED__ #define __IAMExtDevice_FWD_DEFINED__ typedef interface IAMExtDevice IAMExtDevice; +#ifdef __cplusplus +interface IAMExtDevice; +#endif /* __cplusplus */ #endif #ifndef __IAMExtTransport_FWD_DEFINED__ #define __IAMExtTransport_FWD_DEFINED__ typedef interface IAMExtTransport IAMExtTransport; +#ifdef __cplusplus +interface IAMExtTransport; +#endif /* __cplusplus */ #endif #ifndef __IAMGraphStreams_FWD_DEFINED__ #define __IAMGraphStreams_FWD_DEFINED__ typedef interface IAMGraphStreams IAMGraphStreams; +#ifdef __cplusplus +interface IAMGraphStreams; +#endif /* __cplusplus */ #endif #ifndef __IAMLatency_FWD_DEFINED__ #define __IAMLatency_FWD_DEFINED__ typedef interface IAMLatency IAMLatency; +#ifdef __cplusplus +interface IAMLatency; +#endif /* __cplusplus */ #endif #ifndef __IAMOpenProgress_FWD_DEFINED__ #define __IAMOpenProgress_FWD_DEFINED__ typedef interface IAMOpenProgress IAMOpenProgress; +#ifdef __cplusplus +interface IAMOpenProgress; +#endif /* __cplusplus */ #endif #ifndef __IAMOverlayFX_FWD_DEFINED__ #define __IAMOverlayFX_FWD_DEFINED__ typedef interface IAMOverlayFX IAMOverlayFX; +#ifdef __cplusplus +interface IAMOverlayFX; +#endif /* __cplusplus */ #endif #ifndef __IAMPhysicalPinInfo_FWD_DEFINED__ #define __IAMPhysicalPinInfo_FWD_DEFINED__ typedef interface IAMPhysicalPinInfo IAMPhysicalPinInfo; +#ifdef __cplusplus +interface IAMPhysicalPinInfo; +#endif /* __cplusplus */ #endif #ifndef __IAMPushSource_FWD_DEFINED__ #define __IAMPushSource_FWD_DEFINED__ typedef interface IAMPushSource IAMPushSource; +#ifdef __cplusplus +interface IAMPushSource; +#endif /* __cplusplus */ #endif #ifndef __IAMStreamConfig_FWD_DEFINED__ #define __IAMStreamConfig_FWD_DEFINED__ typedef interface IAMStreamConfig IAMStreamConfig; +#ifdef __cplusplus +interface IAMStreamConfig; +#endif /* __cplusplus */ #endif #ifndef __IAMTimecodeDisplay_FWD_DEFINED__ #define __IAMTimecodeDisplay_FWD_DEFINED__ typedef interface IAMTimecodeDisplay IAMTimecodeDisplay; +#ifdef __cplusplus +interface IAMTimecodeDisplay; +#endif /* __cplusplus */ #endif #ifndef __IAMTimecodeGenerator_FWD_DEFINED__ #define __IAMTimecodeGenerator_FWD_DEFINED__ typedef interface IAMTimecodeGenerator IAMTimecodeGenerator; +#ifdef __cplusplus +interface IAMTimecodeGenerator; +#endif /* __cplusplus */ #endif #ifndef __IAMTimecodeReader_FWD_DEFINED__ #define __IAMTimecodeReader_FWD_DEFINED__ typedef interface IAMTimecodeReader IAMTimecodeReader; +#ifdef __cplusplus +interface IAMTimecodeReader; +#endif /* __cplusplus */ #endif #ifndef __IAMTVTuner_FWD_DEFINED__ #define __IAMTVTuner_FWD_DEFINED__ typedef interface IAMTVTuner IAMTVTuner; +#ifdef __cplusplus +interface IAMTVTuner; +#endif /* __cplusplus */ #endif #ifndef __IAMVfwCaptureDialogs_FWD_DEFINED__ #define __IAMVfwCaptureDialogs_FWD_DEFINED__ typedef interface IAMVfwCaptureDialogs IAMVfwCaptureDialogs; +#ifdef __cplusplus +interface IAMVfwCaptureDialogs; +#endif /* __cplusplus */ #endif #ifndef __IAMVfwCompressDialogs_FWD_DEFINED__ #define __IAMVfwCompressDialogs_FWD_DEFINED__ typedef interface IAMVfwCompressDialogs IAMVfwCompressDialogs; +#ifdef __cplusplus +interface IAMVfwCompressDialogs; +#endif /* __cplusplus */ #endif #ifndef __IAMVideoCompression_FWD_DEFINED__ #define __IAMVideoCompression_FWD_DEFINED__ typedef interface IAMVideoCompression IAMVideoCompression; +#ifdef __cplusplus +interface IAMVideoCompression; +#endif /* __cplusplus */ #endif #ifndef __IAMVideoDecimationProperties_FWD_DEFINED__ #define __IAMVideoDecimationProperties_FWD_DEFINED__ typedef interface IAMVideoDecimationProperties IAMVideoDecimationProperties; +#ifdef __cplusplus +interface IAMVideoDecimationProperties; +#endif /* __cplusplus */ #endif #ifndef __IAMVideoProcAmp_FWD_DEFINED__ #define __IAMVideoProcAmp_FWD_DEFINED__ typedef interface IAMVideoProcAmp IAMVideoProcAmp; +#ifdef __cplusplus +interface IAMVideoProcAmp; +#endif /* __cplusplus */ #endif #ifndef __IAMGraphBuilderCallback_FWD_DEFINED__ #define __IAMGraphBuilderCallback_FWD_DEFINED__ typedef interface IAMGraphBuilderCallback IAMGraphBuilderCallback; +#ifdef __cplusplus +interface IAMGraphBuilderCallback; +#endif /* __cplusplus */ #endif #ifndef __ICaptureGraphBuilder_FWD_DEFINED__ #define __ICaptureGraphBuilder_FWD_DEFINED__ typedef interface ICaptureGraphBuilder ICaptureGraphBuilder; +#ifdef __cplusplus +interface ICaptureGraphBuilder; +#endif /* __cplusplus */ #endif #ifndef __ICaptureGraphBuilder2_FWD_DEFINED__ #define __ICaptureGraphBuilder2_FWD_DEFINED__ typedef interface ICaptureGraphBuilder2 ICaptureGraphBuilder2; +#ifdef __cplusplus +interface ICaptureGraphBuilder2; +#endif /* __cplusplus */ #endif #ifndef __IConfigAviMux_FWD_DEFINED__ #define __IConfigAviMux_FWD_DEFINED__ typedef interface IConfigAviMux IConfigAviMux; +#ifdef __cplusplus +interface IConfigAviMux; +#endif /* __cplusplus */ #endif #ifndef __IConfigInterleaving_FWD_DEFINED__ #define __IConfigInterleaving_FWD_DEFINED__ typedef interface IConfigInterleaving IConfigInterleaving; +#ifdef __cplusplus +interface IConfigInterleaving; +#endif /* __cplusplus */ #endif #ifndef __IDecimateVideoImage_FWD_DEFINED__ #define __IDecimateVideoImage_FWD_DEFINED__ typedef interface IDecimateVideoImage IDecimateVideoImage; +#ifdef __cplusplus +interface IDecimateVideoImage; +#endif /* __cplusplus */ #endif #ifndef __IDrawVideoImage_FWD_DEFINED__ #define __IDrawVideoImage_FWD_DEFINED__ typedef interface IDrawVideoImage IDrawVideoImage; +#ifdef __cplusplus +interface IDrawVideoImage; +#endif /* __cplusplus */ #endif #ifndef __IEnumRegFilters_FWD_DEFINED__ #define __IEnumRegFilters_FWD_DEFINED__ typedef interface IEnumRegFilters IEnumRegFilters; +#ifdef __cplusplus +interface IEnumRegFilters; +#endif /* __cplusplus */ #endif #ifndef __IEnumStreamIdMap_FWD_DEFINED__ #define __IEnumStreamIdMap_FWD_DEFINED__ typedef interface IEnumStreamIdMap IEnumStreamIdMap; +#ifdef __cplusplus +interface IEnumStreamIdMap; +#endif /* __cplusplus */ #endif #ifndef __IFileSourceFilter_FWD_DEFINED__ #define __IFileSourceFilter_FWD_DEFINED__ typedef interface IFileSourceFilter IFileSourceFilter; +#ifdef __cplusplus +interface IFileSourceFilter; +#endif /* __cplusplus */ #endif #ifndef __IFileSinkFilter_FWD_DEFINED__ #define __IFileSinkFilter_FWD_DEFINED__ typedef interface IFileSinkFilter IFileSinkFilter; +#ifdef __cplusplus +interface IFileSinkFilter; +#endif /* __cplusplus */ #endif #ifndef __IFileSinkFilter2_FWD_DEFINED__ #define __IFileSinkFilter2_FWD_DEFINED__ typedef interface IFileSinkFilter2 IFileSinkFilter2; +#ifdef __cplusplus +interface IFileSinkFilter2; +#endif /* __cplusplus */ #endif #ifndef __IFilterMapper_FWD_DEFINED__ #define __IFilterMapper_FWD_DEFINED__ typedef interface IFilterMapper IFilterMapper; +#ifdef __cplusplus +interface IFilterMapper; +#endif /* __cplusplus */ #endif #ifndef __IFilterMapper2_FWD_DEFINED__ #define __IFilterMapper2_FWD_DEFINED__ typedef interface IFilterMapper2 IFilterMapper2; +#ifdef __cplusplus +interface IFilterMapper2; +#endif /* __cplusplus */ #endif #ifndef __IGraphBuilder_FWD_DEFINED__ #define __IGraphBuilder_FWD_DEFINED__ typedef interface IGraphBuilder IGraphBuilder; +#ifdef __cplusplus +interface IGraphBuilder; +#endif /* __cplusplus */ #endif #ifndef __IKsPropertySet_FWD_DEFINED__ #define __IKsPropertySet_FWD_DEFINED__ typedef interface IKsPropertySet IKsPropertySet; +#ifdef __cplusplus +interface IKsPropertySet; +#endif /* __cplusplus */ #endif #ifndef __IMediaEventSink_FWD_DEFINED__ #define __IMediaEventSink_FWD_DEFINED__ typedef interface IMediaEventSink IMediaEventSink; +#ifdef __cplusplus +interface IMediaEventSink; +#endif /* __cplusplus */ #endif #ifndef __IMpeg2Demultiplexer_FWD_DEFINED__ #define __IMpeg2Demultiplexer_FWD_DEFINED__ typedef interface IMpeg2Demultiplexer IMpeg2Demultiplexer; +#ifdef __cplusplus +interface IMpeg2Demultiplexer; +#endif /* __cplusplus */ #endif #ifndef __IMPEG2StreamIdMap_FWD_DEFINED__ #define __IMPEG2StreamIdMap_FWD_DEFINED__ typedef interface IMPEG2StreamIdMap IMPEG2StreamIdMap; +#ifdef __cplusplus +interface IMPEG2StreamIdMap; +#endif /* __cplusplus */ #endif #ifndef __IOverlay_FWD_DEFINED__ #define __IOverlay_FWD_DEFINED__ typedef interface IOverlay IOverlay; +#ifdef __cplusplus +interface IOverlay; +#endif /* __cplusplus */ #endif #ifndef __IOverlayNotify_FWD_DEFINED__ #define __IOverlayNotify_FWD_DEFINED__ typedef interface IOverlayNotify IOverlayNotify; +#ifdef __cplusplus +interface IOverlayNotify; +#endif /* __cplusplus */ #endif #ifndef __IOverlayNotify2_FWD_DEFINED__ #define __IOverlayNotify2_FWD_DEFINED__ typedef interface IOverlayNotify2 IOverlayNotify2; +#ifdef __cplusplus +interface IOverlayNotify2; +#endif /* __cplusplus */ #endif #ifndef __IQualityControl_FWD_DEFINED__ #define __IQualityControl_FWD_DEFINED__ typedef interface IQualityControl IQualityControl; +#ifdef __cplusplus +interface IQualityControl; +#endif /* __cplusplus */ #endif #ifndef __ISeekingPassThru_FWD_DEFINED__ #define __ISeekingPassThru_FWD_DEFINED__ typedef interface ISeekingPassThru ISeekingPassThru; +#ifdef __cplusplus +interface ISeekingPassThru; +#endif /* __cplusplus */ #endif typedef enum tagAnalogVideoStandard { @@ -4638,36 +4165,37 @@ typedef struct IEnumRegFiltersVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumRegFilters* This, + IEnumRegFilters *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumRegFilters* This); + IEnumRegFilters *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumRegFilters* This); + IEnumRegFilters *This); /*** IEnumRegFilters methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumRegFilters* This, + IEnumRegFilters *This, ULONG cFilters, REGFILTER **apRegFilter, ULONG *pcFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumRegFilters* This, + IEnumRegFilters *This, ULONG cFilters); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumRegFilters* This); + IEnumRegFilters *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumRegFilters* This, + IEnumRegFilters *This, IEnumRegFilters **ppEnum); END_INTERFACE } IEnumRegFiltersVtbl; + interface IEnumRegFilters { CONST_VTBL IEnumRegFiltersVtbl* lpVtbl; }; @@ -4712,39 +4240,6 @@ static FORCEINLINE HRESULT IEnumRegFilters_Clone(IEnumRegFilters* This,IEnumRegF #endif -HRESULT STDMETHODCALLTYPE IEnumRegFilters_Next_Proxy( - IEnumRegFilters* This, - ULONG cFilters, - REGFILTER **apRegFilter, - ULONG *pcFetched); -void __RPC_STUB IEnumRegFilters_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumRegFilters_Skip_Proxy( - IEnumRegFilters* This, - ULONG cFilters); -void __RPC_STUB IEnumRegFilters_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumRegFilters_Reset_Proxy( - IEnumRegFilters* This); -void __RPC_STUB IEnumRegFilters_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumRegFilters_Clone_Proxy( - IEnumRegFilters* This, - IEnumRegFilters **ppEnum); -void __RPC_STUB IEnumRegFilters_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumRegFilters_INTERFACE_DEFINED__ */ @@ -4763,7 +4258,6 @@ enum { MERIT_SW_COMPRESSOR = 0x100000, MERIT_HW_COMPRESSOR = 0x100050 }; - DEFINE_GUID(IID_IFilterMapper, 0x56a868a3, 0x0ad4, 0x11ce, 0xb0,0x3a, 0x00,0x20,0xaf,0x0b,0xa7,0x70); #if defined(__cplusplus) && !defined(CINTERFACE) MIDL_INTERFACE("56a868a3-0ad4-11ce-b03a-0020af0ba770") @@ -4826,31 +4320,31 @@ typedef struct IFilterMapperVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFilterMapper* This, + IFilterMapper *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFilterMapper* This); + IFilterMapper *This); ULONG (STDMETHODCALLTYPE *Release)( - IFilterMapper* This); + IFilterMapper *This); /*** IFilterMapper methods ***/ HRESULT (STDMETHODCALLTYPE *RegisterFilter)( - IFilterMapper* This, + IFilterMapper *This, CLSID clsid, LPCWSTR Name, DWORD dwMerit); HRESULT (STDMETHODCALLTYPE *RegisterFilterInstance)( - IFilterMapper* This, + IFilterMapper *This, CLSID clsid, LPCWSTR Name, CLSID *MRId); HRESULT (STDMETHODCALLTYPE *RegisterPin)( - IFilterMapper* This, + IFilterMapper *This, CLSID Filter, LPCWSTR Name, WINBOOL bRendered, @@ -4861,27 +4355,27 @@ typedef struct IFilterMapperVtbl { LPCWSTR ConnectsToPin); HRESULT (STDMETHODCALLTYPE *RegisterPinType)( - IFilterMapper* This, + IFilterMapper *This, CLSID clsFilter, LPCWSTR strName, CLSID clsMajorType, CLSID clsSubType); HRESULT (STDMETHODCALLTYPE *UnregisterFilter)( - IFilterMapper* This, + IFilterMapper *This, CLSID Filter); HRESULT (STDMETHODCALLTYPE *UnregisterFilterInstance)( - IFilterMapper* This, + IFilterMapper *This, CLSID MRId); HRESULT (STDMETHODCALLTYPE *UnregisterPin)( - IFilterMapper* This, + IFilterMapper *This, CLSID Filter, LPCWSTR Name); HRESULT (STDMETHODCALLTYPE *EnumMatchingFilters)( - IFilterMapper* This, + IFilterMapper *This, IEnumRegFilters **ppEnum, DWORD dwMerit, WINBOOL bInputNeeded, @@ -4894,6 +4388,7 @@ typedef struct IFilterMapperVtbl { END_INTERFACE } IFilterMapperVtbl; + interface IFilterMapper { CONST_VTBL IFilterMapperVtbl* lpVtbl; }; @@ -4954,93 +4449,6 @@ static FORCEINLINE HRESULT IFilterMapper_EnumMatchingFilters(IFilterMapper* This #endif -HRESULT STDMETHODCALLTYPE IFilterMapper_RegisterFilter_Proxy( - IFilterMapper* This, - CLSID clsid, - LPCWSTR Name, - DWORD dwMerit); -void __RPC_STUB IFilterMapper_RegisterFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFilterMapper_RegisterFilterInstance_Proxy( - IFilterMapper* This, - CLSID clsid, - LPCWSTR Name, - CLSID *MRId); -void __RPC_STUB IFilterMapper_RegisterFilterInstance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFilterMapper_RegisterPin_Proxy( - IFilterMapper* This, - CLSID Filter, - LPCWSTR Name, - WINBOOL bRendered, - WINBOOL bOutput, - WINBOOL bZero, - WINBOOL bMany, - CLSID ConnectsToFilter, - LPCWSTR ConnectsToPin); -void __RPC_STUB IFilterMapper_RegisterPin_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFilterMapper_RegisterPinType_Proxy( - IFilterMapper* This, - CLSID clsFilter, - LPCWSTR strName, - CLSID clsMajorType, - CLSID clsSubType); -void __RPC_STUB IFilterMapper_RegisterPinType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFilterMapper_UnregisterFilter_Proxy( - IFilterMapper* This, - CLSID Filter); -void __RPC_STUB IFilterMapper_UnregisterFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFilterMapper_UnregisterFilterInstance_Proxy( - IFilterMapper* This, - CLSID MRId); -void __RPC_STUB IFilterMapper_UnregisterFilterInstance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFilterMapper_UnregisterPin_Proxy( - IFilterMapper* This, - CLSID Filter, - LPCWSTR Name); -void __RPC_STUB IFilterMapper_UnregisterPin_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFilterMapper_EnumMatchingFilters_Proxy( - IFilterMapper* This, - IEnumRegFilters **ppEnum, - DWORD dwMerit, - WINBOOL bInputNeeded, - CLSID clsInMaj, - CLSID clsInSub, - WINBOOL bRender, - WINBOOL bOututNeeded, - CLSID clsOutMaj, - CLSID clsOutSub); -void __RPC_STUB IFilterMapper_EnumMatchingFilters_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFilterMapper_INTERFACE_DEFINED__ */ @@ -5070,7 +4478,6 @@ enum { REG_PINFLAG_B_MANY = 0x4, REG_PINFLAG_B_OUTPUT = 0x8 }; - typedef struct __WIDL_strmif_generated_name_00000006 { DWORD dwFlags; UINT cInstances; @@ -5150,31 +4557,31 @@ typedef struct IFilterMapper2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFilterMapper2* This, + IFilterMapper2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFilterMapper2* This); + IFilterMapper2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IFilterMapper2* This); + IFilterMapper2 *This); /*** IFilterMapper2 methods ***/ HRESULT (STDMETHODCALLTYPE *CreateCategory)( - IFilterMapper2* This, + IFilterMapper2 *This, REFCLSID clsidCategory, DWORD dwCategoryMerit, LPCWSTR Description); HRESULT (STDMETHODCALLTYPE *UnregisterFilter)( - IFilterMapper2* This, + IFilterMapper2 *This, const CLSID *pclsidCategory, LPCOLESTR szInstance, REFCLSID Filter); HRESULT (STDMETHODCALLTYPE *RegisterFilter)( - IFilterMapper2* This, + IFilterMapper2 *This, REFCLSID clsidFilter, LPCWSTR Name, IMoniker **ppMoniker, @@ -5183,7 +4590,7 @@ typedef struct IFilterMapper2Vtbl { const REGFILTER2 *prf2); HRESULT (STDMETHODCALLTYPE *EnumMatchingFilters)( - IFilterMapper2* This, + IFilterMapper2 *This, IEnumMoniker **ppEnum, DWORD dwFlags, WINBOOL bExactMatch, @@ -5202,6 +4609,7 @@ typedef struct IFilterMapper2Vtbl { END_INTERFACE } IFilterMapper2Vtbl; + interface IFilterMapper2 { CONST_VTBL IFilterMapper2Vtbl* lpVtbl; }; @@ -5246,61 +4654,6 @@ static FORCEINLINE HRESULT IFilterMapper2_EnumMatchingFilters(IFilterMapper2* Th #endif -HRESULT STDMETHODCALLTYPE IFilterMapper2_CreateCategory_Proxy( - IFilterMapper2* This, - REFCLSID clsidCategory, - DWORD dwCategoryMerit, - LPCWSTR Description); -void __RPC_STUB IFilterMapper2_CreateCategory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFilterMapper2_UnregisterFilter_Proxy( - IFilterMapper2* This, - const CLSID *pclsidCategory, - LPCOLESTR szInstance, - REFCLSID Filter); -void __RPC_STUB IFilterMapper2_UnregisterFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFilterMapper2_RegisterFilter_Proxy( - IFilterMapper2* This, - REFCLSID clsidFilter, - LPCWSTR Name, - IMoniker **ppMoniker, - const CLSID *pclsidCategory, - LPCOLESTR szInstance, - const REGFILTER2 *prf2); -void __RPC_STUB IFilterMapper2_RegisterFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFilterMapper2_EnumMatchingFilters_Proxy( - IFilterMapper2* This, - IEnumMoniker **ppEnum, - DWORD dwFlags, - WINBOOL bExactMatch, - DWORD dwMerit, - WINBOOL bInputNeeded, - DWORD cInputTypes, - const GUID *pInputTypes, - const REGPINMEDIUM *pMedIn, - const CLSID *pPinCategoryIn, - WINBOOL bRender, - WINBOOL bOutputNeeded, - DWORD cOutputTypes, - const GUID *pOutputTypes, - const REGPINMEDIUM *pMedOut, - const CLSID *pPinCategoryOut); -void __RPC_STUB IFilterMapper2_EnumMatchingFilters_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFilterMapper2_INTERFACE_DEFINED__ */ @@ -5328,31 +4681,31 @@ typedef struct IFilterMapper3Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFilterMapper3* This, + IFilterMapper3 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFilterMapper3* This); + IFilterMapper3 *This); ULONG (STDMETHODCALLTYPE *Release)( - IFilterMapper3* This); + IFilterMapper3 *This); /*** IFilterMapper2 methods ***/ HRESULT (STDMETHODCALLTYPE *CreateCategory)( - IFilterMapper3* This, + IFilterMapper3 *This, REFCLSID clsidCategory, DWORD dwCategoryMerit, LPCWSTR Description); HRESULT (STDMETHODCALLTYPE *UnregisterFilter)( - IFilterMapper3* This, + IFilterMapper3 *This, const CLSID *pclsidCategory, LPCOLESTR szInstance, REFCLSID Filter); HRESULT (STDMETHODCALLTYPE *RegisterFilter)( - IFilterMapper3* This, + IFilterMapper3 *This, REFCLSID clsidFilter, LPCWSTR Name, IMoniker **ppMoniker, @@ -5361,7 +4714,7 @@ typedef struct IFilterMapper3Vtbl { const REGFILTER2 *prf2); HRESULT (STDMETHODCALLTYPE *EnumMatchingFilters)( - IFilterMapper3* This, + IFilterMapper3 *This, IEnumMoniker **ppEnum, DWORD dwFlags, WINBOOL bExactMatch, @@ -5380,11 +4733,12 @@ typedef struct IFilterMapper3Vtbl { /*** IFilterMapper3 methods ***/ HRESULT (STDMETHODCALLTYPE *GetICreateDevEnum)( - IFilterMapper3* This, + IFilterMapper3 *This, ICreateDevEnum **ppEnum); END_INTERFACE } IFilterMapper3Vtbl; + interface IFilterMapper3 { CONST_VTBL IFilterMapper3Vtbl* lpVtbl; }; @@ -5435,14 +4789,6 @@ static FORCEINLINE HRESULT IFilterMapper3_GetICreateDevEnum(IFilterMapper3* This #endif -HRESULT STDMETHODCALLTYPE IFilterMapper3_GetICreateDevEnum_Proxy( - IFilterMapper3* This, - ICreateDevEnum **ppEnum); -void __RPC_STUB IFilterMapper3_GetICreateDevEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFilterMapper3_INTERFACE_DEFINED__ */ @@ -5485,28 +4831,29 @@ typedef struct IQualityControlVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IQualityControl* This, + IQualityControl *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IQualityControl* This); + IQualityControl *This); ULONG (STDMETHODCALLTYPE *Release)( - IQualityControl* This); + IQualityControl *This); /*** IQualityControl methods ***/ HRESULT (STDMETHODCALLTYPE *Notify)( - IQualityControl* This, + IQualityControl *This, IBaseFilter *pSelf, Quality q); HRESULT (STDMETHODCALLTYPE *SetSink)( - IQualityControl* This, + IQualityControl *This, IQualityControl *piqc); END_INTERFACE } IQualityControlVtbl; + interface IQualityControl { CONST_VTBL IQualityControlVtbl* lpVtbl; }; @@ -5543,23 +4890,6 @@ static FORCEINLINE HRESULT IQualityControl_SetSink(IQualityControl* This,IQualit #endif -HRESULT STDMETHODCALLTYPE IQualityControl_Notify_Proxy( - IQualityControl* This, - IBaseFilter *pSelf, - Quality q); -void __RPC_STUB IQualityControl_Notify_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IQualityControl_SetSink_Proxy( - IQualityControl* This, - IQualityControl *piqc); -void __RPC_STUB IQualityControl_SetSink_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IQualityControl_INTERFACE_DEFINED__ */ @@ -5568,7 +4898,6 @@ enum { CK_INDEX = 0x1, CK_RGB = 0x2 }; - typedef struct tagCOLORKEY { DWORD KeyType; DWORD PaletteIndex; @@ -5583,7 +4912,6 @@ enum { ADVISE_POSITION = 0x8, ADVISE_DISPLAY_CHANGE = 0x10 }; - #define ADVISE_ALL (((ADVISE_CLIPPING | ADVISE_PALETTE) | ADVISE_COLORKEY) | ADVISE_POSITION) #define ADVISE_ALL2 (ADVISE_ALL | ADVISE_DISPLAY_CHANGE) @@ -5638,39 +4966,40 @@ typedef struct IOverlayNotifyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOverlayNotify* This, + IOverlayNotify *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOverlayNotify* This); + IOverlayNotify *This); ULONG (STDMETHODCALLTYPE *Release)( - IOverlayNotify* This); + IOverlayNotify *This); /*** IOverlayNotify methods ***/ HRESULT (STDMETHODCALLTYPE *OnPaletteChange)( - IOverlayNotify* This, + IOverlayNotify *This, DWORD dwColors, const PALETTEENTRY *pPalette); HRESULT (STDMETHODCALLTYPE *OnClipChange)( - IOverlayNotify* This, + IOverlayNotify *This, const RECT *pSourceRect, const RECT *pDestinationRect, const RGNDATA *pRgnData); HRESULT (STDMETHODCALLTYPE *OnColorKeyChange)( - IOverlayNotify* This, + IOverlayNotify *This, const COLORKEY *pColorKey); HRESULT (STDMETHODCALLTYPE *OnPositionChange)( - IOverlayNotify* This, + IOverlayNotify *This, const RECT *pSourceRect, const RECT *pDestinationRect); END_INTERFACE } IOverlayNotifyVtbl; + interface IOverlayNotify { CONST_VTBL IOverlayNotifyVtbl* lpVtbl; }; @@ -5715,42 +5044,6 @@ static FORCEINLINE HRESULT IOverlayNotify_OnPositionChange(IOverlayNotify* This, #endif -HRESULT STDMETHODCALLTYPE IOverlayNotify_OnPaletteChange_Proxy( - IOverlayNotify* This, - DWORD dwColors, - const PALETTEENTRY *pPalette); -void __RPC_STUB IOverlayNotify_OnPaletteChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOverlayNotify_OnClipChange_Proxy( - IOverlayNotify* This, - const RECT *pSourceRect, - const RECT *pDestinationRect, - const RGNDATA *pRgnData); -void __RPC_STUB IOverlayNotify_OnClipChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOverlayNotify_OnColorKeyChange_Proxy( - IOverlayNotify* This, - const COLORKEY *pColorKey); -void __RPC_STUB IOverlayNotify_OnColorKeyChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOverlayNotify_OnPositionChange_Proxy( - IOverlayNotify* This, - const RECT *pSourceRect, - const RECT *pDestinationRect); -void __RPC_STUB IOverlayNotify_OnPositionChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOverlayNotify_INTERFACE_DEFINED__ */ @@ -5782,44 +5075,45 @@ typedef struct IOverlayNotify2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOverlayNotify2* This, + IOverlayNotify2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOverlayNotify2* This); + IOverlayNotify2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IOverlayNotify2* This); + IOverlayNotify2 *This); /*** IOverlayNotify methods ***/ HRESULT (STDMETHODCALLTYPE *OnPaletteChange)( - IOverlayNotify2* This, + IOverlayNotify2 *This, DWORD dwColors, const PALETTEENTRY *pPalette); HRESULT (STDMETHODCALLTYPE *OnClipChange)( - IOverlayNotify2* This, + IOverlayNotify2 *This, const RECT *pSourceRect, const RECT *pDestinationRect, const RGNDATA *pRgnData); HRESULT (STDMETHODCALLTYPE *OnColorKeyChange)( - IOverlayNotify2* This, + IOverlayNotify2 *This, const COLORKEY *pColorKey); HRESULT (STDMETHODCALLTYPE *OnPositionChange)( - IOverlayNotify2* This, + IOverlayNotify2 *This, const RECT *pSourceRect, const RECT *pDestinationRect); /*** IOverlayNotify2 methods ***/ HRESULT (STDMETHODCALLTYPE *OnDisplayChange)( - IOverlayNotify2* This, + IOverlayNotify2 *This, HMONITOR hMonitor); END_INTERFACE } IOverlayNotify2Vtbl; + interface IOverlayNotify2 { CONST_VTBL IOverlayNotify2Vtbl* lpVtbl; }; @@ -5870,14 +5164,6 @@ static FORCEINLINE HRESULT IOverlayNotify2_OnDisplayChange(IOverlayNotify2* This #endif -HRESULT STDMETHODCALLTYPE IOverlayNotify2_OnDisplayChange_Proxy( - IOverlayNotify2* This, - HMONITOR hMonitor); -void __RPC_STUB IOverlayNotify2_OnDisplayChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOverlayNotify2_INTERFACE_DEFINED__ */ @@ -5939,64 +5225,65 @@ typedef struct IOverlayVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IOverlay* This, + IOverlay *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IOverlay* This); + IOverlay *This); ULONG (STDMETHODCALLTYPE *Release)( - IOverlay* This); + IOverlay *This); /*** IOverlay methods ***/ HRESULT (STDMETHODCALLTYPE *GetPalette)( - IOverlay* This, + IOverlay *This, DWORD *pdwColors, PALETTEENTRY **ppPalette); HRESULT (STDMETHODCALLTYPE *SetPalette)( - IOverlay* This, + IOverlay *This, DWORD dwColors, PALETTEENTRY *pPalette); HRESULT (STDMETHODCALLTYPE *GetDefaultColorKey)( - IOverlay* This, + IOverlay *This, COLORKEY *pColorKey); HRESULT (STDMETHODCALLTYPE *GetColorKey)( - IOverlay* This, + IOverlay *This, COLORKEY *pColorKey); HRESULT (STDMETHODCALLTYPE *SetColorKey)( - IOverlay* This, + IOverlay *This, COLORKEY *pColorKey); HRESULT (STDMETHODCALLTYPE *GetWindowHandle)( - IOverlay* This, + IOverlay *This, HWND *pHwnd); HRESULT (STDMETHODCALLTYPE *GetClipList)( - IOverlay* This, + IOverlay *This, RECT *pSourceRect, RECT *pDestinationRect, RGNDATA **ppRgnData); HRESULT (STDMETHODCALLTYPE *GetVideoPosition)( - IOverlay* This, + IOverlay *This, RECT *pSourceRect, RECT *pDestinationRect); HRESULT (STDMETHODCALLTYPE *Advise)( - IOverlay* This, + IOverlay *This, IOverlayNotify *pOverlayNotify, DWORD dwInterests); HRESULT (STDMETHODCALLTYPE *Unadvise)( - IOverlay* This); + IOverlay *This); END_INTERFACE } IOverlayVtbl; + interface IOverlay { CONST_VTBL IOverlayVtbl* lpVtbl; }; @@ -6065,91 +5352,6 @@ static FORCEINLINE HRESULT IOverlay_Unadvise(IOverlay* This) { #endif -HRESULT STDMETHODCALLTYPE IOverlay_GetPalette_Proxy( - IOverlay* This, - DWORD *pdwColors, - PALETTEENTRY **ppPalette); -void __RPC_STUB IOverlay_GetPalette_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOverlay_SetPalette_Proxy( - IOverlay* This, - DWORD dwColors, - PALETTEENTRY *pPalette); -void __RPC_STUB IOverlay_SetPalette_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOverlay_GetDefaultColorKey_Proxy( - IOverlay* This, - COLORKEY *pColorKey); -void __RPC_STUB IOverlay_GetDefaultColorKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOverlay_GetColorKey_Proxy( - IOverlay* This, - COLORKEY *pColorKey); -void __RPC_STUB IOverlay_GetColorKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOverlay_SetColorKey_Proxy( - IOverlay* This, - COLORKEY *pColorKey); -void __RPC_STUB IOverlay_SetColorKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOverlay_GetWindowHandle_Proxy( - IOverlay* This, - HWND *pHwnd); -void __RPC_STUB IOverlay_GetWindowHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOverlay_GetClipList_Proxy( - IOverlay* This, - RECT *pSourceRect, - RECT *pDestinationRect, - RGNDATA **ppRgnData); -void __RPC_STUB IOverlay_GetClipList_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOverlay_GetVideoPosition_Proxy( - IOverlay* This, - RECT *pSourceRect, - RECT *pDestinationRect); -void __RPC_STUB IOverlay_GetVideoPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOverlay_Advise_Proxy( - IOverlay* This, - IOverlayNotify *pOverlayNotify, - DWORD dwInterests); -void __RPC_STUB IOverlay_Advise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IOverlay_Unadvise_Proxy( - IOverlay* This); -void __RPC_STUB IOverlay_Unadvise_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IOverlay_INTERFACE_DEFINED__ */ @@ -6180,25 +5382,26 @@ typedef struct IMediaEventSinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMediaEventSink* This, + IMediaEventSink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMediaEventSink* This); + IMediaEventSink *This); ULONG (STDMETHODCALLTYPE *Release)( - IMediaEventSink* This); + IMediaEventSink *This); /*** IMediaEventSink methods ***/ HRESULT (STDMETHODCALLTYPE *Notify)( - IMediaEventSink* This, + IMediaEventSink *This, LONG EventCode, LONG_PTR EventParam1, LONG_PTR EventParam2); END_INTERFACE } IMediaEventSinkVtbl; + interface IMediaEventSink { CONST_VTBL IMediaEventSinkVtbl* lpVtbl; }; @@ -6231,16 +5434,6 @@ static FORCEINLINE HRESULT IMediaEventSink_Notify(IMediaEventSink* This,LONG Eve #endif -HRESULT STDMETHODCALLTYPE IMediaEventSink_Notify_Proxy( - IMediaEventSink* This, - LONG EventCode, - LONG_PTR EventParam1, - LONG_PTR EventParam2); -void __RPC_STUB IMediaEventSink_Notify_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMediaEventSink_INTERFACE_DEFINED__ */ @@ -6274,29 +5467,30 @@ typedef struct IFileSourceFilterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFileSourceFilter* This, + IFileSourceFilter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFileSourceFilter* This); + IFileSourceFilter *This); ULONG (STDMETHODCALLTYPE *Release)( - IFileSourceFilter* This); + IFileSourceFilter *This); /*** IFileSourceFilter methods ***/ HRESULT (STDMETHODCALLTYPE *Load)( - IFileSourceFilter* This, + IFileSourceFilter *This, LPCOLESTR pszFileName, const AM_MEDIA_TYPE *pmt); HRESULT (STDMETHODCALLTYPE *GetCurFile)( - IFileSourceFilter* This, + IFileSourceFilter *This, LPOLESTR *ppszFileName, AM_MEDIA_TYPE *pmt); END_INTERFACE } IFileSourceFilterVtbl; + interface IFileSourceFilter { CONST_VTBL IFileSourceFilterVtbl* lpVtbl; }; @@ -6333,24 +5527,6 @@ static FORCEINLINE HRESULT IFileSourceFilter_GetCurFile(IFileSourceFilter* This, #endif -HRESULT STDMETHODCALLTYPE IFileSourceFilter_Load_Proxy( - IFileSourceFilter* This, - LPCOLESTR pszFileName, - const AM_MEDIA_TYPE *pmt); -void __RPC_STUB IFileSourceFilter_Load_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileSourceFilter_GetCurFile_Proxy( - IFileSourceFilter* This, - LPOLESTR *ppszFileName, - AM_MEDIA_TYPE *pmt); -void __RPC_STUB IFileSourceFilter_GetCurFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFileSourceFilter_INTERFACE_DEFINED__ */ @@ -6384,29 +5560,30 @@ typedef struct IFileSinkFilterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFileSinkFilter* This, + IFileSinkFilter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFileSinkFilter* This); + IFileSinkFilter *This); ULONG (STDMETHODCALLTYPE *Release)( - IFileSinkFilter* This); + IFileSinkFilter *This); /*** IFileSinkFilter methods ***/ HRESULT (STDMETHODCALLTYPE *SetFileName)( - IFileSinkFilter* This, + IFileSinkFilter *This, LPCOLESTR pszFileName, const AM_MEDIA_TYPE *pmt); HRESULT (STDMETHODCALLTYPE *GetCurFile)( - IFileSinkFilter* This, + IFileSinkFilter *This, LPOLESTR *ppszFileName, AM_MEDIA_TYPE *pmt); END_INTERFACE } IFileSinkFilterVtbl; + interface IFileSinkFilter { CONST_VTBL IFileSinkFilterVtbl* lpVtbl; }; @@ -6443,24 +5620,6 @@ static FORCEINLINE HRESULT IFileSinkFilter_GetCurFile(IFileSinkFilter* This,LPOL #endif -HRESULT STDMETHODCALLTYPE IFileSinkFilter_SetFileName_Proxy( - IFileSinkFilter* This, - LPCOLESTR pszFileName, - const AM_MEDIA_TYPE *pmt); -void __RPC_STUB IFileSinkFilter_SetFileName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileSinkFilter_GetCurFile_Proxy( - IFileSinkFilter* This, - LPOLESTR *ppszFileName, - AM_MEDIA_TYPE *pmt); -void __RPC_STUB IFileSinkFilter_GetCurFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFileSinkFilter_INTERFACE_DEFINED__ */ @@ -6492,38 +5651,39 @@ typedef struct IFileSinkFilter2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFileSinkFilter2* This, + IFileSinkFilter2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFileSinkFilter2* This); + IFileSinkFilter2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IFileSinkFilter2* This); + IFileSinkFilter2 *This); /*** IFileSinkFilter methods ***/ HRESULT (STDMETHODCALLTYPE *SetFileName)( - IFileSinkFilter2* This, + IFileSinkFilter2 *This, LPCOLESTR pszFileName, const AM_MEDIA_TYPE *pmt); HRESULT (STDMETHODCALLTYPE *GetCurFile)( - IFileSinkFilter2* This, + IFileSinkFilter2 *This, LPOLESTR *ppszFileName, AM_MEDIA_TYPE *pmt); /*** IFileSinkFilter2 methods ***/ HRESULT (STDMETHODCALLTYPE *SetMode)( - IFileSinkFilter2* This, + IFileSinkFilter2 *This, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetMode)( - IFileSinkFilter2* This, + IFileSinkFilter2 *This, DWORD *pdwFlags); END_INTERFACE } IFileSinkFilter2Vtbl; + interface IFileSinkFilter2 { CONST_VTBL IFileSinkFilter2Vtbl* lpVtbl; }; @@ -6570,22 +5730,6 @@ static FORCEINLINE HRESULT IFileSinkFilter2_GetMode(IFileSinkFilter2* This,DWORD #endif -HRESULT STDMETHODCALLTYPE IFileSinkFilter2_SetMode_Proxy( - IFileSinkFilter2* This, - DWORD dwFlags); -void __RPC_STUB IFileSinkFilter2_SetMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFileSinkFilter2_GetMode_Proxy( - IFileSinkFilter2* This, - DWORD *pdwFlags); -void __RPC_STUB IFileSinkFilter2_GetMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFileSinkFilter2_INTERFACE_DEFINED__ */ @@ -6639,85 +5783,86 @@ typedef struct IGraphBuilderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IGraphBuilder* This, + IGraphBuilder *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IGraphBuilder* This); + IGraphBuilder *This); ULONG (STDMETHODCALLTYPE *Release)( - IGraphBuilder* This); + IGraphBuilder *This); /*** IFilterGraph methods ***/ HRESULT (STDMETHODCALLTYPE *AddFilter)( - IGraphBuilder* This, + IGraphBuilder *This, IBaseFilter *pFilter, LPCWSTR pName); HRESULT (STDMETHODCALLTYPE *RemoveFilter)( - IGraphBuilder* This, + IGraphBuilder *This, IBaseFilter *pFilter); HRESULT (STDMETHODCALLTYPE *EnumFilters)( - IGraphBuilder* This, + IGraphBuilder *This, IEnumFilters **ppEnum); HRESULT (STDMETHODCALLTYPE *FindFilterByName)( - IGraphBuilder* This, + IGraphBuilder *This, LPCWSTR pName, IBaseFilter **ppFilter); HRESULT (STDMETHODCALLTYPE *ConnectDirect)( - IGraphBuilder* This, + IGraphBuilder *This, IPin *ppinOut, IPin *ppinIn, const AM_MEDIA_TYPE *pmt); HRESULT (STDMETHODCALLTYPE *Reconnect)( - IGraphBuilder* This, + IGraphBuilder *This, IPin *ppin); HRESULT (STDMETHODCALLTYPE *Disconnect)( - IGraphBuilder* This, + IGraphBuilder *This, IPin *ppin); HRESULT (STDMETHODCALLTYPE *SetDefaultSyncSource)( - IGraphBuilder* This); + IGraphBuilder *This); /*** IGraphBuilder methods ***/ HRESULT (STDMETHODCALLTYPE *Connect)( - IGraphBuilder* This, + IGraphBuilder *This, IPin *ppinOut, IPin *ppinIn); HRESULT (STDMETHODCALLTYPE *Render)( - IGraphBuilder* This, + IGraphBuilder *This, IPin *ppinOut); HRESULT (STDMETHODCALLTYPE *RenderFile)( - IGraphBuilder* This, + IGraphBuilder *This, LPCWSTR lpcwstrFile, LPCWSTR lpcwstrPlayList); HRESULT (STDMETHODCALLTYPE *AddSourceFilter)( - IGraphBuilder* This, + IGraphBuilder *This, LPCWSTR lpcwstrFileName, LPCWSTR lpcwstrFilterName, IBaseFilter **ppFilter); HRESULT (STDMETHODCALLTYPE *SetLogFile)( - IGraphBuilder* This, + IGraphBuilder *This, DWORD_PTR hFile); HRESULT (STDMETHODCALLTYPE *Abort)( - IGraphBuilder* This); + IGraphBuilder *This); HRESULT (STDMETHODCALLTYPE *ShouldOperationContinue)( - IGraphBuilder* This); + IGraphBuilder *This); END_INTERFACE } IGraphBuilderVtbl; + interface IGraphBuilder { CONST_VTBL IGraphBuilderVtbl* lpVtbl; }; @@ -6808,64 +5953,6 @@ static FORCEINLINE HRESULT IGraphBuilder_ShouldOperationContinue(IGraphBuilder* #endif -HRESULT STDMETHODCALLTYPE IGraphBuilder_Connect_Proxy( - IGraphBuilder* This, - IPin *ppinOut, - IPin *ppinIn); -void __RPC_STUB IGraphBuilder_Connect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IGraphBuilder_Render_Proxy( - IGraphBuilder* This, - IPin *ppinOut); -void __RPC_STUB IGraphBuilder_Render_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IGraphBuilder_RenderFile_Proxy( - IGraphBuilder* This, - LPCWSTR lpcwstrFile, - LPCWSTR lpcwstrPlayList); -void __RPC_STUB IGraphBuilder_RenderFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IGraphBuilder_AddSourceFilter_Proxy( - IGraphBuilder* This, - LPCWSTR lpcwstrFileName, - LPCWSTR lpcwstrFilterName, - IBaseFilter **ppFilter); -void __RPC_STUB IGraphBuilder_AddSourceFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IGraphBuilder_SetLogFile_Proxy( - IGraphBuilder* This, - DWORD_PTR hFile); -void __RPC_STUB IGraphBuilder_SetLogFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IGraphBuilder_Abort_Proxy( - IGraphBuilder* This); -void __RPC_STUB IGraphBuilder_Abort_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IGraphBuilder_ShouldOperationContinue_Proxy( - IGraphBuilder* This); -void __RPC_STUB IGraphBuilder_ShouldOperationContinue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IGraphBuilder_INTERFACE_DEFINED__ */ @@ -6932,48 +6019,48 @@ typedef struct ICaptureGraphBuilderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICaptureGraphBuilder* This, + ICaptureGraphBuilder *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICaptureGraphBuilder* This); + ICaptureGraphBuilder *This); ULONG (STDMETHODCALLTYPE *Release)( - ICaptureGraphBuilder* This); + ICaptureGraphBuilder *This); /*** ICaptureGraphBuilder methods ***/ HRESULT (STDMETHODCALLTYPE *SetFiltergraph)( - ICaptureGraphBuilder* This, + ICaptureGraphBuilder *This, IGraphBuilder *pfg); HRESULT (STDMETHODCALLTYPE *GetFiltergraph)( - ICaptureGraphBuilder* This, + ICaptureGraphBuilder *This, IGraphBuilder **ppfg); HRESULT (STDMETHODCALLTYPE *SetOutputFileName)( - ICaptureGraphBuilder* This, + ICaptureGraphBuilder *This, const GUID *pType, LPCOLESTR lpstrFile, IBaseFilter **ppf, IFileSinkFilter **ppSink); HRESULT (STDMETHODCALLTYPE *FindInterface)( - ICaptureGraphBuilder* This, + ICaptureGraphBuilder *This, const GUID *pCategory, IBaseFilter *pf, REFIID riid, void **ppint); HRESULT (STDMETHODCALLTYPE *RenderStream)( - ICaptureGraphBuilder* This, + ICaptureGraphBuilder *This, const GUID *pCategory, IUnknown *pSource, IBaseFilter *pfCompressor, IBaseFilter *pfRenderer); HRESULT (STDMETHODCALLTYPE *ControlStream)( - ICaptureGraphBuilder* This, + ICaptureGraphBuilder *This, const GUID *pCategory, IBaseFilter *pFilter, REFERENCE_TIME *pstart, @@ -6982,12 +6069,12 @@ typedef struct ICaptureGraphBuilderVtbl { WORD wStopCookie); HRESULT (STDMETHODCALLTYPE *AllocCapFile)( - ICaptureGraphBuilder* This, + ICaptureGraphBuilder *This, LPCOLESTR lpstr, DWORDLONG dwlSize); HRESULT (STDMETHODCALLTYPE *CopyCaptureFile)( - ICaptureGraphBuilder* This, + ICaptureGraphBuilder *This, LPOLESTR lpwstrOld, LPOLESTR lpwstrNew, int fAllowEscAbort, @@ -6995,6 +6082,7 @@ typedef struct ICaptureGraphBuilderVtbl { END_INTERFACE } ICaptureGraphBuilderVtbl; + interface ICaptureGraphBuilder { CONST_VTBL ICaptureGraphBuilderVtbl* lpVtbl; }; @@ -7055,33 +6143,6 @@ static FORCEINLINE HRESULT ICaptureGraphBuilder_CopyCaptureFile(ICaptureGraphBui #endif -HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder_SetFiltergraph_Proxy( - ICaptureGraphBuilder* This, - IGraphBuilder *pfg); -void __RPC_STUB ICaptureGraphBuilder_SetFiltergraph_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder_GetFiltergraph_Proxy( - ICaptureGraphBuilder* This, - IGraphBuilder **ppfg); -void __RPC_STUB ICaptureGraphBuilder_GetFiltergraph_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder_SetOutputFileName_Proxy( - ICaptureGraphBuilder* This, - const GUID *pType, - LPCOLESTR lpstrFile, - IBaseFilter **ppf, - IFileSinkFilter **ppSink); -void __RPC_STUB ICaptureGraphBuilder_SetOutputFileName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder_RemoteFindInterface_Proxy( ICaptureGraphBuilder* This, const GUID *pCategory, @@ -7093,50 +6154,6 @@ void __RPC_STUB ICaptureGraphBuilder_RemoteFindInterface_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder_RenderStream_Proxy( - ICaptureGraphBuilder* This, - const GUID *pCategory, - IUnknown *pSource, - IBaseFilter *pfCompressor, - IBaseFilter *pfRenderer); -void __RPC_STUB ICaptureGraphBuilder_RenderStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder_ControlStream_Proxy( - ICaptureGraphBuilder* This, - const GUID *pCategory, - IBaseFilter *pFilter, - REFERENCE_TIME *pstart, - REFERENCE_TIME *pstop, - WORD wStartCookie, - WORD wStopCookie); -void __RPC_STUB ICaptureGraphBuilder_ControlStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder_AllocCapFile_Proxy( - ICaptureGraphBuilder* This, - LPCOLESTR lpstr, - DWORDLONG dwlSize); -void __RPC_STUB ICaptureGraphBuilder_AllocCapFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder_CopyCaptureFile_Proxy( - ICaptureGraphBuilder* This, - LPOLESTR lpwstrOld, - LPOLESTR lpwstrNew, - int fAllowEscAbort, - IAMCopyCaptureFileProgress *pCallback); -void __RPC_STUB ICaptureGraphBuilder_CopyCaptureFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK ICaptureGraphBuilder_FindInterface_Proxy( ICaptureGraphBuilder* This, const GUID *pCategory, @@ -7176,23 +6193,24 @@ typedef struct IAMCopyCaptureFileProgressVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAMCopyCaptureFileProgress* This, + IAMCopyCaptureFileProgress *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAMCopyCaptureFileProgress* This); + IAMCopyCaptureFileProgress *This); ULONG (STDMETHODCALLTYPE *Release)( - IAMCopyCaptureFileProgress* This); + IAMCopyCaptureFileProgress *This); /*** IAMCopyCaptureFileProgress methods ***/ HRESULT (STDMETHODCALLTYPE *Progress)( - IAMCopyCaptureFileProgress* This, + IAMCopyCaptureFileProgress *This, int iProgress); END_INTERFACE } IAMCopyCaptureFileProgressVtbl; + interface IAMCopyCaptureFileProgress { CONST_VTBL IAMCopyCaptureFileProgressVtbl* lpVtbl; }; @@ -7225,14 +6243,6 @@ static FORCEINLINE HRESULT IAMCopyCaptureFileProgress_Progress(IAMCopyCaptureFil #endif -HRESULT STDMETHODCALLTYPE IAMCopyCaptureFileProgress_Progress_Proxy( - IAMCopyCaptureFileProgress* This, - int iProgress); -void __RPC_STUB IAMCopyCaptureFileProgress_Progress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAMCopyCaptureFileProgress_INTERFACE_DEFINED__ */ @@ -7311,34 +6321,34 @@ typedef struct ICaptureGraphBuilder2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICaptureGraphBuilder2* This, + ICaptureGraphBuilder2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICaptureGraphBuilder2* This); + ICaptureGraphBuilder2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ICaptureGraphBuilder2* This); + ICaptureGraphBuilder2 *This); /*** ICaptureGraphBuilder2 methods ***/ HRESULT (STDMETHODCALLTYPE *SetFiltergraph)( - ICaptureGraphBuilder2* This, + ICaptureGraphBuilder2 *This, IGraphBuilder *pfg); HRESULT (STDMETHODCALLTYPE *GetFiltergraph)( - ICaptureGraphBuilder2* This, + ICaptureGraphBuilder2 *This, IGraphBuilder **ppfg); HRESULT (STDMETHODCALLTYPE *SetOutputFileName)( - ICaptureGraphBuilder2* This, + ICaptureGraphBuilder2 *This, const GUID *pType, LPCOLESTR lpstrFile, IBaseFilter **ppf, IFileSinkFilter **ppSink); HRESULT (STDMETHODCALLTYPE *FindInterface)( - ICaptureGraphBuilder2* This, + ICaptureGraphBuilder2 *This, const GUID *pCategory, const GUID *pType, IBaseFilter *pf, @@ -7346,7 +6356,7 @@ typedef struct ICaptureGraphBuilder2Vtbl { void **ppint); HRESULT (STDMETHODCALLTYPE *RenderStream)( - ICaptureGraphBuilder2* This, + ICaptureGraphBuilder2 *This, const GUID *pCategory, const GUID *pType, IUnknown *pSource, @@ -7354,7 +6364,7 @@ typedef struct ICaptureGraphBuilder2Vtbl { IBaseFilter *pfRenderer); HRESULT (STDMETHODCALLTYPE *ControlStream)( - ICaptureGraphBuilder2* This, + ICaptureGraphBuilder2 *This, const GUID *pCategory, const GUID *pType, IBaseFilter *pFilter, @@ -7364,19 +6374,19 @@ typedef struct ICaptureGraphBuilder2Vtbl { WORD wStopCookie); HRESULT (STDMETHODCALLTYPE *AllocCapFile)( - ICaptureGraphBuilder2* This, + ICaptureGraphBuilder2 *This, LPCOLESTR lpstr, DWORDLONG dwlSize); HRESULT (STDMETHODCALLTYPE *CopyCaptureFile)( - ICaptureGraphBuilder2* This, + ICaptureGraphBuilder2 *This, LPOLESTR lpwstrOld, LPOLESTR lpwstrNew, int fAllowEscAbort, IAMCopyCaptureFileProgress *pCallback); HRESULT (STDMETHODCALLTYPE *FindPin)( - ICaptureGraphBuilder2* This, + ICaptureGraphBuilder2 *This, IUnknown *pSource, PIN_DIRECTION pindir, const GUID *pCategory, @@ -7387,6 +6397,7 @@ typedef struct ICaptureGraphBuilder2Vtbl { END_INTERFACE } ICaptureGraphBuilder2Vtbl; + interface ICaptureGraphBuilder2 { CONST_VTBL ICaptureGraphBuilder2Vtbl* lpVtbl; }; @@ -7451,33 +6462,6 @@ static FORCEINLINE HRESULT ICaptureGraphBuilder2_FindPin(ICaptureGraphBuilder2* #endif -HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder2_SetFiltergraph_Proxy( - ICaptureGraphBuilder2* This, - IGraphBuilder *pfg); -void __RPC_STUB ICaptureGraphBuilder2_SetFiltergraph_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder2_GetFiltergraph_Proxy( - ICaptureGraphBuilder2* This, - IGraphBuilder **ppfg); -void __RPC_STUB ICaptureGraphBuilder2_GetFiltergraph_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder2_SetOutputFileName_Proxy( - ICaptureGraphBuilder2* This, - const GUID *pType, - LPCOLESTR lpstrFile, - IBaseFilter **ppf, - IFileSinkFilter **ppSink); -void __RPC_STUB ICaptureGraphBuilder2_SetOutputFileName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder2_RemoteFindInterface_Proxy( ICaptureGraphBuilder2* This, const GUID *pCategory, @@ -7490,66 +6474,6 @@ void __RPC_STUB ICaptureGraphBuilder2_RemoteFindInterface_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder2_RenderStream_Proxy( - ICaptureGraphBuilder2* This, - const GUID *pCategory, - const GUID *pType, - IUnknown *pSource, - IBaseFilter *pfCompressor, - IBaseFilter *pfRenderer); -void __RPC_STUB ICaptureGraphBuilder2_RenderStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder2_ControlStream_Proxy( - ICaptureGraphBuilder2* This, - const GUID *pCategory, - const GUID *pType, - IBaseFilter *pFilter, - REFERENCE_TIME *pstart, - REFERENCE_TIME *pstop, - WORD wStartCookie, - WORD wStopCookie); -void __RPC_STUB ICaptureGraphBuilder2_ControlStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder2_AllocCapFile_Proxy( - ICaptureGraphBuilder2* This, - LPCOLESTR lpstr, - DWORDLONG dwlSize); -void __RPC_STUB ICaptureGraphBuilder2_AllocCapFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder2_CopyCaptureFile_Proxy( - ICaptureGraphBuilder2* This, - LPOLESTR lpwstrOld, - LPOLESTR lpwstrNew, - int fAllowEscAbort, - IAMCopyCaptureFileProgress *pCallback); -void __RPC_STUB ICaptureGraphBuilder2_CopyCaptureFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder2_FindPin_Proxy( - ICaptureGraphBuilder2* This, - IUnknown *pSource, - PIN_DIRECTION pindir, - const GUID *pCategory, - const GUID *pType, - WINBOOL fUnconnected, - int num, - IPin **ppPin); -void __RPC_STUB ICaptureGraphBuilder2_FindPin_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK ICaptureGraphBuilder2_FindInterface_Proxy( ICaptureGraphBuilder2* This, const GUID *pCategory, @@ -7600,35 +6524,36 @@ typedef struct IConfigAviMuxVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IConfigAviMux* This, + IConfigAviMux *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IConfigAviMux* This); + IConfigAviMux *This); ULONG (STDMETHODCALLTYPE *Release)( - IConfigAviMux* This); + IConfigAviMux *This); /*** IConfigAviMux methods ***/ HRESULT (STDMETHODCALLTYPE *SetMasterStream)( - IConfigAviMux* This, + IConfigAviMux *This, LONG iStream); HRESULT (STDMETHODCALLTYPE *GetMasterStream)( - IConfigAviMux* This, + IConfigAviMux *This, LONG *pStream); HRESULT (STDMETHODCALLTYPE *SetOutputCompatibilityIndex)( - IConfigAviMux* This, + IConfigAviMux *This, WINBOOL fOldIndex); HRESULT (STDMETHODCALLTYPE *GetOutputCompatibilityIndex)( - IConfigAviMux* This, + IConfigAviMux *This, WINBOOL *pfOldIndex); END_INTERFACE } IConfigAviMuxVtbl; + interface IConfigAviMux { CONST_VTBL IConfigAviMuxVtbl* lpVtbl; }; @@ -7673,38 +6598,6 @@ static FORCEINLINE HRESULT IConfigAviMux_GetOutputCompatibilityIndex(IConfigAviM #endif -HRESULT STDMETHODCALLTYPE IConfigAviMux_SetMasterStream_Proxy( - IConfigAviMux* This, - LONG iStream); -void __RPC_STUB IConfigAviMux_SetMasterStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IConfigAviMux_GetMasterStream_Proxy( - IConfigAviMux* This, - LONG *pStream); -void __RPC_STUB IConfigAviMux_GetMasterStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IConfigAviMux_SetOutputCompatibilityIndex_Proxy( - IConfigAviMux* This, - WINBOOL fOldIndex); -void __RPC_STUB IConfigAviMux_SetOutputCompatibilityIndex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IConfigAviMux_GetOutputCompatibilityIndex_Proxy( - IConfigAviMux* This, - WINBOOL *pfOldIndex); -void __RPC_STUB IConfigAviMux_GetOutputCompatibilityIndex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IConfigAviMux_INTERFACE_DEFINED__ */ @@ -7749,37 +6642,38 @@ typedef struct IConfigInterleavingVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IConfigInterleaving* This, + IConfigInterleaving *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IConfigInterleaving* This); + IConfigInterleaving *This); ULONG (STDMETHODCALLTYPE *Release)( - IConfigInterleaving* This); + IConfigInterleaving *This); /*** IConfigInterleaving methods ***/ HRESULT (STDMETHODCALLTYPE *put_Mode)( - IConfigInterleaving* This, + IConfigInterleaving *This, InterleavingMode mode); HRESULT (STDMETHODCALLTYPE *get_Mode)( - IConfigInterleaving* This, + IConfigInterleaving *This, InterleavingMode *pMode); HRESULT (STDMETHODCALLTYPE *put_Interleaving)( - IConfigInterleaving* This, + IConfigInterleaving *This, const REFERENCE_TIME *prtInterleave, const REFERENCE_TIME *prtPreroll); HRESULT (STDMETHODCALLTYPE *get_Interleaving)( - IConfigInterleaving* This, + IConfigInterleaving *This, REFERENCE_TIME *prtInterleave, REFERENCE_TIME *prtPreroll); END_INTERFACE } IConfigInterleavingVtbl; + interface IConfigInterleaving { CONST_VTBL IConfigInterleavingVtbl* lpVtbl; }; @@ -7824,40 +6718,6 @@ static FORCEINLINE HRESULT IConfigInterleaving_get_Interleaving(IConfigInterleav #endif -HRESULT STDMETHODCALLTYPE IConfigInterleaving_put_Mode_Proxy( - IConfigInterleaving* This, - InterleavingMode mode); -void __RPC_STUB IConfigInterleaving_put_Mode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IConfigInterleaving_get_Mode_Proxy( - IConfigInterleaving* This, - InterleavingMode *pMode); -void __RPC_STUB IConfigInterleaving_get_Mode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IConfigInterleaving_put_Interleaving_Proxy( - IConfigInterleaving* This, - const REFERENCE_TIME *prtInterleave, - const REFERENCE_TIME *prtPreroll); -void __RPC_STUB IConfigInterleaving_put_Interleaving_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IConfigInterleaving_get_Interleaving_Proxy( - IConfigInterleaving* This, - REFERENCE_TIME *prtInterleave, - REFERENCE_TIME *prtPreroll); -void __RPC_STUB IConfigInterleaving_get_Interleaving_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IConfigInterleaving_INTERFACE_DEFINED__ */ @@ -7888,27 +6748,28 @@ typedef struct IAMClockSlaveVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAMClockSlave* This, + IAMClockSlave *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAMClockSlave* This); + IAMClockSlave *This); ULONG (STDMETHODCALLTYPE *Release)( - IAMClockSlave* This); + IAMClockSlave *This); /*** IAMClockSlave methods ***/ HRESULT (STDMETHODCALLTYPE *SetErrorTolerance)( - IAMClockSlave* This, + IAMClockSlave *This, DWORD dwTolerance); HRESULT (STDMETHODCALLTYPE *GetErrorTolerance)( - IAMClockSlave* This, + IAMClockSlave *This, DWORD *pdwTolerance); END_INTERFACE } IAMClockSlaveVtbl; + interface IAMClockSlave { CONST_VTBL IAMClockSlaveVtbl* lpVtbl; }; @@ -7945,22 +6806,6 @@ static FORCEINLINE HRESULT IAMClockSlave_GetErrorTolerance(IAMClockSlave* This,D #endif -HRESULT STDMETHODCALLTYPE IAMClockSlave_SetErrorTolerance_Proxy( - IAMClockSlave* This, - DWORD dwTolerance); -void __RPC_STUB IAMClockSlave_SetErrorTolerance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMClockSlave_GetErrorTolerance_Proxy( - IAMClockSlave* This, - DWORD *pdwTolerance); -void __RPC_STUB IAMClockSlave_GetErrorTolerance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAMClockSlave_INTERFACE_DEFINED__ */ @@ -8025,38 +6870,39 @@ typedef struct IAMCertifiedOutputProtectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAMCertifiedOutputProtection* This, + IAMCertifiedOutputProtection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAMCertifiedOutputProtection* This); + IAMCertifiedOutputProtection *This); ULONG (STDMETHODCALLTYPE *Release)( - IAMCertifiedOutputProtection* This); + IAMCertifiedOutputProtection *This); /*** IAMCertifiedOutputProtection methods ***/ HRESULT (STDMETHODCALLTYPE *KeyExchange)( - IAMCertifiedOutputProtection* This, + IAMCertifiedOutputProtection *This, GUID *pRandom, BYTE **VarLenCertGH, DWORD *pdwLengthCertGH); HRESULT (STDMETHODCALLTYPE *SessionSequenceStart)( - IAMCertifiedOutputProtection* This, + IAMCertifiedOutputProtection *This, AMCOPPSignature *pSig); HRESULT (STDMETHODCALLTYPE *ProtectionCommand)( - IAMCertifiedOutputProtection* This, + IAMCertifiedOutputProtection *This, const AMCOPPCommand *cmd); HRESULT (STDMETHODCALLTYPE *ProtectionStatus)( - IAMCertifiedOutputProtection* This, + IAMCertifiedOutputProtection *This, const AMCOPPStatusInput *pStatusInput, AMCOPPStatusOutput *pStatusOutput); END_INTERFACE } IAMCertifiedOutputProtectionVtbl; + interface IAMCertifiedOutputProtection { CONST_VTBL IAMCertifiedOutputProtectionVtbl* lpVtbl; }; @@ -8101,48 +6947,12 @@ static FORCEINLINE HRESULT IAMCertifiedOutputProtection_ProtectionStatus(IAMCert #endif -HRESULT STDMETHODCALLTYPE IAMCertifiedOutputProtection_KeyExchange_Proxy( - IAMCertifiedOutputProtection* This, - GUID *pRandom, - BYTE **VarLenCertGH, - DWORD *pdwLengthCertGH); -void __RPC_STUB IAMCertifiedOutputProtection_KeyExchange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMCertifiedOutputProtection_SessionSequenceStart_Proxy( - IAMCertifiedOutputProtection* This, - AMCOPPSignature *pSig); -void __RPC_STUB IAMCertifiedOutputProtection_SessionSequenceStart_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMCertifiedOutputProtection_ProtectionCommand_Proxy( - IAMCertifiedOutputProtection* This, - const AMCOPPCommand *cmd); -void __RPC_STUB IAMCertifiedOutputProtection_ProtectionCommand_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMCertifiedOutputProtection_ProtectionStatus_Proxy( - IAMCertifiedOutputProtection* This, - const AMCOPPStatusInput *pStatusInput, - AMCOPPStatusOutput *pStatusOutput); -void __RPC_STUB IAMCertifiedOutputProtection_ProtectionStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAMCertifiedOutputProtection_INTERFACE_DEFINED__ */ enum _AM_RENSDEREXFLAGS { AM_RENDEREX_RENDERTOEXISTINGRENDERERS = 0x1 }; - /***************************************************************************** * IFilterGraph2 interface */ @@ -8179,104 +6989,105 @@ typedef struct IFilterGraph2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFilterGraph2* This, + IFilterGraph2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IFilterGraph2* This); + IFilterGraph2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IFilterGraph2* This); + IFilterGraph2 *This); /*** IFilterGraph methods ***/ HRESULT (STDMETHODCALLTYPE *AddFilter)( - IFilterGraph2* This, + IFilterGraph2 *This, IBaseFilter *pFilter, LPCWSTR pName); HRESULT (STDMETHODCALLTYPE *RemoveFilter)( - IFilterGraph2* This, + IFilterGraph2 *This, IBaseFilter *pFilter); HRESULT (STDMETHODCALLTYPE *EnumFilters)( - IFilterGraph2* This, + IFilterGraph2 *This, IEnumFilters **ppEnum); HRESULT (STDMETHODCALLTYPE *FindFilterByName)( - IFilterGraph2* This, + IFilterGraph2 *This, LPCWSTR pName, IBaseFilter **ppFilter); HRESULT (STDMETHODCALLTYPE *ConnectDirect)( - IFilterGraph2* This, + IFilterGraph2 *This, IPin *ppinOut, IPin *ppinIn, const AM_MEDIA_TYPE *pmt); HRESULT (STDMETHODCALLTYPE *Reconnect)( - IFilterGraph2* This, + IFilterGraph2 *This, IPin *ppin); HRESULT (STDMETHODCALLTYPE *Disconnect)( - IFilterGraph2* This, + IFilterGraph2 *This, IPin *ppin); HRESULT (STDMETHODCALLTYPE *SetDefaultSyncSource)( - IFilterGraph2* This); + IFilterGraph2 *This); /*** IGraphBuilder methods ***/ HRESULT (STDMETHODCALLTYPE *Connect)( - IFilterGraph2* This, + IFilterGraph2 *This, IPin *ppinOut, IPin *ppinIn); HRESULT (STDMETHODCALLTYPE *Render)( - IFilterGraph2* This, + IFilterGraph2 *This, IPin *ppinOut); HRESULT (STDMETHODCALLTYPE *RenderFile)( - IFilterGraph2* This, + IFilterGraph2 *This, LPCWSTR lpcwstrFile, LPCWSTR lpcwstrPlayList); HRESULT (STDMETHODCALLTYPE *AddSourceFilter)( - IFilterGraph2* This, + IFilterGraph2 *This, LPCWSTR lpcwstrFileName, LPCWSTR lpcwstrFilterName, IBaseFilter **ppFilter); HRESULT (STDMETHODCALLTYPE *SetLogFile)( - IFilterGraph2* This, + IFilterGraph2 *This, DWORD_PTR hFile); HRESULT (STDMETHODCALLTYPE *Abort)( - IFilterGraph2* This); + IFilterGraph2 *This); HRESULT (STDMETHODCALLTYPE *ShouldOperationContinue)( - IFilterGraph2* This); + IFilterGraph2 *This); /*** IFilterGraph2 methods ***/ HRESULT (STDMETHODCALLTYPE *AddSourceFilterForMoniker)( - IFilterGraph2* This, + IFilterGraph2 *This, IMoniker *pMoniker, IBindCtx *pCtx, LPCWSTR lpcwstrFilterName, IBaseFilter **ppFilter); HRESULT (STDMETHODCALLTYPE *ReconnectEx)( - IFilterGraph2* This, + IFilterGraph2 *This, IPin *ppin, const AM_MEDIA_TYPE *pmt); HRESULT (STDMETHODCALLTYPE *RenderEx)( - IFilterGraph2* This, + IFilterGraph2 *This, IPin *pPinOut, DWORD dwFlags, DWORD *pvContext); END_INTERFACE } IFilterGraph2Vtbl; + interface IFilterGraph2 { CONST_VTBL IFilterGraph2Vtbl* lpVtbl; }; @@ -8381,36 +7192,6 @@ static FORCEINLINE HRESULT IFilterGraph2_RenderEx(IFilterGraph2* This,IPin *pPin #endif -HRESULT STDMETHODCALLTYPE IFilterGraph2_AddSourceFilterForMoniker_Proxy( - IFilterGraph2* This, - IMoniker *pMoniker, - IBindCtx *pCtx, - LPCWSTR lpcwstrFilterName, - IBaseFilter **ppFilter); -void __RPC_STUB IFilterGraph2_AddSourceFilterForMoniker_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFilterGraph2_ReconnectEx_Proxy( - IFilterGraph2* This, - IPin *ppin, - const AM_MEDIA_TYPE *pmt); -void __RPC_STUB IFilterGraph2_ReconnectEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IFilterGraph2_RenderEx_Proxy( - IFilterGraph2* This, - IPin *pPinOut, - DWORD dwFlags, - DWORD *pvContext); -void __RPC_STUB IFilterGraph2_RenderEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IFilterGraph2_INTERFACE_DEFINED__ */ @@ -8443,29 +7224,30 @@ typedef struct IStreamBuilderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IStreamBuilder* This, + IStreamBuilder *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IStreamBuilder* This); + IStreamBuilder *This); ULONG (STDMETHODCALLTYPE *Release)( - IStreamBuilder* This); + IStreamBuilder *This); /*** IStreamBuilder methods ***/ HRESULT (STDMETHODCALLTYPE *Render)( - IStreamBuilder* This, + IStreamBuilder *This, IPin *ppinOut, IGraphBuilder *pGraph); HRESULT (STDMETHODCALLTYPE *Backout)( - IStreamBuilder* This, + IStreamBuilder *This, IPin *ppinOut, IGraphBuilder *pGraph); END_INTERFACE } IStreamBuilderVtbl; + interface IStreamBuilder { CONST_VTBL IStreamBuilderVtbl* lpVtbl; }; @@ -8502,24 +7284,6 @@ static FORCEINLINE HRESULT IStreamBuilder_Backout(IStreamBuilder* This,IPin *ppi #endif -HRESULT STDMETHODCALLTYPE IStreamBuilder_Render_Proxy( - IStreamBuilder* This, - IPin *ppinOut, - IGraphBuilder *pGraph); -void __RPC_STUB IStreamBuilder_Render_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IStreamBuilder_Backout_Proxy( - IStreamBuilder* This, - IPin *ppinOut, - IGraphBuilder *pGraph); -void __RPC_STUB IStreamBuilder_Backout_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IStreamBuilder_INTERFACE_DEFINED__ */ @@ -8594,38 +7358,39 @@ typedef struct IAMStreamConfigVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAMStreamConfig* This, + IAMStreamConfig *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAMStreamConfig* This); + IAMStreamConfig *This); ULONG (STDMETHODCALLTYPE *Release)( - IAMStreamConfig* This); + IAMStreamConfig *This); /*** IAMStreamConfig methods ***/ HRESULT (STDMETHODCALLTYPE *SetFormat)( - IAMStreamConfig* This, + IAMStreamConfig *This, AM_MEDIA_TYPE *pmt); HRESULT (STDMETHODCALLTYPE *GetFormat)( - IAMStreamConfig* This, + IAMStreamConfig *This, AM_MEDIA_TYPE **pmt); HRESULT (STDMETHODCALLTYPE *GetNumberOfCapabilities)( - IAMStreamConfig* This, + IAMStreamConfig *This, int *piCount, int *piSize); HRESULT (STDMETHODCALLTYPE *GetStreamCaps)( - IAMStreamConfig* This, + IAMStreamConfig *This, int iIndex, AM_MEDIA_TYPE **pmt, BYTE *pSCC); END_INTERFACE } IAMStreamConfigVtbl; + interface IAMStreamConfig { CONST_VTBL IAMStreamConfigVtbl* lpVtbl; }; @@ -8670,41 +7435,6 @@ static FORCEINLINE HRESULT IAMStreamConfig_GetStreamCaps(IAMStreamConfig* This,i #endif -HRESULT STDMETHODCALLTYPE IAMStreamConfig_SetFormat_Proxy( - IAMStreamConfig* This, - AM_MEDIA_TYPE *pmt); -void __RPC_STUB IAMStreamConfig_SetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMStreamConfig_GetFormat_Proxy( - IAMStreamConfig* This, - AM_MEDIA_TYPE **pmt); -void __RPC_STUB IAMStreamConfig_GetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMStreamConfig_GetNumberOfCapabilities_Proxy( - IAMStreamConfig* This, - int *piCount, - int *piSize); -void __RPC_STUB IAMStreamConfig_GetNumberOfCapabilities_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMStreamConfig_GetStreamCaps_Proxy( - IAMStreamConfig* This, - int iIndex, - AM_MEDIA_TYPE **pmt, - BYTE *pSCC); -void __RPC_STUB IAMStreamConfig_GetStreamCaps_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAMStreamConfig_INTERFACE_DEFINED__ */ @@ -8763,19 +7493,19 @@ typedef struct IAMVideoProcAmpVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAMVideoProcAmp* This, + IAMVideoProcAmp *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAMVideoProcAmp* This); + IAMVideoProcAmp *This); ULONG (STDMETHODCALLTYPE *Release)( - IAMVideoProcAmp* This); + IAMVideoProcAmp *This); /*** IAMVideoProcAmp methods ***/ HRESULT (STDMETHODCALLTYPE *GetRange)( - IAMVideoProcAmp* This, + IAMVideoProcAmp *This, LONG Property, LONG *pMin, LONG *pMax, @@ -8784,19 +7514,20 @@ typedef struct IAMVideoProcAmpVtbl { LONG *pCapsFlags); HRESULT (STDMETHODCALLTYPE *Set)( - IAMVideoProcAmp* This, + IAMVideoProcAmp *This, LONG Property, LONG lValue, LONG Flags); HRESULT (STDMETHODCALLTYPE *Get)( - IAMVideoProcAmp* This, + IAMVideoProcAmp *This, LONG Property, LONG *lValue, LONG *Flags); END_INTERFACE } IAMVideoProcAmpVtbl; + interface IAMVideoProcAmp { CONST_VTBL IAMVideoProcAmpVtbl* lpVtbl; }; @@ -8837,39 +7568,6 @@ static FORCEINLINE HRESULT IAMVideoProcAmp_Get(IAMVideoProcAmp* This,LONG Proper #endif -HRESULT STDMETHODCALLTYPE IAMVideoProcAmp_GetRange_Proxy( - IAMVideoProcAmp* This, - LONG Property, - LONG *pMin, - LONG *pMax, - LONG *pSteppingDelta, - LONG *pDefault, - LONG *pCapsFlags); -void __RPC_STUB IAMVideoProcAmp_GetRange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMVideoProcAmp_Set_Proxy( - IAMVideoProcAmp* This, - LONG Property, - LONG lValue, - LONG Flags); -void __RPC_STUB IAMVideoProcAmp_Set_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMVideoProcAmp_Get_Proxy( - IAMVideoProcAmp* This, - LONG Property, - LONG *lValue, - LONG *Flags); -void __RPC_STUB IAMVideoProcAmp_Get_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAMVideoProcAmp_INTERFACE_DEFINED__ */ @@ -8926,57 +7624,58 @@ typedef struct IAsyncReaderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAsyncReader* This, + IAsyncReader *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAsyncReader* This); + IAsyncReader *This); ULONG (STDMETHODCALLTYPE *Release)( - IAsyncReader* This); + IAsyncReader *This); /*** IAsyncReader methods ***/ HRESULT (STDMETHODCALLTYPE *RequestAllocator)( - IAsyncReader* This, + IAsyncReader *This, IMemAllocator *pPreferred, ALLOCATOR_PROPERTIES *pProps, IMemAllocator **ppActual); HRESULT (STDMETHODCALLTYPE *Request)( - IAsyncReader* This, + IAsyncReader *This, IMediaSample *pSample, DWORD_PTR dwUser); HRESULT (STDMETHODCALLTYPE *WaitForNext)( - IAsyncReader* This, + IAsyncReader *This, DWORD dwTimeout, IMediaSample **ppSample, DWORD_PTR *pdwUser); HRESULT (STDMETHODCALLTYPE *SyncReadAligned)( - IAsyncReader* This, + IAsyncReader *This, IMediaSample *pSample); HRESULT (STDMETHODCALLTYPE *SyncRead)( - IAsyncReader* This, + IAsyncReader *This, LONGLONG llPosition, LONG lLength, BYTE *pBuffer); HRESULT (STDMETHODCALLTYPE *Length)( - IAsyncReader* This, + IAsyncReader *This, LONGLONG *pTotal, LONGLONG *pAvailable); HRESULT (STDMETHODCALLTYPE *BeginFlush)( - IAsyncReader* This); + IAsyncReader *This); HRESULT (STDMETHODCALLTYPE *EndFlush)( - IAsyncReader* This); + IAsyncReader *This); END_INTERFACE } IAsyncReaderVtbl; + interface IAsyncReader { CONST_VTBL IAsyncReaderVtbl* lpVtbl; }; @@ -9037,76 +7736,6 @@ static FORCEINLINE HRESULT IAsyncReader_EndFlush(IAsyncReader* This) { #endif -HRESULT STDMETHODCALLTYPE IAsyncReader_RequestAllocator_Proxy( - IAsyncReader* This, - IMemAllocator *pPreferred, - ALLOCATOR_PROPERTIES *pProps, - IMemAllocator **ppActual); -void __RPC_STUB IAsyncReader_RequestAllocator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAsyncReader_Request_Proxy( - IAsyncReader* This, - IMediaSample *pSample, - DWORD_PTR dwUser); -void __RPC_STUB IAsyncReader_Request_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAsyncReader_WaitForNext_Proxy( - IAsyncReader* This, - DWORD dwTimeout, - IMediaSample **ppSample, - DWORD_PTR *pdwUser); -void __RPC_STUB IAsyncReader_WaitForNext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAsyncReader_SyncReadAligned_Proxy( - IAsyncReader* This, - IMediaSample *pSample); -void __RPC_STUB IAsyncReader_SyncReadAligned_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAsyncReader_SyncRead_Proxy( - IAsyncReader* This, - LONGLONG llPosition, - LONG lLength, - BYTE *pBuffer); -void __RPC_STUB IAsyncReader_SyncRead_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAsyncReader_Length_Proxy( - IAsyncReader* This, - LONGLONG *pTotal, - LONGLONG *pAvailable); -void __RPC_STUB IAsyncReader_Length_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAsyncReader_BeginFlush_Proxy( - IAsyncReader* This); -void __RPC_STUB IAsyncReader_BeginFlush_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAsyncReader_EndFlush_Proxy( - IAsyncReader* This); -void __RPC_STUB IAsyncReader_EndFlush_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAsyncReader_INTERFACE_DEFINED__ */ @@ -9134,23 +7763,24 @@ typedef struct IGraphVersionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IGraphVersion* This, + IGraphVersion *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IGraphVersion* This); + IGraphVersion *This); ULONG (STDMETHODCALLTYPE *Release)( - IGraphVersion* This); + IGraphVersion *This); /*** IGraphVersion methods ***/ HRESULT (STDMETHODCALLTYPE *QueryVersion)( - IGraphVersion* This, + IGraphVersion *This, LONG *pVersion); END_INTERFACE } IGraphVersionVtbl; + interface IGraphVersion { CONST_VTBL IGraphVersionVtbl* lpVtbl; }; @@ -9183,14 +7813,6 @@ static FORCEINLINE HRESULT IGraphVersion_QueryVersion(IGraphVersion* This,LONG * #endif -HRESULT STDMETHODCALLTYPE IGraphVersion_QueryVersion_Proxy( - IGraphVersion* This, - LONG *pVersion); -void __RPC_STUB IGraphVersion_QueryVersion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IGraphVersion_INTERFACE_DEFINED__ */ @@ -9221,27 +7843,28 @@ typedef struct IResourceConsumerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IResourceConsumer* This, + IResourceConsumer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IResourceConsumer* This); + IResourceConsumer *This); ULONG (STDMETHODCALLTYPE *Release)( - IResourceConsumer* This); + IResourceConsumer *This); /*** IResourceConsumer methods ***/ HRESULT (STDMETHODCALLTYPE *AcquireResource)( - IResourceConsumer* This, + IResourceConsumer *This, LONG idResource); HRESULT (STDMETHODCALLTYPE *ReleaseResource)( - IResourceConsumer* This, + IResourceConsumer *This, LONG idResource); END_INTERFACE } IResourceConsumerVtbl; + interface IResourceConsumer { CONST_VTBL IResourceConsumerVtbl* lpVtbl; }; @@ -9278,22 +7901,6 @@ static FORCEINLINE HRESULT IResourceConsumer_ReleaseResource(IResourceConsumer* #endif -HRESULT STDMETHODCALLTYPE IResourceConsumer_AcquireResource_Proxy( - IResourceConsumer* This, - LONG idResource); -void __RPC_STUB IResourceConsumer_AcquireResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IResourceConsumer_ReleaseResource_Proxy( - IResourceConsumer* This, - LONG idResource); -void __RPC_STUB IResourceConsumer_ReleaseResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IResourceConsumer_INTERFACE_DEFINED__ */ @@ -9354,63 +7961,64 @@ typedef struct IResourceManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IResourceManager* This, + IResourceManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IResourceManager* This); + IResourceManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IResourceManager* This); + IResourceManager *This); /*** IResourceManager methods ***/ HRESULT (STDMETHODCALLTYPE *Register)( - IResourceManager* This, + IResourceManager *This, LPCWSTR pName, LONG cResource, LONG *plToken); HRESULT (STDMETHODCALLTYPE *RegisterGroup)( - IResourceManager* This, + IResourceManager *This, LPCWSTR pName, LONG cResource, LONG *palTokens, LONG *plToken); HRESULT (STDMETHODCALLTYPE *RequestResource)( - IResourceManager* This, + IResourceManager *This, LONG idResource, IUnknown *pFocusObject, IResourceConsumer *pConsumer); HRESULT (STDMETHODCALLTYPE *NotifyAcquire)( - IResourceManager* This, + IResourceManager *This, LONG idResource, IResourceConsumer *pConsumer, HRESULT hr); HRESULT (STDMETHODCALLTYPE *NotifyRelease)( - IResourceManager* This, + IResourceManager *This, LONG idResource, IResourceConsumer *pConsumer, WINBOOL bStillWant); HRESULT (STDMETHODCALLTYPE *CancelRequest)( - IResourceManager* This, + IResourceManager *This, LONG idResource, IResourceConsumer *pConsumer); HRESULT (STDMETHODCALLTYPE *SetFocus)( - IResourceManager* This, + IResourceManager *This, IUnknown *pFocusObject); HRESULT (STDMETHODCALLTYPE *ReleaseFocus)( - IResourceManager* This, + IResourceManager *This, IUnknown *pFocusObject); END_INTERFACE } IResourceManagerVtbl; + interface IResourceManager { CONST_VTBL IResourceManagerVtbl* lpVtbl; }; @@ -9471,82 +8079,6 @@ static FORCEINLINE HRESULT IResourceManager_ReleaseFocus(IResourceManager* This, #endif -HRESULT STDMETHODCALLTYPE IResourceManager_Register_Proxy( - IResourceManager* This, - LPCWSTR pName, - LONG cResource, - LONG *plToken); -void __RPC_STUB IResourceManager_Register_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IResourceManager_RegisterGroup_Proxy( - IResourceManager* This, - LPCWSTR pName, - LONG cResource, - LONG *palTokens, - LONG *plToken); -void __RPC_STUB IResourceManager_RegisterGroup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IResourceManager_RequestResource_Proxy( - IResourceManager* This, - LONG idResource, - IUnknown *pFocusObject, - IResourceConsumer *pConsumer); -void __RPC_STUB IResourceManager_RequestResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IResourceManager_NotifyAcquire_Proxy( - IResourceManager* This, - LONG idResource, - IResourceConsumer *pConsumer, - HRESULT hr); -void __RPC_STUB IResourceManager_NotifyAcquire_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IResourceManager_NotifyRelease_Proxy( - IResourceManager* This, - LONG idResource, - IResourceConsumer *pConsumer, - WINBOOL bStillWant); -void __RPC_STUB IResourceManager_NotifyRelease_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IResourceManager_CancelRequest_Proxy( - IResourceManager* This, - LONG idResource, - IResourceConsumer *pConsumer); -void __RPC_STUB IResourceManager_CancelRequest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IResourceManager_SetFocus_Proxy( - IResourceManager* This, - IUnknown *pFocusObject); -void __RPC_STUB IResourceManager_SetFocus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IResourceManager_ReleaseFocus_Proxy( - IResourceManager* This, - IUnknown *pFocusObject); -void __RPC_STUB IResourceManager_ReleaseFocus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IResourceManager_INTERFACE_DEFINED__ */ @@ -9596,34 +8128,35 @@ typedef struct IAMStreamControlVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAMStreamControl* This, + IAMStreamControl *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAMStreamControl* This); + IAMStreamControl *This); ULONG (STDMETHODCALLTYPE *Release)( - IAMStreamControl* This); + IAMStreamControl *This); /*** IAMStreamControl methods ***/ HRESULT (STDMETHODCALLTYPE *StartAt)( - IAMStreamControl* This, + IAMStreamControl *This, const REFERENCE_TIME *ptStart, DWORD dwCookie); HRESULT (STDMETHODCALLTYPE *StopAt)( - IAMStreamControl* This, + IAMStreamControl *This, const REFERENCE_TIME *ptStop, WINBOOL bSendExtra, DWORD dwCookie); HRESULT (STDMETHODCALLTYPE *GetInfo)( - IAMStreamControl* This, + IAMStreamControl *This, AM_STREAM_INFO *pInfo); END_INTERFACE } IAMStreamControlVtbl; + interface IAMStreamControl { CONST_VTBL IAMStreamControlVtbl* lpVtbl; }; @@ -9664,33 +8197,6 @@ static FORCEINLINE HRESULT IAMStreamControl_GetInfo(IAMStreamControl* This,AM_ST #endif -HRESULT STDMETHODCALLTYPE IAMStreamControl_StartAt_Proxy( - IAMStreamControl* This, - const REFERENCE_TIME *ptStart, - DWORD dwCookie); -void __RPC_STUB IAMStreamControl_StartAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMStreamControl_StopAt_Proxy( - IAMStreamControl* This, - const REFERENCE_TIME *ptStop, - WINBOOL bSendExtra, - DWORD dwCookie); -void __RPC_STUB IAMStreamControl_StopAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMStreamControl_GetInfo_Proxy( - IAMStreamControl* This, - AM_STREAM_INFO *pInfo); -void __RPC_STUB IAMStreamControl_GetInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAMStreamControl_INTERFACE_DEFINED__ */ @@ -9741,19 +8247,19 @@ typedef struct IKsPropertySetVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IKsPropertySet* This, + IKsPropertySet *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IKsPropertySet* This); + IKsPropertySet *This); ULONG (STDMETHODCALLTYPE *Release)( - IKsPropertySet* This); + IKsPropertySet *This); /*** IKsPropertySet methods ***/ HRESULT (STDMETHODCALLTYPE *Set)( - IKsPropertySet* This, + IKsPropertySet *This, REFGUID guidPropSet, DWORD dwPropID, LPVOID pInstanceData, @@ -9762,7 +8268,7 @@ typedef struct IKsPropertySetVtbl { DWORD cbPropData); HRESULT (STDMETHODCALLTYPE *Get)( - IKsPropertySet* This, + IKsPropertySet *This, REFGUID guidPropSet, DWORD dwPropID, LPVOID pInstanceData, @@ -9772,13 +8278,14 @@ typedef struct IKsPropertySetVtbl { DWORD *pcbReturned); HRESULT (STDMETHODCALLTYPE *QuerySupported)( - IKsPropertySet* This, + IKsPropertySet *This, REFGUID guidPropSet, DWORD dwPropID, DWORD *pTypeSupport); END_INTERFACE } IKsPropertySetVtbl; + interface IKsPropertySet { CONST_VTBL IKsPropertySetVtbl* lpVtbl; }; @@ -9819,43 +8326,6 @@ static FORCEINLINE HRESULT IKsPropertySet_QuerySupported(IKsPropertySet* This,RE #endif -HRESULT STDMETHODCALLTYPE IKsPropertySet_Set_Proxy( - IKsPropertySet* This, - REFGUID guidPropSet, - DWORD dwPropID, - LPVOID pInstanceData, - DWORD cbInstanceData, - LPVOID pPropData, - DWORD cbPropData); -void __RPC_STUB IKsPropertySet_Set_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IKsPropertySet_Get_Proxy( - IKsPropertySet* This, - REFGUID guidPropSet, - DWORD dwPropID, - LPVOID pInstanceData, - DWORD cbInstanceData, - LPVOID pPropData, - DWORD cbPropData, - DWORD *pcbReturned); -void __RPC_STUB IKsPropertySet_Get_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IKsPropertySet_QuerySupported_Proxy( - IKsPropertySet* This, - REFGUID guidPropSet, - DWORD dwPropID, - DWORD *pTypeSupport); -void __RPC_STUB IKsPropertySet_QuerySupported_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IKsPropertySet_INTERFACE_DEFINED__ */ @@ -9887,37 +8357,38 @@ typedef struct IMediaPropertyBagVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMediaPropertyBag* This, + IMediaPropertyBag *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMediaPropertyBag* This); + IMediaPropertyBag *This); ULONG (STDMETHODCALLTYPE *Release)( - IMediaPropertyBag* This); + IMediaPropertyBag *This); /*** IPropertyBag methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - IMediaPropertyBag* This, + IMediaPropertyBag *This, LPCOLESTR pszPropName, VARIANT *pVar, IErrorLog *pErrorLog); HRESULT (STDMETHODCALLTYPE *Write)( - IMediaPropertyBag* This, + IMediaPropertyBag *This, LPCOLESTR pszPropName, VARIANT *pVar); /*** IMediaPropertyBag methods ***/ HRESULT (STDMETHODCALLTYPE *EnumProperty)( - IMediaPropertyBag* This, + IMediaPropertyBag *This, ULONG iProperty, VARIANT *pvarPropertyName, VARIANT *pvarPropertyValue); END_INTERFACE } IMediaPropertyBagVtbl; + interface IMediaPropertyBag { CONST_VTBL IMediaPropertyBagVtbl* lpVtbl; }; @@ -9960,16 +8431,6 @@ static FORCEINLINE HRESULT IMediaPropertyBag_EnumProperty(IMediaPropertyBag* Thi #endif -HRESULT STDMETHODCALLTYPE IMediaPropertyBag_EnumProperty_Proxy( - IMediaPropertyBag* This, - ULONG iProperty, - VARIANT *pvarPropertyName, - VARIANT *pvarPropertyValue); -void __RPC_STUB IMediaPropertyBag_EnumProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMediaPropertyBag_INTERFACE_DEFINED__ */ @@ -10007,38 +8468,39 @@ typedef struct IPersistMediaPropertyBagVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPersistMediaPropertyBag* This, + IPersistMediaPropertyBag *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPersistMediaPropertyBag* This); + IPersistMediaPropertyBag *This); ULONG (STDMETHODCALLTYPE *Release)( - IPersistMediaPropertyBag* This); + IPersistMediaPropertyBag *This); /*** IPersist methods ***/ HRESULT (STDMETHODCALLTYPE *GetClassID)( - IPersistMediaPropertyBag* This, + IPersistMediaPropertyBag *This, CLSID *pClassID); /*** IPersistMediaPropertyBag methods ***/ HRESULT (STDMETHODCALLTYPE *InitNew)( - IPersistMediaPropertyBag* This); + IPersistMediaPropertyBag *This); HRESULT (STDMETHODCALLTYPE *Load)( - IPersistMediaPropertyBag* This, + IPersistMediaPropertyBag *This, IMediaPropertyBag *pPropBag, IErrorLog *pErrorLog); HRESULT (STDMETHODCALLTYPE *Save)( - IPersistMediaPropertyBag* This, + IPersistMediaPropertyBag *This, IMediaPropertyBag *pPropBag, WINBOOL fClearDirty, WINBOOL fSaveAllProperties); END_INTERFACE } IPersistMediaPropertyBagVtbl; + interface IPersistMediaPropertyBag { CONST_VTBL IPersistMediaPropertyBagVtbl* lpVtbl; }; @@ -10085,32 +8547,6 @@ static FORCEINLINE HRESULT IPersistMediaPropertyBag_Save(IPersistMediaPropertyBa #endif -HRESULT STDMETHODCALLTYPE IPersistMediaPropertyBag_InitNew_Proxy( - IPersistMediaPropertyBag* This); -void __RPC_STUB IPersistMediaPropertyBag_InitNew_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPersistMediaPropertyBag_Load_Proxy( - IPersistMediaPropertyBag* This, - IMediaPropertyBag *pPropBag, - IErrorLog *pErrorLog); -void __RPC_STUB IPersistMediaPropertyBag_Load_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPersistMediaPropertyBag_Save_Proxy( - IPersistMediaPropertyBag* This, - IMediaPropertyBag *pPropBag, - WINBOOL fClearDirty, - WINBOOL fSaveAllProperties); -void __RPC_STUB IPersistMediaPropertyBag_Save_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPersistMediaPropertyBag_INTERFACE_DEFINED__ */ @@ -10139,24 +8575,25 @@ typedef struct ISeekingPassThruVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISeekingPassThru* This, + ISeekingPassThru *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISeekingPassThru* This); + ISeekingPassThru *This); ULONG (STDMETHODCALLTYPE *Release)( - ISeekingPassThru* This); + ISeekingPassThru *This); /*** ISeekingPassThru methods ***/ HRESULT (STDMETHODCALLTYPE *Init)( - ISeekingPassThru* This, + ISeekingPassThru *This, WINBOOL bSupportRendering, IPin *pPin); END_INTERFACE } ISeekingPassThruVtbl; + interface ISeekingPassThru { CONST_VTBL ISeekingPassThruVtbl* lpVtbl; }; @@ -10189,15 +8626,6 @@ static FORCEINLINE HRESULT ISeekingPassThru_Init(ISeekingPassThru* This,WINBOOL #endif -HRESULT STDMETHODCALLTYPE ISeekingPassThru_Init_Proxy( - ISeekingPassThru* This, - WINBOOL bSupportRendering, - IPin *pPin); -void __RPC_STUB ISeekingPassThru_Init_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISeekingPassThru_INTERFACE_DEFINED__ */ @@ -10205,7 +8633,6 @@ enum _AM_FILTER_MISC_FLAGS { AM_FILTER_MISC_FLAGS_IS_RENDERER = 0x1, AM_FILTER_MISC_FLAGS_IS_SOURCE = 0x2 }; - /***************************************************************************** * IAMFilterMiscFlags interface */ @@ -10230,22 +8657,23 @@ typedef struct IAMFilterMiscFlagsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAMFilterMiscFlags* This, + IAMFilterMiscFlags *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAMFilterMiscFlags* This); + IAMFilterMiscFlags *This); ULONG (STDMETHODCALLTYPE *Release)( - IAMFilterMiscFlags* This); + IAMFilterMiscFlags *This); /*** IAMFilterMiscFlags methods ***/ ULONG (STDMETHODCALLTYPE *GetMiscFlags)( - IAMFilterMiscFlags* This); + IAMFilterMiscFlags *This); END_INTERFACE } IAMFilterMiscFlagsVtbl; + interface IAMFilterMiscFlags { CONST_VTBL IAMFilterMiscFlagsVtbl* lpVtbl; }; @@ -10278,13 +8706,6 @@ static FORCEINLINE ULONG IAMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags* Thi #endif -ULONG STDMETHODCALLTYPE IAMFilterMiscFlags_GetMiscFlags_Proxy( - IAMFilterMiscFlags* This); -void __RPC_STUB IAMFilterMiscFlags_GetMiscFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAMFilterMiscFlags_INTERFACE_DEFINED__ */ @@ -10315,27 +8736,28 @@ typedef struct IAMGraphBuilderCallbackVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAMGraphBuilderCallback* This, + IAMGraphBuilderCallback *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAMGraphBuilderCallback* This); + IAMGraphBuilderCallback *This); ULONG (STDMETHODCALLTYPE *Release)( - IAMGraphBuilderCallback* This); + IAMGraphBuilderCallback *This); /*** IAMGraphBuilderCallback methods ***/ HRESULT (STDMETHODCALLTYPE *SelectedFilter)( - IAMGraphBuilderCallback* This, + IAMGraphBuilderCallback *This, IMoniker *pMon); HRESULT (STDMETHODCALLTYPE *CreatedFilter)( - IAMGraphBuilderCallback* This, + IAMGraphBuilderCallback *This, IBaseFilter *pFil); END_INTERFACE } IAMGraphBuilderCallbackVtbl; + interface IAMGraphBuilderCallback { CONST_VTBL IAMGraphBuilderCallbackVtbl* lpVtbl; }; @@ -10372,22 +8794,6 @@ static FORCEINLINE HRESULT IAMGraphBuilderCallback_CreatedFilter(IAMGraphBuilder #endif -HRESULT STDMETHODCALLTYPE IAMGraphBuilderCallback_SelectedFilter_Proxy( - IAMGraphBuilderCallback* This, - IMoniker *pMon); -void __RPC_STUB IAMGraphBuilderCallback_SelectedFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMGraphBuilderCallback_CreatedFilter_Proxy( - IAMGraphBuilderCallback* This, - IBaseFilter *pFil); -void __RPC_STUB IAMGraphBuilderCallback_CreatedFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAMGraphBuilderCallback_INTERFACE_DEFINED__ */ @@ -10425,28 +8831,28 @@ typedef struct IAMVfwCaptureDialogsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAMVfwCaptureDialogs* This, + IAMVfwCaptureDialogs *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAMVfwCaptureDialogs* This); + IAMVfwCaptureDialogs *This); ULONG (STDMETHODCALLTYPE *Release)( - IAMVfwCaptureDialogs* This); + IAMVfwCaptureDialogs *This); /*** IAMVfwCaptureDialogs methods ***/ HRESULT (STDMETHODCALLTYPE *HasDialog)( - IAMVfwCaptureDialogs* This, + IAMVfwCaptureDialogs *This, int dialog); HRESULT (STDMETHODCALLTYPE *ShowDialog)( - IAMVfwCaptureDialogs* This, + IAMVfwCaptureDialogs *This, int dialog, HWND hwnd); HRESULT (STDMETHODCALLTYPE *SendDriverMessage)( - IAMVfwCaptureDialogs* This, + IAMVfwCaptureDialogs *This, int dialog, int msg, LONG data1, @@ -10454,6 +8860,7 @@ typedef struct IAMVfwCaptureDialogsVtbl { END_INTERFACE } IAMVfwCaptureDialogsVtbl; + interface IAMVfwCaptureDialogs { CONST_VTBL IAMVfwCaptureDialogsVtbl* lpVtbl; }; @@ -10494,34 +8901,6 @@ static FORCEINLINE HRESULT IAMVfwCaptureDialogs_SendDriverMessage(IAMVfwCaptureD #endif -HRESULT STDMETHODCALLTYPE IAMVfwCaptureDialogs_HasDialog_Proxy( - IAMVfwCaptureDialogs* This, - int dialog); -void __RPC_STUB IAMVfwCaptureDialogs_HasDialog_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMVfwCaptureDialogs_ShowDialog_Proxy( - IAMVfwCaptureDialogs* This, - int dialog, - HWND hwnd); -void __RPC_STUB IAMVfwCaptureDialogs_ShowDialog_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMVfwCaptureDialogs_SendDriverMessage_Proxy( - IAMVfwCaptureDialogs* This, - int dialog, - int msg, - LONG data1, - LONG data2); -void __RPC_STUB IAMVfwCaptureDialogs_SendDriverMessage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAMVfwCaptureDialogs_INTERFACE_DEFINED__ */ @@ -10553,27 +8932,28 @@ typedef struct IAMAsyncReaderTimestampScalingVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAMAsyncReaderTimestampScaling* This, + IAMAsyncReaderTimestampScaling *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAMAsyncReaderTimestampScaling* This); + IAMAsyncReaderTimestampScaling *This); ULONG (STDMETHODCALLTYPE *Release)( - IAMAsyncReaderTimestampScaling* This); + IAMAsyncReaderTimestampScaling *This); /*** IAMAsyncReaderTimestampScaling methods ***/ HRESULT (STDMETHODCALLTYPE *GetTimestampMode)( - IAMAsyncReaderTimestampScaling* This, + IAMAsyncReaderTimestampScaling *This, WINBOOL *pfRaw); HRESULT (STDMETHODCALLTYPE *SetTimestampMode)( - IAMAsyncReaderTimestampScaling* This, + IAMAsyncReaderTimestampScaling *This, WINBOOL fRaw); END_INTERFACE } IAMAsyncReaderTimestampScalingVtbl; + interface IAMAsyncReaderTimestampScaling { CONST_VTBL IAMAsyncReaderTimestampScalingVtbl* lpVtbl; }; @@ -10610,22 +8990,6 @@ static FORCEINLINE HRESULT IAMAsyncReaderTimestampScaling_SetTimestampMode(IAMAs #endif -HRESULT STDMETHODCALLTYPE IAMAsyncReaderTimestampScaling_GetTimestampMode_Proxy( - IAMAsyncReaderTimestampScaling* This, - WINBOOL *pfRaw); -void __RPC_STUB IAMAsyncReaderTimestampScaling_GetTimestampMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMAsyncReaderTimestampScaling_SetTimestampMode_Proxy( - IAMAsyncReaderTimestampScaling* This, - WINBOOL fRaw); -void __RPC_STUB IAMAsyncReaderTimestampScaling_SetTimestampMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAMAsyncReaderTimestampScaling_INTERFACE_DEFINED__ */ @@ -10677,53 +9041,54 @@ typedef struct IAMPluginControlVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAMPluginControl* This, + IAMPluginControl *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAMPluginControl* This); + IAMPluginControl *This); ULONG (STDMETHODCALLTYPE *Release)( - IAMPluginControl* This); + IAMPluginControl *This); /*** IAMPluginControl methods ***/ HRESULT (STDMETHODCALLTYPE *GetPreferredClsid)( - IAMPluginControl* This, + IAMPluginControl *This, REFGUID subType, CLSID *clsid); HRESULT (STDMETHODCALLTYPE *GetPreferredClsidByIndex)( - IAMPluginControl* This, + IAMPluginControl *This, DWORD index, GUID *subType, CLSID *clsid); HRESULT (STDMETHODCALLTYPE *SetPreferredClsid)( - IAMPluginControl* This, + IAMPluginControl *This, REFGUID subType, const CLSID *clsid); HRESULT (STDMETHODCALLTYPE *IsDisabled)( - IAMPluginControl* This, + IAMPluginControl *This, REFCLSID clsid); HRESULT (STDMETHODCALLTYPE *GetDisabledByIndex)( - IAMPluginControl* This, + IAMPluginControl *This, DWORD index, CLSID *clsid); HRESULT (STDMETHODCALLTYPE *SetDisabled)( - IAMPluginControl* This, + IAMPluginControl *This, REFCLSID clsid, WINBOOL disabled); HRESULT (STDMETHODCALLTYPE *IsLegacyDisabled)( - IAMPluginControl* This, + IAMPluginControl *This, LPCWSTR dllName); END_INTERFACE } IAMPluginControlVtbl; + interface IAMPluginControl { CONST_VTBL IAMPluginControlVtbl* lpVtbl; }; @@ -10780,68 +9145,6 @@ static FORCEINLINE HRESULT IAMPluginControl_IsLegacyDisabled(IAMPluginControl* T #endif -HRESULT STDMETHODCALLTYPE IAMPluginControl_GetPreferredClsid_Proxy( - IAMPluginControl* This, - REFGUID subType, - CLSID *clsid); -void __RPC_STUB IAMPluginControl_GetPreferredClsid_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMPluginControl_GetPreferredClsidByIndex_Proxy( - IAMPluginControl* This, - DWORD index, - GUID *subType, - CLSID *clsid); -void __RPC_STUB IAMPluginControl_GetPreferredClsidByIndex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMPluginControl_SetPreferredClsid_Proxy( - IAMPluginControl* This, - REFGUID subType, - const CLSID *clsid); -void __RPC_STUB IAMPluginControl_SetPreferredClsid_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMPluginControl_IsDisabled_Proxy( - IAMPluginControl* This, - REFCLSID clsid); -void __RPC_STUB IAMPluginControl_IsDisabled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMPluginControl_GetDisabledByIndex_Proxy( - IAMPluginControl* This, - DWORD index, - CLSID *clsid); -void __RPC_STUB IAMPluginControl_GetDisabledByIndex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMPluginControl_SetDisabled_Proxy( - IAMPluginControl* This, - REFCLSID clsid, - WINBOOL disabled); -void __RPC_STUB IAMPluginControl_SetDisabled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IAMPluginControl_IsLegacyDisabled_Proxy( - IAMPluginControl* This, - LPCWSTR dllName); -void __RPC_STUB IAMPluginControl_IsLegacyDisabled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAMPluginControl_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/structuredquerycondition.h b/lib/libc/include/any-windows-any/structuredquerycondition.h index 2441936a6b..f24a8fce84 100644 --- a/lib/libc/include/any-windows-any/structuredquerycondition.h +++ b/lib/libc/include/any-windows-any/structuredquerycondition.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/structuredquerycondition.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/structuredquerycondition.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,16 +21,25 @@ #ifndef __IRichChunk_FWD_DEFINED__ #define __IRichChunk_FWD_DEFINED__ typedef interface IRichChunk IRichChunk; +#ifdef __cplusplus +interface IRichChunk; +#endif /* __cplusplus */ #endif #ifndef __ICondition_FWD_DEFINED__ #define __ICondition_FWD_DEFINED__ typedef interface ICondition ICondition; +#ifdef __cplusplus +interface ICondition; +#endif /* __cplusplus */ #endif #ifndef __ICondition2_FWD_DEFINED__ #define __ICondition2_FWD_DEFINED__ typedef interface ICondition2 ICondition2; +#ifdef __cplusplus +interface ICondition2; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -103,19 +113,19 @@ typedef struct IRichChunkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IRichChunk* This, + IRichChunk *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IRichChunk* This); + IRichChunk *This); ULONG (STDMETHODCALLTYPE *Release)( - IRichChunk* This); + IRichChunk *This); /*** IRichChunk methods ***/ HRESULT (STDMETHODCALLTYPE *GetData)( - IRichChunk* This, + IRichChunk *This, ULONG *pFirstPos, ULONG *pLength, LPWSTR *ppsz, @@ -123,6 +133,7 @@ typedef struct IRichChunkVtbl { END_INTERFACE } IRichChunkVtbl; + interface IRichChunk { CONST_VTBL IRichChunkVtbl* lpVtbl; }; @@ -229,74 +240,75 @@ typedef struct IConditionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICondition* This, + ICondition *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICondition* This); + ICondition *This); ULONG (STDMETHODCALLTYPE *Release)( - ICondition* This); + ICondition *This); /*** IPersist methods ***/ HRESULT (STDMETHODCALLTYPE *GetClassID)( - ICondition* This, + ICondition *This, CLSID *pClassID); /*** IPersistStream methods ***/ HRESULT (STDMETHODCALLTYPE *IsDirty)( - ICondition* This); + ICondition *This); HRESULT (STDMETHODCALLTYPE *Load)( - ICondition* This, + ICondition *This, IStream *pStm); HRESULT (STDMETHODCALLTYPE *Save)( - ICondition* This, + ICondition *This, IStream *pStm, WINBOOL fClearDirty); HRESULT (STDMETHODCALLTYPE *GetSizeMax)( - ICondition* This, + ICondition *This, ULARGE_INTEGER *pcbSize); /*** ICondition methods ***/ HRESULT (STDMETHODCALLTYPE *GetConditionType)( - ICondition* This, + ICondition *This, CONDITION_TYPE *pNodeType); HRESULT (STDMETHODCALLTYPE *GetSubConditions)( - ICondition* This, + ICondition *This, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetComparisonInfo)( - ICondition* This, + ICondition *This, LPWSTR *ppszPropertyName, CONDITION_OPERATION *pcop, PROPVARIANT *ppropvar); HRESULT (STDMETHODCALLTYPE *GetValueType)( - ICondition* This, + ICondition *This, LPWSTR *ppszValueTypeName); HRESULT (STDMETHODCALLTYPE *GetValueNormalization)( - ICondition* This, + ICondition *This, LPWSTR *ppszNormalization); HRESULT (STDMETHODCALLTYPE *GetInputTerms)( - ICondition* This, + ICondition *This, IRichChunk **ppPropertyTerm, IRichChunk **ppOperationTerm, IRichChunk **ppValueTerm); HRESULT (STDMETHODCALLTYPE *Clone)( - ICondition* This, + ICondition *This, ICondition **ppc); END_INTERFACE } IConditionVtbl; + interface ICondition { CONST_VTBL IConditionVtbl* lpVtbl; }; @@ -377,23 +389,6 @@ static FORCEINLINE HRESULT ICondition_Clone(ICondition* This,ICondition **ppc) { #endif -HRESULT STDMETHODCALLTYPE ICondition_GetConditionType_Proxy( - ICondition* This, - CONDITION_TYPE *pNodeType); -void __RPC_STUB ICondition_GetConditionType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICondition_GetSubConditions_Proxy( - ICondition* This, - REFIID riid, - void **ppv); -void __RPC_STUB ICondition_GetSubConditions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE ICondition_RemoteGetComparisonInfo_Proxy( ICondition* This, LPWSTR *ppszPropertyName, @@ -404,22 +399,6 @@ void __RPC_STUB ICondition_RemoteGetComparisonInfo_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICondition_GetValueType_Proxy( - ICondition* This, - LPWSTR *ppszValueTypeName); -void __RPC_STUB ICondition_GetValueType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICondition_GetValueNormalization_Proxy( - ICondition* This, - LPWSTR *ppszNormalization); -void __RPC_STUB ICondition_GetValueNormalization_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE ICondition_RemoteGetInputTerms_Proxy( ICondition* This, IRichChunk **ppPropertyTerm, @@ -430,14 +409,6 @@ void __RPC_STUB ICondition_RemoteGetInputTerms_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICondition_Clone_Proxy( - ICondition* This, - ICondition **ppc); -void __RPC_STUB ICondition_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK ICondition_GetComparisonInfo_Proxy( ICondition* This, LPWSTR *ppszPropertyName, @@ -491,85 +462,86 @@ typedef struct ICondition2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICondition2* This, + ICondition2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICondition2* This); + ICondition2 *This); ULONG (STDMETHODCALLTYPE *Release)( - ICondition2* This); + ICondition2 *This); /*** IPersist methods ***/ HRESULT (STDMETHODCALLTYPE *GetClassID)( - ICondition2* This, + ICondition2 *This, CLSID *pClassID); /*** IPersistStream methods ***/ HRESULT (STDMETHODCALLTYPE *IsDirty)( - ICondition2* This); + ICondition2 *This); HRESULT (STDMETHODCALLTYPE *Load)( - ICondition2* This, + ICondition2 *This, IStream *pStm); HRESULT (STDMETHODCALLTYPE *Save)( - ICondition2* This, + ICondition2 *This, IStream *pStm, WINBOOL fClearDirty); HRESULT (STDMETHODCALLTYPE *GetSizeMax)( - ICondition2* This, + ICondition2 *This, ULARGE_INTEGER *pcbSize); /*** ICondition methods ***/ HRESULT (STDMETHODCALLTYPE *GetConditionType)( - ICondition2* This, + ICondition2 *This, CONDITION_TYPE *pNodeType); HRESULT (STDMETHODCALLTYPE *GetSubConditions)( - ICondition2* This, + ICondition2 *This, REFIID riid, void **ppv); HRESULT (STDMETHODCALLTYPE *GetComparisonInfo)( - ICondition2* This, + ICondition2 *This, LPWSTR *ppszPropertyName, CONDITION_OPERATION *pcop, PROPVARIANT *ppropvar); HRESULT (STDMETHODCALLTYPE *GetValueType)( - ICondition2* This, + ICondition2 *This, LPWSTR *ppszValueTypeName); HRESULT (STDMETHODCALLTYPE *GetValueNormalization)( - ICondition2* This, + ICondition2 *This, LPWSTR *ppszNormalization); HRESULT (STDMETHODCALLTYPE *GetInputTerms)( - ICondition2* This, + ICondition2 *This, IRichChunk **ppPropertyTerm, IRichChunk **ppOperationTerm, IRichChunk **ppValueTerm); HRESULT (STDMETHODCALLTYPE *Clone)( - ICondition2* This, + ICondition2 *This, ICondition **ppc); /*** ICondition2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetLocale)( - ICondition2* This, + ICondition2 *This, LPWSTR *ppszLocaleName); HRESULT (STDMETHODCALLTYPE *GetLeafConditionInfo)( - ICondition2* This, + ICondition2 *This, PROPERTYKEY *ppropkey, CONDITION_OPERATION *pcop, PROPVARIANT *ppropvar); END_INTERFACE } ICondition2Vtbl; + interface ICondition2 { CONST_VTBL ICondition2Vtbl* lpVtbl; }; @@ -660,14 +632,6 @@ static FORCEINLINE HRESULT ICondition2_GetLeafConditionInfo(ICondition2* This,PR #endif -HRESULT STDMETHODCALLTYPE ICondition2_GetLocale_Proxy( - ICondition2* This, - LPWSTR *ppszLocaleName); -void __RPC_STUB ICondition2_GetLocale_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE ICondition2_RemoteGetLeafConditionInfo_Proxy( ICondition2* This, PROPERTYKEY *ppropkey, diff --git a/lib/libc/include/any-windows-any/sys/stat.h b/lib/libc/include/any-windows-any/sys/stat.h index d91a498e94..3d4cf45fbc 100644 --- a/lib/libc/include/any-windows-any/sys/stat.h +++ b/lib/libc/include/any-windows-any/sys/stat.h @@ -172,7 +172,7 @@ extern "C" { #if !defined (RC_INVOKED) && !defined (NO_OLDNAMES) int __cdecl fstat(int _Desc,struct stat *_Stat); -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT __mingw_ovr int __cdecl stat(const char *_Filename,struct stat *_Stat) { return _stat(_Filename, (struct _stat *)_Stat); diff --git a/lib/libc/include/any-windows-any/sys/timeb.h b/lib/libc/include/any-windows-any/sys/timeb.h index c92c8e01c2..7bfe98e0c2 100644 --- a/lib/libc/include/any-windows-any/sys/timeb.h +++ b/lib/libc/include/any-windows-any/sys/timeb.h @@ -76,13 +76,14 @@ extern "C" { #endif _CRTIMP void __cdecl _ftime64(struct __timeb64 *_Time); + _CRTIMP void __cdecl _ftime32(struct __timeb32 *_Time); -#ifdef _WIN64 +#ifndef _USE_32BIT_TIME_T #define _timeb __timeb64 - _CRTIMP void __cdecl _ftime(struct __timeb64 *); +#define _ftime _ftime64 #else #define _timeb __timeb32 - _CRTIMP void __cdecl _ftime(struct __timeb32 *); +#define _ftime _ftime32 #endif #ifndef _TIMESPEC_DEFINED @@ -109,7 +110,7 @@ struct itimerspec { } #else __CRT_INLINE void __cdecl ftime(struct timeb *_Tmb) { - _ftime((struct __timeb32 *)_Tmb); + _ftime32((struct __timeb32 *)_Tmb); } #endif /* _USE_32BIT_TIME_T */ #endif /* !__CRT__NO_INLINE */ diff --git a/lib/libc/include/any-windows-any/sys/utime.h b/lib/libc/include/any-windows-any/sys/utime.h index 28294ef063..df0c701a00 100644 --- a/lib/libc/include/any-windows-any/sys/utime.h +++ b/lib/libc/include/any-windows-any/sys/utime.h @@ -95,7 +95,17 @@ int __cdecl _utime(const char *,struct _utimbuf *); int __cdecl _futime(int,struct _utimbuf *); int __cdecl _wutime(const wchar_t *,struct _utimbuf *); #ifndef __CRT__NO_INLINE -#ifndef _USE_32BIT_TIME_T +#ifdef _USE_32BIT_TIME_T +__CRT_INLINE int __cdecl _utime(const char *_Filename,struct _utimbuf *_Utimbuf) { + return _utime32(_Filename,(struct __utimbuf32 *)_Utimbuf); +} +__CRT_INLINE int __cdecl _futime(int _Desc,struct _utimbuf *_Utimbuf) { + return _futime32(_Desc,(struct __utimbuf32 *)_Utimbuf); +} +__CRT_INLINE int __cdecl _wutime(const wchar_t *_Filename,struct _utimbuf *_Utimbuf) { + return _wutime32(_Filename,(struct __utimbuf32 *)_Utimbuf); +} +#else __CRT_INLINE int __cdecl _utime(const char *_Filename,struct _utimbuf *_Utimbuf) { return _utime64(_Filename,(struct __utimbuf64 *)_Utimbuf); } diff --git a/lib/libc/include/any-windows-any/taskschd.h b/lib/libc/include/any-windows-any/taskschd.h index 621a9c5e8c..15d9e67089 100644 --- a/lib/libc/include/any-windows-any/taskschd.h +++ b/lib/libc/include/any-windows-any/taskschd.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/taskschd.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from include/taskschd.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/textstor.h b/lib/libc/include/any-windows-any/textstor.h index 0e051d72ef..6da0b86fe6 100644 --- a/lib/libc/include/any-windows-any/textstor.h +++ b/lib/libc/include/any-windows-any/textstor.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/textstor.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/textstor.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,11 +21,17 @@ #ifndef __ITextStoreACPSink_FWD_DEFINED__ #define __ITextStoreACPSink_FWD_DEFINED__ typedef interface ITextStoreACPSink ITextStoreACPSink; +#ifdef __cplusplus +interface ITextStoreACPSink; +#endif /* __cplusplus */ #endif #ifndef __ITextStoreACP_FWD_DEFINED__ #define __ITextStoreACP_FWD_DEFINED__ typedef interface ITextStoreACP ITextStoreACP; +#ifdef __cplusplus +interface ITextStoreACP; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -201,53 +208,54 @@ typedef struct ITextStoreACPSinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITextStoreACPSink* This, + ITextStoreACPSink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITextStoreACPSink* This); + ITextStoreACPSink *This); ULONG (STDMETHODCALLTYPE *Release)( - ITextStoreACPSink* This); + ITextStoreACPSink *This); /*** ITextStoreACPSink methods ***/ HRESULT (STDMETHODCALLTYPE *OnTextChange)( - ITextStoreACPSink* This, + ITextStoreACPSink *This, DWORD dwFlags, const TS_TEXTCHANGE *pChange); HRESULT (STDMETHODCALLTYPE *OnSelectionChange)( - ITextStoreACPSink* This); + ITextStoreACPSink *This); HRESULT (STDMETHODCALLTYPE *OnLayoutChange)( - ITextStoreACPSink* This, + ITextStoreACPSink *This, TsLayoutCode lcode, TsViewCookie vcView); HRESULT (STDMETHODCALLTYPE *OnStatusChange)( - ITextStoreACPSink* This, + ITextStoreACPSink *This, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *OnAttrsChange)( - ITextStoreACPSink* This, + ITextStoreACPSink *This, LONG acpStart, LONG acpEnd, ULONG cAttrs, const TS_ATTRID *paAttrs); HRESULT (STDMETHODCALLTYPE *OnLockGranted)( - ITextStoreACPSink* This, + ITextStoreACPSink *This, DWORD dwLockFlags); HRESULT (STDMETHODCALLTYPE *OnStartEditTransaction)( - ITextStoreACPSink* This); + ITextStoreACPSink *This); HRESULT (STDMETHODCALLTYPE *OnEndEditTransaction)( - ITextStoreACPSink* This); + ITextStoreACPSink *This); END_INTERFACE } ITextStoreACPSinkVtbl; + interface ITextStoreACPSink { CONST_VTBL ITextStoreACPSinkVtbl* lpVtbl; }; @@ -308,72 +316,6 @@ static FORCEINLINE HRESULT ITextStoreACPSink_OnEndEditTransaction(ITextStoreACPS #endif -HRESULT STDMETHODCALLTYPE ITextStoreACPSink_OnTextChange_Proxy( - ITextStoreACPSink* This, - DWORD dwFlags, - const TS_TEXTCHANGE *pChange); -void __RPC_STUB ITextStoreACPSink_OnTextChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACPSink_OnSelectionChange_Proxy( - ITextStoreACPSink* This); -void __RPC_STUB ITextStoreACPSink_OnSelectionChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACPSink_OnLayoutChange_Proxy( - ITextStoreACPSink* This, - TsLayoutCode lcode, - TsViewCookie vcView); -void __RPC_STUB ITextStoreACPSink_OnLayoutChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACPSink_OnStatusChange_Proxy( - ITextStoreACPSink* This, - DWORD dwFlags); -void __RPC_STUB ITextStoreACPSink_OnStatusChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACPSink_OnAttrsChange_Proxy( - ITextStoreACPSink* This, - LONG acpStart, - LONG acpEnd, - ULONG cAttrs, - const TS_ATTRID *paAttrs); -void __RPC_STUB ITextStoreACPSink_OnAttrsChange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACPSink_OnLockGranted_Proxy( - ITextStoreACPSink* This, - DWORD dwLockFlags); -void __RPC_STUB ITextStoreACPSink_OnLockGranted_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACPSink_OnStartEditTransaction_Proxy( - ITextStoreACPSink* This); -void __RPC_STUB ITextStoreACPSink_OnStartEditTransaction_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACPSink_OnEndEditTransaction_Proxy( - ITextStoreACPSink* This); -void __RPC_STUB ITextStoreACPSink_OnEndEditTransaction_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ITextStoreACPSink_INTERFACE_DEFINED__ */ @@ -546,38 +488,38 @@ typedef struct ITextStoreACPVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITextStoreACP* This, + ITextStoreACP *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITextStoreACP* This); + ITextStoreACP *This); ULONG (STDMETHODCALLTYPE *Release)( - ITextStoreACP* This); + ITextStoreACP *This); /*** ITextStoreACP methods ***/ HRESULT (STDMETHODCALLTYPE *AdviseSink)( - ITextStoreACP* This, + ITextStoreACP *This, REFIID riid, IUnknown *punk, DWORD dwMask); HRESULT (STDMETHODCALLTYPE *UnadviseSink)( - ITextStoreACP* This, + ITextStoreACP *This, IUnknown *punk); HRESULT (STDMETHODCALLTYPE *RequestLock)( - ITextStoreACP* This, + ITextStoreACP *This, DWORD dwLockFlags, HRESULT *phrSession); HRESULT (STDMETHODCALLTYPE *GetStatus)( - ITextStoreACP* This, + ITextStoreACP *This, TS_STATUS *pdcs); HRESULT (STDMETHODCALLTYPE *QueryInsert)( - ITextStoreACP* This, + ITextStoreACP *This, LONG acpTestStart, LONG acpTestEnd, ULONG cch, @@ -585,19 +527,19 @@ typedef struct ITextStoreACPVtbl { LONG *pacpResultEnd); HRESULT (STDMETHODCALLTYPE *GetSelection)( - ITextStoreACP* This, + ITextStoreACP *This, ULONG ulIndex, ULONG ulCount, TS_SELECTION_ACP *pSelection, ULONG *pcFetched); HRESULT (STDMETHODCALLTYPE *SetSelection)( - ITextStoreACP* This, + ITextStoreACP *This, ULONG ulCount, const TS_SELECTION_ACP *pSelection); HRESULT (STDMETHODCALLTYPE *GetText)( - ITextStoreACP* This, + ITextStoreACP *This, LONG acpStart, LONG acpEnd, WCHAR *pchPlain, @@ -609,7 +551,7 @@ typedef struct ITextStoreACPVtbl { LONG *pacpNext); HRESULT (STDMETHODCALLTYPE *SetText)( - ITextStoreACP* This, + ITextStoreACP *This, DWORD dwFlags, LONG acpStart, LONG acpEnd, @@ -618,26 +560,26 @@ typedef struct ITextStoreACPVtbl { TS_TEXTCHANGE *pChange); HRESULT (STDMETHODCALLTYPE *GetFormattedText)( - ITextStoreACP* This, + ITextStoreACP *This, LONG acpStart, LONG acpEnd, IDataObject **ppDataObject); HRESULT (STDMETHODCALLTYPE *GetEmbedded)( - ITextStoreACP* This, + ITextStoreACP *This, LONG acpPos, REFGUID rguidService, REFIID riid, IUnknown **ppunk); HRESULT (STDMETHODCALLTYPE *QueryInsertEmbedded)( - ITextStoreACP* This, + ITextStoreACP *This, const GUID *pguidService, const FORMATETC *pFormatEtc, WINBOOL *pfInsertable); HRESULT (STDMETHODCALLTYPE *InsertEmbedded)( - ITextStoreACP* This, + ITextStoreACP *This, DWORD dwFlags, LONG acpStart, LONG acpEnd, @@ -645,7 +587,7 @@ typedef struct ITextStoreACPVtbl { TS_TEXTCHANGE *pChange); HRESULT (STDMETHODCALLTYPE *InsertTextAtSelection)( - ITextStoreACP* This, + ITextStoreACP *This, DWORD dwFlags, const WCHAR *pchText, ULONG cch, @@ -654,7 +596,7 @@ typedef struct ITextStoreACPVtbl { TS_TEXTCHANGE *pChange); HRESULT (STDMETHODCALLTYPE *InsertEmbeddedAtSelection)( - ITextStoreACP* This, + ITextStoreACP *This, DWORD dwFlags, IDataObject *pDataObject, LONG *pacpStart, @@ -662,27 +604,27 @@ typedef struct ITextStoreACPVtbl { TS_TEXTCHANGE *pChange); HRESULT (STDMETHODCALLTYPE *RequestSupportedAttrs)( - ITextStoreACP* This, + ITextStoreACP *This, DWORD dwFlags, ULONG cFilterAttrs, const TS_ATTRID *paFilterAttrs); HRESULT (STDMETHODCALLTYPE *RequestAttrsAtPosition)( - ITextStoreACP* This, + ITextStoreACP *This, LONG acpPos, ULONG cFilterAttrs, const TS_ATTRID *paFilterAttrs, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *RequestAttrsTransitioningAtPosition)( - ITextStoreACP* This, + ITextStoreACP *This, LONG acpPos, ULONG cFilterAttrs, const TS_ATTRID *paFilterAttrs, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *FindNextAttrTransition)( - ITextStoreACP* This, + ITextStoreACP *This, LONG acpStart, LONG acpHalt, ULONG cFilterAttrs, @@ -693,28 +635,28 @@ typedef struct ITextStoreACPVtbl { LONG *plFoundOffset); HRESULT (STDMETHODCALLTYPE *RetrieveRequestedAttrs)( - ITextStoreACP* This, + ITextStoreACP *This, ULONG ulCount, TS_ATTRVAL *paAttrVals, ULONG *pcFetched); HRESULT (STDMETHODCALLTYPE *GetEndACP)( - ITextStoreACP* This, + ITextStoreACP *This, LONG *pacp); HRESULT (STDMETHODCALLTYPE *GetActiveView)( - ITextStoreACP* This, + ITextStoreACP *This, TsViewCookie *pvcView); HRESULT (STDMETHODCALLTYPE *GetACPFromPoint)( - ITextStoreACP* This, + ITextStoreACP *This, TsViewCookie vcView, const POINT *ptScreen, DWORD dwFlags, LONG *pacp); HRESULT (STDMETHODCALLTYPE *GetTextExt)( - ITextStoreACP* This, + ITextStoreACP *This, TsViewCookie vcView, LONG acpStart, LONG acpEnd, @@ -722,17 +664,18 @@ typedef struct ITextStoreACPVtbl { WINBOOL *pfClipped); HRESULT (STDMETHODCALLTYPE *GetScreenExt)( - ITextStoreACP* This, + ITextStoreACP *This, TsViewCookie vcView, RECT *prc); HRESULT (STDMETHODCALLTYPE *GetWnd)( - ITextStoreACP* This, + ITextStoreACP *This, TsViewCookie vcView, HWND *phwnd); END_INTERFACE } ITextStoreACPVtbl; + interface ITextStoreACP { CONST_VTBL ITextStoreACPVtbl* lpVtbl; }; @@ -865,284 +808,6 @@ static FORCEINLINE HRESULT ITextStoreACP_GetWnd(ITextStoreACP* This,TsViewCookie #endif -HRESULT STDMETHODCALLTYPE ITextStoreACP_AdviseSink_Proxy( - ITextStoreACP* This, - REFIID riid, - IUnknown *punk, - DWORD dwMask); -void __RPC_STUB ITextStoreACP_AdviseSink_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_UnadviseSink_Proxy( - ITextStoreACP* This, - IUnknown *punk); -void __RPC_STUB ITextStoreACP_UnadviseSink_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_RequestLock_Proxy( - ITextStoreACP* This, - DWORD dwLockFlags, - HRESULT *phrSession); -void __RPC_STUB ITextStoreACP_RequestLock_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_GetStatus_Proxy( - ITextStoreACP* This, - TS_STATUS *pdcs); -void __RPC_STUB ITextStoreACP_GetStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_QueryInsert_Proxy( - ITextStoreACP* This, - LONG acpTestStart, - LONG acpTestEnd, - ULONG cch, - LONG *pacpResultStart, - LONG *pacpResultEnd); -void __RPC_STUB ITextStoreACP_QueryInsert_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_GetSelection_Proxy( - ITextStoreACP* This, - ULONG ulIndex, - ULONG ulCount, - TS_SELECTION_ACP *pSelection, - ULONG *pcFetched); -void __RPC_STUB ITextStoreACP_GetSelection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_SetSelection_Proxy( - ITextStoreACP* This, - ULONG ulCount, - const TS_SELECTION_ACP *pSelection); -void __RPC_STUB ITextStoreACP_SetSelection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_GetText_Proxy( - ITextStoreACP* This, - LONG acpStart, - LONG acpEnd, - WCHAR *pchPlain, - ULONG cchPlainReq, - ULONG *pcchPlainRet, - TS_RUNINFO *prgRunInfo, - ULONG cRunInfoReq, - ULONG *pcRunInfoRet, - LONG *pacpNext); -void __RPC_STUB ITextStoreACP_GetText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_SetText_Proxy( - ITextStoreACP* This, - DWORD dwFlags, - LONG acpStart, - LONG acpEnd, - const WCHAR *pchText, - ULONG cch, - TS_TEXTCHANGE *pChange); -void __RPC_STUB ITextStoreACP_SetText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_GetFormattedText_Proxy( - ITextStoreACP* This, - LONG acpStart, - LONG acpEnd, - IDataObject **ppDataObject); -void __RPC_STUB ITextStoreACP_GetFormattedText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_GetEmbedded_Proxy( - ITextStoreACP* This, - LONG acpPos, - REFGUID rguidService, - REFIID riid, - IUnknown **ppunk); -void __RPC_STUB ITextStoreACP_GetEmbedded_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_QueryInsertEmbedded_Proxy( - ITextStoreACP* This, - const GUID *pguidService, - const FORMATETC *pFormatEtc, - WINBOOL *pfInsertable); -void __RPC_STUB ITextStoreACP_QueryInsertEmbedded_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_InsertEmbedded_Proxy( - ITextStoreACP* This, - DWORD dwFlags, - LONG acpStart, - LONG acpEnd, - IDataObject *pDataObject, - TS_TEXTCHANGE *pChange); -void __RPC_STUB ITextStoreACP_InsertEmbedded_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_InsertTextAtSelection_Proxy( - ITextStoreACP* This, - DWORD dwFlags, - const WCHAR *pchText, - ULONG cch, - LONG *pacpStart, - LONG *pacpEnd, - TS_TEXTCHANGE *pChange); -void __RPC_STUB ITextStoreACP_InsertTextAtSelection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_InsertEmbeddedAtSelection_Proxy( - ITextStoreACP* This, - DWORD dwFlags, - IDataObject *pDataObject, - LONG *pacpStart, - LONG *pacpEnd, - TS_TEXTCHANGE *pChange); -void __RPC_STUB ITextStoreACP_InsertEmbeddedAtSelection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_RequestSupportedAttrs_Proxy( - ITextStoreACP* This, - DWORD dwFlags, - ULONG cFilterAttrs, - const TS_ATTRID *paFilterAttrs); -void __RPC_STUB ITextStoreACP_RequestSupportedAttrs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_RequestAttrsAtPosition_Proxy( - ITextStoreACP* This, - LONG acpPos, - ULONG cFilterAttrs, - const TS_ATTRID *paFilterAttrs, - DWORD dwFlags); -void __RPC_STUB ITextStoreACP_RequestAttrsAtPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_RequestAttrsTransitioningAtPosition_Proxy( - ITextStoreACP* This, - LONG acpPos, - ULONG cFilterAttrs, - const TS_ATTRID *paFilterAttrs, - DWORD dwFlags); -void __RPC_STUB ITextStoreACP_RequestAttrsTransitioningAtPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_FindNextAttrTransition_Proxy( - ITextStoreACP* This, - LONG acpStart, - LONG acpHalt, - ULONG cFilterAttrs, - const TS_ATTRID *paFilterAttrs, - DWORD dwFlags, - LONG *pacpNext, - WINBOOL *pfFound, - LONG *plFoundOffset); -void __RPC_STUB ITextStoreACP_FindNextAttrTransition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_RetrieveRequestedAttrs_Proxy( - ITextStoreACP* This, - ULONG ulCount, - TS_ATTRVAL *paAttrVals, - ULONG *pcFetched); -void __RPC_STUB ITextStoreACP_RetrieveRequestedAttrs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_GetEndACP_Proxy( - ITextStoreACP* This, - LONG *pacp); -void __RPC_STUB ITextStoreACP_GetEndACP_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_GetActiveView_Proxy( - ITextStoreACP* This, - TsViewCookie *pvcView); -void __RPC_STUB ITextStoreACP_GetActiveView_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_GetACPFromPoint_Proxy( - ITextStoreACP* This, - TsViewCookie vcView, - const POINT *ptScreen, - DWORD dwFlags, - LONG *pacp); -void __RPC_STUB ITextStoreACP_GetACPFromPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_GetTextExt_Proxy( - ITextStoreACP* This, - TsViewCookie vcView, - LONG acpStart, - LONG acpEnd, - RECT *prc, - WINBOOL *pfClipped); -void __RPC_STUB ITextStoreACP_GetTextExt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_GetScreenExt_Proxy( - ITextStoreACP* This, - TsViewCookie vcView, - RECT *prc); -void __RPC_STUB ITextStoreACP_GetScreenExt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITextStoreACP_GetWnd_Proxy( - ITextStoreACP* This, - TsViewCookie vcView, - HWND *phwnd); -void __RPC_STUB ITextStoreACP_GetWnd_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ITextStoreACP_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/time.h b/lib/libc/include/any-windows-any/time.h index 73f6264a6c..4019cb418f 100644 --- a/lib/libc/include/any-windows-any/time.h +++ b/lib/libc/include/any-windows-any/time.h @@ -109,7 +109,7 @@ extern "C" { #define CLOCKS_PER_SEC 1000 -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT _CRTIMP int *__cdecl __daylight(void); _CRTIMP long *__cdecl __dstbias(void); _CRTIMP long *__cdecl __timezone(void); @@ -131,13 +131,13 @@ extern "C" { _CRTIMP errno_t __cdecl _get_tzname(size_t *_ReturnValue,char *_Buffer,size_t _SizeInBytes,int _Index); char *__cdecl asctime(const struct tm *_Tm) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _SECIMP errno_t __cdecl asctime_s (char *_Buf,size_t _SizeInWords,const struct tm *_Tm); - char *__cdecl _ctime32(const __time32_t *_Time) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; + _CRTIMP char *__cdecl _ctime32(const __time32_t *_Time) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _SECIMP errno_t __cdecl _ctime32_s (char *_Buf,size_t _SizeInBytes,const __time32_t *_Time); clock_t __cdecl clock(void); - double __cdecl _difftime32(__time32_t _Time1,__time32_t _Time2); - struct tm *__cdecl _gmtime32(const __time32_t *_Time) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; + _CRTIMP double __cdecl _difftime32(__time32_t _Time1,__time32_t _Time2); + _CRTIMP struct tm *__cdecl _gmtime32(const __time32_t *_Time) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _SECIMP errno_t __cdecl _gmtime32_s (struct tm *_Tm,const __time32_t *_Time); - struct tm *__cdecl _localtime32(const __time32_t *_Time) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; + _CRTIMP struct tm *__cdecl _localtime32(const __time32_t *_Time) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _SECIMP errno_t __cdecl _localtime32_s (struct tm *_Tm,const __time32_t *_Time); size_t __cdecl strftime(char * __restrict__ _Buf,size_t _SizeInBytes,const char * __restrict__ _Format,const struct tm * __restrict__ _Tm); _CRTIMP size_t __cdecl _strftime_l(char * __restrict__ _Buf,size_t _Max_size,const char * __restrict__ _Format,const struct tm * __restrict__ _Tm,_locale_t _Locale); @@ -145,21 +145,21 @@ extern "C" { _SECIMP errno_t __cdecl _strdate_s (char *_Buf,size_t _SizeInBytes); _CRTIMP char *__cdecl _strtime(char *_Buffer) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _SECIMP errno_t __cdecl _strtime_s (char *_Buf ,size_t _SizeInBytes); - __time32_t __cdecl _time32(__time32_t *_Time); - __time32_t __cdecl _mktime32(struct tm *_Tm); - __time32_t __cdecl _mkgmtime32(struct tm *_Tm); + _CRTIMP __time32_t __cdecl _time32(__time32_t *_Time); + _CRTIMP __time32_t __cdecl _mktime32(struct tm *_Tm); + _CRTIMP __time32_t __cdecl _mkgmtime32(struct tm *_Tm); #if defined (_POSIX_) || defined(__GNUC__) void __cdecl tzset(void) __MINGW_ATTRIB_DEPRECATED_MSVC2005; #endif #if !defined (_POSIX_) -#if __MSVCRT_VERSION__ < 0x1400 +#ifndef _UCRT _CRTIMP #endif void __cdecl _tzset(void); #endif - double __cdecl _difftime64(__time64_t _Time1,__time64_t _Time2); + _CRTIMP double __cdecl _difftime64(__time64_t _Time1,__time64_t _Time2); _CRTIMP char *__cdecl _ctime64(const __time64_t *_Time) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _SECIMP errno_t __cdecl _ctime64_s (char *_Buf,size_t _SizeInBytes,const __time64_t *_Time); _CRTIMP struct tm *__cdecl _gmtime64(const __time64_t *_Time) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; @@ -214,64 +214,41 @@ extern "C" { #endif #ifndef RC_INVOKED -#if __MSVCRT_VERSION__ < 0x1400 -double __cdecl difftime(time_t _Time1,time_t _Time2); -char *__cdecl ctime(const time_t *_Time) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; -struct tm *__cdecl gmtime(const time_t *_Time) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; -struct tm *__cdecl localtime(const time_t *_Time) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - -time_t __cdecl mktime(struct tm *_Tm); -time_t __cdecl _mkgmtime(struct tm *_Tm); -time_t __cdecl time(time_t *_Time); -#endif - -#if !defined(__CRT__NO_INLINE) || __MSVCRT_VERSION__ >= 0x1400 -#if __MSVCRT_VERSION__ >= 0x1400 -#define __TIME_INLINE __mingw_static_ovr -#else -#define __TIME_INLINE __CRT_INLINE -#endif -#if !defined(_USE_32BIT_TIME_T) -__TIME_INLINE double __cdecl difftime(time_t _Time1,time_t _Time2) - { return _difftime64(_Time1,_Time2); } -__TIME_INLINE char *__cdecl ctime(const time_t *_Time) { return _ctime64(_Time); } -__TIME_INLINE struct tm *__cdecl gmtime(const time_t *_Time) { return _gmtime64(_Time); } -__TIME_INLINE struct tm *__cdecl localtime(const time_t *_Time) { return _localtime64(_Time); } -__TIME_INLINE time_t __cdecl mktime(struct tm *_Tm) { return _mktime64(_Tm); } -__TIME_INLINE time_t __cdecl _mkgmtime(struct tm *_Tm) { return _mkgmtime64(_Tm); } -__TIME_INLINE time_t __cdecl time(time_t *_Time) { return _time64(_Time); } -#else -__TIME_INLINE double __cdecl difftime(time_t _Time1,time_t _Time2) - { return _difftime32(_Time1,_Time2); } -__TIME_INLINE char *__cdecl ctime(const time_t *_Time) { return _ctime32(_Time); } -__TIME_INLINE struct tm *__cdecl localtime(const time_t *_Time) { return _localtime32(_Time); } -__TIME_INLINE time_t __cdecl mktime(struct tm *_Tm) { return _mktime32(_Tm); } -__TIME_INLINE struct tm *__cdecl gmtime(const time_t *_Time) { return _gmtime32(_Time); } -__TIME_INLINE time_t __cdecl _mkgmtime(struct tm *_Tm) { return _mkgmtime32(_Tm); } -__TIME_INLINE time_t __cdecl time(time_t *_Time) { return _time32(_Time); } -#endif /* !_USE_32BIT_TIME_T */ -#endif /* !__CRT__NO_INLINE */ #ifdef _USE_32BIT_TIME_T -__forceinline errno_t __cdecl localtime_s(struct tm *_Tm,const time_t *_Time) { return _localtime32_s(_Tm,_Time); } -__forceinline errno_t __cdecl gmtime_s(struct tm *_Tm, const time_t *_Time) { return _gmtime32_s(_Tm, _Time); } -__forceinline errno_t __cdecl ctime_s(char *_Buf,size_t _SizeInBytes,const time_t *_Time) { return _ctime32_s(_Buf,_SizeInBytes,_Time); } - +static __inline time_t __CRTDECL time(time_t *_Time) { return _time32(_Time); } +static __inline double __CRTDECL difftime(time_t _Time1,time_t _Time2) { return _difftime32(_Time1,_Time2); } +static __inline struct tm *__CRTDECL localtime(const time_t *_Time) { return _localtime32(_Time); } +static __inline errno_t __CRTDECL localtime_s(struct tm *_Tm,const time_t *_Time) { return _localtime32_s(_Tm,_Time); } +static __inline struct tm *__CRTDECL gmtime(const time_t *_Time) { return _gmtime32(_Time); } +static __inline errno_t __CRTDECL gmtime_s(struct tm *_Tm, const time_t *_Time) { return _gmtime32_s(_Tm, _Time); } +static __inline char *__CRTDECL ctime(const time_t *_Time) { return _ctime32(_Time); } +static __inline errno_t __CRTDECL ctime_s(char *_Buf,size_t _SizeInBytes,const time_t *_Time) { return _ctime32_s(_Buf,_SizeInBytes,_Time); } +static __inline time_t __CRTDECL mktime(struct tm *_Tm) { return _mktime32(_Tm); } +static __inline time_t __CRTDECL _mkgmtime(struct tm *_Tm) { return _mkgmtime32(_Tm); } #else -__forceinline errno_t __cdecl localtime_s(struct tm *_Tm,const time_t *_Time) { return _localtime64_s(_Tm,_Time); } -__forceinline errno_t __cdecl gmtime_s(struct tm *_Tm, const time_t *_Time) { return _gmtime64_s(_Tm, _Time); } -__forceinline errno_t __cdecl ctime_s(char *_Buf,size_t _SizeInBytes,const time_t *_Time) { return _ctime64_s(_Buf,_SizeInBytes,_Time); } +static __inline time_t __CRTDECL time(time_t *_Time) { return _time64(_Time); } +static __inline double __CRTDECL difftime(time_t _Time1,time_t _Time2) { return _difftime64(_Time1,_Time2); } +static __inline struct tm *__CRTDECL localtime(const time_t *_Time) { return _localtime64(_Time); } +static __inline errno_t __CRTDECL localtime_s(struct tm *_Tm,const time_t *_Time) { return _localtime64_s(_Tm,_Time); } +static __inline struct tm *__CRTDECL gmtime(const time_t *_Time) { return _gmtime64(_Time); } +static __inline errno_t __CRTDECL gmtime_s(struct tm *_Tm, const time_t *_Time) { return _gmtime64_s(_Tm, _Time); } +static __inline char *__CRTDECL ctime(const time_t *_Time) { return _ctime64(_Time); } +static __inline errno_t __CRTDECL ctime_s(char *_Buf,size_t _SizeInBytes,const time_t *_Time) { return _ctime64_s(_Buf,_SizeInBytes,_Time); } +static __inline time_t __CRTDECL mktime(struct tm *_Tm) { return _mktime64(_Tm); } +static __inline time_t __CRTDECL _mkgmtime(struct tm *_Tm) { return _mkgmtime64(_Tm); } #endif + #endif /* !RC_INVOKED */ #if !defined(NO_OLDNAMES) || defined(_POSIX) #define CLK_TCK CLOCKS_PER_SEC -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT #define __MINGW_ATTRIB_DEPRECATED_UCRT \ __MINGW_ATTRIB_DEPRECATED_MSG( \ "Only provided for source compatibility; this variable might " \ - "not always be accurate when linking to ucrtbase.dll.") + "not always be accurate when linking to UCRT.") #else #define __MINGW_ATTRIB_DEPRECATED_UCRT #endif @@ -305,16 +282,16 @@ struct timezone { #endif #ifdef _POSIX_THREAD_SAFE_FUNCTIONS -__forceinline struct tm *__cdecl localtime_r(const time_t *_Time, struct tm *_Tm) { +__forceinline struct tm *__CRTDECL localtime_r(const time_t *_Time, struct tm *_Tm) { return localtime_s(_Tm, _Time) ? NULL : _Tm; } -__forceinline struct tm *__cdecl gmtime_r(const time_t *_Time, struct tm *_Tm) { +__forceinline struct tm *__CRTDECL gmtime_r(const time_t *_Time, struct tm *_Tm) { return gmtime_s(_Tm, _Time) ? NULL : _Tm; } -__forceinline char *__cdecl ctime_r(const time_t *_Time, char *_Str) { +__forceinline char *__CRTDECL ctime_r(const time_t *_Time, char *_Str) { return ctime_s(_Str, 0x7fffffff, _Time) ? NULL : _Str; } -__forceinline char *__cdecl asctime_r(const struct tm *_Tm, char * _Str) { +__forceinline char *__CRTDECL asctime_r(const struct tm *_Tm, char * _Str) { return asctime_s(_Str, 0x7fffffff, _Tm) ? NULL : _Str; } #endif diff --git a/lib/libc/include/any-windows-any/tlbref.h b/lib/libc/include/any-windows-any/tlbref.h index 7ecc3cd5ab..8e9d6c0c78 100644 --- a/lib/libc/include/any-windows-any/tlbref.h +++ b/lib/libc/include/any-windows-any/tlbref.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/tlbref.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/tlbref.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,6 +21,9 @@ #ifndef __ITypeLibResolver_FWD_DEFINED__ #define __ITypeLibResolver_FWD_DEFINED__ typedef interface ITypeLibResolver ITypeLibResolver; +#ifdef __cplusplus +interface ITypeLibResolver; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -67,19 +71,19 @@ typedef struct ITypeLibResolverVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITypeLibResolver* This, + ITypeLibResolver *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITypeLibResolver* This); + ITypeLibResolver *This); ULONG (STDMETHODCALLTYPE *Release)( - ITypeLibResolver* This); + ITypeLibResolver *This); /*** ITypeLibResolver methods ***/ HRESULT (STDMETHODCALLTYPE *ResolveTypeLib)( - ITypeLibResolver* This, + ITypeLibResolver *This, BSTR bstrSimpleName, GUID tlbid, LCID lcid, @@ -90,6 +94,7 @@ typedef struct ITypeLibResolverVtbl { END_INTERFACE } ITypeLibResolverVtbl; + interface ITypeLibResolver { CONST_VTBL ITypeLibResolverVtbl* lpVtbl; }; @@ -122,20 +127,6 @@ static FORCEINLINE HRESULT ITypeLibResolver_ResolveTypeLib(ITypeLibResolver* Thi #endif -HRESULT STDMETHODCALLTYPE ITypeLibResolver_ResolveTypeLib_Proxy( - ITypeLibResolver* This, - BSTR bstrSimpleName, - GUID tlbid, - LCID lcid, - USHORT wMajorVersion, - USHORT wMinorVersion, - SYSKIND syskind, - BSTR *pbstrResolvedTlbName); -void __RPC_STUB ITypeLibResolver_ResolveTypeLib_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ITypeLibResolver_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/tlogstg.h b/lib/libc/include/any-windows-any/tlogstg.h index cb46f01350..5d7605bdbe 100644 --- a/lib/libc/include/any-windows-any/tlogstg.h +++ b/lib/libc/include/any-windows-any/tlogstg.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/tlogstg.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/tlogstg.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,21 +21,33 @@ #ifndef __ITravelLogEntry_FWD_DEFINED__ #define __ITravelLogEntry_FWD_DEFINED__ typedef interface ITravelLogEntry ITravelLogEntry; +#ifdef __cplusplus +interface ITravelLogEntry; +#endif /* __cplusplus */ #endif #ifndef __ITravelLogClient_FWD_DEFINED__ #define __ITravelLogClient_FWD_DEFINED__ typedef interface ITravelLogClient ITravelLogClient; +#ifdef __cplusplus +interface ITravelLogClient; +#endif /* __cplusplus */ #endif #ifndef __IEnumTravelLogEntry_FWD_DEFINED__ #define __IEnumTravelLogEntry_FWD_DEFINED__ typedef interface IEnumTravelLogEntry IEnumTravelLogEntry; +#ifdef __cplusplus +interface IEnumTravelLogEntry; +#endif /* __cplusplus */ #endif #ifndef __ITravelLogStg_FWD_DEFINED__ #define __ITravelLogStg_FWD_DEFINED__ typedef interface ITravelLogStg ITravelLogStg; +#ifdef __cplusplus +interface ITravelLogStg; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -65,7 +78,6 @@ enum tagTLENUMF { TLEF_ABSOLUTE = 0x31, TLEF_EXCLUDE_SUBFRAME_ENTRIES = 0x80 }; - typedef struct _WINDOWDATA { DWORD dwWindowID; UINT uiCP; @@ -104,27 +116,28 @@ typedef struct ITravelLogEntryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITravelLogEntry* This, + ITravelLogEntry *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITravelLogEntry* This); + ITravelLogEntry *This); ULONG (STDMETHODCALLTYPE *Release)( - ITravelLogEntry* This); + ITravelLogEntry *This); /*** ITravelLogEntry methods ***/ HRESULT (STDMETHODCALLTYPE *GetTitle)( - ITravelLogEntry* This, + ITravelLogEntry *This, LPWSTR *ppszTitle); HRESULT (STDMETHODCALLTYPE *GetURL)( - ITravelLogEntry* This, + ITravelLogEntry *This, LPWSTR *ppszURL); END_INTERFACE } ITravelLogEntryVtbl; + interface ITravelLogEntry { CONST_VTBL ITravelLogEntryVtbl* lpVtbl; }; @@ -161,22 +174,6 @@ static FORCEINLINE HRESULT ITravelLogEntry_GetURL(ITravelLogEntry* This,LPWSTR * #endif -HRESULT STDMETHODCALLTYPE ITravelLogEntry_GetTitle_Proxy( - ITravelLogEntry* This, - LPWSTR *ppszTitle); -void __RPC_STUB ITravelLogEntry_GetTitle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITravelLogEntry_GetURL_Proxy( - ITravelLogEntry* This, - LPWSTR *ppszURL); -void __RPC_STUB ITravelLogEntry_GetURL_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ITravelLogEntry_INTERFACE_DEFINED__ */ @@ -213,34 +210,35 @@ typedef struct ITravelLogClientVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITravelLogClient* This, + ITravelLogClient *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITravelLogClient* This); + ITravelLogClient *This); ULONG (STDMETHODCALLTYPE *Release)( - ITravelLogClient* This); + ITravelLogClient *This); /*** ITravelLogClient methods ***/ HRESULT (STDMETHODCALLTYPE *FindWindowByIndex)( - ITravelLogClient* This, + ITravelLogClient *This, DWORD dwID, IUnknown **ppunk); HRESULT (STDMETHODCALLTYPE *GetWindowData)( - ITravelLogClient* This, + ITravelLogClient *This, IStream *pStream, LPWINDOWDATA pWinData); HRESULT (STDMETHODCALLTYPE *LoadHistoryPosition)( - ITravelLogClient* This, + ITravelLogClient *This, LPWSTR pszUrlLocation, DWORD dwPosition); END_INTERFACE } ITravelLogClientVtbl; + interface ITravelLogClient { CONST_VTBL ITravelLogClientVtbl* lpVtbl; }; @@ -281,33 +279,6 @@ static FORCEINLINE HRESULT ITravelLogClient_LoadHistoryPosition(ITravelLogClient #endif -HRESULT STDMETHODCALLTYPE ITravelLogClient_FindWindowByIndex_Proxy( - ITravelLogClient* This, - DWORD dwID, - IUnknown **ppunk); -void __RPC_STUB ITravelLogClient_FindWindowByIndex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITravelLogClient_GetWindowData_Proxy( - ITravelLogClient* This, - IStream *pStream, - LPWINDOWDATA pWinData); -void __RPC_STUB ITravelLogClient_GetWindowData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITravelLogClient_LoadHistoryPosition_Proxy( - ITravelLogClient* This, - LPWSTR pszUrlLocation, - DWORD dwPosition); -void __RPC_STUB ITravelLogClient_LoadHistoryPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ITravelLogClient_INTERFACE_DEFINED__ */ @@ -346,36 +317,37 @@ typedef struct IEnumTravelLogEntryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumTravelLogEntry* This, + IEnumTravelLogEntry *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumTravelLogEntry* This); + IEnumTravelLogEntry *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumTravelLogEntry* This); + IEnumTravelLogEntry *This); /*** IEnumTravelLogEntry methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IEnumTravelLogEntry* This, + IEnumTravelLogEntry *This, ULONG cElt, ITravelLogEntry **rgElt, ULONG *pcEltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumTravelLogEntry* This, + IEnumTravelLogEntry *This, ULONG cElt); HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumTravelLogEntry* This); + IEnumTravelLogEntry *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumTravelLogEntry* This, + IEnumTravelLogEntry *This, IEnumTravelLogEntry **ppEnum); END_INTERFACE } IEnumTravelLogEntryVtbl; + interface IEnumTravelLogEntry { CONST_VTBL IEnumTravelLogEntryVtbl* lpVtbl; }; @@ -420,39 +392,6 @@ static FORCEINLINE HRESULT IEnumTravelLogEntry_Clone(IEnumTravelLogEntry* This,I #endif -HRESULT STDMETHODCALLTYPE IEnumTravelLogEntry_Next_Proxy( - IEnumTravelLogEntry* This, - ULONG cElt, - ITravelLogEntry **rgElt, - ULONG *pcEltFetched); -void __RPC_STUB IEnumTravelLogEntry_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumTravelLogEntry_Skip_Proxy( - IEnumTravelLogEntry* This, - ULONG cElt); -void __RPC_STUB IEnumTravelLogEntry_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumTravelLogEntry_Reset_Proxy( - IEnumTravelLogEntry* This); -void __RPC_STUB IEnumTravelLogEntry_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumTravelLogEntry_Clone_Proxy( - IEnumTravelLogEntry* This, - IEnumTravelLogEntry **ppEnum); -void __RPC_STUB IEnumTravelLogEntry_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumTravelLogEntry_INTERFACE_DEFINED__ */ @@ -507,19 +446,19 @@ typedef struct ITravelLogStgVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ITravelLogStg* This, + ITravelLogStg *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ITravelLogStg* This); + ITravelLogStg *This); ULONG (STDMETHODCALLTYPE *Release)( - ITravelLogStg* This); + ITravelLogStg *This); /*** ITravelLogStg methods ***/ HRESULT (STDMETHODCALLTYPE *CreateEntry)( - ITravelLogStg* This, + ITravelLogStg *This, LPCWSTR pszUrl, LPCWSTR pszTitle, ITravelLogEntry *ptleRelativeTo, @@ -527,36 +466,37 @@ typedef struct ITravelLogStgVtbl { ITravelLogEntry **pptle); HRESULT (STDMETHODCALLTYPE *TravelTo)( - ITravelLogStg* This, + ITravelLogStg *This, ITravelLogEntry *ptle); HRESULT (STDMETHODCALLTYPE *EnumEntries)( - ITravelLogStg* This, + ITravelLogStg *This, TLENUMF flags, IEnumTravelLogEntry **ppenum); HRESULT (STDMETHODCALLTYPE *FindEntries)( - ITravelLogStg* This, + ITravelLogStg *This, TLENUMF flags, LPCWSTR pszUrl, IEnumTravelLogEntry **ppenum); HRESULT (STDMETHODCALLTYPE *GetCount)( - ITravelLogStg* This, + ITravelLogStg *This, TLENUMF flags, DWORD *pcEntries); HRESULT (STDMETHODCALLTYPE *RemoveEntry)( - ITravelLogStg* This, + ITravelLogStg *This, ITravelLogEntry *ptle); HRESULT (STDMETHODCALLTYPE *GetRelativeEntry)( - ITravelLogStg* This, + ITravelLogStg *This, int iOffset, ITravelLogEntry **ptle); END_INTERFACE } ITravelLogStgVtbl; + interface ITravelLogStg { CONST_VTBL ITravelLogStgVtbl* lpVtbl; }; @@ -613,71 +553,6 @@ static FORCEINLINE HRESULT ITravelLogStg_GetRelativeEntry(ITravelLogStg* This,in #endif -HRESULT STDMETHODCALLTYPE ITravelLogStg_CreateEntry_Proxy( - ITravelLogStg* This, - LPCWSTR pszUrl, - LPCWSTR pszTitle, - ITravelLogEntry *ptleRelativeTo, - WINBOOL fPrepend, - ITravelLogEntry **pptle); -void __RPC_STUB ITravelLogStg_CreateEntry_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITravelLogStg_TravelTo_Proxy( - ITravelLogStg* This, - ITravelLogEntry *ptle); -void __RPC_STUB ITravelLogStg_TravelTo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITravelLogStg_EnumEntries_Proxy( - ITravelLogStg* This, - TLENUMF flags, - IEnumTravelLogEntry **ppenum); -void __RPC_STUB ITravelLogStg_EnumEntries_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITravelLogStg_FindEntries_Proxy( - ITravelLogStg* This, - TLENUMF flags, - LPCWSTR pszUrl, - IEnumTravelLogEntry **ppenum); -void __RPC_STUB ITravelLogStg_FindEntries_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITravelLogStg_GetCount_Proxy( - ITravelLogStg* This, - TLENUMF flags, - DWORD *pcEntries); -void __RPC_STUB ITravelLogStg_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITravelLogStg_RemoveEntry_Proxy( - ITravelLogStg* This, - ITravelLogEntry *ptle); -void __RPC_STUB ITravelLogStg_RemoveEntry_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ITravelLogStg_GetRelativeEntry_Proxy( - ITravelLogStg* This, - int iOffset, - ITravelLogEntry **ptle); -void __RPC_STUB ITravelLogStg_GetRelativeEntry_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ITravelLogStg_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/tpcshrd.h b/lib/libc/include/any-windows-any/tpcshrd.h index b114270f92..e9e4dac906 100644 --- a/lib/libc/include/any-windows-any/tpcshrd.h +++ b/lib/libc/include/any-windows-any/tpcshrd.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/tpcshrd.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/tpcshrd.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/uianimation.h b/lib/libc/include/any-windows-any/uianimation.h index 0518c2a368..3831ab3160 100644 --- a/lib/libc/include/any-windows-any/uianimation.h +++ b/lib/libc/include/any-windows-any/uianimation.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/uianimation.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/uianimation.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/uiautomationclient.h b/lib/libc/include/any-windows-any/uiautomationclient.h index ced69dd2ac..654fd38d17 100644 --- a/lib/libc/include/any-windows-any/uiautomationclient.h +++ b/lib/libc/include/any-windows-any/uiautomationclient.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/uiautomationclient.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from include/uiautomationclient.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/uiautomationcore.h b/lib/libc/include/any-windows-any/uiautomationcore.h index e806ea13da..1bb85e5275 100644 --- a/lib/libc/include/any-windows-any/uiautomationcore.h +++ b/lib/libc/include/any-windows-any/uiautomationcore.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/uiautomationcore.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from include/uiautomationcore.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/uiautomationcoreapi.h b/lib/libc/include/any-windows-any/uiautomationcoreapi.h index a4a0448dbc..52696dcc77 100644 --- a/lib/libc/include/any-windows-any/uiautomationcoreapi.h +++ b/lib/libc/include/any-windows-any/uiautomationcoreapi.h @@ -59,6 +59,7 @@ WINBOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id); LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); WINBOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj); +HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **elprov); #ifdef __cplusplus } diff --git a/lib/libc/include/any-windows-any/uiviewsettingsinterop.h b/lib/libc/include/any-windows-any/uiviewsettingsinterop.h index a097e9f99c..5b6e1d2051 100644 --- a/lib/libc/include/any-windows-any/uiviewsettingsinterop.h +++ b/lib/libc/include/any-windows-any/uiviewsettingsinterop.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/uiviewsettingsinterop.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/uiviewsettingsinterop.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,6 +21,9 @@ #ifndef __IUIViewSettingsInterop_FWD_DEFINED__ #define __IUIViewSettingsInterop_FWD_DEFINED__ typedef interface IUIViewSettingsInterop IUIViewSettingsInterop; +#ifdef __cplusplus +interface IUIViewSettingsInterop; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -56,39 +60,40 @@ typedef struct IUIViewSettingsInteropVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IUIViewSettingsInterop* This, + IUIViewSettingsInterop *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IUIViewSettingsInterop* This); + IUIViewSettingsInterop *This); ULONG (STDMETHODCALLTYPE *Release)( - IUIViewSettingsInterop* This); + IUIViewSettingsInterop *This); /*** IInspectable methods ***/ HRESULT (STDMETHODCALLTYPE *GetIids)( - IUIViewSettingsInterop* This, + IUIViewSettingsInterop *This, ULONG *iidCount, IID **iids); HRESULT (STDMETHODCALLTYPE *GetRuntimeClassName)( - IUIViewSettingsInterop* This, + IUIViewSettingsInterop *This, HSTRING *className); HRESULT (STDMETHODCALLTYPE *GetTrustLevel)( - IUIViewSettingsInterop* This, + IUIViewSettingsInterop *This, TrustLevel *trustLevel); /*** IUIViewSettingsInterop methods ***/ HRESULT (STDMETHODCALLTYPE *GetForWindow)( - IUIViewSettingsInterop* This, + IUIViewSettingsInterop *This, HWND hwnd, REFIID riid, void **ppv); END_INTERFACE } IUIViewSettingsInteropVtbl; + interface IUIViewSettingsInterop { CONST_VTBL IUIViewSettingsInteropVtbl* lpVtbl; }; @@ -135,16 +140,6 @@ static FORCEINLINE HRESULT IUIViewSettingsInterop_GetForWindow(IUIViewSettingsIn #endif -HRESULT STDMETHODCALLTYPE IUIViewSettingsInterop_GetForWindow_Proxy( - IUIViewSettingsInterop* This, - HWND hwnd, - REFIID riid, - void **ppv); -void __RPC_STUB IUIViewSettingsInterop_GetForWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IUIViewSettingsInterop_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/unknwnbase.h b/lib/libc/include/any-windows-any/unknwnbase.h index 297f884b4a..e672b9c705 100644 --- a/lib/libc/include/any-windows-any/unknwnbase.h +++ b/lib/libc/include/any-windows-any/unknwnbase.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/unknwnbase.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.14 from include/unknwnbase.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,16 +21,25 @@ #ifndef __IUnknown_FWD_DEFINED__ #define __IUnknown_FWD_DEFINED__ typedef interface IUnknown IUnknown; +#ifdef __cplusplus +interface IUnknown; +#endif /* __cplusplus */ #endif #ifndef __AsyncIUnknown_FWD_DEFINED__ #define __AsyncIUnknown_FWD_DEFINED__ typedef interface AsyncIUnknown AsyncIUnknown; +#ifdef __cplusplus +interface AsyncIUnknown; +#endif /* __cplusplus */ #endif #ifndef __IClassFactory_FWD_DEFINED__ #define __IClassFactory_FWD_DEFINED__ typedef interface IClassFactory IClassFactory; +#ifdef __cplusplus +interface IClassFactory; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -89,6 +99,7 @@ DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00, MIDL_INTERFACE("00000000-0000-0000-c000-000000000046") IUnknown { + BEGIN_INTERFACE virtual HRESULT STDMETHODCALLTYPE QueryInterface( @@ -102,6 +113,7 @@ IUnknown ) = 0; END_INTERFACE + }; #ifdef __CRT_UUID_DECL __CRT_UUID_DECL(IUnknown, 0x00000000, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46) @@ -112,18 +124,19 @@ typedef struct IUnknownVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IUnknown* This, + IUnknown *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IUnknown* This); + IUnknown *This); ULONG (STDMETHODCALLTYPE *Release)( - IUnknown* This); + IUnknown *This); END_INTERFACE } IUnknownVtbl; + interface IUnknown { CONST_VTBL IUnknownVtbl* lpVtbl; }; @@ -150,29 +163,6 @@ static FORCEINLINE ULONG IUnknown_Release(IUnknown* This) { #endif -HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy( - IUnknown* This, - REFIID riid, - void **ppvObject); -void __RPC_STUB IUnknown_QueryInterface_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -ULONG STDMETHODCALLTYPE IUnknown_AddRef_Proxy( - IUnknown* This); -void __RPC_STUB IUnknown_AddRef_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -ULONG STDMETHODCALLTYPE IUnknown_Release_Proxy( - IUnknown* This); -void __RPC_STUB IUnknown_Release_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IUnknown_INTERFACE_DEFINED__ */ @@ -219,39 +209,40 @@ typedef struct AsyncIUnknownVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - AsyncIUnknown* This, + AsyncIUnknown *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - AsyncIUnknown* This); + AsyncIUnknown *This); ULONG (STDMETHODCALLTYPE *Release)( - AsyncIUnknown* This); + AsyncIUnknown *This); /*** AsyncIUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *Begin_QueryInterface)( - AsyncIUnknown* This, + AsyncIUnknown *This, REFIID riid); HRESULT (STDMETHODCALLTYPE *Finish_QueryInterface)( - AsyncIUnknown* This, + AsyncIUnknown *This, void **ppvObject); HRESULT (STDMETHODCALLTYPE *Begin_AddRef)( - AsyncIUnknown* This); + AsyncIUnknown *This); ULONG (STDMETHODCALLTYPE *Finish_AddRef)( - AsyncIUnknown* This); + AsyncIUnknown *This); HRESULT (STDMETHODCALLTYPE *Begin_Release)( - AsyncIUnknown* This); + AsyncIUnknown *This); ULONG (STDMETHODCALLTYPE *Finish_Release)( - AsyncIUnknown* This); + AsyncIUnknown *This); END_INTERFACE } AsyncIUnknownVtbl; + interface AsyncIUnknown { CONST_VTBL AsyncIUnknownVtbl* lpVtbl; }; @@ -304,50 +295,6 @@ static FORCEINLINE ULONG AsyncIUnknown_Finish_Release(AsyncIUnknown* This) { #endif -HRESULT STDMETHODCALLTYPE AsyncIUnknown_Begin_QueryInterface_Proxy( - AsyncIUnknown* This, - REFIID riid); -void __RPC_STUB AsyncIUnknown_Begin_QueryInterface_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE AsyncIUnknown_Finish_QueryInterface_Proxy( - AsyncIUnknown* This, - void **ppvObject); -void __RPC_STUB AsyncIUnknown_Finish_QueryInterface_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE AsyncIUnknown_Begin_AddRef_Proxy( - AsyncIUnknown* This); -void __RPC_STUB AsyncIUnknown_Begin_AddRef_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -ULONG STDMETHODCALLTYPE AsyncIUnknown_Finish_AddRef_Proxy( - AsyncIUnknown* This); -void __RPC_STUB AsyncIUnknown_Finish_AddRef_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE AsyncIUnknown_Begin_Release_Proxy( - AsyncIUnknown* This); -void __RPC_STUB AsyncIUnknown_Begin_Release_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -ULONG STDMETHODCALLTYPE AsyncIUnknown_Finish_Release_Proxy( - AsyncIUnknown* This); -void __RPC_STUB AsyncIUnknown_Finish_Release_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __AsyncIUnknown_INTERFACE_DEFINED__ */ @@ -385,29 +332,30 @@ typedef struct IClassFactoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IClassFactory* This, + IClassFactory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IClassFactory* This); + IClassFactory *This); ULONG (STDMETHODCALLTYPE *Release)( - IClassFactory* This); + IClassFactory *This); /*** IClassFactory methods ***/ HRESULT (STDMETHODCALLTYPE *CreateInstance)( - IClassFactory* This, + IClassFactory *This, IUnknown *pUnkOuter, REFIID riid, void **ppvObject); HRESULT (STDMETHODCALLTYPE *LockServer)( - IClassFactory* This, + IClassFactory *This, WINBOOL fLock); END_INTERFACE } IClassFactoryVtbl; + interface IClassFactory { CONST_VTBL IClassFactoryVtbl* lpVtbl; }; diff --git a/lib/libc/include/any-windows-any/urlhist.h b/lib/libc/include/any-windows-any/urlhist.h index aeb13a6784..6b2858ee61 100644 --- a/lib/libc/include/any-windows-any/urlhist.h +++ b/lib/libc/include/any-windows-any/urlhist.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/urlhist.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from include/urlhist.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/urlmon.h b/lib/libc/include/any-windows-any/urlmon.h index e1b6287af6..79ee2b4198 100644 --- a/lib/libc/include/any-windows-any/urlmon.h +++ b/lib/libc/include/any-windows-any/urlmon.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/urlmon.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/urlmon.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,266 +21,425 @@ #ifndef __IPersistMoniker_FWD_DEFINED__ #define __IPersistMoniker_FWD_DEFINED__ typedef interface IPersistMoniker IPersistMoniker; +#ifdef __cplusplus +interface IPersistMoniker; +#endif /* __cplusplus */ #endif #ifndef __IMonikerProp_FWD_DEFINED__ #define __IMonikerProp_FWD_DEFINED__ typedef interface IMonikerProp IMonikerProp; +#ifdef __cplusplus +interface IMonikerProp; +#endif /* __cplusplus */ #endif #ifndef __IBindProtocol_FWD_DEFINED__ #define __IBindProtocol_FWD_DEFINED__ typedef interface IBindProtocol IBindProtocol; +#ifdef __cplusplus +interface IBindProtocol; +#endif /* __cplusplus */ #endif #ifndef __IBinding_FWD_DEFINED__ #define __IBinding_FWD_DEFINED__ typedef interface IBinding IBinding; +#ifdef __cplusplus +interface IBinding; +#endif /* __cplusplus */ #endif #ifndef __IBindStatusCallback_FWD_DEFINED__ #define __IBindStatusCallback_FWD_DEFINED__ typedef interface IBindStatusCallback IBindStatusCallback; +#ifdef __cplusplus +interface IBindStatusCallback; +#endif /* __cplusplus */ #endif #ifndef __IBindStatusCallbackEx_FWD_DEFINED__ #define __IBindStatusCallbackEx_FWD_DEFINED__ typedef interface IBindStatusCallbackEx IBindStatusCallbackEx; +#ifdef __cplusplus +interface IBindStatusCallbackEx; +#endif /* __cplusplus */ #endif #ifndef __IAuthenticate_FWD_DEFINED__ #define __IAuthenticate_FWD_DEFINED__ typedef interface IAuthenticate IAuthenticate; +#ifdef __cplusplus +interface IAuthenticate; +#endif /* __cplusplus */ #endif #ifndef __IAuthenticateEx_FWD_DEFINED__ #define __IAuthenticateEx_FWD_DEFINED__ typedef interface IAuthenticateEx IAuthenticateEx; +#ifdef __cplusplus +interface IAuthenticateEx; +#endif /* __cplusplus */ #endif #ifndef __IHttpNegotiate_FWD_DEFINED__ #define __IHttpNegotiate_FWD_DEFINED__ typedef interface IHttpNegotiate IHttpNegotiate; +#ifdef __cplusplus +interface IHttpNegotiate; +#endif /* __cplusplus */ #endif #ifndef __IHttpNegotiate2_FWD_DEFINED__ #define __IHttpNegotiate2_FWD_DEFINED__ typedef interface IHttpNegotiate2 IHttpNegotiate2; +#ifdef __cplusplus +interface IHttpNegotiate2; +#endif /* __cplusplus */ #endif #ifndef __IHttpNegotiate3_FWD_DEFINED__ #define __IHttpNegotiate3_FWD_DEFINED__ typedef interface IHttpNegotiate3 IHttpNegotiate3; +#ifdef __cplusplus +interface IHttpNegotiate3; +#endif /* __cplusplus */ #endif #ifndef __IWinInetFileStream_FWD_DEFINED__ #define __IWinInetFileStream_FWD_DEFINED__ typedef interface IWinInetFileStream IWinInetFileStream; +#ifdef __cplusplus +interface IWinInetFileStream; +#endif /* __cplusplus */ #endif #ifndef __IWindowForBindingUI_FWD_DEFINED__ #define __IWindowForBindingUI_FWD_DEFINED__ typedef interface IWindowForBindingUI IWindowForBindingUI; +#ifdef __cplusplus +interface IWindowForBindingUI; +#endif /* __cplusplus */ #endif #ifndef __ICodeInstall_FWD_DEFINED__ #define __ICodeInstall_FWD_DEFINED__ typedef interface ICodeInstall ICodeInstall; +#ifdef __cplusplus +interface ICodeInstall; +#endif /* __cplusplus */ #endif #ifndef __IUri_FWD_DEFINED__ #define __IUri_FWD_DEFINED__ typedef interface IUri IUri; +#ifdef __cplusplus +interface IUri; +#endif /* __cplusplus */ #endif #ifndef __IUriContainer_FWD_DEFINED__ #define __IUriContainer_FWD_DEFINED__ typedef interface IUriContainer IUriContainer; +#ifdef __cplusplus +interface IUriContainer; +#endif /* __cplusplus */ #endif #ifndef __IUriBuilder_FWD_DEFINED__ #define __IUriBuilder_FWD_DEFINED__ typedef interface IUriBuilder IUriBuilder; +#ifdef __cplusplus +interface IUriBuilder; +#endif /* __cplusplus */ #endif #ifndef __IUriBuilderFactory_FWD_DEFINED__ #define __IUriBuilderFactory_FWD_DEFINED__ typedef interface IUriBuilderFactory IUriBuilderFactory; +#ifdef __cplusplus +interface IUriBuilderFactory; +#endif /* __cplusplus */ #endif #ifndef __IWinInetInfo_FWD_DEFINED__ #define __IWinInetInfo_FWD_DEFINED__ typedef interface IWinInetInfo IWinInetInfo; +#ifdef __cplusplus +interface IWinInetInfo; +#endif /* __cplusplus */ #endif #ifndef __IHttpSecurity_FWD_DEFINED__ #define __IHttpSecurity_FWD_DEFINED__ typedef interface IHttpSecurity IHttpSecurity; +#ifdef __cplusplus +interface IHttpSecurity; +#endif /* __cplusplus */ #endif #ifndef __IWinInetHttpInfo_FWD_DEFINED__ #define __IWinInetHttpInfo_FWD_DEFINED__ typedef interface IWinInetHttpInfo IWinInetHttpInfo; +#ifdef __cplusplus +interface IWinInetHttpInfo; +#endif /* __cplusplus */ #endif #ifndef __IWinInetHttpTimeouts_FWD_DEFINED__ #define __IWinInetHttpTimeouts_FWD_DEFINED__ typedef interface IWinInetHttpTimeouts IWinInetHttpTimeouts; +#ifdef __cplusplus +interface IWinInetHttpTimeouts; +#endif /* __cplusplus */ #endif #ifndef __IWinInetCacheHints_FWD_DEFINED__ #define __IWinInetCacheHints_FWD_DEFINED__ typedef interface IWinInetCacheHints IWinInetCacheHints; +#ifdef __cplusplus +interface IWinInetCacheHints; +#endif /* __cplusplus */ #endif #ifndef __IWinInetCacheHints2_FWD_DEFINED__ #define __IWinInetCacheHints2_FWD_DEFINED__ typedef interface IWinInetCacheHints2 IWinInetCacheHints2; +#ifdef __cplusplus +interface IWinInetCacheHints2; +#endif /* __cplusplus */ #endif #ifndef __IBindHost_FWD_DEFINED__ #define __IBindHost_FWD_DEFINED__ typedef interface IBindHost IBindHost; +#ifdef __cplusplus +interface IBindHost; +#endif /* __cplusplus */ #endif #ifndef __IInternet_FWD_DEFINED__ #define __IInternet_FWD_DEFINED__ typedef interface IInternet IInternet; +#ifdef __cplusplus +interface IInternet; +#endif /* __cplusplus */ #endif #ifndef __IInternetBindInfo_FWD_DEFINED__ #define __IInternetBindInfo_FWD_DEFINED__ typedef interface IInternetBindInfo IInternetBindInfo; +#ifdef __cplusplus +interface IInternetBindInfo; +#endif /* __cplusplus */ #endif #ifndef __IInternetBindInfoEx_FWD_DEFINED__ #define __IInternetBindInfoEx_FWD_DEFINED__ typedef interface IInternetBindInfoEx IInternetBindInfoEx; +#ifdef __cplusplus +interface IInternetBindInfoEx; +#endif /* __cplusplus */ #endif #ifndef __IInternetProtocolRoot_FWD_DEFINED__ #define __IInternetProtocolRoot_FWD_DEFINED__ typedef interface IInternetProtocolRoot IInternetProtocolRoot; +#ifdef __cplusplus +interface IInternetProtocolRoot; +#endif /* __cplusplus */ #endif #ifndef __IInternetProtocol_FWD_DEFINED__ #define __IInternetProtocol_FWD_DEFINED__ typedef interface IInternetProtocol IInternetProtocol; +#ifdef __cplusplus +interface IInternetProtocol; +#endif /* __cplusplus */ #endif #ifndef __IInternetProtocolEx_FWD_DEFINED__ #define __IInternetProtocolEx_FWD_DEFINED__ typedef interface IInternetProtocolEx IInternetProtocolEx; +#ifdef __cplusplus +interface IInternetProtocolEx; +#endif /* __cplusplus */ #endif #ifndef __IInternetProtocolSink_FWD_DEFINED__ #define __IInternetProtocolSink_FWD_DEFINED__ typedef interface IInternetProtocolSink IInternetProtocolSink; +#ifdef __cplusplus +interface IInternetProtocolSink; +#endif /* __cplusplus */ #endif #ifndef __IInternetProtocolSinkStackable_FWD_DEFINED__ #define __IInternetProtocolSinkStackable_FWD_DEFINED__ typedef interface IInternetProtocolSinkStackable IInternetProtocolSinkStackable; +#ifdef __cplusplus +interface IInternetProtocolSinkStackable; +#endif /* __cplusplus */ #endif #ifndef __IInternetSession_FWD_DEFINED__ #define __IInternetSession_FWD_DEFINED__ typedef interface IInternetSession IInternetSession; +#ifdef __cplusplus +interface IInternetSession; +#endif /* __cplusplus */ #endif #ifndef __IInternetThreadSwitch_FWD_DEFINED__ #define __IInternetThreadSwitch_FWD_DEFINED__ typedef interface IInternetThreadSwitch IInternetThreadSwitch; +#ifdef __cplusplus +interface IInternetThreadSwitch; +#endif /* __cplusplus */ #endif #ifndef __IInternetPriority_FWD_DEFINED__ #define __IInternetPriority_FWD_DEFINED__ typedef interface IInternetPriority IInternetPriority; +#ifdef __cplusplus +interface IInternetPriority; +#endif /* __cplusplus */ #endif #ifndef __IInternetProtocolInfo_FWD_DEFINED__ #define __IInternetProtocolInfo_FWD_DEFINED__ typedef interface IInternetProtocolInfo IInternetProtocolInfo; +#ifdef __cplusplus +interface IInternetProtocolInfo; +#endif /* __cplusplus */ #endif #ifndef __IInternetSecurityMgrSite_FWD_DEFINED__ #define __IInternetSecurityMgrSite_FWD_DEFINED__ typedef interface IInternetSecurityMgrSite IInternetSecurityMgrSite; +#ifdef __cplusplus +interface IInternetSecurityMgrSite; +#endif /* __cplusplus */ #endif #ifndef __IInternetSecurityManager_FWD_DEFINED__ #define __IInternetSecurityManager_FWD_DEFINED__ typedef interface IInternetSecurityManager IInternetSecurityManager; +#ifdef __cplusplus +interface IInternetSecurityManager; +#endif /* __cplusplus */ #endif #ifndef __IInternetSecurityManagerEx_FWD_DEFINED__ #define __IInternetSecurityManagerEx_FWD_DEFINED__ typedef interface IInternetSecurityManagerEx IInternetSecurityManagerEx; +#ifdef __cplusplus +interface IInternetSecurityManagerEx; +#endif /* __cplusplus */ #endif #ifndef __IInternetSecurityManagerEx2_FWD_DEFINED__ #define __IInternetSecurityManagerEx2_FWD_DEFINED__ typedef interface IInternetSecurityManagerEx2 IInternetSecurityManagerEx2; +#ifdef __cplusplus +interface IInternetSecurityManagerEx2; +#endif /* __cplusplus */ #endif #ifndef __IZoneIdentifier_FWD_DEFINED__ #define __IZoneIdentifier_FWD_DEFINED__ typedef interface IZoneIdentifier IZoneIdentifier; +#ifdef __cplusplus +interface IZoneIdentifier; +#endif /* __cplusplus */ #endif #ifndef __IInternetHostSecurityManager_FWD_DEFINED__ #define __IInternetHostSecurityManager_FWD_DEFINED__ typedef interface IInternetHostSecurityManager IInternetHostSecurityManager; +#ifdef __cplusplus +interface IInternetHostSecurityManager; +#endif /* __cplusplus */ #endif #ifndef __IInternetZoneManager_FWD_DEFINED__ #define __IInternetZoneManager_FWD_DEFINED__ typedef interface IInternetZoneManager IInternetZoneManager; +#ifdef __cplusplus +interface IInternetZoneManager; +#endif /* __cplusplus */ #endif #ifndef __IInternetZoneManagerEx_FWD_DEFINED__ #define __IInternetZoneManagerEx_FWD_DEFINED__ typedef interface IInternetZoneManagerEx IInternetZoneManagerEx; +#ifdef __cplusplus +interface IInternetZoneManagerEx; +#endif /* __cplusplus */ #endif #ifndef __IInternetZoneManagerEx2_FWD_DEFINED__ #define __IInternetZoneManagerEx2_FWD_DEFINED__ typedef interface IInternetZoneManagerEx2 IInternetZoneManagerEx2; +#ifdef __cplusplus +interface IInternetZoneManagerEx2; +#endif /* __cplusplus */ #endif #ifndef __ISoftDistExt_FWD_DEFINED__ #define __ISoftDistExt_FWD_DEFINED__ typedef interface ISoftDistExt ISoftDistExt; +#ifdef __cplusplus +interface ISoftDistExt; +#endif /* __cplusplus */ #endif #ifndef __ICatalogFileInfo_FWD_DEFINED__ #define __ICatalogFileInfo_FWD_DEFINED__ typedef interface ICatalogFileInfo ICatalogFileInfo; +#ifdef __cplusplus +interface ICatalogFileInfo; +#endif /* __cplusplus */ #endif #ifndef __IDataFilter_FWD_DEFINED__ #define __IDataFilter_FWD_DEFINED__ typedef interface IDataFilter IDataFilter; +#ifdef __cplusplus +interface IDataFilter; +#endif /* __cplusplus */ #endif #ifndef __IEncodingFilterFactory_FWD_DEFINED__ #define __IEncodingFilterFactory_FWD_DEFINED__ typedef interface IEncodingFilterFactory IEncodingFilterFactory; +#ifdef __cplusplus +interface IEncodingFilterFactory; +#endif /* __cplusplus */ #endif #ifndef __IWrappedProtocol_FWD_DEFINED__ #define __IWrappedProtocol_FWD_DEFINED__ typedef interface IWrappedProtocol IWrappedProtocol; +#ifdef __cplusplus +interface IWrappedProtocol; +#endif /* __cplusplus */ #endif #ifndef __IGetBindHandle_FWD_DEFINED__ #define __IGetBindHandle_FWD_DEFINED__ typedef interface IGetBindHandle IGetBindHandle; +#ifdef __cplusplus +interface IGetBindHandle; +#endif /* __cplusplus */ #endif #ifndef __IBindCallbackRedirect_FWD_DEFINED__ #define __IBindCallbackRedirect_FWD_DEFINED__ typedef interface IBindCallbackRedirect IBindCallbackRedirect; +#ifdef __cplusplus +interface IBindCallbackRedirect; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -306,76 +466,121 @@ extern "C" { #ifndef __IPersistMoniker_FWD_DEFINED__ #define __IPersistMoniker_FWD_DEFINED__ typedef interface IPersistMoniker IPersistMoniker; +#ifdef __cplusplus +interface IPersistMoniker; +#endif /* __cplusplus */ #endif #ifndef __IBindProtocol_FWD_DEFINED__ #define __IBindProtocol_FWD_DEFINED__ typedef interface IBindProtocol IBindProtocol; +#ifdef __cplusplus +interface IBindProtocol; +#endif /* __cplusplus */ #endif #ifndef __IBinding_FWD_DEFINED__ #define __IBinding_FWD_DEFINED__ typedef interface IBinding IBinding; +#ifdef __cplusplus +interface IBinding; +#endif /* __cplusplus */ #endif #ifndef __IBindStatusCallback_FWD_DEFINED__ #define __IBindStatusCallback_FWD_DEFINED__ typedef interface IBindStatusCallback IBindStatusCallback; +#ifdef __cplusplus +interface IBindStatusCallback; +#endif /* __cplusplus */ #endif #ifndef __IBindStatusCallbackEx_FWD_DEFINED__ #define __IBindStatusCallbackEx_FWD_DEFINED__ typedef interface IBindStatusCallbackEx IBindStatusCallbackEx; +#ifdef __cplusplus +interface IBindStatusCallbackEx; +#endif /* __cplusplus */ #endif #ifndef __IBindStatusCallbackMsg_FWD_DEFINED__ #define __IBindStatusCallbackMsg_FWD_DEFINED__ typedef interface IBindStatusCallbackMsg IBindStatusCallbackMsg; +#ifdef __cplusplus +interface IBindStatusCallbackMsg; +#endif /* __cplusplus */ #endif #ifndef __IAuthenticate_FWD_DEFINED__ #define __IAuthenticate_FWD_DEFINED__ typedef interface IAuthenticate IAuthenticate; +#ifdef __cplusplus +interface IAuthenticate; +#endif /* __cplusplus */ #endif #ifndef __IAuthenticateEx_FWD_DEFINED__ #define __IAuthenticateEx_FWD_DEFINED__ typedef interface IAuthenticateEx IAuthenticateEx; +#ifdef __cplusplus +interface IAuthenticateEx; +#endif /* __cplusplus */ #endif #ifndef __IWindowForBindingUI_FWD_DEFINED__ #define __IWindowForBindingUI_FWD_DEFINED__ typedef interface IWindowForBindingUI IWindowForBindingUI; +#ifdef __cplusplus +interface IWindowForBindingUI; +#endif /* __cplusplus */ #endif #ifndef __ICodeInstall_FWD_DEFINED__ #define __ICodeInstall_FWD_DEFINED__ typedef interface ICodeInstall ICodeInstall; +#ifdef __cplusplus +interface ICodeInstall; +#endif /* __cplusplus */ #endif #ifndef __IHttpNegotiate_FWD_DEFINED__ #define __IHttpNegotiate_FWD_DEFINED__ typedef interface IHttpNegotiate IHttpNegotiate; +#ifdef __cplusplus +interface IHttpNegotiate; +#endif /* __cplusplus */ #endif #ifndef __IHttpNegotiate2_FWD_DEFINED__ #define __IHttpNegotiate2_FWD_DEFINED__ typedef interface IHttpNegotiate2 IHttpNegotiate2; +#ifdef __cplusplus +interface IHttpNegotiate2; +#endif /* __cplusplus */ #endif #ifndef __IHttpNegotiate3_FWD_DEFINED__ #define __IHttpNegotiate3_FWD_DEFINED__ typedef interface IHttpNegotiate3 IHttpNegotiate3; +#ifdef __cplusplus +interface IHttpNegotiate3; +#endif /* __cplusplus */ #endif #ifndef __IWinInetFileStream_FWD_DEFINED__ #define __IWinInetFileStream_FWD_DEFINED__ typedef interface IWinInetFileStream IWinInetFileStream; +#ifdef __cplusplus +interface IWinInetFileStream; +#endif /* __cplusplus */ #endif #ifndef __IXMLElement_FWD_DEFINED__ #define __IXMLElement_FWD_DEFINED__ typedef interface IXMLElement IXMLElement; +#ifdef __cplusplus +interface IXMLElement; +#endif /* __cplusplus */ #endif @@ -628,48 +833,49 @@ typedef struct IPersistMonikerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IPersistMoniker* This, + IPersistMoniker *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IPersistMoniker* This); + IPersistMoniker *This); ULONG (STDMETHODCALLTYPE *Release)( - IPersistMoniker* This); + IPersistMoniker *This); /*** IPersistMoniker methods ***/ HRESULT (STDMETHODCALLTYPE *GetClassID)( - IPersistMoniker* This, + IPersistMoniker *This, CLSID *pClassID); HRESULT (STDMETHODCALLTYPE *IsDirty)( - IPersistMoniker* This); + IPersistMoniker *This); HRESULT (STDMETHODCALLTYPE *Load)( - IPersistMoniker* This, + IPersistMoniker *This, WINBOOL fFullyAvailable, IMoniker *pimkName, LPBC pibc, DWORD grfMode); HRESULT (STDMETHODCALLTYPE *Save)( - IPersistMoniker* This, + IPersistMoniker *This, IMoniker *pimkName, LPBC pbc, WINBOOL fRemember); HRESULT (STDMETHODCALLTYPE *SaveCompleted)( - IPersistMoniker* This, + IPersistMoniker *This, IMoniker *pimkName, LPBC pibc); HRESULT (STDMETHODCALLTYPE *GetCurMoniker)( - IPersistMoniker* This, + IPersistMoniker *This, IMoniker **ppimkName); END_INTERFACE } IPersistMonikerVtbl; + interface IPersistMoniker { CONST_VTBL IPersistMonikerVtbl* lpVtbl; }; @@ -722,59 +928,6 @@ static FORCEINLINE HRESULT IPersistMoniker_GetCurMoniker(IPersistMoniker* This,I #endif -HRESULT STDMETHODCALLTYPE IPersistMoniker_GetClassID_Proxy( - IPersistMoniker* This, - CLSID *pClassID); -void __RPC_STUB IPersistMoniker_GetClassID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPersistMoniker_IsDirty_Proxy( - IPersistMoniker* This); -void __RPC_STUB IPersistMoniker_IsDirty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPersistMoniker_Load_Proxy( - IPersistMoniker* This, - WINBOOL fFullyAvailable, - IMoniker *pimkName, - LPBC pibc, - DWORD grfMode); -void __RPC_STUB IPersistMoniker_Load_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPersistMoniker_Save_Proxy( - IPersistMoniker* This, - IMoniker *pimkName, - LPBC pbc, - WINBOOL fRemember); -void __RPC_STUB IPersistMoniker_Save_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPersistMoniker_SaveCompleted_Proxy( - IPersistMoniker* This, - IMoniker *pimkName, - LPBC pibc); -void __RPC_STUB IPersistMoniker_SaveCompleted_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IPersistMoniker_GetCurMoniker_Proxy( - IPersistMoniker* This, - IMoniker **ppimkName); -void __RPC_STUB IPersistMoniker_GetCurMoniker_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IPersistMoniker_INTERFACE_DEFINED__ */ @@ -817,24 +970,25 @@ typedef struct IMonikerPropVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMonikerProp* This, + IMonikerProp *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMonikerProp* This); + IMonikerProp *This); ULONG (STDMETHODCALLTYPE *Release)( - IMonikerProp* This); + IMonikerProp *This); /*** IMonikerProp methods ***/ HRESULT (STDMETHODCALLTYPE *PutProperty)( - IMonikerProp* This, + IMonikerProp *This, MONIKERPROPERTY mkp, LPCWSTR val); END_INTERFACE } IMonikerPropVtbl; + interface IMonikerProp { CONST_VTBL IMonikerPropVtbl* lpVtbl; }; @@ -867,15 +1021,6 @@ static FORCEINLINE HRESULT IMonikerProp_PutProperty(IMonikerProp* This,MONIKERPR #endif -HRESULT STDMETHODCALLTYPE IMonikerProp_PutProperty_Proxy( - IMonikerProp* This, - MONIKERPROPERTY mkp, - LPCWSTR val); -void __RPC_STUB IMonikerProp_PutProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMonikerProp_INTERFACE_DEFINED__ */ @@ -912,25 +1057,26 @@ typedef struct IBindProtocolVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IBindProtocol* This, + IBindProtocol *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IBindProtocol* This); + IBindProtocol *This); ULONG (STDMETHODCALLTYPE *Release)( - IBindProtocol* This); + IBindProtocol *This); /*** IBindProtocol methods ***/ HRESULT (STDMETHODCALLTYPE *CreateBinding)( - IBindProtocol* This, + IBindProtocol *This, LPCWSTR szUrl, IBindCtx *pbc, IBinding **ppb); END_INTERFACE } IBindProtocolVtbl; + interface IBindProtocol { CONST_VTBL IBindProtocolVtbl* lpVtbl; }; @@ -963,16 +1109,6 @@ static FORCEINLINE HRESULT IBindProtocol_CreateBinding(IBindProtocol* This,LPCWS #endif -HRESULT STDMETHODCALLTYPE IBindProtocol_CreateBinding_Proxy( - IBindProtocol* This, - LPCWSTR szUrl, - IBindCtx *pbc, - IBinding **ppb); -void __RPC_STUB IBindProtocol_CreateBinding_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IBindProtocol_INTERFACE_DEFINED__ */ @@ -1025,36 +1161,36 @@ typedef struct IBindingVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IBinding* This, + IBinding *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IBinding* This); + IBinding *This); ULONG (STDMETHODCALLTYPE *Release)( - IBinding* This); + IBinding *This); /*** IBinding methods ***/ HRESULT (STDMETHODCALLTYPE *Abort)( - IBinding* This); + IBinding *This); HRESULT (STDMETHODCALLTYPE *Suspend)( - IBinding* This); + IBinding *This); HRESULT (STDMETHODCALLTYPE *Resume)( - IBinding* This); + IBinding *This); HRESULT (STDMETHODCALLTYPE *SetPriority)( - IBinding* This, + IBinding *This, LONG nPriority); HRESULT (STDMETHODCALLTYPE *GetPriority)( - IBinding* This, + IBinding *This, LONG *pnPriority); HRESULT (STDMETHODCALLTYPE *GetBindResult)( - IBinding* This, + IBinding *This, CLSID *pclsidProtocol, DWORD *pdwResult, LPOLESTR *pszResult, @@ -1062,6 +1198,7 @@ typedef struct IBindingVtbl { END_INTERFACE } IBindingVtbl; + interface IBinding { CONST_VTBL IBindingVtbl* lpVtbl; }; @@ -1114,43 +1251,6 @@ static FORCEINLINE HRESULT IBinding_GetBindResult(IBinding* This,CLSID *pclsidPr #endif -HRESULT STDMETHODCALLTYPE IBinding_Abort_Proxy( - IBinding* This); -void __RPC_STUB IBinding_Abort_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IBinding_Suspend_Proxy( - IBinding* This); -void __RPC_STUB IBinding_Suspend_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IBinding_Resume_Proxy( - IBinding* This); -void __RPC_STUB IBinding_Resume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IBinding_SetPriority_Proxy( - IBinding* This, - LONG nPriority); -void __RPC_STUB IBinding_SetPriority_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IBinding_GetPriority_Proxy( - IBinding* This, - LONG *pnPriority); -void __RPC_STUB IBinding_GetPriority_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE IBinding_RemoteGetBindResult_Proxy( IBinding* This, CLSID *pclsidProtocol, @@ -1443,61 +1543,62 @@ typedef struct IBindStatusCallbackVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IBindStatusCallback* This, + IBindStatusCallback *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IBindStatusCallback* This); + IBindStatusCallback *This); ULONG (STDMETHODCALLTYPE *Release)( - IBindStatusCallback* This); + IBindStatusCallback *This); /*** IBindStatusCallback methods ***/ HRESULT (STDMETHODCALLTYPE *OnStartBinding)( - IBindStatusCallback* This, + IBindStatusCallback *This, DWORD dwReserved, IBinding *pib); HRESULT (STDMETHODCALLTYPE *GetPriority)( - IBindStatusCallback* This, + IBindStatusCallback *This, LONG *pnPriority); HRESULT (STDMETHODCALLTYPE *OnLowResource)( - IBindStatusCallback* This, + IBindStatusCallback *This, DWORD reserved); HRESULT (STDMETHODCALLTYPE *OnProgress)( - IBindStatusCallback* This, + IBindStatusCallback *This, ULONG ulProgress, ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText); HRESULT (STDMETHODCALLTYPE *OnStopBinding)( - IBindStatusCallback* This, + IBindStatusCallback *This, HRESULT hresult, LPCWSTR szError); HRESULT (STDMETHODCALLTYPE *GetBindInfo)( - IBindStatusCallback* This, + IBindStatusCallback *This, DWORD *grfBINDF, BINDINFO *pbindinfo); HRESULT (STDMETHODCALLTYPE *OnDataAvailable)( - IBindStatusCallback* This, + IBindStatusCallback *This, DWORD grfBSCF, DWORD dwSize, FORMATETC *pformatetc, STGMEDIUM *pstgmed); HRESULT (STDMETHODCALLTYPE *OnObjectAvailable)( - IBindStatusCallback* This, + IBindStatusCallback *This, REFIID riid, IUnknown *punk); END_INTERFACE } IBindStatusCallbackVtbl; + interface IBindStatusCallback { CONST_VTBL IBindStatusCallbackVtbl* lpVtbl; }; @@ -1558,51 +1659,6 @@ static FORCEINLINE HRESULT IBindStatusCallback_OnObjectAvailable(IBindStatusCall #endif -HRESULT STDMETHODCALLTYPE IBindStatusCallback_OnStartBinding_Proxy( - IBindStatusCallback* This, - DWORD dwReserved, - IBinding *pib); -void __RPC_STUB IBindStatusCallback_OnStartBinding_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IBindStatusCallback_GetPriority_Proxy( - IBindStatusCallback* This, - LONG *pnPriority); -void __RPC_STUB IBindStatusCallback_GetPriority_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IBindStatusCallback_OnLowResource_Proxy( - IBindStatusCallback* This, - DWORD reserved); -void __RPC_STUB IBindStatusCallback_OnLowResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IBindStatusCallback_OnProgress_Proxy( - IBindStatusCallback* This, - ULONG ulProgress, - ULONG ulProgressMax, - ULONG ulStatusCode, - LPCWSTR szStatusText); -void __RPC_STUB IBindStatusCallback_OnProgress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IBindStatusCallback_OnStopBinding_Proxy( - IBindStatusCallback* This, - HRESULT hresult, - LPCWSTR szError); -void __RPC_STUB IBindStatusCallback_OnStopBinding_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE IBindStatusCallback_RemoteGetBindInfo_Proxy( IBindStatusCallback* This, DWORD *grfBINDF, @@ -1624,15 +1680,6 @@ void __RPC_STUB IBindStatusCallback_RemoteOnDataAvailable_Stub( IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IBindStatusCallback_OnObjectAvailable_Proxy( - IBindStatusCallback* This, - REFIID riid, - IUnknown *punk); -void __RPC_STUB IBindStatusCallback_OnObjectAvailable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT CALLBACK IBindStatusCallback_GetBindInfo_Proxy( IBindStatusCallback* This, DWORD *grfBINDF, @@ -1719,62 +1766,62 @@ typedef struct IBindStatusCallbackExVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IBindStatusCallbackEx* This, + IBindStatusCallbackEx *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IBindStatusCallbackEx* This); + IBindStatusCallbackEx *This); ULONG (STDMETHODCALLTYPE *Release)( - IBindStatusCallbackEx* This); + IBindStatusCallbackEx *This); /*** IBindStatusCallback methods ***/ HRESULT (STDMETHODCALLTYPE *OnStartBinding)( - IBindStatusCallbackEx* This, + IBindStatusCallbackEx *This, DWORD dwReserved, IBinding *pib); HRESULT (STDMETHODCALLTYPE *GetPriority)( - IBindStatusCallbackEx* This, + IBindStatusCallbackEx *This, LONG *pnPriority); HRESULT (STDMETHODCALLTYPE *OnLowResource)( - IBindStatusCallbackEx* This, + IBindStatusCallbackEx *This, DWORD reserved); HRESULT (STDMETHODCALLTYPE *OnProgress)( - IBindStatusCallbackEx* This, + IBindStatusCallbackEx *This, ULONG ulProgress, ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText); HRESULT (STDMETHODCALLTYPE *OnStopBinding)( - IBindStatusCallbackEx* This, + IBindStatusCallbackEx *This, HRESULT hresult, LPCWSTR szError); HRESULT (STDMETHODCALLTYPE *GetBindInfo)( - IBindStatusCallbackEx* This, + IBindStatusCallbackEx *This, DWORD *grfBINDF, BINDINFO *pbindinfo); HRESULT (STDMETHODCALLTYPE *OnDataAvailable)( - IBindStatusCallbackEx* This, + IBindStatusCallbackEx *This, DWORD grfBSCF, DWORD dwSize, FORMATETC *pformatetc, STGMEDIUM *pstgmed); HRESULT (STDMETHODCALLTYPE *OnObjectAvailable)( - IBindStatusCallbackEx* This, + IBindStatusCallbackEx *This, REFIID riid, IUnknown *punk); /*** IBindStatusCallbackEx methods ***/ HRESULT (STDMETHODCALLTYPE *GetBindInfoEx)( - IBindStatusCallbackEx* This, + IBindStatusCallbackEx *This, DWORD *grfBINDF, BINDINFO *pbindinfo, DWORD *grfBINDF2, @@ -1782,6 +1829,7 @@ typedef struct IBindStatusCallbackExVtbl { END_INTERFACE } IBindStatusCallbackExVtbl; + interface IBindStatusCallbackEx { CONST_VTBL IBindStatusCallbackExVtbl* lpVtbl; }; @@ -1909,25 +1957,26 @@ typedef struct IAuthenticateVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAuthenticate* This, + IAuthenticate *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAuthenticate* This); + IAuthenticate *This); ULONG (STDMETHODCALLTYPE *Release)( - IAuthenticate* This); + IAuthenticate *This); /*** IAuthenticate methods ***/ HRESULT (STDMETHODCALLTYPE *Authenticate)( - IAuthenticate* This, + IAuthenticate *This, HWND *phwnd, LPWSTR *pszUsername, LPWSTR *pszPassword); END_INTERFACE } IAuthenticateVtbl; + interface IAuthenticate { CONST_VTBL IAuthenticateVtbl* lpVtbl; }; @@ -1960,16 +2009,6 @@ static FORCEINLINE HRESULT IAuthenticate_Authenticate(IAuthenticate* This,HWND * #endif -HRESULT STDMETHODCALLTYPE IAuthenticate_Authenticate_Proxy( - IAuthenticate* This, - HWND *phwnd, - LPWSTR *pszUsername, - LPWSTR *pszPassword); -void __RPC_STUB IAuthenticate_Authenticate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAuthenticate_INTERFACE_DEFINED__ */ @@ -2018,26 +2057,26 @@ typedef struct IAuthenticateExVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAuthenticateEx* This, + IAuthenticateEx *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IAuthenticateEx* This); + IAuthenticateEx *This); ULONG (STDMETHODCALLTYPE *Release)( - IAuthenticateEx* This); + IAuthenticateEx *This); /*** IAuthenticate methods ***/ HRESULT (STDMETHODCALLTYPE *Authenticate)( - IAuthenticateEx* This, + IAuthenticateEx *This, HWND *phwnd, LPWSTR *pszUsername, LPWSTR *pszPassword); /*** IAuthenticateEx methods ***/ HRESULT (STDMETHODCALLTYPE *AuthenticateEx)( - IAuthenticateEx* This, + IAuthenticateEx *This, HWND *phwnd, LPWSTR *pszUsername, LPWSTR *pszPassword, @@ -2045,6 +2084,7 @@ typedef struct IAuthenticateExVtbl { END_INTERFACE } IAuthenticateExVtbl; + interface IAuthenticateEx { CONST_VTBL IAuthenticateExVtbl* lpVtbl; }; @@ -2083,17 +2123,6 @@ static FORCEINLINE HRESULT IAuthenticateEx_AuthenticateEx(IAuthenticateEx* This, #endif -HRESULT STDMETHODCALLTYPE IAuthenticateEx_AuthenticateEx_Proxy( - IAuthenticateEx* This, - HWND *phwnd, - LPWSTR *pszUsername, - LPWSTR *pszPassword, - AUTHENTICATEINFO *pauthinfo); -void __RPC_STUB IAuthenticateEx_AuthenticateEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IAuthenticateEx_INTERFACE_DEFINED__ */ @@ -2137,26 +2166,26 @@ typedef struct IHttpNegotiateVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IHttpNegotiate* This, + IHttpNegotiate *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IHttpNegotiate* This); + IHttpNegotiate *This); ULONG (STDMETHODCALLTYPE *Release)( - IHttpNegotiate* This); + IHttpNegotiate *This); /*** IHttpNegotiate methods ***/ HRESULT (STDMETHODCALLTYPE *BeginningTransaction)( - IHttpNegotiate* This, + IHttpNegotiate *This, LPCWSTR szURL, LPCWSTR szHeaders, DWORD dwReserved, LPWSTR *pszAdditionalHeaders); HRESULT (STDMETHODCALLTYPE *OnResponse)( - IHttpNegotiate* This, + IHttpNegotiate *This, DWORD dwResponseCode, LPCWSTR szResponseHeaders, LPCWSTR szRequestHeaders, @@ -2164,6 +2193,7 @@ typedef struct IHttpNegotiateVtbl { END_INTERFACE } IHttpNegotiateVtbl; + interface IHttpNegotiate { CONST_VTBL IHttpNegotiateVtbl* lpVtbl; }; @@ -2200,28 +2230,6 @@ static FORCEINLINE HRESULT IHttpNegotiate_OnResponse(IHttpNegotiate* This,DWORD #endif -HRESULT STDMETHODCALLTYPE IHttpNegotiate_BeginningTransaction_Proxy( - IHttpNegotiate* This, - LPCWSTR szURL, - LPCWSTR szHeaders, - DWORD dwReserved, - LPWSTR *pszAdditionalHeaders); -void __RPC_STUB IHttpNegotiate_BeginningTransaction_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IHttpNegotiate_OnResponse_Proxy( - IHttpNegotiate* This, - DWORD dwResponseCode, - LPCWSTR szResponseHeaders, - LPCWSTR szRequestHeaders, - LPWSTR *pszAdditionalRequestHeaders); -void __RPC_STUB IHttpNegotiate_OnResponse_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IHttpNegotiate_INTERFACE_DEFINED__ */ @@ -2258,26 +2266,26 @@ typedef struct IHttpNegotiate2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IHttpNegotiate2* This, + IHttpNegotiate2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IHttpNegotiate2* This); + IHttpNegotiate2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IHttpNegotiate2* This); + IHttpNegotiate2 *This); /*** IHttpNegotiate methods ***/ HRESULT (STDMETHODCALLTYPE *BeginningTransaction)( - IHttpNegotiate2* This, + IHttpNegotiate2 *This, LPCWSTR szURL, LPCWSTR szHeaders, DWORD dwReserved, LPWSTR *pszAdditionalHeaders); HRESULT (STDMETHODCALLTYPE *OnResponse)( - IHttpNegotiate2* This, + IHttpNegotiate2 *This, DWORD dwResponseCode, LPCWSTR szResponseHeaders, LPCWSTR szRequestHeaders, @@ -2285,13 +2293,14 @@ typedef struct IHttpNegotiate2Vtbl { /*** IHttpNegotiate2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetRootSecurityId)( - IHttpNegotiate2* This, + IHttpNegotiate2 *This, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved); END_INTERFACE } IHttpNegotiate2Vtbl; + interface IHttpNegotiate2 { CONST_VTBL IHttpNegotiate2Vtbl* lpVtbl; }; @@ -2334,16 +2343,6 @@ static FORCEINLINE HRESULT IHttpNegotiate2_GetRootSecurityId(IHttpNegotiate2* Th #endif -HRESULT STDMETHODCALLTYPE IHttpNegotiate2_GetRootSecurityId_Proxy( - IHttpNegotiate2* This, - BYTE *pbSecurityId, - DWORD *pcbSecurityId, - DWORD_PTR dwReserved); -void __RPC_STUB IHttpNegotiate2_GetRootSecurityId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IHttpNegotiate2_INTERFACE_DEFINED__ */ @@ -2379,26 +2378,26 @@ typedef struct IHttpNegotiate3Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IHttpNegotiate3* This, + IHttpNegotiate3 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IHttpNegotiate3* This); + IHttpNegotiate3 *This); ULONG (STDMETHODCALLTYPE *Release)( - IHttpNegotiate3* This); + IHttpNegotiate3 *This); /*** IHttpNegotiate methods ***/ HRESULT (STDMETHODCALLTYPE *BeginningTransaction)( - IHttpNegotiate3* This, + IHttpNegotiate3 *This, LPCWSTR szURL, LPCWSTR szHeaders, DWORD dwReserved, LPWSTR *pszAdditionalHeaders); HRESULT (STDMETHODCALLTYPE *OnResponse)( - IHttpNegotiate3* This, + IHttpNegotiate3 *This, DWORD dwResponseCode, LPCWSTR szResponseHeaders, LPCWSTR szRequestHeaders, @@ -2406,19 +2405,20 @@ typedef struct IHttpNegotiate3Vtbl { /*** IHttpNegotiate2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetRootSecurityId)( - IHttpNegotiate3* This, + IHttpNegotiate3 *This, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved); /*** IHttpNegotiate3 methods ***/ HRESULT (STDMETHODCALLTYPE *GetSerializedClientCertContext)( - IHttpNegotiate3* This, + IHttpNegotiate3 *This, BYTE **ppbCert, DWORD *pcbCert); END_INTERFACE } IHttpNegotiate3Vtbl; + interface IHttpNegotiate3 { CONST_VTBL IHttpNegotiate3Vtbl* lpVtbl; }; @@ -2467,15 +2467,6 @@ static FORCEINLINE HRESULT IHttpNegotiate3_GetSerializedClientCertContext(IHttpN #endif -HRESULT STDMETHODCALLTYPE IHttpNegotiate3_GetSerializedClientCertContext_Proxy( - IHttpNegotiate3* This, - BYTE **ppbCert, - DWORD *pcbCert); -void __RPC_STUB IHttpNegotiate3_GetSerializedClientCertContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IHttpNegotiate3_INTERFACE_DEFINED__ */ @@ -2514,28 +2505,29 @@ typedef struct IWinInetFileStreamVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWinInetFileStream* This, + IWinInetFileStream *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWinInetFileStream* This); + IWinInetFileStream *This); ULONG (STDMETHODCALLTYPE *Release)( - IWinInetFileStream* This); + IWinInetFileStream *This); /*** IWinInetFileStream methods ***/ HRESULT (STDMETHODCALLTYPE *SetHandleForUnlock)( - IWinInetFileStream* This, + IWinInetFileStream *This, DWORD_PTR hWinInetLockHandle, DWORD_PTR dwReserved); HRESULT (STDMETHODCALLTYPE *SetDeleteFile)( - IWinInetFileStream* This, + IWinInetFileStream *This, DWORD_PTR dwReserved); END_INTERFACE } IWinInetFileStreamVtbl; + interface IWinInetFileStream { CONST_VTBL IWinInetFileStreamVtbl* lpVtbl; }; @@ -2572,23 +2564,6 @@ static FORCEINLINE HRESULT IWinInetFileStream_SetDeleteFile(IWinInetFileStream* #endif -HRESULT STDMETHODCALLTYPE IWinInetFileStream_SetHandleForUnlock_Proxy( - IWinInetFileStream* This, - DWORD_PTR hWinInetLockHandle, - DWORD_PTR dwReserved); -void __RPC_STUB IWinInetFileStream_SetHandleForUnlock_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWinInetFileStream_SetDeleteFile_Proxy( - IWinInetFileStream* This, - DWORD_PTR dwReserved); -void __RPC_STUB IWinInetFileStream_SetDeleteFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWinInetFileStream_INTERFACE_DEFINED__ */ @@ -2624,24 +2599,25 @@ typedef struct IWindowForBindingUIVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWindowForBindingUI* This, + IWindowForBindingUI *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWindowForBindingUI* This); + IWindowForBindingUI *This); ULONG (STDMETHODCALLTYPE *Release)( - IWindowForBindingUI* This); + IWindowForBindingUI *This); /*** IWindowForBindingUI methods ***/ HRESULT (STDMETHODCALLTYPE *GetWindow)( - IWindowForBindingUI* This, + IWindowForBindingUI *This, REFGUID rguidReason, HWND *phwnd); END_INTERFACE } IWindowForBindingUIVtbl; + interface IWindowForBindingUI { CONST_VTBL IWindowForBindingUIVtbl* lpVtbl; }; @@ -2674,15 +2650,6 @@ static FORCEINLINE HRESULT IWindowForBindingUI_GetWindow(IWindowForBindingUI* Th #endif -HRESULT STDMETHODCALLTYPE IWindowForBindingUI_GetWindow_Proxy( - IWindowForBindingUI* This, - REFGUID rguidReason, - HWND *phwnd); -void __RPC_STUB IWindowForBindingUI_GetWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWindowForBindingUI_INTERFACE_DEFINED__ */ @@ -2733,25 +2700,25 @@ typedef struct ICodeInstallVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICodeInstall* This, + ICodeInstall *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICodeInstall* This); + ICodeInstall *This); ULONG (STDMETHODCALLTYPE *Release)( - ICodeInstall* This); + ICodeInstall *This); /*** IWindowForBindingUI methods ***/ HRESULT (STDMETHODCALLTYPE *GetWindow)( - ICodeInstall* This, + ICodeInstall *This, REFGUID rguidReason, HWND *phwnd); /*** ICodeInstall methods ***/ HRESULT (STDMETHODCALLTYPE *OnCodeInstallProblem)( - ICodeInstall* This, + ICodeInstall *This, ULONG ulStatusCode, LPCWSTR szDestination, LPCWSTR szSource, @@ -2759,6 +2726,7 @@ typedef struct ICodeInstallVtbl { END_INTERFACE } ICodeInstallVtbl; + interface ICodeInstall { CONST_VTBL ICodeInstallVtbl* lpVtbl; }; @@ -2797,17 +2765,6 @@ static FORCEINLINE HRESULT ICodeInstall_OnCodeInstallProblem(ICodeInstall* This, #endif -HRESULT STDMETHODCALLTYPE ICodeInstall_OnCodeInstallProblem_Proxy( - ICodeInstall* This, - ULONG ulStatusCode, - LPCWSTR szDestination, - LPCWSTR szSource, - DWORD dwReserved); -void __RPC_STUB ICodeInstall_OnCodeInstallProblem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICodeInstall_INTERFACE_DEFINED__ */ @@ -2956,127 +2913,128 @@ typedef struct IUriVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IUri* This, + IUri *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IUri* This); + IUri *This); ULONG (STDMETHODCALLTYPE *Release)( - IUri* This); + IUri *This); /*** IUri methods ***/ HRESULT (STDMETHODCALLTYPE *GetPropertyBSTR)( - IUri* This, + IUri *This, Uri_PROPERTY uriProp, BSTR *pbstrProperty, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetPropertyLength)( - IUri* This, + IUri *This, Uri_PROPERTY uriProp, DWORD *pcchProperty, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetPropertyDWORD)( - IUri* This, + IUri *This, Uri_PROPERTY uriProp, DWORD *pdwProperty, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *HasProperty)( - IUri* This, + IUri *This, Uri_PROPERTY uriProp, WINBOOL *pfHasProperty); HRESULT (STDMETHODCALLTYPE *GetAbsoluteUri)( - IUri* This, + IUri *This, BSTR *pbstrAbsoluteUri); HRESULT (STDMETHODCALLTYPE *GetAuthority)( - IUri* This, + IUri *This, BSTR *pbstrAuthority); HRESULT (STDMETHODCALLTYPE *GetDisplayUri)( - IUri* This, + IUri *This, BSTR *pbstrDisplayString); HRESULT (STDMETHODCALLTYPE *GetDomain)( - IUri* This, + IUri *This, BSTR *pbstrDomain); HRESULT (STDMETHODCALLTYPE *GetExtension)( - IUri* This, + IUri *This, BSTR *pbstrExtension); HRESULT (STDMETHODCALLTYPE *GetFragment)( - IUri* This, + IUri *This, BSTR *pbstrFragment); HRESULT (STDMETHODCALLTYPE *GetHost)( - IUri* This, + IUri *This, BSTR *pbstrHost); HRESULT (STDMETHODCALLTYPE *GetPassword)( - IUri* This, + IUri *This, BSTR *pbstrPassword); HRESULT (STDMETHODCALLTYPE *GetPath)( - IUri* This, + IUri *This, BSTR *pbstrPath); HRESULT (STDMETHODCALLTYPE *GetPathAndQuery)( - IUri* This, + IUri *This, BSTR *pbstrPathAndQuery); HRESULT (STDMETHODCALLTYPE *GetQuery)( - IUri* This, + IUri *This, BSTR *pbstrQuery); HRESULT (STDMETHODCALLTYPE *GetRawUri)( - IUri* This, + IUri *This, BSTR *pbstrRawUri); HRESULT (STDMETHODCALLTYPE *GetSchemeName)( - IUri* This, + IUri *This, BSTR *pbstrSchemeName); HRESULT (STDMETHODCALLTYPE *GetUserInfo)( - IUri* This, + IUri *This, BSTR *pbstrUserInfo); HRESULT (STDMETHODCALLTYPE *GetUserName)( - IUri* This, + IUri *This, BSTR *pbstrUserName); HRESULT (STDMETHODCALLTYPE *GetHostType)( - IUri* This, + IUri *This, DWORD *pdwHostType); HRESULT (STDMETHODCALLTYPE *GetPort)( - IUri* This, + IUri *This, DWORD *pdwPort); HRESULT (STDMETHODCALLTYPE *GetScheme)( - IUri* This, + IUri *This, DWORD *pdwScheme); HRESULT (STDMETHODCALLTYPE *GetZone)( - IUri* This, + IUri *This, DWORD *pdwZone); HRESULT (STDMETHODCALLTYPE *GetProperties)( - IUri* This, + IUri *This, LPDWORD pdwFlags); HRESULT (STDMETHODCALLTYPE *IsEqual)( - IUri* This, + IUri *This, IUri *pUri, WINBOOL *pfEqual); END_INTERFACE } IUriVtbl; + interface IUri { CONST_VTBL IUriVtbl* lpVtbl; }; @@ -3205,214 +3163,6 @@ static FORCEINLINE HRESULT IUri_IsEqual(IUri* This,IUri *pUri,WINBOOL *pfEqual) #endif -HRESULT STDMETHODCALLTYPE IUri_GetPropertyBSTR_Proxy( - IUri* This, - Uri_PROPERTY uriProp, - BSTR *pbstrProperty, - DWORD dwFlags); -void __RPC_STUB IUri_GetPropertyBSTR_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUri_GetPropertyLength_Proxy( - IUri* This, - Uri_PROPERTY uriProp, - DWORD *pcchProperty, - DWORD dwFlags); -void __RPC_STUB IUri_GetPropertyLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUri_GetPropertyDWORD_Proxy( - IUri* This, - Uri_PROPERTY uriProp, - DWORD *pdwProperty, - DWORD dwFlags); -void __RPC_STUB IUri_GetPropertyDWORD_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUri_HasProperty_Proxy( - IUri* This, - Uri_PROPERTY uriProp, - WINBOOL *pfHasProperty); -void __RPC_STUB IUri_HasProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUri_GetAbsoluteUri_Proxy( - IUri* This, - BSTR *pbstrAbsoluteUri); -void __RPC_STUB IUri_GetAbsoluteUri_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUri_GetAuthority_Proxy( - IUri* This, - BSTR *pbstrAuthority); -void __RPC_STUB IUri_GetAuthority_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUri_GetDisplayUri_Proxy( - IUri* This, - BSTR *pbstrDisplayString); -void __RPC_STUB IUri_GetDisplayUri_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUri_GetDomain_Proxy( - IUri* This, - BSTR *pbstrDomain); -void __RPC_STUB IUri_GetDomain_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUri_GetExtension_Proxy( - IUri* This, - BSTR *pbstrExtension); -void __RPC_STUB IUri_GetExtension_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUri_GetFragment_Proxy( - IUri* This, - BSTR *pbstrFragment); -void __RPC_STUB IUri_GetFragment_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUri_GetHost_Proxy( - IUri* This, - BSTR *pbstrHost); -void __RPC_STUB IUri_GetHost_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUri_GetPassword_Proxy( - IUri* This, - BSTR *pbstrPassword); -void __RPC_STUB IUri_GetPassword_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUri_GetPath_Proxy( - IUri* This, - BSTR *pbstrPath); -void __RPC_STUB IUri_GetPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUri_GetPathAndQuery_Proxy( - IUri* This, - BSTR *pbstrPathAndQuery); -void __RPC_STUB IUri_GetPathAndQuery_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUri_GetQuery_Proxy( - IUri* This, - BSTR *pbstrQuery); -void __RPC_STUB IUri_GetQuery_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUri_GetRawUri_Proxy( - IUri* This, - BSTR *pbstrRawUri); -void __RPC_STUB IUri_GetRawUri_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUri_GetSchemeName_Proxy( - IUri* This, - BSTR *pbstrSchemeName); -void __RPC_STUB IUri_GetSchemeName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUri_GetUserInfo_Proxy( - IUri* This, - BSTR *pbstrUserInfo); -void __RPC_STUB IUri_GetUserInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUri_GetUserName_Proxy( - IUri* This, - BSTR *pbstrUserName); -void __RPC_STUB IUri_GetUserName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUri_GetHostType_Proxy( - IUri* This, - DWORD *pdwHostType); -void __RPC_STUB IUri_GetHostType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUri_GetPort_Proxy( - IUri* This, - DWORD *pdwPort); -void __RPC_STUB IUri_GetPort_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUri_GetScheme_Proxy( - IUri* This, - DWORD *pdwScheme); -void __RPC_STUB IUri_GetScheme_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUri_GetZone_Proxy( - IUri* This, - DWORD *pdwZone); -void __RPC_STUB IUri_GetZone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUri_GetProperties_Proxy( - IUri* This, - LPDWORD pdwFlags); -void __RPC_STUB IUri_GetProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUri_IsEqual_Proxy( - IUri* This, - IUri *pUri, - WINBOOL *pfEqual); -void __RPC_STUB IUri_IsEqual_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IUri_INTERFACE_DEFINED__ */ @@ -3509,23 +3259,24 @@ typedef struct IUriContainerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IUriContainer* This, + IUriContainer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IUriContainer* This); + IUriContainer *This); ULONG (STDMETHODCALLTYPE *Release)( - IUriContainer* This); + IUriContainer *This); /*** IUriContainer methods ***/ HRESULT (STDMETHODCALLTYPE *GetIUri)( - IUriContainer* This, + IUriContainer *This, IUri **ppIUri); END_INTERFACE } IUriContainerVtbl; + interface IUriContainer { CONST_VTBL IUriContainerVtbl* lpVtbl; }; @@ -3558,14 +3309,6 @@ static FORCEINLINE HRESULT IUriContainer_GetIUri(IUriContainer* This,IUri **ppIU #endif -HRESULT STDMETHODCALLTYPE IUriContainer_GetIUri_Proxy( - IUriContainer* This, - IUri **ppIUri); -void __RPC_STUB IUriContainer_GetIUri_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IUriContainer_INTERFACE_DEFINED__ */ @@ -3678,32 +3421,32 @@ typedef struct IUriBuilderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IUriBuilder* This, + IUriBuilder *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IUriBuilder* This); + IUriBuilder *This); ULONG (STDMETHODCALLTYPE *Release)( - IUriBuilder* This); + IUriBuilder *This); /*** IUriBuilder methods ***/ HRESULT (STDMETHODCALLTYPE *CreateUriSimple)( - IUriBuilder* This, + IUriBuilder *This, DWORD dwAllowEncodingPropertyMask, DWORD_PTR dwReserved, IUri **ppIUri); HRESULT (STDMETHODCALLTYPE *CreateUri)( - IUriBuilder* This, + IUriBuilder *This, DWORD dwCreateFlags, DWORD dwAllowEncodingPropertyMask, DWORD_PTR dwReserved, IUri **ppIUri); HRESULT (STDMETHODCALLTYPE *CreateUriWithFlags)( - IUriBuilder* This, + IUriBuilder *This, DWORD dwCreateFlags, DWORD dwUriBuilderFlags, DWORD dwAllowEncodingPropertyMask, @@ -3711,96 +3454,97 @@ typedef struct IUriBuilderVtbl { IUri **ppIUri); HRESULT (STDMETHODCALLTYPE *GetIUri)( - IUriBuilder* This, + IUriBuilder *This, IUri **ppIUri); HRESULT (STDMETHODCALLTYPE *SetIUri)( - IUriBuilder* This, + IUriBuilder *This, IUri *pIUri); HRESULT (STDMETHODCALLTYPE *GetFragment)( - IUriBuilder* This, + IUriBuilder *This, DWORD *pcchFragment, LPCWSTR *ppwzFragment); HRESULT (STDMETHODCALLTYPE *GetHost)( - IUriBuilder* This, + IUriBuilder *This, DWORD *pcchHost, LPCWSTR *ppwzHost); HRESULT (STDMETHODCALLTYPE *GetPassword)( - IUriBuilder* This, + IUriBuilder *This, DWORD *pcchPassword, LPCWSTR *ppwzPassword); HRESULT (STDMETHODCALLTYPE *GetPath)( - IUriBuilder* This, + IUriBuilder *This, DWORD *pcchPath, LPCWSTR *ppwzPath); HRESULT (STDMETHODCALLTYPE *GetPort)( - IUriBuilder* This, + IUriBuilder *This, WINBOOL *pfHasPort, DWORD *pdwPort); HRESULT (STDMETHODCALLTYPE *GetQuery)( - IUriBuilder* This, + IUriBuilder *This, DWORD *pcchQuery, LPCWSTR *ppwzQuery); HRESULT (STDMETHODCALLTYPE *GetSchemeName)( - IUriBuilder* This, + IUriBuilder *This, DWORD *pcchSchemeName, LPCWSTR *ppwzSchemeName); HRESULT (STDMETHODCALLTYPE *GetUserName)( - IUriBuilder* This, + IUriBuilder *This, DWORD *pcchUserName, LPCWSTR *ppwzUserName); HRESULT (STDMETHODCALLTYPE *SetFragment)( - IUriBuilder* This, + IUriBuilder *This, LPCWSTR pwzNewValue); HRESULT (STDMETHODCALLTYPE *SetHost)( - IUriBuilder* This, + IUriBuilder *This, LPCWSTR pwzNewValue); HRESULT (STDMETHODCALLTYPE *SetPassword)( - IUriBuilder* This, + IUriBuilder *This, LPCWSTR pwzNewValue); HRESULT (STDMETHODCALLTYPE *SetPath)( - IUriBuilder* This, + IUriBuilder *This, LPCWSTR pwzNewValue); HRESULT (STDMETHODCALLTYPE *SetPort)( - IUriBuilder* This, + IUriBuilder *This, WINBOOL fHasPort, DWORD dwNewValue); HRESULT (STDMETHODCALLTYPE *SetQuery)( - IUriBuilder* This, + IUriBuilder *This, LPCWSTR pwzNewValue); HRESULT (STDMETHODCALLTYPE *SetSchemeName)( - IUriBuilder* This, + IUriBuilder *This, LPCWSTR pwzNewValue); HRESULT (STDMETHODCALLTYPE *SetUserName)( - IUriBuilder* This, + IUriBuilder *This, LPCWSTR pwzNewValue); HRESULT (STDMETHODCALLTYPE *RemoveProperties)( - IUriBuilder* This, + IUriBuilder *This, DWORD dwPropertyMask); HRESULT (STDMETHODCALLTYPE *HasBeenModified)( - IUriBuilder* This, + IUriBuilder *This, WINBOOL *pfModified); END_INTERFACE } IUriBuilderVtbl; + interface IUriBuilder { CONST_VTBL IUriBuilderVtbl* lpVtbl; }; @@ -3921,208 +3665,6 @@ static FORCEINLINE HRESULT IUriBuilder_HasBeenModified(IUriBuilder* This,WINBOOL #endif -HRESULT STDMETHODCALLTYPE IUriBuilder_CreateUriSimple_Proxy( - IUriBuilder* This, - DWORD dwAllowEncodingPropertyMask, - DWORD_PTR dwReserved, - IUri **ppIUri); -void __RPC_STUB IUriBuilder_CreateUriSimple_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUriBuilder_CreateUri_Proxy( - IUriBuilder* This, - DWORD dwCreateFlags, - DWORD dwAllowEncodingPropertyMask, - DWORD_PTR dwReserved, - IUri **ppIUri); -void __RPC_STUB IUriBuilder_CreateUri_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUriBuilder_CreateUriWithFlags_Proxy( - IUriBuilder* This, - DWORD dwCreateFlags, - DWORD dwUriBuilderFlags, - DWORD dwAllowEncodingPropertyMask, - DWORD_PTR dwReserved, - IUri **ppIUri); -void __RPC_STUB IUriBuilder_CreateUriWithFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUriBuilder_GetIUri_Proxy( - IUriBuilder* This, - IUri **ppIUri); -void __RPC_STUB IUriBuilder_GetIUri_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUriBuilder_SetIUri_Proxy( - IUriBuilder* This, - IUri *pIUri); -void __RPC_STUB IUriBuilder_SetIUri_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUriBuilder_GetFragment_Proxy( - IUriBuilder* This, - DWORD *pcchFragment, - LPCWSTR *ppwzFragment); -void __RPC_STUB IUriBuilder_GetFragment_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUriBuilder_GetHost_Proxy( - IUriBuilder* This, - DWORD *pcchHost, - LPCWSTR *ppwzHost); -void __RPC_STUB IUriBuilder_GetHost_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUriBuilder_GetPassword_Proxy( - IUriBuilder* This, - DWORD *pcchPassword, - LPCWSTR *ppwzPassword); -void __RPC_STUB IUriBuilder_GetPassword_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUriBuilder_GetPath_Proxy( - IUriBuilder* This, - DWORD *pcchPath, - LPCWSTR *ppwzPath); -void __RPC_STUB IUriBuilder_GetPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUriBuilder_GetPort_Proxy( - IUriBuilder* This, - WINBOOL *pfHasPort, - DWORD *pdwPort); -void __RPC_STUB IUriBuilder_GetPort_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUriBuilder_GetQuery_Proxy( - IUriBuilder* This, - DWORD *pcchQuery, - LPCWSTR *ppwzQuery); -void __RPC_STUB IUriBuilder_GetQuery_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUriBuilder_GetSchemeName_Proxy( - IUriBuilder* This, - DWORD *pcchSchemeName, - LPCWSTR *ppwzSchemeName); -void __RPC_STUB IUriBuilder_GetSchemeName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUriBuilder_GetUserName_Proxy( - IUriBuilder* This, - DWORD *pcchUserName, - LPCWSTR *ppwzUserName); -void __RPC_STUB IUriBuilder_GetUserName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUriBuilder_SetFragment_Proxy( - IUriBuilder* This, - LPCWSTR pwzNewValue); -void __RPC_STUB IUriBuilder_SetFragment_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUriBuilder_SetHost_Proxy( - IUriBuilder* This, - LPCWSTR pwzNewValue); -void __RPC_STUB IUriBuilder_SetHost_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUriBuilder_SetPassword_Proxy( - IUriBuilder* This, - LPCWSTR pwzNewValue); -void __RPC_STUB IUriBuilder_SetPassword_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUriBuilder_SetPath_Proxy( - IUriBuilder* This, - LPCWSTR pwzNewValue); -void __RPC_STUB IUriBuilder_SetPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUriBuilder_SetPort_Proxy( - IUriBuilder* This, - WINBOOL fHasPort, - DWORD dwNewValue); -void __RPC_STUB IUriBuilder_SetPort_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUriBuilder_SetQuery_Proxy( - IUriBuilder* This, - LPCWSTR pwzNewValue); -void __RPC_STUB IUriBuilder_SetQuery_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUriBuilder_SetSchemeName_Proxy( - IUriBuilder* This, - LPCWSTR pwzNewValue); -void __RPC_STUB IUriBuilder_SetSchemeName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUriBuilder_SetUserName_Proxy( - IUriBuilder* This, - LPCWSTR pwzNewValue); -void __RPC_STUB IUriBuilder_SetUserName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUriBuilder_RemoveProperties_Proxy( - IUriBuilder* This, - DWORD dwPropertyMask); -void __RPC_STUB IUriBuilder_RemoveProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUriBuilder_HasBeenModified_Proxy( - IUriBuilder* This, - WINBOOL *pfModified); -void __RPC_STUB IUriBuilder_HasBeenModified_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IUriBuilder_INTERFACE_DEFINED__ */ @@ -4158,31 +3700,32 @@ typedef struct IUriBuilderFactoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IUriBuilderFactory* This, + IUriBuilderFactory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IUriBuilderFactory* This); + IUriBuilderFactory *This); ULONG (STDMETHODCALLTYPE *Release)( - IUriBuilderFactory* This); + IUriBuilderFactory *This); /*** IUriBuilderFactory methods ***/ HRESULT (STDMETHODCALLTYPE *CreateIUriBuilder)( - IUriBuilderFactory* This, + IUriBuilderFactory *This, DWORD dwFlags, DWORD_PTR dwReserved, IUriBuilder **ppIUriBuilder); HRESULT (STDMETHODCALLTYPE *CreateInitializedIUriBuilder)( - IUriBuilderFactory* This, + IUriBuilderFactory *This, DWORD dwFlags, DWORD_PTR dwReserved, IUriBuilder **ppIUriBuilder); END_INTERFACE } IUriBuilderFactoryVtbl; + interface IUriBuilderFactory { CONST_VTBL IUriBuilderFactoryVtbl* lpVtbl; }; @@ -4219,26 +3762,6 @@ static FORCEINLINE HRESULT IUriBuilderFactory_CreateInitializedIUriBuilder(IUriB #endif -HRESULT STDMETHODCALLTYPE IUriBuilderFactory_CreateIUriBuilder_Proxy( - IUriBuilderFactory* This, - DWORD dwFlags, - DWORD_PTR dwReserved, - IUriBuilder **ppIUriBuilder); -void __RPC_STUB IUriBuilderFactory_CreateIUriBuilder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IUriBuilderFactory_CreateInitializedIUriBuilder_Proxy( - IUriBuilderFactory* This, - DWORD dwFlags, - DWORD_PTR dwReserved, - IUriBuilder **ppIUriBuilder); -void __RPC_STUB IUriBuilderFactory_CreateInitializedIUriBuilder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IUriBuilderFactory_INTERFACE_DEFINED__ */ @@ -4278,25 +3801,26 @@ typedef struct IWinInetInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWinInetInfo* This, + IWinInetInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWinInetInfo* This); + IWinInetInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IWinInetInfo* This); + IWinInetInfo *This); /*** IWinInetInfo methods ***/ HRESULT (STDMETHODCALLTYPE *QueryOption)( - IWinInetInfo* This, + IWinInetInfo *This, DWORD dwOption, LPVOID pBuffer, DWORD *pcbBuf); END_INTERFACE } IWinInetInfoVtbl; + interface IWinInetInfo { CONST_VTBL IWinInetInfoVtbl* lpVtbl; }; @@ -4385,29 +3909,30 @@ typedef struct IHttpSecurityVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IHttpSecurity* This, + IHttpSecurity *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IHttpSecurity* This); + IHttpSecurity *This); ULONG (STDMETHODCALLTYPE *Release)( - IHttpSecurity* This); + IHttpSecurity *This); /*** IWindowForBindingUI methods ***/ HRESULT (STDMETHODCALLTYPE *GetWindow)( - IHttpSecurity* This, + IHttpSecurity *This, REFGUID rguidReason, HWND *phwnd); /*** IHttpSecurity methods ***/ HRESULT (STDMETHODCALLTYPE *OnSecurityProblem)( - IHttpSecurity* This, + IHttpSecurity *This, DWORD dwProblem); END_INTERFACE } IHttpSecurityVtbl; + interface IHttpSecurity { CONST_VTBL IHttpSecurityVtbl* lpVtbl; }; @@ -4446,14 +3971,6 @@ static FORCEINLINE HRESULT IHttpSecurity_OnSecurityProblem(IHttpSecurity* This,D #endif -HRESULT STDMETHODCALLTYPE IHttpSecurity_OnSecurityProblem_Proxy( - IHttpSecurity* This, - DWORD dwProblem); -void __RPC_STUB IHttpSecurity_OnSecurityProblem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IHttpSecurity_INTERFACE_DEFINED__ */ @@ -4492,26 +4009,26 @@ typedef struct IWinInetHttpInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWinInetHttpInfo* This, + IWinInetHttpInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWinInetHttpInfo* This); + IWinInetHttpInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IWinInetHttpInfo* This); + IWinInetHttpInfo *This); /*** IWinInetInfo methods ***/ HRESULT (STDMETHODCALLTYPE *QueryOption)( - IWinInetHttpInfo* This, + IWinInetHttpInfo *This, DWORD dwOption, LPVOID pBuffer, DWORD *pcbBuf); /*** IWinInetHttpInfo methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInfo)( - IWinInetHttpInfo* This, + IWinInetHttpInfo *This, DWORD dwOption, LPVOID pBuffer, DWORD *pcbBuf, @@ -4520,6 +4037,7 @@ typedef struct IWinInetHttpInfoVtbl { END_INTERFACE } IWinInetHttpInfoVtbl; + interface IWinInetHttpInfo { CONST_VTBL IWinInetHttpInfoVtbl* lpVtbl; }; @@ -4617,25 +4135,26 @@ typedef struct IWinInetHttpTimeoutsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWinInetHttpTimeouts* This, + IWinInetHttpTimeouts *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWinInetHttpTimeouts* This); + IWinInetHttpTimeouts *This); ULONG (STDMETHODCALLTYPE *Release)( - IWinInetHttpTimeouts* This); + IWinInetHttpTimeouts *This); /*** IWinInetHttpTimeouts methods ***/ HRESULT (STDMETHODCALLTYPE *GetRequestTimeouts)( - IWinInetHttpTimeouts* This, + IWinInetHttpTimeouts *This, DWORD *pdwConnectTimeout, DWORD *pdwSendTimeout, DWORD *pdwReceiveTimeout); END_INTERFACE } IWinInetHttpTimeoutsVtbl; + interface IWinInetHttpTimeouts { CONST_VTBL IWinInetHttpTimeoutsVtbl* lpVtbl; }; @@ -4668,16 +4187,6 @@ static FORCEINLINE HRESULT IWinInetHttpTimeouts_GetRequestTimeouts(IWinInetHttpT #endif -HRESULT STDMETHODCALLTYPE IWinInetHttpTimeouts_GetRequestTimeouts_Proxy( - IWinInetHttpTimeouts* This, - DWORD *pdwConnectTimeout, - DWORD *pdwSendTimeout, - DWORD *pdwReceiveTimeout); -void __RPC_STUB IWinInetHttpTimeouts_GetRequestTimeouts_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWinInetHttpTimeouts_INTERFACE_DEFINED__ */ @@ -4717,19 +4226,19 @@ typedef struct IWinInetCacheHintsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWinInetCacheHints* This, + IWinInetCacheHints *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWinInetCacheHints* This); + IWinInetCacheHints *This); ULONG (STDMETHODCALLTYPE *Release)( - IWinInetCacheHints* This); + IWinInetCacheHints *This); /*** IWinInetCacheHints methods ***/ HRESULT (STDMETHODCALLTYPE *SetCacheExtension)( - IWinInetCacheHints* This, + IWinInetCacheHints *This, LPCWSTR pwzExt, LPVOID pszCacheFile, DWORD *pcbCacheFile, @@ -4738,6 +4247,7 @@ typedef struct IWinInetCacheHintsVtbl { END_INTERFACE } IWinInetCacheHintsVtbl; + interface IWinInetCacheHints { CONST_VTBL IWinInetCacheHintsVtbl* lpVtbl; }; @@ -4770,18 +4280,6 @@ static FORCEINLINE HRESULT IWinInetCacheHints_SetCacheExtension(IWinInetCacheHin #endif -HRESULT STDMETHODCALLTYPE IWinInetCacheHints_SetCacheExtension_Proxy( - IWinInetCacheHints* This, - LPCWSTR pwzExt, - LPVOID pszCacheFile, - DWORD *pcbCacheFile, - DWORD *pdwWinInetError, - DWORD *pdwReserved); -void __RPC_STUB IWinInetCacheHints_SetCacheExtension_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWinInetCacheHints_INTERFACE_DEFINED__ */ @@ -4822,19 +4320,19 @@ typedef struct IWinInetCacheHints2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWinInetCacheHints2* This, + IWinInetCacheHints2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWinInetCacheHints2* This); + IWinInetCacheHints2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IWinInetCacheHints2* This); + IWinInetCacheHints2 *This); /*** IWinInetCacheHints methods ***/ HRESULT (STDMETHODCALLTYPE *SetCacheExtension)( - IWinInetCacheHints2* This, + IWinInetCacheHints2 *This, LPCWSTR pwzExt, LPVOID pszCacheFile, DWORD *pcbCacheFile, @@ -4843,7 +4341,7 @@ typedef struct IWinInetCacheHints2Vtbl { /*** IWinInetCacheHints2 methods ***/ HRESULT (STDMETHODCALLTYPE *SetCacheExtension2)( - IWinInetCacheHints2* This, + IWinInetCacheHints2 *This, LPCWSTR pwzExt, WCHAR *pwzCacheFile, DWORD *pcchCacheFile, @@ -4852,6 +4350,7 @@ typedef struct IWinInetCacheHints2Vtbl { END_INTERFACE } IWinInetCacheHints2Vtbl; + interface IWinInetCacheHints2 { CONST_VTBL IWinInetCacheHints2Vtbl* lpVtbl; }; @@ -4890,18 +4389,6 @@ static FORCEINLINE HRESULT IWinInetCacheHints2_SetCacheExtension2(IWinInetCacheH #endif -HRESULT STDMETHODCALLTYPE IWinInetCacheHints2_SetCacheExtension2_Proxy( - IWinInetCacheHints2* This, - LPCWSTR pwzExt, - WCHAR *pwzCacheFile, - DWORD *pcchCacheFile, - DWORD *pdwWinInetError, - DWORD *pdwReserved); -void __RPC_STUB IWinInetCacheHints2_SetCacheExtension2_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWinInetCacheHints2_INTERFACE_DEFINED__ */ @@ -4959,26 +4446,26 @@ typedef struct IBindHostVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IBindHost* This, + IBindHost *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IBindHost* This); + IBindHost *This); ULONG (STDMETHODCALLTYPE *Release)( - IBindHost* This); + IBindHost *This); /*** IBindHost methods ***/ HRESULT (STDMETHODCALLTYPE *CreateMoniker)( - IBindHost* This, + IBindHost *This, LPOLESTR szName, IBindCtx *pBC, IMoniker **ppmk, DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *MonikerBindToStorage)( - IBindHost* This, + IBindHost *This, IMoniker *pMk, IBindCtx *pBC, IBindStatusCallback *pBSC, @@ -4986,7 +4473,7 @@ typedef struct IBindHostVtbl { void **ppvObj); HRESULT (STDMETHODCALLTYPE *MonikerBindToObject)( - IBindHost* This, + IBindHost *This, IMoniker *pMk, IBindCtx *pBC, IBindStatusCallback *pBSC, @@ -4995,6 +4482,7 @@ typedef struct IBindHostVtbl { END_INTERFACE } IBindHostVtbl; + interface IBindHost { CONST_VTBL IBindHostVtbl* lpVtbl; }; @@ -5035,17 +4523,6 @@ static FORCEINLINE HRESULT IBindHost_MonikerBindToObject(IBindHost* This,IMonike #endif -HRESULT STDMETHODCALLTYPE IBindHost_CreateMoniker_Proxy( - IBindHost* This, - LPOLESTR szName, - IBindCtx *pBC, - IMoniker **ppmk, - DWORD dwReserved); -void __RPC_STUB IBindHost_CreateMoniker_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); HRESULT STDMETHODCALLTYPE IBindHost_RemoteMonikerBindToStorage_Proxy( IBindHost* This, IMoniker *pMk, @@ -5136,51 +4613,81 @@ STDAPI HlinkNavigateMoniker(IUnknown *pUnk, IMoniker *pmkTarget); #ifndef __IInternet_FWD_DEFINED__ #define __IInternet_FWD_DEFINED__ typedef interface IInternet IInternet; +#ifdef __cplusplus +interface IInternet; +#endif /* __cplusplus */ #endif #ifndef __IInternetBindInfo_FWD_DEFINED__ #define __IInternetBindInfo_FWD_DEFINED__ typedef interface IInternetBindInfo IInternetBindInfo; +#ifdef __cplusplus +interface IInternetBindInfo; +#endif /* __cplusplus */ #endif #ifndef __IInternetBindInfoEx_FWD_DEFINED__ #define __IInternetBindInfoEx_FWD_DEFINED__ typedef interface IInternetBindInfoEx IInternetBindInfoEx; +#ifdef __cplusplus +interface IInternetBindInfoEx; +#endif /* __cplusplus */ #endif #ifndef __IInternetProtocolRoot_FWD_DEFINED__ #define __IInternetProtocolRoot_FWD_DEFINED__ typedef interface IInternetProtocolRoot IInternetProtocolRoot; +#ifdef __cplusplus +interface IInternetProtocolRoot; +#endif /* __cplusplus */ #endif #ifndef __IInternetProtocol_FWD_DEFINED__ #define __IInternetProtocol_FWD_DEFINED__ typedef interface IInternetProtocol IInternetProtocol; +#ifdef __cplusplus +interface IInternetProtocol; +#endif /* __cplusplus */ #endif #ifndef __IInternetProtocolEx_FWD_DEFINED__ #define __IInternetProtocolEx_FWD_DEFINED__ typedef interface IInternetProtocolEx IInternetProtocolEx; +#ifdef __cplusplus +interface IInternetProtocolEx; +#endif /* __cplusplus */ #endif #ifndef __IInternetProtocolSink_FWD_DEFINED__ #define __IInternetProtocolSink_FWD_DEFINED__ typedef interface IInternetProtocolSink IInternetProtocolSink; +#ifdef __cplusplus +interface IInternetProtocolSink; +#endif /* __cplusplus */ #endif #ifndef __IInternetProtocolInfo_FWD_DEFINED__ #define __IInternetProtocolInfo_FWD_DEFINED__ typedef interface IInternetProtocolInfo IInternetProtocolInfo; +#ifdef __cplusplus +interface IInternetProtocolInfo; +#endif /* __cplusplus */ #endif #ifndef __IInternetSession_FWD_DEFINED__ #define __IInternetSession_FWD_DEFINED__ typedef interface IInternetSession IInternetSession; +#ifdef __cplusplus +interface IInternetSession; +#endif /* __cplusplus */ #endif #ifndef __IInternetProtocolSinkStackable_FWD_DEFINED__ #define __IInternetProtocolSinkStackable_FWD_DEFINED__ typedef interface IInternetProtocolSinkStackable IInternetProtocolSinkStackable; +#ifdef __cplusplus +interface IInternetProtocolSinkStackable; +#endif /* __cplusplus */ #endif @@ -5209,18 +4716,19 @@ typedef struct IInternetVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInternet* This, + IInternet *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInternet* This); + IInternet *This); ULONG (STDMETHODCALLTYPE *Release)( - IInternet* This); + IInternet *This); END_INTERFACE } IInternetVtbl; + interface IInternet { CONST_VTBL IInternetVtbl* lpVtbl; }; @@ -5314,24 +4822,24 @@ typedef struct IInternetBindInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInternetBindInfo* This, + IInternetBindInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInternetBindInfo* This); + IInternetBindInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IInternetBindInfo* This); + IInternetBindInfo *This); /*** IInternetBindInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetBindInfo)( - IInternetBindInfo* This, + IInternetBindInfo *This, DWORD *grfBINDF, BINDINFO *pbindinfo); HRESULT (STDMETHODCALLTYPE *GetBindString)( - IInternetBindInfo* This, + IInternetBindInfo *This, ULONG ulStringType, LPOLESTR *ppwzStr, ULONG cEl, @@ -5339,6 +4847,7 @@ typedef struct IInternetBindInfoVtbl { END_INTERFACE } IInternetBindInfoVtbl; + interface IInternetBindInfo { CONST_VTBL IInternetBindInfoVtbl* lpVtbl; }; @@ -5375,26 +4884,6 @@ static FORCEINLINE HRESULT IInternetBindInfo_GetBindString(IInternetBindInfo* Th #endif -HRESULT STDMETHODCALLTYPE IInternetBindInfo_GetBindInfo_Proxy( - IInternetBindInfo* This, - DWORD *grfBINDF, - BINDINFO *pbindinfo); -void __RPC_STUB IInternetBindInfo_GetBindInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetBindInfo_GetBindString_Proxy( - IInternetBindInfo* This, - ULONG ulStringType, - LPOLESTR *ppwzStr, - ULONG cEl, - ULONG *pcElFetched); -void __RPC_STUB IInternetBindInfo_GetBindString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInternetBindInfo_INTERFACE_DEFINED__ */ @@ -5432,24 +4921,24 @@ typedef struct IInternetBindInfoExVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInternetBindInfoEx* This, + IInternetBindInfoEx *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInternetBindInfoEx* This); + IInternetBindInfoEx *This); ULONG (STDMETHODCALLTYPE *Release)( - IInternetBindInfoEx* This); + IInternetBindInfoEx *This); /*** IInternetBindInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetBindInfo)( - IInternetBindInfoEx* This, + IInternetBindInfoEx *This, DWORD *grfBINDF, BINDINFO *pbindinfo); HRESULT (STDMETHODCALLTYPE *GetBindString)( - IInternetBindInfoEx* This, + IInternetBindInfoEx *This, ULONG ulStringType, LPOLESTR *ppwzStr, ULONG cEl, @@ -5457,7 +4946,7 @@ typedef struct IInternetBindInfoExVtbl { /*** IInternetBindInfoEx methods ***/ HRESULT (STDMETHODCALLTYPE *GetBindInfoEx)( - IInternetBindInfoEx* This, + IInternetBindInfoEx *This, DWORD *grfBINDF, BINDINFO *pbindinfo, DWORD *grfBINDF2, @@ -5465,6 +4954,7 @@ typedef struct IInternetBindInfoExVtbl { END_INTERFACE } IInternetBindInfoExVtbl; + interface IInternetBindInfoEx { CONST_VTBL IInternetBindInfoExVtbl* lpVtbl; }; @@ -5507,17 +4997,6 @@ static FORCEINLINE HRESULT IInternetBindInfoEx_GetBindInfoEx(IInternetBindInfoEx #endif -HRESULT STDMETHODCALLTYPE IInternetBindInfoEx_GetBindInfoEx_Proxy( - IInternetBindInfoEx* This, - DWORD *grfBINDF, - BINDINFO *pbindinfo, - DWORD *grfBINDF2, - DWORD *pdwReserved); -void __RPC_STUB IInternetBindInfoEx_GetBindInfoEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInternetBindInfoEx_INTERFACE_DEFINED__ */ @@ -5602,19 +5081,19 @@ typedef struct IInternetProtocolRootVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInternetProtocolRoot* This, + IInternetProtocolRoot *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInternetProtocolRoot* This); + IInternetProtocolRoot *This); ULONG (STDMETHODCALLTYPE *Release)( - IInternetProtocolRoot* This); + IInternetProtocolRoot *This); /*** IInternetProtocolRoot methods ***/ HRESULT (STDMETHODCALLTYPE *Start)( - IInternetProtocolRoot* This, + IInternetProtocolRoot *This, LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, @@ -5622,26 +5101,27 @@ typedef struct IInternetProtocolRootVtbl { HANDLE_PTR dwReserved); HRESULT (STDMETHODCALLTYPE *Continue)( - IInternetProtocolRoot* This, + IInternetProtocolRoot *This, PROTOCOLDATA *pProtocolData); HRESULT (STDMETHODCALLTYPE *Abort)( - IInternetProtocolRoot* This, + IInternetProtocolRoot *This, HRESULT hrReason, DWORD dwOptions); HRESULT (STDMETHODCALLTYPE *Terminate)( - IInternetProtocolRoot* This, + IInternetProtocolRoot *This, DWORD dwOptions); HRESULT (STDMETHODCALLTYPE *Suspend)( - IInternetProtocolRoot* This); + IInternetProtocolRoot *This); HRESULT (STDMETHODCALLTYPE *Resume)( - IInternetProtocolRoot* This); + IInternetProtocolRoot *This); END_INTERFACE } IInternetProtocolRootVtbl; + interface IInternetProtocolRoot { CONST_VTBL IInternetProtocolRootVtbl* lpVtbl; }; @@ -5694,57 +5174,6 @@ static FORCEINLINE HRESULT IInternetProtocolRoot_Resume(IInternetProtocolRoot* T #endif -HRESULT STDMETHODCALLTYPE IInternetProtocolRoot_Start_Proxy( - IInternetProtocolRoot* This, - LPCWSTR szUrl, - IInternetProtocolSink *pOIProtSink, - IInternetBindInfo *pOIBindInfo, - DWORD grfPI, - HANDLE_PTR dwReserved); -void __RPC_STUB IInternetProtocolRoot_Start_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetProtocolRoot_Continue_Proxy( - IInternetProtocolRoot* This, - PROTOCOLDATA *pProtocolData); -void __RPC_STUB IInternetProtocolRoot_Continue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetProtocolRoot_Abort_Proxy( - IInternetProtocolRoot* This, - HRESULT hrReason, - DWORD dwOptions); -void __RPC_STUB IInternetProtocolRoot_Abort_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetProtocolRoot_Terminate_Proxy( - IInternetProtocolRoot* This, - DWORD dwOptions); -void __RPC_STUB IInternetProtocolRoot_Terminate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetProtocolRoot_Suspend_Proxy( - IInternetProtocolRoot* This); -void __RPC_STUB IInternetProtocolRoot_Suspend_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetProtocolRoot_Resume_Proxy( - IInternetProtocolRoot* This); -void __RPC_STUB IInternetProtocolRoot_Resume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInternetProtocolRoot_INTERFACE_DEFINED__ */ @@ -5792,19 +5221,19 @@ typedef struct IInternetProtocolVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInternetProtocol* This, + IInternetProtocol *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInternetProtocol* This); + IInternetProtocol *This); ULONG (STDMETHODCALLTYPE *Release)( - IInternetProtocol* This); + IInternetProtocol *This); /*** IInternetProtocolRoot methods ***/ HRESULT (STDMETHODCALLTYPE *Start)( - IInternetProtocol* This, + IInternetProtocol *This, LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, @@ -5812,46 +5241,47 @@ typedef struct IInternetProtocolVtbl { HANDLE_PTR dwReserved); HRESULT (STDMETHODCALLTYPE *Continue)( - IInternetProtocol* This, + IInternetProtocol *This, PROTOCOLDATA *pProtocolData); HRESULT (STDMETHODCALLTYPE *Abort)( - IInternetProtocol* This, + IInternetProtocol *This, HRESULT hrReason, DWORD dwOptions); HRESULT (STDMETHODCALLTYPE *Terminate)( - IInternetProtocol* This, + IInternetProtocol *This, DWORD dwOptions); HRESULT (STDMETHODCALLTYPE *Suspend)( - IInternetProtocol* This); + IInternetProtocol *This); HRESULT (STDMETHODCALLTYPE *Resume)( - IInternetProtocol* This); + IInternetProtocol *This); /*** IInternetProtocol methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - IInternetProtocol* This, + IInternetProtocol *This, void *pv, ULONG cb, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Seek)( - IInternetProtocol* This, + IInternetProtocol *This, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition); HRESULT (STDMETHODCALLTYPE *LockRequest)( - IInternetProtocol* This, + IInternetProtocol *This, DWORD dwOptions); HRESULT (STDMETHODCALLTYPE *UnlockRequest)( - IInternetProtocol* This); + IInternetProtocol *This); END_INTERFACE } IInternetProtocolVtbl; + interface IInternetProtocol { CONST_VTBL IInternetProtocolVtbl* lpVtbl; }; @@ -5922,41 +5352,6 @@ static FORCEINLINE HRESULT IInternetProtocol_UnlockRequest(IInternetProtocol* Th #endif -HRESULT STDMETHODCALLTYPE IInternetProtocol_Read_Proxy( - IInternetProtocol* This, - void *pv, - ULONG cb, - ULONG *pcbRead); -void __RPC_STUB IInternetProtocol_Read_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetProtocol_Seek_Proxy( - IInternetProtocol* This, - LARGE_INTEGER dlibMove, - DWORD dwOrigin, - ULARGE_INTEGER *plibNewPosition); -void __RPC_STUB IInternetProtocol_Seek_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetProtocol_LockRequest_Proxy( - IInternetProtocol* This, - DWORD dwOptions); -void __RPC_STUB IInternetProtocol_LockRequest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetProtocol_UnlockRequest_Proxy( - IInternetProtocol* This); -void __RPC_STUB IInternetProtocol_UnlockRequest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInternetProtocol_INTERFACE_DEFINED__ */ @@ -5994,19 +5389,19 @@ typedef struct IInternetProtocolExVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInternetProtocolEx* This, + IInternetProtocolEx *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInternetProtocolEx* This); + IInternetProtocolEx *This); ULONG (STDMETHODCALLTYPE *Release)( - IInternetProtocolEx* This); + IInternetProtocolEx *This); /*** IInternetProtocolRoot methods ***/ HRESULT (STDMETHODCALLTYPE *Start)( - IInternetProtocolEx* This, + IInternetProtocolEx *This, LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, @@ -6014,47 +5409,47 @@ typedef struct IInternetProtocolExVtbl { HANDLE_PTR dwReserved); HRESULT (STDMETHODCALLTYPE *Continue)( - IInternetProtocolEx* This, + IInternetProtocolEx *This, PROTOCOLDATA *pProtocolData); HRESULT (STDMETHODCALLTYPE *Abort)( - IInternetProtocolEx* This, + IInternetProtocolEx *This, HRESULT hrReason, DWORD dwOptions); HRESULT (STDMETHODCALLTYPE *Terminate)( - IInternetProtocolEx* This, + IInternetProtocolEx *This, DWORD dwOptions); HRESULT (STDMETHODCALLTYPE *Suspend)( - IInternetProtocolEx* This); + IInternetProtocolEx *This); HRESULT (STDMETHODCALLTYPE *Resume)( - IInternetProtocolEx* This); + IInternetProtocolEx *This); /*** IInternetProtocol methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - IInternetProtocolEx* This, + IInternetProtocolEx *This, void *pv, ULONG cb, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Seek)( - IInternetProtocolEx* This, + IInternetProtocolEx *This, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition); HRESULT (STDMETHODCALLTYPE *LockRequest)( - IInternetProtocolEx* This, + IInternetProtocolEx *This, DWORD dwOptions); HRESULT (STDMETHODCALLTYPE *UnlockRequest)( - IInternetProtocolEx* This); + IInternetProtocolEx *This); /*** IInternetProtocolEx methods ***/ HRESULT (STDMETHODCALLTYPE *StartEx)( - IInternetProtocolEx* This, + IInternetProtocolEx *This, IUri *pUri, IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, @@ -6063,6 +5458,7 @@ typedef struct IInternetProtocolExVtbl { END_INTERFACE } IInternetProtocolExVtbl; + interface IInternetProtocolEx { CONST_VTBL IInternetProtocolExVtbl* lpVtbl; }; @@ -6139,18 +5535,6 @@ static FORCEINLINE HRESULT IInternetProtocolEx_StartEx(IInternetProtocolEx* This #endif -HRESULT STDMETHODCALLTYPE IInternetProtocolEx_StartEx_Proxy( - IInternetProtocolEx* This, - IUri *pUri, - IInternetProtocolSink *pOIProtSink, - IInternetBindInfo *pOIBindInfo, - DWORD grfPI, - HANDLE_PTR dwReserved); -void __RPC_STUB IInternetProtocolEx_StartEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInternetProtocolEx_INTERFACE_DEFINED__ */ @@ -6199,40 +5583,41 @@ typedef struct IInternetProtocolSinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInternetProtocolSink* This, + IInternetProtocolSink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInternetProtocolSink* This); + IInternetProtocolSink *This); ULONG (STDMETHODCALLTYPE *Release)( - IInternetProtocolSink* This); + IInternetProtocolSink *This); /*** IInternetProtocolSink methods ***/ HRESULT (STDMETHODCALLTYPE *Switch)( - IInternetProtocolSink* This, + IInternetProtocolSink *This, PROTOCOLDATA *pProtocolData); HRESULT (STDMETHODCALLTYPE *ReportProgress)( - IInternetProtocolSink* This, + IInternetProtocolSink *This, ULONG ulStatusCode, LPCWSTR szStatusText); HRESULT (STDMETHODCALLTYPE *ReportData)( - IInternetProtocolSink* This, + IInternetProtocolSink *This, DWORD grfBSCF, ULONG ulProgress, ULONG ulProgressMax); HRESULT (STDMETHODCALLTYPE *ReportResult)( - IInternetProtocolSink* This, + IInternetProtocolSink *This, HRESULT hrResult, DWORD dwError, LPCWSTR szResult); END_INTERFACE } IInternetProtocolSinkVtbl; + interface IInternetProtocolSink { CONST_VTBL IInternetProtocolSinkVtbl* lpVtbl; }; @@ -6277,43 +5662,6 @@ static FORCEINLINE HRESULT IInternetProtocolSink_ReportResult(IInternetProtocolS #endif -HRESULT STDMETHODCALLTYPE IInternetProtocolSink_Switch_Proxy( - IInternetProtocolSink* This, - PROTOCOLDATA *pProtocolData); -void __RPC_STUB IInternetProtocolSink_Switch_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetProtocolSink_ReportProgress_Proxy( - IInternetProtocolSink* This, - ULONG ulStatusCode, - LPCWSTR szStatusText); -void __RPC_STUB IInternetProtocolSink_ReportProgress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetProtocolSink_ReportData_Proxy( - IInternetProtocolSink* This, - DWORD grfBSCF, - ULONG ulProgress, - ULONG ulProgressMax); -void __RPC_STUB IInternetProtocolSink_ReportData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetProtocolSink_ReportResult_Proxy( - IInternetProtocolSink* This, - HRESULT hrResult, - DWORD dwError, - LPCWSTR szResult); -void __RPC_STUB IInternetProtocolSink_ReportResult_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInternetProtocolSink_INTERFACE_DEFINED__ */ @@ -6354,29 +5702,30 @@ typedef struct IInternetProtocolSinkStackableVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInternetProtocolSinkStackable* This, + IInternetProtocolSinkStackable *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInternetProtocolSinkStackable* This); + IInternetProtocolSinkStackable *This); ULONG (STDMETHODCALLTYPE *Release)( - IInternetProtocolSinkStackable* This); + IInternetProtocolSinkStackable *This); /*** IInternetProtocolSinkStackable methods ***/ HRESULT (STDMETHODCALLTYPE *SwitchSink)( - IInternetProtocolSinkStackable* This, + IInternetProtocolSinkStackable *This, IInternetProtocolSink *pOIProtSink); HRESULT (STDMETHODCALLTYPE *CommitSwitch)( - IInternetProtocolSinkStackable* This); + IInternetProtocolSinkStackable *This); HRESULT (STDMETHODCALLTYPE *RollbackSwitch)( - IInternetProtocolSinkStackable* This); + IInternetProtocolSinkStackable *This); END_INTERFACE } IInternetProtocolSinkStackableVtbl; + interface IInternetProtocolSinkStackable { CONST_VTBL IInternetProtocolSinkStackableVtbl* lpVtbl; }; @@ -6417,28 +5766,6 @@ static FORCEINLINE HRESULT IInternetProtocolSinkStackable_RollbackSwitch(IIntern #endif -HRESULT STDMETHODCALLTYPE IInternetProtocolSinkStackable_SwitchSink_Proxy( - IInternetProtocolSinkStackable* This, - IInternetProtocolSink *pOIProtSink); -void __RPC_STUB IInternetProtocolSinkStackable_SwitchSink_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetProtocolSinkStackable_CommitSwitch_Proxy( - IInternetProtocolSinkStackable* This); -void __RPC_STUB IInternetProtocolSinkStackable_CommitSwitch_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetProtocolSinkStackable_RollbackSwitch_Proxy( - IInternetProtocolSinkStackable* This); -void __RPC_STUB IInternetProtocolSinkStackable_RollbackSwitch_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInternetProtocolSinkStackable_INTERFACE_DEFINED__ */ @@ -6516,19 +5843,19 @@ typedef struct IInternetSessionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInternetSession* This, + IInternetSession *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInternetSession* This); + IInternetSession *This); ULONG (STDMETHODCALLTYPE *Release)( - IInternetSession* This); + IInternetSession *This); /*** IInternetSession methods ***/ HRESULT (STDMETHODCALLTYPE *RegisterNameSpace)( - IInternetSession* This, + IInternetSession *This, IClassFactory *pCF, REFCLSID rclsid, LPCWSTR pwzProtocol, @@ -6537,23 +5864,23 @@ typedef struct IInternetSessionVtbl { DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *UnregisterNameSpace)( - IInternetSession* This, + IInternetSession *This, IClassFactory *pCF, LPCWSTR pszProtocol); HRESULT (STDMETHODCALLTYPE *RegisterMimeFilter)( - IInternetSession* This, + IInternetSession *This, IClassFactory *pCF, REFCLSID rclsid, LPCWSTR pwzType); HRESULT (STDMETHODCALLTYPE *UnregisterMimeFilter)( - IInternetSession* This, + IInternetSession *This, IClassFactory *pCF, LPCWSTR pwzType); HRESULT (STDMETHODCALLTYPE *CreateBinding)( - IInternetSession* This, + IInternetSession *This, LPBC pBC, LPCWSTR szUrl, IUnknown *pUnkOuter, @@ -6562,14 +5889,14 @@ typedef struct IInternetSessionVtbl { DWORD dwOption); HRESULT (STDMETHODCALLTYPE *SetSessionOption)( - IInternetSession* This, + IInternetSession *This, DWORD dwOption, LPVOID pBuffer, DWORD dwBufferLength, DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *GetSessionOption)( - IInternetSession* This, + IInternetSession *This, DWORD dwOption, LPVOID pBuffer, DWORD *pdwBufferLength, @@ -6577,6 +5904,7 @@ typedef struct IInternetSessionVtbl { END_INTERFACE } IInternetSessionVtbl; + interface IInternetSession { CONST_VTBL IInternetSessionVtbl* lpVtbl; }; @@ -6633,82 +5961,6 @@ static FORCEINLINE HRESULT IInternetSession_GetSessionOption(IInternetSession* T #endif -HRESULT STDMETHODCALLTYPE IInternetSession_RegisterNameSpace_Proxy( - IInternetSession* This, - IClassFactory *pCF, - REFCLSID rclsid, - LPCWSTR pwzProtocol, - ULONG cPatterns, - const LPCWSTR *ppwzPatterns, - DWORD dwReserved); -void __RPC_STUB IInternetSession_RegisterNameSpace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetSession_UnregisterNameSpace_Proxy( - IInternetSession* This, - IClassFactory *pCF, - LPCWSTR pszProtocol); -void __RPC_STUB IInternetSession_UnregisterNameSpace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetSession_RegisterMimeFilter_Proxy( - IInternetSession* This, - IClassFactory *pCF, - REFCLSID rclsid, - LPCWSTR pwzType); -void __RPC_STUB IInternetSession_RegisterMimeFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetSession_UnregisterMimeFilter_Proxy( - IInternetSession* This, - IClassFactory *pCF, - LPCWSTR pwzType); -void __RPC_STUB IInternetSession_UnregisterMimeFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetSession_CreateBinding_Proxy( - IInternetSession* This, - LPBC pBC, - LPCWSTR szUrl, - IUnknown *pUnkOuter, - IUnknown **ppUnk, - IInternetProtocol **ppOInetProt, - DWORD dwOption); -void __RPC_STUB IInternetSession_CreateBinding_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetSession_SetSessionOption_Proxy( - IInternetSession* This, - DWORD dwOption, - LPVOID pBuffer, - DWORD dwBufferLength, - DWORD dwReserved); -void __RPC_STUB IInternetSession_SetSessionOption_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetSession_GetSessionOption_Proxy( - IInternetSession* This, - DWORD dwOption, - LPVOID pBuffer, - DWORD *pdwBufferLength, - DWORD dwReserved); -void __RPC_STUB IInternetSession_GetSessionOption_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInternetSession_INTERFACE_DEFINED__ */ @@ -6746,25 +5998,26 @@ typedef struct IInternetThreadSwitchVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInternetThreadSwitch* This, + IInternetThreadSwitch *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInternetThreadSwitch* This); + IInternetThreadSwitch *This); ULONG (STDMETHODCALLTYPE *Release)( - IInternetThreadSwitch* This); + IInternetThreadSwitch *This); /*** IInternetThreadSwitch methods ***/ HRESULT (STDMETHODCALLTYPE *Prepare)( - IInternetThreadSwitch* This); + IInternetThreadSwitch *This); HRESULT (STDMETHODCALLTYPE *Continue)( - IInternetThreadSwitch* This); + IInternetThreadSwitch *This); END_INTERFACE } IInternetThreadSwitchVtbl; + interface IInternetThreadSwitch { CONST_VTBL IInternetThreadSwitchVtbl* lpVtbl; }; @@ -6801,20 +6054,6 @@ static FORCEINLINE HRESULT IInternetThreadSwitch_Continue(IInternetThreadSwitch* #endif -HRESULT STDMETHODCALLTYPE IInternetThreadSwitch_Prepare_Proxy( - IInternetThreadSwitch* This); -void __RPC_STUB IInternetThreadSwitch_Prepare_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetThreadSwitch_Continue_Proxy( - IInternetThreadSwitch* This); -void __RPC_STUB IInternetThreadSwitch_Continue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInternetThreadSwitch_INTERFACE_DEFINED__ */ @@ -6852,27 +6091,28 @@ typedef struct IInternetPriorityVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInternetPriority* This, + IInternetPriority *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInternetPriority* This); + IInternetPriority *This); ULONG (STDMETHODCALLTYPE *Release)( - IInternetPriority* This); + IInternetPriority *This); /*** IInternetPriority methods ***/ HRESULT (STDMETHODCALLTYPE *SetPriority)( - IInternetPriority* This, + IInternetPriority *This, LONG nPriority); HRESULT (STDMETHODCALLTYPE *GetPriority)( - IInternetPriority* This, + IInternetPriority *This, LONG *pnPriority); END_INTERFACE } IInternetPriorityVtbl; + interface IInternetPriority { CONST_VTBL IInternetPriorityVtbl* lpVtbl; }; @@ -6909,22 +6149,6 @@ static FORCEINLINE HRESULT IInternetPriority_GetPriority(IInternetPriority* This #endif -HRESULT STDMETHODCALLTYPE IInternetPriority_SetPriority_Proxy( - IInternetPriority* This, - LONG nPriority); -void __RPC_STUB IInternetPriority_SetPriority_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetPriority_GetPriority_Proxy( - IInternetPriority* This, - LONG *pnPriority); -void __RPC_STUB IInternetPriority_GetPriority_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInternetPriority_INTERFACE_DEFINED__ */ @@ -7034,19 +6258,19 @@ typedef struct IInternetProtocolInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInternetProtocolInfo* This, + IInternetProtocolInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInternetProtocolInfo* This); + IInternetProtocolInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IInternetProtocolInfo* This); + IInternetProtocolInfo *This); /*** IInternetProtocolInfo methods ***/ HRESULT (STDMETHODCALLTYPE *ParseUrl)( - IInternetProtocolInfo* This, + IInternetProtocolInfo *This, LPCWSTR pwzUrl, PARSEACTION ParseAction, DWORD dwParseFlags, @@ -7056,7 +6280,7 @@ typedef struct IInternetProtocolInfoVtbl { DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *CombineUrl)( - IInternetProtocolInfo* This, + IInternetProtocolInfo *This, LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl, DWORD dwCombineFlags, @@ -7066,13 +6290,13 @@ typedef struct IInternetProtocolInfoVtbl { DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *CompareUrl)( - IInternetProtocolInfo* This, + IInternetProtocolInfo *This, LPCWSTR pwzUrl1, LPCWSTR pwzUrl2, DWORD dwCompareFlags); HRESULT (STDMETHODCALLTYPE *QueryInfo)( - IInternetProtocolInfo* This, + IInternetProtocolInfo *This, LPCWSTR pwzUrl, QUERYOPTION OueryOption, DWORD dwQueryFlags, @@ -7083,6 +6307,7 @@ typedef struct IInternetProtocolInfoVtbl { END_INTERFACE } IInternetProtocolInfoVtbl; + interface IInternetProtocolInfo { CONST_VTBL IInternetProtocolInfoVtbl* lpVtbl; }; @@ -7127,58 +6352,6 @@ static FORCEINLINE HRESULT IInternetProtocolInfo_QueryInfo(IInternetProtocolInfo #endif -HRESULT STDMETHODCALLTYPE IInternetProtocolInfo_ParseUrl_Proxy( - IInternetProtocolInfo* This, - LPCWSTR pwzUrl, - PARSEACTION ParseAction, - DWORD dwParseFlags, - LPWSTR pwzResult, - DWORD cchResult, - DWORD *pcchResult, - DWORD dwReserved); -void __RPC_STUB IInternetProtocolInfo_ParseUrl_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetProtocolInfo_CombineUrl_Proxy( - IInternetProtocolInfo* This, - LPCWSTR pwzBaseUrl, - LPCWSTR pwzRelativeUrl, - DWORD dwCombineFlags, - LPWSTR pwzResult, - DWORD cchResult, - DWORD *pcchResult, - DWORD dwReserved); -void __RPC_STUB IInternetProtocolInfo_CombineUrl_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetProtocolInfo_CompareUrl_Proxy( - IInternetProtocolInfo* This, - LPCWSTR pwzUrl1, - LPCWSTR pwzUrl2, - DWORD dwCompareFlags); -void __RPC_STUB IInternetProtocolInfo_CompareUrl_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetProtocolInfo_QueryInfo_Proxy( - IInternetProtocolInfo* This, - LPCWSTR pwzUrl, - QUERYOPTION OueryOption, - DWORD dwQueryFlags, - LPVOID pBuffer, - DWORD cbBuffer, - DWORD *pcbBuf, - DWORD dwReserved); -void __RPC_STUB IInternetProtocolInfo_QueryInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInternetProtocolInfo_INTERFACE_DEFINED__ */ @@ -7389,27 +6562,28 @@ typedef struct IInternetSecurityMgrSiteVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInternetSecurityMgrSite* This, + IInternetSecurityMgrSite *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInternetSecurityMgrSite* This); + IInternetSecurityMgrSite *This); ULONG (STDMETHODCALLTYPE *Release)( - IInternetSecurityMgrSite* This); + IInternetSecurityMgrSite *This); /*** IInternetSecurityMgrSite methods ***/ HRESULT (STDMETHODCALLTYPE *GetWindow)( - IInternetSecurityMgrSite* This, + IInternetSecurityMgrSite *This, HWND *phwnd); HRESULT (STDMETHODCALLTYPE *EnableModeless)( - IInternetSecurityMgrSite* This, + IInternetSecurityMgrSite *This, WINBOOL fEnable); END_INTERFACE } IInternetSecurityMgrSiteVtbl; + interface IInternetSecurityMgrSite { CONST_VTBL IInternetSecurityMgrSiteVtbl* lpVtbl; }; @@ -7446,22 +6620,6 @@ static FORCEINLINE HRESULT IInternetSecurityMgrSite_EnableModeless(IInternetSecu #endif -HRESULT STDMETHODCALLTYPE IInternetSecurityMgrSite_GetWindow_Proxy( - IInternetSecurityMgrSite* This, - HWND *phwnd); -void __RPC_STUB IInternetSecurityMgrSite_GetWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetSecurityMgrSite_EnableModeless_Proxy( - IInternetSecurityMgrSite* This, - WINBOOL fEnable); -void __RPC_STUB IInternetSecurityMgrSite_EnableModeless_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInternetSecurityMgrSite_INTERFACE_DEFINED__ */ @@ -7587,40 +6745,40 @@ typedef struct IInternetSecurityManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInternetSecurityManager* This, + IInternetSecurityManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInternetSecurityManager* This); + IInternetSecurityManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IInternetSecurityManager* This); + IInternetSecurityManager *This); /*** IInternetSecurityManager methods ***/ HRESULT (STDMETHODCALLTYPE *SetSecuritySite)( - IInternetSecurityManager* This, + IInternetSecurityManager *This, IInternetSecurityMgrSite *pSite); HRESULT (STDMETHODCALLTYPE *GetSecuritySite)( - IInternetSecurityManager* This, + IInternetSecurityManager *This, IInternetSecurityMgrSite **ppSite); HRESULT (STDMETHODCALLTYPE *MapUrlToZone)( - IInternetSecurityManager* This, + IInternetSecurityManager *This, LPCWSTR pwszUrl, DWORD *pdwZone, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetSecurityId)( - IInternetSecurityManager* This, + IInternetSecurityManager *This, LPCWSTR pwszUrl, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved); HRESULT (STDMETHODCALLTYPE *ProcessUrlAction)( - IInternetSecurityManager* This, + IInternetSecurityManager *This, LPCWSTR pwszUrl, DWORD dwAction, BYTE *pPolicy, @@ -7631,7 +6789,7 @@ typedef struct IInternetSecurityManagerVtbl { DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *QueryCustomPolicy)( - IInternetSecurityManager* This, + IInternetSecurityManager *This, LPCWSTR pwszUrl, REFGUID guidKey, BYTE **ppPolicy, @@ -7641,19 +6799,20 @@ typedef struct IInternetSecurityManagerVtbl { DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *SetZoneMapping)( - IInternetSecurityManager* This, + IInternetSecurityManager *This, DWORD dwZone, LPCWSTR lpszPattern, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetZoneMappings)( - IInternetSecurityManager* This, + IInternetSecurityManager *This, DWORD dwZone, IEnumString **ppenumString, DWORD dwFlags); END_INTERFACE } IInternetSecurityManagerVtbl; + interface IInternetSecurityManager { CONST_VTBL IInternetSecurityManagerVtbl* lpVtbl; }; @@ -7714,92 +6873,6 @@ static FORCEINLINE HRESULT IInternetSecurityManager_GetZoneMappings(IInternetSec #endif -HRESULT STDMETHODCALLTYPE IInternetSecurityManager_SetSecuritySite_Proxy( - IInternetSecurityManager* This, - IInternetSecurityMgrSite *pSite); -void __RPC_STUB IInternetSecurityManager_SetSecuritySite_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetSecurityManager_GetSecuritySite_Proxy( - IInternetSecurityManager* This, - IInternetSecurityMgrSite **ppSite); -void __RPC_STUB IInternetSecurityManager_GetSecuritySite_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetSecurityManager_MapUrlToZone_Proxy( - IInternetSecurityManager* This, - LPCWSTR pwszUrl, - DWORD *pdwZone, - DWORD dwFlags); -void __RPC_STUB IInternetSecurityManager_MapUrlToZone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetSecurityManager_GetSecurityId_Proxy( - IInternetSecurityManager* This, - LPCWSTR pwszUrl, - BYTE *pbSecurityId, - DWORD *pcbSecurityId, - DWORD_PTR dwReserved); -void __RPC_STUB IInternetSecurityManager_GetSecurityId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetSecurityManager_ProcessUrlAction_Proxy( - IInternetSecurityManager* This, - LPCWSTR pwszUrl, - DWORD dwAction, - BYTE *pPolicy, - DWORD cbPolicy, - BYTE *pContext, - DWORD cbContext, - DWORD dwFlags, - DWORD dwReserved); -void __RPC_STUB IInternetSecurityManager_ProcessUrlAction_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetSecurityManager_QueryCustomPolicy_Proxy( - IInternetSecurityManager* This, - LPCWSTR pwszUrl, - REFGUID guidKey, - BYTE **ppPolicy, - DWORD *pcbPolicy, - BYTE *pContext, - DWORD cbContext, - DWORD dwReserved); -void __RPC_STUB IInternetSecurityManager_QueryCustomPolicy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetSecurityManager_SetZoneMapping_Proxy( - IInternetSecurityManager* This, - DWORD dwZone, - LPCWSTR lpszPattern, - DWORD dwFlags); -void __RPC_STUB IInternetSecurityManager_SetZoneMapping_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetSecurityManager_GetZoneMappings_Proxy( - IInternetSecurityManager* This, - DWORD dwZone, - IEnumString **ppenumString, - DWORD dwFlags); -void __RPC_STUB IInternetSecurityManager_GetZoneMappings_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInternetSecurityManager_INTERFACE_DEFINED__ */ @@ -7841,40 +6914,40 @@ typedef struct IInternetSecurityManagerExVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInternetSecurityManagerEx* This, + IInternetSecurityManagerEx *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInternetSecurityManagerEx* This); + IInternetSecurityManagerEx *This); ULONG (STDMETHODCALLTYPE *Release)( - IInternetSecurityManagerEx* This); + IInternetSecurityManagerEx *This); /*** IInternetSecurityManager methods ***/ HRESULT (STDMETHODCALLTYPE *SetSecuritySite)( - IInternetSecurityManagerEx* This, + IInternetSecurityManagerEx *This, IInternetSecurityMgrSite *pSite); HRESULT (STDMETHODCALLTYPE *GetSecuritySite)( - IInternetSecurityManagerEx* This, + IInternetSecurityManagerEx *This, IInternetSecurityMgrSite **ppSite); HRESULT (STDMETHODCALLTYPE *MapUrlToZone)( - IInternetSecurityManagerEx* This, + IInternetSecurityManagerEx *This, LPCWSTR pwszUrl, DWORD *pdwZone, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetSecurityId)( - IInternetSecurityManagerEx* This, + IInternetSecurityManagerEx *This, LPCWSTR pwszUrl, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved); HRESULT (STDMETHODCALLTYPE *ProcessUrlAction)( - IInternetSecurityManagerEx* This, + IInternetSecurityManagerEx *This, LPCWSTR pwszUrl, DWORD dwAction, BYTE *pPolicy, @@ -7885,7 +6958,7 @@ typedef struct IInternetSecurityManagerExVtbl { DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *QueryCustomPolicy)( - IInternetSecurityManagerEx* This, + IInternetSecurityManagerEx *This, LPCWSTR pwszUrl, REFGUID guidKey, BYTE **ppPolicy, @@ -7895,20 +6968,20 @@ typedef struct IInternetSecurityManagerExVtbl { DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *SetZoneMapping)( - IInternetSecurityManagerEx* This, + IInternetSecurityManagerEx *This, DWORD dwZone, LPCWSTR lpszPattern, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetZoneMappings)( - IInternetSecurityManagerEx* This, + IInternetSecurityManagerEx *This, DWORD dwZone, IEnumString **ppenumString, DWORD dwFlags); /*** IInternetSecurityManagerEx methods ***/ HRESULT (STDMETHODCALLTYPE *ProcessUrlActionEx)( - IInternetSecurityManagerEx* This, + IInternetSecurityManagerEx *This, LPCWSTR pwszUrl, DWORD dwAction, BYTE *pPolicy, @@ -7921,6 +6994,7 @@ typedef struct IInternetSecurityManagerExVtbl { END_INTERFACE } IInternetSecurityManagerExVtbl; + interface IInternetSecurityManagerEx { CONST_VTBL IInternetSecurityManagerExVtbl* lpVtbl; }; @@ -7987,22 +7061,6 @@ static FORCEINLINE HRESULT IInternetSecurityManagerEx_ProcessUrlActionEx(IIntern #endif -HRESULT STDMETHODCALLTYPE IInternetSecurityManagerEx_ProcessUrlActionEx_Proxy( - IInternetSecurityManagerEx* This, - LPCWSTR pwszUrl, - DWORD dwAction, - BYTE *pPolicy, - DWORD cbPolicy, - BYTE *pContext, - DWORD cbContext, - DWORD dwFlags, - DWORD dwReserved, - DWORD *pdwOutFlags); -void __RPC_STUB IInternetSecurityManagerEx_ProcessUrlActionEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInternetSecurityManagerEx_INTERFACE_DEFINED__ */ @@ -8067,40 +7125,40 @@ typedef struct IInternetSecurityManagerEx2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInternetSecurityManagerEx2* This, + IInternetSecurityManagerEx2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInternetSecurityManagerEx2* This); + IInternetSecurityManagerEx2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IInternetSecurityManagerEx2* This); + IInternetSecurityManagerEx2 *This); /*** IInternetSecurityManager methods ***/ HRESULT (STDMETHODCALLTYPE *SetSecuritySite)( - IInternetSecurityManagerEx2* This, + IInternetSecurityManagerEx2 *This, IInternetSecurityMgrSite *pSite); HRESULT (STDMETHODCALLTYPE *GetSecuritySite)( - IInternetSecurityManagerEx2* This, + IInternetSecurityManagerEx2 *This, IInternetSecurityMgrSite **ppSite); HRESULT (STDMETHODCALLTYPE *MapUrlToZone)( - IInternetSecurityManagerEx2* This, + IInternetSecurityManagerEx2 *This, LPCWSTR pwszUrl, DWORD *pdwZone, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetSecurityId)( - IInternetSecurityManagerEx2* This, + IInternetSecurityManagerEx2 *This, LPCWSTR pwszUrl, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved); HRESULT (STDMETHODCALLTYPE *ProcessUrlAction)( - IInternetSecurityManagerEx2* This, + IInternetSecurityManagerEx2 *This, LPCWSTR pwszUrl, DWORD dwAction, BYTE *pPolicy, @@ -8111,7 +7169,7 @@ typedef struct IInternetSecurityManagerEx2Vtbl { DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *QueryCustomPolicy)( - IInternetSecurityManagerEx2* This, + IInternetSecurityManagerEx2 *This, LPCWSTR pwszUrl, REFGUID guidKey, BYTE **ppPolicy, @@ -8121,20 +7179,20 @@ typedef struct IInternetSecurityManagerEx2Vtbl { DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *SetZoneMapping)( - IInternetSecurityManagerEx2* This, + IInternetSecurityManagerEx2 *This, DWORD dwZone, LPCWSTR lpszPattern, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetZoneMappings)( - IInternetSecurityManagerEx2* This, + IInternetSecurityManagerEx2 *This, DWORD dwZone, IEnumString **ppenumString, DWORD dwFlags); /*** IInternetSecurityManagerEx methods ***/ HRESULT (STDMETHODCALLTYPE *ProcessUrlActionEx)( - IInternetSecurityManagerEx2* This, + IInternetSecurityManagerEx2 *This, LPCWSTR pwszUrl, DWORD dwAction, BYTE *pPolicy, @@ -8147,7 +7205,7 @@ typedef struct IInternetSecurityManagerEx2Vtbl { /*** IInternetSecurityManagerEx2 methods ***/ HRESULT (STDMETHODCALLTYPE *MapUrlToZoneEx2)( - IInternetSecurityManagerEx2* This, + IInternetSecurityManagerEx2 *This, IUri *pUri, DWORD *pdwZone, DWORD dwFlags, @@ -8155,7 +7213,7 @@ typedef struct IInternetSecurityManagerEx2Vtbl { DWORD *pdwOutFlags); HRESULT (STDMETHODCALLTYPE *ProcessUrlActionEx2)( - IInternetSecurityManagerEx2* This, + IInternetSecurityManagerEx2 *This, IUri *pUri, DWORD dwAction, BYTE *pPolicy, @@ -8167,14 +7225,14 @@ typedef struct IInternetSecurityManagerEx2Vtbl { DWORD *pdwOutFlags); HRESULT (STDMETHODCALLTYPE *GetSecurityIdEx2)( - IInternetSecurityManagerEx2* This, + IInternetSecurityManagerEx2 *This, IUri *pUri, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved); HRESULT (STDMETHODCALLTYPE *QueryCustomPolicyEx2)( - IInternetSecurityManagerEx2* This, + IInternetSecurityManagerEx2 *This, IUri *pUri, REFGUID guidKey, BYTE **ppPolicy, @@ -8185,6 +7243,7 @@ typedef struct IInternetSecurityManagerEx2Vtbl { END_INTERFACE } IInternetSecurityManagerEx2Vtbl; + interface IInternetSecurityManagerEx2 { CONST_VTBL IInternetSecurityManagerEx2Vtbl* lpVtbl; }; @@ -8269,59 +7328,6 @@ static FORCEINLINE HRESULT IInternetSecurityManagerEx2_QueryCustomPolicyEx2(IInt #endif -HRESULT STDMETHODCALLTYPE IInternetSecurityManagerEx2_MapUrlToZoneEx2_Proxy( - IInternetSecurityManagerEx2* This, - IUri *pUri, - DWORD *pdwZone, - DWORD dwFlags, - LPWSTR *ppwszMappedUrl, - DWORD *pdwOutFlags); -void __RPC_STUB IInternetSecurityManagerEx2_MapUrlToZoneEx2_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetSecurityManagerEx2_ProcessUrlActionEx2_Proxy( - IInternetSecurityManagerEx2* This, - IUri *pUri, - DWORD dwAction, - BYTE *pPolicy, - DWORD cbPolicy, - BYTE *pContext, - DWORD cbContext, - DWORD dwFlags, - DWORD_PTR dwReserved, - DWORD *pdwOutFlags); -void __RPC_STUB IInternetSecurityManagerEx2_ProcessUrlActionEx2_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetSecurityManagerEx2_GetSecurityIdEx2_Proxy( - IInternetSecurityManagerEx2* This, - IUri *pUri, - BYTE *pbSecurityId, - DWORD *pcbSecurityId, - DWORD_PTR dwReserved); -void __RPC_STUB IInternetSecurityManagerEx2_GetSecurityIdEx2_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetSecurityManagerEx2_QueryCustomPolicyEx2_Proxy( - IInternetSecurityManagerEx2* This, - IUri *pUri, - REFGUID guidKey, - BYTE **ppPolicy, - DWORD *pcbPolicy, - BYTE *pContext, - DWORD cbContext, - DWORD_PTR dwReserved); -void __RPC_STUB IInternetSecurityManagerEx2_QueryCustomPolicyEx2_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInternetSecurityManagerEx2_INTERFACE_DEFINED__ */ @@ -8359,30 +7365,31 @@ typedef struct IZoneIdentifierVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IZoneIdentifier* This, + IZoneIdentifier *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IZoneIdentifier* This); + IZoneIdentifier *This); ULONG (STDMETHODCALLTYPE *Release)( - IZoneIdentifier* This); + IZoneIdentifier *This); /*** IZoneIdentifier methods ***/ HRESULT (STDMETHODCALLTYPE *GetId)( - IZoneIdentifier* This, + IZoneIdentifier *This, DWORD *pdwZone); HRESULT (STDMETHODCALLTYPE *SetId)( - IZoneIdentifier* This, + IZoneIdentifier *This, DWORD dwZone); HRESULT (STDMETHODCALLTYPE *Remove)( - IZoneIdentifier* This); + IZoneIdentifier *This); END_INTERFACE } IZoneIdentifierVtbl; + interface IZoneIdentifier { CONST_VTBL IZoneIdentifierVtbl* lpVtbl; }; @@ -8423,29 +7430,6 @@ static FORCEINLINE HRESULT IZoneIdentifier_Remove(IZoneIdentifier* This) { #endif -HRESULT STDMETHODCALLTYPE IZoneIdentifier_GetId_Proxy( - IZoneIdentifier* This, - DWORD *pdwZone); -void __RPC_STUB IZoneIdentifier_GetId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IZoneIdentifier_SetId_Proxy( - IZoneIdentifier* This, - DWORD dwZone); -void __RPC_STUB IZoneIdentifier_SetId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IZoneIdentifier_Remove_Proxy( - IZoneIdentifier* This); -void __RPC_STUB IZoneIdentifier_Remove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IZoneIdentifier_INTERFACE_DEFINED__ */ @@ -8497,25 +7481,25 @@ typedef struct IInternetHostSecurityManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInternetHostSecurityManager* This, + IInternetHostSecurityManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInternetHostSecurityManager* This); + IInternetHostSecurityManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IInternetHostSecurityManager* This); + IInternetHostSecurityManager *This); /*** IInternetHostSecurityManager methods ***/ HRESULT (STDMETHODCALLTYPE *GetSecurityId)( - IInternetHostSecurityManager* This, + IInternetHostSecurityManager *This, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved); HRESULT (STDMETHODCALLTYPE *ProcessUrlAction)( - IInternetHostSecurityManager* This, + IInternetHostSecurityManager *This, DWORD dwAction, BYTE *pPolicy, DWORD cbPolicy, @@ -8525,7 +7509,7 @@ typedef struct IInternetHostSecurityManagerVtbl { DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *QueryCustomPolicy)( - IInternetHostSecurityManager* This, + IInternetHostSecurityManager *This, REFGUID guidKey, BYTE **ppPolicy, DWORD *pcbPolicy, @@ -8535,6 +7519,7 @@ typedef struct IInternetHostSecurityManagerVtbl { END_INTERFACE } IInternetHostSecurityManagerVtbl; + interface IInternetHostSecurityManager { CONST_VTBL IInternetHostSecurityManagerVtbl* lpVtbl; }; @@ -8575,43 +7560,6 @@ static FORCEINLINE HRESULT IInternetHostSecurityManager_QueryCustomPolicy(IInter #endif -HRESULT STDMETHODCALLTYPE IInternetHostSecurityManager_GetSecurityId_Proxy( - IInternetHostSecurityManager* This, - BYTE *pbSecurityId, - DWORD *pcbSecurityId, - DWORD_PTR dwReserved); -void __RPC_STUB IInternetHostSecurityManager_GetSecurityId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetHostSecurityManager_ProcessUrlAction_Proxy( - IInternetHostSecurityManager* This, - DWORD dwAction, - BYTE *pPolicy, - DWORD cbPolicy, - BYTE *pContext, - DWORD cbContext, - DWORD dwFlags, - DWORD dwReserved); -void __RPC_STUB IInternetHostSecurityManager_ProcessUrlAction_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetHostSecurityManager_QueryCustomPolicy_Proxy( - IInternetHostSecurityManager* This, - REFGUID guidKey, - BYTE **ppPolicy, - DWORD *pcbPolicy, - BYTE *pContext, - DWORD cbContext, - DWORD dwReserved); -void __RPC_STUB IInternetHostSecurityManager_QueryCustomPolicy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInternetHostSecurityManager_INTERFACE_DEFINED__ */ @@ -8862,7 +7810,6 @@ enum { MAX_ZONE_DESCRIPTION = 200 }; - typedef enum __WIDL_urlmon_generated_name_00000011 { ZAFLAGS_CUSTOM_EDIT = 0x1, ZAFLAGS_ADD_SITES = 0x2, @@ -8979,29 +7926,29 @@ typedef struct IInternetZoneManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInternetZoneManager* This, + IInternetZoneManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInternetZoneManager* This); + IInternetZoneManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IInternetZoneManager* This); + IInternetZoneManager *This); /*** IInternetZoneManager methods ***/ HRESULT (STDMETHODCALLTYPE *GetZoneAttributes)( - IInternetZoneManager* This, + IInternetZoneManager *This, DWORD dwZone, ZONEATTRIBUTES *pZoneAttributes); HRESULT (STDMETHODCALLTYPE *SetZoneAttributes)( - IInternetZoneManager* This, + IInternetZoneManager *This, DWORD dwZone, ZONEATTRIBUTES *pZoneAttributes); HRESULT (STDMETHODCALLTYPE *GetZoneCustomPolicy)( - IInternetZoneManager* This, + IInternetZoneManager *This, DWORD dwZone, REFGUID guidKey, BYTE **ppPolicy, @@ -9009,7 +7956,7 @@ typedef struct IInternetZoneManagerVtbl { URLZONEREG urlZoneReg); HRESULT (STDMETHODCALLTYPE *SetZoneCustomPolicy)( - IInternetZoneManager* This, + IInternetZoneManager *This, DWORD dwZone, REFGUID guidKey, BYTE *pPolicy, @@ -9017,7 +7964,7 @@ typedef struct IInternetZoneManagerVtbl { URLZONEREG urlZoneReg); HRESULT (STDMETHODCALLTYPE *GetZoneActionPolicy)( - IInternetZoneManager* This, + IInternetZoneManager *This, DWORD dwZone, DWORD dwAction, BYTE *pPolicy, @@ -9025,7 +7972,7 @@ typedef struct IInternetZoneManagerVtbl { URLZONEREG urlZoneReg); HRESULT (STDMETHODCALLTYPE *SetZoneActionPolicy)( - IInternetZoneManager* This, + IInternetZoneManager *This, DWORD dwZone, DWORD dwAction, BYTE *pPolicy, @@ -9033,7 +7980,7 @@ typedef struct IInternetZoneManagerVtbl { URLZONEREG urlZoneReg); HRESULT (STDMETHODCALLTYPE *PromptAction)( - IInternetZoneManager* This, + IInternetZoneManager *This, DWORD dwAction, HWND hwndParent, LPCWSTR pwszUrl, @@ -9041,36 +7988,37 @@ typedef struct IInternetZoneManagerVtbl { DWORD dwPromptFlags); HRESULT (STDMETHODCALLTYPE *LogAction)( - IInternetZoneManager* This, + IInternetZoneManager *This, DWORD dwAction, LPCWSTR pwszUrl, LPCWSTR pwszText, DWORD dwLogFlags); HRESULT (STDMETHODCALLTYPE *CreateZoneEnumerator)( - IInternetZoneManager* This, + IInternetZoneManager *This, DWORD *pdwEnum, DWORD *pdwCount, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetZoneAt)( - IInternetZoneManager* This, + IInternetZoneManager *This, DWORD dwEnum, DWORD dwIndex, DWORD *pdwZone); HRESULT (STDMETHODCALLTYPE *DestroyZoneEnumerator)( - IInternetZoneManager* This, + IInternetZoneManager *This, DWORD dwEnum); HRESULT (STDMETHODCALLTYPE *CopyTemplatePoliciesToZone)( - IInternetZoneManager* This, + IInternetZoneManager *This, DWORD dwTemplate, DWORD dwZone, DWORD dwReserved); END_INTERFACE } IInternetZoneManagerVtbl; + interface IInternetZoneManager { CONST_VTBL IInternetZoneManagerVtbl* lpVtbl; }; @@ -9147,133 +8095,6 @@ static FORCEINLINE HRESULT IInternetZoneManager_CopyTemplatePoliciesToZone(IInte #endif -HRESULT STDMETHODCALLTYPE IInternetZoneManager_GetZoneAttributes_Proxy( - IInternetZoneManager* This, - DWORD dwZone, - ZONEATTRIBUTES *pZoneAttributes); -void __RPC_STUB IInternetZoneManager_GetZoneAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetZoneManager_SetZoneAttributes_Proxy( - IInternetZoneManager* This, - DWORD dwZone, - ZONEATTRIBUTES *pZoneAttributes); -void __RPC_STUB IInternetZoneManager_SetZoneAttributes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetZoneManager_GetZoneCustomPolicy_Proxy( - IInternetZoneManager* This, - DWORD dwZone, - REFGUID guidKey, - BYTE **ppPolicy, - DWORD *pcbPolicy, - URLZONEREG urlZoneReg); -void __RPC_STUB IInternetZoneManager_GetZoneCustomPolicy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetZoneManager_SetZoneCustomPolicy_Proxy( - IInternetZoneManager* This, - DWORD dwZone, - REFGUID guidKey, - BYTE *pPolicy, - DWORD cbPolicy, - URLZONEREG urlZoneReg); -void __RPC_STUB IInternetZoneManager_SetZoneCustomPolicy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetZoneManager_GetZoneActionPolicy_Proxy( - IInternetZoneManager* This, - DWORD dwZone, - DWORD dwAction, - BYTE *pPolicy, - DWORD cbPolicy, - URLZONEREG urlZoneReg); -void __RPC_STUB IInternetZoneManager_GetZoneActionPolicy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetZoneManager_SetZoneActionPolicy_Proxy( - IInternetZoneManager* This, - DWORD dwZone, - DWORD dwAction, - BYTE *pPolicy, - DWORD cbPolicy, - URLZONEREG urlZoneReg); -void __RPC_STUB IInternetZoneManager_SetZoneActionPolicy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetZoneManager_PromptAction_Proxy( - IInternetZoneManager* This, - DWORD dwAction, - HWND hwndParent, - LPCWSTR pwszUrl, - LPCWSTR pwszText, - DWORD dwPromptFlags); -void __RPC_STUB IInternetZoneManager_PromptAction_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetZoneManager_LogAction_Proxy( - IInternetZoneManager* This, - DWORD dwAction, - LPCWSTR pwszUrl, - LPCWSTR pwszText, - DWORD dwLogFlags); -void __RPC_STUB IInternetZoneManager_LogAction_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetZoneManager_CreateZoneEnumerator_Proxy( - IInternetZoneManager* This, - DWORD *pdwEnum, - DWORD *pdwCount, - DWORD dwFlags); -void __RPC_STUB IInternetZoneManager_CreateZoneEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetZoneManager_GetZoneAt_Proxy( - IInternetZoneManager* This, - DWORD dwEnum, - DWORD dwIndex, - DWORD *pdwZone); -void __RPC_STUB IInternetZoneManager_GetZoneAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetZoneManager_DestroyZoneEnumerator_Proxy( - IInternetZoneManager* This, - DWORD dwEnum); -void __RPC_STUB IInternetZoneManager_DestroyZoneEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetZoneManager_CopyTemplatePoliciesToZone_Proxy( - IInternetZoneManager* This, - DWORD dwTemplate, - DWORD dwZone, - DWORD dwReserved); -void __RPC_STUB IInternetZoneManager_CopyTemplatePoliciesToZone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInternetZoneManager_INTERFACE_DEFINED__ */ @@ -9320,29 +8141,29 @@ typedef struct IInternetZoneManagerExVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInternetZoneManagerEx* This, + IInternetZoneManagerEx *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInternetZoneManagerEx* This); + IInternetZoneManagerEx *This); ULONG (STDMETHODCALLTYPE *Release)( - IInternetZoneManagerEx* This); + IInternetZoneManagerEx *This); /*** IInternetZoneManager methods ***/ HRESULT (STDMETHODCALLTYPE *GetZoneAttributes)( - IInternetZoneManagerEx* This, + IInternetZoneManagerEx *This, DWORD dwZone, ZONEATTRIBUTES *pZoneAttributes); HRESULT (STDMETHODCALLTYPE *SetZoneAttributes)( - IInternetZoneManagerEx* This, + IInternetZoneManagerEx *This, DWORD dwZone, ZONEATTRIBUTES *pZoneAttributes); HRESULT (STDMETHODCALLTYPE *GetZoneCustomPolicy)( - IInternetZoneManagerEx* This, + IInternetZoneManagerEx *This, DWORD dwZone, REFGUID guidKey, BYTE **ppPolicy, @@ -9350,7 +8171,7 @@ typedef struct IInternetZoneManagerExVtbl { URLZONEREG urlZoneReg); HRESULT (STDMETHODCALLTYPE *SetZoneCustomPolicy)( - IInternetZoneManagerEx* This, + IInternetZoneManagerEx *This, DWORD dwZone, REFGUID guidKey, BYTE *pPolicy, @@ -9358,7 +8179,7 @@ typedef struct IInternetZoneManagerExVtbl { URLZONEREG urlZoneReg); HRESULT (STDMETHODCALLTYPE *GetZoneActionPolicy)( - IInternetZoneManagerEx* This, + IInternetZoneManagerEx *This, DWORD dwZone, DWORD dwAction, BYTE *pPolicy, @@ -9366,7 +8187,7 @@ typedef struct IInternetZoneManagerExVtbl { URLZONEREG urlZoneReg); HRESULT (STDMETHODCALLTYPE *SetZoneActionPolicy)( - IInternetZoneManagerEx* This, + IInternetZoneManagerEx *This, DWORD dwZone, DWORD dwAction, BYTE *pPolicy, @@ -9374,7 +8195,7 @@ typedef struct IInternetZoneManagerExVtbl { URLZONEREG urlZoneReg); HRESULT (STDMETHODCALLTYPE *PromptAction)( - IInternetZoneManagerEx* This, + IInternetZoneManagerEx *This, DWORD dwAction, HWND hwndParent, LPCWSTR pwszUrl, @@ -9382,37 +8203,37 @@ typedef struct IInternetZoneManagerExVtbl { DWORD dwPromptFlags); HRESULT (STDMETHODCALLTYPE *LogAction)( - IInternetZoneManagerEx* This, + IInternetZoneManagerEx *This, DWORD dwAction, LPCWSTR pwszUrl, LPCWSTR pwszText, DWORD dwLogFlags); HRESULT (STDMETHODCALLTYPE *CreateZoneEnumerator)( - IInternetZoneManagerEx* This, + IInternetZoneManagerEx *This, DWORD *pdwEnum, DWORD *pdwCount, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetZoneAt)( - IInternetZoneManagerEx* This, + IInternetZoneManagerEx *This, DWORD dwEnum, DWORD dwIndex, DWORD *pdwZone); HRESULT (STDMETHODCALLTYPE *DestroyZoneEnumerator)( - IInternetZoneManagerEx* This, + IInternetZoneManagerEx *This, DWORD dwEnum); HRESULT (STDMETHODCALLTYPE *CopyTemplatePoliciesToZone)( - IInternetZoneManagerEx* This, + IInternetZoneManagerEx *This, DWORD dwTemplate, DWORD dwZone, DWORD dwReserved); /*** IInternetZoneManagerEx methods ***/ HRESULT (STDMETHODCALLTYPE *GetZoneActionPolicyEx)( - IInternetZoneManagerEx* This, + IInternetZoneManagerEx *This, DWORD dwZone, DWORD dwAction, BYTE *pPolicy, @@ -9421,7 +8242,7 @@ typedef struct IInternetZoneManagerExVtbl { DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *SetZoneActionPolicyEx)( - IInternetZoneManagerEx* This, + IInternetZoneManagerEx *This, DWORD dwZone, DWORD dwAction, BYTE *pPolicy, @@ -9431,6 +8252,7 @@ typedef struct IInternetZoneManagerExVtbl { END_INTERFACE } IInternetZoneManagerExVtbl; + interface IInternetZoneManagerEx { CONST_VTBL IInternetZoneManagerExVtbl* lpVtbl; }; @@ -9517,32 +8339,6 @@ static FORCEINLINE HRESULT IInternetZoneManagerEx_SetZoneActionPolicyEx(IInterne #endif -HRESULT STDMETHODCALLTYPE IInternetZoneManagerEx_GetZoneActionPolicyEx_Proxy( - IInternetZoneManagerEx* This, - DWORD dwZone, - DWORD dwAction, - BYTE *pPolicy, - DWORD cbPolicy, - URLZONEREG urlZoneReg, - DWORD dwFlags); -void __RPC_STUB IInternetZoneManagerEx_GetZoneActionPolicyEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetZoneManagerEx_SetZoneActionPolicyEx_Proxy( - IInternetZoneManagerEx* This, - DWORD dwZone, - DWORD dwAction, - BYTE *pPolicy, - DWORD cbPolicy, - URLZONEREG urlZoneReg, - DWORD dwFlags); -void __RPC_STUB IInternetZoneManagerEx_SetZoneActionPolicyEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInternetZoneManagerEx_INTERFACE_DEFINED__ */ @@ -9597,29 +8393,29 @@ typedef struct IInternetZoneManagerEx2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IInternetZoneManagerEx2* This, + IInternetZoneManagerEx2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IInternetZoneManagerEx2* This); + IInternetZoneManagerEx2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IInternetZoneManagerEx2* This); + IInternetZoneManagerEx2 *This); /*** IInternetZoneManager methods ***/ HRESULT (STDMETHODCALLTYPE *GetZoneAttributes)( - IInternetZoneManagerEx2* This, + IInternetZoneManagerEx2 *This, DWORD dwZone, ZONEATTRIBUTES *pZoneAttributes); HRESULT (STDMETHODCALLTYPE *SetZoneAttributes)( - IInternetZoneManagerEx2* This, + IInternetZoneManagerEx2 *This, DWORD dwZone, ZONEATTRIBUTES *pZoneAttributes); HRESULT (STDMETHODCALLTYPE *GetZoneCustomPolicy)( - IInternetZoneManagerEx2* This, + IInternetZoneManagerEx2 *This, DWORD dwZone, REFGUID guidKey, BYTE **ppPolicy, @@ -9627,7 +8423,7 @@ typedef struct IInternetZoneManagerEx2Vtbl { URLZONEREG urlZoneReg); HRESULT (STDMETHODCALLTYPE *SetZoneCustomPolicy)( - IInternetZoneManagerEx2* This, + IInternetZoneManagerEx2 *This, DWORD dwZone, REFGUID guidKey, BYTE *pPolicy, @@ -9635,7 +8431,7 @@ typedef struct IInternetZoneManagerEx2Vtbl { URLZONEREG urlZoneReg); HRESULT (STDMETHODCALLTYPE *GetZoneActionPolicy)( - IInternetZoneManagerEx2* This, + IInternetZoneManagerEx2 *This, DWORD dwZone, DWORD dwAction, BYTE *pPolicy, @@ -9643,7 +8439,7 @@ typedef struct IInternetZoneManagerEx2Vtbl { URLZONEREG urlZoneReg); HRESULT (STDMETHODCALLTYPE *SetZoneActionPolicy)( - IInternetZoneManagerEx2* This, + IInternetZoneManagerEx2 *This, DWORD dwZone, DWORD dwAction, BYTE *pPolicy, @@ -9651,7 +8447,7 @@ typedef struct IInternetZoneManagerEx2Vtbl { URLZONEREG urlZoneReg); HRESULT (STDMETHODCALLTYPE *PromptAction)( - IInternetZoneManagerEx2* This, + IInternetZoneManagerEx2 *This, DWORD dwAction, HWND hwndParent, LPCWSTR pwszUrl, @@ -9659,37 +8455,37 @@ typedef struct IInternetZoneManagerEx2Vtbl { DWORD dwPromptFlags); HRESULT (STDMETHODCALLTYPE *LogAction)( - IInternetZoneManagerEx2* This, + IInternetZoneManagerEx2 *This, DWORD dwAction, LPCWSTR pwszUrl, LPCWSTR pwszText, DWORD dwLogFlags); HRESULT (STDMETHODCALLTYPE *CreateZoneEnumerator)( - IInternetZoneManagerEx2* This, + IInternetZoneManagerEx2 *This, DWORD *pdwEnum, DWORD *pdwCount, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetZoneAt)( - IInternetZoneManagerEx2* This, + IInternetZoneManagerEx2 *This, DWORD dwEnum, DWORD dwIndex, DWORD *pdwZone); HRESULT (STDMETHODCALLTYPE *DestroyZoneEnumerator)( - IInternetZoneManagerEx2* This, + IInternetZoneManagerEx2 *This, DWORD dwEnum); HRESULT (STDMETHODCALLTYPE *CopyTemplatePoliciesToZone)( - IInternetZoneManagerEx2* This, + IInternetZoneManagerEx2 *This, DWORD dwTemplate, DWORD dwZone, DWORD dwReserved); /*** IInternetZoneManagerEx methods ***/ HRESULT (STDMETHODCALLTYPE *GetZoneActionPolicyEx)( - IInternetZoneManagerEx2* This, + IInternetZoneManagerEx2 *This, DWORD dwZone, DWORD dwAction, BYTE *pPolicy, @@ -9698,7 +8494,7 @@ typedef struct IInternetZoneManagerEx2Vtbl { DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *SetZoneActionPolicyEx)( - IInternetZoneManagerEx2* This, + IInternetZoneManagerEx2 *This, DWORD dwZone, DWORD dwAction, BYTE *pPolicy, @@ -9708,30 +8504,31 @@ typedef struct IInternetZoneManagerEx2Vtbl { /*** IInternetZoneManagerEx2 methods ***/ HRESULT (STDMETHODCALLTYPE *GetZoneAttributesEx)( - IInternetZoneManagerEx2* This, + IInternetZoneManagerEx2 *This, DWORD dwZone, ZONEATTRIBUTES *pZoneAttributes, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetZoneSecurityState)( - IInternetZoneManagerEx2* This, + IInternetZoneManagerEx2 *This, DWORD dwZoneIndex, WINBOOL fRespectPolicy, LPDWORD pdwState, WINBOOL *pfPolicyEncountered); HRESULT (STDMETHODCALLTYPE *GetIESecurityState)( - IInternetZoneManagerEx2* This, + IInternetZoneManagerEx2 *This, WINBOOL fRespectPolicy, LPDWORD pdwState, WINBOOL *pfPolicyEncountered, WINBOOL fNoCache); HRESULT (STDMETHODCALLTYPE *FixUnsecureSettings)( - IInternetZoneManagerEx2* This); + IInternetZoneManagerEx2 *This); END_INTERFACE } IInternetZoneManagerEx2Vtbl; + interface IInternetZoneManagerEx2 { CONST_VTBL IInternetZoneManagerEx2Vtbl* lpVtbl; }; @@ -9836,45 +8633,6 @@ static FORCEINLINE HRESULT IInternetZoneManagerEx2_FixUnsecureSettings(IInternet #endif -HRESULT STDMETHODCALLTYPE IInternetZoneManagerEx2_GetZoneAttributesEx_Proxy( - IInternetZoneManagerEx2* This, - DWORD dwZone, - ZONEATTRIBUTES *pZoneAttributes, - DWORD dwFlags); -void __RPC_STUB IInternetZoneManagerEx2_GetZoneAttributesEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetZoneManagerEx2_GetZoneSecurityState_Proxy( - IInternetZoneManagerEx2* This, - DWORD dwZoneIndex, - WINBOOL fRespectPolicy, - LPDWORD pdwState, - WINBOOL *pfPolicyEncountered); -void __RPC_STUB IInternetZoneManagerEx2_GetZoneSecurityState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetZoneManagerEx2_GetIESecurityState_Proxy( - IInternetZoneManagerEx2* This, - WINBOOL fRespectPolicy, - LPDWORD pdwState, - WINBOOL *pfPolicyEncountered, - WINBOOL fNoCache); -void __RPC_STUB IInternetZoneManagerEx2_GetIESecurityState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IInternetZoneManagerEx2_FixUnsecureSettings_Proxy( - IInternetZoneManagerEx2* This); -void __RPC_STUB IInternetZoneManagerEx2_FixUnsecureSettings_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IInternetZoneManagerEx2_INTERFACE_DEFINED__ */ @@ -9963,35 +8721,35 @@ typedef struct ISoftDistExtVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISoftDistExt* This, + ISoftDistExt *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISoftDistExt* This); + ISoftDistExt *This); ULONG (STDMETHODCALLTYPE *Release)( - ISoftDistExt* This); + ISoftDistExt *This); /*** ISoftDistExt methods ***/ HRESULT (STDMETHODCALLTYPE *ProcessSoftDist)( - ISoftDistExt* This, + ISoftDistExt *This, LPCWSTR szCDFURL, IXMLElement *pSoftDistElement, LPSOFTDISTINFO lpsdi); HRESULT (STDMETHODCALLTYPE *GetFirstCodeBase)( - ISoftDistExt* This, + ISoftDistExt *This, LPWSTR *szCodeBase, LPDWORD dwMaxSize); HRESULT (STDMETHODCALLTYPE *GetNextCodeBase)( - ISoftDistExt* This, + ISoftDistExt *This, LPWSTR *szCodeBase, LPDWORD dwMaxSize); HRESULT (STDMETHODCALLTYPE *AsyncInstallDistributionUnit)( - ISoftDistExt* This, + ISoftDistExt *This, IBindCtx *pbc, LPVOID pvReserved, DWORD flags, @@ -9999,6 +8757,7 @@ typedef struct ISoftDistExtVtbl { END_INTERFACE } ISoftDistExtVtbl; + interface ISoftDistExt { CONST_VTBL ISoftDistExtVtbl* lpVtbl; }; @@ -10043,45 +8802,6 @@ static FORCEINLINE HRESULT ISoftDistExt_AsyncInstallDistributionUnit(ISoftDistEx #endif -HRESULT STDMETHODCALLTYPE ISoftDistExt_ProcessSoftDist_Proxy( - ISoftDistExt* This, - LPCWSTR szCDFURL, - IXMLElement *pSoftDistElement, - LPSOFTDISTINFO lpsdi); -void __RPC_STUB ISoftDistExt_ProcessSoftDist_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISoftDistExt_GetFirstCodeBase_Proxy( - ISoftDistExt* This, - LPWSTR *szCodeBase, - LPDWORD dwMaxSize); -void __RPC_STUB ISoftDistExt_GetFirstCodeBase_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISoftDistExt_GetNextCodeBase_Proxy( - ISoftDistExt* This, - LPWSTR *szCodeBase, - LPDWORD dwMaxSize); -void __RPC_STUB ISoftDistExt_GetNextCodeBase_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISoftDistExt_AsyncInstallDistributionUnit_Proxy( - ISoftDistExt* This, - IBindCtx *pbc, - LPVOID pvReserved, - DWORD flags, - LPCODEBASEHOLD lpcbh); -void __RPC_STUB ISoftDistExt_AsyncInstallDistributionUnit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISoftDistExt_INTERFACE_DEFINED__ */ @@ -10122,27 +8842,28 @@ typedef struct ICatalogFileInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICatalogFileInfo* This, + ICatalogFileInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ICatalogFileInfo* This); + ICatalogFileInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - ICatalogFileInfo* This); + ICatalogFileInfo *This); /*** ICatalogFileInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetCatalogFile)( - ICatalogFileInfo* This, + ICatalogFileInfo *This, LPSTR *ppszCatalogFile); HRESULT (STDMETHODCALLTYPE *GetJavaTrust)( - ICatalogFileInfo* This, + ICatalogFileInfo *This, void **ppJavaTrust); END_INTERFACE } ICatalogFileInfoVtbl; + interface ICatalogFileInfo { CONST_VTBL ICatalogFileInfoVtbl* lpVtbl; }; @@ -10179,22 +8900,6 @@ static FORCEINLINE HRESULT ICatalogFileInfo_GetJavaTrust(ICatalogFileInfo* This, #endif -HRESULT STDMETHODCALLTYPE ICatalogFileInfo_GetCatalogFile_Proxy( - ICatalogFileInfo* This, - LPSTR *ppszCatalogFile); -void __RPC_STUB ICatalogFileInfo_GetCatalogFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ICatalogFileInfo_GetJavaTrust_Proxy( - ICatalogFileInfo* This, - void **ppJavaTrust); -void __RPC_STUB ICatalogFileInfo_GetJavaTrust_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ICatalogFileInfo_INTERFACE_DEFINED__ */ @@ -10251,19 +8956,19 @@ typedef struct IDataFilterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDataFilter* This, + IDataFilter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IDataFilter* This); + IDataFilter *This); ULONG (STDMETHODCALLTYPE *Release)( - IDataFilter* This); + IDataFilter *This); /*** IDataFilter methods ***/ HRESULT (STDMETHODCALLTYPE *DoEncode)( - IDataFilter* This, + IDataFilter *This, DWORD dwFlags, LONG lInBufferSize, BYTE *pbInBuffer, @@ -10275,7 +8980,7 @@ typedef struct IDataFilterVtbl { DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *DoDecode)( - IDataFilter* This, + IDataFilter *This, DWORD dwFlags, LONG lInBufferSize, BYTE *pbInBuffer, @@ -10287,11 +8992,12 @@ typedef struct IDataFilterVtbl { DWORD dwReserved); HRESULT (STDMETHODCALLTYPE *SetEncodingLevel)( - IDataFilter* This, + IDataFilter *This, DWORD dwEncLevel); END_INTERFACE } IDataFilterVtbl; + interface IDataFilter { CONST_VTBL IDataFilterVtbl* lpVtbl; }; @@ -10332,46 +9038,6 @@ static FORCEINLINE HRESULT IDataFilter_SetEncodingLevel(IDataFilter* This,DWORD #endif -HRESULT STDMETHODCALLTYPE IDataFilter_DoEncode_Proxy( - IDataFilter* This, - DWORD dwFlags, - LONG lInBufferSize, - BYTE *pbInBuffer, - LONG lOutBufferSize, - BYTE *pbOutBuffer, - LONG lInBytesAvailable, - LONG *plInBytesRead, - LONG *plOutBytesWritten, - DWORD dwReserved); -void __RPC_STUB IDataFilter_DoEncode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDataFilter_DoDecode_Proxy( - IDataFilter* This, - DWORD dwFlags, - LONG lInBufferSize, - BYTE *pbInBuffer, - LONG lOutBufferSize, - BYTE *pbOutBuffer, - LONG lInBytesAvailable, - LONG *plInBytesRead, - LONG *plOutBytesWritten, - DWORD dwReserved); -void __RPC_STUB IDataFilter_DoDecode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IDataFilter_SetEncodingLevel_Proxy( - IDataFilter* This, - DWORD dwEncLevel); -void __RPC_STUB IDataFilter_SetEncodingLevel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IDataFilter_INTERFACE_DEFINED__ */ @@ -10429,32 +9095,33 @@ typedef struct IEncodingFilterFactoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEncodingFilterFactory* This, + IEncodingFilterFactory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEncodingFilterFactory* This); + IEncodingFilterFactory *This); ULONG (STDMETHODCALLTYPE *Release)( - IEncodingFilterFactory* This); + IEncodingFilterFactory *This); /*** IEncodingFilterFactory methods ***/ HRESULT (STDMETHODCALLTYPE *FindBestFilter)( - IEncodingFilterFactory* This, + IEncodingFilterFactory *This, LPCWSTR pwzCodeIn, LPCWSTR pwzCodeOut, DATAINFO info, IDataFilter **ppDF); HRESULT (STDMETHODCALLTYPE *GetDefaultFilter)( - IEncodingFilterFactory* This, + IEncodingFilterFactory *This, LPCWSTR pwzCodeIn, LPCWSTR pwzCodeOut, IDataFilter **ppDF); END_INTERFACE } IEncodingFilterFactoryVtbl; + interface IEncodingFilterFactory { CONST_VTBL IEncodingFilterFactoryVtbl* lpVtbl; }; @@ -10491,27 +9158,6 @@ static FORCEINLINE HRESULT IEncodingFilterFactory_GetDefaultFilter(IEncodingFilt #endif -HRESULT STDMETHODCALLTYPE IEncodingFilterFactory_FindBestFilter_Proxy( - IEncodingFilterFactory* This, - LPCWSTR pwzCodeIn, - LPCWSTR pwzCodeOut, - DATAINFO info, - IDataFilter **ppDF); -void __RPC_STUB IEncodingFilterFactory_FindBestFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEncodingFilterFactory_GetDefaultFilter_Proxy( - IEncodingFilterFactory* This, - LPCWSTR pwzCodeIn, - LPCWSTR pwzCodeOut, - IDataFilter **ppDF); -void __RPC_STUB IEncodingFilterFactory_GetDefaultFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEncodingFilterFactory_INTERFACE_DEFINED__ */ @@ -10543,7 +9189,6 @@ struct CONFIRMSAFETY { DWORD dwFlags; }; - EXTERN_C const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY; #endif @@ -10577,24 +9222,25 @@ typedef struct IWrappedProtocolVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWrappedProtocol* This, + IWrappedProtocol *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWrappedProtocol* This); + IWrappedProtocol *This); ULONG (STDMETHODCALLTYPE *Release)( - IWrappedProtocol* This); + IWrappedProtocol *This); /*** IWrappedProtocol methods ***/ HRESULT (STDMETHODCALLTYPE *GetWrapperCode)( - IWrappedProtocol* This, + IWrappedProtocol *This, LONG *pnCode, DWORD_PTR dwReserved); END_INTERFACE } IWrappedProtocolVtbl; + interface IWrappedProtocol { CONST_VTBL IWrappedProtocolVtbl* lpVtbl; }; @@ -10627,15 +9273,6 @@ static FORCEINLINE HRESULT IWrappedProtocol_GetWrapperCode(IWrappedProtocol* Thi #endif -HRESULT STDMETHODCALLTYPE IWrappedProtocol_GetWrapperCode_Proxy( - IWrappedProtocol* This, - LONG *pnCode, - DWORD_PTR dwReserved); -void __RPC_STUB IWrappedProtocol_GetWrapperCode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWrappedProtocol_INTERFACE_DEFINED__ */ @@ -10677,24 +9314,25 @@ typedef struct IGetBindHandleVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IGetBindHandle* This, + IGetBindHandle *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IGetBindHandle* This); + IGetBindHandle *This); ULONG (STDMETHODCALLTYPE *Release)( - IGetBindHandle* This); + IGetBindHandle *This); /*** IGetBindHandle methods ***/ HRESULT (STDMETHODCALLTYPE *GetBindHandle)( - IGetBindHandle* This, + IGetBindHandle *This, BINDHANDLETYPES enumRequestedHandle, HANDLE *pRetHandle); END_INTERFACE } IGetBindHandleVtbl; + interface IGetBindHandle { CONST_VTBL IGetBindHandleVtbl* lpVtbl; }; @@ -10727,15 +9365,6 @@ static FORCEINLINE HRESULT IGetBindHandle_GetBindHandle(IGetBindHandle* This,BIN #endif -HRESULT STDMETHODCALLTYPE IGetBindHandle_GetBindHandle_Proxy( - IGetBindHandle* This, - BINDHANDLETYPES enumRequestedHandle, - HANDLE *pRetHandle); -void __RPC_STUB IGetBindHandle_GetBindHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IGetBindHandle_INTERFACE_DEFINED__ */ @@ -10781,24 +9410,25 @@ typedef struct IBindCallbackRedirectVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IBindCallbackRedirect* This, + IBindCallbackRedirect *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IBindCallbackRedirect* This); + IBindCallbackRedirect *This); ULONG (STDMETHODCALLTYPE *Release)( - IBindCallbackRedirect* This); + IBindCallbackRedirect *This); /*** IBindCallbackRedirect methods ***/ HRESULT (STDMETHODCALLTYPE *Redirect)( - IBindCallbackRedirect* This, + IBindCallbackRedirect *This, LPCWSTR lpcUrl, VARIANT_BOOL *vbCancel); END_INTERFACE } IBindCallbackRedirectVtbl; + interface IBindCallbackRedirect { CONST_VTBL IBindCallbackRedirectVtbl* lpVtbl; }; @@ -10831,15 +9461,6 @@ static FORCEINLINE HRESULT IBindCallbackRedirect_Redirect(IBindCallbackRedirect* #endif -HRESULT STDMETHODCALLTYPE IBindCallbackRedirect_Redirect_Proxy( - IBindCallbackRedirect* This, - LPCWSTR lpcUrl, - VARIANT_BOOL *vbCancel); -void __RPC_STUB IBindCallbackRedirect_Redirect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IBindCallbackRedirect_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/uxtheme.h b/lib/libc/include/any-windows-any/uxtheme.h index 84e78efb0e..61539860da 100644 --- a/lib/libc/include/any-windows-any/uxtheme.h +++ b/lib/libc/include/any-windows-any/uxtheme.h @@ -20,13 +20,113 @@ typedef HANDLE HTHEME; +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define MAX_THEMECOLOR 64 +#define MAX_THEMESIZE 64 +#endif + #if (NTDDI_VERSION >= NTDDI_WIN7) THEMEAPI_(WINBOOL) BeginPanningFeedback(HWND hwnd); THEMEAPI_(WINBOOL) UpdatePanningFeedback(HWND hwnd,LONG lTotalOverpanOffsetX,LONG lTotalOverpanOffsetY,WINBOOL fInInertia); THEMEAPI_(WINBOOL) EndPanningFeedback(HWND hwnd,WINBOOL fAnimateBack); #endif -#if _WIN32_WINNT >= 0x0600 +#if (NTDDI_VERSION >= NTDDI_WIN8) + +typedef enum TA_PROPERTY { + TAP_FLAGS, + TAP_TRANSFORMCOUNT, + TAP_STAGGERDELAY, + TAP_STAGGERDELAYCAP, + TAP_STAGGERDELAYFACTOR, + TAP_ZORDER, +} TA_PROPERTY; + +typedef enum TA_PROPERTY_FLAG { + TAPF_NONE = 0x0, + TAPF_HASSTAGGER = 0x1, + TAPF_ISRTLAWARE = 0x2, + TAPF_ALLOWCOLLECTION = 0x4, + TAPF_HASBACKGROUND = 0x8, + TAPF_HASPERSPECTIVE = 0x10, +} TA_PROPERTY_FLAG; + +THEMEAPI GetThemeAnimationProperty(HTHEME hTheme, int iStoryboardId, int iTargetId, TA_PROPERTY eProperty, VOID *pvProperty, DWORD cbSize, DWORD *pcbSizeOut); + +typedef enum TA_TRANSFORM_TYPE { + TATT_TRANSLATE_2D, + TATT_SCALE_2D, + TATT_OPACITY, + TATT_CLIP, +} TA_TRANSFORM_TYPE; + +typedef enum TA_TRANSFORM_FLAG { + TATF_NONE = 0x0, + TATF_TARGETVALUES_USER = 0x1, + TATF_HASINITIALVALUES = 0x2, + TATF_HASORIGINVALUES = 0x4, +} TA_TRANSFORM_FLAG; + +typedef struct TA_TRANSFORM { + TA_TRANSFORM_TYPE eTransformType; + DWORD dwTimingFunctionId; + DWORD dwStartTime; + DWORD dwDurationTime; + TA_TRANSFORM_FLAG eFlags; +} TA_TRANSFORM, *PTA_TRANSFORM; + +typedef struct TA_TRANSFORM_2D { + TA_TRANSFORM header; + float rX; + float rY; + float rInitialX; + float rInitialY; + float rOriginX; + float rOriginY; +} TA_TRANSFORM_2D, *PTA_TRANSFORM_2D; + +typedef struct TA_TRANSFORM_OPACITY { + TA_TRANSFORM header; + float rOpacity; + float rInitialOpacity; +} TA_TRANSFORM_OPACITY, *PTA_TRANSFORM_OPACITY; + +typedef struct TA_TRANSFORM_CLIP { + TA_TRANSFORM header; + float rLeft; + float rTop; + float rRight; + float rBottom; + float rInitialLeft; + float rInitialTop; + float rInitialRight; + float rInitialBottom; +} TA_TRANSFORM_CLIP, *PTA_TRANSFORM_CLIP; + +THEMEAPI GetThemeAnimationTransform(HTHEME hTheme, int iStoryboardId, int iTargetId, DWORD dwTransformIndex, TA_TRANSFORM *pTransform, DWORD cbSize, DWORD *pcbSizeOut); + +typedef enum TA_TIMINGFUNCTION_TYPE { + TTFT_UNDEFINED, + TTFT_CUBIC_BEZIER, +} TA_TIMINGFUNCTION_TYPE; + +typedef struct TA_TIMINGFUNCTION { + TA_TIMINGFUNCTION_TYPE eTimingFunctionType; +} TA_TIMINGFUNCTION, *PTA_TIMINGFUNCTION; + +typedef struct TA_CUBIC_BEZIER { + TA_TIMINGFUNCTION header; + float rX0; + float rY0; + float rX1; + float rY1; +} TA_CUBIC_BEZIER, *PTA_CUBIC_BEZIER; + +THEMEAPI GetThemeTimingFunction(HTHEME hTheme, int iTimingFunctionId, TA_TIMINGFUNCTION *pTimingFunction, DWORD cbSize, DWORD *pcbSizeOut); + +#endif + +#if (NTDDI_VERSION >= NTDDI_VISTA) #define GBF_DIRECT 0x00000001 #define GBF_COPY 0x00000002 @@ -39,9 +139,14 @@ THEMEAPI GetThemeTransitionDuration(HTHEME hTheme,int iPartId,int iStateIdFrom,i DECLARE_HANDLE(HPAINTBUFFER); typedef enum _BP_BUFFERFORMAT { - BPBF_COMPATIBLEBITMAP, BPBF_DIB, BPBF_TOPDOWNDIB, BPBF_TOPDOWNMONODIB + BPBF_COMPATIBLEBITMAP, + BPBF_DIB, + BPBF_TOPDOWNDIB, + BPBF_TOPDOWNMONODIB } BP_BUFFERFORMAT; +#define BPBF_COMPOSITED BPBF_TOPDOWNDIB + #define BPPF_ERASE 0x00000001 #define BPPF_NOCLIP 0x00000002 #define BPPF_NONCLIENT 0x00000004 @@ -61,13 +166,17 @@ THEMEAPI_(HDC) GetBufferedPaintDC(HPAINTBUFFER hBufferedPaint); THEMEAPI_(HRESULT) GetBufferedPaintBits(HPAINTBUFFER hBufferedPaint,RGBQUAD **ppbBuffer,int *pcxRow); THEMEAPI_(HRESULT) BufferedPaintClear(HPAINTBUFFER hBufferedPaint,const RECT *prc); THEMEAPI_(HRESULT) BufferedPaintSetAlpha(HPAINTBUFFER hBufferedPaint,const RECT *prc,BYTE alpha); +#define BufferedPaintMakeOpaque(hBufferedPaint, prc) BufferedPaintSetAlpha(hBufferedPaint, prc, 255) THEMEAPI_(HRESULT) BufferedPaintInit(VOID); THEMEAPI_(HRESULT) BufferedPaintUnInit(VOID); DECLARE_HANDLE(HANIMATIONBUFFER); typedef enum _BP_ANIMATIONSTYLE { - BPAS_NONE, BPAS_LINEAR, BPAS_CUBIC, BPAS_SINE + BPAS_NONE, + BPAS_LINEAR, + BPAS_CUBIC, + BPAS_SINE } BP_ANIMATIONSTYLE; typedef struct _BP_ANIMATIONPARAMS { @@ -87,7 +196,7 @@ typedef enum WINDOWTHEMEATTRIBUTETYPE { WTA_NONCLIENT = 1 } WINDOWTHEMEATTRIBUTETYPE; -typedef struct WTA_OPTIONS { +typedef struct _WTA_OPTIONS { DWORD dwFlags; DWORD dwMask; } WTA_OPTIONS, *PWTA_OPTIONS; @@ -110,21 +219,20 @@ static __inline HRESULT SetWindowThemeNonClientAttributes(HWND hwnd,DWORD dwMask THEMEAPI_(HTHEME) OpenThemeData(HWND hwnd,LPCWSTR pszClassList); -#if (_WIN32_WINNT >= 0x0600) #define OTD_FORCE_RECT_SIZING 0x00000001 #define OTD_NONCLIENT 0x00000002 #define OTD_VALIDBITS (OTD_FORCE_RECT_SIZING | OTD_NONCLIENT) +THEMEAPI_(HTHEME) OpenThemeDataForDpi(HWND hwnd, LPCWSTR pszClassList, UINT dpi); THEMEAPI_(HTHEME) OpenThemeDataEx(HWND hwnd,LPCWSTR pszClassList,DWORD dwFlags); -#endif - THEMEAPI CloseThemeData(HTHEME hTheme); THEMEAPI DrawThemeBackground(HTHEME hTheme,HDC hdc,int iPartId,int iStateId,const RECT *pRect,const RECT *pClipRect); -#define DTT_GRAYED 0x1 +#define DTT_GRAYED 0x00000001 +#define DTT_FLAGS2VALIDBITS DTT_GRAYED THEMEAPI DrawThemeText(HTHEME hTheme,HDC hdc,int iPartId,int iStateId,LPCWSTR pszText,int iCharCount,DWORD dwTextFlags,DWORD dwTextFlags2,const RECT *pRect); -#if (_WIN32_WINNT >= 0x0600) +#if (NTDDI_VERSION >= NTDDI_VISTA) #define DTT_TEXTCOLOR (__MSABI_LONG(1U) << 0) #define DTT_BORDERCOLOR (__MSABI_LONG(1U) << 1) @@ -170,7 +278,9 @@ THEMEAPI GetThemeBackgroundContentRect(HTHEME hTheme,HDC hdc,int iPartId,int iSt THEMEAPI GetThemeBackgroundExtent(HTHEME hTheme,HDC hdc,int iPartId,int iStateId,const RECT *pContentRect,RECT *pExtentRect); typedef enum THEMESIZE { - TS_MIN,TS_TRUE,TS_DRAW + TS_MIN, + TS_TRUE, + TS_DRAW } THEMESIZE; THEMEAPI GetThemePartSize(HTHEME hTheme,HDC hdc,int iPartId,int iStateId,RECT *prc,enum THEMESIZE eSize,SIZE *psz); @@ -215,7 +325,7 @@ typedef struct _MARGINS { THEMEAPI GetThemeMargins(HTHEME hTheme,HDC hdc,int iPartId,int iStateId,int iPropId,RECT *prc,MARGINS *pMargins); -#if (_WIN32_WINNT >= 0x0600) +#if (NTDDI_VERSION >= NTDDI_VISTA) #define MAX_INTLIST_COUNT 402 #else #define MAX_INTLIST_COUNT 10 @@ -229,7 +339,11 @@ typedef struct _INTLIST { THEMEAPI GetThemeIntList(HTHEME hTheme,int iPartId,int iStateId,int iPropId,INTLIST *pIntList); typedef enum PROPERTYORIGIN { - PO_STATE,PO_PART,PO_CLASS,PO_GLOBAL,PO_NOTFOUND + PO_STATE, + PO_PART, + PO_CLASS, + PO_GLOBAL, + PO_NOTFOUND } PROPERTYORIGIN; THEMEAPI GetThemePropertyOrigin(HTHEME hTheme,int iPartId,int iStateId,int iPropId,enum PROPERTYORIGIN *pOrigin); @@ -250,7 +364,7 @@ THEMEAPI_(HTHEME) GetWindowTheme(HWND hwnd); #define ETDT_ENABLE 0x00000002 #define ETDT_USETABTEXTURE 0x00000004 #define ETDT_ENABLETAB (ETDT_ENABLE | ETDT_USETABTEXTURE) -#if (_WIN32_WINNT >= 0x0600) +#if (NTDDI_VERSION >= NTDDI_VISTA) #define ETDT_USEAEROWIZARDTABTEXTURE 0x00000008 #define ETDT_ENABLEAEROWIZARDTAB (ETDT_ENABLE | ETDT_USEAEROWIZARDTABTEXTURE) #define ETDT_VALIDBITS (ETDT_DISABLE | ETDT_ENABLE | ETDT_USETABTEXTURE | ETDT_USEAEROWIZARDTABTEXTURE) @@ -262,8 +376,9 @@ THEMEAPI_(WINBOOL) IsThemeDialogTextureEnabled(HWND hwnd); #define STAP_ALLOW_NONCLIENT (1 << 0) #define STAP_ALLOW_CONTROLS (1 << 1) #define STAP_ALLOW_WEBCONTENT (1 << 2) +#define STAP_VALIDBITS (STAP_ALLOW_NONCLIENT | STAP_ALLOW_CONTROLS | STAP_ALLOW_WEBCONTENT) -THEMEAPI_(DWORD) GetThemeAppProperties(); +THEMEAPI_(DWORD) GetThemeAppProperties(VOID); THEMEAPI_(void) SetThemeAppProperties(DWORD dwFlags); THEMEAPI GetCurrentThemeName(LPWSTR pszThemeFileName,int cchMaxNameChars,LPWSTR pszColorBuff,int cchMaxColorChars,LPWSTR pszSizeBuff,int cchMaxSizeChars); @@ -275,7 +390,7 @@ THEMEAPI GetCurrentThemeName(LPWSTR pszThemeFileName,int cchMaxNameChars,LPWSTR THEMEAPI GetThemeDocumentationProperty(LPCWSTR pszThemeName,LPCWSTR pszPropertyName,LPWSTR pszValueBuff,int cchMaxValChars); THEMEAPI DrawThemeParentBackground(HWND hwnd,HDC hdc,RECT *prc); -#if (_WIN32_WINNT >= 0x0600) +#if (NTDDI_VERSION >= NTDDI_VISTA) #define DTPB_WINDOWDC 0x00000001 #define DTPB_USECTLCOLORSTATIC 0x00000002 #define DTPB_USEERASEBKGND 0x00000004 diff --git a/lib/libc/include/any-windows-any/vmr9.h b/lib/libc/include/any-windows-any/vmr9.h index e44485191b..6de4515959 100644 --- a/lib/libc/include/any-windows-any/vmr9.h +++ b/lib/libc/include/any-windows-any/vmr9.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from direct-x/include/vmr9.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from direct-x/include/vmr9.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,76 +21,121 @@ #ifndef __IVMRImagePresenter9_FWD_DEFINED__ #define __IVMRImagePresenter9_FWD_DEFINED__ typedef interface IVMRImagePresenter9 IVMRImagePresenter9; +#ifdef __cplusplus +interface IVMRImagePresenter9; +#endif /* __cplusplus */ #endif #ifndef __IVMRSurfaceAllocator9_FWD_DEFINED__ #define __IVMRSurfaceAllocator9_FWD_DEFINED__ typedef interface IVMRSurfaceAllocator9 IVMRSurfaceAllocator9; +#ifdef __cplusplus +interface IVMRSurfaceAllocator9; +#endif /* __cplusplus */ #endif #ifndef __IVMRSurfaceAllocatorEx9_FWD_DEFINED__ #define __IVMRSurfaceAllocatorEx9_FWD_DEFINED__ typedef interface IVMRSurfaceAllocatorEx9 IVMRSurfaceAllocatorEx9; +#ifdef __cplusplus +interface IVMRSurfaceAllocatorEx9; +#endif /* __cplusplus */ #endif #ifndef __IVMRSurfaceAllocatorNotify9_FWD_DEFINED__ #define __IVMRSurfaceAllocatorNotify9_FWD_DEFINED__ typedef interface IVMRSurfaceAllocatorNotify9 IVMRSurfaceAllocatorNotify9; +#ifdef __cplusplus +interface IVMRSurfaceAllocatorNotify9; +#endif /* __cplusplus */ #endif #ifndef __IVMRWindowlessControl9_FWD_DEFINED__ #define __IVMRWindowlessControl9_FWD_DEFINED__ typedef interface IVMRWindowlessControl9 IVMRWindowlessControl9; +#ifdef __cplusplus +interface IVMRWindowlessControl9; +#endif /* __cplusplus */ #endif #ifndef __IVMRMixerControl9_FWD_DEFINED__ #define __IVMRMixerControl9_FWD_DEFINED__ typedef interface IVMRMixerControl9 IVMRMixerControl9; +#ifdef __cplusplus +interface IVMRMixerControl9; +#endif /* __cplusplus */ #endif #ifndef __IVMRMixerBitmap9_FWD_DEFINED__ #define __IVMRMixerBitmap9_FWD_DEFINED__ typedef interface IVMRMixerBitmap9 IVMRMixerBitmap9; +#ifdef __cplusplus +interface IVMRMixerBitmap9; +#endif /* __cplusplus */ #endif #ifndef __IVMRSurface9_FWD_DEFINED__ #define __IVMRSurface9_FWD_DEFINED__ typedef interface IVMRSurface9 IVMRSurface9; +#ifdef __cplusplus +interface IVMRSurface9; +#endif /* __cplusplus */ #endif #ifndef __IVMRImagePresenterConfig9_FWD_DEFINED__ #define __IVMRImagePresenterConfig9_FWD_DEFINED__ typedef interface IVMRImagePresenterConfig9 IVMRImagePresenterConfig9; +#ifdef __cplusplus +interface IVMRImagePresenterConfig9; +#endif /* __cplusplus */ #endif #ifndef __IVMRVideoStreamControl9_FWD_DEFINED__ #define __IVMRVideoStreamControl9_FWD_DEFINED__ typedef interface IVMRVideoStreamControl9 IVMRVideoStreamControl9; +#ifdef __cplusplus +interface IVMRVideoStreamControl9; +#endif /* __cplusplus */ #endif #ifndef __IVMRFilterConfig9_FWD_DEFINED__ #define __IVMRFilterConfig9_FWD_DEFINED__ typedef interface IVMRFilterConfig9 IVMRFilterConfig9; +#ifdef __cplusplus +interface IVMRFilterConfig9; +#endif /* __cplusplus */ #endif #ifndef __IVMRAspectRatioControl9_FWD_DEFINED__ #define __IVMRAspectRatioControl9_FWD_DEFINED__ typedef interface IVMRAspectRatioControl9 IVMRAspectRatioControl9; +#ifdef __cplusplus +interface IVMRAspectRatioControl9; +#endif /* __cplusplus */ #endif #ifndef __IVMRMonitorConfig9_FWD_DEFINED__ #define __IVMRMonitorConfig9_FWD_DEFINED__ typedef interface IVMRMonitorConfig9 IVMRMonitorConfig9; +#ifdef __cplusplus +interface IVMRMonitorConfig9; +#endif /* __cplusplus */ #endif #ifndef __IVMRDeinterlaceControl9_FWD_DEFINED__ #define __IVMRDeinterlaceControl9_FWD_DEFINED__ typedef interface IVMRDeinterlaceControl9 IVMRDeinterlaceControl9; +#ifdef __cplusplus +interface IVMRDeinterlaceControl9; +#endif /* __cplusplus */ #endif #ifndef __IVMRImageCompositor9_FWD_DEFINED__ #define __IVMRImageCompositor9_FWD_DEFINED__ typedef interface IVMRImageCompositor9 IVMRImageCompositor9; +#ifdef __cplusplus +interface IVMRImageCompositor9; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -104,11 +150,17 @@ extern "C" { #ifndef __IDirect3DSurface9_FWD_DEFINED__ #define __IDirect3DSurface9_FWD_DEFINED__ typedef interface IDirect3DSurface9 IDirect3DSurface9; +#ifdef __cplusplus +interface IDirect3DSurface9; +#endif /* __cplusplus */ #endif #ifndef __IDirect3DDevice9_FWD_DEFINED__ #define __IDirect3DDevice9_FWD_DEFINED__ typedef interface IDirect3DDevice9 IDirect3DDevice9; +#ifdef __cplusplus +interface IDirect3DDevice9; +#endif /* __cplusplus */ #endif typedef LONGLONG REFERENCE_TIME; @@ -125,71 +177,113 @@ typedef struct __WIDL_vmr9_generated_name_00000003 { #ifndef __IVMRSurface9_FWD_DEFINED__ #define __IVMRSurface9_FWD_DEFINED__ typedef interface IVMRSurface9 IVMRSurface9; +#ifdef __cplusplus +interface IVMRSurface9; +#endif /* __cplusplus */ #endif #ifndef __IVMRSurfaceAllocator9_FWD_DEFINED__ #define __IVMRSurfaceAllocator9_FWD_DEFINED__ typedef interface IVMRSurfaceAllocator9 IVMRSurfaceAllocator9; +#ifdef __cplusplus +interface IVMRSurfaceAllocator9; +#endif /* __cplusplus */ #endif #ifndef __IVMRSurfaceAllocatorEx9_FWD_DEFINED__ #define __IVMRSurfaceAllocatorEx9_FWD_DEFINED__ typedef interface IVMRSurfaceAllocatorEx9 IVMRSurfaceAllocatorEx9; +#ifdef __cplusplus +interface IVMRSurfaceAllocatorEx9; +#endif /* __cplusplus */ #endif #ifndef __IVMRSurfaceAllocatorNotify9_FWD_DEFINED__ #define __IVMRSurfaceAllocatorNotify9_FWD_DEFINED__ typedef interface IVMRSurfaceAllocatorNotify9 IVMRSurfaceAllocatorNotify9; +#ifdef __cplusplus +interface IVMRSurfaceAllocatorNotify9; +#endif /* __cplusplus */ #endif #ifndef __IVMRImagePresenter9_FWD_DEFINED__ #define __IVMRImagePresenter9_FWD_DEFINED__ typedef interface IVMRImagePresenter9 IVMRImagePresenter9; +#ifdef __cplusplus +interface IVMRImagePresenter9; +#endif /* __cplusplus */ #endif #ifndef __IVMRImagePresenterConfig9_FWD_DEFINED__ #define __IVMRImagePresenterConfig9_FWD_DEFINED__ typedef interface IVMRImagePresenterConfig9 IVMRImagePresenterConfig9; +#ifdef __cplusplus +interface IVMRImagePresenterConfig9; +#endif /* __cplusplus */ #endif #ifndef __IVMRMonitorConfig9_FWD_DEFINED__ #define __IVMRMonitorConfig9_FWD_DEFINED__ typedef interface IVMRMonitorConfig9 IVMRMonitorConfig9; +#ifdef __cplusplus +interface IVMRMonitorConfig9; +#endif /* __cplusplus */ #endif #ifndef __IVMRWindowlessControl9_FWD_DEFINED__ #define __IVMRWindowlessControl9_FWD_DEFINED__ typedef interface IVMRWindowlessControl9 IVMRWindowlessControl9; +#ifdef __cplusplus +interface IVMRWindowlessControl9; +#endif /* __cplusplus */ #endif #ifndef __IVMRMixerControl9_FWD_DEFINED__ #define __IVMRMixerControl9_FWD_DEFINED__ typedef interface IVMRMixerControl9 IVMRMixerControl9; +#ifdef __cplusplus +interface IVMRMixerControl9; +#endif /* __cplusplus */ #endif #ifndef __IVMRImageCompositor9_FWD_DEFINED__ #define __IVMRImageCompositor9_FWD_DEFINED__ typedef interface IVMRImageCompositor9 IVMRImageCompositor9; +#ifdef __cplusplus +interface IVMRImageCompositor9; +#endif /* __cplusplus */ #endif #ifndef __IVMRMixerBitmap9_FWD_DEFINED__ #define __IVMRMixerBitmap9_FWD_DEFINED__ typedef interface IVMRMixerBitmap9 IVMRMixerBitmap9; +#ifdef __cplusplus +interface IVMRMixerBitmap9; +#endif /* __cplusplus */ #endif #ifndef __IVMRFilterConfig9_FWD_DEFINED__ #define __IVMRFilterConfig9_FWD_DEFINED__ typedef interface IVMRFilterConfig9 IVMRFilterConfig9; +#ifdef __cplusplus +interface IVMRFilterConfig9; +#endif /* __cplusplus */ #endif #ifndef __IVMRAspectRatioControl9_FWD_DEFINED__ #define __IVMRAspectRatioControl9_FWD_DEFINED__ typedef interface IVMRAspectRatioControl9 IVMRAspectRatioControl9; +#ifdef __cplusplus +interface IVMRAspectRatioControl9; +#endif /* __cplusplus */ #endif #ifndef __IVMRVideoStreamControl9_FWD_DEFINED__ #define __IVMRVideoStreamControl9_FWD_DEFINED__ typedef interface IVMRVideoStreamControl9 IVMRVideoStreamControl9; +#ifdef __cplusplus +interface IVMRVideoStreamControl9; +#endif /* __cplusplus */ #endif typedef enum _VMR9PresentationFlags { @@ -241,32 +335,33 @@ typedef struct IVMRImagePresenter9Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IVMRImagePresenter9* This, + IVMRImagePresenter9 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IVMRImagePresenter9* This); + IVMRImagePresenter9 *This); ULONG (STDMETHODCALLTYPE *Release)( - IVMRImagePresenter9* This); + IVMRImagePresenter9 *This); /*** IVMRImagePresenter9 methods ***/ HRESULT (STDMETHODCALLTYPE *StartPresenting)( - IVMRImagePresenter9* This, + IVMRImagePresenter9 *This, DWORD_PTR id); HRESULT (STDMETHODCALLTYPE *StopPresenting)( - IVMRImagePresenter9* This, + IVMRImagePresenter9 *This, DWORD_PTR id); HRESULT (STDMETHODCALLTYPE *PresentImage)( - IVMRImagePresenter9* This, + IVMRImagePresenter9 *This, DWORD_PTR id, VMR9PresentationInfo *info); END_INTERFACE } IVMRImagePresenter9Vtbl; + interface IVMRImagePresenter9 { CONST_VTBL IVMRImagePresenter9Vtbl* lpVtbl; }; @@ -307,31 +402,6 @@ static FORCEINLINE HRESULT IVMRImagePresenter9_PresentImage(IVMRImagePresenter9* #endif -HRESULT STDMETHODCALLTYPE IVMRImagePresenter9_StartPresenting_Proxy( - IVMRImagePresenter9* This, - DWORD_PTR id); -void __RPC_STUB IVMRImagePresenter9_StartPresenting_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRImagePresenter9_StopPresenting_Proxy( - IVMRImagePresenter9* This, - DWORD_PTR id); -void __RPC_STUB IVMRImagePresenter9_StopPresenting_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRImagePresenter9_PresentImage_Proxy( - IVMRImagePresenter9* This, - DWORD_PTR id, - VMR9PresentationInfo *info); -void __RPC_STUB IVMRImagePresenter9_PresentImage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IVMRImagePresenter9_INTERFACE_DEFINED__ */ @@ -392,40 +462,41 @@ typedef struct IVMRSurfaceAllocator9Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IVMRSurfaceAllocator9* This, + IVMRSurfaceAllocator9 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IVMRSurfaceAllocator9* This); + IVMRSurfaceAllocator9 *This); ULONG (STDMETHODCALLTYPE *Release)( - IVMRSurfaceAllocator9* This); + IVMRSurfaceAllocator9 *This); /*** IVMRSurfaceAllocator9 methods ***/ HRESULT (STDMETHODCALLTYPE *InitializeDevice)( - IVMRSurfaceAllocator9* This, + IVMRSurfaceAllocator9 *This, DWORD_PTR id, VMR9AllocationInfo *allocinfo, DWORD *numbuffers); HRESULT (STDMETHODCALLTYPE *TerminateDevice)( - IVMRSurfaceAllocator9* This, + IVMRSurfaceAllocator9 *This, DWORD_PTR id); HRESULT (STDMETHODCALLTYPE *GetSurface)( - IVMRSurfaceAllocator9* This, + IVMRSurfaceAllocator9 *This, DWORD_PTR id, DWORD surfaceindex, DWORD flags, IDirect3DSurface9 **surface); HRESULT (STDMETHODCALLTYPE *AdviseNotify)( - IVMRSurfaceAllocator9* This, + IVMRSurfaceAllocator9 *This, IVMRSurfaceAllocatorNotify9 *allocnotify); END_INTERFACE } IVMRSurfaceAllocator9Vtbl; + interface IVMRSurfaceAllocator9 { CONST_VTBL IVMRSurfaceAllocator9Vtbl* lpVtbl; }; @@ -470,43 +541,6 @@ static FORCEINLINE HRESULT IVMRSurfaceAllocator9_AdviseNotify(IVMRSurfaceAllocat #endif -HRESULT STDMETHODCALLTYPE IVMRSurfaceAllocator9_InitializeDevice_Proxy( - IVMRSurfaceAllocator9* This, - DWORD_PTR id, - VMR9AllocationInfo *allocinfo, - DWORD *numbuffers); -void __RPC_STUB IVMRSurfaceAllocator9_InitializeDevice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRSurfaceAllocator9_TerminateDevice_Proxy( - IVMRSurfaceAllocator9* This, - DWORD_PTR id); -void __RPC_STUB IVMRSurfaceAllocator9_TerminateDevice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRSurfaceAllocator9_GetSurface_Proxy( - IVMRSurfaceAllocator9* This, - DWORD_PTR id, - DWORD surfaceindex, - DWORD flags, - IDirect3DSurface9 **surface); -void __RPC_STUB IVMRSurfaceAllocator9_GetSurface_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRSurfaceAllocator9_AdviseNotify_Proxy( - IVMRSurfaceAllocator9* This, - IVMRSurfaceAllocatorNotify9 *allocnotify); -void __RPC_STUB IVMRSurfaceAllocator9_AdviseNotify_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IVMRSurfaceAllocator9_INTERFACE_DEFINED__ */ @@ -538,41 +572,41 @@ typedef struct IVMRSurfaceAllocatorEx9Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IVMRSurfaceAllocatorEx9* This, + IVMRSurfaceAllocatorEx9 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IVMRSurfaceAllocatorEx9* This); + IVMRSurfaceAllocatorEx9 *This); ULONG (STDMETHODCALLTYPE *Release)( - IVMRSurfaceAllocatorEx9* This); + IVMRSurfaceAllocatorEx9 *This); /*** IVMRSurfaceAllocator9 methods ***/ HRESULT (STDMETHODCALLTYPE *InitializeDevice)( - IVMRSurfaceAllocatorEx9* This, + IVMRSurfaceAllocatorEx9 *This, DWORD_PTR id, VMR9AllocationInfo *allocinfo, DWORD *numbuffers); HRESULT (STDMETHODCALLTYPE *TerminateDevice)( - IVMRSurfaceAllocatorEx9* This, + IVMRSurfaceAllocatorEx9 *This, DWORD_PTR id); HRESULT (STDMETHODCALLTYPE *GetSurface)( - IVMRSurfaceAllocatorEx9* This, + IVMRSurfaceAllocatorEx9 *This, DWORD_PTR id, DWORD surfaceindex, DWORD flags, IDirect3DSurface9 **surface); HRESULT (STDMETHODCALLTYPE *AdviseNotify)( - IVMRSurfaceAllocatorEx9* This, + IVMRSurfaceAllocatorEx9 *This, IVMRSurfaceAllocatorNotify9 *allocnotify); /*** IVMRSurfaceAllocatorEx9 methods ***/ HRESULT (STDMETHODCALLTYPE *GetSurfaceEx)( - IVMRSurfaceAllocatorEx9* This, + IVMRSurfaceAllocatorEx9 *This, DWORD_PTR id, DWORD surfaceindex, DWORD flags, @@ -581,6 +615,7 @@ typedef struct IVMRSurfaceAllocatorEx9Vtbl { END_INTERFACE } IVMRSurfaceAllocatorEx9Vtbl; + interface IVMRSurfaceAllocatorEx9 { CONST_VTBL IVMRSurfaceAllocatorEx9Vtbl* lpVtbl; }; @@ -631,18 +666,6 @@ static FORCEINLINE HRESULT IVMRSurfaceAllocatorEx9_GetSurfaceEx(IVMRSurfaceAlloc #endif -HRESULT STDMETHODCALLTYPE IVMRSurfaceAllocatorEx9_GetSurfaceEx_Proxy( - IVMRSurfaceAllocatorEx9* This, - DWORD_PTR id, - DWORD surfaceindex, - DWORD flags, - IDirect3DSurface9 **surface, - RECT *dest); -void __RPC_STUB IVMRSurfaceAllocatorEx9_GetSurfaceEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IVMRSurfaceAllocatorEx9_INTERFACE_DEFINED__ */ @@ -689,46 +712,47 @@ typedef struct IVMRSurfaceAllocatorNotify9Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IVMRSurfaceAllocatorNotify9* This, + IVMRSurfaceAllocatorNotify9 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IVMRSurfaceAllocatorNotify9* This); + IVMRSurfaceAllocatorNotify9 *This); ULONG (STDMETHODCALLTYPE *Release)( - IVMRSurfaceAllocatorNotify9* This); + IVMRSurfaceAllocatorNotify9 *This); /*** IVMRSurfaceAllocatorNotify9 methods ***/ HRESULT (STDMETHODCALLTYPE *AdviseSurfaceAllocator)( - IVMRSurfaceAllocatorNotify9* This, + IVMRSurfaceAllocatorNotify9 *This, DWORD_PTR id, IVMRSurfaceAllocator9 *alloc); HRESULT (STDMETHODCALLTYPE *SetD3DDevice)( - IVMRSurfaceAllocatorNotify9* This, + IVMRSurfaceAllocatorNotify9 *This, IDirect3DDevice9 *device, HMONITOR monitor); HRESULT (STDMETHODCALLTYPE *ChangeD3DDevice)( - IVMRSurfaceAllocatorNotify9* This, + IVMRSurfaceAllocatorNotify9 *This, IDirect3DDevice9 *device, HMONITOR monitor); HRESULT (STDMETHODCALLTYPE *AllocateSurfaceHelper)( - IVMRSurfaceAllocatorNotify9* This, + IVMRSurfaceAllocatorNotify9 *This, VMR9AllocationInfo *allocinfo, DWORD *numbuffers, IDirect3DSurface9 **surface); HRESULT (STDMETHODCALLTYPE *NotifyEvent)( - IVMRSurfaceAllocatorNotify9* This, + IVMRSurfaceAllocatorNotify9 *This, LONG code, LONG_PTR param1, LONG_PTR param2); END_INTERFACE } IVMRSurfaceAllocatorNotify9Vtbl; + interface IVMRSurfaceAllocatorNotify9 { CONST_VTBL IVMRSurfaceAllocatorNotify9Vtbl* lpVtbl; }; @@ -777,53 +801,6 @@ static FORCEINLINE HRESULT IVMRSurfaceAllocatorNotify9_NotifyEvent(IVMRSurfaceAl #endif -HRESULT STDMETHODCALLTYPE IVMRSurfaceAllocatorNotify9_AdviseSurfaceAllocator_Proxy( - IVMRSurfaceAllocatorNotify9* This, - DWORD_PTR id, - IVMRSurfaceAllocator9 *alloc); -void __RPC_STUB IVMRSurfaceAllocatorNotify9_AdviseSurfaceAllocator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRSurfaceAllocatorNotify9_SetD3DDevice_Proxy( - IVMRSurfaceAllocatorNotify9* This, - IDirect3DDevice9 *device, - HMONITOR monitor); -void __RPC_STUB IVMRSurfaceAllocatorNotify9_SetD3DDevice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRSurfaceAllocatorNotify9_ChangeD3DDevice_Proxy( - IVMRSurfaceAllocatorNotify9* This, - IDirect3DDevice9 *device, - HMONITOR monitor); -void __RPC_STUB IVMRSurfaceAllocatorNotify9_ChangeD3DDevice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRSurfaceAllocatorNotify9_AllocateSurfaceHelper_Proxy( - IVMRSurfaceAllocatorNotify9* This, - VMR9AllocationInfo *allocinfo, - DWORD *numbuffers, - IDirect3DSurface9 **surface); -void __RPC_STUB IVMRSurfaceAllocatorNotify9_AllocateSurfaceHelper_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRSurfaceAllocatorNotify9_NotifyEvent_Proxy( - IVMRSurfaceAllocatorNotify9* This, - LONG code, - LONG_PTR param1, - LONG_PTR param2); -void __RPC_STUB IVMRSurfaceAllocatorNotify9_NotifyEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IVMRSurfaceAllocatorNotify9_INTERFACE_DEFINED__ */ @@ -899,78 +876,79 @@ typedef struct IVMRWindowlessControl9Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IVMRWindowlessControl9* This, + IVMRWindowlessControl9 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IVMRWindowlessControl9* This); + IVMRWindowlessControl9 *This); ULONG (STDMETHODCALLTYPE *Release)( - IVMRWindowlessControl9* This); + IVMRWindowlessControl9 *This); /*** IVMRWindowlessControl9 methods ***/ HRESULT (STDMETHODCALLTYPE *GetNativeVideoSize)( - IVMRWindowlessControl9* This, + IVMRWindowlessControl9 *This, LONG *width, LONG *height, LONG *arwidth, LONG *arheight); HRESULT (STDMETHODCALLTYPE *GetMinIdealVideoSize)( - IVMRWindowlessControl9* This, + IVMRWindowlessControl9 *This, LONG *width, LONG *height); HRESULT (STDMETHODCALLTYPE *GetMaxIdealVideoSize)( - IVMRWindowlessControl9* This, + IVMRWindowlessControl9 *This, LONG *width, LONG *height); HRESULT (STDMETHODCALLTYPE *SetVideoPosition)( - IVMRWindowlessControl9* This, + IVMRWindowlessControl9 *This, const RECT *source, const RECT *dest); HRESULT (STDMETHODCALLTYPE *GetVideoPosition)( - IVMRWindowlessControl9* This, + IVMRWindowlessControl9 *This, RECT *source, RECT *dest); HRESULT (STDMETHODCALLTYPE *GetAspectRatioMode)( - IVMRWindowlessControl9* This, + IVMRWindowlessControl9 *This, DWORD *mode); HRESULT (STDMETHODCALLTYPE *SetAspectRatioMode)( - IVMRWindowlessControl9* This, + IVMRWindowlessControl9 *This, DWORD mode); HRESULT (STDMETHODCALLTYPE *SetVideoClippingWindow)( - IVMRWindowlessControl9* This, + IVMRWindowlessControl9 *This, HWND hwnd); HRESULT (STDMETHODCALLTYPE *RepaintVideo)( - IVMRWindowlessControl9* This, + IVMRWindowlessControl9 *This, HWND hwnd, HDC hdc); HRESULT (STDMETHODCALLTYPE *DisplayModeChanged)( - IVMRWindowlessControl9* This); + IVMRWindowlessControl9 *This); HRESULT (STDMETHODCALLTYPE *GetCurrentImage)( - IVMRWindowlessControl9* This, + IVMRWindowlessControl9 *This, BYTE **dib); HRESULT (STDMETHODCALLTYPE *SetBorderColor)( - IVMRWindowlessControl9* This, + IVMRWindowlessControl9 *This, COLORREF color); HRESULT (STDMETHODCALLTYPE *GetBorderColor)( - IVMRWindowlessControl9* This, + IVMRWindowlessControl9 *This, COLORREF *color); END_INTERFACE } IVMRWindowlessControl9Vtbl; + interface IVMRWindowlessControl9 { CONST_VTBL IVMRWindowlessControl9Vtbl* lpVtbl; }; @@ -1051,117 +1029,6 @@ static FORCEINLINE HRESULT IVMRWindowlessControl9_GetBorderColor(IVMRWindowlessC #endif -HRESULT STDMETHODCALLTYPE IVMRWindowlessControl9_GetNativeVideoSize_Proxy( - IVMRWindowlessControl9* This, - LONG *width, - LONG *height, - LONG *arwidth, - LONG *arheight); -void __RPC_STUB IVMRWindowlessControl9_GetNativeVideoSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRWindowlessControl9_GetMinIdealVideoSize_Proxy( - IVMRWindowlessControl9* This, - LONG *width, - LONG *height); -void __RPC_STUB IVMRWindowlessControl9_GetMinIdealVideoSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRWindowlessControl9_GetMaxIdealVideoSize_Proxy( - IVMRWindowlessControl9* This, - LONG *width, - LONG *height); -void __RPC_STUB IVMRWindowlessControl9_GetMaxIdealVideoSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRWindowlessControl9_SetVideoPosition_Proxy( - IVMRWindowlessControl9* This, - const RECT *source, - const RECT *dest); -void __RPC_STUB IVMRWindowlessControl9_SetVideoPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRWindowlessControl9_GetVideoPosition_Proxy( - IVMRWindowlessControl9* This, - RECT *source, - RECT *dest); -void __RPC_STUB IVMRWindowlessControl9_GetVideoPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRWindowlessControl9_GetAspectRatioMode_Proxy( - IVMRWindowlessControl9* This, - DWORD *mode); -void __RPC_STUB IVMRWindowlessControl9_GetAspectRatioMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRWindowlessControl9_SetAspectRatioMode_Proxy( - IVMRWindowlessControl9* This, - DWORD mode); -void __RPC_STUB IVMRWindowlessControl9_SetAspectRatioMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRWindowlessControl9_SetVideoClippingWindow_Proxy( - IVMRWindowlessControl9* This, - HWND hwnd); -void __RPC_STUB IVMRWindowlessControl9_SetVideoClippingWindow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRWindowlessControl9_RepaintVideo_Proxy( - IVMRWindowlessControl9* This, - HWND hwnd, - HDC hdc); -void __RPC_STUB IVMRWindowlessControl9_RepaintVideo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRWindowlessControl9_DisplayModeChanged_Proxy( - IVMRWindowlessControl9* This); -void __RPC_STUB IVMRWindowlessControl9_DisplayModeChanged_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRWindowlessControl9_GetCurrentImage_Proxy( - IVMRWindowlessControl9* This, - BYTE **dib); -void __RPC_STUB IVMRWindowlessControl9_GetCurrentImage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRWindowlessControl9_SetBorderColor_Proxy( - IVMRWindowlessControl9* This, - COLORREF color); -void __RPC_STUB IVMRWindowlessControl9_SetBorderColor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRWindowlessControl9_GetBorderColor_Proxy( - IVMRWindowlessControl9* This, - COLORREF *color); -void __RPC_STUB IVMRWindowlessControl9_GetBorderColor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IVMRWindowlessControl9_INTERFACE_DEFINED__ */ @@ -1284,80 +1151,81 @@ typedef struct IVMRMixerControl9Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IVMRMixerControl9* This, + IVMRMixerControl9 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IVMRMixerControl9* This); + IVMRMixerControl9 *This); ULONG (STDMETHODCALLTYPE *Release)( - IVMRMixerControl9* This); + IVMRMixerControl9 *This); /*** IVMRMixerControl9 methods ***/ HRESULT (STDMETHODCALLTYPE *SetAlpha)( - IVMRMixerControl9* This, + IVMRMixerControl9 *This, DWORD streamid, FLOAT alpha); HRESULT (STDMETHODCALLTYPE *GetAlpha)( - IVMRMixerControl9* This, + IVMRMixerControl9 *This, DWORD streamid, FLOAT *alpha); HRESULT (STDMETHODCALLTYPE *SetZOrder)( - IVMRMixerControl9* This, + IVMRMixerControl9 *This, DWORD streamid, DWORD zorder); HRESULT (STDMETHODCALLTYPE *GetZOrder)( - IVMRMixerControl9* This, + IVMRMixerControl9 *This, DWORD streamid, DWORD *zorder); HRESULT (STDMETHODCALLTYPE *SetOutputRect)( - IVMRMixerControl9* This, + IVMRMixerControl9 *This, DWORD streamid, const VMR9NormalizedRect *rect); HRESULT (STDMETHODCALLTYPE *GetOutputRect)( - IVMRMixerControl9* This, + IVMRMixerControl9 *This, DWORD streamid, VMR9NormalizedRect *rect); HRESULT (STDMETHODCALLTYPE *SetBackgroundClr)( - IVMRMixerControl9* This, + IVMRMixerControl9 *This, COLORREF back); HRESULT (STDMETHODCALLTYPE *GetBackgroundClr)( - IVMRMixerControl9* This, + IVMRMixerControl9 *This, COLORREF *back); HRESULT (STDMETHODCALLTYPE *SetMixingPrefs)( - IVMRMixerControl9* This, + IVMRMixerControl9 *This, DWORD mixingprefs); HRESULT (STDMETHODCALLTYPE *GetMixingPrefs)( - IVMRMixerControl9* This, + IVMRMixerControl9 *This, DWORD *mixingprefs); HRESULT (STDMETHODCALLTYPE *SetProcAmpControl)( - IVMRMixerControl9* This, + IVMRMixerControl9 *This, DWORD streamid, VMR9ProcAmpControl *control); HRESULT (STDMETHODCALLTYPE *GetProcAmpControl)( - IVMRMixerControl9* This, + IVMRMixerControl9 *This, DWORD streamid, VMR9ProcAmpControl *control); HRESULT (STDMETHODCALLTYPE *GetProcAmpControlRange)( - IVMRMixerControl9* This, + IVMRMixerControl9 *This, DWORD streamid, VMR9ProcAmpControlRange *controlrange); END_INTERFACE } IVMRMixerControl9Vtbl; + interface IVMRMixerControl9 { CONST_VTBL IVMRMixerControl9Vtbl* lpVtbl; }; @@ -1438,119 +1306,6 @@ static FORCEINLINE HRESULT IVMRMixerControl9_GetProcAmpControlRange(IVMRMixerCon #endif -HRESULT STDMETHODCALLTYPE IVMRMixerControl9_SetAlpha_Proxy( - IVMRMixerControl9* This, - DWORD streamid, - FLOAT alpha); -void __RPC_STUB IVMRMixerControl9_SetAlpha_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRMixerControl9_GetAlpha_Proxy( - IVMRMixerControl9* This, - DWORD streamid, - FLOAT *alpha); -void __RPC_STUB IVMRMixerControl9_GetAlpha_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRMixerControl9_SetZOrder_Proxy( - IVMRMixerControl9* This, - DWORD streamid, - DWORD zorder); -void __RPC_STUB IVMRMixerControl9_SetZOrder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRMixerControl9_GetZOrder_Proxy( - IVMRMixerControl9* This, - DWORD streamid, - DWORD *zorder); -void __RPC_STUB IVMRMixerControl9_GetZOrder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRMixerControl9_SetOutputRect_Proxy( - IVMRMixerControl9* This, - DWORD streamid, - const VMR9NormalizedRect *rect); -void __RPC_STUB IVMRMixerControl9_SetOutputRect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRMixerControl9_GetOutputRect_Proxy( - IVMRMixerControl9* This, - DWORD streamid, - VMR9NormalizedRect *rect); -void __RPC_STUB IVMRMixerControl9_GetOutputRect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRMixerControl9_SetBackgroundClr_Proxy( - IVMRMixerControl9* This, - COLORREF back); -void __RPC_STUB IVMRMixerControl9_SetBackgroundClr_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRMixerControl9_GetBackgroundClr_Proxy( - IVMRMixerControl9* This, - COLORREF *back); -void __RPC_STUB IVMRMixerControl9_GetBackgroundClr_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRMixerControl9_SetMixingPrefs_Proxy( - IVMRMixerControl9* This, - DWORD mixingprefs); -void __RPC_STUB IVMRMixerControl9_SetMixingPrefs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRMixerControl9_GetMixingPrefs_Proxy( - IVMRMixerControl9* This, - DWORD *mixingprefs); -void __RPC_STUB IVMRMixerControl9_GetMixingPrefs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRMixerControl9_SetProcAmpControl_Proxy( - IVMRMixerControl9* This, - DWORD streamid, - VMR9ProcAmpControl *control); -void __RPC_STUB IVMRMixerControl9_SetProcAmpControl_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRMixerControl9_GetProcAmpControl_Proxy( - IVMRMixerControl9* This, - DWORD streamid, - VMR9ProcAmpControl *control); -void __RPC_STUB IVMRMixerControl9_GetProcAmpControl_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRMixerControl9_GetProcAmpControlRange_Proxy( - IVMRMixerControl9* This, - DWORD streamid, - VMR9ProcAmpControlRange *controlrange); -void __RPC_STUB IVMRMixerControl9_GetProcAmpControlRange_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IVMRMixerControl9_INTERFACE_DEFINED__ */ @@ -1602,31 +1357,32 @@ typedef struct IVMRMixerBitmap9Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IVMRMixerBitmap9* This, + IVMRMixerBitmap9 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IVMRMixerBitmap9* This); + IVMRMixerBitmap9 *This); ULONG (STDMETHODCALLTYPE *Release)( - IVMRMixerBitmap9* This); + IVMRMixerBitmap9 *This); /*** IVMRMixerBitmap9 methods ***/ HRESULT (STDMETHODCALLTYPE *SetAlphaBitmap)( - IVMRMixerBitmap9* This, + IVMRMixerBitmap9 *This, const VMR9AlphaBitmap *bitmap); HRESULT (STDMETHODCALLTYPE *UpdateAlphaBitmapParameters)( - IVMRMixerBitmap9* This, + IVMRMixerBitmap9 *This, const VMR9AlphaBitmap *bitmap); HRESULT (STDMETHODCALLTYPE *GetAlphaBitmapParameters)( - IVMRMixerBitmap9* This, + IVMRMixerBitmap9 *This, VMR9AlphaBitmap *bitmap); END_INTERFACE } IVMRMixerBitmap9Vtbl; + interface IVMRMixerBitmap9 { CONST_VTBL IVMRMixerBitmap9Vtbl* lpVtbl; }; @@ -1667,30 +1423,6 @@ static FORCEINLINE HRESULT IVMRMixerBitmap9_GetAlphaBitmapParameters(IVMRMixerBi #endif -HRESULT STDMETHODCALLTYPE IVMRMixerBitmap9_SetAlphaBitmap_Proxy( - IVMRMixerBitmap9* This, - const VMR9AlphaBitmap *bitmap); -void __RPC_STUB IVMRMixerBitmap9_SetAlphaBitmap_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRMixerBitmap9_UpdateAlphaBitmapParameters_Proxy( - IVMRMixerBitmap9* This, - const VMR9AlphaBitmap *bitmap); -void __RPC_STUB IVMRMixerBitmap9_UpdateAlphaBitmapParameters_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRMixerBitmap9_GetAlphaBitmapParameters_Proxy( - IVMRMixerBitmap9* This, - VMR9AlphaBitmap *bitmap); -void __RPC_STUB IVMRMixerBitmap9_GetAlphaBitmapParameters_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IVMRMixerBitmap9_INTERFACE_DEFINED__ */ @@ -1727,33 +1459,34 @@ typedef struct IVMRSurface9Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IVMRSurface9* This, + IVMRSurface9 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IVMRSurface9* This); + IVMRSurface9 *This); ULONG (STDMETHODCALLTYPE *Release)( - IVMRSurface9* This); + IVMRSurface9 *This); /*** IVMRSurface9 methods ***/ HRESULT (STDMETHODCALLTYPE *IsSurfaceLocked)( - IVMRSurface9* This); + IVMRSurface9 *This); HRESULT (STDMETHODCALLTYPE *LockSurface)( - IVMRSurface9* This, + IVMRSurface9 *This, BYTE **surface); HRESULT (STDMETHODCALLTYPE *UnlockSurface)( - IVMRSurface9* This); + IVMRSurface9 *This); HRESULT (STDMETHODCALLTYPE *GetSurface)( - IVMRSurface9* This, + IVMRSurface9 *This, IDirect3DSurface9 **surface); END_INTERFACE } IVMRSurface9Vtbl; + interface IVMRSurface9 { CONST_VTBL IVMRSurface9Vtbl* lpVtbl; }; @@ -1798,36 +1531,6 @@ static FORCEINLINE HRESULT IVMRSurface9_GetSurface(IVMRSurface9* This,IDirect3DS #endif -HRESULT STDMETHODCALLTYPE IVMRSurface9_IsSurfaceLocked_Proxy( - IVMRSurface9* This); -void __RPC_STUB IVMRSurface9_IsSurfaceLocked_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRSurface9_LockSurface_Proxy( - IVMRSurface9* This, - BYTE **surface); -void __RPC_STUB IVMRSurface9_LockSurface_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRSurface9_UnlockSurface_Proxy( - IVMRSurface9* This); -void __RPC_STUB IVMRSurface9_UnlockSurface_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRSurface9_GetSurface_Proxy( - IVMRSurface9* This, - IDirect3DSurface9 **surface); -void __RPC_STUB IVMRSurface9_GetSurface_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IVMRSurface9_INTERFACE_DEFINED__ */ @@ -1862,27 +1565,28 @@ typedef struct IVMRImagePresenterConfig9Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IVMRImagePresenterConfig9* This, + IVMRImagePresenterConfig9 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IVMRImagePresenterConfig9* This); + IVMRImagePresenterConfig9 *This); ULONG (STDMETHODCALLTYPE *Release)( - IVMRImagePresenterConfig9* This); + IVMRImagePresenterConfig9 *This); /*** IVMRImagePresenterConfig9 methods ***/ HRESULT (STDMETHODCALLTYPE *SetRenderingPrefs)( - IVMRImagePresenterConfig9* This, + IVMRImagePresenterConfig9 *This, DWORD renderflags); HRESULT (STDMETHODCALLTYPE *GetRenderingPrefs)( - IVMRImagePresenterConfig9* This, + IVMRImagePresenterConfig9 *This, DWORD *renderflags); END_INTERFACE } IVMRImagePresenterConfig9Vtbl; + interface IVMRImagePresenterConfig9 { CONST_VTBL IVMRImagePresenterConfig9Vtbl* lpVtbl; }; @@ -1919,22 +1623,6 @@ static FORCEINLINE HRESULT IVMRImagePresenterConfig9_GetRenderingPrefs(IVMRImage #endif -HRESULT STDMETHODCALLTYPE IVMRImagePresenterConfig9_SetRenderingPrefs_Proxy( - IVMRImagePresenterConfig9* This, - DWORD renderflags); -void __RPC_STUB IVMRImagePresenterConfig9_SetRenderingPrefs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRImagePresenterConfig9_GetRenderingPrefs_Proxy( - IVMRImagePresenterConfig9* This, - DWORD *renderflags); -void __RPC_STUB IVMRImagePresenterConfig9_GetRenderingPrefs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IVMRImagePresenterConfig9_INTERFACE_DEFINED__ */ @@ -1965,27 +1653,28 @@ typedef struct IVMRVideoStreamControl9Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IVMRVideoStreamControl9* This, + IVMRVideoStreamControl9 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IVMRVideoStreamControl9* This); + IVMRVideoStreamControl9 *This); ULONG (STDMETHODCALLTYPE *Release)( - IVMRVideoStreamControl9* This); + IVMRVideoStreamControl9 *This); /*** IVMRVideoStreamControl9 methods ***/ HRESULT (STDMETHODCALLTYPE *SetStreamActiveState)( - IVMRVideoStreamControl9* This, + IVMRVideoStreamControl9 *This, WINBOOL active); HRESULT (STDMETHODCALLTYPE *GetStreamActiveState)( - IVMRVideoStreamControl9* This, + IVMRVideoStreamControl9 *This, WINBOOL *active); END_INTERFACE } IVMRVideoStreamControl9Vtbl; + interface IVMRVideoStreamControl9 { CONST_VTBL IVMRVideoStreamControl9Vtbl* lpVtbl; }; @@ -2022,22 +1711,6 @@ static FORCEINLINE HRESULT IVMRVideoStreamControl9_GetStreamActiveState(IVMRVide #endif -HRESULT STDMETHODCALLTYPE IVMRVideoStreamControl9_SetStreamActiveState_Proxy( - IVMRVideoStreamControl9* This, - WINBOOL active); -void __RPC_STUB IVMRVideoStreamControl9_SetStreamActiveState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRVideoStreamControl9_GetStreamActiveState_Proxy( - IVMRVideoStreamControl9* This, - WINBOOL *active); -void __RPC_STUB IVMRVideoStreamControl9_GetStreamActiveState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IVMRVideoStreamControl9_INTERFACE_DEFINED__ */ @@ -2089,47 +1762,48 @@ typedef struct IVMRFilterConfig9Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IVMRFilterConfig9* This, + IVMRFilterConfig9 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IVMRFilterConfig9* This); + IVMRFilterConfig9 *This); ULONG (STDMETHODCALLTYPE *Release)( - IVMRFilterConfig9* This); + IVMRFilterConfig9 *This); /*** IVMRFilterConfig9 methods ***/ HRESULT (STDMETHODCALLTYPE *SetImageCompositor)( - IVMRFilterConfig9* This, + IVMRFilterConfig9 *This, IVMRImageCompositor9 *compositor); HRESULT (STDMETHODCALLTYPE *SetNumberOfStreams)( - IVMRFilterConfig9* This, + IVMRFilterConfig9 *This, DWORD max); HRESULT (STDMETHODCALLTYPE *GetNumberOfStreams)( - IVMRFilterConfig9* This, + IVMRFilterConfig9 *This, DWORD *max); HRESULT (STDMETHODCALLTYPE *SetRenderingPrefs)( - IVMRFilterConfig9* This, + IVMRFilterConfig9 *This, DWORD renderflags); HRESULT (STDMETHODCALLTYPE *GetRenderingPrefs)( - IVMRFilterConfig9* This, + IVMRFilterConfig9 *This, DWORD *renderflags); HRESULT (STDMETHODCALLTYPE *SetRenderingMode)( - IVMRFilterConfig9* This, + IVMRFilterConfig9 *This, DWORD mode); HRESULT (STDMETHODCALLTYPE *GetRenderingMode)( - IVMRFilterConfig9* This, + IVMRFilterConfig9 *This, DWORD *mode); END_INTERFACE } IVMRFilterConfig9Vtbl; + interface IVMRFilterConfig9 { CONST_VTBL IVMRFilterConfig9Vtbl* lpVtbl; }; @@ -2186,62 +1860,6 @@ static FORCEINLINE HRESULT IVMRFilterConfig9_GetRenderingMode(IVMRFilterConfig9* #endif -HRESULT STDMETHODCALLTYPE IVMRFilterConfig9_SetImageCompositor_Proxy( - IVMRFilterConfig9* This, - IVMRImageCompositor9 *compositor); -void __RPC_STUB IVMRFilterConfig9_SetImageCompositor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRFilterConfig9_SetNumberOfStreams_Proxy( - IVMRFilterConfig9* This, - DWORD max); -void __RPC_STUB IVMRFilterConfig9_SetNumberOfStreams_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRFilterConfig9_GetNumberOfStreams_Proxy( - IVMRFilterConfig9* This, - DWORD *max); -void __RPC_STUB IVMRFilterConfig9_GetNumberOfStreams_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRFilterConfig9_SetRenderingPrefs_Proxy( - IVMRFilterConfig9* This, - DWORD renderflags); -void __RPC_STUB IVMRFilterConfig9_SetRenderingPrefs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRFilterConfig9_GetRenderingPrefs_Proxy( - IVMRFilterConfig9* This, - DWORD *renderflags); -void __RPC_STUB IVMRFilterConfig9_GetRenderingPrefs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRFilterConfig9_SetRenderingMode_Proxy( - IVMRFilterConfig9* This, - DWORD mode); -void __RPC_STUB IVMRFilterConfig9_SetRenderingMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRFilterConfig9_GetRenderingMode_Proxy( - IVMRFilterConfig9* This, - DWORD *mode); -void __RPC_STUB IVMRFilterConfig9_GetRenderingMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IVMRFilterConfig9_INTERFACE_DEFINED__ */ @@ -2272,27 +1890,28 @@ typedef struct IVMRAspectRatioControl9Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IVMRAspectRatioControl9* This, + IVMRAspectRatioControl9 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IVMRAspectRatioControl9* This); + IVMRAspectRatioControl9 *This); ULONG (STDMETHODCALLTYPE *Release)( - IVMRAspectRatioControl9* This); + IVMRAspectRatioControl9 *This); /*** IVMRAspectRatioControl9 methods ***/ HRESULT (STDMETHODCALLTYPE *GetAspectRatioMode)( - IVMRAspectRatioControl9* This, + IVMRAspectRatioControl9 *This, DWORD *mode); HRESULT (STDMETHODCALLTYPE *SetAspectRatioMode)( - IVMRAspectRatioControl9* This, + IVMRAspectRatioControl9 *This, DWORD mode); END_INTERFACE } IVMRAspectRatioControl9Vtbl; + interface IVMRAspectRatioControl9 { CONST_VTBL IVMRAspectRatioControl9Vtbl* lpVtbl; }; @@ -2329,22 +1948,6 @@ static FORCEINLINE HRESULT IVMRAspectRatioControl9_SetAspectRatioMode(IVMRAspect #endif -HRESULT STDMETHODCALLTYPE IVMRAspectRatioControl9_GetAspectRatioMode_Proxy( - IVMRAspectRatioControl9* This, - DWORD *mode); -void __RPC_STUB IVMRAspectRatioControl9_GetAspectRatioMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRAspectRatioControl9_SetAspectRatioMode_Proxy( - IVMRAspectRatioControl9* This, - DWORD mode); -void __RPC_STUB IVMRAspectRatioControl9_SetAspectRatioMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IVMRAspectRatioControl9_INTERFACE_DEFINED__ */ @@ -2399,41 +2002,42 @@ typedef struct IVMRMonitorConfig9Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IVMRMonitorConfig9* This, + IVMRMonitorConfig9 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IVMRMonitorConfig9* This); + IVMRMonitorConfig9 *This); ULONG (STDMETHODCALLTYPE *Release)( - IVMRMonitorConfig9* This); + IVMRMonitorConfig9 *This); /*** IVMRMonitorConfig9 methods ***/ HRESULT (STDMETHODCALLTYPE *SetMonitor)( - IVMRMonitorConfig9* This, + IVMRMonitorConfig9 *This, UINT uDev); HRESULT (STDMETHODCALLTYPE *GetMonitor)( - IVMRMonitorConfig9* This, + IVMRMonitorConfig9 *This, UINT *uDev); HRESULT (STDMETHODCALLTYPE *SetDefaultMonitor)( - IVMRMonitorConfig9* This, + IVMRMonitorConfig9 *This, UINT uDev); HRESULT (STDMETHODCALLTYPE *GetDefaultMonitor)( - IVMRMonitorConfig9* This, + IVMRMonitorConfig9 *This, UINT *uDev); HRESULT (STDMETHODCALLTYPE *GetAvailableMonitors)( - IVMRMonitorConfig9* This, + IVMRMonitorConfig9 *This, VMR9MonitorInfo *info, DWORD arraysize, DWORD *numdev); END_INTERFACE } IVMRMonitorConfig9Vtbl; + interface IVMRMonitorConfig9 { CONST_VTBL IVMRMonitorConfig9Vtbl* lpVtbl; }; @@ -2482,48 +2086,6 @@ static FORCEINLINE HRESULT IVMRMonitorConfig9_GetAvailableMonitors(IVMRMonitorCo #endif -HRESULT STDMETHODCALLTYPE IVMRMonitorConfig9_SetMonitor_Proxy( - IVMRMonitorConfig9* This, - UINT uDev); -void __RPC_STUB IVMRMonitorConfig9_SetMonitor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRMonitorConfig9_GetMonitor_Proxy( - IVMRMonitorConfig9* This, - UINT *uDev); -void __RPC_STUB IVMRMonitorConfig9_GetMonitor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRMonitorConfig9_SetDefaultMonitor_Proxy( - IVMRMonitorConfig9* This, - UINT uDev); -void __RPC_STUB IVMRMonitorConfig9_SetDefaultMonitor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRMonitorConfig9_GetDefaultMonitor_Proxy( - IVMRMonitorConfig9* This, - UINT *uDev); -void __RPC_STUB IVMRMonitorConfig9_GetDefaultMonitor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRMonitorConfig9_GetAvailableMonitors_Proxy( - IVMRMonitorConfig9* This, - VMR9MonitorInfo *info, - DWORD arraysize, - DWORD *numdev); -void __RPC_STUB IVMRMonitorConfig9_GetAvailableMonitors_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IVMRMonitorConfig9_INTERFACE_DEFINED__ */ @@ -2620,54 +2182,55 @@ typedef struct IVMRDeinterlaceControl9Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IVMRDeinterlaceControl9* This, + IVMRDeinterlaceControl9 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IVMRDeinterlaceControl9* This); + IVMRDeinterlaceControl9 *This); ULONG (STDMETHODCALLTYPE *Release)( - IVMRDeinterlaceControl9* This); + IVMRDeinterlaceControl9 *This); /*** IVMRDeinterlaceControl9 methods ***/ HRESULT (STDMETHODCALLTYPE *GetNumberOfDeinterlaceModes)( - IVMRDeinterlaceControl9* This, + IVMRDeinterlaceControl9 *This, VMR9VideoDesc *desc, DWORD *nummodes, GUID *modes); HRESULT (STDMETHODCALLTYPE *GetDeinterlaceModeCaps)( - IVMRDeinterlaceControl9* This, + IVMRDeinterlaceControl9 *This, GUID *mode, VMR9VideoDesc *desc, VMR9DeinterlaceCaps *caps); HRESULT (STDMETHODCALLTYPE *GetDeinterlaceMode)( - IVMRDeinterlaceControl9* This, + IVMRDeinterlaceControl9 *This, DWORD streamid, GUID *mode); HRESULT (STDMETHODCALLTYPE *SetDeinterlaceMode)( - IVMRDeinterlaceControl9* This, + IVMRDeinterlaceControl9 *This, DWORD streamid, GUID *mode); HRESULT (STDMETHODCALLTYPE *GetDeinterlacePrefs)( - IVMRDeinterlaceControl9* This, + IVMRDeinterlaceControl9 *This, DWORD *prefs); HRESULT (STDMETHODCALLTYPE *SetDeinterlacePrefs)( - IVMRDeinterlaceControl9* This, + IVMRDeinterlaceControl9 *This, DWORD prefs); HRESULT (STDMETHODCALLTYPE *GetActualDeinterlaceMode)( - IVMRDeinterlaceControl9* This, + IVMRDeinterlaceControl9 *This, DWORD streamid, GUID *mode); END_INTERFACE } IVMRDeinterlaceControl9Vtbl; + interface IVMRDeinterlaceControl9 { CONST_VTBL IVMRDeinterlaceControl9Vtbl* lpVtbl; }; @@ -2724,69 +2287,6 @@ static FORCEINLINE HRESULT IVMRDeinterlaceControl9_GetActualDeinterlaceMode(IVMR #endif -HRESULT STDMETHODCALLTYPE IVMRDeinterlaceControl9_GetNumberOfDeinterlaceModes_Proxy( - IVMRDeinterlaceControl9* This, - VMR9VideoDesc *desc, - DWORD *nummodes, - GUID *modes); -void __RPC_STUB IVMRDeinterlaceControl9_GetNumberOfDeinterlaceModes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRDeinterlaceControl9_GetDeinterlaceModeCaps_Proxy( - IVMRDeinterlaceControl9* This, - GUID *mode, - VMR9VideoDesc *desc, - VMR9DeinterlaceCaps *caps); -void __RPC_STUB IVMRDeinterlaceControl9_GetDeinterlaceModeCaps_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRDeinterlaceControl9_GetDeinterlaceMode_Proxy( - IVMRDeinterlaceControl9* This, - DWORD streamid, - GUID *mode); -void __RPC_STUB IVMRDeinterlaceControl9_GetDeinterlaceMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRDeinterlaceControl9_SetDeinterlaceMode_Proxy( - IVMRDeinterlaceControl9* This, - DWORD streamid, - GUID *mode); -void __RPC_STUB IVMRDeinterlaceControl9_SetDeinterlaceMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRDeinterlaceControl9_GetDeinterlacePrefs_Proxy( - IVMRDeinterlaceControl9* This, - DWORD *prefs); -void __RPC_STUB IVMRDeinterlaceControl9_GetDeinterlacePrefs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRDeinterlaceControl9_SetDeinterlacePrefs_Proxy( - IVMRDeinterlaceControl9* This, - DWORD prefs); -void __RPC_STUB IVMRDeinterlaceControl9_SetDeinterlacePrefs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRDeinterlaceControl9_GetActualDeinterlaceMode_Proxy( - IVMRDeinterlaceControl9* This, - DWORD streamid, - GUID *mode); -void __RPC_STUB IVMRDeinterlaceControl9_GetActualDeinterlaceMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IVMRDeinterlaceControl9_INTERFACE_DEFINED__ */ @@ -2838,27 +2338,27 @@ typedef struct IVMRImageCompositor9Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IVMRImageCompositor9* This, + IVMRImageCompositor9 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IVMRImageCompositor9* This); + IVMRImageCompositor9 *This); ULONG (STDMETHODCALLTYPE *Release)( - IVMRImageCompositor9* This); + IVMRImageCompositor9 *This); /*** IVMRImageCompositor9 methods ***/ HRESULT (STDMETHODCALLTYPE *InitCompositionDevice)( - IVMRImageCompositor9* This, + IVMRImageCompositor9 *This, IUnknown *d3ddev); HRESULT (STDMETHODCALLTYPE *TermCompositionDevice)( - IVMRImageCompositor9* This, + IVMRImageCompositor9 *This, IUnknown *d3ddev); HRESULT (STDMETHODCALLTYPE *CompositeImage)( - IVMRImageCompositor9* This, + IVMRImageCompositor9 *This, IUnknown *d3ddev, IDirect3DSurface9 *d3dtarget, AM_MEDIA_TYPE *mttarget, @@ -2870,6 +2370,7 @@ typedef struct IVMRImageCompositor9Vtbl { END_INTERFACE } IVMRImageCompositor9Vtbl; + interface IVMRImageCompositor9 { CONST_VTBL IVMRImageCompositor9Vtbl* lpVtbl; }; @@ -2910,37 +2411,6 @@ static FORCEINLINE HRESULT IVMRImageCompositor9_CompositeImage(IVMRImageComposit #endif -HRESULT STDMETHODCALLTYPE IVMRImageCompositor9_InitCompositionDevice_Proxy( - IVMRImageCompositor9* This, - IUnknown *d3ddev); -void __RPC_STUB IVMRImageCompositor9_InitCompositionDevice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRImageCompositor9_TermCompositionDevice_Proxy( - IVMRImageCompositor9* This, - IUnknown *d3ddev); -void __RPC_STUB IVMRImageCompositor9_TermCompositionDevice_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IVMRImageCompositor9_CompositeImage_Proxy( - IVMRImageCompositor9* This, - IUnknown *d3ddev, - IDirect3DSurface9 *d3dtarget, - AM_MEDIA_TYPE *mttarget, - REFERENCE_TIME start, - REFERENCE_TIME stop, - D3DCOLOR back, - VMR9VideoStreamInfo *info, - UINT streams); -void __RPC_STUB IVMRImageCompositor9_CompositeImage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IVMRImageCompositor9_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/wbemads.h b/lib/libc/include/any-windows-any/wbemads.h index e181dfcd1e..3d913f31d0 100644 --- a/lib/libc/include/any-windows-any/wbemads.h +++ b/lib/libc/include/any-windows-any/wbemads.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/wbemads.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/wbemads.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -29,6 +30,9 @@ typedef struct WMIExtension WMIExtension; #ifndef __IWMIExtension_FWD_DEFINED__ #define __IWMIExtension_FWD_DEFINED__ typedef interface IWMIExtension IWMIExtension; +#ifdef __cplusplus +interface IWMIExtension; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -55,6 +59,9 @@ DEFINE_GUID(LIBID_WMIEXTENSIONLib, 0xe503d000, 0x5c7f, 0x11d2, 0x8b,0x74, 0x00,0 #ifndef __IWMIExtension_FWD_DEFINED__ #define __IWMIExtension_FWD_DEFINED__ typedef interface IWMIExtension IWMIExtension; +#ifdef __cplusplus +interface IWMIExtension; +#endif /* __cplusplus */ #endif /***************************************************************************** @@ -100,29 +107,29 @@ typedef struct IWMIExtensionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWMIExtension* This, + IWMIExtension *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWMIExtension* This); + IWMIExtension *This); ULONG (STDMETHODCALLTYPE *Release)( - IWMIExtension* This); + IWMIExtension *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWMIExtension* This, + IWMIExtension *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWMIExtension* This, + IWMIExtension *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWMIExtension* This, + IWMIExtension *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -130,7 +137,7 @@ typedef struct IWMIExtensionVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWMIExtension* This, + IWMIExtension *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -142,19 +149,20 @@ typedef struct IWMIExtensionVtbl { /*** IWMIExtension methods ***/ HRESULT (STDMETHODCALLTYPE *get_WMIObjectPath)( - IWMIExtension* This, + IWMIExtension *This, BSTR *strWMIObjectPath); HRESULT (STDMETHODCALLTYPE *GetWMIObject)( - IWMIExtension* This, + IWMIExtension *This, ISWbemObject **objWMIObject); HRESULT (STDMETHODCALLTYPE *GetWMIServices)( - IWMIExtension* This, + IWMIExtension *This, ISWbemServices **objWMIServices); END_INTERFACE } IWMIExtensionVtbl; + interface IWMIExtension { CONST_VTBL IWMIExtensionVtbl* lpVtbl; }; @@ -213,30 +221,6 @@ static FORCEINLINE HRESULT IWMIExtension_GetWMIServices(IWMIExtension* This,ISWb #endif -HRESULT STDMETHODCALLTYPE IWMIExtension_get_WMIObjectPath_Proxy( - IWMIExtension* This, - BSTR *strWMIObjectPath); -void __RPC_STUB IWMIExtension_get_WMIObjectPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWMIExtension_GetWMIObject_Proxy( - IWMIExtension* This, - ISWbemObject **objWMIObject); -void __RPC_STUB IWMIExtension_GetWMIObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWMIExtension_GetWMIServices_Proxy( - IWMIExtension* This, - ISWbemServices **objWMIServices); -void __RPC_STUB IWMIExtension_GetWMIServices_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWMIExtension_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/wbemcli.h b/lib/libc/include/any-windows-any/wbemcli.h index 6ff4fa9b2e..b365e5be89 100644 --- a/lib/libc/include/any-windows-any/wbemcli.h +++ b/lib/libc/include/any-windows-any/wbemcli.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/wbemcli.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/wbemcli.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -101,106 +102,169 @@ typedef struct WbemRefresher WbemRefresher; #ifndef __IWbemClassObject_FWD_DEFINED__ #define __IWbemClassObject_FWD_DEFINED__ typedef interface IWbemClassObject IWbemClassObject; +#ifdef __cplusplus +interface IWbemClassObject; +#endif /* __cplusplus */ #endif #ifndef __IWbemQualifierSet_FWD_DEFINED__ #define __IWbemQualifierSet_FWD_DEFINED__ typedef interface IWbemQualifierSet IWbemQualifierSet; +#ifdef __cplusplus +interface IWbemQualifierSet; +#endif /* __cplusplus */ #endif #ifndef __IWbemLocator_FWD_DEFINED__ #define __IWbemLocator_FWD_DEFINED__ typedef interface IWbemLocator IWbemLocator; +#ifdef __cplusplus +interface IWbemLocator; +#endif /* __cplusplus */ #endif #ifndef __IWbemObjectSink_FWD_DEFINED__ #define __IWbemObjectSink_FWD_DEFINED__ typedef interface IWbemObjectSink IWbemObjectSink; +#ifdef __cplusplus +interface IWbemObjectSink; +#endif /* __cplusplus */ #endif #ifndef __IWbemObjectSinkEx_FWD_DEFINED__ #define __IWbemObjectSinkEx_FWD_DEFINED__ typedef interface IWbemObjectSinkEx IWbemObjectSinkEx; +#ifdef __cplusplus +interface IWbemObjectSinkEx; +#endif /* __cplusplus */ #endif #ifndef __IEnumWbemClassObject_FWD_DEFINED__ #define __IEnumWbemClassObject_FWD_DEFINED__ typedef interface IEnumWbemClassObject IEnumWbemClassObject; +#ifdef __cplusplus +interface IEnumWbemClassObject; +#endif /* __cplusplus */ #endif #ifndef __IWbemContext_FWD_DEFINED__ #define __IWbemContext_FWD_DEFINED__ typedef interface IWbemContext IWbemContext; +#ifdef __cplusplus +interface IWbemContext; +#endif /* __cplusplus */ #endif #ifndef __IWbemCallResult_FWD_DEFINED__ #define __IWbemCallResult_FWD_DEFINED__ typedef interface IWbemCallResult IWbemCallResult; +#ifdef __cplusplus +interface IWbemCallResult; +#endif /* __cplusplus */ #endif #ifndef __IWbemServices_FWD_DEFINED__ #define __IWbemServices_FWD_DEFINED__ typedef interface IWbemServices IWbemServices; +#ifdef __cplusplus +interface IWbemServices; +#endif /* __cplusplus */ #endif #ifndef __IWbemShutdown_FWD_DEFINED__ #define __IWbemShutdown_FWD_DEFINED__ typedef interface IWbemShutdown IWbemShutdown; +#ifdef __cplusplus +interface IWbemShutdown; +#endif /* __cplusplus */ #endif #ifndef __IWbemObjectTextSrc_FWD_DEFINED__ #define __IWbemObjectTextSrc_FWD_DEFINED__ typedef interface IWbemObjectTextSrc IWbemObjectTextSrc; +#ifdef __cplusplus +interface IWbemObjectTextSrc; +#endif /* __cplusplus */ #endif #ifndef __IWbemObjectAccess_FWD_DEFINED__ #define __IWbemObjectAccess_FWD_DEFINED__ typedef interface IWbemObjectAccess IWbemObjectAccess; +#ifdef __cplusplus +interface IWbemObjectAccess; +#endif /* __cplusplus */ #endif #ifndef __IMofCompiler_FWD_DEFINED__ #define __IMofCompiler_FWD_DEFINED__ typedef interface IMofCompiler IMofCompiler; +#ifdef __cplusplus +interface IMofCompiler; +#endif /* __cplusplus */ #endif #ifndef __IUnsecuredApartment_FWD_DEFINED__ #define __IUnsecuredApartment_FWD_DEFINED__ typedef interface IUnsecuredApartment IUnsecuredApartment; +#ifdef __cplusplus +interface IUnsecuredApartment; +#endif /* __cplusplus */ #endif #ifndef __IWbemUnsecuredApartment_FWD_DEFINED__ #define __IWbemUnsecuredApartment_FWD_DEFINED__ typedef interface IWbemUnsecuredApartment IWbemUnsecuredApartment; +#ifdef __cplusplus +interface IWbemUnsecuredApartment; +#endif /* __cplusplus */ #endif #ifndef __IWbemStatusCodeText_FWD_DEFINED__ #define __IWbemStatusCodeText_FWD_DEFINED__ typedef interface IWbemStatusCodeText IWbemStatusCodeText; +#ifdef __cplusplus +interface IWbemStatusCodeText; +#endif /* __cplusplus */ #endif #ifndef __IWbemBackupRestore_FWD_DEFINED__ #define __IWbemBackupRestore_FWD_DEFINED__ typedef interface IWbemBackupRestore IWbemBackupRestore; +#ifdef __cplusplus +interface IWbemBackupRestore; +#endif /* __cplusplus */ #endif #ifndef __IWbemBackupRestoreEx_FWD_DEFINED__ #define __IWbemBackupRestoreEx_FWD_DEFINED__ typedef interface IWbemBackupRestoreEx IWbemBackupRestoreEx; +#ifdef __cplusplus +interface IWbemBackupRestoreEx; +#endif /* __cplusplus */ #endif #ifndef __IWbemRefresher_FWD_DEFINED__ #define __IWbemRefresher_FWD_DEFINED__ typedef interface IWbemRefresher IWbemRefresher; +#ifdef __cplusplus +interface IWbemRefresher; +#endif /* __cplusplus */ #endif #ifndef __IWbemHiPerfEnum_FWD_DEFINED__ #define __IWbemHiPerfEnum_FWD_DEFINED__ typedef interface IWbemHiPerfEnum IWbemHiPerfEnum; +#ifdef __cplusplus +interface IWbemHiPerfEnum; +#endif /* __cplusplus */ #endif #ifndef __IWbemConfigureRefresher_FWD_DEFINED__ #define __IWbemConfigureRefresher_FWD_DEFINED__ typedef interface IWbemConfigureRefresher IWbemConfigureRefresher; +#ifdef __cplusplus +interface IWbemConfigureRefresher; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -222,101 +286,161 @@ extern "C" { #ifndef __IEnumWbemClassObject_FWD_DEFINED__ #define __IEnumWbemClassObject_FWD_DEFINED__ typedef interface IEnumWbemClassObject IEnumWbemClassObject; +#ifdef __cplusplus +interface IEnumWbemClassObject; +#endif /* __cplusplus */ #endif #ifndef __IUnsecuredApartment_FWD_DEFINED__ #define __IUnsecuredApartment_FWD_DEFINED__ typedef interface IUnsecuredApartment IUnsecuredApartment; +#ifdef __cplusplus +interface IUnsecuredApartment; +#endif /* __cplusplus */ #endif #ifndef __IWbemBackupRestore_FWD_DEFINED__ #define __IWbemBackupRestore_FWD_DEFINED__ typedef interface IWbemBackupRestore IWbemBackupRestore; +#ifdef __cplusplus +interface IWbemBackupRestore; +#endif /* __cplusplus */ #endif #ifndef __IWbemBackupRestoreEx_FWD_DEFINED__ #define __IWbemBackupRestoreEx_FWD_DEFINED__ typedef interface IWbemBackupRestoreEx IWbemBackupRestoreEx; +#ifdef __cplusplus +interface IWbemBackupRestoreEx; +#endif /* __cplusplus */ #endif #ifndef __IWbemCallResult_FWD_DEFINED__ #define __IWbemCallResult_FWD_DEFINED__ typedef interface IWbemCallResult IWbemCallResult; +#ifdef __cplusplus +interface IWbemCallResult; +#endif /* __cplusplus */ #endif #ifndef __IWbemClassObject_FWD_DEFINED__ #define __IWbemClassObject_FWD_DEFINED__ typedef interface IWbemClassObject IWbemClassObject; +#ifdef __cplusplus +interface IWbemClassObject; +#endif /* __cplusplus */ #endif #ifndef __IWbemConfigureRefresher_FWD_DEFINED__ #define __IWbemConfigureRefresher_FWD_DEFINED__ typedef interface IWbemConfigureRefresher IWbemConfigureRefresher; +#ifdef __cplusplus +interface IWbemConfigureRefresher; +#endif /* __cplusplus */ #endif #ifndef __IWbemConnection_FWD_DEFINED__ #define __IWbemConnection_FWD_DEFINED__ typedef interface IWbemConnection IWbemConnection; +#ifdef __cplusplus +interface IWbemConnection; +#endif /* __cplusplus */ #endif #ifndef __IWbemContext_FWD_DEFINED__ #define __IWbemContext_FWD_DEFINED__ typedef interface IWbemContext IWbemContext; +#ifdef __cplusplus +interface IWbemContext; +#endif /* __cplusplus */ #endif #ifndef __IWbemEventSink_FWD_DEFINED__ #define __IWbemEventSink_FWD_DEFINED__ typedef interface IWbemEventSink IWbemEventSink; +#ifdef __cplusplus +interface IWbemEventSink; +#endif /* __cplusplus */ #endif #ifndef __IWbemHiPerfEnum_FWD_DEFINED__ #define __IWbemHiPerfEnum_FWD_DEFINED__ typedef interface IWbemHiPerfEnum IWbemHiPerfEnum; +#ifdef __cplusplus +interface IWbemHiPerfEnum; +#endif /* __cplusplus */ #endif #ifndef __IWbemLocator_FWD_DEFINED__ #define __IWbemLocator_FWD_DEFINED__ typedef interface IWbemLocator IWbemLocator; +#ifdef __cplusplus +interface IWbemLocator; +#endif /* __cplusplus */ #endif #ifndef __IWbemObjectAccess_FWD_DEFINED__ #define __IWbemObjectAccess_FWD_DEFINED__ typedef interface IWbemObjectAccess IWbemObjectAccess; +#ifdef __cplusplus +interface IWbemObjectAccess; +#endif /* __cplusplus */ #endif #ifndef __IWbemObjectSink_FWD_DEFINED__ #define __IWbemObjectSink_FWD_DEFINED__ typedef interface IWbemObjectSink IWbemObjectSink; +#ifdef __cplusplus +interface IWbemObjectSink; +#endif /* __cplusplus */ #endif #ifndef __IWbemQualifierSet_FWD_DEFINED__ #define __IWbemQualifierSet_FWD_DEFINED__ typedef interface IWbemQualifierSet IWbemQualifierSet; +#ifdef __cplusplus +interface IWbemQualifierSet; +#endif /* __cplusplus */ #endif #ifndef __IWbemRefresher_FWD_DEFINED__ #define __IWbemRefresher_FWD_DEFINED__ typedef interface IWbemRefresher IWbemRefresher; +#ifdef __cplusplus +interface IWbemRefresher; +#endif /* __cplusplus */ #endif #ifndef __IWbemSecureObjectSink_FWD_DEFINED__ #define __IWbemSecureObjectSink_FWD_DEFINED__ typedef interface IWbemSecureObjectSink IWbemSecureObjectSink; +#ifdef __cplusplus +interface IWbemSecureObjectSink; +#endif /* __cplusplus */ #endif #ifndef __IWbemServices_FWD_DEFINED__ #define __IWbemServices_FWD_DEFINED__ typedef interface IWbemServices IWbemServices; +#ifdef __cplusplus +interface IWbemServices; +#endif /* __cplusplus */ #endif #ifndef __IWbemStatusCodeText_FWD_DEFINED__ #define __IWbemStatusCodeText_FWD_DEFINED__ typedef interface IWbemStatusCodeText IWbemStatusCodeText; +#ifdef __cplusplus +interface IWbemStatusCodeText; +#endif /* __cplusplus */ #endif #ifndef __IWbemUnsecuredApartment_FWD_DEFINED__ #define __IWbemUnsecuredApartment_FWD_DEFINED__ typedef interface IWbemUnsecuredApartment IWbemUnsecuredApartment; +#ifdef __cplusplus +interface IWbemUnsecuredApartment; +#endif /* __cplusplus */ #endif #include @@ -966,23 +1090,23 @@ typedef struct IWbemClassObjectVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemClassObject* This, + IWbemClassObject *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemClassObject* This); + IWbemClassObject *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemClassObject* This); + IWbemClassObject *This); /*** IWbemClassObject methods ***/ HRESULT (STDMETHODCALLTYPE *GetQualifierSet)( - IWbemClassObject* This, + IWbemClassObject *This, IWbemQualifierSet **ppQualSet); HRESULT (STDMETHODCALLTYPE *Get)( - IWbemClassObject* This, + IWbemClassObject *This, LPCWSTR wszName, LONG lFlags, VARIANT *pVal, @@ -990,29 +1114,29 @@ typedef struct IWbemClassObjectVtbl { LONG *plFlavor); HRESULT (STDMETHODCALLTYPE *Put)( - IWbemClassObject* This, + IWbemClassObject *This, LPCWSTR wszName, LONG lFlags, VARIANT *pVal, CIMTYPE Type); HRESULT (STDMETHODCALLTYPE *Delete)( - IWbemClassObject* This, + IWbemClassObject *This, LPCWSTR wszName); HRESULT (STDMETHODCALLTYPE *GetNames)( - IWbemClassObject* This, + IWbemClassObject *This, LPCWSTR wszQualifierName, LONG lFlags, VARIANT *pQualifierVal, SAFEARRAY **pNames); HRESULT (STDMETHODCALLTYPE *BeginEnumeration)( - IWbemClassObject* This, + IWbemClassObject *This, LONG lEnumFlags); HRESULT (STDMETHODCALLTYPE *Next)( - IWbemClassObject* This, + IWbemClassObject *This, LONG lFlags, BSTR *strName, VARIANT *pVal, @@ -1020,90 +1144,91 @@ typedef struct IWbemClassObjectVtbl { LONG *plFlavor); HRESULT (STDMETHODCALLTYPE *EndEnumeration)( - IWbemClassObject* This); + IWbemClassObject *This); HRESULT (STDMETHODCALLTYPE *GetPropertyQualifierSet)( - IWbemClassObject* This, + IWbemClassObject *This, LPCWSTR wszProperty, IWbemQualifierSet **ppQualSet); HRESULT (STDMETHODCALLTYPE *Clone)( - IWbemClassObject* This, + IWbemClassObject *This, IWbemClassObject **ppCopy); HRESULT (STDMETHODCALLTYPE *GetObjectText)( - IWbemClassObject* This, + IWbemClassObject *This, LONG lFlags, BSTR *pstrObjectText); HRESULT (STDMETHODCALLTYPE *SpawnDerivedClass)( - IWbemClassObject* This, + IWbemClassObject *This, LONG lFlags, IWbemClassObject **ppNewClass); HRESULT (STDMETHODCALLTYPE *SpawnInstance)( - IWbemClassObject* This, + IWbemClassObject *This, LONG lFlags, IWbemClassObject **ppNewInstance); HRESULT (STDMETHODCALLTYPE *CompareTo)( - IWbemClassObject* This, + IWbemClassObject *This, LONG lFlags, IWbemClassObject *pCompareTo); HRESULT (STDMETHODCALLTYPE *GetPropertyOrigin)( - IWbemClassObject* This, + IWbemClassObject *This, LPCWSTR wszName, BSTR *pstrClassName); HRESULT (STDMETHODCALLTYPE *InheritsFrom)( - IWbemClassObject* This, + IWbemClassObject *This, LPCWSTR strAncestor); HRESULT (STDMETHODCALLTYPE *GetMethod)( - IWbemClassObject* This, + IWbemClassObject *This, LPCWSTR wszName, LONG lFlags, IWbemClassObject **ppInSignature, IWbemClassObject **ppOutSignature); HRESULT (STDMETHODCALLTYPE *PutMethod)( - IWbemClassObject* This, + IWbemClassObject *This, LPCWSTR wszName, LONG lFlags, IWbemClassObject *pInSignature, IWbemClassObject *pOutSignature); HRESULT (STDMETHODCALLTYPE *DeleteMethod)( - IWbemClassObject* This, + IWbemClassObject *This, LPCWSTR wszName); HRESULT (STDMETHODCALLTYPE *BeginMethodEnumeration)( - IWbemClassObject* This, + IWbemClassObject *This, LONG lEnumFlags); HRESULT (STDMETHODCALLTYPE *NextMethod)( - IWbemClassObject* This, + IWbemClassObject *This, LONG lFlags, BSTR *pstrName, IWbemClassObject **ppInSignature, IWbemClassObject **ppOutSignature); HRESULT (STDMETHODCALLTYPE *EndMethodEnumeration)( - IWbemClassObject* This); + IWbemClassObject *This); HRESULT (STDMETHODCALLTYPE *GetMethodQualifierSet)( - IWbemClassObject* This, + IWbemClassObject *This, LPCWSTR wszMethod, IWbemQualifierSet **ppQualSet); HRESULT (STDMETHODCALLTYPE *GetMethodOrigin)( - IWbemClassObject* This, + IWbemClassObject *This, LPCWSTR wszMethodName, BSTR *pstrClassName); END_INTERFACE } IWbemClassObjectVtbl; + interface IWbemClassObject { CONST_VTBL IWbemClassObjectVtbl* lpVtbl; }; @@ -1228,227 +1353,6 @@ static FORCEINLINE HRESULT IWbemClassObject_GetMethodOrigin(IWbemClassObject* Th #endif -HRESULT STDMETHODCALLTYPE IWbemClassObject_GetQualifierSet_Proxy( - IWbemClassObject* This, - IWbemQualifierSet **ppQualSet); -void __RPC_STUB IWbemClassObject_GetQualifierSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClassObject_Get_Proxy( - IWbemClassObject* This, - LPCWSTR wszName, - LONG lFlags, - VARIANT *pVal, - CIMTYPE *pType, - LONG *plFlavor); -void __RPC_STUB IWbemClassObject_Get_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClassObject_Put_Proxy( - IWbemClassObject* This, - LPCWSTR wszName, - LONG lFlags, - VARIANT *pVal, - CIMTYPE Type); -void __RPC_STUB IWbemClassObject_Put_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClassObject_Delete_Proxy( - IWbemClassObject* This, - LPCWSTR wszName); -void __RPC_STUB IWbemClassObject_Delete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClassObject_GetNames_Proxy( - IWbemClassObject* This, - LPCWSTR wszQualifierName, - LONG lFlags, - VARIANT *pQualifierVal, - SAFEARRAY **pNames); -void __RPC_STUB IWbemClassObject_GetNames_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClassObject_BeginEnumeration_Proxy( - IWbemClassObject* This, - LONG lEnumFlags); -void __RPC_STUB IWbemClassObject_BeginEnumeration_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClassObject_Next_Proxy( - IWbemClassObject* This, - LONG lFlags, - BSTR *strName, - VARIANT *pVal, - CIMTYPE *pType, - LONG *plFlavor); -void __RPC_STUB IWbemClassObject_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClassObject_EndEnumeration_Proxy( - IWbemClassObject* This); -void __RPC_STUB IWbemClassObject_EndEnumeration_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClassObject_GetPropertyQualifierSet_Proxy( - IWbemClassObject* This, - LPCWSTR wszProperty, - IWbemQualifierSet **ppQualSet); -void __RPC_STUB IWbemClassObject_GetPropertyQualifierSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClassObject_Clone_Proxy( - IWbemClassObject* This, - IWbemClassObject **ppCopy); -void __RPC_STUB IWbemClassObject_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClassObject_GetObjectText_Proxy( - IWbemClassObject* This, - LONG lFlags, - BSTR *pstrObjectText); -void __RPC_STUB IWbemClassObject_GetObjectText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClassObject_SpawnDerivedClass_Proxy( - IWbemClassObject* This, - LONG lFlags, - IWbemClassObject **ppNewClass); -void __RPC_STUB IWbemClassObject_SpawnDerivedClass_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClassObject_SpawnInstance_Proxy( - IWbemClassObject* This, - LONG lFlags, - IWbemClassObject **ppNewInstance); -void __RPC_STUB IWbemClassObject_SpawnInstance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClassObject_CompareTo_Proxy( - IWbemClassObject* This, - LONG lFlags, - IWbemClassObject *pCompareTo); -void __RPC_STUB IWbemClassObject_CompareTo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClassObject_GetPropertyOrigin_Proxy( - IWbemClassObject* This, - LPCWSTR wszName, - BSTR *pstrClassName); -void __RPC_STUB IWbemClassObject_GetPropertyOrigin_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClassObject_InheritsFrom_Proxy( - IWbemClassObject* This, - LPCWSTR strAncestor); -void __RPC_STUB IWbemClassObject_InheritsFrom_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClassObject_GetMethod_Proxy( - IWbemClassObject* This, - LPCWSTR wszName, - LONG lFlags, - IWbemClassObject **ppInSignature, - IWbemClassObject **ppOutSignature); -void __RPC_STUB IWbemClassObject_GetMethod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClassObject_PutMethod_Proxy( - IWbemClassObject* This, - LPCWSTR wszName, - LONG lFlags, - IWbemClassObject *pInSignature, - IWbemClassObject *pOutSignature); -void __RPC_STUB IWbemClassObject_PutMethod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClassObject_DeleteMethod_Proxy( - IWbemClassObject* This, - LPCWSTR wszName); -void __RPC_STUB IWbemClassObject_DeleteMethod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClassObject_BeginMethodEnumeration_Proxy( - IWbemClassObject* This, - LONG lEnumFlags); -void __RPC_STUB IWbemClassObject_BeginMethodEnumeration_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClassObject_NextMethod_Proxy( - IWbemClassObject* This, - LONG lFlags, - BSTR *pstrName, - IWbemClassObject **ppInSignature, - IWbemClassObject **ppOutSignature); -void __RPC_STUB IWbemClassObject_NextMethod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClassObject_EndMethodEnumeration_Proxy( - IWbemClassObject* This); -void __RPC_STUB IWbemClassObject_EndMethodEnumeration_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClassObject_GetMethodQualifierSet_Proxy( - IWbemClassObject* This, - LPCWSTR wszMethod, - IWbemQualifierSet **ppQualSet); -void __RPC_STUB IWbemClassObject_GetMethodQualifierSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClassObject_GetMethodOrigin_Proxy( - IWbemClassObject* This, - LPCWSTR wszMethodName, - BSTR *pstrClassName); -void __RPC_STUB IWbemClassObject_GetMethodOrigin_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemClassObject_INTERFACE_DEFINED__ */ @@ -1503,55 +1407,56 @@ typedef struct IWbemQualifierSetVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemQualifierSet* This, + IWbemQualifierSet *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemQualifierSet* This); + IWbemQualifierSet *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemQualifierSet* This); + IWbemQualifierSet *This); /*** IWbemQualifierSet methods ***/ HRESULT (STDMETHODCALLTYPE *Get)( - IWbemQualifierSet* This, + IWbemQualifierSet *This, LPCWSTR wszName, LONG lFlags, VARIANT *pVal, LONG *plFlavor); HRESULT (STDMETHODCALLTYPE *Put)( - IWbemQualifierSet* This, + IWbemQualifierSet *This, LPCWSTR wszName, VARIANT *pVal, LONG lFlavor); HRESULT (STDMETHODCALLTYPE *Delete)( - IWbemQualifierSet* This, + IWbemQualifierSet *This, LPCWSTR wszName); HRESULT (STDMETHODCALLTYPE *GetNames)( - IWbemQualifierSet* This, + IWbemQualifierSet *This, LONG lFlags, SAFEARRAY **pNames); HRESULT (STDMETHODCALLTYPE *BeginEnumeration)( - IWbemQualifierSet* This, + IWbemQualifierSet *This, LONG lFlags); HRESULT (STDMETHODCALLTYPE *Next)( - IWbemQualifierSet* This, + IWbemQualifierSet *This, LONG lFlags, BSTR *pstrName, VARIANT *pVal, LONG *plFlavor); HRESULT (STDMETHODCALLTYPE *EndEnumeration)( - IWbemQualifierSet* This); + IWbemQualifierSet *This); END_INTERFACE } IWbemQualifierSetVtbl; + interface IWbemQualifierSet { CONST_VTBL IWbemQualifierSetVtbl* lpVtbl; }; @@ -1608,70 +1513,6 @@ static FORCEINLINE HRESULT IWbemQualifierSet_EndEnumeration(IWbemQualifierSet* T #endif -HRESULT STDMETHODCALLTYPE IWbemQualifierSet_Get_Proxy( - IWbemQualifierSet* This, - LPCWSTR wszName, - LONG lFlags, - VARIANT *pVal, - LONG *plFlavor); -void __RPC_STUB IWbemQualifierSet_Get_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemQualifierSet_Put_Proxy( - IWbemQualifierSet* This, - LPCWSTR wszName, - VARIANT *pVal, - LONG lFlavor); -void __RPC_STUB IWbemQualifierSet_Put_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemQualifierSet_Delete_Proxy( - IWbemQualifierSet* This, - LPCWSTR wszName); -void __RPC_STUB IWbemQualifierSet_Delete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemQualifierSet_GetNames_Proxy( - IWbemQualifierSet* This, - LONG lFlags, - SAFEARRAY **pNames); -void __RPC_STUB IWbemQualifierSet_GetNames_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemQualifierSet_BeginEnumeration_Proxy( - IWbemQualifierSet* This, - LONG lFlags); -void __RPC_STUB IWbemQualifierSet_BeginEnumeration_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemQualifierSet_Next_Proxy( - IWbemQualifierSet* This, - LONG lFlags, - BSTR *pstrName, - VARIANT *pVal, - LONG *plFlavor); -void __RPC_STUB IWbemQualifierSet_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemQualifierSet_EndEnumeration_Proxy( - IWbemQualifierSet* This); -void __RPC_STUB IWbemQualifierSet_EndEnumeration_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemQualifierSet_INTERFACE_DEFINED__ */ @@ -1706,19 +1547,19 @@ typedef struct IWbemLocatorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemLocator* This, + IWbemLocator *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemLocator* This); + IWbemLocator *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemLocator* This); + IWbemLocator *This); /*** IWbemLocator methods ***/ HRESULT (STDMETHODCALLTYPE *ConnectServer)( - IWbemLocator* This, + IWbemLocator *This, const BSTR strNetworkResource, const BSTR strUser, const BSTR strPassword, @@ -1730,6 +1571,7 @@ typedef struct IWbemLocatorVtbl { END_INTERFACE } IWbemLocatorVtbl; + interface IWbemLocator { CONST_VTBL IWbemLocatorVtbl* lpVtbl; }; @@ -1762,21 +1604,6 @@ static FORCEINLINE HRESULT IWbemLocator_ConnectServer(IWbemLocator* This,const B #endif -HRESULT STDMETHODCALLTYPE IWbemLocator_ConnectServer_Proxy( - IWbemLocator* This, - const BSTR strNetworkResource, - const BSTR strUser, - const BSTR strPassword, - const BSTR strLocale, - LONG lSecurityFlags, - const BSTR strAuthority, - IWbemContext *pCtx, - IWbemServices **ppNamespace); -void __RPC_STUB IWbemLocator_ConnectServer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemLocator_INTERFACE_DEFINED__ */ @@ -1811,24 +1638,24 @@ typedef struct IWbemObjectSinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemObjectSink* This, + IWbemObjectSink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemObjectSink* This); + IWbemObjectSink *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemObjectSink* This); + IWbemObjectSink *This); /*** IWbemObjectSink methods ***/ HRESULT (STDMETHODCALLTYPE *Indicate)( - IWbemObjectSink* This, + IWbemObjectSink *This, LONG lObjectCount, IWbemClassObject **apObjArray); HRESULT (STDMETHODCALLTYPE *SetStatus)( - IWbemObjectSink* This, + IWbemObjectSink *This, LONG lFlags, HRESULT hResult, BSTR strParam, @@ -1836,6 +1663,7 @@ typedef struct IWbemObjectSinkVtbl { END_INTERFACE } IWbemObjectSinkVtbl; + interface IWbemObjectSink { CONST_VTBL IWbemObjectSinkVtbl* lpVtbl; }; @@ -1872,26 +1700,6 @@ static FORCEINLINE HRESULT IWbemObjectSink_SetStatus(IWbemObjectSink* This,LONG #endif -HRESULT STDMETHODCALLTYPE IWbemObjectSink_Indicate_Proxy( - IWbemObjectSink* This, - LONG lObjectCount, - IWbemClassObject **apObjArray); -void __RPC_STUB IWbemObjectSink_Indicate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemObjectSink_SetStatus_Proxy( - IWbemObjectSink* This, - LONG lFlags, - HRESULT hResult, - BSTR strParam, - IWbemClassObject *pObjParam); -void __RPC_STUB IWbemObjectSink_SetStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemObjectSink_INTERFACE_DEFINED__ */ @@ -1942,24 +1750,24 @@ typedef struct IWbemObjectSinkExVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemObjectSinkEx* This, + IWbemObjectSinkEx *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemObjectSinkEx* This); + IWbemObjectSinkEx *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemObjectSinkEx* This); + IWbemObjectSinkEx *This); /*** IWbemObjectSink methods ***/ HRESULT (STDMETHODCALLTYPE *Indicate)( - IWbemObjectSinkEx* This, + IWbemObjectSinkEx *This, LONG lObjectCount, IWbemClassObject **apObjArray); HRESULT (STDMETHODCALLTYPE *SetStatus)( - IWbemObjectSinkEx* This, + IWbemObjectSinkEx *This, LONG lFlags, HRESULT hResult, BSTR strParam, @@ -1967,23 +1775,23 @@ typedef struct IWbemObjectSinkExVtbl { /*** IWbemObjectSinkEx methods ***/ HRESULT (STDMETHODCALLTYPE *WriteMessage)( - IWbemObjectSinkEx* This, + IWbemObjectSinkEx *This, ULONG uChannel, const BSTR strMessage); HRESULT (STDMETHODCALLTYPE *WriteError)( - IWbemObjectSinkEx* This, + IWbemObjectSinkEx *This, IWbemClassObject *pObjError, unsigned char *puReturned); HRESULT (STDMETHODCALLTYPE *PromptUser)( - IWbemObjectSinkEx* This, + IWbemObjectSinkEx *This, const BSTR strMessage, unsigned char uPromptType, unsigned char *puReturned); HRESULT (STDMETHODCALLTYPE *WriteProgress)( - IWbemObjectSinkEx* This, + IWbemObjectSinkEx *This, const BSTR strActivity, const BSTR strCurrentOperation, const BSTR strStatusDescription, @@ -1991,7 +1799,7 @@ typedef struct IWbemObjectSinkExVtbl { ULONG uSecondsRemaining); HRESULT (STDMETHODCALLTYPE *WriteStreamParameter)( - IWbemObjectSinkEx* This, + IWbemObjectSinkEx *This, const BSTR strName, VARIANT *vtValue, ULONG ulType, @@ -1999,6 +1807,7 @@ typedef struct IWbemObjectSinkExVtbl { END_INTERFACE } IWbemObjectSinkExVtbl; + interface IWbemObjectSinkEx { CONST_VTBL IWbemObjectSinkExVtbl* lpVtbl; }; @@ -2057,57 +1866,6 @@ static FORCEINLINE HRESULT IWbemObjectSinkEx_WriteStreamParameter(IWbemObjectSin #endif -HRESULT STDMETHODCALLTYPE IWbemObjectSinkEx_WriteMessage_Proxy( - IWbemObjectSinkEx* This, - ULONG uChannel, - const BSTR strMessage); -void __RPC_STUB IWbemObjectSinkEx_WriteMessage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemObjectSinkEx_WriteError_Proxy( - IWbemObjectSinkEx* This, - IWbemClassObject *pObjError, - unsigned char *puReturned); -void __RPC_STUB IWbemObjectSinkEx_WriteError_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemObjectSinkEx_PromptUser_Proxy( - IWbemObjectSinkEx* This, - const BSTR strMessage, - unsigned char uPromptType, - unsigned char *puReturned); -void __RPC_STUB IWbemObjectSinkEx_PromptUser_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemObjectSinkEx_WriteProgress_Proxy( - IWbemObjectSinkEx* This, - const BSTR strActivity, - const BSTR strCurrentOperation, - const BSTR strStatusDescription, - ULONG uPercentComplete, - ULONG uSecondsRemaining); -void __RPC_STUB IWbemObjectSinkEx_WriteProgress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemObjectSinkEx_WriteStreamParameter_Proxy( - IWbemObjectSinkEx* This, - const BSTR strName, - VARIANT *vtValue, - ULONG ulType, - ULONG ulFlags); -void __RPC_STUB IWbemObjectSinkEx_WriteStreamParameter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemObjectSinkEx_INTERFACE_DEFINED__ */ @@ -2152,43 +1910,44 @@ typedef struct IEnumWbemClassObjectVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumWbemClassObject* This, + IEnumWbemClassObject *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumWbemClassObject* This); + IEnumWbemClassObject *This); ULONG (STDMETHODCALLTYPE *Release)( - IEnumWbemClassObject* This); + IEnumWbemClassObject *This); /*** IEnumWbemClassObject methods ***/ HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumWbemClassObject* This); + IEnumWbemClassObject *This); HRESULT (STDMETHODCALLTYPE *Next)( - IEnumWbemClassObject* This, + IEnumWbemClassObject *This, LONG lTimeout, ULONG uCount, IWbemClassObject **apObjects, ULONG *puReturned); HRESULT (STDMETHODCALLTYPE *NextAsync)( - IEnumWbemClassObject* This, + IEnumWbemClassObject *This, ULONG uCount, IWbemObjectSink *pSink); HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumWbemClassObject* This, + IEnumWbemClassObject *This, IEnumWbemClassObject **ppEnum); HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumWbemClassObject* This, + IEnumWbemClassObject *This, LONG lTimeout, ULONG nCount); END_INTERFACE } IEnumWbemClassObjectVtbl; + interface IEnumWbemClassObject { CONST_VTBL IEnumWbemClassObjectVtbl* lpVtbl; }; @@ -2237,50 +1996,6 @@ static FORCEINLINE HRESULT IEnumWbemClassObject_Skip(IEnumWbemClassObject* This, #endif -HRESULT STDMETHODCALLTYPE IEnumWbemClassObject_Reset_Proxy( - IEnumWbemClassObject* This); -void __RPC_STUB IEnumWbemClassObject_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumWbemClassObject_Next_Proxy( - IEnumWbemClassObject* This, - LONG lTimeout, - ULONG uCount, - IWbemClassObject **apObjects, - ULONG *puReturned); -void __RPC_STUB IEnumWbemClassObject_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumWbemClassObject_NextAsync_Proxy( - IEnumWbemClassObject* This, - ULONG uCount, - IWbemObjectSink *pSink); -void __RPC_STUB IEnumWbemClassObject_NextAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumWbemClassObject_Clone_Proxy( - IEnumWbemClassObject* This, - IEnumWbemClassObject **ppEnum); -void __RPC_STUB IEnumWbemClassObject_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IEnumWbemClassObject_Skip_Proxy( - IEnumWbemClassObject* This, - LONG lTimeout, - ULONG nCount); -void __RPC_STUB IEnumWbemClassObject_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IEnumWbemClassObject_INTERFACE_DEFINED__ */ @@ -2340,61 +2055,62 @@ typedef struct IWbemContextVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemContext* This, + IWbemContext *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemContext* This); + IWbemContext *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemContext* This); + IWbemContext *This); /*** IWbemContext methods ***/ HRESULT (STDMETHODCALLTYPE *Clone)( - IWbemContext* This, + IWbemContext *This, IWbemContext **ppNewCopy); HRESULT (STDMETHODCALLTYPE *GetNames)( - IWbemContext* This, + IWbemContext *This, LONG lFlags, SAFEARRAY **pNames); HRESULT (STDMETHODCALLTYPE *BeginEnumeration)( - IWbemContext* This, + IWbemContext *This, LONG lFlags); HRESULT (STDMETHODCALLTYPE *Next)( - IWbemContext* This, + IWbemContext *This, LONG lFlags, BSTR *pstrName, VARIANT *pValue); HRESULT (STDMETHODCALLTYPE *EndEnumeration)( - IWbemContext* This); + IWbemContext *This); HRESULT (STDMETHODCALLTYPE *SetValue)( - IWbemContext* This, + IWbemContext *This, LPCWSTR wszName, LONG lFlags, VARIANT *pValue); HRESULT (STDMETHODCALLTYPE *GetValue)( - IWbemContext* This, + IWbemContext *This, LPCWSTR wszName, LONG lFlags, VARIANT *pValue); HRESULT (STDMETHODCALLTYPE *DeleteValue)( - IWbemContext* This, + IWbemContext *This, LPCWSTR wszName, LONG lFlags); HRESULT (STDMETHODCALLTYPE *DeleteAll)( - IWbemContext* This); + IWbemContext *This); END_INTERFACE } IWbemContextVtbl; + interface IWbemContext { CONST_VTBL IWbemContextVtbl* lpVtbl; }; @@ -2459,84 +2175,6 @@ static FORCEINLINE HRESULT IWbemContext_DeleteAll(IWbemContext* This) { #endif -HRESULT STDMETHODCALLTYPE IWbemContext_Clone_Proxy( - IWbemContext* This, - IWbemContext **ppNewCopy); -void __RPC_STUB IWbemContext_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemContext_GetNames_Proxy( - IWbemContext* This, - LONG lFlags, - SAFEARRAY **pNames); -void __RPC_STUB IWbemContext_GetNames_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemContext_BeginEnumeration_Proxy( - IWbemContext* This, - LONG lFlags); -void __RPC_STUB IWbemContext_BeginEnumeration_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemContext_Next_Proxy( - IWbemContext* This, - LONG lFlags, - BSTR *pstrName, - VARIANT *pValue); -void __RPC_STUB IWbemContext_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemContext_EndEnumeration_Proxy( - IWbemContext* This); -void __RPC_STUB IWbemContext_EndEnumeration_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemContext_SetValue_Proxy( - IWbemContext* This, - LPCWSTR wszName, - LONG lFlags, - VARIANT *pValue); -void __RPC_STUB IWbemContext_SetValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemContext_GetValue_Proxy( - IWbemContext* This, - LPCWSTR wszName, - LONG lFlags, - VARIANT *pValue); -void __RPC_STUB IWbemContext_GetValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemContext_DeleteValue_Proxy( - IWbemContext* This, - LPCWSTR wszName, - LONG lFlags); -void __RPC_STUB IWbemContext_DeleteValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemContext_DeleteAll_Proxy( - IWbemContext* This); -void __RPC_STUB IWbemContext_DeleteAll_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemContext_INTERFACE_DEFINED__ */ @@ -2577,39 +2215,40 @@ typedef struct IWbemCallResultVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemCallResult* This, + IWbemCallResult *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemCallResult* This); + IWbemCallResult *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemCallResult* This); + IWbemCallResult *This); /*** IWbemCallResult methods ***/ HRESULT (STDMETHODCALLTYPE *GetResultObject)( - IWbemCallResult* This, + IWbemCallResult *This, LONG lTimeout, IWbemClassObject **ppResultObject); HRESULT (STDMETHODCALLTYPE *GetResultString)( - IWbemCallResult* This, + IWbemCallResult *This, LONG lTimeout, BSTR *pstrResultString); HRESULT (STDMETHODCALLTYPE *GetResultServices)( - IWbemCallResult* This, + IWbemCallResult *This, LONG lTimeout, IWbemServices **ppServices); HRESULT (STDMETHODCALLTYPE *GetCallStatus)( - IWbemCallResult* This, + IWbemCallResult *This, LONG lTimeout, LONG *plStatus); END_INTERFACE } IWbemCallResultVtbl; + interface IWbemCallResult { CONST_VTBL IWbemCallResultVtbl* lpVtbl; }; @@ -2654,42 +2293,6 @@ static FORCEINLINE HRESULT IWbemCallResult_GetCallStatus(IWbemCallResult* This,L #endif -HRESULT STDMETHODCALLTYPE IWbemCallResult_GetResultObject_Proxy( - IWbemCallResult* This, - LONG lTimeout, - IWbemClassObject **ppResultObject); -void __RPC_STUB IWbemCallResult_GetResultObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemCallResult_GetResultString_Proxy( - IWbemCallResult* This, - LONG lTimeout, - BSTR *pstrResultString); -void __RPC_STUB IWbemCallResult_GetResultString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemCallResult_GetResultServices_Proxy( - IWbemCallResult* This, - LONG lTimeout, - IWbemServices **ppServices); -void __RPC_STUB IWbemCallResult_GetResultServices_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemCallResult_GetCallStatus_Proxy( - IWbemCallResult* This, - LONG lTimeout, - LONG *plStatus); -void __RPC_STUB IWbemCallResult_GetCallStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemCallResult_INTERFACE_DEFINED__ */ @@ -2858,19 +2461,19 @@ typedef struct IWbemServicesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemServices* This, + IWbemServices *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemServices* This); + IWbemServices *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemServices* This); + IWbemServices *This); /*** IWbemServices methods ***/ HRESULT (STDMETHODCALLTYPE *OpenNamespace)( - IWbemServices* This, + IWbemServices *This, const BSTR strNamespace, LONG lFlags, IWbemContext *pCtx, @@ -2878,16 +2481,16 @@ typedef struct IWbemServicesVtbl { IWbemCallResult **ppResult); HRESULT (STDMETHODCALLTYPE *CancelAsyncCall)( - IWbemServices* This, + IWbemServices *This, IWbemObjectSink *pSink); HRESULT (STDMETHODCALLTYPE *QueryObjectSink)( - IWbemServices* This, + IWbemServices *This, LONG lFlags, IWbemObjectSink **ppResponseHandler); HRESULT (STDMETHODCALLTYPE *GetObject)( - IWbemServices* This, + IWbemServices *This, const BSTR strObjectPath, LONG lFlags, IWbemContext *pCtx, @@ -2895,98 +2498,98 @@ typedef struct IWbemServicesVtbl { IWbemCallResult **ppCallResult); HRESULT (STDMETHODCALLTYPE *GetObjectAsync)( - IWbemServices* This, + IWbemServices *This, const BSTR strObjectPath, LONG lFlags, IWbemContext *pCtx, IWbemObjectSink *pResponseHandler); HRESULT (STDMETHODCALLTYPE *PutClass)( - IWbemServices* This, + IWbemServices *This, IWbemClassObject *pObject, LONG lFlags, IWbemContext *pCtx, IWbemCallResult **ppCallResult); HRESULT (STDMETHODCALLTYPE *PutClassAsync)( - IWbemServices* This, + IWbemServices *This, IWbemClassObject *pObject, LONG lFlags, IWbemContext *pCtx, IWbemObjectSink *pResponseHandler); HRESULT (STDMETHODCALLTYPE *DeleteClass)( - IWbemServices* This, + IWbemServices *This, const BSTR strClass, LONG lFlags, IWbemContext *pCtx, IWbemCallResult **ppCallResult); HRESULT (STDMETHODCALLTYPE *DeleteClassAsync)( - IWbemServices* This, + IWbemServices *This, const BSTR strClass, LONG lFlags, IWbemContext *pCtx, IWbemObjectSink *pResponseHandler); HRESULT (STDMETHODCALLTYPE *CreateClassEnum)( - IWbemServices* This, + IWbemServices *This, const BSTR strSuperclass, LONG lFlags, IWbemContext *pCtx, IEnumWbemClassObject **ppEnum); HRESULT (STDMETHODCALLTYPE *CreateClassEnumAsync)( - IWbemServices* This, + IWbemServices *This, const BSTR strSuperclass, LONG lFlags, IWbemContext *pCtx, IWbemObjectSink *pResponseHandler); HRESULT (STDMETHODCALLTYPE *PutInstance)( - IWbemServices* This, + IWbemServices *This, IWbemClassObject *pInst, LONG lFlags, IWbemContext *pCtx, IWbemCallResult **ppCallResult); HRESULT (STDMETHODCALLTYPE *PutInstanceAsync)( - IWbemServices* This, + IWbemServices *This, IWbemClassObject *pInst, LONG lFlags, IWbemContext *pCtx, IWbemObjectSink *pResponseHandler); HRESULT (STDMETHODCALLTYPE *DeleteInstance)( - IWbemServices* This, + IWbemServices *This, const BSTR strObjectPath, LONG lFlags, IWbemContext *pCtx, IWbemCallResult **ppCallResult); HRESULT (STDMETHODCALLTYPE *DeleteInstanceAsync)( - IWbemServices* This, + IWbemServices *This, const BSTR strObjectPath, LONG lFlags, IWbemContext *pCtx, IWbemObjectSink *pResponseHandler); HRESULT (STDMETHODCALLTYPE *CreateInstanceEnum)( - IWbemServices* This, + IWbemServices *This, const BSTR strFilter, LONG lFlags, IWbemContext *pCtx, IEnumWbemClassObject **ppEnum); HRESULT (STDMETHODCALLTYPE *CreateInstanceEnumAsync)( - IWbemServices* This, + IWbemServices *This, const BSTR strFilter, LONG lFlags, IWbemContext *pCtx, IWbemObjectSink *pResponseHandler); HRESULT (STDMETHODCALLTYPE *ExecQuery)( - IWbemServices* This, + IWbemServices *This, const BSTR strQueryLanguage, const BSTR strQuery, LONG lFlags, @@ -2994,7 +2597,7 @@ typedef struct IWbemServicesVtbl { IEnumWbemClassObject **ppEnum); HRESULT (STDMETHODCALLTYPE *ExecQueryAsync)( - IWbemServices* This, + IWbemServices *This, const BSTR strQueryLanguage, const BSTR strQuery, LONG lFlags, @@ -3002,7 +2605,7 @@ typedef struct IWbemServicesVtbl { IWbemObjectSink *pResponseHandler); HRESULT (STDMETHODCALLTYPE *ExecNotificationQuery)( - IWbemServices* This, + IWbemServices *This, const BSTR strQueryLanguage, const BSTR strQuery, LONG lFlags, @@ -3010,7 +2613,7 @@ typedef struct IWbemServicesVtbl { IEnumWbemClassObject **ppEnum); HRESULT (STDMETHODCALLTYPE *ExecNotificationQueryAsync)( - IWbemServices* This, + IWbemServices *This, const BSTR strQueryLanguage, const BSTR strQuery, LONG lFlags, @@ -3018,7 +2621,7 @@ typedef struct IWbemServicesVtbl { IWbemObjectSink *pResponseHandler); HRESULT (STDMETHODCALLTYPE *ExecMethod)( - IWbemServices* This, + IWbemServices *This, const BSTR strObjectPath, const BSTR strMethodName, LONG lFlags, @@ -3028,7 +2631,7 @@ typedef struct IWbemServicesVtbl { IWbemCallResult **ppCallResult); HRESULT (STDMETHODCALLTYPE *ExecMethodAsync)( - IWbemServices* This, + IWbemServices *This, const BSTR strObjectPath, const BSTR strMethodName, LONG lFlags, @@ -3038,6 +2641,7 @@ typedef struct IWbemServicesVtbl { END_INTERFACE } IWbemServicesVtbl; + interface IWbemServices { CONST_VTBL IWbemServicesVtbl* lpVtbl; }; @@ -3158,265 +2762,6 @@ static FORCEINLINE HRESULT IWbemServices_ExecMethodAsync(IWbemServices* This,con #endif -HRESULT STDMETHODCALLTYPE IWbemServices_OpenNamespace_Proxy( - IWbemServices* This, - const BSTR strNamespace, - LONG lFlags, - IWbemContext *pCtx, - IWbemServices **ppWorkingNamespace, - IWbemCallResult **ppResult); -void __RPC_STUB IWbemServices_OpenNamespace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemServices_CancelAsyncCall_Proxy( - IWbemServices* This, - IWbemObjectSink *pSink); -void __RPC_STUB IWbemServices_CancelAsyncCall_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemServices_QueryObjectSink_Proxy( - IWbemServices* This, - LONG lFlags, - IWbemObjectSink **ppResponseHandler); -void __RPC_STUB IWbemServices_QueryObjectSink_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemServices_GetObject_Proxy( - IWbemServices* This, - const BSTR strObjectPath, - LONG lFlags, - IWbemContext *pCtx, - IWbemClassObject **ppObject, - IWbemCallResult **ppCallResult); -void __RPC_STUB IWbemServices_GetObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemServices_GetObjectAsync_Proxy( - IWbemServices* This, - const BSTR strObjectPath, - LONG lFlags, - IWbemContext *pCtx, - IWbemObjectSink *pResponseHandler); -void __RPC_STUB IWbemServices_GetObjectAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemServices_PutClass_Proxy( - IWbemServices* This, - IWbemClassObject *pObject, - LONG lFlags, - IWbemContext *pCtx, - IWbemCallResult **ppCallResult); -void __RPC_STUB IWbemServices_PutClass_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemServices_PutClassAsync_Proxy( - IWbemServices* This, - IWbemClassObject *pObject, - LONG lFlags, - IWbemContext *pCtx, - IWbemObjectSink *pResponseHandler); -void __RPC_STUB IWbemServices_PutClassAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemServices_DeleteClass_Proxy( - IWbemServices* This, - const BSTR strClass, - LONG lFlags, - IWbemContext *pCtx, - IWbemCallResult **ppCallResult); -void __RPC_STUB IWbemServices_DeleteClass_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemServices_DeleteClassAsync_Proxy( - IWbemServices* This, - const BSTR strClass, - LONG lFlags, - IWbemContext *pCtx, - IWbemObjectSink *pResponseHandler); -void __RPC_STUB IWbemServices_DeleteClassAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemServices_CreateClassEnum_Proxy( - IWbemServices* This, - const BSTR strSuperclass, - LONG lFlags, - IWbemContext *pCtx, - IEnumWbemClassObject **ppEnum); -void __RPC_STUB IWbemServices_CreateClassEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemServices_CreateClassEnumAsync_Proxy( - IWbemServices* This, - const BSTR strSuperclass, - LONG lFlags, - IWbemContext *pCtx, - IWbemObjectSink *pResponseHandler); -void __RPC_STUB IWbemServices_CreateClassEnumAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemServices_PutInstance_Proxy( - IWbemServices* This, - IWbemClassObject *pInst, - LONG lFlags, - IWbemContext *pCtx, - IWbemCallResult **ppCallResult); -void __RPC_STUB IWbemServices_PutInstance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemServices_PutInstanceAsync_Proxy( - IWbemServices* This, - IWbemClassObject *pInst, - LONG lFlags, - IWbemContext *pCtx, - IWbemObjectSink *pResponseHandler); -void __RPC_STUB IWbemServices_PutInstanceAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemServices_DeleteInstance_Proxy( - IWbemServices* This, - const BSTR strObjectPath, - LONG lFlags, - IWbemContext *pCtx, - IWbemCallResult **ppCallResult); -void __RPC_STUB IWbemServices_DeleteInstance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemServices_DeleteInstanceAsync_Proxy( - IWbemServices* This, - const BSTR strObjectPath, - LONG lFlags, - IWbemContext *pCtx, - IWbemObjectSink *pResponseHandler); -void __RPC_STUB IWbemServices_DeleteInstanceAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemServices_CreateInstanceEnum_Proxy( - IWbemServices* This, - const BSTR strFilter, - LONG lFlags, - IWbemContext *pCtx, - IEnumWbemClassObject **ppEnum); -void __RPC_STUB IWbemServices_CreateInstanceEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemServices_CreateInstanceEnumAsync_Proxy( - IWbemServices* This, - const BSTR strFilter, - LONG lFlags, - IWbemContext *pCtx, - IWbemObjectSink *pResponseHandler); -void __RPC_STUB IWbemServices_CreateInstanceEnumAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemServices_ExecQuery_Proxy( - IWbemServices* This, - const BSTR strQueryLanguage, - const BSTR strQuery, - LONG lFlags, - IWbemContext *pCtx, - IEnumWbemClassObject **ppEnum); -void __RPC_STUB IWbemServices_ExecQuery_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemServices_ExecQueryAsync_Proxy( - IWbemServices* This, - const BSTR strQueryLanguage, - const BSTR strQuery, - LONG lFlags, - IWbemContext *pCtx, - IWbemObjectSink *pResponseHandler); -void __RPC_STUB IWbemServices_ExecQueryAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemServices_ExecNotificationQuery_Proxy( - IWbemServices* This, - const BSTR strQueryLanguage, - const BSTR strQuery, - LONG lFlags, - IWbemContext *pCtx, - IEnumWbemClassObject **ppEnum); -void __RPC_STUB IWbemServices_ExecNotificationQuery_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemServices_ExecNotificationQueryAsync_Proxy( - IWbemServices* This, - const BSTR strQueryLanguage, - const BSTR strQuery, - LONG lFlags, - IWbemContext *pCtx, - IWbemObjectSink *pResponseHandler); -void __RPC_STUB IWbemServices_ExecNotificationQueryAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemServices_ExecMethod_Proxy( - IWbemServices* This, - const BSTR strObjectPath, - const BSTR strMethodName, - LONG lFlags, - IWbemContext *pCtx, - IWbemClassObject *pInParams, - IWbemClassObject **ppOutParams, - IWbemCallResult **ppCallResult); -void __RPC_STUB IWbemServices_ExecMethod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemServices_ExecMethodAsync_Proxy( - IWbemServices* This, - const BSTR strObjectPath, - const BSTR strMethodName, - LONG lFlags, - IWbemContext *pCtx, - IWbemClassObject *pInParams, - IWbemObjectSink *pResponseHandler); -void __RPC_STUB IWbemServices_ExecMethodAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemServices_INTERFACE_DEFINED__ */ @@ -3446,25 +2791,26 @@ typedef struct IWbemShutdownVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemShutdown* This, + IWbemShutdown *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemShutdown* This); + IWbemShutdown *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemShutdown* This); + IWbemShutdown *This); /*** IWbemShutdown methods ***/ HRESULT (STDMETHODCALLTYPE *Shutdown)( - IWbemShutdown* This, + IWbemShutdown *This, LONG uReason, ULONG uMaxMilliseconds, IWbemContext *pCtx); END_INTERFACE } IWbemShutdownVtbl; + interface IWbemShutdown { CONST_VTBL IWbemShutdownVtbl* lpVtbl; }; @@ -3497,16 +2843,6 @@ static FORCEINLINE HRESULT IWbemShutdown_Shutdown(IWbemShutdown* This,LONG uReas #endif -HRESULT STDMETHODCALLTYPE IWbemShutdown_Shutdown_Proxy( - IWbemShutdown* This, - LONG uReason, - ULONG uMaxMilliseconds, - IWbemContext *pCtx); -void __RPC_STUB IWbemShutdown_Shutdown_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemShutdown_INTERFACE_DEFINED__ */ @@ -3545,19 +2881,19 @@ typedef struct IWbemObjectTextSrcVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemObjectTextSrc* This, + IWbemObjectTextSrc *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemObjectTextSrc* This); + IWbemObjectTextSrc *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemObjectTextSrc* This); + IWbemObjectTextSrc *This); /*** IWbemObjectTextSrc methods ***/ HRESULT (STDMETHODCALLTYPE *GetText)( - IWbemObjectTextSrc* This, + IWbemObjectTextSrc *This, LONG lFlags, IWbemClassObject *pObj, ULONG uObjTextFormat, @@ -3565,7 +2901,7 @@ typedef struct IWbemObjectTextSrcVtbl { BSTR *strText); HRESULT (STDMETHODCALLTYPE *CreateFromText)( - IWbemObjectTextSrc* This, + IWbemObjectTextSrc *This, LONG lFlags, BSTR strText, ULONG uObjTextFormat, @@ -3574,6 +2910,7 @@ typedef struct IWbemObjectTextSrcVtbl { END_INTERFACE } IWbemObjectTextSrcVtbl; + interface IWbemObjectTextSrc { CONST_VTBL IWbemObjectTextSrcVtbl* lpVtbl; }; @@ -3610,30 +2947,6 @@ static FORCEINLINE HRESULT IWbemObjectTextSrc_CreateFromText(IWbemObjectTextSrc* #endif -HRESULT STDMETHODCALLTYPE IWbemObjectTextSrc_GetText_Proxy( - IWbemObjectTextSrc* This, - LONG lFlags, - IWbemClassObject *pObj, - ULONG uObjTextFormat, - IWbemContext *pCtx, - BSTR *strText); -void __RPC_STUB IWbemObjectTextSrc_GetText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemObjectTextSrc_CreateFromText_Proxy( - IWbemObjectTextSrc* This, - LONG lFlags, - BSTR strText, - ULONG uObjTextFormat, - IWbemContext *pCtx, - IWbemClassObject **pNewObj); -void __RPC_STUB IWbemObjectTextSrc_CreateFromText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemObjectTextSrc_INTERFACE_DEFINED__ */ @@ -3701,23 +3014,23 @@ typedef struct IWbemObjectAccessVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemObjectAccess* This); + IWbemObjectAccess *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemObjectAccess* This); + IWbemObjectAccess *This); /*** IWbemClassObject methods ***/ HRESULT (STDMETHODCALLTYPE *GetQualifierSet)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, IWbemQualifierSet **ppQualSet); HRESULT (STDMETHODCALLTYPE *Get)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LPCWSTR wszName, LONG lFlags, VARIANT *pVal, @@ -3725,29 +3038,29 @@ typedef struct IWbemObjectAccessVtbl { LONG *plFlavor); HRESULT (STDMETHODCALLTYPE *Put)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LPCWSTR wszName, LONG lFlags, VARIANT *pVal, CIMTYPE Type); HRESULT (STDMETHODCALLTYPE *Delete)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LPCWSTR wszName); HRESULT (STDMETHODCALLTYPE *GetNames)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LPCWSTR wszQualifierName, LONG lFlags, VARIANT *pQualifierVal, SAFEARRAY **pNames); HRESULT (STDMETHODCALLTYPE *BeginEnumeration)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LONG lEnumFlags); HRESULT (STDMETHODCALLTYPE *Next)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LONG lFlags, BSTR *strName, VARIANT *pVal, @@ -3755,144 +3068,145 @@ typedef struct IWbemObjectAccessVtbl { LONG *plFlavor); HRESULT (STDMETHODCALLTYPE *EndEnumeration)( - IWbemObjectAccess* This); + IWbemObjectAccess *This); HRESULT (STDMETHODCALLTYPE *GetPropertyQualifierSet)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LPCWSTR wszProperty, IWbemQualifierSet **ppQualSet); HRESULT (STDMETHODCALLTYPE *Clone)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, IWbemClassObject **ppCopy); HRESULT (STDMETHODCALLTYPE *GetObjectText)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LONG lFlags, BSTR *pstrObjectText); HRESULT (STDMETHODCALLTYPE *SpawnDerivedClass)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LONG lFlags, IWbemClassObject **ppNewClass); HRESULT (STDMETHODCALLTYPE *SpawnInstance)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LONG lFlags, IWbemClassObject **ppNewInstance); HRESULT (STDMETHODCALLTYPE *CompareTo)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LONG lFlags, IWbemClassObject *pCompareTo); HRESULT (STDMETHODCALLTYPE *GetPropertyOrigin)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LPCWSTR wszName, BSTR *pstrClassName); HRESULT (STDMETHODCALLTYPE *InheritsFrom)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LPCWSTR strAncestor); HRESULT (STDMETHODCALLTYPE *GetMethod)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LPCWSTR wszName, LONG lFlags, IWbemClassObject **ppInSignature, IWbemClassObject **ppOutSignature); HRESULT (STDMETHODCALLTYPE *PutMethod)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LPCWSTR wszName, LONG lFlags, IWbemClassObject *pInSignature, IWbemClassObject *pOutSignature); HRESULT (STDMETHODCALLTYPE *DeleteMethod)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LPCWSTR wszName); HRESULT (STDMETHODCALLTYPE *BeginMethodEnumeration)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LONG lEnumFlags); HRESULT (STDMETHODCALLTYPE *NextMethod)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LONG lFlags, BSTR *pstrName, IWbemClassObject **ppInSignature, IWbemClassObject **ppOutSignature); HRESULT (STDMETHODCALLTYPE *EndMethodEnumeration)( - IWbemObjectAccess* This); + IWbemObjectAccess *This); HRESULT (STDMETHODCALLTYPE *GetMethodQualifierSet)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LPCWSTR wszMethod, IWbemQualifierSet **ppQualSet); HRESULT (STDMETHODCALLTYPE *GetMethodOrigin)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LPCWSTR wszMethodName, BSTR *pstrClassName); /*** IWbemObjectAccess methods ***/ HRESULT (STDMETHODCALLTYPE *GetPropertyHandle)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LPCWSTR wszPropertyName, CIMTYPE *pType, LONG *plHandle); HRESULT (STDMETHODCALLTYPE *WritePropertyValue)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LONG lHandle, LONG lNumBytes, const byte *aData); HRESULT (STDMETHODCALLTYPE *ReadPropertyValue)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LONG lHandle, LONG lBufferSize, LONG *plNumBytes, byte *aData); HRESULT (STDMETHODCALLTYPE *ReadDWORD)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LONG lHandle, DWORD *pdw); HRESULT (STDMETHODCALLTYPE *WriteDWORD)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LONG lHandle, DWORD dw); HRESULT (STDMETHODCALLTYPE *ReadQWORD)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LONG lHandle, UINT64 *pqw); HRESULT (STDMETHODCALLTYPE *WriteQWORD)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LONG lHandle, UINT64 pw); HRESULT (STDMETHODCALLTYPE *GetPropertyInfoByHandle)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LONG lHandle, BSTR *pstrName, CIMTYPE *pType); HRESULT (STDMETHODCALLTYPE *Lock)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LONG lFlags); HRESULT (STDMETHODCALLTYPE *Unlock)( - IWbemObjectAccess* This, + IWbemObjectAccess *This, LONG lFlags); END_INTERFACE } IWbemObjectAccessVtbl; + interface IWbemObjectAccess { CONST_VTBL IWbemObjectAccessVtbl* lpVtbl; }; @@ -4059,99 +3373,6 @@ static FORCEINLINE HRESULT IWbemObjectAccess_Unlock(IWbemObjectAccess* This,LONG #endif -HRESULT STDMETHODCALLTYPE IWbemObjectAccess_GetPropertyHandle_Proxy( - IWbemObjectAccess* This, - LPCWSTR wszPropertyName, - CIMTYPE *pType, - LONG *plHandle); -void __RPC_STUB IWbemObjectAccess_GetPropertyHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemObjectAccess_WritePropertyValue_Proxy( - IWbemObjectAccess* This, - LONG lHandle, - LONG lNumBytes, - const byte *aData); -void __RPC_STUB IWbemObjectAccess_WritePropertyValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemObjectAccess_ReadPropertyValue_Proxy( - IWbemObjectAccess* This, - LONG lHandle, - LONG lBufferSize, - LONG *plNumBytes, - byte *aData); -void __RPC_STUB IWbemObjectAccess_ReadPropertyValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemObjectAccess_ReadDWORD_Proxy( - IWbemObjectAccess* This, - LONG lHandle, - DWORD *pdw); -void __RPC_STUB IWbemObjectAccess_ReadDWORD_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemObjectAccess_WriteDWORD_Proxy( - IWbemObjectAccess* This, - LONG lHandle, - DWORD dw); -void __RPC_STUB IWbemObjectAccess_WriteDWORD_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemObjectAccess_ReadQWORD_Proxy( - IWbemObjectAccess* This, - LONG lHandle, - UINT64 *pqw); -void __RPC_STUB IWbemObjectAccess_ReadQWORD_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemObjectAccess_WriteQWORD_Proxy( - IWbemObjectAccess* This, - LONG lHandle, - UINT64 pw); -void __RPC_STUB IWbemObjectAccess_WriteQWORD_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemObjectAccess_GetPropertyInfoByHandle_Proxy( - IWbemObjectAccess* This, - LONG lHandle, - BSTR *pstrName, - CIMTYPE *pType); -void __RPC_STUB IWbemObjectAccess_GetPropertyInfoByHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemObjectAccess_Lock_Proxy( - IWbemObjectAccess* This, - LONG lFlags); -void __RPC_STUB IWbemObjectAccess_Lock_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemObjectAccess_Unlock_Proxy( - IWbemObjectAccess* This, - LONG lFlags); -void __RPC_STUB IWbemObjectAccess_Unlock_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemObjectAccess_INTERFACE_DEFINED__ */ @@ -4208,19 +3429,19 @@ typedef struct IMofCompilerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMofCompiler* This, + IMofCompiler *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMofCompiler* This); + IMofCompiler *This); ULONG (STDMETHODCALLTYPE *Release)( - IMofCompiler* This); + IMofCompiler *This); /*** IMofCompiler methods ***/ HRESULT (STDMETHODCALLTYPE *CompileFile)( - IMofCompiler* This, + IMofCompiler *This, LPWSTR FileName, LPWSTR ServerAndNamespace, LPWSTR User, @@ -4232,7 +3453,7 @@ typedef struct IMofCompilerVtbl { WBEM_COMPILE_STATUS_INFO *pInfo); HRESULT (STDMETHODCALLTYPE *CompileBuffer)( - IMofCompiler* This, + IMofCompiler *This, LONG BuffSize, BYTE *pBuffer, LPWSTR ServerAndNamespace, @@ -4245,7 +3466,7 @@ typedef struct IMofCompilerVtbl { WBEM_COMPILE_STATUS_INFO *pInfo); HRESULT (STDMETHODCALLTYPE *CreateBMOF)( - IMofCompiler* This, + IMofCompiler *This, LPWSTR TextFileName, LPWSTR BMOFFileName, LPWSTR ServerAndNamespace, @@ -4256,6 +3477,7 @@ typedef struct IMofCompilerVtbl { END_INTERFACE } IMofCompilerVtbl; + interface IMofCompiler { CONST_VTBL IMofCompilerVtbl* lpVtbl; }; @@ -4296,53 +3518,6 @@ static FORCEINLINE HRESULT IMofCompiler_CreateBMOF(IMofCompiler* This,LPWSTR Tex #endif -HRESULT STDMETHODCALLTYPE IMofCompiler_CompileFile_Proxy( - IMofCompiler* This, - LPWSTR FileName, - LPWSTR ServerAndNamespace, - LPWSTR User, - LPWSTR Authority, - LPWSTR Password, - LONG lOptionFlags, - LONG lClassFlags, - LONG lInstanceFlags, - WBEM_COMPILE_STATUS_INFO *pInfo); -void __RPC_STUB IMofCompiler_CompileFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMofCompiler_CompileBuffer_Proxy( - IMofCompiler* This, - LONG BuffSize, - BYTE *pBuffer, - LPWSTR ServerAndNamespace, - LPWSTR User, - LPWSTR Authority, - LPWSTR Password, - LONG lOptionFlags, - LONG lClassFlags, - LONG lInstanceFlags, - WBEM_COMPILE_STATUS_INFO *pInfo); -void __RPC_STUB IMofCompiler_CompileBuffer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMofCompiler_CreateBMOF_Proxy( - IMofCompiler* This, - LPWSTR TextFileName, - LPWSTR BMOFFileName, - LPWSTR ServerAndNamespace, - LONG lOptionFlags, - LONG lClassFlags, - LONG lInstanceFlags, - WBEM_COMPILE_STATUS_INFO *pInfo); -void __RPC_STUB IMofCompiler_CreateBMOF_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMofCompiler_INTERFACE_DEFINED__ */ @@ -4371,24 +3546,25 @@ typedef struct IUnsecuredApartmentVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IUnsecuredApartment* This, + IUnsecuredApartment *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IUnsecuredApartment* This); + IUnsecuredApartment *This); ULONG (STDMETHODCALLTYPE *Release)( - IUnsecuredApartment* This); + IUnsecuredApartment *This); /*** IUnsecuredApartment methods ***/ HRESULT (STDMETHODCALLTYPE *CreateObjectStub)( - IUnsecuredApartment* This, + IUnsecuredApartment *This, IUnknown *pObject, IUnknown **ppStub); END_INTERFACE } IUnsecuredApartmentVtbl; + interface IUnsecuredApartment { CONST_VTBL IUnsecuredApartmentVtbl* lpVtbl; }; @@ -4421,15 +3597,6 @@ static FORCEINLINE HRESULT IUnsecuredApartment_CreateObjectStub(IUnsecuredApartm #endif -HRESULT STDMETHODCALLTYPE IUnsecuredApartment_CreateObjectStub_Proxy( - IUnsecuredApartment* This, - IUnknown *pObject, - IUnknown **ppStub); -void __RPC_STUB IUnsecuredApartment_CreateObjectStub_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IUnsecuredApartment_INTERFACE_DEFINED__ */ @@ -4460,25 +3627,25 @@ typedef struct IWbemUnsecuredApartmentVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemUnsecuredApartment* This, + IWbemUnsecuredApartment *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemUnsecuredApartment* This); + IWbemUnsecuredApartment *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemUnsecuredApartment* This); + IWbemUnsecuredApartment *This); /*** IUnsecuredApartment methods ***/ HRESULT (STDMETHODCALLTYPE *CreateObjectStub)( - IWbemUnsecuredApartment* This, + IWbemUnsecuredApartment *This, IUnknown *pObject, IUnknown **ppStub); /*** IWbemUnsecuredApartment methods ***/ HRESULT (STDMETHODCALLTYPE *CreateSinkStub)( - IWbemUnsecuredApartment* This, + IWbemUnsecuredApartment *This, IWbemObjectSink *pSink, DWORD dwFlags, LPCWSTR wszReserved, @@ -4486,6 +3653,7 @@ typedef struct IWbemUnsecuredApartmentVtbl { END_INTERFACE } IWbemUnsecuredApartmentVtbl; + interface IWbemUnsecuredApartment { CONST_VTBL IWbemUnsecuredApartmentVtbl* lpVtbl; }; @@ -4524,17 +3692,6 @@ static FORCEINLINE HRESULT IWbemUnsecuredApartment_CreateSinkStub(IWbemUnsecured #endif -HRESULT STDMETHODCALLTYPE IWbemUnsecuredApartment_CreateSinkStub_Proxy( - IWbemUnsecuredApartment* This, - IWbemObjectSink *pSink, - DWORD dwFlags, - LPCWSTR wszReserved, - IWbemObjectSink **ppStub); -void __RPC_STUB IWbemUnsecuredApartment_CreateSinkStub_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemUnsecuredApartment_INTERFACE_DEFINED__ */ @@ -4571,26 +3728,26 @@ typedef struct IWbemStatusCodeTextVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemStatusCodeText* This, + IWbemStatusCodeText *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemStatusCodeText* This); + IWbemStatusCodeText *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemStatusCodeText* This); + IWbemStatusCodeText *This); /*** IWbemStatusCodeText methods ***/ HRESULT (STDMETHODCALLTYPE *GetErrorCodeText)( - IWbemStatusCodeText* This, + IWbemStatusCodeText *This, HRESULT hRes, LCID LocaleId, LONG lFlags, BSTR *MessageText); HRESULT (STDMETHODCALLTYPE *GetFacilityCodeText)( - IWbemStatusCodeText* This, + IWbemStatusCodeText *This, HRESULT hRes, LCID LocaleId, LONG lFlags, @@ -4598,6 +3755,7 @@ typedef struct IWbemStatusCodeTextVtbl { END_INTERFACE } IWbemStatusCodeTextVtbl; + interface IWbemStatusCodeText { CONST_VTBL IWbemStatusCodeTextVtbl* lpVtbl; }; @@ -4634,28 +3792,6 @@ static FORCEINLINE HRESULT IWbemStatusCodeText_GetFacilityCodeText(IWbemStatusCo #endif -HRESULT STDMETHODCALLTYPE IWbemStatusCodeText_GetErrorCodeText_Proxy( - IWbemStatusCodeText* This, - HRESULT hRes, - LCID LocaleId, - LONG lFlags, - BSTR *MessageText); -void __RPC_STUB IWbemStatusCodeText_GetErrorCodeText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemStatusCodeText_GetFacilityCodeText_Proxy( - IWbemStatusCodeText* This, - HRESULT hRes, - LCID LocaleId, - LONG lFlags, - BSTR *MessageText); -void __RPC_STUB IWbemStatusCodeText_GetFacilityCodeText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemStatusCodeText_INTERFACE_DEFINED__ */ @@ -4688,29 +3824,30 @@ typedef struct IWbemBackupRestoreVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemBackupRestore* This, + IWbemBackupRestore *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemBackupRestore* This); + IWbemBackupRestore *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemBackupRestore* This); + IWbemBackupRestore *This); /*** IWbemBackupRestore methods ***/ HRESULT (STDMETHODCALLTYPE *Backup)( - IWbemBackupRestore* This, + IWbemBackupRestore *This, LPCWSTR strBackupToFile, LONG lFlags); HRESULT (STDMETHODCALLTYPE *Restore)( - IWbemBackupRestore* This, + IWbemBackupRestore *This, LPCWSTR strRestoreFromFile, LONG lFlags); END_INTERFACE } IWbemBackupRestoreVtbl; + interface IWbemBackupRestore { CONST_VTBL IWbemBackupRestoreVtbl* lpVtbl; }; @@ -4747,24 +3884,6 @@ static FORCEINLINE HRESULT IWbemBackupRestore_Restore(IWbemBackupRestore* This,L #endif -HRESULT STDMETHODCALLTYPE IWbemBackupRestore_Backup_Proxy( - IWbemBackupRestore* This, - LPCWSTR strBackupToFile, - LONG lFlags); -void __RPC_STUB IWbemBackupRestore_Backup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemBackupRestore_Restore_Proxy( - IWbemBackupRestore* This, - LPCWSTR strRestoreFromFile, - LONG lFlags); -void __RPC_STUB IWbemBackupRestore_Restore_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemBackupRestore_INTERFACE_DEFINED__ */ @@ -4795,36 +3914,37 @@ typedef struct IWbemBackupRestoreExVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemBackupRestoreEx* This, + IWbemBackupRestoreEx *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemBackupRestoreEx* This); + IWbemBackupRestoreEx *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemBackupRestoreEx* This); + IWbemBackupRestoreEx *This); /*** IWbemBackupRestore methods ***/ HRESULT (STDMETHODCALLTYPE *Backup)( - IWbemBackupRestoreEx* This, + IWbemBackupRestoreEx *This, LPCWSTR strBackupToFile, LONG lFlags); HRESULT (STDMETHODCALLTYPE *Restore)( - IWbemBackupRestoreEx* This, + IWbemBackupRestoreEx *This, LPCWSTR strRestoreFromFile, LONG lFlags); /*** IWbemBackupRestoreEx methods ***/ HRESULT (STDMETHODCALLTYPE *Pause)( - IWbemBackupRestoreEx* This); + IWbemBackupRestoreEx *This); HRESULT (STDMETHODCALLTYPE *Resume)( - IWbemBackupRestoreEx* This); + IWbemBackupRestoreEx *This); END_INTERFACE } IWbemBackupRestoreExVtbl; + interface IWbemBackupRestoreEx { CONST_VTBL IWbemBackupRestoreExVtbl* lpVtbl; }; @@ -4871,20 +3991,6 @@ static FORCEINLINE HRESULT IWbemBackupRestoreEx_Resume(IWbemBackupRestoreEx* Thi #endif -HRESULT STDMETHODCALLTYPE IWbemBackupRestoreEx_Pause_Proxy( - IWbemBackupRestoreEx* This); -void __RPC_STUB IWbemBackupRestoreEx_Pause_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemBackupRestoreEx_Resume_Proxy( - IWbemBackupRestoreEx* This); -void __RPC_STUB IWbemBackupRestoreEx_Resume_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemBackupRestoreEx_INTERFACE_DEFINED__ */ @@ -4912,23 +4018,24 @@ typedef struct IWbemRefresherVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemRefresher* This, + IWbemRefresher *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemRefresher* This); + IWbemRefresher *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemRefresher* This); + IWbemRefresher *This); /*** IWbemRefresher methods ***/ HRESULT (STDMETHODCALLTYPE *Refresh)( - IWbemRefresher* This, + IWbemRefresher *This, LONG lFlags); END_INTERFACE } IWbemRefresherVtbl; + interface IWbemRefresher { CONST_VTBL IWbemRefresherVtbl* lpVtbl; }; @@ -4961,14 +4068,6 @@ static FORCEINLINE HRESULT IWbemRefresher_Refresh(IWbemRefresher* This,LONG lFla #endif -HRESULT STDMETHODCALLTYPE IWbemRefresher_Refresh_Proxy( - IWbemRefresher* This, - LONG lFlags); -void __RPC_STUB IWbemRefresher_Refresh_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemRefresher_INTERFACE_DEFINED__ */ @@ -5013,43 +4112,44 @@ typedef struct IWbemHiPerfEnumVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemHiPerfEnum* This, + IWbemHiPerfEnum *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemHiPerfEnum* This); + IWbemHiPerfEnum *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemHiPerfEnum* This); + IWbemHiPerfEnum *This); /*** IWbemHiPerfEnum methods ***/ HRESULT (STDMETHODCALLTYPE *AddObjects)( - IWbemHiPerfEnum* This, + IWbemHiPerfEnum *This, LONG lFlags, ULONG uNumObjects, LONG *apIds, IWbemObjectAccess **apObj); HRESULT (STDMETHODCALLTYPE *RemoveObjects)( - IWbemHiPerfEnum* This, + IWbemHiPerfEnum *This, LONG lFlags, ULONG uNumObjects, LONG *apIds); HRESULT (STDMETHODCALLTYPE *GetObjects)( - IWbemHiPerfEnum* This, + IWbemHiPerfEnum *This, LONG lFlags, ULONG uNumObjects, IWbemObjectAccess **apObj, ULONG *puReturned); HRESULT (STDMETHODCALLTYPE *RemoveAll)( - IWbemHiPerfEnum* This, + IWbemHiPerfEnum *This, LONG lFlags); END_INTERFACE } IWbemHiPerfEnumVtbl; + interface IWbemHiPerfEnum { CONST_VTBL IWbemHiPerfEnumVtbl* lpVtbl; }; @@ -5094,46 +4194,6 @@ static FORCEINLINE HRESULT IWbemHiPerfEnum_RemoveAll(IWbemHiPerfEnum* This,LONG #endif -HRESULT STDMETHODCALLTYPE IWbemHiPerfEnum_AddObjects_Proxy( - IWbemHiPerfEnum* This, - LONG lFlags, - ULONG uNumObjects, - LONG *apIds, - IWbemObjectAccess **apObj); -void __RPC_STUB IWbemHiPerfEnum_AddObjects_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemHiPerfEnum_RemoveObjects_Proxy( - IWbemHiPerfEnum* This, - LONG lFlags, - ULONG uNumObjects, - LONG *apIds); -void __RPC_STUB IWbemHiPerfEnum_RemoveObjects_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemHiPerfEnum_GetObjects_Proxy( - IWbemHiPerfEnum* This, - LONG lFlags, - ULONG uNumObjects, - IWbemObjectAccess **apObj, - ULONG *puReturned); -void __RPC_STUB IWbemHiPerfEnum_GetObjects_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemHiPerfEnum_RemoveAll_Proxy( - IWbemHiPerfEnum* This, - LONG lFlags); -void __RPC_STUB IWbemHiPerfEnum_RemoveAll_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemHiPerfEnum_INTERFACE_DEFINED__ */ @@ -5191,19 +4251,19 @@ typedef struct IWbemConfigureRefresherVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemConfigureRefresher* This, + IWbemConfigureRefresher *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemConfigureRefresher* This); + IWbemConfigureRefresher *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemConfigureRefresher* This); + IWbemConfigureRefresher *This); /*** IWbemConfigureRefresher methods ***/ HRESULT (STDMETHODCALLTYPE *AddObjectByPath)( - IWbemConfigureRefresher* This, + IWbemConfigureRefresher *This, IWbemServices *pNamespace, LPCWSTR wszPath, LONG lFlags, @@ -5212,7 +4272,7 @@ typedef struct IWbemConfigureRefresherVtbl { LONG *plId); HRESULT (STDMETHODCALLTYPE *AddObjectByTemplate)( - IWbemConfigureRefresher* This, + IWbemConfigureRefresher *This, IWbemServices *pNamespace, IWbemClassObject *pTemplate, LONG lFlags, @@ -5221,18 +4281,18 @@ typedef struct IWbemConfigureRefresherVtbl { LONG *plId); HRESULT (STDMETHODCALLTYPE *AddRefresher)( - IWbemConfigureRefresher* This, + IWbemConfigureRefresher *This, IWbemRefresher *pRefresher, LONG lFlags, LONG *plId); HRESULT (STDMETHODCALLTYPE *Remove)( - IWbemConfigureRefresher* This, + IWbemConfigureRefresher *This, LONG lId, LONG lFlags); HRESULT (STDMETHODCALLTYPE *AddEnum)( - IWbemConfigureRefresher* This, + IWbemConfigureRefresher *This, IWbemServices *pNamespace, LPCWSTR wszClassName, LONG lFlags, @@ -5242,6 +4302,7 @@ typedef struct IWbemConfigureRefresherVtbl { END_INTERFACE } IWbemConfigureRefresherVtbl; + interface IWbemConfigureRefresher { CONST_VTBL IWbemConfigureRefresherVtbl* lpVtbl; }; @@ -5290,64 +4351,6 @@ static FORCEINLINE HRESULT IWbemConfigureRefresher_AddEnum(IWbemConfigureRefresh #endif -HRESULT STDMETHODCALLTYPE IWbemConfigureRefresher_AddObjectByPath_Proxy( - IWbemConfigureRefresher* This, - IWbemServices *pNamespace, - LPCWSTR wszPath, - LONG lFlags, - IWbemContext *pContext, - IWbemClassObject **ppRefreshable, - LONG *plId); -void __RPC_STUB IWbemConfigureRefresher_AddObjectByPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemConfigureRefresher_AddObjectByTemplate_Proxy( - IWbemConfigureRefresher* This, - IWbemServices *pNamespace, - IWbemClassObject *pTemplate, - LONG lFlags, - IWbemContext *pContext, - IWbemClassObject **ppRefreshable, - LONG *plId); -void __RPC_STUB IWbemConfigureRefresher_AddObjectByTemplate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemConfigureRefresher_AddRefresher_Proxy( - IWbemConfigureRefresher* This, - IWbemRefresher *pRefresher, - LONG lFlags, - LONG *plId); -void __RPC_STUB IWbemConfigureRefresher_AddRefresher_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemConfigureRefresher_Remove_Proxy( - IWbemConfigureRefresher* This, - LONG lId, - LONG lFlags); -void __RPC_STUB IWbemConfigureRefresher_Remove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemConfigureRefresher_AddEnum_Proxy( - IWbemConfigureRefresher* This, - IWbemServices *pNamespace, - LPCWSTR wszClassName, - LONG lFlags, - IWbemContext *pContext, - IWbemHiPerfEnum **ppEnum, - LONG *plId); -void __RPC_STUB IWbemConfigureRefresher_AddEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemConfigureRefresher_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/wbemdisp.h b/lib/libc/include/any-windows-any/wbemdisp.h index b8924671da..99cb4ef1f3 100644 --- a/lib/libc/include/any-windows-any/wbemdisp.h +++ b/lib/libc/include/any-windows-any/wbemdisp.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/wbemdisp.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/wbemdisp.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -236,126 +237,201 @@ typedef struct SWbemRefreshableItem SWbemRefreshableItem; #ifndef __ISWbemLocator_FWD_DEFINED__ #define __ISWbemLocator_FWD_DEFINED__ typedef interface ISWbemLocator ISWbemLocator; +#ifdef __cplusplus +interface ISWbemLocator; +#endif /* __cplusplus */ #endif #ifndef __ISWbemServices_FWD_DEFINED__ #define __ISWbemServices_FWD_DEFINED__ typedef interface ISWbemServices ISWbemServices; +#ifdef __cplusplus +interface ISWbemServices; +#endif /* __cplusplus */ #endif #ifndef __ISWbemServicesEx_FWD_DEFINED__ #define __ISWbemServicesEx_FWD_DEFINED__ typedef interface ISWbemServicesEx ISWbemServicesEx; +#ifdef __cplusplus +interface ISWbemServicesEx; +#endif /* __cplusplus */ #endif #ifndef __ISWbemObject_FWD_DEFINED__ #define __ISWbemObject_FWD_DEFINED__ typedef interface ISWbemObject ISWbemObject; +#ifdef __cplusplus +interface ISWbemObject; +#endif /* __cplusplus */ #endif #ifndef __ISWbemObjectEx_FWD_DEFINED__ #define __ISWbemObjectEx_FWD_DEFINED__ typedef interface ISWbemObjectEx ISWbemObjectEx; +#ifdef __cplusplus +interface ISWbemObjectEx; +#endif /* __cplusplus */ #endif #ifndef __ISWbemLastError_FWD_DEFINED__ #define __ISWbemLastError_FWD_DEFINED__ typedef interface ISWbemLastError ISWbemLastError; +#ifdef __cplusplus +interface ISWbemLastError; +#endif /* __cplusplus */ #endif #ifndef __ISWbemObjectSet_FWD_DEFINED__ #define __ISWbemObjectSet_FWD_DEFINED__ typedef interface ISWbemObjectSet ISWbemObjectSet; +#ifdef __cplusplus +interface ISWbemObjectSet; +#endif /* __cplusplus */ #endif #ifndef __ISWbemNamedValueSet_FWD_DEFINED__ #define __ISWbemNamedValueSet_FWD_DEFINED__ typedef interface ISWbemNamedValueSet ISWbemNamedValueSet; +#ifdef __cplusplus +interface ISWbemNamedValueSet; +#endif /* __cplusplus */ #endif #ifndef __ISWbemNamedValue_FWD_DEFINED__ #define __ISWbemNamedValue_FWD_DEFINED__ typedef interface ISWbemNamedValue ISWbemNamedValue; +#ifdef __cplusplus +interface ISWbemNamedValue; +#endif /* __cplusplus */ #endif #ifndef __ISWbemObjectPath_FWD_DEFINED__ #define __ISWbemObjectPath_FWD_DEFINED__ typedef interface ISWbemObjectPath ISWbemObjectPath; +#ifdef __cplusplus +interface ISWbemObjectPath; +#endif /* __cplusplus */ #endif #ifndef __ISWbemProperty_FWD_DEFINED__ #define __ISWbemProperty_FWD_DEFINED__ typedef interface ISWbemProperty ISWbemProperty; +#ifdef __cplusplus +interface ISWbemProperty; +#endif /* __cplusplus */ #endif #ifndef __ISWbemPropertySet_FWD_DEFINED__ #define __ISWbemPropertySet_FWD_DEFINED__ typedef interface ISWbemPropertySet ISWbemPropertySet; +#ifdef __cplusplus +interface ISWbemPropertySet; +#endif /* __cplusplus */ #endif #ifndef __ISWbemQualifier_FWD_DEFINED__ #define __ISWbemQualifier_FWD_DEFINED__ typedef interface ISWbemQualifier ISWbemQualifier; +#ifdef __cplusplus +interface ISWbemQualifier; +#endif /* __cplusplus */ #endif #ifndef __ISWbemQualifierSet_FWD_DEFINED__ #define __ISWbemQualifierSet_FWD_DEFINED__ typedef interface ISWbemQualifierSet ISWbemQualifierSet; +#ifdef __cplusplus +interface ISWbemQualifierSet; +#endif /* __cplusplus */ #endif #ifndef __ISWbemMethod_FWD_DEFINED__ #define __ISWbemMethod_FWD_DEFINED__ typedef interface ISWbemMethod ISWbemMethod; +#ifdef __cplusplus +interface ISWbemMethod; +#endif /* __cplusplus */ #endif #ifndef __ISWbemMethodSet_FWD_DEFINED__ #define __ISWbemMethodSet_FWD_DEFINED__ typedef interface ISWbemMethodSet ISWbemMethodSet; +#ifdef __cplusplus +interface ISWbemMethodSet; +#endif /* __cplusplus */ #endif #ifndef __ISWbemSink_FWD_DEFINED__ #define __ISWbemSink_FWD_DEFINED__ typedef interface ISWbemSink ISWbemSink; +#ifdef __cplusplus +interface ISWbemSink; +#endif /* __cplusplus */ #endif #ifndef __ISWbemSinkEvents_FWD_DEFINED__ #define __ISWbemSinkEvents_FWD_DEFINED__ typedef interface ISWbemSinkEvents ISWbemSinkEvents; +#ifdef __cplusplus +interface ISWbemSinkEvents; +#endif /* __cplusplus */ #endif #ifndef __ISWbemEventSource_FWD_DEFINED__ #define __ISWbemEventSource_FWD_DEFINED__ typedef interface ISWbemEventSource ISWbemEventSource; +#ifdef __cplusplus +interface ISWbemEventSource; +#endif /* __cplusplus */ #endif #ifndef __ISWbemSecurity_FWD_DEFINED__ #define __ISWbemSecurity_FWD_DEFINED__ typedef interface ISWbemSecurity ISWbemSecurity; +#ifdef __cplusplus +interface ISWbemSecurity; +#endif /* __cplusplus */ #endif #ifndef __ISWbemPrivilege_FWD_DEFINED__ #define __ISWbemPrivilege_FWD_DEFINED__ typedef interface ISWbemPrivilege ISWbemPrivilege; +#ifdef __cplusplus +interface ISWbemPrivilege; +#endif /* __cplusplus */ #endif #ifndef __ISWbemPrivilegeSet_FWD_DEFINED__ #define __ISWbemPrivilegeSet_FWD_DEFINED__ typedef interface ISWbemPrivilegeSet ISWbemPrivilegeSet; +#ifdef __cplusplus +interface ISWbemPrivilegeSet; +#endif /* __cplusplus */ #endif #ifndef __ISWbemDateTime_FWD_DEFINED__ #define __ISWbemDateTime_FWD_DEFINED__ typedef interface ISWbemDateTime ISWbemDateTime; +#ifdef __cplusplus +interface ISWbemDateTime; +#endif /* __cplusplus */ #endif #ifndef __ISWbemRefreshableItem_FWD_DEFINED__ #define __ISWbemRefreshableItem_FWD_DEFINED__ typedef interface ISWbemRefreshableItem ISWbemRefreshableItem; +#ifdef __cplusplus +interface ISWbemRefreshableItem; +#endif /* __cplusplus */ #endif #ifndef __ISWbemRefresher_FWD_DEFINED__ #define __ISWbemRefresher_FWD_DEFINED__ typedef interface ISWbemRefresher ISWbemRefresher; +#ifdef __cplusplus +interface ISWbemRefresher; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -380,126 +456,201 @@ DEFINE_GUID(LIBID_WbemScripting, 0x565783c6, 0xcb41, 0x11d1, 0x8b,0x02, 0x00,0x6 #ifndef __ISWbemDateTime_FWD_DEFINED__ #define __ISWbemDateTime_FWD_DEFINED__ typedef interface ISWbemDateTime ISWbemDateTime; +#ifdef __cplusplus +interface ISWbemDateTime; +#endif /* __cplusplus */ #endif #ifndef __ISWbemEventSource_FWD_DEFINED__ #define __ISWbemEventSource_FWD_DEFINED__ typedef interface ISWbemEventSource ISWbemEventSource; +#ifdef __cplusplus +interface ISWbemEventSource; +#endif /* __cplusplus */ #endif #ifndef __ISWbemLastError_FWD_DEFINED__ #define __ISWbemLastError_FWD_DEFINED__ typedef interface ISWbemLastError ISWbemLastError; +#ifdef __cplusplus +interface ISWbemLastError; +#endif /* __cplusplus */ #endif #ifndef __ISWbemLocator_FWD_DEFINED__ #define __ISWbemLocator_FWD_DEFINED__ typedef interface ISWbemLocator ISWbemLocator; +#ifdef __cplusplus +interface ISWbemLocator; +#endif /* __cplusplus */ #endif #ifndef __ISWbemMethod_FWD_DEFINED__ #define __ISWbemMethod_FWD_DEFINED__ typedef interface ISWbemMethod ISWbemMethod; +#ifdef __cplusplus +interface ISWbemMethod; +#endif /* __cplusplus */ #endif #ifndef __ISWbemMethodSet_FWD_DEFINED__ #define __ISWbemMethodSet_FWD_DEFINED__ typedef interface ISWbemMethodSet ISWbemMethodSet; +#ifdef __cplusplus +interface ISWbemMethodSet; +#endif /* __cplusplus */ #endif #ifndef __ISWbemNamedValue_FWD_DEFINED__ #define __ISWbemNamedValue_FWD_DEFINED__ typedef interface ISWbemNamedValue ISWbemNamedValue; +#ifdef __cplusplus +interface ISWbemNamedValue; +#endif /* __cplusplus */ #endif #ifndef __ISWbemNamedValueSet_FWD_DEFINED__ #define __ISWbemNamedValueSet_FWD_DEFINED__ typedef interface ISWbemNamedValueSet ISWbemNamedValueSet; +#ifdef __cplusplus +interface ISWbemNamedValueSet; +#endif /* __cplusplus */ #endif #ifndef __ISWbemObject_FWD_DEFINED__ #define __ISWbemObject_FWD_DEFINED__ typedef interface ISWbemObject ISWbemObject; +#ifdef __cplusplus +interface ISWbemObject; +#endif /* __cplusplus */ #endif #ifndef __ISWbemObjectEx_FWD_DEFINED__ #define __ISWbemObjectEx_FWD_DEFINED__ typedef interface ISWbemObjectEx ISWbemObjectEx; +#ifdef __cplusplus +interface ISWbemObjectEx; +#endif /* __cplusplus */ #endif #ifndef __ISWbemObjectPath_FWD_DEFINED__ #define __ISWbemObjectPath_FWD_DEFINED__ typedef interface ISWbemObjectPath ISWbemObjectPath; +#ifdef __cplusplus +interface ISWbemObjectPath; +#endif /* __cplusplus */ #endif #ifndef __ISWbemObjectSet_FWD_DEFINED__ #define __ISWbemObjectSet_FWD_DEFINED__ typedef interface ISWbemObjectSet ISWbemObjectSet; +#ifdef __cplusplus +interface ISWbemObjectSet; +#endif /* __cplusplus */ #endif #ifndef __ISWbemQualifier_FWD_DEFINED__ #define __ISWbemQualifier_FWD_DEFINED__ typedef interface ISWbemQualifier ISWbemQualifier; +#ifdef __cplusplus +interface ISWbemQualifier; +#endif /* __cplusplus */ #endif #ifndef __ISWbemQualifierSet_FWD_DEFINED__ #define __ISWbemQualifierSet_FWD_DEFINED__ typedef interface ISWbemQualifierSet ISWbemQualifierSet; +#ifdef __cplusplus +interface ISWbemQualifierSet; +#endif /* __cplusplus */ #endif #ifndef __ISWbemPrivilege_FWD_DEFINED__ #define __ISWbemPrivilege_FWD_DEFINED__ typedef interface ISWbemPrivilege ISWbemPrivilege; +#ifdef __cplusplus +interface ISWbemPrivilege; +#endif /* __cplusplus */ #endif #ifndef __ISWbemPrivilegeSet_FWD_DEFINED__ #define __ISWbemPrivilegeSet_FWD_DEFINED__ typedef interface ISWbemPrivilegeSet ISWbemPrivilegeSet; +#ifdef __cplusplus +interface ISWbemPrivilegeSet; +#endif /* __cplusplus */ #endif #ifndef __ISWbemProperty_FWD_DEFINED__ #define __ISWbemProperty_FWD_DEFINED__ typedef interface ISWbemProperty ISWbemProperty; +#ifdef __cplusplus +interface ISWbemProperty; +#endif /* __cplusplus */ #endif #ifndef __ISWbemPropertySet_FWD_DEFINED__ #define __ISWbemPropertySet_FWD_DEFINED__ typedef interface ISWbemPropertySet ISWbemPropertySet; +#ifdef __cplusplus +interface ISWbemPropertySet; +#endif /* __cplusplus */ #endif #ifndef __ISWbemRefresher_FWD_DEFINED__ #define __ISWbemRefresher_FWD_DEFINED__ typedef interface ISWbemRefresher ISWbemRefresher; +#ifdef __cplusplus +interface ISWbemRefresher; +#endif /* __cplusplus */ #endif #ifndef __ISWbemRefreshableItem_FWD_DEFINED__ #define __ISWbemRefreshableItem_FWD_DEFINED__ typedef interface ISWbemRefreshableItem ISWbemRefreshableItem; +#ifdef __cplusplus +interface ISWbemRefreshableItem; +#endif /* __cplusplus */ #endif #ifndef __ISWbemSecurity_FWD_DEFINED__ #define __ISWbemSecurity_FWD_DEFINED__ typedef interface ISWbemSecurity ISWbemSecurity; +#ifdef __cplusplus +interface ISWbemSecurity; +#endif /* __cplusplus */ #endif #ifndef __ISWbemServices_FWD_DEFINED__ #define __ISWbemServices_FWD_DEFINED__ typedef interface ISWbemServices ISWbemServices; +#ifdef __cplusplus +interface ISWbemServices; +#endif /* __cplusplus */ #endif #ifndef __ISWbemServicesEx_FWD_DEFINED__ #define __ISWbemServicesEx_FWD_DEFINED__ typedef interface ISWbemServicesEx ISWbemServicesEx; +#ifdef __cplusplus +interface ISWbemServicesEx; +#endif /* __cplusplus */ #endif #ifndef __ISWbemSink_FWD_DEFINED__ #define __ISWbemSink_FWD_DEFINED__ typedef interface ISWbemSink ISWbemSink; +#ifdef __cplusplus +interface ISWbemSink; +#endif /* __cplusplus */ #endif #ifndef __ISWbemSinkEvents_FWD_DEFINED__ #define __ISWbemSinkEvents_FWD_DEFINED__ typedef interface ISWbemSinkEvents ISWbemSinkEvents; +#ifdef __cplusplus +interface ISWbemSinkEvents; +#endif /* __cplusplus */ #endif typedef enum WbemChangeFlagEnum { @@ -1107,29 +1258,29 @@ typedef struct ISWbemLocatorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemLocator* This, + ISWbemLocator *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemLocator* This); + ISWbemLocator *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemLocator* This); + ISWbemLocator *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemLocator* This, + ISWbemLocator *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemLocator* This, + ISWbemLocator *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemLocator* This, + ISWbemLocator *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1137,7 +1288,7 @@ typedef struct ISWbemLocatorVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemLocator* This, + ISWbemLocator *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1149,7 +1300,7 @@ typedef struct ISWbemLocatorVtbl { /*** ISWbemLocator methods ***/ HRESULT (STDMETHODCALLTYPE *ConnectServer)( - ISWbemLocator* This, + ISWbemLocator *This, BSTR strServer, BSTR strNamespace, BSTR strUser, @@ -1161,11 +1312,12 @@ typedef struct ISWbemLocatorVtbl { ISWbemServices **objWbemServices); HRESULT (STDMETHODCALLTYPE *get_Security_)( - ISWbemLocator* This, + ISWbemLocator *This, ISWbemSecurity **objWbemSecurity); END_INTERFACE } ISWbemLocatorVtbl; + interface ISWbemLocator { CONST_VTBL ISWbemLocatorVtbl* lpVtbl; }; @@ -1220,30 +1372,6 @@ static FORCEINLINE HRESULT ISWbemLocator_get_Security_(ISWbemLocator* This,ISWbe #endif -HRESULT STDMETHODCALLTYPE ISWbemLocator_ConnectServer_Proxy( - ISWbemLocator* This, - BSTR strServer, - BSTR strNamespace, - BSTR strUser, - BSTR strPassword, - BSTR strLocale, - BSTR strAuthority, - LONG iSecurityFlags, - IDispatch *objWbemNamedValueSet, - ISWbemServices **objWbemServices); -void __RPC_STUB ISWbemLocator_ConnectServer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemLocator_get_Security__Proxy( - ISWbemLocator* This, - ISWbemSecurity **objWbemSecurity); -void __RPC_STUB ISWbemLocator_get_Security__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISWbemLocator_INTERFACE_DEFINED__ */ @@ -1421,29 +1549,29 @@ typedef struct ISWbemServicesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemServices* This, + ISWbemServices *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemServices* This); + ISWbemServices *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemServices* This); + ISWbemServices *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemServices* This, + ISWbemServices *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemServices* This, + ISWbemServices *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemServices* This, + ISWbemServices *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1451,7 +1579,7 @@ typedef struct ISWbemServicesVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemServices* This, + ISWbemServices *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1463,14 +1591,14 @@ typedef struct ISWbemServicesVtbl { /*** ISWbemServices methods ***/ HRESULT (STDMETHODCALLTYPE *Get)( - ISWbemServices* This, + ISWbemServices *This, BSTR strObjectPath, LONG iFlags, IDispatch *objWbemNamedValueSet, ISWbemObject **objWbemObject); HRESULT (STDMETHODCALLTYPE *GetAsync)( - ISWbemServices* This, + ISWbemServices *This, IDispatch *objWbemSink, BSTR strObjectPath, LONG iFlags, @@ -1478,13 +1606,13 @@ typedef struct ISWbemServicesVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *Delete)( - ISWbemServices* This, + ISWbemServices *This, BSTR strObjectPath, LONG iFlags, IDispatch *objWbemNamedValueSet); HRESULT (STDMETHODCALLTYPE *DeleteAsync)( - ISWbemServices* This, + ISWbemServices *This, IDispatch *objWbemSink, BSTR strObjectPath, LONG iFlags, @@ -1492,14 +1620,14 @@ typedef struct ISWbemServicesVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *InstancesOf)( - ISWbemServices* This, + ISWbemServices *This, BSTR strClass, LONG iFlags, IDispatch *objWbemNamedValueSet, ISWbemObjectSet **objWbemObjectSet); HRESULT (STDMETHODCALLTYPE *InstancesOfAsync)( - ISWbemServices* This, + ISWbemServices *This, IDispatch *objWbemSink, BSTR strClass, LONG iFlags, @@ -1507,14 +1635,14 @@ typedef struct ISWbemServicesVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *SubclassesOf)( - ISWbemServices* This, + ISWbemServices *This, BSTR strSuperclass, LONG iFlags, IDispatch *objWbemNamedValueSet, ISWbemObjectSet **objWbemObjectSet); HRESULT (STDMETHODCALLTYPE *SubclassesOfAsync)( - ISWbemServices* This, + ISWbemServices *This, IDispatch *objWbemSink, BSTR strSuperclass, LONG iFlags, @@ -1522,7 +1650,7 @@ typedef struct ISWbemServicesVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *ExecQuery)( - ISWbemServices* This, + ISWbemServices *This, BSTR strQuery, BSTR strQueryLanguage, LONG iFlags, @@ -1530,7 +1658,7 @@ typedef struct ISWbemServicesVtbl { ISWbemObjectSet **objWbemObjectSet); HRESULT (STDMETHODCALLTYPE *ExecQueryAsync)( - ISWbemServices* This, + ISWbemServices *This, IDispatch *objWbemSink, BSTR strQuery, BSTR strQueryLanguage, @@ -1539,7 +1667,7 @@ typedef struct ISWbemServicesVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *AssociatorsOf)( - ISWbemServices* This, + ISWbemServices *This, BSTR strObjectPath, BSTR strAssocClass, BSTR strResultClass, @@ -1554,7 +1682,7 @@ typedef struct ISWbemServicesVtbl { ISWbemObjectSet **objWbemObjectSet); HRESULT (STDMETHODCALLTYPE *AssociatorsOfAsync)( - ISWbemServices* This, + ISWbemServices *This, IDispatch *objWbemSink, BSTR strObjectPath, BSTR strAssocClass, @@ -1570,7 +1698,7 @@ typedef struct ISWbemServicesVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *ReferencesTo)( - ISWbemServices* This, + ISWbemServices *This, BSTR strObjectPath, BSTR strResultClass, BSTR strRole, @@ -1582,7 +1710,7 @@ typedef struct ISWbemServicesVtbl { ISWbemObjectSet **objWbemObjectSet); HRESULT (STDMETHODCALLTYPE *ReferencesToAsync)( - ISWbemServices* This, + ISWbemServices *This, IDispatch *objWbemSink, BSTR strObjectPath, BSTR strResultClass, @@ -1595,7 +1723,7 @@ typedef struct ISWbemServicesVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *ExecNotificationQuery)( - ISWbemServices* This, + ISWbemServices *This, BSTR strQuery, BSTR strQueryLanguage, LONG iFlags, @@ -1603,7 +1731,7 @@ typedef struct ISWbemServicesVtbl { ISWbemEventSource **objWbemEventSource); HRESULT (STDMETHODCALLTYPE *ExecNotificationQueryAsync)( - ISWbemServices* This, + ISWbemServices *This, IDispatch *objWbemSink, BSTR strQuery, BSTR strQueryLanguage, @@ -1612,7 +1740,7 @@ typedef struct ISWbemServicesVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *ExecMethod)( - ISWbemServices* This, + ISWbemServices *This, BSTR strObjectPath, BSTR strMethodName, IDispatch *objWbemInParameters, @@ -1621,7 +1749,7 @@ typedef struct ISWbemServicesVtbl { ISWbemObject **objWbemOutParameters); HRESULT (STDMETHODCALLTYPE *ExecMethodAsync)( - ISWbemServices* This, + ISWbemServices *This, IDispatch *objWbemSink, BSTR strObjectPath, BSTR strMethodName, @@ -1631,11 +1759,12 @@ typedef struct ISWbemServicesVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *get_Security_)( - ISWbemServices* This, + ISWbemServices *This, ISWbemSecurity **objWbemSecurity); END_INTERFACE } ISWbemServicesVtbl; + interface ISWbemServices { CONST_VTBL ISWbemServicesVtbl* lpVtbl; }; @@ -1758,254 +1887,6 @@ static FORCEINLINE HRESULT ISWbemServices_get_Security_(ISWbemServices* This,ISW #endif -HRESULT STDMETHODCALLTYPE ISWbemServices_Get_Proxy( - ISWbemServices* This, - BSTR strObjectPath, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - ISWbemObject **objWbemObject); -void __RPC_STUB ISWbemServices_Get_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemServices_GetAsync_Proxy( - ISWbemServices* This, - IDispatch *objWbemSink, - BSTR strObjectPath, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - IDispatch *objWbemAsyncContext); -void __RPC_STUB ISWbemServices_GetAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemServices_Delete_Proxy( - ISWbemServices* This, - BSTR strObjectPath, - LONG iFlags, - IDispatch *objWbemNamedValueSet); -void __RPC_STUB ISWbemServices_Delete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemServices_DeleteAsync_Proxy( - ISWbemServices* This, - IDispatch *objWbemSink, - BSTR strObjectPath, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - IDispatch *objWbemAsyncContext); -void __RPC_STUB ISWbemServices_DeleteAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemServices_InstancesOf_Proxy( - ISWbemServices* This, - BSTR strClass, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - ISWbemObjectSet **objWbemObjectSet); -void __RPC_STUB ISWbemServices_InstancesOf_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemServices_InstancesOfAsync_Proxy( - ISWbemServices* This, - IDispatch *objWbemSink, - BSTR strClass, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - IDispatch *objWbemAsyncContext); -void __RPC_STUB ISWbemServices_InstancesOfAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemServices_SubclassesOf_Proxy( - ISWbemServices* This, - BSTR strSuperclass, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - ISWbemObjectSet **objWbemObjectSet); -void __RPC_STUB ISWbemServices_SubclassesOf_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemServices_SubclassesOfAsync_Proxy( - ISWbemServices* This, - IDispatch *objWbemSink, - BSTR strSuperclass, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - IDispatch *objWbemAsyncContext); -void __RPC_STUB ISWbemServices_SubclassesOfAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemServices_ExecQuery_Proxy( - ISWbemServices* This, - BSTR strQuery, - BSTR strQueryLanguage, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - ISWbemObjectSet **objWbemObjectSet); -void __RPC_STUB ISWbemServices_ExecQuery_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemServices_ExecQueryAsync_Proxy( - ISWbemServices* This, - IDispatch *objWbemSink, - BSTR strQuery, - BSTR strQueryLanguage, - LONG lFlags, - IDispatch *objWbemNamedValueSet, - IDispatch *objWbemAsyncContext); -void __RPC_STUB ISWbemServices_ExecQueryAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemServices_AssociatorsOf_Proxy( - ISWbemServices* This, - BSTR strObjectPath, - BSTR strAssocClass, - BSTR strResultClass, - BSTR strResultRole, - BSTR strRole, - VARIANT_BOOL bClassesOnly, - VARIANT_BOOL bSchemaOnly, - BSTR strRequiredAssocQualifier, - BSTR strRequiredQualifier, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - ISWbemObjectSet **objWbemObjectSet); -void __RPC_STUB ISWbemServices_AssociatorsOf_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemServices_AssociatorsOfAsync_Proxy( - ISWbemServices* This, - IDispatch *objWbemSink, - BSTR strObjectPath, - BSTR strAssocClass, - BSTR strResultClass, - BSTR strResultRole, - BSTR strRole, - VARIANT_BOOL bClassesOnly, - VARIANT_BOOL bSchemaOnly, - BSTR strRequiredAssocQualifier, - BSTR strRequiredQualifier, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - IDispatch *objWbemAsyncContext); -void __RPC_STUB ISWbemServices_AssociatorsOfAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemServices_ReferencesTo_Proxy( - ISWbemServices* This, - BSTR strObjectPath, - BSTR strResultClass, - BSTR strRole, - VARIANT_BOOL bClassesOnly, - VARIANT_BOOL bSchemaOnly, - BSTR strRequiredQualifier, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - ISWbemObjectSet **objWbemObjectSet); -void __RPC_STUB ISWbemServices_ReferencesTo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemServices_ReferencesToAsync_Proxy( - ISWbemServices* This, - IDispatch *objWbemSink, - BSTR strObjectPath, - BSTR strResultClass, - BSTR strRole, - VARIANT_BOOL bClassesOnly, - VARIANT_BOOL bSchemaOnly, - BSTR strRequiredQualifier, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - IDispatch *objWbemAsyncContext); -void __RPC_STUB ISWbemServices_ReferencesToAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemServices_ExecNotificationQuery_Proxy( - ISWbemServices* This, - BSTR strQuery, - BSTR strQueryLanguage, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - ISWbemEventSource **objWbemEventSource); -void __RPC_STUB ISWbemServices_ExecNotificationQuery_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemServices_ExecNotificationQueryAsync_Proxy( - ISWbemServices* This, - IDispatch *objWbemSink, - BSTR strQuery, - BSTR strQueryLanguage, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - IDispatch *objWbemAsyncContext); -void __RPC_STUB ISWbemServices_ExecNotificationQueryAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemServices_ExecMethod_Proxy( - ISWbemServices* This, - BSTR strObjectPath, - BSTR strMethodName, - IDispatch *objWbemInParameters, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - ISWbemObject **objWbemOutParameters); -void __RPC_STUB ISWbemServices_ExecMethod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemServices_ExecMethodAsync_Proxy( - ISWbemServices* This, - IDispatch *objWbemSink, - BSTR strObjectPath, - BSTR strMethodName, - IDispatch *objWbemInParameters, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - IDispatch *objWbemAsyncContext); -void __RPC_STUB ISWbemServices_ExecMethodAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemServices_get_Security__Proxy( - ISWbemServices* This, - ISWbemSecurity **objWbemSecurity); -void __RPC_STUB ISWbemServices_get_Security__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISWbemServices_INTERFACE_DEFINED__ */ @@ -2043,29 +1924,29 @@ typedef struct ISWbemServicesExVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemServicesEx* This); + ISWbemServicesEx *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemServicesEx* This); + ISWbemServicesEx *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2073,7 +1954,7 @@ typedef struct ISWbemServicesExVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2085,14 +1966,14 @@ typedef struct ISWbemServicesExVtbl { /*** ISWbemServices methods ***/ HRESULT (STDMETHODCALLTYPE *Get)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, BSTR strObjectPath, LONG iFlags, IDispatch *objWbemNamedValueSet, ISWbemObject **objWbemObject); HRESULT (STDMETHODCALLTYPE *GetAsync)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, IDispatch *objWbemSink, BSTR strObjectPath, LONG iFlags, @@ -2100,13 +1981,13 @@ typedef struct ISWbemServicesExVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *Delete)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, BSTR strObjectPath, LONG iFlags, IDispatch *objWbemNamedValueSet); HRESULT (STDMETHODCALLTYPE *DeleteAsync)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, IDispatch *objWbemSink, BSTR strObjectPath, LONG iFlags, @@ -2114,14 +1995,14 @@ typedef struct ISWbemServicesExVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *InstancesOf)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, BSTR strClass, LONG iFlags, IDispatch *objWbemNamedValueSet, ISWbemObjectSet **objWbemObjectSet); HRESULT (STDMETHODCALLTYPE *InstancesOfAsync)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, IDispatch *objWbemSink, BSTR strClass, LONG iFlags, @@ -2129,14 +2010,14 @@ typedef struct ISWbemServicesExVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *SubclassesOf)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, BSTR strSuperclass, LONG iFlags, IDispatch *objWbemNamedValueSet, ISWbemObjectSet **objWbemObjectSet); HRESULT (STDMETHODCALLTYPE *SubclassesOfAsync)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, IDispatch *objWbemSink, BSTR strSuperclass, LONG iFlags, @@ -2144,7 +2025,7 @@ typedef struct ISWbemServicesExVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *ExecQuery)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, BSTR strQuery, BSTR strQueryLanguage, LONG iFlags, @@ -2152,7 +2033,7 @@ typedef struct ISWbemServicesExVtbl { ISWbemObjectSet **objWbemObjectSet); HRESULT (STDMETHODCALLTYPE *ExecQueryAsync)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, IDispatch *objWbemSink, BSTR strQuery, BSTR strQueryLanguage, @@ -2161,7 +2042,7 @@ typedef struct ISWbemServicesExVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *AssociatorsOf)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, BSTR strObjectPath, BSTR strAssocClass, BSTR strResultClass, @@ -2176,7 +2057,7 @@ typedef struct ISWbemServicesExVtbl { ISWbemObjectSet **objWbemObjectSet); HRESULT (STDMETHODCALLTYPE *AssociatorsOfAsync)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, IDispatch *objWbemSink, BSTR strObjectPath, BSTR strAssocClass, @@ -2192,7 +2073,7 @@ typedef struct ISWbemServicesExVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *ReferencesTo)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, BSTR strObjectPath, BSTR strResultClass, BSTR strRole, @@ -2204,7 +2085,7 @@ typedef struct ISWbemServicesExVtbl { ISWbemObjectSet **objWbemObjectSet); HRESULT (STDMETHODCALLTYPE *ReferencesToAsync)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, IDispatch *objWbemSink, BSTR strObjectPath, BSTR strResultClass, @@ -2217,7 +2098,7 @@ typedef struct ISWbemServicesExVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *ExecNotificationQuery)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, BSTR strQuery, BSTR strQueryLanguage, LONG iFlags, @@ -2225,7 +2106,7 @@ typedef struct ISWbemServicesExVtbl { ISWbemEventSource **objWbemEventSource); HRESULT (STDMETHODCALLTYPE *ExecNotificationQueryAsync)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, IDispatch *objWbemSink, BSTR strQuery, BSTR strQueryLanguage, @@ -2234,7 +2115,7 @@ typedef struct ISWbemServicesExVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *ExecMethod)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, BSTR strObjectPath, BSTR strMethodName, IDispatch *objWbemInParameters, @@ -2243,7 +2124,7 @@ typedef struct ISWbemServicesExVtbl { ISWbemObject **objWbemOutParameters); HRESULT (STDMETHODCALLTYPE *ExecMethodAsync)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, IDispatch *objWbemSink, BSTR strObjectPath, BSTR strMethodName, @@ -2253,19 +2134,19 @@ typedef struct ISWbemServicesExVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *get_Security_)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, ISWbemSecurity **objWbemSecurity); /*** ISWbemServicesEx methods ***/ HRESULT (STDMETHODCALLTYPE *Put)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, ISWbemObjectEx *objWbemObject, LONG iFlags, IDispatch *objWbemNamedValueSet, ISWbemObjectPath **objWbemObjectPath); HRESULT (STDMETHODCALLTYPE *PutAsync)( - ISWbemServicesEx* This, + ISWbemServicesEx *This, ISWbemSink *objWbemSink, ISWbemObjectEx *objWbemObject, LONG iFlags, @@ -2274,6 +2155,7 @@ typedef struct ISWbemServicesExVtbl { END_INTERFACE } ISWbemServicesExVtbl; + interface ISWbemServicesEx { CONST_VTBL ISWbemServicesExVtbl* lpVtbl; }; @@ -2406,29 +2288,6 @@ static FORCEINLINE HRESULT ISWbemServicesEx_PutAsync(ISWbemServicesEx* This,ISWb #endif -HRESULT STDMETHODCALLTYPE ISWbemServicesEx_Put_Proxy( - ISWbemServicesEx* This, - ISWbemObjectEx *objWbemObject, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - ISWbemObjectPath **objWbemObjectPath); -void __RPC_STUB ISWbemServicesEx_Put_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemServicesEx_PutAsync_Proxy( - ISWbemServicesEx* This, - ISWbemSink *objWbemSink, - ISWbemObjectEx *objWbemObject, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - IDispatch *objWbemAsyncContext); -void __RPC_STUB ISWbemServicesEx_PutAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISWbemServicesEx_INTERFACE_DEFINED__ */ @@ -2597,29 +2456,29 @@ typedef struct ISWbemObjectVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemObject* This, + ISWbemObject *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemObject* This); + ISWbemObject *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemObject* This); + ISWbemObject *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemObject* This, + ISWbemObject *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemObject* This, + ISWbemObject *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemObject* This, + ISWbemObject *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2627,7 +2486,7 @@ typedef struct ISWbemObjectVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemObject* This, + ISWbemObject *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2639,58 +2498,58 @@ typedef struct ISWbemObjectVtbl { /*** ISWbemObject methods ***/ HRESULT (STDMETHODCALLTYPE *Put_)( - ISWbemObject* This, + ISWbemObject *This, LONG iFlags, IDispatch *objWbemNamedValueSet, ISWbemObjectPath **objWbemObjectPath); HRESULT (STDMETHODCALLTYPE *PutAsync_)( - ISWbemObject* This, + ISWbemObject *This, IDispatch *objWbemSink, LONG iFlags, IDispatch *objWbemNamedValueSet, IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *Delete_)( - ISWbemObject* This, + ISWbemObject *This, LONG iFlags, IDispatch *objWbemNamedValueSet); HRESULT (STDMETHODCALLTYPE *DeleteAsync_)( - ISWbemObject* This, + ISWbemObject *This, IDispatch *objWbemSink, LONG iFlags, IDispatch *objWbemNamedValueSet, IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *Instances_)( - ISWbemObject* This, + ISWbemObject *This, LONG iFlags, IDispatch *objWbemNamedValueSet, ISWbemObjectSet **objWbemObjectSet); HRESULT (STDMETHODCALLTYPE *InstancesAsync_)( - ISWbemObject* This, + ISWbemObject *This, IDispatch *objWbemSink, LONG iFlags, IDispatch *objWbemNamedValueSet, IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *Subclasses_)( - ISWbemObject* This, + ISWbemObject *This, LONG iFlags, IDispatch *objWbemNamedValueSet, ISWbemObjectSet **objWbemObjectSet); HRESULT (STDMETHODCALLTYPE *SubclassesAsync_)( - ISWbemObject* This, + ISWbemObject *This, IDispatch *objWbemSink, LONG iFlags, IDispatch *objWbemNamedValueSet, IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *Associators_)( - ISWbemObject* This, + ISWbemObject *This, BSTR strAssocClass, BSTR strResultClass, BSTR strResultRole, @@ -2704,7 +2563,7 @@ typedef struct ISWbemObjectVtbl { ISWbemObjectSet **objWbemObjectSet); HRESULT (STDMETHODCALLTYPE *AssociatorsAsync_)( - ISWbemObject* This, + ISWbemObject *This, IDispatch *objWbemSink, BSTR strAssocClass, BSTR strResultClass, @@ -2719,7 +2578,7 @@ typedef struct ISWbemObjectVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *References_)( - ISWbemObject* This, + ISWbemObject *This, BSTR strResultClass, BSTR strRole, VARIANT_BOOL bClassesOnly, @@ -2730,7 +2589,7 @@ typedef struct ISWbemObjectVtbl { ISWbemObjectSet **objWbemObjectSet); HRESULT (STDMETHODCALLTYPE *ReferencesAsync_)( - ISWbemObject* This, + ISWbemObject *This, IDispatch *objWbemSink, BSTR strResultClass, BSTR strRole, @@ -2742,7 +2601,7 @@ typedef struct ISWbemObjectVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *ExecMethod_)( - ISWbemObject* This, + ISWbemObject *This, BSTR strMethodName, IDispatch *objWbemInParameters, LONG iFlags, @@ -2750,7 +2609,7 @@ typedef struct ISWbemObjectVtbl { ISWbemObject **objWbemOutParameters); HRESULT (STDMETHODCALLTYPE *ExecMethodAsync_)( - ISWbemObject* This, + ISWbemObject *This, IDispatch *objWbemSink, BSTR strMethodName, IDispatch *objWbemInParameters, @@ -2759,56 +2618,57 @@ typedef struct ISWbemObjectVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *Clone_)( - ISWbemObject* This, + ISWbemObject *This, ISWbemObject **objWbemObject); HRESULT (STDMETHODCALLTYPE *GetObjectText_)( - ISWbemObject* This, + ISWbemObject *This, LONG iFlags, BSTR *strObjectText); HRESULT (STDMETHODCALLTYPE *SpawnDerivedClass_)( - ISWbemObject* This, + ISWbemObject *This, LONG iFlags, ISWbemObject **objWbemObject); HRESULT (STDMETHODCALLTYPE *SpawnInstance_)( - ISWbemObject* This, + ISWbemObject *This, LONG iFlags, ISWbemObject **objWbemObject); HRESULT (STDMETHODCALLTYPE *CompareTo_)( - ISWbemObject* This, + ISWbemObject *This, IDispatch *objWbemObject, LONG iFlags, VARIANT_BOOL *bResult); HRESULT (STDMETHODCALLTYPE *get_Qualifiers_)( - ISWbemObject* This, + ISWbemObject *This, ISWbemQualifierSet **objWbemQualifierSet); HRESULT (STDMETHODCALLTYPE *get_Properties_)( - ISWbemObject* This, + ISWbemObject *This, ISWbemPropertySet **objWbemPropertySet); HRESULT (STDMETHODCALLTYPE *get_Methods_)( - ISWbemObject* This, + ISWbemObject *This, ISWbemMethodSet **objWbemMethodSet); HRESULT (STDMETHODCALLTYPE *get_Derivation_)( - ISWbemObject* This, + ISWbemObject *This, VARIANT *strClassNameArray); HRESULT (STDMETHODCALLTYPE *get_Path_)( - ISWbemObject* This, + ISWbemObject *This, ISWbemObjectPath **objWbemObjectPath); HRESULT (STDMETHODCALLTYPE *get_Security_)( - ISWbemObject* This, + ISWbemObject *This, ISWbemSecurity **objWbemSecurity); END_INTERFACE } ISWbemObjectVtbl; + interface ISWbemObject { CONST_VTBL ISWbemObjectVtbl* lpVtbl; }; @@ -2955,275 +2815,6 @@ static FORCEINLINE HRESULT ISWbemObject_get_Security_(ISWbemObject* This,ISWbemS #endif -HRESULT STDMETHODCALLTYPE ISWbemObject_Put__Proxy( - ISWbemObject* This, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - ISWbemObjectPath **objWbemObjectPath); -void __RPC_STUB ISWbemObject_Put__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObject_PutAsync__Proxy( - ISWbemObject* This, - IDispatch *objWbemSink, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - IDispatch *objWbemAsyncContext); -void __RPC_STUB ISWbemObject_PutAsync__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObject_Delete__Proxy( - ISWbemObject* This, - LONG iFlags, - IDispatch *objWbemNamedValueSet); -void __RPC_STUB ISWbemObject_Delete__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObject_DeleteAsync__Proxy( - ISWbemObject* This, - IDispatch *objWbemSink, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - IDispatch *objWbemAsyncContext); -void __RPC_STUB ISWbemObject_DeleteAsync__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObject_Instances__Proxy( - ISWbemObject* This, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - ISWbemObjectSet **objWbemObjectSet); -void __RPC_STUB ISWbemObject_Instances__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObject_InstancesAsync__Proxy( - ISWbemObject* This, - IDispatch *objWbemSink, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - IDispatch *objWbemAsyncContext); -void __RPC_STUB ISWbemObject_InstancesAsync__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObject_Subclasses__Proxy( - ISWbemObject* This, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - ISWbemObjectSet **objWbemObjectSet); -void __RPC_STUB ISWbemObject_Subclasses__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObject_SubclassesAsync__Proxy( - ISWbemObject* This, - IDispatch *objWbemSink, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - IDispatch *objWbemAsyncContext); -void __RPC_STUB ISWbemObject_SubclassesAsync__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObject_Associators__Proxy( - ISWbemObject* This, - BSTR strAssocClass, - BSTR strResultClass, - BSTR strResultRole, - BSTR strRole, - VARIANT_BOOL bClassesOnly, - VARIANT_BOOL bSchemaOnly, - BSTR strRequiredAssocQualifier, - BSTR strRequiredQualifier, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - ISWbemObjectSet **objWbemObjectSet); -void __RPC_STUB ISWbemObject_Associators__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObject_AssociatorsAsync__Proxy( - ISWbemObject* This, - IDispatch *objWbemSink, - BSTR strAssocClass, - BSTR strResultClass, - BSTR strResultRole, - BSTR strRole, - VARIANT_BOOL bClassesOnly, - VARIANT_BOOL bSchemaOnly, - BSTR strRequiredAssocQualifier, - BSTR strRequiredQualifier, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - IDispatch *objWbemAsyncContext); -void __RPC_STUB ISWbemObject_AssociatorsAsync__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObject_References__Proxy( - ISWbemObject* This, - BSTR strResultClass, - BSTR strRole, - VARIANT_BOOL bClassesOnly, - VARIANT_BOOL bSchemaOnly, - BSTR strRequiredQualifier, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - ISWbemObjectSet **objWbemObjectSet); -void __RPC_STUB ISWbemObject_References__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObject_ReferencesAsync__Proxy( - ISWbemObject* This, - IDispatch *objWbemSink, - BSTR strResultClass, - BSTR strRole, - VARIANT_BOOL bClassesOnly, - VARIANT_BOOL bSchemaOnly, - BSTR strRequiredQualifier, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - IDispatch *objWbemAsyncContext); -void __RPC_STUB ISWbemObject_ReferencesAsync__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObject_ExecMethod__Proxy( - ISWbemObject* This, - BSTR strMethodName, - IDispatch *objWbemInParameters, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - ISWbemObject **objWbemOutParameters); -void __RPC_STUB ISWbemObject_ExecMethod__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObject_ExecMethodAsync__Proxy( - ISWbemObject* This, - IDispatch *objWbemSink, - BSTR strMethodName, - IDispatch *objWbemInParameters, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - IDispatch *objWbemAsyncContext); -void __RPC_STUB ISWbemObject_ExecMethodAsync__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObject_Clone__Proxy( - ISWbemObject* This, - ISWbemObject **objWbemObject); -void __RPC_STUB ISWbemObject_Clone__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObject_GetObjectText__Proxy( - ISWbemObject* This, - LONG iFlags, - BSTR *strObjectText); -void __RPC_STUB ISWbemObject_GetObjectText__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObject_SpawnDerivedClass__Proxy( - ISWbemObject* This, - LONG iFlags, - ISWbemObject **objWbemObject); -void __RPC_STUB ISWbemObject_SpawnDerivedClass__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObject_SpawnInstance__Proxy( - ISWbemObject* This, - LONG iFlags, - ISWbemObject **objWbemObject); -void __RPC_STUB ISWbemObject_SpawnInstance__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObject_CompareTo__Proxy( - ISWbemObject* This, - IDispatch *objWbemObject, - LONG iFlags, - VARIANT_BOOL *bResult); -void __RPC_STUB ISWbemObject_CompareTo__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObject_get_Qualifiers__Proxy( - ISWbemObject* This, - ISWbemQualifierSet **objWbemQualifierSet); -void __RPC_STUB ISWbemObject_get_Qualifiers__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObject_get_Properties__Proxy( - ISWbemObject* This, - ISWbemPropertySet **objWbemPropertySet); -void __RPC_STUB ISWbemObject_get_Properties__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObject_get_Methods__Proxy( - ISWbemObject* This, - ISWbemMethodSet **objWbemMethodSet); -void __RPC_STUB ISWbemObject_get_Methods__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObject_get_Derivation__Proxy( - ISWbemObject* This, - VARIANT *strClassNameArray); -void __RPC_STUB ISWbemObject_get_Derivation__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObject_get_Path__Proxy( - ISWbemObject* This, - ISWbemObjectPath **objWbemObjectPath); -void __RPC_STUB ISWbemObject_get_Path__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObject_get_Security__Proxy( - ISWbemObject* This, - ISWbemSecurity **objWbemSecurity); -void __RPC_STUB ISWbemObject_get_Security__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISWbemObject_INTERFACE_DEFINED__ */ @@ -3267,29 +2858,29 @@ typedef struct ISWbemObjectExVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemObjectEx* This); + ISWbemObjectEx *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemObjectEx* This); + ISWbemObjectEx *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -3297,7 +2888,7 @@ typedef struct ISWbemObjectExVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -3309,58 +2900,58 @@ typedef struct ISWbemObjectExVtbl { /*** ISWbemObject methods ***/ HRESULT (STDMETHODCALLTYPE *Put_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, LONG iFlags, IDispatch *objWbemNamedValueSet, ISWbemObjectPath **objWbemObjectPath); HRESULT (STDMETHODCALLTYPE *PutAsync_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, IDispatch *objWbemSink, LONG iFlags, IDispatch *objWbemNamedValueSet, IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *Delete_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, LONG iFlags, IDispatch *objWbemNamedValueSet); HRESULT (STDMETHODCALLTYPE *DeleteAsync_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, IDispatch *objWbemSink, LONG iFlags, IDispatch *objWbemNamedValueSet, IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *Instances_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, LONG iFlags, IDispatch *objWbemNamedValueSet, ISWbemObjectSet **objWbemObjectSet); HRESULT (STDMETHODCALLTYPE *InstancesAsync_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, IDispatch *objWbemSink, LONG iFlags, IDispatch *objWbemNamedValueSet, IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *Subclasses_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, LONG iFlags, IDispatch *objWbemNamedValueSet, ISWbemObjectSet **objWbemObjectSet); HRESULT (STDMETHODCALLTYPE *SubclassesAsync_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, IDispatch *objWbemSink, LONG iFlags, IDispatch *objWbemNamedValueSet, IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *Associators_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, BSTR strAssocClass, BSTR strResultClass, BSTR strResultRole, @@ -3374,7 +2965,7 @@ typedef struct ISWbemObjectExVtbl { ISWbemObjectSet **objWbemObjectSet); HRESULT (STDMETHODCALLTYPE *AssociatorsAsync_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, IDispatch *objWbemSink, BSTR strAssocClass, BSTR strResultClass, @@ -3389,7 +2980,7 @@ typedef struct ISWbemObjectExVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *References_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, BSTR strResultClass, BSTR strRole, VARIANT_BOOL bClassesOnly, @@ -3400,7 +2991,7 @@ typedef struct ISWbemObjectExVtbl { ISWbemObjectSet **objWbemObjectSet); HRESULT (STDMETHODCALLTYPE *ReferencesAsync_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, IDispatch *objWbemSink, BSTR strResultClass, BSTR strRole, @@ -3412,7 +3003,7 @@ typedef struct ISWbemObjectExVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *ExecMethod_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, BSTR strMethodName, IDispatch *objWbemInParameters, LONG iFlags, @@ -3420,7 +3011,7 @@ typedef struct ISWbemObjectExVtbl { ISWbemObject **objWbemOutParameters); HRESULT (STDMETHODCALLTYPE *ExecMethodAsync_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, IDispatch *objWbemSink, BSTR strMethodName, IDispatch *objWbemInParameters, @@ -3429,73 +3020,73 @@ typedef struct ISWbemObjectExVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *Clone_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, ISWbemObject **objWbemObject); HRESULT (STDMETHODCALLTYPE *GetObjectText_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, LONG iFlags, BSTR *strObjectText); HRESULT (STDMETHODCALLTYPE *SpawnDerivedClass_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, LONG iFlags, ISWbemObject **objWbemObject); HRESULT (STDMETHODCALLTYPE *SpawnInstance_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, LONG iFlags, ISWbemObject **objWbemObject); HRESULT (STDMETHODCALLTYPE *CompareTo_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, IDispatch *objWbemObject, LONG iFlags, VARIANT_BOOL *bResult); HRESULT (STDMETHODCALLTYPE *get_Qualifiers_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, ISWbemQualifierSet **objWbemQualifierSet); HRESULT (STDMETHODCALLTYPE *get_Properties_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, ISWbemPropertySet **objWbemPropertySet); HRESULT (STDMETHODCALLTYPE *get_Methods_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, ISWbemMethodSet **objWbemMethodSet); HRESULT (STDMETHODCALLTYPE *get_Derivation_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, VARIANT *strClassNameArray); HRESULT (STDMETHODCALLTYPE *get_Path_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, ISWbemObjectPath **objWbemObjectPath); HRESULT (STDMETHODCALLTYPE *get_Security_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, ISWbemSecurity **objWbemSecurity); /*** ISWbemObjectEx methods ***/ HRESULT (STDMETHODCALLTYPE *Refresh_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, LONG iFlags, IDispatch *objWbemNamedValueSet); HRESULT (STDMETHODCALLTYPE *get_SystemProperties_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, ISWbemPropertySet **objWbemPropertySet); HRESULT (STDMETHODCALLTYPE *GetText_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, WbemObjectTextFormatEnum iObjectTextFormat, LONG iFlags, IDispatch *objWbemNamedValueSet, BSTR *bsText); HRESULT (STDMETHODCALLTYPE *SetFromText_)( - ISWbemObjectEx* This, + ISWbemObjectEx *This, BSTR bsText, WbemObjectTextFormatEnum iObjectTextFormat, LONG iFlags, @@ -3503,6 +3094,7 @@ typedef struct ISWbemObjectExVtbl { END_INTERFACE } ISWbemObjectExVtbl; + interface ISWbemObjectEx { CONST_VTBL ISWbemObjectExVtbl* lpVtbl; }; @@ -3667,45 +3259,6 @@ static FORCEINLINE HRESULT ISWbemObjectEx_SetFromText_(ISWbemObjectEx* This,BSTR #endif -HRESULT STDMETHODCALLTYPE ISWbemObjectEx_Refresh__Proxy( - ISWbemObjectEx* This, - LONG iFlags, - IDispatch *objWbemNamedValueSet); -void __RPC_STUB ISWbemObjectEx_Refresh__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectEx_get_SystemProperties__Proxy( - ISWbemObjectEx* This, - ISWbemPropertySet **objWbemPropertySet); -void __RPC_STUB ISWbemObjectEx_get_SystemProperties__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectEx_GetText__Proxy( - ISWbemObjectEx* This, - WbemObjectTextFormatEnum iObjectTextFormat, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - BSTR *bsText); -void __RPC_STUB ISWbemObjectEx_GetText__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectEx_SetFromText__Proxy( - ISWbemObjectEx* This, - BSTR bsText, - WbemObjectTextFormatEnum iObjectTextFormat, - LONG iFlags, - IDispatch *objWbemNamedValueSet); -void __RPC_STUB ISWbemObjectEx_SetFromText__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISWbemObjectEx_INTERFACE_DEFINED__ */ @@ -3730,29 +3283,29 @@ typedef struct ISWbemLastErrorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemLastError* This, + ISWbemLastError *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemLastError* This); + ISWbemLastError *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemLastError* This); + ISWbemLastError *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemLastError* This, + ISWbemLastError *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemLastError* This, + ISWbemLastError *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemLastError* This, + ISWbemLastError *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -3760,7 +3313,7 @@ typedef struct ISWbemLastErrorVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemLastError* This, + ISWbemLastError *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -3772,58 +3325,58 @@ typedef struct ISWbemLastErrorVtbl { /*** ISWbemObject methods ***/ HRESULT (STDMETHODCALLTYPE *Put_)( - ISWbemLastError* This, + ISWbemLastError *This, LONG iFlags, IDispatch *objWbemNamedValueSet, ISWbemObjectPath **objWbemObjectPath); HRESULT (STDMETHODCALLTYPE *PutAsync_)( - ISWbemLastError* This, + ISWbemLastError *This, IDispatch *objWbemSink, LONG iFlags, IDispatch *objWbemNamedValueSet, IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *Delete_)( - ISWbemLastError* This, + ISWbemLastError *This, LONG iFlags, IDispatch *objWbemNamedValueSet); HRESULT (STDMETHODCALLTYPE *DeleteAsync_)( - ISWbemLastError* This, + ISWbemLastError *This, IDispatch *objWbemSink, LONG iFlags, IDispatch *objWbemNamedValueSet, IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *Instances_)( - ISWbemLastError* This, + ISWbemLastError *This, LONG iFlags, IDispatch *objWbemNamedValueSet, ISWbemObjectSet **objWbemObjectSet); HRESULT (STDMETHODCALLTYPE *InstancesAsync_)( - ISWbemLastError* This, + ISWbemLastError *This, IDispatch *objWbemSink, LONG iFlags, IDispatch *objWbemNamedValueSet, IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *Subclasses_)( - ISWbemLastError* This, + ISWbemLastError *This, LONG iFlags, IDispatch *objWbemNamedValueSet, ISWbemObjectSet **objWbemObjectSet); HRESULT (STDMETHODCALLTYPE *SubclassesAsync_)( - ISWbemLastError* This, + ISWbemLastError *This, IDispatch *objWbemSink, LONG iFlags, IDispatch *objWbemNamedValueSet, IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *Associators_)( - ISWbemLastError* This, + ISWbemLastError *This, BSTR strAssocClass, BSTR strResultClass, BSTR strResultRole, @@ -3837,7 +3390,7 @@ typedef struct ISWbemLastErrorVtbl { ISWbemObjectSet **objWbemObjectSet); HRESULT (STDMETHODCALLTYPE *AssociatorsAsync_)( - ISWbemLastError* This, + ISWbemLastError *This, IDispatch *objWbemSink, BSTR strAssocClass, BSTR strResultClass, @@ -3852,7 +3405,7 @@ typedef struct ISWbemLastErrorVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *References_)( - ISWbemLastError* This, + ISWbemLastError *This, BSTR strResultClass, BSTR strRole, VARIANT_BOOL bClassesOnly, @@ -3863,7 +3416,7 @@ typedef struct ISWbemLastErrorVtbl { ISWbemObjectSet **objWbemObjectSet); HRESULT (STDMETHODCALLTYPE *ReferencesAsync_)( - ISWbemLastError* This, + ISWbemLastError *This, IDispatch *objWbemSink, BSTR strResultClass, BSTR strRole, @@ -3875,7 +3428,7 @@ typedef struct ISWbemLastErrorVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *ExecMethod_)( - ISWbemLastError* This, + ISWbemLastError *This, BSTR strMethodName, IDispatch *objWbemInParameters, LONG iFlags, @@ -3883,7 +3436,7 @@ typedef struct ISWbemLastErrorVtbl { ISWbemObject **objWbemOutParameters); HRESULT (STDMETHODCALLTYPE *ExecMethodAsync_)( - ISWbemLastError* This, + ISWbemLastError *This, IDispatch *objWbemSink, BSTR strMethodName, IDispatch *objWbemInParameters, @@ -3892,56 +3445,57 @@ typedef struct ISWbemLastErrorVtbl { IDispatch *objWbemAsyncContext); HRESULT (STDMETHODCALLTYPE *Clone_)( - ISWbemLastError* This, + ISWbemLastError *This, ISWbemObject **objWbemObject); HRESULT (STDMETHODCALLTYPE *GetObjectText_)( - ISWbemLastError* This, + ISWbemLastError *This, LONG iFlags, BSTR *strObjectText); HRESULT (STDMETHODCALLTYPE *SpawnDerivedClass_)( - ISWbemLastError* This, + ISWbemLastError *This, LONG iFlags, ISWbemObject **objWbemObject); HRESULT (STDMETHODCALLTYPE *SpawnInstance_)( - ISWbemLastError* This, + ISWbemLastError *This, LONG iFlags, ISWbemObject **objWbemObject); HRESULT (STDMETHODCALLTYPE *CompareTo_)( - ISWbemLastError* This, + ISWbemLastError *This, IDispatch *objWbemObject, LONG iFlags, VARIANT_BOOL *bResult); HRESULT (STDMETHODCALLTYPE *get_Qualifiers_)( - ISWbemLastError* This, + ISWbemLastError *This, ISWbemQualifierSet **objWbemQualifierSet); HRESULT (STDMETHODCALLTYPE *get_Properties_)( - ISWbemLastError* This, + ISWbemLastError *This, ISWbemPropertySet **objWbemPropertySet); HRESULT (STDMETHODCALLTYPE *get_Methods_)( - ISWbemLastError* This, + ISWbemLastError *This, ISWbemMethodSet **objWbemMethodSet); HRESULT (STDMETHODCALLTYPE *get_Derivation_)( - ISWbemLastError* This, + ISWbemLastError *This, VARIANT *strClassNameArray); HRESULT (STDMETHODCALLTYPE *get_Path_)( - ISWbemLastError* This, + ISWbemLastError *This, ISWbemObjectPath **objWbemObjectPath); HRESULT (STDMETHODCALLTYPE *get_Security_)( - ISWbemLastError* This, + ISWbemLastError *This, ISWbemSecurity **objWbemSecurity); END_INTERFACE } ISWbemLastErrorVtbl; + interface ISWbemLastError { CONST_VTBL ISWbemLastErrorVtbl* lpVtbl; }; @@ -4130,29 +3684,29 @@ typedef struct ISWbemObjectSetVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemObjectSet* This, + ISWbemObjectSet *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemObjectSet* This); + ISWbemObjectSet *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemObjectSet* This); + ISWbemObjectSet *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemObjectSet* This, + ISWbemObjectSet *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemObjectSet* This, + ISWbemObjectSet *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemObjectSet* This, + ISWbemObjectSet *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -4160,7 +3714,7 @@ typedef struct ISWbemObjectSetVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemObjectSet* This, + ISWbemObjectSet *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -4172,30 +3726,31 @@ typedef struct ISWbemObjectSetVtbl { /*** ISWbemObjectSet methods ***/ HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISWbemObjectSet* This, + ISWbemObjectSet *This, IUnknown **pUnk); HRESULT (STDMETHODCALLTYPE *Item)( - ISWbemObjectSet* This, + ISWbemObjectSet *This, BSTR strObjectPath, LONG iFlags, ISWbemObject **objWbemObject); HRESULT (STDMETHODCALLTYPE *get_Count)( - ISWbemObjectSet* This, + ISWbemObjectSet *This, LONG *iCount); HRESULT (STDMETHODCALLTYPE *get_Security_)( - ISWbemObjectSet* This, + ISWbemObjectSet *This, ISWbemSecurity **objWbemSecurity); HRESULT (STDMETHODCALLTYPE *ItemIndex)( - ISWbemObjectSet* This, + ISWbemObjectSet *This, LONG lIndex, ISWbemObject **objWbemObject); END_INTERFACE } ISWbemObjectSetVtbl; + interface ISWbemObjectSet { CONST_VTBL ISWbemObjectSetVtbl* lpVtbl; }; @@ -4262,49 +3817,6 @@ static FORCEINLINE HRESULT ISWbemObjectSet_ItemIndex(ISWbemObjectSet* This,LONG #endif -HRESULT STDMETHODCALLTYPE ISWbemObjectSet_get__NewEnum_Proxy( - ISWbemObjectSet* This, - IUnknown **pUnk); -void __RPC_STUB ISWbemObjectSet_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectSet_Item_Proxy( - ISWbemObjectSet* This, - BSTR strObjectPath, - LONG iFlags, - ISWbemObject **objWbemObject); -void __RPC_STUB ISWbemObjectSet_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectSet_get_Count_Proxy( - ISWbemObjectSet* This, - LONG *iCount); -void __RPC_STUB ISWbemObjectSet_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectSet_get_Security__Proxy( - ISWbemObjectSet* This, - ISWbemSecurity **objWbemSecurity); -void __RPC_STUB ISWbemObjectSet_get_Security__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectSet_ItemIndex_Proxy( - ISWbemObjectSet* This, - LONG lIndex, - ISWbemObject **objWbemObject); -void __RPC_STUB ISWbemObjectSet_ItemIndex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISWbemObjectSet_INTERFACE_DEFINED__ */ @@ -4356,29 +3868,29 @@ typedef struct ISWbemNamedValueSetVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemNamedValueSet* This, + ISWbemNamedValueSet *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemNamedValueSet* This); + ISWbemNamedValueSet *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemNamedValueSet* This); + ISWbemNamedValueSet *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemNamedValueSet* This, + ISWbemNamedValueSet *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemNamedValueSet* This, + ISWbemNamedValueSet *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemNamedValueSet* This, + ISWbemNamedValueSet *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -4386,7 +3898,7 @@ typedef struct ISWbemNamedValueSetVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemNamedValueSet* This, + ISWbemNamedValueSet *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -4398,40 +3910,41 @@ typedef struct ISWbemNamedValueSetVtbl { /*** ISWbemNamedValueSet methods ***/ HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISWbemNamedValueSet* This, + ISWbemNamedValueSet *This, IUnknown **pUnk); HRESULT (STDMETHODCALLTYPE *Item)( - ISWbemNamedValueSet* This, + ISWbemNamedValueSet *This, BSTR strName, LONG iFlags, ISWbemNamedValue **objWbemNamedValue); HRESULT (STDMETHODCALLTYPE *get_Count)( - ISWbemNamedValueSet* This, + ISWbemNamedValueSet *This, LONG *iCount); HRESULT (STDMETHODCALLTYPE *Add)( - ISWbemNamedValueSet* This, + ISWbemNamedValueSet *This, BSTR strName, VARIANT *varValue, LONG iFlags, ISWbemNamedValue **objWbemNamedValue); HRESULT (STDMETHODCALLTYPE *Remove)( - ISWbemNamedValueSet* This, + ISWbemNamedValueSet *This, BSTR strName, LONG iFlags); HRESULT (STDMETHODCALLTYPE *Clone)( - ISWbemNamedValueSet* This, + ISWbemNamedValueSet *This, ISWbemNamedValueSet **objWbemNamedValueSet); HRESULT (STDMETHODCALLTYPE *DeleteAll)( - ISWbemNamedValueSet* This); + ISWbemNamedValueSet *This); END_INTERFACE } ISWbemNamedValueSetVtbl; + interface ISWbemNamedValueSet { CONST_VTBL ISWbemNamedValueSetVtbl* lpVtbl; }; @@ -4506,67 +4019,6 @@ static FORCEINLINE HRESULT ISWbemNamedValueSet_DeleteAll(ISWbemNamedValueSet* Th #endif -HRESULT STDMETHODCALLTYPE ISWbemNamedValueSet_get__NewEnum_Proxy( - ISWbemNamedValueSet* This, - IUnknown **pUnk); -void __RPC_STUB ISWbemNamedValueSet_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemNamedValueSet_Item_Proxy( - ISWbemNamedValueSet* This, - BSTR strName, - LONG iFlags, - ISWbemNamedValue **objWbemNamedValue); -void __RPC_STUB ISWbemNamedValueSet_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemNamedValueSet_get_Count_Proxy( - ISWbemNamedValueSet* This, - LONG *iCount); -void __RPC_STUB ISWbemNamedValueSet_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemNamedValueSet_Add_Proxy( - ISWbemNamedValueSet* This, - BSTR strName, - VARIANT *varValue, - LONG iFlags, - ISWbemNamedValue **objWbemNamedValue); -void __RPC_STUB ISWbemNamedValueSet_Add_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemNamedValueSet_Remove_Proxy( - ISWbemNamedValueSet* This, - BSTR strName, - LONG iFlags); -void __RPC_STUB ISWbemNamedValueSet_Remove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemNamedValueSet_Clone_Proxy( - ISWbemNamedValueSet* This, - ISWbemNamedValueSet **objWbemNamedValueSet); -void __RPC_STUB ISWbemNamedValueSet_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemNamedValueSet_DeleteAll_Proxy( - ISWbemNamedValueSet* This); -void __RPC_STUB ISWbemNamedValueSet_DeleteAll_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISWbemNamedValueSet_INTERFACE_DEFINED__ */ @@ -4600,29 +4052,29 @@ typedef struct ISWbemNamedValueVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemNamedValue* This, + ISWbemNamedValue *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemNamedValue* This); + ISWbemNamedValue *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemNamedValue* This); + ISWbemNamedValue *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemNamedValue* This, + ISWbemNamedValue *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemNamedValue* This, + ISWbemNamedValue *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemNamedValue* This, + ISWbemNamedValue *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -4630,7 +4082,7 @@ typedef struct ISWbemNamedValueVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemNamedValue* This, + ISWbemNamedValue *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -4642,19 +4094,20 @@ typedef struct ISWbemNamedValueVtbl { /*** ISWbemNamedValue methods ***/ HRESULT (STDMETHODCALLTYPE *get_Value)( - ISWbemNamedValue* This, + ISWbemNamedValue *This, VARIANT *varValue); HRESULT (STDMETHODCALLTYPE *put_Value)( - ISWbemNamedValue* This, + ISWbemNamedValue *This, VARIANT *varValue); HRESULT (STDMETHODCALLTYPE *get_Name)( - ISWbemNamedValue* This, + ISWbemNamedValue *This, BSTR *strName); END_INTERFACE } ISWbemNamedValueVtbl; + interface ISWbemNamedValue { CONST_VTBL ISWbemNamedValueVtbl* lpVtbl; }; @@ -4713,30 +4166,6 @@ static FORCEINLINE HRESULT ISWbemNamedValue_get_Name(ISWbemNamedValue* This,BSTR #endif -HRESULT STDMETHODCALLTYPE ISWbemNamedValue_get_Value_Proxy( - ISWbemNamedValue* This, - VARIANT *varValue); -void __RPC_STUB ISWbemNamedValue_get_Value_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemNamedValue_put_Value_Proxy( - ISWbemNamedValue* This, - VARIANT *varValue); -void __RPC_STUB ISWbemNamedValue_put_Value_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemNamedValue_get_Name_Proxy( - ISWbemNamedValue* This, - BSTR *strName); -void __RPC_STUB ISWbemNamedValue_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISWbemNamedValue_INTERFACE_DEFINED__ */ @@ -4830,29 +4259,29 @@ typedef struct ISWbemObjectPathVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemObjectPath* This); + ISWbemObjectPath *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemObjectPath* This); + ISWbemObjectPath *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -4860,7 +4289,7 @@ typedef struct ISWbemObjectPathVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -4872,97 +4301,98 @@ typedef struct ISWbemObjectPathVtbl { /*** ISWbemObjectPath methods ***/ HRESULT (STDMETHODCALLTYPE *get_Path)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, BSTR *strPath); HRESULT (STDMETHODCALLTYPE *put_Path)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, BSTR strPath); HRESULT (STDMETHODCALLTYPE *get_RelPath)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, BSTR *strRelPath); HRESULT (STDMETHODCALLTYPE *put_RelPath)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, BSTR strRelPath); HRESULT (STDMETHODCALLTYPE *get_Server)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, BSTR *strServer); HRESULT (STDMETHODCALLTYPE *put_Server)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, BSTR strServer); HRESULT (STDMETHODCALLTYPE *get_Namespace)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, BSTR *strNamespace); HRESULT (STDMETHODCALLTYPE *put_Namespace)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, BSTR strNamespace); HRESULT (STDMETHODCALLTYPE *get_ParentNamespace)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, BSTR *strParentNamespace); HRESULT (STDMETHODCALLTYPE *get_DisplayName)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, BSTR *strDisplayName); HRESULT (STDMETHODCALLTYPE *put_DisplayName)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, BSTR strDisplayName); HRESULT (STDMETHODCALLTYPE *get_Class)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, BSTR *strClass); HRESULT (STDMETHODCALLTYPE *put_Class)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, BSTR strClass); HRESULT (STDMETHODCALLTYPE *get_IsClass)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, VARIANT_BOOL *bIsClass); HRESULT (STDMETHODCALLTYPE *SetAsClass)( - ISWbemObjectPath* This); + ISWbemObjectPath *This); HRESULT (STDMETHODCALLTYPE *get_IsSingleton)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, VARIANT_BOOL *bIsSingleton); HRESULT (STDMETHODCALLTYPE *SetAsSingleton)( - ISWbemObjectPath* This); + ISWbemObjectPath *This); HRESULT (STDMETHODCALLTYPE *get_Keys)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, ISWbemNamedValueSet **objWbemNamedValueSet); HRESULT (STDMETHODCALLTYPE *get_Security_)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, ISWbemSecurity **objWbemSecurity); HRESULT (STDMETHODCALLTYPE *get_Locale)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, BSTR *strLocale); HRESULT (STDMETHODCALLTYPE *put_Locale)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, BSTR strLocale); HRESULT (STDMETHODCALLTYPE *get_Authority)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, BSTR *strAuthority); HRESULT (STDMETHODCALLTYPE *put_Authority)( - ISWbemObjectPath* This, + ISWbemObjectPath *This, BSTR strAuthority); END_INTERFACE } ISWbemObjectPathVtbl; + interface ISWbemObjectPath { CONST_VTBL ISWbemObjectPathVtbl* lpVtbl; }; @@ -5101,188 +4531,6 @@ static FORCEINLINE HRESULT ISWbemObjectPath_put_Authority(ISWbemObjectPath* This #endif -HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_Path_Proxy( - ISWbemObjectPath* This, - BSTR *strPath); -void __RPC_STUB ISWbemObjectPath_get_Path_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectPath_put_Path_Proxy( - ISWbemObjectPath* This, - BSTR strPath); -void __RPC_STUB ISWbemObjectPath_put_Path_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_RelPath_Proxy( - ISWbemObjectPath* This, - BSTR *strRelPath); -void __RPC_STUB ISWbemObjectPath_get_RelPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectPath_put_RelPath_Proxy( - ISWbemObjectPath* This, - BSTR strRelPath); -void __RPC_STUB ISWbemObjectPath_put_RelPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_Server_Proxy( - ISWbemObjectPath* This, - BSTR *strServer); -void __RPC_STUB ISWbemObjectPath_get_Server_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectPath_put_Server_Proxy( - ISWbemObjectPath* This, - BSTR strServer); -void __RPC_STUB ISWbemObjectPath_put_Server_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_Namespace_Proxy( - ISWbemObjectPath* This, - BSTR *strNamespace); -void __RPC_STUB ISWbemObjectPath_get_Namespace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectPath_put_Namespace_Proxy( - ISWbemObjectPath* This, - BSTR strNamespace); -void __RPC_STUB ISWbemObjectPath_put_Namespace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_ParentNamespace_Proxy( - ISWbemObjectPath* This, - BSTR *strParentNamespace); -void __RPC_STUB ISWbemObjectPath_get_ParentNamespace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_DisplayName_Proxy( - ISWbemObjectPath* This, - BSTR *strDisplayName); -void __RPC_STUB ISWbemObjectPath_get_DisplayName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectPath_put_DisplayName_Proxy( - ISWbemObjectPath* This, - BSTR strDisplayName); -void __RPC_STUB ISWbemObjectPath_put_DisplayName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_Class_Proxy( - ISWbemObjectPath* This, - BSTR *strClass); -void __RPC_STUB ISWbemObjectPath_get_Class_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectPath_put_Class_Proxy( - ISWbemObjectPath* This, - BSTR strClass); -void __RPC_STUB ISWbemObjectPath_put_Class_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_IsClass_Proxy( - ISWbemObjectPath* This, - VARIANT_BOOL *bIsClass); -void __RPC_STUB ISWbemObjectPath_get_IsClass_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectPath_SetAsClass_Proxy( - ISWbemObjectPath* This); -void __RPC_STUB ISWbemObjectPath_SetAsClass_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_IsSingleton_Proxy( - ISWbemObjectPath* This, - VARIANT_BOOL *bIsSingleton); -void __RPC_STUB ISWbemObjectPath_get_IsSingleton_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectPath_SetAsSingleton_Proxy( - ISWbemObjectPath* This); -void __RPC_STUB ISWbemObjectPath_SetAsSingleton_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_Keys_Proxy( - ISWbemObjectPath* This, - ISWbemNamedValueSet **objWbemNamedValueSet); -void __RPC_STUB ISWbemObjectPath_get_Keys_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_Security__Proxy( - ISWbemObjectPath* This, - ISWbemSecurity **objWbemSecurity); -void __RPC_STUB ISWbemObjectPath_get_Security__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_Locale_Proxy( - ISWbemObjectPath* This, - BSTR *strLocale); -void __RPC_STUB ISWbemObjectPath_get_Locale_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectPath_put_Locale_Proxy( - ISWbemObjectPath* This, - BSTR strLocale); -void __RPC_STUB ISWbemObjectPath_put_Locale_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_Authority_Proxy( - ISWbemObjectPath* This, - BSTR *strAuthority); -void __RPC_STUB ISWbemObjectPath_get_Authority_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemObjectPath_put_Authority_Proxy( - ISWbemObjectPath* This, - BSTR strAuthority); -void __RPC_STUB ISWbemObjectPath_put_Authority_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISWbemObjectPath_INTERFACE_DEFINED__ */ @@ -5331,29 +4579,29 @@ typedef struct ISWbemPropertyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemProperty* This, + ISWbemProperty *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemProperty* This); + ISWbemProperty *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemProperty* This); + ISWbemProperty *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemProperty* This, + ISWbemProperty *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemProperty* This, + ISWbemProperty *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemProperty* This, + ISWbemProperty *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -5361,7 +4609,7 @@ typedef struct ISWbemPropertyVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemProperty* This, + ISWbemProperty *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -5373,39 +4621,40 @@ typedef struct ISWbemPropertyVtbl { /*** ISWbemProperty methods ***/ HRESULT (STDMETHODCALLTYPE *get_Value)( - ISWbemProperty* This, + ISWbemProperty *This, VARIANT *varValue); HRESULT (STDMETHODCALLTYPE *put_Value)( - ISWbemProperty* This, + ISWbemProperty *This, VARIANT *varValue); HRESULT (STDMETHODCALLTYPE *get_Name)( - ISWbemProperty* This, + ISWbemProperty *This, BSTR *strName); HRESULT (STDMETHODCALLTYPE *get_IsLocal)( - ISWbemProperty* This, + ISWbemProperty *This, VARIANT_BOOL *bIsLocal); HRESULT (STDMETHODCALLTYPE *get_Origin)( - ISWbemProperty* This, + ISWbemProperty *This, BSTR *strOrigin); HRESULT (STDMETHODCALLTYPE *get_CIMType)( - ISWbemProperty* This, + ISWbemProperty *This, WbemCimtypeEnum *iCimType); HRESULT (STDMETHODCALLTYPE *get_Qualifiers_)( - ISWbemProperty* This, + ISWbemProperty *This, ISWbemQualifierSet **objWbemQualifierSet); HRESULT (STDMETHODCALLTYPE *get_IsArray)( - ISWbemProperty* This, + ISWbemProperty *This, VARIANT_BOOL *bIsArray); END_INTERFACE } ISWbemPropertyVtbl; + interface ISWbemProperty { CONST_VTBL ISWbemPropertyVtbl* lpVtbl; }; @@ -5484,70 +4733,6 @@ static FORCEINLINE HRESULT ISWbemProperty_get_IsArray(ISWbemProperty* This,VARIA #endif -HRESULT STDMETHODCALLTYPE ISWbemProperty_get_Value_Proxy( - ISWbemProperty* This, - VARIANT *varValue); -void __RPC_STUB ISWbemProperty_get_Value_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemProperty_put_Value_Proxy( - ISWbemProperty* This, - VARIANT *varValue); -void __RPC_STUB ISWbemProperty_put_Value_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemProperty_get_Name_Proxy( - ISWbemProperty* This, - BSTR *strName); -void __RPC_STUB ISWbemProperty_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemProperty_get_IsLocal_Proxy( - ISWbemProperty* This, - VARIANT_BOOL *bIsLocal); -void __RPC_STUB ISWbemProperty_get_IsLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemProperty_get_Origin_Proxy( - ISWbemProperty* This, - BSTR *strOrigin); -void __RPC_STUB ISWbemProperty_get_Origin_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemProperty_get_CIMType_Proxy( - ISWbemProperty* This, - WbemCimtypeEnum *iCimType); -void __RPC_STUB ISWbemProperty_get_CIMType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemProperty_get_Qualifiers__Proxy( - ISWbemProperty* This, - ISWbemQualifierSet **objWbemQualifierSet); -void __RPC_STUB ISWbemProperty_get_Qualifiers__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemProperty_get_IsArray_Proxy( - ISWbemProperty* This, - VARIANT_BOOL *bIsArray); -void __RPC_STUB ISWbemProperty_get_IsArray_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISWbemProperty_INTERFACE_DEFINED__ */ @@ -5594,29 +4779,29 @@ typedef struct ISWbemPropertySetVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemPropertySet* This, + ISWbemPropertySet *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemPropertySet* This); + ISWbemPropertySet *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemPropertySet* This); + ISWbemPropertySet *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemPropertySet* This, + ISWbemPropertySet *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemPropertySet* This, + ISWbemPropertySet *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemPropertySet* This, + ISWbemPropertySet *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -5624,7 +4809,7 @@ typedef struct ISWbemPropertySetVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemPropertySet* This, + ISWbemPropertySet *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -5636,21 +4821,21 @@ typedef struct ISWbemPropertySetVtbl { /*** ISWbemPropertySet methods ***/ HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISWbemPropertySet* This, + ISWbemPropertySet *This, IUnknown **pUnk); HRESULT (STDMETHODCALLTYPE *Item)( - ISWbemPropertySet* This, + ISWbemPropertySet *This, BSTR strName, LONG iFlags, ISWbemProperty **objWbemProperty); HRESULT (STDMETHODCALLTYPE *get_Count)( - ISWbemPropertySet* This, + ISWbemPropertySet *This, LONG *iCount); HRESULT (STDMETHODCALLTYPE *Add)( - ISWbemPropertySet* This, + ISWbemPropertySet *This, BSTR strName, WbemCimtypeEnum iCIMType, VARIANT_BOOL bIsArray, @@ -5658,12 +4843,13 @@ typedef struct ISWbemPropertySetVtbl { ISWbemProperty **objWbemProperty); HRESULT (STDMETHODCALLTYPE *Remove)( - ISWbemPropertySet* This, + ISWbemPropertySet *This, BSTR strName, LONG iFlags); END_INTERFACE } ISWbemPropertySetVtbl; + interface ISWbemPropertySet { CONST_VTBL ISWbemPropertySetVtbl* lpVtbl; }; @@ -5730,53 +4916,6 @@ static FORCEINLINE HRESULT ISWbemPropertySet_Remove(ISWbemPropertySet* This,BSTR #endif -HRESULT STDMETHODCALLTYPE ISWbemPropertySet_get__NewEnum_Proxy( - ISWbemPropertySet* This, - IUnknown **pUnk); -void __RPC_STUB ISWbemPropertySet_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemPropertySet_Item_Proxy( - ISWbemPropertySet* This, - BSTR strName, - LONG iFlags, - ISWbemProperty **objWbemProperty); -void __RPC_STUB ISWbemPropertySet_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemPropertySet_get_Count_Proxy( - ISWbemPropertySet* This, - LONG *iCount); -void __RPC_STUB ISWbemPropertySet_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemPropertySet_Add_Proxy( - ISWbemPropertySet* This, - BSTR strName, - WbemCimtypeEnum iCIMType, - VARIANT_BOOL bIsArray, - LONG iFlags, - ISWbemProperty **objWbemProperty); -void __RPC_STUB ISWbemPropertySet_Add_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemPropertySet_Remove_Proxy( - ISWbemPropertySet* This, - BSTR strName, - LONG iFlags); -void __RPC_STUB ISWbemPropertySet_Remove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISWbemPropertySet_INTERFACE_DEFINED__ */ @@ -5834,29 +4973,29 @@ typedef struct ISWbemQualifierVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemQualifier* This, + ISWbemQualifier *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemQualifier* This); + ISWbemQualifier *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemQualifier* This); + ISWbemQualifier *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemQualifier* This, + ISWbemQualifier *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemQualifier* This, + ISWbemQualifier *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemQualifier* This, + ISWbemQualifier *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -5864,7 +5003,7 @@ typedef struct ISWbemQualifierVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemQualifier* This, + ISWbemQualifier *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -5876,51 +5015,52 @@ typedef struct ISWbemQualifierVtbl { /*** ISWbemQualifier methods ***/ HRESULT (STDMETHODCALLTYPE *get_Value)( - ISWbemQualifier* This, + ISWbemQualifier *This, VARIANT *varValue); HRESULT (STDMETHODCALLTYPE *put_Value)( - ISWbemQualifier* This, + ISWbemQualifier *This, VARIANT *varValue); HRESULT (STDMETHODCALLTYPE *get_Name)( - ISWbemQualifier* This, + ISWbemQualifier *This, BSTR *strName); HRESULT (STDMETHODCALLTYPE *get_IsLocal)( - ISWbemQualifier* This, + ISWbemQualifier *This, VARIANT_BOOL *bIsLocal); HRESULT (STDMETHODCALLTYPE *get_PropagatesToSubclass)( - ISWbemQualifier* This, + ISWbemQualifier *This, VARIANT_BOOL *bPropagatesToSubclass); HRESULT (STDMETHODCALLTYPE *put_PropagatesToSubclass)( - ISWbemQualifier* This, + ISWbemQualifier *This, VARIANT_BOOL bPropagatesToSubclass); HRESULT (STDMETHODCALLTYPE *get_PropagatesToInstance)( - ISWbemQualifier* This, + ISWbemQualifier *This, VARIANT_BOOL *bPropagatesToInstance); HRESULT (STDMETHODCALLTYPE *put_PropagatesToInstance)( - ISWbemQualifier* This, + ISWbemQualifier *This, VARIANT_BOOL bPropagatesToInstance); HRESULT (STDMETHODCALLTYPE *get_IsOverridable)( - ISWbemQualifier* This, + ISWbemQualifier *This, VARIANT_BOOL *bIsOverridable); HRESULT (STDMETHODCALLTYPE *put_IsOverridable)( - ISWbemQualifier* This, + ISWbemQualifier *This, VARIANT_BOOL bIsOverridable); HRESULT (STDMETHODCALLTYPE *get_IsAmended)( - ISWbemQualifier* This, + ISWbemQualifier *This, VARIANT_BOOL *bIsAmended); END_INTERFACE } ISWbemQualifierVtbl; + interface ISWbemQualifier { CONST_VTBL ISWbemQualifierVtbl* lpVtbl; }; @@ -6011,94 +5151,6 @@ static FORCEINLINE HRESULT ISWbemQualifier_get_IsAmended(ISWbemQualifier* This,V #endif -HRESULT STDMETHODCALLTYPE ISWbemQualifier_get_Value_Proxy( - ISWbemQualifier* This, - VARIANT *varValue); -void __RPC_STUB ISWbemQualifier_get_Value_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemQualifier_put_Value_Proxy( - ISWbemQualifier* This, - VARIANT *varValue); -void __RPC_STUB ISWbemQualifier_put_Value_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemQualifier_get_Name_Proxy( - ISWbemQualifier* This, - BSTR *strName); -void __RPC_STUB ISWbemQualifier_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemQualifier_get_IsLocal_Proxy( - ISWbemQualifier* This, - VARIANT_BOOL *bIsLocal); -void __RPC_STUB ISWbemQualifier_get_IsLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemQualifier_get_PropagatesToSubclass_Proxy( - ISWbemQualifier* This, - VARIANT_BOOL *bPropagatesToSubclass); -void __RPC_STUB ISWbemQualifier_get_PropagatesToSubclass_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemQualifier_put_PropagatesToSubclass_Proxy( - ISWbemQualifier* This, - VARIANT_BOOL bPropagatesToSubclass); -void __RPC_STUB ISWbemQualifier_put_PropagatesToSubclass_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemQualifier_get_PropagatesToInstance_Proxy( - ISWbemQualifier* This, - VARIANT_BOOL *bPropagatesToInstance); -void __RPC_STUB ISWbemQualifier_get_PropagatesToInstance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemQualifier_put_PropagatesToInstance_Proxy( - ISWbemQualifier* This, - VARIANT_BOOL bPropagatesToInstance); -void __RPC_STUB ISWbemQualifier_put_PropagatesToInstance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemQualifier_get_IsOverridable_Proxy( - ISWbemQualifier* This, - VARIANT_BOOL *bIsOverridable); -void __RPC_STUB ISWbemQualifier_get_IsOverridable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemQualifier_put_IsOverridable_Proxy( - ISWbemQualifier* This, - VARIANT_BOOL bIsOverridable); -void __RPC_STUB ISWbemQualifier_put_IsOverridable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemQualifier_get_IsAmended_Proxy( - ISWbemQualifier* This, - VARIANT_BOOL *bIsAmended); -void __RPC_STUB ISWbemQualifier_get_IsAmended_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISWbemQualifier_INTERFACE_DEFINED__ */ @@ -6147,29 +5199,29 @@ typedef struct ISWbemQualifierSetVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemQualifierSet* This, + ISWbemQualifierSet *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemQualifierSet* This); + ISWbemQualifierSet *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemQualifierSet* This); + ISWbemQualifierSet *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemQualifierSet* This, + ISWbemQualifierSet *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemQualifierSet* This, + ISWbemQualifierSet *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemQualifierSet* This, + ISWbemQualifierSet *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -6177,7 +5229,7 @@ typedef struct ISWbemQualifierSetVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemQualifierSet* This, + ISWbemQualifierSet *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -6189,21 +5241,21 @@ typedef struct ISWbemQualifierSetVtbl { /*** ISWbemQualifierSet methods ***/ HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISWbemQualifierSet* This, + ISWbemQualifierSet *This, IUnknown **pUnk); HRESULT (STDMETHODCALLTYPE *Item)( - ISWbemQualifierSet* This, + ISWbemQualifierSet *This, BSTR name, LONG iFlags, ISWbemQualifier **objWbemQualifier); HRESULT (STDMETHODCALLTYPE *get_Count)( - ISWbemQualifierSet* This, + ISWbemQualifierSet *This, LONG *iCount); HRESULT (STDMETHODCALLTYPE *Add)( - ISWbemQualifierSet* This, + ISWbemQualifierSet *This, BSTR strName, VARIANT *varVal, VARIANT_BOOL bPropagatesToSubclass, @@ -6213,12 +5265,13 @@ typedef struct ISWbemQualifierSetVtbl { ISWbemQualifier **objWbemQualifier); HRESULT (STDMETHODCALLTYPE *Remove)( - ISWbemQualifierSet* This, + ISWbemQualifierSet *This, BSTR strName, LONG iFlags); END_INTERFACE } ISWbemQualifierSetVtbl; + interface ISWbemQualifierSet { CONST_VTBL ISWbemQualifierSetVtbl* lpVtbl; }; @@ -6285,55 +5338,6 @@ static FORCEINLINE HRESULT ISWbemQualifierSet_Remove(ISWbemQualifierSet* This,BS #endif -HRESULT STDMETHODCALLTYPE ISWbemQualifierSet_get__NewEnum_Proxy( - ISWbemQualifierSet* This, - IUnknown **pUnk); -void __RPC_STUB ISWbemQualifierSet_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemQualifierSet_Item_Proxy( - ISWbemQualifierSet* This, - BSTR name, - LONG iFlags, - ISWbemQualifier **objWbemQualifier); -void __RPC_STUB ISWbemQualifierSet_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemQualifierSet_get_Count_Proxy( - ISWbemQualifierSet* This, - LONG *iCount); -void __RPC_STUB ISWbemQualifierSet_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemQualifierSet_Add_Proxy( - ISWbemQualifierSet* This, - BSTR strName, - VARIANT *varVal, - VARIANT_BOOL bPropagatesToSubclass, - VARIANT_BOOL bPropagatesToInstance, - VARIANT_BOOL bIsOverridable, - LONG iFlags, - ISWbemQualifier **objWbemQualifier); -void __RPC_STUB ISWbemQualifierSet_Add_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemQualifierSet_Remove_Proxy( - ISWbemQualifierSet* This, - BSTR strName, - LONG iFlags); -void __RPC_STUB ISWbemQualifierSet_Remove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISWbemQualifierSet_INTERFACE_DEFINED__ */ @@ -6373,29 +5377,29 @@ typedef struct ISWbemMethodVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemMethod* This, + ISWbemMethod *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemMethod* This); + ISWbemMethod *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemMethod* This); + ISWbemMethod *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemMethod* This, + ISWbemMethod *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemMethod* This, + ISWbemMethod *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemMethod* This, + ISWbemMethod *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -6403,7 +5407,7 @@ typedef struct ISWbemMethodVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemMethod* This, + ISWbemMethod *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -6415,27 +5419,28 @@ typedef struct ISWbemMethodVtbl { /*** ISWbemMethod methods ***/ HRESULT (STDMETHODCALLTYPE *get_Name)( - ISWbemMethod* This, + ISWbemMethod *This, BSTR *strName); HRESULT (STDMETHODCALLTYPE *get_Origin)( - ISWbemMethod* This, + ISWbemMethod *This, BSTR *strOrigin); HRESULT (STDMETHODCALLTYPE *get_InParameters)( - ISWbemMethod* This, + ISWbemMethod *This, ISWbemObject **objWbemInParameters); HRESULT (STDMETHODCALLTYPE *get_OutParameters)( - ISWbemMethod* This, + ISWbemMethod *This, ISWbemObject **objWbemOutParameters); HRESULT (STDMETHODCALLTYPE *get_Qualifiers_)( - ISWbemMethod* This, + ISWbemMethod *This, ISWbemQualifierSet **objWbemQualifierSet); END_INTERFACE } ISWbemMethodVtbl; + interface ISWbemMethod { CONST_VTBL ISWbemMethodVtbl* lpVtbl; }; @@ -6502,46 +5507,6 @@ static FORCEINLINE HRESULT ISWbemMethod_get_Qualifiers_(ISWbemMethod* This,ISWbe #endif -HRESULT STDMETHODCALLTYPE ISWbemMethod_get_Name_Proxy( - ISWbemMethod* This, - BSTR *strName); -void __RPC_STUB ISWbemMethod_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemMethod_get_Origin_Proxy( - ISWbemMethod* This, - BSTR *strOrigin); -void __RPC_STUB ISWbemMethod_get_Origin_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemMethod_get_InParameters_Proxy( - ISWbemMethod* This, - ISWbemObject **objWbemInParameters); -void __RPC_STUB ISWbemMethod_get_InParameters_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemMethod_get_OutParameters_Proxy( - ISWbemMethod* This, - ISWbemObject **objWbemOutParameters); -void __RPC_STUB ISWbemMethod_get_OutParameters_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemMethod_get_Qualifiers__Proxy( - ISWbemMethod* This, - ISWbemQualifierSet **objWbemQualifierSet); -void __RPC_STUB ISWbemMethod_get_Qualifiers__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISWbemMethod_INTERFACE_DEFINED__ */ @@ -6577,29 +5542,29 @@ typedef struct ISWbemMethodSetVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemMethodSet* This, + ISWbemMethodSet *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemMethodSet* This); + ISWbemMethodSet *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemMethodSet* This); + ISWbemMethodSet *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemMethodSet* This, + ISWbemMethodSet *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemMethodSet* This, + ISWbemMethodSet *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemMethodSet* This, + ISWbemMethodSet *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -6607,7 +5572,7 @@ typedef struct ISWbemMethodSetVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemMethodSet* This, + ISWbemMethodSet *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -6619,21 +5584,22 @@ typedef struct ISWbemMethodSetVtbl { /*** ISWbemMethodSet methods ***/ HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISWbemMethodSet* This, + ISWbemMethodSet *This, IUnknown **pUnk); HRESULT (STDMETHODCALLTYPE *Item)( - ISWbemMethodSet* This, + ISWbemMethodSet *This, BSTR strName, LONG iFlags, ISWbemMethod **objWbemMethod); HRESULT (STDMETHODCALLTYPE *get_Count)( - ISWbemMethodSet* This, + ISWbemMethodSet *This, LONG *iCount); END_INTERFACE } ISWbemMethodSetVtbl; + interface ISWbemMethodSet { CONST_VTBL ISWbemMethodSetVtbl* lpVtbl; }; @@ -6692,32 +5658,6 @@ static FORCEINLINE HRESULT ISWbemMethodSet_get_Count(ISWbemMethodSet* This,LONG #endif -HRESULT STDMETHODCALLTYPE ISWbemMethodSet_get__NewEnum_Proxy( - ISWbemMethodSet* This, - IUnknown **pUnk); -void __RPC_STUB ISWbemMethodSet_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemMethodSet_Item_Proxy( - ISWbemMethodSet* This, - BSTR strName, - LONG iFlags, - ISWbemMethod **objWbemMethod); -void __RPC_STUB ISWbemMethodSet_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemMethodSet_get_Count_Proxy( - ISWbemMethodSet* This, - LONG *iCount); -void __RPC_STUB ISWbemMethodSet_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISWbemMethodSet_INTERFACE_DEFINED__ */ @@ -6745,29 +5685,29 @@ typedef struct ISWbemSinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemSink* This, + ISWbemSink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemSink* This); + ISWbemSink *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemSink* This); + ISWbemSink *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemSink* This, + ISWbemSink *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemSink* This, + ISWbemSink *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemSink* This, + ISWbemSink *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -6775,7 +5715,7 @@ typedef struct ISWbemSinkVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemSink* This, + ISWbemSink *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -6787,10 +5727,11 @@ typedef struct ISWbemSinkVtbl { /*** ISWbemSink methods ***/ HRESULT (STDMETHODCALLTYPE *Cancel)( - ISWbemSink* This); + ISWbemSink *This); END_INTERFACE } ISWbemSinkVtbl; + interface ISWbemSink { CONST_VTBL ISWbemSinkVtbl* lpVtbl; }; @@ -6841,13 +5782,6 @@ static FORCEINLINE HRESULT ISWbemSink_Cancel(ISWbemSink* This) { #endif -HRESULT STDMETHODCALLTYPE ISWbemSink_Cancel_Proxy( - ISWbemSink* This); -void __RPC_STUB ISWbemSink_Cancel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISWbemSink_INTERFACE_DEFINED__ */ @@ -6872,29 +5806,29 @@ typedef struct ISWbemSinkEventsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemSinkEvents* This, + ISWbemSinkEvents *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemSinkEvents* This); + ISWbemSinkEvents *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemSinkEvents* This); + ISWbemSinkEvents *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemSinkEvents* This, + ISWbemSinkEvents *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemSinkEvents* This, + ISWbemSinkEvents *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemSinkEvents* This, + ISWbemSinkEvents *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -6902,7 +5836,7 @@ typedef struct ISWbemSinkEventsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemSinkEvents* This, + ISWbemSinkEvents *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -6914,6 +5848,7 @@ typedef struct ISWbemSinkEventsVtbl { END_INTERFACE } ISWbemSinkEventsVtbl; + interface ISWbemSinkEvents { CONST_VTBL ISWbemSinkEventsVtbl* lpVtbl; }; @@ -6988,29 +5923,29 @@ typedef struct ISWbemEventSourceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemEventSource* This, + ISWbemEventSource *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemEventSource* This); + ISWbemEventSource *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemEventSource* This); + ISWbemEventSource *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemEventSource* This, + ISWbemEventSource *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemEventSource* This, + ISWbemEventSource *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemEventSource* This, + ISWbemEventSource *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -7018,7 +5953,7 @@ typedef struct ISWbemEventSourceVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemEventSource* This, + ISWbemEventSource *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -7030,16 +5965,17 @@ typedef struct ISWbemEventSourceVtbl { /*** ISWbemEventSource methods ***/ HRESULT (STDMETHODCALLTYPE *NextEvent)( - ISWbemEventSource* This, + ISWbemEventSource *This, LONG iTimeoutMs, ISWbemObject **objWbemObject); HRESULT (STDMETHODCALLTYPE *get_Security_)( - ISWbemEventSource* This, + ISWbemEventSource *This, ISWbemSecurity **objWbemSecurity); END_INTERFACE } ISWbemEventSourceVtbl; + interface ISWbemEventSource { CONST_VTBL ISWbemEventSourceVtbl* lpVtbl; }; @@ -7094,23 +6030,6 @@ static FORCEINLINE HRESULT ISWbemEventSource_get_Security_(ISWbemEventSource* Th #endif -HRESULT STDMETHODCALLTYPE ISWbemEventSource_NextEvent_Proxy( - ISWbemEventSource* This, - LONG iTimeoutMs, - ISWbemObject **objWbemObject); -void __RPC_STUB ISWbemEventSource_NextEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemEventSource_get_Security__Proxy( - ISWbemEventSource* This, - ISWbemSecurity **objWbemSecurity); -void __RPC_STUB ISWbemEventSource_get_Security__Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISWbemEventSource_INTERFACE_DEFINED__ */ @@ -7150,29 +6069,29 @@ typedef struct ISWbemSecurityVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemSecurity* This, + ISWbemSecurity *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemSecurity* This); + ISWbemSecurity *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemSecurity* This); + ISWbemSecurity *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemSecurity* This, + ISWbemSecurity *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemSecurity* This, + ISWbemSecurity *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemSecurity* This, + ISWbemSecurity *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -7180,7 +6099,7 @@ typedef struct ISWbemSecurityVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemSecurity* This, + ISWbemSecurity *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -7192,27 +6111,28 @@ typedef struct ISWbemSecurityVtbl { /*** ISWbemSecurity methods ***/ HRESULT (STDMETHODCALLTYPE *get_ImpersonationLevel)( - ISWbemSecurity* This, + ISWbemSecurity *This, WbemImpersonationLevelEnum *iImpersonationLevel); HRESULT (STDMETHODCALLTYPE *put_ImpersonationLevel)( - ISWbemSecurity* This, + ISWbemSecurity *This, WbemImpersonationLevelEnum iImpersonationLevel); HRESULT (STDMETHODCALLTYPE *get_AuthenticationLevel)( - ISWbemSecurity* This, + ISWbemSecurity *This, WbemAuthenticationLevelEnum *iAuthenticationLevel); HRESULT (STDMETHODCALLTYPE *put_AuthenticationLevel)( - ISWbemSecurity* This, + ISWbemSecurity *This, WbemAuthenticationLevelEnum iAuthenticationLevel); HRESULT (STDMETHODCALLTYPE *get_Privileges)( - ISWbemSecurity* This, + ISWbemSecurity *This, ISWbemPrivilegeSet **objWbemPrivilegeSet); END_INTERFACE } ISWbemSecurityVtbl; + interface ISWbemSecurity { CONST_VTBL ISWbemSecurityVtbl* lpVtbl; }; @@ -7279,46 +6199,6 @@ static FORCEINLINE HRESULT ISWbemSecurity_get_Privileges(ISWbemSecurity* This,IS #endif -HRESULT STDMETHODCALLTYPE ISWbemSecurity_get_ImpersonationLevel_Proxy( - ISWbemSecurity* This, - WbemImpersonationLevelEnum *iImpersonationLevel); -void __RPC_STUB ISWbemSecurity_get_ImpersonationLevel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemSecurity_put_ImpersonationLevel_Proxy( - ISWbemSecurity* This, - WbemImpersonationLevelEnum iImpersonationLevel); -void __RPC_STUB ISWbemSecurity_put_ImpersonationLevel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemSecurity_get_AuthenticationLevel_Proxy( - ISWbemSecurity* This, - WbemAuthenticationLevelEnum *iAuthenticationLevel); -void __RPC_STUB ISWbemSecurity_get_AuthenticationLevel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemSecurity_put_AuthenticationLevel_Proxy( - ISWbemSecurity* This, - WbemAuthenticationLevelEnum iAuthenticationLevel); -void __RPC_STUB ISWbemSecurity_put_AuthenticationLevel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemSecurity_get_Privileges_Proxy( - ISWbemSecurity* This, - ISWbemPrivilegeSet **objWbemPrivilegeSet); -void __RPC_STUB ISWbemSecurity_get_Privileges_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISWbemSecurity_INTERFACE_DEFINED__ */ @@ -7358,29 +6238,29 @@ typedef struct ISWbemPrivilegeVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemPrivilege* This, + ISWbemPrivilege *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemPrivilege* This); + ISWbemPrivilege *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemPrivilege* This); + ISWbemPrivilege *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemPrivilege* This, + ISWbemPrivilege *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemPrivilege* This, + ISWbemPrivilege *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemPrivilege* This, + ISWbemPrivilege *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -7388,7 +6268,7 @@ typedef struct ISWbemPrivilegeVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemPrivilege* This, + ISWbemPrivilege *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -7400,27 +6280,28 @@ typedef struct ISWbemPrivilegeVtbl { /*** ISWbemPrivilege methods ***/ HRESULT (STDMETHODCALLTYPE *get_IsEnabled)( - ISWbemPrivilege* This, + ISWbemPrivilege *This, VARIANT_BOOL *bIsEnabled); HRESULT (STDMETHODCALLTYPE *put_IsEnabled)( - ISWbemPrivilege* This, + ISWbemPrivilege *This, VARIANT_BOOL bIsEnabled); HRESULT (STDMETHODCALLTYPE *get_Name)( - ISWbemPrivilege* This, + ISWbemPrivilege *This, BSTR *strDisplayName); HRESULT (STDMETHODCALLTYPE *get_DisplayName)( - ISWbemPrivilege* This, + ISWbemPrivilege *This, BSTR *strDisplayName); HRESULT (STDMETHODCALLTYPE *get_Identifier)( - ISWbemPrivilege* This, + ISWbemPrivilege *This, WbemPrivilegeEnum *iPrivilege); END_INTERFACE } ISWbemPrivilegeVtbl; + interface ISWbemPrivilege { CONST_VTBL ISWbemPrivilegeVtbl* lpVtbl; }; @@ -7487,46 +6368,6 @@ static FORCEINLINE HRESULT ISWbemPrivilege_get_Identifier(ISWbemPrivilege* This, #endif -HRESULT STDMETHODCALLTYPE ISWbemPrivilege_get_IsEnabled_Proxy( - ISWbemPrivilege* This, - VARIANT_BOOL *bIsEnabled); -void __RPC_STUB ISWbemPrivilege_get_IsEnabled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemPrivilege_put_IsEnabled_Proxy( - ISWbemPrivilege* This, - VARIANT_BOOL bIsEnabled); -void __RPC_STUB ISWbemPrivilege_put_IsEnabled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemPrivilege_get_Name_Proxy( - ISWbemPrivilege* This, - BSTR *strDisplayName); -void __RPC_STUB ISWbemPrivilege_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemPrivilege_get_DisplayName_Proxy( - ISWbemPrivilege* This, - BSTR *strDisplayName); -void __RPC_STUB ISWbemPrivilege_get_DisplayName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemPrivilege_get_Identifier_Proxy( - ISWbemPrivilege* This, - WbemPrivilegeEnum *iPrivilege); -void __RPC_STUB ISWbemPrivilege_get_Identifier_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISWbemPrivilege_INTERFACE_DEFINED__ */ @@ -7577,29 +6418,29 @@ typedef struct ISWbemPrivilegeSetVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemPrivilegeSet* This, + ISWbemPrivilegeSet *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemPrivilegeSet* This); + ISWbemPrivilegeSet *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemPrivilegeSet* This); + ISWbemPrivilegeSet *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemPrivilegeSet* This, + ISWbemPrivilegeSet *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemPrivilegeSet* This, + ISWbemPrivilegeSet *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemPrivilegeSet* This, + ISWbemPrivilegeSet *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -7607,7 +6448,7 @@ typedef struct ISWbemPrivilegeSetVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemPrivilegeSet* This, + ISWbemPrivilegeSet *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -7619,39 +6460,40 @@ typedef struct ISWbemPrivilegeSetVtbl { /*** ISWbemPrivilegeSet methods ***/ HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISWbemPrivilegeSet* This, + ISWbemPrivilegeSet *This, IUnknown **pUnk); HRESULT (STDMETHODCALLTYPE *Item)( - ISWbemPrivilegeSet* This, + ISWbemPrivilegeSet *This, WbemPrivilegeEnum iPrivilege, ISWbemPrivilege **objWbemPrivilege); HRESULT (STDMETHODCALLTYPE *get_Count)( - ISWbemPrivilegeSet* This, + ISWbemPrivilegeSet *This, LONG *iCount); HRESULT (STDMETHODCALLTYPE *Add)( - ISWbemPrivilegeSet* This, + ISWbemPrivilegeSet *This, WbemPrivilegeEnum iPrivilege, VARIANT_BOOL bIsEnabled, ISWbemPrivilege **objWbemPrivilege); HRESULT (STDMETHODCALLTYPE *Remove)( - ISWbemPrivilegeSet* This, + ISWbemPrivilegeSet *This, WbemPrivilegeEnum iPrivilege); HRESULT (STDMETHODCALLTYPE *DeleteAll)( - ISWbemPrivilegeSet* This); + ISWbemPrivilegeSet *This); HRESULT (STDMETHODCALLTYPE *AddAsString)( - ISWbemPrivilegeSet* This, + ISWbemPrivilegeSet *This, BSTR strPrivilege, VARIANT_BOOL bIsEnabled, ISWbemPrivilege **objWbemPrivilege); END_INTERFACE } ISWbemPrivilegeSetVtbl; + interface ISWbemPrivilegeSet { CONST_VTBL ISWbemPrivilegeSetVtbl* lpVtbl; }; @@ -7726,66 +6568,6 @@ static FORCEINLINE HRESULT ISWbemPrivilegeSet_AddAsString(ISWbemPrivilegeSet* Th #endif -HRESULT STDMETHODCALLTYPE ISWbemPrivilegeSet_get__NewEnum_Proxy( - ISWbemPrivilegeSet* This, - IUnknown **pUnk); -void __RPC_STUB ISWbemPrivilegeSet_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemPrivilegeSet_Item_Proxy( - ISWbemPrivilegeSet* This, - WbemPrivilegeEnum iPrivilege, - ISWbemPrivilege **objWbemPrivilege); -void __RPC_STUB ISWbemPrivilegeSet_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemPrivilegeSet_get_Count_Proxy( - ISWbemPrivilegeSet* This, - LONG *iCount); -void __RPC_STUB ISWbemPrivilegeSet_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemPrivilegeSet_Add_Proxy( - ISWbemPrivilegeSet* This, - WbemPrivilegeEnum iPrivilege, - VARIANT_BOOL bIsEnabled, - ISWbemPrivilege **objWbemPrivilege); -void __RPC_STUB ISWbemPrivilegeSet_Add_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemPrivilegeSet_Remove_Proxy( - ISWbemPrivilegeSet* This, - WbemPrivilegeEnum iPrivilege); -void __RPC_STUB ISWbemPrivilegeSet_Remove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemPrivilegeSet_DeleteAll_Proxy( - ISWbemPrivilegeSet* This); -void __RPC_STUB ISWbemPrivilegeSet_DeleteAll_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemPrivilegeSet_AddAsString_Proxy( - ISWbemPrivilegeSet* This, - BSTR strPrivilege, - VARIANT_BOOL bIsEnabled, - ISWbemPrivilege **objWbemPrivilege); -void __RPC_STUB ISWbemPrivilegeSet_AddAsString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISWbemPrivilegeSet_INTERFACE_DEFINED__ */ @@ -7934,29 +6716,29 @@ typedef struct ISWbemDateTimeVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemDateTime* This, + ISWbemDateTime *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemDateTime* This); + ISWbemDateTime *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemDateTime* This); + ISWbemDateTime *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemDateTime* This, + ISWbemDateTime *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemDateTime* This, + ISWbemDateTime *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemDateTime* This, + ISWbemDateTime *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -7964,7 +6746,7 @@ typedef struct ISWbemDateTimeVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemDateTime* This, + ISWbemDateTime *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -7976,171 +6758,172 @@ typedef struct ISWbemDateTimeVtbl { /*** ISWbemDateTime methods ***/ HRESULT (STDMETHODCALLTYPE *get_Value)( - ISWbemDateTime* This, + ISWbemDateTime *This, BSTR *strValue); HRESULT (STDMETHODCALLTYPE *put_Value)( - ISWbemDateTime* This, + ISWbemDateTime *This, BSTR strValue); HRESULT (STDMETHODCALLTYPE *get_Year)( - ISWbemDateTime* This, + ISWbemDateTime *This, LONG *iYear); HRESULT (STDMETHODCALLTYPE *put_Year)( - ISWbemDateTime* This, + ISWbemDateTime *This, LONG iYear); HRESULT (STDMETHODCALLTYPE *get_YearSpecified)( - ISWbemDateTime* This, + ISWbemDateTime *This, VARIANT_BOOL *bYearSpecified); HRESULT (STDMETHODCALLTYPE *put_YearSpecified)( - ISWbemDateTime* This, + ISWbemDateTime *This, VARIANT_BOOL bYearSpecified); HRESULT (STDMETHODCALLTYPE *get_Month)( - ISWbemDateTime* This, + ISWbemDateTime *This, LONG *iMonth); HRESULT (STDMETHODCALLTYPE *put_Month)( - ISWbemDateTime* This, + ISWbemDateTime *This, LONG iMonth); HRESULT (STDMETHODCALLTYPE *get_MonthSpecified)( - ISWbemDateTime* This, + ISWbemDateTime *This, VARIANT_BOOL *bMonthSpecified); HRESULT (STDMETHODCALLTYPE *put_MonthSpecified)( - ISWbemDateTime* This, + ISWbemDateTime *This, VARIANT_BOOL bMonthSpecified); HRESULT (STDMETHODCALLTYPE *get_Day)( - ISWbemDateTime* This, + ISWbemDateTime *This, LONG *iDay); HRESULT (STDMETHODCALLTYPE *put_Day)( - ISWbemDateTime* This, + ISWbemDateTime *This, LONG iDay); HRESULT (STDMETHODCALLTYPE *get_DaySpecified)( - ISWbemDateTime* This, + ISWbemDateTime *This, VARIANT_BOOL *bDaySpecified); HRESULT (STDMETHODCALLTYPE *put_DaySpecified)( - ISWbemDateTime* This, + ISWbemDateTime *This, VARIANT_BOOL bDaySpecified); HRESULT (STDMETHODCALLTYPE *get_Hours)( - ISWbemDateTime* This, + ISWbemDateTime *This, LONG *iHours); HRESULT (STDMETHODCALLTYPE *put_Hours)( - ISWbemDateTime* This, + ISWbemDateTime *This, LONG iHours); HRESULT (STDMETHODCALLTYPE *get_HoursSpecified)( - ISWbemDateTime* This, + ISWbemDateTime *This, VARIANT_BOOL *bHoursSpecified); HRESULT (STDMETHODCALLTYPE *put_HoursSpecified)( - ISWbemDateTime* This, + ISWbemDateTime *This, VARIANT_BOOL bHoursSpecified); HRESULT (STDMETHODCALLTYPE *get_Minutes)( - ISWbemDateTime* This, + ISWbemDateTime *This, LONG *iMinutes); HRESULT (STDMETHODCALLTYPE *put_Minutes)( - ISWbemDateTime* This, + ISWbemDateTime *This, LONG iMinutes); HRESULT (STDMETHODCALLTYPE *get_MinutesSpecified)( - ISWbemDateTime* This, + ISWbemDateTime *This, VARIANT_BOOL *bMinutesSpecified); HRESULT (STDMETHODCALLTYPE *put_MinutesSpecified)( - ISWbemDateTime* This, + ISWbemDateTime *This, VARIANT_BOOL bMinutesSpecified); HRESULT (STDMETHODCALLTYPE *get_Seconds)( - ISWbemDateTime* This, + ISWbemDateTime *This, LONG *iSeconds); HRESULT (STDMETHODCALLTYPE *put_Seconds)( - ISWbemDateTime* This, + ISWbemDateTime *This, LONG iSeconds); HRESULT (STDMETHODCALLTYPE *get_SecondsSpecified)( - ISWbemDateTime* This, + ISWbemDateTime *This, VARIANT_BOOL *bSecondsSpecified); HRESULT (STDMETHODCALLTYPE *put_SecondsSpecified)( - ISWbemDateTime* This, + ISWbemDateTime *This, VARIANT_BOOL bSecondsSpecified); HRESULT (STDMETHODCALLTYPE *get_Microseconds)( - ISWbemDateTime* This, + ISWbemDateTime *This, LONG *iMicroseconds); HRESULT (STDMETHODCALLTYPE *put_Microseconds)( - ISWbemDateTime* This, + ISWbemDateTime *This, LONG iMicroseconds); HRESULT (STDMETHODCALLTYPE *get_MicrosecondsSpecified)( - ISWbemDateTime* This, + ISWbemDateTime *This, VARIANT_BOOL *bMicrosecondsSpecified); HRESULT (STDMETHODCALLTYPE *put_MicrosecondsSpecified)( - ISWbemDateTime* This, + ISWbemDateTime *This, VARIANT_BOOL bMicrosecondsSpecified); HRESULT (STDMETHODCALLTYPE *get_UTC)( - ISWbemDateTime* This, + ISWbemDateTime *This, LONG *iUTC); HRESULT (STDMETHODCALLTYPE *put_UTC)( - ISWbemDateTime* This, + ISWbemDateTime *This, LONG iUTC); HRESULT (STDMETHODCALLTYPE *get_UTCSpecified)( - ISWbemDateTime* This, + ISWbemDateTime *This, VARIANT_BOOL *bUTCSpecified); HRESULT (STDMETHODCALLTYPE *put_UTCSpecified)( - ISWbemDateTime* This, + ISWbemDateTime *This, VARIANT_BOOL bUTCSpecified); HRESULT (STDMETHODCALLTYPE *get_IsInterval)( - ISWbemDateTime* This, + ISWbemDateTime *This, VARIANT_BOOL *bIsInterval); HRESULT (STDMETHODCALLTYPE *put_IsInterval)( - ISWbemDateTime* This, + ISWbemDateTime *This, VARIANT_BOOL bIsInterval); HRESULT (STDMETHODCALLTYPE *GetVarDate)( - ISWbemDateTime* This, + ISWbemDateTime *This, VARIANT_BOOL bIsLocal, DATE *dVarDate); HRESULT (STDMETHODCALLTYPE *SetVarDate)( - ISWbemDateTime* This, + ISWbemDateTime *This, DATE dVarDate, VARIANT_BOOL bIsLocal); HRESULT (STDMETHODCALLTYPE *GetFileTime)( - ISWbemDateTime* This, + ISWbemDateTime *This, VARIANT_BOOL bIsLocal, BSTR *strFileTime); HRESULT (STDMETHODCALLTYPE *SetFileTime)( - ISWbemDateTime* This, + ISWbemDateTime *This, BSTR strFileTime, VARIANT_BOOL bIsLocal); END_INTERFACE } ISWbemDateTimeVtbl; + interface ISWbemDateTime { CONST_VTBL ISWbemDateTimeVtbl* lpVtbl; }; @@ -8347,330 +7130,6 @@ static FORCEINLINE HRESULT ISWbemDateTime_SetFileTime(ISWbemDateTime* This,BSTR #endif -HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_Value_Proxy( - ISWbemDateTime* This, - BSTR *strValue); -void __RPC_STUB ISWbemDateTime_get_Value_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_Value_Proxy( - ISWbemDateTime* This, - BSTR strValue); -void __RPC_STUB ISWbemDateTime_put_Value_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_Year_Proxy( - ISWbemDateTime* This, - LONG *iYear); -void __RPC_STUB ISWbemDateTime_get_Year_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_Year_Proxy( - ISWbemDateTime* This, - LONG iYear); -void __RPC_STUB ISWbemDateTime_put_Year_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_YearSpecified_Proxy( - ISWbemDateTime* This, - VARIANT_BOOL *bYearSpecified); -void __RPC_STUB ISWbemDateTime_get_YearSpecified_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_YearSpecified_Proxy( - ISWbemDateTime* This, - VARIANT_BOOL bYearSpecified); -void __RPC_STUB ISWbemDateTime_put_YearSpecified_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_Month_Proxy( - ISWbemDateTime* This, - LONG *iMonth); -void __RPC_STUB ISWbemDateTime_get_Month_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_Month_Proxy( - ISWbemDateTime* This, - LONG iMonth); -void __RPC_STUB ISWbemDateTime_put_Month_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_MonthSpecified_Proxy( - ISWbemDateTime* This, - VARIANT_BOOL *bMonthSpecified); -void __RPC_STUB ISWbemDateTime_get_MonthSpecified_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_MonthSpecified_Proxy( - ISWbemDateTime* This, - VARIANT_BOOL bMonthSpecified); -void __RPC_STUB ISWbemDateTime_put_MonthSpecified_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_Day_Proxy( - ISWbemDateTime* This, - LONG *iDay); -void __RPC_STUB ISWbemDateTime_get_Day_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_Day_Proxy( - ISWbemDateTime* This, - LONG iDay); -void __RPC_STUB ISWbemDateTime_put_Day_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_DaySpecified_Proxy( - ISWbemDateTime* This, - VARIANT_BOOL *bDaySpecified); -void __RPC_STUB ISWbemDateTime_get_DaySpecified_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_DaySpecified_Proxy( - ISWbemDateTime* This, - VARIANT_BOOL bDaySpecified); -void __RPC_STUB ISWbemDateTime_put_DaySpecified_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_Hours_Proxy( - ISWbemDateTime* This, - LONG *iHours); -void __RPC_STUB ISWbemDateTime_get_Hours_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_Hours_Proxy( - ISWbemDateTime* This, - LONG iHours); -void __RPC_STUB ISWbemDateTime_put_Hours_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_HoursSpecified_Proxy( - ISWbemDateTime* This, - VARIANT_BOOL *bHoursSpecified); -void __RPC_STUB ISWbemDateTime_get_HoursSpecified_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_HoursSpecified_Proxy( - ISWbemDateTime* This, - VARIANT_BOOL bHoursSpecified); -void __RPC_STUB ISWbemDateTime_put_HoursSpecified_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_Minutes_Proxy( - ISWbemDateTime* This, - LONG *iMinutes); -void __RPC_STUB ISWbemDateTime_get_Minutes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_Minutes_Proxy( - ISWbemDateTime* This, - LONG iMinutes); -void __RPC_STUB ISWbemDateTime_put_Minutes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_MinutesSpecified_Proxy( - ISWbemDateTime* This, - VARIANT_BOOL *bMinutesSpecified); -void __RPC_STUB ISWbemDateTime_get_MinutesSpecified_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_MinutesSpecified_Proxy( - ISWbemDateTime* This, - VARIANT_BOOL bMinutesSpecified); -void __RPC_STUB ISWbemDateTime_put_MinutesSpecified_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_Seconds_Proxy( - ISWbemDateTime* This, - LONG *iSeconds); -void __RPC_STUB ISWbemDateTime_get_Seconds_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_Seconds_Proxy( - ISWbemDateTime* This, - LONG iSeconds); -void __RPC_STUB ISWbemDateTime_put_Seconds_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_SecondsSpecified_Proxy( - ISWbemDateTime* This, - VARIANT_BOOL *bSecondsSpecified); -void __RPC_STUB ISWbemDateTime_get_SecondsSpecified_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_SecondsSpecified_Proxy( - ISWbemDateTime* This, - VARIANT_BOOL bSecondsSpecified); -void __RPC_STUB ISWbemDateTime_put_SecondsSpecified_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_Microseconds_Proxy( - ISWbemDateTime* This, - LONG *iMicroseconds); -void __RPC_STUB ISWbemDateTime_get_Microseconds_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_Microseconds_Proxy( - ISWbemDateTime* This, - LONG iMicroseconds); -void __RPC_STUB ISWbemDateTime_put_Microseconds_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_MicrosecondsSpecified_Proxy( - ISWbemDateTime* This, - VARIANT_BOOL *bMicrosecondsSpecified); -void __RPC_STUB ISWbemDateTime_get_MicrosecondsSpecified_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_MicrosecondsSpecified_Proxy( - ISWbemDateTime* This, - VARIANT_BOOL bMicrosecondsSpecified); -void __RPC_STUB ISWbemDateTime_put_MicrosecondsSpecified_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_UTC_Proxy( - ISWbemDateTime* This, - LONG *iUTC); -void __RPC_STUB ISWbemDateTime_get_UTC_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_UTC_Proxy( - ISWbemDateTime* This, - LONG iUTC); -void __RPC_STUB ISWbemDateTime_put_UTC_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_UTCSpecified_Proxy( - ISWbemDateTime* This, - VARIANT_BOOL *bUTCSpecified); -void __RPC_STUB ISWbemDateTime_get_UTCSpecified_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_UTCSpecified_Proxy( - ISWbemDateTime* This, - VARIANT_BOOL bUTCSpecified); -void __RPC_STUB ISWbemDateTime_put_UTCSpecified_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_IsInterval_Proxy( - ISWbemDateTime* This, - VARIANT_BOOL *bIsInterval); -void __RPC_STUB ISWbemDateTime_get_IsInterval_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_IsInterval_Proxy( - ISWbemDateTime* This, - VARIANT_BOOL bIsInterval); -void __RPC_STUB ISWbemDateTime_put_IsInterval_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_GetVarDate_Proxy( - ISWbemDateTime* This, - VARIANT_BOOL bIsLocal, - DATE *dVarDate); -void __RPC_STUB ISWbemDateTime_GetVarDate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_SetVarDate_Proxy( - ISWbemDateTime* This, - DATE dVarDate, - VARIANT_BOOL bIsLocal); -void __RPC_STUB ISWbemDateTime_SetVarDate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_GetFileTime_Proxy( - ISWbemDateTime* This, - VARIANT_BOOL bIsLocal, - BSTR *strFileTime); -void __RPC_STUB ISWbemDateTime_GetFileTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemDateTime_SetFileTime_Proxy( - ISWbemDateTime* This, - BSTR strFileTime, - VARIANT_BOOL bIsLocal); -void __RPC_STUB ISWbemDateTime_SetFileTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISWbemDateTime_INTERFACE_DEFINED__ */ @@ -8713,29 +7172,29 @@ typedef struct ISWbemRefreshableItemVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemRefreshableItem* This, + ISWbemRefreshableItem *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemRefreshableItem* This); + ISWbemRefreshableItem *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemRefreshableItem* This); + ISWbemRefreshableItem *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemRefreshableItem* This, + ISWbemRefreshableItem *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemRefreshableItem* This, + ISWbemRefreshableItem *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemRefreshableItem* This, + ISWbemRefreshableItem *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -8743,7 +7202,7 @@ typedef struct ISWbemRefreshableItemVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemRefreshableItem* This, + ISWbemRefreshableItem *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -8755,31 +7214,32 @@ typedef struct ISWbemRefreshableItemVtbl { /*** ISWbemRefreshableItem methods ***/ HRESULT (STDMETHODCALLTYPE *get_Index)( - ISWbemRefreshableItem* This, + ISWbemRefreshableItem *This, LONG *iIndex); HRESULT (STDMETHODCALLTYPE *get_Refresher)( - ISWbemRefreshableItem* This, + ISWbemRefreshableItem *This, ISWbemRefresher **objWbemRefresher); HRESULT (STDMETHODCALLTYPE *get_IsSet)( - ISWbemRefreshableItem* This, + ISWbemRefreshableItem *This, VARIANT_BOOL *bIsSet); HRESULT (STDMETHODCALLTYPE *get_Object)( - ISWbemRefreshableItem* This, + ISWbemRefreshableItem *This, ISWbemObjectEx **objWbemObject); HRESULT (STDMETHODCALLTYPE *get_ObjectSet)( - ISWbemRefreshableItem* This, + ISWbemRefreshableItem *This, ISWbemObjectSet **objWbemObjectSet); HRESULT (STDMETHODCALLTYPE *Remove)( - ISWbemRefreshableItem* This, + ISWbemRefreshableItem *This, LONG iFlags); END_INTERFACE } ISWbemRefreshableItemVtbl; + interface ISWbemRefreshableItem { CONST_VTBL ISWbemRefreshableItemVtbl* lpVtbl; }; @@ -8850,54 +7310,6 @@ static FORCEINLINE HRESULT ISWbemRefreshableItem_Remove(ISWbemRefreshableItem* T #endif -HRESULT STDMETHODCALLTYPE ISWbemRefreshableItem_get_Index_Proxy( - ISWbemRefreshableItem* This, - LONG *iIndex); -void __RPC_STUB ISWbemRefreshableItem_get_Index_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemRefreshableItem_get_Refresher_Proxy( - ISWbemRefreshableItem* This, - ISWbemRefresher **objWbemRefresher); -void __RPC_STUB ISWbemRefreshableItem_get_Refresher_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemRefreshableItem_get_IsSet_Proxy( - ISWbemRefreshableItem* This, - VARIANT_BOOL *bIsSet); -void __RPC_STUB ISWbemRefreshableItem_get_IsSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemRefreshableItem_get_Object_Proxy( - ISWbemRefreshableItem* This, - ISWbemObjectEx **objWbemObject); -void __RPC_STUB ISWbemRefreshableItem_get_Object_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemRefreshableItem_get_ObjectSet_Proxy( - ISWbemRefreshableItem* This, - ISWbemObjectSet **objWbemObjectSet); -void __RPC_STUB ISWbemRefreshableItem_get_ObjectSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemRefreshableItem_Remove_Proxy( - ISWbemRefreshableItem* This, - LONG iFlags); -void __RPC_STUB ISWbemRefreshableItem_Remove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISWbemRefreshableItem_INTERFACE_DEFINED__ */ @@ -8962,29 +7374,29 @@ typedef struct ISWbemRefresherVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ISWbemRefresher* This, + ISWbemRefresher *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - ISWbemRefresher* This); + ISWbemRefresher *This); ULONG (STDMETHODCALLTYPE *Release)( - ISWbemRefresher* This); + ISWbemRefresher *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - ISWbemRefresher* This, + ISWbemRefresher *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - ISWbemRefresher* This, + ISWbemRefresher *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - ISWbemRefresher* This, + ISWbemRefresher *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -8992,7 +7404,7 @@ typedef struct ISWbemRefresherVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - ISWbemRefresher* This, + ISWbemRefresher *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -9004,20 +7416,20 @@ typedef struct ISWbemRefresherVtbl { /*** ISWbemRefresher methods ***/ HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - ISWbemRefresher* This, + ISWbemRefresher *This, IUnknown **pUnk); HRESULT (STDMETHODCALLTYPE *Item)( - ISWbemRefresher* This, + ISWbemRefresher *This, LONG iIndex, ISWbemRefreshableItem **objWbemRefreshableItem); HRESULT (STDMETHODCALLTYPE *get_Count)( - ISWbemRefresher* This, + ISWbemRefresher *This, LONG *iCount); HRESULT (STDMETHODCALLTYPE *Add)( - ISWbemRefresher* This, + ISWbemRefresher *This, ISWbemServicesEx *objWbemServices, BSTR bsInstancePath, LONG iFlags, @@ -9025,7 +7437,7 @@ typedef struct ISWbemRefresherVtbl { ISWbemRefreshableItem **objWbemRefreshableItem); HRESULT (STDMETHODCALLTYPE *AddEnum)( - ISWbemRefresher* This, + ISWbemRefresher *This, ISWbemServicesEx *objWbemServices, BSTR bsClassName, LONG iFlags, @@ -9033,27 +7445,28 @@ typedef struct ISWbemRefresherVtbl { ISWbemRefreshableItem **objWbemRefreshableItem); HRESULT (STDMETHODCALLTYPE *Remove)( - ISWbemRefresher* This, + ISWbemRefresher *This, LONG iIndex, LONG iFlags); HRESULT (STDMETHODCALLTYPE *Refresh)( - ISWbemRefresher* This, + ISWbemRefresher *This, LONG iFlags); HRESULT (STDMETHODCALLTYPE *get_AutoReconnect)( - ISWbemRefresher* This, + ISWbemRefresher *This, VARIANT_BOOL *bCount); HRESULT (STDMETHODCALLTYPE *put_AutoReconnect)( - ISWbemRefresher* This, + ISWbemRefresher *This, VARIANT_BOOL bCount); HRESULT (STDMETHODCALLTYPE *DeleteAll)( - ISWbemRefresher* This); + ISWbemRefresher *This); END_INTERFACE } ISWbemRefresherVtbl; + interface ISWbemRefresher { CONST_VTBL ISWbemRefresherVtbl* lpVtbl; }; @@ -9140,95 +7553,6 @@ static FORCEINLINE HRESULT ISWbemRefresher_DeleteAll(ISWbemRefresher* This) { #endif -HRESULT STDMETHODCALLTYPE ISWbemRefresher_get__NewEnum_Proxy( - ISWbemRefresher* This, - IUnknown **pUnk); -void __RPC_STUB ISWbemRefresher_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemRefresher_Item_Proxy( - ISWbemRefresher* This, - LONG iIndex, - ISWbemRefreshableItem **objWbemRefreshableItem); -void __RPC_STUB ISWbemRefresher_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemRefresher_get_Count_Proxy( - ISWbemRefresher* This, - LONG *iCount); -void __RPC_STUB ISWbemRefresher_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemRefresher_Add_Proxy( - ISWbemRefresher* This, - ISWbemServicesEx *objWbemServices, - BSTR bsInstancePath, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - ISWbemRefreshableItem **objWbemRefreshableItem); -void __RPC_STUB ISWbemRefresher_Add_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemRefresher_AddEnum_Proxy( - ISWbemRefresher* This, - ISWbemServicesEx *objWbemServices, - BSTR bsClassName, - LONG iFlags, - IDispatch *objWbemNamedValueSet, - ISWbemRefreshableItem **objWbemRefreshableItem); -void __RPC_STUB ISWbemRefresher_AddEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemRefresher_Remove_Proxy( - ISWbemRefresher* This, - LONG iIndex, - LONG iFlags); -void __RPC_STUB ISWbemRefresher_Remove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemRefresher_Refresh_Proxy( - ISWbemRefresher* This, - LONG iFlags); -void __RPC_STUB ISWbemRefresher_Refresh_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemRefresher_get_AutoReconnect_Proxy( - ISWbemRefresher* This, - VARIANT_BOOL *bCount); -void __RPC_STUB ISWbemRefresher_get_AutoReconnect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemRefresher_put_AutoReconnect_Proxy( - ISWbemRefresher* This, - VARIANT_BOOL bCount); -void __RPC_STUB ISWbemRefresher_put_AutoReconnect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE ISWbemRefresher_DeleteAll_Proxy( - ISWbemRefresher* This); -void __RPC_STUB ISWbemRefresher_DeleteAll_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __ISWbemRefresher_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/wbemprov.h b/lib/libc/include/any-windows-any/wbemprov.h index 8296fcea57..e90f802751 100644 --- a/lib/libc/include/any-windows-any/wbemprov.h +++ b/lib/libc/include/any-windows-any/wbemprov.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/wbemprov.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/wbemprov.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -65,66 +66,105 @@ typedef struct WbemDecoupledBasicEventProvider WbemDecoupledBasicEventProvider; #ifndef __IWbemUnboundObjectSink_FWD_DEFINED__ #define __IWbemUnboundObjectSink_FWD_DEFINED__ typedef interface IWbemUnboundObjectSink IWbemUnboundObjectSink; +#ifdef __cplusplus +interface IWbemUnboundObjectSink; +#endif /* __cplusplus */ #endif #ifndef __IWbemPropertyProvider_FWD_DEFINED__ #define __IWbemPropertyProvider_FWD_DEFINED__ typedef interface IWbemPropertyProvider IWbemPropertyProvider; +#ifdef __cplusplus +interface IWbemPropertyProvider; +#endif /* __cplusplus */ #endif #ifndef __IWbemEventProvider_FWD_DEFINED__ #define __IWbemEventProvider_FWD_DEFINED__ typedef interface IWbemEventProvider IWbemEventProvider; +#ifdef __cplusplus +interface IWbemEventProvider; +#endif /* __cplusplus */ #endif #ifndef __IWbemEventProviderQuerySink_FWD_DEFINED__ #define __IWbemEventProviderQuerySink_FWD_DEFINED__ typedef interface IWbemEventProviderQuerySink IWbemEventProviderQuerySink; +#ifdef __cplusplus +interface IWbemEventProviderQuerySink; +#endif /* __cplusplus */ #endif #ifndef __IWbemEventProviderSecurity_FWD_DEFINED__ #define __IWbemEventProviderSecurity_FWD_DEFINED__ typedef interface IWbemEventProviderSecurity IWbemEventProviderSecurity; +#ifdef __cplusplus +interface IWbemEventProviderSecurity; +#endif /* __cplusplus */ #endif #ifndef __IWbemProviderIdentity_FWD_DEFINED__ #define __IWbemProviderIdentity_FWD_DEFINED__ typedef interface IWbemProviderIdentity IWbemProviderIdentity; +#ifdef __cplusplus +interface IWbemProviderIdentity; +#endif /* __cplusplus */ #endif #ifndef __IWbemEventConsumerProvider_FWD_DEFINED__ #define __IWbemEventConsumerProvider_FWD_DEFINED__ typedef interface IWbemEventConsumerProvider IWbemEventConsumerProvider; +#ifdef __cplusplus +interface IWbemEventConsumerProvider; +#endif /* __cplusplus */ #endif #ifndef __IWbemProviderInitSink_FWD_DEFINED__ #define __IWbemProviderInitSink_FWD_DEFINED__ typedef interface IWbemProviderInitSink IWbemProviderInitSink; +#ifdef __cplusplus +interface IWbemProviderInitSink; +#endif /* __cplusplus */ #endif #ifndef __IWbemProviderInit_FWD_DEFINED__ #define __IWbemProviderInit_FWD_DEFINED__ typedef interface IWbemProviderInit IWbemProviderInit; +#ifdef __cplusplus +interface IWbemProviderInit; +#endif /* __cplusplus */ #endif #ifndef __IWbemHiPerfProvider_FWD_DEFINED__ #define __IWbemHiPerfProvider_FWD_DEFINED__ typedef interface IWbemHiPerfProvider IWbemHiPerfProvider; +#ifdef __cplusplus +interface IWbemHiPerfProvider; +#endif /* __cplusplus */ #endif #ifndef __IWbemDecoupledRegistrar_FWD_DEFINED__ #define __IWbemDecoupledRegistrar_FWD_DEFINED__ typedef interface IWbemDecoupledRegistrar IWbemDecoupledRegistrar; +#ifdef __cplusplus +interface IWbemDecoupledRegistrar; +#endif /* __cplusplus */ #endif #ifndef __IWbemDecoupledBasicEventProvider_FWD_DEFINED__ #define __IWbemDecoupledBasicEventProvider_FWD_DEFINED__ typedef interface IWbemDecoupledBasicEventProvider IWbemDecoupledBasicEventProvider; +#ifdef __cplusplus +interface IWbemDecoupledBasicEventProvider; +#endif /* __cplusplus */ #endif #ifndef __IWbemEventSink_FWD_DEFINED__ #define __IWbemEventSink_FWD_DEFINED__ typedef interface IWbemEventSink IWbemEventSink; +#ifdef __cplusplus +interface IWbemEventSink; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -157,51 +197,81 @@ typedef enum tag_WBEM_PROVIDER_REQUIREMENTS_TYPE { #ifndef __IWbemPropertyProvider_FWD_DEFINED__ #define __IWbemPropertyProvider_FWD_DEFINED__ typedef interface IWbemPropertyProvider IWbemPropertyProvider; +#ifdef __cplusplus +interface IWbemPropertyProvider; +#endif /* __cplusplus */ #endif #ifndef __IWbemUnboundObjectSink_FWD_DEFINED__ #define __IWbemUnboundObjectSink_FWD_DEFINED__ typedef interface IWbemUnboundObjectSink IWbemUnboundObjectSink; +#ifdef __cplusplus +interface IWbemUnboundObjectSink; +#endif /* __cplusplus */ #endif #ifndef __IWbemEventProvider_FWD_DEFINED__ #define __IWbemEventProvider_FWD_DEFINED__ typedef interface IWbemEventProvider IWbemEventProvider; +#ifdef __cplusplus +interface IWbemEventProvider; +#endif /* __cplusplus */ #endif #ifndef __IWbemEventProviderQuerySink_FWD_DEFINED__ #define __IWbemEventProviderQuerySink_FWD_DEFINED__ typedef interface IWbemEventProviderQuerySink IWbemEventProviderQuerySink; +#ifdef __cplusplus +interface IWbemEventProviderQuerySink; +#endif /* __cplusplus */ #endif #ifndef __IWbemEventProviderSecurity_FWD_DEFINED__ #define __IWbemEventProviderSecurity_FWD_DEFINED__ typedef interface IWbemEventProviderSecurity IWbemEventProviderSecurity; +#ifdef __cplusplus +interface IWbemEventProviderSecurity; +#endif /* __cplusplus */ #endif #ifndef __IWbemEventConsumerProvider_FWD_DEFINED__ #define __IWbemEventConsumerProvider_FWD_DEFINED__ typedef interface IWbemEventConsumerProvider IWbemEventConsumerProvider; +#ifdef __cplusplus +interface IWbemEventConsumerProvider; +#endif /* __cplusplus */ #endif #ifndef __IWbemProviderInitSink_FWD_DEFINED__ #define __IWbemProviderInitSink_FWD_DEFINED__ typedef interface IWbemProviderInitSink IWbemProviderInitSink; +#ifdef __cplusplus +interface IWbemProviderInitSink; +#endif /* __cplusplus */ #endif #ifndef __IWbemProviderInit_FWD_DEFINED__ #define __IWbemProviderInit_FWD_DEFINED__ typedef interface IWbemProviderInit IWbemProviderInit; +#ifdef __cplusplus +interface IWbemProviderInit; +#endif /* __cplusplus */ #endif #ifndef __IWbemHiPerfProvider_FWD_DEFINED__ #define __IWbemHiPerfProvider_FWD_DEFINED__ typedef interface IWbemHiPerfProvider IWbemHiPerfProvider; +#ifdef __cplusplus +interface IWbemHiPerfProvider; +#endif /* __cplusplus */ #endif #ifndef __IWbemDecoupledRegistrar_FWD_DEFINED__ #define __IWbemDecoupledRegistrar_FWD_DEFINED__ typedef interface IWbemDecoupledRegistrar IWbemDecoupledRegistrar; +#ifdef __cplusplus +interface IWbemDecoupledRegistrar; +#endif /* __cplusplus */ #endif @@ -314,25 +384,26 @@ typedef struct IWbemUnboundObjectSinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemUnboundObjectSink* This, + IWbemUnboundObjectSink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemUnboundObjectSink* This); + IWbemUnboundObjectSink *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemUnboundObjectSink* This); + IWbemUnboundObjectSink *This); /*** IWbemUnboundObjectSink methods ***/ HRESULT (STDMETHODCALLTYPE *IndicateToConsumer)( - IWbemUnboundObjectSink* This, + IWbemUnboundObjectSink *This, IWbemClassObject *pLogicalConsumer, LONG lNumObjects, IWbemClassObject **apObjects); END_INTERFACE } IWbemUnboundObjectSinkVtbl; + interface IWbemUnboundObjectSink { CONST_VTBL IWbemUnboundObjectSinkVtbl* lpVtbl; }; @@ -365,16 +436,6 @@ static FORCEINLINE HRESULT IWbemUnboundObjectSink_IndicateToConsumer(IWbemUnboun #endif -HRESULT STDMETHODCALLTYPE IWbemUnboundObjectSink_IndicateToConsumer_Proxy( - IWbemUnboundObjectSink* This, - IWbemClassObject *pLogicalConsumer, - LONG lNumObjects, - IWbemClassObject **apObjects); -void __RPC_STUB IWbemUnboundObjectSink_IndicateToConsumer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemUnboundObjectSink_INTERFACE_DEFINED__ */ @@ -415,19 +476,19 @@ typedef struct IWbemPropertyProviderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemPropertyProvider* This, + IWbemPropertyProvider *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemPropertyProvider* This); + IWbemPropertyProvider *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemPropertyProvider* This); + IWbemPropertyProvider *This); /*** IWbemPropertyProvider methods ***/ HRESULT (STDMETHODCALLTYPE *GetProperty)( - IWbemPropertyProvider* This, + IWbemPropertyProvider *This, LONG lFlags, const BSTR strLocale, const BSTR strClassMapping, @@ -436,7 +497,7 @@ typedef struct IWbemPropertyProviderVtbl { VARIANT *pvValue); HRESULT (STDMETHODCALLTYPE *PutProperty)( - IWbemPropertyProvider* This, + IWbemPropertyProvider *This, LONG lFlags, const BSTR strLocale, const BSTR strClassMapping, @@ -446,6 +507,7 @@ typedef struct IWbemPropertyProviderVtbl { END_INTERFACE } IWbemPropertyProviderVtbl; + interface IWbemPropertyProvider { CONST_VTBL IWbemPropertyProviderVtbl* lpVtbl; }; @@ -482,32 +544,6 @@ static FORCEINLINE HRESULT IWbemPropertyProvider_PutProperty(IWbemPropertyProvid #endif -HRESULT STDMETHODCALLTYPE IWbemPropertyProvider_GetProperty_Proxy( - IWbemPropertyProvider* This, - LONG lFlags, - const BSTR strLocale, - const BSTR strClassMapping, - const BSTR strInstMapping, - const BSTR strPropMapping, - VARIANT *pvValue); -void __RPC_STUB IWbemPropertyProvider_GetProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemPropertyProvider_PutProperty_Proxy( - IWbemPropertyProvider* This, - LONG lFlags, - const BSTR strLocale, - const BSTR strClassMapping, - const BSTR strInstMapping, - const BSTR strPropMapping, - const VARIANT *pvValue); -void __RPC_STUB IWbemPropertyProvider_PutProperty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemPropertyProvider_INTERFACE_DEFINED__ */ @@ -536,24 +572,25 @@ typedef struct IWbemEventProviderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemEventProvider* This, + IWbemEventProvider *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemEventProvider* This); + IWbemEventProvider *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemEventProvider* This); + IWbemEventProvider *This); /*** IWbemEventProvider methods ***/ HRESULT (STDMETHODCALLTYPE *ProvideEvents)( - IWbemEventProvider* This, + IWbemEventProvider *This, IWbemObjectSink *pSink, LONG lFlags); END_INTERFACE } IWbemEventProviderVtbl; + interface IWbemEventProvider { CONST_VTBL IWbemEventProviderVtbl* lpVtbl; }; @@ -586,15 +623,6 @@ static FORCEINLINE HRESULT IWbemEventProvider_ProvideEvents(IWbemEventProvider* #endif -HRESULT STDMETHODCALLTYPE IWbemEventProvider_ProvideEvents_Proxy( - IWbemEventProvider* This, - IWbemObjectSink *pSink, - LONG lFlags); -void __RPC_STUB IWbemEventProvider_ProvideEvents_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemEventProvider_INTERFACE_DEFINED__ */ @@ -627,29 +655,30 @@ typedef struct IWbemEventProviderQuerySinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemEventProviderQuerySink* This, + IWbemEventProviderQuerySink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemEventProviderQuerySink* This); + IWbemEventProviderQuerySink *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemEventProviderQuerySink* This); + IWbemEventProviderQuerySink *This); /*** IWbemEventProviderQuerySink methods ***/ HRESULT (STDMETHODCALLTYPE *NewQuery)( - IWbemEventProviderQuerySink* This, + IWbemEventProviderQuerySink *This, ULONG dwId, WBEM_WSTR wszQueryLanguage, WBEM_WSTR wszQuery); HRESULT (STDMETHODCALLTYPE *CancelQuery)( - IWbemEventProviderQuerySink* This, + IWbemEventProviderQuerySink *This, ULONG dwId); END_INTERFACE } IWbemEventProviderQuerySinkVtbl; + interface IWbemEventProviderQuerySink { CONST_VTBL IWbemEventProviderQuerySinkVtbl* lpVtbl; }; @@ -686,24 +715,6 @@ static FORCEINLINE HRESULT IWbemEventProviderQuerySink_CancelQuery(IWbemEventPro #endif -HRESULT STDMETHODCALLTYPE IWbemEventProviderQuerySink_NewQuery_Proxy( - IWbemEventProviderQuerySink* This, - ULONG dwId, - WBEM_WSTR wszQueryLanguage, - WBEM_WSTR wszQuery); -void __RPC_STUB IWbemEventProviderQuerySink_NewQuery_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemEventProviderQuerySink_CancelQuery_Proxy( - IWbemEventProviderQuerySink* This, - ULONG dwId); -void __RPC_STUB IWbemEventProviderQuerySink_CancelQuery_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemEventProviderQuerySink_INTERFACE_DEFINED__ */ @@ -734,19 +745,19 @@ typedef struct IWbemEventProviderSecurityVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemEventProviderSecurity* This, + IWbemEventProviderSecurity *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemEventProviderSecurity* This); + IWbemEventProviderSecurity *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemEventProviderSecurity* This); + IWbemEventProviderSecurity *This); /*** IWbemEventProviderSecurity methods ***/ HRESULT (STDMETHODCALLTYPE *AccessCheck)( - IWbemEventProviderSecurity* This, + IWbemEventProviderSecurity *This, WBEM_CWSTR wszQueryLanguage, WBEM_CWSTR wszQuery, LONG lSidLength, @@ -754,6 +765,7 @@ typedef struct IWbemEventProviderSecurityVtbl { END_INTERFACE } IWbemEventProviderSecurityVtbl; + interface IWbemEventProviderSecurity { CONST_VTBL IWbemEventProviderSecurityVtbl* lpVtbl; }; @@ -786,17 +798,6 @@ static FORCEINLINE HRESULT IWbemEventProviderSecurity_AccessCheck(IWbemEventProv #endif -HRESULT STDMETHODCALLTYPE IWbemEventProviderSecurity_AccessCheck_Proxy( - IWbemEventProviderSecurity* This, - WBEM_CWSTR wszQueryLanguage, - WBEM_CWSTR wszQuery, - LONG lSidLength, - const BYTE *pSid); -void __RPC_STUB IWbemEventProviderSecurity_AccessCheck_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemEventProviderSecurity_INTERFACE_DEFINED__ */ @@ -825,24 +826,25 @@ typedef struct IWbemProviderIdentityVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemProviderIdentity* This, + IWbemProviderIdentity *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemProviderIdentity* This); + IWbemProviderIdentity *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemProviderIdentity* This); + IWbemProviderIdentity *This); /*** IWbemProviderIdentity methods ***/ HRESULT (STDMETHODCALLTYPE *SetRegistrationObject)( - IWbemProviderIdentity* This, + IWbemProviderIdentity *This, LONG lFlags, IWbemClassObject *pProvReg); END_INTERFACE } IWbemProviderIdentityVtbl; + interface IWbemProviderIdentity { CONST_VTBL IWbemProviderIdentityVtbl* lpVtbl; }; @@ -875,15 +877,6 @@ static FORCEINLINE HRESULT IWbemProviderIdentity_SetRegistrationObject(IWbemProv #endif -HRESULT STDMETHODCALLTYPE IWbemProviderIdentity_SetRegistrationObject_Proxy( - IWbemProviderIdentity* This, - LONG lFlags, - IWbemClassObject *pProvReg); -void __RPC_STUB IWbemProviderIdentity_SetRegistrationObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemProviderIdentity_INTERFACE_DEFINED__ */ @@ -912,24 +905,25 @@ typedef struct IWbemEventConsumerProviderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemEventConsumerProvider* This, + IWbemEventConsumerProvider *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemEventConsumerProvider* This); + IWbemEventConsumerProvider *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemEventConsumerProvider* This); + IWbemEventConsumerProvider *This); /*** IWbemEventConsumerProvider methods ***/ HRESULT (STDMETHODCALLTYPE *FindConsumer)( - IWbemEventConsumerProvider* This, + IWbemEventConsumerProvider *This, IWbemClassObject *pLogicalConsumer, IWbemUnboundObjectSink **ppConsumer); END_INTERFACE } IWbemEventConsumerProviderVtbl; + interface IWbemEventConsumerProvider { CONST_VTBL IWbemEventConsumerProviderVtbl* lpVtbl; }; @@ -962,15 +956,6 @@ static FORCEINLINE HRESULT IWbemEventConsumerProvider_FindConsumer(IWbemEventCon #endif -HRESULT STDMETHODCALLTYPE IWbemEventConsumerProvider_FindConsumer_Proxy( - IWbemEventConsumerProvider* This, - IWbemClassObject *pLogicalConsumer, - IWbemUnboundObjectSink **ppConsumer); -void __RPC_STUB IWbemEventConsumerProvider_FindConsumer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemEventConsumerProvider_INTERFACE_DEFINED__ */ @@ -999,24 +984,25 @@ typedef struct IWbemProviderInitSinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemProviderInitSink* This, + IWbemProviderInitSink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemProviderInitSink* This); + IWbemProviderInitSink *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemProviderInitSink* This); + IWbemProviderInitSink *This); /*** IWbemProviderInitSink methods ***/ HRESULT (STDMETHODCALLTYPE *SetStatus)( - IWbemProviderInitSink* This, + IWbemProviderInitSink *This, LONG lStatus, LONG lFlags); END_INTERFACE } IWbemProviderInitSinkVtbl; + interface IWbemProviderInitSink { CONST_VTBL IWbemProviderInitSinkVtbl* lpVtbl; }; @@ -1049,15 +1035,6 @@ static FORCEINLINE HRESULT IWbemProviderInitSink_SetStatus(IWbemProviderInitSink #endif -HRESULT STDMETHODCALLTYPE IWbemProviderInitSink_SetStatus_Proxy( - IWbemProviderInitSink* This, - LONG lStatus, - LONG lFlags); -void __RPC_STUB IWbemProviderInitSink_SetStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemProviderInitSink_INTERFACE_DEFINED__ */ @@ -1091,19 +1068,19 @@ typedef struct IWbemProviderInitVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemProviderInit* This, + IWbemProviderInit *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemProviderInit* This); + IWbemProviderInit *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemProviderInit* This); + IWbemProviderInit *This); /*** IWbemProviderInit methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IWbemProviderInit* This, + IWbemProviderInit *This, LPWSTR wszUser, LONG lFlags, LPWSTR wszNamespace, @@ -1114,6 +1091,7 @@ typedef struct IWbemProviderInitVtbl { END_INTERFACE } IWbemProviderInitVtbl; + interface IWbemProviderInit { CONST_VTBL IWbemProviderInitVtbl* lpVtbl; }; @@ -1146,20 +1124,6 @@ static FORCEINLINE HRESULT IWbemProviderInit_Initialize(IWbemProviderInit* This, #endif -HRESULT STDMETHODCALLTYPE IWbemProviderInit_Initialize_Proxy( - IWbemProviderInit* This, - LPWSTR wszUser, - LONG lFlags, - LPWSTR wszNamespace, - LPWSTR wszLocale, - IWbemServices *pNamespace, - IWbemContext *pCtx, - IWbemProviderInitSink *pInitSink); -void __RPC_STUB IWbemProviderInit_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemProviderInit_INTERFACE_DEFINED__ */ @@ -1226,19 +1190,19 @@ typedef struct IWbemHiPerfProviderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemHiPerfProvider* This, + IWbemHiPerfProvider *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemHiPerfProvider* This); + IWbemHiPerfProvider *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemHiPerfProvider* This); + IWbemHiPerfProvider *This); /*** IWbemHiPerfProvider methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInstances)( - IWbemHiPerfProvider* This, + IWbemHiPerfProvider *This, IWbemServices *pNamespace, WCHAR *wszClass, LONG lFlags, @@ -1246,13 +1210,13 @@ typedef struct IWbemHiPerfProviderVtbl { IWbemObjectSink *pSink); HRESULT (STDMETHODCALLTYPE *CreateRefresher)( - IWbemHiPerfProvider* This, + IWbemHiPerfProvider *This, IWbemServices *pNamespace, LONG lFlags, IWbemRefresher **ppRefresher); HRESULT (STDMETHODCALLTYPE *CreateRefreshableObject)( - IWbemHiPerfProvider* This, + IWbemHiPerfProvider *This, IWbemServices *pNamespace, IWbemObjectAccess *pTemplate, IWbemRefresher *pRefresher, @@ -1262,13 +1226,13 @@ typedef struct IWbemHiPerfProviderVtbl { LONG *plId); HRESULT (STDMETHODCALLTYPE *StopRefreshing)( - IWbemHiPerfProvider* This, + IWbemHiPerfProvider *This, IWbemRefresher *pRefresher, LONG lId, LONG lFlags); HRESULT (STDMETHODCALLTYPE *CreateRefreshableEnum)( - IWbemHiPerfProvider* This, + IWbemHiPerfProvider *This, IWbemServices *pNamespace, LPCWSTR wszClass, IWbemRefresher *pRefresher, @@ -1278,7 +1242,7 @@ typedef struct IWbemHiPerfProviderVtbl { LONG *plId); HRESULT (STDMETHODCALLTYPE *GetObjects)( - IWbemHiPerfProvider* This, + IWbemHiPerfProvider *This, IWbemServices *pNamespace, LONG lNumObjects, IWbemObjectAccess **apObj, @@ -1287,6 +1251,7 @@ typedef struct IWbemHiPerfProviderVtbl { END_INTERFACE } IWbemHiPerfProviderVtbl; + interface IWbemHiPerfProvider { CONST_VTBL IWbemHiPerfProviderVtbl* lpVtbl; }; @@ -1339,78 +1304,6 @@ static FORCEINLINE HRESULT IWbemHiPerfProvider_GetObjects(IWbemHiPerfProvider* T #endif -HRESULT STDMETHODCALLTYPE IWbemHiPerfProvider_QueryInstances_Proxy( - IWbemHiPerfProvider* This, - IWbemServices *pNamespace, - WCHAR *wszClass, - LONG lFlags, - IWbemContext *pCtx, - IWbemObjectSink *pSink); -void __RPC_STUB IWbemHiPerfProvider_QueryInstances_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemHiPerfProvider_CreateRefresher_Proxy( - IWbemHiPerfProvider* This, - IWbemServices *pNamespace, - LONG lFlags, - IWbemRefresher **ppRefresher); -void __RPC_STUB IWbemHiPerfProvider_CreateRefresher_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemHiPerfProvider_CreateRefreshableObject_Proxy( - IWbemHiPerfProvider* This, - IWbemServices *pNamespace, - IWbemObjectAccess *pTemplate, - IWbemRefresher *pRefresher, - LONG lFlags, - IWbemContext *pContext, - IWbemObjectAccess **ppRefreshable, - LONG *plId); -void __RPC_STUB IWbemHiPerfProvider_CreateRefreshableObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemHiPerfProvider_StopRefreshing_Proxy( - IWbemHiPerfProvider* This, - IWbemRefresher *pRefresher, - LONG lId, - LONG lFlags); -void __RPC_STUB IWbemHiPerfProvider_StopRefreshing_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemHiPerfProvider_CreateRefreshableEnum_Proxy( - IWbemHiPerfProvider* This, - IWbemServices *pNamespace, - LPCWSTR wszClass, - IWbemRefresher *pRefresher, - LONG lFlags, - IWbemContext *pContext, - IWbemHiPerfEnum *pHiPerfEnum, - LONG *plId); -void __RPC_STUB IWbemHiPerfProvider_CreateRefreshableEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemHiPerfProvider_GetObjects_Proxy( - IWbemHiPerfProvider* This, - IWbemServices *pNamespace, - LONG lNumObjects, - IWbemObjectAccess **apObj, - LONG lFlags, - IWbemContext *pContext); -void __RPC_STUB IWbemHiPerfProvider_GetObjects_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemHiPerfProvider_INTERFACE_DEFINED__ */ @@ -1447,19 +1340,19 @@ typedef struct IWbemDecoupledRegistrarVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemDecoupledRegistrar* This, + IWbemDecoupledRegistrar *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemDecoupledRegistrar* This); + IWbemDecoupledRegistrar *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemDecoupledRegistrar* This); + IWbemDecoupledRegistrar *This); /*** IWbemDecoupledRegistrar methods ***/ HRESULT (STDMETHODCALLTYPE *Register)( - IWbemDecoupledRegistrar* This, + IWbemDecoupledRegistrar *This, LONG a_Flags, IWbemContext *a_Context, LPCWSTR a_User, @@ -1469,10 +1362,11 @@ typedef struct IWbemDecoupledRegistrarVtbl { IUnknown *pIUnknown); HRESULT (STDMETHODCALLTYPE *UnRegister)( - IWbemDecoupledRegistrar* This); + IWbemDecoupledRegistrar *This); END_INTERFACE } IWbemDecoupledRegistrarVtbl; + interface IWbemDecoupledRegistrar { CONST_VTBL IWbemDecoupledRegistrarVtbl* lpVtbl; }; @@ -1509,27 +1403,6 @@ static FORCEINLINE HRESULT IWbemDecoupledRegistrar_UnRegister(IWbemDecoupledRegi #endif -HRESULT STDMETHODCALLTYPE IWbemDecoupledRegistrar_Register_Proxy( - IWbemDecoupledRegistrar* This, - LONG a_Flags, - IWbemContext *a_Context, - LPCWSTR a_User, - LPCWSTR a_Locale, - LPCWSTR a_Scope, - LPCWSTR a_Registration, - IUnknown *pIUnknown); -void __RPC_STUB IWbemDecoupledRegistrar_Register_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemDecoupledRegistrar_UnRegister_Proxy( - IWbemDecoupledRegistrar* This); -void __RPC_STUB IWbemDecoupledRegistrar_UnRegister_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemDecoupledRegistrar_INTERFACE_DEFINED__ */ @@ -1564,19 +1437,19 @@ typedef struct IWbemDecoupledBasicEventProviderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemDecoupledBasicEventProvider* This, + IWbemDecoupledBasicEventProvider *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemDecoupledBasicEventProvider* This); + IWbemDecoupledBasicEventProvider *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemDecoupledBasicEventProvider* This); + IWbemDecoupledBasicEventProvider *This); /*** IWbemDecoupledRegistrar methods ***/ HRESULT (STDMETHODCALLTYPE *Register)( - IWbemDecoupledBasicEventProvider* This, + IWbemDecoupledBasicEventProvider *This, LONG a_Flags, IWbemContext *a_Context, LPCWSTR a_User, @@ -1586,23 +1459,24 @@ typedef struct IWbemDecoupledBasicEventProviderVtbl { IUnknown *pIUnknown); HRESULT (STDMETHODCALLTYPE *UnRegister)( - IWbemDecoupledBasicEventProvider* This); + IWbemDecoupledBasicEventProvider *This); /*** IWbemDecoupledBasicEventProvider methods ***/ HRESULT (STDMETHODCALLTYPE *GetSink)( - IWbemDecoupledBasicEventProvider* This, + IWbemDecoupledBasicEventProvider *This, LONG a_Flags, IWbemContext *a_Context, IWbemObjectSink **a_Sink); HRESULT (STDMETHODCALLTYPE *GetService)( - IWbemDecoupledBasicEventProvider* This, + IWbemDecoupledBasicEventProvider *This, LONG a_Flags, IWbemContext *a_Context, IWbemServices **a_Service); END_INTERFACE } IWbemDecoupledBasicEventProviderVtbl; + interface IWbemDecoupledBasicEventProvider { CONST_VTBL IWbemDecoupledBasicEventProviderVtbl* lpVtbl; }; @@ -1649,26 +1523,6 @@ static FORCEINLINE HRESULT IWbemDecoupledBasicEventProvider_GetService(IWbemDeco #endif -HRESULT STDMETHODCALLTYPE IWbemDecoupledBasicEventProvider_GetSink_Proxy( - IWbemDecoupledBasicEventProvider* This, - LONG a_Flags, - IWbemContext *a_Context, - IWbemObjectSink **a_Sink); -void __RPC_STUB IWbemDecoupledBasicEventProvider_GetSink_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemDecoupledBasicEventProvider_GetService_Proxy( - IWbemDecoupledBasicEventProvider* This, - LONG a_Flags, - IWbemContext *a_Context, - IWbemServices **a_Service); -void __RPC_STUB IWbemDecoupledBasicEventProvider_GetService_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemDecoupledBasicEventProvider_INTERFACE_DEFINED__ */ @@ -1711,24 +1565,24 @@ typedef struct IWbemEventSinkVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemEventSink* This, + IWbemEventSink *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemEventSink* This); + IWbemEventSink *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemEventSink* This); + IWbemEventSink *This); /*** IWbemObjectSink methods ***/ HRESULT (STDMETHODCALLTYPE *Indicate)( - IWbemEventSink* This, + IWbemEventSink *This, LONG lObjectCount, IWbemClassObject **apObjArray); HRESULT (STDMETHODCALLTYPE *SetStatus)( - IWbemEventSink* This, + IWbemEventSink *This, LONG lFlags, HRESULT hResult, BSTR strParam, @@ -1736,28 +1590,29 @@ typedef struct IWbemEventSinkVtbl { /*** IWbemEventSink methods ***/ HRESULT (STDMETHODCALLTYPE *SetSinkSecurity)( - IWbemEventSink* This, + IWbemEventSink *This, LONG lSDLength, BYTE *pSD); HRESULT (STDMETHODCALLTYPE *IsActive)( - IWbemEventSink* This); + IWbemEventSink *This); HRESULT (STDMETHODCALLTYPE *GetRestrictedSink)( - IWbemEventSink* This, + IWbemEventSink *This, LONG lNumQueries, const LPCWSTR *awszQueries, IUnknown *pCallback, IWbemEventSink **ppSink); HRESULT (STDMETHODCALLTYPE *SetBatchingParameters)( - IWbemEventSink* This, + IWbemEventSink *This, LONG lFlags, DWORD dwMaxBufferSize, DWORD dwMaxSendLatency); END_INTERFACE } IWbemEventSinkVtbl; + interface IWbemEventSink { CONST_VTBL IWbemEventSinkVtbl* lpVtbl; }; @@ -1812,43 +1667,6 @@ static FORCEINLINE HRESULT IWbemEventSink_SetBatchingParameters(IWbemEventSink* #endif -HRESULT STDMETHODCALLTYPE IWbemEventSink_SetSinkSecurity_Proxy( - IWbemEventSink* This, - LONG lSDLength, - BYTE *pSD); -void __RPC_STUB IWbemEventSink_SetSinkSecurity_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemEventSink_IsActive_Proxy( - IWbemEventSink* This); -void __RPC_STUB IWbemEventSink_IsActive_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemEventSink_GetRestrictedSink_Proxy( - IWbemEventSink* This, - LONG lNumQueries, - const LPCWSTR *awszQueries, - IUnknown *pCallback, - IWbemEventSink **ppSink); -void __RPC_STUB IWbemEventSink_GetRestrictedSink_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemEventSink_SetBatchingParameters_Proxy( - IWbemEventSink* This, - LONG lFlags, - DWORD dwMaxBufferSize, - DWORD dwMaxSendLatency); -void __RPC_STUB IWbemEventSink_SetBatchingParameters_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemEventSink_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/wbemtran.h b/lib/libc/include/any-windows-any/wbemtran.h index 6e6280379d..c13219bf42 100644 --- a/lib/libc/include/any-windows-any/wbemtran.h +++ b/lib/libc/include/any-windows-any/wbemtran.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/wbemtran.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/wbemtran.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -56,36 +57,57 @@ typedef struct WbemDCOMTransport WbemDCOMTransport; #ifndef __IWbemLevel1Login_FWD_DEFINED__ #define __IWbemLevel1Login_FWD_DEFINED__ typedef interface IWbemLevel1Login IWbemLevel1Login; +#ifdef __cplusplus +interface IWbemLevel1Login; +#endif /* __cplusplus */ #endif #ifndef __IWbemConnectorLogin_FWD_DEFINED__ #define __IWbemConnectorLogin_FWD_DEFINED__ typedef interface IWbemConnectorLogin IWbemConnectorLogin; +#ifdef __cplusplus +interface IWbemConnectorLogin; +#endif /* __cplusplus */ #endif #ifndef __IWbemAddressResolution_FWD_DEFINED__ #define __IWbemAddressResolution_FWD_DEFINED__ typedef interface IWbemAddressResolution IWbemAddressResolution; +#ifdef __cplusplus +interface IWbemAddressResolution; +#endif /* __cplusplus */ #endif #ifndef __IWbemTransport_FWD_DEFINED__ #define __IWbemTransport_FWD_DEFINED__ typedef interface IWbemTransport IWbemTransport; +#ifdef __cplusplus +interface IWbemTransport; +#endif /* __cplusplus */ #endif #ifndef __IWbemConstructClassObject_FWD_DEFINED__ #define __IWbemConstructClassObject_FWD_DEFINED__ typedef interface IWbemConstructClassObject IWbemConstructClassObject; +#ifdef __cplusplus +interface IWbemConstructClassObject; +#endif /* __cplusplus */ #endif #ifndef __IWbemClientTransport_FWD_DEFINED__ #define __IWbemClientTransport_FWD_DEFINED__ typedef interface IWbemClientTransport IWbemClientTransport; +#ifdef __cplusplus +interface IWbemClientTransport; +#endif /* __cplusplus */ #endif #ifndef __IWbemClientConnectionTransport_FWD_DEFINED__ #define __IWbemClientConnectionTransport_FWD_DEFINED__ typedef interface IWbemClientConnectionTransport IWbemClientConnectionTransport; +#ifdef __cplusplus +interface IWbemClientConnectionTransport; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -110,31 +132,49 @@ extern "C" { #ifndef __IWbemTransport_FWD_DEFINED__ #define __IWbemTransport_FWD_DEFINED__ typedef interface IWbemTransport IWbemTransport; +#ifdef __cplusplus +interface IWbemTransport; +#endif /* __cplusplus */ #endif #ifndef __IWbemLevel1Login_FWD_DEFINED__ #define __IWbemLevel1Login_FWD_DEFINED__ typedef interface IWbemLevel1Login IWbemLevel1Login; +#ifdef __cplusplus +interface IWbemLevel1Login; +#endif /* __cplusplus */ #endif #ifndef __IWbemConnectorLogin_FWD_DEFINED__ #define __IWbemConnectorLogin_FWD_DEFINED__ typedef interface IWbemConnectorLogin IWbemConnectorLogin; +#ifdef __cplusplus +interface IWbemConnectorLogin; +#endif /* __cplusplus */ #endif #ifndef __IWbemAddressResolution_FWD_DEFINED__ #define __IWbemAddressResolution_FWD_DEFINED__ typedef interface IWbemAddressResolution IWbemAddressResolution; +#ifdef __cplusplus +interface IWbemAddressResolution; +#endif /* __cplusplus */ #endif #ifndef __IWbemClientTransport_FWD_DEFINED__ #define __IWbemClientTransport_FWD_DEFINED__ typedef interface IWbemClientTransport IWbemClientTransport; +#ifdef __cplusplus +interface IWbemClientTransport; +#endif /* __cplusplus */ #endif #ifndef __IWbemClientConnectionTransport_FWD_DEFINED__ #define __IWbemClientConnectionTransport_FWD_DEFINED__ typedef interface IWbemClientConnectionTransport IWbemClientConnectionTransport; +#ifdef __cplusplus +interface IWbemClientConnectionTransport; +#endif /* __cplusplus */ #endif typedef enum tag_WBEM_LOGIN_TYPE { @@ -245,31 +285,31 @@ typedef struct IWbemLevel1LoginVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemLevel1Login* This, + IWbemLevel1Login *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemLevel1Login* This); + IWbemLevel1Login *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemLevel1Login* This); + IWbemLevel1Login *This); /*** IWbemLevel1Login methods ***/ HRESULT (STDMETHODCALLTYPE *EstablishPosition)( - IWbemLevel1Login* This, + IWbemLevel1Login *This, LPWSTR wszLocaleList, DWORD dwNumLocales, DWORD *reserved); HRESULT (STDMETHODCALLTYPE *RequestChallenge)( - IWbemLevel1Login* This, + IWbemLevel1Login *This, LPWSTR wszNetworkResource, LPWSTR wszUser, WBEM_128BITS Nonce); HRESULT (STDMETHODCALLTYPE *WBEMLogin)( - IWbemLevel1Login* This, + IWbemLevel1Login *This, LPWSTR wszPreferredLocale, WBEM_128BITS AccessToken, LONG lFlags, @@ -277,7 +317,7 @@ typedef struct IWbemLevel1LoginVtbl { IWbemServices **ppNamespace); HRESULT (STDMETHODCALLTYPE *NTLMLogin)( - IWbemLevel1Login* This, + IWbemLevel1Login *This, LPWSTR wszNetworkResource, LPWSTR wszPreferredLocale, LONG lFlags, @@ -286,6 +326,7 @@ typedef struct IWbemLevel1LoginVtbl { END_INTERFACE } IWbemLevel1LoginVtbl; + interface IWbemLevel1Login { CONST_VTBL IWbemLevel1LoginVtbl* lpVtbl; }; @@ -330,50 +371,6 @@ static FORCEINLINE HRESULT IWbemLevel1Login_NTLMLogin(IWbemLevel1Login* This,LPW #endif -HRESULT STDMETHODCALLTYPE IWbemLevel1Login_EstablishPosition_Proxy( - IWbemLevel1Login* This, - LPWSTR wszLocaleList, - DWORD dwNumLocales, - DWORD *reserved); -void __RPC_STUB IWbemLevel1Login_EstablishPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemLevel1Login_RequestChallenge_Proxy( - IWbemLevel1Login* This, - LPWSTR wszNetworkResource, - LPWSTR wszUser, - WBEM_128BITS Nonce); -void __RPC_STUB IWbemLevel1Login_RequestChallenge_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemLevel1Login_WBEMLogin_Proxy( - IWbemLevel1Login* This, - LPWSTR wszPreferredLocale, - WBEM_128BITS AccessToken, - LONG lFlags, - IWbemContext *pCtx, - IWbemServices **ppNamespace); -void __RPC_STUB IWbemLevel1Login_WBEMLogin_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemLevel1Login_NTLMLogin_Proxy( - IWbemLevel1Login* This, - LPWSTR wszNetworkResource, - LPWSTR wszPreferredLocale, - LONG lFlags, - IWbemContext *pCtx, - IWbemServices **ppNamespace); -void __RPC_STUB IWbemLevel1Login_NTLMLogin_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemLevel1Login_INTERFACE_DEFINED__ */ @@ -406,19 +403,19 @@ typedef struct IWbemConnectorLoginVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemConnectorLogin* This, + IWbemConnectorLogin *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemConnectorLogin* This); + IWbemConnectorLogin *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemConnectorLogin* This); + IWbemConnectorLogin *This); /*** IWbemConnectorLogin methods ***/ HRESULT (STDMETHODCALLTYPE *ConnectorLogin)( - IWbemConnectorLogin* This, + IWbemConnectorLogin *This, LPWSTR wszNetworkResource, LPWSTR wszPreferredLocale, LONG lFlags, @@ -428,6 +425,7 @@ typedef struct IWbemConnectorLoginVtbl { END_INTERFACE } IWbemConnectorLoginVtbl; + interface IWbemConnectorLogin { CONST_VTBL IWbemConnectorLoginVtbl* lpVtbl; }; @@ -460,19 +458,6 @@ static FORCEINLINE HRESULT IWbemConnectorLogin_ConnectorLogin(IWbemConnectorLogi #endif -HRESULT STDMETHODCALLTYPE IWbemConnectorLogin_ConnectorLogin_Proxy( - IWbemConnectorLogin* This, - LPWSTR wszNetworkResource, - LPWSTR wszPreferredLocale, - LONG lFlags, - IWbemContext *pCtx, - REFIID riid, - void **pInterface); -void __RPC_STUB IWbemConnectorLogin_ConnectorLogin_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemConnectorLogin_INTERFACE_DEFINED__ */ @@ -503,19 +488,19 @@ typedef struct IWbemAddressResolutionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemAddressResolution* This, + IWbemAddressResolution *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemAddressResolution* This); + IWbemAddressResolution *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemAddressResolution* This); + IWbemAddressResolution *This); /*** IWbemAddressResolution methods ***/ HRESULT (STDMETHODCALLTYPE *Resolve)( - IWbemAddressResolution* This, + IWbemAddressResolution *This, LPWSTR wszNamespacePath, LPWSTR wszAddressType, DWORD *pdwAddressLength, @@ -523,6 +508,7 @@ typedef struct IWbemAddressResolutionVtbl { END_INTERFACE } IWbemAddressResolutionVtbl; + interface IWbemAddressResolution { CONST_VTBL IWbemAddressResolutionVtbl* lpVtbl; }; @@ -555,17 +541,6 @@ static FORCEINLINE HRESULT IWbemAddressResolution_Resolve(IWbemAddressResolution #endif -HRESULT STDMETHODCALLTYPE IWbemAddressResolution_Resolve_Proxy( - IWbemAddressResolution* This, - LPWSTR wszNamespacePath, - LPWSTR wszAddressType, - DWORD *pdwAddressLength, - BYTE **pabBinaryAddress); -void __RPC_STUB IWbemAddressResolution_Resolve_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemAddressResolution_INTERFACE_DEFINED__ */ @@ -593,22 +568,23 @@ typedef struct IWbemTransportVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemTransport* This, + IWbemTransport *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemTransport* This); + IWbemTransport *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemTransport* This); + IWbemTransport *This); /*** IWbemTransport methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IWbemTransport* This); + IWbemTransport *This); END_INTERFACE } IWbemTransportVtbl; + interface IWbemTransport { CONST_VTBL IWbemTransportVtbl* lpVtbl; }; @@ -641,13 +617,6 @@ static FORCEINLINE HRESULT IWbemTransport_Initialize(IWbemTransport* This) { #endif -HRESULT STDMETHODCALLTYPE IWbemTransport_Initialize_Proxy( - IWbemTransport* This); -void __RPC_STUB IWbemTransport_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemTransport_INTERFACE_DEFINED__ */ @@ -688,39 +657,40 @@ typedef struct IWbemConstructClassObjectVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemConstructClassObject* This, + IWbemConstructClassObject *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemConstructClassObject* This); + IWbemConstructClassObject *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemConstructClassObject* This); + IWbemConstructClassObject *This); /*** IWbemConstructClassObject methods ***/ HRESULT (STDMETHODCALLTYPE *SetInheritanceChain)( - IWbemConstructClassObject* This, + IWbemConstructClassObject *This, LONG lNumAntecedents, LPWSTR *awszAntecedents); HRESULT (STDMETHODCALLTYPE *SetPropertyOrigin)( - IWbemConstructClassObject* This, + IWbemConstructClassObject *This, LPCWSTR wszPropertyName, LONG lOriginIndex); HRESULT (STDMETHODCALLTYPE *SetMethodOrigin)( - IWbemConstructClassObject* This, + IWbemConstructClassObject *This, LPCWSTR wszMethodName, LONG lOriginIndex); HRESULT (STDMETHODCALLTYPE *SetServerNamespace)( - IWbemConstructClassObject* This, + IWbemConstructClassObject *This, LPCWSTR wszServer, LPCWSTR wszNamespace); END_INTERFACE } IWbemConstructClassObjectVtbl; + interface IWbemConstructClassObject { CONST_VTBL IWbemConstructClassObjectVtbl* lpVtbl; }; @@ -765,42 +735,6 @@ static FORCEINLINE HRESULT IWbemConstructClassObject_SetServerNamespace(IWbemCon #endif -HRESULT STDMETHODCALLTYPE IWbemConstructClassObject_SetInheritanceChain_Proxy( - IWbemConstructClassObject* This, - LONG lNumAntecedents, - LPWSTR *awszAntecedents); -void __RPC_STUB IWbemConstructClassObject_SetInheritanceChain_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemConstructClassObject_SetPropertyOrigin_Proxy( - IWbemConstructClassObject* This, - LPCWSTR wszPropertyName, - LONG lOriginIndex); -void __RPC_STUB IWbemConstructClassObject_SetPropertyOrigin_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemConstructClassObject_SetMethodOrigin_Proxy( - IWbemConstructClassObject* This, - LPCWSTR wszMethodName, - LONG lOriginIndex); -void __RPC_STUB IWbemConstructClassObject_SetMethodOrigin_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemConstructClassObject_SetServerNamespace_Proxy( - IWbemConstructClassObject* This, - LPCWSTR wszServer, - LPCWSTR wszNamespace); -void __RPC_STUB IWbemConstructClassObject_SetServerNamespace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemConstructClassObject_INTERFACE_DEFINED__ */ @@ -838,19 +772,19 @@ typedef struct IWbemClientTransportVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemClientTransport* This, + IWbemClientTransport *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemClientTransport* This); + IWbemClientTransport *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemClientTransport* This); + IWbemClientTransport *This); /*** IWbemClientTransport methods ***/ HRESULT (STDMETHODCALLTYPE *ConnectServer)( - IWbemClientTransport* This, + IWbemClientTransport *This, BSTR strAddressType, DWORD dwBinaryAddressLength, BYTE *abBinaryAddress, @@ -865,6 +799,7 @@ typedef struct IWbemClientTransportVtbl { END_INTERFACE } IWbemClientTransportVtbl; + interface IWbemClientTransport { CONST_VTBL IWbemClientTransportVtbl* lpVtbl; }; @@ -897,24 +832,6 @@ static FORCEINLINE HRESULT IWbemClientTransport_ConnectServer(IWbemClientTranspo #endif -HRESULT STDMETHODCALLTYPE IWbemClientTransport_ConnectServer_Proxy( - IWbemClientTransport* This, - BSTR strAddressType, - DWORD dwBinaryAddressLength, - BYTE *abBinaryAddress, - BSTR strNetworkResource, - BSTR strUser, - BSTR strPassword, - BSTR strLocale, - LONG lSecurityFlags, - BSTR strAuthority, - IWbemContext *pCtx, - IWbemServices **ppNamespace); -void __RPC_STUB IWbemClientTransport_ConnectServer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemClientTransport_INTERFACE_DEFINED__ */ @@ -970,19 +887,19 @@ typedef struct IWbemClientConnectionTransportVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWbemClientConnectionTransport* This, + IWbemClientConnectionTransport *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWbemClientConnectionTransport* This); + IWbemClientConnectionTransport *This); ULONG (STDMETHODCALLTYPE *Release)( - IWbemClientConnectionTransport* This); + IWbemClientConnectionTransport *This); /*** IWbemClientConnectionTransport methods ***/ HRESULT (STDMETHODCALLTYPE *Open)( - IWbemClientConnectionTransport* This, + IWbemClientConnectionTransport *This, BSTR strAddressType, DWORD dwBinaryAddressLength, BYTE *abBinaryAddress, @@ -997,7 +914,7 @@ typedef struct IWbemClientConnectionTransportVtbl { IWbemCallResult **pCallRes); HRESULT (STDMETHODCALLTYPE *OpenAsync)( - IWbemClientConnectionTransport* This, + IWbemClientConnectionTransport *This, BSTR strAddressType, DWORD dwBinaryAddressLength, BYTE *abBinaryAddress, @@ -1011,12 +928,13 @@ typedef struct IWbemClientConnectionTransportVtbl { IWbemObjectSink *pResponseHandler); HRESULT (STDMETHODCALLTYPE *Cancel)( - IWbemClientConnectionTransport* This, + IWbemClientConnectionTransport *This, LONG lFlags, IWbemObjectSink *pHandler); END_INTERFACE } IWbemClientConnectionTransportVtbl; + interface IWbemClientConnectionTransport { CONST_VTBL IWbemClientConnectionTransportVtbl* lpVtbl; }; @@ -1057,52 +975,6 @@ static FORCEINLINE HRESULT IWbemClientConnectionTransport_Cancel(IWbemClientConn #endif -HRESULT STDMETHODCALLTYPE IWbemClientConnectionTransport_Open_Proxy( - IWbemClientConnectionTransport* This, - BSTR strAddressType, - DWORD dwBinaryAddressLength, - BYTE *abBinaryAddress, - const BSTR strObject, - const BSTR strUser, - const BSTR strPassword, - const BSTR strLocale, - LONG lFlags, - IWbemContext *pCtx, - REFIID riid, - void **pInterface, - IWbemCallResult **pCallRes); -void __RPC_STUB IWbemClientConnectionTransport_Open_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClientConnectionTransport_OpenAsync_Proxy( - IWbemClientConnectionTransport* This, - BSTR strAddressType, - DWORD dwBinaryAddressLength, - BYTE *abBinaryAddress, - const BSTR strObject, - const BSTR strUser, - const BSTR strPassword, - const BSTR strLocale, - LONG lFlags, - IWbemContext *pCtx, - REFIID riid, - IWbemObjectSink *pResponseHandler); -void __RPC_STUB IWbemClientConnectionTransport_OpenAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWbemClientConnectionTransport_Cancel_Proxy( - IWbemClientConnectionTransport* This, - LONG lFlags, - IWbemObjectSink *pHandler); -void __RPC_STUB IWbemClientConnectionTransport_Cancel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWbemClientConnectionTransport_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/wchar.h b/lib/libc/include/any-windows-any/wchar.h index ce041ade8a..eaaadec3a0 100644 --- a/lib/libc/include/any-windows-any/wchar.h +++ b/lib/libc/include/any-windows-any/wchar.h @@ -6,10 +6,10 @@ #ifndef _INC_WCHAR #define _INC_WCHAR -#include -#include <_mingw_print_push.h> +#include +#include -#if defined (__USE_MINGW_ANSI_STDIO) && ((__USE_MINGW_ANSI_STDIO + 0) != 0) && !defined (__USE_MINGW_STRTOX) +#if __USE_MINGW_ANSI_STDIO && !defined (__USE_MINGW_STRTOX) #define __USE_MINGW_STRTOX 1 #endif @@ -168,7 +168,7 @@ extern FILE (* __MINGW_IMP_SYMBOL(_iob))[]; /* A pointer to an array of FILE */ #ifdef _MSVCRT_ #define __pctype_func() (_pctype) #else -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT _CRTIMP unsigned short* __pctype_func(void); #else #define __pctype_func() (* __MINGW_IMP_SYMBOL(_pctype)) @@ -180,7 +180,7 @@ extern FILE (* __MINGW_IMP_SYMBOL(_iob))[]; /* A pointer to an array of FILE */ #ifdef _MSVCRT_ extern unsigned short *_pctype; #else -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT #define _pctype (__pctype_func()) #else extern unsigned short ** __MINGW_IMP_SYMBOL(_pctype); @@ -234,7 +234,7 @@ extern FILE (* __MINGW_IMP_SYMBOL(_iob))[]; /* A pointer to an array of FILE */ #define _LEADBYTE 0x8000 #define _ALPHA (0x0100|_UPPER|_LOWER) -#if !defined(_UCRTBASE_STDIO_DEFINED) && __MSVCRT_VERSION__ >= 0x1400 +#if !defined(_UCRTBASE_STDIO_DEFINED) && defined(_UCRT) #define _UCRTBASE_STDIO_DEFINED #define UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION (0x0001) @@ -247,12 +247,13 @@ extern FILE (* __MINGW_IMP_SYMBOL(_iob))[]; /* A pointer to an array of FILE */ #define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) #define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) -// Default wide printfs and scanfs to the standard mode +// Default wide printfs and scanfs to the legacy wide mode. Only code built +// with -D__USE_MINGW_ANSI_STDIO=1 will expect the standard behaviour. #ifndef UCRTBASE_PRINTF_DEFAULT_WIDE -#define UCRTBASE_PRINTF_DEFAULT_WIDE 0 +#define UCRTBASE_PRINTF_DEFAULT_WIDE UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS #endif #ifndef UCRTBASE_SCANF_DEFAULT_WIDE -#define UCRTBASE_SCANF_DEFAULT_WIDE 0 +#define UCRTBASE_SCANF_DEFAULT_WIDE UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS #endif #endif @@ -497,7 +498,7 @@ extern FILE (* __MINGW_IMP_SYMBOL(_iob))[]; /* A pointer to an array of FILE */ /* __attribute__((__format__ (gnu_wprintf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2) int __cdecl __mingw_vswprintf(wchar_t * __restrict__ , const wchar_t * __restrict__ ,va_list); -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT int __cdecl __stdio_common_vswprintf(unsigned __int64 options, wchar_t *str, size_t len, const wchar_t *format, _locale_t locale, va_list valist); int __cdecl __stdio_common_vfwprintf(unsigned __int64 options, FILE *file, const wchar_t *format, _locale_t locale, va_list valist); int __cdecl __stdio_common_vswscanf(unsigned __int64 options, const wchar_t *input, size_t length, const wchar_t *format, _locale_t locale, va_list valist); @@ -637,7 +638,7 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti /* #endif */ /* __NO_ISOCEXT */ #else /* !__USE_MINGW_ANSI_STDIO */ -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT __mingw_ovr int __cdecl fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN { @@ -754,7 +755,7 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti int __cdecl wprintf(const wchar_t * __restrict__ _Format,...); int __cdecl vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList); int __cdecl vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList); -#endif /* __MSVCRT_VERSION__ >= 0x1400 */ +#endif /* _UCRT */ #endif /* __USE_MINGW_ANSI_STDIO */ @@ -782,7 +783,7 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti _CRTIMP wchar_t *__cdecl _getws(wchar_t *_String) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP int __cdecl _putws(const wchar_t *_Str); -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT __mingw_ovr int __cdecl _scwprintf(const wchar_t * __restrict__ _Format,...) { @@ -809,7 +810,7 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti return __stdio_common_vswprintf(UCRTBASE_PRINTF_DEFAULT_WIDE | UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, _Dest, _Count, _Format, NULL, _Args); } -#if !defined (__USE_MINGW_ANSI_STDIO) || __USE_MINGW_ANSI_STDIO == 0 +#if __USE_MINGW_ANSI_STDIO == 0 __mingw_ovr int snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...) { @@ -837,7 +838,7 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti #ifndef __NO_ISOCEXT /* externs in libmingwex.a */ -#if !defined (__USE_MINGW_ANSI_STDIO) || __USE_MINGW_ANSI_STDIO == 0 +#if __USE_MINGW_ANSI_STDIO == 0 #pragma push_macro("snwprintf") #pragma push_macro("vsnwprintf") # undef snwprintf @@ -863,12 +864,12 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti #pragma pop_macro ("snwprintf") #endif -#endif /* __MSVCRT_VERSION__ >= 0x1400 */ +#endif /* _UCRT */ #endif /* _WSTDIO_DEFINED */ -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT int __cdecl __stdio_common_vswprintf_p(unsigned __int64 _Options, wchar_t *_Str, size_t _Len, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); int __cdecl __stdio_common_vfwprintf_p(unsigned __int64 _Options, FILE *_File, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); @@ -1141,7 +1142,7 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti __builtin_va_end(_ArgList); return _Ret; } -#else /* __MSVCRT_VERSION__ >= 0x1400 */ +#else /* _UCRT */ _CRTIMP int __cdecl _fwprintf_p(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...); _CRTIMP int __cdecl _wprintf_p(const wchar_t * __restrict__ _Format,...); _CRTIMP int __cdecl _vfwprintf_p(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList); @@ -1172,7 +1173,7 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti _CRTIMP int __cdecl __swprintf_l(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Format,_locale_t _Plocinfo,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP int __cdecl _vswprintf_l(wchar_t * __restrict__ _Dest,size_t _MaxCount,const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP int __cdecl __vswprintf_l(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Format,_locale_t _Plocinfo,va_list _Args) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; -#endif /* __MSVCRT_VERSION__ < 0x1400 */ +#endif /* !_UCRT */ #ifndef RC_INVOKED #include @@ -1186,7 +1187,7 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti #endif _CRTIMP wchar_t *__cdecl _wtempnam(const wchar_t *_Directory,const wchar_t *_FilePrefix); -#if __MSVCRT_VERSION__ < 0x1400 +#ifndef _UCRT _CRTIMP int __cdecl _vscwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList); _CRTIMP int __cdecl _vscwprintf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); _CRTIMP int __cdecl _fwscanf_l(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,_locale_t _Locale,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; @@ -1194,7 +1195,7 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti _CRTIMP int __cdecl _snwscanf(const wchar_t * __restrict__ _Src,size_t _MaxCount,const wchar_t * __restrict__ _Format,...); _CRTIMP int __cdecl _snwscanf_l(const wchar_t * __restrict__ _Src,size_t _MaxCount,const wchar_t * __restrict__ _Format,_locale_t _Locale,...); _CRTIMP int __cdecl _wscanf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; -#endif /* __MSVCRT_VERSION__ < 0x1400 */ +#endif /* !_UCRT */ _CRTIMP FILE *__cdecl _wfdopen(int _FileHandle ,const wchar_t *_Mode); _CRTIMP FILE *__cdecl _wfopen(const wchar_t * __restrict__ _Filename,const wchar_t * __restrict__ _Mode) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP FILE *__cdecl _wfreopen(const wchar_t * __restrict__ _Filename,const wchar_t * __restrict__ _Mode,FILE * __restrict__ _OldFile) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; @@ -1413,7 +1414,15 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti #endif +#if defined(_UCRT) || defined(__LARGE_MBSTATE_T) + typedef struct _Mbstatet { + unsigned long _Wchar; + unsigned short _Byte, _State; + } _Mbstatet; + typedef _Mbstatet mbstate_t; +#else typedef int mbstate_t; +#endif typedef wchar_t _Wint_t; wint_t __cdecl btowc(int); @@ -1432,7 +1441,12 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti wchar_t * __cdecl wmempcpy (wchar_t *_Dst, const wchar_t *_Src, size_t _Size); wchar_t *__cdecl wmemmove(wchar_t *s1, const wchar_t *s2, size_t n) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; int __cdecl fwide(FILE *stream,int mode); +#if defined(_UCRT) || defined(__LARGE_MBSTATE_T) + /* With UCRT, mbsinit is only available as inline. */ + __mingw_static_ovr int __cdecl mbsinit(const mbstate_t *_P) { return (!_P || _P->_Wchar == 0); } +#else int __cdecl mbsinit(const mbstate_t *ps); +#endif __MINGW_EXTENSION long long __cdecl wcstoll(const wchar_t * __restrict__ nptr,wchar_t ** __restrict__ endptr, int base); __MINGW_EXTENSION unsigned long long __cdecl wcstoull(const wchar_t * __restrict__ nptr,wchar_t ** __restrict__ endptr, int base); #endif /* __NO_ISOCEXT */ @@ -1441,7 +1455,9 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti void *__cdecl memcpy(void * __restrict__ _Dst,const void * __restrict__ _Src,size_t _MaxCount) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; #ifndef __CRT__NO_INLINE __CRT_INLINE int __cdecl fwide(FILE *_F,int _M) { (void)_F; return (_M); } +#if !defined(_UCRT) && !defined(__LARGE_MBSTATE_T) __CRT_INLINE int __cdecl mbsinit(const mbstate_t *_P) { return (!_P || *_P==0); } +#endif __CRT_INLINE _CONST_RETURN wchar_t *__cdecl wmemchr(const wchar_t *_S,wchar_t _C,size_t _N) { if (_S) { for ( ; 0 < _N; ++_S, --_N) @@ -1523,7 +1539,5 @@ void __cdecl __mingw_str_free(void *ptr); #include -#include <_mingw_print_pop.h> - #endif /* _INC_WCHAR */ diff --git a/lib/libc/include/any-windows-any/wctype.h b/lib/libc/include/any-windows-any/wctype.h index c89c5d2981..8b1caa6392 100644 --- a/lib/libc/include/any-windows-any/wctype.h +++ b/lib/libc/include/any-windows-any/wctype.h @@ -48,7 +48,7 @@ extern "C" { #ifdef _MSVCRT_ #define __pctype_func() (_pctype) #else -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT _CRTIMP unsigned short* __pctype_func(void); #else #define __pctype_func() (* __MINGW_IMP_SYMBOL(_pctype)) @@ -60,7 +60,7 @@ extern "C" { #ifdef _MSVCRT_ extern unsigned short *_pctype; #else -#if __MSVCRT_VERSION__ >= 0x1400 +#ifdef _UCRT #define _pctype (__pctype_func()) #else extern unsigned short ** __MINGW_IMP_SYMBOL(_pctype); diff --git a/lib/libc/include/any-windows-any/wdstptmgmt.h b/lib/libc/include/any-windows-any/wdstptmgmt.h index 2ee7f93ce2..bef2508104 100644 --- a/lib/libc/include/any-windows-any/wdstptmgmt.h +++ b/lib/libc/include/any-windows-any/wdstptmgmt.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/wdstptmgmt.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/wdstptmgmt.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,126 +21,201 @@ #ifndef __IWdsTransportCacheable_FWD_DEFINED__ #define __IWdsTransportCacheable_FWD_DEFINED__ typedef interface IWdsTransportCacheable IWdsTransportCacheable; +#ifdef __cplusplus +interface IWdsTransportCacheable; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportCollection_FWD_DEFINED__ #define __IWdsTransportCollection_FWD_DEFINED__ typedef interface IWdsTransportCollection IWdsTransportCollection; +#ifdef __cplusplus +interface IWdsTransportCollection; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportConfigurationManager_FWD_DEFINED__ #define __IWdsTransportConfigurationManager_FWD_DEFINED__ typedef interface IWdsTransportConfigurationManager IWdsTransportConfigurationManager; +#ifdef __cplusplus +interface IWdsTransportConfigurationManager; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportDiagnosticsPolicy_FWD_DEFINED__ #define __IWdsTransportDiagnosticsPolicy_FWD_DEFINED__ typedef interface IWdsTransportDiagnosticsPolicy IWdsTransportDiagnosticsPolicy; +#ifdef __cplusplus +interface IWdsTransportDiagnosticsPolicy; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportConfigurationManager2_FWD_DEFINED__ #define __IWdsTransportConfigurationManager2_FWD_DEFINED__ typedef interface IWdsTransportConfigurationManager2 IWdsTransportConfigurationManager2; +#ifdef __cplusplus +interface IWdsTransportConfigurationManager2; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportManager_FWD_DEFINED__ #define __IWdsTransportManager_FWD_DEFINED__ typedef interface IWdsTransportManager IWdsTransportManager; +#ifdef __cplusplus +interface IWdsTransportManager; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportNamespace_FWD_DEFINED__ #define __IWdsTransportNamespace_FWD_DEFINED__ typedef interface IWdsTransportNamespace IWdsTransportNamespace; +#ifdef __cplusplus +interface IWdsTransportNamespace; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportNamespaceAutoCast_FWD_DEFINED__ #define __IWdsTransportNamespaceAutoCast_FWD_DEFINED__ typedef interface IWdsTransportNamespaceAutoCast IWdsTransportNamespaceAutoCast; +#ifdef __cplusplus +interface IWdsTransportNamespaceAutoCast; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportNamespaceScheduledCast_FWD_DEFINED__ #define __IWdsTransportNamespaceScheduledCast_FWD_DEFINED__ typedef interface IWdsTransportNamespaceScheduledCast IWdsTransportNamespaceScheduledCast; +#ifdef __cplusplus +interface IWdsTransportNamespaceScheduledCast; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportNamespaceScheduledCastManualStart_FWD_DEFINED__ #define __IWdsTransportNamespaceScheduledCastManualStart_FWD_DEFINED__ typedef interface IWdsTransportNamespaceScheduledCastManualStart IWdsTransportNamespaceScheduledCastManualStart; +#ifdef __cplusplus +interface IWdsTransportNamespaceScheduledCastManualStart; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportNamespaceScheduledCastAutoStart_FWD_DEFINED__ #define __IWdsTransportNamespaceScheduledCastAutoStart_FWD_DEFINED__ typedef interface IWdsTransportNamespaceScheduledCastAutoStart IWdsTransportNamespaceScheduledCastAutoStart; +#ifdef __cplusplus +interface IWdsTransportNamespaceScheduledCastAutoStart; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportNamespaceManager_FWD_DEFINED__ #define __IWdsTransportNamespaceManager_FWD_DEFINED__ typedef interface IWdsTransportNamespaceManager IWdsTransportNamespaceManager; +#ifdef __cplusplus +interface IWdsTransportNamespaceManager; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportServer_FWD_DEFINED__ #define __IWdsTransportServer_FWD_DEFINED__ typedef interface IWdsTransportServer IWdsTransportServer; +#ifdef __cplusplus +interface IWdsTransportServer; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportServer2_FWD_DEFINED__ #define __IWdsTransportServer2_FWD_DEFINED__ typedef interface IWdsTransportServer2 IWdsTransportServer2; +#ifdef __cplusplus +interface IWdsTransportServer2; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportServicePolicy_FWD_DEFINED__ #define __IWdsTransportServicePolicy_FWD_DEFINED__ typedef interface IWdsTransportServicePolicy IWdsTransportServicePolicy; +#ifdef __cplusplus +interface IWdsTransportServicePolicy; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportServicePolicy2_FWD_DEFINED__ #define __IWdsTransportServicePolicy2_FWD_DEFINED__ typedef interface IWdsTransportServicePolicy2 IWdsTransportServicePolicy2; +#ifdef __cplusplus +interface IWdsTransportServicePolicy2; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportSetupManager_FWD_DEFINED__ #define __IWdsTransportSetupManager_FWD_DEFINED__ typedef interface IWdsTransportSetupManager IWdsTransportSetupManager; +#ifdef __cplusplus +interface IWdsTransportSetupManager; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportSetupManager2_FWD_DEFINED__ #define __IWdsTransportSetupManager2_FWD_DEFINED__ typedef interface IWdsTransportSetupManager2 IWdsTransportSetupManager2; +#ifdef __cplusplus +interface IWdsTransportSetupManager2; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportTftpManager_FWD_DEFINED__ #define __IWdsTransportTftpManager_FWD_DEFINED__ typedef interface IWdsTransportTftpManager IWdsTransportTftpManager; +#ifdef __cplusplus +interface IWdsTransportTftpManager; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportMulticastSessionPolicy_FWD_DEFINED__ #define __IWdsTransportMulticastSessionPolicy_FWD_DEFINED__ typedef interface IWdsTransportMulticastSessionPolicy IWdsTransportMulticastSessionPolicy; +#ifdef __cplusplus +interface IWdsTransportMulticastSessionPolicy; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportContent_FWD_DEFINED__ #define __IWdsTransportContent_FWD_DEFINED__ typedef interface IWdsTransportContent IWdsTransportContent; +#ifdef __cplusplus +interface IWdsTransportContent; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportSession_FWD_DEFINED__ #define __IWdsTransportSession_FWD_DEFINED__ typedef interface IWdsTransportSession IWdsTransportSession; +#ifdef __cplusplus +interface IWdsTransportSession; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportClient_FWD_DEFINED__ #define __IWdsTransportClient_FWD_DEFINED__ typedef interface IWdsTransportClient IWdsTransportClient; +#ifdef __cplusplus +interface IWdsTransportClient; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportTftpClient_FWD_DEFINED__ #define __IWdsTransportTftpClient_FWD_DEFINED__ typedef interface IWdsTransportTftpClient IWdsTransportTftpClient; +#ifdef __cplusplus +interface IWdsTransportTftpClient; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportContentProvider_FWD_DEFINED__ #define __IWdsTransportContentProvider_FWD_DEFINED__ typedef interface IWdsTransportContentProvider IWdsTransportContentProvider; +#ifdef __cplusplus +interface IWdsTransportContentProvider; +#endif /* __cplusplus */ #endif #ifndef __WdsTransportCacheable_FWD_DEFINED__ @@ -348,126 +424,201 @@ extern "C" { #ifndef __IWdsTransportCacheable_FWD_DEFINED__ #define __IWdsTransportCacheable_FWD_DEFINED__ typedef interface IWdsTransportCacheable IWdsTransportCacheable; +#ifdef __cplusplus +interface IWdsTransportCacheable; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportClient_FWD_DEFINED__ #define __IWdsTransportClient_FWD_DEFINED__ typedef interface IWdsTransportClient IWdsTransportClient; +#ifdef __cplusplus +interface IWdsTransportClient; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportCollection_FWD_DEFINED__ #define __IWdsTransportCollection_FWD_DEFINED__ typedef interface IWdsTransportCollection IWdsTransportCollection; +#ifdef __cplusplus +interface IWdsTransportCollection; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportConfigurationManager_FWD_DEFINED__ #define __IWdsTransportConfigurationManager_FWD_DEFINED__ typedef interface IWdsTransportConfigurationManager IWdsTransportConfigurationManager; +#ifdef __cplusplus +interface IWdsTransportConfigurationManager; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportConfigurationManager2_FWD_DEFINED__ #define __IWdsTransportConfigurationManager2_FWD_DEFINED__ typedef interface IWdsTransportConfigurationManager2 IWdsTransportConfigurationManager2; +#ifdef __cplusplus +interface IWdsTransportConfigurationManager2; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportContent_FWD_DEFINED__ #define __IWdsTransportContent_FWD_DEFINED__ typedef interface IWdsTransportContent IWdsTransportContent; +#ifdef __cplusplus +interface IWdsTransportContent; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportContentProvider_FWD_DEFINED__ #define __IWdsTransportContentProvider_FWD_DEFINED__ typedef interface IWdsTransportContentProvider IWdsTransportContentProvider; +#ifdef __cplusplus +interface IWdsTransportContentProvider; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportDiagnosticsPolicy_FWD_DEFINED__ #define __IWdsTransportDiagnosticsPolicy_FWD_DEFINED__ typedef interface IWdsTransportDiagnosticsPolicy IWdsTransportDiagnosticsPolicy; +#ifdef __cplusplus +interface IWdsTransportDiagnosticsPolicy; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportManager_FWD_DEFINED__ #define __IWdsTransportManager_FWD_DEFINED__ typedef interface IWdsTransportManager IWdsTransportManager; +#ifdef __cplusplus +interface IWdsTransportManager; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportNamespace_FWD_DEFINED__ #define __IWdsTransportNamespace_FWD_DEFINED__ typedef interface IWdsTransportNamespace IWdsTransportNamespace; +#ifdef __cplusplus +interface IWdsTransportNamespace; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportNamespaceAutoCast_FWD_DEFINED__ #define __IWdsTransportNamespaceAutoCast_FWD_DEFINED__ typedef interface IWdsTransportNamespaceAutoCast IWdsTransportNamespaceAutoCast; +#ifdef __cplusplus +interface IWdsTransportNamespaceAutoCast; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportNamespaceManager_FWD_DEFINED__ #define __IWdsTransportNamespaceManager_FWD_DEFINED__ typedef interface IWdsTransportNamespaceManager IWdsTransportNamespaceManager; +#ifdef __cplusplus +interface IWdsTransportNamespaceManager; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportNamespaceScheduledCast_FWD_DEFINED__ #define __IWdsTransportNamespaceScheduledCast_FWD_DEFINED__ typedef interface IWdsTransportNamespaceScheduledCast IWdsTransportNamespaceScheduledCast; +#ifdef __cplusplus +interface IWdsTransportNamespaceScheduledCast; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportNamespaceScheduledCastAutoStart_FWD_DEFINED__ #define __IWdsTransportNamespaceScheduledCastAutoStart_FWD_DEFINED__ typedef interface IWdsTransportNamespaceScheduledCastAutoStart IWdsTransportNamespaceScheduledCastAutoStart; +#ifdef __cplusplus +interface IWdsTransportNamespaceScheduledCastAutoStart; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportNamespaceScheduledCastManualStart_FWD_DEFINED__ #define __IWdsTransportNamespaceScheduledCastManualStart_FWD_DEFINED__ typedef interface IWdsTransportNamespaceScheduledCastManualStart IWdsTransportNamespaceScheduledCastManualStart; +#ifdef __cplusplus +interface IWdsTransportNamespaceScheduledCastManualStart; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportServer_FWD_DEFINED__ #define __IWdsTransportServer_FWD_DEFINED__ typedef interface IWdsTransportServer IWdsTransportServer; +#ifdef __cplusplus +interface IWdsTransportServer; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportServer2_FWD_DEFINED__ #define __IWdsTransportServer2_FWD_DEFINED__ typedef interface IWdsTransportServer2 IWdsTransportServer2; +#ifdef __cplusplus +interface IWdsTransportServer2; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportServicePolicy_FWD_DEFINED__ #define __IWdsTransportServicePolicy_FWD_DEFINED__ typedef interface IWdsTransportServicePolicy IWdsTransportServicePolicy; +#ifdef __cplusplus +interface IWdsTransportServicePolicy; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportServicePolicy2_FWD_DEFINED__ #define __IWdsTransportServicePolicy2_FWD_DEFINED__ typedef interface IWdsTransportServicePolicy2 IWdsTransportServicePolicy2; +#ifdef __cplusplus +interface IWdsTransportServicePolicy2; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportSetupManager_FWD_DEFINED__ #define __IWdsTransportSetupManager_FWD_DEFINED__ typedef interface IWdsTransportSetupManager IWdsTransportSetupManager; +#ifdef __cplusplus +interface IWdsTransportSetupManager; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportSetupManager2_FWD_DEFINED__ #define __IWdsTransportSetupManager2_FWD_DEFINED__ typedef interface IWdsTransportSetupManager2 IWdsTransportSetupManager2; +#ifdef __cplusplus +interface IWdsTransportSetupManager2; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportTftpManager_FWD_DEFINED__ #define __IWdsTransportTftpManager_FWD_DEFINED__ typedef interface IWdsTransportTftpManager IWdsTransportTftpManager; +#ifdef __cplusplus +interface IWdsTransportTftpManager; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportMulticastSessionPolicy_FWD_DEFINED__ #define __IWdsTransportMulticastSessionPolicy_FWD_DEFINED__ typedef interface IWdsTransportMulticastSessionPolicy IWdsTransportMulticastSessionPolicy; +#ifdef __cplusplus +interface IWdsTransportMulticastSessionPolicy; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportSession_FWD_DEFINED__ #define __IWdsTransportSession_FWD_DEFINED__ typedef interface IWdsTransportSession IWdsTransportSession; +#ifdef __cplusplus +interface IWdsTransportSession; +#endif /* __cplusplus */ #endif #ifndef __IWdsTransportTftpClient_FWD_DEFINED__ #define __IWdsTransportTftpClient_FWD_DEFINED__ typedef interface IWdsTransportTftpClient IWdsTransportTftpClient; +#ifdef __cplusplus +interface IWdsTransportTftpClient; +#endif /* __cplusplus */ #endif @@ -595,29 +746,29 @@ typedef struct IWdsTransportCacheableVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportCacheable* This, + IWdsTransportCacheable *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportCacheable* This); + IWdsTransportCacheable *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportCacheable* This); + IWdsTransportCacheable *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportCacheable* This, + IWdsTransportCacheable *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportCacheable* This, + IWdsTransportCacheable *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportCacheable* This, + IWdsTransportCacheable *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -625,7 +776,7 @@ typedef struct IWdsTransportCacheableVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportCacheable* This, + IWdsTransportCacheable *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -637,20 +788,21 @@ typedef struct IWdsTransportCacheableVtbl { /*** IWdsTransportCacheable methods ***/ HRESULT (STDMETHODCALLTYPE *get_Dirty)( - IWdsTransportCacheable* This, + IWdsTransportCacheable *This, VARIANT_BOOL *pbDirty); HRESULT (STDMETHODCALLTYPE *Discard)( - IWdsTransportCacheable* This); + IWdsTransportCacheable *This); HRESULT (STDMETHODCALLTYPE *Refresh)( - IWdsTransportCacheable* This); + IWdsTransportCacheable *This); HRESULT (STDMETHODCALLTYPE *Commit)( - IWdsTransportCacheable* This); + IWdsTransportCacheable *This); END_INTERFACE } IWdsTransportCacheableVtbl; + interface IWdsTransportCacheable { CONST_VTBL IWdsTransportCacheableVtbl* lpVtbl; }; @@ -713,35 +865,6 @@ static FORCEINLINE HRESULT IWdsTransportCacheable_Commit(IWdsTransportCacheable* #endif -HRESULT STDMETHODCALLTYPE IWdsTransportCacheable_get_Dirty_Proxy( - IWdsTransportCacheable* This, - VARIANT_BOOL *pbDirty); -void __RPC_STUB IWdsTransportCacheable_get_Dirty_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportCacheable_Discard_Proxy( - IWdsTransportCacheable* This); -void __RPC_STUB IWdsTransportCacheable_Discard_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportCacheable_Refresh_Proxy( - IWdsTransportCacheable* This); -void __RPC_STUB IWdsTransportCacheable_Refresh_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportCacheable_Commit_Proxy( - IWdsTransportCacheable* This); -void __RPC_STUB IWdsTransportCacheable_Commit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWdsTransportCacheable_INTERFACE_DEFINED__ */ @@ -777,29 +900,29 @@ typedef struct IWdsTransportCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportCollection* This, + IWdsTransportCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportCollection* This); + IWdsTransportCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportCollection* This); + IWdsTransportCollection *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportCollection* This, + IWdsTransportCollection *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportCollection* This, + IWdsTransportCollection *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportCollection* This, + IWdsTransportCollection *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -807,7 +930,7 @@ typedef struct IWdsTransportCollectionVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportCollection* This, + IWdsTransportCollection *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -819,20 +942,21 @@ typedef struct IWdsTransportCollectionVtbl { /*** IWdsTransportCollection methods ***/ HRESULT (STDMETHODCALLTYPE *get_Count)( - IWdsTransportCollection* This, + IWdsTransportCollection *This, ULONG *pulCount); HRESULT (STDMETHODCALLTYPE *get_Item)( - IWdsTransportCollection* This, + IWdsTransportCollection *This, ULONG ulIndex, IDispatch **ppVal); HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - IWdsTransportCollection* This, + IWdsTransportCollection *This, IUnknown **ppVal); END_INTERFACE } IWdsTransportCollectionVtbl; + interface IWdsTransportCollection { CONST_VTBL IWdsTransportCollectionVtbl* lpVtbl; }; @@ -891,31 +1015,6 @@ static FORCEINLINE HRESULT IWdsTransportCollection_get__NewEnum(IWdsTransportCol #endif -HRESULT STDMETHODCALLTYPE IWdsTransportCollection_get_Count_Proxy( - IWdsTransportCollection* This, - ULONG *pulCount); -void __RPC_STUB IWdsTransportCollection_get_Count_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportCollection_get_Item_Proxy( - IWdsTransportCollection* This, - ULONG ulIndex, - IDispatch **ppVal); -void __RPC_STUB IWdsTransportCollection_get_Item_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportCollection_get__NewEnum_Proxy( - IWdsTransportCollection* This, - IUnknown **ppVal); -void __RPC_STUB IWdsTransportCollection_get__NewEnum_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWdsTransportCollection_INTERFACE_DEFINED__ */ @@ -969,29 +1068,29 @@ typedef struct IWdsTransportConfigurationManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportConfigurationManager* This, + IWdsTransportConfigurationManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportConfigurationManager* This); + IWdsTransportConfigurationManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportConfigurationManager* This); + IWdsTransportConfigurationManager *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportConfigurationManager* This, + IWdsTransportConfigurationManager *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportConfigurationManager* This, + IWdsTransportConfigurationManager *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportConfigurationManager* This, + IWdsTransportConfigurationManager *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -999,7 +1098,7 @@ typedef struct IWdsTransportConfigurationManagerVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportConfigurationManager* This, + IWdsTransportConfigurationManager *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1011,39 +1110,40 @@ typedef struct IWdsTransportConfigurationManagerVtbl { /*** IWdsTransportConfigurationManager methods ***/ HRESULT (STDMETHODCALLTYPE *get_ServicePolicy)( - IWdsTransportConfigurationManager* This, + IWdsTransportConfigurationManager *This, IWdsTransportServicePolicy **ppWdsTransportServicePolicy); HRESULT (STDMETHODCALLTYPE *get_DiagnosticsPolicy)( - IWdsTransportConfigurationManager* This, + IWdsTransportConfigurationManager *This, IWdsTransportDiagnosticsPolicy **ppWdsTransportDiagnosticsPolicy); HRESULT (STDMETHODCALLTYPE *get_WdsTransportServicesRunning)( - IWdsTransportConfigurationManager* This, + IWdsTransportConfigurationManager *This, VARIANT_BOOL bRealtimeStatus, VARIANT_BOOL *pbServicesRunning); HRESULT (STDMETHODCALLTYPE *EnableWdsTransportServices)( - IWdsTransportConfigurationManager* This); + IWdsTransportConfigurationManager *This); HRESULT (STDMETHODCALLTYPE *DisableWdsTransportServices)( - IWdsTransportConfigurationManager* This); + IWdsTransportConfigurationManager *This); HRESULT (STDMETHODCALLTYPE *StartWdsTransportServices)( - IWdsTransportConfigurationManager* This); + IWdsTransportConfigurationManager *This); HRESULT (STDMETHODCALLTYPE *StopWdsTransportServices)( - IWdsTransportConfigurationManager* This); + IWdsTransportConfigurationManager *This); HRESULT (STDMETHODCALLTYPE *RestartWdsTransportServices)( - IWdsTransportConfigurationManager* This); + IWdsTransportConfigurationManager *This); HRESULT (STDMETHODCALLTYPE *NotifyWdsTransportServices)( - IWdsTransportConfigurationManager* This, + IWdsTransportConfigurationManager *This, WDSTRANSPORT_SERVICE_NOTIFICATION ServiceNotification); END_INTERFACE } IWdsTransportConfigurationManagerVtbl; + interface IWdsTransportConfigurationManager { CONST_VTBL IWdsTransportConfigurationManagerVtbl* lpVtbl; }; @@ -1126,74 +1226,6 @@ static FORCEINLINE HRESULT IWdsTransportConfigurationManager_NotifyWdsTransportS #endif -HRESULT STDMETHODCALLTYPE IWdsTransportConfigurationManager_get_ServicePolicy_Proxy( - IWdsTransportConfigurationManager* This, - IWdsTransportServicePolicy **ppWdsTransportServicePolicy); -void __RPC_STUB IWdsTransportConfigurationManager_get_ServicePolicy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportConfigurationManager_get_DiagnosticsPolicy_Proxy( - IWdsTransportConfigurationManager* This, - IWdsTransportDiagnosticsPolicy **ppWdsTransportDiagnosticsPolicy); -void __RPC_STUB IWdsTransportConfigurationManager_get_DiagnosticsPolicy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportConfigurationManager_get_WdsTransportServicesRunning_Proxy( - IWdsTransportConfigurationManager* This, - VARIANT_BOOL bRealtimeStatus, - VARIANT_BOOL *pbServicesRunning); -void __RPC_STUB IWdsTransportConfigurationManager_get_WdsTransportServicesRunning_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportConfigurationManager_EnableWdsTransportServices_Proxy( - IWdsTransportConfigurationManager* This); -void __RPC_STUB IWdsTransportConfigurationManager_EnableWdsTransportServices_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportConfigurationManager_DisableWdsTransportServices_Proxy( - IWdsTransportConfigurationManager* This); -void __RPC_STUB IWdsTransportConfigurationManager_DisableWdsTransportServices_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportConfigurationManager_StartWdsTransportServices_Proxy( - IWdsTransportConfigurationManager* This); -void __RPC_STUB IWdsTransportConfigurationManager_StartWdsTransportServices_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportConfigurationManager_StopWdsTransportServices_Proxy( - IWdsTransportConfigurationManager* This); -void __RPC_STUB IWdsTransportConfigurationManager_StopWdsTransportServices_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportConfigurationManager_RestartWdsTransportServices_Proxy( - IWdsTransportConfigurationManager* This); -void __RPC_STUB IWdsTransportConfigurationManager_RestartWdsTransportServices_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportConfigurationManager_NotifyWdsTransportServices_Proxy( - IWdsTransportConfigurationManager* This, - WDSTRANSPORT_SERVICE_NOTIFICATION ServiceNotification); -void __RPC_STUB IWdsTransportConfigurationManager_NotifyWdsTransportServices_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWdsTransportConfigurationManager_INTERFACE_DEFINED__ */ @@ -1231,29 +1263,29 @@ typedef struct IWdsTransportDiagnosticsPolicyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportDiagnosticsPolicy* This, + IWdsTransportDiagnosticsPolicy *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportDiagnosticsPolicy* This); + IWdsTransportDiagnosticsPolicy *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportDiagnosticsPolicy* This); + IWdsTransportDiagnosticsPolicy *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportDiagnosticsPolicy* This, + IWdsTransportDiagnosticsPolicy *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportDiagnosticsPolicy* This, + IWdsTransportDiagnosticsPolicy *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportDiagnosticsPolicy* This, + IWdsTransportDiagnosticsPolicy *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1261,7 +1293,7 @@ typedef struct IWdsTransportDiagnosticsPolicyVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportDiagnosticsPolicy* This, + IWdsTransportDiagnosticsPolicy *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1273,37 +1305,38 @@ typedef struct IWdsTransportDiagnosticsPolicyVtbl { /*** IWdsTransportCacheable methods ***/ HRESULT (STDMETHODCALLTYPE *get_Dirty)( - IWdsTransportDiagnosticsPolicy* This, + IWdsTransportDiagnosticsPolicy *This, VARIANT_BOOL *pbDirty); HRESULT (STDMETHODCALLTYPE *Discard)( - IWdsTransportDiagnosticsPolicy* This); + IWdsTransportDiagnosticsPolicy *This); HRESULT (STDMETHODCALLTYPE *Refresh)( - IWdsTransportDiagnosticsPolicy* This); + IWdsTransportDiagnosticsPolicy *This); HRESULT (STDMETHODCALLTYPE *Commit)( - IWdsTransportDiagnosticsPolicy* This); + IWdsTransportDiagnosticsPolicy *This); /*** IWdsTransportDiagnosticsPolicy methods ***/ HRESULT (STDMETHODCALLTYPE *get_Enabled)( - IWdsTransportDiagnosticsPolicy* This, + IWdsTransportDiagnosticsPolicy *This, VARIANT_BOOL *pbEnabled); HRESULT (STDMETHODCALLTYPE *put_Enabled)( - IWdsTransportDiagnosticsPolicy* This, + IWdsTransportDiagnosticsPolicy *This, VARIANT_BOOL bEnabled); HRESULT (STDMETHODCALLTYPE *get_Components)( - IWdsTransportDiagnosticsPolicy* This, + IWdsTransportDiagnosticsPolicy *This, ULONG *pulComponents); HRESULT (STDMETHODCALLTYPE *put_Components)( - IWdsTransportDiagnosticsPolicy* This, + IWdsTransportDiagnosticsPolicy *This, ULONG ulComponents); END_INTERFACE } IWdsTransportDiagnosticsPolicyVtbl; + interface IWdsTransportDiagnosticsPolicy { CONST_VTBL IWdsTransportDiagnosticsPolicyVtbl* lpVtbl; }; @@ -1384,38 +1417,6 @@ static FORCEINLINE HRESULT IWdsTransportDiagnosticsPolicy_put_Components(IWdsTra #endif -HRESULT STDMETHODCALLTYPE IWdsTransportDiagnosticsPolicy_get_Enabled_Proxy( - IWdsTransportDiagnosticsPolicy* This, - VARIANT_BOOL *pbEnabled); -void __RPC_STUB IWdsTransportDiagnosticsPolicy_get_Enabled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportDiagnosticsPolicy_put_Enabled_Proxy( - IWdsTransportDiagnosticsPolicy* This, - VARIANT_BOOL bEnabled); -void __RPC_STUB IWdsTransportDiagnosticsPolicy_put_Enabled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportDiagnosticsPolicy_get_Components_Proxy( - IWdsTransportDiagnosticsPolicy* This, - ULONG *pulComponents); -void __RPC_STUB IWdsTransportDiagnosticsPolicy_get_Components_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportDiagnosticsPolicy_put_Components_Proxy( - IWdsTransportDiagnosticsPolicy* This, - ULONG ulComponents); -void __RPC_STUB IWdsTransportDiagnosticsPolicy_put_Components_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWdsTransportDiagnosticsPolicy_INTERFACE_DEFINED__ */ @@ -1444,29 +1445,29 @@ typedef struct IWdsTransportConfigurationManager2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportConfigurationManager2* This, + IWdsTransportConfigurationManager2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportConfigurationManager2* This); + IWdsTransportConfigurationManager2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportConfigurationManager2* This); + IWdsTransportConfigurationManager2 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportConfigurationManager2* This, + IWdsTransportConfigurationManager2 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportConfigurationManager2* This, + IWdsTransportConfigurationManager2 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportConfigurationManager2* This, + IWdsTransportConfigurationManager2 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1474,7 +1475,7 @@ typedef struct IWdsTransportConfigurationManager2Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportConfigurationManager2* This, + IWdsTransportConfigurationManager2 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1486,44 +1487,45 @@ typedef struct IWdsTransportConfigurationManager2Vtbl { /*** IWdsTransportConfigurationManager methods ***/ HRESULT (STDMETHODCALLTYPE *get_ServicePolicy)( - IWdsTransportConfigurationManager2* This, + IWdsTransportConfigurationManager2 *This, IWdsTransportServicePolicy **ppWdsTransportServicePolicy); HRESULT (STDMETHODCALLTYPE *get_DiagnosticsPolicy)( - IWdsTransportConfigurationManager2* This, + IWdsTransportConfigurationManager2 *This, IWdsTransportDiagnosticsPolicy **ppWdsTransportDiagnosticsPolicy); HRESULT (STDMETHODCALLTYPE *get_WdsTransportServicesRunning)( - IWdsTransportConfigurationManager2* This, + IWdsTransportConfigurationManager2 *This, VARIANT_BOOL bRealtimeStatus, VARIANT_BOOL *pbServicesRunning); HRESULT (STDMETHODCALLTYPE *EnableWdsTransportServices)( - IWdsTransportConfigurationManager2* This); + IWdsTransportConfigurationManager2 *This); HRESULT (STDMETHODCALLTYPE *DisableWdsTransportServices)( - IWdsTransportConfigurationManager2* This); + IWdsTransportConfigurationManager2 *This); HRESULT (STDMETHODCALLTYPE *StartWdsTransportServices)( - IWdsTransportConfigurationManager2* This); + IWdsTransportConfigurationManager2 *This); HRESULT (STDMETHODCALLTYPE *StopWdsTransportServices)( - IWdsTransportConfigurationManager2* This); + IWdsTransportConfigurationManager2 *This); HRESULT (STDMETHODCALLTYPE *RestartWdsTransportServices)( - IWdsTransportConfigurationManager2* This); + IWdsTransportConfigurationManager2 *This); HRESULT (STDMETHODCALLTYPE *NotifyWdsTransportServices)( - IWdsTransportConfigurationManager2* This, + IWdsTransportConfigurationManager2 *This, WDSTRANSPORT_SERVICE_NOTIFICATION ServiceNotification); /*** IWdsTransportConfigurationManager2 methods ***/ HRESULT (STDMETHODCALLTYPE *get_MulticastSessionPolicy)( - IWdsTransportConfigurationManager2* This, + IWdsTransportConfigurationManager2 *This, IWdsTransportMulticastSessionPolicy **ppWdsTransportMulticastSessionPolicy); END_INTERFACE } IWdsTransportConfigurationManager2Vtbl; + interface IWdsTransportConfigurationManager2 { CONST_VTBL IWdsTransportConfigurationManager2Vtbl* lpVtbl; }; @@ -1612,14 +1614,6 @@ static FORCEINLINE HRESULT IWdsTransportConfigurationManager2_get_MulticastSessi #endif -HRESULT STDMETHODCALLTYPE IWdsTransportConfigurationManager2_get_MulticastSessionPolicy_Proxy( - IWdsTransportConfigurationManager2* This, - IWdsTransportMulticastSessionPolicy **ppWdsTransportMulticastSessionPolicy); -void __RPC_STUB IWdsTransportConfigurationManager2_get_MulticastSessionPolicy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWdsTransportConfigurationManager2_INTERFACE_DEFINED__ */ @@ -1649,29 +1643,29 @@ typedef struct IWdsTransportManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportManager* This, + IWdsTransportManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportManager* This); + IWdsTransportManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportManager* This); + IWdsTransportManager *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportManager* This, + IWdsTransportManager *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportManager* This, + IWdsTransportManager *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportManager* This, + IWdsTransportManager *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1679,7 +1673,7 @@ typedef struct IWdsTransportManagerVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportManager* This, + IWdsTransportManager *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1691,12 +1685,13 @@ typedef struct IWdsTransportManagerVtbl { /*** IWdsTransportManager methods ***/ HRESULT (STDMETHODCALLTYPE *GetWdsTransportServer)( - IWdsTransportManager* This, + IWdsTransportManager *This, BSTR bszServerName, IWdsTransportServer **ppWdsTransportServer); END_INTERFACE } IWdsTransportManagerVtbl; + interface IWdsTransportManager { CONST_VTBL IWdsTransportManagerVtbl* lpVtbl; }; @@ -1747,15 +1742,6 @@ static FORCEINLINE HRESULT IWdsTransportManager_GetWdsTransportServer(IWdsTransp #endif -HRESULT STDMETHODCALLTYPE IWdsTransportManager_GetWdsTransportServer_Proxy( - IWdsTransportManager* This, - BSTR bszServerName, - IWdsTransportServer **ppWdsTransportServer); -void __RPC_STUB IWdsTransportManager_GetWdsTransportServer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWdsTransportManager_INTERFACE_DEFINED__ */ @@ -1844,29 +1830,29 @@ typedef struct IWdsTransportNamespaceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportNamespace* This, + IWdsTransportNamespace *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportNamespace* This); + IWdsTransportNamespace *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportNamespace* This); + IWdsTransportNamespace *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportNamespace* This, + IWdsTransportNamespace *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportNamespace* This, + IWdsTransportNamespace *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportNamespace* This, + IWdsTransportNamespace *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1874,7 +1860,7 @@ typedef struct IWdsTransportNamespaceVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportNamespace* This, + IWdsTransportNamespace *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1886,89 +1872,90 @@ typedef struct IWdsTransportNamespaceVtbl { /*** IWdsTransportNamespace methods ***/ HRESULT (STDMETHODCALLTYPE *get_Type)( - IWdsTransportNamespace* This, + IWdsTransportNamespace *This, WDSTRANSPORT_NAMESPACE_TYPE *pType); HRESULT (STDMETHODCALLTYPE *get_Id)( - IWdsTransportNamespace* This, + IWdsTransportNamespace *This, ULONG *pulId); HRESULT (STDMETHODCALLTYPE *get_Name)( - IWdsTransportNamespace* This, + IWdsTransportNamespace *This, BSTR *pbszName); HRESULT (STDMETHODCALLTYPE *put_Name)( - IWdsTransportNamespace* This, + IWdsTransportNamespace *This, BSTR bszName); HRESULT (STDMETHODCALLTYPE *get_FriendlyName)( - IWdsTransportNamespace* This, + IWdsTransportNamespace *This, BSTR *pbszFriendlyName); HRESULT (STDMETHODCALLTYPE *put_FriendlyName)( - IWdsTransportNamespace* This, + IWdsTransportNamespace *This, BSTR bszFriendlyName); HRESULT (STDMETHODCALLTYPE *get_Description)( - IWdsTransportNamespace* This, + IWdsTransportNamespace *This, BSTR *pbszDescription); HRESULT (STDMETHODCALLTYPE *put_Description)( - IWdsTransportNamespace* This, + IWdsTransportNamespace *This, BSTR bszDescription); HRESULT (STDMETHODCALLTYPE *get_ContentProvider)( - IWdsTransportNamespace* This, + IWdsTransportNamespace *This, BSTR *pbszContentProvider); HRESULT (STDMETHODCALLTYPE *put_ContentProvider)( - IWdsTransportNamespace* This, + IWdsTransportNamespace *This, BSTR bszContentProvider); HRESULT (STDMETHODCALLTYPE *get_Configuration)( - IWdsTransportNamespace* This, + IWdsTransportNamespace *This, BSTR *pbszConfiguration); HRESULT (STDMETHODCALLTYPE *put_Configuration)( - IWdsTransportNamespace* This, + IWdsTransportNamespace *This, BSTR bszConfiguration); HRESULT (STDMETHODCALLTYPE *get_Registered)( - IWdsTransportNamespace* This, + IWdsTransportNamespace *This, VARIANT_BOOL *pbRegistered); HRESULT (STDMETHODCALLTYPE *get_Tombstoned)( - IWdsTransportNamespace* This, + IWdsTransportNamespace *This, VARIANT_BOOL *pbTombstoned); HRESULT (STDMETHODCALLTYPE *get_TombstoneTime)( - IWdsTransportNamespace* This, + IWdsTransportNamespace *This, DATE *pTombstoneTime); HRESULT (STDMETHODCALLTYPE *get_TransmissionStarted)( - IWdsTransportNamespace* This, + IWdsTransportNamespace *This, VARIANT_BOOL *pbTransmissionStarted); HRESULT (STDMETHODCALLTYPE *Register)( - IWdsTransportNamespace* This); + IWdsTransportNamespace *This); HRESULT (STDMETHODCALLTYPE *Deregister)( - IWdsTransportNamespace* This, + IWdsTransportNamespace *This, VARIANT_BOOL bTerminateSessions); HRESULT (STDMETHODCALLTYPE *Clone)( - IWdsTransportNamespace* This, + IWdsTransportNamespace *This, IWdsTransportNamespace **ppWdsTransportNamespaceClone); HRESULT (STDMETHODCALLTYPE *Refresh)( - IWdsTransportNamespace* This); + IWdsTransportNamespace *This); HRESULT (STDMETHODCALLTYPE *RetrieveContents)( - IWdsTransportNamespace* This, + IWdsTransportNamespace *This, IWdsTransportCollection **ppWdsTransportContents); END_INTERFACE } IWdsTransportNamespaceVtbl; + interface IWdsTransportNamespace { CONST_VTBL IWdsTransportNamespaceVtbl* lpVtbl; }; @@ -2099,172 +2086,6 @@ static FORCEINLINE HRESULT IWdsTransportNamespace_RetrieveContents(IWdsTransport #endif -HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_get_Type_Proxy( - IWdsTransportNamespace* This, - WDSTRANSPORT_NAMESPACE_TYPE *pType); -void __RPC_STUB IWdsTransportNamespace_get_Type_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_get_Id_Proxy( - IWdsTransportNamespace* This, - ULONG *pulId); -void __RPC_STUB IWdsTransportNamespace_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_get_Name_Proxy( - IWdsTransportNamespace* This, - BSTR *pbszName); -void __RPC_STUB IWdsTransportNamespace_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_put_Name_Proxy( - IWdsTransportNamespace* This, - BSTR bszName); -void __RPC_STUB IWdsTransportNamespace_put_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_get_FriendlyName_Proxy( - IWdsTransportNamespace* This, - BSTR *pbszFriendlyName); -void __RPC_STUB IWdsTransportNamespace_get_FriendlyName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_put_FriendlyName_Proxy( - IWdsTransportNamespace* This, - BSTR bszFriendlyName); -void __RPC_STUB IWdsTransportNamespace_put_FriendlyName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_get_Description_Proxy( - IWdsTransportNamespace* This, - BSTR *pbszDescription); -void __RPC_STUB IWdsTransportNamespace_get_Description_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_put_Description_Proxy( - IWdsTransportNamespace* This, - BSTR bszDescription); -void __RPC_STUB IWdsTransportNamespace_put_Description_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_get_ContentProvider_Proxy( - IWdsTransportNamespace* This, - BSTR *pbszContentProvider); -void __RPC_STUB IWdsTransportNamespace_get_ContentProvider_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_put_ContentProvider_Proxy( - IWdsTransportNamespace* This, - BSTR bszContentProvider); -void __RPC_STUB IWdsTransportNamespace_put_ContentProvider_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_get_Configuration_Proxy( - IWdsTransportNamespace* This, - BSTR *pbszConfiguration); -void __RPC_STUB IWdsTransportNamespace_get_Configuration_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_put_Configuration_Proxy( - IWdsTransportNamespace* This, - BSTR bszConfiguration); -void __RPC_STUB IWdsTransportNamespace_put_Configuration_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_get_Registered_Proxy( - IWdsTransportNamespace* This, - VARIANT_BOOL *pbRegistered); -void __RPC_STUB IWdsTransportNamespace_get_Registered_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_get_Tombstoned_Proxy( - IWdsTransportNamespace* This, - VARIANT_BOOL *pbTombstoned); -void __RPC_STUB IWdsTransportNamespace_get_Tombstoned_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_get_TombstoneTime_Proxy( - IWdsTransportNamespace* This, - DATE *pTombstoneTime); -void __RPC_STUB IWdsTransportNamespace_get_TombstoneTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_get_TransmissionStarted_Proxy( - IWdsTransportNamespace* This, - VARIANT_BOOL *pbTransmissionStarted); -void __RPC_STUB IWdsTransportNamespace_get_TransmissionStarted_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_Register_Proxy( - IWdsTransportNamespace* This); -void __RPC_STUB IWdsTransportNamespace_Register_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_Deregister_Proxy( - IWdsTransportNamespace* This, - VARIANT_BOOL bTerminateSessions); -void __RPC_STUB IWdsTransportNamespace_Deregister_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_Clone_Proxy( - IWdsTransportNamespace* This, - IWdsTransportNamespace **ppWdsTransportNamespaceClone); -void __RPC_STUB IWdsTransportNamespace_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_Refresh_Proxy( - IWdsTransportNamespace* This); -void __RPC_STUB IWdsTransportNamespace_Refresh_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_RetrieveContents_Proxy( - IWdsTransportNamespace* This, - IWdsTransportCollection **ppWdsTransportContents); -void __RPC_STUB IWdsTransportNamespace_RetrieveContents_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWdsTransportNamespace_INTERFACE_DEFINED__ */ @@ -2290,29 +2111,29 @@ typedef struct IWdsTransportNamespaceAutoCastVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportNamespaceAutoCast* This, + IWdsTransportNamespaceAutoCast *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportNamespaceAutoCast* This); + IWdsTransportNamespaceAutoCast *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportNamespaceAutoCast* This); + IWdsTransportNamespaceAutoCast *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportNamespaceAutoCast* This, + IWdsTransportNamespaceAutoCast *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportNamespaceAutoCast* This, + IWdsTransportNamespaceAutoCast *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportNamespaceAutoCast* This, + IWdsTransportNamespaceAutoCast *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2320,7 +2141,7 @@ typedef struct IWdsTransportNamespaceAutoCastVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportNamespaceAutoCast* This, + IWdsTransportNamespaceAutoCast *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2332,89 +2153,90 @@ typedef struct IWdsTransportNamespaceAutoCastVtbl { /*** IWdsTransportNamespace methods ***/ HRESULT (STDMETHODCALLTYPE *get_Type)( - IWdsTransportNamespaceAutoCast* This, + IWdsTransportNamespaceAutoCast *This, WDSTRANSPORT_NAMESPACE_TYPE *pType); HRESULT (STDMETHODCALLTYPE *get_Id)( - IWdsTransportNamespaceAutoCast* This, + IWdsTransportNamespaceAutoCast *This, ULONG *pulId); HRESULT (STDMETHODCALLTYPE *get_Name)( - IWdsTransportNamespaceAutoCast* This, + IWdsTransportNamespaceAutoCast *This, BSTR *pbszName); HRESULT (STDMETHODCALLTYPE *put_Name)( - IWdsTransportNamespaceAutoCast* This, + IWdsTransportNamespaceAutoCast *This, BSTR bszName); HRESULT (STDMETHODCALLTYPE *get_FriendlyName)( - IWdsTransportNamespaceAutoCast* This, + IWdsTransportNamespaceAutoCast *This, BSTR *pbszFriendlyName); HRESULT (STDMETHODCALLTYPE *put_FriendlyName)( - IWdsTransportNamespaceAutoCast* This, + IWdsTransportNamespaceAutoCast *This, BSTR bszFriendlyName); HRESULT (STDMETHODCALLTYPE *get_Description)( - IWdsTransportNamespaceAutoCast* This, + IWdsTransportNamespaceAutoCast *This, BSTR *pbszDescription); HRESULT (STDMETHODCALLTYPE *put_Description)( - IWdsTransportNamespaceAutoCast* This, + IWdsTransportNamespaceAutoCast *This, BSTR bszDescription); HRESULT (STDMETHODCALLTYPE *get_ContentProvider)( - IWdsTransportNamespaceAutoCast* This, + IWdsTransportNamespaceAutoCast *This, BSTR *pbszContentProvider); HRESULT (STDMETHODCALLTYPE *put_ContentProvider)( - IWdsTransportNamespaceAutoCast* This, + IWdsTransportNamespaceAutoCast *This, BSTR bszContentProvider); HRESULT (STDMETHODCALLTYPE *get_Configuration)( - IWdsTransportNamespaceAutoCast* This, + IWdsTransportNamespaceAutoCast *This, BSTR *pbszConfiguration); HRESULT (STDMETHODCALLTYPE *put_Configuration)( - IWdsTransportNamespaceAutoCast* This, + IWdsTransportNamespaceAutoCast *This, BSTR bszConfiguration); HRESULT (STDMETHODCALLTYPE *get_Registered)( - IWdsTransportNamespaceAutoCast* This, + IWdsTransportNamespaceAutoCast *This, VARIANT_BOOL *pbRegistered); HRESULT (STDMETHODCALLTYPE *get_Tombstoned)( - IWdsTransportNamespaceAutoCast* This, + IWdsTransportNamespaceAutoCast *This, VARIANT_BOOL *pbTombstoned); HRESULT (STDMETHODCALLTYPE *get_TombstoneTime)( - IWdsTransportNamespaceAutoCast* This, + IWdsTransportNamespaceAutoCast *This, DATE *pTombstoneTime); HRESULT (STDMETHODCALLTYPE *get_TransmissionStarted)( - IWdsTransportNamespaceAutoCast* This, + IWdsTransportNamespaceAutoCast *This, VARIANT_BOOL *pbTransmissionStarted); HRESULT (STDMETHODCALLTYPE *Register)( - IWdsTransportNamespaceAutoCast* This); + IWdsTransportNamespaceAutoCast *This); HRESULT (STDMETHODCALLTYPE *Deregister)( - IWdsTransportNamespaceAutoCast* This, + IWdsTransportNamespaceAutoCast *This, VARIANT_BOOL bTerminateSessions); HRESULT (STDMETHODCALLTYPE *Clone)( - IWdsTransportNamespaceAutoCast* This, + IWdsTransportNamespaceAutoCast *This, IWdsTransportNamespace **ppWdsTransportNamespaceClone); HRESULT (STDMETHODCALLTYPE *Refresh)( - IWdsTransportNamespaceAutoCast* This); + IWdsTransportNamespaceAutoCast *This); HRESULT (STDMETHODCALLTYPE *RetrieveContents)( - IWdsTransportNamespaceAutoCast* This, + IWdsTransportNamespaceAutoCast *This, IWdsTransportCollection **ppWdsTransportContents); END_INTERFACE } IWdsTransportNamespaceAutoCastVtbl; + interface IWdsTransportNamespaceAutoCast { CONST_VTBL IWdsTransportNamespaceAutoCastVtbl* lpVtbl; }; @@ -2573,29 +2395,29 @@ typedef struct IWdsTransportNamespaceScheduledCastVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportNamespaceScheduledCast* This, + IWdsTransportNamespaceScheduledCast *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportNamespaceScheduledCast* This); + IWdsTransportNamespaceScheduledCast *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportNamespaceScheduledCast* This); + IWdsTransportNamespaceScheduledCast *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportNamespaceScheduledCast* This, + IWdsTransportNamespaceScheduledCast *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportNamespaceScheduledCast* This, + IWdsTransportNamespaceScheduledCast *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportNamespaceScheduledCast* This, + IWdsTransportNamespaceScheduledCast *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2603,7 +2425,7 @@ typedef struct IWdsTransportNamespaceScheduledCastVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportNamespaceScheduledCast* This, + IWdsTransportNamespaceScheduledCast *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2615,93 +2437,94 @@ typedef struct IWdsTransportNamespaceScheduledCastVtbl { /*** IWdsTransportNamespace methods ***/ HRESULT (STDMETHODCALLTYPE *get_Type)( - IWdsTransportNamespaceScheduledCast* This, + IWdsTransportNamespaceScheduledCast *This, WDSTRANSPORT_NAMESPACE_TYPE *pType); HRESULT (STDMETHODCALLTYPE *get_Id)( - IWdsTransportNamespaceScheduledCast* This, + IWdsTransportNamespaceScheduledCast *This, ULONG *pulId); HRESULT (STDMETHODCALLTYPE *get_Name)( - IWdsTransportNamespaceScheduledCast* This, + IWdsTransportNamespaceScheduledCast *This, BSTR *pbszName); HRESULT (STDMETHODCALLTYPE *put_Name)( - IWdsTransportNamespaceScheduledCast* This, + IWdsTransportNamespaceScheduledCast *This, BSTR bszName); HRESULT (STDMETHODCALLTYPE *get_FriendlyName)( - IWdsTransportNamespaceScheduledCast* This, + IWdsTransportNamespaceScheduledCast *This, BSTR *pbszFriendlyName); HRESULT (STDMETHODCALLTYPE *put_FriendlyName)( - IWdsTransportNamespaceScheduledCast* This, + IWdsTransportNamespaceScheduledCast *This, BSTR bszFriendlyName); HRESULT (STDMETHODCALLTYPE *get_Description)( - IWdsTransportNamespaceScheduledCast* This, + IWdsTransportNamespaceScheduledCast *This, BSTR *pbszDescription); HRESULT (STDMETHODCALLTYPE *put_Description)( - IWdsTransportNamespaceScheduledCast* This, + IWdsTransportNamespaceScheduledCast *This, BSTR bszDescription); HRESULT (STDMETHODCALLTYPE *get_ContentProvider)( - IWdsTransportNamespaceScheduledCast* This, + IWdsTransportNamespaceScheduledCast *This, BSTR *pbszContentProvider); HRESULT (STDMETHODCALLTYPE *put_ContentProvider)( - IWdsTransportNamespaceScheduledCast* This, + IWdsTransportNamespaceScheduledCast *This, BSTR bszContentProvider); HRESULT (STDMETHODCALLTYPE *get_Configuration)( - IWdsTransportNamespaceScheduledCast* This, + IWdsTransportNamespaceScheduledCast *This, BSTR *pbszConfiguration); HRESULT (STDMETHODCALLTYPE *put_Configuration)( - IWdsTransportNamespaceScheduledCast* This, + IWdsTransportNamespaceScheduledCast *This, BSTR bszConfiguration); HRESULT (STDMETHODCALLTYPE *get_Registered)( - IWdsTransportNamespaceScheduledCast* This, + IWdsTransportNamespaceScheduledCast *This, VARIANT_BOOL *pbRegistered); HRESULT (STDMETHODCALLTYPE *get_Tombstoned)( - IWdsTransportNamespaceScheduledCast* This, + IWdsTransportNamespaceScheduledCast *This, VARIANT_BOOL *pbTombstoned); HRESULT (STDMETHODCALLTYPE *get_TombstoneTime)( - IWdsTransportNamespaceScheduledCast* This, + IWdsTransportNamespaceScheduledCast *This, DATE *pTombstoneTime); HRESULT (STDMETHODCALLTYPE *get_TransmissionStarted)( - IWdsTransportNamespaceScheduledCast* This, + IWdsTransportNamespaceScheduledCast *This, VARIANT_BOOL *pbTransmissionStarted); HRESULT (STDMETHODCALLTYPE *Register)( - IWdsTransportNamespaceScheduledCast* This); + IWdsTransportNamespaceScheduledCast *This); HRESULT (STDMETHODCALLTYPE *Deregister)( - IWdsTransportNamespaceScheduledCast* This, + IWdsTransportNamespaceScheduledCast *This, VARIANT_BOOL bTerminateSessions); HRESULT (STDMETHODCALLTYPE *Clone)( - IWdsTransportNamespaceScheduledCast* This, + IWdsTransportNamespaceScheduledCast *This, IWdsTransportNamespace **ppWdsTransportNamespaceClone); HRESULT (STDMETHODCALLTYPE *Refresh)( - IWdsTransportNamespaceScheduledCast* This); + IWdsTransportNamespaceScheduledCast *This); HRESULT (STDMETHODCALLTYPE *RetrieveContents)( - IWdsTransportNamespaceScheduledCast* This, + IWdsTransportNamespaceScheduledCast *This, IWdsTransportCollection **ppWdsTransportContents); /*** IWdsTransportNamespaceScheduledCast methods ***/ HRESULT (STDMETHODCALLTYPE *StartTransmission)( - IWdsTransportNamespaceScheduledCast* This); + IWdsTransportNamespaceScheduledCast *This); END_INTERFACE } IWdsTransportNamespaceScheduledCastVtbl; + interface IWdsTransportNamespaceScheduledCast { CONST_VTBL IWdsTransportNamespaceScheduledCastVtbl* lpVtbl; }; @@ -2838,13 +2661,6 @@ static FORCEINLINE HRESULT IWdsTransportNamespaceScheduledCast_StartTransmission #endif -HRESULT STDMETHODCALLTYPE IWdsTransportNamespaceScheduledCast_StartTransmission_Proxy( - IWdsTransportNamespaceScheduledCast* This); -void __RPC_STUB IWdsTransportNamespaceScheduledCast_StartTransmission_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWdsTransportNamespaceScheduledCast_INTERFACE_DEFINED__ */ @@ -2870,29 +2686,29 @@ typedef struct IWdsTransportNamespaceScheduledCastManualStartVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportNamespaceScheduledCastManualStart* This, + IWdsTransportNamespaceScheduledCastManualStart *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportNamespaceScheduledCastManualStart* This); + IWdsTransportNamespaceScheduledCastManualStart *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportNamespaceScheduledCastManualStart* This); + IWdsTransportNamespaceScheduledCastManualStart *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportNamespaceScheduledCastManualStart* This, + IWdsTransportNamespaceScheduledCastManualStart *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportNamespaceScheduledCastManualStart* This, + IWdsTransportNamespaceScheduledCastManualStart *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportNamespaceScheduledCastManualStart* This, + IWdsTransportNamespaceScheduledCastManualStart *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2900,7 +2716,7 @@ typedef struct IWdsTransportNamespaceScheduledCastManualStartVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportNamespaceScheduledCastManualStart* This, + IWdsTransportNamespaceScheduledCastManualStart *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2912,93 +2728,94 @@ typedef struct IWdsTransportNamespaceScheduledCastManualStartVtbl { /*** IWdsTransportNamespace methods ***/ HRESULT (STDMETHODCALLTYPE *get_Type)( - IWdsTransportNamespaceScheduledCastManualStart* This, + IWdsTransportNamespaceScheduledCastManualStart *This, WDSTRANSPORT_NAMESPACE_TYPE *pType); HRESULT (STDMETHODCALLTYPE *get_Id)( - IWdsTransportNamespaceScheduledCastManualStart* This, + IWdsTransportNamespaceScheduledCastManualStart *This, ULONG *pulId); HRESULT (STDMETHODCALLTYPE *get_Name)( - IWdsTransportNamespaceScheduledCastManualStart* This, + IWdsTransportNamespaceScheduledCastManualStart *This, BSTR *pbszName); HRESULT (STDMETHODCALLTYPE *put_Name)( - IWdsTransportNamespaceScheduledCastManualStart* This, + IWdsTransportNamespaceScheduledCastManualStart *This, BSTR bszName); HRESULT (STDMETHODCALLTYPE *get_FriendlyName)( - IWdsTransportNamespaceScheduledCastManualStart* This, + IWdsTransportNamespaceScheduledCastManualStart *This, BSTR *pbszFriendlyName); HRESULT (STDMETHODCALLTYPE *put_FriendlyName)( - IWdsTransportNamespaceScheduledCastManualStart* This, + IWdsTransportNamespaceScheduledCastManualStart *This, BSTR bszFriendlyName); HRESULT (STDMETHODCALLTYPE *get_Description)( - IWdsTransportNamespaceScheduledCastManualStart* This, + IWdsTransportNamespaceScheduledCastManualStart *This, BSTR *pbszDescription); HRESULT (STDMETHODCALLTYPE *put_Description)( - IWdsTransportNamespaceScheduledCastManualStart* This, + IWdsTransportNamespaceScheduledCastManualStart *This, BSTR bszDescription); HRESULT (STDMETHODCALLTYPE *get_ContentProvider)( - IWdsTransportNamespaceScheduledCastManualStart* This, + IWdsTransportNamespaceScheduledCastManualStart *This, BSTR *pbszContentProvider); HRESULT (STDMETHODCALLTYPE *put_ContentProvider)( - IWdsTransportNamespaceScheduledCastManualStart* This, + IWdsTransportNamespaceScheduledCastManualStart *This, BSTR bszContentProvider); HRESULT (STDMETHODCALLTYPE *get_Configuration)( - IWdsTransportNamespaceScheduledCastManualStart* This, + IWdsTransportNamespaceScheduledCastManualStart *This, BSTR *pbszConfiguration); HRESULT (STDMETHODCALLTYPE *put_Configuration)( - IWdsTransportNamespaceScheduledCastManualStart* This, + IWdsTransportNamespaceScheduledCastManualStart *This, BSTR bszConfiguration); HRESULT (STDMETHODCALLTYPE *get_Registered)( - IWdsTransportNamespaceScheduledCastManualStart* This, + IWdsTransportNamespaceScheduledCastManualStart *This, VARIANT_BOOL *pbRegistered); HRESULT (STDMETHODCALLTYPE *get_Tombstoned)( - IWdsTransportNamespaceScheduledCastManualStart* This, + IWdsTransportNamespaceScheduledCastManualStart *This, VARIANT_BOOL *pbTombstoned); HRESULT (STDMETHODCALLTYPE *get_TombstoneTime)( - IWdsTransportNamespaceScheduledCastManualStart* This, + IWdsTransportNamespaceScheduledCastManualStart *This, DATE *pTombstoneTime); HRESULT (STDMETHODCALLTYPE *get_TransmissionStarted)( - IWdsTransportNamespaceScheduledCastManualStart* This, + IWdsTransportNamespaceScheduledCastManualStart *This, VARIANT_BOOL *pbTransmissionStarted); HRESULT (STDMETHODCALLTYPE *Register)( - IWdsTransportNamespaceScheduledCastManualStart* This); + IWdsTransportNamespaceScheduledCastManualStart *This); HRESULT (STDMETHODCALLTYPE *Deregister)( - IWdsTransportNamespaceScheduledCastManualStart* This, + IWdsTransportNamespaceScheduledCastManualStart *This, VARIANT_BOOL bTerminateSessions); HRESULT (STDMETHODCALLTYPE *Clone)( - IWdsTransportNamespaceScheduledCastManualStart* This, + IWdsTransportNamespaceScheduledCastManualStart *This, IWdsTransportNamespace **ppWdsTransportNamespaceClone); HRESULT (STDMETHODCALLTYPE *Refresh)( - IWdsTransportNamespaceScheduledCastManualStart* This); + IWdsTransportNamespaceScheduledCastManualStart *This); HRESULT (STDMETHODCALLTYPE *RetrieveContents)( - IWdsTransportNamespaceScheduledCastManualStart* This, + IWdsTransportNamespaceScheduledCastManualStart *This, IWdsTransportCollection **ppWdsTransportContents); /*** IWdsTransportNamespaceScheduledCast methods ***/ HRESULT (STDMETHODCALLTYPE *StartTransmission)( - IWdsTransportNamespaceScheduledCastManualStart* This); + IWdsTransportNamespaceScheduledCastManualStart *This); END_INTERFACE } IWdsTransportNamespaceScheduledCastManualStartVtbl; + interface IWdsTransportNamespaceScheduledCastManualStart { CONST_VTBL IWdsTransportNamespaceScheduledCastManualStartVtbl* lpVtbl; }; @@ -3172,29 +2989,29 @@ typedef struct IWdsTransportNamespaceScheduledCastAutoStartVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportNamespaceScheduledCastAutoStart* This); + IWdsTransportNamespaceScheduledCastAutoStart *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportNamespaceScheduledCastAutoStart* This); + IWdsTransportNamespaceScheduledCastAutoStart *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -3202,7 +3019,7 @@ typedef struct IWdsTransportNamespaceScheduledCastAutoStartVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -3214,110 +3031,111 @@ typedef struct IWdsTransportNamespaceScheduledCastAutoStartVtbl { /*** IWdsTransportNamespace methods ***/ HRESULT (STDMETHODCALLTYPE *get_Type)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, WDSTRANSPORT_NAMESPACE_TYPE *pType); HRESULT (STDMETHODCALLTYPE *get_Id)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, ULONG *pulId); HRESULT (STDMETHODCALLTYPE *get_Name)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, BSTR *pbszName); HRESULT (STDMETHODCALLTYPE *put_Name)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, BSTR bszName); HRESULT (STDMETHODCALLTYPE *get_FriendlyName)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, BSTR *pbszFriendlyName); HRESULT (STDMETHODCALLTYPE *put_FriendlyName)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, BSTR bszFriendlyName); HRESULT (STDMETHODCALLTYPE *get_Description)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, BSTR *pbszDescription); HRESULT (STDMETHODCALLTYPE *put_Description)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, BSTR bszDescription); HRESULT (STDMETHODCALLTYPE *get_ContentProvider)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, BSTR *pbszContentProvider); HRESULT (STDMETHODCALLTYPE *put_ContentProvider)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, BSTR bszContentProvider); HRESULT (STDMETHODCALLTYPE *get_Configuration)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, BSTR *pbszConfiguration); HRESULT (STDMETHODCALLTYPE *put_Configuration)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, BSTR bszConfiguration); HRESULT (STDMETHODCALLTYPE *get_Registered)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, VARIANT_BOOL *pbRegistered); HRESULT (STDMETHODCALLTYPE *get_Tombstoned)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, VARIANT_BOOL *pbTombstoned); HRESULT (STDMETHODCALLTYPE *get_TombstoneTime)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, DATE *pTombstoneTime); HRESULT (STDMETHODCALLTYPE *get_TransmissionStarted)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, VARIANT_BOOL *pbTransmissionStarted); HRESULT (STDMETHODCALLTYPE *Register)( - IWdsTransportNamespaceScheduledCastAutoStart* This); + IWdsTransportNamespaceScheduledCastAutoStart *This); HRESULT (STDMETHODCALLTYPE *Deregister)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, VARIANT_BOOL bTerminateSessions); HRESULT (STDMETHODCALLTYPE *Clone)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, IWdsTransportNamespace **ppWdsTransportNamespaceClone); HRESULT (STDMETHODCALLTYPE *Refresh)( - IWdsTransportNamespaceScheduledCastAutoStart* This); + IWdsTransportNamespaceScheduledCastAutoStart *This); HRESULT (STDMETHODCALLTYPE *RetrieveContents)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, IWdsTransportCollection **ppWdsTransportContents); /*** IWdsTransportNamespaceScheduledCast methods ***/ HRESULT (STDMETHODCALLTYPE *StartTransmission)( - IWdsTransportNamespaceScheduledCastAutoStart* This); + IWdsTransportNamespaceScheduledCastAutoStart *This); /*** IWdsTransportNamespaceScheduledCastAutoStart methods ***/ HRESULT (STDMETHODCALLTYPE *get_MinimumClients)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, ULONG *pulMinimumClients); HRESULT (STDMETHODCALLTYPE *put_MinimumClients)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, ULONG ulMinimumClients); HRESULT (STDMETHODCALLTYPE *get_StartTime)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, DATE *pStartTime); HRESULT (STDMETHODCALLTYPE *put_StartTime)( - IWdsTransportNamespaceScheduledCastAutoStart* This, + IWdsTransportNamespaceScheduledCastAutoStart *This, DATE StartTime); END_INTERFACE } IWdsTransportNamespaceScheduledCastAutoStartVtbl; + interface IWdsTransportNamespaceScheduledCastAutoStart { CONST_VTBL IWdsTransportNamespaceScheduledCastAutoStartVtbl* lpVtbl; }; @@ -3472,38 +3290,6 @@ static FORCEINLINE HRESULT IWdsTransportNamespaceScheduledCastAutoStart_put_Star #endif -HRESULT STDMETHODCALLTYPE IWdsTransportNamespaceScheduledCastAutoStart_get_MinimumClients_Proxy( - IWdsTransportNamespaceScheduledCastAutoStart* This, - ULONG *pulMinimumClients); -void __RPC_STUB IWdsTransportNamespaceScheduledCastAutoStart_get_MinimumClients_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespaceScheduledCastAutoStart_put_MinimumClients_Proxy( - IWdsTransportNamespaceScheduledCastAutoStart* This, - ULONG ulMinimumClients); -void __RPC_STUB IWdsTransportNamespaceScheduledCastAutoStart_put_MinimumClients_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespaceScheduledCastAutoStart_get_StartTime_Proxy( - IWdsTransportNamespaceScheduledCastAutoStart* This, - DATE *pStartTime); -void __RPC_STUB IWdsTransportNamespaceScheduledCastAutoStart_get_StartTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespaceScheduledCastAutoStart_put_StartTime_Proxy( - IWdsTransportNamespaceScheduledCastAutoStart* This, - DATE StartTime); -void __RPC_STUB IWdsTransportNamespaceScheduledCastAutoStart_put_StartTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWdsTransportNamespaceScheduledCastAutoStart_INTERFACE_DEFINED__ */ @@ -3546,29 +3332,29 @@ typedef struct IWdsTransportNamespaceManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportNamespaceManager* This, + IWdsTransportNamespaceManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportNamespaceManager* This); + IWdsTransportNamespaceManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportNamespaceManager* This); + IWdsTransportNamespaceManager *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportNamespaceManager* This, + IWdsTransportNamespaceManager *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportNamespaceManager* This, + IWdsTransportNamespaceManager *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportNamespaceManager* This, + IWdsTransportNamespaceManager *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -3576,7 +3362,7 @@ typedef struct IWdsTransportNamespaceManagerVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportNamespaceManager* This, + IWdsTransportNamespaceManager *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -3588,7 +3374,7 @@ typedef struct IWdsTransportNamespaceManagerVtbl { /*** IWdsTransportNamespaceManager methods ***/ HRESULT (STDMETHODCALLTYPE *CreateNamespace)( - IWdsTransportNamespaceManager* This, + IWdsTransportNamespaceManager *This, WDSTRANSPORT_NAMESPACE_TYPE NamespaceType, BSTR bszNamespaceName, BSTR bszContentProvider, @@ -3596,12 +3382,12 @@ typedef struct IWdsTransportNamespaceManagerVtbl { IWdsTransportNamespace **ppWdsTransportNamespace); HRESULT (STDMETHODCALLTYPE *RetrieveNamespace)( - IWdsTransportNamespaceManager* This, + IWdsTransportNamespaceManager *This, BSTR bszNamespaceName, IWdsTransportNamespace **ppWdsTransportNamespace); HRESULT (STDMETHODCALLTYPE *RetrieveNamespaces)( - IWdsTransportNamespaceManager* This, + IWdsTransportNamespaceManager *This, BSTR bszContentProvider, BSTR bszNamespaceName, VARIANT_BOOL bIncludeTombstones, @@ -3609,6 +3395,7 @@ typedef struct IWdsTransportNamespaceManagerVtbl { END_INTERFACE } IWdsTransportNamespaceManagerVtbl; + interface IWdsTransportNamespaceManager { CONST_VTBL IWdsTransportNamespaceManagerVtbl* lpVtbl; }; @@ -3667,38 +3454,6 @@ static FORCEINLINE HRESULT IWdsTransportNamespaceManager_RetrieveNamespaces(IWds #endif -HRESULT STDMETHODCALLTYPE IWdsTransportNamespaceManager_CreateNamespace_Proxy( - IWdsTransportNamespaceManager* This, - WDSTRANSPORT_NAMESPACE_TYPE NamespaceType, - BSTR bszNamespaceName, - BSTR bszContentProvider, - BSTR bszConfiguration, - IWdsTransportNamespace **ppWdsTransportNamespace); -void __RPC_STUB IWdsTransportNamespaceManager_CreateNamespace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespaceManager_RetrieveNamespace_Proxy( - IWdsTransportNamespaceManager* This, - BSTR bszNamespaceName, - IWdsTransportNamespace **ppWdsTransportNamespace); -void __RPC_STUB IWdsTransportNamespaceManager_RetrieveNamespace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportNamespaceManager_RetrieveNamespaces_Proxy( - IWdsTransportNamespaceManager* This, - BSTR bszContentProvider, - BSTR bszNamespaceName, - VARIANT_BOOL bIncludeTombstones, - IWdsTransportCollection **ppWdsTransportNamespaces); -void __RPC_STUB IWdsTransportNamespaceManager_RetrieveNamespaces_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWdsTransportNamespaceManager_INTERFACE_DEFINED__ */ @@ -3740,29 +3495,29 @@ typedef struct IWdsTransportServerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportServer* This, + IWdsTransportServer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportServer* This); + IWdsTransportServer *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportServer* This); + IWdsTransportServer *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportServer* This, + IWdsTransportServer *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportServer* This, + IWdsTransportServer *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportServer* This, + IWdsTransportServer *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -3770,7 +3525,7 @@ typedef struct IWdsTransportServerVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportServer* This, + IWdsTransportServer *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -3782,28 +3537,29 @@ typedef struct IWdsTransportServerVtbl { /*** IWdsTransportServer methods ***/ HRESULT (STDMETHODCALLTYPE *get_Name)( - IWdsTransportServer* This, + IWdsTransportServer *This, BSTR *pbszName); HRESULT (STDMETHODCALLTYPE *get_SetupManager)( - IWdsTransportServer* This, + IWdsTransportServer *This, IWdsTransportSetupManager **ppWdsTransportSetupManager); HRESULT (STDMETHODCALLTYPE *get_ConfigurationManager)( - IWdsTransportServer* This, + IWdsTransportServer *This, IWdsTransportConfigurationManager **ppWdsTransportConfigurationManager); HRESULT (STDMETHODCALLTYPE *get_NamespaceManager)( - IWdsTransportServer* This, + IWdsTransportServer *This, IWdsTransportNamespaceManager **ppWdsTransportNamespaceManager); HRESULT (STDMETHODCALLTYPE *DisconnectClient)( - IWdsTransportServer* This, + IWdsTransportServer *This, ULONG ulClientId, WDSTRANSPORT_DISCONNECT_TYPE DisconnectionType); END_INTERFACE } IWdsTransportServerVtbl; + interface IWdsTransportServer { CONST_VTBL IWdsTransportServerVtbl* lpVtbl; }; @@ -3870,47 +3626,6 @@ static FORCEINLINE HRESULT IWdsTransportServer_DisconnectClient(IWdsTransportSer #endif -HRESULT STDMETHODCALLTYPE IWdsTransportServer_get_Name_Proxy( - IWdsTransportServer* This, - BSTR *pbszName); -void __RPC_STUB IWdsTransportServer_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportServer_get_SetupManager_Proxy( - IWdsTransportServer* This, - IWdsTransportSetupManager **ppWdsTransportSetupManager); -void __RPC_STUB IWdsTransportServer_get_SetupManager_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportServer_get_ConfigurationManager_Proxy( - IWdsTransportServer* This, - IWdsTransportConfigurationManager **ppWdsTransportConfigurationManager); -void __RPC_STUB IWdsTransportServer_get_ConfigurationManager_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportServer_get_NamespaceManager_Proxy( - IWdsTransportServer* This, - IWdsTransportNamespaceManager **ppWdsTransportNamespaceManager); -void __RPC_STUB IWdsTransportServer_get_NamespaceManager_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportServer_DisconnectClient_Proxy( - IWdsTransportServer* This, - ULONG ulClientId, - WDSTRANSPORT_DISCONNECT_TYPE DisconnectionType); -void __RPC_STUB IWdsTransportServer_DisconnectClient_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWdsTransportServer_INTERFACE_DEFINED__ */ @@ -3939,29 +3654,29 @@ typedef struct IWdsTransportServer2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportServer2* This, + IWdsTransportServer2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportServer2* This); + IWdsTransportServer2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportServer2* This); + IWdsTransportServer2 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportServer2* This, + IWdsTransportServer2 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportServer2* This, + IWdsTransportServer2 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportServer2* This, + IWdsTransportServer2 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -3969,7 +3684,7 @@ typedef struct IWdsTransportServer2Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportServer2* This, + IWdsTransportServer2 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -3981,33 +3696,34 @@ typedef struct IWdsTransportServer2Vtbl { /*** IWdsTransportServer methods ***/ HRESULT (STDMETHODCALLTYPE *get_Name)( - IWdsTransportServer2* This, + IWdsTransportServer2 *This, BSTR *pbszName); HRESULT (STDMETHODCALLTYPE *get_SetupManager)( - IWdsTransportServer2* This, + IWdsTransportServer2 *This, IWdsTransportSetupManager **ppWdsTransportSetupManager); HRESULT (STDMETHODCALLTYPE *get_ConfigurationManager)( - IWdsTransportServer2* This, + IWdsTransportServer2 *This, IWdsTransportConfigurationManager **ppWdsTransportConfigurationManager); HRESULT (STDMETHODCALLTYPE *get_NamespaceManager)( - IWdsTransportServer2* This, + IWdsTransportServer2 *This, IWdsTransportNamespaceManager **ppWdsTransportNamespaceManager); HRESULT (STDMETHODCALLTYPE *DisconnectClient)( - IWdsTransportServer2* This, + IWdsTransportServer2 *This, ULONG ulClientId, WDSTRANSPORT_DISCONNECT_TYPE DisconnectionType); /*** IWdsTransportServer2 methods ***/ HRESULT (STDMETHODCALLTYPE *get_TftpManager)( - IWdsTransportServer2* This, + IWdsTransportServer2 *This, IWdsTransportTftpManager **ppWdsTransportTftpManager); END_INTERFACE } IWdsTransportServer2Vtbl; + interface IWdsTransportServer2 { CONST_VTBL IWdsTransportServer2Vtbl* lpVtbl; }; @@ -4080,14 +3796,6 @@ static FORCEINLINE HRESULT IWdsTransportServer2_get_TftpManager(IWdsTransportSer #endif -HRESULT STDMETHODCALLTYPE IWdsTransportServer2_get_TftpManager_Proxy( - IWdsTransportServer2* This, - IWdsTransportTftpManager **ppWdsTransportTftpManager); -void __RPC_STUB IWdsTransportServer2_get_TftpManager_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWdsTransportServer2_INTERFACE_DEFINED__ */ @@ -4155,29 +3863,29 @@ typedef struct IWdsTransportServicePolicyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportServicePolicy* This, + IWdsTransportServicePolicy *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportServicePolicy* This); + IWdsTransportServicePolicy *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportServicePolicy* This); + IWdsTransportServicePolicy *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportServicePolicy* This, + IWdsTransportServicePolicy *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportServicePolicy* This, + IWdsTransportServicePolicy *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportServicePolicy* This, + IWdsTransportServicePolicy *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -4185,7 +3893,7 @@ typedef struct IWdsTransportServicePolicyVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportServicePolicy* This, + IWdsTransportServicePolicy *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -4197,75 +3905,76 @@ typedef struct IWdsTransportServicePolicyVtbl { /*** IWdsTransportCacheable methods ***/ HRESULT (STDMETHODCALLTYPE *get_Dirty)( - IWdsTransportServicePolicy* This, + IWdsTransportServicePolicy *This, VARIANT_BOOL *pbDirty); HRESULT (STDMETHODCALLTYPE *Discard)( - IWdsTransportServicePolicy* This); + IWdsTransportServicePolicy *This); HRESULT (STDMETHODCALLTYPE *Refresh)( - IWdsTransportServicePolicy* This); + IWdsTransportServicePolicy *This); HRESULT (STDMETHODCALLTYPE *Commit)( - IWdsTransportServicePolicy* This); + IWdsTransportServicePolicy *This); /*** IWdsTransportServicePolicy methods ***/ HRESULT (STDMETHODCALLTYPE *get_IpAddressSource)( - IWdsTransportServicePolicy* This, + IWdsTransportServicePolicy *This, WDSTRANSPORT_IP_ADDRESS_TYPE AddressType, WDSTRANSPORT_IP_ADDRESS_SOURCE_TYPE *pSourceType); HRESULT (STDMETHODCALLTYPE *put_IpAddressSource)( - IWdsTransportServicePolicy* This, + IWdsTransportServicePolicy *This, WDSTRANSPORT_IP_ADDRESS_TYPE AddressType, WDSTRANSPORT_IP_ADDRESS_SOURCE_TYPE SourceType); HRESULT (STDMETHODCALLTYPE *get_StartIpAddress)( - IWdsTransportServicePolicy* This, + IWdsTransportServicePolicy *This, WDSTRANSPORT_IP_ADDRESS_TYPE AddressType, BSTR *pbszStartIpAddress); HRESULT (STDMETHODCALLTYPE *put_StartIpAddress)( - IWdsTransportServicePolicy* This, + IWdsTransportServicePolicy *This, WDSTRANSPORT_IP_ADDRESS_TYPE AddressType, BSTR bszStartIpAddress); HRESULT (STDMETHODCALLTYPE *get_EndIpAddress)( - IWdsTransportServicePolicy* This, + IWdsTransportServicePolicy *This, WDSTRANSPORT_IP_ADDRESS_TYPE AddressType, BSTR *pbszEndIpAddress); HRESULT (STDMETHODCALLTYPE *put_EndIpAddress)( - IWdsTransportServicePolicy* This, + IWdsTransportServicePolicy *This, WDSTRANSPORT_IP_ADDRESS_TYPE AddressType, BSTR bszEndIpAddress); HRESULT (STDMETHODCALLTYPE *get_StartPort)( - IWdsTransportServicePolicy* This, + IWdsTransportServicePolicy *This, ULONG *pulStartPort); HRESULT (STDMETHODCALLTYPE *put_StartPort)( - IWdsTransportServicePolicy* This, + IWdsTransportServicePolicy *This, ULONG ulStartPort); HRESULT (STDMETHODCALLTYPE *get_EndPort)( - IWdsTransportServicePolicy* This, + IWdsTransportServicePolicy *This, ULONG *pulEndPort); HRESULT (STDMETHODCALLTYPE *put_EndPort)( - IWdsTransportServicePolicy* This, + IWdsTransportServicePolicy *This, ULONG ulEndPort); HRESULT (STDMETHODCALLTYPE *get_NetworkProfile)( - IWdsTransportServicePolicy* This, + IWdsTransportServicePolicy *This, WDSTRANSPORT_NETWORK_PROFILE_TYPE *pProfileType); HRESULT (STDMETHODCALLTYPE *put_NetworkProfile)( - IWdsTransportServicePolicy* This, + IWdsTransportServicePolicy *This, WDSTRANSPORT_NETWORK_PROFILE_TYPE ProfileType); END_INTERFACE } IWdsTransportServicePolicyVtbl; + interface IWdsTransportServicePolicy { CONST_VTBL IWdsTransportServicePolicyVtbl* lpVtbl; }; @@ -4378,108 +4087,6 @@ static FORCEINLINE HRESULT IWdsTransportServicePolicy_put_NetworkProfile(IWdsTra #endif -HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy_get_IpAddressSource_Proxy( - IWdsTransportServicePolicy* This, - WDSTRANSPORT_IP_ADDRESS_TYPE AddressType, - WDSTRANSPORT_IP_ADDRESS_SOURCE_TYPE *pSourceType); -void __RPC_STUB IWdsTransportServicePolicy_get_IpAddressSource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy_put_IpAddressSource_Proxy( - IWdsTransportServicePolicy* This, - WDSTRANSPORT_IP_ADDRESS_TYPE AddressType, - WDSTRANSPORT_IP_ADDRESS_SOURCE_TYPE SourceType); -void __RPC_STUB IWdsTransportServicePolicy_put_IpAddressSource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy_get_StartIpAddress_Proxy( - IWdsTransportServicePolicy* This, - WDSTRANSPORT_IP_ADDRESS_TYPE AddressType, - BSTR *pbszStartIpAddress); -void __RPC_STUB IWdsTransportServicePolicy_get_StartIpAddress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy_put_StartIpAddress_Proxy( - IWdsTransportServicePolicy* This, - WDSTRANSPORT_IP_ADDRESS_TYPE AddressType, - BSTR bszStartIpAddress); -void __RPC_STUB IWdsTransportServicePolicy_put_StartIpAddress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy_get_EndIpAddress_Proxy( - IWdsTransportServicePolicy* This, - WDSTRANSPORT_IP_ADDRESS_TYPE AddressType, - BSTR *pbszEndIpAddress); -void __RPC_STUB IWdsTransportServicePolicy_get_EndIpAddress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy_put_EndIpAddress_Proxy( - IWdsTransportServicePolicy* This, - WDSTRANSPORT_IP_ADDRESS_TYPE AddressType, - BSTR bszEndIpAddress); -void __RPC_STUB IWdsTransportServicePolicy_put_EndIpAddress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy_get_StartPort_Proxy( - IWdsTransportServicePolicy* This, - ULONG *pulStartPort); -void __RPC_STUB IWdsTransportServicePolicy_get_StartPort_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy_put_StartPort_Proxy( - IWdsTransportServicePolicy* This, - ULONG ulStartPort); -void __RPC_STUB IWdsTransportServicePolicy_put_StartPort_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy_get_EndPort_Proxy( - IWdsTransportServicePolicy* This, - ULONG *pulEndPort); -void __RPC_STUB IWdsTransportServicePolicy_get_EndPort_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy_put_EndPort_Proxy( - IWdsTransportServicePolicy* This, - ULONG ulEndPort); -void __RPC_STUB IWdsTransportServicePolicy_put_EndPort_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy_get_NetworkProfile_Proxy( - IWdsTransportServicePolicy* This, - WDSTRANSPORT_NETWORK_PROFILE_TYPE *pProfileType); -void __RPC_STUB IWdsTransportServicePolicy_get_NetworkProfile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy_put_NetworkProfile_Proxy( - IWdsTransportServicePolicy* This, - WDSTRANSPORT_NETWORK_PROFILE_TYPE ProfileType); -void __RPC_STUB IWdsTransportServicePolicy_put_NetworkProfile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWdsTransportServicePolicy_INTERFACE_DEFINED__ */ @@ -4523,29 +4130,29 @@ typedef struct IWdsTransportServicePolicy2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportServicePolicy2* This, + IWdsTransportServicePolicy2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportServicePolicy2* This); + IWdsTransportServicePolicy2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportServicePolicy2* This); + IWdsTransportServicePolicy2 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportServicePolicy2* This, + IWdsTransportServicePolicy2 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportServicePolicy2* This, + IWdsTransportServicePolicy2 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportServicePolicy2* This, + IWdsTransportServicePolicy2 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -4553,7 +4160,7 @@ typedef struct IWdsTransportServicePolicy2Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportServicePolicy2* This, + IWdsTransportServicePolicy2 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -4565,100 +4172,101 @@ typedef struct IWdsTransportServicePolicy2Vtbl { /*** IWdsTransportCacheable methods ***/ HRESULT (STDMETHODCALLTYPE *get_Dirty)( - IWdsTransportServicePolicy2* This, + IWdsTransportServicePolicy2 *This, VARIANT_BOOL *pbDirty); HRESULT (STDMETHODCALLTYPE *Discard)( - IWdsTransportServicePolicy2* This); + IWdsTransportServicePolicy2 *This); HRESULT (STDMETHODCALLTYPE *Refresh)( - IWdsTransportServicePolicy2* This); + IWdsTransportServicePolicy2 *This); HRESULT (STDMETHODCALLTYPE *Commit)( - IWdsTransportServicePolicy2* This); + IWdsTransportServicePolicy2 *This); /*** IWdsTransportServicePolicy methods ***/ HRESULT (STDMETHODCALLTYPE *get_IpAddressSource)( - IWdsTransportServicePolicy2* This, + IWdsTransportServicePolicy2 *This, WDSTRANSPORT_IP_ADDRESS_TYPE AddressType, WDSTRANSPORT_IP_ADDRESS_SOURCE_TYPE *pSourceType); HRESULT (STDMETHODCALLTYPE *put_IpAddressSource)( - IWdsTransportServicePolicy2* This, + IWdsTransportServicePolicy2 *This, WDSTRANSPORT_IP_ADDRESS_TYPE AddressType, WDSTRANSPORT_IP_ADDRESS_SOURCE_TYPE SourceType); HRESULT (STDMETHODCALLTYPE *get_StartIpAddress)( - IWdsTransportServicePolicy2* This, + IWdsTransportServicePolicy2 *This, WDSTRANSPORT_IP_ADDRESS_TYPE AddressType, BSTR *pbszStartIpAddress); HRESULT (STDMETHODCALLTYPE *put_StartIpAddress)( - IWdsTransportServicePolicy2* This, + IWdsTransportServicePolicy2 *This, WDSTRANSPORT_IP_ADDRESS_TYPE AddressType, BSTR bszStartIpAddress); HRESULT (STDMETHODCALLTYPE *get_EndIpAddress)( - IWdsTransportServicePolicy2* This, + IWdsTransportServicePolicy2 *This, WDSTRANSPORT_IP_ADDRESS_TYPE AddressType, BSTR *pbszEndIpAddress); HRESULT (STDMETHODCALLTYPE *put_EndIpAddress)( - IWdsTransportServicePolicy2* This, + IWdsTransportServicePolicy2 *This, WDSTRANSPORT_IP_ADDRESS_TYPE AddressType, BSTR bszEndIpAddress); HRESULT (STDMETHODCALLTYPE *get_StartPort)( - IWdsTransportServicePolicy2* This, + IWdsTransportServicePolicy2 *This, ULONG *pulStartPort); HRESULT (STDMETHODCALLTYPE *put_StartPort)( - IWdsTransportServicePolicy2* This, + IWdsTransportServicePolicy2 *This, ULONG ulStartPort); HRESULT (STDMETHODCALLTYPE *get_EndPort)( - IWdsTransportServicePolicy2* This, + IWdsTransportServicePolicy2 *This, ULONG *pulEndPort); HRESULT (STDMETHODCALLTYPE *put_EndPort)( - IWdsTransportServicePolicy2* This, + IWdsTransportServicePolicy2 *This, ULONG ulEndPort); HRESULT (STDMETHODCALLTYPE *get_NetworkProfile)( - IWdsTransportServicePolicy2* This, + IWdsTransportServicePolicy2 *This, WDSTRANSPORT_NETWORK_PROFILE_TYPE *pProfileType); HRESULT (STDMETHODCALLTYPE *put_NetworkProfile)( - IWdsTransportServicePolicy2* This, + IWdsTransportServicePolicy2 *This, WDSTRANSPORT_NETWORK_PROFILE_TYPE ProfileType); /*** IWdsTransportServicePolicy2 methods ***/ HRESULT (STDMETHODCALLTYPE *get_UdpPortPolicy)( - IWdsTransportServicePolicy2* This, + IWdsTransportServicePolicy2 *This, WDSTRANSPORT_UDP_PORT_POLICY *pUdpPortPolicy); HRESULT (STDMETHODCALLTYPE *put_UdpPortPolicy)( - IWdsTransportServicePolicy2* This, + IWdsTransportServicePolicy2 *This, WDSTRANSPORT_UDP_PORT_POLICY UdpPortPolicy); HRESULT (STDMETHODCALLTYPE *get_TftpMaximumBlockSize)( - IWdsTransportServicePolicy2* This, + IWdsTransportServicePolicy2 *This, ULONG *pulTftpMaximumBlockSize); HRESULT (STDMETHODCALLTYPE *put_TftpMaximumBlockSize)( - IWdsTransportServicePolicy2* This, + IWdsTransportServicePolicy2 *This, ULONG ulTftpMaximumBlockSize); HRESULT (STDMETHODCALLTYPE *get_EnableTftpVariableWindowExtension)( - IWdsTransportServicePolicy2* This, + IWdsTransportServicePolicy2 *This, VARIANT_BOOL *pbEnableTftpVariableWindowExtension); HRESULT (STDMETHODCALLTYPE *put_EnableTftpVariableWindowExtension)( - IWdsTransportServicePolicy2* This, + IWdsTransportServicePolicy2 *This, VARIANT_BOOL bEnableTftpVariableWindowExtension); END_INTERFACE } IWdsTransportServicePolicy2Vtbl; + interface IWdsTransportServicePolicy2 { CONST_VTBL IWdsTransportServicePolicy2Vtbl* lpVtbl; }; @@ -4797,54 +4405,6 @@ static FORCEINLINE HRESULT IWdsTransportServicePolicy2_put_EnableTftpVariableWin #endif -HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy2_get_UdpPortPolicy_Proxy( - IWdsTransportServicePolicy2* This, - WDSTRANSPORT_UDP_PORT_POLICY *pUdpPortPolicy); -void __RPC_STUB IWdsTransportServicePolicy2_get_UdpPortPolicy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy2_put_UdpPortPolicy_Proxy( - IWdsTransportServicePolicy2* This, - WDSTRANSPORT_UDP_PORT_POLICY UdpPortPolicy); -void __RPC_STUB IWdsTransportServicePolicy2_put_UdpPortPolicy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy2_get_TftpMaximumBlockSize_Proxy( - IWdsTransportServicePolicy2* This, - ULONG *pulTftpMaximumBlockSize); -void __RPC_STUB IWdsTransportServicePolicy2_get_TftpMaximumBlockSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy2_put_TftpMaximumBlockSize_Proxy( - IWdsTransportServicePolicy2* This, - ULONG ulTftpMaximumBlockSize); -void __RPC_STUB IWdsTransportServicePolicy2_put_TftpMaximumBlockSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy2_get_EnableTftpVariableWindowExtension_Proxy( - IWdsTransportServicePolicy2* This, - VARIANT_BOOL *pbEnableTftpVariableWindowExtension); -void __RPC_STUB IWdsTransportServicePolicy2_get_EnableTftpVariableWindowExtension_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy2_put_EnableTftpVariableWindowExtension_Proxy( - IWdsTransportServicePolicy2* This, - VARIANT_BOOL bEnableTftpVariableWindowExtension); -void __RPC_STUB IWdsTransportServicePolicy2_put_EnableTftpVariableWindowExtension_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWdsTransportServicePolicy2_INTERFACE_DEFINED__ */ @@ -4888,29 +4448,29 @@ typedef struct IWdsTransportSetupManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportSetupManager* This, + IWdsTransportSetupManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportSetupManager* This); + IWdsTransportSetupManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportSetupManager* This); + IWdsTransportSetupManager *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportSetupManager* This, + IWdsTransportSetupManager *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportSetupManager* This, + IWdsTransportSetupManager *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportSetupManager* This, + IWdsTransportSetupManager *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -4918,7 +4478,7 @@ typedef struct IWdsTransportSetupManagerVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportSetupManager* This, + IWdsTransportSetupManager *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -4930,30 +4490,31 @@ typedef struct IWdsTransportSetupManagerVtbl { /*** IWdsTransportSetupManager methods ***/ HRESULT (STDMETHODCALLTYPE *get_Version)( - IWdsTransportSetupManager* This, + IWdsTransportSetupManager *This, ULONGLONG *pullVersion); HRESULT (STDMETHODCALLTYPE *get_InstalledFeatures)( - IWdsTransportSetupManager* This, + IWdsTransportSetupManager *This, ULONG *pulInstalledFeatures); HRESULT (STDMETHODCALLTYPE *get_Protocols)( - IWdsTransportSetupManager* This, + IWdsTransportSetupManager *This, ULONG *pulProtocols); HRESULT (STDMETHODCALLTYPE *RegisterContentProvider)( - IWdsTransportSetupManager* This, + IWdsTransportSetupManager *This, BSTR bszName, BSTR bszDescription, BSTR bszFilePath, BSTR bszInitializationRoutine); HRESULT (STDMETHODCALLTYPE *DeregisterContentProvider)( - IWdsTransportSetupManager* This, + IWdsTransportSetupManager *This, BSTR bszName); END_INTERFACE } IWdsTransportSetupManagerVtbl; + interface IWdsTransportSetupManager { CONST_VTBL IWdsTransportSetupManagerVtbl* lpVtbl; }; @@ -5020,49 +4581,6 @@ static FORCEINLINE HRESULT IWdsTransportSetupManager_DeregisterContentProvider(I #endif -HRESULT STDMETHODCALLTYPE IWdsTransportSetupManager_get_Version_Proxy( - IWdsTransportSetupManager* This, - ULONGLONG *pullVersion); -void __RPC_STUB IWdsTransportSetupManager_get_Version_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportSetupManager_get_InstalledFeatures_Proxy( - IWdsTransportSetupManager* This, - ULONG *pulInstalledFeatures); -void __RPC_STUB IWdsTransportSetupManager_get_InstalledFeatures_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportSetupManager_get_Protocols_Proxy( - IWdsTransportSetupManager* This, - ULONG *pulProtocols); -void __RPC_STUB IWdsTransportSetupManager_get_Protocols_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportSetupManager_RegisterContentProvider_Proxy( - IWdsTransportSetupManager* This, - BSTR bszName, - BSTR bszDescription, - BSTR bszFilePath, - BSTR bszInitializationRoutine); -void __RPC_STUB IWdsTransportSetupManager_RegisterContentProvider_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportSetupManager_DeregisterContentProvider_Proxy( - IWdsTransportSetupManager* This, - BSTR bszName); -void __RPC_STUB IWdsTransportSetupManager_DeregisterContentProvider_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWdsTransportSetupManager_INTERFACE_DEFINED__ */ @@ -5094,29 +4612,29 @@ typedef struct IWdsTransportSetupManager2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportSetupManager2* This, + IWdsTransportSetupManager2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportSetupManager2* This); + IWdsTransportSetupManager2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportSetupManager2* This); + IWdsTransportSetupManager2 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportSetupManager2* This, + IWdsTransportSetupManager2 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportSetupManager2* This, + IWdsTransportSetupManager2 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportSetupManager2* This, + IWdsTransportSetupManager2 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -5124,7 +4642,7 @@ typedef struct IWdsTransportSetupManager2Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportSetupManager2* This, + IWdsTransportSetupManager2 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -5136,39 +4654,40 @@ typedef struct IWdsTransportSetupManager2Vtbl { /*** IWdsTransportSetupManager methods ***/ HRESULT (STDMETHODCALLTYPE *get_Version)( - IWdsTransportSetupManager2* This, + IWdsTransportSetupManager2 *This, ULONGLONG *pullVersion); HRESULT (STDMETHODCALLTYPE *get_InstalledFeatures)( - IWdsTransportSetupManager2* This, + IWdsTransportSetupManager2 *This, ULONG *pulInstalledFeatures); HRESULT (STDMETHODCALLTYPE *get_Protocols)( - IWdsTransportSetupManager2* This, + IWdsTransportSetupManager2 *This, ULONG *pulProtocols); HRESULT (STDMETHODCALLTYPE *RegisterContentProvider)( - IWdsTransportSetupManager2* This, + IWdsTransportSetupManager2 *This, BSTR bszName, BSTR bszDescription, BSTR bszFilePath, BSTR bszInitializationRoutine); HRESULT (STDMETHODCALLTYPE *DeregisterContentProvider)( - IWdsTransportSetupManager2* This, + IWdsTransportSetupManager2 *This, BSTR bszName); /*** IWdsTransportSetupManager2 methods ***/ HRESULT (STDMETHODCALLTYPE *get_TftpCapabilities)( - IWdsTransportSetupManager2* This, + IWdsTransportSetupManager2 *This, ULONG *pulTftpCapabilities); HRESULT (STDMETHODCALLTYPE *get_ContentProviders)( - IWdsTransportSetupManager2* This, + IWdsTransportSetupManager2 *This, IWdsTransportCollection **ppProviderCollection); END_INTERFACE } IWdsTransportSetupManager2Vtbl; + interface IWdsTransportSetupManager2 { CONST_VTBL IWdsTransportSetupManager2Vtbl* lpVtbl; }; @@ -5245,22 +4764,6 @@ static FORCEINLINE HRESULT IWdsTransportSetupManager2_get_ContentProviders(IWdsT #endif -HRESULT STDMETHODCALLTYPE IWdsTransportSetupManager2_get_TftpCapabilities_Proxy( - IWdsTransportSetupManager2* This, - ULONG *pulTftpCapabilities); -void __RPC_STUB IWdsTransportSetupManager2_get_TftpCapabilities_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportSetupManager2_get_ContentProviders_Proxy( - IWdsTransportSetupManager2* This, - IWdsTransportCollection **ppProviderCollection); -void __RPC_STUB IWdsTransportSetupManager2_get_ContentProviders_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWdsTransportSetupManager2_INTERFACE_DEFINED__ */ @@ -5289,29 +4792,29 @@ typedef struct IWdsTransportTftpManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportTftpManager* This, + IWdsTransportTftpManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportTftpManager* This); + IWdsTransportTftpManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportTftpManager* This); + IWdsTransportTftpManager *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportTftpManager* This, + IWdsTransportTftpManager *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportTftpManager* This, + IWdsTransportTftpManager *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportTftpManager* This, + IWdsTransportTftpManager *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -5319,7 +4822,7 @@ typedef struct IWdsTransportTftpManagerVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportTftpManager* This, + IWdsTransportTftpManager *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -5331,11 +4834,12 @@ typedef struct IWdsTransportTftpManagerVtbl { /*** IWdsTransportTftpManager methods ***/ HRESULT (STDMETHODCALLTYPE *RetrieveTftpClients)( - IWdsTransportTftpManager* This, + IWdsTransportTftpManager *This, IWdsTransportCollection **ppWdsTransportTftpClients); END_INTERFACE } IWdsTransportTftpManagerVtbl; + interface IWdsTransportTftpManager { CONST_VTBL IWdsTransportTftpManagerVtbl* lpVtbl; }; @@ -5386,14 +4890,6 @@ static FORCEINLINE HRESULT IWdsTransportTftpManager_RetrieveTftpClients(IWdsTran #endif -HRESULT STDMETHODCALLTYPE IWdsTransportTftpManager_RetrieveTftpClients_Proxy( - IWdsTransportTftpManager* This, - IWdsTransportCollection **ppWdsTransportTftpClients); -void __RPC_STUB IWdsTransportTftpManager_RetrieveTftpClients_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWdsTransportTftpManager_INTERFACE_DEFINED__ */ @@ -5443,29 +4939,29 @@ typedef struct IWdsTransportMulticastSessionPolicyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportMulticastSessionPolicy* This, + IWdsTransportMulticastSessionPolicy *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportMulticastSessionPolicy* This); + IWdsTransportMulticastSessionPolicy *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportMulticastSessionPolicy* This); + IWdsTransportMulticastSessionPolicy *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportMulticastSessionPolicy* This, + IWdsTransportMulticastSessionPolicy *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportMulticastSessionPolicy* This, + IWdsTransportMulticastSessionPolicy *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportMulticastSessionPolicy* This, + IWdsTransportMulticastSessionPolicy *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -5473,7 +4969,7 @@ typedef struct IWdsTransportMulticastSessionPolicyVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportMulticastSessionPolicy* This, + IWdsTransportMulticastSessionPolicy *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -5485,53 +4981,54 @@ typedef struct IWdsTransportMulticastSessionPolicyVtbl { /*** IWdsTransportCacheable methods ***/ HRESULT (STDMETHODCALLTYPE *get_Dirty)( - IWdsTransportMulticastSessionPolicy* This, + IWdsTransportMulticastSessionPolicy *This, VARIANT_BOOL *pbDirty); HRESULT (STDMETHODCALLTYPE *Discard)( - IWdsTransportMulticastSessionPolicy* This); + IWdsTransportMulticastSessionPolicy *This); HRESULT (STDMETHODCALLTYPE *Refresh)( - IWdsTransportMulticastSessionPolicy* This); + IWdsTransportMulticastSessionPolicy *This); HRESULT (STDMETHODCALLTYPE *Commit)( - IWdsTransportMulticastSessionPolicy* This); + IWdsTransportMulticastSessionPolicy *This); /*** IWdsTransportMulticastSessionPolicy methods ***/ HRESULT (STDMETHODCALLTYPE *get_SlowClientHandling)( - IWdsTransportMulticastSessionPolicy* This, + IWdsTransportMulticastSessionPolicy *This, WDSTRANSPORT_SLOW_CLIENT_HANDLING_TYPE *pSlowClientHandling); HRESULT (STDMETHODCALLTYPE *put_SlowClientHandling)( - IWdsTransportMulticastSessionPolicy* This, + IWdsTransportMulticastSessionPolicy *This, WDSTRANSPORT_SLOW_CLIENT_HANDLING_TYPE SlowClientHandling); HRESULT (STDMETHODCALLTYPE *get_AutoDisconnectThreshold)( - IWdsTransportMulticastSessionPolicy* This, + IWdsTransportMulticastSessionPolicy *This, ULONG *pulThreshold); HRESULT (STDMETHODCALLTYPE *put_AutoDisconnectThreshold)( - IWdsTransportMulticastSessionPolicy* This, + IWdsTransportMulticastSessionPolicy *This, ULONG ulThreshold); HRESULT (STDMETHODCALLTYPE *get_MultistreamStreamCount)( - IWdsTransportMulticastSessionPolicy* This, + IWdsTransportMulticastSessionPolicy *This, ULONG *pulStreamCount); HRESULT (STDMETHODCALLTYPE *put_MultistreamStreamCount)( - IWdsTransportMulticastSessionPolicy* This, + IWdsTransportMulticastSessionPolicy *This, ULONG ulStreamCount); HRESULT (STDMETHODCALLTYPE *get_SlowClientFallback)( - IWdsTransportMulticastSessionPolicy* This, + IWdsTransportMulticastSessionPolicy *This, VARIANT_BOOL *pbClientFallback); HRESULT (STDMETHODCALLTYPE *put_SlowClientFallback)( - IWdsTransportMulticastSessionPolicy* This, + IWdsTransportMulticastSessionPolicy *This, VARIANT_BOOL bClientFallback); END_INTERFACE } IWdsTransportMulticastSessionPolicyVtbl; + interface IWdsTransportMulticastSessionPolicy { CONST_VTBL IWdsTransportMulticastSessionPolicyVtbl* lpVtbl; }; @@ -5628,70 +5125,6 @@ static FORCEINLINE HRESULT IWdsTransportMulticastSessionPolicy_put_SlowClientFal #endif -HRESULT STDMETHODCALLTYPE IWdsTransportMulticastSessionPolicy_get_SlowClientHandling_Proxy( - IWdsTransportMulticastSessionPolicy* This, - WDSTRANSPORT_SLOW_CLIENT_HANDLING_TYPE *pSlowClientHandling); -void __RPC_STUB IWdsTransportMulticastSessionPolicy_get_SlowClientHandling_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportMulticastSessionPolicy_put_SlowClientHandling_Proxy( - IWdsTransportMulticastSessionPolicy* This, - WDSTRANSPORT_SLOW_CLIENT_HANDLING_TYPE SlowClientHandling); -void __RPC_STUB IWdsTransportMulticastSessionPolicy_put_SlowClientHandling_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportMulticastSessionPolicy_get_AutoDisconnectThreshold_Proxy( - IWdsTransportMulticastSessionPolicy* This, - ULONG *pulThreshold); -void __RPC_STUB IWdsTransportMulticastSessionPolicy_get_AutoDisconnectThreshold_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportMulticastSessionPolicy_put_AutoDisconnectThreshold_Proxy( - IWdsTransportMulticastSessionPolicy* This, - ULONG ulThreshold); -void __RPC_STUB IWdsTransportMulticastSessionPolicy_put_AutoDisconnectThreshold_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportMulticastSessionPolicy_get_MultistreamStreamCount_Proxy( - IWdsTransportMulticastSessionPolicy* This, - ULONG *pulStreamCount); -void __RPC_STUB IWdsTransportMulticastSessionPolicy_get_MultistreamStreamCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportMulticastSessionPolicy_put_MultistreamStreamCount_Proxy( - IWdsTransportMulticastSessionPolicy* This, - ULONG ulStreamCount); -void __RPC_STUB IWdsTransportMulticastSessionPolicy_put_MultistreamStreamCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportMulticastSessionPolicy_get_SlowClientFallback_Proxy( - IWdsTransportMulticastSessionPolicy* This, - VARIANT_BOOL *pbClientFallback); -void __RPC_STUB IWdsTransportMulticastSessionPolicy_get_SlowClientFallback_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportMulticastSessionPolicy_put_SlowClientFallback_Proxy( - IWdsTransportMulticastSessionPolicy* This, - VARIANT_BOOL bClientFallback); -void __RPC_STUB IWdsTransportMulticastSessionPolicy_put_SlowClientFallback_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWdsTransportMulticastSessionPolicy_INTERFACE_DEFINED__ */ @@ -5732,29 +5165,29 @@ typedef struct IWdsTransportContentVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportContent* This, + IWdsTransportContent *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportContent* This); + IWdsTransportContent *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportContent* This); + IWdsTransportContent *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportContent* This, + IWdsTransportContent *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportContent* This, + IWdsTransportContent *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportContent* This, + IWdsTransportContent *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -5762,7 +5195,7 @@ typedef struct IWdsTransportContentVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportContent* This, + IWdsTransportContent *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -5774,26 +5207,27 @@ typedef struct IWdsTransportContentVtbl { /*** IWdsTransportContent methods ***/ HRESULT (STDMETHODCALLTYPE *get_Namespace)( - IWdsTransportContent* This, + IWdsTransportContent *This, IWdsTransportNamespace **ppWdsTransportNamespace); HRESULT (STDMETHODCALLTYPE *get_Id)( - IWdsTransportContent* This, + IWdsTransportContent *This, ULONG *pulId); HRESULT (STDMETHODCALLTYPE *get_Name)( - IWdsTransportContent* This, + IWdsTransportContent *This, BSTR *pbszName); HRESULT (STDMETHODCALLTYPE *RetrieveSessions)( - IWdsTransportContent* This, + IWdsTransportContent *This, IWdsTransportCollection **ppWdsTransportSessions); HRESULT (STDMETHODCALLTYPE *Terminate)( - IWdsTransportContent* This); + IWdsTransportContent *This); END_INTERFACE } IWdsTransportContentVtbl; + interface IWdsTransportContent { CONST_VTBL IWdsTransportContentVtbl* lpVtbl; }; @@ -5860,45 +5294,6 @@ static FORCEINLINE HRESULT IWdsTransportContent_Terminate(IWdsTransportContent* #endif -HRESULT STDMETHODCALLTYPE IWdsTransportContent_get_Namespace_Proxy( - IWdsTransportContent* This, - IWdsTransportNamespace **ppWdsTransportNamespace); -void __RPC_STUB IWdsTransportContent_get_Namespace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportContent_get_Id_Proxy( - IWdsTransportContent* This, - ULONG *pulId); -void __RPC_STUB IWdsTransportContent_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportContent_get_Name_Proxy( - IWdsTransportContent* This, - BSTR *pbszName); -void __RPC_STUB IWdsTransportContent_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportContent_RetrieveSessions_Proxy( - IWdsTransportContent* This, - IWdsTransportCollection **ppWdsTransportSessions); -void __RPC_STUB IWdsTransportContent_RetrieveSessions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportContent_Terminate_Proxy( - IWdsTransportContent* This); -void __RPC_STUB IWdsTransportContent_Terminate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWdsTransportContent_INTERFACE_DEFINED__ */ @@ -5948,29 +5343,29 @@ typedef struct IWdsTransportSessionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportSession* This, + IWdsTransportSession *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportSession* This); + IWdsTransportSession *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportSession* This); + IWdsTransportSession *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportSession* This, + IWdsTransportSession *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportSession* This, + IWdsTransportSession *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportSession* This, + IWdsTransportSession *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -5978,7 +5373,7 @@ typedef struct IWdsTransportSessionVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportSession* This, + IWdsTransportSession *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -5990,38 +5385,39 @@ typedef struct IWdsTransportSessionVtbl { /*** IWdsTransportSession methods ***/ HRESULT (STDMETHODCALLTYPE *get_Content)( - IWdsTransportSession* This, + IWdsTransportSession *This, IWdsTransportContent **ppWdsTransportContent); HRESULT (STDMETHODCALLTYPE *get_Id)( - IWdsTransportSession* This, + IWdsTransportSession *This, ULONG *pulId); HRESULT (STDMETHODCALLTYPE *get_NetworkInterfaceName)( - IWdsTransportSession* This, + IWdsTransportSession *This, BSTR *pbszNetworkInterfaceName); HRESULT (STDMETHODCALLTYPE *get_NetworkInterfaceAddress)( - IWdsTransportSession* This, + IWdsTransportSession *This, BSTR *pbszNetworkInterfaceAddress); HRESULT (STDMETHODCALLTYPE *get_TransferRate)( - IWdsTransportSession* This, + IWdsTransportSession *This, ULONG *pulTransferRate); HRESULT (STDMETHODCALLTYPE *get_MasterClientId)( - IWdsTransportSession* This, + IWdsTransportSession *This, ULONG *pulMasterClientId); HRESULT (STDMETHODCALLTYPE *RetrieveClients)( - IWdsTransportSession* This, + IWdsTransportSession *This, IWdsTransportCollection **ppWdsTransportClients); HRESULT (STDMETHODCALLTYPE *Terminate)( - IWdsTransportSession* This); + IWdsTransportSession *This); END_INTERFACE } IWdsTransportSessionVtbl; + interface IWdsTransportSession { CONST_VTBL IWdsTransportSessionVtbl* lpVtbl; }; @@ -6100,69 +5496,6 @@ static FORCEINLINE HRESULT IWdsTransportSession_Terminate(IWdsTransportSession* #endif -HRESULT STDMETHODCALLTYPE IWdsTransportSession_get_Content_Proxy( - IWdsTransportSession* This, - IWdsTransportContent **ppWdsTransportContent); -void __RPC_STUB IWdsTransportSession_get_Content_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportSession_get_Id_Proxy( - IWdsTransportSession* This, - ULONG *pulId); -void __RPC_STUB IWdsTransportSession_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportSession_get_NetworkInterfaceName_Proxy( - IWdsTransportSession* This, - BSTR *pbszNetworkInterfaceName); -void __RPC_STUB IWdsTransportSession_get_NetworkInterfaceName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportSession_get_NetworkInterfaceAddress_Proxy( - IWdsTransportSession* This, - BSTR *pbszNetworkInterfaceAddress); -void __RPC_STUB IWdsTransportSession_get_NetworkInterfaceAddress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportSession_get_TransferRate_Proxy( - IWdsTransportSession* This, - ULONG *pulTransferRate); -void __RPC_STUB IWdsTransportSession_get_TransferRate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportSession_get_MasterClientId_Proxy( - IWdsTransportSession* This, - ULONG *pulMasterClientId); -void __RPC_STUB IWdsTransportSession_get_MasterClientId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportSession_RetrieveClients_Proxy( - IWdsTransportSession* This, - IWdsTransportCollection **ppWdsTransportClients); -void __RPC_STUB IWdsTransportSession_RetrieveClients_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportSession_Terminate_Proxy( - IWdsTransportSession* This); -void __RPC_STUB IWdsTransportSession_Terminate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWdsTransportSession_INTERFACE_DEFINED__ */ @@ -6224,29 +5557,29 @@ typedef struct IWdsTransportClientVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportClient* This, + IWdsTransportClient *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportClient* This); + IWdsTransportClient *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportClient* This); + IWdsTransportClient *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportClient* This, + IWdsTransportClient *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportClient* This, + IWdsTransportClient *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportClient* This, + IWdsTransportClient *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -6254,7 +5587,7 @@ typedef struct IWdsTransportClientVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportClient* This, + IWdsTransportClient *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -6266,55 +5599,56 @@ typedef struct IWdsTransportClientVtbl { /*** IWdsTransportClient methods ***/ HRESULT (STDMETHODCALLTYPE *get_Session)( - IWdsTransportClient* This, + IWdsTransportClient *This, IWdsTransportSession **ppWdsTransportSession); HRESULT (STDMETHODCALLTYPE *get_Id)( - IWdsTransportClient* This, + IWdsTransportClient *This, ULONG *pulId); HRESULT (STDMETHODCALLTYPE *get_Name)( - IWdsTransportClient* This, + IWdsTransportClient *This, BSTR *pbszName); HRESULT (STDMETHODCALLTYPE *get_MacAddress)( - IWdsTransportClient* This, + IWdsTransportClient *This, BSTR *pbszMacAddress); HRESULT (STDMETHODCALLTYPE *get_IpAddress)( - IWdsTransportClient* This, + IWdsTransportClient *This, BSTR *pbszIpAddress); HRESULT (STDMETHODCALLTYPE *get_PercentCompletion)( - IWdsTransportClient* This, + IWdsTransportClient *This, ULONG *pulPercentCompletion); HRESULT (STDMETHODCALLTYPE *get_JoinDuration)( - IWdsTransportClient* This, + IWdsTransportClient *This, ULONG *pulJoinDuration); HRESULT (STDMETHODCALLTYPE *get_CpuUtilization)( - IWdsTransportClient* This, + IWdsTransportClient *This, ULONG *pulCpuUtilization); HRESULT (STDMETHODCALLTYPE *get_MemoryUtilization)( - IWdsTransportClient* This, + IWdsTransportClient *This, ULONG *pulMemoryUtilization); HRESULT (STDMETHODCALLTYPE *get_NetworkUtilization)( - IWdsTransportClient* This, + IWdsTransportClient *This, ULONG *pulNetworkUtilization); HRESULT (STDMETHODCALLTYPE *get_UserIdentity)( - IWdsTransportClient* This, + IWdsTransportClient *This, BSTR *pbszUserIdentity); HRESULT (STDMETHODCALLTYPE *Disconnect)( - IWdsTransportClient* This, + IWdsTransportClient *This, WDSTRANSPORT_DISCONNECT_TYPE DisconnectionType); END_INTERFACE } IWdsTransportClientVtbl; + interface IWdsTransportClient { CONST_VTBL IWdsTransportClientVtbl* lpVtbl; }; @@ -6409,102 +5743,6 @@ static FORCEINLINE HRESULT IWdsTransportClient_Disconnect(IWdsTransportClient* T #endif -HRESULT STDMETHODCALLTYPE IWdsTransportClient_get_Session_Proxy( - IWdsTransportClient* This, - IWdsTransportSession **ppWdsTransportSession); -void __RPC_STUB IWdsTransportClient_get_Session_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportClient_get_Id_Proxy( - IWdsTransportClient* This, - ULONG *pulId); -void __RPC_STUB IWdsTransportClient_get_Id_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportClient_get_Name_Proxy( - IWdsTransportClient* This, - BSTR *pbszName); -void __RPC_STUB IWdsTransportClient_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportClient_get_MacAddress_Proxy( - IWdsTransportClient* This, - BSTR *pbszMacAddress); -void __RPC_STUB IWdsTransportClient_get_MacAddress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportClient_get_IpAddress_Proxy( - IWdsTransportClient* This, - BSTR *pbszIpAddress); -void __RPC_STUB IWdsTransportClient_get_IpAddress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportClient_get_PercentCompletion_Proxy( - IWdsTransportClient* This, - ULONG *pulPercentCompletion); -void __RPC_STUB IWdsTransportClient_get_PercentCompletion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportClient_get_JoinDuration_Proxy( - IWdsTransportClient* This, - ULONG *pulJoinDuration); -void __RPC_STUB IWdsTransportClient_get_JoinDuration_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportClient_get_CpuUtilization_Proxy( - IWdsTransportClient* This, - ULONG *pulCpuUtilization); -void __RPC_STUB IWdsTransportClient_get_CpuUtilization_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportClient_get_MemoryUtilization_Proxy( - IWdsTransportClient* This, - ULONG *pulMemoryUtilization); -void __RPC_STUB IWdsTransportClient_get_MemoryUtilization_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportClient_get_NetworkUtilization_Proxy( - IWdsTransportClient* This, - ULONG *pulNetworkUtilization); -void __RPC_STUB IWdsTransportClient_get_NetworkUtilization_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportClient_get_UserIdentity_Proxy( - IWdsTransportClient* This, - BSTR *pbszUserIdentity); -void __RPC_STUB IWdsTransportClient_get_UserIdentity_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportClient_Disconnect_Proxy( - IWdsTransportClient* This, - WDSTRANSPORT_DISCONNECT_TYPE DisconnectionType); -void __RPC_STUB IWdsTransportClient_Disconnect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWdsTransportClient_INTERFACE_DEFINED__ */ @@ -6551,29 +5789,29 @@ typedef struct IWdsTransportTftpClientVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportTftpClient* This, + IWdsTransportTftpClient *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportTftpClient* This); + IWdsTransportTftpClient *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportTftpClient* This); + IWdsTransportTftpClient *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportTftpClient* This, + IWdsTransportTftpClient *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportTftpClient* This, + IWdsTransportTftpClient *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportTftpClient* This, + IWdsTransportTftpClient *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -6581,7 +5819,7 @@ typedef struct IWdsTransportTftpClientVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportTftpClient* This, + IWdsTransportTftpClient *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -6593,35 +5831,36 @@ typedef struct IWdsTransportTftpClientVtbl { /*** IWdsTransportTftpClient methods ***/ HRESULT (STDMETHODCALLTYPE *get_FileName)( - IWdsTransportTftpClient* This, + IWdsTransportTftpClient *This, BSTR *pbszFileName); HRESULT (STDMETHODCALLTYPE *get_IpAddress)( - IWdsTransportTftpClient* This, + IWdsTransportTftpClient *This, BSTR *pbszIpAddress); HRESULT (STDMETHODCALLTYPE *get_Timeout)( - IWdsTransportTftpClient* This, + IWdsTransportTftpClient *This, ULONG *pulTimeout); HRESULT (STDMETHODCALLTYPE *get_CurrentFileOffset)( - IWdsTransportTftpClient* This, + IWdsTransportTftpClient *This, ULONG64 *pul64CurrentOffset); HRESULT (STDMETHODCALLTYPE *get_FileSize)( - IWdsTransportTftpClient* This, + IWdsTransportTftpClient *This, ULONG64 *pul64FileSize); HRESULT (STDMETHODCALLTYPE *get_BlockSize)( - IWdsTransportTftpClient* This, + IWdsTransportTftpClient *This, ULONG *pulBlockSize); HRESULT (STDMETHODCALLTYPE *get_WindowSize)( - IWdsTransportTftpClient* This, + IWdsTransportTftpClient *This, ULONG *pulWindowSize); END_INTERFACE } IWdsTransportTftpClientVtbl; + interface IWdsTransportTftpClient { CONST_VTBL IWdsTransportTftpClientVtbl* lpVtbl; }; @@ -6696,62 +5935,6 @@ static FORCEINLINE HRESULT IWdsTransportTftpClient_get_WindowSize(IWdsTransportT #endif -HRESULT STDMETHODCALLTYPE IWdsTransportTftpClient_get_FileName_Proxy( - IWdsTransportTftpClient* This, - BSTR *pbszFileName); -void __RPC_STUB IWdsTransportTftpClient_get_FileName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportTftpClient_get_IpAddress_Proxy( - IWdsTransportTftpClient* This, - BSTR *pbszIpAddress); -void __RPC_STUB IWdsTransportTftpClient_get_IpAddress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportTftpClient_get_Timeout_Proxy( - IWdsTransportTftpClient* This, - ULONG *pulTimeout); -void __RPC_STUB IWdsTransportTftpClient_get_Timeout_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportTftpClient_get_CurrentFileOffset_Proxy( - IWdsTransportTftpClient* This, - ULONG64 *pul64CurrentOffset); -void __RPC_STUB IWdsTransportTftpClient_get_CurrentFileOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportTftpClient_get_FileSize_Proxy( - IWdsTransportTftpClient* This, - ULONG64 *pul64FileSize); -void __RPC_STUB IWdsTransportTftpClient_get_FileSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportTftpClient_get_BlockSize_Proxy( - IWdsTransportTftpClient* This, - ULONG *pulBlockSize); -void __RPC_STUB IWdsTransportTftpClient_get_BlockSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportTftpClient_get_WindowSize_Proxy( - IWdsTransportTftpClient* This, - ULONG *pulWindowSize); -void __RPC_STUB IWdsTransportTftpClient_get_WindowSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWdsTransportTftpClient_INTERFACE_DEFINED__ */ @@ -6789,29 +5972,29 @@ typedef struct IWdsTransportContentProviderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWdsTransportContentProvider* This, + IWdsTransportContentProvider *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWdsTransportContentProvider* This); + IWdsTransportContentProvider *This); ULONG (STDMETHODCALLTYPE *Release)( - IWdsTransportContentProvider* This); + IWdsTransportContentProvider *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWdsTransportContentProvider* This, + IWdsTransportContentProvider *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWdsTransportContentProvider* This, + IWdsTransportContentProvider *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWdsTransportContentProvider* This, + IWdsTransportContentProvider *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -6819,7 +6002,7 @@ typedef struct IWdsTransportContentProviderVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWdsTransportContentProvider* This, + IWdsTransportContentProvider *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -6831,23 +6014,24 @@ typedef struct IWdsTransportContentProviderVtbl { /*** IWdsTransportContentProvider methods ***/ HRESULT (STDMETHODCALLTYPE *get_Name)( - IWdsTransportContentProvider* This, + IWdsTransportContentProvider *This, BSTR *pbszName); HRESULT (STDMETHODCALLTYPE *get_Description)( - IWdsTransportContentProvider* This, + IWdsTransportContentProvider *This, BSTR *pbszDescription); HRESULT (STDMETHODCALLTYPE *get_FilePath)( - IWdsTransportContentProvider* This, + IWdsTransportContentProvider *This, BSTR *pbszFilePath); HRESULT (STDMETHODCALLTYPE *get_InitializationRoutine)( - IWdsTransportContentProvider* This, + IWdsTransportContentProvider *This, BSTR *pbszInitializationRoutine); END_INTERFACE } IWdsTransportContentProviderVtbl; + interface IWdsTransportContentProvider { CONST_VTBL IWdsTransportContentProviderVtbl* lpVtbl; }; @@ -6910,38 +6094,6 @@ static FORCEINLINE HRESULT IWdsTransportContentProvider_get_InitializationRoutin #endif -HRESULT STDMETHODCALLTYPE IWdsTransportContentProvider_get_Name_Proxy( - IWdsTransportContentProvider* This, - BSTR *pbszName); -void __RPC_STUB IWdsTransportContentProvider_get_Name_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportContentProvider_get_Description_Proxy( - IWdsTransportContentProvider* This, - BSTR *pbszDescription); -void __RPC_STUB IWdsTransportContentProvider_get_Description_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportContentProvider_get_FilePath_Proxy( - IWdsTransportContentProvider* This, - BSTR *pbszFilePath); -void __RPC_STUB IWdsTransportContentProvider_get_FilePath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWdsTransportContentProvider_get_InitializationRoutine_Proxy( - IWdsTransportContentProvider* This, - BSTR *pbszInitializationRoutine); -void __RPC_STUB IWdsTransportContentProvider_get_InitializationRoutine_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWdsTransportContentProvider_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/winbase.h b/lib/libc/include/any-windows-any/winbase.h index 2b473785c5..d76efaf470 100644 --- a/lib/libc/include/any-windows-any/winbase.h +++ b/lib/libc/include/any-windows-any/winbase.h @@ -1204,17 +1204,6 @@ extern "C" { WINBASEAPI WINBOOL WINAPI SetThreadInformation (HANDLE hThread, THREAD_INFORMATION_CLASS ThreadInformationClass, LPVOID ThreadInformation, DWORD ThreadInformationSize); WINBASEAPI WINBOOL WINAPI GetProcessInformation (HANDLE hProcess, PROCESS_INFORMATION_CLASS ProcessInformationClass, LPVOID ProcessInformation, DWORD ProcessInformationSize); WINBASEAPI WINBOOL WINAPI SetProcessInformation (HANDLE hProcess, PROCESS_INFORMATION_CLASS ProcessInformationClass, LPVOID ProcessInformation, DWORD ProcessInformationSize); - -#define MEMORY_PRIORITY_LOWEST 0 -#define MEMORY_PRIORITY_VERY_LOW 1 -#define MEMORY_PRIORITY_LOW 2 -#define MEMORY_PRIORITY_MEDIUM 3 -#define MEMORY_PRIORITY_BELOW_NORMAL 4 -#define MEMORY_PRIORITY_NORMAL 5 - - typedef struct _MEMORY_PRIORITY_INFORMATION { - ULONG MemoryPriority; - } MEMORY_PRIORITY_INFORMATION,*PMEMORY_PRIORITY_INFORMATION; #endif #if _WIN32_WINNT >= 0x0600 @@ -1597,6 +1586,24 @@ extern "C" { #endif #if _WIN32_WINNT >= 0x0602 ,ProcThreadAttributeSecurityCapabilities = 9 +#endif + ,ProcThreadAttributeProtectionLevel = 11 +#if _WIN32_WINNT >= 0x0603 +#endif +#if _WIN32_WINNT >= 0x0A00 + ,ProcThreadAttributeJobList = 13 + ,ProcThreadAttributeChildProcessPolicy = 14 + ,ProcThreadAttributeAllApplicationPackagesPolicy = 15 + ,ProcThreadAttributeWin32kFilter = 16 +#endif +#if NTDDI_VERSION >= 0x0A000002 + ,ProcThreadAttributeSafeOpenPromptOriginClaim = 17 +#endif +#if NTDDI_VERSION >= 0x0A000003 + ,ProcThreadAttributeDesktopAppPolicy = 18 +#endif +#if NTDDI_VERSION >= 0x0A000006 + ,ProcThreadAttributePseudoConsole = 22 #endif } PROC_THREAD_ATTRIBUTE_NUM; #endif @@ -1613,7 +1620,22 @@ extern "C" { #define PROC_THREAD_ATTRIBUTE_IDEAL_PROCESSOR ProcThreadAttributeValue (ProcThreadAttributeIdealProcessor, TRUE, TRUE, FALSE) #define PROC_THREAD_ATTRIBUTE_UMS_THREAD ProcThreadAttributeValue (ProcThreadAttributeUmsThread, TRUE, TRUE, FALSE) #define PROC_THREAD_ATTRIBUTE_MITIGATION_POLICY ProcThreadAttributeValue (ProcThreadAttributeMitigationPolicy, FALSE, TRUE, FALSE) +#endif +#if _WIN32_WINNT >= 0x0602 +#define PROC_THREAD_ATTRIBUTE_SECURITY_CAPABILITIES ProcThreadAttributeValue (ProcThreadAttributeSecurityCapabilities, FALSE, TRUE, FALSE) +#endif + +#define PROC_THREAD_ATTRIBUTE_PROTECTION_LEVEL ProcThreadAttributeValue (ProcThreadAttributeProtectionLevel, FALSE, TRUE, FALSE) + +#if _WIN32_WINNT >= 0x0603 +#endif + +#if NTDDI_VERSION >= 0x0A000006 +#define PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE ProcThreadAttributeValue (ProcThreadAttributePseudoConsole, FALSE, TRUE, FALSE) +#endif + +#if _WIN32_WINNT >= 0x0601 #define PROCESS_CREATION_MITIGATION_POLICY_DEP_ENABLE 0x01 #define PROCESS_CREATION_MITIGATION_POLICY_DEP_ATL_THUNK_ENABLE 0x02 #define PROCESS_CREATION_MITIGATION_POLICY_SEHOP_ENABLE 0x04 @@ -1799,14 +1821,10 @@ extern "C" { WINBASEAPI WINBOOL WINAPI GetPrivateProfileStructW (LPCWSTR lpszSection, LPCWSTR lpszKey, LPVOID lpStruct, UINT uSizeStruct, LPCWSTR szFile); WINBASEAPI WINBOOL WINAPI WritePrivateProfileStructA (LPCSTR lpszSection, LPCSTR lpszKey, LPVOID lpStruct, UINT uSizeStruct, LPCSTR szFile); WINBASEAPI WINBOOL WINAPI WritePrivateProfileStructW (LPCWSTR lpszSection, LPCWSTR lpszKey, LPVOID lpStruct, UINT uSizeStruct, LPCWSTR szFile); - WINBASEAPI DWORD WINAPI GetTempPathA (DWORD nBufferLength, LPSTR lpBuffer); - WINBASEAPI UINT WINAPI GetTempFileNameA (LPCSTR lpPathName, LPCSTR lpPrefixString, UINT uUnique, LPSTR lpTempFileName); #ifndef UNICODE #define GetStartupInfo GetStartupInfoA #define FindResourceEx FindResourceExA -#define GetTempPath GetTempPathA -#define GetTempFileName GetTempFileNameA #endif #define FatalAppExit __MINGW_NAME_AW(FatalAppExit) @@ -1956,15 +1974,20 @@ extern "C" { #endif #endif -#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= _WIN32_WINNT_WIN10 typedef DWORD (WINAPI *LPPROGRESS_ROUTINE) (LARGE_INTEGER TotalFileSize, LARGE_INTEGER TotalBytesTransferred, LARGE_INTEGER StreamSize, LARGE_INTEGER StreamBytesTransferred, DWORD dwStreamNumber, DWORD dwCallbackReason, HANDLE hSourceFile, HANDLE hDestinationFile, LPVOID lpData); + WINBASEAPI WINBOOL WINAPI CopyFileExA (LPCSTR lpExistingFileName, LPCSTR lpNewFileName, LPPROGRESS_ROUTINE lpProgressRoutine, LPVOID lpData, LPBOOL pbCancel, DWORD dwCopyFlags); + WINBASEAPI WINBOOL WINAPI CopyFileExW (LPCWSTR lpExistingFileName, LPCWSTR lpNewFileName, LPPROGRESS_ROUTINE lpProgressRoutine, LPVOID lpData, LPBOOL pbCancel, DWORD dwCopyFlags); + +#define CopyFileEx __MINGW_NAME_AW(CopyFileEx) +#endif + +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) WINBASEAPI WINBOOL WINAPI CheckNameLegalDOS8Dot3A (LPCSTR lpName, LPSTR lpOemName, DWORD OemNameSize, PBOOL pbNameContainsSpaces, PBOOL pbNameLegal); WINBASEAPI WINBOOL WINAPI CheckNameLegalDOS8Dot3W (LPCWSTR lpName, LPSTR lpOemName, DWORD OemNameSize, PBOOL pbNameContainsSpaces, PBOOL pbNameLegal); WINBASEAPI WINBOOL WINAPI CopyFileA (LPCSTR lpExistingFileName, LPCSTR lpNewFileName, WINBOOL bFailIfExists); WINBASEAPI WINBOOL WINAPI CopyFileW (LPCWSTR lpExistingFileName, LPCWSTR lpNewFileName, WINBOOL bFailIfExists); - WINBASEAPI WINBOOL WINAPI CopyFileExA (LPCSTR lpExistingFileName, LPCSTR lpNewFileName, LPPROGRESS_ROUTINE lpProgressRoutine, LPVOID lpData, LPBOOL pbCancel, DWORD dwCopyFlags); - WINBASEAPI WINBOOL WINAPI CopyFileExW (LPCWSTR lpExistingFileName, LPCWSTR lpNewFileName, LPPROGRESS_ROUTINE lpProgressRoutine, LPVOID lpData, LPBOOL pbCancel, DWORD dwCopyFlags); #if _WIN32_WINNT >= 0x0600 WINBASEAPI HANDLE WINAPI FindFirstFileTransactedA (LPCSTR lpFileName, FINDEX_INFO_LEVELS fInfoLevelId, LPVOID lpFindFileData, FINDEX_SEARCH_OPS fSearchOp, LPVOID lpSearchFilter, DWORD dwAdditionalFlags, HANDLE hTransaction); @@ -1978,7 +2001,6 @@ extern "C" { #define CheckNameLegalDOS8Dot3 __MINGW_NAME_AW(CheckNameLegalDOS8Dot3) #define CopyFile __MINGW_NAME_AW(CopyFile) -#define CopyFileEx __MINGW_NAME_AW(CopyFileEx) #endif @@ -2021,58 +2043,58 @@ extern "C" { DWORD dwPadding; union { struct { - DWORD dwStreamNumber; - DWORD dwReserved; - HANDLE hSourceFile; - HANDLE hDestinationFile; - ULARGE_INTEGER uliChunkNumber; - ULARGE_INTEGER uliChunkSize; - ULARGE_INTEGER uliStreamSize; - ULARGE_INTEGER uliTotalFileSize; + DWORD dwStreamNumber; + DWORD dwReserved; + HANDLE hSourceFile; + HANDLE hDestinationFile; + ULARGE_INTEGER uliChunkNumber; + ULARGE_INTEGER uliChunkSize; + ULARGE_INTEGER uliStreamSize; + ULARGE_INTEGER uliTotalFileSize; } ChunkStarted; struct { - DWORD dwStreamNumber; - DWORD dwFlags; - HANDLE hSourceFile; - HANDLE hDestinationFile; - ULARGE_INTEGER uliChunkNumber; - ULARGE_INTEGER uliChunkSize; - ULARGE_INTEGER uliStreamSize; - ULARGE_INTEGER uliStreamBytesTransferred; - ULARGE_INTEGER uliTotalFileSize; - ULARGE_INTEGER uliTotalBytesTransferred; + DWORD dwStreamNumber; + DWORD dwFlags; + HANDLE hSourceFile; + HANDLE hDestinationFile; + ULARGE_INTEGER uliChunkNumber; + ULARGE_INTEGER uliChunkSize; + ULARGE_INTEGER uliStreamSize; + ULARGE_INTEGER uliStreamBytesTransferred; + ULARGE_INTEGER uliTotalFileSize; + ULARGE_INTEGER uliTotalBytesTransferred; } ChunkFinished; struct { - DWORD dwStreamNumber; - DWORD dwReserved; - HANDLE hSourceFile; - HANDLE hDestinationFile; - ULARGE_INTEGER uliStreamSize; - ULARGE_INTEGER uliTotalFileSize; + DWORD dwStreamNumber; + DWORD dwReserved; + HANDLE hSourceFile; + HANDLE hDestinationFile; + ULARGE_INTEGER uliStreamSize; + ULARGE_INTEGER uliTotalFileSize; } StreamStarted; struct { - DWORD dwStreamNumber; - DWORD dwReserved; - HANDLE hSourceFile; - HANDLE hDestinationFile; - ULARGE_INTEGER uliStreamSize; - ULARGE_INTEGER uliStreamBytesTransferred; - ULARGE_INTEGER uliTotalFileSize; - ULARGE_INTEGER uliTotalBytesTransferred; + DWORD dwStreamNumber; + DWORD dwReserved; + HANDLE hSourceFile; + HANDLE hDestinationFile; + ULARGE_INTEGER uliStreamSize; + ULARGE_INTEGER uliStreamBytesTransferred; + ULARGE_INTEGER uliTotalFileSize; + ULARGE_INTEGER uliTotalBytesTransferred; } StreamFinished; struct { - DWORD dwReserved; + DWORD dwReserved; } PollContinue; struct { - COPYFILE2_COPY_PHASE CopyPhase; - DWORD dwStreamNumber; - HRESULT hrFailure; - DWORD dwReserved; - ULARGE_INTEGER uliChunkNumber; - ULARGE_INTEGER uliStreamSize; - ULARGE_INTEGER uliStreamBytesTransferred; - ULARGE_INTEGER uliTotalFileSize; - ULARGE_INTEGER uliTotalBytesTransferred; + COPYFILE2_COPY_PHASE CopyPhase; + DWORD dwStreamNumber; + HRESULT hrFailure; + DWORD dwReserved; + ULARGE_INTEGER uliChunkNumber; + ULARGE_INTEGER uliStreamSize; + ULARGE_INTEGER uliStreamBytesTransferred; + ULARGE_INTEGER uliTotalFileSize; + ULARGE_INTEGER uliTotalBytesTransferred; } Error; } Info; } COPYFILE2_MESSAGE; @@ -2128,6 +2150,23 @@ extern "C" { #define MOVEFILE_FAIL_IF_NOT_TRACKABLE 0x00000020 #endif +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= _WIN32_WINNT_WIN10 + WINBASEAPI WINBOOL WINAPI GetNamedPipeClientComputerNameA (HANDLE Pipe, LPSTR ClientComputerName, ULONG ClientComputerNameLength); + WINBASEAPI WINBOOL WINAPI GetNamedPipeHandleStateA (HANDLE hNamedPipe, LPDWORD lpState, LPDWORD lpCurInstances, LPDWORD lpMaxCollectionCount, LPDWORD lpCollectDataTimeout, LPSTR lpUserName, DWORD nMaxUserNameSize); + WINBASEAPI WINBOOL WINAPI WaitNamedPipeA (LPCSTR lpNamedPipeName, DWORD nTimeOut); + WINBASEAPI WINBOOL WINAPI CallNamedPipeA (LPCSTR lpNamedPipeName, LPVOID lpInBuffer, DWORD nInBufferSize, LPVOID lpOutBuffer, DWORD nOutBufferSize, LPDWORD lpBytesRead, DWORD nTimeOut); + WINBASEAPI WINBOOL WINAPI CallNamedPipeW (LPCWSTR lpNamedPipeName, LPVOID lpInBuffer, DWORD nInBufferSize, LPVOID lpOutBuffer, DWORD nOutBufferSize, LPDWORD lpBytesRead, DWORD nTimeOut); + WINBASEAPI HANDLE WINAPI CreateNamedPipeA (LPCSTR lpName, DWORD dwOpenMode, DWORD dwPipeMode, DWORD nMaxInstances, DWORD nOutBufferSize, DWORD nInBufferSize, DWORD nDefaultTimeOut, LPSECURITY_ATTRIBUTES lpSecurityAttributes); + +#ifndef UNICODE +#define WaitNamedPipe WaitNamedPipeA +#define CreateNamedPipe CreateNamedPipeA +#endif + +#define CallNamedPipe __MINGW_NAME_AW(CallNamedPipe) + +#endif + #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) WINBASEAPI WINBOOL WINAPI ReplaceFileA (LPCSTR lpReplacedFileName, LPCSTR lpReplacementFileName, LPCSTR lpBackupFileName, DWORD dwReplaceFlags, LPVOID lpExclude, LPVOID lpReserved); WINBASEAPI WINBOOL WINAPI ReplaceFileW (LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileName, LPCWSTR lpBackupFileName, DWORD dwReplaceFlags, LPVOID lpExclude, LPVOID lpReserved); @@ -2161,7 +2200,6 @@ extern "C" { WINBASEAPI HANDLE WINAPI FindFirstFileNameW (LPCWSTR lpFileName, DWORD dwFlags, LPDWORD StringLength, PWSTR LinkName); WINBASEAPI WINBOOL APIENTRY FindNextFileNameW (HANDLE hFindStream, LPDWORD StringLength, PWSTR LinkName); WINBASEAPI HANDLE WINAPI FindFirstFileNameTransactedW (LPCWSTR lpFileName, DWORD dwFlags, LPDWORD StringLength, PWSTR LinkName, HANDLE hTransaction); - WINBASEAPI WINBOOL WINAPI GetNamedPipeClientComputerNameA (HANDLE Pipe, LPSTR ClientComputerName, ULONG ClientComputerNameLength); WINBASEAPI WINBOOL WINAPI GetNamedPipeClientProcessId (HANDLE Pipe, PULONG ClientProcessId); WINBASEAPI WINBOOL WINAPI GetNamedPipeClientSessionId (HANDLE Pipe, PULONG ClientSessionId); WINBASEAPI WINBOOL WINAPI GetNamedPipeServerProcessId (HANDLE Pipe, PULONG ServerProcessId); @@ -2169,12 +2207,7 @@ extern "C" { WINBASEAPI WINBOOL WINAPI SetFileBandwidthReservation (HANDLE hFile, DWORD nPeriodMilliseconds, DWORD nBytesPerPeriod, WINBOOL bDiscardable, LPDWORD lpTransferSize, LPDWORD lpNumOutstandingRequests); WINBASEAPI WINBOOL WINAPI GetFileBandwidthReservation (HANDLE hFile, LPDWORD lpPeriodMilliseconds, LPDWORD lpBytesPerPeriod, LPBOOL pDiscardable, LPDWORD lpTransferSize, LPDWORD lpNumOutstandingRequests); #endif - WINBASEAPI HANDLE WINAPI CreateNamedPipeA (LPCSTR lpName, DWORD dwOpenMode, DWORD dwPipeMode, DWORD nMaxInstances, DWORD nOutBufferSize, DWORD nInBufferSize, DWORD nDefaultTimeOut, LPSECURITY_ATTRIBUTES lpSecurityAttributes); - WINBASEAPI WINBOOL WINAPI GetNamedPipeHandleStateA (HANDLE hNamedPipe, LPDWORD lpState, LPDWORD lpCurInstances, LPDWORD lpMaxCollectionCount, LPDWORD lpCollectDataTimeout, LPSTR lpUserName, DWORD nMaxUserNameSize); WINBASEAPI WINBOOL WINAPI GetNamedPipeHandleStateW (HANDLE hNamedPipe, LPDWORD lpState, LPDWORD lpCurInstances, LPDWORD lpMaxCollectionCount, LPDWORD lpCollectDataTimeout, LPWSTR lpUserName, DWORD nMaxUserNameSize); - WINBASEAPI WINBOOL WINAPI CallNamedPipeA (LPCSTR lpNamedPipeName, LPVOID lpInBuffer, DWORD nInBufferSize, LPVOID lpOutBuffer, DWORD nOutBufferSize, LPDWORD lpBytesRead, DWORD nTimeOut); - WINBASEAPI WINBOOL WINAPI CallNamedPipeW (LPCWSTR lpNamedPipeName, LPVOID lpInBuffer, DWORD nInBufferSize, LPVOID lpOutBuffer, DWORD nOutBufferSize, LPDWORD lpBytesRead, DWORD nTimeOut); - WINBASEAPI WINBOOL WINAPI WaitNamedPipeA (LPCSTR lpNamedPipeName, DWORD nTimeOut); WINBASEAPI WINBOOL WINAPI SetVolumeLabelA (LPCSTR lpRootPathName, LPCSTR lpVolumeName); WINBASEAPI WINBOOL WINAPI SetVolumeLabelW (LPCWSTR lpRootPathName, LPCWSTR lpVolumeName); WINBASEAPI VOID WINAPI SetFileApisToOEM (VOID); @@ -2202,13 +2235,10 @@ extern "C" { WINADVAPI WINBOOL WINAPI ReportEventW (HANDLE hEventLog, WORD wType, WORD wCategory, DWORD dwEventID, PSID lpUserSid, WORD wNumStrings, DWORD dwDataSize, LPCWSTR *lpStrings, LPVOID lpRawData); #ifndef UNICODE -#define CreateNamedPipe CreateNamedPipeA -#define WaitNamedPipe WaitNamedPipeA #define GetVolumeInformation GetVolumeInformationA #endif #define GetNamedPipeHandleState __MINGW_NAME_AW(GetNamedPipeHandleState) -#define CallNamedPipe __MINGW_NAME_AW(CallNamedPipe) #define SetVolumeLabel __MINGW_NAME_AW(SetVolumeLabel) #define ClearEventLog __MINGW_NAME_AW(ClearEventLog) #define BackupEventLog __MINGW_NAME_AW(BackupEventLog) @@ -2256,6 +2286,14 @@ extern "C" { WINADVAPI WINBOOL WINAPI OperationEnd (OPERATION_END_PARAMETERS *OperationEndParams); #endif +#endif + +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= _WIN32_WINNT_WIN10 + WINBASEAPI WINBOOL WINAPI ReadDirectoryChangesW (HANDLE hDirectory, LPVOID lpBuffer, DWORD nBufferLength, WINBOOL bWatchSubtree, DWORD dwNotifyFilter, LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped, LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine); +#endif + +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) + WINADVAPI WINBOOL WINAPI AccessCheckAndAuditAlarmA (LPCSTR SubsystemName, LPVOID HandleId, LPSTR ObjectTypeName, LPSTR ObjectName, PSECURITY_DESCRIPTOR SecurityDescriptor, DWORD DesiredAccess, PGENERIC_MAPPING GenericMapping, WINBOOL ObjectCreation, LPDWORD GrantedAccess, LPBOOL AccessStatus, LPBOOL pfGenerateOnClose); WINADVAPI WINBOOL WINAPI AccessCheckByTypeAndAuditAlarmA (LPCSTR SubsystemName, LPVOID HandleId, LPCSTR ObjectTypeName, LPCSTR ObjectName, PSECURITY_DESCRIPTOR SecurityDescriptor, PSID PrincipalSelfSid, DWORD DesiredAccess, AUDIT_EVENT_TYPE AuditType, DWORD Flags, POBJECT_TYPE_LIST ObjectTypeList, DWORD ObjectTypeListLength, PGENERIC_MAPPING GenericMapping, WINBOOL ObjectCreation, LPDWORD GrantedAccess, LPBOOL AccessStatus, LPBOOL pfGenerateOnClose); WINADVAPI WINBOOL WINAPI AccessCheckByTypeResultListAndAuditAlarmA (LPCSTR SubsystemName, LPVOID HandleId, LPCSTR ObjectTypeName, LPCSTR ObjectName, PSECURITY_DESCRIPTOR SecurityDescriptor, PSID PrincipalSelfSid, DWORD DesiredAccess, AUDIT_EVENT_TYPE AuditType, DWORD Flags, POBJECT_TYPE_LIST ObjectTypeList, DWORD ObjectTypeListLength, PGENERIC_MAPPING GenericMapping, WINBOOL ObjectCreation, LPDWORD GrantedAccess, LPDWORD AccessStatusList, LPBOOL pfGenerateOnClose); @@ -2267,7 +2305,6 @@ extern "C" { WINADVAPI WINBOOL WINAPI PrivilegedServiceAuditAlarmA (LPCSTR SubsystemName, LPCSTR ServiceName, HANDLE ClientToken, PPRIVILEGE_SET Privileges, WINBOOL AccessGranted); WINADVAPI WINBOOL WINAPI SetFileSecurityA (LPCSTR lpFileName, SECURITY_INFORMATION SecurityInformation, PSECURITY_DESCRIPTOR pSecurityDescriptor); WINADVAPI WINBOOL WINAPI GetFileSecurityA (LPCSTR lpFileName, SECURITY_INFORMATION RequestedInformation, PSECURITY_DESCRIPTOR pSecurityDescriptor, DWORD nLength, LPDWORD lpnLengthNeeded); - WINBASEAPI WINBOOL WINAPI ReadDirectoryChangesW (HANDLE hDirectory, LPVOID lpBuffer, DWORD nBufferLength, WINBOOL bWatchSubtree, DWORD dwNotifyFilter, LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped, LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine); WINBASEAPI WINBOOL WINAPI IsBadReadPtr (CONST VOID *lp, UINT_PTR ucb); WINBASEAPI WINBOOL WINAPI IsBadWritePtr (LPVOID lp, UINT_PTR ucb); WINBASEAPI WINBOOL WINAPI IsBadHugeReadPtr (CONST VOID *lp, UINT_PTR ucb); @@ -2917,13 +2954,13 @@ extern "C" { #else union { struct { - struct { - ULONG Capabilities; - } Server; - struct { - ULONG Capabilities; - ULONG CachingFlags; - } Share; + struct { + ULONG Capabilities; + } Server; + struct { + ULONG Capabilities; + ULONG CachingFlags; + } Share; } Smb2; ULONG Reserved[16]; } ProtocolSpecific; diff --git a/lib/libc/include/any-windows-any/wincodec.h b/lib/libc/include/any-windows-any/wincodec.h index 8c750ea8de..23d47dd88e 100644 --- a/lib/libc/include/any-windows-any/wincodec.h +++ b/lib/libc/include/any-windows-any/wincodec.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/wincodec.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/wincodec.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,136 +21,217 @@ #ifndef __IWICColorContext_FWD_DEFINED__ #define __IWICColorContext_FWD_DEFINED__ typedef interface IWICColorContext IWICColorContext; +#ifdef __cplusplus +interface IWICColorContext; +#endif /* __cplusplus */ #endif #ifndef __IWICBitmapSource_FWD_DEFINED__ #define __IWICBitmapSource_FWD_DEFINED__ typedef interface IWICBitmapSource IWICBitmapSource; +#ifdef __cplusplus +interface IWICBitmapSource; +#endif /* __cplusplus */ #endif #ifndef __IWICBitmapLock_FWD_DEFINED__ #define __IWICBitmapLock_FWD_DEFINED__ typedef interface IWICBitmapLock IWICBitmapLock; +#ifdef __cplusplus +interface IWICBitmapLock; +#endif /* __cplusplus */ #endif #ifndef __IWICBitmapFlipRotator_FWD_DEFINED__ #define __IWICBitmapFlipRotator_FWD_DEFINED__ typedef interface IWICBitmapFlipRotator IWICBitmapFlipRotator; +#ifdef __cplusplus +interface IWICBitmapFlipRotator; +#endif /* __cplusplus */ #endif #ifndef __IWICBitmap_FWD_DEFINED__ #define __IWICBitmap_FWD_DEFINED__ typedef interface IWICBitmap IWICBitmap; +#ifdef __cplusplus +interface IWICBitmap; +#endif /* __cplusplus */ #endif #ifndef __IWICPalette_FWD_DEFINED__ #define __IWICPalette_FWD_DEFINED__ typedef interface IWICPalette IWICPalette; +#ifdef __cplusplus +interface IWICPalette; +#endif /* __cplusplus */ #endif #ifndef __IWICComponentInfo_FWD_DEFINED__ #define __IWICComponentInfo_FWD_DEFINED__ typedef interface IWICComponentInfo IWICComponentInfo; +#ifdef __cplusplus +interface IWICComponentInfo; +#endif /* __cplusplus */ #endif #ifndef __IWICMetadataQueryReader_FWD_DEFINED__ #define __IWICMetadataQueryReader_FWD_DEFINED__ typedef interface IWICMetadataQueryReader IWICMetadataQueryReader; +#ifdef __cplusplus +interface IWICMetadataQueryReader; +#endif /* __cplusplus */ #endif #ifndef __IWICMetadataQueryWriter_FWD_DEFINED__ #define __IWICMetadataQueryWriter_FWD_DEFINED__ typedef interface IWICMetadataQueryWriter IWICMetadataQueryWriter; +#ifdef __cplusplus +interface IWICMetadataQueryWriter; +#endif /* __cplusplus */ #endif #ifndef __IWICBitmapFrameDecode_FWD_DEFINED__ #define __IWICBitmapFrameDecode_FWD_DEFINED__ typedef interface IWICBitmapFrameDecode IWICBitmapFrameDecode; +#ifdef __cplusplus +interface IWICBitmapFrameDecode; +#endif /* __cplusplus */ #endif #ifndef __IWICPixelFormatInfo_FWD_DEFINED__ #define __IWICPixelFormatInfo_FWD_DEFINED__ typedef interface IWICPixelFormatInfo IWICPixelFormatInfo; +#ifdef __cplusplus +interface IWICPixelFormatInfo; +#endif /* __cplusplus */ #endif #ifndef __IWICPixelFormatInfo2_FWD_DEFINED__ #define __IWICPixelFormatInfo2_FWD_DEFINED__ typedef interface IWICPixelFormatInfo2 IWICPixelFormatInfo2; +#ifdef __cplusplus +interface IWICPixelFormatInfo2; +#endif /* __cplusplus */ #endif #ifndef __IWICBitmapCodecInfo_FWD_DEFINED__ #define __IWICBitmapCodecInfo_FWD_DEFINED__ typedef interface IWICBitmapCodecInfo IWICBitmapCodecInfo; +#ifdef __cplusplus +interface IWICBitmapCodecInfo; +#endif /* __cplusplus */ #endif #ifndef __IWICBitmapDecoderInfo_FWD_DEFINED__ #define __IWICBitmapDecoderInfo_FWD_DEFINED__ typedef interface IWICBitmapDecoderInfo IWICBitmapDecoderInfo; +#ifdef __cplusplus +interface IWICBitmapDecoderInfo; +#endif /* __cplusplus */ #endif #ifndef __IWICBitmapDecoder_FWD_DEFINED__ #define __IWICBitmapDecoder_FWD_DEFINED__ typedef interface IWICBitmapDecoder IWICBitmapDecoder; +#ifdef __cplusplus +interface IWICBitmapDecoder; +#endif /* __cplusplus */ #endif #ifndef __IWICBitmapFrameEncode_FWD_DEFINED__ #define __IWICBitmapFrameEncode_FWD_DEFINED__ typedef interface IWICBitmapFrameEncode IWICBitmapFrameEncode; +#ifdef __cplusplus +interface IWICBitmapFrameEncode; +#endif /* __cplusplus */ #endif #ifndef __IWICBitmapEncoderInfo_FWD_DEFINED__ #define __IWICBitmapEncoderInfo_FWD_DEFINED__ typedef interface IWICBitmapEncoderInfo IWICBitmapEncoderInfo; +#ifdef __cplusplus +interface IWICBitmapEncoderInfo; +#endif /* __cplusplus */ #endif #ifndef __IWICBitmapEncoder_FWD_DEFINED__ #define __IWICBitmapEncoder_FWD_DEFINED__ typedef interface IWICBitmapEncoder IWICBitmapEncoder; +#ifdef __cplusplus +interface IWICBitmapEncoder; +#endif /* __cplusplus */ #endif #ifndef __IWICFormatConverter_FWD_DEFINED__ #define __IWICFormatConverter_FWD_DEFINED__ typedef interface IWICFormatConverter IWICFormatConverter; +#ifdef __cplusplus +interface IWICFormatConverter; +#endif /* __cplusplus */ #endif #ifndef __IWICFormatConverterInfo_FWD_DEFINED__ #define __IWICFormatConverterInfo_FWD_DEFINED__ typedef interface IWICFormatConverterInfo IWICFormatConverterInfo; +#ifdef __cplusplus +interface IWICFormatConverterInfo; +#endif /* __cplusplus */ #endif #ifndef __IWICStream_FWD_DEFINED__ #define __IWICStream_FWD_DEFINED__ typedef interface IWICStream IWICStream; +#ifdef __cplusplus +interface IWICStream; +#endif /* __cplusplus */ #endif #ifndef __IWICBitmapScaler_FWD_DEFINED__ #define __IWICBitmapScaler_FWD_DEFINED__ typedef interface IWICBitmapScaler IWICBitmapScaler; +#ifdef __cplusplus +interface IWICBitmapScaler; +#endif /* __cplusplus */ #endif #ifndef __IWICBitmapClipper_FWD_DEFINED__ #define __IWICBitmapClipper_FWD_DEFINED__ typedef interface IWICBitmapClipper IWICBitmapClipper; +#ifdef __cplusplus +interface IWICBitmapClipper; +#endif /* __cplusplus */ #endif #ifndef __IWICColorTransform_FWD_DEFINED__ #define __IWICColorTransform_FWD_DEFINED__ typedef interface IWICColorTransform IWICColorTransform; +#ifdef __cplusplus +interface IWICColorTransform; +#endif /* __cplusplus */ #endif #ifndef __IWICFastMetadataEncoder_FWD_DEFINED__ #define __IWICFastMetadataEncoder_FWD_DEFINED__ typedef interface IWICFastMetadataEncoder IWICFastMetadataEncoder; +#ifdef __cplusplus +interface IWICFastMetadataEncoder; +#endif /* __cplusplus */ #endif #ifndef __IWICImagingFactory_FWD_DEFINED__ #define __IWICImagingFactory_FWD_DEFINED__ typedef interface IWICImagingFactory IWICImagingFactory; +#ifdef __cplusplus +interface IWICImagingFactory; +#endif /* __cplusplus */ #endif #ifndef __IWICEnumMetadataItem_FWD_DEFINED__ #define __IWICEnumMetadataItem_FWD_DEFINED__ typedef interface IWICEnumMetadataItem IWICEnumMetadataItem; +#ifdef __cplusplus +interface IWICEnumMetadataItem; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -359,6 +441,9 @@ typedef UINT32 WICColor; #ifndef __IWICPalette_FWD_DEFINED__ #define __IWICPalette_FWD_DEFINED__ typedef interface IWICPalette IWICPalette; +#ifdef __cplusplus +interface IWICPalette; +#endif /* __cplusplus */ #endif /***************************************************************************** @@ -403,46 +488,47 @@ typedef struct IWICColorContextVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICColorContext* This, + IWICColorContext *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICColorContext* This); + IWICColorContext *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICColorContext* This); + IWICColorContext *This); /*** IWICColorContext methods ***/ HRESULT (STDMETHODCALLTYPE *InitializeFromFilename)( - IWICColorContext* This, + IWICColorContext *This, LPCWSTR wzFilename); HRESULT (STDMETHODCALLTYPE *InitializeFromMemory)( - IWICColorContext* This, + IWICColorContext *This, const BYTE *pbBuffer, UINT cbBufferSize); HRESULT (STDMETHODCALLTYPE *InitializeFromExifColorSpace)( - IWICColorContext* This, + IWICColorContext *This, UINT value); HRESULT (STDMETHODCALLTYPE *GetType)( - IWICColorContext* This, + IWICColorContext *This, WICColorContextType *pType); HRESULT (STDMETHODCALLTYPE *GetProfileBytes)( - IWICColorContext* This, + IWICColorContext *This, UINT cbBuffer, BYTE *pbBuffer, UINT *pcbActual); HRESULT (STDMETHODCALLTYPE *GetExifColorSpace)( - IWICColorContext* This, + IWICColorContext *This, UINT *pValue); END_INTERFACE } IWICColorContextVtbl; + interface IWICColorContext { CONST_VTBL IWICColorContextVtbl* lpVtbl; }; @@ -495,57 +581,6 @@ static FORCEINLINE HRESULT IWICColorContext_GetExifColorSpace(IWICColorContext* #endif -HRESULT STDMETHODCALLTYPE IWICColorContext_InitializeFromFilename_Proxy( - IWICColorContext* This, - LPCWSTR wzFilename); -void __RPC_STUB IWICColorContext_InitializeFromFilename_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICColorContext_InitializeFromMemory_Proxy( - IWICColorContext* This, - const BYTE *pbBuffer, - UINT cbBufferSize); -void __RPC_STUB IWICColorContext_InitializeFromMemory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICColorContext_InitializeFromExifColorSpace_Proxy( - IWICColorContext* This, - UINT value); -void __RPC_STUB IWICColorContext_InitializeFromExifColorSpace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICColorContext_GetType_Proxy( - IWICColorContext* This, - WICColorContextType *pType); -void __RPC_STUB IWICColorContext_GetType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICColorContext_GetProfileBytes_Proxy( - IWICColorContext* This, - UINT cbBuffer, - BYTE *pbBuffer, - UINT *pcbActual); -void __RPC_STUB IWICColorContext_GetProfileBytes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICColorContext_GetExifColorSpace_Proxy( - IWICColorContext* This, - UINT *pValue); -void __RPC_STUB IWICColorContext_GetExifColorSpace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICColorContext_INTERFACE_DEFINED__ */ @@ -590,37 +625,37 @@ typedef struct IWICBitmapSourceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICBitmapSource* This, + IWICBitmapSource *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICBitmapSource* This); + IWICBitmapSource *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICBitmapSource* This); + IWICBitmapSource *This); /*** IWICBitmapSource methods ***/ HRESULT (STDMETHODCALLTYPE *GetSize)( - IWICBitmapSource* This, + IWICBitmapSource *This, UINT *puiWidth, UINT *puiHeight); HRESULT (STDMETHODCALLTYPE *GetPixelFormat)( - IWICBitmapSource* This, + IWICBitmapSource *This, WICPixelFormatGUID *pPixelFormat); HRESULT (STDMETHODCALLTYPE *GetResolution)( - IWICBitmapSource* This, + IWICBitmapSource *This, double *pDpiX, double *pDpiY); HRESULT (STDMETHODCALLTYPE *CopyPalette)( - IWICBitmapSource* This, + IWICBitmapSource *This, IWICPalette *pIPalette); HRESULT (STDMETHODCALLTYPE *CopyPixels)( - IWICBitmapSource* This, + IWICBitmapSource *This, const WICRect *prc, UINT cbStride, UINT cbBufferSize, @@ -628,6 +663,7 @@ typedef struct IWICBitmapSourceVtbl { END_INTERFACE } IWICBitmapSourceVtbl; + interface IWICBitmapSource { CONST_VTBL IWICBitmapSourceVtbl* lpVtbl; }; @@ -676,51 +712,6 @@ static FORCEINLINE HRESULT IWICBitmapSource_CopyPixels(IWICBitmapSource* This,co #endif -HRESULT STDMETHODCALLTYPE IWICBitmapSource_GetSize_Proxy( - IWICBitmapSource* This, - UINT *puiWidth, - UINT *puiHeight); -void __RPC_STUB IWICBitmapSource_GetSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapSource_GetPixelFormat_Proxy( - IWICBitmapSource* This, - WICPixelFormatGUID *pPixelFormat); -void __RPC_STUB IWICBitmapSource_GetPixelFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapSource_GetResolution_Proxy( - IWICBitmapSource* This, - double *pDpiX, - double *pDpiY); -void __RPC_STUB IWICBitmapSource_GetResolution_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapSource_CopyPalette_Proxy( - IWICBitmapSource* This, - IWICPalette *pIPalette); -void __RPC_STUB IWICBitmapSource_CopyPalette_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapSource_CopyPixels_Proxy( - IWICBitmapSource* This, - const WICRect *prc, - UINT cbStride, - UINT cbBufferSize, - BYTE *pbBuffer); -void __RPC_STUB IWICBitmapSource_CopyPixels_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICBitmapSource_INTERFACE_DEFINED__ */ @@ -759,37 +750,38 @@ typedef struct IWICBitmapLockVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICBitmapLock* This, + IWICBitmapLock *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICBitmapLock* This); + IWICBitmapLock *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICBitmapLock* This); + IWICBitmapLock *This); /*** IWICBitmapLock methods ***/ HRESULT (STDMETHODCALLTYPE *GetSize)( - IWICBitmapLock* This, + IWICBitmapLock *This, UINT *pWidth, UINT *pHeight); HRESULT (STDMETHODCALLTYPE *GetStride)( - IWICBitmapLock* This, + IWICBitmapLock *This, UINT *pcbStride); HRESULT (STDMETHODCALLTYPE *GetDataPointer)( - IWICBitmapLock* This, + IWICBitmapLock *This, UINT *pcbBufferSize, BYTE **ppbData); HRESULT (STDMETHODCALLTYPE *GetPixelFormat)( - IWICBitmapLock* This, + IWICBitmapLock *This, WICPixelFormatGUID *pPixelFormat); END_INTERFACE } IWICBitmapLockVtbl; + interface IWICBitmapLock { CONST_VTBL IWICBitmapLockVtbl* lpVtbl; }; @@ -834,40 +826,6 @@ static FORCEINLINE HRESULT IWICBitmapLock_GetPixelFormat(IWICBitmapLock* This,WI #endif -HRESULT STDMETHODCALLTYPE IWICBitmapLock_GetSize_Proxy( - IWICBitmapLock* This, - UINT *pWidth, - UINT *pHeight); -void __RPC_STUB IWICBitmapLock_GetSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapLock_GetStride_Proxy( - IWICBitmapLock* This, - UINT *pcbStride); -void __RPC_STUB IWICBitmapLock_GetStride_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapLock_GetDataPointer_Proxy( - IWICBitmapLock* This, - UINT *pcbBufferSize, - BYTE **ppbData); -void __RPC_STUB IWICBitmapLock_GetDataPointer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapLock_GetPixelFormat_Proxy( - IWICBitmapLock* This, - WICPixelFormatGUID *pPixelFormat); -void __RPC_STUB IWICBitmapLock_GetPixelFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICBitmapLock_INTERFACE_DEFINED__ */ @@ -896,37 +854,37 @@ typedef struct IWICBitmapFlipRotatorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICBitmapFlipRotator* This, + IWICBitmapFlipRotator *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICBitmapFlipRotator* This); + IWICBitmapFlipRotator *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICBitmapFlipRotator* This); + IWICBitmapFlipRotator *This); /*** IWICBitmapSource methods ***/ HRESULT (STDMETHODCALLTYPE *GetSize)( - IWICBitmapFlipRotator* This, + IWICBitmapFlipRotator *This, UINT *puiWidth, UINT *puiHeight); HRESULT (STDMETHODCALLTYPE *GetPixelFormat)( - IWICBitmapFlipRotator* This, + IWICBitmapFlipRotator *This, WICPixelFormatGUID *pPixelFormat); HRESULT (STDMETHODCALLTYPE *GetResolution)( - IWICBitmapFlipRotator* This, + IWICBitmapFlipRotator *This, double *pDpiX, double *pDpiY); HRESULT (STDMETHODCALLTYPE *CopyPalette)( - IWICBitmapFlipRotator* This, + IWICBitmapFlipRotator *This, IWICPalette *pIPalette); HRESULT (STDMETHODCALLTYPE *CopyPixels)( - IWICBitmapFlipRotator* This, + IWICBitmapFlipRotator *This, const WICRect *prc, UINT cbStride, UINT cbBufferSize, @@ -934,12 +892,13 @@ typedef struct IWICBitmapFlipRotatorVtbl { /*** IWICBitmapFlipRotator methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IWICBitmapFlipRotator* This, + IWICBitmapFlipRotator *This, IWICBitmapSource *pISource, WICBitmapTransformOptions options); END_INTERFACE } IWICBitmapFlipRotatorVtbl; + interface IWICBitmapFlipRotator { CONST_VTBL IWICBitmapFlipRotatorVtbl* lpVtbl; }; @@ -994,15 +953,6 @@ static FORCEINLINE HRESULT IWICBitmapFlipRotator_Initialize(IWICBitmapFlipRotato #endif -HRESULT STDMETHODCALLTYPE IWICBitmapFlipRotator_Initialize_Proxy( - IWICBitmapFlipRotator* This, - IWICBitmapSource *pISource, - WICBitmapTransformOptions options); -void __RPC_STUB IWICBitmapFlipRotator_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICBitmapFlipRotator_INTERFACE_DEFINED__ */ @@ -1039,37 +989,37 @@ typedef struct IWICBitmapVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICBitmap* This, + IWICBitmap *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICBitmap* This); + IWICBitmap *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICBitmap* This); + IWICBitmap *This); /*** IWICBitmapSource methods ***/ HRESULT (STDMETHODCALLTYPE *GetSize)( - IWICBitmap* This, + IWICBitmap *This, UINT *puiWidth, UINT *puiHeight); HRESULT (STDMETHODCALLTYPE *GetPixelFormat)( - IWICBitmap* This, + IWICBitmap *This, WICPixelFormatGUID *pPixelFormat); HRESULT (STDMETHODCALLTYPE *GetResolution)( - IWICBitmap* This, + IWICBitmap *This, double *pDpiX, double *pDpiY); HRESULT (STDMETHODCALLTYPE *CopyPalette)( - IWICBitmap* This, + IWICBitmap *This, IWICPalette *pIPalette); HRESULT (STDMETHODCALLTYPE *CopyPixels)( - IWICBitmap* This, + IWICBitmap *This, const WICRect *prc, UINT cbStride, UINT cbBufferSize, @@ -1077,22 +1027,23 @@ typedef struct IWICBitmapVtbl { /*** IWICBitmap methods ***/ HRESULT (STDMETHODCALLTYPE *Lock)( - IWICBitmap* This, + IWICBitmap *This, const WICRect *prcLock, DWORD flags, IWICBitmapLock **ppILock); HRESULT (STDMETHODCALLTYPE *SetPalette)( - IWICBitmap* This, + IWICBitmap *This, IWICPalette *pIPalette); HRESULT (STDMETHODCALLTYPE *SetResolution)( - IWICBitmap* This, + IWICBitmap *This, double dpiX, double dpiY); END_INTERFACE } IWICBitmapVtbl; + interface IWICBitmap { CONST_VTBL IWICBitmapVtbl* lpVtbl; }; @@ -1155,33 +1106,6 @@ static FORCEINLINE HRESULT IWICBitmap_SetResolution(IWICBitmap* This,double dpiX #endif -HRESULT STDMETHODCALLTYPE IWICBitmap_Lock_Proxy( - IWICBitmap* This, - const WICRect *prcLock, - DWORD flags, - IWICBitmapLock **ppILock); -void __RPC_STUB IWICBitmap_Lock_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmap_SetPalette_Proxy( - IWICBitmap* This, - IWICPalette *pIPalette); -void __RPC_STUB IWICBitmap_SetPalette_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmap_SetResolution_Proxy( - IWICBitmap* This, - double dpiX, - double dpiY); -void __RPC_STUB IWICBitmap_SetResolution_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICBitmap_INTERFACE_DEFINED__ */ @@ -1242,65 +1166,66 @@ typedef struct IWICPaletteVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICPalette* This, + IWICPalette *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICPalette* This); + IWICPalette *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICPalette* This); + IWICPalette *This); /*** IWICPalette methods ***/ HRESULT (STDMETHODCALLTYPE *InitializePredefined)( - IWICPalette* This, + IWICPalette *This, WICBitmapPaletteType ePaletteType, WINBOOL fAddTransparentColor); HRESULT (STDMETHODCALLTYPE *InitializeCustom)( - IWICPalette* This, + IWICPalette *This, WICColor *pColors, UINT colorCount); HRESULT (STDMETHODCALLTYPE *InitializeFromBitmap)( - IWICPalette* This, + IWICPalette *This, IWICBitmapSource *pISurface, UINT colorCount, WINBOOL fAddTransparentColor); HRESULT (STDMETHODCALLTYPE *InitializeFromPalette)( - IWICPalette* This, + IWICPalette *This, IWICPalette *pIPalette); HRESULT (STDMETHODCALLTYPE *GetType)( - IWICPalette* This, + IWICPalette *This, WICBitmapPaletteType *pePaletteType); HRESULT (STDMETHODCALLTYPE *GetColorCount)( - IWICPalette* This, + IWICPalette *This, UINT *pcCount); HRESULT (STDMETHODCALLTYPE *GetColors)( - IWICPalette* This, + IWICPalette *This, UINT colorCount, WICColor *pColors, UINT *pcActualColors); HRESULT (STDMETHODCALLTYPE *IsBlackWhite)( - IWICPalette* This, + IWICPalette *This, WINBOOL *pfIsBlackWhite); HRESULT (STDMETHODCALLTYPE *IsGrayscale)( - IWICPalette* This, + IWICPalette *This, WINBOOL *pfIsGrayscale); HRESULT (STDMETHODCALLTYPE *HasAlpha)( - IWICPalette* This, + IWICPalette *This, WINBOOL *pfHasAlpha); END_INTERFACE } IWICPaletteVtbl; + interface IWICPalette { CONST_VTBL IWICPaletteVtbl* lpVtbl; }; @@ -1369,92 +1294,6 @@ static FORCEINLINE HRESULT IWICPalette_HasAlpha(IWICPalette* This,WINBOOL *pfHas #endif -HRESULT STDMETHODCALLTYPE IWICPalette_InitializePredefined_Proxy( - IWICPalette* This, - WICBitmapPaletteType ePaletteType, - WINBOOL fAddTransparentColor); -void __RPC_STUB IWICPalette_InitializePredefined_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICPalette_InitializeCustom_Proxy( - IWICPalette* This, - WICColor *pColors, - UINT colorCount); -void __RPC_STUB IWICPalette_InitializeCustom_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICPalette_InitializeFromBitmap_Proxy( - IWICPalette* This, - IWICBitmapSource *pISurface, - UINT colorCount, - WINBOOL fAddTransparentColor); -void __RPC_STUB IWICPalette_InitializeFromBitmap_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICPalette_InitializeFromPalette_Proxy( - IWICPalette* This, - IWICPalette *pIPalette); -void __RPC_STUB IWICPalette_InitializeFromPalette_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICPalette_GetType_Proxy( - IWICPalette* This, - WICBitmapPaletteType *pePaletteType); -void __RPC_STUB IWICPalette_GetType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICPalette_GetColorCount_Proxy( - IWICPalette* This, - UINT *pcCount); -void __RPC_STUB IWICPalette_GetColorCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICPalette_GetColors_Proxy( - IWICPalette* This, - UINT colorCount, - WICColor *pColors, - UINT *pcActualColors); -void __RPC_STUB IWICPalette_GetColors_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICPalette_IsBlackWhite_Proxy( - IWICPalette* This, - WINBOOL *pfIsBlackWhite); -void __RPC_STUB IWICPalette_IsBlackWhite_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICPalette_IsGrayscale_Proxy( - IWICPalette* This, - WINBOOL *pfIsGrayscale); -void __RPC_STUB IWICPalette_IsGrayscale_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICPalette_HasAlpha_Proxy( - IWICPalette* This, - WINBOOL *pfHasAlpha); -void __RPC_STUB IWICPalette_HasAlpha_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICPalette_INTERFACE_DEFINED__ */ @@ -1511,59 +1350,60 @@ typedef struct IWICComponentInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICComponentInfo* This, + IWICComponentInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICComponentInfo* This); + IWICComponentInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICComponentInfo* This); + IWICComponentInfo *This); /*** IWICComponentInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetComponentType)( - IWICComponentInfo* This, + IWICComponentInfo *This, WICComponentType *pType); HRESULT (STDMETHODCALLTYPE *GetCLSID)( - IWICComponentInfo* This, + IWICComponentInfo *This, CLSID *pclsid); HRESULT (STDMETHODCALLTYPE *GetSigningStatus)( - IWICComponentInfo* This, + IWICComponentInfo *This, DWORD *pStatus); HRESULT (STDMETHODCALLTYPE *GetAuthor)( - IWICComponentInfo* This, + IWICComponentInfo *This, UINT cchAuthor, WCHAR *wzAuthor, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetVendorGUID)( - IWICComponentInfo* This, + IWICComponentInfo *This, GUID *pguidVendor); HRESULT (STDMETHODCALLTYPE *GetVersion)( - IWICComponentInfo* This, + IWICComponentInfo *This, UINT cchVersion, WCHAR *wzVersion, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetSpecVersion)( - IWICComponentInfo* This, + IWICComponentInfo *This, UINT cchSpecVersion, WCHAR *wzSpecVersion, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetFriendlyName)( - IWICComponentInfo* This, + IWICComponentInfo *This, UINT cchFriendlyName, WCHAR *wzFriendlyName, UINT *pcchActual); END_INTERFACE } IWICComponentInfoVtbl; + interface IWICComponentInfo { CONST_VTBL IWICComponentInfoVtbl* lpVtbl; }; @@ -1624,78 +1464,6 @@ static FORCEINLINE HRESULT IWICComponentInfo_GetFriendlyName(IWICComponentInfo* #endif -HRESULT STDMETHODCALLTYPE IWICComponentInfo_GetComponentType_Proxy( - IWICComponentInfo* This, - WICComponentType *pType); -void __RPC_STUB IWICComponentInfo_GetComponentType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICComponentInfo_GetCLSID_Proxy( - IWICComponentInfo* This, - CLSID *pclsid); -void __RPC_STUB IWICComponentInfo_GetCLSID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICComponentInfo_GetSigningStatus_Proxy( - IWICComponentInfo* This, - DWORD *pStatus); -void __RPC_STUB IWICComponentInfo_GetSigningStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICComponentInfo_GetAuthor_Proxy( - IWICComponentInfo* This, - UINT cchAuthor, - WCHAR *wzAuthor, - UINT *pcchActual); -void __RPC_STUB IWICComponentInfo_GetAuthor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICComponentInfo_GetVendorGUID_Proxy( - IWICComponentInfo* This, - GUID *pguidVendor); -void __RPC_STUB IWICComponentInfo_GetVendorGUID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICComponentInfo_GetVersion_Proxy( - IWICComponentInfo* This, - UINT cchVersion, - WCHAR *wzVersion, - UINT *pcchActual); -void __RPC_STUB IWICComponentInfo_GetVersion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICComponentInfo_GetSpecVersion_Proxy( - IWICComponentInfo* This, - UINT cchSpecVersion, - WCHAR *wzSpecVersion, - UINT *pcchActual); -void __RPC_STUB IWICComponentInfo_GetSpecVersion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICComponentInfo_GetFriendlyName_Proxy( - IWICComponentInfo* This, - UINT cchFriendlyName, - WCHAR *wzFriendlyName, - UINT *pcchActual); -void __RPC_STUB IWICComponentInfo_GetFriendlyName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICComponentInfo_INTERFACE_DEFINED__ */ @@ -1735,38 +1503,39 @@ typedef struct IWICMetadataQueryReaderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICMetadataQueryReader* This, + IWICMetadataQueryReader *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICMetadataQueryReader* This); + IWICMetadataQueryReader *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICMetadataQueryReader* This); + IWICMetadataQueryReader *This); /*** IWICMetadataQueryReader methods ***/ HRESULT (STDMETHODCALLTYPE *GetContainerFormat)( - IWICMetadataQueryReader* This, + IWICMetadataQueryReader *This, GUID *pguidContainerFormat); HRESULT (STDMETHODCALLTYPE *GetLocation)( - IWICMetadataQueryReader* This, + IWICMetadataQueryReader *This, UINT cchMaxLength, WCHAR *wzNamespace, UINT *pcchActualLength); HRESULT (STDMETHODCALLTYPE *GetMetadataByName)( - IWICMetadataQueryReader* This, + IWICMetadataQueryReader *This, LPCWSTR wzName, PROPVARIANT *pvarValue); HRESULT (STDMETHODCALLTYPE *GetEnumerator)( - IWICMetadataQueryReader* This, + IWICMetadataQueryReader *This, IEnumString **ppIEnumString); END_INTERFACE } IWICMetadataQueryReaderVtbl; + interface IWICMetadataQueryReader { CONST_VTBL IWICMetadataQueryReaderVtbl* lpVtbl; }; @@ -1811,41 +1580,6 @@ static FORCEINLINE HRESULT IWICMetadataQueryReader_GetEnumerator(IWICMetadataQue #endif -HRESULT STDMETHODCALLTYPE IWICMetadataQueryReader_GetContainerFormat_Proxy( - IWICMetadataQueryReader* This, - GUID *pguidContainerFormat); -void __RPC_STUB IWICMetadataQueryReader_GetContainerFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICMetadataQueryReader_GetLocation_Proxy( - IWICMetadataQueryReader* This, - UINT cchMaxLength, - WCHAR *wzNamespace, - UINT *pcchActualLength); -void __RPC_STUB IWICMetadataQueryReader_GetLocation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICMetadataQueryReader_GetMetadataByName_Proxy( - IWICMetadataQueryReader* This, - LPCWSTR wzName, - PROPVARIANT *pvarValue); -void __RPC_STUB IWICMetadataQueryReader_GetMetadataByName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICMetadataQueryReader_GetEnumerator_Proxy( - IWICMetadataQueryReader* This, - IEnumString **ppIEnumString); -void __RPC_STUB IWICMetadataQueryReader_GetEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICMetadataQueryReader_INTERFACE_DEFINED__ */ @@ -1877,48 +1611,49 @@ typedef struct IWICMetadataQueryWriterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICMetadataQueryWriter* This, + IWICMetadataQueryWriter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICMetadataQueryWriter* This); + IWICMetadataQueryWriter *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICMetadataQueryWriter* This); + IWICMetadataQueryWriter *This); /*** IWICMetadataQueryReader methods ***/ HRESULT (STDMETHODCALLTYPE *GetContainerFormat)( - IWICMetadataQueryWriter* This, + IWICMetadataQueryWriter *This, GUID *pguidContainerFormat); HRESULT (STDMETHODCALLTYPE *GetLocation)( - IWICMetadataQueryWriter* This, + IWICMetadataQueryWriter *This, UINT cchMaxLength, WCHAR *wzNamespace, UINT *pcchActualLength); HRESULT (STDMETHODCALLTYPE *GetMetadataByName)( - IWICMetadataQueryWriter* This, + IWICMetadataQueryWriter *This, LPCWSTR wzName, PROPVARIANT *pvarValue); HRESULT (STDMETHODCALLTYPE *GetEnumerator)( - IWICMetadataQueryWriter* This, + IWICMetadataQueryWriter *This, IEnumString **ppIEnumString); /*** IWICMetadataQueryWriter methods ***/ HRESULT (STDMETHODCALLTYPE *SetMetadataByName)( - IWICMetadataQueryWriter* This, + IWICMetadataQueryWriter *This, LPCWSTR wzName, const PROPVARIANT *pvarValue); HRESULT (STDMETHODCALLTYPE *RemoveMetadataByName)( - IWICMetadataQueryWriter* This, + IWICMetadataQueryWriter *This, LPCWSTR wzName); END_INTERFACE } IWICMetadataQueryWriterVtbl; + interface IWICMetadataQueryWriter { CONST_VTBL IWICMetadataQueryWriterVtbl* lpVtbl; }; @@ -1973,23 +1708,6 @@ static FORCEINLINE HRESULT IWICMetadataQueryWriter_RemoveMetadataByName(IWICMeta #endif -HRESULT STDMETHODCALLTYPE IWICMetadataQueryWriter_SetMetadataByName_Proxy( - IWICMetadataQueryWriter* This, - LPCWSTR wzName, - const PROPVARIANT *pvarValue); -void __RPC_STUB IWICMetadataQueryWriter_SetMetadataByName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICMetadataQueryWriter_RemoveMetadataByName_Proxy( - IWICMetadataQueryWriter* This, - LPCWSTR wzName); -void __RPC_STUB IWICMetadataQueryWriter_RemoveMetadataByName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICMetadataQueryWriter_INTERFACE_DEFINED__ */ @@ -2025,37 +1743,37 @@ typedef struct IWICBitmapFrameDecodeVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICBitmapFrameDecode* This, + IWICBitmapFrameDecode *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICBitmapFrameDecode* This); + IWICBitmapFrameDecode *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICBitmapFrameDecode* This); + IWICBitmapFrameDecode *This); /*** IWICBitmapSource methods ***/ HRESULT (STDMETHODCALLTYPE *GetSize)( - IWICBitmapFrameDecode* This, + IWICBitmapFrameDecode *This, UINT *puiWidth, UINT *puiHeight); HRESULT (STDMETHODCALLTYPE *GetPixelFormat)( - IWICBitmapFrameDecode* This, + IWICBitmapFrameDecode *This, WICPixelFormatGUID *pPixelFormat); HRESULT (STDMETHODCALLTYPE *GetResolution)( - IWICBitmapFrameDecode* This, + IWICBitmapFrameDecode *This, double *pDpiX, double *pDpiY); HRESULT (STDMETHODCALLTYPE *CopyPalette)( - IWICBitmapFrameDecode* This, + IWICBitmapFrameDecode *This, IWICPalette *pIPalette); HRESULT (STDMETHODCALLTYPE *CopyPixels)( - IWICBitmapFrameDecode* This, + IWICBitmapFrameDecode *This, const WICRect *prc, UINT cbStride, UINT cbBufferSize, @@ -2063,21 +1781,22 @@ typedef struct IWICBitmapFrameDecodeVtbl { /*** IWICBitmapFrameDecode methods ***/ HRESULT (STDMETHODCALLTYPE *GetMetadataQueryReader)( - IWICBitmapFrameDecode* This, + IWICBitmapFrameDecode *This, IWICMetadataQueryReader **ppIMetadataQueryReader); HRESULT (STDMETHODCALLTYPE *GetColorContexts)( - IWICBitmapFrameDecode* This, + IWICBitmapFrameDecode *This, UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount); HRESULT (STDMETHODCALLTYPE *GetThumbnail)( - IWICBitmapFrameDecode* This, + IWICBitmapFrameDecode *This, IWICBitmapSource **ppIThumbnail); END_INTERFACE } IWICBitmapFrameDecodeVtbl; + interface IWICBitmapFrameDecode { CONST_VTBL IWICBitmapFrameDecodeVtbl* lpVtbl; }; @@ -2140,32 +1859,6 @@ static FORCEINLINE HRESULT IWICBitmapFrameDecode_GetThumbnail(IWICBitmapFrameDec #endif -HRESULT STDMETHODCALLTYPE IWICBitmapFrameDecode_GetMetadataQueryReader_Proxy( - IWICBitmapFrameDecode* This, - IWICMetadataQueryReader **ppIMetadataQueryReader); -void __RPC_STUB IWICBitmapFrameDecode_GetMetadataQueryReader_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapFrameDecode_GetColorContexts_Proxy( - IWICBitmapFrameDecode* This, - UINT cCount, - IWICColorContext **ppIColorContexts, - UINT *pcActualCount); -void __RPC_STUB IWICBitmapFrameDecode_GetColorContexts_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapFrameDecode_GetThumbnail_Proxy( - IWICBitmapFrameDecode* This, - IWICBitmapSource **ppIThumbnail); -void __RPC_STUB IWICBitmapFrameDecode_GetThumbnail_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICBitmapFrameDecode_INTERFACE_DEFINED__ */ @@ -2208,76 +1901,76 @@ typedef struct IWICPixelFormatInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICPixelFormatInfo* This, + IWICPixelFormatInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICPixelFormatInfo* This); + IWICPixelFormatInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICPixelFormatInfo* This); + IWICPixelFormatInfo *This); /*** IWICComponentInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetComponentType)( - IWICPixelFormatInfo* This, + IWICPixelFormatInfo *This, WICComponentType *pType); HRESULT (STDMETHODCALLTYPE *GetCLSID)( - IWICPixelFormatInfo* This, + IWICPixelFormatInfo *This, CLSID *pclsid); HRESULT (STDMETHODCALLTYPE *GetSigningStatus)( - IWICPixelFormatInfo* This, + IWICPixelFormatInfo *This, DWORD *pStatus); HRESULT (STDMETHODCALLTYPE *GetAuthor)( - IWICPixelFormatInfo* This, + IWICPixelFormatInfo *This, UINT cchAuthor, WCHAR *wzAuthor, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetVendorGUID)( - IWICPixelFormatInfo* This, + IWICPixelFormatInfo *This, GUID *pguidVendor); HRESULT (STDMETHODCALLTYPE *GetVersion)( - IWICPixelFormatInfo* This, + IWICPixelFormatInfo *This, UINT cchVersion, WCHAR *wzVersion, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetSpecVersion)( - IWICPixelFormatInfo* This, + IWICPixelFormatInfo *This, UINT cchSpecVersion, WCHAR *wzSpecVersion, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetFriendlyName)( - IWICPixelFormatInfo* This, + IWICPixelFormatInfo *This, UINT cchFriendlyName, WCHAR *wzFriendlyName, UINT *pcchActual); /*** IWICPixelFormatInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetFormatGUID)( - IWICPixelFormatInfo* This, + IWICPixelFormatInfo *This, GUID *pFormat); HRESULT (STDMETHODCALLTYPE *GetColorContext)( - IWICPixelFormatInfo* This, + IWICPixelFormatInfo *This, IWICColorContext **ppIColorContext); HRESULT (STDMETHODCALLTYPE *GetBitsPerPixel)( - IWICPixelFormatInfo* This, + IWICPixelFormatInfo *This, UINT *puiBitsPerPixel); HRESULT (STDMETHODCALLTYPE *GetChannelCount)( - IWICPixelFormatInfo* This, + IWICPixelFormatInfo *This, UINT *puiChannelCount); HRESULT (STDMETHODCALLTYPE *GetChannelMask)( - IWICPixelFormatInfo* This, + IWICPixelFormatInfo *This, UINT uiChannelIndex, UINT cbMaskBuffer, BYTE *pbMaskBuffer, @@ -2285,6 +1978,7 @@ typedef struct IWICPixelFormatInfoVtbl { END_INTERFACE } IWICPixelFormatInfoVtbl; + interface IWICPixelFormatInfo { CONST_VTBL IWICPixelFormatInfoVtbl* lpVtbl; }; @@ -2367,49 +2061,6 @@ static FORCEINLINE HRESULT IWICPixelFormatInfo_GetChannelMask(IWICPixelFormatInf #endif -HRESULT STDMETHODCALLTYPE IWICPixelFormatInfo_GetFormatGUID_Proxy( - IWICPixelFormatInfo* This, - GUID *pFormat); -void __RPC_STUB IWICPixelFormatInfo_GetFormatGUID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICPixelFormatInfo_GetColorContext_Proxy( - IWICPixelFormatInfo* This, - IWICColorContext **ppIColorContext); -void __RPC_STUB IWICPixelFormatInfo_GetColorContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICPixelFormatInfo_GetBitsPerPixel_Proxy( - IWICPixelFormatInfo* This, - UINT *puiBitsPerPixel); -void __RPC_STUB IWICPixelFormatInfo_GetBitsPerPixel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICPixelFormatInfo_GetChannelCount_Proxy( - IWICPixelFormatInfo* This, - UINT *puiChannelCount); -void __RPC_STUB IWICPixelFormatInfo_GetChannelCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICPixelFormatInfo_GetChannelMask_Proxy( - IWICPixelFormatInfo* This, - UINT uiChannelIndex, - UINT cbMaskBuffer, - BYTE *pbMaskBuffer, - UINT *pcbActual); -void __RPC_STUB IWICPixelFormatInfo_GetChannelMask_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICPixelFormatInfo_INTERFACE_DEFINED__ */ @@ -2440,76 +2091,76 @@ typedef struct IWICPixelFormatInfo2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICPixelFormatInfo2* This, + IWICPixelFormatInfo2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICPixelFormatInfo2* This); + IWICPixelFormatInfo2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICPixelFormatInfo2* This); + IWICPixelFormatInfo2 *This); /*** IWICComponentInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetComponentType)( - IWICPixelFormatInfo2* This, + IWICPixelFormatInfo2 *This, WICComponentType *pType); HRESULT (STDMETHODCALLTYPE *GetCLSID)( - IWICPixelFormatInfo2* This, + IWICPixelFormatInfo2 *This, CLSID *pclsid); HRESULT (STDMETHODCALLTYPE *GetSigningStatus)( - IWICPixelFormatInfo2* This, + IWICPixelFormatInfo2 *This, DWORD *pStatus); HRESULT (STDMETHODCALLTYPE *GetAuthor)( - IWICPixelFormatInfo2* This, + IWICPixelFormatInfo2 *This, UINT cchAuthor, WCHAR *wzAuthor, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetVendorGUID)( - IWICPixelFormatInfo2* This, + IWICPixelFormatInfo2 *This, GUID *pguidVendor); HRESULT (STDMETHODCALLTYPE *GetVersion)( - IWICPixelFormatInfo2* This, + IWICPixelFormatInfo2 *This, UINT cchVersion, WCHAR *wzVersion, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetSpecVersion)( - IWICPixelFormatInfo2* This, + IWICPixelFormatInfo2 *This, UINT cchSpecVersion, WCHAR *wzSpecVersion, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetFriendlyName)( - IWICPixelFormatInfo2* This, + IWICPixelFormatInfo2 *This, UINT cchFriendlyName, WCHAR *wzFriendlyName, UINT *pcchActual); /*** IWICPixelFormatInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetFormatGUID)( - IWICPixelFormatInfo2* This, + IWICPixelFormatInfo2 *This, GUID *pFormat); HRESULT (STDMETHODCALLTYPE *GetColorContext)( - IWICPixelFormatInfo2* This, + IWICPixelFormatInfo2 *This, IWICColorContext **ppIColorContext); HRESULT (STDMETHODCALLTYPE *GetBitsPerPixel)( - IWICPixelFormatInfo2* This, + IWICPixelFormatInfo2 *This, UINT *puiBitsPerPixel); HRESULT (STDMETHODCALLTYPE *GetChannelCount)( - IWICPixelFormatInfo2* This, + IWICPixelFormatInfo2 *This, UINT *puiChannelCount); HRESULT (STDMETHODCALLTYPE *GetChannelMask)( - IWICPixelFormatInfo2* This, + IWICPixelFormatInfo2 *This, UINT uiChannelIndex, UINT cbMaskBuffer, BYTE *pbMaskBuffer, @@ -2517,15 +2168,16 @@ typedef struct IWICPixelFormatInfo2Vtbl { /*** IWICPixelFormatInfo2 methods ***/ HRESULT (STDMETHODCALLTYPE *SupportsTransparency)( - IWICPixelFormatInfo2* This, + IWICPixelFormatInfo2 *This, WINBOOL *pfSupportsTransparency); HRESULT (STDMETHODCALLTYPE *GetNumericRepresentation)( - IWICPixelFormatInfo2* This, + IWICPixelFormatInfo2 *This, WICPixelFormatNumericRepresentation *pNumericRepresentation); END_INTERFACE } IWICPixelFormatInfo2Vtbl; + interface IWICPixelFormatInfo2 { CONST_VTBL IWICPixelFormatInfo2Vtbl* lpVtbl; }; @@ -2618,22 +2270,6 @@ static FORCEINLINE HRESULT IWICPixelFormatInfo2_GetNumericRepresentation(IWICPix #endif -HRESULT STDMETHODCALLTYPE IWICPixelFormatInfo2_SupportsTransparency_Proxy( - IWICPixelFormatInfo2* This, - WINBOOL *pfSupportsTransparency); -void __RPC_STUB IWICPixelFormatInfo2_SupportsTransparency_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICPixelFormatInfo2_GetNumericRepresentation_Proxy( - IWICPixelFormatInfo2* This, - WICPixelFormatNumericRepresentation *pNumericRepresentation); -void __RPC_STUB IWICPixelFormatInfo2_GetNumericRepresentation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICPixelFormatInfo2_INTERFACE_DEFINED__ */ @@ -2707,121 +2343,122 @@ typedef struct IWICBitmapCodecInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICBitmapCodecInfo* This, + IWICBitmapCodecInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICBitmapCodecInfo* This); + IWICBitmapCodecInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICBitmapCodecInfo* This); + IWICBitmapCodecInfo *This); /*** IWICComponentInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetComponentType)( - IWICBitmapCodecInfo* This, + IWICBitmapCodecInfo *This, WICComponentType *pType); HRESULT (STDMETHODCALLTYPE *GetCLSID)( - IWICBitmapCodecInfo* This, + IWICBitmapCodecInfo *This, CLSID *pclsid); HRESULT (STDMETHODCALLTYPE *GetSigningStatus)( - IWICBitmapCodecInfo* This, + IWICBitmapCodecInfo *This, DWORD *pStatus); HRESULT (STDMETHODCALLTYPE *GetAuthor)( - IWICBitmapCodecInfo* This, + IWICBitmapCodecInfo *This, UINT cchAuthor, WCHAR *wzAuthor, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetVendorGUID)( - IWICBitmapCodecInfo* This, + IWICBitmapCodecInfo *This, GUID *pguidVendor); HRESULT (STDMETHODCALLTYPE *GetVersion)( - IWICBitmapCodecInfo* This, + IWICBitmapCodecInfo *This, UINT cchVersion, WCHAR *wzVersion, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetSpecVersion)( - IWICBitmapCodecInfo* This, + IWICBitmapCodecInfo *This, UINT cchSpecVersion, WCHAR *wzSpecVersion, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetFriendlyName)( - IWICBitmapCodecInfo* This, + IWICBitmapCodecInfo *This, UINT cchFriendlyName, WCHAR *wzFriendlyName, UINT *pcchActual); /*** IWICBitmapCodecInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetContainerFormat)( - IWICBitmapCodecInfo* This, + IWICBitmapCodecInfo *This, GUID *pguidContainerFormat); HRESULT (STDMETHODCALLTYPE *GetPixelFormats)( - IWICBitmapCodecInfo* This, + IWICBitmapCodecInfo *This, UINT cFormats, GUID *pguidPixelFormats, UINT *pcActual); HRESULT (STDMETHODCALLTYPE *GetColorManagementVersion)( - IWICBitmapCodecInfo* This, + IWICBitmapCodecInfo *This, UINT cchColorManagementVersion, WCHAR *wzColorManagementVersion, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetDeviceManufacturer)( - IWICBitmapCodecInfo* This, + IWICBitmapCodecInfo *This, UINT cchDeviceManufacturer, WCHAR *wzDeviceManufacturer, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetDeviceModels)( - IWICBitmapCodecInfo* This, + IWICBitmapCodecInfo *This, UINT cchDeviceModels, WCHAR *wzDeviceModels, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetMimeTypes)( - IWICBitmapCodecInfo* This, + IWICBitmapCodecInfo *This, UINT cchMimeTypes, WCHAR *wzMimeTypes, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetFileExtensions)( - IWICBitmapCodecInfo* This, + IWICBitmapCodecInfo *This, UINT cchFileExtensions, WCHAR *wzFileExtensions, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *DoesSupportAnimation)( - IWICBitmapCodecInfo* This, + IWICBitmapCodecInfo *This, WINBOOL *pfSupportAnimation); HRESULT (STDMETHODCALLTYPE *DoesSupportChromaKey)( - IWICBitmapCodecInfo* This, + IWICBitmapCodecInfo *This, WINBOOL *pfSupportChromaKey); HRESULT (STDMETHODCALLTYPE *DoesSupportLossless)( - IWICBitmapCodecInfo* This, + IWICBitmapCodecInfo *This, WINBOOL *pfSupportLossless); HRESULT (STDMETHODCALLTYPE *DoesSupportMultiframe)( - IWICBitmapCodecInfo* This, + IWICBitmapCodecInfo *This, WINBOOL *pfSupportMultiframe); HRESULT (STDMETHODCALLTYPE *MatchesMimeType)( - IWICBitmapCodecInfo* This, + IWICBitmapCodecInfo *This, LPCWSTR wzMimeType, WINBOOL *pfMatches); END_INTERFACE } IWICBitmapCodecInfoVtbl; + interface IWICBitmapCodecInfo { CONST_VTBL IWICBitmapCodecInfoVtbl* lpVtbl; }; @@ -2932,121 +2569,15 @@ static FORCEINLINE HRESULT IWICBitmapCodecInfo_MatchesMimeType(IWICBitmapCodecIn #endif -HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_GetContainerFormat_Proxy( - IWICBitmapCodecInfo* This, - GUID *pguidContainerFormat); -void __RPC_STUB IWICBitmapCodecInfo_GetContainerFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_GetPixelFormats_Proxy( - IWICBitmapCodecInfo* This, - UINT cFormats, - GUID *pguidPixelFormats, - UINT *pcActual); -void __RPC_STUB IWICBitmapCodecInfo_GetPixelFormats_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_GetColorManagementVersion_Proxy( - IWICBitmapCodecInfo* This, - UINT cchColorManagementVersion, - WCHAR *wzColorManagementVersion, - UINT *pcchActual); -void __RPC_STUB IWICBitmapCodecInfo_GetColorManagementVersion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_GetDeviceManufacturer_Proxy( - IWICBitmapCodecInfo* This, - UINT cchDeviceManufacturer, - WCHAR *wzDeviceManufacturer, - UINT *pcchActual); -void __RPC_STUB IWICBitmapCodecInfo_GetDeviceManufacturer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_GetDeviceModels_Proxy( - IWICBitmapCodecInfo* This, - UINT cchDeviceModels, - WCHAR *wzDeviceModels, - UINT *pcchActual); -void __RPC_STUB IWICBitmapCodecInfo_GetDeviceModels_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_GetMimeTypes_Proxy( - IWICBitmapCodecInfo* This, - UINT cchMimeTypes, - WCHAR *wzMimeTypes, - UINT *pcchActual); -void __RPC_STUB IWICBitmapCodecInfo_GetMimeTypes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_GetFileExtensions_Proxy( - IWICBitmapCodecInfo* This, - UINT cchFileExtensions, - WCHAR *wzFileExtensions, - UINT *pcchActual); -void __RPC_STUB IWICBitmapCodecInfo_GetFileExtensions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_DoesSupportAnimation_Proxy( - IWICBitmapCodecInfo* This, - WINBOOL *pfSupportAnimation); -void __RPC_STUB IWICBitmapCodecInfo_DoesSupportAnimation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_DoesSupportChromaKey_Proxy( - IWICBitmapCodecInfo* This, - WINBOOL *pfSupportChromaKey); -void __RPC_STUB IWICBitmapCodecInfo_DoesSupportChromaKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_DoesSupportLossless_Proxy( - IWICBitmapCodecInfo* This, - WINBOOL *pfSupportLossless); -void __RPC_STUB IWICBitmapCodecInfo_DoesSupportLossless_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_DoesSupportMultiframe_Proxy( - IWICBitmapCodecInfo* This, - WINBOOL *pfSupportMultiframe); -void __RPC_STUB IWICBitmapCodecInfo_DoesSupportMultiframe_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_MatchesMimeType_Proxy( - IWICBitmapCodecInfo* This, - LPCWSTR wzMimeType, - WINBOOL *pfMatches); -void __RPC_STUB IWICBitmapCodecInfo_MatchesMimeType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICBitmapCodecInfo_INTERFACE_DEFINED__ */ #ifndef __IWICBitmapDecoder_FWD_DEFINED__ #define __IWICBitmapDecoder_FWD_DEFINED__ typedef interface IWICBitmapDecoder IWICBitmapDecoder; +#ifdef __cplusplus +interface IWICBitmapDecoder; +#endif /* __cplusplus */ #endif /***************************************************************************** @@ -3083,138 +2614,139 @@ typedef struct IWICBitmapDecoderInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICBitmapDecoderInfo* This, + IWICBitmapDecoderInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICBitmapDecoderInfo* This); + IWICBitmapDecoderInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICBitmapDecoderInfo* This); + IWICBitmapDecoderInfo *This); /*** IWICComponentInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetComponentType)( - IWICBitmapDecoderInfo* This, + IWICBitmapDecoderInfo *This, WICComponentType *pType); HRESULT (STDMETHODCALLTYPE *GetCLSID)( - IWICBitmapDecoderInfo* This, + IWICBitmapDecoderInfo *This, CLSID *pclsid); HRESULT (STDMETHODCALLTYPE *GetSigningStatus)( - IWICBitmapDecoderInfo* This, + IWICBitmapDecoderInfo *This, DWORD *pStatus); HRESULT (STDMETHODCALLTYPE *GetAuthor)( - IWICBitmapDecoderInfo* This, + IWICBitmapDecoderInfo *This, UINT cchAuthor, WCHAR *wzAuthor, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetVendorGUID)( - IWICBitmapDecoderInfo* This, + IWICBitmapDecoderInfo *This, GUID *pguidVendor); HRESULT (STDMETHODCALLTYPE *GetVersion)( - IWICBitmapDecoderInfo* This, + IWICBitmapDecoderInfo *This, UINT cchVersion, WCHAR *wzVersion, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetSpecVersion)( - IWICBitmapDecoderInfo* This, + IWICBitmapDecoderInfo *This, UINT cchSpecVersion, WCHAR *wzSpecVersion, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetFriendlyName)( - IWICBitmapDecoderInfo* This, + IWICBitmapDecoderInfo *This, UINT cchFriendlyName, WCHAR *wzFriendlyName, UINT *pcchActual); /*** IWICBitmapCodecInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetContainerFormat)( - IWICBitmapDecoderInfo* This, + IWICBitmapDecoderInfo *This, GUID *pguidContainerFormat); HRESULT (STDMETHODCALLTYPE *GetPixelFormats)( - IWICBitmapDecoderInfo* This, + IWICBitmapDecoderInfo *This, UINT cFormats, GUID *pguidPixelFormats, UINT *pcActual); HRESULT (STDMETHODCALLTYPE *GetColorManagementVersion)( - IWICBitmapDecoderInfo* This, + IWICBitmapDecoderInfo *This, UINT cchColorManagementVersion, WCHAR *wzColorManagementVersion, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetDeviceManufacturer)( - IWICBitmapDecoderInfo* This, + IWICBitmapDecoderInfo *This, UINT cchDeviceManufacturer, WCHAR *wzDeviceManufacturer, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetDeviceModels)( - IWICBitmapDecoderInfo* This, + IWICBitmapDecoderInfo *This, UINT cchDeviceModels, WCHAR *wzDeviceModels, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetMimeTypes)( - IWICBitmapDecoderInfo* This, + IWICBitmapDecoderInfo *This, UINT cchMimeTypes, WCHAR *wzMimeTypes, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetFileExtensions)( - IWICBitmapDecoderInfo* This, + IWICBitmapDecoderInfo *This, UINT cchFileExtensions, WCHAR *wzFileExtensions, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *DoesSupportAnimation)( - IWICBitmapDecoderInfo* This, + IWICBitmapDecoderInfo *This, WINBOOL *pfSupportAnimation); HRESULT (STDMETHODCALLTYPE *DoesSupportChromaKey)( - IWICBitmapDecoderInfo* This, + IWICBitmapDecoderInfo *This, WINBOOL *pfSupportChromaKey); HRESULT (STDMETHODCALLTYPE *DoesSupportLossless)( - IWICBitmapDecoderInfo* This, + IWICBitmapDecoderInfo *This, WINBOOL *pfSupportLossless); HRESULT (STDMETHODCALLTYPE *DoesSupportMultiframe)( - IWICBitmapDecoderInfo* This, + IWICBitmapDecoderInfo *This, WINBOOL *pfSupportMultiframe); HRESULT (STDMETHODCALLTYPE *MatchesMimeType)( - IWICBitmapDecoderInfo* This, + IWICBitmapDecoderInfo *This, LPCWSTR wzMimeType, WINBOOL *pfMatches); /*** IWICBitmapDecoderInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetPatterns)( - IWICBitmapDecoderInfo* This, + IWICBitmapDecoderInfo *This, UINT cbSizePatterns, WICBitmapPattern *pPatterns, UINT *pcPatterns, UINT *pcbPatternsActual); HRESULT (STDMETHODCALLTYPE *MatchesPattern)( - IWICBitmapDecoderInfo* This, + IWICBitmapDecoderInfo *This, IStream *pIStream, WINBOOL *pfMatches); HRESULT (STDMETHODCALLTYPE *CreateInstance)( - IWICBitmapDecoderInfo* This, + IWICBitmapDecoderInfo *This, IWICBitmapDecoder **ppIBitmapDecoder); END_INTERFACE } IWICBitmapDecoderInfoVtbl; + interface IWICBitmapDecoderInfo { CONST_VTBL IWICBitmapDecoderInfoVtbl* lpVtbl; }; @@ -3339,23 +2871,6 @@ static FORCEINLINE HRESULT IWICBitmapDecoderInfo_CreateInstance(IWICBitmapDecode #endif -HRESULT STDMETHODCALLTYPE IWICBitmapDecoderInfo_MatchesPattern_Proxy( - IWICBitmapDecoderInfo* This, - IStream *pIStream, - WINBOOL *pfMatches); -void __RPC_STUB IWICBitmapDecoderInfo_MatchesPattern_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapDecoderInfo_CreateInstance_Proxy( - IWICBitmapDecoderInfo* This, - IWICBitmapDecoder **ppIBitmapDecoder); -void __RPC_STUB IWICBitmapDecoderInfo_CreateInstance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICBitmapDecoderInfo_INTERFACE_DEFINED__ */ @@ -3418,68 +2933,69 @@ typedef struct IWICBitmapDecoderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICBitmapDecoder* This, + IWICBitmapDecoder *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICBitmapDecoder* This); + IWICBitmapDecoder *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICBitmapDecoder* This); + IWICBitmapDecoder *This); /*** IWICBitmapDecoder methods ***/ HRESULT (STDMETHODCALLTYPE *QueryCapability)( - IWICBitmapDecoder* This, + IWICBitmapDecoder *This, IStream *pIStream, DWORD *pdwCapability); HRESULT (STDMETHODCALLTYPE *Initialize)( - IWICBitmapDecoder* This, + IWICBitmapDecoder *This, IStream *pIStream, WICDecodeOptions cacheOptions); HRESULT (STDMETHODCALLTYPE *GetContainerFormat)( - IWICBitmapDecoder* This, + IWICBitmapDecoder *This, GUID *pguidContainerFormat); HRESULT (STDMETHODCALLTYPE *GetDecoderInfo)( - IWICBitmapDecoder* This, + IWICBitmapDecoder *This, IWICBitmapDecoderInfo **ppIDecoderInfo); HRESULT (STDMETHODCALLTYPE *CopyPalette)( - IWICBitmapDecoder* This, + IWICBitmapDecoder *This, IWICPalette *pIPalette); HRESULT (STDMETHODCALLTYPE *GetMetadataQueryReader)( - IWICBitmapDecoder* This, + IWICBitmapDecoder *This, IWICMetadataQueryReader **ppIMetadataQueryReader); HRESULT (STDMETHODCALLTYPE *GetPreview)( - IWICBitmapDecoder* This, + IWICBitmapDecoder *This, IWICBitmapSource **ppIBitmapSource); HRESULT (STDMETHODCALLTYPE *GetColorContexts)( - IWICBitmapDecoder* This, + IWICBitmapDecoder *This, UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount); HRESULT (STDMETHODCALLTYPE *GetThumbnail)( - IWICBitmapDecoder* This, + IWICBitmapDecoder *This, IWICBitmapSource **ppIThumbnail); HRESULT (STDMETHODCALLTYPE *GetFrameCount)( - IWICBitmapDecoder* This, + IWICBitmapDecoder *This, UINT *pCount); HRESULT (STDMETHODCALLTYPE *GetFrame)( - IWICBitmapDecoder* This, + IWICBitmapDecoder *This, UINT index, IWICBitmapFrameDecode **ppIBitmapFrame); END_INTERFACE } IWICBitmapDecoderVtbl; + interface IWICBitmapDecoder { CONST_VTBL IWICBitmapDecoderVtbl* lpVtbl; }; @@ -3552,99 +3068,6 @@ static FORCEINLINE HRESULT IWICBitmapDecoder_GetFrame(IWICBitmapDecoder* This,UI #endif -HRESULT STDMETHODCALLTYPE IWICBitmapDecoder_QueryCapability_Proxy( - IWICBitmapDecoder* This, - IStream *pIStream, - DWORD *pdwCapability); -void __RPC_STUB IWICBitmapDecoder_QueryCapability_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapDecoder_Initialize_Proxy( - IWICBitmapDecoder* This, - IStream *pIStream, - WICDecodeOptions cacheOptions); -void __RPC_STUB IWICBitmapDecoder_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapDecoder_GetContainerFormat_Proxy( - IWICBitmapDecoder* This, - GUID *pguidContainerFormat); -void __RPC_STUB IWICBitmapDecoder_GetContainerFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapDecoder_GetDecoderInfo_Proxy( - IWICBitmapDecoder* This, - IWICBitmapDecoderInfo **ppIDecoderInfo); -void __RPC_STUB IWICBitmapDecoder_GetDecoderInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapDecoder_CopyPalette_Proxy( - IWICBitmapDecoder* This, - IWICPalette *pIPalette); -void __RPC_STUB IWICBitmapDecoder_CopyPalette_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapDecoder_GetMetadataQueryReader_Proxy( - IWICBitmapDecoder* This, - IWICMetadataQueryReader **ppIMetadataQueryReader); -void __RPC_STUB IWICBitmapDecoder_GetMetadataQueryReader_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapDecoder_GetPreview_Proxy( - IWICBitmapDecoder* This, - IWICBitmapSource **ppIBitmapSource); -void __RPC_STUB IWICBitmapDecoder_GetPreview_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapDecoder_GetColorContexts_Proxy( - IWICBitmapDecoder* This, - UINT cCount, - IWICColorContext **ppIColorContexts, - UINT *pcActualCount); -void __RPC_STUB IWICBitmapDecoder_GetColorContexts_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapDecoder_GetThumbnail_Proxy( - IWICBitmapDecoder* This, - IWICBitmapSource **ppIThumbnail); -void __RPC_STUB IWICBitmapDecoder_GetThumbnail_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapDecoder_GetFrameCount_Proxy( - IWICBitmapDecoder* This, - UINT *pCount); -void __RPC_STUB IWICBitmapDecoder_GetFrameCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapDecoder_GetFrame_Proxy( - IWICBitmapDecoder* This, - UINT index, - IWICBitmapFrameDecode **ppIBitmapFrame); -void __RPC_STUB IWICBitmapDecoder_GetFrame_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICBitmapDecoder_INTERFACE_DEFINED__ */ @@ -3709,69 +3132,70 @@ typedef struct IWICBitmapFrameEncodeVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICBitmapFrameEncode* This, + IWICBitmapFrameEncode *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICBitmapFrameEncode* This); + IWICBitmapFrameEncode *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICBitmapFrameEncode* This); + IWICBitmapFrameEncode *This); /*** IWICBitmapFrameEncode methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IWICBitmapFrameEncode* This, + IWICBitmapFrameEncode *This, IPropertyBag2 *pIEncoderOptions); HRESULT (STDMETHODCALLTYPE *SetSize)( - IWICBitmapFrameEncode* This, + IWICBitmapFrameEncode *This, UINT uiWidth, UINT uiHeight); HRESULT (STDMETHODCALLTYPE *SetResolution)( - IWICBitmapFrameEncode* This, + IWICBitmapFrameEncode *This, double dpiX, double dpiY); HRESULT (STDMETHODCALLTYPE *SetPixelFormat)( - IWICBitmapFrameEncode* This, + IWICBitmapFrameEncode *This, WICPixelFormatGUID *pPixelFormat); HRESULT (STDMETHODCALLTYPE *SetColorContexts)( - IWICBitmapFrameEncode* This, + IWICBitmapFrameEncode *This, UINT cCount, IWICColorContext **ppIColorContext); HRESULT (STDMETHODCALLTYPE *SetPalette)( - IWICBitmapFrameEncode* This, + IWICBitmapFrameEncode *This, IWICPalette *pIPalette); HRESULT (STDMETHODCALLTYPE *SetThumbnail)( - IWICBitmapFrameEncode* This, + IWICBitmapFrameEncode *This, IWICBitmapSource *pIThumbnail); HRESULT (STDMETHODCALLTYPE *WritePixels)( - IWICBitmapFrameEncode* This, + IWICBitmapFrameEncode *This, UINT lineCount, UINT cbStride, UINT cbBufferSize, BYTE *pbPixels); HRESULT (STDMETHODCALLTYPE *WriteSource)( - IWICBitmapFrameEncode* This, + IWICBitmapFrameEncode *This, IWICBitmapSource *pIBitmapSource, WICRect *prc); HRESULT (STDMETHODCALLTYPE *Commit)( - IWICBitmapFrameEncode* This); + IWICBitmapFrameEncode *This); HRESULT (STDMETHODCALLTYPE *GetMetadataQueryWriter)( - IWICBitmapFrameEncode* This, + IWICBitmapFrameEncode *This, IWICMetadataQueryWriter **ppIMetadataQueryWriter); END_INTERFACE } IWICBitmapFrameEncodeVtbl; + interface IWICBitmapFrameEncode { CONST_VTBL IWICBitmapFrameEncodeVtbl* lpVtbl; }; @@ -3844,106 +3268,15 @@ static FORCEINLINE HRESULT IWICBitmapFrameEncode_GetMetadataQueryWriter(IWICBitm #endif -HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_Initialize_Proxy( - IWICBitmapFrameEncode* This, - IPropertyBag2 *pIEncoderOptions); -void __RPC_STUB IWICBitmapFrameEncode_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_SetSize_Proxy( - IWICBitmapFrameEncode* This, - UINT uiWidth, - UINT uiHeight); -void __RPC_STUB IWICBitmapFrameEncode_SetSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_SetResolution_Proxy( - IWICBitmapFrameEncode* This, - double dpiX, - double dpiY); -void __RPC_STUB IWICBitmapFrameEncode_SetResolution_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_SetPixelFormat_Proxy( - IWICBitmapFrameEncode* This, - WICPixelFormatGUID *pPixelFormat); -void __RPC_STUB IWICBitmapFrameEncode_SetPixelFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_SetColorContexts_Proxy( - IWICBitmapFrameEncode* This, - UINT cCount, - IWICColorContext **ppIColorContext); -void __RPC_STUB IWICBitmapFrameEncode_SetColorContexts_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_SetPalette_Proxy( - IWICBitmapFrameEncode* This, - IWICPalette *pIPalette); -void __RPC_STUB IWICBitmapFrameEncode_SetPalette_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_SetThumbnail_Proxy( - IWICBitmapFrameEncode* This, - IWICBitmapSource *pIThumbnail); -void __RPC_STUB IWICBitmapFrameEncode_SetThumbnail_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_WritePixels_Proxy( - IWICBitmapFrameEncode* This, - UINT lineCount, - UINT cbStride, - UINT cbBufferSize, - BYTE *pbPixels); -void __RPC_STUB IWICBitmapFrameEncode_WritePixels_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_WriteSource_Proxy( - IWICBitmapFrameEncode* This, - IWICBitmapSource *pIBitmapSource, - WICRect *prc); -void __RPC_STUB IWICBitmapFrameEncode_WriteSource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_Commit_Proxy( - IWICBitmapFrameEncode* This); -void __RPC_STUB IWICBitmapFrameEncode_Commit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_GetMetadataQueryWriter_Proxy( - IWICBitmapFrameEncode* This, - IWICMetadataQueryWriter **ppIMetadataQueryWriter); -void __RPC_STUB IWICBitmapFrameEncode_GetMetadataQueryWriter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICBitmapFrameEncode_INTERFACE_DEFINED__ */ #ifndef __IWICBitmapEncoder_FWD_DEFINED__ #define __IWICBitmapEncoder_FWD_DEFINED__ typedef interface IWICBitmapEncoder IWICBitmapEncoder; +#ifdef __cplusplus +interface IWICBitmapEncoder; +#endif /* __cplusplus */ #endif /***************************************************************************** @@ -3970,126 +3303,127 @@ typedef struct IWICBitmapEncoderInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICBitmapEncoderInfo* This, + IWICBitmapEncoderInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICBitmapEncoderInfo* This); + IWICBitmapEncoderInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICBitmapEncoderInfo* This); + IWICBitmapEncoderInfo *This); /*** IWICComponentInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetComponentType)( - IWICBitmapEncoderInfo* This, + IWICBitmapEncoderInfo *This, WICComponentType *pType); HRESULT (STDMETHODCALLTYPE *GetCLSID)( - IWICBitmapEncoderInfo* This, + IWICBitmapEncoderInfo *This, CLSID *pclsid); HRESULT (STDMETHODCALLTYPE *GetSigningStatus)( - IWICBitmapEncoderInfo* This, + IWICBitmapEncoderInfo *This, DWORD *pStatus); HRESULT (STDMETHODCALLTYPE *GetAuthor)( - IWICBitmapEncoderInfo* This, + IWICBitmapEncoderInfo *This, UINT cchAuthor, WCHAR *wzAuthor, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetVendorGUID)( - IWICBitmapEncoderInfo* This, + IWICBitmapEncoderInfo *This, GUID *pguidVendor); HRESULT (STDMETHODCALLTYPE *GetVersion)( - IWICBitmapEncoderInfo* This, + IWICBitmapEncoderInfo *This, UINT cchVersion, WCHAR *wzVersion, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetSpecVersion)( - IWICBitmapEncoderInfo* This, + IWICBitmapEncoderInfo *This, UINT cchSpecVersion, WCHAR *wzSpecVersion, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetFriendlyName)( - IWICBitmapEncoderInfo* This, + IWICBitmapEncoderInfo *This, UINT cchFriendlyName, WCHAR *wzFriendlyName, UINT *pcchActual); /*** IWICBitmapCodecInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetContainerFormat)( - IWICBitmapEncoderInfo* This, + IWICBitmapEncoderInfo *This, GUID *pguidContainerFormat); HRESULT (STDMETHODCALLTYPE *GetPixelFormats)( - IWICBitmapEncoderInfo* This, + IWICBitmapEncoderInfo *This, UINT cFormats, GUID *pguidPixelFormats, UINT *pcActual); HRESULT (STDMETHODCALLTYPE *GetColorManagementVersion)( - IWICBitmapEncoderInfo* This, + IWICBitmapEncoderInfo *This, UINT cchColorManagementVersion, WCHAR *wzColorManagementVersion, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetDeviceManufacturer)( - IWICBitmapEncoderInfo* This, + IWICBitmapEncoderInfo *This, UINT cchDeviceManufacturer, WCHAR *wzDeviceManufacturer, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetDeviceModels)( - IWICBitmapEncoderInfo* This, + IWICBitmapEncoderInfo *This, UINT cchDeviceModels, WCHAR *wzDeviceModels, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetMimeTypes)( - IWICBitmapEncoderInfo* This, + IWICBitmapEncoderInfo *This, UINT cchMimeTypes, WCHAR *wzMimeTypes, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetFileExtensions)( - IWICBitmapEncoderInfo* This, + IWICBitmapEncoderInfo *This, UINT cchFileExtensions, WCHAR *wzFileExtensions, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *DoesSupportAnimation)( - IWICBitmapEncoderInfo* This, + IWICBitmapEncoderInfo *This, WINBOOL *pfSupportAnimation); HRESULT (STDMETHODCALLTYPE *DoesSupportChromaKey)( - IWICBitmapEncoderInfo* This, + IWICBitmapEncoderInfo *This, WINBOOL *pfSupportChromaKey); HRESULT (STDMETHODCALLTYPE *DoesSupportLossless)( - IWICBitmapEncoderInfo* This, + IWICBitmapEncoderInfo *This, WINBOOL *pfSupportLossless); HRESULT (STDMETHODCALLTYPE *DoesSupportMultiframe)( - IWICBitmapEncoderInfo* This, + IWICBitmapEncoderInfo *This, WINBOOL *pfSupportMultiframe); HRESULT (STDMETHODCALLTYPE *MatchesMimeType)( - IWICBitmapEncoderInfo* This, + IWICBitmapEncoderInfo *This, LPCWSTR wzMimeType, WINBOOL *pfMatches); /*** IWICBitmapEncoderInfo methods ***/ HRESULT (STDMETHODCALLTYPE *CreateInstance)( - IWICBitmapEncoderInfo* This, + IWICBitmapEncoderInfo *This, IWICBitmapEncoder **ppIBitmapEncoder); END_INTERFACE } IWICBitmapEncoderInfoVtbl; + interface IWICBitmapEncoderInfo { CONST_VTBL IWICBitmapEncoderInfoVtbl* lpVtbl; }; @@ -4206,14 +3540,6 @@ static FORCEINLINE HRESULT IWICBitmapEncoderInfo_CreateInstance(IWICBitmapEncode #endif -HRESULT STDMETHODCALLTYPE IWICBitmapEncoderInfo_CreateInstance_Proxy( - IWICBitmapEncoderInfo* This, - IWICBitmapEncoder **ppIBitmapEncoder); -void __RPC_STUB IWICBitmapEncoderInfo_CreateInstance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICBitmapEncoderInfo_INTERFACE_DEFINED__ */ @@ -4271,61 +3597,62 @@ typedef struct IWICBitmapEncoderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICBitmapEncoder* This, + IWICBitmapEncoder *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICBitmapEncoder* This); + IWICBitmapEncoder *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICBitmapEncoder* This); + IWICBitmapEncoder *This); /*** IWICBitmapEncoder methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IWICBitmapEncoder* This, + IWICBitmapEncoder *This, IStream *pIStream, WICBitmapEncoderCacheOption cacheOption); HRESULT (STDMETHODCALLTYPE *GetContainerFormat)( - IWICBitmapEncoder* This, + IWICBitmapEncoder *This, GUID *pguidContainerFormat); HRESULT (STDMETHODCALLTYPE *GetEncoderInfo)( - IWICBitmapEncoder* This, + IWICBitmapEncoder *This, IWICBitmapEncoderInfo **ppIEncoderInfo); HRESULT (STDMETHODCALLTYPE *SetColorContexts)( - IWICBitmapEncoder* This, + IWICBitmapEncoder *This, UINT cCount, IWICColorContext **ppIColorContext); HRESULT (STDMETHODCALLTYPE *SetPalette)( - IWICBitmapEncoder* This, + IWICBitmapEncoder *This, IWICPalette *pIPalette); HRESULT (STDMETHODCALLTYPE *SetThumbnail)( - IWICBitmapEncoder* This, + IWICBitmapEncoder *This, IWICBitmapSource *pIThumbnail); HRESULT (STDMETHODCALLTYPE *SetPreview)( - IWICBitmapEncoder* This, + IWICBitmapEncoder *This, IWICBitmapSource *pIPreview); HRESULT (STDMETHODCALLTYPE *CreateNewFrame)( - IWICBitmapEncoder* This, + IWICBitmapEncoder *This, IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions); HRESULT (STDMETHODCALLTYPE *Commit)( - IWICBitmapEncoder* This); + IWICBitmapEncoder *This); HRESULT (STDMETHODCALLTYPE *GetMetadataQueryWriter)( - IWICBitmapEncoder* This, + IWICBitmapEncoder *This, IWICMetadataQueryWriter **ppIMetadataQueryWriter); END_INTERFACE } IWICBitmapEncoderVtbl; + interface IWICBitmapEncoder { CONST_VTBL IWICBitmapEncoderVtbl* lpVtbl; }; @@ -4394,88 +3721,6 @@ static FORCEINLINE HRESULT IWICBitmapEncoder_GetMetadataQueryWriter(IWICBitmapEn #endif -HRESULT STDMETHODCALLTYPE IWICBitmapEncoder_Initialize_Proxy( - IWICBitmapEncoder* This, - IStream *pIStream, - WICBitmapEncoderCacheOption cacheOption); -void __RPC_STUB IWICBitmapEncoder_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapEncoder_GetContainerFormat_Proxy( - IWICBitmapEncoder* This, - GUID *pguidContainerFormat); -void __RPC_STUB IWICBitmapEncoder_GetContainerFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapEncoder_GetEncoderInfo_Proxy( - IWICBitmapEncoder* This, - IWICBitmapEncoderInfo **ppIEncoderInfo); -void __RPC_STUB IWICBitmapEncoder_GetEncoderInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapEncoder_SetColorContexts_Proxy( - IWICBitmapEncoder* This, - UINT cCount, - IWICColorContext **ppIColorContext); -void __RPC_STUB IWICBitmapEncoder_SetColorContexts_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapEncoder_SetPalette_Proxy( - IWICBitmapEncoder* This, - IWICPalette *pIPalette); -void __RPC_STUB IWICBitmapEncoder_SetPalette_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapEncoder_SetThumbnail_Proxy( - IWICBitmapEncoder* This, - IWICBitmapSource *pIThumbnail); -void __RPC_STUB IWICBitmapEncoder_SetThumbnail_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapEncoder_SetPreview_Proxy( - IWICBitmapEncoder* This, - IWICBitmapSource *pIPreview); -void __RPC_STUB IWICBitmapEncoder_SetPreview_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapEncoder_CreateNewFrame_Proxy( - IWICBitmapEncoder* This, - IWICBitmapFrameEncode **ppIFrameEncode, - IPropertyBag2 **ppIEncoderOptions); -void __RPC_STUB IWICBitmapEncoder_CreateNewFrame_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapEncoder_Commit_Proxy( - IWICBitmapEncoder* This); -void __RPC_STUB IWICBitmapEncoder_Commit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICBitmapEncoder_GetMetadataQueryWriter_Proxy( - IWICBitmapEncoder* This, - IWICMetadataQueryWriter **ppIMetadataQueryWriter); -void __RPC_STUB IWICBitmapEncoder_GetMetadataQueryWriter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICBitmapEncoder_INTERFACE_DEFINED__ */ @@ -4513,37 +3758,37 @@ typedef struct IWICFormatConverterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICFormatConverter* This, + IWICFormatConverter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICFormatConverter* This); + IWICFormatConverter *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICFormatConverter* This); + IWICFormatConverter *This); /*** IWICBitmapSource methods ***/ HRESULT (STDMETHODCALLTYPE *GetSize)( - IWICFormatConverter* This, + IWICFormatConverter *This, UINT *puiWidth, UINT *puiHeight); HRESULT (STDMETHODCALLTYPE *GetPixelFormat)( - IWICFormatConverter* This, + IWICFormatConverter *This, WICPixelFormatGUID *pPixelFormat); HRESULT (STDMETHODCALLTYPE *GetResolution)( - IWICFormatConverter* This, + IWICFormatConverter *This, double *pDpiX, double *pDpiY); HRESULT (STDMETHODCALLTYPE *CopyPalette)( - IWICFormatConverter* This, + IWICFormatConverter *This, IWICPalette *pIPalette); HRESULT (STDMETHODCALLTYPE *CopyPixels)( - IWICFormatConverter* This, + IWICFormatConverter *This, const WICRect *prc, UINT cbStride, UINT cbBufferSize, @@ -4551,7 +3796,7 @@ typedef struct IWICFormatConverterVtbl { /*** IWICFormatConverter methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IWICFormatConverter* This, + IWICFormatConverter *This, IWICBitmapSource *pISource, REFWICPixelFormatGUID dstFormat, WICBitmapDitherType dither, @@ -4560,13 +3805,14 @@ typedef struct IWICFormatConverterVtbl { WICBitmapPaletteType paletteTranslate); HRESULT (STDMETHODCALLTYPE *CanConvert)( - IWICFormatConverter* This, + IWICFormatConverter *This, REFWICPixelFormatGUID srcPixelFormat, REFWICPixelFormatGUID dstPixelFormat, WINBOOL *pfCanConvert); END_INTERFACE } IWICFormatConverterVtbl; + interface IWICFormatConverter { CONST_VTBL IWICFormatConverterVtbl* lpVtbl; }; @@ -4625,29 +3871,6 @@ static FORCEINLINE HRESULT IWICFormatConverter_CanConvert(IWICFormatConverter* T #endif -HRESULT STDMETHODCALLTYPE IWICFormatConverter_Initialize_Proxy( - IWICFormatConverter* This, - IWICBitmapSource *pISource, - REFWICPixelFormatGUID dstFormat, - WICBitmapDitherType dither, - IWICPalette *pIPalette, - double alphaThresholdPercent, - WICBitmapPaletteType paletteTranslate); -void __RPC_STUB IWICFormatConverter_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICFormatConverter_CanConvert_Proxy( - IWICFormatConverter* This, - REFWICPixelFormatGUID srcPixelFormat, - REFWICPixelFormatGUID dstPixelFormat, - WINBOOL *pfCanConvert); -void __RPC_STUB IWICFormatConverter_CanConvert_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICFormatConverter_INTERFACE_DEFINED__ */ @@ -4680,70 +3903,71 @@ typedef struct IWICFormatConverterInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICFormatConverterInfo* This, + IWICFormatConverterInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICFormatConverterInfo* This); + IWICFormatConverterInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICFormatConverterInfo* This); + IWICFormatConverterInfo *This); /*** IWICComponentInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetComponentType)( - IWICFormatConverterInfo* This, + IWICFormatConverterInfo *This, WICComponentType *pType); HRESULT (STDMETHODCALLTYPE *GetCLSID)( - IWICFormatConverterInfo* This, + IWICFormatConverterInfo *This, CLSID *pclsid); HRESULT (STDMETHODCALLTYPE *GetSigningStatus)( - IWICFormatConverterInfo* This, + IWICFormatConverterInfo *This, DWORD *pStatus); HRESULT (STDMETHODCALLTYPE *GetAuthor)( - IWICFormatConverterInfo* This, + IWICFormatConverterInfo *This, UINT cchAuthor, WCHAR *wzAuthor, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetVendorGUID)( - IWICFormatConverterInfo* This, + IWICFormatConverterInfo *This, GUID *pguidVendor); HRESULT (STDMETHODCALLTYPE *GetVersion)( - IWICFormatConverterInfo* This, + IWICFormatConverterInfo *This, UINT cchVersion, WCHAR *wzVersion, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetSpecVersion)( - IWICFormatConverterInfo* This, + IWICFormatConverterInfo *This, UINT cchSpecVersion, WCHAR *wzSpecVersion, UINT *pcchActual); HRESULT (STDMETHODCALLTYPE *GetFriendlyName)( - IWICFormatConverterInfo* This, + IWICFormatConverterInfo *This, UINT cchFriendlyName, WCHAR *wzFriendlyName, UINT *pcchActual); /*** IWICFormatConverterInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetPixelFormats)( - IWICFormatConverterInfo* This, + IWICFormatConverterInfo *This, UINT cFormats, WICPixelFormatGUID *pPixelFormatGUIDs, UINT *pcActual); HRESULT (STDMETHODCALLTYPE *CreateInstance)( - IWICFormatConverterInfo* This, + IWICFormatConverterInfo *This, IWICFormatConverter **ppIConverter); END_INTERFACE } IWICFormatConverterInfoVtbl; + interface IWICFormatConverterInfo { CONST_VTBL IWICFormatConverterInfoVtbl* lpVtbl; }; @@ -4814,24 +4038,6 @@ static FORCEINLINE HRESULT IWICFormatConverterInfo_CreateInstance(IWICFormatConv #endif -HRESULT STDMETHODCALLTYPE IWICFormatConverterInfo_GetPixelFormats_Proxy( - IWICFormatConverterInfo* This, - UINT cFormats, - WICPixelFormatGUID *pPixelFormatGUIDs, - UINT *pcActual); -void __RPC_STUB IWICFormatConverterInfo_GetPixelFormats_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICFormatConverterInfo_CreateInstance_Proxy( - IWICFormatConverterInfo* This, - IWICFormatConverter **ppIConverter); -void __RPC_STUB IWICFormatConverterInfo_CreateInstance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICFormatConverterInfo_INTERFACE_DEFINED__ */ @@ -4872,98 +4078,99 @@ typedef struct IWICStreamVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICStream* This, + IWICStream *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICStream* This); + IWICStream *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICStream* This); + IWICStream *This); /*** ISequentialStream methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - IWICStream* This, + IWICStream *This, void *pv, ULONG cb, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Write)( - IWICStream* This, + IWICStream *This, const void *pv, ULONG cb, ULONG *pcbWritten); /*** IStream methods ***/ HRESULT (STDMETHODCALLTYPE *Seek)( - IWICStream* This, + IWICStream *This, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition); HRESULT (STDMETHODCALLTYPE *SetSize)( - IWICStream* This, + IWICStream *This, ULARGE_INTEGER libNewSize); HRESULT (STDMETHODCALLTYPE *CopyTo)( - IWICStream* This, + IWICStream *This, IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten); HRESULT (STDMETHODCALLTYPE *Commit)( - IWICStream* This, + IWICStream *This, DWORD grfCommitFlags); HRESULT (STDMETHODCALLTYPE *Revert)( - IWICStream* This); + IWICStream *This); HRESULT (STDMETHODCALLTYPE *LockRegion)( - IWICStream* This, + IWICStream *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *UnlockRegion)( - IWICStream* This, + IWICStream *This, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); HRESULT (STDMETHODCALLTYPE *Stat)( - IWICStream* This, + IWICStream *This, STATSTG *pstatstg, DWORD grfStatFlag); HRESULT (STDMETHODCALLTYPE *Clone)( - IWICStream* This, + IWICStream *This, IStream **ppstm); /*** IWICStream methods ***/ HRESULT (STDMETHODCALLTYPE *InitializeFromIStream)( - IWICStream* This, + IWICStream *This, IStream *pIStream); HRESULT (STDMETHODCALLTYPE *InitializeFromFilename)( - IWICStream* This, + IWICStream *This, LPCWSTR wzFileName, DWORD dwAccessMode); HRESULT (STDMETHODCALLTYPE *InitializeFromMemory)( - IWICStream* This, + IWICStream *This, BYTE *pbBuffer, DWORD cbBufferSize); HRESULT (STDMETHODCALLTYPE *InitializeFromIStreamRegion)( - IWICStream* This, + IWICStream *This, IStream *pIStream, ULARGE_INTEGER ulOffset, ULARGE_INTEGER ulMaxSize); END_INTERFACE } IWICStreamVtbl; + interface IWICStream { CONST_VTBL IWICStreamVtbl* lpVtbl; }; @@ -5056,42 +4263,6 @@ static FORCEINLINE HRESULT IWICStream_InitializeFromIStreamRegion(IWICStream* Th #endif -HRESULT STDMETHODCALLTYPE IWICStream_InitializeFromIStream_Proxy( - IWICStream* This, - IStream *pIStream); -void __RPC_STUB IWICStream_InitializeFromIStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICStream_InitializeFromFilename_Proxy( - IWICStream* This, - LPCWSTR wzFileName, - DWORD dwAccessMode); -void __RPC_STUB IWICStream_InitializeFromFilename_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICStream_InitializeFromMemory_Proxy( - IWICStream* This, - BYTE *pbBuffer, - DWORD cbBufferSize); -void __RPC_STUB IWICStream_InitializeFromMemory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICStream_InitializeFromIStreamRegion_Proxy( - IWICStream* This, - IStream *pIStream, - ULARGE_INTEGER ulOffset, - ULARGE_INTEGER ulMaxSize); -void __RPC_STUB IWICStream_InitializeFromIStreamRegion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICStream_INTERFACE_DEFINED__ */ @@ -5122,37 +4293,37 @@ typedef struct IWICBitmapScalerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICBitmapScaler* This, + IWICBitmapScaler *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICBitmapScaler* This); + IWICBitmapScaler *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICBitmapScaler* This); + IWICBitmapScaler *This); /*** IWICBitmapSource methods ***/ HRESULT (STDMETHODCALLTYPE *GetSize)( - IWICBitmapScaler* This, + IWICBitmapScaler *This, UINT *puiWidth, UINT *puiHeight); HRESULT (STDMETHODCALLTYPE *GetPixelFormat)( - IWICBitmapScaler* This, + IWICBitmapScaler *This, WICPixelFormatGUID *pPixelFormat); HRESULT (STDMETHODCALLTYPE *GetResolution)( - IWICBitmapScaler* This, + IWICBitmapScaler *This, double *pDpiX, double *pDpiY); HRESULT (STDMETHODCALLTYPE *CopyPalette)( - IWICBitmapScaler* This, + IWICBitmapScaler *This, IWICPalette *pIPalette); HRESULT (STDMETHODCALLTYPE *CopyPixels)( - IWICBitmapScaler* This, + IWICBitmapScaler *This, const WICRect *prc, UINT cbStride, UINT cbBufferSize, @@ -5160,7 +4331,7 @@ typedef struct IWICBitmapScalerVtbl { /*** IWICBitmapScaler methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IWICBitmapScaler* This, + IWICBitmapScaler *This, IWICBitmapSource *pISource, UINT uiWidth, UINT uiHeight, @@ -5168,6 +4339,7 @@ typedef struct IWICBitmapScalerVtbl { END_INTERFACE } IWICBitmapScalerVtbl; + interface IWICBitmapScaler { CONST_VTBL IWICBitmapScalerVtbl* lpVtbl; }; @@ -5222,17 +4394,6 @@ static FORCEINLINE HRESULT IWICBitmapScaler_Initialize(IWICBitmapScaler* This,IW #endif -HRESULT STDMETHODCALLTYPE IWICBitmapScaler_Initialize_Proxy( - IWICBitmapScaler* This, - IWICBitmapSource *pISource, - UINT uiWidth, - UINT uiHeight, - WICBitmapInterpolationMode mode); -void __RPC_STUB IWICBitmapScaler_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICBitmapScaler_INTERFACE_DEFINED__ */ @@ -5261,37 +4422,37 @@ typedef struct IWICBitmapClipperVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICBitmapClipper* This, + IWICBitmapClipper *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICBitmapClipper* This); + IWICBitmapClipper *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICBitmapClipper* This); + IWICBitmapClipper *This); /*** IWICBitmapSource methods ***/ HRESULT (STDMETHODCALLTYPE *GetSize)( - IWICBitmapClipper* This, + IWICBitmapClipper *This, UINT *puiWidth, UINT *puiHeight); HRESULT (STDMETHODCALLTYPE *GetPixelFormat)( - IWICBitmapClipper* This, + IWICBitmapClipper *This, WICPixelFormatGUID *pPixelFormat); HRESULT (STDMETHODCALLTYPE *GetResolution)( - IWICBitmapClipper* This, + IWICBitmapClipper *This, double *pDpiX, double *pDpiY); HRESULT (STDMETHODCALLTYPE *CopyPalette)( - IWICBitmapClipper* This, + IWICBitmapClipper *This, IWICPalette *pIPalette); HRESULT (STDMETHODCALLTYPE *CopyPixels)( - IWICBitmapClipper* This, + IWICBitmapClipper *This, const WICRect *prc, UINT cbStride, UINT cbBufferSize, @@ -5299,12 +4460,13 @@ typedef struct IWICBitmapClipperVtbl { /*** IWICBitmapClipper methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IWICBitmapClipper* This, + IWICBitmapClipper *This, IWICBitmapSource *pISource, const WICRect *prc); END_INTERFACE } IWICBitmapClipperVtbl; + interface IWICBitmapClipper { CONST_VTBL IWICBitmapClipperVtbl* lpVtbl; }; @@ -5359,15 +4521,6 @@ static FORCEINLINE HRESULT IWICBitmapClipper_Initialize(IWICBitmapClipper* This, #endif -HRESULT STDMETHODCALLTYPE IWICBitmapClipper_Initialize_Proxy( - IWICBitmapClipper* This, - IWICBitmapSource *pISource, - const WICRect *prc); -void __RPC_STUB IWICBitmapClipper_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICBitmapClipper_INTERFACE_DEFINED__ */ @@ -5398,37 +4551,37 @@ typedef struct IWICColorTransformVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICColorTransform* This, + IWICColorTransform *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICColorTransform* This); + IWICColorTransform *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICColorTransform* This); + IWICColorTransform *This); /*** IWICBitmapSource methods ***/ HRESULT (STDMETHODCALLTYPE *GetSize)( - IWICColorTransform* This, + IWICColorTransform *This, UINT *puiWidth, UINT *puiHeight); HRESULT (STDMETHODCALLTYPE *GetPixelFormat)( - IWICColorTransform* This, + IWICColorTransform *This, WICPixelFormatGUID *pPixelFormat); HRESULT (STDMETHODCALLTYPE *GetResolution)( - IWICColorTransform* This, + IWICColorTransform *This, double *pDpiX, double *pDpiY); HRESULT (STDMETHODCALLTYPE *CopyPalette)( - IWICColorTransform* This, + IWICColorTransform *This, IWICPalette *pIPalette); HRESULT (STDMETHODCALLTYPE *CopyPixels)( - IWICColorTransform* This, + IWICColorTransform *This, const WICRect *prc, UINT cbStride, UINT cbBufferSize, @@ -5436,7 +4589,7 @@ typedef struct IWICColorTransformVtbl { /*** IWICColorTransform methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IWICColorTransform* This, + IWICColorTransform *This, IWICBitmapSource *pIBitmapSource, IWICColorContext *pIContextSource, IWICColorContext *pIContextDest, @@ -5444,6 +4597,7 @@ typedef struct IWICColorTransformVtbl { END_INTERFACE } IWICColorTransformVtbl; + interface IWICColorTransform { CONST_VTBL IWICColorTransformVtbl* lpVtbl; }; @@ -5498,17 +4652,6 @@ static FORCEINLINE HRESULT IWICColorTransform_Initialize(IWICColorTransform* Thi #endif -HRESULT STDMETHODCALLTYPE IWICColorTransform_Initialize_Proxy( - IWICColorTransform* This, - IWICBitmapSource *pIBitmapSource, - IWICColorContext *pIContextSource, - IWICColorContext *pIContextDest, - REFWICPixelFormatGUID pixelFmtDest); -void __RPC_STUB IWICColorTransform_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICColorTransform_INTERFACE_DEFINED__ */ @@ -5539,26 +4682,27 @@ typedef struct IWICFastMetadataEncoderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICFastMetadataEncoder* This, + IWICFastMetadataEncoder *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICFastMetadataEncoder* This); + IWICFastMetadataEncoder *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICFastMetadataEncoder* This); + IWICFastMetadataEncoder *This); /*** IWICFastMetadataEncoder methods ***/ HRESULT (STDMETHODCALLTYPE *Commit)( - IWICFastMetadataEncoder* This); + IWICFastMetadataEncoder *This); HRESULT (STDMETHODCALLTYPE *GetMetadataQueryWriter)( - IWICFastMetadataEncoder* This, + IWICFastMetadataEncoder *This, IWICMetadataQueryWriter **ppIMetadataQueryWriter); END_INTERFACE } IWICFastMetadataEncoderVtbl; + interface IWICFastMetadataEncoder { CONST_VTBL IWICFastMetadataEncoderVtbl* lpVtbl; }; @@ -5595,21 +4739,6 @@ static FORCEINLINE HRESULT IWICFastMetadataEncoder_GetMetadataQueryWriter(IWICFa #endif -HRESULT STDMETHODCALLTYPE IWICFastMetadataEncoder_Commit_Proxy( - IWICFastMetadataEncoder* This); -void __RPC_STUB IWICFastMetadataEncoder_Commit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICFastMetadataEncoder_GetMetadataQueryWriter_Proxy( - IWICFastMetadataEncoder* This, - IWICMetadataQueryWriter **ppIMetadataQueryWriter); -void __RPC_STUB IWICFastMetadataEncoder_GetMetadataQueryWriter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICFastMetadataEncoder_INTERFACE_DEFINED__ */ @@ -5754,19 +4883,19 @@ typedef struct IWICImagingFactoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICImagingFactory* This, + IWICImagingFactory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICImagingFactory* This); + IWICImagingFactory *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICImagingFactory* This); + IWICImagingFactory *This); /*** IWICImagingFactory methods ***/ HRESULT (STDMETHODCALLTYPE *CreateDecoderFromFilename)( - IWICImagingFactory* This, + IWICImagingFactory *This, LPCWSTR wzFilename, const GUID *pguidVendor, DWORD dwDesiredAccess, @@ -5774,70 +4903,70 @@ typedef struct IWICImagingFactoryVtbl { IWICBitmapDecoder **ppIDecoder); HRESULT (STDMETHODCALLTYPE *CreateDecoderFromStream)( - IWICImagingFactory* This, + IWICImagingFactory *This, IStream *pIStream, const GUID *pguidVendor, WICDecodeOptions metadataOptions, IWICBitmapDecoder **ppIDecoder); HRESULT (STDMETHODCALLTYPE *CreateDecoderFromFileHandle)( - IWICImagingFactory* This, + IWICImagingFactory *This, ULONG_PTR hFile, const GUID *pguidVendor, WICDecodeOptions metadataOptions, IWICBitmapDecoder **ppIDecoder); HRESULT (STDMETHODCALLTYPE *CreateComponentInfo)( - IWICImagingFactory* This, + IWICImagingFactory *This, REFCLSID clsidComponent, IWICComponentInfo **ppIInfo); HRESULT (STDMETHODCALLTYPE *CreateDecoder)( - IWICImagingFactory* This, + IWICImagingFactory *This, REFGUID guidContainerFormat, const GUID *pguidVendor, IWICBitmapDecoder **ppIDecoder); HRESULT (STDMETHODCALLTYPE *CreateEncoder)( - IWICImagingFactory* This, + IWICImagingFactory *This, REFGUID guidContainerFormat, const GUID *pguidVendor, IWICBitmapEncoder **ppIEncoder); HRESULT (STDMETHODCALLTYPE *CreatePalette)( - IWICImagingFactory* This, + IWICImagingFactory *This, IWICPalette **ppIPalette); HRESULT (STDMETHODCALLTYPE *CreateFormatConverter)( - IWICImagingFactory* This, + IWICImagingFactory *This, IWICFormatConverter **ppIFormatConverter); HRESULT (STDMETHODCALLTYPE *CreateBitmapScaler)( - IWICImagingFactory* This, + IWICImagingFactory *This, IWICBitmapScaler **ppIBitmapScaler); HRESULT (STDMETHODCALLTYPE *CreateBitmapClipper)( - IWICImagingFactory* This, + IWICImagingFactory *This, IWICBitmapClipper **ppIBitmapClipper); HRESULT (STDMETHODCALLTYPE *CreateBitmapFlipRotator)( - IWICImagingFactory* This, + IWICImagingFactory *This, IWICBitmapFlipRotator **ppIBitmapFlipRotator); HRESULT (STDMETHODCALLTYPE *CreateStream)( - IWICImagingFactory* This, + IWICImagingFactory *This, IWICStream **ppIWICStream); HRESULT (STDMETHODCALLTYPE *CreateColorContext)( - IWICImagingFactory* This, + IWICImagingFactory *This, IWICColorContext **ppIWICColorContext); HRESULT (STDMETHODCALLTYPE *CreateColorTransformer)( - IWICImagingFactory* This, + IWICImagingFactory *This, IWICColorTransform **ppIWICColorTransform); HRESULT (STDMETHODCALLTYPE *CreateBitmap)( - IWICImagingFactory* This, + IWICImagingFactory *This, UINT uiWidth, UINT uiHeight, REFWICPixelFormatGUID pixelFormat, @@ -5845,13 +4974,13 @@ typedef struct IWICImagingFactoryVtbl { IWICBitmap **ppIBitmap); HRESULT (STDMETHODCALLTYPE *CreateBitmapFromSource)( - IWICImagingFactory* This, + IWICImagingFactory *This, IWICBitmapSource *piBitmapSource, WICBitmapCreateCacheOption option, IWICBitmap **ppIBitmap); HRESULT (STDMETHODCALLTYPE *CreateBitmapFromSourceRect)( - IWICImagingFactory* This, + IWICImagingFactory *This, IWICBitmapSource *piBitmapSource, UINT x, UINT y, @@ -5860,7 +4989,7 @@ typedef struct IWICImagingFactoryVtbl { IWICBitmap **ppIBitmap); HRESULT (STDMETHODCALLTYPE *CreateBitmapFromMemory)( - IWICImagingFactory* This, + IWICImagingFactory *This, UINT uiWidth, UINT uiHeight, REFWICPixelFormatGUID pixelFormat, @@ -5870,47 +4999,48 @@ typedef struct IWICImagingFactoryVtbl { IWICBitmap **ppIBitmap); HRESULT (STDMETHODCALLTYPE *CreateBitmapFromHBITMAP)( - IWICImagingFactory* This, + IWICImagingFactory *This, HBITMAP hBitmap, HPALETTE hPalette, WICBitmapAlphaChannelOption options, IWICBitmap **ppIBitmap); HRESULT (STDMETHODCALLTYPE *CreateBitmapFromHICON)( - IWICImagingFactory* This, + IWICImagingFactory *This, HICON hIcon, IWICBitmap **ppIBitmap); HRESULT (STDMETHODCALLTYPE *CreateComponentEnumerator)( - IWICImagingFactory* This, + IWICImagingFactory *This, DWORD componentTypes, DWORD options, IEnumUnknown **ppIEnumUnknown); HRESULT (STDMETHODCALLTYPE *CreateFastMetadataEncoderFromDecoder)( - IWICImagingFactory* This, + IWICImagingFactory *This, IWICBitmapDecoder *pIDecoder, IWICFastMetadataEncoder **ppIFastEncoder); HRESULT (STDMETHODCALLTYPE *CreateFastMetadataEncoderFromFrameDecode)( - IWICImagingFactory* This, + IWICImagingFactory *This, IWICBitmapFrameDecode *pIFrameDecoder, IWICFastMetadataEncoder **ppIFastEncoder); HRESULT (STDMETHODCALLTYPE *CreateQueryWriter)( - IWICImagingFactory* This, + IWICImagingFactory *This, REFGUID guidMetadataFormat, const GUID *pguidVendor, IWICMetadataQueryWriter **ppIQueryWriter); HRESULT (STDMETHODCALLTYPE *CreateQueryWriterFromReader)( - IWICImagingFactory* This, + IWICImagingFactory *This, IWICMetadataQueryReader *pIQueryReader, const GUID *pguidVendor, IWICMetadataQueryWriter **ppIQueryWriter); END_INTERFACE } IWICImagingFactoryVtbl; + interface IWICImagingFactory { CONST_VTBL IWICImagingFactoryVtbl* lpVtbl; }; @@ -6039,250 +5169,6 @@ static FORCEINLINE HRESULT IWICImagingFactory_CreateQueryWriterFromReader(IWICIm #endif -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateDecoderFromFilename_Proxy( - IWICImagingFactory* This, - LPCWSTR wzFilename, - const GUID *pguidVendor, - DWORD dwDesiredAccess, - WICDecodeOptions metadataOptions, - IWICBitmapDecoder **ppIDecoder); -void __RPC_STUB IWICImagingFactory_CreateDecoderFromFilename_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateDecoderFromStream_Proxy( - IWICImagingFactory* This, - IStream *pIStream, - const GUID *pguidVendor, - WICDecodeOptions metadataOptions, - IWICBitmapDecoder **ppIDecoder); -void __RPC_STUB IWICImagingFactory_CreateDecoderFromStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateDecoderFromFileHandle_Proxy( - IWICImagingFactory* This, - ULONG_PTR hFile, - const GUID *pguidVendor, - WICDecodeOptions metadataOptions, - IWICBitmapDecoder **ppIDecoder); -void __RPC_STUB IWICImagingFactory_CreateDecoderFromFileHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateComponentInfo_Proxy( - IWICImagingFactory* This, - REFCLSID clsidComponent, - IWICComponentInfo **ppIInfo); -void __RPC_STUB IWICImagingFactory_CreateComponentInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateDecoder_Proxy( - IWICImagingFactory* This, - REFGUID guidContainerFormat, - const GUID *pguidVendor, - IWICBitmapDecoder **ppIDecoder); -void __RPC_STUB IWICImagingFactory_CreateDecoder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateEncoder_Proxy( - IWICImagingFactory* This, - REFGUID guidContainerFormat, - const GUID *pguidVendor, - IWICBitmapEncoder **ppIEncoder); -void __RPC_STUB IWICImagingFactory_CreateEncoder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreatePalette_Proxy( - IWICImagingFactory* This, - IWICPalette **ppIPalette); -void __RPC_STUB IWICImagingFactory_CreatePalette_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateFormatConverter_Proxy( - IWICImagingFactory* This, - IWICFormatConverter **ppIFormatConverter); -void __RPC_STUB IWICImagingFactory_CreateFormatConverter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateBitmapScaler_Proxy( - IWICImagingFactory* This, - IWICBitmapScaler **ppIBitmapScaler); -void __RPC_STUB IWICImagingFactory_CreateBitmapScaler_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateBitmapClipper_Proxy( - IWICImagingFactory* This, - IWICBitmapClipper **ppIBitmapClipper); -void __RPC_STUB IWICImagingFactory_CreateBitmapClipper_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateBitmapFlipRotator_Proxy( - IWICImagingFactory* This, - IWICBitmapFlipRotator **ppIBitmapFlipRotator); -void __RPC_STUB IWICImagingFactory_CreateBitmapFlipRotator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateStream_Proxy( - IWICImagingFactory* This, - IWICStream **ppIWICStream); -void __RPC_STUB IWICImagingFactory_CreateStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateColorContext_Proxy( - IWICImagingFactory* This, - IWICColorContext **ppIWICColorContext); -void __RPC_STUB IWICImagingFactory_CreateColorContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateColorTransformer_Proxy( - IWICImagingFactory* This, - IWICColorTransform **ppIWICColorTransform); -void __RPC_STUB IWICImagingFactory_CreateColorTransformer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateBitmap_Proxy( - IWICImagingFactory* This, - UINT uiWidth, - UINT uiHeight, - REFWICPixelFormatGUID pixelFormat, - WICBitmapCreateCacheOption option, - IWICBitmap **ppIBitmap); -void __RPC_STUB IWICImagingFactory_CreateBitmap_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateBitmapFromSource_Proxy( - IWICImagingFactory* This, - IWICBitmapSource *piBitmapSource, - WICBitmapCreateCacheOption option, - IWICBitmap **ppIBitmap); -void __RPC_STUB IWICImagingFactory_CreateBitmapFromSource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateBitmapFromSourceRect_Proxy( - IWICImagingFactory* This, - IWICBitmapSource *piBitmapSource, - UINT x, - UINT y, - UINT width, - UINT height, - IWICBitmap **ppIBitmap); -void __RPC_STUB IWICImagingFactory_CreateBitmapFromSourceRect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateBitmapFromMemory_Proxy( - IWICImagingFactory* This, - UINT uiWidth, - UINT uiHeight, - REFWICPixelFormatGUID pixelFormat, - UINT cbStride, - UINT cbBufferSize, - BYTE *pbBuffer, - IWICBitmap **ppIBitmap); -void __RPC_STUB IWICImagingFactory_CreateBitmapFromMemory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateBitmapFromHBITMAP_Proxy( - IWICImagingFactory* This, - HBITMAP hBitmap, - HPALETTE hPalette, - WICBitmapAlphaChannelOption options, - IWICBitmap **ppIBitmap); -void __RPC_STUB IWICImagingFactory_CreateBitmapFromHBITMAP_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateBitmapFromHICON_Proxy( - IWICImagingFactory* This, - HICON hIcon, - IWICBitmap **ppIBitmap); -void __RPC_STUB IWICImagingFactory_CreateBitmapFromHICON_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateComponentEnumerator_Proxy( - IWICImagingFactory* This, - DWORD componentTypes, - DWORD options, - IEnumUnknown **ppIEnumUnknown); -void __RPC_STUB IWICImagingFactory_CreateComponentEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateFastMetadataEncoderFromDecoder_Proxy( - IWICImagingFactory* This, - IWICBitmapDecoder *pIDecoder, - IWICFastMetadataEncoder **ppIFastEncoder); -void __RPC_STUB IWICImagingFactory_CreateFastMetadataEncoderFromDecoder_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateFastMetadataEncoderFromFrameDecode_Proxy( - IWICImagingFactory* This, - IWICBitmapFrameDecode *pIFrameDecoder, - IWICFastMetadataEncoder **ppIFastEncoder); -void __RPC_STUB IWICImagingFactory_CreateFastMetadataEncoderFromFrameDecode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateQueryWriter_Proxy( - IWICImagingFactory* This, - REFGUID guidMetadataFormat, - const GUID *pguidVendor, - IWICMetadataQueryWriter **ppIQueryWriter); -void __RPC_STUB IWICImagingFactory_CreateQueryWriter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateQueryWriterFromReader_Proxy( - IWICImagingFactory* This, - IWICMetadataQueryReader *pIQueryReader, - const GUID *pguidVendor, - IWICMetadataQueryWriter **ppIQueryWriter); -void __RPC_STUB IWICImagingFactory_CreateQueryWriterFromReader_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICImagingFactory_INTERFACE_DEFINED__ */ @@ -6323,19 +5209,19 @@ typedef struct IWICEnumMetadataItemVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICEnumMetadataItem* This, + IWICEnumMetadataItem *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWICEnumMetadataItem* This); + IWICEnumMetadataItem *This); ULONG (STDMETHODCALLTYPE *Release)( - IWICEnumMetadataItem* This); + IWICEnumMetadataItem *This); /*** IWICEnumMetadataItem methods ***/ HRESULT (STDMETHODCALLTYPE *Next)( - IWICEnumMetadataItem* This, + IWICEnumMetadataItem *This, ULONG celt, PROPVARIANT *rgeltSchema, PROPVARIANT *rgeltId, @@ -6343,18 +5229,19 @@ typedef struct IWICEnumMetadataItemVtbl { ULONG *pceltFetched); HRESULT (STDMETHODCALLTYPE *Skip)( - IWICEnumMetadataItem* This, + IWICEnumMetadataItem *This, ULONG celt); HRESULT (STDMETHODCALLTYPE *Reset)( - IWICEnumMetadataItem* This); + IWICEnumMetadataItem *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IWICEnumMetadataItem* This, + IWICEnumMetadataItem *This, IWICEnumMetadataItem **ppIEnumMetadataItem); END_INTERFACE } IWICEnumMetadataItemVtbl; + interface IWICEnumMetadataItem { CONST_VTBL IWICEnumMetadataItemVtbl* lpVtbl; }; @@ -6399,41 +5286,6 @@ static FORCEINLINE HRESULT IWICEnumMetadataItem_Clone(IWICEnumMetadataItem* This #endif -HRESULT STDMETHODCALLTYPE IWICEnumMetadataItem_Next_Proxy( - IWICEnumMetadataItem* This, - ULONG celt, - PROPVARIANT *rgeltSchema, - PROPVARIANT *rgeltId, - PROPVARIANT *rgeltValue, - ULONG *pceltFetched); -void __RPC_STUB IWICEnumMetadataItem_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICEnumMetadataItem_Skip_Proxy( - IWICEnumMetadataItem* This, - ULONG celt); -void __RPC_STUB IWICEnumMetadataItem_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICEnumMetadataItem_Reset_Proxy( - IWICEnumMetadataItem* This); -void __RPC_STUB IWICEnumMetadataItem_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWICEnumMetadataItem_Clone_Proxy( - IWICEnumMetadataItem* This, - IWICEnumMetadataItem **ppIEnumMetadataItem); -void __RPC_STUB IWICEnumMetadataItem_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWICEnumMetadataItem_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/wincon.h b/lib/libc/include/any-windows-any/wincon.h index e239f1f978..7e88ce5fec 100644 --- a/lib/libc/include/any-windows-any/wincon.h +++ b/lib/libc/include/any-windows-any/wincon.h @@ -178,9 +178,13 @@ extern "C" { #define ENABLE_QUICK_EDIT_MODE 0x40 #define ENABLE_EXTENDED_FLAGS 0x80 #define ENABLE_AUTO_POSITION 0x100 +#define ENABLE_VIRTUAL_TERMINAL_INPUT 0x200 #define ENABLE_PROCESSED_OUTPUT 0x1 #define ENABLE_WRAP_AT_EOL_OUTPUT 0x2 +#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x4 +#define DISABLE_NEWLINE_AUTO_RETURN 0x8 +#define ENABLE_LVB_GRID_WORLDWIDE 0x10 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) @@ -373,6 +377,19 @@ WINBASEAPI WINBOOL WINAPI SetCurrentConsoleFontEx( PCONSOLE_FONT_INFOEX lpConsoleCurrentFontEx ); +#if (NTDDI_VERSION >= 0x0A000006) + +/* CreatePseudoConsole Flags */ +#define PSEUDOCONSOLE_INHERIT_CURSOR 1 + +typedef VOID* HPCON; + +WINBASEAPI HRESULT WINAPI CreatePseudoConsole(COORD size, HANDLE hInput, HANDLE hOutput, DWORD dwFlags, HPCON* phPC); +WINBASEAPI HRESULT WINAPI ResizePseudoConsole(HPCON hPC, COORD size); +WINBASEAPI VOID WINAPI ClosePseudoConsole(HPCON hPC); + +#endif /* NTDDI_WIN10_RS5 */ + #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && defined(WINSTORECOMPAT) diff --git a/lib/libc/include/any-windows-any/wincrypt.h b/lib/libc/include/any-windows-any/wincrypt.h index 7425823f00..1bcfac7e1e 100644 --- a/lib/libc/include/any-windows-any/wincrypt.h +++ b/lib/libc/include/any-windows-any/wincrypt.h @@ -95,9 +95,19 @@ extern "C" { #define ALG_TYPE_STREAM (4 << 9) #define ALG_TYPE_DH (5 << 9) #define ALG_TYPE_SECURECHANNEL (6 << 9) +#if NTDDI_VERSION >= NTDDI_VISTA +#define ALG_TYPE_ECDH (7 << 9) +#endif +#if NTDDI_VERSION >= NTDDI_WIN10_RS1 +#define ALG_TYPE_THIRDPARTY (8 << 9) +#endif #define ALG_SID_ANY (0) +#if NTDDI_VERSION >= NTDDI_WIN10_RS1 +#define ALG_SID_THIRDPARTY_ANY (0) +#endif + #define ALG_SID_RSA_ANY 0 #define ALG_SID_RSA_PKCS 1 #define ALG_SID_RSA_MSATWORK 2 @@ -107,7 +117,7 @@ extern "C" { #define ALG_SID_DSS_ANY 0 #define ALG_SID_DSS_PKCS 1 #define ALG_SID_DSS_DMS 2 -#if NTDDI_VERSION >= 0x06000000 +#if NTDDI_VERSION >= NTDDI_VISTA #define ALG_SID_ECDSA 3 #endif @@ -123,10 +133,12 @@ extern "C" { #define ALG_SID_TEK 11 #define ALG_SID_CYLINK_MEK 12 #define ALG_SID_RC5 13 +#if NTDDI_VERSION >= NTDDI_WINXP #define ALG_SID_AES_128 14 #define ALG_SID_AES_192 15 #define ALG_SID_AES_256 16 #define ALG_SID_AES 17 +#endif #define CRYPT_MODE_CBCI 6 #define CRYPT_MODE_CFBP 7 @@ -143,8 +155,9 @@ extern "C" { #define ALG_SID_DH_EPHEM 2 #define ALG_SID_AGREED_KEY_ANY 3 #define ALG_SID_KEA 4 -#if NTDDI_VERSION >= 0x06000000 +#if NTDDI_VERSION >= NTDDI_VISTA #define ALG_SID_ECDH 5 +#define ALG_SID_ECDH_EPHEM 6 #endif #define ALG_SID_MD2 1 @@ -158,10 +171,14 @@ extern "C" { #define ALG_SID_SSL3SHAMD5 8 #define ALG_SID_HMAC 9 #define ALG_SID_TLS1PRF 10 +#if NTDDI_VERSION >= NTDDI_WINXP #define ALG_SID_HASH_REPLACE_OWF 11 +#endif +#if NTDDI_VERSION > NTDDI_WINXPSP2 #define ALG_SID_SHA_256 12 #define ALG_SID_SHA_384 13 #define ALG_SID_SHA_512 14 +#endif #define ALG_SID_SSL3_MASTER 1 #define ALG_SID_SCHANNEL_MASTER_HASH 2 @@ -171,7 +188,7 @@ extern "C" { #define ALG_SID_TLS1_MASTER 6 #define ALG_SID_SCHANNEL_ENC_KEY 7 -#if NTDDI_VERSION >= 0x06000000 +#if NTDDI_VERSION >= NTDDI_VISTA #define ALG_SID_ECMQV 1 #endif @@ -190,7 +207,9 @@ extern "C" { #define CALG_MAC (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_MAC) #define CALG_RSA_SIGN (ALG_CLASS_SIGNATURE | ALG_TYPE_RSA | ALG_SID_RSA_ANY) #define CALG_DSS_SIGN (ALG_CLASS_SIGNATURE | ALG_TYPE_DSS | ALG_SID_DSS_ANY) +#if NTDDI_VERSION >= NTDDI_WINXP #define CALG_NO_SIGN (ALG_CLASS_SIGNATURE | ALG_TYPE_ANY | ALG_SID_ANY) +#endif #define CALG_RSA_KEYX (ALG_CLASS_KEY_EXCHANGE|ALG_TYPE_RSA|ALG_SID_RSA_ANY) #define CALG_DES (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_DES) #define CALG_3DES_112 (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_3DES_112) @@ -218,18 +237,44 @@ extern "C" { #define CALG_RC5 (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_RC5) #define CALG_HMAC (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_HMAC) #define CALG_TLS1PRF (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_TLS1PRF) +#if NTDDI_VERSION >= NTDDI_WINXP #define CALG_HASH_REPLACE_OWF (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_HASH_REPLACE_OWF) #define CALG_AES_128 (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_AES_128) #define CALG_AES_192 (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_AES_192) #define CALG_AES_256 (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_AES_256) #define CALG_AES (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_AES) +#endif +#if NTDDI_VERSION > NTDDI_WINXPSP2 #define CALG_SHA_256 (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_256) #define CALG_SHA_384 (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_384) #define CALG_SHA_512 (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_512) -#if NTDDI_VERSION >= 0x06000000 +#endif +#if NTDDI_VERSION >= NTDDI_VISTA #define CALG_ECDH (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_ECDH) +#define CALG_ECDH_EPHEM (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_ECDH | ALG_SID_ECDH_EPHEM) #define CALG_ECMQV (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_ANY | ALG_SID_ECMQV) #define CALG_ECDSA (ALG_CLASS_SIGNATURE | ALG_TYPE_DSS | ALG_SID_ECDSA) +#define CALG_NULLCIPHER (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_ANY | 0) +#endif +#if NTDDI_VERSION >= NTDDI_WIN10_RS1 +#define CALG_THIRDPARTY_KEY_EXCHANGE (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_THIRDPARTY | ALG_SID_THIRDPARTY_ANY) +#define CALG_THIRDPARTY_SIGNATURE (ALG_CLASS_SIGNATURE | ALG_TYPE_THIRDPARTY | ALG_SID_THIRDPARTY_ANY) +#define CALG_THIRDPARTY_CIPHER (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_THIRDPARTY | ALG_SID_THIRDPARTY_ANY) +#define CALG_THIRDPARTY_HASH (ALG_CLASS_HASH | ALG_TYPE_THIRDPARTY | ALG_SID_THIRDPARTY_ANY) +#endif + +#if NTDDI_VERSION < NTDDI_WINXP +#define SIGNATURE_RESOURCE_NUMBER 0x29A + + typedef struct _VTableProvStruc { + DWORD Version; + FARPROC FuncVerifyImage; + FARPROC FuncReturnhWnd; + DWORD dwProvType; + BYTE *pbContextInfo; + DWORD cbContextInfo; + LPSTR pszProvName; + } VTableProvStruc, *PVTableProvStruc; #endif /* In ncrypt.h too */ @@ -245,7 +290,7 @@ extern "C" { #define CRYPT_DELETEKEYSET 0x10 #define CRYPT_MACHINE_KEYSET 0x20 #define CRYPT_SILENT 0x40 -#if NTDDI_VERSION >= 0x06000000 +#if NTDDI_VERSION >= NTDDI_VISTA #define CRYPT_DEFAULT_CONTAINER_OPTIONAL 0x80 #endif @@ -264,8 +309,10 @@ extern "C" { #define CRYPT_DATA_KEY 0x800 #define CRYPT_VOLATILE 0x1000 #define CRYPT_SGCKEY 0x2000 +#if NTDDI_VERSION >= NTDDI_WINXP #define CRYPT_ARCHIVABLE 0x4000 -#if NTDDI_VERSION >= 0x06000000 +#endif +#if NTDDI_VERSION >= NTDDI_VISTA #define CRYPT_FORCE_KEY_PROTECTION_HIGH 0x8000 #endif #define CRYPT_USER_PROTECTED_STRONG 0x100000 @@ -279,13 +326,19 @@ extern "C" { #define CRYPT_Y_ONLY 0x1 #define CRYPT_SSL2_FALLBACK 0x2 #define CRYPT_DESTROYKEY 0x4 +#if NTDDI_VERSION >= NTDDI_WS03 #define CRYPT_DECRYPT_RSA_NO_PADDING_CHECK 0x20 +#endif #define CRYPT_OAEP 0x40 #define CRYPT_BLOB_VER3 0x80 +#if NTDDI_VERSION >= NTDDI_WINXP #define CRYPT_IPSEC_HMAC_KEY 0x100 +#endif #define CRYPT_SECRETDIGEST 0x1 +#if NTDDI_VERSION >= NTDDI_WINXP #define CRYPT_OWF_REPL_LM_HASH 0x1 +#endif #define CRYPT_LITTLE_ENDIAN 0x1 #define CRYPT_NOHASHOID 0x1 @@ -303,7 +356,9 @@ extern "C" { #define OPAQUEKEYBLOB 0x9 #define PUBLICKEYBLOBEX 0xa #define SYMMETRICWRAPKEYBLOB 0xb +#if NTDDI_VERSION >= NTDDI_WS03 #define KEYSTATEBLOB 0xc +#endif #define AT_KEYEXCHANGE 1 #define AT_SIGNATURE 2 @@ -344,14 +399,18 @@ extern "C" { #define KP_KEYEXCHANGE_PIN 32 #define KP_SIGNATURE_PIN 33 #define KP_PREHASH 34 +#if NTDDI_VERSION >= NTDDI_WS03 #define KP_ROUNDS 35 +#endif #define KP_OAEP_PARAMS 36 #define KP_CMS_KEY_INFO 37 #define KP_CMS_DH_KEY_INFO 38 #define KP_PUB_PARAMS 39 #define KP_VERIFY_PARAMS 40 #define KP_HIGHEST_VERSION 41 +#if NTDDI_VERSION >= NTDDI_WS03 #define KP_GET_USE_COUNT 42 +#endif #define KP_PIN_ID 43 #define KP_PIN_INFO 44 @@ -373,7 +432,9 @@ extern "C" { #define CRYPT_MAC 0x20 #define CRYPT_EXPORT_KEY 0x40 #define CRYPT_IMPORT_KEY 0x80 +#if NTDDI_VERSION >= NTDDI_WINXP #define CRYPT_ARCHIVE 0x100 +#endif #define HP_ALGID 0x1 #define HP_HASHVAL 0x2 @@ -418,14 +479,16 @@ extern "C" { #define PP_USE_HARDWARE_RNG 38 #define PP_KEYSPEC 39 #define PP_ENUMEX_SIGNING_PROT 40 +#if NTDDI_VERSION >= NTDDI_WS03 #define PP_CRYPT_COUNT_KEY_USE 41 -#if NTDDI_VERSION >= 0x06000000 +#endif +#if NTDDI_VERSION >= NTDDI_VISTA #define PP_USER_CERTSTORE 42 #define PP_SMARTCARD_READER 43 #define PP_SMARTCARD_GUID 45 #define PP_ROOT_CERTSTORE 46 #endif -#if NTDDI_VERSION >= 0x06020000 +#if NTDDI_VERSION >= NTDDI_WIN8 #define PP_SMARTCARD_READER_ICON 47 #endif @@ -460,11 +523,14 @@ extern "C" { #define PP_KEYEXCHANGE_ALG 14 #define PP_SIGNATURE_ALG 15 #define PP_DELETEKEY 24 -#if NTDDI_VERSION >= 0x06000000 +#if NTDDI_VERSION >= NTDDI_VISTA #define PP_PIN_PROMPT_STRING 44 #define PP_SECURE_KEYEXCHANGE_PIN 47 #define PP_SECURE_SIGNATURE_PIN 48 #endif +#if NTDDI_VERSION >= NTDDI_WIN10_RS5 +#define PP_DISMISS_PIN_UI_SEC 49 +#endif #define PROV_RSA_FULL 1 #define PROV_RSA_SIG 2 @@ -487,8 +553,10 @@ extern "C" { #define PROV_SPYRUS_LYNKS 20 #define PROV_RNG 21 #define PROV_INTEL_SEC 22 +#if NTDDI_VERSION >= NTDDI_WINXP #define PROV_REPLACE_OWF 23 #define PROV_RSA_AES 24 +#endif #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) @@ -502,8 +570,10 @@ extern "C" { #define MS_ENH_DSS_DH_PROV __MINGW_NAME_UAW(MS_ENH_DSS_DH_PROV) #define MS_DEF_DH_SCHANNEL_PROV __MINGW_NAME_UAW(MS_DEF_DH_SCHANNEL_PROV) #define MS_SCARD_PROV __MINGW_NAME_UAW(MS_SCARD_PROV) +#if NTDDI_VERSION >= NTDDI_WINXP #define MS_ENH_RSA_AES_PROV_XP __MINGW_NAME_UAW(MS_ENH_RSA_AES_PROV_XP) #define MS_ENH_RSA_AES_PROV __MINGW_NAME_UAW(MS_ENH_RSA_AES_PROV) +#endif #define MS_DEF_PROV_A "Microsoft Base Cryptographic Provider v1.0" #define MS_DEF_PROV_W L"Microsoft Base Cryptographic Provider v1.0" @@ -525,10 +595,12 @@ extern "C" { #define MS_DEF_DH_SCHANNEL_PROV_W L"Microsoft DH SChannel Cryptographic Provider" #define MS_SCARD_PROV_A "Microsoft Base Smart Card Crypto Provider" #define MS_SCARD_PROV_W L"Microsoft Base Smart Card Crypto Provider" +#if NTDDI_VERSION >= NTDDI_WINXP #define MS_ENH_RSA_AES_PROV_A "Microsoft Enhanced RSA and AES Cryptographic Provider" #define MS_ENH_RSA_AES_PROV_W L"Microsoft Enhanced RSA and AES Cryptographic Provider" #define MS_ENH_RSA_AES_PROV_XP_A "Microsoft Enhanced RSA and AES Cryptographic Provider (Prototype)" #define MS_ENH_RSA_AES_PROV_XP_W L"Microsoft Enhanced RSA and AES Cryptographic Provider (Prototype)" +#endif #define MAXUIDLEN 64 @@ -542,11 +614,13 @@ extern "C" { #define szKEY_CACHE_ENABLED "CachePrivateKeys" #define szKEY_CACHE_SECONDS "PrivateKeyLifetimeSeconds" +#if NTDDI_VERSION >= NTDDI_WINXP #define szPRIV_KEY_CACHE_MAX_ITEMS "PrivKeyCacheMaxItems" #define cPRIV_KEY_CACHE_MAX_ITEMS_DEFAULT 20 #define szPRIV_KEY_CACHE_PURGE_INTERVAL_SECONDS "PrivKeyCachePurgeIntervalSeconds" #define cPRIV_KEY_CACHE_PURGE_INTERVAL_SECONDS_DEFAULT 86400 +#endif #define CUR_BLOB_VERSION 2 @@ -648,6 +722,7 @@ extern "C" { unsigned char CertLabel[36]; } CERT_FORTEZZA_DATA_PROP; +#if NTDDI_VERSION >= NTDDI_WS03 typedef struct _CRYPT_RC4_KEY_STATE { unsigned char Key[16]; unsigned char SBox[256]; @@ -666,8 +741,9 @@ extern "C" { unsigned char IV[8]; unsigned char Feedback[8]; } CRYPT_3DES_KEY_STATE,*PCRYPT_3DES_KEY_STATE; +#endif -#if NTDDI_VERSION >= 0x06000000 +#if NTDDI_VERSION >= NTDDI_VISTA typedef struct _CRYPT_AES_128_KEY_STATE { unsigned char Key[16]; unsigned char IV[16]; @@ -756,8 +832,10 @@ extern "C" { WINIMPM WINBOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFlags); WINIMPM WINBOOL WINAPI CryptDuplicateKey (HCRYPTKEY hKey, DWORD *pdwReserved, DWORD dwFlags, HCRYPTKEY *phKey); WINIMPM WINBOOL WINAPI CryptDuplicateHash (HCRYPTHASH hHash, DWORD *pdwReserved, DWORD dwFlags, HCRYPTHASH *phHash); +#if NTDDI_VERSION >= NTDDI_WS03 WINBOOL __cdecl GetEncSChannel (BYTE **pData, DWORD *dwDecSize); #endif +#endif #ifndef _DDK_DRIVER_ typedef ULONG_PTR HCRYPTPROV_OR_NCRYPT_KEY_HANDLE; @@ -864,6 +942,55 @@ extern "C" { #define szOID_ECC_CURVE_P256 "1.2.840.10045.3.1.7" #define szOID_ECC_CURVE_P384 "1.3.132.0.34" #define szOID_ECC_CURVE_P521 "1.3.132.0.35" + +#define szOID_ECC_CURVE_BRAINPOOLP160R1 "1.3.36.3.3.2.8.1.1.1" +#define szOID_ECC_CURVE_BRAINPOOLP160T1 "1.3.36.3.3.2.8.1.1.2" +#define szOID_ECC_CURVE_BRAINPOOLP192R1 "1.3.36.3.3.2.8.1.1.3" +#define szOID_ECC_CURVE_BRAINPOOLP192T1 "1.3.36.3.3.2.8.1.1.4" +#define szOID_ECC_CURVE_BRAINPOOLP224R1 "1.3.36.3.3.2.8.1.1.5" +#define szOID_ECC_CURVE_BRAINPOOLP224T1 "1.3.36.3.3.2.8.1.1.6" +#define szOID_ECC_CURVE_BRAINPOOLP256R1 "1.3.36.3.3.2.8.1.1.7" +#define szOID_ECC_CURVE_BRAINPOOLP256T1 "1.3.36.3.3.2.8.1.1.8" +#define szOID_ECC_CURVE_BRAINPOOLP320R1 "1.3.36.3.3.2.8.1.1.9" +#define szOID_ECC_CURVE_BRAINPOOLP320T1 "1.3.36.3.3.2.8.1.1.10" +#define szOID_ECC_CURVE_BRAINPOOLP384R1 "1.3.36.3.3.2.8.1.1.11" +#define szOID_ECC_CURVE_BRAINPOOLP384T1 "1.3.36.3.3.2.8.1.1.12" +#define szOID_ECC_CURVE_BRAINPOOLP512R1 "1.3.36.3.3.2.8.1.1.13" +#define szOID_ECC_CURVE_BRAINPOOLP512T1 "1.3.36.3.3.2.8.1.1.14" + +#define szOID_ECC_CURVE_EC192WAPI "1.2.156.11235.1.1.2.1" +#define szOID_CN_ECDSA_SHA256 "1.2.156.11235.1.1.1" + +#define szOID_ECC_CURVE_NISTP192 "1.2.840.10045.3.1.1" +#define szOID_ECC_CURVE_NISTP224 "1.3.132.0.33" +#define szOID_ECC_CURVE_NISTP256 szOID_ECC_CURVE_P256 +#define szOID_ECC_CURVE_NISTP384 szOID_ECC_CURVE_P384 +#define szOID_ECC_CURVE_NISTP521 szOID_ECC_CURVE_P521 + +#define szOID_ECC_CURVE_SECP160K1 "1.3.132.0.9" +#define szOID_ECC_CURVE_SECP160R1 "1.3.132.0.8" +#define szOID_ECC_CURVE_SECP160R2 "1.3.132.0.30" +#define szOID_ECC_CURVE_SECP192K1 "1.3.132.0.31" +#define szOID_ECC_CURVE_SECP192R1 szOID_ECC_CURVE_NISTP192 +#define szOID_ECC_CURVE_SECP224K1 "1.3.132.0.32" +#define szOID_ECC_CURVE_SECP224R1 szOID_ECC_CURVE_NISTP224 +#define szOID_ECC_CURVE_SECP256K1 "1.3.132.0.10" +#define szOID_ECC_CURVE_SECP256R1 szOID_ECC_CURVE_P256 +#define szOID_ECC_CURVE_SECP384R1 szOID_ECC_CURVE_P384 +#define szOID_ECC_CURVE_SECP521R1 szOID_ECC_CURVE_P521 + +#define szOID_ECC_CURVE_WTLS7 szOID_ECC_CURVE_SECP160R2 +#define szOID_ECC_CURVE_WTLS9 "2.23.43.1.4.9" +#define szOID_ECC_CURVE_WTLS12 szOID_ECC_CURVE_NISTP224 + +#define szOID_ECC_CURVE_X962P192V1 "1.2.840.10045.3.1.1" +#define szOID_ECC_CURVE_X962P192V2 "1.2.840.10045.3.1.2" +#define szOID_ECC_CURVE_X962P192V3 "1.2.840.10045.3.1.3" +#define szOID_ECC_CURVE_X962P239V1 "1.2.840.10045.3.1.4" +#define szOID_ECC_CURVE_X962P239V2 "1.2.840.10045.3.1.5" +#define szOID_ECC_CURVE_X962P239V3 "1.2.840.10045.3.1.6" +#define szOID_ECC_CURVE_X962P256V1 szOID_ECC_CURVE_P256 + #define szOID_ECDSA_SHA1 "1.2.840.10045.4.1" #define szOID_ECDSA_SPECIFIED "1.2.840.10045.4.3" #define szOID_ECDSA_SHA256 "1.2.840.10045.4.3.2" @@ -1458,6 +1585,8 @@ extern "C" { #define X509_CERT_BUNDLE ((LPCSTR) 81) #define X509_ECC_PRIVATE_KEY ((LPCSTR) 82) #define CNG_RSA_PRIVATE_KEY_BLOB ((LPCSTR) 83) +#define X509_SUBJECT_DIR_ATTRS ((LPCSTR) 84) +#define X509_ECC_PARAMETERS ((LPCSTR) 85) #define PKCS7_SIGNER_INFO ((LPCSTR) 500) #define CMS_SIGNER_INFO ((LPCSTR) 501) @@ -1516,6 +1645,7 @@ extern "C" { #define szOID_BIOMETRIC_EXT "1.3.6.1.5.5.7.1.2" #define szOID_QC_STATEMENTS_EXT "1.3.6.1.5.5.7.1.3" #define szOID_LOGOTYPE_EXT "1.3.6.1.5.5.7.1.12" +#define szOID_TLS_FEATURES_EXT "1.3.6.1.5.5.7.1.24" #define szOID_CERT_EXTENSIONS "1.3.6.1.4.1.311.2.1.14" #define szOID_NEXT_UPDATE_LOCATION "1.3.6.1.4.1.311.10.2" @@ -1613,6 +1743,7 @@ extern "C" { #define szOID_EFS_RECOVERY "1.3.6.1.4.1.311.10.3.4.1" #define szOID_WHQL_CRYPTO "1.3.6.1.4.1.311.10.3.5" +#define szOID_ATTEST_WHQL_CRYPTO "1.3.6.1.4.1.311.10.3.5.1" #define szOID_NT5_CRYPTO "1.3.6.1.4.1.311.10.3.6" #define szOID_OEM_WHQL_CRYPTO "1.3.6.1.4.1.311.10.3.7" #define szOID_EMBEDDED_NT_CRYPTO "1.3.6.1.4.1.311.10.3.8" @@ -1624,6 +1755,8 @@ extern "C" { #define szOID_KP_MOBILE_DEVICE_SOFTWARE "1.3.6.1.4.1.311.10.3.14" #define szOID_KP_SMART_DISPLAY "1.3.6.1.4.1.311.10.3.15" #define szOID_KP_CSP_SIGNATURE "1.3.6.1.4.1.311.10.3.16" +#define szOID_KP_FLIGHT_SIGNING "1.3.6.1.4.1.311.10.3.27" +#define szOID_PLATFORM_MANIFEST_BINARY_ID "1.3.6.1.4.1.311.10.3.28" #ifndef szOID_DRM #define szOID_DRM "1.3.6.1.4.1.311.10.5.1" @@ -1648,9 +1781,35 @@ extern "C" { #define szOID_KP_KERNEL_MODE_CODE_SIGNING "1.3.6.1.4.1.311.61.1.1" #define szOID_KP_KERNEL_MODE_TRUSTED_BOOT_SIGNING "1.3.6.1.4.1.311.61.4.1" #define szOID_REVOKED_LIST_SIGNER "1.3.6.1.4.1.311.10.3.19" +#define szOID_WINDOWS_KITS_SIGNER "1.3.6.1.4.1.311.10.3.20" +#define szOID_WINDOWS_RT_SIGNER "1.3.6.1.4.1.311.10.3.21" +#define szOID_PROTECTED_PROCESS_LIGHT_SIGNER "1.3.6.1.4.1.311.10.3.22" +#define szOID_WINDOWS_TCB_SIGNER "1.3.6.1.4.1.311.10.3.23" +#define szOID_PROTECTED_PROCESS_SIGNER "1.3.6.1.4.1.311.10.3.24" +#define szOID_WINDOWS_THIRD_PARTY_COMPONENT_SIGNER "1.3.6.1.4.1.311.10.3.25" +#define szOID_WINDOWS_SOFTWARE_EXTENSION_SIGNER "1.3.6.1.4.1.311.10.3.26" #define szOID_DISALLOWED_LIST "1.3.6.1.4.1.311.10.3.30" +#define szOID_PIN_RULES_SIGNER "1.3.6.1.4.1.311.10.3.31" +#define szOID_PIN_RULES_CTL "1.3.6.1.4.1.311.10.3.32" +#define szOID_PIN_RULES_EXT "1.3.6.1.4.1.311.10.3.33" +#define szOID_PIN_RULES_DOMAIN_NAME "1.3.6.1.4.1.311.10.3.34" +#define szOID_PIN_RULES_LOG_END_DATE_EXT "1.3.6.1.4.1.311.10.3.35" +#define szOID_IUM_SIGNING "1.3.6.1.4.1.311.10.3.37" +#define szOID_EV_WHQL_CRYPTO "1.3.6.1.4.1.311.10.3.39" +#define szOID_BIOMETRIC_SIGNING "1.3.6.1.4.1.311.10.3.41" +#define szOID_ENCLAVE_SIGNING "1.3.6.1.4.1.311.10.3.42" +#define szOID_SYNC_ROOT_CTL_EXT "1.3.6.1.4.1.311.10.3.50" +#define szOID_HPKP_DOMAIN_NAME_CTL "1.3.6.1.4.1.311.10.3.60" +#define szOID_HPKP_HEADER_VALUE_CTL "1.3.6.1.4.1.311.10.3.61" #define szOID_KP_KERNEL_MODE_HAL_EXTENSION_SIGNING "1.3.6.1.4.1.311.61.5.1" +#define szOID_WINDOWS_STORE_SIGNER "1.3.6.1.4.1.311.76.3.1" +#define szOID_DYNAMIC_CODE_GEN_SIGNER "1.3.6.1.4.1.311.76.5.1" +#define szOID_MICROSOFT_PUBLISHER_SIGNER "1.3.6.1.4.1.311.76.8.1" #define szOID_YESNO_TRUST_ATTR "1.3.6.1.4.1.311.10.4.1" +#define szOID_SITE_PIN_RULES_INDEX_ATTR "1.3.6.1.4.1.311.10.4.2" +#define szOID_SITE_PIN_RULES_FLAGS_ATTR "1.3.6.1.4.1.311.10.4.3" + +#define SITE_PIN_RULES_ALL_SUBDOMAINS_FLAG 0x1 #define szOID_PKIX_POLICY_QUALIFIER_CPS "1.3.6.1.5.5.7.2.1" #define szOID_PKIX_POLICY_QUALIFIER_USERNOTICE "1.3.6.1.5.5.7.2.2" @@ -1664,6 +1823,54 @@ extern "C" { #define szOID_CERT_POLICIES_95_QUALIFIER1 "2.16.840.1.113733.1.7.1.1" +#define szOID_RDN_TPM_MANUFACTURER "2.23.133.2.1" +#define szOID_RDN_TPM_MODEL "2.23.133.2.2" +#define szOID_RDN_TPM_VERSION "2.23.133.2.3" + +#define szOID_RDN_TCG_PLATFORM_MANUFACTURER "2.23.133.2.4" +#define szOID_RDN_TCG_PLATFORM_MODEL "2.23.133.2.5" +#define szOID_RDN_TCG_PLATFORM_VERSION "2.23.133.2.6" + +#define szOID_CT_CERT_SCTLIST "1.3.6.1.4.1.11129.2.4.2" + +#define szOID_ENROLL_EK_INFO "1.3.6.1.4.1.311.21.23" +#define szOID_ENROLL_AIK_INFO "1.3.6.1.4.1.311.21.39" +#define szOID_ENROLL_ATTESTATION_STATEMENT "1.3.6.1.4.1.311.21.24" + +#define szOID_ENROLL_KSP_NAME "1.3.6.1.4.1.311.21.25" + +#define szOID_ENROLL_EKPUB_CHALLENGE "1.3.6.1.4.1.311.21.26" +#define szOID_ENROLL_CAXCHGCERT_HASH "1.3.6.1.4.1.311.21.27" +#define szOID_ENROLL_ATTESTATION_CHALLENGE "1.3.6.1.4.1.311.21.28" +#define szOID_ENROLL_ENCRYPTION_ALGORITHM "1.3.6.1.4.1.311.21.29" + +#define szOID_KP_TPM_EK_CERTIFICATE "2.23.133.8.1" +#define szOID_KP_TPM_PLATFORM_CERTIFICATE "2.23.133.8.2" +#define szOID_KP_TPM_AIK_CERTIFICATE "2.23.133.8.3" + +#define szOID_ENROLL_EKVERIFYKEY "1.3.6.1.4.1.311.21.30" +#define szOID_ENROLL_EKVERIFYCERT "1.3.6.1.4.1.311.21.31" +#define szOID_ENROLL_EKVERIFYCREDS "1.3.6.1.4.1.311.21.32" + +#define szOID_ENROLL_SCEP_ERROR "1.3.6.1.4.1.311.21.33" + +#define szOID_ENROLL_SCEP_SERVER_STATE "1.3.6.1.4.1.311.21.34" +#define szOID_ENROLL_SCEP_CHALLENGE_ANSWER "1.3.6.1.4.1.311.21.35" +#define szOID_ENROLL_SCEP_CLIENT_REQUEST "1.3.6.1.4.1.311.21.37" +#define szOID_ENROLL_SCEP_SERVER_MESSAGE "1.3.6.1.4.1.311.21.38" +#define szOID_ENROLL_SCEP_SERVER_SECRET "1.3.6.1.4.1.311.21.40" + +#define szOID_ENROLL_KEY_AFFINITY "1.3.6.1.4.1.311.21.41" + +#define szOID_ENROLL_SCEP_SIGNER_HASH "1.3.6.1.4.1.311.21.42" + +#define szOID_ENROLL_EK_CA_KEYID "1.3.6.1.4.1.311.21.43" + +#define szOID_ATTR_SUPPORTED_ALGORITHMS "2.5.4.52" +#define szOID_ATTR_TPM_SPECIFICATION "2.23.133.2.16" +#define szOID_ATTR_PLATFORM_SPECIFICATION "2.23.133.2.17" +#define szOID_ATTR_TPM_SECURITY_ASSERTIONS "2.23.133.2.18" + typedef struct _CERT_EXTENSIONS { DWORD cExtension; PCERT_EXTENSION rgExtension; @@ -1698,6 +1905,7 @@ extern "C" { } CERT_KEY_ATTRIBUTES_INFO,*PCERT_KEY_ATTRIBUTES_INFO; #define CERT_ENCIPHER_ONLY_KEY_USAGE 0x01 +#define CERT_CRL_SIGN_KEY_USAGE 0x02 #define CERT_OFFLINE_CRL_SIGN_KEY_USAGE 0x02 #define CERT_KEY_CERT_SIGN_KEY_USAGE 0x04 #define CERT_KEY_AGREEMENT_KEY_USAGE 0x08 @@ -1893,6 +2101,8 @@ extern "C" { #define CRL_REASON_CESSATION_OF_OPERATION 5 #define CRL_REASON_CERTIFICATE_HOLD 6 #define CRL_REASON_REMOVE_FROM_CRL 8 +#define CRL_REASON_PRIVILEGE_WITHDRAWN 9 +#define CRL_REASON_AA_COMPROMISE 10 typedef struct _CRL_DIST_POINT_NAME { DWORD dwDistPointNameChoice; @@ -1918,6 +2128,8 @@ extern "C" { #define CRL_REASON_SUPERSEDED_FLAG 0x08 #define CRL_REASON_CESSATION_OF_OPERATION_FLAG 0x04 #define CRL_REASON_CERTIFICATE_HOLD_FLAG 0x02 +#define CRL_REASON_PRIVILEGE_WITHDRAWN_FLAG 0x01 +#define CRL_REASON_AA_COMPROMISE_FLAG 0x80 typedef struct _CRL_DIST_POINTS_INFO { DWORD cDistPoint; @@ -2097,6 +2309,15 @@ extern "C" { #define szOID_VERISIGN_ISS_STRONG_CRYPTO "2.16.840.1.113733.1.8.1" +#define szOIDVerisign_MessageType "2.16.840.1.113733.1.9.2" +#define szOIDVerisign_PkiStatus "2.16.840.1.113733.1.9.3" +#define szOIDVerisign_FailInfo "2.16.840.1.113733.1.9.4" + +#define szOIDVerisign_SenderNonce "2.16.840.1.113733.1.9.5" +#define szOIDVerisign_RecipientNonce "2.16.840.1.113733.1.9.6" + +#define szOIDVerisign_TransactionID "2.16.840.1.113733.1.9.7" + #define szOID_NETSCAPE "2.16.840.1.113730" #define szOID_NETSCAPE_CERT_EXTENSION "2.16.840.1.113730.1" #define szOID_NETSCAPE_CERT_TYPE "2.16.840.1.113730.1.1" @@ -2467,6 +2688,18 @@ extern "C" { #define OCSP_BASIC_BY_NAME_RESPONDER_ID 1 #define OCSP_BASIC_BY_KEY_RESPONDER_ID 2 + typedef struct _CERT_SUPPORTED_ALGORITHM_INFO { + CRYPT_ALGORITHM_IDENTIFIER Algorithm; + CRYPT_BIT_BLOB IntendedKeyUsage; + CERT_POLICIES_INFO IntendedCertPolicies; + } CERT_SUPPORTED_ALGORITHM_INFO, *PCERT_SUPPORTED_ALGORITHM_INFO; + + typedef struct _CERT_TPM_SPECIFICATION_INFO { + LPWSTR pwszFamily; + DWORD dwLevel; + DWORD dwRevision; + } CERT_TPM_SPECIFICATION_INFO, *PCERT_TPM_SPECIFICATION_INFO; + typedef void *HCRYPTOIDFUNCSET; typedef void *HCRYPTOIDFUNCADDR; @@ -2572,6 +2805,8 @@ extern "C" { #define CRYPT_OID_PUBKEY_ENCRYPT_ONLY_FLAG 0x40000000 #define CRYPT_OID_PUBKEY_SIGN_ONLY_FLAG 0x80000000 +#define CRYPT_OID_USE_CURVE_NAME_FOR_ENCODE_FLAG 0x20000000 +#define CRYPT_OID_USE_CURVE_PARAMETERS_FOR_ENCODE_FLAG 0x10000000 WINIMPM PCCRYPT_OID_INFO WINAPI CryptFindOIDInfo (DWORD dwKeyType, void *pvKey, DWORD dwGroupId); @@ -2872,6 +3107,7 @@ extern "C" { #define CMSG_CONTENTS_OCTETS_FLAG 0x10 #define CMSG_MAX_LENGTH_FLAG 0x20 #define CMSG_CMS_ENCAPSULATED_CONTENT_FLAG 0x40 +#define CMSG_SIGNED_DATA_NO_SIGN_FLAG 0x80 #define CMSG_CRYPT_RELEASE_CONTEXT_FLAG 0x8000 WINIMPM HCRYPTMSG WINAPI CryptMsgOpenToEncode (DWORD dwMsgEncodingType, DWORD dwFlags, DWORD dwMsgType, void const *pvMsgEncodeInfo, LPSTR pszInnerContentObjID, PCMSG_STREAM_INFO pStreamInfo); @@ -3375,11 +3611,58 @@ extern "C" { #define CERT_ROOT_PROGRAM_CHAIN_POLICIES_PROP_ID 105 #define CERT_SMART_CARD_READER_NON_REMOVABLE_PROP_ID 106 +#define CERT_SHA256_HASH_PROP_ID 107 + +#define CERT_SCEP_SERVER_CERTS_PROP_ID 108 +#define CERT_SCEP_RA_SIGNATURE_CERT_PROP_ID 109 +#define CERT_SCEP_RA_ENCRYPTION_CERT_PROP_ID 110 +#define CERT_SCEP_CA_CERT_PROP_ID 111 +#define CERT_SCEP_SIGNER_CERT_PROP_ID 112 +#define CERT_SCEP_NONCE_PROP_ID 113 + +#define CERT_SCEP_ENCRYPT_HASH_CNG_ALG_PROP_ID 114 +#define CERT_SCEP_FLAGS_PROP_ID 115 +#define CERT_SCEP_GUID_PROP_ID 116 +#define CERT_SERIALIZABLE_KEY_CONTEXT_PROP_ID 117 + +#define CERT_ISOLATED_KEY_PROP_ID 118 + +#define CERT_SERIAL_CHAIN_PROP_ID 119 +#define CERT_KEY_CLASSIFICATION_PROP_ID 120 + +#define CERT_OCSP_MUST_STAPLE_PROP_ID 121 + +#define CERT_DISALLOWED_ENHKEY_USAGE_PROP_ID 122 +#define CERT_NONCOMPLIANT_ROOT_URL_PROP_ID 123 + +#define CERT_PIN_SHA256_HASH_PROP_ID 124 +#define CERT_CLR_DELETE_KEY_PROP_ID 125 +#define CERT_NOT_BEFORE_FILETIME_PROP_ID 126 +#define CERT_NOT_BEFORE_ENHKEY_USAGE_PROP_ID 127 + #define CERT_FIRST_RESERVED_PROP_ID 107 #define CERT_LAST_RESERVED_PROP_ID 0x00007fff #define CERT_FIRST_USER_PROP_ID 0x8000 #define CERT_LAST_USER_PROP_ID 0x0000ffff +#if defined(__cplusplus) && __cplusplus >= 201103L && !defined(SORTPP_PASS) +#define WINCRYPT_DWORD_CPP_ONLY : DWORD +#else +#define WINCRYPT_DWORD_CPP_ONLY +#endif + + typedef enum CertKeyType WINCRYPT_DWORD_CPP_ONLY { + KeyTypeOther = 0, + KeyTypeVirtualSmartCard = 1, + KeyTypePhysicalSmartCard = 2, + KeyTypePassport = 3, + KeyTypePassportRemote = 4, + KeyTypePassportSmartCard = 5, + KeyTypeHardware = 6, + KeyTypeSoftware = 7, + KeyTypeSelfSigned = 8 + } CertKeyType; + #define IS_CERT_HASH_PROP_ID(X) (CERT_SHA1_HASH_PROP_ID == (X) || CERT_MD5_HASH_PROP_ID == (X) || CERT_SIGNATURE_HASH_PROP_ID == (X)) #define IS_PUBKEY_HASH_PROP_ID(X) (CERT_ISSUER_PUBLIC_KEY_MD5_HASH_PROP_ID == (X) || CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID == (X)) #define IS_CHAIN_HASH_PROP_ID(X) (CERT_ISSUER_PUBLIC_KEY_MD5_HASH_PROP_ID == (X) || CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID == (X) || CERT_ISSUER_SERIAL_NUMBER_MD5_HASH_PROP_ID == (X) || CERT_SUBJECT_NAME_MD5_HASH_PROP_ID == (X)) @@ -3552,6 +3835,7 @@ extern "C" { #define CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY_ID 7 #define CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY_ID 8 #define CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE_ID 9 +#define CERT_SYSTEM_STORE_LOCAL_MACHINE_WCOS_ID 10 #define CERT_SYSTEM_STORE_CURRENT_USER (CERT_SYSTEM_STORE_CURRENT_USER_ID << CERT_SYSTEM_STORE_LOCATION_SHIFT) #define CERT_SYSTEM_STORE_LOCAL_MACHINE (CERT_SYSTEM_STORE_LOCAL_MACHINE_ID << CERT_SYSTEM_STORE_LOCATION_SHIFT) @@ -3561,6 +3845,7 @@ extern "C" { #define CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY (CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY_ID << CERT_SYSTEM_STORE_LOCATION_SHIFT) #define CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY (CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY_ID << CERT_SYSTEM_STORE_LOCATION_SHIFT) #define CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE (CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE_ID << CERT_SYSTEM_STORE_LOCATION_SHIFT) +#define CERT_SYSTEM_STORE_LOCAL_MACHINE_WCOS (CERT_SYSTEM_STORE_LOCAL_MACHINE_WCOS_ID << CERT_SYSTEM_STORE_LOCATION_SHIFT) #define CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH L"Software\\Policies\\Microsoft\\SystemCertificates" @@ -3599,9 +3884,15 @@ extern "C" { #define CERT_DISABLE_ROOT_AUTO_UPDATE_REGPATH CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH L"\\AuthRoot" #define CERT_DISABLE_ROOT_AUTO_UPDATE_VALUE_NAME L"DisableRootAutoUpdate" +#define CERT_ENABLE_DISALLOWED_CERT_AUTO_UPDATE_VALUE_NAME L"EnableDisallowedCertAutoUpdate" + +#define CERT_DISABLE_PIN_RULES_AUTO_UPDATE_VALUE_NAME L"DisablePinRulesAutoUpdate" + #define CERT_AUTO_UPDATE_LOCAL_MACHINE_REGPATH CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH L"\\AuthRoot\\AutoUpdate" #define CERT_AUTO_UPDATE_ROOT_DIR_URL_VALUE_NAME L"RootDirUrl" +#define CERT_AUTO_UPDATE_SYNC_FROM_DIR_URL_VALUE_NAME L"SyncFromDirUrl" + #define CERT_AUTH_ROOT_AUTO_UPDATE_LOCAL_MACHINE_REGPATH CERT_AUTO_UPDATE_LOCAL_MACHINE_REGPATH #define CERT_AUTH_ROOT_AUTO_UPDATE_ROOT_DIR_URL_VALUE_NAME CERT_AUTO_UPDATE_ROOT_DIR_URL_VALUE_NAME #define CERT_AUTH_ROOT_AUTO_UPDATE_SYNC_DELTA_TIME_VALUE_NAME L"SyncDeltaTime" @@ -3625,6 +3916,17 @@ extern "C" { #define CERT_DISALLOWED_CERT_CAB_FILENAME L"disallowedcertstl.cab" #define CERT_DISALLOWED_CERT_AUTO_UPDATE_LIST_IDENTIFIER L"DisallowedCert_AutoUpdate_1" +#define CERT_PIN_RULES_AUTO_UPDATE_SYNC_DELTA_TIME_VALUE_NAME L"PinRulesSyncDeltaTime" +#define CERT_PIN_RULES_AUTO_UPDATE_LAST_SYNC_TIME_VALUE_NAME L"PinRulesLastSyncTime" +#define CERT_PIN_RULES_AUTO_UPDATE_ENCODED_CTL_VALUE_NAME L"PinRulesEncodedCtl" + +#define CERT_PIN_RULES_CTL_FILENAME L"pinrules.stl" +#define CERT_PIN_RULES_CTL_FILENAME_A "pinrules.stl" + +#define CERT_PIN_RULES_CAB_FILENAME L"pinrulesstl.cab" + +#define CERT_PIN_RULES_AUTO_UPDATE_LIST_IDENTIFIER L"PinRules_AutoUpdate_1" + #define CERT_REGISTRY_STORE_REMOTE_FLAG 0x10000 #define CERT_REGISTRY_STORE_SERIALIZED_FLAG 0x20000 #define CERT_REGISTRY_STORE_CLIENT_GPT_FLAG 0x80000000 @@ -4196,7 +4498,7 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod WINIMPM WINBOOL WINAPI CertIsStrongHashToSign (PCCERT_STRONG_SIGN_PARA pStrongSignPara, LPCWSTR pwszCNGHashAlgid, PCCERT_CONTEXT pSigningCert); WINIMPM WINBOOL WINAPI CryptHashToBeSigned (HCRYPTPROV_LEGACY hCryptProv, DWORD dwCertEncodingType, const BYTE *pbEncoded, DWORD cbEncoded, BYTE *pbComputedHash, DWORD *pcbComputedHash); WINIMPM WINBOOL WINAPI CryptHashCertificate (HCRYPTPROV_LEGACY hCryptProv, ALG_ID Algid, DWORD dwFlags, const BYTE *pbEncoded, DWORD cbEncoded, BYTE *pbComputedHash, DWORD *pcbComputedHash); -#if NTDDI_VERSION >= 0x06000000 +#if NTDDI_VERSION >= NTDDI_VISTA WINIMPM WINBOOL WINAPI CryptHashCertificate2 (LPCWSTR pwszCNGHashAlgid, DWORD dwFlags, void *pvReserved, const BYTE *pbEncoded, DWORD cbEncoded, BYTE *pbComputedHash, DWORD *pcbComputedHash); #endif WINIMPM WINBOOL WINAPI CryptSignCertificate (HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProvOrNCryptKey, DWORD dwKeySpec, DWORD dwCertEncodingType, const BYTE *pbEncodedToBeSigned, DWORD cbEncodedToBeSigned, PCRYPT_ALGORITHM_IDENTIFIER pSignatureAlgorithm, const void *pvHashAuxInfo, BYTE *pbSignature, DWORD *pcbSignature); @@ -4221,7 +4523,7 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod typedef WINBOOL (WINAPI *PFN_CRYPT_EXPORT_PUBLIC_KEY_INFO_EX2_FUNC) (NCRYPT_KEY_HANDLE hNCryptKey, DWORD dwCertEncodingType, LPSTR pszPublicKeyObjId, DWORD dwFlags, void *pvAuxInfo, PCERT_PUBLIC_KEY_INFO pInfo, DWORD *pcbInfo); -#if NTDDI_VERSION >= 0x06010000 +#if NTDDI_VERSION >= NTDDI_WIN7 #define CRYPT_OID_EXPORT_PUBLIC_KEY_INFO_FROM_BCRYPT_HANDLE_FUNC "CryptDllExportPublicKeyInfoFromBCryptKeyHandle" typedef WINBOOL (WINAPI *PFN_CRYPT_EXPORT_PUBLIC_KEY_INFO_FROM_BCRYPT_HANDLE_FUNC) (BCRYPT_KEY_HANDLE hBCryptKey, DWORD dwCertEncodingType, LPSTR pszPublicKeyObjId, DWORD dwFlags, void *pvAuxInfo, PCERT_PUBLIC_KEY_INFO pInfo, DWORD *pcbInfo); @@ -4260,7 +4562,7 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod WINIMPM WINBOOL WINAPI CryptImportPublicKeyInfo (HCRYPTPROV hCryptProv, DWORD dwCertEncodingType, PCERT_PUBLIC_KEY_INFO pInfo, HCRYPTKEY *phKey); WINIMPM WINBOOL WINAPI CryptImportPublicKeyInfoEx (HCRYPTPROV hCryptProv, DWORD dwCertEncodingType, PCERT_PUBLIC_KEY_INFO pInfo, ALG_ID aiKeyAlg, DWORD dwFlags, void *pvAuxInfo, HCRYPTKEY *phKey); -#if NTDDI_VERSION >= 0x06000000 +#if NTDDI_VERSION >= NTDDI_VISTA #define CRYPT_OID_IMPORT_PUBLIC_KEY_INFO_EX2_FUNC "CryptDllImportPublicKeyInfoEx2" typedef WINBOOL (WINAPI *PFN_IMPORT_PUBLIC_KEY_INFO_EX2_FUNC) (DWORD dwCertEncodingType, PCERT_PUBLIC_KEY_INFO pInfo, DWORD dwFlags, void *pvAuxInfo, BCRYPT_KEY_HANDLE *phKey); @@ -4568,6 +4870,8 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod #define CRYPT_OCSP_ONLY_RETRIEVAL 0x1000000 #define CRYPT_NO_OCSP_FAILOVER_TO_CRL_RETRIEVAL 0x2000000 #define CRYPT_RANDOM_QUERY_STRING_RETRIEVAL 0x4000000 +#define CRYPT_ENABLE_FILE_RETRIEVAL 0x08000000 +#define CRYPT_CREATE_NEW_FLUSH_ENTRY 0x10000000 typedef struct _CRYPTNET_URL_CACHE_PRE_FETCH_INFO { DWORD cbSize; @@ -4585,6 +4889,7 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod #define CRYPTNET_URL_CACHE_PRE_FETCH_OCSP 3 #define CRYPTNET_URL_CACHE_PRE_FETCH_AUTOROOT_CAB 5 #define CRYPTNET_URL_CACHE_PRE_FETCH_DISALLOWED_CERT_CAB 6 +#define CRYPTNET_URL_CACHE_PRE_FETCH_PIN_RULES_CAB 7 typedef struct _CRYPTNET_URL_CACHE_FLUSH_INFO { DWORD cbSize; @@ -4623,6 +4928,8 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod DWORD dwHttpStatusCode; } CRYPT_RETRIEVE_AUX_INFO,*PCRYPT_RETRIEVE_AUX_INFO; +#define CRYPT_RETRIEVE_MAX_ERROR_CONTENT_LENGTH 0x1000 + WINIMPM WINBOOL WINAPI CryptRetrieveObjectByUrlA (LPCSTR pszUrl, LPCSTR pszObjectOid, DWORD dwRetrievalFlags, DWORD dwTimeout, LPVOID *ppvObject, HCRYPTASYNC hAsyncRetrieve, PCRYPT_CREDENTIALS pCredentials, LPVOID pvVerify, PCRYPT_RETRIEVE_AUX_INFO pAuxInfo); WINIMPM WINBOOL WINAPI CryptRetrieveObjectByUrlW (LPCWSTR pszUrl, LPCSTR pszObjectOid, DWORD dwRetrievalFlags, DWORD dwTimeout, LPVOID *ppvObject, HCRYPTASYNC hAsyncRetrieve, PCRYPT_CREDENTIALS pCredentials, LPVOID pvVerify, PCRYPT_RETRIEVE_AUX_INFO pAuxInfo); @@ -4751,6 +5058,13 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod #define CERT_CHAIN_MAX_AIA_URL_RETRIEVAL_CERT_COUNT_DEFAULT 10 #define CERT_CHAIN_OCSP_VALIDITY_SECONDS_VALUE_NAME L"OcspValiditySeconds" #define CERT_CHAIN_OCSP_VALIDITY_SECONDS_DEFAULT (12 *60 *60) +#define CERT_CHAIN_DISABLE_SERIAL_CHAIN_VALUE_NAME L"DisableSerialChain" +#define CERT_CHAIN_SERIAL_CHAIN_LOG_FILE_NAME_VALUE_NAME L"SerialChainLogFileName" +#define CERT_CHAIN_DISABLE_SYNC_WITH_SSL_TIME_VALUE_NAME L"DisableSyncWithSslTime" +#define CERT_CHAIN_MAX_SSL_TIME_UPDATED_EVENT_COUNT_VALUE_NAME L"MaxSslTimeUpdatedEventCount" +#define CERT_CHAIN_MAX_SSL_TIME_UPDATED_EVENT_COUNT_DEFAULT 5 +#define CERT_CHAIN_MAX_SSL_TIME_UPDATED_EVENT_COUNT_DISABLE 0xFFFFFFFF +#define CERT_CHAIN_SSL_HANDSHAKE_LOG_FILE_NAME_VALUE_NAME L"SslHandshakeLogFileName" #define CERT_CHAIN_ENABLE_WEAK_SIGNATURE_FLAGS_VALUE_NAME L"EnableWeakSignatureFlags" #define CERT_CHAIN_ENABLE_MD2_MD4_FLAG 0x1 #define CERT_CHAIN_ENABLE_WEAK_RSA_ROOT_FLAG 0x2 @@ -4762,6 +5076,72 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod #define CERT_CHAIN_WEAK_RSA_PUB_KEY_TIME_VALUE_NAME L"WeakRsaPubKeyTime" #define CERT_CHAIN_WEAK_RSA_PUB_KEY_TIME_DEFAULT 0x01ca8a755c6e0000ULL #define CERT_CHAIN_WEAK_SIGNATURE_LOG_DIR_VALUE_NAME L"WeakSignatureLogDir" + +#define CERT_CHAIN_DEFAULT_CONFIG_SUBDIR L"Default" + +#define CERT_CHAIN_WEAK_PREFIX_NAME L"Weak" +#define CERT_CHAIN_WEAK_THIRD_PARTY_CONFIG_NAME L"ThirdParty" +#define CERT_CHAIN_WEAK_ALL_CONFIG_NAME L"All" +#define CERT_CHAIN_WEAK_FLAGS_NAME L"Flags" +#define CERT_CHAIN_WEAK_HYGIENE_NAME L"Hygiene" +#define CERT_CHAIN_WEAK_AFTER_TIME_NAME L"AfterTime" +#define CERT_CHAIN_WEAK_FILE_HASH_AFTER_TIME_NAME L"FileHashAfterTime" +#define CERT_CHAIN_WEAK_TIMESTAMP_HASH_AFTER_TIME_NAME L"TimestampHashAfterTime" +#define CERT_CHAIN_WEAK_MIN_BIT_LENGTH_NAME L"MinBitLength" +#define CERT_CHAIN_WEAK_SHA256_ALLOW_NAME L"Sha256Allow" + +#define CERT_CHAIN_MIN_PUB_KEY_BIT_LENGTH_DISABLE 0xFFFFFFFF + +#define CERT_CHAIN_ENABLE_WEAK_SETTINGS_FLAG 0x80000000 +#define CERT_CHAIN_DISABLE_ALL_EKU_WEAK_FLAG 0x00010000 +#define CERT_CHAIN_ENABLE_ALL_EKU_HYGIENE_FLAG 0x00020000 +#define CERT_CHAIN_DISABLE_OPT_IN_SERVER_AUTH_WEAK_FLAG 0x00040000 +#define CERT_CHAIN_DISABLE_SERVER_AUTH_WEAK_FLAG 0x00100000 +#define CERT_CHAIN_ENABLE_SERVER_AUTH_HYGIENE_FLAG 0x00200000 +#define CERT_CHAIN_DISABLE_CODE_SIGNING_WEAK_FLAG 0x00400000 +#define CERT_CHAIN_DISABLE_MOTW_CODE_SIGNING_WEAK_FLAG 0x00800000 +#define CERT_CHAIN_ENABLE_CODE_SIGNING_HYGIENE_FLAG 0x01000000 +#define CERT_CHAIN_ENABLE_MOTW_CODE_SIGNING_HYGIENE_FLAG 0x02000000 +#define CERT_CHAIN_DISABLE_TIMESTAMP_WEAK_FLAG 0x04000000 +#define CERT_CHAIN_DISABLE_MOTW_TIMESTAMP_WEAK_FLAG 0x08000000 +#define CERT_CHAIN_ENABLE_TIMESTAMP_HYGIENE_FLAG 0x10000000 +#define CERT_CHAIN_ENABLE_MOTW_TIMESTAMP_HYGIENE_FLAG 0x20000000 +#define CERT_CHAIN_MOTW_IGNORE_AFTER_TIME_WEAK_FLAG 0x40000000 +#define CERT_CHAIN_DISABLE_FILE_HASH_WEAK_FLAG 0x00001000 +#define CERT_CHAIN_DISABLE_MOTW_FILE_HASH_WEAK_FLAG 0x00002000 +#define CERT_CHAIN_DISABLE_TIMESTAMP_HASH_WEAK_FLAG 0x00004000 +#define CERT_CHAIN_DISABLE_MOTW_TIMESTAMP_HASH_WEAK_FLAG 0x00008000 +#define CERT_CHAIN_DISABLE_WEAK_FLAGS ( CERT_CHAIN_DISABLE_ALL_EKU_WEAK_FLAG | CERT_CHAIN_DISABLE_SERVER_AUTH_WEAK_FLAG | CERT_CHAIN_DISABLE_OPT_IN_SERVER_AUTH_WEAK_FLAG | CERT_CHAIN_DISABLE_CODE_SIGNING_WEAK_FLAG | CERT_CHAIN_DISABLE_MOTW_CODE_SIGNING_WEAK_FLAG | CERT_CHAIN_DISABLE_TIMESTAMP_WEAK_FLAG | CERT_CHAIN_DISABLE_MOTW_TIMESTAMP_WEAK_FLAG ) +#define CERT_CHAIN_DISABLE_FILE_HASH_WEAK_FLAGS ( CERT_CHAIN_DISABLE_FILE_HASH_WEAK_FLAG | CERT_CHAIN_DISABLE_MOTW_FILE_HASH_WEAK_FLAG ) +#define CERT_CHAIN_DISABLE_TIMESTAMP_HASH_WEAK_FLAGS ( CERT_CHAIN_DISABLE_TIMESTAMP_HASH_WEAK_FLAG | CERT_CHAIN_DISABLE_MOTW_TIMESTAMP_HASH_WEAK_FLAG ) +#define CERT_CHAIN_ENABLE_HYGIENE_FLAGS ( CERT_CHAIN_ENABLE_ALL_EKU_HYGIENE_FLAG | CERT_CHAIN_ENABLE_SERVER_AUTH_HYGIENE_FLAG | CERT_CHAIN_ENABLE_CODE_SIGNING_HYGIENE_FLAG | CERT_CHAIN_ENABLE_MOTW_CODE_SIGNING_HYGIENE_FLAG | CERT_CHAIN_ENABLE_TIMESTAMP_HYGIENE_FLAG | CERT_CHAIN_ENABLE_MOTW_TIMESTAMP_HYGIENE_FLAG ) +#define CERT_CHAIN_MOTW_WEAK_FLAGS ( CERT_CHAIN_DISABLE_MOTW_CODE_SIGNING_WEAK_FLAG | CERT_CHAIN_DISABLE_MOTW_TIMESTAMP_WEAK_FLAG | CERT_CHAIN_ENABLE_MOTW_CODE_SIGNING_HYGIENE_FLAG | CERT_CHAIN_ENABLE_MOTW_TIMESTAMP_HYGIENE_FLAG | CERT_CHAIN_MOTW_IGNORE_AFTER_TIME_WEAK_FLAG) +#define CERT_CHAIN_OPT_IN_WEAK_FLAGS ( CERT_CHAIN_DISABLE_OPT_IN_SERVER_AUTH_WEAK_FLAG) + +#define CERT_CHAIN_AUTO_CURRENT_USER 1 +#define CERT_CHAIN_AUTO_LOCAL_MACHINE 2 +#define CERT_CHAIN_AUTO_IMPERSONATED 3 +#define CERT_CHAIN_AUTO_PROCESS_INFO 4 +#define CERT_CHAIN_AUTO_PINRULE_INFO 5 +#define CERT_CHAIN_AUTO_NETWORK_INFO 6 +#define CERT_CHAIN_AUTO_SERIAL_LOCAL_MACHINE 7 +#define CERT_CHAIN_AUTO_HPKP_RULE_INFO 8 + +#define CERT_CHAIN_AUTO_FLAGS_VALUE_NAME L"AutoFlags" + +#define CERT_CHAIN_AUTO_FLUSH_DISABLE_FLAG 0x00000001 +#define CERT_CHAIN_AUTO_LOG_CREATE_FLAG 0x00000002 +#define CERT_CHAIN_AUTO_LOG_FREE_FLAG 0x00000004 +#define CERT_CHAIN_AUTO_LOG_FLUSH_FLAG 0x00000008 +#define CERT_CHAIN_AUTO_LOG_FLAGS ( CERT_CHAIN_AUTO_LOG_CREATE_FLAG | CERT_CHAIN_AUTO_LOG_FREE_FLAG | CERT_CHAIN_AUTO_LOG_FLUSH_FLAG ) + +#define CERT_CHAIN_AUTO_FLUSH_FIRST_DELTA_SECONDS_VALUE_NAME L"AutoFlushFirstDeltaSeconds" +#define CERT_CHAIN_AUTO_FLUSH_FIRST_DELTA_SECONDS_DEFAULT (5 * 60) +#define CERT_CHAIN_AUTO_FLUSH_NEXT_DELTA_SECONDS_VALUE_NAME L"AutoFlushNextDeltaSeconds" +#define CERT_CHAIN_AUTO_FLUSH_NEXT_DELTA_SECONDS_DEFAULT (30 * 60) +#define CERT_CHAIN_AUTO_LOG_FILE_NAME_VALUE_NAME L"AutoLogFileName" +#define CERT_CHAIN_DISABLE_AUTO_FLUSH_PROCESS_NAME_LIST_VALUE_NAME L"DisableAutoFlushProcessNameList" + #define CERT_SRV_OCSP_RESP_MIN_VALIDITY_SECONDS_VALUE_NAME L"SrvOcspRespMinValiditySeconds" #define CERT_SRV_OCSP_RESP_MIN_VALIDITY_SECONDS_DEFAULT (10 *60) #define CERT_SRV_OCSP_RESP_URL_RETRIEVAL_TIMEOUT_MILLISECONDS_VALUE_NAME L"SrvOcspRespUrlRetrievalTimeoutMilliseconds" @@ -4772,6 +5152,10 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod #define CERT_SRV_OCSP_RESP_MIN_BEFORE_NEXT_UPDATE_SECONDS_DEFAULT (2 *60) #define CERT_SRV_OCSP_RESP_MIN_AFTER_NEXT_UPDATE_SECONDS_VALUE_NAME L"SrvOcspRespMinAfterNextUpdateSeconds" #define CERT_SRV_OCSP_RESP_MIN_AFTER_NEXT_UPDATE_SECONDS_DEFAULT (1 *60) +#define CERT_SRV_OCSP_RESP_MIN_SYNC_CERT_FILE_SECONDS_VALUE_NAME L"SrvOcspRespMinSyncCertFileSeconds" +#define CERT_SRV_OCSP_RESP_MIN_SYNC_CERT_FILE_SECONDS_DEFAULT 5 +#define CERT_SRV_OCSP_RESP_MAX_SYNC_CERT_FILE_SECONDS_VALUE_NAME L"SrvOcspRespMaxSyncCertFileSeconds" +#define CERT_SRV_OCSP_RESP_MAX_SYNC_CERT_FILE_SECONDS_DEFAULT (1 * 60 * 60) #define CRYPTNET_MAX_CACHED_OCSP_PER_CRL_COUNT_VALUE_NAME L"CryptnetMaxCachedOcspPerCrlCount" #define CRYPTNET_MAX_CACHED_OCSP_PER_CRL_COUNT_DEFAULT 500 #define CRYPTNET_OCSP_AFTER_CRL_DISABLE 0xffffffff @@ -4804,6 +5188,24 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod #define CRYPTNET_PRE_FETCH_SCAN_AFTER_TRIGGER_DELAY_SECONDS_DEFAULT 30 #define CRYPTNET_PRE_FETCH_RETRIEVAL_TIMEOUT_SECONDS_VALUE_NAME L"CryptnetPreFetchRetrievalTimeoutSeconds" #define CRYPTNET_PRE_FETCH_RETRIEVAL_TIMEOUT_SECONDS_DEFAULT (5 *60) +#define CRYPTNET_CRL_PRE_FETCH_CONFIG_REGPATH CERT_CHAIN_CONFIG_REGPATH L"\\CrlPreFetch" +#define CRYPTNET_CRL_PRE_FETCH_PROCESS_NAME_LIST_VALUE_NAME L"ProcessNameList" +#define CRYPTNET_CRL_PRE_FETCH_URL_LIST_VALUE_NAME L"PreFetchUrlList" +#define CRYPTNET_CRL_PRE_FETCH_DISABLE_INFORMATION_EVENTS_VALUE_NAME L"DisableInformationEvents" +#define CRYPTNET_CRL_PRE_FETCH_LOG_FILE_NAME_VALUE_NAME L"LogFileName" +#define CRYPTNET_CRL_PRE_FETCH_TIMEOUT_SECONDS_VALUE_NAME L"TimeoutSeconds" +#define CRYPTNET_CRL_PRE_FETCH_TIMEOUT_SECONDS_DEFAULT (5 * 60) +#define CRYPTNET_CRL_PRE_FETCH_MAX_AGE_SECONDS_VALUE_NAME L"MaxAgeSeconds" +#define CRYPTNET_CRL_PRE_FETCH_MAX_AGE_SECONDS_DEFAULT (2 * 60 * 60) +#define CRYPTNET_CRL_PRE_FETCH_MAX_AGE_SECONDS_MIN (5 * 60) +#define CRYPTNET_CRL_PRE_FETCH_PUBLISH_BEFORE_NEXT_UPDATE_SECONDS_VALUE_NAME L"PublishBeforeNextUpdateSeconds" +#define CRYPTNET_CRL_PRE_FETCH_PUBLISH_BEFORE_NEXT_UPDATE_SECONDS_DEFAULT (1 * 60 * 60) +#define CRYPTNET_CRL_PRE_FETCH_PUBLISH_RANDOM_INTERVAL_SECONDS_VALUE_NAME L"PublishRandomIntervalSeconds" +#define CRYPTNET_CRL_PRE_FETCH_PUBLISH_RANDOM_INTERVAL_SECONDS_DEFAULT (5 * 60) +#define CRYPTNET_CRL_PRE_FETCH_MIN_BEFORE_NEXT_UPDATE_SECONDS_VALUE_NAME L"MinBeforeNextUpdateSeconds" +#define CRYPTNET_CRL_PRE_FETCH_MIN_BEFORE_NEXT_UPDATE_SECONDS_DEFAULT (5 * 60) +#define CRYPTNET_CRL_PRE_FETCH_MIN_AFTER_NEXT_UPDATE_SECONDS_VALUE_NAME L"MinAfterNextUpdateSeconds" +#define CRYPTNET_CRL_PRE_FETCH_MIN_AFTER_NEXT_UPDATE_SECONDS_DEFAULT (5 * 60) #define CERT_GROUP_POLICY_CHAIN_CONFIG_REGPATH CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH L"\\ChainEngine\\Config" #define CERT_CHAIN_URL_RETRIEVAL_TIMEOUT_MILLISECONDS_VALUE_NAME L"ChainUrlRetrievalTimeoutMilliseconds" #define CERT_CHAIN_URL_RETRIEVAL_TIMEOUT_MILLISECONDS_DEFAULT (15 *1000) @@ -4827,6 +5229,7 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod #define HCCE_CURRENT_USER ((HCERTCHAINENGINE)NULL) #define HCCE_LOCAL_MACHINE ((HCERTCHAINENGINE)0x1) +#define HCCE_SERIAL_LOCAL_MACHINE ((HCERTCHAINENGINE)0x2) #define CERT_CHAIN_CACHE_END_CERT 0x1 #define CERT_CHAIN_THREAD_STORE_SYNC 0x2 @@ -4848,16 +5251,16 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod DWORD dwUrlRetrievalTimeout; DWORD MaximumCachedCertificates; DWORD CycleDetectionModulus; -#if NTDDI_VERSION >= 0x06010000 +#if NTDDI_VERSION >= NTDDI_WIN7 HCERTSTORE hExclusiveRoot; HCERTSTORE hExclusiveTrustedPeople; #endif -#if NTDDI_VERSION >= 0x06020000 +#if NTDDI_VERSION >= NTDDI_WIN8 DWORD dwExclusiveFlags; #endif } CERT_CHAIN_ENGINE_CONFIG,*PCERT_CHAIN_ENGINE_CONFIG; -#if NTDDI_VERSION >= 0x06020000 +#if NTDDI_VERSION >= NTDDI_WIN8 #define CERT_CHAIN_EXCLUSIVE_ENABLE_CA_FLAG 0x1 #endif @@ -4904,16 +5307,25 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod #define CERT_TRUST_AUTO_UPDATE_CA_REVOCATION 0x10 #define CERT_TRUST_AUTO_UPDATE_END_REVOCATION 0x20 #define CERT_TRUST_NO_OCSP_FAILOVER_TO_CRL 0x40 +#define CERT_TRUST_IS_KEY_ROLLOVER 0x00000080 +#define CERT_TRUST_SSL_HANDSHAKE_OCSP 0x00040000 +#define CERT_TRUST_SSL_TIME_VALID_OCSP 0x00080000 +#define CERT_TRUST_SSL_RECONNECT_OCSP 0x00100000 + #define CERT_TRUST_HAS_PREFERRED_ISSUER 0x100 #define CERT_TRUST_HAS_ISSUANCE_CHAIN_POLICY 0x200 #define CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS 0x400 #define CERT_TRUST_IS_PEER_TRUSTED 0x800 #define CERT_TRUST_HAS_CRL_VALIDITY_EXTENDED 0x1000 #define CERT_TRUST_IS_FROM_EXCLUSIVE_TRUST_STORE 0x2000 -#if NTDDI_VERSION >= 0x06020000 -#define CERT_TRUST_IS_CA_TRUSTED 0x4000 +#if NTDDI_VERSION >= NTDDI_WIN8 +#define CERT_TRUST_IS_CA_TRUSTED 0x00004000 +#define CERT_TRUST_HAS_AUTO_UPDATE_WEAK_SIGNATURE 0x00008000 +#define CERT_TRUST_HAS_ALLOW_WEAK_SIGNATURE 0x00020000 #endif -#define CERT_TRUST_IS_COMPLEX_CHAIN 0x10000 +#define CERT_TRUST_IS_COMPLEX_CHAIN 0x00010000 +#define CERT_TRUST_SSL_TIME_VALID 0x01000000 +#define CERT_TRUST_NO_TIME_CHECK 0x02000000 typedef struct _CERT_REVOCATION_INFO { DWORD cbSize; @@ -5006,6 +5418,10 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod #define CERT_CHAIN_ENABLE_PEER_TRUST 0x400 #define CERT_CHAIN_DISABLE_MY_PEER_TRUST 0x800 #define CERT_CHAIN_DISABLE_MD2_MD4 0x1000 +#define CERT_CHAIN_DISABLE_AIA 0x2000 +#define CERT_CHAIN_HAS_MOTW 0x4000 +#define CERT_CHAIN_ONLY_ADDITIONAL_AND_AUTH_ROOT 0x8000 +#define CERT_CHAIN_OPT_IN_WEAK_SIGNATURE 0x10000 #define CERT_CHAIN_REVOCATION_CHECK_END_CERT 0x10000000 #define CERT_CHAIN_REVOCATION_CHECK_CHAIN 0x20000000 #define CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT 0x40000000 @@ -5114,6 +5530,10 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod #define CERT_CHAIN_POLICY_NT_AUTH ((LPCSTR) 6) #define CERT_CHAIN_POLICY_MICROSOFT_ROOT ((LPCSTR) 7) #define CERT_CHAIN_POLICY_EV ((LPCSTR) 8) +#define CERT_CHAIN_POLICY_SSL_F12 ((LPCSTR) 9) +#define CERT_CHAIN_POLICY_SSL_HPKP_HEADER ((LPCSTR) 10) +#define CERT_CHAIN_POLICY_THIRD_PARTY_ROOT ((LPCSTR) 11) +#define CERT_CHAIN_POLICY_SSL_KEY_PIN ((LPCSTR) 12) typedef struct _AUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_PARA { DWORD cbSize; @@ -5147,8 +5567,9 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod #define BASIC_CONSTRAINTS_CERT_CHAIN_POLICY_CA_FLAG 0x80000000 #define BASIC_CONSTRAINTS_CERT_CHAIN_POLICY_END_ENTITY_FLAG 0x40000000 -#define MICROSOFT_ROOT_CERT_CHAIN_POLICY_ENABLE_TEST_ROOT_FLAG 0x10000 -#define MICROSOFT_ROOT_CERT_CHAIN_POLICY_CHECK_APPLICATION_ROOT_FLAG 0x20000 +#define MICROSOFT_ROOT_CERT_CHAIN_POLICY_ENABLE_TEST_ROOT_FLAG 0x00010000 +#define MICROSOFT_ROOT_CERT_CHAIN_POLICY_CHECK_APPLICATION_ROOT_FLAG 0x00020000 +#define MICROSOFT_ROOT_CERT_CHAIN_POLICY_DISABLE_FLIGHT_ROOT_FLAG 0x00040000 typedef struct _EV_EXTRA_CERT_CHAIN_POLICY_PARA { DWORD cbSize; @@ -5161,6 +5582,53 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod DWORD dwIssuanceUsageIndex; } EV_EXTRA_CERT_CHAIN_POLICY_STATUS,*PEV_EXTRA_CERT_CHAIN_POLICY_STATUS; +#define SSL_F12_ERROR_TEXT_LENGTH 256 + typedef struct _SSL_F12_EXTRA_CERT_CHAIN_POLICY_STATUS { + DWORD cbSize; + DWORD dwErrorLevel; + DWORD dwErrorCategory; + DWORD dwReserved; + WCHAR wszErrorText[SSL_F12_ERROR_TEXT_LENGTH]; // Localized + } SSL_F12_EXTRA_CERT_CHAIN_POLICY_STATUS, *PSSL_F12_EXTRA_CERT_CHAIN_POLICY_STATUS; + +#define CERT_CHAIN_POLICY_SSL_F12_SUCCESS_LEVEL 0 +#define CERT_CHAIN_POLICY_SSL_F12_WARNING_LEVEL 1 +#define CERT_CHAIN_POLICY_SSL_F12_ERROR_LEVEL 2 + +#define CERT_CHAIN_POLICY_SSL_F12_NONE_CATEGORY 0 +#define CERT_CHAIN_POLICY_SSL_F12_WEAK_CRYPTO_CATEGORY 1 +#define CERT_CHAIN_POLICY_SSL_F12_ROOT_PROGRAM_CATEGORY 2 + +#define SSL_HPKP_PKP_HEADER_INDEX 0 +#define SSL_HPKP_PKP_RO_HEADER_INDEX 1 +#define SSL_HPKP_HEADER_COUNT 2 + + typedef struct _SSL_HPKP_HEADER_EXTRA_CERT_CHAIN_POLICY_PARA { + DWORD cbSize; + DWORD dwReserved; + LPWSTR pwszServerName; + LPSTR rgpszHpkpValue[SSL_HPKP_HEADER_COUNT]; + } SSL_HPKP_HEADER_EXTRA_CERT_CHAIN_POLICY_PARA, *PSSL_HPKP_HEADER_EXTRA_CERT_CHAIN_POLICY_PARA; + + typedef struct _SSL_KEY_PIN_EXTRA_CERT_CHAIN_POLICY_PARA { + DWORD cbSize; + DWORD dwReserved; + PCWSTR pwszServerName; + } SSL_KEY_PIN_EXTRA_CERT_CHAIN_POLICY_PARA, *PSSL_KEY_PIN_EXTRA_CERT_CHAIN_POLICY_PARA; + +#define SSL_KEY_PIN_ERROR_TEXT_LENGTH 512 + typedef struct _SSL_KEY_PIN_EXTRA_CERT_CHAIN_POLICY_STATUS { + DWORD cbSize; + LONG lError; + WCHAR wszErrorText[SSL_KEY_PIN_ERROR_TEXT_LENGTH]; + } SSL_KEY_PIN_EXTRA_CERT_CHAIN_POLICY_STATUS, *PSSL_KEY_PIN_EXTRA_CERT_CHAIN_POLICY_STATUS; + +#define CERT_CHAIN_POLICY_SSL_KEY_PIN_MISMATCH_ERROR -2 +#define CERT_CHAIN_POLICY_SSL_KEY_PIN_MITM_ERROR -1 +#define CERT_CHAIN_POLICY_SSL_KEY_PIN_SUCCESS 0 +#define CERT_CHAIN_POLICY_SSL_KEY_PIN_MITM_WARNING 1 +#define CERT_CHAIN_POLICY_SSL_KEY_PIN_MISMATCH_WARNING 2 + #define CryptStringToBinary __MINGW_NAME_AW(CryptStringToBinary) #define CryptBinaryToString __MINGW_NAME_AW(CryptBinaryToString) @@ -5182,7 +5650,13 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod #define CRYPT_STRING_HEXADDR 0x0000000a #define CRYPT_STRING_HEXASCIIADDR 0x0000000b #define CRYPT_STRING_HEXRAW 0x0000000c +#define CRYPT_STRING_BASE64URI 0x0000000d +#define CRYPT_STRING_ENCODEMASK 0x000000ff +#define CRYPT_STRING_RESERVED100 0x00000100 +#define CRYPT_STRING_RESERVED200 0x00000200 + +#define CRYPT_STRING_PERCENTESCAPE 0x08000000 #define CRYPT_STRING_HASHDATA 0x10000000 #define CRYPT_STRING_STRICT 0x20000000 #define CRYPT_STRING_NOCRLF 0x40000000 @@ -5195,6 +5669,8 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod #define szOID_PKCS_12_pbeWithSHA1And2KeyTripleDES "1.2.840.113549.1.12.1.4" #define szOID_PKCS_12_pbeWithSHA1And128BitRC2 "1.2.840.113549.1.12.1.5" #define szOID_PKCS_12_pbeWithSHA1And40BitRC2 "1.2.840.113549.1.12.1.6" +#define szOID_PKCS_5_PBKDF2 "1.2.840.113549.1.5.12" +#define szOID_PKCS_5_PBES2 "1.2.840.113549.1.5.13" typedef struct _CRYPT_PKCS12_PBE_PARAMS { int iIterations; @@ -5213,12 +5689,19 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod #define CRYPT_USER_KEYSET 0x1000 #define PKCS12_PREFER_CNG_KSP 0x100 #define PKCS12_ALWAYS_CNG_KSP 0x200 +#define PKCS12_ONLY_CERTIFICATES 0x00000400 +#define PKCS12_ONLY_NOT_ENCRYPTED_CERTIFICATES 0x00000800 #define PKCS12_ALLOW_OVERWRITE_KEY 0x4000 #define PKCS12_NO_PERSIST_KEY 0x8000 +#define PKCS12_VIRTUAL_ISOLATION_KEY 0x00010000 #define PKCS12_IMPORT_RESERVED_MASK 0xffff0000 #define PKCS12_OBJECT_LOCATOR_ALL_IMPORT_FLAGS (PKCS12_ALWAYS_CNG_KSP | PKCS12_NO_PERSIST_KEY | PKCS12_IMPORT_SILENT | PKCS12_INCLUDE_EXTENDED_PROPERTIES) +#define PKCS12_ONLY_CERTIFICATES_PROVIDER_TYPE 0 +#define PKCS12_ONLY_CERTIFICATES_PROVIDER_NAME L"PfxProvider" +#define PKCS12_ONLY_CERTIFICATES_CONTAINER_NAME L"PfxContainer" + WINIMPM WINBOOL WINAPI PFXIsPFXBlob (CRYPT_DATA_BLOB *pPFX); WINIMPM WINBOOL WINAPI PFXVerifyPassword (CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, DWORD dwFlags); WINIMPM WINBOOL WINAPI PFXExportCertStoreEx (HCERTSTORE hStore, CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, void *pvPara, DWORD dwFlags); @@ -5229,11 +5712,31 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod #define PKCS12_INCLUDE_EXTENDED_PROPERTIES 0x10 #define PKCS12_PROTECT_TO_DOMAIN_SIDS 0x20 #define PKCS12_EXPORT_SILENT 0x40 +#define PKCS12_EXPORT_PBES2_PARAMS 0x0080 +#define PKCS12_DISABLE_ENCRYPT_CERTIFICATES 0x0100 +#define PKCS12_ENCRYPT_CERTIFICATES 0x0200 +#define PKCS12_EXPORT_ECC_CURVE_PARAMETERS 0x1000 +#define PKCS12_EXPORT_ECC_CURVE_OID 0x2000 #define PKCS12_EXPORT_RESERVED_MASK 0xffff0000 +#define PKCS12_PBKDF2_ID_HMAC_SHA1 "1.2.840.113549.2.7" +#define PKCS12_PBKDF2_ID_HMAC_SHA256 "1.2.840.113549.2.9" +#define PKCS12_PBKDF2_ID_HMAC_SHA384 "1.2.840.113549.2.10" +#define PKCS12_PBKDF2_ID_HMAC_SHA512 "1.2.840.113549.2.11" + + typedef struct _PKCS12_PBES2_EXPORT_PARAMS { + DWORD dwSize; + PVOID hNcryptDescriptor; + LPWSTR pwszPbes2Alg; + } PKCS12_PBES2_EXPORT_PARAMS, *PPKCS12_PBES2_EXPORT_PARAMS; + +#define PKCS12_PBES2_ALG_AES256_SHA256 L"AES256-SHA256" +#define PKCS12_CONFIG_REGPATH L"Software\\Microsoft\\Windows\\CurrentVersion\\PFX" +#define PKCS12_ENCRYPT_CERTIFICATES_VALUE_NAME L"EncryptCertificates" + WINIMPM WINBOOL WINAPI PFXExportCertStore (HCERTSTORE hStore, CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, DWORD dwFlags); -#if NTDDI_VERSION >= 0x06000000 +#if NTDDI_VERSION >= NTDDI_VISTA typedef VOID *HCERT_SERVER_OCSP_RESPONSE; WINIMPM HCERT_SERVER_OCSP_RESPONSE WINAPI CertOpenServerOcspResponse (PCCERT_CHAIN_CONTEXT pChainContext, DWORD dwFlags, LPVOID pvReserved); @@ -5252,6 +5755,20 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod DWORD cbEncodedOcspResponse; }; + typedef VOID (CALLBACK *PFN_CERT_SERVER_OCSP_RESPONSE_UPDATE_CALLBACK)(PCCERT_CHAIN_CONTEXT pChainContext, PCCERT_SERVER_OCSP_RESPONSE_CONTEXT pServerOcspResponseContext, PCCRL_CONTEXT pNewCrlContext, PCCRL_CONTEXT pPrevCrlContext, PVOID pvArg, DWORD dwWriteOcspFileError); + + typedef struct _CERT_SERVER_OCSP_RESPONSE_OPEN_PARA { + DWORD cbSize; + DWORD dwFlags; + DWORD *pcbUsedSize; + PWSTR pwszOcspDirectory; + PFN_CERT_SERVER_OCSP_RESPONSE_UPDATE_CALLBACK pfnUpdateCallback; + PVOID pvUpdateCallbackArg; + } CERT_SERVER_OCSP_RESPONSE_OPEN_PARA, *PCERT_SERVER_OCSP_RESPONSE_OPEN_PARA; + +#define CERT_SERVER_OCSP_RESPONSE_OPEN_PARA_READ_FLAG 0x00000001 +#define CERT_SERVER_OCSP_RESPONSE_OPEN_PARA_WRITE_FLAG 0x00000002 + WINIMPM PCCERT_SERVER_OCSP_RESPONSE_CONTEXT WINAPI CertGetServerOcspResponseContext (HCERT_SERVER_OCSP_RESPONSE hServerOcspResponse, DWORD dwFlags, LPVOID pvReserved); WINIMPM VOID WINAPI CertAddRefServerOcspResponseContext (PCCERT_SERVER_OCSP_RESPONSE_CONTEXT pServerOcspResponseContext); WINIMPM VOID WINAPI CertFreeServerOcspResponseContext (PCCERT_SERVER_OCSP_RESPONSE_CONTEXT pServerOcspResponseContext); @@ -5267,7 +5784,7 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod #define CERT_RETRIEVE_BIOMETRIC_PICTURE_TYPE (CERT_RETRIEVE_BIOMETRIC_PREDEFINED_BASE_TYPE + CERT_BIOMETRIC_PICTURE_TYPE) #define CERT_RETRIEVE_BIOMETRIC_SIGNATURE_TYPE (CERT_RETRIEVE_BIOMETRIC_PREDEFINED_BASE_TYPE + CERT_BIOMETRIC_SIGNATURE_TYPE) -#if NTDDI_VERSION >= 0x06010000 +#if NTDDI_VERSION >= NTDDI_WIN7 typedef struct _CERT_SELECT_CHAIN_PARA { HCERTCHAINENGINE hChainEngine; PFILETIME pTime; @@ -5299,6 +5816,9 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod #define CERT_SELECT_BY_ISSUER_NAME 9 #define CERT_SELECT_BY_PUBLIC_KEY 10 #define CERT_SELECT_BY_TLS_SIGNATURES 11 +#define CERT_SELECT_BY_ISSUER_DISPLAYNAME 12 +#define CERT_SELECT_BY_FRIENDLYNAME 13 +#define CERT_SELECT_BY_THUMBPRINT 14 #define CERT_SELECT_LAST CERT_SELECT_BY_TLS_SIGNATURES #define CERT_SELECT_MAX (CERT_SELECT_LAST *3) @@ -5311,12 +5831,13 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod #define CERT_SELECT_HAS_KEY_FOR_KEY_EXCHANGE 0x20 #define CERT_SELECT_HARDWARE_ONLY 0x40 #define CERT_SELECT_ALLOW_DUPLICATES 0x80 +#define CERT_SELECT_IGNORE_AUTOSELECT 0x00000100 WINIMPM WINBOOL WINAPI CertSelectCertificateChains (LPCGUID pSelectionContext, DWORD dwFlags, PCCERT_SELECT_CHAIN_PARA pChainParameters, DWORD cCriteria, PCCERT_SELECT_CRITERIA rgpCriteria, HCERTSTORE hStore, PDWORD pcSelection, PCCERT_CHAIN_CONTEXT **pprgpSelection); WINIMPM VOID WINAPI CertFreeCertificateChainList (PCCERT_CHAIN_CONTEXT *prgpSelection); #endif -#if NTDDI_VERSION >= 0x06010000 +#if NTDDI_VERSION >= NTDDI_WIN7 #define TIMESTAMP_VERSION 1 typedef struct _CRYPT_TIMESTAMP_REQUEST { @@ -5398,7 +5919,7 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod WINBOOL WINAPI CryptVerifyTimeStampSignature (const BYTE *pbTSContentInfo, DWORD cbTSContentInfo, const BYTE *pbData, DWORD cbData, HCERTSTORE hAdditionalStore, PCRYPT_TIMESTAMP_CONTEXT *ppTsContext, PCCERT_CONTEXT *ppTsSigner, HCERTSTORE *phStore); #endif -#if NTDDI_VERSION >= 0x06020000 +#if NTDDI_VERSION >= NTDDI_WIN8 #define CRYPT_OBJECT_LOCATOR_SPN_NAME_TYPE 1 #define CRYPT_OBJECT_LOCATOR_LAST_RESERVED_NAME_TYPE 32 #define CRYPT_OBJECT_LOCATOR_FIRST_RESERVED_USER_NAME_TYPE 33 @@ -5430,6 +5951,14 @@ WINIMPM HCERTSTORE WINAPI CertOpenStore (LPCSTR lpszStoreProvider, DWORD dwEncod } CRYPT_OBJECT_LOCATOR_PROVIDER_TABLE,*PCRYPT_OBJECT_LOCATOR_PROVIDER_TABLE; typedef WINBOOL (WINAPI *PFN_CRYPT_OBJECT_LOCATOR_PROVIDER_INITIALIZE) (PFN_CRYPT_OBJECT_LOCATOR_PROVIDER_FLUSH pfnFlush, LPVOID pContext, DWORD *pdwExpectedObjectCount, PCRYPT_OBJECT_LOCATOR_PROVIDER_TABLE *ppFuncTable, void **ppPluginContext); + + WINIMPM WINBOOL WINAPI CertIsWeakHash(DWORD dwHashUseType, LPCWSTR pwszCNGHashAlgid, DWORD dwChainFlags, PCCERT_CHAIN_CONTEXT pSignerChainContext, LPFILETIME pTimeStamp, LPCWSTR pwszFileName); + + typedef WINBOOL (WINAPI *PFN_CERT_IS_WEAK_HASH)(DWORD dwHashUseType, LPCWSTR pwszCNGHashAlgid, DWORD dwChainFlags, PCCERT_CHAIN_CONTEXT pSignerChainContext, LPFILETIME pTimeStamp, LPCWSTR pwszFileName); + +#define CERT_FILE_HASH_USE_TYPE 1 +#define CERT_TIMESTAMP_HASH_USE_TYPE 2 + #endif #endif diff --git a/lib/libc/include/any-windows-any/windows.system.h b/lib/libc/include/any-windows-any/windows.system.h new file mode 100644 index 0000000000..314321deb3 --- /dev/null +++ b/lib/libc/include/any-windows-any/windows.system.h @@ -0,0 +1,150 @@ +/*** Autogenerated by WIDL 4.4 from include/windows.system.idl - Do not edit ***/ + +#ifdef _WIN32 +#ifndef __REQUIRED_RPCNDR_H_VERSION__ +#define __REQUIRED_RPCNDR_H_VERSION__ 475 +#endif +#include +#include +#endif + +#ifndef COM_NO_WINDOWS_H +#include +#include +#endif + +#ifndef __windows_system_h__ +#define __windows_system_h__ + +/* Forward declarations */ + +#ifndef ____x_ABI_CWindows_CSystem_CIDispatcherQueueController_FWD_DEFINED__ +#define ____x_ABI_CWindows_CSystem_CIDispatcherQueueController_FWD_DEFINED__ +typedef interface __x_ABI_CWindows_CSystem_CIDispatcherQueueController __x_ABI_CWindows_CSystem_CIDispatcherQueueController; +#ifdef __cplusplus +namespace ABI { + namespace Windows { + namespace System { + interface IDispatcherQueueController; + } + } +} +#endif /* __cplusplus */ +#endif + +/* Headers for imported files */ + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/***************************************************************************** + * IDispatcherQueueController interface + */ +#ifndef ____x_ABI_CWindows_CSystem_CIDispatcherQueueController_INTERFACE_DEFINED__ +#define ____x_ABI_CWindows_CSystem_CIDispatcherQueueController_INTERFACE_DEFINED__ + +DEFINE_GUID(IID___x_ABI_CWindows_CSystem_CIDispatcherQueueController, 0x22f34e66, 0x50db, 0x4e36, 0xa9,0x8d, 0x61,0xc0,0x1b,0x38,0x4d,0x20); +#if defined(__cplusplus) && !defined(CINTERFACE) +} /* extern "C" */ +namespace ABI { + namespace Windows { + namespace System { + MIDL_INTERFACE("22f34e66-50db-4e36-a98d-61c01b384d20") + IDispatcherQueueController : public IInspectable + { + }; + } + } +} +extern "C" { +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(ABI::Windows::System::IDispatcherQueueController, 0x22f34e66, 0x50db, 0x4e36, 0xa9,0x8d, 0x61,0xc0,0x1b,0x38,0x4d,0x20) +#endif +#else +typedef struct __x_ABI_CWindows_CSystem_CIDispatcherQueueControllerVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + __x_ABI_CWindows_CSystem_CIDispatcherQueueController *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + __x_ABI_CWindows_CSystem_CIDispatcherQueueController *This); + + ULONG (STDMETHODCALLTYPE *Release)( + __x_ABI_CWindows_CSystem_CIDispatcherQueueController *This); + + /*** IInspectable methods ***/ + HRESULT (STDMETHODCALLTYPE *GetIids)( + __x_ABI_CWindows_CSystem_CIDispatcherQueueController *This, + ULONG *iidCount, + IID **iids); + + HRESULT (STDMETHODCALLTYPE *GetRuntimeClassName)( + __x_ABI_CWindows_CSystem_CIDispatcherQueueController *This, + HSTRING *className); + + HRESULT (STDMETHODCALLTYPE *GetTrustLevel)( + __x_ABI_CWindows_CSystem_CIDispatcherQueueController *This, + TrustLevel *trustLevel); + + END_INTERFACE +} __x_ABI_CWindows_CSystem_CIDispatcherQueueControllerVtbl; + +interface __x_ABI_CWindows_CSystem_CIDispatcherQueueController { + CONST_VTBL __x_ABI_CWindows_CSystem_CIDispatcherQueueControllerVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define __x_ABI_CWindows_CSystem_CIDispatcherQueueController_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define __x_ABI_CWindows_CSystem_CIDispatcherQueueController_AddRef(This) (This)->lpVtbl->AddRef(This) +#define __x_ABI_CWindows_CSystem_CIDispatcherQueueController_Release(This) (This)->lpVtbl->Release(This) +/*** IInspectable methods ***/ +#define __x_ABI_CWindows_CSystem_CIDispatcherQueueController_GetIids(This,iidCount,iids) (This)->lpVtbl->GetIids(This,iidCount,iids) +#define __x_ABI_CWindows_CSystem_CIDispatcherQueueController_GetRuntimeClassName(This,className) (This)->lpVtbl->GetRuntimeClassName(This,className) +#define __x_ABI_CWindows_CSystem_CIDispatcherQueueController_GetTrustLevel(This,trustLevel) (This)->lpVtbl->GetTrustLevel(This,trustLevel) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT __x_ABI_CWindows_CSystem_CIDispatcherQueueController_QueryInterface(__x_ABI_CWindows_CSystem_CIDispatcherQueueController* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG __x_ABI_CWindows_CSystem_CIDispatcherQueueController_AddRef(__x_ABI_CWindows_CSystem_CIDispatcherQueueController* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG __x_ABI_CWindows_CSystem_CIDispatcherQueueController_Release(__x_ABI_CWindows_CSystem_CIDispatcherQueueController* This) { + return This->lpVtbl->Release(This); +} +/*** IInspectable methods ***/ +static FORCEINLINE HRESULT __x_ABI_CWindows_CSystem_CIDispatcherQueueController_GetIids(__x_ABI_CWindows_CSystem_CIDispatcherQueueController* This,ULONG *iidCount,IID **iids) { + return This->lpVtbl->GetIids(This,iidCount,iids); +} +static FORCEINLINE HRESULT __x_ABI_CWindows_CSystem_CIDispatcherQueueController_GetRuntimeClassName(__x_ABI_CWindows_CSystem_CIDispatcherQueueController* This,HSTRING *className) { + return This->lpVtbl->GetRuntimeClassName(This,className); +} +static FORCEINLINE HRESULT __x_ABI_CWindows_CSystem_CIDispatcherQueueController_GetTrustLevel(__x_ABI_CWindows_CSystem_CIDispatcherQueueController* This,TrustLevel *trustLevel) { + return This->lpVtbl->GetTrustLevel(This,trustLevel); +} +#endif +#endif + +#endif + +#endif /* ____x_ABI_CWindows_CSystem_CIDispatcherQueueController_INTERFACE_DEFINED__ */ + +/* Begin additional prototypes for all interfaces */ + + +/* End additional prototypes */ + +#ifdef __cplusplus +} +#endif + +#endif /* __windows_system_h__ */ diff --git a/lib/libc/include/any-windows-any/winineti.h b/lib/libc/include/any-windows-any/winineti.h index d656e1ad09..691ffe07dd 100644 --- a/lib/libc/include/any-windows-any/winineti.h +++ b/lib/libc/include/any-windows-any/winineti.h @@ -107,6 +107,17 @@ typedef enum { #define CACHE_CONFIG_CONTENT_USAGE_FC 0x00002000 #define CACHE_CONFIG_STICKY_CONTENT_USAGE_FC 0x00004000 +#define ERROR_INTERNET_NO_NEW_CONTAINERS (INTERNET_ERROR_BASE + 51) +#define ERROR_INTERNET_SOURCE_PORT_IN_USE (INTERNET_ERROR_BASE + 58) +#define ERROR_INTERNET_INSECURE_FALLBACK_REQUIRED (INTERNET_ERROR_BASE + 59) +#define ERROR_INTERNET_PROXY_ALERT (INTERNET_ERROR_BASE + 61) +#define ERROR_INTERNET_NO_CM_CONNECTION (INTERNET_ERROR_BASE + 80) +#define ERROR_HTTP_PUSH_STATUS_CODE_NOT_SUPPORTED (INTERNET_ERROR_BASE + 147) +#define ERROR_HTTP_PUSH_RETRY_NOT_SUPPORTED (INTERNET_ERROR_BASE + 148) +#define ERROR_HTTP_PUSH_ENABLE_FAILED (INTERNET_ERROR_BASE + 149) + +#define ERROR_INTERNET_OFFLINE ERROR_INTERNET_DISCONNECTED + #ifdef __cplusplus extern "C" { #endif diff --git a/lib/libc/include/any-windows-any/winioctl.h b/lib/libc/include/any-windows-any/winioctl.h index 8eea890adb..044d8783ed 100644 --- a/lib/libc/include/any-windows-any/winioctl.h +++ b/lib/libc/include/any-windows-any/winioctl.h @@ -105,6 +105,32 @@ DEFINE_GUID(GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR,0x4D36E978,0xE325,0x11CE,0x #define FILE_DEVICE_KSEC 0x00000039 #define FILE_DEVICE_FIPS 0x0000003A #define FILE_DEVICE_INFINIBAND 0x0000003B +#define FILE_DEVICE_VMBUS 0x0000003E +#define FILE_DEVICE_CRYPT_PROVIDER 0x0000003F +#define FILE_DEVICE_WPD 0x00000040 +#define FILE_DEVICE_BLUETOOTH 0x00000041 +#define FILE_DEVICE_MT_COMPOSITE 0x00000042 +#define FILE_DEVICE_MT_TRANSPORT 0x00000043 +#define FILE_DEVICE_BIOMETRIC 0x00000044 +#define FILE_DEVICE_PMI 0x00000045 +#define FILE_DEVICE_EHSTOR 0x00000046 +#define FILE_DEVICE_DEVAPI 0x00000047 +#define FILE_DEVICE_GPIO 0x00000048 +#define FILE_DEVICE_USBEX 0x00000049 +#define FILE_DEVICE_CONSOLE 0x00000050 +#define FILE_DEVICE_NFP 0x00000051 +#define FILE_DEVICE_SYSENV 0x00000052 +#define FILE_DEVICE_VIRTUAL_BLOCK 0x00000053 +#define FILE_DEVICE_POINT_OF_SERVICE 0x00000054 +#define FILE_DEVICE_STORAGE_REPLICATION 0x00000055 +#define FILE_DEVICE_TRUST_ENV 0x00000056 +#define FILE_DEVICE_UCM 0x00000057 +#define FILE_DEVICE_UCMTCPCI 0x00000058 +#define FILE_DEVICE_PERSISTENT_MEMORY 0x00000059 +#define FILE_DEVICE_NVDIMM 0x0000005a +#define FILE_DEVICE_HOLOGRAPHIC 0x0000005b +#define FILE_DEVICE_SDFXHCI 0x0000005c +#define FILE_DEVICE_UCMUCSI 0x0000005d #define CTL_CODE(DeviceType,Function,Method,Access) (((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method)) diff --git a/lib/libc/include/any-windows-any/winnetwk.h b/lib/libc/include/any-windows-any/winnetwk.h index 2d79ded22b..9a3685d26f 100644 --- a/lib/libc/include/any-windows-any/winnetwk.h +++ b/lib/libc/include/any-windows-any/winnetwk.h @@ -121,7 +121,7 @@ extern "C" { DWORD WINAPI WNetConnectionDialog(HWND hwnd,DWORD dwType); DWORD WINAPI WNetDisconnectDialog(HWND hwnd,DWORD dwType); #if (_WIN32_WINNT >= _WIN32_WINNT_LONGHORN) - DWORD WINAPI WNetRestoreSingleConnectionW(HWND hwndParent, LPCWSTR lpDevice, BOOL fUseUI); + DWORD WINAPI WNetRestoreSingleConnectionW(HWND hwndParent, LPCWSTR lpDevice, WINBOOL fUseUI); #else DWORD WINAPI WNetRestoreConnectionW(HWND hwndParent,LPCWSTR lpDevice); #endif diff --git a/lib/libc/include/any-windows-any/winnt.h b/lib/libc/include/any-windows-any/winnt.h index 8fb26a1a58..613775e8f6 100644 --- a/lib/libc/include/any-windows-any/winnt.h +++ b/lib/libc/include/any-windows-any/winnt.h @@ -3142,6 +3142,7 @@ __buildmemorybarrier() #define SECURITY_CAPABILITY_RID_COUNT (__MSABI_LONG(5)) #define SECURITY_BUILTIN_PACKAGE_ANY_PACKAGE (__MSABI_LONG(0x00000001)) +#define SECURITY_BUILTIN_PACKAGE_ANY_RESTRICTED_PACKAGE (__MSABI_LONG(0x00000002)) #define SECURITY_CAPABILITY_INTERNET_CLIENT (__MSABI_LONG(0x00000001)) #define SECURITY_CAPABILITY_INTERNET_CLIENT_SERVER (__MSABI_LONG(0x00000002)) @@ -3153,9 +3154,12 @@ __buildmemorybarrier() #define SECURITY_CAPABILITY_ENTERPRISE_AUTHENTICATION (__MSABI_LONG(0x00000008)) #define SECURITY_CAPABILITY_SHARED_USER_CERTIFICATES (__MSABI_LONG(0x00000009)) #define SECURITY_CAPABILITY_REMOVABLE_STORAGE (__MSABI_LONG(0x0000000a)) - +#define SECURITY_CAPABILITY_APPOINTMENTS (__MSABI_LONG(0x0000000b)) +#define SECURITY_CAPABILITY_CONTACTS (__MSABI_LONG(0x0000000c)) #define SECURITY_CAPABILITY_INTERNET_EXPLORER (__MSABI_LONG(0x00001000)) + + #define SECURITY_MANDATORY_LABEL_AUTHORITY {0,0,0,0,0,16} #define SECURITY_MANDATORY_UNTRUSTED_RID (__MSABI_LONG(0x00000000)) #define SECURITY_MANDATORY_LOW_RID (__MSABI_LONG(0x00001000)) @@ -4723,6 +4727,9 @@ __buildmemorybarrier() #define PROCESSOR_ARCHITECTURE_AMD64 9 #define PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 10 #define PROCESSOR_ARCHITECTURE_NEUTRAL 11 +#define PROCESSOR_ARCHITECTURE_ARM64 12 +#define PROCESSOR_ARCHITECTURE_ARM32_ON_WIN64 13 +#define PROCESSOR_ARCHITECTURE_IA32_ON_ARM64 14 #define PROCESSOR_ARCHITECTURE_UNKNOWN 0xffff @@ -4754,6 +4761,12 @@ __buildmemorybarrier() #define PF_ARM_64BIT_LOADSTORE_ATOMIC 25 #define PF_ARM_EXTERNAL_CACHE_AVAILABLE 26 #define PF_ARM_FMAC_INSTRUCTIONS_AVAILABLE 27 +#define PF_RDRAND_INSTRUCTION_AVAILABLE 28 +#define PF_ARM_V8_INSTRUCTIONS_AVAILABLE 29 +#define PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE 30 +#define PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE 31 +#define PF_RDTSCP_INSTRUCTION_AVAILABLE 32 +#define PF_RDPID_INSTRUCTION_AVAILABLE 33 #define XSTATE_LEGACY_FLOATING_POINT (0) #define XSTATE_LEGACY_SSE (1) @@ -4979,8 +4992,7 @@ __buildmemorybarrier() #define FILE_SUPPORTS_INTEGRITY_STREAMS 0x04000000 typedef struct FILE_ID_128 { - ULONGLONG LowPart; - ULONGLONG HighPart; + BYTE Identifier[16]; } FILE_ID_128, *PFILE_ID_128; typedef struct _FILE_NOTIFY_INFORMATION { @@ -5021,18 +5033,48 @@ __buildmemorybarrier() #define IO_REPARSE_TAG_MOUNT_POINT (__MSABI_LONG(0xA0000003)) #define IO_REPARSE_TAG_HSM (__MSABI_LONG(0xC0000004)) +#define IO_REPARSE_TAG_DRIVE_EXTENDER (__MSABI_LONG(0x80000005)) #define IO_REPARSE_TAG_HSM2 (__MSABI_LONG(0x80000006)) #define IO_REPARSE_TAG_SIS (__MSABI_LONG(0x80000007)) #define IO_REPARSE_TAG_WIM (__MSABI_LONG(0x80000008)) #define IO_REPARSE_TAG_CSV (__MSABI_LONG(0x80000009)) #define IO_REPARSE_TAG_DFS (__MSABI_LONG(0x8000000A)) #define IO_REPARSE_TAG_FILTER_MANAGER (__MSABI_LONG(0x8000000B)) -#define IO_REPARSE_TAG_DFSR (__MSABI_LONG(0x80000012)) #define IO_REPARSE_TAG_SYMLINK (__MSABI_LONG(0xA000000C)) #define IO_REPARSE_TAG_IIS_CACHE (__MSABI_LONG(0xA0000010)) -#define IO_REPARSE_TAG_DRIVE_EXTENDER (__MSABI_LONG(0x80000005)) +#define IO_REPARSE_TAG_DFSR (__MSABI_LONG(0x80000012)) #define IO_REPARSE_TAG_DEDUP (__MSABI_LONG(0x80000013)) #define IO_REPARSE_TAG_NFS (__MSABI_LONG(0x80000014)) +#define IO_REPARSE_TAG_FILE_PLACEHOLDER (__MSABI_LONG(0x80000015)) +#define IO_REPARSE_TAG_WOF (__MSABI_LONG(0x80000017)) +#define IO_REPARSE_TAG_WCI (__MSABI_LONG(0x80000018)) +#define IO_REPARSE_TAG_WCI_1 (__MSABI_LONG(0x90001018)) +#define IO_REPARSE_TAG_GLOBAL_REPARSE (__MSABI_LONG(0xA0000019)) +#define IO_REPARSE_TAG_CLOUD (__MSABI_LONG(0x9000001A)) +#define IO_REPARSE_TAG_CLOUD_1 (__MSABI_LONG(0x9000101A)) +#define IO_REPARSE_TAG_CLOUD_2 (__MSABI_LONG(0x9000201A)) +#define IO_REPARSE_TAG_CLOUD_3 (__MSABI_LONG(0x9000301A)) +#define IO_REPARSE_TAG_CLOUD_4 (__MSABI_LONG(0x9000401A)) +#define IO_REPARSE_TAG_CLOUD_5 (__MSABI_LONG(0x9000501A)) +#define IO_REPARSE_TAG_CLOUD_6 (__MSABI_LONG(0x9000601A)) +#define IO_REPARSE_TAG_CLOUD_7 (__MSABI_LONG(0x9000701A)) +#define IO_REPARSE_TAG_CLOUD_8 (__MSABI_LONG(0x9000801A)) +#define IO_REPARSE_TAG_CLOUD_9 (__MSABI_LONG(0x9000901A)) +#define IO_REPARSE_TAG_CLOUD_A (__MSABI_LONG(0x9000A01A)) +#define IO_REPARSE_TAG_CLOUD_B (__MSABI_LONG(0x9000B01A)) +#define IO_REPARSE_TAG_CLOUD_C (__MSABI_LONG(0x9000C01A)) +#define IO_REPARSE_TAG_CLOUD_D (__MSABI_LONG(0x9000D01A)) +#define IO_REPARSE_TAG_CLOUD_E (__MSABI_LONG(0x9000E01A)) +#define IO_REPARSE_TAG_CLOUD_F (__MSABI_LONG(0x9000F01A)) +#define IO_REPARSE_TAG_CLOUD_MASK (__MSABI_LONG(0x0000F000)) +#define IO_REPARSE_TAG_APPEXECLINK (__MSABI_LONG(0x8000001B)) +#define IO_REPARSE_TAG_PROJFS (__MSABI_LONG(0x9000001C)) +#define IO_REPARSE_TAG_STORAGE_SYNC (__MSABI_LONG(0x8000001E)) +#define IO_REPARSE_TAG_WCI_TOMBSTONE (__MSABI_LONG(0xA000001F)) +#define IO_REPARSE_TAG_UNHANDLED (__MSABI_LONG(0x80000020)) +#define IO_REPARSE_TAG_ONEDRIVE (__MSABI_LONG(0x80000021)) +#define IO_REPARSE_TAG_PROJFS_TOMBSTONE (__MSABI_LONG(0xA0000022)) +#define IO_REPARSE_TAG_AF_UNIX (__MSABI_LONG(0x80000023)) #if _WIN32_WINNT >= 0x0602 #define SCRUB_DATA_INPUT_FLAG_RESUME 0x00000001 diff --git a/lib/libc/include/any-windows-any/winreg.h b/lib/libc/include/any-windows-any/winreg.h index 84c51afdb7..dab9324e8d 100644 --- a/lib/libc/include/any-windows-any/winreg.h +++ b/lib/libc/include/any-windows-any/winreg.h @@ -29,9 +29,17 @@ extern "C" { #define RRF_RT_QWORD (RRF_RT_REG_BINARY | RRF_RT_REG_QWORD) #define RRF_RT_ANY 0x0000ffff +#if (_WIN32_WINNT >= 0x0A00) +#define RRF_SUBKEY_WOW6464KEY 0x00010000 +#define RRF_SUBKEY_WOW6432KEY 0x00020000 +#define RRF_WOW64_MASK 0x00030000 +#endif + #define RRF_NOEXPAND 0x10000000 #define RRF_ZEROONFAILURE 0x20000000 +#define REG_PROCESS_APPKEY 0x00000001 + typedef ACCESS_MASK REGSAM; typedef LONG LSTATUS; @@ -42,10 +50,10 @@ extern "C" { #define HKEY_PERFORMANCE_DATA ((HKEY) (ULONG_PTR)((LONG)0x80000004)) #define HKEY_PERFORMANCE_TEXT ((HKEY) (ULONG_PTR)((LONG)0x80000050)) #define HKEY_PERFORMANCE_NLSTEXT ((HKEY) (ULONG_PTR)((LONG)0x80000060)) +#if (WINVER >= 0x0400) #define HKEY_CURRENT_CONFIG ((HKEY) (ULONG_PTR)((LONG)0x80000005)) #define HKEY_DYN_DATA ((HKEY) (ULONG_PTR)((LONG)0x80000006)) - -#define REG_SECURE_CONNECTION 1 +#define HKEY_CURRENT_USER_LOCAL_SETTINGS ((HKEY) (ULONG_PTR)((LONG)0x80000007)) #ifndef _PROVIDER_STRUCTS_DEFINED #define _PROVIDER_STRUCTS_DEFINED @@ -108,11 +116,18 @@ extern "C" { __MINGW_TYPEDEF_AW(VALENT) __MINGW_TYPEDEF_AW(PVALENT) #endif +#endif #define WIN31_CLASS NULL #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) +#define REG_MUI_STRING_TRUNCATE 0x00000001 + +#if (WINVER >= 0x0400) +#define REG_SECURE_CONNECTION 1 +#endif + #define RegConnectRegistry __MINGW_NAME_AW(RegConnectRegistry) #define RegConnectRegistryEx __MINGW_NAME_AW(RegConnectRegistryEx) #define RegCreateKey __MINGW_NAME_AW(RegCreateKey) @@ -145,6 +160,7 @@ extern "C" { WINADVAPI LONG WINAPI RegOpenUserClassesRoot(HANDLE hToken,DWORD dwOptions,REGSAM samDesired,PHKEY phkResult); WINADVAPI LONG WINAPI RegOpenCurrentUser(REGSAM samDesired,PHKEY phkResult); WINADVAPI LONG WINAPI RegDisablePredefinedCache(void); + WINADVAPI LONG WINAPI RegDisablePredefinedCacheEx(void); WINADVAPI LONG WINAPI RegConnectRegistryA(LPCSTR lpMachineName,HKEY hKey,PHKEY phkResult); WINADVAPI LONG WINAPI RegConnectRegistryW(LPCWSTR lpMachineName,HKEY hKey,PHKEY phkResult); WINADVAPI LONG WINAPI RegConnectRegistryExA(LPCSTR lpMachineName,HKEY hKey,ULONG Flags,PHKEY phkResult); @@ -315,8 +331,6 @@ WINADVAPI LONG WINAPI RegDeleteTreeW( LPCWSTR lpSubKey ); -WINADVAPI LONG WINAPI RegDisablePredefinedCacheEx(void); - WINADVAPI LONG WINAPI RegLoadAppKeyA( LPCSTR lpFile, PHKEY phkResult, @@ -360,6 +374,11 @@ WINADVAPI LONG WINAPI RegOpenKeyTransactedW( PVOID pExtendedParameter ); +WINADVAPI LONG WINAPI RegRenameKey( + HKEY hKey, + LPCWSTR lpSubKeyName, + LPCWSTR lpNewKeyName); + #define RegOpenKeyTransacted __MINGW_NAME_AW(RegOpenKeyTransacted) WINADVAPI LONG WINAPI RegSetKeyValueA( @@ -389,7 +408,12 @@ WINADVAPI LONG WINAPI RegSetKeyValueW( #define SHUTDOWN_GRACE_OVERRIDE 0x00000020 #define SHUTDOWN_INSTALL_UPDATES 0x00000040 #define SHUTDOWN_RESTARTAPPS 0x00000080 +#define SHUTDOWN_SKIP_SVC_PRESHUTDOWN 0x00000100 #define SHUTDOWN_HYBRID 0x00000200 +#define SHUTDOWN_RESTART_BOOTOPTIONS 0x00000400 +#define SHUTDOWN_SOFT_REBOOT 0x00000800 +#define SHUTDOWN_MOBILE_UI 0x00001000 +#define SHUTDOWN_ARSO 0x00002000 WINADVAPI DWORD WINAPI InitiateShutdownA( LPSTR lpMachineName, @@ -409,6 +433,11 @@ WINADVAPI DWORD WINAPI InitiateShutdownW( #define InitiateShutdown __MINGW_NAME_AW(InitiateShutdown) +WINADVAPI DWORD WINAPI CheckForHiberboot( + PBOOLEAN pHiberboot, + BOOLEAN bClearFlag +); + #endif /* (_WIN32_WINNT >= 0x0600) */ #endif /* WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) */ diff --git a/lib/libc/include/any-windows-any/winsock2.h b/lib/libc/include/any-windows-any/winsock2.h index de834846d4..99f4c249d6 100644 --- a/lib/libc/include/any-windows-any/winsock2.h +++ b/lib/libc/include/any-windows-any/winsock2.h @@ -88,10 +88,15 @@ extern "C" { #define IPPROTO_IGMP 2 #define IPPROTO_GGP 3 #define IPPROTO_IPV4 4 +#define IPPROTO_ST 5 #define IPPROTO_TCP 6 +#define IPPROTO_CBT 7 +#define IPPROTO_EGP 8 +#define IPPROTO_IGP 9 #define IPPROTO_PUP 12 #define IPPROTO_UDP 17 #define IPPROTO_IDP 22 +#define IPPROTO_RDP 27 #define IPPROTO_IPV6 41 #define IPPROTO_ROUTING 43 #define IPPROTO_FRAGMENT 44 @@ -102,6 +107,10 @@ extern "C" { #define IPPROTO_DSTOPTS 60 #define IPPROTO_ND 77 #define IPPROTO_ICLFXBM 78 +#define IPPROTO_PIM 103 +#define IPPROTO_PGM 113 +#define IPPROTO_L2TP 115 +#define IPPROTO_SCTP 132 #define IPPROTO_RAW 255 #define IPPROTO_MAX 256 @@ -301,7 +310,14 @@ extern "C" { #define MSG_OOB 0x1 #define MSG_PEEK 0x2 #define MSG_DONTROUTE 0x4 + +#if(_WIN32_WINNT >= 0x0502) #define MSG_WAITALL 0x8 +#endif + +#if(_WIN32_WINNT >= 0x0603) +#define MSG_PUSH_IMMEDIATE 0x20 +#endif #define MSG_PARTIAL 0x8000 @@ -468,6 +484,7 @@ typedef unsigned int GROUP; #define PFL_RECOMMENDED_PROTO_ENTRY 0x00000002 #define PFL_HIDDEN 0x00000004 #define PFL_MATCHES_PROTOCOL_ZERO 0x00000008 +#define PFL_NETWORKDIRECT_PROVIDER 0x00000010 #define XP1_CONNECTIONLESS 0x00000001 #define XP1_GUARANTEED_DELIVERY 0x00000002 @@ -488,6 +505,7 @@ typedef unsigned int GROUP; #define XP1_UNI_RECV 0x00010000 #define XP1_IFS_HANDLES 0x00020000 #define XP1_PARTIAL_MESSAGE 0x00040000 +#define XP1_SAN_SUPPORT_SDP 0x00080000 #define BIGENDIAN 0x0000 #define LITTLEENDIAN 0x0001 @@ -503,6 +521,9 @@ typedef unsigned int GROUP; #define WSA_FLAG_MULTIPOINT_C_LEAF 0x04 #define WSA_FLAG_MULTIPOINT_D_ROOT 0x08 #define WSA_FLAG_MULTIPOINT_D_LEAF 0x10 +#define WSA_FLAG_ACCESS_SYSTEM_SECURITY 0x40 +#define WSA_FLAG_NO_HANDLE_INHERIT 0x80 +#define WSA_FLAG_REGISTERED_IO 0x100 #define IOC_UNIX 0x00000000 #define IOC_WS2 0x08000000 @@ -607,7 +628,9 @@ typedef unsigned int GROUP; #define NS_DNS (12) #define NS_NETBT (13) #define NS_WINS (14) +#if(_WIN32_WINNT >= 0x0501) #define NS_NLA (15) +#endif #if (_WIN32_WINNT >= 0x0600) #define NS_BTH (16) #endif @@ -754,17 +777,24 @@ typedef unsigned int GROUP; #define LUP_NON_AUTHORITATIVE 0x4000 #define LUP_SECURE 0x8000 #define LUP_RETURN_PREFERRED_NAMES 0x10000 +#define LUP_DNS_ONLY 0x20000 #define LUP_ADDRCONFIG 0x100000 #define LUP_DUAL_ADDR 0x200000 #define LUP_FILESERVER 0x400000 +#define LUP_DISABLE_IDN_ENCODING 0x00800000 +#define LUP_API_ANSI 0x01000000 + +#define LUP_RESOLUTION_HANDLE 0x80000000 #define LUP_RES_RESERVICE 0x8000 /* FIXME: not in PSDK anymore?? */ #define RESULT_IS_ALIAS 0x0001 +#if(_WIN32_WINNT >= 0x0501) #define RESULT_IS_ADDED 0x0010 #define RESULT_IS_CHANGED 0x0020 #define RESULT_IS_DELETED 0x0040 +#endif typedef enum _WSAESETSERVICEOP { RNRSERVICE_REGISTER = 0, diff --git a/lib/libc/include/any-windows-any/winternl.h b/lib/libc/include/any-windows-any/winternl.h index c694305173..f3b8f2d40d 100644 --- a/lib/libc/include/any-windows-any/winternl.h +++ b/lib/libc/include/any-windows-any/winternl.h @@ -9,7 +9,19 @@ #include #ifndef NT_SUCCESS -#define NT_SUCCESS(status) ((NTSTATUS) (status) >= 0) +#define NT_SUCCESS(status) ((NTSTATUS) (status) >= 0) +#endif + +#ifndef NT_INFORMATION +#define NT_INFORMATION(Status) ((((ULONG)(Status)) >> 30) == 1) +#endif + +#ifndef NT_WARNING +#define NT_WARNING(Status) ((((ULONG)(Status)) >> 30) == 2) +#endif + +#ifndef NT_ERROR +#define NT_ERROR(Status) ((((ULONG)(Status)) >> 30) == 3) #endif #ifndef DEVICE_TYPE @@ -143,17 +155,66 @@ typedef struct _RTL_USER_PROCESS_PARAMETERS { #endif /* Values for the Attributes member */ - #define OBJ_INHERIT 0x00000002 - #define OBJ_PERMANENT 0x00000010 - #define OBJ_EXCLUSIVE 0x00000020 - #define OBJ_CASE_INSENSITIVE 0x00000040 - #define OBJ_OPENIF 0x00000080 - #define OBJ_OPENLINK 0x00000100 - #define OBJ_KERNEL_HANDLE 0x00000200 - #define OBJ_FORCE_ACCESS_CHECK 0x00000400 - #define OBJ_VALID_ATTRIBUTES 0x000007F2 +#define OBJ_INHERIT 0x00000002L +#define OBJ_PERMANENT 0x00000010L +#define OBJ_EXCLUSIVE 0x00000020L +#define OBJ_CASE_INSENSITIVE 0x00000040L +#define OBJ_OPENIF 0x00000080L +#define OBJ_OPENLINK 0x00000100L +#define OBJ_KERNEL_HANDLE 0x00000200L +#define OBJ_FORCE_ACCESS_CHECK 0x00000400L +#define OBJ_IGNORE_IMPERSONATED_DEVICEMAP 0x00000800L +#define OBJ_DONT_REPARSE 0x00001000L +#define OBJ_VALID_ATTRIBUTES 0x00001FF2L + +/* Define the create disposition values */ +#define FILE_SUPERSEDE 0x00000000 +#define FILE_OPEN 0x00000001 +#define FILE_CREATE 0x00000002 +#define FILE_OPEN_IF 0x00000003 +#define FILE_OVERWRITE 0x00000004 +#define FILE_OVERWRITE_IF 0x00000005 +#define FILE_MAXIMUM_DISPOSITION 0x00000005 + +/* Define the create/open option flags */ +#define FILE_DIRECTORY_FILE 0x00000001 +#define FILE_WRITE_THROUGH 0x00000002 +#define FILE_SEQUENTIAL_ONLY 0x00000004 +#define FILE_NO_INTERMEDIATE_BUFFERING 0x00000008 +#define FILE_SYNCHRONOUS_IO_ALERT 0x00000010 +#define FILE_SYNCHRONOUS_IO_NONALERT 0x00000020 +#define FILE_NON_DIRECTORY_FILE 0x00000040 +#define FILE_CREATE_TREE_CONNECTION 0x00000080 +#define FILE_COMPLETE_IF_OPLOCKED 0x00000100 +#define FILE_NO_EA_KNOWLEDGE 0x00000200 +#define FILE_OPEN_REMOTE_INSTANCE 0x00000400 +#define FILE_RANDOM_ACCESS 0x00000800 +#define FILE_DELETE_ON_CLOSE 0x00001000 +#define FILE_OPEN_BY_FILE_ID 0x00002000 +#define FILE_OPEN_FOR_BACKUP_INTENT 0x00004000 +#define FILE_NO_COMPRESSION 0x00008000 +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN7) +#define FILE_OPEN_REQUIRING_OPLOCK 0x00010000 +#endif +#define FILE_RESERVE_OPFILTER 0x00100000 +#define FILE_OPEN_REPARSE_POINT 0x00200000 +#define FILE_OPEN_NO_RECALL 0x00400000 +#define FILE_OPEN_FOR_FREE_SPACE_QUERY 0x00800000 +#define FILE_VALID_OPTION_FLAGS 0x00ffffff +#define FILE_VALID_PIPE_OPTION_FLAGS 0x00000032 +#define FILE_VALID_MAILSLOT_OPTION_FLAGS 0x00000032 +#define FILE_VALID_SET_FLAGS 0x00000036 + +/* Define the I/O status information return values for NtCreateFile/NtOpenFile */ +#define FILE_SUPERSEDED 0x00000000 +#define FILE_OPENED 0x00000001 +#define FILE_CREATED 0x00000002 +#define FILE_OVERWRITTEN 0x00000003 +#define FILE_EXISTS 0x00000004 +#define FILE_DOES_NOT_EXIST 0x00000005 /* Helper Macro */ +#ifndef InitializeObjectAttributes #define InitializeObjectAttributes(p,n,a,r,s) { \ (p)->Length = sizeof(OBJECT_ATTRIBUTES); \ (p)->RootDirectory = (r); \ @@ -162,6 +223,7 @@ typedef struct _RTL_USER_PROCESS_PARAMETERS { (p)->SecurityDescriptor = (s); \ (p)->SecurityQualityOfService = NULL; \ } +#endif typedef struct _OBJECT_DATA_INFORMATION { BOOLEAN InheritHandle; @@ -697,6 +759,18 @@ typedef struct _RTL_USER_PROCESS_PARAMETERS { IO_COUNTERS IoCounters; } SYSTEM_PROCESS_INFORMATION,*PSYSTEM_PROCESS_INFORMATION; + typedef struct _SYSTEM_THREAD_INFORMATION { + LARGE_INTEGER Reserved1[3]; + ULONG Reserved2; + PVOID StartAddress; + CLIENT_ID ClientId; + KPRIORITY Priority; + LONG BasePriority; + ULONG Reserved3; + ULONG ThreadState; + ULONG WaitReason; + } SYSTEM_THREAD_INFORMATION, *PSYSTEM_THREAD_INFORMATION; + typedef struct _SYSTEM_REGISTRY_QUOTA_INFORMATION { ULONG RegistryQuotaAllowed; ULONG RegistryQuotaUsed; @@ -822,6 +896,11 @@ typedef struct _RTL_USER_PROCESS_PARAMETERS { BYTE Reserved1[24]; } SYSTEM_INTERRUPT_INFORMATION,*PSYSTEM_INTERRUPT_INFORMATION; + typedef struct _SYSTEM_POLICY_INFORMATION { + PVOID Reserved1[2]; + ULONG Reserved2[3]; + } SYSTEM_POLICY_INFORMATION, *PSYSTEM_POLICY_INFORMATION; + typedef struct _SYSTEM_HANDLE_ENTRY { ULONG OwnerPid; BYTE ObjectType; @@ -844,6 +923,19 @@ typedef struct _RTL_USER_PROCESS_PARAMETERS { UNICODE_STRING FileName; } SYSTEM_PAGEFILE_INFORMATION, *PSYSTEM_PAGEFILE_INFORMATION; + typedef struct _PUBLIC_OBJECT_BASIC_INFORMATION { + ULONG Attributes; + ACCESS_MASK GrantedAccess; + ULONG HandleCount; + ULONG PointerCount; + ULONG Reserved[10]; + } PUBLIC_OBJECT_BASIC_INFORMATION, *PPUBLIC_OBJECT_BASIC_INFORMATION; + + typedef struct __PUBLIC_OBJECT_TYPE_INFORMATION { + UNICODE_STRING TypeName; + ULONG Reserved[22]; + } PUBLIC_OBJECT_TYPE_INFORMATION, *PPUBLIC_OBJECT_TYPE_INFORMATION; + typedef enum _PROCESSINFOCLASS { ProcessBasicInformation, ProcessQuotaLimits, @@ -920,6 +1012,26 @@ typedef struct _RTL_USER_PROCESS_PARAMETERS { ThreadHideFromDebugger } THREADINFOCLASS; +#define CODEINTEGRITY_OPTION_ENABLED 0x01 +#define CODEINTEGRITY_OPTION_TESTSIGN 0x02 +#define CODEINTEGRITY_OPTION_UMCI_ENABLED 0x04 +#define CODEINTEGRITY_OPTION_UMCI_AUDITMODE_ENABLED 0x08 +#define CODEINTEGRITY_OPTION_UMCI_EXCLUSIONPATHS_ENABLED 0x10 +#define CODEINTEGRITY_OPTION_TEST_BUILD 0x20 +#define CODEINTEGRITY_OPTION_PREPRODUCTION_BUILD 0x40 +#define CODEINTEGRITY_OPTION_DEBUGMODE_ENABLED 0x80 +#define CODEINTEGRITY_OPTION_FLIGHT_BUILD 0x100 +#define CODEINTEGRITY_OPTION_FLIGHTING_ENABLED 0x200 +#define CODEINTEGRITY_OPTION_HVCI_KMCI_ENABLED 0x400 +#define CODEINTEGRITY_OPTION_HVCI_KMCI_AUDITMODE_ENABLED 0x800 +#define CODEINTEGRITY_OPTION_HVCI_KMCI_STRICTMODE_ENABLED 0x1000 +#define CODEINTEGRITY_OPTION_HVCI_IUM_ENABLED 0x2000 + + typedef struct _SYSTEM_CODEINTEGRITY_INFORMATION { + ULONG Length; + ULONG CodeIntegrityOptions; + } SYSTEM_CODEINTEGRITY_INFORMATION, *PSYSTEM_CODEINTEGRITY_INFORMATION; + typedef enum _SYSTEM_INFORMATION_CLASS { SystemBasicInformation = 0, SystemProcessorInformation = 1, @@ -943,15 +1055,38 @@ typedef struct _RTL_USER_PROCESS_PARAMETERS { ObjectDataInformation } OBJECT_INFORMATION_CLASS, *POBJECT_INFORMATION_CLASS; +#if (_WIN32_WINNT >= 0x0501) #define INTERNAL_TS_ACTIVE_CONSOLE_ID (*((volatile ULONG*)(0x7ffe02d8))) +#endif #define RtlMoveMemory(Destination,Source,Length) memmove((Destination),(Source),(Length)) #define RtlFillMemory(Destination,Length,Fill) memset((Destination),(Fill),(Length)) #define RtlZeroMemory(Destination,Length) memset((Destination),0,(Length)) + typedef struct _KEY_VALUE_ENTRY { + PUNICODE_STRING ValueName; + ULONG DataLength; + ULONG DataOffset; + ULONG Type; + } KEY_VALUE_ENTRY, *PKEY_VALUE_ENTRY; + + typedef enum _KEY_SET_INFORMATION_CLASS { + KeyWriteTimeInformation, + KeyWow64FlagsInformation, + KeyControlFlagsInformation, + KeySetVirtualizationInformation, + KeySetDebugInformation, + KeySetHandleTagsInformation, + MaxKeySetInfoClass + } KEY_SET_INFORMATION_CLASS; + NTSTATUS NTAPI NtClose(HANDLE Handle); NTSTATUS NTAPI NtCreateFile(PHANDLE FileHandle,ACCESS_MASK DesiredAccess,POBJECT_ATTRIBUTES ObjectAttributes,PIO_STATUS_BLOCK IoStatusBlock,PLARGE_INTEGER AllocationSize,ULONG FileAttributes,ULONG ShareAccess,ULONG CreateDisposition,ULONG CreateOptions,PVOID EaBuffer,ULONG EaLength); NTSTATUS NTAPI NtOpenFile(PHANDLE FileHandle,ACCESS_MASK DesiredAccess,POBJECT_ATTRIBUTES ObjectAttributes,PIO_STATUS_BLOCK IoStatusBlock,ULONG ShareAccess,ULONG OpenOptions); + NTSTATUS NTAPI NtRenameKey(HANDLE KeyHandle, PUNICODE_STRING NewName); + NTSTATUS NTAPI NtNotifyChangeMultipleKeys(HANDLE MasterKeyHandle, ULONG Count, OBJECT_ATTRIBUTES SubordinateObjects[], HANDLE Event, PIO_APC_ROUTINE ApcRoutine, PVOID ApcContext, PIO_STATUS_BLOCK IoStatusBlock, ULONG CompletionFilter, BOOLEAN WatchTree, PVOID Buffer, ULONG BufferSize, BOOLEAN Asynchronous); + NTSTATUS NTAPI NtQueryMultipleValueKey(HANDLE KeyHandle, PKEY_VALUE_ENTRY ValueEntries, ULONG EntryCount, PVOID ValueBuffer, PULONG BufferLength, PULONG RequiredBufferLength); + NTSTATUS NTAPI NtSetInformationKey(HANDLE KeyHandle, KEY_SET_INFORMATION_CLASS KeySetInformationClass, PVOID KeySetInformation, ULONG KeySetInformationLength); NTSTATUS NTAPI NtFsControlFile(HANDLE FileHandle,HANDLE Event,PIO_APC_ROUTINE ApcRoutine,PVOID ApcContext,PIO_STATUS_BLOCK IoStatusBlock,ULONG IoControlCode,PVOID InputBuffer,ULONG InputBufferLength,PVOID OutputBuffer,ULONG OutputBufferLength); NTSTATUS NTAPI NtDeviceIoControlFile(HANDLE FileHandle,HANDLE Event,PIO_APC_ROUTINE ApcRoutine,PVOID ApcContext,PIO_STATUS_BLOCK IoStatusBlock,ULONG IoControlCode,PVOID InputBuffer,ULONG InputBufferLength,PVOID OutputBuffer,ULONG OutputBufferLength); NTSTATUS NTAPI NtWaitForSingleObject(HANDLE Handle,BOOLEAN Alertable,PLARGE_INTEGER Timeout); @@ -973,7 +1108,9 @@ typedef struct _RTL_USER_PROCESS_PARAMETERS { VOID NTAPI RtlFreeUnicodeString(PUNICODE_STRING UnicodeString); VOID NTAPI RtlFreeOemString(POEM_STRING OemString); VOID NTAPI RtlInitString (PSTRING DestinationString,PCSZ SourceString); + NTSTATUS NTAPI RtlInitStringEx(PSTRING DestinationString, PCSZ SourceString); VOID NTAPI RtlInitAnsiString(PANSI_STRING DestinationString,PCSZ SourceString); + NTSTATUS NTAPI RtlInitAnsiStringEx(PANSI_STRING DestinationString, PCSZ SourceString); VOID NTAPI RtlInitUnicodeString(PUNICODE_STRING DestinationString,PCWSTR SourceString); NTSTATUS NTAPI RtlAnsiStringToUnicodeString(PUNICODE_STRING DestinationString,PCANSI_STRING SourceString,BOOLEAN AllocateDestinationString); NTSTATUS NTAPI RtlUnicodeStringToAnsiString(PANSI_STRING DestinationString,PCUNICODE_STRING SourceString,BOOLEAN AllocateDestinationString); diff --git a/lib/libc/include/any-windows-any/wmcodecdsp.h b/lib/libc/include/any-windows-any/wmcodecdsp.h index 2f1afb1e91..565a91c212 100644 --- a/lib/libc/include/any-windows-any/wmcodecdsp.h +++ b/lib/libc/include/any-windows-any/wmcodecdsp.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/wmcodecdsp.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/wmcodecdsp.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,6 +21,9 @@ #ifndef __IWMValidate_FWD_DEFINED__ #define __IWMValidate_FWD_DEFINED__ typedef interface IWMValidate IWMValidate; +#ifdef __cplusplus +interface IWMValidate; +#endif /* __cplusplus */ #endif #ifndef __CMpeg4DecMediaObject_FWD_DEFINED__ @@ -748,23 +752,24 @@ typedef struct IWMValidateVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWMValidate* This, + IWMValidate *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWMValidate* This); + IWMValidate *This); ULONG (STDMETHODCALLTYPE *Release)( - IWMValidate* This); + IWMValidate *This); /*** IWMValidate methods ***/ HRESULT (STDMETHODCALLTYPE *SetIdentifier)( - IWMValidate* This, + IWMValidate *This, GUID guidValidationID); END_INTERFACE } IWMValidateVtbl; + interface IWMValidate { CONST_VTBL IWMValidateVtbl* lpVtbl; }; @@ -797,14 +802,6 @@ static FORCEINLINE HRESULT IWMValidate_SetIdentifier(IWMValidate* This,GUID guid #endif -HRESULT STDMETHODCALLTYPE IWMValidate_SetIdentifier_Proxy( - IWMValidate* This, - GUID guidValidationID); -void __RPC_STUB IWMValidate_SetIdentifier_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWMValidate_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/wmcontainer.h b/lib/libc/include/any-windows-any/wmcontainer.h index aee1dba74b..0cf8aa825b 100644 --- a/lib/libc/include/any-windows-any/wmcontainer.h +++ b/lib/libc/include/any-windows-any/wmcontainer.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/wmcontainer.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/wmcontainer.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,51 +21,81 @@ #ifndef __IMFASFContentInfo_FWD_DEFINED__ #define __IMFASFContentInfo_FWD_DEFINED__ typedef interface IMFASFContentInfo IMFASFContentInfo; +#ifdef __cplusplus +interface IMFASFContentInfo; +#endif /* __cplusplus */ #endif #ifndef __IMFASFMutualExclusion_FWD_DEFINED__ #define __IMFASFMutualExclusion_FWD_DEFINED__ typedef interface IMFASFMutualExclusion IMFASFMutualExclusion; +#ifdef __cplusplus +interface IMFASFMutualExclusion; +#endif /* __cplusplus */ #endif #ifndef __IMFASFStreamPrioritization_FWD_DEFINED__ #define __IMFASFStreamPrioritization_FWD_DEFINED__ typedef interface IMFASFStreamPrioritization IMFASFStreamPrioritization; +#ifdef __cplusplus +interface IMFASFStreamPrioritization; +#endif /* __cplusplus */ #endif #ifndef __IMFASFSplitter_FWD_DEFINED__ #define __IMFASFSplitter_FWD_DEFINED__ typedef interface IMFASFSplitter IMFASFSplitter; +#ifdef __cplusplus +interface IMFASFSplitter; +#endif /* __cplusplus */ #endif #ifndef __IMFASFMultiplexer_FWD_DEFINED__ #define __IMFASFMultiplexer_FWD_DEFINED__ typedef interface IMFASFMultiplexer IMFASFMultiplexer; +#ifdef __cplusplus +interface IMFASFMultiplexer; +#endif /* __cplusplus */ #endif #ifndef __IMFASFIndexer_FWD_DEFINED__ #define __IMFASFIndexer_FWD_DEFINED__ typedef interface IMFASFIndexer IMFASFIndexer; +#ifdef __cplusplus +interface IMFASFIndexer; +#endif /* __cplusplus */ #endif #ifndef __IMFASFStreamSelector_FWD_DEFINED__ #define __IMFASFStreamSelector_FWD_DEFINED__ typedef interface IMFASFStreamSelector IMFASFStreamSelector; +#ifdef __cplusplus +interface IMFASFStreamSelector; +#endif /* __cplusplus */ #endif #ifndef __IMFDRMNetHelper_FWD_DEFINED__ #define __IMFDRMNetHelper_FWD_DEFINED__ typedef interface IMFDRMNetHelper IMFDRMNetHelper; +#ifdef __cplusplus +interface IMFDRMNetHelper; +#endif /* __cplusplus */ #endif #ifndef __IMFASFProfile_FWD_DEFINED__ #define __IMFASFProfile_FWD_DEFINED__ typedef interface IMFASFProfile IMFASFProfile; +#ifdef __cplusplus +interface IMFASFProfile; +#endif /* __cplusplus */ #endif #ifndef __IMFASFStreamConfig_FWD_DEFINED__ #define __IMFASFStreamConfig_FWD_DEFINED__ typedef interface IMFASFStreamConfig IMFASFStreamConfig; +#ifdef __cplusplus +interface IMFASFStreamConfig; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -140,21 +171,33 @@ EXTERN_GUID(MF_ASFSTREAMCONFIG_LEAKYBUCKET2, 0xc69b5902, 0xea1a, 0x4c9b, 0xb6, 0 #ifndef __IMFASFProfile_FWD_DEFINED__ #define __IMFASFProfile_FWD_DEFINED__ typedef interface IMFASFProfile IMFASFProfile; +#ifdef __cplusplus +interface IMFASFProfile; +#endif /* __cplusplus */ #endif #ifndef __IMFASFStreamConfig_FWD_DEFINED__ #define __IMFASFStreamConfig_FWD_DEFINED__ typedef interface IMFASFStreamConfig IMFASFStreamConfig; +#ifdef __cplusplus +interface IMFASFStreamConfig; +#endif /* __cplusplus */ #endif #ifndef __IMFASFMutualExclusion_FWD_DEFINED__ #define __IMFASFMutualExclusion_FWD_DEFINED__ typedef interface IMFASFMutualExclusion IMFASFMutualExclusion; +#ifdef __cplusplus +interface IMFASFMutualExclusion; +#endif /* __cplusplus */ #endif #ifndef __IMFASFStreamPrioritization_FWD_DEFINED__ #define __IMFASFStreamPrioritization_FWD_DEFINED__ typedef interface IMFASFStreamPrioritization IMFASFStreamPrioritization; +#ifdef __cplusplus +interface IMFASFStreamPrioritization; +#endif /* __cplusplus */ #endif #define MFASFINDEXER_PER_ENTRY_BYTES_DYNAMIC 0xffff @@ -263,51 +306,52 @@ typedef struct IMFASFContentInfoVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFASFContentInfo* This, + IMFASFContentInfo *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFASFContentInfo* This); + IMFASFContentInfo *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFASFContentInfo* This); + IMFASFContentInfo *This); /*** IMFASFContentInfo methods ***/ HRESULT (STDMETHODCALLTYPE *GetHeaderSize)( - IMFASFContentInfo* This, + IMFASFContentInfo *This, IMFMediaBuffer *pIStartOfContent, QWORD *cbHeaderSize); HRESULT (STDMETHODCALLTYPE *ParseHeader)( - IMFASFContentInfo* This, + IMFASFContentInfo *This, IMFMediaBuffer *pIHeaderBuffer, QWORD cbOffsetWithinHeader); HRESULT (STDMETHODCALLTYPE *GenerateHeader)( - IMFASFContentInfo* This, + IMFASFContentInfo *This, IMFMediaBuffer *pIHeader, DWORD *pcbHeader); HRESULT (STDMETHODCALLTYPE *GetProfile)( - IMFASFContentInfo* This, + IMFASFContentInfo *This, IMFASFProfile **ppIProfile); HRESULT (STDMETHODCALLTYPE *SetProfile)( - IMFASFContentInfo* This, + IMFASFContentInfo *This, IMFASFProfile *pIProfile); HRESULT (STDMETHODCALLTYPE *GeneratePresentationDescriptor)( - IMFASFContentInfo* This, + IMFASFContentInfo *This, IMFPresentationDescriptor **ppIPresentationDescriptor); HRESULT (STDMETHODCALLTYPE *GetEncodingConfigurationPropertyStore)( - IMFASFContentInfo* This, + IMFASFContentInfo *This, WORD wStreamNumber, IPropertyStore **ppIStore); END_INTERFACE } IMFASFContentInfoVtbl; + interface IMFASFContentInfo { CONST_VTBL IMFASFContentInfoVtbl* lpVtbl; }; @@ -364,66 +408,6 @@ static FORCEINLINE HRESULT IMFASFContentInfo_GetEncodingConfigurationPropertySto #endif -HRESULT STDMETHODCALLTYPE IMFASFContentInfo_GetHeaderSize_Proxy( - IMFASFContentInfo* This, - IMFMediaBuffer *pIStartOfContent, - QWORD *cbHeaderSize); -void __RPC_STUB IMFASFContentInfo_GetHeaderSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFContentInfo_ParseHeader_Proxy( - IMFASFContentInfo* This, - IMFMediaBuffer *pIHeaderBuffer, - QWORD cbOffsetWithinHeader); -void __RPC_STUB IMFASFContentInfo_ParseHeader_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFContentInfo_GenerateHeader_Proxy( - IMFASFContentInfo* This, - IMFMediaBuffer *pIHeader, - DWORD *pcbHeader); -void __RPC_STUB IMFASFContentInfo_GenerateHeader_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFContentInfo_GetProfile_Proxy( - IMFASFContentInfo* This, - IMFASFProfile **ppIProfile); -void __RPC_STUB IMFASFContentInfo_GetProfile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFContentInfo_SetProfile_Proxy( - IMFASFContentInfo* This, - IMFASFProfile *pIProfile); -void __RPC_STUB IMFASFContentInfo_SetProfile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFContentInfo_GeneratePresentationDescriptor_Proxy( - IMFASFContentInfo* This, - IMFPresentationDescriptor **ppIPresentationDescriptor); -void __RPC_STUB IMFASFContentInfo_GeneratePresentationDescriptor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFContentInfo_GetEncodingConfigurationPropertyStore_Proxy( - IMFASFContentInfo* This, - WORD wStreamNumber, - IPropertyStore **ppIStore); -void __RPC_STUB IMFASFContentInfo_GetEncodingConfigurationPropertyStore_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFASFContentInfo_INTERFACE_DEFINED__ */ @@ -479,59 +463,60 @@ typedef struct IMFASFMutualExclusionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFASFMutualExclusion* This, + IMFASFMutualExclusion *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFASFMutualExclusion* This); + IMFASFMutualExclusion *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFASFMutualExclusion* This); + IMFASFMutualExclusion *This); /*** IMFASFMutualExclusion methods ***/ HRESULT (STDMETHODCALLTYPE *GetType)( - IMFASFMutualExclusion* This, + IMFASFMutualExclusion *This, GUID *pguidType); HRESULT (STDMETHODCALLTYPE *SetType)( - IMFASFMutualExclusion* This, + IMFASFMutualExclusion *This, REFGUID guidType); HRESULT (STDMETHODCALLTYPE *GetRecordCount)( - IMFASFMutualExclusion* This, + IMFASFMutualExclusion *This, DWORD *pdwRecordCount); HRESULT (STDMETHODCALLTYPE *GetStreamsForRecord)( - IMFASFMutualExclusion* This, + IMFASFMutualExclusion *This, DWORD dwRecordNumber, WORD *pwStreamNumArray, DWORD *pcStreams); HRESULT (STDMETHODCALLTYPE *AddStreamForRecord)( - IMFASFMutualExclusion* This, + IMFASFMutualExclusion *This, DWORD dwRecordNumber, WORD wStreamNumber); HRESULT (STDMETHODCALLTYPE *RemoveStreamFromRecord)( - IMFASFMutualExclusion* This, + IMFASFMutualExclusion *This, DWORD dwRecordNumber, WORD wStreamNumber); HRESULT (STDMETHODCALLTYPE *RemoveRecord)( - IMFASFMutualExclusion* This, + IMFASFMutualExclusion *This, DWORD dwRecordNumber); HRESULT (STDMETHODCALLTYPE *AddRecord)( - IMFASFMutualExclusion* This, + IMFASFMutualExclusion *This, DWORD *pdwRecordNumber); HRESULT (STDMETHODCALLTYPE *Clone)( - IMFASFMutualExclusion* This, + IMFASFMutualExclusion *This, IMFASFMutualExclusion **ppIMutex); END_INTERFACE } IMFASFMutualExclusionVtbl; + interface IMFASFMutualExclusion { CONST_VTBL IMFASFMutualExclusionVtbl* lpVtbl; }; @@ -596,82 +581,6 @@ static FORCEINLINE HRESULT IMFASFMutualExclusion_Clone(IMFASFMutualExclusion* Th #endif -HRESULT STDMETHODCALLTYPE IMFASFMutualExclusion_GetType_Proxy( - IMFASFMutualExclusion* This, - GUID *pguidType); -void __RPC_STUB IMFASFMutualExclusion_GetType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFMutualExclusion_SetType_Proxy( - IMFASFMutualExclusion* This, - REFGUID guidType); -void __RPC_STUB IMFASFMutualExclusion_SetType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFMutualExclusion_GetRecordCount_Proxy( - IMFASFMutualExclusion* This, - DWORD *pdwRecordCount); -void __RPC_STUB IMFASFMutualExclusion_GetRecordCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFMutualExclusion_GetStreamsForRecord_Proxy( - IMFASFMutualExclusion* This, - DWORD dwRecordNumber, - WORD *pwStreamNumArray, - DWORD *pcStreams); -void __RPC_STUB IMFASFMutualExclusion_GetStreamsForRecord_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFMutualExclusion_AddStreamForRecord_Proxy( - IMFASFMutualExclusion* This, - DWORD dwRecordNumber, - WORD wStreamNumber); -void __RPC_STUB IMFASFMutualExclusion_AddStreamForRecord_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFMutualExclusion_RemoveStreamFromRecord_Proxy( - IMFASFMutualExclusion* This, - DWORD dwRecordNumber, - WORD wStreamNumber); -void __RPC_STUB IMFASFMutualExclusion_RemoveStreamFromRecord_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFMutualExclusion_RemoveRecord_Proxy( - IMFASFMutualExclusion* This, - DWORD dwRecordNumber); -void __RPC_STUB IMFASFMutualExclusion_RemoveRecord_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFMutualExclusion_AddRecord_Proxy( - IMFASFMutualExclusion* This, - DWORD *pdwRecordNumber); -void __RPC_STUB IMFASFMutualExclusion_AddRecord_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFMutualExclusion_Clone_Proxy( - IMFASFMutualExclusion* This, - IMFASFMutualExclusion **ppIMutex); -void __RPC_STUB IMFASFMutualExclusion_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFASFMutualExclusion_INTERFACE_DEFINED__ */ @@ -714,42 +623,43 @@ typedef struct IMFASFStreamPrioritizationVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFASFStreamPrioritization* This, + IMFASFStreamPrioritization *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFASFStreamPrioritization* This); + IMFASFStreamPrioritization *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFASFStreamPrioritization* This); + IMFASFStreamPrioritization *This); /*** IMFASFStreamPrioritization methods ***/ HRESULT (STDMETHODCALLTYPE *GetStreamCount)( - IMFASFStreamPrioritization* This, + IMFASFStreamPrioritization *This, DWORD *pdwStreamCount); HRESULT (STDMETHODCALLTYPE *GetStream)( - IMFASFStreamPrioritization* This, + IMFASFStreamPrioritization *This, DWORD dwStreamIndex, WORD *pwStreamNumber, WORD *pwStreamFlags); HRESULT (STDMETHODCALLTYPE *AddStream)( - IMFASFStreamPrioritization* This, + IMFASFStreamPrioritization *This, WORD wStreamNumber, WORD wStreamFlags); HRESULT (STDMETHODCALLTYPE *RemoveStream)( - IMFASFStreamPrioritization* This, + IMFASFStreamPrioritization *This, DWORD dwStreamIndex); HRESULT (STDMETHODCALLTYPE *Clone)( - IMFASFStreamPrioritization* This, + IMFASFStreamPrioritization *This, IMFASFStreamPrioritization **ppIStreamPrioritization); END_INTERFACE } IMFASFStreamPrioritizationVtbl; + interface IMFASFStreamPrioritization { CONST_VTBL IMFASFStreamPrioritizationVtbl* lpVtbl; }; @@ -798,49 +708,6 @@ static FORCEINLINE HRESULT IMFASFStreamPrioritization_Clone(IMFASFStreamPrioriti #endif -HRESULT STDMETHODCALLTYPE IMFASFStreamPrioritization_GetStreamCount_Proxy( - IMFASFStreamPrioritization* This, - DWORD *pdwStreamCount); -void __RPC_STUB IMFASFStreamPrioritization_GetStreamCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamPrioritization_GetStream_Proxy( - IMFASFStreamPrioritization* This, - DWORD dwStreamIndex, - WORD *pwStreamNumber, - WORD *pwStreamFlags); -void __RPC_STUB IMFASFStreamPrioritization_GetStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamPrioritization_AddStream_Proxy( - IMFASFStreamPrioritization* This, - WORD wStreamNumber, - WORD wStreamFlags); -void __RPC_STUB IMFASFStreamPrioritization_AddStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamPrioritization_RemoveStream_Proxy( - IMFASFStreamPrioritization* This, - DWORD dwStreamIndex); -void __RPC_STUB IMFASFStreamPrioritization_RemoveStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamPrioritization_Clone_Proxy( - IMFASFStreamPrioritization* This, - IMFASFStreamPrioritization **ppIStreamPrioritization); -void __RPC_STUB IMFASFStreamPrioritization_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFASFStreamPrioritization_INTERFACE_DEFINED__ */ @@ -898,60 +765,61 @@ typedef struct IMFASFSplitterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFASFSplitter* This, + IMFASFSplitter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFASFSplitter* This); + IMFASFSplitter *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFASFSplitter* This); + IMFASFSplitter *This); /*** IMFASFSplitter methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IMFASFSplitter* This, + IMFASFSplitter *This, IMFASFContentInfo *pIContentInfo); HRESULT (STDMETHODCALLTYPE *SetFlags)( - IMFASFSplitter* This, + IMFASFSplitter *This, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetFlags)( - IMFASFSplitter* This, + IMFASFSplitter *This, DWORD *pdwFlags); HRESULT (STDMETHODCALLTYPE *SelectStreams)( - IMFASFSplitter* This, + IMFASFSplitter *This, WORD *pwStreamNumbers, WORD wNumStreams); HRESULT (STDMETHODCALLTYPE *GetSelectedStreams)( - IMFASFSplitter* This, + IMFASFSplitter *This, WORD *pwStreamNumbers, WORD *pwNumStreams); HRESULT (STDMETHODCALLTYPE *ParseData)( - IMFASFSplitter* This, + IMFASFSplitter *This, IMFMediaBuffer *pIBuffer, DWORD cbBufferOffset, DWORD cbLength); HRESULT (STDMETHODCALLTYPE *GetNextSample)( - IMFASFSplitter* This, + IMFASFSplitter *This, DWORD *pdwStatusFlags, WORD *pwStreamNumber, IMFSample **ppISample); HRESULT (STDMETHODCALLTYPE *Flush)( - IMFASFSplitter* This); + IMFASFSplitter *This); HRESULT (STDMETHODCALLTYPE *GetLastSendTime)( - IMFASFSplitter* This, + IMFASFSplitter *This, DWORD *pdwLastSendTime); END_INTERFACE } IMFASFSplitterVtbl; + interface IMFASFSplitter { CONST_VTBL IMFASFSplitterVtbl* lpVtbl; }; @@ -1016,83 +884,6 @@ static FORCEINLINE HRESULT IMFASFSplitter_GetLastSendTime(IMFASFSplitter* This,D #endif -HRESULT STDMETHODCALLTYPE IMFASFSplitter_Initialize_Proxy( - IMFASFSplitter* This, - IMFASFContentInfo *pIContentInfo); -void __RPC_STUB IMFASFSplitter_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFSplitter_SetFlags_Proxy( - IMFASFSplitter* This, - DWORD dwFlags); -void __RPC_STUB IMFASFSplitter_SetFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFSplitter_GetFlags_Proxy( - IMFASFSplitter* This, - DWORD *pdwFlags); -void __RPC_STUB IMFASFSplitter_GetFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFSplitter_SelectStreams_Proxy( - IMFASFSplitter* This, - WORD *pwStreamNumbers, - WORD wNumStreams); -void __RPC_STUB IMFASFSplitter_SelectStreams_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFSplitter_GetSelectedStreams_Proxy( - IMFASFSplitter* This, - WORD *pwStreamNumbers, - WORD *pwNumStreams); -void __RPC_STUB IMFASFSplitter_GetSelectedStreams_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFSplitter_ParseData_Proxy( - IMFASFSplitter* This, - IMFMediaBuffer *pIBuffer, - DWORD cbBufferOffset, - DWORD cbLength); -void __RPC_STUB IMFASFSplitter_ParseData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFSplitter_GetNextSample_Proxy( - IMFASFSplitter* This, - DWORD *pdwStatusFlags, - WORD *pwStreamNumber, - IMFSample **ppISample); -void __RPC_STUB IMFASFSplitter_GetNextSample_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFSplitter_Flush_Proxy( - IMFASFSplitter* This); -void __RPC_STUB IMFASFSplitter_Flush_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFSplitter_GetLastSendTime_Proxy( - IMFASFSplitter* This, - DWORD *pdwLastSendTime); -void __RPC_STUB IMFASFSplitter_GetLastSendTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFASFSplitter_INTERFACE_DEFINED__ */ @@ -1148,58 +939,59 @@ typedef struct IMFASFMultiplexerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFASFMultiplexer* This, + IMFASFMultiplexer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFASFMultiplexer* This); + IMFASFMultiplexer *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFASFMultiplexer* This); + IMFASFMultiplexer *This); /*** IMFASFMultiplexer methods ***/ HRESULT (STDMETHODCALLTYPE *Initialize)( - IMFASFMultiplexer* This, + IMFASFMultiplexer *This, IMFASFContentInfo *pIContentInfo); HRESULT (STDMETHODCALLTYPE *SetFlags)( - IMFASFMultiplexer* This, + IMFASFMultiplexer *This, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetFlags)( - IMFASFMultiplexer* This, + IMFASFMultiplexer *This, DWORD *pdwFlags); HRESULT (STDMETHODCALLTYPE *ProcessSample)( - IMFASFMultiplexer* This, + IMFASFMultiplexer *This, WORD wStreamNumber, IMFSample *pISample, LONGLONG hnsTimestampAdjust); HRESULT (STDMETHODCALLTYPE *GetNextPacket)( - IMFASFMultiplexer* This, + IMFASFMultiplexer *This, DWORD *pdwStatusFlags, IMFSample **ppIPacket); HRESULT (STDMETHODCALLTYPE *Flush)( - IMFASFMultiplexer* This); + IMFASFMultiplexer *This); HRESULT (STDMETHODCALLTYPE *End)( - IMFASFMultiplexer* This, + IMFASFMultiplexer *This, IMFASFContentInfo *pIContentInfo); HRESULT (STDMETHODCALLTYPE *GetStatistics)( - IMFASFMultiplexer* This, + IMFASFMultiplexer *This, WORD wStreamNumber, ASF_MUX_STATISTICS *pMuxStats); HRESULT (STDMETHODCALLTYPE *SetSyncTolerance)( - IMFASFMultiplexer* This, + IMFASFMultiplexer *This, DWORD msSyncTolerance); END_INTERFACE } IMFASFMultiplexerVtbl; + interface IMFASFMultiplexer { CONST_VTBL IMFASFMultiplexerVtbl* lpVtbl; }; @@ -1264,81 +1056,6 @@ static FORCEINLINE HRESULT IMFASFMultiplexer_SetSyncTolerance(IMFASFMultiplexer* #endif -HRESULT STDMETHODCALLTYPE IMFASFMultiplexer_Initialize_Proxy( - IMFASFMultiplexer* This, - IMFASFContentInfo *pIContentInfo); -void __RPC_STUB IMFASFMultiplexer_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFMultiplexer_SetFlags_Proxy( - IMFASFMultiplexer* This, - DWORD dwFlags); -void __RPC_STUB IMFASFMultiplexer_SetFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFMultiplexer_GetFlags_Proxy( - IMFASFMultiplexer* This, - DWORD *pdwFlags); -void __RPC_STUB IMFASFMultiplexer_GetFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFMultiplexer_ProcessSample_Proxy( - IMFASFMultiplexer* This, - WORD wStreamNumber, - IMFSample *pISample, - LONGLONG hnsTimestampAdjust); -void __RPC_STUB IMFASFMultiplexer_ProcessSample_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFMultiplexer_GetNextPacket_Proxy( - IMFASFMultiplexer* This, - DWORD *pdwStatusFlags, - IMFSample **ppIPacket); -void __RPC_STUB IMFASFMultiplexer_GetNextPacket_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFMultiplexer_Flush_Proxy( - IMFASFMultiplexer* This); -void __RPC_STUB IMFASFMultiplexer_Flush_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFMultiplexer_End_Proxy( - IMFASFMultiplexer* This, - IMFASFContentInfo *pIContentInfo); -void __RPC_STUB IMFASFMultiplexer_End_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFMultiplexer_GetStatistics_Proxy( - IMFASFMultiplexer* This, - WORD wStreamNumber, - ASF_MUX_STATISTICS *pMuxStats); -void __RPC_STUB IMFASFMultiplexer_GetStatistics_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFMultiplexer_SetSyncTolerance_Proxy( - IMFASFMultiplexer* This, - DWORD msSyncTolerance); -void __RPC_STUB IMFASFMultiplexer_SetSyncTolerance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFASFMultiplexer_INTERFACE_DEFINED__ */ @@ -1414,58 +1131,58 @@ typedef struct IMFASFIndexerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFASFIndexer* This, + IMFASFIndexer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFASFIndexer* This); + IMFASFIndexer *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFASFIndexer* This); + IMFASFIndexer *This); /*** IMFASFIndexer methods ***/ HRESULT (STDMETHODCALLTYPE *SetFlags)( - IMFASFIndexer* This, + IMFASFIndexer *This, DWORD dwFlags); HRESULT (STDMETHODCALLTYPE *GetFlags)( - IMFASFIndexer* This, + IMFASFIndexer *This, DWORD *pdwFlags); HRESULT (STDMETHODCALLTYPE *Initialize)( - IMFASFIndexer* This, + IMFASFIndexer *This, IMFASFContentInfo *pIContentInfo); HRESULT (STDMETHODCALLTYPE *GetIndexPosition)( - IMFASFIndexer* This, + IMFASFIndexer *This, IMFASFContentInfo *pIContentInfo, QWORD *pcbIndexOffset); HRESULT (STDMETHODCALLTYPE *SetIndexByteStreams)( - IMFASFIndexer* This, + IMFASFIndexer *This, IMFByteStream **ppIByteStreams, DWORD cByteStreams); HRESULT (STDMETHODCALLTYPE *GetIndexByteStreamCount)( - IMFASFIndexer* This, + IMFASFIndexer *This, DWORD *pcByteStreams); HRESULT (STDMETHODCALLTYPE *GetIndexStatus)( - IMFASFIndexer* This, + IMFASFIndexer *This, ASF_INDEX_IDENTIFIER *pIndexIdentifier, WINBOOL *pfIsIndexed, BYTE *pbIndexDescriptor, DWORD *pcbIndexDescriptor); HRESULT (STDMETHODCALLTYPE *SetIndexStatus)( - IMFASFIndexer* This, + IMFASFIndexer *This, BYTE *pbIndexDescriptor, DWORD cbIndexDescriptor, WINBOOL fGenerateIndex); HRESULT (STDMETHODCALLTYPE *GetSeekPositionForValue)( - IMFASFIndexer* This, + IMFASFIndexer *This, const PROPVARIANT *pvarValue, ASF_INDEX_IDENTIFIER *pIndexIdentifier, QWORD *pcbOffsetWithinData, @@ -1473,24 +1190,25 @@ typedef struct IMFASFIndexerVtbl { DWORD *pdwPayloadNumberOfStreamWithinPacket); HRESULT (STDMETHODCALLTYPE *GenerateIndexEntries)( - IMFASFIndexer* This, + IMFASFIndexer *This, IMFSample *pIASFPacketSample); HRESULT (STDMETHODCALLTYPE *CommitIndex)( - IMFASFIndexer* This, + IMFASFIndexer *This, IMFASFContentInfo *pIContentInfo); HRESULT (STDMETHODCALLTYPE *GetIndexWriteSpace)( - IMFASFIndexer* This, + IMFASFIndexer *This, QWORD *pcbIndexWriteSpace); HRESULT (STDMETHODCALLTYPE *GetCompletedIndex)( - IMFASFIndexer* This, + IMFASFIndexer *This, IMFMediaBuffer *pIIndexBuffer, QWORD cbOffsetWithinIndex); END_INTERFACE } IMFASFIndexerVtbl; + interface IMFASFIndexer { CONST_VTBL IMFASFIndexerVtbl* lpVtbl; }; @@ -1571,122 +1289,6 @@ static FORCEINLINE HRESULT IMFASFIndexer_GetCompletedIndex(IMFASFIndexer* This,I #endif -HRESULT STDMETHODCALLTYPE IMFASFIndexer_SetFlags_Proxy( - IMFASFIndexer* This, - DWORD dwFlags); -void __RPC_STUB IMFASFIndexer_SetFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFIndexer_GetFlags_Proxy( - IMFASFIndexer* This, - DWORD *pdwFlags); -void __RPC_STUB IMFASFIndexer_GetFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFIndexer_Initialize_Proxy( - IMFASFIndexer* This, - IMFASFContentInfo *pIContentInfo); -void __RPC_STUB IMFASFIndexer_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFIndexer_GetIndexPosition_Proxy( - IMFASFIndexer* This, - IMFASFContentInfo *pIContentInfo, - QWORD *pcbIndexOffset); -void __RPC_STUB IMFASFIndexer_GetIndexPosition_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFIndexer_SetIndexByteStreams_Proxy( - IMFASFIndexer* This, - IMFByteStream **ppIByteStreams, - DWORD cByteStreams); -void __RPC_STUB IMFASFIndexer_SetIndexByteStreams_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFIndexer_GetIndexByteStreamCount_Proxy( - IMFASFIndexer* This, - DWORD *pcByteStreams); -void __RPC_STUB IMFASFIndexer_GetIndexByteStreamCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFIndexer_GetIndexStatus_Proxy( - IMFASFIndexer* This, - ASF_INDEX_IDENTIFIER *pIndexIdentifier, - WINBOOL *pfIsIndexed, - BYTE *pbIndexDescriptor, - DWORD *pcbIndexDescriptor); -void __RPC_STUB IMFASFIndexer_GetIndexStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFIndexer_SetIndexStatus_Proxy( - IMFASFIndexer* This, - BYTE *pbIndexDescriptor, - DWORD cbIndexDescriptor, - WINBOOL fGenerateIndex); -void __RPC_STUB IMFASFIndexer_SetIndexStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFIndexer_GetSeekPositionForValue_Proxy( - IMFASFIndexer* This, - const PROPVARIANT *pvarValue, - ASF_INDEX_IDENTIFIER *pIndexIdentifier, - QWORD *pcbOffsetWithinData, - MFTIME *phnsApproxTime, - DWORD *pdwPayloadNumberOfStreamWithinPacket); -void __RPC_STUB IMFASFIndexer_GetSeekPositionForValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFIndexer_GenerateIndexEntries_Proxy( - IMFASFIndexer* This, - IMFSample *pIASFPacketSample); -void __RPC_STUB IMFASFIndexer_GenerateIndexEntries_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFIndexer_CommitIndex_Proxy( - IMFASFIndexer* This, - IMFASFContentInfo *pIContentInfo); -void __RPC_STUB IMFASFIndexer_CommitIndex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFIndexer_GetIndexWriteSpace_Proxy( - IMFASFIndexer* This, - QWORD *pcbIndexWriteSpace); -void __RPC_STUB IMFASFIndexer_GetIndexWriteSpace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFIndexer_GetCompletedIndex_Proxy( - IMFASFIndexer* This, - IMFMediaBuffer *pIIndexBuffer, - QWORD cbOffsetWithinIndex); -void __RPC_STUB IMFASFIndexer_GetCompletedIndex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFASFIndexer_INTERFACE_DEFINED__ */ @@ -1767,89 +1369,90 @@ typedef struct IMFASFStreamSelectorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFASFStreamSelector* This, + IMFASFStreamSelector *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFASFStreamSelector* This); + IMFASFStreamSelector *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFASFStreamSelector* This); + IMFASFStreamSelector *This); /*** IMFASFStreamSelector methods ***/ HRESULT (STDMETHODCALLTYPE *GetStreamCount)( - IMFASFStreamSelector* This, + IMFASFStreamSelector *This, DWORD *pcStreams); HRESULT (STDMETHODCALLTYPE *GetOutputCount)( - IMFASFStreamSelector* This, + IMFASFStreamSelector *This, DWORD *pcOutputs); HRESULT (STDMETHODCALLTYPE *GetOutputStreamCount)( - IMFASFStreamSelector* This, + IMFASFStreamSelector *This, DWORD dwOutputNum, DWORD *pcStreams); HRESULT (STDMETHODCALLTYPE *GetOutputStreamNumbers)( - IMFASFStreamSelector* This, + IMFASFStreamSelector *This, DWORD dwOutputNum, WORD *rgwStreamNumbers); HRESULT (STDMETHODCALLTYPE *GetOutputFromStream)( - IMFASFStreamSelector* This, + IMFASFStreamSelector *This, WORD wStreamNum, DWORD *pdwOutput); HRESULT (STDMETHODCALLTYPE *GetOutputOverride)( - IMFASFStreamSelector* This, + IMFASFStreamSelector *This, DWORD dwOutputNum, ASF_SELECTION_STATUS *pSelection); HRESULT (STDMETHODCALLTYPE *SetOutputOverride)( - IMFASFStreamSelector* This, + IMFASFStreamSelector *This, DWORD dwOutputNum, ASF_SELECTION_STATUS Selection); HRESULT (STDMETHODCALLTYPE *GetOutputMutexCount)( - IMFASFStreamSelector* This, + IMFASFStreamSelector *This, DWORD dwOutputNum, DWORD *pcMutexes); HRESULT (STDMETHODCALLTYPE *GetOutputMutex)( - IMFASFStreamSelector* This, + IMFASFStreamSelector *This, DWORD dwOutputNum, DWORD dwMutexNum, IUnknown **ppMutex); HRESULT (STDMETHODCALLTYPE *SetOutputMutexSelection)( - IMFASFStreamSelector* This, + IMFASFStreamSelector *This, DWORD dwOutputNum, DWORD dwMutexNum, WORD wSelectedRecord); HRESULT (STDMETHODCALLTYPE *GetBandwidthStepCount)( - IMFASFStreamSelector* This, + IMFASFStreamSelector *This, DWORD *pcStepCount); HRESULT (STDMETHODCALLTYPE *GetBandwidthStep)( - IMFASFStreamSelector* This, + IMFASFStreamSelector *This, DWORD dwStepNum, DWORD *pdwBitrate, WORD *rgwStreamNumbers, ASF_SELECTION_STATUS *rgSelections); HRESULT (STDMETHODCALLTYPE *BitrateToStepNumber)( - IMFASFStreamSelector* This, + IMFASFStreamSelector *This, DWORD dwBitrate, DWORD *pdwStepNum); HRESULT (STDMETHODCALLTYPE *SetStreamSelectorFlags)( - IMFASFStreamSelector* This, + IMFASFStreamSelector *This, DWORD dwStreamSelectorFlags); END_INTERFACE } IMFASFStreamSelectorVtbl; + interface IMFASFStreamSelector { CONST_VTBL IMFASFStreamSelectorVtbl* lpVtbl; }; @@ -1934,132 +1537,6 @@ static FORCEINLINE HRESULT IMFASFStreamSelector_SetStreamSelectorFlags(IMFASFStr #endif -HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_GetStreamCount_Proxy( - IMFASFStreamSelector* This, - DWORD *pcStreams); -void __RPC_STUB IMFASFStreamSelector_GetStreamCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_GetOutputCount_Proxy( - IMFASFStreamSelector* This, - DWORD *pcOutputs); -void __RPC_STUB IMFASFStreamSelector_GetOutputCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_GetOutputStreamCount_Proxy( - IMFASFStreamSelector* This, - DWORD dwOutputNum, - DWORD *pcStreams); -void __RPC_STUB IMFASFStreamSelector_GetOutputStreamCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_GetOutputStreamNumbers_Proxy( - IMFASFStreamSelector* This, - DWORD dwOutputNum, - WORD *rgwStreamNumbers); -void __RPC_STUB IMFASFStreamSelector_GetOutputStreamNumbers_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_GetOutputFromStream_Proxy( - IMFASFStreamSelector* This, - WORD wStreamNum, - DWORD *pdwOutput); -void __RPC_STUB IMFASFStreamSelector_GetOutputFromStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_GetOutputOverride_Proxy( - IMFASFStreamSelector* This, - DWORD dwOutputNum, - ASF_SELECTION_STATUS *pSelection); -void __RPC_STUB IMFASFStreamSelector_GetOutputOverride_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_SetOutputOverride_Proxy( - IMFASFStreamSelector* This, - DWORD dwOutputNum, - ASF_SELECTION_STATUS Selection); -void __RPC_STUB IMFASFStreamSelector_SetOutputOverride_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_GetOutputMutexCount_Proxy( - IMFASFStreamSelector* This, - DWORD dwOutputNum, - DWORD *pcMutexes); -void __RPC_STUB IMFASFStreamSelector_GetOutputMutexCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_GetOutputMutex_Proxy( - IMFASFStreamSelector* This, - DWORD dwOutputNum, - DWORD dwMutexNum, - IUnknown **ppMutex); -void __RPC_STUB IMFASFStreamSelector_GetOutputMutex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_SetOutputMutexSelection_Proxy( - IMFASFStreamSelector* This, - DWORD dwOutputNum, - DWORD dwMutexNum, - WORD wSelectedRecord); -void __RPC_STUB IMFASFStreamSelector_SetOutputMutexSelection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_GetBandwidthStepCount_Proxy( - IMFASFStreamSelector* This, - DWORD *pcStepCount); -void __RPC_STUB IMFASFStreamSelector_GetBandwidthStepCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_GetBandwidthStep_Proxy( - IMFASFStreamSelector* This, - DWORD dwStepNum, - DWORD *pdwBitrate, - WORD *rgwStreamNumbers, - ASF_SELECTION_STATUS *rgSelections); -void __RPC_STUB IMFASFStreamSelector_GetBandwidthStep_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_BitrateToStepNumber_Proxy( - IMFASFStreamSelector* This, - DWORD dwBitrate, - DWORD *pdwStepNum); -void __RPC_STUB IMFASFStreamSelector_BitrateToStepNumber_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_SetStreamSelectorFlags_Proxy( - IMFASFStreamSelector* This, - DWORD dwStreamSelectorFlags); -void __RPC_STUB IMFASFStreamSelector_SetStreamSelectorFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFASFStreamSelector_INTERFACE_DEFINED__ */ @@ -2096,19 +1573,19 @@ typedef struct IMFDRMNetHelperVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFDRMNetHelper* This, + IMFDRMNetHelper *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFDRMNetHelper* This); + IMFDRMNetHelper *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFDRMNetHelper* This); + IMFDRMNetHelper *This); /*** IMFDRMNetHelper methods ***/ HRESULT (STDMETHODCALLTYPE *ProcessLicenseRequest)( - IMFDRMNetHelper* This, + IMFDRMNetHelper *This, BYTE *pLicenseRequest, DWORD cbLicenseRequest, BYTE **ppLicenseResponse, @@ -2116,12 +1593,13 @@ typedef struct IMFDRMNetHelperVtbl { BSTR *pbstrKID); HRESULT (STDMETHODCALLTYPE *GetChainedLicenseResponse)( - IMFDRMNetHelper* This, + IMFDRMNetHelper *This, BYTE **ppLicenseResponse, DWORD *pcbLicenseResponse); END_INTERFACE } IMFDRMNetHelperVtbl; + interface IMFDRMNetHelper { CONST_VTBL IMFDRMNetHelperVtbl* lpVtbl; }; @@ -2158,27 +1636,6 @@ static FORCEINLINE HRESULT IMFDRMNetHelper_GetChainedLicenseResponse(IMFDRMNetHe #endif -HRESULT STDMETHODCALLTYPE IMFDRMNetHelper_ProcessLicenseRequest_Proxy( - IMFDRMNetHelper* This, - BYTE *pLicenseRequest, - DWORD cbLicenseRequest, - BYTE **ppLicenseResponse, - DWORD *pcbLicenseResponse, - BSTR *pbstrKID); -void __RPC_STUB IMFDRMNetHelper_ProcessLicenseRequest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFDRMNetHelper_GetChainedLicenseResponse_Proxy( - IMFDRMNetHelper* This, - BYTE **ppLicenseResponse, - DWORD *pcbLicenseResponse); -void __RPC_STUB IMFDRMNetHelper_GetChainedLicenseResponse_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFDRMNetHelper_INTERFACE_DEFINED__ */ @@ -2257,240 +1714,241 @@ typedef struct IMFASFProfileVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFASFProfile* This, + IMFASFProfile *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFASFProfile* This); + IMFASFProfile *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFASFProfile* This); + IMFASFProfile *This); /*** IMFAttributes methods ***/ HRESULT (STDMETHODCALLTYPE *GetItem)( - IMFASFProfile* This, + IMFASFProfile *This, REFGUID guidKey, PROPVARIANT *pValue); HRESULT (STDMETHODCALLTYPE *GetItemType)( - IMFASFProfile* This, + IMFASFProfile *This, REFGUID guidKey, MF_ATTRIBUTE_TYPE *pType); HRESULT (STDMETHODCALLTYPE *CompareItem)( - IMFASFProfile* This, + IMFASFProfile *This, REFGUID guidKey, REFPROPVARIANT Value, WINBOOL *pbResult); HRESULT (STDMETHODCALLTYPE *Compare)( - IMFASFProfile* This, + IMFASFProfile *This, IMFAttributes *pTheirs, MF_ATTRIBUTES_MATCH_TYPE MatchType, WINBOOL *pbResult); HRESULT (STDMETHODCALLTYPE *GetUINT32)( - IMFASFProfile* This, + IMFASFProfile *This, REFGUID guidKey, UINT32 *punValue); HRESULT (STDMETHODCALLTYPE *GetUINT64)( - IMFASFProfile* This, + IMFASFProfile *This, REFGUID guidKey, UINT64 *punValue); HRESULT (STDMETHODCALLTYPE *GetDouble)( - IMFASFProfile* This, + IMFASFProfile *This, REFGUID guidKey, double *pfValue); HRESULT (STDMETHODCALLTYPE *GetGUID)( - IMFASFProfile* This, + IMFASFProfile *This, REFGUID guidKey, GUID *pguidValue); HRESULT (STDMETHODCALLTYPE *GetStringLength)( - IMFASFProfile* This, + IMFASFProfile *This, REFGUID guidKey, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetString)( - IMFASFProfile* This, + IMFASFProfile *This, REFGUID guidKey, LPWSTR pwszValue, UINT32 cchBufSize, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetAllocatedString)( - IMFASFProfile* This, + IMFASFProfile *This, REFGUID guidKey, LPWSTR *ppwszValue, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetBlobSize)( - IMFASFProfile* This, + IMFASFProfile *This, REFGUID guidKey, UINT32 *pcbBlobSize); HRESULT (STDMETHODCALLTYPE *GetBlob)( - IMFASFProfile* This, + IMFASFProfile *This, REFGUID guidKey, UINT8 *pBuf, UINT32 cbBufSize, UINT32 *pcbBlobSize); HRESULT (STDMETHODCALLTYPE *GetAllocatedBlob)( - IMFASFProfile* This, + IMFASFProfile *This, REFGUID guidKey, UINT8 **ppBuf, UINT32 *pcbSize); HRESULT (STDMETHODCALLTYPE *GetUnknown)( - IMFASFProfile* This, + IMFASFProfile *This, REFGUID guidKey, REFIID riid, LPVOID *ppv); HRESULT (STDMETHODCALLTYPE *SetItem)( - IMFASFProfile* This, + IMFASFProfile *This, REFGUID guidKey, REFPROPVARIANT Value); HRESULT (STDMETHODCALLTYPE *DeleteItem)( - IMFASFProfile* This, + IMFASFProfile *This, REFGUID guidKey); HRESULT (STDMETHODCALLTYPE *DeleteAllItems)( - IMFASFProfile* This); + IMFASFProfile *This); HRESULT (STDMETHODCALLTYPE *SetUINT32)( - IMFASFProfile* This, + IMFASFProfile *This, REFGUID guidKey, UINT32 unValue); HRESULT (STDMETHODCALLTYPE *SetUINT64)( - IMFASFProfile* This, + IMFASFProfile *This, REFGUID guidKey, UINT64 unValue); HRESULT (STDMETHODCALLTYPE *SetDouble)( - IMFASFProfile* This, + IMFASFProfile *This, REFGUID guidKey, double fValue); HRESULT (STDMETHODCALLTYPE *SetGUID)( - IMFASFProfile* This, + IMFASFProfile *This, REFGUID guidKey, REFGUID guidValue); HRESULT (STDMETHODCALLTYPE *SetString)( - IMFASFProfile* This, + IMFASFProfile *This, REFGUID guidKey, LPCWSTR wszValue); HRESULT (STDMETHODCALLTYPE *SetBlob)( - IMFASFProfile* This, + IMFASFProfile *This, REFGUID guidKey, const UINT8 *pBuf, UINT32 cbBufSize); HRESULT (STDMETHODCALLTYPE *SetUnknown)( - IMFASFProfile* This, + IMFASFProfile *This, REFGUID guidKey, IUnknown *pUnknown); HRESULT (STDMETHODCALLTYPE *LockStore)( - IMFASFProfile* This); + IMFASFProfile *This); HRESULT (STDMETHODCALLTYPE *UnlockStore)( - IMFASFProfile* This); + IMFASFProfile *This); HRESULT (STDMETHODCALLTYPE *GetCount)( - IMFASFProfile* This, + IMFASFProfile *This, UINT32 *pcItems); HRESULT (STDMETHODCALLTYPE *GetItemByIndex)( - IMFASFProfile* This, + IMFASFProfile *This, UINT32 unIndex, GUID *pguidKey, PROPVARIANT *pValue); HRESULT (STDMETHODCALLTYPE *CopyAllItems)( - IMFASFProfile* This, + IMFASFProfile *This, IMFAttributes *pDest); /*** IMFASFProfile methods ***/ HRESULT (STDMETHODCALLTYPE *GetStreamCount)( - IMFASFProfile* This, + IMFASFProfile *This, DWORD *pcStreams); HRESULT (STDMETHODCALLTYPE *GetStream)( - IMFASFProfile* This, + IMFASFProfile *This, DWORD dwStreamIndex, WORD *pwStreamNumber, IMFASFStreamConfig **ppIStream); HRESULT (STDMETHODCALLTYPE *GetStreamByNumber)( - IMFASFProfile* This, + IMFASFProfile *This, WORD wStreamNumber, IMFASFStreamConfig **ppIStream); HRESULT (STDMETHODCALLTYPE *SetStream)( - IMFASFProfile* This, + IMFASFProfile *This, IMFASFStreamConfig *pIStream); HRESULT (STDMETHODCALLTYPE *RemoveStream)( - IMFASFProfile* This, + IMFASFProfile *This, WORD wStreamNumber); HRESULT (STDMETHODCALLTYPE *CreateStream)( - IMFASFProfile* This, + IMFASFProfile *This, IMFMediaType *pIMediaType, IMFASFStreamConfig **ppIStream); HRESULT (STDMETHODCALLTYPE *GetMutualExclusionCount)( - IMFASFProfile* This, + IMFASFProfile *This, DWORD *pcMutexs); HRESULT (STDMETHODCALLTYPE *GetMutualExclusion)( - IMFASFProfile* This, + IMFASFProfile *This, DWORD dwMutexIndex, IMFASFMutualExclusion **ppIMutex); HRESULT (STDMETHODCALLTYPE *AddMutualExclusion)( - IMFASFProfile* This, + IMFASFProfile *This, IMFASFMutualExclusion *pIMutex); HRESULT (STDMETHODCALLTYPE *RemoveMutualExclusion)( - IMFASFProfile* This, + IMFASFProfile *This, DWORD dwMutexIndex); HRESULT (STDMETHODCALLTYPE *CreateMutualExclusion)( - IMFASFProfile* This, + IMFASFProfile *This, IMFASFMutualExclusion **ppIMutex); HRESULT (STDMETHODCALLTYPE *GetStreamPrioritization)( - IMFASFProfile* This, + IMFASFProfile *This, IMFASFStreamPrioritization **ppIStreamPrioritization); HRESULT (STDMETHODCALLTYPE *AddStreamPrioritization)( - IMFASFProfile* This, + IMFASFProfile *This, IMFASFStreamPrioritization *pIStreamPrioritization); HRESULT (STDMETHODCALLTYPE *RemoveStreamPrioritization)( - IMFASFProfile* This); + IMFASFProfile *This); HRESULT (STDMETHODCALLTYPE *CreateStreamPrioritization)( - IMFASFProfile* This, + IMFASFProfile *This, IMFASFStreamPrioritization **ppIStreamPrioritization); HRESULT (STDMETHODCALLTYPE *Clone)( - IMFASFProfile* This, + IMFASFProfile *This, IMFASFProfile **ppIProfile); END_INTERFACE } IMFASFProfileVtbl; + interface IMFASFProfile { CONST_VTBL IMFASFProfileVtbl* lpVtbl; }; @@ -2705,138 +2163,6 @@ static FORCEINLINE HRESULT IMFASFProfile_Clone(IMFASFProfile* This,IMFASFProfile #endif -HRESULT STDMETHODCALLTYPE IMFASFProfile_GetStreamCount_Proxy( - IMFASFProfile* This, - DWORD *pcStreams); -void __RPC_STUB IMFASFProfile_GetStreamCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFProfile_GetStream_Proxy( - IMFASFProfile* This, - DWORD dwStreamIndex, - WORD *pwStreamNumber, - IMFASFStreamConfig **ppIStream); -void __RPC_STUB IMFASFProfile_GetStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFProfile_GetStreamByNumber_Proxy( - IMFASFProfile* This, - WORD wStreamNumber, - IMFASFStreamConfig **ppIStream); -void __RPC_STUB IMFASFProfile_GetStreamByNumber_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFProfile_SetStream_Proxy( - IMFASFProfile* This, - IMFASFStreamConfig *pIStream); -void __RPC_STUB IMFASFProfile_SetStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFProfile_RemoveStream_Proxy( - IMFASFProfile* This, - WORD wStreamNumber); -void __RPC_STUB IMFASFProfile_RemoveStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFProfile_CreateStream_Proxy( - IMFASFProfile* This, - IMFMediaType *pIMediaType, - IMFASFStreamConfig **ppIStream); -void __RPC_STUB IMFASFProfile_CreateStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFProfile_GetMutualExclusionCount_Proxy( - IMFASFProfile* This, - DWORD *pcMutexs); -void __RPC_STUB IMFASFProfile_GetMutualExclusionCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFProfile_GetMutualExclusion_Proxy( - IMFASFProfile* This, - DWORD dwMutexIndex, - IMFASFMutualExclusion **ppIMutex); -void __RPC_STUB IMFASFProfile_GetMutualExclusion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFProfile_AddMutualExclusion_Proxy( - IMFASFProfile* This, - IMFASFMutualExclusion *pIMutex); -void __RPC_STUB IMFASFProfile_AddMutualExclusion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFProfile_RemoveMutualExclusion_Proxy( - IMFASFProfile* This, - DWORD dwMutexIndex); -void __RPC_STUB IMFASFProfile_RemoveMutualExclusion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFProfile_CreateMutualExclusion_Proxy( - IMFASFProfile* This, - IMFASFMutualExclusion **ppIMutex); -void __RPC_STUB IMFASFProfile_CreateMutualExclusion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFProfile_GetStreamPrioritization_Proxy( - IMFASFProfile* This, - IMFASFStreamPrioritization **ppIStreamPrioritization); -void __RPC_STUB IMFASFProfile_GetStreamPrioritization_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFProfile_AddStreamPrioritization_Proxy( - IMFASFProfile* This, - IMFASFStreamPrioritization *pIStreamPrioritization); -void __RPC_STUB IMFASFProfile_AddStreamPrioritization_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFProfile_RemoveStreamPrioritization_Proxy( - IMFASFProfile* This); -void __RPC_STUB IMFASFProfile_RemoveStreamPrioritization_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFProfile_CreateStreamPrioritization_Proxy( - IMFASFProfile* This, - IMFASFStreamPrioritization **ppIStreamPrioritization); -void __RPC_STUB IMFASFProfile_CreateStreamPrioritization_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFProfile_Clone_Proxy( - IMFASFProfile* This, - IMFASFProfile **ppIProfile); -void __RPC_STUB IMFASFProfile_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFASFProfile_INTERFACE_DEFINED__ */ @@ -2898,195 +2224,195 @@ typedef struct IMFASFStreamConfigVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IMFASFStreamConfig* This); + IMFASFStreamConfig *This); ULONG (STDMETHODCALLTYPE *Release)( - IMFASFStreamConfig* This); + IMFASFStreamConfig *This); /*** IMFAttributes methods ***/ HRESULT (STDMETHODCALLTYPE *GetItem)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, REFGUID guidKey, PROPVARIANT *pValue); HRESULT (STDMETHODCALLTYPE *GetItemType)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, REFGUID guidKey, MF_ATTRIBUTE_TYPE *pType); HRESULT (STDMETHODCALLTYPE *CompareItem)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, REFGUID guidKey, REFPROPVARIANT Value, WINBOOL *pbResult); HRESULT (STDMETHODCALLTYPE *Compare)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, IMFAttributes *pTheirs, MF_ATTRIBUTES_MATCH_TYPE MatchType, WINBOOL *pbResult); HRESULT (STDMETHODCALLTYPE *GetUINT32)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, REFGUID guidKey, UINT32 *punValue); HRESULT (STDMETHODCALLTYPE *GetUINT64)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, REFGUID guidKey, UINT64 *punValue); HRESULT (STDMETHODCALLTYPE *GetDouble)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, REFGUID guidKey, double *pfValue); HRESULT (STDMETHODCALLTYPE *GetGUID)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, REFGUID guidKey, GUID *pguidValue); HRESULT (STDMETHODCALLTYPE *GetStringLength)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, REFGUID guidKey, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetString)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, REFGUID guidKey, LPWSTR pwszValue, UINT32 cchBufSize, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetAllocatedString)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, REFGUID guidKey, LPWSTR *ppwszValue, UINT32 *pcchLength); HRESULT (STDMETHODCALLTYPE *GetBlobSize)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, REFGUID guidKey, UINT32 *pcbBlobSize); HRESULT (STDMETHODCALLTYPE *GetBlob)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, REFGUID guidKey, UINT8 *pBuf, UINT32 cbBufSize, UINT32 *pcbBlobSize); HRESULT (STDMETHODCALLTYPE *GetAllocatedBlob)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, REFGUID guidKey, UINT8 **ppBuf, UINT32 *pcbSize); HRESULT (STDMETHODCALLTYPE *GetUnknown)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, REFGUID guidKey, REFIID riid, LPVOID *ppv); HRESULT (STDMETHODCALLTYPE *SetItem)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, REFGUID guidKey, REFPROPVARIANT Value); HRESULT (STDMETHODCALLTYPE *DeleteItem)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, REFGUID guidKey); HRESULT (STDMETHODCALLTYPE *DeleteAllItems)( - IMFASFStreamConfig* This); + IMFASFStreamConfig *This); HRESULT (STDMETHODCALLTYPE *SetUINT32)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, REFGUID guidKey, UINT32 unValue); HRESULT (STDMETHODCALLTYPE *SetUINT64)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, REFGUID guidKey, UINT64 unValue); HRESULT (STDMETHODCALLTYPE *SetDouble)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, REFGUID guidKey, double fValue); HRESULT (STDMETHODCALLTYPE *SetGUID)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, REFGUID guidKey, REFGUID guidValue); HRESULT (STDMETHODCALLTYPE *SetString)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, REFGUID guidKey, LPCWSTR wszValue); HRESULT (STDMETHODCALLTYPE *SetBlob)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, REFGUID guidKey, const UINT8 *pBuf, UINT32 cbBufSize); HRESULT (STDMETHODCALLTYPE *SetUnknown)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, REFGUID guidKey, IUnknown *pUnknown); HRESULT (STDMETHODCALLTYPE *LockStore)( - IMFASFStreamConfig* This); + IMFASFStreamConfig *This); HRESULT (STDMETHODCALLTYPE *UnlockStore)( - IMFASFStreamConfig* This); + IMFASFStreamConfig *This); HRESULT (STDMETHODCALLTYPE *GetCount)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, UINT32 *pcItems); HRESULT (STDMETHODCALLTYPE *GetItemByIndex)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, UINT32 unIndex, GUID *pguidKey, PROPVARIANT *pValue); HRESULT (STDMETHODCALLTYPE *CopyAllItems)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, IMFAttributes *pDest); /*** IMFASFStreamConfig methods ***/ HRESULT (STDMETHODCALLTYPE *GetStreamType)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, GUID *pguidStreamType); WORD (STDMETHODCALLTYPE *GetStreamNumber)( - IMFASFStreamConfig* This); + IMFASFStreamConfig *This); HRESULT (STDMETHODCALLTYPE *SetStreamNumber)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, WORD wStreamNum); HRESULT (STDMETHODCALLTYPE *GetMediaType)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, IMFMediaType **ppIMediaType); HRESULT (STDMETHODCALLTYPE *SetMediaType)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, IMFMediaType *pIMediaType); HRESULT (STDMETHODCALLTYPE *GetPayloadExtensionCount)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, WORD *pcPayloadExtensions); HRESULT (STDMETHODCALLTYPE *GetPayloadExtension)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, WORD wPayloadExtensionNumber, GUID *pguidExtensionSystemID, WORD *pcbExtensionDataSize, @@ -3094,21 +2420,22 @@ typedef struct IMFASFStreamConfigVtbl { DWORD *pcbExtensionSystemInfo); HRESULT (STDMETHODCALLTYPE *AddPayloadExtension)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, GUID guidExtensionSystemID, WORD cbExtensionDataSize, BYTE *pbExtensionSystemInfo, DWORD cbExtensionSystemInfo); HRESULT (STDMETHODCALLTYPE *RemoveAllPayloadExtensions)( - IMFASFStreamConfig* This); + IMFASFStreamConfig *This); HRESULT (STDMETHODCALLTYPE *Clone)( - IMFASFStreamConfig* This, + IMFASFStreamConfig *This, IMFASFStreamConfig **ppIStreamConfig); END_INTERFACE } IMFASFStreamConfigVtbl; + interface IMFASFStreamConfig { CONST_VTBL IMFASFStreamConfigVtbl* lpVtbl; }; @@ -3299,91 +2626,6 @@ static FORCEINLINE HRESULT IMFASFStreamConfig_Clone(IMFASFStreamConfig* This,IMF #endif -HRESULT STDMETHODCALLTYPE IMFASFStreamConfig_GetStreamType_Proxy( - IMFASFStreamConfig* This, - GUID *pguidStreamType); -void __RPC_STUB IMFASFStreamConfig_GetStreamType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -WORD STDMETHODCALLTYPE IMFASFStreamConfig_GetStreamNumber_Proxy( - IMFASFStreamConfig* This); -void __RPC_STUB IMFASFStreamConfig_GetStreamNumber_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamConfig_SetStreamNumber_Proxy( - IMFASFStreamConfig* This, - WORD wStreamNum); -void __RPC_STUB IMFASFStreamConfig_SetStreamNumber_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamConfig_GetMediaType_Proxy( - IMFASFStreamConfig* This, - IMFMediaType **ppIMediaType); -void __RPC_STUB IMFASFStreamConfig_GetMediaType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamConfig_SetMediaType_Proxy( - IMFASFStreamConfig* This, - IMFMediaType *pIMediaType); -void __RPC_STUB IMFASFStreamConfig_SetMediaType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamConfig_GetPayloadExtensionCount_Proxy( - IMFASFStreamConfig* This, - WORD *pcPayloadExtensions); -void __RPC_STUB IMFASFStreamConfig_GetPayloadExtensionCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamConfig_GetPayloadExtension_Proxy( - IMFASFStreamConfig* This, - WORD wPayloadExtensionNumber, - GUID *pguidExtensionSystemID, - WORD *pcbExtensionDataSize, - BYTE *pbExtensionSystemInfo, - DWORD *pcbExtensionSystemInfo); -void __RPC_STUB IMFASFStreamConfig_GetPayloadExtension_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamConfig_AddPayloadExtension_Proxy( - IMFASFStreamConfig* This, - GUID guidExtensionSystemID, - WORD cbExtensionDataSize, - BYTE *pbExtensionSystemInfo, - DWORD cbExtensionSystemInfo); -void __RPC_STUB IMFASFStreamConfig_AddPayloadExtension_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamConfig_RemoveAllPayloadExtensions_Proxy( - IMFASFStreamConfig* This); -void __RPC_STUB IMFASFStreamConfig_RemoveAllPayloadExtensions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IMFASFStreamConfig_Clone_Proxy( - IMFASFStreamConfig* This, - IMFASFStreamConfig **ppIStreamConfig); -void __RPC_STUB IMFASFStreamConfig_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IMFASFStreamConfig_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/wmdrmsdk.h b/lib/libc/include/any-windows-any/wmdrmsdk.h index 471998aa9a..0dcdd49e68 100644 --- a/lib/libc/include/any-windows-any/wmdrmsdk.h +++ b/lib/libc/include/any-windows-any/wmdrmsdk.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/wmdrmsdk.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from include/wmdrmsdk.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/wmistr.h b/lib/libc/include/any-windows-any/wmistr.h index 9ae567aac6..c51c1320b9 100644 --- a/lib/libc/include/any-windows-any/wmistr.h +++ b/lib/libc/include/any-windows-any/wmistr.h @@ -48,6 +48,7 @@ typedef struct _WNODE_HEADER { #if NTDDI_VERSION >= 0x06000000 #define WNODE_FLAG_SEND_DATA_BLOCK 0x00400000 #endif +#define WNODE_FLAG_VERSIONED_PROPERTIES 0x00800000 #define WNODE_FLAG_SEVERITY_MASK 0xff000000 typedef struct { @@ -178,8 +179,19 @@ typedef enum { #define TRACELOG_LOG_EVENT 0x0200 #define TRACELOG_ACCESS_REALTIME 0x0400 #define TRACELOG_REGISTER_GUIDS 0x0800 +#define TRACELOG_JOIN_GROUP 0x1000 -#define WMIGUID_ALL_ACCESS (STANDARD_RIGHTS_READ | SYNCHRONIZE | WMIGUID_QUERY | WMIGUID_SET | WMIGUID_NOTIFICATION | WMIGUID_READ_DESCRIPTION | WMIGUID_EXECUTE | TRACELOG_CREATE_REALTIME | TRACELOG_CREATE_ONDISK | TRACELOG_GUID_ENABLE | TRACELOG_ACCESS_KERNEL_LOGGER | TRACELOG_CREATE_INPROC | TRACELOG_ACCESS_REALTIME | TRACELOG_REGISTER_GUIDS) +#define WMIGUID_ALL_ACCESS_WIN2K (STANDARD_RIGHTS_READ | WMIGUID_QUERY | WMIGUID_SET | WMIGUID_NOTIFICATION | WMIGUID_READ_DESCRIPTION | WMIGUID_EXECUTE | TRACELOG_CREATE_REALTIME | TRACELOG_CREATE_ONDISK | TRACELOG_GUID_ENABLE | TRACELOG_ACCESS_KERNEL_LOGGER | TRACELOG_CREATE_INPROC | TRACELOG_ACCESS_REALTIME) +#define WMIGUID_ALL_ACCESS_WINXP (WMIGUID_ALL_ACCESS_WIN2K | SYNCHRONIZE | TRACELOG_REGISTER_GUIDS) +#define WMIGUID_ALL_ACCESS_RS1 (WMIGUID_ALL_ACCESS_WINXP | TRACELOG_JOIN_GROUP) + +#if (NTDDI_VERSION >= 0x0A000002) +#define WMIGUID_ALL_ACCESS WMIGUID_ALL_ACCESS_RS1 +#elif (NTDDI_VERSION >= 0x05010000) +#define WMIGUID_ALL_ACCESS WMIGUID_ALL_ACCESS_WINXP +#else +#define WMIGUID_ALL_ACCESS WMIGUID_ALL_ACCESS_WIN2K +#endif #define WMI_GLOBAL_LOGGER_ID 0x0001 #endif diff --git a/lib/libc/include/any-windows-any/wmsbuffer.h b/lib/libc/include/any-windows-any/wmsbuffer.h index 2ef994890b..1406369967 100644 --- a/lib/libc/include/any-windows-any/wmsbuffer.h +++ b/lib/libc/include/any-windows-any/wmsbuffer.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/wmsbuffer.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from include/wmsbuffer.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/wmsdkidl.h b/lib/libc/include/any-windows-any/wmsdkidl.h index 29f1f1d648..4fb5302b7b 100644 --- a/lib/libc/include/any-windows-any/wmsdkidl.h +++ b/lib/libc/include/any-windows-any/wmsdkidl.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/wmsdkidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from include/wmsdkidl.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -233,6 +234,22 @@ interface IWMSyncReader; #endif /* __cplusplus */ #endif +#ifndef __IWMReaderAllocatorEx_FWD_DEFINED__ +#define __IWMReaderAllocatorEx_FWD_DEFINED__ +typedef interface IWMReaderAllocatorEx IWMReaderAllocatorEx; +#ifdef __cplusplus +interface IWMReaderAllocatorEx; +#endif /* __cplusplus */ +#endif + +#ifndef __IWMSyncReader2_FWD_DEFINED__ +#define __IWMSyncReader2_FWD_DEFINED__ +typedef interface IWMSyncReader2 IWMSyncReader2; +#ifdef __cplusplus +interface IWMSyncReader2; +#endif /* __cplusplus */ +#endif + #ifndef __IWMInputMediaProps_FWD_DEFINED__ #define __IWMInputMediaProps_FWD_DEFINED__ typedef interface IWMInputMediaProps IWMInputMediaProps; @@ -425,6 +442,22 @@ interface IWMWriterPreprocess; #endif /* __cplusplus */ #endif +#ifndef __IWMLicenseBackup_FWD_DEFINED__ +#define __IWMLicenseBackup_FWD_DEFINED__ +typedef interface IWMLicenseBackup IWMLicenseBackup; +#ifdef __cplusplus +interface IWMLicenseBackup; +#endif /* __cplusplus */ +#endif + +#ifndef __IWMLicenseRestore_FWD_DEFINED__ +#define __IWMLicenseRestore_FWD_DEFINED__ +typedef interface IWMLicenseRestore IWMLicenseRestore; +#ifdef __cplusplus +interface IWMLicenseRestore; +#endif /* __cplusplus */ +#endif + /* Headers for imported files */ #include @@ -594,6 +627,12 @@ typedef struct _WMStreamPrioritizationRecord { WORD wStreamNumber; WINBOOL fMandatory; } WM_STREAM_PRIORITY_RECORD; +typedef struct _WMT_TIMECODE_EXTENSION_DATA { + WORD wRange; + DWORD dwTimecode; + DWORD dwUserbits; + DWORD dwAmFlags; +} WMT_TIMECODE_EXTENSION_DATA; typedef struct _WM_PORT_NUMBER_RANGE { WORD wPortBegin; WORD wPortEnd; @@ -6697,6 +6736,469 @@ static FORCEINLINE HRESULT IWMSyncReader_OpenStream(IWMSyncReader* This,IStream #endif /* __IWMSyncReader_INTERFACE_DEFINED__ */ +/***************************************************************************** + * IWMReaderAllocatorEx interface + */ +#ifndef __IWMReaderAllocatorEx_INTERFACE_DEFINED__ +#define __IWMReaderAllocatorEx_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IWMReaderAllocatorEx, 0x9f762fa7, 0xa22e, 0x428d, 0x93,0xc9, 0xac,0x82,0xf3,0xaa,0xfe,0x5a); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("9f762fa7-a22e-428d-93c9-ac82f3aafe5a") +IWMReaderAllocatorEx : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE AllocateForStreamEx( + WORD wStreamNum, + DWORD cbBuffer, + INSSBuffer **ppBuffer, + DWORD dwFlags, + QWORD cnsSampleTime, + QWORD cnsSampleDuration, + void *pvContext) = 0; + + virtual HRESULT STDMETHODCALLTYPE AllocateForOutputEx( + WORD wOutputNum, + DWORD cbBuffer, + INSSBuffer **ppBuffer, + DWORD dwFlags, + QWORD cnsSampleTime, + QWORD cnsSampleDuration, + void *pvContext) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IWMReaderAllocatorEx, 0x9f762fa7, 0xa22e, 0x428d, 0x93,0xc9, 0xac,0x82,0xf3,0xaa,0xfe,0x5a) +#endif +#else +typedef struct IWMReaderAllocatorExVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IWMReaderAllocatorEx *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IWMReaderAllocatorEx *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IWMReaderAllocatorEx *This); + + /*** IWMReaderAllocatorEx methods ***/ + HRESULT (STDMETHODCALLTYPE *AllocateForStreamEx)( + IWMReaderAllocatorEx *This, + WORD wStreamNum, + DWORD cbBuffer, + INSSBuffer **ppBuffer, + DWORD dwFlags, + QWORD cnsSampleTime, + QWORD cnsSampleDuration, + void *pvContext); + + HRESULT (STDMETHODCALLTYPE *AllocateForOutputEx)( + IWMReaderAllocatorEx *This, + WORD wOutputNum, + DWORD cbBuffer, + INSSBuffer **ppBuffer, + DWORD dwFlags, + QWORD cnsSampleTime, + QWORD cnsSampleDuration, + void *pvContext); + + END_INTERFACE +} IWMReaderAllocatorExVtbl; + +interface IWMReaderAllocatorEx { + CONST_VTBL IWMReaderAllocatorExVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IWMReaderAllocatorEx_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IWMReaderAllocatorEx_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IWMReaderAllocatorEx_Release(This) (This)->lpVtbl->Release(This) +/*** IWMReaderAllocatorEx methods ***/ +#define IWMReaderAllocatorEx_AllocateForStreamEx(This,wStreamNum,cbBuffer,ppBuffer,dwFlags,cnsSampleTime,cnsSampleDuration,pvContext) (This)->lpVtbl->AllocateForStreamEx(This,wStreamNum,cbBuffer,ppBuffer,dwFlags,cnsSampleTime,cnsSampleDuration,pvContext) +#define IWMReaderAllocatorEx_AllocateForOutputEx(This,wOutputNum,cbBuffer,ppBuffer,dwFlags,cnsSampleTime,cnsSampleDuration,pvContext) (This)->lpVtbl->AllocateForOutputEx(This,wOutputNum,cbBuffer,ppBuffer,dwFlags,cnsSampleTime,cnsSampleDuration,pvContext) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT IWMReaderAllocatorEx_QueryInterface(IWMReaderAllocatorEx* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG IWMReaderAllocatorEx_AddRef(IWMReaderAllocatorEx* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG IWMReaderAllocatorEx_Release(IWMReaderAllocatorEx* This) { + return This->lpVtbl->Release(This); +} +/*** IWMReaderAllocatorEx methods ***/ +static FORCEINLINE HRESULT IWMReaderAllocatorEx_AllocateForStreamEx(IWMReaderAllocatorEx* This,WORD wStreamNum,DWORD cbBuffer,INSSBuffer **ppBuffer,DWORD dwFlags,QWORD cnsSampleTime,QWORD cnsSampleDuration,void *pvContext) { + return This->lpVtbl->AllocateForStreamEx(This,wStreamNum,cbBuffer,ppBuffer,dwFlags,cnsSampleTime,cnsSampleDuration,pvContext); +} +static FORCEINLINE HRESULT IWMReaderAllocatorEx_AllocateForOutputEx(IWMReaderAllocatorEx* This,WORD wOutputNum,DWORD cbBuffer,INSSBuffer **ppBuffer,DWORD dwFlags,QWORD cnsSampleTime,QWORD cnsSampleDuration,void *pvContext) { + return This->lpVtbl->AllocateForOutputEx(This,wOutputNum,cbBuffer,ppBuffer,dwFlags,cnsSampleTime,cnsSampleDuration,pvContext); +} +#endif +#endif + +#endif + + +#endif /* __IWMReaderAllocatorEx_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * IWMSyncReader2 interface + */ +#ifndef __IWMSyncReader2_INTERFACE_DEFINED__ +#define __IWMSyncReader2_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IWMSyncReader2, 0xfaed3d21, 0x1b6b, 0x4af7, 0x8b,0xc6, 0x3e,0x18,0x9b,0xbc,0x18,0x7b); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("faed3d21-1b6b-4af7-8bc6-3e189bbc187b") +IWMSyncReader2 : public IWMSyncReader +{ + virtual HRESULT STDMETHODCALLTYPE SetRangeByTimecode( + WORD wStreamNum, + WMT_TIMECODE_EXTENSION_DATA *pStart, + WMT_TIMECODE_EXTENSION_DATA *pEnd) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetRangeByFrameEx( + WORD wStreamNum, + QWORD qwFrameNumber, + LONGLONG cFramesToRead, + QWORD *pcnsStartTime) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetAllocateForOutput( + DWORD dwOutputNum, + IWMReaderAllocatorEx *pAllocator) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetAllocateForOutput( + DWORD dwOutputNum, + IWMReaderAllocatorEx **ppAllocator) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetAllocateForStream( + DWORD dwStreamNum, + IWMReaderAllocatorEx *pAllocator) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetAllocateForStream( + DWORD dwStreamNum, + IWMReaderAllocatorEx **ppAllocator) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IWMSyncReader2, 0xfaed3d21, 0x1b6b, 0x4af7, 0x8b,0xc6, 0x3e,0x18,0x9b,0xbc,0x18,0x7b) +#endif +#else +typedef struct IWMSyncReader2Vtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IWMSyncReader2 *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IWMSyncReader2 *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IWMSyncReader2 *This); + + /*** IWMSyncReader methods ***/ + HRESULT (STDMETHODCALLTYPE *Open)( + IWMSyncReader2 *This, + const WCHAR *pwszFilename); + + HRESULT (STDMETHODCALLTYPE *Close)( + IWMSyncReader2 *This); + + HRESULT (STDMETHODCALLTYPE *SetRange)( + IWMSyncReader2 *This, + QWORD cnsStartTime, + LONGLONG cnsDuration); + + HRESULT (STDMETHODCALLTYPE *SetRangeByFrame)( + IWMSyncReader2 *This, + WORD wStreamNum, + QWORD qwFrameNumber, + LONGLONG cFramesToRead); + + HRESULT (STDMETHODCALLTYPE *GetNextSample)( + IWMSyncReader2 *This, + WORD wStreamNum, + INSSBuffer **ppSample, + QWORD *pcnsSampleTime, + QWORD *pcnsDuration, + DWORD *pdwFlags, + DWORD *pdwOutputNum, + WORD *pwStreamNum); + + HRESULT (STDMETHODCALLTYPE *SetStreamsSelected)( + IWMSyncReader2 *This, + WORD cStreamCount, + WORD *pwStreamNumbers, + WMT_STREAM_SELECTION *pSelections); + + HRESULT (STDMETHODCALLTYPE *GetStreamSelected)( + IWMSyncReader2 *This, + WORD wStreamNum, + WMT_STREAM_SELECTION *pSelection); + + HRESULT (STDMETHODCALLTYPE *SetReadStreamSamples)( + IWMSyncReader2 *This, + WORD wStreamNum, + WINBOOL fCompressed); + + HRESULT (STDMETHODCALLTYPE *GetReadStreamSamples)( + IWMSyncReader2 *This, + WORD wStreamNum, + WINBOOL *pfCompressed); + + HRESULT (STDMETHODCALLTYPE *GetOutputSetting)( + IWMSyncReader2 *This, + DWORD dwOutputNum, + LPCWSTR pszName, + WMT_ATTR_DATATYPE *pType, + BYTE *pValue, + WORD *pcbLength); + + HRESULT (STDMETHODCALLTYPE *SetOutputSetting)( + IWMSyncReader2 *This, + DWORD dwOutputNum, + LPCWSTR pszName, + WMT_ATTR_DATATYPE Type, + const BYTE *pValue, + WORD cbLength); + + HRESULT (STDMETHODCALLTYPE *GetOutputCount)( + IWMSyncReader2 *This, + DWORD *pcOutputs); + + HRESULT (STDMETHODCALLTYPE *GetOutputProps)( + IWMSyncReader2 *This, + DWORD dwOutputNum, + IWMOutputMediaProps **ppOutput); + + HRESULT (STDMETHODCALLTYPE *SetOutputProps)( + IWMSyncReader2 *This, + DWORD dwOutputNum, + IWMOutputMediaProps *pOutput); + + HRESULT (STDMETHODCALLTYPE *GetOutputFormatCount)( + IWMSyncReader2 *This, + DWORD dwOutputNum, + DWORD *pcFormats); + + HRESULT (STDMETHODCALLTYPE *GetOutputFormat)( + IWMSyncReader2 *This, + DWORD dwOutputNum, + DWORD dwFormatNum, + IWMOutputMediaProps **ppProps); + + HRESULT (STDMETHODCALLTYPE *GetOutputNumberForStream)( + IWMSyncReader2 *This, + WORD wStreamNum, + DWORD *pdwOutputNum); + + HRESULT (STDMETHODCALLTYPE *GetStreamNumberForOutput)( + IWMSyncReader2 *This, + DWORD dwOutputNum, + WORD *pwStreamNum); + + HRESULT (STDMETHODCALLTYPE *GetMaxOutputSampleSize)( + IWMSyncReader2 *This, + DWORD dwOutput, + DWORD *pcbMax); + + HRESULT (STDMETHODCALLTYPE *GetMaxStreamSampleSize)( + IWMSyncReader2 *This, + WORD wStream, + DWORD *pcbMax); + + HRESULT (STDMETHODCALLTYPE *OpenStream)( + IWMSyncReader2 *This, + IStream *pStream); + + /*** IWMSyncReader2 methods ***/ + HRESULT (STDMETHODCALLTYPE *SetRangeByTimecode)( + IWMSyncReader2 *This, + WORD wStreamNum, + WMT_TIMECODE_EXTENSION_DATA *pStart, + WMT_TIMECODE_EXTENSION_DATA *pEnd); + + HRESULT (STDMETHODCALLTYPE *SetRangeByFrameEx)( + IWMSyncReader2 *This, + WORD wStreamNum, + QWORD qwFrameNumber, + LONGLONG cFramesToRead, + QWORD *pcnsStartTime); + + HRESULT (STDMETHODCALLTYPE *SetAllocateForOutput)( + IWMSyncReader2 *This, + DWORD dwOutputNum, + IWMReaderAllocatorEx *pAllocator); + + HRESULT (STDMETHODCALLTYPE *GetAllocateForOutput)( + IWMSyncReader2 *This, + DWORD dwOutputNum, + IWMReaderAllocatorEx **ppAllocator); + + HRESULT (STDMETHODCALLTYPE *SetAllocateForStream)( + IWMSyncReader2 *This, + DWORD dwStreamNum, + IWMReaderAllocatorEx *pAllocator); + + HRESULT (STDMETHODCALLTYPE *GetAllocateForStream)( + IWMSyncReader2 *This, + DWORD dwStreamNum, + IWMReaderAllocatorEx **ppAllocator); + + END_INTERFACE +} IWMSyncReader2Vtbl; + +interface IWMSyncReader2 { + CONST_VTBL IWMSyncReader2Vtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IWMSyncReader2_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IWMSyncReader2_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IWMSyncReader2_Release(This) (This)->lpVtbl->Release(This) +/*** IWMSyncReader methods ***/ +#define IWMSyncReader2_Open(This,pwszFilename) (This)->lpVtbl->Open(This,pwszFilename) +#define IWMSyncReader2_Close(This) (This)->lpVtbl->Close(This) +#define IWMSyncReader2_SetRange(This,cnsStartTime,cnsDuration) (This)->lpVtbl->SetRange(This,cnsStartTime,cnsDuration) +#define IWMSyncReader2_SetRangeByFrame(This,wStreamNum,qwFrameNumber,cFramesToRead) (This)->lpVtbl->SetRangeByFrame(This,wStreamNum,qwFrameNumber,cFramesToRead) +#define IWMSyncReader2_GetNextSample(This,wStreamNum,ppSample,pcnsSampleTime,pcnsDuration,pdwFlags,pdwOutputNum,pwStreamNum) (This)->lpVtbl->GetNextSample(This,wStreamNum,ppSample,pcnsSampleTime,pcnsDuration,pdwFlags,pdwOutputNum,pwStreamNum) +#define IWMSyncReader2_SetStreamsSelected(This,cStreamCount,pwStreamNumbers,pSelections) (This)->lpVtbl->SetStreamsSelected(This,cStreamCount,pwStreamNumbers,pSelections) +#define IWMSyncReader2_GetStreamSelected(This,wStreamNum,pSelection) (This)->lpVtbl->GetStreamSelected(This,wStreamNum,pSelection) +#define IWMSyncReader2_SetReadStreamSamples(This,wStreamNum,fCompressed) (This)->lpVtbl->SetReadStreamSamples(This,wStreamNum,fCompressed) +#define IWMSyncReader2_GetReadStreamSamples(This,wStreamNum,pfCompressed) (This)->lpVtbl->GetReadStreamSamples(This,wStreamNum,pfCompressed) +#define IWMSyncReader2_GetOutputSetting(This,dwOutputNum,pszName,pType,pValue,pcbLength) (This)->lpVtbl->GetOutputSetting(This,dwOutputNum,pszName,pType,pValue,pcbLength) +#define IWMSyncReader2_SetOutputSetting(This,dwOutputNum,pszName,Type,pValue,cbLength) (This)->lpVtbl->SetOutputSetting(This,dwOutputNum,pszName,Type,pValue,cbLength) +#define IWMSyncReader2_GetOutputCount(This,pcOutputs) (This)->lpVtbl->GetOutputCount(This,pcOutputs) +#define IWMSyncReader2_GetOutputProps(This,dwOutputNum,ppOutput) (This)->lpVtbl->GetOutputProps(This,dwOutputNum,ppOutput) +#define IWMSyncReader2_SetOutputProps(This,dwOutputNum,pOutput) (This)->lpVtbl->SetOutputProps(This,dwOutputNum,pOutput) +#define IWMSyncReader2_GetOutputFormatCount(This,dwOutputNum,pcFormats) (This)->lpVtbl->GetOutputFormatCount(This,dwOutputNum,pcFormats) +#define IWMSyncReader2_GetOutputFormat(This,dwOutputNum,dwFormatNum,ppProps) (This)->lpVtbl->GetOutputFormat(This,dwOutputNum,dwFormatNum,ppProps) +#define IWMSyncReader2_GetOutputNumberForStream(This,wStreamNum,pdwOutputNum) (This)->lpVtbl->GetOutputNumberForStream(This,wStreamNum,pdwOutputNum) +#define IWMSyncReader2_GetStreamNumberForOutput(This,dwOutputNum,pwStreamNum) (This)->lpVtbl->GetStreamNumberForOutput(This,dwOutputNum,pwStreamNum) +#define IWMSyncReader2_GetMaxOutputSampleSize(This,dwOutput,pcbMax) (This)->lpVtbl->GetMaxOutputSampleSize(This,dwOutput,pcbMax) +#define IWMSyncReader2_GetMaxStreamSampleSize(This,wStream,pcbMax) (This)->lpVtbl->GetMaxStreamSampleSize(This,wStream,pcbMax) +#define IWMSyncReader2_OpenStream(This,pStream) (This)->lpVtbl->OpenStream(This,pStream) +/*** IWMSyncReader2 methods ***/ +#define IWMSyncReader2_SetRangeByTimecode(This,wStreamNum,pStart,pEnd) (This)->lpVtbl->SetRangeByTimecode(This,wStreamNum,pStart,pEnd) +#define IWMSyncReader2_SetRangeByFrameEx(This,wStreamNum,qwFrameNumber,cFramesToRead,pcnsStartTime) (This)->lpVtbl->SetRangeByFrameEx(This,wStreamNum,qwFrameNumber,cFramesToRead,pcnsStartTime) +#define IWMSyncReader2_SetAllocateForOutput(This,dwOutputNum,pAllocator) (This)->lpVtbl->SetAllocateForOutput(This,dwOutputNum,pAllocator) +#define IWMSyncReader2_GetAllocateForOutput(This,dwOutputNum,ppAllocator) (This)->lpVtbl->GetAllocateForOutput(This,dwOutputNum,ppAllocator) +#define IWMSyncReader2_SetAllocateForStream(This,dwStreamNum,pAllocator) (This)->lpVtbl->SetAllocateForStream(This,dwStreamNum,pAllocator) +#define IWMSyncReader2_GetAllocateForStream(This,dwStreamNum,ppAllocator) (This)->lpVtbl->GetAllocateForStream(This,dwStreamNum,ppAllocator) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT IWMSyncReader2_QueryInterface(IWMSyncReader2* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG IWMSyncReader2_AddRef(IWMSyncReader2* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG IWMSyncReader2_Release(IWMSyncReader2* This) { + return This->lpVtbl->Release(This); +} +/*** IWMSyncReader methods ***/ +static FORCEINLINE HRESULT IWMSyncReader2_Open(IWMSyncReader2* This,const WCHAR *pwszFilename) { + return This->lpVtbl->Open(This,pwszFilename); +} +static FORCEINLINE HRESULT IWMSyncReader2_Close(IWMSyncReader2* This) { + return This->lpVtbl->Close(This); +} +static FORCEINLINE HRESULT IWMSyncReader2_SetRange(IWMSyncReader2* This,QWORD cnsStartTime,LONGLONG cnsDuration) { + return This->lpVtbl->SetRange(This,cnsStartTime,cnsDuration); +} +static FORCEINLINE HRESULT IWMSyncReader2_SetRangeByFrame(IWMSyncReader2* This,WORD wStreamNum,QWORD qwFrameNumber,LONGLONG cFramesToRead) { + return This->lpVtbl->SetRangeByFrame(This,wStreamNum,qwFrameNumber,cFramesToRead); +} +static FORCEINLINE HRESULT IWMSyncReader2_GetNextSample(IWMSyncReader2* This,WORD wStreamNum,INSSBuffer **ppSample,QWORD *pcnsSampleTime,QWORD *pcnsDuration,DWORD *pdwFlags,DWORD *pdwOutputNum,WORD *pwStreamNum) { + return This->lpVtbl->GetNextSample(This,wStreamNum,ppSample,pcnsSampleTime,pcnsDuration,pdwFlags,pdwOutputNum,pwStreamNum); +} +static FORCEINLINE HRESULT IWMSyncReader2_SetStreamsSelected(IWMSyncReader2* This,WORD cStreamCount,WORD *pwStreamNumbers,WMT_STREAM_SELECTION *pSelections) { + return This->lpVtbl->SetStreamsSelected(This,cStreamCount,pwStreamNumbers,pSelections); +} +static FORCEINLINE HRESULT IWMSyncReader2_GetStreamSelected(IWMSyncReader2* This,WORD wStreamNum,WMT_STREAM_SELECTION *pSelection) { + return This->lpVtbl->GetStreamSelected(This,wStreamNum,pSelection); +} +static FORCEINLINE HRESULT IWMSyncReader2_SetReadStreamSamples(IWMSyncReader2* This,WORD wStreamNum,WINBOOL fCompressed) { + return This->lpVtbl->SetReadStreamSamples(This,wStreamNum,fCompressed); +} +static FORCEINLINE HRESULT IWMSyncReader2_GetReadStreamSamples(IWMSyncReader2* This,WORD wStreamNum,WINBOOL *pfCompressed) { + return This->lpVtbl->GetReadStreamSamples(This,wStreamNum,pfCompressed); +} +static FORCEINLINE HRESULT IWMSyncReader2_GetOutputSetting(IWMSyncReader2* This,DWORD dwOutputNum,LPCWSTR pszName,WMT_ATTR_DATATYPE *pType,BYTE *pValue,WORD *pcbLength) { + return This->lpVtbl->GetOutputSetting(This,dwOutputNum,pszName,pType,pValue,pcbLength); +} +static FORCEINLINE HRESULT IWMSyncReader2_SetOutputSetting(IWMSyncReader2* This,DWORD dwOutputNum,LPCWSTR pszName,WMT_ATTR_DATATYPE Type,const BYTE *pValue,WORD cbLength) { + return This->lpVtbl->SetOutputSetting(This,dwOutputNum,pszName,Type,pValue,cbLength); +} +static FORCEINLINE HRESULT IWMSyncReader2_GetOutputCount(IWMSyncReader2* This,DWORD *pcOutputs) { + return This->lpVtbl->GetOutputCount(This,pcOutputs); +} +static FORCEINLINE HRESULT IWMSyncReader2_GetOutputProps(IWMSyncReader2* This,DWORD dwOutputNum,IWMOutputMediaProps **ppOutput) { + return This->lpVtbl->GetOutputProps(This,dwOutputNum,ppOutput); +} +static FORCEINLINE HRESULT IWMSyncReader2_SetOutputProps(IWMSyncReader2* This,DWORD dwOutputNum,IWMOutputMediaProps *pOutput) { + return This->lpVtbl->SetOutputProps(This,dwOutputNum,pOutput); +} +static FORCEINLINE HRESULT IWMSyncReader2_GetOutputFormatCount(IWMSyncReader2* This,DWORD dwOutputNum,DWORD *pcFormats) { + return This->lpVtbl->GetOutputFormatCount(This,dwOutputNum,pcFormats); +} +static FORCEINLINE HRESULT IWMSyncReader2_GetOutputFormat(IWMSyncReader2* This,DWORD dwOutputNum,DWORD dwFormatNum,IWMOutputMediaProps **ppProps) { + return This->lpVtbl->GetOutputFormat(This,dwOutputNum,dwFormatNum,ppProps); +} +static FORCEINLINE HRESULT IWMSyncReader2_GetOutputNumberForStream(IWMSyncReader2* This,WORD wStreamNum,DWORD *pdwOutputNum) { + return This->lpVtbl->GetOutputNumberForStream(This,wStreamNum,pdwOutputNum); +} +static FORCEINLINE HRESULT IWMSyncReader2_GetStreamNumberForOutput(IWMSyncReader2* This,DWORD dwOutputNum,WORD *pwStreamNum) { + return This->lpVtbl->GetStreamNumberForOutput(This,dwOutputNum,pwStreamNum); +} +static FORCEINLINE HRESULT IWMSyncReader2_GetMaxOutputSampleSize(IWMSyncReader2* This,DWORD dwOutput,DWORD *pcbMax) { + return This->lpVtbl->GetMaxOutputSampleSize(This,dwOutput,pcbMax); +} +static FORCEINLINE HRESULT IWMSyncReader2_GetMaxStreamSampleSize(IWMSyncReader2* This,WORD wStream,DWORD *pcbMax) { + return This->lpVtbl->GetMaxStreamSampleSize(This,wStream,pcbMax); +} +static FORCEINLINE HRESULT IWMSyncReader2_OpenStream(IWMSyncReader2* This,IStream *pStream) { + return This->lpVtbl->OpenStream(This,pStream); +} +/*** IWMSyncReader2 methods ***/ +static FORCEINLINE HRESULT IWMSyncReader2_SetRangeByTimecode(IWMSyncReader2* This,WORD wStreamNum,WMT_TIMECODE_EXTENSION_DATA *pStart,WMT_TIMECODE_EXTENSION_DATA *pEnd) { + return This->lpVtbl->SetRangeByTimecode(This,wStreamNum,pStart,pEnd); +} +static FORCEINLINE HRESULT IWMSyncReader2_SetRangeByFrameEx(IWMSyncReader2* This,WORD wStreamNum,QWORD qwFrameNumber,LONGLONG cFramesToRead,QWORD *pcnsStartTime) { + return This->lpVtbl->SetRangeByFrameEx(This,wStreamNum,qwFrameNumber,cFramesToRead,pcnsStartTime); +} +static FORCEINLINE HRESULT IWMSyncReader2_SetAllocateForOutput(IWMSyncReader2* This,DWORD dwOutputNum,IWMReaderAllocatorEx *pAllocator) { + return This->lpVtbl->SetAllocateForOutput(This,dwOutputNum,pAllocator); +} +static FORCEINLINE HRESULT IWMSyncReader2_GetAllocateForOutput(IWMSyncReader2* This,DWORD dwOutputNum,IWMReaderAllocatorEx **ppAllocator) { + return This->lpVtbl->GetAllocateForOutput(This,dwOutputNum,ppAllocator); +} +static FORCEINLINE HRESULT IWMSyncReader2_SetAllocateForStream(IWMSyncReader2* This,DWORD dwStreamNum,IWMReaderAllocatorEx *pAllocator) { + return This->lpVtbl->SetAllocateForStream(This,dwStreamNum,pAllocator); +} +static FORCEINLINE HRESULT IWMSyncReader2_GetAllocateForStream(IWMSyncReader2* This,DWORD dwStreamNum,IWMReaderAllocatorEx **ppAllocator) { + return This->lpVtbl->GetAllocateForStream(This,dwStreamNum,ppAllocator); +} +#endif +#endif + +#endif + + +#endif /* __IWMSyncReader2_INTERFACE_DEFINED__ */ + /***************************************************************************** * IWMInputMediaProps interface */ @@ -11177,8 +11679,192 @@ static FORCEINLINE HRESULT IWMWriterPreprocess_EndPreprocessingPass(IWMWriterPre #endif /* __IWMWriterPreprocess_INTERFACE_DEFINED__ */ +/***************************************************************************** + * IWMLicenseBackup interface + */ +#ifndef __IWMLicenseBackup_INTERFACE_DEFINED__ +#define __IWMLicenseBackup_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IWMLicenseBackup, 0x05e5ac9f, 0x3fb6, 0x4508, 0xbb,0x43, 0xa4,0x06,0x7b,0xa1,0xeb,0xe8); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("05e5ac9f-3fb6-4508-bb43-a4067ba1ebe8") +IWMLicenseBackup : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE BackupLicenses( + DWORD dwFlags, + IWMStatusCallback *pCallback) = 0; + + virtual HRESULT STDMETHODCALLTYPE CancelLicenseBackup( + ) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IWMLicenseBackup, 0x05e5ac9f, 0x3fb6, 0x4508, 0xbb,0x43, 0xa4,0x06,0x7b,0xa1,0xeb,0xe8) +#endif +#else +typedef struct IWMLicenseBackupVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IWMLicenseBackup *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IWMLicenseBackup *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IWMLicenseBackup *This); + + /*** IWMLicenseBackup methods ***/ + HRESULT (STDMETHODCALLTYPE *BackupLicenses)( + IWMLicenseBackup *This, + DWORD dwFlags, + IWMStatusCallback *pCallback); + + HRESULT (STDMETHODCALLTYPE *CancelLicenseBackup)( + IWMLicenseBackup *This); + + END_INTERFACE +} IWMLicenseBackupVtbl; + +interface IWMLicenseBackup { + CONST_VTBL IWMLicenseBackupVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IWMLicenseBackup_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IWMLicenseBackup_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IWMLicenseBackup_Release(This) (This)->lpVtbl->Release(This) +/*** IWMLicenseBackup methods ***/ +#define IWMLicenseBackup_BackupLicenses(This,dwFlags,pCallback) (This)->lpVtbl->BackupLicenses(This,dwFlags,pCallback) +#define IWMLicenseBackup_CancelLicenseBackup(This) (This)->lpVtbl->CancelLicenseBackup(This) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT IWMLicenseBackup_QueryInterface(IWMLicenseBackup* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG IWMLicenseBackup_AddRef(IWMLicenseBackup* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG IWMLicenseBackup_Release(IWMLicenseBackup* This) { + return This->lpVtbl->Release(This); +} +/*** IWMLicenseBackup methods ***/ +static FORCEINLINE HRESULT IWMLicenseBackup_BackupLicenses(IWMLicenseBackup* This,DWORD dwFlags,IWMStatusCallback *pCallback) { + return This->lpVtbl->BackupLicenses(This,dwFlags,pCallback); +} +static FORCEINLINE HRESULT IWMLicenseBackup_CancelLicenseBackup(IWMLicenseBackup* This) { + return This->lpVtbl->CancelLicenseBackup(This); +} +#endif +#endif + +#endif + + +#endif /* __IWMLicenseBackup_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * IWMLicenseRestore interface + */ +#ifndef __IWMLicenseRestore_INTERFACE_DEFINED__ +#define __IWMLicenseRestore_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IWMLicenseRestore, 0xc70b6334, 0xa22e, 0x4efb, 0xa2,0x45, 0x15,0xe6,0x5a,0x00,0x4a,0x13); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("c70b6334-a22e-4efb-a245-15e65a004a13") +IWMLicenseRestore : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE RestoreLicenses( + DWORD dwFlags, + IWMStatusCallback *pCallback) = 0; + + virtual HRESULT STDMETHODCALLTYPE CancelLicenseRestore( + ) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IWMLicenseRestore, 0xc70b6334, 0xa22e, 0x4efb, 0xa2,0x45, 0x15,0xe6,0x5a,0x00,0x4a,0x13) +#endif +#else +typedef struct IWMLicenseRestoreVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IWMLicenseRestore *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IWMLicenseRestore *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IWMLicenseRestore *This); + + /*** IWMLicenseRestore methods ***/ + HRESULT (STDMETHODCALLTYPE *RestoreLicenses)( + IWMLicenseRestore *This, + DWORD dwFlags, + IWMStatusCallback *pCallback); + + HRESULT (STDMETHODCALLTYPE *CancelLicenseRestore)( + IWMLicenseRestore *This); + + END_INTERFACE +} IWMLicenseRestoreVtbl; + +interface IWMLicenseRestore { + CONST_VTBL IWMLicenseRestoreVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IWMLicenseRestore_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IWMLicenseRestore_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IWMLicenseRestore_Release(This) (This)->lpVtbl->Release(This) +/*** IWMLicenseRestore methods ***/ +#define IWMLicenseRestore_RestoreLicenses(This,dwFlags,pCallback) (This)->lpVtbl->RestoreLicenses(This,dwFlags,pCallback) +#define IWMLicenseRestore_CancelLicenseRestore(This) (This)->lpVtbl->CancelLicenseRestore(This) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT IWMLicenseRestore_QueryInterface(IWMLicenseRestore* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG IWMLicenseRestore_AddRef(IWMLicenseRestore* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG IWMLicenseRestore_Release(IWMLicenseRestore* This) { + return This->lpVtbl->Release(This); +} +/*** IWMLicenseRestore methods ***/ +static FORCEINLINE HRESULT IWMLicenseRestore_RestoreLicenses(IWMLicenseRestore* This,DWORD dwFlags,IWMStatusCallback *pCallback) { + return This->lpVtbl->RestoreLicenses(This,dwFlags,pCallback); +} +static FORCEINLINE HRESULT IWMLicenseRestore_CancelLicenseRestore(IWMLicenseRestore* This) { + return This->lpVtbl->CancelLicenseRestore(This); +} +#endif +#endif + +#endif + + +#endif /* __IWMLicenseRestore_INTERFACE_DEFINED__ */ + +HRESULT WINAPI WMCheckURLExtension(LPCWSTR); +HRESULT WINAPI WMCheckURLScheme(LPCWSTR); HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**); HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**); +HRESULT WINAPI WMCreateSyncReader(IUnknown*,DWORD,IWMSyncReader**); +HRESULT WINAPI WMCreateEditor(IWMMetadataEditor**); +HRESULT WINAPI WMCreateBackupRestorer(IUnknown*,IWMLicenseBackup**); +HRESULT WINAPI WMCreateProfileManager(IWMProfileManager**); EXTERN_GUID(WMMEDIASUBTYPE_Base, 0x00000000,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71); EXTERN_GUID(WMMEDIATYPE_Video, 0x73646976,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71); EXTERN_GUID(WMMEDIASUBTYPE_RGB1, 0xe436eb78,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70); diff --git a/lib/libc/include/any-windows-any/wpcapi.h b/lib/libc/include/any-windows-any/wpcapi.h index 992f01a5b4..84a9c68797 100644 --- a/lib/libc/include/any-windows-any/wpcapi.h +++ b/lib/libc/include/any-windows-any/wpcapi.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/wpcapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from include/wpcapi.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/ws2tcpip.h b/lib/libc/include/any-windows-any/ws2tcpip.h index 153f9c9099..78742d7cfc 100644 --- a/lib/libc/include/any-windows-any/ws2tcpip.h +++ b/lib/libc/include/any-windows-any/ws2tcpip.h @@ -319,7 +319,6 @@ WCHAR *gai_strerrorW(int); #define PADDRINFOEX __MINGW_NAME_AW(PADDRINFOEX) #define GetAddrInfoEx __MINGW_NAME_AW(GetAddrInfoEx) #define SetAddrInfoEx __MINGW_NAME_AW(SetAddrInfoEx) -#define FreeAddrInfoEx __MINGW_NAME_AW(FreeAddrInfoEx) typedef struct addrinfoExA { int ai_flags; @@ -373,9 +372,14 @@ WINSOCK_API_LINKAGE int WSAAPI SetAddrInfoExW(PCWSTR pName,PCWSTR pServiceName,S LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine, LPHANDLE lpNameHandle); -WINSOCK_API_LINKAGE void WSAAPI FreeAddrInfoExA(PADDRINFOEXA pAddrInfo); +WINSOCK_API_LINKAGE void WSAAPI FreeAddrInfoEx(PADDRINFOEXA pAddrInfo); WINSOCK_API_LINKAGE void WSAAPI FreeAddrInfoExW(PADDRINFOEXW pAddrInfo); +#define FreeAddrInfoExA FreeAddrInfoEx +#ifdef UNICODE +# define FreeAddrInfoEx FreeAddrInfoExW +#endif /* UNICODE */ + #if INCL_WINSOCK_API_TYPEDEFS #define LPFN_GETADDRINFOEX __MINGW_NAME_AW(LPFN_GETADDRINFOEX) typedef int (WSAAPI *LPFN_GETADDRINFOEXA)(PCSTR pName, PCSTR pServiceName, DWORD dwNameSpace, @@ -443,8 +447,8 @@ WINSOCK_API_LINKAGE int WSAAPI WSASetSocketSecurity( #define InetNtopA inet_ntop -WINSOCK_API_LINKAGE LPCWSTR WSAAPI InetNtopW(INT Family, PVOID pAddr, LPWSTR pStringBuf, size_t StringBufSIze); -WINSOCK_API_LINKAGE LPCSTR WSAAPI InetNtopA(INT Family, PVOID pAddr, LPSTR pStringBuf, size_t StringBufSize); +WINSOCK_API_LINKAGE LPCWSTR WSAAPI InetNtopW(INT Family, LPCVOID pAddr, LPWSTR pStringBuf, size_t StringBufSIze); +WINSOCK_API_LINKAGE LPCSTR WSAAPI InetNtopA(INT Family, LPCVOID pAddr, LPSTR pStringBuf, size_t StringBufSize); #define InetNtop __MINGW_NAME_AW(InetNtop) diff --git a/lib/libc/include/any-windows-any/wsdattachment.h b/lib/libc/include/any-windows-any/wsdattachment.h index f5c77b1546..f06e862861 100644 --- a/lib/libc/include/any-windows-any/wsdattachment.h +++ b/lib/libc/include/any-windows-any/wsdattachment.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/wsdattachment.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/wsdattachment.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,16 +21,25 @@ #ifndef __IWSDAttachment_FWD_DEFINED__ #define __IWSDAttachment_FWD_DEFINED__ typedef interface IWSDAttachment IWSDAttachment; +#ifdef __cplusplus +interface IWSDAttachment; +#endif /* __cplusplus */ #endif #ifndef __IWSDInboundAttachment_FWD_DEFINED__ #define __IWSDInboundAttachment_FWD_DEFINED__ typedef interface IWSDInboundAttachment IWSDInboundAttachment; +#ifdef __cplusplus +interface IWSDInboundAttachment; +#endif /* __cplusplus */ #endif #ifndef __IWSDOutboundAttachment_FWD_DEFINED__ #define __IWSDOutboundAttachment_FWD_DEFINED__ typedef interface IWSDOutboundAttachment IWSDOutboundAttachment; +#ifdef __cplusplus +interface IWSDOutboundAttachment; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -51,16 +61,25 @@ extern "C" { #ifndef __IWSDAttachment_FWD_DEFINED__ #define __IWSDAttachment_FWD_DEFINED__ typedef interface IWSDAttachment IWSDAttachment; +#ifdef __cplusplus +interface IWSDAttachment; +#endif /* __cplusplus */ #endif #ifndef __IWSDInboundAttachment_FWD_DEFINED__ #define __IWSDInboundAttachment_FWD_DEFINED__ typedef interface IWSDInboundAttachment IWSDInboundAttachment; +#ifdef __cplusplus +interface IWSDInboundAttachment; +#endif /* __cplusplus */ #endif #ifndef __IWSDOutboundAttachment_FWD_DEFINED__ #define __IWSDOutboundAttachment_FWD_DEFINED__ typedef interface IWSDOutboundAttachment IWSDOutboundAttachment; +#ifdef __cplusplus +interface IWSDOutboundAttachment; +#endif /* __cplusplus */ #endif @@ -85,18 +104,19 @@ typedef struct IWSDAttachmentVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDAttachment* This, + IWSDAttachment *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDAttachment* This); + IWSDAttachment *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDAttachment* This); + IWSDAttachment *This); END_INTERFACE } IWSDAttachmentVtbl; + interface IWSDAttachment { CONST_VTBL IWSDAttachmentVtbl* lpVtbl; }; @@ -156,28 +176,29 @@ typedef struct IWSDInboundAttachmentVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDInboundAttachment* This, + IWSDInboundAttachment *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDInboundAttachment* This); + IWSDInboundAttachment *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDInboundAttachment* This); + IWSDInboundAttachment *This); /*** IWSDInboundAttachment methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - IWSDInboundAttachment* This, + IWSDInboundAttachment *This, BYTE *pBuffer, DWORD dwBytesToRead, LPDWORD pdwNumberOfBytesRead); HRESULT (STDMETHODCALLTYPE *Close)( - IWSDInboundAttachment* This); + IWSDInboundAttachment *This); END_INTERFACE } IWSDInboundAttachmentVtbl; + interface IWSDInboundAttachment { CONST_VTBL IWSDInboundAttachmentVtbl* lpVtbl; }; @@ -214,23 +235,6 @@ static FORCEINLINE HRESULT IWSDInboundAttachment_Close(IWSDInboundAttachment* Th #endif -HRESULT STDMETHODCALLTYPE IWSDInboundAttachment_Read_Proxy( - IWSDInboundAttachment* This, - BYTE *pBuffer, - DWORD dwBytesToRead, - LPDWORD pdwNumberOfBytesRead); -void __RPC_STUB IWSDInboundAttachment_Read_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDInboundAttachment_Close_Proxy( - IWSDInboundAttachment* This); -void __RPC_STUB IWSDInboundAttachment_Close_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDInboundAttachment_INTERFACE_DEFINED__ */ @@ -267,31 +271,32 @@ typedef struct IWSDOutboundAttachmentVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDOutboundAttachment* This, + IWSDOutboundAttachment *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDOutboundAttachment* This); + IWSDOutboundAttachment *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDOutboundAttachment* This); + IWSDOutboundAttachment *This); /*** IWSDOutboundAttachment methods ***/ HRESULT (STDMETHODCALLTYPE *Write)( - IWSDOutboundAttachment* This, + IWSDOutboundAttachment *This, const BYTE *pBuffer, DWORD dwBytesToWrite, LPDWORD pdwNumberOfBytesWritten); HRESULT (STDMETHODCALLTYPE *Close)( - IWSDOutboundAttachment* This); + IWSDOutboundAttachment *This); HRESULT (STDMETHODCALLTYPE *Abort)( - IWSDOutboundAttachment* This); + IWSDOutboundAttachment *This); END_INTERFACE } IWSDOutboundAttachmentVtbl; + interface IWSDOutboundAttachment { CONST_VTBL IWSDOutboundAttachmentVtbl* lpVtbl; }; @@ -332,30 +337,6 @@ static FORCEINLINE HRESULT IWSDOutboundAttachment_Abort(IWSDOutboundAttachment* #endif -HRESULT STDMETHODCALLTYPE IWSDOutboundAttachment_Write_Proxy( - IWSDOutboundAttachment* This, - const BYTE *pBuffer, - DWORD dwBytesToWrite, - LPDWORD pdwNumberOfBytesWritten); -void __RPC_STUB IWSDOutboundAttachment_Write_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDOutboundAttachment_Close_Proxy( - IWSDOutboundAttachment* This); -void __RPC_STUB IWSDOutboundAttachment_Close_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDOutboundAttachment_Abort_Proxy( - IWSDOutboundAttachment* This); -void __RPC_STUB IWSDOutboundAttachment_Abort_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDOutboundAttachment_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/wsdbase.h b/lib/libc/include/any-windows-any/wsdbase.h index f671c065c7..fffad461ed 100644 --- a/lib/libc/include/any-windows-any/wsdbase.h +++ b/lib/libc/include/any-windows-any/wsdbase.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/wsdbase.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/wsdbase.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,51 +21,81 @@ #ifndef __IWSDAddress_FWD_DEFINED__ #define __IWSDAddress_FWD_DEFINED__ typedef interface IWSDAddress IWSDAddress; +#ifdef __cplusplus +interface IWSDAddress; +#endif /* __cplusplus */ #endif #ifndef __IWSDTransportAddress_FWD_DEFINED__ #define __IWSDTransportAddress_FWD_DEFINED__ typedef interface IWSDTransportAddress IWSDTransportAddress; +#ifdef __cplusplus +interface IWSDTransportAddress; +#endif /* __cplusplus */ #endif #ifndef __IWSDMessageParameters_FWD_DEFINED__ #define __IWSDMessageParameters_FWD_DEFINED__ typedef interface IWSDMessageParameters IWSDMessageParameters; +#ifdef __cplusplus +interface IWSDMessageParameters; +#endif /* __cplusplus */ #endif #ifndef __IWSDUdpMessageParameters_FWD_DEFINED__ #define __IWSDUdpMessageParameters_FWD_DEFINED__ typedef interface IWSDUdpMessageParameters IWSDUdpMessageParameters; +#ifdef __cplusplus +interface IWSDUdpMessageParameters; +#endif /* __cplusplus */ #endif #ifndef __IWSDUdpAddress_FWD_DEFINED__ #define __IWSDUdpAddress_FWD_DEFINED__ typedef interface IWSDUdpAddress IWSDUdpAddress; +#ifdef __cplusplus +interface IWSDUdpAddress; +#endif /* __cplusplus */ #endif #ifndef __IWSDHttpMessageParameters_FWD_DEFINED__ #define __IWSDHttpMessageParameters_FWD_DEFINED__ typedef interface IWSDHttpMessageParameters IWSDHttpMessageParameters; +#ifdef __cplusplus +interface IWSDHttpMessageParameters; +#endif /* __cplusplus */ #endif #ifndef __IWSDHttpAddress_FWD_DEFINED__ #define __IWSDHttpAddress_FWD_DEFINED__ typedef interface IWSDHttpAddress IWSDHttpAddress; +#ifdef __cplusplus +interface IWSDHttpAddress; +#endif /* __cplusplus */ #endif #ifndef __IWSDSSLClientCertificate_FWD_DEFINED__ #define __IWSDSSLClientCertificate_FWD_DEFINED__ typedef interface IWSDSSLClientCertificate IWSDSSLClientCertificate; +#ifdef __cplusplus +interface IWSDSSLClientCertificate; +#endif /* __cplusplus */ #endif #ifndef __IWSDHttpAuthParameters_FWD_DEFINED__ #define __IWSDHttpAuthParameters_FWD_DEFINED__ typedef interface IWSDHttpAuthParameters IWSDHttpAuthParameters; +#ifdef __cplusplus +interface IWSDHttpAuthParameters; +#endif /* __cplusplus */ #endif #ifndef __IWSDSignatureProperty_FWD_DEFINED__ #define __IWSDSignatureProperty_FWD_DEFINED__ typedef interface IWSDSignatureProperty IWSDSignatureProperty; +#ifdef __cplusplus +interface IWSDSignatureProperty; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -83,31 +114,49 @@ extern "C" { #ifndef __IWSDAddress_FWD_DEFINED__ #define __IWSDAddress_FWD_DEFINED__ typedef interface IWSDAddress IWSDAddress; +#ifdef __cplusplus +interface IWSDAddress; +#endif /* __cplusplus */ #endif #ifndef __IWSDMessageParameters_FWD_DEFINED__ #define __IWSDMessageParameters_FWD_DEFINED__ typedef interface IWSDMessageParameters IWSDMessageParameters; +#ifdef __cplusplus +interface IWSDMessageParameters; +#endif /* __cplusplus */ #endif #ifndef __IWSDUdpAddress_FWD_DEFINED__ #define __IWSDUdpAddress_FWD_DEFINED__ typedef interface IWSDUdpAddress IWSDUdpAddress; +#ifdef __cplusplus +interface IWSDUdpAddress; +#endif /* __cplusplus */ #endif #ifndef __IWSDUdpMessageParameters_FWD_DEFINED__ #define __IWSDUdpMessageParameters_FWD_DEFINED__ typedef interface IWSDUdpMessageParameters IWSDUdpMessageParameters; +#ifdef __cplusplus +interface IWSDUdpMessageParameters; +#endif /* __cplusplus */ #endif #ifndef __IWSDHttpAddress_FWD_DEFINED__ #define __IWSDHttpAddress_FWD_DEFINED__ typedef interface IWSDHttpAddress IWSDHttpAddress; +#ifdef __cplusplus +interface IWSDHttpAddress; +#endif /* __cplusplus */ #endif #ifndef __IWSDHttpMessageParameters_FWD_DEFINED__ #define __IWSDHttpMessageParameters_FWD_DEFINED__ typedef interface IWSDHttpMessageParameters IWSDHttpMessageParameters; +#ifdef __cplusplus +interface IWSDHttpMessageParameters; +#endif /* __cplusplus */ #endif @@ -215,29 +264,30 @@ typedef struct IWSDAddressVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDAddress* This, + IWSDAddress *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDAddress* This); + IWSDAddress *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDAddress* This); + IWSDAddress *This); /*** IWSDAddress methods ***/ HRESULT (STDMETHODCALLTYPE *Serialize)( - IWSDAddress* This, + IWSDAddress *This, LPWSTR pszBuffer, DWORD cchLength, WINBOOL fSafe); HRESULT (STDMETHODCALLTYPE *Deserialize)( - IWSDAddress* This, + IWSDAddress *This, LPCWSTR pszBuffer); END_INTERFACE } IWSDAddressVtbl; + interface IWSDAddress { CONST_VTBL IWSDAddressVtbl* lpVtbl; }; @@ -274,24 +324,6 @@ static FORCEINLINE HRESULT IWSDAddress_Deserialize(IWSDAddress* This,LPCWSTR psz #endif -HRESULT STDMETHODCALLTYPE IWSDAddress_Serialize_Proxy( - IWSDAddress* This, - LPWSTR pszBuffer, - DWORD cchLength, - WINBOOL fSafe); -void __RPC_STUB IWSDAddress_Serialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDAddress_Deserialize_Proxy( - IWSDAddress* This, - LPCWSTR pszBuffer); -void __RPC_STUB IWSDAddress_Deserialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDAddress_INTERFACE_DEFINED__ */ @@ -332,51 +364,52 @@ typedef struct IWSDTransportAddressVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDTransportAddress* This, + IWSDTransportAddress *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDTransportAddress* This); + IWSDTransportAddress *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDTransportAddress* This); + IWSDTransportAddress *This); /*** IWSDAddress methods ***/ HRESULT (STDMETHODCALLTYPE *Serialize)( - IWSDTransportAddress* This, + IWSDTransportAddress *This, LPWSTR pszBuffer, DWORD cchLength, WINBOOL fSafe); HRESULT (STDMETHODCALLTYPE *Deserialize)( - IWSDTransportAddress* This, + IWSDTransportAddress *This, LPCWSTR pszBuffer); /*** IWSDTransportAddress methods ***/ HRESULT (STDMETHODCALLTYPE *GetPort)( - IWSDTransportAddress* This, + IWSDTransportAddress *This, WORD *pwPort); HRESULT (STDMETHODCALLTYPE *SetPort)( - IWSDTransportAddress* This, + IWSDTransportAddress *This, WORD wPort); HRESULT (STDMETHODCALLTYPE *GetTransportAddress)( - IWSDTransportAddress* This, + IWSDTransportAddress *This, LPCWSTR *ppszAddress); HRESULT (STDMETHODCALLTYPE *GetTransportAddressEx)( - IWSDTransportAddress* This, + IWSDTransportAddress *This, WINBOOL fSafe, LPCWSTR *ppszAddress); HRESULT (STDMETHODCALLTYPE *SetTransportAddress)( - IWSDTransportAddress* This, + IWSDTransportAddress *This, LPCWSTR pszAddress); END_INTERFACE } IWSDTransportAddressVtbl; + interface IWSDTransportAddress { CONST_VTBL IWSDTransportAddressVtbl* lpVtbl; }; @@ -435,47 +468,6 @@ static FORCEINLINE HRESULT IWSDTransportAddress_SetTransportAddress(IWSDTranspor #endif -HRESULT STDMETHODCALLTYPE IWSDTransportAddress_GetPort_Proxy( - IWSDTransportAddress* This, - WORD *pwPort); -void __RPC_STUB IWSDTransportAddress_GetPort_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDTransportAddress_SetPort_Proxy( - IWSDTransportAddress* This, - WORD wPort); -void __RPC_STUB IWSDTransportAddress_SetPort_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDTransportAddress_GetTransportAddress_Proxy( - IWSDTransportAddress* This, - LPCWSTR *ppszAddress); -void __RPC_STUB IWSDTransportAddress_GetTransportAddress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDTransportAddress_GetTransportAddressEx_Proxy( - IWSDTransportAddress* This, - WINBOOL fSafe, - LPCWSTR *ppszAddress); -void __RPC_STUB IWSDTransportAddress_GetTransportAddressEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDTransportAddress_SetTransportAddress_Proxy( - IWSDTransportAddress* This, - LPCWSTR pszAddress); -void __RPC_STUB IWSDTransportAddress_SetTransportAddress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDTransportAddress_INTERFACE_DEFINED__ */ @@ -515,39 +507,40 @@ typedef struct IWSDMessageParametersVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDMessageParameters* This, + IWSDMessageParameters *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDMessageParameters* This); + IWSDMessageParameters *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDMessageParameters* This); + IWSDMessageParameters *This); /*** IWSDMessageParameters methods ***/ HRESULT (STDMETHODCALLTYPE *GetLocalAddress)( - IWSDMessageParameters* This, + IWSDMessageParameters *This, IWSDAddress **ppAddress); HRESULT (STDMETHODCALLTYPE *SetLocalAddress)( - IWSDMessageParameters* This, + IWSDMessageParameters *This, IWSDAddress *pAddress); HRESULT (STDMETHODCALLTYPE *GetRemoteAddress)( - IWSDMessageParameters* This, + IWSDMessageParameters *This, IWSDAddress **ppAddress); HRESULT (STDMETHODCALLTYPE *SetRemoteAddress)( - IWSDMessageParameters* This, + IWSDMessageParameters *This, IWSDAddress *pAddress); HRESULT (STDMETHODCALLTYPE *GetLowerParameters)( - IWSDMessageParameters* This, + IWSDMessageParameters *This, IWSDMessageParameters **ppTxParams); END_INTERFACE } IWSDMessageParametersVtbl; + interface IWSDMessageParameters { CONST_VTBL IWSDMessageParametersVtbl* lpVtbl; }; @@ -596,46 +589,6 @@ static FORCEINLINE HRESULT IWSDMessageParameters_GetLowerParameters(IWSDMessageP #endif -HRESULT STDMETHODCALLTYPE IWSDMessageParameters_GetLocalAddress_Proxy( - IWSDMessageParameters* This, - IWSDAddress **ppAddress); -void __RPC_STUB IWSDMessageParameters_GetLocalAddress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDMessageParameters_SetLocalAddress_Proxy( - IWSDMessageParameters* This, - IWSDAddress *pAddress); -void __RPC_STUB IWSDMessageParameters_SetLocalAddress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDMessageParameters_GetRemoteAddress_Proxy( - IWSDMessageParameters* This, - IWSDAddress **ppAddress); -void __RPC_STUB IWSDMessageParameters_GetRemoteAddress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDMessageParameters_SetRemoteAddress_Proxy( - IWSDMessageParameters* This, - IWSDAddress *pAddress); -void __RPC_STUB IWSDMessageParameters_SetRemoteAddress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDMessageParameters_GetLowerParameters_Proxy( - IWSDMessageParameters* This, - IWSDMessageParameters **ppTxParams); -void __RPC_STUB IWSDMessageParameters_GetLowerParameters_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDMessageParameters_INTERFACE_DEFINED__ */ @@ -676,48 +629,49 @@ typedef struct IWSDUdpMessageParametersVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDUdpMessageParameters* This, + IWSDUdpMessageParameters *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDUdpMessageParameters* This); + IWSDUdpMessageParameters *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDUdpMessageParameters* This); + IWSDUdpMessageParameters *This); /*** IWSDMessageParameters methods ***/ HRESULT (STDMETHODCALLTYPE *GetLocalAddress)( - IWSDUdpMessageParameters* This, + IWSDUdpMessageParameters *This, IWSDAddress **ppAddress); HRESULT (STDMETHODCALLTYPE *SetLocalAddress)( - IWSDUdpMessageParameters* This, + IWSDUdpMessageParameters *This, IWSDAddress *pAddress); HRESULT (STDMETHODCALLTYPE *GetRemoteAddress)( - IWSDUdpMessageParameters* This, + IWSDUdpMessageParameters *This, IWSDAddress **ppAddress); HRESULT (STDMETHODCALLTYPE *SetRemoteAddress)( - IWSDUdpMessageParameters* This, + IWSDUdpMessageParameters *This, IWSDAddress *pAddress); HRESULT (STDMETHODCALLTYPE *GetLowerParameters)( - IWSDUdpMessageParameters* This, + IWSDUdpMessageParameters *This, IWSDMessageParameters **ppTxParams); /*** IWSDUdpMessageParameters methods ***/ HRESULT (STDMETHODCALLTYPE *SetRetransmitParams)( - IWSDUdpMessageParameters* This, + IWSDUdpMessageParameters *This, const WSDUdpRetransmitParams *pParams); HRESULT (STDMETHODCALLTYPE *GetRetransmitParams)( - IWSDUdpMessageParameters* This, + IWSDUdpMessageParameters *This, WSDUdpRetransmitParams *pParams); END_INTERFACE } IWSDUdpMessageParametersVtbl; + interface IWSDUdpMessageParameters { CONST_VTBL IWSDUdpMessageParametersVtbl* lpVtbl; }; @@ -776,22 +730,6 @@ static FORCEINLINE HRESULT IWSDUdpMessageParameters_GetRetransmitParams(IWSDUdpM #endif -HRESULT STDMETHODCALLTYPE IWSDUdpMessageParameters_SetRetransmitParams_Proxy( - IWSDUdpMessageParameters* This, - const WSDUdpRetransmitParams *pParams); -void __RPC_STUB IWSDUdpMessageParameters_SetRetransmitParams_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDUdpMessageParameters_GetRetransmitParams_Proxy( - IWSDUdpMessageParameters* This, - WSDUdpRetransmitParams *pParams); -void __RPC_STUB IWSDUdpMessageParameters_GetRetransmitParams_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDUdpMessageParameters_INTERFACE_DEFINED__ */ @@ -861,91 +799,92 @@ typedef struct IWSDUdpAddressVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDUdpAddress* This, + IWSDUdpAddress *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDUdpAddress* This); + IWSDUdpAddress *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDUdpAddress* This); + IWSDUdpAddress *This); /*** IWSDAddress methods ***/ HRESULT (STDMETHODCALLTYPE *Serialize)( - IWSDUdpAddress* This, + IWSDUdpAddress *This, LPWSTR pszBuffer, DWORD cchLength, WINBOOL fSafe); HRESULT (STDMETHODCALLTYPE *Deserialize)( - IWSDUdpAddress* This, + IWSDUdpAddress *This, LPCWSTR pszBuffer); /*** IWSDTransportAddress methods ***/ HRESULT (STDMETHODCALLTYPE *GetPort)( - IWSDUdpAddress* This, + IWSDUdpAddress *This, WORD *pwPort); HRESULT (STDMETHODCALLTYPE *SetPort)( - IWSDUdpAddress* This, + IWSDUdpAddress *This, WORD wPort); HRESULT (STDMETHODCALLTYPE *GetTransportAddress)( - IWSDUdpAddress* This, + IWSDUdpAddress *This, LPCWSTR *ppszAddress); HRESULT (STDMETHODCALLTYPE *GetTransportAddressEx)( - IWSDUdpAddress* This, + IWSDUdpAddress *This, WINBOOL fSafe, LPCWSTR *ppszAddress); HRESULT (STDMETHODCALLTYPE *SetTransportAddress)( - IWSDUdpAddress* This, + IWSDUdpAddress *This, LPCWSTR pszAddress); /*** IWSDUdpAddress methods ***/ HRESULT (STDMETHODCALLTYPE *SetSockaddr)( - IWSDUdpAddress* This, + IWSDUdpAddress *This, const SOCKADDR_STORAGE *pSockAddr); HRESULT (STDMETHODCALLTYPE *GetSockaddr)( - IWSDUdpAddress* This, + IWSDUdpAddress *This, SOCKADDR_STORAGE *pSockAddr); HRESULT (STDMETHODCALLTYPE *SetExclusive)( - IWSDUdpAddress* This, + IWSDUdpAddress *This, WINBOOL fExclusive); HRESULT (STDMETHODCALLTYPE *GetExclusive)( - IWSDUdpAddress* This); + IWSDUdpAddress *This); HRESULT (STDMETHODCALLTYPE *SetMessageType)( - IWSDUdpAddress* This, + IWSDUdpAddress *This, WSDUdpMessageType messageType); HRESULT (STDMETHODCALLTYPE *GetMessageType)( - IWSDUdpAddress* This, + IWSDUdpAddress *This, WSDUdpMessageType *pMessageType); HRESULT (STDMETHODCALLTYPE *SetTTL)( - IWSDUdpAddress* This, + IWSDUdpAddress *This, DWORD dwTTL); HRESULT (STDMETHODCALLTYPE *GetTTL)( - IWSDUdpAddress* This, + IWSDUdpAddress *This, DWORD *pdwTTL); HRESULT (STDMETHODCALLTYPE *SetAlias)( - IWSDUdpAddress* This, + IWSDUdpAddress *This, const GUID *pAlias); HRESULT (STDMETHODCALLTYPE *GetAlias)( - IWSDUdpAddress* This, + IWSDUdpAddress *This, GUID *pAlias); END_INTERFACE } IWSDUdpAddressVtbl; + interface IWSDUdpAddress { CONST_VTBL IWSDUdpAddressVtbl* lpVtbl; }; @@ -1046,85 +985,6 @@ static FORCEINLINE HRESULT IWSDUdpAddress_GetAlias(IWSDUdpAddress* This,GUID *pA #endif -HRESULT STDMETHODCALLTYPE IWSDUdpAddress_SetSockaddr_Proxy( - IWSDUdpAddress* This, - const SOCKADDR_STORAGE *pSockAddr); -void __RPC_STUB IWSDUdpAddress_SetSockaddr_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDUdpAddress_GetSockaddr_Proxy( - IWSDUdpAddress* This, - SOCKADDR_STORAGE *pSockAddr); -void __RPC_STUB IWSDUdpAddress_GetSockaddr_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDUdpAddress_SetExclusive_Proxy( - IWSDUdpAddress* This, - WINBOOL fExclusive); -void __RPC_STUB IWSDUdpAddress_SetExclusive_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDUdpAddress_GetExclusive_Proxy( - IWSDUdpAddress* This); -void __RPC_STUB IWSDUdpAddress_GetExclusive_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDUdpAddress_SetMessageType_Proxy( - IWSDUdpAddress* This, - WSDUdpMessageType messageType); -void __RPC_STUB IWSDUdpAddress_SetMessageType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDUdpAddress_GetMessageType_Proxy( - IWSDUdpAddress* This, - WSDUdpMessageType *pMessageType); -void __RPC_STUB IWSDUdpAddress_GetMessageType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDUdpAddress_SetTTL_Proxy( - IWSDUdpAddress* This, - DWORD dwTTL); -void __RPC_STUB IWSDUdpAddress_SetTTL_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDUdpAddress_GetTTL_Proxy( - IWSDUdpAddress* This, - DWORD *pdwTTL); -void __RPC_STUB IWSDUdpAddress_GetTTL_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDUdpAddress_SetAlias_Proxy( - IWSDUdpAddress* This, - const GUID *pAlias); -void __RPC_STUB IWSDUdpAddress_SetAlias_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDUdpAddress_GetAlias_Proxy( - IWSDUdpAddress* This, - GUID *pAlias); -void __RPC_STUB IWSDUdpAddress_GetAlias_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDUdpAddress_INTERFACE_DEFINED__ */ @@ -1176,75 +1036,76 @@ typedef struct IWSDHttpMessageParametersVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDHttpMessageParameters* This, + IWSDHttpMessageParameters *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDHttpMessageParameters* This); + IWSDHttpMessageParameters *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDHttpMessageParameters* This); + IWSDHttpMessageParameters *This); /*** IWSDMessageParameters methods ***/ HRESULT (STDMETHODCALLTYPE *GetLocalAddress)( - IWSDHttpMessageParameters* This, + IWSDHttpMessageParameters *This, IWSDAddress **ppAddress); HRESULT (STDMETHODCALLTYPE *SetLocalAddress)( - IWSDHttpMessageParameters* This, + IWSDHttpMessageParameters *This, IWSDAddress *pAddress); HRESULT (STDMETHODCALLTYPE *GetRemoteAddress)( - IWSDHttpMessageParameters* This, + IWSDHttpMessageParameters *This, IWSDAddress **ppAddress); HRESULT (STDMETHODCALLTYPE *SetRemoteAddress)( - IWSDHttpMessageParameters* This, + IWSDHttpMessageParameters *This, IWSDAddress *pAddress); HRESULT (STDMETHODCALLTYPE *GetLowerParameters)( - IWSDHttpMessageParameters* This, + IWSDHttpMessageParameters *This, IWSDMessageParameters **ppTxParams); /*** IWSDHttpMessageParameters methods ***/ HRESULT (STDMETHODCALLTYPE *SetInboundHttpHeaders)( - IWSDHttpMessageParameters* This, + IWSDHttpMessageParameters *This, LPCWSTR pszHeaders); HRESULT (STDMETHODCALLTYPE *GetInboundHttpHeaders)( - IWSDHttpMessageParameters* This, + IWSDHttpMessageParameters *This, LPCWSTR *ppszHeaders); HRESULT (STDMETHODCALLTYPE *SetOutboundHttpHeaders)( - IWSDHttpMessageParameters* This, + IWSDHttpMessageParameters *This, LPCWSTR pszHeaders); HRESULT (STDMETHODCALLTYPE *GetOutboundHttpHeaders)( - IWSDHttpMessageParameters* This, + IWSDHttpMessageParameters *This, LPCWSTR *ppszHeaders); HRESULT (STDMETHODCALLTYPE *SetID)( - IWSDHttpMessageParameters* This, + IWSDHttpMessageParameters *This, LPCWSTR pszId); HRESULT (STDMETHODCALLTYPE *GetID)( - IWSDHttpMessageParameters* This, + IWSDHttpMessageParameters *This, LPCWSTR *ppszId); HRESULT (STDMETHODCALLTYPE *SetContext)( - IWSDHttpMessageParameters* This, + IWSDHttpMessageParameters *This, IUnknown *pContext); HRESULT (STDMETHODCALLTYPE *GetContext)( - IWSDHttpMessageParameters* This, + IWSDHttpMessageParameters *This, IUnknown **ppContext); HRESULT (STDMETHODCALLTYPE *Clear)( - IWSDHttpMessageParameters* This); + IWSDHttpMessageParameters *This); END_INTERFACE } IWSDHttpMessageParametersVtbl; + interface IWSDHttpMessageParameters { CONST_VTBL IWSDHttpMessageParametersVtbl* lpVtbl; }; @@ -1331,77 +1192,6 @@ static FORCEINLINE HRESULT IWSDHttpMessageParameters_Clear(IWSDHttpMessageParame #endif -HRESULT STDMETHODCALLTYPE IWSDHttpMessageParameters_SetInboundHttpHeaders_Proxy( - IWSDHttpMessageParameters* This, - LPCWSTR pszHeaders); -void __RPC_STUB IWSDHttpMessageParameters_SetInboundHttpHeaders_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDHttpMessageParameters_GetInboundHttpHeaders_Proxy( - IWSDHttpMessageParameters* This, - LPCWSTR *ppszHeaders); -void __RPC_STUB IWSDHttpMessageParameters_GetInboundHttpHeaders_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDHttpMessageParameters_SetOutboundHttpHeaders_Proxy( - IWSDHttpMessageParameters* This, - LPCWSTR pszHeaders); -void __RPC_STUB IWSDHttpMessageParameters_SetOutboundHttpHeaders_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDHttpMessageParameters_GetOutboundHttpHeaders_Proxy( - IWSDHttpMessageParameters* This, - LPCWSTR *ppszHeaders); -void __RPC_STUB IWSDHttpMessageParameters_GetOutboundHttpHeaders_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDHttpMessageParameters_SetID_Proxy( - IWSDHttpMessageParameters* This, - LPCWSTR pszId); -void __RPC_STUB IWSDHttpMessageParameters_SetID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDHttpMessageParameters_GetID_Proxy( - IWSDHttpMessageParameters* This, - LPCWSTR *ppszId); -void __RPC_STUB IWSDHttpMessageParameters_GetID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDHttpMessageParameters_SetContext_Proxy( - IWSDHttpMessageParameters* This, - IUnknown *pContext); -void __RPC_STUB IWSDHttpMessageParameters_SetContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDHttpMessageParameters_GetContext_Proxy( - IWSDHttpMessageParameters* This, - IUnknown **ppContext); -void __RPC_STUB IWSDHttpMessageParameters_GetContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDHttpMessageParameters_Clear_Proxy( - IWSDHttpMessageParameters* This); -void __RPC_STUB IWSDHttpMessageParameters_Clear_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDHttpMessageParameters_INTERFACE_DEFINED__ */ @@ -1438,67 +1228,68 @@ typedef struct IWSDHttpAddressVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDHttpAddress* This, + IWSDHttpAddress *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDHttpAddress* This); + IWSDHttpAddress *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDHttpAddress* This); + IWSDHttpAddress *This); /*** IWSDAddress methods ***/ HRESULT (STDMETHODCALLTYPE *Serialize)( - IWSDHttpAddress* This, + IWSDHttpAddress *This, LPWSTR pszBuffer, DWORD cchLength, WINBOOL fSafe); HRESULT (STDMETHODCALLTYPE *Deserialize)( - IWSDHttpAddress* This, + IWSDHttpAddress *This, LPCWSTR pszBuffer); /*** IWSDTransportAddress methods ***/ HRESULT (STDMETHODCALLTYPE *GetPort)( - IWSDHttpAddress* This, + IWSDHttpAddress *This, WORD *pwPort); HRESULT (STDMETHODCALLTYPE *SetPort)( - IWSDHttpAddress* This, + IWSDHttpAddress *This, WORD wPort); HRESULT (STDMETHODCALLTYPE *GetTransportAddress)( - IWSDHttpAddress* This, + IWSDHttpAddress *This, LPCWSTR *ppszAddress); HRESULT (STDMETHODCALLTYPE *GetTransportAddressEx)( - IWSDHttpAddress* This, + IWSDHttpAddress *This, WINBOOL fSafe, LPCWSTR *ppszAddress); HRESULT (STDMETHODCALLTYPE *SetTransportAddress)( - IWSDHttpAddress* This, + IWSDHttpAddress *This, LPCWSTR pszAddress); /*** IWSDHttpAddress methods ***/ HRESULT (STDMETHODCALLTYPE *GetSecure)( - IWSDHttpAddress* This); + IWSDHttpAddress *This); HRESULT (STDMETHODCALLTYPE *SetSecure)( - IWSDHttpAddress* This, + IWSDHttpAddress *This, WINBOOL fSecure); HRESULT (STDMETHODCALLTYPE *GetPath)( - IWSDHttpAddress* This, + IWSDHttpAddress *This, LPCWSTR *ppszPath); HRESULT (STDMETHODCALLTYPE *SetPath)( - IWSDHttpAddress* This, + IWSDHttpAddress *This, LPCWSTR pszPath); END_INTERFACE } IWSDHttpAddressVtbl; + interface IWSDHttpAddress { CONST_VTBL IWSDHttpAddressVtbl* lpVtbl; }; @@ -1575,37 +1366,6 @@ static FORCEINLINE HRESULT IWSDHttpAddress_SetPath(IWSDHttpAddress* This,LPCWSTR #endif -HRESULT STDMETHODCALLTYPE IWSDHttpAddress_GetSecure_Proxy( - IWSDHttpAddress* This); -void __RPC_STUB IWSDHttpAddress_GetSecure_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDHttpAddress_SetSecure_Proxy( - IWSDHttpAddress* This, - WINBOOL fSecure); -void __RPC_STUB IWSDHttpAddress_SetSecure_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDHttpAddress_GetPath_Proxy( - IWSDHttpAddress* This, - LPCWSTR *ppszPath); -void __RPC_STUB IWSDHttpAddress_GetPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDHttpAddress_SetPath_Proxy( - IWSDHttpAddress* This, - LPCWSTR pszPath); -void __RPC_STUB IWSDHttpAddress_SetPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDHttpAddress_INTERFACE_DEFINED__ */ @@ -1637,27 +1397,28 @@ typedef struct IWSDSSLClientCertificateVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDSSLClientCertificate* This, + IWSDSSLClientCertificate *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDSSLClientCertificate* This); + IWSDSSLClientCertificate *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDSSLClientCertificate* This); + IWSDSSLClientCertificate *This); /*** IWSDSSLClientCertificate methods ***/ HRESULT (STDMETHODCALLTYPE *GetClientCertificate)( - IWSDSSLClientCertificate* This, + IWSDSSLClientCertificate *This, PCCERT_CONTEXT *ppCertContext); HRESULT (STDMETHODCALLTYPE *GetMappedAccessToken)( - IWSDSSLClientCertificate* This, + IWSDSSLClientCertificate *This, HANDLE *phToken); END_INTERFACE } IWSDSSLClientCertificateVtbl; + interface IWSDSSLClientCertificate { CONST_VTBL IWSDSSLClientCertificateVtbl* lpVtbl; }; @@ -1694,22 +1455,6 @@ static FORCEINLINE HRESULT IWSDSSLClientCertificate_GetMappedAccessToken(IWSDSSL #endif -HRESULT STDMETHODCALLTYPE IWSDSSLClientCertificate_GetClientCertificate_Proxy( - IWSDSSLClientCertificate* This, - PCCERT_CONTEXT *ppCertContext); -void __RPC_STUB IWSDSSLClientCertificate_GetClientCertificate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDSSLClientCertificate_GetMappedAccessToken_Proxy( - IWSDSSLClientCertificate* This, - HANDLE *phToken); -void __RPC_STUB IWSDSSLClientCertificate_GetMappedAccessToken_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDSSLClientCertificate_INTERFACE_DEFINED__ */ @@ -1740,27 +1485,28 @@ typedef struct IWSDHttpAuthParametersVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDHttpAuthParameters* This, + IWSDHttpAuthParameters *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDHttpAuthParameters* This); + IWSDHttpAuthParameters *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDHttpAuthParameters* This); + IWSDHttpAuthParameters *This); /*** IWSDHttpAuthParameters methods ***/ HRESULT (STDMETHODCALLTYPE *GetClientAccessToken)( - IWSDHttpAuthParameters* This, + IWSDHttpAuthParameters *This, HANDLE *phToken); HRESULT (STDMETHODCALLTYPE *GetAuthType)( - IWSDHttpAuthParameters* This, + IWSDHttpAuthParameters *This, PWSD_SECURITY_HTTP_AUTH_SCHEMES pAuthType); END_INTERFACE } IWSDHttpAuthParametersVtbl; + interface IWSDHttpAuthParameters { CONST_VTBL IWSDHttpAuthParametersVtbl* lpVtbl; }; @@ -1797,22 +1543,6 @@ static FORCEINLINE HRESULT IWSDHttpAuthParameters_GetAuthType(IWSDHttpAuthParame #endif -HRESULT STDMETHODCALLTYPE IWSDHttpAuthParameters_GetClientAccessToken_Proxy( - IWSDHttpAuthParameters* This, - HANDLE *phToken); -void __RPC_STUB IWSDHttpAuthParameters_GetClientAccessToken_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDHttpAuthParameters_GetAuthType_Proxy( - IWSDHttpAuthParameters* This, - PWSD_SECURITY_HTTP_AUTH_SCHEMES pAuthType); -void __RPC_STUB IWSDHttpAuthParameters_GetAuthType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDHttpAuthParameters_INTERFACE_DEFINED__ */ @@ -1855,42 +1585,43 @@ typedef struct IWSDSignaturePropertyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDSignatureProperty* This, + IWSDSignatureProperty *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDSignatureProperty* This); + IWSDSignatureProperty *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDSignatureProperty* This); + IWSDSignatureProperty *This); /*** IWSDSignatureProperty methods ***/ HRESULT (STDMETHODCALLTYPE *IsMessageSigned)( - IWSDSignatureProperty* This, + IWSDSignatureProperty *This, WINBOOL *pbSigned); HRESULT (STDMETHODCALLTYPE *IsMessageSignatureTrusted)( - IWSDSignatureProperty* This, + IWSDSignatureProperty *This, WINBOOL *pbSignatureTrusted); HRESULT (STDMETHODCALLTYPE *GetKeyInfo)( - IWSDSignatureProperty* This, + IWSDSignatureProperty *This, BYTE *pbKeyInfo, DWORD *pdwKeyInfoSize); HRESULT (STDMETHODCALLTYPE *GetSignature)( - IWSDSignatureProperty* This, + IWSDSignatureProperty *This, BYTE *pbSignature, DWORD *pdwSignatureSize); HRESULT (STDMETHODCALLTYPE *GetSignedInfoHash)( - IWSDSignatureProperty* This, + IWSDSignatureProperty *This, BYTE *pbSignedInfoHash, DWORD *pdwHashSize); END_INTERFACE } IWSDSignaturePropertyVtbl; + interface IWSDSignatureProperty { CONST_VTBL IWSDSignaturePropertyVtbl* lpVtbl; }; @@ -1939,49 +1670,6 @@ static FORCEINLINE HRESULT IWSDSignatureProperty_GetSignedInfoHash(IWSDSignature #endif -HRESULT STDMETHODCALLTYPE IWSDSignatureProperty_IsMessageSigned_Proxy( - IWSDSignatureProperty* This, - WINBOOL *pbSigned); -void __RPC_STUB IWSDSignatureProperty_IsMessageSigned_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDSignatureProperty_IsMessageSignatureTrusted_Proxy( - IWSDSignatureProperty* This, - WINBOOL *pbSignatureTrusted); -void __RPC_STUB IWSDSignatureProperty_IsMessageSignatureTrusted_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDSignatureProperty_GetKeyInfo_Proxy( - IWSDSignatureProperty* This, - BYTE *pbKeyInfo, - DWORD *pdwKeyInfoSize); -void __RPC_STUB IWSDSignatureProperty_GetKeyInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDSignatureProperty_GetSignature_Proxy( - IWSDSignatureProperty* This, - BYTE *pbSignature, - DWORD *pdwSignatureSize); -void __RPC_STUB IWSDSignatureProperty_GetSignature_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDSignatureProperty_GetSignedInfoHash_Proxy( - IWSDSignatureProperty* This, - BYTE *pbSignedInfoHash, - DWORD *pdwHashSize); -void __RPC_STUB IWSDSignatureProperty_GetSignedInfoHash_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDSignatureProperty_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/wsdclient.h b/lib/libc/include/any-windows-any/wsdclient.h index b9c6273167..6f9f148dc9 100644 --- a/lib/libc/include/any-windows-any/wsdclient.h +++ b/lib/libc/include/any-windows-any/wsdclient.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/wsdclient.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/wsdclient.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,41 +21,65 @@ #ifndef __IWSDAsyncResult_FWD_DEFINED__ #define __IWSDAsyncResult_FWD_DEFINED__ typedef interface IWSDAsyncResult IWSDAsyncResult; +#ifdef __cplusplus +interface IWSDAsyncResult; +#endif /* __cplusplus */ #endif #ifndef __IWSDAsyncCallback_FWD_DEFINED__ #define __IWSDAsyncCallback_FWD_DEFINED__ typedef interface IWSDAsyncCallback IWSDAsyncCallback; +#ifdef __cplusplus +interface IWSDAsyncCallback; +#endif /* __cplusplus */ #endif #ifndef __IWSDMetadataExchange_FWD_DEFINED__ #define __IWSDMetadataExchange_FWD_DEFINED__ typedef interface IWSDMetadataExchange IWSDMetadataExchange; +#ifdef __cplusplus +interface IWSDMetadataExchange; +#endif /* __cplusplus */ #endif #ifndef __IWSDEventingStatus_FWD_DEFINED__ #define __IWSDEventingStatus_FWD_DEFINED__ typedef interface IWSDEventingStatus IWSDEventingStatus; +#ifdef __cplusplus +interface IWSDEventingStatus; +#endif /* __cplusplus */ #endif #ifndef __IWSDEndpointProxy_FWD_DEFINED__ #define __IWSDEndpointProxy_FWD_DEFINED__ typedef interface IWSDEndpointProxy IWSDEndpointProxy; +#ifdef __cplusplus +interface IWSDEndpointProxy; +#endif /* __cplusplus */ #endif #ifndef __IWSDDeviceProxy_FWD_DEFINED__ #define __IWSDDeviceProxy_FWD_DEFINED__ typedef interface IWSDDeviceProxy IWSDDeviceProxy; +#ifdef __cplusplus +interface IWSDDeviceProxy; +#endif /* __cplusplus */ #endif #ifndef __IWSDServiceProxy_FWD_DEFINED__ #define __IWSDServiceProxy_FWD_DEFINED__ typedef interface IWSDServiceProxy IWSDServiceProxy; +#ifdef __cplusplus +interface IWSDServiceProxy; +#endif /* __cplusplus */ #endif #ifndef __IWSDServiceProxyEventing_FWD_DEFINED__ #define __IWSDServiceProxyEventing_FWD_DEFINED__ typedef interface IWSDServiceProxyEventing IWSDServiceProxyEventing; +#ifdef __cplusplus +interface IWSDServiceProxyEventing; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -75,51 +100,81 @@ extern "C" { #ifndef __IWSDAddress_FWD_DEFINED__ #define __IWSDAddress_FWD_DEFINED__ typedef interface IWSDAddress IWSDAddress; +#ifdef __cplusplus +interface IWSDAddress; +#endif /* __cplusplus */ #endif #ifndef __IWSDXMLContext_FWD_DEFINED__ #define __IWSDXMLContext_FWD_DEFINED__ typedef interface IWSDXMLContext IWSDXMLContext; +#ifdef __cplusplus +interface IWSDXMLContext; +#endif /* __cplusplus */ #endif #ifndef __IWSDiscoveredService_FWD_DEFINED__ #define __IWSDiscoveredService_FWD_DEFINED__ typedef interface IWSDiscoveredService IWSDiscoveredService; +#ifdef __cplusplus +interface IWSDiscoveredService; +#endif /* __cplusplus */ #endif #ifndef __IWSDDeviceProxy_FWD_DEFINED__ #define __IWSDDeviceProxy_FWD_DEFINED__ typedef interface IWSDDeviceProxy IWSDDeviceProxy; +#ifdef __cplusplus +interface IWSDDeviceProxy; +#endif /* __cplusplus */ #endif #ifndef __IWSDServiceProxy_FWD_DEFINED__ #define __IWSDServiceProxy_FWD_DEFINED__ typedef interface IWSDServiceProxy IWSDServiceProxy; +#ifdef __cplusplus +interface IWSDServiceProxy; +#endif /* __cplusplus */ #endif #ifndef __IWSDEndpointProxy_FWD_DEFINED__ #define __IWSDEndpointProxy_FWD_DEFINED__ typedef interface IWSDEndpointProxy IWSDEndpointProxy; +#ifdef __cplusplus +interface IWSDEndpointProxy; +#endif /* __cplusplus */ #endif #ifndef __IWSDAsyncResult_FWD_DEFINED__ #define __IWSDAsyncResult_FWD_DEFINED__ typedef interface IWSDAsyncResult IWSDAsyncResult; +#ifdef __cplusplus +interface IWSDAsyncResult; +#endif /* __cplusplus */ #endif #ifndef __IWSDAsyncCallback_FWD_DEFINED__ #define __IWSDAsyncCallback_FWD_DEFINED__ typedef interface IWSDAsyncCallback IWSDAsyncCallback; +#ifdef __cplusplus +interface IWSDAsyncCallback; +#endif /* __cplusplus */ #endif #ifndef __IWSDMetadataExchange_FWD_DEFINED__ #define __IWSDMetadataExchange_FWD_DEFINED__ typedef interface IWSDMetadataExchange IWSDMetadataExchange; +#ifdef __cplusplus +interface IWSDMetadataExchange; +#endif /* __cplusplus */ #endif #ifndef __IWSDEventingStatus_FWD_DEFINED__ #define __IWSDEventingStatus_FWD_DEFINED__ typedef interface IWSDEventingStatus IWSDEventingStatus; +#ifdef __cplusplus +interface IWSDEventingStatus; +#endif /* __cplusplus */ #endif /***************************************************************************** @@ -165,46 +220,47 @@ typedef struct IWSDAsyncResultVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDAsyncResult* This, + IWSDAsyncResult *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDAsyncResult* This); + IWSDAsyncResult *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDAsyncResult* This); + IWSDAsyncResult *This); /*** IWSDAsyncResult methods ***/ HRESULT (STDMETHODCALLTYPE *SetCallback)( - IWSDAsyncResult* This, + IWSDAsyncResult *This, IWSDAsyncCallback *pCallback, IUnknown *pAsyncState); HRESULT (STDMETHODCALLTYPE *SetWaitHandle)( - IWSDAsyncResult* This, + IWSDAsyncResult *This, HANDLE hWaitHandle); HRESULT (STDMETHODCALLTYPE *HasCompleted)( - IWSDAsyncResult* This); + IWSDAsyncResult *This); HRESULT (STDMETHODCALLTYPE *GetAsyncState)( - IWSDAsyncResult* This, + IWSDAsyncResult *This, IUnknown **ppAsyncState); HRESULT (STDMETHODCALLTYPE *Abort)( - IWSDAsyncResult* This); + IWSDAsyncResult *This); HRESULT (STDMETHODCALLTYPE *GetEvent)( - IWSDAsyncResult* This, + IWSDAsyncResult *This, WSD_EVENT *pEvent); HRESULT (STDMETHODCALLTYPE *GetEndpointProxy)( - IWSDAsyncResult* This, + IWSDAsyncResult *This, IWSDEndpointProxy **ppEndpoint); END_INTERFACE } IWSDAsyncResultVtbl; + interface IWSDAsyncResult { CONST_VTBL IWSDAsyncResultVtbl* lpVtbl; }; @@ -261,61 +317,6 @@ static FORCEINLINE HRESULT IWSDAsyncResult_GetEndpointProxy(IWSDAsyncResult* Thi #endif -HRESULT STDMETHODCALLTYPE IWSDAsyncResult_SetCallback_Proxy( - IWSDAsyncResult* This, - IWSDAsyncCallback *pCallback, - IUnknown *pAsyncState); -void __RPC_STUB IWSDAsyncResult_SetCallback_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDAsyncResult_SetWaitHandle_Proxy( - IWSDAsyncResult* This, - HANDLE hWaitHandle); -void __RPC_STUB IWSDAsyncResult_SetWaitHandle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDAsyncResult_HasCompleted_Proxy( - IWSDAsyncResult* This); -void __RPC_STUB IWSDAsyncResult_HasCompleted_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDAsyncResult_GetAsyncState_Proxy( - IWSDAsyncResult* This, - IUnknown **ppAsyncState); -void __RPC_STUB IWSDAsyncResult_GetAsyncState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDAsyncResult_Abort_Proxy( - IWSDAsyncResult* This); -void __RPC_STUB IWSDAsyncResult_Abort_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDAsyncResult_GetEvent_Proxy( - IWSDAsyncResult* This, - WSD_EVENT *pEvent); -void __RPC_STUB IWSDAsyncResult_GetEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDAsyncResult_GetEndpointProxy_Proxy( - IWSDAsyncResult* This, - IWSDEndpointProxy **ppEndpoint); -void __RPC_STUB IWSDAsyncResult_GetEndpointProxy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDAsyncResult_INTERFACE_DEFINED__ */ @@ -344,24 +345,25 @@ typedef struct IWSDAsyncCallbackVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDAsyncCallback* This, + IWSDAsyncCallback *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDAsyncCallback* This); + IWSDAsyncCallback *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDAsyncCallback* This); + IWSDAsyncCallback *This); /*** IWSDAsyncCallback methods ***/ HRESULT (STDMETHODCALLTYPE *AsyncOperationComplete)( - IWSDAsyncCallback* This, + IWSDAsyncCallback *This, IWSDAsyncResult *pAsyncResult, IUnknown *pAsyncState); END_INTERFACE } IWSDAsyncCallbackVtbl; + interface IWSDAsyncCallback { CONST_VTBL IWSDAsyncCallbackVtbl* lpVtbl; }; @@ -394,15 +396,6 @@ static FORCEINLINE HRESULT IWSDAsyncCallback_AsyncOperationComplete(IWSDAsyncCal #endif -HRESULT STDMETHODCALLTYPE IWSDAsyncCallback_AsyncOperationComplete_Proxy( - IWSDAsyncCallback* This, - IWSDAsyncResult *pAsyncResult, - IUnknown *pAsyncState); -void __RPC_STUB IWSDAsyncCallback_AsyncOperationComplete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDAsyncCallback_INTERFACE_DEFINED__ */ @@ -430,23 +423,24 @@ typedef struct IWSDMetadataExchangeVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDMetadataExchange* This, + IWSDMetadataExchange *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDMetadataExchange* This); + IWSDMetadataExchange *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDMetadataExchange* This); + IWSDMetadataExchange *This); /*** IWSDMetadataExchange methods ***/ HRESULT (STDMETHODCALLTYPE *GetMetadata)( - IWSDMetadataExchange* This, + IWSDMetadataExchange *This, WSD_METADATA_SECTION_LIST **MetadataOut); END_INTERFACE } IWSDMetadataExchangeVtbl; + interface IWSDMetadataExchange { CONST_VTBL IWSDMetadataExchangeVtbl* lpVtbl; }; @@ -479,14 +473,6 @@ static FORCEINLINE HRESULT IWSDMetadataExchange_GetMetadata(IWSDMetadataExchange #endif -HRESULT STDMETHODCALLTYPE IWSDMetadataExchange_GetMetadata_Proxy( - IWSDMetadataExchange* This, - WSD_METADATA_SECTION_LIST **MetadataOut); -void __RPC_STUB IWSDMetadataExchange_GetMetadata_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDMetadataExchange_INTERFACE_DEFINED__ */ @@ -521,32 +507,33 @@ typedef struct IWSDEventingStatusVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDEventingStatus* This, + IWSDEventingStatus *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDEventingStatus* This); + IWSDEventingStatus *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDEventingStatus* This); + IWSDEventingStatus *This); /*** IWSDEventingStatus methods ***/ void (STDMETHODCALLTYPE *SubscriptionRenewed)( - IWSDEventingStatus* This, + IWSDEventingStatus *This, LPCWSTR pszSubscriptionAction); void (STDMETHODCALLTYPE *SubscriptionRenewalFailed)( - IWSDEventingStatus* This, + IWSDEventingStatus *This, LPCWSTR pszSubscriptionAction, HRESULT hr); void (STDMETHODCALLTYPE *SubscriptionEnded)( - IWSDEventingStatus* This, + IWSDEventingStatus *This, LPCWSTR pszSubscriptionAction); END_INTERFACE } IWSDEventingStatusVtbl; + interface IWSDEventingStatus { CONST_VTBL IWSDEventingStatusVtbl* lpVtbl; }; @@ -587,31 +574,6 @@ static FORCEINLINE void IWSDEventingStatus_SubscriptionEnded(IWSDEventingStatus* #endif -void STDMETHODCALLTYPE IWSDEventingStatus_SubscriptionRenewed_Proxy( - IWSDEventingStatus* This, - LPCWSTR pszSubscriptionAction); -void __RPC_STUB IWSDEventingStatus_SubscriptionRenewed_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -void STDMETHODCALLTYPE IWSDEventingStatus_SubscriptionRenewalFailed_Proxy( - IWSDEventingStatus* This, - LPCWSTR pszSubscriptionAction, - HRESULT hr); -void __RPC_STUB IWSDEventingStatus_SubscriptionRenewalFailed_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -void STDMETHODCALLTYPE IWSDEventingStatus_SubscriptionEnded_Proxy( - IWSDEventingStatus* This, - LPCWSTR pszSubscriptionAction); -void __RPC_STUB IWSDEventingStatus_SubscriptionEnded_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDEventingStatus_INTERFACE_DEFINED__ */ @@ -664,30 +626,30 @@ typedef struct IWSDEndpointProxyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDEndpointProxy* This, + IWSDEndpointProxy *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDEndpointProxy* This); + IWSDEndpointProxy *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDEndpointProxy* This); + IWSDEndpointProxy *This); /*** IWSDEndpointProxy methods ***/ HRESULT (STDMETHODCALLTYPE *SendOneWayRequest)( - IWSDEndpointProxy* This, + IWSDEndpointProxy *This, const void *pBody, const WSD_OPERATION *pOperation); HRESULT (STDMETHODCALLTYPE *SendTwoWayRequest)( - IWSDEndpointProxy* This, + IWSDEndpointProxy *This, const void *pBody, const WSD_OPERATION *pOperation, const WSD_SYNCHRONOUS_RESPONSE_CONTEXT *pResponseContext); HRESULT (STDMETHODCALLTYPE *SendTwoWayRequestAsync)( - IWSDEndpointProxy* This, + IWSDEndpointProxy *This, const void *pBody, const WSD_OPERATION *pOperation, IUnknown *pAsyncState, @@ -695,23 +657,24 @@ typedef struct IWSDEndpointProxyVtbl { IWSDAsyncResult **pResult); HRESULT (STDMETHODCALLTYPE *AbortAsyncOperation)( - IWSDEndpointProxy* This, + IWSDEndpointProxy *This, IWSDAsyncResult *pAsyncResult); HRESULT (STDMETHODCALLTYPE *ProcessFault)( - IWSDEndpointProxy* This, + IWSDEndpointProxy *This, const WSD_SOAP_FAULT *pFault); HRESULT (STDMETHODCALLTYPE *GetErrorInfo)( - IWSDEndpointProxy* This, + IWSDEndpointProxy *This, LPCWSTR *ppszErrorInfo); HRESULT (STDMETHODCALLTYPE *GetFaultInfo)( - IWSDEndpointProxy* This, + IWSDEndpointProxy *This, WSD_SOAP_FAULT **ppFault); END_INTERFACE } IWSDEndpointProxyVtbl; + interface IWSDEndpointProxy { CONST_VTBL IWSDEndpointProxyVtbl* lpVtbl; }; @@ -768,69 +731,6 @@ static FORCEINLINE HRESULT IWSDEndpointProxy_GetFaultInfo(IWSDEndpointProxy* Thi #endif -HRESULT STDMETHODCALLTYPE IWSDEndpointProxy_SendOneWayRequest_Proxy( - IWSDEndpointProxy* This, - const void *pBody, - const WSD_OPERATION *pOperation); -void __RPC_STUB IWSDEndpointProxy_SendOneWayRequest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDEndpointProxy_SendTwoWayRequest_Proxy( - IWSDEndpointProxy* This, - const void *pBody, - const WSD_OPERATION *pOperation, - const WSD_SYNCHRONOUS_RESPONSE_CONTEXT *pResponseContext); -void __RPC_STUB IWSDEndpointProxy_SendTwoWayRequest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDEndpointProxy_SendTwoWayRequestAsync_Proxy( - IWSDEndpointProxy* This, - const void *pBody, - const WSD_OPERATION *pOperation, - IUnknown *pAsyncState, - IWSDAsyncCallback *pCallback, - IWSDAsyncResult **pResult); -void __RPC_STUB IWSDEndpointProxy_SendTwoWayRequestAsync_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDEndpointProxy_AbortAsyncOperation_Proxy( - IWSDEndpointProxy* This, - IWSDAsyncResult *pAsyncResult); -void __RPC_STUB IWSDEndpointProxy_AbortAsyncOperation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDEndpointProxy_ProcessFault_Proxy( - IWSDEndpointProxy* This, - const WSD_SOAP_FAULT *pFault); -void __RPC_STUB IWSDEndpointProxy_ProcessFault_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDEndpointProxy_GetErrorInfo_Proxy( - IWSDEndpointProxy* This, - LPCWSTR *ppszErrorInfo); -void __RPC_STUB IWSDEndpointProxy_GetErrorInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDEndpointProxy_GetFaultInfo_Proxy( - IWSDEndpointProxy* This, - WSD_SOAP_FAULT **ppFault); -void __RPC_STUB IWSDEndpointProxy_GetFaultInfo_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDEndpointProxy_INTERFACE_DEFINED__ */ @@ -891,19 +791,19 @@ typedef struct IWSDDeviceProxyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDDeviceProxy* This, + IWSDDeviceProxy *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDDeviceProxy* This); + IWSDDeviceProxy *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDDeviceProxy* This); + IWSDDeviceProxy *This); /*** IWSDDeviceProxy methods ***/ HRESULT (STDMETHODCALLTYPE *Init)( - IWSDDeviceProxy* This, + IWSDDeviceProxy *This, LPCWSTR pszDeviceId, IWSDAddress *pDeviceAddress, LPCWSTR pszLocalId, @@ -911,45 +811,46 @@ typedef struct IWSDDeviceProxyVtbl { IWSDDeviceProxy *pSponsor); HRESULT (STDMETHODCALLTYPE *BeginGetMetadata)( - IWSDDeviceProxy* This, + IWSDDeviceProxy *This, IWSDAsyncResult **ppResult); HRESULT (STDMETHODCALLTYPE *EndGetMetadata)( - IWSDDeviceProxy* This, + IWSDDeviceProxy *This, IWSDAsyncResult *pResult); HRESULT (STDMETHODCALLTYPE *GetHostMetadata)( - IWSDDeviceProxy* This, + IWSDDeviceProxy *This, WSD_HOST_METADATA **ppHostMetadata); HRESULT (STDMETHODCALLTYPE *GetThisModelMetadata)( - IWSDDeviceProxy* This, + IWSDDeviceProxy *This, WSD_THIS_MODEL_METADATA **ppManufacturerMetadata); HRESULT (STDMETHODCALLTYPE *GetThisDeviceMetadata)( - IWSDDeviceProxy* This, + IWSDDeviceProxy *This, WSD_THIS_DEVICE_METADATA **ppThisDeviceMetadata); HRESULT (STDMETHODCALLTYPE *GetAllMetadata)( - IWSDDeviceProxy* This, + IWSDDeviceProxy *This, WSD_METADATA_SECTION_LIST **ppMetadata); HRESULT (STDMETHODCALLTYPE *GetServiceProxyById)( - IWSDDeviceProxy* This, + IWSDDeviceProxy *This, LPCWSTR pszServiceId, IWSDServiceProxy **ppServiceProxy); HRESULT (STDMETHODCALLTYPE *GetServiceProxyByType)( - IWSDDeviceProxy* This, + IWSDDeviceProxy *This, const WSDXML_NAME *pType, IWSDServiceProxy **ppServiceProxy); HRESULT (STDMETHODCALLTYPE *GetEndpointProxy)( - IWSDDeviceProxy* This, + IWSDDeviceProxy *This, IWSDEndpointProxy **ppProxy); END_INTERFACE } IWSDDeviceProxyVtbl; + interface IWSDDeviceProxy { CONST_VTBL IWSDDeviceProxyVtbl* lpVtbl; }; @@ -1018,92 +919,6 @@ static FORCEINLINE HRESULT IWSDDeviceProxy_GetEndpointProxy(IWSDDeviceProxy* Thi #endif -HRESULT STDMETHODCALLTYPE IWSDDeviceProxy_Init_Proxy( - IWSDDeviceProxy* This, - LPCWSTR pszDeviceId, - IWSDAddress *pDeviceAddress, - LPCWSTR pszLocalId, - IWSDXMLContext *pContext, - IWSDDeviceProxy *pSponsor); -void __RPC_STUB IWSDDeviceProxy_Init_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDDeviceProxy_BeginGetMetadata_Proxy( - IWSDDeviceProxy* This, - IWSDAsyncResult **ppResult); -void __RPC_STUB IWSDDeviceProxy_BeginGetMetadata_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDDeviceProxy_EndGetMetadata_Proxy( - IWSDDeviceProxy* This, - IWSDAsyncResult *pResult); -void __RPC_STUB IWSDDeviceProxy_EndGetMetadata_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDDeviceProxy_GetHostMetadata_Proxy( - IWSDDeviceProxy* This, - WSD_HOST_METADATA **ppHostMetadata); -void __RPC_STUB IWSDDeviceProxy_GetHostMetadata_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDDeviceProxy_GetThisModelMetadata_Proxy( - IWSDDeviceProxy* This, - WSD_THIS_MODEL_METADATA **ppManufacturerMetadata); -void __RPC_STUB IWSDDeviceProxy_GetThisModelMetadata_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDDeviceProxy_GetThisDeviceMetadata_Proxy( - IWSDDeviceProxy* This, - WSD_THIS_DEVICE_METADATA **ppThisDeviceMetadata); -void __RPC_STUB IWSDDeviceProxy_GetThisDeviceMetadata_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDDeviceProxy_GetAllMetadata_Proxy( - IWSDDeviceProxy* This, - WSD_METADATA_SECTION_LIST **ppMetadata); -void __RPC_STUB IWSDDeviceProxy_GetAllMetadata_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDDeviceProxy_GetServiceProxyById_Proxy( - IWSDDeviceProxy* This, - LPCWSTR pszServiceId, - IWSDServiceProxy **ppServiceProxy); -void __RPC_STUB IWSDDeviceProxy_GetServiceProxyById_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDDeviceProxy_GetServiceProxyByType_Proxy( - IWSDDeviceProxy* This, - const WSDXML_NAME *pType, - IWSDServiceProxy **ppServiceProxy); -void __RPC_STUB IWSDDeviceProxy_GetServiceProxyByType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDDeviceProxy_GetEndpointProxy_Proxy( - IWSDDeviceProxy* This, - IWSDEndpointProxy **ppProxy); -void __RPC_STUB IWSDDeviceProxy_GetEndpointProxy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDDeviceProxy_INTERFACE_DEFINED__ */ @@ -1153,56 +968,57 @@ typedef struct IWSDServiceProxyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDServiceProxy* This, + IWSDServiceProxy *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDServiceProxy* This); + IWSDServiceProxy *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDServiceProxy* This); + IWSDServiceProxy *This); /*** IWSDMetadataExchange methods ***/ HRESULT (STDMETHODCALLTYPE *GetMetadata)( - IWSDServiceProxy* This, + IWSDServiceProxy *This, WSD_METADATA_SECTION_LIST **MetadataOut); /*** IWSDServiceProxy methods ***/ HRESULT (STDMETHODCALLTYPE *BeginGetMetadata)( - IWSDServiceProxy* This, + IWSDServiceProxy *This, IWSDAsyncResult **ppResult); HRESULT (STDMETHODCALLTYPE *EndGetMetadata)( - IWSDServiceProxy* This, + IWSDServiceProxy *This, IWSDAsyncResult *pResult, WSD_METADATA_SECTION_LIST **ppMetadata); HRESULT (STDMETHODCALLTYPE *GetServiceMetadata)( - IWSDServiceProxy* This, + IWSDServiceProxy *This, WSD_SERVICE_METADATA **ppServiceMetadata); HRESULT (STDMETHODCALLTYPE *SubscribeToOperation)( - IWSDServiceProxy* This, + IWSDServiceProxy *This, const WSD_OPERATION *pOperation, IUnknown *pUnknown, const WSDXML_ELEMENT *pAny, WSDXML_ELEMENT **ppAny); HRESULT (STDMETHODCALLTYPE *UnsubscribeToOperation)( - IWSDServiceProxy* This, + IWSDServiceProxy *This, const WSD_OPERATION *pOperation); HRESULT (STDMETHODCALLTYPE *SetEventingStatusCallback)( - IWSDServiceProxy* This, + IWSDServiceProxy *This, IWSDEventingStatus *pStatus); HRESULT (STDMETHODCALLTYPE *GetEndpointProxy)( - IWSDServiceProxy* This, + IWSDServiceProxy *This, IWSDEndpointProxy **ppProxy); END_INTERFACE } IWSDServiceProxyVtbl; + interface IWSDServiceProxy { CONST_VTBL IWSDServiceProxyVtbl* lpVtbl; }; @@ -1265,66 +1081,6 @@ static FORCEINLINE HRESULT IWSDServiceProxy_GetEndpointProxy(IWSDServiceProxy* T #endif -HRESULT STDMETHODCALLTYPE IWSDServiceProxy_BeginGetMetadata_Proxy( - IWSDServiceProxy* This, - IWSDAsyncResult **ppResult); -void __RPC_STUB IWSDServiceProxy_BeginGetMetadata_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDServiceProxy_EndGetMetadata_Proxy( - IWSDServiceProxy* This, - IWSDAsyncResult *pResult, - WSD_METADATA_SECTION_LIST **ppMetadata); -void __RPC_STUB IWSDServiceProxy_EndGetMetadata_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDServiceProxy_GetServiceMetadata_Proxy( - IWSDServiceProxy* This, - WSD_SERVICE_METADATA **ppServiceMetadata); -void __RPC_STUB IWSDServiceProxy_GetServiceMetadata_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDServiceProxy_SubscribeToOperation_Proxy( - IWSDServiceProxy* This, - const WSD_OPERATION *pOperation, - IUnknown *pUnknown, - const WSDXML_ELEMENT *pAny, - WSDXML_ELEMENT **ppAny); -void __RPC_STUB IWSDServiceProxy_SubscribeToOperation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDServiceProxy_UnsubscribeToOperation_Proxy( - IWSDServiceProxy* This, - const WSD_OPERATION *pOperation); -void __RPC_STUB IWSDServiceProxy_UnsubscribeToOperation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDServiceProxy_SetEventingStatusCallback_Proxy( - IWSDServiceProxy* This, - IWSDEventingStatus *pStatus); -void __RPC_STUB IWSDServiceProxy_SetEventingStatusCallback_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDServiceProxy_GetEndpointProxy_Proxy( - IWSDServiceProxy* This, - IWSDEndpointProxy **ppProxy); -void __RPC_STUB IWSDServiceProxy_GetEndpointProxy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDServiceProxy_INTERFACE_DEFINED__ */ @@ -1440,57 +1196,57 @@ typedef struct IWSDServiceProxyEventingVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDServiceProxyEventing* This, + IWSDServiceProxyEventing *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDServiceProxyEventing* This); + IWSDServiceProxyEventing *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDServiceProxyEventing* This); + IWSDServiceProxyEventing *This); /*** IWSDMetadataExchange methods ***/ HRESULT (STDMETHODCALLTYPE *GetMetadata)( - IWSDServiceProxyEventing* This, + IWSDServiceProxyEventing *This, WSD_METADATA_SECTION_LIST **MetadataOut); /*** IWSDServiceProxy methods ***/ HRESULT (STDMETHODCALLTYPE *BeginGetMetadata)( - IWSDServiceProxyEventing* This, + IWSDServiceProxyEventing *This, IWSDAsyncResult **ppResult); HRESULT (STDMETHODCALLTYPE *EndGetMetadata)( - IWSDServiceProxyEventing* This, + IWSDServiceProxyEventing *This, IWSDAsyncResult *pResult, WSD_METADATA_SECTION_LIST **ppMetadata); HRESULT (STDMETHODCALLTYPE *GetServiceMetadata)( - IWSDServiceProxyEventing* This, + IWSDServiceProxyEventing *This, WSD_SERVICE_METADATA **ppServiceMetadata); HRESULT (STDMETHODCALLTYPE *SubscribeToOperation)( - IWSDServiceProxyEventing* This, + IWSDServiceProxyEventing *This, const WSD_OPERATION *pOperation, IUnknown *pUnknown, const WSDXML_ELEMENT *pAny, WSDXML_ELEMENT **ppAny); HRESULT (STDMETHODCALLTYPE *UnsubscribeToOperation)( - IWSDServiceProxyEventing* This, + IWSDServiceProxyEventing *This, const WSD_OPERATION *pOperation); HRESULT (STDMETHODCALLTYPE *SetEventingStatusCallback)( - IWSDServiceProxyEventing* This, + IWSDServiceProxyEventing *This, IWSDEventingStatus *pStatus); HRESULT (STDMETHODCALLTYPE *GetEndpointProxy)( - IWSDServiceProxyEventing* This, + IWSDServiceProxyEventing *This, IWSDEndpointProxy **ppProxy); /*** IWSDServiceProxyEventing methods ***/ HRESULT (STDMETHODCALLTYPE *SubscribeToMultipleOperations)( - IWSDServiceProxyEventing* This, + IWSDServiceProxyEventing *This, const WSD_OPERATION *pOperations, DWORD dwOperationCount, IUnknown *pUnknown, @@ -1500,7 +1256,7 @@ typedef struct IWSDServiceProxyEventingVtbl { WSDXML_ELEMENT **ppAny); HRESULT (STDMETHODCALLTYPE *BeginSubscribeToMultipleOperations)( - IWSDServiceProxyEventing* This, + IWSDServiceProxyEventing *This, const WSD_OPERATION *pOperations, DWORD dwOperationCount, IUnknown *pUnknown, @@ -1511,7 +1267,7 @@ typedef struct IWSDServiceProxyEventingVtbl { IWSDAsyncResult **ppResult); HRESULT (STDMETHODCALLTYPE *EndSubscribeToMultipleOperations)( - IWSDServiceProxyEventing* This, + IWSDServiceProxyEventing *This, const WSD_OPERATION *pOperations, DWORD dwOperationCount, IWSDAsyncResult *pResult, @@ -1519,13 +1275,13 @@ typedef struct IWSDServiceProxyEventingVtbl { WSDXML_ELEMENT **ppAny); HRESULT (STDMETHODCALLTYPE *UnsubscribeToMultipleOperations)( - IWSDServiceProxyEventing* This, + IWSDServiceProxyEventing *This, const WSD_OPERATION *pOperations, DWORD dwOperationCount, const WSDXML_ELEMENT *pAny); HRESULT (STDMETHODCALLTYPE *BeginUnsubscribeToMultipleOperations)( - IWSDServiceProxyEventing* This, + IWSDServiceProxyEventing *This, const WSD_OPERATION *pOperations, DWORD dwOperationCount, const WSDXML_ELEMENT *pAny, @@ -1534,13 +1290,13 @@ typedef struct IWSDServiceProxyEventingVtbl { IWSDAsyncResult **ppResult); HRESULT (STDMETHODCALLTYPE *EndUnsubscribeToMultipleOperations)( - IWSDServiceProxyEventing* This, + IWSDServiceProxyEventing *This, const WSD_OPERATION *pOperations, DWORD dwOperationCount, IWSDAsyncResult *pResult); HRESULT (STDMETHODCALLTYPE *RenewMultipleOperations)( - IWSDServiceProxyEventing* This, + IWSDServiceProxyEventing *This, const WSD_OPERATION *pOperations, DWORD dwOperationCount, const WSD_EVENTING_EXPIRES *pExpires, @@ -1549,7 +1305,7 @@ typedef struct IWSDServiceProxyEventingVtbl { WSDXML_ELEMENT **ppAny); HRESULT (STDMETHODCALLTYPE *BeginRenewMultipleOperations)( - IWSDServiceProxyEventing* This, + IWSDServiceProxyEventing *This, const WSD_OPERATION *pOperations, DWORD dwOperationCount, const WSD_EVENTING_EXPIRES *pExpires, @@ -1559,7 +1315,7 @@ typedef struct IWSDServiceProxyEventingVtbl { IWSDAsyncResult **ppResult); HRESULT (STDMETHODCALLTYPE *EndRenewMultipleOperations)( - IWSDServiceProxyEventing* This, + IWSDServiceProxyEventing *This, const WSD_OPERATION *pOperations, DWORD dwOperationCount, IWSDAsyncResult *pResult, @@ -1567,7 +1323,7 @@ typedef struct IWSDServiceProxyEventingVtbl { WSDXML_ELEMENT **ppAny); HRESULT (STDMETHODCALLTYPE *GetStatusForMultipleOperations)( - IWSDServiceProxyEventing* This, + IWSDServiceProxyEventing *This, const WSD_OPERATION *pOperations, DWORD dwOperationCount, const WSDXML_ELEMENT *pAny, @@ -1575,7 +1331,7 @@ typedef struct IWSDServiceProxyEventingVtbl { WSDXML_ELEMENT **ppAny); HRESULT (STDMETHODCALLTYPE *BeginGetStatusForMultipleOperations)( - IWSDServiceProxyEventing* This, + IWSDServiceProxyEventing *This, const WSD_OPERATION *pOperations, DWORD dwOperationCount, const WSDXML_ELEMENT *pAny, @@ -1584,7 +1340,7 @@ typedef struct IWSDServiceProxyEventingVtbl { IWSDAsyncResult **ppResult); HRESULT (STDMETHODCALLTYPE *EndGetStatusForMultipleOperations)( - IWSDServiceProxyEventing* This, + IWSDServiceProxyEventing *This, const WSD_OPERATION *pOperations, DWORD dwOperationCount, IWSDAsyncResult *pResult, @@ -1593,6 +1349,7 @@ typedef struct IWSDServiceProxyEventingVtbl { END_INTERFACE } IWSDServiceProxyEventingVtbl; + interface IWSDServiceProxyEventing { CONST_VTBL IWSDServiceProxyEventingVtbl* lpVtbl; }; @@ -1705,156 +1462,6 @@ static FORCEINLINE HRESULT IWSDServiceProxyEventing_EndGetStatusForMultipleOpera #endif -HRESULT STDMETHODCALLTYPE IWSDServiceProxyEventing_SubscribeToMultipleOperations_Proxy( - IWSDServiceProxyEventing* This, - const WSD_OPERATION *pOperations, - DWORD dwOperationCount, - IUnknown *pUnknown, - const WSD_EVENTING_EXPIRES *pExpires, - const WSDXML_ELEMENT *pAny, - WSD_EVENTING_EXPIRES **ppExpires, - WSDXML_ELEMENT **ppAny); -void __RPC_STUB IWSDServiceProxyEventing_SubscribeToMultipleOperations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDServiceProxyEventing_BeginSubscribeToMultipleOperations_Proxy( - IWSDServiceProxyEventing* This, - const WSD_OPERATION *pOperations, - DWORD dwOperationCount, - IUnknown *pUnknown, - const WSD_EVENTING_EXPIRES *pExpires, - const WSDXML_ELEMENT *pAny, - IUnknown *pAsyncState, - IWSDAsyncCallback *pAsyncCallback, - IWSDAsyncResult **ppResult); -void __RPC_STUB IWSDServiceProxyEventing_BeginSubscribeToMultipleOperations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDServiceProxyEventing_EndSubscribeToMultipleOperations_Proxy( - IWSDServiceProxyEventing* This, - const WSD_OPERATION *pOperations, - DWORD dwOperationCount, - IWSDAsyncResult *pResult, - WSD_EVENTING_EXPIRES **ppExpires, - WSDXML_ELEMENT **ppAny); -void __RPC_STUB IWSDServiceProxyEventing_EndSubscribeToMultipleOperations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDServiceProxyEventing_UnsubscribeToMultipleOperations_Proxy( - IWSDServiceProxyEventing* This, - const WSD_OPERATION *pOperations, - DWORD dwOperationCount, - const WSDXML_ELEMENT *pAny); -void __RPC_STUB IWSDServiceProxyEventing_UnsubscribeToMultipleOperations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDServiceProxyEventing_BeginUnsubscribeToMultipleOperations_Proxy( - IWSDServiceProxyEventing* This, - const WSD_OPERATION *pOperations, - DWORD dwOperationCount, - const WSDXML_ELEMENT *pAny, - IUnknown *pAsyncState, - IWSDAsyncCallback *pAsyncCallback, - IWSDAsyncResult **ppResult); -void __RPC_STUB IWSDServiceProxyEventing_BeginUnsubscribeToMultipleOperations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDServiceProxyEventing_EndUnsubscribeToMultipleOperations_Proxy( - IWSDServiceProxyEventing* This, - const WSD_OPERATION *pOperations, - DWORD dwOperationCount, - IWSDAsyncResult *pResult); -void __RPC_STUB IWSDServiceProxyEventing_EndUnsubscribeToMultipleOperations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDServiceProxyEventing_RenewMultipleOperations_Proxy( - IWSDServiceProxyEventing* This, - const WSD_OPERATION *pOperations, - DWORD dwOperationCount, - const WSD_EVENTING_EXPIRES *pExpires, - const WSDXML_ELEMENT *pAny, - WSD_EVENTING_EXPIRES **ppExpires, - WSDXML_ELEMENT **ppAny); -void __RPC_STUB IWSDServiceProxyEventing_RenewMultipleOperations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDServiceProxyEventing_BeginRenewMultipleOperations_Proxy( - IWSDServiceProxyEventing* This, - const WSD_OPERATION *pOperations, - DWORD dwOperationCount, - const WSD_EVENTING_EXPIRES *pExpires, - const WSDXML_ELEMENT *pAny, - IUnknown *pAsyncState, - IWSDAsyncCallback *pAsyncCallback, - IWSDAsyncResult **ppResult); -void __RPC_STUB IWSDServiceProxyEventing_BeginRenewMultipleOperations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDServiceProxyEventing_EndRenewMultipleOperations_Proxy( - IWSDServiceProxyEventing* This, - const WSD_OPERATION *pOperations, - DWORD dwOperationCount, - IWSDAsyncResult *pResult, - WSD_EVENTING_EXPIRES **ppExpires, - WSDXML_ELEMENT **ppAny); -void __RPC_STUB IWSDServiceProxyEventing_EndRenewMultipleOperations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDServiceProxyEventing_GetStatusForMultipleOperations_Proxy( - IWSDServiceProxyEventing* This, - const WSD_OPERATION *pOperations, - DWORD dwOperationCount, - const WSDXML_ELEMENT *pAny, - WSD_EVENTING_EXPIRES **ppExpires, - WSDXML_ELEMENT **ppAny); -void __RPC_STUB IWSDServiceProxyEventing_GetStatusForMultipleOperations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDServiceProxyEventing_BeginGetStatusForMultipleOperations_Proxy( - IWSDServiceProxyEventing* This, - const WSD_OPERATION *pOperations, - DWORD dwOperationCount, - const WSDXML_ELEMENT *pAny, - IUnknown *pAsyncState, - IWSDAsyncCallback *pAsyncCallback, - IWSDAsyncResult **ppResult); -void __RPC_STUB IWSDServiceProxyEventing_BeginGetStatusForMultipleOperations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDServiceProxyEventing_EndGetStatusForMultipleOperations_Proxy( - IWSDServiceProxyEventing* This, - const WSD_OPERATION *pOperations, - DWORD dwOperationCount, - IWSDAsyncResult *pResult, - WSD_EVENTING_EXPIRES **ppExpires, - WSDXML_ELEMENT **ppAny); -void __RPC_STUB IWSDServiceProxyEventing_EndGetStatusForMultipleOperations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDServiceProxyEventing_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/wsddisco.h b/lib/libc/include/any-windows-any/wsddisco.h index 1f2f8886b0..604fb67b49 100644 --- a/lib/libc/include/any-windows-any/wsddisco.h +++ b/lib/libc/include/any-windows-any/wsddisco.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/wsddisco.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/wsddisco.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,31 +21,49 @@ #ifndef __IWSDScopeMatchingRule_FWD_DEFINED__ #define __IWSDScopeMatchingRule_FWD_DEFINED__ typedef interface IWSDScopeMatchingRule IWSDScopeMatchingRule; +#ifdef __cplusplus +interface IWSDScopeMatchingRule; +#endif /* __cplusplus */ #endif #ifndef __IWSDiscoveryProviderNotify_FWD_DEFINED__ #define __IWSDiscoveryProviderNotify_FWD_DEFINED__ typedef interface IWSDiscoveryProviderNotify IWSDiscoveryProviderNotify; +#ifdef __cplusplus +interface IWSDiscoveryProviderNotify; +#endif /* __cplusplus */ #endif #ifndef __IWSDiscoveryProvider_FWD_DEFINED__ #define __IWSDiscoveryProvider_FWD_DEFINED__ typedef interface IWSDiscoveryProvider IWSDiscoveryProvider; +#ifdef __cplusplus +interface IWSDiscoveryProvider; +#endif /* __cplusplus */ #endif #ifndef __IWSDiscoveredService_FWD_DEFINED__ #define __IWSDiscoveredService_FWD_DEFINED__ typedef interface IWSDiscoveredService IWSDiscoveredService; +#ifdef __cplusplus +interface IWSDiscoveredService; +#endif /* __cplusplus */ #endif #ifndef __IWSDiscoveryPublisherNotify_FWD_DEFINED__ #define __IWSDiscoveryPublisherNotify_FWD_DEFINED__ typedef interface IWSDiscoveryPublisherNotify IWSDiscoveryPublisherNotify; +#ifdef __cplusplus +interface IWSDiscoveryPublisherNotify; +#endif /* __cplusplus */ #endif #ifndef __IWSDiscoveryPublisher_FWD_DEFINED__ #define __IWSDiscoveryPublisher_FWD_DEFINED__ typedef interface IWSDiscoveryPublisher IWSDiscoveryPublisher; +#ifdef __cplusplus +interface IWSDiscoveryPublisher; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -64,36 +83,57 @@ extern "C" { #ifndef __IWSDXMLContext_FWD_DEFINED__ #define __IWSDXMLContext_FWD_DEFINED__ typedef interface IWSDXMLContext IWSDXMLContext; +#ifdef __cplusplus +interface IWSDXMLContext; +#endif /* __cplusplus */ #endif #ifndef __IWSDiscoveryProvider_FWD_DEFINED__ #define __IWSDiscoveryProvider_FWD_DEFINED__ typedef interface IWSDiscoveryProvider IWSDiscoveryProvider; +#ifdef __cplusplus +interface IWSDiscoveryProvider; +#endif /* __cplusplus */ #endif #ifndef __IWSDiscoveryProviderNotify_FWD_DEFINED__ #define __IWSDiscoveryProviderNotify_FWD_DEFINED__ typedef interface IWSDiscoveryProviderNotify IWSDiscoveryProviderNotify; +#ifdef __cplusplus +interface IWSDiscoveryProviderNotify; +#endif /* __cplusplus */ #endif #ifndef __IWSDiscoveredService_FWD_DEFINED__ #define __IWSDiscoveredService_FWD_DEFINED__ typedef interface IWSDiscoveredService IWSDiscoveredService; +#ifdef __cplusplus +interface IWSDiscoveredService; +#endif /* __cplusplus */ #endif #ifndef __IWSDiscoveryPublisher_FWD_DEFINED__ #define __IWSDiscoveryPublisher_FWD_DEFINED__ typedef interface IWSDiscoveryPublisher IWSDiscoveryPublisher; +#ifdef __cplusplus +interface IWSDiscoveryPublisher; +#endif /* __cplusplus */ #endif #ifndef __IWSDiscoveryPublisherNotify_FWD_DEFINED__ #define __IWSDiscoveryPublisherNotify_FWD_DEFINED__ typedef interface IWSDiscoveryPublisherNotify IWSDiscoveryPublisherNotify; +#ifdef __cplusplus +interface IWSDiscoveryPublisherNotify; +#endif /* __cplusplus */ #endif #ifndef __IWSDScopeMatchingRule_FWD_DEFINED__ #define __IWSDScopeMatchingRule_FWD_DEFINED__ typedef interface IWSDScopeMatchingRule IWSDScopeMatchingRule; +#ifdef __cplusplus +interface IWSDScopeMatchingRule; +#endif /* __cplusplus */ #endif /***************************************************************************** @@ -125,29 +165,30 @@ typedef struct IWSDScopeMatchingRuleVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDScopeMatchingRule* This, + IWSDScopeMatchingRule *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDScopeMatchingRule* This); + IWSDScopeMatchingRule *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDScopeMatchingRule* This); + IWSDScopeMatchingRule *This); /*** IWSDScopeMatchingRule methods ***/ HRESULT (STDMETHODCALLTYPE *GetScopeRule)( - IWSDScopeMatchingRule* This, + IWSDScopeMatchingRule *This, LPCWSTR *ppszScopeMatchingRule); HRESULT (STDMETHODCALLTYPE *MatchScopes)( - IWSDScopeMatchingRule* This, + IWSDScopeMatchingRule *This, LPCWSTR pszScope1, LPCWSTR pszScope2, WINBOOL *pfMatch); END_INTERFACE } IWSDScopeMatchingRuleVtbl; + interface IWSDScopeMatchingRule { CONST_VTBL IWSDScopeMatchingRuleVtbl* lpVtbl; }; @@ -184,24 +225,6 @@ static FORCEINLINE HRESULT IWSDScopeMatchingRule_MatchScopes(IWSDScopeMatchingRu #endif -HRESULT STDMETHODCALLTYPE IWSDScopeMatchingRule_GetScopeRule_Proxy( - IWSDScopeMatchingRule* This, - LPCWSTR *ppszScopeMatchingRule); -void __RPC_STUB IWSDScopeMatchingRule_GetScopeRule_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDScopeMatchingRule_MatchScopes_Proxy( - IWSDScopeMatchingRule* This, - LPCWSTR pszScope1, - LPCWSTR pszScope2, - WINBOOL *pfMatch); -void __RPC_STUB IWSDScopeMatchingRule_MatchScopes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDScopeMatchingRule_INTERFACE_DEFINED__ */ @@ -239,36 +262,37 @@ typedef struct IWSDiscoveryProviderNotifyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDiscoveryProviderNotify* This, + IWSDiscoveryProviderNotify *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDiscoveryProviderNotify* This); + IWSDiscoveryProviderNotify *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDiscoveryProviderNotify* This); + IWSDiscoveryProviderNotify *This); /*** IWSDiscoveryProviderNotify methods ***/ HRESULT (STDMETHODCALLTYPE *Add)( - IWSDiscoveryProviderNotify* This, + IWSDiscoveryProviderNotify *This, IWSDiscoveredService *pService); HRESULT (STDMETHODCALLTYPE *Remove)( - IWSDiscoveryProviderNotify* This, + IWSDiscoveryProviderNotify *This, IWSDiscoveredService *pService); HRESULT (STDMETHODCALLTYPE *SearchFailed)( - IWSDiscoveryProviderNotify* This, + IWSDiscoveryProviderNotify *This, HRESULT hr, LPCWSTR pszTag); HRESULT (STDMETHODCALLTYPE *SearchComplete)( - IWSDiscoveryProviderNotify* This, + IWSDiscoveryProviderNotify *This, LPCWSTR pszTag); END_INTERFACE } IWSDiscoveryProviderNotifyVtbl; + interface IWSDiscoveryProviderNotify { CONST_VTBL IWSDiscoveryProviderNotifyVtbl* lpVtbl; }; @@ -313,39 +337,6 @@ static FORCEINLINE HRESULT IWSDiscoveryProviderNotify_SearchComplete(IWSDiscover #endif -HRESULT STDMETHODCALLTYPE IWSDiscoveryProviderNotify_Add_Proxy( - IWSDiscoveryProviderNotify* This, - IWSDiscoveredService *pService); -void __RPC_STUB IWSDiscoveryProviderNotify_Add_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveryProviderNotify_Remove_Proxy( - IWSDiscoveryProviderNotify* This, - IWSDiscoveredService *pService); -void __RPC_STUB IWSDiscoveryProviderNotify_Remove_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveryProviderNotify_SearchFailed_Proxy( - IWSDiscoveryProviderNotify* This, - HRESULT hr, - LPCWSTR pszTag); -void __RPC_STUB IWSDiscoveryProviderNotify_SearchFailed_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveryProviderNotify_SearchComplete_Proxy( - IWSDiscoveryProviderNotify* This, - LPCWSTR pszTag); -void __RPC_STUB IWSDiscoveryProviderNotify_SearchComplete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDiscoveryProviderNotify_INTERFACE_DEFINED__ */ @@ -396,51 +387,52 @@ typedef struct IWSDiscoveryProviderVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDiscoveryProvider* This, + IWSDiscoveryProvider *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDiscoveryProvider* This); + IWSDiscoveryProvider *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDiscoveryProvider* This); + IWSDiscoveryProvider *This); /*** IWSDiscoveryProvider methods ***/ HRESULT (STDMETHODCALLTYPE *SetAddressFamily)( - IWSDiscoveryProvider* This, + IWSDiscoveryProvider *This, DWORD dwAddressFamily); HRESULT (STDMETHODCALLTYPE *Attach)( - IWSDiscoveryProvider* This, + IWSDiscoveryProvider *This, IWSDiscoveryProviderNotify *pSink); HRESULT (STDMETHODCALLTYPE *Detach)( - IWSDiscoveryProvider* This); + IWSDiscoveryProvider *This); HRESULT (STDMETHODCALLTYPE *SearchById)( - IWSDiscoveryProvider* This, + IWSDiscoveryProvider *This, LPCWSTR pszId, LPCWSTR pszTag); HRESULT (STDMETHODCALLTYPE *SearchByAddress)( - IWSDiscoveryProvider* This, + IWSDiscoveryProvider *This, LPCWSTR pszAddress, LPCWSTR pszTag); HRESULT (STDMETHODCALLTYPE *SearchByType)( - IWSDiscoveryProvider* This, + IWSDiscoveryProvider *This, const WSD_NAME_LIST *pTypesList, const WSD_URI_LIST *pScopesList, LPCWSTR pszMatchBy, LPCWSTR pszTag); HRESULT (STDMETHODCALLTYPE *GetXMLContext)( - IWSDiscoveryProvider* This, + IWSDiscoveryProvider *This, IWSDXMLContext **ppContext); END_INTERFACE } IWSDiscoveryProviderVtbl; + interface IWSDiscoveryProvider { CONST_VTBL IWSDiscoveryProviderVtbl* lpVtbl; }; @@ -497,66 +489,6 @@ static FORCEINLINE HRESULT IWSDiscoveryProvider_GetXMLContext(IWSDiscoveryProvid #endif -HRESULT STDMETHODCALLTYPE IWSDiscoveryProvider_SetAddressFamily_Proxy( - IWSDiscoveryProvider* This, - DWORD dwAddressFamily); -void __RPC_STUB IWSDiscoveryProvider_SetAddressFamily_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveryProvider_Attach_Proxy( - IWSDiscoveryProvider* This, - IWSDiscoveryProviderNotify *pSink); -void __RPC_STUB IWSDiscoveryProvider_Attach_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveryProvider_Detach_Proxy( - IWSDiscoveryProvider* This); -void __RPC_STUB IWSDiscoveryProvider_Detach_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveryProvider_SearchById_Proxy( - IWSDiscoveryProvider* This, - LPCWSTR pszId, - LPCWSTR pszTag); -void __RPC_STUB IWSDiscoveryProvider_SearchById_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveryProvider_SearchByAddress_Proxy( - IWSDiscoveryProvider* This, - LPCWSTR pszAddress, - LPCWSTR pszTag); -void __RPC_STUB IWSDiscoveryProvider_SearchByAddress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveryProvider_SearchByType_Proxy( - IWSDiscoveryProvider* This, - const WSD_NAME_LIST *pTypesList, - const WSD_URI_LIST *pScopesList, - LPCWSTR pszMatchBy, - LPCWSTR pszTag); -void __RPC_STUB IWSDiscoveryProvider_SearchByType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveryProvider_GetXMLContext_Proxy( - IWSDiscoveryProvider* This, - IWSDXMLContext **ppContext); -void __RPC_STUB IWSDiscoveryProvider_GetXMLContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDiscoveryProvider_INTERFACE_DEFINED__ */ @@ -615,64 +547,65 @@ typedef struct IWSDiscoveredServiceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDiscoveredService* This, + IWSDiscoveredService *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDiscoveredService* This); + IWSDiscoveredService *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDiscoveredService* This); + IWSDiscoveredService *This); /*** IWSDiscoveredService methods ***/ HRESULT (STDMETHODCALLTYPE *GetEndpointReference)( - IWSDiscoveredService* This, + IWSDiscoveredService *This, WSD_ENDPOINT_REFERENCE **ppEndpointReference); HRESULT (STDMETHODCALLTYPE *GetTypes)( - IWSDiscoveredService* This, + IWSDiscoveredService *This, WSD_NAME_LIST **ppTypesList); HRESULT (STDMETHODCALLTYPE *GetScopes)( - IWSDiscoveredService* This, + IWSDiscoveredService *This, WSD_URI_LIST **ppScopesList); HRESULT (STDMETHODCALLTYPE *GetXAddrs)( - IWSDiscoveredService* This, + IWSDiscoveredService *This, WSD_URI_LIST **ppXAddrsList); HRESULT (STDMETHODCALLTYPE *GetMetadataVersion)( - IWSDiscoveredService* This, + IWSDiscoveredService *This, ULONGLONG *pullMetadataVersion); HRESULT (STDMETHODCALLTYPE *GetExtendedDiscoXML)( - IWSDiscoveredService* This, + IWSDiscoveredService *This, WSDXML_ELEMENT **ppHeaderAny, WSDXML_ELEMENT **ppBodyAny); HRESULT (STDMETHODCALLTYPE *GetProbeResolveTag)( - IWSDiscoveredService* This, + IWSDiscoveredService *This, LPCWSTR *ppszTag); HRESULT (STDMETHODCALLTYPE *GetRemoteTransportAddress)( - IWSDiscoveredService* This, + IWSDiscoveredService *This, LPCWSTR *ppszRemoteTransportAddress); HRESULT (STDMETHODCALLTYPE *GetLocalTransportAddress)( - IWSDiscoveredService* This, + IWSDiscoveredService *This, LPCWSTR *ppszLocalTransportAddress); HRESULT (STDMETHODCALLTYPE *GetLocalInterfaceGUID)( - IWSDiscoveredService* This, + IWSDiscoveredService *This, GUID *pGuid); HRESULT (STDMETHODCALLTYPE *GetInstanceId)( - IWSDiscoveredService* This, + IWSDiscoveredService *This, ULONGLONG *pullInstanceId); END_INTERFACE } IWSDiscoveredServiceVtbl; + interface IWSDiscoveredService { CONST_VTBL IWSDiscoveredServiceVtbl* lpVtbl; }; @@ -745,95 +678,6 @@ static FORCEINLINE HRESULT IWSDiscoveredService_GetInstanceId(IWSDiscoveredServi #endif -HRESULT STDMETHODCALLTYPE IWSDiscoveredService_GetEndpointReference_Proxy( - IWSDiscoveredService* This, - WSD_ENDPOINT_REFERENCE **ppEndpointReference); -void __RPC_STUB IWSDiscoveredService_GetEndpointReference_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveredService_GetTypes_Proxy( - IWSDiscoveredService* This, - WSD_NAME_LIST **ppTypesList); -void __RPC_STUB IWSDiscoveredService_GetTypes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveredService_GetScopes_Proxy( - IWSDiscoveredService* This, - WSD_URI_LIST **ppScopesList); -void __RPC_STUB IWSDiscoveredService_GetScopes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveredService_GetXAddrs_Proxy( - IWSDiscoveredService* This, - WSD_URI_LIST **ppXAddrsList); -void __RPC_STUB IWSDiscoveredService_GetXAddrs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveredService_GetMetadataVersion_Proxy( - IWSDiscoveredService* This, - ULONGLONG *pullMetadataVersion); -void __RPC_STUB IWSDiscoveredService_GetMetadataVersion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveredService_GetExtendedDiscoXML_Proxy( - IWSDiscoveredService* This, - WSDXML_ELEMENT **ppHeaderAny, - WSDXML_ELEMENT **ppBodyAny); -void __RPC_STUB IWSDiscoveredService_GetExtendedDiscoXML_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveredService_GetProbeResolveTag_Proxy( - IWSDiscoveredService* This, - LPCWSTR *ppszTag); -void __RPC_STUB IWSDiscoveredService_GetProbeResolveTag_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveredService_GetRemoteTransportAddress_Proxy( - IWSDiscoveredService* This, - LPCWSTR *ppszRemoteTransportAddress); -void __RPC_STUB IWSDiscoveredService_GetRemoteTransportAddress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveredService_GetLocalTransportAddress_Proxy( - IWSDiscoveredService* This, - LPCWSTR *ppszLocalTransportAddress); -void __RPC_STUB IWSDiscoveredService_GetLocalTransportAddress_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveredService_GetLocalInterfaceGUID_Proxy( - IWSDiscoveredService* This, - GUID *pGuid); -void __RPC_STUB IWSDiscoveredService_GetLocalInterfaceGUID_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveredService_GetInstanceId_Proxy( - IWSDiscoveredService* This, - ULONGLONG *pullInstanceId); -void __RPC_STUB IWSDiscoveredService_GetInstanceId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDiscoveredService_INTERFACE_DEFINED__ */ @@ -866,29 +710,30 @@ typedef struct IWSDiscoveryPublisherNotifyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDiscoveryPublisherNotify* This, + IWSDiscoveryPublisherNotify *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDiscoveryPublisherNotify* This); + IWSDiscoveryPublisherNotify *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDiscoveryPublisherNotify* This); + IWSDiscoveryPublisherNotify *This); /*** IWSDiscoveryPublisherNotify methods ***/ HRESULT (STDMETHODCALLTYPE *ProbeHandler)( - IWSDiscoveryPublisherNotify* This, + IWSDiscoveryPublisherNotify *This, const WSD_SOAP_MESSAGE *pSoap, IWSDMessageParameters *pMessageParameters); HRESULT (STDMETHODCALLTYPE *ResolveHandler)( - IWSDiscoveryPublisherNotify* This, + IWSDiscoveryPublisherNotify *This, const WSD_SOAP_MESSAGE *pSoap, IWSDMessageParameters *pMessageParameters); END_INTERFACE } IWSDiscoveryPublisherNotifyVtbl; + interface IWSDiscoveryPublisherNotify { CONST_VTBL IWSDiscoveryPublisherNotifyVtbl* lpVtbl; }; @@ -925,24 +770,6 @@ static FORCEINLINE HRESULT IWSDiscoveryPublisherNotify_ResolveHandler(IWSDiscove #endif -HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisherNotify_ProbeHandler_Proxy( - IWSDiscoveryPublisherNotify* This, - const WSD_SOAP_MESSAGE *pSoap, - IWSDMessageParameters *pMessageParameters); -void __RPC_STUB IWSDiscoveryPublisherNotify_ProbeHandler_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisherNotify_ResolveHandler_Proxy( - IWSDiscoveryPublisherNotify* This, - const WSD_SOAP_MESSAGE *pSoap, - IWSDMessageParameters *pMessageParameters); -void __RPC_STUB IWSDiscoveryPublisherNotify_ResolveHandler_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDiscoveryPublisherNotify_INTERFACE_DEFINED__ */ @@ -1075,31 +902,31 @@ typedef struct IWSDiscoveryPublisherVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDiscoveryPublisher* This, + IWSDiscoveryPublisher *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDiscoveryPublisher* This); + IWSDiscoveryPublisher *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDiscoveryPublisher* This); + IWSDiscoveryPublisher *This); /*** IWSDiscoveryPublisher methods ***/ HRESULT (STDMETHODCALLTYPE *SetAddressFamily)( - IWSDiscoveryPublisher* This, + IWSDiscoveryPublisher *This, DWORD dwAddressFamily); HRESULT (STDMETHODCALLTYPE *RegisterNotificationSink)( - IWSDiscoveryPublisher* This, + IWSDiscoveryPublisher *This, IWSDiscoveryPublisherNotify *pSink); HRESULT (STDMETHODCALLTYPE *UnRegisterNotificationSink)( - IWSDiscoveryPublisher* This, + IWSDiscoveryPublisher *This, IWSDiscoveryPublisherNotify *pSink); HRESULT (STDMETHODCALLTYPE *Publish)( - IWSDiscoveryPublisher* This, + IWSDiscoveryPublisher *This, LPCWSTR pszId, ULONGLONG ullMetadataVersion, ULONGLONG ullInstanceId, @@ -1110,7 +937,7 @@ typedef struct IWSDiscoveryPublisherVtbl { const WSD_URI_LIST *pXAddrsList); HRESULT (STDMETHODCALLTYPE *UnPublish)( - IWSDiscoveryPublisher* This, + IWSDiscoveryPublisher *This, LPCWSTR pszId, ULONGLONG ullInstanceId, ULONGLONG ullMessageNumber, @@ -1118,7 +945,7 @@ typedef struct IWSDiscoveryPublisherVtbl { const WSDXML_ELEMENT *pAny); HRESULT (STDMETHODCALLTYPE *MatchProbe)( - IWSDiscoveryPublisher* This, + IWSDiscoveryPublisher *This, const WSD_SOAP_MESSAGE *pProbeMessage, IWSDMessageParameters *pMessageParameters, LPCWSTR pszId, @@ -1131,7 +958,7 @@ typedef struct IWSDiscoveryPublisherVtbl { const WSD_URI_LIST *pXAddrsList); HRESULT (STDMETHODCALLTYPE *MatchResolve)( - IWSDiscoveryPublisher* This, + IWSDiscoveryPublisher *This, const WSD_SOAP_MESSAGE *pResolveMessage, IWSDMessageParameters *pMessageParameters, LPCWSTR pszId, @@ -1144,7 +971,7 @@ typedef struct IWSDiscoveryPublisherVtbl { const WSD_URI_LIST *pXAddrsList); HRESULT (STDMETHODCALLTYPE *PublishEx)( - IWSDiscoveryPublisher* This, + IWSDiscoveryPublisher *This, LPCWSTR pszId, ULONGLONG ullMetadataVersion, ULONGLONG ullInstanceId, @@ -1160,7 +987,7 @@ typedef struct IWSDiscoveryPublisherVtbl { const WSDXML_ELEMENT *pAny); HRESULT (STDMETHODCALLTYPE *MatchProbeEx)( - IWSDiscoveryPublisher* This, + IWSDiscoveryPublisher *This, const WSD_SOAP_MESSAGE *pProbeMessage, IWSDMessageParameters *pMessageParameters, LPCWSTR pszId, @@ -1178,7 +1005,7 @@ typedef struct IWSDiscoveryPublisherVtbl { const WSDXML_ELEMENT *pAny); HRESULT (STDMETHODCALLTYPE *MatchResolveEx)( - IWSDiscoveryPublisher* This, + IWSDiscoveryPublisher *This, const WSD_SOAP_MESSAGE *pResolveMessage, IWSDMessageParameters *pMessageParameters, LPCWSTR pszId, @@ -1196,19 +1023,20 @@ typedef struct IWSDiscoveryPublisherVtbl { const WSDXML_ELEMENT *pAny); HRESULT (STDMETHODCALLTYPE *RegisterScopeMatchingRule)( - IWSDiscoveryPublisher* This, + IWSDiscoveryPublisher *This, IWSDScopeMatchingRule *pScopeMatchingRule); HRESULT (STDMETHODCALLTYPE *UnRegisterScopeMatchingRule)( - IWSDiscoveryPublisher* This, + IWSDiscoveryPublisher *This, IWSDScopeMatchingRule *pScopeMatchingRule); HRESULT (STDMETHODCALLTYPE *GetXMLContext)( - IWSDiscoveryPublisher* This, + IWSDiscoveryPublisher *This, IWSDXMLContext **ppContext); END_INTERFACE } IWSDiscoveryPublisherVtbl; + interface IWSDiscoveryPublisher { CONST_VTBL IWSDiscoveryPublisherVtbl* lpVtbl; }; @@ -1289,179 +1117,6 @@ static FORCEINLINE HRESULT IWSDiscoveryPublisher_GetXMLContext(IWSDiscoveryPubli #endif -HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_SetAddressFamily_Proxy( - IWSDiscoveryPublisher* This, - DWORD dwAddressFamily); -void __RPC_STUB IWSDiscoveryPublisher_SetAddressFamily_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_RegisterNotificationSink_Proxy( - IWSDiscoveryPublisher* This, - IWSDiscoveryPublisherNotify *pSink); -void __RPC_STUB IWSDiscoveryPublisher_RegisterNotificationSink_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_UnRegisterNotificationSink_Proxy( - IWSDiscoveryPublisher* This, - IWSDiscoveryPublisherNotify *pSink); -void __RPC_STUB IWSDiscoveryPublisher_UnRegisterNotificationSink_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_Publish_Proxy( - IWSDiscoveryPublisher* This, - LPCWSTR pszId, - ULONGLONG ullMetadataVersion, - ULONGLONG ullInstanceId, - ULONGLONG ullMessageNumber, - LPCWSTR pszSessionId, - const WSD_NAME_LIST *pTypesList, - const WSD_URI_LIST *pScopesList, - const WSD_URI_LIST *pXAddrsList); -void __RPC_STUB IWSDiscoveryPublisher_Publish_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_UnPublish_Proxy( - IWSDiscoveryPublisher* This, - LPCWSTR pszId, - ULONGLONG ullInstanceId, - ULONGLONG ullMessageNumber, - LPCWSTR pszSessionId, - const WSDXML_ELEMENT *pAny); -void __RPC_STUB IWSDiscoveryPublisher_UnPublish_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_MatchProbe_Proxy( - IWSDiscoveryPublisher* This, - const WSD_SOAP_MESSAGE *pProbeMessage, - IWSDMessageParameters *pMessageParameters, - LPCWSTR pszId, - ULONGLONG ullMetadataVersion, - ULONGLONG ullInstanceId, - ULONGLONG ullMessageNumber, - LPCWSTR pszSessionId, - const WSD_NAME_LIST *pTypesList, - const WSD_URI_LIST *pScopesList, - const WSD_URI_LIST *pXAddrsList); -void __RPC_STUB IWSDiscoveryPublisher_MatchProbe_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_MatchResolve_Proxy( - IWSDiscoveryPublisher* This, - const WSD_SOAP_MESSAGE *pResolveMessage, - IWSDMessageParameters *pMessageParameters, - LPCWSTR pszId, - ULONGLONG ullMetadataVersion, - ULONGLONG ullInstanceId, - ULONGLONG ullMessageNumber, - LPCWSTR pszSessionId, - const WSD_NAME_LIST *pTypesList, - const WSD_URI_LIST *pScopesList, - const WSD_URI_LIST *pXAddrsList); -void __RPC_STUB IWSDiscoveryPublisher_MatchResolve_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_PublishEx_Proxy( - IWSDiscoveryPublisher* This, - LPCWSTR pszId, - ULONGLONG ullMetadataVersion, - ULONGLONG ullInstanceId, - ULONGLONG ullMessageNumber, - LPCWSTR pszSessionId, - const WSD_NAME_LIST *pTypesList, - const WSD_URI_LIST *pScopesList, - const WSD_URI_LIST *pXAddrsList, - const WSDXML_ELEMENT *pHeaderAny, - const WSDXML_ELEMENT *pReferenceParameterAny, - const WSDXML_ELEMENT *pPolicyAny, - const WSDXML_ELEMENT *pEndpointReferenceAny, - const WSDXML_ELEMENT *pAny); -void __RPC_STUB IWSDiscoveryPublisher_PublishEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_MatchProbeEx_Proxy( - IWSDiscoveryPublisher* This, - const WSD_SOAP_MESSAGE *pProbeMessage, - IWSDMessageParameters *pMessageParameters, - LPCWSTR pszId, - ULONGLONG ullMetadataVersion, - ULONGLONG ullInstanceId, - ULONGLONG ullMessageNumber, - LPCWSTR pszSessionId, - const WSD_NAME_LIST *pTypesList, - const WSD_URI_LIST *pScopesList, - const WSD_URI_LIST *pXAddrsList, - const WSDXML_ELEMENT *pHeaderAny, - const WSDXML_ELEMENT *pReferenceParameterAny, - const WSDXML_ELEMENT *pPolicyAny, - const WSDXML_ELEMENT *pEndpointReferenceAny, - const WSDXML_ELEMENT *pAny); -void __RPC_STUB IWSDiscoveryPublisher_MatchProbeEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_MatchResolveEx_Proxy( - IWSDiscoveryPublisher* This, - const WSD_SOAP_MESSAGE *pResolveMessage, - IWSDMessageParameters *pMessageParameters, - LPCWSTR pszId, - ULONGLONG ullMetadataVersion, - ULONGLONG ullInstanceId, - ULONGLONG ullMessageNumber, - LPCWSTR pszSessionId, - const WSD_NAME_LIST *pTypesList, - const WSD_URI_LIST *pScopesList, - const WSD_URI_LIST *pXAddrsList, - const WSDXML_ELEMENT *pHeaderAny, - const WSDXML_ELEMENT *pReferenceParameterAny, - const WSDXML_ELEMENT *pPolicyAny, - const WSDXML_ELEMENT *pEndpointReferenceAny, - const WSDXML_ELEMENT *pAny); -void __RPC_STUB IWSDiscoveryPublisher_MatchResolveEx_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_RegisterScopeMatchingRule_Proxy( - IWSDiscoveryPublisher* This, - IWSDScopeMatchingRule *pScopeMatchingRule); -void __RPC_STUB IWSDiscoveryPublisher_RegisterScopeMatchingRule_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_UnRegisterScopeMatchingRule_Proxy( - IWSDiscoveryPublisher* This, - IWSDScopeMatchingRule *pScopeMatchingRule); -void __RPC_STUB IWSDiscoveryPublisher_UnRegisterScopeMatchingRule_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_GetXMLContext_Proxy( - IWSDiscoveryPublisher* This, - IWSDXMLContext **ppContext); -void __RPC_STUB IWSDiscoveryPublisher_GetXMLContext_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDiscoveryPublisher_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/wsdhost.h b/lib/libc/include/any-windows-any/wsdhost.h index da01842d75..7778e7d112 100644 --- a/lib/libc/include/any-windows-any/wsdhost.h +++ b/lib/libc/include/any-windows-any/wsdhost.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/wsdhost.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/wsdhost.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,16 +21,25 @@ #ifndef __IWSDDeviceHostNotify_FWD_DEFINED__ #define __IWSDDeviceHostNotify_FWD_DEFINED__ typedef interface IWSDDeviceHostNotify IWSDDeviceHostNotify; +#ifdef __cplusplus +interface IWSDDeviceHostNotify; +#endif /* __cplusplus */ #endif #ifndef __IWSDServiceMessaging_FWD_DEFINED__ #define __IWSDServiceMessaging_FWD_DEFINED__ typedef interface IWSDServiceMessaging IWSDServiceMessaging; +#ifdef __cplusplus +interface IWSDServiceMessaging; +#endif /* __cplusplus */ #endif #ifndef __IWSDDeviceHost_FWD_DEFINED__ #define __IWSDDeviceHost_FWD_DEFINED__ typedef interface IWSDDeviceHost IWSDDeviceHost; +#ifdef __cplusplus +interface IWSDDeviceHost; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -50,26 +60,41 @@ extern "C" { #ifndef __IWSDAddress_FWD_DEFINED__ #define __IWSDAddress_FWD_DEFINED__ typedef interface IWSDAddress IWSDAddress; +#ifdef __cplusplus +interface IWSDAddress; +#endif /* __cplusplus */ #endif #ifndef __IWSDXMLContext_FWD_DEFINED__ #define __IWSDXMLContext_FWD_DEFINED__ typedef interface IWSDXMLContext IWSDXMLContext; +#ifdef __cplusplus +interface IWSDXMLContext; +#endif /* __cplusplus */ #endif #ifndef __IWSDDeviceHost_FWD_DEFINED__ #define __IWSDDeviceHost_FWD_DEFINED__ typedef interface IWSDDeviceHost IWSDDeviceHost; +#ifdef __cplusplus +interface IWSDDeviceHost; +#endif /* __cplusplus */ #endif #ifndef __IWSDDeviceHostNotify_FWD_DEFINED__ #define __IWSDDeviceHostNotify_FWD_DEFINED__ typedef interface IWSDDeviceHostNotify IWSDDeviceHostNotify; +#ifdef __cplusplus +interface IWSDDeviceHostNotify; +#endif /* __cplusplus */ #endif #ifndef __IWSDServiceMessaging_FWD_DEFINED__ #define __IWSDServiceMessaging_FWD_DEFINED__ typedef interface IWSDServiceMessaging IWSDServiceMessaging; +#ifdef __cplusplus +interface IWSDServiceMessaging; +#endif /* __cplusplus */ #endif /***************************************************************************** @@ -97,24 +122,25 @@ typedef struct IWSDDeviceHostNotifyVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDDeviceHostNotify* This, + IWSDDeviceHostNotify *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDDeviceHostNotify* This); + IWSDDeviceHostNotify *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDDeviceHostNotify* This); + IWSDDeviceHostNotify *This); /*** IWSDDeviceHostNotify methods ***/ HRESULT (STDMETHODCALLTYPE *GetService)( - IWSDDeviceHostNotify* This, + IWSDDeviceHostNotify *This, LPCWSTR pszServiceId, IUnknown **ppService); END_INTERFACE } IWSDDeviceHostNotifyVtbl; + interface IWSDDeviceHostNotify { CONST_VTBL IWSDDeviceHostNotifyVtbl* lpVtbl; }; @@ -147,15 +173,6 @@ static FORCEINLINE HRESULT IWSDDeviceHostNotify_GetService(IWSDDeviceHostNotify* #endif -HRESULT STDMETHODCALLTYPE IWSDDeviceHostNotify_GetService_Proxy( - IWSDDeviceHostNotify* This, - LPCWSTR pszServiceId, - IUnknown **ppService); -void __RPC_STUB IWSDDeviceHostNotify_GetService_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDDeviceHostNotify_INTERFACE_DEFINED__ */ @@ -190,31 +207,32 @@ typedef struct IWSDServiceMessagingVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDServiceMessaging* This, + IWSDServiceMessaging *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDServiceMessaging* This); + IWSDServiceMessaging *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDServiceMessaging* This); + IWSDServiceMessaging *This); /*** IWSDServiceMessaging methods ***/ HRESULT (STDMETHODCALLTYPE *SendResponse)( - IWSDServiceMessaging* This, + IWSDServiceMessaging *This, void *pBody, WSD_OPERATION *pOperation, IWSDMessageParameters *pMessageParameters); HRESULT (STDMETHODCALLTYPE *FaultRequest)( - IWSDServiceMessaging* This, + IWSDServiceMessaging *This, WSD_SOAP_HEADER *pRequestHeader, IWSDMessageParameters *pMessageParameters, WSD_SOAP_FAULT *pFault); END_INTERFACE } IWSDServiceMessagingVtbl; + interface IWSDServiceMessaging { CONST_VTBL IWSDServiceMessagingVtbl* lpVtbl; }; @@ -251,26 +269,6 @@ static FORCEINLINE HRESULT IWSDServiceMessaging_FaultRequest(IWSDServiceMessagin #endif -HRESULT STDMETHODCALLTYPE IWSDServiceMessaging_SendResponse_Proxy( - IWSDServiceMessaging* This, - void *pBody, - WSD_OPERATION *pOperation, - IWSDMessageParameters *pMessageParameters); -void __RPC_STUB IWSDServiceMessaging_SendResponse_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDServiceMessaging_FaultRequest_Proxy( - IWSDServiceMessaging* This, - WSD_SOAP_HEADER *pRequestHeader, - IWSDMessageParameters *pMessageParameters, - WSD_SOAP_FAULT *pFault); -void __RPC_STUB IWSDServiceMessaging_FaultRequest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDServiceMessaging_INTERFACE_DEFINED__ */ @@ -348,58 +346,58 @@ typedef struct IWSDDeviceHostVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDDeviceHost* This, + IWSDDeviceHost *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDDeviceHost* This); + IWSDDeviceHost *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDDeviceHost* This); + IWSDDeviceHost *This); /*** IWSDDeviceHost methods ***/ HRESULT (STDMETHODCALLTYPE *Init)( - IWSDDeviceHost* This, + IWSDDeviceHost *This, LPCWSTR pszLocalId, IWSDXMLContext *pContext, IWSDAddress **ppHostAddresses, DWORD dwHostAddressCount); HRESULT (STDMETHODCALLTYPE *Start)( - IWSDDeviceHost* This, + IWSDDeviceHost *This, ULONGLONG ullInstanceId, const WSD_URI_LIST *pScopeList, IWSDDeviceHostNotify *pNotificationSink); HRESULT (STDMETHODCALLTYPE *Stop)( - IWSDDeviceHost* This); + IWSDDeviceHost *This); HRESULT (STDMETHODCALLTYPE *Terminate)( - IWSDDeviceHost* This); + IWSDDeviceHost *This); HRESULT (STDMETHODCALLTYPE *RegisterPortType)( - IWSDDeviceHost* This, + IWSDDeviceHost *This, const WSD_PORT_TYPE *pPortType); HRESULT (STDMETHODCALLTYPE *SetMetadata)( - IWSDDeviceHost* This, + IWSDDeviceHost *This, const WSD_THIS_MODEL_METADATA *pThisModelMetadata, const WSD_THIS_DEVICE_METADATA *pThisDeviceMetadata, const WSD_HOST_METADATA *pHostMetadata, const WSD_METADATA_SECTION_LIST *pCustomMetadata); HRESULT (STDMETHODCALLTYPE *RegisterService)( - IWSDDeviceHost* This, + IWSDDeviceHost *This, LPCWSTR pszServiceId, IUnknown *pService); HRESULT (STDMETHODCALLTYPE *RetireService)( - IWSDDeviceHost* This, + IWSDDeviceHost *This, LPCWSTR pszServiceId); HRESULT (STDMETHODCALLTYPE *AddDynamicService)( - IWSDDeviceHost* This, + IWSDDeviceHost *This, LPCWSTR pszServiceId, LPCWSTR pszEndpointAddress, const WSD_PORT_TYPE *pPortType, @@ -408,22 +406,23 @@ typedef struct IWSDDeviceHostVtbl { IUnknown *pService); HRESULT (STDMETHODCALLTYPE *RemoveDynamicService)( - IWSDDeviceHost* This, + IWSDDeviceHost *This, LPCWSTR pszServiceId); HRESULT (STDMETHODCALLTYPE *SetServiceDiscoverable)( - IWSDDeviceHost* This, + IWSDDeviceHost *This, LPCWSTR pszServiceId, WINBOOL fDiscoverable); HRESULT (STDMETHODCALLTYPE *SignalEvent)( - IWSDDeviceHost* This, + IWSDDeviceHost *This, LPCWSTR pszServiceId, const void *pBody, const WSD_OPERATION *pOperation); END_INTERFACE } IWSDDeviceHostVtbl; + interface IWSDDeviceHost { CONST_VTBL IWSDDeviceHostVtbl* lpVtbl; }; @@ -500,117 +499,6 @@ static FORCEINLINE HRESULT IWSDDeviceHost_SignalEvent(IWSDDeviceHost* This,LPCWS #endif -HRESULT STDMETHODCALLTYPE IWSDDeviceHost_Init_Proxy( - IWSDDeviceHost* This, - LPCWSTR pszLocalId, - IWSDXMLContext *pContext, - IWSDAddress **ppHostAddresses, - DWORD dwHostAddressCount); -void __RPC_STUB IWSDDeviceHost_Init_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDDeviceHost_Start_Proxy( - IWSDDeviceHost* This, - ULONGLONG ullInstanceId, - const WSD_URI_LIST *pScopeList, - IWSDDeviceHostNotify *pNotificationSink); -void __RPC_STUB IWSDDeviceHost_Start_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDDeviceHost_Stop_Proxy( - IWSDDeviceHost* This); -void __RPC_STUB IWSDDeviceHost_Stop_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDDeviceHost_Terminate_Proxy( - IWSDDeviceHost* This); -void __RPC_STUB IWSDDeviceHost_Terminate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDDeviceHost_RegisterPortType_Proxy( - IWSDDeviceHost* This, - const WSD_PORT_TYPE *pPortType); -void __RPC_STUB IWSDDeviceHost_RegisterPortType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDDeviceHost_SetMetadata_Proxy( - IWSDDeviceHost* This, - const WSD_THIS_MODEL_METADATA *pThisModelMetadata, - const WSD_THIS_DEVICE_METADATA *pThisDeviceMetadata, - const WSD_HOST_METADATA *pHostMetadata, - const WSD_METADATA_SECTION_LIST *pCustomMetadata); -void __RPC_STUB IWSDDeviceHost_SetMetadata_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDDeviceHost_RegisterService_Proxy( - IWSDDeviceHost* This, - LPCWSTR pszServiceId, - IUnknown *pService); -void __RPC_STUB IWSDDeviceHost_RegisterService_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDDeviceHost_RetireService_Proxy( - IWSDDeviceHost* This, - LPCWSTR pszServiceId); -void __RPC_STUB IWSDDeviceHost_RetireService_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDDeviceHost_AddDynamicService_Proxy( - IWSDDeviceHost* This, - LPCWSTR pszServiceId, - LPCWSTR pszEndpointAddress, - const WSD_PORT_TYPE *pPortType, - const WSDXML_NAME *pPortName, - const WSDXML_ELEMENT *pAny, - IUnknown *pService); -void __RPC_STUB IWSDDeviceHost_AddDynamicService_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDDeviceHost_RemoveDynamicService_Proxy( - IWSDDeviceHost* This, - LPCWSTR pszServiceId); -void __RPC_STUB IWSDDeviceHost_RemoveDynamicService_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDDeviceHost_SetServiceDiscoverable_Proxy( - IWSDDeviceHost* This, - LPCWSTR pszServiceId, - WINBOOL fDiscoverable); -void __RPC_STUB IWSDDeviceHost_SetServiceDiscoverable_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDDeviceHost_SignalEvent_Proxy( - IWSDDeviceHost* This, - LPCWSTR pszServiceId, - const void *pBody, - const WSD_OPERATION *pOperation); -void __RPC_STUB IWSDDeviceHost_SignalEvent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDDeviceHost_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/wsdxml.h b/lib/libc/include/any-windows-any/wsdxml.h index 9be8c930af..741b190b7f 100644 --- a/lib/libc/include/any-windows-any/wsdxml.h +++ b/lib/libc/include/any-windows-any/wsdxml.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/wsdxml.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/wsdxml.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,6 +21,9 @@ #ifndef __IWSDXMLContext_FWD_DEFINED__ #define __IWSDXMLContext_FWD_DEFINED__ typedef interface IWSDXMLContext IWSDXMLContext; +#ifdef __cplusplus +interface IWSDXMLContext; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -38,6 +42,9 @@ extern "C" { #ifndef __IWSDXMLContext_FWD_DEFINED__ #define __IWSDXMLContext_FWD_DEFINED__ typedef interface IWSDXMLContext IWSDXMLContext; +#ifdef __cplusplus +interface IWSDXMLContext; +#endif /* __cplusplus */ #endif enum { @@ -89,7 +96,6 @@ enum { OpFormatXMLDeclaration_ = 45, OpFormatMax = 46 }; - typedef struct _WSDXML_NAMESPACE WSDXML_NAMESPACE; typedef const WSDXML_NAMESPACE *PCWSDXML_NAMESPACE; typedef struct _WSDXML_NAME WSDXML_NAME; @@ -208,43 +214,44 @@ typedef struct IWSDXMLContextVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSDXMLContext* This, + IWSDXMLContext *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSDXMLContext* This); + IWSDXMLContext *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSDXMLContext* This); + IWSDXMLContext *This); /*** IWSDXMLContext methods ***/ HRESULT (STDMETHODCALLTYPE *AddNamespace)( - IWSDXMLContext* This, + IWSDXMLContext *This, LPCWSTR pszUri, LPCWSTR pszSuggestedPrefix, WSDXML_NAMESPACE **ppNamespace); HRESULT (STDMETHODCALLTYPE *AddNameToNamespace)( - IWSDXMLContext* This, + IWSDXMLContext *This, LPCWSTR pszUri, LPCWSTR pszName, WSDXML_NAME **ppName); HRESULT (STDMETHODCALLTYPE *SetNamespaces)( - IWSDXMLContext* This, + IWSDXMLContext *This, const PCWSDXML_NAMESPACE *pNamespaces, WORD wNamespacesCount, BYTE bLayerNumber); HRESULT (STDMETHODCALLTYPE *SetTypes)( - IWSDXMLContext* This, + IWSDXMLContext *This, const PCWSDXML_TYPE *pTypes, DWORD dwTypesCount, BYTE bLayerNumber); END_INTERFACE } IWSDXMLContextVtbl; + interface IWSDXMLContext { CONST_VTBL IWSDXMLContextVtbl* lpVtbl; }; @@ -289,46 +296,6 @@ static FORCEINLINE HRESULT IWSDXMLContext_SetTypes(IWSDXMLContext* This,const PC #endif -HRESULT STDMETHODCALLTYPE IWSDXMLContext_AddNamespace_Proxy( - IWSDXMLContext* This, - LPCWSTR pszUri, - LPCWSTR pszSuggestedPrefix, - WSDXML_NAMESPACE **ppNamespace); -void __RPC_STUB IWSDXMLContext_AddNamespace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDXMLContext_AddNameToNamespace_Proxy( - IWSDXMLContext* This, - LPCWSTR pszUri, - LPCWSTR pszName, - WSDXML_NAME **ppName); -void __RPC_STUB IWSDXMLContext_AddNameToNamespace_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDXMLContext_SetNamespaces_Proxy( - IWSDXMLContext* This, - const PCWSDXML_NAMESPACE *pNamespaces, - WORD wNamespacesCount, - BYTE bLayerNumber); -void __RPC_STUB IWSDXMLContext_SetNamespaces_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSDXMLContext_SetTypes_Proxy( - IWSDXMLContext* This, - const PCWSDXML_TYPE *pTypes, - DWORD dwTypesCount, - BYTE bLayerNumber); -void __RPC_STUB IWSDXMLContext_SetTypes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSDXMLContext_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/wslapi.h b/lib/libc/include/any-windows-any/wslapi.h new file mode 100644 index 0000000000..ac17975f10 --- /dev/null +++ b/lib/libc/include/any-windows-any/wslapi.h @@ -0,0 +1,42 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ +#ifndef _WSLAPI_H_ +#define _WSLAPI_H_ + +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) + +BOOL WslIsDistributionRegistered(PCWSTR distributionName); +HRESULT WslRegisterDistribution(PCWSTR distributionName, PCWSTR tarGzFilename); +HRESULT WslUnregisterDistribution(PCWSTR distributionName); + +typedef enum { + WSL_DISTRIBUTION_FLAGS_NONE = 0x0, + WSL_DISTRIBUTION_FLAGS_ENABLE_INTEROP = 0x1, + WSL_DISTRIBUTION_FLAGS_APPEND_NT_PATH = 0x2, + WSL_DISTRIBUTION_FLAGS_ENABLE_DRIVE_MOUNTING = 0x4 +} WSL_DISTRIBUTION_FLAGS; + +#define WSL_DISTRIBUTION_FLAGS_VALID (WSL_DISTRIBUTION_FLAGS_ENABLE_INTEROP | WSL_DISTRIBUTION_FLAGS_APPEND_NT_PATH | WSL_DISTRIBUTION_FLAGS_ENABLE_DRIVE_MOUNTING) +#define WSL_DISTRIBUTION_FLAGS_DEFAULT (WSL_DISTRIBUTION_FLAGS_ENABLE_INTEROP | WSL_DISTRIBUTION_FLAGS_APPEND_NT_PATH | WSL_DISTRIBUTION_FLAGS_ENABLE_DRIVE_MOUNTING) + +HRESULT WslConfigureDistribution(PCWSTR distributionName, ULONG defaultUID, WSL_DISTRIBUTION_FLAGS wslDistributionFlags); +HRESULT WslGetDistributionConfiguration(PCWSTR distributionName, ULONG* distributionVersion, ULONG* defaultUID, WSL_DISTRIBUTION_FLAGS* wslDistributionFlags, PSTR** defaultEnvironmentVariables, ULONG* defaultEnvironmentVariableCount); +HRESULT WslLaunchInteractive(PCWSTR distributionName, PCWSTR command, BOOL useCurrentWorkingDirectory, DWORD* exitCode); +HRESULT WslLaunch(PCWSTR distributionName, PCWSTR command, BOOL useCurrentWorkingDirectory, HANDLE stdIn, HANDLE stdOut, HANDLE stdErr, HANDLE* process); + +#endif +#ifdef __cplusplus +} +#endif +#endif diff --git a/lib/libc/include/any-windows-any/wsmandisp.h b/lib/libc/include/any-windows-any/wsmandisp.h index 9c5c0b8ce3..643eb0e6f1 100644 --- a/lib/libc/include/any-windows-any/wsmandisp.h +++ b/lib/libc/include/any-windows-any/wsmandisp.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/wsmandisp.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/wsmandisp.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -38,61 +39,97 @@ typedef struct WSManInternal WSManInternal; #ifndef __IWSMan_FWD_DEFINED__ #define __IWSMan_FWD_DEFINED__ typedef interface IWSMan IWSMan; +#ifdef __cplusplus +interface IWSMan; +#endif /* __cplusplus */ #endif #ifndef __IWSManEx_FWD_DEFINED__ #define __IWSManEx_FWD_DEFINED__ typedef interface IWSManEx IWSManEx; +#ifdef __cplusplus +interface IWSManEx; +#endif /* __cplusplus */ #endif #ifndef __IWSManEx2_FWD_DEFINED__ #define __IWSManEx2_FWD_DEFINED__ typedef interface IWSManEx2 IWSManEx2; +#ifdef __cplusplus +interface IWSManEx2; +#endif /* __cplusplus */ #endif #ifndef __IWSManEx3_FWD_DEFINED__ #define __IWSManEx3_FWD_DEFINED__ typedef interface IWSManEx3 IWSManEx3; +#ifdef __cplusplus +interface IWSManEx3; +#endif /* __cplusplus */ #endif #ifndef __IWSManConnectionOptions_FWD_DEFINED__ #define __IWSManConnectionOptions_FWD_DEFINED__ typedef interface IWSManConnectionOptions IWSManConnectionOptions; +#ifdef __cplusplus +interface IWSManConnectionOptions; +#endif /* __cplusplus */ #endif #ifndef __IWSManConnectionOptionsEx_FWD_DEFINED__ #define __IWSManConnectionOptionsEx_FWD_DEFINED__ typedef interface IWSManConnectionOptionsEx IWSManConnectionOptionsEx; +#ifdef __cplusplus +interface IWSManConnectionOptionsEx; +#endif /* __cplusplus */ #endif #ifndef __IWSManConnectionOptionsEx2_FWD_DEFINED__ #define __IWSManConnectionOptionsEx2_FWD_DEFINED__ typedef interface IWSManConnectionOptionsEx2 IWSManConnectionOptionsEx2; +#ifdef __cplusplus +interface IWSManConnectionOptionsEx2; +#endif /* __cplusplus */ #endif #ifndef __IWSManSession_FWD_DEFINED__ #define __IWSManSession_FWD_DEFINED__ typedef interface IWSManSession IWSManSession; +#ifdef __cplusplus +interface IWSManSession; +#endif /* __cplusplus */ #endif #ifndef __IWSManEnumerator_FWD_DEFINED__ #define __IWSManEnumerator_FWD_DEFINED__ typedef interface IWSManEnumerator IWSManEnumerator; +#ifdef __cplusplus +interface IWSManEnumerator; +#endif /* __cplusplus */ #endif #ifndef __IWSManResourceLocator_FWD_DEFINED__ #define __IWSManResourceLocator_FWD_DEFINED__ typedef interface IWSManResourceLocator IWSManResourceLocator; +#ifdef __cplusplus +interface IWSManResourceLocator; +#endif /* __cplusplus */ #endif #ifndef __IWSManResourceLocatorInternal_FWD_DEFINED__ #define __IWSManResourceLocatorInternal_FWD_DEFINED__ typedef interface IWSManResourceLocatorInternal IWSManResourceLocatorInternal; +#ifdef __cplusplus +interface IWSManResourceLocatorInternal; +#endif /* __cplusplus */ #endif #ifndef __IWSManInternal_FWD_DEFINED__ #define __IWSManInternal_FWD_DEFINED__ typedef interface IWSManInternal IWSManInternal; +#ifdef __cplusplus +interface IWSManInternal; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -153,66 +190,105 @@ typedef enum _WSManProxyAuthenticationFlags { #ifndef __IWSMan_FWD_DEFINED__ #define __IWSMan_FWD_DEFINED__ typedef interface IWSMan IWSMan; +#ifdef __cplusplus +interface IWSMan; +#endif /* __cplusplus */ #endif #ifndef __IWSManEx_FWD_DEFINED__ #define __IWSManEx_FWD_DEFINED__ typedef interface IWSManEx IWSManEx; +#ifdef __cplusplus +interface IWSManEx; +#endif /* __cplusplus */ #endif #ifndef __IWSManEx2_FWD_DEFINED__ #define __IWSManEx2_FWD_DEFINED__ typedef interface IWSManEx2 IWSManEx2; +#ifdef __cplusplus +interface IWSManEx2; +#endif /* __cplusplus */ #endif #ifndef __IWSManEx3_FWD_DEFINED__ #define __IWSManEx3_FWD_DEFINED__ typedef interface IWSManEx3 IWSManEx3; +#ifdef __cplusplus +interface IWSManEx3; +#endif /* __cplusplus */ #endif #ifndef __IWSManConnectionOptions_FWD_DEFINED__ #define __IWSManConnectionOptions_FWD_DEFINED__ typedef interface IWSManConnectionOptions IWSManConnectionOptions; +#ifdef __cplusplus +interface IWSManConnectionOptions; +#endif /* __cplusplus */ #endif #ifndef __IWSManConnectionOptionsEx_FWD_DEFINED__ #define __IWSManConnectionOptionsEx_FWD_DEFINED__ typedef interface IWSManConnectionOptionsEx IWSManConnectionOptionsEx; +#ifdef __cplusplus +interface IWSManConnectionOptionsEx; +#endif /* __cplusplus */ #endif #ifndef __IWSManConnectionOptionsEx2_FWD_DEFINED__ #define __IWSManConnectionOptionsEx2_FWD_DEFINED__ typedef interface IWSManConnectionOptionsEx2 IWSManConnectionOptionsEx2; +#ifdef __cplusplus +interface IWSManConnectionOptionsEx2; +#endif /* __cplusplus */ #endif #ifndef __IWSManSession_FWD_DEFINED__ #define __IWSManSession_FWD_DEFINED__ typedef interface IWSManSession IWSManSession; +#ifdef __cplusplus +interface IWSManSession; +#endif /* __cplusplus */ #endif #ifndef __IWSManSessionEx_FWD_DEFINED__ #define __IWSManSessionEx_FWD_DEFINED__ typedef interface IWSManSessionEx IWSManSessionEx; +#ifdef __cplusplus +interface IWSManSessionEx; +#endif /* __cplusplus */ #endif #ifndef __IWSManEnumerator_FWD_DEFINED__ #define __IWSManEnumerator_FWD_DEFINED__ typedef interface IWSManEnumerator IWSManEnumerator; +#ifdef __cplusplus +interface IWSManEnumerator; +#endif /* __cplusplus */ #endif #ifndef __IWSManResourceLocator_FWD_DEFINED__ #define __IWSManResourceLocator_FWD_DEFINED__ typedef interface IWSManResourceLocator IWSManResourceLocator; +#ifdef __cplusplus +interface IWSManResourceLocator; +#endif /* __cplusplus */ #endif #ifndef __IWSManResourceLocatorInternal_FWD_DEFINED__ #define __IWSManResourceLocatorInternal_FWD_DEFINED__ typedef interface IWSManResourceLocatorInternal IWSManResourceLocatorInternal; +#ifdef __cplusplus +interface IWSManResourceLocatorInternal; +#endif /* __cplusplus */ #endif #ifndef __IWSManInternal_FWD_DEFINED__ #define __IWSManInternal_FWD_DEFINED__ typedef interface IWSManInternal IWSManInternal; +#ifdef __cplusplus +interface IWSManInternal; +#endif /* __cplusplus */ #endif /***************************************************************************** @@ -277,29 +353,29 @@ typedef struct IWSManVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSMan* This, + IWSMan *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSMan* This); + IWSMan *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSMan* This); + IWSMan *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWSMan* This, + IWSMan *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWSMan* This, + IWSMan *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWSMan* This, + IWSMan *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -307,7 +383,7 @@ typedef struct IWSManVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWSMan* This, + IWSMan *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -319,26 +395,27 @@ typedef struct IWSManVtbl { /*** IWSMan methods ***/ HRESULT (STDMETHODCALLTYPE *CreateSession)( - IWSMan* This, + IWSMan *This, BSTR connection, LONG flags, IDispatch *connectionOptions, IDispatch **session); HRESULT (STDMETHODCALLTYPE *CreateConnectionOptions)( - IWSMan* This, + IWSMan *This, IDispatch **connectionOptions); HRESULT (STDMETHODCALLTYPE *get_CommandLine)( - IWSMan* This, + IWSMan *This, BSTR *value); HRESULT (STDMETHODCALLTYPE *get_Error)( - IWSMan* This, + IWSMan *This, BSTR *value); END_INTERFACE } IWSManVtbl; + interface IWSMan { CONST_VTBL IWSManVtbl* lpVtbl; }; @@ -401,41 +478,6 @@ static FORCEINLINE HRESULT IWSMan_get_Error(IWSMan* This,BSTR *value) { #endif -HRESULT STDMETHODCALLTYPE IWSMan_CreateSession_Proxy( - IWSMan* This, - BSTR connection, - LONG flags, - IDispatch *connectionOptions, - IDispatch **session); -void __RPC_STUB IWSMan_CreateSession_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSMan_CreateConnectionOptions_Proxy( - IWSMan* This, - IDispatch **connectionOptions); -void __RPC_STUB IWSMan_CreateConnectionOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSMan_get_CommandLine_Proxy( - IWSMan* This, - BSTR *value); -void __RPC_STUB IWSMan_get_CommandLine_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSMan_get_Error_Proxy( - IWSMan* This, - BSTR *value); -void __RPC_STUB IWSMan_get_Error_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSMan_INTERFACE_DEFINED__ */ @@ -522,29 +564,29 @@ typedef struct IWSManExVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSManEx* This, + IWSManEx *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSManEx* This); + IWSManEx *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSManEx* This); + IWSManEx *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWSManEx* This, + IWSManEx *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWSManEx* This, + IWSManEx *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWSManEx* This, + IWSManEx *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -552,7 +594,7 @@ typedef struct IWSManExVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWSManEx* This, + IWSManEx *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -564,109 +606,110 @@ typedef struct IWSManExVtbl { /*** IWSMan methods ***/ HRESULT (STDMETHODCALLTYPE *CreateSession)( - IWSManEx* This, + IWSManEx *This, BSTR connection, LONG flags, IDispatch *connectionOptions, IDispatch **session); HRESULT (STDMETHODCALLTYPE *CreateConnectionOptions)( - IWSManEx* This, + IWSManEx *This, IDispatch **connectionOptions); HRESULT (STDMETHODCALLTYPE *get_CommandLine)( - IWSManEx* This, + IWSManEx *This, BSTR *value); HRESULT (STDMETHODCALLTYPE *get_Error)( - IWSManEx* This, + IWSManEx *This, BSTR *value); /*** IWSManEx methods ***/ HRESULT (STDMETHODCALLTYPE *CreateResourceLocator)( - IWSManEx* This, + IWSManEx *This, BSTR strResourceLocator, IDispatch **newResourceLocator); HRESULT (STDMETHODCALLTYPE *SessionFlagUTF8)( - IWSManEx* This, + IWSManEx *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagCredUsernamePassword)( - IWSManEx* This, + IWSManEx *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagSkipCACheck)( - IWSManEx* This, + IWSManEx *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagSkipCNCheck)( - IWSManEx* This, + IWSManEx *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagUseDigest)( - IWSManEx* This, + IWSManEx *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagUseNegotiate)( - IWSManEx* This, + IWSManEx *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagUseBasic)( - IWSManEx* This, + IWSManEx *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagUseKerberos)( - IWSManEx* This, + IWSManEx *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagNoEncryption)( - IWSManEx* This, + IWSManEx *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagEnableSPNServerPort)( - IWSManEx* This, + IWSManEx *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagUseNoAuthentication)( - IWSManEx* This, + IWSManEx *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *EnumerationFlagNonXmlText)( - IWSManEx* This, + IWSManEx *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *EnumerationFlagReturnEPR)( - IWSManEx* This, + IWSManEx *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *EnumerationFlagReturnObjectAndEPR)( - IWSManEx* This, + IWSManEx *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *GetErrorMessage)( - IWSManEx* This, + IWSManEx *This, DWORD errorNumber, BSTR *errorMessage); HRESULT (STDMETHODCALLTYPE *EnumerationFlagHierarchyDeep)( - IWSManEx* This, + IWSManEx *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *EnumerationFlagHierarchyShallow)( - IWSManEx* This, + IWSManEx *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *EnumerationFlagHierarchyDeepBasePropsOnly)( - IWSManEx* This, + IWSManEx *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *EnumerationFlagReturnObject)( - IWSManEx* This, + IWSManEx *This, LONG *flags); END_INTERFACE } IWSManExVtbl; + interface IWSManEx { CONST_VTBL IWSManExVtbl* lpVtbl; }; @@ -811,168 +854,6 @@ static FORCEINLINE HRESULT IWSManEx_EnumerationFlagReturnObject(IWSManEx* This,L #endif -HRESULT STDMETHODCALLTYPE IWSManEx_CreateResourceLocator_Proxy( - IWSManEx* This, - BSTR strResourceLocator, - IDispatch **newResourceLocator); -void __RPC_STUB IWSManEx_CreateResourceLocator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx_SessionFlagUTF8_Proxy( - IWSManEx* This, - LONG *flags); -void __RPC_STUB IWSManEx_SessionFlagUTF8_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx_SessionFlagCredUsernamePassword_Proxy( - IWSManEx* This, - LONG *flags); -void __RPC_STUB IWSManEx_SessionFlagCredUsernamePassword_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx_SessionFlagSkipCACheck_Proxy( - IWSManEx* This, - LONG *flags); -void __RPC_STUB IWSManEx_SessionFlagSkipCACheck_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx_SessionFlagSkipCNCheck_Proxy( - IWSManEx* This, - LONG *flags); -void __RPC_STUB IWSManEx_SessionFlagSkipCNCheck_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx_SessionFlagUseDigest_Proxy( - IWSManEx* This, - LONG *flags); -void __RPC_STUB IWSManEx_SessionFlagUseDigest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx_SessionFlagUseNegotiate_Proxy( - IWSManEx* This, - LONG *flags); -void __RPC_STUB IWSManEx_SessionFlagUseNegotiate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx_SessionFlagUseBasic_Proxy( - IWSManEx* This, - LONG *flags); -void __RPC_STUB IWSManEx_SessionFlagUseBasic_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx_SessionFlagUseKerberos_Proxy( - IWSManEx* This, - LONG *flags); -void __RPC_STUB IWSManEx_SessionFlagUseKerberos_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx_SessionFlagNoEncryption_Proxy( - IWSManEx* This, - LONG *flags); -void __RPC_STUB IWSManEx_SessionFlagNoEncryption_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx_SessionFlagEnableSPNServerPort_Proxy( - IWSManEx* This, - LONG *flags); -void __RPC_STUB IWSManEx_SessionFlagEnableSPNServerPort_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx_SessionFlagUseNoAuthentication_Proxy( - IWSManEx* This, - LONG *flags); -void __RPC_STUB IWSManEx_SessionFlagUseNoAuthentication_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx_EnumerationFlagNonXmlText_Proxy( - IWSManEx* This, - LONG *flags); -void __RPC_STUB IWSManEx_EnumerationFlagNonXmlText_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx_EnumerationFlagReturnEPR_Proxy( - IWSManEx* This, - LONG *flags); -void __RPC_STUB IWSManEx_EnumerationFlagReturnEPR_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx_EnumerationFlagReturnObjectAndEPR_Proxy( - IWSManEx* This, - LONG *flags); -void __RPC_STUB IWSManEx_EnumerationFlagReturnObjectAndEPR_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx_GetErrorMessage_Proxy( - IWSManEx* This, - DWORD errorNumber, - BSTR *errorMessage); -void __RPC_STUB IWSManEx_GetErrorMessage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx_EnumerationFlagHierarchyDeep_Proxy( - IWSManEx* This, - LONG *flags); -void __RPC_STUB IWSManEx_EnumerationFlagHierarchyDeep_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx_EnumerationFlagHierarchyShallow_Proxy( - IWSManEx* This, - LONG *flags); -void __RPC_STUB IWSManEx_EnumerationFlagHierarchyShallow_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx_EnumerationFlagHierarchyDeepBasePropsOnly_Proxy( - IWSManEx* This, - LONG *flags); -void __RPC_STUB IWSManEx_EnumerationFlagHierarchyDeepBasePropsOnly_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx_EnumerationFlagReturnObject_Proxy( - IWSManEx* This, - LONG *flags); -void __RPC_STUB IWSManEx_EnumerationFlagReturnObject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSManEx_INTERFACE_DEFINED__ */ @@ -1000,29 +881,29 @@ typedef struct IWSManEx2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSManEx2* This, + IWSManEx2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSManEx2* This); + IWSManEx2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSManEx2* This); + IWSManEx2 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWSManEx2* This, + IWSManEx2 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWSManEx2* This, + IWSManEx2 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWSManEx2* This, + IWSManEx2 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1030,7 +911,7 @@ typedef struct IWSManEx2Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWSManEx2* This, + IWSManEx2 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1042,114 +923,115 @@ typedef struct IWSManEx2Vtbl { /*** IWSMan methods ***/ HRESULT (STDMETHODCALLTYPE *CreateSession)( - IWSManEx2* This, + IWSManEx2 *This, BSTR connection, LONG flags, IDispatch *connectionOptions, IDispatch **session); HRESULT (STDMETHODCALLTYPE *CreateConnectionOptions)( - IWSManEx2* This, + IWSManEx2 *This, IDispatch **connectionOptions); HRESULT (STDMETHODCALLTYPE *get_CommandLine)( - IWSManEx2* This, + IWSManEx2 *This, BSTR *value); HRESULT (STDMETHODCALLTYPE *get_Error)( - IWSManEx2* This, + IWSManEx2 *This, BSTR *value); /*** IWSManEx methods ***/ HRESULT (STDMETHODCALLTYPE *CreateResourceLocator)( - IWSManEx2* This, + IWSManEx2 *This, BSTR strResourceLocator, IDispatch **newResourceLocator); HRESULT (STDMETHODCALLTYPE *SessionFlagUTF8)( - IWSManEx2* This, + IWSManEx2 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagCredUsernamePassword)( - IWSManEx2* This, + IWSManEx2 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagSkipCACheck)( - IWSManEx2* This, + IWSManEx2 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagSkipCNCheck)( - IWSManEx2* This, + IWSManEx2 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagUseDigest)( - IWSManEx2* This, + IWSManEx2 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagUseNegotiate)( - IWSManEx2* This, + IWSManEx2 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagUseBasic)( - IWSManEx2* This, + IWSManEx2 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagUseKerberos)( - IWSManEx2* This, + IWSManEx2 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagNoEncryption)( - IWSManEx2* This, + IWSManEx2 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagEnableSPNServerPort)( - IWSManEx2* This, + IWSManEx2 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagUseNoAuthentication)( - IWSManEx2* This, + IWSManEx2 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *EnumerationFlagNonXmlText)( - IWSManEx2* This, + IWSManEx2 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *EnumerationFlagReturnEPR)( - IWSManEx2* This, + IWSManEx2 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *EnumerationFlagReturnObjectAndEPR)( - IWSManEx2* This, + IWSManEx2 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *GetErrorMessage)( - IWSManEx2* This, + IWSManEx2 *This, DWORD errorNumber, BSTR *errorMessage); HRESULT (STDMETHODCALLTYPE *EnumerationFlagHierarchyDeep)( - IWSManEx2* This, + IWSManEx2 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *EnumerationFlagHierarchyShallow)( - IWSManEx2* This, + IWSManEx2 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *EnumerationFlagHierarchyDeepBasePropsOnly)( - IWSManEx2* This, + IWSManEx2 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *EnumerationFlagReturnObject)( - IWSManEx2* This, + IWSManEx2 *This, LONG *flags); /*** IWSManEx2 methods ***/ HRESULT (STDMETHODCALLTYPE *SessionFlagUseClientCertificate)( - IWSManEx2* This, + IWSManEx2 *This, LONG *flags); END_INTERFACE } IWSManEx2Vtbl; + interface IWSManEx2 { CONST_VTBL IWSManEx2Vtbl* lpVtbl; }; @@ -1300,14 +1182,6 @@ static FORCEINLINE HRESULT IWSManEx2_SessionFlagUseClientCertificate(IWSManEx2* #endif -HRESULT STDMETHODCALLTYPE IWSManEx2_SessionFlagUseClientCertificate_Proxy( - IWSManEx2* This, - LONG *flags); -void __RPC_STUB IWSManEx2_SessionFlagUseClientCertificate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSManEx2_INTERFACE_DEFINED__ */ @@ -1353,29 +1227,29 @@ typedef struct IWSManEx3Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSManEx3* This, + IWSManEx3 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSManEx3* This); + IWSManEx3 *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSManEx3* This); + IWSManEx3 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWSManEx3* This, + IWSManEx3 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWSManEx3* This, + IWSManEx3 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWSManEx3* This, + IWSManEx3 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1383,7 +1257,7 @@ typedef struct IWSManEx3Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWSManEx3* This, + IWSManEx3 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1395,143 +1269,144 @@ typedef struct IWSManEx3Vtbl { /*** IWSMan methods ***/ HRESULT (STDMETHODCALLTYPE *CreateSession)( - IWSManEx3* This, + IWSManEx3 *This, BSTR connection, LONG flags, IDispatch *connectionOptions, IDispatch **session); HRESULT (STDMETHODCALLTYPE *CreateConnectionOptions)( - IWSManEx3* This, + IWSManEx3 *This, IDispatch **connectionOptions); HRESULT (STDMETHODCALLTYPE *get_CommandLine)( - IWSManEx3* This, + IWSManEx3 *This, BSTR *value); HRESULT (STDMETHODCALLTYPE *get_Error)( - IWSManEx3* This, + IWSManEx3 *This, BSTR *value); /*** IWSManEx methods ***/ HRESULT (STDMETHODCALLTYPE *CreateResourceLocator)( - IWSManEx3* This, + IWSManEx3 *This, BSTR strResourceLocator, IDispatch **newResourceLocator); HRESULT (STDMETHODCALLTYPE *SessionFlagUTF8)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagCredUsernamePassword)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagSkipCACheck)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagSkipCNCheck)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagUseDigest)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagUseNegotiate)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagUseBasic)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagUseKerberos)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagNoEncryption)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagEnableSPNServerPort)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagUseNoAuthentication)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *EnumerationFlagNonXmlText)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *EnumerationFlagReturnEPR)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *EnumerationFlagReturnObjectAndEPR)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *GetErrorMessage)( - IWSManEx3* This, + IWSManEx3 *This, DWORD errorNumber, BSTR *errorMessage); HRESULT (STDMETHODCALLTYPE *EnumerationFlagHierarchyDeep)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *EnumerationFlagHierarchyShallow)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *EnumerationFlagHierarchyDeepBasePropsOnly)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *EnumerationFlagReturnObject)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); /*** IWSManEx2 methods ***/ HRESULT (STDMETHODCALLTYPE *SessionFlagUseClientCertificate)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); /*** IWSManEx3 methods ***/ HRESULT (STDMETHODCALLTYPE *SessionFlagUTF16)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagUseCredSsp)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *EnumerationFlagAssociationInstance)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *EnumerationFlagAssociatedInstance)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagSkipRevocationCheck)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagAllowNegotiateImplicitCredentials)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); HRESULT (STDMETHODCALLTYPE *SessionFlagUseSsl)( - IWSManEx3* This, + IWSManEx3 *This, LONG *flags); END_INTERFACE } IWSManEx3Vtbl; + interface IWSManEx3 { CONST_VTBL IWSManEx3Vtbl* lpVtbl; }; @@ -1712,62 +1587,6 @@ static FORCEINLINE HRESULT IWSManEx3_SessionFlagUseSsl(IWSManEx3* This,LONG *fla #endif -HRESULT STDMETHODCALLTYPE IWSManEx3_SessionFlagUTF16_Proxy( - IWSManEx3* This, - LONG *flags); -void __RPC_STUB IWSManEx3_SessionFlagUTF16_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx3_SessionFlagUseCredSsp_Proxy( - IWSManEx3* This, - LONG *flags); -void __RPC_STUB IWSManEx3_SessionFlagUseCredSsp_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx3_EnumerationFlagAssociationInstance_Proxy( - IWSManEx3* This, - LONG *flags); -void __RPC_STUB IWSManEx3_EnumerationFlagAssociationInstance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx3_EnumerationFlagAssociatedInstance_Proxy( - IWSManEx3* This, - LONG *flags); -void __RPC_STUB IWSManEx3_EnumerationFlagAssociatedInstance_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx3_SessionFlagSkipRevocationCheck_Proxy( - IWSManEx3* This, - LONG *flags); -void __RPC_STUB IWSManEx3_SessionFlagSkipRevocationCheck_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx3_SessionFlagAllowNegotiateImplicitCredentials_Proxy( - IWSManEx3* This, - LONG *flags); -void __RPC_STUB IWSManEx3_SessionFlagAllowNegotiateImplicitCredentials_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEx3_SessionFlagUseSsl_Proxy( - IWSManEx3* This, - LONG *flags); -void __RPC_STUB IWSManEx3_SessionFlagUseSsl_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSManEx3_INTERFACE_DEFINED__ */ @@ -1801,29 +1620,29 @@ typedef struct IWSManConnectionOptionsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSManConnectionOptions* This, + IWSManConnectionOptions *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSManConnectionOptions* This); + IWSManConnectionOptions *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSManConnectionOptions* This); + IWSManConnectionOptions *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWSManConnectionOptions* This, + IWSManConnectionOptions *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWSManConnectionOptions* This, + IWSManConnectionOptions *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWSManConnectionOptions* This, + IWSManConnectionOptions *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1831,7 +1650,7 @@ typedef struct IWSManConnectionOptionsVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWSManConnectionOptions* This, + IWSManConnectionOptions *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1843,19 +1662,20 @@ typedef struct IWSManConnectionOptionsVtbl { /*** IWSManConnectionOptions methods ***/ HRESULT (STDMETHODCALLTYPE *get_UserName)( - IWSManConnectionOptions* This, + IWSManConnectionOptions *This, BSTR *name); HRESULT (STDMETHODCALLTYPE *put_UserName)( - IWSManConnectionOptions* This, + IWSManConnectionOptions *This, BSTR name); HRESULT (STDMETHODCALLTYPE *put_Password)( - IWSManConnectionOptions* This, + IWSManConnectionOptions *This, BSTR password); END_INTERFACE } IWSManConnectionOptionsVtbl; + interface IWSManConnectionOptions { CONST_VTBL IWSManConnectionOptionsVtbl* lpVtbl; }; @@ -1914,30 +1734,6 @@ static FORCEINLINE HRESULT IWSManConnectionOptions_put_Password(IWSManConnection #endif -HRESULT STDMETHODCALLTYPE IWSManConnectionOptions_get_UserName_Proxy( - IWSManConnectionOptions* This, - BSTR *name); -void __RPC_STUB IWSManConnectionOptions_get_UserName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManConnectionOptions_put_UserName_Proxy( - IWSManConnectionOptions* This, - BSTR name); -void __RPC_STUB IWSManConnectionOptions_put_UserName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManConnectionOptions_put_Password_Proxy( - IWSManConnectionOptions* This, - BSTR password); -void __RPC_STUB IWSManConnectionOptions_put_Password_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSManConnectionOptions_INTERFACE_DEFINED__ */ @@ -1968,29 +1764,29 @@ typedef struct IWSManConnectionOptionsExVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSManConnectionOptionsEx* This, + IWSManConnectionOptionsEx *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSManConnectionOptionsEx* This); + IWSManConnectionOptionsEx *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSManConnectionOptionsEx* This); + IWSManConnectionOptionsEx *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWSManConnectionOptionsEx* This, + IWSManConnectionOptionsEx *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWSManConnectionOptionsEx* This, + IWSManConnectionOptionsEx *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWSManConnectionOptionsEx* This, + IWSManConnectionOptionsEx *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -1998,7 +1794,7 @@ typedef struct IWSManConnectionOptionsExVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWSManConnectionOptionsEx* This, + IWSManConnectionOptionsEx *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2010,28 +1806,29 @@ typedef struct IWSManConnectionOptionsExVtbl { /*** IWSManConnectionOptions methods ***/ HRESULT (STDMETHODCALLTYPE *get_UserName)( - IWSManConnectionOptionsEx* This, + IWSManConnectionOptionsEx *This, BSTR *name); HRESULT (STDMETHODCALLTYPE *put_UserName)( - IWSManConnectionOptionsEx* This, + IWSManConnectionOptionsEx *This, BSTR name); HRESULT (STDMETHODCALLTYPE *put_Password)( - IWSManConnectionOptionsEx* This, + IWSManConnectionOptionsEx *This, BSTR password); /*** IWSManConnectionOptionsEx methods ***/ HRESULT (STDMETHODCALLTYPE *get_CertificateThumbprint)( - IWSManConnectionOptionsEx* This, + IWSManConnectionOptionsEx *This, BSTR *thumbprint); HRESULT (STDMETHODCALLTYPE *put_CertificateThumbprint)( - IWSManConnectionOptionsEx* This, + IWSManConnectionOptionsEx *This, BSTR thumbprint); END_INTERFACE } IWSManConnectionOptionsExVtbl; + interface IWSManConnectionOptionsEx { CONST_VTBL IWSManConnectionOptionsExVtbl* lpVtbl; }; @@ -2100,22 +1897,6 @@ static FORCEINLINE HRESULT IWSManConnectionOptionsEx_put_CertificateThumbprint(I #endif -HRESULT STDMETHODCALLTYPE IWSManConnectionOptionsEx_get_CertificateThumbprint_Proxy( - IWSManConnectionOptionsEx* This, - BSTR *thumbprint); -void __RPC_STUB IWSManConnectionOptionsEx_get_CertificateThumbprint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManConnectionOptionsEx_put_CertificateThumbprint_Proxy( - IWSManConnectionOptionsEx* This, - BSTR thumbprint); -void __RPC_STUB IWSManConnectionOptionsEx_put_CertificateThumbprint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSManConnectionOptionsEx_INTERFACE_DEFINED__ */ @@ -2167,29 +1948,29 @@ typedef struct IWSManConnectionOptionsEx2Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSManConnectionOptionsEx2* This, + IWSManConnectionOptionsEx2 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSManConnectionOptionsEx2* This); + IWSManConnectionOptionsEx2 *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSManConnectionOptionsEx2* This); + IWSManConnectionOptionsEx2 *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWSManConnectionOptionsEx2* This, + IWSManConnectionOptionsEx2 *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWSManConnectionOptionsEx2* This, + IWSManConnectionOptionsEx2 *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWSManConnectionOptionsEx2* This, + IWSManConnectionOptionsEx2 *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2197,7 +1978,7 @@ typedef struct IWSManConnectionOptionsEx2Vtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWSManConnectionOptionsEx2* This, + IWSManConnectionOptionsEx2 *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2209,64 +1990,65 @@ typedef struct IWSManConnectionOptionsEx2Vtbl { /*** IWSManConnectionOptions methods ***/ HRESULT (STDMETHODCALLTYPE *get_UserName)( - IWSManConnectionOptionsEx2* This, + IWSManConnectionOptionsEx2 *This, BSTR *name); HRESULT (STDMETHODCALLTYPE *put_UserName)( - IWSManConnectionOptionsEx2* This, + IWSManConnectionOptionsEx2 *This, BSTR name); HRESULT (STDMETHODCALLTYPE *put_Password)( - IWSManConnectionOptionsEx2* This, + IWSManConnectionOptionsEx2 *This, BSTR password); /*** IWSManConnectionOptionsEx methods ***/ HRESULT (STDMETHODCALLTYPE *get_CertificateThumbprint)( - IWSManConnectionOptionsEx2* This, + IWSManConnectionOptionsEx2 *This, BSTR *thumbprint); HRESULT (STDMETHODCALLTYPE *put_CertificateThumbprint)( - IWSManConnectionOptionsEx2* This, + IWSManConnectionOptionsEx2 *This, BSTR thumbprint); /*** IWSManConnectionOptionsEx2 methods ***/ HRESULT (STDMETHODCALLTYPE *SetProxy)( - IWSManConnectionOptionsEx2* This, + IWSManConnectionOptionsEx2 *This, LONG accessType, LONG authenticationMechanism, BSTR userName, BSTR password); HRESULT (STDMETHODCALLTYPE *ProxyIEConfig)( - IWSManConnectionOptionsEx2* This, + IWSManConnectionOptionsEx2 *This, LONG *value); HRESULT (STDMETHODCALLTYPE *ProxyWinHttpConfig)( - IWSManConnectionOptionsEx2* This, + IWSManConnectionOptionsEx2 *This, LONG *value); HRESULT (STDMETHODCALLTYPE *ProxyAutoDetect)( - IWSManConnectionOptionsEx2* This, + IWSManConnectionOptionsEx2 *This, LONG *value); HRESULT (STDMETHODCALLTYPE *ProxyNoProxyServer)( - IWSManConnectionOptionsEx2* This, + IWSManConnectionOptionsEx2 *This, LONG *value); HRESULT (STDMETHODCALLTYPE *ProxyAuthenticationUseNegotiate)( - IWSManConnectionOptionsEx2* This, + IWSManConnectionOptionsEx2 *This, LONG *value); HRESULT (STDMETHODCALLTYPE *ProxyAuthenticationUseBasic)( - IWSManConnectionOptionsEx2* This, + IWSManConnectionOptionsEx2 *This, LONG *value); HRESULT (STDMETHODCALLTYPE *ProxyAuthenticationUseDigest)( - IWSManConnectionOptionsEx2* This, + IWSManConnectionOptionsEx2 *This, LONG *value); END_INTERFACE } IWSManConnectionOptionsEx2Vtbl; + interface IWSManConnectionOptionsEx2 { CONST_VTBL IWSManConnectionOptionsEx2Vtbl* lpVtbl; }; @@ -2369,73 +2151,6 @@ static FORCEINLINE HRESULT IWSManConnectionOptionsEx2_ProxyAuthenticationUseDige #endif -HRESULT STDMETHODCALLTYPE IWSManConnectionOptionsEx2_SetProxy_Proxy( - IWSManConnectionOptionsEx2* This, - LONG accessType, - LONG authenticationMechanism, - BSTR userName, - BSTR password); -void __RPC_STUB IWSManConnectionOptionsEx2_SetProxy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManConnectionOptionsEx2_ProxyIEConfig_Proxy( - IWSManConnectionOptionsEx2* This, - LONG *value); -void __RPC_STUB IWSManConnectionOptionsEx2_ProxyIEConfig_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManConnectionOptionsEx2_ProxyWinHttpConfig_Proxy( - IWSManConnectionOptionsEx2* This, - LONG *value); -void __RPC_STUB IWSManConnectionOptionsEx2_ProxyWinHttpConfig_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManConnectionOptionsEx2_ProxyAutoDetect_Proxy( - IWSManConnectionOptionsEx2* This, - LONG *value); -void __RPC_STUB IWSManConnectionOptionsEx2_ProxyAutoDetect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManConnectionOptionsEx2_ProxyNoProxyServer_Proxy( - IWSManConnectionOptionsEx2* This, - LONG *value); -void __RPC_STUB IWSManConnectionOptionsEx2_ProxyNoProxyServer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManConnectionOptionsEx2_ProxyAuthenticationUseNegotiate_Proxy( - IWSManConnectionOptionsEx2* This, - LONG *value); -void __RPC_STUB IWSManConnectionOptionsEx2_ProxyAuthenticationUseNegotiate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManConnectionOptionsEx2_ProxyAuthenticationUseBasic_Proxy( - IWSManConnectionOptionsEx2* This, - LONG *value); -void __RPC_STUB IWSManConnectionOptionsEx2_ProxyAuthenticationUseBasic_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManConnectionOptionsEx2_ProxyAuthenticationUseDigest_Proxy( - IWSManConnectionOptionsEx2* This, - LONG *value); -void __RPC_STUB IWSManConnectionOptionsEx2_ProxyAuthenticationUseDigest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSManConnectionOptionsEx2_INTERFACE_DEFINED__ */ @@ -2514,29 +2229,29 @@ typedef struct IWSManSessionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSManSession* This, + IWSManSession *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSManSession* This); + IWSManSession *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSManSession* This); + IWSManSession *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWSManSession* This, + IWSManSession *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWSManSession* This, + IWSManSession *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWSManSession* This, + IWSManSession *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2544,7 +2259,7 @@ typedef struct IWSManSessionVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWSManSession* This, + IWSManSession *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2556,32 +2271,32 @@ typedef struct IWSManSessionVtbl { /*** IWSManSession methods ***/ HRESULT (STDMETHODCALLTYPE *Get)( - IWSManSession* This, + IWSManSession *This, VARIANT resourceUri, LONG flags, BSTR *resource); HRESULT (STDMETHODCALLTYPE *Put)( - IWSManSession* This, + IWSManSession *This, VARIANT resourceUri, BSTR resource, LONG flags, BSTR *resultResource); HRESULT (STDMETHODCALLTYPE *Create)( - IWSManSession* This, + IWSManSession *This, VARIANT resourceUri, BSTR resource, LONG flags, BSTR *newUri); HRESULT (STDMETHODCALLTYPE *Delete)( - IWSManSession* This, + IWSManSession *This, VARIANT resourceUri, LONG flags); HRESULT (STDMETHODCALLTYPE *IWSManSession_Invoke)( - IWSManSession* This, + IWSManSession *This, BSTR actionUri, VARIANT resourceUri, BSTR parameters, @@ -2589,7 +2304,7 @@ typedef struct IWSManSessionVtbl { BSTR *result); HRESULT (STDMETHODCALLTYPE *Enumerate)( - IWSManSession* This, + IWSManSession *This, VARIANT resourceUri, BSTR filter, BSTR dialect, @@ -2597,32 +2312,33 @@ typedef struct IWSManSessionVtbl { IDispatch **resultSet); HRESULT (STDMETHODCALLTYPE *Identify)( - IWSManSession* This, + IWSManSession *This, LONG flags, BSTR *result); HRESULT (STDMETHODCALLTYPE *get_Error)( - IWSManSession* This, + IWSManSession *This, BSTR *value); HRESULT (STDMETHODCALLTYPE *get_BatchItems)( - IWSManSession* This, + IWSManSession *This, LONG *value); HRESULT (STDMETHODCALLTYPE *put_BatchItems)( - IWSManSession* This, + IWSManSession *This, LONG value); HRESULT (STDMETHODCALLTYPE *get_Timeout)( - IWSManSession* This, + IWSManSession *This, LONG *value); HRESULT (STDMETHODCALLTYPE *put_Timeout)( - IWSManSession* This, + IWSManSession *This, LONG value); END_INTERFACE } IWSManSessionVtbl; + interface IWSManSession { CONST_VTBL IWSManSessionVtbl* lpVtbl; }; @@ -2637,12 +2353,12 @@ interface IWSManSession { #define IWSManSession_GetTypeInfoCount(This,pctinfo) (This)->lpVtbl->GetTypeInfoCount(This,pctinfo) #define IWSManSession_GetTypeInfo(This,iTInfo,lcid,ppTInfo) (This)->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo) #define IWSManSession_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) (This)->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) -#define IWSManSession_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) (This)->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) /*** IWSManSession methods ***/ #define IWSManSession_Get(This,resourceUri,flags,resource) (This)->lpVtbl->Get(This,resourceUri,flags,resource) #define IWSManSession_Put(This,resourceUri,resource,flags,resultResource) (This)->lpVtbl->Put(This,resourceUri,resource,flags,resultResource) #define IWSManSession_Create(This,resourceUri,resource,flags,newUri) (This)->lpVtbl->Create(This,resourceUri,resource,flags,newUri) #define IWSManSession_Delete(This,resourceUri,flags) (This)->lpVtbl->Delete(This,resourceUri,flags) +#define IWSManSession_Invoke(This,actionUri,resourceUri,parameters,flags,result) (This)->lpVtbl->IWSManSession_Invoke(This,actionUri,resourceUri,parameters,flags,result) #define IWSManSession_Enumerate(This,resourceUri,filter,dialect,flags,resultSet) (This)->lpVtbl->Enumerate(This,resourceUri,filter,dialect,flags,resultSet) #define IWSManSession_Identify(This,flags,result) (This)->lpVtbl->Identify(This,flags,result) #define IWSManSession_get_Error(This,value) (This)->lpVtbl->get_Error(This,value) @@ -2671,9 +2387,6 @@ static FORCEINLINE HRESULT IWSManSession_GetTypeInfo(IWSManSession* This,UINT iT static FORCEINLINE HRESULT IWSManSession_GetIDsOfNames(IWSManSession* This,REFIID riid,LPOLESTR *rgszNames,UINT cNames,LCID lcid,DISPID *rgDispId) { return This->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId); } -static FORCEINLINE HRESULT IWSManSession_Invoke(IWSManSession* This,DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) { - return This->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr); -} /*** IWSManSession methods ***/ static FORCEINLINE HRESULT IWSManSession_Get(IWSManSession* This,VARIANT resourceUri,LONG flags,BSTR *resource) { return This->lpVtbl->Get(This,resourceUri,flags,resource); @@ -2687,6 +2400,9 @@ static FORCEINLINE HRESULT IWSManSession_Create(IWSManSession* This,VARIANT reso static FORCEINLINE HRESULT IWSManSession_Delete(IWSManSession* This,VARIANT resourceUri,LONG flags) { return This->lpVtbl->Delete(This,resourceUri,flags); } +static FORCEINLINE HRESULT IWSManSession_Invoke(IWSManSession* This,BSTR actionUri,VARIANT resourceUri,BSTR parameters,LONG flags,BSTR *result) { + return This->lpVtbl->IWSManSession_Invoke(This,actionUri,resourceUri,parameters,flags,result); +} static FORCEINLINE HRESULT IWSManSession_Enumerate(IWSManSession* This,VARIANT resourceUri,BSTR filter,BSTR dialect,LONG flags,IDispatch **resultSet) { return This->lpVtbl->Enumerate(This,resourceUri,filter,dialect,flags,resultSet); } @@ -2713,120 +2429,6 @@ static FORCEINLINE HRESULT IWSManSession_put_Timeout(IWSManSession* This,LONG va #endif -HRESULT STDMETHODCALLTYPE IWSManSession_Get_Proxy( - IWSManSession* This, - VARIANT resourceUri, - LONG flags, - BSTR *resource); -void __RPC_STUB IWSManSession_Get_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManSession_Put_Proxy( - IWSManSession* This, - VARIANT resourceUri, - BSTR resource, - LONG flags, - BSTR *resultResource); -void __RPC_STUB IWSManSession_Put_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManSession_Create_Proxy( - IWSManSession* This, - VARIANT resourceUri, - BSTR resource, - LONG flags, - BSTR *newUri); -void __RPC_STUB IWSManSession_Create_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManSession_Delete_Proxy( - IWSManSession* This, - VARIANT resourceUri, - LONG flags); -void __RPC_STUB IWSManSession_Delete_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManSession_Invoke_Proxy( - IWSManSession* This, - BSTR actionUri, - VARIANT resourceUri, - BSTR parameters, - LONG flags, - BSTR *result); -void __RPC_STUB IWSManSession_Invoke_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManSession_Enumerate_Proxy( - IWSManSession* This, - VARIANT resourceUri, - BSTR filter, - BSTR dialect, - LONG flags, - IDispatch **resultSet); -void __RPC_STUB IWSManSession_Enumerate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManSession_Identify_Proxy( - IWSManSession* This, - LONG flags, - BSTR *result); -void __RPC_STUB IWSManSession_Identify_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManSession_get_Error_Proxy( - IWSManSession* This, - BSTR *value); -void __RPC_STUB IWSManSession_get_Error_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManSession_get_BatchItems_Proxy( - IWSManSession* This, - LONG *value); -void __RPC_STUB IWSManSession_get_BatchItems_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManSession_put_BatchItems_Proxy( - IWSManSession* This, - LONG value); -void __RPC_STUB IWSManSession_put_BatchItems_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManSession_get_Timeout_Proxy( - IWSManSession* This, - LONG *value); -void __RPC_STUB IWSManSession_get_Timeout_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManSession_put_Timeout_Proxy( - IWSManSession* This, - LONG value); -void __RPC_STUB IWSManSession_put_Timeout_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSManSession_INTERFACE_DEFINED__ */ @@ -2860,29 +2462,29 @@ typedef struct IWSManEnumeratorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSManEnumerator* This, + IWSManEnumerator *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSManEnumerator* This); + IWSManEnumerator *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSManEnumerator* This); + IWSManEnumerator *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWSManEnumerator* This, + IWSManEnumerator *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWSManEnumerator* This, + IWSManEnumerator *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWSManEnumerator* This, + IWSManEnumerator *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -2890,7 +2492,7 @@ typedef struct IWSManEnumeratorVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWSManEnumerator* This, + IWSManEnumerator *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -2902,19 +2504,20 @@ typedef struct IWSManEnumeratorVtbl { /*** IWSManEnumerator methods ***/ HRESULT (STDMETHODCALLTYPE *ReadItem)( - IWSManEnumerator* This, + IWSManEnumerator *This, BSTR *resource); HRESULT (STDMETHODCALLTYPE *get_AtEndOfStream)( - IWSManEnumerator* This, + IWSManEnumerator *This, VARIANT_BOOL *eos); HRESULT (STDMETHODCALLTYPE *get_Error)( - IWSManEnumerator* This, + IWSManEnumerator *This, BSTR *value); END_INTERFACE } IWSManEnumeratorVtbl; + interface IWSManEnumerator { CONST_VTBL IWSManEnumeratorVtbl* lpVtbl; }; @@ -2973,30 +2576,6 @@ static FORCEINLINE HRESULT IWSManEnumerator_get_Error(IWSManEnumerator* This,BST #endif -HRESULT STDMETHODCALLTYPE IWSManEnumerator_ReadItem_Proxy( - IWSManEnumerator* This, - BSTR *resource); -void __RPC_STUB IWSManEnumerator_ReadItem_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEnumerator_get_AtEndOfStream_Proxy( - IWSManEnumerator* This, - VARIANT_BOOL *eos); -void __RPC_STUB IWSManEnumerator_get_AtEndOfStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManEnumerator_get_Error_Proxy( - IWSManEnumerator* This, - BSTR *value); -void __RPC_STUB IWSManEnumerator_get_Error_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSManEnumerator_INTERFACE_DEFINED__ */ @@ -3063,29 +2642,29 @@ typedef struct IWSManResourceLocatorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSManResourceLocator* This, + IWSManResourceLocator *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSManResourceLocator* This); + IWSManResourceLocator *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSManResourceLocator* This); + IWSManResourceLocator *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWSManResourceLocator* This, + IWSManResourceLocator *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWSManResourceLocator* This, + IWSManResourceLocator *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWSManResourceLocator* This, + IWSManResourceLocator *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -3093,7 +2672,7 @@ typedef struct IWSManResourceLocatorVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWSManResourceLocator* This, + IWSManResourceLocator *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -3105,60 +2684,61 @@ typedef struct IWSManResourceLocatorVtbl { /*** IWSManResourceLocator methods ***/ HRESULT (STDMETHODCALLTYPE *put_ResourceURI)( - IWSManResourceLocator* This, + IWSManResourceLocator *This, BSTR uri); HRESULT (STDMETHODCALLTYPE *get_ResourceURI)( - IWSManResourceLocator* This, + IWSManResourceLocator *This, BSTR *uri); HRESULT (STDMETHODCALLTYPE *AddSelector)( - IWSManResourceLocator* This, + IWSManResourceLocator *This, BSTR resourceSelName, VARIANT selValue); HRESULT (STDMETHODCALLTYPE *ClearSelectors)( - IWSManResourceLocator* This); + IWSManResourceLocator *This); HRESULT (STDMETHODCALLTYPE *get_FragmentPath)( - IWSManResourceLocator* This, + IWSManResourceLocator *This, BSTR *text); HRESULT (STDMETHODCALLTYPE *put_FragmentPath)( - IWSManResourceLocator* This, + IWSManResourceLocator *This, BSTR text); HRESULT (STDMETHODCALLTYPE *get_FragmentDialect)( - IWSManResourceLocator* This, + IWSManResourceLocator *This, BSTR *text); HRESULT (STDMETHODCALLTYPE *put_FragmentDialect)( - IWSManResourceLocator* This, + IWSManResourceLocator *This, BSTR text); HRESULT (STDMETHODCALLTYPE *AddOption)( - IWSManResourceLocator* This, + IWSManResourceLocator *This, BSTR OptionName, VARIANT OptionValue, WINBOOL mustComply); HRESULT (STDMETHODCALLTYPE *put_MustUnderstandOptions)( - IWSManResourceLocator* This, + IWSManResourceLocator *This, WINBOOL mustUnderstand); HRESULT (STDMETHODCALLTYPE *get_MustUnderstandOptions)( - IWSManResourceLocator* This, + IWSManResourceLocator *This, WINBOOL *mustUnderstand); HRESULT (STDMETHODCALLTYPE *ClearOptions)( - IWSManResourceLocator* This); + IWSManResourceLocator *This); HRESULT (STDMETHODCALLTYPE *get_Error)( - IWSManResourceLocator* This, + IWSManResourceLocator *This, BSTR *value); END_INTERFACE } IWSManResourceLocatorVtbl; + interface IWSManResourceLocator { CONST_VTBL IWSManResourceLocatorVtbl* lpVtbl; }; @@ -3257,111 +2837,6 @@ static FORCEINLINE HRESULT IWSManResourceLocator_get_Error(IWSManResourceLocator #endif -HRESULT STDMETHODCALLTYPE IWSManResourceLocator_put_ResourceURI_Proxy( - IWSManResourceLocator* This, - BSTR uri); -void __RPC_STUB IWSManResourceLocator_put_ResourceURI_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManResourceLocator_get_ResourceURI_Proxy( - IWSManResourceLocator* This, - BSTR *uri); -void __RPC_STUB IWSManResourceLocator_get_ResourceURI_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManResourceLocator_AddSelector_Proxy( - IWSManResourceLocator* This, - BSTR resourceSelName, - VARIANT selValue); -void __RPC_STUB IWSManResourceLocator_AddSelector_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManResourceLocator_ClearSelectors_Proxy( - IWSManResourceLocator* This); -void __RPC_STUB IWSManResourceLocator_ClearSelectors_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManResourceLocator_get_FragmentPath_Proxy( - IWSManResourceLocator* This, - BSTR *text); -void __RPC_STUB IWSManResourceLocator_get_FragmentPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManResourceLocator_put_FragmentPath_Proxy( - IWSManResourceLocator* This, - BSTR text); -void __RPC_STUB IWSManResourceLocator_put_FragmentPath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManResourceLocator_get_FragmentDialect_Proxy( - IWSManResourceLocator* This, - BSTR *text); -void __RPC_STUB IWSManResourceLocator_get_FragmentDialect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManResourceLocator_put_FragmentDialect_Proxy( - IWSManResourceLocator* This, - BSTR text); -void __RPC_STUB IWSManResourceLocator_put_FragmentDialect_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManResourceLocator_AddOption_Proxy( - IWSManResourceLocator* This, - BSTR OptionName, - VARIANT OptionValue, - WINBOOL mustComply); -void __RPC_STUB IWSManResourceLocator_AddOption_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManResourceLocator_put_MustUnderstandOptions_Proxy( - IWSManResourceLocator* This, - WINBOOL mustUnderstand); -void __RPC_STUB IWSManResourceLocator_put_MustUnderstandOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManResourceLocator_get_MustUnderstandOptions_Proxy( - IWSManResourceLocator* This, - WINBOOL *mustUnderstand); -void __RPC_STUB IWSManResourceLocator_get_MustUnderstandOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManResourceLocator_ClearOptions_Proxy( - IWSManResourceLocator* This); -void __RPC_STUB IWSManResourceLocator_ClearOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IWSManResourceLocator_get_Error_Proxy( - IWSManResourceLocator* This, - BSTR *value); -void __RPC_STUB IWSManResourceLocator_get_Error_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSManResourceLocator_INTERFACE_DEFINED__ */ @@ -3386,18 +2861,19 @@ typedef struct IWSManResourceLocatorInternalVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSManResourceLocatorInternal* This, + IWSManResourceLocatorInternal *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSManResourceLocatorInternal* This); + IWSManResourceLocatorInternal *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSManResourceLocatorInternal* This); + IWSManResourceLocatorInternal *This); END_INTERFACE } IWSManResourceLocatorInternalVtbl; + interface IWSManResourceLocatorInternal { CONST_VTBL IWSManResourceLocatorInternalVtbl* lpVtbl; }; @@ -3454,29 +2930,29 @@ typedef struct IWSManInternalVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWSManInternal* This, + IWSManInternal *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IWSManInternal* This); + IWSManInternal *This); ULONG (STDMETHODCALLTYPE *Release)( - IWSManInternal* This); + IWSManInternal *This); /*** IDispatch methods ***/ HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IWSManInternal* This, + IWSManInternal *This, UINT *pctinfo); HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IWSManInternal* This, + IWSManInternal *This, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IWSManInternal* This, + IWSManInternal *This, REFIID riid, LPOLESTR *rgszNames, UINT cNames, @@ -3484,7 +2960,7 @@ typedef struct IWSManInternalVtbl { DISPID *rgDispId); HRESULT (STDMETHODCALLTYPE *Invoke)( - IWSManInternal* This, + IWSManInternal *This, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -3496,7 +2972,7 @@ typedef struct IWSManInternalVtbl { /*** IWSManInternal methods ***/ HRESULT (STDMETHODCALLTYPE *ConfigSDDL)( - IWSManInternal* This, + IWSManInternal *This, IDispatch *session, VARIANT resourceUri, LONG flags, @@ -3504,6 +2980,7 @@ typedef struct IWSManInternalVtbl { END_INTERFACE } IWSManInternalVtbl; + interface IWSManInternal { CONST_VTBL IWSManInternalVtbl* lpVtbl; }; @@ -3554,17 +3031,6 @@ static FORCEINLINE HRESULT IWSManInternal_ConfigSDDL(IWSManInternal* This,IDispa #endif -HRESULT STDMETHODCALLTYPE IWSManInternal_ConfigSDDL_Proxy( - IWSManInternal* This, - IDispatch *session, - VARIANT resourceUri, - LONG flags, - BSTR *resource); -void __RPC_STUB IWSManInternal_ConfigSDDL_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IWSManInternal_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/wspiapi.h b/lib/libc/include/any-windows-any/wspiapi.h index 476a561ec3..c95c46abcc 100644 --- a/lib/libc/include/any-windows-any/wspiapi.h +++ b/lib/libc/include/any-windows-any/wspiapi.h @@ -12,8 +12,6 @@ #include #include -#include <_mingw_print_push.h> - #define _WSPIAPI_STRCPY_S(_Dst,_Size,_Src) strcpy((_Dst),(_Src)) #define _WSPIAPI_STRCAT_S(_Dst,_Size,_Src) strcat((_Dst),(_Src)) #define _WSPIAPI_STRNCPY_S(_Dst,_Size,_Src,_Count) strncpy((_Dst),(_Src),(_Count)); (_Dst)[(_Size) - 1] = 0 @@ -202,6 +200,4 @@ extern "C" { } #endif -#include <_mingw_print_pop.h> - #endif diff --git a/lib/libc/include/any-windows-any/wtypes.h b/lib/libc/include/any-windows-any/wtypes.h index 48c07ebf95..ee3c9ff11d 100644 --- a/lib/libc/include/any-windows-any/wtypes.h +++ b/lib/libc/include/any-windows-any/wtypes.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/wtypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/wtypes.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -564,7 +565,6 @@ enum VARENUM { VT_TYPEMASK = 0xfff }; - typedef ULONG PROPID; #ifndef PROPERTYKEY_DEFINED diff --git a/lib/libc/include/any-windows-any/wtypesbase.h b/lib/libc/include/any-windows-any/wtypesbase.h index 2616f8a51c..a18ccb9a50 100644 --- a/lib/libc/include/any-windows-any/wtypesbase.h +++ b/lib/libc/include/any-windows-any/wtypesbase.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/wtypesbase.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/wtypesbase.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/xinput.h b/lib/libc/include/any-windows-any/xinput.h index c2e8c957f6..d4fe7054cb 100644 --- a/lib/libc/include/any-windows-any/xinput.h +++ b/lib/libc/include/any-windows-any/xinput.h @@ -157,6 +157,9 @@ #define XUSER_INDEX_ANY 0x000000FF #define XINPUT_CAPS_FFB_SUPPORTED 0x0001 +#define XINPUT_CAPS_WIRELESS 0x0002 +#define XINPUT_CAPS_PMD_SUPPORTED 0x0008 +#define XINPUT_CAPS_NO_NAVIGATION 0x0010 /* * Defines the structure of an xbox 360 joystick. diff --git a/lib/libc/include/any-windows-any/xmllite.h b/lib/libc/include/any-windows-any/xmllite.h index 6912f88883..4bc60bda56 100644 --- a/lib/libc/include/any-windows-any/xmllite.h +++ b/lib/libc/include/any-windows-any/xmllite.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 3.1 from include/xmllite.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from include/xmllite.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include diff --git a/lib/libc/include/any-windows-any/xpsdigitalsignature.h b/lib/libc/include/any-windows-any/xpsdigitalsignature.h index bb0611b6eb..4a2b133ec3 100644 --- a/lib/libc/include/any-windows-any/xpsdigitalsignature.h +++ b/lib/libc/include/any-windows-any/xpsdigitalsignature.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/xpsdigitalsignature.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/xpsdigitalsignature.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,41 +21,65 @@ #ifndef __IXpsSigningOptions_FWD_DEFINED__ #define __IXpsSigningOptions_FWD_DEFINED__ typedef interface IXpsSigningOptions IXpsSigningOptions; +#ifdef __cplusplus +interface IXpsSigningOptions; +#endif /* __cplusplus */ #endif #ifndef __IXpsSignature_FWD_DEFINED__ #define __IXpsSignature_FWD_DEFINED__ typedef interface IXpsSignature IXpsSignature; +#ifdef __cplusplus +interface IXpsSignature; +#endif /* __cplusplus */ #endif #ifndef __IXpsSignatureBlock_FWD_DEFINED__ #define __IXpsSignatureBlock_FWD_DEFINED__ typedef interface IXpsSignatureBlock IXpsSignatureBlock; +#ifdef __cplusplus +interface IXpsSignatureBlock; +#endif /* __cplusplus */ #endif #ifndef __IXpsSignatureBlockCollection_FWD_DEFINED__ #define __IXpsSignatureBlockCollection_FWD_DEFINED__ typedef interface IXpsSignatureBlockCollection IXpsSignatureBlockCollection; +#ifdef __cplusplus +interface IXpsSignatureBlockCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsSignatureCollection_FWD_DEFINED__ #define __IXpsSignatureCollection_FWD_DEFINED__ typedef interface IXpsSignatureCollection IXpsSignatureCollection; +#ifdef __cplusplus +interface IXpsSignatureCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsSignatureManager_FWD_DEFINED__ #define __IXpsSignatureManager_FWD_DEFINED__ typedef interface IXpsSignatureManager IXpsSignatureManager; +#ifdef __cplusplus +interface IXpsSignatureManager; +#endif /* __cplusplus */ #endif #ifndef __IXpsSignatureRequest_FWD_DEFINED__ #define __IXpsSignatureRequest_FWD_DEFINED__ typedef interface IXpsSignatureRequest IXpsSignatureRequest; +#ifdef __cplusplus +interface IXpsSignatureRequest; +#endif /* __cplusplus */ #endif #ifndef __IXpsSignatureRequestCollection_FWD_DEFINED__ #define __IXpsSignatureRequestCollection_FWD_DEFINED__ typedef interface IXpsSignatureRequestCollection IXpsSignatureRequestCollection; +#ifdef __cplusplus +interface IXpsSignatureRequestCollection; +#endif /* __cplusplus */ #endif #ifndef __XpsSignatureManager_FWD_DEFINED__ @@ -93,36 +118,57 @@ DEFINE_GUID(LIBID_MSXPSSIG, 0x8223a7eb, 0xc4d5, 0x474d, 0x9b,0xcc, 0xff,0x67,0x1 #ifndef __IXpsSigningOptions_FWD_DEFINED__ #define __IXpsSigningOptions_FWD_DEFINED__ typedef interface IXpsSigningOptions IXpsSigningOptions; +#ifdef __cplusplus +interface IXpsSigningOptions; +#endif /* __cplusplus */ #endif #ifndef __IXpsSignatureCollection_FWD_DEFINED__ #define __IXpsSignatureCollection_FWD_DEFINED__ typedef interface IXpsSignatureCollection IXpsSignatureCollection; +#ifdef __cplusplus +interface IXpsSignatureCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsSignature_FWD_DEFINED__ #define __IXpsSignature_FWD_DEFINED__ typedef interface IXpsSignature IXpsSignature; +#ifdef __cplusplus +interface IXpsSignature; +#endif /* __cplusplus */ #endif #ifndef __IXpsSignatureBlockCollection_FWD_DEFINED__ #define __IXpsSignatureBlockCollection_FWD_DEFINED__ typedef interface IXpsSignatureBlockCollection IXpsSignatureBlockCollection; +#ifdef __cplusplus +interface IXpsSignatureBlockCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsSignatureBlock_FWD_DEFINED__ #define __IXpsSignatureBlock_FWD_DEFINED__ typedef interface IXpsSignatureBlock IXpsSignatureBlock; +#ifdef __cplusplus +interface IXpsSignatureBlock; +#endif /* __cplusplus */ #endif #ifndef __IXpsSignatureRequestCollection_FWD_DEFINED__ #define __IXpsSignatureRequestCollection_FWD_DEFINED__ typedef interface IXpsSignatureRequestCollection IXpsSignatureRequestCollection; +#ifdef __cplusplus +interface IXpsSignatureRequestCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsSignatureRequest_FWD_DEFINED__ #define __IXpsSignatureRequest_FWD_DEFINED__ typedef interface IXpsSignatureRequest IXpsSignatureRequest; +#ifdef __cplusplus +interface IXpsSignatureRequest; +#endif /* __cplusplus */ #endif typedef enum __WIDL_xpsdigitalsignature_generated_name_00000020 { @@ -218,87 +264,88 @@ typedef struct IXpsSigningOptionsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsSigningOptions* This, + IXpsSigningOptions *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsSigningOptions* This); + IXpsSigningOptions *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsSigningOptions* This); + IXpsSigningOptions *This); /*** IXpsSigningOptions methods ***/ HRESULT (STDMETHODCALLTYPE *GetSignatureId)( - IXpsSigningOptions* This, + IXpsSigningOptions *This, LPWSTR *signatureId); HRESULT (STDMETHODCALLTYPE *SetSignatureId)( - IXpsSigningOptions* This, + IXpsSigningOptions *This, LPCWSTR signatureId); HRESULT (STDMETHODCALLTYPE *GetSignatureMethod)( - IXpsSigningOptions* This, + IXpsSigningOptions *This, LPWSTR *signatureMethod); HRESULT (STDMETHODCALLTYPE *SetSignatureMethod)( - IXpsSigningOptions* This, + IXpsSigningOptions *This, LPCWSTR signatureMethod); HRESULT (STDMETHODCALLTYPE *GetDigestMethod)( - IXpsSigningOptions* This, + IXpsSigningOptions *This, LPWSTR *digestMethod); HRESULT (STDMETHODCALLTYPE *SetDigestMethod)( - IXpsSigningOptions* This, + IXpsSigningOptions *This, LPCWSTR digestMethod); HRESULT (STDMETHODCALLTYPE *GetSignaturePartName)( - IXpsSigningOptions* This, + IXpsSigningOptions *This, IOpcPartUri **signaturePartName); HRESULT (STDMETHODCALLTYPE *SetSignaturePartName)( - IXpsSigningOptions* This, + IXpsSigningOptions *This, IOpcPartUri *signaturePartName); HRESULT (STDMETHODCALLTYPE *GetPolicy)( - IXpsSigningOptions* This, + IXpsSigningOptions *This, XPS_SIGN_POLICY *policy); HRESULT (STDMETHODCALLTYPE *SetPolicy)( - IXpsSigningOptions* This, + IXpsSigningOptions *This, XPS_SIGN_POLICY policy); HRESULT (STDMETHODCALLTYPE *GetSigningTimeFormat)( - IXpsSigningOptions* This, + IXpsSigningOptions *This, OPC_SIGNATURE_TIME_FORMAT *timeFormat); HRESULT (STDMETHODCALLTYPE *SetSigningTimeFormat)( - IXpsSigningOptions* This, + IXpsSigningOptions *This, OPC_SIGNATURE_TIME_FORMAT timeFormat); HRESULT (STDMETHODCALLTYPE *GetCustomObjects)( - IXpsSigningOptions* This, + IXpsSigningOptions *This, IOpcSignatureCustomObjectSet **customObjectSet); HRESULT (STDMETHODCALLTYPE *GetCustomReferences)( - IXpsSigningOptions* This, + IXpsSigningOptions *This, IOpcSignatureReferenceSet **customReferenceSet); HRESULT (STDMETHODCALLTYPE *GetCertificateSet)( - IXpsSigningOptions* This, + IXpsSigningOptions *This, IOpcCertificateSet **certificateSet); HRESULT (STDMETHODCALLTYPE *GetFlags)( - IXpsSigningOptions* This, + IXpsSigningOptions *This, XPS_SIGN_FLAGS *flags); HRESULT (STDMETHODCALLTYPE *SetFlags)( - IXpsSigningOptions* This, + IXpsSigningOptions *This, XPS_SIGN_FLAGS flags); END_INTERFACE } IXpsSigningOptionsVtbl; + interface IXpsSigningOptions { CONST_VTBL IXpsSigningOptionsVtbl* lpVtbl; }; @@ -395,142 +442,6 @@ static FORCEINLINE HRESULT IXpsSigningOptions_SetFlags(IXpsSigningOptions* This, #endif -HRESULT STDMETHODCALLTYPE IXpsSigningOptions_GetSignatureId_Proxy( - IXpsSigningOptions* This, - LPWSTR *signatureId); -void __RPC_STUB IXpsSigningOptions_GetSignatureId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSigningOptions_SetSignatureId_Proxy( - IXpsSigningOptions* This, - LPCWSTR signatureId); -void __RPC_STUB IXpsSigningOptions_SetSignatureId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSigningOptions_GetSignatureMethod_Proxy( - IXpsSigningOptions* This, - LPWSTR *signatureMethod); -void __RPC_STUB IXpsSigningOptions_GetSignatureMethod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSigningOptions_SetSignatureMethod_Proxy( - IXpsSigningOptions* This, - LPCWSTR signatureMethod); -void __RPC_STUB IXpsSigningOptions_SetSignatureMethod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSigningOptions_GetDigestMethod_Proxy( - IXpsSigningOptions* This, - LPWSTR *digestMethod); -void __RPC_STUB IXpsSigningOptions_GetDigestMethod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSigningOptions_SetDigestMethod_Proxy( - IXpsSigningOptions* This, - LPCWSTR digestMethod); -void __RPC_STUB IXpsSigningOptions_SetDigestMethod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSigningOptions_GetSignaturePartName_Proxy( - IXpsSigningOptions* This, - IOpcPartUri **signaturePartName); -void __RPC_STUB IXpsSigningOptions_GetSignaturePartName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSigningOptions_SetSignaturePartName_Proxy( - IXpsSigningOptions* This, - IOpcPartUri *signaturePartName); -void __RPC_STUB IXpsSigningOptions_SetSignaturePartName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSigningOptions_GetPolicy_Proxy( - IXpsSigningOptions* This, - XPS_SIGN_POLICY *policy); -void __RPC_STUB IXpsSigningOptions_GetPolicy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSigningOptions_SetPolicy_Proxy( - IXpsSigningOptions* This, - XPS_SIGN_POLICY policy); -void __RPC_STUB IXpsSigningOptions_SetPolicy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSigningOptions_GetSigningTimeFormat_Proxy( - IXpsSigningOptions* This, - OPC_SIGNATURE_TIME_FORMAT *timeFormat); -void __RPC_STUB IXpsSigningOptions_GetSigningTimeFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSigningOptions_SetSigningTimeFormat_Proxy( - IXpsSigningOptions* This, - OPC_SIGNATURE_TIME_FORMAT timeFormat); -void __RPC_STUB IXpsSigningOptions_SetSigningTimeFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSigningOptions_GetCustomObjects_Proxy( - IXpsSigningOptions* This, - IOpcSignatureCustomObjectSet **customObjectSet); -void __RPC_STUB IXpsSigningOptions_GetCustomObjects_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSigningOptions_GetCustomReferences_Proxy( - IXpsSigningOptions* This, - IOpcSignatureReferenceSet **customReferenceSet); -void __RPC_STUB IXpsSigningOptions_GetCustomReferences_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSigningOptions_GetCertificateSet_Proxy( - IXpsSigningOptions* This, - IOpcCertificateSet **certificateSet); -void __RPC_STUB IXpsSigningOptions_GetCertificateSet_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSigningOptions_GetFlags_Proxy( - IXpsSigningOptions* This, - XPS_SIGN_FLAGS *flags); -void __RPC_STUB IXpsSigningOptions_GetFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSigningOptions_SetFlags_Proxy( - IXpsSigningOptions* This, - XPS_SIGN_FLAGS flags); -void __RPC_STUB IXpsSigningOptions_SetFlags_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsSigningOptions_INTERFACE_DEFINED__ */ @@ -595,71 +506,72 @@ typedef struct IXpsSignatureVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsSignature* This, + IXpsSignature *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsSignature* This); + IXpsSignature *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsSignature* This); + IXpsSignature *This); /*** IXpsSignature methods ***/ HRESULT (STDMETHODCALLTYPE *GetSignatureId)( - IXpsSignature* This, + IXpsSignature *This, LPWSTR *sigId); HRESULT (STDMETHODCALLTYPE *GetSignatureValue)( - IXpsSignature* This, + IXpsSignature *This, UINT8 **signatureHashValue, UINT32 *count); HRESULT (STDMETHODCALLTYPE *GetCertificateEnumerator)( - IXpsSignature* This, + IXpsSignature *This, IOpcCertificateEnumerator **certificateEnumerator); HRESULT (STDMETHODCALLTYPE *GetSigningTime)( - IXpsSignature* This, + IXpsSignature *This, LPWSTR *sigDateTimeString); HRESULT (STDMETHODCALLTYPE *GetSigningTimeFormat)( - IXpsSignature* This, + IXpsSignature *This, OPC_SIGNATURE_TIME_FORMAT *timeFormat); HRESULT (STDMETHODCALLTYPE *GetSignaturePartName)( - IXpsSignature* This, + IXpsSignature *This, IOpcPartUri **signaturePartName); HRESULT (STDMETHODCALLTYPE *Verify)( - IXpsSignature* This, + IXpsSignature *This, const CERT_CONTEXT *x509Certificate, XPS_SIGNATURE_STATUS *sigStatus); HRESULT (STDMETHODCALLTYPE *GetPolicy)( - IXpsSignature* This, + IXpsSignature *This, XPS_SIGN_POLICY *policy); HRESULT (STDMETHODCALLTYPE *GetCustomObjectEnumerator)( - IXpsSignature* This, + IXpsSignature *This, IOpcSignatureCustomObjectEnumerator **customObjectEnumerator); HRESULT (STDMETHODCALLTYPE *GetCustomReferenceEnumerator)( - IXpsSignature* This, + IXpsSignature *This, IOpcSignatureReferenceEnumerator **customReferenceEnumerator); HRESULT (STDMETHODCALLTYPE *GetSignatureXml)( - IXpsSignature* This, + IXpsSignature *This, UINT8 **signatureXml, UINT32 *count); HRESULT (STDMETHODCALLTYPE *SetSignatureXml)( - IXpsSignature* This, + IXpsSignature *This, const UINT8 *signatureXml, UINT32 count); END_INTERFACE } IXpsSignatureVtbl; + interface IXpsSignature { CONST_VTBL IXpsSignatureVtbl* lpVtbl; }; @@ -736,106 +648,6 @@ static FORCEINLINE HRESULT IXpsSignature_SetSignatureXml(IXpsSignature* This,con #endif -HRESULT STDMETHODCALLTYPE IXpsSignature_GetSignatureId_Proxy( - IXpsSignature* This, - LPWSTR *sigId); -void __RPC_STUB IXpsSignature_GetSignatureId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignature_GetSignatureValue_Proxy( - IXpsSignature* This, - UINT8 **signatureHashValue, - UINT32 *count); -void __RPC_STUB IXpsSignature_GetSignatureValue_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignature_GetCertificateEnumerator_Proxy( - IXpsSignature* This, - IOpcCertificateEnumerator **certificateEnumerator); -void __RPC_STUB IXpsSignature_GetCertificateEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignature_GetSigningTime_Proxy( - IXpsSignature* This, - LPWSTR *sigDateTimeString); -void __RPC_STUB IXpsSignature_GetSigningTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignature_GetSigningTimeFormat_Proxy( - IXpsSignature* This, - OPC_SIGNATURE_TIME_FORMAT *timeFormat); -void __RPC_STUB IXpsSignature_GetSigningTimeFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignature_GetSignaturePartName_Proxy( - IXpsSignature* This, - IOpcPartUri **signaturePartName); -void __RPC_STUB IXpsSignature_GetSignaturePartName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignature_Verify_Proxy( - IXpsSignature* This, - const CERT_CONTEXT *x509Certificate, - XPS_SIGNATURE_STATUS *sigStatus); -void __RPC_STUB IXpsSignature_Verify_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignature_GetPolicy_Proxy( - IXpsSignature* This, - XPS_SIGN_POLICY *policy); -void __RPC_STUB IXpsSignature_GetPolicy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignature_GetCustomObjectEnumerator_Proxy( - IXpsSignature* This, - IOpcSignatureCustomObjectEnumerator **customObjectEnumerator); -void __RPC_STUB IXpsSignature_GetCustomObjectEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignature_GetCustomReferenceEnumerator_Proxy( - IXpsSignature* This, - IOpcSignatureReferenceEnumerator **customReferenceEnumerator); -void __RPC_STUB IXpsSignature_GetCustomReferenceEnumerator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignature_GetSignatureXml_Proxy( - IXpsSignature* This, - UINT8 **signatureXml, - UINT32 *count); -void __RPC_STUB IXpsSignature_GetSignatureXml_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignature_SetSignatureXml_Proxy( - IXpsSignature* This, - const UINT8 *signatureXml, - UINT32 count); -void __RPC_STUB IXpsSignature_SetSignatureXml_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsSignature_INTERFACE_DEFINED__ */ @@ -876,40 +688,41 @@ typedef struct IXpsSignatureBlockVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsSignatureBlock* This, + IXpsSignatureBlock *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsSignatureBlock* This); + IXpsSignatureBlock *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsSignatureBlock* This); + IXpsSignatureBlock *This); /*** IXpsSignatureBlock methods ***/ HRESULT (STDMETHODCALLTYPE *GetRequests)( - IXpsSignatureBlock* This, + IXpsSignatureBlock *This, IXpsSignatureRequestCollection **requests); HRESULT (STDMETHODCALLTYPE *GetPartName)( - IXpsSignatureBlock* This, + IXpsSignatureBlock *This, IOpcPartUri **partName); HRESULT (STDMETHODCALLTYPE *GetDocumentIndex)( - IXpsSignatureBlock* This, + IXpsSignatureBlock *This, UINT32 *fixedDocumentIndex); HRESULT (STDMETHODCALLTYPE *GetDocumentName)( - IXpsSignatureBlock* This, + IXpsSignatureBlock *This, IOpcPartUri **fixedDocumentName); HRESULT (STDMETHODCALLTYPE *CreateRequest)( - IXpsSignatureBlock* This, + IXpsSignatureBlock *This, LPCWSTR requestId, IXpsSignatureRequest **signatureRequest); END_INTERFACE } IXpsSignatureBlockVtbl; + interface IXpsSignatureBlock { CONST_VTBL IXpsSignatureBlockVtbl* lpVtbl; }; @@ -958,47 +771,6 @@ static FORCEINLINE HRESULT IXpsSignatureBlock_CreateRequest(IXpsSignatureBlock* #endif -HRESULT STDMETHODCALLTYPE IXpsSignatureBlock_GetRequests_Proxy( - IXpsSignatureBlock* This, - IXpsSignatureRequestCollection **requests); -void __RPC_STUB IXpsSignatureBlock_GetRequests_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureBlock_GetPartName_Proxy( - IXpsSignatureBlock* This, - IOpcPartUri **partName); -void __RPC_STUB IXpsSignatureBlock_GetPartName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureBlock_GetDocumentIndex_Proxy( - IXpsSignatureBlock* This, - UINT32 *fixedDocumentIndex); -void __RPC_STUB IXpsSignatureBlock_GetDocumentIndex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureBlock_GetDocumentName_Proxy( - IXpsSignatureBlock* This, - IOpcPartUri **fixedDocumentName); -void __RPC_STUB IXpsSignatureBlock_GetDocumentName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureBlock_CreateRequest_Proxy( - IXpsSignatureBlock* This, - LPCWSTR requestId, - IXpsSignatureRequest **signatureRequest); -void __RPC_STUB IXpsSignatureBlock_CreateRequest_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsSignatureBlock_INTERFACE_DEFINED__ */ @@ -1033,32 +805,33 @@ typedef struct IXpsSignatureBlockCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsSignatureBlockCollection* This, + IXpsSignatureBlockCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsSignatureBlockCollection* This); + IXpsSignatureBlockCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsSignatureBlockCollection* This); + IXpsSignatureBlockCollection *This); /*** IXpsSignatureBlockCollection methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IXpsSignatureBlockCollection* This, + IXpsSignatureBlockCollection *This, UINT32 *count); HRESULT (STDMETHODCALLTYPE *GetAt)( - IXpsSignatureBlockCollection* This, + IXpsSignatureBlockCollection *This, UINT32 index, IXpsSignatureBlock **signatureBlock); HRESULT (STDMETHODCALLTYPE *RemoveAt)( - IXpsSignatureBlockCollection* This, + IXpsSignatureBlockCollection *This, UINT32 index); END_INTERFACE } IXpsSignatureBlockCollectionVtbl; + interface IXpsSignatureBlockCollection { CONST_VTBL IXpsSignatureBlockCollectionVtbl* lpVtbl; }; @@ -1099,31 +872,6 @@ static FORCEINLINE HRESULT IXpsSignatureBlockCollection_RemoveAt(IXpsSignatureBl #endif -HRESULT STDMETHODCALLTYPE IXpsSignatureBlockCollection_GetCount_Proxy( - IXpsSignatureBlockCollection* This, - UINT32 *count); -void __RPC_STUB IXpsSignatureBlockCollection_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureBlockCollection_GetAt_Proxy( - IXpsSignatureBlockCollection* This, - UINT32 index, - IXpsSignatureBlock **signatureBlock); -void __RPC_STUB IXpsSignatureBlockCollection_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureBlockCollection_RemoveAt_Proxy( - IXpsSignatureBlockCollection* This, - UINT32 index); -void __RPC_STUB IXpsSignatureBlockCollection_RemoveAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsSignatureBlockCollection_INTERFACE_DEFINED__ */ @@ -1158,32 +906,33 @@ typedef struct IXpsSignatureCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsSignatureCollection* This, + IXpsSignatureCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsSignatureCollection* This); + IXpsSignatureCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsSignatureCollection* This); + IXpsSignatureCollection *This); /*** IXpsSignatureCollection methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IXpsSignatureCollection* This, + IXpsSignatureCollection *This, UINT32 *count); HRESULT (STDMETHODCALLTYPE *GetAt)( - IXpsSignatureCollection* This, + IXpsSignatureCollection *This, UINT32 index, IXpsSignature **signature); HRESULT (STDMETHODCALLTYPE *RemoveAt)( - IXpsSignatureCollection* This, + IXpsSignatureCollection *This, UINT32 index); END_INTERFACE } IXpsSignatureCollectionVtbl; + interface IXpsSignatureCollection { CONST_VTBL IXpsSignatureCollectionVtbl* lpVtbl; }; @@ -1224,31 +973,6 @@ static FORCEINLINE HRESULT IXpsSignatureCollection_RemoveAt(IXpsSignatureCollect #endif -HRESULT STDMETHODCALLTYPE IXpsSignatureCollection_GetCount_Proxy( - IXpsSignatureCollection* This, - UINT32 *count); -void __RPC_STUB IXpsSignatureCollection_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureCollection_GetAt_Proxy( - IXpsSignatureCollection* This, - UINT32 index, - IXpsSignature **signature); -void __RPC_STUB IXpsSignatureCollection_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureCollection_RemoveAt_Proxy( - IXpsSignatureCollection* This, - UINT32 index); -void __RPC_STUB IXpsSignatureCollection_RemoveAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsSignatureCollection_INTERFACE_DEFINED__ */ @@ -1312,69 +1036,70 @@ typedef struct IXpsSignatureManagerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsSignatureManager* This, + IXpsSignatureManager *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsSignatureManager* This); + IXpsSignatureManager *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsSignatureManager* This); + IXpsSignatureManager *This); /*** IXpsSignatureManager methods ***/ HRESULT (STDMETHODCALLTYPE *LoadPackageFile)( - IXpsSignatureManager* This, + IXpsSignatureManager *This, LPCWSTR fileName); HRESULT (STDMETHODCALLTYPE *LoadPackageStream)( - IXpsSignatureManager* This, + IXpsSignatureManager *This, IStream *stream); HRESULT (STDMETHODCALLTYPE *Sign)( - IXpsSignatureManager* This, + IXpsSignatureManager *This, IXpsSigningOptions *signOptions, const CERT_CONTEXT *x509Certificate, IXpsSignature **signature); HRESULT (STDMETHODCALLTYPE *GetSignatureOriginPartName)( - IXpsSignatureManager* This, + IXpsSignatureManager *This, IOpcPartUri **signatureOriginPartName); HRESULT (STDMETHODCALLTYPE *SetSignatureOriginPartName)( - IXpsSignatureManager* This, + IXpsSignatureManager *This, IOpcPartUri *signatureOriginPartName); HRESULT (STDMETHODCALLTYPE *GetSignatures)( - IXpsSignatureManager* This, + IXpsSignatureManager *This, IXpsSignatureCollection **signatures); HRESULT (STDMETHODCALLTYPE *AddSignatureBlock)( - IXpsSignatureManager* This, + IXpsSignatureManager *This, IOpcPartUri *partName, UINT32 fixedDocumentIndex, IXpsSignatureBlock **signatureBlock); HRESULT (STDMETHODCALLTYPE *GetSignatureBlocks)( - IXpsSignatureManager* This, + IXpsSignatureManager *This, IXpsSignatureBlockCollection **signatureBlocks); HRESULT (STDMETHODCALLTYPE *CreateSigningOptions)( - IXpsSignatureManager* This, + IXpsSignatureManager *This, IXpsSigningOptions **signingOptions); HRESULT (STDMETHODCALLTYPE *SavePackageToFile)( - IXpsSignatureManager* This, + IXpsSignatureManager *This, LPCWSTR fileName, LPSECURITY_ATTRIBUTES securityAttributes, DWORD flagsAndAttributes); HRESULT (STDMETHODCALLTYPE *SavePackageToStream)( - IXpsSignatureManager* This, + IXpsSignatureManager *This, IStream *stream); END_INTERFACE } IXpsSignatureManagerVtbl; + interface IXpsSignatureManager { CONST_VTBL IXpsSignatureManagerVtbl* lpVtbl; }; @@ -1447,100 +1172,6 @@ static FORCEINLINE HRESULT IXpsSignatureManager_SavePackageToStream(IXpsSignatur #endif -HRESULT STDMETHODCALLTYPE IXpsSignatureManager_LoadPackageFile_Proxy( - IXpsSignatureManager* This, - LPCWSTR fileName); -void __RPC_STUB IXpsSignatureManager_LoadPackageFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureManager_LoadPackageStream_Proxy( - IXpsSignatureManager* This, - IStream *stream); -void __RPC_STUB IXpsSignatureManager_LoadPackageStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureManager_Sign_Proxy( - IXpsSignatureManager* This, - IXpsSigningOptions *signOptions, - const CERT_CONTEXT *x509Certificate, - IXpsSignature **signature); -void __RPC_STUB IXpsSignatureManager_Sign_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureManager_GetSignatureOriginPartName_Proxy( - IXpsSignatureManager* This, - IOpcPartUri **signatureOriginPartName); -void __RPC_STUB IXpsSignatureManager_GetSignatureOriginPartName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureManager_SetSignatureOriginPartName_Proxy( - IXpsSignatureManager* This, - IOpcPartUri *signatureOriginPartName); -void __RPC_STUB IXpsSignatureManager_SetSignatureOriginPartName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureManager_GetSignatures_Proxy( - IXpsSignatureManager* This, - IXpsSignatureCollection **signatures); -void __RPC_STUB IXpsSignatureManager_GetSignatures_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureManager_AddSignatureBlock_Proxy( - IXpsSignatureManager* This, - IOpcPartUri *partName, - UINT32 fixedDocumentIndex, - IXpsSignatureBlock **signatureBlock); -void __RPC_STUB IXpsSignatureManager_AddSignatureBlock_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureManager_GetSignatureBlocks_Proxy( - IXpsSignatureManager* This, - IXpsSignatureBlockCollection **signatureBlocks); -void __RPC_STUB IXpsSignatureManager_GetSignatureBlocks_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureManager_CreateSigningOptions_Proxy( - IXpsSignatureManager* This, - IXpsSigningOptions **signingOptions); -void __RPC_STUB IXpsSignatureManager_CreateSigningOptions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureManager_SavePackageToFile_Proxy( - IXpsSignatureManager* This, - LPCWSTR fileName, - LPSECURITY_ATTRIBUTES securityAttributes, - DWORD flagsAndAttributes); -void __RPC_STUB IXpsSignatureManager_SavePackageToFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureManager_SavePackageToStream_Proxy( - IXpsSignatureManager* This, - IStream *stream); -void __RPC_STUB IXpsSignatureManager_SavePackageToStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsSignatureManager_INTERFACE_DEFINED__ */ @@ -1606,72 +1237,73 @@ typedef struct IXpsSignatureRequestVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsSignatureRequest* This, + IXpsSignatureRequest *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsSignatureRequest* This); + IXpsSignatureRequest *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsSignatureRequest* This); + IXpsSignatureRequest *This); /*** IXpsSignatureRequest methods ***/ HRESULT (STDMETHODCALLTYPE *GetIntent)( - IXpsSignatureRequest* This, + IXpsSignatureRequest *This, LPWSTR *intent); HRESULT (STDMETHODCALLTYPE *SetIntent)( - IXpsSignatureRequest* This, + IXpsSignatureRequest *This, LPCWSTR intent); HRESULT (STDMETHODCALLTYPE *GetRequestedSigner)( - IXpsSignatureRequest* This, + IXpsSignatureRequest *This, LPWSTR *signerName); HRESULT (STDMETHODCALLTYPE *SetRequestedSigner)( - IXpsSignatureRequest* This, + IXpsSignatureRequest *This, LPCWSTR signerName); HRESULT (STDMETHODCALLTYPE *GetRequestSignByDate)( - IXpsSignatureRequest* This, + IXpsSignatureRequest *This, LPWSTR *dateString); HRESULT (STDMETHODCALLTYPE *SetRequestSignByDate)( - IXpsSignatureRequest* This, + IXpsSignatureRequest *This, LPCWSTR dateString); HRESULT (STDMETHODCALLTYPE *GetSigningLocale)( - IXpsSignatureRequest* This, + IXpsSignatureRequest *This, LPWSTR *place); HRESULT (STDMETHODCALLTYPE *SetSigningLocale)( - IXpsSignatureRequest* This, + IXpsSignatureRequest *This, LPCWSTR place); HRESULT (STDMETHODCALLTYPE *GetSpotLocation)( - IXpsSignatureRequest* This, + IXpsSignatureRequest *This, INT32 *pageIndex, IOpcPartUri **pagePartName, float *x, float *y); HRESULT (STDMETHODCALLTYPE *SetSpotLocation)( - IXpsSignatureRequest* This, + IXpsSignatureRequest *This, INT32 pageIndex, float x, float y); HRESULT (STDMETHODCALLTYPE *GetRequestId)( - IXpsSignatureRequest* This, + IXpsSignatureRequest *This, LPWSTR *requestId); HRESULT (STDMETHODCALLTYPE *GetSignature)( - IXpsSignatureRequest* This, + IXpsSignatureRequest *This, IXpsSignature **signature); END_INTERFACE } IXpsSignatureRequestVtbl; + interface IXpsSignatureRequest { CONST_VTBL IXpsSignatureRequestVtbl* lpVtbl; }; @@ -1748,107 +1380,6 @@ static FORCEINLINE HRESULT IXpsSignatureRequest_GetSignature(IXpsSignatureReques #endif -HRESULT STDMETHODCALLTYPE IXpsSignatureRequest_GetIntent_Proxy( - IXpsSignatureRequest* This, - LPWSTR *intent); -void __RPC_STUB IXpsSignatureRequest_GetIntent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureRequest_SetIntent_Proxy( - IXpsSignatureRequest* This, - LPCWSTR intent); -void __RPC_STUB IXpsSignatureRequest_SetIntent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureRequest_GetRequestedSigner_Proxy( - IXpsSignatureRequest* This, - LPWSTR *signerName); -void __RPC_STUB IXpsSignatureRequest_GetRequestedSigner_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureRequest_SetRequestedSigner_Proxy( - IXpsSignatureRequest* This, - LPCWSTR signerName); -void __RPC_STUB IXpsSignatureRequest_SetRequestedSigner_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureRequest_GetRequestSignByDate_Proxy( - IXpsSignatureRequest* This, - LPWSTR *dateString); -void __RPC_STUB IXpsSignatureRequest_GetRequestSignByDate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureRequest_SetRequestSignByDate_Proxy( - IXpsSignatureRequest* This, - LPCWSTR dateString); -void __RPC_STUB IXpsSignatureRequest_SetRequestSignByDate_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureRequest_GetSigningLocale_Proxy( - IXpsSignatureRequest* This, - LPWSTR *place); -void __RPC_STUB IXpsSignatureRequest_GetSigningLocale_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureRequest_SetSigningLocale_Proxy( - IXpsSignatureRequest* This, - LPCWSTR place); -void __RPC_STUB IXpsSignatureRequest_SetSigningLocale_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureRequest_GetSpotLocation_Proxy( - IXpsSignatureRequest* This, - INT32 *pageIndex, - IOpcPartUri **pagePartName, - float *x, - float *y); -void __RPC_STUB IXpsSignatureRequest_GetSpotLocation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureRequest_SetSpotLocation_Proxy( - IXpsSignatureRequest* This, - INT32 pageIndex, - float x, - float y); -void __RPC_STUB IXpsSignatureRequest_SetSpotLocation_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureRequest_GetRequestId_Proxy( - IXpsSignatureRequest* This, - LPWSTR *requestId); -void __RPC_STUB IXpsSignatureRequest_GetRequestId_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureRequest_GetSignature_Proxy( - IXpsSignatureRequest* This, - IXpsSignature **signature); -void __RPC_STUB IXpsSignatureRequest_GetSignature_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsSignatureRequest_INTERFACE_DEFINED__ */ @@ -1883,32 +1414,33 @@ typedef struct IXpsSignatureRequestCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsSignatureRequestCollection* This, + IXpsSignatureRequestCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsSignatureRequestCollection* This); + IXpsSignatureRequestCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsSignatureRequestCollection* This); + IXpsSignatureRequestCollection *This); /*** IXpsSignatureRequestCollection methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IXpsSignatureRequestCollection* This, + IXpsSignatureRequestCollection *This, UINT32 *count); HRESULT (STDMETHODCALLTYPE *GetAt)( - IXpsSignatureRequestCollection* This, + IXpsSignatureRequestCollection *This, UINT32 index, IXpsSignatureRequest **signatureRequest); HRESULT (STDMETHODCALLTYPE *RemoveAt)( - IXpsSignatureRequestCollection* This, + IXpsSignatureRequestCollection *This, UINT32 index); END_INTERFACE } IXpsSignatureRequestCollectionVtbl; + interface IXpsSignatureRequestCollection { CONST_VTBL IXpsSignatureRequestCollectionVtbl* lpVtbl; }; @@ -1949,31 +1481,6 @@ static FORCEINLINE HRESULT IXpsSignatureRequestCollection_RemoveAt(IXpsSignature #endif -HRESULT STDMETHODCALLTYPE IXpsSignatureRequestCollection_GetCount_Proxy( - IXpsSignatureRequestCollection* This, - UINT32 *count); -void __RPC_STUB IXpsSignatureRequestCollection_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureRequestCollection_GetAt_Proxy( - IXpsSignatureRequestCollection* This, - UINT32 index, - IXpsSignatureRequest **signatureRequest); -void __RPC_STUB IXpsSignatureRequestCollection_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsSignatureRequestCollection_RemoveAt_Proxy( - IXpsSignatureRequestCollection* This, - UINT32 index); -void __RPC_STUB IXpsSignatureRequestCollection_RemoveAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsSignatureRequestCollection_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/xpsobjectmodel.h b/lib/libc/include/any-windows-any/xpsobjectmodel.h index d34706ef17..663c400c09 100644 --- a/lib/libc/include/any-windows-any/xpsobjectmodel.h +++ b/lib/libc/include/any-windows-any/xpsobjectmodel.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/xpsobjectmodel.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/xpsobjectmodel.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,266 +21,425 @@ #ifndef __IXpsOMShareable_FWD_DEFINED__ #define __IXpsOMShareable_FWD_DEFINED__ typedef interface IXpsOMShareable IXpsOMShareable; +#ifdef __cplusplus +interface IXpsOMShareable; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPart_FWD_DEFINED__ #define __IXpsOMPart_FWD_DEFINED__ typedef interface IXpsOMPart IXpsOMPart; +#ifdef __cplusplus +interface IXpsOMPart; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMGlyphsEditor_FWD_DEFINED__ #define __IXpsOMGlyphsEditor_FWD_DEFINED__ typedef interface IXpsOMGlyphsEditor IXpsOMGlyphsEditor; +#ifdef __cplusplus +interface IXpsOMGlyphsEditor; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMDashCollection_FWD_DEFINED__ #define __IXpsOMDashCollection_FWD_DEFINED__ typedef interface IXpsOMDashCollection IXpsOMDashCollection; +#ifdef __cplusplus +interface IXpsOMDashCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMGeometryFigure_FWD_DEFINED__ #define __IXpsOMGeometryFigure_FWD_DEFINED__ typedef interface IXpsOMGeometryFigure IXpsOMGeometryFigure; +#ifdef __cplusplus +interface IXpsOMGeometryFigure; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMGeometryFigureCollection_FWD_DEFINED__ #define __IXpsOMGeometryFigureCollection_FWD_DEFINED__ typedef interface IXpsOMGeometryFigureCollection IXpsOMGeometryFigureCollection; +#ifdef __cplusplus +interface IXpsOMGeometryFigureCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMGradientStopCollection_FWD_DEFINED__ #define __IXpsOMGradientStopCollection_FWD_DEFINED__ typedef interface IXpsOMGradientStopCollection IXpsOMGradientStopCollection; +#ifdef __cplusplus +interface IXpsOMGradientStopCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMGradientStop_FWD_DEFINED__ #define __IXpsOMGradientStop_FWD_DEFINED__ typedef interface IXpsOMGradientStop IXpsOMGradientStop; +#ifdef __cplusplus +interface IXpsOMGradientStop; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPartResources_FWD_DEFINED__ #define __IXpsOMPartResources_FWD_DEFINED__ typedef interface IXpsOMPartResources IXpsOMPartResources; +#ifdef __cplusplus +interface IXpsOMPartResources; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMFontResourceCollection_FWD_DEFINED__ #define __IXpsOMFontResourceCollection_FWD_DEFINED__ typedef interface IXpsOMFontResourceCollection IXpsOMFontResourceCollection; +#ifdef __cplusplus +interface IXpsOMFontResourceCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMImageResourceCollection_FWD_DEFINED__ #define __IXpsOMImageResourceCollection_FWD_DEFINED__ typedef interface IXpsOMImageResourceCollection IXpsOMImageResourceCollection; +#ifdef __cplusplus +interface IXpsOMImageResourceCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMColorProfileResourceCollection_FWD_DEFINED__ #define __IXpsOMColorProfileResourceCollection_FWD_DEFINED__ typedef interface IXpsOMColorProfileResourceCollection IXpsOMColorProfileResourceCollection; +#ifdef __cplusplus +interface IXpsOMColorProfileResourceCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMRemoteDictionaryResourceCollection_FWD_DEFINED__ #define __IXpsOMRemoteDictionaryResourceCollection_FWD_DEFINED__ typedef interface IXpsOMRemoteDictionaryResourceCollection IXpsOMRemoteDictionaryResourceCollection; +#ifdef __cplusplus +interface IXpsOMRemoteDictionaryResourceCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMSignatureBlockResourceCollection_FWD_DEFINED__ #define __IXpsOMSignatureBlockResourceCollection_FWD_DEFINED__ typedef interface IXpsOMSignatureBlockResourceCollection IXpsOMSignatureBlockResourceCollection; +#ifdef __cplusplus +interface IXpsOMSignatureBlockResourceCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMVisualCollection_FWD_DEFINED__ #define __IXpsOMVisualCollection_FWD_DEFINED__ typedef interface IXpsOMVisualCollection IXpsOMVisualCollection; +#ifdef __cplusplus +interface IXpsOMVisualCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMDictionary_FWD_DEFINED__ #define __IXpsOMDictionary_FWD_DEFINED__ typedef interface IXpsOMDictionary IXpsOMDictionary; +#ifdef __cplusplus +interface IXpsOMDictionary; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPageReference_FWD_DEFINED__ #define __IXpsOMPageReference_FWD_DEFINED__ typedef interface IXpsOMPageReference IXpsOMPageReference; +#ifdef __cplusplus +interface IXpsOMPageReference; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPageReferenceCollection_FWD_DEFINED__ #define __IXpsOMPageReferenceCollection_FWD_DEFINED__ typedef interface IXpsOMPageReferenceCollection IXpsOMPageReferenceCollection; +#ifdef __cplusplus +interface IXpsOMPageReferenceCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMDocumentCollection_FWD_DEFINED__ #define __IXpsOMDocumentCollection_FWD_DEFINED__ typedef interface IXpsOMDocumentCollection IXpsOMDocumentCollection; +#ifdef __cplusplus +interface IXpsOMDocumentCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPackage_FWD_DEFINED__ #define __IXpsOMPackage_FWD_DEFINED__ typedef interface IXpsOMPackage IXpsOMPackage; +#ifdef __cplusplus +interface IXpsOMPackage; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMObjectFactory_FWD_DEFINED__ #define __IXpsOMObjectFactory_FWD_DEFINED__ typedef interface IXpsOMObjectFactory IXpsOMObjectFactory; +#ifdef __cplusplus +interface IXpsOMObjectFactory; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMNameCollection_FWD_DEFINED__ #define __IXpsOMNameCollection_FWD_DEFINED__ typedef interface IXpsOMNameCollection IXpsOMNameCollection; +#ifdef __cplusplus +interface IXpsOMNameCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPartUriCollection_FWD_DEFINED__ #define __IXpsOMPartUriCollection_FWD_DEFINED__ typedef interface IXpsOMPartUriCollection IXpsOMPartUriCollection; +#ifdef __cplusplus +interface IXpsOMPartUriCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPackageWriter_FWD_DEFINED__ #define __IXpsOMPackageWriter_FWD_DEFINED__ typedef interface IXpsOMPackageWriter IXpsOMPackageWriter; +#ifdef __cplusplus +interface IXpsOMPackageWriter; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPackageTarget_FWD_DEFINED__ #define __IXpsOMPackageTarget_FWD_DEFINED__ typedef interface IXpsOMPackageTarget IXpsOMPackageTarget; +#ifdef __cplusplus +interface IXpsOMPackageTarget; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMVisual_FWD_DEFINED__ #define __IXpsOMVisual_FWD_DEFINED__ typedef interface IXpsOMVisual IXpsOMVisual; +#ifdef __cplusplus +interface IXpsOMVisual; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMBrush_FWD_DEFINED__ #define __IXpsOMBrush_FWD_DEFINED__ typedef interface IXpsOMBrush IXpsOMBrush; +#ifdef __cplusplus +interface IXpsOMBrush; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMMatrixTransform_FWD_DEFINED__ #define __IXpsOMMatrixTransform_FWD_DEFINED__ typedef interface IXpsOMMatrixTransform IXpsOMMatrixTransform; +#ifdef __cplusplus +interface IXpsOMMatrixTransform; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMGeometry_FWD_DEFINED__ #define __IXpsOMGeometry_FWD_DEFINED__ typedef interface IXpsOMGeometry IXpsOMGeometry; +#ifdef __cplusplus +interface IXpsOMGeometry; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMGlyphs_FWD_DEFINED__ #define __IXpsOMGlyphs_FWD_DEFINED__ typedef interface IXpsOMGlyphs IXpsOMGlyphs; +#ifdef __cplusplus +interface IXpsOMGlyphs; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPath_FWD_DEFINED__ #define __IXpsOMPath_FWD_DEFINED__ typedef interface IXpsOMPath IXpsOMPath; +#ifdef __cplusplus +interface IXpsOMPath; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMSolidColorBrush_FWD_DEFINED__ #define __IXpsOMSolidColorBrush_FWD_DEFINED__ typedef interface IXpsOMSolidColorBrush IXpsOMSolidColorBrush; +#ifdef __cplusplus +interface IXpsOMSolidColorBrush; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMTileBrush_FWD_DEFINED__ #define __IXpsOMTileBrush_FWD_DEFINED__ typedef interface IXpsOMTileBrush IXpsOMTileBrush; +#ifdef __cplusplus +interface IXpsOMTileBrush; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMGradientBrush_FWD_DEFINED__ #define __IXpsOMGradientBrush_FWD_DEFINED__ typedef interface IXpsOMGradientBrush IXpsOMGradientBrush; +#ifdef __cplusplus +interface IXpsOMGradientBrush; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMVisualBrush_FWD_DEFINED__ #define __IXpsOMVisualBrush_FWD_DEFINED__ typedef interface IXpsOMVisualBrush IXpsOMVisualBrush; +#ifdef __cplusplus +interface IXpsOMVisualBrush; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMImageBrush_FWD_DEFINED__ #define __IXpsOMImageBrush_FWD_DEFINED__ typedef interface IXpsOMImageBrush IXpsOMImageBrush; +#ifdef __cplusplus +interface IXpsOMImageBrush; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMLinearGradientBrush_FWD_DEFINED__ #define __IXpsOMLinearGradientBrush_FWD_DEFINED__ typedef interface IXpsOMLinearGradientBrush IXpsOMLinearGradientBrush; +#ifdef __cplusplus +interface IXpsOMLinearGradientBrush; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMRadialGradientBrush_FWD_DEFINED__ #define __IXpsOMRadialGradientBrush_FWD_DEFINED__ typedef interface IXpsOMRadialGradientBrush IXpsOMRadialGradientBrush; +#ifdef __cplusplus +interface IXpsOMRadialGradientBrush; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMResource_FWD_DEFINED__ #define __IXpsOMResource_FWD_DEFINED__ typedef interface IXpsOMResource IXpsOMResource; +#ifdef __cplusplus +interface IXpsOMResource; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMFontResource_FWD_DEFINED__ #define __IXpsOMFontResource_FWD_DEFINED__ typedef interface IXpsOMFontResource IXpsOMFontResource; +#ifdef __cplusplus +interface IXpsOMFontResource; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMImageResource_FWD_DEFINED__ #define __IXpsOMImageResource_FWD_DEFINED__ typedef interface IXpsOMImageResource IXpsOMImageResource; +#ifdef __cplusplus +interface IXpsOMImageResource; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMColorProfileResource_FWD_DEFINED__ #define __IXpsOMColorProfileResource_FWD_DEFINED__ typedef interface IXpsOMColorProfileResource IXpsOMColorProfileResource; +#ifdef __cplusplus +interface IXpsOMColorProfileResource; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPrintTicketResource_FWD_DEFINED__ #define __IXpsOMPrintTicketResource_FWD_DEFINED__ typedef interface IXpsOMPrintTicketResource IXpsOMPrintTicketResource; +#ifdef __cplusplus +interface IXpsOMPrintTicketResource; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMRemoteDictionaryResource_FWD_DEFINED__ #define __IXpsOMRemoteDictionaryResource_FWD_DEFINED__ typedef interface IXpsOMRemoteDictionaryResource IXpsOMRemoteDictionaryResource; +#ifdef __cplusplus +interface IXpsOMRemoteDictionaryResource; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMDocumentStructureResource_FWD_DEFINED__ #define __IXpsOMDocumentStructureResource_FWD_DEFINED__ typedef interface IXpsOMDocumentStructureResource IXpsOMDocumentStructureResource; +#ifdef __cplusplus +interface IXpsOMDocumentStructureResource; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMStoryFragmentsResource_FWD_DEFINED__ #define __IXpsOMStoryFragmentsResource_FWD_DEFINED__ typedef interface IXpsOMStoryFragmentsResource IXpsOMStoryFragmentsResource; +#ifdef __cplusplus +interface IXpsOMStoryFragmentsResource; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMSignatureBlockResource_FWD_DEFINED__ #define __IXpsOMSignatureBlockResource_FWD_DEFINED__ typedef interface IXpsOMSignatureBlockResource IXpsOMSignatureBlockResource; +#ifdef __cplusplus +interface IXpsOMSignatureBlockResource; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMCanvas_FWD_DEFINED__ #define __IXpsOMCanvas_FWD_DEFINED__ typedef interface IXpsOMCanvas IXpsOMCanvas; +#ifdef __cplusplus +interface IXpsOMCanvas; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPage_FWD_DEFINED__ #define __IXpsOMPage_FWD_DEFINED__ typedef interface IXpsOMPage IXpsOMPage; +#ifdef __cplusplus +interface IXpsOMPage; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMDocument_FWD_DEFINED__ #define __IXpsOMDocument_FWD_DEFINED__ typedef interface IXpsOMDocument IXpsOMDocument; +#ifdef __cplusplus +interface IXpsOMDocument; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMDocumentSequence_FWD_DEFINED__ #define __IXpsOMDocumentSequence_FWD_DEFINED__ typedef interface IXpsOMDocumentSequence IXpsOMDocumentSequence; +#ifdef __cplusplus +interface IXpsOMDocumentSequence; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMCoreProperties_FWD_DEFINED__ #define __IXpsOMCoreProperties_FWD_DEFINED__ typedef interface IXpsOMCoreProperties IXpsOMCoreProperties; +#ifdef __cplusplus +interface IXpsOMCoreProperties; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMThumbnailGenerator_FWD_DEFINED__ #define __IXpsOMThumbnailGenerator_FWD_DEFINED__ typedef interface IXpsOMThumbnailGenerator IXpsOMThumbnailGenerator; +#ifdef __cplusplus +interface IXpsOMThumbnailGenerator; +#endif /* __cplusplus */ #endif #ifndef __XpsOMObjectFactory_FWD_DEFINED__ @@ -394,251 +554,401 @@ extern "C" { #ifndef __IXpsOMDocumentStructureResource_FWD_DEFINED__ #define __IXpsOMDocumentStructureResource_FWD_DEFINED__ typedef interface IXpsOMDocumentStructureResource IXpsOMDocumentStructureResource; +#ifdef __cplusplus +interface IXpsOMDocumentStructureResource; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMCoreProperties_FWD_DEFINED__ #define __IXpsOMCoreProperties_FWD_DEFINED__ typedef interface IXpsOMCoreProperties IXpsOMCoreProperties; +#ifdef __cplusplus +interface IXpsOMCoreProperties; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPrintTicketResource_FWD_DEFINED__ #define __IXpsOMPrintTicketResource_FWD_DEFINED__ typedef interface IXpsOMPrintTicketResource IXpsOMPrintTicketResource; +#ifdef __cplusplus +interface IXpsOMPrintTicketResource; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMStoryFragmentsResource_FWD_DEFINED__ #define __IXpsOMStoryFragmentsResource_FWD_DEFINED__ typedef interface IXpsOMStoryFragmentsResource IXpsOMStoryFragmentsResource; +#ifdef __cplusplus +interface IXpsOMStoryFragmentsResource; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPackage_FWD_DEFINED__ #define __IXpsOMPackage_FWD_DEFINED__ typedef interface IXpsOMPackage IXpsOMPackage; +#ifdef __cplusplus +interface IXpsOMPackage; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPart_FWD_DEFINED__ #define __IXpsOMPart_FWD_DEFINED__ typedef interface IXpsOMPart IXpsOMPart; +#ifdef __cplusplus +interface IXpsOMPart; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMShareable_FWD_DEFINED__ #define __IXpsOMShareable_FWD_DEFINED__ typedef interface IXpsOMShareable IXpsOMShareable; +#ifdef __cplusplus +interface IXpsOMShareable; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMVisual_FWD_DEFINED__ #define __IXpsOMVisual_FWD_DEFINED__ typedef interface IXpsOMVisual IXpsOMVisual; +#ifdef __cplusplus +interface IXpsOMVisual; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMBrush_FWD_DEFINED__ #define __IXpsOMBrush_FWD_DEFINED__ typedef interface IXpsOMBrush IXpsOMBrush; +#ifdef __cplusplus +interface IXpsOMBrush; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMTileBrush_FWD_DEFINED__ #define __IXpsOMTileBrush_FWD_DEFINED__ typedef interface IXpsOMTileBrush IXpsOMTileBrush; +#ifdef __cplusplus +interface IXpsOMTileBrush; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMResource_FWD_DEFINED__ #define __IXpsOMResource_FWD_DEFINED__ typedef interface IXpsOMResource IXpsOMResource; +#ifdef __cplusplus +interface IXpsOMResource; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMCanvas_FWD_DEFINED__ #define __IXpsOMCanvas_FWD_DEFINED__ typedef interface IXpsOMCanvas IXpsOMCanvas; +#ifdef __cplusplus +interface IXpsOMCanvas; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMColorProfileResource_FWD_DEFINED__ #define __IXpsOMColorProfileResource_FWD_DEFINED__ typedef interface IXpsOMColorProfileResource IXpsOMColorProfileResource; +#ifdef __cplusplus +interface IXpsOMColorProfileResource; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMColorProfileResourceCollection_FWD_DEFINED__ #define __IXpsOMColorProfileResourceCollection_FWD_DEFINED__ typedef interface IXpsOMColorProfileResourceCollection IXpsOMColorProfileResourceCollection; +#ifdef __cplusplus +interface IXpsOMColorProfileResourceCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMDashCollection_FWD_DEFINED__ #define __IXpsOMDashCollection_FWD_DEFINED__ typedef interface IXpsOMDashCollection IXpsOMDashCollection; +#ifdef __cplusplus +interface IXpsOMDashCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMFontResource_FWD_DEFINED__ #define __IXpsOMFontResource_FWD_DEFINED__ typedef interface IXpsOMFontResource IXpsOMFontResource; +#ifdef __cplusplus +interface IXpsOMFontResource; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMFontResourceCollection_FWD_DEFINED__ #define __IXpsOMFontResourceCollection_FWD_DEFINED__ typedef interface IXpsOMFontResourceCollection IXpsOMFontResourceCollection; +#ifdef __cplusplus +interface IXpsOMFontResourceCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMGeometry_FWD_DEFINED__ #define __IXpsOMGeometry_FWD_DEFINED__ typedef interface IXpsOMGeometry IXpsOMGeometry; +#ifdef __cplusplus +interface IXpsOMGeometry; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMGeometryFigure_FWD_DEFINED__ #define __IXpsOMGeometryFigure_FWD_DEFINED__ typedef interface IXpsOMGeometryFigure IXpsOMGeometryFigure; +#ifdef __cplusplus +interface IXpsOMGeometryFigure; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMGeometryFigureCollection_FWD_DEFINED__ #define __IXpsOMGeometryFigureCollection_FWD_DEFINED__ typedef interface IXpsOMGeometryFigureCollection IXpsOMGeometryFigureCollection; +#ifdef __cplusplus +interface IXpsOMGeometryFigureCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMGlyphs_FWD_DEFINED__ #define __IXpsOMGlyphs_FWD_DEFINED__ typedef interface IXpsOMGlyphs IXpsOMGlyphs; +#ifdef __cplusplus +interface IXpsOMGlyphs; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMGradientBrush_FWD_DEFINED__ #define __IXpsOMGradientBrush_FWD_DEFINED__ typedef interface IXpsOMGradientBrush IXpsOMGradientBrush; +#ifdef __cplusplus +interface IXpsOMGradientBrush; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMGradientStop_FWD_DEFINED__ #define __IXpsOMGradientStop_FWD_DEFINED__ typedef interface IXpsOMGradientStop IXpsOMGradientStop; +#ifdef __cplusplus +interface IXpsOMGradientStop; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMGradientStopCollection_FWD_DEFINED__ #define __IXpsOMGradientStopCollection_FWD_DEFINED__ typedef interface IXpsOMGradientStopCollection IXpsOMGradientStopCollection; +#ifdef __cplusplus +interface IXpsOMGradientStopCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMImageBrush_FWD_DEFINED__ #define __IXpsOMImageBrush_FWD_DEFINED__ typedef interface IXpsOMImageBrush IXpsOMImageBrush; +#ifdef __cplusplus +interface IXpsOMImageBrush; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMImageResource_FWD_DEFINED__ #define __IXpsOMImageResource_FWD_DEFINED__ typedef interface IXpsOMImageResource IXpsOMImageResource; +#ifdef __cplusplus +interface IXpsOMImageResource; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMImageResourceCollection_FWD_DEFINED__ #define __IXpsOMImageResourceCollection_FWD_DEFINED__ typedef interface IXpsOMImageResourceCollection IXpsOMImageResourceCollection; +#ifdef __cplusplus +interface IXpsOMImageResourceCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMLinearGradientBrush_FWD_DEFINED__ #define __IXpsOMLinearGradientBrush_FWD_DEFINED__ typedef interface IXpsOMLinearGradientBrush IXpsOMLinearGradientBrush; +#ifdef __cplusplus +interface IXpsOMLinearGradientBrush; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMMatrixTransform_FWD_DEFINED__ #define __IXpsOMMatrixTransform_FWD_DEFINED__ typedef interface IXpsOMMatrixTransform IXpsOMMatrixTransform; +#ifdef __cplusplus +interface IXpsOMMatrixTransform; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPartResources_FWD_DEFINED__ #define __IXpsOMPartResources_FWD_DEFINED__ typedef interface IXpsOMPartResources IXpsOMPartResources; +#ifdef __cplusplus +interface IXpsOMPartResources; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPath_FWD_DEFINED__ #define __IXpsOMPath_FWD_DEFINED__ typedef interface IXpsOMPath IXpsOMPath; +#ifdef __cplusplus +interface IXpsOMPath; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPartUriCollection_FWD_DEFINED__ #define __IXpsOMPartUriCollection_FWD_DEFINED__ typedef interface IXpsOMPartUriCollection IXpsOMPartUriCollection; +#ifdef __cplusplus +interface IXpsOMPartUriCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMRadialGradientBrush_FWD_DEFINED__ #define __IXpsOMRadialGradientBrush_FWD_DEFINED__ typedef interface IXpsOMRadialGradientBrush IXpsOMRadialGradientBrush; +#ifdef __cplusplus +interface IXpsOMRadialGradientBrush; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMRemoteDictionaryResource_FWD_DEFINED__ #define __IXpsOMRemoteDictionaryResource_FWD_DEFINED__ typedef interface IXpsOMRemoteDictionaryResource IXpsOMRemoteDictionaryResource; +#ifdef __cplusplus +interface IXpsOMRemoteDictionaryResource; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMRemoteDictionaryResourceCollection_FWD_DEFINED__ #define __IXpsOMRemoteDictionaryResourceCollection_FWD_DEFINED__ typedef interface IXpsOMRemoteDictionaryResourceCollection IXpsOMRemoteDictionaryResourceCollection; +#ifdef __cplusplus +interface IXpsOMRemoteDictionaryResourceCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMDictionary_FWD_DEFINED__ #define __IXpsOMDictionary_FWD_DEFINED__ typedef interface IXpsOMDictionary IXpsOMDictionary; +#ifdef __cplusplus +interface IXpsOMDictionary; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMShareable_FWD_DEFINED__ #define __IXpsOMShareable_FWD_DEFINED__ typedef interface IXpsOMShareable IXpsOMShareable; +#ifdef __cplusplus +interface IXpsOMShareable; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMSolidColorBrush_FWD_DEFINED__ #define __IXpsOMSolidColorBrush_FWD_DEFINED__ typedef interface IXpsOMSolidColorBrush IXpsOMSolidColorBrush; +#ifdef __cplusplus +interface IXpsOMSolidColorBrush; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMTileBrush_FWD_DEFINED__ #define __IXpsOMTileBrush_FWD_DEFINED__ typedef interface IXpsOMTileBrush IXpsOMTileBrush; +#ifdef __cplusplus +interface IXpsOMTileBrush; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMVisualBrush_FWD_DEFINED__ #define __IXpsOMVisualBrush_FWD_DEFINED__ typedef interface IXpsOMVisualBrush IXpsOMVisualBrush; +#ifdef __cplusplus +interface IXpsOMVisualBrush; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMVisualCollection_FWD_DEFINED__ #define __IXpsOMVisualCollection_FWD_DEFINED__ typedef interface IXpsOMVisualCollection IXpsOMVisualCollection; +#ifdef __cplusplus +interface IXpsOMVisualCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPageReference_FWD_DEFINED__ #define __IXpsOMPageReference_FWD_DEFINED__ typedef interface IXpsOMPageReference IXpsOMPageReference; +#ifdef __cplusplus +interface IXpsOMPageReference; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMDocumentSequence_FWD_DEFINED__ #define __IXpsOMDocumentSequence_FWD_DEFINED__ typedef interface IXpsOMDocumentSequence IXpsOMDocumentSequence; +#ifdef __cplusplus +interface IXpsOMDocumentSequence; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMSignatureBlockResource_FWD_DEFINED__ #define __IXpsOMSignatureBlockResource_FWD_DEFINED__ typedef interface IXpsOMSignatureBlockResource IXpsOMSignatureBlockResource; +#ifdef __cplusplus +interface IXpsOMSignatureBlockResource; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMSignatureBlockResourceCollection_FWD_DEFINED__ #define __IXpsOMSignatureBlockResourceCollection_FWD_DEFINED__ typedef interface IXpsOMSignatureBlockResourceCollection IXpsOMSignatureBlockResourceCollection; +#ifdef __cplusplus +interface IXpsOMSignatureBlockResourceCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMNameCollection_FWD_DEFINED__ #define __IXpsOMNameCollection_FWD_DEFINED__ typedef interface IXpsOMNameCollection IXpsOMNameCollection; +#ifdef __cplusplus +interface IXpsOMNameCollection; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMDocument_FWD_DEFINED__ #define __IXpsOMDocument_FWD_DEFINED__ typedef interface IXpsOMDocument IXpsOMDocument; +#ifdef __cplusplus +interface IXpsOMDocument; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPage_FWD_DEFINED__ #define __IXpsOMPage_FWD_DEFINED__ typedef interface IXpsOMPage IXpsOMPage; +#ifdef __cplusplus +interface IXpsOMPage; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPackageWriter_FWD_DEFINED__ #define __IXpsOMPackageWriter_FWD_DEFINED__ typedef interface IXpsOMPackageWriter IXpsOMPackageWriter; +#ifdef __cplusplus +interface IXpsOMPackageWriter; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPackageTarget_FWD_DEFINED__ #define __IXpsOMPackageTarget_FWD_DEFINED__ typedef interface IXpsOMPackageTarget IXpsOMPackageTarget; +#ifdef __cplusplus +interface IXpsOMPackageTarget; +#endif /* __cplusplus */ #endif typedef enum __WIDL_xpsobjectmodel_generated_name_00000020 { @@ -824,27 +1134,28 @@ typedef struct IXpsOMShareableVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMShareable* This, + IXpsOMShareable *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMShareable* This); + IXpsOMShareable *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMShareable* This); + IXpsOMShareable *This); /*** IXpsOMShareable methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMShareable* This, + IXpsOMShareable *This, IUnknown **owner); HRESULT (STDMETHODCALLTYPE *GetType)( - IXpsOMShareable* This, + IXpsOMShareable *This, XPS_OBJECT_TYPE *type); END_INTERFACE } IXpsOMShareableVtbl; + interface IXpsOMShareable { CONST_VTBL IXpsOMShareableVtbl* lpVtbl; }; @@ -881,22 +1192,6 @@ static FORCEINLINE HRESULT IXpsOMShareable_GetType(IXpsOMShareable* This,XPS_OBJ #endif -HRESULT STDMETHODCALLTYPE IXpsOMShareable_GetOwner_Proxy( - IXpsOMShareable* This, - IUnknown **owner); -void __RPC_STUB IXpsOMShareable_GetOwner_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMShareable_GetType_Proxy( - IXpsOMShareable* This, - XPS_OBJECT_TYPE *type); -void __RPC_STUB IXpsOMShareable_GetType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMShareable_INTERFACE_DEFINED__ */ @@ -927,27 +1222,28 @@ typedef struct IXpsOMPartVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMPart* This, + IXpsOMPart *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMPart* This); + IXpsOMPart *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMPart* This); + IXpsOMPart *This); /*** IXpsOMPart methods ***/ HRESULT (STDMETHODCALLTYPE *GetPartName)( - IXpsOMPart* This, + IXpsOMPart *This, IOpcPartUri **partUri); HRESULT (STDMETHODCALLTYPE *SetPartName)( - IXpsOMPart* This, + IXpsOMPart *This, IOpcPartUri *partUri); END_INTERFACE } IXpsOMPartVtbl; + interface IXpsOMPart { CONST_VTBL IXpsOMPartVtbl* lpVtbl; }; @@ -984,22 +1280,6 @@ static FORCEINLINE HRESULT IXpsOMPart_SetPartName(IXpsOMPart* This,IOpcPartUri * #endif -HRESULT STDMETHODCALLTYPE IXpsOMPart_GetPartName_Proxy( - IXpsOMPart* This, - IOpcPartUri **partUri); -void __RPC_STUB IXpsOMPart_GetPartName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPart_SetPartName_Proxy( - IXpsOMPart* This, - IOpcPartUri *partUri); -void __RPC_STUB IXpsOMPart_SetPartName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMPart_INTERFACE_DEFINED__ */ @@ -1084,96 +1364,97 @@ typedef struct IXpsOMGlyphsEditorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMGlyphsEditor* This, + IXpsOMGlyphsEditor *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMGlyphsEditor* This); + IXpsOMGlyphsEditor *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMGlyphsEditor* This); + IXpsOMGlyphsEditor *This); /*** IXpsOMGlyphsEditor methods ***/ HRESULT (STDMETHODCALLTYPE *ApplyEdits)( - IXpsOMGlyphsEditor* This); + IXpsOMGlyphsEditor *This); HRESULT (STDMETHODCALLTYPE *GetUnicodeString)( - IXpsOMGlyphsEditor* This, + IXpsOMGlyphsEditor *This, LPWSTR *unicodeString); HRESULT (STDMETHODCALLTYPE *SetUnicodeString)( - IXpsOMGlyphsEditor* This, + IXpsOMGlyphsEditor *This, LPCWSTR unicodeString); HRESULT (STDMETHODCALLTYPE *GetGlyphIndexCount)( - IXpsOMGlyphsEditor* This, + IXpsOMGlyphsEditor *This, UINT32 *indexCount); HRESULT (STDMETHODCALLTYPE *GetGlyphIndices)( - IXpsOMGlyphsEditor* This, + IXpsOMGlyphsEditor *This, UINT32 *indexCount, XPS_GLYPH_INDEX *glyphIndices); HRESULT (STDMETHODCALLTYPE *SetGlyphIndices)( - IXpsOMGlyphsEditor* This, + IXpsOMGlyphsEditor *This, UINT32 indexCount, const XPS_GLYPH_INDEX *glyphIndices); HRESULT (STDMETHODCALLTYPE *GetGlyphMappingCount)( - IXpsOMGlyphsEditor* This, + IXpsOMGlyphsEditor *This, UINT32 *glyphMappingCount); HRESULT (STDMETHODCALLTYPE *GetGlyphMappings)( - IXpsOMGlyphsEditor* This, + IXpsOMGlyphsEditor *This, UINT32 *glyphMappingCount, XPS_GLYPH_MAPPING *glyphMappings); HRESULT (STDMETHODCALLTYPE *SetGlyphMappings)( - IXpsOMGlyphsEditor* This, + IXpsOMGlyphsEditor *This, UINT32 glyphMappingCount, const XPS_GLYPH_MAPPING *glyphMappings); HRESULT (STDMETHODCALLTYPE *GetProhibitedCaretStopCount)( - IXpsOMGlyphsEditor* This, + IXpsOMGlyphsEditor *This, UINT32 *prohibitedCaretStopCount); HRESULT (STDMETHODCALLTYPE *GetProhibitedCaretStops)( - IXpsOMGlyphsEditor* This, + IXpsOMGlyphsEditor *This, UINT32 *count, UINT32 *prohibitedCaretStops); HRESULT (STDMETHODCALLTYPE *SetProhibitedCaretStops)( - IXpsOMGlyphsEditor* This, + IXpsOMGlyphsEditor *This, UINT32 count, const UINT32 *prohibitedCaretStops); HRESULT (STDMETHODCALLTYPE *GetBidiLevel)( - IXpsOMGlyphsEditor* This, + IXpsOMGlyphsEditor *This, UINT32 *bidiLevel); HRESULT (STDMETHODCALLTYPE *SetBidiLevel)( - IXpsOMGlyphsEditor* This, + IXpsOMGlyphsEditor *This, UINT32 bidiLevel); HRESULT (STDMETHODCALLTYPE *GetIsSideways)( - IXpsOMGlyphsEditor* This, + IXpsOMGlyphsEditor *This, WINBOOL *isSideways); HRESULT (STDMETHODCALLTYPE *SetIsSideways)( - IXpsOMGlyphsEditor* This, + IXpsOMGlyphsEditor *This, WINBOOL isSideways); HRESULT (STDMETHODCALLTYPE *GetDeviceFontName)( - IXpsOMGlyphsEditor* This, + IXpsOMGlyphsEditor *This, LPWSTR *deviceFontName); HRESULT (STDMETHODCALLTYPE *SetDeviceFontName)( - IXpsOMGlyphsEditor* This, + IXpsOMGlyphsEditor *This, LPCWSTR deviceFontName); END_INTERFACE } IXpsOMGlyphsEditorVtbl; + interface IXpsOMGlyphsEditor { CONST_VTBL IXpsOMGlyphsEditorVtbl* lpVtbl; }; @@ -1274,155 +1555,6 @@ static FORCEINLINE HRESULT IXpsOMGlyphsEditor_SetDeviceFontName(IXpsOMGlyphsEdit #endif -HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_ApplyEdits_Proxy( - IXpsOMGlyphsEditor* This); -void __RPC_STUB IXpsOMGlyphsEditor_ApplyEdits_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_GetUnicodeString_Proxy( - IXpsOMGlyphsEditor* This, - LPWSTR *unicodeString); -void __RPC_STUB IXpsOMGlyphsEditor_GetUnicodeString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_SetUnicodeString_Proxy( - IXpsOMGlyphsEditor* This, - LPCWSTR unicodeString); -void __RPC_STUB IXpsOMGlyphsEditor_SetUnicodeString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_GetGlyphIndexCount_Proxy( - IXpsOMGlyphsEditor* This, - UINT32 *indexCount); -void __RPC_STUB IXpsOMGlyphsEditor_GetGlyphIndexCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_GetGlyphIndices_Proxy( - IXpsOMGlyphsEditor* This, - UINT32 *indexCount, - XPS_GLYPH_INDEX *glyphIndices); -void __RPC_STUB IXpsOMGlyphsEditor_GetGlyphIndices_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_SetGlyphIndices_Proxy( - IXpsOMGlyphsEditor* This, - UINT32 indexCount, - const XPS_GLYPH_INDEX *glyphIndices); -void __RPC_STUB IXpsOMGlyphsEditor_SetGlyphIndices_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_GetGlyphMappingCount_Proxy( - IXpsOMGlyphsEditor* This, - UINT32 *glyphMappingCount); -void __RPC_STUB IXpsOMGlyphsEditor_GetGlyphMappingCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_GetGlyphMappings_Proxy( - IXpsOMGlyphsEditor* This, - UINT32 *glyphMappingCount, - XPS_GLYPH_MAPPING *glyphMappings); -void __RPC_STUB IXpsOMGlyphsEditor_GetGlyphMappings_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_SetGlyphMappings_Proxy( - IXpsOMGlyphsEditor* This, - UINT32 glyphMappingCount, - const XPS_GLYPH_MAPPING *glyphMappings); -void __RPC_STUB IXpsOMGlyphsEditor_SetGlyphMappings_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_GetProhibitedCaretStopCount_Proxy( - IXpsOMGlyphsEditor* This, - UINT32 *prohibitedCaretStopCount); -void __RPC_STUB IXpsOMGlyphsEditor_GetProhibitedCaretStopCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_GetProhibitedCaretStops_Proxy( - IXpsOMGlyphsEditor* This, - UINT32 *count, - UINT32 *prohibitedCaretStops); -void __RPC_STUB IXpsOMGlyphsEditor_GetProhibitedCaretStops_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_SetProhibitedCaretStops_Proxy( - IXpsOMGlyphsEditor* This, - UINT32 count, - const UINT32 *prohibitedCaretStops); -void __RPC_STUB IXpsOMGlyphsEditor_SetProhibitedCaretStops_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_GetBidiLevel_Proxy( - IXpsOMGlyphsEditor* This, - UINT32 *bidiLevel); -void __RPC_STUB IXpsOMGlyphsEditor_GetBidiLevel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_SetBidiLevel_Proxy( - IXpsOMGlyphsEditor* This, - UINT32 bidiLevel); -void __RPC_STUB IXpsOMGlyphsEditor_SetBidiLevel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_GetIsSideways_Proxy( - IXpsOMGlyphsEditor* This, - WINBOOL *isSideways); -void __RPC_STUB IXpsOMGlyphsEditor_GetIsSideways_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_SetIsSideways_Proxy( - IXpsOMGlyphsEditor* This, - WINBOOL isSideways); -void __RPC_STUB IXpsOMGlyphsEditor_SetIsSideways_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_GetDeviceFontName_Proxy( - IXpsOMGlyphsEditor* This, - LPWSTR *deviceFontName); -void __RPC_STUB IXpsOMGlyphsEditor_GetDeviceFontName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_SetDeviceFontName_Proxy( - IXpsOMGlyphsEditor* This, - LPCWSTR deviceFontName); -void __RPC_STUB IXpsOMGlyphsEditor_SetDeviceFontName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMGlyphsEditor_INTERFACE_DEFINED__ */ @@ -1468,46 +1600,47 @@ typedef struct IXpsOMDashCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMDashCollection* This, + IXpsOMDashCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMDashCollection* This); + IXpsOMDashCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMDashCollection* This); + IXpsOMDashCollection *This); /*** IXpsOMDashCollection methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IXpsOMDashCollection* This, + IXpsOMDashCollection *This, UINT32 *count); HRESULT (STDMETHODCALLTYPE *GetAt)( - IXpsOMDashCollection* This, + IXpsOMDashCollection *This, UINT32 index, XPS_DASH *dash); HRESULT (STDMETHODCALLTYPE *InsertAt)( - IXpsOMDashCollection* This, + IXpsOMDashCollection *This, UINT32 index, const XPS_DASH *dash); HRESULT (STDMETHODCALLTYPE *RemoveAt)( - IXpsOMDashCollection* This, + IXpsOMDashCollection *This, UINT32 index); HRESULT (STDMETHODCALLTYPE *SetAt)( - IXpsOMDashCollection* This, + IXpsOMDashCollection *This, UINT32 index, const XPS_DASH *dash); HRESULT (STDMETHODCALLTYPE *Append)( - IXpsOMDashCollection* This, + IXpsOMDashCollection *This, const XPS_DASH *dash); END_INTERFACE } IXpsOMDashCollectionVtbl; + interface IXpsOMDashCollection { CONST_VTBL IXpsOMDashCollectionVtbl* lpVtbl; }; @@ -1560,57 +1693,6 @@ static FORCEINLINE HRESULT IXpsOMDashCollection_Append(IXpsOMDashCollection* Thi #endif -HRESULT STDMETHODCALLTYPE IXpsOMDashCollection_GetCount_Proxy( - IXpsOMDashCollection* This, - UINT32 *count); -void __RPC_STUB IXpsOMDashCollection_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDashCollection_GetAt_Proxy( - IXpsOMDashCollection* This, - UINT32 index, - XPS_DASH *dash); -void __RPC_STUB IXpsOMDashCollection_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDashCollection_InsertAt_Proxy( - IXpsOMDashCollection* This, - UINT32 index, - const XPS_DASH *dash); -void __RPC_STUB IXpsOMDashCollection_InsertAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDashCollection_RemoveAt_Proxy( - IXpsOMDashCollection* This, - UINT32 index); -void __RPC_STUB IXpsOMDashCollection_RemoveAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDashCollection_SetAt_Proxy( - IXpsOMDashCollection* This, - UINT32 index, - const XPS_DASH *dash); -void __RPC_STUB IXpsOMDashCollection_SetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDashCollection_Append_Proxy( - IXpsOMDashCollection* This, - const XPS_DASH *dash); -void __RPC_STUB IXpsOMDashCollection_Append_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMDashCollection_INTERFACE_DEFINED__ */ @@ -1687,38 +1769,38 @@ typedef struct IXpsOMGeometryFigureVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMGeometryFigure* This, + IXpsOMGeometryFigure *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMGeometryFigure* This); + IXpsOMGeometryFigure *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMGeometryFigure* This); + IXpsOMGeometryFigure *This); /*** IXpsOMGeometryFigure methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMGeometryFigure* This, + IXpsOMGeometryFigure *This, IXpsOMGeometry **owner); HRESULT (STDMETHODCALLTYPE *GetSegmentData)( - IXpsOMGeometryFigure* This, + IXpsOMGeometryFigure *This, UINT32 *dataCount, FLOAT *segmentData); HRESULT (STDMETHODCALLTYPE *GetSegmentTypes)( - IXpsOMGeometryFigure* This, + IXpsOMGeometryFigure *This, UINT32 *segmentCount, XPS_SEGMENT_TYPE *segmentTypes); HRESULT (STDMETHODCALLTYPE *GetSegmentStrokes)( - IXpsOMGeometryFigure* This, + IXpsOMGeometryFigure *This, UINT32 *segmentCount, WINBOOL *segmentStrokes); HRESULT (STDMETHODCALLTYPE *SetSegments)( - IXpsOMGeometryFigure* This, + IXpsOMGeometryFigure *This, UINT32 segmentCount, UINT32 segmentDataCount, const XPS_SEGMENT_TYPE *segmentTypes, @@ -1726,47 +1808,48 @@ typedef struct IXpsOMGeometryFigureVtbl { const WINBOOL *segmentStrokes); HRESULT (STDMETHODCALLTYPE *GetStartPoint)( - IXpsOMGeometryFigure* This, + IXpsOMGeometryFigure *This, XPS_POINT *startPoint); HRESULT (STDMETHODCALLTYPE *SetStartPoint)( - IXpsOMGeometryFigure* This, + IXpsOMGeometryFigure *This, const XPS_POINT *startPoint); HRESULT (STDMETHODCALLTYPE *GetIsClosed)( - IXpsOMGeometryFigure* This, + IXpsOMGeometryFigure *This, WINBOOL *isClosed); HRESULT (STDMETHODCALLTYPE *SetIsClosed)( - IXpsOMGeometryFigure* This, + IXpsOMGeometryFigure *This, WINBOOL isClosed); HRESULT (STDMETHODCALLTYPE *GetIsFilled)( - IXpsOMGeometryFigure* This, + IXpsOMGeometryFigure *This, WINBOOL *isFilled); HRESULT (STDMETHODCALLTYPE *SetIsFilled)( - IXpsOMGeometryFigure* This, + IXpsOMGeometryFigure *This, WINBOOL isFilled); HRESULT (STDMETHODCALLTYPE *GetSegmentCount)( - IXpsOMGeometryFigure* This, + IXpsOMGeometryFigure *This, UINT32 *segmentCount); HRESULT (STDMETHODCALLTYPE *GetSegmentDataCount)( - IXpsOMGeometryFigure* This, + IXpsOMGeometryFigure *This, UINT32 *segmentDataCount); HRESULT (STDMETHODCALLTYPE *GetSegmentStrokePattern)( - IXpsOMGeometryFigure* This, + IXpsOMGeometryFigure *This, XPS_SEGMENT_STROKE_PATTERN *segmentStrokePattern); HRESULT (STDMETHODCALLTYPE *Clone)( - IXpsOMGeometryFigure* This, + IXpsOMGeometryFigure *This, IXpsOMGeometryFigure **geometryFigure); END_INTERFACE } IXpsOMGeometryFigureVtbl; + interface IXpsOMGeometryFigure { CONST_VTBL IXpsOMGeometryFigureVtbl* lpVtbl; }; @@ -1855,133 +1938,6 @@ static FORCEINLINE HRESULT IXpsOMGeometryFigure_Clone(IXpsOMGeometryFigure* This #endif -HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_GetOwner_Proxy( - IXpsOMGeometryFigure* This, - IXpsOMGeometry **owner); -void __RPC_STUB IXpsOMGeometryFigure_GetOwner_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_GetSegmentData_Proxy( - IXpsOMGeometryFigure* This, - UINT32 *dataCount, - FLOAT *segmentData); -void __RPC_STUB IXpsOMGeometryFigure_GetSegmentData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_GetSegmentTypes_Proxy( - IXpsOMGeometryFigure* This, - UINT32 *segmentCount, - XPS_SEGMENT_TYPE *segmentTypes); -void __RPC_STUB IXpsOMGeometryFigure_GetSegmentTypes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_GetSegmentStrokes_Proxy( - IXpsOMGeometryFigure* This, - UINT32 *segmentCount, - WINBOOL *segmentStrokes); -void __RPC_STUB IXpsOMGeometryFigure_GetSegmentStrokes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_SetSegments_Proxy( - IXpsOMGeometryFigure* This, - UINT32 segmentCount, - UINT32 segmentDataCount, - const XPS_SEGMENT_TYPE *segmentTypes, - const FLOAT *segmentData, - const WINBOOL *segmentStrokes); -void __RPC_STUB IXpsOMGeometryFigure_SetSegments_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_GetStartPoint_Proxy( - IXpsOMGeometryFigure* This, - XPS_POINT *startPoint); -void __RPC_STUB IXpsOMGeometryFigure_GetStartPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_SetStartPoint_Proxy( - IXpsOMGeometryFigure* This, - const XPS_POINT *startPoint); -void __RPC_STUB IXpsOMGeometryFigure_SetStartPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_GetIsClosed_Proxy( - IXpsOMGeometryFigure* This, - WINBOOL *isClosed); -void __RPC_STUB IXpsOMGeometryFigure_GetIsClosed_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_SetIsClosed_Proxy( - IXpsOMGeometryFigure* This, - WINBOOL isClosed); -void __RPC_STUB IXpsOMGeometryFigure_SetIsClosed_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_GetIsFilled_Proxy( - IXpsOMGeometryFigure* This, - WINBOOL *isFilled); -void __RPC_STUB IXpsOMGeometryFigure_GetIsFilled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_SetIsFilled_Proxy( - IXpsOMGeometryFigure* This, - WINBOOL isFilled); -void __RPC_STUB IXpsOMGeometryFigure_SetIsFilled_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_GetSegmentCount_Proxy( - IXpsOMGeometryFigure* This, - UINT32 *segmentCount); -void __RPC_STUB IXpsOMGeometryFigure_GetSegmentCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_GetSegmentDataCount_Proxy( - IXpsOMGeometryFigure* This, - UINT32 *segmentDataCount); -void __RPC_STUB IXpsOMGeometryFigure_GetSegmentDataCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_GetSegmentStrokePattern_Proxy( - IXpsOMGeometryFigure* This, - XPS_SEGMENT_STROKE_PATTERN *segmentStrokePattern); -void __RPC_STUB IXpsOMGeometryFigure_GetSegmentStrokePattern_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_Clone_Proxy( - IXpsOMGeometryFigure* This, - IXpsOMGeometryFigure **geometryFigure); -void __RPC_STUB IXpsOMGeometryFigure_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMGeometryFigure_INTERFACE_DEFINED__ */ @@ -2027,46 +1983,47 @@ typedef struct IXpsOMGeometryFigureCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMGeometryFigureCollection* This, + IXpsOMGeometryFigureCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMGeometryFigureCollection* This); + IXpsOMGeometryFigureCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMGeometryFigureCollection* This); + IXpsOMGeometryFigureCollection *This); /*** IXpsOMGeometryFigureCollection methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IXpsOMGeometryFigureCollection* This, + IXpsOMGeometryFigureCollection *This, UINT32 *count); HRESULT (STDMETHODCALLTYPE *GetAt)( - IXpsOMGeometryFigureCollection* This, + IXpsOMGeometryFigureCollection *This, UINT32 index, IXpsOMGeometryFigure **geometryFigure); HRESULT (STDMETHODCALLTYPE *InsertAt)( - IXpsOMGeometryFigureCollection* This, + IXpsOMGeometryFigureCollection *This, UINT32 index, IXpsOMGeometryFigure *geometryFigure); HRESULT (STDMETHODCALLTYPE *RemoveAt)( - IXpsOMGeometryFigureCollection* This, + IXpsOMGeometryFigureCollection *This, UINT32 index); HRESULT (STDMETHODCALLTYPE *SetAt)( - IXpsOMGeometryFigureCollection* This, + IXpsOMGeometryFigureCollection *This, UINT32 index, IXpsOMGeometryFigure *geometryFigure); HRESULT (STDMETHODCALLTYPE *Append)( - IXpsOMGeometryFigureCollection* This, + IXpsOMGeometryFigureCollection *This, IXpsOMGeometryFigure *geometryFigure); END_INTERFACE } IXpsOMGeometryFigureCollectionVtbl; + interface IXpsOMGeometryFigureCollection { CONST_VTBL IXpsOMGeometryFigureCollectionVtbl* lpVtbl; }; @@ -2119,57 +2076,6 @@ static FORCEINLINE HRESULT IXpsOMGeometryFigureCollection_Append(IXpsOMGeometryF #endif -HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigureCollection_GetCount_Proxy( - IXpsOMGeometryFigureCollection* This, - UINT32 *count); -void __RPC_STUB IXpsOMGeometryFigureCollection_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigureCollection_GetAt_Proxy( - IXpsOMGeometryFigureCollection* This, - UINT32 index, - IXpsOMGeometryFigure **geometryFigure); -void __RPC_STUB IXpsOMGeometryFigureCollection_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigureCollection_InsertAt_Proxy( - IXpsOMGeometryFigureCollection* This, - UINT32 index, - IXpsOMGeometryFigure *geometryFigure); -void __RPC_STUB IXpsOMGeometryFigureCollection_InsertAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigureCollection_RemoveAt_Proxy( - IXpsOMGeometryFigureCollection* This, - UINT32 index); -void __RPC_STUB IXpsOMGeometryFigureCollection_RemoveAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigureCollection_SetAt_Proxy( - IXpsOMGeometryFigureCollection* This, - UINT32 index, - IXpsOMGeometryFigure *geometryFigure); -void __RPC_STUB IXpsOMGeometryFigureCollection_SetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigureCollection_Append_Proxy( - IXpsOMGeometryFigureCollection* This, - IXpsOMGeometryFigure *geometryFigure); -void __RPC_STUB IXpsOMGeometryFigureCollection_Append_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMGeometryFigureCollection_INTERFACE_DEFINED__ */ @@ -2215,46 +2121,47 @@ typedef struct IXpsOMGradientStopCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMGradientStopCollection* This, + IXpsOMGradientStopCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMGradientStopCollection* This); + IXpsOMGradientStopCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMGradientStopCollection* This); + IXpsOMGradientStopCollection *This); /*** IXpsOMGradientStopCollection methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IXpsOMGradientStopCollection* This, + IXpsOMGradientStopCollection *This, UINT32 *count); HRESULT (STDMETHODCALLTYPE *GetAt)( - IXpsOMGradientStopCollection* This, + IXpsOMGradientStopCollection *This, UINT32 index, IXpsOMGradientStop **stop); HRESULT (STDMETHODCALLTYPE *InsertAt)( - IXpsOMGradientStopCollection* This, + IXpsOMGradientStopCollection *This, UINT32 index, IXpsOMGradientStop *stop); HRESULT (STDMETHODCALLTYPE *RemoveAt)( - IXpsOMGradientStopCollection* This, + IXpsOMGradientStopCollection *This, UINT32 index); HRESULT (STDMETHODCALLTYPE *SetAt)( - IXpsOMGradientStopCollection* This, + IXpsOMGradientStopCollection *This, UINT32 index, IXpsOMGradientStop *stop); HRESULT (STDMETHODCALLTYPE *Append)( - IXpsOMGradientStopCollection* This, + IXpsOMGradientStopCollection *This, IXpsOMGradientStop *stop); END_INTERFACE } IXpsOMGradientStopCollectionVtbl; + interface IXpsOMGradientStopCollection { CONST_VTBL IXpsOMGradientStopCollectionVtbl* lpVtbl; }; @@ -2307,57 +2214,6 @@ static FORCEINLINE HRESULT IXpsOMGradientStopCollection_Append(IXpsOMGradientSto #endif -HRESULT STDMETHODCALLTYPE IXpsOMGradientStopCollection_GetCount_Proxy( - IXpsOMGradientStopCollection* This, - UINT32 *count); -void __RPC_STUB IXpsOMGradientStopCollection_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGradientStopCollection_GetAt_Proxy( - IXpsOMGradientStopCollection* This, - UINT32 index, - IXpsOMGradientStop **stop); -void __RPC_STUB IXpsOMGradientStopCollection_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGradientStopCollection_InsertAt_Proxy( - IXpsOMGradientStopCollection* This, - UINT32 index, - IXpsOMGradientStop *stop); -void __RPC_STUB IXpsOMGradientStopCollection_InsertAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGradientStopCollection_RemoveAt_Proxy( - IXpsOMGradientStopCollection* This, - UINT32 index); -void __RPC_STUB IXpsOMGradientStopCollection_RemoveAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGradientStopCollection_SetAt_Proxy( - IXpsOMGradientStopCollection* This, - UINT32 index, - IXpsOMGradientStop *stop); -void __RPC_STUB IXpsOMGradientStopCollection_SetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGradientStopCollection_Append_Proxy( - IXpsOMGradientStopCollection* This, - IXpsOMGradientStop *stop); -void __RPC_STUB IXpsOMGradientStopCollection_Append_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMGradientStopCollection_INTERFACE_DEFINED__ */ @@ -2402,45 +2258,46 @@ typedef struct IXpsOMGradientStopVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMGradientStop* This, + IXpsOMGradientStop *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMGradientStop* This); + IXpsOMGradientStop *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMGradientStop* This); + IXpsOMGradientStop *This); /*** IXpsOMGradientStop methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMGradientStop* This, + IXpsOMGradientStop *This, IXpsOMGradientBrush **owner); HRESULT (STDMETHODCALLTYPE *GetOffset)( - IXpsOMGradientStop* This, + IXpsOMGradientStop *This, FLOAT *offset); HRESULT (STDMETHODCALLTYPE *SetOffset)( - IXpsOMGradientStop* This, + IXpsOMGradientStop *This, FLOAT offset); HRESULT (STDMETHODCALLTYPE *GetColor)( - IXpsOMGradientStop* This, + IXpsOMGradientStop *This, XPS_COLOR *color, IXpsOMColorProfileResource **colorProfile); HRESULT (STDMETHODCALLTYPE *SetColor)( - IXpsOMGradientStop* This, + IXpsOMGradientStop *This, const XPS_COLOR *color, IXpsOMColorProfileResource *colorProfile); HRESULT (STDMETHODCALLTYPE *Clone)( - IXpsOMGradientStop* This, + IXpsOMGradientStop *This, IXpsOMGradientStop **gradientStop); END_INTERFACE } IXpsOMGradientStopVtbl; + interface IXpsOMGradientStop { CONST_VTBL IXpsOMGradientStopVtbl* lpVtbl; }; @@ -2493,56 +2350,6 @@ static FORCEINLINE HRESULT IXpsOMGradientStop_Clone(IXpsOMGradientStop* This,IXp #endif -HRESULT STDMETHODCALLTYPE IXpsOMGradientStop_GetOwner_Proxy( - IXpsOMGradientStop* This, - IXpsOMGradientBrush **owner); -void __RPC_STUB IXpsOMGradientStop_GetOwner_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGradientStop_GetOffset_Proxy( - IXpsOMGradientStop* This, - FLOAT *offset); -void __RPC_STUB IXpsOMGradientStop_GetOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGradientStop_SetOffset_Proxy( - IXpsOMGradientStop* This, - FLOAT offset); -void __RPC_STUB IXpsOMGradientStop_SetOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGradientStop_GetColor_Proxy( - IXpsOMGradientStop* This, - XPS_COLOR *color, - IXpsOMColorProfileResource **colorProfile); -void __RPC_STUB IXpsOMGradientStop_GetColor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGradientStop_SetColor_Proxy( - IXpsOMGradientStop* This, - const XPS_COLOR *color, - IXpsOMColorProfileResource *colorProfile); -void __RPC_STUB IXpsOMGradientStop_SetColor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGradientStop_Clone_Proxy( - IXpsOMGradientStop* This, - IXpsOMGradientStop **gradientStop); -void __RPC_STUB IXpsOMGradientStop_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMGradientStop_INTERFACE_DEFINED__ */ @@ -2579,35 +2386,36 @@ typedef struct IXpsOMPartResourcesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMPartResources* This, + IXpsOMPartResources *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMPartResources* This); + IXpsOMPartResources *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMPartResources* This); + IXpsOMPartResources *This); /*** IXpsOMPartResources methods ***/ HRESULT (STDMETHODCALLTYPE *GetFontResources)( - IXpsOMPartResources* This, + IXpsOMPartResources *This, IXpsOMFontResourceCollection **fontResources); HRESULT (STDMETHODCALLTYPE *GetImageResources)( - IXpsOMPartResources* This, + IXpsOMPartResources *This, IXpsOMImageResourceCollection **imageResources); HRESULT (STDMETHODCALLTYPE *GetColorProfileResources)( - IXpsOMPartResources* This, + IXpsOMPartResources *This, IXpsOMColorProfileResourceCollection **colorProfileResources); HRESULT (STDMETHODCALLTYPE *GetRemoteDictionaryResources)( - IXpsOMPartResources* This, + IXpsOMPartResources *This, IXpsOMRemoteDictionaryResourceCollection **dictionaryResources); END_INTERFACE } IXpsOMPartResourcesVtbl; + interface IXpsOMPartResources { CONST_VTBL IXpsOMPartResourcesVtbl* lpVtbl; }; @@ -2652,38 +2460,6 @@ static FORCEINLINE HRESULT IXpsOMPartResources_GetRemoteDictionaryResources(IXps #endif -HRESULT STDMETHODCALLTYPE IXpsOMPartResources_GetFontResources_Proxy( - IXpsOMPartResources* This, - IXpsOMFontResourceCollection **fontResources); -void __RPC_STUB IXpsOMPartResources_GetFontResources_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPartResources_GetImageResources_Proxy( - IXpsOMPartResources* This, - IXpsOMImageResourceCollection **imageResources); -void __RPC_STUB IXpsOMPartResources_GetImageResources_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPartResources_GetColorProfileResources_Proxy( - IXpsOMPartResources* This, - IXpsOMColorProfileResourceCollection **colorProfileResources); -void __RPC_STUB IXpsOMPartResources_GetColorProfileResources_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPartResources_GetRemoteDictionaryResources_Proxy( - IXpsOMPartResources* This, - IXpsOMRemoteDictionaryResourceCollection **dictionaryResources); -void __RPC_STUB IXpsOMPartResources_GetRemoteDictionaryResources_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMPartResources_INTERFACE_DEFINED__ */ @@ -2733,51 +2509,52 @@ typedef struct IXpsOMFontResourceCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMFontResourceCollection* This, + IXpsOMFontResourceCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMFontResourceCollection* This); + IXpsOMFontResourceCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMFontResourceCollection* This); + IXpsOMFontResourceCollection *This); /*** IXpsOMFontResourceCollection methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IXpsOMFontResourceCollection* This, + IXpsOMFontResourceCollection *This, UINT32 *count); HRESULT (STDMETHODCALLTYPE *GetAt)( - IXpsOMFontResourceCollection* This, + IXpsOMFontResourceCollection *This, UINT32 index, IXpsOMFontResource **value); HRESULT (STDMETHODCALLTYPE *SetAt)( - IXpsOMFontResourceCollection* This, + IXpsOMFontResourceCollection *This, UINT32 index, IXpsOMFontResource *value); HRESULT (STDMETHODCALLTYPE *InsertAt)( - IXpsOMFontResourceCollection* This, + IXpsOMFontResourceCollection *This, UINT32 index, IXpsOMFontResource *value); HRESULT (STDMETHODCALLTYPE *Append)( - IXpsOMFontResourceCollection* This, + IXpsOMFontResourceCollection *This, IXpsOMFontResource *value); HRESULT (STDMETHODCALLTYPE *RemoveAt)( - IXpsOMFontResourceCollection* This, + IXpsOMFontResourceCollection *This, UINT32 index); HRESULT (STDMETHODCALLTYPE *GetByPartName)( - IXpsOMFontResourceCollection* This, + IXpsOMFontResourceCollection *This, IOpcPartUri *partName, IXpsOMFontResource **part); END_INTERFACE } IXpsOMFontResourceCollectionVtbl; + interface IXpsOMFontResourceCollection { CONST_VTBL IXpsOMFontResourceCollectionVtbl* lpVtbl; }; @@ -2834,66 +2611,6 @@ static FORCEINLINE HRESULT IXpsOMFontResourceCollection_GetByPartName(IXpsOMFont #endif -HRESULT STDMETHODCALLTYPE IXpsOMFontResourceCollection_GetCount_Proxy( - IXpsOMFontResourceCollection* This, - UINT32 *count); -void __RPC_STUB IXpsOMFontResourceCollection_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMFontResourceCollection_GetAt_Proxy( - IXpsOMFontResourceCollection* This, - UINT32 index, - IXpsOMFontResource **value); -void __RPC_STUB IXpsOMFontResourceCollection_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMFontResourceCollection_SetAt_Proxy( - IXpsOMFontResourceCollection* This, - UINT32 index, - IXpsOMFontResource *value); -void __RPC_STUB IXpsOMFontResourceCollection_SetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMFontResourceCollection_InsertAt_Proxy( - IXpsOMFontResourceCollection* This, - UINT32 index, - IXpsOMFontResource *value); -void __RPC_STUB IXpsOMFontResourceCollection_InsertAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMFontResourceCollection_Append_Proxy( - IXpsOMFontResourceCollection* This, - IXpsOMFontResource *value); -void __RPC_STUB IXpsOMFontResourceCollection_Append_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMFontResourceCollection_RemoveAt_Proxy( - IXpsOMFontResourceCollection* This, - UINT32 index); -void __RPC_STUB IXpsOMFontResourceCollection_RemoveAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMFontResourceCollection_GetByPartName_Proxy( - IXpsOMFontResourceCollection* This, - IOpcPartUri *partName, - IXpsOMFontResource **part); -void __RPC_STUB IXpsOMFontResourceCollection_GetByPartName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMFontResourceCollection_INTERFACE_DEFINED__ */ @@ -2943,51 +2660,52 @@ typedef struct IXpsOMImageResourceCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMImageResourceCollection* This, + IXpsOMImageResourceCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMImageResourceCollection* This); + IXpsOMImageResourceCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMImageResourceCollection* This); + IXpsOMImageResourceCollection *This); /*** IXpsOMImageResourceCollection methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IXpsOMImageResourceCollection* This, + IXpsOMImageResourceCollection *This, UINT32 *count); HRESULT (STDMETHODCALLTYPE *GetAt)( - IXpsOMImageResourceCollection* This, + IXpsOMImageResourceCollection *This, UINT32 index, IXpsOMImageResource **object); HRESULT (STDMETHODCALLTYPE *InsertAt)( - IXpsOMImageResourceCollection* This, + IXpsOMImageResourceCollection *This, UINT32 index, IXpsOMImageResource *object); HRESULT (STDMETHODCALLTYPE *RemoveAt)( - IXpsOMImageResourceCollection* This, + IXpsOMImageResourceCollection *This, UINT32 index); HRESULT (STDMETHODCALLTYPE *SetAt)( - IXpsOMImageResourceCollection* This, + IXpsOMImageResourceCollection *This, UINT32 index, IXpsOMImageResource *object); HRESULT (STDMETHODCALLTYPE *Append)( - IXpsOMImageResourceCollection* This, + IXpsOMImageResourceCollection *This, IXpsOMImageResource *object); HRESULT (STDMETHODCALLTYPE *GetByPartName)( - IXpsOMImageResourceCollection* This, + IXpsOMImageResourceCollection *This, IOpcPartUri *partName, IXpsOMImageResource **part); END_INTERFACE } IXpsOMImageResourceCollectionVtbl; + interface IXpsOMImageResourceCollection { CONST_VTBL IXpsOMImageResourceCollectionVtbl* lpVtbl; }; @@ -3044,66 +2762,6 @@ static FORCEINLINE HRESULT IXpsOMImageResourceCollection_GetByPartName(IXpsOMIma #endif -HRESULT STDMETHODCALLTYPE IXpsOMImageResourceCollection_GetCount_Proxy( - IXpsOMImageResourceCollection* This, - UINT32 *count); -void __RPC_STUB IXpsOMImageResourceCollection_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMImageResourceCollection_GetAt_Proxy( - IXpsOMImageResourceCollection* This, - UINT32 index, - IXpsOMImageResource **object); -void __RPC_STUB IXpsOMImageResourceCollection_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMImageResourceCollection_InsertAt_Proxy( - IXpsOMImageResourceCollection* This, - UINT32 index, - IXpsOMImageResource *object); -void __RPC_STUB IXpsOMImageResourceCollection_InsertAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMImageResourceCollection_RemoveAt_Proxy( - IXpsOMImageResourceCollection* This, - UINT32 index); -void __RPC_STUB IXpsOMImageResourceCollection_RemoveAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMImageResourceCollection_SetAt_Proxy( - IXpsOMImageResourceCollection* This, - UINT32 index, - IXpsOMImageResource *object); -void __RPC_STUB IXpsOMImageResourceCollection_SetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMImageResourceCollection_Append_Proxy( - IXpsOMImageResourceCollection* This, - IXpsOMImageResource *object); -void __RPC_STUB IXpsOMImageResourceCollection_Append_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMImageResourceCollection_GetByPartName_Proxy( - IXpsOMImageResourceCollection* This, - IOpcPartUri *partName, - IXpsOMImageResource **part); -void __RPC_STUB IXpsOMImageResourceCollection_GetByPartName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMImageResourceCollection_INTERFACE_DEFINED__ */ @@ -3153,51 +2811,52 @@ typedef struct IXpsOMColorProfileResourceCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMColorProfileResourceCollection* This, + IXpsOMColorProfileResourceCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMColorProfileResourceCollection* This); + IXpsOMColorProfileResourceCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMColorProfileResourceCollection* This); + IXpsOMColorProfileResourceCollection *This); /*** IXpsOMColorProfileResourceCollection methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IXpsOMColorProfileResourceCollection* This, + IXpsOMColorProfileResourceCollection *This, UINT32 *count); HRESULT (STDMETHODCALLTYPE *GetAt)( - IXpsOMColorProfileResourceCollection* This, + IXpsOMColorProfileResourceCollection *This, UINT32 index, IXpsOMColorProfileResource **object); HRESULT (STDMETHODCALLTYPE *InsertAt)( - IXpsOMColorProfileResourceCollection* This, + IXpsOMColorProfileResourceCollection *This, UINT32 index, IXpsOMColorProfileResource *object); HRESULT (STDMETHODCALLTYPE *RemoveAt)( - IXpsOMColorProfileResourceCollection* This, + IXpsOMColorProfileResourceCollection *This, UINT32 index); HRESULT (STDMETHODCALLTYPE *SetAt)( - IXpsOMColorProfileResourceCollection* This, + IXpsOMColorProfileResourceCollection *This, UINT32 index, IXpsOMColorProfileResource *object); HRESULT (STDMETHODCALLTYPE *Append)( - IXpsOMColorProfileResourceCollection* This, + IXpsOMColorProfileResourceCollection *This, IXpsOMColorProfileResource *object); HRESULT (STDMETHODCALLTYPE *GetByPartName)( - IXpsOMColorProfileResourceCollection* This, + IXpsOMColorProfileResourceCollection *This, IOpcPartUri *partName, IXpsOMColorProfileResource **part); END_INTERFACE } IXpsOMColorProfileResourceCollectionVtbl; + interface IXpsOMColorProfileResourceCollection { CONST_VTBL IXpsOMColorProfileResourceCollectionVtbl* lpVtbl; }; @@ -3254,66 +2913,6 @@ static FORCEINLINE HRESULT IXpsOMColorProfileResourceCollection_GetByPartName(IX #endif -HRESULT STDMETHODCALLTYPE IXpsOMColorProfileResourceCollection_GetCount_Proxy( - IXpsOMColorProfileResourceCollection* This, - UINT32 *count); -void __RPC_STUB IXpsOMColorProfileResourceCollection_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMColorProfileResourceCollection_GetAt_Proxy( - IXpsOMColorProfileResourceCollection* This, - UINT32 index, - IXpsOMColorProfileResource **object); -void __RPC_STUB IXpsOMColorProfileResourceCollection_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMColorProfileResourceCollection_InsertAt_Proxy( - IXpsOMColorProfileResourceCollection* This, - UINT32 index, - IXpsOMColorProfileResource *object); -void __RPC_STUB IXpsOMColorProfileResourceCollection_InsertAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMColorProfileResourceCollection_RemoveAt_Proxy( - IXpsOMColorProfileResourceCollection* This, - UINT32 index); -void __RPC_STUB IXpsOMColorProfileResourceCollection_RemoveAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMColorProfileResourceCollection_SetAt_Proxy( - IXpsOMColorProfileResourceCollection* This, - UINT32 index, - IXpsOMColorProfileResource *object); -void __RPC_STUB IXpsOMColorProfileResourceCollection_SetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMColorProfileResourceCollection_Append_Proxy( - IXpsOMColorProfileResourceCollection* This, - IXpsOMColorProfileResource *object); -void __RPC_STUB IXpsOMColorProfileResourceCollection_Append_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMColorProfileResourceCollection_GetByPartName_Proxy( - IXpsOMColorProfileResourceCollection* This, - IOpcPartUri *partName, - IXpsOMColorProfileResource **part); -void __RPC_STUB IXpsOMColorProfileResourceCollection_GetByPartName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMColorProfileResourceCollection_INTERFACE_DEFINED__ */ @@ -3363,51 +2962,52 @@ typedef struct IXpsOMRemoteDictionaryResourceCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMRemoteDictionaryResourceCollection* This, + IXpsOMRemoteDictionaryResourceCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMRemoteDictionaryResourceCollection* This); + IXpsOMRemoteDictionaryResourceCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMRemoteDictionaryResourceCollection* This); + IXpsOMRemoteDictionaryResourceCollection *This); /*** IXpsOMRemoteDictionaryResourceCollection methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IXpsOMRemoteDictionaryResourceCollection* This, + IXpsOMRemoteDictionaryResourceCollection *This, UINT32 *count); HRESULT (STDMETHODCALLTYPE *GetAt)( - IXpsOMRemoteDictionaryResourceCollection* This, + IXpsOMRemoteDictionaryResourceCollection *This, UINT32 index, IXpsOMRemoteDictionaryResource **object); HRESULT (STDMETHODCALLTYPE *InsertAt)( - IXpsOMRemoteDictionaryResourceCollection* This, + IXpsOMRemoteDictionaryResourceCollection *This, UINT32 index, IXpsOMRemoteDictionaryResource *object); HRESULT (STDMETHODCALLTYPE *RemoveAt)( - IXpsOMRemoteDictionaryResourceCollection* This, + IXpsOMRemoteDictionaryResourceCollection *This, UINT32 index); HRESULT (STDMETHODCALLTYPE *SetAt)( - IXpsOMRemoteDictionaryResourceCollection* This, + IXpsOMRemoteDictionaryResourceCollection *This, UINT32 index, IXpsOMRemoteDictionaryResource *object); HRESULT (STDMETHODCALLTYPE *Append)( - IXpsOMRemoteDictionaryResourceCollection* This, + IXpsOMRemoteDictionaryResourceCollection *This, IXpsOMRemoteDictionaryResource *object); HRESULT (STDMETHODCALLTYPE *GetByPartName)( - IXpsOMRemoteDictionaryResourceCollection* This, + IXpsOMRemoteDictionaryResourceCollection *This, IOpcPartUri *partName, IXpsOMRemoteDictionaryResource **remoteDictionaryResource); END_INTERFACE } IXpsOMRemoteDictionaryResourceCollectionVtbl; + interface IXpsOMRemoteDictionaryResourceCollection { CONST_VTBL IXpsOMRemoteDictionaryResourceCollectionVtbl* lpVtbl; }; @@ -3464,66 +3064,6 @@ static FORCEINLINE HRESULT IXpsOMRemoteDictionaryResourceCollection_GetByPartNam #endif -HRESULT STDMETHODCALLTYPE IXpsOMRemoteDictionaryResourceCollection_GetCount_Proxy( - IXpsOMRemoteDictionaryResourceCollection* This, - UINT32 *count); -void __RPC_STUB IXpsOMRemoteDictionaryResourceCollection_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMRemoteDictionaryResourceCollection_GetAt_Proxy( - IXpsOMRemoteDictionaryResourceCollection* This, - UINT32 index, - IXpsOMRemoteDictionaryResource **object); -void __RPC_STUB IXpsOMRemoteDictionaryResourceCollection_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMRemoteDictionaryResourceCollection_InsertAt_Proxy( - IXpsOMRemoteDictionaryResourceCollection* This, - UINT32 index, - IXpsOMRemoteDictionaryResource *object); -void __RPC_STUB IXpsOMRemoteDictionaryResourceCollection_InsertAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMRemoteDictionaryResourceCollection_RemoveAt_Proxy( - IXpsOMRemoteDictionaryResourceCollection* This, - UINT32 index); -void __RPC_STUB IXpsOMRemoteDictionaryResourceCollection_RemoveAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMRemoteDictionaryResourceCollection_SetAt_Proxy( - IXpsOMRemoteDictionaryResourceCollection* This, - UINT32 index, - IXpsOMRemoteDictionaryResource *object); -void __RPC_STUB IXpsOMRemoteDictionaryResourceCollection_SetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMRemoteDictionaryResourceCollection_Append_Proxy( - IXpsOMRemoteDictionaryResourceCollection* This, - IXpsOMRemoteDictionaryResource *object); -void __RPC_STUB IXpsOMRemoteDictionaryResourceCollection_Append_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMRemoteDictionaryResourceCollection_GetByPartName_Proxy( - IXpsOMRemoteDictionaryResourceCollection* This, - IOpcPartUri *partName, - IXpsOMRemoteDictionaryResource **remoteDictionaryResource); -void __RPC_STUB IXpsOMRemoteDictionaryResourceCollection_GetByPartName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMRemoteDictionaryResourceCollection_INTERFACE_DEFINED__ */ @@ -3573,51 +3113,52 @@ typedef struct IXpsOMSignatureBlockResourceCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMSignatureBlockResourceCollection* This, + IXpsOMSignatureBlockResourceCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMSignatureBlockResourceCollection* This); + IXpsOMSignatureBlockResourceCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMSignatureBlockResourceCollection* This); + IXpsOMSignatureBlockResourceCollection *This); /*** IXpsOMSignatureBlockResourceCollection methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IXpsOMSignatureBlockResourceCollection* This, + IXpsOMSignatureBlockResourceCollection *This, UINT32 *count); HRESULT (STDMETHODCALLTYPE *GetAt)( - IXpsOMSignatureBlockResourceCollection* This, + IXpsOMSignatureBlockResourceCollection *This, UINT32 index, IXpsOMSignatureBlockResource **signatureBlockResource); HRESULT (STDMETHODCALLTYPE *InsertAt)( - IXpsOMSignatureBlockResourceCollection* This, + IXpsOMSignatureBlockResourceCollection *This, UINT32 index, IXpsOMSignatureBlockResource *signatureBlockResource); HRESULT (STDMETHODCALLTYPE *RemoveAt)( - IXpsOMSignatureBlockResourceCollection* This, + IXpsOMSignatureBlockResourceCollection *This, UINT32 index); HRESULT (STDMETHODCALLTYPE *SetAt)( - IXpsOMSignatureBlockResourceCollection* This, + IXpsOMSignatureBlockResourceCollection *This, UINT32 index, IXpsOMSignatureBlockResource *signatureBlockResource); HRESULT (STDMETHODCALLTYPE *Append)( - IXpsOMSignatureBlockResourceCollection* This, + IXpsOMSignatureBlockResourceCollection *This, IXpsOMSignatureBlockResource *signatureBlockResource); HRESULT (STDMETHODCALLTYPE *GetByPartName)( - IXpsOMSignatureBlockResourceCollection* This, + IXpsOMSignatureBlockResourceCollection *This, IOpcPartUri *partName, IXpsOMSignatureBlockResource **signatureBlockResource); END_INTERFACE } IXpsOMSignatureBlockResourceCollectionVtbl; + interface IXpsOMSignatureBlockResourceCollection { CONST_VTBL IXpsOMSignatureBlockResourceCollectionVtbl* lpVtbl; }; @@ -3674,66 +3215,6 @@ static FORCEINLINE HRESULT IXpsOMSignatureBlockResourceCollection_GetByPartName( #endif -HRESULT STDMETHODCALLTYPE IXpsOMSignatureBlockResourceCollection_GetCount_Proxy( - IXpsOMSignatureBlockResourceCollection* This, - UINT32 *count); -void __RPC_STUB IXpsOMSignatureBlockResourceCollection_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMSignatureBlockResourceCollection_GetAt_Proxy( - IXpsOMSignatureBlockResourceCollection* This, - UINT32 index, - IXpsOMSignatureBlockResource **signatureBlockResource); -void __RPC_STUB IXpsOMSignatureBlockResourceCollection_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMSignatureBlockResourceCollection_InsertAt_Proxy( - IXpsOMSignatureBlockResourceCollection* This, - UINT32 index, - IXpsOMSignatureBlockResource *signatureBlockResource); -void __RPC_STUB IXpsOMSignatureBlockResourceCollection_InsertAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMSignatureBlockResourceCollection_RemoveAt_Proxy( - IXpsOMSignatureBlockResourceCollection* This, - UINT32 index); -void __RPC_STUB IXpsOMSignatureBlockResourceCollection_RemoveAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMSignatureBlockResourceCollection_SetAt_Proxy( - IXpsOMSignatureBlockResourceCollection* This, - UINT32 index, - IXpsOMSignatureBlockResource *signatureBlockResource); -void __RPC_STUB IXpsOMSignatureBlockResourceCollection_SetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMSignatureBlockResourceCollection_Append_Proxy( - IXpsOMSignatureBlockResourceCollection* This, - IXpsOMSignatureBlockResource *signatureBlockResource); -void __RPC_STUB IXpsOMSignatureBlockResourceCollection_Append_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMSignatureBlockResourceCollection_GetByPartName_Proxy( - IXpsOMSignatureBlockResourceCollection* This, - IOpcPartUri *partName, - IXpsOMSignatureBlockResource **signatureBlockResource); -void __RPC_STUB IXpsOMSignatureBlockResourceCollection_GetByPartName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMSignatureBlockResourceCollection_INTERFACE_DEFINED__ */ @@ -3779,46 +3260,47 @@ typedef struct IXpsOMVisualCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMVisualCollection* This, + IXpsOMVisualCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMVisualCollection* This); + IXpsOMVisualCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMVisualCollection* This); + IXpsOMVisualCollection *This); /*** IXpsOMVisualCollection methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IXpsOMVisualCollection* This, + IXpsOMVisualCollection *This, UINT32 *count); HRESULT (STDMETHODCALLTYPE *GetAt)( - IXpsOMVisualCollection* This, + IXpsOMVisualCollection *This, UINT32 index, IXpsOMVisual **object); HRESULT (STDMETHODCALLTYPE *InsertAt)( - IXpsOMVisualCollection* This, + IXpsOMVisualCollection *This, UINT32 index, IXpsOMVisual *object); HRESULT (STDMETHODCALLTYPE *RemoveAt)( - IXpsOMVisualCollection* This, + IXpsOMVisualCollection *This, UINT32 index); HRESULT (STDMETHODCALLTYPE *SetAt)( - IXpsOMVisualCollection* This, + IXpsOMVisualCollection *This, UINT32 index, IXpsOMVisual *object); HRESULT (STDMETHODCALLTYPE *Append)( - IXpsOMVisualCollection* This, + IXpsOMVisualCollection *This, IXpsOMVisual *object); END_INTERFACE } IXpsOMVisualCollectionVtbl; + interface IXpsOMVisualCollection { CONST_VTBL IXpsOMVisualCollectionVtbl* lpVtbl; }; @@ -3871,57 +3353,6 @@ static FORCEINLINE HRESULT IXpsOMVisualCollection_Append(IXpsOMVisualCollection* #endif -HRESULT STDMETHODCALLTYPE IXpsOMVisualCollection_GetCount_Proxy( - IXpsOMVisualCollection* This, - UINT32 *count); -void __RPC_STUB IXpsOMVisualCollection_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisualCollection_GetAt_Proxy( - IXpsOMVisualCollection* This, - UINT32 index, - IXpsOMVisual **object); -void __RPC_STUB IXpsOMVisualCollection_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisualCollection_InsertAt_Proxy( - IXpsOMVisualCollection* This, - UINT32 index, - IXpsOMVisual *object); -void __RPC_STUB IXpsOMVisualCollection_InsertAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisualCollection_RemoveAt_Proxy( - IXpsOMVisualCollection* This, - UINT32 index); -void __RPC_STUB IXpsOMVisualCollection_RemoveAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisualCollection_SetAt_Proxy( - IXpsOMVisualCollection* This, - UINT32 index, - IXpsOMVisual *object); -void __RPC_STUB IXpsOMVisualCollection_SetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisualCollection_Append_Proxy( - IXpsOMVisualCollection* This, - IXpsOMVisual *object); -void __RPC_STUB IXpsOMVisualCollection_Append_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMVisualCollection_INTERFACE_DEFINED__ */ @@ -3986,69 +3417,70 @@ typedef struct IXpsOMDictionaryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMDictionary* This, + IXpsOMDictionary *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMDictionary* This); + IXpsOMDictionary *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMDictionary* This); + IXpsOMDictionary *This); /*** IXpsOMDictionary methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMDictionary* This, + IXpsOMDictionary *This, IUnknown **owner); HRESULT (STDMETHODCALLTYPE *GetCount)( - IXpsOMDictionary* This, + IXpsOMDictionary *This, UINT32 *count); HRESULT (STDMETHODCALLTYPE *GetAt)( - IXpsOMDictionary* This, + IXpsOMDictionary *This, UINT32 index, LPWSTR *key, IXpsOMShareable **entry); HRESULT (STDMETHODCALLTYPE *GetByKey)( - IXpsOMDictionary* This, + IXpsOMDictionary *This, LPCWSTR key, IXpsOMShareable *beforeEntry, IXpsOMShareable **entry); HRESULT (STDMETHODCALLTYPE *GetIndex)( - IXpsOMDictionary* This, + IXpsOMDictionary *This, IXpsOMShareable *entry, UINT32 *index); HRESULT (STDMETHODCALLTYPE *Append)( - IXpsOMDictionary* This, + IXpsOMDictionary *This, LPCWSTR key, IXpsOMShareable *entry); HRESULT (STDMETHODCALLTYPE *InsertAt)( - IXpsOMDictionary* This, + IXpsOMDictionary *This, UINT32 index, LPCWSTR key, IXpsOMShareable *entry); HRESULT (STDMETHODCALLTYPE *RemoveAt)( - IXpsOMDictionary* This, + IXpsOMDictionary *This, UINT32 index); HRESULT (STDMETHODCALLTYPE *SetAt)( - IXpsOMDictionary* This, + IXpsOMDictionary *This, UINT32 index, LPCWSTR key, IXpsOMShareable *entry); HRESULT (STDMETHODCALLTYPE *Clone)( - IXpsOMDictionary* This, + IXpsOMDictionary *This, IXpsOMDictionary **dictionary); END_INTERFACE } IXpsOMDictionaryVtbl; + interface IXpsOMDictionary { CONST_VTBL IXpsOMDictionaryVtbl* lpVtbl; }; @@ -4117,96 +3549,6 @@ static FORCEINLINE HRESULT IXpsOMDictionary_Clone(IXpsOMDictionary* This,IXpsOMD #endif -HRESULT STDMETHODCALLTYPE IXpsOMDictionary_GetOwner_Proxy( - IXpsOMDictionary* This, - IUnknown **owner); -void __RPC_STUB IXpsOMDictionary_GetOwner_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDictionary_GetCount_Proxy( - IXpsOMDictionary* This, - UINT32 *count); -void __RPC_STUB IXpsOMDictionary_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDictionary_GetAt_Proxy( - IXpsOMDictionary* This, - UINT32 index, - LPWSTR *key, - IXpsOMShareable **entry); -void __RPC_STUB IXpsOMDictionary_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDictionary_GetByKey_Proxy( - IXpsOMDictionary* This, - LPCWSTR key, - IXpsOMShareable *beforeEntry, - IXpsOMShareable **entry); -void __RPC_STUB IXpsOMDictionary_GetByKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDictionary_GetIndex_Proxy( - IXpsOMDictionary* This, - IXpsOMShareable *entry, - UINT32 *index); -void __RPC_STUB IXpsOMDictionary_GetIndex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDictionary_Append_Proxy( - IXpsOMDictionary* This, - LPCWSTR key, - IXpsOMShareable *entry); -void __RPC_STUB IXpsOMDictionary_Append_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDictionary_InsertAt_Proxy( - IXpsOMDictionary* This, - UINT32 index, - LPCWSTR key, - IXpsOMShareable *entry); -void __RPC_STUB IXpsOMDictionary_InsertAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDictionary_RemoveAt_Proxy( - IXpsOMDictionary* This, - UINT32 index); -void __RPC_STUB IXpsOMDictionary_RemoveAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDictionary_SetAt_Proxy( - IXpsOMDictionary* This, - UINT32 index, - LPCWSTR key, - IXpsOMShareable *entry); -void __RPC_STUB IXpsOMDictionary_SetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDictionary_Clone_Proxy( - IXpsOMDictionary* This, - IXpsOMDictionary **dictionary); -void __RPC_STUB IXpsOMDictionary_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMDictionary_INTERFACE_DEFINED__ */ @@ -4282,86 +3624,87 @@ typedef struct IXpsOMPageReferenceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMPageReference* This, + IXpsOMPageReference *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMPageReference* This); + IXpsOMPageReference *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMPageReference* This); + IXpsOMPageReference *This); /*** IXpsOMPageReference methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMPageReference* This, + IXpsOMPageReference *This, IXpsOMDocument **document); HRESULT (STDMETHODCALLTYPE *GetPage)( - IXpsOMPageReference* This, + IXpsOMPageReference *This, IXpsOMPage **page); HRESULT (STDMETHODCALLTYPE *SetPage)( - IXpsOMPageReference* This, + IXpsOMPageReference *This, IXpsOMPage *page); HRESULT (STDMETHODCALLTYPE *DiscardPage)( - IXpsOMPageReference* This); + IXpsOMPageReference *This); HRESULT (STDMETHODCALLTYPE *IsPageLoaded)( - IXpsOMPageReference* This, + IXpsOMPageReference *This, WINBOOL *isPageLoaded); HRESULT (STDMETHODCALLTYPE *GetAdvisoryPageDimensions)( - IXpsOMPageReference* This, + IXpsOMPageReference *This, XPS_SIZE *pageDimensions); HRESULT (STDMETHODCALLTYPE *SetAdvisoryPageDimensions)( - IXpsOMPageReference* This, + IXpsOMPageReference *This, const XPS_SIZE *pageDimensions); HRESULT (STDMETHODCALLTYPE *GetStoryFragmentsResource)( - IXpsOMPageReference* This, + IXpsOMPageReference *This, IXpsOMStoryFragmentsResource **storyFragmentsResource); HRESULT (STDMETHODCALLTYPE *SetStoryFragmentsResource)( - IXpsOMPageReference* This, + IXpsOMPageReference *This, IXpsOMStoryFragmentsResource *storyFragmentsResource); HRESULT (STDMETHODCALLTYPE *GetPrintTicketResource)( - IXpsOMPageReference* This, + IXpsOMPageReference *This, IXpsOMPrintTicketResource **printTicketResource); HRESULT (STDMETHODCALLTYPE *SetPrintTicketResource)( - IXpsOMPageReference* This, + IXpsOMPageReference *This, IXpsOMPrintTicketResource *printTicketResource); HRESULT (STDMETHODCALLTYPE *GetThumbnailResource)( - IXpsOMPageReference* This, + IXpsOMPageReference *This, IXpsOMImageResource **imageResource); HRESULT (STDMETHODCALLTYPE *SetThumbnailResource)( - IXpsOMPageReference* This, + IXpsOMPageReference *This, IXpsOMImageResource *imageResource); HRESULT (STDMETHODCALLTYPE *CollectLinkTargets)( - IXpsOMPageReference* This, + IXpsOMPageReference *This, IXpsOMNameCollection **linkTargets); HRESULT (STDMETHODCALLTYPE *CollectPartResources)( - IXpsOMPageReference* This, + IXpsOMPageReference *This, IXpsOMPartResources **partResources); HRESULT (STDMETHODCALLTYPE *HasRestrictedFonts)( - IXpsOMPageReference* This, + IXpsOMPageReference *This, WINBOOL *restrictedFonts); HRESULT (STDMETHODCALLTYPE *Clone)( - IXpsOMPageReference* This, + IXpsOMPageReference *This, IXpsOMPageReference **pageReference); END_INTERFACE } IXpsOMPageReferenceVtbl; + interface IXpsOMPageReference { CONST_VTBL IXpsOMPageReferenceVtbl* lpVtbl; }; @@ -4458,141 +3801,6 @@ static FORCEINLINE HRESULT IXpsOMPageReference_Clone(IXpsOMPageReference* This,I #endif -HRESULT STDMETHODCALLTYPE IXpsOMPageReference_GetOwner_Proxy( - IXpsOMPageReference* This, - IXpsOMDocument **document); -void __RPC_STUB IXpsOMPageReference_GetOwner_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPageReference_GetPage_Proxy( - IXpsOMPageReference* This, - IXpsOMPage **page); -void __RPC_STUB IXpsOMPageReference_GetPage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPageReference_SetPage_Proxy( - IXpsOMPageReference* This, - IXpsOMPage *page); -void __RPC_STUB IXpsOMPageReference_SetPage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPageReference_DiscardPage_Proxy( - IXpsOMPageReference* This); -void __RPC_STUB IXpsOMPageReference_DiscardPage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPageReference_IsPageLoaded_Proxy( - IXpsOMPageReference* This, - WINBOOL *isPageLoaded); -void __RPC_STUB IXpsOMPageReference_IsPageLoaded_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPageReference_GetAdvisoryPageDimensions_Proxy( - IXpsOMPageReference* This, - XPS_SIZE *pageDimensions); -void __RPC_STUB IXpsOMPageReference_GetAdvisoryPageDimensions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPageReference_SetAdvisoryPageDimensions_Proxy( - IXpsOMPageReference* This, - const XPS_SIZE *pageDimensions); -void __RPC_STUB IXpsOMPageReference_SetAdvisoryPageDimensions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPageReference_GetStoryFragmentsResource_Proxy( - IXpsOMPageReference* This, - IXpsOMStoryFragmentsResource **storyFragmentsResource); -void __RPC_STUB IXpsOMPageReference_GetStoryFragmentsResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPageReference_SetStoryFragmentsResource_Proxy( - IXpsOMPageReference* This, - IXpsOMStoryFragmentsResource *storyFragmentsResource); -void __RPC_STUB IXpsOMPageReference_SetStoryFragmentsResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPageReference_GetPrintTicketResource_Proxy( - IXpsOMPageReference* This, - IXpsOMPrintTicketResource **printTicketResource); -void __RPC_STUB IXpsOMPageReference_GetPrintTicketResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPageReference_SetPrintTicketResource_Proxy( - IXpsOMPageReference* This, - IXpsOMPrintTicketResource *printTicketResource); -void __RPC_STUB IXpsOMPageReference_SetPrintTicketResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPageReference_GetThumbnailResource_Proxy( - IXpsOMPageReference* This, - IXpsOMImageResource **imageResource); -void __RPC_STUB IXpsOMPageReference_GetThumbnailResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPageReference_SetThumbnailResource_Proxy( - IXpsOMPageReference* This, - IXpsOMImageResource *imageResource); -void __RPC_STUB IXpsOMPageReference_SetThumbnailResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPageReference_CollectLinkTargets_Proxy( - IXpsOMPageReference* This, - IXpsOMNameCollection **linkTargets); -void __RPC_STUB IXpsOMPageReference_CollectLinkTargets_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPageReference_CollectPartResources_Proxy( - IXpsOMPageReference* This, - IXpsOMPartResources **partResources); -void __RPC_STUB IXpsOMPageReference_CollectPartResources_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPageReference_HasRestrictedFonts_Proxy( - IXpsOMPageReference* This, - WINBOOL *restrictedFonts); -void __RPC_STUB IXpsOMPageReference_HasRestrictedFonts_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPageReference_Clone_Proxy( - IXpsOMPageReference* This, - IXpsOMPageReference **pageReference); -void __RPC_STUB IXpsOMPageReference_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMPageReference_INTERFACE_DEFINED__ */ @@ -4638,46 +3846,47 @@ typedef struct IXpsOMPageReferenceCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMPageReferenceCollection* This, + IXpsOMPageReferenceCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMPageReferenceCollection* This); + IXpsOMPageReferenceCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMPageReferenceCollection* This); + IXpsOMPageReferenceCollection *This); /*** IXpsOMPageReferenceCollection methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IXpsOMPageReferenceCollection* This, + IXpsOMPageReferenceCollection *This, UINT32 *count); HRESULT (STDMETHODCALLTYPE *GetAt)( - IXpsOMPageReferenceCollection* This, + IXpsOMPageReferenceCollection *This, UINT32 index, IXpsOMPageReference **pageReference); HRESULT (STDMETHODCALLTYPE *InsertAt)( - IXpsOMPageReferenceCollection* This, + IXpsOMPageReferenceCollection *This, UINT32 index, IXpsOMPageReference *pageReference); HRESULT (STDMETHODCALLTYPE *RemoveAt)( - IXpsOMPageReferenceCollection* This, + IXpsOMPageReferenceCollection *This, UINT32 index); HRESULT (STDMETHODCALLTYPE *SetAt)( - IXpsOMPageReferenceCollection* This, + IXpsOMPageReferenceCollection *This, UINT32 index, IXpsOMPageReference *pageReference); HRESULT (STDMETHODCALLTYPE *Append)( - IXpsOMPageReferenceCollection* This, + IXpsOMPageReferenceCollection *This, IXpsOMPageReference *pageReference); END_INTERFACE } IXpsOMPageReferenceCollectionVtbl; + interface IXpsOMPageReferenceCollection { CONST_VTBL IXpsOMPageReferenceCollectionVtbl* lpVtbl; }; @@ -4730,57 +3939,6 @@ static FORCEINLINE HRESULT IXpsOMPageReferenceCollection_Append(IXpsOMPageRefere #endif -HRESULT STDMETHODCALLTYPE IXpsOMPageReferenceCollection_GetCount_Proxy( - IXpsOMPageReferenceCollection* This, - UINT32 *count); -void __RPC_STUB IXpsOMPageReferenceCollection_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPageReferenceCollection_GetAt_Proxy( - IXpsOMPageReferenceCollection* This, - UINT32 index, - IXpsOMPageReference **pageReference); -void __RPC_STUB IXpsOMPageReferenceCollection_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPageReferenceCollection_InsertAt_Proxy( - IXpsOMPageReferenceCollection* This, - UINT32 index, - IXpsOMPageReference *pageReference); -void __RPC_STUB IXpsOMPageReferenceCollection_InsertAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPageReferenceCollection_RemoveAt_Proxy( - IXpsOMPageReferenceCollection* This, - UINT32 index); -void __RPC_STUB IXpsOMPageReferenceCollection_RemoveAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPageReferenceCollection_SetAt_Proxy( - IXpsOMPageReferenceCollection* This, - UINT32 index, - IXpsOMPageReference *pageReference); -void __RPC_STUB IXpsOMPageReferenceCollection_SetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPageReferenceCollection_Append_Proxy( - IXpsOMPageReferenceCollection* This, - IXpsOMPageReference *pageReference); -void __RPC_STUB IXpsOMPageReferenceCollection_Append_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMPageReferenceCollection_INTERFACE_DEFINED__ */ @@ -4826,46 +3984,47 @@ typedef struct IXpsOMDocumentCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMDocumentCollection* This, + IXpsOMDocumentCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMDocumentCollection* This); + IXpsOMDocumentCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMDocumentCollection* This); + IXpsOMDocumentCollection *This); /*** IXpsOMDocumentCollection methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IXpsOMDocumentCollection* This, + IXpsOMDocumentCollection *This, UINT32 *count); HRESULT (STDMETHODCALLTYPE *GetAt)( - IXpsOMDocumentCollection* This, + IXpsOMDocumentCollection *This, UINT32 index, IXpsOMDocument **document); HRESULT (STDMETHODCALLTYPE *InsertAt)( - IXpsOMDocumentCollection* This, + IXpsOMDocumentCollection *This, UINT32 index, IXpsOMDocument *document); HRESULT (STDMETHODCALLTYPE *RemoveAt)( - IXpsOMDocumentCollection* This, + IXpsOMDocumentCollection *This, UINT32 index); HRESULT (STDMETHODCALLTYPE *SetAt)( - IXpsOMDocumentCollection* This, + IXpsOMDocumentCollection *This, UINT32 index, IXpsOMDocument *document); HRESULT (STDMETHODCALLTYPE *Append)( - IXpsOMDocumentCollection* This, + IXpsOMDocumentCollection *This, IXpsOMDocument *document); END_INTERFACE } IXpsOMDocumentCollectionVtbl; + interface IXpsOMDocumentCollection { CONST_VTBL IXpsOMDocumentCollectionVtbl* lpVtbl; }; @@ -4918,57 +4077,6 @@ static FORCEINLINE HRESULT IXpsOMDocumentCollection_Append(IXpsOMDocumentCollect #endif -HRESULT STDMETHODCALLTYPE IXpsOMDocumentCollection_GetCount_Proxy( - IXpsOMDocumentCollection* This, - UINT32 *count); -void __RPC_STUB IXpsOMDocumentCollection_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDocumentCollection_GetAt_Proxy( - IXpsOMDocumentCollection* This, - UINT32 index, - IXpsOMDocument **document); -void __RPC_STUB IXpsOMDocumentCollection_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDocumentCollection_InsertAt_Proxy( - IXpsOMDocumentCollection* This, - UINT32 index, - IXpsOMDocument *document); -void __RPC_STUB IXpsOMDocumentCollection_InsertAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDocumentCollection_RemoveAt_Proxy( - IXpsOMDocumentCollection* This, - UINT32 index); -void __RPC_STUB IXpsOMDocumentCollection_RemoveAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDocumentCollection_SetAt_Proxy( - IXpsOMDocumentCollection* This, - UINT32 index, - IXpsOMDocument *document); -void __RPC_STUB IXpsOMDocumentCollection_SetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDocumentCollection_Append_Proxy( - IXpsOMDocumentCollection* This, - IXpsOMDocument *document); -void __RPC_STUB IXpsOMDocumentCollection_Append_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMDocumentCollection_INTERFACE_DEFINED__ */ @@ -5027,63 +4135,64 @@ typedef struct IXpsOMPackageVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMPackage* This, + IXpsOMPackage *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMPackage* This); + IXpsOMPackage *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMPackage* This); + IXpsOMPackage *This); /*** IXpsOMPackage methods ***/ HRESULT (STDMETHODCALLTYPE *GetDocumentSequence)( - IXpsOMPackage* This, + IXpsOMPackage *This, IXpsOMDocumentSequence **documentSequence); HRESULT (STDMETHODCALLTYPE *SetDocumentSequence)( - IXpsOMPackage* This, + IXpsOMPackage *This, IXpsOMDocumentSequence *documentSequence); HRESULT (STDMETHODCALLTYPE *GetCoreProperties)( - IXpsOMPackage* This, + IXpsOMPackage *This, IXpsOMCoreProperties **coreProperties); HRESULT (STDMETHODCALLTYPE *SetCoreProperties)( - IXpsOMPackage* This, + IXpsOMPackage *This, IXpsOMCoreProperties *coreProperties); HRESULT (STDMETHODCALLTYPE *GetDiscardControlPartName)( - IXpsOMPackage* This, + IXpsOMPackage *This, IOpcPartUri **discardControlPartUri); HRESULT (STDMETHODCALLTYPE *SetDiscardControlPartName)( - IXpsOMPackage* This, + IXpsOMPackage *This, IOpcPartUri *discardControlPartUri); HRESULT (STDMETHODCALLTYPE *GetThumbnailResource)( - IXpsOMPackage* This, + IXpsOMPackage *This, IXpsOMImageResource **imageResource); HRESULT (STDMETHODCALLTYPE *SetThumbnailResource)( - IXpsOMPackage* This, + IXpsOMPackage *This, IXpsOMImageResource *imageResource); HRESULT (STDMETHODCALLTYPE *WriteToFile)( - IXpsOMPackage* This, + IXpsOMPackage *This, LPCWSTR fileName, LPSECURITY_ATTRIBUTES securityAttributes, DWORD flagsAndAttributes, WINBOOL optimizeMarkupSize); HRESULT (STDMETHODCALLTYPE *WriteToStream)( - IXpsOMPackage* This, + IXpsOMPackage *This, ISequentialStream *stream, WINBOOL optimizeMarkupSize); END_INTERFACE } IXpsOMPackageVtbl; + interface IXpsOMPackage { CONST_VTBL IXpsOMPackageVtbl* lpVtbl; }; @@ -5152,90 +4261,6 @@ static FORCEINLINE HRESULT IXpsOMPackage_WriteToStream(IXpsOMPackage* This,ISequ #endif -HRESULT STDMETHODCALLTYPE IXpsOMPackage_GetDocumentSequence_Proxy( - IXpsOMPackage* This, - IXpsOMDocumentSequence **documentSequence); -void __RPC_STUB IXpsOMPackage_GetDocumentSequence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPackage_SetDocumentSequence_Proxy( - IXpsOMPackage* This, - IXpsOMDocumentSequence *documentSequence); -void __RPC_STUB IXpsOMPackage_SetDocumentSequence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPackage_GetCoreProperties_Proxy( - IXpsOMPackage* This, - IXpsOMCoreProperties **coreProperties); -void __RPC_STUB IXpsOMPackage_GetCoreProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPackage_SetCoreProperties_Proxy( - IXpsOMPackage* This, - IXpsOMCoreProperties *coreProperties); -void __RPC_STUB IXpsOMPackage_SetCoreProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPackage_GetDiscardControlPartName_Proxy( - IXpsOMPackage* This, - IOpcPartUri **discardControlPartUri); -void __RPC_STUB IXpsOMPackage_GetDiscardControlPartName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPackage_SetDiscardControlPartName_Proxy( - IXpsOMPackage* This, - IOpcPartUri *discardControlPartUri); -void __RPC_STUB IXpsOMPackage_SetDiscardControlPartName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPackage_GetThumbnailResource_Proxy( - IXpsOMPackage* This, - IXpsOMImageResource **imageResource); -void __RPC_STUB IXpsOMPackage_GetThumbnailResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPackage_SetThumbnailResource_Proxy( - IXpsOMPackage* This, - IXpsOMImageResource *imageResource); -void __RPC_STUB IXpsOMPackage_SetThumbnailResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPackage_WriteToFile_Proxy( - IXpsOMPackage* This, - LPCWSTR fileName, - LPSECURITY_ATTRIBUTES securityAttributes, - DWORD flagsAndAttributes, - WINBOOL optimizeMarkupSize); -void __RPC_STUB IXpsOMPackage_WriteToFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPackage_WriteToStream_Proxy( - IXpsOMPackage* This, - ISequentialStream *stream, - WINBOOL optimizeMarkupSize); -void __RPC_STUB IXpsOMPackage_WriteToStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMPackage_INTERFACE_DEFINED__ */ @@ -5450,92 +4475,92 @@ typedef struct IXpsOMObjectFactoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMObjectFactory* This); + IXpsOMObjectFactory *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMObjectFactory* This); + IXpsOMObjectFactory *This); /*** IXpsOMObjectFactory methods ***/ HRESULT (STDMETHODCALLTYPE *CreatePackage)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IXpsOMPackage **package); HRESULT (STDMETHODCALLTYPE *CreatePackageFromFile)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, LPCWSTR filename, WINBOOL reuseObjects, IXpsOMPackage **package); HRESULT (STDMETHODCALLTYPE *CreatePackageFromStream)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IStream *stream, WINBOOL reuseObjects, IXpsOMPackage **package); HRESULT (STDMETHODCALLTYPE *CreateStoryFragmentsResource)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IStream *acquiredStream, IOpcPartUri *partUri, IXpsOMStoryFragmentsResource **storyFragmentsResource); HRESULT (STDMETHODCALLTYPE *CreateDocumentStructureResource)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IStream *acquiredStream, IOpcPartUri *partUri, IXpsOMDocumentStructureResource **documentStructureResource); HRESULT (STDMETHODCALLTYPE *CreateSignatureBlockResource)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IStream *acquiredStream, IOpcPartUri *partUri, IXpsOMSignatureBlockResource **signatureBlockResource); HRESULT (STDMETHODCALLTYPE *CreateRemoteDictionaryResource)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IXpsOMDictionary *dictionary, IOpcPartUri *partUri, IXpsOMRemoteDictionaryResource **remoteDictionaryResource); HRESULT (STDMETHODCALLTYPE *CreateRemoteDictionaryResourceFromStream)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IStream *dictionaryMarkupStream, IOpcPartUri *dictionaryPartUri, IXpsOMPartResources *resources, IXpsOMRemoteDictionaryResource **dictionaryResource); HRESULT (STDMETHODCALLTYPE *CreatePartResources)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IXpsOMPartResources **partResources); HRESULT (STDMETHODCALLTYPE *CreateDocumentSequence)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IOpcPartUri *partUri, IXpsOMDocumentSequence **documentSequence); HRESULT (STDMETHODCALLTYPE *CreateDocument)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IOpcPartUri *partUri, IXpsOMDocument **document); HRESULT (STDMETHODCALLTYPE *CreatePageReference)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, const XPS_SIZE *advisoryPageDimensions, IXpsOMPageReference **pageReference); HRESULT (STDMETHODCALLTYPE *CreatePage)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, const XPS_SIZE *pageDimensions, LPCWSTR language, IOpcPartUri *partUri, IXpsOMPage **page); HRESULT (STDMETHODCALLTYPE *CreatePageFromStream)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IStream *pageMarkupStream, IOpcPartUri *partUri, IXpsOMPartResources *resources, @@ -5543,72 +4568,72 @@ typedef struct IXpsOMObjectFactoryVtbl { IXpsOMPage **page); HRESULT (STDMETHODCALLTYPE *CreateCanvas)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IXpsOMCanvas **canvas); HRESULT (STDMETHODCALLTYPE *CreateGlyphs)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IXpsOMFontResource *fontResource, IXpsOMGlyphs **glyphs); HRESULT (STDMETHODCALLTYPE *CreatePath)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IXpsOMPath **path); HRESULT (STDMETHODCALLTYPE *CreateGeometry)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IXpsOMGeometry **geometry); HRESULT (STDMETHODCALLTYPE *CreateGeometryFigure)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, const XPS_POINT *startPoint, IXpsOMGeometryFigure **figure); HRESULT (STDMETHODCALLTYPE *CreateMatrixTransform)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, const XPS_MATRIX *matrix, IXpsOMMatrixTransform **transform); HRESULT (STDMETHODCALLTYPE *CreateSolidColorBrush)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, const XPS_COLOR *color, IXpsOMColorProfileResource *colorProfile, IXpsOMSolidColorBrush **solidColorBrush); HRESULT (STDMETHODCALLTYPE *CreateColorProfileResource)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IStream *acquiredStream, IOpcPartUri *partUri, IXpsOMColorProfileResource **colorProfileResource); HRESULT (STDMETHODCALLTYPE *CreateImageBrush)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IXpsOMImageResource *image, const XPS_RECT *viewBox, const XPS_RECT *viewPort, IXpsOMImageBrush **imageBrush); HRESULT (STDMETHODCALLTYPE *CreateVisualBrush)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, const XPS_RECT *viewBox, const XPS_RECT *viewPort, IXpsOMVisualBrush **visualBrush); HRESULT (STDMETHODCALLTYPE *CreateImageResource)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IStream *acquiredStream, XPS_IMAGE_TYPE contentType, IOpcPartUri *partUri, IXpsOMImageResource **imageResource); HRESULT (STDMETHODCALLTYPE *CreatePrintTicketResource)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IStream *acquiredStream, IOpcPartUri *partUri, IXpsOMPrintTicketResource **printTicketResource); HRESULT (STDMETHODCALLTYPE *CreateFontResource)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IStream *acquiredStream, XPS_FONT_EMBEDDING fontEmbedding, IOpcPartUri *partUri, @@ -5616,14 +4641,14 @@ typedef struct IXpsOMObjectFactoryVtbl { IXpsOMFontResource **fontResource); HRESULT (STDMETHODCALLTYPE *CreateGradientStop)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, const XPS_COLOR *color, IXpsOMColorProfileResource *colorProfile, FLOAT offset, IXpsOMGradientStop **gradientStop); HRESULT (STDMETHODCALLTYPE *CreateLinearGradientBrush)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IXpsOMGradientStop *gradStop1, IXpsOMGradientStop *gradStop2, const XPS_POINT *startPoint, @@ -5631,7 +4656,7 @@ typedef struct IXpsOMObjectFactoryVtbl { IXpsOMLinearGradientBrush **linearGradientBrush); HRESULT (STDMETHODCALLTYPE *CreateRadialGradientBrush)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IXpsOMGradientStop *gradStop1, IXpsOMGradientStop *gradStop2, const XPS_POINT *centerPoint, @@ -5640,20 +4665,20 @@ typedef struct IXpsOMObjectFactoryVtbl { IXpsOMRadialGradientBrush **radialGradientBrush); HRESULT (STDMETHODCALLTYPE *CreateCoreProperties)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IOpcPartUri *partUri, IXpsOMCoreProperties **coreProperties); HRESULT (STDMETHODCALLTYPE *CreateDictionary)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IXpsOMDictionary **dictionary); HRESULT (STDMETHODCALLTYPE *CreatePartUriCollection)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, IXpsOMPartUriCollection **partUriCollection); HRESULT (STDMETHODCALLTYPE *CreatePackageWriterOnFile)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, LPCWSTR fileName, LPSECURITY_ATTRIBUTES securityAttributes, DWORD flagsAndAttributes, @@ -5667,7 +4692,7 @@ typedef struct IXpsOMObjectFactoryVtbl { IXpsOMPackageWriter **packageWriter); HRESULT (STDMETHODCALLTYPE *CreatePackageWriterOnStream)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, ISequentialStream *outputStream, WINBOOL optimizeMarkupSize, XPS_INTERLEAVING interleaving, @@ -5679,17 +4704,18 @@ typedef struct IXpsOMObjectFactoryVtbl { IXpsOMPackageWriter **packageWriter); HRESULT (STDMETHODCALLTYPE *CreatePartUri)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, LPCWSTR uri, IOpcPartUri **partUri); HRESULT (STDMETHODCALLTYPE *CreateReadOnlyStreamOnFile)( - IXpsOMObjectFactory* This, + IXpsOMObjectFactory *This, LPCWSTR filename, IStream **stream); END_INTERFACE } IXpsOMObjectFactoryVtbl; + interface IXpsOMObjectFactory { CONST_VTBL IXpsOMObjectFactoryVtbl* lpVtbl; }; @@ -5866,381 +4892,6 @@ static FORCEINLINE HRESULT IXpsOMObjectFactory_CreateReadOnlyStreamOnFile(IXpsOM #endif -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePackage_Proxy( - IXpsOMObjectFactory* This, - IXpsOMPackage **package); -void __RPC_STUB IXpsOMObjectFactory_CreatePackage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePackageFromFile_Proxy( - IXpsOMObjectFactory* This, - LPCWSTR filename, - WINBOOL reuseObjects, - IXpsOMPackage **package); -void __RPC_STUB IXpsOMObjectFactory_CreatePackageFromFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePackageFromStream_Proxy( - IXpsOMObjectFactory* This, - IStream *stream, - WINBOOL reuseObjects, - IXpsOMPackage **package); -void __RPC_STUB IXpsOMObjectFactory_CreatePackageFromStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateStoryFragmentsResource_Proxy( - IXpsOMObjectFactory* This, - IStream *acquiredStream, - IOpcPartUri *partUri, - IXpsOMStoryFragmentsResource **storyFragmentsResource); -void __RPC_STUB IXpsOMObjectFactory_CreateStoryFragmentsResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateDocumentStructureResource_Proxy( - IXpsOMObjectFactory* This, - IStream *acquiredStream, - IOpcPartUri *partUri, - IXpsOMDocumentStructureResource **documentStructureResource); -void __RPC_STUB IXpsOMObjectFactory_CreateDocumentStructureResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateSignatureBlockResource_Proxy( - IXpsOMObjectFactory* This, - IStream *acquiredStream, - IOpcPartUri *partUri, - IXpsOMSignatureBlockResource **signatureBlockResource); -void __RPC_STUB IXpsOMObjectFactory_CreateSignatureBlockResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateRemoteDictionaryResource_Proxy( - IXpsOMObjectFactory* This, - IXpsOMDictionary *dictionary, - IOpcPartUri *partUri, - IXpsOMRemoteDictionaryResource **remoteDictionaryResource); -void __RPC_STUB IXpsOMObjectFactory_CreateRemoteDictionaryResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateRemoteDictionaryResourceFromStream_Proxy( - IXpsOMObjectFactory* This, - IStream *dictionaryMarkupStream, - IOpcPartUri *dictionaryPartUri, - IXpsOMPartResources *resources, - IXpsOMRemoteDictionaryResource **dictionaryResource); -void __RPC_STUB IXpsOMObjectFactory_CreateRemoteDictionaryResourceFromStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePartResources_Proxy( - IXpsOMObjectFactory* This, - IXpsOMPartResources **partResources); -void __RPC_STUB IXpsOMObjectFactory_CreatePartResources_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateDocumentSequence_Proxy( - IXpsOMObjectFactory* This, - IOpcPartUri *partUri, - IXpsOMDocumentSequence **documentSequence); -void __RPC_STUB IXpsOMObjectFactory_CreateDocumentSequence_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateDocument_Proxy( - IXpsOMObjectFactory* This, - IOpcPartUri *partUri, - IXpsOMDocument **document); -void __RPC_STUB IXpsOMObjectFactory_CreateDocument_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePageReference_Proxy( - IXpsOMObjectFactory* This, - const XPS_SIZE *advisoryPageDimensions, - IXpsOMPageReference **pageReference); -void __RPC_STUB IXpsOMObjectFactory_CreatePageReference_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePage_Proxy( - IXpsOMObjectFactory* This, - const XPS_SIZE *pageDimensions, - LPCWSTR language, - IOpcPartUri *partUri, - IXpsOMPage **page); -void __RPC_STUB IXpsOMObjectFactory_CreatePage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePageFromStream_Proxy( - IXpsOMObjectFactory* This, - IStream *pageMarkupStream, - IOpcPartUri *partUri, - IXpsOMPartResources *resources, - WINBOOL reuseObjects, - IXpsOMPage **page); -void __RPC_STUB IXpsOMObjectFactory_CreatePageFromStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateCanvas_Proxy( - IXpsOMObjectFactory* This, - IXpsOMCanvas **canvas); -void __RPC_STUB IXpsOMObjectFactory_CreateCanvas_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateGlyphs_Proxy( - IXpsOMObjectFactory* This, - IXpsOMFontResource *fontResource, - IXpsOMGlyphs **glyphs); -void __RPC_STUB IXpsOMObjectFactory_CreateGlyphs_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePath_Proxy( - IXpsOMObjectFactory* This, - IXpsOMPath **path); -void __RPC_STUB IXpsOMObjectFactory_CreatePath_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateGeometry_Proxy( - IXpsOMObjectFactory* This, - IXpsOMGeometry **geometry); -void __RPC_STUB IXpsOMObjectFactory_CreateGeometry_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateGeometryFigure_Proxy( - IXpsOMObjectFactory* This, - const XPS_POINT *startPoint, - IXpsOMGeometryFigure **figure); -void __RPC_STUB IXpsOMObjectFactory_CreateGeometryFigure_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateMatrixTransform_Proxy( - IXpsOMObjectFactory* This, - const XPS_MATRIX *matrix, - IXpsOMMatrixTransform **transform); -void __RPC_STUB IXpsOMObjectFactory_CreateMatrixTransform_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateSolidColorBrush_Proxy( - IXpsOMObjectFactory* This, - const XPS_COLOR *color, - IXpsOMColorProfileResource *colorProfile, - IXpsOMSolidColorBrush **solidColorBrush); -void __RPC_STUB IXpsOMObjectFactory_CreateSolidColorBrush_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateColorProfileResource_Proxy( - IXpsOMObjectFactory* This, - IStream *acquiredStream, - IOpcPartUri *partUri, - IXpsOMColorProfileResource **colorProfileResource); -void __RPC_STUB IXpsOMObjectFactory_CreateColorProfileResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateImageBrush_Proxy( - IXpsOMObjectFactory* This, - IXpsOMImageResource *image, - const XPS_RECT *viewBox, - const XPS_RECT *viewPort, - IXpsOMImageBrush **imageBrush); -void __RPC_STUB IXpsOMObjectFactory_CreateImageBrush_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateVisualBrush_Proxy( - IXpsOMObjectFactory* This, - const XPS_RECT *viewBox, - const XPS_RECT *viewPort, - IXpsOMVisualBrush **visualBrush); -void __RPC_STUB IXpsOMObjectFactory_CreateVisualBrush_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateImageResource_Proxy( - IXpsOMObjectFactory* This, - IStream *acquiredStream, - XPS_IMAGE_TYPE contentType, - IOpcPartUri *partUri, - IXpsOMImageResource **imageResource); -void __RPC_STUB IXpsOMObjectFactory_CreateImageResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePrintTicketResource_Proxy( - IXpsOMObjectFactory* This, - IStream *acquiredStream, - IOpcPartUri *partUri, - IXpsOMPrintTicketResource **printTicketResource); -void __RPC_STUB IXpsOMObjectFactory_CreatePrintTicketResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateFontResource_Proxy( - IXpsOMObjectFactory* This, - IStream *acquiredStream, - XPS_FONT_EMBEDDING fontEmbedding, - IOpcPartUri *partUri, - WINBOOL isObfSourceStream, - IXpsOMFontResource **fontResource); -void __RPC_STUB IXpsOMObjectFactory_CreateFontResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateGradientStop_Proxy( - IXpsOMObjectFactory* This, - const XPS_COLOR *color, - IXpsOMColorProfileResource *colorProfile, - FLOAT offset, - IXpsOMGradientStop **gradientStop); -void __RPC_STUB IXpsOMObjectFactory_CreateGradientStop_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateLinearGradientBrush_Proxy( - IXpsOMObjectFactory* This, - IXpsOMGradientStop *gradStop1, - IXpsOMGradientStop *gradStop2, - const XPS_POINT *startPoint, - const XPS_POINT *endPoint, - IXpsOMLinearGradientBrush **linearGradientBrush); -void __RPC_STUB IXpsOMObjectFactory_CreateLinearGradientBrush_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateRadialGradientBrush_Proxy( - IXpsOMObjectFactory* This, - IXpsOMGradientStop *gradStop1, - IXpsOMGradientStop *gradStop2, - const XPS_POINT *centerPoint, - const XPS_POINT *gradientOrigin, - const XPS_SIZE *radiiSizes, - IXpsOMRadialGradientBrush **radialGradientBrush); -void __RPC_STUB IXpsOMObjectFactory_CreateRadialGradientBrush_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateCoreProperties_Proxy( - IXpsOMObjectFactory* This, - IOpcPartUri *partUri, - IXpsOMCoreProperties **coreProperties); -void __RPC_STUB IXpsOMObjectFactory_CreateCoreProperties_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateDictionary_Proxy( - IXpsOMObjectFactory* This, - IXpsOMDictionary **dictionary); -void __RPC_STUB IXpsOMObjectFactory_CreateDictionary_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePartUriCollection_Proxy( - IXpsOMObjectFactory* This, - IXpsOMPartUriCollection **partUriCollection); -void __RPC_STUB IXpsOMObjectFactory_CreatePartUriCollection_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePackageWriterOnFile_Proxy( - IXpsOMObjectFactory* This, - LPCWSTR fileName, - LPSECURITY_ATTRIBUTES securityAttributes, - DWORD flagsAndAttributes, - WINBOOL optimizeMarkupSize, - XPS_INTERLEAVING interleaving, - IOpcPartUri *documentSequencePartName, - IXpsOMCoreProperties *coreProperties, - IXpsOMImageResource *packageThumbnail, - IXpsOMPrintTicketResource *documentSequencePrintTicket, - IOpcPartUri *discardControlPartName, - IXpsOMPackageWriter **packageWriter); -void __RPC_STUB IXpsOMObjectFactory_CreatePackageWriterOnFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePackageWriterOnStream_Proxy( - IXpsOMObjectFactory* This, - ISequentialStream *outputStream, - WINBOOL optimizeMarkupSize, - XPS_INTERLEAVING interleaving, - IOpcPartUri *documentSequencePartName, - IXpsOMCoreProperties *coreProperties, - IXpsOMImageResource *packageThumbnail, - IXpsOMPrintTicketResource *documentSequencePrintTicket, - IOpcPartUri *discardControlPartName, - IXpsOMPackageWriter **packageWriter); -void __RPC_STUB IXpsOMObjectFactory_CreatePackageWriterOnStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePartUri_Proxy( - IXpsOMObjectFactory* This, - LPCWSTR uri, - IOpcPartUri **partUri); -void __RPC_STUB IXpsOMObjectFactory_CreatePartUri_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateReadOnlyStreamOnFile_Proxy( - IXpsOMObjectFactory* This, - LPCWSTR filename, - IStream **stream); -void __RPC_STUB IXpsOMObjectFactory_CreateReadOnlyStreamOnFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMObjectFactory_INTERFACE_DEFINED__ */ @@ -6272,28 +4923,29 @@ typedef struct IXpsOMNameCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMNameCollection* This, + IXpsOMNameCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMNameCollection* This); + IXpsOMNameCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMNameCollection* This); + IXpsOMNameCollection *This); /*** IXpsOMNameCollection methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IXpsOMNameCollection* This, + IXpsOMNameCollection *This, UINT32 *count); HRESULT (STDMETHODCALLTYPE *GetAt)( - IXpsOMNameCollection* This, + IXpsOMNameCollection *This, UINT32 index, LPWSTR *name); END_INTERFACE } IXpsOMNameCollectionVtbl; + interface IXpsOMNameCollection { CONST_VTBL IXpsOMNameCollectionVtbl* lpVtbl; }; @@ -6330,23 +4982,6 @@ static FORCEINLINE HRESULT IXpsOMNameCollection_GetAt(IXpsOMNameCollection* This #endif -HRESULT STDMETHODCALLTYPE IXpsOMNameCollection_GetCount_Proxy( - IXpsOMNameCollection* This, - UINT32 *count); -void __RPC_STUB IXpsOMNameCollection_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMNameCollection_GetAt_Proxy( - IXpsOMNameCollection* This, - UINT32 index, - LPWSTR *name); -void __RPC_STUB IXpsOMNameCollection_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMNameCollection_INTERFACE_DEFINED__ */ @@ -6392,46 +5027,47 @@ typedef struct IXpsOMPartUriCollectionVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMPartUriCollection* This, + IXpsOMPartUriCollection *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMPartUriCollection* This); + IXpsOMPartUriCollection *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMPartUriCollection* This); + IXpsOMPartUriCollection *This); /*** IXpsOMPartUriCollection methods ***/ HRESULT (STDMETHODCALLTYPE *GetCount)( - IXpsOMPartUriCollection* This, + IXpsOMPartUriCollection *This, UINT32 *count); HRESULT (STDMETHODCALLTYPE *GetAt)( - IXpsOMPartUriCollection* This, + IXpsOMPartUriCollection *This, UINT32 index, IOpcPartUri **partUri); HRESULT (STDMETHODCALLTYPE *InsertAt)( - IXpsOMPartUriCollection* This, + IXpsOMPartUriCollection *This, UINT32 index, IOpcPartUri *partUri); HRESULT (STDMETHODCALLTYPE *RemoveAt)( - IXpsOMPartUriCollection* This, + IXpsOMPartUriCollection *This, UINT32 index); HRESULT (STDMETHODCALLTYPE *SetAt)( - IXpsOMPartUriCollection* This, + IXpsOMPartUriCollection *This, UINT32 index, IOpcPartUri *partUri); HRESULT (STDMETHODCALLTYPE *Append)( - IXpsOMPartUriCollection* This, + IXpsOMPartUriCollection *This, IOpcPartUri *partUri); END_INTERFACE } IXpsOMPartUriCollectionVtbl; + interface IXpsOMPartUriCollection { CONST_VTBL IXpsOMPartUriCollectionVtbl* lpVtbl; }; @@ -6484,57 +5120,6 @@ static FORCEINLINE HRESULT IXpsOMPartUriCollection_Append(IXpsOMPartUriCollectio #endif -HRESULT STDMETHODCALLTYPE IXpsOMPartUriCollection_GetCount_Proxy( - IXpsOMPartUriCollection* This, - UINT32 *count); -void __RPC_STUB IXpsOMPartUriCollection_GetCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPartUriCollection_GetAt_Proxy( - IXpsOMPartUriCollection* This, - UINT32 index, - IOpcPartUri **partUri); -void __RPC_STUB IXpsOMPartUriCollection_GetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPartUriCollection_InsertAt_Proxy( - IXpsOMPartUriCollection* This, - UINT32 index, - IOpcPartUri *partUri); -void __RPC_STUB IXpsOMPartUriCollection_InsertAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPartUriCollection_RemoveAt_Proxy( - IXpsOMPartUriCollection* This, - UINT32 index); -void __RPC_STUB IXpsOMPartUriCollection_RemoveAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPartUriCollection_SetAt_Proxy( - IXpsOMPartUriCollection* This, - UINT32 index, - IOpcPartUri *partUri); -void __RPC_STUB IXpsOMPartUriCollection_SetAt_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPartUriCollection_Append_Proxy( - IXpsOMPartUriCollection* This, - IOpcPartUri *partUri); -void __RPC_STUB IXpsOMPartUriCollection_Append_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMPartUriCollection_INTERFACE_DEFINED__ */ @@ -6583,19 +5168,19 @@ typedef struct IXpsOMPackageWriterVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMPackageWriter* This, + IXpsOMPackageWriter *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMPackageWriter* This); + IXpsOMPackageWriter *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMPackageWriter* This); + IXpsOMPackageWriter *This); /*** IXpsOMPackageWriter methods ***/ HRESULT (STDMETHODCALLTYPE *StartNewDocument)( - IXpsOMPackageWriter* This, + IXpsOMPackageWriter *This, IOpcPartUri *documentPartName, IXpsOMPrintTicketResource *documentPrintTicket, IXpsOMDocumentStructureResource *documentStructure, @@ -6603,7 +5188,7 @@ typedef struct IXpsOMPackageWriterVtbl { IXpsOMPartUriCollection *restrictedFonts); HRESULT (STDMETHODCALLTYPE *AddPage)( - IXpsOMPackageWriter* This, + IXpsOMPackageWriter *This, IXpsOMPage *page, const XPS_SIZE *advisoryPageDimensions, IXpsOMPartUriCollection *discardableResourceParts, @@ -6612,18 +5197,19 @@ typedef struct IXpsOMPackageWriterVtbl { IXpsOMImageResource *pageThumbnail); HRESULT (STDMETHODCALLTYPE *AddResource)( - IXpsOMPackageWriter* This, + IXpsOMPackageWriter *This, IXpsOMResource *resource); HRESULT (STDMETHODCALLTYPE *Close)( - IXpsOMPackageWriter* This); + IXpsOMPackageWriter *This); HRESULT (STDMETHODCALLTYPE *IsClosed)( - IXpsOMPackageWriter* This, + IXpsOMPackageWriter *This, WINBOOL *isClosed); END_INTERFACE } IXpsOMPackageWriterVtbl; + interface IXpsOMPackageWriter { CONST_VTBL IXpsOMPackageWriterVtbl* lpVtbl; }; @@ -6672,54 +5258,6 @@ static FORCEINLINE HRESULT IXpsOMPackageWriter_IsClosed(IXpsOMPackageWriter* Thi #endif -HRESULT STDMETHODCALLTYPE IXpsOMPackageWriter_StartNewDocument_Proxy( - IXpsOMPackageWriter* This, - IOpcPartUri *documentPartName, - IXpsOMPrintTicketResource *documentPrintTicket, - IXpsOMDocumentStructureResource *documentStructure, - IXpsOMSignatureBlockResourceCollection *signatureBlockResources, - IXpsOMPartUriCollection *restrictedFonts); -void __RPC_STUB IXpsOMPackageWriter_StartNewDocument_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPackageWriter_AddPage_Proxy( - IXpsOMPackageWriter* This, - IXpsOMPage *page, - const XPS_SIZE *advisoryPageDimensions, - IXpsOMPartUriCollection *discardableResourceParts, - IXpsOMStoryFragmentsResource *storyFragments, - IXpsOMPrintTicketResource *pagePrintTicket, - IXpsOMImageResource *pageThumbnail); -void __RPC_STUB IXpsOMPackageWriter_AddPage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPackageWriter_AddResource_Proxy( - IXpsOMPackageWriter* This, - IXpsOMResource *resource); -void __RPC_STUB IXpsOMPackageWriter_AddResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPackageWriter_Close_Proxy( - IXpsOMPackageWriter* This); -void __RPC_STUB IXpsOMPackageWriter_Close_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPackageWriter_IsClosed_Proxy( - IXpsOMPackageWriter* This, - WINBOOL *isClosed); -void __RPC_STUB IXpsOMPackageWriter_IsClosed_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMPackageWriter_INTERFACE_DEFINED__ */ @@ -6750,19 +5288,19 @@ typedef struct IXpsOMPackageTargetVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMPackageTarget* This, + IXpsOMPackageTarget *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMPackageTarget* This); + IXpsOMPackageTarget *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMPackageTarget* This); + IXpsOMPackageTarget *This); /*** IXpsOMPackageTarget methods ***/ HRESULT (STDMETHODCALLTYPE *CreateXpsOMPackageWriter)( - IXpsOMPackageTarget* This, + IXpsOMPackageTarget *This, IOpcPartUri *documentSequencePartName, IXpsOMPrintTicketResource *documentSequencePrintTicket, IOpcPartUri *discardControlPartName, @@ -6770,6 +5308,7 @@ typedef struct IXpsOMPackageTargetVtbl { END_INTERFACE } IXpsOMPackageTargetVtbl; + interface IXpsOMPackageTarget { CONST_VTBL IXpsOMPackageTargetVtbl* lpVtbl; }; @@ -6802,17 +5341,6 @@ static FORCEINLINE HRESULT IXpsOMPackageTarget_CreateXpsOMPackageWriter(IXpsOMPa #endif -HRESULT STDMETHODCALLTYPE IXpsOMPackageTarget_CreateXpsOMPackageWriter_Proxy( - IXpsOMPackageTarget* This, - IOpcPartUri *documentSequencePartName, - IXpsOMPrintTicketResource *documentSequencePrintTicket, - IOpcPartUri *discardControlPartName, - IXpsOMPackageWriter **packageWriter); -void __RPC_STUB IXpsOMPackageTarget_CreateXpsOMPackageWriter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMPackageTarget_INTERFACE_DEFINED__ */ @@ -6912,128 +5440,129 @@ typedef struct IXpsOMVisualVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMVisual* This, + IXpsOMVisual *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMVisual* This); + IXpsOMVisual *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMVisual* This); + IXpsOMVisual *This); /*** IXpsOMShareable methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMVisual* This, + IXpsOMVisual *This, IUnknown **owner); HRESULT (STDMETHODCALLTYPE *GetType)( - IXpsOMVisual* This, + IXpsOMVisual *This, XPS_OBJECT_TYPE *type); /*** IXpsOMVisual methods ***/ HRESULT (STDMETHODCALLTYPE *GetTransform)( - IXpsOMVisual* This, + IXpsOMVisual *This, IXpsOMMatrixTransform **matrixTransform); HRESULT (STDMETHODCALLTYPE *GetTransformLocal)( - IXpsOMVisual* This, + IXpsOMVisual *This, IXpsOMMatrixTransform **matrixTransform); HRESULT (STDMETHODCALLTYPE *SetTransformLocal)( - IXpsOMVisual* This, + IXpsOMVisual *This, IXpsOMMatrixTransform *matrixTransform); HRESULT (STDMETHODCALLTYPE *GetTransformLookup)( - IXpsOMVisual* This, + IXpsOMVisual *This, LPWSTR *key); HRESULT (STDMETHODCALLTYPE *SetTransformLookup)( - IXpsOMVisual* This, + IXpsOMVisual *This, LPCWSTR key); HRESULT (STDMETHODCALLTYPE *GetClipGeometry)( - IXpsOMVisual* This, + IXpsOMVisual *This, IXpsOMGeometry **clipGeometry); HRESULT (STDMETHODCALLTYPE *GetClipGeometryLocal)( - IXpsOMVisual* This, + IXpsOMVisual *This, IXpsOMGeometry **clipGeometry); HRESULT (STDMETHODCALLTYPE *SetClipGeometryLocal)( - IXpsOMVisual* This, + IXpsOMVisual *This, IXpsOMGeometry *clipGeometry); HRESULT (STDMETHODCALLTYPE *GetClipGeometryLookup)( - IXpsOMVisual* This, + IXpsOMVisual *This, LPWSTR *key); HRESULT (STDMETHODCALLTYPE *SetClipGeometryLookup)( - IXpsOMVisual* This, + IXpsOMVisual *This, LPCWSTR key); HRESULT (STDMETHODCALLTYPE *GetOpacity)( - IXpsOMVisual* This, + IXpsOMVisual *This, FLOAT *opacity); HRESULT (STDMETHODCALLTYPE *SetOpacity)( - IXpsOMVisual* This, + IXpsOMVisual *This, FLOAT opacity); HRESULT (STDMETHODCALLTYPE *GetOpacityMaskBrush)( - IXpsOMVisual* This, + IXpsOMVisual *This, IXpsOMBrush **opacityMaskBrush); HRESULT (STDMETHODCALLTYPE *GetOpacityMaskBrushLocal)( - IXpsOMVisual* This, + IXpsOMVisual *This, IXpsOMBrush **opacityMaskBrush); HRESULT (STDMETHODCALLTYPE *SetOpacityMaskBrushLocal)( - IXpsOMVisual* This, + IXpsOMVisual *This, IXpsOMBrush *opacityMaskBrush); HRESULT (STDMETHODCALLTYPE *GetOpacityMaskBrushLookup)( - IXpsOMVisual* This, + IXpsOMVisual *This, LPWSTR *key); HRESULT (STDMETHODCALLTYPE *SetOpacityMaskBrushLookup)( - IXpsOMVisual* This, + IXpsOMVisual *This, LPCWSTR key); HRESULT (STDMETHODCALLTYPE *GetName)( - IXpsOMVisual* This, + IXpsOMVisual *This, LPWSTR *name); HRESULT (STDMETHODCALLTYPE *SetName)( - IXpsOMVisual* This, + IXpsOMVisual *This, LPCWSTR name); HRESULT (STDMETHODCALLTYPE *GetIsHyperlinkTarget)( - IXpsOMVisual* This, + IXpsOMVisual *This, WINBOOL *isHyperlink); HRESULT (STDMETHODCALLTYPE *SetIsHyperlinkTarget)( - IXpsOMVisual* This, + IXpsOMVisual *This, WINBOOL isHyperlink); HRESULT (STDMETHODCALLTYPE *GetHyperlinkNavigateUri)( - IXpsOMVisual* This, + IXpsOMVisual *This, IUri **hyperlinkUri); HRESULT (STDMETHODCALLTYPE *SetHyperlinkNavigateUri)( - IXpsOMVisual* This, + IXpsOMVisual *This, IUri *hyperlinkUri); HRESULT (STDMETHODCALLTYPE *GetLanguage)( - IXpsOMVisual* This, + IXpsOMVisual *This, LPWSTR *language); HRESULT (STDMETHODCALLTYPE *SetLanguage)( - IXpsOMVisual* This, + IXpsOMVisual *This, LPCWSTR language); END_INTERFACE } IXpsOMVisualVtbl; + interface IXpsOMVisual { CONST_VTBL IXpsOMVisualVtbl* lpVtbl; }; @@ -7172,206 +5701,6 @@ static FORCEINLINE HRESULT IXpsOMVisual_SetLanguage(IXpsOMVisual* This,LPCWSTR l #endif -HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetTransform_Proxy( - IXpsOMVisual* This, - IXpsOMMatrixTransform **matrixTransform); -void __RPC_STUB IXpsOMVisual_GetTransform_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetTransformLocal_Proxy( - IXpsOMVisual* This, - IXpsOMMatrixTransform **matrixTransform); -void __RPC_STUB IXpsOMVisual_GetTransformLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisual_SetTransformLocal_Proxy( - IXpsOMVisual* This, - IXpsOMMatrixTransform *matrixTransform); -void __RPC_STUB IXpsOMVisual_SetTransformLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetTransformLookup_Proxy( - IXpsOMVisual* This, - LPWSTR *key); -void __RPC_STUB IXpsOMVisual_GetTransformLookup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisual_SetTransformLookup_Proxy( - IXpsOMVisual* This, - LPCWSTR key); -void __RPC_STUB IXpsOMVisual_SetTransformLookup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetClipGeometry_Proxy( - IXpsOMVisual* This, - IXpsOMGeometry **clipGeometry); -void __RPC_STUB IXpsOMVisual_GetClipGeometry_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetClipGeometryLocal_Proxy( - IXpsOMVisual* This, - IXpsOMGeometry **clipGeometry); -void __RPC_STUB IXpsOMVisual_GetClipGeometryLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisual_SetClipGeometryLocal_Proxy( - IXpsOMVisual* This, - IXpsOMGeometry *clipGeometry); -void __RPC_STUB IXpsOMVisual_SetClipGeometryLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetClipGeometryLookup_Proxy( - IXpsOMVisual* This, - LPWSTR *key); -void __RPC_STUB IXpsOMVisual_GetClipGeometryLookup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisual_SetClipGeometryLookup_Proxy( - IXpsOMVisual* This, - LPCWSTR key); -void __RPC_STUB IXpsOMVisual_SetClipGeometryLookup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetOpacity_Proxy( - IXpsOMVisual* This, - FLOAT *opacity); -void __RPC_STUB IXpsOMVisual_GetOpacity_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisual_SetOpacity_Proxy( - IXpsOMVisual* This, - FLOAT opacity); -void __RPC_STUB IXpsOMVisual_SetOpacity_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetOpacityMaskBrush_Proxy( - IXpsOMVisual* This, - IXpsOMBrush **opacityMaskBrush); -void __RPC_STUB IXpsOMVisual_GetOpacityMaskBrush_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetOpacityMaskBrushLocal_Proxy( - IXpsOMVisual* This, - IXpsOMBrush **opacityMaskBrush); -void __RPC_STUB IXpsOMVisual_GetOpacityMaskBrushLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisual_SetOpacityMaskBrushLocal_Proxy( - IXpsOMVisual* This, - IXpsOMBrush *opacityMaskBrush); -void __RPC_STUB IXpsOMVisual_SetOpacityMaskBrushLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetOpacityMaskBrushLookup_Proxy( - IXpsOMVisual* This, - LPWSTR *key); -void __RPC_STUB IXpsOMVisual_GetOpacityMaskBrushLookup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisual_SetOpacityMaskBrushLookup_Proxy( - IXpsOMVisual* This, - LPCWSTR key); -void __RPC_STUB IXpsOMVisual_SetOpacityMaskBrushLookup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetName_Proxy( - IXpsOMVisual* This, - LPWSTR *name); -void __RPC_STUB IXpsOMVisual_GetName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisual_SetName_Proxy( - IXpsOMVisual* This, - LPCWSTR name); -void __RPC_STUB IXpsOMVisual_SetName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetIsHyperlinkTarget_Proxy( - IXpsOMVisual* This, - WINBOOL *isHyperlink); -void __RPC_STUB IXpsOMVisual_GetIsHyperlinkTarget_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisual_SetIsHyperlinkTarget_Proxy( - IXpsOMVisual* This, - WINBOOL isHyperlink); -void __RPC_STUB IXpsOMVisual_SetIsHyperlinkTarget_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetHyperlinkNavigateUri_Proxy( - IXpsOMVisual* This, - IUri **hyperlinkUri); -void __RPC_STUB IXpsOMVisual_GetHyperlinkNavigateUri_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisual_SetHyperlinkNavigateUri_Proxy( - IXpsOMVisual* This, - IUri *hyperlinkUri); -void __RPC_STUB IXpsOMVisual_SetHyperlinkNavigateUri_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetLanguage_Proxy( - IXpsOMVisual* This, - LPWSTR *language); -void __RPC_STUB IXpsOMVisual_GetLanguage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisual_SetLanguage_Proxy( - IXpsOMVisual* This, - LPCWSTR language); -void __RPC_STUB IXpsOMVisual_SetLanguage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMVisual_INTERFACE_DEFINED__ */ @@ -7402,36 +5731,37 @@ typedef struct IXpsOMBrushVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMBrush* This, + IXpsOMBrush *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMBrush* This); + IXpsOMBrush *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMBrush* This); + IXpsOMBrush *This); /*** IXpsOMShareable methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMBrush* This, + IXpsOMBrush *This, IUnknown **owner); HRESULT (STDMETHODCALLTYPE *GetType)( - IXpsOMBrush* This, + IXpsOMBrush *This, XPS_OBJECT_TYPE *type); /*** IXpsOMBrush methods ***/ HRESULT (STDMETHODCALLTYPE *GetOpacity)( - IXpsOMBrush* This, + IXpsOMBrush *This, FLOAT *opacity); HRESULT (STDMETHODCALLTYPE *SetOpacity)( - IXpsOMBrush* This, + IXpsOMBrush *This, FLOAT opacity); END_INTERFACE } IXpsOMBrushVtbl; + interface IXpsOMBrush { CONST_VTBL IXpsOMBrushVtbl* lpVtbl; }; @@ -7478,22 +5808,6 @@ static FORCEINLINE HRESULT IXpsOMBrush_SetOpacity(IXpsOMBrush* This,FLOAT opacit #endif -HRESULT STDMETHODCALLTYPE IXpsOMBrush_GetOpacity_Proxy( - IXpsOMBrush* This, - FLOAT *opacity); -void __RPC_STUB IXpsOMBrush_GetOpacity_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMBrush_SetOpacity_Proxy( - IXpsOMBrush* This, - FLOAT opacity); -void __RPC_STUB IXpsOMBrush_SetOpacity_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMBrush_INTERFACE_DEFINED__ */ @@ -7527,40 +5841,41 @@ typedef struct IXpsOMMatrixTransformVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMMatrixTransform* This, + IXpsOMMatrixTransform *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMMatrixTransform* This); + IXpsOMMatrixTransform *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMMatrixTransform* This); + IXpsOMMatrixTransform *This); /*** IXpsOMShareable methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMMatrixTransform* This, + IXpsOMMatrixTransform *This, IUnknown **owner); HRESULT (STDMETHODCALLTYPE *GetType)( - IXpsOMMatrixTransform* This, + IXpsOMMatrixTransform *This, XPS_OBJECT_TYPE *type); /*** IXpsOMMatrixTransform methods ***/ HRESULT (STDMETHODCALLTYPE *GetMatrix)( - IXpsOMMatrixTransform* This, + IXpsOMMatrixTransform *This, XPS_MATRIX *matrix); HRESULT (STDMETHODCALLTYPE *SetMatrix)( - IXpsOMMatrixTransform* This, + IXpsOMMatrixTransform *This, const XPS_MATRIX *matrix); HRESULT (STDMETHODCALLTYPE *Clone)( - IXpsOMMatrixTransform* This, + IXpsOMMatrixTransform *This, IXpsOMMatrixTransform **matrixTransform); END_INTERFACE } IXpsOMMatrixTransformVtbl; + interface IXpsOMMatrixTransform { CONST_VTBL IXpsOMMatrixTransformVtbl* lpVtbl; }; @@ -7611,30 +5926,6 @@ static FORCEINLINE HRESULT IXpsOMMatrixTransform_Clone(IXpsOMMatrixTransform* Th #endif -HRESULT STDMETHODCALLTYPE IXpsOMMatrixTransform_GetMatrix_Proxy( - IXpsOMMatrixTransform* This, - XPS_MATRIX *matrix); -void __RPC_STUB IXpsOMMatrixTransform_GetMatrix_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMMatrixTransform_SetMatrix_Proxy( - IXpsOMMatrixTransform* This, - const XPS_MATRIX *matrix); -void __RPC_STUB IXpsOMMatrixTransform_SetMatrix_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMMatrixTransform_Clone_Proxy( - IXpsOMMatrixTransform* This, - IXpsOMMatrixTransform **matrixTransform); -void __RPC_STUB IXpsOMMatrixTransform_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMMatrixTransform_INTERFACE_DEFINED__ */ @@ -7686,64 +5977,65 @@ typedef struct IXpsOMGeometryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMGeometry* This, + IXpsOMGeometry *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMGeometry* This); + IXpsOMGeometry *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMGeometry* This); + IXpsOMGeometry *This); /*** IXpsOMShareable methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMGeometry* This, + IXpsOMGeometry *This, IUnknown **owner); HRESULT (STDMETHODCALLTYPE *GetType)( - IXpsOMGeometry* This, + IXpsOMGeometry *This, XPS_OBJECT_TYPE *type); /*** IXpsOMGeometry methods ***/ HRESULT (STDMETHODCALLTYPE *GetFigures)( - IXpsOMGeometry* This, + IXpsOMGeometry *This, IXpsOMGeometryFigureCollection **figures); HRESULT (STDMETHODCALLTYPE *GetFillRule)( - IXpsOMGeometry* This, + IXpsOMGeometry *This, XPS_FILL_RULE *fillRule); HRESULT (STDMETHODCALLTYPE *SetFillRule)( - IXpsOMGeometry* This, + IXpsOMGeometry *This, XPS_FILL_RULE fillRule); HRESULT (STDMETHODCALLTYPE *GetTransform)( - IXpsOMGeometry* This, + IXpsOMGeometry *This, IXpsOMMatrixTransform **transform); HRESULT (STDMETHODCALLTYPE *GetTransformLocal)( - IXpsOMGeometry* This, + IXpsOMGeometry *This, IXpsOMMatrixTransform **transform); HRESULT (STDMETHODCALLTYPE *SetTransformLocal)( - IXpsOMGeometry* This, + IXpsOMGeometry *This, IXpsOMMatrixTransform *transform); HRESULT (STDMETHODCALLTYPE *GetTransformLookup)( - IXpsOMGeometry* This, + IXpsOMGeometry *This, LPWSTR *lookup); HRESULT (STDMETHODCALLTYPE *SetTransformLookup)( - IXpsOMGeometry* This, + IXpsOMGeometry *This, LPCWSTR lookup); HRESULT (STDMETHODCALLTYPE *Clone)( - IXpsOMGeometry* This, + IXpsOMGeometry *This, IXpsOMGeometry **geometry); END_INTERFACE } IXpsOMGeometryVtbl; + interface IXpsOMGeometry { CONST_VTBL IXpsOMGeometryVtbl* lpVtbl; }; @@ -7818,78 +6110,6 @@ static FORCEINLINE HRESULT IXpsOMGeometry_Clone(IXpsOMGeometry* This,IXpsOMGeome #endif -HRESULT STDMETHODCALLTYPE IXpsOMGeometry_GetFigures_Proxy( - IXpsOMGeometry* This, - IXpsOMGeometryFigureCollection **figures); -void __RPC_STUB IXpsOMGeometry_GetFigures_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometry_GetFillRule_Proxy( - IXpsOMGeometry* This, - XPS_FILL_RULE *fillRule); -void __RPC_STUB IXpsOMGeometry_GetFillRule_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometry_SetFillRule_Proxy( - IXpsOMGeometry* This, - XPS_FILL_RULE fillRule); -void __RPC_STUB IXpsOMGeometry_SetFillRule_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometry_GetTransform_Proxy( - IXpsOMGeometry* This, - IXpsOMMatrixTransform **transform); -void __RPC_STUB IXpsOMGeometry_GetTransform_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometry_GetTransformLocal_Proxy( - IXpsOMGeometry* This, - IXpsOMMatrixTransform **transform); -void __RPC_STUB IXpsOMGeometry_GetTransformLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometry_SetTransformLocal_Proxy( - IXpsOMGeometry* This, - IXpsOMMatrixTransform *transform); -void __RPC_STUB IXpsOMGeometry_SetTransformLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometry_GetTransformLookup_Proxy( - IXpsOMGeometry* This, - LPWSTR *lookup); -void __RPC_STUB IXpsOMGeometry_GetTransformLookup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometry_SetTransformLookup_Proxy( - IXpsOMGeometry* This, - LPCWSTR lookup); -void __RPC_STUB IXpsOMGeometry_SetTransformLookup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGeometry_Clone_Proxy( - IXpsOMGeometry* This, - IXpsOMGeometry **geometry); -void __RPC_STUB IXpsOMGeometry_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMGeometry_INTERFACE_DEFINED__ */ @@ -7998,240 +6218,241 @@ typedef struct IXpsOMGlyphsVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMGlyphs* This); + IXpsOMGlyphs *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMGlyphs* This); + IXpsOMGlyphs *This); /*** IXpsOMShareable methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, IUnknown **owner); HRESULT (STDMETHODCALLTYPE *GetType)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, XPS_OBJECT_TYPE *type); /*** IXpsOMVisual methods ***/ HRESULT (STDMETHODCALLTYPE *GetTransform)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, IXpsOMMatrixTransform **matrixTransform); HRESULT (STDMETHODCALLTYPE *GetTransformLocal)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, IXpsOMMatrixTransform **matrixTransform); HRESULT (STDMETHODCALLTYPE *SetTransformLocal)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, IXpsOMMatrixTransform *matrixTransform); HRESULT (STDMETHODCALLTYPE *GetTransformLookup)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, LPWSTR *key); HRESULT (STDMETHODCALLTYPE *SetTransformLookup)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, LPCWSTR key); HRESULT (STDMETHODCALLTYPE *GetClipGeometry)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, IXpsOMGeometry **clipGeometry); HRESULT (STDMETHODCALLTYPE *GetClipGeometryLocal)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, IXpsOMGeometry **clipGeometry); HRESULT (STDMETHODCALLTYPE *SetClipGeometryLocal)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, IXpsOMGeometry *clipGeometry); HRESULT (STDMETHODCALLTYPE *GetClipGeometryLookup)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, LPWSTR *key); HRESULT (STDMETHODCALLTYPE *SetClipGeometryLookup)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, LPCWSTR key); HRESULT (STDMETHODCALLTYPE *GetOpacity)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, FLOAT *opacity); HRESULT (STDMETHODCALLTYPE *SetOpacity)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, FLOAT opacity); HRESULT (STDMETHODCALLTYPE *GetOpacityMaskBrush)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, IXpsOMBrush **opacityMaskBrush); HRESULT (STDMETHODCALLTYPE *GetOpacityMaskBrushLocal)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, IXpsOMBrush **opacityMaskBrush); HRESULT (STDMETHODCALLTYPE *SetOpacityMaskBrushLocal)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, IXpsOMBrush *opacityMaskBrush); HRESULT (STDMETHODCALLTYPE *GetOpacityMaskBrushLookup)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, LPWSTR *key); HRESULT (STDMETHODCALLTYPE *SetOpacityMaskBrushLookup)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, LPCWSTR key); HRESULT (STDMETHODCALLTYPE *GetName)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, LPWSTR *name); HRESULT (STDMETHODCALLTYPE *SetName)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, LPCWSTR name); HRESULT (STDMETHODCALLTYPE *GetIsHyperlinkTarget)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, WINBOOL *isHyperlink); HRESULT (STDMETHODCALLTYPE *SetIsHyperlinkTarget)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, WINBOOL isHyperlink); HRESULT (STDMETHODCALLTYPE *GetHyperlinkNavigateUri)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, IUri **hyperlinkUri); HRESULT (STDMETHODCALLTYPE *SetHyperlinkNavigateUri)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, IUri *hyperlinkUri); HRESULT (STDMETHODCALLTYPE *GetLanguage)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, LPWSTR *language); HRESULT (STDMETHODCALLTYPE *SetLanguage)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, LPCWSTR language); /*** IXpsOMGlyphs methods ***/ HRESULT (STDMETHODCALLTYPE *GetUnicodeString)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, LPWSTR *unicodeString); HRESULT (STDMETHODCALLTYPE *GetGlyphIndexCount)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, UINT32 *indexCount); HRESULT (STDMETHODCALLTYPE *GetGlyphIndices)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, UINT32 *indexCount, XPS_GLYPH_INDEX *glyphIndices); HRESULT (STDMETHODCALLTYPE *GetGlyphMappingCount)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, UINT32 *glyphMappingCount); HRESULT (STDMETHODCALLTYPE *GetGlyphMappings)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, UINT32 *glyphMappingCount, XPS_GLYPH_MAPPING *glyphMappings); HRESULT (STDMETHODCALLTYPE *GetProhibitedCaretStopCount)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, UINT32 *prohibitedCaretStopCount); HRESULT (STDMETHODCALLTYPE *GetProhibitedCaretStops)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, UINT32 *prohibitedCaretStopCount, UINT32 *prohibitedCaretStops); HRESULT (STDMETHODCALLTYPE *GetBidiLevel)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, UINT32 *bidiLevel); HRESULT (STDMETHODCALLTYPE *GetIsSideways)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, WINBOOL *isSideways); HRESULT (STDMETHODCALLTYPE *GetDeviceFontName)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, LPWSTR *deviceFontName); HRESULT (STDMETHODCALLTYPE *GetStyleSimulations)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, XPS_STYLE_SIMULATION *styleSimulations); HRESULT (STDMETHODCALLTYPE *SetStyleSimulations)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, XPS_STYLE_SIMULATION styleSimulations); HRESULT (STDMETHODCALLTYPE *GetOrigin)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, XPS_POINT *origin); HRESULT (STDMETHODCALLTYPE *SetOrigin)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, const XPS_POINT *origin); HRESULT (STDMETHODCALLTYPE *GetFontRenderingEmSize)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, FLOAT *fontRenderingEmSize); HRESULT (STDMETHODCALLTYPE *SetFontRenderingEmSize)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, FLOAT fontRenderingEmSize); HRESULT (STDMETHODCALLTYPE *GetFontResource)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, IXpsOMFontResource **fontResource); HRESULT (STDMETHODCALLTYPE *SetFontResource)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, IXpsOMFontResource *fontResource); HRESULT (STDMETHODCALLTYPE *GetFontFaceIndex)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, SHORT *fontFaceIndex); HRESULT (STDMETHODCALLTYPE *SetFontFaceIndex)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, SHORT fontFaceIndex); HRESULT (STDMETHODCALLTYPE *GetFillBrush)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, IXpsOMBrush **fillBrush); HRESULT (STDMETHODCALLTYPE *GetFillBrushLocal)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, IXpsOMBrush **fillBrush); HRESULT (STDMETHODCALLTYPE *SetFillBrushLocal)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, IXpsOMBrush *fillBrush); HRESULT (STDMETHODCALLTYPE *GetFillBrushLookup)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, LPWSTR *key); HRESULT (STDMETHODCALLTYPE *SetFillBrushLookup)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, LPCWSTR key); HRESULT (STDMETHODCALLTYPE *GetGlyphsEditor)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, IXpsOMGlyphsEditor **editor); HRESULT (STDMETHODCALLTYPE *Clone)( - IXpsOMGlyphs* This, + IXpsOMGlyphs *This, IXpsOMGlyphs **glyphs); END_INTERFACE } IXpsOMGlyphsVtbl; + interface IXpsOMGlyphs { CONST_VTBL IXpsOMGlyphsVtbl* lpVtbl; }; @@ -8480,225 +6701,6 @@ static FORCEINLINE HRESULT IXpsOMGlyphs_Clone(IXpsOMGlyphs* This,IXpsOMGlyphs ** #endif -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetUnicodeString_Proxy( - IXpsOMGlyphs* This, - LPWSTR *unicodeString); -void __RPC_STUB IXpsOMGlyphs_GetUnicodeString_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetGlyphIndexCount_Proxy( - IXpsOMGlyphs* This, - UINT32 *indexCount); -void __RPC_STUB IXpsOMGlyphs_GetGlyphIndexCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetGlyphIndices_Proxy( - IXpsOMGlyphs* This, - UINT32 *indexCount, - XPS_GLYPH_INDEX *glyphIndices); -void __RPC_STUB IXpsOMGlyphs_GetGlyphIndices_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetGlyphMappingCount_Proxy( - IXpsOMGlyphs* This, - UINT32 *glyphMappingCount); -void __RPC_STUB IXpsOMGlyphs_GetGlyphMappingCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetGlyphMappings_Proxy( - IXpsOMGlyphs* This, - UINT32 *glyphMappingCount, - XPS_GLYPH_MAPPING *glyphMappings); -void __RPC_STUB IXpsOMGlyphs_GetGlyphMappings_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetProhibitedCaretStopCount_Proxy( - IXpsOMGlyphs* This, - UINT32 *prohibitedCaretStopCount); -void __RPC_STUB IXpsOMGlyphs_GetProhibitedCaretStopCount_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetProhibitedCaretStops_Proxy( - IXpsOMGlyphs* This, - UINT32 *prohibitedCaretStopCount, - UINT32 *prohibitedCaretStops); -void __RPC_STUB IXpsOMGlyphs_GetProhibitedCaretStops_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetBidiLevel_Proxy( - IXpsOMGlyphs* This, - UINT32 *bidiLevel); -void __RPC_STUB IXpsOMGlyphs_GetBidiLevel_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetIsSideways_Proxy( - IXpsOMGlyphs* This, - WINBOOL *isSideways); -void __RPC_STUB IXpsOMGlyphs_GetIsSideways_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetDeviceFontName_Proxy( - IXpsOMGlyphs* This, - LPWSTR *deviceFontName); -void __RPC_STUB IXpsOMGlyphs_GetDeviceFontName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetStyleSimulations_Proxy( - IXpsOMGlyphs* This, - XPS_STYLE_SIMULATION *styleSimulations); -void __RPC_STUB IXpsOMGlyphs_GetStyleSimulations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_SetStyleSimulations_Proxy( - IXpsOMGlyphs* This, - XPS_STYLE_SIMULATION styleSimulations); -void __RPC_STUB IXpsOMGlyphs_SetStyleSimulations_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetOrigin_Proxy( - IXpsOMGlyphs* This, - XPS_POINT *origin); -void __RPC_STUB IXpsOMGlyphs_GetOrigin_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_SetOrigin_Proxy( - IXpsOMGlyphs* This, - const XPS_POINT *origin); -void __RPC_STUB IXpsOMGlyphs_SetOrigin_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetFontRenderingEmSize_Proxy( - IXpsOMGlyphs* This, - FLOAT *fontRenderingEmSize); -void __RPC_STUB IXpsOMGlyphs_GetFontRenderingEmSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_SetFontRenderingEmSize_Proxy( - IXpsOMGlyphs* This, - FLOAT fontRenderingEmSize); -void __RPC_STUB IXpsOMGlyphs_SetFontRenderingEmSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetFontResource_Proxy( - IXpsOMGlyphs* This, - IXpsOMFontResource **fontResource); -void __RPC_STUB IXpsOMGlyphs_GetFontResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_SetFontResource_Proxy( - IXpsOMGlyphs* This, - IXpsOMFontResource *fontResource); -void __RPC_STUB IXpsOMGlyphs_SetFontResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetFontFaceIndex_Proxy( - IXpsOMGlyphs* This, - SHORT *fontFaceIndex); -void __RPC_STUB IXpsOMGlyphs_GetFontFaceIndex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_SetFontFaceIndex_Proxy( - IXpsOMGlyphs* This, - SHORT fontFaceIndex); -void __RPC_STUB IXpsOMGlyphs_SetFontFaceIndex_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetFillBrush_Proxy( - IXpsOMGlyphs* This, - IXpsOMBrush **fillBrush); -void __RPC_STUB IXpsOMGlyphs_GetFillBrush_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetFillBrushLocal_Proxy( - IXpsOMGlyphs* This, - IXpsOMBrush **fillBrush); -void __RPC_STUB IXpsOMGlyphs_GetFillBrushLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_SetFillBrushLocal_Proxy( - IXpsOMGlyphs* This, - IXpsOMBrush *fillBrush); -void __RPC_STUB IXpsOMGlyphs_SetFillBrushLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetFillBrushLookup_Proxy( - IXpsOMGlyphs* This, - LPWSTR *key); -void __RPC_STUB IXpsOMGlyphs_GetFillBrushLookup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_SetFillBrushLookup_Proxy( - IXpsOMGlyphs* This, - LPCWSTR key); -void __RPC_STUB IXpsOMGlyphs_SetFillBrushLookup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetGlyphsEditor_Proxy( - IXpsOMGlyphs* This, - IXpsOMGlyphsEditor **editor); -void __RPC_STUB IXpsOMGlyphs_GetGlyphsEditor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_Clone_Proxy( - IXpsOMGlyphs* This, - IXpsOMGlyphs **glyphs); -void __RPC_STUB IXpsOMGlyphs_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMGlyphs_INTERFACE_DEFINED__ */ @@ -8834,277 +6836,278 @@ typedef struct IXpsOMPathVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMPath* This, + IXpsOMPath *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMPath* This); + IXpsOMPath *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMPath* This); + IXpsOMPath *This); /*** IXpsOMShareable methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMPath* This, + IXpsOMPath *This, IUnknown **owner); HRESULT (STDMETHODCALLTYPE *GetType)( - IXpsOMPath* This, + IXpsOMPath *This, XPS_OBJECT_TYPE *type); /*** IXpsOMVisual methods ***/ HRESULT (STDMETHODCALLTYPE *GetTransform)( - IXpsOMPath* This, + IXpsOMPath *This, IXpsOMMatrixTransform **matrixTransform); HRESULT (STDMETHODCALLTYPE *GetTransformLocal)( - IXpsOMPath* This, + IXpsOMPath *This, IXpsOMMatrixTransform **matrixTransform); HRESULT (STDMETHODCALLTYPE *SetTransformLocal)( - IXpsOMPath* This, + IXpsOMPath *This, IXpsOMMatrixTransform *matrixTransform); HRESULT (STDMETHODCALLTYPE *GetTransformLookup)( - IXpsOMPath* This, + IXpsOMPath *This, LPWSTR *key); HRESULT (STDMETHODCALLTYPE *SetTransformLookup)( - IXpsOMPath* This, + IXpsOMPath *This, LPCWSTR key); HRESULT (STDMETHODCALLTYPE *GetClipGeometry)( - IXpsOMPath* This, + IXpsOMPath *This, IXpsOMGeometry **clipGeometry); HRESULT (STDMETHODCALLTYPE *GetClipGeometryLocal)( - IXpsOMPath* This, + IXpsOMPath *This, IXpsOMGeometry **clipGeometry); HRESULT (STDMETHODCALLTYPE *SetClipGeometryLocal)( - IXpsOMPath* This, + IXpsOMPath *This, IXpsOMGeometry *clipGeometry); HRESULT (STDMETHODCALLTYPE *GetClipGeometryLookup)( - IXpsOMPath* This, + IXpsOMPath *This, LPWSTR *key); HRESULT (STDMETHODCALLTYPE *SetClipGeometryLookup)( - IXpsOMPath* This, + IXpsOMPath *This, LPCWSTR key); HRESULT (STDMETHODCALLTYPE *GetOpacity)( - IXpsOMPath* This, + IXpsOMPath *This, FLOAT *opacity); HRESULT (STDMETHODCALLTYPE *SetOpacity)( - IXpsOMPath* This, + IXpsOMPath *This, FLOAT opacity); HRESULT (STDMETHODCALLTYPE *GetOpacityMaskBrush)( - IXpsOMPath* This, + IXpsOMPath *This, IXpsOMBrush **opacityMaskBrush); HRESULT (STDMETHODCALLTYPE *GetOpacityMaskBrushLocal)( - IXpsOMPath* This, + IXpsOMPath *This, IXpsOMBrush **opacityMaskBrush); HRESULT (STDMETHODCALLTYPE *SetOpacityMaskBrushLocal)( - IXpsOMPath* This, + IXpsOMPath *This, IXpsOMBrush *opacityMaskBrush); HRESULT (STDMETHODCALLTYPE *GetOpacityMaskBrushLookup)( - IXpsOMPath* This, + IXpsOMPath *This, LPWSTR *key); HRESULT (STDMETHODCALLTYPE *SetOpacityMaskBrushLookup)( - IXpsOMPath* This, + IXpsOMPath *This, LPCWSTR key); HRESULT (STDMETHODCALLTYPE *GetName)( - IXpsOMPath* This, + IXpsOMPath *This, LPWSTR *name); HRESULT (STDMETHODCALLTYPE *SetName)( - IXpsOMPath* This, + IXpsOMPath *This, LPCWSTR name); HRESULT (STDMETHODCALLTYPE *GetIsHyperlinkTarget)( - IXpsOMPath* This, + IXpsOMPath *This, WINBOOL *isHyperlink); HRESULT (STDMETHODCALLTYPE *SetIsHyperlinkTarget)( - IXpsOMPath* This, + IXpsOMPath *This, WINBOOL isHyperlink); HRESULT (STDMETHODCALLTYPE *GetHyperlinkNavigateUri)( - IXpsOMPath* This, + IXpsOMPath *This, IUri **hyperlinkUri); HRESULT (STDMETHODCALLTYPE *SetHyperlinkNavigateUri)( - IXpsOMPath* This, + IXpsOMPath *This, IUri *hyperlinkUri); HRESULT (STDMETHODCALLTYPE *GetLanguage)( - IXpsOMPath* This, + IXpsOMPath *This, LPWSTR *language); HRESULT (STDMETHODCALLTYPE *SetLanguage)( - IXpsOMPath* This, + IXpsOMPath *This, LPCWSTR language); /*** IXpsOMPath methods ***/ HRESULT (STDMETHODCALLTYPE *GetGeometry)( - IXpsOMPath* This, + IXpsOMPath *This, IXpsOMGeometry **geometry); HRESULT (STDMETHODCALLTYPE *GetGeometryLocal)( - IXpsOMPath* This, + IXpsOMPath *This, IXpsOMGeometry **geometry); HRESULT (STDMETHODCALLTYPE *SetGeometryLocal)( - IXpsOMPath* This, + IXpsOMPath *This, IXpsOMGeometry *geometry); HRESULT (STDMETHODCALLTYPE *GetGeometryLookup)( - IXpsOMPath* This, + IXpsOMPath *This, LPWSTR *lookup); HRESULT (STDMETHODCALLTYPE *SetGeometryLookup)( - IXpsOMPath* This, + IXpsOMPath *This, LPCWSTR lookup); HRESULT (STDMETHODCALLTYPE *GetAccessibilityShortDescription)( - IXpsOMPath* This, + IXpsOMPath *This, LPWSTR *shortDescription); HRESULT (STDMETHODCALLTYPE *SetAccessibilityShortDescription)( - IXpsOMPath* This, + IXpsOMPath *This, LPCWSTR shortDescription); HRESULT (STDMETHODCALLTYPE *GetAccessibilityLongDescription)( - IXpsOMPath* This, + IXpsOMPath *This, LPWSTR *longDescription); HRESULT (STDMETHODCALLTYPE *SetAccessibilityLongDescription)( - IXpsOMPath* This, + IXpsOMPath *This, LPCWSTR longDescription); HRESULT (STDMETHODCALLTYPE *GetSnapsToPixels)( - IXpsOMPath* This, + IXpsOMPath *This, WINBOOL *snapsToPixels); HRESULT (STDMETHODCALLTYPE *SetSnapsToPixels)( - IXpsOMPath* This, + IXpsOMPath *This, WINBOOL snapsToPixels); HRESULT (STDMETHODCALLTYPE *GetStrokeBrush)( - IXpsOMPath* This, + IXpsOMPath *This, IXpsOMBrush **brush); HRESULT (STDMETHODCALLTYPE *GetStrokeBrushLocal)( - IXpsOMPath* This, + IXpsOMPath *This, IXpsOMBrush **brush); HRESULT (STDMETHODCALLTYPE *SetStrokeBrushLocal)( - IXpsOMPath* This, + IXpsOMPath *This, IXpsOMBrush *brush); HRESULT (STDMETHODCALLTYPE *GetStrokeBrushLookup)( - IXpsOMPath* This, + IXpsOMPath *This, LPWSTR *lookup); HRESULT (STDMETHODCALLTYPE *SetStrokeBrushLookup)( - IXpsOMPath* This, + IXpsOMPath *This, LPCWSTR lookup); HRESULT (STDMETHODCALLTYPE *GetStrokeDashes)( - IXpsOMPath* This, + IXpsOMPath *This, IXpsOMDashCollection **strokeDashes); HRESULT (STDMETHODCALLTYPE *GetStrokeDashCap)( - IXpsOMPath* This, + IXpsOMPath *This, XPS_DASH_CAP *strokeDashCap); HRESULT (STDMETHODCALLTYPE *SetStrokeDashCap)( - IXpsOMPath* This, + IXpsOMPath *This, XPS_DASH_CAP strokeDashCap); HRESULT (STDMETHODCALLTYPE *GetStrokeDashOffset)( - IXpsOMPath* This, + IXpsOMPath *This, FLOAT *strokeDashOffset); HRESULT (STDMETHODCALLTYPE *SetStrokeDashOffset)( - IXpsOMPath* This, + IXpsOMPath *This, FLOAT strokeDashOffset); HRESULT (STDMETHODCALLTYPE *GetStrokeStartLineCap)( - IXpsOMPath* This, + IXpsOMPath *This, XPS_LINE_CAP *strokeStartLineCap); HRESULT (STDMETHODCALLTYPE *SetStrokeStartLineCap)( - IXpsOMPath* This, + IXpsOMPath *This, XPS_LINE_CAP strokeStartLineCap); HRESULT (STDMETHODCALLTYPE *GetStrokeEndLineCap)( - IXpsOMPath* This, + IXpsOMPath *This, XPS_LINE_CAP *strokeEndLineCap); HRESULT (STDMETHODCALLTYPE *SetStrokeEndLineCap)( - IXpsOMPath* This, + IXpsOMPath *This, XPS_LINE_CAP strokeEndLineCap); HRESULT (STDMETHODCALLTYPE *GetStrokeLineJoin)( - IXpsOMPath* This, + IXpsOMPath *This, XPS_LINE_JOIN *strokeLineJoin); HRESULT (STDMETHODCALLTYPE *SetStrokeLineJoin)( - IXpsOMPath* This, + IXpsOMPath *This, XPS_LINE_JOIN strokeLineJoin); HRESULT (STDMETHODCALLTYPE *GetStrokeMiterLimit)( - IXpsOMPath* This, + IXpsOMPath *This, FLOAT *strokeMiterLimit); HRESULT (STDMETHODCALLTYPE *SetStrokeMiterLimit)( - IXpsOMPath* This, + IXpsOMPath *This, FLOAT strokeMiterLimit); HRESULT (STDMETHODCALLTYPE *GetStrokeThickness)( - IXpsOMPath* This, + IXpsOMPath *This, FLOAT *strokeThickness); HRESULT (STDMETHODCALLTYPE *SetStrokeThickness)( - IXpsOMPath* This, + IXpsOMPath *This, FLOAT strokeThickness); HRESULT (STDMETHODCALLTYPE *GetFillBrush)( - IXpsOMPath* This, + IXpsOMPath *This, IXpsOMBrush **brush); HRESULT (STDMETHODCALLTYPE *GetFillBrushLocal)( - IXpsOMPath* This, + IXpsOMPath *This, IXpsOMBrush **brush); HRESULT (STDMETHODCALLTYPE *SetFillBrushLocal)( - IXpsOMPath* This, + IXpsOMPath *This, IXpsOMBrush *brush); HRESULT (STDMETHODCALLTYPE *GetFillBrushLookup)( - IXpsOMPath* This, + IXpsOMPath *This, LPWSTR *lookup); HRESULT (STDMETHODCALLTYPE *SetFillBrushLookup)( - IXpsOMPath* This, + IXpsOMPath *This, LPCWSTR lookup); HRESULT (STDMETHODCALLTYPE *Clone)( - IXpsOMPath* This, + IXpsOMPath *This, IXpsOMPath **path); END_INTERFACE } IXpsOMPathVtbl; + interface IXpsOMPath { CONST_VTBL IXpsOMPathVtbl* lpVtbl; }; @@ -9393,302 +7396,6 @@ static FORCEINLINE HRESULT IXpsOMPath_Clone(IXpsOMPath* This,IXpsOMPath **path) #endif -HRESULT STDMETHODCALLTYPE IXpsOMPath_GetGeometry_Proxy( - IXpsOMPath* This, - IXpsOMGeometry **geometry); -void __RPC_STUB IXpsOMPath_GetGeometry_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_GetGeometryLocal_Proxy( - IXpsOMPath* This, - IXpsOMGeometry **geometry); -void __RPC_STUB IXpsOMPath_GetGeometryLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_SetGeometryLocal_Proxy( - IXpsOMPath* This, - IXpsOMGeometry *geometry); -void __RPC_STUB IXpsOMPath_SetGeometryLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_GetGeometryLookup_Proxy( - IXpsOMPath* This, - LPWSTR *lookup); -void __RPC_STUB IXpsOMPath_GetGeometryLookup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_SetGeometryLookup_Proxy( - IXpsOMPath* This, - LPCWSTR lookup); -void __RPC_STUB IXpsOMPath_SetGeometryLookup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_GetAccessibilityShortDescription_Proxy( - IXpsOMPath* This, - LPWSTR *shortDescription); -void __RPC_STUB IXpsOMPath_GetAccessibilityShortDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_SetAccessibilityShortDescription_Proxy( - IXpsOMPath* This, - LPCWSTR shortDescription); -void __RPC_STUB IXpsOMPath_SetAccessibilityShortDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_GetAccessibilityLongDescription_Proxy( - IXpsOMPath* This, - LPWSTR *longDescription); -void __RPC_STUB IXpsOMPath_GetAccessibilityLongDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_SetAccessibilityLongDescription_Proxy( - IXpsOMPath* This, - LPCWSTR longDescription); -void __RPC_STUB IXpsOMPath_SetAccessibilityLongDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_GetSnapsToPixels_Proxy( - IXpsOMPath* This, - WINBOOL *snapsToPixels); -void __RPC_STUB IXpsOMPath_GetSnapsToPixels_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_SetSnapsToPixels_Proxy( - IXpsOMPath* This, - WINBOOL snapsToPixels); -void __RPC_STUB IXpsOMPath_SetSnapsToPixels_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_GetStrokeBrush_Proxy( - IXpsOMPath* This, - IXpsOMBrush **brush); -void __RPC_STUB IXpsOMPath_GetStrokeBrush_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_GetStrokeBrushLocal_Proxy( - IXpsOMPath* This, - IXpsOMBrush **brush); -void __RPC_STUB IXpsOMPath_GetStrokeBrushLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_SetStrokeBrushLocal_Proxy( - IXpsOMPath* This, - IXpsOMBrush *brush); -void __RPC_STUB IXpsOMPath_SetStrokeBrushLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_GetStrokeBrushLookup_Proxy( - IXpsOMPath* This, - LPWSTR *lookup); -void __RPC_STUB IXpsOMPath_GetStrokeBrushLookup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_SetStrokeBrushLookup_Proxy( - IXpsOMPath* This, - LPCWSTR lookup); -void __RPC_STUB IXpsOMPath_SetStrokeBrushLookup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_GetStrokeDashes_Proxy( - IXpsOMPath* This, - IXpsOMDashCollection **strokeDashes); -void __RPC_STUB IXpsOMPath_GetStrokeDashes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_GetStrokeDashCap_Proxy( - IXpsOMPath* This, - XPS_DASH_CAP *strokeDashCap); -void __RPC_STUB IXpsOMPath_GetStrokeDashCap_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_SetStrokeDashCap_Proxy( - IXpsOMPath* This, - XPS_DASH_CAP strokeDashCap); -void __RPC_STUB IXpsOMPath_SetStrokeDashCap_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_GetStrokeDashOffset_Proxy( - IXpsOMPath* This, - FLOAT *strokeDashOffset); -void __RPC_STUB IXpsOMPath_GetStrokeDashOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_SetStrokeDashOffset_Proxy( - IXpsOMPath* This, - FLOAT strokeDashOffset); -void __RPC_STUB IXpsOMPath_SetStrokeDashOffset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_GetStrokeStartLineCap_Proxy( - IXpsOMPath* This, - XPS_LINE_CAP *strokeStartLineCap); -void __RPC_STUB IXpsOMPath_GetStrokeStartLineCap_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_SetStrokeStartLineCap_Proxy( - IXpsOMPath* This, - XPS_LINE_CAP strokeStartLineCap); -void __RPC_STUB IXpsOMPath_SetStrokeStartLineCap_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_GetStrokeEndLineCap_Proxy( - IXpsOMPath* This, - XPS_LINE_CAP *strokeEndLineCap); -void __RPC_STUB IXpsOMPath_GetStrokeEndLineCap_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_SetStrokeEndLineCap_Proxy( - IXpsOMPath* This, - XPS_LINE_CAP strokeEndLineCap); -void __RPC_STUB IXpsOMPath_SetStrokeEndLineCap_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_GetStrokeLineJoin_Proxy( - IXpsOMPath* This, - XPS_LINE_JOIN *strokeLineJoin); -void __RPC_STUB IXpsOMPath_GetStrokeLineJoin_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_SetStrokeLineJoin_Proxy( - IXpsOMPath* This, - XPS_LINE_JOIN strokeLineJoin); -void __RPC_STUB IXpsOMPath_SetStrokeLineJoin_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_GetStrokeMiterLimit_Proxy( - IXpsOMPath* This, - FLOAT *strokeMiterLimit); -void __RPC_STUB IXpsOMPath_GetStrokeMiterLimit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_SetStrokeMiterLimit_Proxy( - IXpsOMPath* This, - FLOAT strokeMiterLimit); -void __RPC_STUB IXpsOMPath_SetStrokeMiterLimit_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_GetStrokeThickness_Proxy( - IXpsOMPath* This, - FLOAT *strokeThickness); -void __RPC_STUB IXpsOMPath_GetStrokeThickness_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_SetStrokeThickness_Proxy( - IXpsOMPath* This, - FLOAT strokeThickness); -void __RPC_STUB IXpsOMPath_SetStrokeThickness_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_GetFillBrush_Proxy( - IXpsOMPath* This, - IXpsOMBrush **brush); -void __RPC_STUB IXpsOMPath_GetFillBrush_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_GetFillBrushLocal_Proxy( - IXpsOMPath* This, - IXpsOMBrush **brush); -void __RPC_STUB IXpsOMPath_GetFillBrushLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_SetFillBrushLocal_Proxy( - IXpsOMPath* This, - IXpsOMBrush *brush); -void __RPC_STUB IXpsOMPath_SetFillBrushLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_GetFillBrushLookup_Proxy( - IXpsOMPath* This, - LPWSTR *lookup); -void __RPC_STUB IXpsOMPath_GetFillBrushLookup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_SetFillBrushLookup_Proxy( - IXpsOMPath* This, - LPCWSTR lookup); -void __RPC_STUB IXpsOMPath_SetFillBrushLookup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPath_Clone_Proxy( - IXpsOMPath* This, - IXpsOMPath **path); -void __RPC_STUB IXpsOMPath_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMPath_INTERFACE_DEFINED__ */ @@ -9724,51 +7431,52 @@ typedef struct IXpsOMSolidColorBrushVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMSolidColorBrush* This, + IXpsOMSolidColorBrush *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMSolidColorBrush* This); + IXpsOMSolidColorBrush *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMSolidColorBrush* This); + IXpsOMSolidColorBrush *This); /*** IXpsOMShareable methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMSolidColorBrush* This, + IXpsOMSolidColorBrush *This, IUnknown **owner); HRESULT (STDMETHODCALLTYPE *GetType)( - IXpsOMSolidColorBrush* This, + IXpsOMSolidColorBrush *This, XPS_OBJECT_TYPE *type); /*** IXpsOMBrush methods ***/ HRESULT (STDMETHODCALLTYPE *GetOpacity)( - IXpsOMSolidColorBrush* This, + IXpsOMSolidColorBrush *This, FLOAT *opacity); HRESULT (STDMETHODCALLTYPE *SetOpacity)( - IXpsOMSolidColorBrush* This, + IXpsOMSolidColorBrush *This, FLOAT opacity); /*** IXpsOMSolidColorBrush methods ***/ HRESULT (STDMETHODCALLTYPE *GetColor)( - IXpsOMSolidColorBrush* This, + IXpsOMSolidColorBrush *This, XPS_COLOR *color, IXpsOMColorProfileResource **colorProfile); HRESULT (STDMETHODCALLTYPE *SetColor)( - IXpsOMSolidColorBrush* This, + IXpsOMSolidColorBrush *This, const XPS_COLOR *color, IXpsOMColorProfileResource *colorProfile); HRESULT (STDMETHODCALLTYPE *Clone)( - IXpsOMSolidColorBrush* This, + IXpsOMSolidColorBrush *This, IXpsOMSolidColorBrush **solidColorBrush); END_INTERFACE } IXpsOMSolidColorBrushVtbl; + interface IXpsOMSolidColorBrush { CONST_VTBL IXpsOMSolidColorBrushVtbl* lpVtbl; }; @@ -9829,32 +7537,6 @@ static FORCEINLINE HRESULT IXpsOMSolidColorBrush_Clone(IXpsOMSolidColorBrush* Th #endif -HRESULT STDMETHODCALLTYPE IXpsOMSolidColorBrush_GetColor_Proxy( - IXpsOMSolidColorBrush* This, - XPS_COLOR *color, - IXpsOMColorProfileResource **colorProfile); -void __RPC_STUB IXpsOMSolidColorBrush_GetColor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMSolidColorBrush_SetColor_Proxy( - IXpsOMSolidColorBrush* This, - const XPS_COLOR *color, - IXpsOMColorProfileResource *colorProfile); -void __RPC_STUB IXpsOMSolidColorBrush_SetColor_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMSolidColorBrush_Clone_Proxy( - IXpsOMSolidColorBrush* This, - IXpsOMSolidColorBrush **solidColorBrush); -void __RPC_STUB IXpsOMSolidColorBrush_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMSolidColorBrush_INTERFACE_DEFINED__ */ @@ -9912,81 +7594,82 @@ typedef struct IXpsOMTileBrushVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMTileBrush* This, + IXpsOMTileBrush *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMTileBrush* This); + IXpsOMTileBrush *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMTileBrush* This); + IXpsOMTileBrush *This); /*** IXpsOMShareable methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMTileBrush* This, + IXpsOMTileBrush *This, IUnknown **owner); HRESULT (STDMETHODCALLTYPE *GetType)( - IXpsOMTileBrush* This, + IXpsOMTileBrush *This, XPS_OBJECT_TYPE *type); /*** IXpsOMBrush methods ***/ HRESULT (STDMETHODCALLTYPE *GetOpacity)( - IXpsOMTileBrush* This, + IXpsOMTileBrush *This, FLOAT *opacity); HRESULT (STDMETHODCALLTYPE *SetOpacity)( - IXpsOMTileBrush* This, + IXpsOMTileBrush *This, FLOAT opacity); /*** IXpsOMTileBrush methods ***/ HRESULT (STDMETHODCALLTYPE *GetTransform)( - IXpsOMTileBrush* This, + IXpsOMTileBrush *This, IXpsOMMatrixTransform **transform); HRESULT (STDMETHODCALLTYPE *GetTransformLocal)( - IXpsOMTileBrush* This, + IXpsOMTileBrush *This, IXpsOMMatrixTransform **transform); HRESULT (STDMETHODCALLTYPE *SetTransformLocal)( - IXpsOMTileBrush* This, + IXpsOMTileBrush *This, IXpsOMMatrixTransform *transform); HRESULT (STDMETHODCALLTYPE *GetTransformLookup)( - IXpsOMTileBrush* This, + IXpsOMTileBrush *This, LPWSTR *key); HRESULT (STDMETHODCALLTYPE *SetTransformLookup)( - IXpsOMTileBrush* This, + IXpsOMTileBrush *This, LPCWSTR key); HRESULT (STDMETHODCALLTYPE *GetViewbox)( - IXpsOMTileBrush* This, + IXpsOMTileBrush *This, XPS_RECT *viewbox); HRESULT (STDMETHODCALLTYPE *SetViewbox)( - IXpsOMTileBrush* This, + IXpsOMTileBrush *This, const XPS_RECT *viewbox); HRESULT (STDMETHODCALLTYPE *GetViewport)( - IXpsOMTileBrush* This, + IXpsOMTileBrush *This, XPS_RECT *viewport); HRESULT (STDMETHODCALLTYPE *SetViewport)( - IXpsOMTileBrush* This, + IXpsOMTileBrush *This, const XPS_RECT *viewport); HRESULT (STDMETHODCALLTYPE *GetTileMode)( - IXpsOMTileBrush* This, + IXpsOMTileBrush *This, XPS_TILE_MODE *tileMode); HRESULT (STDMETHODCALLTYPE *SetTileMode)( - IXpsOMTileBrush* This, + IXpsOMTileBrush *This, XPS_TILE_MODE tileMode); END_INTERFACE } IXpsOMTileBrushVtbl; + interface IXpsOMTileBrush { CONST_VTBL IXpsOMTileBrushVtbl* lpVtbl; }; @@ -10079,94 +7762,6 @@ static FORCEINLINE HRESULT IXpsOMTileBrush_SetTileMode(IXpsOMTileBrush* This,XPS #endif -HRESULT STDMETHODCALLTYPE IXpsOMTileBrush_GetTransform_Proxy( - IXpsOMTileBrush* This, - IXpsOMMatrixTransform **transform); -void __RPC_STUB IXpsOMTileBrush_GetTransform_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMTileBrush_GetTransformLocal_Proxy( - IXpsOMTileBrush* This, - IXpsOMMatrixTransform **transform); -void __RPC_STUB IXpsOMTileBrush_GetTransformLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMTileBrush_SetTransformLocal_Proxy( - IXpsOMTileBrush* This, - IXpsOMMatrixTransform *transform); -void __RPC_STUB IXpsOMTileBrush_SetTransformLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMTileBrush_GetTransformLookup_Proxy( - IXpsOMTileBrush* This, - LPWSTR *key); -void __RPC_STUB IXpsOMTileBrush_GetTransformLookup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMTileBrush_SetTransformLookup_Proxy( - IXpsOMTileBrush* This, - LPCWSTR key); -void __RPC_STUB IXpsOMTileBrush_SetTransformLookup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMTileBrush_GetViewbox_Proxy( - IXpsOMTileBrush* This, - XPS_RECT *viewbox); -void __RPC_STUB IXpsOMTileBrush_GetViewbox_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMTileBrush_SetViewbox_Proxy( - IXpsOMTileBrush* This, - const XPS_RECT *viewbox); -void __RPC_STUB IXpsOMTileBrush_SetViewbox_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMTileBrush_GetViewport_Proxy( - IXpsOMTileBrush* This, - XPS_RECT *viewport); -void __RPC_STUB IXpsOMTileBrush_GetViewport_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMTileBrush_SetViewport_Proxy( - IXpsOMTileBrush* This, - const XPS_RECT *viewport); -void __RPC_STUB IXpsOMTileBrush_SetViewport_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMTileBrush_GetTileMode_Proxy( - IXpsOMTileBrush* This, - XPS_TILE_MODE *tileMode); -void __RPC_STUB IXpsOMTileBrush_GetTileMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMTileBrush_SetTileMode_Proxy( - IXpsOMTileBrush* This, - XPS_TILE_MODE tileMode); -void __RPC_STUB IXpsOMTileBrush_SetTileMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMTileBrush_INTERFACE_DEFINED__ */ @@ -10221,77 +7816,78 @@ typedef struct IXpsOMGradientBrushVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMGradientBrush* This, + IXpsOMGradientBrush *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMGradientBrush* This); + IXpsOMGradientBrush *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMGradientBrush* This); + IXpsOMGradientBrush *This); /*** IXpsOMShareable methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMGradientBrush* This, + IXpsOMGradientBrush *This, IUnknown **owner); HRESULT (STDMETHODCALLTYPE *GetType)( - IXpsOMGradientBrush* This, + IXpsOMGradientBrush *This, XPS_OBJECT_TYPE *type); /*** IXpsOMBrush methods ***/ HRESULT (STDMETHODCALLTYPE *GetOpacity)( - IXpsOMGradientBrush* This, + IXpsOMGradientBrush *This, FLOAT *opacity); HRESULT (STDMETHODCALLTYPE *SetOpacity)( - IXpsOMGradientBrush* This, + IXpsOMGradientBrush *This, FLOAT opacity); /*** IXpsOMGradientBrush methods ***/ HRESULT (STDMETHODCALLTYPE *GetGradientStops)( - IXpsOMGradientBrush* This, + IXpsOMGradientBrush *This, IXpsOMGradientStopCollection **gradientStops); HRESULT (STDMETHODCALLTYPE *GetTransform)( - IXpsOMGradientBrush* This, + IXpsOMGradientBrush *This, IXpsOMMatrixTransform **transform); HRESULT (STDMETHODCALLTYPE *GetTransformLocal)( - IXpsOMGradientBrush* This, + IXpsOMGradientBrush *This, IXpsOMMatrixTransform **transform); HRESULT (STDMETHODCALLTYPE *SetTransformLocal)( - IXpsOMGradientBrush* This, + IXpsOMGradientBrush *This, IXpsOMMatrixTransform *transform); HRESULT (STDMETHODCALLTYPE *GetTransformLookup)( - IXpsOMGradientBrush* This, + IXpsOMGradientBrush *This, LPWSTR *key); HRESULT (STDMETHODCALLTYPE *SetTransformLookup)( - IXpsOMGradientBrush* This, + IXpsOMGradientBrush *This, LPCWSTR key); HRESULT (STDMETHODCALLTYPE *GetSpreadMethod)( - IXpsOMGradientBrush* This, + IXpsOMGradientBrush *This, XPS_SPREAD_METHOD *spreadMethod); HRESULT (STDMETHODCALLTYPE *SetSpreadMethod)( - IXpsOMGradientBrush* This, + IXpsOMGradientBrush *This, XPS_SPREAD_METHOD spreadMethod); HRESULT (STDMETHODCALLTYPE *GetColorInterpolationMode)( - IXpsOMGradientBrush* This, + IXpsOMGradientBrush *This, XPS_COLOR_INTERPOLATION *colorInterpolationMode); HRESULT (STDMETHODCALLTYPE *SetColorInterpolationMode)( - IXpsOMGradientBrush* This, + IXpsOMGradientBrush *This, XPS_COLOR_INTERPOLATION colorInterpolationMode); END_INTERFACE } IXpsOMGradientBrushVtbl; + interface IXpsOMGradientBrush { CONST_VTBL IXpsOMGradientBrushVtbl* lpVtbl; }; @@ -10380,86 +7976,6 @@ static FORCEINLINE HRESULT IXpsOMGradientBrush_SetColorInterpolationMode(IXpsOMG #endif -HRESULT STDMETHODCALLTYPE IXpsOMGradientBrush_GetGradientStops_Proxy( - IXpsOMGradientBrush* This, - IXpsOMGradientStopCollection **gradientStops); -void __RPC_STUB IXpsOMGradientBrush_GetGradientStops_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGradientBrush_GetTransform_Proxy( - IXpsOMGradientBrush* This, - IXpsOMMatrixTransform **transform); -void __RPC_STUB IXpsOMGradientBrush_GetTransform_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGradientBrush_GetTransformLocal_Proxy( - IXpsOMGradientBrush* This, - IXpsOMMatrixTransform **transform); -void __RPC_STUB IXpsOMGradientBrush_GetTransformLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGradientBrush_SetTransformLocal_Proxy( - IXpsOMGradientBrush* This, - IXpsOMMatrixTransform *transform); -void __RPC_STUB IXpsOMGradientBrush_SetTransformLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGradientBrush_GetTransformLookup_Proxy( - IXpsOMGradientBrush* This, - LPWSTR *key); -void __RPC_STUB IXpsOMGradientBrush_GetTransformLookup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGradientBrush_SetTransformLookup_Proxy( - IXpsOMGradientBrush* This, - LPCWSTR key); -void __RPC_STUB IXpsOMGradientBrush_SetTransformLookup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGradientBrush_GetSpreadMethod_Proxy( - IXpsOMGradientBrush* This, - XPS_SPREAD_METHOD *spreadMethod); -void __RPC_STUB IXpsOMGradientBrush_GetSpreadMethod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGradientBrush_SetSpreadMethod_Proxy( - IXpsOMGradientBrush* This, - XPS_SPREAD_METHOD spreadMethod); -void __RPC_STUB IXpsOMGradientBrush_SetSpreadMethod_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGradientBrush_GetColorInterpolationMode_Proxy( - IXpsOMGradientBrush* This, - XPS_COLOR_INTERPOLATION *colorInterpolationMode); -void __RPC_STUB IXpsOMGradientBrush_GetColorInterpolationMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMGradientBrush_SetColorInterpolationMode_Proxy( - IXpsOMGradientBrush* This, - XPS_COLOR_INTERPOLATION colorInterpolationMode); -void __RPC_STUB IXpsOMGradientBrush_SetColorInterpolationMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMGradientBrush_INTERFACE_DEFINED__ */ @@ -10502,106 +8018,107 @@ typedef struct IXpsOMVisualBrushVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMVisualBrush* This, + IXpsOMVisualBrush *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMVisualBrush* This); + IXpsOMVisualBrush *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMVisualBrush* This); + IXpsOMVisualBrush *This); /*** IXpsOMShareable methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMVisualBrush* This, + IXpsOMVisualBrush *This, IUnknown **owner); HRESULT (STDMETHODCALLTYPE *GetType)( - IXpsOMVisualBrush* This, + IXpsOMVisualBrush *This, XPS_OBJECT_TYPE *type); /*** IXpsOMBrush methods ***/ HRESULT (STDMETHODCALLTYPE *GetOpacity)( - IXpsOMVisualBrush* This, + IXpsOMVisualBrush *This, FLOAT *opacity); HRESULT (STDMETHODCALLTYPE *SetOpacity)( - IXpsOMVisualBrush* This, + IXpsOMVisualBrush *This, FLOAT opacity); /*** IXpsOMTileBrush methods ***/ HRESULT (STDMETHODCALLTYPE *GetTransform)( - IXpsOMVisualBrush* This, + IXpsOMVisualBrush *This, IXpsOMMatrixTransform **transform); HRESULT (STDMETHODCALLTYPE *GetTransformLocal)( - IXpsOMVisualBrush* This, + IXpsOMVisualBrush *This, IXpsOMMatrixTransform **transform); HRESULT (STDMETHODCALLTYPE *SetTransformLocal)( - IXpsOMVisualBrush* This, + IXpsOMVisualBrush *This, IXpsOMMatrixTransform *transform); HRESULT (STDMETHODCALLTYPE *GetTransformLookup)( - IXpsOMVisualBrush* This, + IXpsOMVisualBrush *This, LPWSTR *key); HRESULT (STDMETHODCALLTYPE *SetTransformLookup)( - IXpsOMVisualBrush* This, + IXpsOMVisualBrush *This, LPCWSTR key); HRESULT (STDMETHODCALLTYPE *GetViewbox)( - IXpsOMVisualBrush* This, + IXpsOMVisualBrush *This, XPS_RECT *viewbox); HRESULT (STDMETHODCALLTYPE *SetViewbox)( - IXpsOMVisualBrush* This, + IXpsOMVisualBrush *This, const XPS_RECT *viewbox); HRESULT (STDMETHODCALLTYPE *GetViewport)( - IXpsOMVisualBrush* This, + IXpsOMVisualBrush *This, XPS_RECT *viewport); HRESULT (STDMETHODCALLTYPE *SetViewport)( - IXpsOMVisualBrush* This, + IXpsOMVisualBrush *This, const XPS_RECT *viewport); HRESULT (STDMETHODCALLTYPE *GetTileMode)( - IXpsOMVisualBrush* This, + IXpsOMVisualBrush *This, XPS_TILE_MODE *tileMode); HRESULT (STDMETHODCALLTYPE *SetTileMode)( - IXpsOMVisualBrush* This, + IXpsOMVisualBrush *This, XPS_TILE_MODE tileMode); /*** IXpsOMVisualBrush methods ***/ HRESULT (STDMETHODCALLTYPE *GetVisual)( - IXpsOMVisualBrush* This, + IXpsOMVisualBrush *This, IXpsOMVisual **visual); HRESULT (STDMETHODCALLTYPE *GetVisualLocal)( - IXpsOMVisualBrush* This, + IXpsOMVisualBrush *This, IXpsOMVisual **visual); HRESULT (STDMETHODCALLTYPE *SetVisualLocal)( - IXpsOMVisualBrush* This, + IXpsOMVisualBrush *This, IXpsOMVisual *visual); HRESULT (STDMETHODCALLTYPE *GetVisualLookup)( - IXpsOMVisualBrush* This, + IXpsOMVisualBrush *This, LPWSTR *lookup); HRESULT (STDMETHODCALLTYPE *SetVisualLookup)( - IXpsOMVisualBrush* This, + IXpsOMVisualBrush *This, LPCWSTR lookup); HRESULT (STDMETHODCALLTYPE *Clone)( - IXpsOMVisualBrush* This, + IXpsOMVisualBrush *This, IXpsOMVisualBrush **visualBrush); END_INTERFACE } IXpsOMVisualBrushVtbl; + interface IXpsOMVisualBrush { CONST_VTBL IXpsOMVisualBrushVtbl* lpVtbl; }; @@ -10720,54 +8237,6 @@ static FORCEINLINE HRESULT IXpsOMVisualBrush_Clone(IXpsOMVisualBrush* This,IXpsO #endif -HRESULT STDMETHODCALLTYPE IXpsOMVisualBrush_GetVisual_Proxy( - IXpsOMVisualBrush* This, - IXpsOMVisual **visual); -void __RPC_STUB IXpsOMVisualBrush_GetVisual_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisualBrush_GetVisualLocal_Proxy( - IXpsOMVisualBrush* This, - IXpsOMVisual **visual); -void __RPC_STUB IXpsOMVisualBrush_GetVisualLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisualBrush_SetVisualLocal_Proxy( - IXpsOMVisualBrush* This, - IXpsOMVisual *visual); -void __RPC_STUB IXpsOMVisualBrush_SetVisualLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisualBrush_GetVisualLookup_Proxy( - IXpsOMVisualBrush* This, - LPWSTR *lookup); -void __RPC_STUB IXpsOMVisualBrush_GetVisualLookup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisualBrush_SetVisualLookup_Proxy( - IXpsOMVisualBrush* This, - LPCWSTR lookup); -void __RPC_STUB IXpsOMVisualBrush_SetVisualLookup_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMVisualBrush_Clone_Proxy( - IXpsOMVisualBrush* This, - IXpsOMVisualBrush **visualBrush); -void __RPC_STUB IXpsOMVisualBrush_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMVisualBrush_INTERFACE_DEFINED__ */ @@ -10807,102 +8276,103 @@ typedef struct IXpsOMImageBrushVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMImageBrush* This, + IXpsOMImageBrush *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMImageBrush* This); + IXpsOMImageBrush *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMImageBrush* This); + IXpsOMImageBrush *This); /*** IXpsOMShareable methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMImageBrush* This, + IXpsOMImageBrush *This, IUnknown **owner); HRESULT (STDMETHODCALLTYPE *GetType)( - IXpsOMImageBrush* This, + IXpsOMImageBrush *This, XPS_OBJECT_TYPE *type); /*** IXpsOMBrush methods ***/ HRESULT (STDMETHODCALLTYPE *GetOpacity)( - IXpsOMImageBrush* This, + IXpsOMImageBrush *This, FLOAT *opacity); HRESULT (STDMETHODCALLTYPE *SetOpacity)( - IXpsOMImageBrush* This, + IXpsOMImageBrush *This, FLOAT opacity); /*** IXpsOMTileBrush methods ***/ HRESULT (STDMETHODCALLTYPE *GetTransform)( - IXpsOMImageBrush* This, + IXpsOMImageBrush *This, IXpsOMMatrixTransform **transform); HRESULT (STDMETHODCALLTYPE *GetTransformLocal)( - IXpsOMImageBrush* This, + IXpsOMImageBrush *This, IXpsOMMatrixTransform **transform); HRESULT (STDMETHODCALLTYPE *SetTransformLocal)( - IXpsOMImageBrush* This, + IXpsOMImageBrush *This, IXpsOMMatrixTransform *transform); HRESULT (STDMETHODCALLTYPE *GetTransformLookup)( - IXpsOMImageBrush* This, + IXpsOMImageBrush *This, LPWSTR *key); HRESULT (STDMETHODCALLTYPE *SetTransformLookup)( - IXpsOMImageBrush* This, + IXpsOMImageBrush *This, LPCWSTR key); HRESULT (STDMETHODCALLTYPE *GetViewbox)( - IXpsOMImageBrush* This, + IXpsOMImageBrush *This, XPS_RECT *viewbox); HRESULT (STDMETHODCALLTYPE *SetViewbox)( - IXpsOMImageBrush* This, + IXpsOMImageBrush *This, const XPS_RECT *viewbox); HRESULT (STDMETHODCALLTYPE *GetViewport)( - IXpsOMImageBrush* This, + IXpsOMImageBrush *This, XPS_RECT *viewport); HRESULT (STDMETHODCALLTYPE *SetViewport)( - IXpsOMImageBrush* This, + IXpsOMImageBrush *This, const XPS_RECT *viewport); HRESULT (STDMETHODCALLTYPE *GetTileMode)( - IXpsOMImageBrush* This, + IXpsOMImageBrush *This, XPS_TILE_MODE *tileMode); HRESULT (STDMETHODCALLTYPE *SetTileMode)( - IXpsOMImageBrush* This, + IXpsOMImageBrush *This, XPS_TILE_MODE tileMode); /*** IXpsOMImageBrush methods ***/ HRESULT (STDMETHODCALLTYPE *GetImageResource)( - IXpsOMImageBrush* This, + IXpsOMImageBrush *This, IXpsOMImageResource **imageResource); HRESULT (STDMETHODCALLTYPE *SetImageResource)( - IXpsOMImageBrush* This, + IXpsOMImageBrush *This, IXpsOMImageResource *imageResource); HRESULT (STDMETHODCALLTYPE *GetColorProfileResource)( - IXpsOMImageBrush* This, + IXpsOMImageBrush *This, IXpsOMColorProfileResource **colorProfileResource); HRESULT (STDMETHODCALLTYPE *SetColorProfileResource)( - IXpsOMImageBrush* This, + IXpsOMImageBrush *This, IXpsOMColorProfileResource *colorProfileResource); HRESULT (STDMETHODCALLTYPE *Clone)( - IXpsOMImageBrush* This, + IXpsOMImageBrush *This, IXpsOMImageBrush **imageBrush); END_INTERFACE } IXpsOMImageBrushVtbl; + interface IXpsOMImageBrush { CONST_VTBL IXpsOMImageBrushVtbl* lpVtbl; }; @@ -11017,46 +8487,6 @@ static FORCEINLINE HRESULT IXpsOMImageBrush_Clone(IXpsOMImageBrush* This,IXpsOMI #endif -HRESULT STDMETHODCALLTYPE IXpsOMImageBrush_GetImageResource_Proxy( - IXpsOMImageBrush* This, - IXpsOMImageResource **imageResource); -void __RPC_STUB IXpsOMImageBrush_GetImageResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMImageBrush_SetImageResource_Proxy( - IXpsOMImageBrush* This, - IXpsOMImageResource *imageResource); -void __RPC_STUB IXpsOMImageBrush_SetImageResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMImageBrush_GetColorProfileResource_Proxy( - IXpsOMImageBrush* This, - IXpsOMColorProfileResource **colorProfileResource); -void __RPC_STUB IXpsOMImageBrush_GetColorProfileResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMImageBrush_SetColorProfileResource_Proxy( - IXpsOMImageBrush* This, - IXpsOMColorProfileResource *colorProfileResource); -void __RPC_STUB IXpsOMImageBrush_SetColorProfileResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMImageBrush_Clone_Proxy( - IXpsOMImageBrush* This, - IXpsOMImageBrush **imageBrush); -void __RPC_STUB IXpsOMImageBrush_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMImageBrush_INTERFACE_DEFINED__ */ @@ -11096,98 +8526,99 @@ typedef struct IXpsOMLinearGradientBrushVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMLinearGradientBrush* This, + IXpsOMLinearGradientBrush *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMLinearGradientBrush* This); + IXpsOMLinearGradientBrush *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMLinearGradientBrush* This); + IXpsOMLinearGradientBrush *This); /*** IXpsOMShareable methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMLinearGradientBrush* This, + IXpsOMLinearGradientBrush *This, IUnknown **owner); HRESULT (STDMETHODCALLTYPE *GetType)( - IXpsOMLinearGradientBrush* This, + IXpsOMLinearGradientBrush *This, XPS_OBJECT_TYPE *type); /*** IXpsOMBrush methods ***/ HRESULT (STDMETHODCALLTYPE *GetOpacity)( - IXpsOMLinearGradientBrush* This, + IXpsOMLinearGradientBrush *This, FLOAT *opacity); HRESULT (STDMETHODCALLTYPE *SetOpacity)( - IXpsOMLinearGradientBrush* This, + IXpsOMLinearGradientBrush *This, FLOAT opacity); /*** IXpsOMGradientBrush methods ***/ HRESULT (STDMETHODCALLTYPE *GetGradientStops)( - IXpsOMLinearGradientBrush* This, + IXpsOMLinearGradientBrush *This, IXpsOMGradientStopCollection **gradientStops); HRESULT (STDMETHODCALLTYPE *GetTransform)( - IXpsOMLinearGradientBrush* This, + IXpsOMLinearGradientBrush *This, IXpsOMMatrixTransform **transform); HRESULT (STDMETHODCALLTYPE *GetTransformLocal)( - IXpsOMLinearGradientBrush* This, + IXpsOMLinearGradientBrush *This, IXpsOMMatrixTransform **transform); HRESULT (STDMETHODCALLTYPE *SetTransformLocal)( - IXpsOMLinearGradientBrush* This, + IXpsOMLinearGradientBrush *This, IXpsOMMatrixTransform *transform); HRESULT (STDMETHODCALLTYPE *GetTransformLookup)( - IXpsOMLinearGradientBrush* This, + IXpsOMLinearGradientBrush *This, LPWSTR *key); HRESULT (STDMETHODCALLTYPE *SetTransformLookup)( - IXpsOMLinearGradientBrush* This, + IXpsOMLinearGradientBrush *This, LPCWSTR key); HRESULT (STDMETHODCALLTYPE *GetSpreadMethod)( - IXpsOMLinearGradientBrush* This, + IXpsOMLinearGradientBrush *This, XPS_SPREAD_METHOD *spreadMethod); HRESULT (STDMETHODCALLTYPE *SetSpreadMethod)( - IXpsOMLinearGradientBrush* This, + IXpsOMLinearGradientBrush *This, XPS_SPREAD_METHOD spreadMethod); HRESULT (STDMETHODCALLTYPE *GetColorInterpolationMode)( - IXpsOMLinearGradientBrush* This, + IXpsOMLinearGradientBrush *This, XPS_COLOR_INTERPOLATION *colorInterpolationMode); HRESULT (STDMETHODCALLTYPE *SetColorInterpolationMode)( - IXpsOMLinearGradientBrush* This, + IXpsOMLinearGradientBrush *This, XPS_COLOR_INTERPOLATION colorInterpolationMode); /*** IXpsOMLinearGradientBrush methods ***/ HRESULT (STDMETHODCALLTYPE *GetStartPoint)( - IXpsOMLinearGradientBrush* This, + IXpsOMLinearGradientBrush *This, XPS_POINT *startPoint); HRESULT (STDMETHODCALLTYPE *SetStartPoint)( - IXpsOMLinearGradientBrush* This, + IXpsOMLinearGradientBrush *This, const XPS_POINT *startPoint); HRESULT (STDMETHODCALLTYPE *GetEndPoint)( - IXpsOMLinearGradientBrush* This, + IXpsOMLinearGradientBrush *This, XPS_POINT *endPoint); HRESULT (STDMETHODCALLTYPE *SetEndPoint)( - IXpsOMLinearGradientBrush* This, + IXpsOMLinearGradientBrush *This, const XPS_POINT *endPoint); HRESULT (STDMETHODCALLTYPE *Clone)( - IXpsOMLinearGradientBrush* This, + IXpsOMLinearGradientBrush *This, IXpsOMLinearGradientBrush **linearGradientBrush); END_INTERFACE } IXpsOMLinearGradientBrushVtbl; + interface IXpsOMLinearGradientBrush { CONST_VTBL IXpsOMLinearGradientBrushVtbl* lpVtbl; }; @@ -11298,46 +8729,6 @@ static FORCEINLINE HRESULT IXpsOMLinearGradientBrush_Clone(IXpsOMLinearGradientB #endif -HRESULT STDMETHODCALLTYPE IXpsOMLinearGradientBrush_GetStartPoint_Proxy( - IXpsOMLinearGradientBrush* This, - XPS_POINT *startPoint); -void __RPC_STUB IXpsOMLinearGradientBrush_GetStartPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMLinearGradientBrush_SetStartPoint_Proxy( - IXpsOMLinearGradientBrush* This, - const XPS_POINT *startPoint); -void __RPC_STUB IXpsOMLinearGradientBrush_SetStartPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMLinearGradientBrush_GetEndPoint_Proxy( - IXpsOMLinearGradientBrush* This, - XPS_POINT *endPoint); -void __RPC_STUB IXpsOMLinearGradientBrush_GetEndPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMLinearGradientBrush_SetEndPoint_Proxy( - IXpsOMLinearGradientBrush* This, - const XPS_POINT *endPoint); -void __RPC_STUB IXpsOMLinearGradientBrush_SetEndPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMLinearGradientBrush_Clone_Proxy( - IXpsOMLinearGradientBrush* This, - IXpsOMLinearGradientBrush **linearGradientBrush); -void __RPC_STUB IXpsOMLinearGradientBrush_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMLinearGradientBrush_INTERFACE_DEFINED__ */ @@ -11383,106 +8774,107 @@ typedef struct IXpsOMRadialGradientBrushVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMRadialGradientBrush* This, + IXpsOMRadialGradientBrush *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMRadialGradientBrush* This); + IXpsOMRadialGradientBrush *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMRadialGradientBrush* This); + IXpsOMRadialGradientBrush *This); /*** IXpsOMShareable methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMRadialGradientBrush* This, + IXpsOMRadialGradientBrush *This, IUnknown **owner); HRESULT (STDMETHODCALLTYPE *GetType)( - IXpsOMRadialGradientBrush* This, + IXpsOMRadialGradientBrush *This, XPS_OBJECT_TYPE *type); /*** IXpsOMBrush methods ***/ HRESULT (STDMETHODCALLTYPE *GetOpacity)( - IXpsOMRadialGradientBrush* This, + IXpsOMRadialGradientBrush *This, FLOAT *opacity); HRESULT (STDMETHODCALLTYPE *SetOpacity)( - IXpsOMRadialGradientBrush* This, + IXpsOMRadialGradientBrush *This, FLOAT opacity); /*** IXpsOMGradientBrush methods ***/ HRESULT (STDMETHODCALLTYPE *GetGradientStops)( - IXpsOMRadialGradientBrush* This, + IXpsOMRadialGradientBrush *This, IXpsOMGradientStopCollection **gradientStops); HRESULT (STDMETHODCALLTYPE *GetTransform)( - IXpsOMRadialGradientBrush* This, + IXpsOMRadialGradientBrush *This, IXpsOMMatrixTransform **transform); HRESULT (STDMETHODCALLTYPE *GetTransformLocal)( - IXpsOMRadialGradientBrush* This, + IXpsOMRadialGradientBrush *This, IXpsOMMatrixTransform **transform); HRESULT (STDMETHODCALLTYPE *SetTransformLocal)( - IXpsOMRadialGradientBrush* This, + IXpsOMRadialGradientBrush *This, IXpsOMMatrixTransform *transform); HRESULT (STDMETHODCALLTYPE *GetTransformLookup)( - IXpsOMRadialGradientBrush* This, + IXpsOMRadialGradientBrush *This, LPWSTR *key); HRESULT (STDMETHODCALLTYPE *SetTransformLookup)( - IXpsOMRadialGradientBrush* This, + IXpsOMRadialGradientBrush *This, LPCWSTR key); HRESULT (STDMETHODCALLTYPE *GetSpreadMethod)( - IXpsOMRadialGradientBrush* This, + IXpsOMRadialGradientBrush *This, XPS_SPREAD_METHOD *spreadMethod); HRESULT (STDMETHODCALLTYPE *SetSpreadMethod)( - IXpsOMRadialGradientBrush* This, + IXpsOMRadialGradientBrush *This, XPS_SPREAD_METHOD spreadMethod); HRESULT (STDMETHODCALLTYPE *GetColorInterpolationMode)( - IXpsOMRadialGradientBrush* This, + IXpsOMRadialGradientBrush *This, XPS_COLOR_INTERPOLATION *colorInterpolationMode); HRESULT (STDMETHODCALLTYPE *SetColorInterpolationMode)( - IXpsOMRadialGradientBrush* This, + IXpsOMRadialGradientBrush *This, XPS_COLOR_INTERPOLATION colorInterpolationMode); /*** IXpsOMRadialGradientBrush methods ***/ HRESULT (STDMETHODCALLTYPE *GetCenter)( - IXpsOMRadialGradientBrush* This, + IXpsOMRadialGradientBrush *This, XPS_POINT *center); HRESULT (STDMETHODCALLTYPE *SetCenter)( - IXpsOMRadialGradientBrush* This, + IXpsOMRadialGradientBrush *This, const XPS_POINT *center); HRESULT (STDMETHODCALLTYPE *GetRadiiSizes)( - IXpsOMRadialGradientBrush* This, + IXpsOMRadialGradientBrush *This, XPS_SIZE *radiiSizes); HRESULT (STDMETHODCALLTYPE *SetRadiiSizes)( - IXpsOMRadialGradientBrush* This, + IXpsOMRadialGradientBrush *This, const XPS_SIZE *radiiSizes); HRESULT (STDMETHODCALLTYPE *GetGradientOrigin)( - IXpsOMRadialGradientBrush* This, + IXpsOMRadialGradientBrush *This, XPS_POINT *origin); HRESULT (STDMETHODCALLTYPE *SetGradientOrigin)( - IXpsOMRadialGradientBrush* This, + IXpsOMRadialGradientBrush *This, const XPS_POINT *origin); HRESULT (STDMETHODCALLTYPE *Clone)( - IXpsOMRadialGradientBrush* This, + IXpsOMRadialGradientBrush *This, IXpsOMRadialGradientBrush **radialGradientBrush); END_INTERFACE } IXpsOMRadialGradientBrushVtbl; + interface IXpsOMRadialGradientBrush { CONST_VTBL IXpsOMRadialGradientBrushVtbl* lpVtbl; }; @@ -11601,62 +8993,6 @@ static FORCEINLINE HRESULT IXpsOMRadialGradientBrush_Clone(IXpsOMRadialGradientB #endif -HRESULT STDMETHODCALLTYPE IXpsOMRadialGradientBrush_GetCenter_Proxy( - IXpsOMRadialGradientBrush* This, - XPS_POINT *center); -void __RPC_STUB IXpsOMRadialGradientBrush_GetCenter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMRadialGradientBrush_SetCenter_Proxy( - IXpsOMRadialGradientBrush* This, - const XPS_POINT *center); -void __RPC_STUB IXpsOMRadialGradientBrush_SetCenter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMRadialGradientBrush_GetRadiiSizes_Proxy( - IXpsOMRadialGradientBrush* This, - XPS_SIZE *radiiSizes); -void __RPC_STUB IXpsOMRadialGradientBrush_GetRadiiSizes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMRadialGradientBrush_SetRadiiSizes_Proxy( - IXpsOMRadialGradientBrush* This, - const XPS_SIZE *radiiSizes); -void __RPC_STUB IXpsOMRadialGradientBrush_SetRadiiSizes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMRadialGradientBrush_GetGradientOrigin_Proxy( - IXpsOMRadialGradientBrush* This, - XPS_POINT *origin); -void __RPC_STUB IXpsOMRadialGradientBrush_GetGradientOrigin_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMRadialGradientBrush_SetGradientOrigin_Proxy( - IXpsOMRadialGradientBrush* This, - const XPS_POINT *origin); -void __RPC_STUB IXpsOMRadialGradientBrush_SetGradientOrigin_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMRadialGradientBrush_Clone_Proxy( - IXpsOMRadialGradientBrush* This, - IXpsOMRadialGradientBrush **radialGradientBrush); -void __RPC_STUB IXpsOMRadialGradientBrush_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMRadialGradientBrush_INTERFACE_DEFINED__ */ @@ -11681,27 +9017,28 @@ typedef struct IXpsOMResourceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMResource* This, + IXpsOMResource *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMResource* This); + IXpsOMResource *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMResource* This); + IXpsOMResource *This); /*** IXpsOMPart methods ***/ HRESULT (STDMETHODCALLTYPE *GetPartName)( - IXpsOMResource* This, + IXpsOMResource *This, IOpcPartUri **partUri); HRESULT (STDMETHODCALLTYPE *SetPartName)( - IXpsOMResource* This, + IXpsOMResource *This, IOpcPartUri *partUri); END_INTERFACE } IXpsOMResourceVtbl; + interface IXpsOMResource { CONST_VTBL IXpsOMResourceVtbl* lpVtbl; }; @@ -11773,42 +9110,43 @@ typedef struct IXpsOMFontResourceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMFontResource* This, + IXpsOMFontResource *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMFontResource* This); + IXpsOMFontResource *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMFontResource* This); + IXpsOMFontResource *This); /*** IXpsOMPart methods ***/ HRESULT (STDMETHODCALLTYPE *GetPartName)( - IXpsOMFontResource* This, + IXpsOMFontResource *This, IOpcPartUri **partUri); HRESULT (STDMETHODCALLTYPE *SetPartName)( - IXpsOMFontResource* This, + IXpsOMFontResource *This, IOpcPartUri *partUri); /*** IXpsOMFontResource methods ***/ HRESULT (STDMETHODCALLTYPE *GetStream)( - IXpsOMFontResource* This, + IXpsOMFontResource *This, IStream **readerStream); HRESULT (STDMETHODCALLTYPE *SetContent)( - IXpsOMFontResource* This, + IXpsOMFontResource *This, IStream *sourceStream, XPS_FONT_EMBEDDING embeddingOption, IOpcPartUri *partName); HRESULT (STDMETHODCALLTYPE *GetEmbeddingOption)( - IXpsOMFontResource* This, + IXpsOMFontResource *This, XPS_FONT_EMBEDDING *embeddingOption); END_INTERFACE } IXpsOMFontResourceVtbl; + interface IXpsOMFontResource { CONST_VTBL IXpsOMFontResourceVtbl* lpVtbl; }; @@ -11859,32 +9197,6 @@ static FORCEINLINE HRESULT IXpsOMFontResource_GetEmbeddingOption(IXpsOMFontResou #endif -HRESULT STDMETHODCALLTYPE IXpsOMFontResource_GetStream_Proxy( - IXpsOMFontResource* This, - IStream **readerStream); -void __RPC_STUB IXpsOMFontResource_GetStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMFontResource_SetContent_Proxy( - IXpsOMFontResource* This, - IStream *sourceStream, - XPS_FONT_EMBEDDING embeddingOption, - IOpcPartUri *partName); -void __RPC_STUB IXpsOMFontResource_SetContent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMFontResource_GetEmbeddingOption_Proxy( - IXpsOMFontResource* This, - XPS_FONT_EMBEDDING *embeddingOption); -void __RPC_STUB IXpsOMFontResource_GetEmbeddingOption_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMFontResource_INTERFACE_DEFINED__ */ @@ -11920,42 +9232,43 @@ typedef struct IXpsOMImageResourceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMImageResource* This, + IXpsOMImageResource *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMImageResource* This); + IXpsOMImageResource *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMImageResource* This); + IXpsOMImageResource *This); /*** IXpsOMPart methods ***/ HRESULT (STDMETHODCALLTYPE *GetPartName)( - IXpsOMImageResource* This, + IXpsOMImageResource *This, IOpcPartUri **partUri); HRESULT (STDMETHODCALLTYPE *SetPartName)( - IXpsOMImageResource* This, + IXpsOMImageResource *This, IOpcPartUri *partUri); /*** IXpsOMImageResource methods ***/ HRESULT (STDMETHODCALLTYPE *GetStream)( - IXpsOMImageResource* This, + IXpsOMImageResource *This, IStream **readerStream); HRESULT (STDMETHODCALLTYPE *SetContent)( - IXpsOMImageResource* This, + IXpsOMImageResource *This, IStream *sourceStream, XPS_IMAGE_TYPE imageType, IOpcPartUri *partName); HRESULT (STDMETHODCALLTYPE *GetImageType)( - IXpsOMImageResource* This, + IXpsOMImageResource *This, XPS_IMAGE_TYPE *imageType); END_INTERFACE } IXpsOMImageResourceVtbl; + interface IXpsOMImageResource { CONST_VTBL IXpsOMImageResourceVtbl* lpVtbl; }; @@ -12006,32 +9319,6 @@ static FORCEINLINE HRESULT IXpsOMImageResource_GetImageType(IXpsOMImageResource* #endif -HRESULT STDMETHODCALLTYPE IXpsOMImageResource_GetStream_Proxy( - IXpsOMImageResource* This, - IStream **readerStream); -void __RPC_STUB IXpsOMImageResource_GetStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMImageResource_SetContent_Proxy( - IXpsOMImageResource* This, - IStream *sourceStream, - XPS_IMAGE_TYPE imageType, - IOpcPartUri *partName); -void __RPC_STUB IXpsOMImageResource_SetContent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMImageResource_GetImageType_Proxy( - IXpsOMImageResource* This, - XPS_IMAGE_TYPE *imageType); -void __RPC_STUB IXpsOMImageResource_GetImageType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMImageResource_INTERFACE_DEFINED__ */ @@ -12063,37 +9350,38 @@ typedef struct IXpsOMColorProfileResourceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMColorProfileResource* This, + IXpsOMColorProfileResource *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMColorProfileResource* This); + IXpsOMColorProfileResource *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMColorProfileResource* This); + IXpsOMColorProfileResource *This); /*** IXpsOMPart methods ***/ HRESULT (STDMETHODCALLTYPE *GetPartName)( - IXpsOMColorProfileResource* This, + IXpsOMColorProfileResource *This, IOpcPartUri **partUri); HRESULT (STDMETHODCALLTYPE *SetPartName)( - IXpsOMColorProfileResource* This, + IXpsOMColorProfileResource *This, IOpcPartUri *partUri); /*** IXpsOMColorProfileResource methods ***/ HRESULT (STDMETHODCALLTYPE *GetStream)( - IXpsOMColorProfileResource* This, + IXpsOMColorProfileResource *This, IStream **stream); HRESULT (STDMETHODCALLTYPE *SetContent)( - IXpsOMColorProfileResource* This, + IXpsOMColorProfileResource *This, IStream *sourceStream, IOpcPartUri *partName); END_INTERFACE } IXpsOMColorProfileResourceVtbl; + interface IXpsOMColorProfileResource { CONST_VTBL IXpsOMColorProfileResourceVtbl* lpVtbl; }; @@ -12140,23 +9428,6 @@ static FORCEINLINE HRESULT IXpsOMColorProfileResource_SetContent(IXpsOMColorProf #endif -HRESULT STDMETHODCALLTYPE IXpsOMColorProfileResource_GetStream_Proxy( - IXpsOMColorProfileResource* This, - IStream **stream); -void __RPC_STUB IXpsOMColorProfileResource_GetStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMColorProfileResource_SetContent_Proxy( - IXpsOMColorProfileResource* This, - IStream *sourceStream, - IOpcPartUri *partName); -void __RPC_STUB IXpsOMColorProfileResource_SetContent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMColorProfileResource_INTERFACE_DEFINED__ */ @@ -12188,37 +9459,38 @@ typedef struct IXpsOMPrintTicketResourceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMPrintTicketResource* This, + IXpsOMPrintTicketResource *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMPrintTicketResource* This); + IXpsOMPrintTicketResource *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMPrintTicketResource* This); + IXpsOMPrintTicketResource *This); /*** IXpsOMPart methods ***/ HRESULT (STDMETHODCALLTYPE *GetPartName)( - IXpsOMPrintTicketResource* This, + IXpsOMPrintTicketResource *This, IOpcPartUri **partUri); HRESULT (STDMETHODCALLTYPE *SetPartName)( - IXpsOMPrintTicketResource* This, + IXpsOMPrintTicketResource *This, IOpcPartUri *partUri); /*** IXpsOMPrintTicketResource methods ***/ HRESULT (STDMETHODCALLTYPE *GetStream)( - IXpsOMPrintTicketResource* This, + IXpsOMPrintTicketResource *This, IStream **stream); HRESULT (STDMETHODCALLTYPE *SetContent)( - IXpsOMPrintTicketResource* This, + IXpsOMPrintTicketResource *This, IStream *sourceStream, IOpcPartUri *partName); END_INTERFACE } IXpsOMPrintTicketResourceVtbl; + interface IXpsOMPrintTicketResource { CONST_VTBL IXpsOMPrintTicketResourceVtbl* lpVtbl; }; @@ -12265,23 +9537,6 @@ static FORCEINLINE HRESULT IXpsOMPrintTicketResource_SetContent(IXpsOMPrintTicke #endif -HRESULT STDMETHODCALLTYPE IXpsOMPrintTicketResource_GetStream_Proxy( - IXpsOMPrintTicketResource* This, - IStream **stream); -void __RPC_STUB IXpsOMPrintTicketResource_GetStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPrintTicketResource_SetContent_Proxy( - IXpsOMPrintTicketResource* This, - IStream *sourceStream, - IOpcPartUri *partName); -void __RPC_STUB IXpsOMPrintTicketResource_SetContent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMPrintTicketResource_INTERFACE_DEFINED__ */ @@ -12312,36 +9567,37 @@ typedef struct IXpsOMRemoteDictionaryResourceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMRemoteDictionaryResource* This, + IXpsOMRemoteDictionaryResource *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMRemoteDictionaryResource* This); + IXpsOMRemoteDictionaryResource *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMRemoteDictionaryResource* This); + IXpsOMRemoteDictionaryResource *This); /*** IXpsOMPart methods ***/ HRESULT (STDMETHODCALLTYPE *GetPartName)( - IXpsOMRemoteDictionaryResource* This, + IXpsOMRemoteDictionaryResource *This, IOpcPartUri **partUri); HRESULT (STDMETHODCALLTYPE *SetPartName)( - IXpsOMRemoteDictionaryResource* This, + IXpsOMRemoteDictionaryResource *This, IOpcPartUri *partUri); /*** IXpsOMRemoteDictionaryResource methods ***/ HRESULT (STDMETHODCALLTYPE *GetDictionary)( - IXpsOMRemoteDictionaryResource* This, + IXpsOMRemoteDictionaryResource *This, IXpsOMDictionary **dictionary); HRESULT (STDMETHODCALLTYPE *SetDictionary)( - IXpsOMRemoteDictionaryResource* This, + IXpsOMRemoteDictionaryResource *This, IXpsOMDictionary *dictionary); END_INTERFACE } IXpsOMRemoteDictionaryResourceVtbl; + interface IXpsOMRemoteDictionaryResource { CONST_VTBL IXpsOMRemoteDictionaryResourceVtbl* lpVtbl; }; @@ -12388,22 +9644,6 @@ static FORCEINLINE HRESULT IXpsOMRemoteDictionaryResource_SetDictionary(IXpsOMRe #endif -HRESULT STDMETHODCALLTYPE IXpsOMRemoteDictionaryResource_GetDictionary_Proxy( - IXpsOMRemoteDictionaryResource* This, - IXpsOMDictionary **dictionary); -void __RPC_STUB IXpsOMRemoteDictionaryResource_GetDictionary_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMRemoteDictionaryResource_SetDictionary_Proxy( - IXpsOMRemoteDictionaryResource* This, - IXpsOMDictionary *dictionary); -void __RPC_STUB IXpsOMRemoteDictionaryResource_SetDictionary_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMRemoteDictionaryResource_INTERFACE_DEFINED__ */ @@ -12438,41 +9678,42 @@ typedef struct IXpsOMDocumentStructureResourceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMDocumentStructureResource* This, + IXpsOMDocumentStructureResource *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMDocumentStructureResource* This); + IXpsOMDocumentStructureResource *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMDocumentStructureResource* This); + IXpsOMDocumentStructureResource *This); /*** IXpsOMPart methods ***/ HRESULT (STDMETHODCALLTYPE *GetPartName)( - IXpsOMDocumentStructureResource* This, + IXpsOMDocumentStructureResource *This, IOpcPartUri **partUri); HRESULT (STDMETHODCALLTYPE *SetPartName)( - IXpsOMDocumentStructureResource* This, + IXpsOMDocumentStructureResource *This, IOpcPartUri *partUri); /*** IXpsOMDocumentStructureResource methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMDocumentStructureResource* This, + IXpsOMDocumentStructureResource *This, IXpsOMDocument **owner); HRESULT (STDMETHODCALLTYPE *GetStream)( - IXpsOMDocumentStructureResource* This, + IXpsOMDocumentStructureResource *This, IStream **stream); HRESULT (STDMETHODCALLTYPE *SetContent)( - IXpsOMDocumentStructureResource* This, + IXpsOMDocumentStructureResource *This, IStream *sourceStream, IOpcPartUri *partName); END_INTERFACE } IXpsOMDocumentStructureResourceVtbl; + interface IXpsOMDocumentStructureResource { CONST_VTBL IXpsOMDocumentStructureResourceVtbl* lpVtbl; }; @@ -12523,31 +9764,6 @@ static FORCEINLINE HRESULT IXpsOMDocumentStructureResource_SetContent(IXpsOMDocu #endif -HRESULT STDMETHODCALLTYPE IXpsOMDocumentStructureResource_GetOwner_Proxy( - IXpsOMDocumentStructureResource* This, - IXpsOMDocument **owner); -void __RPC_STUB IXpsOMDocumentStructureResource_GetOwner_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDocumentStructureResource_GetStream_Proxy( - IXpsOMDocumentStructureResource* This, - IStream **stream); -void __RPC_STUB IXpsOMDocumentStructureResource_GetStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDocumentStructureResource_SetContent_Proxy( - IXpsOMDocumentStructureResource* This, - IStream *sourceStream, - IOpcPartUri *partName); -void __RPC_STUB IXpsOMDocumentStructureResource_SetContent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMDocumentStructureResource_INTERFACE_DEFINED__ */ @@ -12582,41 +9798,42 @@ typedef struct IXpsOMStoryFragmentsResourceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMStoryFragmentsResource* This, + IXpsOMStoryFragmentsResource *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMStoryFragmentsResource* This); + IXpsOMStoryFragmentsResource *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMStoryFragmentsResource* This); + IXpsOMStoryFragmentsResource *This); /*** IXpsOMPart methods ***/ HRESULT (STDMETHODCALLTYPE *GetPartName)( - IXpsOMStoryFragmentsResource* This, + IXpsOMStoryFragmentsResource *This, IOpcPartUri **partUri); HRESULT (STDMETHODCALLTYPE *SetPartName)( - IXpsOMStoryFragmentsResource* This, + IXpsOMStoryFragmentsResource *This, IOpcPartUri *partUri); /*** IXpsOMStoryFragmentsResource methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMStoryFragmentsResource* This, + IXpsOMStoryFragmentsResource *This, IXpsOMPageReference **owner); HRESULT (STDMETHODCALLTYPE *GetStream)( - IXpsOMStoryFragmentsResource* This, + IXpsOMStoryFragmentsResource *This, IStream **stream); HRESULT (STDMETHODCALLTYPE *SetContent)( - IXpsOMStoryFragmentsResource* This, + IXpsOMStoryFragmentsResource *This, IStream *sourceStream, IOpcPartUri *partName); END_INTERFACE } IXpsOMStoryFragmentsResourceVtbl; + interface IXpsOMStoryFragmentsResource { CONST_VTBL IXpsOMStoryFragmentsResourceVtbl* lpVtbl; }; @@ -12667,31 +9884,6 @@ static FORCEINLINE HRESULT IXpsOMStoryFragmentsResource_SetContent(IXpsOMStoryFr #endif -HRESULT STDMETHODCALLTYPE IXpsOMStoryFragmentsResource_GetOwner_Proxy( - IXpsOMStoryFragmentsResource* This, - IXpsOMPageReference **owner); -void __RPC_STUB IXpsOMStoryFragmentsResource_GetOwner_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMStoryFragmentsResource_GetStream_Proxy( - IXpsOMStoryFragmentsResource* This, - IStream **stream); -void __RPC_STUB IXpsOMStoryFragmentsResource_GetStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMStoryFragmentsResource_SetContent_Proxy( - IXpsOMStoryFragmentsResource* This, - IStream *sourceStream, - IOpcPartUri *partName); -void __RPC_STUB IXpsOMStoryFragmentsResource_SetContent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMStoryFragmentsResource_INTERFACE_DEFINED__ */ @@ -12726,41 +9918,42 @@ typedef struct IXpsOMSignatureBlockResourceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMSignatureBlockResource* This, + IXpsOMSignatureBlockResource *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMSignatureBlockResource* This); + IXpsOMSignatureBlockResource *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMSignatureBlockResource* This); + IXpsOMSignatureBlockResource *This); /*** IXpsOMPart methods ***/ HRESULT (STDMETHODCALLTYPE *GetPartName)( - IXpsOMSignatureBlockResource* This, + IXpsOMSignatureBlockResource *This, IOpcPartUri **partUri); HRESULT (STDMETHODCALLTYPE *SetPartName)( - IXpsOMSignatureBlockResource* This, + IXpsOMSignatureBlockResource *This, IOpcPartUri *partUri); /*** IXpsOMSignatureBlockResource methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMSignatureBlockResource* This, + IXpsOMSignatureBlockResource *This, IXpsOMDocument **owner); HRESULT (STDMETHODCALLTYPE *GetStream)( - IXpsOMSignatureBlockResource* This, + IXpsOMSignatureBlockResource *This, IStream **stream); HRESULT (STDMETHODCALLTYPE *SetContent)( - IXpsOMSignatureBlockResource* This, + IXpsOMSignatureBlockResource *This, IStream *sourceStream, IOpcPartUri *partName); END_INTERFACE } IXpsOMSignatureBlockResourceVtbl; + interface IXpsOMSignatureBlockResource { CONST_VTBL IXpsOMSignatureBlockResourceVtbl* lpVtbl; }; @@ -12811,31 +10004,6 @@ static FORCEINLINE HRESULT IXpsOMSignatureBlockResource_SetContent(IXpsOMSignatu #endif -HRESULT STDMETHODCALLTYPE IXpsOMSignatureBlockResource_GetOwner_Proxy( - IXpsOMSignatureBlockResource* This, - IXpsOMDocument **owner); -void __RPC_STUB IXpsOMSignatureBlockResource_GetOwner_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMSignatureBlockResource_GetStream_Proxy( - IXpsOMSignatureBlockResource* This, - IStream **stream); -void __RPC_STUB IXpsOMSignatureBlockResource_GetStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMSignatureBlockResource_SetContent_Proxy( - IXpsOMSignatureBlockResource* This, - IStream *sourceStream, - IOpcPartUri *partName); -void __RPC_STUB IXpsOMSignatureBlockResource_SetContent_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMSignatureBlockResource_INTERFACE_DEFINED__ */ @@ -12899,181 +10067,182 @@ typedef struct IXpsOMCanvasVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMCanvas* This); + IXpsOMCanvas *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMCanvas* This); + IXpsOMCanvas *This); /*** IXpsOMShareable methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, IUnknown **owner); HRESULT (STDMETHODCALLTYPE *GetType)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, XPS_OBJECT_TYPE *type); /*** IXpsOMVisual methods ***/ HRESULT (STDMETHODCALLTYPE *GetTransform)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, IXpsOMMatrixTransform **matrixTransform); HRESULT (STDMETHODCALLTYPE *GetTransformLocal)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, IXpsOMMatrixTransform **matrixTransform); HRESULT (STDMETHODCALLTYPE *SetTransformLocal)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, IXpsOMMatrixTransform *matrixTransform); HRESULT (STDMETHODCALLTYPE *GetTransformLookup)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, LPWSTR *key); HRESULT (STDMETHODCALLTYPE *SetTransformLookup)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, LPCWSTR key); HRESULT (STDMETHODCALLTYPE *GetClipGeometry)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, IXpsOMGeometry **clipGeometry); HRESULT (STDMETHODCALLTYPE *GetClipGeometryLocal)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, IXpsOMGeometry **clipGeometry); HRESULT (STDMETHODCALLTYPE *SetClipGeometryLocal)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, IXpsOMGeometry *clipGeometry); HRESULT (STDMETHODCALLTYPE *GetClipGeometryLookup)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, LPWSTR *key); HRESULT (STDMETHODCALLTYPE *SetClipGeometryLookup)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, LPCWSTR key); HRESULT (STDMETHODCALLTYPE *GetOpacity)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, FLOAT *opacity); HRESULT (STDMETHODCALLTYPE *SetOpacity)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, FLOAT opacity); HRESULT (STDMETHODCALLTYPE *GetOpacityMaskBrush)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, IXpsOMBrush **opacityMaskBrush); HRESULT (STDMETHODCALLTYPE *GetOpacityMaskBrushLocal)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, IXpsOMBrush **opacityMaskBrush); HRESULT (STDMETHODCALLTYPE *SetOpacityMaskBrushLocal)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, IXpsOMBrush *opacityMaskBrush); HRESULT (STDMETHODCALLTYPE *GetOpacityMaskBrushLookup)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, LPWSTR *key); HRESULT (STDMETHODCALLTYPE *SetOpacityMaskBrushLookup)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, LPCWSTR key); HRESULT (STDMETHODCALLTYPE *GetName)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, LPWSTR *name); HRESULT (STDMETHODCALLTYPE *SetName)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, LPCWSTR name); HRESULT (STDMETHODCALLTYPE *GetIsHyperlinkTarget)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, WINBOOL *isHyperlink); HRESULT (STDMETHODCALLTYPE *SetIsHyperlinkTarget)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, WINBOOL isHyperlink); HRESULT (STDMETHODCALLTYPE *GetHyperlinkNavigateUri)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, IUri **hyperlinkUri); HRESULT (STDMETHODCALLTYPE *SetHyperlinkNavigateUri)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, IUri *hyperlinkUri); HRESULT (STDMETHODCALLTYPE *GetLanguage)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, LPWSTR *language); HRESULT (STDMETHODCALLTYPE *SetLanguage)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, LPCWSTR language); /*** IXpsOMCanvas methods ***/ HRESULT (STDMETHODCALLTYPE *GetVisuals)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, IXpsOMVisualCollection **visuals); HRESULT (STDMETHODCALLTYPE *GetUseAliasedEdgeMode)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, WINBOOL *useAliasedEdgeMode); HRESULT (STDMETHODCALLTYPE *SetUseAliasedEdgeMode)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, WINBOOL useAliasedEdgeMode); HRESULT (STDMETHODCALLTYPE *GetAccessibilityShortDescription)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, LPWSTR *shortDescription); HRESULT (STDMETHODCALLTYPE *SetAccessibilityShortDescription)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, LPCWSTR shortDescription); HRESULT (STDMETHODCALLTYPE *GetAccessibilityLongDescription)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, LPWSTR *longDescription); HRESULT (STDMETHODCALLTYPE *SetAccessibilityLongDescription)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, LPCWSTR longDescription); HRESULT (STDMETHODCALLTYPE *GetDictionary)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, IXpsOMDictionary **resourceDictionary); HRESULT (STDMETHODCALLTYPE *GetDictionaryLocal)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, IXpsOMDictionary **resourceDictionary); HRESULT (STDMETHODCALLTYPE *SetDictionaryLocal)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, IXpsOMDictionary *resourceDictionary); HRESULT (STDMETHODCALLTYPE *GetDictionaryResource)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, IXpsOMRemoteDictionaryResource **remoteDictionaryResource); HRESULT (STDMETHODCALLTYPE *SetDictionaryResource)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, IXpsOMRemoteDictionaryResource *remoteDictionaryResource); HRESULT (STDMETHODCALLTYPE *Clone)( - IXpsOMCanvas* This, + IXpsOMCanvas *This, IXpsOMCanvas **canvas); END_INTERFACE } IXpsOMCanvasVtbl; + interface IXpsOMCanvas { CONST_VTBL IXpsOMCanvasVtbl* lpVtbl; }; @@ -13266,110 +10435,6 @@ static FORCEINLINE HRESULT IXpsOMCanvas_Clone(IXpsOMCanvas* This,IXpsOMCanvas ** #endif -HRESULT STDMETHODCALLTYPE IXpsOMCanvas_GetVisuals_Proxy( - IXpsOMCanvas* This, - IXpsOMVisualCollection **visuals); -void __RPC_STUB IXpsOMCanvas_GetVisuals_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCanvas_GetUseAliasedEdgeMode_Proxy( - IXpsOMCanvas* This, - WINBOOL *useAliasedEdgeMode); -void __RPC_STUB IXpsOMCanvas_GetUseAliasedEdgeMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCanvas_SetUseAliasedEdgeMode_Proxy( - IXpsOMCanvas* This, - WINBOOL useAliasedEdgeMode); -void __RPC_STUB IXpsOMCanvas_SetUseAliasedEdgeMode_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCanvas_GetAccessibilityShortDescription_Proxy( - IXpsOMCanvas* This, - LPWSTR *shortDescription); -void __RPC_STUB IXpsOMCanvas_GetAccessibilityShortDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCanvas_SetAccessibilityShortDescription_Proxy( - IXpsOMCanvas* This, - LPCWSTR shortDescription); -void __RPC_STUB IXpsOMCanvas_SetAccessibilityShortDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCanvas_GetAccessibilityLongDescription_Proxy( - IXpsOMCanvas* This, - LPWSTR *longDescription); -void __RPC_STUB IXpsOMCanvas_GetAccessibilityLongDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCanvas_SetAccessibilityLongDescription_Proxy( - IXpsOMCanvas* This, - LPCWSTR longDescription); -void __RPC_STUB IXpsOMCanvas_SetAccessibilityLongDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCanvas_GetDictionary_Proxy( - IXpsOMCanvas* This, - IXpsOMDictionary **resourceDictionary); -void __RPC_STUB IXpsOMCanvas_GetDictionary_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCanvas_GetDictionaryLocal_Proxy( - IXpsOMCanvas* This, - IXpsOMDictionary **resourceDictionary); -void __RPC_STUB IXpsOMCanvas_GetDictionaryLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCanvas_SetDictionaryLocal_Proxy( - IXpsOMCanvas* This, - IXpsOMDictionary *resourceDictionary); -void __RPC_STUB IXpsOMCanvas_SetDictionaryLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCanvas_GetDictionaryResource_Proxy( - IXpsOMCanvas* This, - IXpsOMRemoteDictionaryResource **remoteDictionaryResource); -void __RPC_STUB IXpsOMCanvas_GetDictionaryResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCanvas_SetDictionaryResource_Proxy( - IXpsOMCanvas* This, - IXpsOMRemoteDictionaryResource *remoteDictionaryResource); -void __RPC_STUB IXpsOMCanvas_SetDictionaryResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCanvas_Clone_Proxy( - IXpsOMCanvas* This, - IXpsOMCanvas **canvas); -void __RPC_STUB IXpsOMCanvas_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMCanvas_INTERFACE_DEFINED__ */ @@ -13462,118 +10527,119 @@ typedef struct IXpsOMPageVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMPage* This, + IXpsOMPage *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMPage* This); + IXpsOMPage *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMPage* This); + IXpsOMPage *This); /*** IXpsOMPart methods ***/ HRESULT (STDMETHODCALLTYPE *GetPartName)( - IXpsOMPage* This, + IXpsOMPage *This, IOpcPartUri **partUri); HRESULT (STDMETHODCALLTYPE *SetPartName)( - IXpsOMPage* This, + IXpsOMPage *This, IOpcPartUri *partUri); /*** IXpsOMPage methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMPage* This, + IXpsOMPage *This, IXpsOMPageReference **pageReference); HRESULT (STDMETHODCALLTYPE *GetVisuals)( - IXpsOMPage* This, + IXpsOMPage *This, IXpsOMVisualCollection **visuals); HRESULT (STDMETHODCALLTYPE *GetPageDimensions)( - IXpsOMPage* This, + IXpsOMPage *This, XPS_SIZE *pageDimensions); HRESULT (STDMETHODCALLTYPE *SetPageDimensions)( - IXpsOMPage* This, + IXpsOMPage *This, const XPS_SIZE *pageDimensions); HRESULT (STDMETHODCALLTYPE *GetContentBox)( - IXpsOMPage* This, + IXpsOMPage *This, XPS_RECT *contentBox); HRESULT (STDMETHODCALLTYPE *SetContentBox)( - IXpsOMPage* This, + IXpsOMPage *This, const XPS_RECT *contentBox); HRESULT (STDMETHODCALLTYPE *GetBleedBox)( - IXpsOMPage* This, + IXpsOMPage *This, XPS_RECT *bleedBox); HRESULT (STDMETHODCALLTYPE *SetBleedBox)( - IXpsOMPage* This, + IXpsOMPage *This, const XPS_RECT *bleedBox); HRESULT (STDMETHODCALLTYPE *GetLanguage)( - IXpsOMPage* This, + IXpsOMPage *This, LPWSTR *language); HRESULT (STDMETHODCALLTYPE *SetLanguage)( - IXpsOMPage* This, + IXpsOMPage *This, LPCWSTR language); HRESULT (STDMETHODCALLTYPE *GetName)( - IXpsOMPage* This, + IXpsOMPage *This, LPWSTR *name); HRESULT (STDMETHODCALLTYPE *SetName)( - IXpsOMPage* This, + IXpsOMPage *This, LPCWSTR name); HRESULT (STDMETHODCALLTYPE *GetIsHyperlinkTarget)( - IXpsOMPage* This, + IXpsOMPage *This, WINBOOL *isHyperlinkTarget); HRESULT (STDMETHODCALLTYPE *SetIsHyperlinkTarget)( - IXpsOMPage* This, + IXpsOMPage *This, WINBOOL isHyperlinkTarget); HRESULT (STDMETHODCALLTYPE *GetDictionary)( - IXpsOMPage* This, + IXpsOMPage *This, IXpsOMDictionary **resourceDictionary); HRESULT (STDMETHODCALLTYPE *GetDictionaryLocal)( - IXpsOMPage* This, + IXpsOMPage *This, IXpsOMDictionary **resourceDictionary); HRESULT (STDMETHODCALLTYPE *SetDictionaryLocal)( - IXpsOMPage* This, + IXpsOMPage *This, IXpsOMDictionary *resourceDictionary); HRESULT (STDMETHODCALLTYPE *GetDictionaryResource)( - IXpsOMPage* This, + IXpsOMPage *This, IXpsOMRemoteDictionaryResource **remoteDictionaryResource); HRESULT (STDMETHODCALLTYPE *SetDictionaryResource)( - IXpsOMPage* This, + IXpsOMPage *This, IXpsOMRemoteDictionaryResource *remoteDictionaryResource); HRESULT (STDMETHODCALLTYPE *Write)( - IXpsOMPage* This, + IXpsOMPage *This, ISequentialStream *stream, WINBOOL optimizeMarkupSize); HRESULT (STDMETHODCALLTYPE *GenerateUnusedLookupKey)( - IXpsOMPage* This, + IXpsOMPage *This, XPS_OBJECT_TYPE type, LPWSTR *key); HRESULT (STDMETHODCALLTYPE *Clone)( - IXpsOMPage* This, + IXpsOMPage *This, IXpsOMPage **page); END_INTERFACE } IXpsOMPageVtbl; + interface IXpsOMPage { CONST_VTBL IXpsOMPageVtbl* lpVtbl; }; @@ -13700,184 +10766,6 @@ static FORCEINLINE HRESULT IXpsOMPage_Clone(IXpsOMPage* This,IXpsOMPage **page) #endif -HRESULT STDMETHODCALLTYPE IXpsOMPage_GetOwner_Proxy( - IXpsOMPage* This, - IXpsOMPageReference **pageReference); -void __RPC_STUB IXpsOMPage_GetOwner_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPage_GetVisuals_Proxy( - IXpsOMPage* This, - IXpsOMVisualCollection **visuals); -void __RPC_STUB IXpsOMPage_GetVisuals_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPage_GetPageDimensions_Proxy( - IXpsOMPage* This, - XPS_SIZE *pageDimensions); -void __RPC_STUB IXpsOMPage_GetPageDimensions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPage_SetPageDimensions_Proxy( - IXpsOMPage* This, - const XPS_SIZE *pageDimensions); -void __RPC_STUB IXpsOMPage_SetPageDimensions_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPage_GetContentBox_Proxy( - IXpsOMPage* This, - XPS_RECT *contentBox); -void __RPC_STUB IXpsOMPage_GetContentBox_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPage_SetContentBox_Proxy( - IXpsOMPage* This, - const XPS_RECT *contentBox); -void __RPC_STUB IXpsOMPage_SetContentBox_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPage_GetBleedBox_Proxy( - IXpsOMPage* This, - XPS_RECT *bleedBox); -void __RPC_STUB IXpsOMPage_GetBleedBox_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPage_SetBleedBox_Proxy( - IXpsOMPage* This, - const XPS_RECT *bleedBox); -void __RPC_STUB IXpsOMPage_SetBleedBox_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPage_GetLanguage_Proxy( - IXpsOMPage* This, - LPWSTR *language); -void __RPC_STUB IXpsOMPage_GetLanguage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPage_SetLanguage_Proxy( - IXpsOMPage* This, - LPCWSTR language); -void __RPC_STUB IXpsOMPage_SetLanguage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPage_GetName_Proxy( - IXpsOMPage* This, - LPWSTR *name); -void __RPC_STUB IXpsOMPage_GetName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPage_SetName_Proxy( - IXpsOMPage* This, - LPCWSTR name); -void __RPC_STUB IXpsOMPage_SetName_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPage_GetIsHyperlinkTarget_Proxy( - IXpsOMPage* This, - WINBOOL *isHyperlinkTarget); -void __RPC_STUB IXpsOMPage_GetIsHyperlinkTarget_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPage_SetIsHyperlinkTarget_Proxy( - IXpsOMPage* This, - WINBOOL isHyperlinkTarget); -void __RPC_STUB IXpsOMPage_SetIsHyperlinkTarget_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPage_GetDictionary_Proxy( - IXpsOMPage* This, - IXpsOMDictionary **resourceDictionary); -void __RPC_STUB IXpsOMPage_GetDictionary_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPage_GetDictionaryLocal_Proxy( - IXpsOMPage* This, - IXpsOMDictionary **resourceDictionary); -void __RPC_STUB IXpsOMPage_GetDictionaryLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPage_SetDictionaryLocal_Proxy( - IXpsOMPage* This, - IXpsOMDictionary *resourceDictionary); -void __RPC_STUB IXpsOMPage_SetDictionaryLocal_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPage_GetDictionaryResource_Proxy( - IXpsOMPage* This, - IXpsOMRemoteDictionaryResource **remoteDictionaryResource); -void __RPC_STUB IXpsOMPage_GetDictionaryResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPage_SetDictionaryResource_Proxy( - IXpsOMPage* This, - IXpsOMRemoteDictionaryResource *remoteDictionaryResource); -void __RPC_STUB IXpsOMPage_SetDictionaryResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPage_Write_Proxy( - IXpsOMPage* This, - ISequentialStream *stream, - WINBOOL optimizeMarkupSize); -void __RPC_STUB IXpsOMPage_Write_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPage_GenerateUnusedLookupKey_Proxy( - IXpsOMPage* This, - XPS_OBJECT_TYPE type, - LPWSTR *key); -void __RPC_STUB IXpsOMPage_GenerateUnusedLookupKey_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPage_Clone_Proxy( - IXpsOMPage* This, - IXpsOMPage **page); -void __RPC_STUB IXpsOMPage_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMPage_INTERFACE_DEFINED__ */ @@ -13926,60 +10814,61 @@ typedef struct IXpsOMDocumentVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMDocument* This, + IXpsOMDocument *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMDocument* This); + IXpsOMDocument *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMDocument* This); + IXpsOMDocument *This); /*** IXpsOMPart methods ***/ HRESULT (STDMETHODCALLTYPE *GetPartName)( - IXpsOMDocument* This, + IXpsOMDocument *This, IOpcPartUri **partUri); HRESULT (STDMETHODCALLTYPE *SetPartName)( - IXpsOMDocument* This, + IXpsOMDocument *This, IOpcPartUri *partUri); /*** IXpsOMDocument methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMDocument* This, + IXpsOMDocument *This, IXpsOMDocumentSequence **documentSequence); HRESULT (STDMETHODCALLTYPE *GetPageReferences)( - IXpsOMDocument* This, + IXpsOMDocument *This, IXpsOMPageReferenceCollection **pageReferences); HRESULT (STDMETHODCALLTYPE *GetPrintTicketResource)( - IXpsOMDocument* This, + IXpsOMDocument *This, IXpsOMPrintTicketResource **printTicketResource); HRESULT (STDMETHODCALLTYPE *SetPrintTicketResource)( - IXpsOMDocument* This, + IXpsOMDocument *This, IXpsOMPrintTicketResource *printTicketResource); HRESULT (STDMETHODCALLTYPE *GetDocumentStructureResource)( - IXpsOMDocument* This, + IXpsOMDocument *This, IXpsOMDocumentStructureResource **documentStructureResource); HRESULT (STDMETHODCALLTYPE *SetDocumentStructureResource)( - IXpsOMDocument* This, + IXpsOMDocument *This, IXpsOMDocumentStructureResource *documentStructureResource); HRESULT (STDMETHODCALLTYPE *GetSignatureBlockResources)( - IXpsOMDocument* This, + IXpsOMDocument *This, IXpsOMSignatureBlockResourceCollection **signatureBlockResources); HRESULT (STDMETHODCALLTYPE *Clone)( - IXpsOMDocument* This, + IXpsOMDocument *This, IXpsOMDocument **document); END_INTERFACE } IXpsOMDocumentVtbl; + interface IXpsOMDocument { CONST_VTBL IXpsOMDocumentVtbl* lpVtbl; }; @@ -14050,70 +10939,6 @@ static FORCEINLINE HRESULT IXpsOMDocument_Clone(IXpsOMDocument* This,IXpsOMDocum #endif -HRESULT STDMETHODCALLTYPE IXpsOMDocument_GetOwner_Proxy( - IXpsOMDocument* This, - IXpsOMDocumentSequence **documentSequence); -void __RPC_STUB IXpsOMDocument_GetOwner_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDocument_GetPageReferences_Proxy( - IXpsOMDocument* This, - IXpsOMPageReferenceCollection **pageReferences); -void __RPC_STUB IXpsOMDocument_GetPageReferences_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDocument_GetPrintTicketResource_Proxy( - IXpsOMDocument* This, - IXpsOMPrintTicketResource **printTicketResource); -void __RPC_STUB IXpsOMDocument_GetPrintTicketResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDocument_SetPrintTicketResource_Proxy( - IXpsOMDocument* This, - IXpsOMPrintTicketResource *printTicketResource); -void __RPC_STUB IXpsOMDocument_SetPrintTicketResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDocument_GetDocumentStructureResource_Proxy( - IXpsOMDocument* This, - IXpsOMDocumentStructureResource **documentStructureResource); -void __RPC_STUB IXpsOMDocument_GetDocumentStructureResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDocument_SetDocumentStructureResource_Proxy( - IXpsOMDocument* This, - IXpsOMDocumentStructureResource *documentStructureResource); -void __RPC_STUB IXpsOMDocument_SetDocumentStructureResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDocument_GetSignatureBlockResources_Proxy( - IXpsOMDocument* This, - IXpsOMSignatureBlockResourceCollection **signatureBlockResources); -void __RPC_STUB IXpsOMDocument_GetSignatureBlockResources_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDocument_Clone_Proxy( - IXpsOMDocument* This, - IXpsOMDocument **document); -void __RPC_STUB IXpsOMDocument_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMDocument_INTERFACE_DEFINED__ */ @@ -14150,44 +10975,45 @@ typedef struct IXpsOMDocumentSequenceVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMDocumentSequence* This, + IXpsOMDocumentSequence *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMDocumentSequence* This); + IXpsOMDocumentSequence *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMDocumentSequence* This); + IXpsOMDocumentSequence *This); /*** IXpsOMPart methods ***/ HRESULT (STDMETHODCALLTYPE *GetPartName)( - IXpsOMDocumentSequence* This, + IXpsOMDocumentSequence *This, IOpcPartUri **partUri); HRESULT (STDMETHODCALLTYPE *SetPartName)( - IXpsOMDocumentSequence* This, + IXpsOMDocumentSequence *This, IOpcPartUri *partUri); /*** IXpsOMDocumentSequence methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMDocumentSequence* This, + IXpsOMDocumentSequence *This, IXpsOMPackage **package); HRESULT (STDMETHODCALLTYPE *GetDocuments)( - IXpsOMDocumentSequence* This, + IXpsOMDocumentSequence *This, IXpsOMDocumentCollection **documents); HRESULT (STDMETHODCALLTYPE *GetPrintTicketResource)( - IXpsOMDocumentSequence* This, + IXpsOMDocumentSequence *This, IXpsOMPrintTicketResource **printTicketResource); HRESULT (STDMETHODCALLTYPE *SetPrintTicketResource)( - IXpsOMDocumentSequence* This, + IXpsOMDocumentSequence *This, IXpsOMPrintTicketResource *printTicketResource); END_INTERFACE } IXpsOMDocumentSequenceVtbl; + interface IXpsOMDocumentSequence { CONST_VTBL IXpsOMDocumentSequenceVtbl* lpVtbl; }; @@ -14242,38 +11068,6 @@ static FORCEINLINE HRESULT IXpsOMDocumentSequence_SetPrintTicketResource(IXpsOMD #endif -HRESULT STDMETHODCALLTYPE IXpsOMDocumentSequence_GetOwner_Proxy( - IXpsOMDocumentSequence* This, - IXpsOMPackage **package); -void __RPC_STUB IXpsOMDocumentSequence_GetOwner_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDocumentSequence_GetDocuments_Proxy( - IXpsOMDocumentSequence* This, - IXpsOMDocumentCollection **documents); -void __RPC_STUB IXpsOMDocumentSequence_GetDocuments_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDocumentSequence_GetPrintTicketResource_Proxy( - IXpsOMDocumentSequence* This, - IXpsOMPrintTicketResource **printTicketResource); -void __RPC_STUB IXpsOMDocumentSequence_GetPrintTicketResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMDocumentSequence_SetPrintTicketResource_Proxy( - IXpsOMDocumentSequence* This, - IXpsOMPrintTicketResource *printTicketResource); -void __RPC_STUB IXpsOMDocumentSequence_SetPrintTicketResource_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMDocumentSequence_INTERFACE_DEFINED__ */ @@ -14400,164 +11194,165 @@ typedef struct IXpsOMCorePropertiesVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMCoreProperties* This); + IXpsOMCoreProperties *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMCoreProperties* This); + IXpsOMCoreProperties *This); /*** IXpsOMPart methods ***/ HRESULT (STDMETHODCALLTYPE *GetPartName)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, IOpcPartUri **partUri); HRESULT (STDMETHODCALLTYPE *SetPartName)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, IOpcPartUri *partUri); /*** IXpsOMCoreProperties methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, IXpsOMPackage **package); HRESULT (STDMETHODCALLTYPE *GetCategory)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPWSTR *category); HRESULT (STDMETHODCALLTYPE *SetCategory)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPCWSTR category); HRESULT (STDMETHODCALLTYPE *GetContentStatus)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPWSTR *contentStatus); HRESULT (STDMETHODCALLTYPE *SetContentStatus)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPCWSTR contentStatus); HRESULT (STDMETHODCALLTYPE *GetContentType)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPWSTR *contentType); HRESULT (STDMETHODCALLTYPE *SetContentType)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPCWSTR contentType); HRESULT (STDMETHODCALLTYPE *GetCreated)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, SYSTEMTIME *created); HRESULT (STDMETHODCALLTYPE *SetCreated)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, const SYSTEMTIME *created); HRESULT (STDMETHODCALLTYPE *GetCreator)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPWSTR *creator); HRESULT (STDMETHODCALLTYPE *SetCreator)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPCWSTR creator); HRESULT (STDMETHODCALLTYPE *GetDescription)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPWSTR *description); HRESULT (STDMETHODCALLTYPE *SetDescription)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPCWSTR description); HRESULT (STDMETHODCALLTYPE *GetIdentifier)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPWSTR *identifier); HRESULT (STDMETHODCALLTYPE *SetIdentifier)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPCWSTR identifier); HRESULT (STDMETHODCALLTYPE *GetKeywords)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPWSTR *keywords); HRESULT (STDMETHODCALLTYPE *SetKeywords)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPCWSTR keywords); HRESULT (STDMETHODCALLTYPE *GetLanguage)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPWSTR *language); HRESULT (STDMETHODCALLTYPE *SetLanguage)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPCWSTR language); HRESULT (STDMETHODCALLTYPE *GetLastModifiedBy)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPWSTR *lastModifiedBy); HRESULT (STDMETHODCALLTYPE *SetLastModifiedBy)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPCWSTR lastModifiedBy); HRESULT (STDMETHODCALLTYPE *GetLastPrinted)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, SYSTEMTIME *lastPrinted); HRESULT (STDMETHODCALLTYPE *SetLastPrinted)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, const SYSTEMTIME *lastPrinted); HRESULT (STDMETHODCALLTYPE *GetModified)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, SYSTEMTIME *modified); HRESULT (STDMETHODCALLTYPE *SetModified)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, const SYSTEMTIME *modified); HRESULT (STDMETHODCALLTYPE *GetRevision)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPWSTR *revision); HRESULT (STDMETHODCALLTYPE *SetRevision)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPCWSTR revision); HRESULT (STDMETHODCALLTYPE *GetSubject)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPWSTR *subject); HRESULT (STDMETHODCALLTYPE *SetSubject)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPCWSTR subject); HRESULT (STDMETHODCALLTYPE *GetTitle)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPWSTR *title); HRESULT (STDMETHODCALLTYPE *SetTitle)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPCWSTR title); HRESULT (STDMETHODCALLTYPE *GetVersion)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPWSTR *version); HRESULT (STDMETHODCALLTYPE *SetVersion)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, LPCWSTR version); HRESULT (STDMETHODCALLTYPE *Clone)( - IXpsOMCoreProperties* This, + IXpsOMCoreProperties *This, IXpsOMCoreProperties **coreProperties); END_INTERFACE } IXpsOMCorePropertiesVtbl; + interface IXpsOMCoreProperties { CONST_VTBL IXpsOMCorePropertiesVtbl* lpVtbl; }; @@ -14732,278 +11527,6 @@ static FORCEINLINE HRESULT IXpsOMCoreProperties_Clone(IXpsOMCoreProperties* This #endif -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetOwner_Proxy( - IXpsOMCoreProperties* This, - IXpsOMPackage **package); -void __RPC_STUB IXpsOMCoreProperties_GetOwner_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetCategory_Proxy( - IXpsOMCoreProperties* This, - LPWSTR *category); -void __RPC_STUB IXpsOMCoreProperties_GetCategory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetCategory_Proxy( - IXpsOMCoreProperties* This, - LPCWSTR category); -void __RPC_STUB IXpsOMCoreProperties_SetCategory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetContentStatus_Proxy( - IXpsOMCoreProperties* This, - LPWSTR *contentStatus); -void __RPC_STUB IXpsOMCoreProperties_GetContentStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetContentStatus_Proxy( - IXpsOMCoreProperties* This, - LPCWSTR contentStatus); -void __RPC_STUB IXpsOMCoreProperties_SetContentStatus_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetContentType_Proxy( - IXpsOMCoreProperties* This, - LPWSTR *contentType); -void __RPC_STUB IXpsOMCoreProperties_GetContentType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetContentType_Proxy( - IXpsOMCoreProperties* This, - LPCWSTR contentType); -void __RPC_STUB IXpsOMCoreProperties_SetContentType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetCreated_Proxy( - IXpsOMCoreProperties* This, - SYSTEMTIME *created); -void __RPC_STUB IXpsOMCoreProperties_GetCreated_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetCreated_Proxy( - IXpsOMCoreProperties* This, - const SYSTEMTIME *created); -void __RPC_STUB IXpsOMCoreProperties_SetCreated_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetCreator_Proxy( - IXpsOMCoreProperties* This, - LPWSTR *creator); -void __RPC_STUB IXpsOMCoreProperties_GetCreator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetCreator_Proxy( - IXpsOMCoreProperties* This, - LPCWSTR creator); -void __RPC_STUB IXpsOMCoreProperties_SetCreator_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetDescription_Proxy( - IXpsOMCoreProperties* This, - LPWSTR *description); -void __RPC_STUB IXpsOMCoreProperties_GetDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetDescription_Proxy( - IXpsOMCoreProperties* This, - LPCWSTR description); -void __RPC_STUB IXpsOMCoreProperties_SetDescription_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetIdentifier_Proxy( - IXpsOMCoreProperties* This, - LPWSTR *identifier); -void __RPC_STUB IXpsOMCoreProperties_GetIdentifier_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetIdentifier_Proxy( - IXpsOMCoreProperties* This, - LPCWSTR identifier); -void __RPC_STUB IXpsOMCoreProperties_SetIdentifier_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetKeywords_Proxy( - IXpsOMCoreProperties* This, - LPWSTR *keywords); -void __RPC_STUB IXpsOMCoreProperties_GetKeywords_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetKeywords_Proxy( - IXpsOMCoreProperties* This, - LPCWSTR keywords); -void __RPC_STUB IXpsOMCoreProperties_SetKeywords_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetLanguage_Proxy( - IXpsOMCoreProperties* This, - LPWSTR *language); -void __RPC_STUB IXpsOMCoreProperties_GetLanguage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetLanguage_Proxy( - IXpsOMCoreProperties* This, - LPCWSTR language); -void __RPC_STUB IXpsOMCoreProperties_SetLanguage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetLastModifiedBy_Proxy( - IXpsOMCoreProperties* This, - LPWSTR *lastModifiedBy); -void __RPC_STUB IXpsOMCoreProperties_GetLastModifiedBy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetLastModifiedBy_Proxy( - IXpsOMCoreProperties* This, - LPCWSTR lastModifiedBy); -void __RPC_STUB IXpsOMCoreProperties_SetLastModifiedBy_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetLastPrinted_Proxy( - IXpsOMCoreProperties* This, - SYSTEMTIME *lastPrinted); -void __RPC_STUB IXpsOMCoreProperties_GetLastPrinted_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetLastPrinted_Proxy( - IXpsOMCoreProperties* This, - const SYSTEMTIME *lastPrinted); -void __RPC_STUB IXpsOMCoreProperties_SetLastPrinted_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetModified_Proxy( - IXpsOMCoreProperties* This, - SYSTEMTIME *modified); -void __RPC_STUB IXpsOMCoreProperties_GetModified_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetModified_Proxy( - IXpsOMCoreProperties* This, - const SYSTEMTIME *modified); -void __RPC_STUB IXpsOMCoreProperties_SetModified_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetRevision_Proxy( - IXpsOMCoreProperties* This, - LPWSTR *revision); -void __RPC_STUB IXpsOMCoreProperties_GetRevision_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetRevision_Proxy( - IXpsOMCoreProperties* This, - LPCWSTR revision); -void __RPC_STUB IXpsOMCoreProperties_SetRevision_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetSubject_Proxy( - IXpsOMCoreProperties* This, - LPWSTR *subject); -void __RPC_STUB IXpsOMCoreProperties_GetSubject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetSubject_Proxy( - IXpsOMCoreProperties* This, - LPCWSTR subject); -void __RPC_STUB IXpsOMCoreProperties_SetSubject_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetTitle_Proxy( - IXpsOMCoreProperties* This, - LPWSTR *title); -void __RPC_STUB IXpsOMCoreProperties_GetTitle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetTitle_Proxy( - IXpsOMCoreProperties* This, - LPCWSTR title); -void __RPC_STUB IXpsOMCoreProperties_SetTitle_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetVersion_Proxy( - IXpsOMCoreProperties* This, - LPWSTR *version); -void __RPC_STUB IXpsOMCoreProperties_GetVersion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetVersion_Proxy( - IXpsOMCoreProperties* This, - LPCWSTR version); -void __RPC_STUB IXpsOMCoreProperties_SetVersion_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_Clone_Proxy( - IXpsOMCoreProperties* This, - IXpsOMCoreProperties **coreProperties); -void __RPC_STUB IXpsOMCoreProperties_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMCoreProperties_INTERFACE_DEFINED__ */ @@ -15037,19 +11560,19 @@ typedef struct IXpsOMThumbnailGeneratorVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMThumbnailGenerator* This, + IXpsOMThumbnailGenerator *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMThumbnailGenerator* This); + IXpsOMThumbnailGenerator *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMThumbnailGenerator* This); + IXpsOMThumbnailGenerator *This); /*** IXpsOMThumbnailGenerator methods ***/ HRESULT (STDMETHODCALLTYPE *GenerateThumbnail)( - IXpsOMThumbnailGenerator* This, + IXpsOMThumbnailGenerator *This, IXpsOMPage *page, XPS_IMAGE_TYPE thumbnailType, XPS_THUMBNAIL_SIZE thumbnailSize, @@ -15058,6 +11581,7 @@ typedef struct IXpsOMThumbnailGeneratorVtbl { END_INTERFACE } IXpsOMThumbnailGeneratorVtbl; + interface IXpsOMThumbnailGenerator { CONST_VTBL IXpsOMThumbnailGeneratorVtbl* lpVtbl; }; @@ -15090,18 +11614,6 @@ static FORCEINLINE HRESULT IXpsOMThumbnailGenerator_GenerateThumbnail(IXpsOMThum #endif -HRESULT STDMETHODCALLTYPE IXpsOMThumbnailGenerator_GenerateThumbnail_Proxy( - IXpsOMThumbnailGenerator* This, - IXpsOMPage *page, - XPS_IMAGE_TYPE thumbnailType, - XPS_THUMBNAIL_SIZE thumbnailSize, - IOpcPartUri *imageResourcePartName, - IXpsOMImageResource **imageResource); -void __RPC_STUB IXpsOMThumbnailGenerator_GenerateThumbnail_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMThumbnailGenerator_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/xpsobjectmodel_1.h b/lib/libc/include/any-windows-any/xpsobjectmodel_1.h index f28b6b8280..b3370cd1ec 100644 --- a/lib/libc/include/any-windows-any/xpsobjectmodel_1.h +++ b/lib/libc/include/any-windows-any/xpsobjectmodel_1.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/xpsobjectmodel_1.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/xpsobjectmodel_1.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,26 +21,41 @@ #ifndef __IXpsOMObjectFactory1_FWD_DEFINED__ #define __IXpsOMObjectFactory1_FWD_DEFINED__ typedef interface IXpsOMObjectFactory1 IXpsOMObjectFactory1; +#ifdef __cplusplus +interface IXpsOMObjectFactory1; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPackage1_FWD_DEFINED__ #define __IXpsOMPackage1_FWD_DEFINED__ typedef interface IXpsOMPackage1 IXpsOMPackage1; +#ifdef __cplusplus +interface IXpsOMPackage1; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPage1_FWD_DEFINED__ #define __IXpsOMPage1_FWD_DEFINED__ typedef interface IXpsOMPage1 IXpsOMPage1; +#ifdef __cplusplus +interface IXpsOMPage1; +#endif /* __cplusplus */ #endif #ifndef __IXpsDocumentPackageTarget_FWD_DEFINED__ #define __IXpsDocumentPackageTarget_FWD_DEFINED__ typedef interface IXpsDocumentPackageTarget IXpsDocumentPackageTarget; +#ifdef __cplusplus +interface IXpsDocumentPackageTarget; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMRemoteDictionaryResource1_FWD_DEFINED__ #define __IXpsOMRemoteDictionaryResource1_FWD_DEFINED__ typedef interface IXpsOMRemoteDictionaryResource1 IXpsOMRemoteDictionaryResource1; +#ifdef __cplusplus +interface IXpsOMRemoteDictionaryResource1; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -63,16 +79,25 @@ extern "C" { #ifndef __IXpsOMObjectFactory1_FWD_DEFINED__ #define __IXpsOMObjectFactory1_FWD_DEFINED__ typedef interface IXpsOMObjectFactory1 IXpsOMObjectFactory1; +#ifdef __cplusplus +interface IXpsOMObjectFactory1; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPackage1_FWD_DEFINED__ #define __IXpsOMPackage1_FWD_DEFINED__ typedef interface IXpsOMPackage1 IXpsOMPackage1; +#ifdef __cplusplus +interface IXpsOMPackage1; +#endif /* __cplusplus */ #endif #ifndef __IXpsOMPage1_FWD_DEFINED__ #define __IXpsOMPage1_FWD_DEFINED__ typedef interface IXpsOMPage1 IXpsOMPage1; +#ifdef __cplusplus +interface IXpsOMPage1; +#endif /* __cplusplus */ #endif typedef enum __WIDL_xpsobjectmodel_1_generated_name_00000038 { @@ -173,92 +198,92 @@ typedef struct IXpsOMObjectFactory1Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMObjectFactory1* This); + IXpsOMObjectFactory1 *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMObjectFactory1* This); + IXpsOMObjectFactory1 *This); /*** IXpsOMObjectFactory methods ***/ HRESULT (STDMETHODCALLTYPE *CreatePackage)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IXpsOMPackage **package); HRESULT (STDMETHODCALLTYPE *CreatePackageFromFile)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, LPCWSTR filename, WINBOOL reuseObjects, IXpsOMPackage **package); HRESULT (STDMETHODCALLTYPE *CreatePackageFromStream)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IStream *stream, WINBOOL reuseObjects, IXpsOMPackage **package); HRESULT (STDMETHODCALLTYPE *CreateStoryFragmentsResource)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IStream *acquiredStream, IOpcPartUri *partUri, IXpsOMStoryFragmentsResource **storyFragmentsResource); HRESULT (STDMETHODCALLTYPE *CreateDocumentStructureResource)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IStream *acquiredStream, IOpcPartUri *partUri, IXpsOMDocumentStructureResource **documentStructureResource); HRESULT (STDMETHODCALLTYPE *CreateSignatureBlockResource)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IStream *acquiredStream, IOpcPartUri *partUri, IXpsOMSignatureBlockResource **signatureBlockResource); HRESULT (STDMETHODCALLTYPE *CreateRemoteDictionaryResource)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IXpsOMDictionary *dictionary, IOpcPartUri *partUri, IXpsOMRemoteDictionaryResource **remoteDictionaryResource); HRESULT (STDMETHODCALLTYPE *CreateRemoteDictionaryResourceFromStream)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IStream *dictionaryMarkupStream, IOpcPartUri *dictionaryPartUri, IXpsOMPartResources *resources, IXpsOMRemoteDictionaryResource **dictionaryResource); HRESULT (STDMETHODCALLTYPE *CreatePartResources)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IXpsOMPartResources **partResources); HRESULT (STDMETHODCALLTYPE *CreateDocumentSequence)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IOpcPartUri *partUri, IXpsOMDocumentSequence **documentSequence); HRESULT (STDMETHODCALLTYPE *CreateDocument)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IOpcPartUri *partUri, IXpsOMDocument **document); HRESULT (STDMETHODCALLTYPE *CreatePageReference)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, const XPS_SIZE *advisoryPageDimensions, IXpsOMPageReference **pageReference); HRESULT (STDMETHODCALLTYPE *CreatePage)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, const XPS_SIZE *pageDimensions, LPCWSTR language, IOpcPartUri *partUri, IXpsOMPage **page); HRESULT (STDMETHODCALLTYPE *CreatePageFromStream)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IStream *pageMarkupStream, IOpcPartUri *partUri, IXpsOMPartResources *resources, @@ -266,72 +291,72 @@ typedef struct IXpsOMObjectFactory1Vtbl { IXpsOMPage **page); HRESULT (STDMETHODCALLTYPE *CreateCanvas)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IXpsOMCanvas **canvas); HRESULT (STDMETHODCALLTYPE *CreateGlyphs)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IXpsOMFontResource *fontResource, IXpsOMGlyphs **glyphs); HRESULT (STDMETHODCALLTYPE *CreatePath)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IXpsOMPath **path); HRESULT (STDMETHODCALLTYPE *CreateGeometry)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IXpsOMGeometry **geometry); HRESULT (STDMETHODCALLTYPE *CreateGeometryFigure)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, const XPS_POINT *startPoint, IXpsOMGeometryFigure **figure); HRESULT (STDMETHODCALLTYPE *CreateMatrixTransform)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, const XPS_MATRIX *matrix, IXpsOMMatrixTransform **transform); HRESULT (STDMETHODCALLTYPE *CreateSolidColorBrush)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, const XPS_COLOR *color, IXpsOMColorProfileResource *colorProfile, IXpsOMSolidColorBrush **solidColorBrush); HRESULT (STDMETHODCALLTYPE *CreateColorProfileResource)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IStream *acquiredStream, IOpcPartUri *partUri, IXpsOMColorProfileResource **colorProfileResource); HRESULT (STDMETHODCALLTYPE *CreateImageBrush)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IXpsOMImageResource *image, const XPS_RECT *viewBox, const XPS_RECT *viewPort, IXpsOMImageBrush **imageBrush); HRESULT (STDMETHODCALLTYPE *CreateVisualBrush)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, const XPS_RECT *viewBox, const XPS_RECT *viewPort, IXpsOMVisualBrush **visualBrush); HRESULT (STDMETHODCALLTYPE *CreateImageResource)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IStream *acquiredStream, XPS_IMAGE_TYPE contentType, IOpcPartUri *partUri, IXpsOMImageResource **imageResource); HRESULT (STDMETHODCALLTYPE *CreatePrintTicketResource)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IStream *acquiredStream, IOpcPartUri *partUri, IXpsOMPrintTicketResource **printTicketResource); HRESULT (STDMETHODCALLTYPE *CreateFontResource)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IStream *acquiredStream, XPS_FONT_EMBEDDING fontEmbedding, IOpcPartUri *partUri, @@ -339,14 +364,14 @@ typedef struct IXpsOMObjectFactory1Vtbl { IXpsOMFontResource **fontResource); HRESULT (STDMETHODCALLTYPE *CreateGradientStop)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, const XPS_COLOR *color, IXpsOMColorProfileResource *colorProfile, FLOAT offset, IXpsOMGradientStop **gradientStop); HRESULT (STDMETHODCALLTYPE *CreateLinearGradientBrush)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IXpsOMGradientStop *gradStop1, IXpsOMGradientStop *gradStop2, const XPS_POINT *startPoint, @@ -354,7 +379,7 @@ typedef struct IXpsOMObjectFactory1Vtbl { IXpsOMLinearGradientBrush **linearGradientBrush); HRESULT (STDMETHODCALLTYPE *CreateRadialGradientBrush)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IXpsOMGradientStop *gradStop1, IXpsOMGradientStop *gradStop2, const XPS_POINT *centerPoint, @@ -363,20 +388,20 @@ typedef struct IXpsOMObjectFactory1Vtbl { IXpsOMRadialGradientBrush **radialGradientBrush); HRESULT (STDMETHODCALLTYPE *CreateCoreProperties)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IOpcPartUri *partUri, IXpsOMCoreProperties **coreProperties); HRESULT (STDMETHODCALLTYPE *CreateDictionary)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IXpsOMDictionary **dictionary); HRESULT (STDMETHODCALLTYPE *CreatePartUriCollection)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IXpsOMPartUriCollection **partUriCollection); HRESULT (STDMETHODCALLTYPE *CreatePackageWriterOnFile)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, LPCWSTR fileName, LPSECURITY_ATTRIBUTES securityAttributes, DWORD flagsAndAttributes, @@ -390,7 +415,7 @@ typedef struct IXpsOMObjectFactory1Vtbl { IXpsOMPackageWriter **packageWriter); HRESULT (STDMETHODCALLTYPE *CreatePackageWriterOnStream)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, ISequentialStream *outputStream, WINBOOL optimizeMarkupSize, XPS_INTERLEAVING interleaving, @@ -402,36 +427,36 @@ typedef struct IXpsOMObjectFactory1Vtbl { IXpsOMPackageWriter **packageWriter); HRESULT (STDMETHODCALLTYPE *CreatePartUri)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, LPCWSTR uri, IOpcPartUri **partUri); HRESULT (STDMETHODCALLTYPE *CreateReadOnlyStreamOnFile)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, LPCWSTR filename, IStream **stream); /*** IXpsOMObjectFactory1 methods ***/ HRESULT (STDMETHODCALLTYPE *GetDocumentTypeFromFile)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, LPCWSTR filename, XPS_DOCUMENT_TYPE *documentType); HRESULT (STDMETHODCALLTYPE *GetDocumentTypeFromStream)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IStream *xpsDocumentStream, XPS_DOCUMENT_TYPE *documentType); HRESULT (STDMETHODCALLTYPE *ConvertHDPhotoToJpegXR)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IXpsOMImageResource *imageResource); HRESULT (STDMETHODCALLTYPE *ConvertJpegXRToHDPhoto)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IXpsOMImageResource *imageResource); HRESULT (STDMETHODCALLTYPE *CreatePackageWriterOnFile1)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, LPCWSTR fileName, LPSECURITY_ATTRIBUTES securityAttributes, DWORD flagsAndAttributes, @@ -446,7 +471,7 @@ typedef struct IXpsOMObjectFactory1Vtbl { IXpsOMPackageWriter **packageWriter); HRESULT (STDMETHODCALLTYPE *CreatePackageWriterOnStream1)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, ISequentialStream *outputStream, WINBOOL optimizeMarkupSize, XPS_INTERLEAVING interleaving, @@ -459,30 +484,30 @@ typedef struct IXpsOMObjectFactory1Vtbl { IXpsOMPackageWriter **packageWriter); HRESULT (STDMETHODCALLTYPE *CreatePackage1)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IXpsOMPackage1 **package); HRESULT (STDMETHODCALLTYPE *CreatePackageFromStream1)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IStream *stream, WINBOOL reuseObjects, IXpsOMPackage1 **package); HRESULT (STDMETHODCALLTYPE *CreatePackageFromFile1)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, LPCWSTR filename, WINBOOL reuseObjects, IXpsOMPackage1 **package); HRESULT (STDMETHODCALLTYPE *CreatePage1)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, const XPS_SIZE *pageDimensions, LPCWSTR language, IOpcPartUri *partUri, IXpsOMPage1 **page); HRESULT (STDMETHODCALLTYPE *CreatePageFromStream1)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IStream *pageMarkupStream, IOpcPartUri *partUri, IXpsOMPartResources *resources, @@ -490,7 +515,7 @@ typedef struct IXpsOMObjectFactory1Vtbl { IXpsOMPage1 **page); HRESULT (STDMETHODCALLTYPE *CreateRemoteDictionaryResourceFromStream1)( - IXpsOMObjectFactory1* This, + IXpsOMObjectFactory1 *This, IStream *dictionaryMarkupStream, IOpcPartUri *partUri, IXpsOMPartResources *resources, @@ -498,6 +523,7 @@ typedef struct IXpsOMObjectFactory1Vtbl { END_INTERFACE } IXpsOMObjectFactory1Vtbl; + interface IXpsOMObjectFactory1 { CONST_VTBL IXpsOMObjectFactory1Vtbl* lpVtbl; }; @@ -724,138 +750,6 @@ static FORCEINLINE HRESULT IXpsOMObjectFactory1_CreateRemoteDictionaryResourceFr #endif -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory1_GetDocumentTypeFromFile_Proxy( - IXpsOMObjectFactory1* This, - LPCWSTR filename, - XPS_DOCUMENT_TYPE *documentType); -void __RPC_STUB IXpsOMObjectFactory1_GetDocumentTypeFromFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory1_GetDocumentTypeFromStream_Proxy( - IXpsOMObjectFactory1* This, - IStream *xpsDocumentStream, - XPS_DOCUMENT_TYPE *documentType); -void __RPC_STUB IXpsOMObjectFactory1_GetDocumentTypeFromStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory1_ConvertHDPhotoToJpegXR_Proxy( - IXpsOMObjectFactory1* This, - IXpsOMImageResource *imageResource); -void __RPC_STUB IXpsOMObjectFactory1_ConvertHDPhotoToJpegXR_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory1_ConvertJpegXRToHDPhoto_Proxy( - IXpsOMObjectFactory1* This, - IXpsOMImageResource *imageResource); -void __RPC_STUB IXpsOMObjectFactory1_ConvertJpegXRToHDPhoto_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory1_CreatePackageWriterOnFile1_Proxy( - IXpsOMObjectFactory1* This, - LPCWSTR fileName, - LPSECURITY_ATTRIBUTES securityAttributes, - DWORD flagsAndAttributes, - WINBOOL optimizeMarkupSize, - XPS_INTERLEAVING interleaving, - IOpcPartUri *documentSequencePartName, - IXpsOMCoreProperties *coreProperties, - IXpsOMImageResource *packageThumbnail, - IXpsOMPrintTicketResource *documentSequencePrintTicket, - IOpcPartUri *discardControlPartName, - XPS_DOCUMENT_TYPE documentType, - IXpsOMPackageWriter **packageWriter); -void __RPC_STUB IXpsOMObjectFactory1_CreatePackageWriterOnFile1_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory1_CreatePackageWriterOnStream1_Proxy( - IXpsOMObjectFactory1* This, - ISequentialStream *outputStream, - WINBOOL optimizeMarkupSize, - XPS_INTERLEAVING interleaving, - IOpcPartUri *documentSequencePartName, - IXpsOMCoreProperties *coreProperties, - IXpsOMImageResource *packageThumbnail, - IXpsOMPrintTicketResource *documentSequencePrintTicket, - IOpcPartUri *discardControlPartName, - XPS_DOCUMENT_TYPE documentType, - IXpsOMPackageWriter **packageWriter); -void __RPC_STUB IXpsOMObjectFactory1_CreatePackageWriterOnStream1_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory1_CreatePackage1_Proxy( - IXpsOMObjectFactory1* This, - IXpsOMPackage1 **package); -void __RPC_STUB IXpsOMObjectFactory1_CreatePackage1_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory1_CreatePackageFromStream1_Proxy( - IXpsOMObjectFactory1* This, - IStream *stream, - WINBOOL reuseObjects, - IXpsOMPackage1 **package); -void __RPC_STUB IXpsOMObjectFactory1_CreatePackageFromStream1_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory1_CreatePackageFromFile1_Proxy( - IXpsOMObjectFactory1* This, - LPCWSTR filename, - WINBOOL reuseObjects, - IXpsOMPackage1 **package); -void __RPC_STUB IXpsOMObjectFactory1_CreatePackageFromFile1_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory1_CreatePage1_Proxy( - IXpsOMObjectFactory1* This, - const XPS_SIZE *pageDimensions, - LPCWSTR language, - IOpcPartUri *partUri, - IXpsOMPage1 **page); -void __RPC_STUB IXpsOMObjectFactory1_CreatePage1_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory1_CreatePageFromStream1_Proxy( - IXpsOMObjectFactory1* This, - IStream *pageMarkupStream, - IOpcPartUri *partUri, - IXpsOMPartResources *resources, - WINBOOL reuseObjects, - IXpsOMPage1 **page); -void __RPC_STUB IXpsOMObjectFactory1_CreatePageFromStream1_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory1_CreateRemoteDictionaryResourceFromStream1_Proxy( - IXpsOMObjectFactory1* This, - IStream *dictionaryMarkupStream, - IOpcPartUri *partUri, - IXpsOMPartResources *resources, - IXpsOMRemoteDictionaryResource **dictionaryResource); -void __RPC_STUB IXpsOMObjectFactory1_CreateRemoteDictionaryResourceFromStream1_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMObjectFactory1_INTERFACE_DEFINED__ */ @@ -895,68 +789,68 @@ typedef struct IXpsOMPackage1Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMPackage1* This, + IXpsOMPackage1 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMPackage1* This); + IXpsOMPackage1 *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMPackage1* This); + IXpsOMPackage1 *This); /*** IXpsOMPackage methods ***/ HRESULT (STDMETHODCALLTYPE *GetDocumentSequence)( - IXpsOMPackage1* This, + IXpsOMPackage1 *This, IXpsOMDocumentSequence **documentSequence); HRESULT (STDMETHODCALLTYPE *SetDocumentSequence)( - IXpsOMPackage1* This, + IXpsOMPackage1 *This, IXpsOMDocumentSequence *documentSequence); HRESULT (STDMETHODCALLTYPE *GetCoreProperties)( - IXpsOMPackage1* This, + IXpsOMPackage1 *This, IXpsOMCoreProperties **coreProperties); HRESULT (STDMETHODCALLTYPE *SetCoreProperties)( - IXpsOMPackage1* This, + IXpsOMPackage1 *This, IXpsOMCoreProperties *coreProperties); HRESULT (STDMETHODCALLTYPE *GetDiscardControlPartName)( - IXpsOMPackage1* This, + IXpsOMPackage1 *This, IOpcPartUri **discardControlPartUri); HRESULT (STDMETHODCALLTYPE *SetDiscardControlPartName)( - IXpsOMPackage1* This, + IXpsOMPackage1 *This, IOpcPartUri *discardControlPartUri); HRESULT (STDMETHODCALLTYPE *GetThumbnailResource)( - IXpsOMPackage1* This, + IXpsOMPackage1 *This, IXpsOMImageResource **imageResource); HRESULT (STDMETHODCALLTYPE *SetThumbnailResource)( - IXpsOMPackage1* This, + IXpsOMPackage1 *This, IXpsOMImageResource *imageResource); HRESULT (STDMETHODCALLTYPE *WriteToFile)( - IXpsOMPackage1* This, + IXpsOMPackage1 *This, LPCWSTR fileName, LPSECURITY_ATTRIBUTES securityAttributes, DWORD flagsAndAttributes, WINBOOL optimizeMarkupSize); HRESULT (STDMETHODCALLTYPE *WriteToStream)( - IXpsOMPackage1* This, + IXpsOMPackage1 *This, ISequentialStream *stream, WINBOOL optimizeMarkupSize); /*** IXpsOMPackage1 methods ***/ HRESULT (STDMETHODCALLTYPE *GetDocumentType)( - IXpsOMPackage1* This, + IXpsOMPackage1 *This, XPS_DOCUMENT_TYPE *documentType); HRESULT (STDMETHODCALLTYPE *WriteToFile1)( - IXpsOMPackage1* This, + IXpsOMPackage1 *This, LPCWSTR fileName, LPSECURITY_ATTRIBUTES securityAttributes, DWORD flagsAndAttributes, @@ -964,13 +858,14 @@ typedef struct IXpsOMPackage1Vtbl { XPS_DOCUMENT_TYPE documentType); HRESULT (STDMETHODCALLTYPE *WriteToStream1)( - IXpsOMPackage1* This, + IXpsOMPackage1 *This, ISequentialStream *outputStream, WINBOOL optimizeMarkupSize, XPS_DOCUMENT_TYPE documentType); END_INTERFACE } IXpsOMPackage1Vtbl; + interface IXpsOMPackage1 { CONST_VTBL IXpsOMPackage1Vtbl* lpVtbl; }; @@ -1053,36 +948,6 @@ static FORCEINLINE HRESULT IXpsOMPackage1_WriteToStream1(IXpsOMPackage1* This,IS #endif -HRESULT STDMETHODCALLTYPE IXpsOMPackage1_GetDocumentType_Proxy( - IXpsOMPackage1* This, - XPS_DOCUMENT_TYPE *documentType); -void __RPC_STUB IXpsOMPackage1_GetDocumentType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPackage1_WriteToFile1_Proxy( - IXpsOMPackage1* This, - LPCWSTR fileName, - LPSECURITY_ATTRIBUTES securityAttributes, - DWORD flagsAndAttributes, - WINBOOL optimizeMarkupSize, - XPS_DOCUMENT_TYPE documentType); -void __RPC_STUB IXpsOMPackage1_WriteToFile1_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPackage1_WriteToStream1_Proxy( - IXpsOMPackage1* This, - ISequentialStream *outputStream, - WINBOOL optimizeMarkupSize, - XPS_DOCUMENT_TYPE documentType); -void __RPC_STUB IXpsOMPackage1_WriteToStream1_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMPackage1_INTERFACE_DEFINED__ */ @@ -1115,129 +980,130 @@ typedef struct IXpsOMPage1Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMPage1* This, + IXpsOMPage1 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMPage1* This); + IXpsOMPage1 *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMPage1* This); + IXpsOMPage1 *This); /*** IXpsOMPart methods ***/ HRESULT (STDMETHODCALLTYPE *GetPartName)( - IXpsOMPage1* This, + IXpsOMPage1 *This, IOpcPartUri **partUri); HRESULT (STDMETHODCALLTYPE *SetPartName)( - IXpsOMPage1* This, + IXpsOMPage1 *This, IOpcPartUri *partUri); /*** IXpsOMPage methods ***/ HRESULT (STDMETHODCALLTYPE *GetOwner)( - IXpsOMPage1* This, + IXpsOMPage1 *This, IXpsOMPageReference **pageReference); HRESULT (STDMETHODCALLTYPE *GetVisuals)( - IXpsOMPage1* This, + IXpsOMPage1 *This, IXpsOMVisualCollection **visuals); HRESULT (STDMETHODCALLTYPE *GetPageDimensions)( - IXpsOMPage1* This, + IXpsOMPage1 *This, XPS_SIZE *pageDimensions); HRESULT (STDMETHODCALLTYPE *SetPageDimensions)( - IXpsOMPage1* This, + IXpsOMPage1 *This, const XPS_SIZE *pageDimensions); HRESULT (STDMETHODCALLTYPE *GetContentBox)( - IXpsOMPage1* This, + IXpsOMPage1 *This, XPS_RECT *contentBox); HRESULT (STDMETHODCALLTYPE *SetContentBox)( - IXpsOMPage1* This, + IXpsOMPage1 *This, const XPS_RECT *contentBox); HRESULT (STDMETHODCALLTYPE *GetBleedBox)( - IXpsOMPage1* This, + IXpsOMPage1 *This, XPS_RECT *bleedBox); HRESULT (STDMETHODCALLTYPE *SetBleedBox)( - IXpsOMPage1* This, + IXpsOMPage1 *This, const XPS_RECT *bleedBox); HRESULT (STDMETHODCALLTYPE *GetLanguage)( - IXpsOMPage1* This, + IXpsOMPage1 *This, LPWSTR *language); HRESULT (STDMETHODCALLTYPE *SetLanguage)( - IXpsOMPage1* This, + IXpsOMPage1 *This, LPCWSTR language); HRESULT (STDMETHODCALLTYPE *GetName)( - IXpsOMPage1* This, + IXpsOMPage1 *This, LPWSTR *name); HRESULT (STDMETHODCALLTYPE *SetName)( - IXpsOMPage1* This, + IXpsOMPage1 *This, LPCWSTR name); HRESULT (STDMETHODCALLTYPE *GetIsHyperlinkTarget)( - IXpsOMPage1* This, + IXpsOMPage1 *This, WINBOOL *isHyperlinkTarget); HRESULT (STDMETHODCALLTYPE *SetIsHyperlinkTarget)( - IXpsOMPage1* This, + IXpsOMPage1 *This, WINBOOL isHyperlinkTarget); HRESULT (STDMETHODCALLTYPE *GetDictionary)( - IXpsOMPage1* This, + IXpsOMPage1 *This, IXpsOMDictionary **resourceDictionary); HRESULT (STDMETHODCALLTYPE *GetDictionaryLocal)( - IXpsOMPage1* This, + IXpsOMPage1 *This, IXpsOMDictionary **resourceDictionary); HRESULT (STDMETHODCALLTYPE *SetDictionaryLocal)( - IXpsOMPage1* This, + IXpsOMPage1 *This, IXpsOMDictionary *resourceDictionary); HRESULT (STDMETHODCALLTYPE *GetDictionaryResource)( - IXpsOMPage1* This, + IXpsOMPage1 *This, IXpsOMRemoteDictionaryResource **remoteDictionaryResource); HRESULT (STDMETHODCALLTYPE *SetDictionaryResource)( - IXpsOMPage1* This, + IXpsOMPage1 *This, IXpsOMRemoteDictionaryResource *remoteDictionaryResource); HRESULT (STDMETHODCALLTYPE *Write)( - IXpsOMPage1* This, + IXpsOMPage1 *This, ISequentialStream *stream, WINBOOL optimizeMarkupSize); HRESULT (STDMETHODCALLTYPE *GenerateUnusedLookupKey)( - IXpsOMPage1* This, + IXpsOMPage1 *This, XPS_OBJECT_TYPE type, LPWSTR *key); HRESULT (STDMETHODCALLTYPE *Clone)( - IXpsOMPage1* This, + IXpsOMPage1 *This, IXpsOMPage **page); /*** IXpsOMPage1 methods ***/ HRESULT (STDMETHODCALLTYPE *GetDocumentType)( - IXpsOMPage1* This, + IXpsOMPage1 *This, XPS_DOCUMENT_TYPE *documentType); HRESULT (STDMETHODCALLTYPE *Write1)( - IXpsOMPage1* This, + IXpsOMPage1 *This, ISequentialStream *stream, WINBOOL optimizeMarkupSize, XPS_DOCUMENT_TYPE documentType); END_INTERFACE } IXpsOMPage1Vtbl; + interface IXpsOMPage1 { CONST_VTBL IXpsOMPage1Vtbl* lpVtbl; }; @@ -1374,24 +1240,6 @@ static FORCEINLINE HRESULT IXpsOMPage1_Write1(IXpsOMPage1* This,ISequentialStrea #endif -HRESULT STDMETHODCALLTYPE IXpsOMPage1_GetDocumentType_Proxy( - IXpsOMPage1* This, - XPS_DOCUMENT_TYPE *documentType); -void __RPC_STUB IXpsOMPage1_GetDocumentType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMPage1_Write1_Proxy( - IXpsOMPage1* This, - ISequentialStream *stream, - WINBOOL optimizeMarkupSize, - XPS_DOCUMENT_TYPE documentType); -void __RPC_STUB IXpsOMPage1_Write1_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMPage1_INTERFACE_DEFINED__ */ @@ -1427,33 +1275,34 @@ typedef struct IXpsDocumentPackageTargetVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsDocumentPackageTarget* This, + IXpsDocumentPackageTarget *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsDocumentPackageTarget* This); + IXpsDocumentPackageTarget *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsDocumentPackageTarget* This); + IXpsDocumentPackageTarget *This); /*** IXpsDocumentPackageTarget methods ***/ HRESULT (STDMETHODCALLTYPE *GetXpsOMPackageWriter)( - IXpsDocumentPackageTarget* This, + IXpsDocumentPackageTarget *This, IOpcPartUri *documentSequencePartName, IOpcPartUri *discardControlPartName, IXpsOMPackageWriter **packageWriter); HRESULT (STDMETHODCALLTYPE *GetXpsOMFactory)( - IXpsDocumentPackageTarget* This, + IXpsDocumentPackageTarget *This, IXpsOMObjectFactory **xpsFactory); HRESULT (STDMETHODCALLTYPE *GetXpsType)( - IXpsDocumentPackageTarget* This, + IXpsDocumentPackageTarget *This, XPS_DOCUMENT_TYPE *documentType); END_INTERFACE } IXpsDocumentPackageTargetVtbl; + interface IXpsDocumentPackageTarget { CONST_VTBL IXpsDocumentPackageTargetVtbl* lpVtbl; }; @@ -1494,32 +1343,6 @@ static FORCEINLINE HRESULT IXpsDocumentPackageTarget_GetXpsType(IXpsDocumentPack #endif -HRESULT STDMETHODCALLTYPE IXpsDocumentPackageTarget_GetXpsOMPackageWriter_Proxy( - IXpsDocumentPackageTarget* This, - IOpcPartUri *documentSequencePartName, - IOpcPartUri *discardControlPartName, - IXpsOMPackageWriter **packageWriter); -void __RPC_STUB IXpsDocumentPackageTarget_GetXpsOMPackageWriter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsDocumentPackageTarget_GetXpsOMFactory_Proxy( - IXpsDocumentPackageTarget* This, - IXpsOMObjectFactory **xpsFactory); -void __RPC_STUB IXpsDocumentPackageTarget_GetXpsOMFactory_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsDocumentPackageTarget_GetXpsType_Proxy( - IXpsDocumentPackageTarget* This, - XPS_DOCUMENT_TYPE *documentType); -void __RPC_STUB IXpsDocumentPackageTarget_GetXpsType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsDocumentPackageTarget_INTERFACE_DEFINED__ */ @@ -1551,46 +1374,47 @@ typedef struct IXpsOMRemoteDictionaryResource1Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsOMRemoteDictionaryResource1* This, + IXpsOMRemoteDictionaryResource1 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsOMRemoteDictionaryResource1* This); + IXpsOMRemoteDictionaryResource1 *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsOMRemoteDictionaryResource1* This); + IXpsOMRemoteDictionaryResource1 *This); /*** IXpsOMPart methods ***/ HRESULT (STDMETHODCALLTYPE *GetPartName)( - IXpsOMRemoteDictionaryResource1* This, + IXpsOMRemoteDictionaryResource1 *This, IOpcPartUri **partUri); HRESULT (STDMETHODCALLTYPE *SetPartName)( - IXpsOMRemoteDictionaryResource1* This, + IXpsOMRemoteDictionaryResource1 *This, IOpcPartUri *partUri); /*** IXpsOMRemoteDictionaryResource methods ***/ HRESULT (STDMETHODCALLTYPE *GetDictionary)( - IXpsOMRemoteDictionaryResource1* This, + IXpsOMRemoteDictionaryResource1 *This, IXpsOMDictionary **dictionary); HRESULT (STDMETHODCALLTYPE *SetDictionary)( - IXpsOMRemoteDictionaryResource1* This, + IXpsOMRemoteDictionaryResource1 *This, IXpsOMDictionary *dictionary); /*** IXpsOMRemoteDictionaryResource1 methods ***/ HRESULT (STDMETHODCALLTYPE *GetDocumentType)( - IXpsOMRemoteDictionaryResource1* This, + IXpsOMRemoteDictionaryResource1 *This, XPS_DOCUMENT_TYPE *documentType); HRESULT (STDMETHODCALLTYPE *Write1)( - IXpsOMRemoteDictionaryResource1* This, + IXpsOMRemoteDictionaryResource1 *This, ISequentialStream *stream, XPS_DOCUMENT_TYPE documentType); END_INTERFACE } IXpsOMRemoteDictionaryResource1Vtbl; + interface IXpsOMRemoteDictionaryResource1 { CONST_VTBL IXpsOMRemoteDictionaryResource1Vtbl* lpVtbl; }; @@ -1647,23 +1471,6 @@ static FORCEINLINE HRESULT IXpsOMRemoteDictionaryResource1_Write1(IXpsOMRemoteDi #endif -HRESULT STDMETHODCALLTYPE IXpsOMRemoteDictionaryResource1_GetDocumentType_Proxy( - IXpsOMRemoteDictionaryResource1* This, - XPS_DOCUMENT_TYPE *documentType); -void __RPC_STUB IXpsOMRemoteDictionaryResource1_GetDocumentType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT STDMETHODCALLTYPE IXpsOMRemoteDictionaryResource1_Write1_Proxy( - IXpsOMRemoteDictionaryResource1* This, - ISequentialStream *stream, - XPS_DOCUMENT_TYPE documentType); -void __RPC_STUB IXpsOMRemoteDictionaryResource1_Write1_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); #endif /* __IXpsOMRemoteDictionaryResource1_INTERFACE_DEFINED__ */ diff --git a/lib/libc/include/any-windows-any/xpsprint.h b/lib/libc/include/any-windows-any/xpsprint.h index 82eb7ee311..119f36df29 100644 --- a/lib/libc/include/any-windows-any/xpsprint.h +++ b/lib/libc/include/any-windows-any/xpsprint.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/xpsprint.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/xpsprint.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,11 +21,17 @@ #ifndef __IXpsPrintJobStream_FWD_DEFINED__ #define __IXpsPrintJobStream_FWD_DEFINED__ typedef interface IXpsPrintJobStream IXpsPrintJobStream; +#ifdef __cplusplus +interface IXpsPrintJobStream; +#endif /* __cplusplus */ #endif #ifndef __IXpsPrintJob_FWD_DEFINED__ #define __IXpsPrintJob_FWD_DEFINED__ typedef interface IXpsPrintJob IXpsPrintJob; +#ifdef __cplusplus +interface IXpsPrintJob; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -80,35 +87,36 @@ typedef struct IXpsPrintJobStreamVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsPrintJobStream* This, + IXpsPrintJobStream *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsPrintJobStream* This); + IXpsPrintJobStream *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsPrintJobStream* This); + IXpsPrintJobStream *This); /*** ISequentialStream methods ***/ HRESULT (STDMETHODCALLTYPE *Read)( - IXpsPrintJobStream* This, + IXpsPrintJobStream *This, void *pv, ULONG cb, ULONG *pcbRead); HRESULT (STDMETHODCALLTYPE *Write)( - IXpsPrintJobStream* This, + IXpsPrintJobStream *This, const void *pv, ULONG cb, ULONG *pcbWritten); /*** IXpsPrintJobStream methods ***/ HRESULT (STDMETHODCALLTYPE *Close)( - IXpsPrintJobStream* This); + IXpsPrintJobStream *This); END_INTERFACE } IXpsPrintJobStreamVtbl; + interface IXpsPrintJobStream { CONST_VTBL IXpsPrintJobStreamVtbl* lpVtbl; }; @@ -181,26 +189,27 @@ typedef struct IXpsPrintJobVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsPrintJob* This, + IXpsPrintJob *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsPrintJob* This); + IXpsPrintJob *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsPrintJob* This); + IXpsPrintJob *This); /*** IXpsPrintJob methods ***/ HRESULT (STDMETHODCALLTYPE *Cancel)( - IXpsPrintJob* This); + IXpsPrintJob *This); HRESULT (STDMETHODCALLTYPE *GetJobStatus)( - IXpsPrintJob* This, + IXpsPrintJob *This, XPS_JOB_STATUS *jobStatus); END_INTERFACE } IXpsPrintJobVtbl; + interface IXpsPrintJob { CONST_VTBL IXpsPrintJobVtbl* lpVtbl; }; diff --git a/lib/libc/include/any-windows-any/xpsrassvc.h b/lib/libc/include/any-windows-any/xpsrassvc.h index 93f8e9a15c..ef896934de 100644 --- a/lib/libc/include/any-windows-any/xpsrassvc.h +++ b/lib/libc/include/any-windows-any/xpsrassvc.h @@ -1,11 +1,12 @@ -/*** Autogenerated by WIDL 1.6 from include/xpsrassvc.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.12.1 from include/xpsrassvc.idl - Do not edit ***/ +#ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif - #include #include +#endif #ifndef COM_NO_WINDOWS_H #include @@ -20,21 +21,33 @@ #ifndef __IXpsRasterizerNotificationCallback_FWD_DEFINED__ #define __IXpsRasterizerNotificationCallback_FWD_DEFINED__ typedef interface IXpsRasterizerNotificationCallback IXpsRasterizerNotificationCallback; +#ifdef __cplusplus +interface IXpsRasterizerNotificationCallback; +#endif /* __cplusplus */ #endif #ifndef __IXpsRasterizer_FWD_DEFINED__ #define __IXpsRasterizer_FWD_DEFINED__ typedef interface IXpsRasterizer IXpsRasterizer; +#ifdef __cplusplus +interface IXpsRasterizer; +#endif /* __cplusplus */ #endif #ifndef __IXpsRasterizationFactory_FWD_DEFINED__ #define __IXpsRasterizationFactory_FWD_DEFINED__ typedef interface IXpsRasterizationFactory IXpsRasterizationFactory; +#ifdef __cplusplus +interface IXpsRasterizationFactory; +#endif /* __cplusplus */ #endif #ifndef __IXpsRasterizationFactory1_FWD_DEFINED__ #define __IXpsRasterizationFactory1_FWD_DEFINED__ typedef interface IXpsRasterizationFactory1 IXpsRasterizationFactory1; +#ifdef __cplusplus +interface IXpsRasterizationFactory1; +#endif /* __cplusplus */ #endif /* Headers for imported files */ @@ -50,21 +63,33 @@ extern "C" { #ifndef __IXpsRasterizerNotificationCallback_FWD_DEFINED__ #define __IXpsRasterizerNotificationCallback_FWD_DEFINED__ typedef interface IXpsRasterizerNotificationCallback IXpsRasterizerNotificationCallback; +#ifdef __cplusplus +interface IXpsRasterizerNotificationCallback; +#endif /* __cplusplus */ #endif #ifndef __IXpsRasterizer_FWD_DEFINED__ #define __IXpsRasterizer_FWD_DEFINED__ typedef interface IXpsRasterizer IXpsRasterizer; +#ifdef __cplusplus +interface IXpsRasterizer; +#endif /* __cplusplus */ #endif #ifndef __IXpsRasterizationFactory_FWD_DEFINED__ #define __IXpsRasterizationFactory_FWD_DEFINED__ typedef interface IXpsRasterizationFactory IXpsRasterizationFactory; +#ifdef __cplusplus +interface IXpsRasterizationFactory; +#endif /* __cplusplus */ #endif #ifndef __IXpsRasterizationFactory1_FWD_DEFINED__ #define __IXpsRasterizationFactory1_FWD_DEFINED__ typedef interface IXpsRasterizationFactory1 IXpsRasterizationFactory1; +#ifdef __cplusplus +interface IXpsRasterizationFactory1; +#endif /* __cplusplus */ #endif #include @@ -105,22 +130,23 @@ typedef struct IXpsRasterizerNotificationCallbackVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsRasterizerNotificationCallback* This, + IXpsRasterizerNotificationCallback *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsRasterizerNotificationCallback* This); + IXpsRasterizerNotificationCallback *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsRasterizerNotificationCallback* This); + IXpsRasterizerNotificationCallback *This); /*** IXpsRasterizerNotificationCallback methods ***/ HRESULT (STDMETHODCALLTYPE *Continue)( - IXpsRasterizerNotificationCallback* This); + IXpsRasterizerNotificationCallback *This); END_INTERFACE } IXpsRasterizerNotificationCallbackVtbl; + interface IXpsRasterizerNotificationCallback { CONST_VTBL IXpsRasterizerNotificationCallbackVtbl* lpVtbl; }; @@ -188,19 +214,19 @@ typedef struct IXpsRasterizerVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsRasterizer* This, + IXpsRasterizer *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsRasterizer* This); + IXpsRasterizer *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsRasterizer* This); + IXpsRasterizer *This); /*** IXpsRasterizer methods ***/ HRESULT (STDMETHODCALLTYPE *RasterizeRect)( - IXpsRasterizer* This, + IXpsRasterizer *This, INT x, INT y, INT width, @@ -209,11 +235,12 @@ typedef struct IXpsRasterizerVtbl { IWICBitmap **bitmap); HRESULT (STDMETHODCALLTYPE *SetMinimalLineWidth)( - IXpsRasterizer* This, + IXpsRasterizer *This, INT width); END_INTERFACE } IXpsRasterizerVtbl; + interface IXpsRasterizer { CONST_VTBL IXpsRasterizerVtbl* lpVtbl; }; @@ -281,19 +308,19 @@ typedef struct IXpsRasterizationFactoryVtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsRasterizationFactory* This, + IXpsRasterizationFactory *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsRasterizationFactory* This); + IXpsRasterizationFactory *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsRasterizationFactory* This); + IXpsRasterizationFactory *This); /*** IXpsRasterizationFactory methods ***/ HRESULT (STDMETHODCALLTYPE *CreateRasterizer)( - IXpsRasterizationFactory* This, + IXpsRasterizationFactory *This, IXpsOMPage *xpsPage, FLOAT DPI, XPSRAS_RENDERING_MODE nonTextRenderingMode, @@ -302,6 +329,7 @@ typedef struct IXpsRasterizationFactoryVtbl { END_INTERFACE } IXpsRasterizationFactoryVtbl; + interface IXpsRasterizationFactory { CONST_VTBL IXpsRasterizationFactoryVtbl* lpVtbl; }; @@ -367,19 +395,19 @@ typedef struct IXpsRasterizationFactory1Vtbl { /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IXpsRasterizationFactory1* This, + IXpsRasterizationFactory1 *This, REFIID riid, void **ppvObject); ULONG (STDMETHODCALLTYPE *AddRef)( - IXpsRasterizationFactory1* This); + IXpsRasterizationFactory1 *This); ULONG (STDMETHODCALLTYPE *Release)( - IXpsRasterizationFactory1* This); + IXpsRasterizationFactory1 *This); /*** IXpsRasterizationFactory1 methods ***/ HRESULT (STDMETHODCALLTYPE *CreateRasterizer)( - IXpsRasterizationFactory1* This, + IXpsRasterizationFactory1 *This, IXpsOMPage *xpsPage, FLOAT DPI, XPSRAS_RENDERING_MODE nonTextRenderingMode, @@ -389,6 +417,7 @@ typedef struct IXpsRasterizationFactory1Vtbl { END_INTERFACE } IXpsRasterizationFactory1Vtbl; + interface IXpsRasterizationFactory1 { CONST_VTBL IXpsRasterizationFactory1Vtbl* lpVtbl; }; diff --git a/lib/libc/include/any-windows-any/yvals.h b/lib/libc/include/any-windows-any/yvals.h index 15130e49ef..ec929c7f1d 100644 --- a/lib/libc/include/any-windows-any/yvals.h +++ b/lib/libc/include/any-windows-any/yvals.h @@ -261,7 +261,9 @@ _STD_END _C_STD_BEGIN _CRTIMP void __cdecl _Atexit(void (__cdecl *)(void)); +#if !defined(_UCRT) && !defined(__LARGE_MBSTATE_T) typedef int _Mbstatet; +#endif #define _ATEXIT_T void #define _Mbstinit(x) mbstate_t x = {0} diff --git a/lib/libc/mingw/crt/merr.c b/lib/libc/mingw/crt/merr.c index f3dff58049..687aab4a90 100644 --- a/lib/libc/mingw/crt/merr.c +++ b/lib/libc/mingw/crt/merr.c @@ -4,35 +4,9 @@ * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ -#include #include #include -typedef int (__cdecl *fUserMathErr)(struct _exception *); -static fUserMathErr stUserMathErr; - -void __mingw_raise_matherr (int typ, const char *name, double a1, double a2, - double rslt) -{ - struct _exception ex; - if (!stUserMathErr) - return; - ex.type = typ; - ex.name = (char*)name; - ex.arg1 = a1; - ex.arg2 = a2; - ex.retval = rslt; - (*stUserMathErr)(&ex); -} - -#undef __setusermatherr - -void __mingw_setusermatherr (int (__cdecl *f)(struct _exception *)) -{ - stUserMathErr = f; - __setusermatherr (f); -} - int __CRTDECL _matherr (struct _exception *pexcept) { diff --git a/lib/libc/mingw/crt/mingw_helpers.c b/lib/libc/mingw/crt/mingw_helpers.c index 28c56bc3c5..f5ce286ef5 100644 --- a/lib/libc/mingw/crt/mingw_helpers.c +++ b/lib/libc/mingw/crt/mingw_helpers.c @@ -4,28 +4,5 @@ * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ -#include -#include -#include -#include -#include -#include -#include -#include - -extern const PIMAGE_TLS_CALLBACK __dyn_tls_init_callback; - -void * __cdecl -_decode_pointer (void *codedptr) -{ - return (void *) codedptr; -} - -void * __cdecl -_encode_pointer (void *ptr) -{ - return ptr; -} - /* 0:console, 1:windows. */ int mingw_app_type = 0; diff --git a/lib/libc/mingw/crt/pseudo-reloc.c b/lib/libc/mingw/crt/pseudo-reloc.c index 6210368bac..6e2a63b9c5 100644 --- a/lib/libc/mingw/crt/pseudo-reloc.c +++ b/lib/libc/mingw/crt/pseudo-reloc.c @@ -10,8 +10,8 @@ use, modify or distribute it freely. This code is distributed in the hope that it will be useful but - WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY - DISCLAMED. This includes but is not limited to warrenties of + WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + DISCLAMED. This includes but is not limited to warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ diff --git a/lib/libc/mingw/crt/usermatherr.c b/lib/libc/mingw/crt/usermatherr.c new file mode 100644 index 0000000000..fce059e14e --- /dev/null +++ b/lib/libc/mingw/crt/usermatherr.c @@ -0,0 +1,32 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#include + +typedef int (__cdecl *fUserMathErr)(struct _exception *); +static fUserMathErr stUserMathErr; + +void __mingw_raise_matherr (int typ, const char *name, double a1, double a2, + double rslt) +{ + struct _exception ex; + if (!stUserMathErr) + return; + ex.type = typ; + ex.name = (char*)name; + ex.arg1 = a1; + ex.arg2 = a2; + ex.retval = rslt; + (*stUserMathErr)(&ex); +} + +#undef __setusermatherr + +void __mingw_setusermatherr (int (__cdecl *f)(struct _exception *)) +{ + stUserMathErr = f; + __setusermatherr (f); +} diff --git a/lib/libc/mingw/def-include/msvcrt-common.def.in b/lib/libc/mingw/def-include/msvcrt-common.def.in index 364e4409dd..e28b09e596 100644 --- a/lib/libc/mingw/def-include/msvcrt-common.def.in +++ b/lib/libc/mingw/def-include/msvcrt-common.def.in @@ -1,3 +1,5 @@ +#include "func.def.in" + #define ADD_UNDERSCORE(symbol) symbol == _ ## symbol #define ADD_DOUBLE_UNDERSCORE(symbol) symbol == __ ## symbol @@ -44,7 +46,13 @@ ADD_UNDERSCORE(gcvt) ADD_UNDERSCORE(getch) ADD_UNDERSCORE(getche) ADD_UNDERSCORE(getcwd) +#ifdef UCRTBASE +; ucrtbase.dll has got _getpid for all archs ADD_UNDERSCORE(getpid) +#elif !defined(NO_GETPID_ALIAS) +; msvcrt.dll for arm/arm64 lacks _getpid +F_X86_ANY(ADD_UNDERSCORE(getpid)) +#endif ADD_UNDERSCORE(getw) ADD_UNDERSCORE(heapwalk) ADD_UNDERSCORE(isatty) @@ -131,6 +139,8 @@ ADD_UNDERSCORE(hypot) ;logb ADD_UNDERSCORE(nextafter) +longjmp + #ifndef UCRTBASE _daylight DATA _timezone DATA @@ -140,6 +150,4 @@ ADD_UNDERSCORE(timezone) ADD_UNDERSCORE(tzname) ADD_UNDERSCORE(vsnprintf_s) - -longjmp DATA #endif diff --git a/lib/libc/mingw/include/internal.h b/lib/libc/mingw/include/internal.h index 06bda2bf8c..9439eafb3e 100644 --- a/lib/libc/mingw/include/internal.h +++ b/lib/libc/mingw/include/internal.h @@ -152,10 +152,6 @@ extern char *** __MINGW_IMP_SYMBOL(__initenv); #include #include - void * __cdecl _encode_pointer(void *); - void * __cdecl _encoded_null(); - void * __cdecl _decode_pointer(void *); - BOOL __cdecl _ValidateImageBase (PBYTE pImageBase); PIMAGE_SECTION_HEADER __cdecl _FindPESection (PBYTE pImageBase, DWORD_PTR rva); BOOL __cdecl _IsNonwritableInCurrentImage (PBYTE pTarget); diff --git a/lib/libc/mingw/include/msvcrt.h b/lib/libc/mingw/include/msvcrt.h index d5346254f0..551ea48d23 100644 --- a/lib/libc/mingw/include/msvcrt.h +++ b/lib/libc/mingw/include/msvcrt.h @@ -1,9 +1,5 @@ #include -#ifndef __LIBMSVCRT__ -#error "This file should only be used in libmsvcrt.a" -#endif - static inline HANDLE __mingw_get_msvcrt_handle(void) { return GetModuleHandleW(L"msvcrt.dll"); diff --git a/lib/libc/mingw/lib-common/advapi32.def.in b/lib/libc/mingw/lib-common/advapi32.def.in index db6f3cd7a6..b4e2aa21fa 100644 --- a/lib/libc/mingw/lib-common/advapi32.def.in +++ b/lib/libc/mingw/lib-common/advapi32.def.in @@ -149,6 +149,7 @@ CreateProcessWithTokenW CreateRestrictedToken CreateServiceA CreateServiceW +CreateServiceEx CreateTraceInstanceId CreateWellKnownSid CredBackupCredentials @@ -235,6 +236,7 @@ CryptSignHashA CryptSignHashW CryptVerifySignatureA CryptVerifySignatureW +CveEventWrite DecryptFileA DecryptFileW DeleteAce @@ -519,6 +521,7 @@ NotifyChangeEventLog NotifyServiceStatusChange NotifyServiceStatusChangeA NotifyServiceStatusChangeW +NpGetUserName ObjectCloseAuditAlarmA ObjectCloseAuditAlarmW ObjectDeleteAuditAlarmA @@ -581,6 +584,7 @@ ProcessIdleTasksW ProcessTrace QueryAllTracesA QueryAllTracesW +QueryLocalUserServiceName QueryRecoveryAgentsOnEncryptedFile QuerySecurityAccessMask QueryServiceConfig2A @@ -595,6 +599,9 @@ QueryServiceStatus QueryServiceStatusEx QueryTraceA QueryTraceW +QueryTraceProcessingHandle +QueryUserServiceName +QueryUserServiceNameForContext QueryUsersOnEncryptedFile ReadEncryptedFileRaw ReadEventLogA @@ -694,6 +701,8 @@ RegisterWaitChainCOMCallback RemoteRegEnumKeyWrapper RemoteRegEnumValueWrapper RemoteRegQueryInfoKeyWrapper +RemoteRegQueryMultipleValues2Wrapper +RemoteRegQueryMultipleValuesWrapper RemoteRegQueryValueWrapper RemoveTraceCallback RemoveUsersFromEncryptedFile diff --git a/lib/libc/mingw/lib-common/kernel32.def.in b/lib/libc/mingw/lib-common/kernel32.def.in index 3a556294c6..e92f235ddf 100644 --- a/lib/libc/mingw/lib-common/kernel32.def.in +++ b/lib/libc/mingw/lib-common/kernel32.def.in @@ -26,6 +26,14 @@ AdjustCalendarDate AllocConsole AllocateUserPhysicalPages AllocateUserPhysicalPagesNuma +AppPolicyGetClrCompat +AppPolicyGetCreateFileAccess +AppPolicyGetLifecycleManagement +AppPolicyGetMediaFoundationCodecLoading +AppPolicyGetProcessTerminationMethod +AppPolicyGetShowDeveloperDiagnostic +AppPolicyGetThreadInitializationType +AppPolicyGetWindowingModel AppXGetOSMaxVersionTested ApplicationRecoveryFinished ApplicationRecoveryInProgress @@ -88,12 +96,14 @@ BasepFreeAppCompatData BasepGetAppCompatData BasepGetComputerNameFromNtPath BasepGetExeArchType +BasepInitAppCompatData BasepIsProcessAllowed BasepMapModuleHandle BasepNotifyLoadStringResource BasepPostSuccessAppXExtension BasepProcessInvalidImage BasepQueryAppCompat +BasepQueryModuleChpeSettings BasepReleaseAppXContext BasepReleaseSxsCreateProcessUtilityStruct BasepReportFault @@ -136,6 +146,7 @@ CloseHandle ClosePackageInfo ClosePrivateNamespace CloseProfileUserMapping +ClosePseudoConsole CloseState CloseThreadpool CloseThreadpoolCleanupGroup @@ -186,6 +197,7 @@ CreateDirectoryExW CreateDirectoryTransactedA CreateDirectoryTransactedW CreateDirectoryW +CreateEnclave CreateEventA CreateEventExA CreateEventExW @@ -224,10 +236,12 @@ CreatePipe CreatePrivateNamespaceA CreatePrivateNamespaceW CreateProcessA +CreateProcessAsUserA CreateProcessAsUserW CreateProcessInternalA CreateProcessInternalW CreateProcessW +CreatePseudoConsole CreateRemoteThread CreateRemoteThreadEx CreateSemaphoreA @@ -309,6 +323,7 @@ EndUpdateResourceW EnterCriticalSection F_X64(EnterUmsSchedulingMode) EnterSynchronizationBarrier +EnterUmsSchedulingMode EnumCalendarInfoA EnumCalendarInfoExA EnumCalendarInfoExEx @@ -337,6 +352,7 @@ EnumSystemCodePagesA EnumSystemCodePagesW EnumSystemFirmwareTables EnumSystemGeoID +EnumSystemGeoNames EnumSystemLanguageGroupsA EnumSystemLanguageGroupsW EnumSystemLocalesA @@ -432,6 +448,7 @@ FreeEnvironmentStringsW FreeLibrary FreeLibraryAndExitThread FreeLibraryWhenCallbackReturns +FreeMemoryJobObject FreeResource FreeUserPhysicalPages GenerateConsoleCtrlEvent @@ -558,6 +575,8 @@ GetDiskFreeSpaceA GetDiskFreeSpaceExA GetDiskFreeSpaceExW GetDiskFreeSpaceW +GetDiskSpaceInformationA +GetDiskSpaceInformationW GetDllDirectoryA GetDllDirectoryW GetDriveTypeA @@ -566,6 +585,7 @@ GetDurationFormat GetDurationFormatEx GetDynamicTimeZoneInformation GetEnabledExtendedFeatures +GetEnabledXStateFeatures GetEncryptedFileVersionExt GetEnvironmentStrings GetEnvironmentStringsA @@ -608,6 +628,7 @@ GetFullPathNameTransactedW GetFullPathNameW GetGeoInfoA GetGeoInfoW +GetGeoInfoEx GetHandleInformation GetLargePageMinimum GetLargestConsoleWindowSize @@ -693,7 +714,9 @@ GetPrivateProfileStructA GetPrivateProfileStructW GetProcAddress GetProcessAffinityMask +GetProcessDefaultCpuSets GetProcessDEPPolicy +GetProcessDefaultCpuSets GetProcessGroupAffinity GetProcessHandleCount GetProcessHeap @@ -733,6 +756,7 @@ GetStringTypeExA GetStringTypeExW GetStringTypeW GetSystemAppDataKey +GetSystemCpuSetInformation GetSystemDEPPolicy GetSystemDefaultLCID GetSystemDefaultLangID @@ -763,6 +787,7 @@ GetTempFileNameW GetTempPathA GetTempPathW GetThreadContext +GetThreadDescription GetThreadErrorMode GetThreadGroupAffinity GetThreadIOPendingFlag @@ -773,6 +798,7 @@ GetThreadLocale GetThreadPreferredUILanguages GetThreadPriority GetThreadPriorityBoost +GetThreadSelectedCpuSets GetThreadSelectorEntry GetThreadTimes GetThreadUILanguage @@ -787,6 +813,8 @@ GetTimeZoneInformation GetTimeZoneInformationForYear GetUILanguageInfo F_X64(GetUmsCompletionListEvent) +GetUmsSystemThreadInformation +GetUserDefaultGeoName GetUserDefaultLCID GetUserDefaultLangID GetUserDefaultLocaleName @@ -809,6 +837,7 @@ GetVolumePathNamesForVolumeNameW GetWindowsDirectoryA GetWindowsDirectoryW GetWriteWatch +GetXStateFeaturesMask GlobalAddAtomA GlobalAddAtomExA GlobalAddAtomExW @@ -859,17 +888,17 @@ IdnToAscii IdnToNameprepUnicode IdnToUnicode InitAtomTable -InitializeConditionVariable -InitializeCriticalSection InitOnceBeginInitialize InitOnceComplete InitOnceExecuteOnce InitOnceInitialize InitializeConditionVariable InitializeContext +InitializeContext2 InitializeCriticalSection InitializeCriticalSectionAndSpinCount InitializeCriticalSectionEx +InitializeEnclave InitializeExtendedContext InitializeProcThreadAttributeList InitializeSListHead @@ -895,6 +924,7 @@ IsCalendarLeapYear IsDBCSLeadByte IsDBCSLeadByteEx IsDebuggerPresent +IsEnclaveTypeSupported IsNLSDefinedString IsNativeVhdBoot IsNormalizedString @@ -912,7 +942,9 @@ IsValidLocale IsValidUILanguage IsValidLocaleName IsValidNLSVersion +IsWow64GuestMachineSupported IsWow64Process +IsWow64Process2 K32EmptyWorkingSet K32EnumDeviceDrivers K32EnumPageFilesA @@ -958,6 +990,7 @@ LZStart LeaveCriticalSection LeaveCriticalSectionWhenCallbackReturns LoadAppInitDlls +LoadEnclaveData LoadLibraryA LoadLibraryExA LoadLibraryExW @@ -970,6 +1003,7 @@ LoadStringBaseW LocalAlloc LocalCompact LocalFileTimeToFileTime +LocalFileTimeToLocalSystemTime LocalFlags LocalFree LocalHandle @@ -977,10 +1011,12 @@ LocalLock LocalReAlloc LocalShrink LocalSize +LocalSystemTimeToLocalFileTime LocalUnlock LocaleNameToLCID LocateExtendedFeature LocateLegacyContext +LocateXStateFeature LockFile LockFileEx LockResource @@ -1099,11 +1135,13 @@ QueryFullProcessImageNameW QueryIdleProcessorCycleTime QueryIdleProcessorCycleTimeEx QueryInformationJobObject +QueryIoRateControlInformationJobObject QueryMemoryResourceNotification QueryPerformanceCounter QueryPerformanceFrequency QueryProcessAffinityUpdateMode QueryProcessCycleTime +QueryProtectedPolicy QueryThreadCycleTime QueryThreadProfiling QueryThreadpoolStackInformation @@ -1116,6 +1154,8 @@ QuirkGetDataWorker QuirkIsEnabled2Worker QuirkIsEnabled3Worker QuirkIsEnabledForPackage2Worker +QuirkIsEnabledForPackage3Worker +QuirkIsEnabledForPackage4Worker QuirkIsEnabledForPackageWorker QuirkIsEnabledForProcessWorker QuirkIsEnabledWorker @@ -1135,12 +1175,14 @@ ReadConsoleOutputCharacterA ReadConsoleOutputCharacterW ReadConsoleOutputW ReadConsoleW +ReadDirectoryChangesExW ReadDirectoryChangesW ReadFile ReadFileEx ReadFileScatter ReadProcessMemory ReadThreadProfilingData +ReclaimVirtualMemory ; ; MSDN says these functions are exported ; from advapi32.dll. Commented out for @@ -1231,6 +1273,7 @@ RequestDeviceWakeup RequestWakeupLatency ResetEvent ResetWriteWatch +ResizePseudoConsole ResolveDelayLoadedAPI ResolveDelayLoadsFromDll ResolveLocaleName @@ -1346,6 +1389,7 @@ SetFirmwareEnvironmentVariableW SetHandleCount SetHandleInformation SetInformationJobObject +SetIoRateControlInformationJobObject SetLastConsoleEventActive SetLastError SetLocalPrimaryComputerNameA @@ -1361,6 +1405,7 @@ SetPriorityClass SetProcessAffinityMask SetProcessAffinityUpdateMode SetProcessDEPPolicy +SetProcessDefaultCpuSets SetProcessInformation SetProcessMitigationPolicy SetProcessPreferredUILanguages @@ -1368,6 +1413,7 @@ SetProcessPriorityBoost SetProcessShutdownParameters SetProcessWorkingSetSize SetProcessWorkingSetSizeEx +SetProtectedPolicy SetSearchPathMode SetStdHandle SetStdHandleEx @@ -1380,6 +1426,7 @@ SetTapePosition SetTermsrvAppInstallMode SetThreadAffinityMask SetThreadContext +SetThreadDescription SetThreadErrorMode SetThreadExecutionState SetThreadGroupAffinity @@ -1390,6 +1437,7 @@ SetThreadLocale SetThreadPreferredUILanguages SetThreadPriority SetThreadPriorityBoost +SetThreadSelectedCpuSets SetThreadStackGuarantee SetThreadToken SetThreadUILanguage @@ -1405,6 +1453,7 @@ SetTimerQueueTimer F_X64(SetUmsThreadInformation) SetUnhandledExceptionFilter SetUserGeoID +SetUserGeoName SetVDMCurrentDirectories SetVolumeLabelA SetVolumeLabelW @@ -1413,6 +1462,7 @@ SetVolumeMountPointW SetVolumeMountPointWStub SetWaitableTimer SetWaitableTimerEx +SetXStateFeaturesMask SetupComm ShowConsoleCursor SignalObjectAndWait @@ -1507,6 +1557,7 @@ VirtualUnlock WTSGetActiveConsoleSessionId WaitCommEvent WaitForDebugEvent +WaitForDebugEventEx WaitForMultipleObjects WaitForMultipleObjectsEx WaitForSingleObject @@ -1523,6 +1574,11 @@ WakeByAddressSingle WakeByAddressAll WakeConditionVariable WerGetFlags +WerGetFlagsWorker +WerRegisterAdditionalProcess +WerRegisterAppLocalDump +WerRegisterCustomMetadata +WerRegisterExcludedMemoryBlock WerRegisterFile WerRegisterFileWorker WerRegisterMemoryBlock @@ -1530,6 +1586,11 @@ WerRegisterMemoryBlockWorker WerRegisterRuntimeExceptionModule WerRegisterRuntimeExceptionModuleWorker WerSetFlags +WerSetFlagsWorker +WerUnregisterAdditionalProcess +WerUnregisterAppLocalDump +WerUnregisterCustomMetadata +WerUnregisterExcludedMemoryBlock WerUnregisterFile WerUnregisterFileWorker WerUnregisterMemoryBlock @@ -1583,7 +1644,8 @@ WriteProfileStringW WriteTapemark ZombifyActCtx ZombifyActCtxWorker -__C_specific_handler +F_X64(__C_specific_handler) +F_ARM32(__C_specific_handler) F_ARM32(__chkstk) F_X64(__misaligned_access) _hread @@ -1613,6 +1675,17 @@ lstrcpynW lstrlen lstrlenA lstrlenW +; +; MSDN says these functions are exported +; from winmm.dll. Commented out for +; compatibility with older versions of +; Windows. +; +;timeBeginPeriod +;timeEndPeriod +;timeGetDevCaps +;timeGetSystemTime +;timeGetTime uaw_lstrcmpW uaw_lstrcmpiW uaw_lstrlenW diff --git a/lib/libc/mingw/lib-common/msvcrt.def.in b/lib/libc/mingw/lib-common/msvcrt.def.in index 1a1db2b4e0..702f2aeef3 100644 --- a/lib/libc/mingw/lib-common/msvcrt.def.in +++ b/lib/libc/mingw/lib-common/msvcrt.def.in @@ -226,7 +226,8 @@ _CrtSetReportHook _CrtSetReportHook2 _CrtSetReportMode #endif -_CxxThrowException +F_I386(_CxxThrowException@8) +F_NON_I386(_CxxThrowException) F_I386(_EH_prolog) _Getdays _Getmonths @@ -245,7 +246,7 @@ F_I386(__CxxCallUnwindDtor) F_I386(__CxxCallUnwindVecDtor) F_I386(__CxxDetectRethrow) F_I386(__CxxExceptionFilter) -__CxxFrameHandler +F_X86_ANY(__CxxFrameHandler) F_ARM_ANY(__CxxFrameHandler3) F_I386(__CxxLongjmpUnwind) F_I386(__CxxQueryExceptionSize) @@ -259,9 +260,13 @@ __STRINGTOLD F_NON_I386(___lc_codepage_func) ___lc_collate_cp_func ___lc_handle_func -___mb_cur_max_func -___setlc_active_func -___unguarded_readlc_active_add_func +; ___mb_cur_max_func exists (on all archs) since XP. Earlier, this function +; was never used, but the __mb_cur_max data symbol was accessed instead. +; For i386 we provide this function as a statically linked helper, that uses +; __mb_cur_max, to avoid forcing a dependency on XP here. +F_NON_I386(___mb_cur_max_func) +F_X86_ANY(___setlc_active_func) +F_X86_ANY(___unguarded_readlc_active_add_func) __argc DATA __argv DATA __badioinfo DATA @@ -284,8 +289,8 @@ __isascii __iscsym __iscsymf F_I386(__lc_clike) -__lc_codepage DATA -__lc_collate_cp DATA +F_X86_ANY(__lc_codepage DATA) +F_X86_ANY(__lc_collate_cp DATA) __lc_handle DATA __lconv_init __mb_cur_max DATA @@ -327,16 +332,16 @@ __pxcptinfoptrs F_I386(__security_error_handler) __set_app_type F_I386(__set_buffer_overrun_handler) -__setlc_active DATA +F_X86_ANY(__setlc_active DATA) __setusermatherr F_ARM_ANY(__strncnt) -__threadhandle -__threadid +F_X86_ANY(__threadhandle) +F_X86_ANY(__threadid) __toascii __uncaught_exception __unDName __unDNameEx -__unguarded_readlc_active DATA +F_X86_ANY(__unguarded_readlc_active DATA) __wargv DATA __wcserror F_NON_I386(__wcserror_s) @@ -376,7 +381,7 @@ F_ARM_ANY(_aligned_offset_realloc_dbg) _aligned_realloc F_ARM_ANY(_aligned_realloc_dbg) _amsg_exit -_assert DATA +_assert _atodbl _atodbl_l _atof_l @@ -387,7 +392,7 @@ _atoi_l _atol_l _atoldbl F_NON_I386(_atoldbl_l) -_beep +F_X86_ANY(_beep) _beginthread _beginthreadex _c_exit @@ -428,7 +433,7 @@ _cputs _cputws F_I386(_CRT_RTC_INIT) _creat -_create_locale +F_ARM_ANY(_create_locale) F_ARM32(_crtAssertBusy) F_ARM32(_crtBreakAlloc) F_ARM32(_crtDbgFlag) @@ -453,10 +458,10 @@ _cwscanf _cwscanf_l _cwscanf_s _cwscanf_s_l -_dstbias DATA +F_X86_ANY(_dstbias DATA) F_ARM_ANY(_daylight DATA) -F_ARM_ANY(_difftime32) -F_ARM_ANY(_difftime64) +_difftime32 F_I386(== difftime) +_difftime64 _dup _dup2 _ecvt @@ -520,7 +525,7 @@ _fprintf_s_l _fputchar _fputwchar F_ARM_ANY(_free_dbg) -_free_locale +F_ARM_ANY(_free_locale) F_ARM_ANY(_freea) F_NON_I386(_fscanf_l) F_NON_I386(_fscanf_s_l) @@ -532,7 +537,8 @@ _fstat64 _fstati64 F64(_fstat64i32 == _fstat) _ftime -F_ARM_ANY(_ftime32) +F_I386(_ftime32 == _ftime) +F_NON_I386(_ftime32) _ftime32_s _ftime64 _ftime64_s @@ -542,7 +548,8 @@ F_I386(_ftol) _fullpath F_ARM_ANY(_fullpath_dbg) _futime -F_ARM_ANY(_futime32) +F_I386(_futime32 == _futime) +F_NON_I386(_futime32) _futime64 _fwprintf_l _fwprintf_p @@ -558,10 +565,10 @@ F_ARM_ANY(_get_environ) F_ARM_ANY(_get_errno) F_ARM_ANY(_get_fileinfo) F_ARM_ANY(_get_fmode) -_get_heap_handle +F_X86_ANY(_get_heap_handle) _get_osfhandle ;_get_output_format provided by emu -_get_sbh_threshold +F_X86_ANY(_get_sbh_threshold) F_ARM_ANY(_get_wenviron) _getch _getche @@ -570,25 +577,25 @@ _getdcwd _getdiskfree _getdllprocaddr _getdrive -_getdrives +F_X86_ANY(_getdrives) _getmaxstdio _getmbcp -_getpid -_getsystime +F_X86_ANY(_getpid) +F_X86_ANY(_getsystime) _getw _getwch _getwche -_getws +F_X86_ANY(_getws) F_I386(_global_unwind2) _gmtime32 F_I386(== gmtime) ; _gmtime32_s replaced by emu _gmtime64 ; _gmtime64_s replaced by emu -_heapadd +F_X86_ANY(_heapadd) _heapchk _heapmin -_heapset -_heapused +F_X86_ANY(_heapset) +F_X86_ANY(_heapused) _heapwalk _hypot F_NON_I386(_hypotf) @@ -698,7 +705,7 @@ _j1 _jn _kbhit _lfind -_loaddll +F_X86_ANY(_loaddll) F_NON_I386(_lfind_s) F_X64(_local_unwind) F_I386(_local_unwind2) @@ -868,9 +875,8 @@ _memicmp _memicmp_l _mkdir _mkgmtime -F_I386(_mkgmtime32) -F_ARM_ANY(_mkgmtime32) -F_NON_I386(_mkgmtime64) +_mkgmtime32 +_mkgmtime64 _mktemp ; _mktemp_s replaced by emu F_I386(_mktime32 == mktime) @@ -883,7 +889,7 @@ F_X64(_nextafterf) _onexit _open _open_osfhandle -_osplatform DATA +F_X86_ANY(_osplatform DATA) _osver DATA F_I386(_outp) F_I386(_outpd) @@ -941,19 +947,19 @@ F_ARM_ANY(_set_fileinfo) F_ARM_ANY(_set_fmode) ; Does not seem to present even on Win7 msvcrt ;_set_purecall_handler -_set_sbh_threshold +F_X86_ANY(_set_sbh_threshold) ; _set_output_format provided by emu F_I386(_set_SSE2_enable) F_I386(_set_security_error_handler) -_seterrormode +F_X86_ANY(_seterrormode) _setjmp F_I386(_setjmp3) F_NON_I386(_setjmpex) -_setmaxstdio +F_X86_ANY(_setmaxstdio) _setmbcp _setmode -_setsystime -_sleep +F_X86_ANY(_setsystime) +F_X86_ANY(_sleep) _snprintf _snprintf_c _snprintf_c_l @@ -1074,10 +1080,11 @@ _umask _ungetch _ungetwch _unlink -_unloaddll +F_X86_ANY(_unloaddll) _unlock _utime -F_ARM_ANY(_utime32) +F_I386(_utime32 == _utime) +F_NON_I386(_utime32) _utime64 _vcprintf _vcprintf_l @@ -1138,7 +1145,7 @@ _waccess ; _waccess_s Replaced by emu _wasctime ; _wasctime_s Replaced by emu -F_ARM_ANY(_wassert) +F_NON_I386(_wassert) _wchdir _wchmod _wcmdln DATA @@ -1227,7 +1234,7 @@ _wgetenv_s _winmajor DATA _winminor DATA _winput_s -_winver DATA +F_X86_ANY(_winver DATA) _wmakepath _wmakepath_s _wmkdir @@ -1289,7 +1296,8 @@ _wtol _wtol_l _wunlink _wutime -F_ARM_ANY(_wutime32) +F_I386(_wutime32 == _wutime) +F_NON_I386(_wutime32) _wutime64 _y0 _y1 @@ -1298,14 +1306,18 @@ abort abs acos F_NON_I386(acosf F_X86_ANY(DATA)) +F_ARM_ANY(acosl == acos) asctime ; asctime_s replaced by emu asin F_NON_I386(asinf F_X86_ANY(DATA)) +F_ARM_ANY(asinl == asin) atan atan2 F_X86_ANY(DATA) F_NON_I386(atan2f F_X86_ANY(DATA)) +F_ARM_ANY(atan2l == atan2) F_NON_I386(atanf F_X86_ANY(DATA)) +F_ARM_ANY(atanl == atan) atexit DATA atof atoi @@ -1314,13 +1326,15 @@ bsearch bsearch_s F_ARM_ANY(btowc) calloc -ceil DATA -F_NON_I386(ceilf DATA) +ceil F_X86_ANY(DATA) +F_NON_I386(ceilf F_X86_ANY(DATA)) +F_ARM_ANY(ceill == ceil) clearerr clearerr_s clock cos F_X86_ANY(DATA) F_NON_I386(cosf F_X86_ANY(DATA)) +F_ARM_ANY(cosl == cos) cosh F_NON_I386(coshf DATA) ctime @@ -1329,6 +1343,7 @@ div exit exp F_X86_ANY(DATA) F_NON_I386(expf F_X86_ANY(DATA)) +F_ARM_ANY(expl == exp) fabs DATA F_ARM_ANY(fabsf) fclose @@ -1340,10 +1355,12 @@ fgetpos fgets fgetwc fgetws -floor DATA -F_NON_I386(floorf DATA) +floor F_X86_ANY(DATA) +F_NON_I386(floorf F_X86_ANY(DATA)) +F_ARM_ANY(floorl == floor) fmod F_X86_ANY(DATA) F_NON_I386(fmodf F_X86_ANY(DATA)) +F_ARM_ANY(fmodl == fmod) fopen fopen_s fprintf @@ -1356,8 +1373,7 @@ fread free freopen freopen_s -; If we implement frexp, we can set it to DATA only. -frexp +frexp DATA fscanf fscanf_s fseek @@ -1373,7 +1389,7 @@ getc getchar getenv getenv_s -gets +F_X86_ANY(gets) getwc getwchar gmtime @@ -1411,8 +1427,9 @@ localtime log F_X86_ANY(DATA) log10 F_NON_I386(log10f F_X86_ANY(DATA)) +F_ARM_ANY(log10l == log10) F_NON_I386(logf F_X86_ANY(DATA)) -F_ARM_ANY(longjmp) +F_ARM_ANY(logl == log) malloc mblen F_ARM_ANY(mbrlen) @@ -1434,8 +1451,8 @@ mktime modf DATA F_NON_I386(modff DATA) perror -pow F_X86_ANY(DATA) -F_NON_I386(powf F_X86_ANY(DATA)) +pow DATA +F_NON_I386(powf DATA) printf printf_s putc @@ -1461,6 +1478,7 @@ setvbuf signal sin F_X86_ANY(DATA) F_NON_I386(sinf F_X86_ANY(DATA)) +F_ARM_ANY(sinl == sin) ; if we implement sinh, we can set it DATA only. sinh F_NON_I386(sinhf DATA) @@ -1506,6 +1524,7 @@ swscanf_s system tan F_NON_I386(tanf F_X86_ANY(DATA)) +F_ARM_ANY(tanl == tan) ; if we implement tanh, we can set it to DATA only. tanh F_ARM_ANY(tanhf) diff --git a/lib/libc/mingw/libarm32/mswsock.def b/lib/libc/mingw/lib-common/mswsock.def similarity index 100% rename from lib/libc/mingw/libarm32/mswsock.def rename to lib/libc/mingw/lib-common/mswsock.def diff --git a/lib/libc/mingw/lib-common/rpcrt4.def b/lib/libc/mingw/lib-common/rpcrt4.def index 4be11bc6ff..578c20f6c1 100644 --- a/lib/libc/mingw/lib-common/rpcrt4.def +++ b/lib/libc/mingw/lib-common/rpcrt4.def @@ -2,8 +2,8 @@ LIBRARY "RPCRT4.dll" EXPORTS CreateProxyFromTypeInfo CreateStubFromTypeInfo -I_RpcFixTransferSyntax I_RpcBindingInqCurrentModifiedId +I_RpcFixTransferSyntax I_RpcFwThisIsTheManager I_RpcInitFwImports I_RpcInitHttpImports @@ -83,12 +83,15 @@ I_RpcFilterDCOMActivation I_RpcFree I_RpcFreeBuffer I_RpcFreePipeBuffer +I_RpcFreeSystemHandle +I_RpcFreeSystemHandleCollection I_RpcGetBuffer I_RpcGetBufferWithObject I_RpcGetCurrentCallHandle I_RpcGetDefaultSD I_RpcGetExtendedError I_RpcGetPortAllocationData +I_RpcGetSystemHandle I_RpcIfInqTransferSyntaxes I_RpcLogEvent I_RpcMapWin32Status @@ -127,6 +130,8 @@ I_RpcServerRegisterForwardFunction I_RpcServerSetAddressChangeFn I_RpcServerStartService I_RpcServerSubscribeForDisconnectNotification +I_RpcServerSubscribeForDisconnectNotification2 +I_RpcServerUnsubscribeForDisconnectNotification I_RpcServerUseProtseq2A I_RpcServerUseProtseq2W I_RpcServerUseProtseqEp2A @@ -134,8 +139,10 @@ I_RpcServerUseProtseqEp2W I_RpcSessionStrictContextHandle I_RpcSetAsyncHandle I_RpcSetDCOMAppId +I_RpcSetSystemHandle I_RpcSsDontSerializeContext I_RpcSystemFunction001 +I_RpcSystemHandleTypeSpecificWork I_RpcTransConnectionAllocatePacket I_RpcTransConnectionFreePacket I_RpcTransConnectionReallocPacket @@ -445,6 +452,7 @@ RpcIfIdVectorFree RpcIfInqId RpcImpersonateClient RpcImpersonateClient2 +RpcImpersonateClientContainer RpcInitializeAsyncHandle RpcMgmtEnableIdleCleanup RpcMgmtEpEltInqBegin @@ -479,11 +487,13 @@ RpcProtseqVectorFreeA RpcProtseqVectorFreeW RpcRaiseException RpcRegisterAsyncInfo +RpcRevertContainerImpersonation RpcRevertToSelf RpcRevertToSelfEx RpcServerCompleteSecurityCallback RpcServerInqBindingHandle RpcServerInqBindings +RpcServerInqBindingsEx RpcServerInqCallAttributesA RpcServerInqCallAttributesW RpcServerInqDefaultPrincNameA @@ -571,7 +581,3 @@ UuidHash UuidIsNil UuidToStringA UuidToStringW -pfnFreeRoutines DATA -pfnMarshallRoutines DATA -pfnSizeRoutines DATA -pfnUnmarshallRoutines DATA diff --git a/lib/libc/mingw/lib64/urlmon.def b/lib/libc/mingw/lib-common/urlmon.def similarity index 59% rename from lib/libc/mingw/lib64/urlmon.def rename to lib/libc/mingw/lib-common/urlmon.def index 2a10219a31..ea48695e7b 100644 --- a/lib/libc/mingw/lib64/urlmon.def +++ b/lib/libc/mingw/lib-common/urlmon.def @@ -1,32 +1,49 @@ -; -; Exports of file urlmon.dll ; -; Autogenerated by gen_exportdef -; Written by Kai Tietz, 2007 +; Definition file of urlmon.dll +; Automatic generated by gendef +; written by Kai Tietz 2008 ; -LIBRARY urlmon.dll +LIBRARY "urlmon.dll" EXPORTS +FileBearsMarkOfTheWeb +GetPortFromUrlScheme +GetPropertyFromName +GetPropertyName +IsDWORDProperty +IsStringProperty AsyncGetClassBits AsyncInstallDistributionUnit BindAsyncMoniker +CAuthenticateHostUI_CreateInstance CDLGetLongPathNameA CDLGetLongPathNameW +CORPolicyProvider CoGetClassObjectFromURL CoInstall +CoInternetCanonicalizeIUri +CoInternetCombineIUri CoInternetCombineUrl +CoInternetCombineUrlEx CoInternetCompareUrl CoInternetCreateSecurityManager CoInternetCreateZoneManager CoInternetFeatureSettingsChanged +CoInternetGetMobileBrowserAppCompatMode +CoInternetGetMobileBrowserForceDesktopMode CoInternetGetProtocolFlags CoInternetGetSecurityUrl +CoInternetGetSecurityUrlEx CoInternetGetSession CoInternetIsFeatureEnabled +CoInternetIsFeatureEnabledForIUri CoInternetIsFeatureEnabledForUrl CoInternetIsFeatureZoneElevationEnabled +CoInternetParseIUri CoInternetParseUrl CoInternetQueryInfo CoInternetSetFeatureEnabled +CoInternetSetMobileBrowserAppCompatMode +CoInternetSetMobileBrowserForceDesktopMode CompareSecurityIds CompatFlagsFromClsid CopyBindInfo @@ -34,8 +51,14 @@ CopyStgMedium CreateAsyncBindCtx CreateAsyncBindCtxEx CreateFormatEnumerator +CreateIUriBuilder CreateURLMoniker CreateURLMonikerEx +CreateURLMonikerEx2 +CreateUri +CreateUriFromMultiByteString +CreateUriPriv +CreateUriWithFragment DllCanUnloadNow DllGetClassObject DllInstall @@ -51,16 +74,26 @@ GetAddSitesFileUrl GetClassFileOrMime GetClassURL GetComponentIDFromCLSSPEC +GetIDNFlagsForUri +GetIUriPriv +GetIUriPriv2 +GetLabelsFromNamedHost GetMarkOfTheWeb GetSoftwareUpdateInfo +GetUrlmonThreadNotificationHwnd +GetZoneFromAlternateDataStreamEx HlinkGoBack HlinkGoForward HlinkNavigateMoniker HlinkNavigateString HlinkSimpleNavigateToMoniker HlinkSimpleNavigateToString +IEGetUserPrivateNamespaceName +IEInstallScope InstallFlash +IntlPercentEncodeNormalize IsAsyncMoniker +IsIntranetAvailable IsJITInProgress IsLoggingEnabledA IsLoggingEnabledW @@ -68,14 +101,21 @@ IsValidURL MkParseDisplayNameEx ObtainUserAgentString PrivateCoInstall +QueryAssociations +QueryClsidAssociation RegisterBindStatusCallback RegisterFormatEnumerator RegisterMediaTypeClass RegisterMediaTypes +RegisterWebPlatformPermanentSecurityManager ReleaseBindInfo +RestrictHTTP2 RevokeBindStatusCallback RevokeFormatEnumerator +SetAccessForIEAppContainer SetSoftwareUpdateAdvertisementState +ShouldDisplayPunycodeForUri +ShouldShowIntranetWarningSecband ShowTrustAlertDialog URLDownloadA URLDownloadToCacheFileA @@ -89,8 +129,11 @@ URLOpenPullStreamA URLOpenPullStreamW URLOpenStreamA URLOpenStreamW +UnregisterWebPlatformPermanentSecurityManager UrlMkBuildVersion UrlMkGetSessionOption UrlMkSetSessionOption +UrlmonCleanupCurrentThread WriteHitLogging ZonesReInit +IECompatLogCSSFix diff --git a/lib/libc/mingw/lib32/ntdll.def b/lib/libc/mingw/lib32/ntdll.def index d6837b113f..d6ca366ee8 100644 --- a/lib/libc/mingw/lib32/ntdll.def +++ b/lib/libc/mingw/lib32/ntdll.def @@ -5,6 +5,7 @@ ; LIBRARY "ntdll.dll" EXPORTS +RtlDispatchAPC@12 RtlActivateActivationContextUnsafeFast@0 RtlDeactivateActivationContextUnsafeFast@0 RtlInterlockedPushListSList@8 @@ -35,6 +36,8 @@ AlpcRegisterCompletionListWorkerThread@4 AlpcRundownCompletionList@4 AlpcUnregisterCompletionList@4 AlpcUnregisterCompletionListWorkerThread@4 +ApiSetQueryApiSetPresence@8 +ApiSetQueryApiSetPresenceEx@12 CsrAllocateCaptureBuffer@8 CsrAllocateMessagePointer@12 CsrCaptureMessageBuffer@16 @@ -63,6 +66,7 @@ DbgSsInitialize@16 DbgUiConnectToDbg@0 DbgUiContinue@8 DbgUiConvertStateChangeStructure@8 +DbgUiConvertStateChangeStructureEx@8 DbgUiDebugActiveProcess@4 DbgUiGetThreadDebugObject@0 DbgUiIssueRemoteBreakin@4 @@ -71,6 +75,7 @@ DbgUiSetThreadDebugObject@4 DbgUiStopDebugging@4 DbgUiWaitStateChange@8 DbgUserBreakPoint@0 +EtwCheckCoverage@4 EtwCreateTraceInstanceId@8 EtwDeliverDataBlock@4 EtwEnumerateProcessRegGuids@12 @@ -78,6 +83,7 @@ EtwEventActivityIdControl@8 EtwEventEnabled@12 EtwEventProviderEnabled@20 EtwEventRegister@16 +EtwEventSetInformation@20 EtwEventUnregister@8 EtwEventWrite@20 EtwEventWriteEndScenario@20 @@ -118,64 +124,94 @@ KiUserApcDispatcher@20 KiUserCallbackDispatcher@12 KiUserExceptionDispatcher@8 LdrAccessResource@16 +LdrAddDllDirectory@8 LdrAddLoadAsDataTable@16; Check!!! gendef says @20 LdrAddRefDll@8 LdrAlternateResourcesEnabled@0 +LdrAppxHandleIntegrityFailure@4 +LdrCallEnclave@12 +LdrControlFlowGuardEnforced@0 +LdrCreateEnclave@36 +LdrDeleteEnclave@4 LdrDisableThreadCalloutsForDll@4 LdrEnumResources@20 LdrEnumerateLoadedModules@12 +LdrFastFailInLoaderCallout@0 LdrFindEntryForAddress@8 LdrFindResourceDirectory_U@16 LdrFindResourceEx_U@20 LdrFindResource_U@16 LdrFlushAlternateResourceModules@0 +LdrGetDllDirectory@4 +LdrGetDllFullName@8 LdrGetDllHandle@16 LdrGetDllHandleByMapping@8 LdrGetDllHandleByName@12 LdrGetDllHandleEx@20 +LdrGetDllPath@16 LdrGetFailureData@0 LdrGetFileNameFromLoadAsDataTable@8 LdrGetProcedureAddress@16 LdrGetProcedureAddressEx@20 +LdrGetProcedureAddressForCaller@24 LdrHotPatchRoutine@0 LdrInitShimEngineDynamic@4 +LdrInitializeEnclave@20 LdrInitializeThunk@16 +LdrIsModuleSxsRedirected@4 LdrLoadAlternateResourceModule@16 LdrLoadAlternateResourceModuleEx@20 LdrLoadDll@16 +LdrLoadEnclaveModule@12 LdrAlternateResourcesEnabled@0 LdrLockLoaderLock@12 LdrOpenImageFileOptionsKey@12 +LdrParentInterlockedPopEntrySList@0 +LdrParentRtlInitializeNtUserPfn@0 +LdrParentRtlResetNtUserPfn@0 +LdrParentRtlRetrieveNtUserPfn@0 LdrProcessRelocationBlock@16 +LdrProcessRelocationBlockEx@20 LdrQueryImageFileExecutionOptions@24 LdrQueryImageFileExecutionOptionsEx@28 LdrQueryImageFileKeyOption@24 LdrQueryModuleServiceTags@12 +LdrQueryOptionalDelayLoadedAPI@16 LdrQueryProcessModuleInformation@12 LdrRegisterDllNotification@16 +LdrRemoveDllDirectory@4 LdrRemoveLoadAsDataTable@16 LdrResFindResource@36 LdrResFindResourceDirectory@28 LdrResGetRCConfig@20 LdrResRelease@12 LdrResSearchResource@32 +LdrResolveDelayLoadedAPI@24 +LdrResolveDelayLoadsFromDll@12 LdrRscIsTypeExist@16 LdrSetAppCompatDllRedirectionCallback@12 +LdrSetDefaultDllDirectories@4 +LdrSetDllDirectory@4 LdrSetDllManifestProber@4 +LdrSetImplicitPathOptions@8 LdrSetMUICacheType@4 LdrShutdownProcess@0 LdrShutdownThread@0 +LdrStandardizeSystemPath@4 +LdrSystemDllInitBlock@0 LdrUnloadAlternateResourceModule@4 LdrUnloadAlternateResourceModuleEx@8 LdrUnloadDll@4 LdrUnlockLoaderLock@8 LdrUnregisterDllNotification@4 +LdrUpdatePackageSearchPath@4 LdrVerifyImageMatchesChecksum@16 LdrVerifyImageMatchesChecksumEx@8 -LdrWx86FormatVirtualImage@12 +LdrpChildNtdll@0 LdrpResGetMappingSize@16 LdrpResGetRCConfig@20 LdrpResGetResourceDirectory@20 +LdrWx86FormatVirtualImage@12 MD4Final@4 MD4Init@4 MD4Update@12 @@ -193,22 +229,29 @@ NtAccessCheckByTypeAndAuditAlarm@64 NtAccessCheckByTypeResultList@44 NtAccessCheckByTypeResultListAndAuditAlarm@64 NtAccessCheckByTypeResultListAndAuditAlarmByHandle@68 +NtAcquireProcessActivityReference@12 NtAcquireCMFViewOwnership@12 NtAddAtom@12 +NtAddAtomEx@16 NtAddBootEntry@8 NtAddDriverEntry@8 NtAdjustGroupsToken@24 NtAdjustPrivilegesToken@24 +NtAdjustTokenClaimsAndDeviceGroups@64 NtAlertResumeThread@8 NtAlertThread@4 +NtAlertThreadByThreadId@4 NtAllocateLocallyUniqueId@4 NtAllocateReserveObject@12 NtAllocateUserPhysicalPages@12 +NtAllocateUserPhysicalPagesEx@20 NtAllocateUuids@16 NtAllocateVirtualMemory@24 +NtAllocateVirtualMemoryEx@28 NtAlpcAcceptConnectPort@36 NtAlpcCancelMessage@12 NtAlpcConnectPort@44 +NtAlpcConnectPortEx@44 NtAlpcCreatePort@12 NtAlpcCreatePortSection@24 NtAlpcCreateResourceReserve@16 @@ -219,6 +262,7 @@ NtAlpcDeleteResourceReserve@12 NtAlpcDeleteSectionView@12 NtAlpcDeleteSecurityContext@12 NtAlpcDisconnectPort@8 +NtAlpcImpersonateClientContainerOfPort@12 NtAlpcImpersonateClientOfPort@12 NtAlpcOpenSenderProcess@24 NtAlpcOpenSenderThread@24 @@ -230,58 +274,78 @@ NtAlpcSetInformation@16 NtApphelpCacheControl@8 NtAreMappedFilesTheSame@8 NtAssignProcessToJobObject@8 +NtAssociateWaitCompletionPacket@32 +NtCallEnclave@16 NtCallbackReturn@12 NtCancelDeviceWakeupRequest@4 NtCancelIoFile@8 NtCancelIoFileEx@12 NtCancelSynchronousIoFile@12 +NtCancelTimer2@8 NtCancelTimer@8 +NtCancelWaitCompletionPacket@8 NtClearEvent@4 NtClose@4 NtCloseObjectAuditAlarm@12 NtCommitComplete@8 NtCommitEnlistment@8 +NtCommitRegistryTransaction@8 NtCommitTransaction@8 NtCompactKeys@8 +NtCompareObjects@8 +NtCompareSigningLevels@8 NtCompareTokens@12 NtCompleteConnectPort@4 NtCompressKey@4 NtConnectPort@32 NtContinue@8 +NtConvertBetweenAuxiliaryCounterAndPerformanceCounter@16 +NtCreateCrossVmEvent@24 NtCreateDebugObject@16 NtCreateDirectoryObject@12 +NtCreateDirectoryObjectEx@20 +NtCreateEnclave@36 NtCreateEnlistment@32 NtCreateEvent@20 NtCreateEventPair@12 NtCreateFile@44 +NtCreateIRTimer@12 NtCreateIoCompletion@16 NtCreateJobObject@12 NtCreateJobSet@12 NtCreateKey@28 NtCreateKeyTransacted@32 NtCreateKeyedEvent@16 +NtCreateLowBoxToken@36 NtCreateMailslotFile@32 NtCreateMutant@16 NtCreateNamedPipeFile@56 NtCreatePagingFile@16 +NtCreatePartition@16 NtCreatePort@20 NtCreatePrivateNamespace@16 NtCreateProcess@32 NtCreateProcessEx@36 NtCreateProfile@36 NtCreateProfileEx@40 +NtCreateRegistryTransaction@16 NtCreateResourceManager@28 NtCreateSection@28 +NtCreateSectionEx@36 NtCreateSemaphore@20 NtCreateSymbolicLinkObject@16 NtCreateThread@32 NtCreateThreadEx@44 +NtCreateTimer2@20 NtCreateTimer@16 NtCreateToken@52 +NtCreateTokenEx@68 NtCreateTransaction@40 NtCreateTransactionManager@24 NtCreateUserProcess@44 +NtCreateWaitCompletionPacket@12 NtCreateWaitablePort@20 +NtCreateWnfStateName@28 NtCreateWorkerFactory@40 NtCurrentTeb@0 NtDebugActiveProcess@8 @@ -295,6 +359,8 @@ NtDeleteKey@4 NtDeleteObjectAuditAlarm@12 NtDeletePrivateNamespace@4 NtDeleteValueKey@8 +NtDeleteWnfStateData@8 +NtDeleteWnfStateName@4 NtDeviceIoControlFile@40 NtDisableLastKnownGood@0 NtDisplayString@4 @@ -309,9 +375,12 @@ NtEnumerateSystemEnvironmentValuesEx@12 NtEnumerateTransactionObject@20 NtEnumerateValueKey@24 NtExtendSection@8 +NtFilterBootOption@20 NtFilterToken@24 +NtFilterTokenEx@56 NtFindAtom@12 NtFlushBuffersFile@8 +NtFlushBuffersFileEx@20 NtFlushInstallUILanguage@8 NtFlushInstructionCache@12 NtFlushKey@4 @@ -323,8 +392,11 @@ NtFreeVirtualMemory@16 NtFreezeRegistry@4 NtFreezeTransactions@8 NtFsControlFile@40 +NtGetCachedSigningLevel@24 +NtGetCompleteWnfStateSubscription@24 NtGetContextThread@8 NtGetCurrentProcessorNumber@0 +NtGetCurrentProcessorNumberEx@4 NtGetDevicePowerState@8 NtGetMUIRegistryInfo@12 NtGetNextProcess@20 @@ -337,6 +409,7 @@ NtGetWriteWatch@28 NtImpersonateAnonymousToken@4 NtImpersonateClientOfPort@8 NtImpersonateThread@12 +NtInitializeEnclave@20 NtInitializeNlsFiles@16 ;Check!!! gendef says 12 NtInitializeRegistry@4 NtInitiatePowerAction@16 @@ -345,6 +418,7 @@ NtIsSystemResumeAutomatic@0 NtIsUILanguageComitted@0 NtListenPort@8 NtLoadDriver@4 +NtLoadEnclaveData@36 NtLoadKey2@12 NtLoadKey@8 NtLoadKeyEx@32 @@ -354,13 +428,17 @@ NtLockRegistryKey@4 NtLockVirtualMemory@16 NtMakePermanentObject@4 NtMakeTemporaryObject@4 +NtManageHotPatch@16 +NtManagePartition@20 NtMapCMFModule@24 NtMapUserPhysicalPages@12 NtMapUserPhysicalPagesScatter@12 NtMapViewOfSection@40 +NtMapViewOfSectionEx@36 NtModifyBootEntry@4 NtModifyDriverEntry@4 NtNotifyChangeDirectoryFile@36 +NtNotifyChangeDirectoryFileEx@40 NtNotifyChangeKey@40 NtNotifyChangeMultipleKeys@48 NtNotifyChangeSession@32 @@ -378,10 +456,12 @@ NtOpenKeyTransactedEx@20 NtOpenKeyedEvent@12 NtOpenMutant@12 NtOpenObjectAuditAlarm@48 +NtOpenPartition@12 NtOpenPrivateNamespace@16 NtOpenProcess@16 NtOpenProcessToken@12 NtOpenProcessTokenEx@16 +NtOpenRegistryTransaction@12 NtOpenResourceManager@20 NtOpenSection@12 NtOpenSemaphore@12 @@ -405,20 +485,24 @@ NtPrivilegedServiceAuditAlarm@20 NtPropagationComplete@16 NtPropagationFailed@12 NtProtectVirtualMemory@20 +NtPssCaptureVaSpaceBulk@20 NtPulseEvent@8 NtQueryAttributesFile@8 +NtQueryAuxiliaryCounterFrequency@4 NtQueryBootEntryOrder@8 NtQueryBootOptions@8 NtQueryDebugFilterState@8 NtQueryDefaultLocale@8 NtQueryDefaultUILanguage@4 NtQueryDirectoryFile@44 +NtQueryDirectoryFileEx@40 NtQueryDirectoryObject@28 NtQueryDriverEntryOrder@8 NtQueryEaFile@36 NtQueryEvent@20 NtQueryFullAttributesFile@8 NtQueryInformationAtom@20 +NtQueryInformationByName@20 NtQueryInformationEnlistment@20 NtQueryInformationFile@20 NtQueryInformationJobObject@20 @@ -446,6 +530,7 @@ NtQueryQuotaInformationFile@36 NtQuerySection@20 NtQuerySecurityAttributesToken@24 NtQuerySecurityObject@20 +NtQuerySecurityPolicy@24 NtQuerySemaphore@20 NtQuerySymbolicLinkObject@12 NtQuerySystemEnvironmentValue@16 @@ -458,6 +543,8 @@ NtQueryTimerResolution@12 NtQueryValueKey@24 NtQueryVirtualMemory@24 NtQueryVolumeInformationFile@20 +NtQueryWnfStateData@24 +NtQueryWnfStateNameInformation@20 NtQueueApcThread@20 NtQueueApcThreadEx@24 NtRaiseException@12 @@ -497,8 +584,10 @@ NtResetWriteWatch@12 NtRestoreKey@12 NtResumeProcess@4 NtResumeThread@8 +NtRevertContainerImpersonation@0 NtRollbackComplete@8 NtRollbackEnlistment@8 +NtRollbackRegistryTransaction@8 NtRollbackTransaction@8 NtRollforwardTransactionManager@8 NtSaveKey@8 @@ -508,6 +597,8 @@ NtSecureConnectPort@36 NtSerializeBoot@0 NtSetBootEntryOrder@8 NtSetBootOptions@8 +NtSetCachedSigningLevel2@24 +NtSetCachedSigningLevel@20 NtSetContextThread@8 NtSetDebugFilterState@12 NtSetDefaultHardErrorPort@4 @@ -519,6 +610,7 @@ NtSetEvent@8 NtSetEventBoostPriority@4 NtSetHighEventPair@4 NtSetHighWaitLowEventPair@4 +NtSetIRTimer@8 NtSetInformationDebugObject@20 NtSetInformationEnlistment@16 NtSetInformationFile@20 @@ -527,10 +619,12 @@ NtSetInformationKey@16 NtSetInformationObject@16 NtSetInformationProcess@16 NtSetInformationResourceManager@16 +NtSetInformationSymbolicLink@16 NtSetInformationThread@16 NtSetInformationToken@16 NtSetInformationTransaction@16 NtSetInformationTransactionManager@16 +NtSetInformationVirtualMemory@24 NtSetInformationWorkerFactory@16 NtSetIntervalProfile@8 NtSetIoCompletion@20 @@ -546,21 +640,25 @@ NtSetSystemInformation@12 NtSetSystemPowerState@12 NtSetSystemTime@8 NtSetThreadExecutionState@8 +NtSetTimer2@16 NtSetTimer@28 NtSetTimerEx@16 NtSetTimerResolution@12 NtSetUuidSeed@4 NtSetValueKey@24 NtSetVolumeInformationFile@20 +NtSetWnfProcessNotificationEvent@4 NtShutdownSystem@4 NtShutdownWorkerFactory@8 NtSignalAndWaitForSingleObject@16 NtSinglePhaseReject@8 NtStartProfile@4 NtStopProfile@4 +NtSubscribeWnfStateChange@16 NtSuspendProcess@4 NtSuspendThread@8 NtSystemDebugControl@24 +NtTerminateEnclave@8 NtTerminateJobObject@8 NtTerminateProcess@8 NtTerminateThread@8 @@ -578,7 +676,11 @@ NtUnloadKeyEx@8 NtUnlockFile@20 NtUnlockVirtualMemory@16 NtUnmapViewOfSection@8 +NtUnmapViewOfSectionEx@12 +NtUnsubscribeWnfStateChange@4 +NtUpdateWnfStateData@28 NtVdmControl@8 +NtWaitForAlertByThreadId@8 NtWaitForDebugEvent@16 NtWaitForKeyedEvent@16 NtWaitForMultipleObjects32@20 @@ -622,6 +724,14 @@ PfxFindPrefix@8 PfxInitialize@4 PfxInsertPrefix@12 PfxRemovePrefix@8 +PssNtCaptureSnapshot@16 +PssNtDuplicateSnapshot@20 +PssNtFreeRemoteSnapshot@8 +PssNtFreeSnapshot@4 +PssNtFreeWalkMarker@4 +PssNtQuerySnapshot@16 +PssNtValidateDescriptor@8 +PssNtWalkSnapshot@20 RtlAbortRXact@4 RtlAbsoluteToSelfRelativeSD@12 RtlAcquirePebLock@0 @@ -639,6 +749,7 @@ RtlAddAccessAllowedObjectAce@28 RtlAddAccessDeniedAce@16 RtlAddAccessDeniedAceEx@20 RtlAddAccessDeniedObjectAce@28 +RtlAddAccessFilterAce@32 RtlAddAce@20 RtlAddActionToRXact@24 RtlAddAtomToAtomTable@12 @@ -649,20 +760,25 @@ RtlAddAuditAccessObjectAce@36 RtlAddCompoundAce@24 RtlAddIntegrityLabelToBoundaryDescriptor@8 RtlAddMandatoryAce@24 +RtlAddProcessTrustLabelAce@24 RtlAddRefActivationContext@4 RtlAddRange@36 RtlAddRefMemoryStream@4 +RtlAddResourceAttributeAce@28 RtlAddSIDToBoundaryDescriptor@8 +RtlAddScopedPolicyIDAce@20 RtlAddVectoredContinueHandler@8 RtlAddVectoredExceptionHandler@8 RtlAddressInSectionTable@12 RtlAdjustPrivilege@16 RtlAllocateActivationContextStack@4 RtlAllocateAndInitializeSid@44 +RtlAllocateAndInitializeSidEx@16 RtlAllocateHandle@8 RtlAllocateHeap@12 RtlAllocateMemoryBlockLookaside@12 RtlAllocateMemoryZone@12 +RtlAllocateWnfSerializationGroup@0 RtlAnsiCharToUnicodeChar@4 RtlAnsiStringToUnicodeSize@4 RtlAnsiStringToUnicodeString@12 @@ -674,24 +790,40 @@ RtlAppendUnicodeToString@8 RtlApplicationVerifierStop@40 RtlApplyRXact@4 RtlApplyRXactNoFlush@4 +RtlAppxIsFileOwnedByTrustedInstaller@8 RtlAreAllAccessesGranted@8 RtlAreAnyAccessesGranted@8 RtlAreBitsClear@12 RtlAreBitsSet@12 +RtlAreLongPathsEnabled@0 RtlAssert@16 +RtlAvlInsertNodeEx@16 +RtlAvlRemoveNode@8 RtlBarrier@8 RtlBarrierForDelete@8 RtlCallbackLpcClient@12 RtlCancelTimer@8 +RtlCanonicalizeDomainName@12 +RtlCapabilityCheck@12 +RtlCapabilityCheckForSingleSessionSku@12 RtlCaptureContext@4 RtlCaptureStackBackTrace@16 RtlCaptureStackContext@12 RtlCharToInteger@12 +RtlCheckBootStatusIntegrity@8 RtlCheckForOrphanedCriticalSections@4 +RtlCheckPortableOperatingSystem@4 RtlCheckRegistryKey@8 +RtlCheckSandboxedToken@8 +RtlCheckSystemBootStatusIntegrity@4 +RtlCheckTokenCapability@12 +RtlCheckTokenMembership@12 +RtlCheckTokenMembershipEx@16 RtlCleanUpTEBLangLists@0 RtlClearAllBits@4 +RtlClearBit@8 RtlClearBits@12 +RtlClearThreadWorkOnBehalfTicket@0 RtlCloneMemoryStream@8 RtlCloneUserProcess@20 RtlCmDecodeMemIoResource@8 @@ -711,15 +843,20 @@ RtlComputeImportTableHash@12 RtlComputePrivatizedDllName_U@12 RtlConnectToSm@16 RtlConsoleMultiByteToUnicodeN@24 +RtlConstructCrossVmEventPath@12 RtlContractHashTable@4 +RtlConvertDeviceFamilyInfoToString@16 RtlConvertExclusiveToShared@4 RtlConvertLCIDToString@20 RtlConvertLongToLargeInteger@4 +RtlConvertSRWLockExclusiveToShared@4 RtlConvertSharedToExclusive@4 RtlConvertSidToUnicodeString@12 RtlConvertToAutoInheritSecurityObject@24 RtlConvertUiListToApiList@12 RtlConvertUlongToLargeInteger@4 +RtlCopyBitMap@12 +RtlCopyContext@12 RtlCopyExtendedContext@12 RtlCopyLuid@8 RtlCopyLuidAndAttributesArray@12 @@ -732,6 +869,8 @@ RtlCopySid@12 RtlCopySidAndAttributesArray@28 RtlCopyString@8 RtlCopyUnicodeString@8 +RtlCrc32@12 +RtlCrc64@16 RtlCreateAcl@12 RtlCreateActivationContext@24 RtlCreateAndSetSD@20 @@ -741,12 +880,14 @@ RtlCreateBoundaryDescriptor@8 RtlCreateEnvironment@8 RtlCreateEnvironmentEx@12 RtlCreateHashTable@12 +RtlCreateHashTableEx@16 RtlCreateHeap@24 RtlCreateLpcServer@24 RtlCreateMemoryBlockLookaside@20 RtlCreateMemoryZone@12 RtlCreateProcessParameters@40 RtlCreateProcessParametersEx@44 +RtlCreateProcessParametersWithTemplate@12 RtlCreateProcessReflection@24 RtlCreateQueryDebugBuffer@8 RtlCreateRegistryKey@8 @@ -759,6 +900,7 @@ RtlCreateTimerQueue@4 RtlCreateUnicodeString@8 RtlCreateUnicodeStringFromAsciiz@8 RtlCreateUserProcess@40 +RtlCreateUserProcessEx@20 RtlCreateUserSecurityObject@28 RtlCreateUserStack@24 RtlCreateUserThread@40 @@ -771,8 +913,10 @@ RtlDeNormalizeProcessParams@4 RtlDeactivateActivationContext@8 RtlDebugPrintTimes@0 RtlDecodePointer@4 +RtlDecodeRemotePointer@12 RtlDecodeSystemPointer@4 RtlDecompressBuffer@24 +RtlDecompressBufferEx@28 RtlDecompressFragment@32 RtlDefaultNpAcl@4 RtlDelete@4 @@ -783,6 +927,7 @@ RtlDeleteBoundaryDescriptor@4 RtlDeleteCriticalSection@4 RtlDeleteElementGenericTable@8 RtlDeleteElementGenericTableAvl@8 +RtlDeleteElementGenericTableAvlEx@8 RtlDeleteHashTable@4 RtlDeleteNoSplay@8 RtlDeleteOwnersRanges@8 @@ -797,6 +942,7 @@ RtlDeNormalizeProcessParams@4 RtlDeregisterSecureMemoryCacheCallback@4 RtlDeregisterWait@4 RtlDeregisterWaitEx@8 +RtlDeriveCapabilitySidsFromName@12 RtlDestroyAtomTable@4 RtlDestroyEnvironment@4 RtlDestroyHandleTable@4 @@ -811,7 +957,10 @@ RtlDisableThreadProfiling@4 RtlDllShutdownInProgress@0 RtlDnsHostNameToComputerName@12 RtlDoesFileExists_U@4 +RtlDoesNameContainWildCards@4 RtlDosApplyFileIsolationRedirection_Ustr@36 +RtlDosLongPathNameToNtPathName_U_WithStatus@16 +RtlDosLongPathNameToRelativeNtPathName_U_WithStatus@16 RtlDosPathNameToNtPathName_U@16 RtlDosPathNameToNtPathName_U_WithStatus@16 RtlDosPathNameToRelativeNtPathName_U@16 @@ -826,8 +975,10 @@ RtlEmptyAtomTable@8 RtlEnableEarlyCriticalSectionEventCreation@0 RtlEnableThreadProfiling@20 RtlEncodePointer@4 +RtlEncodeRemotePointer@12 RtlEncodeSystemPointer@4 RtlEndEnumerationHashTable@8 +RtlEndStrongEnumerationHashTable@8 RtlEndWeakEnumerationHashTable@8 RtlEnlargedIntegerMultiply@8 RtlEnlargedUnsignedDivide@16 @@ -847,22 +998,24 @@ RtlEqualPrefixSid@8 RtlEqualSid@8 RtlEqualString@12 RtlEqualUnicodeString@12 +RtlEqualWnfChangeStamps@8 RtlEraseUnicodeString@4 RtlEthernetAddressToStringA@8 RtlEthernetAddressToStringW@8 RtlEthernetStringToAddressA@12 RtlEthernetStringToAddressW@12 RtlExitUserProcess@4 -; Not sure, but we assume @4 -RtlExitUserThread@4 +RtlExitUserThread@4 ; Not sure, but we assume @4 RtlExpandEnvironmentStrings@24 RtlExpandEnvironmentStrings_U@16 RtlExpandHashTable@4 +RtlExtendCorrelationVector@4 RtlExtendMemoryBlockLookaside@8 RtlExtendMemoryZone@8 RtlExtendedIntegerMultiply@12 RtlExtendedLargeIntegerDivide@16 RtlExtendedMagicDivide@20 +RtlExtractBitMap@16 RtlExtendHeap@16 RtlFillMemory@12 RtlFillMemoryUlong@12 @@ -876,6 +1029,7 @@ RtlFindClearBits@12 RtlFindClearBitsAndSet@12 RtlFindClearRuns@16 RtlFindClosestEncodableLength@12 +RtlFindExportedRoutineByName@8 RtlFindLastBackwardRunClear@12 RtlFindLeastSignificantBit@8 RtlFindLongestRunClear@8 @@ -886,10 +1040,14 @@ RtlFindNextForwardRunClear@12 RtlFindRange@48 RtlFindSetBits@12 RtlFindSetBitsAndClear@12 +RtlFindUnicodeSubstring@12 RtlFirstEntrySList@4 RtlFirstFreeAce@8 RtlFlsAlloc@8 RtlFlsFree@4 +RtlFlsGetValue@8 +RtlFlsSetValue@8 +RtlFlushHeaps@0 RtlFlushSecureMemoryCache@8 RtlFormatCurrentUserKeyPath@4 RtlFormatMessage@36 @@ -902,6 +1060,7 @@ RtlFreeMemoryBlockLookaside@8 RtlFreeOemString@4 RtlFreeSid@4 RtlFreeThreadActivationContextStack@0 +RtlFreeUTF8String@4 RtlFreeUnicodeString@4 RtlFreeUserStack@4 RtlFreeUserThreadStack@8 @@ -909,19 +1068,28 @@ RtlGUIDFromString@8 RtlGenerate8dot3Name@16 RtlGetAce@12 RtlGetActiveActivationContext@4 +RtlGetActiveConsoleId@0 +RtlGetAppContainerNamedObjectPath@16 +RtlGetAppContainerParent@8 +RtlGetAppContainerSidType@8 RtlGetCallersAddress@8 RtlGetCompressionWorkSpaceSize@12 +RtlGetConsoleSessionForegroundProcessId@0 RtlGetControlSecurityDescriptor@12 RtlGetCriticalSectionRecursionCount@4 RtlGetCurrentDirectory_U@8 RtlGetCurrentPeb@0 RtlGetCurrentProcessorNumber@0 RtlGetCurrentProcessorNumberEx@4 +RtlGetCurrentServiceSessionId@0 RtlGetCurrentTransaction@0 RtlGetDaclSecurityDescriptor@16 +RtlGetDeviceFamilyInfoEnum@12 RtlGetElementGenericTable@8 RtlGetElementGenericTableAvl@8 RtlGetEnabledExtendedFeatures@8 +RtlGetExePath@8 +RtlGetExtendedContextLength2@16 RtlGetExtendedContextLength@8 RtlGetExtendedFeaturesMask@4 RtlGetFileMUIPath@28 @@ -932,36 +1100,50 @@ RtlGetFullPathName_UEx@20 RtlGetFullPathName_UstrEx@32 RtlGetGroupSecurityDescriptor@12 RtlGetIntegerAtom@8 +RtlGetInterruptTimePrecise@4 RtlGetLastNtStatus@0 RtlGetLastWin32Error@0 RtlGetLengthWithoutLastFullDosOrNtPathElement@12 RtlGetLengthWithoutTrailingPathSeperators@12 RtlGetLocaleFileMappingAddress@12 RtlGetLongestNtPathLength@0 +RtlGetMultiTimePrecise@12 +RtlGetLongestNtPathLength@0 RtlGetNativeSystemInformation@16 RtlGetNextRange@12 RtlGetNextEntryHashTable@8 RtlGetNtGlobalFlags@0 RtlGetNtProductType@4 +RtlGetNtSystemRoot@0 RtlGetNtVersionNumbers@12 RtlGetOwnerSecurityDescriptor@12 RtlGetParentLocaleName@16 +RtlGetPersistedStateLocation@28 RtlGetProcessHeaps@8 RtlGetProcessPreferredUILanguages@16 RtlGetProductInfo@20 RtlGetSaclSecurityDescriptor@16 +RtlGetSearchPath@4 RtlGetSecurityDescriptorRMControl@8 +RtlGetSessionProperties@8 RtlGetSetBootStatusData@24 +RtlGetSuiteMask@0 +RtlGetSystemBootStatus@16 +RtlGetSystemBootStatusEx@12 RtlGetSystemPreferredUILanguages@20 +RtlGetSystemTimePrecise@0 RtlGetThreadErrorMode@0 RtlGetThreadLangIdByIndex@16 RtlGetThreadPreferredUILanguages@16 +RtlGetThreadWorkOnBehalfTicket@8 +RtlGetTokenNamedObjectPath@12 RtlGetUILanguageInfo@20 RtlGetUnloadEventTrace@0 RtlGetUnloadEventTraceEx@12 RtlGetUserInfoHeap@20 RtlGetUserPreferredUILanguages@20 RtlGetVersion@4 +RtlGuardCheckLongJumpTarget@12 RtlGUIDFromString@8 RtlHashUnicodeString@16 RtlHeapTrkInitialize@4 @@ -977,6 +1159,7 @@ RtlImageRvaToVa@16 RtlImpersonateLpcClient@8 RtlImpersonateSelf@4 RtlImpersonateSelfEx@12 +RtlIncrementCorrelationVector@4 RtlInitAnsiString@8 RtlInitAnsiStringEx@8 RtlInitBarrier@12 @@ -986,6 +1169,10 @@ RtlInitMemoryStream@4 RtlInitNlsTables@16 RtlInitOutOfProcessMemoryStream@4 RtlInitString@8 +RtlInitStringEx@8 +RtlInitStrongEnumerationHashTable@8 +RtlInitUTF8String@8 +RtlInitUTF8StringEx@8 RtlInitUnicodeString@8 RtlInitUnicodeStringEx@8 RtlInitWeakEnumerationHashTable@8 @@ -993,10 +1180,12 @@ RtlInitializeAtomPackage@4 RtlInitializeBitMap@12 RtlInitializeConditionVariable@4 RtlInitializeContext@20 +RtlInitializeCorrelationVector@12 RtlInitializeCriticalSection@4 RtlInitializeCriticalSectionAndSpinCount@8 RtlInitializeCriticalSectionEx@12 RtlInitializeExceptionChain@4 +RtlInitializeExtendedContext2@20 RtlInitializeExtendedContext@12 RtlInitializeGenericTable@20 RtlInitializeGenericTableAvl@20 @@ -1007,6 +1196,7 @@ RtlInitializeResource@4 RtlInitializeSListHead@4 RtlInitializeSRWLock@4 RtlInitializeSid@12 +RtlInitializeSidEx@0 RtlInsertElementGenericTable@16 RtlInsertElementGenericTableAvl@16 RtlInsertElementGenericTableFull@24 @@ -1020,6 +1210,7 @@ RtlInterlockedCompareExchange64@20 RtlInterlockedFlushSList@4 RtlInterlockedPopEntrySList@4 RtlInterlockedPushEntrySList@8 +RtlInterlockedPushListSListEx@16 RtlInvertRangeList@8 RtlInterlockedSetBitRun@12 RtlIoDecodeMemIoResource@16 @@ -1041,21 +1232,40 @@ RtlIpv6StringToAddressExA@16 RtlIpv6StringToAddressExW@16 RtlIpv6StringToAddressW@12 RtlIsActivationContextActive@4 +RtlIsCapabilitySid@4 +RtlIsCloudFilesPlaceholder@8 RtlIsCriticalSectionLocked@4 RtlIsCriticalSectionLockedByThread@4 +RtlIsCurrentProcess@4 +RtlIsCurrentThread@4 RtlIsCurrentThreadAttachExempt@0 RtlIsDosDeviceName_U@4 +RtlIsElevatedRid@4 RtlIsGenericTableEmpty@4 RtlIsGenericTableEmptyAvl@4 +RtlIsMultiSessionSku@0 +RtlIsMultiUsersInSessionSku@0 RtlIsNameInExpression@16 +RtlIsNameInUnUpcasedExpression@16 RtlIsNameLegalDOS8Dot3@12 +RtlIsNonEmptyDirectoryReparsePointAllowed@4 RtlIsNormalizedString@16 +RtlIsPackageSid@4 +RtlIsParentOfChildAppContainer@8 +RtlIsPartialPlaceholder@8 +RtlIsPartialPlaceholderFileHandle@8 +RtlIsPartialPlaceholderFileInfo@12 +RtlIsProcessorFeaturePresent@4 RtlIsRangeAvailable@40 +RtlIsStateSeparationEnabled@0 RtlIsTextUnicode@12 RtlIsThreadWithinLoaderCallout@0 +RtlIsUntrustedObject@12 RtlIsValidHandle@8 RtlIsValidIndexHandle@12 RtlIsValidLocaleName@8 +RtlIsValidProcessTrustLabelSid@4 +RtlIsZeroMemory@8 RtlKnownExceptionFilter@4 RtlLCIDToCultureName@8 RtlLargeIntegerAdd@16 @@ -1071,9 +1281,11 @@ RtlLeaveCriticalSection@4 RtlLengthRequiredSid@4 RtlLengthSecurityDescriptor@4 RtlLengthSid@4 +RtlLengthSidAsUnicodeString@8 RtlLoadString@32 RtlLocalTimeToSystemTime@8 RtlLocaleNameToLcid@12 +RtlLocateExtendedFeature2@16 RtlLocateExtendedFeature@12 RtlLocateLegacyContext@8 RtlLockBootStatusData@4 @@ -1090,6 +1302,7 @@ RtlLookupElementGenericTableAvl@8 RtlLookupElementGenericTableFull@16 RtlLookupElementGenericTableFullAvl@16 RtlLookupEntryHashTable@12 +RtlLookupFirstMatchingElementGenericTableAvl@12 RtlMakeSelfRelativeSD@12 RtlMapGenericMask@8 RtlMapSecurityErrorToNtStatus@4 @@ -1106,6 +1319,7 @@ RtlNewSecurityObject@24 RtlNewSecurityObjectEx@32 RtlNewSecurityObjectWithMultipleInheritance@36 RtlNormalizeProcessParams@4 +RtlNormalizeSecurityDescriptor@20 RtlNormalizeString@20 RtlNtPathNameToDosPathName@16 RtlNtStatusToDosError@4 @@ -1113,12 +1327,15 @@ RtlNtStatusToDosErrorNoTeb@4 RtlNumberGenericTableElements@4 RtlNumberGenericTableElementsAvl@4 RtlNumberOfClearBits@4 +RtlNumberOfClearBitsInRange@12 RtlNumberOfSetBits@4 +RtlNumberOfSetBitsInRange@12 RtlNumberOfSetBitsUlongPtr@4 RtlOemStringToUnicodeSize@4 RtlOemStringToUnicodeString@12 RtlOemToUnicodeN@20 RtlOpenCurrentUser@8 +RtlOsDeploymentState@4 RtlOwnerAcesPresent@4 RtlPcToFileHeader@8 RtlPinAtomInAtomTable@8 @@ -1127,6 +1344,7 @@ RtlPrefixString@12 RtlPrefixUnicodeString@12 RtlProcessFlsData@4 RtlProtectHeap@8 +RtlPublishWnfStateData@24 RtlPushFrame@4 RtlQueryActivationContextApplicationSettings@28 RtlQueryAtomInAtomTable@24 @@ -1137,39 +1355,60 @@ RtlQueryElevationFlags@4 RtlQueryEnvironmentVariable@24 RtlQueryEnvironmentVariable_U@12 RtlQueryHeapInformation@20 +RtlQueryImageMitigationPolicy@20 RtlQueryInformationAcl@16 RtlQueryInformationActivationContext@28 RtlQueryInformationActiveActivationContext@16 RtlQueryInterfaceMemoryStream@12 RtlQueryModuleInformation@12 +RtlQueryPackageClaims@32 +RtlQueryPackageIdentity@24 +RtlQueryPackageIdentityEx@28 RtlQueryPerformanceCounter@4 RtlQueryPerformanceFrequency@4 RtlQueryProcessBackTraceInformation@4 RtlQueryProcessDebugInformation@12 RtlQueryProcessHeapInformation@4 RtlQueryProcessLockInformation@4 +RtlQueryProcessPlaceholderCompatibilityMode@0 +RtlQueryProtectedPolicy@8 +RtlQueryRegistryValueWithFallback@28 RtlQueryRegistryValues@20 +RtlQueryRegistryValuesEx@20 +RtlQueryResourcePolicy@16 RtlQuerySecurityObject@20 RtlQueryTagHeap@20 +RtlQueryThreadPlaceholderCompatibilityMode@0 RtlQueryThreadProfiling@8 RtlQueryTimeZoneInformation@4 +RtlQueryTokenHostIdAsUlong64@8 +RtlQueryUnbiasedInterruptTime@4 +RtlQueryValidationRunlevel@4 +RtlQueryWnfMetaNotification@20 +RtlQueryWnfStateData@24 +RtlQueryWnfStateDataWithExplicitScope@28 RtlQueueApcWow64Thread@20 RtlQueueWorkItem@12 +RtlRaiseCustomSystemEventTrigger@4 RtlRaiseException@4 RtlRaiseStatus@4 RtlRandom@4 RtlRandomEx@4 +RtlRbInsertNodeEx@16 +RtlRbRemoveNode@8 RtlReAllocateHeap@16 RtlReadMemoryStream@16 RtlReadOutOfProcessMemoryStream@16 RtlReadThreadProfilingData@12 RtlRealPredecessor@4 RtlRealSuccessor@4 +RtlRegisterForWnfMetaNotification@24 RtlRegisterSecureMemoryCacheCallback@4 RtlRegisterThreadWithCsrss@0 RtlRegisterWait@24 RtlReleaseActivationContext@4 RtlReleaseMemoryStream@4 +RtlReleasePath@4 RtlReleasePebLock@0 RtlReleasePrivilege@4 RtlReleaseRelativeName@4 @@ -1182,13 +1421,19 @@ RtlRemovePrivileges@12 RtlRemoveVectoredContinueHandler@4 RtlRemoveVectoredExceptionHandler@4 RtlReplaceSidInSd@16 +RtlReplaceSystemDirectoryInPath@16 RtlReportException@12 +RtlReportExceptionEx@20 RtlReportSilentProcessExit@8 RtlReportSqmEscalation@24 RtlResetMemoryBlockLookaside@4 RtlResetMemoryZone@4 +RtlResetNtUserPfn@0 RtlResetRtlTranslations@4 +RtlRestoreBootStatusDefaults@4 RtlRestoreLastWin32Error@4 +RtlRestoreSystemBootStatusDefaults@0 +RtlRestoreThreadPreferredUILanguages@4 RtlRetrieveNtUserPfn@12 RtlRevertMemoryStream@4 RtlRunDecodeUnicodeString@8 @@ -1205,6 +1450,7 @@ RtlSelfRelativeToAbsoluteSD@44 RtlSendMsgToSm@8 RtlSetAllBits@4 RtlSetAttributesSecurityDescriptor@12 +RtlSetBit@8 RtlSetBits@12 RtlSetControlSecurityDescriptor@12 RtlSetCriticalSectionSpinCount@8 @@ -1219,23 +1465,35 @@ RtlSetEnvironmentVariable@12 RtlSetExtendedFeaturesMask@12 RtlSetGroupSecurityDescriptor@12 RtlSetHeapInformation@16 +RtlSetImageMitigationPolicy@20 RtlSetInformationAcl@16 RtlSetIoCompletionCallback@12 RtlSetLastWin32Error@4 RtlSetLastWin32ErrorAndNtStatusFromNtStatus@4 RtlSetMemoryStreamSize@12 RtlSetOwnerSecurityDescriptor@12 +RtlSetPortableOperatingSystem@4 RtlSetProcessDebugInformation@12 RtlSetProcessIsCritical@0 +RtlSetProcessPlaceholderCompatibilityMode@4 RtlSetProcessPreferredUILanguages@12 +RtlSetProtectedPolicy@12 +RtlSetProxiedProcessId@4 RtlSetSaclSecurityDescriptor@16 +RtlSetSearchPathMode@4 RtlSetSecurityDescriptorRMControl@8 RtlSetSecurityObject@20 RtlSetSecurityObjectEx@24 +RtlSetSystemBootStatus@16 +RtlSetSystemBootStatusEx@12 RtlSetThreadErrorMode@8 RtlSetThreadIsCritical@0 +RtlSetThreadPlaceholderCompatibilityMode@4 RtlSetThreadPoolStartFunc@8 +RtlSetThreadPreferredUILanguages2@16 RtlSetThreadPreferredUILanguages@12 +RtlSetThreadSubProcessTag@4 +RtlSetThreadWorkOnBehalfTicket@4 RtlSetTimeZoneInformation@4 RtlSetTimer@28 RtlSetUnhandledExceptionFilter@4 @@ -1244,6 +1502,7 @@ RtlSetUserFlagsHeap@20 RtlSetUserValueHeap@16 RtlShutdownLpcServer@4 RtlSidDominates@12 +RtlSidDominatesForTrust@12 RtlSidEqualLevel@12 RtlSidHashInitialize@12 RtlSidHashLookup@8 @@ -1255,12 +1514,18 @@ RtlSplay@4 RtlStartRXact@4 RtlStatMemoryStream@12 RtlStringFromGUID@8 +RtlStringFromGUIDEx@12 +RtlStronglyEnumerateEntryHashTable@8 RtlSubAuthorityCountSid@4 RtlSubAuthoritySid@8 +RtlSubscribeWnfStateChangeNotification@36 RtlSubtreePredecessor@4 RtlSubtreeSuccessor@4 +RtlSwitchedVVI@16 RtlSystemTimeToLocalTime@8 +RtlTestAndPublishWnfStateData@28 RtlTestBit@8 +RtlTestProtectedAccess@8 RtlTimeFieldsToTime@8 RtlTimeToElapsedTimeFields@8 RtlTimeToSecondsSince1970@8 @@ -1277,8 +1542,11 @@ RtlTraceDatabaseValidate@4 RtlTryAcquirePebLock@0 RtlTryAcquireSRWLockExclusive@4 RtlTryAcquireSRWLockShared@4 +RtlTryConvertSRWLockSharedToExclusiveOrRelease@4 RtlTryEnterCriticalSection@4 +RtlUTF8StringToUnicodeString@12 RtlUTF8ToUnicodeN@20 +RtlUdiv128@28 RtlUnhandledExceptionFilter2@8 RtlUnhandledExceptionFilter@4 RtlUnicodeStringToAnsiSize@4 @@ -1287,6 +1555,7 @@ RtlUnicodeStringToCountedOemString@12 RtlUnicodeStringToInteger@12 RtlUnicodeStringToOemSize@4 RtlUnicodeStringToOemString@12 +RtlUnicodeStringToUTF8String@12 RtlUnicodeToCustomCPN@24 RtlUnicodeToMultiByteN@20 RtlUnicodeToMultiByteSize@12 @@ -1300,6 +1569,9 @@ RtlUnlockMemoryBlockLookaside@4 RtlUnlockMemoryStreamRegion@24 RtlUnlockMemoryZone@4 RtlUnlockModuleSection@4 +RtlUnsubscribeWnfNotificationWaitForCompletion@4 +RtlUnsubscribeWnfNotificationWithCompletionCallback@12 +RtlUnsubscribeWnfStateChangeNotification@4 RtlUnwind@16 RtlUpcaseUnicodeChar@4 RtlUpcaseUnicodeString@12 @@ -1318,22 +1590,37 @@ RtlUsageHeap@12 ; Not sure. RtlUserThreadStart RtlValidAcl@4 +RtlValidProcessProtection@4 RtlValidRelativeSecurityDescriptor@12 RtlValidSecurityDescriptor@4 RtlValidSid@4 +RtlValidateCorrelationVector@4 RtlValidateHeap@12 RtlValidateProcessHeaps@0 RtlValidateUnicodeString@8 RtlVerifyVersionInfo@16 +RtlWaitForWnfMetaNotification@24 +RtlWaitOnAddress@16 +RtlWakeAddressAll@4 +RtlWakeAddressAllNoFence@4 +RtlWakeAddressSingle@4 +RtlWakeAddressSingleNoFence@4 RtlWakeAllConditionVariable@4 RtlWakeConditionVariable@4 RtlWalkFrameChain@12 RtlWalkHeap@8 RtlWeaklyEnumerateEntryHashTable@8 RtlWerpReportException@16 +RtlWnfCompareChangeStamp@8 +RtlWnfDllUnloadCallback@4 RtlWow64CallFunction64@28 RtlWow64EnableFsRedirection@4 RtlWow64EnableFsRedirectionEx@8 +RtlWow64GetCurrentMachine@0 +RtlWow64GetEquivalentMachineCHPE@4 +RtlWow64GetProcessMachines@12 +RtlWow64GetSharedInfoProcess@12 +RtlWow64IsWowGuestMachineSupported@8 RtlWow64LogMessageInEventLogger@12 RtlWriteMemoryStream@16 RtlWriteRegistryValue@24 @@ -1343,10 +1630,14 @@ RtlZombifyActivationContext@4 RtlpApplyLengthFunction@16 RtlpCheckDynamicTimeZoneInformation@8 RtlpCleanupRegistryKeys@0 +RtlpConvertAbsoluteToRelativeSecurityAttribute@12 RtlpConvertCultureNamesToLCIDs@8 RtlpConvertLCIDsToCultureNames@8 +RtlpConvertRelativeToAbsoluteSecurityAttribute@16 RtlpCreateProcessRegistryInfo@4 RtlpEnsureBufferSize@12 +RtlpFreezeTimeBias@0 +RtlpGetDeviceFamilyInfoEnum@12 RtlpGetLCIDFromLangInfoNode@12 RtlpGetNameFromLangInfoNode@12 RtlpGetSystemDefaultUILanguage@4 ; Check!!! gendef says @8 @@ -1355,6 +1646,7 @@ RtlpInitializeLangRegistryInfo@4 RtlpIsQualifiedLanguage@12 RtlpLoadMachineUIByPolicy@12 RtlpLoadUserUIByPolicy@12 +RtlpMergeSecurityAttributeInformation@16 RtlpMuiFreeLangRegistryInfo@4 RtlpMuiRegCreateRegistryInfo@0 RtlpMuiRegFreeRegistryInfo@8 @@ -1373,6 +1665,8 @@ RtlpRefreshCachedUILanguage@8 RtlpSetInstallLanguage@8 RtlpSetPreferredUILanguages@12 RtlpSetUserPreferredUILanguages@12 +RtlpTimeFieldsToTime@12 +RtlpTimeToTimeFields@12 RtlpUnWaitCriticalSection@4 RtlpVerifyAndCommitUILanguageSettings@4 RtlpWaitForCriticalSection@4 @@ -1390,17 +1684,21 @@ TpAllocAlpcCompletion@20 TpAllocAlpcCompletionEx@20 TpAllocCleanupGroup@4 TpAllocIoCompletion@20 +TpAllocJobNotification@20 TpAllocPool@8 TpAllocTimer@16 TpAllocWait@16 TpAllocWork@16 TpAlpcRegisterCompletionList@4 TpAlpcUnregisterCompletionList@4 +TpCallbackDetectedUnrecoverableError@4 TpCallbackIndependent@4 TpCallbackLeaveCriticalSectionOnCompletion@8 TpCallbackMayRunLong@4 TpCallbackReleaseMutexOnCompletion@8 TpCallbackReleaseSemaphoreOnCompletion@12 +TpCallbackSendAlpcMessageOnCompletion@16 +TpCallbackSendPendingAlpcMessage@4 TpCallbackSetEventOnCompletion@8 TpCallbackUnloadDllOnCompletion@8 TpCancelAsyncIoOperation@4 @@ -1419,6 +1717,7 @@ TpReleaseAlpcCompletion@4 TpReleaseCleanupGroup@4 TpReleaseCleanupGroupMembers@12 TpReleaseIoCompletion@4 +TpReleaseJobNotification@4 TpReleasePool@4 TpReleaseTimer@4 TpReleaseWait@4 @@ -1426,19 +1725,29 @@ TpReleaseWork@4 TpSetDefaultPoolMaxThreads@4 TpSetDefaultPoolStackInformation@4 TpSetPoolMaxThreads@8 +TpSetPoolMaxThreadsSoftLimit@8 TpSetPoolMinThreads@8 TpSetPoolStackInformation@8 +TpSetPoolThreadBasePriority@8 +TpSetPoolThreadCpuSets@12 +TpSetPoolWorkerThreadIdleTimeout@12 TpSetTimer@16 +TpSetTimerEx@16 TpSetWait@12 +TpSetWaitEx@16 TpSimpleTryPost@12 TpStartAsyncIoOperation@4 +TpTimerOutstandingCallbackCount@4 +TpTrimPools@0 TpWaitForAlpcCompletion@4 TpWaitForIoCompletion@8 +TpWaitForJobNotification@4 TpWaitForTimer@8 TpWaitForWait@8 TpWaitForWork@8 VerSetConditionMask@16 WerCheckEventEscalation@8 +WerReportExceptionWorker@4 WerReportSQMEvent@12 WerReportWatsonEvent@16 WerReportSQMEvent@16 @@ -1462,6 +1771,7 @@ WinSqmGetInstrumentationProperty@16 WinSqmIncrementDWORD@12 WinSqmIsOptedIn@0 WinSqmIsOptedInEx@4 +WinSqmIsSessionDisabled@4 WinSqmSetDWORD64@16 WinSqmSetDWORD@12 WinSqmSetEscalationInfo@16 @@ -1469,6 +1779,8 @@ WinSqmSetIfMaxDWORD@12 WinSqmSetIfMinDWORD@12 WinSqmSetString@12 WinSqmStartSession@12 +WinSqmStartSessionForPartner@16 +WinSqmStartSqmOptinListener@0 ZwAcceptConnectPort@24 ZwAccessCheck@32 ZwAccessCheckAndAuditAlarm@44 @@ -1478,21 +1790,28 @@ ZwAccessCheckByTypeResultList@44 ZwAccessCheckByTypeResultListAndAuditAlarm@64 ZwAccessCheckByTypeResultListAndAuditAlarmByHandle@68 ZwAcquireCMFViewOwnership@12 +ZwAcquireProcessActivityReference@12 ZwAddAtom@12 +ZwAddAtomEx@16 ZwAddBootEntry@8 ZwAddDriverEntry@8 ZwAdjustGroupsToken@24 ZwAdjustPrivilegesToken@24 +ZwAdjustTokenClaimsAndDeviceGroups@64 ZwAlertResumeThread@8 ZwAlertThread@4 +ZwAlertThreadByThreadId@4 ZwAllocateLocallyUniqueId@4 ZwAllocateReserveObject@12 ZwAllocateUserPhysicalPages@12 +ZwAllocateUserPhysicalPagesEx@20 ZwAllocateUuids@16 ZwAllocateVirtualMemory@24 +ZwAllocateVirtualMemoryEx@28 ZwAlpcAcceptConnectPort@36 ZwAlpcCancelMessage@12 ZwAlpcConnectPort@44 +ZwAlpcConnectPortEx@44 ZwAlpcCreatePort@12 ZwAlpcCreatePortSection@24 ZwAlpcCreateResourceReserve@16 @@ -1503,6 +1822,7 @@ ZwAlpcDeleteResourceReserve@12 ZwAlpcDeleteSectionView@12 ZwAlpcDeleteSecurityContext@12 ZwAlpcDisconnectPort@8 +ZwAlpcImpersonateClientContainerOfPort@12 ZwAlpcImpersonateClientOfPort@12 ZwAlpcOpenSenderProcess@24 ZwAlpcOpenSenderThread@24 @@ -1514,58 +1834,78 @@ ZwAlpcSetInformation@16 ZwApphelpCacheControl@8 ZwAreMappedFilesTheSame@8 ZwAssignProcessToJobObject@8 +ZwAssociateWaitCompletionPacket@32 +ZwCallEnclave@16 ZwCallbackReturn@12 ZwCancelDeviceWakeupRequest@4 ZwCancelIoFile@8 ZwCancelIoFileEx@12 ZwCancelSynchronousIoFile@12 +ZwCancelTimer2@8 ZwCancelTimer@8 +ZwCancelWaitCompletionPacket@8 ZwClearEvent@4 ZwClose@4 ZwCloseObjectAuditAlarm@12 ZwCommitComplete@8 ZwCommitEnlistment@8 +ZwCommitRegistryTransaction@8 ZwCommitTransaction@8 ZwCompactKeys@8 +ZwCompareObjects@8 +ZwCompareSigningLevels@8 ZwCompareTokens@12 ZwCompleteConnectPort@4 ZwCompressKey@4 ZwConnectPort@32 ZwContinue@8 +ZwConvertBetweenAuxiliaryCounterAndPerformanceCounter@16 +ZwCreateCrossVmEvent@24 ZwCreateDebugObject@16 ZwCreateDirectoryObject@12 +ZwCreateDirectoryObjectEx@20 +ZwCreateEnclave@36 ZwCreateEnlistment@32 ZwCreateEvent@20 ZwCreateEventPair@12 ZwCreateFile@44 +ZwCreateIRTimer@12 ZwCreateIoCompletion@16 ZwCreateJobObject@12 ZwCreateJobSet@12 ZwCreateKey@28 ZwCreateKeyTransacted@32 ZwCreateKeyedEvent@16 +ZwCreateLowBoxToken@36 ZwCreateMailslotFile@32 ZwCreateMutant@16 ZwCreateNamedPipeFile@56 ZwCreatePagingFile@16 +ZwCreatePartition@16 ZwCreatePort@20 ZwCreatePrivateNamespace@16 ZwCreateProcess@32 ZwCreateProcessEx@36 ZwCreateProfile@36 ZwCreateProfileEx@40 +ZwCreateRegistryTransaction@16 ZwCreateResourceManager@28 ZwCreateSection@28 +ZwCreateSectionEx@36 ZwCreateSemaphore@20 ZwCreateSymbolicLinkObject@16 ZwCreateThread@32 ZwCreateThreadEx@44 +ZwCreateTimer2@20 ZwCreateTimer@16 ZwCreateToken@52 +ZwCreateTokenEx@68 ZwCreateTransaction@40 ZwCreateTransactionManager@24 ZwCreateUserProcess@44 +ZwCreateWaitCompletionPacket@12 ZwCreateWaitablePort@20 +ZwCreateWnfStateName@28 ZwCreateWorkerFactory@40 ZwDebugActiveProcess@8 ZwDebugContinue@12 @@ -1578,6 +1918,8 @@ ZwDeleteKey@4 ZwDeleteObjectAuditAlarm@12 ZwDeletePrivateNamespace@4 ZwDeleteValueKey@8 +ZwDeleteWnfStateData@8 +ZwDeleteWnfStateName@4 ZwDeviceIoControlFile@40 ZwDisableLastKnownGood@0 ZwDisplayString@4 @@ -1592,9 +1934,12 @@ ZwEnumerateSystemEnvironmentValuesEx@12 ZwEnumerateTransactionObject@20 ZwEnumerateValueKey@24 ZwExtendSection@8 +ZwFilterBootOption@20 ZwFilterToken@24 +ZwFilterTokenEx@56 ZwFindAtom@12 ZwFlushBuffersFile@8 +ZwFlushBuffersFileEx@20 ZwFlushInstallUILanguage@8 ZwFlushInstructionCache@12 ZwFlushKey@4 @@ -1606,8 +1951,11 @@ ZwFreeVirtualMemory@16 ZwFreezeRegistry@4 ZwFreezeTransactions@8 ZwFsControlFile@40 +ZwGetCachedSigningLevel@24 +ZwGetCompleteWnfStateSubscription@24 ZwGetContextThread@8 ZwGetCurrentProcessorNumber@0 +ZwGetCurrentProcessorNumberEx@4 ZwGetDevicePowerState@8 ZwGetMUIRegistryInfo@12 ZwGetNextProcess@20 @@ -1620,6 +1968,7 @@ ZwGetWriteWatch@28 ZwImpersonateAnonymousToken@4 ZwImpersonateClientOfPort@8 ZwImpersonateThread@12 +ZwInitializeEnclave@20 ZwInitializeNlsFiles@16 ZwInitializeRegistry@4 ZwInitiatePowerAction@16 @@ -1628,6 +1977,7 @@ ZwIsSystemResumeAutomatic@0 ZwIsUILanguageComitted@0 ZwListenPort@8 ZwLoadDriver@4 +ZwLoadEnclaveData@36 ZwLoadKey2@12 ZwLoadKey@8 ZwLoadKeyEx@32 @@ -1637,13 +1987,17 @@ ZwLockRegistryKey@4 ZwLockVirtualMemory@16 ZwMakePermanentObject@4 ZwMakeTemporaryObject@4 +ZwManageHotPatch@16 +ZwManagePartition@20 ZwMapCMFModule@24 ZwMapUserPhysicalPages@12 ZwMapUserPhysicalPagesScatter@12 ZwMapViewOfSection@40 +ZwMapViewOfSectionEx@36 ZwModifyBootEntry@4 ZwModifyDriverEntry@4 ZwNotifyChangeDirectoryFile@36 +ZwNotifyChangeDirectoryFileEx@40 ZwNotifyChangeKey@40 ZwNotifyChangeMultipleKeys@48 ZwNotifyChangeSession@32 @@ -1661,10 +2015,12 @@ ZwOpenKeyTransactedEx@20 ZwOpenKeyedEvent@12 ZwOpenMutant@12 ZwOpenObjectAuditAlarm@48 +ZwOpenPartition@12 ZwOpenPrivateNamespace@16 ZwOpenProcess@16 ZwOpenProcessToken@12 ZwOpenProcessTokenEx@16 +ZwOpenRegistryTransaction@12 ZwOpenResourceManager@20 ZwOpenSection@12 ZwOpenSemaphore@12 @@ -1688,20 +2044,24 @@ ZwPrivilegedServiceAuditAlarm@20 ZwPropagationComplete@16 ZwPropagationFailed@12 ZwProtectVirtualMemory@20 +ZwPssCaptureVaSpaceBulk@20 ZwPulseEvent@8 ZwQueryAttributesFile@8 +ZwQueryAuxiliaryCounterFrequency@4 ZwQueryBootEntryOrder@8 ZwQueryBootOptions@8 ZwQueryDebugFilterState@8 ZwQueryDefaultLocale@8 ZwQueryDefaultUILanguage@4 ZwQueryDirectoryFile@44 +ZwQueryDirectoryFileEx@40 ZwQueryDirectoryObject@28 ZwQueryDriverEntryOrder@8 ZwQueryEaFile@36 ZwQueryEvent@20 ZwQueryFullAttributesFile@8 ZwQueryInformationAtom@20 +ZwQueryInformationByName@20 ZwQueryInformationEnlistment@20 ZwQueryInformationFile@20 ZwQueryInformationJobObject@20 @@ -1729,6 +2089,7 @@ ZwQueryQuotaInformationFile@36 ZwQuerySection@20 ZwQuerySecurityAttributesToken@24 ZwQuerySecurityObject@20 +ZwQuerySecurityPolicy@24 ZwQuerySemaphore@20 ZwQuerySymbolicLinkObject@12 ZwQuerySystemEnvironmentValue@16 @@ -1741,6 +2102,8 @@ ZwQueryTimerResolution@12 ZwQueryValueKey@24 ZwQueryVirtualMemory@24 ZwQueryVolumeInformationFile@20 +ZwQueryWnfStateData@24 +ZwQueryWnfStateNameInformation@20 ZwQueueApcThread@20 ZwQueueApcThreadEx@24 ZwRaiseException@12 @@ -1780,8 +2143,10 @@ ZwResetWriteWatch@12 ZwRestoreKey@12 ZwResumeProcess@4 ZwResumeThread@8 +ZwRevertContainerImpersonation@0 ZwRollbackComplete@8 ZwRollbackEnlistment@8 +ZwRollbackRegistryTransaction@8 ZwRollbackTransaction@8 ZwRollforwardTransactionManager@8 ZwSaveKey@8 @@ -1791,6 +2156,8 @@ ZwSecureConnectPort@36 ZwSerializeBoot@0 ZwSetBootEntryOrder@8 ZwSetBootOptions@8 +ZwSetCachedSigningLevel2@24 +ZwSetCachedSigningLevel@20 ZwSetContextThread@8 ZwSetDebugFilterState@12 ZwSetDefaultHardErrorPort@4 @@ -1802,6 +2169,7 @@ ZwSetEvent@8 ZwSetEventBoostPriority@4 ZwSetHighEventPair@4 ZwSetHighWaitLowEventPair@4 +ZwSetIRTimer@8 ZwSetInformationDebugObject@20 ZwSetInformationEnlistment@16 ZwSetInformationFile@20 @@ -1810,10 +2178,12 @@ ZwSetInformationKey@16 ZwSetInformationObject@16 ZwSetInformationProcess@16 ZwSetInformationResourceManager@16 +ZwSetInformationSymbolicLink@16 ZwSetInformationThread@16 ZwSetInformationToken@16 ZwSetInformationTransaction@16 ZwSetInformationTransactionManager@16 +ZwSetInformationVirtualMemory@24 ZwSetInformationWorkerFactory@16 ZwSetIntervalProfile@8 ZwSetIoCompletion@20 @@ -1829,21 +2199,25 @@ ZwSetSystemInformation@12 ZwSetSystemPowerState@12 ZwSetSystemTime@8 ZwSetThreadExecutionState@8 +ZwSetTimer2@16 ZwSetTimer@28 ZwSetTimerEx@16 ZwSetTimerResolution@12 ZwSetUuidSeed@4 ZwSetValueKey@24 ZwSetVolumeInformationFile@20 +ZwSetWnfProcessNotificationEvent@4 ZwShutdownSystem@4 ZwShutdownWorkerFactory@8 ZwSignalAndWaitForSingleObject@16 ZwSinglePhaseReject@8 ZwStartProfile@4 ZwStopProfile@4 +ZwSubscribeWnfStateChange@16 ZwSuspendProcess@4 ZwSuspendThread@8 ZwSystemDebugControl@24 +ZwTerminateEnclave@8 ZwTerminateJobObject@8 ZwTerminateProcess@8 ZwTerminateThread@8 @@ -1861,7 +2235,11 @@ ZwUnloadKeyEx@8 ZwUnlockFile@20 ZwUnlockVirtualMemory@16 ZwUnmapViewOfSection@8 +ZwUnmapViewOfSectionEx@12 +ZwUnsubscribeWnfStateChange@4 +ZwUpdateWnfStateData@28 ZwVdmControl@8 +ZwWaitForAlertByThreadId@8 ZwWaitForDebugEvent@16 ZwWaitForKeyedEvent@16 ZwWaitForMultipleObjects32@20 @@ -1895,188 +2273,3 @@ ZwWriteFileGather@36 ZwWriteRequestData@24 ZwWriteVirtualMemory@20 ZwYieldExecution@0 -_CIcos -_CIlog -_CIpow -_CIsin -_CIsqrt -__isascii -__iscsym -__iscsymf -__toascii -_alldiv -_alldvrm@16 -_allmul@16 -_alloca_probe -_alloca_probe_16 -_alloca_probe_8 -_allrem@16 -_allshl -_allshr -_atoi64 -_aulldiv@16 -_aulldvrm@16 -_aullrem@16 -_aullshr -;_chkstk -_fltused DATA -_ftol -_i64toa -_i64toa_s -_i64tow -_i64tow_s -_itoa -_itoa_s -_itow -_itow_s -_lfind -_ltoa -_ltoa_s -_ltow -_ltow_s -_makepath_s -_memccpy -_memicmp -_snprintf -_snprintf_s -_snscanf_s -_snwprintf -_snwprintf_s -_snwscanf_s -_splitpath -_splitpath_s -_strcmpi -_stricmp -_strlwr -_strnicmp -_strnset_s -_strset_s -_strupr -_swprintf -_tolower -_toupper -_ui64toa -_ui64toa_s -_ui64tow -_ui64tow_s -_ultoa -_ultoa_s -_ultow -_ultow_s -_vscwprintf -_vsnprintf -_vsnprintf_s -_vsnwprintf -_vsnwprintf_s -_vswprintf -_wcsicmp -_wcslwr -_wcsnicmp -_wcsnset_s -_wcsset_s -_wcstoui64 -_wcsupr -_wmakepath_s -_wsplitpath_s -_wtoi -_wtoi64 -_wtol -abs -atan DATA -atoi -atol -bsearch -ceil -cos DATA -fabs DATA -floor DATA -isalnum -isalpha -iscntrl -isdigit -isgraph -islower -isprint -ispunct -isspace -isupper -iswalpha -iswctype -iswdigit -iswlower -iswspace -iswxdigit -isxdigit -labs -log -mbstowcs -memchr -memcmp -memcpy -memcpy_s -memmove -memmove_s -memset -pow -qsort -sin -sprintf -sprintf_s -sqrt -sscanf -sscanf_s -strcat -strcat_s -strchr -strcmp -strcpy -strcpy_s -strcspn -strlen -strncat -strncat_s -strncmp -strncpy -strncpy_s -strnlen -strpbrk -strrchr -strspn -strstr -strtok_s -strtol -strtoul -swprintf -swprintf_s -swscanf_s -tan -tolower -toupper -towlower -towupper -vDbgPrintEx@16 -vDbgPrintExWithPrefix@20 -vsprintf -vsprintf_s -vswprintf_s -wcscat -wcscat_s -wcschr -wcscmp -wcscpy -wcscpy_s -wcscspn -wcslen -wcsncat -wcsncat_s -wcsncmp -wcsncpy -wcsncpy_s -wcsnlen -wcspbrk -wcsrchr -wcsspn -wcsstr -wcstol -wcstombs -wcstoul diff --git a/lib/libc/mingw/lib32/rpcrt4.def b/lib/libc/mingw/lib32/rpcrt4.def index 62d030499e..a494f08c97 100644 --- a/lib/libc/mingw/lib32/rpcrt4.def +++ b/lib/libc/mingw/lib32/rpcrt4.def @@ -5,8 +5,14 @@ ; LIBRARY "RPCRT4.dll" EXPORTS +I_RpcBindingInqCurrentModifiedId@8 I_RpcFwThisIsTheManager@0 +I_RpcInitFwImports@4 I_RpcInitHttpImports@4 +I_RpcInitImports@4 +I_RpcInitNdrImports@4 +I_RpcMgmtQueryDedicatedThreadPool@0 +I_RpcOpenClientThread@12 I_RpcOpenClientProcess@12 I_RpcServerTurnOnOffKeepalives@16 I_RpcVerifierCorruptionExpected@0 @@ -40,9 +46,9 @@ I_RpcAsyncSetHandle@8 I_RpcBCacheAllocate@4 I_RpcBCacheFree@4 I_RpcBindingCopy@8 -I_RpcBindingInqDynamicEndpoint@8 I_RpcBindingCreateNP@16 I_RpcBindingHandleToAsyncHandle@8 +I_RpcBindingInqClientTokenAttributes@16 I_RpcBindingInqDynamicEndpoint@8 I_RpcBindingInqDynamicEndpointA@8 I_RpcBindingInqDynamicEndpointW@8 @@ -53,7 +59,10 @@ I_RpcBindingInqSecurityContextKeyInfo@8 I_RpcBindingInqTransportType@8 I_RpcBindingInqWireIdForSnego@8 I_RpcBindingIsClientLocal@8 +I_RpcBindingIsServerLocal@8 +I_RpcBindingSetPrivateOption@12 I_RpcBindingToStaticStringBindingW@8 +I_RpcCertProcessAndProvision@16 I_RpcClearMutex@4 I_RpcConnectionInqSockBuffSize2@4 I_RpcCompleteAndFree@12 @@ -67,17 +76,22 @@ I_RpcFree@4 I_RpcFreeBuffer@4 I_RpcGetAssociationContext@4 I_RpcFreePipeBuffer@4 +I_RpcFreeSystemHandle@8 +I_RpcFreeSystemHandleCollection@8 I_RpcGetBuffer@4 I_RpcGetBufferWithObject@8 I_RpcGetCurrentCallHandle@0 +I_RpcGetDefaultSD@4 I_RpcIOAlerted@4 I_RpcGetExtendedError@0 I_RpcGetPortAllocationData@4 +I_RpcGetSystemHandle@20 I_RpcIfInqTransferSyntaxes@16 I_RpcLogEvent@28 I_RpcMapWin32Status@4 I_RpcMonitorAssociation@12 I_RpcMarshalBindingHandleAndInterfaceForNDF@24 +I_RpcMgmtEnableDedicatedThreadPool@0 I_RpcNDRCGetWireRepresentation@8 I_RpcNDRSContextEmergencyCleanup@8 I_RpcNegotiateTransferSyntax@4 @@ -97,6 +111,8 @@ I_RpcSend@4 I_RpcSendReceive@4 I_RpcServerAllocateIpPort@8 I_RpcServerCheckClientRestriction@4 +I_RpcServerDisableExceptionFilter@0 +I_RpcServerGetAssociationID@8 I_RpcServerInqAddressChangeFn@0 I_RpcServerInqLocalConnAddress@16 I_RpcServerInqRemoteConnAddress@16 @@ -106,12 +122,16 @@ I_RpcServerRegisterForwardFunction@4 I_RpcSetAssociationContext@4 I_RpcServerSetAddressChangeFn@4 I_RpcServerStartService@12 +I_RpcServerSubscribeForDisconnectNotification2@12 +I_RpcServerSubscribeForDisconnectNotification@8 +I_RpcServerUnsubscribeForDisconnectNotification@20 I_RpcServerUseProtseq2A@20 I_RpcServerUseProtseq2W@20 I_RpcServerUseProtseqEp2A@24 I_RpcServerUseProtseqEp2W@24 I_RpcSessionStrictContextHandle@0 I_RpcSetDCOMAppId@4 +I_RpcSetSystemHandle@20 I_RpcSsDontSerializeContext@0 I_RpcStopMonitorAssociation@4 I_RpcTransClientMaxFrag@4 @@ -125,6 +145,7 @@ I_RpcTransServerReallocBuffer@16 I_RpcTransServerReceiveDirectReady@4 I_RpcTransServerUnprotectThread@4 I_RpcSystemFunction001@12 +I_RpcSystemHandleTypeSpecificWork@16 I_RpcTransConnectionAllocatePacket@8 I_RpcTransConnectionFreePacket@8 I_RpcTransConnectionReallocPacket@16 @@ -159,7 +180,8 @@ NDRSContextUnmarshall@8 NDRSContextUnmarshallEx@12 NDRcopy@12 NdrAllocate@8 -NdrAsyncClientCall@0 +NdrAsyncClientCall +NdrAsyncClientCall2 NdrAsyncServerCall@4 NdrByteCountPointerBufferSize@12 NdrByteCountPointerFree@12 @@ -170,6 +192,7 @@ NdrCStdStubBuffer_Release@8 NdrClearOutParameters@12 NdrClientCall NdrClientCall2 +NdrClientCall4 NdrClientContextMarshall@12 NdrClientContextUnmarshall@12 NdrClientInitialize@16 @@ -216,7 +239,8 @@ NdrCorrelationFree@4 NdrCorrelationInitialize@16 NdrCorrelationPass@4 NdrCreateServerInterfaceFromStub@8 -NdrDcomAsyncClientCall@0 +NdrDcomAsyncClientCall +NdrDcomAsyncClientCall2 NdrDcomAsyncStubCall@16 NdrDllCanUnloadNow@4 NdrDllGetClassObject@24 @@ -262,6 +286,7 @@ NdrInterfacePointerUnmarshall@16 NdrMapCommAndFaultStatus@16 NdrMesProcEncodeDecode NdrMesProcEncodeDecode2 +NdrMesProcEncodeDecode4 NdrMesSimpleTypeAlignSize@4 NdrMesSimpleTypeDecode@12 NdrMesSimpleTypeEncode@16 @@ -425,7 +450,9 @@ RpcFreeAuthorizationContext@4 RpcGetAuthorizationContextForClient@36 RpcIfIdVectorFree@4 RpcIfInqId@8 +RpcImpersonateClient2@4 RpcImpersonateClient@4 +RpcImpersonateClientContainer@4 RpcMgmtEnableIdleCleanup@0 RpcMgmtEpEltInqBegin@24 RpcMgmtEpEltInqDone@4 @@ -458,20 +485,29 @@ RpcObjectSetType@8 RpcProtseqVectorFreeA@4 RpcProtseqVectorFreeW@4 RpcRaiseException@4 +RpcRevertContainerImpersonation@0 RpcRevertToSelf@0 RpcRevertToSelfEx@4 RpcServerCompleteSecurityCallback@8 RpcServerInqBindingHandle@4 RpcServerInqBindings@4 +RpcServerInqBindingsEx@8 RpcServerInqCallAttributesA@8 RpcServerInqCallAttributesW@8 RpcServerInqDefaultPrincNameA@8 RpcServerInqDefaultPrincNameW@8 RpcServerInqIf@12 +RpcServerInterfaceGroupActivate@4 +RpcServerInterfaceGroupClose@4 +RpcServerInterfaceGroupCreateA@32 +RpcServerInterfaceGroupCreateW@32 +RpcServerInterfaceGroupDeactivate@8 +RpcServerInterfaceGroupInqBindings@8 RpcServerListen@12 RpcServerRegisterAuthInfoA@16 RpcServerRegisterAuthInfoW@16 RpcServerRegisterIf2@28 +RpcServerRegisterIf3@32 RpcServerRegisterIf@12 RpcServerRegisterIfEx@24 RpcServerSubscribeForNotification@16 diff --git a/lib/libc/mingw/lib32/urlmon.def b/lib/libc/mingw/lib32/urlmon.def index 31e750d76f..0ad95e0b04 100644 --- a/lib/libc/mingw/lib32/urlmon.def +++ b/lib/libc/mingw/lib32/urlmon.def @@ -5,24 +5,10 @@ ; LIBRARY "urlmon.dll" EXPORTS -ord_100@16 @100 -ord_101 @101 -ord_102 @102 -ord_103@8 @103 -ord_104@24 @104 -ord_105@12 @105 -ord_106@4 @106 -ord_107@8 @107 -ord_108 @108 AsyncGetClassBits@44 AsyncInstallDistributionUnit@36 -ord_111@8 @111 -ord_112@8 @112 -ord_113@8 @113 -ord_114 @114 -ord_115@4 @115 -ord_116@8 @116 BindAsyncMoniker@20 +CAuthenticateHostUI_CreateInstance@12 CDLGetLongPathNameA@12 CDLGetLongPathNameW@12 CORPolicyProvider@4 @@ -36,6 +22,8 @@ CoInternetCompareUrl@12 CoInternetCreateSecurityManager@12 CoInternetCreateZoneManager@12 CoInternetFeatureSettingsChanged +CoInternetGetMobileBrowserAppCompatMode@4 +CoInternetGetMobileBrowserForceDesktopMode@4 CoInternetGetProtocolFlags@12 CoInternetGetSecurityUrl@16 CoInternetGetSecurityUrlEx@16 @@ -48,6 +36,8 @@ CoInternetParseIUri@28 CoInternetParseUrl@28 CoInternetQueryInfo@28 CoInternetSetFeatureEnabled@12 +CoInternetSetMobileBrowserAppCompatMode@4 +CoInternetSetMobileBrowserForceDesktopMode@4 CompareSecurityIds@20 CompatFlagsFromClsid@12 CopyBindInfo@8 @@ -65,6 +55,7 @@ CreateUriPriv@32 CreateUriWithFragment@20 Extract@8 FaultInIEFeature@16 +FileBearsMarkOfTheWeb@8 FindMediaType@8 FindMediaTypeClass@16 FindMimeFromData@32 @@ -82,12 +73,14 @@ GetPropertyFromName@8 GetPropertyName@4 GetSoftwareUpdateInfo@8 GetUrlmonThreadNotificationHwnd@0 +GetZoneFromAlternateDataStreamEx@8 HlinkGoBack@4 HlinkGoForward@4 HlinkNavigateMoniker@8 HlinkNavigateString@8 HlinkSimpleNavigateToMoniker@32 HlinkSimpleNavigateToString@32 +IEGetUserPrivateNamespaceName@0 IEDllLoader@8 IEInstallScope@4 IntlPercentEncodeNormalize@16 @@ -108,10 +101,13 @@ RegisterBindStatusCallback@16 RegisterFormatEnumerator@12 RegisterMediaTypeClass@20 RegisterMediaTypes@12 +RegisterWebPlatformPermanentSecurityManager@4 ReleaseBindInfo@4 ResetUrlmonLanguageData@0 +RestrictHTTP2@4 RevokeBindStatusCallback@8 RevokeFormatEnumerator@8 +SetAccessForIEAppContainer@12 SetSoftwareUpdateAdvertisementState@16 ShouldDisplayPunycodeForUri@4 ShouldShowIntranetWarningSecband@4 @@ -128,103 +124,11 @@ URLOpenPullStreamA@16 URLOpenPullStreamW@16 URLOpenStreamA@16 URLOpenStreamW@16 +UnregisterWebPlatformPermanentSecurityManager@0 UrlMkBuildVersion UrlMkGetSessionOption@20 UrlMkSetSessionOption@16 +UrlmonCleanupCurrentThread@0 WriteHitLogging@4 ZonesReInit@4 -ord_304@28 @304 -ord_305@12 @305 -ord_306@4 @306 -ord_307@20 @307 -ord_308@4 @308 -ord_309@4 @309 -ord_310@12 @310 -ord_311@12 @311 -ord_312@4 @312 -ord_313@8 @313 -ord_314@4 @314 -ord_315@8 @315 -ord_316@8 @316 -ord_318@8 @318 -ord_319@8 @319 -ord_320@12 @320 -ord_321@8 @321 IECompatLogCSSFix@12 -ord_323@12 @323 -ord_324 @324 -; ord_395 @395 Couldn't determine function argument count. Function doesn't return. -ord_400@8 @400 -ord_401@4 @401 -ord_403@4 @403 -ord_404 @404 -ord_406 @406 -ord_407 @407 -ord_408@8 @408 -ord_409@8 @409 -ord_410@8 @410 -ord_411@8 @411 -ord_412@8 @412 -ord_413@8 @413 -ord_414@8 @414 -ord_415@8 @415 -ord_416@12 @416 -ord_417@12 @417 -ord_420@24 @420 -ord_421@8 @421 -; ord_422 @422 Check!!! forwards to CloseHandle in KERNEL32.dll (ordinal 82) -ord_423@16 @423 -ord_430 @430 -ord_431@4 @431 -ord_432@8 @432 -ord_433@4 @433 -ord_434@12 @434 -ord_435@12 @435 -ord_436@8 @436 -ord_437@8 @437 -ord_438@24 @438 -ord_439@4 @439 -ord_440@4 @440 -ord_441@16 @441 -ord_442@8 @442 -ord_443@8 @443 -ord_444@12 @444 -ord_445@8 @445 -ord_446@4 @446 -ord_447@4 @447 -ord_448@4 @448 -ord_449@4 @449 -ord_450@4 @450 -ord_451@4 @451 -ord_452@8 @452 -ord_453@8 @453 -ord_454@8 @454 -ord_455 @455 -ord_456 @456 -ord_457@4 @457 -ord_458 @458 -ord_460@4 @460 -ord_461@8 @461 -ord_462@20 @462 -ord_463@20 @463 -ord_470@4 @470 -ord_471 @471 -ord_473@4 @473 -ord_474@16 @474 -ord_475@16 @475 -ord_476@16 @476 -ord_477@16 @477 -ord_478@32 @478 -ord_479@32 @479 -ord_480@36 @480 -ord_481@36 @481 -ord_482@12 @482 -ord_483@28 @483 -ord_484@8 @484 -ord_485@8 @485 -ord_486@8 @486 -ord_487@4 @487 -ord_488 @488 -ord_489@16 @489 -ord_490@44 @490 -ord_491@4 @491 diff --git a/lib/libc/mingw/lib64/mswsock.def b/lib/libc/mingw/lib64/mswsock.def deleted file mode 100644 index 7abab873b9..0000000000 --- a/lib/libc/mingw/lib64/mswsock.def +++ /dev/null @@ -1,40 +0,0 @@ -; -; Exports of file MSWSOCK.dll -; -; Autogenerated by gen_exportdef -; Written by Kai Tietz, 2007 -; -LIBRARY MSWSOCK.dll -EXPORTS -ServiceMain -SvchostPushServiceGlobals -AcceptEx -EnumProtocolsA -EnumProtocolsW -GetAcceptExSockaddrs -GetAddressByNameA -GetAddressByNameW -GetNameByTypeA -GetNameByTypeW -GetServiceA -GetServiceW -GetTypeByNameA -GetTypeByNameW -MigrateWinsockConfiguration -NPLoadNameSpaces -NSPStartup -SetServiceA -SetServiceW -StartWsdpService -StopWsdpService -TransmitFile -WSARecvEx -WSPStartup -dn_expand -getnetbyname -inet_network -rcmd -rexec -rresvport -s_perror -sethostname diff --git a/lib/libc/mingw/lib64/ntdll.def b/lib/libc/mingw/lib64/ntdll.def index 2b2ad36f8a..b6acbddeed 100644 --- a/lib/libc/mingw/lib64/ntdll.def +++ b/lib/libc/mingw/lib64/ntdll.def @@ -26,6 +26,8 @@ AlpcRegisterCompletionListWorkerThread AlpcRundownCompletionList AlpcUnregisterCompletionList AlpcUnregisterCompletionListWorkerThread +ApiSetQueryApiSetPresence +ApiSetQueryApiSetPresenceEx CsrAllocateCaptureBuffer CsrAllocateMessagePointer CsrCaptureMessageBuffer @@ -52,6 +54,7 @@ DbgSetDebugFilterState DbgUiConnectToDbg DbgUiContinue DbgUiConvertStateChangeStructure +DbgUiConvertStateChangeStructureEx DbgUiDebugActiveProcess DbgUiGetThreadDebugObject DbgUiIssueRemoteBreakin @@ -60,6 +63,7 @@ DbgUiSetThreadDebugObject DbgUiStopDebugging DbgUiWaitStateChange DbgUserBreakPoint +EtwCheckCoverage EtwControlTraceA EtwControlTraceW EtwCreateTraceInstanceId @@ -73,6 +77,7 @@ EtwEventActivityIdControl EtwEventEnabled EtwEventProviderEnabled EtwEventRegister +EtwEventSetInformation EtwEventUnregister EtwEventWrite EtwEventWriteEndScenario @@ -132,64 +137,90 @@ KiRaiseUserExceptionDispatcher KiUserApcDispatcher KiUserCallbackDispatcher KiUserExceptionDispatcher +KiUserInvertedFunctionTable LdrAccessOutOfProcessResource LdrAccessResource +LdrAddDllDirectory LdrAddLoadAsDataTable LdrAddRefDll LdrAlternateResourcesEnabled +LdrAppxHandleIntegrityFailure +LdrCallEnclave +LdrControlFlowGuardEnforced +LdrCreateEnclave LdrCreateOutOfProcessImage +LdrDeleteEnclave LdrDestroyOutOfProcessImage LdrDisableThreadCalloutsForDll LdrEnumResources LdrEnumerateLoadedModules +LdrFastFailInLoaderCallout LdrFindCreateProcessManifest LdrFindEntryForAddress LdrFindResourceDirectory_U LdrFindResourceEx_U LdrFindResource_U LdrFlushAlternateResourceModules +LdrGetDllDirectory +LdrGetDllFullName LdrGetDllHandle LdrGetDllHandleByMapping LdrGetDllHandleByName LdrGetDllHandleEx +LdrGetDllPath LdrGetFailureData LdrGetFileNameFromLoadAsDataTable LdrGetKnownDllSectionHandle LdrGetProcedureAddress LdrGetProcedureAddressEx +LdrGetProcedureAddressForCaller LdrHotPatchRoutine LdrInitShimEngineDynamic +LdrInitializeEnclave LdrInitializeThunk +LdrIsModuleSxsRedirected LdrLoadAlternateResourceModule LdrLoadAlternateResourceModuleEx LdrLoadDll +LdrLoadEnclaveModule LdrLockLoaderLock LdrOpenImageFileOptionsKey LdrProcessInitializationComplete LdrProcessRelocationBlock +LdrProcessRelocationBlockEx LdrQueryImageFileExecutionOptions LdrQueryImageFileExecutionOptionsEx LdrQueryImageFileKeyOption LdrQueryModuleServiceTags +LdrQueryOptionalDelayLoadedAPI LdrQueryProcessModuleInformation LdrRegisterDllNotification +LdrRemoveDllDirectory LdrRemoveLoadAsDataTable LdrResFindResource LdrResFindResourceDirectory LdrResGetRCConfig LdrResRelease LdrResSearchResource +LdrResolveDelayLoadedAPI +LdrResolveDelayLoadsFromDll LdrRscIsTypeExist LdrSetAppCompatDllRedirectionCallback +LdrSetDefaultDllDirectories +LdrSetDllDirectory LdrSetDllManifestProber +LdrSetImplicitPathOptions LdrSetMUICacheType LdrShutdownProcess LdrShutdownThread +LdrStandardizeSystemPath +LdrSystemDllInitBlock LdrUnloadAlternateResourceModule LdrUnloadAlternateResourceModuleEx LdrUnloadDll LdrUnlockLoaderLock LdrUnregisterDllNotification +LdrUpdatePackageSearchPath LdrVerifyImageMatchesChecksum LdrVerifyImageMatchesChecksumEx LdrpResGetMappingSize @@ -211,21 +242,28 @@ NtAccessCheckByTypeAndAuditAlarm NtAccessCheckByTypeResultList NtAccessCheckByTypeResultListAndAuditAlarm NtAccessCheckByTypeResultListAndAuditAlarmByHandle +NtAcquireProcessActivityReference NtAddAtom +NtAddAtomEx NtAddBootEntry NtAddDriverEntry NtAdjustGroupsToken NtAdjustPrivilegesToken +NtAdjustTokenClaimsAndDeviceGroups NtAlertResumeThread NtAlertThread +NtAlertThreadByThreadId NtAllocateLocallyUniqueId NtAllocateReserveObject NtAllocateUserPhysicalPages +NtAllocateUserPhysicalPagesEx NtAllocateUuids NtAllocateVirtualMemory +NtAllocateVirtualMemoryEx NtAlpcAcceptConnectPort NtAlpcCancelMessage NtAlpcConnectPort +NtAlpcConnectPortEx NtAlpcCreatePort NtAlpcCreatePortSection NtAlpcCreateResourceReserve @@ -236,6 +274,7 @@ NtAlpcDeleteResourceReserve NtAlpcDeleteSectionView NtAlpcDeleteSecurityContext NtAlpcDisconnectPort +NtAlpcImpersonateClientContainerOfPort NtAlpcImpersonateClientOfPort NtAlpcOpenSenderProcess NtAlpcOpenSenderThread @@ -247,58 +286,78 @@ NtAlpcSetInformation NtApphelpCacheControl NtAreMappedFilesTheSame NtAssignProcessToJobObject +NtAssociateWaitCompletionPacket +NtCallEnclave NtCallbackReturn NtCancelDeviceWakeupRequest NtCancelIoFile NtCancelIoFileEx NtCancelSynchronousIoFile NtCancelTimer +NtCancelTimer2 +NtCancelWaitCompletionPacket NtClearEvent NtClose NtCloseObjectAuditAlarm NtCommitComplete NtCommitEnlistment +NtCommitRegistryTransaction NtCommitTransaction NtCompactKeys +NtCompareObjects +NtCompareSigningLevels NtCompareTokens NtCompleteConnectPort NtCompressKey NtConnectPort NtContinue +NtConvertBetweenAuxiliaryCounterAndPerformanceCounter +NtCreateCrossVmEvent NtCreateDebugObject NtCreateDirectoryObject +NtCreateDirectoryObjectEx +NtCreateEnclave NtCreateEnlistment NtCreateEvent NtCreateEventPair NtCreateFile +NtCreateIRTimer NtCreateIoCompletion NtCreateJobObject NtCreateJobSet NtCreateKey NtCreateKeyTransacted NtCreateKeyedEvent +NtCreateLowBoxToken NtCreateMailslotFile NtCreateMutant NtCreateNamedPipeFile NtCreatePagingFile +NtCreatePartition NtCreatePort NtCreatePrivateNamespace NtCreateProcess NtCreateProcessEx NtCreateProfile NtCreateProfileEx +NtCreateRegistryTransaction NtCreateResourceManager NtCreateSection +NtCreateSectionEx NtCreateSemaphore NtCreateSymbolicLinkObject NtCreateThread NtCreateThreadEx NtCreateTimer +NtCreateTimer2 NtCreateToken +NtCreateTokenEx NtCreateTransaction NtCreateTransactionManager NtCreateUserProcess +NtCreateWaitCompletionPacket NtCreateWaitablePort +NtCreateWnfStateName NtCreateWorkerFactory NtDebugActiveProcess NtDebugContinue @@ -311,6 +370,8 @@ NtDeleteKey NtDeleteObjectAuditAlarm NtDeletePrivateNamespace NtDeleteValueKey +NtDeleteWnfStateData +NtDeleteWnfStateName NtDeviceIoControlFile NtDisableLastKnownGood NtDisplayString @@ -325,9 +386,12 @@ NtEnumerateSystemEnvironmentValuesEx NtEnumerateTransactionObject NtEnumerateValueKey NtExtendSection +NtFilterBootOption NtFilterToken +NtFilterTokenEx NtFindAtom NtFlushBuffersFile +NtFlushBuffersFileEx NtFlushInstallUILanguage NtFlushInstructionCache NtFlushKey @@ -339,8 +403,11 @@ NtFreeVirtualMemory NtFreezeRegistry NtFreezeTransactions NtFsControlFile +NtGetCachedSigningLevel +NtGetCompleteWnfStateSubscription NtGetContextThread NtGetCurrentProcessorNumber +NtGetCurrentProcessorNumberEx NtGetDevicePowerState NtGetMUIRegistryInfo NtGetNextProcess @@ -353,6 +420,7 @@ NtGetWriteWatch NtImpersonateAnonymousToken NtImpersonateClientOfPort NtImpersonateThread +NtInitializeEnclave NtInitializeNlsFiles NtInitializeRegistry NtInitiatePowerAction @@ -361,6 +429,7 @@ NtIsSystemResumeAutomatic NtIsUILanguageComitted NtListenPort NtLoadDriver +NtLoadEnclaveData NtLoadKey NtLoadKey2 NtLoadKeyEx @@ -370,13 +439,17 @@ NtLockRegistryKey NtLockVirtualMemory NtMakePermanentObject NtMakeTemporaryObject +NtManageHotPatch +NtManagePartition NtMapCMFModule NtMapUserPhysicalPages NtMapUserPhysicalPagesScatter NtMapViewOfSection +NtMapViewOfSectionEx NtModifyBootEntry NtModifyDriverEntry NtNotifyChangeDirectoryFile +NtNotifyChangeDirectoryFileEx NtNotifyChangeKey NtNotifyChangeMultipleKeys NtNotifyChangeSession @@ -394,10 +467,12 @@ NtOpenKeyTransactedEx NtOpenKeyedEvent NtOpenMutant NtOpenObjectAuditAlarm +NtOpenPartition NtOpenPrivateNamespace NtOpenProcess NtOpenProcessToken NtOpenProcessTokenEx +NtOpenRegistryTransaction NtOpenResourceManager NtOpenSection NtOpenSemaphore @@ -421,20 +496,24 @@ NtPrivilegedServiceAuditAlarm NtPropagationComplete NtPropagationFailed NtProtectVirtualMemory +NtPssCaptureVaSpaceBulk NtPulseEvent NtQueryAttributesFile +NtQueryAuxiliaryCounterFrequency NtQueryBootEntryOrder NtQueryBootOptions NtQueryDebugFilterState NtQueryDefaultLocale NtQueryDefaultUILanguage NtQueryDirectoryFile +NtQueryDirectoryFileEx NtQueryDirectoryObject NtQueryDriverEntryOrder NtQueryEaFile NtQueryEvent NtQueryFullAttributesFile NtQueryInformationAtom +NtQueryInformationByName NtQueryInformationEnlistment NtQueryInformationFile NtQueryInformationJobObject @@ -462,6 +541,7 @@ NtQueryQuotaInformationFile NtQuerySection NtQuerySecurityAttributesToken NtQuerySecurityObject +NtQuerySecurityPolicy NtQuerySemaphore NtQuerySymbolicLinkObject NtQuerySystemEnvironmentValue @@ -474,6 +554,8 @@ NtQueryTimerResolution NtQueryValueKey NtQueryVirtualMemory NtQueryVolumeInformationFile +NtQueryWnfStateData +NtQueryWnfStateNameInformation NtQueueApcThread NtQueueApcThreadEx NtRaiseException @@ -512,8 +594,10 @@ NtResetWriteWatch NtRestoreKey NtResumeProcess NtResumeThread +NtRevertContainerImpersonation NtRollbackComplete NtRollbackEnlistment +NtRollbackRegistryTransaction NtRollbackTransaction NtRollforwardTransactionManager NtSaveKey @@ -523,6 +607,8 @@ NtSecureConnectPort NtSerializeBoot NtSetBootEntryOrder NtSetBootOptions +NtSetCachedSigningLevel +NtSetCachedSigningLevel2 NtSetContextThread NtSetDebugFilterState NtSetDefaultHardErrorPort @@ -534,6 +620,7 @@ NtSetEvent NtSetEventBoostPriority NtSetHighEventPair NtSetHighWaitLowEventPair +NtSetIRTimer NtSetInformationDebugObject NtSetInformationEnlistment NtSetInformationFile @@ -542,10 +629,12 @@ NtSetInformationKey NtSetInformationObject NtSetInformationProcess NtSetInformationResourceManager +NtSetInformationSymbolicLink NtSetInformationThread NtSetInformationToken NtSetInformationTransaction NtSetInformationTransactionManager +NtSetInformationVirtualMemory NtSetInformationWorkerFactory NtSetIntervalProfile NtSetIoCompletion @@ -562,20 +651,24 @@ NtSetSystemPowerState NtSetSystemTime NtSetThreadExecutionState NtSetTimer +NtSetTimer2 NtSetTimerEx NtSetTimerResolution NtSetUuidSeed NtSetValueKey NtSetVolumeInformationFile +NtSetWnfProcessNotificationEvent NtShutdownSystem NtShutdownWorkerFactory NtSignalAndWaitForSingleObject NtSinglePhaseReject NtStartProfile NtStopProfile +NtSubscribeWnfStateChange NtSuspendProcess NtSuspendThread NtSystemDebugControl +NtTerminateEnclave NtTerminateJobObject NtTerminateProcess NtTerminateThread @@ -593,7 +686,11 @@ NtUnloadKeyEx NtUnlockFile NtUnlockVirtualMemory NtUnmapViewOfSection +NtUnmapViewOfSectionEx +NtUnsubscribeWnfStateChange +NtUpdateWnfStateData NtVdmControl +NtWaitForAlertByThreadId NtWaitForDebugEvent NtWaitForKeyedEvent NtWaitForMultipleObjects @@ -616,6 +713,14 @@ PfxFindPrefix PfxInitialize PfxInsertPrefix PfxRemovePrefix +PssNtCaptureSnapshot +PssNtDuplicateSnapshot +PssNtFreeRemoteSnapshot +PssNtFreeSnapshot +PssNtFreeWalkMarker +PssNtQuerySnapshot +PssNtValidateDescriptor +PssNtWalkSnapshot RtlAbortRXact RtlAbsoluteToSelfRelativeSD RtlAcquirePebLock @@ -634,6 +739,7 @@ RtlAddAccessAllowedObjectAce RtlAddAccessDeniedAce RtlAddAccessDeniedAceEx RtlAddAccessDeniedObjectAce +RtlAddAccessFilterAce RtlAddAce RtlAddActionToRXact RtlAddAtomToAtomTable @@ -643,21 +749,27 @@ RtlAddAuditAccessAceEx RtlAddAuditAccessObjectAce RtlAddCompoundAce RtlAddFunctionTable +RtlAddGrowableFunctionTable RtlAddIntegrityLabelToBoundaryDescriptor RtlAddMandatoryAce +RtlAddProcessTrustLabelAce RtlAddRefActivationContext RtlAddRefMemoryStream +RtlAddResourceAttributeAce RtlAddSIDToBoundaryDescriptor +RtlAddScopedPolicyIDAce RtlAddVectoredContinueHandler RtlAddVectoredExceptionHandler RtlAddressInSectionTable RtlAdjustPrivilege RtlAllocateActivationContextStack RtlAllocateAndInitializeSid +RtlAllocateAndInitializeSidEx RtlAllocateHandle RtlAllocateHeap RtlAllocateMemoryBlockLookaside RtlAllocateMemoryZone +RtlAllocateWnfSerializationGroup RtlAnsiCharToUnicodeChar RtlAnsiStringToUnicodeSize RtlAnsiStringToUnicodeString @@ -669,23 +781,44 @@ RtlAppendUnicodeToString RtlApplicationVerifierStop RtlApplyRXact RtlApplyRXactNoFlush +RtlAppxIsFileOwnedByTrustedInstaller RtlAreAllAccessesGranted RtlAreAnyAccessesGranted RtlAreBitsClear +RtlAreBitsClearEx RtlAreBitsSet +RtlAreLongPathsEnabled RtlAssert +RtlAvlInsertNodeEx +RtlAvlRemoveNode RtlBarrier RtlBarrierForDelete +RtlCallEnclaveReturn RtlCancelTimer +RtlCanonicalizeDomainName +RtlCapabilityCheck +RtlCapabilityCheckForSingleSessionSku RtlCaptureContext RtlCaptureStackBackTrace RtlCharToInteger +RtlCheckBootStatusIntegrity RtlCheckForOrphanedCriticalSections +RtlCheckPortableOperatingSystem RtlCheckProcessParameters RtlCheckRegistryKey +RtlCheckSandboxedToken +RtlCheckSystemBootStatusIntegrity +RtlCheckTokenCapability +RtlCheckTokenMembership +RtlCheckTokenMembershipEx RtlCleanUpTEBLangLists RtlClearAllBits +RtlClearAllBitsEx +RtlClearBit +RtlClearBitEx RtlClearBits +RtlClearBitsEx +RtlClearThreadWorkOnBehalfTicket RtlCloneMemoryStream RtlCloneUserProcess RtlCmDecodeMemIoResource @@ -706,13 +839,18 @@ RtlComputeImportTableHash RtlComputePrivatizedDllName_U RtlConnectToSm RtlConsoleMultiByteToUnicodeN +RtlConstructCrossVmEventPath RtlContractHashTable +RtlConvertDeviceFamilyInfoToString RtlConvertExclusiveToShared RtlConvertLCIDToString +RtlConvertSRWLockExclusiveToShared RtlConvertSharedToExclusive RtlConvertSidToUnicodeString RtlConvertToAutoInheritSecurityObject RtlConvertUiListToApiList +RtlCopyBitMap +RtlCopyContext RtlCopyExtendedContext RtlCopyLuid RtlCopyLuidAndAttributesArray @@ -726,6 +864,8 @@ RtlCopySid RtlCopySidAndAttributesArray RtlCopyString RtlCopyUnicodeString +RtlCrc32 +RtlCrc64 RtlCreateAcl RtlCreateActivationContext RtlCreateAndSetSD @@ -735,11 +875,13 @@ RtlCreateBoundaryDescriptor RtlCreateEnvironment RtlCreateEnvironmentEx RtlCreateHashTable +RtlCreateHashTableEx RtlCreateHeap RtlCreateMemoryBlockLookaside RtlCreateMemoryZone RtlCreateProcessParameters RtlCreateProcessParametersEx +RtlCreateProcessParametersWithTemplate RtlCreateProcessReflection RtlCreateQueryDebugBuffer RtlCreateRegistryKey @@ -754,7 +896,9 @@ RtlCreateUmsThread RtlCreateUmsThreadContext RtlCreateUnicodeString RtlCreateUnicodeStringFromAsciiz +RtlCreateUserFiberShadowStack RtlCreateUserProcess +RtlCreateUserProcessEx RtlCreateUserSecurityObject RtlCreateUserStack RtlCreateUserThread @@ -768,8 +912,10 @@ RtlDeactivateActivationContext RtlDeactivateActivationContextUnsafeFast RtlDebugPrintTimes RtlDecodePointer +RtlDecodeRemotePointer RtlDecodeSystemPointer RtlDecompressBuffer +RtlDecompressBufferEx RtlDecompressFragment RtlDefaultNpAcl RtlDelete @@ -780,7 +926,9 @@ RtlDeleteBoundaryDescriptor RtlDeleteCriticalSection RtlDeleteElementGenericTable RtlDeleteElementGenericTableAvl +RtlDeleteElementGenericTableAvlEx RtlDeleteFunctionTable +RtlDeleteGrowableFunctionTable RtlDeleteHashTable RtlDeleteNoSplay RtlDeleteRegistryValue @@ -795,6 +943,7 @@ RtlDequeueUmsCompletionListItems RtlDeregisterSecureMemoryCacheCallback RtlDeregisterWait RtlDeregisterWaitEx +RtlDeriveCapabilitySidsFromName RtlDestroyAtomTable RtlDestroyEnvironment RtlDestroyHandleTable @@ -809,7 +958,10 @@ RtlDisableThreadProfiling RtlDllShutdownInProgress RtlDnsHostNameToComputerName RtlDoesFileExists_U +RtlDoesNameContainWildCards RtlDosApplyFileIsolationRedirection_Ustr +RtlDosLongPathNameToNtPathName_U_WithStatus +RtlDosLongPathNameToRelativeNtPathName_U_WithStatus RtlDosPathNameToNtPathName_U RtlDosPathNameToNtPathName_U_WithStatus RtlDosPathNameToRelativeNtPathName_U @@ -818,14 +970,19 @@ RtlDosSearchPath_U RtlDosSearchPath_Ustr RtlDowncaseUnicodeChar RtlDowncaseUnicodeString +RtlDrainNonVolatileFlush RtlDumpResource RtlDuplicateUnicodeString RtlEmptyAtomTable RtlEnableEarlyCriticalSectionEventCreation RtlEnableThreadProfiling +RtlEnclaveCallDispatch +RtlEnclaveCallDispatchReturn RtlEncodePointer +RtlEncodeRemotePointer RtlEncodeSystemPointer RtlEndEnumerationHashTable +RtlEndStrongEnumerationHashTable RtlEndWeakEnumerationHashTable RtlEnterCriticalSection RtlEnterUmsSchedulingMode @@ -843,6 +1000,7 @@ RtlEqualPrefixSid RtlEqualSid RtlEqualString RtlEqualUnicodeString +RtlEqualWnfChangeStamps RtlEraseUnicodeString RtlEthernetAddressToStringA RtlEthernetAddressToStringW @@ -855,9 +1013,13 @@ RtlExpandEnvironmentStrings RtlExpandEnvironmentStrings_U RtlExtendHeap RtlExpandHashTable +RtlExtendCorrelationVector RtlExtendMemoryBlockLookaside RtlExtendMemoryZone +RtlExtractBitMap RtlFillMemory +RtlFillMemoryNonTemporal +RtlFillNonVolatileMemory RtlFinalReleaseOutOfProcessMemoryStream RtlFindAceByType RtlFindActivationContextSectionGuid @@ -865,8 +1027,10 @@ RtlFindActivationContextSectionString RtlFindCharInUnicodeString RtlFindClearBits RtlFindClearBitsAndSet +RtlFindClearBitsEx RtlFindClearRuns RtlFindClosestEncodableLength +RtlFindExportedRoutineByName RtlFindLastBackwardRunClear RtlFindLeastSignificantBit RtlFindLongestRunClear @@ -875,10 +1039,18 @@ RtlFindMostSignificantBit RtlFindNextForwardRunClear RtlFindSetBits RtlFindSetBitsAndClear +RtlFindSetBitsAndClearEx +RtlFindSetBitsEx +RtlFindUnicodeSubstring RtlFirstEntrySList RtlFirstFreeAce RtlFlsAlloc RtlFlsFree +RtlFlsGetValue +RtlFlsSetValue +RtlFlushHeaps +RtlFlushNonVolatileMemory +RtlFlushNonVolatileMemoryRanges RtlFlushSecureMemoryCache RtlFormatCurrentUserKeyPath RtlFormatMessage @@ -888,31 +1060,43 @@ RtlFreeAnsiString RtlFreeHandle RtlFreeHeap RtlFreeMemoryBlockLookaside +RtlFreeNonVolatileToken RtlFreeOemString RtlFreeSid RtlFreeThreadActivationContextStack +RtlFreeUTF8String RtlFreeUnicodeString +RtlFreeUserFiberShadowStack RtlFreeUserThreadStack RtlFreeUserStack RtlGUIDFromString RtlGenerate8dot3Name RtlGetAce RtlGetActiveActivationContext +RtlGetActiveConsoleId +RtlGetAppContainerNamedObjectPath +RtlGetAppContainerParent +RtlGetAppContainerSidType RtlGetCallersAddress RtlGetCompressionWorkSpaceSize +RtlGetConsoleSessionForegroundProcessId RtlGetControlSecurityDescriptor RtlGetCriticalSectionRecursionCount RtlGetCurrentDirectory_U RtlGetCurrentPeb RtlGetCurrentProcessorNumber RtlGetCurrentProcessorNumberEx +RtlGetCurrentServiceSessionId RtlGetCurrentTransaction RtlGetCurrentUmsThread RtlGetDaclSecurityDescriptor +RtlGetDeviceFamilyInfoEnum RtlGetElementGenericTable RtlGetElementGenericTableAvl RtlGetEnabledExtendedFeatures +RtlGetExePath RtlGetExtendedContextLength +RtlGetExtendedContextLength2 RtlGetExtendedFeaturesMask RtlGetFileMUIPath RtlGetFrame @@ -922,30 +1106,43 @@ RtlGetFullPathName_UstrEx RtlGetFunctionTableListHead RtlGetGroupSecurityDescriptor RtlGetIntegerAtom +RtlGetInterruptTimePrecise RtlGetLastNtStatus RtlGetLastWin32Error RtlGetLengthWithoutLastFullDosOrNtPathElement RtlGetLengthWithoutTrailingPathSeperators RtlGetLocaleFileMappingAddress RtlGetLongestNtPathLength +RtlGetMultiTimePrecise RtlGetNativeSystemInformation RtlGetNextEntryHashTable RtlGetNextUmsListItem +RtlGetNonVolatileToken RtlGetNtGlobalFlags RtlGetNtProductType +RtlGetNtSystemRoot RtlGetNtVersionNumbers RtlGetOwnerSecurityDescriptor RtlGetParentLocaleName +RtlGetPersistedStateLocation RtlGetProcessHeaps RtlGetProcessPreferredUILanguages RtlGetProductInfo RtlGetSaclSecurityDescriptor +RtlGetSearchPath RtlGetSecurityDescriptorRMControl +RtlGetSessionProperties RtlGetSetBootStatusData +RtlGetSuiteMask +RtlGetSystemBootStatus +RtlGetSystemBootStatusEx RtlGetSystemPreferredUILanguages +RtlGetSystemTimePrecise RtlGetThreadErrorMode RtlGetThreadLangIdByIndex RtlGetThreadPreferredUILanguages +RtlGetThreadWorkOnBehalfTicket +RtlGetTokenNamedObjectPath RtlGetUILanguageInfo RtlGetUmsCompletionListEvent RtlGetUnloadEventTrace @@ -953,6 +1150,8 @@ RtlGetUnloadEventTraceEx RtlGetUserInfoHeap RtlGetUserPreferredUILanguages RtlGetVersion +RtlGrowFunctionTable +RtlGuardCheckLongJumpTarget RtlHashUnicodeString RtlHeapTrkInitialize RtlIdentifierAuthoritySid @@ -966,6 +1165,7 @@ RtlImageRvaToSection RtlImageRvaToVa RtlImpersonateSelf RtlImpersonateSelfEx +RtlIncrementCorrelationVector RtlInitAnsiString RtlInitAnsiStringEx RtlInitBarrier @@ -975,17 +1175,24 @@ RtlInitMemoryStream RtlInitNlsTables RtlInitOutOfProcessMemoryStream RtlInitString +RtlInitStringEx +RtlInitStrongEnumerationHashTable +RtlInitUTF8String +RtlInitUTF8StringEx RtlInitUnicodeString RtlInitUnicodeStringEx RtlInitWeakEnumerationHashTable RtlInitializeAtomPackage RtlInitializeBitMap +RtlInitializeBitMapEx RtlInitializeConditionVariable RtlInitializeContext +RtlInitializeCorrelationVector RtlInitializeCriticalSection RtlInitializeCriticalSectionAndSpinCount RtlInitializeCriticalSectionEx RtlInitializeExtendedContext +RtlInitializeExtendedContext2 RtlInitializeGenericTable RtlInitializeGenericTableAvl RtlInitializeHandleTable @@ -995,6 +1202,7 @@ RtlInitializeResource RtlInitializeSListHead RtlInitializeSRWLock RtlInitializeSid +RtlInitializeSidEx RtlInsertElementGenericTable RtlInsertElementGenericTableAvl RtlInsertElementGenericTableFull @@ -1009,6 +1217,7 @@ RtlInterlockedFlushSList RtlInterlockedPopEntrySList RtlInterlockedPushEntrySList RtlInterlockedPushListSList +RtlInterlockedPushListSListEx RtlInterlockedSetBitRun RtlIoDecodeMemIoResource RtlIoEncodeMemIoResource @@ -1029,20 +1238,39 @@ RtlIpv6StringToAddressExA RtlIpv6StringToAddressExW RtlIpv6StringToAddressW RtlIsActivationContextActive +RtlIsCapabilitySid +RtlIsCloudFilesPlaceholder RtlIsCriticalSectionLocked RtlIsCriticalSectionLockedByThread +RtlIsCurrentProcess +RtlIsCurrentThread RtlIsCurrentThreadAttachExempt RtlIsDosDeviceName_U +RtlIsElevatedRid RtlIsGenericTableEmpty RtlIsGenericTableEmptyAvl +RtlIsMultiSessionSku +RtlIsMultiUsersInSessionSku RtlIsNameInExpression +RtlIsNameInUnUpcasedExpression RtlIsNameLegalDOS8Dot3 +RtlIsNonEmptyDirectoryReparsePointAllowed RtlIsNormalizedString +RtlIsPackageSid +RtlIsParentOfChildAppContainer +RtlIsPartialPlaceholder +RtlIsPartialPlaceholderFileHandle +RtlIsPartialPlaceholderFileInfo +RtlIsProcessorFeaturePresent +RtlIsStateSeparationEnabled RtlIsTextUnicode RtlIsThreadWithinLoaderCallout +RtlIsUntrustedObject RtlIsValidHandle RtlIsValidIndexHandle RtlIsValidLocaleName +RtlIsValidProcessTrustLabelSid +RtlIsZeroMemory RtlKnownExceptionFilter RtlLCIDToCultureName RtlLargeIntegerToChar @@ -1051,10 +1279,12 @@ RtlLeaveCriticalSection RtlLengthRequiredSid RtlLengthSecurityDescriptor RtlLengthSid +RtlLengthSidAsUnicodeString RtlLoadString RtlLocalTimeToSystemTime RtlLocaleNameToLcid RtlLocateExtendedFeature +RtlLocateExtendedFeature2 RtlLocateLegacyContext RtlLockBootStatusData RtlLockCurrentThread @@ -1070,6 +1300,7 @@ RtlLookupElementGenericTableAvl RtlLookupElementGenericTableFull RtlLookupElementGenericTableFullAvl RtlLookupEntryHashTable +RtlLookupFirstMatchingElementGenericTableAvl RtlLookupFunctionEntry RtlLookupFunctionTable RtlMakeSelfRelativeSD @@ -1087,6 +1318,7 @@ RtlNewSecurityObject RtlNewSecurityObjectEx RtlNewSecurityObjectWithMultipleInheritance RtlNormalizeProcessParams +RtlNormalizeSecurityDescriptor RtlNormalizeString RtlNtPathNameToDosPathName RtlNtStatusToDosError @@ -1095,12 +1327,17 @@ RtlNtdllName DATA RtlNumberGenericTableElements RtlNumberGenericTableElementsAvl RtlNumberOfClearBits +RtlNumberOfClearBitsEx +RtlNumberOfClearBitsInRange RtlNumberOfSetBits +RtlNumberOfSetBitsEx +RtlNumberOfSetBitsInRange RtlNumberOfSetBitsUlongPtr RtlOemStringToUnicodeSize RtlOemStringToUnicodeString RtlOemToUnicodeN RtlOpenCurrentUser +RtlOsDeploymentState RtlOwnerAcesPresent RtlPcToFileHeader RtlPinAtomInAtomTable @@ -1110,6 +1347,7 @@ RtlPrefixUnicodeString RtlPrepareForProcessCloning RtlProcessFlsData RtlProtectHeap +RtlPublishWnfStateData RtlPushFrame RtlQueryActivationContextApplicationSettings RtlQueryAtomInAtomTable @@ -1120,40 +1358,61 @@ RtlQueryElevationFlags RtlQueryEnvironmentVariable RtlQueryEnvironmentVariable_U RtlQueryHeapInformation +RtlQueryImageMitigationPolicy RtlQueryInformationAcl RtlQueryInformationActivationContext RtlQueryInformationActiveActivationContext RtlQueryInterfaceMemoryStream RtlQueryModuleInformation +RtlQueryPackageClaims +RtlQueryPackageIdentity +RtlQueryPackageIdentityEx RtlQueryPerformanceCounter RtlQueryPerformanceFrequency RtlQueryProcessBackTraceInformation RtlQueryProcessDebugInformation RtlQueryProcessHeapInformation RtlQueryProcessLockInformation +RtlQueryProcessPlaceholderCompatibilityMode +RtlQueryProtectedPolicy +RtlQueryRegistryValueWithFallback RtlQueryRegistryValues +RtlQueryRegistryValuesEx +RtlQueryResourcePolicy RtlQuerySecurityObject RtlQueryTagHeap +RtlQueryThreadPlaceholderCompatibilityMode RtlQueryThreadProfiling RtlQueryTimeZoneInformation +RtlQueryTokenHostIdAsUlong64 RtlQueryUmsThreadInformation +RtlQueryUnbiasedInterruptTime +RtlQueryValidationRunlevel +RtlQueryWnfMetaNotification +RtlQueryWnfStateData +RtlQueryWnfStateDataWithExplicitScope RtlQueueApcWow64Thread RtlQueueWorkItem +RtlRaiseCustomSystemEventTrigger RtlRaiseException RtlRaiseStatus RtlRandom RtlRandomEx +RtlRbInsertNodeEx +RtlRbRemoveNode RtlReAllocateHeap RtlReadMemoryStream RtlReadOutOfProcessMemoryStream RtlReadThreadProfilingData RtlRealPredecessor RtlRealSuccessor +RtlRegisterForWnfMetaNotification RtlRegisterSecureMemoryCacheCallback RtlRegisterThreadWithCsrss RtlRegisterWait RtlReleaseActivationContext RtlReleaseMemoryStream +RtlReleasePath RtlReleasePebLock RtlReleasePrivilege RtlReleaseRelativeName @@ -1166,14 +1425,20 @@ RtlRemovePrivileges RtlRemoveVectoredContinueHandler RtlRemoveVectoredExceptionHandler RtlReplaceSidInSd +RtlReplaceSystemDirectoryInPath RtlReportException +RtlReportExceptionEx RtlReportSilentProcessExit RtlReportSqmEscalation RtlResetMemoryBlockLookaside RtlResetMemoryZone +RtlResetNtUserPfn RtlResetRtlTranslations +RtlRestoreBootStatusDefaults RtlRestoreContext RtlRestoreLastWin32Error +RtlRestoreSystemBootStatusDefaults +RtlRestoreThreadPreferredUILanguages RtlRetrieveNtUserPfn RtlRevertMemoryStream RtlRunDecodeUnicodeString @@ -1189,8 +1454,12 @@ RtlSelfRelativeToAbsoluteSD RtlSelfRelativeToAbsoluteSD2 RtlSendMsgToSm RtlSetAllBits +RtlSetAllBitsEx RtlSetAttributesSecurityDescriptor +RtlSetBit +RtlSetBitEx RtlSetBits +RtlSetBitsEx RtlSetControlSecurityDescriptor RtlSetCriticalSectionSpinCount RtlSetCurrentDirectory_U @@ -1204,23 +1473,35 @@ RtlSetEnvironmentVariable RtlSetExtendedFeaturesMask RtlSetGroupSecurityDescriptor RtlSetHeapInformation +RtlSetImageMitigationPolicy RtlSetInformationAcl RtlSetIoCompletionCallback RtlSetLastWin32Error RtlSetLastWin32ErrorAndNtStatusFromNtStatus RtlSetMemoryStreamSize RtlSetOwnerSecurityDescriptor +RtlSetPortableOperatingSystem RtlSetProcessDebugInformation RtlSetProcessIsCritical +RtlSetProcessPlaceholderCompatibilityMode RtlSetProcessPreferredUILanguages +RtlSetProtectedPolicy +RtlSetProxiedProcessId RtlSetSaclSecurityDescriptor +RtlSetSearchPathMode RtlSetSecurityDescriptorRMControl RtlSetSecurityObject RtlSetSecurityObjectEx +RtlSetSystemBootStatus +RtlSetSystemBootStatusEx RtlSetThreadErrorMode RtlSetThreadIsCritical +RtlSetThreadPlaceholderCompatibilityMode RtlSetThreadPoolStartFunc RtlSetThreadPreferredUILanguages +RtlSetThreadPreferredUILanguages2 +RtlSetThreadSubProcessTag +RtlSetThreadWorkOnBehalfTicket RtlSetTimeZoneInformation RtlSetTimer RtlSetUmsThreadInformation @@ -1229,6 +1510,7 @@ RtlSetUnicodeCallouts RtlSetUserFlagsHeap RtlSetUserValueHeap RtlSidDominates +RtlSidDominatesForTrust RtlSidEqualLevel RtlSidHashInitialize RtlSidHashLookup @@ -1240,12 +1522,19 @@ RtlSplay RtlStartRXact RtlStatMemoryStream RtlStringFromGUID +RtlStringFromGUIDEx +RtlStronglyEnumerateEntryHashTable RtlSubAuthorityCountSid RtlSubAuthoritySid +RtlSubscribeWnfStateChangeNotification RtlSubtreePredecessor RtlSubtreeSuccessor +RtlSwitchedVVI RtlSystemTimeToLocalTime +RtlTestAndPublishWnfStateData RtlTestBit +RtlTestBitEx +RtlTestProtectedAccess RtlTimeFieldsToTime RtlTimeToElapsedTimeFields RtlTimeToSecondsSince1970 @@ -1262,8 +1551,11 @@ RtlTraceDatabaseValidate RtlTryAcquirePebLock RtlTryAcquireSRWLockExclusive RtlTryAcquireSRWLockShared +RtlTryConvertSRWLockSharedToExclusiveOrRelease RtlTryEnterCriticalSection +RtlUTF8StringToUnicodeString RtlUTF8ToUnicodeN +RtlUdiv128 RtlUmsThreadYield RtlUnhandledExceptionFilter RtlUnhandledExceptionFilter2 @@ -1273,6 +1565,7 @@ RtlUnicodeStringToCountedOemString RtlUnicodeStringToInteger RtlUnicodeStringToOemSize RtlUnicodeStringToOemString +RtlUnicodeStringToUTF8String RtlUnicodeToCustomCPN RtlUnicodeToMultiByteN RtlUnicodeToMultiByteSize @@ -1286,6 +1579,9 @@ RtlUnlockMemoryBlockLookaside RtlUnlockMemoryStreamRegion RtlUnlockMemoryZone RtlUnlockModuleSection +RtlUnsubscribeWnfNotificationWaitForCompletion +RtlUnsubscribeWnfNotificationWithCompletionCallback +RtlUnsubscribeWnfStateChangeNotification RtlUnwind RtlUnwindEx RtlUpcaseUnicodeChar @@ -1302,31 +1598,56 @@ RtlUpdateTimer RtlUpperChar RtlUpperString RtlUsageHeap +RtlUserFiberStart RtlUserThreadStart RtlValidAcl +RtlValidProcessProtection RtlValidRelativeSecurityDescriptor RtlValidSecurityDescriptor RtlValidSid +RtlValidateCorrelationVector RtlValidateHeap RtlValidateProcessHeaps RtlValidateUnicodeString RtlVerifyVersionInfo RtlVirtualUnwind +RtlWaitForWnfMetaNotification +RtlWaitOnAddress +RtlWakeAddressAll +RtlWakeAddressAllNoFence +RtlWakeAddressSingle +RtlWakeAddressSingleNoFence RtlWakeAllConditionVariable RtlWakeConditionVariable RtlWalkFrameChain RtlWalkHeap RtlWeaklyEnumerateEntryHashTable RtlWerpReportException +RtlWnfCompareChangeStamp +RtlWnfDllUnloadCallback RtlWow64CallFunction64 RtlWow64EnableFsRedirection RtlWow64EnableFsRedirectionEx +RtlWow64GetCpuAreaInfo +RtlWow64GetCurrentCpuArea +RtlWow64GetCurrentMachine +RtlWow64GetEquivalentMachineCHPE +RtlWow64GetProcessMachines +RtlWow64GetSharedInfoProcess RtlWow64GetThreadContext RtlWow64GetThreadSelectorEntry +RtlWow64IsWowGuestMachineSupported RtlWow64LogMessageInEventLogger +RtlWow64PopAllCrossProcessWorkFromWorkList +RtlWow64PopCrossProcessWorkFromFreeList +RtlWow64PushCrossProcessWorkOntoFreeList +RtlWow64PushCrossProcessWorkOntoWorkList +RtlWow64RequestCrossProcessHeavyFlush RtlWow64SetThreadContext +RtlWow64SuspendProcess RtlWow64SuspendThread RtlWriteMemoryStream +RtlWriteNonVolatileMemory RtlWriteRegistryValue RtlZeroHeap RtlZeroMemory @@ -1334,11 +1655,15 @@ RtlZombifyActivationContext RtlpApplyLengthFunction RtlpCheckDynamicTimeZoneInformation RtlpCleanupRegistryKeys +RtlpConvertAbsoluteToRelativeSecurityAttribute RtlpConvertCultureNamesToLCIDs RtlpConvertLCIDsToCultureNames +RtlpConvertRelativeToAbsoluteSecurityAttribute RtlpCreateProcessRegistryInfo RtlpEnsureBufferSize RtlpExecuteUmsThread +RtlpFreezeTimeBias +RtlpGetDeviceFamilyInfoEnum RtlpGetLCIDFromLangInfoNode RtlpGetNameFromLangInfoNode RtlpGetSystemDefaultUILanguage @@ -1347,6 +1672,7 @@ RtlpInitializeLangRegistryInfo RtlpIsQualifiedLanguage RtlpLoadMachineUIByPolicy RtlpLoadUserUIByPolicy +RtlpMergeSecurityAttributeInformation RtlpMuiFreeLangRegistryInfo RtlpMuiRegCreateRegistryInfo RtlpMuiRegFreeRegistryInfo @@ -1360,15 +1686,21 @@ RtlpNtQueryValueKey RtlpNtSetValueKey RtlpQueryDefaultUILanguage RtlpQueryProcessDebugInformationFromWow64 +RtlpQueryProcessDebugInformationRemote RtlpRefreshCachedUILanguage RtlpSetInstallLanguage RtlpSetPreferredUILanguages RtlpSetUserPreferredUILanguages +RtlpTimeFieldsToTime +RtlpTimeToTimeFields RtlpUmsExecuteYieldThreadEnd RtlpUmsThreadYield RtlpUnWaitCriticalSection RtlpVerifyAndCommitUILanguageSettings RtlpWaitForCriticalSection +RtlpWow64CtxFromAmd64 +RtlpWow64GetContextOnAmd64 +RtlpWow64SetContextOnAmd64 RtlxAnsiStringToUnicodeSize RtlxOemStringToUnicodeSize RtlxUnicodeStringToAnsiSize @@ -1383,17 +1715,21 @@ TpAllocAlpcCompletion TpAllocAlpcCompletionEx TpAllocCleanupGroup TpAllocIoCompletion +TpAllocJobNotification TpAllocPool TpAllocTimer TpAllocWait TpAllocWork TpAlpcRegisterCompletionList TpAlpcUnregisterCompletionList +TpCallbackDetectedUnrecoverableError TpCallbackIndependent TpCallbackLeaveCriticalSectionOnCompletion TpCallbackMayRunLong TpCallbackReleaseMutexOnCompletion TpCallbackReleaseSemaphoreOnCompletion +TpCallbackSendAlpcMessageOnCompletion +TpCallbackSendPendingAlpcMessage TpCallbackSetEventOnCompletion TpCallbackUnloadDllOnCompletion TpCancelAsyncIoOperation @@ -1412,6 +1748,7 @@ TpReleaseAlpcCompletion TpReleaseCleanupGroup TpReleaseCleanupGroupMembers TpReleaseIoCompletion +TpReleaseJobNotification TpReleasePool TpReleaseTimer TpReleaseWait @@ -1419,18 +1756,28 @@ TpReleaseWork TpSetDefaultPoolMaxThreads TpSetDefaultPoolStackInformation TpSetPoolMaxThreads +TpSetPoolMaxThreadsSoftLimit TpSetPoolMinThreads TpSetPoolStackInformation +TpSetPoolThreadBasePriority +TpSetPoolThreadCpuSets +TpSetPoolWorkerThreadIdleTimeout TpSetTimer +TpSetTimerEx TpSetWait +TpSetWaitEx TpSimpleTryPost TpStartAsyncIoOperation +TpTimerOutstandingCallbackCount +TpTrimPools TpWaitForAlpcCompletion TpWaitForIoCompletion +TpWaitForJobNotification TpWaitForTimer TpWaitForWait TpWaitForWork VerSetConditionMask +WerReportExceptionWorker WerReportSQMEvent WinSqmAddToAverageDWORD WinSqmAddToStream @@ -1452,6 +1799,7 @@ WinSqmGetInstrumentationProperty WinSqmIncrementDWORD WinSqmIsOptedIn WinSqmIsOptedInEx +WinSqmIsSessionDisabled WinSqmSetDWORD WinSqmSetDWORD64 WinSqmSetEscalationInfo @@ -1459,6 +1807,8 @@ WinSqmSetIfMaxDWORD WinSqmSetIfMinDWORD WinSqmSetString WinSqmStartSession +WinSqmStartSessionForPartner +WinSqmStartSqmOptinListener ZwAcceptConnectPort ZwAccessCheck ZwAccessCheckAndAuditAlarm @@ -1467,21 +1817,28 @@ ZwAccessCheckByTypeAndAuditAlarm ZwAccessCheckByTypeResultList ZwAccessCheckByTypeResultListAndAuditAlarm ZwAccessCheckByTypeResultListAndAuditAlarmByHandle +ZwAcquireProcessActivityReference ZwAddAtom +ZwAddAtomEx ZwAddBootEntry ZwAddDriverEntry ZwAdjustGroupsToken ZwAdjustPrivilegesToken +ZwAdjustTokenClaimsAndDeviceGroups ZwAlertResumeThread ZwAlertThread +ZwAlertThreadByThreadId ZwAllocateLocallyUniqueId ZwAllocateReserveObject ZwAllocateUserPhysicalPages +ZwAllocateUserPhysicalPagesEx ZwAllocateUuids ZwAllocateVirtualMemory +ZwAllocateVirtualMemoryEx ZwAlpcAcceptConnectPort ZwAlpcCancelMessage ZwAlpcConnectPort +ZwAlpcConnectPortEx ZwAlpcCreatePort ZwAlpcCreatePortSection ZwAlpcCreateResourceReserve @@ -1492,6 +1849,7 @@ ZwAlpcDeleteResourceReserve ZwAlpcDeleteSectionView ZwAlpcDeleteSecurityContext ZwAlpcDisconnectPort +ZwAlpcImpersonateClientContainerOfPort ZwAlpcImpersonateClientOfPort ZwAlpcOpenSenderProcess ZwAlpcOpenSenderThread @@ -1503,58 +1861,78 @@ ZwAlpcSetInformation ZwApphelpCacheControl ZwAreMappedFilesTheSame ZwAssignProcessToJobObject +ZwAssociateWaitCompletionPacket +ZwCallEnclave ZwCallbackReturn ZwCancelDeviceWakeupRequest ZwCancelIoFile ZwCancelIoFileEx ZwCancelSynchronousIoFile ZwCancelTimer +ZwCancelTimer2 +ZwCancelWaitCompletionPacket ZwClearEvent ZwClose ZwCloseObjectAuditAlarm ZwCommitComplete ZwCommitEnlistment +ZwCommitRegistryTransaction ZwCommitTransaction ZwCompactKeys +ZwCompareObjects +ZwCompareSigningLevels ZwCompareTokens ZwCompleteConnectPort ZwCompressKey ZwConnectPort ZwContinue +ZwConvertBetweenAuxiliaryCounterAndPerformanceCounter +ZwCreateCrossVmEvent ZwCreateDebugObject ZwCreateDirectoryObject +ZwCreateDirectoryObjectEx +ZwCreateEnclave ZwCreateEnlistment ZwCreateEvent ZwCreateEventPair ZwCreateFile +ZwCreateIRTimer ZwCreateIoCompletion ZwCreateJobObject ZwCreateJobSet ZwCreateKey ZwCreateKeyTransacted ZwCreateKeyedEvent +ZwCreateLowBoxToken ZwCreateMailslotFile ZwCreateMutant ZwCreateNamedPipeFile ZwCreatePagingFile +ZwCreatePartition ZwCreatePort ZwCreatePrivateNamespace ZwCreateProcess ZwCreateProcessEx ZwCreateProfile ZwCreateProfileEx +ZwCreateRegistryTransaction ZwCreateResourceManager ZwCreateSection +ZwCreateSectionEx ZwCreateSemaphore ZwCreateSymbolicLinkObject ZwCreateThread ZwCreateThreadEx ZwCreateTimer +ZwCreateTimer2 ZwCreateToken +ZwCreateTokenEx ZwCreateTransaction ZwCreateTransactionManager ZwCreateUserProcess +ZwCreateWaitCompletionPacket ZwCreateWaitablePort +ZwCreateWnfStateName ZwCreateWorkerFactory ZwDebugActiveProcess ZwDebugContinue @@ -1567,6 +1945,8 @@ ZwDeleteKey ZwDeleteObjectAuditAlarm ZwDeletePrivateNamespace ZwDeleteValueKey +ZwDeleteWnfStateData +ZwDeleteWnfStateName ZwDeviceIoControlFile ZwDisableLastKnownGood ZwDisplayString @@ -1581,9 +1961,12 @@ ZwEnumerateSystemEnvironmentValuesEx ZwEnumerateTransactionObject ZwEnumerateValueKey ZwExtendSection +ZwFilterBootOption ZwFilterToken +ZwFilterTokenEx ZwFindAtom ZwFlushBuffersFile +ZwFlushBuffersFileEx ZwFlushInstallUILanguage ZwFlushInstructionCache ZwFlushKey @@ -1595,8 +1978,11 @@ ZwFreeVirtualMemory ZwFreezeRegistry ZwFreezeTransactions ZwFsControlFile +ZwGetCachedSigningLevel +ZwGetCompleteWnfStateSubscription ZwGetContextThread ZwGetCurrentProcessorNumber +ZwGetCurrentProcessorNumberEx ZwGetDevicePowerState ZwGetMUIRegistryInfo ZwGetNextProcess @@ -1608,6 +1994,7 @@ ZwGetWriteWatch ZwImpersonateAnonymousToken ZwImpersonateClientOfPort ZwImpersonateThread +ZwInitializeEnclave ZwInitializeNlsFiles ZwInitializeRegistry ZwInitiatePowerAction @@ -1616,6 +2003,7 @@ ZwIsSystemResumeAutomatic ZwIsUILanguageComitted ZwListenPort ZwLoadDriver +ZwLoadEnclaveData ZwLoadKey ZwLoadKey2 ZwLoadKeyEx @@ -1625,13 +2013,17 @@ ZwLockRegistryKey ZwLockVirtualMemory ZwMakePermanentObject ZwMakeTemporaryObject +ZwManageHotPatch +ZwManagePartition ZwMapCMFModule ZwMapUserPhysicalPages ZwMapUserPhysicalPagesScatter ZwMapViewOfSection +ZwMapViewOfSectionEx ZwModifyBootEntry ZwModifyDriverEntry ZwNotifyChangeDirectoryFile +ZwNotifyChangeDirectoryFileEx ZwNotifyChangeKey ZwNotifyChangeMultipleKeys ZwNotifyChangeSession @@ -1649,10 +2041,12 @@ ZwOpenKeyTransactedEx ZwOpenKeyedEvent ZwOpenMutant ZwOpenObjectAuditAlarm +ZwOpenPartition ZwOpenPrivateNamespace ZwOpenProcess ZwOpenProcessToken ZwOpenProcessTokenEx +ZwOpenRegistryTransaction ZwOpenResourceManager ZwOpenSection ZwOpenSemaphore @@ -1676,20 +2070,24 @@ ZwPrivilegedServiceAuditAlarm ZwPropagationComplete ZwPropagationFailed ZwProtectVirtualMemory +ZwPssCaptureVaSpaceBulk ZwPulseEvent ZwQueryAttributesFile +ZwQueryAuxiliaryCounterFrequency ZwQueryBootEntryOrder ZwQueryBootOptions ZwQueryDebugFilterState ZwQueryDefaultLocale ZwQueryDefaultUILanguage ZwQueryDirectoryFile +ZwQueryDirectoryFileEx ZwQueryDirectoryObject ZwQueryDriverEntryOrder ZwQueryEaFile ZwQueryEvent ZwQueryFullAttributesFile ZwQueryInformationAtom +ZwQueryInformationByName ZwQueryInformationEnlistment ZwQueryInformationFile ZwQueryInformationJobObject @@ -1717,6 +2115,7 @@ ZwQueryQuotaInformationFile ZwQuerySection ZwQuerySecurityAttributesToken ZwQuerySecurityObject +ZwQuerySecurityPolicy ZwQuerySemaphore ZwQuerySymbolicLinkObject ZwQuerySystemEnvironmentValue @@ -1729,6 +2128,8 @@ ZwQueryTimerResolution ZwQueryValueKey ZwQueryVirtualMemory ZwQueryVolumeInformationFile +ZwQueryWnfStateData +ZwQueryWnfStateNameInformation ZwQueueApcThread ZwQueueApcThreadEx ZwRaiseException @@ -1767,8 +2168,10 @@ ZwResetWriteWatch ZwRestoreKey ZwResumeProcess ZwResumeThread +ZwRevertContainerImpersonation ZwRollbackComplete ZwRollbackEnlistment +ZwRollbackRegistryTransaction ZwRollbackTransaction ZwRollforwardTransactionManager ZwSaveKey @@ -1778,6 +2181,8 @@ ZwSecureConnectPort ZwSerializeBoot ZwSetBootEntryOrder ZwSetBootOptions +ZwSetCachedSigningLevel +ZwSetCachedSigningLevel2 ZwSetContextThread ZwSetDebugFilterState ZwSetDefaultHardErrorPort @@ -1789,6 +2194,7 @@ ZwSetEvent ZwSetEventBoostPriority ZwSetHighEventPair ZwSetHighWaitLowEventPair +ZwSetIRTimer ZwSetInformationDebugObject ZwSetInformationEnlistment ZwSetInformationFile @@ -1797,10 +2203,12 @@ ZwSetInformationKey ZwSetInformationObject ZwSetInformationProcess ZwSetInformationResourceManager +ZwSetInformationSymbolicLink ZwSetInformationThread ZwSetInformationToken ZwSetInformationTransaction ZwSetInformationTransactionManager +ZwSetInformationVirtualMemory ZwSetInformationWorkerFactory ZwSetIntervalProfile ZwSetIoCompletion @@ -1817,20 +2225,24 @@ ZwSetSystemPowerState ZwSetSystemTime ZwSetThreadExecutionState ZwSetTimer +ZwSetTimer2 ZwSetTimerEx ZwSetTimerResolution ZwSetUuidSeed ZwSetValueKey ZwSetVolumeInformationFile +ZwSetWnfProcessNotificationEvent ZwShutdownSystem ZwShutdownWorkerFactory ZwSignalAndWaitForSingleObject ZwSinglePhaseReject ZwStartProfile ZwStopProfile +ZwSubscribeWnfStateChange ZwSuspendProcess ZwSuspendThread ZwSystemDebugControl +ZwTerminateEnclave ZwTerminateJobObject ZwTerminateProcess ZwTerminateThread @@ -1848,7 +2260,11 @@ ZwUnloadKeyEx ZwUnlockFile ZwUnlockVirtualMemory ZwUnmapViewOfSection +ZwUnmapViewOfSectionEx +ZwUnsubscribeWnfStateChange +ZwUpdateWnfStateData ZwVdmControl +ZwWaitForAlertByThreadId ZwWaitForDebugEvent ZwWaitForKeyedEvent ZwWaitForMultipleObjects @@ -1863,175 +2279,3 @@ ZwWriteFileGather ZwWriteRequestData ZwWriteVirtualMemory ZwYieldExecution -__C_specific_handler -;__chkstk -__isascii -__iscsym -__iscsymf -__misaligned_access -__toascii -_atoi64 -_fltused DATA -_i64toa -_i64toa_s -_i64tow -_i64tow_s -_itoa -_itoa_s -_itow -_itow_s -_lfind -_local_unwind -_ltoa -_ltoa_s -_ltow -_ltow_s -_makepath_s -_memccpy -_memicmp -_setjmp -_setjmpex -_snprintf -_snprintf_s -_snscanf_s -_snwprintf -_snwprintf_s -_snwscanf_s -_splitpath -_splitpath_s -_strcmpi -_stricmp -_strlwr -_strnicmp -_strnset_s -_strset_s -_strupr -_tolower -_toupper -_swprintf -_ui64toa -_ui64toa_s -_ui64tow -_ui64tow_s -_ultoa -_ultoa_s -_ultow -_ultow_s -_vscwprintf -_vsnprintf -_vsnprintf_s -_vsnwprintf -_vsnwprintf_s -_vswprintf -_wcsicmp -_wcslwr -_wcsnicmp -_wcsnset_s -_wcsset_s -_wcstoui64 -_wcsupr -_wmakepath_s -_wsplitpath_s -_wtoi -_wtoi64 -_wtol -abs -atan DATA -atoi -atol -bsearch -ceil -cos DATA -fabs DATA -floor DATA -isalnum -isalpha -iscntrl -isdigit -isgraph -islower -isprint -ispunct -isspace -isupper -iswalpha -iswctype -iswdigit -iswlower -iswspace -iswxdigit -isxdigit -labs -log -longjmp DATA -mbstowcs -memchr -memcmp -memcpy -memcpy_s -memmove -memmove_s -memset -pow -qsort -sin -sprintf -sprintf_s -sqrt -sscanf -sscanf_s -strcat -strcat_s -strchr -strcmp -strcpy -strcpy_s -strcspn -strlen -strncat -strncat_s -strncmp -strncpy -strncpy_s -strnlen -strpbrk -strrchr -strspn -strstr -strtok_s -strtol -strtoul -swprintf -swprintf_s -swscanf_s -tan -tolower -toupper -towlower -towupper -vDbgPrintEx -vDbgPrintExWithPrefix -vsprintf -vsprintf_s -vswprintf_s -wcscat -wcscat_s -wcschr -wcscmp -wcscpy -wcscpy_s -wcscspn -wcslen -wcsncat -wcsncat_s -wcsncmp -wcsncpy -wcsncpy_s -wcsnlen -wcspbrk -wcsrchr -wcsspn -wcsstr -wcstol -wcstombs -wcstoul diff --git a/lib/libc/mingw/libarm32/ntdll.def b/lib/libc/mingw/libarm32/ntdll.def index 13099a9792..54abcf6212 100644 --- a/lib/libc/mingw/libarm32/ntdll.def +++ b/lib/libc/mingw/libarm32/ntdll.def @@ -32,6 +32,7 @@ AlpcRundownCompletionList AlpcUnregisterCompletionList AlpcUnregisterCompletionListWorkerThread ApiSetQueryApiSetPresence +ApiSetQueryApiSetPresenceEx CsrAllocateCaptureBuffer CsrAllocateMessagePointer CsrCaptureMessageBuffer @@ -55,6 +56,7 @@ DbgSetDebugFilterState DbgUiConnectToDbg DbgUiContinue DbgUiConvertStateChangeStructure +DbgUiConvertStateChangeStructureEx DbgUiDebugActiveProcess DbgUiGetThreadDebugObject DbgUiIssueRemoteBreakin @@ -63,6 +65,7 @@ DbgUiSetThreadDebugObject DbgUiStopDebugging DbgUiWaitStateChange DbgUserBreakPoint +EtwCheckCoverage EtwCreateTraceInstanceId EtwDeliverDataBlock EtwEnumerateProcessRegGuids @@ -108,6 +111,7 @@ ExpInterlockedPopEntrySListResume KiRaiseUserExceptionDispatcher KiUserApcDispatcher KiUserCallbackDispatcher +KiUserCallbackDispatcherReturn KiUserExceptionDispatcher KiUserInvertedFunctionTable DATA LdrAccessResource @@ -115,9 +119,14 @@ LdrAddDllDirectory LdrAddLoadAsDataTable LdrAddRefDll LdrAppxHandleIntegrityFailure +LdrCallEnclave +LdrControlFlowGuardEnforced +LdrCreateEnclave +LdrDeleteEnclave LdrDisableThreadCalloutsForDll LdrEnumResources LdrEnumerateLoadedModules +LdrFastFailInLoaderCallout LdrFindEntryForAddress LdrFindResourceDirectory_U LdrFindResourceEx_U @@ -132,16 +141,21 @@ LdrGetDllHandleEx LdrGetDllPath LdrGetFailureData LdrGetFileNameFromLoadAsDataTable +LdrGetKnownDllSectionHandle LdrGetProcedureAddress LdrGetProcedureAddressEx LdrGetProcedureAddressForCaller LdrInitShimEngineDynamic +LdrInitializeEnclave LdrInitializeThunk +LdrIsModuleSxsRedirected LdrLoadAlternateResourceModule LdrLoadAlternateResourceModuleEx LdrLoadDll +LdrLoadEnclaveModule LdrLockLoaderLock LdrOpenImageFileOptionsKey +LdrProcessInitializationComplete LdrProcessRelocationBlock LdrProcessRelocationBlockEx LdrQueryImageFileExecutionOptions @@ -176,6 +190,7 @@ LdrUnloadAlternateResourceModuleEx LdrUnloadDll LdrUnlockLoaderLock LdrUnregisterDllNotification +LdrUpdatePackageSearchPath LdrVerifyImageMatchesChecksum LdrVerifyImageMatchesChecksumEx LdrpResGetMappingSize @@ -197,6 +212,7 @@ NtAccessCheckByTypeAndAuditAlarm NtAccessCheckByTypeResultList NtAccessCheckByTypeResultListAndAuditAlarm NtAccessCheckByTypeResultListAndAuditAlarmByHandle +NtAcquireProcessActivityReference NtAddAtom NtAddAtomEx NtAddBootEntry @@ -210,8 +226,10 @@ NtAlertThreadByThreadId NtAllocateLocallyUniqueId NtAllocateReserveObject NtAllocateUserPhysicalPages +NtAllocateUserPhysicalPagesEx NtAllocateUuids NtAllocateVirtualMemory +NtAllocateVirtualMemoryEx NtAlpcAcceptConnectPort NtAlpcCancelMessage NtAlpcConnectPort @@ -226,6 +244,7 @@ NtAlpcDeleteResourceReserve NtAlpcDeleteSectionView NtAlpcDeleteSecurityContext NtAlpcDisconnectPort +NtAlpcImpersonateClientContainerOfPort NtAlpcImpersonateClientOfPort NtAlpcOpenSenderProcess NtAlpcOpenSenderThread @@ -238,6 +257,7 @@ NtApphelpCacheControl NtAreMappedFilesTheSame NtAssignProcessToJobObject NtAssociateWaitCompletionPacket +NtCallEnclave NtCallbackReturn NtCancelIoFile NtCancelIoFileEx @@ -250,16 +270,22 @@ NtClose NtCloseObjectAuditAlarm NtCommitComplete NtCommitEnlistment +NtCommitRegistryTransaction NtCommitTransaction NtCompactKeys +NtCompareObjects +NtCompareSigningLevels NtCompareTokens NtCompleteConnectPort NtCompressKey NtConnectPort NtContinue +NtConvertBetweenAuxiliaryCounterAndPerformanceCounter +NtCreateCrossVmEvent NtCreateDebugObject NtCreateDirectoryObject NtCreateDirectoryObjectEx +NtCreateEnclave NtCreateEnlistment NtCreateEvent NtCreateEventPair @@ -276,14 +302,17 @@ NtCreateMailslotFile NtCreateMutant NtCreateNamedPipeFile NtCreatePagingFile +NtCreatePartition NtCreatePort NtCreatePrivateNamespace NtCreateProcess NtCreateProcessEx NtCreateProfile NtCreateProfileEx +NtCreateRegistryTransaction NtCreateResourceManager NtCreateSection +NtCreateSectionEx NtCreateSemaphore NtCreateSymbolicLinkObject NtCreateThread @@ -347,6 +376,7 @@ NtGetCachedSigningLevel NtGetCompleteWnfStateSubscription NtGetContextThread NtGetCurrentProcessorNumber +NtGetCurrentProcessorNumberEx NtGetDevicePowerState NtGetMUIRegistryInfo NtGetNextProcess @@ -358,6 +388,7 @@ NtGetWriteWatch NtImpersonateAnonymousToken NtImpersonateClientOfPort NtImpersonateThread +NtInitializeEnclave NtInitializeNlsFiles NtInitializeRegistry NtInitiatePowerAction @@ -366,6 +397,7 @@ NtIsSystemResumeAutomatic NtIsUILanguageComitted NtListenPort NtLoadDriver +NtLoadEnclaveData NtLoadKey NtLoadKey2 NtLoadKeyEx @@ -375,13 +407,17 @@ NtLockRegistryKey NtLockVirtualMemory NtMakePermanentObject NtMakeTemporaryObject +NtManageHotPatch +NtManagePartition NtMapCMFModule NtMapUserPhysicalPages NtMapUserPhysicalPagesScatter NtMapViewOfSection +NtMapViewOfSectionEx NtModifyBootEntry NtModifyDriverEntry NtNotifyChangeDirectoryFile +NtNotifyChangeDirectoryFileEx NtNotifyChangeKey NtNotifyChangeMultipleKeys NtNotifyChangeSession @@ -399,10 +435,12 @@ NtOpenKeyTransactedEx NtOpenKeyedEvent NtOpenMutant NtOpenObjectAuditAlarm +NtOpenPartition NtOpenPrivateNamespace NtOpenProcess NtOpenProcessToken NtOpenProcessTokenEx +NtOpenRegistryTransaction NtOpenResourceManager NtOpenSection NtOpenSemaphore @@ -426,20 +464,24 @@ NtPrivilegedServiceAuditAlarm NtPropagationComplete NtPropagationFailed NtProtectVirtualMemory +NtPssCaptureVaSpaceBulk NtPulseEvent NtQueryAttributesFile +NtQueryAuxiliaryCounterFrequency NtQueryBootEntryOrder NtQueryBootOptions NtQueryDebugFilterState NtQueryDefaultLocale NtQueryDefaultUILanguage NtQueryDirectoryFile +NtQueryDirectoryFileEx NtQueryDirectoryObject NtQueryDriverEntryOrder NtQueryEaFile NtQueryEvent NtQueryFullAttributesFile NtQueryInformationAtom +NtQueryInformationByName NtQueryInformationEnlistment NtQueryInformationFile NtQueryInformationJobObject @@ -467,6 +509,7 @@ NtQueryQuotaInformationFile NtQuerySection NtQuerySecurityAttributesToken NtQuerySecurityObject +NtQuerySecurityPolicy NtQuerySemaphore NtQuerySymbolicLinkObject NtQuerySystemEnvironmentValue @@ -517,8 +560,10 @@ NtResetWriteWatch NtRestoreKey NtResumeProcess NtResumeThread +NtRevertContainerImpersonation NtRollbackComplete NtRollbackEnlistment +NtRollbackRegistryTransaction NtRollbackTransaction NtRollforwardTransactionManager NtSaveKey @@ -529,6 +574,7 @@ NtSerializeBoot NtSetBootEntryOrder NtSetBootOptions NtSetCachedSigningLevel +NtSetCachedSigningLevel2 NtSetContextThread NtSetDebugFilterState NtSetDefaultHardErrorPort @@ -549,6 +595,7 @@ NtSetInformationKey NtSetInformationObject NtSetInformationProcess NtSetInformationResourceManager +NtSetInformationSymbolicLink NtSetInformationThread NtSetInformationToken NtSetInformationTransaction @@ -587,6 +634,7 @@ NtSubscribeWnfStateChange NtSuspendProcess NtSuspendThread NtSystemDebugControl +NtTerminateEnclave NtTerminateJobObject NtTerminateProcess NtTerminateThread @@ -658,6 +706,7 @@ RtlAddAccessAllowedObjectAce RtlAddAccessDeniedAce RtlAddAccessDeniedAceEx RtlAddAccessDeniedObjectAce +RtlAddAccessFilterAce RtlAddAce RtlAddActionToRXact RtlAddAtomToAtomTable @@ -703,7 +752,9 @@ RtlAppxIsFileOwnedByTrustedInstaller RtlAreAllAccessesGranted RtlAreAnyAccessesGranted RtlAreBitsClear +RtlAreBitsClearEx RtlAreBitsSet +RtlAreLongPathsEnabled RtlAssert RtlAvlInsertNodeEx RtlAvlRemoveNode @@ -711,19 +762,28 @@ RtlBarrier RtlBarrierForDelete RtlCancelTimer RtlCanonicalizeDomainName +RtlCapabilityCheck +RtlCapabilityCheckForSingleSessionSku RtlCaptureContext RtlCaptureStackBackTrace RtlCharToInteger +RtlCheckBootStatusIntegrity RtlCheckForOrphanedCriticalSections RtlCheckPortableOperatingSystem RtlCheckRegistryKey +RtlCheckSandboxedToken +RtlCheckSystemBootStatusIntegrity RtlCheckTokenCapability RtlCheckTokenMembership RtlCheckTokenMembershipEx RtlCleanUpTEBLangLists RtlClearAllBits +RtlClearAllBitsEx RtlClearBit +RtlClearBitEx RtlClearBits +RtlClearBitsEx +RtlClearThreadWorkOnBehalfTicket RtlCloneMemoryStream RtlCloneUserProcess RtlCmDecodeMemIoResource @@ -737,15 +797,19 @@ RtlCompareMemoryUlong RtlCompareString RtlCompareUnicodeString RtlCompareUnicodeStrings +RtlCompleteProcessCloning RtlCompressBuffer RtlComputeCrc32 RtlComputeImportTableHash RtlComputePrivatizedDllName_U RtlConnectToSm RtlConsoleMultiByteToUnicodeN +RtlConstructCrossVmEventPath RtlContractHashTable +RtlConvertDeviceFamilyInfoToString RtlConvertExclusiveToShared RtlConvertLCIDToString +RtlConvertSRWLockExclusiveToShared RtlConvertSharedToExclusive RtlConvertSidToUnicodeString RtlConvertToAutoInheritSecurityObject @@ -780,6 +844,7 @@ RtlCreateMemoryBlockLookaside RtlCreateMemoryZone RtlCreateProcessParameters RtlCreateProcessParametersEx +RtlCreateProcessParametersWithTemplate RtlCreateProcessReflection RtlCreateQueryDebugBuffer RtlCreateRegistryKey @@ -792,6 +857,7 @@ RtlCreateTimerQueue RtlCreateUnicodeString RtlCreateUnicodeStringFromAsciiz RtlCreateUserProcess +RtlCreateUserProcessEx RtlCreateUserSecurityObject RtlCreateUserStack RtlCreateUserThread @@ -805,6 +871,7 @@ RtlDeactivateActivationContext RtlDeactivateActivationContextUnsafeFast RtlDebugPrintTimes RtlDecodePointer +RtlDecodeRemotePointer RtlDecodeSystemPointer RtlDecompressBuffer RtlDecompressBufferEx @@ -832,6 +899,7 @@ RtlDeleteTimerQueueEx RtlDeregisterSecureMemoryCacheCallback RtlDeregisterWait RtlDeregisterWaitEx +RtlDeriveCapabilitySidsFromName RtlDestroyAtomTable RtlDestroyEnvironment RtlDestroyHandleTable @@ -846,7 +914,10 @@ RtlDisableThreadProfiling RtlDllShutdownInProgress RtlDnsHostNameToComputerName RtlDoesFileExists_U +RtlDoesNameContainWildCards RtlDosApplyFileIsolationRedirection_Ustr +RtlDosLongPathNameToNtPathName_U_WithStatus +RtlDosLongPathNameToRelativeNtPathName_U_WithStatus RtlDosPathNameToNtPathName_U RtlDosPathNameToNtPathName_U_WithStatus RtlDosPathNameToRelativeNtPathName_U @@ -855,14 +926,17 @@ RtlDosSearchPath_U RtlDosSearchPath_Ustr RtlDowncaseUnicodeChar RtlDowncaseUnicodeString +RtlDrainNonVolatileFlush RtlDumpResource RtlDuplicateUnicodeString RtlEmptyAtomTable RtlEnableEarlyCriticalSectionEventCreation RtlEnableThreadProfiling RtlEncodePointer +RtlEncodeRemotePointer RtlEncodeSystemPointer RtlEndEnumerationHashTable +RtlEndStrongEnumerationHashTable RtlEndWeakEnumerationHashTable RtlEnterCriticalSection RtlEnumProcessHeaps @@ -890,6 +964,7 @@ RtlExitUserThread RtlExpandEnvironmentStrings RtlExpandEnvironmentStrings_U RtlExpandHashTable +RtlExtendCorrelationVector RtlExtendMemoryBlockLookaside RtlExtendMemoryZone RtlExtendedMagicDivide @@ -897,6 +972,7 @@ RtlExtractBitMap RtlFillMemory RtlFillMemoryUlong RtlFillMemoryUlonglong +RtlFillNonVolatileMemory RtlFinalReleaseOutOfProcessMemoryStream RtlFindAceByType RtlFindActivationContextSectionGuid @@ -904,8 +980,10 @@ RtlFindActivationContextSectionString RtlFindCharInUnicodeString RtlFindClearBits RtlFindClearBitsAndSet +RtlFindClearBitsEx RtlFindClearRuns RtlFindClosestEncodableLength +RtlFindExportedRoutineByName RtlFindLastBackwardRunClear RtlFindLeastSignificantBit RtlFindLongestRunClear @@ -914,11 +992,18 @@ RtlFindMostSignificantBit RtlFindNextForwardRunClear RtlFindSetBits RtlFindSetBitsAndClear +RtlFindSetBitsAndClearEx +RtlFindSetBitsEx +RtlFindUnicodeSubstring RtlFirstEntrySList RtlFirstFreeAce RtlFlsAlloc RtlFlsFree +RtlFlsGetValue +RtlFlsSetValue RtlFlushHeaps +RtlFlushNonVolatileMemory +RtlFlushNonVolatileMemoryRanges RtlFlushSecureMemoryCache RtlFormatCurrentUserKeyPath RtlFormatMessage @@ -928,33 +1013,40 @@ RtlFreeAnsiString RtlFreeHandle RtlFreeHeap RtlFreeMemoryBlockLookaside +RtlFreeNonVolatileToken RtlFreeOemString RtlFreeSid RtlFreeThreadActivationContextStack +RtlFreeUTF8String RtlFreeUnicodeString RtlFreeUserStack RtlGUIDFromString RtlGenerate8dot3Name RtlGetAce RtlGetActiveActivationContext +RtlGetActiveConsoleId RtlGetAppContainerNamedObjectPath RtlGetAppContainerParent RtlGetAppContainerSidType RtlGetCallersAddress RtlGetCompressionWorkSpaceSize +RtlGetConsoleSessionForegroundProcessId RtlGetControlSecurityDescriptor RtlGetCriticalSectionRecursionCount RtlGetCurrentDirectory_U RtlGetCurrentPeb RtlGetCurrentProcessorNumber RtlGetCurrentProcessorNumberEx +RtlGetCurrentServiceSessionId RtlGetCurrentTransaction RtlGetDaclSecurityDescriptor +RtlGetDeviceFamilyInfoEnum RtlGetElementGenericTable RtlGetElementGenericTableAvl RtlGetEnabledExtendedFeatures RtlGetExePath RtlGetExtendedContextLength +RtlGetExtendedContextLength2 RtlGetExtendedFeaturesMask RtlGetFileMUIPath RtlGetFrame @@ -964,31 +1056,42 @@ RtlGetFullPathName_UstrEx RtlGetFunctionTableListHead RtlGetGroupSecurityDescriptor RtlGetIntegerAtom +RtlGetInterruptTimePrecise RtlGetLastNtStatus RtlGetLastWin32Error RtlGetLengthWithoutLastFullDosOrNtPathElement RtlGetLengthWithoutTrailingPathSeperators RtlGetLocaleFileMappingAddress RtlGetLongestNtPathLength +RtlGetMultiTimePrecise RtlGetNativeSystemInformation RtlGetNextEntryHashTable +RtlGetNonVolatileToken RtlGetNtGlobalFlags RtlGetNtProductType +RtlGetNtSystemRoot RtlGetNtVersionNumbers RtlGetOwnerSecurityDescriptor RtlGetParentLocaleName +RtlGetPersistedStateLocation RtlGetProcessHeaps RtlGetProcessPreferredUILanguages RtlGetProductInfo RtlGetSaclSecurityDescriptor RtlGetSearchPath RtlGetSecurityDescriptorRMControl +RtlGetSessionProperties RtlGetSetBootStatusData +RtlGetSuiteMask +RtlGetSystemBootStatus +RtlGetSystemBootStatusEx RtlGetSystemPreferredUILanguages RtlGetSystemTimePrecise RtlGetThreadErrorMode RtlGetThreadLangIdByIndex RtlGetThreadPreferredUILanguages +RtlGetThreadWorkOnBehalfTicket +RtlGetTokenNamedObjectPath RtlGetUILanguageInfo RtlGetUnloadEventTrace RtlGetUnloadEventTraceEx @@ -996,6 +1099,7 @@ RtlGetUserInfoHeap RtlGetUserPreferredUILanguages RtlGetVersion RtlGrowFunctionTable +RtlGuardCheckLongJumpTarget RtlHashUnicodeString RtlHeapTrkInitialize RtlIdentifierAuthoritySid @@ -1009,6 +1113,7 @@ RtlImageRvaToSection RtlImageRvaToVa RtlImpersonateSelf RtlImpersonateSelfEx +RtlIncrementCorrelationVector RtlInitAnsiString RtlInitAnsiStringEx RtlInitBarrier @@ -1018,17 +1123,24 @@ RtlInitMemoryStream RtlInitNlsTables RtlInitOutOfProcessMemoryStream RtlInitString +RtlInitStringEx +RtlInitStrongEnumerationHashTable +RtlInitUTF8String +RtlInitUTF8StringEx RtlInitUnicodeString RtlInitUnicodeStringEx RtlInitWeakEnumerationHashTable RtlInitializeAtomPackage RtlInitializeBitMap +RtlInitializeBitMapEx RtlInitializeConditionVariable RtlInitializeContext +RtlInitializeCorrelationVector RtlInitializeCriticalSection RtlInitializeCriticalSectionAndSpinCount RtlInitializeCriticalSectionEx RtlInitializeExtendedContext +RtlInitializeExtendedContext2 RtlInitializeGenericTable RtlInitializeGenericTableAvl RtlInitializeHandleTable @@ -1038,6 +1150,7 @@ RtlInitializeResource RtlInitializeSListHead RtlInitializeSRWLock RtlInitializeSid +RtlInitializeSidEx RtlInsertElementGenericTable RtlInsertElementGenericTableAvl RtlInsertElementGenericTableFull @@ -1074,17 +1187,30 @@ RtlIpv6StringToAddressExW RtlIpv6StringToAddressW RtlIsActivationContextActive RtlIsCapabilitySid +RtlIsCloudFilesPlaceholder RtlIsCriticalSectionLocked RtlIsCriticalSectionLockedByThread +RtlIsCurrentProcess +RtlIsCurrentThread RtlIsCurrentThreadAttachExempt RtlIsDosDeviceName_U +RtlIsElevatedRid RtlIsGenericTableEmpty RtlIsGenericTableEmptyAvl +RtlIsMultiSessionSku +RtlIsMultiUsersInSessionSku RtlIsNameInExpression +RtlIsNameInUnUpcasedExpression RtlIsNameLegalDOS8Dot3 +RtlIsNonEmptyDirectoryReparsePointAllowed RtlIsNormalizedString RtlIsPackageSid RtlIsParentOfChildAppContainer +RtlIsPartialPlaceholder +RtlIsPartialPlaceholderFileHandle +RtlIsPartialPlaceholderFileInfo +RtlIsProcessorFeaturePresent +RtlIsStateSeparationEnabled RtlIsTextUnicode RtlIsThreadWithinLoaderCallout RtlIsUntrustedObject @@ -1092,6 +1218,7 @@ RtlIsValidHandle RtlIsValidIndexHandle RtlIsValidLocaleName RtlIsValidProcessTrustLabelSid +RtlIsZeroMemory RtlKnownExceptionFilter RtlLCIDToCultureName RtlLargeIntegerToChar @@ -1105,6 +1232,7 @@ RtlLoadString RtlLocalTimeToSystemTime RtlLocaleNameToLcid RtlLocateExtendedFeature +RtlLocateExtendedFeature2 RtlLocateLegacyContext RtlLockBootStatusData RtlLockCurrentThread @@ -1120,6 +1248,7 @@ RtlLookupElementGenericTableAvl RtlLookupElementGenericTableFull RtlLookupElementGenericTableFullAvl RtlLookupEntryHashTable +RtlLookupFirstMatchingElementGenericTableAvl RtlLookupFunctionEntry RtlLookupFunctionTable RtlMakeSelfRelativeSD @@ -1137,27 +1266,33 @@ RtlNewSecurityObject RtlNewSecurityObjectEx RtlNewSecurityObjectWithMultipleInheritance RtlNormalizeProcessParams +RtlNormalizeSecurityDescriptor RtlNormalizeString RtlNtPathNameToDosPathName RtlNtStatusToDosError RtlNtStatusToDosErrorNoTeb +RtlNtdllName RtlNumberGenericTableElements RtlNumberGenericTableElementsAvl RtlNumberOfClearBits +RtlNumberOfClearBitsEx RtlNumberOfClearBitsInRange RtlNumberOfSetBits +RtlNumberOfSetBitsEx RtlNumberOfSetBitsInRange RtlNumberOfSetBitsUlongPtr RtlOemStringToUnicodeSize RtlOemStringToUnicodeString RtlOemToUnicodeN RtlOpenCurrentUser +RtlOsDeploymentState RtlOwnerAcesPresent RtlPcToFileHeader RtlPinAtomInAtomTable RtlPopFrame RtlPrefixString RtlPrefixUnicodeString +RtlPrepareForProcessCloning RtlProcessFlsData RtlProtectHeap RtlPublishWnfStateData @@ -1171,11 +1306,13 @@ RtlQueryElevationFlags RtlQueryEnvironmentVariable RtlQueryEnvironmentVariable_U RtlQueryHeapInformation +RtlQueryImageMitigationPolicy RtlQueryInformationAcl RtlQueryInformationActivationContext RtlQueryInformationActiveActivationContext RtlQueryInterfaceMemoryStream RtlQueryModuleInformation +RtlQueryPackageClaims RtlQueryPackageIdentity RtlQueryPackageIdentityEx RtlQueryPerformanceCounter @@ -1184,13 +1321,18 @@ RtlQueryProcessBackTraceInformation RtlQueryProcessDebugInformation RtlQueryProcessHeapInformation RtlQueryProcessLockInformation +RtlQueryProcessPlaceholderCompatibilityMode +RtlQueryProtectedPolicy +RtlQueryRegistryValueWithFallback RtlQueryRegistryValues RtlQueryRegistryValuesEx RtlQueryResourcePolicy RtlQuerySecurityObject RtlQueryTagHeap +RtlQueryThreadPlaceholderCompatibilityMode RtlQueryThreadProfiling RtlQueryTimeZoneInformation +RtlQueryTokenHostIdAsUlong64 RtlQueryUnbiasedInterruptTime RtlQueryValidationRunlevel RtlQueryWnfMetaNotification @@ -1198,6 +1340,7 @@ RtlQueryWnfStateData RtlQueryWnfStateDataWithExplicitScope RtlQueueApcWow64Thread RtlQueueWorkItem +RtlRaiseCustomSystemEventTrigger RtlRaiseException RtlRaiseStatus RtlRandom @@ -1229,15 +1372,20 @@ RtlRemovePrivileges RtlRemoveVectoredContinueHandler RtlRemoveVectoredExceptionHandler RtlReplaceSidInSd +RtlReplaceSystemDirectoryInPath RtlReportException +RtlReportExceptionEx RtlReportSilentProcessExit RtlReportSqmEscalation RtlResetMemoryBlockLookaside RtlResetMemoryZone RtlResetNtUserPfn RtlResetRtlTranslations +RtlRestoreBootStatusDefaults RtlRestoreContext RtlRestoreLastWin32Error +RtlRestoreSystemBootStatusDefaults +RtlRestoreThreadPreferredUILanguages RtlRetrieveNtUserPfn RtlRevertMemoryStream RtlRunDecodeUnicodeString @@ -1253,9 +1401,12 @@ RtlSelfRelativeToAbsoluteSD RtlSelfRelativeToAbsoluteSD2 RtlSendMsgToSm RtlSetAllBits +RtlSetAllBitsEx RtlSetAttributesSecurityDescriptor RtlSetBit +RtlSetBitEx RtlSetBits +RtlSetBitsEx RtlSetControlSecurityDescriptor RtlSetCriticalSectionSpinCount RtlSetCurrentDirectory_U @@ -1269,6 +1420,7 @@ RtlSetEnvironmentVariable RtlSetExtendedFeaturesMask RtlSetGroupSecurityDescriptor RtlSetHeapInformation +RtlSetImageMitigationPolicy RtlSetInformationAcl RtlSetIoCompletionCallback RtlSetLastWin32Error @@ -1278,16 +1430,25 @@ RtlSetOwnerSecurityDescriptor RtlSetPortableOperatingSystem RtlSetProcessDebugInformation RtlSetProcessIsCritical +RtlSetProcessPlaceholderCompatibilityMode RtlSetProcessPreferredUILanguages +RtlSetProtectedPolicy +RtlSetProxiedProcessId RtlSetSaclSecurityDescriptor RtlSetSearchPathMode RtlSetSecurityDescriptorRMControl RtlSetSecurityObject RtlSetSecurityObjectEx +RtlSetSystemBootStatus +RtlSetSystemBootStatusEx RtlSetThreadErrorMode RtlSetThreadIsCritical +RtlSetThreadPlaceholderCompatibilityMode RtlSetThreadPoolStartFunc RtlSetThreadPreferredUILanguages +RtlSetThreadPreferredUILanguages2 +RtlSetThreadSubProcessTag +RtlSetThreadWorkOnBehalfTicket RtlSetTimeZoneInformation RtlSetTimer RtlSetUnhandledExceptionFilter @@ -1307,14 +1468,17 @@ RtlStartRXact RtlStatMemoryStream RtlStringFromGUID RtlStringFromGUIDEx +RtlStronglyEnumerateEntryHashTable RtlSubAuthorityCountSid RtlSubAuthoritySid RtlSubscribeWnfStateChangeNotification RtlSubtreePredecessor RtlSubtreeSuccessor +RtlSwitchedVVI RtlSystemTimeToLocalTime RtlTestAndPublishWnfStateData RtlTestBit +RtlTestBitEx RtlTestProtectedAccess RtlTimeFieldsToTime RtlTimeToElapsedTimeFields @@ -1334,7 +1498,9 @@ RtlTryAcquireSRWLockExclusive RtlTryAcquireSRWLockShared RtlTryConvertSRWLockSharedToExclusiveOrRelease RtlTryEnterCriticalSection +RtlUTF8StringToUnicodeString RtlUTF8ToUnicodeN +RtlUdiv128 RtlUlongByteSwap RtlUlonglongByteSwap RtlUnhandledExceptionFilter @@ -1345,6 +1511,7 @@ RtlUnicodeStringToCountedOemString RtlUnicodeStringToInteger RtlUnicodeStringToOemSize RtlUnicodeStringToOemString +RtlUnicodeStringToUTF8String RtlUnicodeToCustomCPN RtlUnicodeToMultiByteN RtlUnicodeToMultiByteSize @@ -1376,6 +1543,7 @@ RtlUpdateClonedSRWLock RtlUpdateTimer RtlUpperChar RtlUpperString +RtlUserFiberStart RtlUserThreadStart RtlUshortByteSwap RtlValidAcl @@ -1383,6 +1551,7 @@ RtlValidProcessProtection RtlValidRelativeSecurityDescriptor RtlValidSecurityDescriptor RtlValidSid +RtlValidateCorrelationVector RtlValidateHeap RtlValidateProcessHeaps RtlValidateUnicodeString @@ -1405,7 +1574,26 @@ RtlWnfDllUnloadCallback RtlWow64CallFunction64 RtlWow64EnableFsRedirection RtlWow64EnableFsRedirectionEx +RtlWow64GetCpuAreaInfo +RtlWow64GetCurrentCpuArea +RtlWow64GetCurrentMachine +RtlWow64GetEquivalentMachineCHPE +RtlWow64GetProcessMachines +RtlWow64GetSharedInfoProcess +RtlWow64GetThreadContext +RtlWow64GetThreadSelectorEntry +RtlWow64IsWowGuestMachineSupported +RtlWow64LogMessageInEventLogger +RtlWow64PopAllCrossProcessWorkFromWorkList +RtlWow64PopCrossProcessWorkFromFreeList +RtlWow64PushCrossProcessWorkOntoFreeList +RtlWow64PushCrossProcessWorkOntoWorkList +RtlWow64RequestCrossProcessHeavyFlush +RtlWow64SetThreadContext +RtlWow64SuspendProcess +RtlWow64SuspendThread RtlWriteMemoryStream +RtlWriteNonVolatileMemory RtlWriteRegistryValue RtlZeroHeap RtlZeroMemory @@ -1420,6 +1608,7 @@ RtlpConvertRelativeToAbsoluteSecurityAttribute RtlpCreateProcessRegistryInfo RtlpEnsureBufferSize RtlpFreezeTimeBias DATA +RtlpGetDeviceFamilyInfoEnum RtlpGetLCIDFromLangInfoNode RtlpGetNameFromLangInfoNode RtlpGetSystemDefaultUILanguage @@ -1441,13 +1630,18 @@ RtlpNtOpenKey RtlpNtQueryValueKey RtlpNtSetValueKey RtlpQueryDefaultUILanguage +RtlpQueryProcessDebugInformationFromWow64 +RtlpQueryProcessDebugInformationRemote RtlpRefreshCachedUILanguage RtlpSetInstallLanguage RtlpSetPreferredUILanguages RtlpSetUserPreferredUILanguages +RtlpTimeFieldsToTime +RtlpTimeToTimeFields RtlpUnWaitCriticalSection RtlpVerifyAndCommitUILanguageSettings RtlpWaitForCriticalSection +RtlpWow64CtxFromArm64 RtlxAnsiStringToUnicodeSize RtlxOemStringToUnicodeSize RtlxUnicodeStringToAnsiSize @@ -1501,9 +1695,12 @@ TpReleaseWork TpSetDefaultPoolMaxThreads TpSetDefaultPoolStackInformation TpSetPoolMaxThreads +TpSetPoolMaxThreadsSoftLimit TpSetPoolMinThreads TpSetPoolStackInformation TpSetPoolThreadBasePriority +TpSetPoolThreadCpuSets +TpSetPoolWorkerThreadIdleTimeout TpSetTimer TpSetTimerEx TpSetWait @@ -1519,6 +1716,7 @@ TpWaitForTimer TpWaitForWait TpWaitForWork VerSetConditionMask +WerReportExceptionWorker WerReportSQMEvent WinSqmAddToAverageDWORD WinSqmAddToStream @@ -1549,6 +1747,7 @@ WinSqmSetIfMinDWORD WinSqmSetString WinSqmStartSession WinSqmStartSessionForPartner +WinSqmStartSqmOptinListener ZwAcceptConnectPort ZwAccessCheck ZwAccessCheckAndAuditAlarm @@ -1557,6 +1756,7 @@ ZwAccessCheckByTypeAndAuditAlarm ZwAccessCheckByTypeResultList ZwAccessCheckByTypeResultListAndAuditAlarm ZwAccessCheckByTypeResultListAndAuditAlarmByHandle +ZwAcquireProcessActivityReference ZwAddAtom ZwAddAtomEx ZwAddBootEntry @@ -1570,8 +1770,10 @@ ZwAlertThreadByThreadId ZwAllocateLocallyUniqueId ZwAllocateReserveObject ZwAllocateUserPhysicalPages +ZwAllocateUserPhysicalPagesEx ZwAllocateUuids ZwAllocateVirtualMemory +ZwAllocateVirtualMemoryEx ZwAlpcAcceptConnectPort ZwAlpcCancelMessage ZwAlpcConnectPort @@ -1586,6 +1788,7 @@ ZwAlpcDeleteResourceReserve ZwAlpcDeleteSectionView ZwAlpcDeleteSecurityContext ZwAlpcDisconnectPort +ZwAlpcImpersonateClientContainerOfPort ZwAlpcImpersonateClientOfPort ZwAlpcOpenSenderProcess ZwAlpcOpenSenderThread @@ -1598,6 +1801,7 @@ ZwApphelpCacheControl ZwAreMappedFilesTheSame ZwAssignProcessToJobObject ZwAssociateWaitCompletionPacket +ZwCallEnclave ZwCallbackReturn ZwCancelIoFile ZwCancelIoFileEx @@ -1610,16 +1814,22 @@ ZwClose ZwCloseObjectAuditAlarm ZwCommitComplete ZwCommitEnlistment +ZwCommitRegistryTransaction ZwCommitTransaction ZwCompactKeys +ZwCompareObjects +ZwCompareSigningLevels ZwCompareTokens ZwCompleteConnectPort ZwCompressKey ZwConnectPort ZwContinue +ZwConvertBetweenAuxiliaryCounterAndPerformanceCounter +ZwCreateCrossVmEvent ZwCreateDebugObject ZwCreateDirectoryObject ZwCreateDirectoryObjectEx +ZwCreateEnclave ZwCreateEnlistment ZwCreateEvent ZwCreateEventPair @@ -1636,14 +1846,17 @@ ZwCreateMailslotFile ZwCreateMutant ZwCreateNamedPipeFile ZwCreatePagingFile +ZwCreatePartition ZwCreatePort ZwCreatePrivateNamespace ZwCreateProcess ZwCreateProcessEx ZwCreateProfile ZwCreateProfileEx +ZwCreateRegistryTransaction ZwCreateResourceManager ZwCreateSection +ZwCreateSectionEx ZwCreateSemaphore ZwCreateSymbolicLinkObject ZwCreateThread @@ -1707,6 +1920,7 @@ ZwGetCachedSigningLevel ZwGetCompleteWnfStateSubscription ZwGetContextThread ZwGetCurrentProcessorNumber +ZwGetCurrentProcessorNumberEx ZwGetDevicePowerState ZwGetMUIRegistryInfo ZwGetNextProcess @@ -1717,6 +1931,7 @@ ZwGetWriteWatch ZwImpersonateAnonymousToken ZwImpersonateClientOfPort ZwImpersonateThread +ZwInitializeEnclave ZwInitializeNlsFiles ZwInitializeRegistry ZwInitiatePowerAction @@ -1725,6 +1940,7 @@ ZwIsSystemResumeAutomatic ZwIsUILanguageComitted ZwListenPort ZwLoadDriver +ZwLoadEnclaveData ZwLoadKey ZwLoadKey2 ZwLoadKeyEx @@ -1734,13 +1950,17 @@ ZwLockRegistryKey ZwLockVirtualMemory ZwMakePermanentObject ZwMakeTemporaryObject +ZwManageHotPatch +ZwManagePartition ZwMapCMFModule ZwMapUserPhysicalPages ZwMapUserPhysicalPagesScatter ZwMapViewOfSection +ZwMapViewOfSectionEx ZwModifyBootEntry ZwModifyDriverEntry ZwNotifyChangeDirectoryFile +ZwNotifyChangeDirectoryFileEx ZwNotifyChangeKey ZwNotifyChangeMultipleKeys ZwNotifyChangeSession @@ -1758,10 +1978,12 @@ ZwOpenKeyTransactedEx ZwOpenKeyedEvent ZwOpenMutant ZwOpenObjectAuditAlarm +ZwOpenPartition ZwOpenPrivateNamespace ZwOpenProcess ZwOpenProcessToken ZwOpenProcessTokenEx +ZwOpenRegistryTransaction ZwOpenResourceManager ZwOpenSection ZwOpenSemaphore @@ -1785,20 +2007,24 @@ ZwPrivilegedServiceAuditAlarm ZwPropagationComplete ZwPropagationFailed ZwProtectVirtualMemory +ZwPssCaptureVaSpaceBulk ZwPulseEvent ZwQueryAttributesFile +ZwQueryAuxiliaryCounterFrequency ZwQueryBootEntryOrder ZwQueryBootOptions ZwQueryDebugFilterState ZwQueryDefaultLocale ZwQueryDefaultUILanguage ZwQueryDirectoryFile +ZwQueryDirectoryFileEx ZwQueryDirectoryObject ZwQueryDriverEntryOrder ZwQueryEaFile ZwQueryEvent ZwQueryFullAttributesFile ZwQueryInformationAtom +ZwQueryInformationByName ZwQueryInformationEnlistment ZwQueryInformationFile ZwQueryInformationJobObject @@ -1826,6 +2052,7 @@ ZwQueryQuotaInformationFile ZwQuerySection ZwQuerySecurityAttributesToken ZwQuerySecurityObject +ZwQuerySecurityPolicy ZwQuerySemaphore ZwQuerySymbolicLinkObject ZwQuerySystemEnvironmentValue @@ -1876,8 +2103,10 @@ ZwResetWriteWatch ZwRestoreKey ZwResumeProcess ZwResumeThread +ZwRevertContainerImpersonation ZwRollbackComplete ZwRollbackEnlistment +ZwRollbackRegistryTransaction ZwRollbackTransaction ZwRollforwardTransactionManager ZwSaveKey @@ -1888,6 +2117,7 @@ ZwSerializeBoot ZwSetBootEntryOrder ZwSetBootOptions ZwSetCachedSigningLevel +ZwSetCachedSigningLevel2 ZwSetContextThread ZwSetDebugFilterState ZwSetDefaultHardErrorPort @@ -1908,6 +2138,7 @@ ZwSetInformationKey ZwSetInformationObject ZwSetInformationProcess ZwSetInformationResourceManager +ZwSetInformationSymbolicLink ZwSetInformationThread ZwSetInformationToken ZwSetInformationTransaction @@ -1946,6 +2177,7 @@ ZwSubscribeWnfStateChange ZwSuspendProcess ZwSuspendThread ZwSystemDebugControl +ZwTerminateEnclave ZwTerminateJobObject ZwTerminateProcess ZwTerminateThread @@ -1982,184 +2214,3 @@ ZwWriteFileGather ZwWriteRequestData ZwWriteVirtualMemory ZwYieldExecution -__C_specific_handler -__chkstk -__isascii -__iscsym -__iscsymf -__jump_unwind -__toascii -_atoi64 -_errno -_fltused DATA -_i64toa -_i64toa_s -_i64tow -_i64tow_s -_itoa -_itoa_s -_itow -_itow_s -_lfind -_ltoa -_ltoa_s -_ltow -_ltow_s -_makepath_s -_memccpy -_memicmp -_setjmp -_setjmpex -_snprintf -_snprintf_s -_snscanf_s -_snwprintf -_snwprintf_s -_snwscanf_s -_splitpath -_splitpath_s -_strcmpi -_stricmp -_strlwr -_strlwr_s -_strnicmp -_strnset_s -_strset_s -_strupr -_strupr_s -_swprintf -_ui64toa -_ui64toa_s -_ui64tow -_ui64tow_s -_ultoa -_ultoa_s -_ultow -_ultow_s -_vscwprintf -_vsnprintf -_vsnprintf_s -_vsnwprintf -_vsnwprintf_s -_vswprintf -_wcsicmp -_wcslwr -_wcslwr_s -_wcsnicmp -_wcsnset_s -_wcsset_s -_wcstoi64 -_wcstoui64 -_wcsupr -_wcsupr_s -_wmakepath_s -_wsplitpath_s -_wtoi -_wtoi64 -_wtol -abs -atan -atoi -atol -bsearch -ceil -cos -fabs -floor -isalnum -isalpha -iscntrl -isdigit -isgraph -islower -isprint -ispunct -isspace -isupper -iswalnum -iswalpha -iswascii -iswctype -iswdigit -iswgraph -iswlower -iswprint -iswspace -iswxdigit -isxdigit -labs -log -longjmp -mbstowcs -memchr -memcmp -memcpy -memcpy_s -memmove -memmove_s -memset -pow -qsort -qsort_s -sin -sprintf -sprintf_s -sqrt -sscanf -sscanf_s -strcat -strcat_s -strchr -strcmp -strcpy -strcpy_s -strcspn -strlen -strncat -strncat_s -strncmp -strncpy -strncpy_s -strnlen -strpbrk -strrchr -strspn -strstr -strtok_s -strtol -strtoul -swprintf -swprintf_s -swscanf_s -tan -tolower -toupper -towlower -towupper -vDbgPrintEx -vDbgPrintExWithPrefix -vsprintf -vsprintf_s -vswprintf_s -wcscat -wcscat_s -wcschr -wcscmp -wcscpy -wcscpy_s -wcscspn -wcslen -wcsncat -wcsncat_s -wcsncmp -wcsncpy -wcsncpy_s -wcsnlen -wcspbrk -wcsrchr -wcsspn -wcsstr -wcstok_s -wcstol -wcstombs -wcstoul diff --git a/lib/libc/mingw/libarm32/urlmon.def b/lib/libc/mingw/libarm32/urlmon.def deleted file mode 100644 index 2e0f149886..0000000000 --- a/lib/libc/mingw/libarm32/urlmon.def +++ /dev/null @@ -1,292 +0,0 @@ -; -; Definition file of urlmon.dll -; Automatic generated by gendef -; written by Kai Tietz 2008-2014 -; -LIBRARY "urlmon.dll" -EXPORTS -ord_100 @100 -ord_101 @101 -ord_102 @102 -ord_103 @103 -ord_104 @104 -ord_105 @105 -ord_106 @106 -ord_107 @107 -ord_108 @108 -FileBearsMarkOfTheWeb -GetPortFromUrlScheme -ord_111 @111 -ord_112 @112 -ord_113 @113 -ord_114 @114 -ord_115 @115 -ord_116 @116 -ord_117 @117 -GetPropertyFromName -GetPropertyName -IsDWORDProperty -IsStringProperty -AsyncGetClassBits -AsyncInstallDistributionUnit -BindAsyncMoniker -CDLGetLongPathNameA -CDLGetLongPathNameW -CORPolicyProvider -CoGetClassObjectFromURL -CoInstall -CoInternetCanonicalizeIUri -CoInternetCombineIUri -CoInternetCombineUrl -CoInternetCombineUrlEx -CoInternetCompareUrl -CoInternetCreateSecurityManager -CoInternetCreateZoneManager -CoInternetFeatureSettingsChanged -CoInternetGetProtocolFlags -CoInternetGetSecurityUrl -CoInternetGetSecurityUrlEx -CoInternetGetSession -CoInternetIsFeatureEnabled -CoInternetIsFeatureEnabledForIUri -CoInternetIsFeatureEnabledForUrl -CoInternetIsFeatureZoneElevationEnabled -CoInternetParseIUri -CoInternetParseUrl -CoInternetQueryInfo -CoInternetSetFeatureEnabled -CompareSecurityIds -CompatFlagsFromClsid -CopyBindInfo -CopyStgMedium -CreateAsyncBindCtx -CreateAsyncBindCtxEx -CreateFormatEnumerator -CreateIUriBuilder -CreateURLMoniker -CreateURLMonikerEx -CreateURLMonikerEx2 -CreateUri -CreateUriFromMultiByteString -CreateUriPriv -CreateUriWithFragment -Extract -FaultInIEFeature -FindMediaType -FindMediaTypeClass -FindMimeFromData -GetAddSitesFileUrl -GetClassFileOrMime -GetClassURL -GetComponentIDFromCLSSPEC -GetIDNFlagsForUri -GetIUriPriv -GetIUriPriv2 -GetLabelsFromNamedHost -GetMarkOfTheWeb -GetSoftwareUpdateInfo -GetUrlmonThreadNotificationHwnd -GetZoneFromAlternateDataStreamEx -HlinkGoBack -HlinkGoForward -HlinkNavigateMoniker -HlinkNavigateString -HlinkSimpleNavigateToMoniker -HlinkSimpleNavigateToString -IEDllLoader -IEGetUserPrivateNamespaceName -IEInstallScope -IntlPercentEncodeNormalize -IsAsyncMoniker -IsIntranetAvailable -IsJITInProgress -IsLoggingEnabledA -IsLoggingEnabledW -IsValidURL -MkParseDisplayNameEx -ObtainUserAgentString -PrivateCoInstall -QueryAssociations -QueryClsidAssociation -RegisterBindStatusCallback -RegisterFormatEnumerator -RegisterMediaTypeClass -RegisterMediaTypes -RegisterWebPlatformPermanentSecurityManager -ReleaseBindInfo -RevokeBindStatusCallback -RevokeFormatEnumerator -SetAccessForIEAppContainer -SetSoftwareUpdateAdvertisementState -ShouldDisplayPunycodeForUri -ShouldShowIntranetWarningSecband -ShowTrustAlertDialog -URLDownloadA -URLDownloadToCacheFileA -URLDownloadToCacheFileW -URLDownloadToFileA -URLDownloadToFileW -URLDownloadW -URLOpenBlockingStreamA -URLOpenBlockingStreamW -URLOpenPullStreamA -URLOpenPullStreamW -URLOpenStreamA -URLOpenStreamW -UnregisterWebPlatformPermanentSecurityManager -UrlMkBuildVersion -UrlMkGetSessionOption -UrlMkSetSessionOption -UrlmonCleanupCurrentThread -WriteHitLogging -ZonesReInit -ord_304 @304 -ord_305 @305 -ord_306 @306 -ord_307 @307 -ord_308 @308 -ord_309 @309 -ord_310 @310 -ord_311 @311 -ord_312 @312 -ord_313 @313 -ord_314 @314 -ord_315 @315 -ord_316 @316 -ord_318 @318 -ord_319 @319 -ord_320 @320 -ord_321 @321 -IECompatLogCSSFix -ord_323 @323 -ord_324 @324 -ord_395 @395 -ord_400 @400 -ord_401 @401 -ord_403 @403 -ord_404 @404 -ord_406 @406 -ord_407 @407 -ord_408 @408 -ord_409 @409 -ord_410 @410 -ord_411 @411 -ord_412 @412 -ord_413 @413 -ord_414 @414 -ord_415 @415 -ord_416 @416 -ord_417 @417 -ord_421 @421 -ord_422 @422 -ord_423 @423 -ord_430 @430 -ord_431 @431 -ord_432 @432 -ord_433 @433 -ord_434 @434 -ord_435 @435 -ord_436 @436 -ord_437 @437 -ord_438 @438 -ord_439 @439 -ord_440 @440 -ord_441 @441 -ord_442 @442 -ord_443 @443 -ord_444 @444 -ord_445 @445 -ord_446 @446 -ord_447 @447 -ord_448 @448 -ord_449 @449 -ord_450 @450 -ord_451 @451 -ord_452 @452 -ord_453 @453 -ord_454 @454 -ord_455 @455 -ord_456 @456 -ord_457 @457 -ord_458 @458 -ord_460 @460 -ord_461 @461 -ord_462 @462 -ord_463 @463 -ord_470 @470 -ord_471 @471 -ord_473 @473 -ord_474 @474 -ord_475 @475 -ord_476 @476 -ord_477 @477 -ord_478 @478 -ord_479 @479 -ord_480 @480 -ord_481 @481 -ord_482 @482 -ord_483 @483 -ord_484 @484 -ord_485 @485 -ord_486 @486 -ord_487 @487 -ord_488 @488 -ord_489 @489 -ord_490 @490 -ord_491 @491 -ord_492 @492 -ord_494 @494 -ord_495 @495 -ord_496 @496 -ord_497 @497 -ord_498 @498 -ord_499 @499 -ord_500 @500 -ord_501 @501 -ord_502 @502 -ord_503 @503 -ord_504 @504 -ord_505 @505 -ord_506 @506 -ord_507 @507 -ord_508 @508 -ord_509 @509 -ord_510 @510 -ord_511 @511 -ord_512 @512 -ord_513 @513 -ord_514 @514 -ord_515 @515 -ord_516 @516 -ord_517 @517 -ord_518 @518 -ord_519 @519 -ord_520 @520 -ord_521 @521 -ord_522 @522 -ord_523 @523 -ord_524 @524 -ord_525 @525 -ord_526 @526 -ord_527 @527 -ord_528 @528 -ord_529 @529 -ord_530 @530 -ord_531 @531 -ord_532 @532 -ord_533 @533 -ord_534 @534 -ord_535 @535 -ord_536 @536 -ord_537 @537 -ord_538 @538 -ord_539 @539 -ord_540 @540 -ord_541 @541 -ord_542 @542 -ord_543 @543 -ord_544 @544 -ord_545 @545 -ord_546 @546 -ord_547 @547 -ord_548 @548 diff --git a/lib/libc/mingw/math/arm/ceil.S b/lib/libc/mingw/math/arm/ceil.S deleted file mode 100644 index 47162c9af0..0000000000 --- a/lib/libc/mingw/math/arm/ceil.S +++ /dev/null @@ -1,29 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ -#include <_mingw_mac.h> - - .file "ceil.S" - .text - .align 4 - .globl __MINGW_USYMBOL(ceil) - .def __MINGW_USYMBOL(ceil); .scl 2; .type 32; .endef - -__MINGW_USYMBOL(ceil): - vmov r2, r3, d0 - lsr r3, r3, #20 - bic r3, r3, #0x800 - movw r2, #0x7ff - cmp r2, r3 /* Check for INF/NAN, just return the input in those cases */ - it eq - bxeq lr - vmrs r1, fpscr - bic r0, r1, #0x00c00000 - orr r0, r0, #0x00400000 /* Round towards Plus Infinity */ - vmsr fpscr, r0 - vcvtr.s32.f64 s0, d0 - vcvt.f64.s32 d0, s0 - vmsr fpscr, r1 - bx lr diff --git a/lib/libc/mingw/math/arm/ceilf.S b/lib/libc/mingw/math/arm/ceilf.S deleted file mode 100644 index a899f25fa2..0000000000 --- a/lib/libc/mingw/math/arm/ceilf.S +++ /dev/null @@ -1,28 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ -#include <_mingw_mac.h> - - .file "ceilf.S" - .text - .align 4 - .globl __MINGW_USYMBOL(ceilf) - .def __MINGW_USYMBOL(ceilf); .scl 2; .type 32; .endef - -__MINGW_USYMBOL(ceilf): - vmov r2, s0 - lsr r2, r2, #23 - bic r2, r2, #0x100 - cmp r2, #0xff /* Check for INF/NAN, just return the input in those cases */ - it eq - bxeq lr - vmrs r1, fpscr - bic r0, r1, #0x00c00000 - orr r0, r0, #0x00400000 /* Round towards Plus Infinity */ - vmsr fpscr, r0 - vcvtr.s32.f32 s0, s0 - vcvt.f32.s32 s0, s0 - vmsr fpscr, r1 - bx lr diff --git a/lib/libc/mingw/math/arm/ceill.S b/lib/libc/mingw/math/arm/ceill.S deleted file mode 100644 index 9c6934ba05..0000000000 --- a/lib/libc/mingw/math/arm/ceill.S +++ /dev/null @@ -1,28 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ -#include <_mingw_mac.h> - - .file "ceill.S" - .text - .align 4 - .globl __MINGW_USYMBOL(ceill) - .def __MINGW_USYMBOL(ceill); .scl 2; .type 32; .endef -__MINGW_USYMBOL(ceill): - vmov r2, r3, d0 - lsr r3, r3, #20 - bic r3, r3, #0x800 - movw r2, #0x7ff - cmp r2, r3 /* Check for INF/NAN, just return the input in those cases */ - it eq - bxeq lr - vmrs r1, fpscr - bic r0, r1, #0x00c00000 - orr r0, r0, #0x00400000 /* Round towards Plus Infinity */ - vmsr fpscr, r0 - vcvtr.s32.f64 s0, d0 - vcvt.f64.s32 d0, s0 - vmsr fpscr, r1 - bx lr diff --git a/lib/libc/mingw/math/arm/copysignl.c b/lib/libc/mingw/math/arm/copysignl.c deleted file mode 100644 index ea66215f2d..0000000000 --- a/lib/libc/mingw/math/arm/copysignl.c +++ /dev/null @@ -1,11 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ -#include - -long double copysignl(long double x, long double y) -{ - return copysign(x, y); -} diff --git a/lib/libc/mingw/math/arm/floor.S b/lib/libc/mingw/math/arm/floor.S deleted file mode 100644 index fc1df16af0..0000000000 --- a/lib/libc/mingw/math/arm/floor.S +++ /dev/null @@ -1,28 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ -#include <_mingw_mac.h> - - .file "floor.S" - .text - .p2align 4,,15 - .globl __MINGW_USYMBOL(floor) - .def __MINGW_USYMBOL(floor); .scl 2; .type 32; .endef -__MINGW_USYMBOL(floor): - vmov r2, r3, d0 - lsr r3, r3, #20 - bic r3, r3, #0x800 - movw r2, #0x7ff - cmp r2, r3 /* Check for INF/NAN, just return the input in those cases */ - it eq - bxeq lr - vmrs r1, fpscr - bic r0, r1, #0x00c00000 - orr r0, r0, #0x00800000 /* Round towards Minus Infinity */ - vmsr fpscr, r0 - vcvtr.s32.f64 s0, d0 - vcvt.f64.s32 d0, s0 - vmsr fpscr, r1 - bx lr diff --git a/lib/libc/mingw/math/arm/floorf.S b/lib/libc/mingw/math/arm/floorf.S deleted file mode 100644 index b5ae0c720c..0000000000 --- a/lib/libc/mingw/math/arm/floorf.S +++ /dev/null @@ -1,27 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ - #include <_mingw_mac.h> - - .file "floorf.S" - .text - .p2align 4,,15 - .globl __MINGW_USYMBOL(floorf) - .def __MINGW_USYMBOL(floorf); .scl 2; .type 32; .endef -__MINGW_USYMBOL(floorf): - vmov r2, s0 - lsr r2, r2, #23 - bic r2, r2, #0x100 - cmp r2, #0xff /* Check for INF/NAN, just return the input in those cases */ - it eq - bxeq lr - vmrs r1, fpscr - bic r0, r1, #0x00c00000 - orr r0, r0, #0x00800000 /* Round towards Minus Infinity */ - vmsr fpscr, r0 - vcvtr.s32.f32 s0, s0 - vcvt.f32.s32 s0, s0 - vmsr fpscr, r1 - bx lr diff --git a/lib/libc/mingw/math/arm/floorl.S b/lib/libc/mingw/math/arm/floorl.S deleted file mode 100644 index ec8c0050af..0000000000 --- a/lib/libc/mingw/math/arm/floorl.S +++ /dev/null @@ -1,28 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ -#include <_mingw_mac.h> - - .file "floorl.S" - .text - .align 4 - .globl __MINGW_USYMBOL(floorl) - .def __MINGW_USYMBOL(floorl); .scl 2; .type 32; .endef -__MINGW_USYMBOL(floorl): - vmov r2, r3, d0 - lsr r3, r3, #20 - bic r3, r3, #0x800 - movw r2, #0x7ff - cmp r2, r3 /* Check for INF/NAN, just return the input in those cases */ - it eq - bxeq lr - vmrs r1, fpscr - bic r0, r1, #0x00c00000 - orr r0, r0, #0x00800000 /* Round towards Minus Infinity */ - vmsr fpscr, r0 - vcvtr.s32.f64 s0, d0 - vcvt.f64.s32 d0, s0 - vmsr fpscr, r1 - bx lr diff --git a/lib/libc/mingw/math/arm/ldexpl.c b/lib/libc/mingw/math/arm/ldexpl.c deleted file mode 100644 index 7d3bffcbe0..0000000000 --- a/lib/libc/mingw/math/arm/ldexpl.c +++ /dev/null @@ -1,16 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ - -#include - -long double ldexpl(long double x, int n) -{ -#if defined(__arm__) || defined(_ARM_) - return ldexp(x, n); -#else -#error Not supported on your platform yet -#endif -} diff --git a/lib/libc/mingw/math/arm/log2.c b/lib/libc/mingw/math/arm/log2.c deleted file mode 100644 index eeb690b97b..0000000000 --- a/lib/libc/mingw/math/arm/log2.c +++ /dev/null @@ -1,64 +0,0 @@ -/* - This Software is provided under the Zope Public License (ZPL) Version 2.1. - - Copyright (c) 2014 by the mingw-w64 project - - See the AUTHORS file for the list of contributors to the mingw-w64 project. - - This license has been certified as open source. It has also been designated - as GPL compatible by the Free Software Foundation (FSF). - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions in source code must retain the accompanying copyright - notice, this list of conditions, and the following disclaimer. - 2. Redistributions in binary form must reproduce the accompanying - copyright notice, this list of conditions, and the following disclaimer - in the documentation and/or other materials provided with the - distribution. - 3. Names of the copyright holders must not be used to endorse or promote - products derived from this software without prior written permission - from the copyright holders. - 4. The right to distribute this software or to use it for any purpose does - not give you the right to use Servicemarks (sm) or Trademarks (tm) of - the copyright holders. Use of them is covered by separate agreement - with the copyright holders. - 5. If any files are modified, you must cause the modified files to carry - prominent notices stating that you changed the files and the date of - any change. - - Disclaimer - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED - OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO - EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#include - -double log2(double x) -{ - return log(x) / 0.69314718246459960938; -} - -float log2f(float x) -{ - return logf(x) / 0.69314718246459960938f; -} - -long double log2l(long double x) -{ -#if defined(__arm__) || defined(_ARM_) - return log2(x); -#else -#error Not supported on your platform yet -#endif -} diff --git a/lib/libc/mingw/math/arm/scalbn.c b/lib/libc/mingw/math/arm/scalbn.c deleted file mode 100644 index f11fd37e09..0000000000 --- a/lib/libc/mingw/math/arm/scalbn.c +++ /dev/null @@ -1,64 +0,0 @@ -/* - This Software is provided under the Zope Public License (ZPL) Version 2.1. - - Copyright (c) 2014 by the mingw-w64 project - - See the AUTHORS file for the list of contributors to the mingw-w64 project. - - This license has been certified as open source. It has also been designated - as GPL compatible by the Free Software Foundation (FSF). - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions in source code must retain the accompanying copyright - notice, this list of conditions, and the following disclaimer. - 2. Redistributions in binary form must reproduce the accompanying - copyright notice, this list of conditions, and the following disclaimer - in the documentation and/or other materials provided with the - distribution. - 3. Names of the copyright holders must not be used to endorse or promote - products derived from this software without prior written permission - from the copyright holders. - 4. The right to distribute this software or to use it for any purpose does - not give you the right to use Servicemarks (sm) or Trademarks (tm) of - the copyright holders. Use of them is covered by separate agreement - with the copyright holders. - 5. If any files are modified, you must cause the modified files to carry - prominent notices stating that you changed the files and the date of - any change. - - Disclaimer - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED - OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO - EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#include - -double scalbn(double x, int exp) -{ - return x * exp2(exp); -} - -float scalbnf(float x, int exp) -{ - return x * exp2f(exp); -} - -long double scalbnl(long double x, int exp) -{ -#if defined(__arm__) || defined(_ARM_) - return scalbn(x, exp); -#else -#error Not supported on your platform yet -#endif -} diff --git a/lib/libc/mingw/math/arm/sincos.c b/lib/libc/mingw/math/arm/sincos.c deleted file mode 100644 index 3bb86ee1b6..0000000000 --- a/lib/libc/mingw/math/arm/sincos.c +++ /dev/null @@ -1,29 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ - -#include - -void sincos (double __x, double *p_sin, double *p_cos) -{ - *p_sin = sin(__x); - *p_cos = cos(__x); -} - -void sincosf (float __x, float *p_sin, float *p_cos) -{ - *p_sin = sinf(__x); - *p_cos = cosf(__x); -} - -void sincosl (long double __x, long double *p_sin, long double *p_cos) -{ -#if defined(__arm__) || defined(_ARM_) - *p_sin = sin(__x); - *p_cos = cos(__x); -#else -#error Not supported on your platform yet -#endif -} diff --git a/lib/libc/mingw/math/arm64/ceil.S b/lib/libc/mingw/math/arm64/ceil.S deleted file mode 100644 index 6f46d352fd..0000000000 --- a/lib/libc/mingw/math/arm64/ceil.S +++ /dev/null @@ -1,16 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ -#include <_mingw_mac.h> - - .file "ceil.S" - .text - .align 2 - .globl __MINGW_USYMBOL(ceil) - .def __MINGW_USYMBOL(ceil); .scl 2; .type 32; .endef - -__MINGW_USYMBOL(ceil): - frintp d0, d0 - ret diff --git a/lib/libc/mingw/math/arm64/ceilf.S b/lib/libc/mingw/math/arm64/ceilf.S deleted file mode 100644 index b67d7687a5..0000000000 --- a/lib/libc/mingw/math/arm64/ceilf.S +++ /dev/null @@ -1,16 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ -#include <_mingw_mac.h> - - .file "ceilf.S" - .text - .align 2 - .globl __MINGW_USYMBOL(ceilf) - .def __MINGW_USYMBOL(ceilf); .scl 2; .type 32; .endef - -__MINGW_USYMBOL(ceilf): - frintp s0, s0 - ret diff --git a/lib/libc/mingw/math/arm64/ceill.S b/lib/libc/mingw/math/arm64/ceill.S deleted file mode 100644 index 99385a36d4..0000000000 --- a/lib/libc/mingw/math/arm64/ceill.S +++ /dev/null @@ -1,15 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ -#include <_mingw_mac.h> - - .file "ceill.S" - .text - .align 2 - .globl __MINGW_USYMBOL(ceill) - .def __MINGW_USYMBOL(ceill); .scl 2; .type 32; .endef -__MINGW_USYMBOL(ceill): - frintp d0, d0 - ret diff --git a/lib/libc/mingw/math/arm64/copysignl.c b/lib/libc/mingw/math/arm64/copysignl.c deleted file mode 100644 index ea66215f2d..0000000000 --- a/lib/libc/mingw/math/arm64/copysignl.c +++ /dev/null @@ -1,11 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ -#include - -long double copysignl(long double x, long double y) -{ - return copysign(x, y); -} diff --git a/lib/libc/mingw/math/arm64/floor.S b/lib/libc/mingw/math/arm64/floor.S deleted file mode 100644 index fc3f002d10..0000000000 --- a/lib/libc/mingw/math/arm64/floor.S +++ /dev/null @@ -1,15 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ -#include <_mingw_mac.h> - - .file "floor.S" - .text - .p2align 2 - .globl __MINGW_USYMBOL(floor) - .def __MINGW_USYMBOL(floor); .scl 2; .type 32; .endef -__MINGW_USYMBOL(floor): - frintm d0, d0 - ret diff --git a/lib/libc/mingw/math/arm64/floorf.S b/lib/libc/mingw/math/arm64/floorf.S deleted file mode 100644 index d24db92265..0000000000 --- a/lib/libc/mingw/math/arm64/floorf.S +++ /dev/null @@ -1,15 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ - #include <_mingw_mac.h> - - .file "floorf.S" - .text - .p2align 2 - .globl __MINGW_USYMBOL(floorf) - .def __MINGW_USYMBOL(floorf); .scl 2; .type 32; .endef -__MINGW_USYMBOL(floorf): - frintm s0, s0 - ret diff --git a/lib/libc/mingw/math/arm64/floorl.S b/lib/libc/mingw/math/arm64/floorl.S deleted file mode 100644 index 746738d6c4..0000000000 --- a/lib/libc/mingw/math/arm64/floorl.S +++ /dev/null @@ -1,15 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ -#include <_mingw_mac.h> - - .file "floorl.S" - .text - .align 2 - .globl __MINGW_USYMBOL(floorl) - .def __MINGW_USYMBOL(floorl); .scl 2; .type 32; .endef -__MINGW_USYMBOL(floorl): - frintm d0, d0 - ret diff --git a/lib/libc/mingw/math/arm64/ldexpl.c b/lib/libc/mingw/math/arm64/ldexpl.c deleted file mode 100644 index bfa32876d7..0000000000 --- a/lib/libc/mingw/math/arm64/ldexpl.c +++ /dev/null @@ -1,16 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ - -#include - -long double ldexpl(long double x, int n) -{ -#if defined(__aarch64__) || defined(_ARM64_) - return ldexp(x, n); -#else -#error Not supported on your platform yet -#endif -} diff --git a/lib/libc/mingw/math/arm64/log2.c b/lib/libc/mingw/math/arm64/log2.c deleted file mode 100644 index 6196f42276..0000000000 --- a/lib/libc/mingw/math/arm64/log2.c +++ /dev/null @@ -1,26 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ - -#include - -double log2(double x) -{ - return log(x) / 0.69314718246459960938; -} - -float log2f(float x) -{ - return logf(x) / 0.69314718246459960938f; -} - -long double log2l(long double x) -{ -#if defined(__aarch64__) || defined(_ARM64_) - return log2(x); -#else -#error Not supported on your platform yet -#endif -} diff --git a/lib/libc/mingw/math/arm64/scalbn.c b/lib/libc/mingw/math/arm64/scalbn.c deleted file mode 100644 index 212752c041..0000000000 --- a/lib/libc/mingw/math/arm64/scalbn.c +++ /dev/null @@ -1,26 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ - -#include - -double scalbn(double x, int exp) -{ - return x * exp2(exp); -} - -float scalbnf(float x, int exp) -{ - return x * exp2f(exp); -} - -long double scalbnl(long double x, int exp) -{ -#if defined(__aarch64__) || defined(_ARM64_) - return scalbn(x, exp); -#else -#error Not supported on your platform yet -#endif -} diff --git a/lib/libc/mingw/math/arm64/sincos.c b/lib/libc/mingw/math/arm64/sincos.c deleted file mode 100644 index 94f8244945..0000000000 --- a/lib/libc/mingw/math/arm64/sincos.c +++ /dev/null @@ -1,29 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ - -#include - -void sincos (double __x, double *p_sin, double *p_cos) -{ - *p_sin = sin(__x); - *p_cos = cos(__x); -} - -void sincosf (float __x, float *p_sin, float *p_cos) -{ - *p_sin = sinf(__x); - *p_cos = cosf(__x); -} - -void sincosl (long double __x, long double *p_sin, long double *p_cos) -{ -#if defined(__aarch64__) || defined(_ARM64_) - *p_sin = sin(__x); - *p_cos = cos(__x); -#else -#error Not supported on your platform yet -#endif -} diff --git a/lib/libc/mingw/math/coshl.c b/lib/libc/mingw/math/coshl.c index d7eb4b7cb5..c5aaa73ecf 100644 --- a/lib/libc/mingw/math/coshl.c +++ b/lib/libc/mingw/math/coshl.c @@ -5,6 +5,15 @@ */ #include "cephes_mconf.h" +#if defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__) +#include + +long double coshl(long double x) +{ + return cosh(x); +} +#else + #ifndef _SET_ERRNO #define _SET_ERRNO(x) #endif @@ -21,7 +30,7 @@ long double coshl(long double x) else if (x_class == FP_INFINITE) { errno = ERANGE; - return x; + return INFINITY; } x = fabsl (x); if (x > (MAXLOGL + LOGE2L)) @@ -43,3 +52,4 @@ long double coshl(long double x) y = 0.5L * (y + 1.0L / y); return y; } +#endif diff --git a/lib/libc/mingw/math/erfl.c b/lib/libc/mingw/math/erfl.c index 3832fe9e0c..1408cf5423 100644 --- a/lib/libc/mingw/math/erfl.c +++ b/lib/libc/mingw/math/erfl.c @@ -108,6 +108,17 @@ Copyright 1984, 1995 by Stephen L. Moshier long double erfl(long double x); +#if defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) +long double erfcl(long double x) +{ + return erfc(x); +} + +long double erfl(long double x) +{ + return erf(x); +} +#else /* erfc(x) = exp(-x^2) P(1/x)/Q(1/x) 1/8 <= 1/x <= 1 Peak relative error 5.8e-21 */ @@ -243,6 +254,9 @@ long double erfcl(long double a) if (isinf (a)) return (signbit(a) ? 2.0 : 0.0); + if (isnan (a)) + return (a); + x = fabsl (a); if (x < 1.0L) @@ -301,3 +315,4 @@ long double erfl(long double x) y = x * polevll(z, T, 6) / p1evll(z, U, 6); return (y); } +#endif diff --git a/lib/libc/mingw/math/fp_constsl.c b/lib/libc/mingw/math/fp_constsl.c index c9855df8ab..8804082097 100644 --- a/lib/libc/mingw/math/fp_constsl.c +++ b/lib/libc/mingw/math/fp_constsl.c @@ -4,6 +4,7 @@ * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #include "fp_consts.h" +#include const union _ieee_rep __QNANL = { __LONG_DOUBLE_QNAN_REP }; const union _ieee_rep __SNANL = { __LONG_DOUBLE_SNAN_REP }; @@ -15,6 +16,10 @@ const union _ieee_rep __DENORML = { __LONG_DOUBLE_DENORM_REP }; long double nanl (const char *); long double nanl (const char * tagp __attribute__((unused)) ) { +#if defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) + return nan(""); +#else return __QNANL.ldouble_val; +#endif } diff --git a/lib/libc/mingw/math/fpclassifyl.c b/lib/libc/mingw/math/fpclassifyl.c index a7b0c553fc..3ee487e13d 100644 --- a/lib/libc/mingw/math/fpclassifyl.c +++ b/lib/libc/mingw/math/fpclassifyl.c @@ -7,20 +7,20 @@ int __fpclassifyl (long double _x){ #if defined(__x86_64__) || defined(_AMD64_) - __mingw_fp_types_t hlp; + __mingw_ldbl_type_t hlp; unsigned int e; - hlp.ld = &_x; - e = hlp.ldt->lh.sign_exponent & 0x7fff; + hlp.x = _x; + e = hlp.lh.sign_exponent & 0x7fff; if (!e) { - unsigned int h = hlp.ldt->lh.high; - if (!(hlp.ldt->lh.low | h)) + unsigned int h = hlp.lh.high; + if (!(hlp.lh.low | h)) return FP_ZERO; else if (!(h & 0x80000000)) return FP_SUBNORMAL; } else if (e == 0x7fff) - return (((hlp.ldt->lh.high & 0x7fffffff) | hlp.ldt->lh.low) == 0 ? + return (((hlp.lh.high & 0x7fffffff) | hlp.lh.low) == 0 ? FP_INFINITE : FP_NAN); return FP_NORMAL; #elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) diff --git a/lib/libc/mingw/math/hypotl.c b/lib/libc/mingw/math/hypotl.c index 9696f2b163..563aeb4987 100644 --- a/lib/libc/mingw/math/hypotl.c +++ b/lib/libc/mingw/math/hypotl.c @@ -23,7 +23,6 @@ Direct inquiries to 30 Frost Street, Cambridge, MA 02140 by scalbnl to avoid duplicated range checks. */ -extern long double __INFL; #define PRECL 32 long double @@ -38,7 +37,7 @@ hypotl (long double x, long double y) { /* Annex F.9.4.3, hypot returns +infinity if either component is an infinity, even when the - other compoent is NaN. */ + other component is NaN. */ return (isinf(xx) || isinf(yy)) ? INFINITY : NAN; } @@ -73,7 +72,7 @@ hypotl (long double x, long double y) if (exx > LDBL_MAX_EXP) { errno = ERANGE; - return __INFL; + return INFINITY; } if (exx < LDBL_MIN_EXP) return 0.0L; diff --git a/lib/libc/mingw/math/isnanl.c b/lib/libc/mingw/math/isnanl.c index 5eb31d90f9..ff4ca6e423 100644 --- a/lib/libc/mingw/math/isnanl.c +++ b/lib/libc/mingw/math/isnanl.c @@ -9,12 +9,12 @@ int __isnanl (long double _x) { #if defined(__x86_64__) || defined(_AMD64_) - __mingw_fp_types_t ld; + __mingw_ldbl_type_t ld; int xx, signexp; - ld.ld = &_x; - signexp = (ld.ldt->lh.sign_exponent & 0x7fff) << 1; - xx = (int) (ld.ldt->lh.low | (ld.ldt->lh.high & 0x7fffffffu)); /* explicit */ + ld.x = _x; + signexp = (ld.lh.sign_exponent & 0x7fff) << 1; + xx = (int) (ld.lh.low | (ld.lh.high & 0x7fffffffu)); /* explicit */ signexp |= (unsigned int) (xx | (-xx)) >> 31; signexp = 0xfffe - signexp; return (int) ((unsigned int) signexp) >> 16; diff --git a/lib/libc/mingw/math/lgammaf.c b/lib/libc/mingw/math/lgammaf.c index 8c527dffc7..b6a0581d54 100644 --- a/lib/libc/mingw/math/lgammaf.c +++ b/lib/libc/mingw/math/lgammaf.c @@ -52,7 +52,7 @@ float __lgammaf_r(float x, int* sgngamf) #ifdef INFINITIES if (!isfinite(x)) - return (x); + return (INFINITY); #endif if (x < 0.0) diff --git a/lib/libc/mingw/math/lgammal.c b/lib/libc/mingw/math/lgammal.c index edb9a7ebfb..998c6a90dd 100644 --- a/lib/libc/mingw/math/lgammal.c +++ b/lib/libc/mingw/math/lgammal.c @@ -5,6 +5,15 @@ */ #include "cephes_mconf.h" +#if defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) +double lgamma(double x); + +long double lgammal(long double x) +{ + return lgamma(x); +} +#else + #if UNK static uLD S[9] = { { { -1.193945051381510095614E-3L } }, @@ -216,7 +225,7 @@ long double __lgammal_r(long double x, int* sgngaml) *sgngaml = 1; #ifdef NANS if (isnanl(x)) - return(NANL); + return x; #endif #ifdef INFINITIES if (!isfinitel(x)) @@ -334,4 +343,4 @@ long double lgammal(long double x) { return (__lgammal_r (x, &signgam)); } - +#endif diff --git a/lib/libc/mingw/math/llrint.c b/lib/libc/mingw/math/llrint.c index 8b138c07f3..4ba7af7e6b 100644 --- a/lib/libc/mingw/math/llrint.c +++ b/lib/libc/mingw/math/llrint.c @@ -19,8 +19,23 @@ long long llrint (double x) retval = (long long)ceil(x); else if (mode == FE_TOWARDZERO) retval = x >= 0 ? (long long)floor(x) : (long long)ceil(x); - else - retval = x >= 0 ? (long long)floor(x + 0.5) : (long long)ceil(x - 0.5); + else { + // Break `x` into integral and fractional parts. + double intg, frac; + frac = modf(x, &intg); + frac = fabs(frac); + // Convert the truncated integral part to an integer. + retval = intg; + if (frac < 0.5) { + // Round towards zero. + } else if (frac > 0.5) { + // Round towards infinities. + retval += signbit(x) ? -1 : 1; + } else { + // Round to the nearest even number. + retval += retval % 2; + } + } #endif return retval; } diff --git a/lib/libc/mingw/math/llrintf.c b/lib/libc/mingw/math/llrintf.c index 1b2a422ea0..e8085ec4ea 100644 --- a/lib/libc/mingw/math/llrintf.c +++ b/lib/libc/mingw/math/llrintf.c @@ -19,8 +19,23 @@ long long llrintf (float x) retval = (long long)ceilf(x); else if (mode == FE_TOWARDZERO) retval = x >= 0 ? (long long)floorf(x) : (long long)ceilf(x); - else - retval = x >= 0 ? (long long)floorf(x + 0.5) : (long long)ceilf(x - 0.5); + else { + // Break `x` into integral and fractional parts. + float intg, frac; + frac = modff(x, &intg); + frac = fabsf(frac); + // Convert the truncated integral part to an integer. + retval = intg; + if (frac < 0.5) { + // Round towards zero. + } else if (frac > 0.5) { + // Round towards infinities. + retval += signbit(x) ? -1 : 1; + } else { + // Round to the nearest even number. + retval += retval % 2; + } + } #endif return retval; } diff --git a/lib/libc/mingw/math/llrintl.c b/lib/libc/mingw/math/llrintl.c index ac06ab2953..6a2bf73d8f 100644 --- a/lib/libc/mingw/math/llrintl.c +++ b/lib/libc/mingw/math/llrintl.c @@ -19,8 +19,23 @@ long long llrintl (long double x) retval = (long long)ceil(x); else if (mode == FE_TOWARDZERO) retval = x >= 0 ? (long long)floor(x) : (long long)ceil(x); - else - retval = x >= 0 ? (long long)floor(x + 0.5) : (long long)ceil(x - 0.5); + else { + // Break `x` into integral and fractional parts. + long double intg, frac; + frac = modfl(x, &intg); + frac = fabsl(frac); + // Convert the truncated integral part to an integer. + retval = intg; + if (frac < 0.5) { + // Round towards zero. + } else if (frac > 0.5) { + // Round towards infinities. + retval += signbit(x) ? -1 : 1; + } else { + // Round to the nearest even number. + retval += retval % 2; + } + } #endif return retval; } diff --git a/lib/libc/mingw/math/signbitl.c b/lib/libc/mingw/math/signbitl.c index 723933dbb9..19f2938dbc 100644 --- a/lib/libc/mingw/math/signbitl.c +++ b/lib/libc/mingw/math/signbitl.c @@ -3,33 +3,16 @@ * No warranty is given; refer to the file DISCLAIMER within this package. */ -typedef union __mingw_ldbl_type_t -{ - long double x; - __extension__ struct { - unsigned int low, high; - int sign_exponent : 16; - int res1 : 16; - int res0 : 32; - } lh; -} __mingw_ldbl_type_t; - -typedef union __mingw_fp_types_t -{ - long double *ld; - __mingw_ldbl_type_t *ldt; -} __mingw_fp_types_t; +#include #define __FP_SIGNBIT 0x0200 -extern int __signbit (double x); -int __signbitl (long double x); int __signbitl (long double x) { #if defined(__x86_64__) || defined(_AMD64_) - __mingw_fp_types_t ld; - ld.ld = &x; - return ((ld.ldt->lh.sign_exponent & 0x8000) != 0); + __mingw_ldbl_type_t ld; + ld.x = x; + return ((ld.lh.sign_exponent & 0x8000) != 0); #elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) return __signbit(x); #elif defined(__i386__) || defined(_X86_) diff --git a/lib/libc/mingw/math/sinhl.c b/lib/libc/mingw/math/sinhl.c index 4db0e51ffa..aa6f0a9c34 100644 --- a/lib/libc/mingw/math/sinhl.c +++ b/lib/libc/mingw/math/sinhl.c @@ -6,6 +6,15 @@ #include "cephes_mconf.h" #include +#if defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__) +#include + +long double sinhl(long double x) +{ + return sinh(x); +} +#else + #ifdef UNK static uLD P[] = { { { 1.7550769032975377032681E-6L } }, @@ -97,4 +106,4 @@ long double sinhl(long double x) a *= a; return (x + x * a * (polevll(a,P,3)/polevll(a,Q,4))); } - +#endif diff --git a/lib/libc/mingw/math/tanhl.c b/lib/libc/mingw/math/tanhl.c index 2c48a6aab8..da3fc5e25d 100644 --- a/lib/libc/mingw/math/tanhl.c +++ b/lib/libc/mingw/math/tanhl.c @@ -8,6 +8,15 @@ #define _SET_ERRNO(x) #endif +#if defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__) +#include + +long double tanhl(long double x) +{ + return tanh(x); +} +#else + #ifdef UNK static uLD P[] = { { { -6.8473739392677100872869E-5L } }, @@ -89,4 +98,4 @@ long double tanhl(long double x) } return (z); } - +#endif diff --git a/lib/libc/mingw/math/tgamma.c b/lib/libc/mingw/math/tgamma.c index a75f7a9c8d..f652d80a36 100644 --- a/lib/libc/mingw/math/tgamma.c +++ b/lib/libc/mingw/math/tgamma.c @@ -168,6 +168,9 @@ double __tgamma_r(double x, int *sgngam) return (x); #endif #endif + if (x == 0.0) + return copysign(HUGE_VAL, x); + q = fabs(x); if (q > 33.0) @@ -180,8 +183,8 @@ double __tgamma_r(double x, int *sgngam) gsing: _SET_ERRNO(EDOM); mtherr("tgamma", SING); -#ifdef INFINITIES - return (INFINITY); +#ifdef NANS + return (NAN); #else return (MAXNUM); #endif diff --git a/lib/libc/mingw/math/tgammaf.c b/lib/libc/mingw/math/tgammaf.c index 771b55c779..742d146418 100644 --- a/lib/libc/mingw/math/tgammaf.c +++ b/lib/libc/mingw/math/tgammaf.c @@ -82,6 +82,8 @@ float __tgammaf_r( float x, int* sgngamf) return (x); #endif #endif + if (x == 0.0) + return copysignf(HUGE_VALF, x); *sgngamf = 1; negative = 0; @@ -96,8 +98,8 @@ float __tgammaf_r( float x, int* sgngamf) gsing: _SET_ERRNO(EDOM); mtherr("tgammaf", SING); -#ifdef INFINITIES - return (INFINITYF); +#ifdef NANS + return (NAN); #else return (MAXNUMF); #endif diff --git a/lib/libc/mingw/math/tgammal.c b/lib/libc/mingw/math/tgammal.c index 99408eed7e..1c7d4ea945 100644 --- a/lib/libc/mingw/math/tgammal.c +++ b/lib/libc/mingw/math/tgammal.c @@ -5,6 +5,14 @@ */ #include "cephes_mconf.h" +#if defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) +double tgamma(double x); + +long double tgammal(long double x) +{ + return tgamma(x); +} +#else /* gamma(x+2) = gamma(x+2) P(x)/Q(x) 0 <= x <= 1 @@ -272,7 +280,7 @@ long double __tgammal_r(long double x, int* sgngaml) *sgngaml = 1; #ifdef NANS if (isnanl(x)) - return (NANL); + return x; #endif #ifdef INFINITIES #ifdef NANS @@ -285,6 +293,9 @@ long double __tgammal_r(long double x, int* sgngaml) return (x); #endif #endif + if (x == 0.0L) + return copysignl(HUGE_VALL, x); + q = fabsl(x); if (q > 13.0L) @@ -299,8 +310,8 @@ long double __tgammal_r(long double x, int* sgngaml) gsing: _SET_ERRNO(EDOM); mtherr("tgammal", SING); -#ifdef INFINITIES - return (INFINITYL); +#ifdef NANS + return (NAN); #else return (*sgngaml * MAXNUML); #endif @@ -390,4 +401,4 @@ long double tgammal(long double x) int local_sgngaml = 0; return (__tgammal_r(x, &local_sgngaml)); } - +#endif diff --git a/lib/libc/mingw/math/x86/acosh.def.h b/lib/libc/mingw/math/x86/acosh.def.h index 7ecf08beba..3a7e07763e 100644 --- a/lib/libc/mingw/math/x86/acosh.def.h +++ b/lib/libc/mingw/math/x86/acosh.def.h @@ -50,15 +50,19 @@ __FLT_TYPE __FLT_ABI(acosh) (__FLT_TYPE x) { int x_class = fpclassify (x); - if (x_class == FP_NAN || x < __FLT_CST(1.0)) + if (x_class == FP_NAN) + { + __FLT_RPT_DOMAIN ("acosh", x, 0.0, x); + return x; + } + else if (x < __FLT_CST(1.0)) { __FLT_RPT_DOMAIN ("acosh", x, 0.0, __FLT_NAN); return __FLT_NAN; } else if (x_class == FP_INFINITE) { - __FLT_RPT_DOMAIN ("acosh", x, 0.0, __FLT_NAN); - return __FLT_NAN; + return INFINITY; } if (x > __FLT_CST(0x1p32)) diff --git a/lib/libc/mingw/math/x86/frexpl.S b/lib/libc/mingw/math/x86/frexpl.S deleted file mode 100644 index f9fcc6be1c..0000000000 --- a/lib/libc/mingw/math/x86/frexpl.S +++ /dev/null @@ -1,130 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ -#include <_mingw_mac.h> - -/* - * frexpl(long double x, int* expnt) extracts the exponent from x. - * It returns an integer power of two to expnt and the significand - * between 0.5 and 1 to y. Thus x = y * 2**expn. - */ -#ifdef __x86_64__ - .align 8 -#else - .align 2 -#endif -.globl __MINGW_USYMBOL(frexpl) -__MINGW_USYMBOL(frexpl): -#ifdef __x86_64__ - pushq %rbp - movq %rsp,%rbp - subq $48,%rsp - pushq %rsi - fldt (%rdx) - movq %rcx,%r9 - fld %st(0) - fstpt -12(%rbp) - leaq -4(%rbp),%rcx - movw -4(%rbp),%dx - andl $32767,%edx - jne L25 - fldz - fucompp - fnstsw %ax - andb $68,%ah - xorb $64,%ah - jne L21 - movl $0,(%r8) - fldz - jmp L24 - .align 4,0x90 - .align 4,0x90 -L21: - fldt -12(%rbp) - fadd %st(0),%st - fstpt -12(%rbp) - decl %edx - movw (%rcx),%si - andl $32767,%esi - jne L22 - cmpl $-66,%edx - jg L21 -L22: - add %esi,%edx - jmp L19 - .align 2,0x90 -L25: - fstp %st(0) -L19: - addl $-16382,%edx - movl %edx,(%r8) - movw (%rcx),%ax - andl $-32768,%eax - orl $16382,%eax - movw %ax,(%rcx) - fldt -12(%rbp) -L24: - popq %rsi - movq %r9,%rax - movq $0,8(%r9) - fstpt (%r9) - leave - ret -#else - pushl %ebp - movl %esp,%ebp - subl $24,%esp - pushl %esi - pushl %ebx - fldt 8(%ebp) - movl 20(%ebp),%ebx - fld %st(0) - fstpt -12(%ebp) - leal -4(%ebp),%ecx - movw -4(%ebp),%dx - andl $32767,%edx - jne L25 - fldz - fucompp - fnstsw %ax - andb $68,%ah - xorb $64,%ah - jne L21 - movl $0,(%ebx) - fldz - jmp L24 - .align 2,0x90 - .align 2,0x90 -L21: - fldt -12(%ebp) - fadd %st(0),%st - fstpt -12(%ebp) - decl %edx - movw (%ecx),%si - andl $32767,%esi - jne L22 - cmpl $-66,%edx - jg L21 -L22: - addl %esi,%edx - jmp L19 - .align 2,0x90 -L25: - fstp %st(0) -L19: - addl $-16382,%edx - movl %edx,(%ebx) - movw (%ecx),%ax - andl $-32768,%eax - orl $16382,%eax - movw %ax,(%ecx) - fldt -12(%ebp) -L24: - leal -32(%ebp),%esp - popl %ebx - popl %esi - leave - ret -#endif diff --git a/lib/libc/mingw/math/x86/ilogb.S b/lib/libc/mingw/math/x86/ilogb.S index c54f350d0a..b3bf1d2167 100644 --- a/lib/libc/mingw/math/x86/ilogb.S +++ b/lib/libc/mingw/math/x86/ilogb.S @@ -45,9 +45,7 @@ ilogb (double x) if (hx < 0x7ff00000) return (hx >> 20) - 1023; lx = hlp.lh.low; - if (((hx ^ 0x7ff00000) | lx) == 0) - return 0x7fffffff; - return 0x80000000; + return 0x7fffffff; } */ subq $24, %rsp .seh_stackalloc 24 @@ -80,13 +78,7 @@ ilogb (double x) .L2: cmpl $2146435071, %edx jle .L13 - movsd %xmm0, 8(%rsp) - movq 8(%rsp), %rax - xorl $2146435072, %edx - orl %eax, %edx - cmpl $1, %edx - sbbl %eax, %eax - addl $-2147483648, %eax + movl $2147483647, %eax .L3: addq $24, %rsp ret @@ -126,6 +118,8 @@ ilogb (double x) andb %ah, %dh cmpb $0x05, %dh je 1f /* Is +-Inf, jump. */ + cmpb $0x01, %dh + je 1f /* Is NaN, jump. */ fxtract pushl %eax diff --git a/lib/libc/mingw/math/x86/ilogbf.S b/lib/libc/mingw/math/x86/ilogbf.S index 8b2465564a..4f860dd691 100644 --- a/lib/libc/mingw/math/x86/ilogbf.S +++ b/lib/libc/mingw/math/x86/ilogbf.S @@ -34,9 +34,7 @@ ilogbf (float x) } if (hx < 0x7f800000) return (hx >> 23) - 127; - if (hx == 0x7f800000) - return 0x7fffffff; - return 0x80000000; + return 0x7fffffff; } */ subq $24, %rsp .seh_stackalloc 24 @@ -65,10 +63,7 @@ ilogbf (float x) .L2: cmpl $2139095039, %edx jle .L10 - cmpl $2139095040, %edx movl $2147483647, %eax - movl $-2147483648, %edx - cmovne %edx, %eax addq $24, %rsp ret .p2align 4,,10 @@ -92,6 +87,8 @@ ilogbf (float x) andb %ah, %dh cmpb $0x05, %dh je 1f /* Is +-Inf, jump. */ + cmpb $0x01, %dh + je 1f /* Is Nan, jump. */ fxtract pushl %eax diff --git a/lib/libc/mingw/math/x86/ilogbl.S b/lib/libc/mingw/math/x86/ilogbl.S index f68082ce63..14be7e54cd 100644 --- a/lib/libc/mingw/math/x86/ilogbl.S +++ b/lib/libc/mingw/math/x86/ilogbl.S @@ -23,6 +23,8 @@ __MINGW_USYMBOL(ilogbl): andb %ah, %dh cmpb $0x05, %dh je 1f /* Is +-Inf, jump. */ + cmpb $0x01, %dh + je 1f /* Is NaN, jump. */ fxtract pushq %rax @@ -48,6 +50,8 @@ __MINGW_USYMBOL(ilogbl): andb %ah, %dh cmpb $0x05, %dh je 1f /* Is +-Inf, jump. */ + cmpb $0x01, %dh + je 1f /* Is NaN, jump. */ fxtract pushl %eax diff --git a/lib/libc/mingw/math/x86/log.def.h b/lib/libc/mingw/math/x86/log.def.h index 9428f90ce6..a0d54b73d9 100644 --- a/lib/libc/mingw/math/x86/log.def.h +++ b/lib/libc/mingw/math/x86/log.def.h @@ -56,6 +56,8 @@ __FLT_ABI(log) (__FLT_TYPE x) __FLT_RPT_ERANGE ("log", x, 0.0, -__FLT_HUGE_VAL, 1); return -__FLT_HUGE_VAL; } + else if (x_class == FP_NAN) + return x; else if (signbit (x)) { __FLT_RPT_DOMAIN ("log", x, 0.0, __FLT_NAN); @@ -63,7 +65,5 @@ __FLT_ABI(log) (__FLT_TYPE x) } else if (x_class == FP_INFINITE) return __FLT_HUGE_VAL; - else if (x_class == FP_NAN) - return __FLT_NAN; return (__FLT_TYPE) __logl_internal ((long double) x); } diff --git a/lib/libc/mingw/math/x86/logb.c b/lib/libc/mingw/math/x86/logb.c index 0c0475d932..d522110e2a 100644 --- a/lib/libc/mingw/math/x86/logb.c +++ b/lib/libc/mingw/math/x86/logb.c @@ -25,8 +25,10 @@ logb (double x) return -1.0 / fabs (x); if (hx >= 0x7ff00000) return x * x; - if ((hx >>= 20) == 0) /* IEEE 754 logb */ - return -1022.0; + if ((hx >>= 20) == 0) { + unsigned long long mantissa = hlp.val & 0xfffffffffffffULL; + return -1023.0 - (__builtin_clzll(mantissa) - 12); + } return (double) (hx - 1023); #else double res = 0.0; diff --git a/lib/libc/mingw/math/x86/logbf.c b/lib/libc/mingw/math/x86/logbf.c index 158b29b7b7..2d62233ed5 100644 --- a/lib/libc/mingw/math/x86/logbf.c +++ b/lib/libc/mingw/math/x86/logbf.c @@ -24,8 +24,8 @@ logbf (float x) return (float)-1.0 / fabsf (x); if (v >= 0x7f800000) return x * x; - if ((v >>= 23) == 0) /* IEEE 754 logb */ - return -126.0; + if ((v >>= 23) == 0) + return -127.0 - (__builtin_clzl(hlp.val & 0x7fffff) - 9); return (float) (v - 127); #else float res = 0.0F; diff --git a/lib/libc/mingw/math/x86/pow.def.h b/lib/libc/mingw/math/x86/pow.def.h index 375b02b9d3..0cf0739fee 100644 --- a/lib/libc/mingw/math/x86/pow.def.h +++ b/lib/libc/mingw/math/x86/pow.def.h @@ -121,9 +121,13 @@ __FLT_ABI(pow) (__FLT_TYPE x, __FLT_TYPE y) return __FLT_CST(1.0); else if (x_class == FP_NAN || y_class == FP_NAN) { - rslt = (signbit(x) ? -__FLT_NAN : __FLT_NAN); - __FLT_RPT_DOMAIN ("pow", x, y, rslt); - return rslt; + if (x_class == FP_NAN) { + __FLT_RPT_DOMAIN ("pow", x, y, x); + return x; + } else { + __FLT_RPT_DOMAIN ("pow", x, y, y); + return y; + } } else if (x_class == FP_ZERO) { diff --git a/lib/libc/mingw/misc/assert.c b/lib/libc/mingw/misc/assert.c deleted file mode 100644 index 0bebb7e97f..0000000000 --- a/lib/libc/mingw/misc/assert.c +++ /dev/null @@ -1,31 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ -#include -#include -#include -#include -#include - -void __cdecl _wassert (const wchar_t *, const wchar_t *,unsigned); -void __cdecl _assert (const char *, const char *, unsigned); - -void __cdecl -_assert (const char *_Message, const char *_File, unsigned _Line) -{ - wchar_t *m, *f; - int i; - m = (wchar_t *) malloc ((strlen (_Message) + 1) * sizeof (wchar_t)); - f = (wchar_t *) malloc ((strlen (_File) + 1) * sizeof (wchar_t)); - for (i = 0; _Message[i] != 0; i++) - m[i] = ((wchar_t) _Message[i]) & 0xff; - m[i] = 0; - for (i = 0; _File[i] != 0; i++) - f[i] = ((wchar_t) _File[i]) & 0xff; - f[i] = 0; - _wassert (m, f, _Line); - free (m); - free (f); -} diff --git a/lib/libc/mingw/misc/difftime.c b/lib/libc/mingw/misc/difftime.c deleted file mode 100644 index 5d49f52912..0000000000 --- a/lib/libc/mingw/misc/difftime.c +++ /dev/null @@ -1,21 +0,0 @@ -#define __CRT__NO_INLINE -#include -#include - -/* FIXME: Relying on _USE_32BIT_TIME_T, which is a user-macro, -during CRT compilation is plainly broken. Need an appropriate -implementation to provide users the ability of compiling the -CRT only with 32-bit time_t behavior. */ - -#ifndef _USE_32BIT_TIME_T -double __cdecl difftime(time_t _Time1,time_t _Time2) -{ - return _difftime64(_Time1,_Time2); -} -#else -double __cdecl difftime(time_t _Time1,time_t _Time2) -{ - return _difftime32(_Time1,_Time2); -} -#endif - diff --git a/lib/libc/mingw/misc/difftime32.c b/lib/libc/mingw/misc/difftime32.c deleted file mode 100644 index b893944414..0000000000 --- a/lib/libc/mingw/misc/difftime32.c +++ /dev/null @@ -1,9 +0,0 @@ -#include - -double __cdecl _difftime32(__time32_t _Time1,__time32_t _Time2) -{ - __time32_t r = _Time1 - _Time2; - if (r > _Time1) - return -((double) (_Time2 - _Time1)); - return (double) r; -} diff --git a/lib/libc/mingw/misc/difftime64.c b/lib/libc/mingw/misc/difftime64.c deleted file mode 100644 index 54f9a12af9..0000000000 --- a/lib/libc/mingw/misc/difftime64.c +++ /dev/null @@ -1,9 +0,0 @@ -#include - -double __cdecl _difftime64(__time64_t _Time1,__time64_t _Time2) -{ - __time64_t r = _Time1 - _Time2; - if (r > _Time1) - return -((double) (_Time2 - _Time1)); - return (double) r; -} diff --git a/lib/libc/mingw/misc/execv.c b/lib/libc/mingw/misc/execv.c deleted file mode 100644 index 50fd232495..0000000000 --- a/lib/libc/mingw/misc/execv.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -int __cdecl execv(const char *_Filename,char *const _ArgList[]) -{ - return _execv (_Filename, (const char *const *)_ArgList); -} diff --git a/lib/libc/mingw/misc/execve.c b/lib/libc/mingw/misc/execve.c deleted file mode 100644 index 6ab039ea1f..0000000000 --- a/lib/libc/mingw/misc/execve.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -int __cdecl execve(const char *_Filename,char *const _ArgList[],char *const _Env[]) -{ - return _execve (_Filename, (const char *const *)_ArgList, (const char * const *)_Env); -} diff --git a/lib/libc/mingw/misc/execvp.c b/lib/libc/mingw/misc/execvp.c deleted file mode 100644 index b11ab3f40b..0000000000 --- a/lib/libc/mingw/misc/execvp.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -int __cdecl execvp(const char *_Filename,char *const _ArgList[]) -{ - return _execvp (_Filename, (const char *const *)_ArgList); -} diff --git a/lib/libc/mingw/misc/execvpe.c b/lib/libc/mingw/misc/execvpe.c deleted file mode 100644 index f6fa80ad40..0000000000 --- a/lib/libc/mingw/misc/execvpe.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -int __cdecl execvpe(const char *_Filename,char *const _ArgList[],char *const _Env[]) -{ - return _execvpe (_Filename, (const char *const *)_ArgList, (const char *const *)_Env); -} diff --git a/lib/libc/mingw/misc/fesetenv.c b/lib/libc/mingw/misc/fesetenv.c index f998017b4f..a3279bddd2 100644 --- a/lib/libc/mingw/misc/fesetenv.c +++ b/lib/libc/mingw/misc/fesetenv.c @@ -52,7 +52,7 @@ int fesetenv (const fenv_t * envp) else if (envp == FE_PC53_ENV) /* * MS _fpreset() does same *except* it sets control word - * to 0x27f (53-bit precison). + * to 0x27f (53-bit precision). * We force calling _fpreset in msvcrt.dll */ @@ -65,16 +65,17 @@ int fesetenv (const fenv_t * envp) else { fenv_t env = *envp; + int has_sse = __mingw_has_sse (); int _mxcsr; - __asm__ ("fnstenv %0\n" - "stmxcsr %1" : "=m" (*&env), "=m" (*&_mxcsr)); /*_mxcsr = ((int)envp->__unused0 << 16) | (int)envp->__unused1; *//* mxcsr low and high */ + if (has_sse) + __asm__ ("stmxcsr %0" : "=m" (*&_mxcsr)); env.__unused0 = 0xffff; env.__unused1 = 0xffff; __asm__ volatile ("fldenv %0" : : "m" (env) : "st", "st(1)", "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)"); - if (__mingw_has_sse ()) + if (has_sse) __asm__ volatile ("ldmxcsr %0" : : "m" (*&_mxcsr)); } diff --git a/lib/libc/mingw/misc/feupdateenv.c b/lib/libc/mingw/misc/feupdateenv.c index 4a89d0b2c2..aea95902bb 100644 --- a/lib/libc/mingw/misc/feupdateenv.c +++ b/lib/libc/mingw/misc/feupdateenv.c @@ -19,7 +19,7 @@ int feupdateenv (const fenv_t * envp) { unsigned int _fexcept = fetestexcept (FE_ALL_EXCEPT); /*save excepts */ fesetenv (envp); /* install the env */ - feraiseexcept (_fexcept); /* raise the execept */ + feraiseexcept (_fexcept); /* raise the except */ return 0; } diff --git a/lib/libc/mingw/misc/mbrtowc.c b/lib/libc/mingw/misc/mbrtowc.c index c3091cb4b5..2eb480749f 100644 --- a/lib/libc/mingw/misc/mbrtowc.c +++ b/lib/libc/mingw/misc/mbrtowc.c @@ -137,13 +137,10 @@ mbsrtowcs (wchar_t* __restrict__ dst, const char ** __restrict__ src, else { wchar_t byte_bucket = 0; - while ((ret = __mbrtowc_cp (&byte_bucket, *src, mb_max, + while ((ret = __mbrtowc_cp (&byte_bucket, *src + n, mb_max, internal_ps, cp, mb_max)) > 0) - { - *src += ret; - n += ret; - } + n += ret; } return n; } diff --git a/lib/libc/mingw/misc/mingw_getsp.S b/lib/libc/mingw/misc/mingw_getsp.S index 5d224d1409..1e83b7383c 100644 --- a/lib/libc/mingw/misc/mingw_getsp.S +++ b/lib/libc/mingw/misc/mingw_getsp.S @@ -28,125 +28,3 @@ __MINGW_USYMBOL(mingw_getsp): mov x0, sp ret #endif - -/* On ARM: - * Error: cannot represent BFD_RELOC_32_PCREL relocation in this object file format - * But anyway, nothing is needed here as libarm32/libmsvcrt.a is exporting longjmp - ldr ip, 1f - ldr pc, [pc, ip] - 1: .long __imp_longjmp - (1b + 4) -*/ -#if !(defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__)) - .globl __MINGW_USYMBOL(longjmp) - .def __MINGW_USYMBOL(longjmp); .scl 2; .type 32; .endef -__MINGW_USYMBOL(longjmp): -#if defined(_AMD64_) || defined(__x86_64__) -#ifndef __SEH__ - xorq %rax,%rax - movq %rax, (%rcx) -#endif - leaq __MINGW_IMP_LSYMBOL(longjmp)(%rip), %rax - jmpq *(%rax) -#elif defined(_X86_) || defined(__i386__) - jmp *__imp__longjmp -#endif -#endif /* !(defined(_ARM_) || defined(__arm__)) */ - -#if defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__) - .globl __MINGW_USYMBOL(__mingw_setjmp) - .def __MINGW_USYMBOL(__mingw_setjmp); .scl 2; .type 32; .endef -__MINGW_USYMBOL(__mingw_setjmp): -#if defined(_ARM_) || defined(__arm__) - mov r1, #0 - str r1, [r0] /* jmp_buf->Frame */ - str r4, [r0, #0x4] /* jmp_buf->R4 */ - str r5, [r0, #0x8] /* jmp_buf->R5 */ - str r6, [r0, #0xc] /* jmp_buf->R6 */ - str r7, [r0, #0x10] /* jmp_buf->R7 */ - str r8, [r0, #0x14] /* jmp_buf->R8 */ - str r9, [r0, #0x18] /* jmp_buf->R9 */ - str r10, [r0, #0x1c] /* jmp_buf->R10 */ - str r11, [r0, #0x20] /* jmp_buf->R11 */ - str sp, [r0, #0x24] /* jmp_buf->Sp */ - str lr, [r0, #0x28] /* jmp_buf->Pc */ - vmrs r2, fpscr - str r2, [r0, #0x2c] /* jmp_buf->Fpscr */ - vstr d8, [r0, #0x30] /* jmp_buf->D[0] */ - vstr d9, [r0, #0x38] /* jmp_buf->D[1] */ - vstr d10, [r0, #0x40] /* jmp_buf->D[2] */ - vstr d11, [r0, #0x48] /* jmp_buf->D[3] */ - vstr d12, [r0, #0x50] /* jmp_buf->D[4] */ - vstr d13, [r0, #0x58] /* jmp_buf->D[5] */ - vstr d14, [r0, #0x60] /* jmp_buf->D[6] */ - vstr d15, [r0, #0x68] /* jmp_buf->D[7] */ - mov r0, #0 - bx lr -#elif defined(_ARM64_) || defined(__aarch64__) - str xzr, [x0] /* jmp_buf->Frame */ - stp x19, x20, [x0, #0x10] /* jmp_buf->X19, X20 */ - stp x21, x22, [x0, #0x20] /* jmp_buf->X21, X22 */ - stp x23, x24, [x0, #0x30] /* jmp_buf->X23, X24 */ - stp x25, x26, [x0, #0x40] /* jmp_buf->X25, X26 */ - stp x27, x28, [x0, #0x50] /* jmp_buf->X27, X28 */ - stp x29, x30, [x0, #0x60] /* jmp_buf->Fp, Lr */ - mov x2, sp - str x2, [x0, #0x70] /* jmp_buf->Sp */ - mrs x2, fpcr - str w2, [x0, #0x78] /* jmp_buf->Fpcr */ - mrs x2, fpsr - str w2, [x0, #0x7c] /* jmp_buf->Fpsr */ - stp d8, d9, [x0, #0x80] /* jmp_buf->D[0-1] */ - stp d10, d11, [x0, #0x90] /* jmp_buf->D[2-3] */ - stp d12, d13, [x0, #0xa0] /* jmp_buf->D[4-5] */ - stp d14, d15, [x0, #0xb0] /* jmp_buf->D[6-7] */ - mov x0, #0 - ret -#endif - - .globl __MINGW_USYMBOL(__mingw_longjmp) - .def __MINGW_USYMBOL(__mingw_longjmp); .scl 2; .type 32; .endef -__MINGW_USYMBOL(__mingw_longjmp): -#if defined(_ARM_) || defined(__arm__) - ldr r4, [r0, #0x4] /* jmp_buf->R4 */ - ldr r5, [r0, #0x8] /* jmp_buf->R5 */ - ldr r6, [r0, #0xc] /* jmp_buf->R6 */ - ldr r7, [r0, #0x10] /* jmp_buf->R7 */ - ldr r8, [r0, #0x14] /* jmp_buf->R8 */ - ldr r9, [r0, #0x18] /* jmp_buf->R9 */ - ldr r10, [r0, #0x1c] /* jmp_buf->R10 */ - ldr r11, [r0, #0x20] /* jmp_buf->R11 */ - ldr sp, [r0, #0x24] /* jmp_buf->Sp */ - ldr r2, [r0, #0x28] /* jmp_buf->Pc */ - ldr r3, [r0, #0x2c] /* jmp_buf->Fpscr */ - vmsr fpscr, r3 - vldr d8, [r0, #0x30] /* jmp_buf->D[0] */ - vldr d9, [r0, #0x38] /* jmp_buf->D[1] */ - vldr d10, [r0, #0x40] /* jmp_buf->D[2] */ - vldr d11, [r0, #0x48] /* jmp_buf->D[3] */ - vldr d12, [r0, #0x50] /* jmp_buf->D[4] */ - vldr d13, [r0, #0x58] /* jmp_buf->D[5] */ - vldr d14, [r0, #0x60] /* jmp_buf->D[6] */ - vldr d15, [r0, #0x68] /* jmp_buf->D[7] */ - mov r0, r1 /* retval */ - bx r2 -#elif defined(_ARM64_) || defined(__aarch64__) - ldp x19, x20, [x0, #0x10] /* jmp_buf->X19, X20 */ - ldp x21, x22, [x0, #0x20] /* jmp_buf->X21, X22 */ - ldp x23, x24, [x0, #0x30] /* jmp_buf->X23, X24 */ - ldp x25, x26, [x0, #0x40] /* jmp_buf->X25, X26 */ - ldp x27, x28, [x0, #0x50] /* jmp_buf->X27, X28 */ - ldp x29, x30, [x0, #0x60] /* jmp_buf->Fp, Lr */ - ldr x2, [x0, #0x70] /* jmp_buf->Sp */ - mov sp, x2 - ldr w2, [x0, #0x78] /* jmp_buf->Fpcr */ - msr fpcr, x2 - ldr w2, [x0, #0x7c] /* jmp_buf->Fpsr */ - msr fpsr, x2 - ldp d8, d9, [x0, #0x80] /* jmp_buf->D[0-1] */ - ldp d10, d11, [x0, #0x90] /* jmp_buf->D[2-3] */ - ldp d12, d13, [x0, #0xa0] /* jmp_buf->D[4-5] */ - ldp d14, d15, [x0, #0xb0] /* jmp_buf->D[6-7] */ - mov x0, x1 /* retval */ - ret -#endif -#endif diff --git a/lib/libc/mingw/misc/spawnv.c b/lib/libc/mingw/misc/spawnv.c deleted file mode 100644 index 88e690c8b1..0000000000 --- a/lib/libc/mingw/misc/spawnv.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -intptr_t __cdecl spawnv(int mode,const char *_Filename,char *const _ArgList[]) -{ - return _spawnv(mode, _Filename,(const char *const *)_ArgList); -} diff --git a/lib/libc/mingw/misc/spawnve.c b/lib/libc/mingw/misc/spawnve.c deleted file mode 100644 index 8731c33afc..0000000000 --- a/lib/libc/mingw/misc/spawnve.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -intptr_t __cdecl spawnve(int mode,const char *_Filename,char *const _ArgList[],char *const _Env[]) -{ - return _spawnve(mode, _Filename,(const char *const *)_ArgList,(const char *const *)_Env); -} diff --git a/lib/libc/mingw/misc/spawnvp.c b/lib/libc/mingw/misc/spawnvp.c deleted file mode 100644 index 75e17e13cc..0000000000 --- a/lib/libc/mingw/misc/spawnvp.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -intptr_t __cdecl spawnvp(int mode,const char *_Filename,char *const _ArgList[]) -{ - return _spawnvp(mode, _Filename,(const char *const *)_ArgList); -} diff --git a/lib/libc/mingw/misc/spawnvpe.c b/lib/libc/mingw/misc/spawnvpe.c deleted file mode 100644 index 08e41e8289..0000000000 --- a/lib/libc/mingw/misc/spawnvpe.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -intptr_t __cdecl spawnvpe(int mode,const char *_Filename,char *const _ArgList[],char *const _Env[]) -{ - return _spawnvpe(mode, _Filename,(const char *const *)_ArgList,(const char *const *)_Env); -} diff --git a/lib/libc/mingw/misc/wassert.c b/lib/libc/mingw/misc/wassert.c index 7d745d9215..2fdd5e29a5 100644 --- a/lib/libc/mingw/misc/wassert.c +++ b/lib/libc/mingw/misc/wassert.c @@ -3,47 +3,47 @@ * This file is part of the mingw-w64 runtime package. * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ -#include -#include + +#include #include -#include -#include +#include +#include "msvcrt.h" -extern int mingw_app_type; - -void __cdecl _wassert (const wchar_t *, const wchar_t *,unsigned); -void __cdecl _assert (const char *, const char *, unsigned); - -void __cdecl -_wassert (const wchar_t *_Message, const wchar_t *_File, unsigned _Line) +/* _wassert is not available on XP, so forward it to _assert if needed */ +static void __cdecl mingw_wassert(const wchar_t *_Message, const wchar_t *_File, unsigned _Line) { - wchar_t *msgbuf = (wchar_t *) malloc (8192*sizeof(wchar_t)); - wchar_t fn[MAX_PATH + 1]; - DWORD nCode; + char *message = NULL, *file = NULL; + size_t len; - if (!_File || _File[0] == 0) - _File = L""; - if (!_Message || _Message[0] == 0) - _Message = L"?"; - if (! GetModuleFileNameW (NULL, fn, MAX_PATH)) - wcscpy (fn, L""); - _snwprintf (msgbuf, 8191, L"Assertion failed!\n\nProgram: %ws\n" - "File: %ws, Line %u\n\nExpression: %ws", - fn, _File,_Line, _Message); - if (mingw_app_type == 0) + if ((len = wcstombs(NULL, _Message, 0)) != (size_t)-1) { - fwprintf (stderr, L"%ws\n", msgbuf); - abort (); + message = malloc(len + 1); + wcstombs(message, _Message, len + 1); } - nCode = MessageBoxW (NULL, msgbuf, L"MinGW Runtime Assertion", MB_ABORTRETRYIGNORE| - MB_ICONHAND|MB_SETFOREGROUND|MB_TASKMODAL); - if (nCode == IDABORT) + + if ((len = wcstombs(NULL, _File, 0)) != (size_t)-1) { - raise (SIGABRT); - _exit (3); - abort (); + file = malloc(len + 1); + wcstombs(file, _File, len + 1); } - if (nCode == IDIGNORE) - return; - abort (); + + _assert(message, file, _Line); + + free(message); + free(file); +} + +static void __cdecl init_wassert(const wchar_t *message, const wchar_t *file, unsigned line); + +void (__cdecl *__MINGW_IMP_SYMBOL(_wassert))(const wchar_t*, const wchar_t*,unsigned) = init_wassert; + +static void __cdecl init_wassert(const wchar_t *message, const wchar_t *file, unsigned line) +{ + void *func; + + func = (void*)GetProcAddress(__mingw_get_msvcrt_handle(), "_wassert"); + if(!func) + func = mingw_wassert; + + return (__MINGW_IMP_SYMBOL(_wassert) = func)(message, file, line); } diff --git a/lib/libc/mingw/secapi/_cgets_s.c b/lib/libc/mingw/secapi/_cgets_s.c index e70efe7253..f81623a9a9 100644 --- a/lib/libc/mingw/secapi/_cgets_s.c +++ b/lib/libc/mingw/secapi/_cgets_s.c @@ -1,4 +1,3 @@ -#define MINGW_HAS_SECURE_API 1 #include #include #include diff --git a/lib/libc/mingw/secapi/_cgetws_s.c b/lib/libc/mingw/secapi/_cgetws_s.c index dff4187096..01ee3d1b32 100644 --- a/lib/libc/mingw/secapi/_cgetws_s.c +++ b/lib/libc/mingw/secapi/_cgetws_s.c @@ -1,4 +1,3 @@ -#define MINGW_HAS_SECURE_API 1 #include #include #include diff --git a/lib/libc/mingw/secapi/_cprintf_s.c b/lib/libc/mingw/secapi/_cprintf_s.c index 36ea582d41..eef77df415 100644 --- a/lib/libc/mingw/secapi/_cprintf_s.c +++ b/lib/libc/mingw/secapi/_cprintf_s.c @@ -1,4 +1,3 @@ -#define MINGW_HAS_SECURE_API 1 #include #include #include diff --git a/lib/libc/mingw/secapi/_cprintf_s_l.c b/lib/libc/mingw/secapi/_cprintf_s_l.c index 316ca86ef3..cce1d51b53 100644 --- a/lib/libc/mingw/secapi/_cprintf_s_l.c +++ b/lib/libc/mingw/secapi/_cprintf_s_l.c @@ -1,4 +1,3 @@ -#define MINGW_HAS_SECURE_API 1 #include #include #include diff --git a/lib/libc/mingw/secapi/_cwprintf_s.c b/lib/libc/mingw/secapi/_cwprintf_s.c index b5ce0ab940..013ccc472d 100644 --- a/lib/libc/mingw/secapi/_cwprintf_s.c +++ b/lib/libc/mingw/secapi/_cwprintf_s.c @@ -1,4 +1,3 @@ -#define MINGW_HAS_SECURE_API 1 #include #include #include diff --git a/lib/libc/mingw/secapi/_cwprintf_s_l.c b/lib/libc/mingw/secapi/_cwprintf_s_l.c index cadd55d022..50c9c4bad8 100644 --- a/lib/libc/mingw/secapi/_cwprintf_s_l.c +++ b/lib/libc/mingw/secapi/_cwprintf_s_l.c @@ -1,4 +1,3 @@ -#define MINGW_HAS_SECURE_API 1 #include #include #include diff --git a/lib/libc/mingw/secapi/_vcprintf_s.c b/lib/libc/mingw/secapi/_vcprintf_s.c index b512bb21a9..91f143f1fa 100644 --- a/lib/libc/mingw/secapi/_vcprintf_s.c +++ b/lib/libc/mingw/secapi/_vcprintf_s.c @@ -1,4 +1,3 @@ -#define MINGW_HAS_SECURE_API 1 #include #include #include diff --git a/lib/libc/mingw/secapi/_vcprintf_s_l.c b/lib/libc/mingw/secapi/_vcprintf_s_l.c index e4c86ceb96..787c76be4d 100644 --- a/lib/libc/mingw/secapi/_vcprintf_s_l.c +++ b/lib/libc/mingw/secapi/_vcprintf_s_l.c @@ -1,4 +1,3 @@ -#define MINGW_HAS_SECURE_API 1 #include #include #include diff --git a/lib/libc/mingw/secapi/_vcwprintf_s.c b/lib/libc/mingw/secapi/_vcwprintf_s.c index e6badb1ecf..325e866197 100644 --- a/lib/libc/mingw/secapi/_vcwprintf_s.c +++ b/lib/libc/mingw/secapi/_vcwprintf_s.c @@ -1,4 +1,3 @@ -#define MINGW_HAS_SECURE_API 1 #include #include #include diff --git a/lib/libc/mingw/secapi/_vcwprintf_s_l.c b/lib/libc/mingw/secapi/_vcwprintf_s_l.c index 2ce1deffdf..4d112a1c52 100644 --- a/lib/libc/mingw/secapi/_vcwprintf_s_l.c +++ b/lib/libc/mingw/secapi/_vcwprintf_s_l.c @@ -1,4 +1,3 @@ -#define MINGW_HAS_SECURE_API 1 #include #include #include diff --git a/lib/libc/mingw/secapi/_vscprintf_p.c b/lib/libc/mingw/secapi/_vscprintf_p.c index c7ee3cc87f..3761c21b49 100644 --- a/lib/libc/mingw/secapi/_vscprintf_p.c +++ b/lib/libc/mingw/secapi/_vscprintf_p.c @@ -1,4 +1,3 @@ -#define MINGW_HAS_SECURE_API 1 #include int __cdecl _vscprintf_p(const char *format, va_list arglist) diff --git a/lib/libc/mingw/secapi/_vscwprintf_p.c b/lib/libc/mingw/secapi/_vscwprintf_p.c index 498bc1cf48..666286a62f 100644 --- a/lib/libc/mingw/secapi/_vscwprintf_p.c +++ b/lib/libc/mingw/secapi/_vscwprintf_p.c @@ -1,4 +1,3 @@ -#define MINGW_HAS_SECURE_API 1 #include int __cdecl _vscwprintf_p(const wchar_t *format, va_list arglist) diff --git a/lib/libc/mingw/secapi/_vswprintf_p.c b/lib/libc/mingw/secapi/_vswprintf_p.c index 4823c81d69..52e9dfa59e 100644 --- a/lib/libc/mingw/secapi/_vswprintf_p.c +++ b/lib/libc/mingw/secapi/_vswprintf_p.c @@ -1,4 +1,3 @@ -#define MINGW_HAS_SECURE_API 1 #include int __cdecl _vswprintf_p(wchar_t *_DstBuf, size_t _MaxCount, const wchar_t *_Format, va_list _ArgList) diff --git a/lib/libc/mingw/secapi/_waccess_s.c b/lib/libc/mingw/secapi/_waccess_s.c index 4ca83f4dd4..c4825cff44 100644 --- a/lib/libc/mingw/secapi/_waccess_s.c +++ b/lib/libc/mingw/secapi/_waccess_s.c @@ -1,4 +1,3 @@ -#define MINGW_HAS_SECURE_API 1 #include #include #include diff --git a/lib/libc/mingw/secapi/_wmktemp_s.c b/lib/libc/mingw/secapi/_wmktemp_s.c index 3cbf0c7809..e13abc7908 100644 --- a/lib/libc/mingw/secapi/_wmktemp_s.c +++ b/lib/libc/mingw/secapi/_wmktemp_s.c @@ -1,4 +1,3 @@ -#define MINGW_HAS_SECURE_API 1 #include #include #include diff --git a/lib/libc/mingw/secapi/memmove_s.c b/lib/libc/mingw/secapi/memmove_s.c index 170bdf32ce..dca1dbe57e 100644 --- a/lib/libc/mingw/secapi/memmove_s.c +++ b/lib/libc/mingw/secapi/memmove_s.c @@ -1,4 +1,3 @@ -#define MINGW_HAS_SECURE_API 1 #include #include #include diff --git a/lib/libc/mingw/secapi/sprintf_s.c b/lib/libc/mingw/secapi/sprintf_s.c index 3b92d07beb..eab682a2dc 100644 --- a/lib/libc/mingw/secapi/sprintf_s.c +++ b/lib/libc/mingw/secapi/sprintf_s.c @@ -1,4 +1,3 @@ -#define MINGW_HAS_SECURE_API 1 #include #include #include diff --git a/lib/libc/mingw/secapi/strerror_s.c b/lib/libc/mingw/secapi/strerror_s.c index 148236d393..3a68360e56 100644 --- a/lib/libc/mingw/secapi/strerror_s.c +++ b/lib/libc/mingw/secapi/strerror_s.c @@ -1,4 +1,3 @@ -#define MINGW_HAS_SECURE_API 1 #include #include #include diff --git a/lib/libc/mingw/secapi/vsprintf_s.c b/lib/libc/mingw/secapi/vsprintf_s.c index 96a7680830..45dfb14b11 100644 --- a/lib/libc/mingw/secapi/vsprintf_s.c +++ b/lib/libc/mingw/secapi/vsprintf_s.c @@ -1,4 +1,3 @@ -#define MINGW_HAS_SECURE_API 1 #include #include #include diff --git a/lib/libc/mingw/secapi/wmemcpy_s.c b/lib/libc/mingw/secapi/wmemcpy_s.c index bb59bdca80..83879246ed 100644 --- a/lib/libc/mingw/secapi/wmemcpy_s.c +++ b/lib/libc/mingw/secapi/wmemcpy_s.c @@ -1,4 +1,3 @@ -#define MINGW_HAS_SECURE_API 1 #include #include #include diff --git a/lib/libc/mingw/secapi/wmemmove_s.c b/lib/libc/mingw/secapi/wmemmove_s.c index 788fa7e461..2e0d572efd 100644 --- a/lib/libc/mingw/secapi/wmemmove_s.c +++ b/lib/libc/mingw/secapi/wmemmove_s.c @@ -1,4 +1,3 @@ -#define MINGW_HAS_SECURE_API 1 #include #include #include diff --git a/lib/libc/mingw/stdio/fseeko64.c b/lib/libc/mingw/stdio/fseeko64.c index 5905aa22ee..99a54f7735 100644 --- a/lib/libc/mingw/stdio/fseeko64.c +++ b/lib/libc/mingw/stdio/fseeko64.c @@ -76,33 +76,7 @@ static struct oserr_map local_errtab[] = { { ERROR_NOT_ENOUGH_QUOTA, ENOMEM }, { 0, -1 } }; -_CRTIMP __int64 __cdecl _lseeki64(int fh,__int64 pos,int mthd); -__int64 __cdecl _ftelli64(FILE *str); void mingw_dosmaperr (unsigned long oserrno); -int __cdecl _flush (FILE *str); - -int __cdecl _flush (FILE *str) -{ - FILE *stream; - int rc = 0; /* assume good return */ - __int64 nchar; - - stream = str; - if ((stream->_flag & (_IOREAD | _IOWRT)) == _IOWRT && bigbuf(stream) - && (nchar = (__int64) (stream->_ptr - stream->_base)) > 0ll) - { - if ( _write(_fileno(stream), stream->_base, nchar) == nchar) { - if (_IORW & stream->_flag) - stream->_flag &= ~_IOWRT; - } else { - stream->_flag |= _IOERR; - rc = EOF; - } - } - stream->_ptr = stream->_base; - stream->_cnt = 0ll; - return rc; -} int fseeko64 (FILE* stream, _off64_t offset, int whence) { @@ -130,111 +104,6 @@ int fseeko64 (FILE* stream, _off64_t offset, int whence) return fsetpos (stream, &pos); } -int __cdecl _fseeki64(FILE *str,__int64 offset,int whence) -{ - FILE *stream; - /* Init stream pointer */ - stream = str; - errno=0; - if(!stream || ((whence != SEEK_SET) && (whence != SEEK_CUR) && (whence != SEEK_END))) - { - errno=EINVAL; - return -1; - } - /* Clear EOF flag */ - stream->_flag &= ~_IOEOF; - - if (whence == SEEK_CUR) { - offset += _ftelli64(stream); - whence = SEEK_SET; - } - /* Flush buffer as necessary */ - _flush(stream); - - /* If file opened for read/write, clear flags since we don't know - what the user is going to do next. If the file was opened for - read access only, decrease _bufsiz so that the next _filbuf - won't cost quite so much */ - - if (stream->_flag & _IORW) - stream->_flag &= ~(_IOWRT|_IOREAD); - else if ( (stream->_flag & _IOREAD) && (stream->_flag & _IOMYBUF) && - !(stream->_flag & _IOSETVBUF) ) - stream->_bufsiz = _SMALL_BUFSIZ; - - /* Seek to the desired locale and return. */ - - return (_lseeki64(_fileno(stream), offset, whence) == -1ll ? -1 : 0); -} - -__int64 __cdecl _ftelli64(FILE *str) -{ - FILE *stream; - size_t offset; - __int64 filepos; - register char *p; - char *max; - int fd; - size_t rdcnt = 0; - - errno=0; - stream = str; - fd = _fileno(stream); - if (stream->_cnt < 0ll) stream->_cnt = 0ll; - if ((filepos = _lseeki64(fd, 0ll, SEEK_CUR)) < 0L) - return -1ll; - - if (!bigbuf(stream)) /* _IONBF or no buffering designated */ - return (filepos - (__int64) stream->_cnt); - - offset = (size_t)(stream->_ptr - stream->_base); - - if (stream->_flag & (_IOWRT|_IOREAD)) - { - if (_osfile(fd) & FTEXT) - for (p = stream->_base; p < stream->_ptr; p++) - if (*p == '\n') /* adjust for '\r' */ - offset++; - } - else if (!(stream->_flag & _IORW)) { - errno=EINVAL; - return -1ll; - } - if (filepos == 0ll) - return ((__int64)offset); - - if (stream->_flag & _IOREAD) /* go to preceding sector */ - { - if (stream->_cnt == 0ll) /* filepos holds correct location */ - offset = 0ll; - else - { - rdcnt = ((size_t) stream->_cnt) + ((size_t) (size_t)(stream->_ptr - stream->_base)); - if (_osfile(fd) & FTEXT) { - if (_lseeki64(fd, 0ll, SEEK_END) == filepos) { - max = stream->_base + rdcnt; - for (p = stream->_base; p < max; p++) - if (*p == '\n') /* adjust for '\r' */ - rdcnt++; - if (stream->_flag & _IOCTRLZ) - ++rdcnt; - } else { - _lseeki64(fd, filepos, SEEK_SET); - if ( (rdcnt <= _SMALL_BUFSIZ) && (stream->_flag & _IOMYBUF) && - !(stream->_flag & _IOSETVBUF)) - rdcnt = _SMALL_BUFSIZ; - else - rdcnt = stream->_bufsiz; - if (_osfile(fd) & FCRLF) - ++rdcnt; - } - } /* end if FTEXT */ - } - filepos -= (__int64)rdcnt; - } /* end else stream->_cnt != 0 */ - return (filepos + (__int64)offset); -} - void mingw_dosmaperr (unsigned long oserrno) { size_t i; diff --git a/lib/libc/mingw/stdio/mingw_pformat.c b/lib/libc/mingw/stdio/mingw_pformat.c index 7e2493216e..a68d0f67a5 100644 --- a/lib/libc/mingw/stdio/mingw_pformat.c +++ b/lib/libc/mingw/stdio/mingw_pformat.c @@ -51,6 +51,8 @@ * */ +#define __LARGE_MBSTATE_T + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/lib/libc/mingw/stdio/mingw_vfscanf.c b/lib/libc/mingw/stdio/mingw_vfscanf.c index 4bd9e91cf1..6f2d5eb37a 100644 --- a/lib/libc/mingw/stdio/mingw_vfscanf.c +++ b/lib/libc/mingw/stdio/mingw_vfscanf.c @@ -42,6 +42,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#define __LARGE_MBSTATE_T + #include #include #include diff --git a/lib/libc/mingw/stdio/mingw_wvfscanf.c b/lib/libc/mingw/stdio/mingw_wvfscanf.c index 045aba7916..2f0a03f667 100644 --- a/lib/libc/mingw/stdio/mingw_wvfscanf.c +++ b/lib/libc/mingw/stdio/mingw_wvfscanf.c @@ -42,6 +42,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#define __LARGE_MBSTATE_T + #include #include #include @@ -104,13 +106,19 @@ get_va_nth (va_list argp, unsigned int n) } static void -optimize_alloc (int do_realloc, char **p, size_t sz, size_t need_sz, size_t typ_sz) +optimize_alloc (char **p, char *end, size_t alloc_sz) { + size_t need_sz; char *h; - if (!do_realloc || sz == need_sz || !p || *p == NULL) + if (!p || !*p) return; - if ((h = (char *) realloc (*p, need_sz * typ_sz)) != NULL) + + need_sz = end - *p; + if (need_sz == alloc_sz) + return; + + if ((h = (char *) realloc (*p, need_sz)) != NULL) *p = h; } @@ -237,7 +245,7 @@ release_ptrs (struct gcollect **pt, wchar_t **wbuf) static int cleanup_return (int rval, struct gcollect **pfree, char **strp, wchar_t **wbuf) { - if (rval == WEOF) + if (rval == EOF) release_ptrs (pfree, wbuf); else { @@ -331,7 +339,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) if (!s || s->fp == NULL || !format) { errno = EINVAL; - return WEOF; + return EOF; } memset (&state, 0, sizeof(state)); @@ -351,7 +359,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) else { if ((c = in_ch (s, &read_in)) == WEOF) - return cleanup_return ((!rval ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf); if (ignore_ws) { @@ -361,7 +369,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) do { if ((c = in_ch (s, &read_in)) == WEOF) - return cleanup_return ((!rval ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf); } while (iswspace (c)); } @@ -515,7 +523,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) do { if ((c == WEOF || (c = in_ch (s, &read_in)) == WEOF) && errno == EINTR) - return cleanup_return ((!rval ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf); } while (iswspace (c)); @@ -540,7 +548,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) { case '%': if ((c = in_ch (s, &read_in)) == WEOF) - return cleanup_return ((!rval ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf); if (c != fc) { back_ch (c, s, &read_in, 1); @@ -581,7 +589,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) return cleanup_return (rval, &gcollect, pstr, &wbuf); str_sz = 100; if ((str = *pstr = (char *) malloc (100)) == NULL) - return cleanup_return (((flags & USE_POSIX_ALLOC) != 0 ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return (((flags & USE_POSIX_ALLOC) != 0 ? EOF : rval), &gcollect, pstr, &wbuf); gcollect = resize_gcollect (gcollect); gcollect->ptrs[gcollect->count++] = pstr; } @@ -596,7 +604,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) } } if ((c = in_ch (s, &read_in)) == WEOF) - return cleanup_return ((!rval ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf); memset (&state, 0, sizeof (state)); @@ -613,7 +621,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) if (!nstr) { release_ptrs (&gcollect, &wbuf); - return WEOF; + return EOF; } *pstr = nstr; str = nstr + str_len; @@ -622,14 +630,14 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) n = wcrtomb ((flags & IS_SUPPRESSED) == 0 ? str : NULL, c, &state); if (n == (size_t) -1LL) - return cleanup_return ((!rval ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf); str += n; } while (--width > 0 && (c = in_ch (s, &read_in)) != WEOF); if ((flags & IS_SUPPRESSED) == 0) { - optimize_alloc ((flags & IS_ALLOC_USED) != 0, pstr, str_sz, (str - *pstr), sizeof (char)); + optimize_alloc (pstr, str, str_sz); pstr = NULL; ++rval; } @@ -654,7 +662,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) str_sz = (width > 1024 ? 1024 : width); *pstr = (char *) malloc (str_sz * sizeof (wchar_t)); if ((wstr = (wchar_t *) *pstr) == NULL) - return cleanup_return (((flags & USE_POSIX_ALLOC) != 0 ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return (((flags & USE_POSIX_ALLOC) != 0 ? EOF : rval), &gcollect, pstr, &wbuf); if ((wstr = (wchar_t *) *pstr) != NULL) { @@ -674,7 +682,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) } if ((c = in_ch (s, &read_in)) == WEOF) - return cleanup_return ((!rval ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf); if ((flags & IS_SUPPRESSED) == 0) { @@ -691,7 +699,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) if (!wstr) { release_ptrs (&gcollect, &wbuf); - return WEOF; + return EOF; } *pstr = (char *) wstr; wstr += str_sz; @@ -708,7 +716,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) if ((flags & IS_SUPPRESSED) == 0) { - optimize_alloc ((flags & IS_ALLOC_USED) != 0, pstr, str_sz, (wstr - (wchar_t *) *pstr), sizeof (wchar_t)); + optimize_alloc (pstr, (char *) wstr, str_sz * sizeof (wchar_t)); pstr = NULL; ++rval; } @@ -728,7 +736,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) return cleanup_return (rval, &gcollect, pstr, &wbuf); str_sz = 100; if ((str = *pstr = (char *) malloc (100)) == NULL) - return cleanup_return (((flags & USE_POSIX_ALLOC) != 0 ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return (((flags & USE_POSIX_ALLOC) != 0 ? EOF : rval), &gcollect, pstr, &wbuf); gcollect = resize_gcollect (gcollect); gcollect->ptrs[gcollect->count++] = pstr; } @@ -744,7 +752,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) } if ((c = in_ch (s, &read_in)) == WEOF) - return cleanup_return ((!rval ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf); memset (&state, 0, sizeof (state)); @@ -774,7 +782,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) pstr = NULL; ++rval; } - return cleanup_return (((flags & USE_POSIX_ALLOC) != 0 ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return (((flags & USE_POSIX_ALLOC) != 0 ? EOF : rval), &gcollect, pstr, &wbuf); } *pstr = nstr; str = nstr + str_len; @@ -810,7 +818,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) pstr = NULL; ++rval; } - return cleanup_return (((flags & USE_POSIX_ALLOC) != 0 ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return (((flags & USE_POSIX_ALLOC) != 0 ? EOF : rval), &gcollect, pstr, &wbuf); } *pstr = nstr; str = nstr + str_len; @@ -824,7 +832,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) } *str++ = 0; - optimize_alloc ((flags & IS_ALLOC_USED) != 0, pstr, str_sz, (str - *pstr), sizeof (char)); + optimize_alloc (pstr, str, str_sz); pstr = NULL; ++rval; } @@ -845,7 +853,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) str_sz = 100; *pstr = (char *) malloc (100 * sizeof (wchar_t)); if ((wstr = (wchar_t *) *pstr) == NULL) - return cleanup_return (((flags & USE_POSIX_ALLOC) != 0 ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return (((flags & USE_POSIX_ALLOC) != 0 ? EOF : rval), &gcollect, pstr, &wbuf); gcollect = resize_gcollect (gcollect); gcollect->ptrs[gcollect->count++] = pstr; } @@ -860,7 +868,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) } } if ((c = in_ch (s, &read_in)) == WEOF) - return cleanup_return ((!rval ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf); do { @@ -889,7 +897,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) pstr = NULL; ++rval; } - return cleanup_return (((flags & USE_POSIX_ALLOC) != 0 ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return (((flags & USE_POSIX_ALLOC) != 0 ? EOF : rval), &gcollect, pstr, &wbuf); } *pstr = (char *) wstr; wstr += str_sz; @@ -903,7 +911,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) { *wstr++ = 0; - optimize_alloc ((flags & IS_ALLOC_USED) != 0, pstr, str_sz, (wstr - (wchar_t *) *pstr), sizeof (wchar_t)); + optimize_alloc (pstr, (char *) wstr, str_sz * sizeof (wchar_t)); pstr = NULL; ++rval; } @@ -943,7 +951,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) } if ((c = in_ch (s, &read_in)) == WEOF) - return cleanup_return ((!rval ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf); if (c == '+' || c == '-') { @@ -1084,7 +1092,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) if (width > 0) --width; if ((c = in_ch (s, &read_in)) == WEOF) - return cleanup_return ((!rval ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf); seen_dot = seen_exp = 0; is_neg = (c == '-' ? 1 : 0); @@ -1296,7 +1304,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) str_sz = 100; *pstr = (char *) malloc (100 * sizeof (wchar_t)); if ((wstr = (wchar_t *) *pstr) == NULL) - return cleanup_return (((flags & USE_POSIX_ALLOC) != 0 ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return (((flags & USE_POSIX_ALLOC) != 0 ? EOF : rval), &gcollect, pstr, &wbuf); gcollect = resize_gcollect (gcollect); gcollect->ptrs[gcollect->count++] = pstr; @@ -1326,7 +1334,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) return cleanup_return (rval, &gcollect, pstr, &wbuf); str_sz = 100; if ((str = *pstr = (char *) malloc (100)) == NULL) - return cleanup_return (((flags & USE_POSIX_ALLOC) != 0 ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return (((flags & USE_POSIX_ALLOC) != 0 ? EOF : rval), &gcollect, pstr, &wbuf); gcollect = resize_gcollect (gcollect); gcollect->ptrs[gcollect->count++] = pstr; } @@ -1364,7 +1372,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) read_in_sv = read_in; if ((c = in_ch (s, &read_in)) == WEOF) - return cleanup_return ((!rval ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf); do { @@ -1432,7 +1440,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) pstr = NULL; ++rval; } - return cleanup_return (((flags & USE_POSIX_ALLOC) != 0 ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return (((flags & USE_POSIX_ALLOC) != 0 ? EOF : rval), &gcollect, pstr, &wbuf); } *pstr = (char *) wstr; wstr += str_sz; @@ -1449,7 +1457,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) { *wstr++ = 0; - optimize_alloc ((flags & IS_ALLOC_USED) != 0, pstr, str_sz, (wstr - (wchar_t *) *pstr), sizeof (wchar_t)); + optimize_alloc (pstr, (char *) wstr, str_sz * sizeof (wchar_t)); pstr = NULL; ++rval; } @@ -1459,7 +1467,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) read_in_sv = read_in; if ((c = in_ch (s, &read_in)) == WEOF) - return cleanup_return ((!rval ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf); memset (&state, 0, sizeof (state)); @@ -1529,7 +1537,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) pstr = NULL; ++rval; } - return cleanup_return (((flags & USE_POSIX_ALLOC) != 0 ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return (((flags & USE_POSIX_ALLOC) != 0 ? EOF : rval), &gcollect, pstr, &wbuf); } *pstr = nstr; str = nstr + str_len; @@ -1567,7 +1575,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) pstr = NULL; ++rval; } - return cleanup_return (((flags & USE_POSIX_ALLOC) != 0 ? WEOF : rval), &gcollect, pstr, &wbuf); + return cleanup_return (((flags & USE_POSIX_ALLOC) != 0 ? EOF : rval), &gcollect, pstr, &wbuf); } *pstr = nstr; str = nstr + str_len; @@ -1581,7 +1589,7 @@ __mingw_swformat (_IFP *s, const wchar_t *format, va_list argp) } *str++ = 0; - optimize_alloc ((flags & IS_ALLOC_USED) != 0, pstr, str_sz, (str - *pstr), sizeof (char)); + optimize_alloc (pstr, str, str_sz); pstr = NULL; ++rval; } diff --git a/lib/libc/mingw/stdio/scanf.S b/lib/libc/mingw/stdio/scanf.S index 3a0e977a71..1e0bed9452 100644 --- a/lib/libc/mingw/stdio/scanf.S +++ b/lib/libc/mingw/stdio/scanf.S @@ -164,6 +164,7 @@ __argtos: call *20(%ebp) /* Restore stack. */ + addl $(iOffset + iBytes), %esp popl %edi leave diff --git a/lib/std/array_list.zig b/lib/std/array_list.zig index d1946be02a..cbbec0b4f3 100644 --- a/lib/std/array_list.zig +++ b/lib/std/array_list.zig @@ -5,10 +5,8 @@ const testing = std.testing; const mem = std.mem; const Allocator = mem.Allocator; -/// List of items. -/// -/// This is a wrapper around an array of T values. Initialize with -/// `init`. +/// A contiguous, growable list of items in memory. +/// This is a wrapper around an array of T values. Initialize with `init`. pub fn ArrayList(comptime T: type) type { return AlignedArrayList(T, null); } @@ -22,7 +20,7 @@ pub fn AlignedArrayList(comptime T: type, comptime alignment: ?u29) type { return struct { const Self = @This(); - /// Use toSlice instead of slicing this directly, because if you don't + /// Use `span` instead of slicing this directly, because if you don't /// specify the end position of the slice, this will potentially give /// you uninitialized memory. items: Slice, @@ -56,34 +54,37 @@ pub fn AlignedArrayList(comptime T: type, comptime alignment: ?u29) type { /// Return contents as a slice. Only valid while the list /// doesn't change size. + pub fn span(self: var) @TypeOf(self.items[0..self.len]) { + return self.items[0..self.len]; + } + + /// Deprecated: use `span`. pub fn toSlice(self: Self) Slice { - return self.items[0..self.len]; + return self.span(); } - /// Return list as const slice. Only valid while the list - /// doesn't change size. + /// Deprecated: use `span`. pub fn toSliceConst(self: Self) SliceConst { - return self.items[0..self.len]; + return self.span(); } - /// Safely access index i of the list. + /// Deprecated: use `span()[i]`. pub fn at(self: Self, i: usize) T { - return self.toSliceConst()[i]; + return self.span()[i]; } - /// Safely access ptr to index i of the list. + /// Deprecated: use `&span()[i]`. pub fn ptrAt(self: Self, i: usize) *T { - return &self.toSlice()[i]; + return &self.span()[i]; } - /// Sets the value at index `i`, or returns `error.OutOfBounds` if - /// the index is not in range. + /// Deprecated: use `if (i >= list.len) return error.OutOfBounds else span()[i] = item`. pub fn setOrError(self: Self, i: usize, item: T) !void { if (i >= self.len) return error.OutOfBounds; self.items[i] = item; } - /// Sets the value at index `i`, asserting that the value is in range. + /// Deprecated: use `list.span()[i] = item`. pub fn set(self: *Self, i: usize, item: T) void { assert(i < self.len); self.items[i] = item; @@ -124,18 +125,18 @@ pub fn AlignedArrayList(comptime T: type, comptime alignment: ?u29) type { self.items[n] = item; } - /// Insert slice `items` at index `n`. Moves - /// `list[n .. list.len]` to make room. - pub fn insertSlice(self: *Self, n: usize, items: SliceConst) !void { + /// Insert slice `items` at index `i`. Moves + /// `list[i .. list.len]` to make room. + /// This operation is O(N). + pub fn insertSlice(self: *Self, i: usize, items: SliceConst) !void { try self.ensureCapacity(self.len + items.len); self.len += items.len; - mem.copyBackwards(T, self.items[n + items.len .. self.len], self.items[n .. self.len - items.len]); - mem.copy(T, self.items[n .. n + items.len], items); + mem.copyBackwards(T, self.items[i + items.len .. self.len], self.items[i .. self.len - items.len]); + mem.copy(T, self.items[i .. i + items.len], items); } - /// Extend the list by 1 element. Allocates more memory as - /// necessary. + /// Extend the list by 1 element. Allocates more memory as necessary. pub fn append(self: *Self, item: T) !void { const new_item_ptr = try self.addOne(); new_item_ptr.* = item; @@ -148,8 +149,9 @@ pub fn AlignedArrayList(comptime T: type, comptime alignment: ?u29) type { new_item_ptr.* = item; } - /// Remove the element at index `i` from the list and return - /// its value. Asserts the array has at least one item. + /// Remove the element at index `i` from the list and return its value. + /// Asserts the array has at least one item. + /// This operation is O(N). pub fn orderedRemove(self: *Self, i: usize) T { const newlen = self.len - 1; if (newlen == i) return self.pop(); @@ -163,18 +165,17 @@ pub fn AlignedArrayList(comptime T: type, comptime alignment: ?u29) type { /// Removes the element at the specified index and returns it. /// The empty slot is filled from the end of the list. + /// This operation is O(1). pub fn swapRemove(self: *Self, i: usize) T { if (self.len - 1 == i) return self.pop(); - const slice = self.toSlice(); + const slice = self.span(); const old_item = slice[i]; slice[i] = self.pop(); return old_item; } - /// Removes the element at the specified index and returns it - /// or an error.OutOfBounds is returned. If no error then - /// the empty slot is filled from the end of the list. + /// Deprecated: use `if (i >= list.len) return error.OutOfBounds else list.swapRemove(i)`. pub fn swapRemoveOrError(self: *Self, i: usize) !T { if (i >= self.len) return error.OutOfBounds; return self.swapRemove(i); @@ -204,6 +205,7 @@ pub fn AlignedArrayList(comptime T: type, comptime alignment: ?u29) type { } /// Reduce allocated capacity to `new_len`. + /// Invalidates element pointers. pub fn shrink(self: *Self, new_len: usize) void { assert(new_len <= self.len); self.len = new_len; @@ -222,13 +224,24 @@ pub fn AlignedArrayList(comptime T: type, comptime alignment: ?u29) type { self.items = try self.allocator.realloc(self.items, better_capacity); } + /// Increases the array's length to match the full capacity that is already allocated. + /// The new elements have `undefined` values. This operation does not invalidate any + /// element pointers. + pub fn expandToCapacity(self: *Self) void { + self.len = self.items.len; + } + /// Increase length by 1, returning pointer to the new item. + /// The returned pointer becomes invalid when the list is resized. pub fn addOne(self: *Self) !*T { const new_length = self.len + 1; try self.ensureCapacity(new_length); return self.addOneAssumeCapacity(); } + /// Increase length by 1, returning pointer to the new item. + /// Asserts that there is already space for the new item without allocating more. + /// The returned pointer becomes invalid when the list is resized. pub fn addOneAssumeCapacity(self: *Self) *T { assert(self.len < self.capacity()); const result = &self.items[self.len]; @@ -236,14 +249,15 @@ pub fn AlignedArrayList(comptime T: type, comptime alignment: ?u29) type { return result; } - /// Remove and return the last element from the list. Asserts - /// the list has at least one item. + /// Remove and return the last element from the list. + /// Asserts the list has at least one item. pub fn pop(self: *Self) T { self.len -= 1; return self.items[self.len]; } - /// Like `pop` but returns `null` if empty. + /// Remove and return the last element from the list. + /// If the list is empty, returns `null`. pub fn popOrNull(self: *Self) ?T { if (self.len == 0) return null; return self.pop(); @@ -287,7 +301,7 @@ test "std.ArrayList.basic" { } } - for (list.toSlice()) |v, i| { + for (list.span()) |v, i| { testing.expect(v == @intCast(i32, i + 1)); } @@ -325,7 +339,7 @@ test "std.ArrayList.appendNTimes" { try list.appendNTimes(2, 10); testing.expectEqual(@as(usize, 10), list.len); - for (list.toSlice()) |element| { + for (list.span()) |element| { testing.expectEqual(@as(i32, 2), element); } } diff --git a/lib/std/buffer.zig b/lib/std/buffer.zig index f808af1485..9bf024191e 100644 --- a/lib/std/buffer.zig +++ b/lib/std/buffer.zig @@ -81,12 +81,18 @@ pub const Buffer = struct { self.list.deinit(); } - pub fn toSlice(self: Buffer) [:0]u8 { - return self.list.toSlice()[0..self.len() :0]; + pub fn span(self: var) @TypeOf(self.list.items[0 .. self.list.len - 1 :0]) { + return self.list.span()[0..self.len() :0]; } + /// Deprecated: use `span` + pub fn toSlice(self: Buffer) [:0]u8 { + return self.span(); + } + + /// Deprecated: use `span` pub fn toSliceConst(self: Buffer) [:0]const u8 { - return self.list.toSliceConst()[0..self.len() :0]; + return self.span(); } pub fn shrink(self: *Buffer, new_len: usize) void { diff --git a/lib/std/build.zig b/lib/std/build.zig index 59e6c4e87c..bc8b8acba0 100644 --- a/lib/std/build.zig +++ b/lib/std/build.zig @@ -926,11 +926,9 @@ pub const Builder = struct { try child.spawn(); - var stdout = std.Buffer.initNull(self.allocator); - defer std.Buffer.deinit(&stdout); - var stdout_file_in_stream = child.stdout.?.inStream(); - try stdout_file_in_stream.stream.readAllBuffer(&stdout, max_output_size); + const stdout = try stdout_file_in_stream.stream.readAllAlloc(self.allocator, max_output_size); + errdefer self.allocator.free(stdout); const term = try child.wait(); switch (term) { @@ -939,7 +937,7 @@ pub const Builder = struct { out_code.* = @truncate(u8, code); return error.ExitCodeFailure; } - return stdout.toOwnedSlice(); + return stdout; }, .Signal, .Stopped, .Unknown => |code| { out_code.* = @truncate(u8, code); diff --git a/lib/std/build/run.zig b/lib/std/build/run.zig index eacf408ba9..41417572ca 100644 --- a/lib/std/build/run.zig +++ b/lib/std/build/run.zig @@ -9,7 +9,6 @@ const mem = std.mem; const process = std.process; const ArrayList = std.ArrayList; const BufMap = std.BufMap; -const Buffer = std.Buffer; const warn = std.debug.warn; const max_stdout_size = 1 * 1024 * 1024; // 1 MiB @@ -169,23 +168,26 @@ pub const RunStep = struct { return err; }; - var stdout = Buffer.initNull(self.builder.allocator); - var stderr = Buffer.initNull(self.builder.allocator); - // TODO need to poll to read these streams to prevent a deadlock (or rely on evented I/O). + var stdout: ?[]const u8 = null; + defer if (stdout) |s| self.builder.allocator.free(s); + switch (self.stdout_action) { .expect_exact, .expect_matches => { var stdout_file_in_stream = child.stdout.?.inStream(); - stdout_file_in_stream.stream.readAllBuffer(&stdout, max_stdout_size) catch unreachable; + stdout = stdout_file_in_stream.stream.readAllAlloc(self.builder.allocator, max_stdout_size) catch unreachable; }, .inherit, .ignore => {}, } - switch (self.stdout_action) { + var stderr: ?[]const u8 = null; + defer if (stderr) |s| self.builder.allocator.free(s); + + switch (self.stderr_action) { .expect_exact, .expect_matches => { var stderr_file_in_stream = child.stderr.?.inStream(); - stderr_file_in_stream.stream.readAllBuffer(&stderr, max_stdout_size) catch unreachable; + stderr = stderr_file_in_stream.stream.readAllAlloc(self.builder.allocator, max_stdout_size) catch unreachable; }, .inherit, .ignore => {}, } @@ -216,7 +218,7 @@ pub const RunStep = struct { switch (self.stderr_action) { .inherit, .ignore => {}, .expect_exact => |expected_bytes| { - if (!mem.eql(u8, expected_bytes, stderr.toSliceConst())) { + if (!mem.eql(u8, expected_bytes, stderr.?)) { warn( \\ \\========= Expected this stderr: ========= @@ -224,13 +226,13 @@ pub const RunStep = struct { \\========= But found: ==================== \\{} \\ - , .{ expected_bytes, stderr.toSliceConst() }); + , .{ expected_bytes, stderr.? }); printCmd(cwd, argv); return error.TestFailed; } }, .expect_matches => |matches| for (matches) |match| { - if (mem.indexOf(u8, stderr.toSliceConst(), match) == null) { + if (mem.indexOf(u8, stderr.?, match) == null) { warn( \\ \\========= Expected to find in stderr: ========= @@ -238,7 +240,7 @@ pub const RunStep = struct { \\========= But stderr does not contain it: ===== \\{} \\ - , .{ match, stderr.toSliceConst() }); + , .{ match, stderr.? }); printCmd(cwd, argv); return error.TestFailed; } @@ -248,7 +250,7 @@ pub const RunStep = struct { switch (self.stdout_action) { .inherit, .ignore => {}, .expect_exact => |expected_bytes| { - if (!mem.eql(u8, expected_bytes, stdout.toSliceConst())) { + if (!mem.eql(u8, expected_bytes, stdout.?)) { warn( \\ \\========= Expected this stdout: ========= @@ -256,13 +258,13 @@ pub const RunStep = struct { \\========= But found: ==================== \\{} \\ - , .{ expected_bytes, stdout.toSliceConst() }); + , .{ expected_bytes, stdout.? }); printCmd(cwd, argv); return error.TestFailed; } }, .expect_matches => |matches| for (matches) |match| { - if (mem.indexOf(u8, stdout.toSliceConst(), match) == null) { + if (mem.indexOf(u8, stdout.?, match) == null) { warn( \\ \\========= Expected to find in stdout: ========= @@ -270,7 +272,7 @@ pub const RunStep = struct { \\========= But stdout does not contain it: ===== \\{} \\ - , .{ match, stdout.toSliceConst() }); + , .{ match, stdout.? }); printCmd(cwd, argv); return error.TestFailed; } diff --git a/lib/std/builtin.zig b/lib/std/builtin.zig index 08fc85871b..1190b595ef 100644 --- a/lib/std/builtin.zig +++ b/lib/std/builtin.zig @@ -27,7 +27,7 @@ pub const Cpu = std.Target.Cpu; /// On non-Windows targets, this is `null`. pub const subsystem: ?SubSystem = blk: { if (@hasDecl(@This(), "explicit_subsystem")) break :blk explicit_subsystem; - switch (os) { + switch (os.tag) { .windows => { if (is_test) { break :blk SubSystem.Console; @@ -406,9 +406,9 @@ pub const Version = struct { min: Version, max: Version, - pub fn includesVersion(self: LinuxVersionRange, ver: Version) bool { - if (self.min.compare(ver) == .gt) return false; - if (self.max.compare(ver) == .lt) return false; + pub fn includesVersion(self: Range, ver: Version) bool { + if (self.min.order(ver) == .gt) return false; + if (self.max.order(ver) == .lt) return false; return true; } }; diff --git a/lib/std/c/darwin.zig b/lib/std/c/darwin.zig index 881e52c72c..2134e0e7a4 100644 --- a/lib/std/c/darwin.zig +++ b/lib/std/c/darwin.zig @@ -63,8 +63,8 @@ pub const sf_hdtr = extern struct { }; pub extern "c" fn sendfile( - out_fd: fd_t, in_fd: fd_t, + out_fd: fd_t, offset: off_t, len: *off_t, sf_hdtr: ?*sf_hdtr, diff --git a/lib/std/c/freebsd.zig b/lib/std/c/freebsd.zig index 2c4820bbe9..3a0634dbb7 100644 --- a/lib/std/c/freebsd.zig +++ b/lib/std/c/freebsd.zig @@ -15,9 +15,9 @@ pub const sf_hdtr = extern struct { trl_cnt: c_int, }; pub extern "c" fn sendfile( - out_fd: fd_t, in_fd: fd_t, - offset: ?*off_t, + out_fd: fd_t, + offset: off_t, nbytes: usize, sf_hdtr: ?*sf_hdtr, sbytes: ?*off_t, diff --git a/lib/std/child_process.zig b/lib/std/child_process.zig index d5e914b286..4f5fc2b496 100644 --- a/lib/std/child_process.zig +++ b/lib/std/child_process.zig @@ -217,21 +217,19 @@ pub const ChildProcess = struct { try child.spawn(); - var stdout = Buffer.initNull(args.allocator); - var stderr = Buffer.initNull(args.allocator); - defer Buffer.deinit(&stdout); - defer Buffer.deinit(&stderr); - var stdout_file_in_stream = child.stdout.?.inStream(); var stderr_file_in_stream = child.stderr.?.inStream(); - try stdout_file_in_stream.stream.readAllBuffer(&stdout, args.max_output_bytes); - try stderr_file_in_stream.stream.readAllBuffer(&stderr, args.max_output_bytes); + // TODO need to poll to read these streams to prevent a deadlock (or rely on evented I/O). + const stdout = try stdout_file_in_stream.stream.readAllAlloc(args.allocator, args.max_output_bytes); + errdefer args.allocator.free(stdout); + const stderr = try stderr_file_in_stream.stream.readAllAlloc(args.allocator, args.max_output_bytes); + errdefer args.allocator.free(stderr); return ExecResult{ .term = try child.wait(), - .stdout = stdout.toOwnedSlice(), - .stderr = stderr.toOwnedSlice(), + .stdout = stdout, + .stderr = stderr, }; } diff --git a/lib/std/fmt.zig b/lib/std/fmt.zig index 38371b3aea..0a746b3583 100644 --- a/lib/std/fmt.zig +++ b/lib/std/fmt.zig @@ -491,6 +491,13 @@ pub fn formatType( return format(context, Errors, output, "{}@{x}", .{ @typeName(T), @ptrToInt(value) }); }, .Type => return output(context, @typeName(T)), + .EnumLiteral => { + const name = @tagName(value); + var buffer: [name.len + 1]u8 = undefined; + buffer[0] = '.'; + std.mem.copy(u8, buffer[1..], name); + return formatType(buffer, fmt, options, context, Errors, output, max_depth); + }, else => @compileError("Unable to format type '" ++ @typeName(T) ++ "'"), } } @@ -943,19 +950,17 @@ fn formatIntSigned( .precision = options.precision, .fill = options.fill, }; - - const uint = std.meta.IntType(false, @TypeOf(value).bit_count); + const bit_count = @typeInfo(@TypeOf(value)).Int.bits; + const Uint = std.meta.IntType(false, bit_count); if (value < 0) { - const minus_sign: u8 = '-'; - try output(context, @as(*const [1]u8, &minus_sign)[0..]); - const new_value = @intCast(uint, -(value + 1)) + 1; + try output(context, "-"); + const new_value = math.absCast(value); return formatIntUnsigned(new_value, base, uppercase, new_options, context, Errors, output); } else if (options.width == null or options.width.? == 0) { - return formatIntUnsigned(@intCast(uint, value), base, uppercase, options, context, Errors, output); + return formatIntUnsigned(@intCast(Uint, value), base, uppercase, options, context, Errors, output); } else { - const plus_sign: u8 = '+'; - try output(context, @as(*const [1]u8, &plus_sign)[0..]); - const new_value = @intCast(uint, value); + try output(context, "+"); + const new_value = @intCast(Uint, value); return formatIntUnsigned(new_value, base, uppercase, new_options, context, Errors, output); } } @@ -1165,19 +1170,22 @@ pub fn allocPrint0(allocator: *mem.Allocator, comptime fmt: []const u8, args: va test "bufPrintInt" { var buffer: [100]u8 = undefined; const buf = buffer[0..]; - std.testing.expect(mem.eql(u8, bufPrintIntToSlice(buf, @as(i32, -12345678), 2, false, FormatOptions{}), "-101111000110000101001110")); - std.testing.expect(mem.eql(u8, bufPrintIntToSlice(buf, @as(i32, -12345678), 10, false, FormatOptions{}), "-12345678")); - std.testing.expect(mem.eql(u8, bufPrintIntToSlice(buf, @as(i32, -12345678), 16, false, FormatOptions{}), "-bc614e")); - std.testing.expect(mem.eql(u8, bufPrintIntToSlice(buf, @as(i32, -12345678), 16, true, FormatOptions{}), "-BC614E")); - std.testing.expect(mem.eql(u8, bufPrintIntToSlice(buf, @as(u32, 12345678), 10, true, FormatOptions{}), "12345678")); + std.testing.expectEqualSlices(u8, "-1", bufPrintIntToSlice(buf, @as(i1, -1), 10, false, FormatOptions{})); - std.testing.expect(mem.eql(u8, bufPrintIntToSlice(buf, @as(u32, 666), 10, false, FormatOptions{ .width = 6 }), " 666")); - std.testing.expect(mem.eql(u8, bufPrintIntToSlice(buf, @as(u32, 0x1234), 16, false, FormatOptions{ .width = 6 }), " 1234")); - std.testing.expect(mem.eql(u8, bufPrintIntToSlice(buf, @as(u32, 0x1234), 16, false, FormatOptions{ .width = 1 }), "1234")); + std.testing.expectEqualSlices(u8, "-101111000110000101001110", bufPrintIntToSlice(buf, @as(i32, -12345678), 2, false, FormatOptions{})); + std.testing.expectEqualSlices(u8, "-12345678", bufPrintIntToSlice(buf, @as(i32, -12345678), 10, false, FormatOptions{})); + std.testing.expectEqualSlices(u8, "-bc614e", bufPrintIntToSlice(buf, @as(i32, -12345678), 16, false, FormatOptions{})); + std.testing.expectEqualSlices(u8, "-BC614E", bufPrintIntToSlice(buf, @as(i32, -12345678), 16, true, FormatOptions{})); - std.testing.expect(mem.eql(u8, bufPrintIntToSlice(buf, @as(i32, 42), 10, false, FormatOptions{ .width = 3 }), "+42")); - std.testing.expect(mem.eql(u8, bufPrintIntToSlice(buf, @as(i32, -42), 10, false, FormatOptions{ .width = 3 }), "-42")); + std.testing.expectEqualSlices(u8, "12345678", bufPrintIntToSlice(buf, @as(u32, 12345678), 10, true, FormatOptions{})); + + std.testing.expectEqualSlices(u8, " 666", bufPrintIntToSlice(buf, @as(u32, 666), 10, false, FormatOptions{ .width = 6 })); + std.testing.expectEqualSlices(u8, " 1234", bufPrintIntToSlice(buf, @as(u32, 0x1234), 16, false, FormatOptions{ .width = 6 })); + std.testing.expectEqualSlices(u8, "1234", bufPrintIntToSlice(buf, @as(u32, 0x1234), 16, false, FormatOptions{ .width = 1 })); + + std.testing.expectEqualSlices(u8, "+42", bufPrintIntToSlice(buf, @as(i32, 42), 10, false, FormatOptions{ .width = 3 })); + std.testing.expectEqualSlices(u8, "-42", bufPrintIntToSlice(buf, @as(i32, -42), 10, false, FormatOptions{ .width = 3 })); } fn bufPrintIntToSlice(buf: []u8, value: var, base: u8, uppercase: bool, options: FormatOptions) []u8 { @@ -1635,10 +1643,10 @@ test "hexToBytes" { test "formatIntValue with comptime_int" { const value: comptime_int = 123456789123456789; - var buf = try std.Buffer.init(std.testing.allocator, ""); + var buf = std.ArrayList(u8).init(std.testing.allocator); defer buf.deinit(); - try formatIntValue(value, "", FormatOptions{}, &buf, @TypeOf(std.Buffer.append).ReturnType.ErrorSet, std.Buffer.append); - std.testing.expect(mem.eql(u8, buf.toSlice(), "123456789123456789")); + try formatIntValue(value, "", FormatOptions{}, &buf, @TypeOf(std.ArrayList(u8).appendSlice).ReturnType.ErrorSet, std.ArrayList(u8).appendSlice); + std.testing.expect(mem.eql(u8, buf.toSliceConst(), "123456789123456789")); } test "formatType max_depth" { @@ -1690,24 +1698,24 @@ test "formatType max_depth" { inst.a = &inst; inst.tu.ptr = &inst.tu; - var buf0 = try std.Buffer.init(std.testing.allocator, ""); + var buf0 = std.ArrayList(u8).init(std.testing.allocator); defer buf0.deinit(); - try formatType(inst, "", FormatOptions{}, &buf0, @TypeOf(std.Buffer.append).ReturnType.ErrorSet, std.Buffer.append, 0); + try formatType(inst, "", FormatOptions{}, &buf0, @TypeOf(std.ArrayList(u8).appendSlice).ReturnType.ErrorSet, std.ArrayList(u8).appendSlice, 0); std.testing.expect(mem.eql(u8, buf0.toSlice(), "S{ ... }")); - var buf1 = try std.Buffer.init(std.testing.allocator, ""); + var buf1 = std.ArrayList(u8).init(std.testing.allocator); defer buf1.deinit(); - try formatType(inst, "", FormatOptions{}, &buf1, @TypeOf(std.Buffer.append).ReturnType.ErrorSet, std.Buffer.append, 1); + try formatType(inst, "", FormatOptions{}, &buf1, @TypeOf(std.ArrayList(u8).appendSlice).ReturnType.ErrorSet, std.ArrayList(u8).appendSlice, 1); std.testing.expect(mem.eql(u8, buf1.toSlice(), "S{ .a = S{ ... }, .tu = TU{ ... }, .e = E.Two, .vec = (10.200,2.220) }")); - var buf2 = try std.Buffer.init(std.testing.allocator, ""); + var buf2 = std.ArrayList(u8).init(std.testing.allocator); defer buf2.deinit(); - try formatType(inst, "", FormatOptions{}, &buf2, @TypeOf(std.Buffer.append).ReturnType.ErrorSet, std.Buffer.append, 2); + try formatType(inst, "", FormatOptions{}, &buf2, @TypeOf(std.ArrayList(u8).appendSlice).ReturnType.ErrorSet, std.ArrayList(u8).appendSlice, 2); std.testing.expect(mem.eql(u8, buf2.toSlice(), "S{ .a = S{ .a = S{ ... }, .tu = TU{ ... }, .e = E.Two, .vec = (10.200,2.220) }, .tu = TU{ .ptr = TU{ ... } }, .e = E.Two, .vec = (10.200,2.220) }")); - var buf3 = try std.Buffer.init(std.testing.allocator, ""); + var buf3 = std.ArrayList(u8).init(std.testing.allocator); defer buf3.deinit(); - try formatType(inst, "", FormatOptions{}, &buf3, @TypeOf(std.Buffer.append).ReturnType.ErrorSet, std.Buffer.append, 3); + try formatType(inst, "", FormatOptions{}, &buf3, @TypeOf(std.ArrayList(u8).appendSlice).ReturnType.ErrorSet, std.ArrayList(u8).appendSlice, 3); std.testing.expect(mem.eql(u8, buf3.toSlice(), "S{ .a = S{ .a = S{ .a = S{ ... }, .tu = TU{ ... }, .e = E.Two, .vec = (10.200,2.220) }, .tu = TU{ .ptr = TU{ ... } }, .e = E.Two, .vec = (10.200,2.220) }, .tu = TU{ .ptr = TU{ .ptr = TU{ ... } } }, .e = E.Two, .vec = (10.200,2.220) }")); } @@ -1749,3 +1757,7 @@ test "vector" { try testFmt("{ 1kB, 2kB, 3kB, 4kB }", "{B}", .{vu64}); try testFmt("{ 1000B, 1.953125KiB, 2.9296875KiB, 3.90625KiB }", "{Bi}", .{vu64}); } + +test "enum-literal" { + try testFmt(".hello_world", "{}", .{.hello_world}); +} diff --git a/lib/std/io/in_stream.zig b/lib/std/io/in_stream.zig index 4f3bac3c21..e234182771 100644 --- a/lib/std/io/in_stream.zig +++ b/lib/std/io/in_stream.zig @@ -41,10 +41,13 @@ pub fn InStream(comptime ReadError: type) type { } } + /// Deprecated: use `readAll`. + pub const readFull = readAll; + /// Returns the number of bytes read. If the number read is smaller than buf.len, it /// means the stream reached the end. Reaching the end of a stream is not an error /// condition. - pub fn readFull(self: *Self, buffer: []u8) Error!usize { + pub fn readAll(self: *Self, buffer: []u8) Error!usize { var index: usize = 0; while (index != buffer.len) { const amt = try self.read(buffer[index..]); @@ -57,30 +60,43 @@ pub fn InStream(comptime ReadError: type) type { /// Returns the number of bytes read. If the number read would be smaller than buf.len, /// error.EndOfStream is returned instead. pub fn readNoEof(self: *Self, buf: []u8) !void { - const amt_read = try self.readFull(buf); + const amt_read = try self.readAll(buf); if (amt_read < buf.len) return error.EndOfStream; } - /// Replaces `buffer` contents by reading from the stream until it is finished. - /// If `buffer.len()` would exceed `max_size`, `error.StreamTooLong` is returned and - /// the contents read from the stream are lost. + /// Deprecated: use `readAllArrayList`. pub fn readAllBuffer(self: *Self, buffer: *Buffer, max_size: usize) !void { - try buffer.resize(0); + buffer.list.shrink(0); + try self.readAllArrayList(&buffer.list, max_size); + errdefer buffer.shrink(0); + try buffer.list.append(0); + } - var actual_buf_len: usize = 0; + /// Appends to the `std.ArrayList` contents by reading from the stream until end of stream is found. + /// If the number of bytes appended would exceed `max_append_size`, `error.StreamTooLong` is returned + /// and the `std.ArrayList` has exactly `max_append_size` bytes appended. + pub fn readAllArrayList(self: *Self, array_list: *std.ArrayList(u8), max_append_size: usize) !void { + try array_list.ensureCapacity(math.min(max_append_size, 4096)); + const original_len = array_list.len; + var start_index: usize = original_len; while (true) { - const dest_slice = buffer.toSlice()[actual_buf_len..]; - const bytes_read = try self.readFull(dest_slice); - actual_buf_len += bytes_read; + array_list.expandToCapacity(); + const dest_slice = array_list.span()[start_index..]; + const bytes_read = try self.readAll(dest_slice); + start_index += bytes_read; + + if (start_index - original_len > max_append_size) { + array_list.shrink(original_len + max_append_size); + return error.StreamTooLong; + } if (bytes_read != dest_slice.len) { - buffer.shrink(actual_buf_len); + array_list.shrink(start_index); return; } - const new_buf_size = math.min(max_size, actual_buf_len + mem.page_size); - if (new_buf_size == actual_buf_len) return error.StreamTooLong; - try buffer.resize(new_buf_size); + // This will trigger ArrayList to expand superlinearly at whatever its growth rate is. + try array_list.ensureCapacity(start_index + 1); } } @@ -89,20 +105,23 @@ pub fn InStream(comptime ReadError: type) type { /// Caller owns returned memory. /// If this function returns an error, the contents from the stream read so far are lost. pub fn readAllAlloc(self: *Self, allocator: *mem.Allocator, max_size: usize) ![]u8 { - var buf = Buffer.initNull(allocator); - defer buf.deinit(); - - try self.readAllBuffer(&buf, max_size); - return buf.toOwnedSlice(); + var array_list = std.ArrayList(u8).init(allocator); + defer array_list.deinit(); + try self.readAllArrayList(&array_list, max_size); + return array_list.toOwnedSlice(); } - /// Replaces `buffer` contents by reading from the stream until `delimiter` is found. + /// Replaces the `std.ArrayList` contents by reading from the stream until `delimiter` is found. /// Does not include the delimiter in the result. - /// If `buffer.len()` would exceed `max_size`, `error.StreamTooLong` is returned and the contents - /// read from the stream so far are lost. - pub fn readUntilDelimiterBuffer(self: *Self, buffer: *Buffer, delimiter: u8, max_size: usize) !void { - try buffer.resize(0); - + /// If the `std.ArrayList` length would exceed `max_size`, `error.StreamTooLong` is returned and the + /// `std.ArrayList` is populated with `max_size` bytes from the stream. + pub fn readUntilDelimiterArrayList( + self: *Self, + array_list: *std.ArrayList(u8), + delimiter: u8, + max_size: usize, + ) !void { + array_list.shrink(0); while (true) { var byte: u8 = try self.readByte(); @@ -110,11 +129,11 @@ pub fn InStream(comptime ReadError: type) type { return; } - if (buffer.len() == max_size) { + if (array_list.len == max_size) { return error.StreamTooLong; } - try buffer.appendByte(byte); + try array_list.append(byte); } } @@ -122,12 +141,16 @@ pub fn InStream(comptime ReadError: type) type { /// memory would be greater than `max_size`, returns `error.StreamTooLong`. /// Caller owns returned memory. /// If this function returns an error, the contents from the stream read so far are lost. - pub fn readUntilDelimiterAlloc(self: *Self, allocator: *mem.Allocator, delimiter: u8, max_size: usize) ![]u8 { - var buf = Buffer.initNull(allocator); - defer buf.deinit(); - - try self.readUntilDelimiterBuffer(&buf, delimiter, max_size); - return buf.toOwnedSlice(); + pub fn readUntilDelimiterAlloc( + self: *Self, + allocator: *mem.Allocator, + delimiter: u8, + max_size: usize, + ) ![]u8 { + var array_list = std.ArrayList(u8).init(allocator); + defer array_list.deinit(); + try self.readUntilDelimiterArrayList(&array_list, delimiter, max_size); + return array_list.toOwnedSlice(); } /// Reads from the stream until specified byte is found. If the buffer is not diff --git a/lib/std/math.zig b/lib/std/math.zig index c99de8f9dc..ed13e3cd27 100644 --- a/lib/std/math.zig +++ b/lib/std/math.zig @@ -293,7 +293,7 @@ test "math.min" { } } -pub fn max(x: var, y: var) @TypeOf(x + y) { +pub fn max(x: var, y: var) @TypeOf(x, y) { return if (x > y) x else y; } @@ -670,33 +670,38 @@ fn testRem() void { /// Returns the absolute value of the integer parameter. /// Result is an unsigned integer. -pub fn absCast(x: var) t: { - if (@TypeOf(x) == comptime_int) { - break :t comptime_int; - } else { - break :t std.meta.IntType(false, @TypeOf(x).bit_count); +pub fn absCast(x: var) switch(@typeInfo(@TypeOf(x))) { + .ComptimeInt => comptime_int, + .Int => |intInfo| std.meta.IntType(false, intInfo.bits), + else => @compileError("absCast only accepts integers"), } -} { - if (@TypeOf(x) == comptime_int) { - return if (x < 0) -x else x; +{ + switch(@typeInfo(@TypeOf(x))) { + .ComptimeInt => { + if (x < 0) { + return -x; + } else { + return x; + } + }, + .Int => |intInfo| { + const Uint = std.meta.IntType(false, intInfo.bits); + if (x < 0) { + return ~@bitCast(Uint, x +% -1); + } else { + return @intCast(Uint, x); + } + }, + else => unreachable, } - const uint = std.meta.IntType(false, @TypeOf(x).bit_count); - if (x >= 0) return @intCast(uint, x); - - return @intCast(uint, -(x + 1)) + 1; } test "math.absCast" { - testing.expect(absCast(@as(i32, -999)) == 999); - testing.expect(@TypeOf(absCast(@as(i32, -999))) == u32); - - testing.expect(absCast(@as(i32, 999)) == 999); - testing.expect(@TypeOf(absCast(@as(i32, 999))) == u32); - - testing.expect(absCast(@as(i32, minInt(i32))) == -minInt(i32)); - testing.expect(@TypeOf(absCast(@as(i32, minInt(i32)))) == u32); - - testing.expect(absCast(-999) == 999); + testing.expectEqual(@as(u1, 1), absCast(@as(i1, -1))); + testing.expectEqual(@as(u32, 999), absCast(@as(i32, -999))); + testing.expectEqual(@as(u32, 999), absCast(@as(i32, 999))); + testing.expectEqual(@as(u32, -minInt(i32)), absCast(@as(i32, minInt(i32)))); + testing.expectEqual(999, absCast(-999)); } /// Returns the negation of the integer parameter. diff --git a/lib/std/mem.zig b/lib/std/mem.zig index 391d587dbc..4da7829570 100644 --- a/lib/std/mem.zig +++ b/lib/std/mem.zig @@ -1780,10 +1780,11 @@ fn SliceAsBytesReturnType(comptime sliceType: type) type { pub fn sliceAsBytes(slice: var) SliceAsBytesReturnType(@TypeOf(slice)) { const actualSlice = if (comptime trait.isPtrTo(.Array)(@TypeOf(slice))) slice[0..] else slice; + const actualSliceTypeInfo = @typeInfo(@TypeOf(actualSlice)).Pointer; // let's not give an undefined pointer to @ptrCast // it may be equal to zero and fail a null check - if (actualSlice.len == 0) { + if (actualSlice.len == 0 and actualSliceTypeInfo.sentinel == null) { return &[0]u8{}; } @@ -1805,6 +1806,12 @@ test "sliceAsBytes" { })); } +test "sliceAsBytes with sentinel slice" { + const empty_string:[:0]const u8 = ""; + const bytes = sliceAsBytes(empty_string); + testing.expect(bytes.len == 0); +} + test "sliceAsBytes packed struct at runtime and comptime" { const Foo = packed struct { a: u4, @@ -1941,3 +1948,8 @@ test "isAligned" { testing.expect(!isAligned(4, 8)); testing.expect(!isAligned(4, 16)); } + +test "freeing empty string with null-terminated sentinel" { + const empty_string = try dupeZ(testing.allocator, u8, ""); + testing.allocator.free(empty_string); +} diff --git a/lib/std/os.zig b/lib/std/os.zig index 90ad3e03a9..a6c8b32ba9 100644 --- a/lib/std/os.zig +++ b/lib/std/os.zig @@ -3734,7 +3734,8 @@ pub fn sendfile( while (true) { var sbytes: off_t = undefined; - const err = errno(system.sendfile(out_fd, in_fd, in_offset, adjusted_count, hdtr, &sbytes, flags)); + const offset = @bitCast(off_t, in_offset); + const err = errno(system.sendfile(in_fd, out_fd, offset, adjusted_count, hdtr, &sbytes, flags)); const amt = @bitCast(usize, sbytes); switch (err) { 0 => return amt, @@ -3813,19 +3814,17 @@ pub fn sendfile( while (true) { var sbytes: off_t = adjusted_count; const signed_offset = @bitCast(i64, in_offset); - const err = errno(system.sendfile(out_fd, in_fd, signed_offset, &sbytes, hdtr, flags)); + const err = errno(system.sendfile(in_fd, out_fd, signed_offset, &sbytes, hdtr, flags)); const amt = @bitCast(usize, sbytes); switch (err) { 0 => return amt, + EBADF => unreachable, // Always a race condition. EFAULT => unreachable, // Segmentation fault. EINVAL => unreachable, ENOTCONN => unreachable, // `out_fd` is an unconnected socket. - // On macOS version 10.14.6, I observed Darwin return EBADF when - // using sendfile on a valid open file descriptor of a file - // system file. - ENOTSUP, ENOTSOCK, ENOSYS, EBADF => break :sf, + ENOTSUP, ENOTSOCK, ENOSYS => break :sf, EINTR => if (amt != 0) return amt else continue, diff --git a/lib/std/os/windows.zig b/lib/std/os/windows.zig index b8e14a220d..ba55845a4f 100644 --- a/lib/std/os/windows.zig +++ b/lib/std/os/windows.zig @@ -1083,23 +1083,26 @@ pub fn SetFileTime( } } +pub fn teb() *TEB { + return switch (builtin.arch) { + .i386 => asm volatile ( + \\ movl %%fs:0x18, %[ptr] + : [ptr] "=r" (-> *TEB) + ), + .x86_64 => asm volatile ( + \\ movq %%gs:0x30, %[ptr] + : [ptr] "=r" (-> *TEB) + ), + .aarch64 => asm volatile ( + \\ mov %[ptr], x18 + : [ptr] "=r" (-> *TEB) + ), + else => @compileError("unsupported arch"), + }; +} + pub fn peb() *PEB { - switch (builtin.arch) { - .i386 => { - return asm ( - \\ mov %%fs:0x18, %[ptr] - \\ mov %%ds:0x30(%[ptr]), %[ptr] - : [ptr] "=r" (-> *PEB) - ); - }, - .x86_64 => { - return asm ( - \\ mov %%gs:0x60, %[ptr] - : [ptr] "=r" (-> *PEB) - ); - }, - else => @compileError("unsupported architecture"), - } + return teb().ProcessEnvironmentBlock; } /// A file time is a 64-bit value that represents the number of 100-nanosecond diff --git a/lib/std/os/windows/bits.zig b/lib/std/os/windows/bits.zig index f9ba6cf40e..41466234ed 100644 --- a/lib/std/os/windows/bits.zig +++ b/lib/std/os/windows/bits.zig @@ -1154,6 +1154,19 @@ const RTL_BITMAP = @OpaqueType(); pub const PRTL_BITMAP = *RTL_BITMAP; const KAFFINITY = usize; +pub const TEB = extern struct { + Reserved1: [12]PVOID, + ProcessEnvironmentBlock: *PEB, + Reserved2: [399]PVOID, + Reserved3: [1952]u8, + TlsSlots: [64]PVOID, + Reserved4: [8]u8, + Reserved5: [26]PVOID, + ReservedForOle: PVOID, + Reserved6: [4]PVOID, + TlsExpansionSlots: PVOID, +}; + /// Process Environment Block /// Microsoft documentation of this is incomplete, the fields here are taken from various resources including: /// - https://github.com/wine-mirror/wine/blob/1aff1e6a370ee8c0213a0fd4b220d121da8527aa/include/winternl.h#L269 diff --git a/lib/std/os/windows/kernel32.zig b/lib/std/os/windows/kernel32.zig index 3f65e4d73c..05a7a8f6a3 100644 --- a/lib/std/os/windows/kernel32.zig +++ b/lib/std/os/windows/kernel32.zig @@ -102,7 +102,7 @@ pub extern "kernel32" fn GetFileAttributesW(lpFileName: [*]const WCHAR) callconv pub extern "kernel32" fn GetModuleFileNameW(hModule: ?HMODULE, lpFilename: [*]u16, nSize: DWORD) callconv(.Stdcall) DWORD; -pub extern "kernel32" fn GetModuleHandleW(lpModuleName: ?[*]const WCHAR) callconv(.Stdcall) HMODULE; +pub extern "kernel32" fn GetModuleHandleW(lpModuleName: ?[*]const WCHAR) callconv(.Stdcall) ?HMODULE; pub extern "kernel32" fn GetLastError() callconv(.Stdcall) Win32Error; diff --git a/lib/std/process.zig b/lib/std/process.zig index 01b9947518..084aec4c49 100644 --- a/lib/std/process.zig +++ b/lib/std/process.zig @@ -3,7 +3,6 @@ const builtin = std.builtin; const os = std.os; const fs = std.fs; const BufMap = std.BufMap; -const Buffer = std.Buffer; const mem = std.mem; const math = std.math; const Allocator = mem.Allocator; @@ -266,7 +265,7 @@ pub const ArgIteratorWindows = struct { } fn internalNext(self: *ArgIteratorWindows, allocator: *Allocator) NextError![]u8 { - var buf = try Buffer.initSize(allocator, 0); + var buf = std.ArrayList(u8).init(allocator); defer buf.deinit(); var backslash_count: usize = 0; @@ -282,10 +281,10 @@ pub const ArgIteratorWindows = struct { if (quote_is_real) { self.seen_quote_count += 1; if (self.seen_quote_count == self.quote_count and self.seen_quote_count % 2 == 1) { - try buf.appendByte('"'); + try buf.append('"'); } } else { - try buf.appendByte('"'); + try buf.append('"'); } }, '\\' => { @@ -295,7 +294,7 @@ pub const ArgIteratorWindows = struct { try self.emitBackslashes(&buf, backslash_count); backslash_count = 0; if (self.seen_quote_count % 2 == 1 and self.seen_quote_count != self.quote_count) { - try buf.appendByte(byte); + try buf.append(byte); } else { return buf.toOwnedSlice(); } @@ -303,16 +302,16 @@ pub const ArgIteratorWindows = struct { else => { try self.emitBackslashes(&buf, backslash_count); backslash_count = 0; - try buf.appendByte(byte); + try buf.append(byte); }, } } } - fn emitBackslashes(self: *ArgIteratorWindows, buf: *Buffer, emit_count: usize) !void { + fn emitBackslashes(self: *ArgIteratorWindows, buf: *std.ArrayList(u8), emit_count: usize) !void { var i: usize = 0; while (i < emit_count) : (i += 1) { - try buf.appendByte('\\'); + try buf.append('\\'); } } @@ -410,7 +409,7 @@ pub fn argsAlloc(allocator: *mem.Allocator) ![][]u8 { // TODO refactor to only make 1 allocation. var it = args(); - var contents = try Buffer.initSize(allocator, 0); + var contents = std.ArrayList(u8).init(allocator); defer contents.deinit(); var slice_list = std.ArrayList(usize).init(allocator); @@ -419,7 +418,7 @@ pub fn argsAlloc(allocator: *mem.Allocator) ![][]u8 { while (it.next(allocator)) |arg_or_err| { const arg = try arg_or_err; defer allocator.free(arg); - try contents.append(arg); + try contents.appendSlice(arg); try slice_list.append(arg.len); } diff --git a/lib/std/target.zig b/lib/std/target.zig index 74c5362a00..8e1b9f8736 100644 --- a/lib/std/target.zig +++ b/lib/std/target.zig @@ -907,7 +907,7 @@ pub const Target = struct { }; } - pub fn baseline(arch: Arch) *const Model { + pub fn generic(arch: Arch) *const Model { const S = struct { const generic_model = Model{ .name = "generic", @@ -916,7 +916,7 @@ pub const Target = struct { }; }; return switch (arch) { - .arm, .armeb, .thumb, .thumbeb => &arm.cpu.baseline, + .arm, .armeb, .thumb, .thumbeb => &arm.cpu.generic, .aarch64, .aarch64_be, .aarch64_32 => &aarch64.cpu.generic, .avr => &avr.cpu.avr1, .bpfel, .bpfeb => &bpf.cpu.generic, @@ -926,11 +926,11 @@ pub const Target = struct { .msp430 => &msp430.cpu.generic, .powerpc, .powerpc64, .powerpc64le => &powerpc.cpu.generic, .amdgcn => &amdgpu.cpu.generic, - .riscv32 => &riscv.cpu.baseline_rv32, - .riscv64 => &riscv.cpu.baseline_rv64, + .riscv32 => &riscv.cpu.generic_rv32, + .riscv64 => &riscv.cpu.generic_rv64, .sparc, .sparcv9, .sparcel => &sparc.cpu.generic, .s390x => &systemz.cpu.generic, - .i386 => &x86.cpu.pentium4, + .i386 => &x86.cpu._i386, .x86_64 => &x86.cpu.x86_64, .nvptx, .nvptx64 => &nvptx.cpu.sm_20, .wasm32, .wasm64 => &wasm.cpu.generic, @@ -938,6 +938,18 @@ pub const Target = struct { else => &S.generic_model, }; } + + pub fn baseline(arch: Arch) *const Model { + return switch (arch) { + .arm, .armeb, .thumb, .thumbeb => &arm.cpu.baseline, + .riscv32 => &riscv.cpu.baseline_rv32, + .riscv64 => &riscv.cpu.baseline_rv64, + .i386 => &x86.cpu.pentium4, + .nvptx, .nvptx64 => &nvptx.cpu.sm_20, + + else => generic(arch), + }; + } }; /// The "default" set of CPU features for cross-compiling. A conservative set diff --git a/lib/std/zig/system.zig b/lib/std/zig/system.zig index 7f0609c112..a4e065e184 100644 --- a/lib/std/zig/system.zig +++ b/lib/std/zig/system.zig @@ -171,6 +171,11 @@ pub const NativeTargetInfo = struct { dynamic_linker: DynamicLinker = DynamicLinker{}, + /// Only some architectures have CPU detection implemented. This field reveals whether + /// CPU detection actually occurred. When this is `true` it means that the reported + /// CPU is baseline only because of a missing implementation for that architecture. + cpu_detection_unimplemented: bool = false, + pub const DynamicLinker = Target.DynamicLinker; pub const DetectError = error{ @@ -191,20 +196,6 @@ pub const NativeTargetInfo = struct { /// deinitialization method. /// TODO Remove the Allocator requirement from this function. pub fn detect(allocator: *Allocator, cross_target: CrossTarget) DetectError!NativeTargetInfo { - const cpu = switch (cross_target.cpu_model) { - .native => detectNativeCpuAndFeatures(cross_target), - .baseline => baselineCpuAndFeatures(cross_target), - .determined_by_cpu_arch => if (cross_target.cpu_arch == null) - detectNativeCpuAndFeatures(cross_target) - else - baselineCpuAndFeatures(cross_target), - .explicit => |model| blk: { - var adjusted_model = model.toCpu(cross_target.getCpuArch()); - cross_target.updateCpuFeatures(&adjusted_model.features); - break :blk adjusted_model; - }, - }; - var os = Target.Os.defaultVersionRange(cross_target.getOsTag()); if (cross_target.os_tag == null) { switch (Target.current.os.tag) { @@ -289,9 +280,12 @@ pub const NativeTargetInfo = struct { } }, .freebsd => { - // TODO Detect native operating system version. + // Unimplemented, fall back to default. + // https://github.com/ziglang/zig/issues/4582 + }, + else => { + // Unimplemented, fall back to default version range. }, - else => {}, } } @@ -318,7 +312,32 @@ pub const NativeTargetInfo = struct { os.version_range.linux.glibc = glibc; } - return detectAbiAndDynamicLinker(allocator, cpu, os, cross_target); + var cpu_detection_unimplemented = false; + + // Until https://github.com/ziglang/zig/issues/4592 is implemented (support detecting the + // native CPU architecture as being different than the current target), we use this: + const cpu_arch = cross_target.getCpuArch(); + + const cpu = switch (cross_target.cpu_model) { + .native => detectNativeCpuAndFeatures(cpu_arch, os, cross_target), + .baseline => baselineCpuAndFeatures(cpu_arch, cross_target), + .determined_by_cpu_arch => if (cross_target.cpu_arch == null) + detectNativeCpuAndFeatures(cpu_arch, os, cross_target) + else + baselineCpuAndFeatures(cpu_arch, cross_target), + .explicit => |model| blk: { + var adjusted_model = model.toCpu(cpu_arch); + cross_target.updateCpuFeatures(&adjusted_model.features); + break :blk adjusted_model; + }, + } orelse backup_cpu_detection: { + cpu_detection_unimplemented = true; + break :backup_cpu_detection baselineCpuAndFeatures(cpu_arch, cross_target); + }; + + var target = try detectAbiAndDynamicLinker(allocator, cpu, os, cross_target); + target.cpu_detection_unimplemented = cpu_detection_unimplemented; + return target; } /// First we attempt to use the executable's own binary. If it is dynamically @@ -843,13 +862,24 @@ pub const NativeTargetInfo = struct { } } - fn detectNativeCpuAndFeatures(cross_target: CrossTarget) Target.Cpu { - // TODO Detect native CPU model & features. Until that is implemented we use baseline. - return baselineCpuAndFeatures(cross_target); + fn detectNativeCpuAndFeatures(cpu_arch: Target.Cpu.Arch, os: Target.Os, cross_target: CrossTarget) ?Target.Cpu { + // Here we switch on a comptime value rather than `cpu_arch`. This is valid because `cpu_arch`, + // although it is a runtime value, is guaranteed to be one of the architectures in the set + // of the respective switch prong. + switch (std.Target.current.cpu.arch) { + .x86_64, .i386 => { + return @import("system/x86.zig").detectNativeCpuAndFeatures(cpu_arch, os, cross_target); + }, + else => { + // This architecture does not have CPU model & feature detection yet. + // See https://github.com/ziglang/zig/issues/4591 + return null; + }, + } } - fn baselineCpuAndFeatures(cross_target: CrossTarget) Target.Cpu { - var adjusted_baseline = Target.Cpu.baseline(cross_target.getCpuArch()); + fn baselineCpuAndFeatures(cpu_arch: Target.Cpu.Arch, cross_target: CrossTarget) Target.Cpu { + var adjusted_baseline = Target.Cpu.baseline(cpu_arch); cross_target.updateCpuFeatures(&adjusted_baseline.features); return adjusted_baseline; } diff --git a/lib/std/zig/system/x86.zig b/lib/std/zig/system/x86.zig new file mode 100644 index 0000000000..b7d2c6a227 --- /dev/null +++ b/lib/std/zig/system/x86.zig @@ -0,0 +1,549 @@ +const std = @import("std"); +const Target = std.Target; +const CrossTarget = std.zig.CrossTarget; + +fn setFeature(cpu: *Target.Cpu, feature: Target.x86.Feature, enabled: bool) void { + const idx = @as(Target.Cpu.Feature.Set.Index, @enumToInt(feature)); + + if (enabled) cpu.features.addFeature(idx) else cpu.features.removeFeature(idx); +} + +inline fn bit(input: u32, offset: u5) bool { + return (input >> offset) & 1 != 0; +} + +pub fn detectNativeCpuAndFeatures(arch: Target.Cpu.Arch, os: Target.Os, cross_target: CrossTarget) Target.Cpu { + var cpu = Target.Cpu{ + .arch = arch, + .model = Target.Cpu.Model.generic(arch), + .features = Target.Cpu.Feature.Set.empty, + }; + + // First we detect features, to use as hints when detecting CPU Model. + detectNativeFeatures(&cpu, os.tag); + + var leaf = cpuid(0, 0); + const max_leaf = leaf.eax; + const vendor = leaf.ebx; + + if (max_leaf > 0) { + leaf = cpuid(0x1, 0); + + const brand_id = leaf.ebx & 0xff; + var family: u32 = 0; + var model: u32 = 0; + + { // Detect model and family + family = (leaf.eax >> 8) & 0xf; + model = (leaf.eax >> 4) & 0xf; + if (family == 6 or family == 0xf) { + if (family == 0xf) { + family += (leaf.eax >> 20) & 0xff; + } + model += ((leaf.eax >> 16) & 0xf) << 4; + } + } + + // Now we detect the model. + switch (vendor) { + 0x756e6547 => { + detectIntelProcessor(&cpu, family, model, brand_id); + }, + 0x68747541 => { + detectAMDProcessor(&cpu, family, model); + }, + else => {}, + } + } + + // Add the CPU model's feature set into the working set, but then + // override with actual detected features again. + cpu.features.addFeatureSet(cpu.model.features); + detectNativeFeatures(&cpu, os.tag); + + cpu.features.populateDependencies(cpu.arch.allFeaturesList()); + + return cpu; +} + +fn detectIntelProcessor(cpu: *Target.Cpu, family: u32, model: u32, brand_id: u32) void { + if (brand_id != 0) { + return; + } + switch (family) { + 3 => { + cpu.model = &Target.x86.cpu._i386; + return; + }, + 4 => { + cpu.model = &Target.x86.cpu._i486; + return; + }, + 5 => { + if (Target.x86.featureSetHas(cpu.features, .mmx)) { + cpu.model = &Target.x86.cpu.pentium_mmx; + return; + } + cpu.model = &Target.x86.cpu.pentium; + return; + }, + 6 => { + switch (model) { + 0x01 => { + cpu.model = &Target.x86.cpu.pentiumpro; + return; + }, + 0x03, 0x05, 0x06 => { + cpu.model = &Target.x86.cpu.pentium2; + return; + }, + 0x07, 0x08, 0x0a, 0x0b => { + cpu.model = &Target.x86.cpu.pentium3; + return; + }, + 0x09, 0x0d, 0x15 => { + cpu.model = &Target.x86.cpu.pentium_m; + return; + }, + 0x0e => { + cpu.model = &Target.x86.cpu.yonah; + return; + }, + 0x0f, 0x16 => { + cpu.model = &Target.x86.cpu.core2; + return; + }, + 0x17, 0x1d => { + cpu.model = &Target.x86.cpu.penryn; + return; + }, + 0x1a, 0x1e, 0x1f, 0x2e => { + cpu.model = &Target.x86.cpu.nehalem; + return; + }, + 0x25, 0x2c, 0x2f => { + cpu.model = &Target.x86.cpu.westmere; + return; + }, + 0x2a, 0x2d => { + cpu.model = &Target.x86.cpu.sandybridge; + return; + }, + 0x3a, 0x3e => { + cpu.model = &Target.x86.cpu.ivybridge; + return; + }, + 0x3c, 0x3f, 0x45, 0x46 => { + cpu.model = &Target.x86.cpu.haswell; + return; + }, + 0x3d, 0x47, 0x4f, 0x56 => { + cpu.model = &Target.x86.cpu.broadwell; + return; + }, + 0x4e, 0x5e, 0x8e, 0x9e => { + cpu.model = &Target.x86.cpu.skylake; + return; + }, + 0x55 => { + if (Target.x86.featureSetHas(cpu.features, .avx512bf16)) { + cpu.model = &Target.x86.cpu.cooperlake; + return; + } else if (Target.x86.featureSetHas(cpu.features, .avx512vnni)) { + cpu.model = &Target.x86.cpu.cascadelake; + return; + } else { + cpu.model = &Target.x86.cpu.skylake_avx512; + return; + } + }, + 0x66 => { + cpu.model = &Target.x86.cpu.cannonlake; + return; + }, + 0x7d, 0x7e => { + cpu.model = &Target.x86.cpu.icelake_client; + return; + }, + 0x6a, 0x6c => { + cpu.model = &Target.x86.cpu.icelake_server; + return; + }, + 0x1c, 0x26, 0x27, 0x35, 0x36 => { + cpu.model = &Target.x86.cpu.bonnell; + return; + }, + 0x37, 0x4a, 0x4d, 0x5a, 0x5d, 0x4c => { + cpu.model = &Target.x86.cpu.silvermont; + return; + }, + 0x5c, 0x5f => { + cpu.model = &Target.x86.cpu.goldmont; + return; + }, + 0x7a => { + cpu.model = &Target.x86.cpu.goldmont_plus; + return; + }, + 0x86 => { + cpu.model = &Target.x86.cpu.tremont; + return; + }, + 0x57 => { + cpu.model = &Target.x86.cpu.knl; + return; + }, + 0x85 => { + cpu.model = &Target.x86.cpu.knm; + return; + }, + else => return, // Unknown CPU Model + } + }, + 15 => { + if (Target.x86.featureSetHas(cpu.features, .@"64bit")) { + cpu.model = &Target.x86.cpu.nocona; + return; + } + if (Target.x86.featureSetHas(cpu.features, .sse3)) { + cpu.model = &Target.x86.cpu.prescott; + return; + } + cpu.model = &Target.x86.cpu.pentium4; + return; + }, + else => return, // Unknown CPU Model + } +} + +fn detectAMDProcessor(cpu: *Target.Cpu, family: u32, model: u32) void { + // AMD's cpuid information is less than optimal for determining a CPU model. + // This is very unscientific, and not necessarily correct. + switch (family) { + 4 => { + cpu.model = &Target.x86.cpu._i486; + return; + }, + 5 => { + cpu.model = &Target.x86.cpu.pentium; + switch (model) { + 6, 7 => { + cpu.model = &Target.x86.cpu.k6; + return; + }, + 8 => { + cpu.model = &Target.x86.cpu.k6_2; + return; + }, + 9, 13 => { + cpu.model = &Target.x86.cpu.k6_3; + return; + }, + 10 => { + cpu.model = &Target.x86.cpu.geode; + return; + }, + else => {}, + } + return; + }, + 6 => { + if (Target.x86.featureSetHas(cpu.features, .sse)) { + cpu.model = &Target.x86.cpu.athlon_xp; + return; + } + cpu.model = &Target.x86.cpu.athlon; + return; + }, + 15 => { + if (Target.x86.featureSetHas(cpu.features, .sse3)) { + cpu.model = &Target.x86.cpu.k8_sse3; + return; + } + cpu.model = &Target.x86.cpu.k8; + return; + }, + 16 => { + cpu.model = &Target.x86.cpu.amdfam10; + return; + }, + 20 => { + cpu.model = &Target.x86.cpu.btver1; + return; + }, + 21 => { + cpu.model = &Target.x86.cpu.bdver1; + if (model >= 0x60 and model <= 0x7f) { + cpu.model = &Target.x86.cpu.bdver4; + return; + } + if (model >= 0x30 and model <= 0x3f) { + cpu.model = &Target.x86.cpu.bdver3; + return; + } + if ((model >= 0x10 and model <= 0x1f) or model == 0x02) { + cpu.model = &Target.x86.cpu.bdver2; + return; + } + return; + }, + 22 => { + cpu.model = &Target.x86.cpu.btver2; + return; + }, + 23 => { + cpu.model = &Target.x86.cpu.znver1; + if ((model >= 0x30 and model <= 0x3f) or model == 0x71) { + cpu.model = &Target.x86.cpu.znver2; + return; + } + return; + }, + else => { + return; + }, + } +} + +fn detectNativeFeatures(cpu: *Target.Cpu, os_tag: Target.Os.Tag) void { + var leaf = cpuid(0, 0); + + const max_level = leaf.eax; + + leaf = cpuid(1, 0); + + setFeature(cpu, .cx8, bit(leaf.edx, 8)); + setFeature(cpu, .cx8, bit(leaf.edx, 8)); + setFeature(cpu, .cmov, bit(leaf.edx, 15)); + setFeature(cpu, .mmx, bit(leaf.edx, 23)); + setFeature(cpu, .fxsr, bit(leaf.edx, 24)); + setFeature(cpu, .sse, bit(leaf.edx, 25)); + setFeature(cpu, .sse2, bit(leaf.edx, 26)); + setFeature(cpu, .sse3, bit(leaf.ecx, 0)); + setFeature(cpu, .pclmul, bit(leaf.ecx, 1)); + setFeature(cpu, .ssse3, bit(leaf.ecx, 9)); + setFeature(cpu, .cx16, bit(leaf.ecx, 13)); + setFeature(cpu, .sse4_1, bit(leaf.ecx, 19)); + setFeature(cpu, .sse4_2, bit(leaf.ecx, 20)); + setFeature(cpu, .movbe, bit(leaf.ecx, 22)); + setFeature(cpu, .popcnt, bit(leaf.ecx, 23)); + setFeature(cpu, .aes, bit(leaf.ecx, 25)); + setFeature(cpu, .rdrnd, bit(leaf.ecx, 30)); + + leaf.eax = getXCR0(); + + const has_avx = bit(leaf.ecx, 27) and + bit(leaf.ecx, 28) and + ((leaf.eax & 0x6) == 0x6); + + // LLVM approaches avx512_save by hardcoding it to true on Darwin, + // because the kernel saves the context even if the bit is not set. + // https://github.com/llvm/llvm-project/blob/bca373f73fc82728a8335e7d6cd164e8747139ec/llvm/lib/Support/Host.cpp#L1378 + // + // Google approaches this by using a different series of checks and flags, + // and this may report the feature more accurately on a technically correct + // but ultimately less useful level. + // https://github.com/google/cpu_features/blob/b5c271c53759b2b15ff91df19bd0b32f2966e275/src/cpuinfo_x86.c#L113 + // (called from https://github.com/google/cpu_features/blob/b5c271c53759b2b15ff91df19bd0b32f2966e275/src/cpuinfo_x86.c#L1052) + // + // Right now, we use LLVM's approach, because even if the target doesn't support + // the feature, the kernel should provide the same functionality transparently, + // so the implementation details don't make a difference. + // That said, this flag impacts other CPU features' availability, + // so until we can verify that this doesn't come with side affects, + // we'll say TODO verify this. + + // Darwin lazily saves the AVX512 context on first use: trust that the OS will + // save the AVX512 context if we use AVX512 instructions, even if the bit is not + // set right now. + const has_avx512_save = switch (os_tag.isDarwin()) { + true => true, + false => has_avx and ((leaf.eax & 0xE0) == 0xE0), + }; + + setFeature(cpu, .avx, has_avx); + setFeature(cpu, .fma, has_avx and bit(leaf.ecx, 12)); + // Only enable XSAVE if OS has enabled support for saving YMM state. + setFeature(cpu, .xsave, has_avx and bit(leaf.ecx, 26)); + setFeature(cpu, .f16c, has_avx and bit(leaf.ecx, 29)); + + leaf = cpuid(0x80000000, 0); + const max_ext_level = leaf.eax; + + if (max_ext_level >= 0x80000001) { + leaf = cpuid(0x80000001, 0); + setFeature(cpu, .sahf, bit(leaf.ecx, 0)); + setFeature(cpu, .lzcnt, bit(leaf.ecx, 5)); + setFeature(cpu, .sse4a, bit(leaf.ecx, 6)); + setFeature(cpu, .prfchw, bit(leaf.ecx, 8)); + setFeature(cpu, .xop, bit(leaf.ecx, 11) and has_avx); + setFeature(cpu, .lwp, bit(leaf.ecx, 15)); + setFeature(cpu, .fma4, bit(leaf.ecx, 16) and has_avx); + setFeature(cpu, .tbm, bit(leaf.ecx, 21)); + setFeature(cpu, .mwaitx, bit(leaf.ecx, 29)); + setFeature(cpu, .@"64bit", bit(leaf.edx, 29)); + } else { + for ([_]Target.x86.Feature{ + .sahf, .lzcnt, .sse4a, .prfchw, .xop, + .lwp, .fma4, .tbm, .mwaitx, .@"64bit", + }) |feat| { + setFeature(cpu, feat, false); + } + } + + // Misc. memory-related features. + if (max_ext_level >= 0x80000008) { + leaf = cpuid(0x80000008, 0); + setFeature(cpu, .clzero, bit(leaf.ebx, 0)); + setFeature(cpu, .wbnoinvd, bit(leaf.ebx, 9)); + } else { + for ([_]Target.x86.Feature{ .clzero, .wbnoinvd }) |feat| { + setFeature(cpu, feat, false); + } + } + + if (max_level >= 0x7) { + leaf = cpuid(0x7, 0); + + setFeature(cpu, .fsgsbase, bit(leaf.ebx, 0)); + setFeature(cpu, .sgx, bit(leaf.ebx, 2)); + setFeature(cpu, .bmi, bit(leaf.ebx, 3)); + // AVX2 is only supported if we have the OS save support from AVX. + setFeature(cpu, .avx2, bit(leaf.ebx, 5) and has_avx); + setFeature(cpu, .bmi2, bit(leaf.ebx, 8)); + setFeature(cpu, .invpcid, bit(leaf.ebx, 10)); + setFeature(cpu, .rtm, bit(leaf.ebx, 11)); + // AVX512 is only supported if the OS supports the context save for it. + setFeature(cpu, .avx512f, bit(leaf.ebx, 16) and has_avx512_save); + setFeature(cpu, .avx512dq, bit(leaf.ebx, 17) and has_avx512_save); + setFeature(cpu, .rdseed, bit(leaf.ebx, 18)); + setFeature(cpu, .adx, bit(leaf.ebx, 19)); + setFeature(cpu, .avx512ifma, bit(leaf.ebx, 21) and has_avx512_save); + setFeature(cpu, .clflushopt, bit(leaf.ebx, 23)); + setFeature(cpu, .clwb, bit(leaf.ebx, 24)); + setFeature(cpu, .avx512pf, bit(leaf.ebx, 26) and has_avx512_save); + setFeature(cpu, .avx512er, bit(leaf.ebx, 27) and has_avx512_save); + setFeature(cpu, .avx512cd, bit(leaf.ebx, 28) and has_avx512_save); + setFeature(cpu, .sha, bit(leaf.ebx, 29)); + setFeature(cpu, .avx512bw, bit(leaf.ebx, 30) and has_avx512_save); + setFeature(cpu, .avx512vl, bit(leaf.ebx, 31) and has_avx512_save); + + setFeature(cpu, .prefetchwt1, bit(leaf.ecx, 0)); + setFeature(cpu, .avx512vbmi, bit(leaf.ecx, 1) and has_avx512_save); + setFeature(cpu, .pku, bit(leaf.ecx, 4)); + setFeature(cpu, .waitpkg, bit(leaf.ecx, 5)); + setFeature(cpu, .avx512vbmi2, bit(leaf.ecx, 6) and has_avx512_save); + setFeature(cpu, .shstk, bit(leaf.ecx, 7)); + setFeature(cpu, .gfni, bit(leaf.ecx, 8)); + setFeature(cpu, .vaes, bit(leaf.ecx, 9) and has_avx); + setFeature(cpu, .vpclmulqdq, bit(leaf.ecx, 10) and has_avx); + setFeature(cpu, .avx512vnni, bit(leaf.ecx, 11) and has_avx512_save); + setFeature(cpu, .avx512bitalg, bit(leaf.ecx, 12) and has_avx512_save); + setFeature(cpu, .avx512vpopcntdq, bit(leaf.ecx, 14) and has_avx512_save); + setFeature(cpu, .avx512vp2intersect, bit(leaf.edx, 8) and has_avx512_save); + setFeature(cpu, .rdpid, bit(leaf.ecx, 22)); + setFeature(cpu, .cldemote, bit(leaf.ecx, 25)); + setFeature(cpu, .movdiri, bit(leaf.ecx, 27)); + setFeature(cpu, .movdir64b, bit(leaf.ecx, 28)); + setFeature(cpu, .enqcmd, bit(leaf.ecx, 29)); + + // There are two CPUID leafs which information associated with the pconfig + // instruction: + // EAX=0x7, ECX=0x0 indicates the availability of the instruction (via the 18th + // bit of EDX), while the EAX=0x1b leaf returns information on the + // availability of specific pconfig leafs. + // The target feature here only refers to the the first of these two. + // Users might need to check for the availability of specific pconfig + // leaves using cpuid, since that information is ignored while + // detecting features using the "-march=native" flag. + // For more info, see X86 ISA docs. + setFeature(cpu, .pconfig, bit(leaf.edx, 18)); + + // TODO I feel unsure about this check. + // It doesn't really seem to check for 7.1, just for 7. + // Is this a sound assumption to make? + // Note that this is what other implementations do, so I kind of trust it. + const has_leaf_7_1 = max_level >= 7; + if (has_leaf_7_1) { + leaf = cpuid(0x7, 0x1); + setFeature(cpu, .avx512bf16, bit(leaf.eax, 5) and has_avx512_save); + } else { + setFeature(cpu, .avx512bf16, false); + } + } else { + for ([_]Target.x86.Feature{ + .fsgsbase, .sgx, .bmi, .avx2, + .bmi2, .invpcid, .rtm, .avx512f, + .avx512dq, .rdseed, .adx, .avx512ifma, + .clflushopt, .clwb, .avx512pf, .avx512er, + .avx512cd, .sha, .avx512bw, .avx512vl, + .prefetchwt1, .avx512vbmi, .pku, .waitpkg, + .avx512vbmi2, .shstk, .gfni, .vaes, + .vpclmulqdq, .avx512vnni, .avx512bitalg, .avx512vpopcntdq, + .avx512vp2intersect, .rdpid, .cldemote, .movdiri, + .movdir64b, .enqcmd, .pconfig, .avx512bf16, + }) |feat| { + setFeature(cpu, feat, false); + } + } + + if (max_level >= 0xD and has_avx) { + leaf = cpuid(0xD, 0x1); + // Only enable XSAVE if OS has enabled support for saving YMM state. + setFeature(cpu, .xsaveopt, bit(leaf.eax, 0)); + setFeature(cpu, .xsavec, bit(leaf.eax, 1)); + setFeature(cpu, .xsaves, bit(leaf.eax, 3)); + } else { + for ([_]Target.x86.Feature{ .xsaveopt, .xsavec, .xsaves }) |feat| { + setFeature(cpu, feat, false); + } + } + + if (max_level >= 0x14) { + leaf = cpuid(0x14, 0); + setFeature(cpu, .ptwrite, bit(leaf.ebx, 4)); + } else { + setFeature(cpu, .ptwrite, false); + } +} + +const CpuidLeaf = packed struct { + eax: u32, + ebx: u32, + ecx: u32, + edx: u32, +}; + +fn cpuid(leaf_id: u32, subid: u32) CpuidLeaf { + // Workaround for https://github.com/ziglang/zig/issues/215 + // Inline assembly in zig only supports one output, + // so we pass a pointer to the struct. + var cpuid_leaf = CpuidLeaf{ .eax = 0, .ebx = 0, .ecx = 0, .edx = 0 }; + const leaf_ptr = &cpuid_leaf; + + // valid for both x86 and x86_64 + asm volatile ( + \\ cpuid + \\ movl %%eax, (%[leaf_ptr]) + \\ movl %%ebx, 4(%[leaf_ptr]) + \\ movl %%ecx, 8(%[leaf_ptr]) + \\ movl %%edx, 12(%[leaf_ptr]) + : + : [leaf_id] "{eax}" (leaf_id), + [subid] "{ecx}" (subid), + [leaf_ptr] "r" (leaf_ptr) + : "eax", "ebx", "ecx", "edx" + ); + return cpuid_leaf; +} + +// Read control register 0 (XCR0). Used to detect features such as AVX. +fn getXCR0() u32 { + return asm ( + \\ .byte 0x0F, 0x01, 0xD0 + : [ret] "={eax}" (-> u32) + : [number] "{eax}" (@as(u32, 0)), + [number] "{edx}" (@as(u32, 0)), + [number] "{ecx}" (@as(u32, 0)) + ); +} diff --git a/src-self-hosted/main.zig b/src-self-hosted/main.zig index 4446a974d4..20e39bd2a1 100644 --- a/src-self-hosted/main.zig +++ b/src-self-hosted/main.zig @@ -9,7 +9,6 @@ const mem = std.mem; const process = std.process; const Allocator = mem.Allocator; const ArrayList = std.ArrayList; -const Buffer = std.Buffer; const c = @import("c.zig"); const introspect = @import("introspect.zig"); diff --git a/src-self-hosted/stage2.zig b/src-self-hosted/stage2.zig index a8aa10d91e..ee6789ab86 100644 --- a/src-self-hosted/stage2.zig +++ b/src-self-hosted/stage2.zig @@ -1154,7 +1154,7 @@ fn enumInt(comptime Enum: type, int: c_int) Enum { fn crossTargetToTarget(cross_target: CrossTarget, dynamic_linker_ptr: *?[*:0]u8) !Target { var info = try std.zig.system.NativeTargetInfo.detect(std.heap.c_allocator, cross_target); - if (cross_target.cpu_arch == null or cross_target.cpu_model == .native) { + if (info.cpu_detection_unimplemented) { // TODO We want to just use detected_info.target but implementing // CPU model & feature detection is todo so here we rely on LLVM. const llvm = @import("llvm.zig"); diff --git a/src-self-hosted/translate_c.zig b/src-self-hosted/translate_c.zig index 92ae0f2877..65469c4701 100644 --- a/src-self-hosted/translate_c.zig +++ b/src-self-hosted/translate_c.zig @@ -609,7 +609,8 @@ fn visitVarDecl(c: *Context, var_decl: *const ZigClangVarDecl) Error!void { else try transCreateNodeUndefinedLiteral(c); } else if (storage_class != .Extern) { - return failDecl(c, var_decl_loc, checked_name, "non-extern variable has no initializer", .{}); + eq_tok = try appendToken(c, .Equal, "="); + init_node = try transCreateNodeIdentifierUnchecked(c, "undefined"); } const linksection_expr = blk: { @@ -810,8 +811,10 @@ fn transRecordDecl(c: *Context, record_decl: *const ZigClangRecordDecl) Error!?* _ = try appendToken(c, .Colon, ":"); const field_type = transQualType(rp, ZigClangFieldDecl_getType(field_decl), field_loc) catch |err| switch (err) { error.UnsupportedType => { - try failDecl(c, record_loc, name, "unable to translate {} member type", .{container_kind_name}); - return null; + const opaque = try transCreateNodeOpaqueType(c); + semicolon = try appendToken(c, .Semicolon, ";"); + try emitWarning(c, record_loc, "{} demoted to opaque type - unable to translate type of field {}", .{ container_kind_name, raw_name }); + break :blk opaque; }, else => |e| return e, }; @@ -2234,6 +2237,7 @@ fn transWhileLoop( .id = .Loop, }; while_node.body = try transStmt(rp, &loop_scope, ZigClangWhileStmt_getBody(stmt), .unused, .r_value); + _ = try appendToken(rp.c, .Semicolon, ";"); return &while_node.base; } @@ -2343,8 +2347,10 @@ fn transForLoop( try block_scope.?.block_node.statements.push(&while_node.base); block_scope.?.block_node.rbrace = try appendToken(rp.c, .RBrace, "}"); return &block_scope.?.block_node.base; - } else + } else { + _ = try appendToken(rp.c, .Semicolon, ";"); return &while_node.base; + } } fn transSwitch( @@ -4812,7 +4818,7 @@ fn transCreateNodeIdentifier(c: *Context, name: []const u8) !*ast.Node { return &identifier.base; } -fn transCreateNodeTypeIdentifier(c: *Context, name: []const u8) !*ast.Node { +fn transCreateNodeIdentifierUnchecked(c: *Context, name: []const u8) !*ast.Node { const token_index = try appendTokenFmt(c, .Identifier, "{}", .{name}); const identifier = try c.a().create(ast.Node.Identifier); identifier.* = .{ @@ -4875,7 +4881,7 @@ fn transPreprocessorEntities(c: *Context, unit: *ZigClangASTUnit) Error!void { var tok_it = tok_list.iterator(0); const first_tok = tok_it.next().?; - assert(first_tok.id == .Identifier and mem.eql(u8, slice[first_tok.start..first_tok.end], name)); + assert(mem.eql(u8, slice[first_tok.start..first_tok.end], name)); var macro_fn = false; const next = tok_it.peek().?; @@ -5039,7 +5045,14 @@ fn transMacroFnDefine(c: *Context, it: *CTokenList.Iterator, source: []const u8, .{last.id}, ); _ = try appendToken(c, .Semicolon, ";"); - try type_of.params.push(expr); + const type_of_arg = if (expr.id != .Block) expr else blk: { + const blk = @fieldParentPtr(ast.Node.Block, "base", expr); + const blk_last = blk.statements.at(blk.statements.len - 1).*; + std.debug.assert(blk_last.id == .ControlFlowExpression); + const br = @fieldParentPtr(ast.Node.ControlFlowExpression, "base", blk_last); + break :blk br.rhs.?; + }; + try type_of.params.push(type_of_arg); return_expr.rhs = expr; block.rbrace = try appendToken(c, .RBrace, "}"); @@ -5074,6 +5087,39 @@ fn parseCExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8, source_ if_node.@"else".?.body = try parseCPrimaryExpr(c, it, source, source_loc, scope); return &if_node.base; }, + .Comma => { + _ = try appendToken(c, .Semicolon, ";"); + const block_scope = try Scope.Block.init(c, scope, "blk"); + block_scope.block_node = try transCreateNodeBlock(c, block_scope.label); + + var last = node; + while (true) { + // suppress result + const lhs = try transCreateNodeIdentifier(c, "_"); + const op_token = try appendToken(c, .Equal, "="); + const op_node = try c.a().create(ast.Node.InfixOp); + op_node.* = .{ + .op_token = op_token, + .lhs = lhs, + .op = .Assign, + .rhs = last, + }; + try block_scope.block_node.statements.push(&op_node.base); + + last = try parseCPrefixOpExpr(c, it, source, source_loc, scope); + _ = try appendToken(c, .Semicolon, ";"); + if (it.next().?.id != .Comma) { + _ = it.prev(); + break; + } + } + + const break_node = try transCreateNodeBreak(c, block_scope.label); + break_node.rhs = last; + try block_scope.block_node.statements.push(&break_node.base); + block_scope.block_node.rbrace = try appendToken(c, .RBrace, "}"); + return &block_scope.block_node.base; + }, else => { _ = it.prev(); return node; @@ -5326,15 +5372,15 @@ fn parseCPrimaryExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8, return parseCNumLit(c, tok, source, source_loc); }, // eventually this will be replaced by std.c.parse which will handle these correctly - .Keyword_void => return transCreateNodeTypeIdentifier(c, "c_void"), - .Keyword_bool => return transCreateNodeTypeIdentifier(c, "bool"), - .Keyword_double => return transCreateNodeTypeIdentifier(c, "f64"), - .Keyword_long => return transCreateNodeTypeIdentifier(c, "c_long"), - .Keyword_int => return transCreateNodeTypeIdentifier(c, "c_int"), - .Keyword_float => return transCreateNodeTypeIdentifier(c, "f32"), - .Keyword_short => return transCreateNodeTypeIdentifier(c, "c_short"), - .Keyword_char => return transCreateNodeTypeIdentifier(c, "c_char"), - .Keyword_unsigned => return transCreateNodeTypeIdentifier(c, "c_uint"), + .Keyword_void => return transCreateNodeIdentifierUnchecked(c, "c_void"), + .Keyword_bool => return transCreateNodeIdentifierUnchecked(c, "bool"), + .Keyword_double => return transCreateNodeIdentifierUnchecked(c, "f64"), + .Keyword_long => return transCreateNodeIdentifierUnchecked(c, "c_long"), + .Keyword_int => return transCreateNodeIdentifierUnchecked(c, "c_int"), + .Keyword_float => return transCreateNodeIdentifierUnchecked(c, "f32"), + .Keyword_short => return transCreateNodeIdentifierUnchecked(c, "c_short"), + .Keyword_char => return transCreateNodeIdentifierUnchecked(c, "c_char"), + .Keyword_unsigned => return transCreateNodeIdentifierUnchecked(c, "c_uint"), .Identifier => { const mangled_name = scope.getAlias(source[tok.start..tok.end]); return transCreateNodeIdentifier(c, mangled_name); @@ -5382,12 +5428,15 @@ fn parseCPrimaryExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8, return error.ParseError; } - //if (@typeInfo(@TypeOf(x)) == .Pointer) - // @ptrCast(dest, x) + // TODO: It might be nice if we only did the alignCasting for opaque types + //( if (@typeInfo(@TypeOf(x)) == .Pointer) + // @ptrCast(dest, @alignCast(@alignOf(dest.Child), x)) //else if (@typeInfo(@TypeOf(x)) == .Integer) // @intToPtr(dest, x) //else - // @as(dest, x) + // @as(dest, x) ) + + const group_lparen = try appendToken(c, .LParen, "("); const if_1 = try transCreateNodeIf(c); const type_id_1 = try transCreateNodeBuiltinFnCall(c, "@typeInfo"); @@ -5407,9 +5456,30 @@ fn parseCPrimaryExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8, if_1.condition = &cmp_1.base; _ = try appendToken(c, .RParen, ")"); + const period_tok = try appendToken(c, .Period, "."); + const child_ident = try transCreateNodeIdentifier(c, "Child"); + const inner_node_child = try c.a().create(ast.Node.InfixOp); + inner_node_child.* = .{ + .op_token = period_tok, + .lhs = inner_node, + .op = .Period, + .rhs = child_ident, + }; + + const align_of = try transCreateNodeBuiltinFnCall(c, "@alignOf"); + try align_of.params.push(&inner_node_child.base); + align_of.rparen_token = try appendToken(c, .RParen, ")"); + // hack to get zig fmt to render a comma in builtin calls + _ = try appendToken(c, .Comma, ","); + + const align_cast = try transCreateNodeBuiltinFnCall(c, "@alignCast"); + try align_cast.params.push(&align_of.base); + try align_cast.params.push(node_to_cast); + align_cast.rparen_token = try appendToken(c, .RParen, ")"); + const ptr_cast = try transCreateNodeBuiltinFnCall(c, "@ptrCast"); try ptr_cast.params.push(inner_node); - try ptr_cast.params.push(node_to_cast); + try ptr_cast.params.push(&align_cast.base); ptr_cast.rparen_token = try appendToken(c, .RParen, ")"); if_1.body = &ptr_cast.base; @@ -5450,7 +5520,14 @@ fn parseCPrimaryExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8, as.rparen_token = try appendToken(c, .RParen, ")"); else_2.body = &as.base; - return &if_1.base; + const group_rparen = try appendToken(c, .RParen, ")"); + const grouped_expr = try c.a().create(ast.Node.GroupedExpression); + grouped_expr.* = .{ + .lparen = group_lparen, + .expr = &if_1.base, + .rparen = group_rparen, + }; + return &grouped_expr.base; }, else => { const first_tok = it.list.at(0); @@ -5470,6 +5547,8 @@ fn parseCSuffixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8, var node = try parseCPrimaryExpr(c, it, source, source_loc, scope); while (true) { const tok = it.next().?; + var op_token: ast.TokenIndex = undefined; + var op_id: ast.Node.InfixOp.Op = undefined; switch (tok.id) { .Period => { const name_tok = it.next().?; @@ -5486,6 +5565,7 @@ fn parseCSuffixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8, } node = try transCreateNodeFieldAccess(c, node, source[name_tok.start..name_tok.end]); + continue; }, .Arrow => { const name_tok = it.next().?; @@ -5500,9 +5580,9 @@ fn parseCSuffixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8, ); return error.ParseError; } - const deref = try transCreateNodePtrDeref(c, node); node = try transCreateNodeFieldAccess(c, deref, source[name_tok.start..name_tok.end]); + continue; }, .Asterisk => { if (it.peek().?.id == .RParen) { @@ -5526,161 +5606,57 @@ fn parseCSuffixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8, return &ptr.base; } else { // expr * expr - const op_token = try appendToken(c, .Asterisk, "*"); - const rhs = try parseCPrimaryExpr(c, it, source, source_loc, scope); - const mul_node = try c.a().create(ast.Node.InfixOp); - mul_node.* = .{ - .op_token = op_token, - .lhs = node, - .op = .BitShiftLeft, - .rhs = rhs, - }; - node = &mul_node.base; + op_token = try appendToken(c, .Asterisk, "*"); + op_id = .BitShiftLeft; } }, .AngleBracketAngleBracketLeft => { - const op_token = try appendToken(c, .AngleBracketAngleBracketLeft, "<<"); - const rhs = try parseCPrefixOpExpr(c, it, source, source_loc, scope); - const bitshift_node = try c.a().create(ast.Node.InfixOp); - bitshift_node.* = .{ - .op_token = op_token, - .lhs = node, - .op = .BitShiftLeft, - .rhs = rhs, - }; - node = &bitshift_node.base; + op_token = try appendToken(c, .AngleBracketAngleBracketLeft, "<<"); + op_id = .BitShiftLeft; }, .AngleBracketAngleBracketRight => { - const op_token = try appendToken(c, .AngleBracketAngleBracketRight, ">>"); - const rhs = try parseCPrefixOpExpr(c, it, source, source_loc, scope); - const bitshift_node = try c.a().create(ast.Node.InfixOp); - bitshift_node.* = .{ - .op_token = op_token, - .lhs = node, - .op = .BitShiftRight, - .rhs = rhs, - }; - node = &bitshift_node.base; + op_token = try appendToken(c, .AngleBracketAngleBracketRight, ">>"); + op_id = .BitShiftRight; }, .Pipe => { - const op_token = try appendToken(c, .Pipe, "|"); - const rhs = try parseCPrefixOpExpr(c, it, source, source_loc, scope); - const or_node = try c.a().create(ast.Node.InfixOp); - or_node.* = .{ - .op_token = op_token, - .lhs = node, - .op = .BitOr, - .rhs = rhs, - }; - node = &or_node.base; + op_token = try appendToken(c, .Pipe, "|"); + op_id = .BitOr; }, .Ampersand => { - const op_token = try appendToken(c, .Ampersand, "&"); - const rhs = try parseCPrefixOpExpr(c, it, source, source_loc, scope); - const bitand_node = try c.a().create(ast.Node.InfixOp); - bitand_node.* = .{ - .op_token = op_token, - .lhs = node, - .op = .BitAnd, - .rhs = rhs, - }; - node = &bitand_node.base; + op_token = try appendToken(c, .Ampersand, "&"); + op_id = .BitAnd; }, .Plus => { - const op_token = try appendToken(c, .Plus, "+"); - const rhs = try parseCPrefixOpExpr(c, it, source, source_loc, scope); - const add_node = try c.a().create(ast.Node.InfixOp); - add_node.* = .{ - .op_token = op_token, - .lhs = node, - .op = .Add, - .rhs = rhs, - }; - node = &add_node.base; + op_token = try appendToken(c, .Plus, "+"); + op_id = .Add; }, .Minus => { - const op_token = try appendToken(c, .Minus, "-"); - const rhs = try parseCPrefixOpExpr(c, it, source, source_loc, scope); - const sub_node = try c.a().create(ast.Node.InfixOp); - sub_node.* = .{ - .op_token = op_token, - .lhs = node, - .op = .Sub, - .rhs = rhs, - }; - node = &sub_node.base; + op_token = try appendToken(c, .Minus, "-"); + op_id = .Sub; }, .AmpersandAmpersand => { - const op_token = try appendToken(c, .Keyword_and, "and"); - const rhs = try parseCPrefixOpExpr(c, it, source, source_loc, scope); - const and_node = try c.a().create(ast.Node.InfixOp); - and_node.* = .{ - .op_token = op_token, - .lhs = node, - .op = .BoolAnd, - .rhs = rhs, - }; - node = &and_node.base; + op_token = try appendToken(c, .Keyword_and, "and"); + op_id = .BoolAnd; }, .PipePipe => { - const op_token = try appendToken(c, .Keyword_or, "or"); - const rhs = try parseCPrefixOpExpr(c, it, source, source_loc, scope); - const or_node = try c.a().create(ast.Node.InfixOp); - or_node.* = .{ - .op_token = op_token, - .lhs = node, - .op = .BoolOr, - .rhs = rhs, - }; - node = &or_node.base; + op_token = try appendToken(c, .Keyword_or, "or"); + op_id = .BoolOr; }, .AngleBracketRight => { - const op_token = try appendToken(c, .AngleBracketRight, ">"); - const rhs = try parseCPrefixOpExpr(c, it, source, source_loc, scope); - const and_node = try c.a().create(ast.Node.InfixOp); - and_node.* = .{ - .op_token = op_token, - .lhs = node, - .op = .GreaterThan, - .rhs = rhs, - }; - node = &and_node.base; + op_token = try appendToken(c, .AngleBracketRight, ">"); + op_id = .GreaterThan; }, .AngleBracketRightEqual => { - const op_token = try appendToken(c, .AngleBracketRightEqual, ">="); - const rhs = try parseCPrefixOpExpr(c, it, source, source_loc, scope); - const and_node = try c.a().create(ast.Node.InfixOp); - and_node.* = .{ - .op_token = op_token, - .lhs = node, - .op = .GreaterOrEqual, - .rhs = rhs, - }; - node = &and_node.base; + op_token = try appendToken(c, .AngleBracketRightEqual, ">="); + op_id = .GreaterOrEqual; }, .AngleBracketLeft => { - const op_token = try appendToken(c, .AngleBracketLeft, "<"); - const rhs = try parseCPrefixOpExpr(c, it, source, source_loc, scope); - const and_node = try c.a().create(ast.Node.InfixOp); - and_node.* = .{ - .op_token = op_token, - .lhs = node, - .op = .LessThan, - .rhs = rhs, - }; - node = &and_node.base; + op_token = try appendToken(c, .AngleBracketLeft, "<"); + op_id = .LessThan; }, .AngleBracketLeftEqual => { - const op_token = try appendToken(c, .AngleBracketLeftEqual, "<="); - const rhs = try parseCPrefixOpExpr(c, it, source, source_loc, scope); - const and_node = try c.a().create(ast.Node.InfixOp); - and_node.* = .{ - .op_token = op_token, - .lhs = node, - .op = .LessOrEqual, - .rhs = rhs, - }; - node = &and_node.base; + op_token = try appendToken(c, .AngleBracketLeftEqual, "<="); + op_id = .LessOrEqual; }, .LBracket => { const arr_node = try transCreateNodeArrayAccess(c, node); @@ -5698,6 +5674,7 @@ fn parseCSuffixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8, ); return error.ParseError; } + continue; }, .LParen => { const call_node = try transCreateNodeFnCall(c, node); @@ -5723,12 +5700,39 @@ fn parseCSuffixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8, } call_node.rtoken = try appendToken(c, .RParen, ")"); node = &call_node.base; + continue; + }, + .BangEqual => { + op_token = try appendToken(c, .BangEqual, "!="); + op_id = .BangEqual; + }, + .EqualEqual => { + op_token = try appendToken(c, .EqualEqual, "=="); + op_id = .EqualEqual; + }, + .Slash => { + // unsigned/float division uses the operator + op_id = .Div; + op_token = try appendToken(c, .Slash, "/"); + }, + .Percent => { + // unsigned/float division uses the operator + op_id = .Mod; + op_token = try appendToken(c, .Percent, "%"); }, else => { _ = it.prev(); return node; }, } + const op_node = try c.a().create(ast.Node.InfixOp); + op_node.* = .{ + .op_token = op_token, + .lhs = node, + .op = op_id, + .rhs = try parseCPrefixOpExpr(c, it, source, source_loc, scope), + }; + node = &op_node.base; } } @@ -5746,14 +5750,20 @@ fn parseCPrefixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8, node.rhs = try parseCPrefixOpExpr(c, it, source, source_loc, scope); return &node.base; }, + .Plus => return try parseCPrefixOpExpr(c, it, source, source_loc, scope), .Tilde => { const node = try transCreateNodePrefixOp(c, .BitNot, .Tilde, "~"); node.rhs = try parseCPrefixOpExpr(c, it, source, source_loc, scope); return &node.base; }, .Asterisk => { - const prefix_op_expr = try parseCPrefixOpExpr(c, it, source, source_loc, scope); - return try transCreateNodePtrDeref(c, prefix_op_expr); + const node = try parseCPrefixOpExpr(c, it, source, source_loc, scope); + return try transCreateNodePtrDeref(c, node); + }, + .Ampersand => { + const node = try transCreateNodePrefixOp(c, .AddressOf, .Ampersand, "&"); + node.rhs = try parseCPrefixOpExpr(c, it, source, source_loc, scope); + return &node.base; }, else => { _ = it.prev(); diff --git a/src/all_types.hpp b/src/all_types.hpp index 620b95dccd..699a6601ab 100644 --- a/src/all_types.hpp +++ b/src/all_types.hpp @@ -3285,7 +3285,11 @@ struct IrInstGenUnreachable { struct IrInstSrcTypeOf { IrInstSrc base; - IrInstSrc *value; + union { + IrInstSrc *scalar; // value_count == 1 + IrInstSrc **list; // value_count > 1 + } value; + size_t value_count; }; struct IrInstSrcSetCold { diff --git a/src/analyze.cpp b/src/analyze.cpp index c9b45164f2..7712f0f707 100644 --- a/src/analyze.cpp +++ b/src/analyze.cpp @@ -597,7 +597,7 @@ ZigType *get_pointer_to_type_extra2(CodeGen *g, ZigType *child_type, bool is_con entry->size_in_bits = SIZE_MAX; entry->abi_align = UINT32_MAX; } else if (type_is_resolved(child_type, ResolveStatusZeroBitsKnown)) { - if (type_has_bits(child_type)) { + if (type_has_bits(g, child_type)) { entry->abi_size = g->builtin_types.entry_usize->abi_size; entry->size_in_bits = g->builtin_types.entry_usize->size_in_bits; entry->abi_align = g->builtin_types.entry_usize->abi_align; @@ -649,22 +649,33 @@ ZigType *get_pointer_to_type(CodeGen *g, ZigType *child_type, bool is_const) { } ZigType *get_optional_type(CodeGen *g, ZigType *child_type) { + ZigType *result = get_optional_type2(g, child_type); + if (result == nullptr) { + codegen_report_errors_and_exit(g); + } + return result; +} + +ZigType *get_optional_type2(CodeGen *g, ZigType *child_type) { if (child_type->optional_parent != nullptr) { return child_type->optional_parent; } - assert(type_is_resolved(child_type, ResolveStatusSizeKnown)); + Error err; + if ((err = type_resolve(g, child_type, ResolveStatusSizeKnown))) { + return nullptr; + } ZigType *entry = new_type_table_entry(ZigTypeIdOptional); buf_resize(&entry->name, 0); buf_appendf(&entry->name, "?%s", buf_ptr(&child_type->name)); - if (!type_has_bits(child_type)) { + if (!type_has_bits(g, child_type)) { entry->size_in_bits = g->builtin_types.entry_bool->size_in_bits; entry->abi_size = g->builtin_types.entry_bool->abi_size; entry->abi_align = g->builtin_types.entry_bool->abi_align; - } else if (type_is_nonnull_ptr(child_type) || child_type->id == ZigTypeIdErrorSet) { + } else if (type_is_nonnull_ptr(g, child_type) || child_type->id == ZigTypeIdErrorSet) { // This is an optimization but also is necessary for calling C // functions where all pointers are optional pointers. // Function types are technically pointers. @@ -729,8 +740,8 @@ ZigType *get_error_union_type(CodeGen *g, ZigType *err_set_type, ZigType *payloa entry->data.error_union.err_set_type = err_set_type; entry->data.error_union.payload_type = payload_type; - if (!type_has_bits(payload_type)) { - if (type_has_bits(err_set_type)) { + if (!type_has_bits(g, payload_type)) { + if (type_has_bits(g, err_set_type)) { entry->size_in_bits = err_set_type->size_in_bits; entry->abi_size = err_set_type->abi_size; entry->abi_align = err_set_type->abi_align; @@ -739,7 +750,7 @@ ZigType *get_error_union_type(CodeGen *g, ZigType *err_set_type, ZigType *payloa entry->abi_size = 0; entry->abi_align = 0; } - } else if (!type_has_bits(err_set_type)) { + } else if (!type_has_bits(g, err_set_type)) { entry->size_in_bits = payload_type->size_in_bits; entry->abi_size = payload_type->abi_size; entry->abi_align = payload_type->abi_align; @@ -856,13 +867,13 @@ ZigType *get_slice_type(CodeGen *g, ZigType *ptr_type) { entry->data.structure.requires_comptime = true; } - if (!type_has_bits(ptr_type)) { + if (!type_has_bits(g, ptr_type)) { entry->data.structure.gen_field_count = 1; entry->data.structure.fields[slice_ptr_index]->gen_index = SIZE_MAX; entry->data.structure.fields[slice_len_index]->gen_index = 0; } - if (type_has_bits(ptr_type)) { + if (type_has_bits(g, ptr_type)) { entry->size_in_bits = ptr_type->size_in_bits + g->builtin_types.entry_usize->size_in_bits; entry->abi_size = ptr_type->abi_size + g->builtin_types.entry_usize->abi_size; entry->abi_align = ptr_type->abi_align; @@ -969,12 +980,12 @@ ZigType *get_stack_trace_type(CodeGen *g) { bool want_first_arg_sret(CodeGen *g, FnTypeId *fn_type_id) { if (fn_type_id->cc == CallingConventionUnspecified) { - return handle_is_ptr(fn_type_id->return_type); + return handle_is_ptr(g, fn_type_id->return_type); } if (fn_type_id->cc != CallingConventionC) { return false; } - if (type_is_c_abi_int(g, fn_type_id->return_type)) { + if (type_is_c_abi_int_bail(g, fn_type_id->return_type)) { return false; } if (g->zig_target->arch == ZigLLVM_x86 || @@ -1650,15 +1661,16 @@ static Error emit_error_unless_type_allowed_in_packed_container(CodeGen *g, ZigT return ErrorSemanticAnalyzeFail; } zig_unreachable(); - case ZigTypeIdOptional: - if (get_codegen_ptr_type(type_entry) != nullptr) { - return ErrorNone; - } else { - add_node_error(g, source_node, - buf_sprintf("type '%s' not allowed in packed %s; no guaranteed in-memory representation", - buf_ptr(&type_entry->name), container_name)); - return ErrorSemanticAnalyzeFail; - } + case ZigTypeIdOptional: { + ZigType *ptr_type; + if ((err = get_codegen_ptr_type(g, type_entry, &ptr_type))) return err; + if (ptr_type != nullptr) return ErrorNone; + + add_node_error(g, source_node, + buf_sprintf("type '%s' not allowed in packed %s; no guaranteed in-memory representation", + buf_ptr(&type_entry->name), container_name)); + return ErrorSemanticAnalyzeFail; + } case ZigTypeIdEnum: { AstNode *decl_node = type_entry->data.enumeration.decl_node; if (decl_node->data.container_decl.init_arg_expr != nullptr) { @@ -1737,7 +1749,7 @@ Error type_allowed_in_extern(CodeGen *g, ZigType *type_entry, bool *result) { case ZigTypeIdPointer: if ((err = type_resolve(g, type_entry, ResolveStatusZeroBitsKnown))) return err; - if (!type_has_bits(type_entry)) { + if (!type_has_bits(g, type_entry)) { *result = false; return ErrorNone; } @@ -1753,7 +1765,7 @@ Error type_allowed_in_extern(CodeGen *g, ZigType *type_entry, bool *result) { *result = false; return ErrorNone; } - if (!type_is_nonnull_ptr(child_type)) { + if (!type_is_nonnull_ptr(g, child_type)) { *result = false; return ErrorNone; } @@ -1848,7 +1860,7 @@ static ZigType *analyze_fn_type(CodeGen *g, AstNode *proto_node, Scope *child_sc if (!calling_convention_allows_zig_types(fn_type_id.cc)) { if ((err = type_resolve(g, type_entry, ResolveStatusZeroBitsKnown))) return g->builtin_types.entry_invalid; - if (!type_has_bits(type_entry)) { + if (!type_has_bits(g, type_entry)) { add_node_error(g, param_node->data.param_decl.type, buf_sprintf("parameter of type '%s' has 0 bits; not allowed in function with calling convention '%s'", buf_ptr(&type_entry->name), calling_convention_name(fn_type_id.cc))); @@ -2082,7 +2094,7 @@ static ZigType *get_struct_type(CodeGen *g, const char *type_name, SrcField fiel field->src_index = i; field->align = fields[i].align; - if (type_has_bits(field->type_entry)) { + if (type_has_bits(g, field->type_entry)) { assert(type_is_resolved(field->type_entry, ResolveStatusSizeKnown)); unsigned field_abi_align = max(field->align, field->type_entry->abi_align); if (field_abi_align > abi_align) { @@ -2097,7 +2109,7 @@ static ZigType *get_struct_type(CodeGen *g, const char *type_name, SrcField fiel size_t next_offset = 0; for (size_t i = 0; i < field_count; i += 1) { TypeStructField *field = struct_type->data.structure.fields[i]; - if (!type_has_bits(field->type_entry)) + if (!type_has_bits(g, field->type_entry)) continue; field->offset = next_offset; @@ -2105,7 +2117,7 @@ static ZigType *get_struct_type(CodeGen *g, const char *type_name, SrcField fiel // find the next non-zero-byte field for offset calculations size_t next_src_field_index = i + 1; for (; next_src_field_index < field_count; next_src_field_index += 1) { - if (type_has_bits(struct_type->data.structure.fields[next_src_field_index]->type_entry)) + if (type_has_bits(g, struct_type->data.structure.fields[next_src_field_index]->type_entry)) break; } size_t next_abi_align; @@ -2402,7 +2414,7 @@ static Error resolve_union_alignment(CodeGen *g, ZigType *union_type) { union_type->data.unionation.most_aligned_union_member = most_aligned_union_member; ZigType *tag_type = union_type->data.unionation.tag_type; - if (tag_type != nullptr && type_has_bits(tag_type)) { + if (tag_type != nullptr && type_has_bits(g, tag_type)) { if ((err = type_resolve(g, tag_type, ResolveStatusAlignmentKnown))) { union_type->data.unionation.resolve_status = ResolveStatusInvalid; return ErrorSemanticAnalyzeFail; @@ -2504,7 +2516,7 @@ static Error resolve_union_type(CodeGen *g, ZigType *union_type) { if (type_is_invalid(union_type)) return ErrorSemanticAnalyzeFail; - if (!type_has_bits(field_type)) + if (!type_has_bits(g, field_type)) continue; union_abi_size = max(union_abi_size, field_type->abi_size); @@ -2523,7 +2535,7 @@ static Error resolve_union_type(CodeGen *g, ZigType *union_type) { union_type->data.unionation.union_abi_size = union_abi_size; ZigType *tag_type = union_type->data.unionation.tag_type; - if (tag_type != nullptr && type_has_bits(tag_type)) { + if (tag_type != nullptr && type_has_bits(g, tag_type)) { if ((err = type_resolve(g, tag_type, ResolveStatusSizeKnown))) { union_type->data.unionation.resolve_status = ResolveStatusInvalid; return ErrorSemanticAnalyzeFail; @@ -2998,7 +3010,7 @@ static Error resolve_struct_alignment(CodeGen *g, ZigType *struct_type) { } } - if (!type_has_bits(struct_type)) { + if (!type_has_bits(g, struct_type)) { assert(struct_type->abi_align == 0); } @@ -3378,7 +3390,7 @@ static void get_fully_qualified_decl_name(CodeGen *g, Buf *buf, Tld *tld, bool i } } -ZigFn *create_fn_raw(CodeGen *g, FnInline inline_value) { +static ZigFn *create_fn_raw(CodeGen *g, FnInline inline_value) { ZigFn *fn_entry = heap::c_allocator.create(); fn_entry->ir_executable = heap::c_allocator.create(); @@ -4416,15 +4428,50 @@ ZigType *get_src_ptr_type(ZigType *type) { return nullptr; } -ZigType *get_codegen_ptr_type(ZigType *type) { +Error get_codegen_ptr_type(CodeGen *g, ZigType *type, ZigType **result) { + Error err; + ZigType *ty = get_src_ptr_type(type); - if (ty == nullptr || !type_has_bits(ty)) - return nullptr; - return ty; + if (ty == nullptr) { + *result = nullptr; + return ErrorNone; + } + + bool has_bits; + if ((err = type_has_bits2(g, ty, &has_bits))) return err; + if (!has_bits) { + *result = nullptr; + return ErrorNone; + } + + *result = ty; + return ErrorNone; } -bool type_is_nonnull_ptr(ZigType *type) { - return get_codegen_ptr_type(type) == type && !ptr_allows_addr_zero(type); +ZigType *get_codegen_ptr_type_bail(CodeGen *g, ZigType *type) { + Error err; + ZigType *result; + if ((err = get_codegen_ptr_type(g, type, &result))) { + codegen_report_errors_and_exit(g); + } + return result; +} + +bool type_is_nonnull_ptr(CodeGen *g, ZigType *type) { + Error err; + bool result; + if ((err = type_is_nonnull_ptr2(g, type, &result))) { + codegen_report_errors_and_exit(g); + } + return result; +} + +Error type_is_nonnull_ptr2(CodeGen *g, ZigType *type, bool *result) { + Error err; + ZigType *ptr_type; + if ((err = get_codegen_ptr_type(g, type, &ptr_type))) return err; + *result = ptr_type == type && !ptr_allows_addr_zero(type); + return ErrorNone; } static uint32_t get_async_frame_align_bytes(CodeGen *g) { @@ -4499,8 +4546,12 @@ static Error define_local_param_variables(CodeGen *g, ZigFn *fn_table_entry) { } bool is_noalias = param_info->is_noalias; - if (is_noalias && get_codegen_ptr_type(param_type) == nullptr) { - add_node_error(g, param_decl_node, buf_sprintf("noalias on non-pointer parameter")); + if (is_noalias) { + ZigType *ptr_type; + if ((err = get_codegen_ptr_type(g, param_type, &ptr_type))) return err; + if (ptr_type == nullptr) { + add_node_error(g, param_decl_node, buf_sprintf("noalias on non-pointer parameter")); + } } ZigVar *var = add_variable(g, param_decl_node, fn_table_entry->child_scope, @@ -4509,7 +4560,7 @@ static Error define_local_param_variables(CodeGen *g, ZigFn *fn_table_entry) { fn_table_entry->child_scope = var->child_scope; var->shadowable = var->shadowable || is_var_args; - if (type_has_bits(param_type)) { + if (type_has_bits(g, param_type)) { fn_table_entry->variable_list.append(var); } } @@ -5027,15 +5078,35 @@ ZigType *get_int_type(CodeGen *g, bool is_signed, uint32_t size_in_bits) { return new_entry; } -bool is_valid_vector_elem_type(ZigType *elem_type) { - return elem_type->id == ZigTypeIdInt || +Error is_valid_vector_elem_type(CodeGen *g, ZigType *elem_type, bool *result) { + if (elem_type->id == ZigTypeIdInt || elem_type->id == ZigTypeIdFloat || - elem_type->id == ZigTypeIdBool || - get_codegen_ptr_type(elem_type) != nullptr; + elem_type->id == ZigTypeIdBool) + { + *result = true; + return ErrorNone; + } + + Error err; + ZigType *ptr_type; + if ((err = get_codegen_ptr_type(g, elem_type, &ptr_type))) return err; + if (ptr_type != nullptr) { + *result = true; + return ErrorNone; + } + + *result = false; + return ErrorNone; } ZigType *get_vector_type(CodeGen *g, uint32_t len, ZigType *elem_type) { - assert(is_valid_vector_elem_type(elem_type)); + Error err; + + bool valid_vector_elem; + if ((err = is_valid_vector_elem_type(g, elem_type, &valid_vector_elem))) { + codegen_report_errors_and_exit(g); + } + assert(valid_vector_elem); TypeId type_id = {}; type_id.id = ZigTypeIdVector; @@ -5049,7 +5120,7 @@ ZigType *get_vector_type(CodeGen *g, uint32_t len, ZigType *elem_type) { } ZigType *entry = new_type_table_entry(ZigTypeIdVector); - if ((len != 0) && type_has_bits(elem_type)) { + if ((len != 0) && type_has_bits(g, elem_type)) { // Vectors can only be ints, floats, bools, or pointers. ints (inc. bools) and floats have trivially resolvable // llvm type refs. pointers we will use usize instead. LLVMTypeRef example_vector_llvm_type; @@ -5081,7 +5152,7 @@ ZigType *get_c_int_type(CodeGen *g, CIntType c_int_type) { return *get_c_int_type_ptr(g, c_int_type); } -bool handle_is_ptr(ZigType *type_entry) { +bool handle_is_ptr(CodeGen *g, ZigType *type_entry) { switch (type_entry->id) { case ZigTypeIdInvalid: case ZigTypeIdMetaType: @@ -5108,15 +5179,15 @@ bool handle_is_ptr(ZigType *type_entry) { case ZigTypeIdArray: case ZigTypeIdStruct: case ZigTypeIdFnFrame: - return type_has_bits(type_entry); + return type_has_bits(g, type_entry); case ZigTypeIdErrorUnion: - return type_has_bits(type_entry->data.error_union.payload_type); + return type_has_bits(g, type_entry->data.error_union.payload_type); case ZigTypeIdOptional: - return type_has_bits(type_entry->data.maybe.child_type) && - !type_is_nonnull_ptr(type_entry->data.maybe.child_type) && + return type_has_bits(g, type_entry->data.maybe.child_type) && + !type_is_nonnull_ptr(g, type_entry->data.maybe.child_type) && type_entry->data.maybe.child_type->id != ZigTypeIdErrorSet; case ZigTypeIdUnion: - return type_has_bits(type_entry) && type_entry->data.unionation.gen_field_count != 0; + return type_has_bits(g, type_entry) && type_entry->data.unionation.gen_field_count != 0; } zig_unreachable(); @@ -5329,7 +5400,7 @@ static uint32_t hash_const_val(ZigValue *const_val) { // TODO better hashing algorithm return 2709806591; case ZigTypeIdOptional: - if (get_codegen_ptr_type(const_val->type) != nullptr) { + if (get_src_ptr_type(const_val->type) != nullptr) { return hash_const_val_ptr(const_val) * 1992916303; } else if (const_val->type->data.maybe.child_type->id == ZigTypeIdErrorSet) { return hash_const_val_error_set(const_val) * 3147031929; @@ -5455,7 +5526,7 @@ static bool can_mutate_comptime_var_state(ZigValue *value) { return false; case ZigTypeIdOptional: - if (get_codegen_ptr_type(value->type) != nullptr) + if (get_src_ptr_type(value->type) != nullptr) return value->data.x_ptr.mut == ConstPtrMutComptimeVar; if (value->data.x_optional == nullptr) return false; @@ -5593,11 +5664,13 @@ bool fn_eval_eql(Scope *a, Scope *b) { } // Deprecated. Use type_has_bits2. -bool type_has_bits(ZigType *type_entry) { - assert(type_entry != nullptr); - assert(!type_is_invalid(type_entry)); - assert(type_is_resolved(type_entry, ResolveStatusZeroBitsKnown)); - return type_entry->abi_size != 0; +bool type_has_bits(CodeGen *g, ZigType *type_entry) { + Error err; + bool result; + if ((err = type_has_bits2(g, type_entry, &result))) { + codegen_report_errors_and_exit(g); + } + return result; } // Whether the type has bits at runtime. @@ -5687,7 +5760,7 @@ OnePossibleValue type_has_one_possible_value(CodeGen *g, ZigType *type_entry) { case ZigTypeIdEnum: case ZigTypeIdInt: case ZigTypeIdVector: - return type_has_bits(type_entry) ? OnePossibleValueNo : OnePossibleValueYes; + return type_has_bits(g, type_entry) ? OnePossibleValueNo : OnePossibleValueYes; case ZigTypeIdPointer: { ZigType *elem_type = type_entry->data.pointer.child_type; // If the recursive function call asks, then we are not one possible value. @@ -6365,7 +6438,7 @@ static Error resolve_async_frame(CodeGen *g, ZigType *frame_type) { } if (await->base.base.ref_count == 0) continue; - if (!type_has_bits(await->base.value->type)) + if (!type_has_bits(g, await->base.value->type)) continue; await->result_loc = ir_create_alloca(g, await->base.base.scope, await->base.base.source_node, fn, await->base.value->type, ""); @@ -6406,7 +6479,7 @@ static Error resolve_async_frame(CodeGen *g, ZigType *frame_type) { continue; if ((err = type_resolve(g, instruction->value->type, ResolveStatusZeroBitsKnown))) return ErrorSemanticAnalyzeFail; - if (!type_has_bits(instruction->value->type)) + if (!type_has_bits(g, instruction->value->type)) continue; if (scope_needs_spill(instruction->base.scope)) { instruction->spill = ir_create_alloca(g, instruction->base.scope, instruction->base.source_node, @@ -6465,7 +6538,7 @@ static Error resolve_async_frame(CodeGen *g, ZigType *frame_type) { ZigType *ptr_type = instruction->base.value->type; assert(ptr_type->id == ZigTypeIdPointer); ZigType *child_type = resolve_type_isf(ptr_type->data.pointer.child_type); - if (!type_has_bits(child_type)) + if (!type_has_bits(g, child_type)) continue; if (instruction->base.base.ref_count == 0) continue; @@ -6763,7 +6836,7 @@ bool const_values_equal(CodeGen *g, ZigValue *a, ZigValue *b) { if (bigint_cmp(&union1->tag, &union2->tag) == CmpEQ) { TypeUnionField *field = find_union_field_by_tag(a->type, &union1->tag); assert(field != nullptr); - if (!type_has_bits(field->type_entry)) + if (!type_has_bits(g, field->type_entry)) return true; assert(find_union_field_by_tag(a->type, &union2->tag) != nullptr); return const_values_equal(g, union1->payload, union2->payload); @@ -6826,7 +6899,7 @@ bool const_values_equal(CodeGen *g, ZigValue *a, ZigValue *b) { case ZigTypeIdNull: zig_panic("TODO"); case ZigTypeIdOptional: - if (get_codegen_ptr_type(a->type) != nullptr) + if (get_src_ptr_type(a->type) != nullptr) return const_values_equal_ptr(a, b); if (a->data.x_optional == nullptr || b->data.x_optional == nullptr) { return (a->data.x_optional == nullptr && b->data.x_optional == nullptr); @@ -7097,7 +7170,7 @@ void render_const_value(CodeGen *g, Buf *buf, ZigValue *const_val) { } case ZigTypeIdOptional: { - if (get_codegen_ptr_type(const_val->type) != nullptr) + if (get_src_ptr_type(const_val->type) != nullptr) return render_const_val_ptr(g, buf, const_val, type_entry->data.maybe.child_type); if (type_entry->data.maybe.child_type->id == ZigTypeIdErrorSet) return render_const_val_err_set(g, buf, const_val, type_entry->data.maybe.child_type); @@ -7881,8 +7954,12 @@ static X64CABIClass type_system_V_abi_x86_64_class(CodeGen *g, ZigType *ty, size } X64CABIClass type_c_abi_x86_64_class(CodeGen *g, ZigType *ty) { + Error err; + const size_t ty_size = type_size(g, ty); - if (get_codegen_ptr_type(ty) != nullptr) + ZigType *ptr_type; + if ((err = get_codegen_ptr_type(g, ty, &ptr_type))) return X64CABIClass_Unknown; + if (ptr_type != nullptr) return X64CABIClass_INTEGER; if (g->zig_target->os == OsWindows || g->zig_target->os == OsUefi) { @@ -7898,14 +7975,32 @@ X64CABIClass type_c_abi_x86_64_class(CodeGen *g, ZigType *ty) { } // NOTE this does not depend on x86_64 -bool type_is_c_abi_int(CodeGen *g, ZigType *ty) { - return (ty->id == ZigTypeIdInt || +Error type_is_c_abi_int(CodeGen *g, ZigType *ty, bool *result) { + if (ty->id == ZigTypeIdInt || ty->id == ZigTypeIdFloat || ty->id == ZigTypeIdBool || ty->id == ZigTypeIdEnum || ty->id == ZigTypeIdVoid || - ty->id == ZigTypeIdUnreachable || - get_codegen_ptr_type(ty) != nullptr); + ty->id == ZigTypeIdUnreachable) + { + *result = true; + return ErrorNone; + } + + Error err; + ZigType *ptr_type; + if ((err = get_codegen_ptr_type(g, ty, &ptr_type))) return err; + *result = ptr_type != nullptr; + return ErrorNone; +} + +bool type_is_c_abi_int_bail(CodeGen *g, ZigType *ty) { + Error err; + bool result; + if ((err = type_is_c_abi_int(g, ty, &result))) + codegen_report_errors_and_exit(g); + + return result; } uint32_t get_host_int_bytes(CodeGen *g, ZigType *struct_type, TypeStructField *field) { @@ -8036,7 +8131,7 @@ static void resolve_llvm_types_slice(CodeGen *g, ZigType *type, ResolveStatus wa if (ResolveStatusLLVMFwdDecl >= wanted_resolve_status) return; } - if (!type_has_bits(child_type)) { + if (!type_has_bits(g, child_type)) { LLVMTypeRef element_types[] = { usize_llvm_type, }; @@ -8145,7 +8240,7 @@ static void resolve_llvm_types_struct(CodeGen *g, ZigType *struct_type, ResolveS } if (struct_type->data.structure.resolve_status < ResolveStatusLLVMFwdDecl) { - struct_type->llvm_type = type_has_bits(struct_type) ? + struct_type->llvm_type = type_has_bits(g, struct_type) ? LLVMStructCreateNamed(LLVMGetGlobalContext(), buf_ptr(&struct_type->name)) : LLVMVoidType(); unsigned dwarf_kind = ZigLLVMTag_DW_structure_type(); struct_type->llvm_di_type = ZigLLVMCreateReplaceableCompositeType(g->dbuilder, @@ -8175,7 +8270,7 @@ static void resolve_llvm_types_struct(CodeGen *g, ZigType *struct_type, ResolveS for (size_t i = 0; i < field_count; i += 1) { TypeStructField *field = struct_type->data.structure.fields[i]; ZigType *field_type = field->type_entry; - if (!type_has_bits(field_type)) + if (!type_has_bits(g, field_type)) continue; (void)get_llvm_type(g, field_type); if (struct_type->data.structure.resolve_status >= wanted_resolve_status) return; @@ -8189,7 +8284,7 @@ static void resolve_llvm_types_struct(CodeGen *g, ZigType *struct_type, ResolveS for (size_t i = 0; i < field_count; i += 1) { TypeStructField *field = struct_type->data.structure.fields[i]; ZigType *field_type = field->type_entry; - if (field->is_comptime || !type_has_bits(field_type)) + if (field->is_comptime || !type_has_bits(g, field_type)) continue; LLVMTypeRef field_llvm_type = get_llvm_type(g, field_type); size_t llvm_field_abi_align = LLVMABIAlignmentOfType(g->target_data_ref, field_llvm_type); @@ -8200,7 +8295,7 @@ static void resolve_llvm_types_struct(CodeGen *g, ZigType *struct_type, ResolveS TypeStructField *field = struct_type->data.structure.fields[i]; ZigType *field_type = field->type_entry; - if (field->is_comptime || !type_has_bits(field_type)) { + if (field->is_comptime || !type_has_bits(g, field_type)) { field->gen_index = SIZE_MAX; continue; } @@ -8247,7 +8342,7 @@ static void resolve_llvm_types_struct(CodeGen *g, ZigType *struct_type, ResolveS // find the next non-zero-byte field for offset calculations size_t next_src_field_index = i + 1; for (; next_src_field_index < field_count; next_src_field_index += 1) { - if (type_has_bits(struct_type->data.structure.fields[next_src_field_index]->type_entry)) + if (type_has_bits(g, struct_type->data.structure.fields[next_src_field_index]->type_entry)) break; } size_t next_abi_align; @@ -8293,7 +8388,7 @@ static void resolve_llvm_types_struct(CodeGen *g, ZigType *struct_type, ResolveS gen_field_index += 1; } - if (type_has_bits(struct_type)) { + if (type_has_bits(g, struct_type)) { assert(struct_type->data.structure.gen_field_count == gen_field_index); LLVMStructSetBody(struct_type->llvm_type, element_types, (unsigned)struct_type->data.structure.gen_field_count, packed); @@ -8405,7 +8500,7 @@ static void resolve_llvm_types_enum(CodeGen *g, ZigType *enum_type, ResolveStatu ZigType *import = get_scope_import(scope); AstNode *decl_node = enum_type->data.enumeration.decl_node; - if (!type_has_bits(enum_type)) { + if (!type_has_bits(g, enum_type)) { enum_type->llvm_type = g->builtin_types.entry_void->llvm_type; enum_type->llvm_di_type = make_empty_namespace_llvm_di_type(g, import, buf_ptr(&enum_type->name), decl_node); @@ -8487,7 +8582,7 @@ static void resolve_llvm_types_union(CodeGen *g, ZigType *union_type, ResolveSta uint32_t field_count = union_type->data.unionation.src_field_count; for (uint32_t i = 0; i < field_count; i += 1) { TypeUnionField *union_field = &union_type->data.unionation.fields[i]; - if (!type_has_bits(union_field->type_entry)) + if (!type_has_bits(g, union_field->type_entry)) continue; ZigLLVMDIType *field_di_type = get_llvm_di_type(g, union_field->type_entry); @@ -8506,7 +8601,7 @@ static void resolve_llvm_types_union(CodeGen *g, ZigType *union_type, ResolveSta } - if (tag_type == nullptr || !type_has_bits(tag_type)) { + if (tag_type == nullptr || !type_has_bits(g, tag_type)) { assert(most_aligned_union_member != nullptr); size_t padding_bytes = union_type->data.unionation.union_abi_size - most_aligned_union_member->type_entry->abi_size; @@ -8616,7 +8711,7 @@ static void resolve_llvm_types_pointer(CodeGen *g, ZigType *type, ResolveStatus if (resolve_pointer_zero_bits(g, type) != ErrorNone) zig_unreachable(); - if (!type_has_bits(type)) { + if (!type_has_bits(g, type)) { type->llvm_type = g->builtin_types.entry_void->llvm_type; type->llvm_di_type = g->builtin_types.entry_void->llvm_di_type; return; @@ -8669,7 +8764,7 @@ static void resolve_llvm_types_pointer(CodeGen *g, ZigType *type, ResolveStatus static void resolve_llvm_types_integer(CodeGen *g, ZigType *type) { if (type->llvm_di_type != nullptr) return; - if (!type_has_bits(type)) { + if (!type_has_bits(g, type)) { type->llvm_type = g->builtin_types.entry_void->llvm_type; type->llvm_di_type = g->builtin_types.entry_void->llvm_di_type; return; @@ -8705,14 +8800,14 @@ static void resolve_llvm_types_optional(CodeGen *g, ZigType *type, ResolveStatus ZigLLVMDIType *bool_llvm_di_type = get_llvm_di_type(g, g->builtin_types.entry_bool); ZigType *child_type = type->data.maybe.child_type; - if (!type_has_bits(child_type)) { + if (!type_has_bits(g, child_type)) { type->llvm_type = bool_llvm_type; type->llvm_di_type = bool_llvm_di_type; type->data.maybe.resolve_status = ResolveStatusLLVMFull; return; } - if (type_is_nonnull_ptr(child_type) || child_type->id == ZigTypeIdErrorSet) { + if (type_is_nonnull_ptr(g, child_type) || child_type->id == ZigTypeIdErrorSet) { type->llvm_type = get_llvm_type(g, child_type); type->llvm_di_type = get_llvm_di_type(g, child_type); type->data.maybe.resolve_status = ResolveStatusLLVMFull; @@ -8778,11 +8873,11 @@ static void resolve_llvm_types_error_union(CodeGen *g, ZigType *type) { ZigType *payload_type = type->data.error_union.payload_type; ZigType *err_set_type = type->data.error_union.err_set_type; - if (!type_has_bits(payload_type)) { - assert(type_has_bits(err_set_type)); + if (!type_has_bits(g, payload_type)) { + assert(type_has_bits(g, err_set_type)); type->llvm_type = get_llvm_type(g, err_set_type); type->llvm_di_type = get_llvm_di_type(g, err_set_type); - } else if (!type_has_bits(err_set_type)) { + } else if (!type_has_bits(g, err_set_type)) { type->llvm_type = get_llvm_type(g, payload_type); type->llvm_di_type = get_llvm_di_type(g, payload_type); } else { @@ -8852,7 +8947,7 @@ static void resolve_llvm_types_error_union(CodeGen *g, ZigType *type) { static void resolve_llvm_types_array(CodeGen *g, ZigType *type) { if (type->llvm_di_type != nullptr) return; - if (!type_has_bits(type)) { + if (!type_has_bits(g, type)) { type->llvm_type = g->builtin_types.entry_void->llvm_type; type->llvm_di_type = g->builtin_types.entry_void->llvm_di_type; return; @@ -8893,7 +8988,7 @@ static void resolve_llvm_types_fn_type(CodeGen *g, ZigType *fn_type) { if (is_async) { gen_return_type = g->builtin_types.entry_void; param_di_types.append(nullptr); - } else if (!type_has_bits(fn_type_id->return_type)) { + } else if (!type_has_bits(g, fn_type_id->return_type)) { gen_return_type = g->builtin_types.entry_void; param_di_types.append(nullptr); } else if (first_arg_return) { @@ -8940,11 +9035,11 @@ static void resolve_llvm_types_fn_type(CodeGen *g, ZigType *fn_type) { gen_param_info->src_index = i; gen_param_info->gen_index = SIZE_MAX; - if (is_c_abi || !type_has_bits(type_entry)) + if (is_c_abi || !type_has_bits(g, type_entry)) continue; ZigType *gen_type; - if (handle_is_ptr(type_entry)) { + if (handle_is_ptr(g, type_entry)) { gen_type = get_pointer_to_type(g, type_entry, true); gen_param_info->is_byval = true; } else { @@ -9098,7 +9193,7 @@ static void resolve_llvm_types_any_frame(CodeGen *g, ZigType *any_frame_type, Re field_types.append(usize_type_ref); // resume_index field_types.append(usize_type_ref); // awaiter - bool have_result_type = result_type != nullptr && type_has_bits(result_type); + bool have_result_type = result_type != nullptr && type_has_bits(g, result_type); if (have_result_type) { field_types.append(get_llvm_type(g, ptr_result_type)); // result_ptr_callee field_types.append(get_llvm_type(g, ptr_result_type)); // result_ptr_awaiter @@ -9379,7 +9474,7 @@ bool is_opt_err_set(ZigType *ty) { bool type_has_optional_repr(ZigType *ty) { if (ty->id != ZigTypeIdOptional) { return false; - } else if (get_codegen_ptr_type(ty) != nullptr) { + } else if (get_src_ptr_type(ty) != nullptr) { return false; } else if (is_opt_err_set(ty)) { return false; @@ -9471,6 +9566,58 @@ bool type_is_numeric(ZigType *ty) { zig_unreachable(); } +static void dump_value_indent_error_set(ZigValue *val, int indent) { + fprintf(stderr, "\n"); +} + +static void dump_value_indent(ZigValue *val, int indent); + +static void dump_value_indent_ptr(ZigValue *val, int indent) { + switch (val->data.x_ptr.special) { + case ConstPtrSpecialInvalid: + fprintf(stderr, "\n"); + return; + case ConstPtrSpecialNull: + fprintf(stderr, "\n"); + return; + case ConstPtrSpecialRef: + fprintf(stderr, "data.x_ptr.data.ref.pointee, indent + 1); + break; + case ConstPtrSpecialBaseStruct: { + ZigValue *struct_val = val->data.x_ptr.data.base_struct.struct_val; + size_t field_index = val->data.x_ptr.data.base_struct.field_index; + fprintf(stderr, "data.x_struct.fields[field_index]; + if (field_val != nullptr) { + dump_value_indent(field_val, indent + 1); + } else { + for (int i = 0; i < indent; i += 1) { + fprintf(stderr, " "); + } + fprintf(stderr, "(invalid null field)\n"); + } + } + break; + } + case ConstPtrSpecialBaseOptionalPayload: { + ZigValue *optional_val = val->data.x_ptr.data.base_optional_payload.optional_val; + fprintf(stderr, "\n"); +} + static void dump_value_indent(ZigValue *val, int indent) { for (int i = 0; i < indent; i += 1) { fprintf(stderr, " "); @@ -9548,15 +9695,20 @@ static void dump_value_indent(ZigValue *val, int indent) { return; case ZigTypeIdOptional: - fprintf(stderr, "<\n"); - dump_value_indent(val->data.x_optional, indent + 1); + if (get_src_ptr_type(val->type) != nullptr) { + return dump_value_indent_ptr(val, indent); + } else if (val->type->data.maybe.child_type->id == ZigTypeIdErrorSet) { + return dump_value_indent_error_set(val, indent); + } else { + fprintf(stderr, "<\n"); + dump_value_indent(val->data.x_optional, indent + 1); - for (int i = 0; i < indent; i += 1) { - fprintf(stderr, " "); + for (int i = 0; i < indent; i += 1) { + fprintf(stderr, " "); + } + fprintf(stderr, ">\n"); + return; } - fprintf(stderr, ">\n"); - return; - case ZigTypeIdErrorUnion: if (val->data.x_err_union.payload != nullptr) { fprintf(stderr, "<\n"); @@ -9572,52 +9724,14 @@ static void dump_value_indent(ZigValue *val, int indent) { return; case ZigTypeIdPointer: - switch (val->data.x_ptr.special) { - case ConstPtrSpecialInvalid: - fprintf(stderr, "\n"); - return; - case ConstPtrSpecialRef: - fprintf(stderr, "data.x_ptr.data.ref.pointee, indent + 1); - break; - case ConstPtrSpecialBaseStruct: { - ZigValue *struct_val = val->data.x_ptr.data.base_struct.struct_val; - size_t field_index = val->data.x_ptr.data.base_struct.field_index; - fprintf(stderr, "data.x_struct.fields[field_index]; - if (field_val != nullptr) { - dump_value_indent(field_val, indent + 1); - } else { - for (int i = 0; i < indent; i += 1) { - fprintf(stderr, " "); - } - fprintf(stderr, "(invalid null field)\n"); - } - } - break; - } - case ConstPtrSpecialBaseOptionalPayload: { - ZigValue *optional_val = val->data.x_ptr.data.base_optional_payload.optional_val; - fprintf(stderr, "\n"); - return; + return dump_value_indent_ptr(val, indent); + + case ZigTypeIdErrorSet: + return dump_value_indent_error_set(val, indent); case ZigTypeIdVector: case ZigTypeIdArray: case ZigTypeIdNull: - case ZigTypeIdErrorSet: case ZigTypeIdEnum: case ZigTypeIdUnion: case ZigTypeIdFn: diff --git a/src/analyze.hpp b/src/analyze.hpp index eb3781789d..fded1e4052 100644 --- a/src/analyze.hpp +++ b/src/analyze.hpp @@ -34,6 +34,7 @@ ZigType **get_c_int_type_ptr(CodeGen *g, CIntType c_int_type); ZigType *get_c_int_type(CodeGen *g, CIntType c_int_type); ZigType *get_fn_type(CodeGen *g, FnTypeId *fn_type_id); ZigType *get_optional_type(CodeGen *g, ZigType *child_type); +ZigType *get_optional_type2(CodeGen *g, ZigType *child_type); ZigType *get_array_type(CodeGen *g, ZigType *child_type, uint64_t array_size, ZigValue *sentinel); ZigType *get_slice_type(CodeGen *g, ZigType *ptr_type); ZigType *get_partial_container_type(CodeGen *g, Scope *scope, ContainerKind kind, @@ -44,14 +45,20 @@ ZigType *get_bound_fn_type(CodeGen *g, ZigFn *fn_entry); ZigType *get_opaque_type(CodeGen *g, Scope *scope, AstNode *source_node, const char *full_name, Buf *bare_name); ZigType *get_test_fn_type(CodeGen *g); ZigType *get_any_frame_type(CodeGen *g, ZigType *result_type); -bool handle_is_ptr(ZigType *type_entry); +bool handle_is_ptr(CodeGen *g, ZigType *type_entry); -bool type_has_bits(ZigType *type_entry); +bool type_has_bits(CodeGen *g, ZigType *type_entry); Error type_has_bits2(CodeGen *g, ZigType *type_entry, bool *result); Error type_allowed_in_extern(CodeGen *g, ZigType *type_entry, bool *result); bool ptr_allows_addr_zero(ZigType *ptr_type); -bool type_is_nonnull_ptr(ZigType *type); + +// Deprecated, use `type_is_nonnull_ptr2` +bool type_is_nonnull_ptr(CodeGen *g, ZigType *type); +Error type_is_nonnull_ptr2(CodeGen *g, ZigType *type, bool *result); + +ZigType *get_codegen_ptr_type_bail(CodeGen *g, ZigType *type); +Error get_codegen_ptr_type(CodeGen *g, ZigType *type, ZigType **result); enum SourceKind { SourceKindRoot, @@ -68,7 +75,6 @@ Tld *find_container_decl(CodeGen *g, ScopeDecls *decls_scope, Buf *name); void resolve_top_level_decl(CodeGen *g, Tld *tld, AstNode *source_node, bool allow_lazy); ZigType *get_src_ptr_type(ZigType *type); -ZigType *get_codegen_ptr_type(ZigType *type); uint32_t get_ptr_align(CodeGen *g, ZigType *type); bool get_ptr_const(ZigType *type); ZigType *validate_var_type(CodeGen *g, AstNode *source_node, ZigType *type_entry); @@ -87,7 +93,7 @@ TypeUnionField *find_union_field_by_tag(ZigType *type_entry, const BigInt *tag); bool is_ref(ZigType *type_entry); bool is_array_ref(ZigType *type_entry); bool is_container_ref(ZigType *type_entry); -bool is_valid_vector_elem_type(ZigType *elem_type); +Error is_valid_vector_elem_type(CodeGen *g, ZigType *elem_type, bool *result); void scan_decls(CodeGen *g, ScopeDecls *decls_scope, AstNode *node); ZigFn *scope_fn_entry(Scope *scope); ZigPackage *scope_package(Scope *scope); @@ -99,7 +105,6 @@ ZigVar *add_variable(CodeGen *g, AstNode *source_node, Scope *parent_scope, Buf ZigType *analyze_type_expr(CodeGen *g, Scope *scope, AstNode *node); void append_namespace_qualification(CodeGen *g, Buf *buf, ZigType *container_type); ZigFn *create_fn(CodeGen *g, AstNode *proto_node); -ZigFn *create_fn_raw(CodeGen *g, FnInline inline_value); void init_fn_type_id(FnTypeId *fn_type_id, AstNode *proto_node, CallingConvention cc, size_t param_count_alloc); AstNode *get_param_decl_node(ZigFn *fn_entry, size_t index); Error ATTRIBUTE_MUST_USE type_resolve(CodeGen *g, ZigType *type_entry, ResolveStatus status); @@ -223,7 +228,8 @@ Error ATTRIBUTE_MUST_USE file_fetch(CodeGen *g, Buf *resolved_path, Buf *content void walk_function_params(CodeGen *g, ZigType *fn_type, FnWalk *fn_walk); X64CABIClass type_c_abi_x86_64_class(CodeGen *g, ZigType *ty); -bool type_is_c_abi_int(CodeGen *g, ZigType *ty); +bool type_is_c_abi_int_bail(CodeGen *g, ZigType *ty); +Error type_is_c_abi_int(CodeGen *g, ZigType *ty, bool *result); bool want_first_arg_sret(CodeGen *g, FnTypeId *fn_type_id); const char *container_string(ContainerKind kind); diff --git a/src/codegen.cpp b/src/codegen.cpp index f41bbe5c16..25d8672cd4 100644 --- a/src/codegen.cpp +++ b/src/codegen.cpp @@ -313,7 +313,7 @@ struct CalcLLVMFieldIndex { }; static void calc_llvm_field_index_add(CodeGen *g, CalcLLVMFieldIndex *calc, ZigType *ty) { - if (!type_has_bits(ty)) return; + if (!type_has_bits(g, ty)) return; uint32_t ty_align = get_abi_alignment(g, ty); if (calc->offset % ty_align != 0) { uint32_t llvm_align = LLVMABIAlignmentOfType(g->target_data_ref, get_llvm_type(g, ty)); @@ -334,7 +334,7 @@ static void frame_index_trace_arg_calc(CodeGen *g, CalcLLVMFieldIndex *calc, Zig calc_llvm_field_index_add(g, calc, g->builtin_types.entry_usize); // resume index calc_llvm_field_index_add(g, calc, g->builtin_types.entry_usize); // awaiter index - if (type_has_bits(return_type)) { + if (type_has_bits(g, return_type)) { calc_llvm_field_index_add(g, calc, g->builtin_types.entry_usize); // *ReturnType (callee's) calc_llvm_field_index_add(g, calc, g->builtin_types.entry_usize); // *ReturnType (awaiter's) calc_llvm_field_index_add(g, calc, return_type); // ReturnType @@ -383,7 +383,7 @@ static uint32_t get_err_ret_trace_arg_index(CodeGen *g, ZigFn *fn_table_entry) { return UINT32_MAX; } ZigType *return_type = fn_type->data.fn.fn_type_id.return_type; - bool first_arg_ret = type_has_bits(return_type) && handle_is_ptr(return_type); + bool first_arg_ret = type_has_bits(g, return_type) && handle_is_ptr(g, return_type); return first_arg_ret ? 1 : 0; } @@ -580,9 +580,9 @@ static LLVMValueRef make_fn_llvm_value(CodeGen *g, ZigFn *fn) { addLLVMArgAttr(llvm_fn, 0, "nonnull"); } else { unsigned init_gen_i = 0; - if (!type_has_bits(return_type)) { + if (!type_has_bits(g, return_type)) { // nothing to do - } else if (type_is_nonnull_ptr(return_type)) { + } else if (type_is_nonnull_ptr(g, return_type)) { addLLVMAttr(llvm_fn, 0, "nonnull"); } else if (want_first_arg_sret(g, &fn_type->data.fn.fn_type_id)) { // Sret pointers must not be address 0 @@ -858,8 +858,8 @@ static LLVMValueRef gen_load(CodeGen *g, LLVMValueRef ptr, ZigType *ptr_type, co } static LLVMValueRef get_handle_value(CodeGen *g, LLVMValueRef ptr, ZigType *type, ZigType *ptr_type) { - if (type_has_bits(type)) { - if (handle_is_ptr(type)) { + if (type_has_bits(g, type)) { + if (handle_is_ptr(g, type)) { return ptr; } else { assert(ptr_type->id == ZigTypeIdPointer); @@ -1667,10 +1667,10 @@ static void gen_assign_raw(CodeGen *g, LLVMValueRef ptr, ZigType *ptr_type, assert(ptr_type->id == ZigTypeIdPointer); ZigType *child_type = ptr_type->data.pointer.child_type; - if (!type_has_bits(child_type)) + if (!type_has_bits(g, child_type)) return; - if (handle_is_ptr(child_type)) { + if (handle_is_ptr(g, child_type)) { assert(LLVMGetTypeKind(LLVMTypeOf(value)) == LLVMPointerTypeKind); assert(LLVMGetTypeKind(LLVMTypeOf(ptr)) == LLVMPointerTypeKind); @@ -1778,7 +1778,7 @@ static LLVMValueRef ir_llvm_value(CodeGen *g, IrInstGen *instruction) { render_const_val(g, instruction->value, ""); // we might have to do some pointer casting here due to the way union // values are rendered with a type other than the one we expect - if (handle_is_ptr(instruction->value->type)) { + if (handle_is_ptr(g, instruction->value->type)) { render_const_val_global(g, instruction->value, ""); ZigType *ptr_type = get_pointer_to_type(g, instruction->value->type, true); instruction->llvm_value = LLVMBuildBitCast(g->builder, instruction->value->llvm_global, get_llvm_type(g, ptr_type), ""); @@ -1875,14 +1875,14 @@ static bool iter_function_params_c_abi(CodeGen *g, ZigType *fn_type, FnWalk *fn_ break; } - if (type_is_c_abi_int(g, ty) || ty->id == ZigTypeIdFloat || ty->id == ZigTypeIdVector || + if (type_is_c_abi_int_bail(g, ty) || ty->id == ZigTypeIdFloat || ty->id == ZigTypeIdVector || ty->id == ZigTypeIdInt // TODO investigate if we need to change this ) { switch (fn_walk->id) { case FnWalkIdAttrs: { - ZigType *ptr_type = get_codegen_ptr_type(ty); + ZigType *ptr_type = get_codegen_ptr_type_bail(g, ty); if (ptr_type != nullptr) { - if (type_is_nonnull_ptr(ty)) { + if (type_is_nonnull_ptr(g, ty)) { addLLVMArgAttr(llvm_fn, fn_walk->data.attrs.gen_i, "nonnull"); } if (ptr_type->data.pointer.is_const) { @@ -1924,7 +1924,7 @@ static bool iter_function_params_c_abi(CodeGen *g, ZigType *fn_type, FnWalk *fn_ { // Arrays are just pointers if (ty->id == ZigTypeIdArray) { - assert(handle_is_ptr(ty)); + assert(handle_is_ptr(g, ty)); switch (fn_walk->id) { case FnWalkIdAttrs: // arrays passed to C ABI functions may not be at address 0 @@ -1961,7 +1961,7 @@ static bool iter_function_params_c_abi(CodeGen *g, ZigType *fn_type, FnWalk *fn_ X64CABIClass abi_class = type_c_abi_x86_64_class(g, ty); size_t ty_size = type_size(g, ty); if (abi_class == X64CABIClass_MEMORY || abi_class == X64CABIClass_MEMORY_nobyval) { - assert(handle_is_ptr(ty)); + assert(handle_is_ptr(g, ty)); switch (fn_walk->id) { case FnWalkIdAttrs: if (abi_class != X64CABIClass_MEMORY_nobyval) { @@ -2084,7 +2084,7 @@ void walk_function_params(CodeGen *g, ZigType *fn_type, FnWalk *fn_walk) { for (size_t call_i = 0; call_i < instruction->arg_count; call_i += 1) { IrInstGen *param_instruction = instruction->args[call_i]; ZigType *param_type = param_instruction->value->type; - if (is_var_args || type_has_bits(param_type)) { + if (is_var_args || type_has_bits(g, param_type)) { LLVMValueRef param_value = ir_llvm_value(g, param_instruction); assert(param_value); fn_walk->data.call.gen_param_values->append(param_value); @@ -2115,10 +2115,10 @@ void walk_function_params(CodeGen *g, ZigType *fn_type, FnWalk *fn_walk) { if ((param_type->id == ZigTypeIdPointer && param_type->data.pointer.is_const) || is_byval) { addLLVMArgAttr(llvm_fn, (unsigned)gen_index, "readonly"); } - if (get_codegen_ptr_type(param_type) != nullptr) { + if (get_codegen_ptr_type_bail(g, param_type) != nullptr) { addLLVMArgAttrInt(llvm_fn, (unsigned)gen_index, "align", get_ptr_align(g, param_type)); } - if (type_is_nonnull_ptr(param_type)) { + if (type_is_nonnull_ptr(g, param_type)) { addLLVMArgAttr(llvm_fn, (unsigned)gen_index, "nonnull"); } break; @@ -2133,7 +2133,7 @@ void walk_function_params(CodeGen *g, ZigType *fn_type, FnWalk *fn_walk) { assert(variable); assert(variable->value_ref); - if (!handle_is_ptr(variable->var_type) && !fn_is_async(fn_walk->data.inits.fn)) { + if (!handle_is_ptr(g, variable->var_type) && !fn_is_async(fn_walk->data.inits.fn)) { clear_debug_source_node(g); ZigType *fn_type = fn_table_entry->type_entry; unsigned gen_arg_index = fn_type->data.fn.gen_param_info[variable->src_arg_index].gen_index; @@ -2400,12 +2400,12 @@ static void gen_async_return(CodeGen *g, IrInstGenReturn *instruction) { LLVMTypeRef usize_type_ref = g->builtin_types.entry_usize->llvm_type; ZigType *operand_type = (instruction->operand != nullptr) ? instruction->operand->value->type : nullptr; - bool operand_has_bits = (operand_type != nullptr) && type_has_bits(operand_type); + bool operand_has_bits = (operand_type != nullptr) && type_has_bits(g, operand_type); ZigType *ret_type = g->cur_fn->type_entry->data.fn.fn_type_id.return_type; - bool ret_type_has_bits = type_has_bits(ret_type); + bool ret_type_has_bits = type_has_bits(g, ret_type); if (operand_has_bits && instruction->operand != nullptr) { - bool need_store = instruction->operand->value->special != ConstValSpecialRuntime || !handle_is_ptr(ret_type); + bool need_store = instruction->operand->value->special != ConstValSpecialRuntime || !handle_is_ptr(g, ret_type); if (need_store) { // It didn't get written to the result ptr. We do that now. ZigType *ret_ptr_type = get_pointer_to_type(g, ret_type, true); @@ -2508,7 +2508,7 @@ static LLVMValueRef ir_render_return(CodeGen *g, IrExecutableGen *executable, Ir gen_assign_raw(g, g->cur_ret_ptr, get_pointer_to_type(g, return_type, false), value); LLVMBuildRetVoid(g->builder); } else if (g->cur_fn->type_entry->data.fn.fn_type_id.cc != CallingConventionAsync && - handle_is_ptr(g->cur_fn->type_entry->data.fn.fn_type_id.return_type)) + handle_is_ptr(g, g->cur_fn->type_entry->data.fn.fn_type_id.return_type)) { if (instruction->operand == nullptr) { LLVMValueRef by_val_value = gen_load_untyped(g, g->cur_ret_ptr, 0, false, ""); @@ -2879,7 +2879,7 @@ static LLVMValueRef ir_render_bin_op(CodeGen *g, IrExecutableGen *executable, } else if (scalar_type->id == ZigTypeIdEnum || scalar_type->id == ZigTypeIdErrorSet || scalar_type->id == ZigTypeIdBool || - get_codegen_ptr_type(scalar_type) != nullptr) + get_codegen_ptr_type_bail(g, scalar_type) != nullptr) { LLVMIntPredicate pred = cmp_op_to_int_predicate(op_id, false); return LLVMBuildICmp(g->builder, pred, op1_value, op2_value, ""); @@ -3145,7 +3145,7 @@ static LLVMValueRef ir_render_ptr_of_array_to_slice(CodeGen *g, IrExecutableGen ZigType *array_type = actual_type->data.pointer.child_type; assert(array_type->id == ZigTypeIdArray); - if (type_has_bits(actual_type)) { + if (type_has_bits(g, actual_type)) { LLVMValueRef ptr_field_ptr = LLVMBuildStructGEP(g->builder, result_loc, ptr_index, ""); LLVMValueRef indices[] = { LLVMConstNull(g->builtin_types.entry_usize->llvm_type), @@ -3171,7 +3171,7 @@ static LLVMValueRef ir_render_ptr_cast(CodeGen *g, IrExecutableGen *executable, IrInstGenPtrCast *instruction) { ZigType *wanted_type = instruction->base.value->type; - if (!type_has_bits(wanted_type)) { + if (!type_has_bits(g, wanted_type)) { return nullptr; } LLVMValueRef ptr = ir_llvm_value(g, instruction->ptr); @@ -3200,8 +3200,8 @@ static LLVMValueRef ir_render_bit_cast(CodeGen *g, IrExecutableGen *executable, ZigType *actual_type = instruction->operand->value->type; LLVMValueRef value = ir_llvm_value(g, instruction->operand); - bool wanted_is_ptr = handle_is_ptr(wanted_type); - bool actual_is_ptr = handle_is_ptr(actual_type); + bool wanted_is_ptr = handle_is_ptr(g, wanted_type); + bool actual_is_ptr = handle_is_ptr(g, actual_type); if (wanted_is_ptr == actual_is_ptr) { // We either bitcast the value directly or bitcast the pointer which does a pointer cast LLVMTypeRef wanted_type_ref = wanted_is_ptr ? @@ -3348,9 +3348,9 @@ static LLVMValueRef ir_render_err_to_int(CodeGen *g, IrExecutableGen *executable g->err_tag_type, wanted_type, target_val); } else if (actual_type->id == ZigTypeIdErrorUnion) { // this should have been a compile time constant - assert(type_has_bits(actual_type->data.error_union.err_set_type)); + assert(type_has_bits(g, actual_type->data.error_union.err_set_type)); - if (!type_has_bits(actual_type->data.error_union.payload_type)) { + if (!type_has_bits(g, actual_type->data.error_union.payload_type)) { return gen_widen_or_shorten(g, ir_want_runtime_safety(g, &instruction->base), g->err_tag_type, wanted_type, target_val); } else { @@ -3438,7 +3438,7 @@ static LLVMValueRef ir_render_bool_not(CodeGen *g, IrExecutableGen *executable, } static void render_decl_var(CodeGen *g, ZigVar *var) { - if (!type_has_bits(var->var_type)) + if (!type_has_bits(g, var->var_type)) return; var->value_ref = ir_llvm_value(g, var->ptr_instruction); @@ -3456,7 +3456,7 @@ static LLVMValueRef ir_render_load_ptr(CodeGen *g, IrExecutableGen *executable, IrInstGenLoadPtr *instruction) { ZigType *child_type = instruction->base.value->type; - if (!type_has_bits(child_type)) + if (!type_has_bits(g, child_type)) return nullptr; LLVMValueRef ptr = ir_llvm_value(g, instruction->ptr); @@ -3491,7 +3491,7 @@ static LLVMValueRef ir_render_load_ptr(CodeGen *g, IrExecutableGen *executable, LLVMValueRef shift_amt_val = LLVMConstInt(LLVMTypeOf(containing_int), shift_amt, false); LLVMValueRef shifted_value = LLVMBuildLShr(g->builder, containing_int, shift_amt_val, ""); - if (handle_is_ptr(child_type)) { + if (handle_is_ptr(g, child_type)) { LLVMValueRef result_loc = ir_llvm_value(g, instruction->result_loc); LLVMTypeRef same_size_int = LLVMIntType(size_in_bits); LLVMValueRef truncated_int = LLVMBuildTrunc(g->builder, shifted_value, same_size_int, ""); @@ -3638,7 +3638,7 @@ static void gen_valgrind_undef(CodeGen *g, LLVMValueRef dest_ptr, LLVMValueRef b } static void gen_undef_init(CodeGen *g, uint32_t ptr_align_bytes, ZigType *value_type, LLVMValueRef ptr) { - assert(type_has_bits(value_type)); + assert(type_has_bits(g, value_type)); uint64_t size_bytes = LLVMStoreSizeOfType(g->target_data_ref, get_llvm_type(g, value_type)); assert(size_bytes > 0); assert(ptr_align_bytes > 0); @@ -3704,7 +3704,7 @@ static LLVMValueRef ir_render_var_ptr(CodeGen *g, IrExecutableGen *executable, I if (instruction->base.value->special != ConstValSpecialRuntime) return ir_llvm_value(g, &instruction->base); ZigVar *var = instruction->var; - if (type_has_bits(var->var_type)) { + if (type_has_bits(g, var->var_type)) { assert(var->value_ref); return var->value_ref; } else { @@ -3715,7 +3715,7 @@ static LLVMValueRef ir_render_var_ptr(CodeGen *g, IrExecutableGen *executable, I static LLVMValueRef ir_render_return_ptr(CodeGen *g, IrExecutableGen *executable, IrInstGenReturnPtr *instruction) { - if (!type_has_bits(instruction->base.value->type)) + if (!type_has_bits(g, instruction->base.value->type)) return nullptr; ir_assert(g->cur_ret_ptr != nullptr, &instruction->base); return g->cur_ret_ptr; @@ -3729,7 +3729,7 @@ static LLVMValueRef ir_render_elem_ptr(CodeGen *g, IrExecutableGen *executable, LLVMValueRef subscript_value = ir_llvm_value(g, instruction->elem_index); assert(subscript_value); - if (!type_has_bits(array_type)) + if (!type_has_bits(g, array_type)) return nullptr; bool safety_check_on = ir_want_runtime_safety(g, &instruction->base) && instruction->safety_check_on; @@ -3789,7 +3789,7 @@ static LLVMValueRef ir_render_elem_ptr(CodeGen *g, IrExecutableGen *executable, assert(array_type->data.structure.special == StructSpecialSlice); ZigType *ptr_type = array_type->data.structure.fields[slice_ptr_index]->type_entry; - if (!type_has_bits(ptr_type)) { + if (!type_has_bits(g, ptr_type)) { if (safety_check_on) { assert(LLVMGetTypeKind(LLVMTypeOf(array_ptr)) == LLVMIntegerTypeKind); add_bounds_check(g, subscript_value, LLVMIntEQ, nullptr, LLVMIntULT, array_ptr); @@ -3868,7 +3868,7 @@ static void render_async_spills(CodeGen *g) { for (size_t var_i = 0; var_i < g->cur_fn->variable_list.length; var_i += 1) { ZigVar *var = g->cur_fn->variable_list.at(var_i); - if (!type_has_bits(var->var_type)) { + if (!type_has_bits(g, var->var_type)) { continue; } if (ir_get_var_is_comptime(var)) @@ -3988,7 +3988,7 @@ static LLVMValueRef ir_render_call(CodeGen *g, IrExecutableGen *executable, IrIn FnTypeId *fn_type_id = &fn_type->data.fn.fn_type_id; ZigType *src_return_type = fn_type_id->return_type; - bool ret_has_bits = type_has_bits(src_return_type); + bool ret_has_bits = type_has_bits(g, src_return_type); CallingConvention cc = fn_type->data.fn.fn_type_id.cc; @@ -4308,7 +4308,7 @@ static LLVMValueRef ir_render_call(CodeGen *g, IrExecutableGen *executable, IrIn gen_assert_resume_id(g, &instruction->base, ResumeIdReturn, PanicMsgIdResumedAnAwaitingFn, nullptr); render_async_var_decls(g, instruction->base.base.scope); - if (!type_has_bits(src_return_type)) + if (!type_has_bits(g, src_return_type)) return nullptr; if (result_loc != nullptr) { @@ -4368,7 +4368,7 @@ static LLVMValueRef ir_render_call(CodeGen *g, IrExecutableGen *executable, IrIn } else if (first_arg_ret) { set_call_instr_sret(g, result); return result_loc; - } else if (handle_is_ptr(src_return_type)) { + } else if (handle_is_ptr(g, src_return_type)) { LLVMValueRef store_instr = LLVMBuildStore(g->builder, result, result_loc); LLVMSetAlignment(store_instr, get_ptr_align(g, instruction->result_loc->value->type)); return result_loc; @@ -4393,7 +4393,7 @@ static LLVMValueRef ir_render_struct_field_ptr(CodeGen *g, IrExecutableGen *exec ZigType *struct_ptr_type = instruction->struct_ptr->value->type; TypeStructField *field = instruction->field; - if (!type_has_bits(field->type_entry)) + if (!type_has_bits(g, field->type_entry)) return nullptr; if (struct_ptr_type->id == ZigTypeIdPointer && @@ -4444,9 +4444,9 @@ static LLVMValueRef ir_render_union_field_ptr(CodeGen *g, IrExecutableGen *execu TypeUnionField *field = instruction->field; - if (!type_has_bits(field->type_entry)) { + if (!type_has_bits(g, field->type_entry)) { ZigType *tag_type = union_type->data.unionation.tag_type; - if (!instruction->initializing || tag_type == nullptr || !type_has_bits(tag_type)) + if (!instruction->initializing || tag_type == nullptr || !type_has_bits(g, tag_type)) return nullptr; // The field has no bits but we still have to change the discriminant @@ -4668,10 +4668,10 @@ static LLVMValueRef gen_non_null_bit(CodeGen *g, ZigType *maybe_type, LLVMValueR (maybe_type->id == ZigTypeIdPointer && maybe_type->data.pointer.allow_zero)); ZigType *child_type = maybe_type->data.maybe.child_type; - if (!type_has_bits(child_type)) + if (!type_has_bits(g, child_type)) return maybe_handle; - bool is_scalar = !handle_is_ptr(maybe_type); + bool is_scalar = !handle_is_ptr(g, maybe_type); if (is_scalar) return LLVMBuildICmp(g->builder, LLVMIntNE, maybe_handle, LLVMConstNull(get_llvm_type(g, maybe_type)), ""); @@ -4709,14 +4709,14 @@ static LLVMValueRef ir_render_optional_unwrap_ptr(CodeGen *g, IrExecutableGen *e LLVMPositionBuilderAtEnd(g->builder, ok_block); } - if (!type_has_bits(child_type)) { + if (!type_has_bits(g, child_type)) { if (instruction->initializing) { LLVMValueRef non_null_bit = LLVMConstInt(LLVMInt1Type(), 1, false); gen_store_untyped(g, non_null_bit, base_ptr, 0, false); } return nullptr; } else { - bool is_scalar = !handle_is_ptr(maybe_type); + bool is_scalar = !handle_is_ptr(g, maybe_type); if (is_scalar) { return base_ptr; } else { @@ -4895,11 +4895,11 @@ static LLVMValueRef ir_render_switch_br(CodeGen *g, IrExecutableGen *executable, } static LLVMValueRef ir_render_phi(CodeGen *g, IrExecutableGen *executable, IrInstGenPhi *instruction) { - if (!type_has_bits(instruction->base.value->type)) + if (!type_has_bits(g, instruction->base.value->type)) return nullptr; LLVMTypeRef phi_type; - if (handle_is_ptr(instruction->base.value->type)) { + if (handle_is_ptr(g, instruction->base.value->type)) { phi_type = LLVMPointerType(get_llvm_type(g,instruction->base.value->type), 0); } else { phi_type = get_llvm_type(g, instruction->base.value->type); @@ -4917,7 +4917,7 @@ static LLVMValueRef ir_render_phi(CodeGen *g, IrExecutableGen *executable, IrIns } static LLVMValueRef ir_render_ref(CodeGen *g, IrExecutableGen *executable, IrInstGenRef *instruction) { - if (!type_has_bits(instruction->base.value->type)) { + if (!type_has_bits(g, instruction->base.value->type)) { return nullptr; } if (instruction->operand->id == IrInstGenIdCall) { @@ -4927,7 +4927,7 @@ static LLVMValueRef ir_render_ref(CodeGen *g, IrExecutableGen *executable, IrIns } } LLVMValueRef value = ir_llvm_value(g, instruction->operand); - if (handle_is_ptr(instruction->operand->value->type)) { + if (handle_is_ptr(g, instruction->operand->value->type)) { return value; } else { LLVMValueRef result_loc = ir_llvm_value(g, instruction->result_loc); @@ -5227,20 +5227,20 @@ static LLVMValueRef ir_render_cmpxchg(CodeGen *g, IrExecutableGen *executable, I assert(optional_type->id == ZigTypeIdOptional); ZigType *child_type = optional_type->data.maybe.child_type; - if (!handle_is_ptr(optional_type)) { + if (!handle_is_ptr(g, optional_type)) { LLVMValueRef payload_val = LLVMBuildExtractValue(g->builder, result_val, 0, ""); LLVMValueRef success_bit = LLVMBuildExtractValue(g->builder, result_val, 1, ""); return LLVMBuildSelect(g->builder, success_bit, LLVMConstNull(get_llvm_type(g, child_type)), payload_val, ""); } // When the cmpxchg is discarded, the result location will have no bits. - if (!type_has_bits(instruction->result_loc->value->type)) { + if (!type_has_bits(g, instruction->result_loc->value->type)) { return nullptr; } LLVMValueRef result_loc = ir_llvm_value(g, instruction->result_loc); ir_assert(result_loc != nullptr, &instruction->base); - ir_assert(type_has_bits(child_type), &instruction->base); + ir_assert(type_has_bits(g, child_type), &instruction->base); LLVMValueRef payload_val = LLVMBuildExtractValue(g->builder, result_val, 0, ""); LLVMValueRef val_ptr = LLVMBuildStructGEP(g->builder, result_loc, maybe_child_index, ""); @@ -5368,7 +5368,7 @@ static LLVMValueRef ir_render_slice(CodeGen *g, IrExecutableGen *executable, IrI } } } - if (!type_has_bits(array_type)) { + if (!type_has_bits(g, array_type)) { LLVMValueRef len_field_ptr = LLVMBuildStructGEP(g->builder, tmp_struct_ptr, slice_len_index, ""); // TODO if runtime safety is on, store 0xaaaaaaa in ptr field @@ -5404,7 +5404,7 @@ static LLVMValueRef ir_render_slice(CodeGen *g, IrExecutableGen *executable, IrI } } - if (type_has_bits(array_type)) { + if (type_has_bits(g, array_type)) { size_t gen_ptr_index = instruction->base.value->type->data.structure.fields[slice_ptr_index]->gen_index; LLVMValueRef ptr_field_ptr = LLVMBuildStructGEP(g->builder, tmp_struct_ptr, gen_ptr_index, ""); LLVMValueRef slice_start_ptr = LLVMBuildInBoundsGEP(g->builder, array_ptr, &start_val, 1, ""); @@ -5592,7 +5592,7 @@ static LLVMValueRef ir_render_test_err(CodeGen *g, IrExecutableGen *executable, LLVMValueRef err_union_handle = ir_llvm_value(g, instruction->err_union); LLVMValueRef err_val; - if (type_has_bits(payload_type)) { + if (type_has_bits(g, payload_type)) { LLVMValueRef err_val_ptr = LLVMBuildStructGEP(g->builder, err_union_handle, err_union_err_index, ""); err_val = gen_load_untyped(g, err_val_ptr, 0, false, ""); } else { @@ -5614,7 +5614,7 @@ static LLVMValueRef ir_render_unwrap_err_code(CodeGen *g, IrExecutableGen *execu ZigType *err_union_type = ptr_type->data.pointer.child_type; ZigType *payload_type = err_union_type->data.error_union.payload_type; LLVMValueRef err_union_ptr = ir_llvm_value(g, instruction->err_union_ptr); - if (!type_has_bits(payload_type)) { + if (!type_has_bits(g, payload_type)) { return err_union_ptr; } else { // TODO assign undef to the payload @@ -5654,13 +5654,13 @@ static LLVMValueRef ir_render_unwrap_err_payload(CodeGen *g, IrExecutableGen *ex LLVMValueRef err_union_handle = get_handle_value(g, err_union_ptr, err_union_type, ptr_type); - if (!type_has_bits(err_union_type->data.error_union.err_set_type)) { + if (!type_has_bits(g, err_union_type->data.error_union.err_set_type)) { return err_union_handle; } if (want_safety) { LLVMValueRef err_val; - if (type_has_bits(payload_type)) { + if (type_has_bits(g, payload_type)) { LLVMValueRef err_val_ptr = LLVMBuildStructGEP(g->builder, err_union_handle, err_union_err_index, ""); err_val = gen_load_untyped(g, err_val_ptr, 0, false, ""); } else { @@ -5677,7 +5677,7 @@ static LLVMValueRef ir_render_unwrap_err_payload(CodeGen *g, IrExecutableGen *ex LLVMPositionBuilderAtEnd(g->builder, ok_block); } - if (type_has_bits(payload_type)) { + if (type_has_bits(g, payload_type)) { if (instruction->initializing) { LLVMValueRef err_tag_ptr = LLVMBuildStructGEP(g->builder, err_union_handle, err_union_err_index, ""); LLVMValueRef ok_err_val = LLVMConstNull(get_llvm_type(g, g->err_tag_type)); @@ -5699,7 +5699,7 @@ static LLVMValueRef ir_render_optional_wrap(CodeGen *g, IrExecutableGen *executa ZigType *child_type = wanted_type->data.maybe.child_type; - if (!type_has_bits(child_type)) { + if (!type_has_bits(g, child_type)) { LLVMValueRef result = LLVMConstAllOnes(LLVMInt1Type()); if (instruction->result_loc != nullptr) { LLVMValueRef result_loc = ir_llvm_value(g, instruction->result_loc); @@ -5709,7 +5709,7 @@ static LLVMValueRef ir_render_optional_wrap(CodeGen *g, IrExecutableGen *executa } LLVMValueRef payload_val = ir_llvm_value(g, instruction->operand); - if (!handle_is_ptr(wanted_type)) { + if (!handle_is_ptr(g, wanted_type)) { if (instruction->result_loc != nullptr) { LLVMValueRef result_loc = ir_llvm_value(g, instruction->result_loc); gen_store_untyped(g, payload_val, result_loc, 0, false); @@ -5735,7 +5735,7 @@ static LLVMValueRef ir_render_err_wrap_code(CodeGen *g, IrExecutableGen *executa LLVMValueRef err_val = ir_llvm_value(g, instruction->operand); - if (!handle_is_ptr(wanted_type)) + if (!handle_is_ptr(g, wanted_type)) return err_val; LLVMValueRef result_loc = ir_llvm_value(g, instruction->result_loc); @@ -5756,13 +5756,13 @@ static LLVMValueRef ir_render_err_wrap_payload(CodeGen *g, IrExecutableGen *exec ZigType *payload_type = wanted_type->data.error_union.payload_type; ZigType *err_set_type = wanted_type->data.error_union.err_set_type; - if (!type_has_bits(err_set_type)) { + if (!type_has_bits(g, err_set_type)) { return ir_llvm_value(g, instruction->operand); } LLVMValueRef ok_err_val = LLVMConstNull(get_llvm_type(g, g->err_tag_type)); - if (!type_has_bits(payload_type)) + if (!type_has_bits(g, payload_type)) return ok_err_val; @@ -5783,7 +5783,7 @@ static LLVMValueRef ir_render_union_tag(CodeGen *g, IrExecutableGen *executable, ZigType *union_type = instruction->value->value->type; ZigType *tag_type = union_type->data.unionation.tag_type; - if (!type_has_bits(tag_type)) + if (!type_has_bits(g, tag_type)) return nullptr; LLVMValueRef union_val = ir_llvm_value(g, instruction->value); @@ -5820,7 +5820,7 @@ static LLVMValueRef ir_render_atomic_rmw(CodeGen *g, IrExecutableGen *executable LLVMValueRef ptr = ir_llvm_value(g, instruction->ptr); LLVMValueRef operand = ir_llvm_value(g, instruction->operand); - if (get_codegen_ptr_type(operand_type) == nullptr) { + if (get_codegen_ptr_type_bail(g, operand_type) == nullptr) { return ZigLLVMBuildAtomicRMW(g->builder, op, ptr, operand, ordering, g->is_single_threaded); } @@ -5922,7 +5922,7 @@ static LLVMValueRef ir_render_vector_to_array(CodeGen *g, IrExecutableGen *execu { ZigType *array_type = instruction->base.value->type; assert(array_type->id == ZigTypeIdArray); - assert(handle_is_ptr(array_type)); + assert(handle_is_ptr(g, array_type)); LLVMValueRef result_loc = ir_llvm_value(g, instruction->result_loc); LLVMValueRef vector = ir_llvm_value(g, instruction->vector); @@ -5956,7 +5956,7 @@ static LLVMValueRef ir_render_array_to_vector(CodeGen *g, IrExecutableGen *execu { ZigType *vector_type = instruction->base.value->type; assert(vector_type->id == ZigTypeIdVector); - assert(!handle_is_ptr(vector_type)); + assert(!handle_is_ptr(g, vector_type)); LLVMValueRef array_ptr = ir_llvm_value(g, instruction->array); LLVMTypeRef vector_type_ref = get_llvm_type(g, vector_type); @@ -6052,7 +6052,7 @@ static LLVMValueRef gen_await_early_return(CodeGen *g, IrInstGen *source_instr, { LLVMTypeRef usize_type_ref = g->builtin_types.entry_usize->llvm_type; LLVMValueRef their_result_ptr = nullptr; - if (type_has_bits(result_type) && (non_async || result_loc != nullptr)) { + if (type_has_bits(g, result_type) && (non_async || result_loc != nullptr)) { LLVMValueRef their_result_ptr_ptr = LLVMBuildStructGEP(g->builder, target_frame_ptr, frame_ret_start, ""); their_result_ptr = LLVMBuildLoad(g->builder, their_result_ptr_ptr, ""); if (result_loc != nullptr) { @@ -6077,7 +6077,7 @@ static LLVMValueRef gen_await_early_return(CodeGen *g, IrInstGen *source_instr, ZigLLVMBuildCall(g->builder, get_merge_err_ret_traces_fn_val(g), args, 2, get_llvm_cc(g, CallingConventionUnspecified), ZigLLVM_CallAttrAuto, ""); } - if (non_async && type_has_bits(result_type)) { + if (non_async && type_has_bits(g, result_type)) { LLVMValueRef result_ptr = (result_loc == nullptr) ? their_result_ptr : result_loc; return get_handle_value(g, result_ptr, result_type, ptr_result_type); } else { @@ -6110,7 +6110,7 @@ static LLVMValueRef ir_render_await(CodeGen *g, IrExecutableGen *executable, IrI // This code is as if it is running inside the suspend block. // supply the awaiter return pointer - if (type_has_bits(result_type)) { + if (type_has_bits(g, result_type)) { LLVMValueRef awaiter_ret_ptr_ptr = LLVMBuildStructGEP(g->builder, target_frame_ptr, frame_ret_start + 1, ""); if (result_loc == nullptr) { // no copy needed @@ -6594,7 +6594,7 @@ static LLVMValueRef pack_const_int(CodeGen *g, LLVMTypeRef big_int_type_ref, Zig } ZigType *type_entry = const_val->type; - assert(type_has_bits(type_entry)); + assert(type_has_bits(g, type_entry)); switch (type_entry->id) { case ZigTypeIdInvalid: case ZigTypeIdMetaType: @@ -6727,7 +6727,7 @@ static LLVMValueRef gen_const_val_ptr(CodeGen *g, ZigValue *const_val, const cha { ZigValue *array_const_val = const_val->data.x_ptr.data.base_array.array_val; assert(array_const_val->type->id == ZigTypeIdArray); - if (!type_has_bits(array_const_val->type)) { + if (!type_has_bits(g, array_const_val->type)) { if (array_const_val->type->data.array.sentinel != nullptr) { ZigValue *pointee = array_const_val->type->data.array.sentinel; render_const_val(g, pointee, ""); @@ -6753,7 +6753,7 @@ static LLVMValueRef gen_const_val_ptr(CodeGen *g, ZigValue *const_val, const cha { ZigValue *struct_const_val = const_val->data.x_ptr.data.base_struct.struct_val; assert(struct_const_val->type->id == ZigTypeIdStruct); - if (!type_has_bits(struct_const_val->type)) { + if (!type_has_bits(g, struct_const_val->type)) { // make this a null pointer ZigType *usize = g->builtin_types.entry_usize; const_val->llvm_value = LLVMConstIntToPtr(LLVMConstNull(usize->llvm_type), @@ -6772,7 +6772,7 @@ static LLVMValueRef gen_const_val_ptr(CodeGen *g, ZigValue *const_val, const cha { ZigValue *err_union_const_val = const_val->data.x_ptr.data.base_err_union_code.err_union_val; assert(err_union_const_val->type->id == ZigTypeIdErrorUnion); - if (!type_has_bits(err_union_const_val->type)) { + if (!type_has_bits(g, err_union_const_val->type)) { // make this a null pointer ZigType *usize = g->builtin_types.entry_usize; const_val->llvm_value = LLVMConstIntToPtr(LLVMConstNull(usize->llvm_type), @@ -6788,7 +6788,7 @@ static LLVMValueRef gen_const_val_ptr(CodeGen *g, ZigValue *const_val, const cha { ZigValue *err_union_const_val = const_val->data.x_ptr.data.base_err_union_payload.err_union_val; assert(err_union_const_val->type->id == ZigTypeIdErrorUnion); - if (!type_has_bits(err_union_const_val->type)) { + if (!type_has_bits(g, err_union_const_val->type)) { // make this a null pointer ZigType *usize = g->builtin_types.entry_usize; const_val->llvm_value = LLVMConstIntToPtr(LLVMConstNull(usize->llvm_type), @@ -6804,7 +6804,7 @@ static LLVMValueRef gen_const_val_ptr(CodeGen *g, ZigValue *const_val, const cha { ZigValue *optional_const_val = const_val->data.x_ptr.data.base_optional_payload.optional_val; assert(optional_const_val->type->id == ZigTypeIdOptional); - if (!type_has_bits(optional_const_val->type)) { + if (!type_has_bits(g, optional_const_val->type)) { // make this a null pointer ZigType *usize = g->builtin_types.entry_usize; const_val->llvm_value = LLVMConstIntToPtr(LLVMConstNull(usize->llvm_type), @@ -6842,7 +6842,7 @@ static LLVMValueRef gen_const_val(CodeGen *g, ZigValue *const_val, const char *n Error err; ZigType *type_entry = const_val->type; - assert(type_has_bits(type_entry)); + assert(type_has_bits(g, type_entry)); check: switch (const_val->special) { case ConstValSpecialLazy: @@ -6895,12 +6895,12 @@ check: switch (const_val->special) { case ZigTypeIdOptional: { ZigType *child_type = type_entry->data.maybe.child_type; - if (!type_has_bits(child_type)) { - return LLVMConstInt(LLVMInt1Type(), const_val->data.x_optional ? 1 : 0, false); - } else if (get_codegen_ptr_type(type_entry) != nullptr) { + if (get_src_ptr_type(type_entry) != nullptr) { return gen_const_val_ptr(g, const_val, name); } else if (child_type->id == ZigTypeIdErrorSet) { return gen_const_val_err_set(g, const_val, name); + } else if (!type_has_bits(g, child_type)) { + return LLVMConstInt(LLVMInt1Type(), const_val->data.x_optional ? 1 : 0, false); } else { LLVMValueRef child_val; LLVMValueRef maybe_val; @@ -7123,7 +7123,7 @@ check: switch (const_val->special) { LLVMValueRef union_value_ref; bool make_unnamed_struct; ZigValue *payload_value = const_val->data.x_union.payload; - if (payload_value == nullptr || !type_has_bits(payload_value->type)) { + if (payload_value == nullptr || !type_has_bits(g, payload_value->type)) { if (type_entry->data.unionation.gen_tag_index == SIZE_MAX) return LLVMGetUndef(get_llvm_type(g, type_entry)); @@ -7200,13 +7200,13 @@ check: switch (const_val->special) { { ZigType *payload_type = type_entry->data.error_union.payload_type; ZigType *err_set_type = type_entry->data.error_union.err_set_type; - if (!type_has_bits(payload_type)) { - assert(type_has_bits(err_set_type)); + if (!type_has_bits(g, payload_type)) { + assert(type_has_bits(g, err_set_type)); ErrorTableEntry *err_set = const_val->data.x_err_union.error_set->data.x_err_set; uint64_t value = (err_set == nullptr) ? 0 : err_set->value; return LLVMConstInt(get_llvm_type(g, g->err_tag_type), value, false); - } else if (!type_has_bits(err_set_type)) { - assert(type_has_bits(payload_type)); + } else if (!type_has_bits(g, err_set_type)) { + assert(type_has_bits(g, payload_type)); return gen_const_val(g, const_val->data.x_err_union.payload, ""); } else { LLVMValueRef err_tag_value; @@ -7440,7 +7440,7 @@ static void do_code_gen(CodeGen *g) { continue; } - if (!type_has_bits(var->var_type)) + if (!type_has_bits(g, var->var_type)) continue; assert(var->decl_node); @@ -7539,7 +7539,7 @@ static void do_code_gen(CodeGen *g) { } else { if (want_sret) { g->cur_ret_ptr = LLVMGetParam(fn, 0); - } else if (type_has_bits(fn_type_id->return_type)) { + } else if (type_has_bits(g, fn_type_id->return_type)) { g->cur_ret_ptr = build_alloca(g, fn_type_id->return_type, "result", 0); // TODO add debug info variable for this } else { @@ -7604,7 +7604,7 @@ static void do_code_gen(CodeGen *g) { ZigType *child_type = ptr_type->data.pointer.child_type; if (type_resolve(g, child_type, ResolveStatusSizeKnown)) zig_unreachable(); - if (!type_has_bits(child_type)) + if (!type_has_bits(g, child_type)) continue; if (instruction->base.base.ref_count == 0) continue; @@ -7635,7 +7635,7 @@ static void do_code_gen(CodeGen *g) { for (size_t var_i = 0; var_i < fn_table_entry->variable_list.length; var_i += 1) { ZigVar *var = fn_table_entry->variable_list.at(var_i); - if (!type_has_bits(var->var_type)) { + if (!type_has_bits(g, var->var_type)) { continue; } if (ir_get_var_is_comptime(var)) @@ -7662,7 +7662,7 @@ static void do_code_gen(CodeGen *g) { FnGenParamInfo *gen_info = &fn_table_entry->type_entry->data.fn.gen_param_info[var->src_arg_index]; assert(gen_info->gen_index != SIZE_MAX); - if (handle_is_ptr(var->var_type)) { + if (handle_is_ptr(g, var->var_type)) { if (gen_info->is_byval) { gen_type = var->var_type; } else { @@ -7734,7 +7734,7 @@ static void do_code_gen(CodeGen *g) { LLVMValueRef resume_index_ptr = LLVMBuildStructGEP(g->builder, g->cur_frame_ptr, frame_resume_index, ""); g->cur_async_resume_index_ptr = resume_index_ptr; - if (type_has_bits(fn_type_id->return_type)) { + if (type_has_bits(g, fn_type_id->return_type)) { LLVMValueRef cur_ret_ptr_ptr = LLVMBuildStructGEP(g->builder, g->cur_frame_ptr, frame_ret_start, ""); g->cur_ret_ptr = LLVMBuildLoad(g->builder, cur_ret_ptr_ptr, ""); } @@ -8137,7 +8137,7 @@ static void define_builtin_fns(CodeGen *g) { create_builtin_fn(g, BuiltinFnIdTypeInfo, "typeInfo", 1); create_builtin_fn(g, BuiltinFnIdType, "Type", 1); create_builtin_fn(g, BuiltinFnIdHasField, "hasField", 2); - create_builtin_fn(g, BuiltinFnIdTypeof, "TypeOf", 1); + create_builtin_fn(g, BuiltinFnIdTypeof, "TypeOf", SIZE_MAX); create_builtin_fn(g, BuiltinFnIdAddWithOverflow, "addWithOverflow", 4); create_builtin_fn(g, BuiltinFnIdSubWithOverflow, "subWithOverflow", 4); create_builtin_fn(g, BuiltinFnIdMulWithOverflow, "mulWithOverflow", 4); @@ -9841,10 +9841,10 @@ static void get_c_type(CodeGen *g, GenH *gen_h, ZigType *type_entry, Buf *out_bu case ZigTypeIdOptional: { ZigType *child_type = type_entry->data.maybe.child_type; - if (!type_has_bits(child_type)) { + if (!type_has_bits(g, child_type)) { buf_init_from_str(out_buf, "bool"); return; - } else if (type_is_nonnull_ptr(child_type)) { + } else if (type_is_nonnull_ptr(g, child_type)) { return get_c_type(g, gen_h, child_type, out_buf); } else { zig_unreachable(); diff --git a/src/ir.cpp b/src/ir.cpp index a2cc68b3ca..4068247b72 100644 --- a/src/ir.cpp +++ b/src/ir.cpp @@ -860,7 +860,7 @@ static bool types_have_same_zig_comptime_repr(CodeGen *codegen, ZigType *expecte if (expected == actual) return true; - if (get_codegen_ptr_type(expected) != nullptr && get_codegen_ptr_type(actual) != nullptr) + if (get_src_ptr_type(expected) != nullptr && get_src_ptr_type(actual) != nullptr) return true; if (is_opt_err_set(expected) && is_opt_err_set(actual)) @@ -2766,9 +2766,24 @@ static IrInstGen *ir_build_load_ptr_gen(IrAnalyze *ira, IrInst *source_instructi return &instruction->base; } -static IrInstSrc *ir_build_typeof(IrBuilderSrc *irb, Scope *scope, AstNode *source_node, IrInstSrc *value) { +static IrInstSrc *ir_build_typeof_n(IrBuilderSrc *irb, Scope *scope, AstNode *source_node, + IrInstSrc **values, size_t value_count) +{ + assert(value_count >= 2); + IrInstSrcTypeOf *instruction = ir_build_instruction(irb, scope, source_node); - instruction->value = value; + instruction->value.list = values; + instruction->value_count = value_count; + + for (size_t i = 0; i < value_count; i++) + ir_ref_instruction(values[i], irb->current_basic_block); + + return &instruction->base; +} + +static IrInstSrc *ir_build_typeof_1(IrBuilderSrc *irb, Scope *scope, AstNode *source_node, IrInstSrc *value) { + IrInstSrcTypeOf *instruction = ir_build_instruction(irb, scope, source_node); + instruction->value.scalar = value; ir_ref_instruction(value, irb->current_basic_block); @@ -6043,7 +6058,7 @@ static IrInstSrc *ir_gen_fn_call_with_args(IrBuilderSrc *irb, Scope *scope, AstN if (fn_ref == irb->codegen->invalid_inst_src) return fn_ref; - IrInstSrc *fn_type = ir_build_typeof(irb, scope, source_node, fn_ref); + IrInstSrc *fn_type = ir_build_typeof_1(irb, scope, source_node, fn_ref); IrInstSrc **args = heap::c_allocator.allocate(args_len); for (size_t i = 0; i < args_len; i += 1) { @@ -6104,12 +6119,33 @@ static IrInstSrc *ir_gen_builtin_fn_call(IrBuilderSrc *irb, Scope *scope, AstNod { Scope *sub_scope = create_typeof_scope(irb->codegen, node, scope); - AstNode *arg_node = node->data.fn_call_expr.params.at(0); - IrInstSrc *arg = ir_gen_node(irb, arg_node, sub_scope); - if (arg == irb->codegen->invalid_inst_src) - return arg; + size_t arg_count = node->data.fn_call_expr.params.length; - IrInstSrc *type_of = ir_build_typeof(irb, scope, node, arg); + IrInstSrc *type_of; + + if (arg_count == 0) { + add_node_error(irb->codegen, node, + buf_sprintf("expected at least 1 argument, found 0")); + return irb->codegen->invalid_inst_src; + } else if (arg_count == 1) { + AstNode *arg0_node = node->data.fn_call_expr.params.at(0); + IrInstSrc *arg0_value = ir_gen_node(irb, arg0_node, sub_scope); + if (arg0_value == irb->codegen->invalid_inst_src) + return arg0_value; + + type_of = ir_build_typeof_1(irb, scope, node, arg0_value); + } else { + IrInstSrc **args = heap::c_allocator.allocate(arg_count); + for (size_t i = 0; i < arg_count; i += 1) { + AstNode *arg_node = node->data.fn_call_expr.params.at(i); + IrInstSrc *arg = ir_gen_node(irb, arg_node, sub_scope); + if (arg == irb->codegen->invalid_inst_src) + return irb->codegen->invalid_inst_src; + args[i] = arg; + } + + type_of = ir_build_typeof_n(irb, scope, node, args, arg_count); + } return ir_lval_wrap(irb, scope, type_of, lval, result_loc); } case BuiltinFnIdSetCold: @@ -11366,7 +11402,7 @@ static ConstCastOnly types_match_const_cast_only(IrAnalyze *ira, ZigType *wanted result.id = ConstCastResultIdInvalid; return result; } - if (type_has_bits(wanted_type) == type_has_bits(actual_type) && + if (type_has_bits(g, wanted_type) == type_has_bits(g, actual_type) && actual_ptr_type->data.pointer.bit_offset_in_host == wanted_ptr_type->data.pointer.bit_offset_in_host && actual_ptr_type->data.pointer.host_int_bytes == wanted_ptr_type->data.pointer.host_int_bytes && get_ptr_align(ira->codegen, actual_ptr_type) >= get_ptr_align(ira->codegen, wanted_ptr_type)) @@ -12499,7 +12535,7 @@ static IrInstGen *ir_const_move(IrAnalyze *ira, IrInst *old_instruction, ZigValu static IrInstGen *ir_resolve_cast(IrAnalyze *ira, IrInst *source_instr, IrInstGen *value, ZigType *wanted_type, CastOp cast_op) { - if (instr_is_comptime(value) || !type_has_bits(wanted_type)) { + if (instr_is_comptime(value) || !type_has_bits(ira->codegen, wanted_type)) { IrInstGen *result = ir_const(ira, source_instr, wanted_type); if (!eval_const_expr_implicit_cast(ira, source_instr, cast_op, value->value, value->value->type, result->value, wanted_type)) @@ -12885,7 +12921,7 @@ static Error ir_resolve_const_val(CodeGen *codegen, IrExecutableGen *exec, AstNo case ConstValSpecialStatic: return ErrorNone; case ConstValSpecialRuntime: - if (!type_has_bits(val->type)) + if (!type_has_bits(codegen, val->type)) return ErrorNone; exec_add_error_node_gen(codegen, exec, source_node, @@ -13049,7 +13085,11 @@ static ZigType *ir_resolve_type(IrAnalyze *ira, IrInstGen *type_value) { } static Error ir_validate_vector_elem_type(IrAnalyze *ira, AstNode *source_node, ZigType *elem_type) { - if (!is_valid_vector_elem_type(elem_type)) { + Error err; + bool is_valid; + if ((err = is_valid_vector_elem_type(ira->codegen, elem_type, &is_valid))) + return err; + if (!is_valid) { ir_add_error_node(ira, source_node, buf_sprintf("vector element type must be integer, float, bool, or pointer; '%s' is invalid", buf_ptr(&elem_type->name))); @@ -13165,7 +13205,7 @@ static IrInstGen *ir_analyze_optional_wrap(IrAnalyze *ira, IrInst* source_instr, return &const_instruction->base; } - if (result_loc == nullptr && handle_is_ptr(wanted_type)) { + if (result_loc == nullptr && handle_is_ptr(ira->codegen, wanted_type)) { result_loc = no_result_loc(); } IrInstGen *result_loc_inst = nullptr; @@ -13213,7 +13253,7 @@ static IrInstGen *ir_analyze_err_wrap_payload(IrAnalyze *ira, IrInst* source_ins } IrInstGen *result_loc_inst; - if (handle_is_ptr(wanted_type)) { + if (handle_is_ptr(ira->codegen, wanted_type)) { if (result_loc == nullptr) result_loc = no_result_loc(); result_loc_inst = ir_resolve_result(ira, source_instr, result_loc, wanted_type, nullptr, true, true); if (type_is_invalid(result_loc_inst->value->type) || @@ -13325,7 +13365,7 @@ static IrInstGen *ir_analyze_err_wrap_code(IrAnalyze *ira, IrInst* source_instr, } IrInstGen *result_loc_inst; - if (handle_is_ptr(wanted_type)) { + if (handle_is_ptr(ira->codegen, wanted_type)) { if (result_loc == nullptr) result_loc = no_result_loc(); result_loc_inst = ir_resolve_result(ira, source_instr, result_loc, wanted_type, nullptr, true, true); if (type_is_invalid(result_loc_inst->value->type) || @@ -13352,7 +13392,8 @@ static IrInstGen *ir_analyze_null_to_maybe(IrAnalyze *ira, IrInst *source_instr, IrInstGen *result = ir_const(ira, source_instr, wanted_type); result->value->special = ConstValSpecialStatic; - if (get_codegen_ptr_type(wanted_type) != nullptr) { + + if (get_src_ptr_type(wanted_type) != nullptr) { result->value->data.x_ptr.special = ConstPtrSpecialNull; } else if (is_opt_err_set(wanted_type)) { result->value->data.x_err_set = nullptr; @@ -13401,7 +13442,7 @@ static IrInstGen *ir_get_ref2(IrAnalyze *ira, IrInst* source_instruction, IrInst return ira->codegen->invalid_inst_gen; IrInstGen *result_loc; - if (type_has_bits(ptr_type) && !handle_is_ptr(elem_type)) { + if (type_has_bits(ira->codegen, ptr_type) && !handle_is_ptr(ira->codegen, elem_type)) { result_loc = ir_resolve_result(ira, source_instruction, no_result_loc(), elem_type, nullptr, true, true); } else { result_loc = nullptr; @@ -13646,9 +13687,9 @@ static IrInstGen *ir_analyze_widen_or_shorten(IrAnalyze *ira, IrInst* source_ins // If the destination integer type has no bits, then we can emit a comptime // zero. However, we still want to emit a runtime safety check to make sure // the target is zero. - if (!type_has_bits(wanted_type)) { + if (!type_has_bits(ira->codegen, wanted_type)) { assert(wanted_type->id == ZigTypeIdInt); - assert(type_has_bits(target->value->type)); + assert(type_has_bits(ira->codegen, target->value->type)); ir_build_assert_zero(ira, source_instr, target); IrInstGen *result = ir_const_unsigned(ira, source_instr, 0); result->value->type = wanted_type; @@ -15005,7 +15046,7 @@ static IrInstGen *ir_get_deref(IrAnalyze *ira, IrInst* source_instruction, IrIns } IrInstGen *result_loc_inst; - if (ptr_type->data.pointer.host_int_bytes != 0 && handle_is_ptr(child_type)) { + if (ptr_type->data.pointer.host_int_bytes != 0 && handle_is_ptr(ira->codegen, child_type)) { if (result_loc == nullptr) result_loc = no_result_loc(); result_loc_inst = ir_resolve_result(ira, source_instruction, result_loc, child_type, nullptr, true, true); if (type_is_invalid(result_loc_inst->value->type) || result_loc_inst->value->type->id == ZigTypeIdUnreachable) { @@ -15265,7 +15306,7 @@ static IrInstGen *ir_analyze_instruction_return(IrAnalyze *ira, IrInstSrcReturn } if (!instr_is_comptime(operand) && ira->explicit_return_type != nullptr && - handle_is_ptr(ira->explicit_return_type)) + handle_is_ptr(ira->codegen, ira->explicit_return_type)) { // result location mechanism took care of it. IrInstGen *result = ir_build_return_gen(ira, &instruction->base.base, nullptr); @@ -15354,7 +15395,7 @@ static bool resolve_cmp_op_id(IrBinOp op_id, Cmp cmp) { static bool optional_value_is_null(ZigValue *val) { assert(val->special == ConstValSpecialStatic); - if (get_codegen_ptr_type(val->type) != nullptr) { + if (get_src_ptr_type(val->type) != nullptr) { if (val->data.x_ptr.special == ConstPtrSpecialNull) { return true; } else if (val->data.x_ptr.special == ConstPtrSpecialHardCodedAddr) { @@ -15373,7 +15414,7 @@ static void set_optional_value_to_null(ZigValue *val) { assert(val->special == ConstValSpecialStatic); if (val->type->id == ZigTypeIdNull) return; // nothing to do assert(val->type->id == ZigTypeIdOptional); - if (get_codegen_ptr_type(val->type) != nullptr) { + if (get_src_ptr_type(val->type) != nullptr) { val->data.x_ptr.special = ConstPtrSpecialNull; } else if (is_opt_err_set(val->type)) { val->data.x_err_set = nullptr; @@ -16211,7 +16252,7 @@ static IrInstGen *ir_analyze_bin_op_cmp(IrAnalyze *ira, IrInstSrcBinOp *bin_op_i operator_allowed = false; break; case ZigTypeIdOptional: - operator_allowed = is_equality_cmp && get_codegen_ptr_type(resolved_type) != nullptr; + operator_allowed = is_equality_cmp && get_src_ptr_type(resolved_type) != nullptr; break; } if (!operator_allowed) { @@ -16928,8 +16969,6 @@ static IrInstGen *ir_analyze_tuple_cat(IrAnalyze *ira, IrInst* source_instr, new_type->data.structure.special = StructSpecialInferredTuple; new_type->data.structure.resolve_status = ResolveStatusBeingInferred; - bool is_comptime = ir_should_inline(ira->old_irb.exec, source_instr->scope); - IrInstGen *new_struct_ptr = ir_resolve_result(ira, source_instr, no_result_loc(), new_type, nullptr, false, true); uint32_t new_field_count = op1_field_count + op2_field_count; @@ -16957,7 +16996,6 @@ static IrInstGen *ir_analyze_tuple_cat(IrAnalyze *ira, IrInst* source_instr, return ira->codegen->invalid_inst_gen; ZigList const_ptrs = {}; - IrInstGen *first_non_const_instruction = nullptr; for (uint32_t i = 0; i < new_field_count; i += 1) { TypeStructField *dst_field = new_type->data.structure.fields[i]; IrInstGen *src_struct_op; @@ -16979,8 +17017,6 @@ static IrInstGen *ir_analyze_tuple_cat(IrAnalyze *ira, IrInst* source_instr, return ira->codegen->invalid_inst_gen; if (instr_is_comptime(field_value)) { const_ptrs.append(dest_ptr); - } else { - first_non_const_instruction = field_value; } IrInstGen *store_ptr_inst = ir_analyze_store_ptr(ira, source_instr, dest_ptr, field_value, true); @@ -16997,20 +17033,13 @@ static IrInstGen *ir_analyze_tuple_cat(IrAnalyze *ira, IrInst* source_instr, continue; } IrInstGen *deref = ir_get_deref(ira, &elem_result_loc->base, elem_result_loc, nullptr); - elem_result_loc->value->special = ConstValSpecialRuntime; - ir_analyze_store_ptr(ira, &elem_result_loc->base, elem_result_loc, deref, false); + if (!type_requires_comptime(ira->codegen, elem_result_loc->value->type->data.pointer.child_type)) { + elem_result_loc->value->special = ConstValSpecialRuntime; + } + ir_analyze_store_ptr(ira, &elem_result_loc->base, elem_result_loc, deref, true); } } IrInstGen *result = ir_get_deref(ira, source_instr, new_struct_ptr, nullptr); - if (instr_is_comptime(result)) - return result; - - if (is_comptime) { - ir_add_error(ira, &first_non_const_instruction->base, - buf_sprintf("unable to evaluate constant expression")); - return ira->codegen->invalid_inst_gen; - } - return result; } @@ -17861,7 +17890,7 @@ static IrInstGen *ir_analyze_instruction_error_return_trace(IrAnalyze *ira, if (!exec_has_err_ret_trace(ira->codegen, ira->old_irb.exec)) { IrInstGen *result = ir_const(ira, &instruction->base.base, optional_type); ZigValue *out_val = result->value; - assert(get_codegen_ptr_type(optional_type) != nullptr); + assert(get_src_ptr_type(optional_type) != nullptr); out_val->data.x_ptr.special = ConstPtrSpecialHardCodedAddr; out_val->data.x_ptr.data.hard_coded_addr.addr = 0; return result; @@ -18250,7 +18279,7 @@ static IrInstGen *ir_resolve_result_raw(IrAnalyze *ira, IrInst *suspend_source_i if ((err = type_resolve(ira->codegen, value_type, ResolveStatusAlignmentKnown))) { return ira->codegen->invalid_inst_gen; } - if (!type_has_bits(value_type)) { + if (!type_has_bits(ira->codegen, value_type)) { parent_ptr_align = 0; } // If we're casting from a sentinel-terminated array to a non-sentinel-terminated array, @@ -18295,7 +18324,10 @@ static IrInstGen *ir_resolve_result_raw(IrAnalyze *ira, IrInst *suspend_source_i if (type_is_invalid(dest_type)) return ira->codegen->invalid_inst_gen; - if (get_codegen_ptr_type(dest_type) != nullptr) { + ZigType *dest_cg_ptr_type; + if ((err = get_codegen_ptr_type(ira->codegen, dest_type, &dest_cg_ptr_type))) + return ira->codegen->invalid_inst_gen; + if (dest_cg_ptr_type != nullptr) { ir_add_error(ira, &result_loc->source_instruction->base, buf_sprintf("unable to @bitCast to pointer type '%s'", buf_ptr(&dest_type->name))); return ira->codegen->invalid_inst_gen; @@ -18307,7 +18339,10 @@ static IrInstGen *ir_resolve_result_raw(IrAnalyze *ira, IrInst *suspend_source_i return ira->codegen->invalid_inst_gen; } - if (get_codegen_ptr_type(value_type) != nullptr) { + ZigType *value_cg_ptr_type; + if ((err = get_codegen_ptr_type(ira->codegen, value_type, &value_cg_ptr_type))) + return ira->codegen->invalid_inst_gen; + if (value_cg_ptr_type != nullptr) { ir_add_error(ira, suspend_source_instr, buf_sprintf("unable to @bitCast from pointer type '%s'", buf_ptr(&value_type->name))); return ira->codegen->invalid_inst_gen; @@ -18367,7 +18402,7 @@ static IrInstGen *ir_resolve_result_raw(IrAnalyze *ira, IrInst *suspend_source_i } } uint64_t parent_ptr_align = 0; - if (type_has_bits(value_type)) parent_ptr_align = get_ptr_align(ira->codegen, parent_ptr_type); + if (type_has_bits(ira->codegen, value_type)) parent_ptr_align = get_ptr_align(ira->codegen, parent_ptr_type); ZigType *ptr_type = get_pointer_to_type_extra(ira->codegen, value_type, parent_ptr_type->data.pointer.is_const, parent_ptr_type->data.pointer.is_volatile, PtrLenSingle, parent_ptr_align, 0, 0, parent_ptr_type->data.pointer.allow_zero); @@ -19085,7 +19120,7 @@ static IrInstGen *ir_analyze_fn_call(IrAnalyze *ira, IrInst* source_instr, } IrInstGen *first_arg; - if (!first_arg_known_bare && handle_is_ptr(first_arg_ptr->value->type->data.pointer.child_type)) { + if (!first_arg_known_bare && handle_is_ptr(ira->codegen, first_arg_ptr->value->type->data.pointer.child_type)) { first_arg = first_arg_ptr; } else { first_arg = ir_get_deref(ira, &first_arg_ptr->base, first_arg_ptr, nullptr); @@ -19214,7 +19249,7 @@ static IrInstGen *ir_analyze_fn_call(IrAnalyze *ira, IrInst* source_instr, } IrInstGen *first_arg; - if (!first_arg_known_bare && handle_is_ptr(first_arg_ptr->value->type->data.pointer.child_type)) { + if (!first_arg_known_bare && handle_is_ptr(ira->codegen, first_arg_ptr->value->type->data.pointer.child_type)) { first_arg = first_arg_ptr; } else { first_arg = ir_get_deref(ira, &first_arg_ptr->base, first_arg_ptr, nullptr); @@ -19333,7 +19368,7 @@ static IrInstGen *ir_analyze_fn_call(IrAnalyze *ira, IrInst* source_instr, } IrInstGen *result_loc; - if (handle_is_ptr(impl_fn_type_id->return_type)) { + if (handle_is_ptr(ira->codegen, impl_fn_type_id->return_type)) { result_loc = ir_resolve_result(ira, source_instr, call_result_loc, impl_fn_type_id->return_type, nullptr, true, false); if (result_loc != nullptr) { @@ -19350,7 +19385,7 @@ static IrInstGen *ir_analyze_fn_call(IrAnalyze *ira, IrInst* source_instr, if (res_child_type == ira->codegen->builtin_types.entry_var) { res_child_type = impl_fn_type_id->return_type; } - if (!handle_is_ptr(res_child_type)) { + if (!handle_is_ptr(ira->codegen, res_child_type)) { ir_reset_result(call_result_loc); result_loc = nullptr; } @@ -19402,7 +19437,7 @@ static IrInstGen *ir_analyze_fn_call(IrAnalyze *ira, IrInst* source_instr, IrInstGen *first_arg; if (param_type->id == ZigTypeIdPointer && - handle_is_ptr(first_arg_ptr->value->type->data.pointer.child_type)) + handle_is_ptr(ira->codegen, first_arg_ptr->value->type->data.pointer.child_type)) { first_arg = first_arg_ptr; } else { @@ -19471,7 +19506,7 @@ static IrInstGen *ir_analyze_fn_call(IrAnalyze *ira, IrInst* source_instr, } IrInstGen *result_loc; - if (handle_is_ptr(return_type)) { + if (handle_is_ptr(ira->codegen, return_type)) { result_loc = ir_resolve_result(ira, source_instr, call_result_loc, return_type, nullptr, true, false); if (result_loc != nullptr) { @@ -19488,7 +19523,7 @@ static IrInstGen *ir_analyze_fn_call(IrAnalyze *ira, IrInst* source_instr, if (res_child_type == ira->codegen->builtin_types.entry_var) { res_child_type = return_type; } - if (!handle_is_ptr(res_child_type)) { + if (!handle_is_ptr(ira->codegen, res_child_type)) { ir_reset_result(call_result_loc); result_loc = nullptr; } @@ -21630,10 +21665,31 @@ static IrInstGen *ir_analyze_instruction_load_ptr(IrAnalyze *ira, IrInstSrcLoadP } static IrInstGen *ir_analyze_instruction_typeof(IrAnalyze *ira, IrInstSrcTypeOf *typeof_instruction) { - IrInstGen *expr_value = typeof_instruction->value->child; - ZigType *type_entry = expr_value->value->type; + ZigType *type_entry; + + const size_t value_count = typeof_instruction->value_count; + + // Fast path for the common case of TypeOf with a single argument + if (value_count < 2) { + type_entry = typeof_instruction->value.scalar->child->value->type; + } else { + IrInstGen **args = heap::c_allocator.allocate(value_count); + for (size_t i = 0; i < value_count; i += 1) { + IrInstGen *value = typeof_instruction->value.list[i]->child; + if (type_is_invalid(value->value->type)) + return ira->codegen->invalid_inst_gen; + args[i] = value; + } + + type_entry = ir_resolve_peer_types(ira, typeof_instruction->base.base.source_node, + nullptr, args, value_count); + + heap::c_allocator.deallocate(args, value_count); + } + if (type_is_invalid(type_entry)) return ira->codegen->invalid_inst_gen; + return ir_const_type(ira, &typeof_instruction->base.base, type_entry); } @@ -23021,8 +23077,11 @@ static IrInstGen *ir_analyze_instruction_container_init_list(IrAnalyze *ira, } } + const_ptrs.deinit(); + IrInstGen *result = ir_get_deref(ira, &instruction->base.base, result_loc, nullptr); - if (instr_is_comptime(result)) + // If the result is a tuple, we are allowed to return a struct that uses ConstValSpecialRuntime fields at comptime. + if (instr_is_comptime(result) || is_tuple(container_type)) return result; if (is_comptime) { @@ -23313,7 +23372,7 @@ static TypeStructField *validate_byte_offset(IrAnalyze *ira, return nullptr; } - if (!type_has_bits(field->type_entry)) { + if (!type_has_bits(ira->codegen, field->type_entry)) { ir_add_error(ira, &field_name_value->base, buf_sprintf("zero-bit field '%s' in struct '%s' has no offset", buf_ptr(field_name), buf_ptr(&container_type->name))); @@ -24231,7 +24290,7 @@ static Error ir_make_type_info_value(IrAnalyze *ira, IrInst* source_instr, ZigTy return ErrorSemanticAnalyzeFail; if ((err = type_resolve(ira->codegen, field_type, ResolveStatusZeroBitsKnown))) return err; - if (!type_has_bits(struct_field->type_entry)) { + if (!type_has_bits(ira->codegen, struct_field->type_entry)) { inner_fields[1]->data.x_optional = nullptr; } else { size_t byte_offset = struct_field->offset; @@ -24247,7 +24306,8 @@ static Error ir_make_type_info_value(IrAnalyze *ira, IrInst* source_instr, ZigTy // default_value: var inner_fields[3]->special = ConstValSpecialStatic; - inner_fields[3]->type = get_optional_type(ira->codegen, struct_field->type_entry); + inner_fields[3]->type = get_optional_type2(ira->codegen, struct_field->type_entry); + if (inner_fields[3]->type == nullptr) return ErrorSemanticAnalyzeFail; memoize_field_init_val(ira->codegen, type_entry, struct_field); set_optional_payload(inner_fields[3], struct_field->init_val); @@ -24956,9 +25016,7 @@ static IrInstGen *ir_analyze_instruction_embed_file(IrAnalyze *ira, IrInstSrcEmb } } - ZigType *result_type = get_array_type(ira->codegen, - ira->codegen->builtin_types.entry_u8, buf_len(file_contents), nullptr); - IrInstGen *result = ir_const(ira, &instruction->base.base, result_type); + IrInstGen *result = ir_const(ira, &instruction->base.base, nullptr); init_const_str_lit(ira->codegen, result->value, file_contents); return result; } @@ -25044,7 +25102,7 @@ static IrInstGen *ir_analyze_instruction_cmpxchg(IrAnalyze *ira, IrInstSrcCmpxch ZigType *result_type = get_optional_type(ira->codegen, operand_type); IrInstGen *result_loc; - if (handle_is_ptr(result_type)) { + if (handle_is_ptr(ira->codegen, result_type)) { result_loc = ir_resolve_result(ira, &instruction->base.base, instruction->result_loc, result_type, nullptr, true, true); if (type_is_invalid(result_loc->value->type) || result_loc->value->type->id == ZigTypeIdUnreachable) { @@ -25363,8 +25421,11 @@ static IrInstGen *ir_analyze_instruction_vector_type(IrAnalyze *ira, IrInstSrcVe static IrInstGen *ir_analyze_shuffle_vector(IrAnalyze *ira, IrInst* source_instr, ZigType *scalar_type, IrInstGen *a, IrInstGen *b, IrInstGen *mask) { + Error err; ir_assert(source_instr && scalar_type && a && b && mask, source_instr); - ir_assert(is_valid_vector_elem_type(scalar_type), source_instr); + + if ((err = ir_validate_vector_elem_type(ira, source_instr->source_node, scalar_type))) + return ira->codegen->invalid_inst_gen; uint32_t len_mask; if (mask->value->type->id == ZigTypeIdVector) { @@ -27331,7 +27392,7 @@ static IrInstGen *ir_analyze_ptr_cast(IrAnalyze *ira, IrInst* source_instr, IrIn if ((err = type_resolve(ira->codegen, src_type, ResolveStatusZeroBitsKnown))) return ira->codegen->invalid_inst_gen; - if (type_has_bits(dest_type) && !type_has_bits(src_type) && safety_check_on) { + if (type_has_bits(ira->codegen, dest_type) && !type_has_bits(ira->codegen, src_type) && safety_check_on) { ErrorMsg *msg = ir_add_error(ira, source_instr, buf_sprintf("'%s' and '%s' do not have the same in-memory representation", buf_ptr(&src_type->name), buf_ptr(&dest_type->name))); @@ -27390,7 +27451,7 @@ static IrInstGen *ir_analyze_ptr_cast(IrAnalyze *ira, IrInst* source_instr, IrIn // Keep the bigger alignment, it can only help- // unless the target is zero bits. - if (src_align_bytes > dest_align_bytes && type_has_bits(dest_type)) { + if (src_align_bytes > dest_align_bytes && type_has_bits(ira->codegen, dest_type)) { result = ir_align_cast(ira, result, src_align_bytes, false); } @@ -27411,7 +27472,7 @@ static IrInstGen *ir_analyze_ptr_cast(IrAnalyze *ira, IrInst* source_instr, IrIn // Keep the bigger alignment, it can only help- // unless the target is zero bits. IrInstGen *result; - if (src_align_bytes > dest_align_bytes && type_has_bits(dest_type)) { + if (src_align_bytes > dest_align_bytes && type_has_bits(ira->codegen, dest_type)) { result = ir_align_cast(ira, casted_ptr, src_align_bytes, false); if (type_is_invalid(result->value->type)) return ira->codegen->invalid_inst_gen; @@ -27769,9 +27830,7 @@ static IrInstGen *ir_analyze_bit_cast(IrAnalyze *ira, IrInst* source_instr, IrIn Error err; ZigType *src_type = value->value->type; - ir_assert(get_codegen_ptr_type(src_type) == nullptr, source_instr); ir_assert(type_can_bit_cast(src_type), source_instr); - ir_assert(get_codegen_ptr_type(dest_type) == nullptr, source_instr); ir_assert(type_can_bit_cast(dest_type), source_instr); if (dest_type->id == ZigTypeIdEnum) { @@ -27830,7 +27889,7 @@ static IrInstGen *ir_analyze_int_to_ptr(IrAnalyze *ira, IrInst* source_instr, Ir Error err; ir_assert(get_src_ptr_type(ptr_type) != nullptr, source_instr); - ir_assert(type_has_bits(ptr_type), source_instr); + ir_assert(type_has_bits(ira->codegen, ptr_type), source_instr); IrInstGen *casted_int = ir_implicit_cast(ira, target, ira->codegen->builtin_types.entry_usize); if (type_is_invalid(casted_int->value->type)) @@ -27948,7 +28007,7 @@ static IrInstGen *ir_analyze_instruction_ptr_to_int(IrAnalyze *ira, IrInstSrcPtr if (!val) return ira->codegen->invalid_inst_gen; - // Since we've already run this type trough get_codegen_ptr_type it is + // Since we've already run this type trough get_src_ptr_type it is // safe to access the x_ptr fields if (val->data.x_ptr.special == ConstPtrSpecialHardCodedAddr) { IrInstGen *result = ir_const(ira, &instruction->base.base, usize); @@ -28199,10 +28258,17 @@ static ZigType *ir_resolve_atomic_operand_type(IrAnalyze *ira, IrInstGen *op) { max_atomic_bits, (uint32_t) operand_type->data.floating.bit_count)); return ira->codegen->builtin_types.entry_invalid; } - } else if (get_codegen_ptr_type(operand_type) == nullptr) { - ir_add_error(ira, &op->base, - buf_sprintf("expected integer, float, enum or pointer type, found '%s'", buf_ptr(&operand_type->name))); - return ira->codegen->builtin_types.entry_invalid; + } else { + Error err; + ZigType *operand_ptr_type; + if ((err = get_codegen_ptr_type(ira->codegen, operand_type, &operand_ptr_type))) + return ira->codegen->builtin_types.entry_invalid; + if (operand_ptr_type == nullptr) { + ir_add_error(ira, &op->base, + buf_sprintf("expected integer, float, enum or pointer type, found '%s'", + buf_ptr(&operand_type->name))); + return ira->codegen->builtin_types.entry_invalid; + } } return operand_type; @@ -28633,15 +28699,19 @@ static IrInstGen *ir_analyze_instruction_bswap(IrAnalyze *ira, IrInstSrcBswap *i if (type_is_invalid(uncasted_op->value->type)) return ira->codegen->invalid_inst_gen; - uint32_t vector_len; // UINT32_MAX means not a vector - if (uncasted_op->value->type->id == ZigTypeIdArray && - is_valid_vector_elem_type(uncasted_op->value->type->data.array.child_type)) - { - vector_len = uncasted_op->value->type->data.array.len; + uint32_t vector_len = UINT32_MAX; // means not a vector + if (uncasted_op->value->type->id == ZigTypeIdArray) { + bool can_be_vec_elem; + if ((err = is_valid_vector_elem_type(ira->codegen, uncasted_op->value->type->data.array.child_type, + &can_be_vec_elem))) + { + return ira->codegen->invalid_inst_gen; + } + if (can_be_vec_elem) { + vector_len = uncasted_op->value->type->data.array.len; + } } else if (uncasted_op->value->type->id == ZigTypeIdVector) { vector_len = uncasted_op->value->type->data.vector.len; - } else { - vector_len = UINT32_MAX; } bool is_vector = (vector_len != UINT32_MAX); @@ -29042,7 +29112,7 @@ static IrInstGen *ir_analyze_instruction_await(IrAnalyze *ira, IrInstSrcAwait *i } IrInstGen *result_loc; - if (type_has_bits(result_type)) { + if (type_has_bits(ira->codegen, result_type)) { result_loc = ir_resolve_result(ira, &instruction->base.base, instruction->result_loc, result_type, nullptr, true, true); if (result_loc != nullptr && @@ -29092,7 +29162,7 @@ static IrInstGen *ir_analyze_instruction_spill_begin(IrAnalyze *ira, IrInstSrcSp if (type_is_invalid(operand->value->type)) return ira->codegen->invalid_inst_gen; - if (!type_has_bits(operand->value->type)) + if (!type_has_bits(ira->codegen, operand->value->type)) return ir_const_void(ira, &instruction->base.base); switch (instruction->spill_id) { @@ -29112,7 +29182,7 @@ static IrInstGen *ir_analyze_instruction_spill_end(IrAnalyze *ira, IrInstSrcSpil return ira->codegen->invalid_inst_gen; if (ir_should_inline(ira->old_irb.exec, instruction->base.base.scope) || - !type_has_bits(operand->value->type) || + !type_has_bits(ira->codegen, operand->value->type) || instr_is_comptime(operand)) { return operand; @@ -30155,7 +30225,7 @@ static Error ir_resolve_lazy_raw(AstNode *source_node, ZigValue *val) { if (align_bytes != 0) { if ((err = type_resolve(ira->codegen, elem_type, ResolveStatusAlignmentKnown))) return err; - if (!type_has_bits(elem_type)) + if (!type_has_bits(ira->codegen, elem_type)) align_bytes = 0; } bool allow_zero = lazy_ptr_type->is_allowzero || lazy_ptr_type->ptr_len == PtrLenC; diff --git a/src/ir_print.cpp b/src/ir_print.cpp index 1cfe904660..e66b4a3cdf 100644 --- a/src/ir_print.cpp +++ b/src/ir_print.cpp @@ -1118,7 +1118,13 @@ static void ir_print_vector_store_elem(IrPrintGen *irp, IrInstGenVectorStoreElem static void ir_print_typeof(IrPrintSrc *irp, IrInstSrcTypeOf *instruction) { fprintf(irp->f, "@TypeOf("); - ir_print_other_inst_src(irp, instruction->value); + if (instruction->value_count == 1) { + ir_print_other_inst_src(irp, instruction->value.scalar); + } else { + for (size_t i = 0; i < instruction->value_count; i += 1) { + ir_print_other_inst_src(irp, instruction->value.list[i]); + } + } fprintf(irp->f, ")"); } diff --git a/src/link.cpp b/src/link.cpp index e6d186cef9..655c0f56aa 100644 --- a/src/link.cpp +++ b/src/link.cpp @@ -248,21 +248,13 @@ static const char *mingwex_generic_src[] = { "math" OS_SEP "tgammal.c", "math" OS_SEP "truncl.c", "misc" OS_SEP "alarm.c", - "misc" OS_SEP "assert.c", "misc" OS_SEP "basename.c", "misc" OS_SEP "btowc.c", "misc" OS_SEP "delay-f.c", "misc" OS_SEP "delay-n.c", "misc" OS_SEP "delayimp.c", - "misc" OS_SEP "difftime.c", - "misc" OS_SEP "difftime32.c", - "misc" OS_SEP "difftime64.c", "misc" OS_SEP "dirent.c", "misc" OS_SEP "dirname.c", - "misc" OS_SEP "execv.c", - "misc" OS_SEP "execve.c", - "misc" OS_SEP "execvp.c", - "misc" OS_SEP "execvpe.c", "misc" OS_SEP "feclearexcept.c", "misc" OS_SEP "fegetenv.c", "misc" OS_SEP "fegetexceptflag.c", @@ -300,10 +292,6 @@ static const char *mingwex_generic_src[] = { "misc" OS_SEP "mkstemp.c", "misc" OS_SEP "seterrno.c", "misc" OS_SEP "sleep.c", - "misc" OS_SEP "spawnv.c", - "misc" OS_SEP "spawnve.c", - "misc" OS_SEP "spawnvp.c", - "misc" OS_SEP "spawnvpe.c", "misc" OS_SEP "strnlen.c", "misc" OS_SEP "strsafe.c", "misc" OS_SEP "strtoimax.c", @@ -463,7 +451,6 @@ static const char *mingwex_x86_src[] = { "math" OS_SEP "x86" OS_SEP "fmod.c", "math" OS_SEP "x86" OS_SEP "fmodf.c", "math" OS_SEP "x86" OS_SEP "fmodl.c", - "math" OS_SEP "x86" OS_SEP "frexpl.S", "math" OS_SEP "x86" OS_SEP "fucom.c", "math" OS_SEP "x86" OS_SEP "ilogbf.S", "math" OS_SEP "x86" OS_SEP "ilogbl.S", @@ -509,43 +496,21 @@ static const char *mingwex_x86_src[] = { static const char *mingwex_arm32_src[] = { "math" OS_SEP "arm" OS_SEP "_chgsignl.S", - "math" OS_SEP "arm" OS_SEP "ceil.S", - "math" OS_SEP "arm" OS_SEP "ceilf.S", - "math" OS_SEP "arm" OS_SEP "ceill.S", - "math" OS_SEP "arm" OS_SEP "copysignl.c", "math" OS_SEP "arm" OS_SEP "exp2.c", - "math" OS_SEP "arm" OS_SEP "floor.S", - "math" OS_SEP "arm" OS_SEP "floorf.S", - "math" OS_SEP "arm" OS_SEP "floorl.S", - "math" OS_SEP "arm" OS_SEP "ldexpl.c", - "math" OS_SEP "arm" OS_SEP "log2.c", "math" OS_SEP "arm" OS_SEP "nearbyint.S", "math" OS_SEP "arm" OS_SEP "nearbyintf.S", "math" OS_SEP "arm" OS_SEP "nearbyintl.S", - "math" OS_SEP "arm" OS_SEP "scalbn.c", - "math" OS_SEP "arm" OS_SEP "sincos.c", "math" OS_SEP "arm" OS_SEP "trunc.S", "math" OS_SEP "arm" OS_SEP "truncf.S", }; static const char *mingwex_arm64_src[] = { - "math" OS_SEP "arm64" OS_SEP "ceilf.S", - "math" OS_SEP "arm64" OS_SEP "ceill.S", - "math" OS_SEP "arm64" OS_SEP "ceil.S", "math" OS_SEP "arm64" OS_SEP "_chgsignl.S", - "math" OS_SEP "arm64" OS_SEP "copysignl.c", "math" OS_SEP "arm64" OS_SEP "exp2f.S", "math" OS_SEP "arm64" OS_SEP "exp2.S", - "math" OS_SEP "arm64" OS_SEP "floorf.S", - "math" OS_SEP "arm64" OS_SEP "floorl.S", - "math" OS_SEP "arm64" OS_SEP "floor.S", - "math" OS_SEP "arm64" OS_SEP "ldexpl.c", - "math" OS_SEP "arm64" OS_SEP "log2.c", "math" OS_SEP "arm64" OS_SEP "nearbyintf.S", "math" OS_SEP "arm64" OS_SEP "nearbyintl.S", "math" OS_SEP "arm64" OS_SEP "nearbyint.S", - "math" OS_SEP "arm64" OS_SEP "scalbn.c", - "math" OS_SEP "arm64" OS_SEP "sincos.c", "math" OS_SEP "arm64" OS_SEP "truncf.S", "math" OS_SEP "arm64" OS_SEP "trunc.S", }; @@ -1216,6 +1181,7 @@ static const char *get_libc_crt_file(CodeGen *parent, const char *file, Stage2Pr "mingw" OS_SEP "crt" OS_SEP "xncommod.c", "mingw" OS_SEP "crt" OS_SEP "cinitexe.c", "mingw" OS_SEP "crt" OS_SEP "merr.c", + "mingw" OS_SEP "crt" OS_SEP "usermatherr.c", "mingw" OS_SEP "crt" OS_SEP "pesect.c", "mingw" OS_SEP "crt" OS_SEP "udllargc.c", "mingw" OS_SEP "crt" OS_SEP "xthdloc.c", diff --git a/test/compile_errors.zig b/test/compile_errors.zig index 979bf45bbe..f559311547 100644 --- a/test/compile_errors.zig +++ b/test/compile_errors.zig @@ -2,6 +2,24 @@ const tests = @import("tests.zig"); const std = @import("std"); pub fn addCases(cases: *tests.CompileErrorContext) void { + cases.addTest("@TypeOf with no arguments", + \\export fn entry() void { + \\ _ = @TypeOf(); + \\} + , &[_][]const u8{ + "tmp.zig:2:9: error: expected at least 1 argument, found 0", + }); + + cases.addTest("@TypeOf with incompatible arguments", + \\export fn entry() void { + \\ var var_1: f32 = undefined; + \\ var var_2: u32 = undefined; + \\ _ = @TypeOf(var_1, var_2); + \\} + , &[_][]const u8{ + "tmp.zig:4:9: error: incompatible types: 'f32' and 'u32'", + }); + cases.addTest("type mismatch with tuple concatenation", \\export fn entry() void { \\ var x = .{}; diff --git a/test/run_translated_c.zig b/test/run_translated_c.zig index 629a850836..313a83705c 100644 --- a/test/run_translated_c.zig +++ b/test/run_translated_c.zig @@ -195,4 +195,22 @@ pub fn addCases(cases: *tests.RunTranslatedCContext) void { \\ return 0; \\} , ""); + + cases.add("cast from pointer to opaque type to struct", + \\#include + \\typedef struct + \\{ + \\ int i; + \\} + \\StructType,*StructPtrType; + \\ + \\typedef struct OpaqueStruct OpaqueStructTypedef; + \\#define Macro(opaquePtr) (((StructPtrType)(opaquePtr))->i) + \\int main(int argc, char **argv) { + \\ StructType localStruct = {88}; + \\ OpaqueStructTypedef *opaquePtrToLocal = &localStruct; + \\ printf("%d!\n", Macro(opaquePtrToLocal)); + \\ return 0; + \\} + , "88!\n"); } diff --git a/test/stage1/behavior/cast.zig b/test/stage1/behavior/cast.zig index 080f50cc03..04b2e97e8c 100644 --- a/test/stage1/behavior/cast.zig +++ b/test/stage1/behavior/cast.zig @@ -782,3 +782,10 @@ test "cast between C pointer with different but compatible types" { }; S.doTheTest(); } + +var global_struct: struct { f0: usize } = undefined; + +test "assignment to optional pointer result loc" { + var foo: struct { ptr: ?*c_void } = .{ .ptr = &global_struct }; + expect(foo.ptr.? == @ptrCast(*c_void, &global_struct)); +} diff --git a/test/stage1/behavior/sizeof_and_typeof.zig b/test/stage1/behavior/sizeof_and_typeof.zig index a729bf731d..13078f5dd1 100644 --- a/test/stage1/behavior/sizeof_and_typeof.zig +++ b/test/stage1/behavior/sizeof_and_typeof.zig @@ -105,6 +105,29 @@ test "@TypeOf() has no runtime side effects" { expect(data == 0); } +test "@TypeOf() with multiple arguments" { + { + var var_1: u32 = undefined; + var var_2: u8 = undefined; + var var_3: u64 = undefined; + comptime expect(@TypeOf(var_1, var_2, var_3) == u64); + } + { + var var_1: f16 = undefined; + var var_2: f32 = undefined; + var var_3: f64 = undefined; + comptime expect(@TypeOf(var_1, var_2, var_3) == f64); + } + { + var var_1: u16 = undefined; + comptime expect(@TypeOf(var_1, 0xffff) == u16); + } + { + var var_1: f32 = undefined; + comptime expect(@TypeOf(var_1, 3.1415) == f32); + } +} + test "branching logic inside @TypeOf" { const S = struct { var data: i32 = 0; diff --git a/test/stage1/behavior/tuple.zig b/test/stage1/behavior/tuple.zig index 13d3d05681..686a9ad83e 100644 --- a/test/stage1/behavior/tuple.zig +++ b/test/stage1/behavior/tuple.zig @@ -15,4 +15,42 @@ test "tuple concatenation" { }; S.doTheTest(); comptime S.doTheTest(); + + const T = struct { + fn consume_tuple(tuple: var, len: usize) void { + expect(tuple.len == len); + } + + fn doTheTest() void { + const t1 = .{}; + + var rt_var: u8 = 42; + const t2 = .{rt_var} ++ .{}; + + expect(t2.len == 1); + expect(t2.@"0" == rt_var); + expect(t2.@"0" == 42); + expect(&t2.@"0" != &rt_var); + + consume_tuple(t1 ++ t1, 0); + consume_tuple(.{} ++ .{}, 0); + consume_tuple(.{0} ++ .{}, 1); + consume_tuple(.{0} ++ .{1}, 2); + consume_tuple(.{0, 1, 2} ++ .{u8, 1, noreturn}, 6); + consume_tuple(t2 ++ t1, 1); + consume_tuple(t1 ++ t2, 1); + consume_tuple(t2 ++ t2, 2); + consume_tuple(.{rt_var} ++ .{}, 1); + consume_tuple(.{rt_var} ++ t1, 1); + consume_tuple(.{} ++ .{rt_var}, 1); + consume_tuple(t2 ++ .{void}, 2); + consume_tuple(t2 ++ .{0}, 2); + consume_tuple(.{0} ++ t2, 2); + consume_tuple(.{void} ++ t2, 2); + consume_tuple(.{u8} ++ .{rt_var} ++ .{true}, 3); + } + }; + + T.doTheTest(); + comptime T.doTheTest(); } diff --git a/test/stage1/behavior/type_info.zig b/test/stage1/behavior/type_info.zig index a3988cba6d..3ce44a89c4 100644 --- a/test/stage1/behavior/type_info.zig +++ b/test/stage1/behavior/type_info.zig @@ -386,3 +386,8 @@ test "@typeInfo does not force declarations into existence" { }; comptime expect(@typeInfo(S).Struct.fields.len == 1); } + +test "defaut value for a var-typed field" { + const S = struct { x: var }; + expect(@typeInfo(S).Struct.fields[0].default_value == null); +} diff --git a/test/tests.zig b/test/tests.zig index 0a7f6942ba..a22d3fccea 100644 --- a/test/tests.zig +++ b/test/tests.zig @@ -594,14 +594,13 @@ pub const StackTracesContext = struct { } child.spawn() catch |err| debug.panic("Unable to spawn {}: {}\n", .{ full_exe_path, @errorName(err) }); - var stdout = Buffer.initNull(b.allocator); - var stderr = Buffer.initNull(b.allocator); - var stdout_file_in_stream = child.stdout.?.inStream(); var stderr_file_in_stream = child.stderr.?.inStream(); - stdout_file_in_stream.stream.readAllBuffer(&stdout, max_stdout_size) catch unreachable; - stderr_file_in_stream.stream.readAllBuffer(&stderr, max_stdout_size) catch unreachable; + const stdout = stdout_file_in_stream.stream.readAllAlloc(b.allocator, max_stdout_size) catch unreachable; + defer b.allocator.free(stdout); + const stderr = stderr_file_in_stream.stream.readAllAlloc(b.allocator, max_stdout_size) catch unreachable; + defer b.allocator.free(stderr); const term = child.wait() catch |err| { debug.panic("Unable to spawn {}: {}\n", .{ full_exe_path, @errorName(err) }); @@ -644,11 +643,8 @@ pub const StackTracesContext = struct { const got: []const u8 = got_result: { var buf = try Buffer.initSize(b.allocator, 0); defer buf.deinit(); - const bytes = if (stderr.endsWith("\n")) - stderr.toSliceConst()[0 .. stderr.len() - 1] - else - stderr.toSliceConst()[0..stderr.len()]; - var it = mem.separate(bytes, "\n"); + if (stderr.len != 0 and stderr[stderr.len - 1] == '\n') stderr = stderr[0 .. stderr.len - 1]; + var it = mem.separate(stderr, "\n"); process_lines: while (it.next()) |line| { if (line.len == 0) continue; const delims = [_][]const u8{ ":", ":", ":", " in " }; diff --git a/test/translate_c.zig b/test/translate_c.zig index 1d6c2a60ae..d4ee871793 100644 --- a/test/translate_c.zig +++ b/test/translate_c.zig @@ -3,6 +3,53 @@ const std = @import("std"); const CrossTarget = std.zig.CrossTarget; pub fn addCases(cases: *tests.TranslateCContext) void { + cases.add("nested loops without blocks", + \\void foo() { + \\ while (0) while (0) {} + \\ for (;;) while (0); + \\ for (;;) do {} while (0); + \\} + , &[_][]const u8{ + \\pub export fn foo() void { + \\ while (@as(c_int, 0) != 0) while (@as(c_int, 0) != 0) {}; + \\ while (true) while (@as(c_int, 0) != 0) {}; + \\ while (true) while (true) { + \\ if (!(@as(c_int, 0) != 0)) break; + \\ }; + \\} + }); + + cases.add("macro comma operator", + \\#define foo (foo, bar) + \\#define bar(x) (&x, +3, 4 == 4, 5 * 6, baz(1, 2), 2 % 2, baz(1,2)) + , &[_][]const u8{ + \\pub const foo = blk: { + \\ _ = foo; + \\ break :blk bar; + \\}; + , + \\pub inline fn bar(x: var) @TypeOf(baz(1, 2)) { + \\ return blk: { + \\ _ = &x; + \\ _ = 3; + \\ _ = 4 == 4; + \\ _ = 5 * 6; + \\ _ = baz(1, 2); + \\ _ = 2 % 2; + \\ break :blk baz(1, 2); + \\ }; + \\} + }); + + cases.add("macro keyword define", + \\#define foo 1 + \\#define inline 2 + , &[_][]const u8{ + \\pub const foo = 1; + , + \\pub const @"inline" = 2; + }); + cases.add("macro line continuation", \\#define FOO -\ \\BAR @@ -10,6 +57,26 @@ pub fn addCases(cases: *tests.TranslateCContext) void { \\pub const FOO = -BAR; }); + cases.add("struct with atomic field", + \\struct arcan_shmif_cont { + \\ struct arcan_shmif_page* addr; + \\}; + \\struct arcan_shmif_page { + \\ volatile _Atomic int abufused[12]; + \\}; + , &[_][]const u8{ + \\pub const struct_arcan_shmif_page = // + , + \\warning: unsupported type: 'Atomic' + \\ @OpaqueType(); // + , + \\ warning: struct demoted to opaque type - unable to translate type of field abufused + , // TODO should be `addr: *struct_arcan_shmif_page` + \\pub const struct_arcan_shmif_cont = extern struct { + \\ addr: [*c]struct_arcan_shmif_page, + \\}; + }); + cases.add("function prototype translated as optional", \\typedef void (*fnptr_ty)(void); \\typedef __attribute__((cdecl)) void (*fnptr_attr_ty)(void); @@ -286,10 +353,11 @@ pub fn addCases(cases: *tests.TranslateCContext) void { cases.add("variables", \\extern int extern_var; \\static const int int_var = 13; + \\int foo; , &[_][]const u8{ \\pub extern var extern_var: c_int; - , \\pub const int_var: c_int = 13; + \\pub export var foo: c_int = undefined; }); cases.add("const ptr initializer", @@ -1352,7 +1420,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void { cases.add("macro pointer cast", \\#define NRF_GPIO ((NRF_GPIO_Type *) NRF_GPIO_BASE) , &[_][]const u8{ - \\pub const NRF_GPIO = if (@typeInfo(@TypeOf(NRF_GPIO_BASE)) == .Pointer) @ptrCast([*c]NRF_GPIO_Type, NRF_GPIO_BASE) else if (@typeInfo(@TypeOf(NRF_GPIO_BASE)) == .Int) @intToPtr([*c]NRF_GPIO_Type, NRF_GPIO_BASE) else @as([*c]NRF_GPIO_Type, NRF_GPIO_BASE); + \\pub const NRF_GPIO = (if (@typeInfo(@TypeOf(NRF_GPIO_BASE)) == .Pointer) @ptrCast([*c]NRF_GPIO_Type, @alignCast(@alignOf([*c]NRF_GPIO_Type.Child), NRF_GPIO_BASE)) else if (@typeInfo(@TypeOf(NRF_GPIO_BASE)) == .Int) @intToPtr([*c]NRF_GPIO_Type, NRF_GPIO_BASE) else @as([*c]NRF_GPIO_Type, NRF_GPIO_BASE)); }); cases.add("basic macro function", @@ -2536,11 +2604,11 @@ pub fn addCases(cases: *tests.TranslateCContext) void { \\#define FOO(bar) baz((void *)(baz)) \\#define BAR (void*) a , &[_][]const u8{ - \\pub inline fn FOO(bar: var) @TypeOf(baz(if (@typeInfo(@TypeOf(baz)) == .Pointer) @ptrCast(*c_void, baz) else if (@typeInfo(@TypeOf(baz)) == .Int) @intToPtr(*c_void, baz) else @as(*c_void, baz))) { - \\ return baz(if (@typeInfo(@TypeOf(baz)) == .Pointer) @ptrCast(*c_void, baz) else if (@typeInfo(@TypeOf(baz)) == .Int) @intToPtr(*c_void, baz) else @as(*c_void, baz)); + \\pub inline fn FOO(bar: var) @TypeOf(baz((if (@typeInfo(@TypeOf(baz)) == .Pointer) @ptrCast(*c_void, @alignCast(@alignOf(*c_void.Child), baz)) else if (@typeInfo(@TypeOf(baz)) == .Int) @intToPtr(*c_void, baz) else @as(*c_void, baz)))) { + \\ return baz((if (@typeInfo(@TypeOf(baz)) == .Pointer) @ptrCast(*c_void, @alignCast(@alignOf(*c_void.Child), baz)) else if (@typeInfo(@TypeOf(baz)) == .Int) @intToPtr(*c_void, baz) else @as(*c_void, baz))); \\} , - \\pub const BAR = if (@typeInfo(@TypeOf(a)) == .Pointer) @ptrCast(*c_void, a) else if (@typeInfo(@TypeOf(a)) == .Int) @intToPtr(*c_void, a) else @as(*c_void, a); + \\pub const BAR = (if (@typeInfo(@TypeOf(a)) == .Pointer) @ptrCast(*c_void, @alignCast(@alignOf(*c_void.Child), a)) else if (@typeInfo(@TypeOf(a)) == .Int) @intToPtr(*c_void, a) else @as(*c_void, a)); }); cases.add("macro conditional operator", @@ -2702,4 +2770,19 @@ pub fn addCases(cases: *tests.TranslateCContext) void { \\ return if (x > y) x else y; \\} }); + + cases.add("Make sure casts are grouped", + \\typedef struct + \\{ + \\ int i; + \\} + \\*_XPrivDisplay; + \\typedef struct _XDisplay Display; + \\#define DefaultScreen(dpy) (((_XPrivDisplay)(dpy))->default_screen) + \\ + , &[_][]const u8{ + \\pub inline fn DefaultScreen(dpy: var) @TypeOf((if (@typeInfo(@TypeOf(dpy)) == .Pointer) @ptrCast(_XPrivDisplay, @alignCast(@alignOf(_XPrivDisplay.Child), dpy)) else if (@typeInfo(@TypeOf(dpy)) == .Int) @intToPtr(_XPrivDisplay, dpy) else @as(_XPrivDisplay, dpy)).*.default_screen) { + \\ return (if (@typeInfo(@TypeOf(dpy)) == .Pointer) @ptrCast(_XPrivDisplay, @alignCast(@alignOf(_XPrivDisplay.Child), dpy)) else if (@typeInfo(@TypeOf(dpy)) == .Int) @intToPtr(_XPrivDisplay, dpy) else @as(_XPrivDisplay, dpy)).*.default_screen; + \\} + }); }