June 2009 - Wine-commits - list.winehq.org

Vincent Povirk : windowscodecs: Add stub implementation of IWICImagingFactory.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: b01c652d4b3ce0e3bea34223eb19f3f8fa36d5d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b01c652d4b3ce0e3bea34223e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 1 13:32:41 2009 -0500 windowscodecs: Add stub implementation of IWICImagingFactory. --- dlls/windowscodecs/Makefile.in | 7 +- dlls/windowscodecs/clsfactory.c | 170 ++++++++++++++++ dlls/windowscodecs/imgfactory.c | 339 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 333 +++++++++++++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 24 +++ dlls/windowscodecs/windowscodecs.spec | 4 +- tools/wine.inf.in | 1 + 7 files changed, 875 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b01c652d4b3ce0e3bea34…

1 0

Vincent Povirk : windowscodecs: Add a stub decoder for the BMP format.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 429c784cd719fe487abf7c391a3c74e2472cefdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=429c784cd719fe487abf7c391… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 10 15:40:27 2009 -0500 windowscodecs: Add a stub decoder for the BMP format. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/bmpdecode.c | 202 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/regsvr.c | 6 + dlls/windowscodecs/wincodecs_private.h | 1 + 5 files changed, 211 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 05d5521..9cd6ee1 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -6,6 +6,7 @@ MODULE = windowscodecs.dll IMPORTS = uuid ole32 advapi32 kernel32 C_SRCS = \ + bmpdecode.c \ clsfactory.c \ imgfactory.c \ main.c \ diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c new file mode 100644 index 0000000..2ab8034 --- /dev/null +++ b/dlls/windowscodecs/bmpdecode.c @@ -0,0 +1,202 @@ +/* + * Copyright 2009 Vincent Povirk for CodeWeavers + * + * 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "objbase.h" +#include "wincodec.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +typedef struct { + const IWICBitmapDecoderVtbl *lpVtbl; + LONG ref; +} BmpDecoder; + +HRESULT WINAPI BmpDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, + void **ppv) +{ + BmpDecoder *This = (BmpDecoder*)iface; + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapDecoder, iid)) + { + *ppv = This; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI BmpDecoder_AddRef(IWICBitmapDecoder *iface) +{ + BmpDecoder *This = (BmpDecoder*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI BmpDecoder_Release(IWICBitmapDecoder *iface) +{ + BmpDecoder *This = (BmpDecoder*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI BmpDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *pIStream, + DWORD *pdwCapability) +{ + FIXME("(%p,%p,%p): stub\n", iface, pIStream, pdwCapability); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream, + WICDecodeOptions cacheOptions) +{ + FIXME("(%p,%p,%x): stub\n", iface, pIStream, cacheOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpDecoder_GetContainerFormat(IWICBitmapDecoder *iface, + GUID *pguidContainerFormat) +{ + FIXME("(%p,%p): stub\n", iface, pguidContainerFormat); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, + IWICBitmapDecoderInfo **ppIDecoderInfo) +{ + FIXME("(%p,%p): stub\n", iface, ppIDecoderInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpDecoder_CopyPalette(IWICBitmapDecoder *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p): stub\n", iface, pIPalette); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, + IWICMetadataQueryReader **ppIMetadataQueryReader) +{ + FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpDecoder_GetPreview(IWICBitmapDecoder *iface, + IWICBitmapSource **ppIBitmapSource) +{ + FIXME("(%p,%p): stub\n", iface, ppIBitmapSource); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpDecoder_GetColorContexts(IWICBitmapDecoder *iface, + UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpDecoder_GetThumbnail(IWICBitmapDecoder *iface, + IWICBitmapSource **ppIThumbnail) +{ + FIXME("(%p,%p): stub\n", iface, ppIThumbnail); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpDecoder_GetFrameCount(IWICBitmapDecoder *iface, + UINT *pCount) +{ + FIXME("(%p,%p): stub\n", iface, pCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpDecoder_GetFrame(IWICBitmapDecoder *iface, + UINT index, IWICBitmapFrameDecode **ppIBitmapFrame) +{ + FIXME("(%p,%u,%p): stub\n", iface, index, ppIBitmapFrame); + return E_NOTIMPL; +} + +static const IWICBitmapDecoderVtbl BmpDecoder_Vtbl = { + BmpDecoder_QueryInterface, + BmpDecoder_AddRef, + BmpDecoder_Release, + BmpDecoder_QueryCapability, + BmpDecoder_Initialize, + BmpDecoder_GetContainerFormat, + BmpDecoder_GetDecoderInfo, + BmpDecoder_CopyPalette, + BmpDecoder_GetMetadataQueryReader, + BmpDecoder_GetPreview, + BmpDecoder_GetColorContexts, + BmpDecoder_GetThumbnail, + BmpDecoder_GetFrameCount, + BmpDecoder_GetFrame +}; + +HRESULT BmpDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) +{ + BmpDecoder *This; + HRESULT ret; + + TRACE("(%p,%s,%p)\n", pUnkOuter, debugstr_guid(iid), ppv); + + *ppv = NULL; + + if (pUnkOuter) return CLASS_E_NOAGGREGATION; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(BmpDecoder)); + if (!This) return E_OUTOFMEMORY; + + This->lpVtbl = &BmpDecoder_Vtbl; + This->ref = 1; + + ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); + IUnknown_Release((IUnknown*)This); + + return ret; +} diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index b74746c..37e30e5 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -43,6 +43,7 @@ typedef struct { static classinfo wic_classes[] = { {&CLSID_WICImagingFactory, ImagingFactory_CreateInstance}, + {&CLSID_WICBmpDecoder, BmpDecoder_CreateInstance}, {0}}; typedef struct { diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index fef2979..ddb781a 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -309,6 +309,12 @@ static struct regsvr_coclass const coclass_list[] = { "windowscodecs.dll", "Apartment" }, + { &CLSID_WICBmpDecoder, + "WIC BMP Decoder", + NULL, + "windowscodecs.dll", + "Apartment" + }, { NULL } /* list terminator */ }; diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index b453920..0070bfc 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -20,5 +20,6 @@ #define WINCODECS_PRIVATE_H extern HRESULT ImagingFactory_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); +extern HRESULT BmpDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); #endif /* WINCODECS_PRIVATE_H */

