Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 20:43:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge some changes from Wine

Browse source 
svn path=/trunk/; revision=30326
This commit is contained in:
Hervé Poussineau 2007-11-10 14:35:21 +00:00
parent 040332c006
commit 69a20f248e
11 changed files with 267 additions and 218 deletions
Download patch file Download diff file Expand all files Collapse all files

14
reactos/dll/win32/setupapi/setupcab.c
View file

@ -1,4 +1,4 @@
/*
/*
* Setupapi cabinet routines
*
* Copyright 2003 Gregory M. Turner
@ -20,7 +20,7 @@
*
* Many useful traces are commented in code, uncomment them if you have
* trouble and run with WINEDEBUG=+setupapi
*
*
*/
#include "setupapi_private.h"
@ -87,12 +87,12 @@ static void UnloadCABINETDll(void)
static void *sc_cb_alloc(ULONG cb)
{
return malloc(cb);
return HeapAlloc(GetProcessHeap(), 0, cb);
}
static void sc_cb_free(void *pv)
{
free(pv);
HeapFree(GetProcessHeap(), 0, pv);
}
static INT_PTR sc_cb_open(char *pszFile, int oflag, int pmode)
@ -523,10 +523,10 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved,
BOOL ret;
TRACE("(CabinetFile == %s, Reserved == %lu, MsgHandler == ^%p, Context == ^%p)\n",
TRACE("(CabinetFile == %s, Reserved == %u, MsgHandler == ^%p, Context == ^%p)\n",
debugstr_a(CabinetFile), Reserved, MsgHandler, Context);
if (! LoadCABINETDll())
if (! LoadCABINETDll())
return FALSE;
memset(&my_hsc, 0, sizeof(SC_HSC_A));
@ -588,7 +588,7 @@ BOOL WINAPI SetupIterateCabinetW(PCWSTR CabinetFile, DWORD Reserved,
DWORD fpnsize;
BOOL ret;
TRACE("(CabinetFile == %s, Reserved == %lu, MsgHandler == ^%p, Context == ^%p)\n",
TRACE("(CabinetFile == %s, Reserved == %u, MsgHandler == ^%p, Context == ^%p)\n",
debugstr_w(CabinetFile), Reserved, MsgHandler, Context);
if (!LoadCABINETDll())