Ticket #12: mplayer-virtualalloc.patch

loader/ext.c

@@ -454 +454 @@
 #define MEM_COMMIT              0x00001000
 #define MEM_RESERVE             0x00002000
 
+static virt_alloc* initVirtualAlloc()
+{
+    virt_alloc *first = NULL;
+    virt_alloc *prev = NULL;
+
+#if __linux__
+    FILE *f;
+    char mapsfile[6+10+5+1];    /* /proc/nnn/maps, 32 bit nnn */
+    snprintf(mapsfile, sizeof(mapsfile), "/proc/%d/maps", getpid());
+    f = fopen( mapsfile, "r" );
+    if (f)
+    {
+        char buffer[256];
+
+        while (fgets( buffer, sizeof(buffer), f ))
+        {
+            char *map_start;
+            char *map_end;
+            if (sscanf( buffer, "%08x-%08x ", (unsigned int*)&map_start, (unsigned int*)&map_end ))
+            {
+                map_start = (char*)((unsigned long)map_start & ~0xffff);
+                map_end = (char*)(((unsigned long)map_end+0xffff) & ~0xffff);
+#define INIT_MAPPING_EXTRA (1024*1024)  /* Allow for some growth...how much? */
+                if (prev && prev->address+prev->mapping_size > map_start)
+                    prev->mapping_size = map_end-prev->address+INIT_MAPPING_EXTRA;
+                else
+                {
+                    virt_alloc *new_vm = (virt_alloc*) malloc(sizeof(virt_alloc));
+                    new_vm->mapping_size=map_end-map_start+INIT_MAPPING_EXTRA;
+                    new_vm->address=map_start;
+                    new_vm->prev=prev;
+                    new_vm->state=2;
+                    if (prev)
+                        prev->next=new_vm;
+                    else
+                        first=new_vm;
+                    prev=new_vm;
+                }
+            }
+        }
+        fclose( f );
+    }
+#endif
+
+    if (!prev)
+    {
+        /* If all else fails, just protect one arbitrary segment. */
+        virt_alloc *new_vm = (virt_alloc*) malloc(sizeof(virt_alloc));
+        new_vm->mapping_size=0x10000;
+        new_vm->address=(char*)((unsigned long)&vm & ~0xffff);
+        new_vm->prev=prev;
+        new_vm->state=2;
+        first=new_vm;
+        prev=new_vm;
+    }
+
+    prev->next=0;
+    return first;
+}
+
 LPVOID WINAPI VirtualAlloc(LPVOID address, DWORD size, DWORD type,  DWORD protection)
 {
     void* answer;
@@ -468 +528 @@
     {
     //check whether we can allow to allocate this
         virt_alloc* str=vm;
+        if (!str) str=vm=initVirtualAlloc();
         while(str)
         {
             if((unsigned)address>=(unsigned)str->address+str->mapping_size)
@@ -534 +595 @@
     int answer;
     while(str)
     {
-        if(address!=str->address)
+        if(address!=str->address || str->state==2)
         {
             str=str->prev;
             continue;