[PATCH 2/3] cabinet: Rename the wrappers around HeapAlloc() &Co to use the new standard naming.

[Michael Stefaniuc]

---
 dlls/cabinet/cabinet_main.c  |    8 ++++----
 dlls/cabinet/tests/extract.c |    6 +++---
 dlls/cabinet/tests/fdi.c     |    6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c
index 9e2c18a..0aff728 100644
--- a/dlls/cabinet/cabinet_main.c
+++ b/dlls/cabinet/cabinet_main.c
@@ -69,12 +69,12 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi)
 
 /* FDI callback functions */
 
-static void *mem_alloc(ULONG cb)
+static void *heap_alloc(ULONG cb)
 {
     return HeapAlloc(GetProcessHeap(), 0, cb);
 }
 
-static void mem_free(void *memory)
+static void heap_free(void *memory)
 {
     HeapFree(GetProcessHeap(), 0, memory);
 }
@@ -320,8 +320,8 @@ HRESULT WINAPI Extract(SESSION *dest, LPCSTR szCabName)
 
     TRACE("(%p, %s)\n", dest, szCabName);
 
-    hfdi = FDICreate(mem_alloc,
-                     mem_free,
+    hfdi = FDICreate(heap_alloc,
+                     heap_free,
                      fdi_open,
                      fdi_read,
                      fdi_write,
diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c
index 2cf5154..c565d05 100644
--- a/dlls/cabinet/tests/extract.c
+++ b/dlls/cabinet/tests/extract.c
@@ -111,12 +111,12 @@ static void delete_test_files(void)
 
 /* the FCI callbacks */
 
-static void *mem_alloc(ULONG cb)
+static void *heap_alloc(ULONG cb)
 {
     return HeapAlloc(GetProcessHeap(), 0, cb);
 }
 
-static void mem_free(void *memory)
+static void heap_free(void *memory)
 {
     HeapFree(GetProcessHeap(), 0, memory);
 }
@@ -296,7 +296,7 @@ static void create_cab_file(void)
 
     set_cab_parameters(&cabParams);
 
-    hfci = FCICreate(&erf, file_placed, mem_alloc, mem_free, fci_open,
+    hfci = FCICreate(&erf, file_placed, heap_alloc, heap_free, fci_open,
                       fci_read, fci_write, fci_close, fci_seek, fci_delete,
                       get_temp_file, &cabParams, NULL);
 
diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c
index 7c10b3d..31c9466 100644
--- a/dlls/cabinet/tests/fdi.c
+++ b/dlls/cabinet/tests/fdi.c
@@ -294,12 +294,12 @@ static void delete_test_files(void)
 
 /* FCI callbacks */
 
-static void *mem_alloc(ULONG cb)
+static void *heap_alloc(ULONG cb)
 {
     return HeapAlloc(GetProcessHeap(), 0, cb);
 }
 
-static void mem_free(void *memory)
+static void heap_free(void *memory)
 {
     HeapFree(GetProcessHeap(), 0, memory);
 }
@@ -482,7 +482,7 @@ static void create_cab_file(void)
 
     set_cab_parameters(&cabParams);
 
-    hfci = FCICreate(&erf, file_placed, mem_alloc, mem_free, fci_open,
+    hfci = FCICreate(&erf, file_placed, heap_alloc, heap_free, fci_open,
                       fci_read, fci_write, fci_close, fci_seek, fci_delete,
                       get_temp_file, &cabParams, NULL);
 
-- 
1.5.3.6
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20071128/9ad545ea/attachment-0001.pgp