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

Apostolos Alexiadis : oleaut32: Added Greek translation.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: 825e5ffb3f72407d1e91e363cc33d52f2bd25511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=825e5ffb3f72407d1e91e363c… Author: Apostolos Alexiadis <djapal(a)gmail.com> Date: Sat Apr 5 13:06:34 2008 +0300 oleaut32: Added Greek translation. --- dlls/oleaut32/oleaut32.rc | 1 + dlls/oleaut32/oleaut32_El.rc | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/oleaut32.rc b/dlls/oleaut32/oleaut32.rc index 52e5d8d..44a3641 100644 --- a/dlls/oleaut32/oleaut32.rc +++ b/dlls/oleaut32/oleaut32.rc @@ -27,6 +27,7 @@ #include "oleaut32_Bg.rc" #include "oleaut32_De.rc" #include "oleaut32_Dk.rc" +#include "oleaut32_El.rc" #include "oleaut32_En.rc" #include "oleaut32_Eo.rc" #include "oleaut32_Es.rc" diff --git a/dlls/oleaut32/oleaut32_El.rc b/dlls/oleaut32/oleaut32_El.rc new file mode 100644 index 0000000..145c1a1 --- /dev/null +++ b/dlls/oleaut32/oleaut32_El.rc @@ -0,0 +1,31 @@ +/* + * Greek resources for oleaut32 + * + * Copyright 200 Apostolos Alexiadis + * + * 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 + */ + +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "��" + IDS_FALSE "��" + IDS_YES "��" + IDS_NO "��" + IDS_ON "��" + IDS_OFF "��" +}

1 0

Apostolos Alexiadis : comctl32: Greek resources update.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: d7247a8a0570beb7a9a5fc4095f77ce9dfd35bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7247a8a0570beb7a9a5fc409… Author: Apostolos Alexiadis <djapal(a)gmail.com> Date: Sat Apr 5 13:04:19 2008 +0300 comctl32: Greek resources update. --- dlls/comctl32/comctl_El.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/comctl_El.rc b/dlls/comctl32/comctl_El.rc index 2e15156..a505620 100644 --- a/dlls/comctl32/comctl_El.rc +++ b/dlls/comctl32/comctl_El.rc @@ -24,7 +24,7 @@ CAPTION " FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "��", IDCANCEL,58,122,50,14 + PUSHBUTTON "��", IDCANCEL,58,122,50,14 PUSHBUTTON "&��", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED PUSHBUTTON "��", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 @@ -36,10 +36,10 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "��" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "< &��", IDC_BACK_BUTTON,66,138,55,14 + PUSHBUTTON "< &��", IDC_BACK_BUTTON,63,138,55,14 DEFPUSHBUTTON "&�� >", IDC_NEXT_BUTTON,121,138,55,14 DEFPUSHBUTTON "��", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "��", IDCANCEL,178,138,50,14 + PUSHBUTTON "��", IDCANCEL,178,138,50,14 PUSHBUTTON "��", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 @@ -53,7 +53,7 @@ CAPTION " FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "&��", IDCANCEL,308,6,44,14 - PUSHBUTTON "R&eset", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "�&��", IDC_RESET_BTN,308,23,44,14 PUSHBUTTON "&��", IDC_HELP_BTN,308,40,44,14 PUSHBUTTON "�� &��", IDC_MOVEUP_BTN,308,74,44,14 PUSHBUTTON "�� &��", IDC_MOVEDN_BTN,308,91,44,14

1 0

