wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Anders Jonsson : taskkill: Update Swedish translation.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 87a138f331a0baa19ba2f4f74b847d4f70497e5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=87a138f331a0baa19ba2f4f74… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Wed Oct 13 21:02:19 2010 +0200 taskkill: Update Swedish translation. --- programs/taskkill/Sv.rc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/taskkill/Sv.rc b/programs/taskkill/Sv.rc index 209abdc..8246e56 100644 --- a/programs/taskkill/Sv.rc +++ b/programs/taskkill/Sv.rc @@ -39,5 +39,6 @@ STRINGTABLE STRING_TERM_PROC_SEARCH, "Tvingade fram nedstängning av processen \"%s\" med PID %u.\n" STRING_SEARCH_FAILED, "Fel: Kunde inte hitta processen \"%s\".\n" STRING_ENUM_FAILED, "Fel: Kunde inte räkna upp processlistan.\n" - STRING_TERMINATE_FAILED, "Fel: Kunde inte avbryta processen \"%s\".\n" + STRING_TERMINATE_FAILED, "Fel: Kunde inte avsluta processen \"%s\".\n" + STRING_SELF_TERMINATION, "Fel: Processen får inte avsluta sig själv.\n" }

1 0

Anders Jonsson : inetcpl.cpl: Update Swedish translation.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 6667a6bc8a9ee629a6f9c815c0691c4d9855d81e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6667a6bc8a9ee629a6f9c815c… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Wed Oct 13 21:17:34 2010 +0200 inetcpl.cpl: Update Swedish translation. --- dlls/inetcpl.cpl/cpl_Sv.rc | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Sv.rc b/dlls/inetcpl.cpl/cpl_Sv.rc index 102f934..c152db3 100644 --- a/dlls/inetcpl.cpl/cpl_Sv.rc +++ b/dlls/inetcpl.cpl/cpl_Sv.rc @@ -31,11 +31,28 @@ BEGIN IDS_CPL_INFO "Konfigurera Wines webbläsare och tillhörande inställningar" END +/* "General" propsheet */ +IDD_GENERAL DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Allmänt" +BEGIN + + GROUPBOX " Startsida ", IDC_STATIC, 4, 4, 312, 52 + LTEXT "Du kan välja vilken adress som ska användas som startsida.", + IDC_STATIC, 58, 10, 252, 10 + EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL + PUSHBUTTON "&Aktuell sida", IDC_HOME_CURRENT, 58, 36, 80, 14 + PUSHBUTTON "&Förvald sida", IDC_HOME_DEFAULT, 144, 36, 80, 14 + PUSHBUTTON "&Blank sida", IDC_HOME_BLANK, 230, 36, 80, 14 + +END + /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" -CAPTION "Content" +CAPTION "Innehåll" BEGIN GROUPBOX " Certifikat ", IDC_STATIC, 4, 4, 312, 50

1 0

Anders Jonsson : cryptdlg: Add Swedish translation.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 89845fc9e80d2d06693b781bb975bc992c14e66b URL: http://source.winehq.org/git/wine.git/?a=commit;h=89845fc9e80d2d06693b781bb… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Wed Oct 13 21:04:23 2010 +0200 cryptdlg: Add Swedish translation. --- dlls/cryptdlg/Makefile.in | 1 + dlls/cryptdlg/cryptdlg_Sv.rc | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/cryptdlg/Makefile.in b/dlls/cryptdlg/Makefile.in index 079cf7a..2122165 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_Sv.rc \ cryptdlg_Uk.rc @MAKE_DLL_RULES@ diff --git a/dlls/cryptdlg/cryptdlg_Sv.rc b/dlls/cryptdlg/cryptdlg_Sv.rc new file mode 100644 index 0000000..b09f82d --- /dev/null +++ b/dlls/cryptdlg/cryptdlg_Sv.rc @@ -0,0 +1,40 @@ +/* + * cryptdlg dll resources + * + * Copyright 2010 Anders Jonsson + * + * 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_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_CERT_POLICY "Certifikatspolicy" + IDS_POLICY_ID "Policy-identifierare: " + IDS_POLICY_QUALIFIER_INFO "Policy Qualifier Info" + IDS_POLICY_QUALIFIER_ID "Policy Qualifier Id=" + IDS_CPS "CPS" /* Certification Practice Statement */ + IDS_USER_NOTICE "Användarmeddelande" + IDS_QUALIFIER "Qualifier" + IDS_NOTICE_REF "Meddelandereferens" + IDS_ORGANIZATION "Organisation=" + IDS_NOTICE_NUM "Meddelandenummer=" + IDS_NOTICE_TEXT "Meddelandetext=" +}

