October 2020 - Wine-commits

Aaron Hill : qmgr/tests: Fix issues with handling of transient errors.
by Alexandre Julliard 27 Oct '20

27 Oct '20

Module: wine Branch: master Commit: 2538077463e3be922fc6de576409bee09a9d5de1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2538077463e3be922fc6de57… Author: Aaron Hill <aa1ronham(a)gmail.com> Date: Sun Oct 25 23:51:25 2020 -0400 qmgr/tests: Fix issues with handling of transient errors. When a BITS job is being transferred, it may enter into the state BG_JOB_STATE_TRANSIENT_ERROR (for example, if the hostname fails to resolve). Currently, entering this state causes qmgr job tests to fail, even though it may occur due to temporary network issues out of our control. If a job enters BG_JOB_STATE_TRANSIENT_ERROR before the timeout has elapsed, attempt to resume the job using IBackgroundCopyJob_Resume. If the job is still in BG_JOB_STATE_TRANSIENT_ERROR, query BITS for detailed error information, and print it out. Additionally, ensure that we are able to transfer files on Windows 10 with a metered connection. By default, BITS will not attempt to transfer a job on a metered connection, instead failing with BG_JOB_STATE_TRANSIENT_ERROR. On newer versions of Windows, we can use IBackgroundCopyJob5 to set the transfer policy, forcing the job to run even on a metered connection. This allows qmgr job tests to pass on the testbot Windows 10 VMs, which have metered connections enabled in order to disable Windows Update. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50048 Signed-off-by: Aaron Hill <aa1ronham(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/qmgr_local.idl | 1 + dlls/qmgr/tests/job.c | 116 +++++++++++++++++++++++++++++++++++++++++++++-- include/Makefile.in | 1 + include/bits5_0.idl | 59 ++++++++++++++++++++++++ 4 files changed, 173 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2538077463e3be922fc6…

1 0

Aaron Hill : qmgr/tests: Test registering an IBackgroundCopyCallback2.
by Alexandre Julliard 27 Oct '20

27 Oct '20

Module: wine Branch: master Commit: 2148167f2557cc6c7d1e2f5ffef28bd936503a9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2148167f2557cc6c7d1e2f5f… Author: Aaron Hill <aa1ronham(a)gmail.com> Date: Thu Oct 15 20:38:00 2020 -0400 qmgr/tests: Test registering an IBackgroundCopyCallback2. Signed-off-by: Aaron Hill <aa1ronham(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/tests/Makefile.in | 2 +- dlls/qmgr/tests/job.c | 137 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+), 1 deletion(-) diff --git a/dlls/qmgr/tests/Makefile.in b/dlls/qmgr/tests/Makefile.in index 6482d4d9b7a..2bf92a94019 100644 --- a/dlls/qmgr/tests/Makefile.in +++ b/dlls/qmgr/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = qmgr.dll -IMPORTS = ole32 shlwapi user32 +IMPORTS = uuid ole32 shlwapi user32 C_SRCS = \ enum_files.c \ diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 3e1aad1b26b..71da89facad 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -39,6 +39,123 @@ static IBackgroundCopyJob *test_job; static GUID test_jobId; static BG_JOB_TYPE test_type; +typedef struct IBackgroundCopyCallback2Impl { + IBackgroundCopyCallback2 IBackgroundCopyCallback2_iface; + LONG ref; +} IBackgroundCopyCallback2Impl; + +static inline IBackgroundCopyCallback2Impl *impl_from_IBackgroundCopyCallback2(IBackgroundCopyCallback2 *iface) +{ + return CONTAINING_RECORD(iface, IBackgroundCopyCallback2Impl, IBackgroundCopyCallback2_iface); +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_QueryInterface(IBackgroundCopyCallback2 *iface, REFIID riid, void **ppv) +{ + IBackgroundCopyCallback2Impl *This = impl_from_IBackgroundCopyCallback2(iface); + + if (!ppv) + { + return E_INVALIDARG; + } + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IBackgroundCopyCallback) || + IsEqualIID(riid, &IID_IBackgroundCopyCallback2)) + { + *ppv = &This->IBackgroundCopyCallback2_iface; + } + else + { + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI IBackgroundCopyCallback2Impl_AddRef(IBackgroundCopyCallback2 *iface) +{ + IBackgroundCopyCallback2Impl *This = impl_from_IBackgroundCopyCallback2(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + trace("IBackgroundCopyCallback2Impl_AddRef called (%p, ref = %d)\n", This, ref); + return ref; +} + +static ULONG WINAPI IBackgroundCopyCallback2Impl_Release(IBackgroundCopyCallback2 *iface) +{ + IBackgroundCopyCallback2Impl *This = impl_from_IBackgroundCopyCallback2(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + trace("IBackgroundCopyCallback2Impl_Release called (%p, ref = %d)\n", This, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_JobError(IBackgroundCopyCallback2 *iface, IBackgroundCopyJob *pJob, IBackgroundCopyError *pError) +{ + trace("IBackgroundCopyCallback2Impl_JobError called (%p, %p, %p)\n", iface, pJob, pError); + return S_OK; +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_JobModification(IBackgroundCopyCallback2 *iface, IBackgroundCopyJob *pJob, DWORD dwReserved) +{ + trace("IBackgroundCopyCallback2Impl_JobModification called (%p, %p)\n", iface, pJob); + return S_OK; +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_JobTransferred(IBackgroundCopyCallback2 *iface, IBackgroundCopyJob *pJob) +{ + trace("IBackgroundCopyCallback2Impl_JobTransferred called (%p, %p)\n", iface, pJob); + return S_OK; +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_FileTransferred(IBackgroundCopyCallback2 *iface, IBackgroundCopyJob *pJob, IBackgroundCopyFile *pFile) +{ + trace("IBackgroundCopyCallback2Impl_FileTransferred called (%p, %p, %p)\n", iface, pJob, pFile); + return S_OK; +} + + +static const IBackgroundCopyCallback2Vtbl copyCallback_vtbl = +{ + IBackgroundCopyCallback2Impl_QueryInterface, + IBackgroundCopyCallback2Impl_AddRef, + IBackgroundCopyCallback2Impl_Release, + IBackgroundCopyCallback2Impl_JobTransferred, + IBackgroundCopyCallback2Impl_JobError, + IBackgroundCopyCallback2Impl_JobModification, + IBackgroundCopyCallback2Impl_FileTransferred +}; + +static BOOL create_background_copy_callback2(IBackgroundCopyCallback2 **copyCallback) +{ + IBackgroundCopyCallback2Impl *obj; + *copyCallback = NULL; + + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)); + + if (!obj) + { + trace("Out of memory creating IBackgroundCopyCallback2\n"); + return FALSE; + } + + obj->IBackgroundCopyCallback2_iface.lpVtbl = &copyCallback_vtbl; + obj->ref = 1; + + *copyCallback = &obj->IBackgroundCopyCallback2_iface; + + return TRUE; +} + static HRESULT test_create_manager(void) { HRESULT hres; @@ -592,6 +709,20 @@ static void test_HttpOptions(void) unsigned int i; WCHAR *headers; ULONG flags, orig_flags; + IBackgroundCopyCallback2 *copyCallback; + IUnknown *copyCallbackUnknown; + + ok(create_background_copy_callback2(&copyCallback) == TRUE, "create_background_copy_callback2 failed\n"); + + hr = IBackgroundCopyCallback2_QueryInterface(copyCallback, &IID_IUnknown, (LPVOID*)&copyCallbackUnknown); + ok(hr == S_OK,"IBackgroundCopyCallback_QueryInterface(IID_IUnknown) failed: %08x\n", hr); + + hr = IBackgroundCopyJob_SetNotifyInterface(test_job, copyCallbackUnknown); + ok(hr == S_OK,"IBackgroundCopyCallback_SetNotifyInterface failed: %08x\n", hr); + + hr = IBackgroundCopyJob_SetNotifyFlags(test_job, BG_NOTIFY_JOB_TRANSFERRED | BG_NOTIFY_JOB_ERROR | BG_NOTIFY_DISABLE | BG_NOTIFY_JOB_MODIFICATION | BG_NOTIFY_FILE_TRANSFERRED); + ok(hr == S_OK,"IBackgroundCopyCallback_SetNotifyFlags failed: %08x\n", hr); + DeleteFileW(test_localPathA); hr = IBackgroundCopyJob_AddFile(test_job, L"http://test.winehq.org/", test_localPathA); @@ -710,6 +841,12 @@ static void test_HttpOptions(void) ok(hr == BG_E_INVALID_STATE, "got 0x%08x\n", hr); DeleteFileW(test_localPathA); + + hr = IBackgroundCopyJob_SetNotifyInterface(test_job, NULL); + ok(hr == BG_E_INVALID_STATE, "got 0x%08x\n", hr); + + IUnknown_Release(copyCallbackUnknown); + IBackgroundCopyCallback2_Release(copyCallback); } typedef void (*test_t)(void);

1 0

Zebediah Figura : ntdll: Don't check "info" for NULL in NtQuerySystemInformation(SystemModuleInformation).
by Alexandre Julliard 27 Oct '20

27 Oct '20

Module: wine Branch: master Commit: 6257da8b429e251637d32608f92c934c2e91ad5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6257da8b429e251637d32608… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 26 18:40:06 2020 -0500 ntdll: Don't check "info" for NULL in NtQuerySystemInformation(SystemModuleInformation). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 6ff277c2d0c..7ac084a9899 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2333,30 +2333,27 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, "\\SystemRoot\\system32\\drivers\\mountmgr.sys" }; - if (!info) ret = STATUS_ACCESS_VIOLATION; - else - { - ULONG i; - SYSTEM_MODULE_INFORMATION *smi = info; + ULONG i; + SYSTEM_MODULE_INFORMATION *smi = info; - len = offsetof( SYSTEM_MODULE_INFORMATION, Modules[ARRAY_SIZE(fake_modules)] ); - if (len <= size) + len = offsetof( SYSTEM_MODULE_INFORMATION, Modules[ARRAY_SIZE(fake_modules)] ); + if (len <= size) + { + memset( smi, 0, len ); + for (i = 0; i < ARRAY_SIZE(fake_modules); i++) { - memset( smi, 0, len ); - for (i = 0; i < ARRAY_SIZE(fake_modules); i++) - { - SYSTEM_MODULE *sm = &smi->Modules[i]; - sm->ImageBaseAddress = (char *)0x10000000 + 0x200000 * i; - sm->ImageSize = 0x200000; - sm->LoadOrderIndex = i; - sm->LoadCount = 1; - strcpy( (char *)sm->Name, fake_modules[i] ); - sm->NameOffset = strrchr( fake_modules[i], '\\' ) - fake_modules[i] + 1; - } - smi->ModulesCount = i; + SYSTEM_MODULE *sm = &smi->Modules[i]; + sm->ImageBaseAddress = (char *)0x10000000 + 0x200000 * i; + sm->ImageSize = 0x200000; + sm->LoadOrderIndex = i; + sm->LoadCount = 1; + strcpy( (char *)sm->Name, fake_modules[i] ); + sm->NameOffset = strrchr( fake_modules[i], '\\' ) - fake_modules[i] + 1; } - else ret = STATUS_INFO_LENGTH_MISMATCH; + smi->ModulesCount = i; } + else ret = STATUS_INFO_LENGTH_MISMATCH; + break; }

1 0

Zebediah Figura : ntdll/tests: Add more tests for SystemModuleInformation[Ex].
by Alexandre Julliard 27 Oct '20

27 Oct '20

Module: wine Branch: master Commit: bf9235aa56cb73275c7c76ac3a515fb2d66c943b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf9235aa56cb73275c7c76ac… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 26 18:40:07 2020 -0500 ntdll/tests: Add more tests for SystemModuleInformation[Ex]. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 71 ++++++++++++++++++++++++++++++++++--------------- include/winternl.h | 9 +++++++ 2 files changed, 58 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index b09c57b97a7..6805cfb6a8e 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -469,37 +469,64 @@ static void test_query_procperf(void) static void test_query_module(void) { + const RTL_PROCESS_MODULE_INFORMATION_EX *infoex; + SYSTEM_MODULE_INFORMATION *info; NTSTATUS status; - ULONG ReturnLength; - ULONG ModuleCount, i; + ULONG size, i; + char *buffer; - ULONG SystemInformationLength = sizeof(SYSTEM_MODULE_INFORMATION); - SYSTEM_MODULE_INFORMATION* smi = HeapAlloc(GetProcessHeap(), 0, SystemInformationLength); - SYSTEM_MODULE* sm; + status = pNtQuerySystemInformation(SystemModuleInformation, NULL, 0, &size); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status); + ok(size > 0, "expected nonzero size\n"); - /* Request the needed length */ - status = pNtQuerySystemInformation(SystemModuleInformation, smi, 0, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - ok( ReturnLength > 0, "Expected a ReturnLength to show the needed length\n"); + info = malloc(size); + status = pNtQuerySystemInformation(SystemModuleInformation, info, size, &size); + ok(!status, "got %#x\n", status); - SystemInformationLength = ReturnLength; - smi = HeapReAlloc(GetProcessHeap(), 0, smi , SystemInformationLength); - status = pNtQuerySystemInformation(SystemModuleInformation, smi, SystemInformationLength, &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok(info->ModulesCount > 0, "Expected some modules to be loaded\n"); - ModuleCount = smi->ModulesCount; - sm = &smi->Modules[0]; - /* our implementation is a stub for now */ - ok( ModuleCount > 0, "Expected some modules to be loaded\n"); + for (i = 0; i < info->ModulesCount; i++) + { + const SYSTEM_MODULE *module = &info->Modules[i]; - /* Loop through all the modules/drivers, Wine doesn't get here (yet) */ - for (i = 0; i < ModuleCount ; i++) + ok(module->LoadOrderIndex == i, "%u: got index %u\n", i, module->LoadOrderIndex); + ok(!!module->ImageBaseAddress, "%u: got NULL address\n", i); + ok(module->ImageSize, "%u: got 0 size\n", i); + ok(module->LoadCount, "%u: got 0 load count\n", i); + } + + free(info); + + status = pNtQuerySystemInformation(SystemModuleInformationEx, NULL, 0, &size); + if (status == STATUS_INVALID_INFO_CLASS) { - ok( i == sm->LoadOrderIndex, "LoadOrderIndex (%d) should have matched %u\n", sm->LoadOrderIndex, i); - sm++; + todo_wine win_skip("SystemModuleInformationEx is not supported.\n"); + return; + } + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status); + ok(size > 0, "expected nonzero size\n"); + + buffer = malloc(size); + status = pNtQuerySystemInformation(SystemModuleInformationEx, buffer, size, &size); + ok(!status, "got %#x\n", status); + + infoex = (const void *)buffer; + for (i = 0; infoex->NextOffset; i++) + { + const SYSTEM_MODULE *module = &infoex->BaseInfo; + + ok(module->LoadOrderIndex == i, "%u: got index %u\n", i, module->LoadOrderIndex); + ok(!!module->ImageBaseAddress, "%u: got NULL address\n", i); + ok(module->ImageSize, "%u: got 0 size\n", i); + ok(module->LoadCount, "%u: got 0 load count\n", i); + + infoex = (const void *)((const char *)infoex + infoex->NextOffset); } + ok(((char *)infoex - buffer) + sizeof(infoex->NextOffset) == size, + "got size %u, null terminator %u\n", size, (char *)infoex - buffer); + + free(buffer); - HeapFree( GetProcessHeap(), 0, smi); } static void test_query_handle(void) diff --git a/include/winternl.h b/include/winternl.h index fbce63655ba..bd6a2c35932 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2805,6 +2805,15 @@ typedef struct _SYSTEM_MODULE_INFORMATION #define PROCESS_CREATE_FLAGS_SUSPENDED 0x00000200 #define PROCESS_CREATE_FLAGS_EXTENDED_UNKNOWN 0x00000400 +typedef struct _RTL_PROCESS_MODULE_INFORMATION_EX +{ + USHORT NextOffset; + SYSTEM_MODULE BaseInfo; + ULONG ImageCheckSum; + ULONG TimeDateStamp; + void *DefaultBase; +} RTL_PROCESS_MODULE_INFORMATION_EX; + #define THREAD_CREATE_FLAGS_CREATE_SUSPENDED 0x00000001 #define THREAD_CREATE_FLAGS_SKIP_THREAD_ATTACH 0x00000002 #define THREAD_CREATE_FLAGS_HIDE_FROM_DEBUGGER 0x00000004

1 0

Zebediah Figura : ntdll: Semi-stub SystemModuleInformationEx.
by Alexandre Julliard 27 Oct '20

27 Oct '20

Module: wine Branch: master Commit: ebd92b980a46d0ae5b1c211c7b0028565c9c147d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebd92b980a46d0ae5b1c211c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 26 18:40:08 2020 -0500 ntdll: Semi-stub SystemModuleInformationEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45666 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 2 +- dlls/ntdll/unix/system.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 6805cfb6a8e..70ea7d5146b 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -500,7 +500,7 @@ static void test_query_module(void) status = pNtQuerySystemInformation(SystemModuleInformationEx, NULL, 0, &size); if (status == STATUS_INVALID_INFO_CLASS) { - todo_wine win_skip("SystemModuleInformationEx is not supported.\n"); + win_skip("SystemModuleInformationEx is not supported.\n"); return; } ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status); diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 7ac084a9899..faa7532cfef 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2357,6 +2357,41 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, break; } + case SystemModuleInformationEx: + { + /* FIXME: return some fake info for now */ + static const char *fake_modules[] = + { + "\\SystemRoot\\system32\\ntoskrnl.exe", + "\\SystemRoot\\system32\\hal.dll", + "\\SystemRoot\\system32\\drivers\\mountmgr.sys" + }; + + ULONG i; + RTL_PROCESS_MODULE_INFORMATION_EX *module_info = info; + + len = sizeof(*module_info) * ARRAY_SIZE(fake_modules) + sizeof(module_info->NextOffset); + if (len <= size) + { + memset( info, 0, len ); + for (i = 0; i < ARRAY_SIZE(fake_modules); i++) + { + SYSTEM_MODULE *sm = &module_info[i].BaseInfo; + sm->ImageBaseAddress = (char *)0x10000000 + 0x200000 * i; + sm->ImageSize = 0x200000; + sm->LoadOrderIndex = i; + sm->LoadCount = 1; + strcpy( (char *)sm->Name, fake_modules[i] ); + sm->NameOffset = strrchr( fake_modules[i], '\\' ) - fake_modules[i] + 1; + module_info[i].NextOffset = sizeof(*module_info); + } + module_info[ARRAY_SIZE(fake_modules)].NextOffset = 0; + } + else ret = STATUS_INFO_LENGTH_MISMATCH; + + break; + } + case SystemHandleInformation: { struct handle_info *handle_info;

1 0

Michael Stefaniuc : wmp: Use wide-char string literals.
by Alexandre Julliard 27 Oct '20

27 Oct '20

Module: wine Branch: master Commit: 6f92e48447c3e18f5c2723dd54028045cffc1759 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f92e48447c3e18f5c2723dd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 27 00:06:37 2020 +0100 wmp: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/oleobj.c | 6 ++---- dlls/wmp/player.c | 29 ++++++++++++----------------- dlls/wmp/tests/media.c | 49 +++++++++++++++++++------------------------------ dlls/wmp/tests/oleobj.c | 8 +++----- 4 files changed, 36 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f92e48447c3e18f5c27…

1 0

Huw Davies : riched20: Use row and para helpers in the extend selection function.
by Alexandre Julliard 27 Oct '20

27 Oct '20

Module: wine Branch: master Commit: 245b9231c555a989138b3c97c6bef68f68973320 URL: https://source.winehq.org/git/wine.git/?a=commit;h=245b9231c555a989138b3c97… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 08:23:26 2020 +0000 riched20: Use row and para helpers in the extend selection function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 58 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 834f9fd3afe..d92b93ac2f0 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1044,37 +1044,53 @@ static void ME_ExtendAnchorSelection(ME_TextEditor *editor) { /* Extend the left side of selection */ editor->pCursors[1] = tmp_cursor; - if (editor->nSelectionType == stWord) + switch (editor->nSelectionType) + { + case stWord: ME_MoveCursorWords(editor, &editor->pCursors[1], -1); - else + break; + + case stLine: { - ME_DisplayItem *pItem; - ME_DIType searchType = ((editor->nSelectionType == stLine) ? - diStartRowOrParagraph:diParagraph); - pItem = ME_FindItemBack(editor->pCursors[1].pRun, searchType); - editor->pCursors[1].pRun = ME_FindItemFwd(pItem, diRun); - editor->pCursors[1].pPara = ME_GetParagraph(editor->pCursors[1].pRun); + ME_Row *row = row_from_cursor( editor->pCursors + 1 ); + row_first_cursor( row, editor->pCursors + 1 ); + break; + } + + case stParagraph: + editor->pCursors[1].pRun = run_get_di( para_first_run( &editor->pCursors[1].pPara->member.para ) ); editor->pCursors[1].nOffset = 0; + break; + + default: + break; } } else if (curOfs >= anchorEndOfs) { /* Extend the right side of selection */ editor->pCursors[0] = tmp_cursor; - if (editor->nSelectionType == stWord) - ME_MoveCursorWords(editor, &editor->pCursors[0], +1); - else + switch (editor->nSelectionType) { - ME_DisplayItem *pItem; - ME_DIType searchType = ((editor->nSelectionType == stLine) ? - diStartRowOrParagraphOrEnd:diParagraphOrEnd); - pItem = ME_FindItemFwd(editor->pCursors[0].pRun, searchType); - if (pItem->type == diTextEnd) - editor->pCursors[0].pRun = ME_FindItemBack(pItem, diRun); - else - editor->pCursors[0].pRun = ME_FindItemFwd(pItem, diRun); - editor->pCursors[0].pPara = ME_GetParagraph(editor->pCursors[0].pRun); - editor->pCursors[0].nOffset = 0; + case stWord: + ME_MoveCursorWords( editor, &editor->pCursors[0], +1 ); + break; + + case stLine: + { + ME_Row *row = row_from_cursor( editor->pCursors ); + row_end_cursor( row, editor->pCursors, TRUE ); + break; + } + + case stParagraph: + editor->pCursors[0].pRun = run_get_di( para_end_run( &editor->pCursors[0].pPara->member.para ) ); + editor->pCursors[0].pPara = para_get_di( editor->pCursors[0].pRun->member.run.para ); + editor->pCursors[0].nOffset = editor->pCursors[0].pRun->member.run.len; + break; + + default: + break; } } }

1 0

Huw Davies : riched20: Use a run helper in the delete text function.
by Alexandre Julliard 27 Oct '20

27 Oct '20

Module: wine Branch: master Commit: 0d50e0182d6c8331cc468a8b25807c33e033531a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d50e0182d6c8331cc468a8b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 08:23:27 2020 +0000 riched20: Use a run helper in the delete text function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index d92b93ac2f0..6a8f1e1cd71 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -405,8 +405,8 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, } if (pThisCur->nOffset == run->len) { - pThisCur->pRun = ME_FindItemFwd(pThisCur->pRun, diRunOrParagraphOrEnd); - assert(pThisCur->pRun->type == diRun); + pThisCur->pRun = run_get_di( run_next( &pThisCur->pRun->member.run ) ); + assert( pThisCur->pRun ); pThisCur->nOffset = 0; } }

1 0

Huw Davies : riched20: Use a row ptr in the run drawing function.
by Alexandre Julliard 27 Oct '20

27 Oct '20

Module: wine Branch: master Commit: 30ad0b936a96c403db6476ba45f2f455b613df3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=30ad0b936a96c403db6476ba… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 08:23:28 2020 +0000 riched20: Use a row ptr in the run drawing function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 2 +- dlls/riched20/paint.c | 41 +++++++++++++++++++++-------------------- dlls/riched20/richole.c | 2 +- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index f4484f57d39..ba1e5c169ff 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -264,7 +264,7 @@ int ME_GetParaBorderWidth(const ME_Context *c, int flags) DECLSPEC_HIDDEN; /* richole.c */ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *ppvObj) DECLSPEC_HIDDEN; -void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run* run, BOOL selected) DECLSPEC_HIDDEN; +void draw_ole( ME_Context *c, int x, int y, ME_Run* run, BOOL selected ) DECLSPEC_HIDDEN; void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) DECLSPEC_HIDDEN; void ME_CopyReObject(REOBJECT *dst, const REOBJECT *src, DWORD flags) DECLSPEC_HIDDEN; void ME_DeleteReObject(struct re_object *re_object) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 42f370c857c..0c37fc7c707 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -359,8 +359,8 @@ static void draw_text( ME_Context *c, ME_Run *run, int x, int y, BOOL selected, } -static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, - int nSelFrom, int nSelTo, int ymin, int cy) +static void draw_text_with_style( ME_Context *c, ME_Run *run, int x, int y, + int nSelFrom, int nSelTo, int ymin, int cy ) { HDC hDC = c->hDC; int yOffset = 0; @@ -434,16 +434,16 @@ static void ME_DebugWrite(HDC hDC, const POINT *pt, LPCWSTR szText) { SetTextColor(hDC, color); } -static void ME_DrawRun( ME_Context *c, int x, int y, ME_Run *run, ME_Paragraph *para ) +static void draw_run( ME_Context *c, int x, int y, ME_Cursor *cursor ) { - ME_DisplayItem *start; - int runofs = run->nCharOfs+para->nCharOfs; + ME_Row *row; + ME_Run *run = &cursor->pRun->member.run; + int runofs = run_char_ofs( run, cursor->nOffset ); int nSelFrom, nSelTo; - if (run->nFlags & MERF_HIDDEN) - return; + if (run->nFlags & MERF_HIDDEN) return; - start = ME_FindItemBack( run_get_di( run ), diStartRow ); + row = row_from_cursor( cursor ); ME_GetSelectionOfs(c->editor, &nSelFrom, &nSelTo); /* Draw selected end-of-paragraph mark */ @@ -452,8 +452,7 @@ static void ME_DrawRun( ME_Context *c, int x, int y, ME_Run *run, ME_Paragraph * if (runofs >= nSelFrom && runofs < nSelTo) { draw_space( c, run, x, y, TRUE, FALSE, - c->pt.y + para->pt.y + start->member.row.pt.y, - start->member.row.nHeight ); + c->pt.y + run->para->pt.y + row->pt.y, row->nHeight ); } return; } @@ -463,19 +462,15 @@ static void ME_DrawRun( ME_Context *c, int x, int y, ME_Run *run, ME_Paragraph * BOOL selected = runofs >= nSelFrom && runofs < nSelTo; draw_space( c, run, x, y, selected, TRUE, - c->pt.y + para->pt.y + start->member.row.pt.y, - start->member.row.nHeight ); + c->pt.y + run->para->pt.y + row->pt.y, row->nHeight ); return; } if (run->nFlags & MERF_GRAPHICS) - ME_DrawOLE(c, x, y, run, (runofs >= nSelFrom) && (runofs < nSelTo)); + draw_ole( c, x, y, run, (runofs >= nSelFrom) && (runofs < nSelTo) ); else - { - ME_DrawTextWithStyle(c, run, x, y, nSelFrom - runofs, nSelTo - runofs, - c->pt.y + para->pt.y + start->member.row.pt.y, - start->member.row.nHeight); - } + draw_text_with_style( c, run, x, y, nSelFrom - runofs, nSelTo - runofs, + c->pt.y + run->para->pt.y + row->pt.y, row->nHeight ); } /* The documented widths are in points (72 dpi), but converting them to @@ -1001,8 +996,14 @@ static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) FrameRect(c->hDC, &rc, GetSysColorBrush(COLOR_GRAYTEXT)); } if (visible) - ME_DrawRun( c, c->pt.x + run->pt.x, - c->pt.y + para->pt.y + run->pt.y + baseline, run, para ); + { + ME_Cursor cursor; + + cursor.pRun = run_get_di( run ); + cursor.pPara = para_get_di( para ); + cursor.nOffset = 0; + draw_run( c, c->pt.x + run->pt.x, c->pt.y + para->pt.y + run->pt.y + baseline, &cursor ); + } if (me_debug) { static const WCHAR wszRunDebug[] = {'[','%','d',':','%','x',']',' ','%','l','s',0}; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 21b63911954..015326c5abc 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5846,7 +5846,7 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) } } -void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) +void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) { IDataObject* ido; FORMATETC fmt;

1 0

Huw Davies : riched20: Use row and para ptrs in the ensure visible function.
by Alexandre Julliard 27 Oct '20

27 Oct '20

Module: wine Branch: master Commit: 1abbb78a0949f238cca4b8e09aa0c7ee085d1389 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1abbb78a0949f238cca4b8e0… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 08:23:29 2020 +0000 riched20: Use row and para ptrs in the ensure visible function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 10 ++++------ dlls/riched20/editor.c | 2 +- dlls/riched20/editor.h | 2 +- dlls/riched20/paint.c | 25 ++++++++++++------------- 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 6a8f1e1cd71..47fe77df922 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1176,13 +1176,11 @@ void ME_MouseMove(ME_TextEditor *editor, int x, int y) if (editor->nSelectionType != stPosition && memcmp(&editor->pCursors[1], &editor->pCursors[3], sizeof(ME_Cursor))) - { /* The scroll the cursor towards the other end, since it was the one * extended by ME_ExtendAnchorSelection */ - ME_EnsureVisible(editor, &editor->pCursors[1]); - } else { - ME_EnsureVisible(editor, &editor->pCursors[0]); - } + editor_ensure_visible( editor, &editor->pCursors[1] ); + else + editor_ensure_visible( editor, &editor->pCursors[0] ); ME_InvalidateSelection(editor); update_caret(editor); @@ -1520,7 +1518,7 @@ ME_ArrowKey(ME_TextEditor *editor, int nVKey, BOOL extend, BOOL ctrl) ME_InvalidateSelection(editor); ME_Repaint(editor); hide_caret(editor); - ME_EnsureVisible(editor, &tmp_curs); + editor_ensure_visible( editor, &tmp_curs ); update_caret(editor); ME_SendSelChange(editor); return success; diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 6a2e96a3c7c..462245db233 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4095,7 +4095,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return len; } case EM_SCROLLCARET: - ME_EnsureVisible(editor, &editor->pCursors[0]); + editor_ensure_visible( editor, &editor->pCursors[0] ); return 0; case WM_SETFONT: { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index ba1e5c169ff..1a2346854e7 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -242,7 +242,7 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) DECLS void ME_Repaint(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_RewrapRepaint(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) DECLSPEC_HIDDEN; -void ME_EnsureVisible(ME_TextEditor *editor, ME_Cursor *pCursor) DECLSPEC_HIDDEN; +void editor_ensure_visible( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; void ME_InvalidateSelection(ME_TextEditor *editor) DECLSPEC_HIDDEN; BOOL ME_SetZoom(ME_TextEditor *editor, int numerator, int denominator) DECLSPEC_HIDDEN; int ME_twips2pointsX(const ME_Context *c, int x) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 0c37fc7c707..180307ae01b 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -117,7 +117,7 @@ void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) ME_UpdateScrollBar(editor); /* Ensure that the cursor is visible */ - ME_EnsureVisible(editor, &editor->pCursors[0]); + editor_ensure_visible( editor, &editor->pCursors[0] ); ITextHost_TxViewChange(editor->texthost, update_now); @@ -1269,19 +1269,17 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) } } -void ME_EnsureVisible(ME_TextEditor *editor, ME_Cursor *pCursor) +void editor_ensure_visible( ME_TextEditor *editor, ME_Cursor *cursor ) { - ME_Run *pRun = &pCursor->pRun->member.run; - ME_DisplayItem *pRow = ME_FindItemBack(pCursor->pRun, diStartRow); - ME_DisplayItem *pPara = pCursor->pPara; + ME_Run *run = &cursor->pRun->member.run; + ME_Row *row = row_from_cursor( cursor ); + ME_Paragraph *para = &cursor->pPara->member.para; int x, y, yheight; - assert(pRow); - assert(pPara); if (editor->styleFlags & ES_AUTOHSCROLL) { - x = pRun->pt.x + ME_PointFromChar(editor, pRun, pCursor->nOffset, TRUE); + x = run->pt.x + ME_PointFromChar( editor, run, cursor->nOffset, TRUE ); if (x > editor->horz_si.nPos + editor->sizeWindow.cx) x = x + 1 - editor->sizeWindow.cx; else if (x > editor->horz_si.nPos) @@ -1292,14 +1290,15 @@ void ME_EnsureVisible(ME_TextEditor *editor, ME_Cursor *pCursor) ME_HScrollAbs(editor, x); return; } - } else { - if (~editor->styleFlags & ES_AUTOVSCROLL) - return; + } + else + { + if (~editor->styleFlags & ES_AUTOVSCROLL) return; x = editor->horz_si.nPos; } - y = pPara->member.para.pt.y + pRow->member.row.pt.y; - yheight = pRow->member.row.nHeight; + y = para->pt.y + row->pt.y; + yheight = row->nHeight; if (y < editor->vert_si.nPos) ME_ScrollAbs(editor, x, y);

1 0