February 2010 - Wine-commits

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 : 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

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

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

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

Nikolay Sivov : msxml3: Fix IXMLDOMDocument::createDocumentFragment(), can' t use IXMLDOMNode*->IXMLDOMDocumentFragment* cast.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 035566802b104b75b43fd8c8ccaf6d5261aad21d URL: http://source.winehq.org/git/wine.git/?a=commit;h=035566802b104b75b43fd8c8c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Feb 12 21:30:16 2010 +0300 msxml3: Fix IXMLDOMDocument::createDocumentFragment(), can't use IXMLDOMNode*->IXMLDOMDocumentFragment* cast. --- dlls/msxml3/domdoc.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 9164ad1..cb734b6 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1057,13 +1057,27 @@ static HRESULT WINAPI domdoc_createDocumentFragment( IXMLDOMDocumentFragment** frag ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); + IXMLDOMNode *node; VARIANT type; + HRESULT hr; TRACE("(%p)->(%p)\n", This, frag); + if (!frag) return E_INVALIDARG; + + *frag = NULL; + V_VT(&type) = VT_I1; V_I1(&type) = NODE_DOCUMENT_FRAGMENT; - return IXMLDOMDocument_createNode(iface, type, NULL, NULL, (IXMLDOMNode**)frag); + + hr = IXMLDOMDocument_createNode(iface, type, NULL, NULL, &node); + if (hr == S_OK) + { + IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMDocumentFragment, (void**)frag); + IXMLDOMNode_Release(node); + } + + return hr; }

1 0

Ozkan Sezer : include: Make dmoreg.h C++ compatible.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 95a2f9d9515acd0916d2d0f27d56ec8e1d3ac18e URL: http://source.winehq.org/git/wine.git/?a=commit;h=95a2f9d9515acd0916d2d0f27… Author: Ozkan Sezer <sezeroz(a)gmail.com> Date: Sun Feb 14 12:04:51 2010 +0200 include: Make dmoreg.h C++ compatible. --- include/dmoreg.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/dmoreg.h b/include/dmoreg.h index 66966f9..b1fedb8 100644 --- a/include/dmoreg.h +++ b/include/dmoreg.h @@ -21,6 +21,10 @@ #include "mediaobj.h" +#ifdef __cplusplus +extern "C" { +#endif + typedef struct _DMO_PARTIAL_MEDIATYPE { GUID type; @@ -67,4 +71,8 @@ DEFINE_GUID(DMOCATEGORY_AUDIO_NOISE_SUPPRESS, DEFINE_GUID(DMOCATEGORY_AGC, 0xe88c9ba0,0xc557,0x11d0,0x8a,0x2b,0x00,0xa0,0xc9,0x25,0x5a,0xc1); +#ifdef __cplusplus +} +#endif + #endif /* __DMOREG_H__ */

1 0

Alexandre Julliard : ntdll/tests: Use correct access rights in the NtOpenKey test.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 531daa04c2aadb7d2d655efae09c9f182bc482c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=531daa04c2aadb7d2d655efae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 15 12:20:18 2010 +0100 ntdll/tests: Use correct access rights in the NtOpenKey test. --- dlls/ntdll/tests/reg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 48de5a5..8061516 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -350,7 +350,7 @@ static void test_NtOpenKey(void) InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); /* NULL key */ - status = pNtOpenKey(NULL, 0, &attr); + status = pNtOpenKey(NULL, am, &attr); todo_wine ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got: 0x%08x\n", status);

1 0

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

15 Feb '10

Module: wine Branch: master Commit: a4761f6fdfebeeb5cde7221f0880e4a52e859844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4761f6fdfebeeb5cde7221f0… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Sat Feb 13 01:11:20 2010 +0100 hhctrl.ocx: New Spanish translations. --- dlls/hhctrl.ocx/Es.rc | 63 +++++++++++++++++++++++++++++++++++++++++++ dlls/hhctrl.ocx/Makefile.in | 1 + 2 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/Es.rc b/dlls/hhctrl.ocx/Es.rc new file mode 100644 index 0000000..d7681aa --- /dev/null +++ b/dlls/hhctrl.ocx/Es.rc @@ -0,0 +1,63 @@ +/* + * HTML Help resources + * Spanish Language Support + * + * 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 "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_CONTENTS "&Contenido" + IDS_INDEX "Í&ndice" + IDS_SEARCH "&Buscar" + IDS_FAVORITES "Favor&itos" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "Mostrar" + IDTB_CONTRACT "Ocultar" + IDTB_STOP "Parar" + IDTB_REFRESH "Recargar" + IDTB_BACK "Atrás" + IDTB_HOME "Inicio" + IDTB_SYNC "Sincronizar" + IDTB_PRINT "Imprimir" + IDTB_OPTIONS "Opciones" + IDTB_FORWARD "Adelante" + IDTB_NOTES "IDTB_NOTES" + IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" + IDTB_BROWSE_BACK "IDT_BROWSE_BACK" + IDTB_CONTENTS "IDTB_CONTENTS" + IDTB_INDEX "IDTB_INDEX" + IDTB_SEARCH "IDTB_SEARCH" + IDTB_HISTORY "IDTB_HISTORY" + IDTB_FAVORITES "IDTB_FAVORITES" + IDTB_JUMP1 "Jump1" + IDTB_JUMP2 "Jump2" + IDTB_CUSTOMIZE "Personalizar" + IDTB_ZOOM "Zoom" + IDTB_TOC_NEXT "IDTB_TOC_NEXT" + IDTB_TOC_PREV "IDTB_TOC_PREV" +END diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index 19e6058..1d7f0a2 100644 --- a/dlls/hhctrl.ocx/Makefile.in +++ b/dlls/hhctrl.ocx/Makefile.in @@ -22,6 +22,7 @@ RC_SRCS = \ De.rc \ El.rc \ En.rc \ + Es.rc \ Fi.rc \ Fr.rc \ Hu.rc \

1 0

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

15 Feb '10

Module: wine Branch: master Commit: 7ffbfdb7a05b865d5cfcc09b900bf221acd97de6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ffbfdb7a05b865d5cfcc09b9… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Sat Feb 13 01:12:47 2010 +0100 iccvid: New Spanish translations. --- dlls/iccvid/Makefile.in | 1 + dlls/iccvid/iccvid_Es.rc | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/iccvid/Makefile.in b/dlls/iccvid/Makefile.in index 6fdf13d..7096951 100644 --- a/dlls/iccvid/Makefile.in +++ b/dlls/iccvid/Makefile.in @@ -12,6 +12,7 @@ RC_SRCS = \ iccvid_Da.rc \ iccvid_De.rc \ iccvid_En.rc \ + iccvid_Es.rc \ iccvid_Fr.rc \ iccvid_Hu.rc \ iccvid_Ja.rc \ diff --git a/dlls/iccvid/iccvid_Es.rc b/dlls/iccvid/iccvid_Es.rc new file mode 100644 index 0000000..e86d525 --- /dev/null +++ b/dlls/iccvid/iccvid_Es.rc @@ -0,0 +1,30 @@ +/* + * 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 "iccvid_private.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "Códec de vídeo Cinepak" + IDS_DESCRIPTION "Códec de vídeo Cinepak" +}

1 0