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

Dmitry Timoshkov : windowscodecs: Add a comment to PNG decoder that Windows ignores CRC of the chunks.
by Alexandre Julliard 06 Mar '13

06 Mar '13

Module: wine Branch: master Commit: f18439da5102eafe4ba2b79bf7399e3c7d79d93b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f18439da5102eafe4ba2b79bf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 6 16:29:20 2013 +0900 windowscodecs: Add a comment to PNG decoder that Windows ignores CRC of the chunks. --- dlls/windowscodecs/pngformat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index e4236e2..fb8bf51 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -76,7 +76,7 @@ static HRESULT read_png_chunk(IStream *stream, BYTE *type, BYTE **data, ULONG *d return hr; } - /* FIXME: Verify the CRC? */ + /* Windows ignores CRC of the chunk */ } return S_OK;

1 0

Ken Thomases : winemac: Implement OpenGL support.
by Alexandre Julliard 06 Mar '13

06 Mar '13

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

Ken Thomases : winemac: Implement WGL_ARB_make_current_read.
by Alexandre Julliard 06 Mar '13

06 Mar '13

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 WGL_ARB_pixel_format and enable dependent extensions.
by Alexandre Julliard 06 Mar '13

06 Mar '13

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_pbuffer.
by Alexandre Julliard 06 Mar '13

06 Mar '13

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_render_texture.
by Alexandre Julliard 06 Mar '13

06 Mar '13

Module: wine Branch: master Commit: 8bbf09b412443268732cd0196a006323759ad680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bbf09b412443268732cd0196… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 6 04:59:25 2013 -0600 winemac: Implement WGL_ARB_render_texture. --- dlls/winemac.drv/opengl.c | 329 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 327 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8bbf09b412443268732cd…

1 0

Ken Thomases : winemac: Implement WGL_NV_render_texture_rectangle.
by Alexandre Julliard 06 Mar '13

06 Mar '13

