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

Georg Lehmann : winevulkan: Return NULL for unavailable device functions.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: fc8dcb53c2cebf9a08d9c49a4f7fc021b79fc819 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc8dcb53c2cebf9a08d9c49a… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Aug 20 13:24:50 2021 +0200 winevulkan: Return NULL for unavailable device functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51360 Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader.c | 9 ++++++--- dlls/winevulkan/loader_thunks.h | 1 + dlls/winevulkan/make_vulkan | 2 ++ dlls/winevulkan/vulkan.c | 5 +++++ dlls/winevulkan/vulkan_private.h | 1 + dlls/winevulkan/vulkan_thunks.c | 1 + 6 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 4857a0adc7a..86684cdf00c 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -147,9 +147,12 @@ PFN_vkVoidFunction WINAPI vkGetDeviceProcAddr(VkDevice device, const char *name) * vkCommandBuffer or vkQueue. * Loader takes care of filtering of extensions which are enabled or not. */ - func = wine_vk_get_device_proc_addr(name); - if (func) - return func; + if (unix_funcs->p_is_available_device_function(device, name)) + { + func = wine_vk_get_device_proc_addr(name); + if (func) + return func; + } /* vkGetDeviceProcAddr was intended for loading device and subdevice functions. * idTech 6 titles such as Doom and Wolfenstein II, however use it also for diff --git a/dlls/winevulkan/loader_thunks.h b/dlls/winevulkan/loader_thunks.h index fa0c3155658..516cb0f17c2 100644 --- a/dlls/winevulkan/loader_thunks.h +++ b/dlls/winevulkan/loader_thunks.h @@ -422,6 +422,7 @@ struct unix_funcs /* winevulkan specific functions */ BOOL (WINAPI *p_is_available_instance_function)(VkInstance, const char *); + BOOL (WINAPI *p_is_available_device_function)(VkDevice, const char *); }; #endif /* __WINE_VULKAN_LOADER_THUNKS_H */ diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 760c460b6fe..ef4693651d2 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2789,6 +2789,7 @@ class VkGenerator(object): f.write(" &{1}{0},\n".format(vk_func.name, prefix)) f.write(" &wine_vk_is_available_instance_function,\n") + f.write(" &wine_vk_is_available_device_function,\n") f.write("};\n") def generate_thunks_h(self, f, prefix): @@ -2992,6 +2993,7 @@ class VkGenerator(object): f.write("\n") f.write(" /* winevulkan specific functions */\n") f.write(" BOOL (WINAPI *p_is_available_instance_function)(VkInstance, const char *);\n") + f.write(" BOOL (WINAPI *p_is_available_device_function)(VkDevice, const char *);\n") f.write("};\n\n") f.write("#endif /* __WINE_VULKAN_LOADER_THUNKS_H */\n") diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 3658a4378cb..6f90db9736e 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1610,3 +1610,8 @@ BOOL WINAPI wine_vk_is_available_instance_function(VkInstance instance, const ch { return !!vk_funcs->p_vkGetInstanceProcAddr(instance->instance, name); } + +BOOL WINAPI wine_vk_is_available_device_function(VkDevice device, const char *name) +{ + return !!vk_funcs->p_vkGetDeviceProcAddr(device->device, name); +} diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index ce83b2b7032..6aa60f8c9ae 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -213,5 +213,6 @@ uint64_t wine_vk_unwrap_handle(VkObjectType type, uint64_t handle) DECLSPEC_HIDD extern const struct unix_funcs loader_funcs; BOOL WINAPI wine_vk_is_available_instance_function(VkInstance instance, const char *name) DECLSPEC_HIDDEN; +BOOL WINAPI wine_vk_is_available_device_function(VkDevice device, const char *name) DECLSPEC_HIDDEN; #endif /* __WINE_VULKAN_PRIVATE_H */ diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index b19e3f73dae..a65e544f1f9 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -8720,4 +8720,5 @@ const struct unix_funcs loader_funcs = &wine_vkWaitSemaphoresKHR, &wine_vkWriteAccelerationStructuresPropertiesKHR, &wine_vk_is_available_instance_function, + &wine_vk_is_available_device_function, };

1 0

