January 2009 - Wine-commits

Jacek Caban : jscript: Added Math.random implementation.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: a20a9166a2b0cde1ad2d04a67b19434becd76fef URL: http://source.winehq.org/git/wine.git/?a=commit;h=a20a9166a2b0cde1ad2d04a67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 22 13:47:00 2009 +0100 jscript: Added Math.random implementation. --- dlls/jscript/Makefile.in | 2 +- dlls/jscript/math.c | 16 ++++++++++++++-- dlls/jscript/tests/api.js | 8 ++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 5d4506a..5d7ee69 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = jscript.dll -IMPORTS = oleaut32 kernel32 +IMPORTS = oleaut32 advapi32 kernel32 RC_SRCS = rsrc.rc diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index f2a3d0c..9c1a56b 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -20,8 +20,10 @@ #include "wine/port.h" #include <math.h> +#include <limits.h> #include "jscript.h" +#include "ntsecapi.h" #include "wine/debug.h" @@ -352,11 +354,21 @@ static HRESULT Math_pow(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d return S_OK; } +/* ECMA-262 3rd Edition 15.8.2.14 */ static HRESULT Math_random(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + UINT r; + + TRACE("\n"); + + if(!RtlGenRandom(&r, sizeof(r))) + return E_UNEXPECTED; + + if(retv) + num_set_val(retv, (DOUBLE)r/(DOUBLE)UINT_MAX); + + return S_OK; } /* ECMA-262 3rd Edition 15.8.2.15 */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 16fba15..7fd20a6 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -585,6 +585,14 @@ ok(tmp === 2, "Math.pow(2, 2) = " + tmp); tmp = Math.pow(2, 2, 3); ok(tmp === 4, "Math.pow(2, 2, 3) = " + tmp); +tmp = Math.random(); +ok(typeof(tmp) == "number", "typeof(tmp) = " + typeof(tmp)); +ok(0 <= tmp && tmp <= 1, "Math.random() = " + tmp); + +tmp = Math.random(100); +ok(typeof(tmp) == "number", "typeof(tmp) = " + typeof(tmp)); +ok(0 <= tmp && tmp <= 1, "Math.random(100) = " + tmp); + var func = function (a) { var a = 1; if(a) return;

1 0

Anders Jonsson : progman: Add Swedish translation.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: 890a48adc507f7fbe30411ebe622e0cf46f221fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=890a48adc507f7fbe30411ebe… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Thu Jan 22 00:16:45 2009 +0100 progman: Add Swedish translation. --- programs/progman/Sv.rc | 245 ++++++++++++++++++++++++++++++++++++++++++++++ programs/progman/rsrc.rc | 1 + 2 files changed, 246 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=890a48adc507f7fbe3041…

1 0

Vincent Pelletier : dinput: Add test to show that effects are stopped after Unacquire + Acquire and preserved in dinput .
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: 7d0ee98716504d6b10ade39c2403643151f7511e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d0ee98716504d6b10ade39c2… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Wed Jan 21 23:25:53 2009 +0100 dinput: Add test to show that effects are stopped after Unacquire + Acquire and preserved in dinput. --- dlls/dinput/tests/joystick.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 286c168..133ff58 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -373,6 +373,8 @@ static BOOL CALLBACK EnumJoysticks( if (effect) { + DWORD effect_status; + hr = IDirectInputEffect_Initialize(effect, hInstance, data->version, &GUID_ConstantForce); ok(hr==DI_OK,"IDirectInputEffect_Initialize failed: %08x\n", hr); @@ -389,6 +391,44 @@ static BOOL CALLBACK EnumJoysticks( hr = IDirectInputEffect_SetParameters(effect, &eff, DIEP_GAIN); ok(hr==DI_OK,"IDirectInputEffect_SetParameters failed: %08x\n", hr); } + + /* Check effect status. + * State: initialy stopped + * start + * State: started + * unacquire, acquire, download + * State: stopped + * start + * State: started + * + * Shows that: + * - effects are stopped after Unacquire + Acquire + * - effects are preserved (Download + Start doesn't complain + * about incomplete effect) + */ + hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); + ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); + ok(effect_status==0,"IDirectInputEffect_GetEffectStatus() reported effect as started\n"); + hr = IDirectInputEffect_SetParameters(effect, &eff, DIEP_START); + ok(hr==DI_OK,"IDirectInputEffect_SetParameters failed: %08x\n", hr); + hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); + ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); + todo_wine ok(effect_status!=0,"IDirectInputEffect_GetEffectStatus() reported effect as stopped\n"); + hr = IDirectInputDevice_Unacquire(pJoystick); + ok(hr==DI_OK,"IDirectInputDevice_Unacquire() failed: %08x\n", hr); + hr = IDirectInputDevice_Acquire(pJoystick); + ok(hr==DI_OK,"IDirectInputDevice_Acquire() failed: %08x\n", hr); + hr = IDirectInputEffect_Download(effect); + ok(hr==DI_OK,"IDirectInputEffect_Download() failed: %08x\n", hr); + hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); + ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); + ok(effect_status==0,"IDirectInputEffect_GetEffectStatus() reported effect as started\n"); + hr = IDirectInputEffect_Start(effect, 1, 0); + ok(hr==DI_OK,"IDirectInputEffect_Start() failed: %08x\n", hr); + hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); + ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); + todo_wine ok(effect_status!=0,"IDirectInputEffect_GetEffectStatus() reported effect as stopped\n"); + ref = IUnknown_Release(effect); ok(ref == 0, "IDirectInputDevice_Release() reference count = %d\n", ref); }

