38297 2010-04-28 17:42:56 -0700 Webkit doesn't compile with 3D-canvas enabled and video disabled 2010-05-02 00:12:50 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 noam webkit-unassigned commit-queue oldest_to_newest 218715 0 noam 2010-04-28 17:42:56 -0700 JSWebGLRenderingContextCustom.cpp contains video files without an #ifdef guard 218716 1 54643 noam 2010-04-28 17:44:37 -0700 Created attachment 54643 compile fix 218731 2 54643 darin 2010-04-28 17:52:15 -0700 Comment on attachment 54643 compile fix > #include "HTMLVideoElement.h" > #include "JSHTMLCanvasElement.h" > #include "JSHTMLImageElement.h" > +#if ENABLE(VIDEO) > #include "JSHTMLVideoElement.h" > +#endif > #include "JSImageData.h" > #include "JSWebGLBuffer.h" > #include "JSWebGLFloatArray.h" Conditional includes should go in their own paragraph, after the unconditional ones, not sorted in the include list. Sorry to be so picky about a minor aspect of the patch. 218764 3 54662 noam 2010-04-28 18:57:13 -0700 Created attachment 54662 paragraph style fix no problem with style nit-picks! they make the webkit code easier to read... 218871 4 54662 levin 2010-04-29 00:28:04 -0700 Comment on attachment 54662 paragraph style fix > diff --git a/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp b/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp > index e336027..9481a0c 100644 > --- a/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp > +++ b/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp > @@ -32,10 +32,18 @@ > #include "ExceptionCode.h" > #include "HTMLCanvasElement.h" > #include "HTMLImageElement.h" > + > +#if ENABLE(VIDEO) > #include "HTMLVideoElement.h" > +#endif > + > #include "JSHTMLCanvasElement.h" > #include "JSHTMLImageElement.h" > + > +#if ENABLE(VIDEO) > #include "JSHTMLVideoElement.h" > +#endif > + > #include "JSImageData.h" > #include "JSWebGLBuffer.h" > #include "JSWebGLFloatArray.h" This has the same problem that Darin noted last time. It should look some thing like this (note that the ifdef'ed includes are placed after all others): #include "ExceptionCode.h" #include "HTMLCanvasElement.h" #include "HTMLImageElement.h" #include "JSHTMLCanvasElement.h" #include "JSHTMLImageElement.h" #include "JSImageData.h" #include "JSWebGLBuffer.h" #include "JSWebGLFloatArray.h" #if ENABLE(VIDEO) #include "HTMLVideoElement.h" #include "JSHTMLVideoElement.h" #endif 219313 5 54766 noam 2010-04-29 18:07:48 -0700 Created attachment 54766 style fix to the style fix 219785 6 54766 commit-queue 2010-05-02 00:12:45 -0700 Comment on attachment 54766 style fix to the style fix Clearing flags on attachment: 54766 Committed r58642: <http://trac.webkit.org/changeset/58642> 219786 7 commit-queue 2010-05-02 00:12:50 -0700 All reviewed patches have been landed. Closing bug. 54643 2010-04-28 17:44:37 -0700 2010-04-28 18:57:13 -0700 compile fix patch-38297.diff text/plain 2771 noam ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDk3ZDgxYi4uMzIzMmZmOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wNC0yOCAgTm9hbSBSb3NlbnRo YWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgV2Via2l0IGRvZXNuJ3QgY29tcGlsZSB3aXRoIDNELWNh bnZhcyBlbmFibGVkIGFuZCB2aWRlbyBkaXNhYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzgyOTcKKworICAgICAgICBBZGRlZCBhICNpZmRlZiBF TkFCTEUoVklERU8pIHRvIFdlYkdMIGNvZGUKKworICAgICAgICBObyBuZXcgdGVzdHM6IGNvbXBp bGUgZml4LgorCisgICAgICAgICogYmluZGluZ3MvanMvSlNXZWJHTFJlbmRlcmluZ0NvbnRleHRD dXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SlNXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OnRl eEltYWdlMkQpOgorICAgICAgICAoV2ViQ29yZTo6SlNXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OnRl eFN1YkltYWdlMkQpOgorCiAyMDEwLTA0LTI4ICBBYmhpc2hlayBBcnlhICA8aW5mZXJub0BjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQg YS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTV2ViR0xSZW5kZXJpbmdDb250ZXh0Q3VzdG9tLmNwcCBi L1dlYkNvcmUvYmluZGluZ3MvanMvSlNXZWJHTFJlbmRlcmluZ0NvbnRleHRDdXN0b20uY3BwCmlu ZGV4IGUzMzYwMjcuLmEyODMxOGEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNX ZWJHTFJlbmRlcmluZ0NvbnRleHRDdXN0b20uY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvanMv SlNXZWJHTFJlbmRlcmluZ0NvbnRleHRDdXN0b20uY3BwCkBAIC0zNSw3ICszNSw5IEBACiAjaW5j bHVkZSAiSFRNTFZpZGVvRWxlbWVudC5oIgogI2luY2x1ZGUgIkpTSFRNTENhbnZhc0VsZW1lbnQu aCIKICNpbmNsdWRlICJKU0hUTUxJbWFnZUVsZW1lbnQuaCIKKyNpZiBFTkFCTEUoVklERU8pCiAj aW5jbHVkZSAiSlNIVE1MVmlkZW9FbGVtZW50LmgiCisjZW5kaWYKICNpbmNsdWRlICJKU0ltYWdl RGF0YS5oIgogI2luY2x1ZGUgIkpTV2ViR0xCdWZmZXIuaCIKICNpbmNsdWRlICJKU1dlYkdMRmxv YXRBcnJheS5oIgpAQCAtMzUyLDkgKzM1NCwxMSBAQCBKU1ZhbHVlIEpTV2ViR0xSZW5kZXJpbmdD b250ZXh0Ojp0ZXhJbWFnZTJEKEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgQXJnTGlzdCYgYXJncwog ICAgICAgICB9IGVsc2UgaWYgKG8tPmluaGVyaXRzKCZKU0hUTUxDYW52YXNFbGVtZW50OjpzX2lu Zm8pKSB7CiAgICAgICAgICAgICBIVE1MQ2FudmFzRWxlbWVudCogZWxlbWVudCA9IHN0YXRpY19j YXN0PEhUTUxDYW52YXNFbGVtZW50Kj4oc3RhdGljX2Nhc3Q8SlNIVE1MQ2FudmFzRWxlbWVudCo+ KG8pLT5pbXBsKCkpOwogICAgICAgICAgICAgY29udGV4dC0+dGV4SW1hZ2UyRCh0YXJnZXQsIGxl dmVsLCBlbGVtZW50LCBmbGlwWSwgcHJlbXVsdGlwbHlBbHBoYSwgZWMpOworI2lmIEVOQUJMRShW SURFTykKICAgICAgICAgfSBlbHNlIGlmIChvLT5pbmhlcml0cygmSlNIVE1MVmlkZW9FbGVtZW50 OjpzX2luZm8pKSB7CiAgICAgICAgICAgICBIVE1MVmlkZW9FbGVtZW50KiBlbGVtZW50ID0gc3Rh dGljX2Nhc3Q8SFRNTFZpZGVvRWxlbWVudCo+KHN0YXRpY19jYXN0PEpTSFRNTFZpZGVvRWxlbWVu dCo+KG8pLT5pbXBsKCkpOwogICAgICAgICAgICAgY29udGV4dC0+dGV4SW1hZ2UyRCh0YXJnZXQs IGxldmVsLCBlbGVtZW50LCBmbGlwWSwgcHJlbXVsdGlwbHlBbHBoYSwgZWMpOworI2VuZGlmCiAg ICAgICAgIH0gZWxzZQogICAgICAgICAgICAgZWMgPSBUWVBFX01JU01BVENIX0VSUjsKICAgICB9 IGVsc2UgewpAQCAtNDYxLDkgKzQ2NSwxMSBAQCBKU1ZhbHVlIEpTV2ViR0xSZW5kZXJpbmdDb250 ZXh0Ojp0ZXhTdWJJbWFnZTJEKEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgQXJnTGlzdCYgYQogICAg ICAgICB9IGVsc2UgaWYgKG8tPmluaGVyaXRzKCZKU0hUTUxDYW52YXNFbGVtZW50OjpzX2luZm8p KSB7CiAgICAgICAgICAgICBIVE1MQ2FudmFzRWxlbWVudCogZWxlbWVudCA9IHN0YXRpY19jYXN0 PEhUTUxDYW52YXNFbGVtZW50Kj4oc3RhdGljX2Nhc3Q8SlNIVE1MQ2FudmFzRWxlbWVudCo+KG8p LT5pbXBsKCkpOwogICAgICAgICAgICAgY29udGV4dC0+dGV4U3ViSW1hZ2UyRCh0YXJnZXQsIGxl dmVsLCB4b2ZmLCB5b2ZmLCBlbGVtZW50LCBmbGlwWSwgcHJlbXVsdGlwbHlBbHBoYSwgZWMpOwor I2lmIEVOQUJMRShWSURFTykKICAgICAgICAgfSBlbHNlIGlmIChvLT5pbmhlcml0cygmSlNIVE1M VmlkZW9FbGVtZW50OjpzX2luZm8pKSB7CiAgICAgICAgICAgICBIVE1MVmlkZW9FbGVtZW50KiBl bGVtZW50ID0gc3RhdGljX2Nhc3Q8SFRNTFZpZGVvRWxlbWVudCo+KHN0YXRpY19jYXN0PEpTSFRN TFZpZGVvRWxlbWVudCo+KG8pLT5pbXBsKCkpOwogICAgICAgICAgICAgY29udGV4dC0+dGV4U3Vi SW1hZ2UyRCh0YXJnZXQsIGxldmVsLCB4b2ZmLCB5b2ZmLCBlbGVtZW50LCBmbGlwWSwgcHJlbXVs dGlwbHlBbHBoYSwgZWMpOworI2VuZGlmCiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgZWMg PSBUWVBFX01JU01BVENIX0VSUjsKICAgICB9IGVsc2Ugewo= 54662 2010-04-28 18:57:13 -0700 2010-04-29 18:07:48 -0700 paragraph style fix patch-38297-2.diff text/plain 2907 noam ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDk3ZDgxYi4uMzIzMmZmOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wNC0yOCAgTm9hbSBSb3NlbnRo YWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgV2Via2l0IGRvZXNuJ3QgY29tcGlsZSB3aXRoIDNELWNh bnZhcyBlbmFibGVkIGFuZCB2aWRlbyBkaXNhYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzgyOTcKKworICAgICAgICBBZGRlZCBhICNpZmRlZiBF TkFCTEUoVklERU8pIHRvIFdlYkdMIGNvZGUKKworICAgICAgICBObyBuZXcgdGVzdHM6IGNvbXBp bGUgZml4LgorCisgICAgICAgICogYmluZGluZ3MvanMvSlNXZWJHTFJlbmRlcmluZ0NvbnRleHRD dXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SlNXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OnRl eEltYWdlMkQpOgorICAgICAgICAoV2ViQ29yZTo6SlNXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OnRl eFN1YkltYWdlMkQpOgorCiAyMDEwLTA0LTI4ICBBYmhpc2hlayBBcnlhICA8aW5mZXJub0BjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQg YS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTV2ViR0xSZW5kZXJpbmdDb250ZXh0Q3VzdG9tLmNwcCBi L1dlYkNvcmUvYmluZGluZ3MvanMvSlNXZWJHTFJlbmRlcmluZ0NvbnRleHRDdXN0b20uY3BwCmlu ZGV4IGUzMzYwMjcuLjk0ODFhMGMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNX ZWJHTFJlbmRlcmluZ0NvbnRleHRDdXN0b20uY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvanMv SlNXZWJHTFJlbmRlcmluZ0NvbnRleHRDdXN0b20uY3BwCkBAIC0zMiwxMCArMzIsMTggQEAKICNp bmNsdWRlICJFeGNlcHRpb25Db2RlLmgiCiAjaW5jbHVkZSAiSFRNTENhbnZhc0VsZW1lbnQuaCIK ICNpbmNsdWRlICJIVE1MSW1hZ2VFbGVtZW50LmgiCisKKyNpZiBFTkFCTEUoVklERU8pCiAjaW5j bHVkZSAiSFRNTFZpZGVvRWxlbWVudC5oIgorI2VuZGlmCisKICNpbmNsdWRlICJKU0hUTUxDYW52 YXNFbGVtZW50LmgiCiAjaW5jbHVkZSAiSlNIVE1MSW1hZ2VFbGVtZW50LmgiCisKKyNpZiBFTkFC TEUoVklERU8pCiAjaW5jbHVkZSAiSlNIVE1MVmlkZW9FbGVtZW50LmgiCisjZW5kaWYKKwogI2lu Y2x1ZGUgIkpTSW1hZ2VEYXRhLmgiCiAjaW5jbHVkZSAiSlNXZWJHTEJ1ZmZlci5oIgogI2luY2x1 ZGUgIkpTV2ViR0xGbG9hdEFycmF5LmgiCkBAIC0zNTIsOSArMzYwLDEzIEBAIEpTVmFsdWUgSlNX ZWJHTFJlbmRlcmluZ0NvbnRleHQ6OnRleEltYWdlMkQoRXhlY1N0YXRlKiBleGVjLCBjb25zdCBB cmdMaXN0JiBhcmdzCiAgICAgICAgIH0gZWxzZSBpZiAoby0+aW5oZXJpdHMoJkpTSFRNTENhbnZh c0VsZW1lbnQ6OnNfaW5mbykpIHsKICAgICAgICAgICAgIEhUTUxDYW52YXNFbGVtZW50KiBlbGVt ZW50ID0gc3RhdGljX2Nhc3Q8SFRNTENhbnZhc0VsZW1lbnQqPihzdGF0aWNfY2FzdDxKU0hUTUxD YW52YXNFbGVtZW50Kj4obyktPmltcGwoKSk7CiAgICAgICAgICAgICBjb250ZXh0LT50ZXhJbWFn ZTJEKHRhcmdldCwgbGV2ZWwsIGVsZW1lbnQsIGZsaXBZLCBwcmVtdWx0aXBseUFscGhhLCBlYyk7 CisKKyNpZiBFTkFCTEUoVklERU8pCiAgICAgICAgIH0gZWxzZSBpZiAoby0+aW5oZXJpdHMoJkpT SFRNTFZpZGVvRWxlbWVudDo6c19pbmZvKSkgewogICAgICAgICAgICAgSFRNTFZpZGVvRWxlbWVu dCogZWxlbWVudCA9IHN0YXRpY19jYXN0PEhUTUxWaWRlb0VsZW1lbnQqPihzdGF0aWNfY2FzdDxK U0hUTUxWaWRlb0VsZW1lbnQqPihvKS0+aW1wbCgpKTsKICAgICAgICAgICAgIGNvbnRleHQtPnRl eEltYWdlMkQodGFyZ2V0LCBsZXZlbCwgZWxlbWVudCwgZmxpcFksIHByZW11bHRpcGx5QWxwaGEs IGVjKTsKKyNlbmRpZgorCiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgZWMgPSBUWVBFX01J U01BVENIX0VSUjsKICAgICB9IGVsc2UgewpAQCAtNDYxLDkgKzQ3MywxMyBAQCBKU1ZhbHVlIEpT V2ViR0xSZW5kZXJpbmdDb250ZXh0Ojp0ZXhTdWJJbWFnZTJEKEV4ZWNTdGF0ZSogZXhlYywgY29u c3QgQXJnTGlzdCYgYQogICAgICAgICB9IGVsc2UgaWYgKG8tPmluaGVyaXRzKCZKU0hUTUxDYW52 YXNFbGVtZW50OjpzX2luZm8pKSB7CiAgICAgICAgICAgICBIVE1MQ2FudmFzRWxlbWVudCogZWxl bWVudCA9IHN0YXRpY19jYXN0PEhUTUxDYW52YXNFbGVtZW50Kj4oc3RhdGljX2Nhc3Q8SlNIVE1M Q2FudmFzRWxlbWVudCo+KG8pLT5pbXBsKCkpOwogICAgICAgICAgICAgY29udGV4dC0+dGV4U3Vi SW1hZ2UyRCh0YXJnZXQsIGxldmVsLCB4b2ZmLCB5b2ZmLCBlbGVtZW50LCBmbGlwWSwgcHJlbXVs dGlwbHlBbHBoYSwgZWMpOworCisjaWYgRU5BQkxFKFZJREVPKQogICAgICAgICB9IGVsc2UgaWYg KG8tPmluaGVyaXRzKCZKU0hUTUxWaWRlb0VsZW1lbnQ6OnNfaW5mbykpIHsKICAgICAgICAgICAg IEhUTUxWaWRlb0VsZW1lbnQqIGVsZW1lbnQgPSBzdGF0aWNfY2FzdDxIVE1MVmlkZW9FbGVtZW50 Kj4oc3RhdGljX2Nhc3Q8SlNIVE1MVmlkZW9FbGVtZW50Kj4obyktPmltcGwoKSk7CiAgICAgICAg ICAgICBjb250ZXh0LT50ZXhTdWJJbWFnZTJEKHRhcmdldCwgbGV2ZWwsIHhvZmYsIHlvZmYsIGVs ZW1lbnQsIGZsaXBZLCBwcmVtdWx0aXBseUFscGhhLCBlYyk7CisjZW5kaWYKKwogICAgICAgICB9 IGVsc2UKICAgICAgICAgICAgIGVjID0gVFlQRV9NSVNNQVRDSF9FUlI7CiAgICAgfSBlbHNlIHsK 54766 2010-04-29 18:07:48 -0700 2010-05-02 00:12:45 -0700 style fix to the style fix patch-38297-3.diff text/plain 3059 noam ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDk3ZDgxYi4uMzIzMmZmOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wNC0yOCAgTm9hbSBSb3NlbnRo YWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgV2Via2l0IGRvZXNuJ3QgY29tcGlsZSB3aXRoIDNELWNh bnZhcyBlbmFibGVkIGFuZCB2aWRlbyBkaXNhYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzgyOTcKKworICAgICAgICBBZGRlZCBhICNpZmRlZiBF TkFCTEUoVklERU8pIHRvIFdlYkdMIGNvZGUKKworICAgICAgICBObyBuZXcgdGVzdHM6IGNvbXBp bGUgZml4LgorCisgICAgICAgICogYmluZGluZ3MvanMvSlNXZWJHTFJlbmRlcmluZ0NvbnRleHRD dXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SlNXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OnRl eEltYWdlMkQpOgorICAgICAgICAoV2ViQ29yZTo6SlNXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OnRl eFN1YkltYWdlMkQpOgorCiAyMDEwLTA0LTI4ICBBYmhpc2hlayBBcnlhICA8aW5mZXJub0BjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQg YS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTV2ViR0xSZW5kZXJpbmdDb250ZXh0Q3VzdG9tLmNwcCBi L1dlYkNvcmUvYmluZGluZ3MvanMvSlNXZWJHTFJlbmRlcmluZ0NvbnRleHRDdXN0b20uY3BwCmlu ZGV4IGUzMzYwMjcuLjQxMDAwZmQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNX ZWJHTFJlbmRlcmluZ0NvbnRleHRDdXN0b20uY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvanMv SlNXZWJHTFJlbmRlcmluZ0NvbnRleHRDdXN0b20uY3BwCkBAIC0zMiwxMCArMzIsOCBAQAogI2lu Y2x1ZGUgIkV4Y2VwdGlvbkNvZGUuaCIKICNpbmNsdWRlICJIVE1MQ2FudmFzRWxlbWVudC5oIgog I2luY2x1ZGUgIkhUTUxJbWFnZUVsZW1lbnQuaCIKLSNpbmNsdWRlICJIVE1MVmlkZW9FbGVtZW50 LmgiCiAjaW5jbHVkZSAiSlNIVE1MQ2FudmFzRWxlbWVudC5oIgogI2luY2x1ZGUgIkpTSFRNTElt YWdlRWxlbWVudC5oIgotI2luY2x1ZGUgIkpTSFRNTFZpZGVvRWxlbWVudC5oIgogI2luY2x1ZGUg IkpTSW1hZ2VEYXRhLmgiCiAjaW5jbHVkZSAiSlNXZWJHTEJ1ZmZlci5oIgogI2luY2x1ZGUgIkpT V2ViR0xGbG9hdEFycmF5LmgiCkBAIC02MCw2ICs1OCwxMSBAQAogI2luY2x1ZGUgPHd0Zi9GYXN0 TWFsbG9jLmg+CiAjaW5jbHVkZSA8d3RmL093bkZhc3RNYWxsb2NQdHIuaD4KIAorI2lmIEVOQUJM RShWSURFTykKKyNpbmNsdWRlICJIVE1MVmlkZW9FbGVtZW50LmgiCisjaW5jbHVkZSAiSlNIVE1M VmlkZW9FbGVtZW50LmgiCisjZW5kaWYKKwogdXNpbmcgbmFtZXNwYWNlIEpTQzsKIAogbmFtZXNw YWNlIFdlYkNvcmUgewpAQCAtMzUyLDkgKzM1NSwxMSBAQCBKU1ZhbHVlIEpTV2ViR0xSZW5kZXJp bmdDb250ZXh0Ojp0ZXhJbWFnZTJEKEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgQXJnTGlzdCYgYXJn cwogICAgICAgICB9IGVsc2UgaWYgKG8tPmluaGVyaXRzKCZKU0hUTUxDYW52YXNFbGVtZW50Ojpz X2luZm8pKSB7CiAgICAgICAgICAgICBIVE1MQ2FudmFzRWxlbWVudCogZWxlbWVudCA9IHN0YXRp Y19jYXN0PEhUTUxDYW52YXNFbGVtZW50Kj4oc3RhdGljX2Nhc3Q8SlNIVE1MQ2FudmFzRWxlbWVu dCo+KG8pLT5pbXBsKCkpOwogICAgICAgICAgICAgY29udGV4dC0+dGV4SW1hZ2UyRCh0YXJnZXQs IGxldmVsLCBlbGVtZW50LCBmbGlwWSwgcHJlbXVsdGlwbHlBbHBoYSwgZWMpOworI2lmIEVOQUJM RShWSURFTykKICAgICAgICAgfSBlbHNlIGlmIChvLT5pbmhlcml0cygmSlNIVE1MVmlkZW9FbGVt ZW50OjpzX2luZm8pKSB7CiAgICAgICAgICAgICBIVE1MVmlkZW9FbGVtZW50KiBlbGVtZW50ID0g c3RhdGljX2Nhc3Q8SFRNTFZpZGVvRWxlbWVudCo+KHN0YXRpY19jYXN0PEpTSFRNTFZpZGVvRWxl bWVudCo+KG8pLT5pbXBsKCkpOwogICAgICAgICAgICAgY29udGV4dC0+dGV4SW1hZ2UyRCh0YXJn ZXQsIGxldmVsLCBlbGVtZW50LCBmbGlwWSwgcHJlbXVsdGlwbHlBbHBoYSwgZWMpOworI2VuZGlm CiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgZWMgPSBUWVBFX01JU01BVENIX0VSUjsKICAg ICB9IGVsc2UgewpAQCAtNDYxLDkgKzQ2NiwxMSBAQCBKU1ZhbHVlIEpTV2ViR0xSZW5kZXJpbmdD b250ZXh0Ojp0ZXhTdWJJbWFnZTJEKEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgQXJnTGlzdCYgYQog ICAgICAgICB9IGVsc2UgaWYgKG8tPmluaGVyaXRzKCZKU0hUTUxDYW52YXNFbGVtZW50OjpzX2lu Zm8pKSB7CiAgICAgICAgICAgICBIVE1MQ2FudmFzRWxlbWVudCogZWxlbWVudCA9IHN0YXRpY19j YXN0PEhUTUxDYW52YXNFbGVtZW50Kj4oc3RhdGljX2Nhc3Q8SlNIVE1MQ2FudmFzRWxlbWVudCo+ KG8pLT5pbXBsKCkpOwogICAgICAgICAgICAgY29udGV4dC0+dGV4U3ViSW1hZ2UyRCh0YXJnZXQs IGxldmVsLCB4b2ZmLCB5b2ZmLCBlbGVtZW50LCBmbGlwWSwgcHJlbXVsdGlwbHlBbHBoYSwgZWMp OworI2lmIEVOQUJMRShWSURFTykKICAgICAgICAgfSBlbHNlIGlmIChvLT5pbmhlcml0cygmSlNI VE1MVmlkZW9FbGVtZW50OjpzX2luZm8pKSB7CiAgICAgICAgICAgICBIVE1MVmlkZW9FbGVtZW50 KiBlbGVtZW50ID0gc3RhdGljX2Nhc3Q8SFRNTFZpZGVvRWxlbWVudCo+KHN0YXRpY19jYXN0PEpT SFRNTFZpZGVvRWxlbWVudCo+KG8pLT5pbXBsKCkpOwogICAgICAgICAgICAgY29udGV4dC0+dGV4 U3ViSW1hZ2UyRCh0YXJnZXQsIGxldmVsLCB4b2ZmLCB5b2ZmLCBlbGVtZW50LCBmbGlwWSwgcHJl bXVsdGlwbHlBbHBoYSwgZWMpOworI2VuZGlmCiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAg ZWMgPSBUWVBFX01JU01BVENIX0VSUjsKICAgICB9IGVsc2Ugewo=