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

Austin English : README: Update for 1.2.
by Alexandre Julliard July 12, 2010

July 12, 2010

Module: wine Branch: master Commit: 954514ec920d74fca28f278bc10ee24441ab2a3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=954514ec920d74fca28f278bc… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Jul 10 02:50:00 2010 -0500 README: Update for 1.2. --- README | 76 +++++++++++++++++++++++++-------------------------------------- 1 files changed, 30 insertions(+), 46 deletions(-) diff --git a/README b/README index 9678e17..baa6ab3 100644 --- a/README +++ b/README @@ -1,11 +1,11 @@ 1. INTRODUCTION Wine is a program which allows running Microsoft Windows programs -(including DOS, Windows 3.x and Win32 executables) on Unix. It -consists of a program loader which loads and executes a Microsoft +(including DOS, Windows 3.x, Win32, and Win64 executables) on Unix. +It consists of a program loader which loads and executes a Microsoft Windows binary, and a library (called Winelib) that implements Windows API calls using their Unix or X11 equivalents. The library may also -be used for porting Win32 code into native Unix executables. +be used for porting Windows code into native Unix executables. Wine is free software, released under the GNU LGPL; see the file LICENSE for the details. @@ -46,7 +46,7 @@ Linux info: FreeBSD info: Wine will generally not work properly on versions before FreeBSD 6.3 or 7.0, and FreeBSD 6.3 has additional patches available. See - <http://wiki.freebsd.org/Wine> for more information. + http://wiki.freebsd.org/Wine for more information. Solaris info: You will most likely need to build Wine with the GNU toolchain @@ -75,16 +75,18 @@ Basic requirements: Of course you also need "make" (most likely GNU make). - You also need flex version 2.5 or later and bison. + You also need flex version 2.5.33 or later and bison. Optional support libraries: Configure will display notices when optional libraries are not found on your system. See http://wiki.winehq.org/Recommended_Packages for hints about the packages you should install. - On 64-bit platforms you have to make sure to install the 32-bit - versions of these libraries; see http://wiki.winehq.org/WineOn64bit - for details. + On 64-bit platforms, if compiling Wine as 32-bit (default), you have + to make sure to install the 32-bit versions of these libraries; see + http://wiki.winehq.org/WineOn64bit for details. If you want a true + 64-bit Wine (or a mixed 32-bit and 64-bit Wine setup), see + http://wiki.winehq.org/Wine64 for details. 4. COMPILATION @@ -92,7 +94,6 @@ In case you chose to not use wineinstall, run the following commands to build Wine: ./configure -make depend make This will build the program "wine" and numerous support libraries/binaries. @@ -102,22 +103,11 @@ Windows source code under Unix. To see compile configuration options, do ./configure --help. -To upgrade to a new release by using a patch file, first cd to the -top-level directory of the release (the one containing this README -file). Then do a "make clean", and patch the release with: - - bunzip2 -c patch-file | patch -p1 - -where "patch-file" is the name of the patch file (something like -wine-1.0.x.diff.bz2). You can then re-run "./configure", and then -run "make depend && make". - - 5. SETUP Once Wine has been built correctly, you can do "make install"; this -will install the wine executable, the Wine man page, and a few other -needed files. +will install the wine executable and libraries, the Wine man page, and +other needed files. Don't forget to uninstall any conflicting previous Wine installation first. Try either "dpkg -r wine" or "rpm -e wine" or "make uninstall" @@ -134,20 +124,18 @@ or a filename only. For example: to run Notepad: - wine notepad (using the search Path as specified in - wine notepad.exe the config file to locate the file) + wine notepad (using the search Path as specified in + wine notepad.exe the registry to locate the file) - wine c:\\windows\\notepad.exe (using DOS filename syntax) + wine c:\\windows\\notepad.exe (using DOS filename syntax) - wine ~/.wine/drive_c/windows/notepad.exe (using Unix filename syntax) + wine ~/.wine/drive_c/windows/notepad.exe (using Unix filename syntax) - wine notepad.exe /parameter1 -parameter2 parameter3 - (calling program with parameters) + wine notepad.exe readme.txt (calling program with parameters) -Wine is not yet complete, so several programs may crash. In that crash -you will be dropped into the debugger so that you can investigate and -fix the problem. For more information on how to do this, please check -the debugging section of the Wine Developer's Guide. +Wine is not perfect, so some programs may crash. If that happens you +will get a crash log that you should attach to your report when filing +a bug. 7. GETTING MORE INFORMATION @@ -158,28 +146,24 @@ WWW: A great deal of information about Wine is available from WineHQ at FAQ: The Wine FAQ is located at http://www.winehq.org/FAQ -Usenet: You can discuss Wine-related issues and get help - on comp.emulators.ms-windows.wine. +Wiki: The Wine Wiki is located at http://wiki.winehq.org + +Mailing lists: + There are several mailing lists for Wine users and developers; + see http://www.winehq.org/forums for more information. Bugs: Report bugs to Wine Bugzilla at http://bugs.winehq.org Please search the bugzilla database to check whether your - problem is already found before posting a bug report. You can - also post bug reports to comp.emulators.ms-windows.wine. + problem is already known or fixed before posting a bug report. IRC: Online help is available at channel #WineHQ on irc.freenode.net. Git: The current Wine development tree is available through Git. - Go to http://www.winehq.org/site/git for more information. - -Mailing lists: - There are several mailing lists for Wine users and developers; - see http://www.winehq.org/forums for more information. - -Wiki: The Wine Wiki is located at http://wiki.winehq.org + Go to http://www.winehq.org/git for more information. -If you add something, or fix a bug, please send a patch (in 'diff -u' -format) to wine-patches(a)winehq.org list for inclusion in the next -release. +If you add something, or fix a bug, please send a patch (preferably +using git-format-patch) to the wine-patches(a)winehq.org list for +inclusion in the next release. -- Alexandre Julliard

