446159 - Fix build break in nsPluginsDirOS2.cpp and query plugin file version

Status: RESOLVED FIXED

(Core Graveyard :: Plug-ins, defect)

Description

[Peter Weilbacher]

The change in bug 427743 broke the OS/2 build from mozilla-central:

nsPluginsDirOS2.cpp
X:/central/mozilla/modules/plugin/base/src/nsPluginsDirOS2.cpp: In member 
   function `nsresult nsPluginFile::FreePluginInfo(nsPluginInfo&)':
X:/central/mozilla/modules/plugin/base/src/nsPluginsDirOS2.cpp:250: error:
   'struct nsPluginInfo' has no member named 'fFileVersion'

I'll try to get the resource thing worked out as said in bug 427743 comment 12 and then attach a patch.

Comment 1

[Peter Weilbacher]

Ah, didn't notice before, the build break is just because of the last minute rename from fFileVersion to fVersion. Will fix that now for OS2 and BeOS but leave this bug open to really fix the resource thing on OS/2

Comment 2

[Peter Weilbacher]

Attachment: query the version resource on OS/2

OK, this might not be elegant but it seems to work as it gave correct output for the null plugin ("1.0.0.15") and the newest GBM plugin ("1.3.4.1"). The data in memory appears as alternating filled and empty bytes, like
   01 00 03 00 04 00 01 00
for the GBM plugin, so I print every other character...

Comment 3

[Mike Kaply [:mkaply]]

Comment on attachment 330365 [details] [diff] [review]
query the version resource on OS/2

r=mkaply

Comment 4

[Peter Weilbacher]

Great, pushed to mozilla-central:

4e77a961dde2f2d760ec8b69ed20d17d735d71c3
remote: added 1 changesets with 1 changes to 1 files

Comment 5

[Peter Weilbacher]

Not sure how I managed to get an old patch reviewed and checked in while testing with a newer one. Anyway, I just fixed the resulting build break for real with changeset 287af2ba070ba9bf9c58782c55bec41b944d88f8.