wine-commits October 2018

wine-commits@winehq.org

1 participants
602 discussions

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 : 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

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 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

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

Andrey Gusev : Update bug status descriptions.
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: bugzilla Branch: master Commit: badd254b430da88f414a39e91df9d51c38640358 URL: https://source.winehq.org/git/bugzilla.git/?a=commit;h=badd254b430da88f414a… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Oct 16 18:13:19 2018 +0300 Update bug status descriptions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39470 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- template/en/default/pages/fields.html.tmpl | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/template/en/default/pages/fields.html.tmpl b/template/en/default/pages/fields.html.tmpl index f7437a0..2e78fd3 100644 --- a/template/en/default/pages/fields.html.tmpl +++ b/template/en/default/pages/fields.html.tmpl @@ -90,6 +90,26 @@ either marked [% display_value("bug_status", "ASSIGNED") FILTER html %] or [% display_value("bug_status", "RESOLVED") FILTER html %]. </dd> + + <dt> + [% display_value("bug_status", "NEEDINFO") FILTER html %] + </dt> + <dd> + This [% terms.bug %] has an unclear description, or the + reporter didn't provide requested information. If no new + information is supplied, after some time the [% terms.bug %] + can be closed as + [% display_value("resolution", "ABANDONED") FILTER html %]. + </dd> + + <dt> + [% display_value("bug_status", "STAGED") FILTER html %] + </dt> + <dd> + This [% terms.bug %] has an experimental patch in + wine-staging for testing before integration into the + development branch. + </dd> </dl> </td> @@ -186,13 +206,12 @@ </dd> <dt> - [% display_value("resolution", "UPSTREAM") FILTER html %] + [% display_value("resolution", "NOTOURBUG") FILTER html %] </dt> <dd> The problem is not a [% terms.bug %] in Wine, but in some upstream software Wine depends on or broken packages in distributions. - Note: Most other bug trackers call this "NOTOURBUG". </dd> </dl> </td>

1 0

Andrey Gusev : Add Changed column to Regressions page.
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: bugzilla Branch: master Commit: c24896e1a8e5d1cbcf70aff9d063fdadb102d711 URL: https://source.winehq.org/git/bugzilla.git/?a=commit;h=c24896e1a8e5d1cbcf70… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Oct 15 14:54:29 2018 +0300 Add Changed column to Regressions page. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- template/en/default/global/sidebar.html.tmpl | 2 +- template/en/default/index.html.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/template/en/default/global/sidebar.html.tmpl b/template/en/default/global/sidebar.html.tmpl index fd0de99..453bf70 100644 --- a/template/en/default/global/sidebar.html.tmpl +++ b/template/en/default/global/sidebar.html.tmpl @@ -23,7 +23,7 @@ [% INCLUDE global/menu_start.html.tmpl bt = 'Task Lists' %] - <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&keywords=regression&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords_type=anywords">Regressions</a></li> + <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&keywords=regression&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc,changeddate&keywords_type=anywords">Regressions</a></li> <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&keywords=download&keywords_type=anywords">With download</a></li> <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&keywords=patch&keywords_type=anywords">With patch</a></li> [% INCLUDE global/menu_end.html.tmpl %] diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index d60c46a..7934785 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -150,7 +150,7 @@ YAHOO.util.Event.onDOMReady(onLoadActions); The bugs we are currently working on are organized into Task lists. <ol class="wine_index_list"> - <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords=regression&keywords_type=anywords">Regressions</a> + <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc,changeddate&keywords=regression&keywords_type=anywords">Regressions</a> Bugs introduced as result of a regression. </li>

1 0

Roger Zoellner : xaudio2: Don't return XAudio28 interface for XAudio2[0..7 ] objects in QueryInterface().
by Alexandre Julliard 15 Oct '18

15 Oct '18

