Added support for mappings with no associated file.
diff --git a/server/mapping.c b/server/mapping.c
index b6f4b68..acacbb6 100644
--- a/server/mapping.c
+++ b/server/mapping.c
@@ -9,6 +9,7 @@
#include <stdlib.h>
#include <unistd.h>
+#include "config.h"
#include "winerror.h"
#include "winnt.h"
#include "server/process.h"
@@ -40,10 +41,51 @@
mapping_destroy
};
+#ifdef __i386__
+
+/* These are always the same on an i386, and it will be faster this way */
+# define page_mask 0xfff
+# define page_shift 12
+# define init_page_size() /* nothing */
+
+#else /* __i386__ */
+
+static int page_shift, page_mask;
+
+static void init_page_size(void)
+{
+ int page_size;
+# ifdef HAVE_GETPAGESIZE
+ page_size = getpagesize();
+# else
+# ifdef __svr4__
+ page_size = sysconf(_SC_PAGESIZE);
+# else
+# error Cannot get the page size on this platform
+# endif
+# endif
+ page_mask = page_size - 1;
+ /* Make sure we have a power of 2 */
+ assert( !(page_size & page_mask) );
+ page_shift = 0;
+ while ((1 << page_shift) != page_size) page_shift++;
+}
+#endif /* __i386__ */
+
+#define ROUND_ADDR(addr) \
+ ((int)(addr) & ~page_mask)
+
+#define ROUND_SIZE(addr,size) \
+ (((int)(size) + ((int)(addr) & page_mask) + page_mask) & ~page_mask)
+
+
struct object *create_mapping( int size_high, int size_low, int protect,
int handle, const char *name )
{
struct mapping *mapping;
+ int access = 0;
+
+ if (!page_mask) init_page_size();
if (!(mapping = (struct mapping *)create_named_object( name, &mapping_ops,
sizeof(*mapping) )))
@@ -51,22 +93,42 @@
if (GET_ERROR() == ERROR_ALREADY_EXISTS)
return &mapping->obj; /* Nothing else to do */
+ if (protect & VPROT_READ) access |= GENERIC_READ;
+ if (protect & VPROT_WRITE) access |= GENERIC_WRITE;
+
+ size_low = ROUND_SIZE( 0, size_low );
+ if (handle != -1)
+ {
+ if (!(mapping->file = get_file_obj( current->process, handle, access ))) goto error;
+ if (!size_high && !size_low)
+ {
+ struct get_file_info_reply reply;
+ struct object *obj = (struct object *)mapping->file;
+ obj->ops->get_file_info( obj, &reply );
+ size_high = reply.size_high;
+ size_low = ROUND_SIZE( 0, reply.size_low );
+ }
+ else if (!grow_file( mapping->file, size_high, size_low )) goto error;
+ }
+ else /* Anonymous mapping (no associated file) */
+ {
+ if (!size_high && !size_low)
+ {
+ SET_ERROR( ERROR_INVALID_PARAMETER );
+ mapping->file = NULL;
+ goto error;
+ }
+ if (!(mapping->file = create_temp_file( access ))) goto error;
+ if (!grow_file( mapping->file, size_high, size_low )) goto error;
+ }
mapping->size_high = size_high;
mapping->size_low = size_low;
mapping->protect = protect;
- if (handle != -1)
- {
- int access = 0;
- if (protect & VPROT_READ) access |= GENERIC_READ;
- if (protect & VPROT_WRITE) access |= GENERIC_WRITE;
- if (!(mapping->file = get_file_obj( current->process, handle, access )))
- {
- release_object( mapping );
- return NULL;
- }
- }
- else mapping->file = NULL;
return &mapping->obj;
+
+ error:
+ release_object( mapping );
+ return NULL;
}
int open_mapping( unsigned int access, int inherit, const char *name )
