April 2013 - Wine-Commits - list.winehq.org

Hans Leidekker : wininet: Get rid of the clear parameter to HTTP_GetResponseHeaders.
by Alexandre Julliard April 25, 2013

April 25, 2013

Module: wine Branch: master Commit: 2145b637fd4f374b0ecc23ef5ffe5abb0d558164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2145b637fd4f374b0ecc23ef5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 25 10:14:21 2013 +0200 wininet: Get rid of the clear parameter to HTTP_GetResponseHeaders. --- dlls/wininet/http.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c910c59..5a58ac9 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -207,7 +207,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION authcache_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; -static BOOL HTTP_GetResponseHeaders(http_request_t *req, BOOL clear); +static BOOL HTTP_GetResponseHeaders(http_request_t *req); static DWORD HTTP_ProcessHeader(http_request_t *req, LPCWSTR field, LPCWSTR value, DWORD dwModifier); static LPWSTR * HTTP_InterpretHttpHeader(LPCWSTR buffer); static DWORD HTTP_InsertCustomHeader(http_request_t *req, LPHTTPHEADERW lpHdr); @@ -4076,7 +4076,7 @@ static DWORD HTTP_SecureProxyConnect(http_request_t *request) if (res != ERROR_SUCCESS) return res; - responseLen = HTTP_GetResponseHeaders( request, TRUE ); + responseLen = HTTP_GetResponseHeaders( request ); if (!responseLen) return ERROR_HTTP_INVALID_HEADER; @@ -4873,7 +4873,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); - responseLen = HTTP_GetResponseHeaders(request, TRUE); + responseLen = HTTP_GetResponseHeaders(request); /* FIXME: We should know that connection is closed before sending * headers. Otherwise wrong callbacks are executed */ if(!responseLen && reusing_connection) { @@ -5067,7 +5067,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); - responseLen = HTTP_GetResponseHeaders(request, TRUE); + responseLen = HTTP_GetResponseHeaders(request); if (!responseLen) res = ERROR_HTTP_HEADER_NOT_FOUND; @@ -5722,7 +5722,7 @@ static void HTTP_clear_response_headers( http_request_t *request ) * TRUE on success * FALSE on error */ -static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear) +static INT HTTP_GetResponseHeaders(http_request_t *request) { INT cbreaks = 0; WCHAR buffer[MAX_REPLY_LEN]; @@ -5742,6 +5742,9 @@ static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear) if(!request->netconn) goto lend; + /* clear old response headers (eg. from a redirect response) */ + HTTP_clear_response_headers( request ); + NETCON_set_timeout( request->netconn, FALSE, request->receive_timeout ); do { /* @@ -5751,12 +5754,6 @@ static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear) if (!read_line(request, bufferA, &buflen)) goto lend; - /* clear old response headers (eg. from a redirect response) */ - if (clear) { - HTTP_clear_response_headers( request ); - clear = FALSE; - } - rc += buflen; MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); /* check is this a status code line? */

1 0

Hans Leidekker : wininet/tests: Improve error reporting in a couple of tests.
by Alexandre Julliard April 25, 2013

April 25, 2013

Module: wine Branch: master Commit: 669a1b3562754448669400cb9651901d468ca8ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=669a1b3562754448669400cb9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 25 10:13:40 2013 +0200 wininet/tests: Improve error reporting in a couple of tests. --- dlls/wininet/tests/http.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index de7f354..ceddde1 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2114,7 +2114,7 @@ static void test_proxy_indirect(int port) ok(hr != NULL, "HttpOpenRequest failed\n"); r = HttpSendRequest(hr, NULL, 0, NULL, 0); - ok(r, "HttpSendRequest failed\n"); + ok(r, "HttpSendRequest failed %u\n", GetLastError()); sz = sizeof buffer; r = HttpQueryInfo(hr, HTTP_QUERY_PROXY_AUTHENTICATE, buffer, &sz, NULL); @@ -2181,7 +2181,7 @@ static void test_proxy_direct(int port) ok(hr != NULL, "HttpOpenRequest failed\n"); r = HttpSendRequest(hr, NULL, 0, NULL, 0); - ok(r, "HttpSendRequest failed\n"); + ok(r, "HttpSendRequest failed %u\n", GetLastError()); test_status_code(hr, 407); @@ -2401,7 +2401,7 @@ static void test_proxy_direct(int port) ok(sz == lstrlenW(passwordW), "got %u\n", sz); r = HttpSendRequest(hr, NULL, 0, NULL, 0); - ok(r, "HttpSendRequest failed\n"); + ok(r, "HttpSendRequest failed %u\n", GetLastError()); sz = sizeof buffer; r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE, buffer, &sz, NULL); ok(r, "HttpQueryInfo failed\n");

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMLIGHT.
by Alexandre Julliard April 25, 2013

