January 2009 - Wine-commits

Alexandre Julliard : jscript/tests: Don' t crash if we fail to get the IActiveScriptParse interface.
by Alexandre Julliard 05 Jan '09

05 Jan '09

Module: wine Branch: master Commit: 57a1a147a6b8187a830a525cdd66ad12d6d70634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57a1a147a6b8187a830a525cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 5 15:50:36 2009 +0100 jscript/tests: Don't crash if we fail to get the IActiveScriptParse interface. --- dlls/jscript/tests/jscript.c | 10 ++++++++++ dlls/jscript/tests/run.c | 10 ++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 4cc01c9..ac65058 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -295,6 +295,11 @@ static void test_jscript(void) hres = IUnknown_QueryInterface(unk, &IID_IActiveScriptParse, (void**)&parse); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + if (FAILED(hres)) + { + IActiveScript_Release(script); + return; + } test_state(script, SCRIPTSTATE_UNINITIALIZED); test_safety(unk); @@ -366,6 +371,11 @@ static void test_jscript2(void) hres = IUnknown_QueryInterface(unk, &IID_IActiveScriptParse, (void**)&parse); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + if (FAILED(hres)) + { + IActiveScript_Release(script); + return; + } test_state(script, SCRIPTSTATE_UNINITIALIZED); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 81de579..66c312e 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -574,6 +574,11 @@ static void parse_script(BSTR script_str) hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + if (FAILED(hres)) + { + IActiveScript_Release(engine); + return; + } hres = IActiveScriptParse_InitNew(parser); ok(hres == S_OK, "InitNew failed: %08x\n", hres); @@ -696,6 +701,11 @@ static void test_isvisible(BOOL global_members) hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + if (FAILED(hres)) + { + IActiveScript_Release(engine); + return; + } hres = IActiveScriptParse_InitNew(parser); ok(hres == S_OK, "InitNew failed: %08x\n", hres);

1 0

Alexandre Julliard : include: Fix 64-bit sign extension in the MAKEWPARAM/ LPARAM macros.
by Alexandre Julliard 05 Jan '09

05 Jan '09

Module: wine Branch: master Commit: fec03d2bcc76e7c64f32223e0ca8eba2d3d1d430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec03d2bcc76e7c64f32223e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 5 16:08:17 2009 +0100 include: Fix 64-bit sign extension in the MAKEWPARAM/LPARAM macros. --- include/winuser.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index fd91d92..3f202b1 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2078,9 +2078,9 @@ typedef struct tagMSG #define POINTSTOPOINT(pt, pts) { (pt).x = (pts).x; (pt).y = (pts).y; } #define POINTTOPOINTS(pt) (MAKELONG((short)((pt).x), (short)((pt).y))) -#define MAKELPARAM(low,high) ((LPARAM)MAKELONG(low,high)) -#define MAKEWPARAM(low,high) ((WPARAM)MAKELONG(low,high)) -#define MAKELRESULT(low,high) ((LRESULT)MAKELONG(low,high)) +#define MAKELPARAM(low,high) ((LPARAM)(DWORD)MAKELONG(low,high)) +#define MAKEWPARAM(low,high) ((WPARAM)(DWORD)MAKELONG(low,high)) +#define MAKELRESULT(low,high) ((LRESULT)(DWORD)MAKELONG(low,high)) /* Cursors / Icons */

1 0

Paul Vriens : shell32/tests: Fix some test failures on Vista and W2K8.
by Alexandre Julliard 05 Jan '09

05 Jan '09

Module: wine Branch: master Commit: d1d0e335cf9e1d94734b9bfd2a19755874bcb847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1d0e335cf9e1d94734b9bfd2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jan 5 15:17:04 2009 +0100 shell32/tests: Fix some test failures on Vista and W2K8. --- dlls/shell32/tests/shlfileop.c | 159 +++++++++++++++++++++++++++++++--------- 1 files changed, 125 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1d0e335cf9e1d94734b9…

1 0

Alexandre Julliard : crypt32/tests: Fix handle size in CERT_KEY_PROV_HANDLE_PROP_ID for Win64.
by Alexandre Julliard 05 Jan '09

05 Jan '09

