93275 2012-08-06 09:20:47 -0700 Windows 64 bit compliance 2012-08-13 20:20:52 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC Windows 7 RESOLVED FIXED https://github.com/achristensen07/webkit64prep P2 Normal --- 0 alex.christensen webkit-unassigned adele aroben bfulgham eric jberlin lforschler roger_fong sfalken webkit.review.bot oldest_to_newest 688187 0 alex.christensen 2012-08-06 09:20:47 -0700 Here are a few fixes from my Windows 64-bit build. I'll post most of the others as separate bugs. https://github.com/achristensen07/webkit64prep 688196 1 156707 alex.christensen 2012-08-06 09:29:00 -0700 Created attachment 156707 Patch 688205 2 156709 alex.christensen 2012-08-06 09:37:45 -0700 Created attachment 156709 patch patch 688228 3 156716 alex.christensen 2012-08-06 10:00:15 -0700 Created attachment 156716 Patch 688441 4 156716 paroga 2012-08-06 14:54:14 -0700 Comment on attachment 156716 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=156716&action=review > Tools/WinLauncher/WinLauncher.cpp:232 > - DefWebKitProc = reinterpret_cast<WNDPROC>(::GetWindowLongPtr(hMainWnd, GWL_WNDPROC)); > - ::SetWindowLongPtr(hMainWnd, GWL_WNDPROC, reinterpret_cast<LONG_PTR>(WndProc)); > + DefWebKitProc = reinterpret_cast<WNDPROC>(::GetWindowLongPtr(hMainWnd, GWLP_WNDPROC)); > + ::SetWindowLongPtr(hMainWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(WndProc)); i'd like to see usage of http://trac.webkit.org/browser/trunk/Source/WebCore/platform/win/WindowsExtras.h instead, which adds additional abstraction required for OS(WINCE). > Tools/win/DLLLauncher/DLLLauncherMain.cpp:191 > +#ifdef _M_AMD64 > + const char* entryPointName = "_dllLauncherEntryPoint"; > +#else > const char* entryPointName = "_dllLauncherEntryPoint@8"; > +#endif isn't there a possibility to export them as extern C without any additional decoration? > Tools/win/DLLLauncher/DLLLauncherMain.cpp:198 > +#ifdef _M_AMD64 > const char* entryPointName = "_dllLauncherEntryPoint@16"; > +#else > + const char* entryPointName = "_dllLauncherEntryPoint@16"; > +#endif they look very similar 688458 5 alex.christensen 2012-08-06 15:19:10 -0700 (In reply to comment #4) > i'd like to see usage of http://trac.webkit.org/browser/trunk/Source/WebCore/platform/win/WindowsExtras.h instead, which adds additional abstraction required for OS(WINCE). That's a good idea, but it would still need to use GWLP_WNDPROC instead of GWL_WNDPROC. > isn't there a possibility to export them as extern C without any additional decoration? I don't know why the symbol names are in the source code, but they don't work with the 64-bit dlls, hence the additional 64-bit symbols. > they look very similar They are the same. The first shouldn't have @16. My bad. 689199 6 alex.christensen 2012-08-07 11:09:10 -0700 > i'd like to see usage of http://trac.webkit.org/browser/trunk/Source/WebCore/platform/win/WindowsExtras.h instead, which adds additional abstraction required for OS(WINCE). How does it know what #if OS(WINCE) means? Whatever is done in WebKit to define that isn't done in WinLauncher. > isn't there a possibility to export them as extern C without any additional decoration? This isn't exporting, it's the parameter given to GetProcAddress to link to an already exported symbol. 690527 7 156716 bfulgham 2012-08-08 11:14:56 -0700 Comment on attachment 156716 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=156716&action=review This is a good start, but needs a few adjustments before landing. I think Patrick's idea to use the WindowsExtras.h code is good, but I think you will need to add a static value to represent the token you want to get from GetWindowLongPtr. >> Tools/WinLauncher/WinLauncher.cpp:232 >> + ::SetWindowLongPtr(hMainWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(WndProc)); > > i'd like to see usage of http://trac.webkit.org/browser/trunk/Source/WebCore/platform/win/WindowsExtras.h instead, which adds additional abstraction required for OS(WINCE). How would using that help with GWL_WNDPROC versus GWLP_WNDPROC? GWL_WNDPROC resolves to -4 for win32 (and to nothing in 64-bit), while GWLP_WNDPROC is -4 for 64-bit, and undefined for 32-bit. I guess we could add a static const "s_wndProc" member to the WindowsExtras.h that would be defined as -4. >> Tools/win/DLLLauncher/DLLLauncherMain.cpp:198 >> +#endif > > they look very similar Maybe this should be "#ifdef _M_AMD64 || _WIN64"? 690594 8 alex.christensen 2012-08-08 12:12:23 -0700 (In reply to comment #7) > This is a good start, but needs a few adjustments before landing. I think Patrick's idea to use the WindowsExtras.h code is good, but I think you will need to add a static value to represent the token you want to get from GetWindowLongPtr. Try adding #include "WindowsExtras.h" to WinLauncher.cpp. It doesn't know what to do with the #if OS(WINCE) directive. > I guess we could add a static const "s_wndProc" member to the WindowsExtras.h that would be defined as -4. GWLP_WNDPROC is defined for 32-bit and 64-bit. GWL_WNDPROC is not defined for 64-bit. > Maybe this should be "#ifdef _M_AMD64 || _WIN64"? Good idea. #if defined _M_AMD64 || defined _WIN64 690680 9 bfulgham 2012-08-08 13:37:52 -0700 (In reply to comment #8) > (In reply to comment #7) > > > This is a good start, but needs a few adjustments before landing. I think Patrick's idea to use the WindowsExtras.h code is good, but I think you will need to add a static value to represent the token you want to get from GetWindowLongPtr. > > Try adding #include "WindowsExtras.h" to WinLauncher.cpp. It doesn't know what to do with the #if OS(WINCE) directive. Ah, right. That's internal to WebCore. Why not do an #if/def around it using the _M_AMD64 and _WIN64. WINCE won't define these, and can stick to the old way. Then you don't need to touch WindowsExtras at all, and it should build fine on all systems. -Brent 693772 10 158031 alex.christensen 2012-08-13 10:09:52 -0700 Created attachment 158031 Patch 694438 11 158031 bfulgham 2012-08-13 20:01:40 -0700 Comment on attachment 158031 Patch Thanks for your patience revising the patch. These look great. 694447 12 158031 webkit.review.bot 2012-08-13 20:20:48 -0700 Comment on attachment 158031 Patch Clearing flags on attachment: 158031 Committed r125505: <http://trac.webkit.org/changeset/125505> 694448 13 webkit.review.bot 2012-08-13 20:20:52 -0700 All reviewed patches have been landed. Closing bug. 156707 2012-08-06 09:29:00 -0700 2012-08-06 09:37:45 -0700 Patch bug-93275-20120806102648.patch text/plain 2583 alex.christensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L3dpbi9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNDc3NSkKKysrIFNvdXJjZS9XZWJLaXQv d2luL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDEyLTA4LTA2 ICBBbGV4IENocmlzdGVuc2VuICA8YWxleC5jaHJpc3RlbnNlbkBmbGV4c2ltLmNvbT4KKworICAg ICAgICBXaW5kb3dzIDY0IGJpdCBjb21wbGlhbmNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzI3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEZpeGVkIGEgZmV3IGNvbXBpbGUgcHJvYmxlbXMgZm9yIFdp bjY0CisKKyAgICAgICAgKiBXZWJWaWV3LmNwcDoKKwogMjAxMi0wOC0wNSAgUGF0cmljayBHYW5z dGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBbV0lOXSBVc2Ugc2l6ZW9mKCkg Zm9yIGNiV25kRXh0cmEgdmFsdWVzCkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxMjQ3NzUpCisrKyBUb29scy9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxMi0wOC0wNiAgQWxleCBDaHJpc3Rl bnNlbiAgPGFsZXguY2hyaXN0ZW5zZW5AZmxleHNpbS5jb20+CisKKyAgICAgICAgV2luZG93cyA2 NCBiaXQgY29tcGxpYW5jZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTMyNzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBGaXhlZCBhIGZldyBjb21waWxlIHByb2JsZW1zIGZvciBXaW42NAorCisgICAgICAg ICogV2luTGF1bmNoZXIvV2luTGF1bmNoZXIuY3BwOgorICAgICAgICAqIHdpbi9ETExMYXVuY2hl ci9ETExMYXVuY2hlck1haW4uY3BwOgorCiAyMDEyLTA4LTA2ICBCYWxhenMgS2VsZW1lbiAgPGti YWxhenNAd2Via2l0Lm9yZz4KIAogICAgICAgICBXVFIgc2hvdWxkIGJlIGFibGUgdG8gbG9hZCBl eHRlcm5hbCByZXNvdXJjZXMKSW5kZXg6IFRvb2xzL1dpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9XaW5MYXVuY2hlci9XaW5MYXVuY2hlci5jcHAJKHJldmlz aW9uIDEyNDIwMSkKKysrIFRvb2xzL1dpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMjI4LDggKzIyOCw4IEBAIHN0YXRpYyB2b2lkIHJlc2l6ZVN1YlZpZXdzKCkK IHN0YXRpYyB2b2lkIHN1YmNsYXNzRm9yTGF5ZXJlZFdpbmRvdygpCiB7CiAgICAgaE1haW5XbmQg PSBnVmlld1dpbmRvdzsKLSAgICBEZWZXZWJLaXRQcm9jID0gcmVpbnRlcnByZXRfY2FzdDxXTkRQ Uk9DPig6OkdldFdpbmRvd0xvbmdQdHIoaE1haW5XbmQsIEdXTF9XTkRQUk9DKSk7Ci0gICAgOjpT ZXRXaW5kb3dMb25nUHRyKGhNYWluV25kLCBHV0xfV05EUFJPQywgcmVpbnRlcnByZXRfY2FzdDxM T05HX1BUUj4oV25kUHJvYykpOworICAgIERlZldlYktpdFByb2MgPSByZWludGVycHJldF9jYXN0 PFdORFBST0M+KDo6R2V0V2luZG93TG9uZ1B0cihoTWFpblduZCwgR1dMUF9XTkRQUk9DKSk7Cisg ICAgOjpTZXRXaW5kb3dMb25nUHRyKGhNYWluV25kLCBHV0xQX1dORFBST0MsIHJlaW50ZXJwcmV0 X2Nhc3Q8TE9OR19QVFI+KFduZFByb2MpKTsKIH0KIAogc3RhdGljIHZvaWQgY29tcHV0ZUZ1bGxE ZXNrdG9wRnJhbWUoKQpAQCAtMzE0LDggKzMxNCw4IEBAIGV4dGVybiAiQyIgX19kZWNsc3BlYyhk bGxleHBvcnQpIGludCBXSU4KICAgICAgICAgVXBkYXRlV2luZG93KGhNYWluV25kKTsKICAgICB9 CiAKLSAgICBEZWZFZGl0UHJvYyA9IHJlaW50ZXJwcmV0X2Nhc3Q8V05EUFJPQz4oR2V0V2luZG93 TG9uZ1B0cihoVVJMQmFyV25kLCBHV0xfV05EUFJPQykpOwotICAgIFNldFdpbmRvd0xvbmdQdHIo aFVSTEJhclduZCwgR1dMX1dORFBST0MsIHJlaW50ZXJwcmV0X2Nhc3Q8TE9OR19QVFI+KE15RWRp dFByb2MpKTsKKyAgICBEZWZFZGl0UHJvYyA9IHJlaW50ZXJwcmV0X2Nhc3Q8V05EUFJPQz4oR2V0 V2luZG93TG9uZ1B0cihoVVJMQmFyV25kLCBHV0xQX1dORFBST0MpKTsKKyAgICBTZXRXaW5kb3dM b25nUHRyKGhVUkxCYXJXbmQsIEdXTFBfV05EUFJPQywgcmVpbnRlcnByZXRfY2FzdDxMT05HX1BU Uj4oTXlFZGl0UHJvYykpOwogICAgIFNldEZvY3VzKGhVUkxCYXJXbmQpOwogCiAgICAgUkVDVCBj bGllbnRSZWN0ID0geyBzX3dpbmRvd1Bvc2l0aW9uLngsIHNfd2luZG93UG9zaXRpb24ueSwgc193 aW5kb3dQb3NpdGlvbi54ICsgc193aW5kb3dTaXplLmN4LCBzX3dpbmRvd1Bvc2l0aW9uLnkgKyBz X3dpbmRvd1NpemUuY3kgfTsK 156709 2012-08-06 09:37:45 -0700 2012-08-06 10:00:09 -0700 patch patch1.patch text/plain 4580 alex.christensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZw0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFNvdXJj ZS9XZWJLaXQvd2luL0NoYW5nZUxvZwkocmV2aXNpb24gMTI0Nzc1KQ0KKysrIFNvdXJjZS9XZWJL aXQvd2luL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQ0KQEAgLTEsMyArMSwxNCBAQA0KKzIwMTIt MDgtMDYgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhbGV4LmNocmlzdGVuc2VuQGZsZXhzaW0uY29tPgor CisgICAgICAgIFdpbmRvd3MgNjQgYml0IGNvbXBsaWFuY2UKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkzMjc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4ZWQgYSBmZXcgY29tcGlsZSBwcm9ibGVtcyBm b3IgV2luNjQKKworICAgICAgICAqIFdlYlZpZXcuY3BwOgorCiAyMDEyLTA4LTA1ICBQYXRyaWNr IEdhbnN0ZXJlciAgPHBhcm9nYUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtXSU5dIFVzZSBzaXpl b2YoKSBmb3IgY2JXbmRFeHRyYSB2YWx1ZXMKSW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL0Z1bGxz Y3JlZW5WaWRlb0NvbnRyb2xsZXIuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gU291cmNlL1dlYktpdC93 aW4vRnVsbHNjcmVlblZpZGVvQ29udHJvbGxlci5jcHAJKHJldmlzaW9uIDEyNDIwMSkNCisrKyBT b3VyY2UvV2ViS2l0L3dpbi9GdWxsc2NyZWVuVmlkZW9Db250cm9sbGVyLmNwcAkod29ya2luZyBj b3B5KQ0KQEAgLTQyMiw3ICs0MjIsNyBAQA0KICAgICB3Y2V4LnN0eWxlID0gQ1NfSFJFRFJBVyB8 IENTX1ZSRURSQVc7CiAgICAgd2NleC5scGZuV25kUHJvYyA9IGh1ZFduZFByb2M7CiAgICAgd2Nl eC5jYkNsc0V4dHJhID0gMDsKLSAgICB3Y2V4LmNiV25kRXh0cmEgPSA0OworICAgIHdjZXguY2JX bmRFeHRyYSA9IHNpemVvZih2b2lkICopOwogICAgIHdjZXguaEluc3RhbmNlID0gZ0luc3RhbmNl OwogICAgIHdjZXguaEljb24gPSAwOwogICAgIHdjZXguaEN1cnNvciA9IExvYWRDdXJzb3IoMCwg SURDX0FSUk9XKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwDQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09DQotLS0gU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5jcHAJKHJldmlzaW9uIDEyNDIwMSkN CisrKyBTb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAkod29ya2luZyBjb3B5KQ0KQEAgLTIx MDUsNyArMjEwNSw3IEBADQogICAgIHdjZXguc3R5bGUgICAgICAgICAgPSBDU19EQkxDTEtTOwog ICAgIHdjZXgubHBmblduZFByb2MgICAgPSBXZWJWaWV3V25kUHJvYzsKICAgICB3Y2V4LmNiQ2xz RXh0cmEgICAgID0gMDsKLSAgICB3Y2V4LmNiV25kRXh0cmEgICAgID0gNDsgLy8gNCBieXRlcyBm b3IgdGhlIElXZWJWaWV3IHBvaW50ZXIKKyAgICB3Y2V4LmNiV25kRXh0cmEgICAgID0gc2l6ZW9m KHZvaWQgKik7IC8vIDQgb3IgOCBieXRlcyBmb3IgdGhlIElXZWJWaWV3IHBvaW50ZXIKICAgICB3 Y2V4LmhJbnN0YW5jZSAgICAgID0gZ0luc3RhbmNlOwogICAgIHdjZXguaEljb24gICAgICAgICAg PSAwOwogICAgIHdjZXguaEN1cnNvciAgICAgICAgPSA6OkxvYWRDdXJzb3IoMCwgSURDX0FSUk9X KTsKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFRvb2xzL0NoYW5nZUxv ZwkocmV2aXNpb24gMTI0Nzc1KQ0KKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQ0K QEAgLTEsMyArMSwxNSBAQA0KKzIwMTItMDgtMDYgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhbGV4LmNo cmlzdGVuc2VuQGZsZXhzaW0uY29tPgorCisgICAgICAgIFdpbmRvd3MgNjQgYml0IGNvbXBsaWFu Y2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkzMjc1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4ZWQg YSBmZXcgY29tcGlsZSBwcm9ibGVtcyBmb3IgV2luNjQKKworICAgICAgICAqIFdpbkxhdW5jaGVy L1dpbkxhdW5jaGVyLmNwcDoKKyAgICAgICAgKiB3aW4vRExMTGF1bmNoZXIvRExMTGF1bmNoZXJN YWluLmNwcDoKKwogMjAxMi0wOC0wNiAgQmFsYXpzIEtlbGVtZW4gIDxrYmFsYXpzQHdlYmtpdC5v cmc+CiAKICAgICAgICAgV1RSIHNob3VsZCBiZSBhYmxlIHRvIGxvYWQgZXh0ZXJuYWwgcmVzb3Vy Y2VzCkluZGV4OiBUb29scy93aW4vRExMTGF1bmNoZXIvRExMTGF1bmNoZXJNYWluLmNwcA0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQ0KLS0tIFRvb2xzL3dpbi9ETExMYXVuY2hlci9ETExMYXVuY2hlck1haW4uY3BwCShy ZXZpc2lvbiAxMjQyMDEpDQorKysgVG9vbHMvd2luL0RMTExhdW5jaGVyL0RMTExhdW5jaGVyTWFp bi5jcHAJKHdvcmtpbmcgY29weSkNCkBAIC0xODQsMTEgKzE4NCwxOSBAQA0KIAogI2lmIFVTRV9D T05TT0xFX0VOVFJZX1BPSU5UCiAgICAgdHlwZWRlZiBpbnQgKFdJTkFQSSpFbnRyeVBvaW50KShp bnQsIGNvbnN0IGNoYXIqW10pOworI2lmZGVmIF9NX0FNRDY0CisgICAgY29uc3QgY2hhciogZW50 cnlQb2ludE5hbWUgPSAiZGxsTGF1bmNoZXJFbnRyeVBvaW50IjsKKyNlbHNlCiAgICAgY29uc3Qg Y2hhciogZW50cnlQb2ludE5hbWUgPSAiX2RsbExhdW5jaGVyRW50cnlQb2ludEA4IjsKKyNlbmRp ZgogI2Vsc2UKICAgICB0eXBlZGVmIGludCAoV0lOQVBJKkVudHJ5UG9pbnQpKEhJTlNUQU5DRSwg SElOU1RBTkNFLCBMUFdTVFIsIGludCk7CisjaWZkZWYgX01fQU1ENjQKKyAgICBjb25zdCBjaGFy KiBlbnRyeVBvaW50TmFtZSA9ICJkbGxMYXVuY2hlckVudHJ5UG9pbnQiOworI2Vsc2UKICAgICBj b25zdCBjaGFyKiBlbnRyeVBvaW50TmFtZSA9ICJfZGxsTGF1bmNoZXJFbnRyeVBvaW50QDE2IjsK ICNlbmRpZgorI2VuZGlmCiAKICAgICBFbnRyeVBvaW50IGVudHJ5UG9pbnQgPSByZWludGVycHJl dF9jYXN0PEVudHJ5UG9pbnQ+KDo6R2V0UHJvY0FkZHJlc3MobW9kdWxlLCBlbnRyeVBvaW50TmFt ZSkpOwogICAgIGlmICghZW50cnlQb2ludCkKSW5kZXg6IFRvb2xzL1dpbkxhdW5jaGVyL1dpbkxh dW5jaGVyLmNwcA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFRvb2xzL1dpbkxhdW5jaGVyL1dpbkxhdW5jaGVy LmNwcAkocmV2aXNpb24gMTI0MjAxKQ0KKysrIFRvb2xzL1dpbkxhdW5jaGVyL1dpbkxhdW5jaGVy LmNwcAkod29ya2luZyBjb3B5KQ0KQEAgLTIyOCw4ICsyMjgsOCBAQA0KIHN0YXRpYyB2b2lkIHN1 YmNsYXNzRm9yTGF5ZXJlZFdpbmRvdygpCiB7CiAgICAgaE1haW5XbmQgPSBnVmlld1dpbmRvdzsK LSAgICBEZWZXZWJLaXRQcm9jID0gcmVpbnRlcnByZXRfY2FzdDxXTkRQUk9DPig6OkdldFdpbmRv d0xvbmdQdHIoaE1haW5XbmQsIEdXTF9XTkRQUk9DKSk7Ci0gICAgOjpTZXRXaW5kb3dMb25nUHRy KGhNYWluV25kLCBHV0xfV05EUFJPQywgcmVpbnRlcnByZXRfY2FzdDxMT05HX1BUUj4oV25kUHJv YykpOworICAgIERlZldlYktpdFByb2MgPSByZWludGVycHJldF9jYXN0PFdORFBST0M+KDo6R2V0 V2luZG93TG9uZ1B0cihoTWFpblduZCwgR1dMUF9XTkRQUk9DKSk7CisgICAgOjpTZXRXaW5kb3dM b25nUHRyKGhNYWluV25kLCBHV0xQX1dORFBST0MsIHJlaW50ZXJwcmV0X2Nhc3Q8TE9OR19QVFI+ KFduZFByb2MpKTsKIH0KIAogc3RhdGljIHZvaWQgY29tcHV0ZUZ1bGxEZXNrdG9wRnJhbWUoKQpA QCAtMzE0LDggKzMxNCw4IEBADQogICAgICAgICBVcGRhdGVXaW5kb3coaE1haW5XbmQpOwogICAg IH0KIAotICAgIERlZkVkaXRQcm9jID0gcmVpbnRlcnByZXRfY2FzdDxXTkRQUk9DPihHZXRXaW5k b3dMb25nUHRyKGhVUkxCYXJXbmQsIEdXTF9XTkRQUk9DKSk7Ci0gICAgU2V0V2luZG93TG9uZ1B0 cihoVVJMQmFyV25kLCBHV0xfV05EUFJPQywgcmVpbnRlcnByZXRfY2FzdDxMT05HX1BUUj4oTXlF ZGl0UHJvYykpOworICAgIERlZkVkaXRQcm9jID0gcmVpbnRlcnByZXRfY2FzdDxXTkRQUk9DPihH ZXRXaW5kb3dMb25nUHRyKGhVUkxCYXJXbmQsIEdXTFBfV05EUFJPQykpOworICAgIFNldFdpbmRv d0xvbmdQdHIoaFVSTEJhclduZCwgR1dMUF9XTkRQUk9DLCByZWludGVycHJldF9jYXN0PExPTkdf UFRSPihNeUVkaXRQcm9jKSk7CiAgICAgU2V0Rm9jdXMoaFVSTEJhclduZCk7CiAKICAgICBSRUNU IGNsaWVudFJlY3QgPSB7IHNfd2luZG93UG9zaXRpb24ueCwgc193aW5kb3dQb3NpdGlvbi55LCBz X3dpbmRvd1Bvc2l0aW9uLnggKyBzX3dpbmRvd1NpemUuY3gsIHNfd2luZG93UG9zaXRpb24ueSAr IHNfd2luZG93U2l6ZS5jeSB9Owo= 156716 2012-08-06 10:00:15 -0700 2012-08-13 10:09:48 -0700 Patch bug-93275-20120806105803.patch text/plain 2897 alex.christensen SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDEyNDc3OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDEyLTA4LTA2ICBBbGV4IENocmlzdGVuc2VuICA8YWxleC5jaHJpc3RlbnNl bkBmbGV4c2ltLmNvbT4KKworICAgICAgICBXaW5kb3dzIDY0IGJpdCBjb21wbGlhbmNlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzI3NQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeGVkIGEgZmV3IGNv bXBpbGUgYW5kIGxpbmsgcHJvYmxlbXMgZm9yIFdpbjY0CisKKyAgICAgICAgKiBXaW5MYXVuY2hl ci9XaW5MYXVuY2hlci5jcHA6CisgICAgICAgICogd2luL0RMTExhdW5jaGVyL0RMTExhdW5jaGVy TWFpbi5jcHA6CisKIDIwMTItMDgtMDYgIEJhbGF6cyBLZWxlbWVuICA8a2JhbGF6c0B3ZWJraXQu b3JnPgogCiAgICAgICAgIFdUUiBzaG91bGQgYmUgYWJsZSB0byBsb2FkIGV4dGVybmFsIHJlc291 cmNlcwpJbmRleDogVG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL1dpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLmNwcAkocmV2aXNpb24gMTI0Nzc4KQor KysgVG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0y MjgsOCArMjI4LDggQEAgc3RhdGljIHZvaWQgcmVzaXplU3ViVmlld3MoKQogc3RhdGljIHZvaWQg c3ViY2xhc3NGb3JMYXllcmVkV2luZG93KCkKIHsKICAgICBoTWFpblduZCA9IGdWaWV3V2luZG93 OwotICAgIERlZldlYktpdFByb2MgPSByZWludGVycHJldF9jYXN0PFdORFBST0M+KDo6R2V0V2lu ZG93TG9uZ1B0cihoTWFpblduZCwgR1dMX1dORFBST0MpKTsKLSAgICA6OlNldFdpbmRvd0xvbmdQ dHIoaE1haW5XbmQsIEdXTF9XTkRQUk9DLCByZWludGVycHJldF9jYXN0PExPTkdfUFRSPihXbmRQ cm9jKSk7CisgICAgRGVmV2ViS2l0UHJvYyA9IHJlaW50ZXJwcmV0X2Nhc3Q8V05EUFJPQz4oOjpH ZXRXaW5kb3dMb25nUHRyKGhNYWluV25kLCBHV0xQX1dORFBST0MpKTsKKyAgICA6OlNldFdpbmRv d0xvbmdQdHIoaE1haW5XbmQsIEdXTFBfV05EUFJPQywgcmVpbnRlcnByZXRfY2FzdDxMT05HX1BU Uj4oV25kUHJvYykpOwogfQogCiBzdGF0aWMgdm9pZCBjb21wdXRlRnVsbERlc2t0b3BGcmFtZSgp CkBAIC0zMTQsOCArMzE0LDggQEAgZXh0ZXJuICJDIiBfX2RlY2xzcGVjKGRsbGV4cG9ydCkgaW50 IFdJTgogICAgICAgICBVcGRhdGVXaW5kb3coaE1haW5XbmQpOwogICAgIH0KIAotICAgIERlZkVk aXRQcm9jID0gcmVpbnRlcnByZXRfY2FzdDxXTkRQUk9DPihHZXRXaW5kb3dMb25nUHRyKGhVUkxC YXJXbmQsIEdXTF9XTkRQUk9DKSk7Ci0gICAgU2V0V2luZG93TG9uZ1B0cihoVVJMQmFyV25kLCBH V0xfV05EUFJPQywgcmVpbnRlcnByZXRfY2FzdDxMT05HX1BUUj4oTXlFZGl0UHJvYykpOworICAg IERlZkVkaXRQcm9jID0gcmVpbnRlcnByZXRfY2FzdDxXTkRQUk9DPihHZXRXaW5kb3dMb25nUHRy KGhVUkxCYXJXbmQsIEdXTFBfV05EUFJPQykpOworICAgIFNldFdpbmRvd0xvbmdQdHIoaFVSTEJh clduZCwgR1dMUF9XTkRQUk9DLCByZWludGVycHJldF9jYXN0PExPTkdfUFRSPihNeUVkaXRQcm9j KSk7CiAgICAgU2V0Rm9jdXMoaFVSTEJhclduZCk7CiAKICAgICBSRUNUIGNsaWVudFJlY3QgPSB7 IHNfd2luZG93UG9zaXRpb24ueCwgc193aW5kb3dQb3NpdGlvbi55LCBzX3dpbmRvd1Bvc2l0aW9u LnggKyBzX3dpbmRvd1NpemUuY3gsIHNfd2luZG93UG9zaXRpb24ueSArIHNfd2luZG93U2l6ZS5j eSB9OwpJbmRleDogVG9vbHMvd2luL0RMTExhdW5jaGVyL0RMTExhdW5jaGVyTWFpbi5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvd2luL0RMTExhdW5jaGVyL0RMTExhdW5jaGVyTWFpbi5jcHAJKHJl dmlzaW9uIDEyNDc3OCkKKysrIFRvb2xzL3dpbi9ETExMYXVuY2hlci9ETExMYXVuY2hlck1haW4u Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xODQsMTAgKzE4NCwxOCBAQCBpbnQgV0lOQVBJIHdXaW5N YWluKEhJTlNUQU5DRSBoSW5zdGFuY2UsCiAKICNpZiBVU0VfQ09OU09MRV9FTlRSWV9QT0lOVAog ICAgIHR5cGVkZWYgaW50IChXSU5BUEkqRW50cnlQb2ludCkoaW50LCBjb25zdCBjaGFyKltdKTsK KyNpZmRlZiBfTV9BTUQ2NAorICAgIGNvbnN0IGNoYXIqIGVudHJ5UG9pbnROYW1lID0gIl9kbGxM YXVuY2hlckVudHJ5UG9pbnQiOworI2Vsc2UKICAgICBjb25zdCBjaGFyKiBlbnRyeVBvaW50TmFt ZSA9ICJfZGxsTGF1bmNoZXJFbnRyeVBvaW50QDgiOworI2VuZGlmCiAjZWxzZQogICAgIHR5cGVk ZWYgaW50IChXSU5BUEkqRW50cnlQb2ludCkoSElOU1RBTkNFLCBISU5TVEFOQ0UsIExQV1NUUiwg aW50KTsKKyNpZmRlZiBfTV9BTUQ2NAogICAgIGNvbnN0IGNoYXIqIGVudHJ5UG9pbnROYW1lID0g Il9kbGxMYXVuY2hlckVudHJ5UG9pbnRAMTYiOworI2Vsc2UKKyAgICBjb25zdCBjaGFyKiBlbnRy eVBvaW50TmFtZSA9ICJfZGxsTGF1bmNoZXJFbnRyeVBvaW50QDE2IjsKKyNlbmRpZgogI2VuZGlm CiAKICAgICBFbnRyeVBvaW50IGVudHJ5UG9pbnQgPSByZWludGVycHJldF9jYXN0PEVudHJ5UG9p bnQ+KDo6R2V0UHJvY0FkZHJlc3MobW9kdWxlLCBlbnRyeVBvaW50TmFtZSkpOwo= 158031 2012-08-13 10:09:52 -0700 2012-08-13 20:20:48 -0700 Patch bug-93275-20120813110725.patch text/plain 3463 alex.christensen SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDEyNTQxOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDEyLTA4LTEzICBBbGV4IENocmlzdGVuc2VuICA8YWxleC5jaHJpc3RlbnNl bkBmbGV4c2ltLmNvbT4KKworICAgICAgICBXaW5kb3dzIDY0IGJpdCBjb21wbGlhbmNlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzI3NQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeGVkIGEgZmV3IGNv bXBpbGUgYW5kIGxpbmsgcHJvYmxlbXMgZm9yIFdpbjY0CisKKyAgICAgICAgKiBXaW5MYXVuY2hl ci9XaW5MYXVuY2hlci5jcHA6CisgICAgICAgICogd2luL0RMTExhdW5jaGVyL0RMTExhdW5jaGVy TWFpbi5jcHA6CisKIDIwMTItMDgtMTMgIE1pa2hhaWwgUG96ZG55YWtvdiAgPG1pa2hhaWwucG96 ZG55YWtvdkBpbnRlbC5jb20+CiAKICAgICAgICAgW1dLMl0gW1dUUl0gSW5qZWN0ZWRCdW5kbGVQ YWdlOjpkaWRGYWlsTG9hZEZvclJlc291cmNlIGludm9rZXMgd3JvbmcgY2FsbGJhY2sKSW5kZXg6 IFRvb2xzL1dpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9X aW5MYXVuY2hlci9XaW5MYXVuY2hlci5jcHAJKHJldmlzaW9uIDEyNTQxOSkKKysrIFRvb2xzL1dp bkxhdW5jaGVyL1dpbkxhdW5jaGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjI4LDggKzIyOCwx MyBAQCBzdGF0aWMgdm9pZCByZXNpemVTdWJWaWV3cygpCiBzdGF0aWMgdm9pZCBzdWJjbGFzc0Zv ckxheWVyZWRXaW5kb3coKQogewogICAgIGhNYWluV25kID0gZ1ZpZXdXaW5kb3c7Ci0gICAgRGVm V2ViS2l0UHJvYyA9IHJlaW50ZXJwcmV0X2Nhc3Q8V05EUFJPQz4oOjpHZXRXaW5kb3dMb25nUHRy KGhNYWluV25kLCBHV0xfV05EUFJPQykpOwotICAgIDo6U2V0V2luZG93TG9uZ1B0cihoTWFpbldu ZCwgR1dMX1dORFBST0MsIHJlaW50ZXJwcmV0X2Nhc3Q8TE9OR19QVFI+KFduZFByb2MpKTsKKyNp ZiBkZWZpbmVkIF9NX0FNRDY0IHx8IGRlZmluZWQgX1dJTjY0CisgICAgRGVmV2ViS2l0UHJvYyA9 IHJlaW50ZXJwcmV0X2Nhc3Q8V05EUFJPQz4oOjpHZXRXaW5kb3dMb25nUHRyKGhNYWluV25kLCBH V0xQX1dORFBST0MpKTsKKyAgICA6OlNldFdpbmRvd0xvbmdQdHIoaE1haW5XbmQsIEdXTFBfV05E UFJPQywgcmVpbnRlcnByZXRfY2FzdDxMT05HX1BUUj4oV25kUHJvYykpOworI2Vsc2UKKyAgICBE ZWZXZWJLaXRQcm9jID0gcmVpbnRlcnByZXRfY2FzdDxXTkRQUk9DPig6OkdldFdpbmRvd0xvbmco aE1haW5XbmQsIEdXTF9XTkRQUk9DKSk7CisgICAgOjpTZXRXaW5kb3dMb25nKGhNYWluV25kLCBH V0xfV05EUFJPQywgcmVpbnRlcnByZXRfY2FzdDxMT05HX1BUUj4oV25kUHJvYykpOworI2VuZGlm CiB9CiAKIHN0YXRpYyB2b2lkIGNvbXB1dGVGdWxsRGVza3RvcEZyYW1lKCkKQEAgLTMxNCw4ICsz MTksMTQgQEAgZXh0ZXJuICJDIiBfX2RlY2xzcGVjKGRsbGV4cG9ydCkgaW50IFdJTgogICAgICAg ICBVcGRhdGVXaW5kb3coaE1haW5XbmQpOwogICAgIH0KIAotICAgIERlZkVkaXRQcm9jID0gcmVp bnRlcnByZXRfY2FzdDxXTkRQUk9DPihHZXRXaW5kb3dMb25nUHRyKGhVUkxCYXJXbmQsIEdXTF9X TkRQUk9DKSk7Ci0gICAgU2V0V2luZG93TG9uZ1B0cihoVVJMQmFyV25kLCBHV0xfV05EUFJPQywg cmVpbnRlcnByZXRfY2FzdDxMT05HX1BUUj4oTXlFZGl0UHJvYykpOworI2lmIGRlZmluZWQgX01f QU1ENjQgfHwgZGVmaW5lZCBfV0lONjQKKyAgICBEZWZFZGl0UHJvYyA9IHJlaW50ZXJwcmV0X2Nh c3Q8V05EUFJPQz4oR2V0V2luZG93TG9uZ1B0cihoVVJMQmFyV25kLCBHV0xQX1dORFBST0MpKTsK KyAgICBTZXRXaW5kb3dMb25nUHRyKGhVUkxCYXJXbmQsIEdXTFBfV05EUFJPQywgcmVpbnRlcnBy ZXRfY2FzdDxMT05HX1BUUj4oTXlFZGl0UHJvYykpOworI2Vsc2UKKyAgICBEZWZFZGl0UHJvYyA9 IHJlaW50ZXJwcmV0X2Nhc3Q8V05EUFJPQz4oR2V0V2luZG93TG9uZyhoVVJMQmFyV25kLCBHV0xf V05EUFJPQykpOworICAgIFNldFdpbmRvd0xvbmcoaFVSTEJhclduZCwgR1dMX1dORFBST0MsIHJl aW50ZXJwcmV0X2Nhc3Q8TE9OR19QVFI+KE15RWRpdFByb2MpKTsKKyNlbmRpZgorCiAgICAgU2V0 Rm9jdXMoaFVSTEJhclduZCk7CiAKICAgICBSRUNUIGNsaWVudFJlY3QgPSB7IHNfd2luZG93UG9z aXRpb24ueCwgc193aW5kb3dQb3NpdGlvbi55LCBzX3dpbmRvd1Bvc2l0aW9uLnggKyBzX3dpbmRv d1NpemUuY3gsIHNfd2luZG93UG9zaXRpb24ueSArIHNfd2luZG93U2l6ZS5jeSB9OwpJbmRleDog VG9vbHMvd2luL0RMTExhdW5jaGVyL0RMTExhdW5jaGVyTWFpbi5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvd2luL0RMTExhdW5jaGVyL0RMTExhdW5jaGVyTWFpbi5jcHAJKHJldmlzaW9uIDEyNTQx OSkKKysrIFRvb2xzL3dpbi9ETExMYXVuY2hlci9ETExMYXVuY2hlck1haW4uY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xODQsMTEgKzE4NCwxOSBAQCBpbnQgV0lOQVBJIHdXaW5NYWluKEhJTlNUQU5D RSBoSW5zdGFuY2UsCiAKICNpZiBVU0VfQ09OU09MRV9FTlRSWV9QT0lOVAogICAgIHR5cGVkZWYg aW50IChXSU5BUEkqRW50cnlQb2ludCkoaW50LCBjb25zdCBjaGFyKltdKTsKKyNpZiBkZWZpbmVk IF9NX0FNRDY0IHx8IGRlZmluZWQgX1dJTjY0CisgICAgY29uc3QgY2hhciogZW50cnlQb2ludE5h bWUgPSAiX2RsbExhdW5jaGVyRW50cnlQb2ludCI7CisjZWxzZQogICAgIGNvbnN0IGNoYXIqIGVu dHJ5UG9pbnROYW1lID0gIl9kbGxMYXVuY2hlckVudHJ5UG9pbnRAOCI7CisjZW5kaWYKICNlbHNl CiAgICAgdHlwZWRlZiBpbnQgKFdJTkFQSSpFbnRyeVBvaW50KShISU5TVEFOQ0UsIEhJTlNUQU5D RSwgTFBXU1RSLCBpbnQpOworI2lmIGRlZmluZWQgX01fQU1ENjQgfHwgZGVmaW5lZCBfV0lONjQK KyAgICBjb25zdCBjaGFyKiBlbnRyeVBvaW50TmFtZSA9ICJfZGxsTGF1bmNoZXJFbnRyeVBvaW50 IjsKKyNlbHNlCiAgICAgY29uc3QgY2hhciogZW50cnlQb2ludE5hbWUgPSAiX2RsbExhdW5jaGVy RW50cnlQb2ludEAxNiI7CiAjZW5kaWYKKyNlbmRpZgogCiAgICAgRW50cnlQb2ludCBlbnRyeVBv aW50ID0gcmVpbnRlcnByZXRfY2FzdDxFbnRyeVBvaW50Pig6OkdldFByb2NBZGRyZXNzKG1vZHVs ZSwgZW50cnlQb2ludE5hbWUpKTsKICAgICBpZiAoIWVudHJ5UG9pbnQpCg==