diff options
| author | Anatol Belski <ab@php.net> | 2017-06-20 15:38:25 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-06-20 15:40:25 +0200 |
| commit | 6a854e274088341103835f99a4c437596cbf66c0 (patch) | |
| tree | 5f489faf568613d8eea756fe17c1b9deb71b3b6d | |
| parent | b4fa2ba29572eca34d19df73347b1d1b73171821 (diff) | |
| download | php-git-6a854e274088341103835f99a4c437596cbf66c0.tar.gz | |
Split requested size as expected by CreateFileMapping.
Thus fixing ext\opcache\tests\log_verbosity_bug.phpt fails on 64-bit.
| -rw-r--r-- | ext/opcache/shared_alloc_win32.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/opcache/shared_alloc_win32.c b/ext/opcache/shared_alloc_win32.c index 2701b41739..a0398b2d90 100644 --- a/ext/opcache/shared_alloc_win32.c +++ b/ext/opcache/shared_alloc_win32.c @@ -211,8 +211,10 @@ static int create_segments(size_t requested_size, zend_shared_segment ***shared_ */ #if defined(_WIN64) void *vista_mapping_base_set[] = { (void *) 0x0000100000000000, (void *) 0x0000200000000000, (void *) 0x0000300000000000, (void *) 0x0000700000000000, 0 }; + DWORD size_high = (requested_size >> 32), size_low = (requested_size & 0xffffffff); #else void *vista_mapping_base_set[] = { (void *) 0x20000000, (void *) 0x21000000, (void *) 0x30000000, (void *) 0x31000000, (void *) 0x50000000, 0 }; + DWORD size_high = 0, size_low = requested_size; #endif void **wanted_mapping_base = default_mapping_base_set; @@ -265,7 +267,7 @@ static int create_segments(size_t requested_size, zend_shared_segment ***shared_ shared_segment = (zend_shared_segment *)((char *)(*shared_segments_p) + sizeof(void *)); (*shared_segments_p)[0] = shared_segment; - memfile = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, requested_size, + memfile = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, size_high, size_low, create_name_with_username(ACCEL_FILEMAP_NAME)); if (memfile == NULL) { err = GetLastError(); |