August 2015 - Wine-Commits - list.winehq.org

Michael Müller : winhttp: Remove unused variable in read_reply().
by Alexandre Julliard Aug. 12, 2015

Aug. 12, 2015

Module: wine Branch: master Commit: a533bf26ce1f27e2df2f438f8896ba3f26ccab5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a533bf26ce1f27e2df2f438f8… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Aug 10 18:34:06 2015 +0200 winhttp: Remove unused variable in read_reply(). --- dlls/winhttp/request.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 740a582..607b502 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2092,19 +2092,17 @@ static BOOL read_reply( request_t *request ) static const WCHAR crlf[] = {'\r','\n',0}; char buffer[MAX_REPLY_LEN]; - DWORD buflen, len, offset, received_len, crlf_len = 2; /* strlenW(crlf) */ + DWORD buflen, len, offset, crlf_len = 2; /* strlenW(crlf) */ char *status_code, *status_text; WCHAR *versionW, *status_textW, *raw_headers; WCHAR status_codeW[4]; /* sizeof("nnn") */ if (!netconn_connected( &request->netconn )) return FALSE; - received_len = 0; do { buflen = MAX_REPLY_LEN; if (!read_line( request, buffer, &buflen )) return FALSE; - received_len += buflen; /* first line should look like 'HTTP/1.x nnn OK' where nnn is the status code */ if (!(status_code = strchr( buffer, ' ' ))) return FALSE; @@ -2157,7 +2155,6 @@ static BOOL read_reply( request_t *request ) buflen = MAX_REPLY_LEN; if (!read_line( request, buffer, &buflen )) return TRUE; - received_len += buflen; if (!*buffer) break; while (len - offset < buflen + crlf_len)

1 0

Piotr Caban : imm32: Use IMM context keyboard layout when possible.
by Alexandre Julliard Aug. 12, 2015

Aug. 12, 2015

Module: wine Branch: master Commit: 9e099828470eb3c74302260a7e1aa004ac6c7583 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e099828470eb3c74302260a7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 11 20:45:31 2015 +0200 imm32: Use IMM context keyboard layout when possible. --- dlls/imm32/imm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index c4b44e4..3629024 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -763,7 +763,7 @@ HIMC WINAPI ImmCreateContext(void) return 0; } new_context->threadID = GetCurrentThreadId(); - SendMessageW(GetFocus(), WM_IME_SELECT, TRUE, (LPARAM)GetKeyboardLayout(0)); + SendMessageW(GetFocus(), WM_IME_SELECT, TRUE, (LPARAM)new_context->immKbd); new_context->immKbd->uSelected++; TRACE("Created context %p\n",new_context); @@ -783,7 +783,7 @@ static BOOL IMM_DestroyContext(HIMC hIMC) data->immKbd->uSelected --; data->immKbd->pImeSelect(hIMC, FALSE); - SendMessageW(data->IMC.hWnd, WM_IME_SELECT, FALSE, (LPARAM)GetKeyboardLayout(0)); + SendMessageW(data->IMC.hWnd, WM_IME_SELECT, FALSE, (LPARAM)data->immKbd); ImmDestroyIMCC(data->IMC.hCompStr); ImmDestroyIMCC(data->IMC.hCandInfo);

1 0

