February 2022 - Wine-commits

Paul Gofman : hnetcfg/tests: Don't test removing the same mapping twice.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 19c2ffe85202859914dfcde7f7b1dbd6bdb1cb41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19c2ffe85202859914dfcde7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 3 14:28:34 2022 +0300 hnetcfg/tests: Don't test removing the same mapping twice. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/tests/policy.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index f344019d1d3..3b614e6e05a 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -278,8 +278,6 @@ static void test_static_port_mapping_collection( IStaticPortMappingCollection *p hr = IEnumVARIANT_Next(enum_ports, 1, &var, &fetched); ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); - hr = IStaticPortMappingCollection_Remove(ports, 12345, (BSTR)L"UDP"); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IStaticPortMappingCollection_Remove(ports, 12345, (BSTR)L"UDP"); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : msxml3: Fix long types warnings in traces.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 624202be4bfdbec9955eb0d3cf301d48742c13d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=624202be4bfdbec9955eb0d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 3 13:48:04 2022 +0300 msxml3: Fix long types warnings in traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/Makefile.in | 1 - dlls/msxml3/attribute.c | 8 ++-- dlls/msxml3/bsc.c | 33 ++++++++------- dlls/msxml3/cdata.c | 40 ++++++++---------- dlls/msxml3/comment.c | 40 ++++++++---------- dlls/msxml3/dispex.c | 54 ++++++++++-------------- dlls/msxml3/docfrag.c | 25 ++++++----- dlls/msxml3/doctype.c | 25 ++++++----- dlls/msxml3/domdoc.c | 42 ++++++++++--------- dlls/msxml3/domimpl.c | 23 +++++----- dlls/msxml3/element.c | 29 +++++++------ dlls/msxml3/entityref.c | 7 ++-- dlls/msxml3/factory.c | 20 +++++---- dlls/msxml3/httprequest.c | 104 ++++++++++++++++++++-------------------------- dlls/msxml3/main.c | 2 +- dlls/msxml3/mxnamespace.c | 18 ++++---- dlls/msxml3/mxwriter.c | 52 +++++++++-------------- dlls/msxml3/node.c | 30 +++++-------- dlls/msxml3/nodelist.c | 13 +++--- dlls/msxml3/nodemap.c | 17 ++++---- dlls/msxml3/parseerror.c | 7 ++-- dlls/msxml3/pi.c | 8 ++-- dlls/msxml3/saxreader.c | 34 ++++++--------- dlls/msxml3/schema.c | 14 +++---- dlls/msxml3/selection.c | 20 ++++----- dlls/msxml3/stylesheet.c | 10 ++--- dlls/msxml3/text.c | 18 ++++---- dlls/msxml3/xmldoc.c | 17 +++----- dlls/msxml3/xmlelem.c | 31 +++++--------- dlls/msxml3/xmlparser.c | 26 ++++-------- dlls/msxml3/xmlview.c | 84 +++++++++++++++---------------------- 31 files changed, 373 insertions(+), 479 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=624202be4bfdbec9955e…

1 0

