422793 - reduce narrow windows API calls in xpfe

Status: RESOLVED FIXED

(Core :: General, defect)

Description

[Brad Lassey [:blassey] (use needinfo?)]

Attachment: directy from "other" patch on bug 418703

Comment 1

[[e-mail]]

Comment on attachment 309240 [details] [diff] [review]
directy from "other" patch on bug 418703

Sorry, but this file is deprecated, although I think Camino (Mac) hasn't migrated off it yet.

Comment 2

[Brian Crowder]

Neil:  re: comment #1:  shouldn't that make a patch here easy to accept?  :)

Comment 3

[[e-mail]]

Comment on attachment 309240 [details] [diff] [review]
directy from "other" patch on bug 418703

So, it turns out that this gets copied into toolkit...

>+    NS_ConvertUTF8toUTF16 msg_str(aMessage, copy_len);
>+    PRUnichar* message_copy =  (PRUnichar*)msg_str.get();
>+    MessageBoxW(NULL, message_copy, NULL, MB_OK | MB_ICONERROR | MB_SETFOREGROUND );
You can write this all on one line:
MessageBoxW(NULL, NS_ConvertUTF8toUTF16(aMessage).get(), ...);

>     const PRInt32 max_len = 255;
>-    char message_copy[max_len+1] = { 0 };
>     PRInt32 input_len = strlen(aMessage);
>     PRInt32 copy_len = (input_len > max_len) ? max_len : input_len;
>     strncpy(message_copy, aMessage, copy_len);
>     message_copy[copy_len] = 0;
So, it turns out that this copy is only needed on the Mac. And we're using XP_MAC instead of XP_MACOSX :-( I don't know what to recommend here (ask josh or someone) but unless you get told to delete it, please move this code into the XP_MAC block. (Fix OS/2 to use aMessage too.)

Comment 4

[Brian Crowder]

Attachment: remove it [Checkin: Comment 7]

Looks like you were right the first time, Neil.

Comment 5

[Brian Crowder]

The removal patch survived a try-server run, also.

Comment 6

[[e-mail]]

Comment on attachment 342333 [details] [diff] [review]
remove it
[Checkin: Comment 7]

I trawled CVS history and discovered that it was part of the old JS-based xpinstall mechanism that got dropped at the end of January.

Comment 7

[Brian Crowder]

http://hg.mozilla.org/mozilla-central/rev/57941b4eec1a