July 2012 - Wine-commits - list.winehq.org

Matteo Bruni : d3dcompiler: Track the location of each lexer token.
by Alexandre Julliard 12 Jul '12

12 Jul '12

Module: wine Branch: master Commit: 40cbcabc0b3c9e1c6e78e206d6531d24c517d172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40cbcabc0b3c9e1c6e78e206d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 12 16:01:33 2012 +0200 d3dcompiler: Track the location of each lexer token. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 7 ++++- dlls/d3dcompiler_43/hlsl.l | 9 ++++++++ dlls/d3dcompiler_43/hlsl.y | 30 ++++++++++++++++++++++++---- 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index aa02eb9..1286f00 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -705,7 +705,7 @@ struct hlsl_ir_node enum hlsl_ir_node_type type; struct hlsl_type *data_type; - char *source_file; + const char *source_file; unsigned int line; unsigned int column; }; @@ -823,8 +823,11 @@ struct parse_variable_def struct hlsl_parse_ctx { - char *source_file; + const char **source_files; + unsigned int source_files_count; + const char *source_file; unsigned int line_no; + unsigned int column; enum parse_status status; struct compilation_messages messages; diff --git a/dlls/d3dcompiler_43/hlsl.l b/dlls/d3dcompiler_43/hlsl.l index 55b6b63..1e3b4a9 100644 --- a/dlls/d3dcompiler_43/hlsl.l +++ b/dlls/d3dcompiler_43/hlsl.l @@ -29,6 +29,14 @@ #include "hlsl.tab.h" WINE_DEFAULT_DEBUG_CHANNEL(hlsl_parser); + +#define YY_USER_ACTION \ + do { \ + hlsl_lloc.first_column = hlsl_ctx.column; \ + hlsl_lloc.first_line = hlsl_ctx.line_no; \ + hlsl_ctx.column += yyleng; \ + } while(0); + %} %option noyywrap nounput noinput @@ -206,6 +214,7 @@ row_major {return KW_ROW_MAJOR; } {WS}+ {} {NEWLINE} { hlsl_ctx.line_no++; + hlsl_ctx.column = 1; } ^# { diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 240eaaf..48c43a2 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -95,7 +95,7 @@ void hlsl_report_message(const char *filename, DWORD line, DWORD column, static void hlsl_error(const char *s) { - hlsl_report_message(hlsl_ctx.source_file, hlsl_ctx.line_no, 1, HLSL_LEVEL_ERROR, "%s", s); + hlsl_report_message(hlsl_ctx.source_file, hlsl_ctx.line_no, hlsl_ctx.column, HLSL_LEVEL_ERROR, "%s", s); } static void debug_dump_decl(struct hlsl_type *type, DWORD modifiers, const char *declname, unsigned int line_no) @@ -177,6 +177,7 @@ static unsigned int components_count_expr_list(struct list *list) %} +%locations %error-verbose %union @@ -360,8 +361,19 @@ preproc_directive: PRE_LINE STRING { TRACE("Updating line information to file %s, line %u\n", debugstr_a($2), $1); hlsl_ctx.line_no = $1; - d3dcompiler_free(hlsl_ctx.source_file); - hlsl_ctx.source_file = $2; + if (strcmp($2, hlsl_ctx.source_file)) + { + const char **new_array; + + hlsl_ctx.source_file = $2; + new_array = d3dcompiler_realloc(hlsl_ctx.source_files, + sizeof(*hlsl_ctx.source_files) * hlsl_ctx.source_files_count + 1); + if (new_array) + { + hlsl_ctx.source_files = new_array; + hlsl_ctx.source_files[hlsl_ctx.source_files_count++] = $2; + } + } } any_identifier: VAR_IDENTIFIER @@ -978,11 +990,16 @@ struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD mino struct hlsl_scope *scope, *next_scope; struct hlsl_type *hlsl_type, *next_type; struct hlsl_ir_var *var, *next_var; + unsigned int i; hlsl_ctx.status = PARSE_SUCCESS; hlsl_ctx.messages.size = hlsl_ctx.messages.capacity = 0; - hlsl_ctx.line_no = 1; + hlsl_ctx.line_no = hlsl_ctx.column = 1; hlsl_ctx.source_file = d3dcompiler_strdup(""); + hlsl_ctx.source_files = d3dcompiler_alloc(sizeof(*hlsl_ctx.source_files)); + if (hlsl_ctx.source_files) + hlsl_ctx.source_files[0] = hlsl_ctx.source_file; + hlsl_ctx.source_files_count = 1; hlsl_ctx.cur_scope = NULL; hlsl_ctx.matrix_majority = HLSL_COLUMN_MAJOR; list_init(&hlsl_ctx.scopes); @@ -1020,7 +1037,10 @@ struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD mino d3dcompiler_free(hlsl_ctx.messages.string); } - d3dcompiler_free(hlsl_ctx.source_file); + for (i = 0; i < hlsl_ctx.source_files_count; ++i) + d3dcompiler_free((void *)hlsl_ctx.source_files[i]); + d3dcompiler_free(hlsl_ctx.source_files); + TRACE("Freeing functions IR.\n"); LIST_FOR_EACH_ENTRY(function, &hlsl_ctx.functions, struct hlsl_ir_function_decl, node.entry) free_function(function);

1 0

André Hentschel : setupapi: Add a stub for SetupDiGetDeviceInstallParamsW.
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: 7b32809890a148346648d7dd06084ada83479850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b32809890a148346648d7dd0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jul 7 15:19:53 2012 +0200 setupapi: Add a stub for SetupDiGetDeviceInstallParamsW. --- dlls/setupapi/devinst.c | 12 ++++++++++++ dlls/setupapi/setupapi.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 19986f8..c93b2c1 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3683,6 +3683,18 @@ BOOL WINAPI SetupDiCallClassInstaller( } /*********************************************************************** + * SetupDiGetDeviceInstallParamsW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDeviceInstallParamsW( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) +{ + FIXME("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); + return FALSE; +} + +/*********************************************************************** * SetupDiGetDeviceInstallParamsA (SETUPAPI.@) */ BOOL WINAPI SetupDiGetDeviceInstallParamsA( diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index f8f8fab..38113e3 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -336,7 +336,7 @@ @ stdcall SetupDiGetDeviceInfoListDetailA(ptr ptr) @ stdcall SetupDiGetDeviceInfoListDetailW(ptr ptr) @ stdcall SetupDiGetDeviceInstallParamsA(ptr ptr ptr) -@ stub SetupDiGetDeviceInstallParamsW +@ stdcall SetupDiGetDeviceInstallParamsW(ptr ptr ptr) @ stdcall SetupDiGetDeviceInstanceIdA(ptr ptr ptr long ptr) @ stdcall SetupDiGetDeviceInstanceIdW(ptr ptr ptr long ptr) @ stub SetupDiGetDeviceInterfaceAlias

1 0

Henri Verbeet : winex11: Simplify X11DRV_XRandR_Init() error handling a bit .
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: 5ed890904b7d890bfa1682dff465758d10a7ef96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ed890904b7d890bfa1682dff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 11 17:35:44 2012 +0200 winex11: Simplify X11DRV_XRandR_Init() error handling a bit. --- dlls/winex11.drv/xrandr.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 53d16c9..ccb004f 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -277,18 +277,15 @@ void X11DRV_XRandR_Init(void) /* see if Xrandr is available */ wine_tsx11_lock(); - ok = pXRRQueryExtension(gdi_display, &xrandr_event, &xrandr_error); - if (ok) - { - X11DRV_expect_error(gdi_display, XRandRErrorHandler, NULL); - ok = pXRRQueryVersion(gdi_display, &xrandr_major, &xrandr_minor); - if (X11DRV_check_error()) ok = FALSE; - } - if (ok) - { - TRACE("Found XRandR - major: %d, minor: %d\n", xrandr_major, xrandr_minor); - xrandr_init_modes(); - } + if (!pXRRQueryExtension( gdi_display, &xrandr_event, &xrandr_error )) goto done; + X11DRV_expect_error( gdi_display, XRandRErrorHandler, NULL ); + ok = pXRRQueryVersion( gdi_display, &xrandr_major, &xrandr_minor ); + if (X11DRV_check_error() || !ok) goto done; + + TRACE("Found XRandR %d.%d.\n", xrandr_major, xrandr_minor); + xrandr_init_modes(); + +done: wine_tsx11_unlock(); }

1 0

Henri Verbeet : winex11: Get rid of some needless globals.
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: b4a31d0a9ed74b823027f9a03f9bc4f33f0cae59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4a31d0a9ed74b823027f9a03… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 11 17:35:45 2012 +0200 winex11: Get rid of some needless globals. --- dlls/winex11.drv/xrandr.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index ccb004f..83137a4 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -49,8 +49,6 @@ MAKE_FUNCPTR(XRRSizes) extern int usexrandr; -static int xrandr_event, xrandr_error, xrandr_major, xrandr_minor; - static struct x11drv_mode_info *dd_modes; static unsigned int dd_mode_count; static XRRScreenSize *real_xrandr_sizes; @@ -268,21 +266,23 @@ static void xrandr_init_modes(void) void X11DRV_XRandR_Init(void) { + int event_base, error_base, minor; + static int major; Bool ok; - if (xrandr_major) return; /* already initialized? */ + if (major) return; /* already initialized? */ if (!usexrandr) return; /* disabled in config */ if (root_window != DefaultRootWindow( gdi_display )) return; if (!load_xrandr()) return; /* can't load the Xrandr library */ /* see if Xrandr is available */ wine_tsx11_lock(); - if (!pXRRQueryExtension( gdi_display, &xrandr_event, &xrandr_error )) goto done; + if (!pXRRQueryExtension( gdi_display, &event_base, &error_base )) goto done; X11DRV_expect_error( gdi_display, XRandRErrorHandler, NULL ); - ok = pXRRQueryVersion( gdi_display, &xrandr_major, &xrandr_minor ); + ok = pXRRQueryVersion( gdi_display, &major, &minor ); if (X11DRV_check_error() || !ok) goto done; - TRACE("Found XRandR %d.%d.\n", xrandr_major, xrandr_minor); + TRACE("Found XRandR %d.%d.\n", major, minor); xrandr_init_modes(); done:

1 0

Matteo Bruni : d3dcompiler: Properly print compilation messages.
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: b33e1ceaf29e4c7559d4c66a84d13cf3e629abfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b33e1ceaf29e4c7559d4c66a8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 11 17:27:49 2012 +0200 d3dcompiler: Properly print compilation messages. --- dlls/d3dcompiler_43/compiler.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index a977315..f08e713 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -359,7 +359,7 @@ static HRESULT preprocess_shader(const void *data, SIZE_T data_size, int size; ID3DBlob *buffer; - TRACE("Preprocessor messages:\n%s", debugstr_a(wpp_messages)); + TRACE("Preprocessor messages:\n%s\n", debugstr_a(wpp_messages)); if (error_messages) { @@ -405,7 +405,7 @@ static HRESULT assemble_shader(const char *preproc_shader, if (messages) { TRACE("Assembler messages:\n"); - TRACE("%s", messages); + TRACE("%s\n", debugstr_a(messages)); TRACE("Shader source:\n"); TRACE("%s\n", debugstr_a(preproc_shader)); @@ -537,7 +537,7 @@ static HRESULT compile_shader(const char *preproc_shader, const char *target, co if (messages) { TRACE("Compiler messages:\n"); - TRACE("%s", messages); + TRACE("%s\n", debugstr_a(messages)); TRACE("Shader source:\n"); TRACE("%s\n", debugstr_a(preproc_shader));

1 0

Matteo Bruni : d3dcompiler: Make declaration_statement return a list.
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: 6fbed51ef1eefc1f54d30f702a6fd179d0d56ec3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fbed51ef1eefc1f54d30f702… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 11 17:27:50 2012 +0200 d3dcompiler: Make declaration_statement return a list. --- dlls/d3dcompiler_43/hlsl.y | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index b4c9b25..03aa4eb 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -251,6 +251,7 @@ static unsigned int components_count_expr_list(struct list *list) %type <boolval> boolean %type <type> base_type %type <type> type +%type <list> declaration_statement %type <list> complex_initializer %type <list> initializer_expr_list %type <instr> initializer_expr @@ -530,6 +531,8 @@ base_type: KW_VOID declaration_statement: declaration { + $$ = d3dcompiler_alloc(sizeof(*$$)); + list_init($$); } declaration: var_modifiers type variables_def ';' @@ -713,8 +716,7 @@ statement_list: statement statement: declaration_statement { - $$ = d3dcompiler_alloc(sizeof(*$$)); - list_init($$); + $$ = $1; } | expr_statement {

1 0

Matteo Bruni : d3dcompiler: Pass the shader filename to the preprocessor.
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: 3d052768ab04187434ca53aec9a9095fd5671b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d052768ab04187434ca53aec… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 11 17:27:51 2012 +0200 d3dcompiler: Pass the shader filename to the preprocessor. --- dlls/d3dcompiler_43/compiler.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index f08e713..9f1ed86 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -41,6 +41,7 @@ struct mem_file_desc static struct mem_file_desc current_shader; static ID3DInclude *current_include; +static const char *initial_filename; #define INCLUDES_INITIAL_CAPACITY 4 @@ -179,7 +180,7 @@ static void *wpp_open_mem(const char *filename, int type) struct mem_file_desc *desc; HRESULT hr; - if(filename[0] == '\0') /* "" means to load the initial shader */ + if(!strcmp(filename, initial_filename)) { current_shader.pos = 0; return &current_shader; @@ -310,7 +311,7 @@ static int wpp_close_output(void) return 1; } -static HRESULT preprocess_shader(const void *data, SIZE_T data_size, +static HRESULT preprocess_shader(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, ID3DBlob **error_messages) { int ret; @@ -347,8 +348,9 @@ static HRESULT preprocess_shader(const void *data, SIZE_T data_size, wpp_messages = NULL; current_shader.buffer = data; current_shader.size = data_size; + initial_filename = filename ? filename : ""; - ret = wpp_parse("", NULL); + ret = wpp_parse(initial_filename, NULL); if (!wpp_close_output()) ret = 1; if (ret) @@ -481,7 +483,7 @@ HRESULT WINAPI D3DAssemble(const void *data, SIZE_T datasize, const char *filena if (shader) *shader = NULL; if (error_messages) *error_messages = NULL; - hr = preprocess_shader(data, datasize, defines, include, error_messages); + hr = preprocess_shader(data, datasize, filename, defines, include, error_messages); if (SUCCEEDED(hr)) hr = assemble_shader(wpp_output, shader, error_messages); @@ -615,7 +617,7 @@ HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filena EnterCriticalSection(&wpp_mutex); - hr = preprocess_shader(data, data_size, defines, include, error_messages); + hr = preprocess_shader(data, data_size, filename, defines, include, error_messages); if (SUCCEEDED(hr)) hr = compile_shader(wpp_output, target, entrypoint, shader, error_messages); @@ -639,7 +641,7 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename if (shader) *shader = NULL; if (error_messages) *error_messages = NULL; - hr = preprocess_shader(data, size, defines, include, error_messages); + hr = preprocess_shader(data, size, filename, defines, include, error_messages); if (SUCCEEDED(hr)) {

1 0

Matteo Bruni : d3dcompiler: Add a trace to the scope push/pop functions.
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: 995fb30d58e08b4def6112533f8a19823712a5a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=995fb30d58e08b4def6112533… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 11 17:27:52 2012 +0200 d3dcompiler: Add a trace to the scope push/pop functions. --- dlls/d3dcompiler_43/utils.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 886d506..880a484 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -927,6 +927,7 @@ void push_scope(struct hlsl_parse_ctx *ctx) ERR("Out of memory!\n"); return; } + TRACE("Pushing a new scope\n"); list_init(&new_scope->vars); list_init(&new_scope->types); new_scope->upper = ctx->cur_scope; @@ -940,6 +941,7 @@ BOOL pop_scope(struct hlsl_parse_ctx *ctx) if (!prev_scope) return FALSE; + TRACE("Popping current scope\n"); ctx->cur_scope = prev_scope; return TRUE; }

1 0

Matteo Bruni : d3dcompiler: Improve debug_hlsl_type function.
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: 4a013688093c01663f16cf2e1d4752beeb2e3807 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a013688093c01663f16cf2e1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 11 17:27:53 2012 +0200 d3dcompiler: Improve debug_hlsl_type function. --- dlls/d3dcompiler_43/utils.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 880a484..2d4eefb 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -999,16 +999,16 @@ const char *debug_hlsl_type(const struct hlsl_type *type) return debugstr_a(type->name); if (type->type == HLSL_CLASS_STRUCT) - name = "<anonymous struct>"; - else - name = debug_base_type(type); + return "<anonymous struct>"; + + name = debug_base_type(type); if (type->type == HLSL_CLASS_SCALAR) return wine_dbg_sprintf("%s", name); if (type->type == HLSL_CLASS_VECTOR) - return wine_dbg_sprintf("vector<%s, %u>", name, type->dimx); + return wine_dbg_sprintf("%s%u", name, type->dimx); if (type->type == HLSL_CLASS_MATRIX) - return wine_dbg_sprintf("matrix<%s, %u, %u>", name, type->dimx, type->dimy); + return wine_dbg_sprintf("%s%ux%u", name, type->dimx, type->dimy); return "unexpected_type"; }

1 0

Jacek Caban : mshtml: Simplify ASServiceProvider_QueryService.
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: 8bb4a6b3ea242cd6434c2f95493532d37a11900e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bb4a6b3ea242cd6434c2f954… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 11 13:51:18 2012 +0200 mshtml: Simplify ASServiceProvider_QueryService. --- dlls/mshtml/script.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index d742b99..7b39963 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -573,10 +573,10 @@ static HRESULT WINAPI ASServiceProvider_QueryService(IServiceProvider *iface, RE if(IsEqualGUID(&SID_SInternetHostSecurityManager, guidService)) { TRACE("(%p)->(SID_SInternetHostSecurityManager)\n", This); - if(!This->window || !This->window->base.inner_window->doc) + if(!This->window || !This->window->doc) return E_NOINTERFACE; - return IInternetHostSecurityManager_QueryInterface(&This->window->base.inner_window->doc->IInternetHostSecurityManager_iface, + return IInternetHostSecurityManager_QueryInterface(&This->window->doc->IInternetHostSecurityManager_iface, riid, ppv); }

1 0