September 2012 - Wine-Commits

Nikolay Sivov : mlang: Forward ConvertStringFromUnicode() to IMultiLanguage3 implementation.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: 8e7006025cdd09d962e13fbe2deb892de84c12bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e7006025cdd09d962e13fbe2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 27 22:28:09 2012 +0400 mlang: Forward ConvertStringFromUnicode() to IMultiLanguage3 implementation. --- dlls/mlang/mlang.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index a0aae65..ba1feba 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2166,15 +2166,16 @@ static HRESULT WINAPI fnIMultiLanguage_ConvertStringToUnicode( static HRESULT WINAPI fnIMultiLanguage_ConvertStringFromUnicode( IMultiLanguage* iface, - DWORD* pdwMode, - DWORD dwEncoding, - WCHAR* pSrcStr, - UINT* pcSrcSize, - CHAR* pDstStr, - UINT* pcDstSize) + DWORD* mode, + DWORD encoding, + WCHAR* src, + UINT* src_size, + CHAR* dest, + UINT* dest_size) { - return ConvertINetUnicodeToMultiByte(pdwMode, dwEncoding, - pSrcStr, (LPINT)pcSrcSize, pDstStr, (LPINT)pcDstSize); + MLang_impl *This = impl_from_IMultiLanguage(iface); + return IMultiLanguage3_ConvertStringFromUnicode(&This->IMultiLanguage3_iface, + mode, encoding, src, src_size, dest, dest_size); } static HRESULT WINAPI fnIMultiLanguage_ConvertStringReset(

1 0

Rico Schüller : d3dx9: Improve D3DXMatrixAffineTransformation2D().
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: c131bee4fcc8862f7b4169cdc28afee63845bfff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c131bee4fcc8862f7b4169cdc… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Sep 28 08:43:18 2012 +0200 d3dx9: Improve D3DXMatrixAffineTransformation2D(). --- dlls/d3dx9_36/math.c | 67 +++++++++++++++++++------------------------------ 1 files changed, 26 insertions(+), 41 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index a3aa07e..2c837a8 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -126,57 +126,42 @@ D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *pout, FLOAT scalin return pout; } -D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation2D(D3DXMATRIX *pout, FLOAT scaling, CONST D3DXVECTOR2 *protationcenter, FLOAT rotation, CONST D3DXVECTOR2 *ptranslation) +D3DXMATRIX * WINAPI D3DXMatrixAffineTransformation2D(D3DXMATRIX *out, FLOAT scaling, + const D3DXVECTOR2 *rotationcenter, FLOAT rotation, const D3DXVECTOR2 *translation) { - D3DXMATRIX m1, m2, m3, m4, m5; - D3DXQUATERNION rot; - D3DXVECTOR3 rot_center, trans; + FLOAT tmp1, tmp2, s; - TRACE("(%p, %f, %p, %f, %p)\n", pout, scaling, protationcenter, rotation, ptranslation); + TRACE("out %p, scaling %f, rotationcenter %p, rotation %f, translation %p\n", + out, scaling, rotationcenter, rotation, translation); - rot.w=cos(rotation/2.0f); - rot.x=0.0f; - rot.y=0.0f; - rot.z=sin(rotation/2.0f); + s = sinf(rotation / 2.0f); + tmp1 = 1.0f - 2.0f * s * s; + tmp2 = 2.0 * s * cosf(rotation / 2.0f); - if ( protationcenter ) - { - rot_center.x=protationcenter->x; - rot_center.y=protationcenter->y; - rot_center.z=0.0f; - } - else - { - rot_center.x=0.0f; - rot_center.y=0.0f; - rot_center.z=0.0f; - } + D3DXMatrixIdentity(out); + out->u.m[0][0] = scaling * tmp1; + out->u.m[0][1] = scaling * tmp2; + out->u.m[1][0] = -scaling * tmp2; + out->u.m[1][1] = scaling * tmp1; - if ( ptranslation ) + if (rotationcenter) { - trans.x=ptranslation->x; - trans.y=ptranslation->y; - trans.z=0.0f; + FLOAT x, y; + + x = rotationcenter->x; + y = rotationcenter->y; + + out->u.m[3][0] = y * tmp2 - x * tmp1 + x; + out->u.m[3][1] = -x * tmp2 - y * tmp1 + y; } - else + + if (translation) { - trans.x=0.0f; - trans.y=0.0f; - trans.z=0.0f; + out->u.m[3][0] += translation->x; + out->u.m[3][1] += translation->y; } - D3DXMatrixScaling(&m1, scaling, scaling, 1.0f); - D3DXMatrixTranslation(&m2, -rot_center.x, -rot_center.y, -rot_center.z); - D3DXMatrixTranslation(&m4, rot_center.x, rot_center.y, rot_center.z); - D3DXMatrixRotationQuaternion(&m3, &rot); - D3DXMatrixTranslation(&m5, trans.x, trans.y, trans.z); - - D3DXMatrixMultiply(&m1, &m1, &m2); - D3DXMatrixMultiply(&m1, &m1, &m3); - D3DXMatrixMultiply(&m1, &m1, &m4); - D3DXMatrixMultiply(pout, &m1, &m5); - - return pout; + return out; } HRESULT WINAPI D3DXMatrixDecompose(D3DXVECTOR3 *poutscale, D3DXQUATERNION *poutrotation, D3DXVECTOR3 *pouttranslation, CONST D3DXMATRIX *pm)

