July 2009 - Wine-Commits - list.winehq.org

Frédéric Delanoy : oledlg: Fix French translation & UI display.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 569aa66f5e971cfc303edf1ad22b97df46fde231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=569aa66f5e971cfc303edf1ad… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 7 18:48:33 2009 +0200 oledlg: Fix French translation & UI display. --- dlls/oledlg/oledlg_Fr.rc | 90 ++++++++++++++++++++++++---------------------- 1 files changed, 47 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=569aa66f5e971cfc303ed…

1 0

Ricardo Filipe : winefile: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 9046d2816644c89e5cd82f32fed0c7b90feb347b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9046d2816644c89e5cd82f32f… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Tue Jul 7 10:14:59 2009 -0700 winefile: Update Portuguese translation and convert to UTF8. --- programs/winefile/Pt.rc | 145 +++++++++++++++++++++++++++++++---------------- 1 files changed, 96 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9046d2816644c89e5cd82…

1 0

Frédéric Delanoy : setupapi: Fix French translation & UI display.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: c71454db688f87d61e268557412a68b81e61b325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c71454db688f87d61e2685574… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 7 19:15:51 2009 +0200 setupapi: Fix French translation & UI display. --- dlls/setupapi/Fr.rc | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/setupapi/Fr.rc b/dlls/setupapi/Fr.rc index e18fa85..24095e5 100644 --- a/dlls/setupapi/Fr.rc +++ b/dlls/setupapi/Fr.rc @@ -2,7 +2,7 @@ * French resources for SETUPAPI * * Copyright 2001 Andreas Mohr - * Copyright 2003 Vincent B�ron + * Copyright 2003 Vincent Béron * Copyright 2009 Jonathan Ernst * * This library is free software; you can redistribute it and/or @@ -22,13 +22,16 @@ #include "setupapi_private.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - IDS_PROMPTDISK "Le fichier ��%s�� sur %s est requis" + IDS_PROMPTDISK "Le fichier « %s » sur %s est requis" IDS_UNKNOWN "Inconnu" - IDS_COPYFROM "Copier les fichiers depuis�:" + IDS_COPYFROM "Copier les fichiers depuis :" IDS_INFO "Saisissez le chemin du fichier, puis cliquez sur OK." } @@ -38,9 +41,9 @@ CAPTION "Copie de fichiers..." FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "Annuler", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Source�:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Source :", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Destination�:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Destination :", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -50,9 +53,9 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Fichiers requis" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Veuillez ins�rer le disque d'installation du fabriquant et\nassurez vous que le lecteur correct est s�lectionn� ci-dessous", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Veuillez insérer le disque d'installation du fabricant et\nassurez vous que le lecteur correct est sélectionné ci-dessous", IDC_FILENEEDED, 10, 10, 175, 25, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Copier les fichiers du fabriquan depuis�:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copier les fichiers du fabricant depuis :", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 PUSHBUTTON "OK", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Annuler", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP

1 0

Frédéric Delanoy : serialui: Fix French translation & UI display.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 8907860f3e894224af2fa7f543af02b801c205e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8907860f3e894224af2fa7f54… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 7 17:32:28 2009 +0200 serialui: Fix French translation & UI display. --- dlls/serialui/Fr.rc | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/serialui/Fr.rc b/dlls/serialui/Fr.rc index 53c1fe3..8dc8fbb 100644 --- a/dlls/serialui/Fr.rc +++ b/dlls/serialui/Fr.rc @@ -3,7 +3,8 @@ * French language support * * Copyright 2000 Mike McCormack - * Copyright 2003 Vincent B�ron + * Copyright 2003 Vincent Béron + * Copyright 2009 Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,25 +23,28 @@ #include "serialui.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159 +IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 180, 150 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propri�t�s pour " +CAPTION "Propriétés pour " FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Vitesse de connexion", -1,5,20,55,10 - COMBOBOX IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Parit�", -1,5,40,55,10 - COMBOBOX IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Contr�le de flux", -1,5,60,55,10 - COMBOBOX IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Bits de donn�es", -1,5,80,55,10 - COMBOBOX IDC_DATA, 60, 80, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Bits de stop", -1,5,100,55,10 - COMBOBOX IDC_STOP, 60, 100, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK,30,138,50,14 - PUSHBUTTON "Annuler", IDCANCEL,85,138,50,14 + LTEXT "Vitesse de transmission (bauds)", -1,5,19,70,18 + COMBOBOX IDC_BAUD, 80, 20, 90, 15, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Parité", -1,5,42,55,10 + COMBOBOX IDC_PARITY, 80, 40, 90, 15, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Contrôle de flux", -1,5,62,55,10 + COMBOBOX IDC_FLOW, 80, 60, 90, 15, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Bits de données", -1,5,82,55,10 + COMBOBOX IDC_DATA, 80, 80, 90, 15, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Bits d'arrêt", -1,5,102,55,10 + COMBOBOX IDC_STOP, 80, 100, 90, 15, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK,30,125,50,14 + PUSHBUTTON "Annuler", IDCANCEL,93,125,50,14 /* these two buttons are for testing Get/SetDefaultCommConfig */ /* PUSHBUTTON "GetDefault", ID_GETDEFAULT,30,115,50,14 */ /* PUSHBUTTON "SetDefault", ID_SETDEFAULT,85,115,50,14 */

