August 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : winebuild: Use the correct registers for relay debugging of floating point arguments on x86_64 .
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: 7c9b525128e6a6d60107442337efeee3b9ea8868 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c9b525128e6a6d6010744233… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 30 12:41:06 2010 +0200 winebuild: Use the correct registers for relay debugging of floating point arguments on x86_64. --- dlls/ntdll/relay.c | 4 ++++ tools/winebuild/spec32.c | 18 ++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index cd9412c..a2d5377 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -378,6 +378,10 @@ __ASM_GLOBAL_FUNC( call_entry_point, "movq 8(%rsp),%rdx\n\t" "movq 16(%rsp),%r8\n\t" "movq 24(%rsp),%r9\n\t" + "movq %rcx,%xmm0\n\t" + "movq %rdx,%xmm1\n\t" + "movq %r8,%xmm2\n\t" + "movq %r9,%xmm3\n\t" "callq *%rax\n\t" "leaq -16(%rbp),%rsp\n\t" "popq %rdi\n\t" diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 81f139c..030a6bc 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -58,6 +58,12 @@ static inline int needs_relay( const ORDDEF *odp ) return 1; } +static int is_float_arg( const ORDDEF *odp, unsigned int arg ) +{ + if (arg >= odp->u.func.nb_args) return 0; + return (odp->u.func.args[arg] == ARG_FLOAT || odp->u.func.args[arg] == ARG_DOUBLE); +} + /* check if dll will output relay thunks */ int has_relays( DLLSPEC *spec ) { @@ -189,10 +195,14 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\t.cfi_startproc\n" ); output( "\tsubq $40,%%rsp\n" ); output( "\t.cfi_adjust_cfa_offset 40\n" ); - output( "\tmovq %%rcx,48(%%rsp)\n" ); - output( "\tmovq %%rdx,56(%%rsp)\n" ); - output( "\tmovq %%r8,64(%%rsp)\n" ); - output( "\tmovq %%r9,72(%%rsp)\n" ); + switch (args) + { + default: output( "\tmovq %%%s,72(%%rsp)\n", is_float_arg( odp, 3 ) ? "xmm3" : "r9" ); + case 3: output( "\tmovq %%%s,64(%%rsp)\n", is_float_arg( odp, 2 ) ? "xmm2" : "r8" ); + case 2: output( "\tmovq %%%s,56(%%rsp)\n", is_float_arg( odp, 1 ) ? "xmm1" : "rdx" ); + case 1: output( "\tmovq %%%s,48(%%rsp)\n", is_float_arg( odp, 0 ) ? "xmm0" : "rcx" ); + case 0: break; + } output( "\tleaq 40(%%rsp),%%r8\n" ); output( "\tmovq $%u,%%rdx\n", (flags << 24) | (args << 16) | (i - spec->base) ); output( "\tleaq .L__wine_spec_relay_descr(%%rip),%%rcx\n" );

1 0

Louis Lenders : kernel32: Add stub for GetUserDefaultLocaleName.
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: afa53a37a4694da38597fd352886256a223e1e98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afa53a37a4694da38597fd352… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Aug 27 23:38:06 2010 +0200 kernel32: Add stub for GetUserDefaultLocaleName. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 6 ++++++ include/winnls.h | 1 + 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 601644f..fc9e3cc 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -660,6 +660,7 @@ @ stdcall GetTimeZoneInformation(ptr) @ stdcall GetUserDefaultLCID() @ stdcall GetUserDefaultLangID() +@ stdcall GetUserDefaultLocaleName(ptr long) @ stdcall GetUserDefaultUILanguage() @ stdcall GetUserGeoID(long) @ stub GetVDMCurrentDirectories diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 76076ea..8d8042b 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3798,3 +3798,9 @@ INT WINAPI GetGeoInfoA(GEOID GeoId, GEOTYPE GeoType, LPSTR lpGeoData, FIXME("%d %d %p %d %d\n", GeoId, GeoType, lpGeoData, cchData, language); return 0; } + +INT WINAPI GetUserDefaultLocaleName(LPWSTR localename, int buffersize) +{ + FIXME("(%p, %d) stub!\n", localename, buffersize); + return 0; +} diff --git a/include/winnls.h b/include/winnls.h index 47c81d9..b75e24a 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -767,6 +767,7 @@ WINBASEAPI INT WINAPI GetTimeFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWST #define GetTimeFormat WINELIB_NAME_AW(GetTimeFormat) WINBASEAPI LANGID WINAPI GetUserDefaultLangID(void); WINBASEAPI LCID WINAPI GetUserDefaultLCID(void); +WINBASEAPI INT WINAPI GetUserDefaultLocaleName(LPWSTR,int); WINBASEAPI LANGID WINAPI GetUserDefaultUILanguage(void); WINBASEAPI GEOID WINAPI GetUserGeoID(GEOCLASS); WINBASEAPI BOOL WINAPI IsDBCSLeadByte(BYTE);

1 0

Alexandre Julliard : winebuild: Add int64, int128 and float argument types.
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: 451d5043f32298fadcadb78f6b6d1570510883d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=451d5043f32298fadcadb78f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 30 12:40:53 2010 +0200 winebuild: Add int64, int128 and float argument types. --- tools/winebuild/build.h | 5 ++++- tools/winebuild/parser.c | 3 +++ tools/winebuild/spec16.c | 18 +++++++++++++++--- tools/winebuild/spec32.c | 2 ++ tools/winebuild/utils.c | 9 +++++++++ tools/winebuild/winebuild.man.in | 17 +++++++++++++---- 6 files changed, 46 insertions(+), 8 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 7ec9997..eec682f 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -68,7 +68,10 @@ enum arg_type ARG_PTR, /* pointer */ ARG_STR, /* pointer to Ansi string */ ARG_WSTR, /* pointer to Unicode string */ - ARG_DOUBLE, /* floating point double */ + ARG_INT64, /* 64-bit integer */ + ARG_INT128, /* 128-bit integer */ + ARG_FLOAT, /* 32-bit float */ + ARG_DOUBLE, /* 64-bit float */ ARG_MAXARG = ARG_DOUBLE }; diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 8ace705..bc483c9 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -82,6 +82,9 @@ static const char * const ArgNames[ARG_MAXARG + 1] = "ptr", /* ARG_PTR */ "str", /* ARG_STR */ "wstr", /* ARG_WSTR */ + "int64", /* ARG_INT64 */ + "int128", /* ARG_INT128 */ + "float", /* ARG_FLOAT */ "double" /* ARG_DOUBLE */ }; diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index 82ff9f1..c5ca051 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -78,11 +78,14 @@ static const char *get_args_str( const ORDDEF *odp ) case ARG_SWORD: strcat( buffer, "s" ); break; case ARG_SEGSTR: strcat( buffer, "T" ); break; case ARG_STR: strcat( buffer, "t" ); break; - case ARG_DOUBLE: strcat( buffer, "ll" ); break; case ARG_LONG: + case ARG_FLOAT: case ARG_SEGPTR: strcat( buffer, "l" ); break; case ARG_PTR: - case ARG_WSTR: strcat( buffer, "p" ); break; + case ARG_WSTR: + case ARG_INT128: strcat( buffer, "p" ); break; + case ARG_INT64: + case ARG_DOUBLE: strcat( buffer, "ll" ); break; } } return buffer; @@ -288,8 +291,11 @@ static int get_function_argsize( const ORDDEF *odp ) case ARG_PTR: case ARG_STR: case ARG_WSTR: + case ARG_FLOAT: + case ARG_INT128: argsize += 4; break; + case ARG_INT64: case ARG_DOUBLE: argsize += 8; break; @@ -362,7 +368,7 @@ static void output_call16_function( ORDDEF *odp ) /* preserve 16-byte stack alignment */ stack_words += odp->u.func.nb_args; for (i = 0; i < odp->u.func.nb_args; i++) - if (odp->u.func.args[i] == ARG_DOUBLE) stack_words++; + if (odp->u.func.args[i] == ARG_DOUBLE || odp->u.func.args[i] == ARG_INT64) stack_words++; if ((odp->flags & FLAG_REGISTER) || (odp->type == TYPE_VARARGS)) stack_words++; if (stack_words % 4) output( "\tsubl $%d,%%esp\n", 16 - 4 * (stack_words % 4) ); @@ -398,12 +404,14 @@ static void output_call16_function( ORDDEF *odp ) if (odp->type == TYPE_PASCAL) pos += 2; break; + case ARG_INT64: case ARG_DOUBLE: if (odp->type != TYPE_PASCAL) pos -= 4; output( "\tpushl %d(%%ecx)\n", pos ); if (odp->type == TYPE_PASCAL) pos += 4; /* fall through */ case ARG_LONG: + case ARG_FLOAT: case ARG_SEGPTR: case ARG_SEGSTR: if (odp->type != TYPE_PASCAL) pos -= 4; @@ -414,6 +422,7 @@ static void output_call16_function( ORDDEF *odp ) case ARG_PTR: case ARG_STR: case ARG_WSTR: + case ARG_INT128: if (odp->type != TYPE_PASCAL) pos -= 4; output( "\tmovzwl %d(%%ecx),%%edx\n", pos + 2 ); /* sel */ output( "\tshr $3,%%edx\n" ); @@ -707,6 +716,9 @@ static void output_module16( DLLSPEC *spec ) case ARG_PTR: type = ARG16_PTR; break; case ARG_STR: type = ARG16_STR; break; case ARG_WSTR: type = ARG16_PTR; break; + case ARG_FLOAT: type = ARG16_LONG; break; + case ARG_INT128: type = ARG16_PTR; break; + case ARG_INT64: case ARG_DOUBLE: type = ARG16_LONG; arg_types[pos / 10] |= type << (3 * (pos % 10)); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 20a1ed8..81f139c 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -117,7 +117,9 @@ static void output_relay_debug( DLLSPEC *spec ) { case ARG_STR: mask |= 1 << (2 * pos++); break; case ARG_WSTR: mask |= 2 << (2 * pos++); break; + case ARG_INT64: case ARG_DOUBLE: pos += 8 / get_ptr_size(); break; + case ARG_INT128: pos += (target_cpu == CPU_x86) ? 4 : 1; break; default: pos++; break; } } diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index a856831..d5902c6 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -899,9 +899,18 @@ unsigned int get_args_size( const ORDDEF *odp ) { switch (odp->u.func.args[i]) { + case ARG_INT64: case ARG_DOUBLE: size += 8; break; + case ARG_INT128: + /* int128 is passed as pointer on x86_64 */ + if (target_cpu != CPU_x86_64) + { + size += 16; + break; + } + /* fall through */ default: size += get_ptr_size(); break; diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index fb554f7..2dcd3c0 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -343,10 +343,19 @@ should be one or several of: (16-bit signed word) .TP .B long -(32-bit value) +(pointer-sized integer value) +.TP +.B int64 +(64-bit integer value) +.TP +.B int128 +(128-bit integer value) +.TP +.B float +(32-bit floating point value) .TP .B double -(64-bit value) +(64-bit floating point value) .TP .B ptr (linear pointer) @@ -363,8 +372,8 @@ should be one or several of: .B segstr (segmented pointer to a null-terminated ASCII string). .HP -.RB Only\ ptr ,\ str ,\ wstr ,\ long\ and\ double -are valid for Win32 functions. +Note: The 16-bit and segmented pointer types are only valid for Win16 +functions. .RE .PP .I handler

1 0

Alexandre Julliard : winebuild: Use a proper enum for function arguments instead of storing them in a string .
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: e0188c8340306e29067574abc0bd43f18c04b2db URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0188c8340306e29067574abc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 30 12:06:19 2010 +0200 winebuild: Use a proper enum for function arguments instead of storing them in a string. --- tools/winebuild/build.h | 20 ++++++- tools/winebuild/parser.c | 84 ++++++++++++++-------------- tools/winebuild/spec16.c | 141 +++++++++++++++++++++++++++++---------------- tools/winebuild/spec32.c | 17 ++++-- tools/winebuild/utils.c | 20 +++++++ 5 files changed, 183 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0188c8340306e2906757…

1 0

Nikolay Sivov : msxml3: Dump namespace aliases passed with SelectionNamespaces property.
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: 2a5b375580fd664c0e497a38035a3308b93c8e30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a5b375580fd664c0e497a380… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 30 01:33:54 2010 +0400 msxml3: Dump namespace aliases passed with SelectionNamespaces property. --- dlls/msxml3/domdoc.c | 33 +++++++++++++++++++++------------ dlls/msxml3/tests/domdoc.c | 22 +++++++++++++++++----- 2 files changed, 38 insertions(+), 17 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 070dff4..12672a5 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -58,10 +58,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #define XML_SAVE_AS_XML 32 #define XML_SAVE_AS_HTML 64 -static const WCHAR SZ_PROPERTY_SELECTION_LANGUAGE[] = {'S','e','l','e','c','t','i','o','n','L','a','n','g','u','a','g','e',0}; -static const WCHAR SZ_PROPERTY_PROHIBIT_DTD[] = {'P','r','o','h','i','b','i','t','D','T','D',0}; -static const WCHAR SZ_VALUE_XPATH[] = {'X','P','a','t','h',0}; -static const WCHAR SZ_VALUE_XSLPATTERN[] = {'X','S','L','P','a','t','t','e','r','n',0}; +static const WCHAR PropertySelectionLanguageW[] = {'S','e','l','e','c','t','i','o','n','L','a','n','g','u','a','g','e',0}; +static const WCHAR PropertySelectionNamespacesW[] = {'S','e','l','e','c','t','i','o','n','N','a','m','e','s','p','a','c','e','s',0}; +static const WCHAR PropertyProhibitDTDW[] = {'P','r','o','h','i','b','i','t','D','T','D',0}; +static const WCHAR PropValueXPathW[] = {'X','P','a','t','h',0}; +static const WCHAR PropValueXSLPatternW[] = {'X','S','L','P','a','t','t','e','r','n',0}; typedef struct _domdoc { @@ -1736,9 +1737,9 @@ static HRESULT WINAPI domdoc_loadXML( { domdoc *This = impl_from_IXMLDOMDocument3( iface ); xmlDocPtr xmldoc = NULL; + HRESULT hr = S_FALSE, hr2; char *str; int len; - HRESULT hr = S_FALSE, hr2; TRACE("(%p)->(%s %p)\n", This, debugstr_w( bstrXML ), isSuccessful ); @@ -1758,6 +1759,7 @@ static HRESULT WINAPI domdoc_loadXML( { hr = This->error = S_OK; *isSuccessful = VARIANT_TRUE; + TRACE("parsed document %p\n", xmldoc); } } } @@ -2043,7 +2045,7 @@ static HRESULT WINAPI domdoc_setProperty( TRACE("(%p)->(%s)\n", This, debugstr_w(p)); - if (lstrcmpiW(p, SZ_PROPERTY_SELECTION_LANGUAGE) == 0) + if (lstrcmpiW(p, PropertySelectionLanguageW) == 0) { VARIANT varStr; HRESULT hr; @@ -2060,9 +2062,9 @@ static HRESULT WINAPI domdoc_setProperty( bstr = V_BSTR(&var); hr = S_OK; - if (lstrcmpiW(bstr, SZ_VALUE_XPATH) == 0) + if (lstrcmpiW(bstr, PropValueXPathW) == 0) This->bUseXPath = TRUE; - else if (lstrcmpiW(bstr, SZ_VALUE_XSLPATTERN) == 0) + else if (lstrcmpiW(bstr, PropValueXSLPatternW) == 0) This->bUseXPath = FALSE; else hr = E_FAIL; @@ -2070,12 +2072,18 @@ static HRESULT WINAPI domdoc_setProperty( VariantClear(&varStr); return hr; } - else if (lstrcmpiW(p, SZ_PROPERTY_PROHIBIT_DTD) == 0) + else if (lstrcmpiW(p, PropertyProhibitDTDW) == 0) { /* Ignore */ FIXME("Ignoring property ProhibitDTD, value %d\n", V_BOOL(&var)); return S_OK; } + else if (lstrcmpiW(p, PropertySelectionNamespacesW) == 0) + { + if (V_VT(&var) == VT_BSTR) + FIXME("Unsupported SelectionNamespaces: %s\n", wine_dbgstr_w(V_BSTR(&var))); + return E_FAIL; + } FIXME("Unknown property %s\n", wine_dbgstr_w(p)); return E_FAIL; @@ -2092,13 +2100,14 @@ static HRESULT WINAPI domdoc_getProperty( if (var == NULL) return E_INVALIDARG; - if (lstrcmpiW(p, SZ_PROPERTY_SELECTION_LANGUAGE) == 0) + + if (lstrcmpiW(p, PropertySelectionLanguageW) == 0) { V_VT(var) = VT_BSTR; if (This->bUseXPath) - V_BSTR(var) = SysAllocString(SZ_VALUE_XPATH); + V_BSTR(var) = SysAllocString(PropValueXPathW); else - V_BSTR(var) = SysAllocString(SZ_VALUE_XSLPATTERN); + V_BSTR(var) = SysAllocString(PropValueXSLPatternW); return S_OK; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 5dd0ec6..7104afb 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2868,14 +2868,15 @@ static void test_XMLHTTP(void) static void test_IXMLDOMDocument2(void) { - HRESULT r; - VARIANT_BOOL b; - BSTR str; - IXMLDOMDocument *doc; + static const WCHAR emptyW[] = {0}; IXMLDOMDocument2 *doc2; + IXMLDOMDocument *doc; IDispatchEx *dispex; + VARIANT_BOOL b; VARIANT var; - int ref; + HRESULT r; + LONG ref; + BSTR str; r = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc ); @@ -2928,6 +2929,17 @@ static void test_IXMLDOMDocument2(void) ole_check(IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionLanguage"), _variantbstr_("XPath"))); ole_check(IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionLanguage"), _variantbstr_("XSLPattern"))); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(emptyW); + r = IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionNamespaces"), var); + todo_wine ok(r == S_OK, "got 0x%08x\n", r); + VariantClear(&var); + + V_VT(&var) = VT_I2; + V_I2(&var) = 0; + r = IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionNamespaces"), var); + ok(r == E_FAIL, "got 0x%08x\n", r); + /* contrary to what MSDN claims you can switch back from XPath to XSLPattern */ ole_check(IXMLDOMDocument2_getProperty(doc2, _bstr_("SelectionLanguage"), &var)); expect_eq(V_VT(&var), VT_BSTR, int, "%x");

1 0

Nikolay Sivov : msxml3: Silence FIXME for supported properties.
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: fd35084294cf324f94cd0d3bd9d167e11b516069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd35084294cf324f94cd0d3bd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 30 01:33:28 2010 +0400 msxml3: Silence FIXME for supported properties. --- dlls/msxml3/saxreader.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 372884d..815d062 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2146,10 +2146,7 @@ static HRESULT internal_putProperty( 'x','m','l','d','e','c','l','-','v','e','r','s','i','o','n',0 }; - FIXME("(%p)->(%s): semi-stub\n", This, debugstr_w(pProp)); - - if(!memcmp(pProp, wszCharset, sizeof(wszCharset))) - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(pProp)); if(!memcmp(pProp, wszDeclarationHandler, sizeof(wszDeclarationHandler))) { @@ -2177,12 +2174,6 @@ static HRESULT internal_putProperty( return S_OK; } - if(!memcmp(pProp, wszDomNode, sizeof(wszDomNode))) - return E_FAIL; - - if(!memcmp(pProp, wszInputSource, sizeof(wszInputSource))) - return E_NOTIMPL; - if(!memcmp(pProp, wszLexicalHandler, sizeof(wszLexicalHandler))) { if(This->isParsing) return E_FAIL; @@ -2211,6 +2202,17 @@ static HRESULT internal_putProperty( return S_OK; } + FIXME("(%p)->(%s): unsupported property\n", This, debugstr_w(pProp)); + + if(!memcmp(pProp, wszCharset, sizeof(wszCharset))) + return E_NOTIMPL; + + if(!memcmp(pProp, wszDomNode, sizeof(wszDomNode))) + return E_FAIL; + + if(!memcmp(pProp, wszInputSource, sizeof(wszInputSource))) + return E_NOTIMPL; + if(!memcmp(pProp, wszMaxElementDepth, sizeof(wszMaxElementDepth))) return E_NOTIMPL;

1 0

Nikolay Sivov : msxml3: Allow FreeThreadedDOMDocument40 to be created.
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: 42020c94199c9f3fb9d65381d8d93ab4805df811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42020c94199c9f3fb9d65381d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 30 01:33:04 2010 +0400 msxml3: Allow FreeThreadedDOMDocument40 to be created. --- dlls/msxml3/factory.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 969773e..46d8249 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -166,6 +166,7 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) else if( IsEqualCLSID( rclsid, &CLSID_DOMFreeThreadedDocument ) || /* Version indep. v 2.x */ IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument ) || IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument30 ) || + IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument40 ) || IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument60 )) { cf = (IClassFactory*) &domdoccf.lpVtbl;

1 0

Nikolay Sivov : msxml3/tests: Tests for IXMLDOMText::splitText(), stub is extended a bit.
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: a0e7b3b93acf851b8de56a1d00c115ef8cd6f2c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0e7b3b93acf851b8de56a1d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 30 01:32:37 2010 +0400 msxml3/tests: Tests for IXMLDOMText::splitText(), stub is extended a bit. --- dlls/msxml3/tests/domdoc.c | 42 +++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/text.c | 17 +++++++++++++++-- 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 70faa87..5dd0ec6 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5614,7 +5614,7 @@ static void test_splitText(void) IXMLDOMCDATASection *cdata; IXMLDOMElement *root; IXMLDOMDocument *doc; - IXMLDOMText *text; + IXMLDOMText *text, *text2; IXMLDOMNode *node; VARIANT var; VARIANT_BOOL success; @@ -5684,6 +5684,46 @@ static void test_splitText(void) ok(hr == S_OK, "got 0x%08x\n", hr); IXMLDOMNode_Release(node); + /* split new text node */ + hr = IXMLDOMText_get_length(text, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + + node = (void*)0xdeadbeef; + hr = IXMLDOMText_get_nextSibling(text, &node); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(node == 0, "got %p\n", text); + + hr = IXMLDOMText_splitText(text, 0, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + text2 = (void*)0xdeadbeef; + /* negative offset */ + hr = IXMLDOMText_splitText(text, -1, &text2); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(text2 == (void*)0xdeadbeef, "got %p\n", text2); + + text2 = (void*)0xdeadbeef; + /* offset outside data */ + hr = IXMLDOMText_splitText(text, length + 1, &text2); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(text2 == 0, "got %p\n", text2); + + text2 = (void*)0xdeadbeef; + /* offset outside data */ + hr = IXMLDOMText_splitText(text, length, &text2); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(text2 == 0, "got %p\n", text); + + text2 = 0; + hr = IXMLDOMText_splitText(text, 4, &text2); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (text2) IXMLDOMText_Release(text2); + + node = 0; + hr = IXMLDOMText_get_nextSibling(text, &node); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (node) IXMLDOMNode_Release(node); + IXMLDOMText_Release(text); IXMLDOMElement_Release(root); IXMLDOMCDATASection_Release(cdata); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index a8afd87..a087076 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -726,11 +726,24 @@ static HRESULT WINAPI domtext_splitText( LONG offset, IXMLDOMText **txtNode) { domtext *This = impl_from_IXMLDOMText( iface ); - FIXME("(%p)->(%d %p)\n", This, offset, txtNode); + LONG length = 0; + + TRACE("(%p)->(%d %p)\n", This, offset, txtNode); + + if (!txtNode || offset < 0) return E_INVALIDARG; + + *txtNode = NULL; + + IXMLDOMText_get_length(iface, &length); + + if (offset > length) return E_INVALIDARG; + if (offset == length) return S_FALSE; + + FIXME("adjacent text nodes are not supported\n"); + return E_NOTIMPL; } - static const struct IXMLDOMTextVtbl domtext_vtbl = { domtext_QueryInterface,

1 0

Nikolay Sivov : msxml3: Implement IXMLDOMCDATASection::splitText().
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: 92a574b44bf4dc4e9b54bb17b6b4e7a9d6c1e699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92a574b44bf4dc4e9b54bb17b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 30 01:32:11 2010 +0400 msxml3: Implement IXMLDOMCDATASection::splitText(). --- dlls/msxml3/cdata.c | 44 ++++++++++++- dlls/msxml3/domdoc.c | 4 +- dlls/msxml3/tests/domdoc.c | 151 ++++++++++++++++++++++++++++++++++---------- 3 files changed, 160 insertions(+), 39 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 55340a4..373bbc8 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -725,10 +725,48 @@ static HRESULT WINAPI domcdata_splitText( LONG offset, IXMLDOMText **txtNode) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - FIXME("(%p)->(%d %p)\n", This, offset, txtNode); - return E_NOTIMPL; -} + IXMLDOMDocument *doc; + LONG length = 0; + HRESULT hr; + + TRACE("(%p)->(%d %p)\n", This, offset, txtNode); + + if (!txtNode || offset < 0) return E_INVALIDARG; + + *txtNode = NULL; + IXMLDOMCDATASection_get_length(iface, &length); + + if (offset > length) return E_INVALIDARG; + if (offset == length) return S_FALSE; + + hr = IXMLDOMCDATASection_get_ownerDocument(iface, &doc); + if (hr == S_OK) + { + BSTR data; + + hr = IXMLDOMCDATASection_substringData(iface, offset, length - offset, &data); + if (hr == S_OK) + { + hr = IXMLDOMDocument_createTextNode(doc, data, txtNode); + if (hr == S_OK) + { + IXMLDOMNode *parent; + + hr = IXMLDOMCDATASection_get_parentNode(iface, &parent); + if (hr == S_OK) + { + IXMLDOMCDATASection_deleteData(iface, 0, offset); + hr = IXMLDOMNode_appendChild(parent, (IXMLDOMNode*)*txtNode, NULL); + } + } + SysFreeString(data); + } + IXMLDOMDocument_Release(doc); + } + + return hr; +} static const struct IXMLDOMCDATASectionVtbl domcdata_vtbl = { diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index d689b86..070dff4 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2414,8 +2414,8 @@ HRESULT DOMDocument_create(IUnknown *pUnkOuter, void **ppObj) IUnknown* create_domdoc( xmlNodePtr document ) { + void* pObj = NULL; HRESULT hr; - LPVOID pObj = NULL; TRACE("(%p)\n", document); @@ -2428,7 +2428,7 @@ IUnknown* create_domdoc( xmlNodePtr document ) #else -HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) +HRESULT DOMDocument_create(IUnknown *pUnkOuter, void **ppObj) { MESSAGE("This program tried to use a DOMDocument object, but\n" "libxml2 support was not present at compile time.\n"); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index aa16a03..70faa87 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5609,6 +5609,87 @@ static void test_XSLPattern(void) free_bstrs(); } +static void test_splitText(void) +{ + IXMLDOMCDATASection *cdata; + IXMLDOMElement *root; + IXMLDOMDocument *doc; + IXMLDOMText *text; + IXMLDOMNode *node; + VARIANT var; + VARIANT_BOOL success; + LONG length; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_DOMDocument, NULL, + CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc ); + ok( hr == S_OK, "got 0x%08x\n", hr ); + if( hr != S_OK ) + return; + + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<root></root>"), &success); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_documentElement(doc, &root); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_createCDATASection(doc, _bstr_("beautiful plumage"), &cdata); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&var) = VT_EMPTY; + hr = IXMLDOMElement_appendChild(root, (IXMLDOMNode*)cdata, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + length = 0; + hr = IXMLDOMCDATASection_get_length(cdata, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length > 0, "got %d\n", length); + + hr = IXMLDOMCDATASection_splitText(cdata, 0, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + text = (void*)0xdeadbeef; + /* negative offset */ + hr = IXMLDOMCDATASection_splitText(cdata, -1, &text); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(text == (void*)0xdeadbeef, "got %p\n", text); + + text = (void*)0xdeadbeef; + /* offset outside data */ + hr = IXMLDOMCDATASection_splitText(cdata, length + 1, &text); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(text == 0, "got %p\n", text); + + text = (void*)0xdeadbeef; + /* offset outside data */ + hr = IXMLDOMCDATASection_splitText(cdata, length, &text); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(text == 0, "got %p\n", text); + + /* no empty node created */ + node = (void*)0xdeadbeef; + hr = IXMLDOMCDATASection_get_nextSibling(cdata, &node); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(node == 0, "got %p\n", text); + + hr = IXMLDOMCDATASection_splitText(cdata, 10, &text); + ok(hr == S_OK, "got 0x%08x\n", hr); + + length = 0; + hr = IXMLDOMText_get_length(text, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 7, "got %d\n", length); + + hr = IXMLDOMCDATASection_get_nextSibling(cdata, &node); + ok(hr == S_OK, "got 0x%08x\n", hr); + IXMLDOMNode_Release(node); + + IXMLDOMText_Release(text); + IXMLDOMElement_Release(root); + IXMLDOMCDATASection_Release(cdata); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -5619,44 +5700,46 @@ START_TEST(domdoc) if (r != S_OK) return; + test_XMLHTTP(); + r = CoCreateInstance( &CLSID_DOMDocument, NULL, - CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc ); - if (SUCCEEDED(r)) + CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc ); + if (FAILED(r)) { - IXMLDOMDocument_Release(doc); - - test_domdoc(); - test_persiststreaminit(); - test_domnode(); - test_refs(); - test_create(); - test_getElementsByTagName(); - test_get_text(); - test_get_childNodes(); - test_get_firstChild(); - test_removeChild(); - test_replaceChild(); - test_removeNamedItem(); - test_IXMLDOMDocument2(); - test_XPath(); - test_XSLPattern(); - test_cloneNode(); - test_xmlTypes(); - test_nodeTypeTests(); - test_DocumentSaveToDocument(); - test_DocumentSaveToFile(); - test_testTransforms(); - test_Namespaces(); - test_FormattingXML(); - test_NodeTypeValue(); - test_TransformWithLoadingLocalFile(); - test_put_nodeValue(); - test_document_IObjectSafety(); - } - else win_skip("IXMLDOMDocument is not available (0x%08x)\n", r); + return; + } - test_XMLHTTP(); + IXMLDOMDocument_Release(doc); + + test_domdoc(); + test_persiststreaminit(); + test_domnode(); + test_refs(); + test_create(); + test_getElementsByTagName(); + test_get_text(); + test_get_childNodes(); + test_get_firstChild(); + test_removeChild(); + test_replaceChild(); + test_removeNamedItem(); + test_IXMLDOMDocument2(); + test_XPath(); + test_XSLPattern(); + test_cloneNode(); + test_xmlTypes(); + test_nodeTypeTests(); + test_DocumentSaveToDocument(); + test_DocumentSaveToFile(); + test_testTransforms(); + test_Namespaces(); + test_FormattingXML(); + test_NodeTypeValue(); + test_TransformWithLoadingLocalFile(); + test_put_nodeValue(); + test_document_IObjectSafety(); + test_splitText(); CoUninitialize(); }

1 0

Nikolay Sivov : msxml3: Add IXMLDOMDocument3 stub support.
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: 62e521ad0d287526ade34f78c69d400ffe31c3cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e521ad0d287526ade34f78c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 30 01:31:49 2010 +0400 msxml3: Add IXMLDOMDocument3 stub support. --- dlls/msxml3/attribute.c | 2 +- dlls/msxml3/bsc.c | 2 +- dlls/msxml3/cdata.c | 2 +- dlls/msxml3/comment.c | 2 +- dlls/msxml3/dispex.c | 2 +- dlls/msxml3/docfrag.c | 2 +- dlls/msxml3/domdoc.c | 427 ++++++++++++++++++++++--------------------- dlls/msxml3/domimpl.c | 2 +- dlls/msxml3/element.c | 2 +- dlls/msxml3/entityref.c | 2 +- dlls/msxml3/httprequest.c | 2 +- dlls/msxml3/main.c | 2 +- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/node.c | 4 +- dlls/msxml3/nodelist.c | 2 +- dlls/msxml3/nodemap.c | 2 +- dlls/msxml3/parseerror.c | 2 +- dlls/msxml3/pi.c | 2 +- dlls/msxml3/queryresult.c | 2 +- dlls/msxml3/regsvr.c | 2 +- dlls/msxml3/saxreader.c | 2 +- dlls/msxml3/schema.c | 2 +- dlls/msxml3/text.c | 2 +- dlls/msxml3/xmldoc.c | 2 +- dlls/msxml3/xmlelem.c | 2 +- 25 files changed, 247 insertions(+), 230 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=62e521ad0d287526ade34…

1 0