wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

Alexandre Julliard : wine.inf: Also create iexplorer. exe in the system directory for registration.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: f5956f1ac6a10acd188ac2de5dfa30663138b7a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5956f1ac6a10acd188ac2de5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 14 18:01:25 2011 +0100 wine.inf: Also create iexplorer.exe in the system directory for registration. --- tools/wine.inf.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index a84b73e..2fdd3b7 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2536,6 +2536,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,mui, 11,gecko\plugin,npmshtml.dll 11,wbem,mofcomp.exe +11,,iexplore.exe 11,,winetest.exe,- 12,,mountmgr.sys,- ; registration order matters for these @@ -2562,6 +2563,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,,notepad.exe 10,,regedit.exe 11,,explorer.exe +11,,iexplore.exe 11,,notepad.exe 11,,winetest.exe,- 12,,mountmgr.sys

1 0

Alexandre Julliard : winex11: Add missing initialization of pattern brush style.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: 59f790af046899b68744e80d7fafa72c25adbe41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59f790af046899b68744e80d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 14 17:35:21 2011 +0100 winex11: Add missing initialization of pattern brush style. --- dlls/winex11.drv/xrender.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 02625eb..10e6cda 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2690,6 +2690,7 @@ static HBRUSH xrenderdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap physdev->x11dev->brush.pixmap = pixmap; physdev->x11dev->brush.fillStyle = FillTiled; physdev->x11dev->brush.pixel = 0; /* ignored */ + physdev->x11dev->brush.style = BS_PATTERN; wine_tsx11_unlock(); X11DRV_DIB_Unlock( physbitmap, TRUE );

1 0

