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

Eric Pouech : msvcrt: Use enum to clarify post-processing actions.
by Alexandre Julliard 31 Aug '22

31 Aug '22

Module: wine Branch: master Commit: 638b06015b6696358f4e30037a72981672ae3730 URL: https://gitlab.winehq.org/wine/wine/-/commit/638b06015b6696358f4e30037a7298… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Aug 31 10:39:16 2022 +0200 msvcrt: Use enum to clarify post-processing actions. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/undname.c | 48 ++++++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index a3ad3497c00..424d977a2a7 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1421,7 +1421,12 @@ done: static BOOL symbol_demangle(struct parsed_symbol* sym) { BOOL ret = FALSE; - unsigned do_after = 0; + enum { + PP_NONE, + PP_CONSTRUCTOR, + PP_DESTRUCTOR, + PP_CAST_OPERATOR, + } post_process = PP_NONE; /* FIXME seems wrong as name, as it demangles a simple data type */ if (sym->flags & UNDNAME_NO_ARGUMENTS) @@ -1455,8 +1460,8 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) /* C++ operator code (one character, or two if the first is '_') */ switch (*++sym->current) { - case '0': function_name = ""; do_after = 1; break; - case '1': function_name = ""; do_after = 2; break; + case '0': function_name = ""; post_process = PP_CONSTRUCTOR; break; + case '1': function_name = ""; post_process = PP_DESTRUCTOR; break; case '2': function_name = "operator new"; break; case '3': function_name = "operator delete"; break; case '4': function_name = "operator="; break; @@ -1466,7 +1471,7 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) case '8': function_name = "operator=="; break; case '9': function_name = "operator!="; break; case 'A': function_name = "operator[]"; break; - case 'B': function_name = "operator"; do_after = 3; break; + case 'B': function_name = "operator"; post_process = PP_CAST_OPERATOR; break; case 'C': function_name = "operator->"; break; case 'D': function_name = "operator*"; break; case 'E': function_name = "operator++"; break; @@ -1506,7 +1511,10 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) case '9': function_name = "`vcall'"; break; case 'A': function_name = "`typeof'"; break; case 'B': function_name = "`local static guard'"; break; - case 'C': function_name = "`string'"; do_after = 4; break; + case 'C': sym->result = (char*)"`string'"; /* string literal: followed by string encoding (native nevers undecode it) */ + /* FIXME: should unmangle the whole string for error reporting */ + if (*sym->current && sym->current[strlen(sym->current) - 1] == '@') ret = TRUE; + goto done; case 'D': function_name = "`vbase destructor'"; break; case 'E': function_name = "`vector deleting destructor'"; break; case 'F': function_name = "`default constructor closure'"; break; @@ -1601,18 +1609,8 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) if (args) function_name = function_name ? str_printf(sym, "%s%s", function_name, args) : args; sym->names.num = 0; } - switch (do_after) - { - case 4: - sym->result = (char*)function_name; - ret = TRUE; - goto done; - /* fall through */ - default: - if (!str_array_push(sym, function_name, -1, &sym->stack)) - return FALSE; - break; - } + if (!str_array_push(sym, function_name, -1, &sym->stack)) + return FALSE; } else if (*sym->current == '$') { @@ -1634,20 +1632,18 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) break; } - switch (do_after) + switch (post_process) { - case 0: default: break; - case 1: case 2: + case PP_NONE: default: break; + case PP_CONSTRUCTOR: case PP_DESTRUCTOR: /* 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] = str_printf(sym, "%s%s", sym->stack.elts[1], sym->stack.elts[0]); - else - sym->stack.elts[0] = str_printf(sym, "~%s%s", sym->stack.elts[1], sym->stack.elts[0]); + sym->stack.elts[0] = str_printf(sym, "%s%s%s", post_process == PP_DESTRUCTOR ? "~" : NULL, + sym->stack.elts[1], sym->stack.elts[0]); /* ctors and dtors don't have return type */ sym->flags |= UNDNAME_NO_FUNCTION_RETURNS; break; - case 3: + case PP_CAST_OPERATOR: sym->flags &= ~UNDNAME_NO_FUNCTION_RETURNS; break; } @@ -1656,7 +1652,7 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) if (*sym->current >= '0' && *sym->current <= '9') ret = handle_data(sym); else if ((*sym->current >= 'A' && *sym->current <= 'Z') || *sym->current == '$') - ret = handle_method(sym, do_after == 3); + ret = handle_method(sym, post_process == PP_CAST_OPERATOR); else ret = FALSE; done: if (ret) assert(sym->result);

1 0

Eric Pouech : msvcrt: Fix order of extended qualifiers and qualifiers.
by Alexandre Julliard 31 Aug '22

31 Aug '22

