wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Alexandre Julliard : kernel32/tests: Add some tests for the behavior of queries on a dead process.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: fdf6d7de2e77f0986b01532c4e1913602e006d6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdf6d7de2e77f0986b01532c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 11 18:04:48 2021 +0100 kernel32/tests: Add some tests for the behavior of queries on a dead process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 71 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 0c514f816c1..108851000ff 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4171,6 +4171,72 @@ static void test_handle_list_attribute(BOOL child, HANDLE handle1, HANDLE handle CloseHandle(pipe[1]); } +static void test_dead_process(void) +{ + DWORD_PTR data[256]; + PROCESS_BASIC_INFORMATION basic; + SYSTEM_PROCESS_INFORMATION *spi; + SECTION_IMAGE_INFORMATION image; + PROCESS_INFORMATION pi; + PROCESS_PRIORITY_CLASS *prio = (PROCESS_PRIORITY_CLASS *)data; + BYTE *buffer = NULL; + BOOL found; + ULONG size = 0; + DWORD offset = 0; + NTSTATUS status; + + create_process("exit", &pi); + wait_child_process(pi.hProcess); + Sleep(100); + + memset( data, 0, sizeof(data) ); + status = NtQueryInformationProcess( pi.hProcess, ProcessImageFileName, data, sizeof(data), NULL); + ok( !status, "ProcessImageFileName failed %x\n", status ); + todo_wine + ok( ((UNICODE_STRING *)data)->Length, "ProcessImageFileName not set\n" ); + todo_wine + ok( ((UNICODE_STRING *)data)->Buffer[0] == '\\', "ProcessImageFileName not set\n" ); + + memset( prio, 0xcc, sizeof(*prio) ); + status = NtQueryInformationProcess( pi.hProcess, ProcessPriorityClass, prio, sizeof(*prio), NULL); + ok( !status, "ProcessPriorityClass failed %x\n", status ); + ok( prio->PriorityClass != 0xcc, "ProcessPriorityClass not set\n" ); + + memset( &basic, 0xcc, sizeof(basic) ); + status = NtQueryInformationProcess( pi.hProcess, ProcessBasicInformation, &basic, sizeof(basic), NULL); + ok( !status, "ProcessBasicInformation failed %x\n", status ); + ok( basic.ExitStatus == 0, "ProcessBasicInformation info modified\n" ); + + memset( &image, 0xcc, sizeof(image) ); + status = NtQueryInformationProcess( pi.hProcess, ProcessImageInformation, &image, sizeof(image), NULL); + todo_wine + ok( status == STATUS_PROCESS_IS_TERMINATING, "ProcessImageInformation wrong error %x\n", status ); + todo_wine + ok( image.Machine == 0xcccc, "ProcessImageInformation info modified\n" ); + + while ((status = NtQuerySystemInformation(SystemProcessInformation, buffer, size, &size)) == STATUS_INFO_LENGTH_MISMATCH) + { + free(buffer); + buffer = malloc(size); + } + ok(status == STATUS_SUCCESS, "got %#x\n", status); + found = FALSE; + do + { + spi = (SYSTEM_PROCESS_INFORMATION *)(buffer + offset); + if (spi->UniqueProcessId == ULongToHandle(pi.dwProcessId)) + { + found = TRUE; + break; + } + offset += spi->NextEntryOffset; + } while (spi->NextEntryOffset); + todo_wine + ok( !found, "process still enumerated\n" ); + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); +} + START_TEST(process) { HANDLE job, hproc, h, h2; @@ -4291,6 +4357,9 @@ START_TEST(process) test_ProcThreadAttributeList(); test_SuspendProcessState(); test_SuspendProcessNewThread(); + test_parent_process_attribute(0, NULL); + test_handle_list_attribute(FALSE, NULL, NULL); + test_dead_process(); /* things that can be tested: * lookup: check the way program to be executed is searched @@ -4314,6 +4383,4 @@ START_TEST(process) test_jobInheritance(job); test_BreakawayOk(job); CloseHandle(job); - test_parent_process_attribute(0, NULL); - test_handle_list_attribute(FALSE, NULL, NULL); }

1 0

Bernhard Kölbl : netprofm: Set correct GUIDs for network connections.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 4393438ab31e8825edf4111524ef5a0be0a90d00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4393438ab31e8825edf41115… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Fri Mar 5 16:22:07 2021 +0100 netprofm: Set correct GUIDs for network connections. Retrieve the network connection's GUID from the interface index. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netprofm/list.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index fa94916dd9b..40d2fd9763c 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -1738,8 +1738,10 @@ static void init_networks( struct list_manager *mgr ) { struct network *network; struct connection *connection; + NET_LUID luid; - id.Data1 = aa->u.s.IfIndex; + ConvertInterfaceIndexToLuid(aa->u.s.IfIndex, &luid); + ConvertInterfaceLuidToGuid(&luid, &id); /* assume a one-to-one mapping between networks and connections */ if (!(network = create_network( &id ))) goto done;

1 0

Rémi Bernon : tools: Relax the dot in module names rules.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: a6f214d75a124e7d84c23f05f353e8ebd2bf0740 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6f214d75a124e7d84c23f05… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 5 19:16:45 2021 +0100 tools: Relax the dot in module names rules. This should allow modules with dot in their names, while still making the .dll extension optional. The MODULE variable still determines the actual output file extension. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_makefiles | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index 2d3c14cb2ec..3abba2da840 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -446,18 +446,17 @@ sub update_makefiles(@) if (defined $make{"APPMODE"}) { $dllflags .= " " . $make{"APPMODE"}; } die "MODULE should not be defined in $file" unless $file =~ /^(dlls|programs)\//; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; - die "Invalid MODULE in $file" if $name =~ /\./ && $make{"MODULE"} ne $name; if ($file =~ /^programs\//) { die "EXTRADLLFLAGS should be defined in $file" unless $dllflags; die "EXTRADLLFLAGS should contain -mconsole or -mwindows in $file" unless $dllflags =~ /-m(console|windows)/; - die "Invalid MODULE in $file" unless $name =~ /\./ || $make{"MODULE"} eq "$name.exe"; + die "Invalid MODULE in $file" unless ($name =~ /\./ && $make{"MODULE"} eq $name) || $make{"MODULE"} eq "$name.exe"; } else { die "APPMODE should not be defined in $file" if defined $make{"APPMODE"} ; die "EXTRADLLFLAGS should not contain -mconsole or -mwindows in $file" if $dllflags =~ /-m(console|windows)/; - die "Invalid MODULE in $file" unless $name =~ /\./ || $make{"MODULE"} eq "$name.dll"; + die "Invalid MODULE in $file" unless ($name =~ /\./ && $make{"MODULE"} eq $name) || $make{"MODULE"} eq "$name.dll"; } if (defined $make{"IMPORTLIB"}) {

1 0

Hugh McMaster : regedit/tests: Add tests for escaped null characters.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 7eb77bef05243621ce7facf8797c3c0f64fdaa92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7eb77bef05243621ce7facf8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Mar 11 21:37:51 2021 +1100 regedit/tests: Add tests for escaped null characters. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 134 +++++++++++++++++++++++---------------- 1 file changed, 80 insertions(+), 54 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 0f58b6d85b8..9b431fa6f38 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -677,6 +677,22 @@ static void test_basic_import(void) verify_reg(hkey, "Wine22h", REG_BINARY, NULL, 0, 0); verify_reg(hkey, "Wine22i", REG_NONE, NULL, 0, 0); + /* Test with escaped null characters */ + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine23a\"=\"\\\\0\"\n" + "\"Wine23b\"=\"\\\\0\\\\0\"\n" + "\"Wine23c\"=\"Value1\\\\0\"\n" + "\"Wine23d\"=\"Value2\\\\0\\\\0\\\\0\\\\0\"\n" + "\"Wine23e\"=\"Value3\\\\0Value4\"\n" + "\"Wine23f\"=\"\\\\0Value5\"\n\n"); + verify_reg(hkey, "Wine23a", REG_SZ, "\\0", 3, 0); + verify_reg(hkey, "Wine23b", REG_SZ, "\\0\\0", 5, 0); + verify_reg(hkey, "Wine23c", REG_SZ, "Value1\\0", 9, 0); + verify_reg(hkey, "Wine23d", REG_SZ, "Value2\\0\\0\\0\\0", 15, 0); + verify_reg(hkey, "Wine23e", REG_SZ, "Value3\\0Value4", 15, 0); + verify_reg(hkey, "Wine23f", REG_SZ, "\\0Value5", 9, 0); + /* Test forward and back slashes */ exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1100,6 +1116,22 @@ static void test_basic_import_unicode(void) verify_reg(hkey, "Wine22h", REG_BINARY, NULL, 0, 0); verify_reg(hkey, "Wine22i", REG_NONE, NULL, 0, 0); + /* Test with escaped null characters */ + exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine23a\"=\"\\\\0\"\n" + "\"Wine23b\"=\"\\\\0\\\\0\"\n" + "\"Wine23c\"=\"Value1\\\\0\"\n" + "\"Wine23d\"=\"Value2\\\\0\\\\0\\\\0\\\\0\"\n" + "\"Wine23e\"=\"Value3\\\\0Value4\"\n" + "\"Wine23f\"=\"\\\\0Value5\"\n\n"); + verify_reg(hkey, "Wine23a", REG_SZ, "\\0", 3, 0); + verify_reg(hkey, "Wine23b", REG_SZ, "\\0\\0", 5, 0); + verify_reg(hkey, "Wine23c", REG_SZ, "Value1\\0", 9, 0); + verify_reg(hkey, "Wine23d", REG_SZ, "Value2\\0\\0\\0\\0", 15, 0); + verify_reg(hkey, "Wine23e", REG_SZ, "Value3\\0Value4", 15, 0); + verify_reg(hkey, "Wine23f", REG_SZ, "\\0Value5", 9, 0); + /* Test forward and back slashes */ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1656,33 +1688,18 @@ static void test_invalid_import(void) /* Test with embedded null characters */ exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine33a\"=\"\\0\n" - "\"Wine33b\"=\"\\0\\0\n" - "\"Wine33c\"=\"Value1\\0\n" - "\"Wine33d\"=\"Value2\\0\\0\\0\\0\n" - "\"Wine33e\"=\"Value3\\0Value4\n" - "\"Wine33f\"=\"\\0Value5\n\n"); - verify_reg_nonexist(hkey, "Wine33a"); - verify_reg_nonexist(hkey, "Wine33b"); - verify_reg_nonexist(hkey, "Wine33c"); - verify_reg_nonexist(hkey, "Wine33d"); - verify_reg_nonexist(hkey, "Wine33e"); - verify_reg_nonexist(hkey, "Wine33f"); - - exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine34a\"=\"\\0\"\n" - "\"Wine34b\"=\"\\0\\0\"\n" - "\"Wine34c\"=\"Value1\\0\"\n" - "\"Wine34d\"=\"Value2\\0\\0\\0\\0\"\n" - "\"Wine34e\"=\"Value3\\0Value4\"\n" - "\"Wine34f\"=\"\\0Value5\"\n\n"); - todo_wine verify_reg_nonexist(hkey, "Wine34a"); - todo_wine verify_reg_nonexist(hkey, "Wine34b"); - todo_wine verify_reg_nonexist(hkey, "Wine34c"); - todo_wine verify_reg_nonexist(hkey, "Wine34d"); - todo_wine verify_reg_nonexist(hkey, "Wine34e"); - todo_wine verify_reg_nonexist(hkey, "Wine34f"); + "\"Wine33a\"=\"\\0\"\n" + "\"Wine33b\"=\"\\0\\0\"\n" + "\"Wine33c\"=\"Value1\\0\"\n" + "\"Wine33d\"=\"Value2\\0\\0\\0\\0\"\n" + "\"Wine33e\"=\"Value3\\0Value4\"\n" + "\"Wine33f\"=\"\\0Value5\"\n\n"); + todo_wine verify_reg_nonexist(hkey, "Wine33a"); + todo_wine verify_reg_nonexist(hkey, "Wine33b"); + todo_wine verify_reg_nonexist(hkey, "Wine33c"); + todo_wine verify_reg_nonexist(hkey, "Wine33d"); + todo_wine verify_reg_nonexist(hkey, "Wine33e"); + todo_wine verify_reg_nonexist(hkey, "Wine33f"); close_key(hkey); @@ -2182,33 +2199,18 @@ static void test_invalid_import_unicode(void) /* Test with embedded null characters */ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine33a\"=\"\\0\n" - "\"Wine33b\"=\"\\0\\0\n" - "\"Wine33c\"=\"Value1\\0\n" - "\"Wine33d\"=\"Value2\\0\\0\\0\\0\n" - "\"Wine33e\"=\"Value3\\0Value4\n" - "\"Wine33f\"=\"\\0Value5\n\n"); - verify_reg_nonexist(hkey, "Wine33a"); - verify_reg_nonexist(hkey, "Wine33b"); - verify_reg_nonexist(hkey, "Wine33c"); - verify_reg_nonexist(hkey, "Wine33d"); - verify_reg_nonexist(hkey, "Wine33e"); - verify_reg_nonexist(hkey, "Wine33f"); - - exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine34a\"=\"\\0\"\n" - "\"Wine34b\"=\"\\0\\0\"\n" - "\"Wine34c\"=\"Value1\\0\"\n" - "\"Wine34d\"=\"Value2\\0\\0\\0\\0\"\n" - "\"Wine34e\"=\"Value3\\0Value4\"\n" - "\"Wine34f\"=\"\\0Value5\"\n\n"); - todo_wine verify_reg_nonexist(hkey, "Wine34a"); - todo_wine verify_reg_nonexist(hkey, "Wine34b"); - todo_wine verify_reg_nonexist(hkey, "Wine34c"); - todo_wine verify_reg_nonexist(hkey, "Wine34d"); - todo_wine verify_reg_nonexist(hkey, "Wine34e"); - todo_wine verify_reg_nonexist(hkey, "Wine34f"); + "\"Wine33a\"=\"\\0\"\n" + "\"Wine33b\"=\"\\0\\0\"\n" + "\"Wine33c\"=\"Value1\\0\"\n" + "\"Wine33d\"=\"Value2\\0\\0\\0\\0\"\n" + "\"Wine33e\"=\"Value3\\0Value4\"\n" + "\"Wine33f\"=\"\\0Value5\"\n\n"); + todo_wine verify_reg_nonexist(hkey, "Wine33a"); + todo_wine verify_reg_nonexist(hkey, "Wine33b"); + todo_wine verify_reg_nonexist(hkey, "Wine33c"); + todo_wine verify_reg_nonexist(hkey, "Wine33d"); + todo_wine verify_reg_nonexist(hkey, "Wine33e"); + todo_wine verify_reg_nonexist(hkey, "Wine33f"); close_key(hkey); @@ -3559,6 +3561,16 @@ static void test_export(void) "\"\\\\foo\\\\bar\"=\"\"\r\n\r\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\https://winehq.org]\r\n\r\n"; + const char *escaped_null_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"Wine5a\"=\"\\\\0\"\r\n" + "\"Wine5b\"=\"\\\\0\\\\0\"\r\n" + "\"Wine5c\"=\"Value1\\\\0\"\r\n" + "\"Wine5d\"=\"Value2\\\\0\\\\0\\\\0\\\\0\"\r\n" + "\"Wine5e\"=\"Value3\\\\0Value4\"\r\n" + "\"Wine5f\"=\"\\\\0Value5\"\r\n\r\n"; + delete_tree(HKEY_CURRENT_USER, KEY_BASE); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); @@ -3725,6 +3737,20 @@ static void test_export(void) run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); ok(compare_export("file.reg", slashes_test, TODO_REG_COMPARE), "compare_export() failed\n"); delete_tree(HKEY_CURRENT_USER, KEY_BASE); + + /* Test registry export with escaped null characters */ + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + add_value(hkey, "Wine5a", REG_SZ, "\\0", 3); + add_value(hkey, "Wine5b", REG_SZ, "\\0\\0", 5); + add_value(hkey, "Wine5c", REG_SZ, "Value1\\0", 9); + add_value(hkey, "Wine5d", REG_SZ, "Value2\\0\\0\\0\\0", 15); + add_value(hkey, "Wine5e", REG_SZ, "Value3\\0Value4", 15); + add_value(hkey, "Wine5f", REG_SZ, "\\0Value5", 9); + close_key(hkey); + + run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); + ok(compare_export("file.reg", escaped_null_test, 0), "compare_export() failed\n"); + delete_key(HKEY_CURRENT_USER, KEY_BASE); } START_TEST(regedit)

