wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Paul Vriens : msvcp80/msvcr90: Fix some typos in the forwards.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: ba5e80986462acd07ff2903329d1f060f5c48683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba5e80986462acd07ff290332… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Sep 10 18:06:28 2010 +0200 msvcp80/msvcr90: Fix some typos in the forwards. --- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index a3e490e..eda3b7c 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5550,7 +5550,7 @@ @ cdecl -arch=win32 ?to_char_type@?$char_traits@D@std@@SADABH@Z(ptr) msvcp90.?to_char_type@?$char_traits@D@std@@SADABH@Z @ cdecl -arch=win64 ?to_char_type@?$char_traits@D@std@@SADAEBH@Z(ptr) msvcp90.?to_char_type@?$char_traits@D@std@@SADAEBH@Z @ cdecl -arch=win32 ?to_char_type@?$char_traits@G@std@@SAGABG@Z(ptr) msvcp90.?to_char_type@?$char_traits@G@std@@SAGABG@Z -@ cdecl -arch=win64 ?to_char_type@?$char_traits@G@std@@SAGAEBG@Z(ptr) msvcp90.to_char_type@?$char_traits@G@std@@SAGAEBG@Z +@ cdecl -arch=win64 ?to_char_type@?$char_traits@G@std@@SAGAEBG@Z(ptr) msvcp90.?to_char_type@?$char_traits@G@std@@SAGAEBG@Z @ cdecl -arch=win32 ?to_char_type@?$char_traits@_W@std@@SA_WABG@Z(ptr) msvcp90.?to_char_type@?$char_traits@_W@std@@SA_WABG@Z @ cdecl -arch=win64 ?to_char_type@?$char_traits@_W@std@@SA_WAEBG@Z(ptr) msvcp90.?to_char_type@?$char_traits@_W@std@@SA_WAEBG@Z @ cdecl -arch=win32 ?to_int_type@?$char_traits@D@std@@SAHABD@Z(ptr) msvcp90.?to_int_type@?$char_traits@D@std@@SAHABD@Z diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 650d0a7..01df496 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -564,7 +564,7 @@ @ stub _heapused @ cdecl _heapwalk(ptr) msvcrt._heapwalk @ cdecl _hypot(double double) msvcrt._hypot -@ cdecl _hypotf(float float) msvcrt.hypotf +@ cdecl _hypotf(float float) msvcrt._hypotf @ cdecl _i64toa(int64 ptr long) msvcrt._i64toa @ stub _i64toa_s @ cdecl _i64tow(int64 ptr long) msvcrt._i64tow

1 0

Hans Leidekker : wine.inf: Create 32-bit program files and common files directories in 64-bit prefixes .
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 6fd6175df70b9a787ccb8aea174ecccbd7d65ac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd6175df70b9a787ccb8aea1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 10 17:30:43 2010 +0200 wine.inf: Create 32-bit program files and common files directories in 64-bit prefixes. --- tools/wine.inf.in | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 0623047..429934e 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -89,6 +89,7 @@ AddReg=\ ContentIndex,\ ControlClass,\ CurrentVersion,\ + CurrentVersionWow64,\ Debugger,\ Desktop,\ Dotnet,\ @@ -474,6 +475,10 @@ HKLM,%CurrentVersionNT%\Ports,,16 HKLM,%CurrentVersionNT%\Print,,16 HKLM,%CurrentVersionNT%\ProfileList,,16 +[CurrentVersionWow64] +HKLM,%CurrentVersion%,"ProgramFilesDir (x86)",,"%16426%" +HKLM,%CurrentVersion%,"CommonFilesDir (x86)",,"%16428%" + [Debugger] HKLM,%CurrentVersionNT%\AeDebug,"Debugger",2,"winedbg --auto %ld %ld" HKLM,%CurrentVersionNT%\AeDebug,"Auto",2,"1"

1 0

