wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Nikolay Sivov : msxml3: Reimplement IXMLDOMDocument::createComment() on top of ::createNode().
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 760f7ba724a50b242e0b266bb7c49169256c272c URL: http://source.winehq.org/git/wine.git/?a=commit;h=760f7ba724a50b242e0b266bb… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Feb 12 21:26:50 2010 +0300 msxml3: Reimplement IXMLDOMDocument::createComment() on top of ::createNode(). --- dlls/msxml3/domdoc.c | 31 +++++++++--------- dlls/msxml3/msxml_private.h | 2 + dlls/msxml3/tests/domdoc.c | 74 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 89 insertions(+), 18 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index f3bd371..9164ad1 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1105,29 +1105,28 @@ static HRESULT WINAPI domdoc_createComment( IXMLDOMComment** comment ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - xmlNodePtr xmlnode; - xmlChar *xml_content; + VARIANT type; + HRESULT hr; + IXMLDOMNode *node; - TRACE("%p->(%s %p)\n", iface, debugstr_w(data), comment); + TRACE("%p->(%s %p)\n", This, debugstr_w(data), comment); - if(!comment) - return E_INVALIDARG; + if (!comment) return E_INVALIDARG; *comment = NULL; - xml_content = xmlChar_from_wchar(data); - xmlnode = xmlNewComment(xml_content); - heap_free(xml_content); - - if(!xmlnode) - return E_FAIL; - - xmlnode->doc = get_doc( This ); - xmldoc_add_orphan(xmlnode->doc, xmlnode); + V_VT(&type) = VT_I1; + V_I1(&type) = NODE_COMMENT; - *comment = (IXMLDOMComment*)create_comment(xmlnode); + hr = IXMLDOMDocument2_createNode(iface, type, NULL, NULL, &node); + if (hr == S_OK) + { + IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMComment, (void**)comment); + IXMLDOMNode_Release(node); + hr = IXMLDOMComment_put_data(*comment, data); + } - return S_OK; + return hr; } diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index dd7b2af..1df3e8b 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -174,6 +174,8 @@ static inline BSTR bstr_from_xmlChar(const xmlChar *str) if(ret) MultiByteToWideChar( CP_UTF8, 0, (LPCSTR)str, -1, ret, len); } + else + ret = SysAllocStringLen(NULL, 0); return ret; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 11115b6..031f701 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -969,6 +969,27 @@ static void test_domdoc( void ) /* test Create Comment */ r = IXMLDOMDocument_createComment(doc, NULL, NULL); ok( r == E_INVALIDARG, "returns %08x\n", r ); + node_comment = (IXMLDOMComment*)0x1; + + /* empty comment */ + r = IXMLDOMDocument_createComment(doc, _bstr_(""), &node_comment); + ok( r == S_OK, "returns %08x\n", r ); + str = (BSTR)0x1; + r = IXMLDOMComment_get_data(node_comment, &str); + ok( r == S_OK, "returns %08x\n", r ); + ok( str && SysStringLen(str) == 0, "expected empty string data\n"); + IXMLDOMComment_Release(node_comment); + SysFreeString(str); + + r = IXMLDOMDocument_createComment(doc, NULL, &node_comment); + ok( r == S_OK, "returns %08x\n", r ); + str = (BSTR)0x1; + r = IXMLDOMComment_get_data(node_comment, &str); + ok( r == S_OK, "returns %08x\n", r ); + ok( str && (SysStringLen(str) == 0), "expected empty string data\n"); + IXMLDOMComment_Release(node_comment); + SysFreeString(str); + str = SysAllocString(szComment); r = IXMLDOMDocument_createComment(doc, str, &node_comment); SysFreeString(str); @@ -1655,6 +1676,7 @@ static void test_create(void) BSTR str, name; IXMLDOMDocument *doc; IXMLDOMElement *element; + IXMLDOMComment *comment; IXMLDOMNode *root, *node, *child; IXMLDOMNamedNodeMap *attr_map; IUnknown *unk; @@ -1695,6 +1717,54 @@ static void test_create(void) ok( r == E_INVALIDARG, "returns %08x\n", r ); ok( node == (void*)0x1, "expected same ptr, got %p\n", node); + /* NODE_COMMENT */ + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_COMMENT; + node = NULL; + r = IXMLDOMDocument_createNode( doc, var, NULL, NULL, &node ); + ok( r == S_OK, "returns %08x\n", r ); + ok( node != NULL, "\n"); + + r = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMComment, (void**)&comment); + ok( r == S_OK, "returns %08x\n", r ); + IXMLDOMNode_Release(node); + + str = NULL; + r = IXMLDOMComment_get_data(comment, &str); + ok( r == S_OK, "returns %08x\n", r ); + ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); + IXMLDOMComment_Release(comment); + SysFreeString(str); + + node = (IXMLDOMNode*)0x1; + r = IXMLDOMDocument_createNode( doc, var, _bstr_(""), NULL, &node ); + ok( r == S_OK, "returns %08x\n", r ); + + r = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMComment, (void**)&comment); + ok( r == S_OK, "returns %08x\n", r ); + IXMLDOMNode_Release(node); + + str = NULL; + r = IXMLDOMComment_get_data(comment, &str); + ok( r == S_OK, "returns %08x\n", r ); + ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); + IXMLDOMComment_Release(comment); + + node = (IXMLDOMNode*)0x1; + r = IXMLDOMDocument_createNode( doc, var, _bstr_("blah"), NULL, &node ); + ok( r == S_OK, "returns %08x\n", r ); + + r = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMComment, (void**)&comment); + ok( r == S_OK, "returns %08x\n", r ); + IXMLDOMNode_Release(node); + + str = NULL; + r = IXMLDOMComment_get_data(comment, &str); + ok( r == S_OK, "returns %08x\n", r ); + ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); + IXMLDOMComment_Release(comment); + + /* NODE_ELEMENT */ V_VT(&var) = VT_I1; V_I1(&var) = NODE_ELEMENT; str = SysAllocString( szlc ); @@ -2920,7 +2990,7 @@ static void test_xmlTypes(void) { /* Comment */ str = SysAllocString(szComment); - hr = IXMLDOMDocument_createComment(doc, szComment, &pComment); + hr = IXMLDOMDocument_createComment(doc, str, &pComment); SysFreeString(str); ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK) @@ -3200,7 +3270,7 @@ static void test_xmlTypes(void) /* Attribute */ str = SysAllocString(szAttribute); - hr = IXMLDOMDocument_createAttribute(doc, szAttribute, &pAttrubute); + hr = IXMLDOMDocument_createAttribute(doc, str, &pAttrubute); SysFreeString(str); ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK)