1 0

Michael Stefaniuc : winefile: Add the Romanian translation.
by Alexandre Julliard July 12, 2010

July 12, 2010

Module: wine Branch: master Commit: e8e58aa7e4d92f66d0bc1b63df843c4e232a9465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8e58aa7e4d92f66d0bc1b63d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 12 12:53:33 2010 +0200 winefile: Add the Romanian translation. Translation by Claudia Cotună. --- programs/winefile/Makefile.in | 1 + programs/winefile/Ro.rc | 249 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 250 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8e58aa7e4d92f66d0bc1…

1 0

Igor Paliychuk : user32: Ukrainian translation update.
by Alexandre Julliard July 12, 2010

July 12, 2010

Module: wine Branch: master Commit: 7aa9011da1910c4cf47ddb51d639145711ff5944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aa9011da1910c4cf47ddb51d… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Sat Jul 10 17:29:02 2010 +0300 user32: Ukrainian translation update. --- dlls/user32/resources/user32_Uk.rc | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/user32/resources/user32_Uk.rc b/dlls/user32/resources/user32_Uk.rc index 9698165..19a7c0c 100644 --- a/dlls/user32/resources/user32_Uk.rc +++ b/dlls/user32/resources/user32_Uk.rc @@ -1,5 +1,6 @@ /* * Copyright 2004 Ilya Korniyko + * Copyright 2010 Igor Paliychuk * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -54,17 +55,28 @@ BEGIN ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX PUSHBUTTON "&OK", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "�&��", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&³��", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&��", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "�&��", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "��&��", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&��", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&��", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&ͳ", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Try Again", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Continue", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Help", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&�� ", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "�&��", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "��", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +MDI_MOREWINDOWS DIALOG FIXED IMPURE 20, 20, 232, 122 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "�� " +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX MDI_IDC_LISTBOX, 5, 7, 222, 90, WS_VSCROLL | WS_HSCROLL /* defined in mdi.h */ + DEFPUSHBUTTON "OK", IDOK, 75, 100, 35, 14 + PUSHBUTTON "��", IDCANCEL, 120, 100, 35, 14 +END + + STRINGTABLE DISCARDABLE { IDS_ERROR "��"

1 0

Michael Stefaniuc : winhlp32: Remove an untranslated resource from multiple translations.
by Alexandre Julliard July 12, 2010

July 12, 2010

Module: wine Branch: master Commit: a569032d7609419b487680d847df4794c2b68061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a569032d7609419b487680d84… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 12 16:15:11 2010 +0200 winhlp32: Remove an untranslated resource from multiple translations. --- programs/winhlp32/Bg.rc | 1 - programs/winhlp32/Cs.rc | 1 - programs/winhlp32/Da.rc | 1 - programs/winhlp32/Eo.rc | 1 - programs/winhlp32/Fi.rc | 1 - programs/winhlp32/Hu.rc | 1 - programs/winhlp32/Sk.rc | 1 - programs/winhlp32/Tr.rc | 1 - programs/winhlp32/Wa.rc | 1 - 9 files changed, 0 insertions(+), 9 deletions(-) diff --git a/programs/winhlp32/Bg.rc b/programs/winhlp32/Bg.rc index e6d3143..de00593 100644 --- a/programs/winhlp32/Bg.rc +++ b/programs/winhlp32/Bg.rc @@ -83,5 +83,4 @@ STID_ALL_FILES, " STID_HELP_FILES_HLP, "�� (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " } diff --git a/programs/winhlp32/Cs.rc b/programs/winhlp32/Cs.rc index a8f8db3..cab3455 100644 --- a/programs/winhlp32/Cs.rc +++ b/programs/winhlp32/Cs.rc @@ -88,5 +88,4 @@ STID_ALL_FILES, "V STID_HELP_FILES_HLP, "Soubory n�pov�dy (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " } diff --git a/programs/winhlp32/Da.rc b/programs/winhlp32/Da.rc index 20e3331..f0026c4 100644 --- a/programs/winhlp32/Da.rc +++ b/programs/winhlp32/Da.rc @@ -106,7 +106,6 @@ STID_ALL_FILES, "Alle filer (*.*)" STID_HELP_FILES_HLP, "Hjælpe filer (*.hlp)" STID_FILE_NOT_FOUND_s "Kan ikke finde '%s'. Vil du selv finde filen?" STID_NO_RICHEDIT "Kan ikke finde en 'richedit' implementering... Afbryder" -STID_PSH_INDEX, "Help topics: " } CONTEXT_MENU MENU diff --git a/programs/winhlp32/Eo.rc b/programs/winhlp32/Eo.rc index adf288d..f91f2d5 100644 --- a/programs/winhlp32/Eo.rc +++ b/programs/winhlp32/Eo.rc @@ -86,5 +86,4 @@ STID_ALL_FILES, "Tutaj dosieroj (*.*)" STID_HELP_FILES_HLP, "Helpaj dosieroj (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " } diff --git a/programs/winhlp32/Fi.rc b/programs/winhlp32/Fi.rc index 5585619..3079d30 100644 --- a/programs/winhlp32/Fi.rc +++ b/programs/winhlp32/Fi.rc @@ -86,5 +86,4 @@ STID_ALL_FILES, "Kaikki tiedostot (*.*)" STID_HELP_FILES_HLP, "Ohjetiedostot (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " } diff --git a/programs/winhlp32/Hu.rc b/programs/winhlp32/Hu.rc index ef3a1ee..1213337 100644 --- a/programs/winhlp32/Hu.rc +++ b/programs/winhlp32/Hu.rc @@ -86,5 +86,4 @@ STID_ALL_FILES, "Minden f STID_HELP_FILES_HLP, "S�g� f�jlok (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " } diff --git a/programs/winhlp32/Sk.rc b/programs/winhlp32/Sk.rc index 1b45e1f..174596d 100644 --- a/programs/winhlp32/Sk.rc +++ b/programs/winhlp32/Sk.rc @@ -81,5 +81,4 @@ STID_ALL_FILES, "V STID_HELP_FILES_HLP, "S�bory pomoci (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " } diff --git a/programs/winhlp32/Tr.rc b/programs/winhlp32/Tr.rc index 876f33c..cb36619 100644 --- a/programs/winhlp32/Tr.rc +++ b/programs/winhlp32/Tr.rc @@ -83,5 +83,4 @@ STID_ALL_FILES, "T STID_HELP_FILES_HLP, "Yard�m dosyalar� (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " } diff --git a/programs/winhlp32/Wa.rc b/programs/winhlp32/Wa.rc index f19ac84..3de5eb6 100644 --- a/programs/winhlp32/Wa.rc +++ b/programs/winhlp32/Wa.rc @@ -88,7 +88,6 @@ STID_ALL_FILES, "Tos les fitch STID_HELP_FILES_HLP, "Fitch�s d' aide (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " } #endif /* LANG_WALON */

