WinDDK ATL and MSVC express compatability

chrome/installer/mini_installer/mini_installer.cc

 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // mini_installer.exe is the first exe that is run when chrome is being
 // installed or upgraded. It is designed to be extremely small (~5KB with no
 // extra resources linked) and it has two main jobs:
 //   1) unpack the resources (possibly decompressing some)
 //   2) run the real installer (setup.exe) with appropiate flags.
 //
@@ skipping 10 matching lines @@
 // are forced to manually link against it. It comes in the form of two
 // object files that exist in $(VCInstallDir)\crt\src which are memset.obj and
 // P4_memset.obj. These two object files rely on the existence of a static
 // variable named __sse2_available which indicates the presence of intel sse2
 // extensions. We define it to false which causes a slower but safe code for
 // memcpy and memset intrinsics.
 
 // having the linker merge the sections is saving us ~500 bytes.
 #pragma comment(linker, "/MERGE:.rdata=.text")
 
+#ifdef COMPILER_MSVCEXPRESS
+#include <intrin.h>  //  __stosb for memset

[Mark Mentovai, 2011/03/16 16:25:20]

Two spaces before the //, one after.

[M-A Ruel, 2011/03/16 17:48:55]

Just include it, no need for #ifdef.

[RN, 2011/03/17 06:33:25]

Done and Done.

+#endif
 #include <windows.h>
 #include <setupapi.h>
 #include <shellapi.h>
 #include <shlwapi.h>
 
 #include "chrome/installer/mini_installer/appid.h"
 #include "chrome/installer/mini_installer/mini_installer.h"
 #include "chrome/installer/mini_installer/pe_resource.h"
 
 // Required linker symbol. See remarks above.
@@ skipping 656 matching lines @@
   return exit_code;
 }
 
 }  // namespace mini_installer
 
 
 int MainEntryPoint() {
   int result = mini_installer::WMain(::GetModuleHandle(NULL));
   ::ExitProcess(result);
 }
+
+// VC Express editions don't come with the memset CRT obj file
+#ifdef COMPILER_MSVCEXPRESS
+    extern "C" {

[Mark Mentovai, 2011/03/16 16:25:20]

Don’t indent this line at all.

[RN, 2011/03/17 06:33:25]

Done.

+        #pragma function(memset)

[Mark Mentovai, 2011/03/16 16:25:20]

Never indent C preprocessor directives.

[RN, 2011/03/17 06:33:25]

Done.

+        void* memset(void *dest, int ci, size_t count) {

[Mark Mentovai, 2011/03/16 16:25:20]

The indentation in here is wrong, too.

[RN, 2011/03/17 06:33:25]

Think I fixed this.

+            __stosb((unsigned char*)dest, (unsigned char)ci, count);
+            return dest;
+        }
+    }
+#endif
+

[Mark Mentovai, 2011/03/16 16:25:20]

Get rid of the blank line at EOF.

[RN, 2011/03/17 06:33:25]

Done.