May 2009 - Wine-Commits - list.winehq.org

Piotr Caban : jscript: Added Math_SQRT2 implementation and tests.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 27f327aebc64e4e95c90e91c4625500b74a08174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f327aebc64e4e95c90e91c4… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun May 24 21:06:23 2009 +0200 jscript: Added Math_SQRT2 implementation and tests. --- dlls/jscript/math.c | 4 ++-- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index ac487d1..1157fed 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -120,8 +120,8 @@ static HRESULT Math_PI(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp static HRESULT Math_SQRT2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return math_constant(M_SQRT2, flags, retv); } static HRESULT Math_SQRT1_2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 30f2017..a4dd9f5 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -675,4 +675,9 @@ ok(Math.floor(Math.LN2*100) === 69, "Math.LN2 = " + Math.LN2); Math.LN2 = "test"; ok(Math.floor(Math.LN2*100) === 69, "modified Math.LN2 = " + Math.LN2); +ok(typeof(Math.SQRT2) === "number", "typeof(Math.SQRT2) = " + typeof(Math.SQRT2)); +ok(Math.floor(Math.SQRT2*100) === 141, "Math.SQRT2 = " + Math.SQRT2); +Math.SQRT2 = "test"; +ok(Math.floor(Math.SQRT2*100) === 141, "modified Math.SQRT2 = " + Math.SQRT2); + reportSuccess();

1 0

Chris Robinson : wined3d: Prevent erroneous FIXMEs on newer cards.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 1d757fd6da5e5cbd57396ad0c42de78e2d7c4820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d757fd6da5e5cbd57396ad0c… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sun May 10 14:17:43 2009 -0700 wined3d: Prevent erroneous FIXMEs on newer cards. Cards that have 12 or more combined samplers can trigger a fixme if they have the same amount of vertex samplers, even though it's plenty enough. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 46c1556..5ce84cd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -901,7 +901,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { * So this is just a check to check that our assumption holds true. If not, write a warning * and reduce the number of vertex samplers or probably disable vertex texture fetch. */ - if(gl_info->max_vertex_samplers && + if(gl_info->max_vertex_samplers && gl_info->max_combined_samplers < 12 && MAX_TEXTURES + gl_info->max_vertex_samplers > gl_info->max_combined_samplers) { FIXME("OpenGL implementation supports %u vertex samplers and %u total samplers\n", gl_info->max_vertex_samplers, gl_info->max_combined_samplers);

1 0

