October 2008 - Wine-Commits

Bobby Bingham : gdi32: Add support for the GGO_UNHINTED flag in GetGlyphOutline.
by Alexandre Julliard Oct. 28, 2008

Oct. 28, 2008

Module: wine Branch: master Commit: a900f5e06509237ea87d81eda5ee67a150571afa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a900f5e06509237ea87d81eda… Author: Bobby Bingham <uhmmmm(a)gmail.com> Date: Sun Oct 26 18:20:13 2008 -0400 gdi32: Add support for the GGO_UNHINTED flag in GetGlyphOutline. --- dlls/gdi32/freetype.c | 5 +++++ include/wingdi.h | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 313e625..2e64038 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4373,6 +4373,11 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, original_index = glyph_index; } + if(format & GGO_UNHINTED) { + load_flags |= FT_LOAD_NO_HINTING; + format &= ~GGO_UNHINTED; + } + /* tategaki never appears to happen to lower glyph index */ if (glyph_index < TATEGAKI_LOWER_BOUND ) tategaki = FALSE; diff --git a/include/wingdi.h b/include/wingdi.h index 322a267..e7be055 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -1294,6 +1294,7 @@ typedef struct #define GGO_GRAY4_BITMAP 5 #define GGO_GRAY8_BITMAP 6 #define GGO_GLYPH_INDEX 0x80 +#define GGO_UNHINTED 0x100 #ifdef __WINESRC__ #define WINE_GGO_GRAY16_BITMAP 0x7f

1 0

Henri Verbeet : wined3d: Fix some indentation.
by Alexandre Julliard Oct. 28, 2008

Oct. 28, 2008

