May 2012 - Wine-Commits - list.winehq.org

Jacek Caban : wininet: Store server_t on the list until clean up.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: 95c1b74fc9fe4525f2314570aa422401fc40d865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95c1b74fc9fe4525f2314570a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 25 16:35:32 2012 +0200 wininet: Store server_t on the list until clean up. --- dlls/wininet/http.c | 21 +++++++++------------ dlls/wininet/internet.h | 1 - 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 50f77df..e32dde6 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -242,8 +242,10 @@ void server_release(server_t *server) if(InterlockedDecrement(&server->ref)) return; - if(!server->ref) - server->keep_until = GetTickCount64() + COLLECT_TIME; + list_remove(&server->entry); + + heap_free(server->name); + heap_free(server); } static server_t *get_server(const WCHAR *name, INTERNET_PORT port) @@ -264,7 +266,7 @@ static server_t *get_server(const WCHAR *name, INTERNET_PORT port) server = heap_alloc(sizeof(*server)); if(server) { server->addr_len = 0; - server->ref = 1; + server->ref = 2; /* list reference and return */ server->port = port; server->security_flags = 0; list_init(&server->conn_pool); @@ -303,15 +305,10 @@ BOOL collect_connections(BOOL collect_all) } } - if(!server->ref) { - if(collect_all || server->keep_until < now) { - list_remove(&server->entry); - - heap_free(server->name); - heap_free(server); - }else { - remaining = TRUE; - } + if(collect_all) { + list_remove(&server->entry); + list_init(&server->entry); + server_release(server); } } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index bf11e6d..30869d9 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -61,7 +61,6 @@ typedef struct { char addr_str[INET6_ADDRSTRLEN]; LONG ref; - DWORD64 keep_until; DWORD security_flags;

1 0

Aric Stewart : usp10: Check bounds before checking value in array.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: 1f4554d141774e948a29731db72ce5758ddad2f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f4554d141774e948a29731db… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 25 07:55:19 2012 -0500 usp10: Check bounds before checking value in array. --- dlls/usp10/shape.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index a039504..d582fc7 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -628,9 +628,9 @@ static void UpdateClustersFromGlyphProp(const int cGlyphs, const int cChars, WOR if (pwLogClust[j] == i) { int k = j; - while (!pGlyphProp[pwLogClust[k]].sva.fClusterStart && k >= 0 && k <cChars) + while (k >= 0 && k <cChars && !pGlyphProp[pwLogClust[k]].sva.fClusterStart) k-=1; - if (pGlyphProp[pwLogClust[k]].sva.fClusterStart) + if (k >= 0 && k <cChars && pGlyphProp[pwLogClust[k]].sva.fClusterStart) pwLogClust[j] = pwLogClust[k]; } }

1 0

Jacek Caban : wininet: Added INTERNET_OPTION_SECURITY_FLAGS tests.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: 22e25ea006eb6fed29d2d70cfc70cbc9b65f0a8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=22e25ea006eb6fed29d2d70cf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 25 16:36:46 2012 +0200 wininet: Added INTERNET_OPTION_SECURITY_FLAGS tests. --- dlls/wininet/tests/http.c | 215 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 215 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=22e25ea006eb6fed29d2d…

1 0

Jacek Caban : wininet: Set SECURITY_FLAG_STRENGTH_* flags in NETCONN_secure_connect.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: f3dd75d8a4da66da467a6e026ec8c1a5ee8339b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3dd75d8a4da66da467a6e026… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 25 16:35:12 2012 +0200 wininet: Set SECURITY_FLAG_STRENGTH_* flags in NETCONN_secure_connect. --- dlls/wininet/http.c | 11 ++--------- dlls/wininet/netconnection.c | 9 +++++++++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1943e91..50f77df 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1999,16 +1999,9 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe *size = sizeof(DWORD); flags = req->netconn ? req->netconn->security_flags : req->security_flags | req->server->security_flags; - if(req->netconn) { - int bits = NETCON_GetCipherStrength(req->netconn); - if (bits >= 128) - flags |= SECURITY_FLAG_STRENGTH_STRONG; - else if (bits >= 56) - flags |= SECURITY_FLAG_STRENGTH_MEDIUM; - else - flags |= SECURITY_FLAG_STRENGTH_WEAK; - } *(DWORD *)buffer = flags; + + TRACE("INTERNET_OPTION_SECURITY_FLAGS %x\n", flags); return ERROR_SUCCESS; } diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index ac9f347..66e1734 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -688,6 +688,7 @@ DWORD NETCON_secure_connect(netconn_t *connection) DWORD res = ERROR_NOT_SUPPORTED; #ifdef SONAME_LIBSSL void *ssl_s; + int bits; /* can't connect if we are already connected */ if (connection->ssl_s) @@ -730,7 +731,15 @@ DWORD NETCON_secure_connect(netconn_t *connection) connection->ssl_s = ssl_s; + bits = NETCON_GetCipherStrength(connection); + if (bits >= 128) + connection->security_flags |= SECURITY_FLAG_STRENGTH_STRONG; + else if (bits >= 56) + connection->security_flags |= SECURITY_FLAG_STRENGTH_MEDIUM; + else + connection->security_flags |= SECURITY_FLAG_STRENGTH_WEAK; connection->security_flags |= SECURITY_FLAG_SECURE; + connection->server->security_flags = connection->security_flags; return ERROR_SUCCESS;