Module: wine Branch: master Commit: 9a98276f981903bdd179705f1eaf0808f74ca678 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a98276f981903bdd179705f1eaf08… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Aug 31 10:39:16 2022 +0200 msvcrt: Fix order of extended qualifiers and qualifiers. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/tests/cpp.c | 1 + dlls/msvcrt/undname.c | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 7735da4ea89..b2b6a1909b7 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1310,6 +1310,7 @@ static void test_demangle(void) /* 146 */ {"?ptititi3@@3PEStititi@@IES1@", "unsigned int volatile tititi::* __ptr64 volatile __ptr64 ptititi3"}, /* 147 */ {"?ptititi4@@3PETtititi@@IET1@", "unsigned int const volatile tititi::* __ptr64 const volatile __ptr64 ptititi4"}, /* 148 */ {"?ptititi4v@@3RETtititi@@IET1@", "unsigned int const volatile tititi::* __ptr64 const volatile __ptr64 ptititi4v"}, +/* 149 */ {"?meth(a)AAA@@QFCEXXZ", "public: void __thiscall AAA::meth(void)volatile __unaligned "}, }; int i, num_test = ARRAY_SIZE(test); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 424d977a2a7..8eb3a12057f 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -456,10 +456,8 @@ static BOOL get_modifier(struct parsed_symbol *sym, struct datatype_t *xdt, cons case 'T': mod = "const volatile"; break; default: return FALSE; } - if (xdt->left && mod) - xdt->left = str_printf(sym, "%s %s", xdt->left, mod); - else if (mod) - xdt->left = mod; + if (mod) + xdt->left = xdt->left ? str_printf(sym, "%s %s", mod, xdt->left) : mod; if (ch >= 'Q' && ch <= 'T') /* pointer to member, fetch class */ { const char* class = get_class_name(sym);

1 0

Jacek Caban : winevulkan: Use vk_unix_call in loader.c.
by Alexandre Julliard 31 Aug '22

31 Aug '22

Module: wine Branch: master Commit: 05d2576b1f296f118362e32dc8001995ec463326 URL: https://gitlab.winehq.org/wine/wine/-/commit/05d2576b1f296f118362e32dc80019… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 25 21:42:47 2022 +0200 winevulkan: Use vk_unix_call in loader.c. --- dlls/winevulkan/loader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 1c45c036c18..fa596c1f9e5 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -242,7 +242,7 @@ VkResult WINAPI vkCreateInstance(const VkInstanceCreateInfo *create_info, params.pCreateInfo = create_info; params.pAllocator = allocator; params.pInstance = instance; - return unix_funcs->p_vk_call(unix_vkCreateInstance, &params); + return vk_unix_call(unix_vkCreateInstance, &params); } VkResult WINAPI vkEnumerateInstanceExtensionProperties(const char *layer_name, @@ -267,7 +267,7 @@ VkResult WINAPI vkEnumerateInstanceExtensionProperties(const char *layer_name, params.pLayerName = layer_name; params.pPropertyCount = count; params.pProperties = properties; - return unix_funcs->p_vk_call(unix_vkEnumerateInstanceExtensionProperties, &params); + return vk_unix_call(unix_vkEnumerateInstanceExtensionProperties, &params); } VkResult WINAPI vkEnumerateInstanceVersion(uint32_t *version) @@ -283,7 +283,7 @@ VkResult WINAPI vkEnumerateInstanceVersion(uint32_t *version) } params.pApiVersion = version; - return unix_funcs->p_vk_call(unix_vkEnumerateInstanceVersion, &params); + return vk_unix_call(unix_vkEnumerateInstanceVersion, &params); } static HANDLE get_display_device_init_mutex(void)

1 0

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

31 Aug '22

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 : evr/filter: Initialize interface pointer in GetService() (Coverity).
by Alexandre Julliard 31 Aug '22

31 Aug '22

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 : win32u/hook: Fix a leak on earlier return (Coverity).
by Alexandre Julliard 31 Aug '22

31 Aug '22

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 : mshtml/tests: Fix a typo in test message (Coverity).
by Alexandre Julliard 31 Aug '22

31 Aug '22

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

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

31 Aug '22

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 : bcrypt/tests: Use CRT allocation functions.
by Alexandre Julliard 31 Aug '22

31 Aug '22

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

Andrey Gusev : d3dx10: Implement D3DX10PreprocessShaderFromMemory().
by Alexandre Julliard 30 Aug '22

30 Aug '22

Module: wine Branch: master Commit: 8ffbd56a4380ff23381c5b2c137b4b4b2de4f61e URL: https://gitlab.winehq.org/wine/wine/-/commit/8ffbd56a4380ff23381c5b2c137b4b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Aug 7 12:53:14 2022 +0300 d3dx10: Implement D3DX10PreprocessShaderFromMemory(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53427 --- dlls/d3dx10_43/async.c | 12 ------------ dlls/d3dx10_43/compiler.c | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index 667219b3500..62627886804 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -600,18 +600,6 @@ HRESULT WINAPI D3DX10CreateAsyncTextureProcessor(ID3D10Device *device, return S_OK; } -HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_size, const char *filename, - const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text, - ID3D10Blob **errors, HRESULT *hresult) -{ - FIXME("data %s, data_size %Iu, filename %s, defines %p, include %p, pump %p, shader_text %p, " - "errors %p, hresult %p stub!\n", - debugstr_an(data, data_size), data_size, debugstr_a(filename), defines, include, pump, - shader_text, errors, hresult); - - return E_NOTIMPL; -} - struct work_item { struct list entry; diff --git a/dlls/d3dx10_43/compiler.c b/dlls/d3dx10_43/compiler.c index c66eb679a8f..ad27783eabb 100644 --- a/dlls/d3dx10_43/compiler.c +++ b/dlls/d3dx10_43/compiler.c @@ -183,3 +183,26 @@ HRESULT WINAPI D3DX10CreateEffectFromResourceW(HMODULE module, const WCHAR *reso free(filename); return hr; } + +HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_size, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text, + ID3D10Blob **errors, HRESULT *hresult) +{ + HRESULT hr; + + TRACE("data %s, data_size %Iu, filename %s, defines %p, include %p, pump %p, shader_text %p, " + "errors %p, hresult %p.\n", + debugstr_an(data, data_size), data_size, debugstr_a(filename), defines, include, pump, + shader_text, errors, hresult); + + if (!data) + return E_FAIL; + + if (pump) + FIXME("Unimplemented ID3DX10ThreadPump handling.\n"); + + hr = D3DPreprocess(data, data_size, filename, defines, include, shader_text, errors); + if (hresult) + *hresult = hr; + return hr; +}

1 0