October 2006 - Wine-Commits

Mike McCormack : msi: Only ignore the StringPool and StringData in a transform.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: 59edd7d8a8e6ef4ea166cf611068015a3121772a URL: http://source.winehq.org/git/wine.git/?a=commit;h=59edd7d8a8e6ef4ea166cf611… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Oct 5 17:00:46 2006 +0900 msi: Only ignore the StringPool and StringData in a transform. --- dlls/msi/table.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index ef54c76..0a228dc 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1966,11 +1966,17 @@ UINT msi_table_apply_transform( MSIDATAB r = IEnumSTATSTG_Next( stgenum, 1, &stat, &count ); if( FAILED( r ) || !count ) break; + decode_streamname( stat.pwcsName, name ); - if( ( name[0] == 0x4840 ) && ( name[1] != '_' ) ) - ret = msi_table_load_transform( db, stg, strings, name+1 ); - else - TRACE("transform contains stream %s\n", debugstr_w(name)); + TRACE("transform contains stream %s\n", debugstr_w(name)); + + if ( name[0] != 0x4840 ) + continue; + + if ( !lstrcmpW(name+1, szStringPool ) || !lstrcmpW(name+1, szStringData) ) + continue; + + ret = msi_table_load_transform( db, stg, strings, name+1 ); } if ( ret == ERROR_SUCCESS )

1 0

Mike McCormack : msi: Only declare the szStringData and szStringPool strings once.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: 2af5ed571a0049bf152454a6cc8e320c01746bc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2af5ed571a0049bf152454a6c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Oct 5 17:00:10 2006 +0900 msi: Only declare the szStringData and szStringPool strings once. --- dlls/msi/table.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 6362f13..ef54c76 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -71,6 +71,11 @@ typedef struct tagMSITRANSFORM { IStorage *stg; } MSITRANSFORM; +static const WCHAR szStringData[] = { + '_','S','t','r','i','n','g','D','a','t','a',0 }; +static const WCHAR szStringPool[] = { + '_','S','t','r','i','n','g','P','o','o','l',0 }; + #define MAX_STREAM_NAME 0x1f static UINT table_get_column_info( MSIDATABASE *db, LPCWSTR name, @@ -635,10 +640,6 @@ err: HRESULT init_string_table( IStorage *stg ) { HRESULT r; - static const WCHAR szStringData[] = { - '_','S','t','r','i','n','g','D','a','t','a',0 }; - static const WCHAR szStringPool[] = { - '_','S','t','r','i','n','g','P','o','o','l',0 }; USHORT zero[2] = { 0, 0 }; ULONG count = 0; IStream *stm = NULL; @@ -687,10 +688,6 @@ string_table *load_string_table( IStorag USHORT *pool = NULL; UINT r, datasize = 0, poolsize = 0, codepage; DWORD i, count, offset, len, n, refs; - static const WCHAR szStringData[] = { - '_','S','t','r','i','n','g','D','a','t','a',0 }; - static const WCHAR szStringPool[] = { - '_','S','t','r','i','n','g','P','o','o','l',0 }; r = read_stream_data( stg, szStringPool, &pool, &poolsize ); if( r != ERROR_SUCCESS) @@ -767,10 +764,6 @@ static UINT save_string_table( MSIDATABA { UINT i, count, datasize = 0, poolsize = 0, sz, used, r, codepage, n; UINT ret = ERROR_FUNCTION_FAILED; - static const WCHAR szStringData[] = { - '_','S','t','r','i','n','g','D','a','t','a',0 }; - static const WCHAR szStringPool[] = { - '_','S','t','r','i','n','g','P','o','o','l',0 }; CHAR *data = NULL; USHORT *pool = NULL;

1 0

