Title: [174754] trunk
- Revision
- 174754
- Author
- roger_f...@apple.com
- Date
- 2014-10-15 18:16:36 -0700 (Wed, 15 Oct 2014)
Log Message
[Windows] Speculative Windows test fix.
Also add some more test logging.
* DumpRenderTree/win/DumpRenderTree.cpp: Make sure that OLEAUT32.dll doesn't cache BSTRs.
* WebActionPropertyBag.cpp:
(WebActionPropertyBag::Read): Add logging for testing purposes.
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (174753 => 174754)
--- trunk/Source/WebKit/win/ChangeLog 2014-10-16 00:56:05 UTC (rev 174753)
+++ trunk/Source/WebKit/win/ChangeLog 2014-10-16 01:16:36 UTC (rev 174754)
@@ -1,3 +1,10 @@
+2014-10-15 Roger Fong <roger_f...@apple.com>
+
+ [Windows] Add some more logging to debug Windows test issues.
+
+ * WebActionPropertyBag.cpp:
+ (WebActionPropertyBag::Read):
+
2014-10-14 Roger Fong <roger_f...@apple.com>
[Windows] Add some logging to debug random crashing when running layout tests on Windows.
Modified: trunk/Source/WebKit/win/WebActionPropertyBag.cpp (174753 => 174754)
--- trunk/Source/WebKit/win/WebActionPropertyBag.cpp 2014-10-16 00:56:05 UTC (rev 174753)
+++ trunk/Source/WebKit/win/WebActionPropertyBag.cpp 2014-10-16 01:16:36 UTC (rev 174754)
@@ -111,11 +111,12 @@
if (!pszPropName)
return E_POINTER;
- WTFLogAlways("pVar Pointer Value: %p", pVar);
VariantClear(pVar);
if (isEqual(pszPropName, WebActionNavigationTypeKey)) {
+ WTFLogAlways("WebActionNavigationKey 1");
V_VT(pVar) = VT_I4;
+ WTFLogAlways("WebActionNavigationKey 2");
V_I4(pVar) = m_action.type();
return S_OK;
}
@@ -135,6 +136,7 @@
}
if (isEqual(pszPropName, WebActionOriginalURLKey)) {
V_VT(pVar) = VT_BSTR;
+ WTFLogAlways("WebActionOriginalURLKey");
V_BSTR(pVar) = BString(m_action.url().string()).release();
return S_OK;
}
Modified: trunk/Tools/ChangeLog (174753 => 174754)
--- trunk/Tools/ChangeLog 2014-10-16 00:56:05 UTC (rev 174753)
+++ trunk/Tools/ChangeLog 2014-10-16 01:16:36 UTC (rev 174754)
@@ -1,3 +1,9 @@
+2014-10-15 Roger Fong <roger_f...@apple.com>
+
+ [Windows] Speculative Windows test fix.
+
+ * DumpRenderTree/win/DumpRenderTree.cpp: Make sure that OLEAUT32.dll doesn't cache BSTRs.
+
2014-10-15 Rebecca Hauck <rha...@adobe.com>
import-w3c-test rewrites relative src paths in ref files incorrectly
Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (174753 => 174754)
--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2014-10-16 00:56:05 UTC (rev 174753)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2014-10-16 01:16:36 UTC (rev 174754)
@@ -112,6 +112,21 @@
UINT_PTR waitToDumpWatchdog = 0;
+
+typedef int(*SETOANOCACHE)(void);
+
+void DisableBSTRCache()
+{
+ HINSTANCE hLib = LoadLibrary(L"OLEAUT32.DLL");
+ if (hLib != NULL)
+ {
+ SETOANOCACHE SetOaNoCache = (SETOANOCACHE)GetProcAddress(hLib, "SetOaNoCache");
+ if (SetOaNoCache != NULL)
+ SetOaNoCache();
+ FreeLibrary(hLib);
+ }
+}
+
void setPersistentUserStyleSheetLocation(CFStringRef url)
{
persistentUserStyleSheetLocation = url;
@@ -1247,6 +1262,7 @@
::SetErrorMode(0);
::SetUnhandledExceptionFilter(exceptionFilter);
+ DisableBSTRCache();
leakChecking = false;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