1 0

Nikolay Sivov : dwrite/tests: Add a test for matching in system font set.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: e729b2602613b8241292b5d7cec0f62a18c2aa70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e729b2602613b8241292b5d7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 11 12:41:24 2021 +0300 dwrite/tests: Add a test for matching in system font set. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index bded40a53c7..d0940c3b145 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -10011,8 +10011,11 @@ static void test_family_font_set(void) static void test_system_font_set(void) { + IDWriteFontSet *fontset, *filtered_set; + IDWriteFontFaceReference *ref; + IDWriteFontFace3 *fontface; IDWriteFactory3 *factory; - IDWriteFontSet *fontset; + DWRITE_FONT_PROPERTY p; unsigned int count; HRESULT hr; @@ -10028,6 +10031,25 @@ static void test_system_font_set(void) count = IDWriteFontSet_GetFontCount(fontset); ok(!!count, "Unexpected font count %u.\n", count); + p.propertyId = DWRITE_FONT_PROPERTY_ID_FULL_NAME; + p.propertyValue = L"Tahoma"; + p.localeName = L""; + hr = IDWriteFontSet_GetMatchingFonts(fontset, &p, 1, &filtered_set); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + count = IDWriteFontSet_GetFontCount(filtered_set); + ok(!!count, "Unexpected font count %u.\n", count); + + hr = IDWriteFontSet_GetFontFaceReference(filtered_set, 0, &ref); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDWriteFontFaceReference_CreateFontFace(ref, &fontface); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDWriteFontFace3_Release(fontface); + IDWriteFontFaceReference_Release(ref); + + IDWriteFontSet_Release(filtered_set); + IDWriteFontSet_Release(fontset); IDWriteFactory3_Release(factory);

1 0

Nikolay Sivov : dwrite: Implement GetSystemFontSet().
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 318ebc89dcb590c6afa71e5b1504669037979a60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=318ebc89dcb590c6afa71e5b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 11 12:41:23 2021 +0300 dwrite: Implement GetSystemFontSet(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 159 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/dwrite/tests/font.c | 25 ++++++++ 2 files changed, 178 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 51020d6f586..3326b1550ce 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1509,11 +1509,152 @@ static HRESULT WINAPI dwritefactory3_CreateFontFaceReference(IDWriteFactory7 *if return hr; } +static HRESULT create_system_path_list(WCHAR ***ret, unsigned int *ret_count) +{ + unsigned int index = 0, value_size, name_count, max_name_count, type, data_size; + WCHAR **paths = NULL, *name, *value = NULL; + size_t capacity = 0, count = 0; + HKEY hkey; + LONG r; + + if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts", + 0, GENERIC_READ, &hkey)) + { + return E_UNEXPECTED; + } + + value_size = MAX_PATH * sizeof(*value); + value = heap_alloc(value_size); + + max_name_count = MAX_PATH; + name = heap_alloc(max_name_count * sizeof(*name)); + + for (;;) + { + if (!value) + { + value_size = MAX_PATH * sizeof(*value); + value = heap_alloc(value_size); + } + + do + { + name_count = max_name_count; + data_size = value_size - sizeof(*value); + + r = RegEnumValueW(hkey, index, name, &name_count, NULL, &type, (BYTE *)value, &data_size); + if (r == ERROR_MORE_DATA) + { + if (name_count >= max_name_count) + { + max_name_count *= 2; + heap_free(name); + name = heap_alloc(max_name_count * sizeof(*name)); + } + + if (data_size > value_size - sizeof(*value)) + { + heap_free(value); + value_size = max(data_size + sizeof(*value), value_size * 2); + value = heap_alloc(value_size); + } + } + } while (r == ERROR_MORE_DATA); + + if (r != ERROR_SUCCESS) + break; + + value[data_size / sizeof(*value)] = 0; + if (type == REG_SZ && *name != '@') + { + if (dwrite_array_reserve((void **)&paths, &capacity, count + 1, sizeof(*paths))) + { + if (!strchrW(value, '\\')) + { + static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; + WCHAR *ptrW; + + ptrW = heap_alloc((MAX_PATH + lstrlenW(value)) * sizeof(WCHAR)); + GetWindowsDirectoryW(ptrW, MAX_PATH); + lstrcatW(ptrW, fontsW); + lstrcatW(ptrW, value); + + heap_free(value); + value = ptrW; + } + + paths[count++] = value; + value = NULL; + } + } + index++; + } + + heap_free(name); + + *ret = paths; + *ret_count = count; + + RegCloseKey(hkey); + + return S_OK; +} + +static int create_system_fontset_compare(const void *left, const void *right) +{ + const WCHAR *_l = *(WCHAR **)left, *_r = *(WCHAR **)right; + return lstrcmpiW(_l, _r); +}; + +static HRESULT create_system_fontset(IDWriteFactory7 *factory, REFIID riid, void **obj) +{ + IDWriteFontSetBuilder2 *builder; + IDWriteFontSet *fontset; + unsigned int i, j, count; + WCHAR **paths; + HRESULT hr; + + *obj = NULL; + + if (FAILED(hr = create_fontset_builder(factory, &builder))) return hr; + + if (SUCCEEDED(hr = create_system_path_list(&paths, &count))) + { + /* Sort, skip duplicates. */ + + qsort(paths, count, sizeof(*paths), create_system_fontset_compare); + + for (i = 0, j = 0; i < count; ++i) + { + if (i != j && !lstrcmpiW(paths[i], paths[j])) continue; + + if (FAILED(hr = IDWriteFontSetBuilder2_AddFontFile(builder, paths[i])) && hr != DWRITE_E_FILEFORMAT) + WARN("Failed to add font file, hr %#x, path %s.\n", hr, debugstr_w(paths[i])); + + j = i; + } + + for (i = 0; i < count; ++i) + heap_free(paths[i]); + heap_free(paths); + } + + if (SUCCEEDED(hr = IDWriteFontSetBuilder2_CreateFontSet(builder, &fontset))) + { + hr = IDWriteFontSet_QueryInterface(fontset, riid, obj); + IDWriteFontSet_Release(fontset); + } + + IDWriteFontSetBuilder2_Release(builder); + + return hr; +} + static HRESULT WINAPI dwritefactory3_GetSystemFontSet(IDWriteFactory7 *iface, IDWriteFontSet **fontset) { - FIXME("%p, %p: stub\n", iface, fontset); + TRACE("%p, %p.\n", iface, fontset); - return E_NOTIMPL; + return create_system_fontset(iface, &IID_IDWriteFontSet, (void **)fontset); } static HRESULT WINAPI dwritefactory3_CreateFontSetBuilder(IDWriteFactory7 *iface, IDWriteFontSetBuilder **builder) @@ -1691,9 +1832,12 @@ static HRESULT WINAPI dwritefactory6_CreateFontResource(IDWriteFactory7 *iface, static HRESULT WINAPI dwritefactory6_GetSystemFontSet(IDWriteFactory7 *iface, BOOL include_downloadable, IDWriteFontSet1 **fontset) { - FIXME("%p, %d, %p.\n", iface, include_downloadable, fontset); + TRACE("%p, %d, %p.\n", iface, include_downloadable, fontset); - return E_NOTIMPL; + if (include_downloadable) + FIXME("Downloadable fonts are not supported.\n"); + + return create_system_fontset(iface, &IID_IDWriteFontSet1, (void **)fontset); } static HRESULT WINAPI dwritefactory6_GetSystemFontCollection(IDWriteFactory7 *iface, BOOL include_downloadable, @@ -1732,9 +1876,12 @@ static HRESULT WINAPI dwritefactory6_CreateTextFormat(IDWriteFactory7 *iface, co static HRESULT WINAPI dwritefactory7_GetSystemFontSet(IDWriteFactory7 *iface, BOOL include_downloadable, IDWriteFontSet2 **fontset) { - FIXME("%p, %d, %p.\n", iface, include_downloadable, fontset); + TRACE("%p, %d, %p.\n", iface, include_downloadable, fontset); - return E_NOTIMPL; + if (include_downloadable) + FIXME("Downloadable fonts are not supported.\n"); + + return create_system_fontset(iface, &IID_IDWriteFontSet2, (void **)fontset); } static HRESULT WINAPI dwritefactory7_GetSystemFontCollection(IDWriteFactory7 *iface, BOOL include_downloadable, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 4367f1d95c8..bded40a53c7 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -10009,6 +10009,30 @@ static void test_family_font_set(void) ok(!refcount, "Unexpected factory refcount %u.\n", refcount); } +static void test_system_font_set(void) +{ + IDWriteFactory3 *factory; + IDWriteFontSet *fontset; + unsigned int count; + HRESULT hr; + + if (!(factory = create_factory_iid(&IID_IDWriteFactory3))) + { + win_skip("System font set is not supported.\n"); + return; + } + + hr = IDWriteFactory3_GetSystemFontSet(factory, &fontset); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IDWriteFontSet_GetFontCount(fontset); + ok(!!count, "Unexpected font count %u.\n", count); + + IDWriteFontSet_Release(fontset); + + IDWriteFactory3_Release(factory); +} + START_TEST(font) { IDWriteFactory *factory; @@ -10081,6 +10105,7 @@ START_TEST(font) test_GetVerticalGlyphVariants(); test_expiration_event(); test_family_font_set(); + test_system_font_set(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Use properly capitalized weight names for constructed face names.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 1f8d7489b7e0a196d8f59ac401a67c2b7a84d3a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f8d7489b7e0a196d8f59ac4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 11 12:41:22 2021 +0300 dwrite: Use properly capitalized weight names for constructed face names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 4252a3698ba..1a54d2300b1 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3653,6 +3653,10 @@ static BOOL is_known_weight_value(DWRITE_FONT_WEIGHT weight, WCHAR *nameW) static const WCHAR extrablackW[] = {'E','x','t','r','a',' ','B','l','a','c','k',0}; static const WCHAR extraboldW[] = {'E','x','t','r','a',' ','B','o','l','d',0}; static const WCHAR demiboldW[] = {'D','e','m','i',' ','B','o','l','d',0}; + static const WCHAR thinW[] = {'T','h','i','n',0}; + static const WCHAR lightW[] = {'L','i','g','h','t',0}; + static const WCHAR mediumW[] = {'M','e','d','i','u','m',0}; + static const WCHAR blackW[] = {'B','l','a','c','k',0}; const struct knownweight_entry *ptr; static const struct knownweight_entry knownweights[] = {

1 0

Nikolay Sivov : dwrite: Use same name for refcount field across different object structures.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 118b080a08db941a23ade3893e7f44e90ad29a83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=118b080a08db941a23ade389… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 11 12:41:21 2021 +0300 dwrite: Use same name for refcount field across different object structures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 11 ++++++----- dlls/dwrite/font.c | 47 ++++++++++++++++++++++++----------------------- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 6b74a23540a..ecbe1a389fa 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -258,9 +258,10 @@ struct dwrite_fontfallback_builder size_t count; }; -struct dwrite_numbersubstitution { +struct dwrite_numbersubstitution +{ IDWriteNumberSubstitution IDWriteNumberSubstitution_iface; - LONG ref; + LONG refcount; DWRITE_NUMBER_SUBSTITUTION_METHOD method; WCHAR *locale; @@ -1871,7 +1872,7 @@ static HRESULT WINAPI dwritenumbersubstitution_QueryInterface(IDWriteNumberSubst static ULONG WINAPI dwritenumbersubstitution_AddRef(IDWriteNumberSubstitution *iface) { struct dwrite_numbersubstitution *object = impl_from_IDWriteNumberSubstitution(iface); - ULONG refcount = InterlockedIncrement(&object->ref); + ULONG refcount = InterlockedIncrement(&object->refcount); TRACE("%p, refcount %d.\n", iface, refcount); @@ -1881,7 +1882,7 @@ static ULONG WINAPI dwritenumbersubstitution_AddRef(IDWriteNumberSubstitution *i static ULONG WINAPI dwritenumbersubstitution_Release(IDWriteNumberSubstitution *iface) { struct dwrite_numbersubstitution *object = impl_from_IDWriteNumberSubstitution(iface); - ULONG refcount = InterlockedDecrement(&object->ref); + ULONG refcount = InterlockedDecrement(&object->refcount); TRACE("%p, refcount %d.\n", iface, refcount); @@ -1926,7 +1927,7 @@ HRESULT create_numbersubstitution(DWRITE_NUMBER_SUBSTITUTION_METHOD method, cons return E_OUTOFMEMORY; substitution->IDWriteNumberSubstitution_iface.lpVtbl = &numbersubstitutionvtbl; - substitution->ref = 1; + substitution->refcount = 1; substitution->ignore_user_override = ignore_user_override; substitution->method = method; substitution->locale = heap_strdupW(locale); diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8e173263ad5..4252a3698ba 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -71,7 +71,7 @@ struct dwrite_font_propvec { struct dwrite_font_data { - LONG ref; + LONG refcount; DWRITE_FONT_STYLE style; DWRITE_FONT_STRETCH stretch; @@ -498,7 +498,7 @@ static const struct dwrite_fonttable *get_fontface_cpal(struct dwrite_fontface * static struct dwrite_font_data * addref_font_data(struct dwrite_font_data *data) { - InterlockedIncrement(&data->ref); + InterlockedIncrement(&data->refcount); return data; } @@ -506,7 +506,7 @@ static void release_font_data(struct dwrite_font_data *data) { int i; - if (InterlockedDecrement(&data->ref) > 0) + if (InterlockedDecrement(&data->refcount) > 0) return; for (i = 0; i < ARRAY_SIZE(data->info_strings); ++i) @@ -3963,7 +3963,7 @@ static HRESULT init_font_data(const struct fontface_desc *desc, struct dwrite_fo if (!data) return E_OUTOFMEMORY; - data->ref = 1; + data->refcount = 1; data->file = desc->file; data->face_index = desc->index; data->face_type = desc->face_type; @@ -4024,7 +4024,7 @@ static HRESULT init_font_data_from_font(const struct dwrite_font_data *src, DWRI return E_OUTOFMEMORY; *data = *src; - data->ref = 1; + data->refcount = 1; data->simulations |= sim; if (sim == DWRITE_FONT_SIMULATIONS_BOLD) data->weight = DWRITE_FONT_WEIGHT_BOLD; @@ -4448,7 +4448,7 @@ HRESULT create_font_collection(IDWriteFactory7 *factory, IDWriteFontFileEnumerat struct system_fontfile_enumerator { IDWriteFontFileEnumerator IDWriteFontFileEnumerator_iface; - LONG ref; + LONG refcount; IDWriteFactory7 *factory; HKEY hkey; @@ -4481,15 +4481,15 @@ static HRESULT WINAPI systemfontfileenumerator_QueryInterface(IDWriteFontFileEnu static ULONG WINAPI systemfontfileenumerator_AddRef(IDWriteFontFileEnumerator *iface) { struct system_fontfile_enumerator *enumerator = impl_from_IDWriteFontFileEnumerator(iface); - return InterlockedIncrement(&enumerator->ref); + return InterlockedIncrement(&enumerator->refcount); } static ULONG WINAPI systemfontfileenumerator_Release(IDWriteFontFileEnumerator *iface) { struct system_fontfile_enumerator *enumerator = impl_from_IDWriteFontFileEnumerator(iface); - ULONG ref = InterlockedDecrement(&enumerator->ref); + ULONG refcount = InterlockedDecrement(&enumerator->refcount); - if (!ref) + if (!refcount) { IDWriteFactory7_Release(enumerator->factory); RegCloseKey(enumerator->hkey); @@ -4497,7 +4497,7 @@ static ULONG WINAPI systemfontfileenumerator_Release(IDWriteFontFileEnumerator * heap_free(enumerator); } - return ref; + return refcount; } static HRESULT create_local_file_reference(IDWriteFactory7 *factory, const WCHAR *filename, IDWriteFontFile **file) @@ -4614,7 +4614,7 @@ static HRESULT create_system_fontfile_enumerator(IDWriteFactory7 *factory, IDWri return E_OUTOFMEMORY; enumerator->IDWriteFontFileEnumerator_iface.lpVtbl = &systemfontfileenumeratorvtbl; - enumerator->ref = 1; + enumerator->refcount = 1; enumerator->factory = factory; enumerator->index = -1; enumerator->filename_size = MAX_PATH * sizeof(*enumerator->filename); @@ -5085,7 +5085,7 @@ static struct dwrite_localfontfileloader local_fontfile_loader; struct dwrite_inmemory_stream_data { - LONG ref; + LONG refcount; IUnknown *owner; void *data; UINT32 size; @@ -5094,7 +5094,7 @@ struct dwrite_inmemory_stream_data struct dwrite_inmemory_filestream { IDWriteFontFileStream IDWriteFontFileStream_iface; - LONG ref; + LONG refcount; struct dwrite_inmemory_stream_data *data; }; @@ -5102,7 +5102,7 @@ struct dwrite_inmemory_filestream struct dwrite_inmemory_fileloader { IDWriteInMemoryFontFileLoader IDWriteInMemoryFontFileLoader_iface; - LONG ref; + LONG refcount; struct dwrite_inmemory_stream_data **streams; size_t size; @@ -5131,7 +5131,8 @@ static inline struct dwrite_inmemory_filestream *inmemory_impl_from_IDWriteFontF static void release_inmemory_stream(struct dwrite_inmemory_stream_data *stream) { - if (InterlockedDecrement(&stream->ref) == 0) { + if (InterlockedDecrement(&stream->refcount) == 0) + { if (stream->owner) IUnknown_Release(stream->owner); else @@ -6638,7 +6639,7 @@ static HRESULT WINAPI inmemoryfilestream_QueryInterface(IDWriteFontFileStream *i static ULONG WINAPI inmemoryfilestream_AddRef(IDWriteFontFileStream *iface) { struct dwrite_inmemory_filestream *stream = inmemory_impl_from_IDWriteFontFileStream(iface); - ULONG refcount = InterlockedIncrement(&stream->ref); + ULONG refcount = InterlockedIncrement(&stream->refcount); TRACE_(dwrite_file)("%p, refcount %u.\n", iface, refcount); @@ -6648,7 +6649,7 @@ static ULONG WINAPI inmemoryfilestream_AddRef(IDWriteFontFileStream *iface) static ULONG WINAPI inmemoryfilestream_Release(IDWriteFontFileStream *iface) { struct dwrite_inmemory_filestream *stream = inmemory_impl_from_IDWriteFontFileStream(iface); - ULONG refcount = InterlockedDecrement(&stream->ref); + ULONG refcount = InterlockedDecrement(&stream->refcount); TRACE_(dwrite_file)("%p, refcount %u.\n", iface, refcount); @@ -6739,7 +6740,7 @@ static HRESULT WINAPI inmemoryfontfileloader_QueryInterface(IDWriteInMemoryFontF static ULONG WINAPI inmemoryfontfileloader_AddRef(IDWriteInMemoryFontFileLoader *iface) { struct dwrite_inmemory_fileloader *loader = impl_from_IDWriteInMemoryFontFileLoader(iface); - ULONG refcount = InterlockedIncrement(&loader->ref); + ULONG refcount = InterlockedIncrement(&loader->refcount); TRACE("%p, refcount %u.\n", iface, refcount); @@ -6749,7 +6750,7 @@ static ULONG WINAPI inmemoryfontfileloader_AddRef(IDWriteInMemoryFontFileLoader static ULONG WINAPI inmemoryfontfileloader_Release(IDWriteInMemoryFontFileLoader *iface) { struct dwrite_inmemory_fileloader *loader = impl_from_IDWriteInMemoryFontFileLoader(iface); - ULONG refcount = InterlockedDecrement(&loader->ref); + ULONG refcount = InterlockedDecrement(&loader->refcount); size_t i; TRACE("%p, refcount %u.\n", iface, refcount); @@ -6788,9 +6789,9 @@ static HRESULT WINAPI inmemoryfontfileloader_CreateStreamFromKey(IDWriteInMemory return E_OUTOFMEMORY; stream->IDWriteFontFileStream_iface.lpVtbl = &inmemoryfilestreamvtbl; - stream->ref = 1; + stream->refcount = 1; stream->data = loader->streams[index]; - InterlockedIncrement(&stream->data->ref); + InterlockedIncrement(&stream->data->refcount); *ret = &stream->IDWriteFontFileStream_iface; @@ -6814,7 +6815,7 @@ static HRESULT WINAPI inmemoryfontfileloader_CreateInMemoryFontFileReference(IDW if (!(stream = heap_alloc(sizeof(*stream)))) return E_OUTOFMEMORY; - stream->ref = 1; + stream->refcount = 1; stream->size = data_size; stream->owner = owner; if (stream->owner) { @@ -6866,7 +6867,7 @@ HRESULT create_inmemory_fileloader(IDWriteInMemoryFontFileLoader **ret) return E_OUTOFMEMORY; loader->IDWriteInMemoryFontFileLoader_iface.lpVtbl = &inmemoryfontfileloadervtbl; - loader->ref = 1; + loader->refcount = 1; *ret = &loader->IDWriteInMemoryFontFileLoader_iface;

1 0

Nikolay Sivov : dwrite: Make font data reference assignment more compact.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 24f085badd9c431d518593cb6f3dd0656b7b550e URL: https://source.winehq.org/git/wine.git/?a=commit;h=24f085badd9c431d518593cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 11 12:41:20 2021 +0300 dwrite: Make font data reference assignment more compact. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 3da6b555c02..8e173263ad5 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -496,9 +496,10 @@ static const struct dwrite_fonttable *get_fontface_cpal(struct dwrite_fontface * return &fontface->cpal; } -static void addref_font_data(struct dwrite_font_data *data) +static struct dwrite_font_data * addref_font_data(struct dwrite_font_data *data) { InterlockedIncrement(&data->ref); + return data; } static void release_font_data(struct dwrite_font_data *data) @@ -2645,9 +2646,7 @@ static HRESULT WINAPI dwritefontfamily_GetMatchingFonts(IDWriteFontFamily2 *ifac { if (!func || func(family->data->fonts[i])) { - fonts->fonts[fonts->font_count] = family->data->fonts[i]; - addref_font_data(family->data->fonts[i]); - fonts->font_count++; + fonts->fonts[fonts->font_count++] = addref_font_data(family->data->fonts[i]); } } @@ -5006,8 +5005,7 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li */ if (desc->font_data) { - font_data = desc->font_data; - addref_font_data(font_data); + font_data = addref_font_data(desc->font_data); } else {

1 0

Huw Davies : riched20: Handle EM_REPLACESEL's unicode conversion in the host.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 45d21d00907b804cc6e02b28653d43ab03445a58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45d21d00907b804cc6e02b28… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 11 08:51:03 2021 +0000 riched20: Handle EM_REPLACESEL's unicode conversion in the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 11 ++++------- dlls/riched20/txthost.c | 11 +++++++++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 3d17d2d974f..217394eaafb 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3883,14 +3883,11 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_REPLACESEL: { - int len = 0; - LONG codepage = unicode ? CP_UNICODE : CP_ACP; - LPWSTR wszText = ME_ToUnicode(codepage, (void *)lParam, &len); + WCHAR *text = (WCHAR *)lParam; + int len = text ? lstrlenW( text ) : 0; - TRACE("EM_REPLACESEL - %s\n", debugstr_w(wszText)); - - ME_ReplaceSel(editor, !!wParam, wszText, len); - ME_EndToUnicode(codepage, wszText); + TRACE( "EM_REPLACESEL - %s\n", debugstr_w( text ) ); + ME_ReplaceSel( editor, !!wParam, text, len ); return len; } case EM_SCROLLCARET: diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index ac561ef4c83..064ce3fb827 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -849,6 +849,17 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, EndPaint( editor->hWnd, &ps ); return 0; } + case EM_REPLACESEL: + { + int len; + LONG codepage = unicode ? CP_UNICODE : CP_ACP; + WCHAR *text = ME_ToUnicode( codepage, (void *)lparam, &len ); + + hr = ITextServices_TxSendMessage( host->text_srv, msg, wparam, (LPARAM)text, &res ); + ME_EndToUnicode( codepage, text ); + res = len; + break; + } case EM_SETOPTIONS: { DWORD style;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2021