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

Hwang YunSong(황윤성 : user32: Updated Korean resource.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: d20d374f77fdfaa0686547e2b7328a70ca9ada04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d20d374f77fdfaa0686547e2b… Author: Hwang YunSong(황윤성 <hys545(a)dreamwiz.com> Date: Mon Apr 14 09:37:05 2008 +0900 user32: Updated Korean resource. --- dlls/user32/resources/user32_Ko.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/resources/user32_Ko.rc b/dlls/user32/resources/user32_Ko.rc index c845578..9b2c307 100644 --- a/dlls/user32/resources/user32_Ko.rc +++ b/dlls/user32/resources/user32_Ko.rc @@ -62,9 +62,9 @@ BEGIN PUSHBUTTON "��(&I)", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "��(&Y)", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "�ƴϿ�(&N)", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Try Again", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Continue", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Help", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "�ٽ� �õ�(&T)", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "��(&C)," 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "��", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END MDI_MOREWINDOWS DIALOG FIXED IMPURE 20, 20, 232, 122

1 0

Aric Stewart : user32: Call ImmProcessKey in TranslateMessage to allow IMEs to handle key processing if they choose to .
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: f51542d9b5c3601dfc3266706a98f996cf909e2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f51542d9b5c3601dfc3266706… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Apr 14 12:39:28 2008 -0500 user32: Call ImmProcessKey in TranslateMessage to allow IMEs to handle key processing if they choose to. --- dlls/user32/message.c | 4 ++++ include/imm.h | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 33c12c1..7f3407e 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -35,6 +35,7 @@ #include "winnls.h" #include "dbt.h" #include "dde.h" +#include "imm.h" #include "wine/unicode.h" #include "wine/server.h" #include "user_private.h" @@ -2994,6 +2995,9 @@ BOOL WINAPI TranslateMessage( const MSG *msg ) TRACE_(key)("Translating key %s (%04lx), scancode %02x\n", SPY_GetVKeyName(msg->wParam), msg->wParam, LOBYTE(HIWORD(msg->lParam))); + if (ImmProcessKey(msg->hwnd, GetKeyboardLayout(0), msg->wParam, msg->lParam,0)) + return TRUE; + GetKeyboardState( state ); /* FIXME : should handle ToUnicode yielding 2 */ switch (ToUnicode(msg->wParam, HIWORD(msg->lParam), state, wp, 2, 0)) diff --git a/include/imm.h b/include/imm.h index 85848e6..1b4cc71 100644 --- a/include/imm.h +++ b/include/imm.h @@ -538,6 +538,7 @@ BOOL WINAPI ImmIsUIMessageA(HWND, UINT, WPARAM, LPARAM); BOOL WINAPI ImmIsUIMessageW(HWND, UINT, WPARAM, LPARAM); #define ImmIsUIMessage WINELIB_NAME_AW(ImmIsUIMessage) BOOL WINAPI ImmNotifyIME(HIMC, DWORD, DWORD, DWORD); +BOOL WINAPI ImmProcessKey(HWND, HKL, UINT, LPARAM, DWORD); BOOL WINAPI ImmRegisterWordA(HKL, LPCSTR, DWORD, LPCSTR); BOOL WINAPI ImmRegisterWordW(HKL, LPCWSTR, DWORD, LPCWSTR); #define ImmRegisterWord WINELIB_NAME_AW(ImmRegisterWord)

1 0

Alexander Nicolaysen Sørnes : winhelp: Update Norwegian Bokmål resource.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: a593d07d2d373ba904a267dbf7528db59a0a2be3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a593d07d2d373ba904a267dbf… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Apr 14 18:14:26 2008 +0200 winhelp: Update Norwegian Bokmål resource. --- programs/winhelp/No.rc | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/No.rc b/programs/winhelp/No.rc index f016efb..9f60725 100644 --- a/programs/winhelp/No.rc +++ b/programs/winhelp/No.rc @@ -1,7 +1,7 @@ /* * Help Viewer * - * Copyright 2005 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2008 Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -44,11 +44,21 @@ MAIN_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL MENUITEM SEPARATOR MENUITEM "&Informasjon . . .", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "&om WINE", MNID_HELP_WINE + MENUITEM "&Om WINE", MNID_HELP_WINE #endif } } +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Innhold" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER + PUSHBUTTON "&OK", IDOK, 40, 170, 50, 12 + PUSHBUTTON "&Avbryt", IDCANCEL, 120, 170, 50, 12 +} + /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL {

1 0

Hwang YunSong(황윤성 : winemine: Updated Korean resource.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 0928df2483b6b428756641bf713168e106ee839b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0928df2483b6b428756641bf7… Author: Hwang YunSong(황윤성 <hys545(a)dreamwiz.com> Date: Mon Apr 14 09:35:17 2008 +0900 winemine: Updated Korean resource. --- programs/winemine/Ko.rc | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/winemine/Ko.rc b/programs/winemine/Ko.rc index bd27674..7ec4cb0 100644 --- a/programs/winemine/Ko.rc +++ b/programs/winemine/Ko.rc @@ -53,7 +53,6 @@ DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "�� ð�" -FONT 8, "MS Shell Dlg" { GROUPBOX "�ִ� �ð�", IDIGNORE, 10, 10, 140, 45 LTEXT "�ʺ��", IDIGNORE, 20, 20, 40, 8 @@ -72,7 +71,6 @@ DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "��մϴ�!" -FONT 8, "MS Shell Dlg" { LTEXT "�� ̸�� ּ��", IDIGNORE, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 @@ -83,7 +81,6 @@ DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "�� " -FONT 8, "MS Shell Dlg" { LTEXT "��", IDIGNORE, 5, 5, 30, 10 LTEXT "��", IDIGNORE, 5, 35, 30, 10

1 0

Maarten Lankhorst : include: Add dvdmedia stub header.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 271f2eda14a1345044df11deeedb735435ad1015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=271f2eda14a1345044df11dee… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 11 15:03:33 2008 -0700 include: Add dvdmedia stub header. --- include/Makefile.in | 1 + include/dvdmedia.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 11ee8b6..d03f7cf 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -180,6 +180,7 @@ SRCDIR_INCLUDES = \ dshow.h \ dsound.h \ dsrole.h \ + dvdmedia.h \ dwmapi.h \ dxdiag.h \ dxerr8.h \ diff --git a/include/dvdmedia.h b/include/dvdmedia.h new file mode 100644 index 0000000..9a29994 --- /dev/null +++ b/include/dvdmedia.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2008 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __DVDMEDIA_H__ +#define __DVDMEDIA_H__ + +#define AMCONTROL_USED 0x00000001 +#define AMCONTROL_PAD_TO_4x3 0x00000002 +#define AMCONTROL_PAD_TO_16x9 0x00000004 + +typedef struct tagVIDEOINFOHEADER2 { + RECT rcSource; + RECT rcTarget; + DWORD dwBitRate; + DWORD dwBitErrorRate; + REFERENCE_TIME AvgTimePerFrame; + DWORD dwInterlaceFlags; + DWORD dwCopyProtectFlags; + DWORD dwPictAspectRatioX; + DWORD dwPictAspectRatioY; + union { + DWORD dwControlFlags; + DWORD dwReserved1; + } DUMMYUNIONNAME; + DWORD dwReserved2; + BITMAPINFOHEADER bmiHeader; +} VIDEOINFOHEADER2; + +#endif /* __DVDMEDIA_H__ */

1 0

Alexander Nicolaysen Sørnes : regedit: Update Norwegian Bokmål resource.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: a4649d37301a657dbdda88500031224881a64347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4649d37301a657dbdda88500… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Apr 14 18:01:44 2008 +0200 regedit: Update Norwegian Bokmål resource. --- programs/regedit/No.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/No.rc b/programs/regedit/No.rc index 0ee4d36..ee57f2a 100644 --- a/programs/regedit/No.rc +++ b/programs/regedit/No.rc @@ -201,7 +201,7 @@ CAPTION "Rediger bin FONT 8, "MS Shell Dlg" BEGIN LTEXT "Verdinavn:",IDC_STATIC,5,5,119,8 - EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | WS_DISABLED + EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL | WS_DISABLED LTEXT "Verdidata:",IDC_STATIC,5,30,90,8 CONTROL "",IDC_VALUE_DATA,"HexEdit",WS_TABSTOP,4,40,160,40 DEFPUSHBUTTON "OK",IDOK,140,80,30,11,WS_GROUP

1 0

Maarten Lankhorst : quartz: Silence requests for IVideoWindow.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 5fb4224f81c8b18ede56dd723c68fb74b76b83a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb4224f81c8b18ede56dd723… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Apr 10 15:38:56 2008 -0700 quartz: Silence requests for IVideoWindow. --- dlls/quartz/dsoundrender.c | 2 +- dlls/quartz/filesource.c | 2 +- dlls/quartz/nullrenderer.c | 2 +- dlls/quartz/parser.c | 2 +- dlls/quartz/transform.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 529f836..a199e5f 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -372,7 +372,7 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri return S_OK; } - if (!IsEqualIID(riid, &IID_IPin)) + if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); return E_NOINTERFACE; diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index b2d6838..2bb5fa7 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -394,7 +394,7 @@ static HRESULT WINAPI AsyncReader_QueryInterface(IBaseFilter * iface, REFIID rii return S_OK; } - if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IMediaSeeking)) + if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IMediaSeeking) && !IsEqualIID(riid, &IID_IVideoWindow)) FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); return E_NOINTERFACE; diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index 191771b..d871e67 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -249,7 +249,7 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown * iface, REFIID return S_OK; } - if (!IsEqualIID(riid, &IID_IPin)) + if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); return E_NOINTERFACE; diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index a369de2..37cf8ee 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -132,7 +132,7 @@ static HRESULT WINAPI Parser_QueryInterface(IBaseFilter * iface, REFIID riid, LP return S_OK; } - if (!IsEqualIID(riid, &IID_IPin)) + if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); return E_NOINTERFACE; diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index dbb84a7..df5c746 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -248,7 +248,7 @@ static HRESULT WINAPI TransformFilter_QueryInterface(IBaseFilter * iface, REFIID return S_OK; } - if (!IsEqualIID(riid, &IID_IPin)) + if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); return E_NOINTERFACE;

