January 2015 - Wine-commits

Matteo Bruni : wined3d: Use the core glColorMaski function.
by Alexandre Julliard 15 Jan '15

15 Jan '15

Module: wine Branch: master Commit: 7e169d43c546c0175868a2eeb114f4c8b996a9ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e169d43c546c0175868a2eeb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 14 16:27:32 2015 +0100 wined3d: Use the core glColorMaski function. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/state.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 00d2ac6..7259dfe 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2883,6 +2883,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glBlendFuncSeparate) /* OpenGL 1.4 */ USE_GL_FUNC(glBufferData) /* OpenGL 1.5 */ USE_GL_FUNC(glBufferSubData) /* OpenGL 1.5 */ + USE_GL_FUNC(glColorMaski) /* OpenGL 3.0 */ USE_GL_FUNC(glDeleteBuffers) /* OpenGL 1.5 */ USE_GL_FUNC(glGenBuffers) /* OpenGL 1.5 */ USE_GL_FUNC(glGetBufferSubData) /* OpenGL 1.5 */ @@ -2911,6 +2912,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glBlendFuncSeparate, glBlendFuncSeparateEXT); MAP_GL_FUNCTION(glBufferData, glBufferDataARB); MAP_GL_FUNCTION(glBufferSubData, glBufferSubDataARB); + MAP_GL_FUNCTION(glColorMaski, glColorMaskIndexedEXT); MAP_GL_FUNCTION(glDeleteBuffers, glDeleteBuffersARB); MAP_GL_FUNCTION(glGenBuffers, glGenBuffersARB); MAP_GL_FUNCTION(glGetBufferSubData, glGetBufferSubDataARB); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 725ed63..a8e6e8a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1600,11 +1600,12 @@ static void state_colorwrite(struct wined3d_context *context, const struct wined static void set_color_mask(const struct wined3d_gl_info *gl_info, UINT index, DWORD mask) { - GL_EXTCALL(glColorMaskIndexedEXT(index, + GL_EXTCALL(glColorMaski(index, mask & WINED3DCOLORWRITEENABLE_RED ? GL_TRUE : GL_FALSE, mask & WINED3DCOLORWRITEENABLE_GREEN ? GL_TRUE : GL_FALSE, mask & WINED3DCOLORWRITEENABLE_BLUE ? GL_TRUE : GL_FALSE, mask & WINED3DCOLORWRITEENABLE_ALPHA ? GL_TRUE : GL_FALSE)); + checkGLcall("glColorMaski"); } static void state_colorwrite0(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)

1 0

Michael Stefaniuc : dmband/tests: Remove an unused assigment (PVS-Studio).
by Alexandre Julliard 15 Jan '15

15 Jan '15

Module: wine Branch: master Commit: 468cb274d145bfe6ba547a91af2e4bb3a4bf0c4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=468cb274d145bfe6ba547a91a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 15 12:02:26 2015 +0100 dmband/tests: Remove an unused assigment (PVS-Studio). --- dlls/dmband/tests/dmband.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index cfbf34d..e2ba8d8 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -126,7 +126,7 @@ static void test_COM_bandtrack(void) ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); refcount = IPersistStream_AddRef(ps); ok(refcount == 4, "refcount == %u, expected 4\n", refcount); - refcount = IPersistStream_Release(ps); + IPersistStream_Release(ps); hr = IDirectMusicTrack_QueryInterface(dmbt, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr);

1 0

Michael Stefaniuc : dmcompos/tests: Remove an unused assigment (PVS-Studio ).
by Alexandre Julliard 15 Jan '15

15 Jan '15

Module: wine Branch: master Commit: 68e76e67f62fd51d63f8f307c577ee4d4c9966aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=68e76e67f62fd51d63f8f307c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 15 12:08:43 2015 +0100 dmcompos/tests: Remove an unused assigment (PVS-Studio). --- dlls/dmcompos/tests/dmcompos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index aaaa4ac..16dc75e 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -218,7 +218,7 @@ static void test_COM_track(void) ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); refcount = IPersistStream_AddRef(ps); ok(refcount == 4, "refcount == %u, expected 4\n", refcount); - refcount = IPersistStream_Release(ps); + IPersistStream_Release(ps); hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr);

1 0

Michael Stefaniuc : dmime/tests: Remove unused assigments (PVS-Studio).
by Alexandre Julliard 15 Jan '15

15 Jan '15

Module: wine Branch: master Commit: 4ffcae35d294a0133a83168641b0154e8034a2fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ffcae35d294a0133a8316864… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 15 12:09:15 2015 +0100 dmime/tests: Remove unused assigments (PVS-Studio). --- dlls/dmime/tests/dmime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 03b0a37..f7c018f 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -133,7 +133,7 @@ static void test_COM_audiopathconfig(void) ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); refcount = IPersistStream_AddRef(ps); ok(refcount == 4, "refcount == %u, expected 4\n", refcount); - refcount = IPersistStream_Release(ps); + IPersistStream_Release(ps); hr = IDirectMusicObject_QueryInterface(dmo, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); @@ -358,7 +358,7 @@ static void test_COM_track(void) ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); refcount = IPersistStream_AddRef(ps); ok(refcount == 4, "refcount == %u, expected 4\n", refcount); - refcount = IPersistStream_Release(ps); + IPersistStream_Release(ps); hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr);

1 0

Michael Stefaniuc : dmloader/tests: Test the return of CoCreateInstance ( PVS-Studio).
by Alexandre Julliard 15 Jan '15

15 Jan '15

Module: wine Branch: master Commit: 9d52d8c07dc6e6b50c48e7120f951bcb38000ae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d52d8c07dc6e6b50c48e7120… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 15 12:14:10 2015 +0100 dmloader/tests: Test the return of CoCreateInstance (PVS-Studio). --- dlls/dmloader/tests/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 46a2b93..3083ac5 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -47,6 +47,7 @@ static void test_release_object(void) IDirectMusicLoader8* loader = NULL; hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC, &IID_IDirectMusicLoader8, (void**)&loader); + ok(hr == S_OK, "Couldn't create Loader %08x\n", hr); hr = IDirectMusicLoader_ReleaseObject(loader, NULL); ok(hr == E_POINTER, "Expected E_POINTER, received %#x\n", hr);

1 0

Marcus Meissner : mshtml: Check for failed allocs (Coverity).
by Alexandre Julliard 14 Jan '15

14 Jan '15

