September 2008 - Wine-Commits

Lei Zhang : sane.ds: Replace wsprintfW with sprintfW.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

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

Alistair Leslie-Hughes : mshtml: Add IHTMLBodyElement bgColor tests.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: e605d3e9bffbe3c4d57ee78465a8dd3d49e049e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e605d3e9bffbe3c4d57ee7846… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 5 22:47:28 2008 +1000 mshtml: Add IHTMLBodyElement bgColor tests. --- dlls/mshtml/tests/dom.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b658a74..ce7391d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2036,6 +2036,36 @@ static void test_default_body(IHTMLBodyElement *body) ok(!l, "scrollWidth = %ld\n", l); } +static void test_body_funs(IHTMLBodyElement *body) +{ + static WCHAR sRed[] = {'r','e','d',0}; + static WCHAR sRedbg[] = {'#','f','f','0','0','0','0',0}; + VARIANT vbg; + VARIANT vDefaultbg; + HRESULT hres; + + hres = IHTMLBodyElement_get_bgColor(body, &vDefaultbg); + ok(hres == S_OK, "get_background failed: %08x\n", hres); + ok(V_VT(&vDefaultbg) == VT_BSTR, "bstr != NULL\n"); + + V_VT(&vbg) = VT_BSTR; + V_BSTR(&vbg) = SysAllocString(sRed); + hres = IHTMLBodyElement_put_bgColor(body, vbg); + ok(hres == S_OK, "get_background failed: %08x\n", hres); + VariantClear(&vbg); + + hres = IHTMLBodyElement_get_bgColor(body, &vbg); + ok(hres == S_OK, "get_background failed: %08x\n", hres); + ok(V_VT(&vDefaultbg) == VT_BSTR, "V_VT(&vDefaultbg) != VT_BSTR\n"); + ok(!lstrcmpW(V_BSTR(&vbg), sRedbg), "Unexpected type %s\n", dbgstr_w(V_BSTR(&vbg))); + VariantClear(&vbg); + + /* Restore Originial */ + hres = IHTMLBodyElement_put_bgColor(body, vDefaultbg); + ok(hres == S_OK, "get_background failed: %08x\n", hres); + VariantClear(&vDefaultbg); +} + static void test_window(IHTMLDocument2 *doc) { IHTMLWindow2 *window, *window2, *self; @@ -2091,6 +2121,7 @@ static void test_defaults(IHTMLDocument2 *doc) hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLBodyElement, (void**)&body); ok(hres == S_OK, "Could not get IHTMBodyElement: %08x\n", hres); test_default_body(body); + test_body_funs(body); IHTMLBodyElement_Release(body); hres = IHTMLElement_get_style(elem, &style);

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLBodyElement get/put bgColor .
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

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 Sept. 5, 2008

Sept. 5, 2008

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 Sept. 5, 2008

Sept. 5, 2008

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

Alexandre Julliard : Release 1.1.4.
by Alexandre Julliard Sept. 5, 2008

Sept. 5, 2008

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

Paul Vriens : winspool.drv/tests: Fix a test on Vista/W2K8.
by Alexandre Julliard Sept. 5, 2008

Sept. 5, 2008

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

Nikolay Sivov : gdiplus: Fix for GdipGraphicsClear.
by Alexandre Julliard Sept. 5, 2008

Sept. 5, 2008

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

Paul Vriens : wintrust/tests: Add a missing FreeLibrary.
by Alexandre Julliard Sept. 5, 2008

Sept. 5, 2008

Module: wine Branch: master Commit: 6d6881a79162e87b7090e8fc766180f3ecddc50a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d6881a79162e87b7090e8fc7… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Sep 5 16:14:56 2008 +0200 wintrust/tests: Add a missing FreeLibrary. --- dlls/wintrust/tests/asn.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index dff0adf..eb9ca0f 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -465,4 +465,6 @@ START_TEST(asn) test_decodeSPCLink(); test_encodeSPCPEImage(); test_decodeSPCPEImage(); + + FreeLibrary(hCrypt32); }

1 0

Hans Leidekker : winhttp: The last parameter of WinHttpQueryDataAvailable and WinHttpReadData is optional .
by Alexandre Julliard Sept. 5, 2008

Sept. 5, 2008

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