1 0

Paul Vriens : taskmgr: Remove a useless commented line.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 0d4c5c87761975cdb6b310f07179429625167947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d4c5c87761975cdb6b310f07… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 13 21:06:22 2010 +0200 taskmgr: Remove a useless commented line. --- programs/taskmgr/Da.rc | 1 - programs/taskmgr/De.rc | 1 - programs/taskmgr/En.rc | 1 - programs/taskmgr/Fr.rc | 1 - programs/taskmgr/He.rc | 1 - programs/taskmgr/It.rc | 1 - programs/taskmgr/Ja.rc | 1 - programs/taskmgr/Ko.rc | 1 - programs/taskmgr/Lt.rc | 1 - programs/taskmgr/Nl.rc | 1 - programs/taskmgr/No.rc | 1 - programs/taskmgr/Pt.rc | 2 -- programs/taskmgr/Ro.rc | 1 - programs/taskmgr/Ru.rc | 1 - programs/taskmgr/Si.rc | 1 - programs/taskmgr/Sv.rc | 1 - programs/taskmgr/Tr.rc | 1 - programs/taskmgr/Uk.rc | 1 - programs/taskmgr/Zh.rc | 2 -- 19 files changed, 0 insertions(+), 21 deletions(-) diff --git a/programs/taskmgr/Da.rc b/programs/taskmgr/Da.rc index 8554bc5..92bf45d 100644 --- a/programs/taskmgr/Da.rc +++ b/programs/taskmgr/Da.rc @@ -210,7 +210,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/De.rc b/programs/taskmgr/De.rc index c31e3b2..569fce6 100644 --- a/programs/taskmgr/De.rc +++ b/programs/taskmgr/De.rc @@ -205,7 +205,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,121,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/En.rc b/programs/taskmgr/En.rc index 0074e7b..eddc1ee 100644 --- a/programs/taskmgr/En.rc +++ b/programs/taskmgr/En.rc @@ -207,7 +207,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Fr.rc b/programs/taskmgr/Fr.rc index f084f39..a3121d7 100644 --- a/programs/taskmgr/Fr.rc +++ b/programs/taskmgr/Fr.rc @@ -212,7 +212,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,161,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/He.rc b/programs/taskmgr/He.rc index d5ce06b..02b5834 100644 --- a/programs/taskmgr/He.rc +++ b/programs/taskmgr/He.rc @@ -213,7 +213,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN EXSTYLE WS_EX_LAYOUTRTL diff --git a/programs/taskmgr/It.rc b/programs/taskmgr/It.rc index f7517c2..7e15983 100644 --- a/programs/taskmgr/It.rc +++ b/programs/taskmgr/It.rc @@ -211,7 +211,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Ja.rc b/programs/taskmgr/Ja.rc index 495996d..171aedf 100644 --- a/programs/taskmgr/Ja.rc +++ b/programs/taskmgr/Ja.rc @@ -211,7 +211,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS Shell Dlg" diff --git a/programs/taskmgr/Ko.rc b/programs/taskmgr/Ko.rc index efe94ae..645d4fd 100644 --- a/programs/taskmgr/Ko.rc +++ b/programs/taskmgr/Ko.rc @@ -207,7 +207,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS Shell Dlg" diff --git a/programs/taskmgr/Lt.rc b/programs/taskmgr/Lt.rc index 75847d6..062d931 100644 --- a/programs/taskmgr/Lt.rc +++ b/programs/taskmgr/Lt.rc @@ -210,7 +210,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,120,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Nl.rc b/programs/taskmgr/Nl.rc index 53e081b..e91fd63 100644 --- a/programs/taskmgr/Nl.rc +++ b/programs/taskmgr/Nl.rc @@ -202,7 +202,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,125,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/No.rc b/programs/taskmgr/No.rc index 2e9c239..d03fb86 100644 --- a/programs/taskmgr/No.rc +++ b/programs/taskmgr/No.rc @@ -209,7 +209,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Pt.rc b/programs/taskmgr/Pt.rc index f169516..3ce7fe9 100644 --- a/programs/taskmgr/Pt.rc +++ b/programs/taskmgr/Pt.rc @@ -344,7 +344,6 @@ END LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -405,7 +404,6 @@ END LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Ro.rc b/programs/taskmgr/Ro.rc index fbc6e62..0a0a650 100644 --- a/programs/taskmgr/Ro.rc +++ b/programs/taskmgr/Ro.rc @@ -205,7 +205,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,135,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Ru.rc b/programs/taskmgr/Ru.rc index c0d87f3..81c2492 100644 --- a/programs/taskmgr/Ru.rc +++ b/programs/taskmgr/Ru.rc @@ -210,7 +210,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,160,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Si.rc b/programs/taskmgr/Si.rc index 20e5a1c..3ec4e21 100644 --- a/programs/taskmgr/Si.rc +++ b/programs/taskmgr/Si.rc @@ -209,7 +209,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,120,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Sv.rc b/programs/taskmgr/Sv.rc index 1a244a5..9fba1f8 100644 --- a/programs/taskmgr/Sv.rc +++ b/programs/taskmgr/Sv.rc @@ -207,7 +207,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,130,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Tr.rc b/programs/taskmgr/Tr.rc index 9573cde..77ca968 100644 --- a/programs/taskmgr/Tr.rc +++ b/programs/taskmgr/Tr.rc @@ -207,7 +207,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Uk.rc b/programs/taskmgr/Uk.rc index 81568c7..e2093ab 100644 --- a/programs/taskmgr/Uk.rc +++ b/programs/taskmgr/Uk.rc @@ -211,7 +211,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,147,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Zh.rc b/programs/taskmgr/Zh.rc index 6ae6ace..33d27fd 100644 --- a/programs/taskmgr/Zh.rc +++ b/programs/taskmgr/Zh.rc @@ -211,7 +211,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS Shell Dlg" @@ -667,7 +666,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS Shell Dlg"