Hans Leidekker : shell32: Add support for CSIDL_PROGRAM_FILESX86 and CSIDL_PROGRAM_FILES_COMMONX86.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 02e38f3066e75a43ac0b3ff1018781ecd82197b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02e38f3066e75a43ac0b3ff10… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 10 17:30:23 2010 +0200 shell32: Add support for CSIDL_PROGRAM_FILESX86 and CSIDL_PROGRAM_FILES_COMMONX86. --- dlls/shell32/shell32_En.rc | 2 ++ dlls/shell32/shellpath.c | 14 ++++++++------ dlls/shell32/shresdef.h | 2 ++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc index d8cd66d..ce7d63d 100644 --- a/dlls/shell32/shell32_En.rc +++ b/dlls/shell32/shell32_En.rc @@ -274,8 +274,10 @@ STRINGTABLE IDS_COOKIES "Cookies" IDS_HISTORY "Local Settings\\History" IDS_PROGRAM_FILES "Program Files" + IDS_PROGRAM_FILESX86 "Program Files (x86)" IDS_MYPICTURES "My Pictures" IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" + IDS_PROGRAM_FILES_COMMONX86 "Program Files (x86)\\Common Files" IDS_COMMON_DOCUMENTS "Documents" IDS_ADMINTOOLS "Start Menu\\Programs\\Administrative Tools" IDS_COMMON_MUSIC "Music" diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 6083b45..8daa875 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -767,6 +767,7 @@ static const WCHAR Common_DesktopW[] = {'C','o','m','m','o','n',' ','D','e','s', static const WCHAR Common_DocumentsW[] = {'C','o','m','m','o','n',' ','D','o','c','u','m','e','n','t','s','\0'}; static const WCHAR Common_FavoritesW[] = {'C','o','m','m','o','n',' ','F','a','v','o','r','i','t','e','s','\0'}; static const WCHAR CommonFilesDirW[] = {'C','o','m','m','o','n','F','i','l','e','s','D','i','r','\0'}; +static const WCHAR CommonFilesDirX86W[] = {'C','o','m','m','o','n','F','i','l','e','s','D','i','r',' ','(','x','8','6',')','\0'}; static const WCHAR CommonMusicW[] = {'C','o','m','m','o','n','M','u','s','i','c','\0'}; static const WCHAR CommonPicturesW[] = {'C','o','m','m','o','n','P','i','c','t','u','r','e','s','\0'}; static const WCHAR Common_ProgramsW[] = {'C','o','m','m','o','n',' ','P','r','o','g','r','a','m','s','\0'}; @@ -787,6 +788,7 @@ static const WCHAR NetHoodW[] = {'N','e','t','H','o','o','d','\0'}; static const WCHAR PersonalW[] = {'P','e','r','s','o','n','a','l','\0'}; static const WCHAR PrintHoodW[] = {'P','r','i','n','t','H','o','o','d','\0'}; static const WCHAR ProgramFilesDirW[] = {'P','r','o','g','r','a','m','F','i','l','e','s','D','i','r','\0'}; +static const WCHAR ProgramFilesDirX86W[] = {'P','r','o','g','r','a','m','F','i','l','e','s','D','i','r',' ','(','x','8','6',')','\0'}; static const WCHAR ProgramsW[] = {'P','r','o','g','r','a','m','s','\0'}; static const WCHAR RecentW[] = {'R','e','c','e','n','t','\0'}; static const WCHAR ResourcesW[] = {'R','e','s','o','u','r','c','e','s','\0'}; @@ -1037,9 +1039,9 @@ static const CSIDL_DATA CSIDL_Data[] = NULL }, { /* 0x2a - CSIDL_PROGRAM_FILESX86 */ - CSIDL_Type_NonExistent, - NULL, - NULL + CSIDL_Type_CurrVer, + ProgramFilesDirX86W, + MAKEINTRESOURCEW(IDS_PROGRAM_FILESX86) }, { /* 0x2b - CSIDL_PROGRAM_FILES_COMMON */ CSIDL_Type_CurrVer, @@ -1047,9 +1049,9 @@ static const CSIDL_DATA CSIDL_Data[] = MAKEINTRESOURCEW(IDS_PROGRAM_FILES_COMMON) }, { /* 0x2c - CSIDL_PROGRAM_FILES_COMMONX86 */ - CSIDL_Type_NonExistent, - NULL, - NULL + CSIDL_Type_CurrVer, + CommonFilesDirX86W, + MAKEINTRESOURCEW(IDS_PROGRAM_FILES_COMMONX86) }, { /* 0x2d - CSIDL_COMMON_TEMPLATES */ CSIDL_Type_AllUsers, diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index b8a456b..9261fe3 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -90,6 +90,8 @@ #define IDS_COMMON_PICTURES 69 #define IDS_COMMON_VIDEO 70 #define IDS_CDBURN_AREA 71 +#define IDS_PROGRAM_FILESX86 72 +#define IDS_PROGRAM_FILES_COMMONX86 73 #define IDS_CREATEFOLDER_DENIED 128 #define IDS_CREATEFOLDER_CAPTION 129