1 0

Maarten Lankhorst : quartz: Silence seeking fixmes on transform filter.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: ba10e6104a8f485ed40345212a325b94369525d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba10e6104a8f485ed40345212… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Apr 12 19:15:34 2008 -0700 quartz: Silence seeking fixmes on transform filter. --- dlls/quartz/transform.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index df5c746..936d96d 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -139,21 +139,25 @@ static const IMediaSeekingVtbl TransformFilter_Seeking_Vtbl = MediaSeekingImpl_GetPreroll }; +/* These shouldn't be implemented by default. + * Usually only source filters should implement these + * and even it's not needed all of the time + */ static HRESULT TransformFilter_ChangeCurrent(IBaseFilter *iface) { - FIXME("(%p) filter hasn't implemented current position change!\n", iface); + TRACE("(%p) filter hasn't implemented current position change!\n", iface); return S_OK; } static HRESULT TransformFilter_ChangeStop(IBaseFilter *iface) { - FIXME("(%p) filter hasn't implemented stop position change!\n", iface); + TRACE("(%p) filter hasn't implemented stop position change!\n", iface); return S_OK; } static HRESULT TransformFilter_ChangeRate(IBaseFilter *iface) { - FIXME("(%p) filter hasn't implemented rate change!\n", iface); + TRACE("(%p) filter hasn't implemented rate change!\n", iface); return S_OK; }