Module: wine Branch: master Commit: 9c29be680c58bc8359d4d72b3f4e30f8dda38c26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c29be680c58bc8359d4d72b3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 6 04:59:30 2013 -0600 winemac: Implement WGL_NV_render_texture_rectangle. --- dlls/winemac.drv/opengl.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 3b60a5c..c62db1a 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1705,10 +1705,13 @@ static BOOL macdrv_wglChoosePixelFormatARB(HDC hdc, const int *piAttribIList, case WGL_DRAW_TO_PBUFFER_ARB: case WGL_BIND_TO_TEXTURE_RGB_ARB: case WGL_BIND_TO_TEXTURE_RGBA_ARB: + case WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV: + case WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV: if (valid.pbuffer && (!pf.pbuffer != !value)) goto cant_match; pf.pbuffer = (value != 0); valid.pbuffer = 1; - if (attr == WGL_BIND_TO_TEXTURE_RGBA_ARB && !alpha_bits) + if ((attr == WGL_BIND_TO_TEXTURE_RGBA_ARB || attr == WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV) && + !alpha_bits) alpha_bits = 1; break; @@ -1859,6 +1862,10 @@ static struct wgl_pbuffer *macdrv_wglCreatePbufferARB(HDC hdc, int iPixelFormat, TRACE("WGL_TEXTURE_TARGET_ARB: WGL_TEXTURE_2D_ARB\n"); target = GL_TEXTURE_2D; break; + case WGL_TEXTURE_RECTANGLE_NV: + TRACE("WGL_TEXTURE_TARGET_ARB: WGL_TEXTURE_RECTANGLE_NV\n"); + target = GL_TEXTURE_RECTANGLE; + break; default: WARN("unknown WGL_TEXTURE_TARGET_ARB value 0x%x\n", value); SetLastError(ERROR_INVALID_DATA); @@ -2244,10 +2251,12 @@ static BOOL macdrv_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelFormat, int i case WGL_DRAW_TO_PBUFFER_ARB: case WGL_BIND_TO_TEXTURE_RGB_ARB: + case WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV: piValues[i] = pf->pbuffer ? GL_TRUE : GL_FALSE; break; case WGL_BIND_TO_TEXTURE_RGBA_ARB: + case WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV: piValues[i] = (pf->pbuffer && color_modes[pf->color_mode].alpha_bits) ? GL_TRUE : GL_FALSE; break; @@ -2490,9 +2499,11 @@ static BOOL macdrv_wglQueryPbufferARB(struct wgl_pbuffer *pbuffer, int iAttribut *piValue = WGL_TEXTURE_CUBE_MAP_ARB; break; case GL_TEXTURE_2D: + *piValue = WGL_TEXTURE_2D_ARB; + break; case GL_TEXTURE_RECTANGLE: default: - *piValue = WGL_TEXTURE_2D_ARB; + *piValue = WGL_TEXTURE_RECTANGLE_NV; break; } break; @@ -2726,6 +2737,10 @@ static void load_extensions(void) opengl_funcs.ext.p_wglBindTexImageARB = macdrv_wglBindTexImageARB; opengl_funcs.ext.p_wglReleaseTexImageARB = macdrv_wglReleaseTexImageARB; opengl_funcs.ext.p_wglSetPbufferAttribARB = macdrv_wglSetPbufferAttribARB; + + if (gluCheckExtension((GLubyte*)"GL_ARB_texture_rectangle", (GLubyte*)gl_info.glExtensions) || + gluCheckExtension((GLubyte*)"GL_EXT_texture_rectangle", (GLubyte*)gl_info.glExtensions)) + register_extension("WGL_NV_render_texture_rectangle"); } /* TODO:

1 0

Ken Thomases : winemac: Implement WGL_EXT_swap_control.
by Alexandre Julliard 06 Mar '13

06 Mar '13

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

Alexandre Julliard : server: Use socklen_t where appropriate.
by Alexandre Julliard 06 Mar '13

06 Mar '13

Module: wine Branch: master Commit: 9fdf7bc7715b9b00846d8f0b451533906a131eaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fdf7bc7715b9b00846d8f0b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 13:40:38 2013 +0100 server: Use socklen_t where appropriate. --- server/request.c | 2 +- server/sock.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/request.c b/server/request.c index eeb3476..e075212 100644 --- a/server/request.c +++ b/server/request.c @@ -537,7 +537,7 @@ static void master_socket_poll_event( struct fd *fd, int event ) else if (event & POLLIN) { struct sockaddr_un dummy; - unsigned int len = sizeof(dummy); + socklen_t len = sizeof(dummy); int client = accept( get_unix_fd( master_socket->fd ), (struct sockaddr *) &dummy, &len ); if (client == -1) return; fcntl( client, F_SETFL, O_NONBLOCK ); diff --git a/server/sock.c b/server/sock.c index 7dcc101..ba18a66 100644 --- a/server/sock.c +++ b/server/sock.c @@ -285,9 +285,9 @@ static void sock_wake_up( struct sock *sock ) static inline int sock_error( struct fd *fd ) { - unsigned int optval = 0, optlen; + unsigned int optval = 0; + socklen_t optlen = sizeof(optval); - optlen = sizeof(optval); getsockopt( get_unix_fd(fd), SOL_SOCKET, SO_ERROR, (void *) &optval, &optlen); return optval; } @@ -667,7 +667,7 @@ static int accept_new_fd( struct sock *sock ) */ int acceptfd; struct sockaddr saddr; - unsigned int slen = sizeof(saddr); + socklen_t slen = sizeof(saddr); acceptfd = accept( get_unix_fd(sock->fd), &saddr, &slen); if (acceptfd == -1) {

1 0

Alexandre Julliard : ws2_32: Use socklen_t where appropriate.
by Alexandre Julliard 06 Mar '13

06 Mar '13

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