Alexandre Julliard : gdi32/tests: Add some tests for behavior of 32-bit DDBs.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: 6752d3478f450deb1ba4489c47984abccdf892b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6752d3478f450deb1ba4489c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 14 17:34:58 2011 +0100 gdi32/tests: Add some tests for behavior of 32-bit DDBs. --- dlls/gdi32/tests/bitmap.c | 72 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 58 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index ba8ad84..9a34f63 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3601,22 +3601,24 @@ static void test_clipping(void) DeleteDC( hdcSrc ); } -static void test_32bit_bitmap_blt(void) +static void test_32bit_ddb(void) { - BITMAPINFO biDst; + char buffer[sizeof(BITMAPINFOHEADER) + sizeof(DWORD)]; + BITMAPINFO *biDst = (BITMAPINFO *)buffer; HBITMAP bmpSrc, bmpDst; HBITMAP oldSrc, oldDst; HDC hdcSrc, hdcDst, hdcScreen; - UINT32 *dstBuffer; - DWORD colorSrc = 0x11223344; - - memset(&biDst, 0, sizeof(BITMAPINFO)); - biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - biDst.bmiHeader.biWidth = 2; - biDst.bmiHeader.biHeight = -2; - biDst.bmiHeader.biPlanes = 1; - biDst.bmiHeader.biBitCount = 32; - biDst.bmiHeader.biCompression = BI_RGB; + HBRUSH brush; + DWORD *dstBuffer, *data; + DWORD colorSrc = 0x40201008; + + memset(biDst, 0, sizeof(BITMAPINFOHEADER)); + biDst->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + biDst->bmiHeader.biWidth = 1; + biDst->bmiHeader.biHeight = -1; + biDst->bmiHeader.biPlanes = 1; + biDst->bmiHeader.biBitCount = 32; + biDst->bmiHeader.biCompression = BI_RGB; hdcScreen = CreateCompatibleDC(0); if(GetDeviceCaps(hdcScreen, BITSPIXEL) != 32) @@ -3631,12 +3633,54 @@ static void test_32bit_bitmap_blt(void) oldSrc = SelectObject(hdcSrc, bmpSrc); hdcDst = CreateCompatibleDC(hdcScreen); - bmpDst = CreateDIBSection(hdcDst, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, NULL, 0); + bmpDst = CreateDIBSection(hdcDst, biDst, DIB_RGB_COLORS, (void**)&dstBuffer, NULL, 0); oldDst = SelectObject(hdcDst, bmpDst); StretchBlt(hdcDst, 0, 0, 1, 1, hdcSrc, 0, 0, 1, 1, SRCCOPY); ok(dstBuffer[0] == colorSrc, "Expected color=%x, received color=%x\n", colorSrc, dstBuffer[0]); + if (pGdiAlphaBlend) + { + BLENDFUNCTION blend; + BOOL ret; + + blend.BlendOp = AC_SRC_OVER; + blend.BlendFlags = 0; + blend.SourceConstantAlpha = 128; + blend.AlphaFormat = 0; + dstBuffer[0] = 0x80808080; + ret = pGdiAlphaBlend( hdcDst, 0, 0, 1, 1, hdcSrc, 0, 0, 1, 1, blend ); + ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() ); + ok(dstBuffer[0] == 0x60504844, "wrong color %x\n", dstBuffer[0]); + blend.AlphaFormat = AC_SRC_ALPHA; + dstBuffer[0] = 0x80808080; + ret = pGdiAlphaBlend( hdcDst, 0, 0, 1, 1, hdcSrc, 0, 0, 1, 1, blend ); + ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() ); + ok(dstBuffer[0] == 0x90807874, "wrong color %x\n", dstBuffer[0]); + } + + data = (DWORD *)biDst->bmiColors; + data[0] = 0x20304050; + brush = CreateDIBPatternBrushPt( biDst, DIB_RGB_COLORS ); + ok( brush != 0, "brush creation failed\n" ); + SelectObject( hdcSrc, brush ); + PatBlt( hdcSrc, 0, 0, 1, 1, PATCOPY ); + BitBlt( hdcDst, 0, 0, 1, 1, hdcSrc, 0, 0, SRCCOPY ); + ok(dstBuffer[0] == data[0], "Expected color=%x, received color=%x\n", data[0], dstBuffer[0]); + SelectObject( hdcSrc, GetStockObject(BLACK_BRUSH) ); + DeleteObject( brush ); + + biDst->bmiHeader.biBitCount = 24; + brush = CreateDIBPatternBrushPt( biDst, DIB_RGB_COLORS ); + ok( brush != 0, "brush creation failed\n" ); + SelectObject( hdcSrc, brush ); + PatBlt( hdcSrc, 0, 0, 1, 1, PATCOPY ); + BitBlt( hdcDst, 0, 0, 1, 1, hdcSrc, 0, 0, SRCCOPY ); + ok(dstBuffer[0] == (data[0] & ~0xff000000), + "Expected color=%x, received color=%x\n", data[0] & 0xff000000, dstBuffer[0]); + SelectObject( hdcSrc, GetStockObject(BLACK_BRUSH) ); + DeleteObject( brush ); + /* Tidy up */ SelectObject(hdcDst, oldDst); DeleteObject(bmpDst); @@ -5259,7 +5303,7 @@ START_TEST(bitmap) test_StretchDIBits(); test_GdiAlphaBlend(); test_GdiGradientFill(); - test_32bit_bitmap_blt(); + test_32bit_ddb(); test_bitmapinfoheadersize(); test_get16dibits(); test_clipping();

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: b1c791c7d315742d305eed03bf9ecd552af7024d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c791c7d315742d305eed03b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 13 22:36:48 2011 +0100 po: Update French translation. --- po/fr.po | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/po/fr.po b/po/fr.po index c364b1b..eebaf7a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-06 00:09+0100\n" +"PO-Revision-Date: 2011-12-13 22:35+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -3494,9 +3494,8 @@ msgid "Subscript out of range" msgstr "Indice hors limites" #: jscript.rc:28 -#, fuzzy msgid "Object required" -msgstr "Objet attendu" +msgstr "Objet requis" #: jscript.rc:29 msgid "Automation server can't create object" @@ -6817,9 +6816,8 @@ msgid "&Data Rate" msgstr "&Débit de données" #: msvfw32.rc:52 -#, fuzzy msgid "kB/s" -msgstr "ko/sec" +msgstr "ko/s" #: msvfw32.rc:25 msgid "Full Frames (Uncompressed)"

1 0

