wine-commits December 2018

wine-commits@winehq.org

1 participants
352 discussions

Eberhard Beilharz : comctl32/imagelist: Fix crash with large number of images.
by Alexandre Julliard 12 Dec '18

12 Dec '18

Module: wine Branch: master Commit: f760079a717042d436a693df59fa1d4416a0e352 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f760079a717042d436a693df… Author: Eberhard Beilharz <eb1(a)sil.org> Date: Tue Dec 11 21:00:23 2018 +0100 comctl32/imagelist: Fix crash with large number of images. Fix a crash that occurred when reading a imagelist with a large number of images. In the particular case we read a cMaxImage value of 1032, but allocated only 40 or so images. This lead to memory corruption in ImageList_Read. This change allows to run TntConnect. Signed-off-by: Eberhard Beilharz <eb1(a)sil.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index a08d607..3e30673 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2273,7 +2273,7 @@ HIMAGELIST WINAPI ImageList_Read(IStream *pstm) TRACE("cx %u, cy %u, flags 0x%04x, cCurImage %u, cMaxImage %u\n", ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cCurImage, ilHead.cMaxImage); - himl = ImageList_Create(ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cCurImage, ilHead.cMaxImage); + himl = ImageList_Create(ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cMaxImage, ilHead.cGrow); if (!himl) return NULL;

1 0

Akihiro Sagawa : advapi32: Load a resource dll as data file in RegLoadMUIStringW.
by Alexandre Julliard 12 Dec '18

12 Dec '18

Module: wine Branch: master Commit: 64addb512b6274e0f393439959ceaa0a0d00fc3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=64addb512b6274e0f3934399… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Dec 12 23:44:07 2018 +0900 advapi32: Load a resource dll as data file in RegLoadMUIStringW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46266 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 3018372..14604e0 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3240,7 +3240,8 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer uiStringId = atoiW(pComma+2); *pComma = '\0'; - hModule = LoadLibraryW(pwszExpandedBuffer + 1); + hModule = LoadLibraryExW(pwszExpandedBuffer + 1, NULL, + LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE); if (!hModule || !load_string(hModule, uiStringId, pwszBuffer, cbBuffer/sizeof(WCHAR))) result = ERROR_BADKEY; FreeLibrary(hModule);

1 0

Akihiro Sagawa : tzres: Make resources translatable.
by Alexandre Julliard 12 Dec '18

12 Dec '18

Module: wine Branch: master Commit: 7435ddbc4068de1c8755e8f3a9682df254b82ef9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7435ddbc4068de1c8755e8f3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Dec 13 00:15:51 2018 +0900 tzres: Make resources translatable. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 6 + po/ar.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/bg.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/ca.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/cs.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/da.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/de.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/el.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/en.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/en_US.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/eo.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/es.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/fa.po | 791 +++++++++++++++++++++++++++++++++++++++++++++++++ po/fi.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/fr.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/he.po | 800 ++++++++++++++++++++++++++++++++++++++++++++++++++ po/hi.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/hr.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/hu.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/it.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/ja.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/ko.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/lt.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/ml.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/nb_NO.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/nl.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/or.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/pa.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/pl.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/pt_BR.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/pt_PT.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/rm.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/ro.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/ru.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/sk.po | 802 ++++++++++++++++++++++++++++++++++++++++++++++++++ po/sl.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 797 ++++++++++++++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)latin.po | 797 ++++++++++++++++++++++++++++++++++++++++++++++++++ po/sv.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/te.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/th.po | 791 +++++++++++++++++++++++++++++++++++++++++++++++++ po/tr.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/uk.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/wa.po | 791 +++++++++++++++++++++++++++++++++++++++++++++++++ po/wine.pot | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/zh_CN.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/zh_TW.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ 47 files changed, 36867 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7435ddbc4068de1c8755…

1 0

Gabriel Ivăncescu : user32: Fix tracking position for non-client scrollbars.
by Alexandre Julliard 12 Dec '18

12 Dec '18

