January 2021 - Wine-commits

Zebediah Figura : vkd3d-shader: Implement inequality operators in #if directives.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: vkd3d Branch: master Commit: eecfe9c2a2d4dde32a60c7fb680c02ff74a6837d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=eecfe9c2a2d4dde32a60c7f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 19 11:18:21 2021 -0600 vkd3d-shader: Implement inequality operators in #if directives. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 7 +++++-- libs/vkd3d-shader/preproc.y | 43 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index a522b7c..6779a39 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -78,6 +78,9 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>{IDENTIFIER}/\( {return T_IDENTIFIER_PAREN;} <INITIAL>{IDENTIFIER} {return T_IDENTIFIER;} +<INITIAL>"<=" {return T_LE;} +<INITIAL>">=" {return T_GE;} + /* We have no use for floats, but shouldn't parse them as integers. */ <INITIAL>[0-9]*\.[0-9]+([eE][+-]?[0-9]+)?[hHfF]? {return T_TEXT;} @@ -96,7 +99,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>"--" {return T_TEXT;} <INITIAL>"<<"=? {return T_TEXT;} <INITIAL>">>"=? {return T_TEXT;} -<INITIAL>[-+*/%&|^=><!]= {return T_TEXT;} +<INITIAL>[-+*/%&|^=!]= {return T_TEXT;} <INCLUDE>\"[^"]*\" {return T_STRING;} <INCLUDE>\<[^>]*\> {return T_STRING;} @@ -157,7 +160,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* } <INITIAL>{WS}+ {} -<INITIAL>[-()\[\]{},+!*/] {return yytext[0];} +<INITIAL>[-()\[\]{},+!*/<>] {return yytext[0];} <INITIAL>. {return T_TEXT;} %% diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 61b6baf..6d88419 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -331,12 +331,16 @@ static void free_parse_arg_names(struct parse_arg_names *args) %token T_UNDEF "#undef" %token T_CONCAT "##" + +%token T_LE "<=" +%token T_GE ">=" %token T_DEFINED "defined" %type <integer> primary_expr %type <integer> unary_expr %type <integer> mul_expr %type <integer> add_expr +%type <integer> ineq_expr %type <string> body_token %type <const_string> body_token_const %type <string_buffer> body_text @@ -449,10 +453,26 @@ body_token_const { $$ = "/"; } + | '<' + { + $$ = "<"; + } + | '>' + { + $$ = ">"; + } | T_CONCAT { $$ = "##"; } + | T_LE + { + $$ = "<="; + } + | T_GE + { + $$ = ">="; + } | T_DEFINED { $$ = "defined"; @@ -490,7 +510,7 @@ directive } vkd3d_free($2); } - | T_IF add_expr T_NEWLINE + | T_IF ineq_expr T_NEWLINE { if (!preproc_push_if(ctx, !!$2)) YYABORT; @@ -505,7 +525,7 @@ directive preproc_push_if(ctx, !preproc_find_macro(ctx, $2)); vkd3d_free($2); } - | T_ELIF add_expr T_NEWLINE + | T_ELIF ineq_expr T_NEWLINE { const struct preproc_file *file = preproc_get_top_file(ctx); @@ -668,3 +688,22 @@ add_expr { $$ = $1 - $3; } + +ineq_expr + : add_expr + | ineq_expr '<' add_expr + { + $$ = $1 < $3; + } + | ineq_expr '>' add_expr + { + $$ = $1 > $3; + } + | ineq_expr T_LE add_expr + { + $$ = $1 <= $3; + } + | ineq_expr T_GE add_expr + { + $$ = $1 >= $3; + }

1 0

Francois Gouget : testbot/TestWTBS: Fix a typo in the TestUnits check.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: tools Branch: master Commit: 0fb4aa9ddb7ea476d065617eb1b6a3f4af8c090e URL: https://source.winehq.org/git/tools.git/?a=commit;h=0fb4aa9ddb7ea476d065617… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 21 11:16:22 2021 +0100 testbot/TestWTBS: Fix a typo in the TestUnits check. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index b4460b8..e8d8f3f 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -652,7 +652,7 @@ sub CheckJobTree($) { foreach my $TestUnit (split / +/, $TypeInfo->{TestUnits}) { - ok($TestUnits->{$Type}->{$TestUnit}, "Check that $TestUnit was tested by $Type VMs for job ". $Job->Id) or + ok($TestUnits->{$Type}->{$TestUnit}, "Check that $TestUnit was tested by $Type VMs for job ". $Job->Id) or diag("TestUnits=", join(" ", sort keys %{$TestUnits->{$Type}})); } }

1 0

