October 2008 - Wine-Commits

Zachary Goldberg : WWN 353 -- WineConf edition
by Jeremy Newman Oct. 7, 2008

Oct. 7, 2008

Module: website Branch: master Commit: cab7dd0a5e0ab9c02b060e639d78f4358e71d52e URL: http://source.winehq.org/git/website.git/?a=commit;h=cab7dd0a5e0ab9c02b060e… Author: Zachary Goldberg <zgs(a)bluesata.com> Date: Mon Oct 6 19:47:33 2008 -0400 WWN 353 -- WineConf edition --- news/en/2008100601.xml | 8 + wwn/en/wn20081006_353.xml | 2344 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 2352 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=cab7dd0a5e0ab9c02b…

1 0

Aric Stewart : d3d8: Initialize IDirect3DDevice8 *device to NULL in case of immediate cleanup ( Coverity 795).
by Alexandre Julliard Oct. 7, 2008

Oct. 7, 2008

Module: wine Branch: master Commit: f7cacc1f0933a5483574174d557843b82a3ddb31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7cacc1f0933a5483574174d5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sun Oct 5 11:52:52 2008 -0500 d3d8: Initialize IDirect3DDevice8 *device to NULL in case of immediate cleanup (Coverity 795). --- dlls/d3d8/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 1909038..fbbdf1d 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1288,7 +1288,7 @@ static void test_depth_stencil_reset(void) D3DPRESENT_PARAMETERS present_parameters; D3DDISPLAYMODE display_mode; IDirect3DSurface8 *surface; - IDirect3DDevice8 *device; + IDirect3DDevice8 *device = NULL; IDirect3D8 *d3d8; HRESULT hr; HWND hwnd;

1 0

Aric Stewart : wineoss: Don' t dereference a potentially NULL value in the WARN statement (Coverity 93).
by Alexandre Julliard Oct. 7, 2008

Oct. 7, 2008

Module: wine Branch: master Commit: e3e9bc30fdd4889d97cc1a81f38d8a89fbcd93af URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3e9bc30fdd4889d97cc1a81f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 7 07:17:27 2008 -0500 wineoss: Don't dereference a potentially NULL value in the WARN statement (Coverity 93). --- dlls/wineoss.drv/midi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index a7ec4fd..ade1928 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -1620,8 +1620,8 @@ static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0 || lpMidiHdr->dwBufferLength >= 0x10000ul) { - WARN("%p %p %08x %d/%d\n", lpMidiHdr, lpMidiHdr->lpData, - lpMidiHdr->dwFlags, sizeof(MIDIHDR), dwSize); + WARN("%p %p %08x %d/%d\n", lpMidiHdr, lpMidiHdr ? lpMidiHdr->lpData : NULL, + lpMidiHdr ? lpMidiHdr->dwFlags : 0, sizeof(MIDIHDR), dwSize); return MMSYSERR_INVALPARAM; }

1 0

Aric Stewart : oleaut32: In variants check bOverflow to make sure not to accidently overun static buffers in an overflow case (Coverity 313).
by Alexandre Julliard Oct. 7, 2008

Oct. 7, 2008

