Merge branch 'v0.19.x'

2014-12-12 13:14:29 +01:00 · 2014-12-12 13:14:29 +01:00 · 4741d7bfe2
parent aea99a1222 2fec463542
commit 4741d7bfe2
3 changed files with 4 additions and 2 deletions
--- a/1
+++ b/1
@ -18,6 +18,7 @@ ver 0.20 (not yet released)
 ver 0.19.7 (not yet released)
 * playlist
  - don't skip non-existent songs in "listplaylist"
+* fix memory allocator bug on Windows

 ver 0.19.6 (2014/12/08)
 * decoder
--- a/src/input/Init.cxx
+++ b/src/input/Init.cxx
@ -67,7 +67,7 @@ input_stream_global_init(Error &error)
 		case InputPlugin::InitResult::UNAVAILABLE:
 			if (error.IsDefined()) {
 				FormatError(error,
-					    "Input plugin '%s' is unavailable: ",
+					    "Input plugin '%s' is unavailable",
 					    plugin->name);
 				error.Clear();
 			}
--- a/src/util/HugeAllocator.hxx
+++ b/src/util/HugeAllocator.hxx
@ -70,7 +70,8 @@ gcc_malloc
 static inline void *
 HugeAllocate(size_t size)
 {
-	return VirtualAlloc(nullptr, size, MEM_LARGE_PAGES, PAGE_READWRITE);
+	// TODO: use MEM_LARGE_PAGES
+	return VirtualAlloc(nullptr, size, MEM_RESERVE, PAGE_READWRITE);
 }

 static inline void