Module: wine Branch: master Commit: a303f9cd101a06b7baf6302a90c8b3f6eb29a03c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a303f9cd101a06b7baf6302a… Author: Roger Zoellner <zoellner.roger(a)gmail.com> Date: Fri Oct 12 21:05:24 2018 +0200 xaudio2: Don't return XAudio28 interface for XAudio2[0..7] objects in QueryInterface(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43660 Signed-off-by: Roger Zoellner <zoellner.roger(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/tests/xaudio2.c | 3 +++ dlls/xaudio2_7/xaudio_dll.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 6609753..0c1d9a7 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -1273,6 +1273,9 @@ START_TEST(xaudio2) if(hr == S_OK){ xaudio27 = TRUE; + hr = IXAudio27_QueryInterface(xa27, &IID_IXAudio28, (void**) &xa); + ok(hr != S_OK, "QueryInterface with IID_IXAudio28 on IXAudio27 object returned success. Expected to fail\n"); + hr = IXAudio27_Initialize(xa27, 0, XAUDIO2_ANY_PROCESSOR); ok(hr == S_OK, "Initialize failed: %08x\n", hr); diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 28cf985..461ac56 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1262,7 +1262,9 @@ static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid, TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject); if(IsEqualGUID(riid, &IID_IUnknown) || +#if XAUDIO2_VER == 8 IsEqualGUID(riid, &IID_IXAudio28) || +#endif IsEqualGUID(riid, &IID_IXAudio2)) *ppvObject = &This->IXAudio2_iface; else if(IsEqualGUID(riid, &IID_IXAudio27)){

1 0

Akihiro Sagawa : kernel32: Fix LCMapString buffer calculation with LCMAP_KATAKANA and LCMAP_HALFWIDTH.
by Alexandre Julliard 15 Oct '18

15 Oct '18

Module: wine Branch: master Commit: b02cdd36150d7afc6cac52725e3b659db0ec68f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b02cdd36150d7afc6cac5272… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Oct 16 00:31:23 2018 +0900 kernel32: Fix LCMapString buffer calculation with LCMAP_KATAKANA and LCMAP_HALFWIDTH. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45982 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 10 +++++++++- dlls/kernel32/tests/locale.c | 1 - 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 0f37027..4d1eac6 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3557,8 +3557,16 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW else if (flags & LCMAP_HALFWIDTH) { for (len = 0; srclen; src++, srclen--, len++) - if (decompose_katakana(*src, NULL, 0) == 2) + { + WCHAR wch = *src; + /* map Hiragana to Katakana before decomposition if needed */ + if ((flags & LCMAP_KATAKANA) && + ((wch >= 0x3041 && wch <= 0x3096) || wch == 0x309D || wch == 0x309E)) + wch += 0x60; + + if (decompose_katakana(wch, NULL, 0) == 2) len++; + } } else len = srclen; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b8ced50..d3eb2ec 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2537,7 +2537,6 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f ok(!lstrcmpW(buf, halfwidth_text2), "%s string compare mismatch\n", func_name); ret2 = func_ptr(LCMAP_HALFWIDTH | LCMAP_KATAKANA, japanese_text, -1, NULL, 0); - todo_wine ok(ret == ret2, "%s ret %d, expected value %d\n", func_name, ret, ret2); /* test buffer overflow */

1 0

Akihiro Sagawa : kernel32/tests: Add LCMapString tests with a voiced consonant Hiragana character.
by Alexandre Julliard 15 Oct '18

15 Oct '18