André Zwing : ntdll: Fix some spec file entries.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 8cfe529a59107d5dc671a76f21aa3522dc3bde87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cfe529a59107d5dc671a76f… Author: André Zwing <nerv(a)dawncrow.de> Date: Wed Feb 2 18:32:34 2022 +0100 ntdll: Fix some spec file entries. Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index afb945d4665..29174965394 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -52,7 +52,7 @@ @ stdcall EtwEventSetInformation(int64 long ptr long) @ stdcall EtwEventUnregister(int64) @ stdcall EtwEventWrite(int64 ptr long ptr) -@ stdcall EtwEventWriteString(int64 long int64 ptr) +@ stdcall EtwEventWriteString(int64 long int64 wstr) @ stdcall EtwEventWriteTransfer(int64 ptr ptr ptr long ptr) @ stdcall EtwGetTraceEnableFlags(int64) @ stdcall EtwGetTraceEnableLevel(int64) @@ -594,7 +594,7 @@ @ stub RtlDeleteNoSplay @ stub RtlDeleteOwnersRanges @ stub RtlDeleteRange -@ stdcall RtlDeleteRegistryValue(long ptr ptr) +@ stdcall RtlDeleteRegistryValue(long ptr wstr) @ stdcall RtlDeleteResource(ptr) @ stdcall RtlDeleteSecurityObject(ptr) @ stdcall RtlDeleteTimer(ptr ptr ptr) @@ -1089,7 +1089,7 @@ @ stdcall RtlWow64IsWowGuestMachineSupported(long ptr) @ stdcall -arch=win64 RtlWow64SetThreadContext(long ptr) @ stub RtlWriteMemoryStream -@ stdcall RtlWriteRegistryValue(long ptr ptr long ptr long) +@ stdcall RtlWriteRegistryValue(long ptr wstr long ptr long) @ stub RtlZeroHeap @ stdcall RtlZeroMemory(ptr long) @ stdcall RtlZombifyActivationContext(ptr)

1 0

Michael Stefaniuc : dmsynth/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: fe1aebb600d9585e33263a633b36ce8e3f0462cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe1aebb600d9585e33263a63… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 2 23:40:32 2022 +0100 dmsynth/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/tests/Makefile.in | 1 - dlls/dmsynth/tests/dmsynth.c | 104 ++++++++++++++++++++--------------------- 2 files changed, 52 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fe1aebb600d9585e3326…

1 0

Eric Pouech : msvcrt: Use correct integral types in structs.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: d7dad505448591fa9956cdf5d7ff36ba5bb40a2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7dad505448591fa9956cdf5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 11:50:12 2022 +0100 msvcrt: Use correct integral types in structs. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/msvcp.h | 2 +- dlls/msvcp90/exception.c | 2 +- dlls/msvcp90/msvcp90.h | 2 +- dlls/msvcrt/concurrency.c | 6 +++--- dlls/msvcrt/cpp.c | 2 +- dlls/msvcrt/msvcrt.h | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index 19078a133e4..2e5b24dccef 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -266,7 +266,7 @@ typedef enum { typedef struct _iosarray { struct _iosarray *next; int index; - int long_val; + LONG long_val; void *ptr_val; } IOS_BASE_iosarray; diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index e5b6018fe31..7f1dfd2188a 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -954,7 +954,7 @@ int __cdecl __uncaught_exceptions(void) typedef struct { EXCEPTION_RECORD *rec; - int *ref; /* not binary compatible with native */ + LONG *ref; /* not binary compatible with native */ } exception_ptr; /********************************************************************* diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 4aa88e028d6..052305a8a25 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -379,7 +379,7 @@ typedef enum { typedef struct _iosarray { struct _iosarray *next; int index; - int long_val; + LONG long_val; void *ptr_val; } IOS_BASE_iosarray; diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index f0a97f98e41..0a393cd0004 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -169,7 +169,7 @@ typedef struct cs_queue { struct cs_queue *next; #if _MSVCR_VER >= 110 - BOOL free; + LONG free; int unknown; #endif } cs_queue; @@ -249,7 +249,7 @@ typedef struct thread_wait_entry typedef struct thread_wait { void *signaled; - int pending_waits; + LONG pending_waits; thread_wait_entry entries[1]; } thread_wait; @@ -263,7 +263,7 @@ typedef struct #if _MSVCR_VER >= 110 typedef struct cv_queue { struct cv_queue *next; - BOOL expired; + LONG expired; } cv_queue; typedef struct { diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 6617237b055..f3200e046cb 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1134,7 +1134,7 @@ const char * __thiscall type_info_name_internal_method(type_info * _this, struct typedef struct { EXCEPTION_RECORD *rec; - int *ref; /* not binary compatible with native msvcr100 */ + LONG *ref; /* not binary compatible with native msvcr100 */ } exception_ptr; #if _MSVCR_VER >= 100 diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index e50f3e6991b..1d965ff8ffc 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -66,7 +66,7 @@ typedef struct __lc_time_data { LCID lcid; #endif int unk; - int refcount; + LONG refcount; #if _MSVCR_VER == 0 || _MSVCR_VER >= 100 union { const wchar_t *wstr[43]; @@ -90,7 +90,7 @@ typedef struct __lc_time_data { } __lc_time_data; typedef struct threadmbcinfostruct { - int refcount; + LONG refcount; int mbcodepage; int ismbcodepage; int mblcid;

