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

Vitaliy Margolen : regedit: Fix typo.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: 0f2d7aedd9b589db2f57103c57c9dd14477e63f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f2d7aedd9b589db2f57103c5… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Mar 27 21:42:28 2008 -0600 regedit: Fix typo. --- programs/regedit/En.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/En.rc b/programs/regedit/En.rc index 307ffcc..c8c497f 100644 --- a/programs/regedit/En.rc +++ b/programs/regedit/En.rc @@ -369,7 +369,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FILEDIALOG_IMPORT_TITLE "Import Registry File" IDS_FILEDIALOG_EXPORT_TITLE "Export Registry File" - IDS_FILEDIALOG_FILTER "Registration Files\0*.reg\0Win9x/NT4 Registration Files (REGEDIT4)\0*.reg\0All Files (*.*)\0*.*\0\0" + IDS_FILEDIALOG_FILTER "Registry Files\0*.reg\0Win9x/NT4 Registry Files (REGEDIT4)\0*.reg\0All Files (*.*)\0*.*\0\0" END STRINGTABLE DISCARDABLE

1 0

Michael Stefaniuc : kernel32: Add the NLS file for Romansh (Switzerland).
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: c90baaf7f1eca99424eead1869541d1ead3a2a7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c90baaf7f1eca99424eead186… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 28 00:57:54 2008 +0100 kernel32: Add the NLS file for Romansh (Switzerland). --- dlls/kernel32/locale_rc.rc | 2 + dlls/kernel32/nls/rmc.nls | 166 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 168 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/locale_rc.rc b/dlls/kernel32/locale_rc.rc index 5642189..01b24c6 100644 --- a/dlls/kernel32/locale_rc.rc +++ b/dlls/kernel32/locale_rc.rc @@ -134,6 +134,8 @@ #include "nls/ptb.nls" /* 0x0416 LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN */ #include "nls/ptg.nls" /* 0x0816 LANG_PORTUGUESE, SUBLANG_PORTUGUESE */ +#include "nls/rmc.nls" /* 0x0417 LANG_ROMANSH, SUBLANG_ROMANSH_SWITZERLAND */ + #include "nls/rom.nls" /* 0x0418 LANG_ROMANIAN, SUBLANG_DEFAULT */ #include "nls/rus.nls" /* 0x0419 LANG_RUSSIAN, SUBLANG_DEFAULT */ diff --git a/dlls/kernel32/nls/rmc.nls b/dlls/kernel32/nls/rmc.nls new file mode 100644 index 0000000..fb09800 --- /dev/null +++ b/dlls/kernel32/nls/rmc.nls @@ -0,0 +1,166 @@ +/* + * Locale definitions for Romansh (Switzerland) + * + * Copyright 2002 Alexandre Julliard for CodeWeavers + * Copyright 2008 Michael Stefaniuc + * + * 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 + */ + +/* +- Windows Vista (at least the NLS informations about it on www.microsoft.com) + has the wrong short date format dd/MM/yyyy e.g. 01/08/1996 instead of the + correct d-M-yyyy e.g 1-8-1996. This file uses the right short date format as + seen on http://www.liarumantscha.ch/ and in the glibc-morelocales.patch for + glibc-2.6. +- As decimal separator this file uses the "," like http://www.liarumantscha.ch/ + does and not the "." used by Windows Vista and the Swiss German language. +*/ + +#pragma code_page(1252) + +STRINGTABLE LANGUAGE LANG_ROMANSH, SUBLANG_ROMANSH_SWITZERLAND +{ + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0093\x0000\x0000\xcdd4" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "41" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "2" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "0" + LOCALE_IDEFAULTANSICODEPAGE "1252" + LOCALE_IDEFAULTCODEPAGE "850" + LOCALE_IDEFAULTCOUNTRY "41" + LOCALE_IDEFAULTEBCDICCODEPAGE "20273" + LOCALE_IDEFAULTLANGUAGE "0417" + LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTUNIXCODEPAGE "28605" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "2" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0417" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "0" + LOCALE_INEGCURR "2" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "0" + LOCALE_INEGSIGNPOSN "4" + LOCALE_INEGSYMPRECEDES "1" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "4" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "1" + LOCALE_S1159 "" + LOCALE_S2359 "" + LOCALE_SABBREVCTRYNAME "CHE" + LOCALE_SABBREVDAYNAME1 "gli" + LOCALE_SABBREVDAYNAME2 "ma" + LOCALE_SABBREVDAYNAME3 "me" + LOCALE_SABBREVDAYNAME4 "gie" + LOCALE_SABBREVDAYNAME5 "ve" + LOCALE_SABBREVDAYNAME6 "so" + LOCALE_SABBREVDAYNAME7 "du" + LOCALE_SABBREVLANGNAME "RMC" + LOCALE_SABBREVMONTHNAME1 "schan" + LOCALE_SABBREVMONTHNAME2 "favr" + LOCALE_SABBREVMONTHNAME3 "mars" + LOCALE_SABBREVMONTHNAME4 "avr" + LOCALE_SABBREVMONTHNAME5 "matg" + LOCALE_SABBREVMONTHNAME6 "zercl" + LOCALE_SABBREVMONTHNAME7 "fan" + LOCALE_SABBREVMONTHNAME8 "avust" + LOCALE_SABBREVMONTHNAME9 "sett" + LOCALE_SABBREVMONTHNAME10 "oct" + LOCALE_SABBREVMONTHNAME11 "nov" + LOCALE_SABBREVMONTHNAME12 "dec" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Switzerland" + LOCALE_SCURRENCY "fr." + LOCALE_SDATE "-" + LOCALE_SDAYNAME1 "glindesdi" + LOCALE_SDAYNAME2 "mardi" + LOCALE_SDAYNAME3 "mesemna" + LOCALE_SDAYNAME4 "gievgia" + LOCALE_SDAYNAME5 "venderdi" + LOCALE_SDAYNAME6 "sonda" + LOCALE_SDAYNAME7 "dumengia" + LOCALE_SDECIMAL "," + LOCALE_SENGCOUNTRY "Switzerland" + LOCALE_SENGCURRNAME "Swiss Franc" + LOCALE_SENGLANGUAGE "Romansh" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "CHF" + LOCALE_SISO3166CTRYNAME "CH" + LOCALE_SISO639LANGNAME "rm" + LOCALE_SLANGUAGE "Romansh (Switzerland)" + LOCALE_SLIST ";" + LOCALE_SLONGDATE "dddd, d MMMM yyyy" + LOCALE_SMONDECIMALSEP "," + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "schaner" + LOCALE_SMONTHNAME2 "favrer" + LOCALE_SMONTHNAME3 "mars" + LOCALE_SMONTHNAME4 "avrigl" + LOCALE_SMONTHNAME5 "matg" + LOCALE_SMONTHNAME6 "zercladur" + LOCALE_SMONTHNAME7 "fanadur" + LOCALE_SMONTHNAME8 "avust" + LOCALE_SMONTHNAME9 "settember" + LOCALE_SMONTHNAME10 "october" + LOCALE_SMONTHNAME11 "november" + LOCALE_SMONTHNAME12 "december" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "'" + LOCALE_SNAME "rm-CH" + LOCALE_SNATIVECTRYNAME "Svizra" + LOCALE_SNATIVECURRNAME "Franc svizzer" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVELANGNAME "Rumantsch (Svizra)" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSHORTDATE "dd-MM-yyyy" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "'" + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "MMMM yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +}

