Real fix of the broken build.

svn path=/trunk/; revision=51869
This commit is contained in:
Eric Kohl 2011-05-23 18:49:03 +00:00
parent 597107fc28
commit 126ebc89ff

View file

@ -20,7 +20,6 @@ typedef struct _COMDB
HKEY hKey; HKEY hKey;
DWORD dwSize; DWORD dwSize;
PBYTE pBitmap; PBYTE pBitmap;
PBYTE pData;
} COMDB, *PCOMDB; } COMDB, *PCOMDB;
@ -92,7 +91,7 @@ ComDBClaimPort(IN HCOMDB hComDB,
L"ComDB", L"ComDB",
0, 0,
REG_BINARY, REG_BINARY,
pComDB->pData, pComDB->pBitmap,
pComDB->dwSize); pComDB->dwSize);
} }
@ -171,10 +170,10 @@ ComDBOpen(OUT HCOMDB *phComDB)
{ {
/* Allocate a new bitmap */ /* Allocate a new bitmap */
pComDB->dwSize = COMDB_MIN_PORTS_ARBITRATED / BITS_PER_BYTE; pComDB->dwSize = COMDB_MIN_PORTS_ARBITRATED / BITS_PER_BYTE;
pComDB->pData = HeapAlloc(GetProcessHeap(), pComDB->pBitmap = HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
pComDB->dwSize); pComDB->dwSize);
if (pComDB->pData == NULL) if (pComDB->pBitmap == NULL)
{ {
ERR("Failed to allocaete the bitmap!\n"); ERR("Failed to allocaete the bitmap!\n");
lError = ERROR_ACCESS_DENIED; lError = ERROR_ACCESS_DENIED;
@ -186,7 +185,7 @@ ComDBOpen(OUT HCOMDB *phComDB)
L"ComDB", L"ComDB",
0, 0,
REG_BINARY, REG_BINARY,
pComDB->pData, pComDB->pBitmap,
pComDB->dwSize); pComDB->dwSize);
} }
@ -197,8 +196,8 @@ done:;
if (pComDB->hKey != NULL) if (pComDB->hKey != NULL)
RegCloseKey(pComDB->hKey); RegCloseKey(pComDB->hKey);
if (pComDB->pData != NULL) if (pComDB->pBitmap != NULL)
HeapFree(GetProcessHeap(), 0, pComDB->pData); HeapFree(GetProcessHeap(), 0, pComDB->pBitmap);
HeapFree(GetProcessHeap(), 0, pComDB); HeapFree(GetProcessHeap(), 0, pComDB);