April 2008 - Wine-Commits - list.winehq.org

Guy Albertelli : listview: Correct return value from LVM_GETORIGIN including tests for this.
by Alexandre Julliard April 28, 2008

April 28, 2008

Module: wine Branch: master Commit: 7fb21244d9d9369d95c4109e7ad421a176796d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb21244d9d9369d95c4109e7… Author: Guy Albertelli <galberte(a)neo.rr.com> Date: Sat Apr 26 00:20:09 2008 -0400 listview: Correct return value from LVM_GETORIGIN including tests for this. Tests to validate return value of the LVM_GETORIGIN message and fix our implementation. --- dlls/comctl32/listview.c | 2 + dlls/comctl32/tests/listview.c | 49 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a634f98..7760ecb 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9632,6 +9632,8 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case LVM_GETORIGIN: if (!lParam) return FALSE; + if ((infoPtr->dwStyle & LVS_TYPEMASK) == LVS_REPORT || + (infoPtr->dwStyle & LVS_TYPEMASK) == LVS_LIST) return FALSE; LISTVIEW_GetOrigin(infoPtr, (LPPOINT)lParam); return TRUE; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index ad82579..838691c 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1076,6 +1076,54 @@ static void test_item_position(void) DestroyWindow(hwnd); } +static void test_getorigin(void) +{ + /* LVM_GETORIGIN */ + + HWND hwnd; + DWORD r; + POINT position; + + position.x = position.y = 0; + + hwnd = create_custom_listview_control(LVS_ICON); + ok(hwnd != NULL, "failed to create a listview window\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + trace("test get origin results\n"); + r = SendMessage(hwnd, LVM_GETORIGIN, 0, (LPARAM)&position); + expect(TRUE, r); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + DestroyWindow(hwnd); + + hwnd = create_custom_listview_control(LVS_SMALLICON); + ok(hwnd != NULL, "failed to create a listview window\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + trace("test get origin results\n"); + r = SendMessage(hwnd, LVM_GETORIGIN, 0, (LPARAM)&position); + expect(TRUE, r); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + DestroyWindow(hwnd); + + hwnd = create_custom_listview_control(LVS_LIST); + ok(hwnd != NULL, "failed to create a listview window\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + trace("test get origin results\n"); + r = SendMessage(hwnd, LVM_GETORIGIN, 0, (LPARAM)&position); + expect(FALSE, r); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + DestroyWindow(hwnd); + + hwnd = create_custom_listview_control(LVS_REPORT); + ok(hwnd != NULL, "failed to create a listview window\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + trace("test get origin results\n"); + r = SendMessage(hwnd, LVM_GETORIGIN, 0, (LPARAM)&position); + expect(FALSE, r); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + DestroyWindow(hwnd); + +} + START_TEST(listview) { HMODULE hComctl32; @@ -1111,4 +1159,5 @@ START_TEST(listview) test_item_count(); test_item_position(); test_columns(); + test_getorigin(); }

1 0

Dmitry Timoshkov : gdi32: Add SetPixel to the EMF DC functions.
by Alexandre Julliard April 28, 2008

April 28, 2008

Module: wine Branch: master Commit: c814d17c764341dc127ab1c6307abe5cdf91ff23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c814d17c764341dc127ab1c63… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Apr 25 22:39:59 2008 +0900 gdi32: Add SetPixel to the EMF DC functions. --- dlls/gdi32/enhmfdrv/init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 2203ced..7e68847 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -130,7 +130,7 @@ static const DC_FUNCTIONS EMFDRV_Funcs = NULL, /* pSetDeviceGammaRamp */ EMFDRV_SetMapMode, /* pSetMapMode */ EMFDRV_SetMapperFlags, /* pSetMapperFlags */ - NULL, /* pSetPixel */ + EMFDRV_SetPixel, /* pSetPixel */ NULL, /* pSetPixelFormat */ EMFDRV_SetPolyFillMode, /* pSetPolyFillMode */ EMFDRV_SetROP2, /* pSetROP2 */

1 0

Guy Albertelli : listview: Implement 2 pixel decoration at top of report style with grid lines.
by Alexandre Julliard April 28, 2008

April 28, 2008

Module: wine Branch: master Commit: e85fa81f3cc8b52f01b603cb228379a0ed764cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e85fa81f3cc8b52f01b603cb2… Author: Guy Albertelli <galberte(a)neo.rr.com> Date: Sat Apr 26 00:20:06 2008 -0400 listview: Implement 2 pixel decoration at top of report style with grid lines. The native control has a 2 pixel header. This implements that background pixel line and the gridline below it. --- dlls/comctl32/listview.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ad0ad0e..a634f98 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4100,6 +4100,9 @@ static void LISTVIEW_RefreshReportGrid(LISTVIEW_INFO *infoPtr, HDC hdc) itemheight = LISTVIEW_CalculateItemHeight(infoPtr); rcItem.left = infoPtr->rcList.left + Origin.x; rcItem.right = infoPtr->rcList.right + Origin.x; + rcItem.bottom = rcItem.top = Origin.y - 1; + MoveToEx(hdc, rcItem.left, rcItem.top, NULL); + LineTo(hdc, rcItem.right, rcItem.top); for(y=itemheight-1+Origin.y; y<=infoPtr->rcList.bottom; y+=itemheight) { rcItem.bottom = rcItem.top = y; @@ -7131,6 +7134,13 @@ static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD dwM SetWindowLongW(infoPtr->hwndHeader, GWL_STYLE, dwStyle); } + /* GRIDLINES adds decoration at top so changes sizes */ + if((infoPtr->dwLvExStyle ^ dwOldExStyle) & LVS_EX_GRIDLINES) + { + LISTVIEW_UpdateSize(infoPtr); + } + + LISTVIEW_InvalidateList(infoPtr); return dwOldExStyle; } @@ -9368,10 +9378,12 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) hl.prc = &infoPtr->rcList; hl.pwpos = &wp; SendMessageW( infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl ); - + TRACE(" wp.flags=0x%08x, wp=%d,%d (%dx%d)\n", wp.flags, wp.x, wp.y, wp.cx, wp.cy); SetWindowPos(wp.hwnd, wp.hwndInsertAfter, wp.x, wp.y, wp.cx, wp.cy, wp.flags); + TRACE(" after SWP wp=%d,%d (%dx%d)\n", wp.x, wp.y, wp.cx, wp.cy); infoPtr->rcList.top = max(wp.cy, 0); + infoPtr->rcList.top += (infoPtr->dwLvExStyle & LVS_EX_GRIDLINES) ? 2 : 0; } TRACE(" rcList=%s\n", wine_dbgstr_rect(&infoPtr->rcList));

