50378 2010-12-02 00:58:30 -0800 Enable DEP at runtime to allow for compatibility with older versions of ATL 2010-12-02 09:10:58 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 sfalken sfalken alice.barraclough oldest_to_newest 316035 0 sfalken 2010-12-02 00:58:30 -0800 Enable DEP at runtime to allow for compatibility with older versions of ATL 316037 1 75359 sfalken 2010-12-02 01:04:58 -0800 Created attachment 75359 Patch 316181 2 75359 aroben 2010-12-02 09:07:04 -0800 Comment on attachment 75359 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=75359&action=review > WebKit2/WebProcess/win/WebProcessMainWin.cpp:45 > + const DWORD disableATLThunkEmulation = 0x00000002; Maybe we don't need to declare this, since we don't use it? > WebKit2/WebProcess/win/WebProcessMainWin.cpp:47 > + HMODULE hMod = GetModuleHandleW(L"Kernel32.dll"); Please add a :: here. > WebKit2/WebProcess/win/WebProcessMainWin.cpp:53 > + PSETDEP procSet = reinterpret_cast<PSETDEP>(GetProcAddress(hMod, "SetProcessDEPPolicy")); And here. > WebKit2/WebProcess/win/WebProcessMainWin.cpp:83 > + enableDataExecutionPrevention(); Seems like this should go in WebKitMain instead. We already have similar code there. 316182 3 75359 aroben 2010-12-02 09:08:29 -0800 Comment on attachment 75359 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=75359&action=review >> WebKit2/WebProcess/win/WebProcessMainWin.cpp:83 >> + enableDataExecutionPrevention(); > > Seems like this should go in WebKitMain instead. We already have similar code there. By putting it in WebKitMain it will get used by the plugin process, too (once we have one). 316184 4 sfalken 2010-12-02 09:10:58 -0800 Committed r73138: <http://trac.webkit.org/changeset/73138> 75359 2010-12-02 01:04:58 -0800 2010-12-02 09:08:29 -0800 Patch bug-50378-20101202010450.patch text/plain 2489 sfalken SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MzExMykKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTAtMTItMDIgIFN0ZXZlIEZhbGtlbmJ1cmcgIDxzZmFsa2VuQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBFbmFibGUgREVQIGF0IHJ1bnRpbWUgdG8gYWxsb3cgZm9yIGNvbXBhdGliaWxpdHkgd2l0aCBv bGRlciB2ZXJzaW9ucyBvZiBBVEwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTUwMzc4CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL3dpbi9XZWJQcm9jZXNz TWFpbldpbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OmVuYWJsZURhdGFFeGVjdXRpb25QcmV2ZW50 aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc01haW4pOgorICAgICAgICAqIHdpbi9X ZWJLaXQyV2ViUHJvY2Vzc0NvbW1vbi52c3Byb3BzOgorCiAyMDEwLTEyLTAxICBTYW0gV2Vpbmln ICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRml4IDY0LWJpdCBidWlsZC4KSW5kZXg6IFdl YktpdDIvV2ViUHJvY2Vzcy93aW4vV2ViUHJvY2Vzc01haW5XaW4uY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdDIvV2ViUHJvY2Vzcy93aW4vV2ViUHJvY2Vzc01haW5XaW4uY3BwCShyZXZpc2lvbiA3 MzA1OSkKKysrIFdlYktpdDIvV2ViUHJvY2Vzcy93aW4vV2ViUHJvY2Vzc01haW5XaW4uY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zNiw2ICszNiwyOCBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAor c3RhdGljIHZvaWQgZW5hYmxlRGF0YUV4ZWN1dGlvblByZXZlbnRpb24oKQoreworICAgIC8vIEVu YWJsZSBEYXRhIEV4ZWN1dGlvbiBwcmV2ZW50aW9uIGF0IHJ1bnRpbWUgcmF0aGVyIHRoYW4gdmlh IC9OWENPTVBBVAorICAgIC8vIGh0dHA6Ly9ibG9ncy5tc2RuLmNvbS9taWNoYWVsX2hvd2FyZC9h cmNoaXZlLzIwMDgvMDEvMjkvbmV3LW54LWFwaXMtYWRkZWQtdG8td2luZG93cy12aXN0YS1zcDEt d2luZG93cy14cC1zcDMtYW5kLXdpbmRvd3Mtc2VydmVyLTIwMDguYXNweAorCisgICAgY29uc3Qg RFdPUkQgZW5hYmxlREVQID0gMHgwMDAwMDAwMTsKKyAgICBjb25zdCBEV09SRCBkaXNhYmxlQVRM VGh1bmtFbXVsYXRpb24gPSAweDAwMDAwMDAyOworCisgICAgSE1PRFVMRSBoTW9kID0gR2V0TW9k dWxlSGFuZGxlVyhMIktlcm5lbDMyLmRsbCIpOworICAgIGlmICghaE1vZCkKKyAgICAgICAgcmV0 dXJuOworCisgICAgdHlwZWRlZiBCT09MIChXSU5BUEkgKlBTRVRERVApKERXT1JEKTsKKworICAg IFBTRVRERVAgcHJvY1NldCA9IHJlaW50ZXJwcmV0X2Nhc3Q8UFNFVERFUD4oR2V0UHJvY0FkZHJl c3MoaE1vZCwgIlNldFByb2Nlc3NERVBQb2xpY3kiKSk7CisgICAgaWYgKCFwcm9jU2V0KQorICAg ICAgICByZXR1cm47CisKKyAgICAvLyBFbmFibGUgRGF0YSBFeGVjdXRpb24gUHJldmVudGlvbiwg YnV0IGFsbG93IEFUTCB0aHVua3MgKGZvciBjb21wYXRpYmlsaXR5IHdpdGggdGhlIHZlcnNpb24g b2YgQVRMIHRoYXQgc2hpcHMgd2l0aCB0aGUgUGxhdGZvcm0gU0RLKS4KKyAgICBwcm9jU2V0KGVu YWJsZURFUCk7Cit9CisKICNpZiBVU0UoU0FGQVJJX1RIRU1FKQogI2lmZGVmIERFQlVHX0FMTAog U09GVF9MSU5LX0RFQlVHX0xJQlJBUlkoU2FmYXJpVGhlbWUpCkBAIC01OCw2ICs4MCw4IEBAIHN0 YXRpYyB2b2lkIGluaXRpYWxpemVTYWZhcmlUaGVtZSgpCiAKIGludCBXZWJQcm9jZXNzTWFpbihj b25zdCBDb21tYW5kTGluZSYgY29tbWFuZExpbmUpCiB7CisgICAgZW5hYmxlRGF0YUV4ZWN1dGlv blByZXZlbnRpb24oKTsKKwogICAgIDo6T2xlSW5pdGlhbGl6ZSgwKTsKIAogI2lmIFVTRShTQUZB UklfVEhFTUUpCkluZGV4OiBXZWJLaXQyL3dpbi9XZWJLaXQyV2ViUHJvY2Vzc0NvbW1vbi52c3By b3BzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvd2luL1dlYktpdDJXZWJQcm9jZXNzQ29tbW9uLnZz cHJvcHMJKHJldmlzaW9uIDczMDYwKQorKysgV2ViS2l0Mi93aW4vV2ViS2l0MldlYlByb2Nlc3ND b21tb24udnNwcm9wcwkod29ya2luZyBjb3B5KQpAQCAtMTEsNiArMTEsNSBAQAogCTxUb29sCiAJ CU5hbWU9IlZDTGlua2VyVG9vbCIKIAkJQWRkaXRpb25hbERlcGVuZGVuY2llcz0iV2ViS2l0JChX ZWJLaXRETExDb25maWdTdWZmaXgpLmxpYiIKLQkJQWRkaXRpb25hbE9wdGlvbnM9Ii9OWENPTVBB VCIKIAkvPgogPC9WaXN1YWxTdHVkaW9Qcm9wZXJ0eVNoZWV0Pgo=