1331171 - Remove Windows shell integration and xpcom checks for Windows Vista

Status: RESOLVED FIXED

(Core :: XPCOM, defect)

Description

[Chris Peterson [:cpeterson]]

Now that Firefox 53 no longer supports Windows XP or Vista, we can remove unnecessary Windows version checks for XP, Vista, and 7.

Here is a green Try run:

https://treeherder.mozilla.org/#/jobs?repo=try&revision=51f08cea49f983d343706cccdb9bd92e1657bb75

Comment 1

[Chris Peterson [:cpeterson]]

Attachment: Bug 1331171 - Part 1: Remove StartupSpecialSystemDirectory() workaround for Windows XP.

SHGetKnownFolderPath() is available on Windows Vista+ so we no longer need to GetProcAddress("SHGetKnownFolderPath"). We can set _WIN32_WINNT 0x0600 to expose the SHGetKnownFolderPath function declaration in shlobj.h and call it directly.

Also remove a redundant #include <shlobj.h>.

Review commit: https://reviewboard.mozilla.org/r/104724/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/104724/

Comment 2

[Chris Peterson [:cpeterson]]

Attachment: Bug 1331171 - Part 2: Remove Windows shell integration checks for Windows Vista.

Review commit: https://reviewboard.mozilla.org/r/104726/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/104726/

Comment 3

[Chris Peterson [:cpeterson]]

Attachment: Bug 1331171 - Part 3: Remove xpcom checks for Windows Vista.

Also remove the #includes of some unused header files.

Review commit: https://reviewboard.mozilla.org/r/104728/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/104728/

Comment 4

[Nathan Froyd [:froydnj]]

Comment on attachment 8826899 [details]
Bug 1331171 - Part 1: Remove StartupSpecialSystemDirectory() workaround for Windows XP.

https://reviewboard.mozilla.org/r/104724/#review105456

::: xpcom/io/SpecialSystemDirectory.cpp:14
(Diff revision 1)
> +#ifdef _WIN32_WINNT
> +#undef _WIN32_WINNT
> +#endif
> +#define _WIN32_WINNT 0x0600

FWIW, bug 1325299 is busy making this the default everywhere.

Comment 5

[Nathan Froyd [:froydnj]]

Comment on attachment 8826901 [details]
Bug 1331171 - Part 3: Remove xpcom checks for Windows Vista.

https://reviewboard.mozilla.org/r/104728/#review105940

Thank you!

Comment 6

[Jim Mathies [:jimm]]

Comment on attachment 8826899 [details]
Bug 1331171 - Part 1: Remove StartupSpecialSystemDirectory() workaround for Windows XP.

https://reviewboard.mozilla.org/r/104724/#review106312

r+ on the removal of the code, but lets wait until we can avoid the added platform ifdef work.

::: xpcom/io/SpecialSystemDirectory.cpp:14
(Diff revision 1)
> +#ifdef _WIN32_WINNT
> +#undef _WIN32_WINNT
> +#endif
> +#define _WIN32_WINNT 0x0600

I like the idea of blocking on this and updating this patch.

Comment 7

[Jim Mathies [:jimm]]

Comment on attachment 8826900 [details]
Bug 1331171 - Part 2: Remove Windows shell integration checks for Windows Vista.

https://reviewboard.mozilla.org/r/104726/#review106320

Comment 8

[Chris Peterson [:cpeterson]]

(In reply to Jim Mathies [:jimm] from comment #6)
> ::: xpcom/io/SpecialSystemDirectory.cpp:14
> (Diff revision 1)
> > +#ifdef _WIN32_WINNT
> > +#undef _WIN32_WINNT
> > +#endif
> > +#define _WIN32_WINNT 0x0600
> 
> I like the idea of blocking on this and updating this patch.

Sounds good. I'll wait for _WIN32_WINNT bug 1325299 to land and then rebase my patches.

Comment 9

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/db3691e4c328
Part 1: Remove StartupSpecialSystemDirectory() workaround for Windows XP. r=jimm
https://hg.mozilla.org/integration/mozilla-inbound/rev/00edf253517f
Part 2: Remove Windows shell integration checks for Windows Vista. r=jimm
https://hg.mozilla.org/integration/mozilla-inbound/rev/be835d18c74f
Part 3: Remove xpcom checks for Windows Vista. r=froydnj

Comment 10

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/db3691e4c328
https://hg.mozilla.org/mozilla-central/rev/00edf253517f
https://hg.mozilla.org/mozilla-central/rev/be835d18c74f