wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Nikolay Sivov : msi: Use VARIANT_BOOL values consistently for VT_BOOL type (PVS-Studio).
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: 2257928a7af1de0c1702b252ebb7f1dd9647b1f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2257928a7af1de0c1702b252e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 14:59:49 2015 +0300 msi: Use VARIANT_BOOL values consistently for VT_BOOL type (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/automation.c | 4 ++-- dlls/msi/tests/automation.c | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 56823ee..c3d2c67 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1437,7 +1437,7 @@ static HRESULT session_invoke( hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; V_VT(pVarResult) = VT_BOOL; - V_BOOL(pVarResult) = MsiGetMode(This->msiHandle, V_I4(&varg0)); + V_BOOL(pVarResult) = MsiGetMode(This->msiHandle, V_I4(&varg0)) ? VARIANT_TRUE : VARIANT_FALSE; } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; @@ -2053,7 +2053,7 @@ static HRESULT InstallerImpl_RegistryValue(WORD wFlags, /* Return VT_BOOL clarifying whether registry key exists or not. */ case VT_EMPTY: V_VT(pVarResult) = VT_BOOL; - V_BOOL(pVarResult) = (ret == ERROR_SUCCESS); + V_BOOL(pVarResult) = (ret == ERROR_SUCCESS) ? VARIANT_TRUE : VARIANT_FALSE; break; /* Return the value of specified key if it exists. */ diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index e31527f..a1df3f1 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1204,7 +1204,7 @@ static HRESULT Session_LanguageGet(IDispatch *pSession, UINT *pLangId) return hr; } -static HRESULT Session_ModeGet(IDispatch *pSession, int iFlag, BOOL *pMode) +static HRESULT Session_ModeGet(IDispatch *pSession, int iFlag, VARIANT_BOOL *mode) { VARIANT varresult; VARIANTARG vararg[1]; @@ -1216,12 +1216,12 @@ static HRESULT Session_ModeGet(IDispatch *pSession, int iFlag, BOOL *pMode) V_I4(&vararg[0]) = iFlag; hr = invoke(pSession, "Mode", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_BOOL); - *pMode = V_BOOL(&varresult); + *mode = V_BOOL(&varresult); VariantClear(&varresult); return hr; } -static HRESULT Session_ModePut(IDispatch *pSession, int iFlag, BOOL bMode) +static HRESULT Session_ModePut(IDispatch *pSession, int iFlag, VARIANT_BOOL mode) { VARIANT varresult; VARIANTARG vararg[2]; @@ -1233,7 +1233,7 @@ static HRESULT Session_ModePut(IDispatch *pSession, int iFlag, BOOL bMode) V_I4(&vararg[1]) = iFlag; VariantInit(&vararg[0]); V_VT(&vararg[0]) = VT_BOOL; - V_BOOL(&vararg[0]) = bMode; + V_BOOL(&vararg[0]) = mode; return invoke(pSession, "Mode", DISPATCH_PROPERTYPUT, &dispparams, &varresult, VT_EMPTY); } @@ -1876,7 +1876,7 @@ static void test_Session(IDispatch *pSession) WCHAR stringw[MAX_PATH]; CHAR string[MAX_PATH]; UINT len; - BOOL bool; + VARIANT_BOOL bool; int myint; IDispatch *pDatabase = NULL, *pInst = NULL, *record = NULL; ULONG refs_before, refs_after; @@ -1944,15 +1944,15 @@ static void test_Session(IDispatch *pSession) ok(!bool, "Maintenance mode is %d\n", bool); /* Session::Mode, put */ - hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, TRUE); + hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, VARIANT_TRUE); ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTATEND, &bool); ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); ok(bool, "Reboot at end session mode is %d, expected 1\n", bool); - hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, FALSE); /* set it again so we don't reboot */ + hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, VARIANT_FALSE); /* set it again so we don't reboot */ ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); - hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, TRUE); + hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, VARIANT_TRUE); ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); ok_exception(hr, szModeFlag); @@ -1960,11 +1960,11 @@ static void test_Session(IDispatch *pSession) ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); ok(bool, "Reboot now mode is %d, expected 1\n", bool); - hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, FALSE); /* set it again so we don't reboot */ + hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, VARIANT_FALSE); /* set it again so we don't reboot */ ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); ok_exception(hr, szModeFlag); - hr = Session_ModePut(pSession, MSIRUNMODE_MAINTENANCE, TRUE); + hr = Session_ModePut(pSession, MSIRUNMODE_MAINTENANCE, VARIANT_TRUE); ok(hr == DISP_E_EXCEPTION, "Session_ModePut failed, hresult 0x%08x\n", hr); ok_exception(hr, szModeFlag);

