August 2011 - Wine-commits - list.winehq.org

Stefan Dösinger : ddraw: Correct WINED3DFMT_D24_UNORM_S8_UINT.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 8e7ff7835402ba907f08e0f6ead93c389a787332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e7ff7835402ba907f08e0f6e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 18 18:28:50 2011 +0200 ddraw: Correct WINED3DFMT_D24_UNORM_S8_UINT. --- dlls/ddraw/utils.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index c07fbe6..b4b9dab 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -216,10 +216,9 @@ void PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, enum wined3d_format_i case WINED3DFMT_D24_UNORM_S8_UINT: DDPixelFormat->dwFlags = DDPF_ZBUFFER | DDPF_STENCILBUFFER; DDPixelFormat->dwFourCC = 0; - /* Should I set dwZBufferBitDepth to 32 here? */ DDPixelFormat->u1.dwZBufferBitDepth = 32; DDPixelFormat->u2.dwStencilBitDepth = 8; - DDPixelFormat->u3.dwZBitMask = 0x00FFFFFFFF; + DDPixelFormat->u3.dwZBitMask = 0x00FFFFFF; DDPixelFormat->u4.dwStencilBitMask = 0xFF000000; DDPixelFormat->u5.dwRGBAlphaBitMask = 0x0; break;

1 0