Maarten Lankhorst : quartz: Reset EcCompleteCount before starting filters.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: ee792916e0b33de1f65499d01ff5f48416fd271d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee792916e0b33de1f65499d01… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 4 15:54:56 2008 -0700 quartz: Reset EcCompleteCount before starting filters. This sends EC_COMPLETE notifications to the application after a graph has finished running for the second time. --- dlls/quartz/filtergraph.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 7c00552..1c0acc7 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1570,6 +1570,9 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) { if (This->state == State_Running) return S_OK; EnterCriticalSection(&This->cs); + if (This->state == State_Stopped) + This->EcCompleteCount = 0; + if (This->refClock) { IReferenceClock_GetTime(This->refClock, &This->start_time); @@ -1590,6 +1593,9 @@ static HRESULT WINAPI MediaControl_Pause(IMediaControl *iface) { if (This->state == State_Paused) return S_OK; EnterCriticalSection(&This->cs); + if (This->state == State_Stopped) + This->EcCompleteCount = 0; + if (This->state == State_Running && This->refClock) { LONGLONG time = This->start_time;

1 0

Maarten Lankhorst : quartz: Handle flushing and end of stream notifications for input pins.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: 01c6e64da67ffde47cd846d37d3f254f7cc56cc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c6e64da67ffde47cd846d37… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 4 16:27:29 2008 -0700 quartz: Handle flushing and end of stream notifications for input pins. --- dlls/quartz/dsoundrender.c | 96 +++++++++++++++++++++++++++---------------- dlls/quartz/nullrenderer.c | 3 + dlls/quartz/pin.c | 48 ++++++++++++++++----- dlls/quartz/pin.h | 1 + dlls/quartz/transform.c | 6 +++ dlls/quartz/videorenderer.c | 6 +++ 6 files changed, 112 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=01c6e64da67ffde47cd84…

1 0

Maarten Lankhorst : quartz: Fix past mistake to release lock during seeking and changing state.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: 3d3dcc4e07d9046a71a49309003690859b73422e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d3dcc4e07d9046a71a493090… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 4 15:54:04 2008 -0700 quartz: Fix past mistake to release lock during seeking and changing state. --- dlls/quartz/filtergraph.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 417ec3f..7c00552 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1472,9 +1472,8 @@ static HRESULT ExploreGraph(IFilterGraphImpl* pGraph, IPin* pOutputPin, fnFoundF CoTaskMemFree(ppPins); } TRACE("Doing stuff with filter %p\n", PinInfo.pFilter); - LeaveCriticalSection(&pGraph->cs); + FoundFilter(PinInfo.pFilter); - EnterCriticalSection(&pGraph->cs); } if (PinInfo.pFilter) IBaseFilter_Release(PinInfo.pFilter); @@ -1778,9 +1777,9 @@ static HRESULT all_renderers_seek(IFilterGraphImpl *This, fnFoundSeek FoundSeek, IBaseFilter_QueryInterface(pfilter, &IID_IMediaSeeking, (void**)&seek); if (!seek) continue; - LeaveCriticalSection(&This->cs); + hr = FoundSeek(This, seek, arg); - EnterCriticalSection(&This->cs); + IMediaSeeking_Release(seek); if (hr_return != E_NOTIMPL) allnotimpl = FALSE;

1 0

Maarten Lankhorst : quartz: Fix some memory leaks in the file source.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: 45bd38ece3ce8dda36ae1c3e8d5cac942b6013ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=45bd38ece3ce8dda36ae1c3e8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 4 14:32:09 2008 -0700 quartz: Fix some memory leaks in the file source. --- dlls/quartz/filesource.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 288c564..fd977f9 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -432,6 +432,8 @@ static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); This->lpVtbl = NULL; + CoTaskMemFree(This->pszFileName); + FreeMediaType(This->pmt); CoTaskMemFree(This); return 0; } @@ -639,8 +641,13 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi /* store file name & media type */ if (SUCCEEDED(hr)) { + CoTaskMemFree(This->pszFileName); + if (This->pmt) + FreeMediaType(This->pmt); + This->pszFileName = CoTaskMemAlloc((strlenW(pszFileName) + 1) * sizeof(WCHAR)); strcpyW(This->pszFileName, pszFileName); + This->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); if (!pmt) { @@ -674,7 +681,9 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi } CoTaskMemFree(This->pszFileName); + FreeMediaType(This->pmt); This->pszFileName = NULL; + This->pmt = NULL; CloseHandle(hFile); }

1 0

Maarten Lankhorst : quartz: Make FileAsyncReader_WaitForNext return an empty sample in flushing state.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: d56c50c85b96fbb13593c460572673e48c75b26a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56c50c85b96fbb13593c4605… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 4 14:30:21 2008 -0700 quartz: Make FileAsyncReader_WaitForNext return an empty sample in flushing state. --- dlls/quartz/filesource.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 8be522c..288c564 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1093,16 +1093,13 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw *ppSample = NULL; *pdwUser = 0; - /* we return immediately if flushing */ - if (This->bFlushing) - hr = VFW_E_WRONG_STATE; - - if (SUCCEEDED(hr)) + if (!This->bFlushing) { /* wait for the read to finish or timeout */ if (WaitForSingleObject(This->hEvent, dwTimeout) == WAIT_TIMEOUT) hr = VFW_E_TIMEOUT; } + if (SUCCEEDED(hr)) { EnterCriticalSection(&This->csList); @@ -1116,7 +1113,7 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw LeaveCriticalSection(&This->csList); } - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr) && !This->bFlushing) { /* get any errors */ if (!GetOverlappedResult(This->hFile, &pDataRq->ovl, &dwBytes, FALSE)) @@ -1132,7 +1129,14 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw /* no need to close event handle since we will close it when the pin is destroyed */ CoTaskMemFree(pDataRq); - + + /* Return the sample if flushing so it can be destroyed */ + if (This->bFlushing && SUCCEEDED(hr)) + { + hr = VFW_E_WRONG_STATE; + IMediaSample_SetActualDataLength(pDataRq->pSample, 0); + } + TRACE("-- %x\n", hr); return hr; }

