December 2009 - Wine-commits

Nikolay Sivov : gdiplus/tests: Delete Pen object after use.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 5b7fae2ea8052856899235e3e19198bac563e1e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b7fae2ea8052856899235e3e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Dec 5 22:37:35 2009 +0300 gdiplus/tests: Delete Pen object after use. --- dlls/gdiplus/tests/graphicspath.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 6e257eb..cbcf390 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -415,6 +415,8 @@ static void test_worldbounds(void) expectf(-1274.8, bounds.Y); expectf(705.0, bounds.Width); expectf(945.0, bounds.Height); + + GdipDeletePen(pen); } static path_test_t pathpath_path[] = {

1 0

Huw Davies : oleaut32: Fix several memory leaks in tests.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 0099431f084d632964bb129fab41962237ea117d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0099431f084d632964bb129fa… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun Dec 6 13:11:33 2009 +0000 oleaut32: Fix several memory leaks in tests. Found by Valgrind. --- dlls/oleaut32/tests/vartype.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 87f2901..7e7fe35 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4855,6 +4855,7 @@ static void test_VarBstrFromR4(void) */ ok(memcmp(bstr, szNative, sizeof(szNative)) == 0, "string different\n"); } + SysFreeString(bstr); } f = -0.0; @@ -4866,6 +4867,7 @@ static void test_VarBstrFromR4(void) ok(memcmp(bstr + 1, szZero, sizeof(szZero)) == 0, "negative zero (got %s)\n", wtoascii(bstr)); else ok(memcmp(bstr, szZero, sizeof(szZero)) == 0, "negative zero (got %s)\n", wtoascii(bstr)); + SysFreeString(bstr); } /* The following tests that lcid is used for decimal separator even without LOCALE_USE_NLS */ @@ -4875,6 +4877,7 @@ static void test_VarBstrFromR4(void) if (bstr) { ok(memcmp(bstr, szOneHalf_English, sizeof(szOneHalf_English)) == 0, "English locale failed (got %s)\n", wtoascii(bstr)); + SysFreeString(bstr); } f = 0.5; hres = pVarBstrFromR4(f, lcid_spanish, LOCALE_NOUSEROVERRIDE, &bstr); @@ -4882,12 +4885,13 @@ static void test_VarBstrFromR4(void) if (bstr) { ok(memcmp(bstr, szOneHalf_Spanish, sizeof(szOneHalf_Spanish)) == 0, "Spanish locale failed (got %s)\n", wtoascii(bstr)); + SysFreeString(bstr); } } #define BSTR_DATE(dt,str) SysFreeString(bstr); bstr = NULL; \ hres = pVarBstrFromDate(dt,lcid,LOCALE_NOUSEROVERRIDE,&bstr); \ - if (bstr) WideCharToMultiByte(CP_ACP, 0, bstr, -1, buff, sizeof(buff), 0, 0); \ + if (bstr) {WideCharToMultiByte(CP_ACP, 0, bstr, -1, buff, sizeof(buff), 0, 0); SysFreeString(bstr);} \ else buff[0] = 0; \ ok(hres == S_OK && !strcmp(str,buff), "Expected '%s', got '%s', hres = 0x%08x\n", \ str, buff, hres) @@ -4920,6 +4924,7 @@ static void test_VarBstrFromDate(void) if (hres== S_OK && bstr)\ {\ ok(lstrcmpW(bstr, e) == 0, "invalid number (got %s)\n", wtoascii(bstr));\ + SysFreeString(bstr);\ } static void test_VarBstrFromCy(void) @@ -4982,6 +4987,7 @@ static void test_VarBstrFromCy(void) if (hres== S_OK && bstr)\ {\ ok(lstrcmpW(bstr, e) == 0, "invalid number (got %s)\n", wtoascii(bstr));\ + SysFreeString(bstr);\ } #define BSTR_DEC64(l, a, b, c, x, d, e) \ @@ -4991,6 +4997,7 @@ static void test_VarBstrFromCy(void) if (hres== S_OK && bstr)\ {\ ok(lstrcmpW(bstr, e) == 0, "invalid number (got %s)\n", wtoascii(bstr));\ + SysFreeString(bstr);\ } static void test_VarBstrFromDec(void) @@ -5162,6 +5169,7 @@ static void test_VarBstrCmp(void) VARBSTRCMP(bstr2,bstr,0,VARCMP_GT); SysFreeString(bstr2); SysFreeString(bstr); + SysFreeString(bstrempty); } /* Get the internal representation of a BSTR */ @@ -5858,6 +5866,7 @@ static void test_EmptyChangeTypeEx(void) ok(hres == hExpected && (hres != S_OK || V_VT(&vDst) == vt), "change empty: vt %d expected 0x%08x, got 0x%08x, vt %d\n", vt, hExpected, hres, V_VT(&vDst)); + if(hres == S_OK) VariantClear(&vDst); } }

