November 2011 - Wine-commits

Huw Davies : msxml3: Re-initialise the variant so that VariantChangeType doesn' t free the user string.
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: 8f9c39d2a8a3666efb86d400d9f5f9c464f3ab2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f9c39d2a8a3666efb86d400d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 16 13:18:49 2011 +0000 msxml3: Re-initialise the variant so that VariantChangeType doesn't free the user string. --- dlls/msxml3/httprequest.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 32cfc2c..2385d18 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -706,6 +706,7 @@ static HRESULT WINAPI httprequest_open(IXMLHTTPRequest *iface, BSTR method, BSTR if (hr == S_OK) This->user = V_BSTR(&str); + VariantInit(&str); hr = VariantChangeType(&str, &password, 0, VT_BSTR); if (hr == S_OK) This->password = V_BSTR(&str);

1 0

Francois Gouget : rpcrt4: An interface pointer just has the size of a regular pointer.
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: e9e0507d2b470fe6edadab777506899d50a75ce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9e0507d2b470fe6edadab777… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 16 16:24:39 2011 +0100 rpcrt4: An interface pointer just has the size of a regular pointer. --- dlls/rpcrt4/ndr_stubless.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index fdde3a4..88aae7a 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -211,6 +211,8 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) break; default: FIXME("Unhandled type %02x\n", *pFormat); + /* fallthrough */ + case RPC_FC_IP: size = sizeof(void *); break; }

1 0

Francois Gouget : dxgi: Remove an unneeded refcount field.
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: fb49b7fd5b43d55840ecabe762ab5e99e11b37bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb49b7fd5b43d55840ecabe76… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 16 16:27:45 2011 +0100 dxgi: Remove an unneeded refcount field. --- dlls/dxgi/dxgi_main.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index 2ef5072..36e3326 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -39,7 +39,6 @@ struct dxgi_main HMODULE d3d10core; struct dxgi_device_layer *device_layers; UINT layer_count; - LONG refcount; }; static struct dxgi_main dxgi_main; @@ -65,11 +64,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); - ++dxgi_main.refcount; break; case DLL_PROCESS_DETACH: - if (!--dxgi_main.refcount) dxgi_main_cleanup(); + dxgi_main_cleanup(); break; }

1 0

Francois Gouget : msvcrt: Statically initialize and name the MSVCRT_file_cs critical section.
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: d78bfe1149c1974d29d602a219f4423eaaa4e921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d78bfe1149c1974d29d602a21… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 16 16:28:20 2011 +0100 msvcrt: Statically initialize and name the MSVCRT_file_cs critical section. --- dlls/msvcrt/file.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1334ec6..c636e85 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -128,6 +128,13 @@ static const ULONGLONG WCCOM = TOUL('c') << 32 | TOUL('o') << 16 | TOUL('m'); * protection, rather than locking the whole table for every change. */ static CRITICAL_SECTION MSVCRT_file_cs; +static CRITICAL_SECTION_DEBUG MSVCRT_file_cs_debug = +{ + 0, 0, &MSVCRT_file_cs, + { &MSVCRT_file_cs_debug.ProcessLocksList, &MSVCRT_file_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": MSVCRT_file_cs") } +}; +static CRITICAL_SECTION MSVCRT_file_cs = { &MSVCRT_file_cs_debug, -1, 0, 0, 0, 0 }; #define LOCK_FILES() do { EnterCriticalSection(&MSVCRT_file_cs); } while (0) #define UNLOCK_FILES() do { LeaveCriticalSection(&MSVCRT_file_cs); } while (0) @@ -440,8 +447,6 @@ void msvcrt_init_io(void) int i; ioinfo *fdinfo; - InitializeCriticalSection(&MSVCRT_file_cs); - MSVCRT_file_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": MSVCRT_file_cs"); GetStartupInfoA(&si); if (si.cbReserved2 >= sizeof(unsigned int) && si.lpReserved2 != NULL) { @@ -983,7 +988,6 @@ void msvcrt_free_io(void) for(i=0; i<sizeof(MSVCRT_fstream)/sizeof(MSVCRT_fstream[0]); i++) MSVCRT_free(MSVCRT_fstream[i]); - MSVCRT_file_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&MSVCRT_file_cs); }