1 0

Alistair Leslie-Hughes : msxml4: Added support for SAXXMLReader40.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: dd404487071ebcf0204520124f7910e8a1fd0c5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd404487071ebcf0204520124… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Feb 13 22:59:18 2010 +1100 msxml4: Added support for SAXXMLReader40. --- dlls/msxml3/factory.c | 3 ++- dlls/msxml4/regsvr.c | 13 +++++++++++++ include/msxml2.idl | 9 +++++++++ 3 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 45ba368..af94d5c 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -167,7 +167,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) cf = (IClassFactory*) &domdoccf.lpVtbl; } else if( IsEqualCLSID( rclsid, &CLSID_SAXXMLReader) || - IsEqualCLSID( rclsid, &CLSID_SAXXMLReader30 )) + IsEqualCLSID( rclsid, &CLSID_SAXXMLReader30 ) || + IsEqualCLSID( rclsid, &CLSID_SAXXMLReader40 )) { cf = (IClassFactory*) &saxreadcf.lpVtbl; } diff --git a/dlls/msxml4/regsvr.c b/dlls/msxml4/regsvr.c index d5180c3..b3088f1 100644 --- a/dlls/msxml4/regsvr.c +++ b/dlls/msxml4/regsvr.c @@ -345,6 +345,14 @@ static struct regsvr_coclass const coclass_list[] = { "Msxml2.DOMDocument", "4.0" }, + { &CLSID_SAXXMLReader40, + "SAX XML Reader 4.0", + NULL, + "msxml4.dll", + "Both", + "Msxml2.SAXXMLReader", + "4.0" + }, { NULL } /* list terminator */ }; @@ -357,6 +365,11 @@ static struct progid const progid_list[] = { &CLSID_DOMDocument40, NULL }, + { "Msxml2.SAXXMLReader.4.0", + "SAX XML Reader 4.0", + &CLSID_SAXXMLReader40, + NULL + }, { NULL } /* list terminator */ }; diff --git a/include/msxml2.idl b/include/msxml2.idl index b6303c9..8991400 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -1980,6 +1980,15 @@ coclass SAXXMLReader30 }; [ + uuid(7c6e29bc-8b8b-4c3d-859e-af6cd158be0f) +] +coclass SAXXMLReader40 +{ + [default] interface IVBSAXXMLReader; + interface ISAXXMLReader; +}; + +[ uuid(fc220ad8-a72a-4ee8-926e-0b7ad152a020) ] coclass MXXMLWriter