1 0

Nikolay Sivov : dxdiagn: Properly set VT_BOOL values (PVS-Studio).
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: 5c170dc9bd380aa2b92acb2f4538b482d2f99e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c170dc9bd380aa2b92acb2f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 14:48:09 2015 +0300 dxdiagn: Properly set VT_BOOL values (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxdiagn/provider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 3b5fcab..2890c61 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -335,7 +335,7 @@ static inline HRESULT add_bool_property(IDxDiagContainerImpl_Container *node, co return E_OUTOFMEMORY; V_VT(&prop->vProp) = VT_BOOL; - V_BOOL(&prop->vProp) = data; + V_BOOL(&prop->vProp) = data ? VARIANT_TRUE : VARIANT_FALSE; list_add_tail(&node->properties, &prop->entry); ++node->nProperties;

1 0

Nikolay Sivov : shell32/tests: Fix prototype to match implementation ( PVS-Studio).
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: 2fff77a0eee097de8510ae2f229d5aa7b9551316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fff77a0eee097de8510ae2f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 14:43:30 2015 +0300 shell32/tests: Fix prototype to match implementation (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/string.c b/dlls/shell32/tests/string.c index 81f4754..6cdb386 100644 --- a/dlls/shell32/tests/string.c +++ b/dlls/shell32/tests/string.c @@ -32,7 +32,7 @@ #include "wine/test.h" static HMODULE hShell32; -static HRESULT (WINAPI *pStrRetToStrNAW)(LPVOID,DWORD,LPSTRRET,const ITEMIDLIST *); +static BOOL (WINAPI *pStrRetToStrNAW)(LPVOID,DWORD,LPSTRRET,const ITEMIDLIST *); static WCHAR *CoDupStrW(const char* src) {

1 0

Nikolay Sivov : quartz: Minor cleanup of returned interface pointers.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: 5fb58eae3b9c2ca89d801b9d50ef9843665ca6b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb58eae3b9c2ca89d801b9d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 14:31:49 2015 +0300 quartz: Minor cleanup of returned interface pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avisplit.c | 2 +- dlls/quartz/filesource.c | 10 ++++------ dlls/quartz/mpegsplit.c | 2 +- dlls/quartz/parser.c | 10 +++++----- dlls/quartz/systemclock.c | 2 +- dlls/quartz/vmr9.c | 2 +- dlls/quartz/waveparser.c | 2 +- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index d62ec2b..74529f2 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -1451,7 +1451,7 @@ HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) if (FAILED(hr)) return hr; - *ppv = This; + *ppv = &This->Parser.filter.IBaseFilter_iface; return hr; } diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 877c706..33ac442 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -810,20 +810,18 @@ static HRESULT WINAPI FileAsyncReaderPin_QueryInterface(IPin * iface, REFIID rii *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IPin)) - *ppv = This; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPin)) + *ppv = &This->pin.pin.IPin_iface; else if (IsEqualIID(riid, &IID_IAsyncReader)) *ppv = &This->IAsyncReader_iface; if (*ppv) { - IUnknown_AddRef((IUnknown *)(*ppv)); + IUnknown_AddRef((IUnknown *)*ppv); return S_OK; } - if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IMediaSeeking)) + if (!IsEqualIID(riid, &IID_IMediaSeeking)) FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); return E_NOINTERFACE; diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 33a93ba..60dd82c 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -797,7 +797,7 @@ HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) This->seek = TRUE; /* Note: This memory is managed by the parser filter once created */ - *ppv = This; + *ppv = &This->Parser.filter.IBaseFilter_iface; return hr; } diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index cd8d93d..fd98787 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -147,11 +147,11 @@ HRESULT WINAPI Parser_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * || IsEqualIID(riid, &IID_IPersist) || IsEqualIID(riid, &IID_IMediaFilter) || IsEqualIID(riid, &IID_IBaseFilter) ) - *ppv = This; + *ppv = &This->filter.IBaseFilter_iface; if (*ppv) { - IUnknown_AddRef((IUnknown *)(*ppv)); + IUnknown_AddRef((IUnknown *)*ppv); return S_OK; } @@ -521,21 +521,21 @@ static HRESULT WINAPI Parser_Seeking_QueryInterface(IMediaSeeking * iface, REFII { ParserImpl *This = impl_from_IMediaSeeking(iface); - return IUnknown_QueryInterface((IUnknown *)This, riid, ppv); + return IBaseFilter_QueryInterface(&This->filter.IBaseFilter_iface, riid, ppv); } static ULONG WINAPI Parser_Seeking_AddRef(IMediaSeeking * iface) { ParserImpl *This = impl_from_IMediaSeeking(iface); - return IUnknown_AddRef((IUnknown *)This); + return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); } static ULONG WINAPI Parser_Seeking_Release(IMediaSeeking * iface) { ParserImpl *This = impl_from_IMediaSeeking(iface); - return IUnknown_Release((IUnknown *)This); + return IBaseFilter_Release(&This->filter.IBaseFilter_iface); } static const IMediaSeekingVtbl Parser_Seeking_Vtbl = diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index cdb06f7..a3e1504 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -215,7 +215,7 @@ static HRESULT WINAPI SystemClockImpl_QueryInterface(IReferenceClock* iface, REF if (IsEqualIID (riid, &IID_IUnknown) || IsEqualIID (riid, &IID_IReferenceClock)) { SystemClockImpl_AddRef(iface); - *ppobj = This; + *ppobj = &This->IReferenceClock_iface; return S_OK; } diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index c9a330d..10b9dff 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -3111,6 +3111,6 @@ static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *paren This->SurfaceAllocatorNotify = NULL; This->reset = FALSE; - *ppv = This; + *ppv = &This->IVMRImagePresenter9_iface; return S_OK; } diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 3f3846c..6e8c664 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -440,7 +440,7 @@ HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv) if (FAILED(hr)) return hr; - *ppv = This; + *ppv = &This->Parser.filter.IBaseFilter_iface; return hr; }