Module: wine Branch: master Commit: d2cf3e976370723cd009acafdc842fdcd2cb4b9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2cf3e976370723cd009acaf… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 11 14:00:06 2018 +0200 user32: Fix tracking position for non-client scrollbars. Non-client scrollbars (SB_HORZ and SB_VERT) don't have their client origin at (0,0) because they can have non-client borders. It is necessary to offset by this origin just as it is done for LBUTTONDOWN. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 95d9761..d611cf0 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -1095,15 +1095,17 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) { MSG msg; + RECT rect; if (scrollbar != SB_CTL) { - RECT rect; WIN_GetRectangles( hwnd, COORDS_CLIENT, &rect, NULL ); ScreenToClient( hwnd, &pt ); pt.x -= rect.left; pt.y -= rect.top; } + else + rect.left = rect.top = 0; SCROLL_HandleScrollEvent( hwnd, scrollbar, WM_LBUTTONDOWN, pt ); @@ -1115,8 +1117,8 @@ void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) msg.message == WM_MOUSEMOVE || (msg.message == WM_SYSTIMER && msg.wParam == SCROLL_TIMER)) { - pt.x = (short)LOWORD(msg.lParam); - pt.y = (short)HIWORD(msg.lParam); + pt.x = (short)LOWORD(msg.lParam) - rect.left; + pt.y = (short)HIWORD(msg.lParam) - rect.top; SCROLL_HandleScrollEvent( hwnd, scrollbar, msg.message, pt ); } else

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 12 Dec '18

12 Dec '18

Module: wine Branch: master Commit: 9cd29b325fa4456123284b6471967e82af47beb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cd29b325fa4456123284b64… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Dec 12 16:05:08 2018 +0200 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 46 +++++++++++++++------------------------------- 1 file changed, 15 insertions(+), 31 deletions(-) diff --git a/po/uk.po b/po/uk.po index 1e0455a..11bf9ad 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-07-15 16:35+0300\n" +"PO-Revision-Date: 2018-12-12 15:58+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -306,25 +306,23 @@ msgstr "Скасування..." #: browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "Залишилося %1!u! %2" #: browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "Залишилося %1!u! %2 and %3!u! %4" #: browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "&Секунди" +msgstr "сек." #: browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "хв." #: browseui.rc:33 msgid "hours" -msgstr "" +msgstr "год." #: comctl32.rc:68 winefile.rc:157 msgid "Properties for %s" @@ -423,16 +421,12 @@ msgid "&Retry" msgstr "По&втор" #: comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "С&ховати вкладки" +msgstr "Сховати подробиці" #: comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "Подробиці" +msgstr "Показати подробиці" #: comctl32.rc:31 cryptui.rc:235 regedit.rc:286 taskmgr.rc:434 winedbg.rc:61 #: winedbg.rc:76 wordpad.rc:180 @@ -2452,16 +2446,12 @@ msgid "You have successfully completed the Certificate Export Wizard." msgstr "Майстер експорту сертифікатів завершив роботу успішно." #: cryptui.rc:456 cryptui.rc:179 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "Вибір сховища сертифікатів" +msgstr "Вибір сертифіката" #: cryptui.rc:459 -#, fuzzy -#| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "Виберіть потрібне сховище сертифікатів:" +msgstr "Виберіть потрібний сертифікат" #: cryptui.rc:30 cryptui.rc:93 msgid "Certificate" @@ -2992,20 +2982,16 @@ msgstr "" "Увага: Приватний ключ для цього сертифікату не може бути експортований." #: cryptui.rc:177 -#, fuzzy -#| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "&Призначена ціль:" +msgstr "Призначення" #: cryptui.rc:178 shell32.rc:152 msgid "Location" msgstr "Розміщення" #: cryptui.rc:180 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select a certificate" -msgstr "Вибір сховища сертифікатів" +msgstr "Виберіть сертифікат" #: cryptui.rc:181 winefile.rc:102 winhlp32.rc:110 winhlp32.rc:85 msgid "Not yet implemented" @@ -11183,10 +11169,8 @@ msgid "Error: Invalid option '%c'.\n" msgstr "Помилка: невірний параметр '%c'.\n" #: hostname.rc:32 -#, fuzzy -#| msgid "Error: Could not find process \"%1\".\n" msgid "Error: Could not get hostname: %u.\n" -msgstr "Помилка: Не вдалось знайти процес \"%1\".\n" +msgstr "Помилка: Не вдалося отримати ім'я хоста: %u.\n" #: hostname.rc:33 msgid "" @@ -14354,11 +14338,11 @@ msgstr "Ко&лір:" #: winecfg.rc:304 msgid "MIME types" -msgstr "" +msgstr "Типи MIME" #: winecfg.rc:305 msgid "Manage file &associations" -msgstr "" +msgstr "Керування &асоціаціями файлів" #: winecfg.rc:308 msgid "Folders"

