August 2022 - Wine-Commits - list.winehq.org

Eric Pouech : msvcrt: Improve support for template in methods.
by Alexandre Julliard Aug. 31, 2022

Aug. 31, 2022

Module: wine Branch: master Commit: 507a02c1d39507207b8a1b485a9fbcb451635409 URL: https://gitlab.winehq.org/wine/wine/-/commit/507a02c1d39507207b8a1b485a9fbc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Aug 31 10:39:16 2022 +0200 msvcrt: Improve support for template in methods. Adding function template support for methods that need specific post processing in demangling (constructor, destructor, cast operator) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/tests/cpp.c | 4 ++++ dlls/msvcrt/undname.c | 48 ++++++++++++++++++++++-------------------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 90f3d6a9d6a..04573aa3d65 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1297,6 +1297,10 @@ static void test_demangle(void) /* 135 */ {"?x@@3PAY02HA", "int (* x)[3]"}, /* 136 */ {"?Qux(a)Bar@@0PAPAP6AHPAV1(a)AAH1PAH@ZA", "private: static int (__cdecl** * Bar::Qux)(class Bar *,int &,int &,int *)"}, /* variation of 105: note white space handling! */ +/* 137 */ {"?x@@3PAW4myenum@@A", "enum myenum * x"}, +/* 138 */ {"?pfunc@@3PAY0E(a)P6AXF@ZA", "void (__cdecl*(* pfunc)[4])(short)"}, +/* 139 */ {"??$?0AEAVzzz(a)BB4@AA@@AEAV012@$0A@@?$pair(a)Vzzz@BB4(a)AA@@V123@@std@@QEAA(a)AEAVzzz@BB4(a)AA@@0(a)Z", + "public: __cdecl std::pair<class AA::BB4::zzz,class AA::BB4::zzz>::pair<class AA::BB4::zzz,class AA::BB4::zzz><class AA::BB4::zzz & __ptr64,class AA::BB4::zzz & __ptr64,0>(class AA::BB4::zzz & __ptr64,class AA::BB4::zzz & __ptr64) __ptr64"}, }; int i, num_test = ARRAY_SIZE(test); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 7daae616efd..de07dd3ac24 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -452,7 +452,7 @@ static BOOL get_modifier(struct parsed_symbol *sym, struct datatype_t *xdt) } static BOOL get_modified_type(struct datatype_t *ct, struct parsed_symbol* sym, - struct array *pmt_ref, char modif, BOOL in_args) + struct array *pmt_ref, char modif) { struct datatype_t xdt; const char* ref; @@ -860,17 +860,17 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, } else { - if (!get_modified_type(ct, sym, pmt_ref, '?', in_args)) goto done; + if (!get_modified_type(ct, sym, pmt_ref, '?')) goto done; } break; case 'A': /* reference */ case 'B': /* volatile reference */ - if (!get_modified_type(ct, sym, pmt_ref, dt, in_args)) goto done; + if (!get_modified_type(ct, sym, pmt_ref, dt)) goto done; break; case 'Q': /* const pointer */ case 'R': /* volatile pointer */ case 'S': /* const volatile pointer */ - if (!get_modified_type(ct, sym, pmt_ref, in_args ? dt : 'P', in_args)) goto done; + if (!get_modified_type(ct, sym, pmt_ref, in_args ? dt : 'P')) goto done; break; case 'P': /* Pointer */ if (isdigit(*sym->current)) @@ -941,7 +941,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, } else goto done; } - else if (!get_modified_type(ct, sym, pmt_ref, 'P', in_args)) goto done; + else if (!get_modified_type(ct, sym, pmt_ref, 'P')) goto done; break; case 'W': if (*sym->current == '4') @@ -1050,7 +1050,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, else if (*sym->current == 'Q') { sym->current++; - if (!get_modified_type(ct, sym, pmt_ref, '$', in_args)) goto done; + if (!get_modified_type(ct, sym, pmt_ref, '$')) goto done; } break; } @@ -1361,7 +1361,6 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) { BOOL ret = FALSE; unsigned do_after = 0; - static CHAR dashed_null[] = "--null--"; /* FIXME seems wrong as name, as it demangles a simple data type */ if (sym->flags & UNDNAME_NO_ARGUMENTS) @@ -1384,18 +1383,19 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) if (*sym->current == '?') { const char* function_name = NULL; + BOOL in_template = FALSE; if (sym->current[1] == '$' && sym->current[2] == '?') { - do_after = 5; + in_template = TRUE; sym->current += 2; } /* C++ operator code (one character, or two if the first is '_') */ switch (*++sym->current) { - case '0': do_after = 1; break; - case '1': do_after = 2; break; + case '0': function_name = ""; do_after = 1; break; + case '1': function_name = ""; do_after = 2; break; case '2': function_name = "operator new"; break; case '3': function_name = "operator delete"; break; case '4': function_name = "operator="; break; @@ -1530,26 +1530,22 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) return FALSE; } sym->current++; + if (in_template) + { + const char *args; + struct array array_pmt; + + str_array_init(&array_pmt); + args = get_args(sym, &array_pmt, FALSE, '<', '>'); + if (args) function_name = function_name ? str_printf(sym, "%s%s", function_name, args) : args; + sym->names.num = 0; + } switch (do_after) { - case 1: case 2: - if (!str_array_push(sym, dashed_null, -1, &sym->stack)) - return FALSE; - break; case 4: sym->result = (char*)function_name; ret = TRUE; goto done; - case 5: - { - char *args; - struct array array_pmt; - - str_array_init(&array_pmt); - args = get_args(sym, &array_pmt, FALSE, '<', '>'); - if (args != NULL) function_name = str_printf(sym, "%s%s", function_name, args); - sym->names.num = 0; - } /* fall through */ default: if (!str_array_push(sym, function_name, -1, &sym->stack)) @@ -1584,9 +1580,9 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) /* it's time to set the member name for ctor & dtor */ if (sym->stack.num <= 1) goto done; if (do_after == 1) - sym->stack.elts[0] = sym->stack.elts[1]; + sym->stack.elts[0] = str_printf(sym, "%s%s", sym->stack.elts[1], sym->stack.elts[0]); else - sym->stack.elts[0] = str_printf(sym, "~%s", sym->stack.elts[1]); + sym->stack.elts[0] = str_printf(sym, "~%s%s", sym->stack.elts[1], sym->stack.elts[0]); /* ctors and dtors don't have return type */ sym->flags |= UNDNAME_NO_FUNCTION_RETURNS; break;