Stefan Dösinger : wined3d: Disable WINED3DFMT_S1_UINT_D15_UNORM and WINED3DFMT_S4X4_UINT_D24_UNORM.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 2459d79b53dd8d70289f5d11a4ca64d55ca3c8ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=2459d79b53dd8d70289f5d11a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 18 18:44:28 2011 +0200 wined3d: Disable WINED3DFMT_S1_UINT_D15_UNORM and WINED3DFMT_S4X4_UINT_D24_UNORM. --- dlls/wined3d/directx.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index afc77df..7a659ee 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3242,6 +3242,18 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, /* Only allow depth/stencil formats */ if (!(ds_format->depth_size || ds_format->stencil_size)) return FALSE; + /* Blacklist formats not supported on Windows */ + switch (ds_format->id) + { + case WINED3DFMT_S1_UINT_D15_UNORM: /* Breaks the shadowvol2 dx7 sdk sample */ + case WINED3DFMT_S4X4_UINT_D24_UNORM: + TRACE_(d3d_caps)("[FAILED] - not supported on windows\n"); + return FALSE; + + default: + break; + } + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { /* With FBOs WGL limitations do not apply, but the format needs to be FBO attachable */ @@ -3425,9 +3437,7 @@ static BOOL CheckTextureCapability(const struct wined3d_adapter *adapter, const */ case WINED3DFMT_D16_LOCKABLE: case WINED3DFMT_D16_UNORM: - case WINED3DFMT_S1_UINT_D15_UNORM: case WINED3DFMT_X8D24_UNORM: - case WINED3DFMT_S4X4_UINT_D24_UNORM: case WINED3DFMT_D24_UNORM_S8_UINT: case WINED3DFMT_S8_UINT_D24_FLOAT: case WINED3DFMT_D32_UNORM: @@ -3440,6 +3450,12 @@ static BOOL CheckTextureCapability(const struct wined3d_adapter *adapter, const return TRUE; return FALSE; + /* Not supported on Windows */ + case WINED3DFMT_S1_UINT_D15_UNORM: + case WINED3DFMT_S4X4_UINT_D24_UNORM: + TRACE_(d3d_caps)("[FAILED] - not supported on windows\n"); + return FALSE; + /***** * Not supported everywhere(depends on GL_ATI_envmap_bumpmap or * GL_NV_texture_shader). Emulated by shaders

1 0

Stefan Dösinger : ddraw: Correct WINED3DFMT_X8D24_UNORM.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 138a12545d0e0af2a12ed75bcd04ae04c3150233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=138a12545d0e0af2a12ed75bc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 18 18:47:48 2011 +0200 ddraw: Correct WINED3DFMT_X8D24_UNORM. --- dlls/ddraw/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index b4b9dab..94e4ac0 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -228,7 +228,7 @@ void PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, enum wined3d_format_i DDPixelFormat->dwFourCC = 0; DDPixelFormat->u1.dwZBufferBitDepth = 32; DDPixelFormat->u2.dwStencilBitDepth = 0; - DDPixelFormat->u3.dwZBitMask = 0x00FFFFFFFF; + DDPixelFormat->u3.dwZBitMask = 0x00FFFFFF; DDPixelFormat->u4.dwStencilBitMask = 0x00000000; DDPixelFormat->u5.dwRGBAlphaBitMask = 0x0; break;

1 0

André Hentschel : wininet: Use the constants from the wininet header.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 0fda135f3fc4430641f63a93c9089e6c392974a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fda135f3fc4430641f63a93c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 22 21:30:55 2011 +0200 wininet: Use the constants from the wininet header. --- dlls/wininet/cookie.c | 2 +- dlls/wininet/http.c | 28 +++++++++++++--------------- dlls/wininet/internet.c | 24 +++++++++++++----------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 1895a93..6f9caad 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -554,7 +554,7 @@ BOOL WINAPI InternetSetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, LPCWSTR lpCookieData) { BOOL ret; - WCHAR hostName[2048], path[2048]; + WCHAR hostName[INTERNET_MAX_HOST_NAME_LENGTH], path[INTERNET_MAX_PATH_LENGTH]; TRACE("(%s,%s,%s)\n", debugstr_w(lpszUrl), debugstr_w(lpszCookieName), debugstr_w(lpCookieData)); diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index dab96b9..7934c43 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -139,10 +139,6 @@ static const WCHAR szVia[] = { 'V','i','a',0 }; static const WCHAR szWarning[] = { 'W','a','r','n','i','n','g',0 }; static const WCHAR szWWW_Authenticate[] = { 'W','W','W','-','A','u','t','h','e','n','t','i','c','a','t','e',0 }; -#define MAXHOSTNAME 100 -#define MAX_FIELD_VALUE_LEN 256 -#define MAX_FIELD_LEN 256 - #define HTTP_REFERER szReferer #define HTTP_ACCEPT szAccept #define HTTP_USERAGENT szUser_Agent @@ -1689,10 +1685,10 @@ static WCHAR *HTTP_BuildProxyRequestUrl(http_request_t *req) */ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_request_t *request) { - WCHAR buf[MAXHOSTNAME]; - WCHAR protoProxy[MAXHOSTNAME + 15]; - DWORD protoProxyLen = sizeof(protoProxy) / sizeof(protoProxy[0]); - WCHAR proxy[MAXHOSTNAME + 15]; /* 15 == "http://" + sizeof(port#) + ":/\0" */ + WCHAR buf[INTERNET_MAX_HOST_NAME_LENGTH]; + WCHAR protoProxy[INTERNET_MAX_URL_LENGTH]; + DWORD protoProxyLen = INTERNET_MAX_URL_LENGTH; + WCHAR proxy[INTERNET_MAX_URL_LENGTH]; static WCHAR szNul[] = { 0 }; URL_COMPONENTSW UrlComponents; static const WCHAR protoHttp[] = { 'h','t','t','p',0 }; @@ -1702,7 +1698,7 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req memset( &UrlComponents, 0, sizeof UrlComponents ); UrlComponents.dwStructSize = sizeof UrlComponents; UrlComponents.lpszHostName = buf; - UrlComponents.dwHostNameLength = MAXHOSTNAME; + UrlComponents.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; if (!INTERNET_FindProxyForProtocol(hIC->proxy, protoHttp, protoProxy, &protoProxyLen)) return FALSE; @@ -3758,7 +3754,7 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) http_session_t *session = request->session; appinfo_t *hIC = session->appInfo; BOOL using_proxy = hIC->proxy && hIC->proxy[0]; - WCHAR path[INTERNET_MAX_URL_LENGTH]; + WCHAR path[INTERNET_MAX_PATH_LENGTH]; int index; if(lpszUrl[0]=='/') @@ -3769,7 +3765,9 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) else { URL_COMPONENTSW urlComponents; - WCHAR protocol[32], hostName[MAXHOSTNAME], userName[1024]; + WCHAR protocol[INTERNET_MAX_SCHEME_LENGTH]; + WCHAR hostName[INTERNET_MAX_HOST_NAME_LENGTH]; + WCHAR userName[INTERNET_MAX_USER_NAME_LENGTH]; static WCHAR szHttp[] = {'h','t','t','p',0}; static WCHAR szHttps[] = {'h','t','t','p','s',0}; @@ -3779,15 +3777,15 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) urlComponents.dwStructSize = sizeof(URL_COMPONENTSW); urlComponents.lpszScheme = protocol; - urlComponents.dwSchemeLength = 32; + urlComponents.dwSchemeLength = INTERNET_MAX_SCHEME_LENGTH; urlComponents.lpszHostName = hostName; - urlComponents.dwHostNameLength = MAXHOSTNAME; + urlComponents.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; urlComponents.lpszUserName = userName; - urlComponents.dwUserNameLength = 1024; + urlComponents.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH; urlComponents.lpszPassword = NULL; urlComponents.dwPasswordLength = 0; urlComponents.lpszUrlPath = path; - urlComponents.dwUrlPathLength = 2048; + urlComponents.dwUrlPathLength = INTERNET_MAX_PATH_LENGTH; urlComponents.lpszExtraInfo = NULL; urlComponents.dwExtraInfoLength = 0; if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents)) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index c949f5d..3d85dd7 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -29,8 +29,6 @@ #include "config.h" #include "wine/port.h" -#define MAXHOSTNAME 100 /* from http.c */ - #if defined(__MINGW32__) || defined (_MSC_VER) #include <ws2tcpip.h> #endif @@ -3161,7 +3159,7 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe static const CHAR ping[] = "ping -c 1 "; static const CHAR redirect[] = " >/dev/null 2>/dev/null"; CHAR *command = NULL; - WCHAR hostW[1024]; + WCHAR hostW[INTERNET_MAX_HOST_NAME_LENGTH]; DWORD len; INTERNET_PORT port; int status = -1; @@ -3189,7 +3187,7 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe ZeroMemory(&components,sizeof(URL_COMPONENTSW)); components.lpszHostName = (LPWSTR)hostW; - components.dwHostNameLength = 1024; + components.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; if (!InternetCrackUrlW(lpszUrl,0,0,&components)) goto End; @@ -3286,8 +3284,12 @@ static HINTERNET INTERNET_InternetOpenUrlW(appinfo_t *hIC, LPCWSTR lpszUrl, LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD_PTR dwContext) { URL_COMPONENTSW urlComponents; - WCHAR protocol[32], hostName[MAXHOSTNAME], userName[1024]; - WCHAR password[1024], path[2048], extra[1024]; + WCHAR protocol[INTERNET_MAX_SCHEME_LENGTH]; + WCHAR hostName[INTERNET_MAX_HOST_NAME_LENGTH]; + WCHAR userName[INTERNET_MAX_USER_NAME_LENGTH]; + WCHAR password[INTERNET_MAX_PASSWORD_LENGTH]; + WCHAR path[INTERNET_MAX_PATH_LENGTH]; + WCHAR extra[1024]; HINTERNET client = NULL, client1 = NULL; DWORD res; @@ -3296,15 +3298,15 @@ static HINTERNET INTERNET_InternetOpenUrlW(appinfo_t *hIC, LPCWSTR lpszUrl, urlComponents.dwStructSize = sizeof(URL_COMPONENTSW); urlComponents.lpszScheme = protocol; - urlComponents.dwSchemeLength = 32; + urlComponents.dwSchemeLength = INTERNET_MAX_SCHEME_LENGTH; urlComponents.lpszHostName = hostName; - urlComponents.dwHostNameLength = MAXHOSTNAME; + urlComponents.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; urlComponents.lpszUserName = userName; - urlComponents.dwUserNameLength = 1024; + urlComponents.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH; urlComponents.lpszPassword = password; - urlComponents.dwPasswordLength = 1024; + urlComponents.dwPasswordLength = INTERNET_MAX_PASSWORD_LENGTH; urlComponents.lpszUrlPath = path; - urlComponents.dwUrlPathLength = 2048; + urlComponents.dwUrlPathLength = INTERNET_MAX_PATH_LENGTH; urlComponents.lpszExtraInfo = extra; urlComponents.dwExtraInfoLength = 1024; if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents))