Francois Gouget : testbot/TestWTBS: Do not allow nested $TestInfo structures.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: tools Branch: master Commit: 0485fbcee84d679e93f9b8a671fed6ff4cfa1bc4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0485fbcee84d679e93f9b8a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 21 11:16:11 2021 +0100 testbot/TestWTBS: Do not allow nested $TestInfo structures. Enforce $TestInfo to be of the form $TestInfo->{category}->{property}. Having $TestInfo->{category}->{subcategory}->{property} would make the propagation code more complex and would require documentation regarding how the subcategory properties get merged. That means properties cannot be hashtables, except in the case of the errors-matching properties since their value is a LoadLogErrors() structure. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index e8d8f3f..5f62d63 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -330,12 +330,24 @@ sub LoadTestInfo($) my ($Src, $TaskTypes) = @$Pair; foreach my $Field (keys %{$TestInfo->{$Src}}) { + my $SrcVal = $TestInfo->{$Src}->{$Field}; + if (ref($SrcVal) eq "HASH" and $Field !~ /\.errors$/) + { + # Simply propagating hashtable references would result in changes to + # win32 to impact the parent win / test parent which is not what we + # want. So subsets of properties are not supported. + # .errors properties are the exception because their values are a + # LoadLogErrors() structure. As a result they are read-only, and are + # not merged. + fail("internal error: $Src.$Field should not be a hash in $FileName"); + next; + } foreach my $TaskType (@$TaskTypes) { my $TaskInfo = $TestInfo->{$TaskType}; if (!defined $TaskInfo->{$Field}) { - $TaskInfo->{$Field} = $TestInfo->{$Src}->{$Field}; + $TaskInfo->{$Field} = $SrcVal; } } } @@ -404,6 +416,10 @@ the test suite, then one could also issue the following check: p tests.TestFailures 2 +Finally, note that while the error directives are inherited by subcategories, +they are not merged. So if if both win and win32 have error-matching +directives, win32 will not inherit anything from the win category. + =cut sub CheckLogErrors($$$)

1 0

Nikolay Sivov : dwrite: Zero-initialize run analysis object structure.
by Alexandre Julliard 20 Jan '21

20 Jan '21

Module: wine Branch: master Commit: 5197fd7c91eed7c1ff4309adf904c454f1b19336 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5197fd7c91eed7c1ff4309ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 20 18:14:33 2021 +0300 dwrite: Zero-initialize run analysis object structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c10234e09fc..74e6b929ecd 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5931,7 +5931,7 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit if ((UINT32)desc->measuring_mode > DWRITE_MEASURING_MODE_GDI_NATURAL) return E_INVALIDARG; - analysis = heap_alloc(sizeof(*analysis)); + analysis = heap_alloc_zero(sizeof(*analysis)); if (!analysis) return E_OUTOFMEMORY; @@ -5945,10 +5945,6 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit else analysis->texture_type = DWRITE_TEXTURE_CLEARTYPE_3x1; - analysis->flags = 0; - analysis->bitmap = NULL; - analysis->max_glyph_bitmap_size = 0; - SetRectEmpty(&analysis->bounds); analysis->run = *desc->run; IDWriteFontFace_AddRef(analysis->run.fontFace); analysis->glyphs = heap_calloc(desc->run->glyphCount, sizeof(*analysis->glyphs)); @@ -5970,12 +5966,8 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit analysis->m = *desc->transform; analysis->flags |= RUNANALYSIS_USE_TRANSFORM; } - else - memset(&analysis->m, 0, sizeof(analysis->m)); analysis->run.glyphIndices = analysis->glyphs; - analysis->run.glyphAdvances = NULL; - analysis->run.glyphOffsets = NULL; rtl_factor = desc->run->bidiLevel & 1 ? -1.0f : 1.0f;

1 0

Nikolay Sivov : gdi32/uniscribe: Merge Arabic joining types C and D.
by Alexandre Julliard 20 Jan '21

20 Jan '21

Module: wine Branch: master Commit: f734d98a98e5be5ae456b9a1516011ec57241632 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f734d98a98e5be5ae456b9a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 20 15:35:14 2021 +0300 gdi32/uniscribe: Merge Arabic joining types C and D. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/uniscribe/shape.c | 21 +-- dlls/gdi32/uniscribe/shaping.c | 314 ++++++++++++++++++++--------------------- tools/make_unicode | 14 +- 3 files changed, 177 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f734d98a98e5be5ae456…

1 0

Nikolay Sivov : gdi32/uniscribe: Get rid of shaping group values in Arabic shaping data table.
by Alexandre Julliard 20 Jan '21

20 Jan '21

Module: wine Branch: master Commit: 016eeb5109663420e25e5ba3da019135331a893e URL: https://source.winehq.org/git/wine.git/?a=commit;h=016eeb5109663420e25e5ba3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 20 15:35:15 2021 +0300 gdi32/uniscribe: Get rid of shaping group values in Arabic shaping data table. It's not used right now, Syriac specific groups will be accomodated as additional joining types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/uniscribe/shaping.c | 356 ++++++++++++++++++++--------------------- tools/make_unicode | 8 +- 2 files changed, 175 insertions(+), 189 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=016eeb5109663420e25e…

1 0

Nikolay Sivov : make_unicode: Make it explicit what other default joining type is.
by Alexandre Julliard 20 Jan '21

20 Jan '21

Module: wine Branch: master Commit: 9c11fc642f8c84a0d8ff1ed9c07387d7565a4994 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c11fc642f8c84a0d8ff1ed9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 20 15:35:16 2021 +0300 make_unicode: Make it explicit what other default joining type is. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_unicode | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/make_unicode b/tools/make_unicode index 27ce80432a8..da4c732bc3e 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -643,7 +643,14 @@ sub load_data() $category_table[$src] = $categories{$cat}; $direction_table[$src] = $bidi; - $joining_table[$src] = $joining_types{"T"} if $cat eq "Mn" || $cat eq "Me" || $cat eq "Cf"; + if ($cat eq "Mn" || $cat eq "Me" || $cat eq "Cf") + { + $joining_table[$src] = $joining_types{"T"}; + } + else + { + $joining_table[$src] = $joining_types{"U"}; + } if ($lower ne "") {

1 0

Hans Leidekker : ws2_32: Avoid returning duplicate entries from WS_getaddrinfo.
by Alexandre Julliard 20 Jan '21

20 Jan '21

Module: wine Branch: master Commit: e7dc82377b37810109910fe92c4ce8cdb516f782 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7dc82377b37810109910fe9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 20 15:56:29 2021 +0100 ws2_32: Avoid returning duplicate entries from WS_getaddrinfo. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 381c61d5e10..88dfc83dbc2 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6528,6 +6528,21 @@ static char *get_fqdn(void) return ret; } +static BOOL addrinfo_in_list( const struct WS_addrinfo *list, const struct WS_addrinfo *ai ) +{ + const struct WS_addrinfo *cursor = list; + while (cursor) + { + if (ai->ai_flags == cursor->ai_flags && ai->ai_family == cursor->ai_family && + ai->ai_socktype == cursor->ai_socktype && ai->ai_protocol == cursor->ai_protocol && + ai->ai_addrlen == cursor->ai_addrlen && !memcmp(ai->ai_addr, cursor->ai_addr, ai->ai_addrlen) && + ((ai->ai_canonname && cursor->ai_canonname && !strcmp(ai->ai_canonname, cursor->ai_canonname)) + || (!ai->ai_canonname && !cursor->ai_canonname))) return TRUE; + cursor = cursor->ai_next; + } + return FALSE; +} + /*********************************************************************** * getaddrinfo (WS2_32.@) */ @@ -6654,7 +6669,6 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr if (!ai) goto outofmem; - *xai = ai;xai = &ai->ai_next; ai->ai_flags = convert_aiflag_u2w(xuai->ai_flags); ai->ai_family = convert_af_u2w(xuai->ai_family); /* copy whatever was sent in the hints */ @@ -6690,6 +6704,18 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr goto outofmem; ai->ai_addrlen = len; } while (1); + + if (addrinfo_in_list(*res, ai)) + { + HeapFree(GetProcessHeap(), 0, ai->ai_canonname); + HeapFree(GetProcessHeap(), 0, ai->ai_addr); + HeapFree(GetProcessHeap(), 0, ai); + } + else + { + *xai = ai; + xai = &ai->ai_next; + } xuai = xuai->ai_next; } freeaddrinfo(unixaires);

