September 2008 - Wine-commits

Lei Zhang : sane.ds: Replace wsprintfW with sprintfW.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: 887aa9eb3dd3fc22d4f50df125080f5fc82b583c URL: http://source.winehq.org/git/wine.git/?a=commit;h=887aa9eb3dd3fc22d4f50df12… Author: Lei Zhang <thestig(a)google.com> Date: Fri Sep 5 08:21:32 2008 -0700 sane.ds: Replace wsprintfW with sprintfW. --- dlls/sane.ds/ui.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 83006c5..236a91d 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -36,6 +36,7 @@ #include "sane_i.h" #include "wine/debug.h" #include "resource.h" +#include "wine/unicode.h" #ifdef SONAME_LIBSANE @@ -622,7 +623,7 @@ static void UpdateRelevantEdit(HWND hwnd, const SANE_Option_Descriptor *opt, else si = position; - len = wsprintfW( buffer, formatW, si ); + len = sprintfW( buffer, formatW, si ); } else if (opt->type == SANE_TYPE_FIXED) { @@ -636,7 +637,7 @@ static void UpdateRelevantEdit(HWND hwnd, const SANE_Option_Descriptor *opt, else dd = position * 0.01; - len = wsprintfW( buffer, formatW, dd ); + len = sprintfW( buffer, formatW, dd ); } else return;

1 0