Mike McCormack : msi: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: f1d4646a49a9d0398ea668a938a781bb40dd25dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1d4646a49a9d0398ea668a93… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Oct 5 13:41:22 2006 +0900 msi: Win64 printf format warning fixes. --- dlls/msi/Makefile.in | 1 - dlls/msi/action.c | 8 +++---- dlls/msi/appsearch.c | 4 ++- dlls/msi/custom.c | 11 ++++----- dlls/msi/database.c | 4 ++- dlls/msi/dialog.c | 6 +++-- dlls/msi/files.c | 6 +++-- dlls/msi/format.c | 8 +++---- dlls/msi/insert.c | 2 +- dlls/msi/msi.c | 58 +++++++++++++++++++++++++------------------------- dlls/msi/msiquery.c | 2 +- dlls/msi/package.c | 8 +++---- dlls/msi/record.c | 2 +- dlls/msi/registry.c | 40 +++++++++++++++++----------------- dlls/msi/source.c | 29 ++++++++++++------------- dlls/msi/suminfo.c | 12 +++++----- dlls/msi/table.c | 24 ++++++++++----------- dlls/msi/upgrade.c | 4 ++- 18 files changed, 113 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f1d4646a49a9d0398ea66…

1 0

Mike McCormack : msi: Remove an unused variable.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: 8d7bbd18094cd75a475d2f6905c6a63e8fdc2034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d7bbd18094cd75a475d2f690… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Oct 5 17:00:21 2006 +0900 msi: Remove an unused variable. --- dlls/msi/table.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 455e362..6362f13 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1950,7 +1950,7 @@ UINT msi_table_apply_transform( MSIDATAB IEnumSTATSTG *stgenum = NULL; HRESULT r; STATSTG stat; - ULONG n, count; + ULONG count; WCHAR name[0x40]; string_table *strings; UINT ret = ERROR_FUNCTION_FAILED; @@ -1965,7 +1965,6 @@ UINT msi_table_apply_transform( MSIDATAB if( FAILED( r ) ) goto end; - n = 0; ret = ERROR_SUCCESS; while( r == ERROR_SUCCESS ) @@ -1979,7 +1978,6 @@ UINT msi_table_apply_transform( MSIDATAB ret = msi_table_load_transform( db, stg, strings, name+1 ); else TRACE("transform contains stream %s\n", debugstr_w(name)); - n++; } if ( ret == ERROR_SUCCESS )

1 0

Mike McCormack : msi: Check that transforms preserve tables.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: 2e19d49538e2829f48f78a29403166479abe4016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e19d49538e2829f48f78a294… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Oct 5 13:40:52 2006 +0900 msi: Check that transforms preserve tables. --- dlls/msi/tests/db.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 318d167..a065477 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1720,6 +1720,14 @@ static void test_generate_transform(void r = run_query(hdb1, 0, query); ok(r == ERROR_SUCCESS, "failed to add table\n"); + query = "INSERT INTO `AAR` ( `BAR`, `CAR` ) VALUES ( 1, 'vw' )"; + r = run_query(hdb1, 0, query); + ok(r == ERROR_SUCCESS, "failed to add row 1\n"); + + query = "INSERT INTO `AAR` ( `BAR`, `CAR` ) VALUES ( 2, 'bmw' )"; + r = run_query(hdb1, 0, query); + ok(r == ERROR_SUCCESS, "failed to add row 2\n"); + todo_wine { r = MsiDatabaseGenerateTransform(hdb1, hdb2, NULL, 0, 0); ok( r == ERROR_SUCCESS, "return code %d, should be ERROR_SUCCESS\n", r ); @@ -1727,11 +1735,19 @@ static void test_generate_transform(void r = MsiDatabaseGenerateTransform(hdb1, hdb2, mstfile, 0, 0); ok( r == ERROR_SUCCESS, "return code %d, should be ERROR_SUCCESS\n", r ); + /* database needs to be committed */ + MsiDatabaseCommit(hdb1); + + r = MsiDatabaseGenerateTransform(hdb1, hdb2, mstfile, 0, 0); + ok( r == ERROR_SUCCESS, "return code %d, should be ERROR_SUCCESS\n", r ); + MsiCloseHandle( hdb1 ); r = MsiDatabaseApplyTransform( hdb2, mstfile, 0 ); ok( r == ERROR_SUCCESS, "return code %d, should be ERROR_SUCCESS\n", r ); + MsiDatabaseCommit(hdb2); + /* apply the same transform again? */ r = MsiDatabaseApplyTransform( hdb2, mstfile, 0 ); ok( r == ERROR_INSTALL_TRANSFORM_FAILURE, @@ -1741,6 +1757,18 @@ static void test_generate_transform(void MsiCloseHandle( hdb2 ); DeleteFile(msifile); + + r = MsiOpenDatabase(msifile2, MSIDBOPEN_READONLY, &hdb1 ); + ok( r == ERROR_SUCCESS , "Failed to create database\n" ); + + todo_wine { + query = "select `BAR`,`CAR` from `AAR`"; + r = run_query(hdb1, 0, query); + ok(r == ERROR_SUCCESS, "select query failed\n"); + } + + MsiCloseHandle( hdb1 ); + DeleteFile(msifile2); DeleteFile(mstfile); }

1 0

Hwang YunSong(황윤성) : regedit: Updated Korean Resource.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: 33c6347472029e9250b53c24a76607c79b1d3254 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c6347472029e9250b53c24a… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Thu Oct 5 10:30:51 2006 +0900 regedit: Updated Korean Resource. --- programs/regedit/Ko.rc | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/programs/regedit/Ko.rc b/programs/regedit/Ko.rc index 2241164..d5af338 100644 --- a/programs/regedit/Ko.rc +++ b/programs/regedit/Ko.rc @@ -222,7 +222,16 @@ BEGIN PUSHBUTTON "�ݱ�",IDCANCEL,175,22,30,11, WS_GROUP END - +IDD_EXPORT_TEMPLATE DIALOG DISCARDABLE 50, 50, 278, 54 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | +WS_BORDER +FONT 8, "MS Shell Dlg" + BEGIN + GROUPBOX "��Ʈ�� ҷ��(&E)", IDC_EXPORT_BASE, 6, 6, 266, 42, WS_GROUP + AUTORADIOBUTTON "��(&A)", IDC_EXPORT_ALL, 12, 15, 244, 12 + AUTORADIOBUTTON "��õ� �κи�(&S):", IDC_EXPORT_SELECTED, 12, 30, 70, 12 + EDITTEXT IDC_EXPORT_PATH, 82, 30, 184, 12 +END /* * String Table @@ -319,6 +328,8 @@ END /*****************************************************************/ + + /* * TEXTINCLUDE */

1 0

Karsten Elfenbein : d3d9: Fix typo in trace.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: 836cf139bbb962ee2271fdb6c9e762602a6472d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=836cf139bbb962ee2271fdb6c… Author: Karsten Elfenbein <kelfe(a)gmx.de> Date: Wed Oct 4 18:10:56 2006 +0200 d3d9: Fix typo in trace. --- dlls/d3d9/vertexdeclaration.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index c901d92..5ba5205 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -290,7 +290,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Cr IUnknown_AddRef(iface); object->parentDevice = iface; *ppDecl = (LPDIRECT3DVERTEXDECLARATION9) object; - TRACE("(%p) : Created vertex declatanio %p\n", This, object); + TRACE("(%p) : Created vertex declaration %p\n", This, object); } return hr; }

1 0

Juan Lang : crypt32: Don' t crash when setting CRYPT_KEY_PROV_INFO with empty names.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: 190f9d6546644217ad8043aeea4e0ff532b09778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=190f9d6546644217ad8043aee… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Oct 4 18:13:49 2006 -0700 crypt32: Don't crash when setting CRYPT_KEY_PROV_INFO with empty names. --- dlls/crypt32/cert.c | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index b520c0f..c1a638a 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -367,12 +367,22 @@ static void CRYPT_CopyKeyProvInfo(PCRYPT DWORD i; LPBYTE nextData = (LPBYTE)to + sizeof(CRYPT_KEY_PROV_INFO); - to->pwszContainerName = (LPWSTR)nextData; - lstrcpyW(to->pwszContainerName, from->pwszContainerName); - nextData += (lstrlenW(from->pwszContainerName) + 1) * sizeof(WCHAR); - to->pwszProvName = (LPWSTR)nextData; - lstrcpyW(to->pwszProvName, from->pwszProvName); - nextData += (lstrlenW(from->pwszProvName) + 1) * sizeof(WCHAR); + if (from->pwszContainerName) + { + to->pwszContainerName = (LPWSTR)nextData; + lstrcpyW(to->pwszContainerName, from->pwszContainerName); + nextData += (lstrlenW(from->pwszContainerName) + 1) * sizeof(WCHAR); + } + else + to->pwszContainerName = NULL; + if (from->pwszProvName) + { + to->pwszProvName = (LPWSTR)nextData; + lstrcpyW(to->pwszProvName, from->pwszProvName); + nextData += (lstrlenW(from->pwszProvName) + 1) * sizeof(WCHAR); + } + else + to->pwszProvName = NULL; to->dwProvType = from->dwProvType; to->dwFlags = from->dwFlags; to->cProvParam = from->cProvParam; @@ -397,8 +407,14 @@ static BOOL CertContext_SetKeyProvInfoPr LPBYTE buf = NULL; DWORD size = sizeof(CRYPT_KEY_PROV_INFO), i, containerSize, provNameSize; - containerSize = (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR); - provNameSize = (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); + if (info->pwszContainerName) + containerSize = (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR); + else + containerSize = 0; + if (info->pwszProvName) + provNameSize = (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); + else + provNameSize = 0; size += containerSize + provNameSize; for (i = 0; i < info->cProvParam; i++) size += sizeof(CRYPT_KEY_PROV_PARAM) + info->rgProvParam[i].cbData;

1 0

Jonathan Ernst : oleview: Updated French translation.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: c41a9784bf3e57bbc6dec0f1c8016e4d814fb932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c41a9784bf3e57bbc6dec0f1c… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Wed Oct 4 21:48:12 2006 +0200 oleview: Updated French translation. --- programs/oleview/Fr.rc | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 93 insertions(+), 0 deletions(-) diff --git a/programs/oleview/Fr.rc b/programs/oleview/Fr.rc index cef6e45..09aa3d2 100644 --- a/programs/oleview/Fr.rc +++ b/programs/oleview/Fr.rc @@ -71,6 +71,22 @@ IDM_MENU MENU } } +IDM_TYPELIB MENU +{ + POPUP "&Fichier" + { + MENUITEM "Enregistrer &sous", IDM_SAVEAS + MENUITEM "&Fermer", IDM_CLOSE + } + POPUP "&Affichage" + { + MENUITEM "&Grouper par type", IDM_GROUP + MENUITEM SEPARATOR + MENUITEM "Barre d'&outils", IDM_TOOLBAR + MENUITEM "&Barre d'état", IDM_STATUSBAR,CHECKED + } +} + STRINGTABLE { IDS_APPNAME "OleView" @@ -78,6 +94,8 @@ STRINGTABLE IDS_READY "Prêt" IDS_ABOUT "OleView - Visionneur d'objets OLE/COM" IDS_ABOUTVER "version 1.0" + IDS_TYPELIBTITLE "Visionneur d'ITypeLib" + IDS_OPEN "Ouvrir" IDM_BIND, "Lie à un fichier à l'aide d'un File Moniker" IDM_TYPELIB, "Ouvre un fichier TypeLib et afficher son contenu" @@ -100,6 +118,10 @@ STRINGTABLE IDM_REFRESH, "Actualise toutes les listes" IDM_ABOUT, "Affiche les informations sur le programme ; le numéro de version et la licence" + IDM_SAVEAS, "Enregistrer en tant que fichier .IDL ou .H" + IDM_CLOSE, "Fermer la fenêtre" + IDM_GROUP, "Grouper par typeinfos" + IDS_TREE_OC, "ObjectClasses" IDS_TREE_GBCC, "Groupés par catégorie de composants" IDS_TREE_O1O, "Objets OLE 1.0" @@ -116,4 +138,75 @@ STRINGTABLE IDS_CGCOFAIL, "CoGetClassObject a échoué." IDS_ERROR_UNKN, "Erreur inconnue" + IDS_TRUE, "True" + IDS_FALSE, "Faux" + IDS_BYTES, "octets" + + IDS_ERROR_LOADTYPELIB, "Échec de LoadTypeLib( %s ) ($%x)" + IDS_INHERITINTERFACES, "Interfaces héritées" +} + +DLG_CREATEINSTON DIALOG DISCARDABLE 0, 0, 250, 41 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Se connecter à une autre machine" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Nom de la &machine :", IDIGNORE, 5, 6, 190, 8 + EDITTEXT IDC_MACHINE, 5, 16, 190, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + DEFPUSHBUTTON "&OK", IDOK, 200, 5, 45, 14 + PUSHBUTTON "&Annuler", IDCANCEL, 200, 22, 45, 14 +} + +DLG_SYSCONF DIALOG DISCARDABLE 0, 0, 170, 100 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Configuration système" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Paramètres système", IDIGNORE, 5, 6, 160, 8 + CHECKBOX "&Activer le COM distribué", IDC_ENABLEDCOM, 5, 20, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + CHECKBOX "Activer les connexions à &distance (seulement Win95)", IDC_ENABLEREMOTE, 5, 35, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + LTEXT "Ces paramètres ne font que modifier les valeurs du registre.\nIls n'ont pas d'effet sur les performances de Wine.", IDIGNORE, 5, 50, 160, 40 + DEFPUSHBUTTON "&OK", IDOK, 70, 80, 45, 14 + PUSHBUTTON "&Annuler", IDCANCEL, 120, 80, 45, 14 +} + +DLG_DEFAULT_IV DIALOG DISCARDABLE 0, 0, 280, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Visionneur d'interface par défaut" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Interface", IDIGNORE, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "IID:", IDIGNORE, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Fermer", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&Afficher les informations de type", IDC_VIEWTYPEINFO, 6, 31, 70, 14, WS_DISABLED +} + +DLG_IPERSIST_IV DIALOG DISCARDABLE 0, 0, 280, 29 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "IPersist Interface Viewer" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Nom de la classe :", IDIGNORE, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", IDIGNORE, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Fermer", IDCANCEL, 230, 6, 45, 14 +} + +DLG_IPERSISTSTREAM_IV DIALOG DISCARDABLE 0, 0, 280, 68 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Visionneur d'interface IPersistStream" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Nom de la classe :", IDIGNORE, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", IDIGNORE, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Fermer", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&IsDirty", IDC_ISDIRTY_BUTTON, 6, 31, 50, 14 + LTEXT "???", IDC_ISDIRTY, 60, 34, 145, 8 + PUSHBUTTON "&GetSizeMax", IDC_GETSIZEMAX_BUTTON, 6, 49, 50, 14 + LTEXT "???", IDC_GETSIZEMAX, 60, 52, 145, 8 }

1 0

Jonathan Ernst : regedit: Updated French translation.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: ea2dd593ed42dd4bb09672952aedc90681913d32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea2dd593ed42dd4bb09672952… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Wed Oct 4 21:47:35 2006 +0200 regedit: Updated French translation. --- programs/regedit/Fr.rc | 64 +++++++++++++++++++++++++++++------------------- 1 files changed, 38 insertions(+), 26 deletions(-) diff --git a/programs/regedit/Fr.rc b/programs/regedit/Fr.rc index 81d1d6d..146a123 100644 --- a/programs/regedit/Fr.rc +++ b/programs/regedit/Fr.rc @@ -22,6 +22,22 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +/* + * Menu + */ + +IDC_REGEDIT MENU DISCARDABLE +BEGIN + POPUP "&Fichier" + BEGIN + MENUITEM "&Quitter", ID_REGISTRY_EXIT + END + POPUP "Aid&e" + BEGIN + MENUITEM "� &propos", ID_HELP_ABOUT + END +END + IDR_REGEDIT_MENU MENU DISCARDABLE BEGIN POPUP "&Registres" @@ -78,22 +94,6 @@ BEGIN END END -/* - * Menu - */ - -IDC_REGEDIT MENU DISCARDABLE -BEGIN - POPUP "&Fichier" - BEGIN - MENUITEM "&Quitter", ID_REGISTRY_EXIT - END - POPUP "Aid&e" - BEGIN - MENUITEM "� &propos", ID_HELP_ABOUT - END -END - IDR_POPUP_MENUS MENU DISCARDABLE BEGIN POPUP "" @@ -121,10 +121,10 @@ BEGIN MENUITEM "&Copier le nom de la cl�", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Rechercher\tCtrl+F", ID_EDIT_FIND, GRAYED - MENUITEM "Rechercher le s&uivant\tF3", ID_EDIT_FINDNEXT, GRAYED END END + /* * Dialog */ @@ -141,6 +141,17 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,195,6,30,11,WS_GROUP END +IDD_EXPORT_TEMPLATE DIALOG DISCARDABLE 50, 50, 278, 54 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | + WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "&Exporter le registre", IDC_EXPORT_BASE, 6, 6, 266, 42, WS_GROUP + AUTORADIOBUTTON "&Tout", IDC_EXPORT_ALL, 12, 15, 244, 12 + AUTORADIOBUTTON "&S�lectionner une branche�:", IDC_EXPORT_SELECTED, 12, 30, 70, 12 + EDITTEXT IDC_EXPORT_PATH, 82, 30, 184, 12 +END + IDD_FIND DIALOG DISCARDABLE 22, 17, 210, 85 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Recherche" @@ -148,7 +159,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Rechercher�:",IDC_STATIC,5,7,119,8 EDITTEXT IDC_VALUE_NAME,40,5,125,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Regarder dans:",IDC_STATIC,5, 22, 119, 8 + LTEXT "Regarder dans�:",IDC_STATIC,5, 22, 119, 8 CHECKBOX "Cl�s", IDC_FIND_KEYS, 5, 34, 90, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX CHECKBOX "Valeurs", IDC_FIND_VALUES, 5, 46, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX CHECKBOX "Donn�es", IDC_FIND_CONTENT, 5, 58, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX @@ -159,10 +170,10 @@ END IDD_ADDFAVORITE DIALOG DISCARDABLE 22, 17, 210, 55 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Ajouter aux Favoris" +CAPTION "Ajouter aux signets" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Nom du Favori:",IDC_STATIC,5,5,119,8 + LTEXT "Nom du signet�:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,140,40,30,11,WS_GROUP PUSHBUTTON "Annuler",IDCANCEL,175,40,30,11, WS_GROUP @@ -170,10 +181,10 @@ END IDD_DELFAVORITE DIALOG DISCARDABLE 22, 17, 210, 90 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Supprimer les Favoris" +CAPTION "Supprimer les signets" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "S�lectionnez un ou plusieurs Favoris:",IDC_STATIC,5,5,119,8 + LTEXT "S�lectionnez un ou plusieurs signets�:",IDC_STATIC,5,5,119,8 LISTBOX IDC_NAME_LIST,5,15,200,52, WS_BORDER | WS_TABSTOP | LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL DEFPUSHBUTTON "OK",IDOK,140,73,30,11,WS_GROUP PUSHBUTTON "Annuler",IDCANCEL,175,73,30,11, WS_GROUP @@ -184,9 +195,9 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SY CAPTION "Modification de la c&ha�ne" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Nom de la valeur:",IDC_STATIC,5,5,119,8 + LTEXT "Nom de la valeur�:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | WS_DISABLED - LTEXT "Donn�es de la valeur:",IDC_STATIC,5,30,119,8 + LTEXT "Donn�es de la valeur�:",IDC_STATIC,5,30,119,8 EDITTEXT IDC_VALUE_DATA,5,40,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,140,60,30,11,WS_GROUP PUSHBUTTON "Annuler",IDCANCEL,175,60,30,11,WS_GROUP @@ -271,8 +282,8 @@ END STRINGTABLE DISCARDABLE BEGIN ID_REGISTRY_EXIT "Quitte l'�diteur de registres" - ID_FAVORITES_ADDTOFAVORITES "Ajoute des cl�s � la liste des Favoris" - ID_FAVORITES_REMOVEFAVORITE "Retire des cl�s de la liste des Favoris" + ID_FAVORITES_ADDTOFAVORITES "Ajoute des cl�s � la liste des signets" + ID_FAVORITES_REMOVEFAVORITE "Retire des cl�s de la liste des signets" ID_VIEW_STATUSBAR "Montre ou cache la barre d'�tat" ID_VIEW_SPLIT "Change la position de la s�paration entre les deux panneaux" ID_VIEW_REFRESH "Rafra�chit la fen�tre" @@ -312,6 +323,7 @@ BEGIN IDS_REGISTRY_VALUE_CANT_DISPLAY "(impossible d'afficher la valeur)" IDS_REGISTRY_UNKNOWN_TYPE "(%d inconnu)" END + /*****************************************************************/ /*

1 0