October 2015 - Wine-commits

Józef Kucia : d3d11: Implement ID3D10BlendState1 interface.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 0912adee670dc8846897af99e61b4a4918974bcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0912adee670dc8846897af99e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 20 01:46:42 2015 +0200 d3d11: Implement ID3D10BlendState1 interface. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 2 +- dlls/d3d11/state.c | 47 ++++++++++++++++++++++++++++------------------ 3 files changed, 32 insertions(+), 21 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 39236ab..b8df609 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -279,11 +279,11 @@ struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *i HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; -/* ID3D11BlendState, ID3D10BlendState */ +/* ID3D11BlendState, ID3D10BlendState1 */ struct d3d_blend_state { ID3D11BlendState ID3D11BlendState_iface; - ID3D10BlendState ID3D10BlendState_iface; + ID3D10BlendState1 ID3D10BlendState1_iface; LONG refcount; struct wined3d_private_store private_store; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c471810..e0f5f4d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3042,7 +3042,7 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetBlendState(ID3D10Device1 *iface, TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask %p.\n", iface, blend_state, blend_factor, sample_mask); - if ((*blend_state = device->blend_state ? &device->blend_state->ID3D10BlendState_iface : NULL)) + if ((*blend_state = device->blend_state ? (ID3D10BlendState *)&device->blend_state->ID3D10BlendState1_iface : NULL)) ID3D10BlendState_AddRef(*blend_state); wined3d_mutex_lock(); memcpy(blend_factor, device->blend_factor, 4 * sizeof(*blend_factor)); diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 2151389..502ed9a 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -47,11 +47,12 @@ static HRESULT STDMETHODCALLTYPE d3d11_blend_state_QueryInterface(ID3D11BlendSta return S_OK; } - if (IsEqualGUID(riid, &IID_ID3D10BlendState) + if (IsEqualGUID(riid, &IID_ID3D10BlendState1) + || IsEqualGUID(riid, &IID_ID3D10BlendState) || IsEqualGUID(riid, &IID_ID3D10DeviceChild)) { - ID3D10BlendState_AddRef(&state->ID3D10BlendState_iface); - *object = &state->ID3D10BlendState_iface; + ID3D10BlendState1_AddRef(&state->ID3D10BlendState1_iface); + *object = &state->ID3D10BlendState1_iface; return S_OK; } @@ -159,14 +160,14 @@ static const struct ID3D11BlendStateVtbl d3d11_blend_state_vtbl = /* ID3D10BlendState methods */ -static inline struct d3d_blend_state *impl_from_ID3D10BlendState(ID3D10BlendState *iface) +static inline struct d3d_blend_state *impl_from_ID3D10BlendState(ID3D10BlendState1 *iface) { - return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D10BlendState_iface); + return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D10BlendState1_iface); } /* IUnknown methods */ -static HRESULT STDMETHODCALLTYPE d3d10_blend_state_QueryInterface(ID3D10BlendState *iface, +static HRESULT STDMETHODCALLTYPE d3d10_blend_state_QueryInterface(ID3D10BlendState1 *iface, REFIID riid, void **object) { struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); @@ -176,7 +177,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_QueryInterface(ID3D10BlendSta return d3d11_blend_state_QueryInterface(&state->ID3D11BlendState_iface, riid, object); } -static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState *iface) +static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState1 *iface) { struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); @@ -185,7 +186,7 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState *iface) return d3d11_blend_state_AddRef(&state->ID3D11BlendState_iface); } -static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface) +static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState1 *iface) { struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); @@ -196,7 +197,7 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface /* ID3D10DeviceChild methods */ -static void STDMETHODCALLTYPE d3d10_blend_state_GetDevice(ID3D10BlendState *iface, ID3D10Device **device) +static void STDMETHODCALLTYPE d3d10_blend_state_GetDevice(ID3D10BlendState1 *iface, ID3D10Device **device) { struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); @@ -205,7 +206,7 @@ static void STDMETHODCALLTYPE d3d10_blend_state_GetDevice(ID3D10BlendState *ifac ID3D11Device_QueryInterface(state->device, &IID_ID3D10Device, (void **)device); } -static HRESULT STDMETHODCALLTYPE d3d10_blend_state_GetPrivateData(ID3D10BlendState *iface, +static HRESULT STDMETHODCALLTYPE d3d10_blend_state_GetPrivateData(ID3D10BlendState1 *iface, REFGUID guid, UINT *data_size, void *data) { struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); @@ -216,7 +217,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_GetPrivateData(ID3D10BlendSta return d3d_get_private_data(&state->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateData(ID3D10BlendState *iface, +static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateData(ID3D10BlendState1 *iface, REFGUID guid, UINT data_size, const void *data) { struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); @@ -227,7 +228,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateData(ID3D10BlendSta return d3d_set_private_data(&state->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateDataInterface(ID3D10BlendState *iface, +static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateDataInterface(ID3D10BlendState1 *iface, REFGUID guid, const IUnknown *data) { struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); @@ -239,8 +240,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateDataInterface(ID3D1 /* ID3D10BlendState methods */ -static void STDMETHODCALLTYPE d3d10_blend_state_GetDesc(ID3D10BlendState *iface, - D3D10_BLEND_DESC *desc) +static void STDMETHODCALLTYPE d3d10_blend_state_GetDesc(ID3D10BlendState1 *iface, D3D10_BLEND_DESC *desc) { struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); const D3D11_BLEND_DESC *d3d11_desc = &state->desc; @@ -262,7 +262,16 @@ static void STDMETHODCALLTYPE d3d10_blend_state_GetDesc(ID3D10BlendState *iface, } } -static const struct ID3D10BlendStateVtbl d3d10_blend_state_vtbl = +static void STDMETHODCALLTYPE d3d10_blend_state_GetDesc1(ID3D10BlendState1 *iface, D3D10_BLEND_DESC1 *desc) +{ + struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + memcpy(desc, &state->desc, sizeof(*desc)); +} + +static const struct ID3D10BlendState1Vtbl d3d10_blend_state_vtbl = { /* IUnknown methods */ d3d10_blend_state_QueryInterface, @@ -275,13 +284,15 @@ static const struct ID3D10BlendStateVtbl d3d10_blend_state_vtbl = d3d10_blend_state_SetPrivateDataInterface, /* ID3D10BlendState methods */ d3d10_blend_state_GetDesc, + /* ID3D10BlendState1 methods */ + d3d10_blend_state_GetDesc1, }; HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, const D3D11_BLEND_DESC *desc) { state->ID3D11BlendState_iface.lpVtbl = &d3d11_blend_state_vtbl; - state->ID3D10BlendState_iface.lpVtbl = &d3d10_blend_state_vtbl; + state->ID3D10BlendState1_iface.lpVtbl = &d3d10_blend_state_vtbl; state->refcount = 1; wined3d_mutex_lock(); wined3d_private_store_init(&state->private_store); @@ -306,9 +317,9 @@ struct d3d_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *ifac { if (!iface) return NULL; - assert(iface->lpVtbl == &d3d10_blend_state_vtbl); + assert(iface->lpVtbl == (ID3D10BlendStateVtbl *)&d3d10_blend_state_vtbl); - return impl_from_ID3D10BlendState(iface); + return impl_from_ID3D10BlendState((ID3D10BlendState1 *)iface); } /* ID3D11DepthStencilState methods */

1 0

Aric Stewart : hidclass.sys: Correct size of IOCTL request and unused return value.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: e27a4b5e1bfc92b9e3616d06958cdef1bf03c39b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e27a4b5e1bfc92b9e3616d069… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 19 10:37:49 2015 -0500 hidclass.sys: Correct size of IOCTL request and unused return value. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index e7e7e11..e3c7121 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -277,7 +277,7 @@ static DWORD CALLBACK hid_device_thread(void *args) packet->reportId = 0; irp = IoBuildDeviceIoControlRequest(IOCTL_HID_GET_INPUT_REPORT, - device, NULL, 0, packet, sizeof(packet), TRUE, events[0], + device, NULL, 0, packet, sizeof(*packet), TRUE, events[0], &irp_status); irpsp = IoGetNextIrpStackLocation(irp); @@ -287,7 +287,7 @@ static DWORD CALLBACK hid_device_thread(void *args) ntrc = IoCallDriver(device, irp); if (ntrc == STATUS_PENDING) - rc = WaitForMultipleObjects(2, events, FALSE, INFINITE); + WaitForMultipleObjects(2, events, FALSE, INFINITE); if (irp->IoStatus.u.Status == STATUS_SUCCESS) {

1 0

Gerald Pfeifer : msi: Avoid shift overflow in msi_view_get_row.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 40922ccd4f850b2538dece474ae30337756c6df8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40922ccd4f850b2538dece474… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Oct 19 22:05:53 2015 +0200 msi: Avoid shift overflow in msi_view_get_row. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msiquery.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 467cd49..d73e5fe 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -354,7 +354,7 @@ UINT msi_view_get_row(MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD **rec) if ((type & MSI_DATASIZEMASK) == 2) MSI_RecordSetInteger(*rec, i, ival - (1<<15)); else - MSI_RecordSetInteger(*rec, i, ival - (1<<31)); + MSI_RecordSetInteger(*rec, i, ival - (1u<<31)); } }

1 0

Bruno Jesus : msvfw32: Use a helper to free memory.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 8701f92e8df6e86abe2f87d142ced5346e308600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8701f92e8df6e86abe2f87d14… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Oct 20 14:56:02 2015 +0800 msvfw32: Use a helper to free memory. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 5aff706..b4c22ae 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1401,6 +1401,15 @@ LPVOID VFWAPI ICSeqCompressFrame(PCOMPVARS pc, UINT uiFlags, LPVOID lpBits, BOOL return NULL; } +static void clear_compvars(PCOMPVARS pc) +{ + HeapFree(GetProcessHeap(), 0, pc->lpbiIn); + HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); + HeapFree(GetProcessHeap(), 0, pc->lpBitsOut); + HeapFree(GetProcessHeap(), 0, pc->lpState); + pc->lpbiIn = pc->lpBitsPrev = pc->lpBitsOut = pc->lpState = NULL; +} + /*********************************************************************** * ICSeqCompressFrameEnd [MSVFW32.@] */ @@ -1410,11 +1419,7 @@ void VFWAPI ICSeqCompressFrameEnd(PCOMPVARS pc) TRACE("(%p)\n", pc); ret = ICSendMessage(pc->hic, ICM_COMPRESS_END, 0, 0); TRACE(" -- %x\n", ret); - HeapFree(GetProcessHeap(), 0, pc->lpbiIn); - HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); - HeapFree(GetProcessHeap(), 0, pc->lpBitsOut); - HeapFree(GetProcessHeap(), 0, pc->lpState); - pc->lpbiIn = pc->lpBitsPrev = pc->lpBitsOut = pc->lpState = NULL; + clear_compvars(pc); } /*********************************************************************** @@ -1474,11 +1479,7 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) return TRUE; } error: - HeapFree(GetProcessHeap(), 0, pc->lpbiIn); - HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); - HeapFree(GetProcessHeap(), 0, pc->lpState); - HeapFree(GetProcessHeap(), 0, pc->lpBitsOut); - pc->lpBitsPrev = pc->lpbiIn = pc->lpState = pc->lpBitsOut = NULL; + clear_compvars(pc); return FALSE; }

1 0

Bruno Jesus : msvfw32: Fix the size of previous compressed buffer.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: d733e0d24302b50eb9403e64a34d574fca80f650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d733e0d24302b50eb9403e64a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Oct 20 14:56:10 2015 +0800 msvfw32: Fix the size of previous compressed buffer. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index b4c22ae..1c38b75 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1436,9 +1436,6 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) return FALSE; *pc->lpbiIn = *lpbiIn; - pc->lpBitsPrev = HeapAlloc(GetProcessHeap(), 0, pc->lpbiIn->bmiHeader.biSizeImage); - if (!pc->lpBitsPrev) - goto error; pc->lpState = HeapAlloc(GetProcessHeap(), 0, sizeof(ICCOMPRESS)); if (!pc->lpState) @@ -1446,10 +1443,16 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) pc->cbState = sizeof(ICCOMPRESS); + /* Buffer for compressed frame data */ pc->lpBitsOut = HeapAlloc(GetProcessHeap(), 0, pc->lpbiOut->bmiHeader.biSizeImage); if (!pc->lpBitsOut) goto error; + /* Buffer for previous compressed frame data */ + pc->lpBitsPrev = HeapAlloc(GetProcessHeap(), 0, pc->lpbiOut->bmiHeader.biSizeImage); + if (!pc->lpBitsPrev) + goto error; + TRACE("Compvars:\n" "\tpc:\n" "\tsize: %i\n"

1 0

Bruno Jesus : msvfw32: Lpckid and lpdwFlags must be valid memory addresses.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 4cb36b9aaf087d07b2ff45ef89a51caf1984ce5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cb36b9aaf087d07b2ff45ef8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Oct 20 14:56:22 2015 +0800 msvfw32: Lpckid and lpdwFlags must be valid memory addresses. Otherwise codecs will crash while trying to write to it. Even though MSDN states that NULL is allowed for lpckid that is not true. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 1c38b75..d1a2283 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1431,13 +1431,15 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) * it doesn't appear to be used though */ DWORD ret; + ICCOMPRESS* icComp; pc->lpbiIn = HeapAlloc(GetProcessHeap(), 0, sizeof(BITMAPINFO)); if (!pc->lpbiIn) return FALSE; *pc->lpbiIn = *lpbiIn; - pc->lpState = HeapAlloc(GetProcessHeap(), 0, sizeof(ICCOMPRESS)); + pc->lpState = HeapAlloc(GetProcessHeap(), 0, sizeof(ICCOMPRESS) + + sizeof(*icComp->lpckid) + sizeof(*icComp->lpdwFlags)); if (!pc->lpState) goto error; @@ -1469,17 +1471,20 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) TRACE(" -- %x\n", ret); if (ret == ICERR_OK) { - ICCOMPRESS* icComp = pc->lpState; - /* Initialise some variables */ - pc->lFrame = 0; pc->lKeyCount = 0; - - icComp->lpbiOutput = &pc->lpbiOut->bmiHeader; - icComp->lpbiInput = &pc->lpbiIn->bmiHeader; - icComp->lpckid = NULL; - icComp->dwFrameSize = 0; - icComp->dwQuality = pc->lQ; - icComp->lpbiPrev = &pc->lpbiIn->bmiHeader; - return TRUE; + icComp = pc->lpState; + /* Initialise some variables */ + pc->lFrame = 0; pc->lKeyCount = 0; + + icComp->lpbiOutput = &pc->lpbiOut->bmiHeader; + icComp->lpbiInput = &pc->lpbiIn->bmiHeader; + icComp->lpckid = (DWORD *)(icComp + 1); + *icComp->lpckid = 0; + icComp->lpdwFlags = (DWORD *)((char *)(icComp + 1) + sizeof(*icComp->lpckid)); + *icComp->lpdwFlags = 0; + icComp->dwFrameSize = 0; + icComp->dwQuality = pc->lQ; + icComp->lpbiPrev = &pc->lpbiIn->bmiHeader; + return TRUE; } error: clear_compvars(pc);

