October 2018 - Wine-commits

Jacek Caban : jscript: Allow trailing comma in object literals.
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: 4cabe3612fa3bd1188f17b244c635c950a831bbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cabe3612fa3bd1188f17b24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 17:22:03 2018 +0200 jscript: Allow trailing comma in object literals. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/parser.y | 8 ++++++++ dlls/jscript/tests/lang.js | 14 ++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index a40b813..0bb8856 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -778,6 +778,14 @@ ObjectLiteral : '{' '}' { $$ = new_prop_and_value_expression(ctx, NULL); } | '{' PropertyNameAndValueList '}' { $$ = new_prop_and_value_expression(ctx, $2); } + | '{' PropertyNameAndValueList ',' '}' + { + if(ctx->script->version < 2) { + WARN("Trailing comma in object literal is illegal in legacy mode.\n"); + YYABORT; + } + $$ = new_prop_and_value_expression(ctx, $2); + } /* ECMA-262 3rd Edition 11.1.5 */ PropertyNameAndValueList diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index badb6a8..1cd5668 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -480,6 +480,20 @@ ok(obj3.prop1 === 1, "obj3.prop1 is not 1"); ok(obj3.prop2 === "boolean", "obj3.prop2 is not \"boolean\""); ok(obj3.constructor === Object, "unexpected obj3.constructor"); +if(invokeVersion >= 2) { + eval("tmp = {prop: 'value',}"); + ok(tmp.prop === "value", "tmp.prop = " + tmp.prop); + eval("tmp = {prop: 'value',second:2,}"); + ok(tmp.prop === "value", "tmp.prop = " + tmp.prop); +}else { + try { + eval("tmp = {prop: 'value',}"); + }catch(e) { + tmp = true; + } + ok(tmp === true, "exception not fired"); +} + { var blockVar = 1; blockVar = 2;

1 0

Henri Verbeet : wined3d: Avoid accessing the device after deactivation some more.
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: a4104c7c6085e42a97594eafb8726acfc82e1230 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4104c7c6085e42a97594eaf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 16 21:04:11 2018 +0330 wined3d: Avoid accessing the device after deactivation some more. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 70d43e0..b90df20 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5315,9 +5315,13 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL } else if (message == WM_ACTIVATEAPP) { - UINT i; + unsigned int i = device->swapchain_count; - for (i = 0; i < device->swapchain_count; i++) + /* Deactivating the implicit swapchain may cause the application + * (e.g. Deus Ex: GOTY) to destroy the device, so take care to + * deactivate the implicit swapchain last, and to avoid accessing the + * "device" pointer afterwards. */ + while (i--) wined3d_swapchain_activate(device->swapchains[i], wparam); } else if (message == WM_SYSCOMMAND)

1 0

