Skip to content

W
wine-cw
Commit f12a970c authored by Bruno Jesus's avatar Bruno Jesus Committed by Alexandre Julliard
Browse files
Options

msvfw32: Fix a copy & paste issue.

Signed-off-by: 's avatarBruno Jesus <00cpxxx@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 3f276c9b
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
dlls/msvfw32/msvideo_main.c
View file @ f12a970c
...@@ -1415,8 +1415,8 @@ static void clear_compvars(PCOMPVARS pc) ...@@ -1415,8 +1415,8 @@ static void clear_compvars(PCOMPVARS pc)
pc->lpbiIn = pc->lpBitsPrev = pc->lpBitsOut = pc->lpState = NULL; pc->lpbiIn = pc->lpBitsPrev = pc->lpBitsOut = pc->lpState = NULL;
if (pc->dwFlags & 0x80000000) if (pc->dwFlags & 0x80000000)
{ {
HeapFree(GetProcessHeap(), 0, pc->lpBitsOut); HeapFree(GetProcessHeap(), 0, pc->lpbiOut);
pc->lpBitsOut = NULL; pc->lpbiOut = NULL;
pc->dwFlags &= ~0x80000000; pc->dwFlags &= ~0x80000000;
} }
} }
...@@ -1461,6 +1461,8 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) ...@@ -1461,6 +1461,8 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn)
pc->lpbiOut = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFO)); pc->lpbiOut = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFO));
if (!pc->lpbiOut) if (!pc->lpbiOut)
goto error; goto error;
/* Flag to show that we allocated lpbiOut for proper cleanup */
pc->dwFlags |= 0x80000000;
ret = ICSendMessage(pc->hic, ICM_COMPRESS_GET_FORMAT, ret = ICSendMessage(pc->hic, ICM_COMPRESS_GET_FORMAT,
(DWORD_PTR)pc->lpbiIn, (DWORD_PTR)pc->lpbiOut); (DWORD_PTR)pc->lpbiIn, (DWORD_PTR)pc->lpbiOut);
...@@ -1479,8 +1481,6 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) ...@@ -1479,8 +1481,6 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn)
pc->lpbiOut->bmiHeader.biSizeImage = max(8192, pc->lpbiIn->bmiHeader.biSizeImage); pc->lpbiOut->bmiHeader.biSizeImage = max(8192, pc->lpbiIn->bmiHeader.biSizeImage);
ERR("Bad codec! Invalid output frame size, guessing from input\n"); ERR("Bad codec! Invalid output frame size, guessing from input\n");
} }
/* Flag to show that we allocated lpbiOutput for proper cleanup */
pc->dwFlags |= 0x80000000;
} }
TRACE("Input: %ux%u, fcc %s, bpp %u, size %u\n", TRACE("Input: %ux%u, fcc %s, bpp %u, size %u\n",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment