428970 - Implement --disable-vista-sdk-requirements configure option and update source to use it

Status: RESOLVED FIXED

Description

[Jim Mathies [:jimm]]

From the discussion in bug 397678, we'll be moving to a more general configure flag and ifdefing more code, including - 

http://lxr.mozilla.org/mozilla/source/browser/components/shell/src/nsWindowsShellService.cpp#212
http://lxr.mozilla.org/mozilla/source/mail/components/shell/nsMailWinIntegration.cpp#640
http://lxr.mozilla.org/mozilla/source/uriloader/exthandler/win/nsOSHelperAppService.cpp (multiple uses of app reg api)

and the removal of header information in the above src files plus -

http://lxr.mozilla.org/mozilla/source/uriloader/exthandler/win/IApplicationAssociationRegistration.h

Comment 1

[Mike Beltzner [:beltzner, not reading bugmail]]

I should have checked the discussion before making my decision. Yes, this blocks.

Comment 2

[Jim Mathies [:jimm]]

Created attachment 317036 [details] [diff] [review]
sdk update v.1

Comment 3

[Jim Mathies [:jimm]]

Created attachment 317046 [details] [diff] [review]
sdk update v.2

Comment 4

[Jim Mathies [:jimm]]

Created attachment 317076 [details] [diff] [review]
sdk update v.3

updated sunbird and lightning mozconfigs

Comment 5

[Jim Mathies [:jimm]]

Created attachment 317117 [details] [diff] [review]
sdk update v.4

Comment 6

[Jim Mathies [:jimm]]

Tested on msvc 8 w/ vista sdk and msvc 7.1 w/2003 R2 sdk. Also tested the various ac options flags, and ran the browser portion through the try server.
 

Comment 7

[Robert Strong [:rstrong] (use needinfo to contact me)]

Comment on attachment 317117 [details] [diff] [review]
sdk update v.4

I did a quick once over and this looks fine. I'll do a more thorough review later.

Comment 8

[Mike Beltzner [:beltzner, not reading bugmail]]

Comment on attachment 317117 [details] [diff] [review]
sdk update v.4

a1.9=beltzner

Comment 9

[:Gavin Sharp [email: [e-mail]]]

mozilla/browser/components/shell/src/nsWindowsShellService.cpp 	1.56
mozilla/browser/components/shell/src/nsWindowsShellService.h 	1.15
mozilla/config/autoconf.mk.in 	3.461
mozilla/uriloader/exthandler/Makefile.in 	1.74
mozilla/mail/components/shell/nsMailWinIntegration.cpp 	1.10
mozilla/tools/tinderbox-configs/lightning/win32/mozconfig 	1.6
mozilla/uriloader/exthandler/win/nsOSHelperAppService.cpp 	1.85
mozilla/uriloader/exthandler/win/nsOSHelperAppService.h 	1.33
mozilla/suite/shell/src/nsWindowsShellService.cpp 	1.4
mozilla/tools/tinderbox-configs/sunbird/win32/mozconfig 	1.36
mozilla/configure.in 	1.1987

Comment 10

[Serge Gautherie (:sgautherie)]

Comment on attachment 317117 [details] [diff] [review]
sdk update v.4

>Index: mail/components/shell/nsMailWinIntegration.cpp
>===================================================================
>RCS file: /cvsroot/mozilla/mail/components/shell/nsMailWinIntegration.cpp,v
>retrieving revision 1.9
>diff -u -p -8 -r1.9 nsMailWinIntegration.cpp
>--- mail/components/shell/nsMailWinIntegration.cpp	11 Jul 2007 05:59:57 -0000	1.9
>+++ mail/components/shell/nsMailWinIntegration.cpp	22 Apr 2008 22:37:59 -0000
>@@ -638,64 +644,20 @@ nsWindowsShellService::setKeysForSetting
>   HRESULT hr = CoCreateInstance (CLSID_ApplicationAssociationReg,
>                                  NULL,
>                                  CLSCTX_INPROC,
>                                  IID_IApplicationAssociationReg,
>                                  (void**)&pAAR);

The 2 |*ApplicationAssociationReg| must be renamed here too !

Comment 11

[:Gavin Sharp [email: [e-mail]]]

Created attachment 317742 [details] [diff] [review]
followup

mozilla/mail/components/shell/nsMailWinIntegration.cpp 	1.11

Comment 12

[Jim Mathies [:jimm]]

Crap, sorry. search and replace let me down. 

Comment 13

[Jim Mathies [:jimm]]

If anyone on this has delete access to cvs, could you please remove - 

uriloader/exthandler/win/IApplicationAssociationRegistration.h  

Comment 14

[:Gavin Sharp [email: [e-mail]]]

(In reply to comment #13)
> If anyone on this has delete access to cvs, could you please remove - 
> uriloader/exthandler/win/IApplicationAssociationRegistration.h  

Done.