1 0

Bruno Jesus : msvfw32: Improve tracing from ICSeqCompressFrameStart.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 4a9d238c14699caed8f2ae62180509ee2e1c84c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a9d238c14699caed8f2ae621… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Oct 20 14:56:49 2015 +0800 msvfw32: Improve tracing from ICSeqCompressFrameStart. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index d1a2283..1e05396 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1445,6 +1445,17 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) pc->cbState = sizeof(ICCOMPRESS); + TRACE("Input: %ux%u, fcc %s, bpp %u, size %u\n", + pc->lpbiIn->bmiHeader.biWidth, pc->lpbiIn->bmiHeader.biHeight, + wine_dbgstr_fcc(pc->lpbiIn->bmiHeader.biCompression), + pc->lpbiIn->bmiHeader.biBitCount, + pc->lpbiIn->bmiHeader.biSizeImage); + TRACE("Output: %ux%u, fcc %s, bpp %u, size %u\n", + pc->lpbiOut->bmiHeader.biWidth, pc->lpbiOut->bmiHeader.biHeight, + wine_dbgstr_fcc(pc->lpbiOut->bmiHeader.biCompression), + pc->lpbiOut->bmiHeader.biBitCount, + pc->lpbiOut->bmiHeader.biSizeImage); + /* Buffer for compressed frame data */ pc->lpBitsOut = HeapAlloc(GetProcessHeap(), 0, pc->lpbiOut->bmiHeader.biSizeImage); if (!pc->lpBitsOut) @@ -1456,15 +1467,14 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) goto error; TRACE("Compvars:\n" - "\tpc:\n" "\tsize: %i\n" - "\tflags: %i\n" + "\tflags: 0x%x\n" "\thic: %p\n" - "\ttype: %x\n" - "\thandler: %x\n" + "\ttype: 0x%x\n" + "\thandler: %s\n" "\tin/out: %p/%p\n" - "key/data/quality: %i/%i/%i\n", - pc->cbSize, pc->dwFlags, pc->hic, pc->fccType, pc->fccHandler, + "\tkey/data/quality: %i/%i/%i\n", + pc->cbSize, pc->dwFlags, pc->hic, pc->fccType, wine_dbgstr_fcc(pc->fccHandler), pc->lpbiIn, pc->lpbiOut, pc->lKey, pc->lDataRate, pc->lQ); ret = ICSendMessage(pc->hic, ICM_COMPRESS_BEGIN, (DWORD_PTR)pc->lpbiIn, (DWORD_PTR)pc->lpbiOut);