Nikolay Sivov : msxml3: Initialize VARIANT before passing it to VariantCopy .
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: 2cd62a5dbd51164291cfc717955d6009e287fa68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd62a5dbd51164291cfc7179… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 14 14:51:30 2011 +0300 msxml3: Initialize VARIANT before passing it to VariantCopy. --- dlls/msxml3/dispex.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index d13b182..23b8805 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -553,6 +553,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc switch(wFlags) { case INVOKE_PROPERTYGET: + V_VT(pvarRes) = VT_EMPTY; return VariantCopy(pvarRes, var); case INVOKE_PROPERTYPUT: VariantClear(var);

1 0

Nikolay Sivov : msxml3: Added IXMLDOMParseError2 support.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: 0151f4741af3b554ef324faed3a3ad3b1c27ba70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0151f4741af3b554ef324faed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 14 15:42:23 2011 +0300 msxml3: Added IXMLDOMParseError2 support. --- dlls/msxml3/dispex.c | 2 +- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/parseerror.c | 122 +++++++++++++++++++++++++++++-------------- dlls/msxml3/tests/domdoc.c | 10 ++++ 4 files changed, 94 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0151f4741af3b554ef324…

1 0

Nikolay Sivov : msxml3: Implemented get_responseStream().
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: 19a86feaa1c986846a346a98d1340258e1c37106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19a86feaa1c986846a346a98d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 13 00:56:13 2011 +0300 msxml3: Implemented get_responseStream(). --- dlls/msxml3/httprequest.c | 26 ++++++++++++++++++++++---- dlls/msxml3/tests/domdoc.c | 31 ++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 2385d18..cf4afe4 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -926,7 +926,9 @@ static HRESULT WINAPI httprequest_get_responseBody(IXMLHTTPRequest *iface, VARIA TRACE("(%p)->(%p)\n", This, body); if (!body) return E_INVALIDARG; - if (This->state != READYSTATE_COMPLETE) return E_FAIL; + V_VT(body) = VT_EMPTY; + + if (This->state != READYSTATE_COMPLETE) return E_PENDING; hr = GetHGlobalFromStream(This->bsc->stream, &hglobal); if (hr == S_OK) @@ -968,13 +970,29 @@ static HRESULT WINAPI httprequest_get_responseBody(IXMLHTTPRequest *iface, VARIA return hr; } -static HRESULT WINAPI httprequest_get_responseStream(IXMLHTTPRequest *iface, VARIANT *pvarBody) +static HRESULT WINAPI httprequest_get_responseStream(IXMLHTTPRequest *iface, VARIANT *body) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); + LARGE_INTEGER move; + IStream *stream; + HRESULT hr; - FIXME("stub %p %p\n", This, pvarBody); + TRACE("(%p)->(%p)\n", This, body); - return E_NOTIMPL; + if (!body) return E_INVALIDARG; + V_VT(body) = VT_EMPTY; + + if (This->state != READYSTATE_COMPLETE) return E_PENDING; + + hr = IStream_Clone(This->bsc->stream, &stream); + + move.QuadPart = 0; + IStream_Seek(stream, move, STREAM_SEEK_SET, NULL); + + V_VT(body) = VT_UNKNOWN; + V_UNKNOWN(body) = (IUnknown*)stream; + + return hr; } static HRESULT WINAPI httprequest_get_readyState(IXMLHTTPRequest *iface, LONG *state) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 4a719c8..19cb758 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4639,6 +4639,7 @@ static void test_XMLHTTP(void) IDispatch *event; void *ptr; HRESULT hr; + HGLOBAL g; hr = CoCreateInstance(&CLSID_XMLHTTPRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLHttpRequest, (void**)&xhr); @@ -4665,6 +4666,20 @@ static void test_XMLHTTP(void) hr = IXMLHttpRequest_abort(xhr); EXPECT_HR(hr, S_OK); + V_VT(&varbody) = VT_I2; + V_I2(&varbody) = 1; + hr = IXMLHttpRequest_get_responseBody(xhr, &varbody); + EXPECT_HR(hr, E_PENDING); + ok(V_VT(&varbody) == VT_EMPTY, "got type %d\n", V_VT(&varbody)); + ok(V_I2(&varbody) == 1, "got %d\n", V_I2(&varbody)); + + V_VT(&varbody) = VT_I2; + V_I2(&varbody) = 1; + hr = IXMLHttpRequest_get_responseStream(xhr, &varbody); + EXPECT_HR(hr, E_PENDING); + ok(V_VT(&varbody) == VT_EMPTY, "got type %d\n", V_VT(&varbody)); + ok(V_I2(&varbody) == 1, "got %d\n", V_I2(&varbody)); + /* send before open */ hr = IXMLHttpRequest_send(xhr, dummy); ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win2k */, "got 0x%08x\n", hr); @@ -4835,9 +4850,23 @@ static void test_XMLHTTP(void) SafeArrayUnaccessData(V_ARRAY(&varbody)); VariantClear(&varbody); - SysFreeString(url); + /* get_responseStream */ + hr = IXMLHttpRequest_get_responseStream(xhr, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + V_VT(&varbody) = VT_EMPTY; + hr = IXMLHttpRequest_get_responseStream(xhr, &varbody); + ok(V_VT(&varbody) == VT_UNKNOWN, "got type %d\n", V_VT(&varbody)); + EXPECT_HR(hr, S_OK); + EXPECT_REF(V_UNKNOWN(&varbody), 1); + + g = NULL; + hr = GetHGlobalFromStream((IStream*)V_UNKNOWN(&varbody), &g); + EXPECT_HR(hr, S_OK); + ok(g != NULL, "got %p\n", g); + hr = IXMLHttpRequest_QueryInterface(xhr, &IID_IObjectSafety, (void**)&safety); EXPECT_HR(hr, S_OK); if(hr == S_OK)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetValue().
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: 940b50b2d8e1b1c2d69739fe4d8af8b4cb536cb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=940b50b2d8e1b1c2d69739fe4… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Dec 13 17:02:42 2011 +0100 d3dx9: Implement ID3DXBaseEffect::SetValue(). --- dlls/d3dx9_36/effect.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d9fc0b9..75680d3 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1603,10 +1603,48 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotationByName(ID3DXBaseEffect static HRESULT WINAPI ID3DXBaseEffectImpl_SetValue(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPCVOID data, UINT bytes) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, data %p, bytes %u stub\n", This, parameter, data, bytes); + TRACE("iface %p, parameter %p, data %p, bytes %u\n", This, parameter, data, bytes); - return E_NOTIMPL; + if (!param) + { + WARN("Invalid parameter %p specified\n", parameter); + return D3DERR_INVALIDCALL; + } + + /* samplers don't touch data */ + if (param->class == D3DXPC_OBJECT && (param->type == D3DXPT_SAMPLER + || param->type == D3DXPT_SAMPLER1D || param->type == D3DXPT_SAMPLER2D + || param->type == D3DXPT_SAMPLER3D || param->type == D3DXPT_SAMPLERCUBE)) + { + TRACE("Sampler: returning E_FAIL\n"); + return E_FAIL; + } + + if (data && param->bytes >= bytes) + { + switch (param->type) + { + case D3DXPT_VOID: + case D3DXPT_BOOL: + case D3DXPT_INT: + case D3DXPT_FLOAT: + TRACE("Copy %u bytes\n", bytes); + memcpy(param->data, data, bytes); + break; + + default: + FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); + break; + } + + return D3D_OK; + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetValue(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPVOID data, UINT bytes)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetVectorArray().
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: 165afd63cee6e4c52512e6a31ea2c20a2d312ba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=165afd63cee6e4c52512e6a31… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Dec 13 17:02:37 2011 +0100 d3dx9: Implement ID3DXBaseEffect::SetVectorArray(). --- dlls/d3dx9_36/effect.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 1e86aa2..d9fc0b9 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2123,10 +2123,40 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetVector(ID3DXBaseEffect *iface, D3DX static HRESULT WINAPI ID3DXBaseEffectImpl_SetVectorArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXVECTOR4 *vector, UINT count) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, vector %p, count %u stub\n", This, parameter, vector, count); + TRACE("iface %p, parameter %p, vector %p, count %u stub\n", This, parameter, vector, count); - return E_NOTIMPL; + if (param && param->element_count && param->element_count >= count) + { + UINT i; + + TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_VECTOR: + for (i = 0; i < count; ++i) + { + set_vector(get_parameter_struct(param->member_handles[i]), &vector[i]); + } + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_MATRIX_ROWS: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetVectorArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXVECTOR4 *vector, UINT count)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetVector().
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: 67591832a34828a85b394e61b401f2e4a165f57c URL: http://source.winehq.org/git/wine.git/?a=commit;h=67591832a34828a85b394e61b… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Dec 13 17:02:34 2011 +0100 d3dx9: Implement ID3DXBaseEffect::SetVector(). --- dlls/d3dx9_36/effect.c | 54 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d9cd085..1e86aa2 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -919,6 +919,16 @@ static void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indat } } +static void set_vector(struct d3dx_parameter *param, CONST D3DXVECTOR4 *vector) +{ + UINT i; + + for (i = 0; i < param->columns; ++i) + { + set_number((FLOAT *)param->data + i, param->type, (FLOAT *)vector + i, D3DXPT_FLOAT); + } +} + static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) { unsigned int i, k; @@ -2020,13 +2030,51 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetFloatArray(ID3DXBaseEffect *iface, return D3DERR_INVALIDCALL; } -static HRESULT WINAPI ID3DXBaseEffectImpl_SetVector(ID3DXBaseEffect* iface, D3DXHANDLE parameter, CONST D3DXVECTOR4* vector) +static HRESULT WINAPI ID3DXBaseEffectImpl_SetVector(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXVECTOR4 *vector) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, vector %p stub\n", This, parameter, vector); + TRACE("iface %p, parameter %p, vector %p\n", This, parameter, vector); - return E_NOTIMPL; + if (param && !param->element_count) + { + TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + if (param->type == D3DXPT_INT && param->bytes == 4) + { + DWORD tmp; + + TRACE("INT fixup\n"); + tmp = (DWORD)(max(min(vector->z, 1.0f), 0.0f) * INT_FLOAT_MULTI); + tmp += ((DWORD)(max(min(vector->y, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 8; + tmp += ((DWORD)(max(min(vector->x, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 16; + tmp += ((DWORD)(max(min(vector->w, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 24; + + *(INT *)param->data = tmp; + return D3D_OK; + } + set_vector(param, vector); + return D3D_OK; + + case D3DXPC_MATRIX_ROWS: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetVector(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXVECTOR4 *vector)

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
81
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 December 2011