Alexandre Julliard : Wine release 1.7.49
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: website Branch: master Commit: e0ff313ab0f8cfe2cdaffaea429a9b72aca3264c URL: http://source.winehq.org/git/website.git/?a=commit;h=e0ff313ab0f8cfe2cdaffa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 8 00:57:58 2015 +0900 Wine release 1.7.49 --- news/en/2015080801.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2015080801.xml b/news/en/2015080801.xml new file mode 100644 index 0000000..66ee89f --- /dev/null +++ b/news/en/2015080801.xml @@ -0,0 +1,16 @@ +<news> +<date>August 8, 2015</date> +<title>Wine 1.7.49 Released</title> +<body> + The Wine development release 1.7.49 is now available. + <a href="{$root}/announce/1.7.49">What's new</a> in this release: +<ul> + <li>DirectWrite is now good enough for rendering text in Steam.</li> + <li>A number of Direct2D improvements.</li> + <li>Some more OpenMP functions.</li> + <li>Support for namespaces in the IDL compiler.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.49.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Zhenbo Li : mshtml: Add IHTMLSelectElement::size property implementation.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: 6419ac0f139c2a3d9cbcd71e5b43e3f89d6336cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6419ac0f139c2a3d9cbcd71e5… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Fri Aug 7 18:12:27 2015 +0800 mshtml: Add IHTMLSelectElement::size property implementation. --- dlls/mshtml/htmlselect.c | 30 ++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index ebac427..152d855 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -142,15 +142,37 @@ static HRESULT WINAPI HTMLSelectElement_Invoke(IHTMLSelectElement *iface, DISPID static HRESULT WINAPI HTMLSelectElement_put_size(IHTMLSelectElement *iface, LONG v) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - FIXME("(%p)->(%d)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%d)\n", This, v); + if(v < 0) + return CTL_E_INVALIDPROPERTYVALUE; + + nsres = nsIDOMHTMLSelectElement_SetSize(This->nsselect, v); + if(NS_FAILED(nsres)) { + ERR("SetSize failed: %08x\n", nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLSelectElement_get_size(IHTMLSelectElement *iface, LONG *p) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + DWORD val; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + if(!p) + return E_INVALIDARG; + + nsres = nsIDOMHTMLSelectElement_GetSize(This->nsselect, &val); + if(NS_FAILED(nsres)) { + ERR("GetSize failed: %08x\n", nsres); + return E_FAIL; + } + *p = val; + return S_OK; } static HRESULT WINAPI HTMLSelectElement_put_multiple(IHTMLSelectElement *iface, VARIANT_BOOL v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f5dee76..02eeb78 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2193,6 +2193,30 @@ static void _test_select_set_multiple(unsigned line, IHTMLSelectElement *select, _test_select_multiple(line, select, val); } +#define test_select_size(s,v) _test_select_size(__LINE__,s,v) +static void _test_select_size(unsigned line, IHTMLSelectElement *select, LONG exval) +{ + HRESULT hres; + LONG val; + + hres = IHTMLSelectElement_get_size(select, NULL); + ok_(__FILE__,line) (hres == E_INVALIDARG, "got %08x, expected E_INVALIDARG\n", hres); + + val = 0xdeadbeef; + hres = IHTMLSelectElement_get_size(select, &val); + ok_(__FILE__,line) (hres == S_OK, "get_size failed: %08x\n", hres); + ok_(__FILE__,line) (val == exval, "size = %d, expected %d\n", val, exval); +} + +#define test_select_set_size(s,v,e) _test_select_set_size(__LINE__,s,v,e) +static void _test_select_set_size(unsigned line, IHTMLSelectElement *select, LONG val, HRESULT exhres) +{ + HRESULT hres; + + hres = IHTMLSelectElement_put_size(select, val); + ok_(__FILE__,line) (hres == exhres, "put_size(%d) got %08x, expect %08x\n", val, hres, exhres); +} + #define test_range_text(r,t) _test_range_text(__LINE__,r,t) static void _test_range_text(unsigned line, IHTMLTxtRange *range, const char *extext) { @@ -4882,6 +4906,15 @@ static void test_select_elem(IHTMLSelectElement *select) test_select_set_value(select, "val1"); test_select_value(select, "val1"); + test_select_size(select, 0); + test_select_set_size(select, 1, S_OK); + test_select_size(select, 1); + + test_select_set_size(select, -1, CTL_E_INVALIDPROPERTYVALUE); + test_select_size(select, 1); + test_select_set_size(select, 3, S_OK); + test_select_size(select, 3); + test_select_get_disabled(select, VARIANT_FALSE); test_select_set_disabled(select, VARIANT_TRUE); test_select_set_disabled(select, VARIANT_FALSE);

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: f8a7d6ed74b69499ffb8a4a9610863de93f8457d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8a7d6ed74b69499ffb8a4a96… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 7 15:40:50 2015 +0200 Assorted spelling fixes. --- dlls/avifil32/icmstream.c | 8 ++++---- dlls/comctl32/listview.c | 6 +++--- dlls/comctl32/rebar.c | 2 +- dlls/d2d1/brush.c | 6 +++--- dlls/d3d8/device.c | 2 +- dlls/d3drm/tests/d3drm.c | 30 +++++++++++++++--------------- dlls/dbghelp/cpu_i386.c | 2 +- dlls/dbghelp/dbghelp.c | 2 +- dlls/gameux/tests/gamestatistics.c | 4 ++-- dlls/gdi32/bitmap.c | 2 +- dlls/kernel32/editline.c | 2 +- dlls/kernel32/tests/loader.c | 6 +++--- dlls/localui/localui.c | 2 +- dlls/mpr/tests/mpr.c | 4 ++-- dlls/msvcrt/mbcs.c | 2 +- dlls/msxml3/domdoc.c | 4 ++-- dlls/ntdll/virtual.c | 2 +- dlls/ole32/storage32.c | 4 ++-- dlls/riched20/tests/richole.c | 2 +- 19 files changed, 46 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f8a7d6ed74b69499ffb8a…

