July 2010 - Wine-Commits - list.winehq.org

Tag wine-1.2-rc6 : Alexandre Julliard : Release 1.2-rc6
by Alexandre Julliard July 2, 2010

July 2, 2010

Module: wine Branch: refs/tags/wine-1.2-rc6 Tag: ce012fb3fb58b4e2722aa4fd9548931863e307f8 URL: http://source.winehq.org/git/wine.git/?a=tag;h=ce012fb3fb58b4e2722aa4fd9548… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 2 19:24:56 2010 +0200 Release 1.2-rc6

1 0

Alexandre Julliard : Release 1.2-rc6.
by Alexandre Julliard July 2, 2010

July 2, 2010

Module: wine Branch: master Commit: 4d3aec55ea41cb0f47a9da82de1665ad1b16f3de URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d3aec55ea41cb0f47a9da82d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 2 19:24:56 2010 +0200 Release 1.2-rc6. --- ANNOUNCE | 555 ++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 262 insertions(+), 313 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d3aec55ea41cb0f47a9d…

1 0

Matthias Kupfer : comctl32: Fix selection of tab via mouse.
by Alexandre Julliard July 2, 2010

July 2, 2010

Module: wine Branch: master Commit: 6018b88913be5a252d1c0aa779b42e7af1fb283c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6018b88913be5a252d1c0aa77… Author: Matthias Kupfer <maku(a)butler.site> Date: Fri Jul 2 00:12:54 2010 +0200 comctl32: Fix selection of tab via mouse. --- dlls/comctl32/tab.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index c99153e..acf664c 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -683,7 +683,7 @@ TAB_LButtonDown (TAB_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if (pressed) TAB_DeselectAll (infoPtr, FALSE); else - TAB_SetCurSel(infoPtr, newItem); + TAB_SetCurFocus(infoPtr, newItem); TAB_SendSimpleNotify(infoPtr, TCN_SELCHANGE); }

1 0

Paul Chitescu : shdocvw: Strip out initial whitespaces and quotes around an URL on iexplore command line .
by Alexandre Julliard July 2, 2010

July 2, 2010

Module: wine Branch: master Commit: 310dc62655fce76fd055f342fd9bb910e79cb9de URL: http://source.winehq.org/git/wine.git/?a=commit;h=310dc62655fce76fd055f342f… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Fri Jul 2 16:16:27 2010 +0300 shdocvw: Strip out initial whitespaces and quotes around an URL on iexplore command line. --- dlls/shdocvw/iexplore.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index e4e7618..0984889 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -142,15 +142,23 @@ static IWebBrowser2 *create_ie_window(LPCSTR cmdline) }else { VARIANT var_url; DWORD len; + int cmdlen; if(!strncasecmp(cmdline, "-nohome", 7)) cmdline += 7; + while(*cmdline == ' ' || *cmdline == '\t') + cmdline++; + cmdlen = lstrlenA(cmdline); + if(cmdlen > 2 && cmdline[0] == '"' && cmdline[cmdlen-1] == '"') { + cmdline++; + cmdlen -= 2; + } V_VT(&var_url) = VT_BSTR; - len = MultiByteToWideChar(CP_ACP, 0, cmdline, -1, NULL, 0); + len = MultiByteToWideChar(CP_ACP, 0, cmdline, cmdlen, NULL, 0); V_BSTR(&var_url) = SysAllocStringLen(NULL, len); - MultiByteToWideChar(CP_ACP, 0, cmdline, -1, V_BSTR(&var_url), len); + MultiByteToWideChar(CP_ACP, 0, cmdline, cmdlen, V_BSTR(&var_url), len); /* navigate to the first page */ IWebBrowser2_Navigate2(wb, &var_url, NULL, NULL, NULL, NULL);

1 0

Gustavo Henrique Milaré : mshtml: Fix Portuguese translation.
by Alexandre Julliard July 2, 2010

July 2, 2010

