September 2008 - Wine-Commits

James Hawkins : advapi32: Fix a few test failures in Vista.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 83b21a6d5bcd4f95f3e32715cf7e3a86e43edd39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83b21a6d5bcd4f95f3e32715c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 00:46:10 2008 -0500 advapi32: Fix a few test failures in Vista. --- dlls/advapi32/tests/crypt_lmhash.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/crypt_lmhash.c b/dlls/advapi32/tests/crypt_lmhash.c index 9f2b24e..63ab2c0 100644 --- a/dlls/advapi32/tests/crypt_lmhash.c +++ b/dlls/advapi32/tests/crypt_lmhash.c @@ -348,20 +348,24 @@ static void test_SystemFunction005(void) out.Length = 0; out.MaximumLength = 0; r = pSystemFunction005(&out, &key, &res); - ok(r == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", r); + ok(r == STATUS_SUCCESS || + r == STATUS_INVALID_PARAMETER_1, /* Vista */ + "Expected STATUS_SUCCESS or STATUS_INVALID_PARAMETER_1, got %08x\n", r); ok(res.Length == in.Length, "Length wrong\n"); ok(!memcmp(res.Buffer, in.Buffer, in.Length), "data wrong\n"); res.MaximumLength = 0; r = pSystemFunction005(&out, &key, &res); - ok(r == STATUS_BUFFER_TOO_SMALL, - "Expected STATUS_BUFFER_TOO_SMALL, got %08x\n", r); + ok(r == STATUS_BUFFER_TOO_SMALL || + r == STATUS_INVALID_PARAMETER_1, /* Vista */ + "Expected STATUS_BUFFER_TOO_SMALL or STATUS_INVALID_PARAMETER_1, got %08x\n", r); key.Length = 1; r = pSystemFunction005(&out, &key, &res); - ok(r == STATUS_UNKNOWN_REVISION, - "Expected STATUS_UNKNOWN_REVISION, got %08x\n", r); + ok(r == STATUS_UNKNOWN_REVISION || + r == STATUS_INVALID_PARAMETER_1, /* Vista */ + "Expected STATUS_UNKNOWN_REVISION or STATUS_INVALID_PARAMETER_1, got %08x\n", r); key.Length = 0; r = pSystemFunction005(&out, &key, &res);

1 0

James Hawkins : crypt32: Remove a test with a binary result that behaves differently across platforms .
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: f5dd6d23edd0cb97e4d72e5a4501875e76554b91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5dd6d23edd0cb97e4d72e5a4… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 00:54:48 2008 -0500 crypt32: Remove a test with a binary result that behaves differently across platforms. --- dlls/crypt32/tests/main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 87ac711..3d54b3b 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -200,8 +200,7 @@ static void test_cryptAllocate(void) buf = CryptMemAlloc(0); ok(buf != NULL, "CryptMemAlloc failed: %08x\n", GetLastError()); CryptMemFree(buf); - buf = CryptMemRealloc(NULL, 0); - ok(!buf, "Expected NULL\n"); + /* CryptMemRealloc(NULL, 0) fails pre-Vista */ buf = CryptMemAlloc(0); buf = CryptMemRealloc(buf, 1); ok(buf != NULL, "CryptMemRealloc failed: %08x\n", GetLastError());

1 0

Francois Gouget : oleaut32: Improve the LHashValOfNameSys() documentation a bit.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 5512dacf8f59b4d113fa6ed5f024a0cd9669f22e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5512dacf8f59b4d113fa6ed5f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 1 17:01:42 2008 +0200 oleaut32: Improve the LHashValOfNameSys() documentation a bit. --- dlls/oleaut32/hash.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/hash.c b/dlls/oleaut32/hash.c index b3929f3..32c1086 100644 --- a/dlls/oleaut32/hash.c +++ b/dlls/oleaut32/hash.c @@ -486,6 +486,7 @@ static const unsigned char Lookup_224[128 * 3] = { /*********************************************************************** * LHashValOfNameSysA (OLEAUT32.166) + * LHashValOfNameSys (TYPELIB.4) * * Produce a string hash value. *

1 0

Jacek Caban : jscript: Added IDispatchEx::GetIDsOfNames implementation.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: a861c78b9260cc29aabf3228ff26f299f2df7bdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a861c78b9260cc29aabf3228f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 1 01:24:23 2008 +0200 jscript: Added IDispatchEx::GetIDsOfNames implementation. --- dlls/jscript/dispex.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 7dfa0d0..88a53a8 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -96,9 +96,19 @@ static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, LCID lcid, DISPID *rgDispId) { DispatchEx *This = DISPATCHEX_THIS(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + UINT i; + HRESULT hres; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + + for(i=0; i < cNames; i++) { + hres = IDispatchEx_GetDispID(_IDispatchEx_(This), rgszNames[i], 0, rgDispId+i); + if(FAILED(hres)) + return hres; + } + + return S_OK; } static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember,

1 0

Katayama Hirofumi MZ : wordpad: Added Japanese resource.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 13359ce22bf06c4b60ba37aa28750a8cad53b1bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=13359ce22bf06c4b60ba37aa2… Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> Date: Mon Sep 1 09:10:00 2008 +0900 wordpad: Added Japanese resource. --- programs/wordpad/Ja.rc | 241 ++++++++++++++++++++++++++++++++++++++++++++++ programs/wordpad/rsrc.rc | 1 + 2 files changed, 242 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/Ja.rc b/programs/wordpad/Ja.rc new file mode 100644 index 0000000..acb3ddf --- /dev/null +++ b/programs/wordpad/Ja.rc @@ -0,0 +1,241 @@ +/* + * Copyright 2008 by Katayama Hirofumi MZ + * + * 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_JAPANESE, SUBLANG_DEFAULT + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "�t�@�C��(&F)" + BEGIN + MENUITEM "�V�K�쐬(&N)...\tCtrl+N", ID_FILE_NEW + MENUITEM "�J��(&O)...\tCtrl+O", ID_FILE_OPEN + MENUITEM "�㏑��ۑ�(&S)\tCtrl+S", ID_FILE_SAVE + MENUITEM "��O��t��ĕۑ�(&A)...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "��(&P)...\tCtrl+P", ID_PRINT + MENUITEM "��v��r��[(&W)...", ID_PREVIEW + MENUITEM "�y�[�W�ݒ�(&E)...", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "�I��(&X)", ID_FILE_EXIT + END + POPUP "�ҏW(&E)" + BEGIN + MENUITEM "��ɖ߂�(&U)\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "��蒼��(&E)\tCtrl+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "�؂��(&T)\tCtrl+X", ID_EDIT_CUT + MENUITEM "�R�s�[(&C)\tCtrl+C", ID_EDIT_COPY + MENUITEM "�\\��t��(&P)\tCtrl+V", ID_EDIT_PASTE + MENUITEM "�N��A(&C)\tDEL", ID_EDIT_CLEAR + MENUITEM "��ׂđI��(&S)\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "��(&F)...\tCrtl+F", ID_FIND + MENUITEM "��(&N)\tF3", ID_FIND_NEXT + MENUITEM "�u��(&R)...\tCtrl+H", ID_REPLACE + MENUITEM SEPARATOR + MENUITEM "�ǂݎ��p(&O)", ID_EDIT_READONLY + MENUITEM "�ύX��(&M)", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "E&xtras" + BEGIN + MENUITEM "Selection &info", ID_EDIT_SELECTIONINFO + MENUITEM "Character &format", ID_EDIT_CHARFORMAT + MENUITEM "&Def. char format", ID_EDIT_DEFCHARFORMAT + MENUITEM "Paragrap&h format", ID_EDIT_PARAFORMAT + MENUITEM "&Get text", ID_EDIT_GETTEXT + END + END + POPUP "�\\��(&V)" + BEGIN + MENUITEM "�c�[��o�[(&T)", ID_TOGGLE_TOOLBAR + MENUITEM "��o�[(&F)", ID_TOGGLE_FORMATBAR + MENUITEM "��[��[(&R)", ID_TOGGLE_RULER + MENUITEM "�X�e�[�^�X �o�[(&S)", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "�I�v�V��(&O)...", ID_VIEWPROPERTIES + END + POPUP "�}��(&I)" + BEGIN + MENUITEM "��t�Ǝ��(&D)...", ID_DATETIME + END + POPUP "��(&O)" + BEGIN + MENUITEM "�t�H��g(&F)...", ID_FONTSETTINGS + MENUITEM "�ӏ��(&B)" ID_BULLET + MENUITEM "�i��(&P)..." ID_PARAFORMAT + MENUITEM "�^�u(&T)..." ID_TABSTOPS + POPUP "�w�i(&D)" + BEGIN + MENUITEM "�V�X�e��(&S)\tCtrl+1", ID_BACK_1 + MENUITEM "&PostThat yellowish\tCtrl+2", ID_BACK_2 + END + END + POPUP "�w��v(&H)" + BEGIN + MENUITEM "Wine Wordpad�ɂ��(&A)" ID_ABOUT + END +END + +IDM_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "�؂��(&T)", ID_EDIT_CUT + MENUITEM "�R�s�[(&C)", ID_EDIT_COPY + MENUITEM "�\\��t��(&P)", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "�ӏ��(&B)" ID_BULLET + MENUITEM "�i��(&P)..." ID_PARAFORMAT + END +END + +IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "��t�Ǝ��" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "��p�ł��`��",0,3,2,100,15 + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT|LBS_NOTIFY + PUSHBUTTON "&OK",IDOK,87,12,40,12 + PUSHBUTTON "�L��Z��(&C)",IDCANCEL,87,26,40,12 +END + +IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "�V�K�쐬" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "�V��`��",0,3,2,100,15 + LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT + PUSHBUTTON "&OK",IDOK,97,12,40,12 + PUSHBUTTON "�L��Z��(&C)",IDCANCEL,97,26,40,12 +END + +IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "�i��̐ݒ�" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "�C��f��g", 0, 10, 10, 120, 68 + LTEXT "��(&L)", 0, 15, 22, 40, 13 + EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 + LTEXT "�E(&R)", 0, 15, 40, 40, 13 + EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 + LTEXT "�ŏ��̍s(&F)", 0, 15, 58, 40, 13 + EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 + LTEXT "��(&A)", 0, 15, 87, 40, 13 + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST + PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 + PUSHBUTTON "�L��Z��(&C)", IDCANCEL, 137, 33, 50, 15 +END + +IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "�^�u�̐ݒ�" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "�^�u�̒�~�ʒu(&T)", 0, 10, 10, 120, 90 + COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT + DEFPUSHBUTTON "�ǉ�(&A)", ID_TAB_ADD, 20, 80, 45, 15 + PUSHBUTTON "�폜(&R)", ID_TAB_DEL, 72, 80, 45, 15 + PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 + PUSHBUTTON "�L��Z��(&C)", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "��ׂč폜(&L)", ID_TAB_EMPTY, 137, 51, 50, 15 +END + +IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +STYLE DS_SYSMODAL +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "�s�̐܂�Ԃ�", 0, 10, 10, 130, 85 + RADIOBUTTON "�E�B��h�E�̋��E�Ő܂�Ԃ�(&W)", IDC_PAGEFMT_WW, 18, 25, 117, 15 + RADIOBUTTON "�}�[�W��Ő܂�Ԃ�(&M)", IDC_PAGEFMT_WM, 18, 45, 117, 15 + GROUPBOX "�c�[��o�[", 0, 150, 10, 120, 85 + CHECKBOX "�c�[��o�[(&T)", IDC_PAGEFMT_TB, 160, 20, 80, 15 + CHECKBOX "��o�[(&F)", IDC_PAGEFMT_FB, 160, 38, 80, 15 + CHECKBOX "��[��[(&R)", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "�X�e�[�^�X�o�[(&S)", IDC_PAGEFMT_SB, 160, 74, 80, 15 + LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_RICHTEXT_FILES_RTF, "��b�`�e�L�X�g�`�� (*.rtf)" + STRING_TEXT_FILES_TXT, "�e�L�X�g�� (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "Unicode�e�L�X�g��(*.txt)" + STRING_ALL_FILES, "��ׂẴt�@�C�� (*.*)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_ALIGN_LEFT, "��" + STRING_ALIGN_RIGHT, "�E" + STRING_ALIGN_CENTER, "��" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_NEWFILE_RICHTEXT, "��b�`�e�L�X�g��" + STRING_NEWFILE_TXT, "�e�L�X�g��" + STRING_NEWFILE_TXT_UNICODE, "Unicode�e�L�X�g��" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PRINTER_FILES_PRN, "�v��^�t�@�C�� (*.PRN)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_VIEWPROPS_TITLE, "�I�v�V��" + STRING_VIEWPROPS_TEXT, "�e�L�X�g" + STRING_VIEWPROPS_RICHTEXT, "��b�`�e�L�X�g" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PREVIEW_PRINT, "��" + STRING_PREVIEW_NEXTPAGE, "��̃y�[�W" + STRING_PREVIEW_PREVPAGE, "�O�̃y�[�W" + STRING_PREVIEW_TWOPAGES, "2�y�[�W" + STRING_PREVIEW_ONEPAGE, "1�y�[�W" + STRING_PREVIEW_CLOSE, "��" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_UNITS_CM, "cm" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_DEFAULT_FILENAME, "��" + STRING_PROMPT_SAVE_CHANGES, "'%s'�ւ̕ύX��ۑ��܂��?" + STRING_SEARCH_FINISHED, "��̌��B" + STRING_LOAD_RICHED_FAILED, "RichEdit��C�u��̓ǂݍ��݂Ɏ��s�B" + STRING_SAVE_LOSEFORMATTING, "�v��[��e�L�X�g�`��ŕۑ��ƁA" \ + "��ׂĂ̏��܂��B" \ + "��ł��悢�ł��H" + STRING_INVALID_NUMBER, "��̏��s��" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE�X�g��[�W��̓T�|�[�g��Ă��܂��B" + STRING_WRITE_FAILED, "�t�@�C��ۑ��ł��܂��B" + STRING_WRITE_ACCESS_DENIED, "�t�@�C��ɕۑ��錠��܂��B" + STRING_OPEN_FAILED, "�t�@�C��J��܂��B" + STRING_OPEN_ACCESS_DENIED, "�t�@�C��J��܂��B" +END diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc index 894e1c3..49482ad 100644 --- a/programs/wordpad/rsrc.rc +++ b/programs/wordpad/rsrc.rc @@ -69,6 +69,7 @@ IDI_TXT ICON "txt.ico" #include "En.rc" #include "Fr.rc" #include "Hu.rc" +#include "Ja.rc" #include "Ko.rc" #include "Nl.rc" #include "No.rc"

1 0

Jacek Caban : jscript: Added IActiveScript::GetScriptState implementation.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: db21502d510d6c92e0680a9b116fdfb40b8c63d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db21502d510d6c92e0680a9b1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 1 01:25:29 2008 +0200 jscript: Added IActiveScript::GetScriptState implementation. --- dlls/jscript/jscript.c | 18 ++++++++++++++++-- dlls/jscript/tests/jscript.c | 16 ++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 26586d1..4d62fce 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -188,8 +188,22 @@ static HRESULT WINAPI JScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE s static HRESULT WINAPI JScript_GetScriptState(IActiveScript *iface, SCRIPTSTATE *pssState) { JScript *This = ACTSCRIPT_THIS(iface); - FIXME("(%p)->(%p)\n", This, pssState); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pssState); + + if(!pssState) + return E_POINTER; + + if(!This->thread_id) { + *pssState = SCRIPTSTATE_UNINITIALIZED; + return S_OK; + } + + if(This->thread_id != GetCurrentThreadId()) + return E_UNEXPECTED; + + *pssState = This->ctx ? This->ctx->state : SCRIPTSTATE_UNINITIALIZED; + return S_OK; } static HRESULT WINAPI JScript_Close(IActiveScript *iface) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 18aef1a..d923f33 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -66,6 +66,17 @@ DEFINE_EXPECT(OnStateChange_INITIALIZED); DEFINE_EXPECT(OnEnterScript); DEFINE_EXPECT(OnLeaveScript); +#define test_state(s,ss) _test_state(__LINE__,s,ss) +static void _test_state(unsigned line, IActiveScript *script, SCRIPTSTATE exstate) +{ + SCRIPTSTATE state = -1; + HRESULT hres; + + hres = IActiveScript_GetScriptState(script, &state); + ok_(__FILE__,line) (hres == S_OK, "GetScriptState failed: %08x\n", hres); + ok_(__FILE__,line) (state == exstate, "state=%d, expected %d\n", state, exstate); +} + static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -277,6 +288,7 @@ static void test_jscript(void) hres = IUnknown_QueryInterface(unk, &IID_IActiveScriptParse, (void**)&parse); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + test_state(script, SCRIPTSTATE_UNINITIALIZED); test_safety(unk); hres = IActiveScriptParse_InitNew(parse); @@ -288,6 +300,7 @@ static void test_jscript(void) hres = IActiveScript_SetScriptSite(script, NULL); ok(hres == E_POINTER, "SetScriptSite failed: %08x, expected E_POINTER\n", hres); + test_state(script, SCRIPTSTATE_UNINITIALIZED); test_script_dispatch(script, FALSE); SET_EXPECT(GetLCID); @@ -297,6 +310,8 @@ static void test_jscript(void) CHECK_CALLED(GetLCID); CHECK_CALLED(OnStateChange_INITIALIZED); + test_state(script, SCRIPTSTATE_INITIALIZED); + hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); ok(hres == E_UNEXPECTED, "SetScriptSite failed: %08x, expected E_UNEXPECTED\n", hres); @@ -307,6 +322,7 @@ static void test_jscript(void) ok(hres == S_OK, "Close failed: %08x\n", hres); CHECK_CALLED(OnStateChange_CLOSED); + test_state(script, SCRIPTSTATE_CLOSED); test_script_dispatch(script, FALSE); IActiveScriptParse_Release(parse);

1 0

Jacek Caban : jscript: Added IDispatchEx::Invoke implementation.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: dfbb5b953044bb2de1e9585803c22342e7d8fda5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfbb5b953044bb2de1e958580… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 1 01:24:57 2008 +0200 jscript: Added IDispatchEx::Invoke implementation. --- dlls/jscript/dispex.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 88a53a8..3ea1ed1 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -116,9 +116,12 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { DispatchEx *This = DISPATCHEX_THIS(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + return IDispatchEx_InvokeEx(_IDispatchEx_(This), dispIdMember, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, NULL); } static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid)

1 0

Jacek Caban : jscript: Added IActiveScript:: GetScriptDispatch implementation.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: c62c4f89281ec4433e66a419965db298f3d7124c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c62c4f89281ec4433e66a4199… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 1 01:23:38 2008 +0200 jscript: Added IActiveScript::GetScriptDispatch implementation. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/dispex.c | 217 ++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/jscript.c | 28 +++++- dlls/jscript/jscript.h | 22 ++++ dlls/jscript/tests/jscript.c | 33 +++++++ 5 files changed, 298 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c62c4f89281ec4433e66a…

1 0

Jacek Caban : jscript: Added script site tests.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: f3eb77610bb48e9a6598b299ad9a1fa3edef95d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3eb77610bb48e9a6598b299a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 1 01:19:25 2008 +0200 jscript: Added script site tests. --- dlls/jscript/tests/jscript.c | 164 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 163 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index f7dd162..b0c61be 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -17,6 +17,7 @@ */ #define COBJMACROS +#define CONST_VTABLE #include <initguid.h> #include <ole2.h> @@ -30,6 +31,146 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static const CLSID CLSID_JScript = {0xf414c260,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}}; +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define SET_CALLED(func) \ + called_ ## func = TRUE + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(GetLCID); +DEFINE_EXPECT(OnStateChange_STARTED); +DEFINE_EXPECT(OnStateChange_CLOSED); +DEFINE_EXPECT(OnStateChange_INITIALIZED); +DEFINE_EXPECT(OnEnterScript); +DEFINE_EXPECT(OnLeaveScript); + +static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) + *ppv = iface; + else if(IsEqualGUID(&IID_IActiveScriptSite, riid)) + *ppv = iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ActiveScriptSite_AddRef(IActiveScriptSite *iface) +{ + return 2; +} + +static ULONG WINAPI ActiveScriptSite_Release(IActiveScriptSite *iface) +{ + return 1; +} + +static HRESULT WINAPI ActiveScriptSite_GetLCID(IActiveScriptSite *iface, LCID *plcid) +{ + CHECK_EXPECT(GetLCID); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPCOLESTR pstrName, + DWORD dwReturnMask, IUnknown **ppiunkItem, ITypeInfo **ppti) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSite_GetDocVersionString(IActiveScriptSite *iface, BSTR *pbstrVersion) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSite_OnScriptTerminate(IActiveScriptSite *iface, + const VARIANT *pvarResult, const EXCEPINFO *pexcepinfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSite_OnStateChange(IActiveScriptSite *iface, SCRIPTSTATE ssScriptState) +{ + switch(ssScriptState) { + case SCRIPTSTATE_STARTED: + CHECK_EXPECT(OnStateChange_STARTED); + return S_OK; + case SCRIPTSTATE_CLOSED: + CHECK_EXPECT(OnStateChange_CLOSED); + return S_OK; + case SCRIPTSTATE_INITIALIZED: + CHECK_EXPECT(OnStateChange_INITIALIZED); + return S_OK; + default: + ok(0, "unexpected call %d\n", ssScriptState); + } + + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSite_OnScriptError(IActiveScriptSite *iface, IActiveScriptError *pscripterror) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSite_OnEnterScript(IActiveScriptSite *iface) +{ + CHECK_EXPECT(OnEnterScript); + return S_OK; +} + +static HRESULT WINAPI ActiveScriptSite_OnLeaveScript(IActiveScriptSite *iface) +{ + CHECK_EXPECT(OnLeaveScript); + return S_OK; +} + +#undef ACTSCPSITE_THIS + +static const IActiveScriptSiteVtbl ActiveScriptSiteVtbl = { + ActiveScriptSite_QueryInterface, + ActiveScriptSite_AddRef, + ActiveScriptSite_Release, + ActiveScriptSite_GetLCID, + ActiveScriptSite_GetItemInfo, + ActiveScriptSite_GetDocVersionString, + ActiveScriptSite_OnScriptTerminate, + ActiveScriptSite_OnStateChange, + ActiveScriptSite_OnScriptError, + ActiveScriptSite_OnEnterScript, + ActiveScriptSite_OnLeaveScript +}; + +static IActiveScriptSite ActiveScriptSite = { &ActiveScriptSiteVtbl }; + static void test_safety(IUnknown *unk) { IObjectSafety *safety; @@ -94,6 +235,7 @@ static void test_jscript(void) IActiveScriptParse *parse; IActiveScript *script; IUnknown *unk; + ULONG ref; HRESULT hres; hres = CoCreateInstance(&CLSID_JScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -116,9 +258,29 @@ static void test_jscript(void) hres = IActiveScriptParse_InitNew(parse); ok(hres == E_UNEXPECTED, "InitNew failed: %08x, expected E_UNEXPECTED\n", hres); + hres = IActiveScript_SetScriptSite(script, NULL); + ok(hres == E_POINTER, "SetScriptSite failed: %08x, expected E_POINTER\n", hres); + + SET_EXPECT(GetLCID); + SET_EXPECT(OnStateChange_INITIALIZED); + hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + CHECK_CALLED(GetLCID); + CHECK_CALLED(OnStateChange_INITIALIZED); + + hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); + ok(hres == E_UNEXPECTED, "SetScriptSite failed: %08x, expected E_UNEXPECTED\n", hres); + + SET_EXPECT(OnStateChange_CLOSED); + hres = IActiveScript_Close(script); + ok(hres == S_OK, "Close failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_CLOSED); + IActiveScriptParse_Release(parse); IActiveScript_Release(script); - IUnknown_Release(unk); + + ref = IUnknown_Release(unk); + ok(!ref, "ref = %d\n", ref); } START_TEST(jscript)

1 0

Jacek Caban : jscript: Added IActiveScript::Close implementation.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 9efb87ea88a8a47afdc3710dd210ce31ae7e38d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9efb87ea88a8a47afdc3710dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 1 01:17:53 2008 +0200 jscript: Added IActiveScript::Close implementation. --- dlls/jscript/jscript.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index d70db46..ed2dd47 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -120,10 +120,10 @@ static ULONG WINAPI JScript_Release(IActiveScript *iface) TRACE("(%p) ref=%d\n", iface, ref); if(!ref) { + if(This->ctx && This->ctx->state != SCRIPTSTATE_CLOSED) + IActiveScript_Close(ACTSCRIPT(This)); if(This->ctx) script_release(This->ctx); - if(This->site) - IActiveScriptSite_Release(This->site); heap_free(This); unlock_module(); } @@ -191,8 +191,21 @@ static HRESULT WINAPI JScript_GetScriptState(IActiveScript *iface, SCRIPTSTATE * static HRESULT WINAPI JScript_Close(IActiveScript *iface) { JScript *This = ACTSCRIPT_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + if(This->thread_id != GetCurrentThreadId()) + return E_UNEXPECTED; + + if(This->ctx) + change_state(This, SCRIPTSTATE_CLOSED); + + if(This->site) { + IActiveScriptSite_Release(This->site); + This->site = NULL; + } + + return S_OK; } static HRESULT WINAPI JScript_AddNamedItem(IActiveScript *iface,

1 0