1 0

Eric Pouech : winedump: Added reference for MSVC 8.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: a9c7612d4c51beeb19bdfd3eca8cde630f13b6f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c7612d4c51beeb19bdfd3ec… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jun 28 14:04:17 2009 +0200 winedump: Added reference for MSVC 8. --- tools/winedump/pdb.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 4217113..24ca4e4 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -456,6 +456,7 @@ static void pdb_dump_types(struct pdb_reader* reader) case 19951122: case 19961031: /* VC 5.0 / 6.0 */ case 19990903: /* VC 7.0 */ + case 20040203: /* VC 8.0 */ break; default: printf("-Unknown type info version %d\n", types->version);

1 0

Frédéric Delanoy : wldap32: Fixed French translation.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 1f983c51dee234a6e9121ccdd92e00651c78734d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f983c51dee234a6e9121ccdd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jun 29 00:20:32 2009 +0200 wldap32: Fixed French translation. --- dlls/wldap32/wldap32_Fr.rc | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wldap32/wldap32_Fr.rc b/dlls/wldap32/wldap32_Fr.rc index 8ea8d1c..3906b70 100644 --- a/dlls/wldap32/wldap32_Fr.rc +++ b/dlls/wldap32/wldap32_Fr.rc @@ -2,6 +2,7 @@ * French resources for WLDAP32 * * Copyright 2005 Jonathan Ernst + * 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 @@ -27,8 +28,8 @@ STRINGTABLE DISCARDABLE 2 "Erreur de protocole" 3 "Limite de temps d�pass�e" 4 "Limite de taille d�pass�e" - 5 "Comparaison Fausse" - 6 "Comparaison Vraie" + 5 "Comparaison fausse" + 6 "Comparaison vraie" 7 "M�thode d'authentification non support�e" 8 "Authentification forte requise" 9 "R�f�rant (v2)" @@ -40,7 +41,7 @@ STRINGTABLE DISCARDABLE 15 "" 16 "Attribut inconnu" 17 "Type ind�fini" - 18 "Inappropriate Matching" + 18 "Correspondance inappropri�e" 19 "Violation de contrainte" 20 "Attribut ou valeur existant" 21 "Syntaxe invalide" @@ -71,7 +72,7 @@ STRINGTABLE DISCARDABLE 46 "" 47 "" 48 "Authentification inappropri�e" - 49 "Droits invalides" + 49 "Autorisations invalides" 50 "Droits insuffisants" 51 "Occup�" 52 "Indisponible" @@ -92,8 +93,8 @@ STRINGTABLE DISCARDABLE 67 "Interdit sur RDN" 68 "Existe d�j�" 69 "Pas de Mods de classe d'objet" - 70 "R�sultat trop grand" - 71 "Affecte de multiple DSAs" + 70 "R�sultats trop grands" + 71 "Affecte de multiples DSA" 72 "" 73 "" 74 "" @@ -108,9 +109,9 @@ STRINGTABLE DISCARDABLE 83 "Erreur d'encodage" 84 "Erreur de d�codage" 85 "D�lai d'attente d�pass�" - 86 "Auth inconnue" + 86 "Auth. inconnue" 87 "Erreur de filtre" - 88 "Annulation de l'utilisateur" + 88 "Annulation par l'utilisateur" 89 "Erreur de param�tre" 90 "Pas de m�moire" 91 "Impossible de se connecter au serveur LDAP" @@ -119,5 +120,5 @@ STRINGTABLE DISCARDABLE 94 "Pas de r�sultat dans le message" 95 "Plus de r�sultats retourn�s" 96 "Boucle lors du traitement des r�f�rants" - 97 "Limite du nombre de r�f�rents d�pass�e" + 97 "Limite du nombre de r�f�rants d�pass�e" }

