wine-commits March 2014

wine-commits@winehq.org

2 participants
530 discussions

Matteo Bruni : wined3d: Free CS data on CS destruction.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: 9c5c3a81ceab5362513de6eb81cee921dcc52c14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c5c3a81ceab5362513de6eb8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 5 18:35:20 2014 +0100 wined3d: Free CS data on CS destruction. --- dlls/wined3d/cs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 4d7c76e..9288b94 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -939,5 +939,6 @@ void wined3d_cs_destroy(struct wined3d_cs *cs) { state_cleanup(&cs->state); HeapFree(GetProcessHeap(), 0, cs->fb.render_targets); + HeapFree(GetProcessHeap(), 0, cs->data); HeapFree(GetProcessHeap(), 0, cs); }

1 0

Matteo Bruni : d3dx9: Free string data.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: 83c3f8c9ed786d45ee39df7771427e9513910ca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83c3f8c9ed786d45ee39df777… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 5 18:35:19 2014 +0100 d3dx9: Free string data. --- dlls/d3dx9_36/effect.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 9a8f727..13f4524 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -561,6 +561,7 @@ static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL chil switch (param->type) { case D3DXPT_STRING: + HeapFree(GetProcessHeap(), 0, *(char **)param->data); break; case D3DXPT_TEXTURE:

1 0

Matteo Bruni : d3dx9: Support skipping mip levels in D3DXCreateTextureFromFileInMemoryEx.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: 596557a57acd1bc800d71853c3a9f82b5f9f962b URL: http://source.winehq.org/git/wine.git/?a=commit;h=596557a57acd1bc800d71853c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 5 18:35:18 2014 +0100 d3dx9: Support skipping mip levels in D3DXCreateTextureFromFileInMemoryEx. --- dlls/d3dx9_36/d3dx9_36_private.h | 2 +- dlls/d3dx9_36/surface.c | 23 +++++++++++++---------- dlls/d3dx9_36/tests/texture.c | 19 +++++++++++++++++++ dlls/d3dx9_36/texture.c | 26 ++++++++++++++++++++++---- include/d3dx9tex.h | 5 +++++ 5 files changed, 60 insertions(+), 15 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 492b665..79f3b76 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -88,7 +88,7 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic const struct pixel_format_desc *dst_format, D3DCOLOR color_key, const PALETTEENTRY *palette) DECLSPEC_HIDDEN; HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, const PALETTEENTRY *palette, - DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info, + DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info, unsigned int skip_levels, unsigned int *loaded_miplevels) DECLSPEC_HIDDEN; HRESULT load_cube_texture_from_dds(IDirect3DCubeTexture9 *cube_texture, const void *src_data, const PALETTEENTRY *palette, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN; diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 97c71bf..09c2fce 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -539,9 +539,8 @@ HRESULT load_volume_from_dds(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *d } HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, const PALETTEENTRY *palette, - DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info, + DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info, unsigned int skip_levels, unsigned int *loaded_miplevels) - { HRESULT hr; RECT src_rect; @@ -569,25 +568,29 @@ HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, mip_levels = min(src_info->MipLevels, IDirect3DTexture9_GetLevelCount(texture)); if (src_info->ResourceType == D3DRTYPE_VOLUMETEXTURE) mip_levels = 1; - for (mip_level = 0; mip_level < mip_levels; mip_level++) + for (mip_level = 0; mip_level < mip_levels + skip_levels; ++mip_level) { hr = calculate_dds_surface_size(src_info->Format, width, height, &src_pitch, &mip_level_size); if (FAILED(hr)) return hr; - SetRect(&src_rect, 0, 0, width, height); + if (mip_level >= skip_levels) + { + SetRect(&src_rect, 0, 0, width, height); - IDirect3DTexture9_GetSurfaceLevel(texture, mip_level, &surface); - hr = D3DXLoadSurfaceFromMemory(surface, palette, NULL, pixels, src_info->Format, src_pitch, - NULL, &src_rect, filter, color_key); - IDirect3DSurface9_Release(surface); - if (FAILED(hr)) return hr; + IDirect3DTexture9_GetSurfaceLevel(texture, mip_level - skip_levels, &surface); + hr = D3DXLoadSurfaceFromMemory(surface, palette, NULL, pixels, src_info->Format, src_pitch, + NULL, &src_rect, filter, color_key); + IDirect3DSurface9_Release(surface); + if (FAILED(hr)) + return hr; + } pixels += mip_level_size; width = max(1, width / 2); height = max(1, height / 2); } - *loaded_miplevels = mip_levels; + *loaded_miplevels = mip_levels - skip_levels; return D3D_OK; } diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index a2fc551..631a658 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1511,6 +1511,9 @@ static void test_D3DXCreateTextureFromFileInMemoryEx(IDirect3DDevice9 *device) { HRESULT hr; IDirect3DTexture9 *texture; + unsigned int miplevels; + IDirect3DSurface9 *surface; + D3DSURFACE_DESC desc; hr = D3DXCreateTextureFromFileInMemoryEx(device, dds_16bit, sizeof(dds_16bit), D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &texture); @@ -1522,6 +1525,22 @@ static void test_D3DXCreateTextureFromFileInMemoryEx(IDirect3DDevice9 *device) ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemoryEx returned %#x, expected %#x\n", hr, D3D_OK); if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); + hr = D3DXCreateTextureFromFileInMemoryEx(device, dds_24bit, sizeof(dds_24bit), D3DX_DEFAULT, + D3DX_DEFAULT, D3DX_DEFAULT, D3DUSAGE_DYNAMIC, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, + D3DX_DEFAULT, D3DX_SKIP_DDS_MIP_LEVELS(1, D3DX_FILTER_POINT), 0, NULL, NULL, &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemoryEx returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) + { + miplevels = IDirect3DTexture9_GetLevelCount(texture); + ok(miplevels == 1, "Got miplevels %u, expected %u\n", miplevels, 1); + IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + IDirect3DSurface9_GetDesc(surface, &desc); + ok(desc.Width == 1 && desc.Height == 1, + "Surface dimensions are %ux%u, expected 1x1.\n", desc.Width, desc.Height); + IDirect3DSurface9_Release(surface); + IDirect3DTexture9_Release(texture); + } + if (!is_autogenmipmap_supported(device, D3DRTYPE_TEXTURE)) { skip("No D3DUSAGE_AUTOGENMIPMAP support for textures\n"); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index f5f754d..32415a2 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -529,12 +529,15 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi BOOL file_format = FALSE, file_miplevels = FALSE; BOOL dynamic_texture; D3DXIMAGE_INFO imginfo; - UINT loaded_miplevels; + UINT loaded_miplevels, skip_levels; D3DCAPS9 caps; HRESULT hr; - TRACE("(%p, %p, %u, %u, %u, %u, %x, %x, %x, %u, %u, %x, %p, %p, %p)\n", device, srcdata, srcdatasize, width, - height, miplevels, usage, format, pool, filter, mipfilter, colorkey, srcinfo, palette, texture); + TRACE("device %p, srcdata %p, srcdatasize %u, width %u, height %u, miplevels %u," + " usage %#x, format %#x, pool %#x, filter %#x, mipfilter %#x, colorkey %#x," + " srcinfo %p, palette %p, texture %p.\n", + device, srcdata, srcdatasize, width, height, miplevels, usage, format, pool, + filter, mipfilter, colorkey, srcinfo, palette, texture); /* check for invalid parameters */ if (!device || !texture || !srcdata || !srcdatasize) @@ -588,6 +591,21 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi miplevels = imginfo.MipLevels; } + skip_levels = mipfilter != D3DX_DEFAULT ? mipfilter >> D3DX_SKIP_DDS_MIP_LEVELS_SHIFT : 0; + if (skip_levels && imginfo.MipLevels > skip_levels) + { + TRACE("Skipping the first %u (of %u) levels of a DDS mipmapped texture.\n", + skip_levels, imginfo.MipLevels); + TRACE("Texture level 0 dimensions are %ux%u.\n", imginfo.Width, imginfo.Height); + width >>= skip_levels; + height >>= skip_levels; + miplevels -= skip_levels; + } + else + { + skip_levels = 0; + } + /* fix texture creation parameters */ hr = D3DXCheckTextureRequirements(device, &width, &height, &miplevels, usage, &format, pool); if (FAILED(hr)) @@ -650,7 +668,7 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi } else { - hr = load_texture_from_dds(*texptr, srcdata, palette, filter, colorkey, &imginfo, + hr = load_texture_from_dds(*texptr, srcdata, palette, filter, colorkey, &imginfo, skip_levels, &loaded_miplevels); } diff --git a/include/d3dx9tex.h b/include/d3dx9tex.h index 205d897..542460f 100644 --- a/include/d3dx9tex.h +++ b/include/d3dx9tex.h @@ -39,6 +39,11 @@ #define D3DX_FILTER_SRGB_OUT 0x00400000 #define D3DX_FILTER_SRGB 0x00600000 +#define D3DX_SKIP_DDS_MIP_LEVELS_MASK 0x1f +#define D3DX_SKIP_DDS_MIP_LEVELS_SHIFT 26 +#define D3DX_SKIP_DDS_MIP_LEVELS(l, f) ((((l) & D3DX_SKIP_DDS_MIP_LEVELS_MASK) \ + << D3DX_SKIP_DDS_MIP_LEVELS_SHIFT) | ((f) == D3DX_DEFAULT ? D3DX_FILTER_BOX : (f))) + #define D3DX_NORMALMAP_MIRROR_U 0x00010000 #define D3DX_NORMALMAP_MIRROR_V 0x00020000 #define D3DX_NORMALMAP_MIRROR 0x00030000

1 0

Matteo Bruni : d3dx9: Introduce a handle table for parameters to make lookup faster.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: 7788161c910b8ad6fdd72104a1649e2667501874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7788161c910b8ad6fdd72104a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 5 18:35:17 2014 +0100 d3dx9: Introduce a handle table for parameters to make lookup faster. --- dlls/d3dx9_36/effect.c | 228 ++++++++++++++++++++++++++---------------------- 1 file changed, 122 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7788161c910b8ad6fdd72…

1 0

Matteo Bruni : d3dx9: Fix an error trace.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: db8e1df742a0c4d5a87e4900304b79359b9f935a URL: http://source.winehq.org/git/wine.git/?a=commit;h=db8e1df742a0c4d5a87e49003… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 5 18:35:16 2014 +0100 d3dx9: Fix an error trace. --- dlls/d3dx9_36/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 6629f38..b7abe24 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4382,7 +4382,7 @@ static HRESULT d3dx9_copy_data(struct d3dx_object *object, const char **ptr) object->data = HeapAlloc(GetProcessHeap(), 0, object->size); if (!object->data) { - ERR("Failed to allocate name memory.\n"); + ERR("Failed to allocate object memory.\n"); return E_OUTOFMEMORY; }

1 0

Jacek Caban : wininet: Added support for raw deflate content encoding.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: 22e75c69abf89ad2e834c63b44b70cd1abcbe8f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22e75c69abf89ad2e834c63b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 5 18:28:33 2014 +0100 wininet: Added support for raw deflate content encoding. --- dlls/wininet/http.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ad5d956..934af3a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -431,7 +431,8 @@ static DWORD gzip_get_avail_data(data_stream_t *stream, http_request_t *req) static BOOL gzip_end_of_data(data_stream_t *stream, http_request_t *req) { gzip_stream_t *gzip_stream = (gzip_stream_t*)stream; - return gzip_stream->end_of_data; + return gzip_stream->end_of_data + || (!gzip_stream->buf_size && gzip_stream->parent_stream->vtbl->end_of_data(gzip_stream->parent_stream, req)); } static DWORD gzip_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DWORD size, @@ -443,6 +444,8 @@ static DWORD gzip_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DW int zres; DWORD res = ERROR_SUCCESS; + TRACE("(%d %d)\n", size, blocking_mode); + while(size && !gzip_stream->end_of_data) { if(!gzip_stream->buf_size) { if(gzip_stream->buf_pos) { @@ -530,7 +533,7 @@ static void wininet_zfree(voidpf opaque, voidpf address) heap_free(address); } -static DWORD init_gzip_stream(http_request_t *req) +static DWORD init_gzip_stream(http_request_t *req, BOOL is_gzip) { gzip_stream_t *gzip_stream; int index, zres; @@ -543,7 +546,7 @@ static DWORD init_gzip_stream(http_request_t *req) gzip_stream->zstream.zalloc = wininet_zalloc; gzip_stream->zstream.zfree = wininet_zfree; - zres = inflateInit2(&gzip_stream->zstream, 0x1f); + zres = inflateInit2(&gzip_stream->zstream, is_gzip ? 0x1f : -15); if(zres != Z_OK) { ERR("inflateInit failed: %d\n", zres); heap_free(gzip_stream); @@ -568,7 +571,7 @@ static DWORD init_gzip_stream(http_request_t *req) #else -static DWORD init_gzip_stream(http_request_t *req) +static DWORD init_gzip_stream(http_request_t *req, BOOL is_gzip) { ERR("gzip stream not supported, missing zlib.\n"); return ERROR_SUCCESS; @@ -1934,7 +1937,7 @@ static void HTTPREQ_Destroy(object_header_t *hdr) static void http_release_netconn(http_request_t *req, BOOL reuse) { - TRACE("%p %p\n",req, req->netconn); + TRACE("%p %p %x\n",req, req->netconn, reuse); if(!is_valid_netconn(req->netconn)) return; @@ -2922,12 +2925,19 @@ static DWORD set_content_length(http_request_t *request) if(request->decoding) { int encoding_idx; + static const WCHAR deflateW[] = {'d','e','f','l','a','t','e',0}; static const WCHAR gzipW[] = {'g','z','i','p',0}; encoding_idx = HTTP_GetCustomHeaderIndex(request, szContent_Encoding, 0, FALSE); - if(encoding_idx != -1 && !strcmpiW(request->custHeaders[encoding_idx].lpszValue, gzipW)) { - HTTP_DeleteCustomHeader(request, encoding_idx); - return init_gzip_stream(request); + if(encoding_idx != -1) { + if(!strcmpiW(request->custHeaders[encoding_idx].lpszValue, gzipW)) { + HTTP_DeleteCustomHeader(request, encoding_idx); + return init_gzip_stream(request, TRUE); + } + if(!strcmpiW(request->custHeaders[encoding_idx].lpszValue, deflateW)) { + HTTP_DeleteCustomHeader(request, encoding_idx); + return init_gzip_stream(request, FALSE); + } } }

1 0

Jacek Caban : wininet: Get rid of no longer needed hack in gzip_read that prevents consuming the whole input buffer until we 're at the end of stream.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: 2667a5376c1d9ff6de483940cd1fe8aa391af13a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2667a5376c1d9ff6de483940c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 5 18:28:24 2014 +0100 wininet: Get rid of no longer needed hack in gzip_read that prevents consuming the whole input buffer until we're at the end of stream. --- dlls/wininet/http.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9a82368..ad5d956 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -440,14 +440,11 @@ static DWORD gzip_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DW gzip_stream_t *gzip_stream = (gzip_stream_t*)stream; z_stream *zstream = &gzip_stream->zstream; DWORD current_read, ret_read = 0; - BOOL end; int zres; DWORD res = ERROR_SUCCESS; while(size && !gzip_stream->end_of_data) { - end = gzip_stream->parent_stream->vtbl->end_of_data(gzip_stream->parent_stream, req); - - if(gzip_stream->buf_size <= 64 && !end) { + if(!gzip_stream->buf_size) { if(gzip_stream->buf_pos) { if(gzip_stream->buf_size) memmove(gzip_stream->buf, gzip_stream->buf+gzip_stream->buf_pos, gzip_stream->buf_size); @@ -458,20 +455,18 @@ static DWORD gzip_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DW gzip_stream->buf_size += current_read; if(res != ERROR_SUCCESS) break; - end = gzip_stream->parent_stream->vtbl->end_of_data(gzip_stream->parent_stream, req); - if(!current_read && !end) { + + if(!current_read) { if(blocking_mode != BLOCKING_DISALLOW) { WARN("unexpected end of data\n"); gzip_stream->end_of_data = TRUE; } break; } - if(gzip_stream->buf_size <= 64 && !end) - continue; } zstream->next_in = gzip_stream->buf+gzip_stream->buf_pos; - zstream->avail_in = gzip_stream->buf_size-(end ? 0 : 64); + zstream->avail_in = gzip_stream->buf_size; zstream->next_out = buf+ret_read; zstream->avail_out = size; zres = inflate(&gzip_stream->zstream, 0);

1 0

Jacek Caban : wininet: Use non-blocking reads in netconn_drain_content.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: b7c47c033c171cfdd3b9b11bc74a40880b611692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7c47c033c171cfdd3b9b11bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 5 18:28:14 2014 +0100 wininet: Use non-blocking reads in netconn_drain_content. --- dlls/wininet/http.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a892b0b..9a82368 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2662,18 +2662,13 @@ static BOOL netconn_drain_content(data_stream_t *stream, http_request_t *req) { netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; BYTE buf[1024]; - DWORD avail; int len; if(netconn_end_of_data(stream, req)) return TRUE; do { - avail = netconn_get_avail_data(stream, req); - if(!avail) - return FALSE; - - if(NETCON_recv(req->netconn, buf, min(avail, sizeof(buf)), BLOCKING_ALLOW, &len) != ERROR_SUCCESS) + if(NETCON_recv(req->netconn, buf, sizeof(buf), BLOCKING_DISALLOW, &len) != ERROR_SUCCESS) return FALSE; netconn_stream->content_read += len;

1 0

Jacek Caban : wininet: Get rid of no longer needed size calculation in netconn_read.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: f9a16d70e22dd000ef47aa6a47c34db25e301552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9a16d70e22dd000ef47aa6a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 5 18:28:03 2014 +0100 wininet: Get rid of no longer needed size calculation in netconn_read. --- dlls/wininet/http.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 62faadd..a892b0b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2641,12 +2641,6 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, size = min(size, netconn_stream->content_length-netconn_stream->content_read); - if(blocking_mode == BLOCKING_DISALLOW) { - DWORD avail = netconn_get_avail_data(stream, req); - if (size > avail) - size = avail; - } - if(size && is_valid_netconn(req->netconn)) { if((res = NETCON_recv(req->netconn, buf, size, blocking_mode, &len))) { len = 0;

1 0

Jacek Caban : wininet: Improved non-blocking mode in secure NETCON_recv.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: d8948da1b4ede8f9425b8e42c3307a7eda273268 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8948da1b4ede8f9425b8e42c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 5 18:27:53 2014 +0100 wininet: Improved non-blocking mode in secure NETCON_recv. --- dlls/wininet/netconnection.c | 102 ++++++++++++++++++++++++++++-------------- 1 file changed, 69 insertions(+), 33 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 4c97924..fa07a9b 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -86,6 +86,11 @@ #define RESPONSE_TIMEOUT 30 /* FROM internet.c */ +#ifdef MSG_DONTWAIT +#define WINE_MSG_DONTWAIT MSG_DONTWAIT +#else +#define WINE_MSG_DONTWAIT 0 +#endif WINE_DEFAULT_DEBUG_CHANNEL(wininet); @@ -755,37 +760,53 @@ DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, } } -static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T *ret_size, BOOL *eof) +static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, blocking_mode_t mode, SIZE_T *ret_size, BOOL *eof) { const SIZE_T ssl_buf_size = conn->ssl_sizes.cbHeader+conn->ssl_sizes.cbMaximumMessage+conn->ssl_sizes.cbTrailer; SecBuffer bufs[4]; SecBufferDesc buf_desc = {SECBUFFER_VERSION, sizeof(bufs)/sizeof(*bufs), bufs}; - SSIZE_T size, buf_len; + SSIZE_T size, buf_len = 0; + blocking_mode_t tmp_mode; int i; SECURITY_STATUS res; assert(conn->extra_len < ssl_buf_size); + /* BLOCKING_WAITALL is handled by caller */ + if(mode == BLOCKING_WAITALL) + mode = BLOCKING_ALLOW; + if(conn->extra_len) { memcpy(conn->ssl_buf, conn->extra_buf, conn->extra_len); buf_len = conn->extra_len; conn->extra_len = 0; heap_free(conn->extra_buf); conn->extra_buf = NULL; - }else { - buf_len = recv(conn->socket, conn->ssl_buf+conn->extra_len, ssl_buf_size-conn->extra_len, 0); - if(buf_len < 0) { - WARN("recv failed\n"); - return FALSE; - } + } + tmp_mode = buf_len ? BLOCKING_DISALLOW : mode; + set_socket_blocking(conn->socket, tmp_mode); + size = recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, tmp_mode == BLOCKING_ALLOW ? 0 : WINE_MSG_DONTWAIT); + if(size < 0) { if(!buf_len) { - *eof = TRUE; - return TRUE; + if(errno == EAGAIN || errno == EWOULDBLOCK) { + TRACE("would block\n"); + return WSAEWOULDBLOCK; + } + WARN("recv failed\n"); + return ERROR_INTERNET_CONNECTION_ABORTED; } + }else { + buf_len += size; + } + + *ret_size = buf_len; + + if(!buf_len) { + *eof = TRUE; + return ERROR_SUCCESS; } - *ret_size = 0; *eof = FALSE; do { @@ -801,19 +822,34 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T * case SEC_I_CONTEXT_EXPIRED: TRACE("context expired\n"); *eof = TRUE; - return TRUE; + return ERROR_SUCCESS; case SEC_E_INCOMPLETE_MESSAGE: assert(buf_len < ssl_buf_size); - size = recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, 0); - if(size < 1) - return FALSE; + set_socket_blocking(conn->socket, mode); + size = recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, mode == BLOCKING_ALLOW ? 0 : WINE_MSG_DONTWAIT); + if(size < 1) { + if(size < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) { + TRACE("would block\n"); + + /* FIXME: Optimize extra_buf usage. */ + conn->extra_buf = heap_alloc(buf_len); + if(!conn->extra_buf) + return ERROR_NOT_ENOUGH_MEMORY; + + conn->extra_len = buf_len; + memcpy(conn->extra_buf, conn->ssl_buf, conn->extra_len); + return WSAEWOULDBLOCK; + } + + return ERROR_INTERNET_CONNECTION_ABORTED; + } buf_len += size; continue; default: WARN("failed: %08x\n", res); - return FALSE; + return ERROR_INTERNET_CONNECTION_ABORTED; } } while(res != SEC_E_OK); @@ -825,7 +861,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T * assert(!conn->peek_len); conn->peek_msg_mem = conn->peek_msg = heap_alloc(bufs[i].cbBuffer - size); if(!conn->peek_msg) - return FALSE; + return ERROR_NOT_ENOUGH_MEMORY; conn->peek_len = bufs[i].cbBuffer-size; memcpy(conn->peek_msg, (char*)bufs[i].pvBuffer+size, conn->peek_len); } @@ -838,14 +874,14 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T * if(bufs[i].BufferType == SECBUFFER_EXTRA) { conn->extra_buf = heap_alloc(bufs[i].cbBuffer); if(!conn->extra_buf) - return FALSE; + return ERROR_NOT_ENOUGH_MEMORY; conn->extra_len = bufs[i].cbBuffer; memcpy(conn->extra_buf, bufs[i].pvBuffer, conn->extra_len); } } - return TRUE; + return ERROR_SUCCESS; } /****************************************************************************** @@ -867,9 +903,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, blocking_mode_t case BLOCKING_ALLOW: break; case BLOCKING_DISALLOW: -#ifdef MSG_DONTWAIT - flags = MSG_DONTWAIT; -#endif + flags = WINE_MSG_DONTWAIT; break; case BLOCKING_WAITALL: flags = MSG_WAITALL; @@ -883,7 +917,8 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, blocking_mode_t else { SIZE_T size = 0, cread; - BOOL res, eof; + BOOL eof; + DWORD res; if(connection->peek_msg) { size = min(len, connection->peek_len); @@ -900,18 +935,19 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, blocking_mode_t *recvd = size; return ERROR_SUCCESS; } - } - if(mode == BLOCKING_DISALLOW) - return WSAEWOULDBLOCK; /* FIXME: We can do better */ - set_socket_blocking(connection->socket, BLOCKING_ALLOW); + mode = BLOCKING_DISALLOW; + } do { - res = read_ssl_chunk(connection, (BYTE*)buf+size, len-size, &cread, &eof); - if(!res) { - WARN("read_ssl_chunk failed\n"); - if(!size) - return ERROR_INTERNET_CONNECTION_ABORTED; + res = read_ssl_chunk(connection, (BYTE*)buf+size, len-size, mode, &cread, &eof); + if(res != ERROR_SUCCESS) { + if(res == WSAEWOULDBLOCK) { + if(size) + res = ERROR_SUCCESS; + }else { + WARN("read_ssl_chunk failed\n"); + } break; } @@ -925,7 +961,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, blocking_mode_t TRACE("received %ld bytes\n", size); *recvd = size; - return ERROR_SUCCESS; + return res; } }

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
53
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2014