1 0

André Hentschel : msvcr90: Added __timezone implementation.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 0399f721cadda39b4e2b8a6cdfa79dca6087ab9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0399f721cadda39b4e2b8a6cd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 13 20:19:52 2010 +0200 msvcr90: Added __timezone implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 7437db4..3468cbb 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -473,7 +473,7 @@ @ cdecl __sys_nerr() msvcr90.__sys_nerr @ cdecl __threadhandle() msvcrt.__threadhandle @ cdecl __threadid() msvcrt.__threadid -@ stub __timezone +@ cdecl __timezone() msvcrt.__p__timezone @ cdecl __toascii(long) msvcrt.__toascii @ cdecl __tzname() msvcrt.__p__tzname @ cdecl __unDName(ptr str long ptr ptr long) msvcrt.__unDName diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1921c51..8f70693 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -297,7 +297,7 @@ @ cdecl __sys_nerr() msvcr90.__sys_nerr @ cdecl __threadhandle() msvcrt.__threadhandle @ cdecl __threadid() msvcrt.__threadid -@ stub __timezone +@ cdecl __timezone() msvcrt.__p__timezone @ cdecl __toascii(long) msvcrt.__toascii @ cdecl __tzname() msvcrt.__p__tzname @ cdecl __unDName(ptr str long ptr ptr long) msvcrt.__unDName diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 6900317..a9f6b01 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -289,7 +289,7 @@ @ cdecl __sys_nerr() @ cdecl __threadhandle() msvcrt.__threadhandle @ cdecl __threadid() msvcrt.__threadid -@ stub __timezone +@ cdecl __timezone() msvcrt.__p__timezone @ cdecl __toascii(long) msvcrt.__toascii @ cdecl __tzname() msvcrt.__p__tzname @ cdecl __unDName(ptr str long ptr ptr long) msvcrt.__unDName

