wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Vincent Povirk : gdiplus: Implement horizontal alignment in GdipDrawString.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: aa9602db10f337f39ab93bf17a9da3203d14376e URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa9602db10f337f39ab93bf17… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 29 16:36:11 2009 -0500 gdiplus: Implement horizontal alignment in GdipDrawString. --- dlls/gdiplus/graphics.c | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c052bc3..152d590 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2098,6 +2098,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string INT sum = 0, height = 0, offsety = 0, fit, fitcpy, save_state, i, j, lret, nwidth, nheight; SIZE size; + POINT drawbase; + UINT drawflags; RECT drawcoord; TRACE("(%p, %s, %i, %p, %s, %p, %p)\n", graphics, debugstr_wn(string, length), @@ -2207,17 +2209,35 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string length = j; + if (format->align == StringAlignmentNear) + { + drawbase.x = corners[0].x; + drawbase.y = corners[0].y; + drawflags = DT_NOCLIP | DT_EXPANDTABS; + } + else if (format->align == StringAlignmentCenter) + { + drawbase.x = (corners[0].x + corners[1].x)/2; + drawbase.y = (corners[0].y + corners[1].y)/2; + drawflags = DT_NOCLIP | DT_EXPANDTABS | DT_CENTER; + } + else /* (format->align == StringAlignmentFar) */ + { + drawbase.x = corners[1].x; + drawbase.y = corners[1].y; + drawflags = DT_NOCLIP | DT_EXPANDTABS | DT_RIGHT; + } + while(sum < length){ - drawcoord.left = corners[0].x + roundr(ang_sin * (REAL) height); - drawcoord.top = corners[0].y + roundr(ang_cos * (REAL) height); + drawcoord.left = drawcoord.right = drawbase.x + roundr(ang_sin * (REAL) height); + drawcoord.top = drawcoord.bottom = drawbase.y + roundr(ang_cos * (REAL) height); GetTextExtentExPointW(graphics->hdc, stringdup + sum, length - sum, nwidth, &fit, NULL, &size); fitcpy = fit; if(fit == 0){ - DrawTextW(graphics->hdc, stringdup + sum, 1, &drawcoord, DT_NOCLIP | - DT_EXPANDTABS); + DrawTextW(graphics->hdc, stringdup + sum, 1, &drawcoord, drawflags); break; } @@ -2246,7 +2266,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string } } DrawTextW(graphics->hdc, stringdup + sum, min(length - sum, fit), - &drawcoord, DT_NOCLIP | DT_EXPANDTABS); + &drawcoord, drawflags); sum += fit + (lret < fitcpy ? 1 : 0); height += size.cy;

1 0

Stefan Leichter : oleaut32: Add two tests of function VarDateFromStr for German date format.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 3ca49a10d81f7b680c4a3243f62ba75f499772f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ca49a10d81f7b680c4a3243f… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Jun 29 22:28:33 2009 +0200 oleaut32: Add two tests of function VarDateFromStr for German date format. --- dlls/oleaut32/tests/vartype.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 7600946..3e5730b 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3434,6 +3434,11 @@ static void test_VarDateFromStr(void) DFS("1/2/1970"); EXPECT_DBL(25570.0); DFS("1-2-1970"); EXPECT_DBL(25570.0); /* Native fails "1999 January 3, 9AM". I consider that a bug in native */ + + /* test a none english data string */ + DFS("02.01.1970 00:00:00"); EXPECT_MISMATCH; + lcid = MAKELCID(MAKELANGID(LANG_GERMAN,SUBLANG_GERMAN),SORT_DEFAULT); + DFS("02.01.1970 00:00:00"); todo_wine EXPECT_DBL(25570.0); } static void test_VarDateCopy(void)

1 0

