August 2009 - Wine-Commits - list.winehq.org

Ricardo Filipe : regedit: Update Portuguese translation.
by Alexandre Julliard Aug. 6, 2009

Aug. 6, 2009

Module: wine Branch: master Commit: c25523c7c79c88fe2ca7662efab30ddd66767364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c25523c7c79c88fe2ca7662ef… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Thu Aug 6 04:35:59 2009 -0700 regedit: Update Portuguese translation. --- programs/regedit/Pt.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/regedit/Pt.rc b/programs/regedit/Pt.rc index 3c1607e..b482148 100644 --- a/programs/regedit/Pt.rc +++ b/programs/regedit/Pt.rc @@ -374,6 +374,7 @@ BEGIN ID_EDIT_NEW_STRINGVALUE "Adiciona um novo valor texto." ID_EDIT_NEW_BINARYVALUE "Adiciona um novo valor binário." ID_EDIT_NEW_DWORDVALUE "Adiciona um novo valor DWORD." + ID_EDIT_NEW_MULTI_STRINGVALUE "Adiciona um novo valor multi string" ID_REGISTRY_IMPORTREGISTRYFILE "Importa um ficheiro de texto para o registo." ID_REGISTRY_EXPORTREGISTRYFILE "Exporta todo ou parte do registo para um ficheiro de texto." @@ -419,6 +420,7 @@ BEGIN ID_EDIT_COPYKEYNAME "Copia o nome da chave seleccionada para a Área de transferência." ID_EDIT_FIND "Localiza um texto numa chave, valor ou dado." ID_EDIT_FINDNEXT "Localiza a próxima ocorrência do texto indicado na pesquisa anterior." + ID_EDIT_EXPORT "Exporta o ramo seleccionado do registo para um ficheiro de texto" END

1 0

Ricardo Filipe : wininet: Fix Portuguese translation and convert to UTF8.
by Alexandre Julliard Aug. 6, 2009

Aug. 6, 2009

