November 2009 - Wine-Commits

Rob Shearman : rpcrt4: Add test for calling NdrFullPointerQueryRefId with a 0 pointer ID.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: d6f293f7be7a8d4093e9233b841d94eb8d729ff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f293f7be7a8d4093e9233b8… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Nov 18 11:40:44 2009 +0000 rpcrt4: Add test for calling NdrFullPointerQueryRefId with a 0 pointer ID. --- dlls/rpcrt4/tests/ndr_marshall.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 9781115..dbf29a5 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1046,6 +1046,10 @@ static void test_fullpointer_xlat(void) /* "unmarshaling" phase */ + ret = NdrFullPointerQueryRefId(pXlatTables, 0x0, 0, &Pointer); + todo_wine + ok(ret == 1, "ret should be 1 instead of 0x%x\n", ret); + ret = NdrFullPointerQueryRefId(pXlatTables, 0x2, 0, &Pointer); ok(ret == 0, "ret should be 0 instead of 0x%x\n", ret); ok(Pointer == (void *)0xcafebabe, "Pointer should be 0xcafebabe instead of %p\n", Pointer);

1 0

Piotr Caban : msxml3: Implemented xmlnode_get_nodeTypedValue 'number' data type handling.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: 0a6d3a70ca1e8811efbc0d41a23ff1ba90a62858 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a6d3a70ca1e8811efbc0d41a… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Nov 18 00:51:11 2009 +0100 msxml3: Implemented xmlnode_get_nodeTypedValue 'number' data type handling. --- dlls/msxml3/node.c | 3 ++- dlls/msxml3/tests/domdoc.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 1f4dc32..56a8578 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -948,7 +948,8 @@ static HRESULT WINAPI xmlnode_get_dataType(IXMLDOMNode*, VARIANT*); inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) { - if(!type || !lstrcmpiW(type, szString)) + if(!type || !lstrcmpiW(type, szString) || + !lstrcmpiW(type, szNumber)) { V_VT(v) = VT_BSTR; V_BSTR(v) = bstr_from_xmlChar(str); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index b946970..2f34a24 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -151,6 +151,8 @@ static const CHAR szTypeValueXML[] = "<root xmlns:dt=\"urn:schemas-microsoft-com:datatypes\">\n" " <string>Wine</string>\n" " <string2 dt:dt=\"string\">String</string2>\n" +" <number dt:dt=\"number\">12.44</number>\n" +" <number2 dt:dt=\"NUMbEr\">-3.71e3</number2>\n" "</root>"; static const CHAR szBasicTransformSSXMLPart1[] = @@ -4009,6 +4011,32 @@ static void test_NodeTypeValue(void) IXMLDOMNode_Release(pNode); } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/number"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_BSTR, "incorrect type\n"); + ok(!lstrcmpW( V_BSTR(&v), _bstr_("12.44") ), "incorrect value\n"); + VariantClear( &v ); + + IXMLDOMNode_Release(pNode); + } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/number2"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_BSTR, "incorrect type\n"); + ok(!lstrcmpW( V_BSTR(&v), _bstr_("-3.71e3") ), "incorrect value\n"); + VariantClear( &v ); + + IXMLDOMNode_Release(pNode); + } } IXMLDOMDocument2_Release(doc);

1 0

