95468 2012-08-30 09:17:06 -0700 [Qt] QNX triggers compile errors in ANGLE due to missing std:: 2014-01-09 20:58:34 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 74040 95466 1 milian.wolff milian.wolff abecsi bfulgham ddkilzer dino hausmann iamsergio kbr pravind.2k4 webkit.review.bot zmo oldest_to_newest 708701 0 milian.wolff 2012-08-30 09:17:06 -0700 Various constructs in the ANGLE third party library reference code from cstring or similar headers without the explicit std:: namespace identifier. On other platforms this is apparently not an issue, one guess from Simon is: [13:30] <tronical> milian: I suppose an implicit inclusion of string.h from somewhere, so that the extern "C" variant of strlen is chosen? On QNX though, this is not the case and various compile errors arise. Expect a patch from me. 709471 1 161657 milian.wolff 2012-08-31 04:02:31 -0700 Created attachment 161657 Patch 709473 2 webkit.review.bot 2012-08-31 04:05:03 -0700 Attachment 161657 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/ThirdParty/ANGLE/ChangeLog', u'Sour..." exit_code: 1 Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/DirectiveParser.cpp:712: More than one command on the same line in if [whitespace/parens] [4] Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/DirectiveParser.cpp:762: More than one command on the same line in if [whitespace/parens] [4] Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/DirectiveParser.cpp:771: More than one command on the same line in if [whitespace/parens] [4] Total errors found: 3 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 709489 3 milian.wolff 2012-08-31 04:43:39 -0700 The style errors existed in ANGLE codebase already, I didn't change them on purpose. Should I though? 709664 4 pravind.2k4 2012-08-31 08:46:49 -0700 (In reply to comment #3) > The style errors existed in ANGLE codebase already, I didn't change them on purpose. Should I though? > The previous code also had this problem(in correct style) i guess. The webkit style check script applies only to the code that has been changed. That is only to code added/modified by your patch. just bring the line content after the if() to the line below. See http://www.webkit.org/coding/coding-style.html Hope this helps... 709721 5 milian.wolff 2012-08-31 09:36:44 -0700 This means though that the patch will break the code style of the surrounding file, just to get it accepted in WebKit? Assuming I upstream the patch as-is to ANGLE, would I still need to change it to get it into WebKit and thus create a diversion? 709756 6 161657 darin 2012-08-31 10:25:02 -0700 Comment on attachment 161657 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=161657&action=review > Source/ThirdParty/ANGLE/ChangeLog:12 > + Add the explicit std:: qualifier to uses of std functions and types. > + On other platforms this is apparently not required due to implicit > + inclusion of "string.h"-style headers containing extern "C" variants. > + On QNX at least this is not the case though, resulting in compile > + errors. Wouldn't a simpler way to fix this would be to add one or more includes of <string.h>? 731738 7 milian.wolff 2012-10-01 09:17:56 -0700 also blocks 74040 740805 8 milian.wolff 2012-10-12 04:39:13 -0700 Upstream patch: https://codereview.appspot.com/6653048 747253 9 hausmann 2012-10-21 23:35:22 -0700 (In reply to comment #6) > (From update of attachment 161657 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=161657&action=review > > > Source/ThirdParty/ANGLE/ChangeLog:12 > > + Add the explicit std:: qualifier to uses of std functions and types. > > + On other platforms this is apparently not required due to implicit > > + inclusion of "string.h"-style headers containing extern "C" variants. > > + On QNX at least this is not the case though, resulting in compile > > + errors. > > Wouldn't a simpler way to fix this would be to add one or more includes of <string.h>? Millian, did you see Darin's comment? If that works then it would seem like a much simpler solution :) 756358 10 milian.wolff 2012-11-01 09:46:19 -0700 Yes, I saw Darin's comment, but wonder why it should be done instead of adding the explicit std:: qualified identifier. Example: When trying to compile DirectiveParser.cpp into DirectiveParser.o, we get (without this patch): qcc -Vgcc_ntoarmv7le -c -Wno-psabi -lang-c++ -O2 -fvisibility=hidden -fvisibility-inlines-hidden -fPIC -D_REENTRANT -DQT_NO_CLIPBOARD -DQT_NO_LIBUDEV -DQT_NO_EVDEV -DQT_NO_XCB -DBUILDING_QT__=1 -DNDEBUG -DENABLE_3D_RENDERING=1 -DENABLE_BLOB=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_CSS_BOX_DECORATION_BREAK=1 -DENABLE_CSS_COMPOSITING=1 -DENABLE_CSS_EXCLUSIONS=1 -DENABLE_CSS_FILTERS=1 -DENABLE_CSS_IMAGE_SET=1 -DENABLE_CSS_REGIONS=1 -DENABLE_CSS_STICKY_POSITION=1 -DENABLE_DATALIST_ELEMENT=1 -DENABLE_DETAILS_ELEMENT=1 -DENABLE_FAST_MOBILE_SCROLLING=1 -DENABLE_FILTERS=1 -DENABLE_FTPDIR=1 -DENABLE_FULLSCREEN_API=1 -DENABLE_GESTURE_EVENTS=1 -DENABLE_ICONDATABASE=1 -DENABLE_IFRAME_SEAMLESS=1 -DENABLE_INPUT_TYPE_COLOR=1 -DENABLE_INSPECTOR=1 -DENABLE_INSPECTOR_SERVER=1 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_LEGACY_NOTIFICATIONS=1 -DENABLE_LEGACY_VIEWPORT_ADAPTION=1 -DENABLE_LEGACY_VENDOR_PREFIXES=1 -DENABLE_METER_ELEMENT=1 -DENABLE_NOTIFICATIONS=1 -DENABLE_PAGE_VISIBILITY_API=1 -DENABLE_PROGRESS_ELEMENT=1 -DENABLE_RESOLUTION_MEDIA_QUERY=1 -DENABLE_REQUEST_ANIMATION_FRAME=1 -DENABLE_SHARED_WORKERS=1 -DENABLE_SMOOTH_SCROLLING=1 -DENABLE_SQL_DATABASE=1 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ADJUSTMENT=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_WEB_TIMING=1 -DENABLE_WORKERS=1 -DWTF_USE_TILED_BACKING_STORE=1 -DHAVE_QTQUICK=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_ZLIB=1 -DPLUGIN_ARCHITECTURE_UNSUPPORTED=1 -DWTF_USE_3D_GRAPHICS=1 -DENABLE_WEBGL=1 -DENABLE_CSS_SHADERS=1 -DENABLE_TOUCH_SLIDER=1 -DENABLE_ACCELERATED_2D_CANVAS=0 -DENABLE_ANIMATION_API=0 -DENABLE_BATTERY_STATUS=0 -DENABLE_CSP_NEXT=0 -DENABLE_CSS_GRID_LAYOUT=0 -DENABLE_CSS_HIERARCHIES=0 -DENABLE_CSS_IMAGE_ORIENTATION=0 -DENABLE_CSS_IMAGE_RESOLUTION=0 -DENABLE_CSS_VARIABLES=0 -DENABLE_CSS3_CONDITIONAL_RULES=0 -DENABLE_CSS3_TEXT=0 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_DATAGRID=0 -DENABLE_DATA_TRANSFER_ITEMS=0 -DENABLE_DEVICE_ORIENTATION=0 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_DOWNLOAD_ATTRIBUTE=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_GAMEPAD=0 -DENABLE_GEOLOCATION=0 -DENABLE_HIGH_DPI_CANVAS=0 -DENABLE_INDEXED_DATABASE=0 -DENABLE_INPUT_SPEECH=0 -DENABLE_INPUT_TYPE_DATE=0 -DENABLE_INPUT_TYPE_DATETIME=0 -DENABLE_INPUT_TYPE_DATETIMELOCAL=0 -DENABLE_INPUT_TYPE_MONTH=0 -DENABLE_INPUT_TYPE_TIME=0 -DENABLE_INPUT_TYPE_WEEK=0 -DENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 -DENABLE_LINK_PREFETCH=0 -DENABLE_LINK_PRERENDER=0 -DENABLE_MATHML=0 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_MHTML=0 -DENABLE_MICRODATA=0 -DENABLE_MUTATION_OBSERVERS=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=0 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_NETWORK_INFO=0 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_QUOTA=0 -DENABLE_SCRIPTED_SPEECH=0 -DENABLE_SHADOW_DOM=0 -DENABLE_STYLE_SCOPED=0 -DENABLE_SVG_DOM_OBJC_BINDINGS=0 -DENABLE_TEXT_AUTOSIZING=0 -DENABLE_TEXT_NOTIFICATIONS_ONLY=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_UNDO_MANAGER=0 -DENABLE_VIBRATION=0 -DENABLE_VIDEO=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_WEB_AUDIO=0 -DENABLE_XSLT=0 -DBUILDING_ANGLE -DBUILDING_WEBKIT -DQT_ASCII_CAST_WARNINGS -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -I/home/milian/projects/qt5/install-qnx650/mkspecs/qnx-armv7le-qcc -I/home/milian/projects/qt5/qtwebkit/Source/ThirdParty/ANGLE -I.moc/debug-shared -I/home/milian/projects/qt5/qtwebkit/Source/ThirdParty/ANGLE/include/GLSLANG -I/home/milian/projects/qt5/qtwebkit/Source/ThirdParty/ANGLE/src -I/home/milian/projects/qt5/qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor/new -I/home/milian/projects/qt5/qtwebkit/Source/ThirdParty/ANGLE/include -I/home/milian/projects/qt5/qtwebkit/Source -I/home/milian/projects/qt5/build-qnx650/qtwebkit/Source/include -I/home/milian/projects/qt5/install-qnx650/include -I/home/milian/projects/qt5/install-qnx650/include/QtScript -I/opt/qnx650/target/qnx6/usr/include -I/opt/qnx650/target/qnx6/usr/include/freetype2 -I. -o obj/debug/src/compiler/preprocessor/new/DirectiveParser.o /home/milian/projects/qt5/qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/DirectiveParser.cpp In file included from /home/milian/projects/qt5/qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/DirectiveParser.cpp:16: /home/milian/projects/qt5/qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/MacroExpander.h:55: error: 'size_t' does not name a type /home/milian/projects/qt5/qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/MacroExpander.h: In constructor 'pp::MacroExpander::MacroContext::MacroContext()': /home/milian/projects/qt5/qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/MacroExpander.h:58: error: class 'pp::MacroExpander::MacroContext' does not have any field named 'index' /home/milian/projects/qt5/qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/MacroExpander.h: In member function 'bool pp::MacroExpander::MacroContext::empty() const': /home/milian/projects/qt5/qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/MacroExpander.h:59: error: ISO C++ forbids comparison between pointer and integer /home/milian/projects/qt5/qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/MacroExpander.h: In member function 'const pp::Token& pp::MacroExpander::MacroContext::get()': /home/milian/projects/qt5/qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/MacroExpander.h:60: error: ISO C++ forbids incrementing a pointer of type 'const char* (*)(const char*, int)' /home/milian/projects/qt5/qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/MacroExpander.h:60: error: lvalue required as increment operand /home/milian/projects/qt5/qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/MacroExpander.h: In member function 'void pp::MacroExpander::MacroContext::unget()': /home/milian/projects/qt5/qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/MacroExpander.h:61: error: ISO C++ forbids decrementing a pointer of type 'const char* (*)(const char*, int)' /home/milian/projects/qt5/qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/MacroExpander.h:61: error: lvalue required as decrement operand /home/milian/projects/qt5/qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/DirectiveParser.cpp: In member function 'void pp::DirectiveParser::parseVersion(pp::Token*)': /home/milian/projects/qt5/qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/DirectiveParser.cpp:712: error: 'atoi' was not declared in this scope /home/milian/projects/qt5/qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/DirectiveParser.cpp: In member function 'void pp::DirectiveParser::parseLine(pp::Token*)': /home/milian/projects/qt5/qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/DirectiveParser.cpp:762: error: 'atoi' was not declared in this scope /home/milian/projects/qt5/qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/DirectiveParser.cpp:771: error: 'atoi' was not declared in this scope cc: /opt/qnx650/host/linux/x86/usr/lib/gcc/arm-unknown-nto-qnx6.5.0eabi/4.4.2/cc1plus error 1 make[2]: *** [obj/debug/src/compiler/preprocessor/new/DirectiveParser.o] Error 1 make[2]: Leaving directory `/home/milian/projects/qt5/build-qnx650/qtwebkit/Source/ThirdParty/ANGLE' Where would you add the include to string.h? Into MacroExpander.h? DirectiveParser.cpp? But then again, if I'm patching ANGLE sources, I can also fix it by adding the std:: namespace identifier. Anyhow, I'll ask the ANGLE people on what they prefer, so far noone has taken an interest in my patch. 762685 11 iamsergio 2012-11-09 01:09:06 -0800 > [13:30] <tronical> milian: I suppose an implicit inclusion of string.h from > somewhere, so that the extern "C" variant of strlen is chosen? string.h isn't being included. What happens is that some compilers, when including the cstring, cstdlib etc, will also define the stuff in global namespace. QNX's compiler does'n do this, but it isn't a compiler bug, as the standard doesn't specify: http://stackoverflow.com/questions/9149368/is-it-ok-to-qualify-c-functions-with-the-std-namespace > > Wouldn't a simpler way to fix this would be to add one or more includes of <string.h>? > > Millian, did you see Darin's comment? If that works then it would seem like a much simpler solution :) Build also fails on malloc(), we would need stdlib.h too, we're opening a can of worms. IMO, duplicating C and C++ headers is not a good solution. Besides, C header usage in C++ is discouraged by the standard. A couple of "using" or std:: would be best. 770730 12 174978 milian.wolff 2012-11-19 07:27:19 -0800 Created attachment 174978 Patch Updated patch. I'll still try to resolve this issue somehow in ANGLE upstream... 770792 13 milian.wolff 2012-11-19 08:53:46 -0800 Upstream ANGLE diverged quite a bit, I've submitted a patch but I'm not sure whether that is all that is required to get it working for WebKit. See: https://codereview.appspot.com/6843083/ 780040 14 milian.wolff 2012-11-30 05:32:07 -0800 Ok, my patch was accepted upstream in ANGLE. What do I do now to get this issue resolved in WebKit? Do I have to submit a patch that updates the local checkout of ANGLE in the WebKit source tree? See: https://codereview.appspot.com/6843083/ Considering that upstream ANGLE diverged, we cannot apply the patch from there 1to1 to the WebKit copy. 780085 15 abecsi 2012-11-30 07:06:16 -0800 I've seen patches against the copy of ANGLE in WebKit, but I'm not sure that's the right way. CC'ing a couple of people who might know how updates are done. 780244 16 kbr 2012-11-30 11:06:28 -0800 @dino did the last major update of the copy of ANGLE in WebKit. 787606 17 dino 2012-12-10 11:48:55 -0800 (In reply to comment #16) > @dino did the last major update of the copy of ANGLE in WebKit. WebKit ANGLE diverged from upstream ANGLE, but maybe we can sync back up now. I'll look into this. 787608 18 dino 2012-12-10 11:50:19 -0800 (In reply to comment #17) > (In reply to comment #16) > > @dino did the last major update of the copy of ANGLE in WebKit. > > WebKit ANGLE diverged from upstream ANGLE, but maybe we can sync back up now. I'll look into this. If this is urgent, and it is already landed in upstream, then you can apply to the WebKit fork. The goal is to get back onto the official ANGLE as soon as possible, so that we can avoid these situations. 966210 19 bfulgham 2014-01-09 20:58:34 -0800 The QT port is no longer part of WebKit. 161657 2012-08-31 04:02:31 -0700 2012-11-19 07:27:19 -0800 Patch bug-95468-20120831130218.patch text/plain 7167 milian.wolff U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3MjQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggYjc0YzZkNTM3ZmRjZjNiMWU4OTM4NmMzMTkxMGQ5OWFiNDJjZmFhNC4uMzg1NmE3Y2RmNTg2 NDNmZDc4M2IwMTg1OGFjODA4YzYyMjJjYjdlMCAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTA4LTMxICBNaWxpYW4gV29sZmYgIDxtaWxpYW4ud29s ZmZAa2RhYi5jb20+CisKKyAgICAgICAgW1F0XSBRTlggdHJpZ2dlcnMgY29tcGlsZSBlcnJvcnMg aW4gQU5HTEUgZHVlIHRvIG1pc3Npbmcgc3RkOjoKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTk1NDY4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWRkIHRoZSBleHBsaWNpdCBzdGQ6OiBxdWFsaWZpZXIgdG8g dXNlcyBvZiBzdGQgZnVuY3Rpb25zIGFuZCB0eXBlcy4KKyAgICAgICAgT24gb3RoZXIgcGxhdGZv cm1zIHRoaXMgaXMgYXBwYXJlbnRseSBub3QgcmVxdWlyZWQgZHVlIHRvIGltcGxpY2l0CisgICAg ICAgIGluY2x1c2lvbiBvZiAic3RyaW5nLmgiLXN0eWxlIGhlYWRlcnMgY29udGFpbmluZyBleHRl cm4gIkMiIHZhcmlhbnRzLgorICAgICAgICBPbiBRTlggYXQgbGVhc3QgdGhpcyBpcyBub3QgdGhl IGNhc2UgdGhvdWdoLCByZXN1bHRpbmcgaW4gY29tcGlsZQorICAgICAgICBlcnJvcnMuCisKKyAg ICAgICAgKiBzcmMvY29tcGlsZXIvcHJlcHJvY2Vzc29yL25ldy9EaXJlY3RpdmVQYXJzZXIuY3Bw OgorICAgICAgICAocHA6OkRpcmVjdGl2ZVBhcnNlcjo6cGFyc2VWZXJzaW9uKToKKyAgICAgICAg KHBwOjpEaXJlY3RpdmVQYXJzZXI6OnBhcnNlTGluZSk6CisgICAgICAgICogc3JjL2NvbXBpbGVy L3ByZXByb2Nlc3Nvci9uZXcvSW5wdXQuY3BwOgorICAgICAgICAocHA6OklucHV0OjpJbnB1dCk6 CisgICAgICAgIChwcDo6SW5wdXQ6OnJlYWQpOgorICAgICAgICAqIHNyYy9jb21waWxlci9wcmVw cm9jZXNzb3IvbmV3L01hY3JvRXhwYW5kZXIuY3BwOgorICAgICAgICAocHA6Ok1hY3JvRXhwYW5k ZXI6OmV4cGFuZE1hY3JvKToKKyAgICAgICAgKHBwOjpNYWNyb0V4cGFuZGVyOjpjb2xsZWN0TWFj cm9BcmdzKToKKyAgICAgICAgKHBwOjpNYWNyb0V4cGFuZGVyOjpyZXBsYWNlTWFjcm9QYXJhbXMp OgorICAgICAgICAqIHNyYy9jb21waWxlci9wcmVwcm9jZXNzb3IvbmV3L01hY3JvRXhwYW5kZXIu aDoKKyAgICAgICAgKE1hY3JvQ29udGV4dCk6CisKIDIwMTItMDgtMjQgIEpvc2h1YSBOZXR0ZXJm aWVsZCAgPGpuZXR0ZXJmaWVsZEByaW0uY29tPgogCiAgICAgICAgIFtDU1MgU2hhZGVyc10gW0FO R0xFXSBSZW5hbWVGdW5jdGlvbjo6UmVuYW1lRnVuY3Rpb24gbWF5IHN0b3JlIHJlZmVyZW5jZXMg dG8gdGVtcG9yYXJ5IHN0cmluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUv c3JjL2NvbXBpbGVyL3ByZXByb2Nlc3Nvci9uZXcvRGlyZWN0aXZlUGFyc2VyLmNwcCBiL1NvdXJj ZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci9wcmVwcm9jZXNzb3IvbmV3L0RpcmVjdGl2 ZVBhcnNlci5jcHAKaW5kZXggNTg1YTkwZTU5N2M2ZmY3NDgwM2FjZjE0YjM1Zjc3Njk5YTQyYjlj OS4uMDEyM2JjZmM3YmI5MDU4YTE2YTNmYjJiMDZkNjY0MzJkYWYzNDgxZSAxMDA2NDQKLS0tIGEv U291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL3ByZXByb2Nlc3Nvci9uZXcvRGly ZWN0aXZlUGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGls ZXIvcHJlcHJvY2Vzc29yL25ldy9EaXJlY3RpdmVQYXJzZXIuY3BwCkBAIC03MDksNyArNzA5LDcg QEAgdm9pZCBEaXJlY3RpdmVQYXJzZXI6OnBhcnNlVmVyc2lvbihUb2tlbiogdG9rZW4pCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdG9rZW4tPmxvY2F0aW9uLCB0b2tlbi0+ dmFsdWUpOwogICAgICAgICAgICAgICAgIHZhbGlkID0gZmFsc2U7CiAgICAgICAgICAgICB9Ci0g ICAgICAgICAgICBpZiAodmFsaWQpIHZlcnNpb24gPSBhdG9pKHRva2VuLT52YWx1ZS5jX3N0cigp KTsKKyAgICAgICAgICAgIGlmICh2YWxpZCkgdmVyc2lvbiA9IHN0ZDo6YXRvaSh0b2tlbi0+dmFs dWUuY19zdHIoKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICBkZWZhdWx0OgogICAg ICAgICAgICAgaWYgKHZhbGlkKQpAQCAtNzU5LDcgKzc1OSw3IEBAIHZvaWQgRGlyZWN0aXZlUGFy c2VyOjpwYXJzZUxpbmUoVG9rZW4qIHRva2VuKQogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHRva2VuLT5sb2NhdGlvbiwgdG9rZW4tPnZhbHVlKTsKICAgICAgICAgICAgICAg ICB2YWxpZCA9IGZhbHNlOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgaWYgKHZhbGlkKSBs aW5lID0gYXRvaSh0b2tlbi0+dmFsdWUuY19zdHIoKSk7CisgICAgICAgICAgICBpZiAodmFsaWQp IGxpbmUgPSBzdGQ6OmF0b2kodG9rZW4tPnZhbHVlLmNfc3RyKCkpOwogICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgICAgY2FzZSBGSUxFX05VTUJFUjoKICAgICAgICAgICAgIGlmICh2YWxpZCAm JiAodG9rZW4tPnR5cGUgIT0gVG9rZW46OkNPTlNUX0lOVCkpCkBAIC03NjgsNyArNzY4LDcgQEAg dm9pZCBEaXJlY3RpdmVQYXJzZXI6OnBhcnNlTGluZShUb2tlbiogdG9rZW4pCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgdG9rZW4tPmxvY2F0aW9uLCB0b2tlbi0+dmFsdWUp OwogICAgICAgICAgICAgICAgIHZhbGlkID0gZmFsc2U7CiAgICAgICAgICAgICB9Ci0gICAgICAg ICAgICBpZiAodmFsaWQpIGZpbGUgPSBhdG9pKHRva2VuLT52YWx1ZS5jX3N0cigpKTsKKyAgICAg ICAgICAgIGlmICh2YWxpZCkgZmlsZSA9IHN0ZDo6YXRvaSh0b2tlbi0+dmFsdWUuY19zdHIoKSk7 CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgaWYg KHZhbGlkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVy L3ByZXByb2Nlc3Nvci9uZXcvSW5wdXQuY3BwIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3Jj L2NvbXBpbGVyL3ByZXByb2Nlc3Nvci9uZXcvSW5wdXQuY3BwCmluZGV4IGMzZGU5NWYzMTNkNWQx MDlkNTExZDI2MzkzYjk2NDg4YTNkYmE5MTYuLjExODY4YzFjZDViOTk1ZmY4NGYxMTgxODcxNDUy ZTE0ZmU3OWU1MGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21w aWxlci9wcmVwcm9jZXNzb3IvbmV3L0lucHV0LmNwcAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9B TkdMRS9zcmMvY29tcGlsZXIvcHJlcHJvY2Vzc29yL25ldy9JbnB1dC5jcHAKQEAgLTI2LDcgKzI2 LDcgQEAgSW5wdXQ6OklucHV0KGludCBjb3VudCwgY29uc3QgY2hhciogY29uc3Qgc3RyaW5nW10s IGNvbnN0IGludCBsZW5ndGhbXSkgOgogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbUNvdW50OyAr K2kpCiAgICAgewogICAgICAgICBpbnQgbGVuID0gbGVuZ3RoID8gbGVuZ3RoW2ldIDogLTE7Ci0g ICAgICAgIG1MZW5ndGgucHVzaF9iYWNrKGxlbiA8IDAgPyBzdHJsZW4obVN0cmluZ1tpXSkgOiBs ZW4pOworICAgICAgICBtTGVuZ3RoLnB1c2hfYmFjayhsZW4gPCAwID8gc3RkOjpzdHJsZW4obVN0 cmluZ1tpXSkgOiBsZW4pOwogICAgIH0KIH0KIApAQCAtMzcsNyArMzcsNyBAQCBpbnQgSW5wdXQ6 OnJlYWQoY2hhciogYnVmLCBpbnQgbWF4U2l6ZSkKICAgICB7CiAgICAgICAgIGludCBzaXplID0g bUxlbmd0aFttUmVhZExvYy5zSW5kZXhdIC0gbVJlYWRMb2MuY0luZGV4OwogICAgICAgICBzaXpl ID0gc3RkOjptaW4oc2l6ZSwgbWF4U2l6ZSk7Ci0gICAgICAgIG1lbWNweShidWYgKyBuUmVhZCwg bVN0cmluZ1ttUmVhZExvYy5zSW5kZXhdICsgbVJlYWRMb2MuY0luZGV4LCBzaXplKTsKKyAgICAg ICAgc3RkOjptZW1jcHkoYnVmICsgblJlYWQsIG1TdHJpbmdbbVJlYWRMb2Muc0luZGV4XSArIG1S ZWFkTG9jLmNJbmRleCwgc2l6ZSk7CiAgICAgICAgIG5SZWFkICs9IHNpemU7CiAgICAgICAgIG1S ZWFkTG9jLmNJbmRleCArPSBzaXplOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9B TkdMRS9zcmMvY29tcGlsZXIvcHJlcHJvY2Vzc29yL25ldy9NYWNyb0V4cGFuZGVyLmNwcCBiL1Nv dXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci9wcmVwcm9jZXNzb3IvbmV3L01hY3Jv RXhwYW5kZXIuY3BwCmluZGV4IGZlNWE3YWU4YzY1MmU3MmZlMTY2YmVmOGUyOTQwZGUzOGMyMGY2 MWUuLjE5YWE0MTFjNDk3ZDAwZjQxOTA2OGJmMDZhOTM3ODE2NmI0MThlODIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci9wcmVwcm9jZXNzb3IvbmV3L01h Y3JvRXhwYW5kZXIuY3BwCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxl ci9wcmVwcm9jZXNzb3IvbmV3L01hY3JvRXhwYW5kZXIuY3BwCkBAIC0yMjIsNyArMjIyLDcgQEAg Ym9vbCBNYWNyb0V4cGFuZGVyOjpleHBhbmRNYWNybyhjb25zdCBNYWNybyYgbWFjcm8sCiAgICAg ICAgIHJlcGxhY2VNYWNyb1BhcmFtcyhtYWNybywgYXJncywgcmVwbGFjZW1lbnRzKTsKICAgICB9 CiAKLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHJlcGxhY2VtZW50cy0+c2l6ZSgpOyArK2kp CisgICAgZm9yIChzdGQ6OnNpemVfdCBpID0gMDsgaSA8IHJlcGxhY2VtZW50cy0+c2l6ZSgpOyAr K2kpCiAgICAgewogICAgICAgICBUb2tlbiYgcmVwbCA9IHJlcGxhY2VtZW50cy0+YXQoaSk7CiAg ICAgICAgIGlmIChpID09IDApCkBAIC0zMDksNyArMzA5LDcgQEAgYm9vbCBNYWNyb0V4cGFuZGVy Ojpjb2xsZWN0TWFjcm9BcmdzKGNvbnN0IE1hY3JvJiBtYWNybywKICAgICAvLyBQcmUtZXhwYW5k IGVhY2ggYXJndW1lbnQgYmVmb3JlIHN1YnN0aXR1dGlvbi4KICAgICAvLyBUaGlzIHN0ZXAgZXhw YW5kcyBlYWNoIGFyZ3VtZW50IGluZGl2aWR1YWxseSBiZWZvcmUgdGhleSBhcmUKICAgICAvLyBp bnNlcnRlZCBpbnRvIHRoZSBtYWNybyBib2R5LgotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwg YXJncy0+c2l6ZSgpOyArK2kpCisgICAgZm9yIChzdGQ6OnNpemVfdCBpID0gMDsgaSA8IGFyZ3Mt PnNpemUoKTsgKytpKQogICAgIHsKICAgICAgICAgTWFjcm9BcmcmIGFyZyA9IGFyZ3MtPmF0KGkp OwogICAgICAgICBUb2tlbkxleGVyIGxleGVyKCZhcmcpOwpAQCAtMzMwLDcgKzMzMCw3IEBAIHZv aWQgTWFjcm9FeHBhbmRlcjo6cmVwbGFjZU1hY3JvUGFyYW1zKGNvbnN0IE1hY3JvJiBtYWNybywK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHN0ZDo6dmVjdG9y PE1hY3JvQXJnPiYgYXJncywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHN0ZDo6dmVjdG9yPFRva2VuPiogcmVwbGFjZW1lbnRzKQogewotICAgIGZvciAoc2l6ZV90IGkg PSAwOyBpIDwgbWFjcm8ucmVwbGFjZW1lbnRzLnNpemUoKTsgKytpKQorICAgIGZvciAoc3RkOjpz aXplX3QgaSA9IDA7IGkgPCBtYWNyby5yZXBsYWNlbWVudHMuc2l6ZSgpOyArK2kpCiAgICAgewog ICAgICAgICBjb25zdCBUb2tlbiYgcmVwbCA9IG1hY3JvLnJlcGxhY2VtZW50c1tpXTsKICAgICAg ICAgaWYgKHJlcGwudHlwZSAhPSBUb2tlbjo6SURFTlRJRklFUikKQEAgLTM1MCwxMyArMzUwLDEz IEBAIHZvaWQgTWFjcm9FeHBhbmRlcjo6cmVwbGFjZU1hY3JvUGFyYW1zKGNvbnN0IE1hY3JvJiBt YWNybywKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAKLSAgICAgICAgc2l6ZV90 IGlBcmcgPSBzdGQ6OmRpc3RhbmNlKG1hY3JvLnBhcmFtZXRlcnMuYmVnaW4oKSwgaXRlcik7Cisg ICAgICAgIHN0ZDo6c2l6ZV90IGlBcmcgPSBzdGQ6OmRpc3RhbmNlKG1hY3JvLnBhcmFtZXRlcnMu YmVnaW4oKSwgaXRlcik7CiAgICAgICAgIGNvbnN0IE1hY3JvQXJnJiBhcmcgPSBhcmdzW2lBcmdd OwogICAgICAgICBpZiAoYXJnLmVtcHR5KCkpCiAgICAgICAgIHsKICAgICAgICAgICAgIGNvbnRp bnVlOwogICAgICAgICB9Ci0gICAgICAgIHNpemVfdCBpUmVwbCA9IHJlcGxhY2VtZW50cy0+c2l6 ZSgpOworICAgICAgICBzdGQ6OnNpemVfdCBpUmVwbCA9IHJlcGxhY2VtZW50cy0+c2l6ZSgpOwog ICAgICAgICByZXBsYWNlbWVudHMtPmluc2VydChyZXBsYWNlbWVudHMtPmVuZCgpLCBhcmcuYmVn aW4oKSwgYXJnLmVuZCgpKTsKICAgICAgICAgLy8gVGhlIHJlcGxhY2VtZW50IHRva2VuIGluaGVy aXRzIHBhZGRpbmcgcHJvcGVydGllcyBmcm9tCiAgICAgICAgIC8vIG1hY3JvIHJlcGxhY2VtZW50 IHRva2VuLgpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVy L3ByZXByb2Nlc3Nvci9uZXcvTWFjcm9FeHBhbmRlci5oIGIvU291cmNlL1RoaXJkUGFydHkvQU5H TEUvc3JjL2NvbXBpbGVyL3ByZXByb2Nlc3Nvci9uZXcvTWFjcm9FeHBhbmRlci5oCmluZGV4IDQ1 MDRlYmExNDNhZjU1MDI2ZWI3NzQ2MmM2ZmZjMGMxNDEyODIwYTkuLmJhM2M0ZjFkZDE1MjFlYmZk MWI4NTU2YWUxZDBiYzNhODc0NWFmZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FO R0xFL3NyYy9jb21waWxlci9wcmVwcm9jZXNzb3IvbmV3L01hY3JvRXhwYW5kZXIuaAorKysgYi9T b3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvcHJlcHJvY2Vzc29yL25ldy9NYWNy b0V4cGFuZGVyLmgKQEAgLTUyLDcgKzUyLDcgQEAgY2xhc3MgTWFjcm9FeHBhbmRlciA6IHB1Ymxp YyBMZXhlcgogICAgIHN0cnVjdCBNYWNyb0NvbnRleHQKICAgICB7CiAgICAgICAgIGNvbnN0IE1h Y3JvKiBtYWNybzsKLSAgICAgICAgc2l6ZV90IGluZGV4OworICAgICAgICBzdGQ6OnNpemVfdCBp bmRleDsKICAgICAgICAgc3RkOjp2ZWN0b3I8VG9rZW4+IHJlcGxhY2VtZW50czsKIAogICAgICAg ICBNYWNyb0NvbnRleHQoKSA6IG1hY3JvKDApLCBpbmRleCgwKSB7IH0K 174978 2012-11-19 07:27:19 -0800 2012-11-19 07:27:19 -0800 Patch angle_std.patch text/plain 7892 milian.wolff Y29tbWl0IDczZWY1NmIwNGRhOTFiZmQ0MDNmMmUwMmVlYWRhOTJmODM1NzAwNmYKQXV0aG9yOiBN aWxpYW4gV29sZmYgPG1pbGlhbi53b2xmZkBrZGFiLmNvbT4KRGF0ZTogICBGcmkgQXVnIDMxIDEy OjU4OjQxIDIwMTIgKzAyMDAKCiAgICBhbmdsZSBzdGQgdGFrZSAxCgpkaWZmIC0tZ2l0IGEvU291 cmNlL1RoaXJkUGFydHkvQU5HTEUvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUv Q2hhbmdlTG9nCmluZGV4IDRmOTY0ZTguLjkxMDgzZjU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhp cmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTItMDgtMzEgIE1pbGlhbiBXb2xmZiAgPG1pbGlh bi53b2xmZkBrZGFiLmNvbT4KKworICAgICAgICBbUXRdIFFOWCB0cmlnZ2VycyBjb21waWxlIGVy cm9ycyBpbiBBTkdMRSBkdWUgdG8gbWlzc2luZyBzdGQ6OgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTU0NjgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgdGhlIGV4cGxpY2l0IHN0ZDo6IHF1YWxpZmll ciB0byB1c2VzIG9mIHN0ZCBmdW5jdGlvbnMgYW5kIHR5cGVzLgorICAgICAgICBPbiBvdGhlciBw bGF0Zm9ybXMgdGhpcyBpcyBhcHBhcmVudGx5IG5vdCByZXF1aXJlZCBkdWUgdG8gaW1wbGljaXQK KyAgICAgICAgaW5jbHVzaW9uIG9mICJzdHJpbmcuaCItc3R5bGUgaGVhZGVycyBjb250YWluaW5n IGV4dGVybiAiQyIgdmFyaWFudHMuCisgICAgICAgIE9uIFFOWCBhdCBsZWFzdCB0aGlzIGlzIG5v dCB0aGUgY2FzZSB0aG91Z2gsIHJlc3VsdGluZyBpbiBjb21waWxlCisgICAgICAgIGVycm9ycy4K KworICAgICAgICAqIHNyYy9jb21waWxlci9wcmVwcm9jZXNzb3IvbmV3L0RpcmVjdGl2ZVBhcnNl ci5jcHA6CisgICAgICAgIChwcDo6RGlyZWN0aXZlUGFyc2VyOjpwYXJzZVZlcnNpb24pOgorICAg ICAgICAocHA6OkRpcmVjdGl2ZVBhcnNlcjo6cGFyc2VMaW5lKToKKyAgICAgICAgKiBzcmMvY29t cGlsZXIvcHJlcHJvY2Vzc29yL25ldy9JbnB1dC5jcHA6CisgICAgICAgIChwcDo6SW5wdXQ6Oklu cHV0KToKKyAgICAgICAgKHBwOjpJbnB1dDo6cmVhZCk6CisgICAgICAgICogc3JjL2NvbXBpbGVy L3ByZXByb2Nlc3Nvci9uZXcvTWFjcm9FeHBhbmRlci5jcHA6CisgICAgICAgIChwcDo6TWFjcm9F eHBhbmRlcjo6ZXhwYW5kTWFjcm8pOgorICAgICAgICAocHA6Ok1hY3JvRXhwYW5kZXI6OmNvbGxl Y3RNYWNyb0FyZ3MpOgorICAgICAgICAocHA6Ok1hY3JvRXhwYW5kZXI6OnJlcGxhY2VNYWNyb1Bh cmFtcyk6CisgICAgICAgICogc3JjL2NvbXBpbGVyL3ByZXByb2Nlc3Nvci9uZXcvTWFjcm9FeHBh bmRlci5oOgorICAgICAgICAoTWFjcm9Db250ZXh0KToKKwogMjAxMi0xMC0yOSAgQW5kZXJzIENh cmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIEJ1aWxkIFdlYktpdCBhcyBD KysxMSBvbiBNYWMKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21w aWxlci9nbHNsYW5nLnkgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvZ2xz bGFuZy55CmluZGV4IDNjYWQzMzUuLjIwMzM4MzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBh cnR5L0FOR0xFL3NyYy9jb21waWxlci9nbHNsYW5nLnkKKysrIGIvU291cmNlL1RoaXJkUGFydHkv QU5HTEUvc3JjL2NvbXBpbGVyL2dsc2xhbmcueQpAQCAtMzgsNiArMzgsOCBAQCBXSElDSCBHRU5F UkFURVMgVEhFIEdMU0wgRVMgUEFSU0VSIChnbHNsYW5nX3RhYi5jcHAgQU5EIGdsc2xhbmdfdGFi LmgpLgogI2luY2x1ZGUgImNvbXBpbGVyL1BhcnNlSGVscGVyLmgiCiAjaW5jbHVkZSAiR0xTTEFO Ry9TaGFkZXJMYW5nLmgiCiAKK3VzaW5nIG5hbWVzcGFjZSBzdGQ7CisKICNkZWZpbmUgWVlFTkFC TEVfTkxTIDAKICNkZWZpbmUgWVlMVFlQRV9JU19UUklWSUFMIDEKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL3ByZXByb2Nlc3Nvci9uZXcvRGlyZWN0 aXZlUGFyc2VyLmNwcCBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci9wcmVw cm9jZXNzb3IvbmV3L0RpcmVjdGl2ZVBhcnNlci5jcHAKaW5kZXggNTg1YTkwZS4uMDEyM2JjZiAx MDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL3ByZXByb2Nl c3Nvci9uZXcvRGlyZWN0aXZlUGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdM RS9zcmMvY29tcGlsZXIvcHJlcHJvY2Vzc29yL25ldy9EaXJlY3RpdmVQYXJzZXIuY3BwCkBAIC03 MDksNyArNzA5LDcgQEAgdm9pZCBEaXJlY3RpdmVQYXJzZXI6OnBhcnNlVmVyc2lvbihUb2tlbiog dG9rZW4pCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdG9rZW4tPmxvY2F0 aW9uLCB0b2tlbi0+dmFsdWUpOwogICAgICAgICAgICAgICAgIHZhbGlkID0gZmFsc2U7CiAgICAg ICAgICAgICB9Ci0gICAgICAgICAgICBpZiAodmFsaWQpIHZlcnNpb24gPSBhdG9pKHRva2VuLT52 YWx1ZS5jX3N0cigpKTsKKyAgICAgICAgICAgIGlmICh2YWxpZCkgdmVyc2lvbiA9IHN0ZDo6YXRv aSh0b2tlbi0+dmFsdWUuY19zdHIoKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICBk ZWZhdWx0OgogICAgICAgICAgICAgaWYgKHZhbGlkKQpAQCAtNzU5LDcgKzc1OSw3IEBAIHZvaWQg RGlyZWN0aXZlUGFyc2VyOjpwYXJzZUxpbmUoVG9rZW4qIHRva2VuKQogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHRva2VuLT5sb2NhdGlvbiwgdG9rZW4tPnZhbHVlKTsKICAg ICAgICAgICAgICAgICB2YWxpZCA9IGZhbHNlOwogICAgICAgICAgICAgfQotICAgICAgICAgICAg aWYgKHZhbGlkKSBsaW5lID0gYXRvaSh0b2tlbi0+dmFsdWUuY19zdHIoKSk7CisgICAgICAgICAg ICBpZiAodmFsaWQpIGxpbmUgPSBzdGQ6OmF0b2kodG9rZW4tPnZhbHVlLmNfc3RyKCkpOwogICAg ICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgY2FzZSBGSUxFX05VTUJFUjoKICAgICAgICAgICAg IGlmICh2YWxpZCAmJiAodG9rZW4tPnR5cGUgIT0gVG9rZW46OkNPTlNUX0lOVCkpCkBAIC03Njgs NyArNzY4LDcgQEAgdm9pZCBEaXJlY3RpdmVQYXJzZXI6OnBhcnNlTGluZShUb2tlbiogdG9rZW4p CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdG9rZW4tPmxvY2F0aW9uLCB0 b2tlbi0+dmFsdWUpOwogICAgICAgICAgICAgICAgIHZhbGlkID0gZmFsc2U7CiAgICAgICAgICAg ICB9Ci0gICAgICAgICAgICBpZiAodmFsaWQpIGZpbGUgPSBhdG9pKHRva2VuLT52YWx1ZS5jX3N0 cigpKTsKKyAgICAgICAgICAgIGlmICh2YWxpZCkgZmlsZSA9IHN0ZDo6YXRvaSh0b2tlbi0+dmFs dWUuY19zdHIoKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICBkZWZhdWx0OgogICAg ICAgICAgICAgaWYgKHZhbGlkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUv c3JjL2NvbXBpbGVyL3ByZXByb2Nlc3Nvci9uZXcvRXhwcmVzc2lvblBhcnNlci55IGIvU291cmNl L1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL3ByZXByb2Nlc3Nvci9uZXcvRXhwcmVzc2lv blBhcnNlci55CmluZGV4IDE3YzlmMDUuLjRiZWQwYzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGly ZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci9wcmVwcm9jZXNzb3IvbmV3L0V4cHJlc3Npb25QYXJz ZXIueQorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvcHJlcHJvY2Vz c29yL25ldy9FeHByZXNzaW9uUGFyc2VyLnkKQEAgLTU0LDYgKzU0LDggQEAgdHlwZWRlZiBpbnRt YXhfdCBZWVNUWVBFOwogI2RlZmluZSBZWVNUWVBFX0lTX1RSSVZJQUwgMQogI2RlZmluZSBZWVNU WVBFX0lTX0RFQ0xBUkVEIDEKIAordXNpbmcgbmFtZXNwYWNlIHN0ZDsKKwogbmFtZXNwYWNlIHsK IHN0cnVjdCBDb250ZXh0CiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9z cmMvY29tcGlsZXIvcHJlcHJvY2Vzc29yL25ldy9JbnB1dC5jcHAgYi9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9zcmMvY29tcGlsZXIvcHJlcHJvY2Vzc29yL25ldy9JbnB1dC5jcHAKaW5kZXggYzNk ZTk1Zi4uMTE4NjhjMSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2Nv bXBpbGVyL3ByZXByb2Nlc3Nvci9uZXcvSW5wdXQuY3BwCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5 L0FOR0xFL3NyYy9jb21waWxlci9wcmVwcm9jZXNzb3IvbmV3L0lucHV0LmNwcApAQCAtMjYsNyAr MjYsNyBAQCBJbnB1dDo6SW5wdXQoaW50IGNvdW50LCBjb25zdCBjaGFyKiBjb25zdCBzdHJpbmdb XSwgY29uc3QgaW50IGxlbmd0aFtdKSA6CiAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBtQ291bnQ7 ICsraSkKICAgICB7CiAgICAgICAgIGludCBsZW4gPSBsZW5ndGggPyBsZW5ndGhbaV0gOiAtMTsK LSAgICAgICAgbUxlbmd0aC5wdXNoX2JhY2sobGVuIDwgMCA/IHN0cmxlbihtU3RyaW5nW2ldKSA6 IGxlbik7CisgICAgICAgIG1MZW5ndGgucHVzaF9iYWNrKGxlbiA8IDAgPyBzdGQ6OnN0cmxlbiht U3RyaW5nW2ldKSA6IGxlbik7CiAgICAgfQogfQogCkBAIC0zNyw3ICszNyw3IEBAIGludCBJbnB1 dDo6cmVhZChjaGFyKiBidWYsIGludCBtYXhTaXplKQogICAgIHsKICAgICAgICAgaW50IHNpemUg PSBtTGVuZ3RoW21SZWFkTG9jLnNJbmRleF0gLSBtUmVhZExvYy5jSW5kZXg7CiAgICAgICAgIHNp emUgPSBzdGQ6Om1pbihzaXplLCBtYXhTaXplKTsKLSAgICAgICAgbWVtY3B5KGJ1ZiArIG5SZWFk LCBtU3RyaW5nW21SZWFkTG9jLnNJbmRleF0gKyBtUmVhZExvYy5jSW5kZXgsIHNpemUpOworICAg ICAgICBzdGQ6Om1lbWNweShidWYgKyBuUmVhZCwgbVN0cmluZ1ttUmVhZExvYy5zSW5kZXhdICsg bVJlYWRMb2MuY0luZGV4LCBzaXplKTsKICAgICAgICAgblJlYWQgKz0gc2l6ZTsKICAgICAgICAg bVJlYWRMb2MuY0luZGV4ICs9IHNpemU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5 L0FOR0xFL3NyYy9jb21waWxlci9wcmVwcm9jZXNzb3IvbmV3L01hY3JvRXhwYW5kZXIuY3BwIGIv U291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL3ByZXByb2Nlc3Nvci9uZXcvTWFj cm9FeHBhbmRlci5jcHAKaW5kZXggZmU1YTdhZS4uMTlhYTQxMSAxMDA2NDQKLS0tIGEvU291cmNl L1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL3ByZXByb2Nlc3Nvci9uZXcvTWFjcm9FeHBh bmRlci5jcHAKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL3ByZXBy b2Nlc3Nvci9uZXcvTWFjcm9FeHBhbmRlci5jcHAKQEAgLTIyMiw3ICsyMjIsNyBAQCBib29sIE1h Y3JvRXhwYW5kZXI6OmV4cGFuZE1hY3JvKGNvbnN0IE1hY3JvJiBtYWNybywKICAgICAgICAgcmVw bGFjZU1hY3JvUGFyYW1zKG1hY3JvLCBhcmdzLCByZXBsYWNlbWVudHMpOwogICAgIH0KIAotICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgcmVwbGFjZW1lbnRzLT5zaXplKCk7ICsraSkKKyAgICBm b3IgKHN0ZDo6c2l6ZV90IGkgPSAwOyBpIDwgcmVwbGFjZW1lbnRzLT5zaXplKCk7ICsraSkKICAg ICB7CiAgICAgICAgIFRva2VuJiByZXBsID0gcmVwbGFjZW1lbnRzLT5hdChpKTsKICAgICAgICAg aWYgKGkgPT0gMCkKQEAgLTMwOSw3ICszMDksNyBAQCBib29sIE1hY3JvRXhwYW5kZXI6OmNvbGxl Y3RNYWNyb0FyZ3MoY29uc3QgTWFjcm8mIG1hY3JvLAogICAgIC8vIFByZS1leHBhbmQgZWFjaCBh cmd1bWVudCBiZWZvcmUgc3Vic3RpdHV0aW9uLgogICAgIC8vIFRoaXMgc3RlcCBleHBhbmRzIGVh Y2ggYXJndW1lbnQgaW5kaXZpZHVhbGx5IGJlZm9yZSB0aGV5IGFyZQogICAgIC8vIGluc2VydGVk IGludG8gdGhlIG1hY3JvIGJvZHkuCi0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBhcmdzLT5z aXplKCk7ICsraSkKKyAgICBmb3IgKHN0ZDo6c2l6ZV90IGkgPSAwOyBpIDwgYXJncy0+c2l6ZSgp OyArK2kpCiAgICAgewogICAgICAgICBNYWNyb0FyZyYgYXJnID0gYXJncy0+YXQoaSk7CiAgICAg ICAgIFRva2VuTGV4ZXIgbGV4ZXIoJmFyZyk7CkBAIC0zMzAsNyArMzMwLDcgQEAgdm9pZCBNYWNy b0V4cGFuZGVyOjpyZXBsYWNlTWFjcm9QYXJhbXMoY29uc3QgTWFjcm8mIG1hY3JvLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qgc3RkOjp2ZWN0b3I8TWFjcm9B cmc+JiBhcmdzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RkOjp2 ZWN0b3I8VG9rZW4+KiByZXBsYWNlbWVudHMpCiB7Ci0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkg PCBtYWNyby5yZXBsYWNlbWVudHMuc2l6ZSgpOyArK2kpCisgICAgZm9yIChzdGQ6OnNpemVfdCBp ID0gMDsgaSA8IG1hY3JvLnJlcGxhY2VtZW50cy5zaXplKCk7ICsraSkKICAgICB7CiAgICAgICAg IGNvbnN0IFRva2VuJiByZXBsID0gbWFjcm8ucmVwbGFjZW1lbnRzW2ldOwogICAgICAgICBpZiAo cmVwbC50eXBlICE9IFRva2VuOjpJREVOVElGSUVSKQpAQCAtMzUwLDEzICszNTAsMTMgQEAgdm9p ZCBNYWNyb0V4cGFuZGVyOjpyZXBsYWNlTWFjcm9QYXJhbXMoY29uc3QgTWFjcm8mIG1hY3JvLAog ICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KIAotICAgICAgICBzaXplX3QgaUFyZyA9 IHN0ZDo6ZGlzdGFuY2UobWFjcm8ucGFyYW1ldGVycy5iZWdpbigpLCBpdGVyKTsKKyAgICAgICAg c3RkOjpzaXplX3QgaUFyZyA9IHN0ZDo6ZGlzdGFuY2UobWFjcm8ucGFyYW1ldGVycy5iZWdpbigp LCBpdGVyKTsKICAgICAgICAgY29uc3QgTWFjcm9BcmcmIGFyZyA9IGFyZ3NbaUFyZ107CiAgICAg ICAgIGlmIChhcmcuZW1wdHkoKSkKICAgICAgICAgewogICAgICAgICAgICAgY29udGludWU7CiAg ICAgICAgIH0KLSAgICAgICAgc2l6ZV90IGlSZXBsID0gcmVwbGFjZW1lbnRzLT5zaXplKCk7Cisg ICAgICAgIHN0ZDo6c2l6ZV90IGlSZXBsID0gcmVwbGFjZW1lbnRzLT5zaXplKCk7CiAgICAgICAg IHJlcGxhY2VtZW50cy0+aW5zZXJ0KHJlcGxhY2VtZW50cy0+ZW5kKCksIGFyZy5iZWdpbigpLCBh cmcuZW5kKCkpOwogICAgICAgICAvLyBUaGUgcmVwbGFjZW1lbnQgdG9rZW4gaW5oZXJpdHMgcGFk ZGluZyBwcm9wZXJ0aWVzIGZyb20KICAgICAgICAgLy8gbWFjcm8gcmVwbGFjZW1lbnQgdG9rZW4u CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvcHJlcHJv Y2Vzc29yL25ldy9NYWNyb0V4cGFuZGVyLmggYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMv Y29tcGlsZXIvcHJlcHJvY2Vzc29yL25ldy9NYWNyb0V4cGFuZGVyLmgKaW5kZXggNDUwNGViYS4u YmEzYzRmMSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVy L3ByZXByb2Nlc3Nvci9uZXcvTWFjcm9FeHBhbmRlci5oCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5 L0FOR0xFL3NyYy9jb21waWxlci9wcmVwcm9jZXNzb3IvbmV3L01hY3JvRXhwYW5kZXIuaApAQCAt NTIsNyArNTIsNyBAQCBjbGFzcyBNYWNyb0V4cGFuZGVyIDogcHVibGljIExleGVyCiAgICAgc3Ry dWN0IE1hY3JvQ29udGV4dAogICAgIHsKICAgICAgICAgY29uc3QgTWFjcm8qIG1hY3JvOwotICAg ICAgICBzaXplX3QgaW5kZXg7CisgICAgICAgIHN0ZDo6c2l6ZV90IGluZGV4OwogICAgICAgICBz dGQ6OnZlY3RvcjxUb2tlbj4gcmVwbGFjZW1lbnRzOwogCiAgICAgICAgIE1hY3JvQ29udGV4dCgp IDogbWFjcm8oMCksIGluZGV4KDApIHsgfQo=