wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Eric Pouech : ntdll/tests: Use correct integral type.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: f74474072a5e4123ebfb78469623263adfa61580 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f74474072a5e4123ebfb7846… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 12 09:37:40 2022 +0100 ntdll/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index a99b1e46b06..442aadfd784 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2425,7 +2425,8 @@ static void test_restore_context(void) EXCEPTION_RECORD rec; _JUMP_BUFFER buf; CONTEXT ctx; - int i, pass; + int i; + LONG pass; if (!pRtlUnwindEx || !pRtlRestoreContext || !pRtlCaptureContext || !p_setjmp) { @@ -4900,7 +4901,7 @@ static void CALLBACK test_unwind_apc(ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR a static void test_unwind_from_apc(void) { NTSTATUS status; - int pass; + LONG pass; if (!pNtQueueApcThread) { @@ -8648,7 +8649,7 @@ static void test_user_apc(void) { NTSTATUS status; CONTEXT context; - int pass; + LONG pass; if (!pNtQueueApcThread) { @@ -8818,7 +8819,7 @@ static void suspend_process_proc(void) { HANDLE event = OpenEventA(SYNCHRONIZE, FALSE, suspend_process_event_name); HANDLE event2 = OpenEventA(SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE, suspend_process_event2_name); - unsigned int count; + DWORD count; NTSTATUS status; HANDLE thread;

1 0

Eric Pouech : oleaut32/tests: Ensure (re)definition of EXPECTRES for all integer types.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 3f7ef33e5b926f5a98167a6132e3fd64775ead5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f7ef33e5b926f5a98167a61… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 12 09:36:44 2022 +0100 oleaut32/tests: Ensure (re)definition of EXPECTRES for all integer types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 46897085d05..c368c5129bb 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -648,6 +648,8 @@ static void test_VarI1ChangeTypeEx(void) #undef CONV_TYPE #define CONV_TYPE BYTE +#undef EXPECTRES +#define EXPECTRES(res, x) _EXPECTRES(res, x, "%u") static void test_VarUI1FromI1(void) { @@ -942,6 +944,8 @@ static void test_VarUI1ChangeTypeEx(void) #undef CONV_TYPE #define CONV_TYPE SHORT +#undef EXPECTRES +#define EXPECTRES(res, x) _EXPECTRES(res, x, "%d") static void test_VarI2FromI1(void) { @@ -1178,6 +1182,8 @@ static void test_VarI2ChangeTypeEx(void) #undef CONV_TYPE #define CONV_TYPE USHORT +#undef EXPECTRES +#define EXPECTRES(res, x) _EXPECTRES(res, x, "%u") static void test_VarUI2FromI1(void) { @@ -1411,6 +1417,8 @@ static void test_VarUI2ChangeTypeEx(void) #undef CONV_TYPE #define CONV_TYPE LONG +#undef EXPECTRES +#define EXPECTRES(res, x) _EXPECTRES(res, x, "%d") static void test_VarI4FromI1(void) {

1 0

Eric Pouech : oleaut32/tests: Convert UI8Copy to existing integer test scheme.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 734a8ea204f629aac2b8bb753de558f323252f0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=734a8ea204f629aac2b8bb75… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 12 09:36:38 2022 +0100 oleaut32/tests: Convert UI8Copy to existing integer test scheme. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 601520eb2f6..46897085d05 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -2265,33 +2265,13 @@ static void test_VarUI8FromStr(void) static void test_VarUI8Copy(void) { - HRESULT hres; - VARIANTARG vSrc, vDst; - ULONGLONG in = 1; - if (!has_i8) { win_skip("I8 and UI8 data types are not available\n"); return; } - VariantInit(&vSrc); - VariantInit(&vDst); - V_VT(&vSrc) = VT_UI8; - V_UI8(&vSrc) = in; - hres = VariantCopy(&vDst, &vSrc); - ok(hres == S_OK && V_VT(&vDst) == VT_UI8 && V_UI8(&vDst) == in, - "copy hres 0x%X, type %d, value (%x%08x) %x%08x\n", - hres, V_VT(&vDst), (UINT)(in >> 32), (UINT)in, (UINT)(V_UI8(&vDst) >> 32), (UINT)V_UI8(&vDst) ); - V_VT(&vSrc) = VT_UI8|VT_BYREF; - V_UI8REF(&vSrc) = &in; - hres = VariantCopy(&vDst, &vSrc); - ok(hres == S_OK && V_VT(&vDst) == (VT_UI8|VT_BYREF) && V_UI8REF(&vDst) == &in, - "ref hres 0x%X, type %d, ref (%p) %p\n", hres, V_VT(&vDst), &in, V_UI8REF(&vDst)); - hres = VariantCopyInd(&vDst, &vSrc); - ok(hres == S_OK && V_VT(&vDst) == VT_UI8 && V_UI8(&vDst) == in, - "copy hres 0x%X, type %d, value (%x%08x) %x%08x\n", - hres, V_VT(&vDst), (UINT)(in >> 32), (UINT)in, (UINT)(V_UI8(&vDst) >> 32), (UINT)V_UI8(&vDst) ); + COPYTEST(1ull, VT_UI8, V_UI8(&vSrc), V_UI8(&vDst), V_UI8REF(&vSrc), V_UI8REF(&vDst), "%I64u"); } static void test_VarUI8ChangeTypeEx(void)

1 0

Eric Pouech : oleaut32/tests: Convert UI8 to existing integer test scheme.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: df0eaf58825a83cb6d986dcd2f0c338100dffb68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df0eaf58825a83cb6d986dcd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 12 09:36:30 2022 +0100 oleaut32/tests: Convert UI8 to existing integer test scheme. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 152 +++++++++++++++++------------------------- 1 file changed, 63 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=df0eaf58825a83cb6d98…

1 0

Jinoh Kang : user32: Recognise RichEdit50W window class in spy.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 411d640d3f5e6c8bf13e5109a57eb892c659a42f URL: https://source.winehq.org/git/wine.git/?a=commit;h=411d640d3f5e6c8bf13e5109… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Mar 12 19:36:01 2022 +0900 user32: Recognise RichEdit50W window class in spy. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/spy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index dc8e0b2a708..4d22acb43c2 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -1764,6 +1764,7 @@ static const CONTROL_CLASS cc_array[] = { {TOOLTIPS_CLASSW, tooltips_array, ARRAY_SIZE(tooltips_array)}, {UPDOWN_CLASSW, updown_array, ARRAY_SIZE(updown_array)}, {RICHEDIT_CLASS20W, richedit_array, ARRAY_SIZE(richedit_array)}, + {MSFTEDIT_CLASS, richedit_array, ARRAY_SIZE(richedit_array)}, {0, 0, 0} };

1 0

Zebediah Figura : wined3d: Try to load winevulkan.dll instead of vulkan-1.dll.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 93217a4ad272f61162f25b71e1decf588796aef1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93217a4ad272f61162f25b71… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Mar 11 15:56:45 2022 -0600 wined3d: Try to load winevulkan.dll instead of vulkan-1.dll. The Khronos Vulkan loader calls into dxgi, which results in infinite recursion. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52640 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 506c7167f31..2752a0ac0b3 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -219,7 +219,8 @@ static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) { struct vulkan_ops *vk_ops = &vk_info->vk_ops; - if (!(vk_info->vulkan_lib = LoadLibraryA("vulkan-1.dll"))) + if (!(vk_info->vulkan_lib = LoadLibraryA("winevulkan.dll")) + && !(vk_info->vulkan_lib = LoadLibraryA("vulkan-1.dll"))) { WARN("Failed to load vulkan-1.dll.\n"); return FALSE;

1 0

Daniel Lehman : server: Always close previous IRP handle.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 2fc3d7eb2912b189ab38c0683f16e97cf9987362 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fc3d7eb2912b189ab38c068… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Mar 10 16:18:13 2022 -0800 server: Always close previous IRP handle. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/device.c b/server/device.c index d6288920bf4..436dac6bfe9 100644 --- a/server/device.c +++ b/server/device.c @@ -959,7 +959,6 @@ DECL_HANDLER(get_next_device_request) if (req->prev) { set_irp_result( irp, req->iosb_status, get_req_data(), get_req_data_size(), req->result ); - close_handle( current->process, req->prev ); /* avoid an extra round-trip for close */ } else { @@ -977,6 +976,9 @@ DECL_HANDLER(get_next_device_request) set_irp_result( irp, req->status, NULL, 0, 0 ); } + if (req->prev) + close_handle( current->process, req->prev ); /* avoid an extra round-trip for close */ + free_irp_params( irp ); release_object( irp ); manager->current_call = NULL;

1 0

Alexandre Julliard : vkd3d: Only use __builtin_popcount in PE builds.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 7c908186ec5c09f72d92c468abda6562b3da82e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c908186ec5c09f72d92c468… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 14 11:22:47 2022 +0100 vkd3d: Only use __builtin_popcount in PE builds. It's not compatible with -mabi=ms. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52664 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/include/private/vkd3d_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/include/private/vkd3d_common.h b/libs/vkd3d/include/private/vkd3d_common.h index 6e57e05c7e2..4ee8ccd4325 100644 --- a/libs/vkd3d/include/private/vkd3d_common.h +++ b/libs/vkd3d/include/private/vkd3d_common.h @@ -65,7 +65,7 @@ static inline unsigned int vkd3d_popcount(unsigned int v) { #ifdef _MSC_VER return __popcnt(v); -#elif defined(__GNUC__) && (__GNUC__ >= 4) +#elif defined(__MINGW32__) return __builtin_popcount(v); #else v -= (v >> 1) & 0x55555555;

1 0

Alexandre Julliard : wined3d: Only use __builtin_popcount in PE builds.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: a3e9ed6fc8a84b4b1e9ed19af617b73fc3c3650e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3e9ed6fc8a84b4b1e9ed19a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 14 11:22:40 2022 +0100 wined3d: Only use __builtin_popcount in PE builds. It's not compatible with -mabi=ms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bc3b9699fa6..577377f8dd4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -405,7 +405,7 @@ static inline float float_24_to_32(DWORD in) static inline unsigned int wined3d_popcount(unsigned int x) { -#if defined(__GNUC__) && (__GNUC__ >= 4) +#if defined(__MINGW32__) return __builtin_popcount(x); #else x -= x >> 1 & 0x55555555;

1 0

Alexandre Julliard : dwrite: Only use __builtin_popcount in PE builds.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 73b94f8f94abab874dd24d91f43917ba76f76383 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73b94f8f94abab874dd24d91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 14 11:22:23 2022 +0100 dwrite: Only use __builtin_popcount in PE builds. It's not compatible with -mabi=ms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index f04b70db193..c671218c486 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3435,7 +3435,7 @@ static unsigned int opentype_layout_is_glyph_covered(const struct dwrite_fonttab static inline unsigned int dwrite_popcount(unsigned int x) { -#if defined(__GNUC__) && (__GNUC__ >= 4) +#if defined(__MINGW32__) return __builtin_popcount(x); #else x -= x >> 1 & 0x55555555;

1 0

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