October 2008 - Wine-Commits

Alexandre Julliard : ws2_32: Allow arbitrary-sized iovecs again in WSASendTo and WSARecvFrom.
by Alexandre Julliard Oct. 16, 2008

Oct. 16, 2008

Module: wine Branch: stable Commit: b20836e9097890a350a3a5f8f1c20e8b630c4b6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b20836e9097890a350a3a5f8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 9 12:57:33 2008 +0200 ws2_32: Allow arbitrary-sized iovecs again in WSASendTo and WSARecvFrom. (cherry picked from commit fe7c5d86e7d9e06872c2fb6ddf7ebe8d92525d9c) --- dlls/ws2_32/socket.c | 159 +++++++++++++++++++++---------------------------- 1 files changed, 68 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b20836e9097890a350a3a…

1 0

Juan Lang : crypt32: Fix length calculation for decoding CRL_DIST_POINT_NAME.
by Alexandre Julliard Oct. 16, 2008

Oct. 16, 2008

Module: wine Branch: stable Commit: 187630cd262c6cacde80d2b3a7de494ed18912b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=187630cd262c6cacde80d2b3a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 15 16:19:11 2008 -0700 crypt32: Fix length calculation for decoding CRL_DIST_POINT_NAME. (cherry picked from commit 9423f836ac76b8242a5870dbabe73b8f947252a0) --- dlls/crypt32/decode.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 47b0ba6..8c16d31 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3913,15 +3913,19 @@ static BOOL CRYPT_AsnDecodeDistPointName(const BYTE *pbEncoded, sizeof(CERT_ALT_NAME_ENTRY), TRUE, offsetof(CERT_ALT_NAME_ENTRY, u.pwszURL) }; BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); + DWORD nameLen; if (dataLen) { - DWORD nameLen; - ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded + 1 + lenBytes, cbEncoded - 1 - lenBytes, 0, NULL, NULL, &nameLen, NULL, NULL); - bytesNeeded = sizeof(CRL_DIST_POINT_NAME) + nameLen; + /* The CERT_ALT_NAME_INFO's size is included by CRYPT_AsnDecodeArray + * as the sizeof(struct GenericArray), so don't include it in the + * total bytes needed. + */ + bytesNeeded = sizeof(CRL_DIST_POINT_NAME) + nameLen - + sizeof(CERT_ALT_NAME_INFO); } else bytesNeeded = sizeof(CRL_DIST_POINT_NAME); @@ -3944,7 +3948,7 @@ static BOOL CRYPT_AsnDecodeDistPointName(const BYTE *pbEncoded, name->dwDistPointNameChoice = CRL_DIST_POINT_FULL_NAME; ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded + 1 + lenBytes, cbEncoded - 1 - lenBytes, - 0, NULL, &name->u.FullName, pcbStructInfo, NULL, + 0, NULL, &name->u.FullName, &nameLen, NULL, name->u.FullName.rgAltEntry); } else

1 0

Damjan Jovanovic : ws2_32: Only enable FD_WRITE on short sends.
by Alexandre Julliard Oct. 16, 2008

Oct. 16, 2008

