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

Michael Stefaniuc mstefani at redhat.de
Wed Nov 28 15:40:53 CST 2007


---
 dlls/msi/tests/install.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index fd8184b..06f6b11 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -843,12 +843,12 @@ static const msi_table mc_tables[] =
 
 /* 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);
 }
@@ -1054,7 +1054,7 @@ static void create_cab_file(const CHAR *name, DWORD max_size, const CHAR *files)
 
     set_cab_parameters(&cabParams, name, max_size);
 
-    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);
 
@@ -1438,7 +1438,7 @@ static void create_cc_test_files(void)
 
     set_cab_parameters(&cabParams, "test1.cab", 200);
 
-    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, cab_context);
     ok(hfci != NULL, "Failed to create an FCI context\n");
-- 
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/d868caf7/attachment.pgp 


More information about the wine-patches mailing list