1 0

Bruno Jesus : msvfw32: Ask the codec to fill the lpbiOutput info when it is not available.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: cc9e70a80aa03942fd0c545f1bbf935a91ae6019 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc9e70a80aa03942fd0c545f1… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Oct 20 14:56:56 2015 +0800 msvfw32: Ask the codec to fill the lpbiOutput info when it is not available. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 1e05396..204d53a 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1408,6 +1408,12 @@ static void clear_compvars(PCOMPVARS pc) HeapFree(GetProcessHeap(), 0, pc->lpBitsOut); HeapFree(GetProcessHeap(), 0, pc->lpState); pc->lpbiIn = pc->lpBitsPrev = pc->lpBitsOut = pc->lpState = NULL; + if (pc->dwFlags & 0x80000000) + { + HeapFree(GetProcessHeap(), 0, pc->lpBitsOut); + pc->lpBitsOut = NULL; + pc->dwFlags &= ~0x80000000; + } } /*********************************************************************** @@ -1445,6 +1451,33 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) pc->cbState = sizeof(ICCOMPRESS); + if (!pc->lpbiOut) + { + pc->lpbiOut = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFO)); + if (!pc->lpbiOut) + goto error; + + ret = ICSendMessage(pc->hic, ICM_COMPRESS_GET_FORMAT, + (DWORD_PTR)pc->lpbiIn, (DWORD_PTR)pc->lpbiOut); + if (ret != ICERR_OK) + { + ERR("Could not get output format from compressor\n"); + goto error; + } + if (!pc->lpbiOut->bmiHeader.biSizeImage) + { + /* If we can't know the output frame size for sure at least allocate + * the same size of the input frame and also at least 8Kb to be sure + * that poor compressors will have enough memory to work if the input + * frame is too small. + */ + pc->lpbiOut->bmiHeader.biSizeImage = max(8192, pc->lpbiIn->bmiHeader.biSizeImage); + 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", pc->lpbiIn->bmiHeader.biWidth, pc->lpbiIn->bmiHeader.biHeight, wine_dbgstr_fcc(pc->lpbiIn->bmiHeader.biCompression),