1 0

Maarten Lankhorst : quartz: Bring waveparser to the same level as the mpeg splitter.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: ebe438c82a017e20500bc7c725cb12f83f70123f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebe438c82a017e20500bc7c72… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Apr 12 16:52:26 2008 -0700 quartz: Bring waveparser to the same level as the mpeg splitter. --- dlls/quartz/waveparser.c | 151 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 127 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 55fad4c..7f4a96f 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -48,10 +48,32 @@ typedef struct WAVEParserImpl LONGLONG StartOfFile; /* in media time */ LONGLONG EndOfFile; DWORD dwSampleSize; - FLOAT fSamplesPerSec; + DWORD nSamplesPerSec; DWORD dwLength; } WAVEParserImpl; +static LONGLONG bytepos_to_duration(WAVEParserImpl *This, LONGLONG bytepos) +{ + LONGLONG duration = BYTES_FROM_MEDIATIME(bytepos - This->StartOfFile); + duration *= 10000000; + duration /= (This->dwSampleSize * This->nSamplesPerSec); + + return duration; +} + +static LONGLONG duration_to_bytepos(WAVEParserImpl *This, LONGLONG duration) +{ + LONGLONG bytepos; + + bytepos = (This->dwSampleSize * This->nSamplesPerSec); + bytepos *= duration; + bytepos /= 10000000; + bytepos += BYTES_FROM_MEDIATIME(This->StartOfFile); + bytepos -= bytepos % This->dwSampleSize; + + return MEDIATIME_FROM_BYTES(bytepos); +} + static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample) { WAVEParserImpl *This = (WAVEParserImpl *)iface; @@ -65,7 +87,7 @@ static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample) long cbDstStream; long chunk_remaining_bytes = 0; long offset_src = 0; - + hr = IMediaSample_GetPointer(pSample, &pbSrcStream); hr = IMediaSample_GetTime(pSample, &tStart, &tStop); @@ -76,17 +98,36 @@ static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample) pOutputPin = (Parser_OutputPin *)This->Parser.ppPins[1]; + /* Try to get rid of the current sample in case we had a S_FALSE last time */ + if (This->pCurrentSample && (IMediaSample_GetActualDataLength(This->pCurrentSample) == IMediaSample_GetSize(This->pCurrentSample))) + { + HRESULT hr; + + /* Unset advancement */ + This->Parser.pInputPin->rtCurrent -= MEDIATIME_FROM_BYTES(cbSrcStream); + + hr = OutputPin_SendSample(&pOutputPin->pin, This->pCurrentSample); + + if (hr != S_OK) + return hr; + + IMediaSample_Release(This->pCurrentSample); + This->pCurrentSample = NULL; + + This->Parser.pInputPin->rtCurrent += MEDIATIME_FROM_BYTES(cbSrcStream); + } + if (tStop < This->StartOfFile) - return S_OK; + return S_OK; if (tStart < This->StartOfFile) - offset_src = BYTES_FROM_MEDIATIME(This->StartOfFile - tStart); + offset_src = BYTES_FROM_MEDIATIME(This->StartOfFile - tStart); while (bMoreData) { if (!This->pCurrentSample) { - /* cache media sample until it is ready to be despatched + /* cache media sample until it is ready to be dispatched * (i.e. we reach the end of the chunk) */ hr = OutputPin_GetDeliveryBuffer(&pOutputPin->pin, &This->pCurrentSample, NULL, NULL, 0); @@ -126,36 +167,42 @@ static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample) if (SUCCEEDED(hr)) { - REFERENCE_TIME tAviStart, tAviStop; + REFERENCE_TIME tAviStart, tAviStop, tOffset; /* FIXME: hack */ if (pOutputPin->dwSamplesProcessed == 0) { IMediaSample_SetDiscontinuity(This->pCurrentSample, TRUE); - IMediaSample_SetSyncPoint(This->pCurrentSample, TRUE); } - + IMediaSample_SetSyncPoint(This->pCurrentSample, TRUE); pOutputPin->dwSamplesProcessed++; - if (This->dwSampleSize) - tAviStart = (LONGLONG)ceil(10000000.0 * (float)(pOutputPin->dwSamplesProcessed - 1) * (float)IMediaSample_GetActualDataLength(This->pCurrentSample) / ((float)This->dwSampleSize * This->fSamplesPerSec)); - else - tAviStart = (LONGLONG)ceil(10000000.0 * (float)(pOutputPin->dwSamplesProcessed - 1) / (float)This->fSamplesPerSec); - if (This->dwSampleSize) - tAviStop = (LONGLONG)ceil(10000000.0 * (float)pOutputPin->dwSamplesProcessed * (float)IMediaSample_GetActualDataLength(This->pCurrentSample) / ((float)This->dwSampleSize * This->fSamplesPerSec)); - else - tAviStop = (LONGLONG)ceil(10000000.0 * (float)pOutputPin->dwSamplesProcessed / (float)This->fSamplesPerSec); + tOffset = MEDIATIME_FROM_BYTES(offset_src + chunk_remaining_bytes - IMediaSample_GetActualDataLength(This->pCurrentSample)); + tAviStart = bytepos_to_duration(This, tStart + tOffset); + + tOffset += MEDIATIME_FROM_BYTES(IMediaSample_GetActualDataLength(This->pCurrentSample)); + tAviStop = bytepos_to_duration(This, tStart + tOffset); IMediaSample_SetTime(This->pCurrentSample, &tAviStart, &tAviStop); hr = OutputPin_SendSample(&pOutputPin->pin, This->pCurrentSample); - if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) + if (hr != S_OK && hr != VFW_E_NOT_CONNECTED && hr != S_FALSE) ERR("Error sending sample (%x)\n", hr); } - if (This->pCurrentSample) + if (This->pCurrentSample && hr != S_FALSE) + { IMediaSample_Release(This->pCurrentSample); - - This->pCurrentSample = NULL; + This->pCurrentSample = NULL; + } + if (hr == S_FALSE) + { + /* Break out */ + offset_src += chunk_remaining_bytes; + This->Parser.pInputPin->rtCurrent -= BYTES_FROM_MEDIATIME(cbSrcStream - offset_src); + hr = S_OK; + break; + } + } else { @@ -169,7 +216,7 @@ static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample) offset_src += chunk_remaining_bytes; } - if (tStop >= This->EndOfFile) + if (tStop >= This->EndOfFile || (bytepos_to_duration(This, tStop) >= This->Parser.mediaSeeking.llStop)) { int i; @@ -213,6 +260,54 @@ static HRESULT WAVEParser_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt) return S_FALSE; } +static HRESULT WAVEParserImpl_seek(IBaseFilter *iface) +{ + WAVEParserImpl *This = (WAVEParserImpl *)iface; + PullPin *pPin = This->Parser.pInputPin; + IPin *victim = NULL; + LONGLONG newpos, curpos, endpos, bytepos; + + newpos = This->Parser.mediaSeeking.llCurrent; + curpos = bytepos_to_duration(This, pPin->rtCurrent); + endpos = bytepos_to_duration(This, This->EndOfFile); + bytepos = duration_to_bytepos(This, newpos); + + if (newpos > endpos) + { + WARN("Requesting position %x%08x beyond end of stream %x%08x\n", (DWORD)(newpos>>32), (DWORD)newpos, (DWORD)(endpos>>32), (DWORD)endpos); + return E_INVALIDARG; + } + + if (curpos/1000000 == newpos/1000000) + { + TRACE("Requesting position %x%08x same as current position %x%08x\n", (DWORD)(newpos>>32), (DWORD)newpos, (DWORD)(curpos>>32), (DWORD)curpos); + return S_OK; + } + + TRACE("Moving sound to %08u bytes!\n", (DWORD)BYTES_FROM_MEDIATIME(bytepos)); + + EnterCriticalSection(&pPin->thread_lock); + IPin_BeginFlush((IPin *)pPin); + + /* Make sure this is done while stopped, BeginFlush takes care of this */ + EnterCriticalSection(&This->Parser.csFilter); + IPin_ConnectedTo(This->Parser.ppPins[1], &victim); + if (victim) + { + IPin_NewSegment(victim, newpos, endpos, pPin->dRate); + IPin_Release(victim); + } + + pPin->rtStart = pPin->rtCurrent = bytepos; + LeaveCriticalSection(&This->Parser.csFilter); + + TRACE("Done flushing\n"); + IPin_EndFlush((IPin *)pPin); + LeaveCriticalSection(&pPin->thread_lock); + + return S_OK; +} + static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) { PullPin *This = (PullPin *)iface; @@ -296,9 +391,17 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) pWAVEParser->dwSampleSize = ((WAVEFORMATEX*)amt.pbFormat)->nBlockAlign; IAsyncReader_Length(This->pReader, &length, &avail); pWAVEParser->dwLength = length / (ULONGLONG)pWAVEParser->dwSampleSize; - pWAVEParser->fSamplesPerSec = ((WAVEFORMATEX*)amt.pbFormat)->nAvgBytesPerSec / ((WAVEFORMATEX*)amt.pbFormat)->nBlockAlign; + pWAVEParser->nSamplesPerSec = ((WAVEFORMATEX*)amt.pbFormat)->nSamplesPerSec; hr = Parser_AddPin(&(pWAVEParser->Parser), &piOutput, &props, &amt); - + CoTaskMemFree(amt.pbFormat); + + pWAVEParser->Parser.mediaSeeking.llCurrent = 0; + pWAVEParser->Parser.mediaSeeking.llStop = pWAVEParser->Parser.mediaSeeking.llDuration = bytepos_to_duration(pWAVEParser, pWAVEParser->EndOfFile); + TRACE("Duration: %lld seconds\n", pWAVEParser->Parser.mediaSeeking.llDuration / (LONGLONG)10000000); + + This->rtStop = pWAVEParser->EndOfFile; + This->rtStart = pWAVEParser->StartOfFile; + TRACE("WAVE File ok\n"); return hr; @@ -334,7 +437,7 @@ HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv) This->pCurrentSample = NULL; - hr = Parser_Create(&(This->Parser), &CLSID_WAVEParser, WAVEParser_Sample, WAVEParser_QueryAccept, WAVEParser_InputPin_PreConnect, WAVEParser_Cleanup, NULL, NULL, NULL); + hr = Parser_Create(&(This->Parser), &CLSID_WAVEParser, WAVEParser_Sample, WAVEParser_QueryAccept, WAVEParser_InputPin_PreConnect, WAVEParser_Cleanup, NULL, WAVEParserImpl_seek, NULL); if (FAILED(hr)) return hr;

1 0

Maarten Lankhorst : quartz: Don't clean up in avi decoder if driver isn' t opened.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 48f80f629634d1bb62d1f49f4b260647c432eace URL: http://source.winehq.org/git/wine.git/?a=commit;h=48f80f629634d1bb62d1f49f4… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Apr 12 23:04:49 2008 -0700 quartz: Don't clean up in avi decoder if driver isn't opened. --- dlls/quartz/avidec.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index b8a1b19..83d212c 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -146,11 +146,14 @@ static HRESULT AVIDec_ProcessEnd(TransformFilterImpl* pTransformFilter) TRACE("(%p)->()\n", This); + if (!This->hvid) + return S_OK; + result = ICDecompressEnd(This->hvid); if (result != ICERR_OK) { ERR("Cannot stop processing (%d)\n", result); - return E_FAIL; + return E_FAIL; } return S_OK; }

1 0