1 0

Huw Davies : rpcrt4: Fix tests on win64.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 24db8d384cab9828648900869a5f52f667eff28b URL: http://source.winehq.org/git/wine.git/?a=commit;h=24db8d384cab9828648900869… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 12 16:34:14 2010 +0000 rpcrt4: Fix tests on win64. --- dlls/rpcrt4/tests/ndr_marshall.c | 38 +++++++++++++++++++++++++++++++++++++- 1 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 841af17..2c18bc5 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1922,6 +1922,21 @@ static void test_conf_complex_array(void) /* 28 */ NdrFcShort( 0xffe4 ), /* Offset= -28 (0) */ /* 30 */ 0x5c, /* FC_PAD */ 0x5b, /* FC_END */ + +#ifdef _WIN64 +/* 32 */ 0x1a, /* FC_BOGUS_STRUCT */ + 0x3, /* 3 */ +/* 34 */ NdrFcShort( 0x10 ), /* 16 */ +/* 36 */ NdrFcShort( 0x0 ), /* 0 */ +/* 38 */ NdrFcShort( 0x6 ), /* Offset= 6 (44) */ +/* 40 */ 0x8, /* FC_LONG */ + 0x8, /* FC_LONG */ +/* 42 */ 0x36, /* FC_POINTER */ + 0x5b, /* FC_END */ +/* 44 */ + 0x12, 0x0, /* FC_UP */ +/* 46 */ NdrFcShort( 0xffe0 ), /* Offset= -32 (14) */ +#else /* 32 */ 0x16, /* FC_PSTRUCT */ 0x3, /* 3 */ @@ -1940,6 +1955,7 @@ static void test_conf_complex_array(void) 0x8, /* FC_LONG */ /* 52 */ 0x5c, /* FC_PAD */ 0x5b, /* FC_END */ +#endif }; memsrc.dim1 = 5; @@ -1964,9 +1980,16 @@ static void test_conf_complex_array(void) 0); StubMsg.BufferLength = 0; + +#ifdef _WIN64 + NdrComplexStructBufferSize( &StubMsg, + (unsigned char *)&memsrc, + &fmtstr_complex_array[32] ); +#else NdrSimpleStructBufferSize( &StubMsg, (unsigned char *)&memsrc, &fmtstr_complex_array[32] ); +#endif expected_length = (4 + memsrc.dim1 * (2 + memsrc.dim2)) * 4; if (StubMsg.BufferLength == 96) @@ -1981,10 +2004,15 @@ todo_wine StubMsg.RpcMsg->Buffer = StubMsg.BufferStart = StubMsg.Buffer = HeapAlloc(GetProcessHeap(), 0, StubMsg.BufferLength); StubMsg.BufferEnd = StubMsg.BufferStart + StubMsg.BufferLength; +#ifdef _WIN64 + ptr = NdrComplexStructMarshall( &StubMsg, (unsigned char *)&memsrc, + &fmtstr_complex_array[32] ); +#else ptr = NdrSimpleStructMarshall( &StubMsg, (unsigned char *)&memsrc, &fmtstr_complex_array[32] ); - ok(ptr == NULL, "ret %p\n", ptr); +#endif + ok(ptr == NULL, "ret %p\n", ptr); todo_wine ok((char*)StubMsg.Buffer == (char*)StubMsg.BufferStart + expected_length, "not at expected length\n"); @@ -2025,14 +2053,22 @@ todo_wine StubMsg.IsClient = 0; mem = NULL; StubMsg.Buffer = StubMsg.BufferStart; +#ifdef _WIN64 + ptr = NdrComplexStructUnmarshall( &StubMsg, (unsigned char **)&mem, &fmtstr_complex_array[32], 0); +#else ptr = NdrSimpleStructUnmarshall( &StubMsg, (unsigned char **)&mem, &fmtstr_complex_array[32], 0); +#endif ok(ptr == NULL, "ret %p\n", ptr); ok(mem->dim1 == memsrc.dim1, "mem->dim1 wasn't unmarshalled correctly (%d)\n", mem->dim1); ok(mem->dim2 == memsrc.dim2, "mem->dim2 wasn't unmarshalled correctly (%d)\n", mem->dim2); ok(mem->array[1][0] == memsrc.dim2, "mem->array[1][0] wasn't unmarshalled correctly (%d)\n", mem->array[1][0]); StubMsg.Buffer = StubMsg.BufferStart; +#ifdef _WIN64 + NdrComplexStructFree( &StubMsg, (unsigned char*)mem, &fmtstr_complex_array[32]); +#else NdrSimpleStructFree( &StubMsg, (unsigned char*)mem, &fmtstr_complex_array[32]); +#endif } HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer);

