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, |
1568 | 1568 | { |
1569 | 1569 | case WM_WINE_NOTIFY_ACTIVITY: |
1570 | 1570 | { |
| 1571 | #if MAC_OS_X_VERSION_MIN_REQUIRED > 1070 |
1571 | 1572 | /* This wakes from display sleep, but doesn't affect the screen saver. */ |
1572 | 1573 | static IOPMAssertionID assertion; |
1573 | 1574 | 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 |
1575 | 1583 | /* This prevents the screen saver, but doesn't wake from display sleep. */ |
1576 | 1584 | /* It's deprecated, but there's no better alternative. */ |
1577 | 1585 | #pragma clang diagnostic push |
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 ) |
47 | 47 | } |
48 | 48 | else dashes[pos++] = dashes[i]; |
49 | 49 | } |
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 ); |
51 | 51 | return pos; |
52 | 52 | } |
53 | 53 | |
diff --git dlls/ws2_32/socket.c dlls/ws2_32/socket.c
index 27acd85..abe0c64 100644
|
|
static const int ws_ip_map[][2] = |
692 | 692 | MAP_OPTION( IP_MULTICAST_LOOP ), |
693 | 693 | MAP_OPTION( IP_ADD_MEMBERSHIP ), |
694 | 694 | MAP_OPTION( IP_DROP_MEMBERSHIP ), |
| 695 | #ifdef IP_ADD_SOURCE_MEMBERSHIP |
695 | 696 | 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 |
697 | 702 | MAP_OPTION( IP_BLOCK_SOURCE ), |
| 703 | #endif |
| 704 | #ifdef IP_UNBLOCK_SOURCE |
698 | 705 | MAP_OPTION( IP_UNBLOCK_SOURCE ), |
| 706 | #endif |
699 | 707 | MAP_OPTION( IP_OPTIONS ), |
700 | 708 | #ifdef IP_HDRINCL |
701 | 709 | MAP_OPTION( IP_HDRINCL ), |
… |
… |
int WINAPI WS_setsockopt(SOCKET s, int level, int optname, |
5776 | 5784 | int woptval; |
5777 | 5785 | struct linger linger; |
5778 | 5786 | struct timeval tval; |
| 5787 | #if MAC_OS_X_VERSION_MAX_ALLOWED > 1070 |
5779 | 5788 | struct ip_mreq_source mreq_source; |
| 5789 | #endif |
5780 | 5790 | |
5781 | 5791 | TRACE("(socket %04lx, %s, optval %s, optlen %d)\n", s, |
5782 | 5792 | debugstr_sockopt(level, optname), debugstr_optval(optval, optlen), |
… |
… |
int WINAPI WS_setsockopt(SOCKET s, int level, int optname, |
5992 | 6002 | case WS_IP_BLOCK_SOURCE: |
5993 | 6003 | case WS_IP_UNBLOCK_SOURCE: |
5994 | 6004 | { |
| 6005 | #if MAC_OS_X_VERSION_MAX_ALLOWED > 1070 |
5995 | 6006 | WS_IP_MREQ_SOURCE* val = (void*)optval; |
5996 | 6007 | mreq_source.imr_interface.s_addr = val->imr_interface.S_un.S_addr; |
5997 | 6008 | mreq_source.imr_multiaddr.s_addr = val->imr_multiaddr.S_un.S_addr; |
… |
… |
int WINAPI WS_setsockopt(SOCKET s, int level, int optname, |
6001 | 6012 | optlen = sizeof(mreq_source); |
6002 | 6013 | |
6003 | 6014 | convert_sockopt(&level, &optname); |
| 6015 | #endif |
6004 | 6016 | break; |
6005 | 6017 | } |
6006 | 6018 | case WS_IP_ADD_MEMBERSHIP: |