1 0

Bruno Jesus : msvfw32: Only update output parameters when the compress operation works.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 3a7dfcd28fa1ab686c4b18bea0658545e48f2340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7dfcd28fa1ab686c4b18bea… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Oct 20 14:57:02 2015 +0800 msvfw32: Only update output parameters when the compress operation works. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 204d53a..1ebfc00 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1366,7 +1366,7 @@ LPVOID VFWAPI ICSeqCompressFrame(PCOMPVARS pc, UINT uiFlags, LPVOID lpBits, BOOL if (pc->lKey && pc->lKeyCount == (pc->lKey - 1)) /* No key frames if pc->lKey == 0 */ pc->lKeyCount = 0; - icComp->dwFlags = 0; + icComp->dwFlags = 0; } icComp->lpInput = lpBits; @@ -1375,28 +1375,30 @@ LPVOID VFWAPI ICSeqCompressFrame(PCOMPVARS pc, UINT uiFlags, LPVOID lpBits, BOOL icComp->lpPrev = pc->lpBitsPrev; ret = ICSendMessage(pc->hic, ICM_COMPRESS, (DWORD_PTR)icComp, sizeof(*icComp)); - if (icComp->dwFlags & AVIIF_KEYFRAME) - { - pc->lKeyCount = 1; - *pfKey = TRUE; - TRACE("Key frame\n"); - } - else - *pfKey = FALSE; - - *plSize = icComp->lpbiOutput->biSizeImage; TRACE(" -- 0x%08x\n", ret); if (ret == ICERR_OK) { - LPVOID oldprev, oldout; -/* We shift Prev and Out, so we don't have to allocate and release memory */ - oldprev = pc->lpBitsPrev; - oldout = pc->lpBitsOut; - pc->lpBitsPrev = oldout; - pc->lpBitsOut = oldprev; - - TRACE("returning: %p\n", icComp->lpOutput); - return icComp->lpOutput; + LPVOID oldprev, oldout; + + if (icComp->dwFlags & AVIIF_KEYFRAME) + { + pc->lKeyCount = 1; + *pfKey = TRUE; + TRACE("Key frame\n"); + } + else + *pfKey = FALSE; + + *plSize = icComp->lpbiOutput->biSizeImage; + + /* We shift Prev and Out, so we don't have to allocate and release memory */ + oldprev = pc->lpBitsPrev; + oldout = pc->lpBitsOut; + pc->lpBitsPrev = oldout; + pc->lpBitsOut = oldprev; + + TRACE("returning: %p, compressed frame size %u\n", icComp->lpOutput, *plSize); + return icComp->lpOutput; } return NULL; }

