August 2008 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Update the overlay when the destination was drawn to.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: bab367e1a0c0f1bbf36f26827efad49b5d37162d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab367e1a0c0f1bbf36f26827… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 20 10:48:14 2008 -0500 wined3d: Update the overlay when the destination was drawn to. --- dlls/wined3d/surface.c | 16 ++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9a50e84..3ef659f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4077,6 +4077,7 @@ void surface_load_ds_location(IWineD3DSurface *iface, DWORD location) { static void WINAPI IWineD3DSurfaceImpl_ModifyLocation(IWineD3DSurface *iface, DWORD flag, BOOL persistent) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; IWineD3DBaseTexture *texture; + IWineD3DSurfaceImpl *overlay; TRACE("(%p)->(%s, %s)\n", iface, flag == SFLAG_INSYSMEM ? "SFLAG_INSYSMEM" : flag == SFLAG_INDRAWABLE ? "SFLAG_INDRAWABLE" : "SFLAG_INTEXTURE", @@ -4105,6 +4106,13 @@ static void WINAPI IWineD3DSurfaceImpl_ModifyLocation(IWineD3DSurface *iface, DW } This->Flags &= ~SFLAG_LOCATIONS; This->Flags |= flag; + + /* Redraw emulated overlays, if any */ + if(flag & SFLAG_INDRAWABLE && !list_empty(&This->overlays)) { + LIST_FOR_EACH_ENTRY(overlay, &This->overlays, IWineD3DSurfaceImpl, overlay_entry) { + IWineD3DSurface_DrawOverlay((IWineD3DSurface *) overlay); + } + } } else { if((This->Flags & SFLAG_INTEXTURE) && (flag & SFLAG_INTEXTURE)) { if (IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&texture) == WINED3D_OK) { @@ -4556,9 +4564,17 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_DrawOverlay(IWineD3DSurface *iface) { /* If there's no destination surface there is nothing to do */ if(!This->overlay_dest) return WINED3D_OK; + /* Blt calls ModifyLocation on the dest surface, which in turn calls DrawOverlay to + * update the overlay. Prevent an endless recursion + */ + if(This->overlay_dest->Flags & SFLAG_INOVERLAYDRAW) { + return WINED3D_OK; + } + This->overlay_dest->Flags |= SFLAG_INOVERLAYDRAW; hr = IWineD3DSurfaceImpl_Blt((IWineD3DSurface *) This->overlay_dest, &This->overlay_destrect, iface, &This->overlay_srcrect, WINEDDBLT_WAIT, NULL, WINED3DTEXF_LINEAR); + This->overlay_dest->Flags &= ~SFLAG_INOVERLAYDRAW; return hr; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e2b1215..45d8ace 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1423,6 +1423,7 @@ void flip_surface(IWineD3DSurfaceImpl *front, IWineD3DSurfaceImpl *back); #define SFLAG_NORMCOORD 0x00080000 /* Set if the GL texture coords are normalized(non-texture rectangle) */ #define SFLAG_DS_ONSCREEN 0x00100000 /* Is a depth stencil, last modified onscreen */ #define SFLAG_DS_OFFSCREEN 0x00200000 /* Is a depth stencil, last modified offscreen */ +#define SFLAG_INOVERLAYDRAW 0x00400000 /* Overlay drawing is in progress. Recursion prevention */ /* In some conditions the surface memory must not be freed: * SFLAG_OVERSIZE: Not all data can be kept in GL

1 0

David Adam : appwiz.cpl: Add the French resource.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 2972775b204f8c05aec782ea143b904adc1e95e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2972775b204f8c05aec782ea1… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Wed Aug 20 15:53:15 2008 +0200 appwiz.cpl: Add the French resource. --- dlls/appwiz.cpl/Fr.rc | 79 +++++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/appwiz.rc | 1 + 2 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Fr.rc b/dlls/appwiz.cpl/Fr.rc new file mode 100644 index 0000000..15b4af4 --- /dev/null +++ b/dlls/appwiz.cpl/Fr.rc @@ -0,0 +1,79 @@ +/* +* Ajoute/Supprime des programmes resources francaises +* +* Copyright 2008 David Adam +* +* 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_DEFAULT + +STRINGTABLE +{ + IDS_CPL_TITLE, "Ajouter/Supprimer des programmes" + IDS_CPL_DESC, "Vous autorise � installer un nouveau logiciel, ou supprimer un logiciel existant de votre ordinateur." + IDS_TAB1_TITLE, "Applications" + + IDS_UNINSTALL_FAILED, "Incapable d'ex�cuter le d�sinstalleur, '%s'. Voulez-vous supprimer l'entr�e de ce programme du registre?" + IDS_NOT_SPECIFIED, "Non sp�cifi�" + + IDS_COLUMN_NAME, "Nom" + IDS_COLUMN_PUBLISHER, "Editeur" + IDS_COLUMN_VERSION, "Version" +} + +/* TODO: it's best to use the constant WC_LISTVIEW instead of SysListView32 directly, but the Wine resource compiler doesn't seem to like that... */ + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installation/D�sinstallation" +FONT 8, "MS Sans Serif" +{ +CONTROL "Pour installer un nouveau programme � partir d'une disquette, d'un cdrom ou de votre disque dur, cliquer sur Installation.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "&Installer...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 + CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 + CONTROL "Ce logiciel peut �tre automatiquement d�sinstaller. Pour supprimer un programme ou modifier ses composants, s�lectionner le dans la liste, et cliquer sur Ajouter/Supprimer.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "Ajouter/&Supprimer...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 198, 64, 14 + CONTROL "&Info. support..", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 176, 198, 64, 14 + CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 +} + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Information pour support" +FONT 8, "MS Sans Serif" +{ + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "Les informations suivantes peuvent �tre utilis�es pour obtenir un support technique pour %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Editeur:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "Version:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Contact:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "Support Information:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "Support Telephone:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Lisez-moi:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Mise � jour des produits:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "Commentaires:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "", 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 + CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8 + CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8 + CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8 + CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 + CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 +} diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc index b4a8dd5..c86f9a8 100644 --- a/dlls/appwiz.cpl/appwiz.rc +++ b/dlls/appwiz.cpl/appwiz.rc @@ -26,6 +26,7 @@ #include "res.h" #include "En.rc" +#include "Fr.rc" #include "Nl.rc" #include "No.rc"

1 0

David Adam : wordpad: Update the French translation.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 2ca1fe29b888463e549049792035089783fcb6d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ca1fe29b888463e549049792… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Wed Jul 30 15:45:17 2008 +0200 wordpad: Update the French translation. --- programs/wordpad/Fr.rc | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index ac40084..8a409d9 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -64,7 +64,7 @@ BEGIN BEGIN MENUITEM "&Barre d'outils", ID_TOGGLE_TOOLBAR MENUITEM "&Barre de format", ID_TOGGLE_FORMATBAR - MENUITEM "&Ruler", ID_TOGGLE_RULER + MENUITEM "&R�gle", ID_TOGGLE_RULER MENUITEM "&Barre d'�tat", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Options...", ID_VIEWPROPERTIES @@ -75,7 +75,7 @@ BEGIN END POPUP "Forma&t" BEGIN - MENUITEM "&Polive...", ID_FONTSETTINGS + MENUITEM "&Police...", ID_FONTSETTINGS MENUITEM "&Puces" ID_BULLET MENUITEM "&Paragraphe..." ID_PARAFORMAT MENUITEM "&Tabulations..." ID_TABSTOPS @@ -109,10 +109,10 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Date et heure" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Available formats",0,3,2,100,15 + LTEXT "Formats disponibles",0,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&OK",IDOK,87,12,40,12 - PUSHBUTTON "&Cancel",IDCANCEL,87,26,40,12 + PUSHBUTTON "&Annuler",IDCANCEL,87,26,40,12 END IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 @@ -132,13 +132,13 @@ Caption "Format de paragraphe" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Indentation", 0, 10, 10, 120, 68 - LTEXT "Left", 0, 15, 22, 40, 13 + LTEXT "Gauche", 0, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Right", 0, 15, 40, 40, 13 + LTEXT "Droite", 0, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "First line", 0, 15, 58, 40, 13 + LTEXT "Premi�re ligne", 0, 15, 58, 40, 18 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Alignment", 0, 15, 87, 40, 13 + LTEXT "Alignement", 0, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Annuler", IDCANCEL, 137, 33, 50, 15 @@ -163,14 +163,14 @@ STYLE DS_SYSMODAL Caption "" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Line wrapping", 0, 10, 10, 130, 85 - RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 25, 117, 15 - RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 45, 117, 15 - GROUPBOX "Barres d'outils", 0, 150, 10, 120, 85 - CHECKBOX "&Barre d'outils", IDC_PAGEFMT_TB, 160, 20, 80, 15 - CHECKBOX "Barre de &format", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 - CHECKBOX "Barre de &statut", IDC_PAGEFMT_SB, 160, 74, 80, 15 + GROUPBOX "Enveloppement de ligne", 0, 10, 10, 170, 85 + RADIOBUTTON "Enveloppe le texte � partir de la bordure de fen�tre", IDC_PAGEFMT_WW, 18, 25, 145, 15 + RADIOBUTTON "Enveloppe le texte � partir de la &marge", IDC_PAGEFMT_WM, 18, 45, 145, 15 + GROUPBOX "Barres d'outils", 0, 170, 10, 120, 85 + CHECKBOX "&Barre d'outils", IDC_PAGEFMT_TB, 180, 20, 80, 15 + CHECKBOX "Barre de &format", IDC_PAGEFMT_FB, 180, 38, 80, 15 + CHECKBOX "&R�gle", IDC_PAGEFMT_RU, 180, 56, 80, 15 + CHECKBOX "Barre de &statut", IDC_PAGEFMT_SB, 180, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END @@ -213,8 +213,8 @@ BEGIN STRING_PREVIEW_PRINT, "Imprimer" STRING_PREVIEW_NEXTPAGE, "Page suivante" STRING_PREVIEW_PREVPAGE, "Page pr�c�dente" - STRING_PREVIEW_TWOPAGES, "Two pages" - STRING_PREVIEW_ONEPAGE, "One page" + STRING_PREVIEW_TWOPAGES, "Deux pages" + STRING_PREVIEW_ONEPAGE, "Une page" STRING_PREVIEW_CLOSE, "Fermer" END

1 0

Piotr Caban : msxml3: Fix IVBErrorHandler related bugs.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 7b7a187956659f6a74c2bcb7aae785fe1a40f7a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b7a187956659f6a74c2bcb7a… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Aug 20 18:32:23 2008 +0200 msxml3: Fix IVBErrorHandler related bugs. --- dlls/msxml3/saxreader.c | 43 ++++++++++++++++++++++++++----------------- 1 files changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 2e35eaa..ef62c9f 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -197,7 +197,8 @@ static void format_error_message_from_id(saxlocator *This, HRESULT hr) xmlStopParser(This->pParserCtxt); This->ret = hr; - if(This->saxreader->errorHandler) + if((This->vbInterface && This->saxreader->vberrorHandler) + || (!This->vbInterface && This->saxreader->errorHandler)) { WCHAR msg[1024]; if(!FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, @@ -1257,7 +1258,8 @@ void libxmlFatalError(void *ctx, const char *msg, ...) DWORD len; va_list args; - if(!This->saxreader->errorHandler) + if((This->vbInterface && !This->saxreader->vberrorHandler) + || (!This->vbInterface && !This->saxreader->errorHandler)) { xmlStopParser(This->pParserCtxt); This->ret = E_FAIL; @@ -1272,7 +1274,8 @@ void libxmlFatalError(void *ctx, const char *msg, ...) len = MultiByteToWideChar(CP_ACP, 0, message, -1, NULL, 0); wszError = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); - MultiByteToWideChar(CP_ACP, 0, message, -1, (LPWSTR)wszError, len); + if(wszError) + MultiByteToWideChar(CP_ACP, 0, message, -1, (LPWSTR)wszError, len); if(This->vbInterface) { @@ -1773,13 +1776,12 @@ static HRESULT WINAPI internal_getErrorHandler( TRACE("(%p)->(%p)\n", This, pErrorHandler); if(pErrorHandler == NULL) return E_POINTER; - if(This->errorHandler) - { - if(vbInterface) - IVBSAXErrorHandler_AddRef(This->vberrorHandler); - else - ISAXErrorHandler_AddRef(This->errorHandler); - } + + if(vbInterface && This->vberrorHandler) + IVBSAXErrorHandler_AddRef(This->vberrorHandler); + else if(!vbInterface && This->errorHandler) + ISAXErrorHandler_AddRef(This->errorHandler); + if(vbInterface) *(IVBSAXErrorHandler**)pErrorHandler = This->vberrorHandler; else @@ -1802,13 +1804,12 @@ static HRESULT WINAPI internal_putErrorHandler( else ISAXErrorHandler_AddRef((ISAXErrorHandler*)errorHandler); } - if(This->errorHandler) - { - if(vbInterface) - IVBSAXErrorHandler_Release(This->vberrorHandler); - else - ISAXErrorHandler_Release(This->errorHandler); - } + + if(vbInterface && This->vberrorHandler) + IVBSAXErrorHandler_Release(This->vberrorHandler); + else if(!vbInterface && This->errorHandler) + ISAXErrorHandler_Release(This->errorHandler); + if(vbInterface) This->vberrorHandler = errorHandler; else @@ -2018,9 +2019,15 @@ static ULONG WINAPI saxxmlreader_Release( if(This->contentHandler) ISAXContentHandler_Release(This->contentHandler); + if(This->vbcontentHandler) + IVBSAXContentHandler_Release(This->vbcontentHandler); + if(This->errorHandler) ISAXErrorHandler_Release(This->errorHandler); + if(This->vberrorHandler) + IVBSAXErrorHandler_Release(This->vberrorHandler); + HeapFree( GetProcessHeap(), 0, This ); } @@ -2528,7 +2535,9 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) reader->lpSAXXMLReaderVtbl = &isaxreader_vtbl; reader->ref = 1; reader->contentHandler = NULL; + reader->vbcontentHandler = NULL; reader->errorHandler = NULL; + reader->vberrorHandler = NULL; memset(&reader->sax, 0, sizeof(xmlSAXHandler)); reader->sax.initialized = XML_SAX2_MAGIC;

1 0

Piotr Caban : msxml3: Add ISAXAttributes_getValueFromQName implementation.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 655155feb810bda6e42f663a9fead83cf53f2910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=655155feb810bda6e42f663a9… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Aug 20 18:31:39 2008 +0200 msxml3: Add ISAXAttributes_getValueFromQName implementation. --- dlls/msxml3/saxreader.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 64ad0b1..7affb4a 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -859,10 +859,15 @@ static HRESULT WINAPI isaxattributes_getValueFromQName( const WCHAR **pValue, int *nValue) { + HRESULT hr; + int index; saxattributes *This = impl_from_ISAXAttributes( iface ); + TRACE("(%p)->(%s, %d)\n", This, debugstr_w(pQName), nQName); - FIXME("(%p)->(%s, %d) stub\n", This, debugstr_w(pQName), nQName); - return E_NOTIMPL; + hr = ISAXAttributes_getIndexFromQName(iface, pQName, nQName, &index); + if(hr==S_OK) hr = ISAXAttributes_getValue(iface, index, pValue, nValue); + + return hr; } static const struct ISAXAttributesVtbl isaxattributes_vtbl =

1 0

Piotr Caban : msxml3: Add error handling when reading from IStream.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 126c0abeefb05af8137abdcc7c9271848bfaf5fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=126c0abeefb05af8137abdcc7… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Aug 20 18:32:02 2008 +0200 msxml3: Add error handling when reading from IStream. --- dlls/msxml3/saxreader.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 7affb4a..2e35eaa 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1876,8 +1876,20 @@ static HRESULT WINAPI internal_parse( if(hr == E_PENDING) continue; break; } + if(hr != S_OK) + { + IStream_Release(stream); + break; + } + data = HeapAlloc(GetProcessHeap(), 0, dataInfo.cbSize.QuadPart); + if(!data) + { + IStream_Release(stream); + break; + } + while(1) { hr = IStream_Read(stream, data, @@ -1885,6 +1897,13 @@ static HRESULT WINAPI internal_parse( if(hr == E_PENDING) continue; break; } + if(hr != S_OK) + { + HeapFree(GetProcessHeap(), 0, data); + IStream_Release(stream); + break; + } + hr = internal_parseBuffer(This, data, dataInfo.cbSize.QuadPart, vbInterface); HeapFree(GetProcessHeap(), 0, data);

1 0

Piotr Caban : msxml3: Add ISAXAttributes_getValueFromName implementation.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: c9893d176d4deb3a11b8e6ab035bc98455ac894d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9893d176d4deb3a11b8e6ab0… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Aug 20 18:31:17 2008 +0200 msxml3: Add ISAXAttributes_getValueFromName implementation. --- dlls/msxml3/saxreader.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 2a9f628..64ad0b1 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -839,11 +839,17 @@ static HRESULT WINAPI isaxattributes_getValueFromName( const WCHAR **pValue, int *nValue) { + HRESULT hr; + int index; saxattributes *This = impl_from_ISAXAttributes( iface ); - - FIXME("(%p)->(%s, %d, %s, %d) stub\n", This, debugstr_w(pUri), nUri, + TRACE("(%p)->(%s, %d, %s, %d)\n", This, debugstr_w(pUri), nUri, debugstr_w(pLocalName), nLocalName); - return E_NOTIMPL; + + hr = ISAXAttributes_getIndexFromName(iface, + pUri, nUri, pLocalName, nLocalName, &index); + if(hr==S_OK) hr = ISAXAttributes_getValue(iface, index, pValue, nValue); + + return hr; } static HRESULT WINAPI isaxattributes_getValueFromQName(

1 0

Piotr Caban : msxml3: Add ISAXAttributes_getIndexFromName implementation.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 0afbcd5def23cbb0605ccc6bed856ed5a1d32f89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0afbcd5def23cbb0605ccc6be… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Aug 20 18:30:34 2008 +0200 msxml3: Add ISAXAttributes_getIndexFromName implementation. --- dlls/msxml3/saxreader.c | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index d850c05..a9a37da 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -721,10 +721,29 @@ static HRESULT WINAPI isaxattributes_getIndexFromName( int *index) { saxattributes *This = impl_from_ISAXAttributes( iface ); - - FIXME("(%p)->(%s, %d, %s, %d) stub\n", This, debugstr_w(pUri), cUriLength, + int i; + TRACE("(%p)->(%s, %d, %s, %d)\n", This, debugstr_w(pUri), cUriLength, debugstr_w(pLocalName), cocalNameLength); - return E_NOTIMPL; + + if(!pUri || !pLocalName || !index) return E_POINTER; + + for(i=0; i<This->nb_attributes; i++) + { + if(cUriLength!=SysStringLen(This->szURI[i]) + || cocalNameLength!=SysStringLen(This->szLocalname[i])) + continue; + if(cUriLength && memcmp(pUri, This->szURI[i], + sizeof(WCHAR)*cUriLength)) + continue; + if(cocalNameLength && memcmp(pLocalName, This->szLocalname[i], + sizeof(WCHAR)*cocalNameLength)) + continue; + + *index = i; + return S_OK; + } + + return E_INVALIDARG; } static HRESULT WINAPI isaxattributes_getIndexFromQName(

1 0

Piotr Caban : msxml3: Add ISAXAttributes_getIndexFromQName implementation.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: fa221f56a3cb3fcc17252e7c0c95de5c1b640a09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa221f56a3cb3fcc17252e7c0… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Aug 20 18:30:58 2008 +0200 msxml3: Add ISAXAttributes_getIndexFromQName implementation. --- dlls/msxml3/saxreader.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index a9a37da..2a9f628 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -753,9 +753,22 @@ static HRESULT WINAPI isaxattributes_getIndexFromQName( int *index) { saxattributes *This = impl_from_ISAXAttributes( iface ); + int i; + TRACE("(%p)->(%s, %d)\n", This, debugstr_w(pQName), nQNameLength); - FIXME("(%p)->(%s, %d) stub\n", This, debugstr_w(pQName), nQNameLength); - return E_NOTIMPL; + if(!pQName || !index) return E_POINTER; + if(!nQNameLength) return E_INVALIDARG; + + for(i=0; i<This->nb_attributes; i++) + { + if(nQNameLength!=SysStringLen(This->szQName[i])) continue; + if(memcmp(pQName, This->szQName, sizeof(WCHAR)*nQNameLength)) continue; + + *index = i; + return S_OK; + } + + return E_INVALIDARG; } static HRESULT WINAPI isaxattributes_getType(

1 0

Piotr Caban : msxml3: Fix checking if ContentHandler was set.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: f3ab228ae72f7a97e8065b5fbb89b7420ef48f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3ab228ae72f7a97e8065b5fb… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Aug 20 18:26:25 2008 +0200 msxml3: Fix checking if ContentHandler was set. --- dlls/msxml3/saxreader.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index f7da49f..55d4d56 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -908,7 +908,8 @@ static void libxmlStartDocument(void *ctx) saxlocator *This = ctx; HRESULT hr; - if(This->saxreader->contentHandler) + if((This->vbInterface && This->saxreader->vbcontentHandler) + || (!This->vbInterface && This->saxreader->contentHandler)) { if(This->vbInterface) hr = IVBSAXContentHandler_startDocument(This->saxreader->vbcontentHandler); @@ -932,7 +933,8 @@ static void libxmlEndDocument(void *ctx) if(This->ret != S_OK) return; - if(This->saxreader->contentHandler) + if((This->vbInterface && This->saxreader->vbcontentHandler) + || (!This->vbInterface && This->saxreader->contentHandler)) { if(This->vbInterface) hr = IVBSAXContentHandler_endDocument(This->saxreader->vbcontentHandler); @@ -964,8 +966,8 @@ static void libxmlStartElementNS( update_position(This, (xmlChar*)This->pParserCtxt->input->cur+1); hr = namespacePush(This, nb_namespaces); - - if(hr==S_OK && This->saxreader->contentHandler) + if(hr==S_OK && ((This->vbInterface && This->saxreader->vbcontentHandler) + || (!This->vbInterface && This->saxreader->contentHandler))) { for(index=0; index<nb_namespaces; index++) { @@ -1042,7 +1044,8 @@ static void libxmlEndElementNS( nsNr = namespacePop(This); - if(This->saxreader->contentHandler) + if((This->vbInterface && This->saxreader->vbcontentHandler) + || (!This->vbInterface && This->saxreader->contentHandler)) { NamespaceUri = bstr_from_xmlChar(URI); LocalName = bstr_from_xmlChar(localname); @@ -1120,7 +1123,8 @@ static void libxmlCharacters( lineCopy = This->line; end = This->lastCur; - if(This->saxreader->contentHandler) + if((This->vbInterface && This->saxreader->vbcontentHandler) + || (!This->vbInterface && This->saxreader->contentHandler)) { while(This->lastCur < chEnd) { @@ -1645,7 +1649,8 @@ static HRESULT WINAPI internal_getContentHandler( TRACE("(%p)->(%p)\n", This, pContentHandler); if(pContentHandler == NULL) return E_POINTER; - if(This->contentHandler) + if((vbInterface && This->vbcontentHandler) + || (!vbInterface && This->contentHandler)) { if(vbInterface) IVBSAXContentHandler_AddRef(This->vbcontentHandler); @@ -1672,7 +1677,8 @@ static HRESULT WINAPI internal_putContentHandler( else ISAXContentHandler_AddRef((ISAXContentHandler*)contentHandler); } - if(This->contentHandler) + if((vbInterface && This->vbcontentHandler) + || (!vbInterface && This->contentHandler)) { if(vbInterface) IVBSAXContentHandler_Release(This->vbcontentHandler);

1 0