1 0

Maarten Lankhorst : quartz: Get rid of code duplication and add a flush method.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: fab66ee7a04e8b6072888c2c53502dafa0d7ad26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fab66ee7a04e8b6072888c2c5… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 4 14:29:21 2008 -0700 quartz: Get rid of code duplication and add a flush method. --- dlls/quartz/dsoundrender.c | 34 +---------- dlls/quartz/filesource.c | 20 ++----- dlls/quartz/nullrenderer.c | 37 +---------- dlls/quartz/parser.c | 77 +++--------------------- dlls/quartz/pin.c | 141 ++++++++++++++++++++++--------------------- dlls/quartz/pin.h | 23 ++++--- dlls/quartz/transform.c | 65 +------------------- dlls/quartz/videorenderer.c | 32 +---------- 8 files changed, 105 insertions(+), 324 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fab66ee7a04e8b6072888…

1 0

Maarten Lankhorst : quartz: Add more state transitions to the filtergraph.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: 7f7c1d07527e4e9e2236fe6c7c9a5e0b12062403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f7c1d07527e4e9e2236fe6c7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 4 14:10:13 2008 -0700 quartz: Add more state transitions to the filtergraph. --- dlls/quartz/tests/filtergraph.c | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e1a6ef2..d72b7b3 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -58,17 +58,46 @@ static void rungraph(void) hr = IMediaControl_Run(pmc); ok(hr==S_FALSE, "Cannot run the graph returned: %x\n", hr); - Sleep(100); + Sleep(10); /* Crash fun */ + trace("run -> stop\n"); hr = IMediaControl_Stop(pmc); ok(hr==S_OK || hr == S_FALSE, "Cannot stop the graph returned: %x\n", hr); - hr = IMediaControl_Run(pmc); - ok(hr==S_OK || hr == S_FALSE, "Cannot start the graph returned: %x\n", hr); + + Sleep(10); + trace("stop -> pause\n"); hr = IMediaControl_Pause(pmc); + ok(hr==S_OK || hr == S_FALSE, "Cannot start the graph returned: %x\n", hr); + + Sleep(10); + trace("pause -> run\n"); + hr = IMediaControl_Run(pmc); ok(hr==S_OK || hr == S_FALSE, "Cannot pause the graph returned: %x\n", hr); + + Sleep(10); + trace("run -> pause\n"); + hr = IMediaControl_Pause(pmc); + ok(hr==S_OK || hr == S_FALSE, "Cannot start the graph returned: %x\n", hr); + + Sleep(10); + trace("pause -> stop\n"); + hr = IMediaControl_Stop(pmc); + ok(hr==S_OK || hr == S_FALSE, "Cannot start the graph returned: %x\n", hr); + + Sleep(10); + trace("pause -> run\n"); + hr = IMediaControl_Run(pmc); + ok(hr==S_OK || hr == S_FALSE, "Cannot start the graph returned: %x\n", hr); + + trace("run -> stop\n"); + hr = IMediaControl_Stop(pmc); + ok(hr==S_OK || hr == S_FALSE, "Cannot start the graph returned: %x\n", hr); + + trace("stop -> run\n"); hr = IMediaControl_Run(pmc); ok(hr==S_OK || hr == S_FALSE, "Cannot start the graph returned: %x\n", hr); + hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaEvent, (LPVOID*)&pme); ok(hr==S_OK, "Cannot get IMediaEvent interface returned: %x\n", hr);

1 0

Maarten Lankhorst : dsound: Hold lock in GetStatus.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: 98933362f379e8a108703d9d5631f86e1c788fd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98933362f379e8a108703d9d5… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 2 15:01:27 2008 -0700 dsound: Hold lock in GetStatus. --- dlls/dsound/buffer.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index bb08f4a..108636a 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -465,11 +465,13 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetStatus( } *status = 0; + RtlAcquireResourceShared(&This->lock, TRUE); if ((This->state == STATE_STARTING) || (This->state == STATE_PLAYING)) { *status |= DSBSTATUS_PLAYING; if (This->playflags & DSBPLAY_LOOPING) *status |= DSBSTATUS_LOOPING; } + RtlReleaseResource(&This->lock); TRACE("status=%x\n", *status); return DS_OK;

1 0