1 0

Hans Leidekker : msi: Avoid pointer truncation in MSI_ViewFetch and MSI_ViewModify.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 7e9d50a122cca40cc1e538fdbf303cc5090f5dc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e9d50a122cca40cc1e538fdb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 10 17:30:05 2010 +0200 msi: Avoid pointer truncation in MSI_ViewFetch and MSI_ViewModify. --- dlls/msi/msipriv.h | 3 +++ dlls/msi/msiquery.c | 4 ++-- dlls/msi/record.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index a5d089e..ebfcae7 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -103,6 +103,7 @@ typedef struct tagMSIFIELD union { INT iVal; + INT_PTR pVal; LPWSTR szwVal; IStream *stream; } u; @@ -709,11 +710,13 @@ extern UINT MSI_RecordGetIStream( MSIRECORD *, UINT, IStream **); extern const WCHAR *MSI_RecordGetString( const MSIRECORD *, UINT ); extern MSIRECORD *MSI_CreateRecord( UINT ); extern UINT MSI_RecordSetInteger( MSIRECORD *, UINT, int ); +extern UINT MSI_RecordSetIntPtr( MSIRECORD *, UINT, INT_PTR ); extern UINT MSI_RecordSetStringW( MSIRECORD *, UINT, LPCWSTR ); extern BOOL MSI_RecordIsNull( MSIRECORD *, UINT ); extern UINT MSI_RecordGetStringW( MSIRECORD * , UINT, LPWSTR, LPDWORD); extern UINT MSI_RecordGetStringA( MSIRECORD *, UINT, LPSTR, LPDWORD); extern int MSI_RecordGetInteger( MSIRECORD *, UINT ); +extern INT_PTR MSI_RecordGetIntPtr( MSIRECORD *, UINT ); extern UINT MSI_RecordReadStream( MSIRECORD *, UINT, char *, LPDWORD); extern UINT MSI_RecordSetStream(MSIRECORD *, UINT, IStream *); extern UINT MSI_RecordGetFieldCount( const MSIRECORD *rec ); diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index c603e6a..cf69593 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -382,7 +382,7 @@ UINT MSI_ViewFetch(MSIQUERY *query, MSIRECORD **prec) if (r == ERROR_SUCCESS) { query->row ++; - MSI_RecordSetInteger(*prec, 0, (int)query); + MSI_RecordSetIntPtr(*prec, 0, (INT_PTR)query); } return r; @@ -617,7 +617,7 @@ UINT MSI_ViewModify( MSIQUERY *query, MSIMODIFY mode, MSIRECORD *rec ) if ( !view || !view->ops->modify) return ERROR_FUNCTION_FAILED; - if ( mode == MSIMODIFY_UPDATE && MSI_RecordGetInteger( rec, 0 ) != (int)query ) + if ( mode == MSIMODIFY_UPDATE && MSI_RecordGetIntPtr( rec, 0 ) != (INT_PTR)query ) return ERROR_FUNCTION_FAILED; r = view->ops->modify( view, mode, rec, query->row ); diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 45adbac..7bc8281 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -45,6 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); #define MSIFIELD_INT 1 #define MSIFIELD_WSTR 3 #define MSIFIELD_STREAM 4 +#define MSIFIELD_INTPTR 5 static void MSI_FreeField( MSIFIELD *field ) { @@ -52,6 +53,7 @@ static void MSI_FreeField( MSIFIELD *field ) { case MSIFIELD_NULL: case MSIFIELD_INT: + case MSIFIELD_INTPTR: break; case MSIFIELD_WSTR: msi_free( field->u.szwVal); @@ -177,6 +179,9 @@ UINT MSI_RecordCopyField( MSIRECORD *in_rec, UINT in_n, case MSIFIELD_INT: out->u.iVal = in->u.iVal; break; + case MSIFIELD_INTPTR: + out->u.pVal = in->u.pVal; + break; case MSIFIELD_WSTR: str = strdupW( in->u.szwVal ); if ( !str ) @@ -200,6 +205,32 @@ UINT MSI_RecordCopyField( MSIRECORD *in_rec, UINT in_n, return r; } +INT_PTR MSI_RecordGetIntPtr( MSIRECORD *rec, UINT iField ) +{ + int ret; + + TRACE( "%p %d\n", rec, iField ); + + if( iField > rec->count ) + return MININT_PTR; + + switch( rec->fields[iField].type ) + { + case MSIFIELD_INT: + return rec->fields[iField].u.iVal; + case MSIFIELD_INTPTR: + return rec->fields[iField].u.pVal; + case MSIFIELD_WSTR: + if( string2intW( rec->fields[iField].u.szwVal, &ret ) ) + return ret; + return MININT_PTR; + default: + break; + } + + return MININT_PTR; +} + int MSI_RecordGetInteger( MSIRECORD *rec, UINT iField) { int ret = 0; @@ -213,6 +244,8 @@ int MSI_RecordGetInteger( MSIRECORD *rec, UINT iField) { case MSIFIELD_INT: return rec->fields[iField].u.iVal; + case MSIFIELD_INTPTR: + return rec->fields[iField].u.pVal; case MSIFIELD_WSTR: if( string2intW( rec->fields[iField].u.szwVal, &ret ) ) return ret; @@ -267,6 +300,20 @@ UINT WINAPI MsiRecordClearData( MSIHANDLE handle ) return ERROR_SUCCESS; } +UINT MSI_RecordSetIntPtr( MSIRECORD *rec, UINT iField, INT_PTR pVal ) +{ + TRACE("%p %u %ld\n", rec, iField, pVal); + + if( iField > rec->count ) + return ERROR_INVALID_PARAMETER; + + MSI_FreeField( &rec->fields[iField] ); + rec->fields[iField].type = MSIFIELD_INTPTR; + rec->fields[iField].u.pVal = pVal; + + return ERROR_SUCCESS; +} + UINT MSI_RecordSetInteger( MSIRECORD *rec, UINT iField, int iVal ) { TRACE("%p %u %d\n", rec, iField, iVal);