Jeff Zaroyko : wined3d: Add missing HeapFree.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: 6a14bcc824bf8aea4ca806edbfe356356d08f4c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a14bcc824bf8aea4ca806edb… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Sat Sep 6 02:17:34 2008 +1000 wined3d: Add missing HeapFree. --- dlls/wined3d/arb_program_shader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7fa88c0..a8d5633 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2897,6 +2897,7 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB FIXME("Vertex program error at position %d: %s\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); } + HeapFree(GetProcessHeap(), 0, buffer.buffer); return ret; }

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLBodyElement get/put bgColor .
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: 4196f83f49eadb951a9392f332e9d892dfd22582 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4196f83f49eadb951a9392f33… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 5 20:34:59 2008 +1000 mshtml: Implement IHTMLBodyElement get/put bgColor. --- dlls/mshtml/htmlbody.c | 37 +++++++++++++++++++++++++++++++++---- 1 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 13c802e..140a0a5 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -257,15 +257,44 @@ static HRESULT WINAPI HTMLBodyElement_get_noWrap(IHTMLBodyElement *iface, VARIAN static HRESULT WINAPI HTMLBodyElement_put_bgColor(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + nsAString strColor; + nsresult nsres; + + TRACE("(%p)->()\n", This); + + if(!variant_to_nscolor(&v, &strColor)) + return S_OK; + + nsres = nsIDOMHTMLBodyElement_SetBgColor(This->nsbody, &strColor); + nsAString_Finish(&strColor); + if(NS_FAILED(nsres)) + ERR("SetBgColor failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLBodyElement_get_bgColor(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString strColor; + nsresult nsres; + const PRUnichar *color; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&strColor, NULL); + nsres = nsIDOMHTMLBodyElement_GetBgColor(This->nsbody, &strColor); + if(NS_FAILED(nsres)) + ERR("SetBgColor failed: %08x\n", nsres); + + nsAString_GetData(&strColor, &color); + + V_VT(p) = VT_BSTR; + V_BSTR(p) = SysAllocString(color); + + nsAString_Finish(&strColor); + + return S_OK; } static HRESULT WINAPI HTMLBodyElement_put_text(IHTMLBodyElement *iface, VARIANT v)

1 0

Alexandre Julliard : Wine release 1.1.4
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: website Branch: master Commit: e65fc67e2a0924f5ab54f0193b231628d5dda9b5 URL: http://source.winehq.org/git/website.git/?a=commit;h=e65fc67e2a0924f5ab54f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 5 17:40:28 2008 +0200 Wine release 1.1.4 --- news/en/2008090501.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2008090501.xml b/news/en/2008090501.xml new file mode 100644 index 0000000..8d9362f --- /dev/null +++ b/news/en/2008090501.xml @@ -0,0 +1,17 @@ +<news> +<date>September 5, 2008</date> +<title>Wine 1.1.4 Released</title> +<body> + The Wine development release 1.1.4 is now available. + <a href="?announce=1.1.4">What's new</a> in this release: +<ul> + <li>Substantial chunks of WinHTTP are implemented.</li> + <li>More JavaScript support.</li> + <li>Beginnings of shell AppBar implementation.</li> + <li>Several fixes for Google Chrome support.</li> + <li>Chinese translations.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.4.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="/site/download">download locations</a>. +</body></news>

1 0

Tag wine-1.1.4 : Alexandre Julliard : Release 1.1.4
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: refs/tags/wine-1.1.4 Tag: a1847a392a8464bc233994f129eba9564aa8232b URL: http://source.winehq.org/git/wine.git/?a=tag;h=a1847a392a8464bc233994f129eb… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 5 17:28:27 2008 +0200 Release 1.1.4

1 0

Paul Vriens : winspool.drv/tests: Fix a test on Vista/W2K8.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: bf520bfbb1b064e155f7b0db8d64d90f88bfc2ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf520bfbb1b064e155f7b0db8… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Sep 5 16:19:34 2008 +0200 winspool.drv/tests: Fix a test on Vista/W2K8. --- dlls/winspool.drv/tests/info.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index f0f4754..e2fd941 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -693,7 +693,9 @@ static void test_DeleteMonitor(void) AddMonitorA(NULL, 2, (LPBYTE) &mi2a); SetLastError(MAGIC_DEAD); res = DeleteMonitorA(NULL, invalid_env, winetest); - ok(res, "returned %d with %d (expected '!=0')\n", res, GetLastError()); + ok( res || + (!res && GetLastError() == ERROR_INVALID_ENVIRONMENT) /* Vista/W2K8 */, + "returned %d with %d\n", res, GetLastError()); /* the monitor-name */ AddMonitorA(NULL, 2, (LPBYTE) &mi2a);

1 0

Alexandre Julliard : Release 1.1.4.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 878737580dd4f0bcc5e9d67858039836a7962780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=878737580dd4f0bcc5e9d6785… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 5 17:28:27 2008 +0200 Release 1.1.4. --- ANNOUNCE | 1658 ++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 774 insertions(+), 904 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=878737580dd4f0bcc5e9d…

1 0

Hans Leidekker : winhttp: Implement WinHttpQueryHeaders( WINHTTP_QUERY_RAW_HEADERS).
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 6fe2edb5def17acd18f420664eebffeac66ae8e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fe2edb5def17acd18f420664… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 5 14:11:46 2008 +0200 winhttp: Implement WinHttpQueryHeaders(WINHTTP_QUERY_RAW_HEADERS). --- dlls/winhttp/request.c | 41 ++++++++++++++++++++++++++++++++++++++--- dlls/winhttp/tests/winhttp.c | 26 +++++++++++++++++++++++++- 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index be951c5..ae24499 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -526,7 +526,7 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID header_t *header = NULL; BOOL request_only, ret = FALSE; int requested_index, header_index = -1; - DWORD attr; + DWORD attr, len; request_only = level & WINHTTP_QUERY_FLAG_REQUEST_HEADERS; requested_index = index ? *index : 0; @@ -539,10 +539,45 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID header_index = get_header_index( request, name, requested_index, request_only ); break; } + case WINHTTP_QUERY_RAW_HEADERS: + { + WCHAR *headers, *p, *q; + + if (request_only) + headers = build_request_string( request ); + else + headers = request->raw_headers; + + if (!(p = headers)) return FALSE; + for (len = 0; *p; p++) if (*p != '\r') len++; + + if ((len + 1) * sizeof(WCHAR) > *buflen || !buffer) + { + len++; + set_last_error( ERROR_INSUFFICIENT_BUFFER ); + } + else if (buffer) + { + for (p = headers, q = (WCHAR *)buffer; *p; p++, q++) + { + if (*p != '\r') *q = *p; + else + { + *q = 0; + p++; /* skip '\n' */ + } + } + *q = 0; + TRACE("returning data: %s\n", debugstr_wn((WCHAR *)buffer, len)); + ret = TRUE; + } + *buflen = len * sizeof(WCHAR); + if (request_only) heap_free( headers ); + return ret; + } case WINHTTP_QUERY_RAW_HEADERS_CRLF: { WCHAR *headers; - DWORD len; if (request_only) headers = build_request_string( request ); @@ -551,7 +586,7 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID if (!headers) return FALSE; len = strlenW( headers ) * sizeof(WCHAR); - if (len + sizeof(WCHAR) > *buflen) + if (len + sizeof(WCHAR) > *buflen || !buffer) { len += sizeof(WCHAR); set_last_error( ERROR_INSUFFICIENT_BUFFER ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 012d703..71e4efa 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -287,7 +287,7 @@ static void test_WinHttpAddHeaders(void) ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_RAW_HEADERS_CRLF | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, test_header_name, NULL, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded.\n"); - todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); ok(index == 0, "WinHttpQueryHeaders incorrectly incremented header index.\n"); @@ -331,6 +331,30 @@ static void test_WinHttpAddHeaders(void) "WinHttpQueryHeaders returned invalid end of header string.\n"); ok(index == 0, "WinHttpQueryHeaders incremented header index.\n"); + index = 0; + len = 0; + SetLastError(0xdeadbeef); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_RAW_HEADERS | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + test_header_name, NULL, &len, &index); + ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded.\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); + ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); + ok(index == 0, "WinHttpQueryHeaders failed: index was incremented.\n"); + + oldlen = len; + index = 0; + len = sizeof(buffer); + memset(buffer, 0xff, sizeof(buffer)); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_RAW_HEADERS | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + test_header_name, buffer, &len, &index); + ok(ret == TRUE, "WinHttpQueryHeaders failed %u\n", GetLastError()); + ok(len + sizeof(WCHAR) <= oldlen, "resulting length longer than advertized\n"); + ok((len < sizeof(buffer) - sizeof(WCHAR)) && !buffer[len / sizeof(WCHAR)] && !buffer[len / sizeof(WCHAR) - 1], + "no double NULL terminator\n"); + ok(!memcmp(buffer, test_header_begin, sizeof(test_header_begin)), "invalid beginning of header string\n"); + ok(index == 0, "header index was incremented\n"); + /* tests for more indices */ ret = WinHttpAddRequestHeaders(request, test_headers[1], -1L, WINHTTP_ADDREQ_FLAG_ADD); ok(ret == TRUE, "WinHttpAddRequestHeaders failed to add duplicate header: %d\n", ret);

1 0

Hans Leidekker : winhttp: The last parameter of WinHttpQueryDataAvailable and WinHttpReadData is optional .
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 6ecd01b8d1f19c32d5acd09da51e4b10fde8197f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ecd01b8d1f19c32d5acd09da… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 5 14:12:08 2008 +0200 winhttp: The last parameter of WinHttpQueryDataAvailable and WinHttpReadData is optional. --- dlls/winhttp/request.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index ae24499..72f9eb5 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1149,6 +1149,7 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) { BOOL ret; + DWORD num_bytes; request_t *request; TRACE("%p, %p\n", hrequest, available); @@ -1165,8 +1166,9 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) return FALSE; } - ret = netconn_query_data_available( &request->netconn, available ); + ret = netconn_query_data_available( &request->netconn, &num_bytes ); + if (ret && available) *available = num_bytes; release_object( &request->hdr ); return ret; } @@ -1255,7 +1257,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L BOOL ret; request_t *request; WCHAR encoding[20]; - DWORD buflen = sizeof(encoding); + DWORD num_bytes, buflen = sizeof(encoding); TRACE("%p, %p, %d, %p\n", hrequest, buffer, to_read, read); @@ -1274,11 +1276,12 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L if (query_headers( request, WINHTTP_QUERY_TRANSFER_ENCODING, NULL, encoding, &buflen, NULL ) && !strcmpiW( encoding, chunked )) { - ret = read_data_chunked( request, buffer, to_read, read, request->hdr.flags & WINHTTP_FLAG_ASYNC ); + ret = read_data_chunked( request, buffer, to_read, &num_bytes, request->hdr.flags & WINHTTP_FLAG_ASYNC ); } else - ret = read_data( request, buffer, to_read, read, request->hdr.flags & WINHTTP_FLAG_ASYNC ); + ret = read_data( request, buffer, to_read, &num_bytes, request->hdr.flags & WINHTTP_FLAG_ASYNC ); + if (ret && read) *read = num_bytes; release_object( &request->hdr ); return ret; }

1 0

Nikolay Sivov : gdiplus: Fix for GdipGraphicsClear.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 7258dea49c95069628f4ac9fbe053ae63817de8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7258dea49c95069628f4ac9fb… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Sep 5 16:51:25 2008 +0400 gdiplus: Fix for GdipGraphicsClear. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a8afa25..c1e63f6 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -754,7 +754,7 @@ GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **gra } (*graphics)->hdc = hdc; - (*graphics)->hwnd = NULL; + (*graphics)->hwnd = WindowFromDC(hdc); (*graphics)->smoothing = SmoothingModeDefault; (*graphics)->compqual = CompositingQualityDefault; (*graphics)->interpolation = InterpolationModeDefault;

1 0