1 0

Alexandre Julliard : Wine release 1.2-rc7
by Alexandre Julliard July 9, 2010

July 9, 2010

Module: website Branch: master Commit: 53628f587d46ed6bdc9019b1443892f4b3333e30 URL: http://source.winehq.org/git/website.git/?a=commit;h=53628f587d46ed6bdc9019… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 9 18:53:27 2010 +0200 Wine release 1.2-rc7 --- news/en/2010070901.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/news/en/2010070901.xml b/news/en/2010070901.xml new file mode 100644 index 0000000..fb480fe --- /dev/null +++ b/news/en/2010070901.xml @@ -0,0 +1,13 @@ +<news> +<date>July 9, 2010</date> +<title>Wine 1.2-rc7 Released</title> +<body> + The Wine development release 1.2-rc7 is now available. Barring any last minute problems, this should be the last release candidate before the final 1.2. Please give it a good testing. + <a href="{$root}/announce/1.2-rc7">What's new</a> in this release: +<ul> + <li>Translation updates.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc7.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.2-rc7.
by Alexandre Julliard July 9, 2010

July 9, 2010

Module: wine Branch: master Commit: 1cd170fd2e0e7df5083e7c66f8422783c57ed256 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd170fd2e0e7df5083e7c66f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 9 18:44:34 2010 +0200 Release 1.2-rc7. --- ANNOUNCE | 424 +++++++++++++++++++++++-------------------------------------- VERSION | 2 +- configure | 18 ++-- 3 files changed, 171 insertions(+), 273 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1cd170fd2e0e7df5083e7…