1 0

Eric Pouech : msvcrt: Correctly support space generation in pointers.
by Alexandre Julliard Aug. 31, 2022

Aug. 31, 2022

Module: wine Branch: master Commit: 766085edd2491b42fa743229437d159f2ad4156a URL: https://gitlab.winehq.org/wine/wine/-/commit/766085edd2491b42fa743229437d15… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Aug 31 10:39:16 2022 +0200 msvcrt: Correctly support space generation in pointers. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/tests/cpp.c | 2 ++ dlls/msvcrt/undname.c | 53 ++++++++++++++++++++++++------------------------- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 58ecd1327a5..90f3d6a9d6a 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1295,6 +1295,8 @@ static void test_demangle(void) /* 132 */ {"??$meth(a)FD@DD(a)CC@@QAE_NK(a)Z", "public: bool __thiscall CC::DD::meth<short,char>(unsigned long)"}, /* 133 */ {"?func@@YAXPIFAH(a)Z", "void __cdecl func(int __unaligned * __restrict)"}, /* 135 */ {"?x@@3PAY02HA", "int (* x)[3]"}, +/* 136 */ {"?Qux(a)Bar@@0PAPAP6AHPAV1(a)AAH1PAH@ZA", + "private: static int (__cdecl** * Bar::Qux)(class Bar *,int &,int &,int *)"}, /* variation of 105: note white space handling! */ }; int i, num_test = ARRAY_SIZE(test); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index acfe96fe436..7daae616efd 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -77,11 +77,17 @@ struct parsed_symbol unsigned avail_in_first; /* number of available bytes in head block */ }; +enum datatype_e +{ + DT_NO_LEADING_WS = 0x01, +}; + /* Type for parsing mangled types */ struct datatype_t { const char* left; const char* right; + enum datatype_e flags; }; static BOOL symbol_demangle(struct parsed_symbol* sym); @@ -407,6 +413,7 @@ static void append_extended_modifier(struct parsed_symbol *sym, const char **whe static void get_extended_modifier(struct parsed_symbol *sym, struct datatype_t *xdt) { xdt->left = xdt->right = NULL; + xdt->flags = 0; for (;;) { switch (*sym->current) @@ -455,25 +462,24 @@ static BOOL get_modified_type(struct datatype_t *ct, struct parsed_symbol* sym, switch (modif) { - case 'A': ref = "&"; str_modif = NULL; break; - case 'B': ref = "&"; str_modif = "volatile"; break; - case 'P': ref = "*"; str_modif = NULL; break; - case 'Q': ref = "*"; str_modif = "const"; break; - case 'R': ref = "*"; str_modif = "volatile"; break; - case 'S': ref = "*"; str_modif = "const volatile"; break; - case '?': ref = NULL; str_modif = NULL; break; - case '$': ref = "&&"; str_modif = NULL; break; + case 'A': ref = " &"; str_modif = NULL; break; + case 'B': ref = " &"; str_modif = " volatile"; break; + case 'P': ref = " *"; str_modif = NULL; break; + case 'Q': ref = " *"; str_modif = " const"; break; + case 'R': ref = " *"; str_modif = " volatile"; break; + case 'S': ref = " *"; str_modif = " const volatile"; break; + case '?': ref = NULL; str_modif = NULL; break; + case '$': ref = " &&"; str_modif = NULL; break; default: return FALSE; } if (ref || str_modif || xdt.left || xdt.right) - ct->left = str_printf(sym, " %s%s%s%s%s%s%s", - xdt.left, - xdt.left && ref ? " " : NULL, ref, - (xdt.left || ref) && xdt.right ? " " : NULL, xdt.right, - (xdt.left || ref || xdt.right) && str_modif ? " " : NULL, str_modif); + ct->left = str_printf(sym, "%s%s%s%s%s%s", + xdt.left ? " " : NULL, xdt.left, ref, + xdt.right ? " " : NULL, xdt.right, str_modif); else ct->left = NULL; ct->right = NULL; + ct->flags = 0; if (get_modifier(sym, &xdt)) { @@ -490,10 +496,7 @@ static BOOL get_modified_type(struct datatype_t *ct, struct parsed_symbol* sym, if (!(n1 = get_number(sym))) return FALSE; num = atoi(n1); - if (ct->left && ct->left[0] == ' ' && !xdt.left) - ct->left++; - - ct->left = str_printf(sym, " (%s%s", xdt.left, ct->left); + ct->left = str_printf(sym, " (%s%s", xdt.left, ct->left && !xdt.left ? ct->left + 1 : ct->left); ct->right = ")"; xdt.left = NULL; @@ -504,15 +507,9 @@ static BOOL get_modified_type(struct datatype_t *ct, struct parsed_symbol* sym, /* Recurse to get the referred-to type */ if (!demangle_datatype(sym, &sub_ct, pmt_ref, FALSE)) return FALSE; - if (xdt.left) - ct->left = str_printf(sym, "%s %s%s", sub_ct.left, xdt.left, ct->left); - else - { - /* don't insert a space between duplicate '*' */ - if (!in_args && ct->left && ct->left[0] && ct->left[1] == '*' && sub_ct.left[strlen(sub_ct.left)-1] == '*') - ct->left++; - ct->left = str_printf(sym, "%s%s", sub_ct.left, ct->left); - } + if (sub_ct.flags & DT_NO_LEADING_WS) + ct->left++; + ct->left = str_printf(sym, "%s%s%s%s", sub_ct.left, xdt.left ? " " : NULL, xdt.left, ct->left); if (sub_ct.right) ct->right = str_printf(sym, "%s%s", ct->right, sub_ct.right); sym->stack.num = mark; } @@ -814,7 +811,8 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, assert(ct); ct->left = ct->right = NULL; - + ct->flags = 0; + switch (dt = *sym->current++) { case '_': @@ -938,6 +936,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, ct->left = str_printf(sym, "%s%s (%s*", sub_ct.left, sub_ct.right, call_conv); + ct->flags = DT_NO_LEADING_WS; ct->right = str_printf(sym, ")%s", args); } else goto done;