1 0

Michael Stefaniuc : user32: About dialog cosmetic fixes for the Romanian translation too.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: 4174053fbc0a4b0451f54a9f2c5e1a44009b594d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4174053fbc0a4b0451f54a9f2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 28 00:51:17 2008 +0100 user32: About dialog cosmetic fixes for the Romanian translation too. --- dlls/user32/resources/user32_Ro.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/resources/user32_Ro.rc b/dlls/user32/resources/user32_Ro.rc index b2b7cd3..91aa557 100644 --- a/dlls/user32/resources/user32_Ro.rc +++ b/dlls/user32/resources/user32_Ro.rc @@ -33,7 +33,7 @@ SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE MENUITEM SEPARATOR MENUITEM "&Comută la ...\tCtrl-Esc", 61744 MENUITEM SEPARATOR - MENUITEM "&Despre WINE ...", 61761 + MENUITEM "&Despre Wine ...", 61761 MENUITEM SEPARATOR MENUITEM "&Pune 'Debug mark' în jurnalul de depanare", 61762 }

1 0

Michael Stefaniuc : wrc: Add the code page mapping for LANG_ROMANSH.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: 865c31b81143676fcad794d9ab0745c8a5cc0b8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=865c31b81143676fcad794d9a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 28 00:51:51 2008 +0100 wrc: Add the code page mapping for LANG_ROMANSH. --- tools/wrc/utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 24f589e..58d6124 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -405,6 +405,7 @@ static const struct lang2cp lang2cps[] = { LANG_PORTUGUESE, SUBLANG_NEUTRAL, 1252 }, { LANG_PUNJABI, SUBLANG_NEUTRAL, 0 }, { LANG_ROMANIAN, SUBLANG_NEUTRAL, 1250 }, + { LANG_ROMANSH, SUBLANG_NEUTRAL, 1252 }, { LANG_RUSSIAN, SUBLANG_NEUTRAL, 1251 }, { LANG_SANSKRIT, SUBLANG_NEUTRAL, 0 }, { LANG_SERBIAN, SUBLANG_NEUTRAL, 1250 },

