26375 2009-06-13 12:09:18 -0700 VC++ 2005 Express failed to build WebKit due to raw UTF-8 string in WebKit/win/WebCoreLocalizedStrings.cpp 2009-08-06 10:55:06 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 27416 1 tyoshino levin abarth hbono levin oldest_to_newest 125656 0 tyoshino 2009-06-13 12:09:18 -0700 VC++ 2005 Express failed to build WebKit due to raw UTF-8 string in WebKit/win/WebCoreLocalizedStrings.cpp . It shows warning that the file contains some non ASCII characters (in my Japanese environment, it said it found some characters not in Windows-932 codepage). By default VC++ treats warnings as errors and stops building. Actually, WebKit/win/WebCoreLocalizedStrings.cpp contains a multiplication sign (U+00D7) encoded in UTF-8 (0xC3 0x97). Checkout is ToT r44649 125657 1 31242 tyoshino 2009-06-13 12:10:54 -0700 Created attachment 31242 Proposed fix for 26375 125741 2 31242 abarth 2009-06-13 23:08:42 -0700 Comment on attachment 31242 Proposed fix for 26375 LGTM. Thanks. 125787 3 31242 darin 2009-06-14 11:21:44 -0700 Comment on attachment 31242 Proposed fix for 26375 This change is incompatible with the scripts that we uses to maintain the localized string files, so while it fixes compilation for the people using these development tools, it breaks WebKit development work flow for anyone using the localization scripts, unless we make some changes to the script used to extract localizable strings. 125789 4 31242 abarth 2009-06-14 11:27:49 -0700 Comment on attachment 31242 Proposed fix for 26375 Marking as R- based on comment #3. I'm surprised we've been able to get away with non-ASCII source files thus far. Maybe we should change the scripts? 125793 5 darin 2009-06-14 11:48:53 -0700 (In reply to comment #4) > Marking as R- based on comment #3. I'm surprised we've been able to get away > with non-ASCII source files thus far. Maybe we should change the scripts? Until this point in the project, all the compilers we support were consistent in that in C strings (non-wide) they allowed non-ASCII characters, including the same raw bytes in the executable that were in the source file. This meant we were free to use UTF-8 for all strings, and not do any special escaping. I'm disappointed to find we need to support compilers incompatible with this technique. If we decide that this is no longer allowed, then we need to teach the scripts to deal with some sort of all-ASCII syntax. I think actual UTF-8 sequences with \x for each byte are a really ugly choice; it would be nice to have something that was aesthetically pleasing. I don't have any immediate good ideas at the moment about how to resolve this. 125794 6 darin 2009-06-14 11:49:47 -0700 Perhaps the issue is entirely with warnings. Maybe we can fix this by turning off the warning. Or is the compiler actually trying to transcode the string? 125808 7 abarth 2009-06-14 13:26:08 -0700 Other projects I've been involved with have used XML as the source representations of localized strings (which, of course, is natively UTF-8). 125895 8 tyoshino 2009-06-14 23:30:07 -0700 I see. So, for now, may I put some comments into the code to let the Windows-based developer know the workaround, e.g. URL to this bug entry? I'll send a new patch to do so, later. 126414 9 31405 tyoshino 2009-06-17 01:27:01 -0700 Created attachment 31405 Proposed fix for 26375 (rev 2) 126802 10 levin 2009-06-18 16:00:12 -0700 *** Bug 21849 has been marked as a duplicate of this bug. *** 126852 11 eric 2009-06-18 18:23:55 -0700 Could you please post the warning number, and the description (even if it's in Japanese). 126867 12 tyoshino 2009-06-18 19:32:07 -0700 (In reply to comment #11) > Could you please post the warning number, and the description (even if it's in > Japanese). > Here's the warning. 5>WebCoreLocalizedStrings.cpp 5>..\WebCoreLocalizedStrings.cpp : error C2220: warning treated as error - no 'object' file generated 5>..\WebCoreLocalizedStrings.cpp : warning C4819: The file contains a character that cannot be represented in the current code page (932). S ave the file in Unicode format to prevent data loss 5>Project : warning PRJ0018 : The following environment variables were not found: 5>$(PRODUCTION) 5>Build log was saved at "file://E:\wk1_svn_cygwin\WebKitBuild\obj\WebKit\Debug\BuildLog.htm" 5>WebKit - 1 error(s), 1 warning(s) ========== Build: 4 succeeded, 1 failed, 13 up-to-date, 0 skipped ========== 126870 13 31531 tyoshino 2009-06-18 19:36:15 -0700 Created attachment 31531 Proposed fix for 26375 (rev 3) Included the warning messages to the patch. 127297 14 eric 2009-06-21 23:51:55 -0700 What happens if we "Save the file in Unicode format"? Does it just add a UTF8 BOM to the top of the file? 127565 15 tyoshino 2009-06-22 21:12:51 -0700 (In reply to comment #14) > What happens if we "Save the file in Unicode format"? Does it just add a UTF8 > BOM to the top of the file? > I couldn't find what the message "Save the file in Unicode format" in C4819 (http://msdn.microsoft.com/en-us/library/ms173715.aspx) exactly means. However, Visual Studio 2005 Professional has a "Advanced Save Options" for its editor. I saw five encoding options in the dialog with "Unicode" in them. So, I've tested building WebKit by saving WebCoreLocalizedString.cpp with each of them. Whether a BOM is added or not is also described. Build mode used: Release (because run-safari in debug mode on Windows fails too frequently) Check: Navigate to some image (http://www.google.co.jp/intl/ja_jp/images/logo.gif) and check the title Save mode: Unicode (UTF-8 with signature) - Codepage 65001 The source was encoded by UTF-8 w/ BOM Build: Successful Result: localized string not found Save mode: Unicode - Codepage 1200 The source was encoded by UTF-16 Little Endian w/o BOM Build: Successful Result: localized string not found Save mode: Unicode (Big-Endian) - Codepage 1201 The source was encoded by UTF-16 Big-Endian w/o BOM Build: Successful Result: localized string not found Save mode: Unicode (UTF-7) - Codepage 65000 The source was encoded by UTF-7 Build: Failure 4>WebCoreLocalizedStrings.cpp 4>..\WebCoreLocalizedStrings.cpp(1) : error C2059: syntax error : '/' 4>..\WebCoreLocalizedStrings.cpp(7) : error C2059: syntax error : '+' 4>..\WebCoreLocalizedStrings.cpp(13) : error C2137: empty character constant 4>..\WebCoreLocalizedStrings.cpp(35) : error C2653: 'WebCore' : is not a class or namespace name Save mode: Unicode (UTF-8 without signature) - Codepage 65001 The source was encoded by UTF-8 w/o BOM Build: Failure. We need to remove /Wx option (take warnings as errors) Build w/o /Wx: Successful Result: localized string not found None of them fixed the problem. I saw "logo.gif 276×110 pixels image" on the title bar only when I replace the character with escape sequences (\xC3\x97). Thanks, 127818 16 31531 eric 2009-06-23 22:57:06 -0700 Comment on attachment 31531 Proposed fix for 26375 (rev 3) Wow! Thank you for the awesome investigation. Unfortunately the current patch doesn't seem to actually have the code change, just a comment? This is the only log message you need in the ChangeLog: WebCoreLocalizedStrings.cpp : warning C4819: The file contains a character that cannot be represented in the current code page (932). Save the file in Unicode format to prevent data loss The rest of the build output you can remove from the ChangeLog. r- for lack of code change. Otherwise I'd r+ this. Thanks again for the investigation! 127819 17 31531 eric 2009-06-23 22:57:35 -0700 Comment on attachment 31531 Proposed fix for 26375 (rev 3) oops, meant to r- it until a new patch is posted with the code change (and adjusted ChangeLog) 127824 18 tyoshino 2009-06-23 23:17:35 -0700 (In reply to comment #16) > (From update of attachment 31531 [review]) > Wow! Thank you for the awesome investigation. > > Unfortunately the current patch doesn't seem to actually have the code change, > just a comment? > > This is the only log message you need in the ChangeLog: > WebCoreLocalizedStrings.cpp : warning C4819: The file contains a character that > cannot be represented in the current code page (932). Save the file in Unicode > format to prevent data loss > > The rest of the build output you can remove from the ChangeLog. > OK. Thanks. > r- for lack of code change. Otherwise I'd r+ this. Thanks again for the > investigation! > As Darin said, if I make code change on WebCoreLocalizedStrings.cpp without making change on extract-localized-strings script, I'll break Localized.strings generation process. Do you mean I should make change on extract-localized-strings instead of putting a comment? Thanks, 133363 19 33143 tyoshino 2009-07-20 21:53:21 -0700 Created attachment 33143 Proposed fix for 26375 (rev 4) Wrote a change on WebKitTools/Scripts/extract-localizable-strings so that replacing a raw string in UI_STRING with hexadecimal escape sequences won't break localized string generation process. 133899 20 levin 2009-07-22 14:23:19 -0700 Assign to levin for landing. 133937 21 levin 2009-07-22 15:11:53 -0700 Committed as http://trac.webkit.org/changeset/46245 137600 22 tyoshino 2009-08-06 10:55:06 -0700 (In reply to comment #21) > Committed as http://trac.webkit.org/changeset/46245 Thank you! 31242 2009-06-13 12:10:54 -0700 2009-06-17 01:27:01 -0700 Proposed fix for 26375 p text/plain 1764 tyoshino SW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vQ2hh bmdlTG9nCShyZXZpc2lvbiA0NDY1MCkKKysrIFdlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMDktMDYtMTMgIFRha2VzaGkgWW9zaGlubyAgPHR5 b3NoaW5vQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQnVnIDI2Mzc1OiBWQysrIDIwMDUgRXhwcmVzcyBmYWlsZWQgdG8gYnVpbGQg V2ViS2l0IGR1ZSB0byByYXcgVVRGLTggc3RyaW5nIGluIFdlYktpdC93aW4vV2ViQ29yZUxvY2Fs aXplZFN0cmluZ3MuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yNjM3NQorCisgICAgICAgIFJlcGxhY2UgYSBtdWx0aXBsaWNhdGlvbiBzaWduIChV KzAwRDcpIGVuY29kZWQgaW4gVVRGLTggKDB4QzMgMHg5NykgaW4KKyAgICAgICAgV2ViQ29yZUxv Y2FsaXplZFN0cmluZ3MuY3BwIHdpdGggaGV4IGVzY2FwZSBzZXF1ZW5jZXMuCisKKyAgICAgICAg VkMyMDA1IGZhaWxlZCB0byBidWlsZCBkdWUgdG8gdGhpcyByYXcgVVRGLTggZGF0YSBpbiBzb3Vy Y2UgY29kZS4KKworICAgICAgICAqIFdlYkNvcmVMb2NhbGl6ZWRTdHJpbmdzLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmltYWdlVGl0bGUpOgorCiAyMDA5LTA2LTEyICBQZXRlciBLYXN0aW5nICA8 cGthc3RpbmdAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4K SW5kZXg6IFdlYktpdC93aW4vV2ViQ29yZUxvY2FsaXplZFN0cmluZ3MuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC93aW4vV2ViQ29yZUxvY2FsaXplZFN0cmluZ3MuY3BwCShyZXZpc2lvbiA0NDY0 OSkKKysrIFdlYktpdC93aW4vV2ViQ29yZUxvY2FsaXplZFN0cmluZ3MuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC05Nyw3ICs5Nyw3IEBAIFN0cmluZyBXZWJDb3JlOjphbGxGaWxlc1RleHQoKSB7IHJl dHVybiAKIAogU3RyaW5nIFdlYkNvcmU6OmltYWdlVGl0bGUoY29uc3QgU3RyaW5nJiBmaWxlbmFt ZSwgY29uc3QgSW50U2l6ZSYgc2l6ZSkgCiB7IAotICAgIHN0YXRpYyBSZXRhaW5QdHI8Q0ZTdHJp bmdSZWY+IGZvcm1hdChBZG9wdENGLCBVSV9TVFJJTkcoIiVAICVkw5clZCBwaXhlbHMiLCAid2lu ZG93IHRpdGxlIGZvciBhIHN0YW5kYWxvbmUgaW1hZ2UgKHVzZXMgbXVsdGlwbGljYXRpb24gc3lt Ym9sLCBub3QgeCkiKSk7CisgICAgc3RhdGljIFJldGFpblB0cjxDRlN0cmluZ1JlZj4gZm9ybWF0 KEFkb3B0Q0YsIFVJX1NUUklORygiJUAgJWRceEMzXHg5NyVkIHBpeGVscyIsICJ3aW5kb3cgdGl0 bGUgZm9yIGEgc3RhbmRhbG9uZSBpbWFnZSAodXNlcyBtdWx0aXBsaWNhdGlvbiBzeW1ib2wsIG5v dCB4KSIpKTsKIAogICAgIFJldGFpblB0cjxDRlN0cmluZ1JlZj4gZmlsZW5hbWVDRihBZG9wdENG LCBmaWxlbmFtZS5jcmVhdGVDRlN0cmluZygpKTsKICAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+ IHJlc3VsdChBZG9wdENGLCBDRlN0cmluZ0NyZWF0ZVdpdGhGb3JtYXQoMCwgMCwgZm9ybWF0Lmdl dCgpLCBmaWxlbmFtZUNGLmdldCgpLCBzaXplLndpZHRoKCksIHNpemUuaGVpZ2h0KCkpKTsK 31405 2009-06-17 01:27:01 -0700 2009-06-18 19:36:15 -0700 Proposed fix for 26375 (rev 2) 26375_rev2.patch text/plain 2207 tyoshino SW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vQ2hh bmdlTG9nCShyZXZpc2lvbiA0NDc1NSkKKysrIFdlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMDktMDYtMTcgIFRha2VzaGkgWW9zaGlubyAgPHR5 b3NoaW5vQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQnVnIDIxODQ5OiBBIG1pbm9yIGJ1aWxkIGZhaWx1cmUgb24gSmFwYW5lc2Ug dmVyc2lvbnMgb2YgV2luZG93cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE4NDkKKyAgICAgICAgQnVnIDI2Mzc1OiBWQysrIDIwMDUgRXhwcmVzcyBm YWlsZWQgdG8gYnVpbGQgV2ViS2l0IGR1ZSB0byByYXcgVVRGLTggc3RyaW5nIGluIFdlYktpdC93 aW4vV2ViQ29yZUxvY2FsaXplZFN0cmluZ3MuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjM3NQorCisgICAgICAgIFZDMjAwNSBmYWlsZWQgdG8g YnVpbGQgZHVlIHRvIGEgVVRGLTggY2hhcmFjdGVyIGluIHRoZSBzb3VyY2UgY29kZS4KKyAgICAg ICAgVGhpcyBwYXRjaCBwdXRzIGEgY29tbWVudCB0aGF0IGV4cGxhaW5zIHdvcmthcm91bmQgZm9y IHRoaXMgYnVpbGQKKyAgICAgICAgZmFpbHVyZS4gU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yNjM3NSBmb3IgdGhlCisgICAgICAgIHJlYXNvbiB3aHkgd2UgY2Fu bm90IG1ha2UgY2hhbmdlIG9uIHRoZSB0cnVuayBub3cuCisKKyAgICAgICAgKiBXZWJDb3JlTG9j YWxpemVkU3RyaW5ncy5jcHA6CisgICAgICAgIChXZWJDb3JlOjppbWFnZVRpdGxlKToKKwogMjAw OS0wNi0xNiAgQnJpYW4gV2VpbnN0ZWluICA8YndlaW5zdGVpbkBhcHBsZS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgQWRhbSBSb2Jlbi4KSW5kZXg6IFdlYktpdC93aW4vV2ViQ29yZUxvY2Fs aXplZFN0cmluZ3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vV2ViQ29yZUxvY2FsaXpl ZFN0cmluZ3MuY3BwCShyZXZpc2lvbiA0NDY4OSkKKysrIFdlYktpdC93aW4vV2ViQ29yZUxvY2Fs aXplZFN0cmluZ3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05Niw3ICs5NiwxMyBAQCBTdHJpbmcg V2ViQ29yZTo6dXBsb2FkRmlsZVRleHQoKSB7IHJldHVyCiBTdHJpbmcgV2ViQ29yZTo6YWxsRmls ZXNUZXh0KCkgeyByZXR1cm4gU3RyaW5nKExQQ1RTVFJfVUlfU1RSSU5HKCJBbGwgRmlsZXMiLCAi KFdpbmRvd3MpIEZvcm0gc3VibWl0IGZpbGUgdXBsb2FkIGFsbCBmaWxlcyBwb3AtdXAiKSk7IH0K IAogU3RyaW5nIFdlYkNvcmU6OmltYWdlVGl0bGUoY29uc3QgU3RyaW5nJiBmaWxlbmFtZSwgY29u c3QgSW50U2l6ZSYgc2l6ZSkgCi17IAoreworICAgIC8vIFRoaXMgbGluZSBjb250YWlucyBhIFVU Ri04IGVuY29kZWQgbXVsdGlwbGljYXRpb24gc2lnbi4gVmlzdWFsIFN0dWRpbworICAgIC8vIDIw MDUgcnVubmluZyBvbiBzb21lIG5vbi1FbmdsaXNoIHN5c3RlbSBsb2NhbGUgc2hvd3Mgd2Fybmlu ZyBmb3IgdGhpcy4KKyAgICAvLyBVc2UgdGhpcyB3b3JrYXJvdW5kIGZvciBub3c6IFJlcGxhY2Ug dGhlIG11bHRpcGxpY2F0aW9uIHNpZ24gd2l0aCBlc2NhcGUKKyAgICAvLyBzZXF1ZW5jZXMgXHhD M1x4OTcuCisgICAgLy8gU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yNjM3NSBmb3IgdGhlIHJlYXNvbiB3aHkgd2UKKyAgICAvLyBkb24ndCBjaGFuZ2UgdGhpcyB0 byBlc2NhcGUgc2VxdWVuY2VzIG9uIHRoZSB0cnVuay4KICAgICBzdGF0aWMgUmV0YWluUHRyPENG U3RyaW5nUmVmPiBmb3JtYXQoQWRvcHRDRiwgVUlfU1RSSU5HKCIlQCAlZMOXJWQgcGl4ZWxzIiwg IndpbmRvdyB0aXRsZSBmb3IgYSBzdGFuZGFsb25lIGltYWdlICh1c2VzIG11bHRpcGxpY2F0aW9u IHN5bWJvbCwgbm90IHgpIikpOwogCiAgICAgUmV0YWluUHRyPENGU3RyaW5nUmVmPiBmaWxlbmFt ZUNGKEFkb3B0Q0YsIGZpbGVuYW1lLmNyZWF0ZUNGU3RyaW5nKCkpOwo= 31531 2009-06-18 19:36:15 -0700 2009-07-20 21:53:21 -0700 Proposed fix for 26375 (rev 3) 26375_rev3.patch text/plain 2910 tyoshino SW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vQ2hh bmdlTG9nCShyZXZpc2lvbiA0NDc1NSkKKysrIFdlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMDktMDYtMTcgIFRha2VzaGkgWW9zaGlubyAgPHR5 b3NoaW5vQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQnVnIDIxODQ5OiBBIG1pbm9yIGJ1aWxkIGZhaWx1cmUgb24gSmFwYW5lc2Ug dmVyc2lvbnMgb2YgV2luZG93cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE4NDkKKyAgICAgICAgQnVnIDI2Mzc1OiBWQysrIDIwMDUgRXhwcmVzcyBm YWlsZWQgdG8gYnVpbGQgV2ViS2l0IGR1ZSB0byByYXcgVVRGLTggc3RyaW5nIGluIFdlYktpdC93 aW4vV2ViQ29yZUxvY2FsaXplZFN0cmluZ3MuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjM3NQorCisgICAgICAgIFZDMjAwNSBmYWlsZWQgdG8g YnVpbGQgZHVlIHRvIGEgVVRGLTggY2hhcmFjdGVyIGluIHRoZSBzb3VyY2UgY29kZS4KKyAgICAg ICAgVGhpcyBwYXRjaCBwdXRzIGEgY29tbWVudCB0aGF0IGV4cGxhaW5zIHdvcmthcm91bmQgZm9y IHRoaXMgYnVpbGQKKyAgICAgICAgZmFpbHVyZS4gU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yNjM3NSBmb3IgdGhlCisgICAgICAgIHJlYXNvbiB3aHkgd2UgY2Fu bm90IG1ha2UgY2hhbmdlIG9uIHRoZSB0cnVuayBub3cuCisKKyAgICAgICAgNT5XZWJDb3JlTG9j YWxpemVkU3RyaW5ncy5jcHAKKyAgICAgICAgNT4uLlxXZWJDb3JlTG9jYWxpemVkU3RyaW5ncy5j cHAgOiBlcnJvciBDMjIyMDogd2FybmluZyB0cmVhdGVkIGFzIGVycm9yIC0gbm8gJ29iamVjdCcg ZmlsZSBnZW5lcmF0ZWQKKyAgICAgICAgNT4uLlxXZWJDb3JlTG9jYWxpemVkU3RyaW5ncy5jcHAg OiB3YXJuaW5nIEM0ODE5OiBUaGUgZmlsZSBjb250YWlucyBhIGNoYXJhY3RlciB0aGF0IGNhbm5v dCBiZSByZXByZXNlbnRlZCBpbiB0aGUgY3VycmVudCBjb2RlIHBhZ2UgKDkzMikuIFNhdmUgdGhl IGZpbGUgaW4gVW5pY29kZSBmb3JtYXQgdG8gcHJldmVudCBkYXRhIGxvc3MKKyAgICAgICAgNT5Q cm9qZWN0IDogd2FybmluZyBQUkowMDE4IDogVGhlIGZvbGxvd2luZyBlbnZpcm9ubWVudCB2YXJp YWJsZXMgd2VyZSBub3QgZm91bmQ6CisgICAgICAgIDU+JChQUk9EVUNUSU9OKQorICAgICAgICA1 PkJ1aWxkIGxvZyB3YXMgc2F2ZWQgYXQgImZpbGU6Ly9FOlx3azFfc3ZuX2N5Z3dpblxXZWJLaXRC dWlsZFxvYmpcV2ViS2l0XERlYnVnXEJ1aWxkTG9nLmh0bSIKKyAgICAgICAgNT5XZWJLaXQgLSAx IGVycm9yKHMpLCAxIHdhcm5pbmcocykKKyAgICAgICAgPT09PT09PT09PSBCdWlsZDogNCBzdWNj ZWVkZWQsIDEgZmFpbGVkLCAxMyB1cC10by1kYXRlLCAwIHNraXBwZWQgPT09PT09PT09PQorCisg ICAgICAgICogV2ViQ29yZUxvY2FsaXplZFN0cmluZ3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 aW1hZ2VUaXRsZSk6CisKIDIwMDktMDYtMTYgIEJyaWFuIFdlaW5zdGVpbiAgPGJ3ZWluc3RlaW5A YXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gUm9iZW4uCkluZGV4OiBXZWJL aXQvd2luL1dlYkNvcmVMb2NhbGl6ZWRTdHJpbmdzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQv d2luL1dlYkNvcmVMb2NhbGl6ZWRTdHJpbmdzLmNwcAkocmV2aXNpb24gNDQ2ODkpCisrKyBXZWJL aXQvd2luL1dlYkNvcmVMb2NhbGl6ZWRTdHJpbmdzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTYs NyArOTYsMTMgQEAgU3RyaW5nIFdlYkNvcmU6OnVwbG9hZEZpbGVUZXh0KCkgeyByZXR1cgogU3Ry aW5nIFdlYkNvcmU6OmFsbEZpbGVzVGV4dCgpIHsgcmV0dXJuIFN0cmluZyhMUENUU1RSX1VJX1NU UklORygiQWxsIEZpbGVzIiwgIihXaW5kb3dzKSBGb3JtIHN1Ym1pdCBmaWxlIHVwbG9hZCBhbGwg ZmlsZXMgcG9wLXVwIikpOyB9CiAKIFN0cmluZyBXZWJDb3JlOjppbWFnZVRpdGxlKGNvbnN0IFN0 cmluZyYgZmlsZW5hbWUsIGNvbnN0IEludFNpemUmIHNpemUpIAoteyAKK3sKKyAgICAvLyBUaGlz IGxpbmUgY29udGFpbnMgYSBVVEYtOCBlbmNvZGVkIG11bHRpcGxpY2F0aW9uIHNpZ24uIFZpc3Vh bCBTdHVkaW8KKyAgICAvLyAyMDA1IHJ1bm5pbmcgb24gc29tZSBub24tRW5nbGlzaCBzeXN0ZW0g bG9jYWxlIHNob3dzIHdhcm5pbmcgZm9yIHRoaXMuCisgICAgLy8gVXNlIHRoaXMgd29ya2Fyb3Vu ZCBmb3Igbm93OiBSZXBsYWNlIHRoZSBtdWx0aXBsaWNhdGlvbiBzaWduIHdpdGggZXNjYXBlCisg ICAgLy8gc2VxdWVuY2VzIFx4QzNceDk3LgorICAgIC8vIFNlZSBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjYzNzUgZm9yIHRoZSByZWFzb24gd2h5IHdlCisgICAgLy8g ZG9uJ3QgY2hhbmdlIHRoaXMgdG8gZXNjYXBlIHNlcXVlbmNlcyBvbiB0aGUgdHJ1bmsuCiAgICAg c3RhdGljIFJldGFpblB0cjxDRlN0cmluZ1JlZj4gZm9ybWF0KEFkb3B0Q0YsIFVJX1NUUklORygi JUAgJWTDlyVkIHBpeGVscyIsICJ3aW5kb3cgdGl0bGUgZm9yIGEgc3RhbmRhbG9uZSBpbWFnZSAo dXNlcyBtdWx0aXBsaWNhdGlvbiBzeW1ib2wsIG5vdCB4KSIpKTsKIAogICAgIFJldGFpblB0cjxD RlN0cmluZ1JlZj4gZmlsZW5hbWVDRihBZG9wdENGLCBmaWxlbmFtZS5jcmVhdGVDRlN0cmluZygp KTsK 33143 2009-07-20 21:53:21 -0700 2009-07-22 10:03:19 -0700 Proposed fix for 26375 (rev 4) 26375_rev4.patch text/plain 6070 tyoshino SW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vQ2hh bmdlTG9nCShyZXZpc2lvbiA0NjE1MykKKysrIFdlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjUgQEAKKzIwMDktMDctMjAgIFRha2VzaGkgWW9zaGlubyAgPHR5 b3NoaW5vQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVkMrKyAyMDA1IEV4cHJlc3MgZmFpbGVkIHRvIGJ1aWxkIFdlYktpdCBkdWUg dG8gcmF3IFVURi04IHN0cmluZyBpbiBXZWJLaXQvd2luL1dlYkNvcmVMb2NhbGl6ZWRTdHJpbmdz LmNwcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjYz NzUKKworICAgICAgICBSZXBsYWNlIGEgbXVsdGlwbGljYXRpb24gc2lnbiAoVSswMEQ3KSBlbmNv ZGVkIGluIFVURi04ICgweEMzIDB4OTcpIGluIFdlYkNvcmVMb2NhbGl6ZWRTdHJpbmdzLmNwcAor ICAgICAgICB3aXRoIGhleCBlc2NhcGUgc2VxdWVuY2VzLgorCisgICAgICAgIFZDMjAwNSBmYWls ZWQgdG8gYnVpbGQgZHVlIHRvIHRoaXMgcmF3IFVURi04IGRhdGEgaW4gc291cmNlIGNvZGUuIEhl cmUncyB0aGUgd2FybmluZyBtZXNzYWdlICgKKyAgICAgICAgdHJlYXRlZCBhcyBhbiBlcnJvciBh bmQgc3RvcHBlZCBidWlsZCkuCisKKyAgICAgICAgV2ViQ29yZUxvY2FsaXplZFN0cmluZ3MuY3Bw IDogd2FybmluZyBDNDgxOTogVGhlIGZpbGUgY29udGFpbnMgYSBjaGFyYWN0ZXIgdGhhdCBjYW5u b3QgYmUKKyAgICAgICAgcmVwcmVzZW50ZWQgaW4gdGhlIGN1cnJlbnQgY29kZSBwYWdlICg5MzIp LiBTYXZlIHRoZSBmaWxlIGluIFVuaWNvZGUgZm9ybWF0IHRvIHByZXZlbnQgZGF0YSBsb3NzCisK KyAgICAgICAgQSBjaGFuZ2Ugb24gV2ViS2l0VG9vbHMvU2NyaXB0cy9leHRyYWN0LWxvY2FsaXph YmxlLXN0cmluZ3MgaXMgYXR0YWNoZWQgdG8gdGhpcyBjaGFuZ2Ugbm90IHRvIGJyZWFrCisgICAg ICAgIGxvY2FsaXplZCBzdHJpbmcgZ2VuZXJhdGlvbiBwcm9jZXNzLgorCisgICAgICAgICogV2Vi Q29yZUxvY2FsaXplZFN0cmluZ3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aW1hZ2VUaXRsZSk6 CisKIDIwMDktMDctMjAgIFBldGVyIEthc3RpbmcgIDxwa2FzdGluZ0Bnb29nbGUuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IE1hcmsgUm93ZS4KSW5kZXg6IFdlYktpdC93aW4vV2ViQ29yZUxv Y2FsaXplZFN0cmluZ3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vV2ViQ29yZUxvY2Fs aXplZFN0cmluZ3MuY3BwCShyZXZpc2lvbiA0NjE0MykKKysrIFdlYktpdC93aW4vV2ViQ29yZUxv Y2FsaXplZFN0cmluZ3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05OSw3ICs5OSw3IEBAIFN0cmlu ZyBXZWJDb3JlOjptZWRpYUVsZW1lbnRMaXZlQnJvYWRjYXMKIAogU3RyaW5nIFdlYkNvcmU6Omlt YWdlVGl0bGUoY29uc3QgU3RyaW5nJiBmaWxlbmFtZSwgY29uc3QgSW50U2l6ZSYgc2l6ZSkgCiB7 IAotICAgIHN0YXRpYyBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IGZvcm1hdChBZG9wdENGLCBVSV9T VFJJTkcoIiVAICVkw5clZCBwaXhlbHMiLCAid2luZG93IHRpdGxlIGZvciBhIHN0YW5kYWxvbmUg aW1hZ2UgKHVzZXMgbXVsdGlwbGljYXRpb24gc3ltYm9sLCBub3QgeCkiKSk7CisgICAgc3RhdGlj IFJldGFpblB0cjxDRlN0cmluZ1JlZj4gZm9ybWF0KEFkb3B0Q0YsIFVJX1NUUklORygiJUAgJWRc eEMzXHg5NyVkIHBpeGVscyIsICJ3aW5kb3cgdGl0bGUgZm9yIGEgc3RhbmRhbG9uZSBpbWFnZSAo dXNlcyBtdWx0aXBsaWNhdGlvbiBzeW1ib2wsIG5vdCB4KSIpKTsKIAogICAgIFJldGFpblB0cjxD RlN0cmluZ1JlZj4gZmlsZW5hbWVDRihBZG9wdENGLCBmaWxlbmFtZS5jcmVhdGVDRlN0cmluZygp KTsKICAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IHJlc3VsdChBZG9wdENGLCBDRlN0cmluZ0Ny ZWF0ZVdpdGhGb3JtYXQoMCwgMCwgZm9ybWF0LmdldCgpLCBmaWxlbmFtZUNGLmdldCgpLCBzaXpl LndpZHRoKCksIHNpemUuaGVpZ2h0KCkpKTsKSW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ2MTUzKQorKysg V2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIw MDktMDctMjAgIFRha2VzaGkgWW9zaGlubyAgPHR5b3NoaW5vQGdvb2dsZS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVkMrKyAyMDA1IEV4cHJl c3MgZmFpbGVkIHRvIGJ1aWxkIFdlYktpdCBkdWUgdG8gcmF3IFVURi04IHN0cmluZyBpbiBXZWJL aXQvd2luL1dlYkNvcmVMb2NhbGl6ZWRTdHJpbmdzLmNwcAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjYzNzUKKworICAgICAgICBNYWtlIGl0IGFibGUg dG8gdXNlIGhleGFkZWNpbWFsIGVzY2FwZSBzZXF1ZW5jZXMgaW4gLipVSV9TVFJJTkcoX0tFWSk/ IG1hY3Jvcy4gTm93CisgICAgICAgIHRoZSBleHRyYWN0LWxvY2FsaXphYmxlLXN0cmluZ3Mgc2Ny aXB0IHVuZXNjYXBlcyBoZXhhZGVjaW1hbCBlc2NhcGUgc2VxdWVuY2VzIGluIHN0cmluZyBsaXRl cmFscworICAgICAgICBpbiB0aGUgbWFjcm9zIGJlZm9yZSB3cml0aW5nIG91dCB0aGVtIGludG8g dGhlIGZpbGUgdG8gdXBkYXRlLgorCisgICAgICAgIEJ5IHRoaXMgZml4LCB3ZSBjYW4gZWxpbWlu YXRlIHJhdyBVVEYtOCBzdHJpbmdzIGluIHNvdXJjZSBjb2RlIHdoaWxlIHVzaW5nIHJhdyBVVEYt MTYgYmlnIGVuZGlhbgorICAgICAgICBzdHJpbmdzIGluIHRoZSBMb2NhbGl6YWJsZS5zdHJpbmdz IGZpbGUuCisKKyAgICAgICAgQm9udXM6IFRoZXJlJ3Mgbm8gbG9uZ2VyIGV4dHJhY3Qtd2Via2l0 LWxvY2FsaXphYmxlLXN0cmluZ3Mgc2NyaXB0LiBGaXggdXNhZ2UgbWVzc2FnZSB0byBndWlkZQor ICAgICAgICB1c2VycyB0byB1cGRhdGUtd2Via2l0LWxvY2FsaXphYmxlLXN0cmluZ3MuCisKKyAg ICAgICAgKiBTY3JpcHRzL2V4dHJhY3QtbG9jYWxpemFibGUtc3RyaW5nczoKKwogMjAwOS0wNy0y MCAgUGV0ZXIgS2FzdGluZyAgPHBrYXN0aW5nQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgTWFyayBSb3dlLgpJbmRleDogV2ViS2l0VG9vbHMvU2NyaXB0cy9leHRyYWN0LWxvY2Fs aXphYmxlLXN0cmluZ3MKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvU2NyaXB0cy9leHRyYWN0 LWxvY2FsaXphYmxlLXN0cmluZ3MJKHJldmlzaW9uIDQ2MTQzKQorKysgV2ViS2l0VG9vbHMvU2Ny aXB0cy9leHRyYWN0LWxvY2FsaXphYmxlLXN0cmluZ3MJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDkg KzQ0LDExIEBACiAKIHVzZSBzdHJpY3Q7CiAKK3N1YiBVbmVzY2FwZUhleFNlcXVlbmNlKCQpOwor CiBteSAlaXNEZWJ1Z01hY3JvID0gKCBBU1NFUlRfV0lUSF9NRVNTQUdFID0+IDEsIExPR19FUlJP UiA9PiAxLCBFUlJPUiA9PiAxLCBOU1VSTF9FUlJPUiA9PiAxLCBGQVRBTCA9PiAxLCBMT0cgPT4g MSwgTE9HX1dBUk5JTkcgPT4gMSwgVUlfU1RSSU5HX0xPQ0FMSVpFX0xBVEVSID0+IDEsIExQQ1RT VFJfVUlfU1RSSU5HX0xPQ0FMSVpFX0xBVEVSID0+IDEsIFVOTE9DQUxJWkVEX1NUUklORyA9PiAx LCBVTkxPQ0FMSVpFRF9MUENUU1RSID0+IDEsIGRwcmludGYgPT4gMSwgTlNFeGNlcHRpb24gPT4g MSwgTlNMb2cgPT4gMSwgcHJpbnRmID0+IDEgKTsKIAotQEFSR1YgPj0gMSBvciBkaWUgIlVzYWdl OiBleHRyYWN0LWxvY2FsaXphYmxlLXN0cmluZ3MgPGV4Y2VwdGlvbnMgZmlsZT4gWyBkaXJlY3Rv cnkuLi4gXVxuRGlkIHlvdSBtZWFuIHRvIHJ1biBleHRyYWN0LXdlYmtpdC1sb2NhbGl6YWJsZS1z dHJpbmdzIGluc3RlYWQ/XG4iOworQEFSR1YgPj0gMSBvciBkaWUgIlVzYWdlOiBleHRyYWN0LWxv Y2FsaXphYmxlLXN0cmluZ3MgPGV4Y2VwdGlvbnMgZmlsZT4gWyBkaXJlY3RvcnkuLi4gXVxuRGlk IHlvdSBtZWFuIHRvIHJ1biB1cGRhdGUtd2Via2l0LWxvY2FsaXphYmxlLXN0cmluZ3MgaW5zdGVh ZD9cbiI7CiAKIG15ICRleGNlcHRpb25zRmlsZSA9IHNoaWZ0IEBBUkdWOwogLWYgJGV4Y2VwdGlv bnNGaWxlIG9yIGRpZSAiQ291bGRuJ3QgZmluZCBleGNlcHRpb25zIGZpbGUgJGV4Y2VwdGlvbnNG aWxlXG4iOwpAQCAtMjY0LDYgKzI2NiwyOSBAQCBoYW5kbGVTdHJpbmc6CiAgICAgY2xvc2UgU09V UkNFOwogfQogCisjIFVuZXNjYXBlcyBDIGxhbmd1YWdlIGhleGFkZWNpbWFsIGVzY2FwZSBzZXF1 ZW5jZXMuCitzdWIgVW5lc2NhcGVIZXhTZXF1ZW5jZSgkKQoreworICAgIG15ICgkb3JpZ2luYWxT dHIpID0gQF87CisKKyAgICBteSAkZXNjYXBlZFN0ciA9ICRvcmlnaW5hbFN0cjsKKyAgICBteSAk dW5lc2NhcGVkU3RyID0gIiI7CisKKyAgICBmb3IgKDs7KSB7CisgICAgICAgIGlmICgkZXNjYXBl ZFN0ciA9fiBzLV5cXHgoW1s6eGRpZ2l0Ol1dKyktLSkgeworICAgICAgICAgICAgaWYgKDI1NiA8 PSBoZXgoJDEpKSB7CisgICAgICAgICAgICAgICAgcHJpbnQgIkhleGFkZWNpbWFsIGVzY2FwZSBz ZXF1ZW5jZSBvdXQgb2YgcmFuZ2U6IFxceCQxXG4iOworICAgICAgICAgICAgICAgIHJldHVybiB1 bmRlZjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgICR1bmVzY2FwZWRTdHIgLj0gcGFjaygi SCoiLCAkMSk7CisgICAgICAgIH0gZWxzaWYgKCRlc2NhcGVkU3RyID1+IHMtXiguKS0tKSB7Cisg ICAgICAgICAgICAkdW5lc2NhcGVkU3RyIC49ICQxOworICAgICAgICB9IGVsc2UgeworICAgICAg ICAgICAgcmV0dXJuICR1bmVzY2FwZWRTdHI7CisgICAgICAgIH0KKyAgICB9Cit9CisKIG15ICVz dHJpbmdCeUtleTsKIG15ICVjb21tZW50QnlLZXk7CiBteSAlZmlsZUJ5S2V5OwpAQCAtMjc0LDYg KzI5OSwyMSBAQCBzdWIgSGFuZGxlVUlTdHJpbmcKICAgICBteSAoJHN0cmluZywgJGtleSwgJGNv bW1lbnQsICRmaWxlLCAkbGluZSkgPSBAXzsKIAogICAgIG15ICRiYWQgPSAwOworICAgICRzdHJp bmcgPSBVbmVzY2FwZUhleFNlcXVlbmNlKCRzdHJpbmcpOworICAgIGlmICghZGVmaW5lZCgkc3Ry aW5nKSkgeworICAgICAgICBwcmludCAiJGZpbGU6JGxpbmU6RVJST1I6c3RyaW5nIGhhcyBhbiBp bGxlZ2FsIGhleGFkZWNpbWFsIGVzY2FwZSBzZXF1ZW5jZVxuIjsKKyAgICAgICAgJGJhZCA9IDE7 CisgICAgfQorICAgICRrZXkgPSBVbmVzY2FwZUhleFNlcXVlbmNlKCRrZXkpOworICAgIGlmICgh ZGVmaW5lZCgka2V5KSkgeworICAgICAgICBwcmludCAiJGZpbGU6JGxpbmU6RVJST1I6a2V5IGhh cyBhbiBpbGxlZ2FsIGhleGFkZWNpbWFsIGVzY2FwZSBzZXF1ZW5jZVxuIjsKKyAgICAgICAgJGJh ZCA9IDE7CisgICAgfQorICAgICRjb21tZW50ID0gVW5lc2NhcGVIZXhTZXF1ZW5jZSgkY29tbWVu dCk7CisgICAgaWYgKCFkZWZpbmVkKCRjb21tZW50KSkgeworICAgICAgICBwcmludCAiJGZpbGU6 JGxpbmU6RVJST1I6Y29tbWVudCBoYXMgYW4gaWxsZWdhbCBoZXhhZGVjaW1hbCBlc2NhcGUgc2Vx dWVuY2VcbiI7CisgICAgICAgICRiYWQgPSAxOworICAgIH0KICAgICBpZiAoZ3JlcCB7ICRfID09 IDB4RkZGRCB9IHVucGFjayAiVSoiLCAkc3RyaW5nKSB7CiAgICAgICAgIHByaW50ICIkZmlsZTok bGluZTpFUlJPUjpzdHJpbmcgZm9yIHRyYW5zbGF0aW9uIGhhcyBpbGxlZ2FsIFVURi04IC0tIG1v c3QgbGlrZWx5IGEgcHJvYmxlbSB3aXRoIHRoZSBUZXh0IEVuY29kaW5nIG9mIHRoZSBzb3VyY2Ug ZmlsZVxuIjsKICAgICAgICAgJGJhZCA9IDE7Cg==