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

Hans Leidekker : wininet: Always return errors from NETCON_recv.
by Alexandre Julliard 25 Apr '13

25 Apr '13

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

Alistair Leslie-Hughes : oledb32: Implement DataConvert DBTYPE_VARIANT-> DBTYPE_UI4.
by Alexandre Julliard 25 Apr '13

25 Apr '13

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

Jacek Caban : jscript: Optimize String.concat implementation.
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: b46ace51f8605180e37434da1005770bafde459a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b46ace51f8605180e37434da1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 25 15:23:48 2013 +0200 jscript: Optimize String.concat implementation. --- dlls/jscript/string.c | 89 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 59 insertions(+), 30 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index bf635a8..8ef1656 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -377,51 +377,80 @@ static HRESULT String_charCodeAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, static HRESULT String_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - unsigned len = 0, i, str_cnt; - jsstr_t **strs, *ret = NULL; - WCHAR *ptr; + jsstr_t *ret, *str; HRESULT hres; TRACE("\n"); - str_cnt = argc+1; - strs = heap_alloc_zero(str_cnt * sizeof(*strs)); - if(!strs) - return E_OUTOFMEMORY; + hres = get_string_val(ctx, jsthis, &str); + if(FAILED(hres)) + return hres; - hres = to_string(ctx, jsval_disp(jsthis->u.disp), strs); - if(SUCCEEDED(hres)) { + switch(argc) { + case 0: + ret = str; + break; + case 1: { + jsstr_t *arg_str; + + hres = to_string(ctx, argv[0], &arg_str); + if(FAILED(hres)) { + jsstr_release(str); + return hres; + } + + ret = jsstr_concat(str, arg_str); + jsstr_release(str); + if(!ret) + return E_OUTOFMEMORY; + break; + } + default: { + const unsigned str_cnt = argc+1; + unsigned len = 0, i; + jsstr_t **strs; + WCHAR *ptr; + + strs = heap_alloc_zero(str_cnt * sizeof(*strs)); + if(!strs) { + jsstr_release(str); + return E_OUTOFMEMORY; + } + + strs[0] = str; for(i=0; i < argc; i++) { hres = to_string(ctx, argv[i], strs+i+1); if(FAILED(hres)) break; } - } - if(SUCCEEDED(hres)) { - for(i=0; i < str_cnt; i++) { - len += jsstr_length(strs[i]); - if(len > JSSTR_MAX_LENGTH) { - hres = E_OUTOFMEMORY; - break; + if(SUCCEEDED(hres)) { + for(i=0; i < str_cnt; i++) { + len += jsstr_length(strs[i]); + if(len > JSSTR_MAX_LENGTH) { + hres = E_OUTOFMEMORY; + break; + } } - } - ptr = jsstr_alloc_buf(len, &ret); - if(ptr) { - for(i=0; i < str_cnt; i++) - ptr += jsstr_flush(strs[i], ptr); - }else { - hres = E_OUTOFMEMORY; + if(SUCCEEDED(hres)) { + ptr = jsstr_alloc_buf(len, &ret); + if(ptr) { + for(i=0; i < str_cnt; i++) + ptr += jsstr_flush(strs[i], ptr); + }else { + hres = E_OUTOFMEMORY; + } + } } - } - - for(i=0; i < str_cnt; i++) - jsstr_release(strs[i]); - heap_free(strs); - if(FAILED(hres)) - return hres; + while(i--) + jsstr_release(strs[i]); + heap_free(strs); + if(FAILED(hres)) + return hres; + } + } if(r) *r = jsval_string(ret);

1 0

Christian Costa : d3dx9_36: Add support for DIB file in D3DXGetImageInfoFromFileInMemory.
by Alexandre Julliard 25 Apr '13

25 Apr '13

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

Christian Costa : d3dx9_36: Add DIB file support to D3DXLoadSurfaceFromFileInMemory.
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: 792e2ee248bcf0cf361a2115255033ac6d837781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=792e2ee248bcf0cf361a21152… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 22 23:08:09 2013 +0200 d3dx9_36: Add DIB file support to D3DXLoadSurfaceFromFileInMemory. --- dlls/d3dx9_36/surface.c | 6 ++++++ dlls/d3dx9_36/tests/surface.c | 6 ++---- dlls/d3dx9_36/tests/texture.c | 9 ++++----- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index af7b89e..fd1acc6 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1073,6 +1073,9 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface, return hr; } + if (imginfo.ImageFileFormat == D3DXIFF_DIB) + convert_dib_to_bmp((void**)&pSrcData, &SrcDataSize); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); if (FAILED(CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&factory))) @@ -1135,6 +1138,9 @@ cleanup_bmp: cleanup_err: CoUninitialize(); + if (imginfo.ImageFileFormat == D3DXIFF_DIB) + HeapFree(GetProcessHeap(), 0, (void*)pSrcData); + if (FAILED(hr)) return D3DXERR_INVALIDDATA; diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 759f9e1..b46f33b 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -623,10 +623,8 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) /* D3DXLoadSurfaceFromResource */ - todo_wine { - hr = D3DXLoadSurfaceFromResourceA(surf, NULL, NULL, NULL, MAKEINTRESOURCE(IDB_BITMAP_1x1), NULL, D3DX_DEFAULT, 0, NULL); - ok(hr == D3D_OK, "D3DXLoadSurfaceFromResource returned %#x, expected %#x\n", hr, D3D_OK); - } + hr = D3DXLoadSurfaceFromResourceA(surf, NULL, NULL, NULL, MAKEINTRESOURCE(IDB_BITMAP_1x1), NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromResource returned %#x, expected %#x\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromResourceA(surf, NULL, NULL, NULL, MAKEINTRESOURCE(IDD_BITMAPDATA_1x1), NULL, D3DX_DEFAULT, 0, NULL); ok(hr == D3D_OK, "D3DXLoadSurfaceFromResource returned %#x, expected %#x\n", hr, D3D_OK); diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 5f51db1..782864c 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -728,11 +728,10 @@ static void test_D3DXCreateTexture(IDirect3DDevice9 *device) } /* D3DXCreateTextureFromResource */ - todo_wine { - hr = D3DXCreateTextureFromResourceA(device, NULL, MAKEINTRESOURCEA(IDB_BITMAP_1x1), &texture); - ok(hr == D3D_OK, "D3DXCreateTextureFromResource returned %#x, expected %#x\n", hr, D3D_OK); - if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); - } + hr = D3DXCreateTextureFromResourceA(device, NULL, MAKEINTRESOURCEA(IDB_BITMAP_1x1), &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromResource returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); + hr = D3DXCreateTextureFromResourceA(device, NULL, MAKEINTRESOURCEA(IDD_BITMAPDATA_1x1), &texture); ok(hr == D3D_OK, "D3DXCreateTextureFromResource returned %#x, expected %#x\n", hr, D3D_OK); if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture);

1 0

Christian Costa : d3dx9_36: Add DIB file support to D3DXSaveSurfaceToFileInMemory.
by Alexandre Julliard 25 Apr '13

25 Apr '13

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

Jacek Caban : winegecko.php: Added 2.21-beta1 release.
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: tools Branch: master Commit: a6611c31119e427cf892c3c7defad77e945d6d97 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a6611c31119e427cf892c3c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 25 11:58:59 2013 +0200 winegecko.php: Added 2.21-beta1 release. --- winegecko.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/winegecko.php b/winegecko.php index 8f4186e..34f0f36 100644 --- a/winegecko.php +++ b/winegecko.php @@ -72,7 +72,9 @@ $aFileSizes = array( '1.8-x86'=>17774592, '1.8-x86_64'=>18238976, '1.9-x86'=>19060224, - '1.9-x86_64'=>19622400 + '1.9-x86_64'=>19622400, + '2.21-beta1-x86'=>20875264, + '2.21-beta1-x86_64'=>21648896 ); // Exact size of the file:

1 0

Piotr Caban : wininet: Improve searching for no-store header in HTTP response.
by Alexandre Julliard 24 Apr '13

24 Apr '13

Module: wine Branch: master Commit: 4c4a922e278a327b04ed3d4dcc0d775a69cedf06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c4a922e278a327b04ed3d4dc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 24 11:23:18 2013 +0200 wininet: Improve searching for no-store header in HTTP response. --- dlls/wininet/http.c | 27 ++++++++++++++++++++++++--- dlls/wininet/tests/http.c | 2 +- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9f01d0c..c910c59 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2307,9 +2307,30 @@ static void create_cache_entry(http_request_t *req) if(b) { int header_idx = HTTP_GetCustomHeaderIndex(req, szCache_Control, 0, FALSE); - if(header_idx!=-1 && (!strcmpiW(req->custHeaders[header_idx].lpszValue, no_cacheW) - || !strcmpiW(req->custHeaders[header_idx].lpszValue, no_storeW))) - b = FALSE; + if(header_idx != -1) { + WCHAR *ptr; + + for(ptr=req->custHeaders[header_idx].lpszValue; *ptr; ) { + WCHAR *end; + + while(*ptr==' ' || *ptr=='\t') + ptr++; + + end = strchrW(ptr, ','); + if(!end) + end = ptr + strlenW(ptr); + + if(!strncmpiW(ptr, no_cacheW, sizeof(no_cacheW)/sizeof(*no_cacheW)-1) + || !strncmpiW(ptr, no_storeW, sizeof(no_storeW)/sizeof(*no_storeW)-1)) { + b = FALSE; + break; + } + + ptr = end; + if(*ptr == ',') + ptr++; + } + } } if(!b) { diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index fa01917..de7f354 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2026,7 +2026,7 @@ static DWORD CALLBACK server_thread(LPVOID param) } if (strstr(buffer, "GET /test_cache_control_no_store")) { - static const char no_cache_response[] = "HTTP/1.1 200 OK\r\nCache-Control: No-StOrE\r\n\r\nsome content"; + static const char no_cache_response[] = "HTTP/1.1 200 OK\r\nCache-Control: junk, \t No-StOrE\r\n\r\nsome content"; send(c, no_cache_response, sizeof(no_cache_response)-1, 0); } if (strstr(buffer, "GET /test_premature_disconnect"))

1 0

Piotr Caban : wininet: Fix cache container prefix initialization.
by Alexandre Julliard 24 Apr '13

24 Apr '13

Module: wine Branch: master Commit: cf227b5f237b73d28f764a32e1955788e7b392fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf227b5f237b73d28f764a32e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 24 11:25:19 2013 +0200 wininet: Fix cache container prefix initialization. --- dlls/wininet/urlcache.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 34337c6..f0a731b 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -698,11 +698,11 @@ static void cache_container_close_index(cache_container *pContainer) pContainer->mapping = NULL; } -static BOOL cache_containers_add(LPCWSTR cache_prefix, - LPCWSTR path, DWORD default_entry_type, LPWSTR mutex_name) +static BOOL cache_containers_add(const char *cache_prefix, LPCWSTR path, + DWORD default_entry_type, LPWSTR mutex_name) { cache_container *pContainer = heap_alloc(sizeof(cache_container)); - int cache_prefix_len = strlenW(cache_prefix); + int cache_prefix_len = strlen(cache_prefix); if (!pContainer) { @@ -720,7 +720,7 @@ static BOOL cache_containers_add(LPCWSTR cache_prefix, return FALSE; } - pContainer->cache_prefix = heap_alloc((cache_prefix_len + 1) * sizeof(WCHAR)); + pContainer->cache_prefix = heap_alloc(cache_prefix_len+1); if (!pContainer->cache_prefix) { heap_free(pContainer->path); @@ -728,7 +728,7 @@ static BOOL cache_containers_add(LPCWSTR cache_prefix, return FALSE; } - memcpy(pContainer->cache_prefix, cache_prefix, (cache_prefix_len + 1) * sizeof(WCHAR)); + memcpy(pContainer->cache_prefix, cache_prefix, cache_prefix_len+1); CharLowerW(mutex_name); cache_container_create_object_name(mutex_name, '!'); @@ -760,22 +760,19 @@ static void cache_container_delete_container(cache_container *pContainer) static void cache_containers_init(void) { static const WCHAR UrlSuffix[] = {'C','o','n','t','e','n','t','.','I','E','5',0}; - static const WCHAR UrlPrefix[] = {0}; static const WCHAR HistorySuffix[] = {'H','i','s','t','o','r','y','.','I','E','5',0}; - static const WCHAR HistoryPrefix[] = {'V','i','s','i','t','e','d',':',0}; static const WCHAR CookieSuffix[] = {0}; - static const WCHAR CookiePrefix[] = {'C','o','o','k','i','e',':',0}; static const struct { int nFolder; /* CSIDL_* constant */ - const WCHAR * shpath_suffix; /* suffix on path returned by SHGetSpecialFolderPath */ - const WCHAR * cache_prefix; /* prefix used to reference the container */ + const WCHAR *shpath_suffix; /* suffix on path returned by SHGetSpecialFolderPath */ + const char *cache_prefix; /* prefix used to reference the container */ DWORD default_entry_type; } DefaultContainerData[] = { - { CSIDL_INTERNET_CACHE, UrlSuffix, UrlPrefix, NORMAL_CACHE_ENTRY }, - { CSIDL_HISTORY, HistorySuffix, HistoryPrefix, URLHISTORY_CACHE_ENTRY }, - { CSIDL_COOKIES, CookieSuffix, CookiePrefix, COOKIE_CACHE_ENTRY }, + { CSIDL_INTERNET_CACHE, UrlSuffix, "", NORMAL_CACHE_ENTRY }, + { CSIDL_HISTORY, HistorySuffix, "Visited:", URLHISTORY_CACHE_ENTRY }, + { CSIDL_COOKIES, CookieSuffix, "Cookie:", COOKIE_CACHE_ENTRY }, }; DWORD i;

1 0

Piotr Caban : mshtml: Added IOmHistory::get_length test.
by Alexandre Julliard 24 Apr '13

24 Apr '13

Module: wine Branch: master Commit: 8bc118cf17309988ba7bf68954cbe33efd8241ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bc118cf17309988ba7bf6895… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 24 11:50:01 2013 +0200 mshtml: Added IOmHistory::get_length test. --- dlls/mshtml/tests/htmldoc.c | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 7531a40..c8ed4d4 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -3309,10 +3309,13 @@ static HRESULT WINAPI TravelLog_Clone(ITravelLog *iface, ITravelLog **pptl) return E_NOTIMPL; } +static IBrowserService BrowserService; static DWORD WINAPI TravelLog_CountEntries(ITravelLog *iface, IUnknown *punk) { CHECK_EXPECT(CountEntries); - return E_NOTIMPL; + + ok(punk == (IUnknown*)&BrowserService, "punk != &BrowserService (%p)\n", punk); + return 0; } static HRESULT WINAPI TravelLog_Revert(ITravelLog *iface) @@ -5761,6 +5764,29 @@ static void test_load_history(IHTMLDocument2 *doc) history_stream = NULL; } +static void test_OmHistory(IHTMLDocument2 *doc) +{ + IHTMLWindow2 *win; + IOmHistory *hist; + short len; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &win); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + + hres = IHTMLWindow2_get_history(win, &hist); + ok(hres == S_OK, "get_history failed: %08x\n", hres); + IHTMLWindow2_Release(win); + + SET_EXPECT(CountEntries); + hres = IOmHistory_get_length(hist, &len); + CHECK_CALLED(CountEntries); + ok(hres == S_OK, "get_length failed: %08x\n", hres); + ok(len == 0, "len = %d\n", len); + + IOmHistory_Release(hist); +} + static void test_refresh(IHTMLDocument2 *doc) { IOleCommandTarget *cmdtrg; @@ -7292,6 +7318,7 @@ static void test_HTMLDocument_http(BOOL with_wbapp) test_put_href(doc, TRUE, NULL, "about:replace", FALSE, FALSE, 0); if(support_wbapp) { test_load_history(doc); + test_OmHistory(doc); test_put_href(doc, FALSE, NULL, "about:blank", FALSE, FALSE, support_wbapp ? DWL_EXPECT_HISTUPDATE : 0); }

1 0