wine-devel June 2020

wine-devel@winehq.org

75 participants
814 discussions

[PATCH v5 1/2] user32/tests:Add test function Used to verify the child window Z order problem.【请注意，邮件由wine-devel-bounces@winehq.org代发】
by Jiajin Cui 22 Jun '20

22 Jun '20

I found that the z-order of window on WIN system will not change when HWND_TOPMOST and HWND_NOTOPMOST attributes are set for the same level window with WS_CHILD style, but it will change in wine, resulting in the problem of overlapping window, so I wrote a test function to explain this problem. v2： Add git log information v3: Move the path to fixup_flags function, only used to fix SetWindowPos function problem. v4: Divide a path into two pathes, better explain the prolem. and add notopmost verification v5: Add todo_wine to test patch[PATCH v5 1/2], and optimize fixup_flags[PATCH v5 2/2]. Signed-off-by: Jiajin Cui <cuijiajin(a)uniontech.com>

2 1

[PATCH] msxml3: Add support for 'int' in IXMLDOMElement_put_dataType.
by Hans Leidekker 22 Jun '20

22 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msxml3/element.c | 1 + dlls/msxml3/tests/domdoc.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 0ff26e4fb7..ecebd39fea 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -847,6 +847,7 @@ static HRESULT WINAPI domelem_put_nodeTypedValue( { /* for untyped node coerce to BSTR and set */ case DT_INVALID: + case DT_INT: if (V_VT(&value) != VT_BSTR) { VARIANT content; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a6acdba366..49768b8dbe 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8541,6 +8541,33 @@ static void test_put_nodeTypedValue(void) "got %s, expected \"1\"\n", wine_dbgstr_w(V_BSTR(&type))); VariantClear(&type); + /* int */ + hr = IXMLDOMElement_put_dataType(elem, _bstr_("int")); + EXPECT_HR(hr, S_OK); + + V_VT(&value) = VT_BSTR; + V_BSTR(&value) = _bstr_("1"); + hr = IXMLDOMElement_put_nodeTypedValue(elem, value); + EXPECT_HR(hr, S_OK); + VariantClear(&value); + + V_VT(&value) = VT_EMPTY; + hr = IXMLDOMElement_get_nodeTypedValue(elem, &value); + EXPECT_HR(hr, S_OK); + ok(V_VT(&value) == VT_I4, "got %d\n", V_VT(&value)); + ok(V_I4(&value) == 1, "got %d\n", V_I4(&value)); + + V_VT(&value) = VT_I2; + V_I2(&value) = -1; + hr = IXMLDOMElement_put_nodeTypedValue(elem, value); + EXPECT_HR(hr, S_OK); + + V_VT(&value) = VT_EMPTY; + hr = IXMLDOMElement_get_nodeTypedValue(elem, &value); + EXPECT_HR(hr, S_OK); + ok(V_VT(&value) == VT_I4, "got %d\n", V_VT(&value)); + ok(V_I4(&value) == -1, "got %d\n", V_I4(&value)); + hr = IXMLDOMElement_get_firstChild(elem, &node); EXPECT_HR(hr, S_OK); hr = IXMLDOMElement_removeChild(elem, node, NULL); -- 2.20.1

2 1

[PATCH v5 2/2] user32:Fix z order error when WS_CHILD window want to be topmost windows.
by Jiajin Cui 22 Jun '20

22 Jun '20

Window with WS_CHILD does not need to change Z order when SetWindowPos param hwndInsertAfter is HWND_TOPMOST or HWND_NOTOPMOST. Solve the problems mentioned in the previous patch, and Remove todo_wine on test_child_topmost_zorder. v2： Add git log information v3: Move the path to fixup_flags function, only used to fix SetWindowPos function problem. v4: Divide a path into two pathes, better explain the prolem. and add notopmost verification v5: Add todo_wine to test patch[PATCH v5 1/2], and optimize fixup_flags[PATCH v5 2/2]. Signed-off-by: cuijiajin <cuijiajin(a)uniontech.com>

2 1

[PATCH] user32: Fix store the surface rectangle in the server.
by Chao Long 22 Jun '20

22 Jun '20

2 1

[PATCH 1/3] dxva2: Add device manager stub.
by Nikolay Sivov 22 Jun '20

22 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure | 1 + configure.ac | 1 + dlls/dxva2/Makefile.in | 1 + dlls/dxva2/main.c | 147 +++++++++++++++++++++++++++- dlls/dxva2/tests/Makefile.in | 5 + dlls/dxva2/tests/dxva2.c | 181 +++++++++++++++++++++++++++++++++++ 6 files changed, 332 insertions(+), 4 deletions(-) create mode 100644 dlls/dxva2/tests/Makefile.in create mode 100644 dlls/dxva2/tests/dxva2.c diff --git a/configure b/configure index dd23b5ab13b..106ce1625b1 100755 --- a/configure +++ b/configure @@ -20683,6 +20683,7 @@ wine_fn_config_makefile dlls/dxgi enable_dxgi wine_fn_config_makefile dlls/dxgi/tests enable_tests wine_fn_config_makefile dlls/dxguid enable_dxguid wine_fn_config_makefile dlls/dxva2 enable_dxva2 +wine_fn_config_makefile dlls/dxva2/tests enable_tests wine_fn_config_makefile dlls/esent enable_esent wine_fn_config_makefile dlls/evr enable_evr wine_fn_config_makefile dlls/evr/tests enable_tests diff --git a/configure.ac b/configure.ac index 9c5f76669df..a78610c6490 100644 --- a/configure.ac +++ b/configure.ac @@ -3269,6 +3269,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxgi) WINE_CONFIG_MAKEFILE(dlls/dxgi/tests) WINE_CONFIG_MAKEFILE(dlls/dxguid) WINE_CONFIG_MAKEFILE(dlls/dxva2) +WINE_CONFIG_MAKEFILE(dlls/dxva2/tests) WINE_CONFIG_MAKEFILE(dlls/esent) WINE_CONFIG_MAKEFILE(dlls/evr) WINE_CONFIG_MAKEFILE(dlls/evr/tests) diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in index 44e125e9b5f..cc7551a186b 100644 --- a/dlls/dxva2/Makefile.in +++ b/dlls/dxva2/Makefile.in @@ -1,4 +1,5 @@ MODULE = dxva2.dll +IMPORTS = uuid EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 782f0dfa3d4..e1eb2128439 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -16,19 +16,144 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "d3d9.h" -#include "dxva2api.h" #include "physicalmonitorenumerationapi.h" #include "lowlevelmonitorconfigurationapi.h" #include "highlevelmonitorconfigurationapi.h" +#include "initguid.h" +#include "dxva2api.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dxva2); +struct device_manager +{ + IDirect3DDeviceManager9 IDirect3DDeviceManager9_iface; + LONG refcount; + + UINT token; +}; + +static struct device_manager *impl_from_IDirect3DDeviceManager9(IDirect3DDeviceManager9 *iface) +{ + return CONTAINING_RECORD(iface, struct device_manager, IDirect3DDeviceManager9_iface); +} + +static HRESULT WINAPI device_manager_QueryInterface(IDirect3DDeviceManager9 *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(&IID_IDirect3DDeviceManager9, riid) || + IsEqualIID(&IID_IUnknown, riid)) + { + *obj = iface; + IDirect3DDeviceManager9_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI device_manager_AddRef(IDirect3DDeviceManager9 *iface) +{ + struct device_manager *manager = impl_from_IDirect3DDeviceManager9(iface); + ULONG refcount = InterlockedIncrement(&manager->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI device_manager_Release(IDirect3DDeviceManager9 *iface) +{ + struct device_manager *manager = impl_from_IDirect3DDeviceManager9(iface); + ULONG refcount = InterlockedDecrement(&manager->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + heap_free(manager); + } + + return refcount; +} + +static HRESULT WINAPI device_manager_ResetDevice(IDirect3DDeviceManager9 *iface, IDirect3DDevice9 *device, + UINT token) +{ + FIXME("%p, %p, %#x.\n", iface, device, token); + + return E_NOTIMPL; +} + +static HRESULT WINAPI device_manager_OpenDeviceHandle(IDirect3DDeviceManager9 *iface, HANDLE *hdevice) +{ + FIXME("%p, %p.\n", iface, hdevice); + + return E_NOTIMPL; +} + +static HRESULT WINAPI device_manager_CloseDeviceHandle(IDirect3DDeviceManager9 *iface, HANDLE hdevice) +{ + FIXME("%p, %p.\n", iface, hdevice); + + return E_NOTIMPL; +} + +static HRESULT WINAPI device_manager_TestDevice(IDirect3DDeviceManager9 *iface, HANDLE hdevice) +{ + FIXME("%p, %p.\n", iface, hdevice); + + return E_NOTIMPL; +} + +static HRESULT WINAPI device_manager_LockDevice(IDirect3DDeviceManager9 *iface, HANDLE hdevice, + IDirect3DDevice9 **device, BOOL block) +{ + FIXME("%p, %p, %p, %d.\n", iface, hdevice, device, block); + + return E_NOTIMPL; +} + +static HRESULT WINAPI device_manager_UnlockDevice(IDirect3DDeviceManager9 *iface, HANDLE hdevice, BOOL savestate) +{ + FIXME("%p, %p, %d.\n", iface, hdevice, savestate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI device_manager_GetVideoService(IDirect3DDeviceManager9 *iface, HANDLE hdevice, REFIID riid, + void **obj) +{ + FIXME("%p, %p, %s, %p.\n", iface, hdevice, debugstr_guid(riid), obj); + + return E_NOTIMPL; +} + +static const IDirect3DDeviceManager9Vtbl device_manager_vtbl = +{ + device_manager_QueryInterface, + device_manager_AddRef, + device_manager_Release, + device_manager_ResetDevice, + device_manager_OpenDeviceHandle, + device_manager_CloseDeviceHandle, + device_manager_TestDevice, + device_manager_LockDevice, + device_manager_UnlockDevice, + device_manager_GetVideoService, +}; + BOOL WINAPI CapabilitiesRequestAndCapabilitiesReply( HMONITOR monitor, LPSTR buffer, DWORD length ) { FIXME("(%p, %p, %d): stub\n", monitor, buffer, length); @@ -37,11 +162,25 @@ BOOL WINAPI CapabilitiesRequestAndCapabilitiesReply( HMONITOR monitor, LPSTR buf return FALSE; } -HRESULT WINAPI DXVA2CreateDirect3DDeviceManager9( UINT *resetToken, IDirect3DDeviceManager9 **dxvManager ) +HRESULT WINAPI DXVA2CreateDirect3DDeviceManager9(UINT *token, IDirect3DDeviceManager9 **manager) { - FIXME("(%p, %p): stub\n", resetToken, dxvManager); + struct device_manager *object; - return E_NOTIMPL; + TRACE("%p, %p.\n", token, manager); + + *manager = NULL; + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IDirect3DDeviceManager9_iface.lpVtbl = &device_manager_vtbl; + object->refcount = 1; + object->token = GetTickCount(); + + *token = object->token; + *manager = &object->IDirect3DDeviceManager9_iface; + + return S_OK; } HRESULT WINAPI DXVA2CreateVideoService( IDirect3DDevice9 *device, REFIID riid, void **ppv ) diff --git a/dlls/dxva2/tests/Makefile.in b/dlls/dxva2/tests/Makefile.in new file mode 100644 index 00000000000..c86c5ab42fc --- /dev/null +++ b/dlls/dxva2/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = dxva2.dll +IMPORTS = dxva2 user32 d3d9 + +C_SRCS = \ + dxva2.c diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c new file mode 100644 index 00000000000..cbcad40ca59 --- /dev/null +++ b/dlls/dxva2/tests/dxva2.c @@ -0,0 +1,181 @@ +/* + * Copyright 2020 Nikolay Sivov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include "wine/test.h" +#include "d3d9.h" + +#include "initguid.h" +#include "dxva2api.h" + +static int get_refcount(IUnknown *object) +{ + IUnknown_AddRef(object); + return IUnknown_Release(object); +} + +static HWND create_window(void) +{ + RECT r = {0, 0, 640, 480}; + + AdjustWindowRect(&r, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE); + + return CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); +} + +static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + IDirect3DDevice9 *device = NULL; + + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = focus_window; + present_parameters.Windowed = TRUE; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + + IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); + + return device; +} + +static void test_device_manager(void) +{ + IDirectXVideoProcessorService *processor_service; + IDirect3DDevice9 *device, *device2; + IDirect3DDeviceManager9 *manager; + int refcount, refcount2; + HANDLE handle, handle1; + IDirect3D9 *d3d; + HWND window; + UINT token; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); +todo_wine + ok(hr == DXVA2_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + /* Invalid token. */ + hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token + 1); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + refcount = get_refcount((IUnknown *)device); + + handle1 = NULL; + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle1); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + refcount2 = get_refcount((IUnknown *)device); + ok(refcount2 == refcount, "Unexpected refcount %d.\n", refcount); + + handle = NULL; + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(handle != handle1, "Unexpected handle.\n"); +} + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Already closed. */ + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); +todo_wine + ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); + + handle = NULL; + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle1); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_TestDevice(manager, handle1); +todo_wine + ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); + + handle = NULL; + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + handle1 = NULL; + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle1); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, &IID_IDirectXVideoProcessorService, + (void **)&processor_service); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IDirectXVideoProcessorService_Release(processor_service); + + device2 = create_device(d3d, window); + hr = IDirect3DDeviceManager9_ResetDevice(manager, device2, token); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, &IID_IDirectXVideoProcessorService, + (void **)&processor_service); +todo_wine + ok(hr == DXVA2_E_NEW_VIDEO_DEVICE, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_TestDevice(manager, handle); +todo_wine + ok(hr == DXVA2_E_NEW_VIDEO_DEVICE, "Unexpected hr %#x.\n", hr); + + IDirect3DDevice9_Release(device); + IDirect3DDevice9_Release(device2); + + IDirect3DDeviceManager9_Release(manager); + +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + +START_TEST(dxva2) +{ + test_device_manager(); +} -- 2.27.0

1 2

[PATCH v5 1/2] user32/tests:Add test function Used to verify the child window Z order problem.
by Jiajin Cui 22 Jun '20

22 Jun '20

2 1

[PATCH v5 2/2] user32:Fix z order error when WS_CHILD window want to be topmost windows.
by cuijiajin 22 Jun '20

22 Jun '20

window with WS_CHILD does not need to change Z order when SetWindowPos param hwndInsertAfter is HWND_TOPMOST or HWND_NOTOPMOST. Solve the problems mentioned in the previous patch, and Remove todo_wine on test_child_topmost_zorder. v2： Add git log information v3: Move the path to fixup_flags function, only used to fix SetWindowPos function problem. v4: Divide a path into two pathes, better explain the prolem. and add notopmost verification v5: Add todo_wine to test patch[patch v5 1/2], and optimize fixup_flags[patch v5 2/2]. Signed-off-by: cuijiajin <cuijiajin(a)uniontech.com>

2 1

[PATCH] user32: Fix store the surface rectangle in the server
by longchao 22 Jun '20

22 Jun '20

2 1

[PATCH v5 1/2] user32/tests:Add test function Used to verify the child window Z order problem.
by cuijiajin 22 Jun '20

22 Jun '20

I found that the z-order of window on WIN system will not change when HWND_TOPMOST and HWND_NOTOPMOST attributes are set for the same level window with WS_CHILD style, but it will change in wine, resulting in the problem of overlapping window, so I wrote a test function to explain this problem. v2： Add git log information v3: Move the path to fixup_flags function, only used to fix SetWindowPos function problem. v4: Divide a path into two pathes, better explain the prolem. v5: Add todo_wine to test patch[patch v5 1/2], and optimize fixup_flags[patch v5 2/2]. Signed-off-by: cuijiajin <cuijiajin(a)uniontech.com>

2 1

[PATCH] ieframe/tests: Add some tests for Shell Embedding resizing.
by Dmitry Timoshkov 22 Jun '20

22 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/tests/webbrowser.c | 84 ++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 6 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 95d5fc4988..9d8a4fc63d 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -1832,7 +1832,9 @@ static HWND create_container_window(void) static void test_DoVerb(IWebBrowser2 *unk) { IOleObject *oleobj; - RECT rect = {0,0,1000,1000}; + IOleWindow *olewin; + HWND hwnd; + RECT rect; HRESULT hres; hres = IWebBrowser2_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); @@ -1840,6 +1842,12 @@ static void test_DoVerb(IWebBrowser2 *unk) if(FAILED(hres)) return; + hres = IOleObject_QueryInterface(oleobj, &IID_IOleWindow, (void**)&olewin); + ok(hres == S_OK, "Could not get IOleInPlaceSite: %08x\n", hres); + + hres = IOleWindow_GetWindow(olewin, &hwnd); + ok(hres == S_OK, "GetWindow failed: %08x\n", hres); + SET_EXPECT(CanInPlaceActivate); SET_EXPECT(Site_GetWindow); SET_EXPECT(OnInPlaceActivate); @@ -1853,10 +1861,16 @@ static void test_DoVerb(IWebBrowser2 *unk) SET_EXPECT(SetMenu); SET_EXPECT(OnFocus_TRUE); + SetRect(&rect, 0, 0, 500, 500); hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, 0, (HWND)0xdeadbeef, &rect); ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + SetRectEmpty(&rect); + GetWindowRect(hwnd, &rect); + ok(rect.right - rect.left == 1000 && rect.bottom - rect.top == 900, "window size = {%d %d}\n", + rect.right - rect.left, rect.bottom - rect.top); + CHECK_CALLED(CanInPlaceActivate); CHECK_CALLED(Site_GetWindow); CHECK_CALLED(OnInPlaceActivate); @@ -1870,10 +1884,27 @@ static void test_DoVerb(IWebBrowser2 *unk) CHECK_CALLED(SetMenu); CHECK_CALLED(OnFocus_TRUE); + SetRect(&rect, 0, 0, 600, 600); hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, 0, (HWND)0xdeadbeef, &rect); ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + SetRectEmpty(&rect); + GetWindowRect(hwnd, &rect); + ok(rect.right - rect.left == 1000 && rect.bottom - rect.top == 900, "window size = {%d %d}\n", + rect.right - rect.left, rect.bottom - rect.top); + + SetRect(&rect, 0, 0, 700, 700); + hres = IOleObject_DoVerb(oleobj, OLEIVERB_UIACTIVATE, NULL, &ClientSite, + 0, (HWND)0xdeadbeef, &rect); + ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + + SetRectEmpty(&rect); + GetWindowRect(hwnd, &rect); + ok(rect.right - rect.left == 1000 && rect.bottom - rect.top == 900, "window size = {%d %d}\n", + rect.right - rect.left, rect.bottom - rect.top); + + IOleWindow_Release(olewin); IOleObject_Release(oleobj); } @@ -2649,14 +2680,18 @@ static void test_GetControlInfo(IWebBrowser2 *unk) IOleControl_Release(control); } -static void test_Extent(IWebBrowser2 *unk) +static void test_Extent(IWebBrowser2 *unk, BOOL activated) { IOleObject *oleobj; + IOleWindow *olewin; SIZE size, expected; + RECT rc; HRESULT hres; DWORD dpi_x; DWORD dpi_y; HDC hdc; + HWND hwnd; + char buf[256]; /* default aspect ratio is 96dpi / 96dpi */ hdc = GetDC(0); @@ -2671,15 +2706,41 @@ static void test_Extent(IWebBrowser2 *unk) if(FAILED(hres)) return; + hres = IOleObject_QueryInterface(oleobj, &IID_IOleWindow, (void**)&olewin); + ok(hres == S_OK, "Could not get IOleInPlaceSite: %08x\n", hres); + + hres = IOleWindow_GetWindow(olewin, &hwnd); + ok(hres == S_OK, "GetWindow failed: %08x\n", hres); + + buf[0] = 0; + GetClassNameA(hwnd, buf, sizeof(buf)); + ok(!strcmp(buf, "Shell Embedding"), "got %s\n", buf); + size.cx = size.cy = 0xdeadbeef; hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &size); ok(hres == S_OK, "GetExtent failed: %08x\n", hres); - /* Default size is 50x20 pixels, in himetric units */ - expected.cx = MulDiv( 50, 2540, dpi_x ); - expected.cy = MulDiv( 20, 2540, dpi_y ); + if(activated) { + /* FIXME: what is 300x150 coming from? */ + expected.cx = MulDiv( 300, 2540, dpi_x ); + expected.cy = MulDiv( 150, 2540, dpi_y ); + }else { + /* Default size is 50x20 pixels, in himetric units */ + expected.cx = MulDiv( 50, 2540, dpi_x ); + expected.cy = MulDiv( 20, 2540, dpi_y ); + } +todo_wine_if(activated) ok(size.cx == expected.cx && size.cy == expected.cy, "size = {%d %d} (expected %d %d)\n", size.cx, size.cy, expected.cx, expected.cy ); + SetRectEmpty(&rc); + GetWindowRect(hwnd, &rc); + if(activated) + /* window size should match what was set by last ::SetExtent() before activation */ + ok(rc.right - rc.left == 1000 && rc.bottom - rc.top == 900, "window size = {%d %d}\n", + rc.right - rc.left, rc.bottom - rc.top); + else + ok(IsRectEmpty(&rc), "window size = {%d %d}\n", rc.right - rc.left, rc.bottom - rc.top); + size.cx = 800; size.cy = 700; hres = IOleObject_SetExtent(oleobj, DVASPECT_CONTENT, &size); @@ -2695,6 +2756,15 @@ static void test_Extent(IWebBrowser2 *unk) ok(hres == S_OK, "GetExtent failed: %08x\n", hres); ok(size.cx == 800 && size.cy == 700, "size = {%d %d}\n", size.cx, size.cy); + SetRectEmpty(&rc); + GetWindowRect(hwnd, &rc); + if(activated) + /* window size should match what was set by last ::SetExtent() before activation */ + ok(rc.right - rc.left == 1000 && rc.bottom - rc.top == 900, "window size = {%d %d}\n", + rc.right - rc.left, rc.bottom - rc.top); + else + ok(IsRectEmpty(&rc), "window size = {%d %d}\n", rc.right - rc.left, rc.bottom - rc.top); + size.cx = 900; size.cy = 800; hres = IOleObject_SetExtent(oleobj, 0, &size); @@ -2725,6 +2795,7 @@ static void test_Extent(IWebBrowser2 *unk) ok(hres == S_OK, "GetExtent failed: %08x\n", hres); ok(size.cx == 1000 && size.cy == 900, "size = {%d %d}\n", size.cx, size.cy); + IOleWindow_Release(olewin); IOleObject_Release(oleobj); } @@ -3754,9 +3825,10 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_LocationURL(webbrowser, L""); test_ConnectionPoint(webbrowser, TRUE); test_ClientSite(webbrowser, &ClientSite, !do_download); - test_Extent(webbrowser); + test_Extent(webbrowser, FALSE); test_wb_funcs(webbrowser, TRUE); test_DoVerb(webbrowser); + test_Extent(webbrowser, TRUE); test_olecmd(webbrowser, FALSE); test_Navigate2(webbrowser, L"about:blank"); test_QueryStatusWB(webbrowser, TRUE); -- 2.26.2

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
82
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-devel June 2020