1 0

Henri Verbeet : d3dx9: Don't use HEAP_ZERO_MEMORY if we' re going to overwrite the memory anyway.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: 372984e053b0fc8a8e56d5f2209540b61fb2836b URL: http://source.winehq.org/git/wine.git/?a=commit;h=372984e053b0fc8a8e56d5f22… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 25 16:10:29 2012 +0200 d3dx9: Don't use HEAP_ZERO_MEMORY if we're going to overwrite the memory anyway. --- dlls/d3dx9_36/surface.c | 4 ++-- dlls/d3dx9_36/texture.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 821d51e..d490cef 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -656,7 +656,7 @@ HRESULT WINAPI D3DXGetImageInfoFromFileA(LPCSTR file, D3DXIMAGE_INFO *info) if( !file ) return D3DERR_INVALIDCALL; strlength = MultiByteToWideChar(CP_ACP, 0, file, -1, NULL, 0); - widename = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlength * sizeof(WCHAR)); + widename = HeapAlloc(GetProcessHeap(), 0, strlength * sizeof(*widename)); MultiByteToWideChar(CP_ACP, 0, file, -1, widename, strlength); hr = D3DXGetImageInfoFromFileW(widename, info); @@ -918,7 +918,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileA(LPDIRECT3DSURFACE9 pDestSurface, if( !pSrcFile || !pDestSurface ) return D3DERR_INVALIDCALL; strlength = MultiByteToWideChar(CP_ACP, 0, pSrcFile, -1, NULL, 0); - pWidename = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlength * sizeof(WCHAR)); + pWidename = HeapAlloc(GetProcessHeap(), 0, strlength * sizeof(*pWidename)); MultiByteToWideChar(CP_ACP, 0, pSrcFile, -1, pWidename, strlength); hr = D3DXLoadSurfaceFromFileW(pDestSurface, pDestPalette, pDestRect, pWidename, pSrcRect, dwFilter, Colorkey, pSrcInfo); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 750025c..c17a327 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -746,7 +746,7 @@ HRESULT WINAPI D3DXCreateTextureFromFileExA(LPDIRECT3DDEVICE9 device, return D3DERR_INVALIDCALL; len = MultiByteToWideChar(CP_ACP, 0, srcfile, -1, NULL, 0); - widename = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR)); + widename = HeapAlloc(GetProcessHeap(), 0, len * sizeof(*widename)); MultiByteToWideChar(CP_ACP, 0, srcfile, -1, widename, len); hr = D3DXCreateTextureFromFileExW(device, widename, width, height, miplevels,

1 0