1 0

Christian Costa : ddraw: Enable GetViewport to retreive data set by SetViewport2 and vice-versa + tests .
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: e0213af9abb603bb8924ec1099907b21092c8b8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0213af9abb603bb8924ec109… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Feb 15 09:49:16 2010 +0100 ddraw: Enable GetViewport to retreive data set by SetViewport2 and vice-versa + tests. --- dlls/ddraw/tests/d3d.c | 167 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/viewport.c | 46 ++++++++++---- 2 files changed, 201 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0213af9abb603bb8924e…

1 0

Christian Costa : ddraw: Fix D3DTBLEND_MODULATE emulation.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 720aa5bf2326dd31874fa9965ea3388dfe66d0f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=720aa5bf2326dd31874fa9965… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Feb 15 09:48:38 2010 +0100 ddraw: Fix D3DTBLEND_MODULATE emulation. Alpha source should be selected with WINED3DTSS_ALPHAOP and not by changing the source itself. --- dlls/ddraw/device.c | 25 +++++++++---------------- 1 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 68b149e..136d73e 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2580,7 +2580,8 @@ IDirect3DDeviceImpl_3_GetRenderState(IDirect3DDevice3 *iface, } if (!(colorop == WINED3DTOP_MODULATE && colorarg1 == WINED3DTA_TEXTURE && colorarg2 == WINED3DTA_CURRENT && - alphaop == WINED3DTOP_SELECTARG1 && alphaarg1 == (tex_alpha ? WINED3DTA_TEXTURE : WINED3DTA_CURRENT))) + alphaop == (tex_alpha ? WINED3DTOP_SELECTARG1 : WINED3DTOP_SELECTARG2) && + alphaarg1 == WINED3DTA_TEXTURE && alphaarg2 == WINED3DTA_CURRENT)) { ERR("Unexpected texture stage state setup, returning D3DTBLEND_MODULATE - likely erroneous\n"); } @@ -2852,16 +2853,12 @@ IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface, IWineD3DBaseTexture_Release(tex); } - IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAOP, WINED3DTOP_SELECTARG1); if (tex_alpha) - { - IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAARG1, WINED3DTA_TEXTURE); - } + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAOP, WINED3DTOP_SELECTARG1); else - { - IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAARG1, WINED3DTA_CURRENT); - } - + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAOP, WINED3DTOP_SELECTARG2); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAARG1, WINED3DTA_TEXTURE); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAARG2, WINED3DTA_CURRENT); IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLORARG1, WINED3DTA_TEXTURE); IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLORARG2, WINED3DTA_CURRENT); IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLOROP, WINED3DTOP_MODULATE); @@ -4664,15 +4661,11 @@ IDirect3DDeviceImpl_3_SetTexture(IDirect3DDevice3 *iface, IWineD3DBaseTexture_Release(tex); } - /* alphaop is WINED3DTOP_SELECTARG1 if it's D3DTBLEND_MODULATE, so only modify alphaarg1 */ + /* Arg 1/2 are already set to WINED3DTA_TEXTURE/WINED3DTA_CURRENT in case of D3DTBLEND_MODULATE */ if (tex_alpha) - { - IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAARG1, WINED3DTA_TEXTURE); - } + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAOP, WINED3DTOP_SELECTARG1); else - { - IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAARG1, WINED3DTA_CURRENT); - } + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAOP, WINED3DTOP_SELECTARG2); } LeaveCriticalSection(&ddraw_cs);