Module: wine Branch: master Commit: 7181c38dccf5e4e50e5fd0e5deb07e68049616dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7181c38dccf5e4e50e5fd0e5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 5 15:44:37 2009 +0100 crypt32/tests: Fix handle size in CERT_KEY_PROV_HANDLE_PROP_ID for Win64. --- dlls/crypt32/tests/cert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index c26398b..69e7ce6 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -551,7 +551,7 @@ static void testCertProperties(void) ok(ret, "CertSetCertificateContextProperty failed: %08x\n", GetLastError()); /* Now that that's set, the key prov handle property is also gettable. */ - size = sizeof(DWORD); + size = sizeof(keyContext.hCryptProv); ret = CertGetCertificateContextProperty(context, CERT_KEY_PROV_HANDLE_PROP_ID, &keyContext.hCryptProv, &size); ok(ret, "Expected to get the CERT_KEY_PROV_HANDLE_PROP_ID, got %08x\n",

1 0

Alexandre Julliard : include: Fix the PROCESS_MEMORY_COUNTERS structure definition for Win64.
by Alexandre Julliard 05 Jan '09

05 Jan '09

Module: wine Branch: master Commit: b11507ebca583a8b707d5427164abd1034ac2a0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b11507ebca583a8b707d54271… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 5 15:44:53 2009 +0100 include: Fix the PROCESS_MEMORY_COUNTERS structure definition for Win64. --- include/psapi.h | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/psapi.h b/include/psapi.h index bb7d1cf..f031724 100644 --- a/include/psapi.h +++ b/include/psapi.h @@ -28,16 +28,16 @@ typedef struct _MODULEINFO { } MODULEINFO, *LPMODULEINFO; typedef struct _PROCESS_MEMORY_COUNTERS { - DWORD cb; - DWORD PageFaultCount; - DWORD PeakWorkingSetSize; - DWORD WorkingSetSize; - DWORD QuotaPeakPagedPoolUsage; - DWORD QuotaPagedPoolUsage; - DWORD QuotaPeakNonPagedPoolUsage; - DWORD QuotaNonPagedPoolUsage; - DWORD PagefileUsage; - DWORD PeakPagefileUsage; + DWORD cb; + DWORD PageFaultCount; + SIZE_T PeakWorkingSetSize; + SIZE_T WorkingSetSize; + SIZE_T QuotaPeakPagedPoolUsage; + SIZE_T QuotaPagedPoolUsage; + SIZE_T QuotaPeakNonPagedPoolUsage; + SIZE_T QuotaNonPagedPoolUsage; + SIZE_T PagefileUsage; + SIZE_T PeakPagefileUsage; } PROCESS_MEMORY_COUNTERS; typedef PROCESS_MEMORY_COUNTERS *PPROCESS_MEMORY_COUNTERS;

1 0

Alexandre Julliard : mshtml/tests: Fix the platform test for Win64.
by Alexandre Julliard 05 Jan '09

05 Jan '09

Module: wine Branch: master Commit: 19184f00716fbc528301d6d83d76389357380d7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=19184f00716fbc528301d6d83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 5 15:37:39 2009 +0100 mshtml/tests: Fix the platform test for Win64. --- dlls/mshtml/tests/dom.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index de363bb..ee2a5ca 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2245,7 +2245,11 @@ static void test_navigator(IHTMLDocument2 *doc) bstr = NULL; hres = IOmNavigator_get_platform(navigator, &bstr); ok(hres == S_OK, "get_platform failed: %08x\n", hres); +#ifdef _WIN64 + ok(!strcmp_wa(bstr, "Win64"), "unexpected platform %s\n", dbgstr_w(bstr)); +#else ok(!strcmp_wa(bstr, "Win32"), "unexpected platform %s\n", dbgstr_w(bstr)); +#endif SysFreeString(bstr); bstr = NULL;

1 0

Alexandre Julliard : ole32/tests: Fix a structure size check for Win64.
by Alexandre Julliard 05 Jan '09

05 Jan '09

Module: wine Branch: master Commit: e793a2ba35649919fdd8db101bde3e86fdc7fdb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e793a2ba35649919fdd8db101… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 5 15:37:48 2009 +0100 ole32/tests: Fix a structure size check for Win64. --- dlls/ole32/tests/moniker.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 1b7bcc3..b959e74 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1750,7 +1750,7 @@ static void test_bind_context(void) hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); ok_ole_success(hr, "IBindCtx_GetBindOptions"); ok(bind_opts.cbStruct == sizeof(bind_opts) || - bind_opts.cbStruct == 36, /* Vista */ + bind_opts.cbStruct == sizeof(bind_opts) + sizeof(void*), /* Vista */ "bind_opts.cbStruct was %d\n", bind_opts.cbStruct); bind_opts.cbStruct = sizeof(BIND_OPTS);

1 0

Paul Vriens : d3d8/tests: Fix a test failure on VMware and VirtualBox.
by Alexandre Julliard 05 Jan '09

05 Jan '09