Frédéric Delanoy : winedbg: Add French translation.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: af8348c5b7fdd8de8b1a7f24469656c9ff31b40b URL: http://source.winehq.org/git/wine.git/?a=commit;h=af8348c5b7fdd8de8b1a7f244… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jun 29 23:53:23 2009 +0200 winedbg: Add French translation. --- programs/winedbg/rsrc.rc | 1 + programs/winedbg/rsrc_Fr.rc | 59 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/rsrc.rc b/programs/winedbg/rsrc.rc index 50c5efb..604c54d 100644 --- a/programs/winedbg/rsrc.rc +++ b/programs/winedbg/rsrc.rc @@ -25,6 +25,7 @@ #include "rsrc_De.rc" #include "rsrc_En.rc" +#include "rsrc_Fr.rc" #include "rsrc_Ko.rc" #include "rsrc_Lt.rc" #include "rsrc_Nl.rc" diff --git a/programs/winedbg/rsrc_Fr.rc b/programs/winedbg/rsrc_Fr.rc new file mode 100644 index 0000000..a483c29 --- /dev/null +++ b/programs/winedbg/rsrc_Fr.rc @@ -0,0 +1,59 @@ +/* + * French Language Support + * + * 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 + * 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 + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDM_DEBUG_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Déboguer", ID_DEBUG + END +END + +IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Erreur du programme" +FONT 8, "Tahoma" +BEGIN + LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 + LTEXT "Le programme %s a rencontré un problème sérieux et doit \ + être fermé. Nous somme désolés pour le désagrément subi.", + IDC_STATIC_TXT1,27,10,224,30 + LTEXT "Cela peut être causé par une erreur dans le programme ou un défaut dans Wine. \ + Vous pouvez consulter http://appdb.winehq.org pour obtenir des instructions sur \ + l'exécution de cette application.\n\n\ + Si ce problème ne se produit pas sous Windows et n'a pas déjà été rapporté, \ + vous pouvez le rapporter sur http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 + DEFPUSHBUTTON "Fermer", IDOK, 205, 151, 60, 16, WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_AUTO_CAPTION "Plantage du programme Wine" + IDS_INVALID_PARAMS "Erreurs internes - paramètres invalides reçus" + IDS_UNIDENTIFIED "(non identifié)" +END + +#pragma code_page(default) +

1 0

Frédéric Delanoy : cryptui: Add French translation.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 6628fb474f342ba0bf81c4a821aa09213d85d97a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6628fb474f342ba0bf81c4a82… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jun 29 19:28:54 2009 +0200 cryptui: Add French translation. --- dlls/cryptui/cryptui.rc | 1 + dlls/cryptui/cryptui_Fr.rc | 466 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 467 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6628fb474f342ba0bf81c…

1 0

Aurimas Fišeras : view: Add Lithuanian translation.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: afa41e91051be85315381f206f70c363f44e9a4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=afa41e91051be85315381f206… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Jun 29 20:24:10 2009 +0300 view: Add Lithuanian translation. --- programs/view/Lt.rc | 75 +++++++++++++++++++++++++++++++++++++++++++++++ programs/view/viewrc.rc | 1 + 2 files changed, 76 insertions(+), 0 deletions(-) diff --git a/programs/view/Lt.rc b/programs/view/Lt.rc new file mode 100644 index 0000000..cbce3bb --- /dev/null +++ b/programs/view/Lt.rc @@ -0,0 +1,75 @@ +/* + * View + * Lithuanian Language Support + * + * Copyright 2009 Aurimas Fišeras <aurimas(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 + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +/* + * + * Menu + * + */ + +VIEW MENU +BEGIN + POPUP "&Failas" + BEGIN + MENUITEM "&Atverti", IDM_OPEN + MENUITEM "Iš&eiti", IDM_EXIT + END + POPUP "&Perkelti" + BEGIN + MENUITEM "&Sutalpinti į langą", IDM_SET_EXT_TO_WIN + MENUITEM SEPARATOR + MENUITEM "&Dešinėn", IDM_LEFT + MENUITEM "&Kairėn", IDM_RIGHT + MENUITEM "&Žemyn", IDM_UP + MENUITEM "&Aukštyn", IDM_DOWN + END +END + + +/* + * + * Accelerator + * + */ + +VIEW ACCELERATORS +BEGIN + "Q", IDM_EXIT, VIRTKEY, CONTROL +END + + +/* + * + * String Table + * + */ + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Įprastinė metafailų žiūryklė" +END + +#pragma code_page(default) diff --git a/programs/view/viewrc.rc b/programs/view/viewrc.rc index 7b104fa..6217cf6 100644 --- a/programs/view/viewrc.rc +++ b/programs/view/viewrc.rc @@ -30,6 +30,7 @@ #include "It.rc" #include "Ja.rc" #include "Ko.rc" +#include "Lt.rc" #include "Nl.rc" #include "No.rc" #include "Pl.rc"

