Compilation was broken on Windows since the introduction of Advanced String Formatting.

Only PCBuild (vs9) was really tested.
Changes for older compilers were done manually.

PC/VC6/pythoncore.dsp

@@ -125,6 +125,10 @@ SOURCE=..\..\Modules\_codecsmodule.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\_collectionsmodule.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Modules\_csv.c
 # End Source File
 # Begin Source File
@@ -253,10 +257,6 @@ SOURCE=..\..\Objects\codeobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\collectionsmodule.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Python\compile.c
 # End Source File
 # Begin Source File
@@ -333,6 +333,14 @@ SOURCE=..\..\Objects\floatobject.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Python\formatter_string.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Python\formatter_unicode.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Objects\frameobject.c
 # End Source File
 # Begin Source File
@@ -583,10 +591,6 @@ SOURCE=..\..\Objects\rangeobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\rgbimgmodule.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Modules\rotatingtree.c
 # End Source File
 # Begin Source File

PC/VS7.1/pythoncore.vcproj

@@ -514,6 +514,12 @@
 		<File
 			RelativePath="..\..\Objects\floatobject.c">
 		</File>
+		<File
+			RelativePath="..\..\Python\formatter_string.c">
+		</File>
+		<File
+			RelativePath="..\..\Python\formatter_unicode.c">
+		</File>
 		<File
 			RelativePath="..\..\Objects\frameobject.c">
 		</File>

PC/VS8.0/pythoncore.vcproj

@@ -1626,6 +1626,14 @@
 				RelativePath="..\..\Python\errors.c"
 				>
 			</File>
+			<File
+				RelativePath="..\Python\formatter_string.c"
+				>
+			</File>
+			<File
+				RelativePath="..\Python\formatter_unicode.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\Python\frozen.c"
 				>

PCbuild/pythoncore.vcproj

@@ -1626,6 +1626,14 @@
 				RelativePath="..\Python\errors.c"
 				>
 			</File>
+			<File
+				RelativePath="..\Python\formatter_string.c"
+				>
+			</File>
+			<File
+				RelativePath="..\Python\formatter_unicode.c"
+				>
+			</File>
 			<File
 				RelativePath="..\Python\frozen.c"
 				>