March 2013 - Wine-Commits - list.winehq.org

Alessandro Pignotti : strmbase: Frame scheduling should use IMediaSample:: GetTime.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 0029bbcf484a9e4b3f94ada84d4cc9e002b53cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0029bbcf484a9e4b3f94ada84… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Tue Mar 5 16:13:43 2013 +0100 strmbase: Frame scheduling should use IMediaSample::GetTime. --- dlls/strmbase/renderer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 1f950f9..8bbb1f8 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -371,7 +371,7 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp } /* Wait for render Time */ - if (SUCCEEDED(IMediaSample_GetMediaTime(pSample, &start, &stop))) + if (SUCCEEDED(IMediaSample_GetTime(pSample, &start, &stop))) { hr = S_FALSE; RendererPosPassThru_RegisterMediaTime(This->pPosition, start);

1 0

Alexandre Julliard : winedbg: Use socklen_t where appropriate.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 51947acd5abb07209a8929ab639c1016a733e828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51947acd5abb07209a8929ab6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 14:09:24 2013 +0100 winedbg: Use socklen_t where appropriate. --- programs/winedbg/gdbproxy.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 580fb88..66ff6a8 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -476,6 +476,7 @@ static inline DWORD64 cpu_register(CONTEXT* ctx, unsigned idx) default: fprintf(stderr, "got unexpected size: %u\n", (unsigned)cpu_register_map[idx].ctx_length); assert(0); + return 0; } } @@ -2363,7 +2364,7 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, DEBUG_EVENT* de, unsigned fl { int sock; struct sockaddr_in s_addrs; - unsigned int s_len = sizeof(s_addrs); + socklen_t s_len = sizeof(s_addrs); struct pollfd pollfd; IMAGEHLP_MODULE64 imh_mod; BOOL ret = FALSE;

1 0

Alexandre Julliard : ws2_32: Use socklen_t where appropriate.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: cfed5aa16c97871ad8454856877caabebfc6e174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfed5aa16c97871ad84548568… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 13:26:59 2013 +0100 ws2_32: Use socklen_t where appropriate. --- dlls/ws2_32/socket.c | 35 ++++++++++++++++++----------------- 1 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6fd1e34..05c7aac 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -985,9 +985,8 @@ static char *strdup_lower(const char *str) static inline int sock_error_p(int s) { - unsigned int optval, optlen; - - optlen = sizeof(optval); + unsigned int optval; + socklen_t optlen = sizeof(optval); getsockopt(s, SOL_SOCKET, SO_ERROR, (void *) &optval, &optlen); if (optval) WARN("\t[%i] error: %d\n", s, optval); return optval != 0; @@ -999,7 +998,7 @@ static inline int sock_error_p(int s) static inline int get_rcvsnd_timeo( int fd, int optname) { struct timeval tv; - unsigned int len = sizeof(tv); + socklen_t len = sizeof(tv); int ret = getsockopt(fd, SOL_SOCKET, optname, &tv, &len); if( ret >= 0) ret = tv.tv_sec * 1000 + tv.tv_usec / 1000; @@ -1777,7 +1776,7 @@ static int WS2_send( int fd, struct ws2_async *wsa ) { struct sockaddr_ipx* uipx = (struct sockaddr_ipx*)hdr.msg_name; int val=0; - unsigned int len=sizeof(int); + socklen_t len = sizeof(int); /* The packet type is stored at the ipx socket level; At least the linux kernel seems * to do something with it in case hdr.msg_name is NULL. Nonetheless can we use it to store @@ -2148,7 +2147,8 @@ static int WINAPI WS2_WSARecvMsg( SOCKET s, LPWSAMSG msg, LPDWORD lpNumberOfByte static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) { struct sockaddr_in *in_sock = (struct sockaddr_in *) addr; - unsigned int sock_type = 0, optlen = sizeof(sock_type); + unsigned int sock_type = 0; + socklen_t optlen = sizeof(sock_type); in_addr_t bind_addr = in_sock->sin_addr.s_addr; PIP_ADAPTER_INFO adapters = NULL, adapter; BOOL ret = FALSE; @@ -2523,7 +2523,7 @@ int WINAPI WS_getpeername(SOCKET s, struct WS_sockaddr *name, int *namelen) if (fd != -1) { union generic_unix_sockaddr uaddr; - unsigned int uaddrlen = sizeof(uaddr); + socklen_t uaddrlen = sizeof(uaddr); if (getpeername(fd, &uaddr.addr, &uaddrlen) == 0) { @@ -2565,7 +2565,7 @@ int WINAPI WS_getsockname(SOCKET s, struct WS_sockaddr *name, int *namelen) if (fd != -1) { union generic_unix_sockaddr uaddr; - unsigned int uaddrlen = sizeof(uaddr); + socklen_t uaddrlen = sizeof(uaddr); if (getsockname(fd, &uaddr.addr, &uaddrlen) != 0) { @@ -2622,7 +2622,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; convert_sockopt(&level, &optname); - if (getsockopt(fd, level, optname, optval, (unsigned int *)optlen) != 0 ) + if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) { SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); ret = SOCKET_ERROR; @@ -2633,7 +2633,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_SO_DONTLINGER: { struct linger lingval; - unsigned int len = sizeof(struct linger); + socklen_t len = sizeof(struct linger); if (!optlen || *optlen < sizeof(BOOL)|| !optval) { @@ -2695,7 +2695,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, { struct linger lingval; int so_type; - unsigned int len = sizeof(struct linger), slen = sizeof(int); + socklen_t len = sizeof(struct linger), slen = sizeof(int); /* struct linger and LINGER have different sizes */ if (!optlen || *optlen < sizeof(LINGER) || !optval) @@ -2759,7 +2759,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, #if defined(SO_RCVTIMEO) || defined(SO_SNDTIMEO) { struct timeval tv; - unsigned int len = sizeof(struct timeval); + socklen_t len = sizeof(struct timeval); if (!optlen || *optlen < sizeof(int)|| !optval) { @@ -2802,7 +2802,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case IPX_PTYPE: if ((fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; #ifdef SOL_IPX - if(getsockopt(fd, SOL_IPX, IPX_TYPE, optval, (unsigned int*)optlen) == -1) + if(getsockopt(fd, SOL_IPX, IPX_TYPE, optval, (socklen_t *)optlen) == -1) { ret = SOCKET_ERROR; } @@ -2931,7 +2931,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; convert_sockopt(&level, &optname); - if (getsockopt(fd, level, optname, optval, (unsigned int *)optlen) != 0 ) + if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) { SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); ret = SOCKET_ERROR; @@ -2965,7 +2965,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; convert_sockopt(&level, &optname); - if (getsockopt(fd, level, optname, optval, (unsigned int *)optlen) != 0 ) + if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) { SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); ret = SOCKET_ERROR; @@ -3000,7 +3000,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; convert_sockopt(&level, &optname); - if (getsockopt(fd, level, optname, optval, (unsigned int *)optlen) != 0 ) + if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) { SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); ret = SOCKET_ERROR; @@ -3245,7 +3245,8 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID case WS_SIOCATMARK: { - unsigned int oob = 0, oobsize = sizeof(int), atmark = 0; + unsigned int oob = 0, atmark = 0; + socklen_t oobsize = sizeof(int); if (out_size != sizeof(WS_u_long) || IS_INTRESOURCE(out_buff)) { WSASetLastError(WSAEFAULT);

1 0

Ken Thomases : winemac: Implement WGL_EXT_swap_control.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 3f807e7a1a59aa62c626142f7f98e40d11008056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f807e7a1a59aa62c626142f7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 6 04:59:35 2013 -0600 winemac: Implement WGL_EXT_swap_control. --- dlls/winemac.drv/opengl.c | 65 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index c62db1a..0f62e28 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -2327,6 +2327,31 @@ static BOOL macdrv_wglGetPixelFormatAttribfvARB(HDC hdc, int iPixelFormat, int i } +/********************************************************************** + * macdrv_wglGetSwapIntervalEXT + * + * WGL_EXT_swap_control: wglGetSwapIntervalEXT + */ +static int macdrv_wglGetSwapIntervalEXT(void) +{ + struct wgl_context *context = NtCurrentTeb()->glContext; + long value; + CGLError err; + + TRACE("\n"); + + err = CGLGetParameter(context->cglcontext, kCGLCPSwapInterval, (GLint*)&value); + if (err != kCGLNoError) + { + WARN("CGLGetParameter(kCGLCPSwapInterval) failed; error %d %s\n", + err, CGLErrorString(err)); + value = 1; + } + + return value; +} + + /*********************************************************************** * macdrv_wglMakeContextCurrentARB * @@ -2686,6 +2711,42 @@ static BOOL macdrv_wglSetPixelFormatWINE(HDC hdc, int fmt) } +/********************************************************************** + * macdrv_wglSwapIntervalEXT + * + * WGL_EXT_swap_control: wglSwapIntervalEXT + */ +static BOOL macdrv_wglSwapIntervalEXT(int interval) +{ + struct wgl_context *context = NtCurrentTeb()->glContext; + long value; + CGLError err; + + TRACE("interval %d\n", interval); + + if (interval < 0) + { + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + + if (interval > 1) + interval = 1; + + value = interval; + err = CGLSetParameter(context->cglcontext, kCGLCPSwapInterval, (GLint*)&value); + if (err != kCGLNoError) + { + WARN("CGLSetParameter(kCGLCPSwapInterval) failed; error %d %s\n", + err, CGLErrorString(err)); + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + + return TRUE; +} + + static void register_extension(const char *ext) { if (gl_info.wglExtensions[0]) @@ -2754,6 +2815,10 @@ static void load_extensions(void) register_extension("WGL_EXT_extensions_string"); opengl_funcs.ext.p_wglGetExtensionsStringEXT = macdrv_wglGetExtensionsStringEXT; + register_extension("WGL_EXT_swap_control"); + opengl_funcs.ext.p_wglSwapIntervalEXT = macdrv_wglSwapIntervalEXT; + opengl_funcs.ext.p_wglGetSwapIntervalEXT = macdrv_wglGetSwapIntervalEXT; + /* Presumably identical to [W]GL_ARB_framebuffer_sRGB, above, but clients may check for either, so register them separately. */ if (gluCheckExtension((GLubyte*)"GL_EXT_framebuffer_sRGB", (GLubyte*)gl_info.glExtensions))

1 0

Ken Thomases : winemac: Implement WGL_ARB_pbuffer.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: be7231bea37b058b5d58325026fb264b04db325a URL: http://source.winehq.org/git/wine.git/?a=commit;h=be7231bea37b058b5d5832502… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 6 04:59:21 2013 -0600 winemac: Implement WGL_ARB_pbuffer. --- dlls/winemac.drv/opengl.c | 336 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 321 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be7231bea37b058b5d583…

1 0

Ken Thomases : winemac: Implement WGL_ARB_pixel_format and enable dependent extensions.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 0ce3761655ca096a31468c9698f61108c5dc2835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ce3761655ca096a31468c969… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 6 04:59:17 2013 -0600 winemac: Implement WGL_ARB_pixel_format and enable dependent extensions. --- dlls/winemac.drv/opengl.c | 616 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 616 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0ce3761655ca096a31468…

1 0

Ken Thomases : winemac: Implement WGL_ARB_make_current_read.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 8d0d95c03334fe87f53e2a391fd84356a175d628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d0d95c03334fe87f53e2a391… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 6 04:59:14 2013 -0600 winemac: Implement WGL_ARB_make_current_read. --- dlls/winemac.drv/opengl.c | 235 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 184 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8d0d95c03334fe87f53e2…

1 0

Ken Thomases : winemac: Implement OpenGL support.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 3f3ee6393d08805a429c8d70e2027f8191cd2adf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f3ee6393d08805a429c8d70e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 6 04:59:07 2013 -0600 winemac: Implement OpenGL support. --- dlls/winemac.drv/Makefile.in | 4 +- dlls/winemac.drv/cocoa_opengl.h | 32 + dlls/winemac.drv/cocoa_opengl.m | 154 ++++ dlls/winemac.drv/cocoa_window.m | 187 ++++ dlls/winemac.drv/gdi.c | 2 +- dlls/winemac.drv/macdrv.h | 10 + dlls/winemac.drv/macdrv_cocoa.h | 15 + dlls/winemac.drv/opengl.c | 1912 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/window.c | 11 +- 9 files changed, 2322 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3f3ee6393d08805a429c8…

1 0

Andrew Talbot : winex11.drv: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 0ff8c9da524caea5ebdeb748398e6db3f9e0c100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ff8c9da524caea5ebdeb7483… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Mar 5 22:52:11 2013 +0000 winex11.drv: Avoid signed-unsigned integer comparisons. --- dlls/winex11.drv/mouse.c | 4 +++- dlls/winex11.drv/window.c | 3 ++- dlls/winex11.drv/xrender.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 790c532..de6672e 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1220,8 +1220,10 @@ static Cursor create_xlib_color_cursor( HDC hdc, const ICONINFOEXW *icon, int wi } else /* invert the mask */ { + unsigned int j; + ptr = (unsigned int *)mask_bits; - for (i = 0; i < info->bmiHeader.biSizeImage / sizeof(*ptr); i++, ptr++) *ptr ^= ~0u; + for (j = 0; j < info->bmiHeader.biSizeImage / sizeof(*ptr); j++, ptr++) *ptr ^= ~0u; } vis.depth = 1; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 05cd75f..5fc978e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -534,7 +534,8 @@ static BOOL create_icon_pixmaps( HDC hdc, const ICONINFO *icon, Pixmap *icon_ret XVisualInfo vis = default_visual; struct gdi_image_bits bits; Pixmap color_pixmap = 0, mask_pixmap = 0; - int i, lines; + int lines; + unsigned int i; bits.ptr = NULL; bits.free = NULL; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 293e8e2..671f67a 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -763,7 +763,7 @@ static void lfsz_calc_hash(LFANDSIZE *plfsz) { DWORD hash = 0, *ptr, two_chars; WORD *pwc; - int i; + unsigned int i; hash ^= plfsz->devsize.cx; hash ^= plfsz->devsize.cy;

1 0

Andrew Talbot : winhttp: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: a9983e6cd20d1c6423915ddc7397056839dba7f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9983e6cd20d1c6423915ddc7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Mar 5 22:52:21 2013 +0000 winhttp: Avoid signed-unsigned integer comparisons. --- dlls/winhttp/net.c | 2 +- dlls/winhttp/request.c | 4 ++-- dlls/winhttp/session.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index fa8cad0..5ce7683 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -568,7 +568,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T * SecBuffer bufs[4]; SecBufferDesc buf_desc = {SECBUFFER_VERSION, sizeof(bufs)/sizeof(*bufs), bufs}; SSIZE_T size, buf_len; - int i; + unsigned int i; SECURITY_STATUS res; assert(conn->extra_len < ssl_buf_size); diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index cd583e7..e2c3734 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2935,9 +2935,9 @@ static HRESULT request_send( struct winhttp_request *request ) VariantInit( &data ); if (V_VT( &request->data ) == VT_BSTR) { - UINT i, cp = CP_ACP; + UINT cp = CP_ACP; const WCHAR *str = V_BSTR( &request->data ); - int len = strlenW( str ); + int i, len = strlenW( str ); for (i = 0; i < len; i++) { diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 41b266a..d43b225 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -878,7 +878,7 @@ static const object_vtbl_t request_vtbl = static BOOL store_accept_types( request_t *request, const WCHAR **accept_types ) { const WCHAR **types = accept_types; - int i; + DWORD i; if (!types) return TRUE; while (*types) @@ -897,7 +897,7 @@ static BOOL store_accept_types( request_t *request, const WCHAR **accept_types ) { if (!(request->accept_types[i] = strdupW( *types ))) { - for (; i >= 0; i--) heap_free( request->accept_types[i] ); + for ( ; i > 0; --i) heap_free( request->accept_types[i - 1] ); heap_free( request->accept_types ); request->accept_types = NULL; request->num_accept_types = 0;

1 0