1 0

Tag wine-1.2-rc7 : Alexandre Julliard : Release 1.2-rc7
by Alexandre Julliard July 9, 2010

July 9, 2010

Module: wine Branch: refs/tags/wine-1.2-rc7 Tag: f343087634ed8fe1a67b072ddbe0c720180a4ed1 URL: http://source.winehq.org/git/wine.git/?a=tag;h=f343087634ed8fe1a67b072ddbe0… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 9 18:44:35 2010 +0200 Release 1.2-rc7

1 0

Igor Paliychuk : winhlp32: Ukrainian translation update.
by Alexandre Julliard July 9, 2010

July 9, 2010

Module: wine Branch: master Commit: 92047639b89095525e3179aca57950eba4eaff9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=92047639b89095525e3179aca… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Fri Jul 9 16:45:22 2010 +0300 winhlp32: Ukrainian translation update. --- programs/winhlp32/Uk.rc | 110 +++++++++------------------------------------- 1 files changed, 22 insertions(+), 88 deletions(-) diff --git a/programs/winhlp32/Uk.rc b/programs/winhlp32/Uk.rc index bf026b0..eb01092 100644 --- a/programs/winhlp32/Uk.rc +++ b/programs/winhlp32/Uk.rc @@ -28,54 +28,11 @@ /* UTF-8 */ #pragma code_page(65001) -/* Menu */ +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -MAIN_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -{ - POPUP "&Файл" { - MENUITEM "&Відкрити", MNID_FILE_OPEN - MENUITEM SEPARATOR - MENUITEM "&Друк", MNID_FILE_PRINT - MENUITEM "Налаштування &принтера...", MNID_FILE_SETUP - MENUITEM SEPARATOR - MENUITEM "В&ихід", MNID_FILE_EXIT - } - POPUP "&Правка" { - MENUITEM "&Копіювати...", MNID_EDIT_COPYDLG - MENUITEM SEPARATOR - MENUITEM "&Annotate...", MNID_EDIT_ANNOTATE - } - POPUP "&Закладка" { - MENUITEM "&Define...", MNID_BKMK_DEFINE - } - POPUP "&Налаштування" { - POPUP "Help always visible" - BEGIN - MENUITEM "За замовчуванням", MNID_OPTS_HELP_DEFAULT - MENUITEM "Видимий", MNID_OPTS_HELP_VISIBLE - MENUITEM "Невидимий", MNID_OPTS_HELP_NONVISIBLE - END - MENUITEM "Історія", MNID_OPTS_HISTORY - POPUP "Шрифти" - BEGIN - MENUITEM "Малий", MNID_OPTS_FONTS_SMALL - MENUITEM "Нормальний", MNID_OPTS_FONTS_NORMAL - MENUITEM "Великий", MNID_OPTS_FONTS_LARGE - END - MENUITEM "Використати системні кольори", MNID_OPTS_SYSTEM_COLORS - } - POPUP "&Довідка" { - MENUITEM "Help &on help", MNID_HELP_HELPON - MENUITEM "Завжди &зверху", MNID_HELP_HELPTOP - MENUITEM SEPARATOR - MENUITEM "&Інформація...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&Про Wine", MNID_HELP_WINE -#endif - } -} +/* Menu */ -MAIN_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL +MAIN_MENU MENU { POPUP "&Файл" { MENUITEM "&Відкрити", MNID_FILE_OPEN @@ -88,17 +45,17 @@ MAIN_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL POPUP "&Правка" { MENUITEM "&Копіювати...", MNID_EDIT_COPYDLG MENUITEM SEPARATOR - MENUITEM "&Annotate...", MNID_EDIT_ANNOTATE + MENUITEM "&Замітки...", MNID_EDIT_ANNOTATE } POPUP "&Закладка" { - MENUITEM "&Define...", MNID_BKMK_DEFINE + MENUITEM "&Задати...", MNID_BKMK_DEFINE } POPUP "&Налаштування" { - POPUP "Help always visible" + POPUP "Видимість Довідки" BEGIN MENUITEM "За замовчуванням", MNID_OPTS_HELP_DEFAULT - MENUITEM "Видимий", MNID_OPTS_HELP_VISIBLE - MENUITEM "Невидимий", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "Зверху", MNID_OPTS_HELP_VISIBLE + MENUITEM "Не зверху", MNID_OPTS_HELP_NONVISIBLE END MENUITEM "Історія", MNID_OPTS_HISTORY POPUP "Шрифти" @@ -110,7 +67,7 @@ MAIN_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL MENUITEM "Використати системні кольори", MNID_OPTS_SYSTEM_COLORS } POPUP "&Довідка" { - MENUITEM "Help &on help", MNID_HELP_HELPON + MENUITEM "Довідка &про Довідку", MNID_HELP_HELPON MENUITEM "Завжди &зверху", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Інформація...", MNID_HELP_ABOUT @@ -120,24 +77,24 @@ MAIN_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Index" +CAPTION "Вказівник" { LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } -IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Search" +CAPTION "Пошук" { LTEXT "Ще не впроваджено", -1, 10, 10, 180, 150 } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "Довідка Wine" STID_WHERROR, "ПОМИЛКА" @@ -145,21 +102,21 @@ STID_WARNING, "УВАГА" STID_INFO, "Інформація" STID_NOT_IMPLEMENTED, "Не впроваджено" STID_HLPFILE_ERROR_s, "Помилка читання файлу довідки `%s'" -STID_INDEX, "&Index" -STID_CONTENTS, "Summary" +STID_INDEX, "&Зміст" +STID_CONTENTS, "Сумарно" STID_BACK, "&Назад" STID_ALL_FILES, "Всі файли (*.*)" STID_HELP_FILES_HLP, "Файли довідки (*.hlp)" STID_FILE_NOT_FOUND_s "Не можу знайти '%s'. Хочете знайти цей файл самотужки?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" +STID_NO_RICHEDIT "Не можу знайти richedit... Скасовую" STID_PSH_INDEX, "Розділи Довідки: " } -CONTEXT_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +CONTEXT_MENU MENU BEGIN POPUP "" BEGIN - MENUITEM "Annotation...", MNID_CTXT_ANNOTATE + MENUITEM "Замітки...", MNID_CTXT_ANNOTATE MENUITEM "Копіювати", MNID_CTXT_COPY MENUITEM "Друк...", MNID_CTXT_PRINT POPUP "Шрифти" @@ -168,35 +125,12 @@ BEGIN MENUITEM "Нормальний", MNID_CTXT_FONTS_NORMAL MENUITEM "Великий", MNID_CTXT_FONTS_LARGE END - POPUP "Довідка завжди видима" + POPUP "Видимість Довідки" BEGIN MENUITEM "За замовчуванням", MNID_CTXT_HELP_DEFAULT - MENUITEM "Видима", MNID_CTXT_HELP_VISIBLE - MENUITEM "Невидима", MNID_CTXT_HELP_NONVISIBLE + MENUITEM "Зверху", MNID_CTXT_HELP_VISIBLE + MENUITEM "Не зверху", MNID_CTXT_HELP_NONVISIBLE END MENUITEM "Використати системні кольори", MNID_CTXT_SYSTEM_COLORS END END - -CONTEXT_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL -BEGIN - POPUP "" - BEGIN - MENUITEM "Annotation...", MNID_CTXT_ANNOTATE - MENUITEM "Копіювати", MNID_CTXT_COPY - MENUITEM "Друк...", MNID_CTXT_PRINT - POPUP "Шрифти" - BEGIN - MENUITEM "Малий", MNID_CTXT_FONTS_SMALL - MENUITEM "Нормальний", MNID_CTXT_FONTS_NORMAL - MENUITEM "Великий", MNID_CTXT_FONTS_LARGE - END - POPUP "Довідка завжди видима" - BEGIN - MENUITEM "За замовчуванням", MNID_CTXT_HELP_DEFAULT - MENUITEM "Видима", MNID_CTXT_HELP_VISIBLE - MENUITEM "Невидима", MNID_CTXT_HELP_NONVISIBLE - END - MENUITEM "Використати ситемні кольори", MNID_CTXT_SYSTEM_COLORS - END -END