1 0

Jacek Caban : msxml3: Don't use xmlnode' s IXMLDOMNode iface in insertBefore implementations.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: addefe4ce568c0da592a402c0ceee3379e019df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=addefe4ce568c0da592a402c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 10 16:55:14 2010 +0200 msxml3: Don't use xmlnode's IXMLDOMNode iface in insertBefore implementations. --- dlls/msxml3/attribute.c | 7 +++- dlls/msxml3/cdata.c | 7 +++- dlls/msxml3/comment.c | 7 +++- dlls/msxml3/docfrag.c | 8 ++++- dlls/msxml3/domdoc.c | 5 +++- dlls/msxml3/element.c | 7 +++- dlls/msxml3/entityref.c | 7 +++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 58 +++++++++++++++++++++++-------------------- dlls/msxml3/pi.c | 7 +++- dlls/msxml3/text.c | 7 +++- 11 files changed, 77 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=addefe4ce568c0da592a4…

1 0

Jacek Caban : msxml3: Don't use xmlnode' s IXMLDOMNode iface in get_attributes implementations.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: e9ebd8c964feb83c3a9fd09ac47c68e4a0423576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9ebd8c964feb83c3a9fd09ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 10 16:54:06 2010 +0200 msxml3: Don't use xmlnode's IXMLDOMNode iface in get_attributes implementations. --- dlls/msxml3/attribute.c | 5 ++++- dlls/msxml3/cdata.c | 7 +++++-- dlls/msxml3/comment.c | 5 ++++- dlls/msxml3/docfrag.c | 5 ++++- dlls/msxml3/domdoc.c | 5 ++++- dlls/msxml3/element.c | 6 +++++- dlls/msxml3/entityref.c | 5 ++++- dlls/msxml3/msxml_private.h | 8 ++++++++ dlls/msxml3/node.c | 31 ++++++------------------------- dlls/msxml3/pi.c | 6 +++++- dlls/msxml3/text.c | 5 ++++- 11 files changed, 53 insertions(+), 35 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 823234f..5607a03 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -293,7 +293,10 @@ static HRESULT WINAPI domattr_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); + + TRACE("(%p)->(%p)\n", This, attributeMap); + + return return_null_ptr((void**)attributeMap); } static HRESULT WINAPI domattr_insertBefore( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index e537858..98e77c5 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -303,8 +303,11 @@ static HRESULT WINAPI domcdata_get_attributes( IXMLDOMCDATASection *iface, IXMLDOMNamedNodeMap** attributeMap) { - domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); + domcdata *This = impl_from_IXMLDOMCDATASection( iface ); + + TRACE("(%p)->(%p)\n", This, attributeMap); + + return return_null_ptr((void**)attributeMap); } static HRESULT WINAPI domcdata_insertBefore( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index bc53dde..dee94b2 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -297,7 +297,10 @@ static HRESULT WINAPI domcomment_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); + + TRACE("(%p)->(%p)\n", This, attributeMap); + + return return_null_ptr((void**)attributeMap); } static HRESULT WINAPI domcomment_insertBefore( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 9c6c903..0c1b9ae 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -299,7 +299,10 @@ static HRESULT WINAPI domfrag_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); + + TRACE("(%p)->(%p)\n", This, attributeMap); + + return return_null_ptr((void**)attributeMap); } static HRESULT WINAPI domfrag_insertBefore( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 3e1cf90..fbdc280 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -812,7 +812,10 @@ static HRESULT WINAPI domdoc_get_attributes( IXMLDOMNamedNodeMap** attributeMap ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); + + TRACE("(%p)->(%p)\n", This, attributeMap); + + return return_null_ptr((void**)attributeMap); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 7983720..1081ed4 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -308,7 +308,11 @@ static HRESULT WINAPI domelem_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); + + TRACE("(%p)->(%p)\n", This, attributeMap); + + *attributeMap = create_nodemap((IXMLDOMNode*)&This->lpVtbl); + return S_OK; } static HRESULT WINAPI domelem_insertBefore( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 8598cdf..cf0b800 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -295,7 +295,10 @@ static HRESULT WINAPI entityref_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); + + TRACE("(%p)->(%p)\n", This, attributeMap); + + return return_null_ptr((void**)attributeMap); } static HRESULT WINAPI entityref_insertBefore( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 901a374..211300e 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -212,6 +212,14 @@ static inline HRESULT return_null_node(IXMLDOMNode **p) return S_FALSE; } +static inline HRESULT return_null_ptr(void **p) +{ + if(!p) + return E_INVALIDARG; + *p = NULL; + return S_FALSE; +} + #endif void* libxslt_handle; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index f72d064..5d25761 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -369,30 +369,8 @@ static HRESULT WINAPI xmlnode_get_attributes( IXMLDOMNode *iface, IXMLDOMNamedNodeMap** attributeMap) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); - TRACE("(%p)->(%p)\n", This, attributeMap); - - if (!attributeMap) - return E_INVALIDARG; - - switch( This->node->type ) - { - /* Attribute, CDataSection, Comment, Documents, Documents Fragments, - Entity and Text Nodes does not support get_attributes */ - case XML_ATTRIBUTE_NODE: - case XML_CDATA_SECTION_NODE: - case XML_COMMENT_NODE: - case XML_DOCUMENT_NODE: - case XML_DOCUMENT_FRAG_NODE: - case XML_ENTITY_NODE: - case XML_ENTITY_REF_NODE: - case XML_TEXT_NODE: - *attributeMap = NULL; - return S_FALSE; - default: - *attributeMap = create_nodemap( This->iface ); - return S_OK; - } + ERR("Should not be called\n"); + return E_NOTIMPL; } static HRESULT WINAPI xmlnode_insertBefore( @@ -1852,7 +1830,10 @@ static HRESULT WINAPI unknode_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { unknode *This = impl_from_unkIXMLDOMNode( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); + + FIXME("(%p)->(%p)\n", This, attributeMap); + + return return_null_ptr((void**)attributeMap); } static HRESULT WINAPI unknode_insertBefore( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index a42c2d7..446b1a7 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -310,7 +310,11 @@ static HRESULT WINAPI dom_pi_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); + + TRACE("(%p)->(%p)\n", This, attributeMap); + + *attributeMap = create_nodemap((IXMLDOMNode*)&This->lpVtbl); + return S_OK; } static HRESULT WINAPI dom_pi_insertBefore( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 3ce9190..b236c54 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -310,7 +310,10 @@ static HRESULT WINAPI domtext_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); + + TRACE("(%p)->(%p)\n", This, attributeMap); + + return return_null_ptr((void**)attributeMap); } static HRESULT WINAPI domtext_insertBefore(

