Changeset 140930 in webkit


Ignore:
Timestamp:
Jan 27, 2013 4:26:55 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Fixing atomicIncrement implementation for Windows by dropping support before XP SP2.
​https://bugs.webkit.org/show_bug.cgi?id=106740

Patch by Zoltan Arvai <​zarvai@inf.u-szeged.hu> on 2013-01-27
Reviewed by Benjamin Poulain.

Source/JavaScriptCore:

  • config.h:

Source/WebCore:

  • WebCorePrefix.h:
  • config.h:

Source/WebKit/win:

  • WebKitPrefix.h:

Source/WebKit2:

  • config.h:

Source/WTF:

Adding int64_t type atomicIncrement and atomicDecrement implementations for Windows
into Atomics.h required by WebKit2 after r139514. Separating WinCE implementation
that does not support WebKit2 and has no support for 64 bit interlocked methods.

Increasing WINVER and _WIN32_WINNT to XP SP2, because the 64 bit type interlocked methods
are not supported on previous versions on 32 bit target.

  • config.h:
  • wtf/Atomics.h:

(WTF):
(WTF::atomicIncrement):
(WTF::atomicDecrement):

Tools:

  • DumpRenderTree/config.h:
  • WinLauncher/stdafx.h:
Location:
trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r140904 r140930  
     12013-01-27  Zoltan Arvai  <zarvai@inf.u-szeged.hu>
     2
     3        Fixing atomicIncrement implementation for Windows by dropping support before XP SP2.
     4        https://bugs.webkit.org/show_bug.cgi?id=106740
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        * config.h:
     9
    1102013-01-25  Filip Pizlo  <fpizlo@apple.com>
    211

  • trunk/Source/JavaScriptCore/config.h

    r140472 r140930  
    4141
    4242#ifndef _WIN32_WINNT
    43 #define _WIN32_WINNT 0x0501
     43#define _WIN32_WINNT 0x0502
    4444#endif
    4545
    4646#ifndef WINVER
    47 #define WINVER 0x0501
     47#define WINVER 0x0502
    4848#endif
    4949

  • trunk/Source/WTF/ChangeLog

    r140917 r140930  
     12013-01-27  Zoltan Arvai  <zarvai@inf.u-szeged.hu>
     2
     3        Fixing atomicIncrement implementation for Windows by dropping support before XP SP2.
     4        https://bugs.webkit.org/show_bug.cgi?id=106740
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        Adding int64_t type atomicIncrement and atomicDecrement implementations for Windows
     9        into Atomics.h required by WebKit2 after r139514. Separating WinCE implementation
     10        that does not support WebKit2 and has no support for 64 bit interlocked methods.
     11
     12        Increasing WINVER and _WIN32_WINNT to XP SP2, because the 64 bit type interlocked methods
     13        are not supported on previous versions on 32 bit target.
     14
     15        * config.h:
     16        * wtf/Atomics.h:
     17        (WTF):
     18        (WTF::atomicIncrement):
     19        (WTF::atomicDecrement):
     20
    1212013-01-26  Andras Becsi  <andras.becsi@digia.com>
    222

  • trunk/Source/WTF/config.h

    r140451 r140930  
    3434
    3535#ifndef _WIN32_WINNT
    36 #define _WIN32_WINNT 0x0501
     36#define _WIN32_WINNT 0x0502
    3737#endif
    3838
    3939#ifndef WINVER
    40 #define WINVER 0x0501
     40#define WINVER 0x0502
    4141#endif
    4242

  • trunk/Source/WTF/wtf/Atomics.h

    r139921 r140930  
    7777#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
    7878
    79 #if COMPILER(MINGW) || COMPILER(MSVC7_OR_LOWER) || OS(WINCE)
     79#if OS(WINCE)
    8080inline int atomicIncrement(int* addend) { return InterlockedIncrement(reinterpret_cast<long*>(addend)); }
    8181inline int atomicDecrement(int* addend) { return InterlockedDecrement(reinterpret_cast<long*>(addend)); }
     82#elif COMPILER(MINGW) || COMPILER(MSVC7_OR_LOWER)
     83inline int atomicIncrement(int* addend) { return InterlockedIncrement(reinterpret_cast<long*>(addend)); }
     84inline int atomicDecrement(int* addend) { return InterlockedDecrement(reinterpret_cast<long*>(addend)); }
     85
     86inline int64_t atomicIncrement(int64_t* addend) { return InterlockedIncrement64(reinterpret_cast<long long*>(addend)); }
     87inline int64_t atomicDecrement(int64_t* addend) { return InterlockedDecrement64(reinterpret_cast<long long*>(addend)); }
    8288#else
    8389inline int atomicIncrement(int volatile* addend) { return InterlockedIncrement(reinterpret_cast<long volatile*>(addend)); }
    8490inline int atomicDecrement(int volatile* addend) { return InterlockedDecrement(reinterpret_cast<long volatile*>(addend)); }
     91
     92inline int64_t atomicIncrement(int64_t volatile* addend) { return InterlockedIncrement64(reinterpret_cast<long long volatile*>(addend)); }
     93inline int64_t atomicDecrement(int64_t volatile* addend) { return InterlockedDecrement64(reinterpret_cast<long long volatile*>(addend)); }
    8594#endif
    8695

  • trunk/Source/WebCore/ChangeLog

    r140927 r140930  
     12013-01-27  Zoltan Arvai  <zarvai@inf.u-szeged.hu>
     2
     3        Fixing atomicIncrement implementation for Windows by dropping support before XP SP2.
     4        https://bugs.webkit.org/show_bug.cgi?id=106740
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        * WebCorePrefix.h:
     9        * config.h:
     10
    1112013-01-27  Jochen Eisinger  <jochen@chromium.org>
    212

  • trunk/Source/WebCore/WebCorePrefix.h

    r140574 r140930  
    3939
    4040#ifndef _WIN32_WINNT
    41 #define _WIN32_WINNT 0x0501
     41#define _WIN32_WINNT 0x0502
    4242#endif
    4343
    4444#ifndef WINVER
    45 #define WINVER 0x0501
     45#define WINVER 0x0502
    4646#endif
    4747

  • trunk/Source/WebCore/config.h

    r140574 r140930  
    4646
    4747#ifndef _WIN32_WINNT
    48 #define _WIN32_WINNT 0x0501
     48#define _WIN32_WINNT 0x0502
    4949#endif
    5050
    5151#ifndef WINVER
    52 #define WINVER 0x0501
     52#define WINVER 0x0502
    5353#endif
    5454

  • trunk/Source/WebKit/win/ChangeLog

    r140921 r140930  
     12013-01-27  Zoltan Arvai  <zarvai@inf.u-szeged.hu>
     2
     3        Fixing atomicIncrement implementation for Windows by dropping support before XP SP2.
     4        https://bugs.webkit.org/show_bug.cgi?id=106740
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        * WebKitPrefix.h:
     9
    1102013-01-26  Alexey Proskuryakov  <ap@apple.com>
    211

  • trunk/Source/WebKit/win/WebKitPrefix.h

    r72327 r140930  
    2828
    2929#ifndef _WIN32_WINNT
    30 #define _WIN32_WINNT 0x0500
     30#define _WIN32_WINNT 0x0502
    3131#endif
    3232
    3333#ifndef WINVER
    34 #define WINVER 0x0500
     34#define WINVER 0x0502
    3535#endif
    3636

  • trunk/Source/WebKit2/ChangeLog

    r140929 r140930  
     12013-01-27  Zoltan Arvai  <zarvai@inf.u-szeged.hu>
     2
     3        Fixing atomicIncrement implementation for Windows by dropping support before XP SP2.
     4        https://bugs.webkit.org/show_bug.cgi?id=106740
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        * config.h:
     9
    1102013-01-27  Sam Weinig  <sam@webkit.org>
    211

  • trunk/Source/WebKit2/config.h

    r139023 r140930  
    6363
    6464#ifndef _WIN32_WINNT
    65 #define _WIN32_WINNT 0x0500
     65#define _WIN32_WINNT 0x0502
    6666#endif
    6767
    6868#ifndef WINVER
    69 #define WINVER 0x0500
     69#define WINVER 0x0502
    7070#endif
    7171

  • trunk/Tools/ChangeLog

    r140912 r140930  
     12013-01-27  Zoltan Arvai  <zarvai@inf.u-szeged.hu>
     2
     3        Fixing atomicIncrement implementation for Windows by dropping support before XP SP2.
     4        https://bugs.webkit.org/show_bug.cgi?id=106740
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        * DumpRenderTree/config.h:
     9        * WinLauncher/stdafx.h:
     10
    1112013-01-26  David Farler  <dfarler@apple.com>
    212

  • trunk/Tools/DumpRenderTree/config.h

    r122402 r140930  
    8686
    8787#undef _WIN32_WINNT
    88 #define _WIN32_WINNT 0x0500
     88#define _WIN32_WINNT 0x0502
    8989
    9090#undef WINVER
    91 #define WINVER 0x0500
     91#define WINVER 0x0502
    9292
    9393#undef _WINSOCKAPI_

  • trunk/Tools/WinLauncher/stdafx.h

    r72260 r140930  
    3333// Modify the following defines if you have to target a platform prior to the ones specified below.
    3434// Refer to MSDN for the latest info on corresponding values for different platforms.
    35 #ifndef WINVER                // Allow use of features specific to Windows XP or later.
    36 #define WINVER 0x0501        // Change this to the appropriate value to target other versions of Windows.
     35#ifndef WINVER // Allow use of features specific to Windows XP SP2 or later.
     36#define WINVER 0x0502 // Change this to the appropriate value to target other versions of Windows.
    3737#endif
    3838
    39 #ifndef _WIN32_WINNT        // Allow use of features specific to Windows XP or later.                   
    40 #define _WIN32_WINNT 0x0501    // Change this to the appropriate value to target other versions of Windows.
     39#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP SP2 or later.
     40#define _WIN32_WINNT 0x0502 // Change this to the appropriate value to target other versions of Windows.
    4141#endif                       
    4242
Note: See TracChangeset for help on using the changeset viewer.