Fix bug #13065 with file selector dialog on Windows 7.

 src/w32heap.c (allocate_heap) [!_WIN64]: Decrease the initial
 request of memory reservation to 1.7GB.

diff --git a/src/ChangeLog b/src/ChangeLog
index 623d9e4877f80488d0a04281996a18bcb997bcf4..e7ab13311e149eeb546320e257bfef21afe8bf3c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-22  Eli Zaretskii  <eliz@gnu.org>
+
+       * w32heap.c (allocate_heap) [!_WIN64]: Decrease the initial
+       request of memory reservation to 1.7GB.  (Bug#13065)
+
 2013-01-20  Andreas Schwab  <schwab@linux-m68k.org>
 
        * coding.c (detect_coding_iso_2022): Move back mis-reordered code

diff --git a/src/w32heap.c b/src/w32heap.c
index 9c189dbda6dfd1e052c0c133ac4052b632137f2b..81206ce2834bcf280885987a47659b83681ce938 100644 (file)
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -98,7 +98,11 @@ allocate_heap (void)
 #ifdef _WIN64
   size_t size = 0x4000000000i64; /* start by asking for 32GB */
 #else
-  size_t size = 0x80000000; /* start by asking for 2GB */
+  /* We used to start with 2GB here, but on Windows 7 that would leave
+     too little room in the address space for threads started by
+     Windows on our behalf, e.g. when we pop up the file selection
+     dialog.  */
+  size_t size = 0x68000000; /* start by asking for 1.7GB */
 #endif
   void *ptr = NULL;