Nikolay Sivov : d3d10/effect: Handle geometry shader variables declared with stream output.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: 6385d93e540adcd8af14df11f42d694c65440510 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6385d93e540adcd8af14df11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 20 21:24:52 2021 +0200 d3d10/effect: Handle geometry shader variables declared with stream output. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 7 + dlls/d3d10/effect.c | 38 ++++- dlls/d3d10/tests/effect.c | 398 ++++++++++++++++++++++++--------------------- 3 files changed, 254 insertions(+), 189 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6385d93e540adcd8af14…

1 0

Nikolay Sivov : d3d10/effect: Handle SetResource() called on null variable instance.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: 455239e3791e1cce37ec8d2c7b3e950474c79d69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=455239e3791e1cce37ec8d2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 18 10:51:52 2021 +0300 d3d10/effect: Handle SetResource() called on null variable instance. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 3 +++ dlls/d3d10/tests/effect.c | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 0ee63ed41d5..520f816098f 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -6237,6 +6237,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_resource_variable_SetResour TRACE("iface %p, resource %p.\n", iface, resource); + if (!d3d10_effect_shader_resource_variable_IsValid(iface)) + return E_FAIL; + set_shader_resource_variable(&resource, v->u.resource.srv); return S_OK; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 53e2d52c496..9a217993e7e 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -5698,9 +5698,16 @@ static void test_effect_resource_variable(void) effect_desc.SharedGlobalVariables); ok(effect_desc.Techniques == 1, "Unexpected techniques count %u.\n", effect_desc.Techniques); + create_effect_texture_resource(device, &srv0, &tex0); + + /* SetResource() on null resource variable. */ + var = effect->lpVtbl->GetVariableByName(effect, "dummy name"); + t0 = var->lpVtbl->AsShaderResource(var); + hr = t0->lpVtbl->SetResource(t0, srv0); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + var = effect->lpVtbl->GetVariableByName(effect, "t0"); t0 = get_effect_shader_resource_variable(var); - create_effect_texture_resource(device, &srv0, &tex0); hr = t0->lpVtbl->SetResource(t0, srv0); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : d3dx10_42/tests: Enable tests.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: df7bccf8ecdb01c7f9d299ddfe641903bcb52899 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df7bccf8ecdb01c7f9d299dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 18 10:53:08 2021 +0300 d3dx10_42/tests: Enable tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/d3dx10_42/Makefile.in | 1 + dlls/d3dx10_42/tests/Makefile.in | 6 ++++++ 4 files changed, 9 insertions(+) diff --git a/configure b/configure index cc4f64347f1..2e61fcbc685 100755 --- a/configure +++ b/configure @@ -20387,6 +20387,7 @@ wine_fn_config_makefile dlls/d3dx10_39 enable_d3dx10_39 wine_fn_config_makefile dlls/d3dx10_40 enable_d3dx10_40 wine_fn_config_makefile dlls/d3dx10_41 enable_d3dx10_41 wine_fn_config_makefile dlls/d3dx10_42 enable_d3dx10_42 +wine_fn_config_makefile dlls/d3dx10_42/tests enable_tests wine_fn_config_makefile dlls/d3dx10_43 enable_d3dx10_43 wine_fn_config_makefile dlls/d3dx10_43/tests enable_tests wine_fn_config_makefile dlls/d3dx11_42 enable_d3dx11_42 diff --git a/configure.ac b/configure.ac index cb8fa573c37..a9750330443 100644 --- a/configure.ac +++ b/configure.ac @@ -3087,6 +3087,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dx10_39) WINE_CONFIG_MAKEFILE(dlls/d3dx10_40) WINE_CONFIG_MAKEFILE(dlls/d3dx10_41) WINE_CONFIG_MAKEFILE(dlls/d3dx10_42) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_42/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_43) WINE_CONFIG_MAKEFILE(dlls/d3dx10_43/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx11_42) diff --git a/dlls/d3dx10_42/Makefile.in b/dlls/d3dx10_42/Makefile.in index 105bf3d4c93..e06f064cddc 100644 --- a/dlls/d3dx10_42/Makefile.in +++ b/dlls/d3dx10_42/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dx10_42.dll +IMPORTLIB = d3dx10_42 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx10_42/tests/Makefile.in b/dlls/d3dx10_42/tests/Makefile.in new file mode 100644 index 00000000000..c3965b7c3f2 --- /dev/null +++ b/dlls/d3dx10_42/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_42.dll +IMPORTS = d3dx10_42 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c

1 0

