34614 2010-02-04 13:27:09 -0800 [Qt] npapi header leaves XP_WIN flag defined even when __SYMBIAN32__ flag is found 2010-06-16 08:55:44 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) S60 Emulator S60 3rd edition CLOSED FIXED Qt P2 Normal --- 35784 1 abhinav.mithal abhinav.mithal abhinav.mithal commit-queue hausmann hegde.shashank laszlo.gombos oldest_to_newest 187915 0 abhinav.mithal 2010-02-04 13:27:09 -0800 When MinGW compiler is used to compile Netscape Plugins on Windows XP with Qt, npapi.h tries to include windows.h. This is because in npapi.h ifdef clause for __SYMBIAN32__ does not undefine XP_WIN and npapi.h eventually ends up trying to include windows.h eventhough user is building for Symbian. This problem is reproducible with nightly build -r54342 Here is the error seen while trying to compile a sample Netscape Plug-in: make -s -r -f "\EPOC32\BUILD\cwrt\plugins\s60\SampleNPQtPlugin\SAMPLENPQTPLUGIN_0XE0AE5E3D\WINSCW\SAMPLENPQTPLUGIN_0XE0AE5E3D.WINSCW" UDEB samplenpqtplugin.cpp npapi.h:116: the file 'windows.h' cannot be opened Proposed Solution: add #undef XP_WIN after #define XP_SYMBIAN 1 in the ifdef clause for __SYMBIAN32__ 208790 1 laszlo.gombos 2010-04-05 16:36:17 -0700 Abhinav, any update on this ? 209049 2 52639 abhinav.mithal 2010-04-06 07:55:36 -0700 Created attachment 52639 This patch checks for Symbian flag definition before defining XP_WIN flag and takes care of the issue. 209134 3 52653 abhinav.mithal 2010-04-06 11:28:26 -0700 Created attachment 52653 This is a new patch which has been tested for both winscw and armv5 209142 4 52653 laszlo.gombos 2010-04-06 11:42:21 -0700 Comment on attachment 52653 This is a new patch which has been tested for both winscw and armv5 lgtm, thanks. This seems to be a regression after r49987. 209283 5 52653 commit-queue 2010-04-06 15:32:48 -0700 Comment on attachment 52653 This is a new patch which has been tested for both winscw and armv5 Clearing flags on attachment: 52653 Committed r57170: <http://trac.webkit.org/changeset/57170> 209284 6 commit-queue 2010-04-06 15:32:53 -0700 All reviewed patches have been landed. Closing bug. 209509 7 hausmann 2010-04-07 00:32:38 -0700 Revision r57170 cherry-picked into qtwebkit-2.0 with commit b246edd8056941a91f1ceec2fcd45850d647ef34 238834 8 hausmann 2010-06-16 06:33:47 -0700 *** Bug 39708 has been marked as a duplicate of this bug. *** 238907 9 hausmann 2010-06-16 08:55:44 -0700 Revision r57170 cherry-picked into qtwebkit-4.6 with aa3f786bdba4dc153620ae7f98e4b0e41770d1d1 52639 2010-04-06 07:55:36 -0700 2010-04-06 11:28:26 -0700 This patch checks for Symbian flag definition before defining XP_WIN flag and takes care of the issue. 34614.patch text/plain 1367 abhinav.mithal SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzA3NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMDQtMDUgIEFiaGluYXYgTWl0aGFsIDxhYmhpbmF2Lm1pdGhh bEBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgW1F0XSBucGFwaSBoZWFkZXIgbGVhdmVzIFhQX1dJTiBmbGFnIGRlZmluZWQgZXZlbiB3 aGVuIF9fU1lNQklBTjMyX18gZmxhZyBpcyBmb3VuZAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQ2MTQKKworICAgICAgICBEbyBub3QgZGVmaW5lIFhQ X1dJTiBpZiBXZWJLaXQgaXMgY29tcGlsZWQgZm9yIFN5bWJpYW4uCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzIGFzIHRoZXJlIGlzIG5vIG5ldyBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICogYnJp ZGdlL25wYXBpLmg6CisKIDIwMTAtMDQtMDUgIExhc3psbyBHb21ib3MgIDxsYXN6bG8uMS5nb21i b3NAbm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0 aWFuc2VuLgpJbmRleDogV2ViQ29yZS9icmlkZ2UvbnBhcGkuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL2JyaWRnZS9ucGFwaS5oCShyZXZpc2lvbiA1NzA3NSkKKysrIFdlYkNvcmUvYnJpZGdlL25w YXBpLmgJKHdvcmtpbmcgY29weSkKQEAgLTUwLDE4ICs1MCwxOCBAQAogI2RlZmluZSBKUklFbnYg IHZvaWQKICNlbmRpZgogCi0jaWZkZWYgX1dJTjMyCi0jICAgIGlmbmRlZiBYUF9XSU4KLSMgICAg ICAgIGRlZmluZSBYUF9XSU4gMQotIyAgICBlbmRpZiAvKiBYUF9XSU4gKi8KLSNlbmRpZiAvKiBf V0lOMzIgKi8KLQogI2lmZGVmIF9fU1lNQklBTjMyX18KICMgICBpZm5kZWYgWFBfU1lNQklBTgog IyAgICAgICBkZWZpbmUgWFBfU1lNQklBTiAxCiAjICAgZW5kaWYKICNlbmRpZiAgLyogX19TWU1C SUFOMzJfXyAqLwogCisjaWYgZGVmaW5lZChfV0lOMzIpICYmICFkZWZpbmVkKFhQX1NZTUJJQU4p CisjICAgIGlmbmRlZiBYUF9XSU4KKyMgICAgICAgIGRlZmluZSBYUF9XSU4gMQorIyAgICBlbmRp ZiAvKiBYUF9XSU4gKi8KKyNlbmRpZiAvKiBfV0lOMzIgKi8KKwogI2lmZGVmIF9fTVdFUktTX18K ICMgICAgZGVmaW5lIF9kZWNsc3BlYyBfX2RlY2xzcGVjCiAjICAgIGlmZGVmIG1hY2ludG9zaAo= 52653 2010-04-06 11:28:26 -0700 2010-04-06 15:32:48 -0700 This is a new patch which has been tested for both winscw and armv5 34614.patch text/plain 1059 abhinav.mithal SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzEyNSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMDQtMDYgIEFiaGluYXYgTWl0aGFsIDxhYmhpbmF2Lm1pdGhh bEBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgW1F0XSBucGFwaSBoZWFkZXIgbGVhdmVzIFhQX1dJTiBmbGFnIGRlZmluZWQgZXZlbiB3 aGVuIF9fU1lNQklBTjMyX18gZmxhZyBpcyBmb3VuZAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQ2MTQKKworICAgICAgICBEbyBub3QgZGVmaW5lIFhQ X1dJTiBpZiBXZWJLaXQgaXMgY29tcGlsZWQgZm9yIFN5bWJpYW4uCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzIGFzIHRoZXJlIGlzIG5vIG5ldyBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICogYnJp ZGdlL25wYXBpLmg6CisKIDIwMTAtMDQtMDUgIExlYW5kcm8gUGVyZWlyYSAgPGxlYW5kcm9AcHJv ZnVzaW9uLm1vYmk+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3Rp YW5zZW4uCkluZGV4OiBXZWJDb3JlL2JyaWRnZS9ucGFwaS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvYnJpZGdlL25wYXBpLmgJKHJldmlzaW9uIDU3MTE3KQorKysgV2ViQ29yZS9icmlkZ2UvbnBh cGkuaAkod29ya2luZyBjb3B5KQpAQCAtNTAsNyArNTAsNyBAQAogI2RlZmluZSBKUklFbnYgIHZv aWQKICNlbmRpZgogCi0jaWZkZWYgX1dJTjMyCisjaWYgZGVmaW5lZChfV0lOMzIpICYmICFkZWZp bmVkKF9fU1lNQklBTjMyX18pCiAjICAgIGlmbmRlZiBYUF9XSU4KICMgICAgICAgIGRlZmluZSBY UF9XSU4gMQogIyAgICBlbmRpZiAvKiBYUF9XSU4gKi8K