wine-commits November 2015

wine-commits@winehq.org

2 participants
623 discussions

Andrew Eikum : Revert "explorerframe: Allow treeview expandos to open with a single click.".
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 585009124aafc1fa6aaa536573a59fad7834f930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=585009124aafc1fa6aaa53657… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Nov 25 07:07:10 2015 -0600 Revert "explorerframe: Allow treeview expandos to open with a single click.". This reverts commit 5bbdcaaa16018c9e15cbaadb3a6e5954d0089cf1. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/nstc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index e8a2c54..87a7200 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -686,9 +686,9 @@ static LRESULT on_nm_click(NSTC2Impl *This, NMHDR *nmhdr) psi = shellitem_from_treeitem(This, tvhit.hItem); hr = events_OnItemClick(This, psi, tvhit.flags, NSTCECT_LBUTTON); - /* The label should not be expanded unless + /* The expando should not be expanded unless * double-clicked. */ - if(tvhit.flags == TVHT_ONITEMLABEL) + if(tvhit.flags == TVHT_ONITEMBUTTON) return TRUE; if(SUCCEEDED(hr))

1 0

Stefan Dösinger : dxgi/tests: Windows 10 properly makes buffers read only.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 8492b1939501093af78bf22d0c486f2ca8a3a9f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8492b1939501093af78bf22d0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 24 22:18:46 2015 +0100 dxgi/tests: Windows 10 properly makes buffers read only. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 522d5de..4e54f4f 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -1051,7 +1051,7 @@ static void test_swapchain_parameters(void) HRESULT hr; unsigned int i, j; ULONG refcount; - DXGI_USAGE usage, expected_usage; + DXGI_USAGE usage, expected_usage, broken_usage; HWND window; static const struct { @@ -1191,13 +1191,14 @@ static void test_swapchain_parameters(void) hr = IDXGISwapChain_GetBuffer(swapchain, j, &IID_IDXGIResource, (void **)&resource); ok(SUCCEEDED(hr), "GetBuffer(%u) failed, hr %#x, test %u.\n", hr, i, j); - expected_usage = DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_BACK_BUFFER; - /* Buffers > 0 are supposed to be read only. This is the case except that in - * fullscreen mode the last backbuffer (BufferCount - 1) is writeable. This - * is not the case if an unsupported refresh rate is passed for some reason, - * probably because the invalid refresh rate triggers a kinda-sorta windowed - * mode. + * fullscreen mode on Windows <= 8 the last backbuffer (BufferCount - 1) is + * writeable. This is not the case if an unsupported refresh rate is passed + * for some reason, probably because the invalid refresh rate triggers a + * kinda-sorta windowed mode. + * + * On Windows 10 all buffers > 0 are read-only. Mark the earlier behavior + * broken. * * This last buffer acts as a shadow frontbuffer. Writing to it doesn't show * the draw on the screen right away (Aero on or off doesn't matter), but @@ -1206,12 +1207,15 @@ static void test_swapchain_parameters(void) * Note that if the application doesn't have focused creating a fullscreen * swapchain returns DXGI_STATUS_OCCLUDED and we get a windowed swapchain, * so use the Windowed property of the swapchain that was actually created. */ + expected_usage = DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_BACK_BUFFER | DXGI_USAGE_READ_ONLY; + broken_usage = DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_BACK_BUFFER; + if (desc.Windowed || j < tests[i].highest_accessible_buffer) - expected_usage |= DXGI_USAGE_READ_ONLY; + broken_usage |= DXGI_USAGE_READ_ONLY; hr = IDXGIResource_GetUsage(resource, &usage); ok(SUCCEEDED(hr), "Failed to get resource usage, hr %#x, test %u, buffer %u.\n", hr, i, j); - ok(usage == expected_usage, "Got usage %x, expected %x, test %u, buffer %u.\n", + ok(usage == expected_usage || broken(usage == broken_usage), "Got usage %x, expected %x, test %u, buffer %u.\n", usage, expected_usage, i, j); IDXGIResource_Release(resource);

1 0

Stefan Dösinger : dxgi/tests: Test DXGI_SWAP_EFFECT_FLIP_DISCARD.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: a971d4f2f67f3271e3fe331f32eee2241c2691bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a971d4f2f67f3271e3fe331f3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 24 22:18:45 2015 +0100 dxgi/tests: Test DXGI_SWAP_EFFECT_FLIP_DISCARD. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/factory.c | 1 + dlls/dxgi/tests/device.c | 25 +++++++++++++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 2e0d5ab..5da45f3 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -201,6 +201,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory1 *ifa min_buffer_count = 1; break; + case DXGI_SWAP_EFFECT_FLIP_DISCARD: case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: min_buffer_count = 2; break; diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index f5480de..522d5de 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -1077,15 +1077,20 @@ static void test_swapchain_parameters(void) {TRUE, 1, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 2, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 1}, {TRUE, 3, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 2}, - {TRUE, 0, 4 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {TRUE, 1, 4 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {TRUE, 2, 4 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 0, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 1, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 2, DXGI_SWAP_EFFECT_FLIP_DISCARD, S_OK, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 0, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 1, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 2, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 16, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, {TRUE, 16, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 15}, {TRUE, 16, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 15}, + {TRUE, 16, DXGI_SWAP_EFFECT_FLIP_DISCARD, S_OK, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 17, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 17, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 0, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 1, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, @@ -1101,15 +1106,23 @@ static void test_swapchain_parameters(void) {FALSE, 1, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 2, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 1}, {FALSE, 3, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 2}, - {FALSE, 0, 4 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {FALSE, 1, 4 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {FALSE, 2, 4 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 0, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 1, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 2, DXGI_SWAP_EFFECT_FLIP_DISCARD, S_OK, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 0, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 1, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 2, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 16, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, {FALSE, 16, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 15}, {FALSE, 16, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 15}, + /* The following test fails on Nvidia with E_OUTOFMEMORY and leaks device references in the + * process. Disable it for now. + {FALSE, 16, DXGI_SWAP_EFFECT_FLIP_DISCARD, S_OK, DXGI_ERROR_INVALID_CALL, 0}, + */ {FALSE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 17, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 17, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 17, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, }; if (!(device = create_device()))

1 0

Stefan Dösinger : include: Add DXGI_SWAP_EFFECT_FLIP_DISCARD.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: e990d94dba96aecc584eaf657c0e10821a50f66c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e990d94dba96aecc584eaf657… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 24 22:18:44 2015 +0100 include: Add DXGI_SWAP_EFFECT_FLIP_DISCARD. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxgi.idl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index dd16309..cc98970 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -69,7 +69,8 @@ const UINT DXGI_ENUM_MODES_SCALING = 2; typedef enum DXGI_SWAP_EFFECT { DXGI_SWAP_EFFECT_DISCARD = 0, DXGI_SWAP_EFFECT_SEQUENTIAL = 1, - DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL = 3 + DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL = 3, + DXGI_SWAP_EFFECT_FLIP_DISCARD = 4 } DXGI_SWAP_EFFECT; typedef enum DXGI_RESIDENCY {

1 0

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

25 Nov '15

Module: wine Branch: master Commit: 7578bca0c09f233e8f1582cc77dcfd0aa266ac10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7578bca0c09f233e8f1582cc7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 24 14:41:08 2015 -0600 d3d9/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/d3d9/tests/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 326e789..6cdb225 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -22,6 +22,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WINVER 0x0602 /* for CURSOR_SUPPRESSED */ #define COBJMACROS #include <d3d9.h> #include "wine/test.h" @@ -1657,7 +1658,7 @@ static void test_cursor(void) memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); ok(GetCursorInfo(&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 */ @@ -1671,7 +1672,7 @@ static void test_cursor(void) memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); ok(GetCursorInfo(&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 = IDirect3DDevice9_Release(device);

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

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

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

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

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

← Newer
1
...
4
5
6
7
8
9
10
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2015