1 0

Frédéric Delanoy : cmdlgtst: Fixed French translation.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 55f3442204ffae4ca32ee0889945a38151244d6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f3442204ffae4ca32ee0889… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jun 29 01:12:50 2009 +0200 cmdlgtst: Fixed French translation. --- programs/cmdlgtst/Fr.rc | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/cmdlgtst/Fr.rc b/programs/cmdlgtst/Fr.rc index b8cb1b4..680d6a8 100644 --- a/programs/cmdlgtst/Fr.rc +++ b/programs/cmdlgtst/Fr.rc @@ -58,7 +58,7 @@ CmdlgtstMenu MENU MENUITEM "Mise en pa&ge", CM_F_PAGESETUP } - POPUP "Aid&e" + POPUP "&Aide" { MENUITEM "&Usage", CM_H_USAGE MENUITEM "� &propos", CM_H_ABOUT @@ -147,7 +147,7 @@ FONT 8, "MS Shell Dlg" CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 168, 11, 13 CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 180, 11, 13 CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 24, 228, 11, 13 - CONTROL "Indique les drapeaux qui sont fournis par le syst�me et qui doivent �tre effac�s par l'usager.", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 48, 228, 98, 36 + CONTROL "Indique les drapeaux qui sont fournis par le syst�me et qui doivent �tre effac�s par l'utilisateur.", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 48, 228, 98, 36 } Print_Flags_Dialog DIALOG 4, 17, 239, 287 @@ -243,8 +243,8 @@ CAPTION " FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 72, 96, 50, 14 - LTEXT "Gabarit de test des bo�tes de dialogue standards, version 1.20", -1, 13, 36, 168, 12 - LTEXT "(c) 1999-2000, Eric Williams. Droits tels qu'accord�s par la licence de Wine. N'accumulez pas du code tout seul... partagez-le�!", -1, 18, 60, 157, 24 + LTEXT "Test des bo�tes de dialogue standard, version 1.20", -1, 13, 36, 168, 12 + LTEXT "(c) 1999-2000, Eric Williams. Droits tels qu'accord�s par la licence de Wine. N'accumulez pas du code tout seul... partagez-le�!", -1, 18, 60, 157, 24 ICON "AboutIcon", -1, 84, 12, 18, 20 } @@ -254,20 +254,20 @@ CAPTION "Usage" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 70, 276, 50, 14 - LTEXT "Gabarit de test des bo�tes de dialogue standards, version 1.20", -1, 13, 48, 168, 12 + LTEXT "Test des bo�tes de dialogue standard, version 1.20", -1, 13, 48, 168, 12 LTEXT "Cet outil teste COMMDLG pour Wine.", -1, 12, 72, 168, 12 - LTEXT "Les drapeaux sont sp�cif�s dans le menu Drapeaux.", -1, 12, 96, 168, 12 - LTEXT "La bo�te de dialogue de choix de la couleur change la couleur de l'arri�re-plan.", -1, 12, 120, 168, 12 + LTEXT "Drapeaux sp�cifi�s dans le menu Drapeaux.", -1, 12, 96, 168, 12 + LTEXT "La bo�te de dialogue de choix de la couleur change la couleur de l'arri�re-plan.", -1, 12, 114, 168, 18 LTEXT "La bo�te de dialogue de choix de la police change toutes les polices, et la couleur de la police si CF_EFFECTS est s�lectionn�.", -1, 12, 144, 168, 24 LTEXT "Le nom complet et le titre de la derni�re op�ration r�ussie d'ouverture ou d'enregistrement se trouvent dans le coin en haut � gauche.", -1, 12, 180, 168, 24 - LTEXT "(c) 1999-2000, Eric Williams. Droits tels qu'accord�s par la licence de Wine. N'accumulez pas du code tout seul... partagez-le�!", -1, 12, 228, 168, 36 + LTEXT "(c) 1999-2000, Eric Williams. Droits tels qu'accord�s par la licence de Wine. N'accumulez pas du code tout seul... partagez-le�!", -1, 12, 228, 168, 36 ICON "AboutIcon", -1, 86, 12, 18, 20 CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 216, 168, 2 } PAGESETUPDLGORD_CSTM DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "TFT test dialog" +CAPTION "Bo�te de dialogue de test TFT" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 @@ -277,11 +277,11 @@ BEGIN LTEXT "&Taille�:", stc2, 16, 112, 36, 8 COMBOBOX cmb2, 64, 110, 80, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL COMBOBOX cmb1, 150, 110, 80, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - LTEXT "&Bac�:", stc3, 16, 132, 36, 8 + LTEXT "Ba&c�:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Orientation", grp1, 8, 156, 64, 56, BS_GROUPBOX AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Paysage", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "Pa&ysage", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Bordures", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Gauche�:", stc15, 88, 172, 21, 8 EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER

1 0

Frédéric Delanoy : taskmgr: Some fixes to French translation/display.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: c95acb9115cc0289f04a3e49abe7f95da22e2069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c95acb9115cc0289f04a3e49a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jun 29 02:03:31 2009 +0200 taskmgr: Some fixes to French translation/display. --- programs/taskmgr/Fr.rc | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/taskmgr/Fr.rc b/programs/taskmgr/Fr.rc index d1c3488..617a2bc 100644 --- a/programs/taskmgr/Fr.rc +++ b/programs/taskmgr/Fr.rc @@ -36,7 +36,7 @@ BEGIN END POPUP "&Options" BEGIN - MENUITEM "&Always On Top", ID_OPTIONS_ALWAYSONTOP + MENUITEM "Toujours &visible", ID_OPTIONS_ALWAYSONTOP , CHECKED MENUITEM "R�d&uire � l'ex�cution", ID_OPTIONS_MINIMIZEONUSE , CHECKED @@ -58,8 +58,8 @@ BEGIN END MENUITEM SEPARATOR - MENUITEM "G&randes Ic�nes", ID_VIEW_LARGE - MENUITEM "P&etites Ic�nes", ID_VIEW_SMALL + MENUITEM "G&randes ic�nes", ID_VIEW_LARGE + MENUITEM "P&etites ic�nes", ID_VIEW_SMALL MENUITEM "&D�tails", ID_VIEW_DETAILS, CHECKED MENUITEM "&S�lectionner les colonnes...", ID_VIEW_SELECTCOLUMNS POPUP "&Historique du processeur" @@ -71,7 +71,7 @@ BEGIN END MENUITEM "Aff&icher les temps du noyau", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Fen�tres" + POPUP "Fe&n�tres" BEGIN MENUITEM "Arranger &Horizontallement", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Arranger &Verticallement", ID_WINDOWS_TILEVERTICALLY @@ -124,7 +124,7 @@ BEGIN MENUITEM "&Cascade", ID_WINDOWS_CASCADE MENUITEM SEPARATOR MENUITEM "F&in de t�che", ID_APPLICATION_PAGE_ENDTASK - MENUITEM "&Basculer vers", ID_APPLICATION_PAGE_GOTOPROCESS + MENUITEM "&Suivre le processus", ID_APPLICATION_PAGE_GOTOPROCESS END END @@ -189,9 +189,9 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 - PUSHBUTTON "&Nouvelle t�che...",IDC_NEWTASK,187,189,53,14 + PUSHBUTTON "&Nouvelle t�che",IDC_NEWTASK,187,189,53,14 PUSHBUTTON "&Basculer vers",IDC_SWITCHTO,131,189,53,14,WS_DISABLED - PUSHBUTTON "&Fin de t�che",IDC_ENDTASK,75,189,53,14,WS_DISABLED + PUSHBUTTON "&Fin de t�che",IDC_ENDTASK,75,189,56,14,WS_DISABLED END IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 @@ -201,9 +201,9 @@ BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP,7,7,233,177 - PUSHBUTTON "&Terminer le processus",IDC_ENDPROCESS,171,189,69,14 + PUSHBUTTON "&Terminer le processus",IDC_ENDPROCESS,161,189,79,14 CONTROL "&Afficher les processus de tous les utilisateurs",IDC_SHOWALLPROCESSES, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,161,10 END /*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ @@ -420,7 +420,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_APP_TITLE "Gestionnaire des t�ches" IDC_TASKMGR "Gestionnaire des t�ches" - IDS_RUNDLG_CAPTION "Create New Task" + IDS_RUNDLG_CAPTION "Nouvelle t�che..." END STRINGTABLE DISCARDABLE

1 0

Alexandre Julliard : ntdll: Disable releasing the address space on Mac OS since dyld doesn' t support this.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 1ac7576d477a6f22fa6d5758db6d8344d4bad1a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ac7576d477a6f22fa6d5758d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 29 13:21:37 2009 +0200 ntdll: Disable releasing the address space on Mac OS since dyld doesn't support this. --- dlls/ntdll/virtual.c | 4 +++- loader/main.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index bacfa32..6ce5331 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1681,14 +1681,16 @@ void virtual_release_address_space( BOOL free_high_mem ) server_enter_uninterrupted_section( &csVirtual, &sigset ); +#ifndef __APPLE__ /* dyld doesn't support parts of the WINE_DOS segment being unmapped */ range.base = (char *)0x20000000; range.limit = (char *)0x7f000000; while (wine_mmap_enum_reserved_areas( free_reserved_memory, &range, 0 )) /* nothing */; +#endif /* no large address space on win9x */ if (free_high_mem && NtCurrentTeb()->Peb->OSPlatformId == VER_PLATFORM_WIN32_NT) { - range.base = (char *)0x80000000; + range.base = (char *)0x82000000; range.limit = address_space_limit; while (wine_mmap_enum_reserved_areas( free_reserved_memory, &range, 1 )) /* nothing */; user_space_limit = working_set_limit = address_space_limit; diff --git a/loader/main.c b/loader/main.c index 676eae3..e0588d1 100644 --- a/loader/main.c +++ b/loader/main.c @@ -40,9 +40,9 @@ #ifdef __APPLE__ -asm(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x70000000"); +asm(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x40000000"); asm(".zerofill WINE_SHAREDHEAP, WINE_SHAREDHEAP, ___wine_shared_heap, 0x03000000"); -extern char __wine_dos[0x70000000], __wine_shared_heap[0x03000000]; +extern char __wine_dos[0x40000000], __wine_shared_heap[0x03000000]; static const struct wine_preload_info wine_main_preload_info[] = {