1 0

Huw Davies : ntdll: Fix a few memory leaks in tests.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 1cc0dd5c57f027bf6aa8277f73d6c0e2c6493685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc0dd5c57f027bf6aa8277f7… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun Dec 6 15:02:55 2009 +0000 ntdll: Fix a few memory leaks in tests. Found by Valgrind. --- dlls/ntdll/tests/rtlstr.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index ad9c5a1..80e9efa 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -46,6 +46,7 @@ static NTSTATUS (WINAPI *pRtlDuplicateUnicodeString)(long, UNICODE_STRING *, UNI static BOOLEAN (WINAPI *pRtlEqualUnicodeString)(const UNICODE_STRING *, const UNICODE_STRING *, BOOLEAN); static NTSTATUS (WINAPI *pRtlFindCharInUnicodeString)(int, const UNICODE_STRING *, const UNICODE_STRING *, USHORT *); static VOID (WINAPI *pRtlFreeAnsiString)(PSTRING); +static VOID (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); static VOID (WINAPI *pRtlInitAnsiString)(PSTRING, LPCSTR); static VOID (WINAPI *pRtlInitString)(PSTRING, LPCSTR); static VOID (WINAPI *pRtlInitUnicodeString)(PUNICODE_STRING, LPCWSTR); @@ -65,7 +66,6 @@ static NTSTATUS (WINAPI *pRtlStringFromGUID)(const GUID*, UNICODE_STRING*); static BOOLEAN (WINAPI *pRtlIsTextUnicode)(LPVOID, INT, INT *); /*static VOID (WINAPI *pRtlFreeOemString)(PSTRING);*/ -/*static VOID (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING);*/ /*static VOID (WINAPI *pRtlCopyUnicodeString)(UNICODE_STRING *, const UNICODE_STRING *);*/ /*static VOID (WINAPI *pRtlEraseUnicodeString)(UNICODE_STRING *);*/ /*static LONG (WINAPI *pRtlCompareString)(const STRING *,const STRING *,BOOLEAN);*/ @@ -114,6 +114,7 @@ static void InitFunctionPtrs(void) pRtlEqualUnicodeString = (void *)GetProcAddress(hntdll, "RtlEqualUnicodeString"); pRtlFindCharInUnicodeString = (void *)GetProcAddress(hntdll, "RtlFindCharInUnicodeString"); pRtlFreeAnsiString = (void *)GetProcAddress(hntdll, "RtlFreeAnsiString"); + pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); pRtlInitAnsiString = (void *)GetProcAddress(hntdll, "RtlInitAnsiString"); pRtlInitString = (void *)GetProcAddress(hntdll, "RtlInitString"); pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString"); @@ -467,6 +468,7 @@ static void test_RtlDuplicateUnicodeString(void) ok(memcmp(dest_str.Buffer, res_str.Buffer, dupl_ustr[test_num].res_buf_size) == 0, "(test %d): RtlDuplicateUnicodeString(%d, source, dest) has destination \"%s\" expected \"%s\"\n", test_num, dupl_ustr[test_num].add_nul, dest_ansi_str.Buffer, dupl_ustr[test_num].res_buf); + pRtlFreeUnicodeString(&dest_str); } else { ok(dest_str.Buffer == NULL && dupl_ustr[test_num].res_buf == NULL, "(test %d): RtlDuplicateUnicodeString(%d, source, dest) has destination %p expected %p\n", @@ -794,6 +796,8 @@ static void test_RtlUnicodeStringToAnsiString(void) ok(memcmp(ansi_str.Buffer, ustr2astr[test_num].res_buf, ustr2astr[test_num].res_buf_size) == 0, "(test %d): RtlUnicodeStringToAnsiString(ansi, uni, %d) has ansi \"%s\" expected \"%s\"\n", test_num, ustr2astr[test_num].doalloc, ansi_str.Buffer, ustr2astr[test_num].res_buf); + if(result == STATUS_SUCCESS && ustr2astr[test_num].doalloc) + pRtlFreeAnsiString(&ansi_str); } } @@ -1850,6 +1854,7 @@ static void test_RtlStringFromGUID(void) ret = pRtlStringFromGUID(&IID_Endianess, &str); ok(ret == 0, "expected ret=0, got 0x%0x\n", ret); ok(str.Buffer && !lstrcmpiW(str.Buffer, szGuid), "Endianess broken\n"); + pRtlFreeUnicodeString(&str); } START_TEST(rtlstr)

