September 2006 - Wine-Commits

Andrew Talbot : dinput: Cast-qual warnings fix.
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: 78cdd5460c6e7eb0c41eb08859fae61e5d6d3128 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=78cdd5460c6e7eb0c41eb08… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Sep 8 16:35:27 2006 +0100 dinput: Cast-qual warnings fix. --- dlls/dinput/device.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 5c0234f..13141c2 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -219,9 +219,9 @@ void _dump_DIDATAFORMAT(const DIDATAFORM /* Conversion between internal data buffer and external data buffer */ void fill_DataFormat(void *out, const void *in, DataFormat *df) { int i; - char *in_c = (char *) in; + const char *in_c = in; char *out_c = (char *) out; - + if (df->dt == NULL) { /* This means that the app uses Wine's internal data format */ memcpy(out, in, df->internal_format_size); @@ -231,22 +231,22 @@ void fill_DataFormat(void *out, const vo switch (df->dt[i].size) { case 1: TRACE("Copying (c) to %d from %d (value %d)\n", - df->dt[i].offset_out, df->dt[i].offset_in, *((char *) (in_c + df->dt[i].offset_in))); - *((char *) (out_c + df->dt[i].offset_out)) = *((char *) (in_c + df->dt[i].offset_in)); + df->dt[i].offset_out, df->dt[i].offset_in, *(in_c + df->dt[i].offset_in)); + *(out_c + df->dt[i].offset_out) = *(in_c + df->dt[i].offset_in); break; - + case 2: TRACE("Copying (s) to %d from %d (value %d)\n", - df->dt[i].offset_out, df->dt[i].offset_in, *((short *) (in_c + df->dt[i].offset_in))); - *((short *) (out_c + df->dt[i].offset_out)) = *((short *) (in_c + df->dt[i].offset_in)); + df->dt[i].offset_out, df->dt[i].offset_in, *((const short *)(in_c + df->dt[i].offset_in))); + *((short *)(out_c + df->dt[i].offset_out)) = *((const short *)(in_c + df->dt[i].offset_in)); break; - + case 4: TRACE("Copying (i) to %d from %d (value %d)\n", - df->dt[i].offset_out, df->dt[i].offset_in, *((int *) (in_c + df->dt[i].offset_in))); - *((int *) (out_c + df->dt[i].offset_out)) = *((int *) (in_c + df->dt[i].offset_in)); + df->dt[i].offset_out, df->dt[i].offset_in, *((const int *)(in_c + df->dt[i].offset_in))); + *((int *)(out_c + df->dt[i].offset_out)) = *((const int *)(in_c + df->dt[i].offset_in)); break; - + default: memcpy((out_c + df->dt[i].offset_out), (in_c + df->dt[i].offset_in), df->dt[i].size); break; @@ -256,7 +256,7 @@ void fill_DataFormat(void *out, const vo case 1: TRACE("Copying (c) to %d default value %d\n", df->dt[i].offset_out, df->dt[i].value); - *((char *) (out_c + df->dt[i].offset_out)) = (char) df->dt[i].value; + *(out_c + df->dt[i].offset_out) = (char) df->dt[i].value; break; case 2:

1 0

Andrew Talbot : ddraw: Cast-qual warning fix.
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: 8968f8d55d57a88f2e925d52baf2adced3c3204d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8968f8d55d57a88f2e925d5… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Sep 8 15:31:35 2006 +0100 ddraw: Cast-qual warning fix. --- dlls/ddraw/texture.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/texture.c b/dlls/ddraw/texture.c index c3a2717..a29b26e 100644 --- a/dlls/ddraw/texture.c +++ b/dlls/ddraw/texture.c @@ -262,13 +262,13 @@ static IDirectDrawSurfaceImpl * get_sub_mimaplevel(IDirectDrawSurfaceImpl *tex_ptr) { /* Now go down the mipmap chain to the next surface */ - static const DDSCAPS2 mipmap_caps = { DDSCAPS_MIPMAP | DDSCAPS_TEXTURE, 0, 0, 0 }; + static DDSCAPS2 mipmap_caps = { DDSCAPS_MIPMAP | DDSCAPS_TEXTURE, 0, 0, 0 }; LPDIRECTDRAWSURFACE7 next_level; IDirectDrawSurfaceImpl *surf_ptr; HRESULT hr; hr = IDirectDrawSurface7_GetAttachedSurface(ICOM_INTERFACE(tex_ptr, IDirectDrawSurface7), - (DDSCAPS2 *) &mipmap_caps, &next_level); + &mipmap_caps, &next_level); if (FAILED(hr)) return NULL; surf_ptr = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, next_level);

1 0

Jonathan Ernst : Assorted French translation improvements.
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: 0ebd271fe0919a60b8ff7cfc7467ce6dc41e298c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0ebd271fe0919a60b8ff7cf… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Sat Sep 9 16:41:20 2006 +0200 Assorted French translation improvements. --- dlls/msvfw32/msvfw32_Fr.rc | 10 +++++---- programs/clock/Fr.rc | 2 +- programs/cmdlgtst/Fr.rc | 2 +- programs/notepad/Fr.rc | 20 +++++++++---------- programs/progman/Fr.rc | 47 ++++++++++++++++++++++---------------------- programs/regedit/Fr.rc | 4 ++-- programs/taskmgr/Fr.rc | 4 ++-- programs/uninstaller/Fr.rc | 14 +++++++------ programs/winefile/Fr.rc | 22 ++++++++++----------- programs/winemine/Fr.rc | 7 ++++--- programs/winhelp/Fr.rc | 4 ++-- 11 files changed, 69 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0ebd271fe0919a60b8f…

1 0

Jonathan Ernst : winecfg: French translation update.
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: a0f9c32216bbd42a980f77493305aa10d85bf655 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a0f9c32216bbd42a980f774… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Sat Sep 9 16:40:53 2006 +0200 winecfg: French translation update. --- programs/winecfg/Fr.rc | 76 ++++++++++++++++++++++++------------------------ 1 files changed, 38 insertions(+), 38 deletions(-) diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index d3dfefe..acbc930 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -37,7 +37,7 @@ BEGIN LTEXT PACKAGE_STRING,IDC_STATIC,119,17,120,8 CONTROL IDB_WINE,IDC_STATIC,"Static",SS_BITMAP ,15,17,157,111 LTEXT "http://www.winehq.org/",IDC_STATIC,119,31,106,8 - LTEXT "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.", + LTEXT "Cette biblioth�que est un logiciel libre�; vous pouvez la redistribuer et/ou la modifier conform�ment aux dispositions de la Licence Publique G�n�rale GNU, telle que publi�e par la Free Software Foundation�; version 2.1 de la licence, ou encore (� votre choix) toute version ult�rieure." IDC_STATIC,119,44,124,72 END @@ -206,7 +206,7 @@ BEGIN IDS_TAB_GRAPHICS "Affichage" IDS_TAB_DESKTOP_INTEGRATION "Int�gration avec le bureau" IDS_TAB_AUDIO "Audio" - IDS_TAB_ABOUT "A propos" + IDS_TAB_ABOUT "� propos" IDS_WINECFG_TITLE "Configuration de Wine" IDS_WINECFG_TITLE_APP "Configuration de Wine pour %s" IDS_THEMEFILE "Fichiers de th�mes" @@ -225,56 +225,56 @@ BEGIN IDS_DLL_NATIVE_BUILTIN "native, inclue" IDS_DLL_BUILTIN_NATIVE "inclue, native" IDS_DLL_DISABLED "d�sactiv�e" - IDS_DEFAULT_SETTINGS "Default Settings" - IDS_EXECUTABLE_FILTER "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0" - IDS_USE_GLOBAL_SETTINGS "Use global settings" - IDS_SELECT_EXECUTABLE "Select an executable file" + IDS_DEFAULT_SETTINGS "Param�tres par d�faut" + IDS_EXECUTABLE_FILTER "Programmes de Wine (*.exe,*.exe.so)\0*.exe;*.exe.so\0" + IDS_USE_GLOBAL_SETTINGS "Utiliser les param�tres globaux" + IDS_SELECT_EXECUTABLE "S�lectionnez un fichier ex�cutable" END STRINGTABLE DISCARDABLE BEGIN IDS_SHADER_MODE_HARDWARE "Mat�riel" IDS_SHADER_MODE_NONE "Aucun" - IDS_SHADER_MODE_EMULATION "Emulation" + IDS_SHADER_MODE_EMULATION "�mulation" END STRINGTABLE DISCARDABLE BEGIN - IDS_DRIVE_UNKNOWN "Autodetect" - IDS_DRIVE_FIXED "Local hard disk" - IDS_DRIVE_REMOTE "Network share" - IDS_DRIVE_REMOVABLE "Floppy disk" + IDS_DRIVE_UNKNOWN "D�tection auto." + IDS_DRIVE_FIXED "Disque dur local" + IDS_DRIVE_REMOTE "Partage r�seau" + IDS_DRIVE_REMOVABLE "Lecteur de disquette" IDS_DRIVE_CDROM "CD-ROM" - IDS_DRIVE_LETTERS_EXCEEDED "You cannot add any more drives.\n\nEach drive must have a letter, from A to Z, so you cannot have more than 26" - IDS_SYSTEM_DRIVE_LABEL "System drive" - IDS_CONFIRM_DELETE_C "Are you sure you want to delete drive C?\n\nMost Windows applications expect drive C to exist, and will die messily if it doesn't. If you proceed remember to recreate it!" - IDS_COL_DRIVELETTER "Letter" - IDS_COL_DRIVEMAPPING "Drive Mapping" - IDS_NO_DRIVE_C "You don't have a drive C. This is not so great.\n\nRemember to click 'Add' in the Drives tab to create one!\n" + IDS_DRIVE_LETTERS_EXCEEDED "Vous ne pouvez pas ajouter plus de lecteurs.\n\nUne lettre de A � Z doit �tre assign�e � chaque lecteur ; vous ne pouvez donc pas en avoir plus de 26." + IDS_SYSTEM_DRIVE_LABEL "Lecteur syst�me" + IDS_CONFIRM_DELETE_C "�tes-vous s�r de vouloir supprimer le lecteur C�?\n\nLa plupart des applications Windows comptent sur l'existence de ce lecteur et ne fonctionneront pas s'il n'existe pas. Si vous continuez, n'oubliez pas de le recr�er�!" + IDS_COL_DRIVELETTER "Lettre" + IDS_COL_DRIVEMAPPING "Assignation" + IDS_NO_DRIVE_C "Vous ne disposez pas de lecteur C ce qui peut poser des probl�mes.\n\nN'oubliez pas d'en recr�er un en cliquant sur le bouton ��Ajouter�� dans l'onglet ��Lecteurs��!\n" END STRINGTABLE DISCARDABLE BEGIN - IDS_ACCEL_FULL "Full" + IDS_ACCEL_FULL "Compl�te" IDS_ACCEL_STANDARD "Standard" - IDS_ACCEL_BASIC "Basic" - IDS_ACCEL_EMULATION "Emulation" - IDS_DRIVER_ALSA "ALSA Driver" - IDS_DRIVER_ARTS "aRts Driver" - IDS_DRIVER_ESOUND "EsounD Driver" - IDS_DRIVER_OSS "OSS Driver" - IDS_DRIVER_JACK "JACK Driver" - IDS_DRIVER_NAS "NAS Driver" - IDS_DRIVER_AUDIOIO "Audio IO (Solaris) Driver" - IDS_DRIVER_COREAUDIO "CoreAudio Driver" - IDS_OPEN_DRIVER_ERROR "Couldn't open %s!" - IDS_SOUNDDRIVERS "Sound Drivers" - IDS_DEVICES_WAVEOUT "Wave Out Devices" - IDS_DEVICES_WAVEIN "Wave In Devices" - IDS_DEVICES_MIDIOUT "MIDI Out Devices" - IDS_DEVICES_MIDIIN "MIDI In Devices" - IDS_DEVICES_AUX "Aux Devices" - IDS_DEVICES_MIXER "Mixer Devices" - IDS_UNAVAILABLE_DRIVER "Found driver in registry that is not available!\n\nRemove \"%s\" from registry?" - IDS_WARNING "Warning" + IDS_ACCEL_BASIC "Basique" + IDS_ACCEL_EMULATION "�mulation" + IDS_DRIVER_ALSA "Pilote ALSA" + IDS_DRIVER_ARTS "Pilote aRts" + IDS_DRIVER_ESOUND "Pilote EsounD" + IDS_DRIVER_OSS "Pilote OSS" + IDS_DRIVER_JACK "Pilote JACK" + IDS_DRIVER_NAS "Pilote NAS" + IDS_DRIVER_AUDIOIO "Pilote Audio IO (Solaris)" + IDS_DRIVER_COREAUDIO "Pilote CoreAudio" + IDS_OPEN_DRIVER_ERROR "Impossible d'ouvrir %s�!" + IDS_SOUNDDRIVERS "Pilotes audio" + IDS_DEVICES_WAVEOUT "P�riph�riques de sortie Wave" + IDS_DEVICES_WAVEIN "P�riph�riques d'entr�e Wave" + IDS_DEVICES_MIDIOUT "P�riph�riques de sortie MIDI" + IDS_DEVICES_MIDIIN "P�riph�riques d'entr�e MIDI" + IDS_DEVICES_AUX "P�riph�riques Aux" + IDS_DEVICES_MIXER "P�riph�riques de mixage" + IDS_UNAVAILABLE_DRIVER "Un pilote non disponible a �t� trouv� dans la base de registre�!\n\nSouhaitez-vous supprimer ��%s�� de la base de registre�?" + IDS_WARNING "Attention" END

1 0

Jonathan Ernst : hhctrl: New French translation.
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: b05e6ffc1db63a71ee89b92576de8e6a26ce80e2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b05e6ffc1db63a71ee89b92… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Fri Sep 8 16:37:00 2006 +0200 hhctrl: New French translation. --- dlls/hhctrl.ocx/Fr.rc | 58 +++++++++++++++++++++++++++++++++++++++++++++ dlls/hhctrl.ocx/hhctrl.rc | 1 + 2 files changed, 59 insertions(+), 0 deletions(-) create mode 100644 dlls/hhctrl.ocx/Fr.rc diff --git a/dlls/hhctrl.ocx/Fr.rc b/dlls/hhctrl.ocx/Fr.rc new file mode 100644 index 0000000..6c97203 --- /dev/null +++ b/dlls/hhctrl.ocx/Fr.rc @@ -0,0 +1,58 @@ +/* + * HTML Help resources + * French Language Support + * + * Copyright 2006 Jonathan Ernst + * + * 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 + */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_CONTENTS "Somm&aire" + IDS_INDEX "I&ndex" + IDS_SEARCH "&Recherche" + IDS_FAVORITES "&Signets" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "Afficher" + IDTB_CONTRACT "Cacher" + IDTB_STOP "Arrêter" + IDTB_REFRESH "A&ctualiser" + IDTB_BACK "Précédent" + IDTB_HOME "Sommaire" + IDTB_SYNC "Synchroniser" + IDTB_PRINT "Imprimer" + IDTB_OPTIONS "Options" + IDTB_FORWARD "Suivant" + IDTB_NOTES "IDTB_NOTES" + IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" + IDTB_BROWSE_BACK "IDT_BROWSE_BACK" + IDTB_CONTENTS "IDTB_CONTENTS" + IDTB_INDEX "IDTB_INDEX" + IDTB_SEARCH "IDTB_SEARCH" + IDTB_HISTORY "IDTB_HISTORY" + IDTB_FAVORITES "IDTB_FAVORITES" + IDTB_JUMP1 "Jump1" + IDTB_JUMP2 "Jump2" + IDTB_CUSTOMIZE "Personnaliser" + IDTB_ZOOM "Zoom" + IDTB_TOC_NEXT "IDTB_TOC_NEXT" + IDTB_TOC_PREV "IDTB_TOC_PREV" +END diff --git a/dlls/hhctrl.ocx/hhctrl.rc b/dlls/hhctrl.ocx/hhctrl.rc index 8e4b708..ad2642c 100644 --- a/dlls/hhctrl.ocx/hhctrl.rc +++ b/dlls/hhctrl.ocx/hhctrl.rc @@ -32,6 +32,7 @@ #include "version.rc" #include "Cs.rc" #include "De.rc" #include "En.rc" +#include "Fr.rc" #include "Fi.rc" #include "Hu.rc" #include "Ko.rc"

1 0

Jonathan Ernst : winspool.drv: New French translation.
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: d101c6c8a7f80a5d9b5cadf20a43aedead334918 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d101c6c8a7f80a5d9b5cadf… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Fri Sep 8 16:36:30 2006 +0200 winspool.drv: New French translation. --- dlls/winspool.drv/Fr.rc | 39 +++++++++++++++++++++++++++++++++++++++ dlls/winspool.drv/winspool.rc | 1 + 2 files changed, 40 insertions(+), 0 deletions(-) create mode 100644 dlls/winspool.drv/Fr.rc diff --git a/dlls/winspool.drv/Fr.rc b/dlls/winspool.drv/Fr.rc new file mode 100644 index 0000000..9dae704 --- /dev/null +++ b/dlls/winspool.drv/Fr.rc @@ -0,0 +1,39 @@ +/* + * French resources for winspool + * + * Copyright 2006 Jonathan Ernst + * + * 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 + */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Imprimer dans un fichier" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Fichier de sortie :", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT EDITBOX, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Annuler", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_CAPTION "Port local" + IDS_FILE_EXISTS "Le fichier de sortie existe déjà. Cliquez sur OK pour l'écraser." + IDS_CANNOT_OPEN "Impossible de créer le fichier de sortie." +} diff --git a/dlls/winspool.drv/winspool.rc b/dlls/winspool.drv/winspool.rc index 27287f3..c665c76 100644 --- a/dlls/winspool.drv/winspool.rc +++ b/dlls/winspool.drv/winspool.rc @@ -44,6 +44,7 @@ #include "De.rc" #include "En.rc" #include "Eo.rc" #include "Fi.rc" +#include "Fr.rc" #include "It.rc" #include "Ko.rc" #include "Nl.rc"

1 0

Paul Vriens : crypt32/tests: Added tests for CryptSIPAddProvider and CryptSIPRemoveProvider.
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: d78f7736f3962a724f7922a9439a1263733e2b1c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d78f7736f3962a724f7922a… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Sep 8 16:13:59 2006 +0200 crypt32/tests: Added tests for CryptSIPAddProvider and CryptSIPRemoveProvider. --- dlls/crypt32/tests/main.c | 81 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 8b980ce..3e27170 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -25,6 +25,7 @@ #include <winbase.h> #include <winerror.h> #include <wincrypt.h> #include <winreg.h> +#include <mssip.h> #include "wine/test.h" @@ -343,6 +344,85 @@ static void test_getDefaultCryptProv(voi CryptReleaseContext(prov, 0); } +static void test_AddRemoveProvider(void) +{ + BOOL ret; + SIP_ADD_NEWPROVIDER newprov; + GUID actionid = { 0xdeadbe, 0xefde, 0xadbe, { 0xef,0xde,0xad,0xbe,0xef,0xde,0xad,0xbe }}; + static WCHAR dummydll[] = {'d','e','a','d','b','e','e','f','.','d','l','l',0 }; + static WCHAR dummyfunction[] = {'d','u','m','m','y','f','u','n','c','t','i','o','n',0 }; + + /* NULL check */ + SetLastError(0xdeadbeef); + ret = CryptSIPRemoveProvider(NULL); + ok (!ret, "Expected CryptSIPRemoveProvider to fail.\n"); + ok (GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); + + /* nonexistent provider should result in a registry error */ + SetLastError(0xdeadbeef); + ret = CryptSIPRemoveProvider(&actionid); + ok (!ret, "Expected CryptSIPRemoveProvider to fail.\n"); + ok (GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %ld.\n", GetLastError()); + + /* Everything OK, pwszIsFunctionName and pwszIsFunctionNameFmt2 are left NULL + * as allowed */ + + memset(&newprov, 0, sizeof(SIP_ADD_NEWPROVIDER)); + newprov.cbStruct = sizeof(SIP_ADD_NEWPROVIDER); + newprov.pgSubject = &actionid; + newprov.pwszDLLFileName = dummydll; + newprov.pwszGetFuncName = dummyfunction; + newprov.pwszPutFuncName = dummyfunction; + newprov.pwszCreateFuncName = dummyfunction; + newprov.pwszVerifyFuncName = dummyfunction; + newprov.pwszRemoveFuncName = dummyfunction; + SetLastError(0xdeadbeef); + ret = CryptSIPAddProvider(&newprov); + ok ( ret, "CryptSIPAddProvider should have succeeded\n"); + ok ( GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", + GetLastError()); + + /* Dummy provider will be deleted, but the function still fails because + * pwszIsFunctionName and pwszIsFunctionNameFmt2 are not present in the + * registry. + */ + SetLastError(0xdeadbeef); + ret = CryptSIPRemoveProvider(&actionid); + ok (!ret, "Expected CryptSIPRemoveProvider to fail.\n"); + ok (GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %ld.\n", GetLastError()); + + /* Everything OK */ + memset(&newprov, 0, sizeof(SIP_ADD_NEWPROVIDER)); + newprov.cbStruct = sizeof(SIP_ADD_NEWPROVIDER); + newprov.pgSubject = &actionid; + newprov.pwszDLLFileName = dummydll; + newprov.pwszGetFuncName = dummyfunction; + newprov.pwszPutFuncName = dummyfunction; + newprov.pwszCreateFuncName = dummyfunction; + newprov.pwszVerifyFuncName = dummyfunction; + newprov.pwszRemoveFuncName = dummyfunction; + newprov.pwszIsFunctionNameFmt2 = dummyfunction; + newprov.pwszIsFunctionName = dummyfunction; + SetLastError(0xdeadbeef); + ret = CryptSIPAddProvider(&newprov); + ok ( ret, "CryptSIPAddProvider should have succeeded\n"); + ok ( GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", + GetLastError()); + + /* Dummy provider should be deleted */ + SetLastError(0xdeadbeef); + ret = CryptSIPRemoveProvider(&actionid); + todo_wine + { + ok ( ret, "CryptSIPRemoveProvider should have succeeded\n"); + ok ( GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", + GetLastError()); + } +} + START_TEST(main) { hCrypt = LoadLibraryA("crypt32.dll"); @@ -354,4 +434,5 @@ START_TEST(main) test_cryptTls(); test_readTrustedPublisherDWORD(); test_getDefaultCryptProv(); + test_AddRemoveProvider(); }

1 0

Jonathan Ernst : mshtml: Updated French translation.
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: bef65da0c5fe94fac005f00eb07b7d1ac9b3bc7e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bef65da0c5fe94fac005f00… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Fri Sep 8 16:35:58 2006 +0200 mshtml: Updated French translation. --- dlls/mshtml/Fr.rc | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/Fr.rc b/dlls/mshtml/Fr.rc index 3911398..43c51e0 100644 --- a/dlls/mshtml/Fr.rc +++ b/dlls/mshtml/Fr.rc @@ -2,7 +2,7 @@ * MsHTML resources * French Language Support * - * Copyright 2005 Jonathan Ernst + * Copyright 2005-2006 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +22,27 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ + IDS_HTMLDISABLED "Le rendu HTML est actuellement d�sactiv�." + IDS_HTMLDOCUMENT "Document HTML" + IDS_DOWNLOADING "T�l�chargement..." + IDS_INSTALLING "Installation..." +} + +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Programme d'installation de Gecko de Wine" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Cette application essaie d'afficher une page HTML. Wine requiert la pr�sence du moteur de rendu Gecko de Mozilla" \ + "pour afficher cette page. Cliquez sur Installer si vous souhaitez que Wine " \ + "t�l�charge et installe automatiquement Gecko.", ID_DWL_STATUS, 10, 10, 240, 30, SS_CENTER + CONTROL "Progression", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + PUSHBUTTON "Annuler", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Installer", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP +} + /* FIXME: This should be in shdoclc.dll */ IDR_BROWSE_CONTEXT_MENU MENU