1 0

Alex Henrie : user32: Release capture before sending WM_COMMAND.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: a3e4c694197018f5c05b815660f3cd9fcee17c87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3e4c694197018f5c05b81566… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 12 01:30:51 2015 -0600 user32: Release capture before sending WM_COMMAND. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index eeb3035..db479a8 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -353,9 +353,13 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, (state & BST_INDETERMINATE) ? 0 : ((state & 3) + 1), 0 ); break; } + ReleaseCapture(); BUTTON_NOTIFY_PARENT(hWnd, BN_CLICKED); } - ReleaseCapture(); + else + { + ReleaseCapture(); + } break; case WM_CAPTURECHANGED:

1 0

Bruno Jesus : msvfw32/tests: Add ICSeqFrameCompress tests.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: 8b054fb3076b4af63af77c41bc350c2e110ef8a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b054fb3076b4af63af77c41b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Oct 21 13:31:47 2015 +0800 msvfw32/tests: Add ICSeqFrameCompress tests. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/tests/msvfw.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 139c644..0b18e47 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -200,8 +200,73 @@ static void test_Locate(void) if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); } +static void test_ICSeqCompress(void) +{ + /* The purpose of this test is to validate sequential frame compressing + * functions. The MRLE codec will be used because Wine supports it and + * it is present in any Windows. + */ + HIC h; + DWORD err, vidc = mmioFOURCC('v','i','d','c'), mrle = mmioFOURCC('m', 'r', 'l', 'e'); + DWORD i; + LONG frame_len; + BOOL key_frame, ret; + char *frame; + COMPVARS pc; + struct { BITMAPINFOHEADER header; RGBQUAD map[256]; } + input_header = { {sizeof(BITMAPINFOHEADER), 32, 1, 1, 8, 0, 32*8, 0, 0, 256, 256}, + {{255,0,0}, {0,255,0}, {0,0,255}, {255,255,255}}}; + PBITMAPINFO bitmap = (PBITMAPINFO) &input_header; + static BYTE input[32] = {1,2,3,3,3,3,2,3,1}; + static const BYTE output_kf[] = {1,1,1,2,4,3,0,3,2,3,1,0,23,0,0,0,0,1}, /* key frame*/ + output_nkf[] = {0,0,0,1}; /* non key frame */ + + h = ICOpen(vidc, mrle, ICMODE_COMPRESS); + ok(h != NULL, "Expected non-NULL\n"); + + pc.cbSize = sizeof(pc); + pc.dwFlags = ICMF_COMPVARS_VALID; + pc.fccType = vidc; + pc.fccHandler = mrle; + pc.hic = h; + pc.lpbiIn = NULL; + pc.lpbiOut = NULL; + pc.lpBitsOut = pc.lpBitsPrev = pc.lpState = NULL; + pc.lQ = ICQUALITY_DEFAULT; + pc.lKey = 1; + pc.lDataRate = 300; + pc.lpState = NULL; + pc.cbState = 0; + + ret = ICSeqCompressFrameStart(&pc, bitmap); + ok(ret == TRUE, "Expected TRUE\n"); + /* Check that reserved pointers were allocated */ + ok(pc.lpbiIn != NULL, "Expected non-NULL\n"); + ok(pc.lpbiOut != NULL, "Expected non-NULL\n"); + + for(i = 0; i < 9; i++) + { + frame_len = 0; + frame = ICSeqCompressFrame(&pc, 0, input, &key_frame, &frame_len); + ok(frame != NULL, "Frame[%d]: Expected non-NULL\n", i); + if (frame_len == sizeof(output_nkf)) + ok(!memcmp(output_nkf, frame, frame_len), "Frame[%d]: Contents do not match\n", i); + else if (frame_len == sizeof(output_kf)) + ok(!memcmp(output_kf, frame, frame_len), "Frame[%d]: Contents do not match\n", i); + else + ok(0, "Unknown frame size of %d byten\n", frame_len); + } + + ICSeqCompressFrameEnd(&pc); + ICCompressorFree(&pc); + /* ICCompressorFree already closed the HIC */ + err = ICClose(h); + ok(err == ICERR_BADHANDLE, "Expected -8, got %d\n", err); +} + START_TEST(msvfw) { test_OpenCase(); test_Locate(); + test_ICSeqCompress(); }