1 0

Maarten Lankhorst : quartz: Change name from Start position to Current position in MediaSeeking.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: cc3ef90db000235f8de7a6692e9db79eda9680f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc3ef90db000235f8de7a6692… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Mar 27 16:27:53 2008 -0700 quartz: Change name from Start position to Current position in MediaSeeking. --- dlls/quartz/control.c | 32 ++++++++++++++++---------------- dlls/quartz/control_private.h | 8 +++----- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c index d32d054..6e5cb0d 100644 --- a/dlls/quartz/control.c +++ b/dlls/quartz/control.c @@ -95,23 +95,23 @@ out: } -HRESULT MediaSeekingImpl_Init(IBaseFilter *pUserData, CHANGEPROC fnChangeStop, CHANGEPROC fnChangeStart, CHANGEPROC fnChangeRate, MediaSeekingImpl * pSeeking, PCRITICAL_SECTION crit_sect) +HRESULT MediaSeekingImpl_Init(IBaseFilter *pUserData, CHANGEPROC fnChangeStop, CHANGEPROC fnChangeCurrent, CHANGEPROC fnChangeRate, MediaSeekingImpl * pSeeking, PCRITICAL_SECTION crit_sect) { - assert(fnChangeStop && fnChangeStart && fnChangeRate); + assert(fnChangeStop && fnChangeCurrent && fnChangeRate); pSeeking->refCount = 1; pSeeking->pUserData = pUserData; pSeeking->fnChangeRate = fnChangeRate; pSeeking->fnChangeStop = fnChangeStop; - pSeeking->fnChangeStart = fnChangeStart; + pSeeking->fnChangeCurrent = fnChangeCurrent; pSeeking->dwCapabilities = AM_SEEKING_CanSeekForwards | AM_SEEKING_CanSeekBackwards | AM_SEEKING_CanSeekAbsolute | AM_SEEKING_CanGetStopPos | AM_SEEKING_CanGetDuration; - pSeeking->llStart = 0; + pSeeking->llCurrent = 0; pSeeking->llStop = ((ULONGLONG)0x80000000) << 32; - pSeeking->llDuration = pSeeking->llStop - pSeeking->llStart; + pSeeking->llDuration = pSeeking->llStop; pSeeking->dRate = 1.0; pSeeking->timeformat = TIME_FORMAT_MEDIA_TIME; pSeeking->crst = crit_sect; @@ -306,7 +306,7 @@ HRESULT WINAPI MediaSeekingImpl_GetCurrentPosition(IMediaSeeking * iface, LONGLO TRACE("(%p)\n", pCurrent); EnterCriticalSection(This->crst); - *pCurrent = This->llStart; + *pCurrent = This->llCurrent; ForwardCmdSeek(This->pUserData, fwd_getcurposition, pCurrent); LeaveCriticalSection(This->crst); @@ -344,31 +344,31 @@ static inline LONGLONG Adjust(LONGLONG value, const LONGLONG * pModifier, DWORD HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * pCurrent, DWORD dwCurrentFlags, LONGLONG * pStop, DWORD dwStopFlags) { MediaSeekingImpl *This = (MediaSeekingImpl *)iface; - BOOL bChangeStart = FALSE, bChangeStop = FALSE; - LONGLONG llNewStart, llNewStop; + BOOL bChangeCurrent = FALSE, bChangeStop = FALSE; + LONGLONG llNewCurrent, llNewStop; TRACE("(%p, %x, %p, %x)\n", pCurrent, dwCurrentFlags, pStop, dwStopFlags); EnterCriticalSection(This->crst); - llNewStart = Adjust(This->llStart, pCurrent, dwCurrentFlags); + llNewCurrent = Adjust(This->llCurrent, pCurrent, dwCurrentFlags); llNewStop = Adjust(This->llStop, pStop, dwStopFlags); - if (llNewStart != This->llStart) - bChangeStart = TRUE; + if (llNewCurrent != This->llCurrent) + bChangeCurrent = TRUE; if (llNewStop != This->llStop) bChangeStop = TRUE; - This->llStart = llNewStart; + This->llCurrent = llNewCurrent; This->llStop = llNewStop; if (dwCurrentFlags & AM_SEEKING_ReturnTime) - *pCurrent = llNewStart; + *pCurrent = llNewCurrent; if (dwStopFlags & AM_SEEKING_ReturnTime) *pStop = llNewStop; - if (bChangeStart) - This->fnChangeStart(This->pUserData); + if (bChangeCurrent) + This->fnChangeCurrent(This->pUserData); if (bChangeStop) This->fnChangeStop(This->pUserData); @@ -384,7 +384,7 @@ HRESULT WINAPI MediaSeekingImpl_GetPositions(IMediaSeeking * iface, LONGLONG * p TRACE("(%p, %p)\n", pCurrent, pStop); EnterCriticalSection(This->crst); - *pCurrent = This->llStart; + *pCurrent = This->llCurrent; *pStop = This->llStop; LeaveCriticalSection(This->crst); diff --git a/dlls/quartz/control_private.h b/dlls/quartz/control_private.h index 80e550d..15855d6 100644 --- a/dlls/quartz/control_private.h +++ b/dlls/quartz/control_private.h @@ -27,18 +27,16 @@ typedef struct MediaSeekingImpl ULONG refCount; IBaseFilter *pUserData; CHANGEPROC fnChangeStop; - CHANGEPROC fnChangeStart; + CHANGEPROC fnChangeCurrent; CHANGEPROC fnChangeRate; DWORD dwCapabilities; double dRate; - LONGLONG llStart; - LONGLONG llStop; - LONGLONG llDuration; /* FIXME: needed? */ + LONGLONG llCurrent, llStop, llDuration; GUID timeformat; PCRITICAL_SECTION crst; } MediaSeekingImpl; -HRESULT MediaSeekingImpl_Init(IBaseFilter *pUserData, CHANGEPROC fnChangeStop, CHANGEPROC fnChangeStart, CHANGEPROC fnChangeRate, MediaSeekingImpl * pSeeking, PCRITICAL_SECTION crit_sect); +HRESULT MediaSeekingImpl_Init(IBaseFilter *pUserData, CHANGEPROC fnChangeStop, CHANGEPROC fnChangeCurrent, CHANGEPROC fnChangeRate, MediaSeekingImpl * pSeeking, PCRITICAL_SECTION crit_sect); HRESULT WINAPI MediaSeekingImpl_GetCapabilities(IMediaSeeking * iface, DWORD * pCapabilities); HRESULT WINAPI MediaSeekingImpl_CheckCapabilities(IMediaSeeking * iface, DWORD * pCapabilities);

1 0

Maarten Lankhorst : quartz: Add GetCurrentPosition using the reference clock.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: 39623a403a99ee32ba3d16d2db316544dccb417e URL: http://source.winehq.org/git/wine.git/?a=commit;h=39623a403a99ee32ba3d16d2d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Mar 27 16:28:51 2008 -0700 quartz: Add GetCurrentPosition using the reference clock. --- dlls/quartz/filtergraph.c | 43 +++++++++++++++++++++++++++++++++++++- dlls/quartz/tests/filtergraph.c | 37 +++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 9b37594..4371a36 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -199,6 +199,8 @@ typedef struct _IFilterGraphImpl { BOOL bUnkOuterValid; BOOL bAggregatable; GUID timeformatseek; + LONGLONG start_time; + LONGLONG position; } IFilterGraphImpl; static HRESULT WINAPI Filtergraph_QueryInterface(IFilterGraphImpl *This, @@ -1517,7 +1519,7 @@ static HRESULT SendFilterMessage(IMediaControl *iface, fnFoundFilter FoundFilter /* Explorer the graph from source filters to renderers, determine renderers * number and run filters from renderers to source filters */ - This->nRenderers = 0; + This->nRenderers = 0; ResetEvent(This->hEventCompletion); for(i = 0; i < This->nFilters; i++) @@ -1567,6 +1569,13 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) { if (This->state == State_Running) return S_OK; EnterCriticalSection(&This->cs); + if (This->refClock) + { + IReferenceClock_GetTime(This->refClock, &This->start_time); + This->start_time += 500000; + } + else This->position = This->start_time = 0; + SendFilterMessage(iface, SendRun); This->state = State_Running; LeaveCriticalSection(&This->cs); @@ -1580,6 +1589,13 @@ static HRESULT WINAPI MediaControl_Pause(IMediaControl *iface) { if (This->state == State_Paused) return S_OK; EnterCriticalSection(&This->cs); + if (This->state == State_Running && This->refClock) + { + LONGLONG time = This->start_time; + IReferenceClock_GetTime(This->refClock, &time); + This->position += time - This->start_time; + } + SendFilterMessage(iface, SendPause); This->state = State_Paused; LeaveCriticalSection(&This->cs); @@ -1593,6 +1609,13 @@ static HRESULT WINAPI MediaControl_Stop(IMediaControl *iface) { if (This->state == State_Stopped) return S_OK; EnterCriticalSection(&This->cs); + if (This->state == State_Running && This->refClock) + { + LONGLONG time = This->start_time; + IReferenceClock_GetTime(This->refClock, &time); + This->position += time - This->start_time; + } + if (This->state == State_Running) SendFilterMessage(iface, SendPause); SendFilterMessage(iface, SendStop); This->state = State_Stopped; @@ -1952,8 +1975,23 @@ static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *pCurrent) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaSeeking_vtbl, iface); + LONGLONG time = 0; + + if (!pCurrent) + return E_POINTER; - FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pCurrent); + if (This->state == State_Running && This->refClock) + { + IReferenceClock_GetTime(This->refClock, &time); + if (time) + time += This->position - This->start_time; + if (time < This->position) + time = This->position; + *pCurrent = time; + } + else + *pCurrent = This->position; + TRACE("Time: %lld.%03lld\n", *pCurrent / 10000000, (*pCurrent / 10000)%1000); return S_OK; } @@ -4933,6 +4971,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IFilterGraphImpl.cs"); fimpl->nItfCacheEntries = 0; memcpy(&fimpl->timeformatseek, &TIME_FORMAT_MEDIA_TIME, sizeof(GUID)); + fimpl->start_time = fimpl->position = 0; hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (LPVOID*)&fimpl->pFilterMapper2); if (FAILED(hr)) { diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 2a2a806..efe12fc 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -172,6 +172,42 @@ static void test_graph_builder_addfilter(void) hr = IGraphBuilder_AddFilter(pgraph, pF, NULL); ok(hr == S_OK, "IGraphBuilder_AddFilter returned: %x\n", hr); + IMediaFilter_Release(pF); +} + +static void test_mediacontrol(void) +{ + HRESULT hr; + LONGLONG pos = 0xdeadbeef; + IMediaSeeking *seeking = NULL; + IMediaFilter *filter = NULL; + + IFilterGraph2_SetDefaultSyncSource(pgraph); + hr = IFilterGraph2_QueryInterface(pgraph, &IID_IMediaSeeking, (void**) &seeking); + ok(hr == S_OK, "QueryInterface IMediaControl failed: %08x\n", hr); + if (FAILED(hr)) + return; + + hr = IFilterGraph2_QueryInterface(pgraph, &IID_IMediaFilter, (void**) &filter); + ok(hr == S_OK, "QueryInterface IMediaFilter failed: %08x\n", hr); + if (FAILED(hr)) + { + IUnknown_Release(seeking); + return; + } + + hr = IMediaSeeking_GetCurrentPosition(seeking, &pos); + ok(hr == S_OK, "GetCurrentPosition failed: %08x\n", hr); + ok(pos == 0, "Position != 0 (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); + + IMediaFilter_SetSyncSource(filter, NULL); + pos = 0xdeadbeef; + hr = IMediaSeeking_GetCurrentPosition(seeking, &pos); + ok(hr == S_OK, "GetCurrentPosition failed: %08x\n", hr); + ok(pos == 0, "Position != 0 (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); + + IUnknown_Release(seeking); + IUnknown_Release(filter); releasefiltergraph(); } @@ -195,5 +231,6 @@ START_TEST(filtergraph) test_render_run(); test_graph_builder(); test_graph_builder_addfilter(); + test_mediacontrol(); test_filter_graph2(); }

1 0

Dan Hipschman : wininet: InternetReadFileExA should check INTERNET_FLAG_ASYNC.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: 0929593b6c96a9dd482919b56f0a39d3ed015cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0929593b6c96a9dd482919b56… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Mar 27 13:52:24 2008 -0700 wininet: InternetReadFileExA should check INTERNET_FLAG_ASYNC. --- dlls/wininet/http.c | 4 +--- dlls/wininet/tests/http.c | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index fc458d4..3980e9a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1733,9 +1733,7 @@ static DWORD HTTPREQ_ReadFileExA(WININETHANDLEHEADER *hdr, INTERNET_BUFFERSA *bu INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); - /* FIXME: IRF_ASYNC may not be the right thing to test here; - * hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC is probably better */ - if (flags & IRF_ASYNC) { + if (hdr->dwFlags & INTERNET_FLAG_ASYNC) { DWORD available = 0; NETCON_query_data_available(&req->netConnection, &available); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index fb561c4..5d42077 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -659,6 +659,8 @@ static void InternetReadFileExA_test(int flags) if (GetLastError() == ERROR_IO_PENDING) { trace("InternetReadFileEx -> PENDING\n"); + ok(flags & INTERNET_FLAG_ASYNC, + "Should not get ERROR_IO_PENDING without INTERNET_FLAG_ASYNC\n"); CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); WaitForSingleObject(hCompleteEvent, INFINITE); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE);

1 0

Dan Hipschman : wininet: HttpSendRequestExA is not a stub.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: aaecdf79bdb0fef0c04901dc03f4540ad62f3f11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaecdf79bdb0fef0c04901dc0… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Mar 27 13:51:13 2008 -0700 wininet: HttpSendRequestExA is not a stub. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 016a8f0..fc458d4 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2588,7 +2588,7 @@ BOOL WINAPI HttpSendRequestExA(HINTERNET hRequest, DWORD headerlen; LPWSTR header = NULL; - TRACE("(%p, %p, %p, %08x, %08lx): stub\n", hRequest, lpBuffersIn, + TRACE("(%p, %p, %p, %08x, %08lx)\n", hRequest, lpBuffersIn, lpBuffersOut, dwFlags, dwContext); if (lpBuffersIn)

1 0

Lei Zhang : user32: Handle WM_CHAR messages better in edit controls.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: 0fac05b97791145cc624034733ab474169640156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fac05b97791145cc62403473… Author: Lei Zhang <thestig(a)google.com> Date: Thu Mar 27 12:22:04 2008 -0700 user32: Handle WM_CHAR messages better in edit controls. --- dlls/user32/edit.c | 22 ++++++++++++++++------ dlls/user32/tests/edit.c | 6 +++--- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 0ff4e7c..dd5ba0a 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -853,12 +853,22 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, MultiByteToWideChar(CP_ACP, 0, &charA, 1, &charW, 1); } - if ((charW == VK_RETURN || charW == VK_ESCAPE) && es->hwndListBox) - { - if (SendMessageW(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0)) - SendMessageW(GetParent(hwnd), WM_KEYDOWN, charW, 0); - break; - } + if (es->hwndListBox) + { + if (charW == VK_RETURN || charW == VK_ESCAPE) + { + if (SendMessageW(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0)) + { + SendMessageW(GetParent(hwnd), WM_KEYDOWN, charW, 0); + break; + } + } + } + else + { + if (charW == VK_TAB || charW == VK_RETURN) + break; + } EDIT_WM_Char(es, charW); break; } diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 0d15641..74092be 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1296,9 +1296,9 @@ static void test_edit_dialog(void) r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 3); ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 4); - todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 5); - todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + ok(444 == r, "Expected %d, got %d\n", 444, r); /* tests for WM_KEYDOWN + WM_CHAR */ r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 6); @@ -1306,7 +1306,7 @@ static void test_edit_dialog(void) r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 7); todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 8); - todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + ok(444 == r, "Expected %d, got %d\n", 444, r); } static BOOL RegisterWindowClasses (void)