Module: wine Branch: master Commit: 76fef29cd3fc8283819b457882d5a5cf00a05255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76fef29cd3fc8283819b45788… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jan 11 23:40:19 2015 +0100 mshtml: Check for failed allocs (Coverity). --- dlls/mshtml/dispex.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 7f6d5c5..a97f09d 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -345,9 +345,18 @@ static dispex_data_t *preprocess_dispex_data(DispatchEx *This) } data = heap_alloc(sizeof(dispex_data_t)); + if (!data) { + ERR("Out of memory\n"); + return NULL; + } data->func_cnt = 0; data->func_disp_cnt = 0; data->funcs = heap_alloc_zero(size*sizeof(func_info_t)); + if (!data->funcs) { + heap_free (data); + ERR("Out of memory\n"); + return NULL; + } list_add_tail(&dispex_data_list, &data->entry); while(*tid) {

1 0

Qian Hong : atl100/tests: Added more tests for class AtlAxWin100 and AtlAxWinLic100.
by Alexandre Julliard 14 Jan '15

14 Jan '15

Module: wine Branch: master Commit: 0486b4368d63aa6cb97727c4d97e6030dfab431f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0486b4368d63aa6cb97727c4d… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Jan 13 17:01:42 2015 +0800 atl100/tests: Added more tests for class AtlAxWin100 and AtlAxWinLic100. --- dlls/atl100/tests/atl.c | 170 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 156 insertions(+), 14 deletions(-) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 96abf57..dcc199f 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -591,28 +591,170 @@ static void test_source_iface(void) static void test_ax_win(void) { - BOOL ret; + DWORD ret, ret_size, i; + HRESULT res; + HWND hwnd; + HANDLE hfile; + IUnknown *control; + WNDPROC wndproc[2] = {NULL, NULL}; + WCHAR file_uri1W[MAX_PATH], pathW[MAX_PATH]; WNDCLASSEXW wcex; - static const WCHAR AtlAxWin100[] = {'A','t','l','A','x','W','i','n','1','0','0',0}; - static const WCHAR AtlAxWinLic100[] = {'A','t','l','A','x','W','i','n','L','i','c','1','0','0',0}; static HMODULE hinstance = 0; + static const WCHAR emptyW[] = {'\0'}; + static const WCHAR randomW[] = {'r','a','n','d','o','m','\0'}; + static const WCHAR progid1W[] = {'S','h','e','l','l','.','E','x','p','l','o','r','e','r','.','2','\0'}; + static const WCHAR clsid1W[] = {'{','8','8','5','6','f','9','6','1','-','3','4','0','a','-', + '1','1','d','0','-','a','9','6','b','-', + '0','0','c','0','4','f','d','7','0','5','a','2','}','\0'}; + static const WCHAR url1W[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q', + '.','o','r','g','/','t','e','s','t','s','/','w','i','n','e','h','q','_', + 's','n','a','p','s','h','o','t','/','\0'}; + static const WCHAR mshtml1W[] = {'m','s','h','t','m','l',':','<','h','t','m','l','>','<','b','o','d','y','>', + 't','e','s','t','<','/','b','o','d','y','>','<','/','h','t','m','l','>','\0'}; + static const WCHAR mshtml2W[] = {'M','S','H','T','M','L',':','<','h','t','m','l','>','<','b','o','d','y','>', + 't','e','s','t','<','/','b','o','d','y','>','<','/','h','t','m','l','>','\0'}; + static const WCHAR mshtml3W[] = {'<','h','t','m','l','>','<','b','o','d','y','>', 't','e','s','t', + '<','/','b','o','d','y','>','<','/','h','t','m','l','>','\0'}; + static const WCHAR fileW[] = {'f','i','l','e',':','/','/','/','\0'}; + static const WCHAR html_fileW[] = {'t','e','s','t','.','h','t','m','l','\0'}; + static const char html_str[] = "<html><body>test</body><html>"; + static const WCHAR cls_names[][16] = + { + {'A','t','l','A','x','W','i','n','1','0','0',0}, + {'A','t','l','A','x','W','i','n','L','i','c','1','0','0',0} + }; ret = AtlAxWinInit(); ok(ret, "AtlAxWinInit failed\n"); hinstance = GetModuleHandleA(NULL); - memset(&wcex, 0, sizeof(wcex)); - wcex.cbSize = sizeof(wcex); - ret = GetClassInfoExW(hinstance, AtlAxWin100, &wcex); - ok(ret, "AtlAxWin100 has not registered\n"); - ok(wcex.style == (CS_GLOBALCLASS | CS_DBLCLKS), "wcex.style %08x\n", wcex.style); - - memset(&wcex, 0, sizeof(wcex)); - wcex.cbSize = sizeof(wcex); - ret = GetClassInfoExW(hinstance, AtlAxWinLic100, &wcex); - ok(ret, "AtlAxWinLic100 has not registered\n"); - ok(wcex.style == (CS_GLOBALCLASS | CS_DBLCLKS), "wcex.style %08x\n", wcex.style); + for (i = 0; i < 2; i++) + { + memset(&wcex, 0, sizeof(wcex)); + wcex.cbSize = sizeof(wcex); + ret = GetClassInfoExW(hinstance, cls_names[i], &wcex); + ok(ret, "%s has not registered\n", wine_dbgstr_w(cls_names[i])); + ok(wcex.style == (CS_GLOBALCLASS | CS_DBLCLKS), "wcex.style %08x\n", wcex.style); + wndproc[i] = wcex.lpfnWndProc; + + hwnd = CreateWindowW(cls_names[i], NULL, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = (IUnknown *)0xdeadbeef; + res = AtlAxGetControl(hwnd, &control); + todo_wine ok(res == E_FAIL, "Expected E_FAIL, returned %08x\n", res); + todo_wine ok(!control, "returned %p\n", control); + if (control) IUnknown_Release(control); + DestroyWindow(hwnd); + + hwnd = CreateWindowW(cls_names[i], emptyW, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = (IUnknown *)0xdeadbeef; + res = AtlAxGetControl(hwnd, &control); + todo_wine ok(res == E_FAIL, "Expected E_FAIL, returned %08x\n", res); + todo_wine ok(!control, "returned %p\n", control); + if (control) IUnknown_Release(control); + DestroyWindow(hwnd); + + hwnd = CreateWindowW(cls_names[i], randomW, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + todo_wine ok(!hwnd, "returned %p\n", hwnd); + if(hwnd) DestroyWindow(hwnd); + + hwnd = CreateWindowW(cls_names[i], progid1W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = NULL; + res = AtlAxGetControl(hwnd, &control); + ok(res == S_OK, "AtlAxGetControl failed with res %08x\n", res); + ok(control != NULL, "AtlAxGetControl failed!\n"); + IUnknown_Release(control); + DestroyWindow(hwnd); + + hwnd = CreateWindowW(cls_names[i], clsid1W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = NULL; + res = AtlAxGetControl(hwnd, &control); + ok(res == S_OK, "AtlAxGetControl failed with res %08x\n", res); + ok(control != NULL, "AtlAxGetControl failed!\n"); + IUnknown_Release(control); + DestroyWindow(hwnd); + + hwnd = CreateWindowW(cls_names[i], url1W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = NULL; + res = AtlAxGetControl(hwnd, &control); + ok(res == S_OK, "AtlAxGetControl failed with res %08x\n", res); + ok(control != NULL, "AtlAxGetControl failed!\n"); + IUnknown_Release(control); + DestroyWindow(hwnd); + + /* test html stream with "MSHTML:" prefix */ + hwnd = CreateWindowW(cls_names[i], mshtml1W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = NULL; + res = AtlAxGetControl(hwnd, &control); + ok(res == S_OK, "AtlAxGetControl failed with res %08x\n", res); + ok(control != NULL, "AtlAxGetControl failed!\n"); + IUnknown_Release(control); + DestroyWindow(hwnd); + + hwnd = CreateWindowW(cls_names[i], mshtml2W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = NULL; + res = AtlAxGetControl(hwnd, &control); + ok(res == S_OK, "AtlAxGetControl failed with res %08x\n", res); + ok(control != NULL, "AtlAxGetControl failed!\n"); + IUnknown_Release(control); + DestroyWindow(hwnd); + + /* test html stream without "MSHTML:" prefix */ + hwnd = CreateWindowW(cls_names[i], mshtml3W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + todo_wine ok(!hwnd, "returned %p\n", hwnd); + if(hwnd) DestroyWindow(hwnd); + + ret = GetTempPathW(MAX_PATH, pathW); + ok(ret, "GetTempPath failed!\n"); + lstrcatW(pathW, html_fileW); + hfile = CreateFileW(pathW, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to create file\n"); + ret = WriteFile(hfile, html_str, sizeof(html_str), &ret_size, NULL); + ok(ret, "WriteFile failed\n"); + CloseHandle(hfile); + + /* test C:// scheme */ + hwnd = CreateWindowW(cls_names[i], pathW, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = NULL; + res = AtlAxGetControl(hwnd, &control); + ok(res == S_OK, "AtlAxGetControl failed with res %08x\n", res); + ok(control != NULL, "AtlAxGetControl failed!\n"); + IUnknown_Release(control); + DestroyWindow(hwnd); + + /* test file:// scheme */ + lstrcpyW(file_uri1W, fileW); + lstrcatW(file_uri1W, pathW); + hwnd = CreateWindowW(cls_names[i], file_uri1W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = NULL; + res = AtlAxGetControl(hwnd, &control); + ok(res == S_OK, "AtlAxGetControl failed with res %08x\n", res); + ok(control != NULL, "AtlAxGetControl failed!\n"); + IUnknown_Release(control); + DestroyWindow(hwnd); + + /* test file:// scheme on non-existent file */ + ret = DeleteFileW(pathW); + ok(ret, "DeleteFile failed!\n"); + hwnd = CreateWindowW(cls_names[i], file_uri1W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = NULL; + res = AtlAxGetControl(hwnd, &control); + ok(res == S_OK, "AtlAxGetControl failed with res %08x\n", res); + ok(control != NULL, "AtlAxGetControl failed!\n"); + IUnknown_Release(control); + DestroyWindow(hwnd); + } + todo_wine ok(wndproc[0] != wndproc[1], "expected different proc!\n"); } START_TEST(atl)

1 0

Austin English : iphlpapi: Add FreeMibTable implementation.
by Alexandre Julliard 14 Jan '15

14 Jan '15

Module: wine Branch: master Commit: 44933230f63402ad079c8d22c024119f8d5228e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44933230f63402ad079c8d22c… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jan 12 14:50:43 2015 -0800 iphlpapi: Add FreeMibTable implementation. --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index fcb6d72..228f64f 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -66,7 +66,7 @@ #@ stub FlushIpNetTable2 @ stub FlushIpNetTableFromStack #@ stub FlushIpPathTable -#@ stub FreeMibTable +@ stdcall FreeMibTable( ptr ) @ stdcall GetAdapterIndex( wstr ptr ) @ stub GetAdapterOrderMap @ stdcall GetAdaptersAddresses( long long ptr ptr ptr ) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index f04e12a..59f3593 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -442,6 +442,20 @@ DWORD WINAPI FlushIpNetTable(DWORD dwIfIndex) return ERROR_NOT_SUPPORTED; } +/****************************************************************** + * FreeMibTable (IPHLPAPI.@) + * + * Free buffer allocated by network functions + * + * PARAMS + * ptr [In] pointer to the buffer to free + * + */ +void WINAPI FreeMibTable(void *ptr) +{ + TRACE("(%p)\n", ptr); + HeapFree(GetProcessHeap(), 0, ptr); +} /****************************************************************** * GetAdapterIndex (IPHLPAPI.@)

1 0

Jacek Caban : jscript: Don' t allow function execution if script engine is not in started state.
by Alexandre Julliard 14 Jan '15

14 Jan '15

Module: wine Branch: master Commit: 091738ffdf1cb2f71397fb37a9da2369cb945888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=091738ffdf1cb2f71397fb37a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 13 21:45:56 2015 +0100 jscript: Don't allow function execution if script engine is not in started state. --- dlls/jscript/function.c | 5 +++ dlls/jscript/tests/run.c | 84 ++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 79 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 276c4f9..43ade98 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -205,6 +205,11 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis scope_chain_t *scope; HRESULT hres; + if(ctx->state == SCRIPTSTATE_UNINITIALIZED || ctx->state == SCRIPTSTATE_CLOSED) { + WARN("Script engine state does not allow running code.\n"); + return E_UNEXPECTED; + } + if(!function->func_code) { FIXME("no source\n"); return E_FAIL; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index c0a62b8..fb313d5 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1908,7 +1908,7 @@ static void test_isvisible(BOOL global_members) IActiveScriptParse_Release(parser); } -static HRESULT parse_script_expr(const char *expr, VARIANT *res) +static HRESULT parse_script_expr(const char *expr, VARIANT *res, IActiveScript **engine_ret) { IActiveScriptParse *parser; IActiveScript *engine; @@ -1939,9 +1939,14 @@ static HRESULT parse_script_expr(const char *expr, VARIANT *res) hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, res, NULL); SysFreeString(str); - IActiveScript_Release(engine); IActiveScriptParse_Release(parser); + if(engine_ret) { + *engine_ret = engine; + }else { + IActiveScript_Close(engine); + IActiveScript_Release(engine); + } return hres; } @@ -1952,7 +1957,7 @@ static void test_default_value(void) VARIANT v; HRESULT hres; - hres = parse_script_expr("new Date()", &v); + hres = parse_script_expr("new Date()", &v, NULL); ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); disp = V_DISPATCH(&v); @@ -1976,38 +1981,38 @@ static void test_script_exprs(void) testing_expr = TRUE; - hres = parse_script_expr("true", &v); + hres = parse_script_expr("true", &v, NULL); ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); ok(V_BOOL(&v) == VARIANT_TRUE, "V_BOOL(v) = %x\n", V_BOOL(&v)); - hres = parse_script_expr("false, true", &v); + hres = parse_script_expr("false, true", &v, NULL); ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); ok(V_BOOL(&v) == VARIANT_TRUE, "V_BOOL(v) = %x\n", V_BOOL(&v)); SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); - hres = parse_script_expr("reportSuccess(); true", &v); + hres = parse_script_expr("reportSuccess(); true", &v, NULL); ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); ok(V_BOOL(&v) == VARIANT_TRUE, "V_BOOL(v) = %x\n", V_BOOL(&v)); CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); - hres = parse_script_expr("if(false) true", &v); + hres = parse_script_expr("if(false) true", &v, NULL); ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); ok(V_VT(&v) == VT_EMPTY, "V_VT(v) = %d\n", V_VT(&v)); - hres = parse_script_expr("return testPropGet", &v); + hres = parse_script_expr("return testPropGet", &v, NULL); ok(hres == 0x800a03fa, "parse_script_expr failed: %08x\n", hres); - hres = parse_script_expr("reportSuccess(); return true", &v); + hres = parse_script_expr("reportSuccess(); return true", &v, NULL); ok(hres == 0x800a03fa, "parse_script_expr failed: %08x\n", hres); SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); - hres = parse_script_expr("reportSuccess(); true", NULL); + hres = parse_script_expr("reportSuccess(); true", NULL, NULL); ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); @@ -2017,6 +2022,64 @@ static void test_script_exprs(void) testing_expr = FALSE; } +static void test_invokeex(void) +{ + DISPID func_id, prop_id; + DISPPARAMS dp = {NULL}; + IActiveScript *script; + IDispatchEx *dispex; + VARIANT v; + BSTR str; + HRESULT hres; + + hres = parse_script_expr("var o = {func: function() {return 3;}, prop: 6}; o", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + + hres = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + VariantClear(&v); + + str = a2bstr("func"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &func_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + + str = a2bstr("prop"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &prop_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + + hres = IDispatchEx_InvokeEx(dispex, func_id, 0, DISPATCH_METHOD, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 3, "V_I4(v) = %d\n", V_I4(&v)); + + hres = IDispatchEx_InvokeEx(dispex, prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 6, "V_I4(v) = %d\n", V_I4(&v)); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + + str = a2bstr("func"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &func_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + + hres = IDispatchEx_InvokeEx(dispex, func_id, 0, DISPATCH_METHOD, &dp, &v, NULL, NULL); + ok(hres == E_UNEXPECTED || broken(hres == 0x800a1393), "InvokeEx failed: %08x\n", hres); + + hres = IDispatchEx_InvokeEx(dispex, prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 6, "V_I4(v) = %d\n", V_I4(&v)); + + IDispatchEx_Release(dispex); + IActiveScript_Release(script); +} + struct bom_test { WCHAR str[1024]; @@ -2335,6 +2398,7 @@ static BOOL run_tests(void) ok(hres != S_OK, "ParseScriptText have not failed\n"); test_script_exprs(); + test_invokeex(); parse_script_with_error_a( "?",

1 0

Jacek Caban : jscript: Added more SCRIPTSTATE_STARTED tests.
by Alexandre Julliard 14 Jan '15

14 Jan '15

Module: wine Branch: master Commit: a2a57791cd72bb8fd4a7df7c53a5c4799cab78f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2a57791cd72bb8fd4a7df7c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 13 21:46:02 2015 +0100 jscript: Added more SCRIPTSTATE_STARTED tests. --- dlls/jscript/tests/run.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index fb313d5..1b895bb 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -139,6 +139,7 @@ DEFINE_EXPECT(DeleteMemberByDispID_false); #define DISPID_GLOBAL_TESTNORES 0x1019 #define DISPID_GLOBAL_DISPEXFUNC 0x101a #define DISPID_GLOBAL_TESTPROPPUTREF 0x101b +#define DISPID_GLOBAL_GETSCRIPTSTATE 0x101c #define DISPID_GLOBAL_TESTPROPDELETE 0x2000 #define DISPID_GLOBAL_TESTNOPROPDELETE 0x2001 @@ -161,6 +162,7 @@ static const char *test_name = "(null)"; static IDispatch *script_disp; static int invoke_version; static IActiveScriptError *script_error; +static IActiveScript *script_engine; static const CLSID *engine_clsid = &CLSID_JScript; /* Returns true if the user interface is in English. Note that this does not @@ -756,6 +758,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD return S_OK; } + if(!strcmp_wa(bstrName, "getScriptState")) { + *pid = DISPID_GLOBAL_GETSCRIPTSTATE; + return S_OK; + } + if(strict_dispid_check && strcmp_wa(bstrName, "t")) ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; @@ -1108,6 +1115,18 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; + case DISPID_GLOBAL_GETSCRIPTSTATE: { + SCRIPTSTATE state; + HRESULT hres; + + hres = IActiveScript_GetScriptState(script_engine, &state); + ok(hres == S_OK, "GetScriptState failed: %08x\n", hres); + + V_VT(pvarRes) = VT_I4; + V_I4(pvarRes) = state; + return S_OK; + } + case DISPID_GLOBAL_PROPARGPUT: CHECK_EXPECT(global_propargput_i); ok(wFlags == INVOKE_PROPERTYPUT, "wFlags = %x\n", wFlags); @@ -1908,6 +1927,47 @@ static void test_isvisible(BOOL global_members) IActiveScriptParse_Release(parser); } +static void test_start(void) +{ + IActiveScriptParse *parser; + IActiveScript *engine; + BSTR str; + HRESULT hres; + + script_engine = engine = create_script(); + if(!engine) + return; + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + hres = IActiveScriptParse_InitNew(parser); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + + hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + + hres = IActiveScript_AddNamedItem(engine, testW, SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); + ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); + + str = a2bstr("ok(getScriptState() === 5, \"getScriptState = \" + getScriptState());\n" + "reportSuccess();"); + hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + SysFreeString(str); + + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + + IActiveScript_Release(engine); + IActiveScriptParse_Release(parser); + script_engine = NULL; +} + static HRESULT parse_script_expr(const char *expr, VARIANT *res, IActiveScript **engine_ret) { IActiveScriptParse *parser; @@ -2380,6 +2440,7 @@ static BOOL run_tests(void) test_isvisible(FALSE); test_isvisible(TRUE); + test_start(); parse_script_af(0, "test.testThis2(this);"); parse_script_af(0, "(function () { test.testThis2(this); })();");

1 0