34380 2010-01-30 14:38:11 -0800 [WINCE] Buildfix for ThreadSpecific.h 2010-01-31 20:23:16 -0800 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 0 paroga webkit-unassigned commit-queue oldest_to_newest 186131 0 paroga 2010-01-30 14:38:11 -0800 see patch 186132 1 47776 paroga 2010-01-30 14:38:58 -0800 Created attachment 47776 The patch 186283 2 47776 darin 2010-01-31 19:47:36 -0800 Comment on attachment 47776 The patch > +// TLS_OUT_OF_INDEXES is not defined on WinCE. > +#ifndef TLS_OUT_OF_INDEXES > +#define TLS_OUT_OF_INDEXES 0xffffffff > +#endif I guess this is OK, but I don't see any check for WinCE here. Might be slightly better to explicitly use a WINCE ifdef so we’d get a warning instead of just using the wrong value if someone made a mistake and did not get the TLS_OUT_OF_INDEXES constant. > - DWORD tls_key = TlsAlloc(); > - if (tls_key == TLS_OUT_OF_INDEXES) > + DWORD tlsKey = TlsAlloc(); > + if (tlsKey == TLS_OUT_OF_INDEXES) > CRASH(); > > m_index = InterlockedIncrement(&tlsKeyCount()) - 1; > if (m_index >= kMaxTlsKeySize) > CRASH(); > - tlsKeys()[m_index] = tls_key; > + tlsKeys()[m_index] = tlsKey; The unrelated style change really does not belong on the same patch. 186288 3 47776 commit-queue 2010-01-31 20:23:11 -0800 Comment on attachment 47776 The patch Clearing flags on attachment: 47776 Committed r54123: <http://trac.webkit.org/changeset/54123> 186289 4 commit-queue 2010-01-31 20:23:16 -0800 All reviewed patches have been landed. Closing bug. 47776 2010-01-30 14:38:58 -0800 2010-01-31 20:23:10 -0800 The patch ThreadSpecific.patch text/plain 1768 paroga SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDU0MTA0KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTAtMDEtMzAgIFBhdHJpY2sg R2Fuc3RlcmVyICA8cGFyb2dhQHBhcm9nYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQnVpbGRmaXggZm9yIFdpbkNFICsgc3R5bGUgZml4ZXMg KFRMU19PVVRfT0ZfSU5ERVhFUyBpcyBub3QgZGVmaW5lZCkuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDM4MAorCisgICAgICAgICogd3RmL1RocmVh ZFNwZWNpZmljLmg6CisKIDIwMTAtMDEtMjkgIE1hcmsgUm93ZSAgPG1yb3dlQGFwcGxlLmNvbT4K IAogICAgICAgICBTb3J0IFhjb2RlIHByb2plY3RzLgpJbmRleDogSmF2YVNjcmlwdENvcmUvd3Rm L1RocmVhZFNwZWNpZmljLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUvd3RmL1RocmVh ZFNwZWNpZmljLmgJKHJldmlzaW9uIDU0MTAzKQorKysgSmF2YVNjcmlwdENvcmUvd3RmL1RocmVh ZFNwZWNpZmljLmgJKHdvcmtpbmcgY29weSkKQEAgLTE4OCw2ICsxODgsMTEgQEAgaW5saW5lIHZv aWQgVGhyZWFkU3BlY2lmaWM8VD46OnNldChUKiBwdAogCiAjZWxpZiBPUyhXSU5ET1dTKQogCisv LyBUTFNfT1VUX09GX0lOREVYRVMgaXMgbm90IGRlZmluZWQgb24gV2luQ0UuCisjaWZuZGVmIFRM U19PVVRfT0ZfSU5ERVhFUworI2RlZmluZSBUTFNfT1VUX09GX0lOREVYRVMgMHhmZmZmZmZmZgor I2VuZGlmCisKIC8vIFRoZSBtYXhpbXVtIG51bWJlciBvZiBUTFMga2V5cyB0aGF0IGNhbiBiZSBj cmVhdGVkLiBGb3Igc2ltcGxpZmljYXRpb24sIHdlIGFzc3VtZSB0aGF0OgogLy8gMSkgT25jZSB0 aGUgaW5zdGFuY2Ugb2YgVGhyZWFkU3BlY2lmaWM8PiBpcyBjcmVhdGVkLCBpdCB3aWxsIG5vdCBi ZSBkZXN0cnVjdGVkIHVudGlsIHRoZSBwcm9ncmFtIGRpZXMuCiAvLyAyKSBXZSBkbyBub3QgbmVl ZCB0byBob2xkIG1hbnkgaW5zdGFuY2VzIG9mIFRocmVhZFNwZWNpZmljPD4gZGF0YS4gVGhpcyBm aXhlZCBudW1iZXIgc2hvdWxkIGJlIGZhciBlbm91Z2guCkBAIC0yMDAsMTQgKzIwNSwxNCBAQCB0 ZW1wbGF0ZTx0eXBlbmFtZSBUPgogaW5saW5lIFRocmVhZFNwZWNpZmljPFQ+OjpUaHJlYWRTcGVj aWZpYygpCiAgICAgOiBtX2luZGV4KC0xKQogewotICAgIERXT1JEIHRsc19rZXkgPSBUbHNBbGxv YygpOwotICAgIGlmICh0bHNfa2V5ID09IFRMU19PVVRfT0ZfSU5ERVhFUykKKyAgICBEV09SRCB0 bHNLZXkgPSBUbHNBbGxvYygpOworICAgIGlmICh0bHNLZXkgPT0gVExTX09VVF9PRl9JTkRFWEVT KQogICAgICAgICBDUkFTSCgpOwogCiAgICAgbV9pbmRleCA9IEludGVybG9ja2VkSW5jcmVtZW50 KCZ0bHNLZXlDb3VudCgpKSAtIDE7CiAgICAgaWYgKG1faW5kZXggPj0ga01heFRsc0tleVNpemUp CiAgICAgICAgIENSQVNIKCk7Ci0gICAgdGxzS2V5cygpW21faW5kZXhdID0gdGxzX2tleTsKKyAg ICB0bHNLZXlzKClbbV9pbmRleF0gPSB0bHNLZXk7CiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+ Cg==