1 0

Aurimas Fišeras : winefile: Add Lithuanian translation .
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 73285f5c59c04b1d93f67c5ef0937aa1ad09dff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73285f5c59c04b1d93f67c5ef… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Jun 29 19:15:44 2009 +0300 winefile: Add Lithuanian translation. --- programs/winefile/Lt.rc | 263 +++++++++++++++++++++++++++++++++++++++++++++ programs/winefile/rsrc.rc | 1 + 2 files changed, 264 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=73285f5c59c04b1d93f67…

1 0

Frédéric Delanoy : shell32: Updated French translation.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: f4a625b3b3b859510dabcdecd831fd8d66496da5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4a625b3b3b859510dabcdecd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jun 29 15:37:50 2009 +0200 shell32: Updated French translation. --- dlls/shell32/shell32_Fr.rc | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shell32_Fr.rc b/dlls/shell32/shell32_Fr.rc index e4fc4bb..e1b95e6 100644 --- a/dlls/shell32/shell32_Fr.rc +++ b/dlls/shell32/shell32_Fr.rc @@ -98,13 +98,13 @@ END MENU_CPANEL MENU BEGIN - POPUP "&File" + POPUP "&Fichier" BEGIN MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_CPANEL_EXIT + MENUITEM "&Quitter", IDM_CPANEL_EXIT END - POPUP "&View" + POPUP "&Affichage" BEGIN MENUITEM "&Grandes icônes", FCIDM_SHVIEW_BIGICON MENUITEM "&Petites icônes", FCIDM_SHVIEW_SMALLICON @@ -112,9 +112,9 @@ BEGIN MENUITEM "&Détails", FCIDM_SHVIEW_REPORTVIEW END - POPUP "&Help" + POPUP "Ai&de" BEGIN - MENUITEM "&About Control Panel...", IDM_CPANEL_ABOUT + MENUITEM "À &propos du panneau de configuration...", IDM_CPANEL_ABOUT END END @@ -239,7 +239,7 @@ STRINGTABLE IDS_OVERWRITEFILE_CAPTION "Confirmer l'écrasement du fichier" IDS_OVERWRITEFOLDER_TEXT "Ce dossier contient déjà un dossier nommé « %1 ».\n\n"\ "Si des fichiers dans le dossier de destination ont le même nom que ceux dans le dossier\n"\ - "sélectionné, ils seront remplacés. Voulez-vous quand même déplacer ou copier\n"\ + "sélectionné, ils seront écrasés. Voulez-vous quand même déplacer ou copier\n"\ "le dossier ?" /* message box strings */ @@ -259,8 +259,8 @@ STRINGTABLE IDS_PERSONAL "Mes documents" IDS_FAVORITES "Favoris" IDS_STARTUP "Menu Démarrer\\Programmes\\Démarrage" - IDS_RECENT "Recent" - IDS_SENDTO "SendTo" + IDS_RECENT "Documents récents" + IDS_SENDTO "Envoyer vers" IDS_STARTMENU "Menu Démarrer" IDS_MYMUSIC "Ma musique" IDS_MYVIDEO "Mes vidéos" @@ -285,11 +285,11 @@ STRINGTABLE IDS_NEWFOLDER "Nouveau dossier" - IDS_CPANEL_TITLE "Wine Control Panel" - IDS_CPANEL_NAME "Name" + IDS_CPANEL_TITLE "Panneau de configuration de Wine" + IDS_CPANEL_NAME "Nom" IDS_CPANEL_DESCRIPTION "Description" - IDS_SHLEXEC_NOASSOC "Il n'y a aucun programme Windows configuré pour ouvrir ce type de fichier." + IDS_SHLEXEC_NOASSOC "Aucun programme Windows n'est configuré pour ouvrir ce type de fichier." } STRINGTABLE

1 0