1 0

Vincent Pelletier : dinput: On Unacquire, stop all effects and unload them.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: 41be1096c0c23da208d45e253eff10b16277ebf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41be1096c0c23da208d45e253… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Wed Jan 21 23:01:42 2009 +0100 dinput: On Unacquire, stop all effects and unload them. --- dlls/dinput/joystick_linuxinput.c | 12 ++++++++++++ dlls/dinput/tests/joystick.c | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index be5dccf..da2d0bc 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -678,6 +678,18 @@ static HRESULT WINAPI JoystickAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) TRACE("(this=%p)\n",This); res = IDirectInputDevice2AImpl_Unacquire(iface); if (res==DI_OK && This->joyfd!=-1) { + effect_list_item *itr; + + /* For each known effect: + * - stop it + * - unload it + * But, unlike DISFFC_RESET, do not release the effect. + */ + LIST_FOR_EACH_ENTRY(itr, &This->ff_effects, effect_list_item, entry) { + IDirectInputEffect_Stop(itr->ref); + IDirectInputEffect_Unload(itr->ref); + } + close(This->joyfd); This->joyfd = -1; } diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 0d5a34b..286c168 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -387,7 +387,7 @@ static BOOL CALLBACK EnumJoysticks( hr = IDirectInputDevice_Acquire(pJoystick); ok(hr==DI_OK,"IDirectInputDevice_Acquire() failed: %08x\n", hr); hr = IDirectInputEffect_SetParameters(effect, &eff, DIEP_GAIN); - todo_wine ok(hr==DI_OK,"IDirectInputEffect_SetParameters failed: %08x\n", hr); + ok(hr==DI_OK,"IDirectInputEffect_SetParameters failed: %08x\n", hr); } ref = IUnknown_Release(effect); ok(ref == 0, "IDirectInputDevice_Release() reference count = %d\n", ref);

1 0