Module: wine Branch: master Commit: 96b4a5a3563dfb0ec8e81e471a25ae1dbbcc7380 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96b4a5a3563dfb0ec8e81e47… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Oct 16 00:31:21 2018 +0900 kernel32/tests: Add LCMapString tests with a voiced consonant Hiragana character. Use U+3060 (HIRAGANA LETTER DA) in the test. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 85c468d..b8ced50 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2420,20 +2420,29 @@ typedef INT (*lcmapstring_wrapper)(DWORD, LPCWSTR, INT, LPWSTR, INT); static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *func_name) { const static WCHAR japanese_text[] = { - 0x3044, 0x309d, 0x3084, 0x3001, 0x30a4, 0x30fc, 0x30cf, - 0x30c8, 0x30fc, 0x30f4, 0x30a9, 0x306e, 0x2026, 0 + 0x3044, 0x309d, 0x3084, 0x3001, 0x30a4, 0x30fc, 0x30cf, 0x30c8, + 0x30fc, 0x30f4, 0x30a9, 0x306e, 0x91ce, 0x539f, 0x306f, 0x5e83, + 0x3044, 0x3093, 0x3060, 0x3088, 0x3002, 0 }; const static WCHAR hiragana_text[] = { - 0x3044, 0x309d, 0x3084, 0x3001, 0x3044, 0x30fc, 0x306f, - 0x3068, 0x30fc, 0x3094, 0x3049, 0x306e, 0x2026, 0 + 0x3044, 0x309d, 0x3084, 0x3001, 0x3044, 0x30fc, 0x306f, 0x3068, + 0x30fc, 0x3094, 0x3049, 0x306e, 0x91ce, 0x539f, 0x306f, 0x5e83, + 0x3044, 0x3093, 0x3060, 0x3088, 0x3002, 0 }; const static WCHAR katakana_text[] = { - 0x30a4, 0x30fd, 0x30e4, 0x3001, 0x30a4, 0x30fc, 0x30cf, - 0x30c8, 0x30fc, 0x30f4, 0x30a9, 0x30ce, 0x2026, 0 + 0x30a4, 0x30fd, 0x30e4, 0x3001, 0x30a4, 0x30fc, 0x30cf, 0x30c8, + 0x30fc, 0x30f4, 0x30a9, 0x30ce, 0x91ce, 0x539f, 0x30cf, 0x5e83, + 0x30a4, 0x30f3, 0x30c0, 0x30e8, 0x3002, 0 }; const static WCHAR halfwidth_text[] = { - 0x3044, 0x309d, 0x3084, 0xff64, 0xff72, 0xff70, 0xff8a, - 0xff84, 0xff70, 0xff73, 0xff9e, 0xff6b, 0x306e, 0x2026, 0 + 0x3044, 0x309d, 0x3084, 0xff64, 0xff72, 0xff70, 0xff8a, 0xff84, + 0xff70, 0xff73, 0xff9e, 0xff6b, 0x306e, 0x91ce, 0x539f, 0x306f, + 0x5e83, 0x3044, 0x3093, 0x3060, 0x3088, 0xff61, 0 + }; + const static WCHAR halfwidth_text2[] = { + 0xff72, 0x30fd, 0xff94, 0xff64, 0xff72, 0xff70, 0xff8a, 0xff84, + 0xff70, 0xff73, 0xff9e, 0xff6b, 0xff89, 0x91ce, 0x539f, 0xff8a, + 0x5e83, 0xff72, 0xff9d, 0xff80, 0xff9e, 0xff96, 0xff61, 0 }; int ret, ret2, i; WCHAR buf[256], buf2[256]; @@ -2520,6 +2529,17 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f ret2 = func_ptr(LCMAP_HALFWIDTH, japanese_text, -1, NULL, 0); ok(ret == ret2, "%s ret %d, expected value %d\n", func_name, ret, ret2); + /* test LCMAP_HALFWIDTH | LCMAP_KATAKANA + (hiragana character is converted into half-width katakana) */ + ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_KATAKANA, japanese_text, -1, buf, ARRAY_SIZE(buf)); + ok(ret == lstrlenW(halfwidth_text2) + 1, "%s ret %d, error %d, expected value %d\n", func_name, + ret, GetLastError(), lstrlenW(halfwidth_text2) + 1); + ok(!lstrcmpW(buf, halfwidth_text2), "%s string compare mismatch\n", func_name); + + ret2 = func_ptr(LCMAP_HALFWIDTH | LCMAP_KATAKANA, japanese_text, -1, NULL, 0); + todo_wine + ok(ret == ret2, "%s ret %d, expected value %d\n", func_name, ret, ret2); + /* test buffer overflow */ SetLastError(0xdeadbeef); ret = func_ptr(LCMAP_UPPERCASE,

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2018