1 0

Fabian Maurer : riched32: Handle enter press in WM_CHAR instead of WM_KEYDOWN.
by Alexandre Julliard 12 Dec '18

12 Dec '18

Module: wine Branch: master Commit: 52c106418c60141ab816b065eb156df271218228 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52c106418c60141ab816b065… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Dec 12 11:48:00 2018 +0000 riched32: Handle enter press in WM_CHAR instead of WM_KEYDOWN. This fixes an old regression when VK_RETURN handling was implemented Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=23282 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 16 +++++++++++----- dlls/riched20/tests/editor.c | 29 +++++++++++++++++++++++++++++ dlls/riched32/tests/editor.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 79c9636..9bacc63 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2668,7 +2668,9 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) ME_SendRequestResize(editor, FALSE); return TRUE; case VK_RETURN: - return handle_enter(editor); + if (!editor->bEmulateVersion10) + return handle_enter(editor); + break; case VK_ESCAPE: if (editor->bDialogMode && editor->hwndParent) PostMessageW(editor->hwndParent, WM_CLOSE, 0, 0); @@ -2740,6 +2742,12 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, if (editor->bMouseCaptured) return 0; + if (editor->styleFlags & ES_READONLY) + { + MessageBeep(MB_ICONERROR); + return 0; /* FIXME really 0 ? */ + } + if (unicode) wstr = (WCHAR)charCode; else @@ -2748,10 +2756,8 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, MultiByteToWideChar(CP_ACP, 0, &charA, 1, &wstr, 1); } - if (editor->styleFlags & ES_READONLY) { - MessageBeep(MB_ICONERROR); - return 0; /* FIXME really 0 ? */ - } + if (editor->bEmulateVersion10 && wstr == '\r') + handle_enter(editor); if ((unsigned)wstr >= ' ' || wstr == '\t') { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 782d6d8..932c8a1 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8273,6 +8273,7 @@ static void format_test_result(char *target, const char *src) * inserts CR. If shows that EM_GETTEXTEX with GT_USECRLF == WM_GETTEXT * and also shows that GT_USECRLF has no effect in richedit 1.0, but * does for higher. The same test is cloned in riched32 and riched20. + * Also shows the difference between WM_CHAR/WM_KEYDOWN in v1.0 and higher versions */ static void test_enter(void) { @@ -8353,6 +8354,34 @@ static void test_enter(void) i, resultbuf, expectedbuf); } + /* Show that WM_CHAR is handled differently from WM_KEYDOWN */ + getText.flags = GT_DEFAULT; + getText.codepage = CP_ACP; + + result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)""); + ok (result == 1, "[%d] WM_SETTEXT returned %ld instead of 1\n", i, result); + SendMessageW(hwndRichEdit, WM_CHAR, 'T', 0); + SendMessageW(hwndRichEdit, WM_KEYDOWN, VK_RETURN, 0); + + result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); + ok(result == 2, "Got %d\n", (int)result); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, "T\r"); + result = strcmp(resultbuf, expectedbuf); + ok (result == 0, "[%d] EM_GETTEXTEX, GT_DEFAULT unexpected '%s', expected '%s'\n", i, resultbuf, expectedbuf); + + result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)""); + ok (result == 1, "[%d] WM_SETTEXT returned %ld instead of 1\n", i, result); + SendMessageW(hwndRichEdit, WM_CHAR, 'T', 0); + SendMessageW(hwndRichEdit, WM_CHAR, '\r', 0); + + result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); + ok(result == 1, "Got %d\n", (int)result); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, "T"); + result = strcmp(resultbuf, expectedbuf); + ok (result == 0, "[%d] EM_GETTEXTEX, GT_DEFAULT unexpected '%s', expected '%s'\n", i, resultbuf, expectedbuf); + DestroyWindow(hwndRichEdit); } diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index a60d21b..dd9773c 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -1163,6 +1163,7 @@ static void format_test_result(char *target, const char *src) * inserts CR. If shows that EM_GETTEXTEX with GT_USECRLF == WM_GETTEXT * and also shows that GT_USECRLF has no effect in richedit 1.0, but * does for higher. The same test is cloned in riched32 and riched20. + * Also shows the difference between WM_CHAR/WM_KEYDOWN in v1.0 and higher versions */ static void test_enter(void) { @@ -1241,6 +1242,34 @@ static void test_enter(void) i, resultbuf, expectedbuf); } + /* Show that WM_CHAR is handled differently from WM_KEYDOWN */ + getText.flags = GT_DEFAULT; + getText.codepage = CP_ACP; + + result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)""); + ok (result == 1, "[%d] WM_SETTEXT returned %ld instead of 1\n", i, result); + SendMessageW(hwndRichEdit, WM_CHAR, 'T', 0); + SendMessageW(hwndRichEdit, WM_KEYDOWN, VK_RETURN, 0); + + result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); + ok(result == 1, "Got %d\n", (int)result); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, "T"); + result = strcmp(resultbuf, expectedbuf); + ok (result == 0, "[%d] EM_GETTEXTEX, GT_DEFAULT unexpected '%s', expected '%s'\n", i, resultbuf, expectedbuf); + + result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)""); + ok (result == 1, "[%d] WM_SETTEXT returned %ld instead of 1\n", i, result); + SendMessageW(hwndRichEdit, WM_CHAR, 'T', 0); + SendMessageW(hwndRichEdit, WM_CHAR, '\r', 0); + + SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); + ok(result == 1, "Got %d\n", (int)result); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, "T\r\n"); + result = strcmp(resultbuf, expectedbuf); + ok (result == 0, "[%d] EM_GETTEXTEX, GT_DEFAULT unexpected '%s', expected '%s'\n", i, resultbuf, expectedbuf); + DestroyWindow(hwndRichEdit); }