1 0

André Hentschel : wininet: Don' t return a relative path when building the proxy url request.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: d8f036e4dc7c43661437b830e8b8bd318dcc59e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8f036e4dc7c43661437b830e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 22 21:31:14 2011 +0200 wininet: Don't return a relative path when building the proxy url request. --- dlls/wininet/http.c | 37 +++++++++++++++++++++---------------- 1 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 7934c43..772aba6 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1648,34 +1648,39 @@ static BOOL HTTP_InsertAuthorization( http_request_t *request, struct HttpAuthIn static WCHAR *HTTP_BuildProxyRequestUrl(http_request_t *req) { + static const WCHAR slash[] = { '/',0 }; + static const WCHAR format[] = { 'h','t','t','p',':','/','/','%','s',':','%','u',0 }; + static const WCHAR formatSSL[] = { 'h','t','t','p','s',':','/','/','%','s',':','%','u',0 }; + http_session_t *session = req->session; WCHAR new_location[INTERNET_MAX_URL_LENGTH], *url; DWORD size; size = sizeof(new_location); if (HTTP_HttpQueryInfoW(req, HTTP_QUERY_LOCATION, new_location, &size, NULL) == ERROR_SUCCESS) { + URL_COMPONENTSW UrlComponents; + if (!(url = heap_alloc(size + sizeof(WCHAR)))) return NULL; strcpyW( url, new_location ); + + ZeroMemory(&UrlComponents,sizeof(URL_COMPONENTSW)); + if(InternetCrackUrlW(url, 0, 0, &UrlComponents)) goto done; + heap_free(url); } - else - { - static const WCHAR slash[] = { '/',0 }; - static const WCHAR format[] = { 'h','t','t','p',':','/','/','%','s',':','%','u',0 }; - static const WCHAR formatSSL[] = { 'h','t','t','p','s',':','/','/','%','s',':','%','u',0 }; - http_session_t *session = req->session; - size = 16; /* "https://" + sizeof(port#) + ":/\0" */ - size += strlenW( session->hostName ) + strlenW( req->path ); + size = 16; /* "https://" + sizeof(port#) + ":/\0" */ + size += strlenW( session->hostName ) + strlenW( req->path ); - if (!(url = heap_alloc(size * sizeof(WCHAR)))) return NULL; + if (!(url = heap_alloc(size * sizeof(WCHAR)))) return NULL; - if (req->hdr.dwFlags & INTERNET_FLAG_SECURE) - sprintfW( url, formatSSL, session->hostName, session->hostPort ); - else - sprintfW( url, format, session->hostName, session->hostPort ); - if (req->path[0] != '/') strcatW( url, slash ); - strcatW( url, req->path ); - } + if (req->hdr.dwFlags & INTERNET_FLAG_SECURE) + sprintfW( url, formatSSL, session->hostName, session->hostPort ); + else + sprintfW( url, format, session->hostName, session->hostPort ); + if (req->path[0] != '/') strcatW( url, slash ); + strcatW( url, req->path ); + +done: TRACE("url=%s\n", debugstr_w(url)); return url; }

1 0

André Hentschel : wininet: Parse user and password for proxy authentication.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 20d7bc9522a29abac898569e5dd9a14c7f4b4f26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20d7bc9522a29abac898569e5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 22 21:31:54 2011 +0200 wininet: Parse user and password for proxy authentication. --- dlls/wininet/internet.c | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 3d85dd7..cf555c7 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -621,9 +621,46 @@ static BOOL INTERNET_ConfigureProxy( appinfo_t *lpwai ) if (wpi.proxyEnabled) { - lpwai->accessType = INTERNET_OPEN_TYPE_PROXY; - lpwai->proxy = wpi.proxy; - return TRUE; + WCHAR proxyurl[INTERNET_MAX_URL_LENGTH]; + WCHAR username[INTERNET_MAX_USER_NAME_LENGTH]; + WCHAR password[INTERNET_MAX_PASSWORD_LENGTH]; + WCHAR hostname[INTERNET_MAX_HOST_NAME_LENGTH]; + URL_COMPONENTSW UrlComponents; + + UrlComponents.dwStructSize = sizeof UrlComponents; + UrlComponents.dwSchemeLength = 0; + UrlComponents.lpszHostName = hostname; + UrlComponents.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; + UrlComponents.lpszUserName = username; + UrlComponents.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH; + UrlComponents.lpszPassword = password; + UrlComponents.dwPasswordLength = INTERNET_MAX_PASSWORD_LENGTH; + UrlComponents.dwExtraInfoLength = 0; + + if(InternetCrackUrlW(wpi.proxy, 0, 0, &UrlComponents)) + { + static const WCHAR szFormat[] = { 'h','t','t','p',':','/','/','%','s',':','%','u',0 }; + + if(UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) + UrlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT; + sprintfW(proxyurl, szFormat, hostname, UrlComponents.nPort); + + lpwai->accessType = INTERNET_OPEN_TYPE_PROXY; + lpwai->proxy = heap_strdupW(proxyurl); + if (UrlComponents.dwUserNameLength) + { + lpwai->proxyUsername = heap_strdupW(UrlComponents.lpszUserName); + lpwai->proxyPassword = heap_strdupW(UrlComponents.lpszPassword); + } + + TRACE("http proxy = %s\n", debugstr_w(lpwai->proxy)); + return TRUE; + } + else + { + TRACE("Failed to parse proxy: %s\n", debugstr_w(wpi.proxy)); + lpwai->proxy = NULL; + } } lpwai->accessType = INTERNET_OPEN_TYPE_DIRECT;

1 0

Bruno Jesus : ws2_32: Fix false-positive write fds on select().
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: bebc425bb52fde72611a767c732b0214074b3f17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bebc425bb52fde72611a767c7… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Aug 5 01:04:06 2011 -0300 ws2_32: Fix false-positive write fds on select(). --- dlls/ws2_32/socket.c | 3 ++- dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index eafaefd..a51b921 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3661,7 +3661,8 @@ static int get_poll_results( WS_fd_set *readfds, WS_fd_set *writefds, WS_fd_set if (writefds) { for (i = k = 0; i < writefds->fd_count; i++, j++) - if (fds[j].revents) writefds->fd_array[k++] = writefds->fd_array[i]; + if ((fds[j].revents & POLLOUT) && !(fds[j].revents & POLLHUP)) + writefds->fd_array[k++] = writefds->fd_array[i]; writefds->fd_count = k; total += k; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a171c85..9e6912c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2311,7 +2311,7 @@ static void test_errors(void) timeval.tv_usec = 50000; ret = select(1, NULL, &set, NULL, &timeval); - todo_wine ok( (ret == 0), "expected 0 (timeout), got: %d\n", ret ); + ok( (ret == 0), "expected 0 (timeout), got: %d\n", ret ); } ret = closesocket(sock); @@ -2353,8 +2353,8 @@ static void test_select(void) ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); ok ( (ret == 0), "select should not return any socket handles\n"); ok ( !FD_ISSET(fdRead, &readfds), "FD should not be set\n"); - ok ( !FD_ISSET(fdWrite, &writefds), "FD should not be set\n"); } + ok ( !FD_ISSET(fdWrite, &writefds), "FD should not be set\n"); ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); ok ( !FD_ISSET(fdWrite, &exceptfds), "FD should not be set\n");