Frédéric Delanoy : appwiz.cpl: Updated French translation.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 85aadbd9064e8fb5114af1e2f90c3e32d45e4eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=85aadbd9064e8fb5114af1e2f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jun 28 21:29:25 2009 +0200 appwiz.cpl: Updated French translation. --- dlls/appwiz.cpl/En.rc | 4 ++-- dlls/appwiz.cpl/Fr.rc | 39 ++++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/appwiz.cpl/En.rc b/dlls/appwiz.cpl/En.rc index 3463b2e..da34c3b 100644 --- a/dlls/appwiz.cpl/En.rc +++ b/dlls/appwiz.cpl/En.rc @@ -45,9 +45,9 @@ FONT 8, "MS Shell Dlg" CONTROL "&Install...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 - CONTROL "The following software can be automatically removed. To remove a program or to modify its installed components, select it from the list and click Add/Remove.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "The following software can be automatically removed. To remove a program or to modify its installed components, select it from the list and click Change/Remove.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 - CONTROL "Add/&Remove...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 198, 64, 14 + CONTROL "Change/&Remove...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 CONTROL "&Support Info...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 176, 198, 64, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 } diff --git a/dlls/appwiz.cpl/Fr.rc b/dlls/appwiz.cpl/Fr.rc index 8dbdff1..f13797e 100644 --- a/dlls/appwiz.cpl/Fr.rc +++ b/dlls/appwiz.cpl/Fr.rc @@ -1,5 +1,5 @@ /* -* Ajoute/Supprime des programmes resources francaises +* Ressources fran�aises pour Ajout/suppression de programmes * * Copyright 2008 David Adam * @@ -23,16 +23,17 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE { - IDS_CPL_TITLE, "Ajouter/Supprimer des programmes" - IDS_CPL_DESC, "Vous autorise � installer un nouveau logiciel, ou supprimer un logiciel existant de votre ordinateur." + IDS_CPL_TITLE, "Ajout/Suppression de programmes" + IDS_CPL_DESC, "Vous permet d'installer un nouveau logiciel, ou supprimer un logiciel existant de votre ordinateur." IDS_TAB1_TITLE, "Applications" - IDS_UNINSTALL_FAILED, "Incapable d'ex�cuter le d�sinstalleur, '%s'. Voulez-vous supprimer l'entr�e de ce programme du registre?" + IDS_UNINSTALL_FAILED, "Impossible d'ex�cuter le d�sinstalleur '%s'. Voulez-vous supprimer l'entr�e de d�sinstallation de ce programme dans la base de registres ?" IDS_NOT_SPECIFIED, "Non sp�cifi�" IDS_COLUMN_NAME, "Nom" - IDS_COLUMN_PUBLISHER, "Editeur" + IDS_COLUMN_PUBLISHER, "�diteur" IDS_COLUMN_VERSION, "Version" + IDS_INSTALL_FILTER, "Programmes d'installation\0*instal*.exe;*setup*.exe;*.msi\0Programmes (*.exe)\0*.exe\0Tous les fichiers (*.*)\0*.*\0\0" } IDD_MAIN DIALOG 0, 0, 320, 220 @@ -40,32 +41,32 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Installation/D�sinstallation" FONT 8, "MS Shell Dlg" { -CONTROL "Pour installer un nouveau programme � partir d'une disquette, d'un cdrom ou de votre disque dur, cliquer sur Installer.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 +CONTROL "Pour installer un nouveau programme � partir d'une disquette, d'un cdrom ou de votre disque dur, cliquez sur Installer.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 CONTROL "&Installer", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 - CONTROL "Les logiciels suivants peuvent �tre automatiquement d�sinstall�s. Pour supprimer un programme ou modifier ses composants, le s�lectionner dans la liste, et cliquer sur Ajouter/Supprimer.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "Les logiciels suivants peuvent �tre d�sinstall�s automatiquement.\nPour supprimer un programme ou modifier ses composants, s�lectionnez-le dans la liste, et cliquez sur Modifier/Supprimer.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 - CONTROL "Ajouter/&Supprimer", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 198, 64, 14 - CONTROL "&Info. support", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 176, 198, 64, 14 + CONTROL "Modifier/&Supprimer", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 + CONTROL "&Infos de support", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 176, 198, 64, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 } IDD_INFO DIALOG 0, 0, 256, 138 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Information pour support" +CAPTION "Informations de support" FONT 8, "MS Shell Dlg" { CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 - CONTROL "Les informations suivantes peuvent �tre utilis�es pour obtenir un support technique pour %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 - CONTROL "Editeur:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 - CONTROL "Version:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 - CONTROL "Contact:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 - CONTROL "Support Information:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 - CONTROL "Support Telephone:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 - CONTROL "Lisez-moi:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 - CONTROL "Mise � jour des produits:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 - CONTROL "Commentaires:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "Les informations suivantes peuvent �tre utilis�es pour obtenir du support technique pour %s :", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "�diteur :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "Version :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Contact :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "Support :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "T�l�phone :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Lisez-moi :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Mises � jour :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "Commentaires :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8

1 0

Louis Lenders : advapi32: Add a few tests for GetSidSubAuthority and SetLastError correctly.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 011c5b8fae7c53bc2a5be2ff4e5337f69b2f7afc URL: http://source.winehq.org/git/wine.git/?a=commit;h=011c5b8fae7c53bc2a5be2ff4… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sat Jun 27 12:48:46 2009 +0200 advapi32: Add a few tests for GetSidSubAuthority and SetLastError correctly. --- dlls/advapi32/security.c | 2 ++ dlls/advapi32/tests/security.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 773a839..e1cbb1a 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1073,6 +1073,7 @@ GetSidIdentifierAuthority( PSID pSid ) PDWORD WINAPI GetSidSubAuthority( PSID pSid, DWORD nSubAuthority ) { + SetLastError(ERROR_SUCCESS); return RtlSubAuthoritySid(pSid, nSubAuthority); } @@ -1085,6 +1086,7 @@ GetSidSubAuthority( PSID pSid, DWORD nSubAuthority ) PUCHAR WINAPI GetSidSubAuthorityCount (PSID pSid) { + SetLastError(ERROR_SUCCESS); return RtlSubAuthorityCountSid(pSid); } diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index af52a3a..de794de 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -92,6 +92,9 @@ typedef BOOL (WINAPI *fnSetFileSecurityA)(LPCSTR, SECURITY_INFORMATION, static DWORD (WINAPI *pGetNamedSecurityInfoA)(LPSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION, PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*); +static PDWORD (WINAPI *pGetSidSubAuthority)(PSID, DWORD); +static PUCHAR (WINAPI *pGetSidSubAuthorityCount)(PSID); +static BOOL (WINAPI *pIsValidSid)(PSID); typedef DWORD (WINAPI *fnRtlAdjustPrivilege)(ULONG,BOOLEAN,BOOLEAN,PBOOLEAN); typedef BOOL (WINAPI *fnCreateWellKnownSid)(WELL_KNOWN_SID_TYPE,PSID,PSID,DWORD*); typedef BOOL (WINAPI *fnDuplicateTokenEx)(HANDLE,DWORD,LPSECURITY_ATTRIBUTES, @@ -160,6 +163,9 @@ static void init(void) pSetFileSecurityA = (fnSetFileSecurityA)GetProcAddress(hmod, "SetFileSecurityA" ); pCreateWellKnownSid = (fnCreateWellKnownSid)GetProcAddress( hmod, "CreateWellKnownSid" ); pGetNamedSecurityInfoA = (void *)GetProcAddress(hmod, "GetNamedSecurityInfoA"); + pGetSidSubAuthority = (void *)GetProcAddress(hmod, "GetSidSubAuthority"); + pGetSidSubAuthorityCount = (void *)GetProcAddress(hmod, "GetSidSubAuthorityCount"); + pIsValidSid = (void *)GetProcAddress(hmod, "IsValidSid"); pMakeSelfRelativeSD = (void *)GetProcAddress(hmod, "MakeSelfRelativeSD"); pSetEntriesInAclW = (void *)GetProcAddress(hmod, "SetEntriesInAclW"); pSetSecurityDescriptorControl = (void *)GetProcAddress(hmod, "SetSecurityDescriptorControl"); @@ -3176,6 +3182,34 @@ static void test_GetSecurityInfo(void) CloseHandle(obj); } +static void test_GetSidSubAuthority(void) +{ + PSID psid = NULL; + + if (!pGetSidSubAuthority || !pConvertStringSidToSidA || !pIsValidSid || !pGetSidSubAuthorityCount) + { + win_skip("Some functions not available\n"); + return; + } + /* Note: on windows passing in an invalid index like -1, lets GetSidSubAuthority return 0x05000000 but + still GetLastError returns ERROR_SUCCESS then. We don't test these unlikely cornercases here for now */ + ok(pConvertStringSidToSidA("S-1-5-21-93476-23408-4576",&psid),"ConvertStringSidToSidA failed\n"); + ok(pIsValidSid(psid),"Sid is not valid\n"); + SetLastError(0xbebecaca); + ok(*pGetSidSubAuthorityCount(psid) == 4,"GetSidSubAuthorityCount gave %d expected 4\n",*pGetSidSubAuthorityCount(psid)); + ok(GetLastError() == 0,"GetLastError returned %d instead of 0\n",GetLastError()); + SetLastError(0xbebecaca); + ok(*pGetSidSubAuthority(psid,0) == 21,"GetSidSubAuthority gave %d expected 21",*pGetSidSubAuthority(psid,0)); + ok(GetLastError() == 0,"GetLastError returned %d instead of 0\n",GetLastError()); + SetLastError(0xbebecaca); + ok(*pGetSidSubAuthority(psid,1) == 93476,"GetSidSubAuthority gave %d expected 93476",*pGetSidSubAuthority(psid,1)); + ok(GetLastError() == 0,"GetLastError returned %d instead of 0\n",GetLastError()); + SetLastError(0xbebecaca); + todo_wine ok(*pGetSidSubAuthority(psid,4) == 0,"GetSidSubAuthority gave %d,expected 0\n",*pGetSidSubAuthority(psid,4)); + ok(GetLastError() == 0,"GetLastError returned %d instead of 0\n",GetLastError()); + LocalFree(psid); +} + START_TEST(security) { init(); @@ -3205,4 +3239,5 @@ START_TEST(security) test_PrivateObjectSecurity(); test_acls(); test_GetSecurityInfo(); + test_GetSidSubAuthority(); }

