March 2014 - Wine-Commits - list.winehq.org

Huw Davies : riched20: Add a helper to return the default line height and use that in EM_LINESCROLL.
by Alexandre Julliard March 31, 2014

March 31, 2014

Module: wine Branch: master Commit: 2f07df59f955606af1047e4ba6f612bd669eadf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f07df59f955606af1047e4ba… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 31 14:09:41 2014 +0100 riched20: Add a helper to return the default line height and use that in EM_LINESCROLL. --- dlls/riched20/editor.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1d17ef0..9262baf 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2925,6 +2925,16 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } +static inline int get_default_line_height( ME_TextEditor *editor ) +{ + int height = 0; + + if (editor->pBuffer && editor->pBuffer->pDefaultStyle) + height = editor->pBuffer->pDefaultStyle->tm.tmHeight; + if (height <= 0) height = 24; + + return height; +} static const char * const edit_messages[] = { "EM_GETSEL", @@ -3548,7 +3558,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { if (!(editor->styleFlags & ES_MULTILINE)) return FALSE; - ME_ScrollDown(editor, lParam * 8); /* FIXME follow the original */ + ME_ScrollDown( editor, lParam * get_default_line_height( editor ) ); return TRUE; } case WM_CLEAR: @@ -4221,14 +4231,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_VSCROLL: { int origNPos; - int lineHeight; + int lineHeight = get_default_line_height( editor ); origNPos = editor->vert_si.nPos; - lineHeight = 24; - - if (editor->pBuffer && editor->pBuffer->pDefaultStyle) - lineHeight = editor->pBuffer->pDefaultStyle->tm.tmHeight; - if (lineHeight <= 0) lineHeight = 24; switch(LOWORD(wParam)) {

1 0

Huw Davies : riched20: Keep track of fractions of WHEEL_DELTA when scrolling.
by Alexandre Julliard March 31, 2014

March 31, 2014

Module: wine Branch: master Commit: fa50baf31f8849b4bfbc0db99455b77eb221e23a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa50baf31f8849b4bfbc0db99… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 31 14:09:42 2014 +0100 riched20: Keep track of fractions of WHEEL_DELTA when scrolling. --- dlls/riched20/editor.c | 38 +++++++++++++++++++++++++++++--------- dlls/riched20/editstr.h | 1 + 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9262baf..1235a16 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2858,6 +2858,8 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->horz_si.nPage = 0; ed->horz_si.nPos = 0; + ed->wheel_remain = 0; + OleInitialize(NULL); return ed; @@ -2936,6 +2938,13 @@ static inline int get_default_line_height( ME_TextEditor *editor ) return height; } +static inline int calc_wheel_change( int *remain, int amount_per_click ) +{ + int change = amount_per_click * (float)*remain / WHEEL_DELTA; + *remain -= WHEEL_DELTA * change / amount_per_click; + return change; +} + static const char * const edit_messages[] = { "EM_GETSEL", "EM_SETSEL", @@ -4145,6 +4154,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_KILLFOCUS: ME_CommitUndo(editor); /* End coalesced undos for typed characters */ editor->bHaveFocus = FALSE; + editor->wheel_remain = 0; ME_HideCaret(editor); ME_SendOldNotify(editor, EN_KILLFOCUS); return 0; @@ -4273,8 +4283,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case WM_MOUSEWHEEL: { - int gcWheelDelta; - UINT pulScrollLines; + int delta; BOOL ctrl_is_down; if ((editor->nEventMask & ENM_MOUSEEVENTS) && @@ -4283,9 +4292,16 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ctrl_is_down = GetKeyState(VK_CONTROL) & 0x8000; - gcWheelDelta = GET_WHEEL_DELTA_WPARAM(wParam); + delta = GET_WHEEL_DELTA_WPARAM(wParam); + + /* if scrolling changes direction, ignore left overs */ + if ((delta < 0 && editor->wheel_remain < 0) || + (delta > 0 && editor->wheel_remain > 0)) + editor->wheel_remain += delta; + else + editor->wheel_remain = delta; - if (abs(gcWheelDelta) >= WHEEL_DELTA) + if (editor->wheel_remain) { if (ctrl_is_down) { int numerator; @@ -4295,14 +4311,18 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } else { numerator = editor->nZoomNumerator * 100 / editor->nZoomDenominator; } - numerator = numerator + (gcWheelDelta / WHEEL_DELTA) * 10; + numerator += calc_wheel_change( &editor->wheel_remain, 10 ); if (numerator >= 10 && numerator <= 500) ME_SetZoom(editor, numerator, 100); } else { - SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); - /* FIXME follow the original */ - if (pulScrollLines) - ME_ScrollDown(editor,pulScrollLines * (-gcWheelDelta / WHEEL_DELTA) * 8); + UINT max_lines = 3; + int lines = 0; + + SystemParametersInfoW( SPI_GETWHEELSCROLLLINES, 0, &max_lines, 0 ); + if (max_lines) + lines = calc_wheel_change( &editor->wheel_remain, (int)max_lines ); + if (lines) + ME_ScrollDown( editor, -lines * get_default_line_height( editor ) ); } } break; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 8ce56c3..f139c29 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -443,6 +443,7 @@ typedef struct tagME_TextEditor SCROLLINFO vert_si, horz_si; BOOL bMouseCaptured; + int wheel_remain; } ME_TextEditor; typedef struct tagME_Context

1 0

Jacek Caban : ieframe: Fixed some tests on IE11.
by Alexandre Julliard March 31, 2014

March 31, 2014

Module: wine Branch: master Commit: 1d67d66efc5278852dbafa4919443f27900016c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d67d66efc5278852dbafa491… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 31 15:28:28 2014 +0200 ieframe: Fixed some tests on IE11. --- dlls/ieframe/tests/webbrowser.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index ce96edf..4bf7949 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -419,10 +419,12 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID CHECK_EXPECT(Exec_IDM_STOP); return OLECMDERR_E_NOTSUPPORTED; case OLECMDID_UPDATETRAVELENTRY_DATARECOVERY: + case OLECMDID_PAGEAVAILABLE: /* TODO (IE11) */ + return E_NOTIMPL; case 6058: /* TODO */ return E_NOTIMPL; default: - ok(0, "unexpected nsCmdID %d\n", nCmdID); + ok(0, "unexpected nCmdID %d\n", nCmdID); } }else if(IsEqualGUID(&CGID_Explorer, pguidCmdGroup)) { switch(nCmdID) { @@ -437,6 +439,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 101: /* TODO (IE8) */ case 109: /* TODO (IE9) */ case 113: /* TODO (IE10) */ + case 119: /* IE11 */ return E_FAIL; default: ok(0, "unexpected nCmdID %d\n", nCmdID); @@ -444,11 +447,14 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID }else if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { switch(nCmdID) { case 105: /* TODO */ + case 133: /* IE11 */ case 134: /* TODO (IE10) */ + case 135: /* IE11 */ case 136: /* TODO (IE10) */ case 138: /* TODO */ case 140: /* TODO (Win7) */ case 144: /* TODO */ + case 178: /* IE11 */ return E_FAIL; default: ok(0, "unexpected nCmdID %d\n", nCmdID);

1 0

Stefan Dösinger : wined3d: Raise MaxPrimitiveCount and MaxVertexIndex.
by Alexandre Julliard March 31, 2014

March 31, 2014

Module: wine Branch: master Commit: 62f7ba2555c475a65ad6bf143780b24fbb3d0664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62f7ba2555c475a65ad6bf143… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 28 21:03:46 2014 +0100 wined3d: Raise MaxPrimitiveCount and MaxVertexIndex. --- dlls/wined3d/directx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ef81278..86d0fcc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4473,8 +4473,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->MaxAnisotropy = gl_info->limits.anisotropy; caps->MaxPointSize = gl_info->limits.pointsize_max; - caps->MaxPrimitiveCount = 0xfffff; /* For now set 2^20-1 which is used by most >=Geforce3/Radeon8500 cards */ - caps->MaxVertexIndex = 0xfffff; + caps->MaxPrimitiveCount = 0x555555; /* Taken from an AMD Radeon HD 5700 (Evergreen) GPU. */ + caps->MaxVertexIndex = 0xffffff; /* Taken from an AMD Radeon HD 5700 (Evergreen) GPU. */ caps->MaxStreams = MAX_STREAMS; caps->MaxStreamStride = 1024;

1 0

Jacek Caban : kernel32: Skip reserved TLS tests on WinXP SP1.
by Alexandre Julliard March 31, 2014

March 31, 2014

Module: wine Branch: master Commit: e168cd28db6dbd149cddb1a2d3f1eef90a32209d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e168cd28db6dbd149cddb1a2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 31 14:31:01 2014 +0200 kernel32: Skip reserved TLS tests on WinXP SP1. --- dlls/kernel32/tests/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 36414ec..1ea5fb3 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1644,8 +1644,8 @@ static void test_reserved_tls(void) DWORD tls; BOOL ret; - /* This seems to be a WinXP+ feature. */ - if(!pCreateActCtxW) { + /* This seems to be a WinXP SP2+ feature. */ + if(!pIsWow64Process) { win_skip("Skipping reserved TLS slot on too old Windows.\n"); return; }

1 0

Jacek Caban : docobj.idl: Added some new OLECMDID values.
by Alexandre Julliard March 31, 2014

March 31, 2014

Module: wine Branch: master Commit: db08d9ad16b3533f0bb6c80c53f2d4525178f205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db08d9ad16b3533f0bb6c80c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 31 15:28:19 2014 +0200 docobj.idl: Added some new OLECMDID values. --- include/docobj.idl | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/include/docobj.idl b/include/docobj.idl index c77e546..119d4ea 100644 --- a/include/docobj.idl +++ b/include/docobj.idl @@ -275,7 +275,18 @@ interface IOleCommandTarget : IUnknown OLECMDID_OPTICAL_GETZOOMRANGE = 64, OLECMDID_WINDOWSTATECHANGED = 65, OLECMDID_ACTIVEXINSTALLSCOPE = 66, - OLECMDID_UPDATETRAVELENTRY_DATARECOVERY = 67 + OLECMDID_UPDATETRAVELENTRY_DATARECOVERY = 67, + OLECMDID_SHOWTASKDLG = 68, + OLECMDID_POPSTATEEVENT = 69, + OLECMDID_VIEWPORT_MODE = 70, + OLECMDID_LAYOUT_VIEWPORT_WIDTH = 71, + OLECMDID_VISUAL_VIEWPORT_EXCLUDE_BOTTOM = 72, + OLECMDID_USER_OPTICAL_ZOOM = 73, + OLECMDID_PAGEAVAILABLE = 74, + OLECMDID_GETUSERSCALABLE = 75, + OLECMDID_UPDATE_CARET = 76, + OLECMDID_ENABLE_VISIBILITY = 77, + OLECMDID_MEDIA_PLAYBACK = 78 } OLECMDID; HRESULT QueryStatus(

1 0

Francois Gouget : user32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard March 31, 2014

March 31, 2014

Module: wine Branch: master Commit: ebd99188302b27351cdf72d5296fde8ff82922ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd99188302b27351cdf72d52… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 31 12:30:43 2014 +0200 user32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/user32/tests/win.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 5206642..0966bad 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7548,13 +7548,13 @@ START_TEST(win) memset(input, 0, sizeof(input)); input[0].type = INPUT_MOUSE; - input[0].mi.dx = 101; - input[0].mi.dy = 101; - input[0].mi.dwFlags = MOUSEEVENTF_LEFTDOWN; + U(input[0]).mi.dx = 101; + U(input[0]).mi.dy = 101; + U(input[0]).mi.dwFlags = MOUSEEVENTF_LEFTDOWN; input[0].type = INPUT_MOUSE; - input[0].mi.dx = 101; - input[0].mi.dy = 101; - input[0].mi.dwFlags = MOUSEEVENTF_LEFTUP; + U(input[0]).mi.dx = 101; + U(input[0]).mi.dy = 101; + U(input[0]).mi.dwFlags = MOUSEEVENTF_LEFTUP; events_no = SendInput(2, input, sizeof(input[0])); ok(events_no == 2, "SendInput returned %d\n", events_no); ok(SetForegroundWindow(hwndMain), "SetForegroundWindow failed\n");

1 0

Thomas Faber : advapi32: Fix uneven length handling in CredUnmarshalCredential.
by Alexandre Julliard March 31, 2014

March 31, 2014

Module: wine Branch: master Commit: 6754c35589709c033d30ca593de90fa55f25b4e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6754c35589709c033d30ca593… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Mar 28 10:21:06 2014 +0100 advapi32: Fix uneven length handling in CredUnmarshalCredential. --- dlls/advapi32/cred.c | 2 +- dlls/advapi32/tests/cred.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 9ecfaee..fdd5645 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -2100,7 +2100,7 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO DWORD size; if (len < 9 || !cred_decode( cred + 3, 6, (char *)&size ) || - !size || size % sizeof(WCHAR) || size > INT_MAX) + size % sizeof(WCHAR) || len - 6 != (size * 4 + 2) / 3) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index de05e30..0ee08ef 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -566,6 +566,8 @@ static void test_CredUnmarshalCredentialA(void) static const UCHAR cert_empty[CERT_HASH_LENGTH] = {0}; static const UCHAR cert_wine[CERT_HASH_LENGTH] = {'W','i','n','e',0}; static const WCHAR tW[] = {'t',0}; + static const WCHAR teW[] = {'t','e',0}; + static const WCHAR tesW[] = {'t','e','s',0}; static const WCHAR testW[] = {'t','e','s','t',0}; void *p; CERT_CREDENTIAL_INFO *cert; @@ -593,6 +595,8 @@ static void test_CredUnmarshalCredentialA(void) { "@@-", 63, NULL }, { "@@B", CertCredential, NULL }, { "@@BA", CertCredential, NULL }, + { "@@BAAAAAAAAAAAAAAAAAAAAAAAAAA", CertCredential, NULL }, + { "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAAA", CertCredential, NULL }, { "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", CertCredential, cert_empty }, { "@@BXlmblBAAAAAAAAAAAAAAAAAAAAA", CertCredential, cert_wine }, { "@@C", UsernameTargetCredential, NULL }, @@ -601,6 +605,20 @@ static void test_CredUnmarshalCredentialA(void) { "@@CAAAAAA0B", UsernameTargetCredential, NULL }, { "@@CAAAAAA0BA", UsernameTargetCredential, NULL }, { "@@CCAAAAA0BA", UsernameTargetCredential, tW }, + { "@@CEAAAAA0BA", UsernameTargetCredential, NULL }, + { "@@CEAAAAA0BAd", UsernameTargetCredential, NULL }, + { "@@CEAAAAA0BAdA", UsernameTargetCredential, NULL }, + { "@@CEAAAAA0BQZAA", UsernameTargetCredential, teW }, + { "@@CEAAAAA0BQZAQ", UsernameTargetCredential, teW }, + { "@@CEAAAAA0BQZAg", UsernameTargetCredential, teW }, + { "@@CEAAAAA0BQZAw", UsernameTargetCredential, teW }, + { "@@CEAAAAA0BQZAAA", UsernameTargetCredential, NULL }, + { "@@CGAAAAA0BQZAMH", UsernameTargetCredential, NULL }, + { "@@CGAAAAA0BQZAMHA", UsernameTargetCredential, tesW }, + { "@@CGAAAAA0BQZAMHAA", UsernameTargetCredential, NULL }, + { "@@CCAAAAA0BAA", UsernameTargetCredential, NULL }, + { "@@CBAAAAA0BAA", UsernameTargetCredential, NULL }, + { "@@CAgAAAA0BAA", UsernameTargetCredential, NULL }, { "@@CIAAAAA0BQZAMHA0BA", UsernameTargetCredential, testW }, { "@@CA-----0BQZAMHA0BA", UsernameTargetCredential, NULL }, };

1 0

Thomas Faber : advapi32: Fix stack corruption in CredIsMarshaledCredentialW.
by Alexandre Julliard March 31, 2014

March 31, 2014

Module: wine Branch: master Commit: f9fae1b3f619a5ff70cdf397dcbba197d64a10d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9fae1b3f619a5ff70cdf397d… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Dec 20 00:17:35 2013 +0100 advapi32: Fix stack corruption in CredIsMarshaledCredentialW. In its currrent implementation, cred_decode with input length 6 writes 6 bytes to the output buffer. This overflows the DWORD passed in CredIsMarshaledCredentialW. --- dlls/advapi32/cred.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 3bfc885..f407c0d 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -2049,7 +2049,6 @@ static BOOL cred_decode( const WCHAR *cred, unsigned int len, char *buf ) buf[i + 0] = (c1 << 6) | c0; buf[i + 1] = (c2 << 4) | (c1 >> 2); - buf[i + 2] = c2 >> 4; } else if (len == 2) { @@ -2057,16 +2056,10 @@ static BOOL cred_decode( const WCHAR *cred, unsigned int len, char *buf ) if ((c1 = char_decode( p[1] )) > 63) return FALSE; buf[i + 0] = (c1 << 6) | c0; - buf[i + 1] = c1 >> 2; - buf[i + 2] = 0; } else if (len == 1) { - if ((c0 = char_decode( p[0] )) > 63) return FALSE; - - buf[i + 0] = c0; - buf[i + 1] = 0; - buf[i + 2] = 0; + return FALSE; } return TRUE; } @@ -2090,7 +2083,7 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO { case CertCredential: { - char hash[CERT_HASH_LENGTH + 2]; + char hash[CERT_HASH_LENGTH]; CERT_CREDENTIAL_INFO *cert; if (len != 27 || !cred_decode( cred + 3, len, hash )) @@ -2108,7 +2101,7 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO case UsernameTargetCredential: { USERNAME_TARGET_CREDENTIAL_INFO *target; - ULONGLONG size = 0; + DWORD size; if (len < 9 || !cred_decode( cred + 3, 6, (char *)&size ) || !size || size % sizeof(WCHAR) || size > INT_MAX) @@ -2157,7 +2150,7 @@ BOOL WINAPI CredIsMarshaledCredentialW(LPCWSTR name) if (name && name[0] == '@' && name[1] == '@' && name[2] > 'A' && name[3]) { - char hash[CERT_HASH_LENGTH + 2]; + char hash[CERT_HASH_LENGTH]; int len = strlenW(name + 3 ); DWORD size;

1 0

Nikolay Sivov : qcap/tests: Check method return values (Coverity).
by Alexandre Julliard March 31, 2014

March 31, 2014

Module: wine Branch: master Commit: ddbcd24178455f108d510b22016dc0347cf53b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddbcd24178455f108d510b220… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 30 16:07:11 2014 +0400 qcap/tests: Check method return values (Coverity). --- dlls/qcap/tests/qcap.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 4ad4d7c..19177bd 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1055,9 +1055,12 @@ static HRESULT WINAPI MemInputPin_Receive(IMemInputPin *iface, IMediaSample *pSa REFERENCE_TIME off, tmp; LARGE_INTEGER li; BYTE *data; + HRESULT hr; - IMediaSample_GetTime(pSample, &off, &tmp); - IMediaSample_GetPointer(pSample, &data); + hr = IMediaSample_GetTime(pSample, &off, &tmp); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IMediaSample_GetPointer(pSample, &data); + ok(hr == S_OK, "got 0x%08x\n", hr); li.QuadPart = off; IStream_Seek(avi_stream, li, STREAM_SEEK_SET, NULL); IStream_Write(avi_stream, data, IMediaSample_GetActualDataLength(pSample), NULL); @@ -1826,7 +1829,8 @@ static void test_AviMux(char *arg) ok(memalloc != &MemAllocator, "memalloc == &MemAllocator\n"); IMemAllocator_Release(memalloc); - CreateStreamOnHGlobal(NULL, TRUE, &avi_stream); + hr = CreateStreamOnHGlobal(NULL, TRUE, &avi_stream); + ok(hr == S_OK, "got 0x%08x\n", hr); SET_EXPECT(MediaSeeking_GetPositions); SET_EXPECT(MemInputPin_QueryInterface_IStream); hr = IBaseFilter_Run(avimux, 0);

1 0