1 0

Yaron Shahrabani : mapi32: Added Hebrew translation.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 2c4b2b792af625d7f357d09ce4f88c9d6f3f2757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c4b2b792af625d7f357d09ce… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Wed Oct 13 18:05:03 2010 +0200 mapi32: Added Hebrew translation. --- dlls/mapi32/He.rc | 31 +++++++++++++++++++++++++++++++ dlls/mapi32/Makefile.in | 1 + 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/He.rc b/dlls/mapi32/He.rc new file mode 100644 index 0000000..72d84e9 --- /dev/null +++ b/dlls/mapi32/He.rc @@ -0,0 +1,31 @@ +/* +* MAPI32 Hebrew resources +* +* Copyright 2009 Owen Rudge for CodeWeavers +* Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> +* +* 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 "res.h" + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "�� MAPI ��." + IDS_SEND_MAIL, "�� " +} diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index 972db37..4ef119f 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -17,6 +17,7 @@ RC_SRCS = \ Es.rc \ Fr.rc \ Ga.rc \ + He.rc \ Hu.rc \ It.rc \ Ja.rc \

1 0

Yaron Shahrabani : kernel32: heb.nls: Made some corrections.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 73805ced316919a4bf24a611b7a4fdcad8e0eb63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73805ced316919a4bf24a611b… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Wed Oct 13 03:05:09 2010 +0200 kernel32: heb.nls: Made some corrections. --- dlls/kernel32/nls/heb.nls | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/nls/heb.nls b/dlls/kernel32/nls/heb.nls index c204154..b298b56 100644 --- a/dlls/kernel32/nls/heb.nls +++ b/dlls/kernel32/nls/heb.nls @@ -107,7 +107,7 @@ STRINGTABLE LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT LOCALE_SISO639LANGNAME "he" LOCALE_SLANGUAGE "Hebrew" LOCALE_SLIST "," - LOCALE_SLONGDATE "dddd dd MMMM yyyy" + LOCALE_SLONGDATE "dddd ��dd �MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" LOCALE_SMONTHNAME1 "��" @@ -139,21 +139,21 @@ STRINGTABLE LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT LOCALE_STIMEFORMAT "HH:mm:ss" LOCALE_SYEARMONTH "MMMM yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "�� " - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "�� " - LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" - LGRPID_GREEK+LGRPID_RES_BASE "��" - LGRPID_CYRILLIC+LGRPID_RES_BASE "��" - LGRPID_TURKISH+LGRPID_RES_BASE "��" - LGRPID_JAPANESE+LGRPID_RES_BASE "��" - LGRPID_KOREAN+LGRPID_RES_BASE "��" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "�� " - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "�� " - LGRPID_THAI+LGRPID_RES_BASE "��" - LGRPID_HEBREW+LGRPID_RES_BASE "��" - LGRPID_ARABIC+LGRPID_RES_BASE "��" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "��" - LGRPID_INDIC+LGRPID_RES_BASE "Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE "��" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "�� " + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "�� " + LGRPID_BALTIC+LGRPID_RES_BASE "��" + LGRPID_GREEK+LGRPID_RES_BASE "��" + LGRPID_CYRILLIC+LGRPID_RES_BASE "��" + LGRPID_TURKISH+LGRPID_RES_BASE "��" + LGRPID_JAPANESE+LGRPID_RES_BASE "��" + LGRPID_KOREAN+LGRPID_RES_BASE "��" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "�� " + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "�� " + LGRPID_THAI+LGRPID_RES_BASE "��" + LGRPID_HEBREW+LGRPID_RES_BASE "��" + LGRPID_ARABIC+LGRPID_RES_BASE "��" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "��" + LGRPID_INDIC+LGRPID_RES_BASE "��" + LGRPID_GEORGIAN+LGRPID_RES_BASE "��" + LGRPID_ARMENIAN+LGRPID_RES_BASE "��" }

1 0

Yaron Shahrabani : inetcpl: Added Hebrew translation.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: f9545fad82886c16f7fc133bf2e235106b78462a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9545fad82886c16f7fc133bf… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Wed Oct 13 02:25:33 2010 +0200 inetcpl: Added Hebrew translation. --- dlls/inetcpl.cpl/Makefile.in | 1 + dlls/inetcpl.cpl/cpl_He.rc | 67 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index 565e54e..2f5ca46 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -11,6 +11,7 @@ RC_SRCS = \ cpl_De.rc \ cpl_En.rc \ cpl_Fr.rc \ + cpl_He.rc \ cpl_It.rc \ cpl_Ko.rc \ cpl_Lt.rc \ diff --git a/dlls/inetcpl.cpl/cpl_He.rc b/dlls/inetcpl.cpl/cpl_He.rc new file mode 100644 index 0000000..4c761ef --- /dev/null +++ b/dlls/inetcpl.cpl/cpl_He.rc @@ -0,0 +1,67 @@ +/* + * Hebrew resources for the Internet control panel applet + * + * Copyright 2010 Detlef Riekenberg + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * 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 "inetcpl.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPL_NAME "הגדרות אינטרנט" + IDS_CPL_INFO "הגדרת דפדפן האינטרנט של Wine והגדרות שקשורות בו" +END + +/* "General" propsheet */ +IDD_GENERAL DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +EXSTYLE WS_EX_LAYOUTRTL +FONT 8, "MS Shell Dlg" +CAPTION "כללי" +BEGIN + + GROUPBOX " דף הבית ", IDC_STATIC, 4, 4, 312, 52 + LTEXT "באפשרותך לבחור את הכתובת שתשמש כדף הבית שלך.", + IDC_STATIC, 58, 10, 252, 10 + EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL + PUSHBUTTON "העמוד ה&נוכחי", IDC_HOME_CURRENT, 58, 36, 80, 14 + PUSHBUTTON "עמוד &בררת המחדל", IDC_HOME_DEFAULT, 144, 36, 80, 14 + PUSHBUTTON "עמוד &ריק", IDC_HOME_BLANK, 230, 36, 80, 14 + +END + +/* "Content" propsheet */ +IDD_CONTENT DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +EXSTYLE WS_EX_LAYOUTRTL +FONT 8, "MS Shell Dlg" +CAPTION "תוכן" +BEGIN + + GROUPBOX " אישורים ", IDC_STATIC, 4, 4, 312, 50 + LTEXT "אישורים משמשים כדי לזהות אותך וגם כדי לזהות רשויות ומפיצים.", + IDC_STATIC, 58, 14, 252, 18 + PUSHBUTTON "אישורים...", IDC_CERT, 146, 34, 80, 14 + PUSHBUTTON "מפיצים...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + +END

