wine-commits July 2010

wine-commits@winehq.org

2 participants
892 discussions

Michael Stefaniuc : regedit: Add the Romanian translation.
by Alexandre Julliard 12 Jul '10

12 Jul '10

Module: wine Branch: master Commit: 11f367f6a597fd7c8fb9073a56d7800d5d1e33bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=11f367f6a597fd7c8fb9073a5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 12 01:28:16 2010 +0200 regedit: Add the Romanian translation. Translation by Claudia Cotună. --- programs/regedit/Makefile.in | 1 + programs/regedit/Ro.rc | 335 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 336 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=11f367f6a597fd7c8fb90…

1 0

Igor Paliychuk : wininet: Ukrainian translation update.
by Alexandre Julliard 12 Jul '10

12 Jul '10

Module: wine Branch: master Commit: deb41e5d5eb15ec65200a48962b2a2125473476d URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb41e5d5eb15ec65200a4896… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Sat Jul 10 17:29:57 2010 +0300 wininet: Ukrainian translation update. --- dlls/wininet/wininet_Uk.rc | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/wininet_Uk.rc b/dlls/wininet/wininet_Uk.rc index 94a9611..89db0b7 100644 --- a/dlls/wininet/wininet_Uk.rc +++ b/dlls/wininet/wininet_Uk.rc @@ -2,6 +2,7 @@ * wininet.dll (Ukrainian resources) * * Copyright 2006 Artem Reznikov + * 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 @@ -42,6 +43,26 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "��", 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 "�� " +FONT 8, "MS Shell Dlg" +{ + LTEXT "�� , �� '� �� :", -1, 40, 6, 150, 15 + LTEXT "��", -1, 40, 26, 50, 10 + LTEXT "��", -1, 40, 46, 50, 10 + LTEXT "��", -1, 40, 66, 50, 10 + LTEXT "��", -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 "&�� (��)", 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 "��", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE DISCARDABLE { IDS_LANCONNECTION "ϳ�� "

1 0

Igor Paliychuk : user32: Ukrainian translation update.
by Alexandre Julliard 12 Jul '10

12 Jul '10

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

Igor Paliychuk : shell32: Ukrainian translation update.
by Alexandre Julliard 12 Jul '10

12 Jul '10

Module: wine Branch: master Commit: 82ee62d265c44e2e5587a5dadab63f021ef78a8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=82ee62d265c44e2e5587a5dad… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Sat Jul 10 17:28:04 2010 +0300 shell32: Ukrainian translation update. --- dlls/shell32/shell32_Uk.rc | 185 +++++++++++++++++++++++++++++++++----------- 1 files changed, 140 insertions(+), 45 deletions(-) diff --git a/dlls/shell32/shell32_Uk.rc b/dlls/shell32/shell32_Uk.rc index 7d1f60a..72ac7fd 100644 --- a/dlls/shell32/shell32_Uk.rc +++ b/dlls/shell32/shell32_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 @@ -77,7 +78,7 @@ MENU_SHV_FILE MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM "&Select" FCIDM_SHVIEW_OPEN + MENUITEM "&��" FCIDM_SHVIEW_OPEN MENUITEM "&��", FCIDM_SHVIEW_EXPLORE MENUITEM "&³��", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR @@ -94,13 +95,13 @@ END MENU_CPANEL MENU BEGIN - POPUP "&File" + POPUP "&��" BEGIN MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_CPANEL_EXIT + MENUITEM "�&��", IDM_CPANEL_EXIT END - POPUP "&View" + POPUP "&��" BEGIN MENUITEM "&�� ", FCIDM_SHVIEW_BIGICON MENUITEM "&�� ", FCIDM_SHVIEW_SMALLICON @@ -108,9 +109,9 @@ BEGIN MENUITEM "&��", FCIDM_SHVIEW_REPORTVIEW END - POPUP "&Help" + POPUP "&��" BEGIN - MENUITEM "&About Control Panel...", IDM_CPANEL_ABOUT + MENUITEM "&�� ...", IDM_CPANEL_ABOUT END END @@ -120,7 +121,7 @@ CAPTION " FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "³��", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP LTEXT "", IDD_TITLE, 4, 4, 180, 12 LTEXT "", IDD_STATUS, 4, 25, 180, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", @@ -129,18 +130,49 @@ FONT 8, "MS Shell Dlg" 4, 40, 180, 120 } +SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "�� " +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDD_TITLE, 10, 8, 198, 24 + LTEXT "", IDD_STATUS, 10, 25, 198, 12 + LTEXT "��:", IDD_FOLDER, 10, 156, 40, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 12, 38, 194, 105 + EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "&�� ", IDD_MAKENEWFOLDER, 12, 174, 70, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP +} + +SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "��" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "&��", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "�� &��", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&ͳ", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&��", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP + ICON "", IDD_ICON, 10, 10, 16, 16 + LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 +} + SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "�� %s" FONT 10, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 153, 133, 60, 12, WS_TABSTOP - PUSHBUTTON "Wine &license...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP + PUSHBUTTON "&˳�� Wine...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 170, 10 LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 170, 10 - LTEXT "Running on %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 + LTEXT "�� %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 LTEXT "�� Wine:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 } @@ -154,18 +186,36 @@ FONT 8, "MS Shell Dlg" LTEXT "&³��:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "³��", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "��", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "&��...", 12288, 170, 63, 50, 14, WS_TABSTOP } -/* - special folders -*/ STRINGTABLE { - IDS_DESKTOP "��" +/* columns in the shellview */ + IDS_SHV_COLUMN1 "��" + IDS_SHV_COLUMN2 "��" + IDS_SHV_COLUMN3 "��" + IDS_SHV_COLUMN4 "��" + IDS_SHV_COLUMN5 "��" + IDS_SHV_COLUMN6 "��" + IDS_SHV_COLUMN7 "³�� " + IDS_SHV_COLUMN8 "��'�" + IDS_SHV_COLUMN9 "��" + IDS_SHV_COLUMN10 "��" + IDS_SHV_COLUMN11 "��" + IDS_SHV_COLUMN_DELFROM "�� " + IDS_SHV_COLUMN_DELDATE "�� " + IDS_SHV_COL_DOCS "��" + IDS_SHV_COL_STATUS "��" + IDS_SHV_COL_LOCATION "��" + IDS_SHV_COL_MODEL "��" + + /* special folders */ + IDS_DESKTOP "�� " IDS_MYCOMPUTER "̳� ��'��" - IDS_CONTROLPANEL "Control Panel" + IDS_RECYCLEBIN_FOLDER_NAME "��" + IDS_CONTROLPANEL "�� " /* context menus */ IDS_VIEW_LARGE "&�� " @@ -181,36 +231,81 @@ STRINGTABLE IDS_DELETEFOLDER_CAPTION "ϳ�� " IDS_DELETEITEM_TEXT "�� , �� '%1'?" IDS_DELETEMULTIPLE_TEXT "�� , �� %1 ��(��)?" - IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" - IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Trash?" - IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Trash?" - IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Trash?" - IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" - IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" + IDS_DELETESELECTED_TEXT "�� , �� ?" + IDS_TRASHITEM_TEXT "�� , �� '%1' � ��?" + IDS_TRASHFOLDER_TEXT "�� , �� '%1' �� ?" + IDS_TRASHMULTIPLE_TEXT "�� , �� %1 ��(��) � ��?" + IDS_CANTTRASH_TEXT "�� '%1' �� . �� ?" + IDS_OVERWRITEFILE_TEXT "�� '%1'.\n\n�� ?" IDS_OVERWRITEFILE_CAPTION "ϳ�� " - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" + IDS_OVERWRITEFOLDER_TEXT "�� '%1'.\n\n"\ + "�� \n"\ + "�� , �� . �� \n"\ + "�� ?" -/* columns in the shellview */ - IDS_SHV_COLUMN1 "��" - IDS_SHV_COLUMN2 "��" - IDS_SHV_COLUMN3 "��" - IDS_SHV_COLUMN4 "��" - IDS_SHV_COLUMN5 "��" - IDS_SHV_COLUMN6 "��" - IDS_SHV_COLUMN7 "³�� " - IDS_SHV_COLUMN8 "Name" - IDS_SHV_COLUMN9 "Comments" - IDS_SHV_COLUMN10 "Owner" - IDS_SHV_COLUMN11 "Group" - IDS_SHV_COLUMN_DELFROM "Original location" - IDS_SHV_COLUMN_DELDATE "Date deleted" - - IDS_NEWFOLDER "New Folder" - - IDS_CPANEL_TITLE "Wine Control Panel" - IDS_CPANEL_NAME "Name" - IDS_CPANEL_DESCRIPTION "Description" + /* message box strings */ + IDS_RESTART_TITLE "��" + IDS_RESTART_PROMPT "�� Windows?" + IDS_SHUTDOWN_TITLE "��" + IDS_SHUTDOWN_PROMPT "�� Wine?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "�� (�� )" + IDS_RUNDLG_BROWSE_ERROR "�� (�� )" + IDS_RUNDLG_BROWSE_CAPTION "��" + IDS_RUNDLG_BROWSE_FILTER "�� \0*.exe\0�� \0*.*\0\0" + + /* shell folder path default values */ + IDS_PROGRAMS "�� \\��" + IDS_PERSONAL "�� " + IDS_FAVORITES "��" + IDS_STARTUP "�� \\��\\��" + IDS_RECENT "��" + IDS_SENDTO "³��" + IDS_STARTMENU "�� " + IDS_MYMUSIC "�� " + IDS_MYVIDEO "�� Գ��" + IDS_DESKTOPDIRECTORY "�� " + IDS_NETHOOD "�� " + IDS_TEMPLATES "��" + IDS_APPDATA "Application Data" + IDS_PRINTHOOD "��" + IDS_LOCAL_APPDATA "Local Settings\\Application Data" + IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" + IDS_COOKIES "Cookies" + IDS_HISTORY "Local Settings\\History" + IDS_PROGRAM_FILES "Program Files" + IDS_MYPICTURES "�� " + IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" + IDS_COMMON_DOCUMENTS "��" + IDS_ADMINTOOLS "Start Menu\\Programs\\Administrative Tools" + IDS_COMMON_MUSIC "��" + IDS_COMMON_PICTURES "��" + IDS_COMMON_VIDEO "Գ��" + IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + + IDS_NEWFOLDER "�� " + + IDS_CPANEL_TITLE "�� Wine" + IDS_CPANEL_NAME "��'�" + IDS_CPANEL_DESCRIPTION "��" + + IDS_SHLEXEC_NOASSOC "�� Windows �� ." +} + +STRINGTABLE +{ +IDS_LICENSE_CAPTION, "˳�� Wine" +IDS_LICENSE, +"Wine � �� ; �� /�� \ +�� GNU Lesser General Public \ +License, �� Free Software Foundation; �� \ +2.1 ˳��糿, �� (�� ) �� .\n\n\ +Wine �� 䳺�, �� , \ +�� -�� Ҳ�; �� \ +�� Ҳ �� ֲ��. �� GNU \ +Lesser General Public License �� .\n\n\ +�� GNU Lesser General Public \ +License �� Wine; �� , �� Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." }

1 0

Alexandre Julliard : Wine release 1.2-rc7
by Alexandre Julliard 09 Jul '10

09 Jul '10

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

Tag wine-1.2-rc7 : Alexandre Julliard : Release 1.2-rc7
by Alexandre Julliard 09 Jul '10

09 Jul '10

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

Alexandre Julliard : Release 1.2-rc7.
by Alexandre Julliard 09 Jul '10

09 Jul '10

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

Igor Paliychuk : winhlp32: Ukrainian translation update.
by Alexandre Julliard 09 Jul '10

09 Jul '10

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

Louis Lenders : d3d9: Add a few tests for GetAdapterDisplayModeEx.
by Alexandre Julliard 09 Jul '10

09 Jul '10

Module: wine Branch: master Commit: 277fdc6b33a66906269e3c6af87a6b3cf94dace2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=277fdc6b33a66906269e3c6af… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Jul 9 13:25:56 2010 +0200 d3d9: Add a few tests for GetAdapterDisplayModeEx. --- dlls/d3d9/tests/d3d9ex.c | 108 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 107 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 1a052ac..5af2e4e 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2008 Stefan Dösinger(for CodeWeavers) + * Copyright (C) 2010 Louis Lenders * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,12 +22,17 @@ */ #define COBJMACROS +#include "wine/test.h" +#include "winuser.h" +#include "wingdi.h" #include <initguid.h> #include <d3d9.h> -#include "wine/test.h" static HMODULE d3d9_handle = 0; +static BOOL (WINAPI *pEnumDisplaySettingsExA)(LPCSTR, DWORD, DEVMODEA *, DWORD); +static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODE, HWND, DWORD, LPVOID); + static IDirect3D9 * (WINAPI *pDirect3DCreate9)(UINT SDKVersion); static HRESULT (WINAPI *pDirect3DCreate9Ex)(UINT SDKVersion, IDirect3D9Ex **d3d9ex); @@ -216,6 +222,105 @@ static void test_get_adapter_luid(void) IDirect3D9Ex_Release(d3d9ex); } +static void test_get_adapter_displaymode_ex(void) +{ + HWND window = create_window(); + IDirect3D9 *d3d9 = (void *) 0xdeadbeef; + IDirect3D9Ex *d3d9ex; + UINT count; + HRESULT hr; + D3DDISPLAYMODE mode; + D3DDISPLAYMODEEX mode_ex; + D3DDISPLAYROTATION rotation; + HANDLE hdll; + DEVMODEA startmode; + LONG retval; + + hr = pDirect3DCreate9Ex(D3D_SDK_VERSION, &d3d9ex); + if (FAILED(hr)) + { + skip("Direct3D9Ex is not available (%#x)\n", hr); + DestroyWindow(window); + return; + } + + count = IDirect3D9Ex_GetAdapterCount(d3d9ex); + if (!count) + { + skip("No adapters available.\n"); + IDirect3D9Ex_Release(d3d9ex); + DestroyWindow(window); + return; + } + + hr = IDirect3D9Ex_QueryInterface(d3d9ex, &IID_IDirect3D9, (void **) &d3d9); + ok(hr == D3D_OK, + "IDirect3D9Ex::QueryInterface for IID_IDirect3D9 returned %08x, expected D3D_OK\n", + hr); + ok(d3d9 != NULL && d3d9 != (void *) 0xdeadbeef, + "QueryInterface returned interface %p, expected != NULL && != 0xdeadbeef\n", d3d9); + /* change displayorientation*/ + hdll = GetModuleHandleA("user32.dll"); + pEnumDisplaySettingsExA = (void*)GetProcAddress(hdll, "EnumDisplaySettingsExA"); + pChangeDisplaySettingsExA = (void*)GetProcAddress(hdll, "ChangeDisplaySettingsExA"); + + if (!pEnumDisplaySettingsExA || !pChangeDisplaySettingsExA) goto out; + + memset(&startmode, 0, sizeof(startmode)); + startmode.dmSize = sizeof(startmode); + startmode.dmFields = DM_DISPLAYORIENTATION; + startmode.dmDisplayOrientation = DMDO_180; + + retval = pChangeDisplaySettingsExA(NULL, &startmode, NULL, 0, NULL); + + if(retval == DISP_CHANGE_BADMODE) + { + trace(" Test skipped: graphics mode is not supported\n"); + goto out; + } + + ok(retval == DISP_CHANGE_SUCCESSFUL,"ChangeDisplaySettingsEx failed with %d\n", retval); + /* try retrieve orientation info with EnumDisplaySettingsEx*/ + startmode.dmFields = 0; + startmode.dmDisplayOrientation = 0; + ok(pEnumDisplaySettingsExA(NULL, ENUM_CURRENT_SETTINGS, &startmode, EDS_ROTATEDMODE), "EnumDisplaySettingsEx failed\n"); + + /*now that orientation has changed start tests for GetAdapterDisplayModeEx: invalid Size*/ + memset(&mode_ex, 0, sizeof(mode_ex)); + hr = IDirect3D9Ex_GetAdapterDisplayModeEx(d3d9ex, D3DADAPTER_DEFAULT, &mode_ex, &rotation); + todo_wine ok(hr == D3DERR_INVALIDCALL, "GetAdapterDisplayModeEx returned %#x instead of D3DERR_INVALIDCALL\n", hr); + + mode_ex.Size = sizeof(D3DDISPLAYMODEEX); + /* invalid count*/ + hr = IDirect3D9Ex_GetAdapterDisplayModeEx(d3d9ex, count + 1, &mode_ex, &rotation); + todo_wine ok(hr == D3DERR_INVALIDCALL, "GetAdapterDisplayModeEx returned %#x instead of D3DERR_INVALIDCALL\n", hr); + /*valid count and valid Size*/ + hr = IDirect3D9Ex_GetAdapterDisplayModeEx(d3d9ex, D3DADAPTER_DEFAULT, &mode_ex, &rotation); + todo_wine ok(SUCCEEDED(hr), "GetAdapterDisplayModeEx failed, hr %#x.\n", hr); + + /* Compare what GetAdapterDisplayMode returns with what GetAdapterDisplayModeEx returns*/ + hr = IDirect3D9_GetAdapterDisplayMode(d3d9, D3DADAPTER_DEFAULT, &mode); + ok(SUCCEEDED(hr), "GetAdapterDisplayMode failed, hr %#x.\n", hr); + + ok(mode_ex.Size == sizeof(D3DDISPLAYMODEEX), "size is %d instead of %d\n", mode_ex.Size, sizeof(D3DDISPLAYMODEEX)); + todo_wine ok(mode_ex.Width == mode.Width, "width is %d instead of %d\n", mode_ex.Width, mode.Width); + todo_wine ok(mode_ex.Height == mode.Height, "height is %d instead of %d\n", mode_ex.Height, mode.Height); + todo_wine ok(mode_ex.RefreshRate == mode.RefreshRate, "RefreshRate is %d instead of %d\n", mode_ex.RefreshRate, mode.RefreshRate); + todo_wine ok(mode_ex.Format == mode.Format, "format is %x instead of %x\n", mode_ex.Format, mode.Format); + /* don't know yet how to test for ScanLineOrdering, just testing that it is set to a value by GetAdapterDisplayModeEx*/ + todo_wine ok(mode_ex.ScanLineOrdering != 0, "ScanLineOrdering returned 0\n"); + /* check that orientation is returned correctly by GetAdapterDisplayModeEx and EnumDisplaySettingsEx*/ + todo_wine ok(startmode.dmDisplayOrientation == DMDO_180 && rotation == D3DDISPLAYROTATION_180, "rotation is %d instead of %d\n", rotation, startmode.dmDisplayOrientation); + + /* return to the default mode */ + pChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + trace("GetAdapterDisplayModeEx returned Width = %d,Height = %d, RefreshRate = %d, Format = %x, ScanLineOrdering = %x, rotation = %d\n", + mode_ex.Width, mode_ex.Height, mode_ex.RefreshRate, mode_ex.Format, mode_ex.ScanLineOrdering, rotation); +out: + IDirect3D9_Release(d3d9); + IDirect3D9Ex_Release(d3d9ex); +} + START_TEST(d3d9ex) { d3d9_handle = LoadLibraryA("d3d9.dll"); @@ -239,4 +344,5 @@ START_TEST(d3d9ex) test_qi_base_to_ex(); test_qi_ex_to_base(); test_get_adapter_luid(); + test_get_adapter_displaymode_ex(); }

1 0

Marcus Meissner : ntdll: Handle error cases in om test (Coverity).
by Alexandre Julliard 09 Jul '10

09 Jul '10

Module: wine Branch: master Commit: c7bbf3652e703397a769f953150b6673c16e28ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7bbf3652e703397a769f9531… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Jul 9 13:09:53 2010 +0200 ntdll: Handle error cases in om test (Coverity). --- dlls/ntdll/tests/om.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 24339bb..c6a3cbf 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -419,9 +419,12 @@ static void test_directory(void) memset( buffer, 0xaa, sizeof(buffer) ); status = pNtQuerySymbolicLinkObject( dir, &str, &len ); ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status ); + if (status != STATUS_SUCCESS) + goto error; full_len = str.Length + sizeof(WCHAR); ok( len == full_len, "bad length %u/%u\n", len, full_len ); - ok( buffer[len / sizeof(WCHAR) - 1] == 0, "no terminating null\n" ); + if (len == full_len) + ok( buffer[len / sizeof(WCHAR) - 1] == 0, "no terminating null\n" ); str.MaximumLength = str.Length; len = 0xdeadbeef; @@ -441,6 +444,7 @@ static void test_directory(void) ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status ); ok( len == full_len, "bad length %u/%u\n", len, full_len ); +error: pNtClose(dir); }

1 0

← Newer
1
...
72
73
74
75
76
77
78
...
90
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 July 2010