January 2010 - Wine-Commits

Paul Vriens : comctl32: Fix size parameter for memset (Coccinelle).
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: 9cf1af7cac45feb6dff0bef4feb661c46693328f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf1af7cac45feb6dff0bef4f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jan 11 08:51:01 2010 +0100 comctl32: Fix size parameter for memset (Coccinelle). --- dlls/comctl32/rebar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index f2e736a..21aabfa 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2409,7 +2409,7 @@ REBAR_InsertBandT(REBAR_INFO *infoPtr, INT iIndex, LPREBARBANDINFOW lprbbi, BOOL TRACE("index %d!\n", iIndex); /* initialize band */ - memset(lpBand, 0, sizeof(lpBand)); + memset(lpBand, 0, sizeof(*lpBand)); lpBand->clrFore = infoPtr->clrText == CLR_NONE ? infoPtr->clrBtnText : infoPtr->clrText; lpBand->clrBack = infoPtr->clrBk == CLR_NONE ? infoPtr->clrBtnFace :

1 0

Christian Costa : d3drm: Add definitions for IDirect3DRM2 and IDirect3DRM3 interfaces.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: 9d5f6ef3c0711258b18212f6a288985655d2fbbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5f6ef3c0711258b18212f6a… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Jan 10 21:41:04 2010 +0100 d3drm: Add definitions for IDirect3DRM2 and IDirect3DRM3 interfaces. --- include/d3drm.h | 290 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/d3drmobj.h | 28 +++++ 2 files changed, 318 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d5f6ef3c0711258b1821…

1 0

Michael Stefaniuc : Grammar fixes "is doesn't" => "doesn't".
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: d3bc43b5ede223eaea0b6a74aa8867228deb500d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3bc43b5ede223eaea0b6a74a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 11 00:17:36 2010 +0100 Grammar fixes "is doesn't" => "doesn't". --- dlls/msgsm32.acm/msgsm32.c | 2 +- dlls/riched20/editor.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c index ad86bc1..e760ac3 100644 --- a/dlls/msgsm32.acm/msgsm32.c +++ b/dlls/msgsm32.acm/msgsm32.c @@ -381,7 +381,7 @@ static LRESULT GSM_StreamOpen(PACMDRVSTREAMINSTANCE adsi) return MMSYSERR_NOMEM; if (pgsm_option(r, GSM_OPT_WAV49, &used) < 0) { - FIXME("Your libgsm library is doesn't support GSM_OPT_WAV49\n"); + FIXME("Your libgsm library doesn't support GSM_OPT_WAV49\n"); FIXME("Please recompile libgsm with WAV49 support\n"); pgsm_destroy(r); return MMSYSERR_NOTSUPPORTED; diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index af6bf69..7a11647 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3276,7 +3276,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (bRtf) { ME_StreamInRTFString(editor, bSelection, (char *)lParam); if (bSelection) { - /* FIXME: The length returned is doesn't include the rtf control + /* FIXME: The length returned doesn't include the rtf control * characters, only the actual text. */ len = lParam ? strlen((char *)lParam) : 0; }

1 0

Christian Costa : d3drm: Fix LPDIRECT3DRM definition and make sure it is defined before including d3drmobj .h.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: 2795f4ad17613911aef58f0ddf74b83d4acbb82f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2795f4ad17613911aef58f0dd… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Jan 10 21:41:12 2010 +0100 d3drm: Fix LPDIRECT3DRM definition and make sure it is defined before including d3drmobj.h. --- include/d3drm.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/d3drm.h b/include/d3drm.h index e13c91d..240014e 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -21,6 +21,9 @@ #define __D3DRM_H__ #include <ddraw.h> + +typedef struct IDirect3DRM *LPDIRECT3DRM; + #include <d3drmobj.h> @@ -32,8 +35,6 @@ DEFINE_GUID(IID_IDirect3DRM, 0x2bc49361, 0x8327, 0x11cf, 0xac, 0x DEFINE_GUID(IID_IDirect3DRM2, 0x4516ecc8, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); DEFINE_GUID(IID_IDirect3DRM3, 0x4516ec83, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); -typedef void *LPDIRECT3DRM; - HRESULT WINAPI Direct3DRMCreate(LPDIRECT3DRM* ppDirect3DRM); /*****************************************************************************

1 0

Nikolay Sivov : msxml3: Get rid of upper case converting helper.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: 1aaf2bd5485684e954e02ae33f5d99a6d592bc73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aaf2bd5485684e954e02ae33… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jan 10 22:42:46 2010 +0300 msxml3: Get rid of upper case converting helper. --- dlls/msxml3/xmlelem.c | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index 93cc53a..b91722c 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -171,31 +171,17 @@ static HRESULT WINAPI xmlelem_Invoke(IXMLElement *iface, DISPID dispIdMember, return hr; } -static inline BSTR str_dup_upper(BSTR str) -{ - INT len = (lstrlenW(str) + 1) * sizeof(WCHAR); - BSTR p = SysAllocStringLen(NULL, len); - if (p) - { - memcpy(p, str, len); - CharUpperW(p); - } - return p; -} - static HRESULT WINAPI xmlelem_get_tagName(IXMLElement *iface, BSTR *p) { xmlelem *This = impl_from_IXMLElement(iface); - BSTR temp; TRACE("(%p, %p)\n", iface, p); if (!p) return E_INVALIDARG; - temp = bstr_from_xmlChar(This->node->name); - *p = str_dup_upper(temp); - SysFreeString(temp); + *p = bstr_from_xmlChar(This->node->name); + CharUpperBuffW(*p, SysStringLen(*p)); TRACE("returning %s\n", debugstr_w(*p));

1 0

Christian Costa : d3drm: Add some definitions.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: 4244dc30a701bbca41dffb3ad4d9cde4f3bd96e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4244dc30a701bbca41dffb3ad… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Jan 10 21:41:18 2010 +0100 d3drm: Add some definitions. --- include/d3drmdef.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/d3drmdef.h b/include/d3drmdef.h index bf14a5a..0d83397 100644 --- a/include/d3drmdef.h +++ b/include/d3drmdef.h @@ -42,6 +42,17 @@ typedef enum _D3DRMLIGHTTYPE { D3DRMLIGHT_PARALLELPOINT } D3DRMLIGHTTYPE, *LPD3DRMLIGHTTYPE; +typedef DWORD D3DRMRENDERQUALITY, *LPD3DRMRENDERQUALITY; + +typedef enum _D3DRMTEXTUREQUALITY { + D3DRMTEXTURE_NEAREST, + D3DRMTEXTURE_LINEAR, + D3DRMTEXTURE_MIPNEAREST, + D3DRMTEXTURE_MIPLINEAR, + D3DRMTEXTURE_LINEARMIPNEAREST, + D3DRMTEXTURE_LINEARMIPLINEAR +} D3DRMTEXTUREQUALITY, *LPD3DRMTEXTUREQUALITY; + typedef struct _D3DRMPALETTEENTRY { unsigned char red; unsigned char green;

1 0

Nikolay Sivov : msxml3: Implement IXMLDocument::get_doctype().
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: af502d236e8c743291918e78df562551511910d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af502d236e8c743291918e78d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jan 10 22:22:06 2010 +0300 msxml3: Implement IXMLDocument::get_doctype(). --- dlls/msxml3/tests/xmldoc.c | 10 ++++++++++ dlls/msxml3/xmldoc.c | 16 ++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 8a9ae78..5db91f1 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -39,6 +39,7 @@ static void create_xml_file(LPCSTR filename) static const char data[] = "<?xml version=\"1.0\" ?>\n" + "<!DOCTYPE BankAccount>\n" "<BankAccount>\n" " <Number>1234</Number>\n" " <Name>Captain Ahab</Name>\n" @@ -125,6 +126,15 @@ static void test_xmldoc(void) ok(!lstrcmpW(name, szVersion), "Expected 1.0, got %s\n", wine_dbgstr_w(name)); SysFreeString(name); + /* doctype */ + hr = IXMLDocument_get_doctype(doc, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + hr = IXMLDocument_get_doctype(doc, &name); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(!lstrcmpW(name, szBankAccount), "Expected BANKACCOUNT, got %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + hr = IXMLDocument_get_root(doc, &element); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(element != NULL, "Expected non-NULL element\n"); diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c index 227afc2..018cf6c 100644 --- a/dlls/msxml3/xmldoc.c +++ b/dlls/msxml3/xmldoc.c @@ -451,8 +451,20 @@ static HRESULT WINAPI xmldoc_get_version(IXMLDocument *iface, BSTR *p) static HRESULT WINAPI xmldoc_get_doctype(IXMLDocument *iface, BSTR *p) { - FIXME("(%p, %p): stub\n", iface, p); - return E_NOTIMPL; + xmldoc *This = impl_from_IXMLDocument(iface); + xmlDtd *dtd; + + TRACE("(%p, %p)\n", This, p); + + if (!p) return E_INVALIDARG; + + dtd = xmlGetIntSubset(This->xmldoc); + if (!dtd) return S_FALSE; + + *p = bstr_from_xmlChar(dtd->name); + CharUpperBuffW(*p, SysStringLen(*p)); + + return S_OK; } static HRESULT WINAPI xmldoc_get_dtdURl(IXMLDocument *iface, BSTR *p)

1 0

Nikolay Sivov : msxml3: Implement IXMLDocument::get_version().
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: 04288208d0118bb0203a6afc10efda77a0597a04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04288208d0118bb0203a6afc1… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jan 10 21:08:21 2010 +0300 msxml3: Implement IXMLDocument::get_version(). --- dlls/msxml3/tests/xmldoc.c | 10 ++++++++++ dlls/msxml3/xmldoc.c | 10 ++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index d2d99fc..8a9ae78 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -70,6 +70,7 @@ static void test_xmldoc(void) static const WCHAR szNumVal[] = {'1','2','3','4',0}; static const WCHAR szName[] = {'N','A','M','E',0}; static const WCHAR szNameVal[] = {'C','a','p','t','a','i','n',' ','A','h','a','b',0}; + static const WCHAR szVersion[] = {'1','.','0',0}; hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDocument, (LPVOID*)&doc); @@ -115,6 +116,15 @@ static void test_xmldoc(void) ok(stream != NULL, "Expected non-NULL stream\n"); + /* version field */ + hr = IXMLDocument_get_version(doc, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + hr = IXMLDocument_get_version(doc, &name); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(!lstrcmpW(name, szVersion), "Expected 1.0, got %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + hr = IXMLDocument_get_root(doc, &element); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(element != NULL, "Expected non-NULL element\n"); diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c index 1a8c894..227afc2 100644 --- a/dlls/msxml3/xmldoc.c +++ b/dlls/msxml3/xmldoc.c @@ -439,8 +439,14 @@ static HRESULT WINAPI xmldoc_put_charset(IXMLDocument *iface, BSTR p) static HRESULT WINAPI xmldoc_get_version(IXMLDocument *iface, BSTR *p) { - FIXME("(%p, %p): stub\n", iface, p); - return E_NOTIMPL; + xmldoc *This = impl_from_IXMLDocument(iface); + + TRACE("(%p, %p)\n", This, p); + + if (!p) return E_INVALIDARG; + *p = bstr_from_xmlChar(This->xmldoc->version); + + return S_OK; } static HRESULT WINAPI xmldoc_get_doctype(IXMLDocument *iface, BSTR *p)

1 0

Christian Costa : d3drm: Add some object interface definitions.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: b8729fdadeab046c3fd780c66767c9608182733a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8729fdadeab046c3fd780c66… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Jan 10 21:41:25 2010 +0100 d3drm: Add some object interface definitions. --- include/d3drmobj.h | 187 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 187 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8729fdadeab046c3fd78…

1 0

David Adam : d3drm: The input quaternions are not changed when calling D3DRMQuaternionSlerp.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: 7822494499a42f7fd5328f38f74c58882fcf2c9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7822494499a42f7fd5328f38f… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sun Jan 10 21:19:05 2010 +0100 d3drm: The input quaternions are not changed when calling D3DRMQuaternionSlerp. --- dlls/d3drm/math.c | 6 ++++-- dlls/d3drm/tests/vector.c | 9 ++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index d3156fc..aed6690 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -128,6 +128,7 @@ LPD3DRMQUATERNION WINAPI D3DRMQuaternionFromRotation(LPD3DRMQUATERNION q, LPD3DV LPD3DRMQUATERNION WINAPI D3DRMQuaternionSlerp(LPD3DRMQUATERNION q, LPD3DRMQUATERNION a, LPD3DRMQUATERNION b, D3DVALUE alpha) { D3DVALUE dot, epsilon, temp, theta, u; + D3DVECTOR v1, v2; dot = a->s * b->s + D3DRMVectorDotProduct(&a->v, &b->v); epsilon = 1.0f; @@ -145,8 +146,9 @@ LPD3DRMQUATERNION WINAPI D3DRMQuaternionSlerp(LPD3DRMQUATERNION q, LPD3DRMQUATER u = sin(theta * alpha) / sin(theta); } q->s = temp * a->s + epsilon * u * b->s; - D3DRMVectorAdd(&q->v, D3DRMVectorScale(&a->v, &a->v, temp), - D3DRMVectorScale(&b->v, &b->v, epsilon * u)); + D3DRMVectorScale(&v1, &a->v, temp); + D3DRMVectorScale(&v2, &b->v, epsilon * u); + D3DRMVectorAdd(&q->v, &v1, &v2); return q; } diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index fbc8cc1..1961fe0 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -243,7 +243,7 @@ static void QuaternionTest(void) { D3DVECTOR axis; D3DVALUE par,theta; - D3DRMQUATERNION q,q1,q2,r; + D3DRMQUATERNION q,q1,q1final,q2,q2final,r; /*_________________QuaternionFromRotation___________________*/ U1(axis).x=1.0f; U2(axis).y=1.0f; U3(axis).z=1.0f; @@ -275,8 +275,15 @@ static void QuaternionTest(void) q1.s=0.1f; U1(q1.v).x=0.2f; U2(q1.v).y=0.3f; U3(q1.v).z=0.4f; q2.s=0.5f; U1(q2.v).x=0.6f; U2(q2.v).y=0.7f; U3(q2.v).z=0.8f; q.s = 0.243943f; U1(q.v).x = 0.351172f; U2(q.v).y = 0.458401f; U3(q.v).z = 0.565629f; + + q1final=q1; + q2final=q2; pD3DRMQuaternionSlerp(&r,&q1,&q2,par); expect_quat(q,r); + +/* Test to show that the input quaternions are not changed */ + expect_quat(q1,q1final); + expect_quat(q2,q2final); } static void ColorTest(void)

1 0