April 25, 2013

Module: wine Branch: master Commit: b8e3cee7831ba41a6ebe337a845cdb51b0069336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e3cee7831ba41a6ebe337a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 25 09:59:46 2013 +0200 d3drm: Avoid LPDIRECT3DRMLIGHT. --- dlls/d3drm/d3drm.c | 97 ++++++++++++++++++++------------------------- dlls/d3drm/frame.c | 20 ++++------ dlls/d3drm/tests/d3drm.c | 50 ++++++++++++------------ include/d3drm.h | 19 +++++---- include/d3drmobj.h | 22 +++++----- 5 files changed, 98 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8e3cee7831ba41a6ebe3…

1 0

Henri Verbeet : winex11: Move the desktop process check from X11DRV_ClipCursor() to grab_clipping_window().
by Alexandre Julliard April 25, 2013

April 25, 2013

Module: wine Branch: master Commit: 76bbf106a28c4caa82873e8450bde7d4adc765bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=76bbf106a28c4caa82873e845… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 25 09:59:42 2013 +0200 winex11: Move the desktop process check from X11DRV_ClipCursor() to grab_clipping_window(). We don't want to clip in the desktop process, but we still need it to call ungrab_clipping_window() if the process that was previously clipping didn't. This can happen for example when fullscreen clipping is enabled, but the corresponding window isn't explicitly destroyed before process exit. --- dlls/winex11.drv/mouse.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index de6672e..168914f 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -362,6 +362,9 @@ static BOOL grab_clipping_window( const RECT *clip ) Window clip_window; HWND msg_hwnd = 0; + if (GetWindowThreadProcessId( GetDesktopWindow(), NULL ) == GetCurrentThreadId()) + return TRUE; /* don't clip in the desktop process */ + if (!data) return FALSE; if (!(clip_window = init_clip_window())) return TRUE; @@ -1378,9 +1381,6 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) { if (!clip) clip = &virtual_screen_rect; - if (GetWindowThreadProcessId( GetDesktopWindow(), NULL ) == GetCurrentThreadId()) - return TRUE; /* don't clip in the desktop process */ - if (grab_pointer) { HWND foreground = GetForegroundWindow();

1 0

Alistair Leslie-Hughes : oledb32: Implement DataConvert DBTYPE_VARIANT-> DBTYPE_UI4.
by Alexandre Julliard April 25, 2013

April 25, 2013

Module: wine Branch: master Commit: f5d64e061333eedbb8843db5947fbe09b069fa85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5d64e061333eedbb8843db59… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 18 12:15:06 2013 +1000 oledb32: Implement DataConvert DBTYPE_VARIANT->DBTYPE_UI4. --- dlls/oledb32/convert.c | 14 +++++++------- dlls/oledb32/tests/convert.c | 9 +++++++++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 07b9342..3d7d23d 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -165,6 +165,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, convert *This = impl_from_IDataConvert(iface); DBLENGTH dst_len_loc; DBSTATUS dst_status_loc; + VARIANT tmp; HRESULT hr; TRACE("(%p)->(%d, %d, %ld, %p, %p, %p, %ld, %d, %p, %d, %d, %x)\n", This, @@ -226,7 +227,6 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, case DBTYPE_I2: { signed short *d = dst; - VARIANT tmp; switch(src_type) { case DBTYPE_EMPTY: *d = 0; hr = S_OK; break; @@ -258,7 +258,6 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, case DBTYPE_I4: { signed int *d = dst; - VARIANT tmp; switch(src_type) { case DBTYPE_EMPTY: *d = 0; hr = S_OK; break; @@ -523,14 +522,10 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, } break; case DBTYPE_VARIANT: - { - VARIANT tmp; - VariantInit(&tmp); if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_BSTR)) == S_OK) *d = V_BSTR(&tmp); - } - break; + break; default: FIXME("Unimplemented conversion %04x -> BSTR\n", src_type); return E_NOTIMPL; } break; @@ -608,6 +603,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, case DBTYPE_UI4: *d = *(DWORD*)src; hr = S_OK; break; case DBTYPE_I8: hr = VarUI4FromI8(*(LONGLONG*)src, d); break; case DBTYPE_UI8: hr = VarUI4FromUI8(*(ULONGLONG*)src, d); break; + case DBTYPE_VARIANT: + VariantInit(&tmp); + if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_UI4)) == S_OK) + *d = V_UI4(&tmp); + break; default: FIXME("Unimplemented conversion %04x -> UI4\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 58b6965..bfb606b 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2303,6 +2303,15 @@ todo_wine ok(broken(dst_len == sizeof(dst)) || dst_len == 0x1234 /* W2K+ */, "got %ld\n", dst_len); ok(dst == 0x12345678, "got %08x\n", dst); + dst_len = dst = 0x1234; + V_VT((VARIANT*)src) = VT_I2; + V_I2((VARIANT*)src) = 0x4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_UI4, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 0x4321, "got %08x\n", dst); + IDataConvert_Release(convert); }

1 0

Henri Verbeet : wined3d: Introduce a wined3d_vertex_pipe_ops structure.
by Alexandre Julliard April 25, 2013

April 25, 2013

Module: wine Branch: master Commit: 471991eb9a56858b585a48b9a85d7663eb63699e URL: http://source.winehq.org/git/wine.git/?a=commit;h=471991eb9a56858b585a48b9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 25 12:16:47 2013 +0200 wined3d: Introduce a wined3d_vertex_pipe_ops structure. --- dlls/wined3d/arb_program_shader.c | 23 +++++++++- dlls/wined3d/device.c | 13 ++++-- dlls/wined3d/directx.c | 39 +++++------------ dlls/wined3d/glsl_shader.c | 26 ++++++++++-- dlls/wined3d/shader.c | 21 ++++++++- dlls/wined3d/state.c | 84 ++++++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 32 +++++++++++++- 7 files changed, 174 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=471991eb9a56858b585a4…

1 0

Ken Thomases : winemac: Fix an off-by-one error in macdrv_wglChoosePixelFormatARB().
by Alexandre Julliard April 25, 2013

April 25, 2013

Module: wine Branch: master Commit: a34168edaaffbe722a74299120d86c84eab2eaf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a34168edaaffbe722a7429912… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 24 20:18:43 2013 -0500 winemac: Fix an off-by-one error in macdrv_wglChoosePixelFormatARB(). --- dlls/winemac.drv/opengl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index e72281a..5f269fc 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1917,8 +1917,8 @@ static BOOL macdrv_wglChoosePixelFormatARB(HDC hdc, const int *piAttribIList, else if (accum_bits || accum_red_bits || accum_green_bits || accum_blue_bits || accum_alpha_bits) continue; - piFormats[found++] = i; - TRACE("match: pixel format %d %s\n", i, debugstr_pf(&pixel_formats[i])); + piFormats[found++] = i + 1; + TRACE("match: pixel format %d %s\n", i + 1, debugstr_pf(&pixel_formats[i])); } cant_match:

1 0

Christian Costa : d3dx9_36: Add DIB file support to D3DXSaveSurfaceToFileInMemory.
by Alexandre Julliard April 25, 2013

April 25, 2013

Module: wine Branch: master Commit: 0321e6364141a2fc5796343145bcb14b7ff5aa7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0321e6364141a2fc579634314… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 22 23:08:18 2013 +0200 d3dx9_36: Add DIB file support to D3DXSaveSurfaceToFileInMemory. --- dlls/d3dx9_36/surface.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index fd1acc6..81bdd78 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1941,6 +1941,7 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE switch (file_format) { case D3DXIFF_BMP: + case D3DXIFF_DIB: encoder_clsid = &CLSID_WICBmpEncoder; break; case D3DXIFF_PNG: @@ -1951,7 +1952,6 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE break; case D3DXIFF_DDS: return save_dds_surface_to_memory(dst_buffer, src_surface, src_rect); - case D3DXIFF_DIB: case D3DXIFF_HDR: case D3DXIFF_PFM: case D3DXIFF_TGA: @@ -2088,6 +2088,10 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE } size = stream_stats.cbSize.u.LowPart; + /* Remove BMP header for DIB */ + if (file_format == D3DXIFF_DIB) + size -= sizeof(BITMAPFILEHEADER); + hr = D3DXCreateBuffer(size, &buffer); if (FAILED(hr)) goto cleanup; @@ -2096,6 +2100,9 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE { void *buffer_pointer = ID3DXBuffer_GetBufferPointer(buffer); void *stream_data = GlobalLock(stream_hglobal); + /* Remove BMP header for DIB */ + if (file_format == D3DXIFF_DIB) + stream_data = (void*)((BYTE*)stream_data + sizeof(BITMAPFILEHEADER)); memcpy(buffer_pointer, stream_data, size); GlobalUnlock(stream_hglobal); *dst_buffer = buffer;

1 0

Christian Costa : d3dx9_36: Add support for DIB file in D3DXGetImageInfoFromFileInMemory.
by Alexandre Julliard April 25, 2013

April 25, 2013

Module: wine Branch: master Commit: 4653b839e7f8dd3613d2f4b15543feb254d321a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4653b839e7f8dd3613d2f4b15… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Apr 24 23:40:19 2013 +0200 d3dx9_36: Add support for DIB file in D3DXGetImageInfoFromFileInMemory. --- dlls/d3dx9_36/surface.c | 85 ++++++++++++++++++++++++++++++++++++++-- dlls/d3dx9_36/tests/surface.c | 6 +-- 2 files changed, 82 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index ea77497..af7b89e 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -675,6 +675,71 @@ HRESULT load_volume_texture_from_dds(IDirect3DVolumeTexture9 *volume_texture, co return D3D_OK; } +static BOOL convert_dib_to_bmp(void **data, UINT *size) +{ + ULONG header_size; + ULONG count = 0; + ULONG offset; + BITMAPFILEHEADER *header; + BYTE *new_data; + UINT new_size; + + if ((*size < 4) || (*size < (header_size = *(ULONG*)*data))) + return FALSE; + + if ((header_size == sizeof(BITMAPINFOHEADER)) || + (header_size == sizeof(BITMAPV4HEADER)) || + (header_size == sizeof(BITMAPV5HEADER)) || + (header_size == 64 /* sizeof(BITMAPCOREHEADER2) */)) + { + /* All structures begin with the same memory layout as BITMAPINFOHEADER */ + BITMAPINFOHEADER *info_header = (BITMAPINFOHEADER*)*data; + count = info_header->biClrUsed; + + if (!count && info_header->biBitCount <= 8) + count = 1 << info_header->biBitCount; + + offset = sizeof(BITMAPFILEHEADER) + header_size + sizeof(RGBQUAD) * count; + + /* For BITMAPINFOHEADER with BI_BITFIELDS compression, there are 3 additional color masks after header */ + if ((info_header->biSize == sizeof(BITMAPINFOHEADER)) && (info_header->biCompression == BI_BITFIELDS)) + offset += 3 * sizeof(DWORD); + } + else if (header_size == sizeof(BITMAPCOREHEADER)) + { + BITMAPCOREHEADER *core_header = (BITMAPCOREHEADER*)*data; + + if (core_header->bcBitCount <= 8) + count = 1 << core_header->bcBitCount; + + offset = sizeof(BITMAPFILEHEADER) + header_size + sizeof(RGBTRIPLE) * count; + } + else + { + return FALSE; + } + + TRACE("Converting DIB file to BMP\n"); + + new_size = *size + sizeof(BITMAPFILEHEADER); + new_data = HeapAlloc(GetProcessHeap(), 0, new_size); + CopyMemory(new_data + sizeof(BITMAPFILEHEADER), *data, *size); + + /* Add BMP header */ + header = (BITMAPFILEHEADER*)new_data; + header->bfType = 0x4d42; /* BM */ + header->bfSize = new_size; + header->bfReserved1 = 0; + header->bfReserved2 = 0; + header->bfOffBits = offset; + + /* Update input data */ + *data = new_data; + *size = new_size; + + return TRUE; +} + /************************************************************ * D3DXGetImageInfoFromFileInMemory * @@ -696,13 +761,14 @@ HRESULT load_volume_texture_from_dds(IDirect3DVolumeTexture9 *volume_texture, co * datasize may be bigger than the actual file size * */ -HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3DXIMAGE_INFO *info) +HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(const void *data, UINT datasize, D3DXIMAGE_INFO *info) { IWICImagingFactory *factory; IWICBitmapDecoder *decoder = NULL; IWICStream *stream; HRESULT hr; HRESULT initresult; + BOOL dib; TRACE("(%p, %d, %p)\n", data, datasize, info); @@ -717,6 +783,9 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D return get_image_info_from_dds(data, datasize, info); } + /* In case of DIB file, convert it to BMP */ + dib = convert_dib_to_bmp((void**)&data, &datasize); + initresult = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&factory); @@ -732,8 +801,6 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D if (FAILED(hr)) { if ((datasize >= 2) && (!strncmp(data, "P3", 2) || !strncmp(data, "P6", 2))) FIXME("File type PPM is not supported yet\n"); - else if ((datasize >= 4) && (*(DWORD*)data == sizeof(BITMAPINFOHEADER))) - FIXME("File type DIB is not supported yet\n"); else if ((datasize >= 10) && !strncmp(data, "#?RADIANCE", 10)) FIXME("File type HDR is not supported yet\n"); else if ((datasize >= 2) && (!strncmp(data, "PF", 2) || !strncmp(data, "Pf", 2))) @@ -747,8 +814,13 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D hr = IWICBitmapDecoder_GetContainerFormat(decoder, &container_format); if (SUCCEEDED(hr)) { if (IsEqualGUID(&container_format, &GUID_ContainerFormatBmp)) { - TRACE("File type is BMP\n"); - info->ImageFileFormat = D3DXIFF_BMP; + if (dib) { + TRACE("File type is DIB\n"); + info->ImageFileFormat = D3DXIFF_DIB; + } else { + TRACE("File type is BMP\n"); + info->ImageFileFormat = D3DXIFF_BMP; + } } else if (IsEqualGUID(&container_format, &GUID_ContainerFormatPng)) { TRACE("File type is PNG\n"); info->ImageFileFormat = D3DXIFF_PNG; @@ -805,6 +877,9 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D if (SUCCEEDED(initresult)) CoUninitialize(); + if (dib) + HeapFree(GetProcessHeap(), 0, (void*)data); + if (FAILED(hr)) { TRACE("Invalid or unsupported image file\n"); return D3DXERR_INVALIDDATA; diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index bb1104b..759f9e1 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -377,10 +377,8 @@ static void test_D3DXGetImageInfo(void) /* D3DXGetImageInfoFromResource */ - todo_wine { - hr = D3DXGetImageInfoFromResourceA(NULL, MAKEINTRESOURCEA(IDB_BITMAP_1x1), &info); /* RT_BITMAP */ - ok(hr == D3D_OK, "D3DXGetImageInfoFromResource returned %#x, expected %#x\n", hr, D3D_OK); - } + hr = D3DXGetImageInfoFromResourceA(NULL, MAKEINTRESOURCEA(IDB_BITMAP_1x1), &info); /* RT_BITMAP */ + ok(hr == D3D_OK, "D3DXGetImageInfoFromResource returned %#x, expected %#x\n", hr, D3D_OK); hr = D3DXGetImageInfoFromResourceA(NULL, MAKEINTRESOURCEA(IDB_BITMAP_1x1), NULL); ok(hr == D3D_OK, "D3DXGetImageInfoFromResource returned %#x, expected %#x\n", hr, D3D_OK);

1 0

Hans Leidekker : wininet: Always return errors from NETCON_recv.
by Alexandre Julliard April 25, 2013

April 25, 2013

Module: wine Branch: master Commit: 736a4239a0a7e30957b55f59b32204ef5be7289a URL: http://source.winehq.org/git/wine.git/?a=commit;h=736a4239a0a7e30957b55f59b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 25 10:15:19 2013 +0200 wininet: Always return errors from NETCON_recv. --- dlls/wininet/http.c | 61 +++++++++++++++++++++++++++----------------------- 1 files changed, 33 insertions(+), 28 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 5a58ac9..73aa3f7 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -207,7 +207,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION authcache_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; -static BOOL HTTP_GetResponseHeaders(http_request_t *req); +static DWORD HTTP_GetResponseHeaders(http_request_t *req, INT *len); static DWORD HTTP_ProcessHeader(http_request_t *req, LPCWSTR field, LPCWSTR value, DWORD dwModifier); static LPWSTR * HTTP_InterpretHttpHeader(LPCWSTR buffer); static DWORD HTTP_InsertCustomHeader(http_request_t *req, LPHTTPHEADERW lpHdr); @@ -2404,7 +2404,7 @@ static void remove_data( http_request_t *req, int count ) else req->read_pos += count; } -static BOOL read_line( http_request_t *req, LPSTR buffer, DWORD *len ) +static DWORD read_line( http_request_t *req, LPSTR buffer, DWORD *len ) { int count, bytes_read, pos = 0; DWORD res; @@ -2427,13 +2427,18 @@ static BOOL read_line( http_request_t *req, LPSTR buffer, DWORD *len ) remove_data( req, bytes_read ); if (eol) break; - if ((res = read_more_data( req, -1 )) != ERROR_SUCCESS || !req->read_size) + if ((res = read_more_data( req, -1 ))) + { + WARN( "read failed %u\n", res ); + LeaveCriticalSection( &req->read_section ); + return res; + } + if (!req->read_size) { *len = 0; - TRACE( "returning empty string %u\n", res); + TRACE( "returning empty string\n" ); LeaveCriticalSection( &req->read_section ); - INTERNET_SetLastError(res); - return FALSE; + return ERROR_SUCCESS; } } LeaveCriticalSection( &req->read_section ); @@ -2445,7 +2450,7 @@ static BOOL read_line( http_request_t *req, LPSTR buffer, DWORD *len ) } buffer[*len - 1] = 0; TRACE( "returning %s\n", debugstr_a(buffer)); - return TRUE; + return ERROR_SUCCESS; } /* check if we have reached the end of the data to read (the read section must be held) */ @@ -2530,6 +2535,7 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DWORD *read, read_mode_t read_mode) { netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; + DWORD res = ERROR_SUCCESS; int len = 0; size = min(size, netconn_stream->content_length-netconn_stream->content_read); @@ -2541,7 +2547,7 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, } if(size && req->netconn) { - if(NETCON_recv(req->netconn, buf, size, read_mode == READMODE_SYNC ? MSG_WAITALL : 0, &len) != ERROR_SUCCESS) + if((res = NETCON_recv(req->netconn, buf, size, read_mode == READMODE_SYNC ? MSG_WAITALL : 0, &len))) len = 0; if(!len) netconn_stream->content_length = netconn_stream->content_read; @@ -2549,7 +2555,7 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, netconn_stream->content_read += *read = len; TRACE("read %u bytes\n", len); - return ERROR_SUCCESS; + return res; } static BOOL netconn_drain_content(data_stream_t *stream, http_request_t *req) @@ -4076,8 +4082,7 @@ static DWORD HTTP_SecureProxyConnect(http_request_t *request) if (res != ERROR_SUCCESS) return res; - responseLen = HTTP_GetResponseHeaders( request ); - if (!responseLen) + if (HTTP_GetResponseHeaders( request, &responseLen ) || !responseLen) return ERROR_HTTP_INVALID_HEADER; return ERROR_SUCCESS; @@ -4873,7 +4878,12 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); - responseLen = HTTP_GetResponseHeaders(request); + if (HTTP_GetResponseHeaders(request, &responseLen)) + { + http_release_netconn(request, FALSE); + res = ERROR_INTERNET_CONNECTION_ABORTED; + goto lend; + } /* FIXME: We should know that connection is closed before sending * headers. Otherwise wrong callbacks are executed */ if(!responseLen && reusing_connection) { @@ -5067,8 +5077,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); - responseLen = HTTP_GetResponseHeaders(request); - if (!responseLen) + if (HTTP_GetResponseHeaders(request, &responseLen) || !responseLen) res = ERROR_HTTP_HEADER_NOT_FOUND; INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, @@ -5722,16 +5731,15 @@ static void HTTP_clear_response_headers( http_request_t *request ) * TRUE on success * FALSE on error */ -static INT HTTP_GetResponseHeaders(http_request_t *request) +static DWORD HTTP_GetResponseHeaders(http_request_t *request, INT *len) { INT cbreaks = 0; WCHAR buffer[MAX_REPLY_LEN]; DWORD buflen = MAX_REPLY_LEN; - BOOL bSuccess = FALSE; INT rc = 0; char bufferA[MAX_REPLY_LEN]; LPWSTR status_code = NULL, status_text = NULL; - DWORD cchMaxRawHeaders = 1024; + DWORD res = ERROR_HTTP_INVALID_SERVER_RESPONSE, cchMaxRawHeaders = 1024; LPWSTR lpszRawHeaders = NULL; LPWSTR temp; DWORD cchRawHeaders = 0; @@ -5751,9 +5759,11 @@ static INT HTTP_GetResponseHeaders(http_request_t *request) * We should first receive 'HTTP/1.x nnn OK' where nnn is the status code. */ buflen = MAX_REPLY_LEN; - if (!read_line(request, bufferA, &buflen)) + if ((res = read_line(request, bufferA, &buflen))) goto lend; + if (!buflen) goto lend; + rc += buflen; MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); /* check is this a status code line? */ @@ -5792,7 +5802,6 @@ static INT HTTP_GetResponseHeaders(http_request_t *request) heap_free(request->rawHeaders); request->rawHeaders = heap_strdupW(szDefaultHeader); - bSuccess = TRUE; goto lend; } } while (codeHundred); @@ -5830,7 +5839,7 @@ static INT HTTP_GetResponseHeaders(http_request_t *request) do { buflen = MAX_REPLY_LEN; - if (read_line(request, bufferA, &buflen)) + if (!read_line(request, bufferA, &buflen) && buflen) { LPWSTR * pFieldAndValue; @@ -5883,18 +5892,14 @@ static INT HTTP_GetResponseHeaders(http_request_t *request) heap_free(request->rawHeaders); request->rawHeaders = lpszRawHeaders; TRACE("raw headers: %s\n", debugstr_w(lpszRawHeaders)); - bSuccess = TRUE; + res = ERROR_SUCCESS; lend: + if (res) heap_free(lpszRawHeaders); + *len = rc; TRACE("<--\n"); - if (bSuccess) - return rc; - else - { - heap_free(lpszRawHeaders); - return 0; - } + return res; } /***********************************************************************

1 0