Module: wine Branch: master Commit: 57675f801cab7506c13b00a510de1528bd62a680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57675f801cab7506c13b00a51… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Thu Aug 6 04:17:02 2009 -0700 wininet: Fix Portuguese translation and convert to UTF8. --- dlls/wininet/wininet_Pt.rc | 32 +++++++++++++++++++++++++++----- 1 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/wininet_Pt.rc b/dlls/wininet/wininet_Pt.rc index a968ab4..95e06e6 100644 --- a/dlls/wininet/wininet_Pt.rc +++ b/dlls/wininet/wininet_Pt.rc @@ -1,6 +1,7 @@ /* * Copyright 2003 Marcelo Duarte - * Copyright 2006-2007 Am�rico Jos� Melo + * Copyright 2006-2007 Américo José Melo + * Copyright 2009 Ricardo Filipe * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,6 +20,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 @@ -26,10 +29,10 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Entrar Senha da Rede" FONT 8, "MS Shell Dlg" { - LTEXT "Por favor, entre com o nome de usu�rio e a senha:", -1, 40, 6, 150, 15 + LTEXT "Por favor, entre com o nome de usuário e a senha:", -1, 40, 6, 150, 15 LTEXT "Proxy", -1, 40, 26, 50, 10 LTEXT "Realm", -1, 40, 46, 50, 10 - LTEXT "Usu�rio", -1, 40, 66, 50, 10 + LTEXT "Usuário", -1, 40, 66, 50, 10 LTEXT "Senha", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 @@ -63,17 +66,36 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Autenticação necessária" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Por favor insira o seu nome de utilizador e palavra-passe:", -1, 40, 6, 150, 15 + LTEXT "Servidor", -1, 40, 26, 50, 10 + LTEXT "Reino", -1, 40, 46, 50, 10 + LTEXT "Utilizador", -1, 40, 66, 50, 10 + LTEXT "Palavra-passe", -1, 40, 86, 50, 10 + LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Guardar esta palavra-passe (inseguro)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE DISCARDABLE { - IDS_LANCONNECTION "Conex�o LAN" + IDS_LANCONNECTION "Conexão LAN" } LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE DISCARDABLE { - IDS_LANCONNECTION "Liga��o LAN" + IDS_LANCONNECTION "Ligação LAN" }

1 0

Ricardo Filipe : jscript: Add Portuguese translation.
by Alexandre Julliard Aug. 6, 2009

Aug. 6, 2009

Module: wine Branch: master Commit: 63aec3f32585ea3c20e6c70f41e1e6a0d1aa41f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63aec3f32585ea3c20e6c70f4… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Thu Aug 6 04:11:19 2009 -0700 jscript: Add Portuguese translation. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/jscript_Pt.rc | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 489567f..e1e164f 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -11,6 +11,7 @@ RC_SRCS = \ jscript_Fr.rc \ jscript_Lt.rc \ jscript_Nl.rc \ + jscript_Pt.rc \ rsrc.rc C_SRCS = \ diff --git a/dlls/jscript/jscript_Pt.rc b/dlls/jscript/jscript_Pt.rc new file mode 100644 index 0000000..87a7914 --- /dev/null +++ b/dlls/jscript/jscript_Pt.rc @@ -0,0 +1,42 @@ +/* + * Copyright 2009 Ricardo Filipe + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +STRINGTABLE DISCARDABLE +{ + IDS_TO_PRIMITIVE "Erro ao converter objecto em tipo primitivo" + IDS_INVALID_CALL_ARG "Argumento ou chamada de procedimento inválida" + IDS_NO_PROPERTY "O objecto não suporta esta propriedade ou método" + IDS_ARG_NOT_OPT "Argumento não opcional" + IDS_SYNTAX_ERROR "Erro de sintaxe" + IDS_SEMICOLON "';' esperado" + IDS_LBRACKET "'(' esperado" + IDS_RBRACKET "')' esperado" + IDS_NOT_FUNC "Função esperada" + IDS_NOT_DATE "'[object]' não é um objecto de data" + IDS_NOT_NUM "Número esperado" + IDS_ILLEGAL_ASSIGN "Atribuição ilegal" + IDS_UNDEFINED "'|' é indefinido" + IDS_NOT_BOOL "Objecto boleano esperado" + IDS_INVALID_LENGTH "Tamanho do vector tem de ser um inteiro finito positivo" +}

1 0

Alexandre Julliard : make_makefiles: Fix handling of .mc files.
by Alexandre Julliard Aug. 6, 2009

Aug. 6, 2009

Module: wine Branch: master Commit: 29cec05c6f0073372417f59d469fb1649cc9c505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29cec05c6f0073372417f59d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 6 14:42:28 2009 +0200 make_makefiles: Fix handling of .mc files. --- tools/make_makefiles | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index fb15697..44cab39 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -301,7 +301,7 @@ sub assign_sources_to_makefiles() elsif ($basename =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $basename; } elsif ($basename =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $basename; } elsif ($basename =~ /\.rc$/) { push @{${$make}{"=RC_SRCS"}}, $basename; } - elsif ($basename =~ /\.rc$/) { push @{${$make}{"=RC_SRCS"}}, $basename; } + elsif ($basename =~ /\.mc$/) { push @{${$make}{"=MC_SRCS"}}, $basename; } elsif ($basename =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $basename; } } }

1 0

Vladimir Pankratov : kernel32: Convert the Russian resources to UTF-8.
by Alexandre Julliard Aug. 6, 2009

Aug. 6, 2009

Module: wine Branch: master Commit: d1de34a58b6e66752f640d0c728f33f457bed55e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1de34a58b6e66752f640d0c7… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Aug 6 16:20:14 2009 +0500 kernel32: Convert the Russian resources to UTF-8. --- dlls/kernel32/nls/rus.nls | 128 ++++++++++++++++++++++---------------------- 1 files changed, 64 insertions(+), 64 deletions(-) diff --git a/dlls/kernel32/nls/rus.nls b/dlls/kernel32/nls/rus.nls index ced98f2..fdda023 100644 --- a/dlls/kernel32/nls/rus.nls +++ b/dlls/kernel32/nls/rus.nls @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1251) +#pragma code_page(65001) STRINGTABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT { @@ -63,37 +63,37 @@ STRINGTABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT LOCALE_S1159 "" LOCALE_S2359 "" LOCALE_SABBREVCTRYNAME "RUS" - LOCALE_SABBREVDAYNAME1 "��" - LOCALE_SABBREVDAYNAME2 "��" - LOCALE_SABBREVDAYNAME3 "��" - LOCALE_SABBREVDAYNAME4 "��" - LOCALE_SABBREVDAYNAME5 "��" - LOCALE_SABBREVDAYNAME6 "��" - LOCALE_SABBREVDAYNAME7 "��" + LOCALE_SABBREVDAYNAME1 "Пн" + LOCALE_SABBREVDAYNAME2 "Вт" + LOCALE_SABBREVDAYNAME3 "Ср" + LOCALE_SABBREVDAYNAME4 "Чт" + LOCALE_SABBREVDAYNAME5 "Пт" + LOCALE_SABBREVDAYNAME6 "Сб" + LOCALE_SABBREVDAYNAME7 "Вс" LOCALE_SABBREVLANGNAME "RUS" - LOCALE_SABBREVMONTHNAME1 "��" - LOCALE_SABBREVMONTHNAME2 "��" - LOCALE_SABBREVMONTHNAME3 "��" - LOCALE_SABBREVMONTHNAME4 "��" - LOCALE_SABBREVMONTHNAME5 "��" - LOCALE_SABBREVMONTHNAME6 "��" - LOCALE_SABBREVMONTHNAME7 "��" - LOCALE_SABBREVMONTHNAME8 "��" - LOCALE_SABBREVMONTHNAME9 "��" - LOCALE_SABBREVMONTHNAME10 "��" - LOCALE_SABBREVMONTHNAME11 "��" - LOCALE_SABBREVMONTHNAME12 "��" + LOCALE_SABBREVMONTHNAME1 "янв" + LOCALE_SABBREVMONTHNAME2 "фев" + LOCALE_SABBREVMONTHNAME3 "мар" + LOCALE_SABBREVMONTHNAME4 "апр" + LOCALE_SABBREVMONTHNAME5 "май" + LOCALE_SABBREVMONTHNAME6 "июн" + LOCALE_SABBREVMONTHNAME7 "июл" + LOCALE_SABBREVMONTHNAME8 "авг" + LOCALE_SABBREVMONTHNAME9 "сен" + LOCALE_SABBREVMONTHNAME10 "окт" + LOCALE_SABBREVMONTHNAME11 "ноя" + LOCALE_SABBREVMONTHNAME12 "дек" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Russia" - LOCALE_SCURRENCY "�." + LOCALE_SCURRENCY "р." LOCALE_SDATE "." - LOCALE_SDAYNAME1 "��" - LOCALE_SDAYNAME2 "��" - LOCALE_SDAYNAME3 "��" - LOCALE_SDAYNAME4 "��" - LOCALE_SDAYNAME5 "��" - LOCALE_SDAYNAME6 "��" - LOCALE_SDAYNAME7 "��" + LOCALE_SDAYNAME1 "понедельник" + LOCALE_SDAYNAME2 "вторник" + LOCALE_SDAYNAME3 "среда" + LOCALE_SDAYNAME4 "четверг" + LOCALE_SDAYNAME5 "пятница" + LOCALE_SDAYNAME6 "суббота" + LOCALE_SDAYNAME7 "воскресенье" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Russia" LOCALE_SENGCURRNAME "Russian Ruble" @@ -104,53 +104,53 @@ STRINGTABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT LOCALE_SISO639LANGNAME "ru" LOCALE_SLANGUAGE "Russian" LOCALE_SLIST ";" - LOCALE_SLONGDATE "d MMMM yyyy '�.'" + LOCALE_SLONGDATE "d MMMM yyyy 'г.'" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "��" - LOCALE_SMONTHNAME2 "��" - LOCALE_SMONTHNAME3 "��" - LOCALE_SMONTHNAME4 "��" - LOCALE_SMONTHNAME5 "��" - LOCALE_SMONTHNAME6 "��" - LOCALE_SMONTHNAME7 "��" - LOCALE_SMONTHNAME8 "��" - LOCALE_SMONTHNAME9 "��" - LOCALE_SMONTHNAME10 "��" - LOCALE_SMONTHNAME11 "��" - LOCALE_SMONTHNAME12 "��" + LOCALE_SMONTHNAME1 "Январь" + LOCALE_SMONTHNAME2 "Февраль" + LOCALE_SMONTHNAME3 "Март" + LOCALE_SMONTHNAME4 "Апрель" + LOCALE_SMONTHNAME5 "Май" + LOCALE_SMONTHNAME6 "Июнь" + LOCALE_SMONTHNAME7 "Июль" + LOCALE_SMONTHNAME8 "Август" + LOCALE_SMONTHNAME9 "Сентябрь" + LOCALE_SMONTHNAME10 "Октябрь" + LOCALE_SMONTHNAME11 "Ноябрь" + LOCALE_SMONTHNAME12 "Декабрь" LOCALE_SMONTHNAME13 "" - LOCALE_SMONTHOUSANDSEP "�" + LOCALE_SMONTHOUSANDSEP " " LOCALE_SNAME "ru-RU" - LOCALE_SNATIVECTRYNAME "��" - LOCALE_SNATIVECURRNAME "��" + LOCALE_SNATIVECTRYNAME "Россия" + LOCALE_SNATIVECURRNAME "рубль" LOCALE_SNATIVEDIGITS "0123456789" - LOCALE_SNATIVELANGNAME "��" + LOCALE_SNATIVELANGNAME "русский" LOCALE_SNEGATIVESIGN "-" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Cyrl;" LOCALE_SSHORTDATE "dd.MM.yyyy" LOCALE_SSORTNAME "Default" - LOCALE_STHOUSAND "�" + LOCALE_STHOUSAND " " LOCALE_STIME ":" LOCALE_STIMEFORMAT "H:mm:ss" - LOCALE_SYEARMONTH "MMMM yyyy '�.'" + LOCALE_SYEARMONTH "MMMM yyyy 'г.'" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "��" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "��" - LGRPID_BALTIC+LGRPID_RES_BASE "��" - LGRPID_GREEK+LGRPID_RES_BASE "��" - LGRPID_CYRILLIC+LGRPID_RES_BASE "��" - LGRPID_TURKISH+LGRPID_RES_BASE "��" - LGRPID_JAPANESE+LGRPID_RES_BASE "��" - LGRPID_KOREAN+LGRPID_RES_BASE "��" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "�� " - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "�� " - LGRPID_THAI+LGRPID_RES_BASE "��" - LGRPID_HEBREW+LGRPID_RES_BASE "��" - LGRPID_ARABIC+LGRPID_RES_BASE "��" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "��" - LGRPID_INDIC+LGRPID_RES_BASE "��" - LGRPID_GEORGIAN+LGRPID_RES_BASE "��" - LGRPID_ARMENIAN+LGRPID_RES_BASE "��" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Западный" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Центральноевропейский" + LGRPID_BALTIC+LGRPID_RES_BASE "Балтийский" + LGRPID_GREEK+LGRPID_RES_BASE "Греческий" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Кириллический" + LGRPID_TURKISH+LGRPID_RES_BASE "Турецкий" + LGRPID_JAPANESE+LGRPID_RES_BASE "Японский" + LGRPID_KOREAN+LGRPID_RES_BASE "Корейский" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Китайский традиционный" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Китайский упрощённый" + LGRPID_THAI+LGRPID_RES_BASE "Тайский" + LGRPID_HEBREW+LGRPID_RES_BASE "Иврит" + LGRPID_ARABIC+LGRPID_RES_BASE "Арабский" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Вьетнамский" + LGRPID_INDIC+LGRPID_RES_BASE "Индийский" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Грузинский" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Армянский" }

1 0

Nikolay Sivov : comctl32/treeview: Handle EN_KILLFOCUS in WM_COMMAND handler.
by Alexandre Julliard Aug. 6, 2009

Aug. 6, 2009

Module: wine Branch: master Commit: 861fb2eddd6be186bc08b06b0e58ebf4fb650eed URL: http://source.winehq.org/git/wine.git/?a=commit;h=861fb2eddd6be186bc08b06b0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Aug 6 13:43:18 2009 +0400 comctl32/treeview: Handle EN_KILLFOCUS in WM_COMMAND handler. --- dlls/comctl32/tests/treeview.c | 2 +- dlls/comctl32/treeview.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 06a0445..252949f 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -875,7 +875,7 @@ static void test_itemedit(void) r = SendMessage(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); expect(0, r); - todo_wine ok(!IsWindow(edit), "Expected edit control to be destroyed\n"); + ok(!IsWindow(edit), "Expected edit control to be destroyed\n"); DestroyWindow(hTree); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 8155aab..84a8c30 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3637,6 +3637,9 @@ TREEVIEW_Command(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ReleaseDC(infoPtr->hwnd, hdc); break; } + case EN_KILLFOCUS: + TREEVIEW_EndEditLabelNow(infoPtr, FALSE); + break; default: return SendMessageW(infoPtr->hwndNotify, WM_COMMAND, wParam, lParam); @@ -3757,8 +3760,7 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) WCHAR *newText = tmpText; int iLength = 0; - if (!infoPtr->hwndEdit) - return FALSE; + if (!IsWindow(infoPtr->hwndEdit)) return FALSE; tvdi.hdr.hwndFrom = hwnd; tvdi.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID);

1 0

Nikolay Sivov : comctl32/treeview: Some tests to show edit item label problems.
by Alexandre Julliard Aug. 6, 2009

Aug. 6, 2009

Module: wine Branch: master Commit: 578e872b313859b0a340794bf60565ac554ea71f URL: http://source.winehq.org/git/wine.git/?a=commit;h=578e872b313859b0a340794bf… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Aug 6 13:21:22 2009 +0400 comctl32/treeview: Some tests to show edit item label problems. --- dlls/comctl32/tests/treeview.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 967b888..06a0445 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -858,6 +858,28 @@ static void test_expandinvisible(void) DestroyWindow(hTree); } +static void test_itemedit(void) +{ + DWORD r; + HWND edit; + + hTree = create_treeview_control(); + fill_tree(hTree); + + /* trigger edit */ + edit = (HWND)SendMessage(hTree, TVM_EDITLABEL, 0, (LPARAM)hRoot); + ok(IsWindow(edit), "Expected valid handle\n"); + /* item shouldn't be selected automatically after TVM_EDITLABEL */ + r = SendMessage(hTree, TVM_GETITEMSTATE, (WPARAM)hRoot, TVIS_SELECTED); + todo_wine expect(0, r); + + r = SendMessage(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); + expect(0, r); + todo_wine ok(!IsWindow(edit), "Expected edit control to be destroyed\n"); + + DestroyWindow(hTree); +} + START_TEST(treeview) { HMODULE hComctl32; @@ -905,6 +927,7 @@ START_TEST(treeview) test_getset(); test_callback(); test_expandinvisible(); + test_itemedit(); PostMessageA(hMainWnd, WM_CLOSE, 0, 0); while(GetMessageA(&msg,0,0,0)) {

1 0

Nikolay Sivov : comctl32/treeview: Make tests not depend from each other, replace some magics with macros.
by Alexandre Julliard Aug. 6, 2009

Aug. 6, 2009

Module: wine Branch: master Commit: 0adb4ef4233572ff5ea1dded754694a68c730cdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0adb4ef4233572ff5ea1dded7… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Aug 6 12:56:48 2009 +0400 comctl32/treeview: Make tests not depend from each other, replace some magics with macros. --- dlls/comctl32/tests/treeview.c | 341 +++++++++++++++++++++------------------- 1 files changed, 178 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0adb4ef4233572ff5ea1d…

1 0

Nikolay Sivov : comctl32/treeview: Use a common structure for tests ( as we use already for others).
by Alexandre Julliard Aug. 6, 2009

Aug. 6, 2009

Module: wine Branch: master Commit: b32bccb4da74f79a5015c41ea0e9bbedc2a7df02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32bccb4da74f79a5015c41ea… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Aug 6 00:17:13 2009 +0400 comctl32/treeview: Use a common structure for tests (as we use already for others). --- dlls/comctl32/tests/treeview.c | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index d0767f3..ed9c18f 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -238,6 +238,8 @@ static void FillRoot(void) static CHAR root[] = "Root", child[] = "Child"; + flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); + Clear(); AddItem('A'); ins.hParent = TVI_ROOT; @@ -262,6 +264,7 @@ static void FillRoot(void) hChild = TreeView_InsertItem(hTree, &ins); assert(hChild); AddItem('.'); + ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, FillRootSeq, "FillRoot", FALSE); ok(!strcmp(sequence, "AB."), "Item creation\n"); } @@ -331,6 +334,9 @@ static void TestCallback(void) static void DoTest1(void) { BOOL r; + + flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); + r = TreeView_SelectItem(hTree, NULL); Clear(); AddItem('1'); @@ -345,11 +351,15 @@ static void DoTest1(void) r = TreeView_SelectItem(hTree, hRoot); AddItem('.'); ok(!strcmp(sequence, "1(nR)nR23(Rn)Rn45(nR)nR."), "root-none select test\n"); + ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, DoTest1Seq, "DoTest1", FALSE); } static void DoTest2(void) { BOOL r; + + flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); + r = TreeView_SelectItem(hTree, NULL); Clear(); AddItem('1'); @@ -364,6 +374,7 @@ static void DoTest2(void) r = TreeView_SelectItem(hTree, hRoot); AddItem('.'); ok(!strcmp(sequence, "1(nR)nR23(RC)RC45(CR)CR."), "root-child select test\n"); + ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, DoTest2Seq, "DoTest2", FALSE); } static void DoTest3(void) @@ -375,6 +386,8 @@ static void DoTest3(void) int nBufferSize = 80; CHAR szBuffer[80] = "Blah"; + flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); + /* add an item without TVIF_TEXT mask and pszText == NULL */ ins.hParent = hRoot; ins.hInsertAfter = TVI_ROOT; @@ -393,6 +406,7 @@ static void DoTest3(void) SendMessageA( hTree, TVM_GETITEM, 0, (LPARAM)&tvi ); ok(!strcmp(szBuffer, ""), "szBuffer=\"%s\", expected \"\"\n", szBuffer); ok(SendMessageA(hTree, TVM_DELETEITEM, 0, (LPARAM)hChild), "DeleteItem failed\n"); + ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, DoTest3Seq, "DoTest3", FALSE); } static void DoFocusTest(void) @@ -402,6 +416,8 @@ static void DoFocusTest(void) child2[] = "A really long string"; HTREEITEM hChild1, hChild2; + flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); + /* This test verifies that when a label is being edited, scrolling * the treeview does not cause the label to lose focus. To test * this, first some additional entries are added to generate @@ -425,6 +441,7 @@ static void DoFocusTest(void) hEdit = TreeView_EditLabel(hTree, hChild); ScrollWindowEx(hTree, -10, 0, NULL, NULL, NULL, NULL, SW_SCROLLCHILDREN); ok(GetFocus() == hEdit, "Edit control should have focus\n"); + ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, DoFocusTestSeq, "DoFocusTest", TRUE); } static void TestGetSetBkColor(void) @@ -863,32 +880,14 @@ START_TEST(treeview) if ( !ok(hMainWnd != NULL, "Failed to create parent window. Tests aborted.\n") ) return; - flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); FillRoot(); - ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, FillRootSeq, "FillRoot", FALSE); - - flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); DoTest1(); - ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, DoTest1Seq, "DoTest1", FALSE); - - flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); DoTest2(); - ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, DoTest2Seq, "DoTest2", FALSE); - - flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); DoTest3(); - ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, DoTest3Seq, "DoTest3", FALSE); - - flush_sequences(MsgSequences, NUM_MSG_SEQUENCES); DoFocusTest(); - ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, DoFocusTestSeq, "DoFocusTest", TRUE); - - /* Sequences tested inside due to number */ TestGetSet(); - /* Clears all the previous items */ TestCallback(); - /* Clears all the previous items */ TestExpandInvisible();