1 0

Hans Leidekker : ws2_32: Fix buffer size query in WSAAddressToStringW.
by Alexandre Julliard 20 Jan '21

20 Jan '21

Module: wine Branch: master Commit: dc02bbee547266ef4c55bc9105e0337ffcedda83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc02bbee547266ef4c55bc91… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 20 15:56:30 2021 +0100 ws2_32: Fix buffer size query in WSAAddressToStringW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 25 +++++-------------------- dlls/ws2_32/tests/sock.c | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 88dfc83dbc2..6e783f87ee7 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -8518,30 +8518,15 @@ INT WINAPI WSAAddressToStringW( LPSOCKADDR sockaddr, DWORD len, LPWSAPROTOCOL_INFOW info, LPWSTR string, LPDWORD lenstr ) { - INT ret; - DWORD size; - WCHAR buffer[54]; /* 32 digits + 7':' + '[' + '%" + 5 digits + ']:' + 5 digits + '\0' */ - CHAR bufAddr[54]; + INT ret; + char buf[54]; /* 32 digits + 7':' + '[' + '%" + 5 digits + ']:' + 5 digits + '\0' */ TRACE( "(%p, %d, %p, %p, %p)\n", sockaddr, len, info, string, lenstr ); - size = *lenstr; - ret = WSAAddressToStringA(sockaddr, len, NULL, bufAddr, &size); - - if (ret) return ret; + if ((ret = WSAAddressToStringA(sockaddr, len, NULL, buf, lenstr))) return ret; - MultiByteToWideChar(CP_ACP, 0, bufAddr, size, buffer, ARRAY_SIZE(buffer)); - - if (*lenstr < size) - { - *lenstr = size; - SetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - - TRACE("=> %s,%u bytes\n", debugstr_w(buffer), size); - *lenstr = size; - lstrcpyW( string, buffer ); + MultiByteToWideChar(CP_ACP, 0, buf, *lenstr, string, *lenstr); + TRACE("=> %s,%u chars\n", debugstr_w(string), *lenstr); return 0; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 81536cb9dbe..cab25baf1d1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2923,11 +2923,29 @@ static void test_WSAAddressToString(void) sockaddr.sin_family = AF_INET; sockaddr.sin_addr.s_addr = 0; sockaddr.sin_port = 0; + WSASetLastError( 0xdeadbeef ); ret = WSAAddressToStringA( (SOCKADDR*)&sockaddr, sizeof(sockaddr), NULL, output, &len ); ok( ret == SOCKET_ERROR, "WSAAddressToStringA() returned %d, expected SOCKET_ERROR\n", ret ); ok( WSAGetLastError() == WSAEFAULT, "WSAAddressToStringA() gave error %d, expected WSAEFAULT\n", WSAGetLastError() ); ok( len == 8, "WSAAddressToStringA() gave length %d, expected 8\n", len ); + len = 0; + sockaddr.sin_family = AF_INET; + sockaddr.sin_addr.s_addr = 0; + sockaddr.sin_port = 0; + WSASetLastError( 0xdeadbeef ); + ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr, sizeof(sockaddr), NULL, NULL, &len ); + ok( ret == SOCKET_ERROR, "got %d\n", ret ); + ok( WSAGetLastError() == WSAEFAULT, "got %08x\n", WSAGetLastError() ); + ok( len == 8, "got %u\n", len ); + + len = ARRAY_SIZE(outputW); + memset( outputW, 0, sizeof(outputW) ); + ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr, sizeof(sockaddr), NULL, outputW, &len ); + ok( !ret, "WSAAddressToStringW() returned %d\n", ret ); + ok( len == 8, "got %u\n", len ); + ok( !wcscmp(outputW, L"0.0.0.0"), "got %s\n", wine_dbgstr_w(outputW) ); + for (i = 0; i < 2; i++) { for (j = 0; j < ARRAY_SIZE(ipv4_tests); j++)

1 0

Zebediah Figura : include: Use __atomic_exchange_n() for InterlockedExchange*() if possible.
by Alexandre Julliard 20 Jan '21

20 Jan '21

Module: wine Branch: master Commit: aabdaed10211fd5d6e7399c95b25a1a2bde3c7e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aabdaed10211fd5d6e7399c9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 18 21:55:01 2021 -0600 include: Use __atomic_exchange_n() for InterlockedExchange*() if possible. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index e48c884cd4c..8abc11a7dd5 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -7015,7 +7015,9 @@ static FORCEINLINE unsigned char InterlockedCompareExchange128( volatile __int64 static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) { LONG ret; -#if defined(__i386__) || defined(__x86_64__) +#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) + ret = __atomic_exchange_n( dest, val, __ATOMIC_SEQ_CST ); +#elif defined(__i386__) || defined(__x86_64__) __asm__ __volatile__( "lock; xchgl %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); #else @@ -7042,7 +7044,9 @@ static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) static FORCEINLINE void * WINAPI InterlockedExchangePointer( void *volatile *dest, void *val ) { void *ret; -#ifdef __x86_64__ +#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) + ret = __atomic_exchange_n( dest, val, __ATOMIC_SEQ_CST ); +#elif defined(__x86_64__) __asm__ __volatile__( "lock; xchgq %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); #elif defined(__i386__) __asm__ __volatile__( "lock; xchgl %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" );

1 0