1 0

Nikolay Sivov : msvcrt/tests: Free temporary file name after test.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: e5e17ca438475fcc95bad6171e9c35dff583100d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e17ca438475fcc95bad6171… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Dec 6 18:58:28 2009 +0300 msvcrt/tests: Free temporary file name after test. --- dlls/msvcrt/tests/file.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index e652985..e164555 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -439,6 +439,7 @@ static void test_fgetc( void ) ok(ich == ret, "Second fgetc expected %x got %x\n", ich, ret); fclose(tempfh); unlink(tempf); + free(tempf); } static void test_fputc( void ) @@ -463,6 +464,7 @@ static void test_fputc( void ) fclose(tempfh); unlink(tempf); + free(tempf); } static void test_flsbuf( void ) @@ -517,6 +519,7 @@ static void test_flsbuf( void ) fclose(tempfh); unlink(tempf); + free(tempf); } static void test_fgetwc( void ) @@ -634,6 +637,7 @@ static void test_fgetwc( void ) free(mytextW); fclose(tempfh); unlink(tempf); + free(tempf); } static void test_ctrlz( void ) @@ -681,6 +685,7 @@ static void test_ctrlz( void ) ok(feof(tempfh), "did not get EOF\n"); fclose(tempfh); unlink(tempf); + free(tempf); } static void test_file_put_get( void ) @@ -730,6 +735,7 @@ static void test_file_put_get( void ) free(mytextW); fclose(tempfh); unlink(tempf); + free(tempf); } static void test_file_write_read( void ) @@ -806,6 +812,7 @@ static void test_file_write_read( void ) ret = unlink(tempf); ok( ret == 0 ,"Can't unlink '%s': %d\n", tempf, errno); + free(tempf); tempf=_tempnam(".","wne"); tempfd = _open(tempf,_O_CREAT|_O_TRUNC|_O_BINARY|_O_RDWR,0); @@ -833,6 +840,7 @@ static void test_file_write_read( void ) "Can't chmod '%s' to read-write: %d\n", tempf, errno); ret = unlink(tempf); ok( ret == 0 ,"Can't unlink '%s': %d\n", tempf, errno); + free(tempf); } static void test_file_inherit_child(const char* fd_s) @@ -1080,6 +1088,7 @@ static void test_chsize( void ) _close( fd ); _unlink( tempfile ); + free( tempfile ); } static void test_fopen_fclose_fcloseall( void )

1 0