1 0

Maarten Lankhorst : quartz: Fix acmwrapper time regression.
by Alexandre Julliard April 28, 2008

April 28, 2008

Module: wine Branch: master Commit: 10708b405c2303e782a688edad1a79215fca142d URL: http://source.winehq.org/git/wine.git/?a=commit;h=10708b405c2303e782a688eda… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 25 15:14:54 2008 -0700 quartz: Fix acmwrapper time regression. --- dlls/quartz/acmwrapper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 65f196a..c7b1e42 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -170,7 +170,7 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte if (ash.cbSrcLengthUsed == cbSrcStream) { IMediaSample_SetTime(pOutSample, &tStart, &tStop); - tStart = tStop; + tStart = tMed = tStop; } else if (tStop != tStart) {

1 0

Guy Albertelli : listview: Implement LVS_EX_GRIDLINES functionality.
by Alexandre Julliard April 28, 2008

April 28, 2008

Module: wine Branch: master Commit: 7326f091b0f19e2043fcccc2d4d75c3e43cdae92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7326f091b0f19e2043fcccc2d… Author: Guy Albertelli <galberte(a)neo.rr.com> Date: Sat Apr 26 00:20:03 2008 -0400 listview: Implement LVS_EX_GRIDLINES functionality. Implement basic LVS_EX_GRIDLINES functionality including support for no items. --- dlls/comctl32/listview.c | 94 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 93 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ab819e6..ad0ad0e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -91,7 +91,6 @@ * Extended Styles * -- LVS_EX_BORDERSELECT * -- LVS_EX_FLATSB - * -- LVS_EX_GRIDLINES * -- LVS_EX_HEADERDRAGDROP * -- LVS_EX_INFOTIP * -- LVS_EX_LABELTIP @@ -2495,6 +2494,8 @@ static INT LISTVIEW_CalculateItemHeight(const LISTVIEW_INFO *infoPtr) else { nItemHeight = infoPtr->ntmHeight; + if (uView == LVS_REPORT && infoPtr->dwLvExStyle & LVS_EX_GRIDLINES) + nItemHeight++; if (infoPtr->himlState) nItemHeight = max(nItemHeight, infoPtr->iconStateSize.cy); if (infoPtr->himlSmall) @@ -3873,6 +3874,11 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS else rcLabel.left += LABEL_HOR_PADDING; } else if (uFormat & DT_RIGHT) rcLabel.right -= LABEL_HOR_PADDING; + + /* for GRIDLINES reduce the bottom so the text formats correctly */ + if (uView == LVS_REPORT && infoPtr->dwLvExStyle & LVS_EX_GRIDLINES) + rcLabel.bottom--; + DrawTextW(hdc, lvItem.pszText, -1, &rcLabel, uFormat); postpaint: @@ -4029,6 +4035,86 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, /*** * DESCRIPTION: + * Draws the gridlines if necessary when in report display mode. + * + * PARAMETER(S): + * [I] infoPtr : valid pointer to the listview structure + * [I] hdc : device context handle + * + * RETURN: + * None + */ +static void LISTVIEW_RefreshReportGrid(LISTVIEW_INFO *infoPtr, HDC hdc) +{ + INT rgntype; + INT y, itemheight; + HPEN hPen, hOldPen; + RECT rcClip, rcItem; + POINT Origin; + RANGE colRange; + ITERATOR j; + + TRACE("()\n"); + + /* figure out what to draw */ + rgntype = GetClipBox(hdc, &rcClip); + if (rgntype == NULLREGION) return; + + /* Get scroll info once before loop */ + LISTVIEW_GetOrigin(infoPtr, &Origin); + + /* narrow down the columns we need to paint */ + for(colRange.lower = 0; colRange.lower < DPA_GetPtrCount(infoPtr->hdpaColumns); colRange.lower++) + { + LISTVIEW_GetHeaderRect(infoPtr, colRange.lower, &rcItem); + if (rcItem.right + Origin.x >= rcClip.left) break; + } + for(colRange.upper = DPA_GetPtrCount(infoPtr->hdpaColumns); colRange.upper > 0; colRange.upper--) + { + LISTVIEW_GetHeaderRect(infoPtr, colRange.upper - 1, &rcItem); + if (rcItem.left + Origin.x < rcClip.right) break; + } + iterator_rangeitems(&j, colRange); + + if ((hPen = CreatePen( PS_SOLID, 1, comctl32_color.clr3dFace ))) + { + hOldPen = SelectObject ( hdc, hPen ); + + /* draw the vertical lines for the columns */ + iterator_rangeitems(&j, colRange); + while(iterator_next(&j)) + { + LISTVIEW_GetHeaderRect(infoPtr, j.nItem, &rcItem); + if (rcItem.left == 0) continue; /* skip first column */ + rcItem.left += Origin.x; + rcItem.right += Origin.x; + rcItem.top = infoPtr->rcList.top; + rcItem.bottom = infoPtr->rcList.bottom; + TRACE("vert col=%d, rcItem=%s\n", j.nItem, wine_dbgstr_rect(&rcItem)); + MoveToEx (hdc, rcItem.left, rcItem.top, NULL); + LineTo (hdc, rcItem.left, rcItem.bottom); + } + iterator_destroy(&j); + + /* draw the horizontial lines for the rows */ + itemheight = LISTVIEW_CalculateItemHeight(infoPtr); + rcItem.left = infoPtr->rcList.left + Origin.x; + rcItem.right = infoPtr->rcList.right + Origin.x; + for(y=itemheight-1+Origin.y; y<=infoPtr->rcList.bottom; y+=itemheight) + { + rcItem.bottom = rcItem.top = y; + TRACE("horz rcItem=%s\n", wine_dbgstr_rect(&rcItem)); + MoveToEx (hdc, rcItem.left, rcItem.top, NULL); + LineTo (hdc, rcItem.right, rcItem.top); + } + + SelectObject( hdc, hOldPen ); + DeleteObject( hPen ); + } +} + +/*** + * DESCRIPTION: * Draws listview items when in list display mode. * * PARAMETER(S): @@ -4175,6 +4261,12 @@ static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *prcEra iterator_destroy(&i); enddraw: + /* For LVS_EX_GRIDLINES go and draw lines */ + /* This includes the case where there were *no* items */ + if ((infoPtr->dwStyle & LVS_TYPEMASK) == LVS_REPORT && + infoPtr->dwLvExStyle & LVS_EX_GRIDLINES) + LISTVIEW_RefreshReportGrid(infoPtr, hdc); + if (cdmode & CDRF_NOTIFYPOSTPAINT) notify_postpaint(infoPtr, &nmlvcd);