1 0

Lucas Fialho Zawacki : dinput: Common implementation of BuildActionMap for keyboard and mouse.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: c0fd222321059e1063d5f717b4b08f2a99395006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0fd222321059e1063d5f717b… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Tue Aug 23 23:42:49 2011 -0300 dinput: Common implementation of BuildActionMap for keyboard and mouse. --- dlls/dinput/device.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/dinput/device_private.h | 2 ++ dlls/dinput/keyboard.c | 26 +------------------------- dlls/dinput/mouse.c | 26 ++------------------------ 4 files changed, 47 insertions(+), 49 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 8719066..e3dfd03 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -598,6 +598,48 @@ DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic) return type | (0x0000ff00 & (obj_instance << 8)); } +HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags, DWORD devMask, LPCDIDATAFORMAT df) +{ + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + int i, has_actions = 0; + + for (i=0; i < lpdiaf->dwNumActions; i++) + { + if ((lpdiaf->rgoAction[i].dwSemantic & devMask) == devMask) + { + DWORD obj_id = semantic_to_obj_id(This, lpdiaf->rgoAction[i].dwSemantic); + DWORD type = DIDFT_GETTYPE(obj_id); + DWORD inst = DIDFT_GETINSTANCE(obj_id); + + LPDIOBJECTDATAFORMAT odf; + + if (type == DIDFT_PSHBUTTON) type = DIDFT_BUTTON; + if (type == DIDFT_RELAXIS) type = DIDFT_AXIS; + + /* Assure that the object exists */ + odf = dataformat_to_odf_by_type(df, inst, type); + + if (odf != NULL) + { + lpdiaf->rgoAction[i].dwObjID = obj_id; + lpdiaf->rgoAction[i].guidInstance = This->guid; + lpdiaf->rgoAction[i].dwHow = DIAH_DEFAULT; + has_actions = 1; + } + } + else if (!(dwFlags & DIDBAM_PRESERVE)) + { + /* we must clear action data belonging to other devices */ + memset(&lpdiaf->rgoAction[i].guidInstance, 0, sizeof(GUID)); + lpdiaf->rgoAction[i].dwHow = DIAH_UNMAPPED; + } + } + + if (!has_actions) return DI_NOEFFECT; + + return IDirectInputDevice8WImpl_BuildActionMap(iface, lpdiaf, lpszUserName, dwFlags); +} + /****************************************************************************** * queue_event - add new event to the ring queue */ diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index e8fe00a..9b7b370 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -127,6 +127,8 @@ extern const char *_dump_dinput_GUID(const GUID *guid) DECLSPEC_HIDDEN; extern DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic) DECLSPEC_HIDDEN; extern LPDIOBJECTDATAFORMAT dataformat_to_odf_by_type(LPCDIDATAFORMAT df, int n, DWORD type) DECLSPEC_HIDDEN; +extern HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags, DWORD devMask, LPCDIDATAFORMAT df) DECLSPEC_HIDDEN; + /* And the stubs */ extern HRESULT WINAPI IDirectInputDevice2AImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirectInputDevice2WImpl_Acquire(LPDIRECTINPUTDEVICE8W iface) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 3c93bcd..1f766fc 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -529,33 +529,9 @@ static HRESULT WINAPI SysKeyboardWImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W ifac LPCWSTR lpszUserName, DWORD dwFlags) { - SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); - int i, has_actions = 0; - FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); - for (i=0; i < lpdiaf->dwNumActions; i++) - { - if ((lpdiaf->rgoAction[i].dwSemantic & DIKEYBOARD_MASK) == DIKEYBOARD_MASK) - { - DWORD obj_id = semantic_to_obj_id(&This->base, lpdiaf->rgoAction[i].dwSemantic); - - lpdiaf->rgoAction[i].dwObjID = obj_id; - lpdiaf->rgoAction[i].guidInstance = This->base.guid; - lpdiaf->rgoAction[i].dwHow = DIAH_DEFAULT; - has_actions = 1; - } - else if (!(dwFlags & DIDBAM_PRESERVE)) - { - /* we must clear action data belonging to other devices */ - memset(&lpdiaf->rgoAction[i].guidInstance, 0, sizeof(GUID)); - lpdiaf->rgoAction[i].dwHow = DIAH_UNMAPPED; - } - } - - if (!has_actions) return DI_NOEFFECT; - - return IDirectInputDevice8WImpl_BuildActionMap(iface, lpdiaf, lpszUserName, dwFlags); + return _build_action_map(iface, lpdiaf, lpszUserName, dwFlags, DIKEYBOARD_MASK, &c_dfDIKeyboard); } static HRESULT WINAPI SysKeyboardAImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface, diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 8da35f4..f42cdb5 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -778,31 +778,9 @@ static HRESULT WINAPI SysMouseWImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, LPCWSTR lpszUserName, DWORD dwFlags) { - SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); - int i, has_actions = 0; - - for (i=0; i < lpdiaf->dwNumActions; i++) - { - if ((lpdiaf->rgoAction[i].dwSemantic & DIMOUSE_MASK) == DIMOUSE_MASK) - { - DWORD obj_id = semantic_to_obj_id(&This->base, lpdiaf->rgoAction[i].dwSemantic); - - lpdiaf->rgoAction[i].dwObjID = obj_id; - lpdiaf->rgoAction[i].guidInstance = This->base.guid; - lpdiaf->rgoAction[i].dwHow = DIAH_DEFAULT; - has_actions = 1; - } - else if (!(dwFlags & DIDBAM_PRESERVE)) - { - /* we must clear action data belonging to other devices */ - memset(&lpdiaf->rgoAction[i].guidInstance, 0, sizeof(GUID)); - lpdiaf->rgoAction[i].dwHow = DIAH_UNMAPPED; - } - } - - if (!has_actions) return DI_NOEFFECT; + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); - return IDirectInputDevice8WImpl_BuildActionMap(iface, lpdiaf, lpszUserName, dwFlags); + return _build_action_map(iface, lpdiaf, lpszUserName, dwFlags, DIMOUSE_MASK, &c_dfDIMouse2); } static HRESULT WINAPI SysMouseAImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface,