Module: wine Branch: master Commit: 067baa3a95bd24fd0a32d6544605b645a7d7f722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=067baa3a95bd24fd0a32d6544… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Thu Jul 1 23:37:35 2010 -0300 mshtml: Fix Portuguese translation. --- dlls/mshtml/Pt.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/Pt.rc b/dlls/mshtml/Pt.rc index e6b6588..3c19ca5 100644 --- a/dlls/mshtml/Pt.rc +++ b/dlls/mshtml/Pt.rc @@ -49,7 +49,7 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Instalador Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "O Wine não pôde encontrar o pacote Gecko que é necessário para aplicações com HTML embutido" \ + LTEXT "O Wine não pôde encontrar o pacote Gecko que é necessário para aplicações com HTML embutido " \ "funcionarem corretamente. O Wine pode automaticamente efetuar o download e instalá-lo para você.\n\n" \ "Nota: é recomendável usar os pacotes da sua distribuição ao invés disso. \n\ Veja http://wiki.winehq.org/Gecko para mais detalhes.", @@ -66,7 +66,7 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Instalador Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "O Wine não conseguiu encontrar o pacote Gecko que é necessário para aplicações com HTML embutido" \ + LTEXT "O Wine não conseguiu encontrar o pacote Gecko que é necessário para aplicações com HTML embutido " \ "funcionarem corretamente. O Wine pode automaticamente efetuar o download e instalá-lo por si.\n\n" \ "Nota: é recomendável usar os pacotes da sua distribuição em vez disso. \n\ Veja http://wiki.winehq.org/Gecko para mais detalhes.",

1 0

Michael Stefaniuc : progman: Add the Romanian translation.
by Alexandre Julliard July 2, 2010

July 2, 2010