1 0

Jacek Caban : msxml3: Don't use xmlnode's IXMLDOMNode iface in get_[ previous|next]Sibling implementations.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 55175042eb84af7af383e8cbe5c911519a32e291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55175042eb84af7af383e8cbe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 10 16:53:48 2010 +0200 msxml3: Don't use xmlnode's IXMLDOMNode iface in get_[previous|next]Sibling implementations. --- dlls/msxml3/attribute.c | 10 ++++++- dlls/msxml3/cdata.c | 10 ++++++- dlls/msxml3/comment.c | 10 ++++++- dlls/msxml3/docfrag.c | 10 ++++++- dlls/msxml3/domdoc.c | 10 ++++++- dlls/msxml3/element.c | 10 ++++++- dlls/msxml3/entityref.c | 10 ++++++- dlls/msxml3/msxml_private.h | 2 + dlls/msxml3/node.c | 58 +++++++++++++++--------------------------- dlls/msxml3/pi.c | 10 ++++++- dlls/msxml3/text.c | 10 ++++++- 11 files changed, 95 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=55175042eb84af7af383e…

1 0

Alistair Leslie-Hughes : msxml: Added support to create msxml4/6 interfaces .
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 5e5cd71ff10cb17d00c6e6559b8afc5910bffb9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5cd71ff10cb17d00c6e6559… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 9 20:21:21 2010 +1000 msxml: Added support to create msxml4/6 interfaces. --- dlls/msxml3/factory.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 46d8249..5e2039f 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -154,8 +154,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) { cf = (IClassFactory*) &domdoccf.lpVtbl; } - else if( IsEqualCLSID( rclsid, &CLSID_XMLSchemaCache ) || - IsEqualCLSID( rclsid, &CLSID_XMLSchemaCache30 ) ) + else if( IsEqualCLSID( rclsid, &CLSID_XMLSchemaCache ) || + IsEqualCLSID( rclsid, &CLSID_XMLSchemaCache30 ) || + IsEqualCLSID( rclsid, &CLSID_XMLSchemaCache40 ) || + IsEqualCLSID( rclsid, &CLSID_XMLSchemaCache60 )) { cf = (IClassFactory*) &schemacf.lpVtbl; } @@ -173,7 +175,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) } else if( IsEqualCLSID( rclsid, &CLSID_SAXXMLReader) || IsEqualCLSID( rclsid, &CLSID_SAXXMLReader30 ) || - IsEqualCLSID( rclsid, &CLSID_SAXXMLReader40 )) + IsEqualCLSID( rclsid, &CLSID_SAXXMLReader40 ) || + IsEqualCLSID( rclsid, &CLSID_SAXXMLReader60 )) { cf = (IClassFactory*) &saxreadcf.lpVtbl; }

