Ticket #61721: patch-wine-4.0.4-SnowLeopard.diff

File patch-wine-4.0.4-SnowLeopard.diff, 3.3 KB (added by kencu (Ken), 4 years ago)

  • dlls/winemac.drv/window.c 

    diff --git dlls/winemac.drv/window.c dlls/winemac.drv/window.c
index b7a0963..4f160ee 100644
    static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, 
    15681568    {
    15691569    case WM_WINE_NOTIFY_ACTIVITY:
    15701570    {
     1571#if MAC_OS_X_VERSION_MIN_REQUIRED > 1070
    15711572        /* This wakes from display sleep, but doesn't affect the screen saver. */
    15721573        static IOPMAssertionID assertion;
    15731574        IOPMAssertionDeclareUserActivity(CFSTR("Wine user input"), kIOPMUserActiveLocal, &assertion);
    1574 
     1575#else
     1576        /* https://stackoverflow.com/questions/10598809/how-do-i-wake-from-display-sleep-in-osx-10-7-4 */
     1577                io_registry_entry_t regEntry = IORegistryEntryFromPath(kIOMasterPortDefault, "IOService:/IOResources/IODisplayWrangler");
     1578                if (regEntry != MACH_PORT_NULL) {
     1579                        IORegistryEntrySetCFProperty(regEntry, CFSTR("IORequestIdle"), kCFBooleanFalse);
     1580                        IOObjectRelease(regEntry);
     1581                }
     1582#endif
    15751583        /* This prevents the screen saver, but doesn't wake from display sleep. */
    15761584        /* It's deprecated, but there's no better alternative. */
    15771585#pragma clang diagnostic push

  • dlls/winex11.drv/pen.c 

    diff --git dlls/winex11.drv/pen.c dlls/winex11.drv/pen.c
index 6df2659..9b81492 100644
    static DWORD get_user_dashes( char *res, const DWORD *style, DWORD len ) 
    4747        }
    4848        else dashes[pos++] = dashes[i];
    4949    }
    50     for (i = 0; i < pos; i++) res[i] = min( dashes[i], 255 );
     50    for (i = 0; i < pos; i++) res[i] = min( dashes[i], (int)255 );
    5151    return pos;
    5252}
    5353

  • dlls/ws2_32/socket.c 

    diff --git dlls/ws2_32/socket.c dlls/ws2_32/socket.c
index 27acd85..abe0c64 100644
    static const int ws_ip_map[][2] = 
    692692    MAP_OPTION( IP_MULTICAST_LOOP ),
    693693    MAP_OPTION( IP_ADD_MEMBERSHIP ),
    694694    MAP_OPTION( IP_DROP_MEMBERSHIP ),
     695#ifdef IP_ADD_SOURCE_MEMBERSHIP
    695696    MAP_OPTION( IP_ADD_SOURCE_MEMBERSHIP ),
    696     MAP_OPTION( IP_DROP_SOURCE_MEMBERSHIP ),
     697#endif
     698#ifdef IP_DROP_SOURCE_MEMBERSHIP
     699        MAP_OPTION( IP_DROP_SOURCE_MEMBERSHIP ),
     700#endif
     701#ifdef IP_BLOCK_SOURCE
    697702    MAP_OPTION( IP_BLOCK_SOURCE ),
     703#endif
     704#ifdef IP_UNBLOCK_SOURCE
    698705    MAP_OPTION( IP_UNBLOCK_SOURCE ),
     706#endif
    699707    MAP_OPTION( IP_OPTIONS ),
    700708#ifdef IP_HDRINCL
    701709    MAP_OPTION( IP_HDRINCL ),
    … … int WINAPI WS_setsockopt(SOCKET s, int level, int optname, 
    57765784    int woptval;
    57775785    struct linger linger;
    57785786    struct timeval tval;
     5787#if MAC_OS_X_VERSION_MAX_ALLOWED > 1070
    57795788    struct ip_mreq_source mreq_source;
     5789#endif
    57805790
    57815791    TRACE("(socket %04lx, %s, optval %s, optlen %d)\n", s,
    57825792          debugstr_sockopt(level, optname), debugstr_optval(optval, optlen),
    … … int WINAPI WS_setsockopt(SOCKET s, int level, int optname, 
    59926002        case WS_IP_BLOCK_SOURCE:
    59936003        case WS_IP_UNBLOCK_SOURCE:
    59946004        {
     6005#if MAC_OS_X_VERSION_MAX_ALLOWED > 1070
    59956006            WS_IP_MREQ_SOURCE* val = (void*)optval;
    59966007            mreq_source.imr_interface.s_addr = val->imr_interface.S_un.S_addr;
    59976008            mreq_source.imr_multiaddr.s_addr = val->imr_multiaddr.S_un.S_addr;
    … … int WINAPI WS_setsockopt(SOCKET s, int level, int optname, 
    60016012            optlen = sizeof(mreq_source);
    60026013
    60036014            convert_sockopt(&level, &optname);
     6015#endif
    60046016            break;
    60056017        }
    60066018        case WS_IP_ADD_MEMBERSHIP: