July 2008 - Wine-commits - list.winehq.org

Alexander Nicolaysen Sørnes : Guard against intensive searches
by Chris Morgan 18 Jul '08

18 Jul '08

Module: appdb Branch: master Commit: 7be5d6bd34d5c9c2f78df084e8d824b111925dcb URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7be5d6bd34d5c9c2f78df084… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 10 01:03:26 2008 +0200 Guard against intensive searches --- include/util.php | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/include/util.php b/include/util.php index 6fe6c1c..3b6453d 100644 --- a/include/util.php +++ b/include/util.php @@ -427,7 +427,16 @@ function cleanupSearchWords($search_words) Search for the first word in the search query */ function searchForApplicationPartial($sSearchWords) { + /* This would yield too many results and stress MySQL */ + if(strlen($sSearchWords) < 4) + return null; + $sSearchWords = cleanupSearchWords($sSearchWords); + + /* The search string may have gotten shorter; even empty */ + if(strlen($sSearchWords) < 4) + return null; + $aWords = explode(' ', $sSearchWords); $sSearchString = ''; $sEnsureExactWord = ''; // Used to ensure we don't match partial words when prepending @@ -455,9 +464,17 @@ function searchForApplicationPartial($sSearchWords) /* search the database and return a hResult from the query_appdb() */ function searchForApplication($search_words) { + /* This would yield too many results and stress MySQL */ + if(strlen($search_words) < 4) + return null; + /* cleanup search words */ $search_words = cleanupSearchWords($search_words); + /* The search string may have gotten shorter; even empty */ + if(strlen($search_words) < 4) + return null; + /* remove any search words less than 4 letters */ $split_words = array(); $split_search_words = split(" ", $search_words);

1 0

Alexander Nicolaysen Sørnes : Let application::getVersions() optionally return only accepted versions
by Chris Morgan 18 Jul '08

18 Jul '08

Module: appdb Branch: master Commit: 64f3219c94e2d2806dd0ce866b0ad8e7917013c0 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=64f3219c94e2d2806dd0ce86… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Jul 14 14:33:18 2008 +0200 Let application::getVersions() optionally return only accepted versions --- include/application.php | 24 ++++++++++++------------ include/version.php | 2 +- screenshots.php | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/application.php b/include/application.php index 6b2cd77..a7ffa09 100644 --- a/include/application.php +++ b/include/application.php @@ -101,20 +101,20 @@ class Application { } } - private function _internal_retrieve_all_versions($bIncludeObsolete = TRUE, $bIncludeDeleted = false) + private function _internal_retrieve_all_versions($bOnlyAccepted = false, $bIncludeObsolete = TRUE, $bIncludeDeleted = false) { + $sExtraTerms = ''; + if(!$bIncludeObsolete) - $sObsolete = " AND obsoleteBy = '0'"; - else - $sObsolete = ""; + $sExtraTerms .= " AND obsoleteBy = '0'"; - if($bIncludeDeleted) - $sExcludeDeleted = ""; - else - $sExcludeDeleted = " AND state != 'deleted'"; + if($bOnlyAccepted) + $sExtraTerms .= " AND state = 'accepted'"; + else if(!$bIncludeDeleted) + $sExtraTerms .= " AND state != 'deleted'"; $sQuery = "SELECT versionId FROM appVersion WHERE - appId = '?'$sObsolete$sExcludeDeleted ORDER by versionName"; + appId = '?'$sExtraTerms ORDER by versionName"; $hResult = query_parameters($sQuery, $this->iAppId); return $hResult; } @@ -1224,7 +1224,7 @@ class Application { return $oRow->count; } - public function getVersions($bIncludeObsolete = TRUE, $bIncludeDeleted = false) + public function getVersions($bOnlyAccepted = false, $bIncludeObsolete = TRUE, $bIncludeDeleted = false) { /* If no id is set we cannot query for the versions, but perhaps objects are already cached? */ if(!$this->iAppId) @@ -1232,7 +1232,7 @@ class Application { $aVersions = array(); - $hResult = $this->_internal_retrieve_all_versions($bIncludeObsolete, $bIncludeDeleted); + $hResult = $this->_internal_retrieve_all_versions($bOnlyAccepted, $bIncludeObsolete, $bIncludeDeleted); while($oRow = mysql_fetch_object($hResult)) $aVersions[] = new version($oRow->versionId); @@ -1268,7 +1268,7 @@ class Application { $aChildren = array(); /* Get versions */ - foreach($this->getVersions(true, $bIncludeDeleted) as $oVersion) + foreach($this->getVersions(false, true, $bIncludeDeleted) as $oVersion) { $aChildren += $oVersion->objectGetChildren($bIncludeDeleted); $aChildren[] = $oVersion; diff --git a/include/version.php b/include/version.php index e04955b..3526012 100644 --- a/include/version.php +++ b/include/version.php @@ -687,7 +687,7 @@ class version { echo "<input type=\"hidden\" name=\"iObsoleteBy\" value=\"". $oVersionInDB->iObsoleteBy."\" type=\"hidden\" >\n"; - } else if(sizeof($oApp->getVersions(FALSE)) > 1) + } else if(sizeof($oApp->getVersions(TRUE, FALSE)) > 1) { if($this->iObsoleteBy) $sObsolete = "checked=\"checked\""; diff --git a/screenshots.php b/screenshots.php index aa55225..fdb1d0b 100644 --- a/screenshots.php +++ b/screenshots.php @@ -165,7 +165,7 @@ if($aClean['iVersionId'] && $_SESSION['current']->isLoggedIn()) echo html_frame_start("Upload Screenshot", "30%"); echo 'If you would like to submit screenshots, please select an application version below.<br>'; echo '<ul>'; - foreach($oApp->getVersions() as $oVersion) + foreach($oApp->getVersions(true) as $oVersion) echo '<li><a href="'.BASE.'screenshots.php?iVersionId='.$oVersion->objectGetId().'">'.$oVersion->sName.'</a></li>'; echo '</ul>';

1 0

Vladimir Pankratov : hhctrl.ocx: Update Russian translation.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: stable Commit: 176db0e62539073ead894cf1d006703f29f271c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=176db0e62539073ead894cf1d… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Jun 24 15:41:32 2008 +0500 hhctrl.ocx: Update Russian translation. (cherry picked from commit 2eee5fbfbe650541b3589f011bba2a589148f490) --- dlls/hhctrl.ocx/Ru.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/hhctrl.ocx/Ru.rc b/dlls/hhctrl.ocx/Ru.rc index 4333033..a530f80 100644 --- a/dlls/hhctrl.ocx/Ru.rc +++ b/dlls/hhctrl.ocx/Ru.rc @@ -38,11 +38,11 @@ BEGIN IDTB_BACK "��" IDTB_HOME "� ��" IDTB_SYNC "��" - IDTB_PRINT "��" + IDTB_PRINT "��" IDTB_OPTIONS "��" - IDTB_FORWARD "� ��" + IDTB_FORWARD "��" IDTB_NOTES "��" - IDTB_BROWSE_FWD "�� " + IDTB_BROWSE_FWD "�� " IDTB_BROWSE_BACK "�� " IDTB_CONTENTS "��" IDTB_INDEX "��"

1 0

Vladimir Pankratov : oleview: Add Russian translation.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: stable Commit: 21afafb9c5b445afe53f53e714825cbfecb05c1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=21afafb9c5b445afe53f53e71… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Fri Jun 20 16:07:32 2008 +0500 oleview: Add Russian translation. (cherry picked from commit ad0c267f748339f98fb27af11637284de1016674) --- programs/oleview/Ru.rc | 213 ++++++++++++++++++++++++++++++++++++++++++++++ programs/oleview/rsrc.rc | 1 + 2 files changed, 214 insertions(+), 0 deletions(-) diff --git a/programs/oleview/Ru.rc b/programs/oleview/Ru.rc new file mode 100644 index 0000000..29aca2a --- /dev/null +++ b/programs/oleview/Ru.rc @@ -0,0 +1,213 @@ +/* + * OleView (Ru.rc) + * Russian Language Support + * + * Copyright 2008 Vladimir Pankratov + * + * 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 + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_RUSSIAN + +IDM_MENU MENU +{ + POPUP "&��" + { + MENUITEM "�&�� ...", IDM_BIND + MENUITEM "&�� TypeLib...", IDM_TYPELIB + MENUITEM SEPARATOR + MENUITEM "&�� ...", IDM_SYSCONF + MENUITEM "&�� ", IDM_REGEDIT + MENUITEM SEPARATOR + MENUITEM "&��", IDM_EXIT + } + POPUP "&��" + { + POPUP "&CoCreateInstance Flag" + { + MENUITEM "CLSCTX_&INPROC_SERVER", IDM_FLAG_INSERV,CHECKED + MENUITEM "CLSCTX_INPROC_&HANDLER", IDM_FLAG_INHANDL + MENUITEM "CLSCTX_&LOCAL_SERVER", IDM_FLAG_LOCSERV,CHECKED + MENUITEM "CLSCTX_&REMOTE_SERVER", IDM_FLAG_REMSERV + } + MENUITEM SEPARATOR + MENUITEM "�� &Type info", IDM_TYPEINFO, GRAYED + MENUITEM SEPARATOR + MENUITEM "Create &Instance", IDM_CREATEINST, GRAYED + MENUITEM "Create Instance &On...", IDM_CREATEINSTON, GRAYED + MENUITEM "&Release Instance", IDM_RELEASEINST, GRAYED + MENUITEM SEPARATOR + MENUITEM "�� C&LSID � ��", IDM_COPYCLSID, GRAYED + MENUITEM "�� &HTML object Tag � ��", IDM_HTMLTAG, GRAYED + MENUITEM SEPARATOR + MENUITEM "&��...", IDM_VIEW, GRAYED + } + POPUP "&��" + { + MENUITEM "&�� ", IDM_EXPERT,CHECKED + MENUITEM SEPARATOR + MENUITEM "&Hidden component categories", IDM_HIDDEN, GRAYED + MENUITEM SEPARATOR + MENUITEM "&�� ", IDM_TOOLBAR,CHECKED + MENUITEM "&�� ", IDM_STATUSBAR,CHECKED + MENUITEM SEPARATOR + MENUITEM "&��\tF5", IDM_REFRESH + } + POPUP "&��" + { + MENUITEM "&� ��...", IDM_ABOUT + } +} + +IDM_TYPELIB MENU +{ + POPUP "&��" + { + MENUITEM "&�� ...", IDM_SAVEAS + MENUITEM "&��", IDM_CLOSE + } + POPUP "&��" + { + MENUITEM "&Group by type kind", IDM_GROUP + MENUITEM SEPARATOR + MENUITEM "&�� ", IDM_TOOLBAR + MENUITEM "&�� ", IDM_STATUSBAR,CHECKED + } +} + +STRINGTABLE +{ + IDS_APPNAME "OleView" + IDS_APPTITLE "OleView" + IDS_READY "��" + IDS_ABOUT "OleView - OLE/COM Object Viewer" + IDS_ABOUTVER "�� 1.0" + IDS_TYPELIBTITLE "ITypeLib viewer" + IDS_OPEN "��" + IDS_OPEN_TYPELIB_FILTER "�� TypeLib (*.tlb;*.olb;*.dll;*.ocx;*.exe)\0*.tlb;*.olb;*.dll;*.ocx;*.exe\0All Files (*.*)\0*.*\0\0" + + IDM_BIND, "Bind to file via a File Moniker" + IDM_TYPELIB, "Open a TypeLib file and view the contents" + IDM_SYSCONF, "Change machine wide Distributed COM settings" + IDM_REGEDIT, "�� Wine" + IDM_EXIT, "�� " + IDM_CREATEINST, "Create an instance of the selected object" + IDM_CREATEINSTON, "Create an instance of the selected object on a specyfic machine" + IDM_RELEASEINST, "Release the currently selected object instance" + IDM_COPYCLSID, "�� GUID �� " + IDM_VIEW, "Display the viewer for the selected item" + IDM_FLAG_INSERV, "�� CLSCTX_INPROC_SERVER �� CoGetClassObject" + IDM_FLAG_INHANDL, "�� CLSCTX_INPROC_HANDLER �� CoGetClassObject" + IDM_FLAG_LOCSERV, "�� CLSCTX_LOCAL_SERVER �� CoGetClassObject" + IDM_FLAG_REMSERV, "�� CLSCTX_REMOTE_SERVER �� CoGetClassObject" + IDM_EXPERT, "�� /��" + IDM_HIDDEN, "Toggle the display of component categories that are not meant to be visible" + IDM_TOOLBAR, "��/�� " + IDM_STATUSBAR, "��/�� " + IDM_REFRESH, "�� " + IDM_ABOUT, "�� , �� " + + IDM_SAVEAS, "�� .IDL �� .H ��" + IDM_CLOSE, "�� " + IDM_GROUP, "Group typeinfos by kind" + + IDS_TREE_OC, "ObjectClasses" + IDS_TREE_GBCC, "Grouped by Component Category" + IDS_TREE_O1O, "�� OLE 1.0" + IDS_TREE_CLO, "�� COM" + IDS_TREE_AO, "�� " + IDS_TREE_AID, "ID ��" + IDS_TREE_TL, "Type Libraries" + IDS_TL_VER, "��." + IDS_TREE_I, "��" + + IDS_TAB_REG, "��" + IDS_TAB_IMPL, "Implementation" + IDS_TAB_ACTIV, "Activation" + + IDS_CGCOFAIL, "CoGetClassObject failed." + IDS_ERROR_UNKN, "�� " + IDS_TRUE, "True" + IDS_FALSE, "False" + IDS_BYTES, "��" + + IDS_ERROR_LOADTYPELIB, "LoadTypeLib( %s ) failed ($%x)" + IDS_INHERITINTERFACES, "Inherited Interfaces" +} + +DLG_CREATEINSTON DIALOG DISCARDABLE 0, 0, 250, 41 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "�� " +FONT 8, "MS Shell Dlg" +{ + LTEXT "&�� :", IDIGNORE, 5, 6, 190, 8 + EDITTEXT IDC_MACHINE, 5, 16, 190, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + DEFPUSHBUTTON "&OK", IDOK, 200, 5, 45, 14 + PUSHBUTTON "&��", IDCANCEL, 200, 22, 45, 14 +} + +DLG_SYSCONF DIALOG DISCARDABLE 0, 0, 170, 100 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "�� " +FONT 8, "MS Shell Dlg" +{ + LTEXT "�� ", IDIGNORE, 5, 6, 160, 8 + CHECKBOX "&�� COM", IDC_ENABLEDCOM, 5, 20, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + CHECKBOX "�� &�� (�� Win95)", IDC_ENABLEREMOTE, 5, 35, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + LTEXT "�� Wine.", IDIGNORE, 5, 50, 160, 40 + DEFPUSHBUTTON "&OK", IDOK, 70, 80, 45, 14 + PUSHBUTTON "&��", IDCANCEL, 120, 80, 45, 14 +} + +DLG_DEFAULT_IV DIALOG DISCARDABLE 0, 0, 280, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Default Interface Viewer" +FONT 8, "MS Shell Dlg" +{ + LTEXT "��", IDIGNORE, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "IID:", IDIGNORE, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&��", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&View Type Info", IDC_VIEWTYPEINFO, 6, 31, 70, 14, WS_DISABLED +} + +DLG_IPERSIST_IV DIALOG DISCARDABLE 0, 0, 280, 29 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "IPersist Interface Viewer" +FONT 8, "MS Shell Dlg" +{ + LTEXT "�� :", IDIGNORE, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", IDIGNORE, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&��", IDCANCEL, 230, 6, 45, 14 +} + +DLG_IPERSISTSTREAM_IV DIALOG DISCARDABLE 0, 0, 280, 68 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "IPersistStream Interface Viewer" +FONT 8, "MS Shell Dlg" +{ + LTEXT "�� :", IDIGNORE, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", IDIGNORE, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&��", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&IsDirty", IDC_ISDIRTY_BUTTON, 6, 31, 50, 14 + LTEXT "???", IDC_ISDIRTY, 60, 34, 145, 8 + PUSHBUTTON "&GetSizeMax", IDC_GETSIZEMAX_BUTTON, 6, 49, 50, 14 + LTEXT "???", IDC_GETSIZEMAX, 60, 52, 145, 8 +} diff --git a/programs/oleview/rsrc.rc b/programs/oleview/rsrc.rc index 9604346..5b4c781 100644 --- a/programs/oleview/rsrc.rc +++ b/programs/oleview/rsrc.rc @@ -31,6 +31,7 @@ #include "Nl.rc" #include "No.rc" #include "Pl.rc" +#include "Ru.rc" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

1 0

Vladimir Pankratov : regedit: Update Russian translation.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: stable Commit: 66fdb76e7c146923199f9495d9fd0772db11ffe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66fdb76e7c146923199f9495d… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jun 19 11:26:03 2008 +0500 regedit: Update Russian translation. (cherry picked from commit 56c1ea6af415e76bfe562f796543c7dce87503bd) --- programs/regedit/Ru.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/Ru.rc b/programs/regedit/Ru.rc index 0e9b6e6..743d8ec 100644 --- a/programs/regedit/Ru.rc +++ b/programs/regedit/Ru.rc @@ -285,7 +285,7 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "��" + IDS_ERROR "��" IDS_BAD_KEY "�� '%s'" IDS_BAD_VALUE "�� '%s'" IDS_UNSUPPORTED_TYPE "�� (%ld) �� "

1 0

Vladimir Pankratov : mshtml: Update Russian translation.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: stable Commit: f7e61be843324d7718a31038c84dd45fa1a1ccb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7e61be843324d7718a31038c… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Jun 17 13:07:10 2008 +0500 mshtml: Update Russian translation. (cherry picked from commit 605d1e2f1e869927f9fe6d6fa74d5f35cbbf820c) --- dlls/mshtml/Ru.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/Ru.rc b/dlls/mshtml/Ru.rc index 3c8207f..a16273b 100644 --- a/dlls/mshtml/Ru.rc +++ b/dlls/mshtml/Ru.rc @@ -27,17 +27,17 @@ STRINGTABLE DISCARDABLE IDS_INSTALLING "��..." } -ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 85 +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 261, 85 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "�� Wine Gecko" FONT 8, "MS Shell Dlg" { LTEXT "�� HTML ��. �� Wine �� " \ "�� Gecko (Mozilla HTML engine). �� , �� Wine " \ - "�� Gecko.", ID_DWL_STATUS, 10, 10, 240, 30, SS_LEFT - CONTROL "��", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&��", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&��", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP + "�� Gecko.", ID_DWL_STATUS, 10, 10, 240, 33, SS_LEFT + CONTROL "��", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 46, 240, 12 + DEFPUSHBUTTON "&��", ID_DWL_INSTALL, 200, 63, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&��", IDCANCEL, 140, 63, 50, 15, WS_GROUP | WS_TABSTOP } IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65

1 0

Vladimir Pankratov : shell32: Update Russian translation.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: stable Commit: b4a551bd1e46a4a59764aa6f6a0416f23091e1fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4a551bd1e46a4a59764aa6f6… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Jun 17 13:06:51 2008 +0500 shell32: Update Russian translation. (cherry picked from commit 2cb5773d7baefd56b4d83cbee63231569aa93fe1) --- dlls/shell32/shell32_Ru.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_Ru.rc b/dlls/shell32/shell32_Ru.rc index ec7ace6..48a403e 100644 --- a/dlls/shell32/shell32_Ru.rc +++ b/dlls/shell32/shell32_Ru.rc @@ -137,12 +137,12 @@ FONT 8, "MS Shell Dlg" LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 } -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 +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, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 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

1 0

Alexander Nicolaysen Sørnes : Updated Norwegian Bokmål Readme file.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: stable Commit: 21465630da45d690600e2584f542bd7dee4e9611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21465630da45d690600e2584f… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 17 21:23:26 2008 +0200 Updated Norwegian Bokmål Readme file. (cherry picked from commit 4df06c4cfe620f3551c73cb0b2368108fa0c9c44) --- documentation/README.no | 168 +++++++++++++++++++++------------------------- 1 files changed, 77 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21465630da45d690600e2…

1 0

Vladimir Pankratov : README: Add Russian translation.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: stable Commit: 0622c4c225086940d25820d732840fb5d45950d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0622c4c225086940d25820d73… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jul 3 15:12:45 2008 +0500 README: Add Russian translation. (cherry picked from commit 0cd3bda1f1729c81431ab664767fcaf98d9afdb4) --- documentation/README.ru | 189 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 189 insertions(+), 0 deletions(-) diff --git a/documentation/README.ru b/documentation/README.ru new file mode 100644 index 0000000..dbcd0da --- /dev/null +++ b/documentation/README.ru @@ -0,0 +1,189 @@ +1. �� + +Wine - �� , �� Microsoft +Windows (�� DOS, Windows 3.x � Win32) �� Unix. �� +�� , �� Microsoft +Windows, � �� (Winelib), �� Windows API, +�� Unix- �� X11-��. �� +�� Win32 � �� Unix. + +Wine - �� , �� +GNU LGPL; �� LICENSE. + + +2. �� + +�� , �� , �� +Wine Installer �� Wine. � ��, �� +�� Wine (� �� ), ��: + +./tools/wineinstall + +�� "wine program". �� +�� . �� Wine, +� �� http://www.winehq.org. + + +3. �� + +�� Wine �� : + + Linux �� 2.0.36 �� + FreeBSD 7.0 �� + Solaris x86 9 �� + NetBSD-�� + Mac OS X 10.4 �� + +�� Wine �� , �� +�� , �� . �� , +� �� , �� Wine � ��. + +Linux: + Linux 2.2.x: �� ; Linux 2.0.x: �� + (�� 2.0.x �� ), + �� 2.4.x �� 2.6.x. + +FreeBSD: + Wine �� , �� FreeBSD + 7.0. � FreeBSD 6.3 �� , �� Wine ��. �� + <http://wiki.freebsd.org/Wine> �� . + +Solaris: + �� Wine �� GNU + (gcc, gas, � �.�.). ��: �� gas *��* �� + �� gcc �� . �� gcc �� + �� gas �� cc, �� ld � �� gnu. (?) + +NetBSD: + �� , �� USER_LDT, SYSVSHM, SYSVSEM � SYSVMSG + �� . + +Mac OS X: + �� Xcode 2.4 �� x86. + + +�� : + Wine �� . �� + �� Samba. ��, + NTFS �� , �� + ��. �� Linux, �� ext3. + +�� : + � �� X11 + (xlib6g-dev � Debian � XFree86-devel � Red Hat). + + ��, �� "make" (�� GNU make). + + �� flex �� 2.5 �� , � �� bison. + +�� : + �� , �� + �� . �� http://wiki.winehq.org/Recommended_Packages �� + �� , �� . + + �� 64-�� , �� 32-�� + �� ; �� + http://wiki.winehq.org/WineOn64bit. + +4. �� + +�� wineinstall, �� +�� Wine: + +./configure +make depend +make + +�� "wine" � �� /�� . +�� "wine" �� , � �� Windows. +�� "libwine" ("Winelib") �� +�� Windows �� Unix. + +�� , �� ./configure --help. + +�� , �� +�� (�� README ��). +�� "make clean", � �� : + + bunzip2 -c patch-file | patch -p1 + +�� "patch-file" - �� (��-�� +wine-1.0.x.diff.bz2). �� "./configure", � �� +"make depend && make". + + +5. �� + +�� , Wine �� , �� "make install"; �� +�� wine, �� Wine, � �� +�� . + +�� Wine. +�� "dpkg -r wine" �� "rpm -e wine" �� "make uninstall" +�� . + +�� , �� "winecfg". �� +�� http://www.winehq.org/ �� . + + +6. �� + +�� , �� . + +��: �� : + + wine notepad (�� , �� + wine notepad.exe � ��, �� ) + + wine c:\\windows\\notepad.exe (�� DOS) + + wine ~/.wine/drive_c/windows/notepad.exe (�� Unix) + + wine notepad.exe /parameter1 -parameter2 parameter3 + (�� ) + +Wine �� , �� +�� . �� , +�� . �� , +�� Wine Developer's Guide. + + +7. �� + +WWW: �� Wine �� WineHQ �� + http://www.winehq.org/: �� Wine, �� , + �� . �� . + +FAQ: Wine FAQ �� http://www.winehq.org/FAQ + +Usenet: �� Wine � �� + �� comp.emulators.ms-windows.wine. + +��: �� Wine Bugzilla �� http://bugs.winehq.org + �� , �� + �� . �� + comp.emulators.ms-windows.wine. + +IRC: �� #WineHQ �� irc.freenode.net. + +GIT: �� Wine �� GIT. + �� http://www.winehq.org/site/git �� . + +��: + �� Wine; + �� http://www.winehq.org/forums �� . + +Wiki: Wine Wiki �� http://wiki.winehq.org + +�� -�� , �� , �� (� �� 'diff -u') +�� wine-patches(a)winehq.org �� . + +-- +Alexandre Julliard +julliard(a)winehq.org + +�� +�� +scriptkid(a)mail.ru +�� +lav(a)etersoft.ru

1 0

Alexandre Julliard : winex11: Check for XKB extension on the GDI display too.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: stable Commit: 43c7ea247cf3b967e4c1b8e703c79c90d1ede98e URL: http://source.winehq.org/git/wine.git/?a=commit;h=43c7ea247cf3b967e4c1b8e70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 2 12:03:52 2008 +0200 winex11: Check for XKB extension on the GDI display too. (cherry picked from commit 219ae804ba4de3e3dfb71c1822e1a8a0007b5971) --- dlls/winex11.drv/x11drv_main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 4ca1bb6..4b9df5e 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -537,6 +537,9 @@ static BOOL process_attach(void) X11DRV_XComposite_Init(); #endif +#ifdef HAVE_XKB + if (use_xkb) use_xkb = XkbUseExtension( gdi_display, NULL, NULL ); +#endif X11DRV_InitKeyboard( gdi_display ); X11DRV_InitClipboard(); if (use_xim) use_xim = X11DRV_InitXIM( input_style );

1 0