10856 2006-09-14 07:13:01 -0700 Windows build fixes after r16360 2006-09-14 10:00:22 -0700 1 1 1 Unclassified WebKit WebCore Misc. 420+ PC Windows XP RESOLVED FIXED P2 Normal --- 1 karthikkumar webkit-unassigned mrowe oldest_to_newest 55499 0 karthikkumar 2006-09-14 07:13:01 -0700 Compilation breaks on Windows.. the following patch adds temporarylinkstubs and fixes it. Index: WebCore/ChangeLog =================================================================== --- WebCore/ChangeLog (revision 16363) +++ WebCore/ChangeLog (working copy) @@ -1,3 +1,10 @@ +2006-09-14 Karthik Kumar <karthikkumar@gmail.com> + + Wrote temporary link stubs to fix compilation on Windows. + + * platform/win/TemporaryLinkStubs.cpp + * WebCore.vcproj/WebCore/WebCore.vcproj + 2006-09-14 Brady Eidson <beidson@apple.com> Part of a build fix for Windows - rest will be working out a mess of temporary link stubs Index: WebCore/WebCore.vcproj/WebCore/WebCore.vcproj =================================================================== --- WebCore/WebCore.vcproj/WebCore/WebCore.vcproj (revision 16363) +++ WebCore/WebCore.vcproj/WebCore/WebCore.vcproj (working copy) @@ -41,7 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(ProjectDir)\..\..\..\iconv\include";"$(ProjectDir)\..\..\..\icu\include";"$(ProjectDir)\..\..\..\libxml\include";"$(ProjectDir)\..\..\..\libxslt\include";"$(ProjectDir)\..\..\DerivedSources\WebCore";"$(ProjectDir)\..\..\";"$(ProjectDir)\..\..\css";"$(ProjectDir)\..\..\editing";"$(ProjectDir)\..\..\rendering";"$(ProjectDir)\..\..\bindings\js";"$(ProjectDir)\..\..\dom";"$(ProjectDir)\..\..\html";"$(ProjectDir)\..\..\bridge";"$(ProjectDir)\..\..\bridge\win";"$(ProjectDir)\..\..\loader";"$(ProjectDir)\..\..\page";"$(ProjectDir)\..\..\platform";"$(ProjectDir)\..\..\platform\cairo";"$(ProjectDir)\..\..\platform\image-decoders";"$(ProjectDir)\..\..\platform\image-decoders\bmp";"$(ProjectDir)\..\..\platform\image-decoders\gif";"$(ProjectDir)\..\..\platform\image-decoders\ico";"$(ProjectDir)\..\..\platform\image-decoders\jpeg";"$(ProjectDir)\..\..\platform\image-decoders\png";"$(ProjectDir)\..\..\platform\image-decoders\xbm";"$(ProjectDir)\..\..\platform\image-decoders\zlib";"$(ProjectDir)\..\..\xml";"$(ProjectDir)\..\..\..\JavaScriptCore";"$(ProjectDir)\..\..\..\JavaScriptCore\os-win32";"$(ProjectDir)\..\..\ForwardingHeaders";"$(WebKitOutputDir)\WebCore.intermediate\$(ConfigurationName)\WebCore.intermediate\DerivedSources";"$(ProjectDir)\..\..\..\JavaScriptCore\kjs";"$(ProjectDir)\..\..\platform\win";"$(ProjectDir)\..\..\platform\cairo\pixman\src";"$(ProjectDir)\..\..\platform\cairo\cairo\src"" + AdditionalIncludeDirectories=""$(ProjectDir)\..\..\..\iconv\include";"$(ProjectDir)\..\..\..\icu\include";"$(ProjectDir)\..\..\..\libxml\include";"$(ProjectDir)\..\..\..\libxslt\include";"$(ProjectDir)\..\..\DerivedSources\WebCore";"$(ProjectDir)\..\..\";"$(ProjectDir)\..\..\css";"$(ProjectDir)\..\..\editing";"$(ProjectDir)\..\..\rendering";"$(ProjectDir)\..\..\bindings\js";"$(ProjectDir)\..\..\dom";"$(ProjectDir)\..\..\html";"$(ProjectDir)\..\..\bridge";"$(ProjectDir)\..\..\bridge\win";"$(ProjectDir)\..\..\loader";"$(ProjectDir)\..\..\page";"$(ProjectDir)\..\..\platform";"$(ProjectDir)\..\..\platform\cairo";"$(ProjectDir)\..\..\platform\image-decoders";"$(ProjectDir)\..\..\platform\image-decoders\bmp";"$(ProjectDir)\..\..\platform\image-decoders\gif";"$(ProjectDir)\..\..\platform\image-decoders\ico";"$(ProjectDir)\..\..\platform\image-decoders\jpeg";"$(ProjectDir)\..\..\platform\image-decoders\png";"$(ProjectDir)\..\..\platform\image-decoders\xbm";"$(ProjectDir)\..\..\platform\image-decoders\zlib";"$(ProjectDir)\..\..\xml";"$(ProjectDir)\..\..\..\JavaScriptCore";"$(ProjectDir)\..\..\..\JavaScriptCore\os-win32";"$(ProjectDir)\..\..\ForwardingHeaders";"$(WebKitOutputDir)\WebCore.intermediate\$(ConfigurationName)\WebCore.intermediate\DerivedSources";"$(ProjectDir)\..\..\..\JavaScriptCore\kjs";"$(ProjectDir)\..\..\platform\win";"$(ProjectDir)\..\..\platform\cairo\pixman\src";"$(ProjectDir)\..\..\platform\cairo\cairo\src";"$(ProjectDir)\..\..\loader\icon"" PreprocessorDefinitions="WIN32;KHTML_NO_XBL;KHTML_XSLT;XPATH_SUPPORT" MinimalRebuild="true" ExceptionHandling="0" @@ -108,7 +108,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(ProjectDir)\..\..\..\iconv\include";"$(ProjectDir)\..\..\..\icu\include";"$(ProjectDir)\..\..\..\libxml\include";"$(ProjectDir)\..\..\..\libxslt\include";"$(ProjectDir)\..\..\DerivedSources\WebCore";"$(ProjectDir)\..\..\";"$(ProjectDir)\..\..\css";"$(ProjectDir)\..\..\editing";"$(ProjectDir)\..\..\rendering";"$(ProjectDir)\..\..\bindings\js";"$(ProjectDir)\..\..\dom";"$(ProjectDir)\..\..\html";"$(ProjectDir)\..\..\bridge";"$(ProjectDir)\..\..\bridge\win";"$(ProjectDir)\..\..\loader";"$(ProjectDir)\..\..\page";"$(ProjectDir)\..\..\platform";"$(ProjectDir)\..\..\platform\cairo";"$(ProjectDir)\..\..\platform\image-decoders";"$(ProjectDir)\..\..\platform\image-decoders\bmp";"$(ProjectDir)\..\..\platform\image-decoders\gif";"$(ProjectDir)\..\..\platform\image-decoders\ico";"$(ProjectDir)\..\..\platform\image-decoders\jpeg";"$(ProjectDir)\..\..\platform\image-decoders\png";"$(ProjectDir)\..\..\platform\image-decoders\xbm";"$(ProjectDir)\..\..\platform\image-decoders\zlib";"$(ProjectDir)\..\..\xml";"$(ProjectDir)\..\..\..\JavaScriptCore";"$(ProjectDir)\..\..\..\JavaScriptCore\os-win32";"$(ProjectDir)\..\..\ForwardingHeaders";"$(WebKitOutputDir)\WebCore.intermediate\$(ConfigurationName)\WebCore.intermediate\DerivedSources";"$(ProjectDir)\..\..\..\JavaScriptCore\kjs";"$(ProjectDir)\..\..\platform\win";"$(ProjectDir)\..\..\platform\cairo\pixman\src";"$(ProjectDir)\..\..\platform\cairo\cairo\src"" + AdditionalIncludeDirectories=""$(ProjectDir)\..\..\..\iconv\include";"$(ProjectDir)\..\..\..\icu\include";"$(ProjectDir)\..\..\..\libxml\include";"$(ProjectDir)\..\..\..\libxslt\include";"$(ProjectDir)\..\..\DerivedSources\WebCore";"$(ProjectDir)\..\..\";"$(ProjectDir)\..\..\css";"$(ProjectDir)\..\..\editing";"$(ProjectDir)\..\..\rendering";"$(ProjectDir)\..\..\bindings\js";"$(ProjectDir)\..\..\dom";"$(ProjectDir)\..\..\html";"$(ProjectDir)\..\..\bridge";"$(ProjectDir)\..\..\bridge\win";"$(ProjectDir)\..\..\loader";"$(ProjectDir)\..\..\page";"$(ProjectDir)\..\..\platform";"$(ProjectDir)\..\..\platform\cairo";"$(ProjectDir)\..\..\platform\image-decoders";"$(ProjectDir)\..\..\platform\image-decoders\bmp";"$(ProjectDir)\..\..\platform\image-decoders\gif";"$(ProjectDir)\..\..\platform\image-decoders\ico";"$(ProjectDir)\..\..\platform\image-decoders\jpeg";"$(ProjectDir)\..\..\platform\image-decoders\png";"$(ProjectDir)\..\..\platform\image-decoders\xbm";"$(ProjectDir)\..\..\platform\image-decoders\zlib";"$(ProjectDir)\..\..\xml";"$(ProjectDir)\..\..\..\JavaScriptCore";"$(ProjectDir)\..\..\..\JavaScriptCore\os-win32";"$(ProjectDir)\..\..\ForwardingHeaders";"$(WebKitOutputDir)\WebCore.intermediate\$(ConfigurationName)\WebCore.intermediate\DerivedSources";"$(ProjectDir)\..\..\..\JavaScriptCore\kjs";"$(ProjectDir)\..\..\platform\win";"$(ProjectDir)\..\..\platform\cairo\pixman\src";"$(ProjectDir)\..\..\platform\cairo\cairo\src";"$(ProjectDir)\..\..\loader\icon"" PreprocessorDefinitions="WIN32;KHTML_NO_XBL;KHTML_XSLT;XPATH_SUPPORT;NDEBUG" ExceptionHandling="0" RuntimeLibrary="2" Index: WebCore/platform/win/TemporaryLinkStubs.cpp =================================================================== --- WebCore/platform/win/TemporaryLinkStubs.cpp (revision 16363) +++ WebCore/platform/win/TemporaryLinkStubs.cpp (working copy) @@ -65,6 +65,8 @@ #include "RenderPopupMenuWin.h" #include "EditCommand.h" #include "Icon.h" +#include "IconLoader.h" +#include "IconDatabase.h" using namespace WebCore; @@ -378,4 +380,12 @@ void RenderThemeWin::adjustMenuListStyle Icon::Icon() { notImplemented(); } Icon::~Icon() { notImplemented(); } PassRefPtr<Icon> Icon::newIconForFile(const String& filename) { notImplemented(); return PassRefPtr<Icon>(new Icon()); } -void Icon::paint(GraphicsContext*, const IntRect&) { notImplemented(); } \ No newline at end of file +void Icon::paint(GraphicsContext*, const IntRect&) { notImplemented(); } + +void IconLoader::stopLoading() { notImplemented(); } +void IconLoader::startLoading() { notImplemented(); } +IconLoader* IconLoader::createForFrame(Frame *frame) { return 0; } + +bool IconDatabase::isIconExpiredForIconURL(const String& url) { return false; } +bool IconDatabase::hasEntryForIconURL(const String& url) { return false; } +IconDatabase* IconDatabase::sharedIconDatabase() { return 0; } 55500 1 10557 karthikkumar 2006-09-14 07:14:24 -0700 Created attachment 10557 TLS for Windows/IconLoader/IconDatabase apply the diff to 16363 55507 2 10557 aroben 2006-09-14 09:16:38 -0700 Comment on attachment 10557 TLS for Windows/IconLoader/IconDatabase The convention in the .vcproj files is to add any WebCore .h files to the project rather than to point AdditionalIncludeDirectories at them. Could you make this change and resubmit the patch? 55509 3 10557 aroben 2006-09-14 09:26:34 -0700 Comment on attachment 10557 TLS for Windows/IconLoader/IconDatabase Disregard my previous comment. r=Tim 55510 4 aroben 2006-09-14 10:00:22 -0700 Landed as r16364. 10557 2006-09-14 07:14:24 -0700 2006-09-14 09:26:34 -0700 TLS for Windows/IconLoader/IconDatabase patch.diff text/plain 9760 karthikkumar SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNjM2MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTAgQEAKKzIwMDYtMDktMTQgIEthcnRoaWsgS3VtYXIgIDxrYXJ0aGlra3VtYXJA Z21haWwuY29tPgorCisgICAgICAgIFdyb3RlIHRlbXBvcmFyeSBsaW5rIHN0dWJzIHRvIGZpeCBj b21waWxhdGlvbiBvbiBXaW5kb3dzLgorCisgICAgICAgICogcGxhdGZvcm0vd2luL1RlbXBvcmFy eUxpbmtTdHVicy5jcHAKKyAgICAgICAgKiBXZWJDb3JlLnZjcHJvai9XZWJDb3JlL1dlYkNvcmUu dmNwcm9qIAorCiAyMDA2LTA5LTE0ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4K IAogICAgICAgICBQYXJ0IG9mIGEgYnVpbGQgZml4IGZvciBXaW5kb3dzIC0gcmVzdCB3aWxsIGJl IHdvcmtpbmcgb3V0IGEgbWVzcyBvZiB0ZW1wb3JhcnkgbGluayBzdHVicwpJbmRleDogV2ViQ29y ZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlL1dlYkNvcmUudmNwcm9qCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS9XZWJDb3JlLnZjcHJvagkocmV2aXNpb24gMTYz NjMpCisrKyBXZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2oJKHdv cmtpbmcgY29weSkKQEAgLTQxLDcgKzQxLDcgQEAKIAkJCTxUb29sCiAJCQkJTmFtZT0iVkNDTENv bXBpbGVyVG9vbCIKIAkJCQlPcHRpbWl6YXRpb249IjAiCi0JCQkJQWRkaXRpb25hbEluY2x1ZGVE aXJlY3Rvcmllcz0iJnF1b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlwuLlxpY29udlxpbmNsdWRlJnF1 b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5cLi5caWN1XGluY2x1ZGUmcXVvdDs7JnF1b3Q7 JChQcm9qZWN0RGlyKVwuLlwuLlwuLlxsaWJ4bWxcaW5jbHVkZSZxdW90OzsmcXVvdDskKFByb2pl Y3REaXIpXC4uXC4uXC4uXGxpYnhzbHRcaW5jbHVkZSZxdW90OzsmcXVvdDskKFByb2plY3REaXIp XC4uXC4uXERlcml2ZWRTb3VyY2VzXFdlYkNvcmUmcXVvdDs7JnF1b3Q7JChQcm9qZWN0RGlyKVwu LlwuLlwmcXVvdDs7JnF1b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlxjc3MmcXVvdDs7JnF1b3Q7JChQ cm9qZWN0RGlyKVwuLlwuLlxlZGl0aW5nJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5c cmVuZGVyaW5nJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5cYmluZGluZ3NcanMmcXVv dDs7JnF1b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlxkb20mcXVvdDs7JnF1b3Q7JChQcm9qZWN0RGly KVwuLlwuLlxodG1sJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5cYnJpZGdlJnF1b3Q7 OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5cYnJpZGdlXHdpbiZxdW90OzsmcXVvdDskKFByb2pl Y3REaXIpXC4uXC4uXGxvYWRlciZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4uXHBhZ2Um cXVvdDs7JnF1b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlxwbGF0Zm9ybSZxdW90OzsmcXVvdDskKFBy b2plY3REaXIpXC4uXC4uXHBsYXRmb3JtXGNhaXJvJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilc Li5cLi5ccGxhdGZvcm1caW1hZ2UtZGVjb2RlcnMmcXVvdDs7JnF1b3Q7JChQcm9qZWN0RGlyKVwu LlwuLlxwbGF0Zm9ybVxpbWFnZS1kZWNvZGVyc1xibXAmcXVvdDs7JnF1b3Q7JChQcm9qZWN0RGly KVwuLlwuLlxwbGF0Zm9ybVxpbWFnZS1kZWNvZGVyc1xnaWYmcXVvdDs7JnF1b3Q7JChQcm9qZWN0 RGlyKVwuLlwuLlxwbGF0Zm9ybVxpbWFnZS1kZWNvZGVyc1xpY28mcXVvdDs7JnF1b3Q7JChQcm9q ZWN0RGlyKVwuLlwuLlxwbGF0Zm9ybVxpbWFnZS1kZWNvZGVyc1xqcGVnJnF1b3Q7OyZxdW90OyQo UHJvamVjdERpcilcLi5cLi5ccGxhdGZvcm1caW1hZ2UtZGVjb2RlcnNccG5nJnF1b3Q7OyZxdW90 OyQoUHJvamVjdERpcilcLi5cLi5ccGxhdGZvcm1caW1hZ2UtZGVjb2RlcnNceGJtJnF1b3Q7OyZx dW90OyQoUHJvamVjdERpcilcLi5cLi5ccGxhdGZvcm1caW1hZ2UtZGVjb2RlcnNcemxpYiZxdW90 OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4uXHhtbCZxdW90OzsmcXVvdDskKFByb2plY3REaXIp XC4uXC4uXC4uXEphdmFTY3JpcHRDb3JlJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5c Li5cSmF2YVNjcmlwdENvcmVcb3Mtd2luMzImcXVvdDs7JnF1b3Q7JChQcm9qZWN0RGlyKVwuLlwu LlxGb3J3YXJkaW5nSGVhZGVycyZxdW90OzsmcXVvdDskKFdlYktpdE91dHB1dERpcilcV2ViQ29y ZS5pbnRlcm1lZGlhdGVcJChDb25maWd1cmF0aW9uTmFtZSlcV2ViQ29yZS5pbnRlcm1lZGlhdGVc RGVyaXZlZFNvdXJjZXMmcXVvdDs7JnF1b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlwuLlxKYXZhU2Ny aXB0Q29yZVxranMmcXVvdDs7JnF1b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlxwbGF0Zm9ybVx3aW4m cXVvdDs7JnF1b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlxwbGF0Zm9ybVxjYWlyb1xwaXhtYW5cc3Jj JnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5ccGxhdGZvcm1cY2Fpcm9cY2Fpcm9cc3Jj JnF1b3Q7IgorCQkJCUFkZGl0aW9uYWxJbmNsdWRlRGlyZWN0b3JpZXM9IiZxdW90OyQoUHJvamVj dERpcilcLi5cLi5cLi5caWNvbnZcaW5jbHVkZSZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4u XC4uXC4uXGljdVxpbmNsdWRlJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5cLi5cbGli eG1sXGluY2x1ZGUmcXVvdDs7JnF1b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlwuLlxsaWJ4c2x0XGlu Y2x1ZGUmcXVvdDs7JnF1b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlxEZXJpdmVkU291cmNlc1xXZWJD b3JlJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5cJnF1b3Q7OyZxdW90OyQoUHJvamVj dERpcilcLi5cLi5cY3NzJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5cZWRpdGluZyZx dW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4uXHJlbmRlcmluZyZxdW90OzsmcXVvdDskKFBy b2plY3REaXIpXC4uXC4uXGJpbmRpbmdzXGpzJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5c Li5cZG9tJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5caHRtbCZxdW90OzsmcXVvdDsk KFByb2plY3REaXIpXC4uXC4uXGJyaWRnZSZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4u XGJyaWRnZVx3aW4mcXVvdDs7JnF1b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlxsb2FkZXImcXVvdDs7 JnF1b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlxwYWdlJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilc Li5cLi5ccGxhdGZvcm0mcXVvdDs7JnF1b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlxwbGF0Zm9ybVxj YWlybyZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4uXHBsYXRmb3JtXGltYWdlLWRlY29k ZXJzJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5ccGxhdGZvcm1caW1hZ2UtZGVjb2Rl cnNcYm1wJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5ccGxhdGZvcm1caW1hZ2UtZGVj b2RlcnNcZ2lmJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5ccGxhdGZvcm1caW1hZ2Ut ZGVjb2RlcnNcaWNvJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5ccGxhdGZvcm1caW1h Z2UtZGVjb2RlcnNcanBlZyZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4uXHBsYXRmb3Jt XGltYWdlLWRlY29kZXJzXHBuZyZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4uXHBsYXRm b3JtXGltYWdlLWRlY29kZXJzXHhibSZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4uXHBs YXRmb3JtXGltYWdlLWRlY29kZXJzXHpsaWImcXVvdDs7JnF1b3Q7JChQcm9qZWN0RGlyKVwuLlwu Llx4bWwmcXVvdDs7JnF1b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlwuLlxKYXZhU2NyaXB0Q29yZSZx dW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4uXC4uXEphdmFTY3JpcHRDb3JlXG9zLXdpbjMy JnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5cRm9yd2FyZGluZ0hlYWRlcnMmcXVvdDs7 JnF1b3Q7JChXZWJLaXRPdXRwdXREaXIpXFdlYkNvcmUuaW50ZXJtZWRpYXRlXCQoQ29uZmlndXJh dGlvbk5hbWUpXFdlYkNvcmUuaW50ZXJtZWRpYXRlXERlcml2ZWRTb3VyY2VzJnF1b3Q7OyZxdW90 OyQoUHJvamVjdERpcilcLi5cLi5cLi5cSmF2YVNjcmlwdENvcmVca2pzJnF1b3Q7OyZxdW90OyQo UHJvamVjdERpcilcLi5cLi5ccGxhdGZvcm1cd2luJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilc Li5cLi5ccGxhdGZvcm1cY2Fpcm9ccGl4bWFuXHNyYyZxdW90OzsmcXVvdDskKFByb2plY3REaXIp XC4uXC4uXHBsYXRmb3JtXGNhaXJvXGNhaXJvXHNyYyZxdW90OzsmcXVvdDskKFByb2plY3REaXIp XC4uXC4uXGxvYWRlclxpY29uJnF1b3Q7IgogCQkJCVByZXByb2Nlc3NvckRlZmluaXRpb25zPSJX SU4zMjtLSFRNTF9OT19YQkw7S0hUTUxfWFNMVDtYUEFUSF9TVVBQT1JUIgogCQkJCU1pbmltYWxS ZWJ1aWxkPSJ0cnVlIgogCQkJCUV4Y2VwdGlvbkhhbmRsaW5nPSIwIgpAQCAtMTA4LDcgKzEwOCw3 IEBACiAJCQkvPgogCQkJPFRvb2wKIAkJCQlOYW1lPSJWQ0NMQ29tcGlsZXJUb29sIgotCQkJCUFk ZGl0aW9uYWxJbmNsdWRlRGlyZWN0b3JpZXM9IiZxdW90OyQoUHJvamVjdERpcilcLi5cLi5cLi5c aWNvbnZcaW5jbHVkZSZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4uXC4uXGljdVxpbmNs dWRlJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5cLi5cbGlieG1sXGluY2x1ZGUmcXVv dDs7JnF1b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlwuLlxsaWJ4c2x0XGluY2x1ZGUmcXVvdDs7JnF1 b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlxEZXJpdmVkU291cmNlc1xXZWJDb3JlJnF1b3Q7OyZxdW90 OyQoUHJvamVjdERpcilcLi5cLi5cJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5cY3Nz JnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5cZWRpdGluZyZxdW90OzsmcXVvdDskKFBy b2plY3REaXIpXC4uXC4uXHJlbmRlcmluZyZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4u XGJpbmRpbmdzXGpzJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5cZG9tJnF1b3Q7OyZx dW90OyQoUHJvamVjdERpcilcLi5cLi5caHRtbCZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4u XC4uXGJyaWRnZSZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4uXGJyaWRnZVx3aW4mcXVv dDs7JnF1b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlxsb2FkZXImcXVvdDs7JnF1b3Q7JChQcm9qZWN0 RGlyKVwuLlwuLlxwYWdlJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5ccGxhdGZvcm0m cXVvdDs7JnF1b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlxwbGF0Zm9ybVxjYWlybyZxdW90OzsmcXVv dDskKFByb2plY3REaXIpXC4uXC4uXHBsYXRmb3JtXGltYWdlLWRlY29kZXJzJnF1b3Q7OyZxdW90 OyQoUHJvamVjdERpcilcLi5cLi5ccGxhdGZvcm1caW1hZ2UtZGVjb2RlcnNcYm1wJnF1b3Q7OyZx dW90OyQoUHJvamVjdERpcilcLi5cLi5ccGxhdGZvcm1caW1hZ2UtZGVjb2RlcnNcZ2lmJnF1b3Q7 OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5ccGxhdGZvcm1caW1hZ2UtZGVjb2RlcnNcaWNvJnF1 b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5ccGxhdGZvcm1caW1hZ2UtZGVjb2RlcnNcanBl ZyZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4uXHBsYXRmb3JtXGltYWdlLWRlY29kZXJz XHBuZyZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4uXHBsYXRmb3JtXGltYWdlLWRlY29k ZXJzXHhibSZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4uXHBsYXRmb3JtXGltYWdlLWRl Y29kZXJzXHpsaWImcXVvdDs7JnF1b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlx4bWwmcXVvdDs7JnF1 b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlwuLlxKYXZhU2NyaXB0Q29yZSZxdW90OzsmcXVvdDskKFBy b2plY3REaXIpXC4uXC4uXC4uXEphdmFTY3JpcHRDb3JlXG9zLXdpbjMyJnF1b3Q7OyZxdW90OyQo UHJvamVjdERpcilcLi5cLi5cRm9yd2FyZGluZ0hlYWRlcnMmcXVvdDs7JnF1b3Q7JChXZWJLaXRP dXRwdXREaXIpXFdlYkNvcmUuaW50ZXJtZWRpYXRlXCQoQ29uZmlndXJhdGlvbk5hbWUpXFdlYkNv cmUuaW50ZXJtZWRpYXRlXERlcml2ZWRTb3VyY2VzJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilc Li5cLi5cLi5cSmF2YVNjcmlwdENvcmVca2pzJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5c Li5ccGxhdGZvcm1cd2luJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5ccGxhdGZvcm1c Y2Fpcm9ccGl4bWFuXHNyYyZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4uXHBsYXRmb3Jt XGNhaXJvXGNhaXJvXHNyYyZxdW90OyIKKwkJCQlBZGRpdGlvbmFsSW5jbHVkZURpcmVjdG9yaWVz PSImcXVvdDskKFByb2plY3REaXIpXC4uXC4uXC4uXGljb252XGluY2x1ZGUmcXVvdDs7JnF1b3Q7 JChQcm9qZWN0RGlyKVwuLlwuLlwuLlxpY3VcaW5jbHVkZSZxdW90OzsmcXVvdDskKFByb2plY3RE aXIpXC4uXC4uXC4uXGxpYnhtbFxpbmNsdWRlJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5c Li5cLi5cbGlieHNsdFxpbmNsdWRlJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5cRGVy aXZlZFNvdXJjZXNcV2ViQ29yZSZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4uXCZxdW90 OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4uXGNzcyZxdW90OzsmcXVvdDskKFByb2plY3REaXIp XC4uXC4uXGVkaXRpbmcmcXVvdDs7JnF1b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlxyZW5kZXJpbmcm cXVvdDs7JnF1b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlxiaW5kaW5nc1xqcyZxdW90OzsmcXVvdDsk KFByb2plY3REaXIpXC4uXC4uXGRvbSZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4uXGh0 bWwmcXVvdDs7JnF1b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlxicmlkZ2UmcXVvdDs7JnF1b3Q7JChQ cm9qZWN0RGlyKVwuLlwuLlxicmlkZ2Vcd2luJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5c Li5cbG9hZGVyJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5ccGFnZSZxdW90OzsmcXVv dDskKFByb2plY3REaXIpXC4uXC4uXHBsYXRmb3JtJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilc Li5cLi5ccGxhdGZvcm1cY2Fpcm8mcXVvdDs7JnF1b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlxwbGF0 Zm9ybVxpbWFnZS1kZWNvZGVycyZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4uXHBsYXRm b3JtXGltYWdlLWRlY29kZXJzXGJtcCZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4uXHBs YXRmb3JtXGltYWdlLWRlY29kZXJzXGdpZiZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4u XHBsYXRmb3JtXGltYWdlLWRlY29kZXJzXGljbyZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4u XC4uXHBsYXRmb3JtXGltYWdlLWRlY29kZXJzXGpwZWcmcXVvdDs7JnF1b3Q7JChQcm9qZWN0RGly KVwuLlwuLlxwbGF0Zm9ybVxpbWFnZS1kZWNvZGVyc1xwbmcmcXVvdDs7JnF1b3Q7JChQcm9qZWN0 RGlyKVwuLlwuLlxwbGF0Zm9ybVxpbWFnZS1kZWNvZGVyc1x4Ym0mcXVvdDs7JnF1b3Q7JChQcm9q ZWN0RGlyKVwuLlwuLlxwbGF0Zm9ybVxpbWFnZS1kZWNvZGVyc1x6bGliJnF1b3Q7OyZxdW90OyQo UHJvamVjdERpcilcLi5cLi5ceG1sJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilcLi5cLi5cLi5c SmF2YVNjcmlwdENvcmUmcXVvdDs7JnF1b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlwuLlxKYXZhU2Ny aXB0Q29yZVxvcy13aW4zMiZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4uXEZvcndhcmRp bmdIZWFkZXJzJnF1b3Q7OyZxdW90OyQoV2ViS2l0T3V0cHV0RGlyKVxXZWJDb3JlLmludGVybWVk aWF0ZVwkKENvbmZpZ3VyYXRpb25OYW1lKVxXZWJDb3JlLmludGVybWVkaWF0ZVxEZXJpdmVkU291 cmNlcyZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4uXC4uXEphdmFTY3JpcHRDb3JlXGtq cyZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uXC4uXHBsYXRmb3JtXHdpbiZxdW90OzsmcXVv dDskKFByb2plY3REaXIpXC4uXC4uXHBsYXRmb3JtXGNhaXJvXHBpeG1hblxzcmMmcXVvdDs7JnF1 b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlxwbGF0Zm9ybVxjYWlyb1xjYWlyb1xzcmMmcXVvdDs7JnF1 b3Q7JChQcm9qZWN0RGlyKVwuLlwuLlxsb2FkZXJcaWNvbiZxdW90OyIKIAkJCQlQcmVwcm9jZXNz b3JEZWZpbml0aW9ucz0iV0lOMzI7S0hUTUxfTk9fWEJMO0tIVE1MX1hTTFQ7WFBBVEhfU1VQUE9S VDtOREVCVUciCiAJCQkJRXhjZXB0aW9uSGFuZGxpbmc9IjAiCiAJCQkJUnVudGltZUxpYnJhcnk9 IjIiCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL3dpbi9UZW1wb3JhcnlMaW5rU3R1YnMuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vd2luL1RlbXBvcmFyeUxpbmtTdHVicy5jcHAJ KHJldmlzaW9uIDE2MzYzKQorKysgV2ViQ29yZS9wbGF0Zm9ybS93aW4vVGVtcG9yYXJ5TGlua1N0 dWJzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjUsNiArNjUsOCBAQAogI2luY2x1ZGUgIlJlbmRl clBvcHVwTWVudVdpbi5oIgogI2luY2x1ZGUgIkVkaXRDb21tYW5kLmgiCiAjaW5jbHVkZSAiSWNv bi5oIgorI2luY2x1ZGUgIkljb25Mb2FkZXIuaCIKKyNpbmNsdWRlICJJY29uRGF0YWJhc2UuaCIK IAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTM3OCw0ICszODAsMTIgQEAgdm9pZCBS ZW5kZXJUaGVtZVdpbjo6YWRqdXN0TWVudUxpc3RTdHlsZQogSWNvbjo6SWNvbigpIHsgbm90SW1w bGVtZW50ZWQoKTsgfQogSWNvbjo6fkljb24oKSB7IG5vdEltcGxlbWVudGVkKCk7IH0KIFBhc3NS ZWZQdHI8SWNvbj4gSWNvbjo6bmV3SWNvbkZvckZpbGUoY29uc3QgU3RyaW5nJiBmaWxlbmFtZSkg eyBub3RJbXBsZW1lbnRlZCgpOyByZXR1cm4gUGFzc1JlZlB0cjxJY29uPihuZXcgSWNvbigpKTsg fQotdm9pZCBJY29uOjpwYWludChHcmFwaGljc0NvbnRleHQqLCBjb25zdCBJbnRSZWN0JikgeyBu b3RJbXBsZW1lbnRlZCgpOyB9ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQordm9pZCBJY29u OjpwYWludChHcmFwaGljc0NvbnRleHQqLCBjb25zdCBJbnRSZWN0JikgeyBub3RJbXBsZW1lbnRl ZCgpOyB9CisKK3ZvaWQgSWNvbkxvYWRlcjo6c3RvcExvYWRpbmcoKSB7IG5vdEltcGxlbWVudGVk KCk7IH0gCit2b2lkIEljb25Mb2FkZXI6OnN0YXJ0TG9hZGluZygpIHsgbm90SW1wbGVtZW50ZWQo KTsgfSAKK0ljb25Mb2FkZXIqIEljb25Mb2FkZXI6OmNyZWF0ZUZvckZyYW1lKEZyYW1lICpmcmFt ZSkgeyByZXR1cm4gMDsgfSAKKworYm9vbCBJY29uRGF0YWJhc2U6OmlzSWNvbkV4cGlyZWRGb3JJ Y29uVVJMKGNvbnN0IFN0cmluZyYgdXJsKSB7IHJldHVybiBmYWxzZTsgfQorYm9vbCBJY29uRGF0 YWJhc2U6Omhhc0VudHJ5Rm9ySWNvblVSTChjb25zdCBTdHJpbmcmIHVybCkgeyByZXR1cm4gZmFs c2U7IH0KK0ljb25EYXRhYmFzZSogSWNvbkRhdGFiYXNlOjpzaGFyZWRJY29uRGF0YWJhc2UoKSB7 IHJldHVybiAwOyB9Cg==