1 0

Lei Zhang : user32: Add more DrawText tests.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: bab3d82bcf0df511d07d29b525b2614465d94f3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab3d82bcf0df511d07d29b52… Author: Lei Zhang <thestig(a)google.com> Date: Thu Mar 27 10:58:08 2008 -0700 user32: Add more DrawText tests. --- dlls/user32/tests/text.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 01bd306..1e09650 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -147,6 +147,23 @@ static void test_DrawTextCalcRect(void) "rectangle should NOT be empty.\n"); } + /* More test cases from bug 12226 */ + SetRect(&rect, 0, 0, 0, 0); + textheight = DrawTextA(hdc, emptystring, -1, &rect, DT_CALCRECT | DT_LEFT | DT_SINGLELINE); + todo_wine ok(textheight, "DrawTextA error %u\n", GetLastError()); + ok(0 == rect.left, "expected 0, got %d\n", rect.left); + ok(0 == rect.right, "expected 0, got %d\n", rect.right); + ok(0 == rect.top, "expected 0, got %d\n", rect.top); + todo_wine ok(rect.bottom, "rect.bottom should not be 0\n"); + + SetRect(&rect, 0, 0, 0, 0); + textheight = DrawTextW(hdc, emptystringW, -1, &rect, DT_CALCRECT | DT_LEFT | DT_SINGLELINE); + todo_wine ok(textheight, "DrawTextW error %u\n", GetLastError()); + ok(0 == rect.left, "expected 0, got %d\n", rect.left); + ok(0 == rect.right, "expected 0, got %d\n", rect.right); + ok(0 == rect.top, "expected 0, got %d\n", rect.top); + todo_wine ok(rect.bottom, "rect.bottom should not be 0\n"); + SelectObject(hdc, hOldFont); ret = DeleteObject(hFont); ok( ret, "DeleteObject error %u\n", GetLastError());

1 0