1 0

Lucas Fialho Zawacki : dinput: Common implementation for joystick, keyboard and mouse SetActionMap.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: d175c1526f8912b4295df6faf0977571d2416041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d175c1526f8912b4295df6faf… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Tue Aug 23 23:42:50 2011 -0300 dinput: Common implementation for joystick, keyboard and mouse SetActionMap. --- dlls/dinput/device.c | 106 +++++++++++++++++++++++++++++++++--------- dlls/dinput/device_private.h | 1 + dlls/dinput/joystick.c | 58 +---------------------- dlls/dinput/keyboard.c | 48 +------------------ dlls/dinput/mouse.c | 52 +-------------------- 5 files changed, 90 insertions(+), 175 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d175c1526f8912b4295df…

1 0

Jacek Caban : mshtml: Wine Gecko 1.3 release.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: bf4b8691527cc518077b3d2dfdc2d1028a7a71b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf4b8691527cc518077b3d2df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 23 14:07:02 2011 +0200 mshtml: Wine Gecko 1.3 release. --- dlls/appwiz.cpl/addons.c | 6 +- dlls/mshtml/htmlbody.c | 12 +-- dlls/mshtml/htmlcurstyle.c | 23 +--- dlls/mshtml/htmldoc3.c | 10 +-- dlls/mshtml/htmlelem.c | 18 +-- dlls/mshtml/htmlelem2.c | 11 +- dlls/mshtml/htmlevent.c | 15 +-- dlls/mshtml/htmlwindow.c | 19 +--- dlls/mshtml/mutation.c | 2 +- dlls/mshtml/npplugin.c | 24 +-- dlls/mshtml/nsiface.idl | 333 ++++++++++++++++---------------------------- dlls/mshtml/nsio.c | 174 ++++++++++++++++------- 12 files changed, 266 insertions(+), 381 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf4b8691527cc518077b3…

1 0