April 2008 - Wine-Commits - list.winehq.org

Vitaliy Margolen : msacm32: Add Russian translation.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: 3f9209eb2a6c76e519b3a96d16286fd73593abfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f9209eb2a6c76e519b3a96d1… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 5 10:44:09 2008 -0600 msacm32: Add Russian translation. --- dlls/msacm32/msacm.rc | 1 + dlls/msacm32/msacm_Ru.rc | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/msacm32/msacm.rc b/dlls/msacm32/msacm.rc index b00feb0..cbaf0a6 100644 --- a/dlls/msacm32/msacm.rc +++ b/dlls/msacm32/msacm.rc @@ -36,5 +36,6 @@ #include "msacm_No.rc" #include "msacm_Pl.rc" #include "msacm_Pt.rc" +#include "msacm_Ru.rc" #include "msacm_Sv.rc" #include "msacm_Tr.rc" diff --git a/dlls/msacm32/msacm_Ru.rc b/dlls/msacm32/msacm_Ru.rc new file mode 100644 index 0000000..d634139 --- /dev/null +++ b/dlls/msacm32/msacm_Ru.rc @@ -0,0 +1,56 @@ +/* + * Russian resource file for MS ACM + * + * Copyright 2008 Vitaliy Margolen + * + * 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_DEFAULT + +DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "�� " +FONT 8, "MS Shell Dlg" +BEGIN + + LTEXT "&��:", -1, 5, 5, 115, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + PUSHBUTTON "&�� ...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "&��", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + + LTEXT "&��:", -1, 5, 41, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + LTEXT "&��:", -1, 5, 59, 44, 8, NOT WS_GROUP + +#if 0 + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | + CBS_OWNERDRAWFIXED | CBS_HASSTRINGS +#else + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +#endif + DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 + PUSHBUTTON "��", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "&��", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + +END

1 0

Vitaliy Margolen : sane.ds: Add Russian translation.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: 76a030685608d5364d2dddbef5e491403e223408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76a030685608d5364d2dddbef… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 5 10:39:45 2008 -0600 sane.ds: Add Russian translation. --- dlls/sane.ds/rsrc.rc | 1 + dlls/sane.ds/sane_Ru.rc | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/rsrc.rc b/dlls/sane.ds/rsrc.rc index ec0d7ac..cde9b9b 100644 --- a/dlls/sane.ds/rsrc.rc +++ b/dlls/sane.ds/rsrc.rc @@ -34,4 +34,5 @@ #include "sane_Nl.rc" #include "sane_No.rc" #include "sane_Pl.rc" +#include "sane_Ru.rc" #include "sane_Sv.rc" diff --git a/dlls/sane.ds/sane_Ru.rc b/dlls/sane.ds/sane_Ru.rc new file mode 100644 index 0000000..32fabef --- /dev/null +++ b/dlls/sane.ds/sane_Ru.rc @@ -0,0 +1,40 @@ +/* + * Russian resources for Twain + * + * Copyright 2008 Vitaliy Margolen + * + * 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_DEFAULT + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "��" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "��.... �� ",IDC_STATIC,5,19,176,8, SS_CENTER +END + +STRINGTABLE DISCARDABLE +{ + 0 "" + 1 "��" + 2 "��" + 3 "��" + 4 "�� " + 5 "%" + 6 "�� " +}

1 0