1 0

Henri Verbeet : wined3d: Set more accurate limits for SM4 shaders.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: e13a589bfcade4dd50a6eadc09e6501349ecba0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e13a589bfcade4dd50a6eadc0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 28 01:06:56 2012 +0200 wined3d: Set more accurate limits for SM4 shaders. --- dlls/wined3d/glsl_shader.c | 6 ++-- dlls/wined3d/shader.c | 64 +++++++++++++++++++++++++++++++++++----- dlls/wined3d/wined3d_private.h | 8 ++-- 3 files changed, 63 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6efa7fc..db04c6a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -997,7 +997,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont if (!pshader) { shader_addline(buffer, "uniform vec4 posFixup;\n"); - shader_addline(buffer, "void order_ps_input(in vec4[%u]);\n", MAX_REG_OUTPUT); + shader_addline(buffer, "void order_ps_input(in vec4[%u]);\n", shader->limits.packed_output); } else { @@ -3997,7 +3997,7 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer if (ps_major < 3) { - shader_addline(buffer, "void order_ps_input(in vec4 vs_out[%u])\n{\n", MAX_REG_OUTPUT); + shader_addline(buffer, "void order_ps_input(in vec4 vs_out[%u])\n{\n", vs->limits.packed_output); for (i = 0; map; map >>= 1, ++i) { @@ -4053,7 +4053,7 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer UINT in_count = min(vec4_varyings(ps_major, gl_info), ps->limits.packed_input); /* This one is tricky: a 3.0 pixel shader reads from a 3.0 vertex shader */ shader_addline(buffer, "varying vec4 ps_in[%u];\n", in_count); - shader_addline(buffer, "void order_ps_input(in vec4 vs_out[%u])\n{\n", MAX_REG_OUTPUT); + shader_addline(buffer, "void order_ps_input(in vec4 vs_out[%u])\n{\n", vs->limits.packed_output); /* First, sort out position and point size. Those are not passed to the pixel shader */ for (i = 0; map; map >>= 1, ++i) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index bcff6b1..72f2fa6 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1779,10 +1779,6 @@ static void vertexshader_set_limits(struct wined3d_shader *shader) shader->limits.constant_float = min(256, device->d3d_vshader_constantF); break; - case WINED3D_SHADER_VERSION(4, 0): - FIXME("Using 3.0 limits for 4.0 shader.\n"); - /* Fall through. */ - case WINED3D_SHADER_VERSION(3, 0): shader->limits.temporary = 32; shader->limits.constant_bool = 32; @@ -1799,6 +1795,19 @@ static void vertexshader_set_limits(struct wined3d_shader *shader) shader->limits.constant_float = min(256, device->d3d_vshader_constantF); break; + case WINED3D_SHADER_VERSION(4, 0): + shader->limits.temporary = 32; /* FIXME: 4096 */ + shader->limits.sampler = 16; /* FIXME: 128 resources, 16 sampler states */ + shader->limits.constant_int = 0; + shader->limits.constant_float = 0; + shader->limits.constant_bool = 0; + shader->limits.address = 1; + shader->limits.packed_output = 16; + shader->limits.packed_input = 0; + shader->limits.attributes = 16; + shader->limits.label = 16; + break; + default: shader->limits.temporary = 12; shader->limits.constant_bool = 16; @@ -1864,6 +1873,35 @@ static HRESULT vertexshader_init(struct wined3d_shader *shader, struct wined3d_d return WINED3D_OK; } +static void geometryshader_set_limits(struct wined3d_shader *shader) +{ + DWORD shader_version = WINED3D_SHADER_VERSION(shader->reg_maps.shader_version.major, + shader->reg_maps.shader_version.minor); + + switch (shader_version) + { + case WINED3D_SHADER_VERSION(4, 0): + shader->limits.temporary = 32; /* FIXME: 4096 */ + shader->limits.texcoord = 0; + shader->limits.sampler = 16; /* FIXME: 128 resources, 16 sampler states */ + shader->limits.constant_int = 0; + shader->limits.constant_float = 0; + shader->limits.constant_bool = 0; + shader->limits.address = 1; + shader->limits.packed_output = 32; + shader->limits.packed_input = 16; + shader->limits.attributes = 0; + shader->limits.label = 16; + break; + + default: + memset(&shader->limits, 0, sizeof(shader->limits)); + FIXME("Unhandled geometry shader version \"%u.%u\".\n", + shader->reg_maps.shader_version.major, + shader->reg_maps.shader_version.minor); + } +} + static HRESULT geometryshader_init(struct wined3d_shader *shader, struct wined3d_device *device, const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, void *parent, const struct wined3d_parent_ops *parent_ops, unsigned int max_version) @@ -1880,6 +1918,8 @@ static HRESULT geometryshader_init(struct wined3d_shader *shader, struct wined3d return hr; } + geometryshader_set_limits(shader); + shader->load_local_constsF = FALSE; return WINED3D_OK; @@ -2092,10 +2132,6 @@ static void pixelshader_set_limits(struct wined3d_shader *shader) shader->limits.label = 16; break; - case WINED3D_SHADER_VERSION(4, 0): - FIXME("Using 3.0 limits for 4.0 shader.\n"); - /* Fall through. */ - case WINED3D_SHADER_VERSION(3, 0): shader->limits.temporary = 32; shader->limits.constant_float = 224; @@ -2107,6 +2143,18 @@ static void pixelshader_set_limits(struct wined3d_shader *shader) shader->limits.label = 16; /* FIXME: 2048 */ break; + case WINED3D_SHADER_VERSION(4, 0): + shader->limits.temporary = 32; /* FIXME: 4096 */ + shader->limits.texcoord = 0; + shader->limits.sampler = 16; /* FIXME: 128 resources, 16 sampler states */ + shader->limits.constant_int = 0; + shader->limits.constant_float = 0; + shader->limits.constant_bool = 0; + shader->limits.address = 1; + shader->limits.packed_input = 32; + shader->limits.label = 16; + break; + default: shader->limits.temporary = 32; shader->limits.constant_float = 32; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 258ac2d..b5fd4f0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -404,8 +404,8 @@ enum wined3d_shader_rel_op #define MAX_REG_ADDR 1 #define MAX_REG_TEMP 32 #define MAX_REG_TEXCRD 8 -#define MAX_REG_INPUT 12 -#define MAX_REG_OUTPUT 12 +#define MAX_REG_INPUT 32 +#define MAX_REG_OUTPUT 32 #define MAX_CONST_I 16 #define MAX_CONST_B 16 @@ -563,8 +563,8 @@ struct wined3d_shader_reg_maps DWORD temporary; /* MAX_REG_TEMP, 32 */ DWORD *constf; /* pixel, vertex */ DWORD texcoord_mask[MAX_REG_TEXCRD]; /* vertex < 3.0 */ - WORD input_registers; /* max(MAX_REG_INPUT, MAX_ATTRIBS), 16 */ - WORD output_registers; /* MAX_REG_OUTPUT, 12 */ + DWORD input_registers; /* max(MAX_REG_INPUT, MAX_ATTRIBS), 32 */ + DWORD output_registers; /* MAX_REG_OUTPUT, 32 */ WORD integer_constants; /* MAX_CONST_I, 16 */ WORD boolean_constants; /* MAX_CONST_B, 16 */ WORD local_int_consts; /* MAX_CONST_I, 16 */

1 0

Henri Verbeet : wined3d: Unify GLSL input / output variable naming.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: aa9daa285e7a7caefcf9e03911cb9a0b6c4d0a1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa9daa285e7a7caefcf9e0391… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 28 01:06:55 2012 +0200 wined3d: Unify GLSL input / output variable naming. --- dlls/wined3d/glsl_shader.c | 90 ++++++++++++++++++++++--------------------- 1 files changed, 46 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa9daa285e7a7caefcf9e…

1 0

Nikolay Sivov : mlang: Move GetFontCodePages() code to IMLangFontLink2 and forward to it.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: b7eb9c234ec99ef56c209d132619e59fb9e4feaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7eb9c234ec99ef56c209d132… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 27 22:41:51 2012 +0400 mlang: Move GetFontCodePages() code to IMLangFontLink2 and forward to it. --- dlls/mlang/mlang.c | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index a361bc9..3d2cde7 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1972,24 +1972,12 @@ static HRESULT WINAPI fnIMLangFontLink_CodePagesToCodePage( static HRESULT WINAPI fnIMLangFontLink_GetFontCodePages( IMLangFontLink* iface, - HDC hDC, - HFONT hFont, - DWORD* pdwCodePages) + HDC hdc, + HFONT hfont, + DWORD* codepages) { - HFONT old_font; - FONTSIGNATURE fontsig; - MLang_impl *This = impl_from_IMLangFontLink( iface ); - - TRACE("(%p)\n",This); - - old_font = SelectObject(hDC,hFont); - GetTextCharsetInfo(hDC,&fontsig, 0); - SelectObject(hDC,old_font); - - *pdwCodePages = fontsig.fsCsb[0]; - TRACE("CodePages is 0x%x\n",fontsig.fsCsb[0]); - - return S_OK; + MLang_impl *This = impl_from_IMLangFontLink(iface); + return IMLangFontLink2_GetFontCodePages(&This->IMLangFontLink2_iface, hdc, hfont, codepages); } static HRESULT WINAPI fnIMLangFontLink_MapFont( @@ -3279,11 +3267,23 @@ static HRESULT WINAPI fnIMLangFontLink2_CodePagesToCodePage(IMLangFontLink2* Thi return E_NOTIMPL; } -static HRESULT WINAPI fnIMLangFontLink2_GetFontCodePages(IMLangFontLink2* This, - HDC hDC, HFONT hFont, DWORD *pdwCodePages) +static HRESULT WINAPI fnIMLangFontLink2_GetFontCodePages(IMLangFontLink2 *iface, + HDC hdc, HFONT hfont, DWORD *codepages) { - FIXME("(%p)->%p %p %p\n",This, hDC, hFont, pdwCodePages); - return E_NOTIMPL; + MLang_impl *This = impl_from_IMLangFontLink2(iface); + FONTSIGNATURE fontsig; + HFONT old_font; + + TRACE("(%p)->(%p %p %p)\n", This, hdc, hfont, codepages); + + old_font = SelectObject(hdc, hfont); + GetTextCharsetInfo(hdc, &fontsig, 0); + SelectObject(hdc, old_font); + + *codepages = fontsig.fsCsb[0]; + TRACE("ret 0x%x\n", fontsig.fsCsb[0]); + + return S_OK; } static HRESULT WINAPI fnIMLangFontLink2_ReleaseFont(IMLangFontLink2* This,

1 0

Jacek Caban : vbscript: Added Now() implementation.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: 9554e44e470012a2b9d370b9903a41226624cb59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9554e44e470012a2b9d370b99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 28 11:49:30 2012 +0200 vbscript: Added Now() implementation. --- dlls/vbscript/global.c | 19 +++++++++++++++++-- dlls/vbscript/tests/api.vbs | 2 ++ dlls/vbscript/tests/run.c | 2 ++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index bf423b4..9fb6a4d 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -130,6 +130,15 @@ static inline HRESULT return_null(VARIANT *res) return S_OK; } +static inline HRESULT return_date(VARIANT *res, double date) +{ + if(res) { + V_VT(res) = VT_DATE; + V_DATE(res) = date; + } + return S_OK; +} + static HRESULT to_int(VARIANT *v, int *ret) { switch(V_VT(v)) { @@ -967,8 +976,14 @@ static HRESULT Global_Sgn(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_Now(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + SYSTEMTIME lt; + double date; + + TRACE("\n"); + + GetLocalTime(&lt); + SystemTimeToVariantTime(&lt, &date); + return return_date(res, date); } static HRESULT Global_Date(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 78e4a8b..97ca5e0 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -232,4 +232,6 @@ if isEnglishLang then Call ok(MonthName(12, true) = "Dec", "MonthName(12, true) = " & MonthName(12, true)) end if +Call ok(getVT(Now()) = "VT_DATE", "getVT(Now()) = " & getVT(Now())) + Call reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 3f68717..8c541bd 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -173,6 +173,8 @@ static const char *vt2a(VARIANT *v) return "VT_I4"; case VT_R8: return "VT_R8"; + case VT_DATE: + return "VT_DATE"; case VT_BSTR: return "VT_BSTR"; case VT_DISPATCH:

1 0

Christian Costa : dmusic: Check returned value of GetPortCaps.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: 58f34f509b926619a512025e89b7299fe8a2d038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58f34f509b926619a512025e8… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Sep 28 08:59:36 2012 +0200 dmusic: Check returned value of GetPortCaps. --- dlls/dmusic/dmusic.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 2977cd9..11968ed 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -395,10 +395,8 @@ static void create_system_ports_list(IDirectMusic8Impl* object) hr = IDirectMusicSynth8_GetPortCaps(synth, &port->caps); IDirectMusicSynth8_Release(synth); } - else - { + if (FAILED(hr)) nb_ports--; - } object->nb_system_ports = nb_ports; }

1 0

Nikolay Sivov : dwrite: Added IDWriteTextLayout stub.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: f49d360ffd36a1ad0d2d2b5ca9e691d100970142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f49d360ffd36a1ad0d2d2b5ca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 28 12:13:17 2012 +0400 dwrite: Added IDWriteTextLayout stub. --- dlls/dwrite/Makefile.in | 1 + dlls/dwrite/dwrite_private.h | 3 +- dlls/dwrite/layout.c | 645 +++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 10 +- dlls/dwrite/tests/Makefile.in | 3 +- dlls/dwrite/tests/layout.c | 90 ++++++ 6 files changed, 747 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f49d360ffd36a1ad0d2d2…

1 0

Christian Costa : ntoskrnl.exe: Improve IoAllocateMdl stub.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: 2a278ef5e4e49e0aaa23c21873cf9f1c2865dd59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a278ef5e4e49e0aaa23c2187… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Sep 27 23:12:28 2012 +0200 ntoskrnl.exe: Improve IoAllocateMdl stub. --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 285541a..afcca48 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -396,8 +396,15 @@ PVOID WINAPI IoAllocateErrorLogEntry( PVOID IoObject, UCHAR EntrySize ) */ PMDL WINAPI IoAllocateMdl( PVOID VirtualAddress, ULONG Length, BOOLEAN SecondaryBuffer, BOOLEAN ChargeQuota, PIRP Irp ) { - FIXME( "stub: %p, %u, %i, %i, %p\n", VirtualAddress, Length, SecondaryBuffer, ChargeQuota, Irp ); - return NULL; + PMDL mdl; + + FIXME("partial stub: %p, %u, %i, %i, %p\n", VirtualAddress, Length, SecondaryBuffer, ChargeQuota, Irp); + + mdl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MDL)); + if (!mdl) + return NULL; + + return mdl; }

1 0

Rico Schüller : d3dx9: Use float function in D3DXPlaneNormalize().
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: e420409b8d1e1be16b9085451c240460f81bbd20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e420409b8d1e1be16b9085451… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Sep 28 08:43:04 2012 +0200 d3dx9: Use float function in D3DXPlaneNormalize(). --- dlls/d3dx9_36/math.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index d54095a..24303d2 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1197,30 +1197,29 @@ D3DXVECTOR3* WINAPI D3DXPlaneIntersectLine(D3DXVECTOR3 *pout, CONST D3DXPLANE *p return pout; } -D3DXPLANE* WINAPI D3DXPlaneNormalize(D3DXPLANE *pout, CONST D3DXPLANE *pp) +D3DXPLANE * WINAPI D3DXPlaneNormalize(D3DXPLANE *out, const D3DXPLANE *p) { - D3DXPLANE out; FLOAT norm; - TRACE("(%p, %p)\n", pout, pp); + TRACE("out %p, p %p\n", out, p); - norm = sqrt(pp->a * pp->a + pp->b * pp->b + pp->c * pp->c); - if ( norm ) + norm = sqrtf(p->a * p->a + p->b * p->b + p->c * p->c); + if (norm) { - out.a = pp->a / norm; - out.b = pp->b / norm; - out.c = pp->c / norm; - out.d = pp->d / norm; + out->a = p->a / norm; + out->b = p->b / norm; + out->c = p->c / norm; + out->d = p->d / norm; } else { - out.a = 0.0f; - out.b = 0.0f; - out.c = 0.0f; - out.d = 0.0f; + out->a = 0.0f; + out->b = 0.0f; + out->c = 0.0f; + out->d = 0.0f; } - *pout = out; - return pout; + + return out; } D3DXPLANE* WINAPI D3DXPlaneTransform(D3DXPLANE *pout, CONST D3DXPLANE *pplane, CONST D3DXMATRIX *pm)

1 0