349439 - update MOZILLA_USE_EXTENDED_FT2LIB

Status: VERIFIED FIXED

(Core Graveyard :: GFX: OS/2, defect)

Description

[Andy Willis (abwillis)]

The latest release of Innowin Font Engine now will use HKLM so there may not be a HKCU field or even if there is SM/FF/ETC may not be in it but in HKLM instead.  
Patch to follow that should take care of either case.

Comment 1

[Andy Willis (abwillis)]

Attachment: Add HKLM check

Comment 2

[Peter Weilbacher]

Comment on attachment 234705 [details] [diff] [review]
Add HKLM check

>     // Is FT2LIB enabled?
>     HKEY key;
>     LONG result = RegOpenKeyEx(HKEY_CURRENT_USER,
>                                "Software\\Innotek\\InnoTek Font Engine", 0,
>                                KEY_READ, &key);
>     if (result != ERROR_SUCCESS) {
>-      DosFreeModule(hmod);
>-      return PR_FALSE;
>+      LONG result = RegOpenKeyEx(HKEY_LOCAL_MACHINE,

That LONG should not be there, as it was already defined above. Otherwise it looks fine to me.

Comment 3

[Andy Willis (abwillis)]

Attachment: Remove excess long declaration.

Removed the Long... that's what I get for copy/paste.
I guess Mike still has to do the reviews?

Comment 4

[Mike Kaply [:mkaply]]

Comment on attachment 235656 [details] [diff] [review]
Remove excess long declaration.

r=mkaply

Comment 5

[Peter Weilbacher]

Patch checked into trunk (with a small whitespace change to have the RegOpenKeyEx() arguments aligned).

Comment 6

[Peter Weilbacher]

Reminder to myself: get this into branch...

Comment 7

[Peter Weilbacher]

(In reply to comment #6)
> Reminder to myself: get this into branch...

Somehow bugmail of this bug never arrives in my mailbox. But now, finally, I checked this into the 1.8 branch.

Comment 8

[Peter Weilbacher]

Verifying some older bugs.

(In this case verified that the fix is in but it wasn't necessarily complete, see bug 369695.)