Daniel Ansorregui : d2d1: Use default NULL argument in SetBlendState call.
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: e55aca8f498536af974a031c2e9a4d905de9a7cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=e55aca8f498536af974a031c… Author: Daniel Ansorregui <mailszeros(a)gmail.com> Date: Mon Oct 15 20:17:15 2018 +0100 d2d1: Use default NULL argument in SetBlendState call. Signed-off-by: Daniel Ansorregui <mailszeros(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index ff5caac..2593413 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -131,8 +131,6 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en D3D10_VIEWPORT vp; HRESULT hr; - static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; - vp.TopLeftX = 0; vp.TopLeftY = 0; vp.Width = render_target->pixel_size.width; @@ -180,7 +178,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en ID3D10Device_OMSetRenderTargets(device, 1, &render_target->target->rtv, NULL); if (brush) { - ID3D10Device_OMSetBlendState(device, render_target->bs, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); + ID3D10Device_OMSetBlendState(device, render_target->bs, NULL, D3D10_DEFAULT_SAMPLE_MASK); d2d_brush_bind_resources(brush, device, 0); } if (opacity_brush)

1 0

Piotr Caban : wbemprox: Support specifying server and namespace in WbemServices functions.
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: ff4f1c2e3ad3c0e08cbfe820fa1b4906eb6f1b56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff4f1c2e3ad3c0e08cbfe820… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 15 19:59:21 2018 +0200 wbemprox: Support specifying server and namespace in WbemServices functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/services.c | 35 +++++++++++++++++++++++++++++++++-- dlls/wbemprox/tests/query.c | 27 ++++++++++++++++++++++----- 2 files changed, 55 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index fd87feb..fa1386f 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -338,15 +338,46 @@ static HRESULT parse_path( const WCHAR *str, struct path **ret ) if (!(path = heap_alloc_zero( sizeof(*path) ))) return E_OUTOFMEMORY; + if (*p == '\\') + { + static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2'}; + + WCHAR server[MAX_COMPUTERNAME_LENGTH+1]; + DWORD server_len = ARRAY_SIZE(server); + + p++; + if (*p != '\\') return WBEM_E_INVALID_OBJECT_PATH; + p++; + + q = p; + while (*p && *p != '\\') p++; + if (!*p) return WBEM_E_INVALID_OBJECT_PATH; + + len = p - q; + if (!GetComputerNameW( server, &server_len ) || server_len != len + || memcmp( q, server, server_len * sizeof(WCHAR) )) + return WBEM_E_NOT_SUPPORTED; + + q = ++p; + while (*p && *p != ':') p++; + if (!*p) return WBEM_E_INVALID_OBJECT_PATH; + + len = p - q; + if (len != ARRAY_SIZE(cimv2W) || memcmp( q, cimv2W, sizeof(cimv2W) )) + return WBEM_E_INVALID_NAMESPACE; + p++; + } + + q = p; while (*p && *p != '.') p++; - len = p - str; + len = p - q; if (!(path->class = heap_alloc( (len + 1) * sizeof(WCHAR) ))) { heap_free( path ); return E_OUTOFMEMORY; } - memcpy( path->class, str, len * sizeof(WCHAR) ); + memcpy( path->class, q, len * sizeof(WCHAR) ); path->class[len] = 0; path->class_len = len; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 387952d..168c290 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -398,7 +398,7 @@ static void test_Win32_Bios( IWbemServices *services ) SysFreeString( wql ); } -static void test_Win32_Process( IWbemServices *services ) +static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) { static const WCHAR returnvalueW[] = {'R','e','t','u','r','n','V','a','l','u','e',0}; static const WCHAR getownerW[] = {'G','e','t','O','w','n','e','r',0}; @@ -408,18 +408,33 @@ static void test_Win32_Process( IWbemServices *services ) static const WCHAR idW[] = {'I','D',0}; static const WCHAR fmtW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s','.', 'H','a','n','d','l','e','=','"','%','u','"',0}; + static const WCHAR full_path_fmt[] = + {'\\','\\','%','s','\\','R','O','O','T','\\','C','I','M','V','2',':',0}; static const LONG expected_flavor = WBEM_FLAVOR_FLAG_PROPAGATE_TO_INSTANCE | WBEM_FLAVOR_NOT_OVERRIDABLE | WBEM_FLAVOR_ORIGIN_PROPAGATED; + WCHAR full_path[MAX_COMPUTERNAME_LENGTH + ARRAY_SIZE(full_path_fmt)]; BSTR class, method; IWbemClassObject *process, *out; IWbemQualifierSet *qualifiers; VARIANT user, domain, retval, val; + DWORD full_path_len = 0; LONG flavor; CIMTYPE type; HRESULT hr; - class = SysAllocString( processW ); + if (use_full_path) + { + WCHAR server[MAX_COMPUTERNAME_LENGTH+1]; + + full_path_len = ARRAY_SIZE(server); + ok( GetComputerNameW(server, &full_path_len), "GetComputerName failed\n" ); + full_path_len = wsprintfW(full_path, full_path_fmt, server); + } + + class = SysAllocStringLen( NULL, full_path_len + ARRAY_SIZE( processW ) ); + memcpy( class, full_path, full_path_len * sizeof(WCHAR) ); + memcpy( class + full_path_len, processW, sizeof(processW) ); hr = IWbemServices_GetObject( services, class, 0, NULL, &process, NULL ); SysFreeString( class ); if (hr != S_OK) @@ -433,8 +448,9 @@ static void test_Win32_Process( IWbemServices *services ) out = NULL; method = SysAllocString( getownerW ); - class = SysAllocStringLen( NULL, ARRAY_SIZE( fmtW ) + 10 ); - wsprintfW( class, fmtW, GetCurrentProcessId() ); + class = SysAllocStringLen( NULL, full_path_len + ARRAY_SIZE( fmtW ) + 10 ); + memcpy( class, full_path, full_path_len * sizeof(WCHAR) ); + wsprintfW( class + full_path_len, fmtW, GetCurrentProcessId() ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); ok( hr == S_OK, "failed to execute method %08x\n", hr ); SysFreeString( method ); @@ -1860,7 +1876,8 @@ START_TEST(query) test_select( services ); test_associators( services ); test_Win32_Bios( services ); - test_Win32_Process( services ); + test_Win32_Process( services, FALSE ); + test_Win32_Process( services, TRUE ); test_Win32_Service( services ); test_Win32_ComputerSystem( services ); test_Win32_SystemEnclosure( services );

1 0

Alistair Leslie-Hughes : include: Add missing XINPUT_CAPS_ defines.
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: 3adddfecc31fee89200cd953ab729d542ec6e6a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3adddfecc31fee89200cd953… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Oct 16 02:30:06 2018 +0000 include: Add missing XINPUT_CAPS_ defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/xinput.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/xinput.h b/include/xinput.h index dae8cad..73b8c92 100644 --- a/include/xinput.h +++ b/include/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.

1 0

Alexandre Julliard : widl: Support generating multiple typelibs into the same resource file.
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: c34e2451375155980e94dab552b4bc820b37f3d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c34e2451375155980e94dab5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 16 13:47:54 2018 +0200 widl: Support generating multiple typelibs into the same resource file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 12 ++++++------ tools/widl/register.c | 26 +++++++++++++++++++++++++- tools/widl/typelib.c | 16 +--------------- tools/widl/typelib.h | 4 +--- tools/widl/widl.h | 1 + tools/widl/write_msft.c | 1 - 6 files changed, 34 insertions(+), 26 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 005163f..1cb9ab9 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -134,6 +134,8 @@ static struct namespace global_namespace = { static struct namespace *current_namespace = &global_namespace; +static typelib_t *current_typelib; + %} %union { attr_t *attr; @@ -326,6 +328,7 @@ input: gbl_statements { fix_incomplete(); write_client($1); write_server($1); write_regscript($1); + write_typelib_regscript($1); write_dlldata($1); write_local_stubs($1); } @@ -424,21 +427,18 @@ import: import_start imp_statements aEOF { $$ = $1->name; ; importlib: tIMPORTLIB '(' aSTRING ')' - semicolon_opt { $$ = $3; if(!parse_only) add_importlib($3); } + semicolon_opt { $$ = $3; if(!parse_only) add_importlib($3, current_typelib); } ; libraryhdr: tLIBRARY aIDENTIFIER { $$ = $2; } | tLIBRARY aKNOWNTYPE { $$ = $2; } ; library_start: attributes libraryhdr '{' { $$ = make_library($2, check_library_attrs($2, $1)); - if (!parse_only) start_typelib($$); + if (!parse_only && do_typelib) current_typelib = $$; } ; librarydef: library_start imp_statements '}' - semicolon_opt { $$ = $1; - $$->stmts = $2; - if (!parse_only) end_typelib(); - } + semicolon_opt { $$ = $1; $$->stmts = $2; } ; m_args: { $$ = NULL; } diff --git a/tools/widl/register.c b/tools/widl/register.c index 9a4f219..210fb74 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -34,6 +34,7 @@ #include "parser.h" #include "header.h" #include "typegen.h" +#include "typelib.h" static int indent; @@ -273,6 +274,24 @@ void write_regscript( const statement_list_t *stmts ) } } +void write_typelib_regscript( const statement_list_t *stmts ) +{ + const statement_t *stmt; + unsigned int count = 0; + + if (!do_typelib) return; + if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) + { + if (stmt->type != STMT_LIBRARY) continue; + if (count && !strendswith( typelib_name, ".res" )) + error( "Cannot store multiple typelibs into %s\n", typelib_name ); + else + create_msft_typelib( stmt->u.lib ); + count++; + } + if (count && strendswith( typelib_name, ".res" )) flush_output_resources( typelib_name ); +} + void output_typelib_regscript( const typelib_t *typelib ) { const UUID *typelib_uuid = get_attrp( typelib->attrs, ATTR_UUID ); @@ -281,6 +300,7 @@ void output_typelib_regscript( const typelib_t *typelib ) unsigned int version = get_attrv( typelib->attrs, ATTR_VERSION ); unsigned int flags = 0; char id_part[12] = ""; + char *resname = typelib_name; expr_t *expr; if (is_attr( typelib->attrs, ATTR_RESTRICTED )) flags |= 1; /* LIBFLAG_FRESTRICTED */ @@ -299,7 +319,11 @@ void output_typelib_regscript( const typelib_t *typelib ) put_str( indent++, "{\n" ); expr = get_attrp( typelib->attrs, ATTR_ID ); if (expr) + { sprintf(id_part, "\\%d", expr->cval); + resname = xmalloc( strlen(typelib_name) + 20 ); + sprintf(resname, "%s\\%d", typelib_name, expr->cval); + } put_str( indent, "'%x' { %s = s '%%MODULE%%%s' }\n", lcid_expr ? lcid_expr->cval : 0, typelib_kind == SYS_WIN64 ? "win64" : "win32", id_part ); put_str( indent, "FLAGS = s '%u'\n", flags ); @@ -320,5 +344,5 @@ void output_typelib_regscript( const typelib_t *typelib ) write_progids( typelib->stmts ); put_str( --indent, "}\n" ); - add_output_to_resources( "WINE_REGISTRY", typelib_name ); + add_output_to_resources( "WINE_REGISTRY", resname ); } diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 2ebb50e..3083839 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -44,7 +44,6 @@ #include "typelib_struct.h" #include "typetree.h" -static typelib_t *typelib; /* List of oleauto types that should be recognized by name. * (most of) these seem to be intrinsic types in mktyplib. @@ -239,19 +238,6 @@ unsigned short get_type_vt(type_t *t) return 0; } -void start_typelib(typelib_t *typelib_type) -{ - if (!do_typelib) return; - typelib = typelib_type; -} - -void end_typelib(void) -{ - if (!typelib) return; - - create_msft_typelib(typelib); -} - static void tlb_read(int fd, void *buf, int count) { if(read(fd, buf, count) < count) @@ -376,7 +362,7 @@ static void read_importlib(importlib_t *importlib) close(fd); } -void add_importlib(const char *name) +void add_importlib(const char *name, typelib_t *typelib) { importlib_t *importlib; diff --git a/tools/widl/typelib.h b/tools/widl/typelib.h index 18e6cdb..7df7d29 100644 --- a/tools/widl/typelib.h +++ b/tools/widl/typelib.h @@ -21,9 +21,7 @@ #ifndef __WIDL_TYPELIB_H #define __WIDL_TYPELIB_H -extern void start_typelib(typelib_t *typelib_type); -extern void end_typelib(void); -extern void add_importlib(const char *name); +extern void add_importlib(const char *name, typelib_t *typelib); /* Copied from wtypes.h. Not included directly because that would create a * circular dependency (after all, wtypes.h is generated by widl...) */ diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 09e7871..7530f9f 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -89,6 +89,7 @@ extern void write_proxies(const statement_list_t *stmts); extern void write_client(const statement_list_t *stmts); extern void write_server(const statement_list_t *stmts); extern void write_regscript(const statement_list_t *stmts); +extern void write_typelib_regscript(const statement_list_t *stmts); extern void output_typelib_regscript( const typelib_t *typelib ); extern void write_local_stubs(const statement_list_t *stmts); extern void write_dlldata(const statement_list_t *stmts); diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 5585a2f..88a80d1 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2636,7 +2636,6 @@ static void save_all_changes(msft_typelib_t *typelib) sprintf( typelib_id, "#%d", expr->cval ); add_output_to_resources( "TYPELIB", typelib_id ); output_typelib_regscript( typelib->typelib ); - flush_output_resources( typelib_name ); } else flush_output_buffer( typelib_name ); }

1 0

Alistair Leslie-Hughes : include: Add natupnp.idl.
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: c71abc386b5f84c19fed7dd69ff5cc19b100a24e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c71abc386b5f84c19fed7dd6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Oct 14 23:27:04 2018 +0000 include: Add natupnp.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/natupnp.idl | 224 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 225 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index f90fe84..f60f919 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -454,6 +454,7 @@ SOURCES = \ msxmldid.h \ mtxdm.h \ multimon.h \ + natupnp.idl \ nb30.h \ ncrypt.h \ ndrtypes.h \ diff --git a/include/natupnp.idl b/include/natupnp.idl new file mode 100644 index 0000000..83b48a3 --- /dev/null +++ b/include/natupnp.idl @@ -0,0 +1,224 @@ +/* + * Copyright 2018 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +import "oaidl.idl"; +import "ocidl.idl"; + +#if !defined(progid) && !defined(__WIDL__) +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + +[ + object, + uuid(6F10711F-729B-41E5-93B8-F21D0F818DF1), + dual, + pointer_default(unique) +] +interface IStaticPortMapping : IDispatch +{ + [propget, id(1)] + HRESULT ExternalIPAddress ([out, retval] BSTR *value); + + [propget, id(2)] + HRESULT ExternalPort([out, retval] long *value); + + [propget, id(3)] + HRESULT InternalPort([out, retval] long *value); + + [propget, id(4)] + HRESULT Protocol([out, retval] BSTR *value); + + [propget, id(5)] + HRESULT InternalClient([out, retval] BSTR *value); + + [propget, id(6)] + HRESULT Enabled([out, retval] VARIANT_BOOL *value); + + [propget, id(7)] + HRESULT Description([out, retval] BSTR *value); + + [id(8)] + HRESULT EditInternalClient ([in] BSTR client); + + [id(9)] + HRESULT Enable ([in] VARIANT_BOOL enable); + + [id(10)] + HRESULT EditDescription ([in] BSTR description); + + [id(11)] + HRESULT EditInternalPort ([in] long port); +}; + +[ + object, + uuid(cd1f3e77-66d6-4664-82c7-36dbb641d0f1), + dual, + pointer_default(unique) +] +interface IStaticPortMappingCollection : IDispatch +{ + [propget, id(DISPID_NEWENUM), hidden, restricted] + HRESULT _NewEnum([out, retval] IUnknown **value); + + [propget, id(DISPID_VALUE)] + HRESULT Item([in] long port, [in] BSTR protocol, [out, retval] IStaticPortMapping **mapping); + + [propget, id(1)] + HRESULT Count([out, retval] long *value); + + [id(2)] + HRESULT Remove([in] long port, [in] BSTR protocol); + + [id(3)] + HRESULT Add([in] long external, [in] BSTR protocol, [in] long internal, [in] BSTR client, + [in] VARIANT_BOOL enabled, [in] BSTR description, [out, retval] IStaticPortMapping **mapping); +}; + +[ + object, + uuid(4FC80282-23B6-4378-9A27-CD8F17C9400C), + dual, + pointer_default(unique) +] +interface IDynamicPortMapping : IDispatch +{ + [propget, id(1)] + HRESULT ExternalIPAddress ([out, retval] BSTR *value); + + [propget, id(2)] + HRESULT RemoteHost ([out, retval] BSTR *value); + + [propget, id(3)] + HRESULT ExternalPort([out, retval] long *value); + + [propget, id(4)] + HRESULT Protocol([out, retval] BSTR *value); + + [propget, id(5)] + HRESULT InternalPort([out, retval] long *value); + + [propget, id(6)] + HRESULT InternalClient([out, retval] BSTR *value); + + [propget, id(7)] + HRESULT Enabled([out, retval] VARIANT_BOOL *value); + + [propget, id(8)] + HRESULT Description([out, retval] BSTR *value); + + [propget, id(9)] + HRESULT LeaseDuration([out, retval] long *value); + + [id(10)] + HRESULT RenewLease([in] long desired, [out, retval] long *duration); + + [id(11)] + HRESULT EditInternalClient ([in] BSTR client); + + [id(12)] + HRESULT Enable ([in] VARIANT_BOOL enabled); + + [id(13)] + HRESULT EditDescription ([in] BSTR description); + + [id(14)] + HRESULT EditInternalPort ([in] long port); +}; + +[ + object, + uuid(b60de00f-156e-4e8d-9ec1-3a2342c10899), + dual, + pointer_default(unique) +] +interface IDynamicPortMappingCollection : IDispatch +{ + [propget, id(DISPID_NEWENUM), hidden, restricted] + HRESULT _NewEnum([out, retval] IUnknown **value); + + [propget, id(DISPID_VALUE)] + HRESULT Item([in] BSTR host, [in] long port, [in] BSTR orotocol, + [out, retval] IDynamicPortMapping **mapping); + + [propget, id(1)] + HRESULT Count([out, retval] long *value); + + [id(2)] + HRESULT Remove([in] BSTR host, [in] long port, [in] BSTR protocol); + + [id(3)] + HRESULT Add([in] BSTR host, [in] long port, [in] BSTR protocol, [in] long internal, + [in] BSTR client, [in] VARIANT_BOOL enabled, [in] BSTR Description, + [in] long duration, [out, retval] IDynamicPortMapping **mapping); +}; + +[ + object, + uuid(624bd588-9060-4109-b0b0-1adbbcac32df), + dual, + pointer_default(unique) +] +interface INATEventManager : IDispatch +{ + [id(1), propput] + HRESULT ExternalIPAddressCallback ([in] IUnknown *unk); + + [id(2), propput] + HRESULT NumberOfEntriesCallback ([in] IUnknown *unk); +}; + +[ + object, + uuid(b171c812-cc76-485a-94d8-b6b3a2794e99), + dual, + pointer_default(unique) +] +interface IUPnPNAT : IDispatch +{ + [propget, id(1)] + HRESULT StaticPortMappingCollection ([out, retval] IStaticPortMappingCollection **collection); + + [propget, id(2)] + HRESULT DynamicPortMappingCollection ([out, retval] IDynamicPortMappingCollection **collection); + + [propget, id(3)] + HRESULT NATEventManager ([out, retval] INATEventManager **manager); +}; + +[ + id(2), + uuid(1c565858-f302-471e-b409-f180aa4abec6), + version(1.0) +] +library NATUPNPLib +{ + importlib("stdole2.tlb"); + + [ + vi_progid("HNetCfg.NATUPnP"), + progid("HNetCfg.NATUPnP.1"), + threading(apartment), + uuid(ae1e00aa-3fd5-403c-8a27-2bbdc30cd0e1) + ] + coclass UPnPNAT + { + [default] interface IUPnPNAT; + }; +};

1 0

Alistair Leslie-Hughes : hnetcfg: Register NATUPnP interface.
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: bd9610535369500dff1dfde0fc49abedc463675c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd9610535369500dff1dfde0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Oct 14 23:27:05 2018 +0000 hnetcfg: Register NATUPnP interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/hnetcfg_tlb.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/hnetcfg/hnetcfg_tlb.idl b/dlls/hnetcfg/hnetcfg_tlb.idl index 33e8cc8..e368fe6 100644 --- a/dlls/hnetcfg/hnetcfg_tlb.idl +++ b/dlls/hnetcfg/hnetcfg_tlb.idl @@ -21,3 +21,4 @@ #pragma makedep regtypelib #include "netfw.idl" +#include "natupnp.idl"

1 0

Alistair Leslie-Hughes : hnetcfg: Support IUPnPNAT interface.
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: 449833b48aabe25ef500fe12b2b00e83bd9b2efd URL: https://source.winehq.org/git/wine.git/?a=commit;h=449833b48aabe25ef500fe12… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Oct 14 23:27:06 2018 +0000 hnetcfg: Support IUPnPNAT interface. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34711 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/apps.c | 4 +- dlls/hnetcfg/hnetcfg.c | 7 ++ dlls/hnetcfg/hnetcfg_private.h | 2 + dlls/hnetcfg/manager.c | 1 + dlls/hnetcfg/port.c | 167 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 180 insertions(+), 1 deletion(-) diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index e671e8c..9972468 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -27,6 +27,7 @@ #include "winuser.h" #include "ole2.h" #include "netfw.h" +#include "natupnp.h" #include "wine/debug.h" #include "wine/heap.h" @@ -115,7 +116,8 @@ static REFIID tid_id[] = &IID_INetFwOpenPorts, &IID_INetFwPolicy, &IID_INetFwPolicy2, - &IID_INetFwProfile + &IID_INetFwProfile, + &IID_IUPnPNAT }; HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) diff --git a/dlls/hnetcfg/hnetcfg.c b/dlls/hnetcfg/hnetcfg.c index e56dbab..5cc24a1 100644 --- a/dlls/hnetcfg/hnetcfg.c +++ b/dlls/hnetcfg/hnetcfg.c @@ -25,6 +25,7 @@ #include "objbase.h" #include "rpcproxy.h" #include "netfw.h" +#include "natupnp.h" #include "wine/debug.h" #include "hnetcfg_private.h" @@ -114,6 +115,8 @@ static hnetcfg_cf fw_manager_cf = { { &hnetcfg_cf_vtbl }, NetFwMgr_create }; static hnetcfg_cf fw_app_cf = { { &hnetcfg_cf_vtbl }, NetFwAuthorizedApplication_create }; static hnetcfg_cf fw_openport_cf = { { &hnetcfg_cf_vtbl }, NetFwOpenPort_create }; static hnetcfg_cf fw_policy2_cf = { { &hnetcfg_cf_vtbl }, NetFwPolicy2_create }; +static hnetcfg_cf upnpnat_cf = { { &hnetcfg_cf_vtbl }, IUPnPNAT_create }; + BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { @@ -156,6 +159,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) { cf = &fw_policy2_cf.IClassFactory_iface; } + else if (IsEqualGUID( rclsid, &CLSID_UPnPNAT )) + { + cf = &upnpnat_cf.IClassFactory_iface; + } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, ppv ); diff --git a/dlls/hnetcfg/hnetcfg_private.h b/dlls/hnetcfg/hnetcfg_private.h index 5245883..be2d0f3 100644 --- a/dlls/hnetcfg/hnetcfg_private.h +++ b/dlls/hnetcfg/hnetcfg_private.h @@ -27,6 +27,7 @@ enum type_id INetFwPolicy2_tid, INetFwProfile_tid, INetFwRules_tid, + IUPnPNAT_tid, last_tid }; @@ -42,3 +43,4 @@ HRESULT NetFwAuthorizedApplications_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN HRESULT NetFwOpenPorts_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwOpenPort_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwServices_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT IUPnPNAT_create(IUnknown *, void **) DECLSPEC_HIDDEN; diff --git a/dlls/hnetcfg/manager.c b/dlls/hnetcfg/manager.c index 1d548b4..d3f089e 100644 --- a/dlls/hnetcfg/manager.c +++ b/dlls/hnetcfg/manager.c @@ -28,6 +28,7 @@ #include "initguid.h" #include "ole2.h" #include "netfw.h" +#include "natupnp.h" #include "wine/debug.h" #include "wine/unicode.h" diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index 7d74965..f497bcb 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -27,7 +27,9 @@ #include "winuser.h" #include "ole2.h" #include "netfw.h" +#include "natupnp.h" +#include "wine/heap.h" #include "wine/debug.h" #include "wine/unicode.h" #include "hnetcfg_private.h" @@ -603,3 +605,168 @@ HRESULT NetFwOpenPorts_create( IUnknown *pUnkOuter, LPVOID *ppObj ) TRACE("returning iface %p\n", *ppObj); return S_OK; } + +typedef struct _upnpnat +{ + IUPnPNAT IUPnPNAT_iface; + LONG ref; +} upnpnat; + +static inline upnpnat *impl_from_IUPnPNAT( IUPnPNAT *iface ) +{ + return CONTAINING_RECORD(iface, upnpnat, IUPnPNAT_iface); +} + +static HRESULT WINAPI upnpnat_QueryInterface(IUPnPNAT *iface, REFIID riid, void **object) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), object ); + + if ( IsEqualGUID( riid, &IID_IUPnPNAT ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *object = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + IUPnPNAT_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI upnpnat_AddRef(IUPnPNAT *iface) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + return InterlockedIncrement( &This->ref ); +} + +static ULONG WINAPI upnpnat_Release(IUPnPNAT *iface) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + LONG refs = InterlockedDecrement( &This->ref ); + if (!refs) + { + heap_free( This ); + } + return refs; +} + +static HRESULT WINAPI upnpnat_GetTypeInfoCount(IUPnPNAT *iface, UINT *pctinfo) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + + TRACE("%p %p\n", This, pctinfo); + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI upnpnat_GetTypeInfo(IUPnPNAT *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + + TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo( IUPnPNAT_tid, ppTInfo ); +} + +static HRESULT WINAPI upnpnat_GetIDsOfNames(IUPnPNAT *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo( IUPnPNAT_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, rgszNames, cNames, rgDispId ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI upnpnat_Invoke(IUPnPNAT *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, + UINT *puArgErr) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo( IUPnPNAT_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &This->IUPnPNAT_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI upnpnat_get_StaticPortMappingCollection(IUPnPNAT *iface, IStaticPortMappingCollection **collection) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + FIXME("%p, %p\n", This, collection); + if(collection) + *collection = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI upnpnat_get_DynamicPortMappingCollection(IUPnPNAT *iface, IDynamicPortMappingCollection **collection) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + FIXME("%p, %p\n", This, collection); + if(collection) + *collection = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI upnpnat_get_NATEventManager(IUPnPNAT *iface, INATEventManager **manager) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + FIXME("%p, %p\n", This, manager); + if(manager) + *manager = NULL; + return E_NOTIMPL; +} + +const static IUPnPNATVtbl upnpnat_vtbl = +{ + upnpnat_QueryInterface, + upnpnat_AddRef, + upnpnat_Release, + upnpnat_GetTypeInfoCount, + upnpnat_GetTypeInfo, + upnpnat_GetIDsOfNames, + upnpnat_Invoke, + upnpnat_get_StaticPortMappingCollection, + upnpnat_get_DynamicPortMappingCollection, + upnpnat_get_NATEventManager +}; + + +HRESULT IUPnPNAT_create(IUnknown *outer, void **object) +{ + upnpnat *nat; + + TRACE("(%p,%p)\n", outer, object); + + nat = heap_alloc( sizeof(*nat) ); + if (!nat) return E_OUTOFMEMORY; + + nat->IUPnPNAT_iface.lpVtbl = &upnpnat_vtbl; + nat->ref = 1; + + *object = &nat->IUPnPNAT_iface; + + TRACE("returning iface %p\n", *object); + return S_OK; +}

1 0

Alistair Leslie-Hughes : hnetcfg: Link to uuid library.
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: d65bd95ecd4fee57cbfe17b375f0b0325f9e076e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d65bd95ecd4fee57cbfe17b3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Oct 14 23:27:07 2018 +0000 hnetcfg: Link to uuid library. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/Makefile.in | 2 +- dlls/hnetcfg/manager.c | 2 -- dlls/uuid/uuid.c | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/hnetcfg/Makefile.in b/dlls/hnetcfg/Makefile.in index 44c9cb5..e4960ab 100644 --- a/dlls/hnetcfg/Makefile.in +++ b/dlls/hnetcfg/Makefile.in @@ -1,5 +1,5 @@ MODULE = hnetcfg.dll -IMPORTS = oleaut32 ole32 advapi32 mpr +IMPORTS = oleaut32 ole32 advapi32 mpr uuid C_SRCS = \ apps.c \ diff --git a/dlls/hnetcfg/manager.c b/dlls/hnetcfg/manager.c index d3f089e..2d89479 100644 --- a/dlls/hnetcfg/manager.c +++ b/dlls/hnetcfg/manager.c @@ -25,10 +25,8 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "initguid.h" #include "ole2.h" #include "netfw.h" -#include "natupnp.h" #include "wine/debug.h" #include "wine/unicode.h" diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 913e99c..aa3b30c 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -79,6 +79,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "perhist.h" #include "netcon.h" #include "netfw.h" +#include "natupnp.h" #include "msctf.h" #include "sensevts.h" #include "ocmm.h"

1 0