Index: Makefile.msc
==================================================================
--- Makefile.msc
+++ Makefile.msc
@@ -8,10 +8,14 @@
 TOP = .
 
 # Set this non-0 to create and use the SQLite amalgamation file.
 #
 USE_AMALGAMATION = 1
+
+# Set this to non-0 to create and use PDBs.
+#
+SYMBOLS = 1
 
 # Set this to one of the following values to enable various debugging
 # features.  Each level includes the debugging options from the previous
 # levels.  Currently, the recognized values for DEBUG are:
 #
@@ -31,17 +35,17 @@
 RELEASE = 3.7.7
 
 # C Compiler and options for use in building executables that
 # will run on the platform that is doing the build.
 #
-BCC = cl.exe -O2
+BCC = cl.exe
 
 # C Compile and options for use in building executables that
 # will run on the target platform.  (BCC and TCC are usually the
 # same unless your are cross-compiling.)
 #
-TCC = cl.exe -W3 -O2 -DSQLITE_OS_WIN=1 -I. -I$(TOP)\src -fp:precise
+TCC = cl.exe -W3 -DSQLITE_OS_WIN=1 -I. -I$(TOP)\src -fp:precise
 
 # The mksqlite3c.tcl and mksqlite3h.tcl scripts will pull in 
 # any extension header files by default.  For non-amalgamation
 # builds, we need to make sure the compiler can find these.
 #
@@ -161,13 +165,20 @@
 
 # Add in any optional parameters specified on the make commane line
 # ie.  make "OPTS=-DSQLITE_ENABLE_FOO=1 -DSQLITE_OMIT_FOO=1".
 TCC = $(TCC) $(OPTS)
 
+# If symbols are enabled, enable PDBs.
 # If debugging is enabled, disable all optimizations and enable PDBs.
 !IF $(DEBUG)>0
-TCC = $(TCC) -Od -Zi -D_DEBUG
+TCC = $(TCC) -Od -D_DEBUG
+!ELSE
+TCC = $(TCC) -O2
+!ENDIF
+
+!IF $(DEBUG)>0 || $(SYMBOLS)!=0
+TCC = $(TCC) -Zi
 !ENDIF
 
 # libtool compile/link
 LTCOMPILE = $(TCC) -Fo$@
 LTLIB = lib.exe
@@ -181,11 +192,11 @@
 LTLINKOPTS = /MACHINE:$(PLATFORM)
 LTLIBOPTS = /MACHINE:$(PLATFORM)
 !ENDIF
 
 # If debugging is enabled, enable PDBs.
-!IF $(DEBUG)>0
+!IF $(DEBUG)>0 || $(SYMBOLS)!=0
 LTLINKOPTS = $(LTLINKOPTS) /DEBUG
 !ENDIF
 
 # nawk compatible awk.
 NAWK = gawk.exe

Index: test/win32lock.test
==================================================================
--- test/win32lock.test
+++ test/win32lock.test
@@ -124,9 +124,10 @@
   sqlite3_sleep 10
 }
 
 file_control_win32_av_retry db 10 25
 sqlite3_test_control_pending_byte $old_pending_byte
+db close
 sqlite3_shutdown
 test_sqlite3_log 
 sqlite3_initialize
 finish_test