1 0

Christian Costa : d3dx9_36: Improve some stubs.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 6b6db0dcb20b20f46fcd7ea29d108b123c3dbbde URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6db0dcb20b20f46fcd7ea29… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Feb 15 09:48:03 2010 +0100 d3dx9_36: Improve some stubs. --- dlls/d3dx9_36/shader.c | 4 ++-- dlls/d3dx9_36/surface.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index bd41013..16fdd78 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -142,7 +142,7 @@ HRESULT WINAPI D3DXAssembleShader(LPCSTR data, LPD3DXBUFFER* shader, LPD3DXBUFFER* error_messages) { - FIXME("stub\n"); + FIXME("(%p, %d, %p, %p, %x, %p, %p): stub\n", data, data_len, defines, include, flags, shader, error_messages); return D3DERR_INVALIDCALL; } @@ -177,7 +177,7 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR filename, LPD3DXBUFFER* shader, LPD3DXBUFFER* error_messages) { - FIXME("stub\n"); + FIXME("(%s, %p, %p, %x, %p, %p): stub\n", debugstr_w(filename), defines, include, flags, shader, error_messages); return D3DERR_INVALIDCALL; } diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 4d8d1f6..6de6de7 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -47,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); */ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3DXIMAGE_INFO *info) { - FIXME("stub\n"); + FIXME("(%p, %d, %p): stub\n", data, datasize, info); if(data && datasize && !info) return D3D_OK; if( !data || !datasize ) return D3DERR_INVALIDCALL; @@ -193,7 +193,9 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(LPDIRECT3DSURFACE9 pDestSurface, D3DCOLOR Colorkey, D3DXIMAGE_INFO *pSrcInfo) { - FIXME("stub\n"); + FIXME("(%p, %p, %p, %p, %d, %p, %d, %x, %p): stub\n", pDestSurface, pDestPalette, + pDestRect, pSrcData, SrcDataSize, pSrcRect, dwFilter, Colorkey, pSrcInfo); + if( !pDestSurface || !pSrcData | !SrcDataSize ) return D3DERR_INVALIDCALL; return E_NOTIMPL; }

1 0

Christian Costa : d3dx9_36: Implement D3DXCreateTexture.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 82d70540857d868691db0fecc65c254b0ebc58ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d70540857d868691db0fecc… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Feb 15 09:47:50 2010 +0100 d3dx9_36: Implement D3DXCreateTexture. --- dlls/d3dx9_36/Makefile.in | 1 + dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/texture.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index 88ac1d7..36eca4a 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -15,6 +15,7 @@ C_SRCS = \ shader.c \ sprite.c \ surface.c \ + texture.c \ util.c RC_SRCS = version.rc diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 37334e7..43551b2 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -92,7 +92,7 @@ @ stub D3DXCreateTeapot @ stub D3DXCreateTextA @ stub D3DXCreateTextW -@ stub D3DXCreateTexture +@ stdcall D3DXCreateTexture(ptr long long long long long long ptr) @ stub D3DXCreateTextureFromFileA @ stub D3DXCreateTextureFromFileExA @ stub D3DXCreateTextureFromFileExW diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c new file mode 100644 index 0000000..f47853a --- /dev/null +++ b/dlls/d3dx9_36/texture.c @@ -0,0 +1,37 @@ +/* + * Copyright 2010 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" +#include "d3dx9_36_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +HRESULT WINAPI D3DXCreateTexture(LPDIRECT3DDEVICE9 pDevice, + UINT width, + UINT height, + UINT miplevels, + DWORD usage, + D3DFORMAT format, + D3DPOOL pool, + LPDIRECT3DTEXTURE9 *ppTexture) +{ + FIXME("(%p, %d, %d, %d, %x, %x, %x, %p): semi-stub\n", pDevice, width, height, miplevels, usage, format, + pool, ppTexture); + + return IDirect3DDevice9_CreateTexture(pDevice, width, height, miplevels, usage, format, pool, ppTexture, NULL); +}

1 0

Alexandre Julliard : runtest: Fix handling of test binaries in the programs directory.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 96346ed62ef1d51df38f5073309172bb58c68c82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96346ed62ef1d51df38f50733… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 15 12:49:08 2010 +0100 runtest: Fix handling of test binaries in the programs directory. --- tools/runtest | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/tools/runtest b/tools/runtest index 86f8680..79bd2f7 100755 --- a/tools/runtest +++ b/tools/runtest @@ -91,14 +91,22 @@ done if [ -z "$program" ]; then # try to autodetect the test program name based on the working directory working_path=`pwd` - working_basename=`basename "$working_path"` - if [ "$working_basename" = "tests" ]; then - parent_path=`dirname "$working_path"` - parent_basename=`basename "$parent_path"` - program="${parent_basename}_test.exe.so" - elif [ -d "tests" ]; then - program="tests/${working_basename}_test.exe.so" - fi + case $working_path in + */dlls/*/tests) + parent_path=`dirname "$working_path"` + program=`basename "$parent_path"`_test.exe.so + ;; + */dlls/*) + program=tests/`basename "$working_path"`_test.exe.so + ;; + */programs/*/tests) + parent_path=`dirname "$working_path"` + program=`basename "$parent_path"`.exe_test.exe.so + ;; + */programs/*) + program=tests/`basename "$working_path"`.exe_test.exe.so + ;; + esac fi if [ ! -f "$program" ]; then echo "Can't find the test program, use the -p argument to specify one" 1>&2

1 0

José Manuel Ferrer Ortiz : mapi32: New Spanish translations.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: bd5f4637a15a9d95849a9346d1fdb76936bf2441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd5f4637a15a9d95849a9346d… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Sat Feb 13 01:14:07 2010 +0100 mapi32: New Spanish translations. --- dlls/mapi32/Es.rc | 33 +++++++++++++++++++++++++++++++++ dlls/mapi32/Makefile.in | 1 + 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/Es.rc b/dlls/mapi32/Es.rc new file mode 100644 index 0000000..534f4d4 --- /dev/null +++ b/dlls/mapi32/Es.rc @@ -0,0 +1,33 @@ +/* +* MAPI32 Spanish resources +* +* Copyright 2010 José Manuel Ferrer Ortiz +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +* +*/ + +#include "res.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "El envío de correo ha fallado debido a que no tiene instalado un cliente de correo MAPI." + IDS_SEND_MAIL, "Enviar correo" +} diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index 2ce3313..46139bd 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -16,6 +16,7 @@ C_SRCS = \ RC_SRCS = \ De.rc \ En.rc \ + Es.rc \ Fr.rc \ Lt.rc \ Ru.rc \

1 0

José Manuel Ferrer Ortiz : localspl: New Spanish translations.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: efa97230c13306f1e7e689915f71ba7c1375d94d URL: http://source.winehq.org/git/wine.git/?a=commit;h=efa97230c13306f1e7e689915… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Sat Feb 13 01:13:29 2010 +0100 localspl: New Spanish translations. --- dlls/localspl/Makefile.in | 1 + dlls/localspl/spl_Es.rc | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/Makefile.in b/dlls/localspl/Makefile.in index 9fa087d..6409454 100644 --- a/dlls/localspl/Makefile.in +++ b/dlls/localspl/Makefile.in @@ -15,6 +15,7 @@ RC_SRCS = \ spl_Da.rc \ spl_De.rc \ spl_En.rc \ + spl_Es.rc \ spl_Fr.rc \ spl_Ko.rc \ spl_Lt.rc \ diff --git a/dlls/localspl/spl_Es.rc b/dlls/localspl/spl_Es.rc new file mode 100644 index 0000000..9b9a558 --- /dev/null +++ b/dlls/localspl/spl_Es.rc @@ -0,0 +1,32 @@ +/* + * Spanish resources for localspl + * + * Copyright 2010 José Manuel Ferrer Ortiz + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "localspl_private.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Puerto local" + IDS_LOCALMONITOR "Monitor local" +}

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
79
Older →

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 February 2010