wine-commits July 2008

wine-commits@winehq.org

3 participants
1114 discussions

Rob Shearman : widl: Increment the buffer offset by 8 for embedded pointers inside varying arrays in varying structures .
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: fb224429f7f5bcd66798ceb1709c048789238e41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb224429f7f5bcd66798ceb17… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Jul 2 00:00:43 2008 +0100 widl: Increment the buffer offset by 8 for embedded pointers inside varying arrays in varying structures. The 8 bytes are for the variance and offset and are added just before the array, as seen in the marshalling code in rpcrt4. No offset needs to be added for non-varying structures since the buffer mark is set after the conformance in marshalled or unmarshalled. --- tools/widl/typegen.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f7a189a..79ae0f4 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1437,6 +1437,14 @@ static int write_varying_array_pointer_descriptions( if (offset_in_memory && offset_in_buffer) { size_t padding; + + if (is_array(v->type) && v->type->length_is) + { + *offset_in_buffer = ROUND_SIZE(*offset_in_buffer, 4); + /* skip over variance and offset in buffer */ + *offset_in_buffer += 8; + } + align = 0; type_memsize(v->type, &align); padding = ROUNDING(*offset_in_memory, align); @@ -1470,19 +1478,13 @@ static void write_pointer_description(FILE *file, type_t *type, { size_t offset_in_buffer; size_t offset_in_memory; - size_t conformance = 0; - - if (type->type == RPC_FC_CVSTRUCT) - conformance = 8; - else if (type->type == RPC_FC_CSTRUCT || type->type == RPC_FC_CPSTRUCT) - conformance = 4; /* pass 1: search for single instance of a pointer (i.e. don't descend * into arrays) */ if (!is_array(type)) { offset_in_memory = 0; - offset_in_buffer = conformance; + offset_in_buffer = 0; write_no_repeat_pointer_descriptions( file, type, &offset_in_memory, &offset_in_buffer, typestring_offset); @@ -1490,7 +1492,7 @@ static void write_pointer_description(FILE *file, type_t *type, /* pass 2: search for pointers in fixed arrays */ offset_in_memory = 0; - offset_in_buffer = conformance; + offset_in_buffer = 0; write_fixed_array_pointer_descriptions( file, NULL, type, &offset_in_memory, &offset_in_buffer, typestring_offset); @@ -1512,7 +1514,7 @@ static void write_pointer_description(FILE *file, type_t *type, /* pass 4: search for pointers in varying arrays */ offset_in_memory = 0; - offset_in_buffer = conformance; + offset_in_buffer = 0; write_varying_array_pointer_descriptions( file, NULL, type, &offset_in_memory, &offset_in_buffer, typestring_offset);

1 0

Rob Shearman : rpcrt4: Reset the BufferLength to the used part of the buffer in NdrProxySendReceive .
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 182a2ae3150cdf0defd8c85c021175d1238901ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=182a2ae3150cdf0defd8c85c0… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Jul 1 23:34:12 2008 +0100 rpcrt4: Reset the BufferLength to the used part of the buffer in NdrProxySendReceive. This avoids sending uninitialised data on the wire. --- dlls/rpcrt4/cproxy.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 6ddaccd..8272679 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -385,6 +385,8 @@ void WINAPI NdrProxySendReceive(void *This, } pStubMsg->dwStubPhase = PROXY_SENDRECEIVE; + /* avoid sending uninitialised parts of the buffer on the wire */ + pStubMsg->RpcMsg->BufferLength = pStubMsg->Buffer - (unsigned char *)pStubMsg->RpcMsg->Buffer; hr = IRpcChannelBuffer_SendReceive(pStubMsg->pRpcChannelBuffer, (RPCOLEMESSAGE*)pStubMsg->RpcMsg, &Status);

1 0

H. Verbeet : wined3d: Extract an attach_depth_stencil_fbo() function.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: d5a8875b930abbc43b8adcf369483339a1b5c786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5a8875b930abbc43b8adcf36… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jul 1 21:30:11 2008 +0200 wined3d: Extract an attach_depth_stencil_fbo() function. The idea is to make setting depth attachments a bit more consistent with set_render_target_fbo()/attach_surface_fbo(). I've also got an upcoming patch in my tree that needs this. --- dlls/wined3d/device.c | 94 ++++++++++++++++++++++++++----------------------- 1 files changed, 50 insertions(+), 44 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e3fa816..45dc25c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6059,6 +6059,54 @@ static void bind_fbo(IWineD3DDevice *iface, GLenum target, GLuint *fbo) { checkGLcall("glBindFramebuffer()"); } +/* TODO: Handle stencil attachments */ +static void attach_depth_stencil_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, IWineD3DSurface *depth_stencil, BOOL use_render_buffer) { + IWineD3DSurfaceImpl *depth_stencil_impl = (IWineD3DSurfaceImpl *)depth_stencil; + + if (use_render_buffer && depth_stencil_impl->current_renderbuffer) { + GL_EXTCALL(glFramebufferRenderbufferEXT(fbo_target, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, depth_stencil_impl->current_renderbuffer->id)); + checkGLcall("glFramebufferRenderbufferEXT()"); + } else { + IWineD3DBaseTextureImpl *texture_impl; + GLenum texttarget, target; + GLint old_binding = 0; + + texttarget = depth_stencil_impl->glDescription.target; + if(texttarget == GL_TEXTURE_2D) { + target = GL_TEXTURE_2D; + glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_binding); + } else if(texttarget == GL_TEXTURE_RECTANGLE_ARB) { + target = GL_TEXTURE_RECTANGLE_ARB; + glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_binding); + } else { + target = GL_TEXTURE_CUBE_MAP_ARB; + glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP_ARB, &old_binding); + } + + IWineD3DSurface_PreLoad(depth_stencil); + + glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri(target, GL_DEPTH_TEXTURE_MODE_ARB, GL_LUMINANCE); + glBindTexture(target, old_binding); + + /* Update base texture states array */ + if (SUCCEEDED(IWineD3DSurface_GetContainer(depth_stencil, &IID_IWineD3DBaseTexture, (void **)&texture_impl))) { + texture_impl->baseTexture.states[WINED3DTEXSTA_MINFILTER] = WINED3DTEXF_POINT; + texture_impl->baseTexture.states[WINED3DTEXSTA_MAGFILTER] = WINED3DTEXF_POINT; + if (texture_impl->baseTexture.bindCount) { + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(texture_impl->baseTexture.sampler)); + } + + IWineD3DBaseTexture_Release((IWineD3DBaseTexture *)texture_impl); + } + + GL_EXTCALL(glFramebufferTexture2DEXT(fbo_target, GL_DEPTH_ATTACHMENT_EXT, texttarget, + depth_stencil_impl->glDescription.textureName, depth_stencil_impl->glDescription.level)); + checkGLcall("glFramebufferTexture2DEXT()"); + } +} + static void attach_surface_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, DWORD idx, IWineD3DSurface *surface) { const IWineD3DSurfaceImpl *surface_impl = (IWineD3DSurfaceImpl *)surface; IWineD3DBaseTextureImpl *texture_impl; @@ -6409,53 +6457,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetDepthStencilSurface(IWineD3DDevice /* TODO: Handle stencil attachments */ static void set_depth_stencil_fbo(IWineD3DDevice *iface, IWineD3DSurface *depth_stencil) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DSurfaceImpl *depth_stencil_impl = (IWineD3DSurfaceImpl *)depth_stencil; TRACE("Set depth stencil to %p\n", depth_stencil); - if (depth_stencil_impl) { - if (depth_stencil_impl->current_renderbuffer) { - GL_EXTCALL(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, depth_stencil_impl->current_renderbuffer->id)); - checkGLcall("glFramebufferRenderbufferEXT()"); - } else { - IWineD3DBaseTextureImpl *texture_impl; - GLenum texttarget, target; - GLint old_binding = 0; - - texttarget = depth_stencil_impl->glDescription.target; - if(texttarget == GL_TEXTURE_2D) { - target = GL_TEXTURE_2D; - glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_binding); - } else if(texttarget == GL_TEXTURE_RECTANGLE_ARB) { - target = GL_TEXTURE_RECTANGLE_ARB; - glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_binding); - } else { - target = GL_TEXTURE_CUBE_MAP_ARB; - glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP_ARB, &old_binding); - } - - IWineD3DSurface_PreLoad(depth_stencil); - - glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexParameteri(target, GL_DEPTH_TEXTURE_MODE_ARB, GL_LUMINANCE); - glBindTexture(target, old_binding); - - /* Update base texture states array */ - if (SUCCEEDED(IWineD3DSurface_GetContainer(depth_stencil, &IID_IWineD3DBaseTexture, (void **)&texture_impl))) { - texture_impl->baseTexture.states[WINED3DTEXSTA_MINFILTER] = WINED3DTEXF_POINT; - texture_impl->baseTexture.states[WINED3DTEXSTA_MAGFILTER] = WINED3DTEXF_POINT; - if (texture_impl->baseTexture.bindCount) { - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(texture_impl->baseTexture.sampler)); - } - - IWineD3DBaseTexture_Release((IWineD3DBaseTexture *)texture_impl); - } - - GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, texttarget, - depth_stencil_impl->glDescription.textureName, depth_stencil_impl->glDescription.level)); - checkGLcall("glFramebufferTexture2DEXT()"); - } + if (depth_stencil) { + attach_depth_stencil_fbo(This, GL_FRAMEBUFFER_EXT, depth_stencil, TRUE); } else { GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, 0, 0)); checkGLcall("glFramebufferTexture2DEXT()");

1 0

H. Verbeet : wined3d: Get rid of a redundant local variable.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: a1a14fb2c33ed729641979e65e8b7859732ff221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1a14fb2c33ed729641979e65… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jul 1 21:29:45 2008 +0200 wined3d: Get rid of a redundant local variable. --- dlls/wined3d/device.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f7301d7..e3fa816 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6464,11 +6464,10 @@ static void set_depth_stencil_fbo(IWineD3DDevice *iface, IWineD3DSurface *depth_ static void set_render_target_fbo(IWineD3DDevice *iface, DWORD idx, IWineD3DSurface *render_target) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DSurfaceImpl *rtimpl = (IWineD3DSurfaceImpl *)render_target; TRACE("Set render target %u to %p\n", idx, render_target); - if (rtimpl) { + if (render_target) { attach_surface_fbo(This, GL_FRAMEBUFFER_EXT, idx, render_target); This->draw_buffers[idx] = GL_COLOR_ATTACHMENT0_EXT + idx; } else {

1 0

Peter Oberndorfer : msvcrt: Implement %p for scanf.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 9e3a4652dafbcf1f3f957858a54f2149e91942b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3a4652dafbcf1f3f957858a… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue Jul 1 21:15:00 2008 +0200 msvcrt: Implement %p for scanf. --- dlls/msvcrt/scanf.h | 4 +++- dlls/msvcrt/tests/scanf.c | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 07c64e8..c236f48 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -149,6 +149,8 @@ _FUNCTION_ { } /* read type */ switch(*format) { + case 'p': + case 'P': /* pointer. */ case 'x': case 'X': /* hexadecimal integer. */ base = 16; @@ -179,7 +181,7 @@ _FUNCTION_ { if (width>0) width--; } /* look for leading indication of base */ - if (width!=0 && nch == '0') { + if (width!=0 && nch == '0' && *format != 'p' && *format != 'P') { nch = _GETC_(file); if (width>0) width--; seendigit=1; diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index c2a695b..b152eac 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -41,7 +41,6 @@ static void test_sscanf( void ) ok( ret == EOF,"sscanf returns %x instead of %x\n", ret, EOF ); /* check %p */ - todo_wine { ok( sscanf("000000000046F170", "%p", &ptr) == 1, "sscanf failed\n" ); ok( ptr == (void *)0x46F170,"sscanf reads %p instead of %x\n", ptr, 0x46F170 ); @@ -66,7 +65,6 @@ static void test_sscanf( void ) ok( sscanf("1234", "%P", &ptr) == 1, "sscanf failed\n" ); ok( ptr == (void *)0x1234,"sscanf reads %p instead of %x\n", ptr, 0x1234 ); - } /* check %x */ strcpy(buffer,"0x519");

1 0

Peter Oberndorfer : msvcrt: Add a test for scanf %p.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 02fb99e6b360a6f321f716b57df97ca79ec1b9f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02fb99e6b360a6f321f716b57… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue Jul 1 21:14:51 2008 +0200 msvcrt: Add a test for scanf %p. --- dlls/msvcrt/tests/scanf.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 65bea46..c2a695b 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -28,6 +28,7 @@ static void test_sscanf( void ) char format[20]; int result, ret; char c; + void *ptr; float res1= -82.6267f, res2= 27.76f, res11, res12; static const char pname[]=" St. Petersburg, Florida\n"; int hour=21,min=59,sec=20; @@ -39,6 +40,34 @@ static void test_sscanf( void ) ret = sscanf(buffer, "%d", &result); ok( ret == EOF,"sscanf returns %x instead of %x\n", ret, EOF ); + /* check %p */ + todo_wine { + ok( sscanf("000000000046F170", "%p", &ptr) == 1, "sscanf failed\n" ); + ok( ptr == (void *)0x46F170,"sscanf reads %p instead of %x\n", ptr, 0x46F170 ); + + ok( sscanf("0046F171", "%p", &ptr) == 1, "sscanf failed\n" ); + ok( ptr == (void *)0x46F171,"sscanf reads %p instead of %x\n", ptr, 0x46F171 ); + + ok( sscanf("46F172", "%p", &ptr) == 1, "sscanf failed\n" ); + ok( ptr == (void *)0x46F172,"sscanf reads %p instead of %x\n", ptr, 0x46F172 ); + + ok( sscanf("0x46F173", "%p", &ptr) == 1, "sscanf failed\n" ); + ok( ptr == (void *)0,"sscanf reads %p instead of %x\n", ptr, 0 ); + + ok( sscanf("-46F174", "%p", &ptr) == 1, "sscanf failed\n" ); + ok( ptr == (void *)0xFFB90E8C,"sscanf reads %p instead of %x\n", ptr, 0xFFB90E8C ); + + ok( sscanf("+46F175", "%p", &ptr) == 1, "sscanf failed\n" ); + ok( ptr == (void *)0x46F175,"sscanf reads %p instead of %x\n", ptr, 0x46F175 ); + + /* check %p with no hex digits */ + ok( sscanf("1233", "%p", &ptr) == 1, "sscanf failed\n" ); + ok( ptr == (void *)0x1233,"sscanf reads %p instead of %x\n", ptr, 0x1233 ); + + ok( sscanf("1234", "%P", &ptr) == 1, "sscanf failed\n" ); + ok( ptr == (void *)0x1234,"sscanf reads %p instead of %x\n", ptr, 0x1234 ); + } + /* check %x */ strcpy(buffer,"0x519"); ok( sscanf(buffer, "%x", &result) == 1, "sscanf failed\n" );

1 0

Piotr Caban : msxml3: Added IXMLDOMElement_getAttributeNode implementation.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: c0661fdb90816ff5b19c86bb80709cec70896cad URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0661fdb90816ff5b19c86bb8… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 1 19:47:08 2008 +0200 msxml3: Added IXMLDOMElement_getAttributeNode implementation. --- dlls/msxml3/element.c | 29 +++++++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 4 ---- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 76af4c6..4b9bf6c 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -582,8 +582,33 @@ static HRESULT WINAPI domelem_getAttributeNode( IXMLDOMElement *iface, BSTR p, IXMLDOMAttribute** attributeNode ) { - FIXME("\n"); - return E_NOTIMPL; + domelem *This = impl_from_IXMLDOMElement( iface ); + xmlChar *xml_name; + xmlNodePtr element; + xmlAttrPtr attr; + IUnknown *unk; + HRESULT hr = E_FAIL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), attributeNode); + + element = get_element( This ); + if ( !element ) + return E_FAIL; + + xml_name = xmlChar_from_wchar(p); + + attr = xmlHasProp(element, xml_name); + if(attr) { + unk = create_attribute((xmlNodePtr)attr); + hr = IUnknown_QueryInterface(unk, &IID_IXMLDOMAttribute, (void**)attributeNode); + IUnknown_Release(unk); + }else { + *attributeNode = NULL; + } + + HeapFree(GetProcessHeap(), 0, xml_name); + + return hr; } static HRESULT WINAPI domelem_setAttributeNode( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 0479d80..d5c463d 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -939,10 +939,8 @@ static void test_domnode( void ) attr = (IXMLDOMAttribute*)0xdeadbeef; r = IXMLDOMElement_getAttributeNode( element, str, &attr); - todo_wine { ok( r == E_FAIL, "getAttributeNode ret %08x\n", r ); ok( attr == NULL, "getAttributeNode ret %p, expected NULL\n", attr ); - } SysFreeString( str ); str = SysAllocString( szdl ); @@ -962,10 +960,8 @@ static void test_domnode( void ) attr = NULL; r = IXMLDOMElement_getAttributeNode( element, str, &attr); - todo_wine { ok( r == S_OK, "GetAttributeNode ret %08x\n", r ); ok( attr != NULL, "getAttributeNode returned NULL\n" ); - } if(attr) IXMLDOMAttribute_Release(attr);

1 0

Piotr Caban : msxml3: Added IXMLDOMElement_getAttributeNode test.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: bd4e7379aedfa6f453cd850d47e7a2c17708d411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd4e7379aedfa6f453cd850d4… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 1 19:47:03 2008 +0200 msxml3: Added IXMLDOMElement_getAttributeNode test. --- dlls/msxml3/tests/domdoc.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 820a37a..0479d80 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -853,6 +853,7 @@ static void test_domnode( void ) IXMLDOMNamedNodeMap *map = NULL; IXMLDOMNode *node = NULL, *next = NULL; IXMLDOMNodeList *list = NULL; + IXMLDOMAttribute *attr = NULL; DOMNodeType type = NODE_INVALID; VARIANT_BOOL b; BSTR str; @@ -935,6 +936,13 @@ static void test_domnode( void ) ok( r == E_FAIL, "getAttribute ret %08x\n", r ); ok( V_VT(&var) == VT_NULL || V_VT(&var) == VT_EMPTY, "vt = %x\n", V_VT(&var)); VariantClear(&var); + + attr = (IXMLDOMAttribute*)0xdeadbeef; + r = IXMLDOMElement_getAttributeNode( element, str, &attr); + todo_wine { + ok( r == E_FAIL, "getAttributeNode ret %08x\n", r ); + ok( attr == NULL, "getAttributeNode ret %p, expected NULL\n", attr ); + } SysFreeString( str ); str = SysAllocString( szdl ); @@ -952,6 +960,15 @@ static void test_domnode( void ) r = IXMLDOMElement_getAttribute( element, str, NULL ); ok( r == E_INVALIDARG, "getAttribute ret %08x\n", r ); + attr = NULL; + r = IXMLDOMElement_getAttributeNode( element, str, &attr); + todo_wine { + ok( r == S_OK, "GetAttributeNode ret %08x\n", r ); + ok( attr != NULL, "getAttributeNode returned NULL\n" ); + } + if(attr) + IXMLDOMAttribute_Release(attr); + SysFreeString( str ); r = IXMLDOMElement_get_attributes( element, &map );

1 0

James Hawkins : rpcrt4: Fix a few failing tests in win2k.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: ee24a372bee31baff6f5c7ab6084da5ceb67bf69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee24a372bee31baff6f5c7ab6… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 1 00:28:01 2008 -0500 rpcrt4: Fix a few failing tests in win2k. --- dlls/rpcrt4/tests/ndr_marshall.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index a860253..fa19674 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1161,7 +1161,9 @@ static void test_client_init(void) ok(stubMsg.IsClient == 1, "stubMsg.IsClient should have been 1 instead of %u\n", stubMsg.IsClient); TEST_ZERO(ReuseBuffer, "%d"); TEST_ZERO(pAllocAllNodesContext, "%p"); - TEST_ZERO(pPointerQueueState, "%p"); + ok(stubMsg.pPointerQueueState == 0 || + broken(stubMsg.pPointerQueueState == (void *)0xcccccccc), /* win2k */ + "stubMsg.pPointerQueueState should have been unset instead of %p\n", stubMsg.pPointerQueueState); TEST_ZERO(IgnoreEmbeddedPointers, "%d"); TEST_ZERO(PointerBufferMark, "%p"); TEST_ZERO(CorrDespIncrement, "%d"); @@ -1260,9 +1262,13 @@ todo_wine TEST_ULONG_UNSET(MemorySize); TEST_POINTER_UNSET(Memory); ok(stubMsg.IsClient == 0, "stubMsg.IsClient should have been 0 instead of %u\n", stubMsg.IsClient); - TEST_ZERO(ReuseBuffer, "%d"); + ok(stubMsg.ReuseBuffer == 0 || + broken(stubMsg.ReuseBuffer == 1), /* win2k */ + "stubMsg.ReuseBuffer should have been set to zero instead of %d\n", stubMsg.ReuseBuffer); TEST_ZERO(pAllocAllNodesContext, "%p"); - TEST_ZERO(pPointerQueueState, "%p"); + ok(stubMsg.pPointerQueueState == 0 || + broken(stubMsg.pPointerQueueState == (void *)0xcccccccc), /* win2k */ + "stubMsg.pPointerQueueState should have been unset instead of %p\n", stubMsg.pPointerQueueState); TEST_ZERO(IgnoreEmbeddedPointers, "%d"); TEST_ZERO(PointerBufferMark, "%p"); ok(stubMsg.CorrDespIncrement == 0xcc, "CorrDespIncrement should have been unset instead of 0x%x\n", stubMsg.CorrDespIncrement);

1 0

James Hawkins : oleaut32: Fix a test that fails on all platforms up to and including win2k.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: d932fefb6115c0f56c79917739451b14fa4a1c75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d932fefb6115c0f56c7991773… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Jun 30 23:55:37 2008 -0500 oleaut32: Fix a test that fails on all platforms up to and including win2k. --- dlls/oleaut32/tests/olefont.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index cbf85e1..9f96fee 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -769,8 +769,9 @@ static void test_AddRefHfont(void) /* Decrement reference for destroyed hfnt1 */ hres = IFont_ReleaseHfont(ifnt2,hfnt1); - ok(hres == S_OK, - "IFont_AddRefHfont: (Release ref) Expected S_OK but got 0x%08x\n", + ok(hres == S_OK || + hres == S_FALSE, /* <= win2k */ + "IFont_AddRefHfont: (Release ref) Expected S_OK or S_FALSE but got 0x%08x\n", hres); /* Shows that releasing all IFONT's does clear the HFONT cache. */

1 0

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 July 2008