Module: wine Branch: stable Commit: 65aa98826db11f5f8d648ecabff134e4995cb9c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65aa98826db11f5f8d648ecab… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Sep 7 12:41:19 2008 +0200 ws2_32: Only enable FD_WRITE on short sends. (cherry picked from commit b904dd783cd2b7368e11882e37b90e7da23b73be) --- dlls/ws2_32/socket.c | 12 +++- dlls/ws2_32/tests/sock.c | 140 +++++++++++++++++++++++++++++++++------------ 2 files changed, 112 insertions(+), 40 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 989af4a..53514e7 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1250,8 +1250,13 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu if (result >= 0) { + int totalLength = 0; + int i; status = STATUS_SUCCESS; - _enable_event( wsa->hSocket, FD_WRITE, 0, 0 ); + for (i = 0; i < wsa->n_iovecs; i++) + totalLength += wsa->iovec[i].iov_len; + if (result < totalLength) + _enable_event( wsa->hSocket, FD_WRITE, 0, 0 ); } else { @@ -2667,6 +2672,7 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, unsigned int i, options; int n, fd, err; struct iovec iovec[WS_MSG_MAXIOVLEN]; + int totalLength = 0; ULONG_PTR cvalue = (lpOverlapped && ((ULONG_PTR)lpOverlapped->hEvent & 1) == 0) ? (ULONG_PTR)lpOverlapped : 0; TRACE("socket %04lx, wsabuf %p, nbufs %d, flags %d, to %p, tolen %d, ovl %p, func %p\n", @@ -2694,6 +2700,7 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, { iovec[i].iov_base = lpBuffers[i].buf; iovec[i].iov_len = lpBuffers[i].len; + totalLength += lpBuffers[i].len; } for (;;) @@ -2819,7 +2826,8 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } else /* non-blocking */ { - _enable_event(SOCKET2HANDLE(s), FD_WRITE, 0, 0); + if (n < totalLength) + _enable_event(SOCKET2HANDLE(s), FD_WRITE, 0, 0); if (n == -1) { err = WSAEWOULDBLOCK; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c2c56ae..d497b44 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1992,9 +1992,23 @@ static DWORD WINAPI drain_socket_thread(LPVOID arg) { char buffer[1024]; SOCKET sock = *(SOCKET*)arg; + int ret; - while (recv(sock, buffer, sizeof(buffer), 0) > 0) - ; + while ((ret = recv(sock, buffer, sizeof(buffer), 0)) != 0) + { + if (ret < 0) + { + if (WSAGetLastError() == WSAEWOULDBLOCK) + { + fd_set readset; + FD_ZERO(&readset); + FD_SET(sock, &readset); + select(0, &readset, NULL, NULL, NULL); + } + else + break; + } + } return 0; } @@ -2050,10 +2064,13 @@ static void test_write_events(void) SOCKET dst = INVALID_SOCKET; HANDLE hThread = NULL; HANDLE hEvent = INVALID_HANDLE_VALUE; - int len; + char *buffer = NULL; + int bufferSize = 1024*1024; u_long one = 1; int ret; DWORD id; + WSANETWORKEVENTS netEvents; + DWORD dwRet; if (tcp_socketpair(&src, &dst) != 0) { @@ -2061,6 +2078,29 @@ static void test_write_events(void) return; } + /* On Windows it seems when a non-blocking socket sends to a + blocking socket on the same host, the send() is BLOCKING, + so make both sockets non-blocking */ + ret = ioctlsocket(src, FIONBIO, &one); + if (ret) + { + ok(0, "ioctlsocket failed, error %d\n", WSAGetLastError()); + goto end; + } + ret = ioctlsocket(dst, FIONBIO, &one); + if (ret) + { + ok(0, "ioctlsocket failed, error %d\n", WSAGetLastError()); + goto end; + } + + buffer = HeapAlloc(GetProcessHeap(), 0, bufferSize); + if (buffer == NULL) + { + ok(0, "could not allocate memory for test\n"); + goto end; + } + hThread = CreateThread(NULL, 0, drain_socket_thread, &dst, 0, &id); if (hThread == NULL) { @@ -2075,55 +2115,79 @@ static void test_write_events(void) goto end; } - ret = ioctlsocket(src, FIONBIO, &one); + ret = WSAEventSelect(src, hEvent, FD_WRITE | FD_CLOSE); if (ret) { - ok(0, "ioctlsocket failed, error %d\n", WSAGetLastError()); + ok(0, "WSAEventSelect failed, error %d\n", ret); goto end; } - ret = WSAEventSelect(src, hEvent, FD_WRITE | FD_CLOSE); + /* FD_WRITE should be set initially, and allow us to send at least 1 byte */ + dwRet = WaitForSingleObject(hEvent, 5000); + if (dwRet != WAIT_OBJECT_0) + { + ok(0, "Initial WaitForSingleObject failed, error %d\n", dwRet); + goto end; + } + ret = WSAEnumNetworkEvents(src, NULL, &netEvents); if (ret) { - ok(0, "WSAEventSelect failed, error %d\n", ret); + ok(0, "WSAEnumNetworkEvents failed, error %d\n", ret); + goto end; + } + if (netEvents.lNetworkEvents & FD_WRITE) + { + ret = send(src, "a", 1, 0); + ok(ret == 1, "sending 1 byte failed, error %d\n", WSAGetLastError()); + if (ret != 1) + goto end; + } + else + { + ok(0, "FD_WRITE not among initial events\n"); goto end; } - for (len = 100; len > 0; --len) + /* Now FD_WRITE should not be set, because the socket send buffer isn't full yet */ + dwRet = WaitForSingleObject(hEvent, 2000); + if (dwRet == WAIT_OBJECT_0) + { + ok(0, "WaitForSingleObject should have timed out, but succeeded!\n"); + goto end; + } + + /* Now if we send a tonne of data, the socket send buffer will only take some of it, + and we will get a short write, which will trigger another FD_WRITE event + as soon as data is sent and more space becomes available, but not any earlier. */ + do + { + ret = send(src, buffer, bufferSize, 0); + } while (ret == bufferSize); + if (ret >= 0 || WSAGetLastError() == WSAEWOULDBLOCK) { - WSANETWORKEVENTS netEvents; - DWORD dwRet = WaitForSingleObject(hEvent, 5000); - if (dwRet != WAIT_OBJECT_0) - { - ok(0, "WaitForSingleObject failed, error %d\n", dwRet); - goto end; - } - - ret = WSAEnumNetworkEvents(src, NULL, &netEvents); - if (ret) - { - ok(0, "WSAEnumNetworkEvents failed, error %d\n", ret); - goto end; - } - - if (netEvents.lNetworkEvents & FD_WRITE) - { - ret = send(src, "a", 1, 0); - if (ret < 0 && WSAGetLastError() != WSAEWOULDBLOCK) - { - ok(0, "send failed, error %d\n", WSAGetLastError()); - goto end; - } - } - - if (netEvents.lNetworkEvents & FD_CLOSE) - { - ok(0, "unexpected close\n"); - goto end; - } + dwRet = WaitForSingleObject(hEvent, 5000); + ok(dwRet == WAIT_OBJECT_0, "Waiting failed with %d\n", dwRet); + if (dwRet == WAIT_OBJECT_0) + { + ret = WSAEnumNetworkEvents(src, NULL, &netEvents); + ok(ret == 0, "WSAEnumNetworkEvents failed, error %d\n", ret); + if (ret == 0) + goto end; + ok(netEvents.lNetworkEvents & FD_WRITE, + "FD_WRITE event not set as expected, events are 0x%x\n", netEvents.lNetworkEvents); + } + else + goto end; + } + else + { + ok(0, "sending a lot of data failed with error %d\n", WSAGetLastError()); + goto end; } end: + if (buffer != NULL) + HeapFree(GetProcessHeap(), 0, buffer); if (src != INVALID_SOCKET) closesocket(src); if (dst != INVALID_SOCKET)

1 0

Jeff Zaroyko : ws2_32: Ignore lpFrom for connected sockets.
by Alexandre Julliard Oct. 16, 2008

Oct. 16, 2008

Module: wine Branch: stable Commit: a0ee64439e9c1c0bbddf5c912100a9dbeb640601 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ee64439e9c1c0bbddf5c912… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Fri Jun 13 18:05:22 2008 +1000 ws2_32: Ignore lpFrom for connected sockets. If the the socket is connected and lpFrom is not NULL, Linux will set msg_namelen to zero and ignore msg_name in recvfrom so don't try try to update lpFrom. (cherry picked from commit 30e6b81dd1890ce21e9a5bb22d251887fbd8188a) --- dlls/ws2_32/socket.c | 12 +++++- dlls/ws2_32/tests/sock.c | 103 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 113 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 31be2b9..989af4a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1103,7 +1103,17 @@ static int WS2_recv( int fd, struct iovec* iov, int count, if ( (n = recvmsg(fd, &hdr, *lpFlags)) == -1 ) return -1; - if ( lpFrom && + /* if this socket is connected and lpFrom is not NULL, Linux doesn't give us + * msg_name and msg_namelen from recvmsg, but it does set msg_namelen to zero. + * + * quoting linux 2.6 net/ipv4/tcp.c: + * "According to UNIX98, msg_name/msg_namelen are ignored + * on connected socket. I was just happy when found this 8) --ANK" + * + * likewise MSDN says that lpFrom and lpFromlen are ignored for + * connection-oriented sockets, so don't try to update lpFrom. + */ + if ( lpFrom && hdr.msg_namelen && ws_sockaddr_u2ws( &unix_sockaddr.addr, lpFrom, lpFromlen ) != 0 ) { /* The from buffer was too small, but we read the data diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6ba6667..c2c56ae 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -31,7 +31,7 @@ #include <winerror.h> #define MAX_CLIENTS 4 /* Max number of clients */ -#define NUM_TESTS 3 /* Number of tests performed */ +#define NUM_TESTS 4 /* Number of tests performed */ #define FIRST_CHAR 'A' /* First character in transferred pattern */ #define BIND_SLEEP 10 /* seconds to wait between attempts to bind() */ #define BIND_TRIES 6 /* Number of bind() attempts */ @@ -269,6 +269,16 @@ static int do_synchronous_recv ( SOCKET s, char *buf, int buflen, int recvlen ) return p - buf; } +static int do_synchronous_recvfrom ( SOCKET s, char *buf, int buflen,int flags,struct sockaddr *from, socklen_t *fromlen, int recvlen ) +{ + char* last = buf + buflen, *p; + int n = 1; + for ( p = buf; n > 0 && p < last; p += n ) + n = recvfrom ( s, p, min ( recvlen, last - p ), 0, from, fromlen ); + wsa_ok ( n, 0 <=, "do_synchronous_recv (%x): error %d:\n" ); + return p - buf; +} + /* * Call this routine right after thread startup. * SO_OPENTYPE must by 0, regardless what the server did. @@ -627,6 +637,76 @@ static VOID WINAPI simple_client ( client_params *par ) } /* + * simple_mixed_client: mixing send and recvfrom + */ +static VOID WINAPI simple_mixed_client ( client_params *par ) +{ + test_params *gen = par->general; + client_memory *mem; + int n_sent, n_recvd, n_expected = gen->n_chunks * gen->chunk_size, id; + char *p; + socklen_t fromLen = sizeof(mem->addr); + struct sockaddr test; + + id = GetCurrentThreadId(); + trace ( "simple_client (%x): starting\n", id ); + /* wait here because we want to call set_so_opentype before creating a socket */ + WaitForSingleObject ( server_ready, INFINITE ); + trace ( "simple_client (%x): server ready\n", id ); + + check_so_opentype (); + set_so_opentype ( FALSE ); /* non-overlapped */ + client_start ( par ); + mem = TlsGetValue ( tls ); + + /* Connect */ + wsa_ok ( connect ( mem->s, (struct sockaddr*) &mem->addr, sizeof ( mem->addr ) ), + 0 ==, "simple_client (%x): connect error: %d\n" ); + ok ( set_blocking ( mem->s, TRUE ) == 0, + "simple_client (%x): failed to set blocking mode\n", id ); + trace ( "simple_client (%x) connected\n", id ); + + /* send data to server */ + n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen ); + ok ( n_sent == n_expected, + "simple_client (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); + + /* shutdown send direction */ + wsa_ok ( shutdown ( mem->s, SD_SEND ), 0 ==, "simple_client (%x): shutdown failed: %d\n" ); + + /* this shouldn't change, since lpFrom, is not updated on + connection oriented sockets - exposed by bug 11640 + */ + ((struct sockaddr_in*)&test)->sin_addr.s_addr = inet_addr("0.0.0.0"); + + /* Receive data echoed back & check it */ + n_recvd = do_synchronous_recvfrom ( mem->s, + mem->recv_buf, + n_expected, + 0, + (struct sockaddr *)&test, + &fromLen, + par->buflen ); + ok ( n_recvd == n_expected, + "simple_client (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected ); + + /* check that lpFrom was not updated */ + ok(0 == + strcmp( + inet_ntoa(((struct sockaddr_in*)&test)->sin_addr), + "0.0.0.0"), "lpFrom shouldn't be updated on connection oriented sockets\n"); + + /* check data */ + p = test_buffer ( mem->recv_buf, gen->chunk_size, gen->n_chunks ); + ok ( p == NULL, "simple_client (%x): test pattern error: %d\n", id, p - mem->recv_buf); + + /* cleanup */ + read_zero_bytes ( mem->s ); + trace ( "simple_client (%x) exiting\n", id ); + client_stop (); +} + +/* * event_client: An event-driven client */ static void WINAPI event_client ( client_params *par ) @@ -1013,6 +1093,27 @@ static test_setup tests [NUM_TESTS] = 0, 128 } + }, + /* Test 3: synchronous mixed client and server */ + { + { + STD_STREAM_SOCKET, + 2048, + 16, + 2 + }, + simple_server, + { + NULL, + 0, + 64 + }, + simple_mixed_client, + { + NULL, + 0, + 128 + } } };

1 0

Alexander Morozov : ntoskrnl.exe: Initialize some IRP fields to prevent using bad pointers by IofCompleteRequest .
by Alexandre Julliard Oct. 16, 2008

Oct. 16, 2008

Module: wine Branch: master Commit: e99451561dc431d3b22125ec235c6fafaba191c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e99451561dc431d3b22125ec2… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Oct 16 12:06:23 2008 +0400 ntoskrnl.exe: Initialize some IRP fields to prevent using bad pointers by IofCompleteRequest. --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 1ed3040..4a20d5e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -153,6 +153,7 @@ static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, irp.UserBuffer = out_buff; irp.MdlAddress = &mdl; irp.Tail.Overlay.s.u.CurrentStackLocation = &irpsp; + irp.UserIosb = NULL; irpsp.MajorFunction = IRP_MJ_DEVICE_CONTROL; irpsp.Parameters.DeviceIoControl.OutputBufferLength = *out_size; @@ -160,6 +161,7 @@ static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, irpsp.Parameters.DeviceIoControl.IoControlCode = code; irpsp.Parameters.DeviceIoControl.Type3InputBuffer = in_buff; irpsp.DeviceObject = device; + irpsp.CompletionRoutine = NULL; mdl.Next = NULL; mdl.Size = 0;

1 0

Kirill K. Smirnov : oleaut32: Remove superfluous return statement.
by Alexandre Julliard Oct. 16, 2008

Oct. 16, 2008

Module: wine Branch: master Commit: c47d0715ab046d1e111b947b81803d7e9631b849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c47d0715ab046d1e111b947b8… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Thu Oct 16 13:20:59 2008 +0400 oleaut32: Remove superfluous return statement. --- dlls/oleaut32/olepicture.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 4b45779..93b932f 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -509,7 +509,6 @@ static void OLEPicture_SendNotify(OLEPictureImpl* this, DISPID dispID) IUnknown_Release(CD.pUnk); } IEnumConnections_Release(pEnum); - return; } /************************************************************************

1 0

Kirill K. Smirnov : oleaut32: Return correct error code.
by Alexandre Julliard Oct. 16, 2008

Oct. 16, 2008

Module: wine Branch: master Commit: fd6d2b4d0c2012d4ac281069df1ddf17fa816fa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd6d2b4d0c2012d4ac281069d… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Thu Oct 16 13:20:54 2008 +0400 oleaut32: Return correct error code. --- dlls/oleaut32/olepicture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index ce6ad16..4b45779 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1802,7 +1802,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { hr=IStream_Read(pStm,header,8,&xread); if (hr || xread!=8) { ERR("Failure while reading picture header (hr is %x, nread is %d).\n",hr,xread); - return hr; + return (hr?hr:E_FAIL); } headerread += xread; xread = 0;

1 0

Henri Verbeet : wined3d: Modifying GL_TEXTURE_MIN_FILTER modifies both the MINFILTER and MIPFILTER sampler states .
by Alexandre Julliard Oct. 16, 2008

Oct. 16, 2008

Module: wine Branch: master Commit: 723f3656e54c5840956c56c047bc04fad070b405 URL: http://source.winehq.org/git/wine.git/?a=commit;h=723f3656e54c5840956c56c04… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 16 11:52:54 2008 +0200 wined3d: Modifying GL_TEXTURE_MIN_FILTER modifies both the MINFILTER and MIPFILTER sampler states. --- dlls/wined3d/context.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bf77f12..d8ac3ea 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -83,9 +83,11 @@ static void context_apply_attachment_filter_states(IWineD3DDevice *iface, IWineD /* Update base texture states array */ if (SUCCEEDED(IWineD3DSurface_GetContainer(surface, &IID_IWineD3DBaseTexture, (void **)&texture_impl))) { - if (texture_impl->baseTexture.states[WINED3DTEXSTA_MINFILTER] != WINED3DTEXF_POINT) + if (texture_impl->baseTexture.states[WINED3DTEXSTA_MINFILTER] != WINED3DTEXF_POINT + || texture_impl->baseTexture.states[WINED3DTEXSTA_MIPFILTER] != WINED3DTEXF_NONE) { texture_impl->baseTexture.states[WINED3DTEXSTA_MINFILTER] = WINED3DTEXF_POINT; + texture_impl->baseTexture.states[WINED3DTEXSTA_MIPFILTER] = WINED3DTEXF_NONE; update_minfilter = TRUE; }

1 0

Kirill K. Smirnov : oleaut32: Print error messages as ERR.
by Alexandre Julliard Oct. 16, 2008

Oct. 16, 2008

Module: wine Branch: master Commit: 4dfaf90ab21422eaeffb08e114fc9aed8730c808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dfaf90ab21422eaeffb08e11… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Thu Oct 16 13:20:45 2008 +0400 oleaut32: Print error messages as ERR. --- dlls/oleaut32/olepicture.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 09d2c32..ce6ad16 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1036,7 +1036,7 @@ static int _gif_inputfunc(GifFileType *gif, GifByteType *data, int len) { struct gifdata *gd = (struct gifdata*)gif->UserData; if (len+gd->curoff > gd->len) { - FIXME("Trying to read %d bytes, but only %d available.\n",len, gd->len-gd->curoff); + ERR("Trying to read %d bytes, but only %d available.\n",len, gd->len-gd->curoff); len = gd->len - gd->curoff; } memcpy(data, gd->data+gd->curoff, len); @@ -1066,14 +1066,14 @@ static HRESULT OLEPictureImpl_LoadGif(OLEPictureImpl *This, BYTE *xbuf, ULONG xr gif = DGifOpen((void*)&gd, _gif_inputfunc); ret = DGifSlurp(gif); if (ret == GIF_ERROR) { - FIXME("Failed reading GIF using libgif.\n"); + ERR("Failed reading GIF using libgif.\n"); return E_FAIL; } TRACE("screen height %d, width %d\n", gif->SWidth, gif->SHeight); TRACE("color res %d, backgcolor %d\n", gif->SColorResolution, gif->SBackGroundColor); TRACE("imgcnt %d\n", gif->ImageCount); if (gif->ImageCount<1) { - FIXME("GIF stream does not have images inside?\n"); + ERR("GIF stream does not have images inside?\n"); return E_FAIL; } TRACE("curimage: %d x %d, on %dx%d, interlace %d\n", @@ -1259,7 +1259,7 @@ static HRESULT OLEPictureImpl_LoadJpeg(OLEPictureImpl *This, BYTE *xbuf, ULONG x if(!libjpeg_handle) { if(!load_libjpeg()) { - FIXME("Failed reading JPEG because unable to find %s\n", SONAME_LIBJPEG); + ERR("Failed reading JPEG because unable to find %s\n", SONAME_LIBJPEG); return E_FAIL; } } @@ -1298,7 +1298,7 @@ static HRESULT OLEPictureImpl_LoadJpeg(OLEPictureImpl *This, BYTE *xbuf, ULONG x while ( jd.output_scanline<jd.output_height ) { x = pjpeg_read_scanlines(&jd,&samprow,1); if (x != 1) { - FIXME("failed to read current scanline?\n"); + ERR("failed to read current scanline?\n"); break; } /* We have to convert from RGB to BGR, see MSDN/ BITMAPINFOHEADER */ @@ -1672,7 +1672,7 @@ static HRESULT OLEPictureImpl_LoadIcon(OLEPictureImpl *This, BYTE *xbuf, ULONG x 0 ); if (!hicon) { - FIXME("CreateIcon failed.\n"); + ERR("CreateIcon failed.\n"); return E_FAIL; } else { This->desc.picType = PICTYPE_ICON; @@ -1801,7 +1801,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { do { hr=IStream_Read(pStm,header,8,&xread); if (hr || xread!=8) { - FIXME("Failure while reading picture header (hr is %x, nread is %d).\n",hr,xread); + ERR("Failure while reading picture header (hr is %x, nread is %d).\n",hr,xread); return hr; } headerread += xread; @@ -1879,7 +1879,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { break; } if (xread != This->datalen) - FIXME("Could only read %d of %d bytes out of stream?\n",xread,This->datalen); + ERR("Could only read %d of %d bytes out of stream?\n",xread,This->datalen); } if (This->datalen == 0) { /* Marks the "NONE" picture */ This->desc.picType = PICTYPE_NONE; @@ -2637,7 +2637,7 @@ HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, return hr; hr = IPicture_QueryInterface(newpic,&IID_IPersistStream, (LPVOID*)&ps); if (hr) { - FIXME("Could not get IPersistStream iface from Ole Picture?\n"); + ERR("Could not get IPersistStream iface from Ole Picture?\n"); IPicture_Release(newpic); *ppvObj = NULL; return hr; @@ -2653,7 +2653,7 @@ HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, } hr = IPicture_QueryInterface(newpic,riid,ppvObj); if (hr) - FIXME("Failed to get interface %s from IPicture.\n",debugstr_guid(riid)); + ERR("Failed to get interface %s from IPicture.\n",debugstr_guid(riid)); IPicture_Release(newpic); return hr; } @@ -2676,7 +2676,7 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, return hr; hr = IPicture_QueryInterface(newpic,&IID_IPersistStream, (LPVOID*)&ps); if (hr) { - FIXME("Could not get IPersistStream iface from Ole Picture?\n"); + ERR("Could not get IPersistStream iface from Ole Picture?\n"); IPicture_Release(newpic); *ppvObj = NULL; return hr; @@ -2692,7 +2692,7 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, } hr = IPicture_QueryInterface(newpic,riid,ppvObj); if (hr) - FIXME("Failed to get interface %s from IPicture.\n",debugstr_guid(riid)); + ERR("Failed to get interface %s from IPicture.\n",debugstr_guid(riid)); IPicture_Release(newpic); return hr; } @@ -2798,7 +2798,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, hRes = IPicture_QueryInterface(ipicture,riid,ppvRet); if (hRes) - FIXME("Failed to get interface %s from IPicture.\n",debugstr_guid(riid)); + ERR("Failed to get interface %s from IPicture.\n",debugstr_guid(riid)); IPicture_Release(ipicture); return hRes;

1 0

Henri Verbeet : wined3d: Remove a redundant local variable in apply_draw_buffer().
by Alexandre Julliard Oct. 16, 2008

Oct. 16, 2008

Module: wine Branch: master Commit: bd5abfb1e40b889866df86698232c6ad2bd067eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd5abfb1e40b889866df86698… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 16 11:52:54 2008 +0200 wined3d: Remove a redundant local variable in apply_draw_buffer(). --- dlls/wined3d/context.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 43b8533..bf77f12 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1409,11 +1409,9 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf static void apply_draw_buffer(IWineD3DDeviceImpl *This, IWineD3DSurface *target, BOOL blit) { - HRESULT hr; IWineD3DSwapChain *swapchain; - hr = IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain); - if (SUCCEEDED(hr)) + if (SUCCEEDED(IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain))) { IWineD3DSwapChain_Release((IUnknown *)swapchain); glDrawBuffer(surface_get_gl_buffer(target, swapchain));

1 0