1 0

Maarten Lankhorst : quartz: Make dwSamplesProcessed a longlong.
by Alexandre Julliard April 28, 2008

April 28, 2008

Module: wine Branch: master Commit: ec87de35af3ccb76383697b51aefe8041bbfdc15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec87de35af3ccb76383697b51… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 25 14:50:22 2008 -0700 quartz: Make dwSamplesProcessed a longlong. --- dlls/quartz/parser.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/parser.h b/dlls/quartz/parser.h index 6fda5e3..f30a8fd 100644 --- a/dlls/quartz/parser.h +++ b/dlls/quartz/parser.h @@ -52,7 +52,7 @@ typedef struct Parser_OutputPin OutputPin pin; AM_MEDIA_TYPE * pmt; - DWORD dwSamplesProcessed; + LONGLONG dwSamplesProcessed; } Parser_OutputPin; extern HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PROPERTIES * props, const AM_MEDIA_TYPE * amt);

1 0

Maarten Lankhorst : quartz: Add a function that can be called when stopping processing data.
by Alexandre Julliard April 28, 2008

April 28, 2008

Module: wine Branch: master Commit: 512ee927cb56a6b3355550c2f929d34f080247ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=512ee927cb56a6b3355550c2f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 25 14:59:05 2008 -0700 quartz: Add a function that can be called when stopping processing data. --- dlls/quartz/avisplit.c | 2 +- dlls/quartz/mpegsplit.c | 2 +- dlls/quartz/parser.c | 65 +++++++++++++++++++++++++++++++--------------- dlls/quartz/parser.h | 2 +- dlls/quartz/pin.c | 12 ++++++-- dlls/quartz/pin.h | 8 +++++- dlls/quartz/waveparser.c | 2 +- 7 files changed, 64 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=512ee927cb56a6b335555…