1 0

Ricardo Filipe : progman: Update Portuguese translation and convert to UTF8 .
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 9ed4f647ee831c09fd4408b1212633da860ee663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ed4f647ee831c09fd4408b12… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Tue Jul 7 07:36:54 2009 -0700 progman: Update Portuguese translation and convert to UTF8. --- programs/progman/Pt.rc | 106 ++++++++++++++++++++++++++++++------------------ 1 files changed, 66 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ed4f647ee831c09fd440…

1 0

Ricardo Filipe : oledlg: Fix Portuguese translation.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 04de5762665147b0a66c114f66f7e38aca0e55e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04de5762665147b0a66c114f6… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Tue Jul 7 07:28:05 2009 -0700 oledlg: Fix Portuguese translation. --- dlls/oledlg/oledlg_Pt.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oledlg/oledlg_Pt.rc b/dlls/oledlg/oledlg_Pt.rc index 078d2c1..9ef209e 100644 --- a/dlls/oledlg/oledlg_Pt.rc +++ b/dlls/oledlg/oledlg_Pt.rc @@ -126,7 +126,7 @@ BEGIN CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 CONTROL "<< texto resultante fica aqui >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 CONTROL "Resultado", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 - CONTROL "", IDC_PS_SOURCETEXT, "Editar", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 + CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 END STRINGTABLE DISCARDABLE

1 0

Ricardo Filipe : regedit: Update Portuguese translation and convert to UTF8 .
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 3591c44e5504220cc8c457e4737931e9c6b74f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3591c44e5504220cc8c457e47… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Tue Jul 7 09:02:11 2009 -0700 regedit: Update Portuguese translation and convert to UTF8. --- programs/regedit/Pt.rc | 196 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 142 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3591c44e5504220cc8c45…

1 0

Frédéric Delanoy : crypt32: Update French translation.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: db4e9128782b033e18128fbc2ce639ae2caf25e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db4e9128782b033e18128fbc2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 7 15:54:30 2009 +0200 crypt32: Update French translation. --- dlls/crypt32/crypt32_Fr.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_Fr.rc b/dlls/crypt32/crypt32_Fr.rc index 030a3a9..b98636d 100644 --- a/dlls/crypt32/crypt32_Fr.rc +++ b/dlls/crypt32/crypt32_Fr.rc @@ -177,6 +177,7 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_CA "Autorités intermédiaires" IDS_LOCALIZEDNAME_ADDRESSBOOK "Autres personnes" IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Éditeurs de confiance" + IDS_LOCALIZEDNAME_DISALLOWED "Certificats non autorisés" } STRINGTABLE DISCARDABLE

1 0