Henri Verbeet : d3d9: Get rid of the D3D_DECL_* macros.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: b5d64260e00ef98de12cecbfcbd5a2910538875b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5d64260e00ef98de12cecbfc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 25 16:10:28 2012 +0200 d3d9: Get rid of the D3D_DECL_* macros. --- dlls/d3d9/vertexdeclaration.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 679f010..2d31dd7 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -27,8 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static const struct { enum wined3d_format_id format; - int size; - int typesize; + unsigned int component_count; + unsigned int component_size; } d3d_dtype_lookup[] = { @@ -51,9 +51,6 @@ d3d_dtype_lookup[] = /* D3DDECLTYPE_FLOAT16_4 */ {WINED3DFMT_R16G16B16A16_FLOAT, 4, sizeof(short int)} }; -#define D3D_DECL_SIZE(type) d3d_dtype_lookup[type].size -#define D3D_DECL_TYPESIZE(type) d3d_dtype_lookup[type].typesize - static inline IDirect3DVertexDeclaration9Impl *impl_from_IDirect3DVertexDeclaration9(IDirect3DVertexDeclaration9 *iface) { return CONTAINING_RECORD(iface, IDirect3DVertexDeclaration9Impl, IDirect3DVertexDeclaration9_iface); @@ -192,7 +189,8 @@ HRESULT vdecl_convert_fvf( elements[idx].Stream = 0; elements[idx].Method = D3DDECLMETHOD_DEFAULT; elements[idx].Offset = offset; - offset += D3D_DECL_SIZE(elements[idx].Type) * D3D_DECL_TYPESIZE(elements[idx].Type); + offset += d3d_dtype_lookup[elements[idx].Type].component_count + * d3d_dtype_lookup[elements[idx].Type].component_size; } *ppVertexElements = elements;

1 0