Nikolay Sivov : d3dx10_43/tests: Test all attributes of glyph textures.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: 7d60044e187704176981500d139e1591a4d63ad5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d60044e187704176981500d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 20 12:00:54 2021 +0300 d3dx10_43/tests: Test all attributes of glyph textures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index cb2cb3e64f1..b7834fb6f8a 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2352,15 +2352,22 @@ todo_wine ID3D10Resource_Release(resource); ID3D10Texture2D_GetDesc(texture, &texture_desc); + ok(texture_desc.Width == 256, "Unexpected width %u.\n", texture_desc.Width); + ok(texture_desc.Height == 256, "Unexpected height %u.\n", texture_desc.Height); + ok(texture_desc.MipLevels == 5, "Unexpected miplevels %u.\n", texture_desc.MipLevels); + ok(texture_desc.ArraySize == 1, "Unexpected array size %u.\n", texture_desc.ArraySize); ok(texture_desc.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", texture_desc.Format); + ok(texture_desc.SampleDesc.Count == 1, "Unexpected samples count %u.\n", + texture_desc.SampleDesc.Count); + ok(texture_desc.SampleDesc.Quality == 0, "Unexpected quality level %u.\n", + texture_desc.SampleDesc.Quality); ok(texture_desc.Usage == 0, "Unexpected usage %#x.\n", texture_desc.Usage); - ok(texture_desc.Width == 256, "Unexpected width %u.\n", texture_desc.Width); - ok(texture_desc.Height == 256, "Unexpected height %u.\n", texture_desc.Height); - ok(texture_desc.CPUAccessFlags == 0, "Unexpected access flags %#x.\n", - texture_desc.CPUAccessFlags); ok(texture_desc.BindFlags == D3D10_BIND_SHADER_RESOURCE, "Unexpected bind flags %#x.\n", texture_desc.BindFlags); + ok(texture_desc.CPUAccessFlags == 0, "Unexpected access flags %#x.\n", + texture_desc.CPUAccessFlags); + ok(texture_desc.MiscFlags == 0, "Unexpected misc flags %#x.\n", texture_desc.MiscFlags); count = GetGlyphOutlineW(hdc, glyph, GGO_GLYPH_INDEX | GGO_METRICS, &glyph_metrics, 0, NULL, &mat); ok(count != GDI_ERROR, "Unexpected count %#x.\n", count);

1 0

Jacek Caban : gdi32: Use NtGdiHfontCreate for CreateFont* functions.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: 75786478c67a49c7ab960452fc5b1fd23b76051c URL: https://source.winehq.org/git/wine.git/?a=commit;h=75786478c67a49c7ab960452… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 20 10:42:44 2021 +0200 gdi32: Use NtGdiHfontCreate for CreateFont* functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 129 ++------------------------------------------------ dlls/gdi32/text.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=75786478c67a49c7ab96…

1 0

Jacek Caban : gdi32: Use NtGdiGetOutlineTextMetricsInternalW for GetOutlineTextMetrics.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: 0669b6cd4868e50dc7c0b41aff9dcb39e00f9d0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0669b6cd4868e50dc7c0b41a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 20 10:43:13 2021 +0200 gdi32: Use NtGdiGetOutlineTextMetricsInternalW for GetOutlineTextMetrics. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 188 ++---------------------------------------------------- dlls/gdi32/text.c | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 187 insertions(+), 183 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0669b6cd4868e50dc7c0…

1 0

Nikolay Sivov : oleaut32/tests: Add interface checks for font object.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: f7d26b4244fc69e878a548790daa6a47086656a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7d26b4244fc69e878a54879… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 20 12:00:15 2021 +0300 oleaut32/tests: Add interface checks for font object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/olefont.c | 53 ++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 5137d807e78..c14d3d9435d 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -51,6 +51,21 @@ static HMODULE hOleaut32; static HRESULT (WINAPI *pOleCreateFontIndirect)(LPFONTDESC,REFIID,LPVOID*); +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) @@ -183,41 +198,27 @@ static void test_ifont_sizes(void) test_ifont_size(300000, 2, 2, -1058, "2:2 ratio 3"); } -static void test_QueryInterface(void) +static void test_interfaces(void) { - LPVOID pvObj = NULL; HRESULT hr; - IFont* font = NULL; - IPersistStreamInit *persistStreamInit = NULL; - LONG ref; + IFont *font = NULL; hr = pOleCreateFontIndirect(NULL, &IID_IFont, NULL); EXPECT_HR(hr, E_POINTER); - hr = pOleCreateFontIndirect(NULL, &IID_IFont, &pvObj); - font = pvObj; - + hr = pOleCreateFontIndirect(NULL, &IID_IFont, (void **)&font); EXPECT_HR(hr, S_OK); ok(font != NULL,"OCFI (NULL,..) returns NULL, instead of !NULL\n"); - pvObj = NULL; - hr = IFont_QueryInterface( font, &IID_IFont, &pvObj); - EXPECT_HR(hr, S_OK); - - /* Test if QueryInterface increments ref counter for IFONTs */ - ref = IFont_AddRef(font); - ok(ref == 3 || - broken(ref == 1), /* win95 */ - "IFont_QI expected ref value 3 but instead got %d\n", ref); - IFont_Release(font); + check_interface(font, &IID_IFont, TRUE); + check_interface(font, &IID_IFontDisp, TRUE); + check_interface(font, &IID_IDispatch, TRUE); + check_interface(font, &IID_IPersist, TRUE); + check_interface(font, &IID_IPersistStream, TRUE); + check_interface(font, &IID_IConnectionPointContainer, TRUE); + check_interface(font, &IID_IPersistPropertyBag, TRUE); + check_interface(font, &IID_IPersistStreamInit, FALSE); - ok(pvObj != NULL,"IFont_QI does return NULL, instead of a ptr\n"); - - /* IFont never had IPersistStreamInit */ - hr = IFont_QueryInterface(font, &IID_IPersistStreamInit, (void**)&persistStreamInit); - EXPECT_HR(hr, E_NOINTERFACE); - - IFont_Release(font); IFont_Release(font); } @@ -1278,7 +1279,7 @@ START_TEST(olefont) return; } - test_QueryInterface(); + test_interfaces(); test_type_info(); test_ifont_sizes(); test_font_events_disp();

