wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Move patch to forward _{calloc,malloc,free}_base to {calloc,malloc,free} into separate directory.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-01-19 17:11:54 +01:00
parent e8e54f0838
commit 031b029c8d
20 changed files with 42 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
patches/ucrtbase-Functions/0001-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch Normal file
View File

@@ -0,0 +1,69 @@
From 97853bae25a321b30e2ee38044c85af75fb61174 Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Mon, 3 Aug 2015 22:26:01 +0300
Subject: ucrtbase: Hook up some functions with new names to existing
implementations
These are some functions that on a first glance seem to have a
matching signature even though the name has changed.
---
dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec | 6 +++---
dlls/ucrtbase/ucrtbase.spec | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec
index 18ca9d4..418926e 100644
--- a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec
+++ b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec
@@ -7,14 +7,14 @@
@ cdecl _aligned_realloc(ptr long long) ucrtbase._aligned_realloc
@ stub _aligned_recalloc
@ cdecl _callnewh(long) ucrtbase._callnewh
-@ stub _calloc_base
+@ cdecl _calloc_base(long long) ucrtbase._calloc_base
@ cdecl _expand(ptr long) ucrtbase._expand
-@ stub _free_base
+@ cdecl _free_base(ptr) ucrtbase._free_base
@ cdecl _get_heap_handle() ucrtbase._get_heap_handle
@ cdecl _heapchk() ucrtbase._heapchk
@ cdecl _heapmin() ucrtbase._heapmin
@ cdecl _heapwalk(ptr) ucrtbase._heapwalk
-@ stub _malloc_base
+@ cdecl _malloc_base(long) ucrtbase._malloc_base
@ cdecl _msize(ptr) ucrtbase._msize
@ stub _query_new_handler
@ stub _query_new_mode
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index 3478342..53ca8fb 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -211,7 +211,7 @@
@ cdecl _c_exit() MSVCRT__c_exit
@ cdecl _cabs(long) MSVCRT__cabs
@ cdecl _callnewh(long)
-@ stub _calloc_base
+@ cdecl _calloc_base(long long) MSVCRT_calloc
@ cdecl _cexit() MSVCRT__cexit
@ cdecl _cgets(ptr)
@ stub _cgets_s
@@ -333,7 +333,7 @@
@ cdecl _fputwchar(long) MSVCRT__fputwchar
@ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock
@ cdecl _fread_nolock_s(ptr long long long ptr) MSVCRT__fread_nolock_s
-@ stub _free_base
+@ cdecl _free_base(ptr) MSVCRT_free
@ cdecl _free_locale(ptr) MSVCRT__free_locale
@ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock
@ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64
@@ -580,7 +580,7 @@
@ cdecl _ltow_s(long ptr long long) MSVCRT__ltow_s
@ cdecl _makepath(ptr str str str str) MSVCRT__makepath
@ cdecl _makepath_s(ptr long str str str str) MSVCRT__makepath_s
-@ stub _malloc_base
+@ cdecl _malloc_base(long) MSVCRT_malloc
@ cdecl _mbbtombc(long)
@ stub _mbbtombc_l
@ cdecl _mbbtype(long long)
--
2.6.4

1
patches/ucrtbase-Functions/definition Normal file
View File

@@ -0,0 +1 @@
Fixes: Forward _{calloc,malloc,free}_base to {calloc,malloc,free}