Henri Verbeet : d3d9: Get rid of the d3dType field from d3d_dtype_lookup.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: 51024a078f4747f05527310d034f0f47c4e3cdd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51024a078f4747f05527310d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 25 16:10:27 2012 +0200 d3d9: Get rid of the d3dType field from d3d_dtype_lookup. --- dlls/d3d9/vertexdeclaration.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 421f099..679f010 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -26,30 +26,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static const struct { - D3DDECLTYPE d3dType; enum wined3d_format_id format; int size; int typesize; } d3d_dtype_lookup[] = { - {D3DDECLTYPE_FLOAT1, WINED3DFMT_R32_FLOAT, 1, sizeof(float)}, - {D3DDECLTYPE_FLOAT2, WINED3DFMT_R32G32_FLOAT, 2, sizeof(float)}, - {D3DDECLTYPE_FLOAT3, WINED3DFMT_R32G32B32_FLOAT, 3, sizeof(float)}, - {D3DDECLTYPE_FLOAT4, WINED3DFMT_R32G32B32A32_FLOAT, 4, sizeof(float)}, - {D3DDECLTYPE_D3DCOLOR, WINED3DFMT_B8G8R8A8_UNORM, 4, sizeof(BYTE)}, - {D3DDECLTYPE_UBYTE4, WINED3DFMT_R8G8B8A8_UINT, 4, sizeof(BYTE)}, - {D3DDECLTYPE_SHORT2, WINED3DFMT_R16G16_SINT, 2, sizeof(short int)}, - {D3DDECLTYPE_SHORT4, WINED3DFMT_R16G16B16A16_SINT, 4, sizeof(short int)}, - {D3DDECLTYPE_UBYTE4N, WINED3DFMT_R8G8B8A8_UNORM, 4, sizeof(BYTE)}, - {D3DDECLTYPE_SHORT2N, WINED3DFMT_R16G16_SNORM, 2, sizeof(short int)}, - {D3DDECLTYPE_SHORT4N, WINED3DFMT_R16G16B16A16_SNORM, 4, sizeof(short int)}, - {D3DDECLTYPE_USHORT2N, WINED3DFMT_R16G16_UNORM, 2, sizeof(short int)}, - {D3DDECLTYPE_USHORT4N, WINED3DFMT_R16G16B16A16_UNORM, 4, sizeof(short int)}, - {D3DDECLTYPE_UDEC3, WINED3DFMT_R10G10B10A2_UINT, 3, sizeof(short int)}, - {D3DDECLTYPE_DEC3N, WINED3DFMT_R10G10B10A2_SNORM, 3, sizeof(short int)}, - {D3DDECLTYPE_FLOAT16_2, WINED3DFMT_R16G16_FLOAT, 2, sizeof(short int)}, - {D3DDECLTYPE_FLOAT16_4, WINED3DFMT_R16G16B16A16_FLOAT, 4, sizeof(short int)}}; + /* D3DDECLTYPE_FLOAT1 */ {WINED3DFMT_R32_FLOAT, 1, sizeof(float)}, + /* D3DDECLTYPE_FLOAT2 */ {WINED3DFMT_R32G32_FLOAT, 2, sizeof(float)}, + /* D3DDECLTYPE_FLOAT3 */ {WINED3DFMT_R32G32B32_FLOAT, 3, sizeof(float)}, + /* D3DDECLTYPE_FLOAT4 */ {WINED3DFMT_R32G32B32A32_FLOAT, 4, sizeof(float)}, + /* D3DDECLTYPE_D3DCOLOR */ {WINED3DFMT_B8G8R8A8_UNORM, 4, sizeof(BYTE)}, + /* D3DDECLTYPE_UBYTE4 */ {WINED3DFMT_R8G8B8A8_UINT, 4, sizeof(BYTE)}, + /* D3DDECLTYPE_SHORT2 */ {WINED3DFMT_R16G16_SINT, 2, sizeof(short int)}, + /* D3DDECLTYPE_SHORT4 */ {WINED3DFMT_R16G16B16A16_SINT, 4, sizeof(short int)}, + /* D3DDECLTYPE_UBYTE4N */ {WINED3DFMT_R8G8B8A8_UNORM, 4, sizeof(BYTE)}, + /* D3DDECLTYPE_SHORT2N */ {WINED3DFMT_R16G16_SNORM, 2, sizeof(short int)}, + /* D3DDECLTYPE_SHORT4N */ {WINED3DFMT_R16G16B16A16_SNORM, 4, sizeof(short int)}, + /* D3DDECLTYPE_USHORT2N */ {WINED3DFMT_R16G16_UNORM, 2, sizeof(short int)}, + /* D3DDECLTYPE_USHORT4N */ {WINED3DFMT_R16G16B16A16_UNORM, 4, sizeof(short int)}, + /* D3DDECLTYPE_UDEC3 */ {WINED3DFMT_R10G10B10A2_UINT, 3, sizeof(short int)}, + /* D3DDECLTYPE_DEC3N */ {WINED3DFMT_R10G10B10A2_SNORM, 3, sizeof(short int)}, + /* D3DDECLTYPE_FLOAT16_2 */ {WINED3DFMT_R16G16_FLOAT, 2, sizeof(short int)}, + /* D3DDECLTYPE_FLOAT16_4 */ {WINED3DFMT_R16G16B16A16_FLOAT, 4, sizeof(short int)} +}; #define D3D_DECL_SIZE(type) d3d_dtype_lookup[type].size #define D3D_DECL_TYPESIZE(type) d3d_dtype_lookup[type].typesize

1 0