1 0

Fabian Maurer : riched20/tests: Refactor tests testing VK_RETURN.
by Alexandre Julliard 12 Dec '18

12 Dec '18

Module: wine Branch: master Commit: c03c5397a27f24162011039e86cb5cdb81f045df URL: https://source.winehq.org/git/wine.git/?a=commit;h=c03c5397a27f24162011039e… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Dec 12 11:47:59 2018 +0000 riched20/tests: Refactor tests testing VK_RETURN. This is basically a no-op to make the tests and the following additions simpler Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 57 ++++++++++++++++++-------------------------- dlls/riched32/tests/editor.c | 57 ++++++++++++++++++-------------------------- 2 files changed, 46 insertions(+), 68 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 035869e..782d6d8 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8259,6 +8259,14 @@ static void test_EM_FINDWORDBREAK_A(void) DestroyWindow(hwndRichEdit); } +static void format_test_result(char *target, const char *src) +{ + int i; + for (i = 0; i < strlen(src); i++) + sprintf(target + 2*i, "%02x", src[i] & 0xFF); + target[2*i] = 0; +} + /* * This test attempts to show the effect of enter on a richedit * control v1.0 inserts CRLF whereas for higher versions it only @@ -8285,15 +8293,14 @@ static void test_enter(void) char expectedbuf[1024]; char resultbuf[1024]; HWND hwndRichEdit = new_richedit(NULL); - UINT i,j; - - for (i = 0; i < ARRAY_SIZE(testenteritems); i++) { - - char buf[1024] = {0}; - LRESULT result; - GETTEXTEX getText; - const char *expected; + UINT i; + char buf[1024] = {0}; + GETTEXTEX getText = {sizeof(buf)}; + LRESULT result; + const char *expected; + for (i = 0; i < ARRAY_SIZE(testenteritems); i++) + { /* Set the text to the initial text */ result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)testenteritems[i].initialtext); ok (result == 1, "[%d] WM_SETTEXT returned %ld instead of 1\n", i, result); @@ -8307,12 +8314,8 @@ static void test_enter(void) result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buf); expected = testenteritems[i].expectedwmtext; - resultbuf[0]=0x00; - for (j = 0; j < (UINT)result; j++) - sprintf(resultbuf+strlen(resultbuf), "%02x", buf[j] & 0xFF); - expectedbuf[0] = '\0'; - for (j = 0; j < strlen(expected); j++) - sprintf(expectedbuf+strlen(expectedbuf), "%02x", expected[j] & 0xFF); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, expected); result = strcmp(expected, buf); ok (result == 0, @@ -8320,21 +8323,14 @@ static void test_enter(void) i, resultbuf, expectedbuf); /* 2. Retrieve with EM_GETTEXTEX, GT_DEFAULT */ - getText.cb = sizeof(buf); getText.flags = GT_DEFAULT; - getText.codepage = CP_ACP; - getText.lpDefaultChar = NULL; - getText.lpUsedDefChar = NULL; + getText.codepage = CP_ACP; buf[0] = 0x00; result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); expected = testenteritems[i].expectedemtext; - resultbuf[0]=0x00; - for (j = 0; j < (UINT)result; j++) - sprintf(resultbuf+strlen(resultbuf), "%02x", buf[j] & 0xFF); - expectedbuf[0] = '\0'; - for (j = 0; j < strlen(expected); j++) - sprintf(expectedbuf+strlen(expectedbuf), "%02x", expected[j] & 0xFF); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, expected); result = strcmp(expected, buf); ok (result == 0, @@ -8342,21 +8338,14 @@ static void test_enter(void) i, resultbuf, expectedbuf); /* 3. Retrieve with EM_GETTEXTEX, GT_USECRLF */ - getText.cb = sizeof(buf); getText.flags = GT_USECRLF; - getText.codepage = CP_ACP; - getText.lpDefaultChar = NULL; - getText.lpUsedDefChar = NULL; + getText.codepage = CP_ACP; buf[0] = 0x00; result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); expected = testenteritems[i].expectedemtextcrlf; - resultbuf[0]=0x00; - for (j = 0; j < (UINT)result; j++) - sprintf(resultbuf+strlen(resultbuf), "%02x", buf[j] & 0xFF); - expectedbuf[0] = '\0'; - for (j = 0; j < strlen(expected); j++) - sprintf(expectedbuf+strlen(expectedbuf), "%02x", expected[j] & 0xFF); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, expected); result = strcmp(expected, buf); ok (result == 0, diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 7751d2b..a60d21b 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -1149,6 +1149,14 @@ static void simulate_typing_characters(HWND hwnd, const char* szChars) } } +static void format_test_result(char *target, const char *src) +{ + int i; + for (i = 0; i < strlen(src); i++) + sprintf(target + 2*i, "%02x", src[i] & 0xFF); + target[2*i] = 0; +} + /* * This test attempts to show the effect of enter on a richedit * control v1.0 inserts CRLF whereas for higher versions it only @@ -1173,15 +1181,14 @@ static void test_enter(void) char expectedbuf[1024]; char resultbuf[1024]; HWND hwndRichEdit = new_richedit(NULL); - UINT i,j; - - for (i = 0; i < ARRAY_SIZE(testenteritems); i++) { - - char buf[1024] = {0}; - LRESULT result; - GETTEXTEX getText; - const char *expected; + UINT i; + char buf[1024] = {0}; + GETTEXTEX getText = {sizeof(buf)}; + LRESULT result; + const char *expected; + for (i = 0; i < ARRAY_SIZE(testenteritems); i++) + { /* Set the text to the initial text */ result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)testenteritems[i].initialtext); ok (result == 1, "[%d] WM_SETTEXT returned %ld instead of 1\n", i, result); @@ -1195,12 +1202,8 @@ static void test_enter(void) result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buf); expected = testenteritems[i].expectedtext; - resultbuf[0]=0x00; - for (j = 0; j < (UINT)result; j++) - sprintf(resultbuf+strlen(resultbuf), "%02x", buf[j] & 0xFF); - expectedbuf[0] = '\0'; - for (j = 0; j < strlen(expected); j++) - sprintf(expectedbuf+strlen(expectedbuf), "%02x", expected[j] & 0xFF); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, expected); result = strcmp(expected, buf); ok (result == 0, @@ -1208,21 +1211,14 @@ static void test_enter(void) i, resultbuf, expectedbuf); /* 2. Retrieve with EM_GETTEXTEX, GT_DEFAULT */ - getText.cb = sizeof(buf); getText.flags = GT_DEFAULT; - getText.codepage = CP_ACP; - getText.lpDefaultChar = NULL; - getText.lpUsedDefChar = NULL; + getText.codepage = CP_ACP; buf[0] = 0x00; result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); expected = testenteritems[i].expectedtext; - resultbuf[0]=0x00; - for (j = 0; j < (UINT)result; j++) - sprintf(resultbuf+strlen(resultbuf), "%02x", buf[j] & 0xFF); - expectedbuf[0] = '\0'; - for (j = 0; j < strlen(expected); j++) - sprintf(expectedbuf+strlen(expectedbuf), "%02x", expected[j] & 0xFF); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, expected); result = strcmp(expected, buf); ok (result == 0 || broken(buf[0]==0x00 /* WinNT4 */), @@ -1230,21 +1226,14 @@ static void test_enter(void) i, resultbuf, expectedbuf); /* 3. Retrieve with EM_GETTEXTEX, GT_USECRLF */ - getText.cb = sizeof(buf); getText.flags = GT_USECRLF; - getText.codepage = CP_ACP; - getText.lpDefaultChar = NULL; - getText.lpUsedDefChar = NULL; + getText.codepage = CP_ACP; buf[0] = 0x00; result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); expected = testenteritems[i].expectedtext; - resultbuf[0]=0x00; - for (j = 0; j < (UINT)result; j++) - sprintf(resultbuf+strlen(resultbuf), "%02x", buf[j] & 0xFF); - expectedbuf[0] = '\0'; - for (j = 0; j < strlen(expected); j++) - sprintf(expectedbuf+strlen(expectedbuf), "%02x", expected[j] & 0xFF); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, expected); result = strcmp(expected, buf); ok (result == 0 || broken(buf[0]==0x00 /* WinNT4 */),