Module: wine Branch: master Commit: 49da5031c238d2a5644f5651b42e2a13a9584667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49da5031c238d2a5644f5651b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jan 5 12:46:05 2009 +0100 d3d8/tests: Fix a test failure on VMware and VirtualBox. --- dlls/d3d8/tests/stateblock.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index fbb8248..a6ad662 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -61,7 +61,8 @@ static HRESULT init_d3d8(HMODULE d3d8_module, IDirect3DDevice8 **device, D3DPRES hr = IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, device_pparams, device); - ok(SUCCEEDED(hr) || hr == D3DERR_NOTAVAILABLE, "IDirect3D8_CreateDevice failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr) || hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), + "IDirect3D8_CreateDevice failed, hr %#x.\n", hr); return hr; } @@ -1540,7 +1541,11 @@ START_TEST(stateblock) } hr = init_d3d8(d3d8_module, &device, &device_pparams); - if (FAILED(hr)) return; + if (FAILED(hr)) + { + FreeLibrary(d3d8_module); + return; + } test_begin_end_state_block(device); test_state_management(device, &device_pparams); @@ -1548,4 +1553,6 @@ START_TEST(stateblock) refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left\n", refcount); + + FreeLibrary(d3d8_module); }

1 0

Paul Vriens : shdocvw/tests: Fix test failures on XP SP2 and higher.
by Alexandre Julliard 05 Jan '09

05 Jan '09

Module: wine Branch: master Commit: 10b2d6db04200dc2986e9698ebab465d509dd1f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b2d6db04200dc2986e9698e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jan 5 13:11:26 2009 +0100 shdocvw/tests: Fix test failures on XP SP2 and higher. --- dlls/shdocvw/tests/shdocvw.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/shdocvw/tests/shdocvw.c b/dlls/shdocvw/tests/shdocvw.c index 963b9a8..8e7b1f3 100644 --- a/dlls/shdocvw/tests/shdocvw.c +++ b/dlls/shdocvw/tests/shdocvw.c @@ -251,9 +251,10 @@ static void test_ParseURLFromOutsideSourceA(void) len = maxlen-1; dummy = 0; res = pParseURLFromOutsideSourceA(ParseURL_table[i].url, buffer, &len, &dummy); - ok( res == 0 && len == ParseURL_table[i].len + 1, - "#%d (-1): got %d and %d (expected '0' and %d)\n", - i, res, len, ParseURL_table[i].len + 1); + /* len includes the terminating 0 on XP SP1 and before, when the buffer is too small */ + ok( res == 0 && (len == ParseURL_table[i].len || len == ParseURL_table[i].len + 1), + "#%d (-1): got %d and %d (expected '0' and %d or %d)\n", + i, res, len, ParseURL_table[i].len, ParseURL_table[i].len + 1); memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; @@ -341,9 +342,10 @@ static void test_ParseURLFromOutsideSourceW(void) len = maxlen - 1; dummy = 0; res = pParseURLFromOutsideSourceW(urlW, bufferW, &len, &dummy); - ok( res == 0 && len == ParseURL_table[0].len + 1, - "-1: got %d and %d (expected '0' and %d)\n", - res, len, ParseURL_table[0].len + 1); + /* len includes the terminating 0 on XP SP1 and before, when the buffer is too small */ + ok( res == 0 && (len == ParseURL_table[0].len || len == ParseURL_table[0].len + 1), + "-1: got %d and %d (expected '0' and %d or %d)\n", + res, len, ParseURL_table[0].len, ParseURL_table[0].len + 1); }

1 0

Alexandre Julliard : urlmon/tests: Fix an uninitialized variable check for Win64.
by Alexandre Julliard 05 Jan '09

05 Jan '09

Module: wine Branch: master Commit: 4deb0ada754448ef91183bfcfa9950e5f97ddf3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4deb0ada754448ef91183bfcf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 5 15:20:15 2009 +0100 urlmon/tests: Fix an uninitialized variable check for Win64. --- dlls/urlmon/tests/misc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 6d3305e..1de010d 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1305,18 +1305,20 @@ static void test_ReleaseBindInfo(void) static void test_CopyStgMedium(void) { STGMEDIUM src, dst; + HGLOBAL empty; HRESULT hres; static WCHAR fileW[] = {'f','i','l','e',0}; memset(&src, 0xf0, sizeof(src)); memset(&dst, 0xe0, sizeof(dst)); + memset(&empty, 0xf0, sizeof(empty)); src.tymed = TYMED_NULL; src.pUnkForRelease = NULL; hres = CopyStgMedium(&src, &dst); ok(hres == S_OK, "CopyStgMedium failed: %08x\n", hres); ok(dst.tymed == TYMED_NULL, "tymed=%d\n", dst.tymed); - ok(dst.u.hGlobal == (void*)0xf0f0f0f0, "u=%p\n", dst.u.hGlobal); + ok(dst.u.hGlobal == empty, "u=%p\n", dst.u.hGlobal); ok(!dst.pUnkForRelease, "pUnkForRelease=%p, expected NULL\n", dst.pUnkForRelease); memset(&dst, 0xe0, sizeof(dst));

1 0