Hib Eris : oleaut32: Prevent overflow in VarDecCmp.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 3e5159e169492bdaf95301794eeebd7af7e865a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e5159e169492bdaf95301794… Author: Hib Eris <hib(a)hiberis.nl> Date: Tue Jul 7 14:01:57 2009 +0200 oleaut32: Prevent overflow in VarDecCmp. --- dlls/oleaut32/tests/vartype.c | 24 ++++++++++++------------ dlls/oleaut32/vartype.c | 10 ++++++++++ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index c3ec180..419e027 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4420,11 +4420,11 @@ static void test_VarDecCmp(void) SETDEC(l,0,0,0,1); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_GT; SETDEC(l,0,0,0,1); SETDEC(out,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_GT; - SETDEC(l,0,0,0,1); SETDEC(out,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + SETDEC(l,0,0,0,1); SETDEC(out,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_GT; SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,0,0,1); MATH1(VarDecCmp); EXPECT_LT; SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,0,0,0); MATH1(VarDecCmp); EXPECT_LT; - SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_LT; SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_EQ; SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_LT; @@ -4450,13 +4450,13 @@ static void test_VarDecCmp(void) SETDEC(l,0,0,-1,-1); SETDEC(out,0,0,0,0); MATH1(VarDecCmp); EXPECT_GT; SETDEC(l,0,0,-1,-1); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_EQ; - SETDEC(l,0,0,-1,-1); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + SETDEC(l,0,0,-1,-1); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_GT; SETDEC(l,0,0,-1,-1); SETDEC(out,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_GT; - SETDEC(l,0,0,-1,-1); SETDEC(out,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + SETDEC(l,0,0,-1,-1); SETDEC(out,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_GT; - SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,0,0,1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,0,0,1); MATH1(VarDecCmp); EXPECT_LT; SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,0,0,0); MATH1(VarDecCmp); EXPECT_LT; - SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_LT; SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_LT; SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_LT; @@ -4469,11 +4469,11 @@ static void test_VarDecCmp(void) SETDEC(out,0,0,0,1); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_LT; SETDEC(out,0,0,0,1); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_LT; - SETDEC(out,0,0,0,1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + SETDEC(out,0,0,0,1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_LT; SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,0,0,1); MATH1(VarDecCmp); EXPECT_GT; SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,0,0,0); MATH1(VarDecCmp); EXPECT_GT; - SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_GT; SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_EQ; SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_GT; @@ -4499,13 +4499,13 @@ static void test_VarDecCmp(void) SETDEC(out,0,0,-1,-1); SETDEC(l,0,0,0,0); MATH1(VarDecCmp); EXPECT_LT; SETDEC(out,0,0,-1,-1); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_EQ; - SETDEC(out,0,0,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + SETDEC(out,0,0,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_LT; SETDEC(out,0,0,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_LT; - SETDEC(out,0,0,-1,-1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + SETDEC(out,0,0,-1,-1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_LT; - SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,0,0,1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,0,0,1); MATH1(VarDecCmp); EXPECT_GT; SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,0,0,0); MATH1(VarDecCmp); EXPECT_GT; - SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_GT; SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_GT; SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_GT; diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 2d5ae7d..7f53259 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -5788,6 +5788,16 @@ HRESULT WINAPI VarDecCmp(const DECIMAL* pDecLeft, const DECIMAL* pDecRight) HRESULT hRet; DECIMAL result; + if (!pDecLeft || !pDecRight) + return VARCMP_NULL; + + if ((!(DEC_SIGN(pDecLeft) & DECIMAL_NEG)) && (DEC_SIGN(pDecRight) & DECIMAL_NEG) && + (DEC_HI32(pDecLeft) | DEC_MID32(pDecLeft) | DEC_LO32(pDecLeft))) + return VARCMP_GT; + else if ((DEC_SIGN(pDecLeft) & DECIMAL_NEG) && (!(DEC_SIGN(pDecRight) & DECIMAL_NEG)) && + (DEC_HI32(pDecLeft) | DEC_MID32(pDecLeft) | DEC_LO32(pDecLeft))) + return VARCMP_LT; + /* Subtract right from left, and compare the result to 0 */ hRet = VarDecSub(pDecLeft, pDecRight, &result);

1 0

Huw Davies : hhctrl.ocx: Add English neutral translations.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 0cb9a6ec01efba753d5b49fa42a105d742313b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb9a6ec01efba753d5b49fa4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 7 12:23:34 2009 +0100 hhctrl.ocx: Add English neutral translations. --- dlls/hhctrl.ocx/En.rc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/En.rc b/dlls/hhctrl.ocx/En.rc index 95ccd51..b69383e 100644 --- a/dlls/hhctrl.ocx/En.rc +++ b/dlls/hhctrl.ocx/En.rc @@ -58,3 +58,13 @@ BEGIN IDTB_TOC_NEXT "IDTB_TOC_NEXT" IDTB_TOC_PREV "IDTB_TOC_PREV" END + +LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_CONTENTS "&Contents" + IDS_INDEX "I&ndex" + IDS_SEARCH "&Search" + IDS_FAVORITES "Favour&ites" +END

1 0