Vincent Pelletier : dinput: Use tested DirectInput version instead of latest.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: a0c10c2af2c30542cb21321adc5b8e109c7ef609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c10c2af2c30542cb21321ad… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Wed Jan 21 23:00:25 2009 +0100 dinput: Use tested DirectInput version instead of latest. --- dlls/dinput/tests/joystick.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 77cfa4c..0d5a34b 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -373,7 +373,7 @@ static BOOL CALLBACK EnumJoysticks( if (effect) { - hr = IDirectInputEffect_Initialize(effect, hInstance, DIRECTINPUT_VERSION, + hr = IDirectInputEffect_Initialize(effect, hInstance, data->version, &GUID_ConstantForce); ok(hr==DI_OK,"IDirectInputEffect_Initialize failed: %08x\n", hr); hr = IDirectInputEffect_SetParameters(effect, &eff, DIEP_AXES | DIEP_DIRECTION |

1 0

Dylan Smith : richedit: Removed some unused invalidation code.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: 94146a72ad80c182ba9ac53840eede78178336e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94146a72ad80c182ba9ac5384… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jan 21 10:10:10 2009 -0500 richedit: Removed some unused invalidation code. The ME_InvalidateFromOfs and ME_QueueInvalidateFromCursor functions are never called, and the nInvalidOfs variable had its value set but never used. --- dlls/riched20/editor.c | 1 - dlls/riched20/editor.h | 1 - dlls/riched20/editstr.h | 1 - dlls/riched20/paint.c | 25 ------------------------- 4 files changed, 0 insertions(+), 28 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 33964d6..2666c64 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2725,7 +2725,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->pLastSelStartPara = ed->pLastSelEndPara = ME_FindItemFwd(ed->pBuffer->pFirst, diParagraph); ed->bWordWrap = (props & TXTBIT_WORDWRAP) != 0; ed->bHideSelection = FALSE; - ed->nInvalidOfs = -1; ed->pfnWordBreak = NULL; ed->lpOleCallback = NULL; ed->mode = TM_RICHTEXT | TM_MULTILEVELUNDO | TM_MULTICODEPAGE; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 53d6295..484acfb 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -233,7 +233,6 @@ void ME_RewrapRepaint(ME_TextEditor *editor); void ME_UpdateRepaint(ME_TextEditor *editor); void ME_EnsureVisible(ME_TextEditor *editor, ME_Cursor *pCursor); void ME_InvalidateSelection(ME_TextEditor *editor); -void ME_QueueInvalidateFromCursor(ME_TextEditor *editor, int nCursor); BOOL ME_SetZoom(ME_TextEditor *editor, int numerator, int denominator); int ME_twips2pointsX(ME_Context *c, int x); int ME_twips2pointsY(ME_Context *c, int y); diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 7ac476d..ccdf51d 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -363,7 +363,6 @@ typedef struct tagME_TextEditor RECT rcFormat; BOOL bDefaultFormatRect; BOOL bWordWrap; - int nInvalidOfs; int nTextLimit; EDITWORDBREAKPROCW pfnWordBreak; LPRICHEDITOLECALLBACK lpOleCallback; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 728b623..3de26e1 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1241,24 +1241,6 @@ void ME_EnsureVisible(ME_TextEditor *editor, ME_Cursor *pCursor) void -ME_InvalidateFromOfs(ME_TextEditor *editor, int nCharOfs) -{ - RECT rc; - int x, y, height; - ME_Cursor tmp; - - ME_RunOfsFromCharOfs(editor, nCharOfs, &tmp.pRun, &tmp.nOffset); - ME_GetCursorCoordinates(editor, &tmp, &x, &y, &height); - - rc.left = 0; - rc.top = y; - rc.bottom = y + height; - rc.right = editor->rcFormat.right; - ITextHost_TxInvalidateRect(editor->texthost, &rc, FALSE); -} - - -void ME_InvalidateSelection(ME_TextEditor *editor) { ME_DisplayItem *para1, *para2; @@ -1306,13 +1288,6 @@ ME_InvalidateSelection(ME_TextEditor *editor) assert(editor->pLastSelEndPara->type == diParagraph); } -void -ME_QueueInvalidateFromCursor(ME_TextEditor *editor, int nCursor) -{ - editor->nInvalidOfs = ME_GetCursorOfs(editor, nCursor); -} - - BOOL ME_SetZoom(ME_TextEditor *editor, int numerator, int denominator) {

1 0

Dylan Smith : richedit: Implemented ITextServices_TxGetVScroll & TxGetHScroll.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: 8f7a99fb96df73c694b4bc696593d7286d5b0777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f7a99fb96df73c694b4bc696… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jan 21 10:13:56 2009 -0500 richedit: Implemented ITextServices_TxGetVScroll & TxGetHScroll. --- dlls/riched20/txtsrv.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 2d5ff81..0c3fc55 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -190,8 +190,12 @@ HRESULT WINAPI fnTextSrv_TxGetHScroll(ITextServices *iface, { ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - FIXME("%p: STUB\n", This); - return E_NOTIMPL; + *plMin = This->editor->horz_si.nMin; + *plMax = This->editor->horz_si.nMax; + *plPos = This->editor->horz_si.nPos; + *plPage = This->editor->horz_si.nPage; + *pfEnabled = (This->editor->styleFlags & WS_HSCROLL) != 0; + return S_OK; } HRESULT WINAPI fnTextSrv_TxGetVScroll(ITextServices *iface, @@ -203,8 +207,12 @@ HRESULT WINAPI fnTextSrv_TxGetVScroll(ITextServices *iface, { ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - FIXME("%p: STUB\n", This); - return E_NOTIMPL; + *plMin = This->editor->vert_si.nMin; + *plMax = This->editor->vert_si.nMax; + *plPos = This->editor->vert_si.nPos; + *plPage = This->editor->vert_si.nPage; + *pfEnabled = (This->editor->styleFlags & WS_VSCROLL) != 0; + return S_OK; } HRESULT WINAPI fnTextSrv_OnTxSetCursor(ITextServices *iface,

1 0

Nikolay Sivov : richedit: Update EM_GETOLEINTERFACE documentation status.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: e49cb3bfcbc9180ec58f89e84d2f25f761eef406 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e49cb3bfcbc9180ec58f89e84… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jan 21 19:08:31 2009 +0300 richedit: Update EM_GETOLEINTERFACE documentation status. --- dlls/riched20/editor.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2666c64..f10dddc 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -56,7 +56,7 @@ + EM_GETLINE + EM_GETLINECOUNT returns number of rows, not of paragraphs + EM_GETMODIFY - - EM_GETOLEINTERFACE + + EM_GETOLEINTERFACE + EM_GETOPTIONS + EM_GETPARAFORMAT + EM_GETPASSWORDCHAR 2.0 @@ -3045,7 +3045,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, UNSUPPORTED_MSG(EM_GETIMESTATUS) UNSUPPORTED_MSG(EM_SETIMESTATUS) UNSUPPORTED_MSG(EM_GETLANGOPTIONS) - /* UNSUPPORTED_MSG(EM_GETOLEINTERFACE) separate stub */ UNSUPPORTED_MSG(EM_GETREDONAME) UNSUPPORTED_MSG(EM_GETTEXTMODE) UNSUPPORTED_MSG(EM_GETTYPOGRAPHYOPTIONS)

1 0

Dylan Smith : richedit: Typing is ignored while mouse is captured.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: a6c7b6fdb278ef5c99d343894a188a80db849cb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6c7b6fdb278ef5c99d343894… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jan 21 10:10:04 2009 -0500 richedit: Typing is ignored while mouse is captured. I noticed a while ago that on Windows XP richedit controls ignored characters typed while the mouse is captured (e.g. from holding the left or middle button down). Arrow keys, delete, and backspace, copying, cutting, pasting, and everything else handled on WM_CHAR and WM_KEYDOWN messages are also ignored. --- dlls/riched20/editor.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 09f3fb3..33964d6 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2155,6 +2155,8 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) BOOL ctrl_is_down = GetKeyState(VK_CONTROL) & 0x8000; BOOL shift_is_down = GetKeyState(VK_SHIFT) & 0x8000; + if (editor->bMouseCaptured) + return FALSE; if (nKey != VK_SHIFT && nKey != VK_CONTROL && nKey != VK_MENU) editor->nSelectionType = stPosition; @@ -2400,6 +2402,9 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, { WCHAR wstr; + if (editor->bMouseCaptured) + return 0; + if (unicode) wstr = (WCHAR)charCode; else

1 0

Henri Verbeet : ddraw: Rename the main vtables to lpVtbl.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: 9b5f3ed8f32d6315e00b4a6dfde269cd257ae552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b5f3ed8f32d6315e00b4a6df… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 22 12:24:01 2009 +0100 ddraw: Rename the main vtables to lpVtbl. --- dlls/ddraw/ddraw.c | 14 +++++++------- dlls/ddraw/ddraw_private.h | 24 ++++++++++++------------ dlls/ddraw/device.c | 2 +- dlls/ddraw/direct3d.c | 14 +++++++------- dlls/ddraw/main.c | 4 ++-- dlls/ddraw/material.c | 4 ++-- 6 files changed, 31 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b5f3ed8f32d6315e00b4…

1 0