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

Piotr Caban : msvcrt: Remove incorrect cast in fgetws function.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: cde73251d818afdb135b722889d6f083fdb6c45a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde73251d818afdb135b72288… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 20 10:39:37 2013 +0100 msvcrt: Remove incorrect cast in fgetws function. --- dlls/msvcrt/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 28aefc1..6e8b324 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3315,7 +3315,7 @@ MSVCRT_wint_t CDECL MSVCRT_getwchar(void) */ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* file) { - int cc = MSVCRT_WEOF; + MSVCRT_wint_t cc = MSVCRT_WEOF; MSVCRT_wchar_t * buf_start = s; TRACE(":file(%p) fd (%d) str (%p) len (%d)\n", @@ -3325,7 +3325,7 @@ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* f while ((size >1) && (cc = MSVCRT_fgetwc(file)) != MSVCRT_WEOF && cc != '\n') { - *s++ = (char)cc; + *s++ = cc; size --; } if ((cc == MSVCRT_WEOF) && (s == buf_start)) /* If nothing read, return 0*/

1 0

Piotr Caban : msvcrt: Fixed fgetwc behavior on multibyte characters and Unicode files.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 6eeb000c90f640489964fdb764fe27271e0f67d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eeb000c90f640489964fdb76… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 20 10:40:45 2013 +0100 msvcrt: Fixed fgetwc behavior on multibyte characters and Unicode files. --- dlls/msvcrt/file.c | 80 ++++++++++++++++++++++---------------------------- dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 36 insertions(+), 45 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 6e8b324..28dd132 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3205,60 +3205,50 @@ char * CDECL MSVCRT_fgets(char *s, int size, MSVCRT_FILE* file) /********************************************************************* * fgetwc (MSVCRT.@) - * - * In MSVCRT__O_TEXT mode, multibyte characters are read from the file, dropping - * the CR from CR/LF combinations */ MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT_FILE* file) { - int c; + MSVCRT_wint_t ret; + int ch; - MSVCRT__lock_file(file); - if (!(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT)) - { - MSVCRT_wchar_t wc; - unsigned int i; - int j; - char *chp, *wcp; - wcp = (char *)&wc; - for(i=0; i<sizeof(wc); i++) - { - if (file->_cnt>0) - { - file->_cnt--; - chp = file->_ptr++; - wcp[i] = *chp; - } - else - { - j = MSVCRT__filbuf(file); - if(file->_cnt<=0) - { - file->_flag |= (file->_cnt == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; - file->_cnt = 0; + MSVCRT__lock_file(file); - MSVCRT__unlock_file(file); - return MSVCRT_WEOF; - } - wcp[i] = j; + if((msvcrt_get_ioinfo(file->_file)->exflag & (EF_UTF8 | EF_UTF16)) + || !(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT)) { + char *p; + + for(p=(char*)&ret; (MSVCRT_wint_t*)p<&ret+1; p++) { + ch = MSVCRT_fgetc(file); + if(ch == MSVCRT_EOF) { + ret = MSVCRT_WEOF; + break; + } + *p = (char)ch; + } + }else { + char mbs[MSVCRT_MB_LEN_MAX]; + int len = 0; + + ch = MSVCRT_fgetc(file); + if(ch != MSVCRT_EOF) { + mbs[0] = (char)ch; + if(MSVCRT_isleadbyte((unsigned char)mbs[0])) { + ch = MSVCRT_fgetc(file); + if(ch != MSVCRT_EOF) { + mbs[1] = (char)ch; + len = 2; + } + }else { + len = 1; + } } - } - MSVCRT__unlock_file(file); - return wc; - } - - c = MSVCRT_fgetc(file); - if ((get_locinfo()->mb_cur_max > 1) && MSVCRT_isleadbyte(c)) - { - FIXME("Treat Multibyte characters\n"); + if(!len || MSVCRT_mbtowc(&ret, mbs, len)==-1) + ret = MSVCRT_WEOF; } - MSVCRT__unlock_file(file); - if (c == MSVCRT_EOF) - return MSVCRT_WEOF; - else - return (MSVCRT_wint_t)c; + MSVCRT__unlock_file(file); + return ret; } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index e2ff7a0..3bbbe93 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -945,6 +945,7 @@ int __cdecl _getch(void); int __cdecl _ismbblead(unsigned int); int __cdecl _ismbclegal(unsigned int c); int __cdecl _ismbstrail(const unsigned char* start, const unsigned char* str); +int __cdecl MSVCRT_mbtowc(MSVCRT_wchar_t*,const char*,MSVCRT_size_t); MSVCRT_size_t __cdecl MSVCRT_mbstowcs(MSVCRT_wchar_t*,const char*,MSVCRT_size_t); MSVCRT_intptr_t __cdecl MSVCRT__spawnve(int,const char*,const char* const *,const char* const *); MSVCRT_intptr_t __cdecl MSVRT__spawnvpe(int,const char*,const char* const *,const char* const *);

1 0

Lucas Zawacki : dinput: Initialize all axis (from 0 to ABS_MAX) with -1.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 45a19b0c9b32b9a02be11b597a7db5341b310474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a19b0c9b32b9a02be11b597… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Wed Mar 20 19:35:08 2013 -0300 dinput: Initialize all axis (from 0 to ABS_MAX) with -1. --- dlls/dinput/joystick_linuxinput.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 0a044a5..5ed9bde 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -445,9 +445,10 @@ static JoystickImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput, unsig newDevice->generic.base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->base.crit"); /* Count number of available axes - supported Axis & POVs */ - for (i = 0; i < WINE_JOYSTICK_MAX_AXES; i++) + for (i = 0; i < ABS_MAX; i++) { - if (test_bit(newDevice->joydev->absbits, i)) + if (i < WINE_JOYSTICK_MAX_AXES && + test_bit(newDevice->joydev->absbits, i)) { newDevice->generic.device_axis_count++; newDevice->dev_axes_to_di[i] = idx;

1 0

Austin English : msvcp90/tests: Remove thiscall_thunk_retptr struct definitions.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: f3c154197edbf9a347b7a96a5ca105b568571b15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c154197edbf9a347b7a96a5… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 20 20:24:13 2013 -0700 msvcp90/tests: Remove thiscall_thunk_retptr struct definitions. --- dlls/msvcp90/tests/ios.c | 2 -- dlls/msvcp90/tests/misc.c | 1 - 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 0ae34d3..9c78318 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -544,8 +544,6 @@ static void * (WINAPI *call_thiscall_func5)( void *func, void *this, const void static void * (WINAPI *call_thiscall_func2_ptr_dbl)( void *func, void *this, double a ); static void * (WINAPI *call_thiscall_func2_ptr_fpos)( void *func, void *this, fpos_int a ); -struct thiscall_thunk_retptr *thunk_retptr; - static void init_thiscall_thunk(void) { struct thiscall_thunk *thunk = VirtualAlloc( NULL, sizeof(*thunk), diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index dc099d3..f8eee4e 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -149,7 +149,6 @@ static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void static void * (WINAPI *call_thiscall_func3)( void *func, void *this, const void *a, const void *b ); static void * (WINAPI *call_thiscall_func5)( void *func, void *this, const void *a, const void *b, const void *c, const void *d ); -struct thiscall_thunk_retptr *thunk_retptr; static void init_thiscall_thunk(void) {

1 0

Dmitry Timoshkov : ws2_32: Make _is_blocking() return server error code, so that callers can act appropriately.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: c09c82b25a3c95e79f23f22571fe9a63b38b824c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c09c82b25a3c95e79f23f2257… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 22 14:59:50 2013 +0900 ws2_32: Make _is_blocking() return server error code, so that callers can act appropriately. --- dlls/ws2_32/socket.c | 49 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 39 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f9e8a6c..a6a1b4c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -803,19 +803,19 @@ static void _enable_event( HANDLE s, unsigned int event, SERVER_END_REQ; } -static int _is_blocking(SOCKET s) +static NTSTATUS _is_blocking(SOCKET s, BOOL *ret) { - int ret; + NTSTATUS status; SERVER_START_REQ( get_socket_event ) { req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); req->service = FALSE; req->c_event = 0; - wine_server_call( req ); - ret = (reply->state & FD_WINE_NONBLOCKING) == 0; + status = wine_server_call( req ); + *ret = (reply->state & FD_WINE_NONBLOCKING) == 0; } SERVER_END_REQ; - return ret; + return status; } static unsigned int _get_sock_mask(SOCKET s) @@ -835,9 +835,10 @@ static unsigned int _get_sock_mask(SOCKET s) static void _sync_sock_state(SOCKET s) { + BOOL dummy; /* do a dummy wineserver request in order to let the wineserver run through its select loop once */ - (void)_is_blocking(s); + (void)_is_blocking(s, &dummy); } static int _get_sock_error(SOCKET s, unsigned int bit) @@ -1950,7 +1951,12 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, BOOL is_blocking; TRACE("socket %04lx\n", s ); - is_blocking = _is_blocking(s); + status = _is_blocking(s, &is_blocking); + if (status) + { + set_error(status); + return INVALID_SOCKET; + } do { /* try accepting first (if there is a deferred connection) */ @@ -2341,6 +2347,8 @@ int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen) if (fd != -1) { + NTSTATUS status; + BOOL is_blocking; int ret = do_connect(fd, name, namelen); if (ret == 0) goto connect_success; @@ -2351,7 +2359,14 @@ int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen) _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, FD_CONNECT, FD_WINE_CONNECTED|FD_WINE_LISTENING); - if (_is_blocking(s)) + status = _is_blocking( s, &is_blocking ); + if (status) + { + release_sock_fd( s, fd ); + set_error( status ); + return SOCKET_ERROR; + } + if (is_blocking) { int result; /* block here */ @@ -3965,6 +3980,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, int totalLength = 0; ULONG_PTR cvalue = (lpOverlapped && ((ULONG_PTR)lpOverlapped->hEvent & 1) == 0) ? (ULONG_PTR)lpOverlapped : 0; DWORD bytes_sent; + BOOL is_blocking; TRACE("socket %04lx, wsabuf %p, nbufs %d, flags %d, to %p, tolen %d, ovl %p, func %p\n", s, lpBuffers, dwBufferCount, dwFlags, @@ -4063,7 +4079,13 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, return 0; } - if ( _is_blocking(s) ) + if ((err = _is_blocking( s, &is_blocking ))) + { + err = NtStatusToWSAError( err ); + goto error; + } + + if ( is_blocking ) { /* On a blocking non-overlapped stream socket, * sending blocks until the entire buffer is sent. */ @@ -5858,6 +5880,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, unsigned int i, options; int n, fd, err; struct ws2_async *wsa; + BOOL is_blocking; DWORD timeout_start = GetTickCount(); ULONG_PTR cvalue = (lpOverlapped && ((ULONG_PTR)lpOverlapped->hEvent & 1) == 0) ? (ULONG_PTR)lpOverlapped : 0; @@ -5961,7 +5984,13 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, if (n != -1) break; - if ( _is_blocking(s) ) + if ((err = _is_blocking( s, &is_blocking ))) + { + err = NtStatusToWSAError( err ); + goto error; + } + + if ( is_blocking ) { struct pollfd pfd; int timeout = GET_RCVTIMEO(fd);

1 0

Hans Leidekker : rpcrt4: Use the right port for https connections.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 9967aed09db32909ce7116e7cad804bec8998dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9967aed09db32909ce7116e7c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 25 13:26:03 2013 +0100 rpcrt4: Use the right port for https connections. --- dlls/rpcrt4/rpc_transport.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index fc81bbe..6adc289 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2066,7 +2066,7 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) LPWSTR password = NULL; LPWSTR servername = NULL; const WCHAR *option; - INTERNET_PORT port = INTERNET_INVALID_PORT_NUMBER; /* use default port */ + INTERNET_PORT port; if (httpc->common.QOS && (httpc->common.QOS->qos->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP)) @@ -2163,6 +2163,11 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) MultiByteToWideChar(CP_ACP, 0, httpc->common.NetworkAddr, -1, servername, strlen(httpc->common.NetworkAddr) + 1); } + port = (httpc->common.QOS && + (httpc->common.QOS->qos->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP) && + (httpc->common.QOS->qos->u.HttpCredentials->Flags & RPC_C_HTTP_FLAG_USE_SSL)) ? + INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; + httpc->session = InternetConnectW(httpc->app_info, servername, port, user, password, INTERNET_SERVICE_HTTP, 0, 0);

1 0

Hans Leidekker : winhttp: Add a read-ahead buffer to allow WinHttpQueryDataAvailable to return the right values in chunked mode .
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: bb3097f01e532583c8c78c9daf64ff29f8eb255c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb3097f01e532583c8c78c9da… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 25 13:26:37 2013 +0100 winhttp: Add a read-ahead buffer to allow WinHttpQueryDataAvailable to return the right values in chunked mode. This is a port of wininet commit 3d02c42b39c7346a97c41974418a6d01a29f9b81. --- dlls/winhttp/request.c | 381 +++++++++++++++++++++++++--------------- dlls/winhttp/tests/winhttp.c | 78 ++++++++ dlls/winhttp/winhttp_private.h | 5 + 3 files changed, 318 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb3097f01e532583c8c78…

1 0

Daniel Jelinski : comctl32/listview: Fix overwriting of item values.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 27fb2fb076878a6efa9bdafe96f26fb6fb54ab5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=27fb2fb076878a6efa9bdafe9… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sun Mar 17 16:18:15 2013 +0100 comctl32/listview: Fix overwriting of item values. --- dlls/comctl32/listview.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 52717e9..42e389f 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6265,6 +6265,7 @@ again: { lvItem.iItem = nItem; lvItem.iSubItem = 0; + lvItem.pszText = szDispText; if (!LISTVIEW_GetItemW(infoPtr, &lvItem)) continue; if (lvItem.mask & LVIF_PARAM)

1 0

Ken Thomases : winemac: Rename create_cgimage_from_icon() to create_cgimage_from_icon_bitmaps().
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 322ce433d5fbb3d1354c6e2ac7fa8943f21923c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=322ce433d5fbb3d1354c6e2ac… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 17 22:40:38 2013 -0500 winemac: Rename create_cgimage_from_icon() to create_cgimage_from_icon_bitmaps(). --- dlls/winemac.drv/mouse.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 66214fe..d8c97b6 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -467,12 +467,12 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, /*********************************************************************** - * create_cgimage_from_icon + * create_cgimage_from_icon_bitmaps */ -static CGImageRef create_cgimage_from_icon(HDC hdc, HANDLE icon, HBITMAP hbmColor, - unsigned char *color_bits, int color_size, HBITMAP hbmMask, - unsigned char *mask_bits, int mask_size, int width, - int height, int istep) +static CGImageRef create_cgimage_from_icon_bitmaps(HDC hdc, HANDLE icon, HBITMAP hbmColor, + unsigned char *color_bits, int color_size, HBITMAP hbmMask, + unsigned char *mask_bits, int mask_size, int width, + int height, int istep) { int i, has_alpha = FALSE; DWORD *ptr; @@ -655,8 +655,8 @@ static CFDictionaryRef create_cursor_frame(HDC hdc, const ICONINFOEXW *iinfo, HA CFDictionarySetValue(frame, CFSTR("duration"), duration_number); CFRelease(duration_number); - cgimage = create_cgimage_from_icon(hdc, icon, hbmColor, color_bits, color_size, - hbmMask, mask_bits, mask_size, width, height, istep); + cgimage = create_cgimage_from_icon_bitmaps(hdc, icon, hbmColor, color_bits, color_size, + hbmMask, mask_bits, mask_size, width, height, istep); if (!cgimage) { CFRelease(frame);

1 0

Ken Thomases : winemac: Move create_cgimage_from_icon_bitmaps() into new module, image.c.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 462721a11562732de00702cb3e7711552d1783ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=462721a11562732de00702cb3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 17 22:40:44 2013 -0500 winemac: Move create_cgimage_from_icon_bitmaps() into new module, image.c. --- dlls/winemac.drv/Makefile.in | 1 + dlls/winemac.drv/image.c | 152 ++++++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv.h | 5 ++ dlls/winemac.drv/mouse.c | 126 ---------------------------------- 4 files changed, 158 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=462721a11562732de0070…

1 0