Vitaliy Margolen : msvidc32: Add Russian translation.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: e00a93fd5de7fa9c0d62e5cba9c06638b961e4d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e00a93fd5de7fa9c0d62e5cba… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 5 10:39:24 2008 -0600 msvidc32: Add Russian translation. --- dlls/msvidc32/msvidc32_Ru.rc | 25 +++++++++++++++++++++++++ dlls/msvidc32/rsrc.rc | 1 + 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/msvidc32/msvidc32_Ru.rc b/dlls/msvidc32/msvidc32_Ru.rc new file mode 100644 index 0000000..2c84bff --- /dev/null +++ b/dlls/msvidc32/msvidc32_Ru.rc @@ -0,0 +1,25 @@ +/* + * Copyright 2008 Vitaliy Margolen + * + * 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_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "MS-CRAM" + IDS_DESCRIPTION "�� Wine Video 1" +} diff --git a/dlls/msvidc32/rsrc.rc b/dlls/msvidc32/rsrc.rc index 34f3980..bb8fdfe 100644 --- a/dlls/msvidc32/rsrc.rc +++ b/dlls/msvidc32/rsrc.rc @@ -28,5 +28,6 @@ #include "msvidc32_No.rc" #include "msvidc32_Pl.rc" #include "msvidc32_Ro.rc" +#include "msvidc32_Ru.rc" #include "msvidc32_Sv.rc" #include "msvidc32_Tr.rc"

1 0

Vitaliy Margolen : msvfw32: Add Russian translation.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: 24ce6dc61d9985429c47b5e5e7192cd1b11a30a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ce6dc61d9985429c47b5e5e… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 5 10:39:08 2008 -0600 msvfw32: Add Russian translation. --- dlls/msvfw32/msvfw32_Ru.rc | 51 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvfw32/rsrc.rc | 1 + 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/msvfw32/msvfw32_Ru.rc b/dlls/msvfw32/msvfw32_Ru.rc new file mode 100644 index 0000000..96c8a81 --- /dev/null +++ b/dlls/msvfw32/msvfw32_Ru.rc @@ -0,0 +1,51 @@ +/* + * Copyright 2008 Vitaliy Margolen + * + * 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_DEFAULT + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "�� " +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK",IDOK,129,2,49,14 + PUSHBUTTON "��",IDCANCEL,129,18,49,14 + + LTEXT "&�� :",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "&��...",882,129,36,49,14 + PUSHBUTTON "&��...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "&�� :",886,9,34,80,8 + + CONTROL "��&�� ",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "��",889,103,62,26,10 + + CONTROL "&�� ",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "��/��",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "�� (�� )" +} diff --git a/dlls/msvfw32/rsrc.rc b/dlls/msvfw32/rsrc.rc index 442ee4c..ba00f7d 100644 --- a/dlls/msvfw32/rsrc.rc +++ b/dlls/msvfw32/rsrc.rc @@ -29,5 +29,6 @@ #include "msvfw32_Nl.rc" #include "msvfw32_No.rc" #include "msvfw32_Pl.rc" +#include "msvfw32_Ru.rc" #include "msvfw32_Sv.rc" #include "msvfw32_Tr.rc"

1 0

Vitaliy Margolen : localui: Add Russian translation.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: a4d9ad0fe2d48165200f31872f2ccd9c35780189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4d9ad0fe2d48165200f31872… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 5 10:38:19 2008 -0600 localui: Add Russian translation. --- dlls/localui/localui.rc | 1 + dlls/localui/ui_Ru.rc | 54 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/localui/localui.rc b/dlls/localui/localui.rc index fc2ad73..7c67807 100644 --- a/dlls/localui/localui.rc +++ b/dlls/localui/localui.rc @@ -45,4 +45,5 @@ #include "ui_Nl.rc" #include "ui_No.rc" #include "ui_Pl.rc" +#include "ui_Ru.rc" #include "ui_Sv.rc" diff --git a/dlls/localui/ui_Ru.rc b/dlls/localui/ui_Ru.rc new file mode 100644 index 0000000..96e78f1 --- /dev/null +++ b/dlls/localui/ui_Ru.rc @@ -0,0 +1,54 @@ +/* + * Russian resources for localui + * + * Copyright 2008 Vitaliy Margolen + * + * 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_DEFAULT + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "�� " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "�� &�� :", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "��", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "�� " +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "��-�� (��)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "&�� :", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "��", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "�� " + IDS_INVALIDNAME "�� '%s'" + IDS_PORTEXISTS "�� '%s' �� " + IDS_NOTHINGTOCONFIG "�� " +}

1 0

Vitaliy Margolen : mpr: Add Russian translation.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: 7d3a5af43ea0d66a0596a4fac22cf88ae50d2745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3a5af43ea0d66a0596a4fac… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 5 10:38:36 2008 -0600 mpr: Add Russian translation. --- dlls/mpr/mpr.rc | 1 + dlls/mpr/mpr_Ru.rc | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/mpr/mpr.rc b/dlls/mpr/mpr.rc index 1b1af54..7419740 100644 --- a/dlls/mpr/mpr.rc +++ b/dlls/mpr/mpr.rc @@ -39,5 +39,6 @@ #include "mpr_No.rc" #include "mpr_Pl.rc" #include "mpr_Pt.rc" +#include "mpr_Ru.rc" #include "mpr_Sv.rc" #include "mpr_Tr.rc" diff --git a/dlls/mpr/mpr_Ru.rc b/dlls/mpr/mpr_Ru.rc new file mode 100644 index 0000000..d093c06 --- /dev/null +++ b/dlls/mpr/mpr_Ru.rc @@ -0,0 +1,46 @@ +/* + * MPR dll Russian resources + * + * Copyright (C) 2008 Vitaliy Margolen + * + * 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_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "�� " +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "�� " +FONT 8, "MS Shell Dlg" +{ + LTEXT "�� :", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "��", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "��", -1, 40, 66, 50, 10 + LTEXT "��", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 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 +}

1 0

Eric Pouech : dbghelp: Prevent debug overflow of internal buffer while tracing.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: ce7656d218cd9dcd9772992b29e965b92c2a0609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce7656d218cd9dcd9772992b2… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Apr 5 09:35:28 2008 +0200 dbghelp: Prevent debug overflow of internal buffer while tracing. --- dlls/dbghelp/msc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index a2454d0..a2d0c23 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1575,7 +1575,7 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root while (*ptr1) { ptr2 = ptr1 + strlen(ptr1) + 1; - TRACE("\t%s => %s\n", ptr1, ptr2); + TRACE("\t%s => %s\n", ptr1, debugstr_a(ptr2)); ptr1 = ptr2 + strlen(ptr2) + 1; } }

1 0

Eric Pouech : dbghelp: Be stricter when looping in symbol tables.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: f46d717818d11cd80127ca64646db57311af72cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f46d717818d11cd80127ca646… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Apr 5 09:34:07 2008 +0200 dbghelp: Be stricter when looping in symbol tables. --- dlls/dbghelp/msc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 25589fc..a2454d0 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1322,6 +1322,7 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root const union codeview_symbol* sym = (const union codeview_symbol*)(root + i); length = sym->generic.len + 2; if (i + length > size) break; + if (!sym->generic.id || length < 4) break; if (length & 3) FIXME("unpadded len %u\n", length); switch (sym->generic.id)

1 0

James Hawkins : msi: Don' t execute the view again when modifying a WHERE query.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: 4d9c17da02397898f195858d9e2d55927154bd10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d9c17da02397898f195858d9… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Apr 6 14:31:19 2008 -0500 msi: Don't execute the view again when modifying a WHERE query. --- dlls/msi/tests/db.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/where.c | 10 ++-- 2 files changed, 107 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 663388e..cd9abad 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -5887,6 +5887,107 @@ static void test_viewmodify_refresh(void) DeleteFileA(msifile); } +static void test_where_viewmodify(void) +{ + MSIHANDLE hdb, hview, hrec; + const char *query; + UINT r; + + DeleteFile(msifile); + + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "CREATE TABLE `Table` ( `A` INT, `B` INT PRIMARY KEY `A` )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Table` ( `A`, `B` ) VALUES ( 1, 2 )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Table` ( `A`, `B` ) VALUES ( 3, 4 )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Table` ( `A`, `B` ) VALUES ( 5, 6 )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* `B` = 3 doesn't match, but the view shouldn't be executed */ + query = "SELECT * FROM `Table` WHERE `B` = 3"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + hrec = MsiCreateRecord(2); + MsiRecordSetInteger(hrec, 1, 7); + MsiRecordSetInteger(hrec, 2, 8); + + r = MsiViewModify(hview, MSIMODIFY_INSERT_TEMPORARY, hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + MsiCloseHandle(hrec); + MsiViewClose(hview); + MsiCloseHandle(hview); + + query = "SELECT * FROM `Table` WHERE `A` = 7"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 1); + ok(r == 7, "Expected 7, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 2); + ok(r == 8, "Expected 8, got %d\n", r); + + MsiRecordSetInteger(hrec, 2, 9); + + r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + MsiCloseHandle(hrec); + MsiViewClose(hview); + MsiCloseHandle(hview); + + query = "SELECT * FROM `Table` WHERE `A` = 7"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 1); + ok(r == 7, "Expected 7, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 2); + ok(r == 9, "Expected 9, got %d\n", r); + + query = "UPDATE `Table` SET `B` = 10 WHERE `A` = 7"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewModify(hview, MSIMODIFY_REFRESH, hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 1); + ok(r == 7, "Expected 7, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 2); + ok(r == 10, "Expected 10, got %d\n", r); + + MsiCloseHandle(hrec); + MsiViewClose(hview); + MsiCloseHandle(hview); + MsiCloseHandle(hdb); +} + START_TEST(db) { test_msidatabase(); @@ -5923,4 +6024,5 @@ START_TEST(db) test_noquotes(); test_forcecodepage(); test_viewmodify_refresh(); + test_where_viewmodify(); } diff --git a/dlls/msi/where.c b/dlls/msi/where.c index aa5d5f3..8883496 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -86,6 +86,9 @@ static UINT find_entry_in_hash(MSIHASHENTRY **table, UINT row, UINT *val) { MSIHASHENTRY *entry; + if (!table) + return ERROR_SUCCESS; + if (!(entry = table[row % MSI_HASH_TABLE_SIZE])) { WARN("Row not found in hash table!\n"); @@ -503,15 +506,12 @@ static UINT WHERE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec, UINT row ) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; - UINT r; TRACE("%p %d %p\n", wv, eModifyMode, rec); - r = WHERE_execute(view, NULL); - if (r != ERROR_SUCCESS) - return r; - find_entry_in_hash(wv->reorder, row - 1, &row); + row++; + return wv->table->ops->modify( wv->table, eModifyMode, rec, row ); }

1 0

Vitaliy Margolen : iccvid: Add Russian translation.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: 2e4e2ac3c3a75774460f163b63a27e9d2f75a653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e4e2ac3c3a75774460f163b6… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 5 10:38:02 2008 -0600 iccvid: Add Russian translation. --- dlls/iccvid/iccvid_Ru.rc | 25 +++++++++++++++++++++++++ dlls/iccvid/rsrc.rc | 1 + 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/iccvid/iccvid_Ru.rc b/dlls/iccvid/iccvid_Ru.rc new file mode 100644 index 0000000..c78ee72 --- /dev/null +++ b/dlls/iccvid/iccvid_Ru.rc @@ -0,0 +1,25 @@ +/* + * Copyright 2008 Vitaliy Margolen + * + * 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_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "�� -�� Cinepak" + IDS_DESCRIPTION "�� -�� Cinepak" +} diff --git a/dlls/iccvid/rsrc.rc b/dlls/iccvid/rsrc.rc index baa9fb3..b3a92ea 100644 --- a/dlls/iccvid/rsrc.rc +++ b/dlls/iccvid/rsrc.rc @@ -28,5 +28,6 @@ #include "iccvid_No.rc" #include "iccvid_Pl.rc" #include "iccvid_Ro.rc" +#include "iccvid_Ru.rc" #include "iccvid_Sv.rc" #include "iccvid_Tr.rc"

1 0