Jacek Caban : wininet: Store server_t in http_request_t.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: 3aeb8eb6b69f38a2e081d55fac0c2905ac6c44da URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aeb8eb6b69f38a2e081d55fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 25 16:34:24 2012 +0200 wininet: Store server_t in http_request_t. --- dlls/wininet/http.c | 77 +++++++++++++++++++++++++---------------------- dlls/wininet/internet.h | 1 + 2 files changed, 42 insertions(+), 36 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 2f64b03..d8b3d1c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1182,7 +1182,7 @@ static BOOL HTTP_DoAuthorization( http_request_t *request, LPCWSTR pszAuthValue, sec_status = InitializeSecurityContextW(first ? &pAuthInfo->cred : NULL, first ? NULL : &pAuthInfo->ctx, - first ? request->session->serverName : NULL, + first ? request->server->name : NULL, context_req, 0, SECURITY_NETWORK_DREP, in.pvBuffer ? &in_desc : NULL, 0, &pAuthInfo->ctx, &out_desc, @@ -1698,6 +1698,7 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req WCHAR proxy[INTERNET_MAX_URL_LENGTH]; static WCHAR szNul[] = { 0 }; URL_COMPONENTSW UrlComponents; + server_t *new_server; static const WCHAR protoHttp[] = { 'h','t','t','p',0 }; static const WCHAR szHttp[] = { 'h','t','t','p',':','/','/',0 }; static const WCHAR szFormat[] = { 'h','t','t','p',':','/','/','%','s',0 }; @@ -1725,16 +1726,20 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req if(UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) UrlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT; - heap_free(session->serverName); - session->serverName = heap_strdupW(UrlComponents.lpszHostName); - session->serverPort = UrlComponents.nPort; + new_server = get_server(UrlComponents.lpszHostName, UrlComponents.nPort); + if(!new_server) + return FALSE; + + server_release(request->server); + request->server = new_server; - TRACE("proxy server=%s port=%d\n", debugstr_w(session->serverName), session->serverPort); + TRACE("proxy server=%s port=%d\n", debugstr_w(new_server->name), new_server->port); return TRUE; } -static DWORD HTTP_ResolveName(http_request_t *request, server_t *server) +static DWORD HTTP_ResolveName(http_request_t *request) { + server_t *server = request->server; socklen_t addr_len; const void *addr; @@ -1833,6 +1838,9 @@ static void HTTPREQ_Destroy(object_header_t *hdr) destroy_authinfo(request->authInfo); destroy_authinfo(request->proxyAuthInfo); + if(request->server) + server_release(request->server); + heap_free(request->path); heap_free(request->verb); heap_free(request->rawHeaders); @@ -3063,6 +3071,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, { appinfo_t *hIC = session->appInfo; http_request_t *request; + INTERNET_PORT port; DWORD len, res = ERROR_SUCCESS; TRACE("-->\n"); @@ -3089,6 +3098,16 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, request->session = session; list_add_head( &session->hdr.children, &request->hdr.entry ); + port = session->serverPort; + if(port == INTERNET_INVALID_PORT_NUMBER) + port = dwFlags & INTERNET_FLAG_SECURE ? INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; + + request->server = get_server(session->serverName, port); + if(!request->server) { + WININET_Release(&request->hdr); + return ERROR_OUTOFMEMORY; + } + if (dwFlags & INTERNET_FLAG_IGNORE_CERT_CN_INVALID) request->security_flags |= SECURITY_FLAG_IGNORE_CERT_CN_INVALID; if (dwFlags & INTERNET_FLAG_IGNORE_CERT_DATE_INVALID) @@ -3156,11 +3175,6 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, HTTP_ProcessHeader(request, hostW, session->hostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); - if (session->serverPort == INTERNET_INVALID_PORT_NUMBER) - session->serverPort = (dwFlags & INTERNET_FLAG_SECURE ? - INTERNET_DEFAULT_HTTPS_PORT : - INTERNET_DEFAULT_HTTP_PORT); - if (session->hostPort == INTERNET_INVALID_PORT_NUMBER) session->hostPort = (dwFlags & INTERNET_FLAG_SECURE ? INTERNET_DEFAULT_HTTPS_PORT : @@ -3913,12 +3927,12 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) reset_data_stream(request); - if(!using_proxy) { - if(strcmpiW(session->serverName, hostName)) { - heap_free(session->serverName); - session->serverName = heap_strdupW(hostName); - } - session->serverPort = urlComponents.nPort; + if(!using_proxy && (strcmpiW(request->server->name, hostName) || request->server->port != urlComponents.nPort)) { + server_t *new_server; + + new_server = get_server(hostName, urlComponents.nPort); + server_release(request->server); + request->server = new_server; } } heap_free(request->path); @@ -4601,28 +4615,20 @@ static void HTTP_CacheRequest(http_request_t *request) static DWORD open_http_connection(http_request_t *request, BOOL *reusing) { const BOOL is_https = (request->hdr.dwFlags & INTERNET_FLAG_SECURE) != 0; - http_session_t *session = request->session; netconn_t *netconn = NULL; - server_t *server; DWORD res; assert(!request->netconn); reset_data_stream(request); - server = get_server(session->serverName, session->serverPort); - if(!server) - return ERROR_OUTOFMEMORY; - - res = HTTP_ResolveName(request, server); - if(res != ERROR_SUCCESS) { - server_release(server); + res = HTTP_ResolveName(request); + if(res != ERROR_SUCCESS) return res; - } EnterCriticalSection(&connection_pool_cs); - while(!list_empty(&server->conn_pool)) { - netconn = LIST_ENTRY(list_head(&server->conn_pool), netconn_t, pool_entry); + while(!list_empty(&request->server->conn_pool)) { + netconn = LIST_ENTRY(list_head(&request->server->conn_pool), netconn_t, pool_entry); list_remove(&netconn->pool_entry); if(NETCON_is_alive(netconn)) @@ -4644,11 +4650,10 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_CONNECTING_TO_SERVER, - server->addr_str, - strlen(server->addr_str)+1); + request->server->addr_str, + strlen(request->server->addr_str)+1); - res = create_netconn(is_https, server, request->security_flags, request->connect_timeout, &netconn); - server_release(server); + res = create_netconn(is_https, request->server, request->security_flags, request->connect_timeout, &netconn); if(res != ERROR_SUCCESS) { ERR("create_netconn failed: %u\n", res); return res; @@ -4658,7 +4663,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_CONNECTED_TO_SERVER, - server->addr_str, strlen(server->addr_str)+1); + request->server->addr_str, strlen(request->server->addr_str)+1); if(is_https) { /* Note: we differ from Microsoft's WinINet here. they seem to have @@ -4667,7 +4672,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) * behaviour to be more correct and to not cause any incompatibilities * because using a secure connection through a proxy server is a rare * case that would be hard for anyone to depend on */ - if(session->appInfo->proxy) + if(request->session->appInfo->proxy) res = HTTP_SecureProxyConnect(request); if(res == ERROR_SUCCESS) res = NETCON_secure_connect(request->netconn); @@ -4693,7 +4698,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) } *reusing = FALSE; - TRACE("Created connection to %s: %p\n", debugstr_w(server->name), netconn); + TRACE("Created connection to %s: %p\n", debugstr_w(request->server->name), netconn); return ERROR_SUCCESS; } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 1956e07..38d6275 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -304,6 +304,7 @@ typedef struct { object_header_t hdr; http_session_t *session; + server_t *server; LPWSTR path; LPWSTR verb; LPWSTR rawHeaders;

1 0

Henri Verbeet : d3d9: Get rid of IDirect3D9Impl.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: 82adae949bb4f35eed95e276d9ad7acb72cc800a URL: http://source.winehq.org/git/wine.git/?a=commit;h=82adae949bb4f35eed95e276d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 25 16:10:31 2012 +0200 d3d9: Get rid of IDirect3D9Impl. --- dlls/d3d9/d3d9_main.c | 4 +- dlls/d3d9/d3d9_private.h | 28 ++--- dlls/d3d9/device.c | 2 +- dlls/d3d9/directx.c | 335 ++++++++++++++++++++++------------------------ 4 files changed, 176 insertions(+), 193 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82adae949bb4f35eed95e…

1 0

Oleksij Rempel : krnl386: Set remote bit for cdrom.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: 75555c3011484b980f4e2b8dc6d237abbba4a0ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=75555c3011484b980f4e2b8dc… Author: Oleksij Rempel <bug-track(a)fisher-privat.net> Date: Fri May 25 10:58:49 2012 +0200 krnl386: Set remote bit for cdrom. --- dlls/krnl386.exe16/int21.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index a1bb8ce..14dbdfe 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -2491,6 +2491,10 @@ static void INT21_Ioctl_Block( CONTEXT *context ) if (drivetype == DRIVE_REMOTE) SET_DX( context, (1<<9) | (1<<12) ); /* remote + no direct IO */ + else if (drivetype == DRIVE_CDROM) + /* CDROM should be set to remote. If it set the app will + * call int2f to check if it cdrom or remote drive. */ + SET_DX( context, (1<<12) ); else SET_DX( context, 0 ); /* FIXME: use driver attr here */ break;

1 0