Module: wine Branch: master Commit: 63430a826fc0cc80b0a47ef9e454155c97bcfea7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63430a826fc0cc80b0a47ef9e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 2 02:55:14 2010 +0200 progman: Add the Romanian translation. Translation by Claudia Cotună, reviewed by Alexandru Băluț. --- programs/progman/Makefile.in | 1 + programs/progman/Ro.rc | 215 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 216 insertions(+), 0 deletions(-) diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in index 6648995..12d4ecd 100644 --- a/programs/progman/Makefile.in +++ b/programs/progman/Makefile.in @@ -29,6 +29,7 @@ RC_SRCS = \ No.rc \ Pl.rc \ Pt.rc \ + Ro.rc \ Ru.rc \ Si.rc \ Sv.rc \ diff --git a/programs/progman/Ro.rc b/programs/progman/Ro.rc new file mode 100644 index 0000000..2016803 --- /dev/null +++ b/programs/progman/Ro.rc @@ -0,0 +1,215 @@ +/* + * Program Manager + * + * Copyright 1996 Ulrich Schmid + * Copyright 2002 Sylvain Petreolle + * Copyright 2010 Claudia Cotună + * Michael Stefaniuc + * + * 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 "progman.h" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +/* Menu */ + +MAIN_MENU MENU +{ + POPUP "&Fișier" { + MENUITEM "&Nou...", PM_NEW + MENUITEM "Desc&hide\tEnter", PM_OPEN + MENUITEM "&Mutare...\tF7", PM_MOVE, GRAYED + MENUITEM "&Copiere...\tF8", PM_COPY, GRAYED + MENUITEM "&Șterge\tEntf", PM_DELETE + MENUITEM "&Atribute...\tAlt+Enter", PM_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "&Executare...", PM_EXECUTE + MENUITEM SEPARATOR + MENUITEM "Î&nchidere Windows...", PM_EXIT + } + POPUP "&Opțiuni" { + MENUITEM "&Aranjează automat", PM_AUTO_ARRANGE + MENUITEM "&Minimizează la execuție", PM_MIN_ON_RUN + MENUITEM "&Salvează configurația la închidere", PM_SAVE_SETTINGS + } + POPUP "F&erestre" { + MENUITEM "&Cascadă\tShift+F5", PM_OVERLAP + MENUITEM "&Una lângă alta\tShift+F4", PM_SIDE_BY_SIDE + MENUITEM "&Aranjează pictogramele", PM_ARRANGE + } + +POPUP "A&jutor" { + MENUITEM "&Conținut", PM_CONTENTS + MENUITEM "Că&utare...", PM_SEARCH + MENUITEM SEPARATOR + MENUITEM "A&jutor pentru Ajutor", PM_HELPONHELP + MENUITEM "&Tutorial", PM_TUTORIAL + MENUITEM SEPARATOR + MENUITEM "Des&pre Wine", PM_ABOUT_WINE + } +} + +/* Dialog `New' */ + +DIALOG_NEW DIALOG 0, 0, 170, 65 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Nou" +{ +RADIOBUTTON "", PM_NEW_GROUP, 10, 15, 10, 15 +LTEXT "&Grup programe", -1, 20, 18, 80, 15 +RADIOBUTTON "", PM_NEW_PROGRAM, 10, 35, 10, 15 +LTEXT "&Program", -1, 20, 38, 80, 15 +DEFPUSHBUTTON "OK", IDOK, 105, 5, 60, 15, WS_TABSTOP +PUSHBUTTON "Renunță", IDCANCEL, 105, 25, 60, 15, WS_TABSTOP +PUSHBUTTON "A&jutor", PM_HELP, 105, 45, 60, 15, WS_TABSTOP +} + +/* Dialog `Move' */ + +DIALOG_MOVE DIALOG 0, 0, 250, 65 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Mutare program" +{ +LTEXT "Mutare program:", -1, 5, 5, 90, 15 +LTEXT "", PM_PROGRAM, 95, 5, 90, 15 +LTEXT "Din grupul:", -1, 5, 13, 90, 15 +LTEXT "", PM_FROM_GROUP, 95, 13, 90, 15 +LTEXT "În &grupul:", PM_TO_GROUP_TXT, 5, 28, 140, 15 +COMBOBOX PM_TO_GROUP, 5, 38, 140, 50, WS_TABSTOP | CBS_DROPDOWNLIST +DEFPUSHBUTTON "OK", IDOK, 185, 5, 60, 15, WS_TABSTOP +PUSHBUTTON "Renunță", IDCANCEL, 185, 25, 60, 15, WS_TABSTOP +PUSHBUTTON "A&jutor", PM_HELP, 185, 45, 60, 15, WS_TABSTOP +} + +/* Dialog `Copy' */ + +DIALOG_COPY DIALOG 0, 0, 250, 65 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Copiere program" +{ +LTEXT "Copiere program:", -1, 5, 5, 90, 15 +LTEXT "", PM_PROGRAM, 95, 5, 90, 15 +LTEXT "Din grupul:", -1, 5, 13, 90, 15 +LTEXT "", PM_FROM_GROUP, 95, 13, 90, 15 +LTEXT "În &grupul:", PM_TO_GROUP_TXT, 5, 28, 140, 15 +COMBOBOX PM_TO_GROUP, 5, 38, 140, 50, WS_TABSTOP | CBS_DROPDOWNLIST +DEFPUSHBUTTON "OK", IDOK, 185, 5, 60, 15, WS_TABSTOP +PUSHBUTTON "Renunță", IDCANCEL, 185, 25, 60, 15, WS_TABSTOP +PUSHBUTTON "A&jutor", PM_HELP, 185, 45, 60, 15, WS_TABSTOP +} + +/* Dialog `Group attributes' */ + +DIALOG_GROUP DIALOG 0, 0, 230, 65 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Atributele grupului de programe" +{ +LTEXT "&Descriere:", PM_DESCRIPTION_TXT, 05, 18, 50, 10 +EDITTEXT PM_DESCRIPTION, 60, 18, 90, 15, WS_TABSTOP +LTEXT "Fișier &grup:", PM_FILE_TXT, 05, 38, 50, 10 +EDITTEXT PM_FILE, 60, 38, 90, 15, WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 155, 5, 60, 15, WS_TABSTOP +PUSHBUTTON "Renunță", IDCANCEL, 155, 25, 60, 15, WS_TABSTOP +PUSHBUTTON "A&jutor", PM_HELP, 155, 45, 60, 15, WS_TABSTOP +} + +/* Dialog `Program attributes' */ + +DIALOG_PROGRAM DIALOG 0, 0, 270, 105 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Atributele programului" +{ +LTEXT "&Descriere:", PM_DESCRIPTION_TXT, 05, 10, 60, 10 +EDITTEXT PM_DESCRIPTION, 80, 10, 90, 15, WS_TABSTOP +LTEXT "Linie de &comandă:", PM_COMMAND_LINE_TXT, 05, 25, 60, 10 +EDITTEXT PM_COMMAND_LINE, 80, 25, 90, 15, WS_TABSTOP +LTEXT "Director de &lucru:", PM_DIRECTORY_TXT, 05, 40, 60, 10 +EDITTEXT PM_DIRECTORY, 80, 40, 90, 15, WS_TABSTOP +LTEXT "Com&binație de taste:", PM_HOT_KEY_TXT, 05, 55, 70, 10 +EDITTEXT PM_HOT_KEY, 80, 55, 90, 15, WS_TABSTOP +ICON "", PM_ICON, 20, 70 +CHECKBOX "", PM_SYMBOL, 80, 75, 10, 10, WS_TABSTOP +LTEXT "&Minimizează la lansare", -1, 95, 75, 95, 10 +DEFPUSHBUTTON "OK", IDOK, 185, 5, 80, 15, WS_TABSTOP +PUSHBUTTON "Renunță", IDCANCEL, 185, 25, 80, 15, WS_TABSTOP +PUSHBUTTON "Na&vigare...", PM_BROWSE, 185, 45, 80, 15, WS_TABSTOP +PUSHBUTTON "Schimbare p&ictogramă...", PM_OTHER_SYMBOL, 185, 65, 80, 15, WS_TABSTOP +PUSHBUTTON "A&jutor", PM_HELP, 185, 85, 80, 15, WS_TABSTOP +} + +/* Dialog `Symbol' */ + +DIALOG_SYMBOL DIALOG 0, 0, 200, 85 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Schimbare pictogramă" +{ +LTEXT "Nume de &fișier:", PM_ICON_FILE_TXT, 5, 15, 40, 10 +EDITTEXT PM_ICON_FILE, 45, 15, 85, 15, WS_TABSTOP +LTEXT "P&ictogramă curentă:", PM_SYMBOL_LIST_TXT, 5, 30, 125, 10 +COMBOBOX PM_SYMBOL_LIST, 5, 40, 125, 50, + CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_OWNERDRAWFIXED | WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 135, 5, 60, 15, WS_TABSTOP +PUSHBUTTON "Renunță", IDCANCEL, 135, 25, 60, 15, WS_TABSTOP +PUSHBUTTON "Na&vigare...", PM_BROWSE, 135, 45, 60, 15, WS_TABSTOP +PUSHBUTTON "A&jutor", PM_HELP, 135, 65, 60, 15, WS_TABSTOP +} + +/* Dialog `Execute' */ + +DIALOG_EXECUTE DIALOG 0, 0, 200, 85 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Executare program" +{ +LTEXT "&Linie de comandă:", -1, 05, 15, 120, 10 +EDITTEXT PM_COMMAND, 05, 25, 120, 15, WS_TABSTOP +CHECKBOX "", PM_SYMBOL, 05, 45, 10, 10, WS_TABSTOP +LTEXT "&Minimizează la lansare", -1, 20, 45, 120, 10 +DEFPUSHBUTTON "OK", IDOK, 135, 5, 60, 15, WS_TABSTOP +PUSHBUTTON "Renunță", IDCANCEL, 135, 25, 60, 15, WS_TABSTOP +PUSHBUTTON "Na&vigare...", PM_BROWSE, 135, 45, 60, 15, WS_TABSTOP +PUSHBUTTON "A&jutor", PM_HELP, 135, 65, 60, 15, WS_TABSTOP +} + +/* Strings */ + +STRINGTABLE DISCARDABLE +{ +IDS_PROGRAM_MANAGER, "Administrator programe" +IDS_ERROR, "EROARE" +IDS_WARNING, "AVERTIZARE" +IDS_INFO, "Informații" +IDS_DELETE, "Șterge" +IDS_DELETE_GROUP_s, "Se șterge grupul „%s” ?" +IDS_DELETE_PROGRAM_s, "Se șterge programul „%s” ?" +IDS_NOT_IMPLEMENTED, "Neimplementat" +IDS_FILE_READ_ERROR_s, "Eroare la citirea „%s”." +IDS_FILE_WRITE_ERROR_s, "Eroare la scrierea „%s”." +IDS_GRPFILE_READ_ERROR_s, "Fișierul grup „%s” nu se poate deschide.\nDoriți să se mai încerce deschiderea?" +IDS_OUT_OF_MEMORY, "Memorie insuficientă." +IDS_WINHELP_ERROR, "Nu este disponibil ajutor." +IDS_UNKNOWN_FEATURE_s, "Caracteristică necunoscută în %s" +IDS_FILE_NOT_OVERWRITTEN_s, "Fișierul „%s” există. Nu a fost suprascris." +IDS_SAVE_GROUP_AS_s, "Salvează grupul ca „%s” pentru a preveni suprascrierea fișierelor originale." +IDS_NO_HOT_KEY, "Niciuna" +IDS_ALL_FILES, "Toate fișierele (*.*)" +IDS_PROGRAMS, "Programe" +IDS_LIBRARIES_DLL, "Biblioteci (*.dll)" +IDS_SYMBOL_FILES, "Fișiere pictogramă" +IDS_SYMBOLS_ICO, "Pictograme (*.ico)" +}