1 0

Eric Pouech : msvcp: Use correct integral types.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 3fb30b5d75a201b9afb8f1cfaa978faa35499cbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fb30b5d75a201b9afb8f1cf… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 11:50:18 2022 +0100 msvcp: Use correct integral types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 4 ++-- dlls/msvcp90/ios.c | 4 ++-- dlls/msvcp90/locale.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 495817a54db..9cb78e9dd8e 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -8442,7 +8442,7 @@ basic_istream_char* __thiscall basic_istream_char_read_int(basic_istream_char *t istreambuf_iterator_char first={0}, last={0}; first.strbuf = strbuf; - num_get_char_get_long(numget, &last, first, last, &base->base, &state, v); + num_get_char_get_long(numget, &last, first, last, &base->base, &state, (LONG*)v); } basic_istream_char_sentry_destroy(this); @@ -9953,7 +9953,7 @@ static basic_istream_wchar* basic_istream_read_int(basic_istream_wchar *this, in istreambuf_iterator_wchar first={0}, last={0}; first.strbuf = strbuf; - num_get_wchar_get_long(numget, &last, first, last, &base->base, &state, v); + num_get_wchar_get_long(numget, &last, first, last, &base->base, &state, (LONG*)v); } basic_istream_wchar_sentry_destroy(this); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 21cf33a505c..a4a8657e74f 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8978,7 +8978,7 @@ basic_istream_char* __thiscall basic_istream_char_read_int(basic_istream_char *t istreambuf_iterator_char first={0}, last={0}; first.strbuf = strbuf; - num_get_char_get_long(numget, &last, first, last, &base->base, &state, v); + num_get_char_get_long(numget, &last, first, last, &base->base, &state, (LONG*)v); } basic_istream_char_sentry_destroy(this); @@ -10560,7 +10560,7 @@ static basic_istream_wchar* basic_istream_read_int(basic_istream_wchar *this, in istreambuf_iterator_wchar first={0}, last={0}; first.strbuf = strbuf; - num_get_wchar_get_long(numget, &last, first, last, &base->base, &state, v); + num_get_wchar_get_long(numget, &last, first, last, &base->base, &state, (LONG*)v); } basic_istream_wchar_sentry_destroy(this); diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 116f3c75e5d..dd7fea203eb 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -5931,7 +5931,7 @@ istreambuf_iterator_wchar *__thiscall num_get_wchar_do_get_uint(const num_get *t istreambuf_iterator_wchar first, istreambuf_iterator_wchar last, ios_base *base, int *state, unsigned int *pval) { TRACE("(%p %p %p %p %p)\n", this, ret, base, state, pval); - return num_get_wchar_do_get_ulong(this, ret, first, last, base, state, pval); + return num_get_wchar_do_get_ulong(this, ret, first, last, base, state, (ULONG*)pval); } /* ?do_get@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@MBE?AV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@0AAVios_base(a)2@AAHAAI(a)Z */ @@ -5941,7 +5941,7 @@ istreambuf_iterator_wchar *__thiscall num_get_short_do_get_uint(const num_get *t istreambuf_iterator_wchar first, istreambuf_iterator_wchar last, ios_base *base, int *state, unsigned int *pval) { TRACE("(%p %p %p %p %p)\n", this, ret, base, state, pval); - return num_get_short_do_get_ulong(this, ret, first, last, base, state, pval); + return num_get_short_do_get_ulong(this, ret, first, last, base, state, (ULONG*)pval); } /* ?get@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@0AAVios_base(a)2@AAHAAI(a)Z */ @@ -6921,7 +6921,7 @@ istreambuf_iterator_char *__thiscall num_get_char_do_get_uint(const num_get *thi istreambuf_iterator_char first, istreambuf_iterator_char last, ios_base *base, int *state, unsigned int *pval) { TRACE("(%p %p %p %p %p)\n", this, ret, base, state, pval); - return num_get_char_do_get_ulong(this, ret, first, last, base, state, pval); + return num_get_char_do_get_ulong(this, ret, first, last, base, state, (ULONG*)pval); } /* ?get@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHAAI(a)Z */