Huw Davies : setupapi: Fix memory leak.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 63231be8044441218fb82899e748900e1ace3d0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=63231be8044441218fb82899e… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun Dec 6 17:04:00 2009 +0000 setupapi: Fix memory leak. Found by Valgrind. --- dlls/setupapi/queue.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index 6c9ca64..6a2b8d6 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -722,8 +722,9 @@ BOOL WINAPI SetupQueueCopySectionW( HSPFILEQ queue, PCWSTR src_root, HINF hinf, { SP_FILE_COPY_PARAMS_W params; INFCONTEXT context; - WCHAR dest[MAX_PATH], src[MAX_PATH]; + WCHAR dest[MAX_PATH], src[MAX_PATH], *dest_dir; INT flags; + BOOL ret = FALSE; TRACE( "hinf=%p/%p section=%s root=%s\n", hinf, hlist, debugstr_w(section), debugstr_w(src_root) ); @@ -742,18 +743,21 @@ BOOL WINAPI SetupQueueCopySectionW( HSPFILEQ queue, PCWSTR src_root, HINF hinf, if (!hlist) hlist = hinf; if (!hinf) hinf = hlist; if (!SetupFindFirstLineW( hlist, section, NULL, &context )) return FALSE; - if (!(params.TargetDirectory = get_destination_dir( hinf, section ))) return FALSE; + if (!(params.TargetDirectory = dest_dir = get_destination_dir( hinf, section ))) return FALSE; do { if (!SetupGetStringFieldW( &context, 1, dest, sizeof(dest)/sizeof(WCHAR), NULL )) - return FALSE; + goto end; if (!SetupGetStringFieldW( &context, 2, src, sizeof(src)/sizeof(WCHAR), NULL )) *src = 0; if (!SetupGetIntField( &context, 4, &flags )) flags = 0; /* FIXME */ params.SourceFilename = *src ? src : NULL; - if (!SetupQueueCopyIndirectW( &params )) return FALSE; + if (!SetupQueueCopyIndirectW( &params )) goto end; } while (SetupFindNextLine( &context, &context )); - return TRUE; + ret = TRUE; +end: + HeapFree(GetProcessHeap(), 0, dest_dir); + return ret; }

1 0

Paul Vriens : advapi32/tests: Fix some test failures when the computername is fully qualified.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 19f4c42f99b119dbf8fa2419445a9257d8d09b7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=19f4c42f99b119dbf8fa24194… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Dec 6 18:32:06 2009 +0100 advapi32/tests: Fix some test failures when the computername is fully qualified. --- dlls/advapi32/tests/eventlog.c | 39 +++++++++++++++++++++++++++++---------- 1 files changed, 29 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 207fec5..a781c06 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -31,6 +31,8 @@ static BOOL (WINAPI *pCreateWellKnownSid)(WELL_KNOWN_SID_TYPE,PSID,PSID,DWORD*); static BOOL (WINAPI *pGetEventLogInformation)(HANDLE,DWORD,LPVOID,DWORD,LPDWORD); + +static BOOL (WINAPI *pGetComputerNameExA)(COMPUTER_NAME_FORMAT,LPSTR,LPDWORD); static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(PVOID *); static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(PVOID); @@ -42,6 +44,7 @@ static void init_function_pointers(void) pCreateWellKnownSid = (void*)GetProcAddress(hadvapi32, "CreateWellKnownSid"); pGetEventLogInformation = (void*)GetProcAddress(hadvapi32, "GetEventLogInformation"); + pGetComputerNameExA = (void*)GetProcAddress(hkernel32, "GetComputerNameExA"); pWow64DisableWow64FsRedirection = (void*)GetProcAddress(hkernel32, "Wow64DisableWow64FsRedirection"); pWow64RevertWow64FsRedirection = (void*)GetProcAddress(hkernel32, "Wow64RevertWow64FsRedirection"); } @@ -709,8 +712,8 @@ static void test_readwrite(void) BOOL ret, sidavailable; BOOL on_vista = FALSE; /* Used to indicate Vista, W2K8 or Win7 */ int i; - char localcomputer[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD len = sizeof(localcomputer); + char *localcomputer; + DWORD size; if (pCreateWellKnownSid) { @@ -727,7 +730,23 @@ static void test_readwrite(void) user = NULL; } - GetComputerNameA(localcomputer, &len); + if (pGetComputerNameExA) + { + size = 0; + SetLastError(0xdeadbeef); + pGetComputerNameExA(ComputerNameDnsFullyQualified, NULL, &size); + /* Cope with W2K (needed size is not set) */ + if (size == 0 && GetLastError() == ERROR_MORE_DATA) + size = 1024; + localcomputer = HeapAlloc(GetProcessHeap(), 0, size); + pGetComputerNameExA(ComputerNameDnsFullyQualified, localcomputer, &size); + } + else + { + size = MAX_COMPUTERNAME_LENGTH + 1; + localcomputer = HeapAlloc(GetProcessHeap(), 0, size); + GetComputerNameA(localcomputer, &size); + } /* Write an event with an incorrect event type. This will fail on Windows 7 * but succeed on all others, hence it's not part of the struct. @@ -737,8 +756,7 @@ static void test_readwrite(void) { /* Intermittently seen on NT4 when tests are run immediately after boot */ win_skip("Could not get a handle to the eventlog\n"); - HeapFree(GetProcessHeap(), 0, user); - return; + goto cleanup; } count = 0xdeadbeef; @@ -756,9 +774,8 @@ static void test_readwrite(void) if (count != 0) { win_skip("We didn't open our new eventlog\n"); - HeapFree(GetProcessHeap(), 0, user); CloseEventLog(handle); - return; + goto cleanup; } } @@ -854,7 +871,7 @@ static void test_readwrite(void) if (count == 0) { skip("No events were written to the eventlog\n"); - return; + goto cleanup; } /* Report only once */ @@ -962,8 +979,6 @@ static void test_readwrite(void) } CloseEventLog(handle); - HeapFree(GetProcessHeap(), 0, user); - /* Test clearing a real eventlog */ handle = OpenEventLogA(NULL, eventlogname); @@ -977,6 +992,10 @@ static void test_readwrite(void) ok(count == 0, "Expected an empty eventlog, got %d records\n", count); CloseEventLog(handle); + +cleanup: + HeapFree(GetProcessHeap(), 0, localcomputer); + HeapFree(GetProcessHeap(), 0, user); } /* Before Vista:

1 0

André Hentschel : xcopy: Fix time acronyms in German translation.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 9f9635d2a27d1477b71d2650f647f91d1b894b11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f9635d2a27d1477b71d2650f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 6 21:42:21 2009 +0100 xcopy: Fix time acronyms in German translation. --- programs/xcopy/De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/De.rc b/programs/xcopy/De.rc index c13addf..cd6e1b9 100644 --- a/programs/xcopy/De.rc +++ b/programs/xcopy/De.rc @@ -75,7 +75,7 @@ Mit:\n\ [/C] Nach Fehlern den Kopiervorgang fortsetzen\n\ [/A] Nur Dateien mit Archivbit kopieren\n\ [/M] Nur Dateien mit Archivbit kopieren, danach Archivbit löschen\n\ -[/D | /D:m-d-y] Kopiere neue Dateien und Dateien, die neuer als das\n\ +[/D | /D:M-T-J] Kopiere neue Dateien und Dateien, die neuer als das\n\ \t\tangegebene Datum sind. Wird kein Datum angegegebn, werden nur\n\ \t\tQuelldateien kopiert, die neuer sind als die Zieldatei\n\n"

1 0

Jacek Caban : mshtml: Don' t pass fdexNameEnsure flag to script engines in find_global_prop.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: f3d805862a60ca296f0579ff3f8f4957fdcf370c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3d805862a60ca296f0579ff3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 6 22:10:07 2009 +0100 mshtml: Don't pass fdexNameEnsure flag to script engines in find_global_prop. --- dlls/mshtml/script.c | 2 +- dlls/mshtml/tests/script.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 7df0dd6..efd2605 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -895,7 +895,7 @@ BOOL find_global_prop(HTMLWindow *window, BSTR name, DWORD flags, ScriptHost **r hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); if(SUCCEEDED(hres)) { - hres = IDispatchEx_GetDispID(dispex, name, flags, ret_id); + hres = IDispatchEx_GetDispID(dispex, name, flags & (~fdexNameEnsure), ret_id); IDispatchEx_Release(dispex); }else { FIXME("No IDispatchEx\n"); diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 22ed48e..d8dce6a 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -115,6 +115,7 @@ DEFINE_EXPECT(funcDisp); DEFINE_EXPECT(script_divid_d); DEFINE_EXPECT(script_testprop_d); DEFINE_EXPECT(script_testprop_i); +DEFINE_EXPECT(script_testprop2_d); DEFINE_EXPECT(AXQueryInterface_IActiveScript); DEFINE_EXPECT(AXQueryInterface_IObjectSafety); DEFINE_EXPECT(AXGetInterfaceSafetyOptions); @@ -124,6 +125,7 @@ DEFINE_EXPECT(AXSetInterfaceSafetyOptions); #define TESTACTIVEX_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80646}" #define DISPID_SCRIPT_TESTPROP 0x100000 +#define DISPID_SCRIPT_TESTPROP2 0x100001 static const GUID CLSID_TestScript = {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x07,0x46}}; @@ -394,6 +396,13 @@ static HRESULT WINAPI scriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW return S_OK; } + if(!strcmp_wa(bstrName, "testProp2")) { + CHECK_EXPECT(script_testprop2_d); + ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); + *pid = DISPID_SCRIPT_TESTPROP2; + return S_OK; + } + if(!strcmp_wa(bstrName, "divid")) { CHECK_EXPECT(script_divid_d); ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); @@ -1212,6 +1221,16 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac CHECK_CALLED(GetScriptDispatch); CHECK_CALLED(script_testprop_i); + SET_EXPECT(GetScriptDispatch); + SET_EXPECT(script_testprop2_d); + tmp = a2bstr("testProp2"); + hres = IDispatchEx_GetDispID(window_dispex, tmp, fdexNameCaseSensitive|fdexNameEnsure, &id); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + ok(id != DISPID_SCRIPT_TESTPROP2, "id == DISPID_SCRIPT_TESTPROP2\n"); + CHECK_CALLED(GetScriptDispatch); + CHECK_CALLED(script_testprop2_d); + SysFreeString(tmp); + test_global_id(); test_security();

1 0

Jacek Caban : mshtml: Added test for setting VT_EMPTY event handler.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: f1a543d5469457ca63b284ab2ec65b4063f8d4c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1a543d5469457ca63b284ab2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 6 22:10:24 2009 +0100 mshtml: Added test for setting VT_EMPTY event handler. --- dlls/mshtml/htmlevent.c | 1 + dlls/mshtml/tests/events.c | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index c09db52..41be3e2 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1065,6 +1065,7 @@ HRESULT set_event_handler(event_target_t **event_target, HTMLDocumentNode *doc, default: FIXME("not supported vt=%d\n", V_VT(var)); + case VT_EMPTY: return E_NOTIMPL; } diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index eac72a6..abca9f4 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1082,6 +1082,10 @@ static void test_onclick(IHTMLDocument2 *doc) ok(hres == S_OK, "get_onclick failed: %08x\n", hres); ok(V_VT(&v) == VT_NULL, "V_VT(onclick) = %d\n", V_VT(&v)); + V_VT(&v) = VT_EMPTY; + hres = IHTMLElement_put_onclick(div, v); + ok(hres == E_NOTIMPL, "put_onclick failed: %08x\n", hres); + V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&div_onclick_obj; hres = IHTMLElement_put_onclick(div, v);

1 0

Jacek Caban : jscript: Don' t pass EXPR_NEWREF flag to evaluate member expression in array_expression_eval .
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 8d44d63849b2498a6e82c3825a5397353dc3f3d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d44d63849b2498a6e82c3825… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 6 22:10:44 2009 +0100 jscript: Don't pass EXPR_NEWREF flag to evaluate member expression in array_expression_eval. --- dlls/jscript/engine.c | 2 +- dlls/jscript/tests/lang.js | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 15ef905..9a89431 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1396,7 +1396,7 @@ HRESULT array_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, TRACE("\n"); - hres = expr_eval(ctx, expr->member_expr, EXPR_NEWREF, ei, &exprval); + hres = expr_eval(ctx, expr->member_expr, 0, ei, &exprval); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 1359e05..b13091f 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -863,6 +863,13 @@ ok(("1" in obj) === false, "1 is in obj"); obj = [1,2,3]; ok((1 in obj) === true, "1 is not in obj"); +obj = new Object(); +try { + obj.prop["test"]; + ok(false, "expected exception"); +}catch(e) {} +ok(!("prop" in obj), "prop in obj"); + ok(isNaN(NaN) === true, "isNaN(NaN) !== true"); ok(isNaN(0.5) === false, "isNaN(0.5) !== false"); ok(isNaN(Infinity) === false, "isNaN(Infinity) !== false");

1 0