wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Alexandre Julliard : dnsapi: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: c78fce9e5b85780c1825667c4f4a99702be4fcbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=c78fce9e5b85780c1825667c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 8 20:54:16 2021 +0100 dnsapi: Implement Wow64 entry points in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/dnsapi.h | 5 --- dlls/dnsapi/libresolv.c | 86 +++++++++++++++++++++++++++++++++++++++++++++---- dlls/dnsapi/query.c | 3 +- 3 files changed, 80 insertions(+), 14 deletions(-) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index af3dee45bb9..f27cce9a99d 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -139,11 +139,6 @@ struct get_serverlist_params DWORD *len; }; -struct set_serverlist_params -{ - const IP4_ARRAY *addrs; -}; - struct query_params { const char *name; diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index 9e12683b8a8..0871348fb22 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -124,7 +124,7 @@ static DNS_STATUS map_h_errno( int error ) static NTSTATUS resolv_get_searchlist( void *args ) { - struct get_searchlist_params *params = args; + const struct get_searchlist_params *params = args; DNS_TXT_DATAW *list = params->list; DWORD i, needed, str_needed = 0; char *ptr, *end; @@ -170,7 +170,7 @@ static inline int filter( unsigned short sin_family, USHORT family ) static NTSTATUS resolv_get_serverlist( void *args ) { - struct get_serverlist_params *params = args; + const struct get_serverlist_params *params = args; DNS_ADDR_ARRAY *addrs = params->addrs; struct __res_state *state = &_res; DWORD i, found, total, needed; @@ -238,7 +238,7 @@ static NTSTATUS resolv_get_serverlist( void *args ) static NTSTATUS resolv_get_serverlist( void *args ) { - struct get_serverlist_params *params = args; + const struct get_serverlist_params *params = args; DNS_ADDR_ARRAY *addrs = params->addrs; DWORD needed, found, i; @@ -305,8 +305,7 @@ static NTSTATUS resolv_get_serverlist( void *args ) static NTSTATUS resolv_set_serverlist( void *args ) { - struct set_serverlist_params *params = args; - const IP4_ARRAY *addrs = params->addrs; + const IP4_ARRAY *addrs = args; int i; init_resolver(); @@ -328,7 +327,7 @@ static NTSTATUS resolv_set_serverlist( void *args ) static NTSTATUS resolv_query( void *args ) { - struct query_params *params = args; + const struct query_params *params = args; DNS_STATUS ret = ERROR_SUCCESS; int len; @@ -342,7 +341,7 @@ static NTSTATUS resolv_query( void *args ) return ret; } -unixlib_entry_t __wine_unix_call_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { resolv_get_searchlist, resolv_get_serverlist, @@ -350,4 +349,77 @@ unixlib_entry_t __wine_unix_call_funcs[] = resolv_query, }; +#ifdef _WIN64 + +typedef ULONG PTR32; + +static NTSTATUS wow64_resolv_get_searchlist( void *args ) +{ + struct + { + PTR32 list; + PTR32 len; + } const *params32 = args; + + struct get_searchlist_params params = + { + ULongToPtr(params32->list), + ULongToPtr(params32->len) + }; + + return resolv_get_searchlist( &params ); +} + +static NTSTATUS wow64_resolv_get_serverlist( void *args ) +{ + struct + { + USHORT family; + PTR32 addrs; + PTR32 len; + } const *params32 = args; + + struct get_serverlist_params params = + { + params32->family, + ULongToPtr(params32->addrs), + ULongToPtr(params32->len) + }; + + return resolv_get_serverlist( &params ); +} + +static NTSTATUS wow64_resolv_query( void *args ) +{ + struct + { + PTR32 name; + WORD type; + DWORD options; + PTR32 buf; + PTR32 len; + } const *params32 = args; + + struct query_params params = + { + ULongToPtr(params32->name), + params32->type, + params32->options, + ULongToPtr(params32->buf), + ULongToPtr(params32->len) + }; + + return resolv_query( &params ); +} + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + wow64_resolv_get_searchlist, + wow64_resolv_get_serverlist, + resolv_set_serverlist, + wow64_resolv_query, +}; + +#endif /* _WIN64 */ + #endif /* HAVE_RESOLV */ diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 7bfaf78cc7f..f732c6a6c65 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -170,7 +170,6 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser DNS_STATUS ret = DNS_ERROR_RCODE_NOT_IMPLEMENTED; unsigned char answer[4096]; DWORD len = sizeof(answer); - struct set_serverlist_params servlist_params = { servers }; struct query_params query_params = { name, type, options, answer, &len }; TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), debugstr_type( type ), @@ -179,7 +178,7 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser if (!name || !result) return ERROR_INVALID_PARAMETER; - if ((ret = RESOLV_CALL( set_serverlist, &servlist_params ))) return ret; + if ((ret = RESOLV_CALL( set_serverlist, servers ))) return ret; ret = RESOLV_CALL( query, &query_params ); if (!ret)

1 0

Alexandre Julliard : ctapi32: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: fc67bbf27fbcd5d32a373b599e038fab069d9177 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc67bbf27fbcd5d32a373b59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 8 20:53:51 2021 +0100 ctapi32: Implement Wow64 entry points in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ctapi32/ctapi32.c | 4 +--- dlls/ctapi32/unixlib.c | 54 ++++++++++++++++++++++++++++++++++++++++++++------ dlls/ctapi32/unixlib.h | 5 ----- 3 files changed, 49 insertions(+), 14 deletions(-) diff --git a/dlls/ctapi32/ctapi32.c b/dlls/ctapi32/ctapi32.c index 471da7bbd14..5d5060ace47 100644 --- a/dlls/ctapi32/ctapi32.c +++ b/dlls/ctapi32/ctapi32.c @@ -38,7 +38,6 @@ static unixlib_handle_t ctapi_handle; static BOOL load_functions(void) { - struct attach_params params; char soname[MAX_PATH] = FALLBACK_LIBCTAPI; LONG result; HKEY key_handle; @@ -61,8 +60,7 @@ static BOOL load_functions(void) { } TRACE("Loading library '%s'\n", soname); - params.libname = soname; - if (!CTAPI_CALL( attach, &params )) return TRUE; + if (!CTAPI_CALL( attach, soname )) return TRUE; MESSAGE("Wine cannot find any usable hardware library, ctapi32.dll not working.\n"); MESSAGE("Please create the key \"HKEY_CURRENT_USER\\Software\\Wine\\ctapi32\" in your registry\n"); diff --git a/dlls/ctapi32/unixlib.c b/dlls/ctapi32/unixlib.c index a31c0a13c30..cdfe6e6eb73 100644 --- a/dlls/ctapi32/unixlib.c +++ b/dlls/ctapi32/unixlib.c @@ -40,9 +40,9 @@ static void *ctapi_handle; static NTSTATUS attach( void *args ) { - struct attach_params *params = args; + const char *libname = args; - if (!(ctapi_handle = dlopen( params->libname, RTLD_NOW ))) return STATUS_DLL_NOT_FOUND; + if (!(ctapi_handle = dlopen( libname, RTLD_NOW ))) return STATUS_DLL_NOT_FOUND; #define LOAD_FUNCPTR(f) if((p##f = dlsym(ctapi_handle, #f)) == NULL) return STATUS_ENTRYPOINT_NOT_FOUND LOAD_FUNCPTR(CT_init); @@ -60,14 +60,14 @@ static NTSTATUS detach( void *args ) static NTSTATUS ct_init( void *args ) { - struct ct_init_params *params = args; + const struct ct_init_params *params = args; return pCT_init(params->ctn, params->pn); } static NTSTATUS ct_data( void *args ) { - struct ct_data_params *params = args; + const struct ct_data_params *params = args; return pCT_data(params->ctn, params->dad, params->sad, params->lenc, params->command, params->lenr, params->response); @@ -75,12 +75,12 @@ static NTSTATUS ct_data( void *args ) static NTSTATUS ct_close( void *args ) { - struct ct_close_params *params = args; + const struct ct_close_params *params = args; return pCT_close(params->ctn); } -unixlib_entry_t __wine_unix_call_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { attach, detach, @@ -88,3 +88,45 @@ unixlib_entry_t __wine_unix_call_funcs[] = ct_data, ct_close, }; + +#ifdef _WIN64 + +typedef ULONG PTR32; + +static NTSTATUS wow64_ct_data( void *args ) +{ + struct + { + IU16 ctn; + PTR32 dad; + PTR32 sad; + IU16 lenc; + PTR32 command; + PTR32 lenr; + PTR32 response; + } const *params32 = args; + + struct ct_data_params params = + { + params32->ctn, + ULongToPtr(params32->dad), + ULongToPtr(params32->sad), + params32->lenc, + ULongToPtr(params32->command), + ULongToPtr(params32->lenr), + ULongToPtr(params32->response) + }; + + return ct_data( &params ); +} + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + attach, + detach, + ct_init, + wow64_ct_data, + ct_close, +}; + +#endif /* _WIN64 */ diff --git a/dlls/ctapi32/unixlib.h b/dlls/ctapi32/unixlib.h index 05301b99fcf..535c2aeae09 100644 --- a/dlls/ctapi32/unixlib.h +++ b/dlls/ctapi32/unixlib.h @@ -31,11 +31,6 @@ typedef unsigned short IU16; typedef signed char IS8; typedef signed short IS16; -struct attach_params -{ - const char *libname; -}; - struct ct_init_params { IU16 ctn;

1 0

Alexandre Julliard : avicap32: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 9f69a0ddaa2f33cf42fc0bd489f189f6c222ceab URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f69a0ddaa2f33cf42fc0bd4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 8 20:53:24 2021 +0100 avicap32: Implement Wow64 entry points in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avicap32/v4l.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/avicap32/v4l.c b/dlls/avicap32/v4l.c index 0b004e17e58..ef41b7e281b 100644 --- a/dlls/avicap32/v4l.c +++ b/dlls/avicap32/v4l.c @@ -134,4 +134,13 @@ const unixlib_entry_t __wine_unix_call_funcs[] = get_device_desc, }; +#ifdef _WIN64 + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + get_device_desc, +}; + +#endif /* _WIN64 */ + #endif /* HAVE_LINUX_VIDEODEV_2 */

1 0

Stefan Dösinger : include: _InterlockedExchangePointer is an intrinsic on x86 in newer MSVC versions.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: ad05f33d676ff43484a8bdcffa7122280d1bd10d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad05f33d676ff43484a8bdcf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 8 16:39:01 2021 +0300 include: _InterlockedExchangePointer is an intrinsic on x86 in newer MSVC versions. msvc 2019 complains that _InterlockedCompareExchangePointer and _InterlockedExchangePointer are intrinsics and cannot be defined even when building for x86. If I read Microsoft's header right that started with msvc 2016. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index ef731e29c52..3e8a92fc063 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6345,7 +6345,7 @@ long _InterlockedIncrement(long volatile*); short _InterlockedIncrement16(short volatile*); long _InterlockedOr(long volatile *,long); -#ifndef __i386__ +#if !defined(__i386__) || _MSC_VER >= 1600 #pragma intrinsic(_InterlockedCompareExchangePointer) #pragma intrinsic(_InterlockedExchangePointer)

1 0

Stefan Dösinger : include: Add more dummy msvc SAL macros.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 793bb89c75ab6c95acb2b686724b6e9b6d0cfce1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=793bb89c75ab6c95acb2b686… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 8 16:39:00 2021 +0300 include: Add more dummy msvc SAL macros. To make Visual Studio 2019's msvcrt headers happy. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sal.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/sal.h b/include/sal.h index f11e744aa51..72803a1be39 100644 --- a/include/sal.h +++ b/include/sal.h @@ -202,6 +202,7 @@ #define _Pre_z_ #define _Prepost_z_ +#define _Printf_format_string_ #define _Printf_format_string_params_(count) #define _Reserved_ @@ -224,6 +225,7 @@ #define _Scanf_format_string_ #define _Scanf_format_string_params_(count) +#define _Scanf_s_format_string_ #define _Scanf_s_format_string_params_(count) #define _Success_(exp)

1 0

Arkadiusz Hiler : ucrtbase/tests: Test for FreeLibrary() vs _beginthread[ex]() race condition.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 96b6dbc94926363a2305913aec17119c85d6d449 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96b6dbc94926363a2305913a… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Nov 8 19:38:34 2021 +0200 ucrtbase/tests: Test for FreeLibrary() vs _beginthread[ex]() race condition. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ucrtbase/tests/thread.c b/dlls/ucrtbase/tests/thread.c index 8fffbffb38e..7693304e612 100644 --- a/dlls/ucrtbase/tests/thread.c +++ b/dlls/ucrtbase/tests/thread.c @@ -105,11 +105,11 @@ static void test_thread_library_reference(char *thread_dll, ok(thread_handle != -1 && thread_handle != 0, "Failed to begin thread: %u\n", errno); + ok(FreeLibrary(dll), "Failed to free the library: %u\n", GetLastError()); + ret = WaitForSingleObject(args.confirm_running, 200); ok(ret == WAIT_OBJECT_0, "Event was not signaled, ret: %u, err: %u\n", ret, GetLastError()); - ok(FreeLibrary(dll), "Failed to free the library: %u\n", GetLastError()); - ret = WaitForSingleObject(detach_event, 0); ok(ret == WAIT_TIMEOUT, "Thread detach happened unexpectedly signaling an event, ret: %d, err: %u\n", ret, GetLastError());

1 0

Arkadiusz Hiler : msvcrt: Increase module's reference count before returning from _beginthread[ex]().
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 04bb9112d2d540452068d1e22d4faf51fe11f351 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04bb9112d2d540452068d1e2… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Nov 8 19:38:33 2021 +0200 msvcrt: Increase module's reference count before returning from _beginthread[ex](). Increasing DLL's reference count from the trampoline function makes it prone to race conditions. The thread can start executing after we have already returned from _beginthread[ex]() and the DLL might have been freed. Fixes rare crash on launch with Baldur's Gate 3. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/thread.c | 50 +++++++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index 01500d93d91..173763d0eb1 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -32,6 +32,9 @@ typedef struct { _beginthreadex_start_routine_t start_address_ex; }; void *arglist; +#if _MSVCR_VER >= 140 + HMODULE module; +#endif } _beginthread_trampoline_t; /********************************************************************* @@ -113,16 +116,10 @@ static DWORD CALLBACK _beginthread_trampoline(LPVOID arg) thread_data_t *data = msvcrt_get_thread_data(); memcpy(&local_trampoline,arg,sizeof(local_trampoline)); - data->handle = local_trampoline.thread; free(arg); - + data->handle = local_trampoline.thread; #if _MSVCR_VER >= 140 - if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, - (void*)local_trampoline.start_address, &data->module)) - { - data->module = NULL; - WARN("failed to get module for the start_address: %d\n", GetLastError()); - } + data->module = local_trampoline.module; #endif local_trampoline.start_address(local_trampoline.arglist); @@ -162,7 +159,19 @@ uintptr_t CDECL _beginthread( trampoline->start_address = start_address; trampoline->arglist = arglist; +#if _MSVCR_VER >= 140 + if(!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, + (void*)start_address, &trampoline->module)) + { + trampoline->module = NULL; + WARN("failed to get module for the start_address: %d\n", GetLastError()); + } +#endif + if(ResumeThread(thread) == -1) { +#if _MSVCR_VER >= 140 + FreeLibrary(trampoline->module); +#endif free(trampoline); *_errno() = EAGAIN; return -1; @@ -181,19 +190,10 @@ static DWORD CALLBACK _beginthreadex_trampoline(LPVOID arg) thread_data_t *data = msvcrt_get_thread_data(); memcpy(&local_trampoline, arg, sizeof(local_trampoline)); - data->handle = local_trampoline.thread; free(arg); - + data->handle = local_trampoline.thread; #if _MSVCR_VER >= 140 - { - thread_data_t *data = msvcrt_get_thread_data(); - if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, - (void*)local_trampoline.start_address_ex, &data->module)) - { - data->module = NULL; - WARN("failed to get module for the start_address: %d\n", GetLastError()); - } - } + data->module = local_trampoline.module; #endif retval = local_trampoline.start_address_ex(local_trampoline.arglist); @@ -225,9 +225,21 @@ uintptr_t CDECL _beginthreadex( trampoline->start_address_ex = start_address; trampoline->arglist = arglist; +#if _MSVCR_VER >= 140 + if(!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, + (void*)start_address, &trampoline->module)) + { + trampoline->module = NULL; + WARN("failed to get module for the start_address: %d\n", GetLastError()); + } +#endif + thread = CreateThread(security, stack_size, _beginthreadex_trampoline, trampoline, initflag, thrdaddr); if(!thread) { +#if _MSVCR_VER >= 140 + FreeLibrary(trampoline->module); +#endif free(trampoline); msvcrt_set_errno(GetLastError()); return 0;

1 0

Rémi Bernon : include: Add some MPEG4 container attributes to mfidl.idl.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 2bec77cb5f9f0e8d0f492bf59d0230061750c1c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bec77cb5f9f0e8d0f492bf5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 8 15:08:16 2021 +0100 include: Add some MPEG4 container attributes to mfidl.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 511f97e3ac6..4df1d0c85ba 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1589,6 +1589,9 @@ cpp_quote("EXTERN_GUID(MR_AUDIO_POLICY_SERVICE, 0x911fd737, 0x6775, 0x4ab0, 0xa6 cpp_quote("EXTERN_GUID(MF_PROPERTY_HANDLER_SERVICE, 0xa3face02, 0x32b8, 0x41dd, 0x90, 0xe7, 0x5f, 0xef, 0x7c, 0x89, 0x91, 0xb5);") cpp_quote("EXTERN_GUID(MF_WORKQUEUE_SERVICES, 0x8e37d489, 0x41e0, 0x413a, 0x90, 0x68, 0x28, 0x7c, 0x88, 0x6d, 0x8d, 0xda);") +cpp_quote("EXTERN_GUID(MF_PROGRESSIVE_CODING_CONTENT, 0x8f020eea, 0x1508, 0x471f, 0x9d, 0xa6, 0x50, 0x7d, 0x7c, 0xfa, 0x40, 0xdb);") +cpp_quote("EXTERN_GUID(MF_NALU_LENGTH_SET, 0xa7911d53, 0x12a4, 0x4965, 0xae, 0x70, 0x6e, 0xad, 0xd6, 0xff, 0x05, 0x51);") + cpp_quote("EXTERN_GUID(MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET, 0x62e3d776, 0x8100, 0x4e03, 0xa6, 0xe8, 0xbd, 0x38, 0x57, 0xac, 0x9c, 0x47);") cpp_quote("EXTERN_GUID(MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, 0x0efda2c0, 0x2b69, 0x4e2e, 0xab, 0x8d, 0x46, 0xdc, 0xbf, 0xf7, 0xd2, 0x5d);")

1 0

Rémi Bernon : propsys: Fix VT_UI4 comparison, use ulVal instead of uiVal.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 58eeb1a86433db1104d3a9ccf9ad7435ec81443a URL: https://source.winehq.org/git/wine.git/?a=commit;h=58eeb1a86433db1104d3a9cc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 8 15:08:15 2021 +0100 propsys: Fix VT_UI4 comparison, use ulVal instead of uiVal. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 977fbebb918..be27c5cb641 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -865,7 +865,7 @@ INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2 CMP_NUM_VALUE(lVal); break; case VT_UI4: - CMP_NUM_VALUE(uiVal); + CMP_NUM_VALUE(ulVal); break; case VT_I8: CMP_NUM_VALUE(hVal.QuadPart);

1 0

Alistair Leslie-Hughes : include: Add define SQL_OV_ODBC3_80.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: ef306b148f477611b89eff9f29bb8f21f718d433 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef306b148f477611b89eff9f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 8 18:45:06 2021 +1100 include: Add define SQL_OV_ODBC3_80. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sqlext.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sqlext.h b/include/sqlext.h index ba799a36bb3..51e76a5a856 100644 --- a/include/sqlext.h +++ b/include/sqlext.h @@ -64,6 +64,7 @@ extern "C" { #define SQL_OV_ODBC2 __MSABI_LONG(2U) #define SQL_OV_ODBC3 __MSABI_LONG(3U) +#define SQL_OV_ODBC3_80 __MSABI_LONG(380U) #endif #define SQL_ACCESS_MODE 101

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
96
Older →

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 November 2021