October 2020 - Wine-Devel - list.winehq.org

[PATCH 1/5] mfplat: Implement DXGI device manager handle management.
by Nikolay Sivov Oct. 23, 2020

Oct. 23, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 248 +++++++++++++++++++++++++++++++++---- dlls/mfplat/tests/mfplat.c | 162 +++++++++++++++++++++++- include/mfapi.h | 4 + 3 files changed, 386 insertions(+), 28 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 452426d055f..68aa2cdaa2d 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -8556,12 +8556,29 @@ HRESULT WINAPI CreatePropertyStore(IPropertyStore **store) return S_OK; } +enum dxgi_device_handle_flags +{ + DXGI_DEVICE_HANDLE_FLAG_OPEN = 0x1, + DXGI_DEVICE_HANDLE_FLAG_INVALID = 0x2, + DXGI_DEVICE_HANDLE_FLAG_LOCKED = 0x4, +}; + struct dxgi_device_manager { IMFDXGIDeviceManager IMFDXGIDeviceManager_iface; LONG refcount; UINT token; IDXGIDevice *device; + + unsigned int *handles; + size_t count; + size_t capacity; + + unsigned int locks; + unsigned int locking_tid; + + CRITICAL_SECTION cs; + CONDITION_VARIABLE lock; }; static struct dxgi_device_manager *impl_from_IMFDXGIDeviceManager(IMFDXGIDeviceManager *iface) @@ -8569,6 +8586,14 @@ static struct dxgi_device_manager *impl_from_IMFDXGIDeviceManager(IMFDXGIDeviceM return CONTAINING_RECORD(iface, struct dxgi_device_manager, IMFDXGIDeviceManager_iface); } +static HRESULT dxgi_device_manager_get_handle_index(struct dxgi_device_manager *manager, HANDLE hdevice, size_t *idx) +{ + if (!hdevice || hdevice > ULongToHandle(manager->count)) + return E_HANDLE; + *idx = (ULONG_PTR)hdevice - 1; + return S_OK; +} + static HRESULT WINAPI dxgi_device_manager_QueryInterface(IMFDXGIDeviceManager *iface, REFIID riid, void **obj) { TRACE("(%p, %s, %p).\n", iface, debugstr_guid(riid), obj); @@ -8607,17 +8632,61 @@ static ULONG WINAPI dxgi_device_manager_Release(IMFDXGIDeviceManager *iface) { if (manager->device) IDXGIDevice_Release(manager->device); + DeleteCriticalSection(&manager->cs); + heap_free(manager->handles); heap_free(manager); } return refcount; } -static HRESULT WINAPI dxgi_device_manager_CloseDeviceHandle(IMFDXGIDeviceManager *iface, HANDLE device) +static void dxgi_device_manager_lock_handle(struct dxgi_device_manager *manager, size_t idx) { - FIXME("(%p, %p): stub.\n", iface, device); + if (manager->handles[idx] & DXGI_DEVICE_HANDLE_FLAG_LOCKED) + return; - return E_NOTIMPL; + manager->handles[idx] |= DXGI_DEVICE_HANDLE_FLAG_LOCKED; + manager->locks++; +} + +static void dxgi_device_manager_unlock_handle(struct dxgi_device_manager *manager, size_t idx) +{ + if (!(manager->handles[idx] & DXGI_DEVICE_HANDLE_FLAG_LOCKED)) + return; + + manager->handles[idx] &= ~DXGI_DEVICE_HANDLE_FLAG_LOCKED; + if (!--manager->locks) + manager->locking_tid = 0; +} + +static HRESULT WINAPI dxgi_device_manager_CloseDeviceHandle(IMFDXGIDeviceManager *iface, HANDLE hdevice) +{ + struct dxgi_device_manager *manager = impl_from_IMFDXGIDeviceManager(iface); + HRESULT hr; + size_t idx; + + TRACE("%p, %p.\n", iface, hdevice); + + EnterCriticalSection(&manager->cs); + + if (SUCCEEDED(hr = dxgi_device_manager_get_handle_index(manager, hdevice, &idx))) + { + if (manager->handles[idx] & DXGI_DEVICE_HANDLE_FLAG_OPEN) + { + dxgi_device_manager_unlock_handle(manager, idx); + manager->handles[idx] = 0; + if (idx == manager->count - 1) + manager->count--; + } + else + hr = E_HANDLE; + } + + LeaveCriticalSection(&manager->cs); + + WakeAllConditionVariable(&manager->lock); + + return hr; } static HRESULT WINAPI dxgi_device_manager_GetVideoService(IMFDXGIDeviceManager *iface, HANDLE device, @@ -8628,57 +8697,180 @@ static HRESULT WINAPI dxgi_device_manager_GetVideoService(IMFDXGIDeviceManager * return E_NOTIMPL; } -static HRESULT WINAPI dxgi_device_manager_LockDevice(IMFDXGIDeviceManager *iface, HANDLE device, - REFIID riid, void **ppv, BOOL block) +static HRESULT WINAPI dxgi_device_manager_LockDevice(IMFDXGIDeviceManager *iface, HANDLE hdevice, + REFIID riid, void **obj, BOOL block) { - FIXME("(%p, %p, %s, %p, %d): stub.\n", iface, device, wine_dbgstr_guid(riid), ppv, block); + struct dxgi_device_manager *manager = impl_from_IMFDXGIDeviceManager(iface); + HRESULT hr; + size_t idx; - return E_NOTIMPL; + TRACE("%p, %p, %s, %p, %d.\n", iface, hdevice, wine_dbgstr_guid(riid), obj, block); + + EnterCriticalSection(&manager->cs); + + if (SUCCEEDED(hr = dxgi_device_manager_get_handle_index(manager, hdevice, &idx))) + { + if (!manager->device) + { + hr = MF_E_DXGI_DEVICE_NOT_INITIALIZED; + } + else if (manager->locking_tid == GetCurrentThreadId()) + { + if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(manager->device, riid, obj))) + dxgi_device_manager_lock_handle(manager, idx); + } + else if (manager->locking_tid && !block) + { + hr = MF_E_DXGI_VIDEO_DEVICE_LOCKED; + } + else + { + while (manager->locking_tid) + { + SleepConditionVariableCS(&manager->lock, &manager->cs, INFINITE); + } + + if (SUCCEEDED(hr = dxgi_device_manager_get_handle_index(manager, hdevice, &idx))) + { + if (manager->handles[idx] & DXGI_DEVICE_HANDLE_FLAG_INVALID) + hr = MF_E_DXGI_NEW_VIDEO_DEVICE; + else if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(manager->device, riid, obj))) + { + manager->locking_tid = GetCurrentThreadId(); + dxgi_device_manager_lock_handle(manager, idx); + } + } + } + } + + LeaveCriticalSection(&manager->cs); + + return hr; } -static HRESULT WINAPI dxgi_device_manager_OpenDeviceHandle(IMFDXGIDeviceManager *iface, HANDLE *device) +static HRESULT WINAPI dxgi_device_manager_OpenDeviceHandle(IMFDXGIDeviceManager *iface, HANDLE *hdevice) { - FIXME("(%p, %p): stub.\n", iface, device); + struct dxgi_device_manager *manager = impl_from_IMFDXGIDeviceManager(iface); + HRESULT hr = S_OK; + size_t i; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, hdevice); + + *hdevice = NULL; + + EnterCriticalSection(&manager->cs); + + if (!manager->device) + hr = MF_E_DXGI_DEVICE_NOT_INITIALIZED; + else + { + for (i = 0; i < manager->count; ++i) + { + if (!(manager->handles[i] & DXGI_DEVICE_HANDLE_FLAG_OPEN)) + { + manager->handles[i] |= DXGI_DEVICE_HANDLE_FLAG_OPEN; + *hdevice = ULongToHandle(i + 1); + break; + } + } + + if (mf_array_reserve((void **)&manager->handles, &manager->capacity, manager->count + 1, + sizeof(*manager->handles))) + { + *hdevice = ULongToHandle(manager->count + 1); + manager->handles[manager->count++] = DXGI_DEVICE_HANDLE_FLAG_OPEN; + } + else + hr = E_OUTOFMEMORY; + } + + LeaveCriticalSection(&manager->cs); + + return hr; } static HRESULT WINAPI dxgi_device_manager_ResetDevice(IMFDXGIDeviceManager *iface, IUnknown *device, UINT token) { struct dxgi_device_manager *manager = impl_from_IMFDXGIDeviceManager(iface); IDXGIDevice *dxgi_device; - HRESULT hr; + size_t i; - TRACE("(%p, %p, %u).\n", iface, device, token); + TRACE("%p, %p, %u.\n", iface, device, token); if (!device || token != manager->token) return E_INVALIDARG; - hr = IUnknown_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); - if (SUCCEEDED(hr)) + if (FAILED(IUnknown_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device))) + return E_INVALIDARG; + + EnterCriticalSection(&manager->cs); + + if (manager->device) { - if (manager->device) - IDXGIDevice_Release(manager->device); - manager->device = dxgi_device; + for (i = 0; i < manager->count; ++i) + { + manager->handles[i] |= DXGI_DEVICE_HANDLE_FLAG_INVALID; + manager->handles[i] &= ~DXGI_DEVICE_HANDLE_FLAG_LOCKED; + } + manager->locking_tid = 0; + manager->locks = 0; + IDXGIDevice_Release(manager->device); } - else - hr = E_INVALIDARG; + manager->device = dxgi_device; - return hr; + LeaveCriticalSection(&manager->cs); + + WakeAllConditionVariable(&manager->lock); + + return S_OK; } -static HRESULT WINAPI dxgi_device_manager_TestDevice(IMFDXGIDeviceManager *iface, HANDLE device) +static HRESULT WINAPI dxgi_device_manager_TestDevice(IMFDXGIDeviceManager *iface, HANDLE hdevice) { - FIXME("(%p, %p): stub.\n", iface, device); + struct dxgi_device_manager *manager = impl_from_IMFDXGIDeviceManager(iface); + HRESULT hr; + size_t idx; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, hdevice); + + EnterCriticalSection(&manager->cs); + + if (SUCCEEDED(hr = dxgi_device_manager_get_handle_index(manager, hdevice, &idx))) + { + if (manager->handles[idx] & DXGI_DEVICE_HANDLE_FLAG_INVALID) + hr = MF_E_DXGI_NEW_VIDEO_DEVICE; + else if (!(manager->handles[idx] & DXGI_DEVICE_HANDLE_FLAG_OPEN)) + hr = E_HANDLE; + } + + LeaveCriticalSection(&manager->cs); + + return hr; } -static HRESULT WINAPI dxgi_device_manager_UnlockDevice(IMFDXGIDeviceManager *iface, HANDLE device, BOOL state) +static HRESULT WINAPI dxgi_device_manager_UnlockDevice(IMFDXGIDeviceManager *iface, HANDLE hdevice, + BOOL savestate) { - FIXME("(%p, %p, %d): stub.\n", iface, device, state); + struct dxgi_device_manager *manager = impl_from_IMFDXGIDeviceManager(iface); + HRESULT hr = E_FAIL; + size_t idx; - return E_NOTIMPL; + TRACE("%p, %p, %d.\n", iface, hdevice, savestate); + + EnterCriticalSection(&manager->cs); + + if (SUCCEEDED(dxgi_device_manager_get_handle_index(manager, hdevice, &idx))) + { + hr = manager->handles[idx] & DXGI_DEVICE_HANDLE_FLAG_LOCKED ? S_OK : E_INVALIDARG; + if (SUCCEEDED(hr)) + dxgi_device_manager_unlock_handle(manager, idx); + } + + LeaveCriticalSection(&manager->cs); + + WakeAllConditionVariable(&manager->lock); + + return hr; } static const IMFDXGIDeviceManagerVtbl dxgi_device_manager_vtbl = @@ -8699,7 +8891,7 @@ HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **man { struct dxgi_device_manager *object; - TRACE("(%p, %p).\n", token, manager); + TRACE("%p, %p.\n", token, manager); if (!token || !manager) return E_POINTER; @@ -8712,6 +8904,8 @@ HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **man object->refcount = 1; object->token = GetTickCount(); object->device = NULL; + InitializeCriticalSection(&object->cs); + InitializeConditionVariable(&object->lock); TRACE("Created device manager: %p, token: %u.\n", object, object->token); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index a5388840bc5..c318c4364fb 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -4497,10 +4497,38 @@ if (0) ok(!refcount, "Unexpected refcount %u.\n", refcount); } +struct test_thread_param +{ + IMFDXGIDeviceManager *manager; + HANDLE handle; + BOOL lock; +}; + +static DWORD WINAPI test_device_manager_thread(void *arg) +{ + struct test_thread_param *param = arg; + ID3D11Device *device; + HRESULT hr; + + if (param->lock) + { + hr = IMFDXGIDeviceManager_LockDevice(param->manager, param->handle, &IID_ID3D11Device, + (void **)&device, FALSE); + if (SUCCEEDED(hr)) + ID3D11Device_Release(device); + } + else + hr = IMFDXGIDeviceManager_UnlockDevice(param->manager, param->handle, FALSE); + + return hr; +} + static void test_dxgi_device_manager(void) { IMFDXGIDeviceManager *manager, *manager2; - ID3D11Device *d3d11_dev, *d3d11_dev2; + ID3D11Device *device, *d3d11_dev, *d3d11_dev2; + struct test_thread_param param; + HANDLE handle1, handle, thread; UINT token, token2; HRESULT hr; @@ -4532,6 +4560,18 @@ static void test_dxgi_device_manager(void) ok(manager != manager2, "got wrong pointer: %p.\n", manager2); EXPECT_REF(manager, 1); + hr = IMFDXGIDeviceManager_OpenDeviceHandle(manager, &handle); + ok(hr == MF_E_DXGI_DEVICE_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIDeviceManager_CloseDeviceHandle(manager, 0); + ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIDeviceManager_LockDevice(manager, 0, &IID_ID3D11Device, (void **)&device, FALSE); + ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIDeviceManager_LockDevice(manager, UlongToHandle(100), &IID_ID3D11Device, (void **)&device, FALSE); + ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, D3D11_CREATE_DEVICE_VIDEO_SUPPORT, NULL, 0, D3D11_SDK_VERSION, &d3d11_dev, NULL, NULL); ok(hr == S_OK, "D3D11CreateDevice failed: %#x.\n", hr); @@ -4569,6 +4609,126 @@ static void test_dxgi_device_manager(void) EXPECT_REF(d3d11_dev2, 2); EXPECT_REF(d3d11_dev, 1); + handle = NULL; + hr = IMFDXGIDeviceManager_OpenDeviceHandle(manager, &handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!handle, "Unexpected handle value %p.\n", handle); + + handle1 = NULL; + hr = IMFDXGIDeviceManager_OpenDeviceHandle(manager, &handle1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(handle != handle1, "Unexpected handle.\n"); + + hr = IMFDXGIDeviceManager_CloseDeviceHandle(manager, handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Already closed. */ + hr = IMFDXGIDeviceManager_CloseDeviceHandle(manager, handle); + ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); + + handle = NULL; + hr = IMFDXGIDeviceManager_OpenDeviceHandle(manager, &handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIDeviceManager_CloseDeviceHandle(manager, handle1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIDeviceManager_TestDevice(manager, handle1); + ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIDeviceManager_LockDevice(manager, handle, &IID_ID3D11Device, (void **)&device, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(device == d3d11_dev2, "Unexpected device pointer.\n"); + ID3D11Device_Release(device); + + hr = IMFDXGIDeviceManager_UnlockDevice(manager, handle, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIDeviceManager_UnlockDevice(manager, handle, FALSE); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIDeviceManager_UnlockDevice(manager, UlongToHandle(100), FALSE); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + /* Locked with one handle, unlock with another. */ + hr = IMFDXGIDeviceManager_OpenDeviceHandle(manager, &handle1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIDeviceManager_LockDevice(manager, handle, &IID_ID3D11Device, (void **)&device, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIDeviceManager_UnlockDevice(manager, handle1, FALSE); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + ID3D11Device_Release(device); + + /* Closing unlocks the device. */ + hr = IMFDXGIDeviceManager_CloseDeviceHandle(manager, handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIDeviceManager_LockDevice(manager, handle1, &IID_ID3D11Device, (void **)&device, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D11Device_Release(device); + + hr = IMFDXGIDeviceManager_CloseDeviceHandle(manager, handle1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Open two handles. */ + hr = IMFDXGIDeviceManager_OpenDeviceHandle(manager, &handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIDeviceManager_OpenDeviceHandle(manager, &handle1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIDeviceManager_LockDevice(manager, handle, &IID_ID3D11Device, (void **)&device, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D11Device_Release(device); + + hr = IMFDXGIDeviceManager_LockDevice(manager, handle1, &IID_ID3D11Device, (void **)&device, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D11Device_Release(device); + + hr = IMFDXGIDeviceManager_UnlockDevice(manager, handle, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIDeviceManager_UnlockDevice(manager, handle, FALSE); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + param.manager = manager; + param.handle = handle; + param.lock = TRUE; + thread = CreateThread(NULL, 0, test_device_manager_thread, &param, 0, NULL); + ok(!WaitForSingleObject(thread, 1000), "Wait for a test thread failed.\n"); + GetExitCodeThread(thread, (DWORD *)&hr); + ok(hr == MF_E_DXGI_VIDEO_DEVICE_LOCKED, "Unexpected hr %#x.\n", hr); + CloseHandle(thread); + + hr = IMFDXGIDeviceManager_UnlockDevice(manager, handle1, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIDeviceManager_UnlockDevice(manager, handle1, FALSE); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + /* Lock on main thread, unlock on another. */ + hr = IMFDXGIDeviceManager_LockDevice(manager, handle, &IID_ID3D11Device, (void **)&device, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D11Device_Release(device); + + param.manager = manager; + param.handle = handle; + param.lock = FALSE; + thread = CreateThread(NULL, 0, test_device_manager_thread, &param, 0, NULL); + ok(!WaitForSingleObject(thread, 1000), "Wait for a test thread failed.\n"); + GetExitCodeThread(thread, (DWORD *)&hr); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + CloseHandle(thread); + + hr = IMFDXGIDeviceManager_CloseDeviceHandle(manager, handle1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIDeviceManager_CloseDeviceHandle(manager, handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFDXGIDeviceManager_Release(manager); EXPECT_REF(d3d11_dev2, 1); ID3D11Device_Release(d3d11_dev); diff --git a/include/mfapi.h b/include/mfapi.h index 499c77ab337..25fced1c7d6 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -482,6 +482,10 @@ typedef enum #define MFSESSIONCAP_RATE_REVERSE 0x00000020 #define MFSESSIONCAP_DOES_NOT_USE_NETWORK 0x00000040 +#define MF_E_DXGI_DEVICE_NOT_INITIALIZED ((HRESULT)0x80041000) +#define MF_E_DXGI_NEW_VIDEO_DEVICE ((HRESULT)0x80041001) +#define MF_E_DXGI_VIDEO_DEVICE_LOCKED ((HRESULT)0x80041002) + HRESULT WINAPI MFAddPeriodicCallback(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); HRESULT WINAPI MFAllocateSerialWorkQueue(DWORD target_queue, DWORD *queue); HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue); -- 2.28.0

2 6

[PATCH] netprofm: Initialize ret value in IEnumNetworkConnections_Next().
by Jactry Zeng Oct. 23, 2020

Oct. 23, 2020

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- Fixes a hang of Futu Securities. --- dlls/netprofm/list.c | 2 ++ dlls/netprofm/tests/list.c | 20 +++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index def2aa6cf67..72a594a81d5 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -1000,6 +1000,8 @@ static HRESULT WINAPI connections_enum_Next( TRACE( "%p, %u %p %p\n", iter, count, ret, fetched ); + if (!ret) return E_POINTER; + *ret = NULL; if (fetched) *fetched = 0; if (!count) return S_OK; diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index 0a1f854c00b..87eb857426b 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -229,7 +229,7 @@ static void test_INetworkListManager( void ) INetworkConnection *conn; DWORD cookie; HRESULT hr; - ULONG ref1, ref2; + ULONG ref1, ref2, fetched; IID iid; hr = CoCreateInstance( &CLSID_NetworkListManager, NULL, CLSCTX_INPROC_SERVER, @@ -351,11 +351,29 @@ static void test_INetworkListManager( void ) ok( hr == S_OK, "got %08x\n", hr ); if (conn_iter) { + fetched = 256; + hr = IEnumNetworkConnections_Next( conn_iter, 1, NULL, &fetched ); + ok( hr == E_POINTER, "got hr %#x.\n", hr ); + ok( fetched == 256, "got wrong feteched: %d.\n", fetched ); + + hr = IEnumNetworkConnections_Next( conn_iter, 0, NULL, &fetched ); + ok( hr == E_POINTER, "got hr %#x.\n", hr ); + ok( fetched == 256, "got wrong feteched: %d.\n", fetched ); + while ((hr = IEnumNetworkConnections_Next( conn_iter, 1, &conn, NULL )) == S_OK) { test_INetworkConnection( conn ); INetworkConnection_Release( conn ); } + ok( !conn, "got wrong pointer: %p.\n", conn ); + + conn = (void *)0xdeadbeef; + hr = IEnumNetworkConnections_Next( conn_iter, 0, &conn, &fetched ); + ok( hr == S_OK, "got hr %#x.\n", hr ); + ok( !conn || broken( conn == (void *)0xdeadbeef ) /* win10 v2004 */, + "got wrong pointer: %p.\n", conn ); + ok( !fetched, "got wrong feteched: %d.\n", fetched ); + IEnumNetworkConnections_Release( conn_iter ); } -- 2.28.0

1 0

[PATCH 5/5] riched20: Remove the caret at end hack.
by Huw Davies Oct. 23, 2020

Oct. 23, 2020

The end of one run already has a different cursor to the beginning of the next run. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 111 ++++++++-------------------------------- dlls/riched20/editor.c | 1 - dlls/riched20/editstr.h | 1 - dlls/riched20/table.c | 5 +- 4 files changed, 21 insertions(+), 97 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index bb462b034b7..4da6898bef8 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -238,16 +238,6 @@ void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, if (!pCursor->nOffset && (prev = run_prev( run ))) size_run = prev; - if (editor->bCaretAtEnd && !pCursor->nOffset && - run == &ME_FindItemFwd( row, diRun )->member.run) - { - ME_DisplayItem *tmp = ME_FindItemBack(row, diRunOrParagraph); - if (tmp->type == diRun) - { - row = ME_FindItemBack(tmp, diStartRow); - size_run = run = &tmp->member.run; - } - } run_x = ME_PointFromCharContext( &c, run, pCursor->nOffset, TRUE ); *height = size_run->nAscent + size_run->nDescent; @@ -484,7 +474,6 @@ void ME_InsertOLEFromCursor(ME_TextEditor *editor, const REOBJECT* reo, int nCur ME_DeleteSelection(editor); run = run_insert( editor, cursor, style, &space, 1, MERF_GRAPHICS ); - editor->bCaretAtEnd = FALSE; run->reobj = create_re_object( reo ); @@ -517,7 +506,6 @@ void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor) ME_DeleteSelection(editor); run_insert( editor, cursor, style, &space, 1, MERF_ENDROW ); - editor->bCaretAtEnd = FALSE; ME_ReleaseStyle( style ); } @@ -538,7 +526,6 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, /* text operations set modified state */ editor->nModifyStep = 1; - editor->bCaretAtEnd = FALSE; assert(style); @@ -877,7 +864,7 @@ int ME_GetCursorOfs(const ME_Cursor *cursor) + cursor->pRun->member.run.nCharOfs + cursor->nOffset; } -/* Helper function for ME_FindPixelPos to find paragraph within tables */ +/* Helper function for cursor_from_virtual_coords() to find paragraph within tables */ static ME_Paragraph *pixel_pos_in_table_row( int x, int y, ME_Paragraph *para ) { ME_Cell *cell, *next_cell; @@ -916,8 +903,9 @@ static ME_Paragraph *pixel_pos_in_table_row( int x, int y, ME_Paragraph *para ) return para; } -static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, - int x, ME_Cursor *cursor, BOOL *pbCaretAtEnd) + +static BOOL cursor_from_row( ME_TextEditor *editor, ME_DisplayItem *pRow, + int x, ME_Cursor *cursor ) { ME_DisplayItem *pNext, *pLastRun; ME_Row *row = &pRow->member.row; @@ -930,7 +918,6 @@ static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, } pNext = ME_FindItemFwd(pRow, diRunOrStartRow); assert(pNext->type == diRun); - if (pbCaretAtEnd) *pbCaretAtEnd = FALSE; cursor->nOffset = 0; do { int run_x = pNext->member.run.pt.x; @@ -947,14 +934,7 @@ static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, pNext = ME_FindItemFwd(pNext, diRunOrStartRow); } while(pNext && pNext->type == diRun); - if ((pLastRun->member.run.nFlags & MERF_ENDPARA) == 0) - { - cursor->pRun = ME_FindItemFwd(pNext, diRun); - if (pbCaretAtEnd) *pbCaretAtEnd = TRUE; - } - else - cursor->pRun = pLastRun; - + cursor->pRun = pLastRun; cursor->pPara = ME_GetParagraph( cursor->pRun ); return FALSE; } @@ -969,8 +949,8 @@ static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, * returns TRUE if the result was exactly under the cursor, otherwise returns * FALSE, and result is set to the closest position to the coordinates. */ -static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, - ME_Cursor *result, BOOL *is_eol, BOOL final_eop) +static BOOL cursor_from_virtual_coords( ME_TextEditor *editor, int x, int y, + ME_Cursor *result, BOOL final_eop ) { ME_Paragraph *para = editor_first_para( editor ); ME_DisplayItem *row = NULL; @@ -979,9 +959,6 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, x -= editor->rcFormat.left; y -= editor->rcFormat.top; - if (is_eol) - *is_eol = FALSE; - /* find paragraph */ for (; para_next( para ); para = para_next( para )) { @@ -1018,7 +995,8 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, row = ME_FindItemBack( para_get_di( para ), diStartRow); } - if (row) return ME_FindRunInRow( editor, row, x, result, is_eol ) && isExact; + + if (row) return cursor_from_row( editor, row, x, result ) && isExact; ME_SetCursorToEnd(editor, result, TRUE); return FALSE; @@ -1048,7 +1026,7 @@ BOOL ME_CharFromPos(ME_TextEditor *editor, int x, int y, } x += editor->horz_si.nPos; y += editor->vert_si.nPos; - bResult = ME_FindPixelPos(editor, x, y, cursor, NULL, FALSE); + bResult = cursor_from_virtual_coords( editor, x, y, cursor, FALSE ); if (isExact) *isExact = bResult; return TRUE; } @@ -1131,7 +1109,7 @@ void ME_LButtonDown(ME_TextEditor *editor, int x, int y, int clickNum) is_selection = ME_IsSelection(editor); is_shift = GetKeyState(VK_SHIFT) < 0; - ME_FindPixelPos(editor, x, y, &editor->pCursors[0], &editor->bCaretAtEnd, FALSE); + cursor_from_virtual_coords( editor, x, y, &editor->pCursors[0], FALSE ); if (x >= editor->rcFormat.left || is_shift) { @@ -1189,8 +1167,8 @@ void ME_MouseMove(ME_TextEditor *editor, int x, int y) y += editor->vert_si.nPos; tmp_cursor = editor->pCursors[0]; - /* FIXME: do something with the return value of ME_FindPixelPos */ - ME_FindPixelPos(editor, x, y, &tmp_cursor, &editor->bCaretAtEnd, TRUE); + /* FIXME: do something with the return value of cursor_from_virtual_coords */ + cursor_from_virtual_coords( editor, x, y, &tmp_cursor, TRUE ); ME_InvalidateSelection(editor); editor->pCursors[0] = tmp_cursor; @@ -1220,17 +1198,8 @@ static int ME_GetXForArrow(ME_TextEditor *editor, ME_Cursor *pCursor) x = editor->nUDArrowX; else { - if (editor->bCaretAtEnd) - { - run = run_prev_all_paras( run ); - assert( run ); - x = run->pt.x + run->nWidth; - } - else - { - x = run->pt.x; - x += ME_PointFromChar( editor, run, pCursor->nOffset, TRUE ); - } + x = run->pt.x; + x += ME_PointFromChar( editor, run, pCursor->nOffset, TRUE ); editor->nUDArrowX = x; } return x; @@ -1245,14 +1214,6 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs, BOOL ME_DisplayItem *pItem; int x = ME_GetXForArrow(editor, pCursor); - if (editor->bCaretAtEnd && !pCursor->nOffset) - { - ME_Run *prev = run_prev_all_paras( &pRun->member.run ); - if (!prev) return; - pRun = run_get_di( prev ); - old_para = prev->para; - } - if (nRelOfs == -1) { /* start of this row */ @@ -1318,7 +1279,7 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs, BOOL /* row not found - ignore */ return; } - ME_FindRunInRow(editor, pItem, x, pCursor, &editor->bCaretAtEnd); + cursor_from_row( editor, pItem, x, pCursor ); assert(pCursor->pRun); assert(pCursor->pRun->type == diRun); } @@ -1330,7 +1291,6 @@ static void ME_ArrowPageUp(ME_TextEditor *editor, ME_Cursor *pCursor) if (editor->vert_si.nPos < p->member.row.nHeight) { ME_SetCursorToStart(editor, pCursor); - editor->bCaretAtEnd = FALSE; /* Native clears seems to clear this x value on page up at the top * of the text, but not on page down at the end of the text. * Doesn't make sense, but we try to be bug for bug compatible. */ @@ -1342,8 +1302,6 @@ static void ME_ArrowPageUp(ME_TextEditor *editor, ME_Cursor *pCursor) int yOldScrollPos = editor->vert_si.nPos; x = ME_GetXForArrow(editor, pCursor); - if (!pCursor->nOffset && editor->bCaretAtEnd) - pRun = ME_FindItemBack(pRun, diRun); p = ME_FindItemBack(pRun, diStartRowOrParagraph); assert(p->type == diStartRow); @@ -1371,7 +1329,7 @@ static void ME_ArrowPageUp(ME_TextEditor *editor, ME_Cursor *pCursor) pLast = p; } while(1); - ME_FindRunInRow(editor, pLast, x, pCursor, &editor->bCaretAtEnd); + cursor_from_row( editor, pLast, x, pCursor ); } assert(pCursor->pRun); assert(pCursor->pRun->type == diRun); @@ -1392,16 +1350,12 @@ static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) if (editor->vert_si.nPos >= y - editor->sizeWindow.cy) { ME_SetCursorToEnd(editor, pCursor, FALSE); - editor->bCaretAtEnd = FALSE; } else { ME_DisplayItem *pRun = pCursor->pRun; ME_DisplayItem *p; int yd, yp; int yOldScrollPos = editor->vert_si.nPos; - if (!pCursor->nOffset && editor->bCaretAtEnd) - pRun = ME_FindItemBack(pRun, diRun); - p = ME_FindItemBack(pRun, diStartRowOrParagraph); assert(p->type == diStartRow); yp = ME_FindItemBack(p, diParagraph)->member.para.pt.y; @@ -1429,7 +1383,7 @@ static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) pLast = p; } while(1); - ME_FindRunInRow(editor, pLast, x, pCursor, &editor->bCaretAtEnd); + cursor_from_row( editor, pLast, x, pCursor ); } assert(pCursor->pRun); assert(pCursor->pRun->type == diRun); @@ -1440,11 +1394,7 @@ static void ME_ArrowHome(ME_TextEditor *editor, ME_Cursor *pCursor) ME_DisplayItem *pRow = ME_FindItemBack(pCursor->pRun, diStartRow); if (pRow) { ME_DisplayItem *pRun; - if (editor->bCaretAtEnd && !pCursor->nOffset) { - pRow = ME_FindItemBack(pRow, diStartRow); - if (!pRow) - return; - } + pRun = ME_FindItemFwd(pRow, diRun); if (pRun) { pCursor->pRun = pRun; @@ -1452,44 +1402,26 @@ static void ME_ArrowHome(ME_TextEditor *editor, ME_Cursor *pCursor) pCursor->nOffset = 0; } } - editor->bCaretAtEnd = FALSE; } static void ME_ArrowCtrlHome(ME_TextEditor *editor, ME_Cursor *pCursor) { ME_SetCursorToStart(editor, pCursor); - editor->bCaretAtEnd = FALSE; } static void ME_ArrowEnd(ME_TextEditor *editor, ME_Cursor *pCursor) { ME_DisplayItem *pRow; - if (editor->bCaretAtEnd && !pCursor->nOffset) - return; - pRow = ME_FindItemFwd(pCursor->pRun, diStartRowOrParagraphOrEnd); assert(pRow); - if (pRow->type == diStartRow) { - ME_DisplayItem *pRun = ME_FindItemFwd(pRow, diRun); - assert(pRun); - pCursor->pRun = pRun; - assert(pCursor->pPara == ME_GetParagraph(pCursor->pRun)); - pCursor->nOffset = 0; - editor->bCaretAtEnd = TRUE; - return; - } pCursor->pRun = ME_FindItemBack(pRow, diRun); - assert(pCursor->pRun && pCursor->pRun->member.run.nFlags & MERF_ENDPARA); - assert(pCursor->pPara == ME_GetParagraph(pCursor->pRun)); - pCursor->nOffset = 0; - editor->bCaretAtEnd = FALSE; + pCursor->nOffset = (pRow->type == diStartRow) ? pCursor->pRun->member.run.len : 0; } static void ME_ArrowCtrlEnd(ME_TextEditor *editor, ME_Cursor *pCursor) { ME_SetCursorToEnd(editor, pCursor, FALSE); - editor->bCaretAtEnd = FALSE; } BOOL ME_IsSelection(ME_TextEditor *editor) @@ -1554,14 +1486,12 @@ ME_ArrowKey(ME_TextEditor *editor, int nVKey, BOOL extend, BOOL ctrl) ME_CheckCharOffsets(editor); switch(nVKey) { case VK_LEFT: - editor->bCaretAtEnd = FALSE; if (ctrl) success = ME_MoveCursorWords(editor, &tmp_curs, -1); else success = ME_MoveCursorChars(editor, &tmp_curs, -1, extend); break; case VK_RIGHT: - editor->bCaretAtEnd = FALSE; if (ctrl) success = ME_MoveCursorWords(editor, &tmp_curs, +1); else @@ -1584,7 +1514,6 @@ ME_ArrowKey(ME_TextEditor *editor, int nVKey, BOOL extend, BOOL ctrl) ME_ArrowCtrlHome(editor, &tmp_curs); else ME_ArrowHome(editor, &tmp_curs); - editor->bCaretAtEnd = FALSE; break; } case VK_END: diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 0cc33ad5d9b..6a2e96a3c7c 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3121,7 +3121,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->nUDArrowX = -1; ed->rgbBackColor = -1; ed->hbrBackground = GetSysColorBrush(COLOR_WINDOW); - ed->bCaretAtEnd = FALSE; ed->nEventMask = 0; ed->nModifyStep = 0; ed->nTextLimit = TEXT_LIMIT_DEFAULT; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index fd5c9bc3df8..8722890bf47 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -398,7 +398,6 @@ typedef struct tagME_TextEditor int total_rows; COLORREF rgbBackColor; HBRUSH hbrBackground; - BOOL bCaretAtEnd; int nEventMask; int nModifyStep; struct list undo_stack; diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index daae18d5968..33e89a11771 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -625,10 +625,7 @@ void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow) editor->pCursors[0] = fromCursor; editor->pCursors[1] = fromCursor; /* FIXME: For some reason the caret is shown at the start of the - * previous paragraph in v1.0 to v3.0, and bCaretAtEnd only works - * within the paragraph for wrapped lines. */ - if (ME_FindItemBack(fromCursor.pRun, diRun)) - editor->bCaretAtEnd = TRUE; + * previous paragraph in v1.0 to v3.0 */ } else if ((bSelectedRow || !ME_IsInTable(toCursor.pRun))) { ME_SelectOrInsertNextCell(editor, fromCursor.pRun); } else { -- 2.23.0

1 0

[PATCH 4/5] riched20: Use run and para ptrs in the cursor move lines function.
by Huw Davies Oct. 23, 2020

Oct. 23, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 63 +++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 9676636a64e..bb462b034b7 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1241,13 +1241,17 @@ static void ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs, BOOL extend) { ME_DisplayItem *pRun = pCursor->pRun; - ME_DisplayItem *pOldPara = pCursor->pPara; - ME_DisplayItem *pItem, *pNewPara; + ME_Paragraph *old_para = &pCursor->pPara->member.para, *new_para; + ME_DisplayItem *pItem; int x = ME_GetXForArrow(editor, pCursor); if (editor->bCaretAtEnd && !pCursor->nOffset) - if (!ME_PrevRun(&pOldPara, &pRun, TRUE)) - return; + { + ME_Run *prev = run_prev_all_paras( &pRun->member.run ); + if (!prev) return; + pRun = run_get_di( prev ); + old_para = prev->para; + } if (nRelOfs == -1) { @@ -1262,25 +1266,23 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs, BOOL ME_SetCursorToStart(editor, pCursor); return; } - pNewPara = ME_GetParagraph(pItem); - if (pOldPara->member.para.nFlags & MEPF_ROWEND || - (pOldPara->member.para.pCell && - pOldPara->member.para.pCell != pNewPara->member.para.pCell)) + new_para = &ME_GetParagraph(pItem)->member.para; + if (old_para->nFlags & MEPF_ROWEND || + (para_cell( old_para ) && para_cell( old_para ) != para_cell( new_para ))) { /* Brought out of a cell */ - pNewPara = table_row_start( &pOldPara->member.para )->prev_para; - if (pNewPara->type == diTextStart) - return; /* At the top, so don't go anywhere. */ - pItem = ME_FindItemFwd(pNewPara, diStartRow); + new_para = para_prev( table_row_start( old_para )); + if (!new_para) return; /* At the top, so don't go anywhere. */ + pItem = ME_FindItemFwd( para_get_di( new_para ), diStartRow); } - if (pNewPara->member.para.nFlags & MEPF_ROWEND) + if (new_para->nFlags & MEPF_ROWEND) { /* Brought into a table row */ - ME_Cell *cell = &ME_FindItemBack(pNewPara, diCell)->member.cell; - while (x < cell->pt.x && cell->prev_cell) - cell = &cell->prev_cell->member.cell; - if (cell->next_cell) /* else - we are still at the end of the row */ - pItem = ME_FindItemBack(cell->next_cell, diStartRow); + ME_Cell *cell = table_row_end_cell( new_para ); + while (x < cell->pt.x && cell_prev( cell )) + cell = cell_prev( cell ); + if (cell_next( cell )) /* else - we are still at the end of the row */ + pItem = ME_FindItemBack( cell_get_di( cell_next( cell ) ), diStartRow ); } } else @@ -1293,25 +1295,22 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs, BOOL ME_SetCursorToEnd(editor, pCursor, TRUE); return; } - pNewPara = ME_GetParagraph(pItem); - if (pOldPara->member.para.nFlags & MEPF_ROWSTART || - (pOldPara->member.para.pCell && - pOldPara->member.para.pCell != pNewPara->member.para.pCell)) + new_para = &ME_GetParagraph(pItem)->member.para; + if (old_para->nFlags & MEPF_ROWSTART || + (para_cell( old_para ) && para_cell( old_para ) != para_cell( new_para ))) { /* Brought out of a cell */ - pNewPara = table_row_end( &pOldPara->member.para )->next_para; - if (pNewPara->type == diTextEnd) - return; /* At the bottom, so don't go anywhere. */ - pItem = ME_FindItemFwd(pNewPara, diStartRow); + new_para = para_next( table_row_end( old_para ) ); + if (!para_next( new_para )) return; /* At the bottom, so don't go anywhere. */ + pItem = ME_FindItemFwd( para_get_di( new_para ), diStartRow ); } - if (pNewPara->member.para.nFlags & MEPF_ROWSTART) + if (new_para->nFlags & MEPF_ROWSTART) { /* Brought into a table row */ - ME_DisplayItem *cell = ME_FindItemFwd(pNewPara, diCell); - while (cell->member.cell.next_cell && - x >= cell->member.cell.next_cell->member.cell.pt.x) - cell = cell->member.cell.next_cell; - pItem = ME_FindItemFwd(cell, diStartRow); + ME_Cell *cell = table_row_first_cell( new_para ); + while (cell_next( cell ) && x >= cell_next( cell )->pt.x) + cell = cell_next( cell ); + pItem = ME_FindItemFwd( cell_get_di( cell ), diStartRow ); } } if (!pItem) -- 2.23.0

1 0

[PATCH 3/5] riched20: Use cell ptrs in the table position to offset function.
by Huw Davies Oct. 23, 2020

Oct. 23, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 5d49d11bd3b..9676636a64e 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -880,21 +880,21 @@ int ME_GetCursorOfs(const ME_Cursor *cursor) /* Helper function for ME_FindPixelPos to find paragraph within tables */ static ME_Paragraph *pixel_pos_in_table_row( int x, int y, ME_Paragraph *para ) { - ME_DisplayItem *cell, *next_cell; + ME_Cell *cell, *next_cell; assert( para->nFlags & MEPF_ROWSTART ); - cell = para_next( para )->pCell; - assert(cell); + cell = table_row_first_cell( para ); + assert( cell ); /* find the cell we are in */ - while ((next_cell = cell->member.cell.next_cell) != NULL) + while ((next_cell = cell_next( cell )) != NULL) { - if (x < next_cell->member.cell.pt.x) + if (x < next_cell->pt.x) { - para = &ME_FindItemFwd( cell, diParagraph )->member.para; + para = cell_first_para( cell ); /* Found the cell, but there might be multiple paragraphs in * the cell, so need to search down the cell for the paragraph. */ - while (cell == para->pCell) + while (cell == para_cell( para )) { if (y < para->pt.y + para->nHeight) { -- 2.23.0

1 0

[PATCH 2/5] riched20: Use cell ptrs in the wrapping functions.
by Huw Davies Oct. 23, 2020

Oct. 23, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/wrap.c | 105 +++++++++++++++++++++---------------------- 1 file changed, 51 insertions(+), 54 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 4f6eb82cea7..046a7fd5423 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -185,6 +185,8 @@ static ME_DisplayItem *ME_MakeRow(int height, int baseline, int width) static void ME_BeginRow(ME_WrapContext *wc) { + ME_Cell *cell; + wc->pRowStart = NULL; wc->bOverflown = FALSE; wc->pLastSplittableRun = NULL; @@ -195,19 +197,18 @@ static void ME_BeginRow(ME_WrapContext *wc) wc->bWordWrap = FALSE; if (wc->para->nFlags & MEPF_ROWEND) { - ME_Cell *cell = &ME_FindItemBack( para_get_di( wc->para ), diCell)->member.cell; + cell = table_row_end_cell( wc->para ); cell->nWidth = 0; } } - else if (wc->para->pCell) + else if (para_cell( wc->para )) { - ME_Cell *cell = &wc->para->pCell->member.cell; int width; + cell = para_cell( wc->para ); width = cell->nRightBoundary; - if (cell->prev_cell) - width -= cell->prev_cell->member.cell.nRightBoundary; - if (!cell->prev_cell) + if (cell_prev( cell )) width -= cell_prev( cell )->nRightBoundary; + else { int rowIndent = table_row_end( wc->para )->fmt.dxStartIndent; width -= rowIndent; @@ -217,13 +218,14 @@ static void ME_BeginRow(ME_WrapContext *wc) wc->nAvailWidth = cell->nWidth - (wc->nRow ? wc->nLeftMargin : wc->nFirstMargin) - wc->nRightMargin; wc->bWordWrap = TRUE; - } else { + } + else wc->nAvailWidth = wc->context->nAvailWidth - (wc->nRow ? wc->nLeftMargin : wc->nFirstMargin) - wc->nRightMargin; - } + wc->pt.x = wc->context->pt.x; if (wc->context->editor->bEmulateVersion10 && /* v1.0 - 3.0 */ - wc->para->fmt.dwMask & PFM_TABLE && wc->para->fmt.wEffects & PFE_TABLE) + para_in_table( wc->para )) /* Shift the text down because of the border. */ wc->pt.y++; } @@ -843,7 +845,7 @@ static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Parag else { int dxStartIndent = para->fmt.dxStartIndent; - if (para->pCell) dxStartIndent += table_row_end( para )->fmt.dxOffset; + if (para_cell( wc.para )) dxStartIndent += table_row_end( para )->fmt.dxOffset; wc.nLeftMargin = ME_twips2pointsX( c, dxStartIndent + para->fmt.dxOffset ); wc.nFirstMargin = ME_twips2pointsX( c, dxStartIndent ); @@ -916,33 +918,36 @@ static void update_repaint( ME_Paragraph *para, struct repaint_range *repaint ) static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_range *repaint ) { + ME_Cell *cell; + if (para->nFlags & MEPF_ROWSTART) { - ME_DisplayItem *cell = ME_FindItemFwd( para_get_di( para ), diCell); ME_Paragraph *end_row_para = table_row_end( para ); int borderWidth = 0; - cell->member.cell.pt = c->pt; + + cell = table_row_first_cell( para ); + cell->pt = c->pt; /* Offset the text by the largest top border width. */ - while (cell->member.cell.next_cell) + while (cell_next( cell )) { - borderWidth = max(borderWidth, cell->member.cell.border.top.width); - cell = cell->member.cell.next_cell; + borderWidth = max( borderWidth, cell->border.top.width ); + cell = cell_next( cell ); } if (borderWidth > 0) { borderWidth = max(ME_twips2pointsY(c, borderWidth), 1); while (cell) { - cell->member.cell.yTextOffset = borderWidth; - cell = cell->member.cell.prev_cell; + cell->yTextOffset = borderWidth; + cell = cell_prev( cell ); } c->pt.y += borderWidth; } if (end_row_para->fmt.dxStartIndent > 0) { - cell = ME_FindItemFwd( para_get_di( para ), diCell); - cell->member.cell.pt.x += ME_twips2pointsX( c, end_row_para->fmt.dxStartIndent ); - c->pt.x = cell->member.cell.pt.x; + cell = table_row_first_cell( para ); + cell->pt.x += ME_twips2pointsX( c, end_row_para->fmt.dxStartIndent ); + c->pt.x = cell->pt.x; } } else if (para->nFlags & MEPF_ROWEND) @@ -950,74 +955,66 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran /* Set all the cells to the height of the largest cell */ ME_Paragraph *start_row_para = table_row_start( para ); int prevHeight, nHeight, bottomBorder = 0; - ME_DisplayItem *cell = ME_FindItemBack( para_get_di( para ), diCell ); - para->nWidth = cell->member.cell.pt.x + cell->member.cell.nWidth; + + cell = table_row_end_cell( para ); + para->nWidth = cell->pt.x + cell->nWidth; if (!(para_next( para )->nFlags & MEPF_ROWSTART)) { /* Last row, the bottom border is added to the height. */ - cell = cell->member.cell.prev_cell; - while (cell) - { - bottomBorder = max(bottomBorder, cell->member.cell.border.bottom.width); - cell = cell->member.cell.prev_cell; - } + while ((cell = cell_prev( cell ))) + bottomBorder = max( bottomBorder, cell->border.bottom.width ); + bottomBorder = ME_twips2pointsY(c, bottomBorder); - cell = ME_FindItemBack( para_get_di( para ), diCell ); + cell = table_row_end_cell( para ); } - prevHeight = cell->member.cell.nHeight; - nHeight = cell->member.cell.prev_cell->member.cell.nHeight + bottomBorder; - cell->member.cell.nHeight = nHeight; + prevHeight = cell->nHeight; + nHeight = cell_prev( cell )->nHeight + bottomBorder; + cell->nHeight = nHeight; para->nHeight = nHeight; - cell = cell->member.cell.prev_cell; - cell->member.cell.nHeight = nHeight; - while (cell->member.cell.prev_cell) + while (cell_prev( cell )) { - cell = cell->member.cell.prev_cell; - cell->member.cell.nHeight = nHeight; + cell = cell_prev( cell ); + cell->nHeight = nHeight; } + /* Also set the height of the start row paragraph */ start_row_para->nHeight = nHeight; c->pt.x = start_row_para->pt.x; - c->pt.y = cell->member.cell.pt.y + nHeight; + c->pt.y = cell->pt.y + nHeight; if (prevHeight < nHeight) { /* The height of the cells has grown, so invalidate the bottom of * the cells. */ update_repaint( para, repaint ); - cell = ME_FindItemBack( para_get_di( para ), diCell ); + cell = cell_prev( table_row_end_cell( para ) ); while (cell) { - update_repaint( &ME_FindItemBack(cell, diParagraph)->member.para, repaint ); - cell = cell->member.cell.prev_cell; + update_repaint( cell_end_para( cell ), repaint ); + cell = cell_prev( cell ); } } } - else if (para->pCell && para->pCell != para_next( para )->pCell) + else if ((cell = para_cell( para )) && para == cell_end_para( cell )) { /* The next paragraph is in the next cell in the table row. */ - ME_Cell *cell = &para->pCell->member.cell; cell->nHeight = c->pt.y + para->nHeight - cell->pt.y; /* Propagate the largest height to the end so that it can be easily * sent back to all the cells at the end of the row. */ - if (cell->prev_cell) - cell->nHeight = max(cell->nHeight, cell->prev_cell->member.cell.nHeight); + if (cell_prev( cell )) + cell->nHeight = max( cell->nHeight, cell_prev( cell )->nHeight ); c->pt.x = cell->pt.x + cell->nWidth; c->pt.y = cell->pt.y; - cell->next_cell->member.cell.pt = c->pt; - if (!(para->next_para->member.para.nFlags & MEPF_ROWEND)) + cell_next( cell )->pt = c->pt; + if (!(para_next( para )->nFlags & MEPF_ROWEND)) c->pt.y += cell->yTextOffset; } else { - if (para->pCell) - { - /* Next paragraph in the same cell. */ - c->pt.x = para->pCell->member.cell.pt.x; - } - else - /* Normal paragraph */ + if ((cell = para_cell( para ))) /* Next paragraph in the same cell. */ + c->pt.x = cell->pt.x; + else /* Normal paragraph */ c->pt.x = 0; c->pt.y += para->nHeight; } -- 2.23.0

1 0

[PATCH 1/5] riched20: Use cell and para ptrs in the table border drawing function.
by Huw Davies Oct. 23, 2020

Oct. 23, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/paint.c | 84 ++++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 30c0d7f57fd..42f370c857c 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -689,30 +689,31 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT } } -static void ME_DrawTableBorders( ME_Context *c, ME_Paragraph *para ) +static void draw_table_borders( ME_Context *c, ME_Paragraph *para ) { if (!c->editor->bEmulateVersion10) /* v4.1 */ { - if (para->pCell) + if (para_cell( para )) { RECT rc; - ME_Cell *cell = &para->pCell->member.cell; - ME_DisplayItem *paraAfterRow; + ME_Cell *cell = para_cell( para ); + ME_Paragraph *after_row; HPEN pen, oldPen; LOGBRUSH logBrush; HBRUSH brush; COLORREF color; POINT oldPt; int width; - BOOL atTop = (para->pCell != para->prev_para->member.para.pCell); - BOOL atBottom = (para->pCell != para->next_para->member.para.pCell); + BOOL atTop = (para == cell_first_para( cell )); + BOOL atBottom = (para == cell_end_para( cell )); int top = c->pt.y + (atTop ? cell->pt.y : para->pt.y); int bottom = (atBottom ? c->pt.y + cell->pt.y + cell->nHeight : top + para->nHeight + (atTop ? cell->yTextOffset : 0)); rc.left = c->pt.x + cell->pt.x; rc.right = rc.left + cell->nWidth; - if (atTop) { + if (atTop) + { /* Erase gap before text if not all borders are the same height. */ width = max(ME_twips2pointsY(c, cell->border.top.width), 1); rc.top = top + width; @@ -725,14 +726,17 @@ static void ME_DrawTableBorders( ME_Context *c, ME_Paragraph *para ) * The order borders are draw in is left, top, bottom, right in order * to be consistent with native richedit. This is noticeable from the * overlap of borders of different colours. */ - if (!(para->nFlags & MEPF_ROWEND)) { + if (!(para->nFlags & MEPF_ROWEND)) + { rc.top = top; rc.bottom = bottom; if (cell->border.left.width > 0) { color = cell->border.left.colorRef; width = max(ME_twips2pointsX(c, cell->border.left.width), 1); - } else { + } + else + { color = RGB(192,192,192); width = 1; } @@ -749,12 +753,15 @@ static void ME_DrawTableBorders( ME_Context *c, ME_Paragraph *para ) MoveToEx(c->hDC, oldPt.x, oldPt.y, NULL); } - if (atTop) { + if (atTop) + { if (cell->border.top.width > 0) { brush = CreateSolidBrush(cell->border.top.colorRef); width = max(ME_twips2pointsY(c, cell->border.top.width), 1); - } else { + } + else + { brush = GetStockObject(LTGRAY_BRUSH); width = 1; } @@ -767,29 +774,24 @@ static void ME_DrawTableBorders( ME_Context *c, ME_Paragraph *para ) /* Draw the bottom border if at the last paragraph in the cell, and when * in the last row of the table. */ - if (atBottom) { + if (atBottom) + { int oldLeft = rc.left; width = max(ME_twips2pointsY(c, cell->border.bottom.width), 1); - paraAfterRow = table_row_end( para )->next_para; - if (paraAfterRow->member.para.nFlags & MEPF_ROWSTART) { - ME_DisplayItem *nextEndCell; - nextEndCell = ME_FindItemBack( para_get_di( table_row_end( &paraAfterRow->member.para ) ), diCell ); - assert(nextEndCell && !nextEndCell->member.cell.next_cell); - rc.left = c->pt.x + nextEndCell->member.cell.pt.x; - /* FIXME: Native draws FROM the bottom of the table rather than - * TO the bottom of the table in this case, but just doing so here - * will cause the next row to erase the border. */ - /* - rc.top = bottom; - rc.bottom = rc.top + width; - */ + after_row = para_next( table_row_end( para ) ); + if (after_row->nFlags & MEPF_ROWSTART) + { + ME_Cell *next_end; + next_end = table_row_end_cell( after_row ); + assert( next_end && !cell_next( next_end ) ); + rc.left = c->pt.x + next_end->pt.x; } - if (rc.left < rc.right) { - if (cell->border.bottom.width > 0) { + if (rc.left < rc.right) + { + if (cell->border.bottom.width > 0) brush = CreateSolidBrush(cell->border.bottom.colorRef); - } else { + else brush = GetStockObject(LTGRAY_BRUSH); - } rc.bottom = bottom; rc.top = rc.bottom - width; FillRect(c->hDC, &rc, brush); @@ -800,15 +802,17 @@ static void ME_DrawTableBorders( ME_Context *c, ME_Paragraph *para ) } /* Right border only drawn if at the end of the table row. */ - if (!cell->next_cell->member.cell.next_cell && - !(para->nFlags & MEPF_ROWSTART)) + if (!cell_next( cell_next( cell ) ) && !(para->nFlags & MEPF_ROWSTART)) { rc.top = top; rc.bottom = bottom; - if (cell->border.right.width > 0) { + if (cell->border.right.width > 0) + { color = cell->border.right.colorRef; width = max(ME_twips2pointsX(c, cell->border.right.width), 1); - } else { + } + else + { color = RGB(192,192,192); width = 1; } @@ -825,13 +829,15 @@ static void ME_DrawTableBorders( ME_Context *c, ME_Paragraph *para ) MoveToEx(c->hDC, oldPt.x, oldPt.y, NULL); } } - } else { /* v1.0 - 3.0 */ + } + else /* v1.0 - 3.0 */ + { /* Draw simple table border */ - if (para->fmt.dwMask & PFM_TABLE && para->fmt.wEffects & PFE_TABLE) { + if (para_in_table( para )) + { HPEN pen = NULL, oldpen = NULL; int i, firstX, startX, endX, rowY, rowBottom, nHeight; POINT oldPt; - PARAFORMAT2 *pNextFmt; pen = CreatePen(PS_SOLID, 0, para->border.top.colorRef); oldpen = SelectObject(c->hDC, pen); @@ -853,11 +859,9 @@ static void ME_DrawTableBorders( ME_Context *c, ME_Paragraph *para ) i = para->fmt.cTabCount - 1; endX = startX + ME_twips2pointsX(c, para->fmt.rgxTabs[i] & 0x00ffffff) + 1; LineTo(c->hDC, endX, rowY); - pNextFmt = &para->next_para->member.para.fmt; /* The bottom of the row only needs to be drawn if the next row is * not a table. */ - if (!(pNextFmt && pNextFmt->dwMask & PFM_TABLE && pNextFmt->wEffects && - para->nRows == 1)) + if (!(para_next( para ) && para_in_table( para_next( para ) ) && para->nRows == 1)) { /* Decrement rowBottom to draw the bottom line within the row, and * to not draw over this line when drawing the vertical lines. */ @@ -1026,7 +1030,7 @@ static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) no++; } - ME_DrawTableBorders( c, para ); + draw_table_borders( c, para ); draw_para_number( c, para ); SetTextAlign(c->hDC, align); -- 2.23.0

1 0

[PATCH] inetcomm/tests: Use wide-char string literals.
by Michael Stefaniuc Oct. 23, 2020

Oct. 23, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetcomm/internettransport.c | 2 +- dlls/inetcomm/tests/mimeintl.c | 2 +- dlls/inetcomm/tests/mimeole.c | 10 ++++------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/inetcomm/internettransport.c b/dlls/inetcomm/internettransport.c index dcce0d9df17..f7060abe9e7 100644 --- a/dlls/inetcomm/internettransport.c +++ b/dlls/inetcomm/internettransport.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); -static const WCHAR wszClassName[] = {'T','h','o','r','C','o','n','n','W','n','d','C','l','a','s','s',0}; +static const WCHAR wszClassName[] = L"ThorConnWndClass"; #define IX_READ (WM_USER + 0) #define IX_READLINE (WM_USER + 1) diff --git a/dlls/inetcomm/tests/mimeintl.c b/dlls/inetcomm/tests/mimeintl.c index 09f9dae8d8c..11ec68d3223 100644 --- a/dlls/inetcomm/tests/mimeintl.c +++ b/dlls/inetcomm/tests/mimeintl.c @@ -235,7 +235,7 @@ static void test_convert(void) ULONG read; PROPVARIANT prop_in, prop_out; static char test_string[] = "test string"; - static WCHAR test_stringW[] = {'t','e','s','t',' ','s','t','r','i','n','g',0}; + static WCHAR test_stringW[] = L"test string"; hr = MimeOleGetInternat(&internat); ok(hr == S_OK, "ret %08x\n", hr); diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index afd25af015c..04edd3773fd 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -826,7 +826,6 @@ static void test_mhtml_message(void) static void test_MessageSetProp(void) { static const char topic[] = "wine topic"; - static const WCHAR topicW[] = {'w','i','n','e',' ','t','o','p','i','c',0}; HRESULT hr; IMimeMessage *msg; IMimeBody *body; @@ -906,7 +905,7 @@ static void test_MessageSetProp(void) if(hr == S_OK) { ok(prop.vt == VT_LPWSTR, "type %d\n", prop.vt); - ok(!lstrcmpW(prop.u.pwszVal, topicW), "got %s\n", wine_dbgstr_w(prop.u.pwszVal)); + ok(!lstrcmpW(prop.u.pwszVal, L"wine topic"), "got %s\n", wine_dbgstr_w(prop.u.pwszVal)); PropVariantClear(&prop); } @@ -1488,8 +1487,6 @@ static void test_mhtml_protocol_info(void) unsigned i, exlen; HRESULT hres; - static const WCHAR http_url[] = {'h','t','t','p',':','/','/','t','e','s','t','.','o','r','g',0}; - hres = CoCreateInstance(&CLSID_IMimeHtmlProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocolInfo, (void**)&protocol_info); ok(hres == S_OK, "Could not create protocol info: %08x\n", hres); @@ -1516,8 +1513,9 @@ static void test_mhtml_protocol_info(void) } } - hres = IInternetProtocolInfo_CombineUrl(protocol_info, http_url, http_url, ICU_BROWSER_MODE, - combined_url, ARRAY_SIZE(combined_url), &combined_len, 0); + hres = IInternetProtocolInfo_CombineUrl(protocol_info, L"http://test.org", L"http://test.org", + ICU_BROWSER_MODE, combined_url, ARRAY_SIZE(combined_url), + &combined_len, 0); ok(hres == E_FAIL, "CombineUrl failed: %08x\n", hres); IInternetProtocolInfo_Release(protocol_info); -- 2.25.4

1 0

[PATCH] inetcomm: Zero terminate the mhtml WCHAR strings
by Michael Stefaniuc Oct. 23, 2020

Oct. 23, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetcomm/mimeole.c | 8 +++----- dlls/inetcomm/protocol.c | 26 +++++++++++++------------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index eda9a911bbf..74c5c670d15 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -3697,8 +3697,6 @@ HRESULT WINAPI MimeOleObjectFromMoniker(BINDF bindf, IMoniker *moniker, IBindCtx size_t len; HRESULT hres; - static const WCHAR mhtml_prefixW[] = {'m','h','t','m','l',':'}; - WARN("(0x%08x, %p, %p, %s, %p, %p) semi-stub\n", bindf, moniker, binding, debugstr_guid(riid), out, moniker_new); if(!IsEqualGUID(&IID_IUnknown, riid)) { @@ -3713,12 +3711,12 @@ HRESULT WINAPI MimeOleObjectFromMoniker(BINDF bindf, IMoniker *moniker, IBindCtx TRACE("display name %s\n", debugstr_w(display_name)); len = lstrlenW(display_name); - mhtml_url = heap_alloc((len+1)*sizeof(WCHAR) + sizeof(mhtml_prefixW)); + mhtml_url = heap_alloc(len*sizeof(WCHAR) + sizeof(L"mhtml:")); if(!mhtml_url) return E_OUTOFMEMORY; - memcpy(mhtml_url, mhtml_prefixW, sizeof(mhtml_prefixW)); - lstrcpyW(mhtml_url + ARRAY_SIZE(mhtml_prefixW), display_name); + lstrcpyW(mhtml_url, L"mhtml:"); + lstrcatW(mhtml_url, display_name); HeapFree(GetProcessHeap(), 0, display_name); hres = CreateURLMoniker(NULL, mhtml_url, moniker_new); diff --git a/dlls/inetcomm/protocol.c b/dlls/inetcomm/protocol.c index e50e5a625c3..2751012e0e6 100644 --- a/dlls/inetcomm/protocol.c +++ b/dlls/inetcomm/protocol.c @@ -59,8 +59,8 @@ typedef struct { WCHAR url[1]; } MimeHtmlBinding; -static const WCHAR mhtml_prefixW[] = {'m','h','t','m','l',':'}; -static const WCHAR mhtml_separatorW[] = {'!','x','-','u','s','c',':'}; +static const WCHAR mhtml_prefixW[] = L"mhtml:"; +static const WCHAR mhtml_separatorW[] = L"!x-usc:"; static inline LPWSTR heap_strdupW(LPCWSTR str) { @@ -82,16 +82,16 @@ static HRESULT parse_mhtml_url(const WCHAR *url, mhtml_url_t *r) { const WCHAR *p; - if(wcsnicmp(url, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) + if(wcsnicmp(url, mhtml_prefixW, lstrlenW(mhtml_prefixW))) return E_FAIL; - r->mhtml = url + ARRAY_SIZE(mhtml_prefixW); + r->mhtml = url + lstrlenW(mhtml_prefixW); p = wcschr(r->mhtml, '!'); if(p) { r->mhtml_len = p - r->mhtml; /* FIXME: We handle '!' and '!x-usc:' in URLs as the same thing. Those should not be the same. */ - if(!wcsncmp(p, mhtml_separatorW, ARRAY_SIZE(mhtml_separatorW))) - p += ARRAY_SIZE(mhtml_separatorW); + if(!wcsncmp(p, mhtml_separatorW, lstrlenW(mhtml_separatorW))) + p += lstrlenW(mhtml_separatorW); else p++; }else { @@ -656,7 +656,7 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa DWORD cchResult, DWORD* pcchResult, DWORD dwReserved) { MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); - size_t len = ARRAY_SIZE(mhtml_prefixW); + size_t len = lstrlenW(mhtml_prefixW); mhtml_url_t url; WCHAR *p; HRESULT hres; @@ -669,26 +669,26 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa if(FAILED(hres)) return hres; - if(!wcsnicmp(pwzRelativeUrl, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) { + if(!wcsnicmp(pwzRelativeUrl, mhtml_prefixW, len)) { FIXME("Relative URL is mhtml protocol\n"); return INET_E_USE_DEFAULT_PROTOCOLHANDLER; } len += url.mhtml_len; if(*pwzRelativeUrl) - len += lstrlenW(pwzRelativeUrl) + ARRAY_SIZE(mhtml_separatorW); + len += lstrlenW(pwzRelativeUrl) + lstrlenW(mhtml_separatorW); if(len >= cchResult) { *pcchResult = 0; return E_FAIL; } - memcpy(pwzResult, mhtml_prefixW, sizeof(mhtml_prefixW)); - p = pwzResult + ARRAY_SIZE(mhtml_prefixW); + lstrcpyW(pwzResult, mhtml_prefixW); + p = pwzResult + lstrlenW(mhtml_prefixW); memcpy(p, url.mhtml, url.mhtml_len*sizeof(WCHAR)); p += url.mhtml_len; if(*pwzRelativeUrl) { - memcpy(p, mhtml_separatorW, sizeof(mhtml_separatorW)); - p += ARRAY_SIZE(mhtml_separatorW); + lstrcpyW(p, mhtml_separatorW); + p += lstrlenW(mhtml_separatorW); lstrcpyW(p, pwzRelativeUrl); }else { *p = 0; -- 2.25.4

1 0

[PATCH] wbemprox: Implement IWbemClassObject::GetMethodQualifierSet.
by Hans Leidekker Oct. 23, 2020

Oct. 23, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/class.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index e048fb3db82..d24d8cbb5ca 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -971,8 +971,11 @@ static HRESULT WINAPI class_object_GetMethodQualifierSet( LPCWSTR wszMethod, IWbemQualifierSet **ppQualSet) { - FIXME("%p, %s, %p\n", iface, debugstr_w(wszMethod), ppQualSet); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + + TRACE("%p, %s, %p\n", iface, debugstr_w(wszMethod), ppQualSet); + + return WbemQualifierSet_create( co->name, wszMethod, (void **)ppQualSet ); } static HRESULT WINAPI class_object_GetMethodOrigin( -- 2.28.0

1 0