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

Rein Klazes : comdlg32: Fix a problem with resizing a customized file dialog.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: a73175fd11f398184deb316bde1daac9ec682e5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73175fd11f398184deb316bd… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Jul 9 09:36:04 2009 +0200 comdlg32: Fix a problem with resizing a customized file dialog. --- dlls/comdlg32/filedlg.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index eb92c0d..faed51a 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1117,9 +1117,6 @@ static LRESULT FILEDLG95_OnWMSize(HWND hwnd, WPARAM wParam, LPARAM lParam) if(fodInfos->DlgInfos.hwndCustomDlg && (fodInfos->ofnInfos->Flags & (OFN_ENABLETEMPLATE | OFN_ENABLETEMPLATEHANDLE))) { - GetClientRect(hwnd, &rc); - DeferWindowPos( hdwp,fodInfos->DlgInfos.hwndCustomDlg, NULL, - 0, 0, rc.right, rc.bottom, SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); for( ctrl = GetWindow( fodInfos->DlgInfos.hwndCustomDlg, GW_CHILD); ctrl ; ctrl = GetWindow( ctrl, GW_HWNDNEXT)) { @@ -1142,6 +1139,11 @@ static LRESULT FILEDLG95_OnWMSize(HWND hwnd, WPARAM wParam, LPARAM lParam) SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); } } + /* size the custom dialog at the end: some applications do some + * control re-arranging at this point */ + GetClientRect(hwnd, &rc); + DeferWindowPos( hdwp,fodInfos->DlgInfos.hwndCustomDlg, NULL, + 0, 0, rc.right, rc.bottom, SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); } EndDeferWindowPos( hdwp); /* should not be needed */

1 0