1 0

Bruno Jesus : msvfw32: Make wine_dbgstr_fcc handle non-ASCII values better.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 970692c081061a89ccb40169bc5c66256140a09c URL: http://source.winehq.org/git/wine.git/?a=commit;h=970692c081061a89ccb40169b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Oct 20 14:57:12 2015 +0800 msvfw32: Make wine_dbgstr_fcc handle non-ASCII values better. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 1ebfc00..d0ff270 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -48,9 +48,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvideo); static inline const char *wine_dbgstr_fcc( DWORD fcc ) { - return wine_dbg_sprintf("%c%c%c%c", - LOBYTE(LOWORD(fcc)), HIBYTE(LOWORD(fcc)), - LOBYTE(HIWORD(fcc)), HIBYTE(HIWORD(fcc))); + char fcc_str[5] = {LOBYTE(LOWORD(fcc)), HIBYTE(LOWORD(fcc)), + LOBYTE(HIWORD(fcc)), HIBYTE(HIWORD(fcc)), '\0'}; + if (isalnum(fcc_str[0]) && isalnum(fcc_str[1]) + && isalnum(fcc_str[2]) && isalnum(fcc_str[3])) + return wine_dbg_sprintf("%s", fcc_str); + return wine_dbg_sprintf("0x%08x", fcc); } static WINE_HIC* MSVIDEO_FirstHic /* = NULL */;

1 0