Module: wine Branch: master Commit: 3b3ed7a0208fd655fc183cb70aba8af610212fc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b3ed7a0208fd655fc183cb70… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 3 10:24:06 2008 -0500 oleaut32: In variants check bOverflow to make sure not to accidently overun static buffers in an overflow case (Coverity 313). --- dlls/oleaut32/variant.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index f6dcbf1..e96325f 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2322,7 +2322,7 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, whole = whole * dblMultipliers[10]; multiplier10 -= 10; } - if (multiplier10) + if (multiplier10 && !bOverflow) { if (whole > dblMaximums[multiplier10]) { @@ -2333,9 +2333,10 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, whole = whole * dblMultipliers[multiplier10]; } - TRACE("Scaled double value is %16.16g\n", whole); + if (!bOverflow) + TRACE("Scaled double value is %16.16g\n", whole); - while (divisor10 > 10) + while (divisor10 > 10 && !bOverflow) { if (whole < dblMinimums[10] && whole != 0) { @@ -2346,7 +2347,7 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, whole = whole / dblMultipliers[10]; divisor10 -= 10; } - if (divisor10) + if (divisor10 && !bOverflow) { if (whole < dblMinimums[divisor10] && whole != 0) {

1 0

Alexandre Julliard : msvcrt: Pass the command interpreter as exe name from _wpopen.
by Alexandre Julliard Oct. 7, 2008

Oct. 7, 2008

Module: wine Branch: master Commit: e20ef5013992e8b6671a238aabe3c962a589c51b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e20ef5013992e8b6671a238aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 7 15:36:44 2008 +0200 msvcrt: Pass the command interpreter as exe name from _wpopen. --- dlls/msvcrt/process.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index 9dbc43e..5298520 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -1125,9 +1125,8 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc strcpyW(fullcmd, comspec); strcatW(fullcmd, flag); strcatW(fullcmd, command); - HeapFree(GetProcessHeap(), 0, comspec); - if (msvcrt_spawn(MSVCRT__P_NOWAIT, NULL, fullcmd, NULL, 1) == -1) + if (msvcrt_spawn(MSVCRT__P_NOWAIT, comspec, fullcmd, NULL, 1) == -1) { MSVCRT__close(fds[fdToOpen]); ret = NULL; @@ -1138,6 +1137,7 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc if (!ret) MSVCRT__close(fds[fdToOpen]); } + HeapFree(GetProcessHeap(), 0, comspec); HeapFree(GetProcessHeap(), 0, fullcmd); MSVCRT__dup2(fdStdHandle, fdToDup); MSVCRT__close(fdStdHandle);

1 0

Eric Pouech : msvcrt: Implemented splitpath_s.
by Alexandre Julliard Oct. 7, 2008

Oct. 7, 2008

Module: wine Branch: master Commit: 3a2dda11e9118f4a3f9438297ac64af1f199f59d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a2dda11e9118f4a3f9438297… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 4 13:37:55 2008 +0200 msvcrt: Implemented splitpath_s. --- dlls/msvcrt/dir.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 5 +++ dlls/msvcrt/msvcrt.spec | 1 + 3 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 5859adf..d06242c 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -735,6 +735,84 @@ void CDECL _wsplitpath(const MSVCRT_wchar_t *inpath, MSVCRT_wchar_t *drv, MSVCRT if (ext) strcpyW( ext, end ); } +/****************************************************************** + * _wsplitpath_s (MSVCRT.@) + * + * Secure version of _wsplitpath + */ +int _wsplitpath_s(const MSVCRT_wchar_t* inpath, + MSVCRT_wchar_t* drive, MSVCRT_size_t sz_drive, + MSVCRT_wchar_t* dir, MSVCRT_size_t sz_dir, + MSVCRT_wchar_t* fname, MSVCRT_size_t sz_fname, + MSVCRT_wchar_t* ext, MSVCRT_size_t sz_ext) +{ + const MSVCRT_wchar_t *p, *end; + + if (!inpath) return MSVCRT_EINVAL; + if (!drive && sz_drive) return MSVCRT_EINVAL; + if (drive && !sz_drive) return MSVCRT_EINVAL; + if (!dir && sz_dir) return MSVCRT_EINVAL; + if (dir && !sz_dir) return MSVCRT_EINVAL; + if (!fname && sz_fname) return MSVCRT_EINVAL; + if (fname && !sz_fname) return MSVCRT_EINVAL; + if (!ext && sz_ext) return MSVCRT_EINVAL; + if (ext && !sz_ext) return MSVCRT_EINVAL; + + if (inpath[0] && inpath[1] == ':') + { + if (drive) + { + if (sz_drive <= 2) goto do_error; + drive[0] = inpath[0]; + drive[1] = inpath[1]; + drive[2] = 0; + } + inpath += 2; + } + else if (drive) drive[0] = '\0'; + + /* look for end of directory part */ + end = NULL; + for (p = inpath; *p; p++) if (*p == '/' || *p == '\\') end = p + 1; + + if (end) /* got a directory */ + { + if (dir) + { + if (sz_dir <= end - inpath) goto do_error; + memcpy( dir, inpath, (end - inpath) * sizeof(MSVCRT_wchar_t) ); + dir[end - inpath] = 0; + } + inpath = end; + } + else if (dir) dir[0] = 0; + + /* look for extension: what's after the last dot */ + end = NULL; + for (p = inpath; *p; p++) if (*p == '.') end = p; + + if (!end) end = p; /* there's no extension */ + + if (fname) + { + if (sz_fname <= end - inpath) goto do_error; + memcpy( fname, inpath, (end - inpath) * sizeof(MSVCRT_wchar_t) ); + fname[end - inpath] = 0; + } + if (ext) + { + if (sz_ext <= strlenW(end)) goto do_error; + strcpyW( ext, end ); + } + return 0; +do_error: + if (drive) drive[0] = '\0'; + if (dir) dir[0] = '\0'; + if (fname) fname[0]= '\0'; + if (ext) ext[0]= '\0'; + return MSVCRT_ERANGE; +} + /********************************************************************* * _wfullpath (MSVCRT.@) * diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index b9aea53..73862dc 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -403,6 +403,11 @@ struct MSVCRT__stat64 { #define MSVCRT__IOLBF 0x0040 #define MSVCRT_FILENAME_MAX 260 +#define MSVCRT_DRIVE_MAX 3 +#define MSVCRT_FNAME_MAX 256 +#define MSVCRT_DIR_MAX 256 +#define MSVCRT_EXT_MAX 256 +#define MSVCRT_PATH_MAX 260 #define MSVCRT_stdin (MSVCRT__iob+MSVCRT_STDIN_FILENO) #define MSVCRT_stdout (MSVCRT__iob+MSVCRT_STDOUT_FILENO) #define MSVCRT_stderr (MSVCRT__iob+MSVCRT_STDERR_FILENO) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c54d33e..0da6a25 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -571,6 +571,7 @@ @ cdecl _wspawnvp(long wstr ptr) @ cdecl _wspawnvpe(long wstr ptr ptr) @ cdecl _wsplitpath(wstr wstr wstr wstr wstr) +@ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long) _wsplitpath_s @ cdecl _wstat(wstr ptr) MSVCRT__wstat @ cdecl _wstati64(wstr ptr) MSVCRT__wstati64 @ cdecl _wstat64(wstr ptr) MSVCRT__wstat64

1 0

Paul Vriens : kernel32/tests: Add a missing newline.
by Alexandre Julliard Oct. 7, 2008

Oct. 7, 2008

Module: wine Branch: master Commit: 839b5400cd88ea289de149e409f4004644badf26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=839b5400cd88ea289de149e40… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Oct 7 14:07:50 2008 +0200 kernel32/tests: Add a missing newline. --- dlls/kernel32/tests/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 4531c9f..321053f 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1251,7 +1251,7 @@ static void test_Console(void) ok(cpOutC == 1252, "Wrong console-SB CP (expected 1252 got %d/%d)\n", cpOutC, cpOut); } else - win_skip("Setting the codepage is not implemented"); + win_skip("Setting the codepage is not implemented\n"); ok(modeInC == (modeIn ^ 1), "Wrong console mode\n"); ok(modeOutC == (modeOut ^ 1), "Wrong console-SB mode\n");

1 0

John Klehm : wintab32: Send notification when z-order changes.
by Alexandre Julliard Oct. 7, 2008

Oct. 7, 2008

Module: wine Branch: master Commit: 3496d17018de61d95e974b673959d7827e43c374 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3496d17018de61d95e974b673… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Tue Oct 7 01:05:51 2008 -0500 wintab32: Send notification when z-order changes. --- dlls/wintab32/context.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index bf46170..33c780c 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -648,6 +648,10 @@ BOOL WINAPI WTEnable(HCTX hCtx, BOOL fEnable) context->enabled = TRUE; /* TODO: Add to top of overlap order */ context->context.lcStatus = CXS_ONTOP; + TABLET_PostTabletMessage(context, + _WT_CTXOVERLAP(context->context.lcMsgBase), + (WPARAM)context->handle, + context->context.lcStatus, TRUE); } /* if we want to disable and it is not disabled then */ else if (!fEnable && context->enabled) @@ -656,6 +660,10 @@ BOOL WINAPI WTEnable(HCTX hCtx, BOOL fEnable) /* TODO: Remove from overlap order?? needs a test */ context->context.lcStatus = CXS_DISABLED; TABLET_FlushQueue(context); + TABLET_PostTabletMessage(context, + _WT_CTXOVERLAP(context->context.lcMsgBase), + (WPARAM)context->handle, + context->context.lcStatus, TRUE); } LeaveCriticalSection(&csTablet); @@ -677,17 +685,26 @@ BOOL WINAPI WTOverlap(HCTX hCtx, BOOL fToTop) EnterCriticalSection(&csTablet); context = TABLET_FindOpenContext(hCtx); - if (fToTop) + /* if we want to send to top and it's not already there */ + if (fToTop && context->context.lcStatus != CXS_ONTOP) { /* TODO: Move context to top of overlap order */ FIXME("Not moving context to top of overlap order\n"); context->context.lcStatus = CXS_ONTOP; + TABLET_PostTabletMessage(context, + _WT_CTXOVERLAP(context->context.lcMsgBase), + (WPARAM)context->handle, + context->context.lcStatus, TRUE); } - else + else if (!fToTop) { /* TODO: Move context to bottom of overlap order */ FIXME("Not moving context to bottom of overlap order\n"); context->context.lcStatus = CXS_OBSCURED; + TABLET_PostTabletMessage(context, + _WT_CTXOVERLAP(context->context.lcMsgBase), + (WPARAM)context->handle, + context->context.lcStatus, TRUE); } LeaveCriticalSection(&csTablet);

1 0

Michael Karcher : msxml3: Revert "Simplify IXMLDOMNode::removeChild".
by Alexandre Julliard Oct. 7, 2008

Oct. 7, 2008

Module: wine Branch: master Commit: 57ee10ff12a7ed1d2ca2936c17b465c9791bac7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=57ee10ff12a7ed1d2ca2936c1… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Tue Oct 7 11:56:06 2008 +0200 msxml3: Revert "Simplify IXMLDOMNode::removeChild". The simplification was bad, native msxml works if interface pointers to the wrong interface are passed in. Tests included. --- dlls/msxml3/node.c | 11 ++++++++++- dlls/msxml3/tests/domdoc.c | 8 ++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 9598e29..7056ca3 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -671,6 +671,8 @@ static HRESULT WINAPI xmlnode_removeChild( { xmlnode *This = impl_from_IXMLDOMNode( iface ); xmlNode *child_node_ptr; + HRESULT hr; + IXMLDOMNode *child; TRACE("%p->(%p, %p)\n", This, childNode, oldChild); @@ -679,15 +681,22 @@ static HRESULT WINAPI xmlnode_removeChild( if(oldChild) *oldChild = NULL; - child_node_ptr = impl_from_IXMLDOMNode(childNode)->node; + hr = IXMLDOMNode_QueryInterface(childNode, &IID_IXMLDOMNode, (LPVOID)&child); + if(FAILED(hr)) + return hr; + + child_node_ptr = impl_from_IXMLDOMNode(child)->node; if(child_node_ptr->parent != This->node) { WARN("childNode %p is not a child of %p\n", childNode, iface); + IXMLDOMNode_Release(child); return E_INVALIDARG; } xmlUnlinkNode(child_node_ptr); + IXMLDOMNode_Release(child); + if(oldChild) { IXMLDOMNode_AddRef(childNode); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 1645e2f..aeb53d7 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1791,7 +1791,7 @@ static void test_removeChild(void) BSTR str; VARIANT_BOOL b; IXMLDOMDocument *doc; - IXMLDOMElement *element; + IXMLDOMElement *element, *lc_element; IXMLDOMNode *fo_node, *ba_node, *removed_node, *temp_node, *lc_node; IXMLDOMNodeList *root_list, *fo_list; @@ -1855,7 +1855,11 @@ static void test_removeChild(void) r = IXMLDOMNodeList_get_item( root_list, 0, &lc_node ); ok( r == S_OK, "ret %08x\n", r); - r = IXMLDOMElement_removeChild( element, lc_node, NULL ); + r = IXMLDOMElement_QueryInterface( lc_node, &IID_IXMLDOMElement, (LPVOID*)&lc_element ); + ok( r == S_OK, "ret %08x\n", r); + + /* MS quirk: passing wrong interface pointer works, too */ + r = IXMLDOMElement_removeChild( element, (IXMLDOMNode*)lc_element, NULL ); ok( r == S_OK, "ret %08x\n", r); r = IXMLDOMNode_get_parentNode( lc_node, &temp_node );

1 0

Michael Karcher : msxml3: Handle all variant types in IXMLDOMDocument:: createNode.
by Alexandre Julliard Oct. 7, 2008

Oct. 7, 2008

Module: wine Branch: master Commit: 91513caa16f5c5c523a312e05920e4ea943cf4fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=91513caa16f5c5c523a312e05… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Tue Oct 7 11:55:57 2008 +0200 msxml3: Handle all variant types in IXMLDOMDocument::createNode. --- dlls/msxml3/domdoc.c | 22 ++++++++++++++++------ dlls/msxml3/tests/domdoc.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 3c5aede..41cd856 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1110,13 +1110,19 @@ static HRESULT WINAPI domdoc_getElementsByTagName( return hr; } -static DOMNodeType get_node_type(VARIANT Type) +static HRESULT get_node_type(VARIANT Type, DOMNodeType * type) { - if(V_VT(&Type) == VT_I4) - return V_I4(&Type); + VARIANT tmp; + HRESULT hr; + + VariantInit(&tmp); + hr = VariantChangeType(&tmp, &Type, 0, VT_I4); + if(FAILED(hr)) + return E_INVALIDARG; + + *type = V_I4(&tmp); - FIXME("Unsupported variant type %x\n", V_VT(&Type)); - return 0; + return S_OK; } static HRESULT WINAPI domdoc_createNode( @@ -1130,10 +1136,14 @@ static HRESULT WINAPI domdoc_createNode( DOMNodeType node_type; xmlNodePtr xmlnode = NULL; xmlChar *xml_name; + HRESULT hr; TRACE("(%p)->(type,%s,%s,%p)\n", This, debugstr_w(name), debugstr_w(namespaceURI), node); - node_type = get_node_type(Type); + hr = get_node_type(Type, &node_type); + if(FAILED(hr)) + return hr; + TRACE("node_type %d\n", node_type); xml_name = xmlChar_from_wchar((WCHAR*)name); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 056c91b..1645e2f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1353,6 +1353,8 @@ static void test_refs(void) static void test_create(void) { + static const WCHAR szOne[] = {'1',0}; + static const WCHAR szOneGarbage[] = {'1','G','a','r','b','a','g','e',0}; HRESULT r; VARIANT var; BSTR str, name; @@ -1369,6 +1371,36 @@ static void test_create(void) if( r != S_OK ) return; + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ELEMENT; + str = SysAllocString( szlc ); + r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); + ok( r == S_OK, "returns %08x\n", r ); + if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); + + V_VT(&var) = VT_R4; + V_R4(&var) = NODE_ELEMENT; + str = SysAllocString( szlc ); + r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); + ok( r == S_OK, "returns %08x\n", r ); + if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString( szOne ); + str = SysAllocString( szlc ); + r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); + ok( r == S_OK, "returns %08x\n", r ); + if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); + VariantClear(&var); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString( szOneGarbage ); + str = SysAllocString( szlc ); + r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); + ok( r == E_INVALIDARG, "returns %08x\n", r ); + if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); + VariantClear(&var); + V_VT(&var) = VT_I4; V_I4(&var) = NODE_ELEMENT; str = SysAllocString( szlc );

1 0