November 2015 - Wine-commits

Alexandre Julliard : gdiplus/tests: Check the correct fallback font when Arial is missing.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 9fb9cb2bb7113f664a3db12472f217b9a967e433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb9cb2bb7113f664a3db1247… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 25 20:30:00 2015 +0900 gdiplus/tests: Check the correct fallback font when Arial is missing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 932b5ed..39b539b 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -726,6 +726,7 @@ static void test_font_metrics(void) static void test_font_substitution(void) { WCHAR ms_shell_dlg[LF_FACESIZE]; + char fallback_font[LF_FACESIZE]; HDC hdc; HFONT hfont; LOGFONTA lf; @@ -772,13 +773,22 @@ static void test_font_substitution(void) status = GdipCreateFontFamilyFromName(nonexistent, NULL, &family); ok(status == FontFamilyNotFound, "expected FontFamilyNotFound, got %d\n", status); + /* nonexistent fonts fallback to Arial, or something else if it's missing */ + strcpy(lf.lfFaceName,"Arial"); + status = GdipCreateFontFromLogfontA(hdc, &lf, &font); + expect(Ok, status); + status = GdipGetLogFontA(font, graphics, &lf); + expect(Ok, status); + strcpy(fallback_font,lf.lfFaceName); + trace("fallback font %s\n", fallback_font); + lstrcpyA(lf.lfFaceName, "ThisFontShouldNotExist"); status = GdipCreateFontFromLogfontA(hdc, &lf, &font); expect(Ok, status); memset(&lf, 0xfe, sizeof(lf)); status = GdipGetLogFontA(font, graphics, &lf); expect(Ok, status); - ok(!lstrcmpA(lf.lfFaceName, "Arial"), "wrong face name %s\n", lf.lfFaceName); + ok(!lstrcmpA(lf.lfFaceName, fallback_font), "wrong face name %s / %s\n", lf.lfFaceName, fallback_font); GdipDeleteFont(font); /* empty FaceName */ @@ -788,7 +798,7 @@ static void test_font_substitution(void) memset(&lf, 0xfe, sizeof(lf)); status = GdipGetLogFontA(font, graphics, &lf); expect(Ok, status); - ok(!lstrcmpA(lf.lfFaceName, "Arial"), "wrong face name %s\n", lf.lfFaceName); + ok(!lstrcmpA(lf.lfFaceName, fallback_font), "wrong face name %s / %s\n", lf.lfFaceName, fallback_font); GdipDeleteFont(font); /* zeroing out lfWeight and lfCharSet leads to font creation failure */

1 0

Alexandre Julliard : user32: Reduce the idle timeout before flushing surfaces to make it less noticeable.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: bbc849df8d66b99162684dcee213b08cd67b86d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbc849df8d66b99162684dcee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 25 19:25:46 2015 +0900 user32: Reduce the idle timeout before flushing surfaces to make it less noticeable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 87bc97b..b81c22d 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -598,7 +598,7 @@ void flush_window_surfaces( BOOL idle ) now = GetTickCount(); if (idle) last_idle = now; /* if not idle, we only flush if there's evidence that the app never goes idle */ - else if ((int)(now - last_idle) < 1000) goto done; + else if ((int)(now - last_idle) < 50) goto done; LIST_FOR_EACH_ENTRY( surface, &window_surfaces, struct window_surface, entry ) surface->funcs->flush( surface );

1 0

Vincent Povirk : comctl32/tests: Accept touchscreen-related messages in button tests.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 45e706a2a79beffe28eecd7ec01139a1c61431e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45e706a2a79beffe28eecd7ec… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 24 15:32:59 2015 -0600 comctl32/tests: Accept touchscreen-related messages in button tests. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 8c27c0f..9977ce1 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -205,6 +205,7 @@ static const struct message setfocus_seq[] = { { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { BM_GETSTATE, sent|optional }, /* when touchscreen is present */ { WM_SETFOCUS, sent|wparam }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) }, { WM_APP, sent|wparam|lparam }, @@ -227,6 +228,7 @@ static const struct message setfocus_static_seq[] = { { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { BM_GETSTATE, sent|optional }, /* when touchscreen is present */ { WM_SETFOCUS, sent|wparam, 0 }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) }, { WM_COMMAND, sent|wparam|parent|optional, MAKEWPARAM(ID_BUTTON, BN_CLICKED) }, /* radio button */ @@ -239,6 +241,7 @@ static const struct message setfocus_groupbox_seq[] = { { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { BM_GETSTATE, sent|optional }, /* when touchscreen is present */ { WM_SETFOCUS, sent|wparam, 0 }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) }, { WM_COMMAND, sent|wparam|parent|optional, MAKEWPARAM(ID_BUTTON, BN_CLICKED) }, /* radio button */ @@ -262,6 +265,7 @@ static const struct message setfocus_ownerdraw_seq[] = { { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { BM_GETSTATE, sent|optional }, /* when touchscreen is present */ { WM_SETFOCUS, sent|wparam, 0 }, { WM_DRAWITEM, sent|wparam|parent, ID_BUTTON }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) }, @@ -287,6 +291,7 @@ static const struct message lbuttondown_seq[] = { WM_LBUTTONDOWN, sent|wparam|lparam, 0, 0 }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { BM_GETSTATE, sent|defwinproc|optional }, /* when touchscreen is present */ { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, { BM_SETSTATE, sent|wparam|defwinproc, TRUE }, { 0 }

1 0

Bruno Jesus : ws2_32/tests: Check if the first IP is a default route in gethostbyname.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 2056de01b5eb8e4ce26150094d4eb168964d5c7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2056de01b5eb8e4ce26150094… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Nov 25 17:22:13 2015 +0800 ws2_32/tests: Check if the first IP is a default route in gethostbyname. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 045b991..3c66f7d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -30,6 +30,7 @@ #include <wsnwlink.h> #include <mswsock.h> #include <mstcpip.h> +#include <iphlpapi.h> #include <stdio.h> #include "wine/test.h" @@ -76,6 +77,10 @@ static int (WINAPI *pWSAEnumNameSpaceProvidersA)(LPDWORD,LPWSANAMESPACE_INFOA) static int (WINAPI *pWSAEnumNameSpaceProvidersW)(LPDWORD,LPWSANAMESPACE_INFOW); static int (WINAPI *pWSAPoll)(WSAPOLLFD *,ULONG,INT); +/* Function pointers from iphlpapi */ +static DWORD (WINAPI *pGetAdaptersInfo)(PIP_ADAPTER_INFO,PULONG); +static DWORD (WINAPI *pGetIpForwardTable)(PMIB_IPFORWARDTABLE,PULONG,BOOL); + /**************** Structs and typedefs ***************/ typedef struct thread_info @@ -1207,7 +1212,7 @@ static void Init (void) { WORD ver = MAKEWORD (2, 2); WSADATA data; - HMODULE hws2_32 = GetModuleHandleA("ws2_32.dll"); + HMODULE hws2_32 = GetModuleHandleA("ws2_32.dll"), hiphlpapi; pfreeaddrinfo = (void *)GetProcAddress(hws2_32, "freeaddrinfo"); pgetaddrinfo = (void *)GetProcAddress(hws2_32, "getaddrinfo"); @@ -1223,6 +1228,13 @@ static void Init (void) pWSAEnumNameSpaceProvidersW = (void *)GetProcAddress(hws2_32, "WSAEnumNameSpaceProvidersW"); pWSAPoll = (void *)GetProcAddress(hws2_32, "WSAPoll"); + hiphlpapi = LoadLibraryA("iphlpapi.dll"); + if (hiphlpapi) + { + pGetIpForwardTable = (void *)GetProcAddress(hiphlpapi, "GetIpForwardTable"); + pGetAdaptersInfo = (void *)GetProcAddress(hiphlpapi, "GetAdaptersInfo"); + } + ok ( WSAStartup ( ver, &data ) == 0, "WSAStartup failed\n" ); tls = TlsAlloc(); } @@ -4451,6 +4463,88 @@ static void test_dns(void) int WINAPI gethostname(char *name, int namelen); +static void test_gethostbyname(void) +{ + struct hostent *he; + struct in_addr **addr_list; + char name[256], first_ip[16]; + int ret, i; + PMIB_IPFORWARDTABLE routes = NULL; + PIP_ADAPTER_INFO adapters = NULL, k; + DWORD adap_size = 0, route_size = 0; + BOOL found_default = FALSE; + BOOL local_ip = FALSE; + + ret = gethostname(name, sizeof(name)); + ok(ret == 0, "gethostname() call failed: %d\n", WSAGetLastError()); + + he = gethostbyname(name); + ok(he != NULL, "gethostbyname(\"%s\") failed: %d\n", name, WSAGetLastError()); + addr_list = (struct in_addr **)he->h_addr_list; + strcpy(first_ip, inet_ntoa(*addr_list[0])); + + trace("List of local IPs:\n"); + for(i = 0; addr_list[i] != NULL; i++) + { + char *ip = inet_ntoa(*addr_list[i]); + if (!strcmp(ip, "127.0.0.1")) + local_ip = TRUE; + trace("%s\n", ip); + } + + if (local_ip) + { + ok (i == 1, "expected 127.0.0.1 to be the only IP returned\n"); + skip("Only the loopback address is present, skipping tests\n"); + return; + } + + if (!pGetAdaptersInfo || !pGetIpForwardTable) + { + win_skip("GetAdaptersInfo and/or GetIpForwardTable not found, skipping tests\n"); + return; + } + + ret = pGetAdaptersInfo(NULL, &adap_size); + ok (ret == ERROR_BUFFER_OVERFLOW, "GetAdaptersInfo failed with a different error: %d\n", ret); + ret = pGetIpForwardTable(NULL, &route_size, FALSE); + ok (ret == ERROR_INSUFFICIENT_BUFFER, "GetIpForwardTable failed with a different error: %d\n", ret); + + adapters = HeapAlloc(GetProcessHeap(), 0, adap_size); + routes = HeapAlloc(GetProcessHeap(), 0, route_size); + + ret = pGetAdaptersInfo(adapters, &adap_size); + ok (ret == NO_ERROR, "GetAdaptersInfo failed, error: %d\n", ret); + ret = pGetIpForwardTable(routes, &route_size, FALSE); + ok (ret == NO_ERROR, "GetIpForwardTable failed, error: %d\n", ret); + + for (i = 0; !found_default && i < routes->dwNumEntries; i++) + { + /* default route (ip 0.0.0.0) ? */ + if (routes->table[i].dwForwardDest) continue; + + for (k = adapters; k != NULL; k = k->Next) + { + char *ip; + + if (k->Index != routes->table[i].dwForwardIfIndex) continue; + + /* the first IP returned from gethostbyname must be a default route */ + ip = k->IpAddressList.IpAddress.String; + if (!strcmp(first_ip, ip)) + { + found_default = TRUE; + break; + } + } + } +todo_wine + ok (found_default, "failed to find the first IP from gethostbyname!\n"); + + HeapFree(GetProcessHeap(), 0, adapters); + HeapFree(GetProcessHeap(), 0, routes); +} + static void test_gethostbyname_hack(void) { struct hostent *he; @@ -9461,6 +9555,7 @@ START_TEST( sock ) test_addr_to_print(); test_ioctlsocket(); test_dns(); + test_gethostbyname(); test_gethostbyname_hack(); test_gethostname();

1 0

Jacek Caban : mshtml: Added IHTMLDOMAttribute2::put_value implementation.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: b73f9d2e46f4e6dadcc5b92b12796b505c94ee15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b73f9d2e46f4e6dadcc5b92b1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 25 11:56:59 2015 +0100 mshtml: Added IHTMLDOMAttribute2::put_value implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlattr.c | 9 +++++++-- dlls/mshtml/tests/dom.c | 25 +++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 0302ee9..446cb6f 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -296,8 +296,13 @@ static HRESULT WINAPI HTMLDOMAttribute2_get_name(IHTMLDOMAttribute2 *iface, BSTR static HRESULT WINAPI HTMLDOMAttribute2_put_value(IHTMLDOMAttribute2 *iface, BSTR v) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + VARIANT var; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = v; + return IHTMLDOMAttribute_put_nodeValue(&This->IHTMLDOMAttribute_iface, var); } static HRESULT WINAPI HTMLDOMAttribute2_get_value(IHTMLDOMAttribute2 *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index bc60ff0..b9f7935 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4762,6 +4762,20 @@ static void _put_attr_node_value(unsigned line, IHTMLDOMAttribute *attr, VARIANT ok_(__FILE__,line) (hres == S_OK, "put_nodeValue failed: %08x\n", hres); } +#define put_attr_value(a,b) _put_attr_value(__LINE__,a,b) +static void _put_attr_value(unsigned line, IHTMLDOMAttribute *attr, const char *value) +{ + IHTMLDOMAttribute2 *attr2 = _get_attr2_iface(line, (IUnknown*)attr); + BSTR str = a2bstr(value); + HRESULT hres; + + hres = IHTMLDOMAttribute2_put_value(attr2, str); + ok_(__FILE__,line) (hres == S_OK, "put_nodeValue failed: %08x\n", hres); + + IHTMLDOMAttribute2_Release(attr2); + SysFreeString(str); +} + #define get_window_doc(e) _get_window_doc(__LINE__,e) static IHTMLDocument2 *_get_window_doc(unsigned line, IHTMLWindow2 *window) { @@ -8385,6 +8399,12 @@ static void test_attr(IHTMLElement *elem) ok(!strcmp_wa(V_BSTR(&v), "divid2"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + put_attr_value(attr, "divid3"); + + get_attr_node_value(attr, &v, VT_BSTR); + ok(!strcmp_wa(V_BSTR(&v), "divid3"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + IHTMLDOMAttribute_Release(attr); attr = get_elem_attr_node((IUnknown*)elem, "emptyattr", TRUE); @@ -8420,6 +8440,11 @@ static void test_attr(IHTMLElement *elem) get_attr_node_value(attr, &v, VT_I4); ok(V_I4(&v) == 150, "V_I4(v) = %d\n", V_I4(&v)); + put_attr_value(attr, "160"); + get_attr_node_value(attr, &v, VT_BSTR); + ok(!strcmp_wa(V_BSTR(&v), "160"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + IHTMLDOMAttribute_Release(attr); attr = get_elem_attr_node((IUnknown*)elem, "tabIndex", TRUE);

1 0

Michael Stefaniuc : ieframe: Use BOOL instead of VARIANT_BOOL in on_commandstate_change().
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 2cebbfc5e542dc8a59a2f33ab42b36cddcae651b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cebbfc5e542dc8a59a2f33ab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 25 10:04:59 2015 +0100 ieframe: Use BOOL instead of VARIANT_BOOL in on_commandstate_change(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/dochost.c | 2 +- dlls/ieframe/ieframe.h | 2 +- dlls/ieframe/navigate.c | 4 ++-- dlls/ieframe/oleobject.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 8f3b088..2d4261a 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -80,7 +80,7 @@ void abort_dochost_tasks(DocHost *This, task_proc_t proc) } } -void on_commandstate_change(DocHost *doc_host, LONG command, VARIANT_BOOL enable) +void on_commandstate_change(DocHost *doc_host, LONG command, BOOL enable) { DISPPARAMS dispparams; VARIANTARG params[2]; diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index ae36c65..371cb03 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -278,7 +278,7 @@ HRESULT dochost_object_available(DocHost*,IUnknown*) DECLSPEC_HIDDEN; void set_doc_state(DocHost*,READYSTATE) DECLSPEC_HIDDEN; void deactivate_document(DocHost*) DECLSPEC_HIDDEN; void create_doc_view_hwnd(DocHost*) DECLSPEC_HIDDEN; -void on_commandstate_change(DocHost*,LONG,VARIANT_BOOL) DECLSPEC_HIDDEN; +void on_commandstate_change(DocHost*,LONG,BOOL) DECLSPEC_HIDDEN; void notify_download_state(DocHost*,BOOL) DECLSPEC_HIDDEN; void update_navigation_commands(DocHost *dochost) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 1b42fa5..1027313eb 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -885,8 +885,8 @@ static HRESULT navigate_bsc(DocHost *This, BindStatusCallback *bsc, IMoniker *mo } notify_download_state(This, TRUE); - on_commandstate_change(This, CSC_NAVIGATEBACK, VARIANT_FALSE); - on_commandstate_change(This, CSC_NAVIGATEFORWARD, VARIANT_FALSE); + on_commandstate_change(This, CSC_NAVIGATEBACK, FALSE); + on_commandstate_change(This, CSC_NAVIGATEFORWARD, FALSE); if(This->document) deactivate_document(This); diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 3a75a71..2d3cac6 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -471,8 +471,8 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE release_client_site(This); if(!pClientSite) { - on_commandstate_change(&This->doc_host, CSC_NAVIGATEBACK, VARIANT_FALSE); - on_commandstate_change(&This->doc_host, CSC_NAVIGATEFORWARD, VARIANT_FALSE); + on_commandstate_change(&This->doc_host, CSC_NAVIGATEBACK, FALSE); + on_commandstate_change(&This->doc_host, CSC_NAVIGATEFORWARD, FALSE); if(This->doc_host.document) deactivate_document(&This->doc_host);

1 0

Vincent Povirk : d3d8/tests: Accept CURSOR_SUPPRESSED in cursor flags.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: fbe20ab62fb067f5219059f8748c98b549b58485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe20ab62fb067f5219059f87… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 24 14:41:07 2015 -0600 d3d8/tests: Accept CURSOR_SUPPRESSED in cursor flags. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 5 +++-- include/winuser.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 827f144..daf45b7 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -21,6 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WINVER 0x0602 /* for CURSOR_SUPPRESSED */ #define COBJMACROS #include <initguid.h> #include <d3d8.h> @@ -853,7 +854,7 @@ static void test_cursor(void) memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); ok(pGetCursorInfo(&info), "GetCursorInfo failed\n"); - ok(info.flags & CURSOR_SHOWING, "The gdi cursor is hidden (%08x)\n", info.flags); + ok(info.flags & (CURSOR_SHOWING|CURSOR_SUPPRESSED), "The gdi cursor is hidden (%08x)\n", info.flags); ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ /* Still hidden */ @@ -867,7 +868,7 @@ static void test_cursor(void) memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); ok(pGetCursorInfo(&info), "GetCursorInfo failed\n"); - ok(info.flags & CURSOR_SHOWING, "The gdi cursor is hidden (%08x)\n", info.flags); + ok(info.flags & (CURSOR_SHOWING|CURSOR_SUPPRESSED), "The gdi cursor is hidden (%08x)\n", info.flags); ok(info.hCursor != cur, "The cursor handle is %p\n", info.hCursor); refcount = IDirect3DDevice8_Release(device); diff --git a/include/winuser.h b/include/winuser.h index 1d3759a..50821f4 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -1533,6 +1533,7 @@ typedef struct tagCURSORINFO } CURSORINFO, *PCURSORINFO, *LPCURSORINFO; #define CURSOR_SHOWING 0x00000001 +#define CURSOR_SUPPRESSED 0x00000002 /* this is the 6 byte accel struct used in Win32 when presented to the user */ typedef struct tagACCEL

1 0

Alexandre Julliard : patches: Display the total number of regressions.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: tools Branch: master Commit: 99a65af2dfa0881dde9b0b8aa8aee6d77b6c80e6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=99a65af2dfa0881dde9b0b8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 25 21:50:03 2015 +0900 patches: Display the total number of regressions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update-regressions | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/patches/update-regressions b/patches/update-regressions index 65eb263..5e39075 100755 --- a/patches/update-regressions +++ b/patches/update-regressions @@ -129,7 +129,8 @@ print OUTPUT "<div id=\"tabs\"><ul>", "<li><a href=\"//appdb.winehq.org/\">AppDB</a></li>", "<li><a href=\"//bugs.winehq.org/\">Bugzilla</a></li>", "<li><a href=\"//forum.winehq.org/\">Forums</a></li></ul></div>\n"; -print OUTPUT "<div id=\"logo_blurb\">Wine source repository – Regressions</div>\n"; +printf OUTPUT "<div id=\"logo_blurb\">Wine source repository – Regressions (total %u)</div>\n", + $count + scalar @unknown; print OUTPUT "<div id=\"main_content\"><div id=\"content\"><div class=\"main\">\n"; printf OUTPUT "<h2>%u bisected regressions</h2>\n", $count;

1 0

Dmitry Timoshkov : oleaut32/tests: Add some tests for IPicture:: SaveAsFile.
by Alexandre Julliard 24 Nov '15

24 Nov '15

Module: wine Branch: master Commit: b2de69487814293ce85f01911ce9933d4f7e7699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2de69487814293ce85f01911… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 24 17:27:31 2015 +0800 oleaut32/tests: Add some tests for IPicture::SaveAsFile. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/olepicture.c | 61 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 46dd05f..0903298 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1052,7 +1052,9 @@ static void test_load_save_bmp(void) DWORD *mem; IPersistStream *src_stream; IStream *dst_stream; + LARGE_INTEGER offset; HRESULT hr; + LONG size; desc.cbSizeofstruct = sizeof(desc); desc.picType = PICTYPE_BITMAP; @@ -1074,6 +1076,27 @@ static void test_load_save_bmp(void) hr = CreateStreamOnHGlobal(hmem, FALSE, &dst_stream); ok(hr == S_OK, "createstreamonhglobal error %#x\n", hr); + size = -1; + hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); + ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); +todo_wine + ok(size == 66, "expected 66, got %d\n", size); + mem = GlobalLock(hmem); +todo_wine + ok(!memcmp(&mem[0], "BM", 2), "got wrong bmp header %04x\n", mem[0]); + GlobalUnlock(hmem); + + size = -1; + hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); +todo_wine + ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); +todo_wine + ok(size == -1, "expected -1, got %d\n", size); + + offset.QuadPart = 0; + hr = IStream_Seek(dst_stream, offset, SEEK_SET, NULL); + ok(hr == S_OK, "IStream_Seek %#x\n", hr); + hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); ok(hr == S_OK, "QueryInterface error %#x\n", hr); @@ -1105,7 +1128,9 @@ static void test_load_save_icon(void) DWORD *mem; IPersistStream *src_stream; IStream *dst_stream; + LARGE_INTEGER offset; HRESULT hr; + LONG size; desc.cbSizeofstruct = sizeof(desc); desc.picType = PICTYPE_ICON; @@ -1126,6 +1151,27 @@ static void test_load_save_icon(void) hr = CreateStreamOnHGlobal(hmem, FALSE, &dst_stream); ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); + size = -1; + hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); + ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); +todo_wine + ok(size == 766, "expected 766, got %d\n", size); + mem = GlobalLock(hmem); +todo_wine + ok(mem[0] == 0x00010000, "got wrong icon header %04x\n", mem[0]); + GlobalUnlock(hmem); + + size = -1; + hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); +todo_wine + ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); +todo_wine + ok(size == -1, "expected -1, got %d\n", size); + + offset.QuadPart = 0; + hr = IStream_Seek(dst_stream, offset, SEEK_SET, NULL); + ok(hr == S_OK, "IStream_Seek %#x\n", hr); + hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); ok(hr == S_OK, "QueryInterface error %#x\n", hr); @@ -1160,6 +1206,7 @@ static void test_load_save_empty_picture(void) IStream *dst_stream, *stream; LARGE_INTEGER offset; HRESULT hr; + LONG size; memset(&pic, 0, sizeof(pic)); desc.cbSizeofstruct = sizeof(desc); @@ -1169,7 +1216,7 @@ static void test_load_save_empty_picture(void) type = -1; hr = IPicture_get_Type(pic, &type); - ok(hr == S_OK,"get_Type error %#8x\n", hr); + ok(hr == S_OK, "get_Type error %#x\n", hr); ok(type == PICTYPE_NONE,"expected picture type PICTYPE_NONE, got %d\n", type); handle = (OLE_HANDLE)0xdeadbeef; @@ -1181,6 +1228,18 @@ static void test_load_save_empty_picture(void) hr = CreateStreamOnHGlobal(hmem, FALSE, &dst_stream); ok(hr == S_OK, "createstreamonhglobal error %#x\n", hr); + size = -1; + hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); + ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); +todo_wine + ok(size == -1, "expected -1, got %d\n", size); + + size = -1; + hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); + ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); +todo_wine + ok(size == -1, "expected -1, got %d\n", size); + hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); ok(hr == S_OK, "QueryInterface error %#x\n", hr);