1 0

Paul Vriens : crypt32: Add documentation.
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: b8d9201fc3ea4e5f8ff2fecefb41e9d60fc8c6d1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b8d9201fc3ea4e5f8ff2fec… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Sep 8 15:54:06 2006 +0200 crypt32: Add documentation. --- dlls/crypt32/main.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 3c9c050..3296649 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -93,6 +93,22 @@ HLRUCACHE WINAPI I_CryptFreeLruCache(HLR return h; } +/*********************************************************************** + * CryptSIPRemoveProvider (CRYPT32.@) + * + * Remove a SIP provider and its functions from the registry. + * + * PARAMS + * pgProv [I] Pointer to a GUID for this SIP provider + * + * RETURNS + * Success: TRUE. + * Failure: FALSE. (Look at GetLastError()). + * + * NOTES + * Registry errors are always reported via SetLastError(). Every registry + * deletion will be tried. + */ BOOL WINAPI CryptSIPRemoveProvider(GUID *pgProv) { FIXME("stub!\n");

1 0

Paul Vriens : crypt32: Implemented CryptSIPRemoveProvider.
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: f7ea4629165eab67d8c19175fe9f07f2c76f49d5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f7ea4629165eab67d8c1917… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Sep 8 15:54:25 2006 +0200 crypt32: Implemented CryptSIPRemoveProvider. --- dlls/crypt32/main.c | 125 +++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 90 insertions(+), 35 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 3296649..405990a 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -36,6 +36,31 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); static HCRYPTPROV hDefProv; +static const WCHAR szOID[] = { + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'C','r','y','p','t','o','g','r','a','p','h','y','\\', + 'O','I','D','\\', + 'E','n','c','o','d','i','n','g','T','y','p','e',' ','0','\\', + 'C','r','y','p','t','S','I','P','D','l','l', 0 }; + +static const WCHAR szBackSlash[] = { '\\', 0 }; + +static const WCHAR szPutSigned[] = { + 'P','u','t','S','i','g','n','e','d','D','a','t','a','M','s','g',0}; +static const WCHAR szGetSigned[] = { + 'G','e','t','S','i','g','n','e','d','D','a','t','a','M','s','g',0}; +static const WCHAR szRemoveSigned[] = { + 'R','e','m','o','v','e','S','i','g','n','e','d','D','a','t','a','M','s','g',0}; +static const WCHAR szCreate[] = { + 'C','r','e','a','t','e','I','n','d','i','r','e','c','t','D','a','t','a',0}; +static const WCHAR szVerify[] = { + 'V','e','r','i','f','y','I','n','d','i','r','e','c','t','D','a','t','a',0}; +static const WCHAR szIsMyFile[] = { + 'I','s','M','y','F','i','l','e','T','y','p','e', 0 }; +static const WCHAR szIsMyFile2[] = { + 'I','s','M','y','F','i','l','e','T','y','p','e','2', 0}; + BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved) { switch (fdwReason) @@ -93,6 +118,40 @@ HLRUCACHE WINAPI I_CryptFreeLruCache(HLR return h; } +/* convert a guid to a wide character string */ +static void CRYPT_guid2wstr( LPGUID guid, LPWSTR wstr ) +{ + char str[40]; + + sprintf(str, "{%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); + MultiByteToWideChar( CP_ACP, 0, str, -1, wstr, 40 ); +} + +/*********************************************************************** + * CRYPT_SIPDeleteFunction + * + * Helper function for CryptSIPRemoveProvider + */ +static LONG CRYPT_SIPDeleteFunction( LPGUID guid, LPCWSTR szKey ) +{ + WCHAR szFullKey[ 0x100 ]; + LONG r = ERROR_SUCCESS; + + /* max length of szFullKey depends on our code only, so we won't overrun */ + lstrcpyW( szFullKey, szOID ); + lstrcatW( szFullKey, szKey ); + lstrcatW( szFullKey, szBackSlash ); + CRYPT_guid2wstr( guid, &szFullKey[ lstrlenW( szFullKey ) ] ); + lstrcatW( szFullKey, szBackSlash ); + + r = RegDeleteKeyW(HKEY_LOCAL_MACHINE, szFullKey); + + return r; +} + /*********************************************************************** * CryptSIPRemoveProvider (CRYPT32.@) * @@ -111,20 +170,39 @@ HLRUCACHE WINAPI I_CryptFreeLruCache(HLR */ BOOL WINAPI CryptSIPRemoveProvider(GUID *pgProv) { - FIXME("stub!\n"); - return FALSE; -} + LONG r = ERROR_SUCCESS; + LONG remove_error = ERROR_SUCCESS; -/* convert a guid to a wide character string */ -static void CRYPT_guid2wstr( LPGUID guid, LPWSTR wstr ) -{ - char str[40]; + TRACE("%s\n", debugstr_guid(pgProv)); - sprintf(str, "{%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); - MultiByteToWideChar( CP_ACP, 0, str, -1, wstr, 40 ); + if (!pgProv) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + +#define CRYPT_SIPREMOVEPROV( key ) \ + r = CRYPT_SIPDeleteFunction( pgProv, key); \ + if (r != ERROR_SUCCESS) remove_error = r + + CRYPT_SIPREMOVEPROV( szPutSigned); + CRYPT_SIPREMOVEPROV( szGetSigned); + CRYPT_SIPREMOVEPROV( szRemoveSigned); + CRYPT_SIPREMOVEPROV( szCreate); + CRYPT_SIPREMOVEPROV( szVerify); + CRYPT_SIPREMOVEPROV( szIsMyFile); + CRYPT_SIPREMOVEPROV( szIsMyFile2); + +#undef CRYPT_SIPREMOVEPROV + + if (remove_error != ERROR_SUCCESS) + { + SetLastError(remove_error); + return FALSE; + } + + return TRUE; } /* @@ -136,14 +214,6 @@ static void CRYPT_guid2wstr( LPGUID guid static LONG CRYPT_SIPWriteFunction( LPGUID guid, LPCWSTR szKey, LPCWSTR szDll, LPCWSTR szFunction ) { - static const WCHAR szOID[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'C','r','y','p','t','o','g','r','a','p','h','y','\\', - 'O','I','D','\\', - 'E','n','c','o','d','i','n','g','T','y','p','e',' ','0','\\', - 'C','r','y','p','t','S','I','P','D','l','l', 0 }; - static const WCHAR szBackSlash[] = { '\\', 0 }; static const WCHAR szDllName[] = { 'D','l','l',0 }; static const WCHAR szFuncName[] = { 'F','u','n','c','N','a','m','e',0 }; WCHAR szFullKey[ 0x100 ]; @@ -199,21 +269,6 @@ error_close_key: */ BOOL WINAPI CryptSIPAddProvider(SIP_ADD_NEWPROVIDER *psNewProv) { - static const WCHAR szCreate[] = { - 'C','r','e','a','t','e', - 'I','n','d','i','r','e','c','t','D','a','t','a',0}; - static const WCHAR szGetSigned[] = { - 'G','e','t','S','i','g','n','e','d','D','a','t','a','M','s','g',0}; - static const WCHAR szIsMyFile[] = { - 'I','s','M','y','F','i','l','e','T','y','p','e', 0 }; - static const WCHAR szPutSigned[] = { - 'P','u','t','S','i','g','n','e','d','D','a','t','a','M','s','g',0}; - static const WCHAR szRemoveSigned[] = { - 'R','e','m','o','v','e', - 'S','i','g','n','e','d','D','a','t','a','M','s','g',0}; - static const WCHAR szVerify[] = { - 'V','e','r','i','f','y', - 'I','n','d','i','r','e','c','t','D','a','t','a',0}; LONG r = ERROR_SUCCESS; TRACE("%p\n", psNewProv);

1 0