April 2019 - Wine-Commits - list.winehq.org

Nikolay Sivov : dbgeng: Partially implement GetModuleNameString().
by Alexandre Julliard April 23, 2019

April 23, 2019

Module: wine Branch: master Commit: 64aa7f61ad3c5c5517848e9c1c432a0f10fffc4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=64aa7f61ad3c5c5517848e9c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 23 10:38:18 2019 +0300 dbgeng: Partially implement GetModuleNameString(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 62 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/dbgeng/tests/dbgeng.c | 27 +++++++++++++++++--- include/dbgeng.h | 8 ++++++ 3 files changed, 92 insertions(+), 5 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index a62c052..704084c 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -42,6 +42,7 @@ extern NTSTATUS WINAPI NtResumeProcess(HANDLE handle); struct module_info { DEBUG_MODULE_PARAMETERS params; + char image_name[MAX_PATH]; }; struct target_process @@ -136,6 +137,9 @@ static HRESULT debug_target_init_modules_info(struct target_process *target) target->modules.info[i].params.Base = (ULONG_PTR)info.lpBaseOfDll; target->modules.info[i].params.Size = info.SizeOfImage; + + GetModuleFileNameExA(target->handle, modules[i], target->modules.info[i].image_name, + ARRAY_SIZE(target->modules.info[i].image_name)); } } @@ -1448,13 +1452,67 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleVersionInformation(IDebug return E_NOTIMPL; } +static HRESULT debug_target_return_string(const char *str, char *buffer, unsigned int buffer_size, + unsigned int *size) +{ + unsigned int len = strlen(str), dst_len; + + if (size) + *size = len + 1; + + if (buffer && buffer_size) + { + dst_len = min(len, buffer_size - 1); + if (dst_len) + memcpy(buffer, str, dst_len); + buffer[dst_len] = 0; + } + + return len < buffer_size ? S_OK : S_FALSE; +} + static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNameString(IDebugSymbols3 *iface, ULONG which, ULONG index, ULONG64 base, char *buffer, ULONG buffer_size, ULONG *name_size) { - FIXME("%p, %u, %u, %s, %p, %u, %p stub.\n", iface, which, index, wine_dbgstr_longlong(base), buffer, buffer_size, + struct debug_client *debug_client = impl_from_IDebugSymbols3(iface); + const struct module_info *info; + struct target_process *target; + HRESULT hr; + + TRACE("%p, %u, %u, %s, %p, %u, %p.\n", iface, which, index, wine_dbgstr_longlong(base), buffer, buffer_size, name_size); - return E_NOTIMPL; + if (!(target = debug_client_get_target(debug_client))) + return E_UNEXPECTED; + + if (index == DEBUG_ANY_ID) + info = debug_target_get_module_info_by_base(target, base); + else + info = debug_target_get_module_info(target, index); + + if (!info) + { + WARN("Was unable to locate module.\n"); + return E_INVALIDARG; + } + + switch (which) + { + case DEBUG_MODNAME_IMAGE: + hr = debug_target_return_string(info->image_name, buffer, buffer_size, name_size); + break; + case DEBUG_MODNAME_MODULE: + case DEBUG_MODNAME_LOADED_IMAGE: + case DEBUG_MODNAME_SYMBOL_FILE: + case DEBUG_MODNAME_MAPPED_IMAGE: + FIXME("Unsupported name info %d.\n", which); + return E_NOTIMPL; + default: + WARN("Unknown name info %d.\n", which); + return E_INVALIDARG; + } + + return hr; } static HRESULT STDMETHODCALLTYPE debugsymbols_GetConstantName(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id, diff --git a/dlls/dbgeng/tests/dbgeng.c b/dlls/dbgeng/tests/dbgeng.c index 32f9001..715649b 100644 --- a/dlls/dbgeng/tests/dbgeng.c +++ b/dlls/dbgeng/tests/dbgeng.c @@ -326,11 +326,11 @@ static void test_module_information(void) DEBUG_MODULE_PARAMETERS params[2]; IDebugDataSpaces *dataspaces; PROCESS_INFORMATION info; - IDebugSymbols *symbols; + IDebugSymbols2 *symbols; IDebugControl *control; ULONG64 bases[2], base; + char buffer[MAX_PATH]; IDebugClient *client; - char buffer[64]; HANDLE event; HRESULT hr; BOOL ret; @@ -341,7 +341,7 @@ static void test_module_information(void) hr = client->lpVtbl->QueryInterface(client, &IID_IDebugControl, (void **)&control); ok(hr == S_OK, "Failed to get interface pointer, hr %#x.\n", hr); - hr = client->lpVtbl->QueryInterface(client, &IID_IDebugSymbols, (void **)&symbols); + hr = client->lpVtbl->QueryInterface(client, &IID_IDebugSymbols2, (void **)&symbols); ok(hr == S_OK, "Failed to get interface pointer, hr %#x.\n", hr); hr = client->lpVtbl->QueryInterface(client, &IID_IDebugDataSpaces, (void **)&dataspaces); @@ -432,6 +432,27 @@ static void test_module_information(void) hr = symbols->lpVtbl->GetModuleParameters(symbols, 1, NULL, loaded, params); ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + /* Image name. */ + hr = symbols->lpVtbl->GetModuleNameString(symbols, DEBUG_MODNAME_IMAGE, 0, 0, buffer, sizeof(buffer), &length); + ok(hr == S_OK, "Failed to get image name, hr %#x.\n", hr); + ok(strlen(buffer) + 1 == length, "Unexpected length.\n"); + + hr = symbols->lpVtbl->GetModuleNameString(symbols, DEBUG_MODNAME_IMAGE, 0, 0, NULL, sizeof(buffer), &length); + ok(hr == S_OK, "Failed to get image name, hr %#x.\n", hr); + ok(length > 0, "Unexpected length.\n"); + + hr = symbols->lpVtbl->GetModuleNameString(symbols, DEBUG_MODNAME_IMAGE, DEBUG_ANY_ID, base, buffer, sizeof(buffer), + &length); + ok(hr == S_OK, "Failed to get image name, hr %#x.\n", hr); + ok(strlen(buffer) + 1 == length, "Unexpected length.\n"); + + hr = symbols->lpVtbl->GetModuleNameString(symbols, DEBUG_MODNAME_IMAGE, 0, 0, buffer, length - 1, &length); + ok(hr == S_FALSE, "Failed to get image name, hr %#x.\n", hr); + ok(strlen(buffer) + 2 == length, "Unexpected length %u, %u.\n", length, strlen(buffer)); + + hr = symbols->lpVtbl->GetModuleNameString(symbols, DEBUG_MODNAME_IMAGE, 0, 0, NULL, length - 1, NULL); + ok(hr == S_FALSE, "Failed to get image name, hr %#x.\n", hr); + /* Read memory. */ base = 0; hr = symbols->lpVtbl->GetModuleByIndex(symbols, 0, &base); diff --git a/include/dbgeng.h b/include/dbgeng.h index f50a1ca..3017eda 100644 --- a/include/dbgeng.h +++ b/include/dbgeng.h @@ -162,7 +162,15 @@ DEFINE_GUID(IID_IDebugSystemObjects3, 0xe9676e2f, 0xe286, 0x4ea3, 0xb0, 0xf9 #define DEBUG_CDS_REFRESH_INLINESTEP 16 #define DEBUG_CDS_REFRESH_INLINESTEP_PSEUDO 17 +/* GetModuleNameString() indices */ +#define DEBUG_MODNAME_IMAGE 0 +#define DEBUG_MODNAME_MODULE 1 +#define DEBUG_MODNAME_LOADED_IMAGE 2 +#define DEBUG_MODNAME_SYMBOL_FILE 3 +#define DEBUG_MODNAME_MAPPED_IMAGE 4 + #define DEBUG_INVALID_OFFSET ((ULONG64)-1) +#define DEBUG_ANY_ID 0xffffffff typedef struct _DEBUG_MODULE_PARAMETERS {

1 0

Vijay Kiran Kamuju : kernel/nls: Add LOCALE_SMONTHDAY to all supported languages.
by Alexandre Julliard April 23, 2019

April 23, 2019

1 0

Vijay Kiran Kamuju : kernel/nls: Fix LOCALE_SLONGDATE and LOCALE_SYEARMONTH for some chinese locales.
by Alexandre Julliard April 23, 2019

April 23, 2019

Module: wine Branch: master Commit: 568609f051acbd147529dfe74854757831058267 URL: https://source.winehq.org/git/wine.git/?a=commit;h=568609f051acbd147529dfe7… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Apr 23 11:17:23 2019 +0200 kernel/nls: Fix LOCALE_SLONGDATE and LOCALE_SYEARMONTH for some chinese locales. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/zhh.nls | 4 ++-- dlls/kernel32/nls/zhi.nls | 4 ++-- dlls/kernel32/nls/zhm.nls | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/nls/zhh.nls b/dlls/kernel32/nls/zhh.nls index 720261c..9da553c 100644 --- a/dlls/kernel32/nls/zhh.nls +++ b/dlls/kernel32/nls/zhh.nls @@ -106,7 +106,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG LOCALE_SISO639LANGNAME "zh" LOCALE_SLANGUAGE "Chinese (Hong Kong S.A.R.)" LOCALE_SLIST "," - LOCALE_SLONGDATE "dddd, d MMMM, yyyy" + LOCALE_SLONGDATE "yyyy'年'M'月'd'日'" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" LOCALE_SMONTHDAY "M'月'd'日'" @@ -149,7 +149,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG LOCALE_STHOUSAND "," LOCALE_STIME ":" LOCALE_STIMEFORMAT "H:mm:ss" - LOCALE_SYEARMONTH "MMMM, yyyy" + LOCALE_SYEARMONTH "yyyy'年'M'月'" LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" diff --git a/dlls/kernel32/nls/zhi.nls b/dlls/kernel32/nls/zhi.nls index 2017b87..389b8eb 100644 --- a/dlls/kernel32/nls/zhi.nls +++ b/dlls/kernel32/nls/zhi.nls @@ -106,7 +106,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE LOCALE_SISO639LANGNAME "zh" LOCALE_SLANGUAGE "Chinese (Singapore)" LOCALE_SLIST "," - LOCALE_SLONGDATE "dddd, d MMMM, yyyy" + LOCALE_SLONGDATE "yyyy'年'M'月'd'日'" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" LOCALE_SMONTHDAY "M'月'd'日'" @@ -149,7 +149,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE LOCALE_STHOUSAND "," LOCALE_STIME ":" LOCALE_STIMEFORMAT "tt h:mm:ss" - LOCALE_SYEARMONTH "MMMM, yyyy" + LOCALE_SYEARMONTH "yyyy'年'M'月'" LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" diff --git a/dlls/kernel32/nls/zhm.nls b/dlls/kernel32/nls/zhm.nls index c9a6f14..009fb93 100644 --- a/dlls/kernel32/nls/zhm.nls +++ b/dlls/kernel32/nls/zhm.nls @@ -106,7 +106,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_MACAU LOCALE_SISO639LANGNAME "zh" LOCALE_SLANGUAGE "Chinese (Macau S.A.R.)" LOCALE_SLIST "," - LOCALE_SLONGDATE "dddd, d MMMM, yyyy" + LOCALE_SLONGDATE "yyyy'年'M'月'd'日'" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" LOCALE_SMONTHDAY "M'月'd'日'" @@ -149,7 +149,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_MACAU LOCALE_STHOUSAND "," LOCALE_STIME ":" LOCALE_STIMEFORMAT "H:mm:ss" - LOCALE_SYEARMONTH "MMMM, yyyy" + LOCALE_SYEARMONTH "yyyy'年'M'月'" LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe"

1 0

Vijay Kiran Kamuju : kernel/nls: Fix LOCALE_SABBREVCTRYNAME for Serbian.
by Alexandre Julliard April 23, 2019

April 23, 2019

Module: wine Branch: master Commit: 57d6c541b93bf82919a9862cd36f038a24e6a80b URL: https://source.winehq.org/git/wine.git/?a=commit;h=57d6c541b93bf82919a9862c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Apr 23 15:31:14 2019 +0200 kernel/nls: Fix LOCALE_SABBREVCTRYNAME for Serbian. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/srb.nls | 2 +- dlls/kernel32/nls/srl.nls | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/nls/srb.nls b/dlls/kernel32/nls/srb.nls index 4d1049b..8664244 100644 --- a/dlls/kernel32/nls/srb.nls +++ b/dlls/kernel32/nls/srb.nls @@ -64,7 +64,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC LOCALE_ITLZERO "0" LOCALE_S1159 "" LOCALE_S2359 "" - LOCALE_SABBREVCTRYNAME "SPB" + LOCALE_SABBREVCTRYNAME "SRB" LOCALE_SABBREVDAYNAME1 "пон" LOCALE_SABBREVDAYNAME2 "уто" LOCALE_SABBREVDAYNAME3 "сре" diff --git a/dlls/kernel32/nls/srl.nls b/dlls/kernel32/nls/srl.nls index fb6ba8b..0c4b2f5 100644 --- a/dlls/kernel32/nls/srl.nls +++ b/dlls/kernel32/nls/srl.nls @@ -64,7 +64,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN LOCALE_ITLZERO "0" LOCALE_S1159 "" LOCALE_S2359 "" - LOCALE_SABBREVCTRYNAME "SPB" + LOCALE_SABBREVCTRYNAME "SRB" LOCALE_SABBREVDAYNAME1 "pon" LOCALE_SABBREVDAYNAME2 "uto" LOCALE_SABBREVDAYNAME3 "sre"

1 0

Akihiro Sagawa : comctl32/tests: Use GREEK_CHARSET in margin tests to avoid Associated Charset feature.
by Alexandre Julliard April 23, 2019

April 23, 2019

Module: wine Branch: master Commit: 48d86f8931d9e3673f31e4584773abdc2d98b967 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48d86f8931d9e3673f31e458… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 23 22:01:31 2019 +0900 comctl32/tests: Use GREEK_CHARSET in margin tests to avoid Associated Charset feature. Due to Associated Charset feature, we currently use Chinese typeface in the test in zh_CN locale. For consistency with another locale, we should avoid the fature in tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index bc44d0c..64d2fe8 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1699,7 +1699,7 @@ static void test_margins_font_change(void) memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, "Arial"); lf.lfHeight = 16; - lf.lfCharSet = DEFAULT_CHARSET; + lf.lfCharSet = GREEK_CHARSET; /* to avoid associated charset feature */ hfont = CreateFontIndirectA(&lf); lf.lfHeight = 30; hfont2 = CreateFontIndirectA(&lf);

1 0

Akihiro Sagawa : comctl32/tests: Skip margin tests if a font for the target charset isn't available.
by Alexandre Julliard April 23, 2019

April 23, 2019

Module: wine Branch: master Commit: a0e6d45519ff440a060311a865f32c7bfb3ad2a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0e6d45519ff440a060311a8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 23 22:01:33 2019 +0900 comctl32/tests: Skip margin tests if a font for the target charset isn't available. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 64d2fe8..3e0239c 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1490,6 +1490,7 @@ static void test_margins_usefontinfo(UINT charset) INT margins, threshold, expect, empty_expect, small_expect; HWND hwnd; HDC hdc; + TEXTMETRICW tm; SIZE size; BOOL cjk; LOGFONTA lf; @@ -1513,7 +1514,16 @@ static void test_margins_usefontinfo(UINT charset) hdc = GetDC(hwnd); hfont = SelectObject(hdc, hfont); - size.cx = GdiGetCharDimensions( hdc, NULL, &size.cy ); + size.cx = GdiGetCharDimensions( hdc, &tm, &size.cy ); + if ((charset != tm.tmCharSet && charset != DEFAULT_CHARSET) || + !(tm.tmPitchAndFamily & (TMPF_TRUETYPE | TMPF_VECTOR))) { + skip("%s for charset %d isn't available\n", lf.lfFaceName, charset); + hfont = SelectObject(hdc, hfont); + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + DeleteObject(hfont); + return; + } expect = MAKELONG(size.cx / 2, size.cx / 2); small_expect = 0; empty_expect = size.cx >= 28 ? small_expect : expect;

1 0

Alexandre Julliard : wbemprox: Use %define parse.error verbose instead of %error-verbose.
by Alexandre Julliard April 23, 2019

April 23, 2019

Module: wine Branch: master Commit: 6d4cdeb658e1cfd7c73643f674a0043006970b44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d4cdeb658e1cfd7c73643f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 23 11:47:59 2019 +0200 wbemprox: Use %define parse.error verbose instead of %error-verbose. The latter is deprecated and causes warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/wql.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 0c48c98..75ce5b0 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -187,7 +187,7 @@ static int wql_lex( void *val, struct parser *parser ); %lex-param { struct parser *ctx } %parse-param { struct parser *ctx } -%error-verbose +%define parse.error verbose %pure-parser %union

1 0

Alexandre Julliard : ntdll: Use the correct type for %llu scanf format.
by Alexandre Julliard April 23, 2019

April 23, 2019

Module: wine Branch: master Commit: 70d17d39295f10e5eec4739e525128b850107272 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70d17d39295f10e5eec4739e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 23 17:10:47 2019 +0200 ntdll: Use the correct type for %llu scanf format. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index c8794e5..d03c0a1 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2321,7 +2321,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( if ((fp = fopen("/proc/meminfo", "r"))) { - ULONG64 totalram, freeram, totalswap, freeswap; + unsigned long long totalram, freeram, totalswap, freeswap; char line[64]; while (fgets(line, sizeof(line), fp)) {

1 0

Alexandre Julliard : d3dcompiler: Use %define parse.error verbose instead of %error-verbose.
by Alexandre Julliard April 23, 2019

April 23, 2019

Module: wine Branch: master Commit: 2d27c13d5ea76ec80e2a67272c8eafe8527e6af0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d27c13d5ea76ec80e2a6727… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 23 11:47:53 2019 +0200 d3dcompiler: Use %define parse.error verbose instead of %error-verbose. The latter is deprecated and causes warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index c2c415f..358ed96 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -903,7 +903,7 @@ static const struct hlsl_ir_function_decl *get_overloaded_func(struct wine_rb_tr %} %locations -%error-verbose +%define parse.error verbose %expect 1 %union

1 0

Alexandre Julliard : widl: Use %define parse.error verbose instead of %error-verbose.
by Alexandre Julliard April 23, 2019

April 23, 2019

Module: wine Branch: master Commit: 5ea4d5971bff3430c29f1da31166b0a2565347ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ea4d5971bff3430c29f1da3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 23 11:47:22 2019 +0200 widl: Use %define parse.error verbose instead of %error-verbose. The latter is deprecated and causes warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5156dce..dd676e9 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -318,7 +318,7 @@ static typelib_t *current_typelib; %right '!' '~' CAST PPTR POS NEG ADDRESSOF tSIZEOF %left '.' MEMBERPTR '[' ']' -%error-verbose +%define parse.error verbose %%

1 0