1 0

Bruno Jesus : msvfw32: Ask the driver about how much data is required for lpbiOut.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: bd4ead0fec36a6901df0afa15743e4806c93fe68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd4ead0fec36a6901df0afa15… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Oct 21 13:30:48 2015 +0800 msvfw32: Ask the driver about how much data is required for lpbiOut. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index db71014..717bcf9 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1458,7 +1458,13 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) if (!pc->lpbiOut) { - pc->lpbiOut = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFO)); + /* Ask compressor for needed header size */ + int size = ICSendMessage(pc->hic, ICM_COMPRESS_GET_FORMAT, + (DWORD_PTR)pc->lpbiIn, 0); + if (size <= 0) + goto error; + + pc->lpbiOut = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); if (!pc->lpbiOut) goto error; /* Flag to show that we allocated lpbiOut for proper cleanup */

1 0

Bruno Jesus : msvfw32: Fix a copy & paste issue.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: f12a970c0970945337fda8f985b2c4b84fd1c92c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f12a970c0970945337fda8f98… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Oct 21 13:29:38 2015 +0800 msvfw32: Fix a copy & paste issue. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index d0ff270..db71014 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1415,8 +1415,8 @@ static void clear_compvars(PCOMPVARS pc) pc->lpbiIn = pc->lpBitsPrev = pc->lpBitsOut = pc->lpState = NULL; if (pc->dwFlags & 0x80000000) { - HeapFree(GetProcessHeap(), 0, pc->lpBitsOut); - pc->lpBitsOut = NULL; + HeapFree(GetProcessHeap(), 0, pc->lpbiOut); + pc->lpbiOut = NULL; pc->dwFlags &= ~0x80000000; } } @@ -1461,6 +1461,8 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) pc->lpbiOut = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFO)); if (!pc->lpbiOut) goto error; + /* Flag to show that we allocated lpbiOut for proper cleanup */ + pc->dwFlags |= 0x80000000; ret = ICSendMessage(pc->hic, ICM_COMPRESS_GET_FORMAT, (DWORD_PTR)pc->lpbiIn, (DWORD_PTR)pc->lpbiOut); @@ -1479,8 +1481,6 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) 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",