1 0

Eric Pouech : msvcrt: Fix white space output for typecast operator.
by Alexandre Julliard Aug. 31, 2022

Aug. 31, 2022

Module: wine Branch: master Commit: 5e37bcf7940ab16e6098cb91e8f21ae688d6dea4 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e37bcf7940ab16e6098cb91e8f21a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Aug 31 10:39:16 2022 +0200 msvcrt: Fix white space output for typecast operator. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/tests/cpp.c | 3 +++ dlls/msvcrt/undname.c | 54 ++++++++++++++++++++++++++++--------------------- 2 files changed, 34 insertions(+), 23 deletions(-)

1 0

Alistair Leslie-Hughes : winepulse: Use the predicate to terminate the connect cond_wait loop.
by Alexandre Julliard Aug. 31, 2022

Aug. 31, 2022

Module: wine Branch: master Commit: 4e1b7cec167a836dbbe5780a1664e28afd3f9146 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e1b7cec167a836dbbe5780a1664e2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Aug 28 09:51:25 2022 +1000 winepulse: Use the predicate to terminate the connect cond_wait loop. --- dlls/winepulse.drv/pulse.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 463f4c28d00..a75184e712a 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -363,6 +363,8 @@ static BOOL pulse_stream_valid(struct pulse_stream *stream) static HRESULT pulse_connect(const char *name) { + pa_context_state_t state; + if (pulse_ctx && PA_CONTEXT_IS_GOOD(pa_context_get_state(pulse_ctx))) return S_OK; if (pulse_ctx) @@ -381,15 +383,12 @@ static HRESULT pulse_connect(const char *name) goto fail; /* Wait for connection */ - while (pulse_cond_wait()) { - pa_context_state_t state = pa_context_get_state(pulse_ctx); - - if (state == PA_CONTEXT_FAILED || state == PA_CONTEXT_TERMINATED) - goto fail; + while ((state = pa_context_get_state(pulse_ctx)) != PA_CONTEXT_READY && + state != PA_CONTEXT_FAILED && state != PA_CONTEXT_TERMINATED) + pulse_cond_wait(); - if (state == PA_CONTEXT_READY) - break; - } + if (state != PA_CONTEXT_READY) + goto fail; TRACE("Connected to server %s with protocol version: %i.\n", pa_context_get_server(pulse_ctx),

1 0

Nikolay Sivov : mshtml/tests: Fix a typo in test message (Coverity).
by Alexandre Julliard Aug. 31, 2022

Aug. 31, 2022

Module: wine Branch: master Commit: 3a481200a488aa0157eec455f228790076cd3b24 URL: https://gitlab.winehq.org/wine/wine/-/commit/3a481200a488aa0157eec455f22879… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 31 09:59:53 2022 +0300 mshtml/tests: Fix a typo in test message (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mshtml/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/misc.c b/dlls/mshtml/tests/misc.c index c2c8370cc4b..5f38f9d45fb 100644 --- a/dlls/mshtml/tests/misc.c +++ b/dlls/mshtml/tests/misc.c @@ -223,7 +223,7 @@ static void test_HTMLStorage(void) hres = IHTMLStorage_get_length(storage, &length); ok(hres == S_OK, "get_length failed %08lx\n", hres); - ok(length >= 0, "length = %ld\n", lval); + ok(length >= 0, "length = %ld\n", length); value = SysAllocString(L"null"); hres = IHTMLStorage_setItem(storage, key, value);

1 0

Nikolay Sivov : win32u/hook: Fix a leak on earlier return (Coverity).
by Alexandre Julliard Aug. 31, 2022

Aug. 31, 2022

Module: wine Branch: master Commit: 114a06364b8c163b790aadbb02c8b999e2109ef1 URL: https://gitlab.winehq.org/wine/wine/-/commit/114a06364b8c163b790aadbb02c8b9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 31 10:18:40 2022 +0300 win32u/hook: Fix a leak on earlier return (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/win32u/hook.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/win32u/hook.c b/dlls/win32u/hook.c index 53b98108acc..666e2a844df 100644 --- a/dlls/win32u/hook.c +++ b/dlls/win32u/hook.c @@ -302,6 +302,7 @@ static LRESULT call_hook( struct win_hook_params *info, const WCHAR *module ) if (thread_info->hook_call_depth >= 25) { WARN("Too many hooks called recursively, skipping call.\n"); + if (params != info) free( params ); return 0; }

1 0

Nikolay Sivov : evr/filter: Initialize interface pointer in GetService() (Coverity).
by Alexandre Julliard Aug. 31, 2022

Aug. 31, 2022

Module: wine Branch: master Commit: 9d58733b3b646c853c40d3a018602141da5f8ad1 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d58733b3b646c853c40d3a0186021… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 31 09:53:26 2022 +0300 evr/filter: Initialize interface pointer in GetService() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/evr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index d45bd361aff..1b2930c500a 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -437,7 +437,7 @@ static HRESULT WINAPI filter_get_service_GetService(IMFGetService *iface, REFGUI { struct evr *filter = impl_from_IMFGetService(iface); HRESULT hr = E_NOINTERFACE; - IMFGetService *gs; + IMFGetService *gs = NULL; TRACE("iface %p, service %s, riid %s, obj %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj);

1 0

Nikolay Sivov : mfsrcsnk/wave: Initialize buffer pointer in ProcessSample() (Coverity).
by Alexandre Julliard Aug. 31, 2022

Aug. 31, 2022

Module: wine Branch: master Commit: bc05d15cf1099d37cc76b3a24c7977911f8a6736 URL: https://gitlab.winehq.org/wine/wine/-/commit/bc05d15cf1099d37cc76b3a24c7977… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 31 09:38:05 2022 +0300 mfsrcsnk/wave: Initialize buffer pointer in ProcessSample() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfsrcsnk/wave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfsrcsnk/wave.c b/dlls/mfsrcsnk/wave.c index a1108de4bdc..736bbb5aa3c 100644 --- a/dlls/mfsrcsnk/wave.c +++ b/dlls/mfsrcsnk/wave.c @@ -706,8 +706,8 @@ static HRESULT WINAPI wave_stream_sink_GetMediaTypeHandler(IMFStreamSink *iface, static HRESULT WINAPI wave_stream_sink_ProcessSample(IMFStreamSink *iface, IMFSample *sample) { struct wave_sink *sink = impl_from_IMFStreamSink(iface); + IMFMediaBuffer *buffer = NULL; DWORD max_length, length; - IMFMediaBuffer *buffer; HRESULT hr = S_OK; BYTE *data;

1 0

Nikolay Sivov : bcrypt/tests: Use CRT allocation functions.
by Alexandre Julliard Aug. 31, 2022

Aug. 31, 2022

Module: wine Branch: master Commit: c6a75d01b52973ed0763ee1070634a2f2d111350 URL: https://gitlab.winehq.org/wine/wine/-/commit/c6a75d01b52973ed0763ee1070634a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 31 08:31:46 2022 +0300 bcrypt/tests: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/bcrypt/tests/bcrypt.c | 102 ++++++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 51 deletions(-)

1 0

Francois Gouget : winspool.drv/tests: Fix the spelling of a variable name.
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

Module: wine Branch: master Commit: c0ad6d745e511da6e1459fb6a5b51ac307205c24 URL: https://gitlab.winehq.org/wine/wine/-/commit/c0ad6d745e511da6e1459fb6a5b51a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 25 11:57:45 2022 +0200 winspool.drv/tests: Fix the spelling of a variable name. --- dlls/winspool.drv/tests/info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 47f602b7de3..58ab581ed25 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2679,7 +2679,7 @@ static void test_DocumentProperties(void) LONG dm_size, ret; DEVMODEA *dm; char empty_str[] = ""; - char non_existing_str[] = "non existing printer"; + char nonexistent_str[] = "nonexistent printer"; if (!default_printer) { @@ -2708,7 +2708,7 @@ static void test_DocumentProperties(void) ret = DocumentPropertiesA(0, hprn, empty_str, dm, dm, DM_OUT_BUFFER); ok(ret == IDOK, "DocumentPropertiesA ret value %ld != expected IDOK\n", ret); - ret = DocumentPropertiesA(0, hprn, non_existing_str, dm, dm, DM_OUT_BUFFER); + ret = DocumentPropertiesA(0, hprn, nonexistent_str, dm, dm, DM_OUT_BUFFER); ok(ret == IDOK, "DocumentPropertiesA ret value %ld != expected IDOK\n", ret); test_DEVMODEA(dm, dm_size, default_printer);

1 0