1 0

Nikolay Sivov : comctl32/listview: Fix comment typo.
by Alexandre Julliard Aug. 6, 2009

Aug. 6, 2009

Module: wine Branch: master Commit: a6694761faf638e34a6a62ada2e6fab4729f1fe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6694761faf638e34a6a62ada… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Aug 5 20:59:33 2009 +0400 comctl32/listview: Fix comment typo. --- dlls/comctl32/listview.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 3a0c411..a65d832 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -85,7 +85,6 @@ * Extended Styles * -- LVS_EX_BORDERSELECT * -- LVS_EX_FLATSB - * -- LVS_EX_HEADERDRAGDROP * -- LVS_EX_INFOTIP * -- LVS_EX_LABELTIP * -- LVS_EX_MULTIWORKAREAS @@ -5774,9 +5773,9 @@ static INT LISTVIEW_GetColumnWidth(const LISTVIEW_INFO *infoPtr, INT nColumn) nColumnWidth = infoPtr->nItemWidth; break; case LV_VIEW_DETAILS: - /* We are not using LISTVIEW_GetHeaderRect as this data is updated only after a HDM_ITEMCHANGED. + /* We are not using LISTVIEW_GetHeaderRect as this data is updated only after a HDN_ITEMCHANGED. * There is an application that subclasses the listview, calls LVM_GETCOLUMNWIDTH in the - * HDM_ITEMCHANGED handler and goes into infinite recursion if it receives old data. + * HDN_ITEMCHANGED handler and goes into infinite recursion if it receives old data. * * TODO: should we do the same in LVM_GETCOLUMN? */

1 0