Module: wine Branch: master Commit: c52a55d724f2e348717d2bb6e535a93c1bb49abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c52a55d724f2e348717d2bb6e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 28 09:27:20 2008 +0100 wined3d: Fix some indentation. --- dlls/wined3d/device.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 737708f..6307950 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1391,11 +1391,11 @@ static void WINAPI IWineD3DDeviceImpl_RestoreWindow(IWineD3DDevice *iface, HWND } /* example at http://www.fairyengine.com/articles/dxmultiviews.htm */ -static HRESULT WINAPI IWineD3DDeviceImpl_CreateSwapChain(IWineD3DDevice* iface, WINED3DPRESENT_PARAMETERS* pPresentationParameters, IWineD3DSwapChain** ppSwapChain, - IUnknown* parent, - D3DCB_CREATERENDERTARGETFN D3DCB_CreateRenderTarget, - D3DCB_CREATEDEPTHSTENCILSURFACEFN D3DCB_CreateDepthStencil, - WINED3DSURFTYPE surface_type) { +static HRESULT WINAPI IWineD3DDeviceImpl_CreateSwapChain(IWineD3DDevice* iface, + WINED3DPRESENT_PARAMETERS* pPresentationParameters, IWineD3DSwapChain** ppSwapChain, + IUnknown* parent, D3DCB_CREATERENDERTARGETFN D3DCB_CreateRenderTarget, + D3DCB_CREATEDEPTHSTENCILSURFACEFN D3DCB_CreateDepthStencil, WINED3DSURFTYPE surface_type) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; HDC hDc;

1 0

Henri Verbeet : wined3d: Rename CreateAdditionalSwapChain to CreateSwapChain.
by Alexandre Julliard Oct. 28, 2008

Oct. 28, 2008

Module: wine Branch: master Commit: 092b51e82aa0a6c6f55fba932ece9e0fd557767a URL: http://source.winehq.org/git/wine.git/?a=commit;h=092b51e82aa0a6c6f55fba932… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 28 09:27:20 2008 +0100 wined3d: Rename CreateAdditionalSwapChain to CreateSwapChain. --- dlls/d3d8/device.c | 4 ++-- dlls/d3d9/swapchain.c | 4 ++-- dlls/ddraw/ddraw.c | 6 +++--- dlls/wined3d/device.c | 16 ++++++++-------- include/wine/wined3d_interface.h | 10 +++++----- 5 files changed, 20 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=092b51e82aa0a6c6f55fb…

1 0

Henri Verbeet : d3d10: Make some functions static.
by Alexandre Julliard Oct. 28, 2008

Oct. 28, 2008

Module: wine Branch: master Commit: 3eb3538556c50085ec6e89338f95c441c675b77e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eb3538556c50085ec6e89338… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 28 09:27:20 2008 +0100 d3d10: Make some functions static. --- dlls/d3d10/device.c | 196 +++++++++++++++++++++++++------------------------- 1 files changed, 98 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3eb3538556c50085ec6e8…

1 0

Austin English : advapi32/tests: fix a couple failures on Vista.
by Alexandre Julliard Oct. 28, 2008

Oct. 28, 2008

Module: wine Branch: master Commit: 955759381d58edc7acf77847cbcbbe70c250d53a URL: http://source.winehq.org/git/wine.git/?a=commit;h=955759381d58edc7acf77847c… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Oct 27 15:24:52 2008 -0500 advapi32/tests: fix a couple failures on Vista. --- dlls/advapi32/tests/security.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d4f532d..db955cd 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1319,8 +1319,8 @@ static void test_LookupAccountSid(void) real_dom_sizeA = MAX_PATH; ret = LookupAccountSidA("deepthought", pUsersSid, accountA, &real_acc_sizeA, domainA, &real_dom_sizeA, &use); ok(!ret, "LookupAccountSidA() Expected FALSE got TRUE\n"); - ok(GetLastError() == RPC_S_SERVER_UNAVAILABLE, - "LookupAccountSidA() Expected RPC_S_SERVER_UNAVAILABLE, got %u\n", GetLastError()); + ok(GetLastError() == RPC_S_SERVER_UNAVAILABLE || GetLastError() == RPC_S_INVALID_NET_ADDR /* Vista */, + "LookupAccountSidA() Expected RPC_S_SERVER_UNAVAILABLE or RPC_S_INVALID_NET_ADDR, got %u\n", GetLastError()); /* native windows crashes if domainW or accountW is NULL */ @@ -1664,8 +1664,8 @@ static void test_LookupAccountName(void) domain_size = 0; ret = LookupAccountNameA("deepthought", NULL, NULL, &sid_size, NULL, &domain_size, &sid_use); ok(!ret, "Expected 0, got %d\n", ret); - ok(GetLastError() == RPC_S_SERVER_UNAVAILABLE, - "Expected RPC_S_SERVER_UNAVAILABLE, got %d\n", GetLastError()); + ok(GetLastError() == RPC_S_SERVER_UNAVAILABLE || GetLastError() == RPC_S_INVALID_NET_ADDR /* Vista */, + "Expected RPC_S_SERVER_UNAVAILABLE or RPC_S_INVALID_NET_ADDR, got %d\n", GetLastError()); ok(sid_size == 0, "Expected 0, got %d\n", sid_size); ok(domain_size == 0, "Expected 0, got %d\n", domain_size);

1 0

Tobias Jakobi : wined3d: Fix typo in baseshader.c.
by Alexandre Julliard Oct. 28, 2008

Oct. 28, 2008

Module: wine Branch: master Commit: f4e0dec42ed4c5cfc8f3970d3b49e31081fe5a1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e0dec42ed4c5cfc8f3970d3… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Sun Oct 26 17:01:15 2008 +0100 wined3d: Fix typo in baseshader.c. --- dlls/wined3d/baseshader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 03567a1..f7c8d35 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -937,7 +937,7 @@ void shader_trace_init( unsigned int len = 0; DWORD i; - TRACE("(%p) : Parsing programme\n", This); + TRACE("(%p) : Parsing program\n", This); if (NULL != pToken) { while (WINED3DVS_END() != *pToken) {

1 0

Henri Verbeet : dxgi: Make some functions static.
by Alexandre Julliard Oct. 28, 2008

Oct. 28, 2008

Module: wine Branch: master Commit: fc17a99ef0e86dd639ec5093237525d983ca929d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc17a99ef0e86dd639ec50932… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 28 09:27:20 2008 +0100 dxgi: Make some functions static. --- dlls/dxgi/device.c | 24 ++++++++++++------------ dlls/dxgi/factory.c | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 9c7f252..195c502 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); /* IUnknown methods */ -HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IDXGIDevice* iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IDXGIDevice *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); @@ -45,7 +45,7 @@ HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IDXGIDevice* iface, REFIID return E_NOINTERFACE; } -ULONG STDMETHODCALLTYPE dxgi_device_AddRef(IDXGIDevice* iface) +static ULONG STDMETHODCALLTYPE dxgi_device_AddRef(IDXGIDevice *iface) { struct dxgi_device *This = (struct dxgi_device *)iface; ULONG refcount = InterlockedIncrement(&This->refcount); @@ -55,7 +55,7 @@ ULONG STDMETHODCALLTYPE dxgi_device_AddRef(IDXGIDevice* iface) return refcount; } -ULONG STDMETHODCALLTYPE dxgi_device_Release(IDXGIDevice* iface) +static ULONG STDMETHODCALLTYPE dxgi_device_Release(IDXGIDevice *iface) { struct dxgi_device *This = (struct dxgi_device *)iface; ULONG refcount = InterlockedDecrement(&This->refcount); @@ -72,28 +72,28 @@ ULONG STDMETHODCALLTYPE dxgi_device_Release(IDXGIDevice* iface) /* IDXGIObject methods */ -HRESULT STDMETHODCALLTYPE dxgi_device_SetPrivateData(IDXGIDevice* iface, REFGUID guid, UINT data_size, const void *data) +static HRESULT STDMETHODCALLTYPE dxgi_device_SetPrivateData(IDXGIDevice *iface, REFGUID guid, UINT data_size, const void *data) { FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE dxgi_device_SetPrivateDataInterface(IDXGIDevice* iface, REFGUID guid, const IUnknown *object) +static HRESULT STDMETHODCALLTYPE dxgi_device_SetPrivateDataInterface(IDXGIDevice *iface, REFGUID guid, const IUnknown *object) { FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object); return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE dxgi_device_GetPrivateData(IDXGIDevice* iface, REFGUID guid, UINT *data_size, void *data) +static HRESULT STDMETHODCALLTYPE dxgi_device_GetPrivateData(IDXGIDevice *iface, REFGUID guid, UINT *data_size, void *data) { FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE dxgi_device_GetParent(IDXGIDevice* iface, REFIID riid, void **parent) +static HRESULT STDMETHODCALLTYPE dxgi_device_GetParent(IDXGIDevice *iface, REFIID riid, void **parent) { FIXME("iface %p, riid %s, parent %p stub!\n", iface, debugstr_guid(riid), parent); @@ -102,14 +102,14 @@ HRESULT STDMETHODCALLTYPE dxgi_device_GetParent(IDXGIDevice* iface, REFIID riid, /* IDXGIDevice methods */ -HRESULT STDMETHODCALLTYPE dxgi_device_GetAdapter(IDXGIDevice* iface, IDXGIAdapter **adapter) +static HRESULT STDMETHODCALLTYPE dxgi_device_GetAdapter(IDXGIDevice *iface, IDXGIAdapter **adapter) { FIXME("iface %p, adapter %p stub!\n", iface, adapter); return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IDXGIDevice* iface, +static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IDXGIDevice *iface, const DXGI_SURFACE_DESC *desc, UINT surface_count, DXGI_USAGE usage, const DXGI_SHARED_RESOURCE *shared_resource, IDXGISurface **surface) { @@ -119,7 +119,7 @@ HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IDXGIDevice* iface, return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE dxgi_device_QueryResourceResidency(IDXGIDevice* iface, +static HRESULT STDMETHODCALLTYPE dxgi_device_QueryResourceResidency(IDXGIDevice *iface, IUnknown *const *resources, DXGI_RESIDENCY *residency, UINT resource_count) { FIXME("iface %p, resources %p, residency %p, resource_count %u stub!\n", @@ -128,14 +128,14 @@ HRESULT STDMETHODCALLTYPE dxgi_device_QueryResourceResidency(IDXGIDevice* iface, return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE dxgi_device_SetGPUThreadPriority(IDXGIDevice* iface, INT priority) +static HRESULT STDMETHODCALLTYPE dxgi_device_SetGPUThreadPriority(IDXGIDevice *iface, INT priority) { FIXME("iface %p, priority %d stub!\n", iface, priority); return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE dxgi_device_GetGPUThreadPriority(IDXGIDevice* iface, INT *priority) +static HRESULT STDMETHODCALLTYPE dxgi_device_GetGPUThreadPriority(IDXGIDevice *iface, INT *priority) { FIXME("iface %p, priority %p stub!\n", iface, priority); diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index d9593e3..5b85783 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); /* IUnknown methods */ -HRESULT STDMETHODCALLTYPE dxgi_factory_QueryInterface(IDXGIFactory* iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE dxgi_factory_QueryInterface(IDXGIFactory *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); @@ -45,7 +45,7 @@ HRESULT STDMETHODCALLTYPE dxgi_factory_QueryInterface(IDXGIFactory* iface, REFII return E_NOINTERFACE; } -ULONG STDMETHODCALLTYPE dxgi_factory_AddRef(IDXGIFactory* iface) +static ULONG STDMETHODCALLTYPE dxgi_factory_AddRef(IDXGIFactory *iface) { struct dxgi_factory *This = (struct dxgi_factory *)iface; ULONG refcount = InterlockedIncrement(&This->refcount); @@ -55,7 +55,7 @@ ULONG STDMETHODCALLTYPE dxgi_factory_AddRef(IDXGIFactory* iface) return refcount; } -ULONG STDMETHODCALLTYPE dxgi_factory_Release(IDXGIFactory* iface) +static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IDXGIFactory *iface) { struct dxgi_factory *This = (struct dxgi_factory *)iface; ULONG refcount = InterlockedDecrement(&This->refcount); @@ -72,7 +72,7 @@ ULONG STDMETHODCALLTYPE dxgi_factory_Release(IDXGIFactory* iface) /* IDXGIObject methods */ -HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateData(IDXGIFactory* iface, +static HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateData(IDXGIFactory *iface, REFGUID guid, UINT data_size, const void *data) { FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); @@ -80,7 +80,7 @@ HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateData(IDXGIFactory* iface, return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateDataInterface(IDXGIFactory* iface, +static HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateDataInterface(IDXGIFactory *iface, REFGUID guid, const IUnknown *object) { FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object); @@ -88,7 +88,7 @@ HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateDataInterface(IDXGIFactory* ifa return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE dxgi_factory_GetPrivateData(IDXGIFactory* iface, +static HRESULT STDMETHODCALLTYPE dxgi_factory_GetPrivateData(IDXGIFactory *iface, REFGUID guid, UINT *data_size, void *data) { FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); @@ -96,7 +96,7 @@ HRESULT STDMETHODCALLTYPE dxgi_factory_GetPrivateData(IDXGIFactory* iface, return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE dxgi_factory_GetParent(IDXGIFactory* iface, REFIID riid, void **parent) +static HRESULT STDMETHODCALLTYPE dxgi_factory_GetParent(IDXGIFactory *iface, REFIID riid, void **parent) { FIXME("iface %p, riid %s, parent %p stub!\n", iface, debugstr_guid(riid), parent); @@ -105,28 +105,28 @@ HRESULT STDMETHODCALLTYPE dxgi_factory_GetParent(IDXGIFactory* iface, REFIID rii /* IDXGIFactory methods */ -HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IDXGIFactory* iface, UINT adapter_idx, IDXGIAdapter **adapter) +static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IDXGIFactory *iface, UINT adapter_idx, IDXGIAdapter **adapter) { FIXME("iface %p, adapter_idx %u, adapter %p stub!\n", iface, adapter_idx, adapter); return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IDXGIFactory* iface, HWND window, UINT flags) +static HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IDXGIFactory *iface, HWND window, UINT flags) { FIXME("iface %p, window %p, flags %#x stub!\n\n", iface, window, flags); return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IDXGIFactory* iface, HWND *window) +static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IDXGIFactory *iface, HWND *window) { FIXME("iface %p, window %p stub!\n", iface, window); return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory* iface, +static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory *iface, IUnknown *device, DXGI_SWAP_CHAIN_DESC *desc, IDXGISwapChain **swapchain) { FIXME("iface %p, device %p, desc %p, swapchain %p stub!\n", iface, device, desc, swapchain); @@ -134,7 +134,7 @@ HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory* iface, return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSoftwareAdapter(IDXGIFactory* iface, +static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSoftwareAdapter(IDXGIFactory *iface, HMODULE swrast, IDXGIAdapter **adapter) { FIXME("iface %p, swrast %p, adapter %p stub!\n", iface, swrast, adapter);

1 0

Alistair Leslie-Hughes : msxml3: Add support to get_nodeTypedValue on Element Nodes.
by Alexandre Julliard Oct. 28, 2008

Oct. 28, 2008

Module: wine Branch: master Commit: 13606ed49d40174935135a053426f1f1ca7c9dc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13606ed49d40174935135a053… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Oct 28 19:47:15 2008 +1100 msxml3: Add support to get_nodeTypedValue on Element Nodes. --- dlls/msxml3/node.c | 28 ++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 63aa8df..3162f82 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -977,8 +977,32 @@ static HRESULT WINAPI xmlnode_get_nodeTypedValue( IXMLDOMNode *iface, VARIANT* typedValue) { - FIXME("ignoring data type\n"); - return xmlnode_get_nodeValue(iface, typedValue); + xmlnode *This = impl_from_IXMLDOMNode( iface ); + HRESULT r = S_FALSE; + + FIXME("ignoring data type %p %p\n", This, typedValue); + + if(!typedValue) + return E_INVALIDARG; + + V_VT(typedValue) = VT_NULL; + + switch ( This->node->type ) + { + case XML_ELEMENT_NODE: + { + xmlChar *content = xmlNodeGetContent(This->node); + V_VT(typedValue) = VT_BSTR; + V_BSTR(typedValue) = bstr_from_xmlChar( content ); + xmlFree(content); + r = S_OK; + break; + } + default: + r = xmlnode_get_nodeValue(iface, typedValue); + } + + return r; } static HRESULT WINAPI xmlnode_put_nodeTypedValue( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 578738f..df3fa0e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -146,6 +146,10 @@ static const CHAR szTransformOutput[] = "Hello World" "</h1></body></html>"; +static const CHAR szTypeValueXML[] = +"<?xml version=\"1.0\" encoding=\"utf-8\"?>" +"<string>Wine</string>"; + static const WCHAR szNonExistentFile[] = { 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0 }; @@ -3782,6 +3786,64 @@ static void test_FormattingXML(void) free_bstrs(); } +static void test_NodeTypeValue(void) +{ + IXMLDOMDocument2 *doc = NULL; + IXMLDOMNode *pNode; + VARIANT_BOOL bSucc; + HRESULT hr; + VARIANT v; + + hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc ); + if( hr != S_OK ) + return; + + hr = IXMLDOMDocument2_loadXML(doc, _bstr_(szTypeValueXML), &bSucc); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(bSucc == VARIANT_TRUE, "Expected VARIANT_TRUE got VARIANT_FALSE\n"); + if(bSucc == VARIANT_TRUE) + { + hr = IXMLDOMDocument2_get_nodeValue(doc, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = NULL; + hr = IXMLDOMDocument2_get_nodeValue(doc, &v); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_NULL, "expect VT_NULL got %d\n", V_VT(&v)); + + hr = IXMLDOMDocument2_get_nodeTypedValue(doc, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + hr = IXMLDOMDocument2_get_nodeTypedValue(doc, &v); + ok(hr == S_FALSE, "ret %08x\n", hr ); + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("string"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = NULL; + hr = IXMLDOMNode_get_nodeValue(pNode, &v); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_NULL, "expect VT_NULL got %d\n", V_VT(&v)); + + hr = IXMLDOMNode_get_nodeTypedValue(pNode, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(!lstrcmpW( V_BSTR(&v), _bstr_("Wine") ), "incorrect value\n"); + + IXMLDOMNode_Release(pNode); + } + } + + IXMLDOMDocument2_Release(doc); + + free_bstrs(); +} + START_TEST(domdoc) { HRESULT r; @@ -3810,6 +3872,7 @@ START_TEST(domdoc) test_testTransforms(); test_Namespaces(); test_FormattingXML(); + test_NodeTypeValue(); CoUninitialize(); }

1 0

Alistair Leslie-Hughes : comdlg32: Fix test under win98.
by Alexandre Julliard Oct. 28, 2008

Oct. 28, 2008

Module: wine Branch: master Commit: 9e4d6e6110568c7f4ef2beeff4ca7b0c3dc23b89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e4d6e6110568c7f4ef2beeff… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Oct 28 19:49:45 2008 +1100 comdlg32: Fix test under win98. --- dlls/comdlg32/tests/filedlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 09a2428..e05f5a9 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -254,7 +254,7 @@ static void test_create_view_template(void) ofn.nMaxFile = 1042; ofn.lpfnHook = (LPOFNHOOKPROC)template_hook; ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER| OFN_ENABLETEMPLATE; - ofn.hInstance = GetModuleHandleW(NULL); + ofn.hInstance = GetModuleHandleA(NULL); ofn.lpTemplateName = "template1"; ofn.lpstrFilter="text\0*.txt\0All\0*\0\0"; ret = GetOpenFileNameA(&ofn);

1 0

Michael Stefaniuc : comctl32: Remove superfluous casts as HANDLE to other handle types.
by Alexandre Julliard Oct. 28, 2008

Oct. 28, 2008

Module: wine Branch: master Commit: d1791f81087c35acea2d123fca7430a2033b3fbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1791f81087c35acea2d123fc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 27 23:07:40 2008 +0100 comctl32: Remove superfluous casts as HANDLE to other handle types. --- dlls/comctl32/comboex.c | 4 ++-- dlls/comctl32/ipaddress.c | 2 +- dlls/comctl32/toolbar.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 8d91992..aa5af6e 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1713,7 +1713,7 @@ static LRESULT COMBOEX_WindowPosChanging (COMBOEX_INFO *infoPtr, WINDOWPOS *wp) static LRESULT WINAPI COMBOEX_EditWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - HWND hwndComboex = (HWND)GetPropW(hwnd, COMBOEX_SUBCLASS_PROP); + HWND hwndComboex = GetPropW(hwnd, COMBOEX_SUBCLASS_PROP); COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwndComboex); NMCBEENDEDITW cbeend; WCHAR edit_text[260]; @@ -1911,7 +1911,7 @@ COMBOEX_EditWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) static LRESULT WINAPI COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - HWND hwndComboex = (HWND)GetPropW(hwnd, COMBOEX_SUBCLASS_PROP); + HWND hwndComboex = GetPropW(hwnd, COMBOEX_SUBCLASS_PROP); COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwndComboex); NMCBEENDEDITW cbeend; NMMOUSE nmmse; diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 4a91417..15d39f5 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -454,7 +454,7 @@ static BOOL IPADDRESS_GotoNextField (const IPADDRESS_INFO *infoPtr, int cur, int LRESULT CALLBACK IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - HWND Self = (HWND)GetPropW (hwnd, IP_SUBCLASS_PROP); + HWND Self = GetPropW (hwnd, IP_SUBCLASS_PROP); IPADDRESS_INFO *infoPtr = (IPADDRESS_INFO *)GetWindowLongPtrW (Self, 0); CHAR c = (CHAR)wParam; INT index, len = 0, startsel, endsel; diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 9b21efc..6a6eeb4 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2665,7 +2665,7 @@ TOOLBAR_AddBitmapToImageList(TOOLBAR_INFO *infoPtr, HIMAGELIST himlDef, const TB TRACE("adding hInst=%p nID=%d nButtons=%d\n", bitmap->hInst, bitmap->nID, bitmap->nButtons); /* Add bitmaps to the default image list */ if (bitmap->hInst == NULL) /* a handle was passed */ - hbmLoad = (HBITMAP)CopyImage(ULongToHandle(bitmap->nID), IMAGE_BITMAP, 0, 0, 0); + hbmLoad = CopyImage(ULongToHandle(bitmap->nID), IMAGE_BITMAP, 0, 0, 0); else hbmLoad = CreateMappedBitmap(bitmap->hInst, bitmap->nID, 0, NULL, 0);

1 0