Andrew Talbot : avifil32: Constify a variable.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: e281b0935bca915a9f3d876338a97f7ebc9397f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e281b0935bca915a9f3d87633… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat May 23 22:31:56 2009 +0100 avifil32: Constify a variable. --- dlls/avifil32/avifile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 1719031..49e141f 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -226,7 +226,7 @@ static ULONG AVIFILE_SearchStream(const IAVIFileImpl *This, DWORD fccType, LONG lSkip); static void AVIFILE_UpdateInfo(IAVIFileImpl *This); static HRESULT AVIFILE_WriteBlock(IAVIStreamImpl *This, DWORD block, - FOURCC ckid, DWORD flags, LPVOID buffer, + FOURCC ckid, DWORD flags, LPCVOID buffer, LONG size); HRESULT AVIFILE_CreateAVIFile(REFIID riid, LPVOID *ppv) @@ -2543,7 +2543,7 @@ static void AVIFILE_UpdateInfo(IAVIFileImpl *This) } static HRESULT AVIFILE_WriteBlock(IAVIStreamImpl *This, DWORD block, - FOURCC ckid, DWORD flags, LPVOID buffer, + FOURCC ckid, DWORD flags, LPCVOID buffer, LONG size) { MMCKINFO ck;

1 0

Chris Robinson : wined3d: Decrement fbo_entry_count when one is removed from the list.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 12799db34926cbb32b190af56aa464e96cc2bc18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12799db34926cbb32b190af56… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sun May 24 05:15:29 2009 -0700 wined3d: Decrement fbo_entry_count when one is removed from the list. --- dlls/wined3d/context.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 02215c8..8fb075d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -259,13 +259,14 @@ static void context_reuse_fbo_entry(IWineD3DDevice *iface, struct fbo_entry *ent } /* GL locking is done by the caller */ -static void context_destroy_fbo_entry(IWineD3DDeviceImpl *This, struct fbo_entry *entry) +static void context_destroy_fbo_entry(IWineD3DDeviceImpl *This, WineD3DContext *context, struct fbo_entry *entry) { if (entry->id) { TRACE("Destroy FBO %d\n", entry->id); context_destroy_fbo(This, &entry->id); } + --context->fbo_entry_count; list_remove(&entry->entry); HeapFree(GetProcessHeap(), 0, entry->render_targets); HeapFree(GetProcessHeap(), 0, entry); @@ -381,11 +382,12 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource { for (i = 0; i < This->numContexts; ++i) { + WineD3DContext *context = This->contexts[i]; struct fbo_entry *entry, *entry2; ENTER_GL(); - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &This->contexts[i]->fbo_list, struct fbo_entry, entry) + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) { BOOL destroyed = FALSE; UINT j; @@ -394,13 +396,13 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource { if (entry->render_targets[j] == (IWineD3DSurface *)resource) { - context_destroy_fbo_entry(This, entry); + context_destroy_fbo_entry(This, context, entry); destroyed = TRUE; } } if (!destroyed && entry->depth_stencil == (IWineD3DSurface *)resource) - context_destroy_fbo_entry(This, entry); + context_destroy_fbo_entry(This, context, entry); } LEAVE_GL(); @@ -1053,7 +1055,7 @@ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { ENTER_GL(); LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) { - context_destroy_fbo_entry(This, entry); + context_destroy_fbo_entry(This, context, entry); } if (context->src_fbo) { TRACE("Destroy src FBO %d\n", context->src_fbo);

1 0

Vladimir Pankratov : winedbg: Add Russian translation.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: c75f31e1b8e6cb3202fa5c4d89519d530636fdb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c75f31e1b8e6cb3202fa5c4d8… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Sat May 23 02:21:03 2009 +0500 winedbg: Add Russian translation. --- programs/winedbg/rsrc.rc | 1 + programs/winedbg/rsrc_Ru.rc | 53 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/rsrc.rc b/programs/winedbg/rsrc.rc index fbc07d7..9963bbf 100644 --- a/programs/winedbg/rsrc.rc +++ b/programs/winedbg/rsrc.rc @@ -26,3 +26,4 @@ #include "rsrc_En.rc" #include "rsrc_Ko.rc" #include "rsrc_Nl.rc" +#include "rsrc_Ru.rc" diff --git a/programs/winedbg/rsrc_Ru.rc b/programs/winedbg/rsrc_Ru.rc new file mode 100644 index 0000000..7fc05bb --- /dev/null +++ b/programs/winedbg/rsrc_Ru.rc @@ -0,0 +1,53 @@ +/* + * Russian Language Support + * + * Copyright 2009 Vladimir Pankratov + * + * 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 + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDM_DEBUG_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&��", ID_DEBUG + END +END + +IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "�� " +FONT 8, "Tahoma" +BEGIN + LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 + LTEXT "� �� %s �� \ + ��. �� .", + IDC_STATIC_TXT1,27,10,224,30 + LTEXT "�� Wine. \ + �� http://appdb.winehq.org � �� \ + �� .\n\n\ + �� Windows � �� , \ + �� http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 + DEFPUSHBUTTON "��", IDOK, 205, 151, 60, 16, WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_AUTO_CAPTION "�� Wine" + IDS_INVALID_PARAMS "�� - �� " + IDS_UNIDENTIFIED "(��)" +END

1 0

Piotr Caban : jscript: Added Math_acos implementation and tests.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: b050c20638db462c67cf95b9cbef8b5a2482b6b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b050c20638db462c67cf95b9c… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon May 25 00:03:06 2009 +0200 jscript: Added Math_acos implementation and tests. --- dlls/jscript/math.c | 18 ++++++++++++++++-- dlls/jscript/tests/api.js | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index f7cf3d1..99bd9f5 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -160,8 +160,22 @@ static HRESULT Math_abs(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d static HRESULT Math_acos(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(retv) num_set_val(retv, acos(num_val(&v))); + return S_OK; } static HRESULT Math_asin(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 71517cb..a202fbd 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -626,6 +626,39 @@ tmp = Math.random(100); ok(typeof(tmp) == "number", "typeof(tmp) = " + typeof(tmp)); ok(0 <= tmp && tmp <= 1, "Math.random(100) = " + tmp); +tmp = Math.acos(0); +ok(Math.floor(tmp*100) === 157, "Math.acos(0) = " + tmp); + +tmp = Math.acos(1); +ok(Math.floor(tmp*100) === 0, "Math.acos(1) = " + tmp); + +tmp = Math.acos(-1); +ok(Math.floor(tmp*100) === 314, "Math.acos(-1) = " + tmp); + +tmp = Math.acos(Math.PI/4, 2); +ok(Math.floor(tmp*100) === 66, "Math.acos(Math.PI/4, 2) = " + tmp); + +tmp = Math.acos(true); +ok(Math.floor(tmp*100) === 0, "Math.acos(true) = " + tmp); + +tmp = Math.acos(false); +ok(Math.floor(tmp*100) === 157, "Math.acos(false) = " + tmp); + +tmp = Math.acos(1.1); +ok(isNaN(tmp), "Math.acos(1.1) is not NaN"); + +tmp = Math.acos(); +ok(isNaN(tmp), "Math.acos() is not NaN"); + +tmp = Math.acos(NaN); +ok(isNaN(tmp), "Math.acos(NaN) is not NaN"); + +tmp = Math.acos(Infinity); +ok(isNaN(tmp), "Math.acos(Infinity) is not NaN"); + +tmp = Math.acos(-Infinity); +ok(isNaN(tmp), "Math.acos(-Infinity) is not NaN"); + var func = function (a) { var a = 1; if(a) return;

1 0

Michael Stefaniuc : imm32: Use a simpler comparison of a pointer with NULL.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: f8c545fa97268574ec15fecc7d13f8ee089269b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c545fa97268574ec15fecc7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 22 22:23:17 2009 +0200 imm32: Use a simpler comparison of a pointer with NULL. --- dlls/imm32/imm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index c7d170c..cb97ecd 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -528,7 +528,7 @@ BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags) } else if (dwFlags == IACE_IGNORENOCONTEXT) { - if (GetPropW(hWnd,szwWineIMCProperty) > 0) + if (GetPropW(hWnd,szwWineIMCProperty)) ImmAssociateContext(hWnd,hIMC); return TRUE; }

1 0

Alexandre Julliard : msvcrt: Fix the stat and finddata structures for 64-bit.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: ac760a47f3f27594bd3ace8853c6e34e94074ab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac760a47f3f27594bd3ace885… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 23 11:15:19 2009 +0200 msvcrt: Fix the stat and finddata structures for 64-bit. --- dlls/msvcrt/file.c | 10 +- dlls/msvcrt/msvcrt.h | 187 +++++++++++++++++++++++++++---------------- dlls/msvcrt/msvcrt.spec | 6 +- dlls/msvcrt/tests/headers.c | 57 ------------- 4 files changed, 126 insertions(+), 134 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac760a47f3f27594bd3ac…

1 0

Alexandre Julliard : include/msvcrt: Add explicit msvcrt_long types to replace long for 64-bit compatibility.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 580e07e7ba22de1a86defeb560674eb367abfd71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=580e07e7ba22de1a86defeb56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 23 11:38:59 2009 +0200 include/msvcrt: Add explicit msvcrt_long types to replace long for 64-bit compatibility. --- include/msvcrt/conio.h | 4 +- include/msvcrt/crtdbg.h | 10 ++++---- include/msvcrt/crtdefs.h | 9 +++++++- include/msvcrt/direct.h | 2 +- include/msvcrt/float.h | 2 +- include/msvcrt/io.h | 22 ++++++++++---------- include/msvcrt/stddef.h | 4 +- include/msvcrt/stdio.h | 4 +- include/msvcrt/stdlib.h | 48 ++++++++++++++++++++++---------------------- include/msvcrt/sys/types.h | 2 +- include/msvcrt/time.h | 10 ++++---- include/msvcrt/wchar.h | 20 +++++++++--------- 12 files changed, 72 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=580e07e7ba22de1a86def…

1 0

Alexandre Julliard : msvcrt: Replace long by MSVCRT_long.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 82f175e9b5ab98a9b3a59d7f65bf42f8d55e4b8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f175e9b5ab98a9b3a59d7f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 23 11:49:09 2009 +0200 msvcrt: Replace long by MSVCRT_long. --- dlls/msvcrt/errno.c | 4 +- dlls/msvcrt/file.c | 22 ++++++++++---------- dlls/msvcrt/math.c | 14 ++++++------ dlls/msvcrt/misc.c | 4 +- dlls/msvcrt/msvcrt.h | 14 +++++++----- dlls/msvcrt/process.c | 4 +- dlls/msvcrt/tests/file.c | 48 +++++++++++++++++++++++----------------------- dlls/msvcrt/time.c | 6 ++-- dlls/msvcrt/undname.c | 4 +- 9 files changed, 61 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82f175e9b5ab98a9b3a59…

1 0