1 0

Maarten Lankhorst : quartz: Optimize the file source to do its job better.
by Alexandre Julliard April 28, 2008

April 28, 2008

Module: wine Branch: master Commit: 12a0fd3d8b0acff07ec07b4d7f5ea1f79effad93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a0fd3d8b0acff07ec07b4d7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 25 14:33:15 2008 -0700 quartz: Optimize the file source to do its job better. --- dlls/quartz/filesource.c | 42 +++++++++++++++++++++++++++++++++--------- 1 files changed, 33 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index a44de7a..1ac37b0 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -769,6 +769,8 @@ typedef struct FileAsyncReader LONG samples; CRITICAL_SECTION csList; /* critical section to prevent concurrency issues */ DATAREQUEST *sample_list; + + /* Have a handle for every sample, and then one more as flushing handle */ HANDLE *handle_list; } FileAsyncReader; @@ -832,7 +834,7 @@ static ULONG WINAPI FileAsyncReaderPin_Release(IPin * iface) CoTaskMemFree(This->sample_list); if (This->handle_list) { - for (x = 0; x < This->samples; ++x) + for (x = 0; x <= This->samples; ++x) CloseHandle(This->handle_list[x]); CoTaskMemFree(This->handle_list); } @@ -1009,7 +1011,7 @@ done: if (This->handle_list) { int x; - for (x = 0; x < This->samples; ++x) + for (x = 0; x <= This->samples; ++x) CloseHandle(This->handle_list[x]); CoTaskMemFree(This->handle_list); } @@ -1017,7 +1019,7 @@ done: This->samples = pProps->cBuffers; TRACE("Samples: %u\n", This->samples); This->sample_list = CoTaskMemAlloc(sizeof(This->sample_list[0]) * pProps->cBuffers); - This->handle_list = CoTaskMemAlloc(sizeof(HANDLE) * pProps->cBuffers); + This->handle_list = CoTaskMemAlloc(sizeof(HANDLE) * (pProps->cBuffers + 1)); if (This->sample_list && This->handle_list) { @@ -1027,6 +1029,7 @@ done: { This->sample_list[x].ovl.hEvent = This->handle_list[x] = CreateEventW(NULL, 0, 0, NULL); } + This->handle_list[This->samples] = CreateEventW(NULL, 1, 0, NULL); This->pin.allocProps = *pProps; } else @@ -1060,6 +1063,7 @@ static HRESULT WINAPI FileAsyncReader_Request(IAsyncReader * iface, IMediaSample REFERENCE_TIME Stop; FileAsyncReader *This = impl_from_IAsyncReader(iface); LPBYTE pBuffer = NULL; + DWORD wait; TRACE("(%p, %lx)\n", pSample, dwUser); @@ -1080,17 +1084,32 @@ static HRESULT WINAPI FileAsyncReader_Request(IAsyncReader * iface, IMediaSample return VFW_E_WRONG_STATE; } + wait = WaitForMultipleObjectsEx(This->samples, This->handle_list, FALSE, 0, FALSE); + if (wait < This->samples - 1) + SetEvent(This->handle_list[wait]); + else + wait = This->samples; + if (SUCCEEDED(hr)) { DWORD dwLength = (DWORD) BYTES_FROM_MEDIATIME(Stop - Start); DATAREQUEST *pDataRq; int x; - for (x = 0; x < This->samples; ++x) + /* Try to insert above the waiting sample if possible */ + for (x = wait + 1; x < This->samples; ++x) { if (!This->sample_list[x].pSample) break; } + + if (x >= This->samples) + for (x = 0; x < This->samples; ++x) + { + if (!This->sample_list[x].pSample) + break; + } + assert(x < This->samples); InterlockedIncrement(&This->queued_number); @@ -1138,20 +1157,20 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw { if (!This->queued_number) { - ERR("Called without samples in queue and not flushing!!\n"); - return E_FAIL; + /* It could be that nothing is queued right now, but that can be fixed */ + WARN("Called without samples in queue and not flushing!!\n"); } /* wait for an object to read, or time out */ - buffer = WaitForMultipleObjectsEx(This->samples, This->handle_list, FALSE, dwTimeout, TRUE); + buffer = WaitForMultipleObjectsEx(This->samples+1, This->handle_list, FALSE, dwTimeout, TRUE); - if (buffer >= MAXIMUM_WAIT_OBJECTS) + if (buffer >= This->samples) { FIXME("Returned: %u (%08x)\n", buffer, GetLastError()); hr = VFW_E_TIMEOUT; buffer = ~0; } - else + else if (buffer < This->samples) InterlockedDecrement(&This->queued_number); } @@ -1161,7 +1180,10 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw for (buffer = 0; buffer < This->samples; ++buffer) { if (This->sample_list[buffer].pSample) + { + ResetEvent(This->handle_list[buffer]); break; + } } if (buffer == This->samples) { @@ -1311,6 +1333,7 @@ static HRESULT WINAPI FileAsyncReader_BeginFlush(IAsyncReader * iface) EnterCriticalSection(&This->csList); This->bFlushing = TRUE; CancelIo(This->hFile); + SetEvent(This->handle_list[This->samples]); LeaveCriticalSection(&This->csList); return S_OK; @@ -1323,6 +1346,7 @@ static HRESULT WINAPI FileAsyncReader_EndFlush(IAsyncReader * iface) TRACE("()\n"); EnterCriticalSection(&This->csList); + ResetEvent(This->handle_list[This->samples]); This->bFlushing = FALSE; LeaveCriticalSection(&This->csList);

1 0

Maarten Lankhorst : quartz: Make the EnumPins interface dynamic.
by Alexandre Julliard April 28, 2008

April 28, 2008

Module: wine Branch: master Commit: 79349513435aa677e584bcad66865cafbac95db9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79349513435aa677e584bcad6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 25 14:25:49 2008 -0700 quartz: Make the EnumPins interface dynamic. Take a reference to the ibasefilter and request it for the pins and a cookie. This seems to be the easiest way to ensure correctness. --- dlls/quartz/dsoundrender.c | 41 ++++++++++++------------- dlls/quartz/enumpins.c | 69 ++++++++++++++++++++++++++++-------------- dlls/quartz/filesource.c | 25 ++++++++++++--- dlls/quartz/nullrenderer.c | 33 ++++++++++++-------- dlls/quartz/parser.c | 27 +++++++++++++--- dlls/quartz/parser.h | 1 + dlls/quartz/quartz_private.h | 10 ++---- dlls/quartz/transform.c | 20 ++++++++++-- dlls/quartz/videorenderer.c | 52 ++++++++++++++++++++----------- 9 files changed, 182 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79349513435aa677e584b…

1 0

Maarten Lankhorst : quartz: Fix time discontinuities in the acm wrapper.
by Alexandre Julliard April 28, 2008

April 28, 2008

Module: wine Branch: master Commit: b7e20bfdd1bc9777e56cb3fe73976e38146c1741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7e20bfdd1bc9777e56cb3fe7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 25 14:15:42 2008 -0700 quartz: Fix time discontinuities in the acm wrapper. --- dlls/quartz/acmwrapper.c | 42 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 34 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 11b07f1..65f196a 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -47,6 +47,9 @@ typedef struct ACMWrapperImpl HACMSTREAM has; LPWAVEFORMATEX pWfIn; LPWAVEFORMATEX pWfOut; + + LONGLONG lasttime_real; + LONGLONG lasttime_sent; } ACMWrapperImpl; static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilter, IMediaSample *pSample) @@ -75,6 +78,19 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte IMediaSample_GetTime(pSample, &tStart, &tStop); cbSrcStream = IMediaSample_GetActualDataLength(pSample); + /* Prevent discontinuities when codecs 'absorb' data but not give anything back in return */ + if (IMediaSample_IsDiscontinuity(pSample) == S_OK) + { + This->lasttime_real = tStart; + This->lasttime_sent = tStart; + } + else if (This->lasttime_real == tStart) + tStart = This->lasttime_sent; + else + WARN("Discontinuity\n"); + + tMed = tStart; + TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, (long)cbSrcStream); hr = IPin_ConnectionMediaType(This->tf.ppPins[0], &amt); @@ -132,19 +148,20 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte if (res) { - if(res != MMSYSERR_MOREDATA) - ERR("Cannot convert data header %d\n", res); - goto error; - } + if(res != MMSYSERR_MOREDATA) + ERR("Cannot convert data header %d\n", res); + goto error; + } - TRACE("used in %u/%u, used out %u/%u\n", ash.cbSrcLengthUsed, ash.cbSrcLength, ash.cbDstLengthUsed, ash.cbDstLength); + TRACE("used in %u/%u, used out %u/%u\n", ash.cbSrcLengthUsed, ash.cbSrcLength, ash.cbDstLengthUsed, ash.cbDstLength); - hr = IMediaSample_SetActualDataLength(pOutSample, ash.cbDstLengthUsed); - assert(hr == S_OK); + hr = IMediaSample_SetActualDataLength(pOutSample, ash.cbDstLengthUsed); + assert(hr == S_OK); + /* Bug in acm codecs? It apparantly uses the input, but doesn't necessarily output immediately kl*/ if (!ash.cbSrcLengthUsed) { - WARN("Sample was skipped\n"); + WARN("Sample was skipped? Outputted: %u\n", ash.cbDstLengthUsed); ash.cbSrcLength = 0; goto error; } @@ -187,8 +204,15 @@ error: if (pOutSample) IMediaSample_Release(pOutSample); pOutSample = NULL; + } + This->lasttime_real = tStop; + This->lasttime_sent = tMed; + + if (hr != S_OK) + FIXME("FATALITY: %08x\n", hr); + return hr; } @@ -252,6 +276,7 @@ static HRESULT ACMWrapper_Cleanup(TransformFilterImpl* pTransformFilter) acmStreamClose(This->has, 0); This->has = 0; + This->lasttime_real = This->lasttime_sent = -1; return S_OK; } @@ -287,6 +312,7 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) return hr; *ppv = (LPVOID)This; + This->lasttime_real = This->lasttime_sent = -1; return hr; }

1 0