1 0

Dmitry Timoshkov : oleaut32: Implement a better stub for IPicture:: SaveAsFile.
by Alexandre Julliard 24 Nov '15

24 Nov '15

Module: wine Branch: master Commit: 212dd9c226c7f20c28697592468b3e631c250809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=212dd9c226c7f20c286975924… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 24 17:27:38 2015 +0800 oleaut32: Implement a better stub for IPicture::SaveAsFile. Based on OLEPictureImpl_Save implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/olepicture.c | 92 ++++++++++++++++++++++++++++++++++------ dlls/oleaut32/tests/olepicture.c | 9 ---- 2 files changed, 79 insertions(+), 22 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 5ce83e0..47430e3 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -834,19 +834,6 @@ static HRESULT WINAPI OLEPictureImpl_PictureChanged(IPicture *iface) } /************************************************************************ - * OLEPictureImpl_SaveAsFile - */ -static HRESULT WINAPI OLEPictureImpl_SaveAsFile(IPicture *iface, - IStream *pstream, - BOOL SaveMemCopy, - LONG *pcbSize) -{ - OLEPictureImpl *This = impl_from_IPicture(iface); - FIXME("(%p)->(%p, %d, %p), hacked stub.\n", This, pstream, SaveMemCopy, pcbSize); - return IStream_Write(pstream,This->data,This->datalen,(ULONG*)pcbSize); -} - -/************************************************************************ * OLEPictureImpl_get_Attributes */ static HRESULT WINAPI OLEPictureImpl_get_Attributes(IPicture *iface, @@ -1859,6 +1846,85 @@ static HRESULT WINAPI OLEPictureImpl_GetSizeMax( return E_NOTIMPL; } +/************************************************************************ + * OLEPictureImpl_SaveAsFile + */ +static HRESULT WINAPI OLEPictureImpl_SaveAsFile(IPicture *iface, + IStream *stream, BOOL mem_copy, LONG *size) +{ + OLEPictureImpl *This = impl_from_IPicture(iface); + void *data; + unsigned data_size; + ULONG written; + HRESULT hr; + + FIXME("(%p)->(%p,%d,%p): semi-stub\n", This, stream, mem_copy, size); + + switch (This->desc.picType) + { + case PICTYPE_NONE: + return S_OK; + + case PICTYPE_ICON: + if (!mem_copy) return E_FAIL; + + if (This->bIsDirty || !This->data) + { + if (!serializeIcon(This->desc.u.icon.hicon, &data, &data_size)) + return E_FAIL; + HeapFree(GetProcessHeap(), 0, This->data); + This->data = data; + This->datalen = data_size; + } + hr = IStream_Write(stream, This->data, This->datalen, &written); + if (hr == S_OK && size) *size = written; + return hr; + + case PICTYPE_BITMAP: + if (!mem_copy) return E_FAIL; + + if (This->bIsDirty || !This->data) + { + switch (This->keepOrigFormat ? This->loadtime_format : BITMAP_FORMAT_BMP) + { + case BITMAP_FORMAT_BMP: + if (!serializeBMP(This->desc.u.bmp.hbitmap, &data, &data_size)) + return E_FAIL; + break; + case BITMAP_FORMAT_JPEG: + FIXME("BITMAP_FORMAT_JPEG is not implemented\n"); + return E_NOTIMPL; + case BITMAP_FORMAT_GIF: + FIXME("BITMAP_FORMAT_GIF is not implemented\n"); + return E_NOTIMPL; + case BITMAP_FORMAT_PNG: + FIXME("BITMAP_FORMAT_PNG is not implemented\n"); + return E_NOTIMPL; + default: + FIXME("PICTYPE_BITMAP/%#x is not implemented\n", This->loadtime_format); + return E_NOTIMPL; + } + + HeapFree(GetProcessHeap(), 0, This->data); + This->data = data; + This->datalen = data_size; + } + hr = IStream_Write(stream, This->data, This->datalen, &written); + if (hr == S_OK && size) *size = written; + return hr; + + case PICTYPE_METAFILE: + FIXME("PICTYPE_METAFILE is not implemented\n"); + return E_NOTIMPL; + case PICTYPE_ENHMETAFILE: + FIXME("ENHMETAFILE is not implemented\n"); + return E_NOTIMPL; + default: + FIXME("%#x is not implemented\n", This->desc.picType); + break; + } + return E_NOTIMPL; +} /************************************************************************ * IDispatch diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 0903298..0c69cbd 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1079,18 +1079,14 @@ static void test_load_save_bmp(void) size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); -todo_wine ok(size == 66, "expected 66, got %d\n", size); mem = GlobalLock(hmem); -todo_wine ok(!memcmp(&mem[0], "BM", 2), "got wrong bmp header %04x\n", mem[0]); GlobalUnlock(hmem); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); -todo_wine ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); -todo_wine ok(size == -1, "expected -1, got %d\n", size); offset.QuadPart = 0; @@ -1157,15 +1153,12 @@ static void test_load_save_icon(void) todo_wine ok(size == 766, "expected 766, got %d\n", size); mem = GlobalLock(hmem); -todo_wine ok(mem[0] == 0x00010000, "got wrong icon header %04x\n", mem[0]); GlobalUnlock(hmem); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); -todo_wine ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); -todo_wine ok(size == -1, "expected -1, got %d\n", size); offset.QuadPart = 0; @@ -1231,13 +1224,11 @@ static void test_load_save_empty_picture(void) size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); -todo_wine ok(size == -1, "expected -1, got %d\n", size); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); -todo_wine ok(size == -1, "expected -1, got %d\n", size); hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream);

1 0