Frédéric Delanoy : msrle32: Fix French translation.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: dc4463e142ea9e041bdf9d02396c62ef4c3d17be URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc4463e142ea9e041bdf9d023… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 8 15:32:48 2009 +0200 msrle32: Fix French translation. --- dlls/msrle32/msrle_Fr.rc | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msrle32/msrle_Fr.rc b/dlls/msrle32/msrle_Fr.rc index 001d37e..f45892c 100644 --- a/dlls/msrle32/msrle_Fr.rc +++ b/dlls/msrle32/msrle_Fr.rc @@ -1,7 +1,7 @@ /* * French resource file for MS-RLE * - * Copyright 2002 Michael G�nnewig + * Copyright 2002 Michael Günnewig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,11 +20,14 @@ #include "msrle_private.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine: d�codeur/encodeur vid�o MS-RLE" - IDS_ABOUT "Wine: d�codeur/encodeur vid�o MS-RLE\nCopyright 2002 par Michael G�nnewig" + IDS_DESCRIPTION "Wine : codec vidéo MS-RLE" + IDS_ABOUT "Wine : codec vidéo MS-RLE\nCopyright 2002 par Michael Günnewig" }

1 0

Frédéric Delanoy : appwiz.cpl: Fix French translation & UI display.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 1cd85126950e8b5123d6750a5e9a4ad8632d1d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd85126950e8b5123d6750a5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 8 18:11:59 2009 +0200 appwiz.cpl: Fix French translation & UI display. --- dlls/appwiz.cpl/Fr.rc | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/appwiz.cpl/Fr.rc b/dlls/appwiz.cpl/Fr.rc index 0c860b3..4c29010 100644 --- a/dlls/appwiz.cpl/Fr.rc +++ b/dlls/appwiz.cpl/Fr.rc @@ -1,5 +1,5 @@ /* -* Ressources fran�aises pour Ajout/suppression de programmes +* Ressources françaises pour Ajout/Suppression de programmes * * Copyright 2008 David Adam * @@ -21,6 +21,9 @@ #include "res.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE @@ -29,28 +32,28 @@ STRINGTABLE 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, "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_UNINSTALL_FAILED, "Impossible d'exécuter le désinstalleur « %s ». Voulez-vous supprimer l'entrée de désinstallation de ce programme de la base de registre ?" + IDS_NOT_SPECIFIED, "Non spécifié" IDS_COLUMN_NAME, "Nom" - IDS_COLUMN_PUBLISHER, "�diteur" + 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 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Installation/D�sinstallation" +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, 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 "Pour installer un nouveau programme à partir d'une disquette, d'un CD-ROM ou d'un 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, 240, 26, 70, 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 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 "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 "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 "Modifier/&Supprimer", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 198, 70, 14 + CONTROL "&Informations de support", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 198, 87, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 } @@ -60,15 +63,15 @@ 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 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 "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, 54, 8 + CONTROL "Version :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 54, 8 + CONTROL "Contact :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 54, 8 + CONTROL "Support :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 54, 8 + CONTROL "Téléphone :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 54, 8 + CONTROL "Lisez-moi :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 54, 8 + CONTROL "Mises à jour :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 54, 8 + CONTROL "Commentaires :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 54, 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

Hwang YunSong : notepad: Updated Korean resource.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 3ce23c9802fe1a201e5c449acfca93db1766e92c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ce23c9802fe1a201e5c449ac… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jul 9 16:17:03 2009 +0900 notepad: Updated Korean resource. --- programs/notepad/Ko.rc | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/programs/notepad/Ko.rc b/programs/notepad/Ko.rc index b838cbf..56167de 100644 --- a/programs/notepad/Ko.rc +++ b/programs/notepad/Ko.rc @@ -114,12 +114,22 @@ STRING_TOOLARGE, "%s �ٸ� ��⸦ ��Ͻʽÿ�." STRING_NOTEXT, "�Է�� ϴ�.\ \n�� Է�� õ��Ͻʽÿ�" -STRING_DOESNOTEXIST, "%s\n�� ϴ�.\n\n \ +STRING_DOESNOTEXIST, "%s\ �� ϴ�.\n\n \ �� ðڽ��ϱ�?" -STRING_NOTSAVED, "%s\n�� Ǿ��ϴ�.\n\n \ +STRING_NOTSAVED, "%s\ �� Ǿ��ϴ�.\n\n \ �� Ͻðڽ��ϱ�?" STRING_NOTFOUND, "%s ��ڿ�� ã�� ϴ�." STRING_OUT_OF_MEMORY, "�� ۾�� Ϸ��ϴ� �� ʿ�� ޸𸮰� ��մϴ�.\ -\n�� ޸�� Ȯ��ϱ� �� ϳ� �̻�� α׷�� ݾ� �ֽʽÿ�.\n" +\n�� ޸�� Ȯ��ϱ� �� ϳ� �̻�� α׷�� ݾ� �ֽʽÿ�." + +STRING_UNICODE_LE, "��ڵ� (UTF-16)" +STRING_UNICODE_BE, "��ڵ� (UTF-16 ��-��)" + +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +��ڵ� ��ڸ� ��ϰ� �ִ� �� %s ��ڵ�� \n\ +�� ϸ� �� ս�� Դϴ�.\n\ +�� ڸ� ��Ϸ�� Ҹ� Ŭ��ϰ�, ��ڵ� ��Ӵٿ�� ڵ� \n\ +�ɼ� �� ϳ�� Ͻʽÿ�t.\n\ +��Ͻðڽ��ϱ�?" }

1 0

Hwang YunSong : crypt32: Updated Korean resource.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 755abeda015e14314348a52af3064bee02308429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=755abeda015e14314348a52af… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jul 9 16:04:31 2009 +0900 crypt32: Updated Korean resource. --- dlls/crypt32/crypt32_Ko.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_Ko.rc b/dlls/crypt32/crypt32_Ko.rc index 1a05353..0d83815 100644 --- a/dlls/crypt32/crypt32_Ko.rc +++ b/dlls/crypt32/crypt32_Ko.rc @@ -175,6 +175,7 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_CA "�߰� �� " IDS_LOCALIZEDNAME_ADDRESSBOOK "�ٸ� ��" IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "�ŷ�� ִ� ��" + IDS_LOCALIZEDNAME_DISALLOWED "�ŷ� �� " } STRINGTABLE DISCARDABLE

1 0

Hwang YunSong : cryptui: Updated Korean resource.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 7cecc0cb8255ff9f0492599900e368e31869dd84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cecc0cb8255ff9f049259990… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jul 9 16:12:45 2009 +0900 cryptui: Updated Korean resource. --- dlls/cryptui/cryptui_Ko.rc | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/cryptui/cryptui_Ko.rc b/dlls/cryptui/cryptui_Ko.rc index 6cbf6fe..2533a4e 100644 --- a/dlls/cryptui/cryptui_Ko.rc +++ b/dlls/cryptui/cryptui_Ko.rc @@ -404,22 +404,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "�� :", -1, 21,1,195,10 AUTORADIOBUTTON "&DER-��ȣȭ�� X.509 (.cer)", - IDC_EXPORT_FORMAT_DER, 31,18,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP + IDC_EXPORT_FORMAT_DER, 31,18,240,12, BS_AUTORADIOBUTTON|WS_TABSTOP AUTORADIOBUTTON "Ba&se64-��ȣȭ�� X.509 (.cer):", - IDC_EXPORT_FORMAT_BASE64, 31,30,200,12, BS_AUTORADIOBUTTON + IDC_EXPORT_FORMAT_BASE64, 31,30,240,12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "��ȣ �޽�� ǥ��/PKCS #7 �޽��(&C) (.p7b)", - IDC_EXPORT_FORMAT_CMS, 31,42,200,12, BS_AUTORADIOBUTTON + IDC_EXPORT_FORMAT_CMS, 31,42,240,12, BS_AUTORADIOBUTTON CHECKBOX "�� ο� �ִ� �� (&I)", - IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED AUTORADIOBUTTON "�� ȯ(&P)/PKCS #12 (.pfx)", - IDC_EXPORT_FORMAT_PFX, 31,72,200,12, BS_AUTORADIOBUTTON|WS_DISABLED + IDC_EXPORT_FORMAT_PFX, 31,72,240,12, BS_AUTORADIOBUTTON|WS_DISABLED CHECKBOX "�� ο� �ִ� �� (&U)", - IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED CHECKBOX "�� ȣȭ ��(&E)", - IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,200,8, + IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED CHECKBOX "��Ⱑ ��ϸ� �� Ű ��(&K)", - IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,200,8, + IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED END

1 0

Francois Gouget : urlmon/tests: Fix two ok() trailing '\n's.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: a4f4fd2a77371a8f99e30a92aa3623db5e6733b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4f4fd2a77371a8f99e30a92a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 9 09:51:58 2009 +0200 urlmon/tests: Fix two ok() trailing '\n's. --- dlls/urlmon/tests/sec_mgr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 07d409e..a6fb6bb 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -294,12 +294,12 @@ static void test_CoInternetCreateZoneManager(void) return; hr = IInternetZoneManager_QueryInterface(zonemgr, &IID_IUnknown, (void **) &punk); - ok(SUCCEEDED(hr), "got 0x%x with %p (expected Success)n", hr, punk); + ok(SUCCEEDED(hr), "got 0x%x with %p (expected Success)\n", hr, punk); if (punk) IUnknown_Release(punk); hr = IInternetZoneManager_QueryInterface(zonemgr, &IID_IInternetZoneManager, (void **) &punk); - ok(SUCCEEDED(hr), "got 0x%x with %p (expected Success)n", hr, punk); + ok(SUCCEEDED(hr), "got 0x%x with %p (expected Success)\n", hr, punk); if (punk) IUnknown_Release(punk);

1 0

Austin English : notepad: Fix English resource line breaks.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: b0f53e1920e33ca970d29b47f6419a95c2ff9a28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f53e1920e33ca970d29b47f… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jul 8 01:10:40 2009 -0500 notepad: Fix English resource line breaks. --- programs/notepad/En.rc | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/notepad/En.rc b/programs/notepad/En.rc index fb774cf..15439b1 100644 --- a/programs/notepad/En.rc +++ b/programs/notepad/En.rc @@ -120,14 +120,13 @@ STRING_TOOLARGE, "File '%s' is too large for note Please use a different editor." STRING_NOTEXT, "You didn't enter any text. \ \nPlease type something and try again" -STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ +STRING_DOESNOTEXIST, "File '%s' does not exist\n\n \ Do you want to create a new file ?" -STRING_NOTSAVED, "File '%s'\nhas been modified\n\n \ +STRING_NOTSAVED, "File '%s' has been modified\n\n \ Would you like to save the changes ?" STRING_NOTFOUND, "'%s' could not be found." STRING_OUT_OF_MEMORY, "Not enough memory to complete this \ -task.\nClose one or more applications to increase the amount of\nfree \ -memory." +task.\nClose one or more applications to increase the amount of free memory." STRING_UNICODE_LE, "Unicode (UTF-16)" STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)"

1 0

Andrew Eikum : gdiplus: Implement GdipSaveGraphics and GdipRestoreGraphics.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 1ef13941f6d80b4f1413f888cd753c8619ebaea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ef13941f6d80b4f1413f888c… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Tue Jul 7 22:30:49 2009 -0500 gdiplus: Implement GdipSaveGraphics and GdipRestoreGraphics. --- dlls/gdiplus/graphics.c | 21 ++------------------- dlls/gdiplus/tests/graphics.c | 24 ++++++++---------------- 2 files changed, 10 insertions(+), 35 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 12f1e26..b59814e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3322,15 +3322,7 @@ GpStatus WINGDIPAPI GdipResetWorldTransform(GpGraphics *graphics) GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics *graphics, GraphicsState state) { - static int calls; - - if(!graphics) - return InvalidParameter; - - if(!(calls++)) - FIXME("graphics state not implemented\n"); - - return Ok; + return GdipEndContainer(graphics, state); } GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics *graphics, REAL angle, @@ -3349,16 +3341,7 @@ GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics *graphics, REAL angle, GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics *graphics, GraphicsState *state) { - static int calls; - - if(!graphics || !state) - return InvalidParameter; - - if(!(calls++)) - FIXME("graphics state not implemented\n"); - - *state = 0xdeadbeef; - return Ok; + return GdipBeginContainer2(graphics, state); } GpStatus WINGDIPAPI GdipBeginContainer2(GpGraphics *graphics, diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 23aa717..6fd49f7 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -137,8 +137,7 @@ static void test_save_restore(void) stat = GdipRestoreGraphics(graphics1, state_a); expect(Ok, stat); GdipGetInterpolationMode(graphics1, &mode); - todo_wine - expect(InterpolationModeBilinear, mode); + expect(InterpolationModeBilinear, mode); GdipDeleteGraphics(graphics1); log_state(state_a, &state_log); @@ -154,12 +153,10 @@ static void test_save_restore(void) expect(Ok, stat); GdipRestoreGraphics(graphics1, state_b); GdipGetInterpolationMode(graphics1, &mode); - todo_wine - expect(InterpolationModeBicubic, mode); + expect(InterpolationModeBicubic, mode); GdipRestoreGraphics(graphics1, state_a); GdipGetInterpolationMode(graphics1, &mode); - todo_wine - expect(InterpolationModeBilinear, mode); + expect(InterpolationModeBilinear, mode); GdipDeleteGraphics(graphics1); log_state(state_a, &state_log); @@ -176,16 +173,13 @@ static void test_save_restore(void) GdipSetInterpolationMode(graphics1, InterpolationModeHighQualityBilinear); GdipRestoreGraphics(graphics1, state_b); GdipGetInterpolationMode(graphics1, &mode); - todo_wine - expect(InterpolationModeBicubic, mode); + expect(InterpolationModeBicubic, mode); GdipRestoreGraphics(graphics1, state_c); GdipGetInterpolationMode(graphics1, &mode); - todo_wine - expect(InterpolationModeBicubic, mode); + expect(InterpolationModeBicubic, mode); GdipRestoreGraphics(graphics1, state_a); GdipGetInterpolationMode(graphics1, &mode); - todo_wine - expect(InterpolationModeBilinear, mode); + expect(InterpolationModeBilinear, mode); GdipDeleteGraphics(graphics1); log_state(state_a, &state_log); @@ -204,12 +198,10 @@ static void test_save_restore(void) GdipSetInterpolationMode(graphics2, InterpolationModeNearestNeighbor); GdipRestoreGraphics(graphics1, state_a); GdipGetInterpolationMode(graphics1, &mode); - todo_wine - expect(InterpolationModeBilinear, mode); + expect(InterpolationModeBilinear, mode); GdipRestoreGraphics(graphics2, state_b); GdipGetInterpolationMode(graphics2, &mode); - todo_wine - expect(InterpolationModeBicubic, mode); + expect(InterpolationModeBicubic, mode); GdipDeleteGraphics(graphics1); GdipDeleteGraphics(graphics2);

1 0

Juan Lang : cryptui: Increase control width to support larger fonts.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: a83f1c93c32e45159fa33b85f80f07dc731ea11f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a83f1c93c32e45159fa33b85f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 6 09:38:27 2009 -0700 cryptui: Increase control width to support larger fonts. --- dlls/cryptui/cryptui_En.rc | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 1335f0e..957fe98 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -419,22 +419,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Select the format you want to use:", -1, 21,1,195,10 AUTORADIOBUTTON "&DER-encoded X.509 (.cer)", - IDC_EXPORT_FORMAT_DER, 31,18,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP + IDC_EXPORT_FORMAT_DER, 31,18,240,12, BS_AUTORADIOBUTTON|WS_TABSTOP AUTORADIOBUTTON "Ba&se64-encoded X.509 (.cer):", - IDC_EXPORT_FORMAT_BASE64, 31,30,200,12, BS_AUTORADIOBUTTON + IDC_EXPORT_FORMAT_BASE64, 31,30,240,12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)", - IDC_EXPORT_FORMAT_CMS, 31,42,200,12, BS_AUTORADIOBUTTON + IDC_EXPORT_FORMAT_CMS, 31,42,240,12, BS_AUTORADIOBUTTON CHECKBOX "&Include all certificates in the certification path if possible", - IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED AUTORADIOBUTTON "&Personal Information Exchange/PKCS #12 (.pfx)", - IDC_EXPORT_FORMAT_PFX, 31,72,200,12, BS_AUTORADIOBUTTON|WS_DISABLED + IDC_EXPORT_FORMAT_PFX, 31,72,240,12, BS_AUTORADIOBUTTON|WS_DISABLED CHECKBOX "Incl&ude all certificates in the certification path if possible", - IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED CHECKBOX "&Enable strong encryption", - IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,200,8, + IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED CHECKBOX "Delete the private &key if the export is successful", - IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,200,8, + IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED END

1 0