1 0

Fabian Maurer : riched20: Extract handling of VK_RETURN into a method.
by Alexandre Julliard 12 Dec '18

12 Dec '18

Module: wine Branch: master Commit: 4d72bde62fff194acef93f40b3240949947a4c36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d72bde62fff194acef93f40… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Dec 12 11:47:58 2018 +0000 riched20: Extract handling of VK_RETURN into a method. This is basically a no-op to make the following fix simpler Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 333 ++++++++++++++++++++++++++----------------------- 1 file changed, 176 insertions(+), 157 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4d72bde62fff194acef9…

1 0

Alistair Leslie-Hughes : user32/edit: Don't set caret position when we don 't have focus.
by Alexandre Julliard 12 Dec '18

12 Dec '18

Module: wine Branch: master Commit: 7b742485f901fd305833d37ba602b5efe4dfc44f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b742485f901fd305833d37b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Dec 6 21:23:47 2018 +0000 user32/edit: Don't set caret position when we don't have focus. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 48c65ea..6f8f412 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1799,9 +1799,14 @@ static LRESULT EDIT_EM_Scroll(EDITSTATE *es, INT action) static void EDIT_SetCaretPos(EDITSTATE *es, INT pos, BOOL after_wrap) { - LRESULT res = EDIT_EM_PosFromChar(es, pos, after_wrap); - TRACE("%d - %dx%d\n", pos, (short)LOWORD(res), (short)HIWORD(res)); - SetCaretPos((short)LOWORD(res), (short)HIWORD(res)); + LRESULT res; + + if (es->flags & EF_FOCUSED) + { + res = EDIT_EM_PosFromChar(es, pos, after_wrap); + TRACE("%d - %dx%d\n", pos, (short)LOWORD(res), (short)HIWORD(res)); + SetCaretPos((short)LOWORD(res), (short)HIWORD(res)); + } } @@ -1870,7 +1875,6 @@ static void EDIT_EM_ScrollCaret(EDITSTATE *es) } } - if(es->flags & EF_FOCUSED) EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP); }

1 0

Francois Gouget : testbot/SetWinLocale: Automate changing the Windows locales.
by Alexandre Julliard 12 Dec '18

12 Dec '18

Module: tools Branch: master Commit: 7c9506177aba7f3a7d99d766de22aba4dbff8c73 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7c9506177aba7f3a7d99d76… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 12 16:58:35 2018 +0100 testbot/SetWinLocale: Automate changing the Windows locales. SetWinLocale leverages TestAgent and intl.cpl to automate changing the Windows locales of the specified host: sorting and formatting, system locale, display language, keyboard and location. It can also create locale VMs for the TestBot, that is copies of a base VM that allow the TestBot to run the tests in the specified locale. Then it can recreate a specific locale VM snapshot from the base snapshot, or refresh the snapshots of all the locale VMs of a given base VM. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/SetWinLocale | 857 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 857 insertions(+) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=7c9506177aba7f3a7d9…

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
36
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2018