1 0

Alexandre Julliard : d3d8/tests: Fix some test failures with the focus messages.
by Alexandre Julliard July 2, 2010

July 2, 2010

Module: wine Branch: master Commit: 857d8f36759ab8bec8ba97578db0bbc6688fb649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=857d8f36759ab8bec8ba97578… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 2 13:45:25 2010 +0200 d3d8/tests: Fix some test failures with the focus messages. --- dlls/d3d8/tests/device.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b46ec4e..baf78e1 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -46,6 +46,22 @@ static int get_refcount(IUnknown *object) return IUnknown_Release( object ); } +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + diff = time - GetTickCount(); + } +} + static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND device_window, HWND focus_window, BOOL windowed) { D3DPRESENT_PARAMETERS present_parameters = {0}; @@ -1505,7 +1521,8 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM { if (filter_messages && filter_messages == hwnd) { - ok(message == WM_DISPLAYCHANGE, "Received unexpected message %#x for window %p.\n", message, hwnd); + if (message != WM_DISPLAYCHANGE && message != WM_IME_NOTIFY) + todo_wine ok(0, "Received unexpected message %#x for window %p.\n", message, hwnd); } if (expect_message.window == hwnd && expect_message.message == message) expect_message.message = 0; @@ -1555,7 +1572,6 @@ static void test_wndproc(void) LONG_PTR proc; ULONG ref; DWORD res, tid; - MSG msg; if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) { @@ -1601,7 +1617,7 @@ static void test_wndproc(void) expect_message.window = focus_window; expect_message.message = WM_SETFOCUS; - while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + flush_events(); device = create_device(d3d8, device_window, focus_window, FALSE); if (!device) @@ -1620,6 +1636,7 @@ static void test_wndproc(void) ok(tmp == focus_window, "Expected foreground window %p, got %p.\n", focus_window, tmp); } SetForegroundWindow(focus_window); + flush_events(); filter_messages = focus_window;

1 0

André Hentschel : user32/tests: Test that GetDlgItem does not recurse.
by Alexandre Julliard July 2, 2010

July 2, 2010

Module: wine Branch: master Commit: f0e21b0e6224db5f1b294b26da79edbfdc146d55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e21b0e6224db5f1b294b26d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jul 1 22:07:40 2010 +0200 user32/tests: Test that GetDlgItem does not recurse. --- dlls/user32/tests/dialog.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index d18ba0e..cc80c27 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -926,6 +926,23 @@ static void test_GetDlgItem(void) hwnd2 = GetDlgItem(hwnd, 0); ok(hwnd2 == child2, "expected second child, got %p\n", hwnd2); + /* Now test how GetDlgItem searches */ + DestroyWindow(child2); + child2 = CreateWindowA("button", "child2", WS_VISIBLE|WS_CHILD, 0, 0, 10, 10, child1, 0, g_hinst, NULL); + ok(child2 != NULL, "failed to create second child\n"); + + /* give child2 an ID */ + SetWindowLong(child2, GWLP_ID, 100); + + hwnd2 = GetDlgItem(hwnd, 100); + ok(!hwnd2, "expected child to not be found, got %p\n", hwnd2); + + /* make the ID of child2 public with a WS_EX_CONTROLPARENT parent */ + SetWindowLong(child1, GWL_EXSTYLE, WS_EX_CONTROLPARENT); + + hwnd2 = GetDlgItem(hwnd, 100); + ok(!hwnd2, "expected child to not be found, got %p\n", hwnd2); + DestroyWindow(child1); DestroyWindow(child2); DestroyWindow(hwnd);

1 0

Gustavo Henrique Milaré : hhctrl.ocx: Fix Portuguese (Brazilian) translation.
by Alexandre Julliard July 2, 2010

July 2, 2010

Module: wine Branch: master Commit: 3f404369da61477e5a301952fcbd37b5b1658a53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f404369da61477e5a301952f… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Thu Jul 1 23:22:25 2010 -0300 hhctrl.ocx: Fix Portuguese (Brazilian) translation. --- dlls/hhctrl.ocx/Pt.rc | 46 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/hhctrl.ocx/Pt.rc b/dlls/hhctrl.ocx/Pt.rc index 13476ce..2b8b101 100644 --- a/dlls/hhctrl.ocx/Pt.rc +++ b/dlls/hhctrl.ocx/Pt.rc @@ -3,6 +3,7 @@ * Portuguese Language Support * * Copyright 2008 Ricardo Filipe + * Copyright 2010 Gustavo Henrique Milaré * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,16 +22,51 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_CONTENTS "&Conte�dos" - IDS_INDEX "&�ndice" + IDS_CONTENTS "&Conteúdos" + IDS_INDEX "&Índice" IDS_SEARCH "&Pesquisar" IDS_FAVORITES "&Favoritos" END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE +BEGIN + IDTB_EXPAND "Mostrar" + IDTB_CONTRACT "Ocultar" + IDTB_STOP "Parar" + IDTB_REFRESH "Recarregar" + IDTB_BACK "Voltar" + IDTB_HOME "Início" + IDTB_SYNC "Sincronizar" + IDTB_PRINT "Imprimir" + IDTB_OPTIONS "Opções" + IDTB_FORWARD "Avançar" + IDTB_NOTES "IDTB_NOTES" + IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" + IDTB_BROWSE_BACK "IDT_BROWSE_BACK" + IDTB_CONTENTS "IDTB_CONTENTS" + IDTB_INDEX "IDTB_INDEX" + IDTB_SEARCH "IDTB_SEARCH" + IDTB_HISTORY "IDTB_HISTORY" + IDTB_FAVORITES "IDTB_FAVORITES" + IDTB_JUMP1 "Jump1" + IDTB_JUMP2 "Jump2" + IDTB_CUSTOMIZE "Personalizar" + IDTB_ZOOM "Zoom" + IDTB_TOC_NEXT "IDTB_TOC_NEXT" + IDTB_TOC_PREV "IDTB_TOC_PREV" +END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + STRINGTABLE BEGIN IDTB_EXPAND "Mostrar" @@ -38,11 +74,11 @@ BEGIN IDTB_STOP "Parar" IDTB_REFRESH "Actualizar" IDTB_BACK "Retroceder" - IDTB_HOME "In�cio" + IDTB_HOME "Início" IDTB_SYNC "Sincronizar" IDTB_PRINT "Imprimir" - IDTB_OPTIONS "Op��es" - IDTB_FORWARD "Avan�ar" + IDTB_OPTIONS "Opções" + IDTB_FORWARD "Avançar" IDTB_NOTES "IDTB_NOTES" IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" IDTB_BROWSE_BACK "IDT_BROWSE_BACK"

1 0

Alexandre Julliard : d3d9/tests: Fix some test failures with the focus messages.
by Alexandre Julliard July 2, 2010

July 2, 2010

Module: wine Branch: master Commit: d0f60b05d199d1ef841ca6fe7314f9da2a6bd1b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0f60b05d199d1ef841ca6fe7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 2 13:45:29 2010 +0200 d3d9/tests: Fix some test failures with the focus messages. --- dlls/d3d9/tests/device.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 2119995..ba25760 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -32,6 +32,22 @@ static int get_refcount(IUnknown *object) return IUnknown_Release( object ); } +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + diff = time - GetTickCount(); + } +} + static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND device_window, HWND focus_window, BOOL windowed) { D3DPRESENT_PARAMETERS present_parameters = {0}; @@ -2348,8 +2364,8 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM { if (filter_messages && filter_messages == hwnd) { - ok(message == WM_DISPLAYCHANGE || message == WM_IME_NOTIFY, - "Received unexpected message %#x for window %p.\n", message, hwnd); + if (message != WM_DISPLAYCHANGE && message != WM_IME_NOTIFY) + todo_wine ok( 0, "Received unexpected message %#x for window %p.\n", message, hwnd); } if (expect_message.window == hwnd && expect_message.message == message) expect_message.message = 0; @@ -2399,7 +2415,6 @@ static void test_wndproc(void) LONG_PTR proc; ULONG ref; DWORD res, tid; - MSG msg; if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) { @@ -2445,7 +2460,7 @@ static void test_wndproc(void) expect_message.window = focus_window; expect_message.message = WM_SETFOCUS; - while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + flush_events(); device = create_device(d3d9, device_window, focus_window, FALSE); if (!device) @@ -2464,6 +2479,7 @@ static void test_wndproc(void) ok(tmp == focus_window, "Expected foreground window %p, got %p.\n", focus_window, tmp); } SetForegroundWindow(focus_window); + flush_events(); filter_messages = focus_window;

1 0