1 0

Paul Vriens : shell32: Fix Dutch translations.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: d9a9e3f06da38bfe560b6be6400fa91c46352c80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9a9e3f06da38bfe560b6be64… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jun 29 11:50:10 2009 +0200 shell32: Fix Dutch translations. --- dlls/shell32/shell32_Nl.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_Nl.rc b/dlls/shell32/shell32_Nl.rc index 1de7bf0..e5329ee 100644 --- a/dlls/shell32/shell32_Nl.rc +++ b/dlls/shell32/shell32_Nl.rc @@ -94,13 +94,13 @@ END MENU_CPANEL MENU BEGIN - POPUP "&File" + POPUP "&Bestand" BEGIN MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_CPANEL_EXIT + MENUITEM "&Afsluiten", IDM_CPANEL_EXIT END - POPUP "&View" + POPUP "B&eeld" BEGIN MENUITEM "&Grote Icons", FCIDM_SHVIEW_BIGICON MENUITEM "&Kleine Icons", FCIDM_SHVIEW_SMALLICON

1 0

Paul Vriens : taskmgr: Fix Dutch translations.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: e6b58a0ba1b689f67463b725034c5c3f38bf4e4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6b58a0ba1b689f67463b7250… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jun 26 17:22:29 2009 +0200 taskmgr: Fix Dutch translations. --- programs/taskmgr/Nl.rc | 73 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 69 insertions(+), 4 deletions(-) diff --git a/programs/taskmgr/Nl.rc b/programs/taskmgr/Nl.rc index 1dafd1d..5d1860b 100644 --- a/programs/taskmgr/Nl.rc +++ b/programs/taskmgr/Nl.rc @@ -376,14 +376,14 @@ BEGIN WS_TABSTOP,7,127,49,10 CONTROL "I/O - Bytes (Lezen)",IDC_IOREADBYTES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,138,75,10 - CONTROL "&Session-ID",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | + CONTROL "&Sessie-ID",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,149,50,10 CONTROL "Gebruikers&naam",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,160,80,10 CONTROL "Delta van de &page faults",IDC_PAGEFAULTSDELTA,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,132,28,72,10 - CONTROL "&Grootte van het virtuele geheugen",IDC_VIRTUALMEMORYSIZE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,132,39,105,10 + BS_AUTOCHECKBOX | WS_TABSTOP,132,28,100,10 + CONTROL "&Grootte van virtueel geheugen",IDC_VIRTUALMEMORYSIZE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,132,39,115,10 CONTROL "&Paged Pool",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,132,50,90,10 CONTROL "Non&paged Pool",IDC_NONPAGEDPOOL,"Button", @@ -467,6 +467,7 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Zet het proces in de NORMAAL-prioriteitsklasse" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Zet het proces in de LAGER DAN NORMAAL-prioriteitsklasse" ID_PROCESS_PAGE_SETPRIORITY_LOW "Zet het proces in de LAGE-prioriteitsklasse" + ID_PROCESS_PAGE_DEBUGCHANNELS "Beheer van debugkanalen" END STRINGTABLE DISCARDABLE @@ -488,3 +489,67 @@ BEGIN IDS_STATUS_BAR_PROCESSES "Processen: %d" IDS_STATUS_BAR_MEMORY_USAGE "Geheugengebruik: %dK / %dK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMAGENAME "Procesnaam" + IDS_PID "Process ID" + IDS_CPUUSAGE "CPU-gebruik" + IDS_CPUTIME "CPU-tijd" + IDS_MEMORYUSAGE "Geheugengebruik" + IDS_MEMORYUSAGEDELTA "Delta in geheugengebruik" + IDS_PEAKMEMORYUSAGE "Maximale geheugengebruik" + IDS_PAGEFAULTS "Page Faults" + IDS_USEROBJECTS "USER-objecten" + IDS_IOREADS "I/O (Lezen)" + IDS_IOREADBYTES "I/O - Bytes (Lezen)" + IDS_SESSIONID "Sessie-ID" + IDS_USERNAME "Gebruikersnaam" + IDS_PAGEFAULTSDELTA "Delta van de Page Faults" + IDS_VIRTUALMEMORYSIZE "VM-grootte" + IDS_PAGEDPOOL "Paged Pool" + IDS_NONPAGEDPOOL "NP Pool" + IDS_BASEPRIORITY "Basisprioriteit" + IDS_HANDLECOUNT "Aantal handles" + IDS_THREADCOUNT "Aantal threads" + IDS_GDIOBJECTS "GDI-objecten" + IDS_IOWRITES "I/O (Schrijven)" + IDS_IOWRITEBYTES "I/O - Bytes (Schrijven)" + IDS_IOOTHER "I/O (Anders)" + IDS_IOOTHERBYTES "I/O - Bytes (Anders)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_WARNING_TITLE "Task Manager Waarschuwing" + IDS_PRIORITY_CHANGE_MESSAGE "WAARSCHUWING: Het veranderen van de prioriteits klasse van dit\n\ + proces kan ongewenste gevolgen hebben zoals instabiliteit van\n\ + het systeem. Weet u zeker dat u de prioriteits klasse wilt veranderen?" + IDS_PRIORITY_UNABLE2CHANGE "Prioriteit kan niet worden verandered" + IDS_TERMINATE_MESSAGE "WAARSCHUWING: Het stoppen van een proces kan ongewenste\n\ + gevolgen hebben zoals verlies van gegevens en instabiliteit\n\ + van het systeem. Het proces zal geen mogelijkheid worden gegeven\n\ + om zijn gegevens of status op te slaan. Weet u zeker dat u dit process\n\ + wilt stoppen?" + IDS_TERMINATE_UNABLE2TERMINATE "Proces kan niet worden gestopt" + IDS_DEBUG_MESSAGE "WAARSCHUWING: Het debuggen van dit proces kan verlies van data tot\n\ + gevolg hebben. Weet u zeker dat u de debugger wilt koppelen?" + IDS_DEBUG_UNABLE2DEBUG "Proces kan niet worden gedebugged" + IDS_AFFINITY_ERROR_MESSAGE "Het proces moet aan tenminste 1 processor worden gekoppeld" + IDS_AFFINITY_ERROR_TITLE "Ongeldige optie" + IDS_AFFINITY_UNABLE2ACCESS "Proces affiniteit kan niet worden gelezen of gezet" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SYSTEM_IDLE_PROCESS "Niet actief proces" + IDS_APPLICATION_NOT_RESPONDING "Reageert niet" + IDS_APPLICATION_RUNNING "Geactiveerd" + IDS_APPLICATION_TASK "Taak" + IDS_APPLICATION_STATUS "Status" + IDS_DEBUG_CHANNEL "Debugkanalen" + IDS_DEBUG_CHANNEL_FIXME "Fixme" + IDS_DEBUG_CHANNEL_ERR "Err" + IDS_DEBUG_CHANNEL_WARN "Warn" + IDS_DEBUG_CHANNEL_TRACE "Trace" +END

1 0

Francois Gouget : gdi32/tests: Make test_GetTextMetrics2() static.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 8b93e1fe062b2ac770c5fe4290e6d635bacb499e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b93e1fe062b2ac770c5fe429… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jun 28 13:29:54 2009 +0200 gdi32/tests: Make test_GetTextMetrics2() static. --- dlls/gdi32/tests/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index d58b8be..6950503 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2912,7 +2912,7 @@ static void test_GetGlyphOutline(void) } /* bug #9995: there is a limit to the character width that can be specified */ -void test_GetTextMetrics2( const char *fontname) +static void test_GetTextMetrics2( const char *fontname) { HFONT of, hf; HDC hdc;

1 0