mirrors/mingw-w64
1
0
Fork 0
mirror of https://git.code.sf.net/p/mingw-w64/mingw-w64 synced 2024-11-23 09:54:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

widl: Update to current Wine version.

Browse Source 
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
This commit is contained in:
Jacek Caban 2023-04-13 23:38:11 +02:00
parent d48a95a494
commit 6a0bbbf931
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mingw-w64-tools/widl/include/winnt.h
View File

@ -6541,8 +6541,10 @@ typedef enum _FIRMWARE_TYPE
#pragma intrinsic(_InterlockedAnd)
#pragma intrinsic(_InterlockedCompareExchange)
#pragma intrinsic(_InterlockedCompareExchange64)
#pragma intrinsic(_InterlockedCompareExchangePointer)
#pragma intrinsic(_InterlockedExchange)
#pragma intrinsic(_InterlockedExchangeAdd)
#pragma intrinsic(_InterlockedExchangePointer)
#pragma intrinsic(_InterlockedIncrement)
#pragma intrinsic(_InterlockedIncrement16)
#pragma intrinsic(_InterlockedDecrement)
@ -6556,10 +6558,12 @@ BOOLEAN _BitScanReverse(unsigned long*,unsigned long);
long _InterlockedAnd(long volatile *,long);
long _InterlockedCompareExchange(long volatile*,long,long);
long long _InterlockedCompareExchange64(long long volatile*,long long,long long);
void * _InterlockedCompareExchangePointer(void *volatile*,void*,void*);
long _InterlockedDecrement(long volatile*);
short _InterlockedDecrement16(short volatile*);
long _InterlockedExchange(long volatile*,long);
long _InterlockedExchangeAdd(long volatile*,long);
void * _InterlockedExchangePointer(void *volatile*,void*);
long _InterlockedIncrement(long volatile*);
short _InterlockedIncrement16(short volatile*);
long _InterlockedOr(long volatile *,long);
@ -6569,19 +6573,15 @@ DECLSPEC_NORETURN void __fastfail(unsigned int);
#ifndef __i386__
#pragma intrinsic(_InterlockedAnd64)
#pragma intrinsic(_InterlockedCompareExchangePointer)
#pragma intrinsic(_InterlockedDecrement64)
#pragma intrinsic(_InterlockedExchangeAdd64)
#pragma intrinsic(_InterlockedExchangePointer)
#pragma intrinsic(_InterlockedIncrement64)
#pragma intrinsic(_InterlockedOr64)
#pragma intrinsic(_InterlockedXor64)
__int64 _InterlockedAnd64(__int64 volatile *, __int64);
void * _InterlockedCompareExchangePointer(void *volatile*,void*,void*);
__int64 _InterlockedDecrement64(__int64 volatile *);
__int64 _InterlockedExchangeAdd64(__int64 volatile *, __int64);
void * _InterlockedExchangePointer(void *volatile*,void*);
__int64 _InterlockedIncrement64(__int64 volatile *);
__int64 _InterlockedOr64(__int64 volatile *, __int64);
__int64 _InterlockedXor64(__int64 volatile *, __int64);
@ -6595,11 +6595,6 @@ static FORCEINLINE __int64 InterlockedAnd64( __int64 volatile *dest, __int64 val
return prev;
}
static FORCEINLINE void * WINAPI InterlockedCompareExchangePointer( void *volatile *dest, void *xchg, void *compare )
{
return (void *)_InterlockedCompareExchange( (long volatile*)dest, (long)xchg, (long)compare );
}
static FORCEINLINE __int64 InterlockedExchangeAdd64( __int64 volatile *dest, __int64 val )
{
__int64 prev;
@ -6607,11 +6602,6 @@ static FORCEINLINE __int64 InterlockedExchangeAdd64( __int64 volatile *dest, __i
return prev;
}
static FORCEINLINE void * WINAPI InterlockedExchangePointer( void *volatile *dest, void *val )
{
return (void *)_InterlockedExchange( (long volatile*)dest, (long)val );
}
static FORCEINLINE __int64 InterlockedIncrement64( __int64 volatile *dest )
{
return InterlockedExchangeAdd64( dest, 1 ) + 1;

8
mingw-w64-tools/widl/src/parser.tab.c
View File

@ -7756,8 +7756,12 @@ static void check_field_common(const type_t *container_type,
break;
}
case TGT_POINTER:
type = type_pointer_get_ref_type(type);
more_to_do = TRUE;
if (type_get_type(type_pointer_get_ref_type(type)) != TYPE_VOID ||
!type->name || strcmp(type->name, "HANDLE"))
{
type = type_pointer_get_ref_type(type);
more_to_do = TRUE;
}
break;
case TGT_ARRAY:
type = type_array_get_element_type(type);

8
mingw-w64-tools/widl/src/parser.y
View File

@ -2481,8 +2481,12 @@ static void check_field_common(const type_t *container_type,
break;
}
case TGT_POINTER:
type = type_pointer_get_ref_type(type);
more_to_do = TRUE;
if (type_get_type(type_pointer_get_ref_type(type)) != TYPE_VOID ||
!type->name || strcmp(type->name, "HANDLE"))
{
type = type_pointer_get_ref_type(type);
more_to_do = TRUE;
}
break;
case TGT_ARRAY:
type = type_array_get_element_type(type);