1 0

Huw Davies : wineps: Pass the collate setting as a CUPS option.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: 3f276c9be2a98cef198565f92b66163ef3ce2f11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f276c9be2a98cef198565f92… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 21 09:17:50 2015 +0100 wineps: Pass the collate setting as a CUPS option. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/ps.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index a19dda3..a01346e 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -48,6 +48,8 @@ static const char *cups_duplexes[3] = cups_two_sided_long, /* DMDUP_VERTICAL */ cups_two_sided_short /* DMDUP_HORIZONTAL */ }; +static const char cups_collate_false[] = "%cupsJobTicket: collate=false\n"; +static const char cups_collate_true[] = "%cupsJobTicket: collate=true\n"; static const char psheader[] = /* title llx lly urx ury orientation */ "%%%%Creator: Wine PostScript Driver\n" @@ -364,6 +366,14 @@ static void write_cups_job_ticket( PHYSDEV dev, const struct ticket_info *info ) physDev->Devmode->dmPublic.u1.s1.dmCopies ); if (len > 0 && len < sizeof(buf)) write_spool( dev, buf, len ); + + if (physDev->Devmode->dmPublic.dmFields & DM_COLLATE) + { + if (physDev->Devmode->dmPublic.dmCollate == DMCOLLATE_FALSE) + write_spool( dev, cups_collate_false, sizeof(cups_collate_false) - 1 ); + else if (physDev->Devmode->dmPublic.dmCollate == DMCOLLATE_TRUE) + write_spool( dev, cups_collate_true, sizeof(cups_collate_true) - 1 ); + } } }

1 0

Huw Davies : wineps: Let CUPS control the copy count rather than embedding it in the PostScript.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: 631caae76d0225dd39ab6084cb68771784a5773e URL: http://source.winehq.org/git/wine.git/?a=commit;h=631caae76d0225dd39ab6084c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 21 09:17:49 2015 +0100 wineps: Let CUPS control the copy count rather than embedding it in the PostScript. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/ps.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 6187223..a19dda3 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -331,6 +331,7 @@ struct ticket_info static void write_cups_job_ticket( PHYSDEV dev, const struct ticket_info *info ) { + PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); char buf[256]; int len; @@ -356,6 +357,14 @@ static void write_cups_job_ticket( PHYSDEV dev, const struct ticket_info *info ) write_spool( dev, str, strlen( str ) ); } } + + if (physDev->Devmode->dmPublic.u1.s1.dmCopies > 1) + { + len = snprintf( buf, sizeof(buf), "%%cupsJobTicket: copies=%d\n", + physDev->Devmode->dmPublic.u1.s1.dmCopies ); + if (len > 0 && len < sizeof(buf)) + write_spool( dev, buf, len ); + } } INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) @@ -414,12 +423,6 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) write_spool( dev, psendprolog, strlen(psendprolog) ); write_spool( dev, psbeginsetup, strlen(psbeginsetup) ); - if(physDev->Devmode->dmPublic.u1.s1.dmCopies > 1) { - char copies_buf[100]; - sprintf(copies_buf, "mark {\n << /NumCopies %d >> setpagedevice\n} stopped cleartomark\n", physDev->Devmode->dmPublic.u1.s1.dmCopies); - write_spool(dev, copies_buf, strlen(copies_buf)); - } - if (slot && slot->InvocationString) PSDRV_WriteFeature( dev, "*InputSlot", slot->Name, slot->InvocationString );

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2015