Henri Verbeet : wined3d: Remove the effetively unused "state" field from the device.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: 55f3c576d9f9c48075eb46d9c26878495b5fb5e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f3c576d9f9c48075eb46d9c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 18 10:45:54 2009 +0100 wined3d: Remove the effetively unused "state" field from the device. --- dlls/d3d8/device.c | 12 ++------- dlls/d3d9/device.c | 17 ++++++-------- dlls/ddraw/ddraw.c | 47 +--------------------------------------- dlls/wined3d/device.c | 32 --------------------------- dlls/wined3d/wined3d_private.h | 3 -- include/wine/wined3d.idl | 2 - 6 files changed, 11 insertions(+), 102 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index eb26d73..450a5ff 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -334,17 +334,11 @@ static ULONG WINAPI IDirect3DDevice8Impl_Release(LPDIRECT3DDEVICE8 iface) { } /* IDirect3DDevice Interface follow: */ -static HRESULT WINAPI IDirect3DDevice8Impl_TestCooperativeLevel(LPDIRECT3DDEVICE8 iface) { - IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; - HRESULT hr; - +static HRESULT WINAPI IDirect3DDevice8Impl_TestCooperativeLevel(IDirect3DDevice8 *iface) +{ TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - hr = IWineD3DDevice_TestCooperativeLevel(This->WineD3DDevice); - wined3d_mutex_unlock(); - - return hr; + return D3D_OK; } static UINT WINAPI IDirect3DDevice8Impl_GetAvailableTextureMem(LPDIRECT3DDEVICE8 iface) { diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1151d99..dfb6b26 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -280,22 +280,19 @@ static ULONG WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Release(LPDIRECT3DDEV } /* IDirect3DDevice Interface follow: */ -static HRESULT WINAPI IDirect3DDevice9Impl_TestCooperativeLevel(LPDIRECT3DDEVICE9EX iface) { +static HRESULT WINAPI IDirect3DDevice9Impl_TestCooperativeLevel(IDirect3DDevice9Ex *iface) +{ IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - HRESULT hr; TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - hr = IWineD3DDevice_TestCooperativeLevel(This->WineD3DDevice); - wined3d_mutex_unlock(); - - if(hr == WINED3D_OK && This->notreset) { - TRACE("D3D9 Device is marked not reset\n"); - hr = D3DERR_DEVICENOTRESET; + if (This->notreset) + { + TRACE("D3D9 device is marked not reset.\n"); + return D3DERR_DEVICENOTRESET; } - return hr; + return D3D_OK; } static UINT WINAPI IDirect3DDevice9Impl_GetAvailableTextureMem(LPDIRECT3DDEVICE9EX iface) { diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 351ebda..aeaffbd 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1187,53 +1187,8 @@ static HRESULT WINAPI IDirectDrawImpl_GetScanLine(IDirectDraw7 *iface, DWORD *Sc static HRESULT WINAPI IDirectDrawImpl_TestCooperativeLevel(IDirectDraw7 *iface) { - IDirectDrawImpl *This = (IDirectDrawImpl *)iface; - HRESULT hr; - TRACE("(%p)\n", This); - - EnterCriticalSection(&ddraw_cs); - /* Description from MSDN: - * For fullscreen apps return DDERR_NOEXCLUSIVEMODE if the user switched - * away from the app with e.g. alt-tab. Windowed apps receive - * DDERR_EXCLUSIVEMODEALREADYSET if another application created a - * DirectDraw object in exclusive mode. DDERR_WRONGMODE is returned, - * when the video mode has changed - */ - - hr = IWineD3DDevice_TestCooperativeLevel(This->wineD3DDevice); + TRACE("iface %p.\n", iface); - /* Fix the result value. These values are mapped from their - * d3d9 counterpart. - */ - switch(hr) - { - case WINED3DERR_DEVICELOST: - if(This->cooperative_level & DDSCL_EXCLUSIVE) - { - LeaveCriticalSection(&ddraw_cs); - return DDERR_NOEXCLUSIVEMODE; - } - else - { - LeaveCriticalSection(&ddraw_cs); - return DDERR_EXCLUSIVEMODEALREADYSET; - } - - case WINED3DERR_DEVICENOTRESET: - LeaveCriticalSection(&ddraw_cs); - return DD_OK; - - case WINED3D_OK: - LeaveCriticalSection(&ddraw_cs); - return DD_OK; - - case WINED3DERR_DRIVERINTERNALERROR: - default: - ERR("(%p) Unexpected return value %08x from wineD3D, " - " returning DD_OK\n", This, hr); - } - - LeaveCriticalSection(&ddraw_cs); return DD_OK; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c48424e..136f396 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6494,31 +6494,6 @@ static BOOL WINAPI IWineD3DDeviceImpl_ShowCursor(IWineD3DDevice* iface, BOO return oldVisible; } -static HRESULT WINAPI IWineD3DDeviceImpl_TestCooperativeLevel(IWineD3DDevice* iface) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - IWineD3DResourceImpl *resource; - TRACE("(%p) : state (%u)\n", This, This->state); - - /* TODO: Implement wrapping of the WndProc so that mimimize and maximize can be monitored and the states adjusted. */ - switch (This->state) { - case WINED3D_OK: - return WINED3D_OK; - case WINED3DERR_DEVICELOST: - { - LIST_FOR_EACH_ENTRY(resource, &This->resources, IWineD3DResourceImpl, resource.resource_list_entry) { - if (resource->resource.pool == WINED3DPOOL_DEFAULT) - return WINED3DERR_DEVICENOTRESET; - } - return WINED3DERR_DEVICELOST; - } - case WINED3DERR_DRIVERINTERNALERROR: - return WINED3DERR_DRIVERINTERNALERROR; - } - - /* Unknown state */ - return WINED3DERR_DRIVERINTERNALERROR; -} - static HRESULT WINAPI evict_managed_resource(IWineD3DResource *resource, void *data) { TRACE("checking resource %p for eviction\n", resource); if(((IWineD3DResourceImpl *) resource)->resource.pool == WINED3DPOOL_MANAGED) { @@ -7154,7 +7129,6 @@ static const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl = IWineD3DDeviceImpl_SetCursorProperties, IWineD3DDeviceImpl_SetCursorPosition, IWineD3DDeviceImpl_ShowCursor, - IWineD3DDeviceImpl_TestCooperativeLevel, /*** Getters and setters **/ IWineD3DDeviceImpl_SetClipPlane, IWineD3DDeviceImpl_GetClipPlane, @@ -7278,9 +7252,6 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, device->surface_alignment = wined3d->dxVersion == 7 ? DDRAW_PITCH_ALIGNMENT : D3D8_PITCH_ALIGNMENT; device->posFixup[0] = 1.0f; /* This is needed to get the x coord unmodified through a MAD. */ - /* Set the state up as invalid until the device is fully created. */ - device->state = WINED3DERR_DRIVERINTERNALERROR; - /* Get the initial screen setup for ddraw. */ hr = IWineD3D_GetAdapterDisplayMode((IWineD3D *)wined3d, adapter_idx, &mode); if (FAILED(hr)) @@ -7330,9 +7301,6 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, device->blitter = select_blit_implementation(adapter, device_type); - /* Set the state of the device to valid. */ - device->state = WINED3D_OK; - return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9299a6e..12685d2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1555,9 +1555,6 @@ struct IWineD3DDeviceImpl /* Textures for when no other textures are mapped */ UINT dummyTextureName[MAX_TEXTURES]; - /* Device state management */ - HRESULT state; - /* DirectDraw stuff */ DWORD ddraw_width, ddraw_height; WINED3DFORMAT ddraw_format; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 2534fbb..176e602 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -3076,8 +3076,6 @@ interface IWineD3DDevice : IWineD3DBase BOOL ShowCursor( [in] BOOL show ); - HRESULT TestCooperativeLevel( - ); HRESULT SetClipPlane( [in] DWORD plane_idx, [in] const float *plane

1 0

Roderick Colenbrander : wgl: Add initial WGL_ARB_create_context support.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: 41f061ea1bf8c6394ed858bf28b9c74fd45c40f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41f061ea1bf8c6394ed858bf2… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Nov 16 23:24:24 2009 +0100 wgl: Add initial WGL_ARB_create_context support. --- dlls/gdi32/driver.c | 1 + dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/opengl.c | 23 ++++++- dlls/opengl32/tests/opengl.c | 2 +- dlls/winex11.drv/opengl.c | 133 ++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/winex11.drv.spec | 1 + 6 files changed, 158 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=41f061ea1bf8c6394ed85…

1 0

Henri Verbeet : wined3d: Add a separate function for device initialization.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: 135e6cea7b607e5806304434b8f05e37c179bceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=135e6cea7b607e5806304434b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 18 10:45:53 2009 +0100 wined3d: Add a separate function for device initialization. --- dlls/wined3d/device.c | 86 +++++++++++++++++++++++++++++- dlls/wined3d/directx.c | 118 +++++++++------------------------------- dlls/wined3d/wined3d_private.h | 5 +- 3 files changed, 113 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=135e6cea7b607e5806304…

1 0

Paul Vriens : rsaenh/tests: Fix some test failures on Wow64.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: 3323ae9dd63e8b5c85d8907d867a51a457efb787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3323ae9dd63e8b5c85d8907d8… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 18 09:10:44 2009 +0100 rsaenh/tests: Fix some test failures on Wow64. --- dlls/rsaenh/tests/rsaenh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 4d57b25..bf6ed0f 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -74,7 +74,7 @@ static void uniquecontainer(char *unique) DWORD size = MAX_PATH; /* Get the MachineGUID */ - RegOpenKeyA(HKEY_LOCAL_MACHINE, szCryptography, &hkey); + RegOpenKeyExA(HKEY_LOCAL_MACHINE, szCryptography, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); RegQueryValueExA(hkey, szMachineGuid, NULL, NULL, (LPBYTE)guid, &size); RegCloseKey(hkey);

1 0

Piotr Caban : msxml3: Implemented xmlnode_get_nodeTypedValue 'string' data type handling.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: b56031c3a671b158a74da95684cbc84681266f2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b56031c3a671b158a74da9568… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Nov 18 00:51:03 2009 +0100 msxml3: Implemented xmlnode_get_nodeTypedValue 'string' data type handling. --- dlls/msxml3/node.c | 60 +++++++++++++++++++++++++++++++------------ dlls/msxml3/tests/domdoc.c | 23 ++++++++++++++-- 2 files changed, 63 insertions(+), 20 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 93d8032..1f4dc32 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -944,36 +944,62 @@ static HRESULT WINAPI xmlnode_get_definition( return E_NOTIMPL; } +static HRESULT WINAPI xmlnode_get_dataType(IXMLDOMNode*, VARIANT*); + +inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) +{ + if(!type || !lstrcmpiW(type, szString)) + { + V_VT(v) = VT_BSTR; + V_BSTR(v) = bstr_from_xmlChar(str); + + if(!V_BSTR(v)) + return E_OUTOFMEMORY; + } + else + { + FIXME("Type handling not yet implemented\n"); + V_VT(v) = VT_BSTR; + V_BSTR(v) = bstr_from_xmlChar(str); + + if(!V_BSTR(v)) + return E_OUTOFMEMORY; + } + + return S_OK; +} + static HRESULT WINAPI xmlnode_get_nodeTypedValue( IXMLDOMNode *iface, VARIANT* typedValue) { xmlnode *This = impl_from_IXMLDOMNode( iface ); - HRESULT r = S_FALSE; + VARIANT type; + xmlChar *content; + HRESULT hres = S_FALSE; - FIXME("ignoring data type %p %p\n", This, typedValue); + TRACE("iface %p\n", iface); 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); - } + if(This->node->type == XML_ELEMENT_NODE || + This->node->type == XML_TEXT_NODE || + This->node->type == XML_ENTITY_REF_NODE) + hres = xmlnode_get_dataType(iface, &type); - return r; + if(hres != S_OK && This->node->type != XML_ELEMENT_NODE) + return xmlnode_get_nodeValue(iface, typedValue); + + content = xmlNodeGetContent(This->node); + hres = VARIANT_from_xmlChar(content, typedValue, + hres==S_OK ? V_BSTR(&type) : NULL); + xmlFree(content); + VariantClear(&type); + + return hres; } static HRESULT WINAPI xmlnode_put_nodeTypedValue( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 469a4f9..b946970 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -147,8 +147,11 @@ static const CHAR szTransformOutput[] = "</h1></body></html>"; static const CHAR szTypeValueXML[] = -"<?xml version=\"1.0\" encoding=\"utf-8\"?>" -"<string>Wine</string>"; +"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +"<root xmlns:dt=\"urn:schemas-microsoft-com:datatypes\">\n" +" <string>Wine</string>\n" +" <string2 dt:dt=\"string\">String</string2>\n" +"</root>"; static const CHAR szBasicTransformSSXMLPart1[] = "<?xml version=\"1.0\"?>" @@ -3972,7 +3975,7 @@ static void test_NodeTypeValue(void) hr = IXMLDOMDocument2_get_nodeTypedValue(doc, &v); ok(hr == S_FALSE, "ret %08x\n", hr ); - hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("string"), &pNode); + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/string"), &pNode); ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK) { @@ -3987,11 +3990,25 @@ static void test_NodeTypeValue(void) hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_BSTR, "incorrect type\n"); ok(!lstrcmpW( V_BSTR(&v), _bstr_("Wine") ), "incorrect value\n"); VariantClear( &v ); IXMLDOMNode_Release(pNode); } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/string2"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_BSTR, "incorrect type\n"); + ok(!lstrcmpW( V_BSTR(&v), _bstr_("String") ), "incorrect value\n"); + VariantClear( &v ); + + IXMLDOMNode_Release(pNode); + } } IXMLDOMDocument2_Release(doc);

1 0

Henri Verbeet : wined3d: Move the various backend selection utility functions to utils.c.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: e4d8a3f309375ec4b749ac26487f566bb1f3bd29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4d8a3f309375ec4b749ac264… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 18 10:45:52 2009 +0100 wined3d: Move the various backend selection utility functions to utils.c. --- dlls/wined3d/directx.c | 103 ---------------------------------------- dlls/wined3d/utils.c | 60 +++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 8 +++ 3 files changed, 68 insertions(+), 103 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f9cec29..774dfec 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -155,10 +155,6 @@ static const struct { **********************************************************/ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapter, WINED3DDEVTYPE DeviceType, WINED3DFORMAT AdapterFormat, DWORD Usage, WINED3DRESOURCETYPE RType, WINED3DFORMAT CheckFormat, WINED3DSURFTYPE SurfaceType); -static const struct fragment_pipeline *select_fragment_implementation(struct wined3d_adapter *adapter, - WINED3DDEVTYPE DeviceType); -static const shader_backend_t *select_shader_backend(struct wined3d_adapter *adapter, WINED3DDEVTYPE DeviceType); -static const struct blit_shader *select_blit_implementation(struct wined3d_adapter *adapter, WINED3DDEVTYPE DeviceType); GLint wrap_lookup[WINED3DTADDRESS_MIRRORONCE - WINED3DTADDRESS_WRAP + 1]; @@ -389,39 +385,6 @@ static ULONG WINAPI IWineD3DImpl_Release(IWineD3D *iface) { return ref; } -/* Set the shader type for this device, depending on the given capabilities - * and the user preferences in wined3d_settings. */ -static void select_shader_mode(const struct wined3d_gl_info *gl_info, int *ps_selected, int *vs_selected) -{ - if (wined3d_settings.vs_mode == VS_NONE) { - *vs_selected = SHADER_NONE; - } else if (gl_info->supported[ARB_VERTEX_SHADER] && wined3d_settings.glslRequested) { - /* Geforce4 cards support GLSL but for vertex shaders only. Further its reported GLSL caps are - * wrong. This combined with the fact that glsl won't offer more features or performance, use ARB - * shaders only on this card. */ - if (gl_info->supported[NV_VERTEX_PROGRAM] && !gl_info->supported[NV_VERTEX_PROGRAM2]) - *vs_selected = SHADER_ARB; - else - *vs_selected = SHADER_GLSL; - } else if (gl_info->supported[ARB_VERTEX_PROGRAM]) { - *vs_selected = SHADER_ARB; - } else { - *vs_selected = SHADER_NONE; - } - - if (wined3d_settings.ps_mode == PS_NONE) { - *ps_selected = SHADER_NONE; - } else if (gl_info->supported[ARB_FRAGMENT_SHADER] && wined3d_settings.glslRequested) { - *ps_selected = SHADER_GLSL; - } else if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) { - *ps_selected = SHADER_ARB; - } else if (gl_info->supported[ATI_FRAGMENT_SHADER]) { - *ps_selected = SHADER_ATI; - } else { - *ps_selected = SHADER_NONE; - } -} - /********************************************************** * IWineD3D parts follows **********************************************************/ @@ -3810,72 +3773,6 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormatConversion(IWineD3D *iface, return WINED3D_OK; } -static const shader_backend_t *select_shader_backend(struct wined3d_adapter *adapter, WINED3DDEVTYPE DeviceType) -{ - const shader_backend_t *ret; - int vs_selected_mode; - int ps_selected_mode; - - select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); - if (vs_selected_mode == SHADER_GLSL || ps_selected_mode == SHADER_GLSL) { - ret = &glsl_shader_backend; - } else if (vs_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_ARB) { - ret = &arb_program_shader_backend; - } else { - ret = &none_shader_backend; - } - return ret; -} - -static const struct fragment_pipeline *select_fragment_implementation(struct wined3d_adapter *adapter, - WINED3DDEVTYPE DeviceType) -{ - const struct wined3d_gl_info *gl_info = &adapter->gl_info; - int vs_selected_mode; - int ps_selected_mode; - - select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); - if ((ps_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_GLSL) - && gl_info->supported[ARB_FRAGMENT_PROGRAM]) - { - return &arbfp_fragment_pipeline; - } - else if (ps_selected_mode == SHADER_ATI) - { - return &atifs_fragment_pipeline; - } - else if (gl_info->supported[NV_REGISTER_COMBINERS] && gl_info->supported[NV_TEXTURE_SHADER2]) - { - return &nvts_fragment_pipeline; - } - else if (gl_info->supported[NV_REGISTER_COMBINERS]) - { - return &nvrc_fragment_pipeline; - } - else - { - return &ffp_fragment_pipeline; - } -} - -static const struct blit_shader *select_blit_implementation(struct wined3d_adapter *adapter, WINED3DDEVTYPE DeviceType) -{ - const struct wined3d_gl_info *gl_info = &adapter->gl_info; - int vs_selected_mode; - int ps_selected_mode; - - select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); - if ((ps_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_GLSL) - && gl_info->supported[ARB_FRAGMENT_PROGRAM]) - { - return &arbfp_blit; - } - else - { - return &ffp_blit; - } -} - /* Note: d3d8 passes in a pointer to a D3DCAPS8 structure, which is a true subset of a D3DCAPS9 structure. However, it has to come via a void * as the d3d8 interface cannot import the d3d9 header */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 54b0fb7..1b4516a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2772,3 +2772,63 @@ UINT wined3d_log2i(UINT32 x) return (i = x >> 16) ? (x = i >> 8) ? l[x] + 24 : l[i] + 16 : (i = x >> 8) ? l[i] + 8 : l[x]; } + +/* Set the shader type for this device, depending on the given capabilities + * and the user preferences in wined3d_settings. */ +void select_shader_mode(const struct wined3d_gl_info *gl_info, int *ps_selected, int *vs_selected) +{ + if (wined3d_settings.vs_mode == VS_NONE) *vs_selected = SHADER_NONE; + else if (gl_info->supported[ARB_VERTEX_SHADER] && wined3d_settings.glslRequested) + { + /* Geforce4 cards support GLSL but for vertex shaders only. Further its reported GLSL caps are + * wrong. This combined with the fact that glsl won't offer more features or performance, use ARB + * shaders only on this card. */ + if (gl_info->supported[NV_VERTEX_PROGRAM] && !gl_info->supported[NV_VERTEX_PROGRAM2]) *vs_selected = SHADER_ARB; + else *vs_selected = SHADER_GLSL; + } + else if (gl_info->supported[ARB_VERTEX_PROGRAM]) *vs_selected = SHADER_ARB; + else *vs_selected = SHADER_NONE; + + if (wined3d_settings.ps_mode == PS_NONE) *ps_selected = SHADER_NONE; + else if (gl_info->supported[ARB_FRAGMENT_SHADER] && wined3d_settings.glslRequested) *ps_selected = SHADER_GLSL; + else if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) *ps_selected = SHADER_ARB; + else if (gl_info->supported[ATI_FRAGMENT_SHADER]) *ps_selected = SHADER_ATI; + else *ps_selected = SHADER_NONE; +} + +const shader_backend_t *select_shader_backend(struct wined3d_adapter *adapter, WINED3DDEVTYPE device_type) +{ + int vs_selected_mode, ps_selected_mode; + + select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); + if (vs_selected_mode == SHADER_GLSL || ps_selected_mode == SHADER_GLSL) return &glsl_shader_backend; + if (vs_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_ARB) return &arb_program_shader_backend; + return &none_shader_backend; +} + +const struct fragment_pipeline *select_fragment_implementation(struct wined3d_adapter *adapter, + WINED3DDEVTYPE device_type) +{ + const struct wined3d_gl_info *gl_info = &adapter->gl_info; + int vs_selected_mode, ps_selected_mode; + + select_shader_mode(gl_info, &ps_selected_mode, &vs_selected_mode); + if ((ps_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_GLSL) + && gl_info->supported[ARB_FRAGMENT_PROGRAM]) return &arbfp_fragment_pipeline; + else if (ps_selected_mode == SHADER_ATI) return &atifs_fragment_pipeline; + else if (gl_info->supported[NV_REGISTER_COMBINERS] + && gl_info->supported[NV_TEXTURE_SHADER2]) return &nvts_fragment_pipeline; + else if (gl_info->supported[NV_REGISTER_COMBINERS]) return &nvrc_fragment_pipeline; + else return &ffp_fragment_pipeline; +} + +const struct blit_shader *select_blit_implementation(struct wined3d_adapter *adapter, WINED3DDEVTYPE device_type) +{ + const struct wined3d_gl_info *gl_info = &adapter->gl_info; + int vs_selected_mode, ps_selected_mode; + + select_shader_mode(gl_info, &ps_selected_mode, &vs_selected_mode); + if ((ps_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_GLSL) + && gl_info->supported[ARB_FRAGMENT_PROGRAM]) return &arbfp_blit; + else return &ffp_blit; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f423733..1c8c539 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2525,6 +2525,14 @@ void multiply_matrix(WINED3DMATRIX *dest, const WINED3DMATRIX *src1, const WINED UINT wined3d_log2i(UINT32 x) DECLSPEC_HIDDEN; unsigned int count_bits(unsigned int mask) DECLSPEC_HIDDEN; +const struct blit_shader *select_blit_implementation(struct wined3d_adapter *adapter, + WINED3DDEVTYPE device_type) DECLSPEC_HIDDEN; +const struct fragment_pipeline *select_fragment_implementation(struct wined3d_adapter *adapter, + WINED3DDEVTYPE device_type) DECLSPEC_HIDDEN; +const shader_backend_t *select_shader_backend(struct wined3d_adapter *adapter, + WINED3DDEVTYPE device_type) DECLSPEC_HIDDEN; +void select_shader_mode(const struct wined3d_gl_info *gl_info, int *ps_selected, int *vs_selected) DECLSPEC_HIDDEN; + typedef struct local_constant { struct list entry; unsigned int idx;

1 0

Henri Verbeet : d3d9: Move D3D9CB_DestroySwapChain() to device.c.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: 434a23d90dfeefb31522e2cb3f051557c9f5f375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=434a23d90dfeefb31522e2cb3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 18 10:45:51 2009 +0100 d3d9: Move D3D9CB_DestroySwapChain() to device.c. --- dlls/d3d9/d3d9_private.h | 4 ---- dlls/d3d9/device.c | 11 +++++++++++ dlls/d3d9/directx.c | 10 ---------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 042a394..cbe5d80 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -563,8 +563,4 @@ typedef struct IDirect3DQuery9Impl { LPDIRECT3DDEVICE9EX parentDevice; } IDirect3DQuery9Impl; - -/* Callbacks */ -extern ULONG WINAPI D3D9CB_DestroySwapChain (IWineD3DSwapChain *pSwapChain) DECLSPEC_HIDDEN; - #endif /* __WINE_D3D9_PRIVATE_H */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 653395e..1151d99 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -181,6 +181,17 @@ static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, U } } +static ULONG WINAPI D3D9CB_DestroySwapChain(IWineD3DSwapChain *swapchain) +{ + IDirect3DSwapChain9Impl *parent; + + TRACE("swapchain %p.\n", swapchain); + + IWineD3DSwapChain_GetParent(swapchain, (IUnknown **)&parent); + parent->isImplicit = FALSE; + return IDirect3DSwapChain9_Release((IDirect3DSwapChain9 *)parent); +} + /* IDirect3D IUnknown parts follow: */ static HRESULT WINAPI IDirect3DDevice9Impl_QueryInterface(LPDIRECT3DDEVICE9EX iface, REFIID riid, LPVOID* ppobj) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 18c9955..9395381 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -407,16 +407,6 @@ static HMONITOR WINAPI IDirect3D9Impl_GetAdapterMonitor(LPDIRECT3D9EX iface, UIN return ret; } -ULONG WINAPI D3D9CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain) { - IDirect3DSwapChain9Impl* swapChainParent; - TRACE("(%p) call back\n", pSwapChain); - - IWineD3DSwapChain_GetParent(pSwapChain,(IUnknown **) &swapChainParent); - swapChainParent->isImplicit = FALSE; - /* Swap chain had refcount of 0 GetParent addrefed to 1, so 1 Release is enough */ - return IDirect3DSwapChain9_Release((IDirect3DSwapChain9*) swapChainParent); -} - static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9Impl_CreateDevice(IDirect3D9Ex *iface, UINT adapter, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters, IDirect3DDevice9 **device)

1 0

André Hentschel : winebuild: Add ARM support.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: 27fb36b39e611ff470ca970279671e33e087e155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27fb36b39e611ff470ca97027… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 17 20:20:48 2009 +0100 winebuild: Add ARM support. --- tools/winebuild/build.h | 2 +- tools/winebuild/import.c | 12 ++++++++++++ tools/winebuild/main.c | 2 ++ tools/winebuild/spec32.c | 7 +++++++ tools/winebuild/utils.c | 26 +++++++++++++++++++++++--- 5 files changed, 45 insertions(+), 4 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index b942934..65163f3 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -119,7 +119,7 @@ typedef struct enum target_cpu { - CPU_x86, CPU_x86_64, CPU_SPARC, CPU_ALPHA, CPU_POWERPC + CPU_x86, CPU_x86_64, CPU_SPARC, CPU_ALPHA, CPU_POWERPC, CPU_ARM }; enum target_platform diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index bb9d6d1..d41a754 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -699,6 +699,10 @@ static void output_import_thunk( const char *name, const char *table, int pos ) output( "\tlda $0,%d($0)\n", pos ); output( "\tjmp $31,($0)\n" ); break; + case CPU_ARM: + output( "\tmov r4, #%s\n", table ); + output( "\tldr r15, [r4, #%d]\n", pos ); + break; case CPU_POWERPC: output( "\tmr %s, %s\n", ppc_reg(0), ppc_reg(31) ); if (target_platform == PLATFORM_APPLE) @@ -1005,6 +1009,11 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tjsr $26,%s\n", asm_name("__wine_spec_delay_load") ); output( "\tjmp $31,($0)\n" ); break; + case CPU_ARM: + output( "\tstmfd sp!, {r4, r5, r6, r7, r8, r9, r10, lr}\n" ); + output( "\tblx %s\n", asm_name("__wine_spec_delay_load") ); + output( "\tldmfd sp!, {r4, r5, r6, r7, r8, r9, r10, pc}\n" ); + break; case CPU_POWERPC: if (target_platform == PLATFORM_APPLE) extra_stack_storage = 56; @@ -1088,6 +1097,9 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tldah $0,%d($0)\n", idx); output( "\tjmp $31,%s\n", asm_name("__wine_delay_load_asm") ); break; + case CPU_ARM: + output( "\tb %s\n", asm_name("__wine_delay_load_asm") ); + break; case CPU_POWERPC: switch(target_platform) { diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 4dfa63f..14c1689 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -58,6 +58,8 @@ enum target_cpu target_cpu = CPU_SPARC; enum target_cpu target_cpu = CPU_ALPHA; #elif defined(__powerpc__) enum target_cpu target_cpu = CPU_POWERPC; +#elif defined(__arm__) +enum target_cpu target_cpu = CPU_ARM; #else #error Unsupported CPU #endif diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 09e69f5..c2b11af 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -37,6 +37,7 @@ #define IMAGE_FILE_MACHINE_ALPHA 0x0184 #define IMAGE_FILE_MACHINE_POWERPC 0x01f0 #define IMAGE_FILE_MACHINE_AMD64 0x8664 +#define IMAGE_FILE_MACHINE_ARM 0x01C0 #define IMAGE_SIZEOF_NT_OPTIONAL32_HEADER 224 #define IMAGE_SIZEOF_NT_OPTIONAL64_HEADER 240 @@ -369,6 +370,9 @@ static void output_asm_constructor( const char *constructor ) case CPU_ALPHA: output( "\tjsr $26,%s\n", asm_name(constructor) ); break; + case CPU_ARM: + output( "\tblx %s\n", asm_name(constructor) ); + break; case CPU_POWERPC: output( "\tbl %s\n", asm_name(constructor) ); break; @@ -412,6 +416,7 @@ void output_module( DLLSPEC *spec ) case CPU_SPARC: output( "\tjmp 1f\n" ); break; + case CPU_ARM: case CPU_POWERPC: output( "\tb 1f\n" ); break; @@ -434,6 +439,7 @@ void output_module( DLLSPEC *spec ) { case CPU_x86: machine = IMAGE_FILE_MACHINE_I386; break; case CPU_x86_64: machine = IMAGE_FILE_MACHINE_AMD64; break; + case CPU_ARM: machine = IMAGE_FILE_MACHINE_ARM; break; case CPU_POWERPC: machine = IMAGE_FILE_MACHINE_POWERPC; break; case CPU_ALPHA: machine = IMAGE_FILE_MACHINE_ALPHA; break; case CPU_SPARC: machine = IMAGE_FILE_MACHINE_UNKNOWN; break; @@ -623,6 +629,7 @@ void output_fake_module( DLLSPEC *spec ) case CPU_POWERPC: put_word( IMAGE_FILE_MACHINE_POWERPC ); break; case CPU_ALPHA: put_word( IMAGE_FILE_MACHINE_ALPHA ); break; case CPU_SPARC: put_word( IMAGE_FILE_MACHINE_UNKNOWN ); break; + case CPU_ARM: put_word( IMAGE_FILE_MACHINE_ARM ); break; } put_word( nb_sections ); /* NumberOfSections */ put_dword( 0 ); /* TimeDateStamp */ diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index bbf23f4..c0b9371 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -57,7 +57,8 @@ static const struct { "x86_64", CPU_x86_64 }, { "sparc", CPU_SPARC }, { "alpha", CPU_ALPHA }, - { "powerpc", CPU_POWERPC } + { "powerpc", CPU_POWERPC }, + { "arm", CPU_ARM } }; /* atexit handler to clean tmp files */ @@ -795,6 +796,7 @@ unsigned int get_alignment(unsigned int align) case CPU_x86: case CPU_x86_64: case CPU_SPARC: + case CPU_ARM: if (target_platform != PLATFORM_APPLE) return align; /* fall through */ case CPU_POWERPC: @@ -816,6 +818,7 @@ unsigned int get_page_size(void) case CPU_x86: return 4096; case CPU_x86_64: return 4096; case CPU_POWERPC: return 4096; + case CPU_ARM: return 4096; case CPU_SPARC: return 8192; case CPU_ALPHA: return 8192; } @@ -833,6 +836,7 @@ unsigned int get_ptr_size(void) case CPU_POWERPC: case CPU_SPARC: case CPU_ALPHA: + case CPU_ARM: return 4; case CPU_x86_64: return 8; @@ -873,7 +877,15 @@ const char *func_declaration( const char *func ) sprintf( buffer, ".def _%s; .scl 2; .type 32; .endef", func ); break; default: - sprintf( buffer, ".type %s,@function", func ); + switch(target_cpu) + { + case CPU_ARM: + sprintf( buffer, ".type %s,%%function", func ); + break; + default: + sprintf( buffer, ".type %s,@function", func ); + break; + } break; } return buffer; @@ -902,7 +914,15 @@ void output_gnu_stack_note(void) case PLATFORM_APPLE: break; default: - output( "\t.section .note.GNU-stack,\"\",@progbits\n" ); + switch(target_cpu) + { + case CPU_ARM: + output( "\t.section .note.GNU-stack,\"\",%%progbits\n" ); + break; + default: + output( "\t.section .note.GNU-stack,\"\",@progbits\n" ); + break; + } break; } }

1 0