1 0

Nikolay Sivov : oleaut32/typelib: Remove explicit check already handled by the loop condition.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: 8ca5afa43046627bcc1acd0f465715397825ed1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ca5afa43046627bcc1acd0f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 20 13:57:56 2021 +0300 oleaut32/typelib: Remove explicit check already handled by the loop condition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0526af0abdb..ac326afe1a1 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7216,7 +7216,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( UINT *pArgErr) { ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); - int i; + int i, j; unsigned int var_index; TYPEKIND type_kind; HRESULT hres; @@ -7323,15 +7323,13 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( src_arg = NULL; - if (cNamedArgs) + for (j = 0; j < cNamedArgs; j++) { - USHORT j; - for (j = 0; j < cNamedArgs; j++) - if (rgdispidNamedArgs[j] == i || (i == func_desc->cParams-1 && rgdispidNamedArgs[j] == DISPID_PROPERTYPUT)) - { - src_arg = &pDispParams->rgvarg[j]; - break; - } + if (rgdispidNamedArgs[j] == i || (i == func_desc->cParams-1 && rgdispidNamedArgs[j] == DISPID_PROPERTYPUT)) + { + src_arg = &pDispParams->rgvarg[j]; + break; + } } if (!src_arg && vargs_converted + cNamedArgs < pDispParams->cArgs) @@ -7400,7 +7398,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( { SAFEARRAYBOUND bound; VARIANT *v; - LONG j; + bound.lLbound = 0; bound.cElements = pDispParams->cArgs-i; if (!(a = SafeArrayCreate(VT_VARIANT, 1, &bound))) @@ -7585,7 +7583,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( i == func_desc->cParams-1) { SAFEARRAY *a = V_ARRAY(prgpvarg[i]); - LONG j, ubound; + LONG ubound; VARIANT *v; hres = SafeArrayGetUBound(a, 1, &ubound); if (hres != S_OK)

1 0

Piotr Caban : msvcrt: Rename exception::what() implementation to exception_what.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: f1fa214b9f936bd91fecbfd6f05436d22311f4dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1fa214b9f936bd91fecbfd6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 20 18:44:35 2021 +0200 msvcrt: Rename exception::what() implementation to exception_what. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr70/msvcr70.spec | 4 ++-- dlls/msvcr71/msvcr71.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/cpp.c | 30 +++++++++++++++--------------- dlls/msvcrt/msvcrt.spec | 6 +++--- dlls/msvcrtd/msvcrtd.spec | 4 ++-- 10 files changed, 36 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f1fa214b9f936bd91fec…

1 0