[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111192: Fix bug #13065 with file selector dialog on Windows 7.

[Eli Zaretskii]

------------------------------------------------------------
revno: 111192
fixes bug: http://debbugs.gnu.org/13065
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Tue 2013-01-22 15:30:17 +0200
message:
  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.
modified:
  src/ChangeLog
  src/w32heap.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-01-20 22:59:47 +0000
+++ b/src/ChangeLog     2013-01-22 13:30:17 +0000
@@ -1,3 +1,8 @@
+2013-01-22  Eli Zaretskii  <address@hidden>
+
+       * w32heap.c (allocate_heap) [!_WIN64]: Decrease the initial
+       request of memory reservation to 1.7GB.  (Bug#13065)
+
 2013-01-20  Andreas Schwab  <address@hidden>
 
        * coding.c (detect_coding_iso_2022): Move back mis-reordered code

=== modified file 'src/w32heap.c'
--- a/src/w32heap.c     2013-01-01 09:11:05 +0000
+++ b/src/w32heap.c     2013-01-22 13:30:17 +0000
@@ -98,7 +98,11 @@
 #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;