1 0

Eric Pouech : msvcrt: Add cast to avoid 'long' types warning in _beginthreadex.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 800971f9344e67067f0c8c96a8ffb4c264414d4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=800971f9344e67067f0c8c96… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 11:50:24 2022 +0100 msvcrt: Add cast to avoid 'long' types warning in _beginthreadex. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index 173763d0eb1..e71b949a6d5 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -235,7 +235,7 @@ uintptr_t CDECL _beginthreadex( #endif thread = CreateThread(security, stack_size, _beginthreadex_trampoline, - trampoline, initflag, thrdaddr); + trampoline, initflag, (DWORD *)thrdaddr); if(!thread) { #if _MSVCR_VER >= 140 FreeLibrary(trampoline->module);

1 0

Eric Pouech : msvcrt: Add casts to avoid 'long' types warning in locale functions.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 29541adafa3fc7422293dc4ea385535b9dbc3c99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29541adafa3fc7422293dc4e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 11:50:30 2022 +0100 msvcrt: Add casts to avoid 'long' types warning in locale functions. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 4c0fce194bd..3b3d027f466 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -429,13 +429,13 @@ static void copy_threadlocinfo_category(pthreadlocinfo locinfo, if(!locinfo->lc_category[category].locale) { locinfo->lc_category[category].locale = old_locinfo->lc_category[category].locale; locinfo->lc_category[category].refcount = old_locinfo->lc_category[category].refcount; - InterlockedIncrement(locinfo->lc_category[category].refcount); + InterlockedIncrement((LONG *)locinfo->lc_category[category].refcount); } #if _MSVCR_VER >= 110 locinfo->lc_name[category] = old_locinfo->lc_name[category]; locinfo->lc_category[category].wrefcount = old_locinfo->lc_category[category].wrefcount; if(locinfo->lc_category[category].wrefcount) - InterlockedIncrement(locinfo->lc_category[category].wrefcount); + InterlockedIncrement((LONG *)locinfo->lc_category[category].wrefcount); #endif } @@ -560,21 +560,21 @@ static void grab_locinfo(pthreadlocinfo locinfo) { int i; - InterlockedIncrement(&locinfo->refcount); + InterlockedIncrement((LONG *)&locinfo->refcount); for(i=LC_MIN+1; i<=LC_MAX; i++) { - InterlockedIncrement(locinfo->lc_category[i].refcount); + InterlockedIncrement((LONG *)locinfo->lc_category[i].refcount); if(locinfo->lc_category[i].wrefcount) - InterlockedIncrement(locinfo->lc_category[i].wrefcount); + InterlockedIncrement((LONG *)locinfo->lc_category[i].wrefcount); } if(locinfo->lconv_intl_refcount) - InterlockedIncrement(locinfo->lconv_intl_refcount); + InterlockedIncrement((LONG *)locinfo->lconv_intl_refcount); if(locinfo->lconv_num_refcount) - InterlockedIncrement(locinfo->lconv_num_refcount); + InterlockedIncrement((LONG *)locinfo->lconv_num_refcount); if(locinfo->lconv_mon_refcount) - InterlockedIncrement(locinfo->lconv_mon_refcount); + InterlockedIncrement((LONG *)locinfo->lconv_mon_refcount); if(locinfo->ctype1_refcount) - InterlockedIncrement(locinfo->ctype1_refcount); + InterlockedIncrement((LONG *)locinfo->ctype1_refcount); InterlockedIncrement(&locinfo->lc_time_curr->refcount); } @@ -1039,12 +1039,12 @@ void free_locinfo(pthreadlocinfo locinfo) for(i=LC_MIN+1; i<=LC_MAX; i++) { if(!locinfo->lc_category[i].refcount - || !InterlockedDecrement(locinfo->lc_category[i].refcount)) { + || !InterlockedDecrement((LONG *)locinfo->lc_category[i].refcount)) { free(locinfo->lc_category[i].locale); free(locinfo->lc_category[i].refcount); } if(!locinfo->lc_category[i].wrefcount - || !InterlockedDecrement(locinfo->lc_category[i].wrefcount)) { + || !InterlockedDecrement((LONG *)locinfo->lc_category[i].wrefcount)) { #if _MSVCR_VER >= 110 free(locinfo->lc_name[i]); #endif @@ -1053,7 +1053,7 @@ void free_locinfo(pthreadlocinfo locinfo) } if(locinfo->lconv_num_refcount - && !InterlockedDecrement(locinfo->lconv_num_refcount)) { + && !InterlockedDecrement((LONG *)locinfo->lconv_num_refcount)) { free(locinfo->lconv->decimal_point); free(locinfo->lconv->thousands_sep); free(locinfo->lconv->grouping); @@ -1064,7 +1064,7 @@ void free_locinfo(pthreadlocinfo locinfo) free(locinfo->lconv_num_refcount); } if(locinfo->lconv_mon_refcount - && !InterlockedDecrement(locinfo->lconv_mon_refcount)) { + && !InterlockedDecrement((LONG *)locinfo->lconv_mon_refcount)) { free(locinfo->lconv->int_curr_symbol); free(locinfo->lconv->currency_symbol); free(locinfo->lconv->mon_decimal_point); @@ -1083,13 +1083,13 @@ void free_locinfo(pthreadlocinfo locinfo) free(locinfo->lconv_mon_refcount); } if(locinfo->lconv_intl_refcount - && !InterlockedDecrement(locinfo->lconv_intl_refcount)) { + && !InterlockedDecrement((LONG *)locinfo->lconv_intl_refcount)) { free(locinfo->lconv_intl_refcount); free(locinfo->lconv); } if(locinfo->ctype1_refcount - && !InterlockedDecrement(locinfo->ctype1_refcount)) { + && !InterlockedDecrement((LONG *)locinfo->ctype1_refcount)) { free(locinfo->ctype1_refcount); free(locinfo->ctype1); free((void*)locinfo->pclmap); @@ -1100,7 +1100,7 @@ void free_locinfo(pthreadlocinfo locinfo) && locinfo->lc_time_curr != &cloc_time_data) free(locinfo->lc_time_curr); - if(InterlockedDecrement(&locinfo->refcount)) + if(InterlockedDecrement((LONG *)&locinfo->refcount)) return; free(locinfo); @@ -1398,7 +1398,7 @@ static pthreadlocinfo create_locinfo(int category, locinfo->pclmap = old_locinfo->pclmap; locinfo->pcumap = old_locinfo->pcumap; if(locinfo->ctype1_refcount) - InterlockedIncrement(locinfo->ctype1_refcount); + InterlockedIncrement((LONG *)locinfo->ctype1_refcount); } else if(lcid[LC_CTYPE]) { CPINFO cp_info; int j; @@ -1480,7 +1480,7 @@ static pthreadlocinfo create_locinfo(int category, locinfo->lconv = old_locinfo->lconv; locinfo->lconv_intl_refcount = old_locinfo->lconv_intl_refcount; if(locinfo->lconv_intl_refcount) - InterlockedIncrement(locinfo->lconv_intl_refcount); + InterlockedIncrement((LONG *)locinfo->lconv_intl_refcount); } else if(lcid[LC_MONETARY] || lcid[LC_NUMERIC]) { locinfo->lconv = malloc(sizeof(struct lconv)); locinfo->lconv_intl_refcount = malloc(sizeof(int)); @@ -1510,7 +1510,7 @@ static pthreadlocinfo create_locinfo(int category, copy_threadlocinfo_category(locinfo, old_locinfo, LC_MONETARY); locinfo->lconv_mon_refcount = old_locinfo->lconv_mon_refcount; if(locinfo->lconv_mon_refcount) - InterlockedIncrement(locinfo->lconv_mon_refcount); + InterlockedIncrement((LONG *)locinfo->lconv_mon_refcount); if(locinfo->lconv != &cloc_lconv && locinfo->lconv != old_locinfo->lconv) { locinfo->lconv->int_curr_symbol = old_locinfo->lconv->int_curr_symbol; locinfo->lconv->currency_symbol = old_locinfo->lconv->currency_symbol; @@ -1785,7 +1785,7 @@ static pthreadlocinfo create_locinfo(int category, copy_threadlocinfo_category(locinfo, old_locinfo, LC_NUMERIC); locinfo->lconv_num_refcount = old_locinfo->lconv_num_refcount; if(locinfo->lconv_num_refcount) - InterlockedIncrement(locinfo->lconv_num_refcount); + InterlockedIncrement((LONG *)locinfo->lconv_num_refcount); if(locinfo->lconv != &cloc_lconv && locinfo->lconv != old_locinfo->lconv) { locinfo->lconv->decimal_point = old_locinfo->lconv->decimal_point; locinfo->lconv->thousands_sep = old_locinfo->lconv->thousands_sep;

1 0

Eric Pouech : d3dx11/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 513720542547af3195994a73e8e51ab5e15152b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=513720542547af3195994a73… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 19:40:06 2022 +0100 d3dx11/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_42/tests/Makefile.in | 1 - dlls/d3dx11_43/tests/Makefile.in | 1 - dlls/d3dx11_43/tests/d3dx11.c | 145 ++++++++++++++++++++------------------- 3 files changed, 73 insertions(+), 74 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=513720542547af319599…

1 0

Henri Verbeet : d2d1/tests: Pass the hash size as DWORD in compare_sha1().
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: ce6372d9b8f0dbff24ed94353c901394325a3720 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce6372d9b8f0dbff24ed9435… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 3 19:40:07 2022 +0100 d2d1/tests: Pass the hash size as DWORD in compare_sha1(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index b0aa02ad2a9..314d8b7ce60 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -536,6 +536,7 @@ static BOOL compare_sha1(void *data, unsigned int pitch, unsigned int bpp, HCRYPTPROV provider; BYTE hash_data[20]; HCRYPTHASH hash; + DWORD hash_size; unsigned int i; char sha1[41]; BOOL ret; @@ -552,10 +553,10 @@ static BOOL compare_sha1(void *data, unsigned int pitch, unsigned int bpp, } ok(ret, "Failed to hash data.\n"); - i = sizeof(hash_data); - ret = CryptGetHashParam(hash, HP_HASHVAL, hash_data, &i, 0); + hash_size = sizeof(hash_data); + ret = CryptGetHashParam(hash, HP_HASHVAL, hash_data, &hash_size, 0); ok(ret, "Failed to get hash value.\n"); - ok(i == sizeof(hash_data), "Got unexpected hash size %u.\n", i); + ok(hash_size == sizeof(hash_data), "Got unexpected hash size %u.\n", hash_size); ret = CryptDestroyHash(hash); ok(ret, "Failed to destroy hash.\n");

1 0