1 0

Detlef Riekenberg : advapi32: Check the output pointer first in RegOpenKey, with test.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 0ca3b3b423444e0febcec4f9c2e44940dca493ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ca3b3b423444e0febcec4f9c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jun 28 20:40:04 2009 +0200 advapi32: Check the output pointer first in RegOpenKey, with test. --- dlls/advapi32/registry.c | 8 +++++++- dlls/advapi32/tests/registry.c | 9 +++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 52de6c5..3762908 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -381,6 +381,9 @@ LSTATUS WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, REGSAM acc */ LSTATUS WINAPI RegOpenKeyW( HKEY hkey, LPCWSTR name, PHKEY retkey ) { + if (!retkey) + return ERROR_INVALID_PARAMETER; + if (!name || !*name) { *retkey = hkey; @@ -402,10 +405,13 @@ LSTATUS WINAPI RegOpenKeyW( HKEY hkey, LPCWSTR name, PHKEY retkey ) * * RETURNS * Success: ERROR_SUCCESS - * Failure: A standard Win32 error code. retkey is set to 0. + * Failure: A standard Win32 error code. When retkey is valid, *retkey is set to 0. */ LSTATUS WINAPI RegOpenKeyA( HKEY hkey, LPCSTR name, PHKEY retkey ) { + if (!retkey) + return ERROR_INVALID_PARAMETER; + if (!name || !*name) { *retkey = hkey; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 47e76b2..ca82fa1 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -956,9 +956,18 @@ static void test_reg_open_key(void) RegCloseKey(hkResult); /* send in NULL hkResult */ + SetLastError(0xdeadbeef); ret = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test", NULL); ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", ret); + SetLastError(0xdeadbeef); + ret = RegOpenKeyA(HKEY_CURRENT_USER, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", ret); + + SetLastError(0xdeadbeef); + ret = RegOpenKeyA(NULL, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", ret); + /* beginning backslash character */ ret = RegOpenKeyA(HKEY_CURRENT_USER, "\\Software\\Wine\\Test", &hkResult); ok(ret == ERROR_BAD_PATHNAME || /* NT/2k/XP */

1 0

← Newer
1
2
3
4
5
6
7
8
...
112
Older →

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 June 2009