November 2010 - Wine-Commits

Stefan Dösinger : wined3d: Don' t reapply lighting when vertex shaders are used.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: f89fdb4429883f869be3853a712cb14c876a5304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f89fdb4429883f869be3853a7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 29 18:15:23 2010 +0200 wined3d: Don't reapply lighting when vertex shaders are used. If a vertex shader is used the GL_LIGHTING state is ignored. If the shader is turned off state_vdecl is called anyway, so it will adjust the lighting state to match the available fixed function vertex attributes. --- dlls/wined3d/state.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 83ed0c6..9e0df6a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4630,11 +4630,6 @@ static void vertexdeclaration(DWORD state_id, IWineD3DStateBlockImpl *stateblock updateFog = TRUE; } - /* Reapply lighting if it is not scheduled for reapplication already */ - if(!isStateDirty(context, STATE_RENDER(WINED3DRS_LIGHTING))) { - state_lighting(STATE_RENDER(WINED3DRS_LIGHTING), stateblock, context); - } - if (transformed) { context->last_was_rhw = TRUE; } else { @@ -4677,6 +4672,9 @@ static void vertexdeclaration(DWORD state_id, IWineD3DStateBlockImpl *stateblock if(!isStateDirty(context, STATE_RENDER(WINED3DRS_COLORVERTEX))) { state_colormat(STATE_RENDER(WINED3DRS_COLORVERTEX), stateblock, context); } + if(!isStateDirty(context, STATE_RENDER(WINED3DRS_LIGHTING))) { + state_lighting(STATE_RENDER(WINED3DRS_LIGHTING), stateblock, context); + } if(context->last_was_vshader) { updateFog = TRUE;

1 0

Paul Vriens : oledlg: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 7e5cd4a22407bfaac970f5ee6f9cf2e35a5850aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e5cd4a22407bfaac970f5ee6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Oct 31 18:56:35 2010 +0100 oledlg: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/oledlg/Makefile.in | 1 + dlls/oledlg/oledlg_Sr.rc | 178 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 179 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e5cd4a22407bfaac970f…

1 0

Vincent Povirk : gdiplus: Don't rely on an HDC in GdipMeasureString.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 3e86d43030e36ce85b330620be3cca638542906a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e86d43030e36ce85b330620b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Oct 30 13:35:43 2010 -0500 gdiplus: Don't rely on an HDC in GdipMeasureString. --- dlls/gdiplus/graphics.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index da2d966..5ec54ad 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3918,6 +3918,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, { HFONT oldfont; struct measure_string_args args; + HDC temp_hdc=NULL; TRACE("(%p, %s, %i, %p, %s, %p, %p, %p, %p)\n", graphics, debugstr_wn(string, length), length, font, debugstr_rectf(rect), format, @@ -3928,8 +3929,8 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if(!graphics->hdc) { - FIXME("graphics object has no HDC\n"); - return NotImplemented; + temp_hdc = graphics->hdc = CreateCompatibleDC(0); + if (!temp_hdc) return OutOfMemory; } if(linesfilled) *linesfilled = 0; @@ -3954,6 +3955,12 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, DeleteObject(SelectObject(graphics->hdc, oldfont)); + if (temp_hdc) + { + graphics->hdc = NULL; + DeleteDC(temp_hdc); + } + return Ok; }

1 0

Paul Vriens : jscript: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 2deee14f318e388c3daa460085efc870f87a7be2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2deee14f318e388c3daa46008… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Oct 31 11:48:35 2010 +0100 jscript: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/jscript_Sr.rc | 84 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 07fc1be..24f5fdb 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -19,6 +19,7 @@ RC_SRCS = \ jscript_Ro.rc \ jscript_Ru.rc \ jscript_Si.rc \ + jscript_Sr.rc \ jscript_Sv.rc \ jscript_Uk.rc \ rsrc.rc diff --git a/dlls/jscript/jscript_Sr.rc b/dlls/jscript/jscript_Sr.rc new file mode 100644 index 0000000..155659f --- /dev/null +++ b/dlls/jscript/jscript_Sr.rc @@ -0,0 +1,84 @@ +/* + * Copyright 2009 Piotr Caban + * Copyright 2010 Đorđe Vasiljević + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + IDS_TO_PRIMITIVE "Грешка у претварању објекта у основну врсту" + IDS_INVALID_CALL_ARG "Неважећи поступак позива или аргумента" + IDS_SUBSCRIPT_OUT_OF_RANGE "Потпис је ван домета" + IDS_CREATE_OBJ_ERROR "Аутоматизовани сервер не може да створи објекат" + IDS_NO_PROPERTY "Објекат не подржава ово својство или методу" + IDS_UNSUPPORTED_ACTION "Објекат не подржава ову радњу" + IDS_ARG_NOT_OPT "Аргумент је обавезан" + IDS_SYNTAX_ERROR "Грешка у синтакси" + IDS_SEMICOLON "Очекивано ';'" + IDS_LBRACKET "Очекивано '('" + IDS_RBRACKET "Очекивано ')'" + IDS_UNTERMINATED_STR "Незавршена константа ниски" + IDS_NOT_FUNC "Очекивана функција" + IDS_NOT_DATE "„[object]“ није временски објекат" + IDS_NOT_NUM "Очекивани број" + IDS_OBJECT_EXPECTED "Очекивани објекат" + IDS_ILLEGAL_ASSIGN "Недозвољен задатак" + IDS_UNDEFINED "„|“ није одређено" + IDS_NOT_BOOL "Очекивани објекат истинитосне вредности" + IDS_NOT_VBARRAY "VBArray објекат се очекује" + IDS_JSCRIPT_EXPECTED "Очекивани објекат JScript врсте" + IDS_REGEXP_SYNTAX_ERROR "Синтаксна грешка у регуларном изразу" + IDS_URI_INVALID_CHAR "URI садржи неисправне знакове" + IDS_INVALID_LENGTH "Низ дужине мора бити коначан позитиван цео број" + IDS_ARRAY_EXPECTED "Очекивани низ објекта" +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + IDS_TO_PRIMITIVE "Greška u pretvaranju objekta u osnovnu vrstu" + IDS_INVALID_CALL_ARG "Nevažeći postupak poziva ili argumenta" + IDS_SUBSCRIPT_OUT_OF_RANGE "Potpis je van dometa" + IDS_CREATE_OBJ_ERROR "Automatizovani server ne može da stvori objekat" + IDS_NO_PROPERTY "Objekat ne podržava ovo svojstvo ili metodu" + IDS_UNSUPPORTED_ACTION "Objekat ne podržava ovu radnju" + IDS_ARG_NOT_OPT "Argument je obavezan" + IDS_SYNTAX_ERROR "Greška u sintaksi" + IDS_SEMICOLON "Očekivano ';'" + IDS_LBRACKET "Očekivano '('" + IDS_RBRACKET "Očekivano ')'" + IDS_UNTERMINATED_STR "Nezavršena konstanta niski" + IDS_NOT_FUNC "Očekivana funkcija" + IDS_NOT_DATE "„[object]“ nije vremenski objekat" + IDS_NOT_NUM "Očekivani broj" + IDS_OBJECT_EXPECTED "Očekivani objekat" + IDS_ILLEGAL_ASSIGN "Nedozvoljen zadatak" + IDS_UNDEFINED "„|“ nije određeno" + IDS_NOT_BOOL "Očekivani objekat istinitosne vrednosti" + IDS_NOT_VBARRAY "VBArray objekat se očekuje" + IDS_JSCRIPT_EXPECTED "Očekivani objekat JScript vrste" + IDS_REGEXP_SYNTAX_ERROR "Sintaksna greška u regularnom izrazu" + IDS_URI_INVALID_CHAR "URI sadrži neispravne znakove" + IDS_INVALID_LENGTH "Niz dužine mora biti konačan pozitivan ceo broj" + IDS_ARRAY_EXPECTED "Očekivani niz objekta" +}

1 0

Paul Vriens : cryptdlg: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: e2c066eea483a39476653e597f0ddea51f45f773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2c066eea483a39476653e597… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Oct 31 13:31:41 2010 +0100 cryptdlg: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/cryptdlg/Makefile.in | 1 + dlls/cryptdlg/cryptdlg_Sr.rc | 58 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/cryptdlg/Makefile.in b/dlls/cryptdlg/Makefile.in index 2122165..0725c8d 100644 --- a/dlls/cryptdlg/Makefile.in +++ b/dlls/cryptdlg/Makefile.in @@ -18,6 +18,7 @@ RC_SRCS = \ cryptdlg_Pl.rc \ cryptdlg_Pt.rc \ cryptdlg_Ro.rc \ + cryptdlg_Sr.rc \ cryptdlg_Sv.rc \ cryptdlg_Uk.rc diff --git a/dlls/cryptdlg/cryptdlg_Sr.rc b/dlls/cryptdlg/cryptdlg_Sr.rc new file mode 100644 index 0000000..5d88a3b --- /dev/null +++ b/dlls/cryptdlg/cryptdlg_Sr.rc @@ -0,0 +1,58 @@ +/* + * cryptdlg dll Serbian resources + * + * Copyright 2008 Juan Lang + * Copyright 2010 Đorđe Vasiljević + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "cryptres.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + IDS_CERT_POLICY "Смерница сертификата" + IDS_POLICY_ID "Смерница идентификатора: " + IDS_POLICY_QUALIFIER_INFO "Смерница квалификатора" + IDS_POLICY_QUALIFIER_ID "Смерница ID квалификатора=" + IDS_CPS "CPS" /* Certification Practice Statement */ + IDS_USER_NOTICE "Корисничко обавештење" + IDS_QUALIFIER "Квалификатор" + IDS_NOTICE_REF "Референца обавештења" + IDS_ORGANIZATION "Организација=" + IDS_NOTICE_NUM "Број обавештења=" + IDS_NOTICE_TEXT "Текст обавештења=" +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + IDS_CERT_POLICY "Smernica sertifikata" + IDS_POLICY_ID "Smernica identifikatora: " + IDS_POLICY_QUALIFIER_INFO "Smernica kvalifikatora" + IDS_POLICY_QUALIFIER_ID "Smernica ID kvalifikatora=" + IDS_CPS "CPS" /* Certification Practice Statement */ + IDS_USER_NOTICE "Korisničko obaveštenje" + IDS_QUALIFIER "Kvalifikator" + IDS_NOTICE_REF "Referenca obaveštenja" + IDS_ORGANIZATION "Organizacija=" + IDS_NOTICE_NUM "Broj obaveštenja=" + IDS_NOTICE_TEXT "Tekst obaveštenja=" +}

1 0

Paul Vriens : gphoto2.ds: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 8691b052e1434d1b5b6be06790740a1869ed18b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8691b052e1434d1b5b6be0679… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Oct 31 13:35:19 2010 +0100 gphoto2.ds: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/gphoto2.ds/Makefile.in | 1 + dlls/gphoto2.ds/gphoto2_Sr.rc | 88 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 0 deletions(-) diff --git a/dlls/gphoto2.ds/Makefile.in b/dlls/gphoto2.ds/Makefile.in index 6943b15..82041aa 100644 --- a/dlls/gphoto2.ds/Makefile.in +++ b/dlls/gphoto2.ds/Makefile.in @@ -28,6 +28,7 @@ RC_SRCS = \ gphoto2_Ro.rc \ gphoto2_Ru.rc \ gphoto2_Si.rc \ + gphoto2_Sr.rc \ gphoto2_Sv.rc \ gphoto2_Uk.rc \ gphoto2_Zh.rc diff --git a/dlls/gphoto2.ds/gphoto2_Sr.rc b/dlls/gphoto2.ds/gphoto2_Sr.rc new file mode 100644 index 0000000..0570834 --- /dev/null +++ b/dlls/gphoto2.ds/gphoto2_Sr.rc @@ -0,0 +1,88 @@ +/* + * Serbian resources for Twain + * + * Copyright 2006 CodeWeavers, Aric Stewart + * Copyright 2010 Đorđe Vasiljević + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +IDD_CAMERAUI DIALOG 0, 0, 372, 273 +STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Датотеке на камери" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "Списак 1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | WS_TABSTOP,7,7,358,229 + DEFPUSHBUTTON "Увези изабрано",IDC_IMPORT,152,252,72,14 + PUSHBUTTON "Преглед",IDC_FETCH,7,252,64,14 + PUSHBUTTON "Увези све",IDC_IMPORTALL,80,252,64,14 + CONTROL "Прескочи ово прозорче",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 + PUSHBUTTON "Излаз",IDC_EXIT,315,252,50,14 +END + +IDD_DIALOG1 DIALOG 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 + +IDD_CONNECTING DIALOG 0, 0, 280, 116 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER +CAPTION "Повезивање са камером" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 + LTEXT "Повезивање са камером...",IDC_STATIC,128,58,116,8 +END + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +IDD_CAMERAUI DIALOG 0, 0, 372, 273 +STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Datoteke na kameri" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "Spisak 1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | WS_TABSTOP,7,7,358,229 + DEFPUSHBUTTON "Uvezi izabrano",IDC_IMPORT,152,252,72,14 + PUSHBUTTON "Pregled",IDC_FETCH,7,252,64,14 + PUSHBUTTON "Uvezi sve",IDC_IMPORTALL,80,252,64,14 + CONTROL "Preskoči ovo prozorče",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 + PUSHBUTTON "Izlaz",IDC_EXIT,315,252,50,14 +END + +IDD_DIALOG1 DIALOG 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Prenos" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Prenošenje...",IDC_STATIC,5,19,176,8, SS_CENTER +END + +IDD_CONNECTING DIALOG 0, 0, 280, 116 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER +CAPTION "Povezivanje sa kamerom" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 + LTEXT "Povezivanje sa kamerom...",IDC_STATIC,128,58,116,8 +END

1 0

Paul Vriens : wininet: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: ddda9e939acd883eb141edf0d2434658428aaa13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddda9e939acd883eb141edf0d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Oct 31 18:47:54 2010 +0100 wininet: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/wininet/Makefile.in | 1 + dlls/wininet/wininet_Sr.rc | 116 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index 6b17184..9ddca9e 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -41,6 +41,7 @@ RC_SRCS = \ wininet_Ro.rc \ wininet_Ru.rc \ wininet_Si.rc \ + wininet_Sr.rc \ wininet_Sv.rc \ wininet_Tr.rc \ wininet_Uk.rc \ diff --git a/dlls/wininet/wininet_Sr.rc b/dlls/wininet/wininet_Sr.rc new file mode 100644 index 0000000..343b671 --- /dev/null +++ b/dlls/wininet/wininet_Sr.rc @@ -0,0 +1,116 @@ +/* + * Copyright 2003 Mike McCormack for CodeWeavers + * Copyright 2010 Đorđe Vasiljević + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +IDD_PROXYDLG DIALOG 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_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 "У реду", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Откажи", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +IDD_AUTHDLG DIALOG 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 "У реду", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Откажи", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE +{ + IDS_LANCONNECTION "LAN веза" +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +IDD_PROXYDLG DIALOG 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Unos mrežne lozinke" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Unesite svoje korisničko ime i lozinku:", -1, 40, 6, 150, 15 + LTEXT "Posrednik", -1, 40, 26, 50, 10 + LTEXT "Domen", -1, 40, 46, 50, 10 + LTEXT "Korisničko ime", -1, 40, 66, 50, 10 + LTEXT "Lozinka", -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 "&Sačuvaj ovu lozinku (nebezbedno)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "U redu", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Otkaži", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +IDD_AUTHDLG DIALOG 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Potvrda identiteta" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Unesite svoje korisničko ime i lozinku:", -1, 40, 6, 150, 15 + LTEXT "Server", -1, 40, 26, 50, 10 + LTEXT "Domen", -1, 40, 46, 50, 10 + LTEXT "Korisničko ime", -1, 40, 66, 50, 10 + LTEXT "Lozinka", -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 "&Sačuvaj ovu lozinku (nebezbedno)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "U redu", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Otkaži", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE +{ + IDS_LANCONNECTION "LAN veza" +}

1 0

Paul Vriens : shdoclc: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: e8cebe8c7885ab2446384fe41ee322771009a2a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8cebe8c7885ab2446384fe41… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Oct 31 17:17:59 2010 +0100 shdoclc: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/shdoclc/Makefile.in | 1 + dlls/shdoclc/Sr.rc | 480 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 481 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8cebe8c7885ab2446384…

1 0

Paul Vriens : devenum: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 9b82b5a853f3e7e3abb8448e9492c2dc0d694146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b82b5a853f3e7e3abb8448e9… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Oct 31 13:33:14 2010 +0100 devenum: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/devenum/Makefile.in | 1 + dlls/devenum/Sr.rc | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in index 76a70b6..8c24da0 100644 --- a/dlls/devenum/Makefile.in +++ b/dlls/devenum/Makefile.in @@ -28,6 +28,7 @@ RC_SRCS = \ Ro.rc \ Ru.rc \ Si.rc \ + Sr.rc \ Sv.rc \ Uk.rc \ devenum.rc diff --git a/dlls/devenum/Sr.rc b/dlls/devenum/Sr.rc new file mode 100644 index 0000000..faf123a --- /dev/null +++ b/dlls/devenum/Sr.rc @@ -0,0 +1,44 @@ +/* + * Serbian resources for Device Enumerator + * + * Copyright 2002 Robert Shearman + * Copyright 2010 Đorđe Vasiljević + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "devenum_private.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + IDS_DEVENUM_DSDEFAULT "Подразумевани DirectSound" + IDS_DEVENUM_DS "DirectSound: %s" + IDS_DEVENUM_WODEFAULT "Подразумевани WaveOut уређај" + IDS_DEVENUM_MIDEFAULT "Подразумевани MidiOut уређај" +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + IDS_DEVENUM_DSDEFAULT "Podrazumevani DirectSound" + IDS_DEVENUM_DS "DirectSound: %s" + IDS_DEVENUM_WODEFAULT "Podrazumevani WaveOut uređaj" + IDS_DEVENUM_MIDEFAULT "Podrazumevani MidiOut uređaj" +}

1 0

Vincent Povirk : gdiplus: Add tests for GdipGetLineTransform.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: f49d56fef3b0d497c635106d2205839a412e607a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f49d56fef3b0d497c635106d2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Oct 30 15:19:00 2010 -0500 gdiplus: Add tests for GdipGetLineTransform. --- dlls/gdiplus/tests/brush.c | 91 ++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 2 files changed, 92 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 648a1d3..655d80c 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -286,10 +286,15 @@ static void test_texturewrap(void) static void test_gradientgetrect(void) { GpLineGradient *brush; + GpMatrix *transform; + REAL elements[6]; GpRectF rectf; GpStatus status; GpPointF pt1, pt2; + status = GdipCreateMatrix(&transform); + expect(Ok, status); + pt1.X = pt1.Y = 1.0; pt2.X = pt2.Y = 100.0; status = GdipCreateLineBrush(&pt1, &pt2, 0, 0, WrapModeTile, &brush); @@ -301,6 +306,18 @@ static void test_gradientgetrect(void) expectf(1.0, rectf.Y); expectf(99.0, rectf.Width); expectf(99.0, rectf.Height); + status = GdipGetLineTransform(brush, transform); + todo_wine expect(Ok, status); + if (status == Ok) + { + status = GdipGetMatrixElements(transform, elements); + expectf(1.0, elements[0]); + expectf(1.0, elements[1]); + expectf(-1.0, elements[2]); + expectf(1.0, elements[3]); + expectf(50.50, elements[4]); + expectf(-50.50, elements[5]); + } status = GdipDeleteBrush((GpBrush*)brush); /* vertical gradient */ pt1.X = pt1.Y = pt2.X = 0.0; @@ -314,6 +331,18 @@ static void test_gradientgetrect(void) expectf(0.0, rectf.Y); expectf(10.0, rectf.Width); expectf(10.0, rectf.Height); + status = GdipGetLineTransform(brush, transform); + todo_wine expect(Ok, status); + if (status == Ok) + { + status = GdipGetMatrixElements(transform, elements); + expectf(0.0, elements[0]); + expectf(1.0, elements[1]); + expectf(-1.0, elements[2]); + expectf(0.0, elements[3]); + expectf(5.0, elements[4]); + expectf(5.0, elements[5]); + } status = GdipDeleteBrush((GpBrush*)brush); /* horizontal gradient */ pt1.X = pt1.Y = pt2.Y = 0.0; @@ -327,6 +356,18 @@ static void test_gradientgetrect(void) expectf(-5.0, rectf.Y); expectf(10.0, rectf.Width); expectf(10.0, rectf.Height); + status = GdipGetLineTransform(brush, transform); + todo_wine expect(Ok, status); + if (status == Ok) + { + status = GdipGetMatrixElements(transform, elements); + expectf(1.0, elements[0]); + expectf(0.0, elements[1]); + expectf(0.0, elements[2]); + expectf(1.0, elements[3]); + expectf(0.0, elements[4]); + expectf(0.0, elements[5]); + } status = GdipDeleteBrush((GpBrush*)brush); /* slope = -1 */ pt1.X = pt1.Y = 0.0; @@ -341,6 +382,18 @@ static void test_gradientgetrect(void) expectf(-20.0, rectf.Y); expectf(20.0, rectf.Width); expectf(20.0, rectf.Height); + status = GdipGetLineTransform(brush, transform); + todo_wine expect(Ok, status); + if (status == Ok) + { + status = GdipGetMatrixElements(transform, elements); + expectf(1.0, elements[0]); + expectf(-1.0, elements[1]); + expectf(1.0, elements[2]); + expectf(1.0, elements[3]); + expectf(10.0, elements[4]); + expectf(10.0, elements[5]); + } status = GdipDeleteBrush((GpBrush*)brush); /* slope = 1/100 */ pt1.X = pt1.Y = 0.0; @@ -355,6 +408,18 @@ static void test_gradientgetrect(void) expectf(0.0, rectf.Y); expectf(100.0, rectf.Width); expectf(1.0, rectf.Height); + status = GdipGetLineTransform(brush, transform); + todo_wine expect(Ok, status); + if (status == Ok) + { + status = GdipGetMatrixElements(transform, elements); + expectf(1.0, elements[0]); + expectf(0.01, elements[1]); + expectf(-0.02, elements[2]); + /* expectf(2.0, elements[3]); */ + expectf(0.01, elements[4]); + /* expectf(-1.0, elements[5]); */ + } status = GdipDeleteBrush((GpBrush*)brush); /* zero height rect */ rectf.X = rectf.Y = 10.0; @@ -383,6 +448,18 @@ static void test_gradientgetrect(void) expectf(10.0, rectf.Y); expectf(100.0, rectf.Width); expectf(100.0, rectf.Height); + status = GdipGetLineTransform(brush, transform); + todo_wine expect(Ok, status); + if (status == Ok) + { + status = GdipGetMatrixElements(transform, elements); + expectf(1.0, elements[0]); + expectf(0.0, elements[1]); + expectf(0.0, elements[2]); + expectf(1.0, elements[3]); + expectf(0.0, elements[4]); + expectf(0.0, elements[5]); + } status = GdipDeleteBrush((GpBrush*)brush); /* passing negative Width/Height to LinearGradientModeHorizontal */ rectf.X = rectf.Y = 10.0; @@ -397,7 +474,21 @@ static void test_gradientgetrect(void) expectf(10.0, rectf.Y); expectf(-100.0, rectf.Width); expectf(-100.0, rectf.Height); + status = GdipGetLineTransform(brush, transform); + todo_wine expect(Ok, status); + if (status == Ok) + { + status = GdipGetMatrixElements(transform, elements); + expectf(1.0, elements[0]); + expectf(0.0, elements[1]); + expectf(0.0, elements[2]); + expectf(1.0, elements[3]); + expectf(0.0, elements[4]); + expectf(0.0, elements[5]); + } status = GdipDeleteBrush((GpBrush*)brush); + + GdipDeleteMatrix(transform); } static void test_lineblend(void) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 1a443f9..b12909c 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -474,6 +474,7 @@ GpStatus WINGDIPAPI GdipSetLinePresetBlend(GpLineGradient*,GDIPCONST ARGB*, GDIPCONST REAL*,INT); GpStatus WINGDIPAPI GdipGetLinePresetBlend(GpLineGradient*,ARGB*,REAL*,INT); GpStatus WINGDIPAPI GdipGetLinePresetBlendCount(GpLineGradient*,INT*); +GpStatus WINGDIPAPI GdipGetLineTransform(GpLineGradient*,GpMatrix*); GpStatus WINGDIPAPI GdipResetLineTransform(GpLineGradient*); GpStatus WINGDIPAPI GdipRotateLineTransform(GpLineGradient*,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipScaleLineTransform(GpLineGradient*,REAL,REAL,

1 0