1 0

Jacek Caban : widl: Added support for namespaced enums.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: 88987c0a9500f2a3f86080baad2d8764a26defcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=88987c0a9500f2a3f86080baa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 7 15:41:55 2015 +0200 widl: Added support for namespaced enums. --- tools/widl/header.c | 58 ++++++++++++++++++++++++++++++++++++++------------- tools/widl/header.h | 2 +- tools/widl/parser.y | 14 ++++++------- tools/widl/typegen.c | 6 +++--- tools/widl/typetree.c | 20 +++++++++++++++--- tools/widl/typetree.h | 8 ++++++- 6 files changed, 79 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=88987c0a9500f2a3f8608…

1 0

Francois Gouget : ntdll: Add a trailing '\n' to a FIXME() trace.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: e0e2ee3487027c47f1f06a4e99e64219cf78dc10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0e2ee3487027c47f1f06a4e9… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 7 11:55:51 2015 +0200 ntdll: Add a trailing '\n' to a FIXME() trace. --- dlls/ntdll/threadpool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 8605a22..0ed0851 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -2252,7 +2252,7 @@ NTSTATUS WINAPI TpAllocPool( TP_POOL **out, PVOID reserved ) TRACE( "%p %p\n", out, reserved ); if (reserved) - FIXME( "reserved argument is nonzero (%p)", reserved ); + FIXME( "reserved argument is nonzero (%p)\n", reserved ); return tp_threadpool_alloc( (struct threadpool **)out ); }

1 0

Francois Gouget : d3drm: Fix a trailing '\n' in a TRACE().
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: 7e1e3a4d6d79ed08e770cb8c4b855ef163319ee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e1e3a4d6d79ed08e770cb8c4… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 7 11:53:32 2015 +0200 d3drm: Fix a trailing '\n' in a TRACE(). --- dlls/d3drm/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 9c0fe4a..aebba9a 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -636,7 +636,7 @@ static DWORD WINAPI d3drm_device2_GetShades(IDirect3DRMDevice2 *iface) { struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); - TRACE("iface %p.\n.", iface); + TRACE("iface %p.\n", iface); return IDirect3DRMDevice3_GetShades(&device->IDirect3DRMDevice3_iface); }

1 0

Francois Gouget : ntdll: Use #ifdef to check for potentially undefined macros.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: 93a7845ae8d7a9813f59d3020c05c0917be39d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=93a7845ae8d7a9813f59d3020… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 7 11:52:58 2015 +0200 ntdll: Use #ifdef to check for potentially undefined macros. --- dlls/ntdll/signal_x86_64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 9b98894..575a770 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1431,7 +1431,7 @@ static NTSTATUS dwarf_virtual_unwind( ULONG64 ip, ULONG64 *frame,CONTEXT *contex } -#if HAVE_LIBUNWIND_H +#ifdef HAVE_LIBUNWIND_H /*********************************************************************** * libunwind_set_cursor_from_context */ @@ -2341,7 +2341,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex if (status != STATUS_SUCCESS) return status; got_info = TRUE; } -#if HAVE_LIBUNWIND_H +#ifdef HAVE_LIBUNWIND_H else { status = libunwind_virtual_unwind( context.Rip, &got_info, &dispatch.EstablisherFrame, &new_context, @@ -3369,7 +3369,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec if (status != STATUS_SUCCESS) raise_status( status, rec ); got_info = TRUE; } -#if HAVE_LIBUNWIND_H +#ifdef HAVE_LIBUNWIND_H else { status = libunwind_virtual_unwind( context->Rip, &got_info, &dispatch.EstablisherFrame, &new_context,

1 0

Henri Verbeet : dxgi: Implement dxgi_swapchain_ResizeBuffers().
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: fca2d194236fe35a663bba3d2d6b9414745b081b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca2d194236fe35a663bba3d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 7 10:01:34 2015 +0200 dxgi: Implement dxgi_swapchain_ResizeBuffers(). --- dlls/dxgi/swapchain.c | 34 ++++- dlls/dxgi/tests/device.c | 305 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 3 - include/wine/wined3d.h | 3 + 6 files changed, 342 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fca2d194236fe35a663bb…

1 0