1 0

Henri Verbeet : wined3d: Pass a wined3d_color struct to wined3d_device_clear().
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: e0a0d611af86e3320dd305c7af0abe14065cd8ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0a0d611af86e3320dd305c7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 15 21:18:28 2011 +0100 wined3d: Pass a wined3d_color struct to wined3d_device_clear(). --- dlls/d3d8/device.c | 15 +++++++++++---- dlls/d3d9/device.c | 16 +++++++++++----- dlls/ddraw/device.c | 21 +++++++++++---------- dlls/wined3d/device.c | 12 ++++++------ dlls/wined3d/swapchain.c | 4 +++- include/wine/wined3d.h | 4 +--- 6 files changed, 43 insertions(+), 29 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 1ead518..4ba3bbd 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1200,17 +1200,24 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice8Impl_EndScene(IDirect3DD return hr; } -static HRESULT WINAPI IDirect3DDevice8Impl_Clear(IDirect3DDevice8 *iface, DWORD Count, - const D3DRECT *pRects, DWORD Flags, D3DCOLOR Color, float Z, DWORD Stencil) +static HRESULT WINAPI IDirect3DDevice8Impl_Clear(IDirect3DDevice8 *iface, DWORD rect_count, + const D3DRECT *rects, DWORD flags, D3DCOLOR color, float z, DWORD stencil) { + const struct wined3d_color c = + { + ((color >> 16) & 0xff) / 255.0f, + ((color >> 8) & 0xff) / 255.0f, + (color & 0xff) / 255.0f, + ((color >> 24) & 0xff) / 255.0f, + }; IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); HRESULT hr; TRACE("iface %p, rect_count %u, rects %p, flags %#x, color 0x%08x, z %.8e, stencil %u.\n", - iface, Count, pRects, Flags, Color, Z, Stencil); + iface, rect_count, rects, flags, color, z, stencil); wined3d_mutex_lock(); - hr = wined3d_device_clear(This->wined3d_device, Count, (const RECT *)pRects, Flags, Color, Z, Stencil); + hr = wined3d_device_clear(This->wined3d_device, rect_count, (const RECT *)rects, flags, &c, z, stencil); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 4e8eee1..9dea7fb 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1218,18 +1218,24 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_EndScene(IDirect3DD return hr; } -static HRESULT WINAPI IDirect3DDevice9Impl_Clear(IDirect3DDevice9Ex *iface, DWORD Count, - const D3DRECT *pRects, DWORD Flags, D3DCOLOR Color, float Z, DWORD Stencil) +static HRESULT WINAPI IDirect3DDevice9Impl_Clear(IDirect3DDevice9Ex *iface, DWORD rect_count, + const D3DRECT *rects, DWORD flags, D3DCOLOR color, float z, DWORD stencil) { + const struct wined3d_color c = + { + ((color >> 16) & 0xff) / 255.0f, + ((color >> 8) & 0xff) / 255.0f, + (color & 0xff) / 255.0f, + ((color >> 24) & 0xff) / 255.0f, + }; IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); HRESULT hr; TRACE("iface %p, rect_count %u, rects %p, flags %#x, color 0x%08x, z %.8e, stencil %u.\n", - iface, Count, pRects, Flags, Color, Z, Stencil); + iface, rect_count, rects, flags, color, z, stencil); - /* Note: D3DRECT is compatible with WINED3DRECT */ wined3d_mutex_lock(); - hr = wined3d_device_clear(This->wined3d_device, Count, (const RECT *)pRects, Flags, Color, Z, Stencil); + hr = wined3d_device_clear(This->wined3d_device, rect_count, (const RECT *)rects, flags, &c, z, stencil); wined3d_mutex_unlock(); return hr; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 2c4de3b..ecff7fa 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5065,23 +5065,24 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_ValidateDevice(IDirect3DDevice3 *ifa * For details, see IWineD3DDevice::Clear * *****************************************************************************/ -static HRESULT -IDirect3DDeviceImpl_7_Clear(IDirect3DDevice7 *iface, - DWORD Count, - D3DRECT *Rects, - DWORD Flags, - D3DCOLOR Color, - D3DVALUE Z, - DWORD Stencil) +static HRESULT IDirect3DDeviceImpl_7_Clear(IDirect3DDevice7 *iface, DWORD count, + D3DRECT *rects, DWORD flags, D3DCOLOR color, D3DVALUE z, DWORD stencil) { + const struct wined3d_color c = + { + ((color >> 16) & 0xff) / 255.0f, + ((color >> 8) & 0xff) / 255.0f, + (color & 0xff) / 255.0f, + ((color >> 24) & 0xff) / 255.0f, + }; IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface); HRESULT hr; TRACE("iface %p, count %u, rects %p, flags %#x, color 0x%08x, z %.8e, stencil %#x.\n", - iface, Count, Rects, Flags, Color, Z, Stencil); + iface, count, rects, flags, color, z, stencil); wined3d_mutex_lock(); - hr = wined3d_device_clear(This->wined3d_device, Count, (RECT *)Rects, Flags, Color, Z, Stencil); + hr = wined3d_device_clear(This->wined3d_device, count, (RECT *)rects, flags, &c, z, stencil); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fb51b39..177f41a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1199,6 +1199,7 @@ void CDECL wined3d_device_release_focus_window(struct wined3d_device *device) HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, WINED3DPRESENT_PARAMETERS *present_parameters) { + static const struct wined3d_color black = {0.0f, 0.0f, 0.0f, 0.0f}; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_swapchain *swapchain = NULL; struct wined3d_context *context; @@ -1345,7 +1346,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, /* Clear the screen */ wined3d_device_clear(device, 0, NULL, WINED3DCLEAR_TARGET | (present_parameters->EnableAutoDepthStencil ? WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL : 0), - 0x00, 1.0f, 0); + &black, 1.0f, 0); device->d3d_initialized = TRUE; @@ -4025,13 +4026,12 @@ HRESULT CDECL wined3d_device_present(const struct wined3d_device *device, const /* Do not call while under the GL lock. */ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, - const RECT *rects, DWORD flags, WINED3DCOLOR color, float depth, DWORD stencil) + const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { - const struct wined3d_color c = {D3DCOLOR_R(color), D3DCOLOR_G(color), D3DCOLOR_B(color), D3DCOLOR_A(color)}; RECT draw_rect; - TRACE("device %p, rect_count %u, rects %p, flags %#x, color 0x%08x, depth %.8e, stencil %u.\n", - device, rect_count, rects, flags, color, depth, stencil); + TRACE("device %p, rect_count %u, rects %p, flags %#x, color {%.8e, %.8e, %.8e, %.8e}, depth %.8e, stencil %u.\n", + device, rect_count, rects, flags, color->r, color->g, color->b, color->a, depth, stencil); if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) { @@ -4057,7 +4057,7 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou return device_clear_render_targets(device, device->adapter->gl_info.limits.buffers, &device->fb, rect_count, rects, - &draw_rect, flags, &c, depth, stencil); + &draw_rect, flags, color, depth, stencil); } void CDECL wined3d_device_set_primitive_type(struct wined3d_device *device, diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index d04d9c1..321d8ea 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -591,10 +591,12 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R * (The Max Payne bug has been confirmed on Windows with the debug runtime) */ if (FALSE && swapchain->presentParms.SwapEffect == WINED3DSWAPEFFECT_DISCARD) { + static const struct wined3d_color cyan = {0.0f, 1.0f, 1.0f, 1.0f}; + TRACE("Clearing the color buffer with cyan color\n"); wined3d_device_clear(swapchain->device, 0, NULL, - WINED3DCLEAR_TARGET, 0xff00ffff, 1.0f, 0); + WINED3DCLEAR_TARGET, &cyan, 1.0f, 0); } if (!swapchain->render_to_fbo && ((swapchain->front_buffer->flags & SFLAG_INSYSMEM) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c1dbaa3..4224c6c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -65,8 +65,6 @@ #define WINEDDERR_NOCLIPLIST MAKE_WINED3DHRESULT(205) #define WINEDDERR_OVERLAYNOTVISIBLE MAKE_WINED3DHRESULT(577) -typedef DWORD WINED3DCOLOR; - typedef enum _WINED3DLIGHTTYPE { WINED3DLIGHT_POINT = 1, @@ -2168,7 +2166,7 @@ HRESULT __cdecl wined3d_device_acquire_focus_window(struct wined3d_device *devic HRESULT __cdecl wined3d_device_begin_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_begin_stateblock(struct wined3d_device *device); HRESULT __cdecl wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, - WINED3DCOLOR color, float z, DWORD stencil); + const struct wined3d_color *color, float z, DWORD stencil); void __cdecl wined3d_device_clear_rendertarget_view(struct wined3d_device *device, struct wined3d_rendertarget_view *rendertarget_view, const struct wined3d_color *color); HRESULT __cdecl wined3d_device_color_fill(struct wined3d_device *device, struct wined3d_surface *surface,

1 0

Nikolay Sivov : msxml3: Properly return node prefix from get_prefix().
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: 588f27dae9b90ed7e735f73498face3ea68b9fd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=588f27dae9b90ed7e735f7349… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 16 00:19:28 2011 +0300 msxml3: Properly return node prefix from get_prefix(). --- dlls/msxml3/entityref.c | 4 +- dlls/msxml3/node.c | 9 +--- dlls/msxml3/tests/domdoc.c | 99 ++++++++++++++++++++++++++++++++------------ 3 files changed, 77 insertions(+), 35 deletions(-) diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 79b53be..091b3d7 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -531,8 +531,8 @@ static HRESULT WINAPI entityref_get_prefix( BSTR* prefix) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - TRACE("(%p)->(%p)\n", This, prefix); - return node_get_prefix( &This->node, prefix ); + FIXME("(%p)->(%p): stub\n", This, prefix); + return return_null_bstr( prefix ); } static HRESULT WINAPI entityref_get_baseName( diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 3a104cd..923a0c2 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1074,17 +1074,14 @@ HRESULT node_get_namespaceURI(xmlnode *This, BSTR *namespaceURI) HRESULT node_get_prefix(xmlnode *This, BSTR *prefix) { - xmlNsPtr *ns; + xmlNsPtr ns = This->node->ns; if (!prefix) return E_INVALIDARG; *prefix = NULL; - if ((ns = xmlGetNsList(This->node->doc, This->node))) - { - if (ns[0]->prefix) *prefix = bstr_from_xmlChar( ns[0]->prefix ); - xmlFree(ns); - } + if (ns && ns->prefix) + *prefix = bstr_from_xmlChar(ns->prefix); TRACE("prefix: %s\n", debugstr_w(*prefix)); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index eb1270d..bad088f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6960,21 +6960,21 @@ static void test_testTransforms(void) free_bstrs(); } -static void test_Namespaces(void) +static void test_namespaces(void) { - static const CHAR szNamespacesXML[] = + static const CHAR namespaces_xmlA[] = "<?xml version=\"1.0\"?>\n" "<XMI xmi.version=\"1.1\" xmlns:Model=\"http://omg.org/mof.Model/1.3\">" " <XMI.content>" - " <Model:Package name=\"WinePackage\" />" + " <Model:Package name=\"WinePackage\" Model:name2=\"name2 attr\" />" " </XMI.content>" "</XMI>"; IXMLDOMDocument *doc; IXMLDOMElement *elem; IXMLDOMNode *node; - IXMLDOMNode *pNode2 = NULL; - VARIANT_BOOL bSucc; + + VARIANT_BOOL b; VARIANT var; HRESULT hr; BSTR str; @@ -6982,44 +6982,66 @@ static void test_Namespaces(void) doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; - hr = IXMLDOMDocument_loadXML(doc, _bstr_(szNamespacesXML), &bSucc); - ok(hr == S_OK, "ret %08x\n", hr ); - ok(bSucc == VARIANT_TRUE, "Expected VARIANT_TRUE got VARIANT_FALSE\n"); + hr = IXMLDOMDocument_loadXML(doc, _bstr_(namespaces_xmlA), &b); + EXPECT_HR(hr, S_OK); + ok(b == VARIANT_TRUE, "got %d\n", b); hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("//XMI.content"), &node ); - ok(hr == S_OK, "ret %08x\n", hr ); + EXPECT_HR(hr, S_OK); if(hr == S_OK) { - hr = IXMLDOMNode_get_firstChild( node, &pNode2 ); - ok( hr == S_OK, "ret %08x\n", hr ); - ok( pNode2 != NULL, "pNode2 == NULL\n"); + IXMLDOMAttribute *attr; + IXMLDOMNode *node2; + + hr = IXMLDOMNode_get_firstChild(node, &node2); + EXPECT_HR(hr, S_OK); + ok(node2 != NULL, "got %p\n", node2); /* Test get_prefix */ - hr = IXMLDOMNode_get_prefix(pNode2, NULL); - ok( hr == E_INVALIDARG, "ret %08x\n", hr ); + hr = IXMLDOMNode_get_prefix(node2, NULL); + EXPECT_HR(hr, E_INVALIDARG); /* NOTE: Need to test that arg2 gets cleared on Error. */ - hr = IXMLDOMNode_get_prefix(pNode2, &str); - ok( hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("Model")), "incorrect prefix string\n"); + hr = IXMLDOMNode_get_prefix(node2, &str); + EXPECT_HR(hr, S_OK); + ok( !lstrcmpW( str, _bstr_("Model")), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); - hr = IXMLDOMNode_get_nodeName(pNode2, &str); - ok( hr == S_OK, "ret %08x\n", hr ); - todo_wine ok( !lstrcmpW( str, _bstr_("Model:Package")), "incorrect nodeName string\n"); + hr = IXMLDOMNode_get_nodeName(node2, &str); + EXPECT_HR(hr, S_OK); + todo_wine ok(!lstrcmpW( str, _bstr_("Model:Package")), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); /* Test get_namespaceURI */ - hr = IXMLDOMNode_get_namespaceURI(pNode2, NULL); - ok( hr == E_INVALIDARG, "ret %08x\n", hr ); + hr = IXMLDOMNode_get_namespaceURI(node2, NULL); + EXPECT_HR(hr, E_INVALIDARG); /* NOTE: Need to test that arg2 gets cleared on Error. */ - hr = IXMLDOMNode_get_namespaceURI(pNode2, &str); - ok( hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("http://omg.org/mof.Model/1.3")), "incorrect namespaceURI string\n"); + hr = IXMLDOMNode_get_namespaceURI(node2, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW( str, _bstr_("http://omg.org/mof.Model/1.3")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IXMLDOMNode_QueryInterface(node2, &IID_IXMLDOMElement, (void**)&elem); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("Model:name2"), &attr); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMAttribute_get_nodeName(attr, &str); + EXPECT_HR(hr, S_OK); + todo_wine ok(!lstrcmpW( str, _bstr_("Model:name2")), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); - IXMLDOMNode_Release(pNode2); + hr = IXMLDOMAttribute_get_prefix(attr, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW( str, _bstr_("Model")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMAttribute_Release(attr); + IXMLDOMElement_Release(elem); + + IXMLDOMNode_Release(node2); IXMLDOMNode_Release(node); } @@ -8579,6 +8601,10 @@ todo_wine { free_bstrs(); } +static const char get_prefix_doc[] = + "<?xml version=\"1.0\" ?>" + "<a xmlns:ns1=\"ns1 href\" />"; + static void test_get_prefix(void) { IXMLDOMDocumentFragment *fragment; @@ -8586,6 +8612,7 @@ static void test_get_prefix(void) IXMLDOMElement *element; IXMLDOMComment *comment; IXMLDOMDocument *doc; + VARIANT_BOOL b; HRESULT hr; BSTR str; @@ -8672,6 +8699,24 @@ static void test_get_prefix(void) IXMLDOMElement_Release(element); + hr = IXMLDOMDocument_loadXML(doc, _bstr_(get_prefix_doc), &b); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_documentElement(doc, &element); + EXPECT_HR(hr, S_OK); + + str = (void*)0xdeadbeef; + hr = IXMLDOMElement_get_prefix(element, &str); + EXPECT_HR(hr, S_FALSE); + ok(str == NULL, "got %p\n", str); + + str = (void*)0xdeadbeef; + hr = IXMLDOMElement_get_namespaceURI(element, &str); +todo_wine { + EXPECT_HR(hr, S_FALSE); + ok(str == NULL, "got %s\n", wine_dbgstr_w(str)); +} + IXMLDOMDocument_Release(doc); free_bstrs(); } @@ -10741,7 +10786,7 @@ START_TEST(domdoc) test_nodeTypeTests(); test_save(); test_testTransforms(); - test_Namespaces(); + test_namespaces(); test_FormattingXML(); test_nodeTypedValue(); test_TransformWithLoadingLocalFile();

1 0

Nikolay Sivov : msxml3: Fix get_namespaceURI().
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: 12bb4a471fc0ec01108d19e649dd097382fc9913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12bb4a471fc0ec01108d19e64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 16 00:28:51 2011 +0300 msxml3: Fix get_namespaceURI(). --- dlls/msxml3/node.c | 9 +++------ dlls/msxml3/tests/domdoc.c | 2 -- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 923a0c2..1df7331 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1054,18 +1054,15 @@ HRESULT node_select_singlenode(const xmlnode *This, BSTR query, IXMLDOMNode **no HRESULT node_get_namespaceURI(xmlnode *This, BSTR *namespaceURI) { - xmlNsPtr *ns; + xmlNsPtr ns = This->node->ns; if(!namespaceURI) return E_INVALIDARG; *namespaceURI = NULL; - if ((ns = xmlGetNsList(This->node->doc, This->node))) - { - if (ns[0]->href) *namespaceURI = bstr_from_xmlChar( ns[0]->href ); - xmlFree(ns); - } + if (ns && ns->href) + *namespaceURI = bstr_from_xmlChar(ns->href); TRACE("uri: %s\n", debugstr_w(*namespaceURI)); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index bad088f..699382f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8712,10 +8712,8 @@ static void test_get_prefix(void) str = (void*)0xdeadbeef; hr = IXMLDOMElement_get_namespaceURI(element, &str); -todo_wine { EXPECT_HR(hr, S_FALSE); ok(str == NULL, "got %s\n", wine_dbgstr_w(str)); -} IXMLDOMDocument_Release(doc); free_bstrs();

1 0

Nikolay Sivov : msxml3: Return qualified name from get_nodeName().
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: ede880a1c38899dbe16467e30d59697e357363e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ede880a1c38899dbe16467e30… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 16 00:31:40 2011 +0300 msxml3: Return qualified name from get_nodeName(). --- dlls/msxml3/node.c | 27 ++++++++++++++++++++++++--- dlls/msxml3/tests/domdoc.c | 4 ++-- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 1df7331..38102ec 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -128,12 +128,33 @@ xmlnode *get_node_obj(IXMLDOMNode *node) HRESULT node_get_nodeName(xmlnode *This, BSTR *name) { + BSTR prefix, base; + HRESULT hr; + if (!name) return E_INVALIDARG; - *name = bstr_from_xmlChar(This->node->name); - if (!*name) - return S_FALSE; + hr = node_get_base_name(This, &base); + if (hr != S_OK) return hr; + + hr = node_get_prefix(This, &prefix); + if (hr == S_OK) + { + static const WCHAR colW = ':'; + WCHAR *ptr; + + /* +1 for ':' */ + ptr = *name = SysAllocStringLen(NULL, SysStringLen(base) + SysStringLen(prefix) + 1); + memcpy(ptr, prefix, SysStringByteLen(prefix)); + ptr += SysStringLen(prefix); + memcpy(ptr++, &colW, sizeof(WCHAR)); + memcpy(ptr, base, SysStringByteLen(base)); + + SysFreeString(base); + SysFreeString(prefix); + } + else + *name = base; return S_OK; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 699382f..3999b95 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7009,7 +7009,7 @@ static void test_namespaces(void) hr = IXMLDOMNode_get_nodeName(node2, &str); EXPECT_HR(hr, S_OK); - todo_wine ok(!lstrcmpW( str, _bstr_("Model:Package")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW( str, _bstr_("Model:Package")), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); /* Test get_namespaceURI */ @@ -7030,7 +7030,7 @@ static void test_namespaces(void) hr = IXMLDOMAttribute_get_nodeName(attr, &str); EXPECT_HR(hr, S_OK); - todo_wine ok(!lstrcmpW( str, _bstr_("Model:name2")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW( str, _bstr_("Model:name2")), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IXMLDOMAttribute_get_prefix(attr, &str);

1 0

Nikolay Sivov : msxml3: Convert test stream to single byte string.
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: f291933177d68c7e118d282499f2be726ada1d44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f291933177d68c7e118d28249… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 16 00:32:42 2011 +0300 msxml3: Convert test stream to single byte string. --- dlls/msxml3/tests/domdoc.c | 154 +++++++++++++++++--------------------------- 1 files changed, 59 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f291933177d68c7e118d2…

1 0

Eric Pouech : winhlp32: Fix hlpfile content decompression in phrase40 mode.
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: a494cbb63b6f9bbba11f3da8ffec1e506656f103 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a494cbb63b6f9bbba11f3da8f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Nov 15 22:08:38 2011 +0100 winhlp32: Fix hlpfile content decompression in phrase40 mode. --- programs/winhlp32/hlpfile.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index fcdca60..add53e6 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -2358,14 +2358,14 @@ static BOOL HLPFILE_Uncompress_Phrases40(HLPFILE* hlpfile) INT dec_size, cpr_size; BYTE *buf_idx, *end_idx; BYTE *buf_phs, *end_phs; - LONG* ptr, mask = 0; + ULONG* ptr, mask = 0; unsigned int i; unsigned short bc, n; if (!HLPFILE_FindSubFile(hlpfile, "|PhrIndex", &buf_idx, &end_idx) || !HLPFILE_FindSubFile(hlpfile, "|PhrImage", &buf_phs, &end_phs)) return FALSE; - ptr = (LONG*)(buf_idx + 9 + 28); + ptr = (ULONG*)(buf_idx + 9 + 28); bc = GET_USHORT(buf_idx, 9 + 24) & 0x0F; num = hlpfile->num_phrases = GET_USHORT(buf_idx, 9 + 4); @@ -2400,9 +2400,10 @@ static BOOL HLPFILE_Uncompress_Phrases40(HLPFILE* hlpfile) return FALSE; } -#define getbit() (ptr += (mask < 0), mask = mask*2 + (mask<=0), (*ptr & mask) != 0) +#define getbit() ((mask <<= 1) ? (*ptr & mask) != 0: (*++ptr & (mask=1)) != 0) hlpfile->phrases_offsets[0] = 0; + ptr--; /* as we'll first increment ptr because mask is 0 on first getbit() call */ for (i = 0; i < num; i++) { for (n = 1; getbit(); n += 1 << bc);

1 0