1 0

Alistair Leslie-Hughes : mshtml: Correct test for another unknown dispID.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: ea451adf5873310dfa3facbbaf8134bcd3dc4fe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea451adf5873310dfa3facbba… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 9 20:23:23 2010 +1000 mshtml: Correct test for another unknown dispID. --- dlls/mshtml/tests/htmldoc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index d1d02f0..641153b 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -837,6 +837,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D case 3000028: case 3000029: case 3000030: + case 3000031: /* TODO */ return S_OK; }

1 0

Aric Stewart : gdi32: Silence a common and expected error.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 5c581f079eb8ed5f329b05e0db3852cfac2bd220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c581f079eb8ed5f329b05e0d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 9 15:28:15 2010 -0500 gdi32: Silence a common and expected error. --- dlls/gdi32/bidi.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 7d748fd..4ef0e99 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -622,7 +622,10 @@ BOOL BIDI_Reorder( } if (res) { - FIXME("Unable to shape string (%x)\n",res); + if (res == USP_E_SCRIPT_NOT_IN_FONT) + TRACE("Unable to shape with currently selected font\n"); + else + FIXME("Unable to shape string (%x)\n",res); j = nItems; doGlyphs = FALSE; HeapFree(GetProcessHeap(), 0, *lpGlyphs);

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2010