WinDDK ATL and MSVC express compatability

build/common.gypi

Index: build/common.gypi
===================================================================
--- build/common.gypi	(revision 78499)
+++ build/common.gypi	(working copy)
@@ -452,6 +452,13 @@
           },{
             'msvs_large_module_debug_link_mode%': '2',  # Yes
           }],
+          ['MSVS_VERSION=="2010e" or MSVS_VERSION=="2008e" or MSVS_VERSION=="2005e"', {
+            'msvs_express%': 1,
+            'secure_atl%': 0,

[Mark Mentovai, 2011/03/17 16:45:10]

For my own benefit, what’s “secure” ATL? Is this related to what you were
discussing about the DDK ATL?

My current understanding is that Express doesn’t have its own ATL so you’re
forced to use an external ATL, which you’re getting from the DDK, and it’s
somewhat different than the ATL that ships with non-Express MSVC. Is this
correct?

[Mark Mentovai, 2011/03/17 16:49:48]

Mark Mentovai wrote:
I looked back through your responses to my previous questions and saw that you
covered this. Sorry for asking the question again, I understand what’s going on
now. Thanks for your explanation.

+          },{
+            'msvs_express%': 0,
+            'secure_atl%': 1,
+          }],
         ],
         'nacl_win64_defines': [
           # This flag is used to minimize dependencies when building
@@ -1446,7 +1453,6 @@
           '_CRT_RAND_S',
           'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
           'WIN32_LEAN_AND_MEAN',
-          '_SECURE_ATL',
           '_ATL_NO_OPENGL',
           '_HAS_TR1=0',
         ],
@@ -1456,6 +1462,16 @@
               '_HAS_EXCEPTIONS=0',
             ],
           }],
+          [ 'msvs_express', {

[Mark Mentovai, 2011/03/17 16:45:10]

It’s unusual to put a space between the [ and ' as is done here and on 1470,
1493, and 1496. The style above on 1460 and below on 1522 is much more common.

[RN, 2011/03/17 20:15:11]

It's still inconsistent; just following the existing surrounding code as
previously instructed in a similar instance. 

Done.

+            'defines': [
+              'COMPILER_MSVC_EXPRESS',

[M-A Ruel, 2011/03/17 14:01:24]

I prefer COMPILER_MSVC_EXPRESS to be set in build/build_config.h like
COMPILER_MSVC and COMPILER_GCC.

[Mark Mentovai, 2011/03/17 16:45:10]

This is now only used in exactly one location. If we can kill that location, we
can kill this macro altogether, which would probably be the best solution.

[RN, 2011/03/17 16:50:27]

So would I, but it isn't possible to determine an express version at
compile/preprocessor time. 

Unless... you mean you want to literally do a different named define here and
then put it in build/build_config.h also.

[RN, 2011/03/17 20:15:11]

Yeah, I can agree with that. Done.

+            ],
+          }],
+          [ 'secure_atl', {
+            'defines': [
+              '_SECURE_ATL',
+            ],
+          }],
         ],
         'msvs_system_include_dirs': [
           '<(DEPTH)/third_party/platformsdk_win7/files/Include',
@@ -1477,7 +1493,7 @@
               [ 'msvs_multi_core_compile', {
                 'AdditionalOptions': ['/MP'],
               }],
-              ['component=="shared_library"', {
+              [ 'component=="shared_library"', {
                 'ExceptionHandling': '1',  # /EHsc
               }, {
                 'ExceptionHandling': '0',
@@ -1502,6 +1518,14 @@
               'psapi.lib',
               'dbghelp.lib',
             ],
+            'conditions': [ 
+              ['msvs_express', {

[Mark Mentovai, 2011/03/17 16:45:10]

Does this section have to do with Express or with secure_atl?

[RN, 2011/03/17 20:15:11]

This is actually express-specific. Non-express versions will try to link this
library automatically; this applies to all ATL implementations and has nothing
to the WinDDK ATL (at least since ~VC6).

+                # Explicitly required when using the ATL with express
+                'AdditionalDependencies': [
+                  'atlthunk.lib',
+                ],
+              }],
+            ],
             'AdditionalLibraryDirectories': [
               '<(DEPTH)/third_party/platformsdk_win7/files/Lib',
               '<(DEPTH)/third_party/directxsdk/files/Lib/x86',