1 0

Austin Lund : riched20/tests: Cleaned up ITextServices:: TxGetNaturalSize test and fixed test failures.
by Alexandre Julliard 13 Oct '10

13 Oct '10

Module: wine Branch: master Commit: b20e75f5e903e5e785f0e4c6d53efe0cf2cfb74a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b20e75f5e903e5e785f0e4c6d… Author: Austin Lund <austin.lund(a)gmail.com> Date: Mon Oct 11 13:46:31 2010 +1000 riched20/tests: Cleaned up ITextServices::TxGetNaturalSize test and fixed test failures. --- dlls/riched20/tests/txtsrv.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 894ff92..72152fc 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -726,15 +726,14 @@ static void test_TxGetNaturalSize(void) { goto cleanup; } + SetLastError(0xdeadbeef); result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, TXTNS_FITTOCONTENT, &psizelExtent, &xdim, &ydim); - todo_wine ok(result == S_OK, "TxGetNaturalSize failed (result = %x)\n", result); - if (result != S_OK) { - skip("TxGetNaturalSize measurements failed\n"); - goto cleanup; - } + todo_wine ok(result == S_OK || broken(result == E_FAIL), /* WINXP Arabic Language */ + "TxGetNaturalSize gave unexpected return value (result = %x)\n", result); + if (result == S_OK) { todo_wine ok(ydim == tmInfo_text.tmHeight, "Height calculated incorrectly (expected %d, got %d)\n", tmInfo_text.tmHeight, ydim); @@ -742,6 +741,9 @@ static void test_TxGetNaturalSize(void) { todo_wine ok(xdim >= charwidth_caps_text[0] && xdim <= charwidth_caps_text[0] + 1, "Width calculated incorrectly (expected %d {+1}, got %d)\n", charwidth_caps_text[0], xdim); + } else + skip("TxGetNaturalSize measurements not performed (xdim = %d, ydim = %d, result = %x, error = %x)\n", + xdim, ydim, result, GetLastError()); cleanup: RestoreDC(hdcDraw,1);

1 0

Rico Schüller : d3dcompiler: Implement D3DStripShader( ).
by Alexandre Julliard 13 Oct '10

13 Oct '10

Module: wine Branch: master Commit: 2c9b24b05415da6f7d5ba07bc5067628f8d23604 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c9b24b05415da6f7d5ba07bc… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Oct 12 19:25:26 2010 +0200 d3dcompiler: Implement D3DStripShader(). --- dlls/d3dcompiler_43/blob.c | 89 +++++++++++++++++++++++++++++ dlls/d3dcompiler_43/d3dcompiler_43.spec | 2 +- dlls/d3dcompiler_43/d3dcompiler_43_main.c | 7 ++ dlls/d3dcompiler_43/d3dcompiler_private.h | 3 + include/d3dcompiler.h | 10 +++ 5 files changed, 110 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index dc0a65f..cd47024 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -285,3 +285,92 @@ HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D_BLOB_P return hr; } + +static BOOL check_blob_strip(DWORD tag, UINT flags) +{ + BOOL add = TRUE; + + if (flags & D3DCOMPILER_STRIP_TEST_BLOBS) FIXME("Unhandled flag D3DCOMPILER_STRIP_TEST_BLOBS.\n"); + + switch(tag) + { + case TAG_RDEF: + case TAG_STAT: + if (flags & D3DCOMPILER_STRIP_REFLECTION_DATA) add = FALSE; + break; + + case TAG_SDBG: + if (flags & D3DCOMPILER_STRIP_DEBUG_INFO) add = FALSE; + break; + + default: + break; + } + + TRACE("%s tag %s\n", add ? "Add" : "Skip", debugstr_an((const char *)&tag, 4)); + + return add; +} + +HRESULT d3dcompiler_strip_shader(const void *data, SIZE_T data_size, UINT flags, ID3DBlob **blob) +{ + struct dxbc src_dxbc, dst_dxbc; + HRESULT hr; + unsigned int i; + + if (!blob) + { + WARN("NULL for blob specified\n"); + return E_FAIL; + } + + if (!data || !data_size) + { + WARN("Invalid arguments: data %p, data_size %lu\n", data, data_size); + return D3DERR_INVALIDCALL; + } + + hr = dxbc_parse(data, data_size, &src_dxbc); + if (FAILED(hr)) + { + WARN("Failed to parse blob part\n"); + return hr; + } + + /* src_dxbc.count >= dst_dxbc.count */ + hr = dxbc_init(&dst_dxbc, src_dxbc.count); + if (FAILED(hr)) + { + dxbc_destroy(&src_dxbc); + WARN("Failed to init dxbc\n"); + return hr; + } + + for (i = 0; i < src_dxbc.count; ++i) + { + struct dxbc_section *section = &src_dxbc.sections[i]; + + if (check_blob_strip(section->tag, flags)) + { + hr = dxbc_add_section(&dst_dxbc, section->tag, section->data, section->data_size); + if (FAILED(hr)) + { + dxbc_destroy(&src_dxbc); + dxbc_destroy(&dst_dxbc); + WARN("Failed to add section to dxbc\n"); + return hr; + } + } + } + + hr = dxbc_write_blob(&dst_dxbc, blob); + if (FAILED(hr)) + { + WARN("Failed to write blob part\n"); + } + + dxbc_destroy(&src_dxbc); + dxbc_destroy(&dst_dxbc); + + return hr; +} diff --git a/dlls/d3dcompiler_43/d3dcompiler_43.spec b/dlls/d3dcompiler_43/d3dcompiler_43.spec index 8077be7..bb9a13d 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43.spec +++ b/dlls/d3dcompiler_43/d3dcompiler_43.spec @@ -14,4 +14,4 @@ @ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) @ stub D3DReflect @ stub D3DReturnFailure1 -@ stub D3DStripShader +@ stdcall D3DStripShader(ptr long long ptr) diff --git a/dlls/d3dcompiler_43/d3dcompiler_43_main.c b/dlls/d3dcompiler_43/d3dcompiler_43_main.c index a7fabef..37937a6 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43_main.c +++ b/dlls/d3dcompiler_43/d3dcompiler_43_main.c @@ -116,3 +116,10 @@ HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **bl return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_DEBUG_INFO, 0, blob); } + +HRESULT WINAPI D3DStripShader(const void *data, SIZE_T data_size, UINT flags, ID3D10Blob **blob) +{ + TRACE("data %p, data_size %lu, flags %#x, blob %p\n", data, data_size, flags, blob); + + return d3dcompiler_strip_shader(data, data_size, flags, blob); +} diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 96dd166..a5121fb 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -55,6 +55,7 @@ HRESULT d3dcompiler_blob_init(struct d3dcompiler_blob *blob, SIZE_T data_size) D /* blob handling */ HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob) DECLSPEC_HIDDEN; +HRESULT d3dcompiler_strip_shader(const void *data, SIZE_T data_size, UINT flags, ID3DBlob **blob) DECLSPEC_HIDDEN; /* Shader assembler definitions */ typedef enum _shader_type { @@ -585,7 +586,9 @@ void SlDeleteShader(struct bwriter_shader *shader); #define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') #define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') #define TAG_PCSG MAKE_TAG('P', 'C', 'S', 'G') +#define TAG_RDEF MAKE_TAG('R', 'D', 'E', 'F') #define TAG_SDBG MAKE_TAG('S', 'D', 'B', 'G') +#define TAG_STAT MAKE_TAG('S', 'T', 'A', 'T') #define TAG_XNAP MAKE_TAG('X', 'N', 'A', 'P') #define TAG_XNAS MAKE_TAG('X', 'N', 'A', 'S') diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 11ccf56..c3bdb53 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -45,6 +45,16 @@ HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filena const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages); +typedef enum D3DCOMPILER_STRIP_FLAGS +{ + D3DCOMPILER_STRIP_REFLECTION_DATA = 1, + D3DCOMPILER_STRIP_DEBUG_INFO = 2, + D3DCOMPILER_STRIP_TEST_BLOBS = 4, + D3DCOMPILER_STRIP_FORCE_DWORD = 0x7fffffff +} D3DCOMPILER_STRIP_FLAGS; + +HRESULT WINAPI D3DStripShader(const void *data, SIZE_T data_size, UINT flags, ID3DBlob **blob); + typedef enum D3D_BLOB_PART { D3D_BLOB_INPUT_SIGNATURE_BLOB,

1 0

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 October 2010