1 0

Andrew Nguyen : msi/tests: Skip some source tests if a required product key cannot be created.
by Alexandre Julliard July 9, 2010

July 9, 2010

Module: wine Branch: master Commit: 93f92d51a488749ec0dba06ff5fcd90d09472449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f92d51a488749ec0dba06ff… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jul 9 04:10:55 2010 -0500 msi/tests: Skip some source tests if a required product key cannot be created. --- dlls/msi/tests/source.c | 91 ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 78 insertions(+), 13 deletions(-) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 44721d5..1563c44 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -896,7 +896,11 @@ static void test_MsiSourceListAddSourceEx(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + goto machine_tests; + } /* product key exists */ r = pMsiSourceListAddSourceExA(prodcode, usersid, @@ -952,6 +956,7 @@ static void test_MsiSourceListAddSourceEx(void) /* MSIINSTALLCONTEXT_MACHINE */ +machine_tests: /* szUserSid must be NULL for MSIINSTALLCONTEXT_MACHINE */ r = pMsiSourceListAddSourceExA(prodcode, usersid, MSIINSTALLCONTEXT_MACHINE, @@ -967,7 +972,12 @@ static void test_MsiSourceListAddSourceEx(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + LocalFree(usersid); + return; + } /* product key exists */ r = pMsiSourceListAddSourceExA(prodcode, NULL, @@ -1358,7 +1368,11 @@ static void test_MsiSourceListEnumSources(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &userkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + goto machine_tests; + } /* user product key exists */ size = MAX_PATH; @@ -1469,6 +1483,7 @@ static void test_MsiSourceListEnumSources(void) /* MSIINSTALLCONTEXT_MACHINE */ +machine_tests: /* szUserSid is non-NULL */ size = MAX_PATH; lstrcpyA(value, "aaa"); @@ -1493,7 +1508,12 @@ static void test_MsiSourceListEnumSources(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + LocalFree(usersid); + return; + } /* user product key exists */ size = MAX_PATH; @@ -1938,7 +1958,11 @@ static void test_MsiSourceListSetInfo(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &userkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + goto machine_tests; + } /* user product key exists */ r = pMsiSourceListSetInfoA(prodcode, NULL, @@ -1971,11 +1995,17 @@ static void test_MsiSourceListSetInfo(void) /* MSIINSTALLCONTEXT_MACHINE */ +machine_tests: lstrcpyA(keypath, "Software\\Classes\\Installer\\Products\\"); lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + LocalFree(usersid); + return; + } /* user product key exists */ r = pMsiSourceListSetInfoA(prodcode, NULL, @@ -2234,7 +2264,11 @@ static void test_MsiSourceListAddMediaDisk(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &userkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + goto machine_tests; + } /* user product key exists */ r = pMsiSourceListAddMediaDiskA(prodcode, usersid, @@ -2268,11 +2302,17 @@ static void test_MsiSourceListAddMediaDisk(void) /* MSIINSTALLCONTEXT_MACHINE */ +machine_tests: lstrcpyA(keypath, "Software\\Classes\\Installer\\Products\\"); lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + LocalFree(usersid); + return; + } /* machine product key exists */ r = pMsiSourceListAddMediaDiskA(prodcode, NULL, @@ -2939,7 +2979,11 @@ static void test_MsiSourceListEnumMediaDisks(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &userkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + goto machine_tests; + } /* user product key exists */ r = pMsiSourceListEnumMediaDisksA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED, @@ -3017,11 +3061,17 @@ static void test_MsiSourceListEnumMediaDisks(void) /* MSIINSTALLCONTEXT_MACHINE */ +machine_tests: lstrcpyA(keypath, "Software\\Classes\\Installer\\Products\\"); lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + LocalFree(usersid); + return; + } /* machine product key exists */ r = pMsiSourceListEnumMediaDisksA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE, @@ -3201,7 +3251,11 @@ static void test_MsiSourceListAddSource(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &userkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + goto userunmanaged_tests; + } /* user product key exists */ r = pMsiSourceListAddSourceA(prodcode, username, 0, "source"); @@ -3292,6 +3346,7 @@ static void test_MsiSourceListAddSource(void) /* MSIINSTALLCONTEXT_USERUNMANAGED */ +userunmanaged_tests: r = pMsiSourceListAddSourceA(prodcode, username, 0, "source"); ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); @@ -3299,7 +3354,11 @@ static void test_MsiSourceListAddSource(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &userkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + goto machine_tests; + } /* user product key exists */ r = pMsiSourceListAddSourceA(prodcode, username, 0, "source"); @@ -3328,6 +3387,7 @@ static void test_MsiSourceListAddSource(void) /* MSIINSTALLCONTEXT_MACHINE */ +machine_tests: r = pMsiSourceListAddSourceA(prodcode, NULL, 0, "source"); ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); @@ -3335,7 +3395,12 @@ static void test_MsiSourceListAddSource(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + LocalFree(usersid); + return; + } /* machine product key exists */ r = pMsiSourceListAddSourceA(prodcode, NULL, 0, "source");

1 0

Andrew Nguyen : msi/tests: Fix a source test comment.
by Alexandre Julliard July 9, 2010

July 9, 2010

Module: wine Branch: master Commit: 9c850c9f8ac8c2a1f099a8554b2901f23ad37bfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c850c9f8ac8c2a1f099a8554… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jul 9 04:10:43 2010 -0500 msi/tests: Fix a source test comment. --- dlls/msi/tests/source.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index fbf93fe..44721d5 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -1479,7 +1479,7 @@ static void test_MsiSourceListEnumSources(void) ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value); ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size); - /* szUserSid is non-NULL */ + /* szUserSid is NULL */ size = MAX_PATH; lstrcpyA(value, "aaa"); r = pMsiSourceListEnumSourcesA(prodcode, NULL,

1 0