winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
April 2008
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
4 participants
1278 discussions
Start a n
N
ew thread
Austin English : ole32: Spelling fixes.
by Alexandre Julliard
10 Apr '08
10 Apr '08
Module: wine Branch: master Commit: 1b24da3aa070c63b8ded0800b2745ced67dfd8bd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1b24da3aa070c63b8ded0800b…
Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 9 14:33:37 2008 -0500 ole32: Spelling fixes. --- dlls/ole32/antimoniker.c | 4 ++-- dlls/ole32/bindctx.c | 2 +- dlls/ole32/compobj.c | 4 ++-- dlls/ole32/compositemoniker.c | 6 +++--- dlls/ole32/datacache.c | 4 ++-- dlls/ole32/defaulthandler.c | 2 +- dlls/ole32/filemoniker.c | 6 +++--- dlls/ole32/ifs.c | 2 +- dlls/ole32/itemmoniker.c | 6 +++--- dlls/ole32/moniker.c | 8 ++++---- dlls/ole32/ole16.c | 2 +- dlls/ole32/pointermoniker.c | 2 +- dlls/ole32/rpc.c | 6 +++--- dlls/ole32/stg_prop.c | 2 +- dlls/ole32/storage.c | 2 +- dlls/ole32/storage32.c | 22 +++++++++++----------- dlls/ole32/storage32.h | 2 +- 17 files changed, 41 insertions(+), 41 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b24da3aa070c63b8ded0…
1
0
0
0
Maarten Lankhorst : include: Add ISeekingPassThru interface.
by Alexandre Julliard
10 Apr '08
10 Apr '08
Module: wine Branch: master Commit: 7fa1c9d024231847c3385a82d478a7b9f59b32cc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7fa1c9d024231847c3385a82d…
Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 9 11:44:46 2008 -0700 include: Add ISeekingPassThru interface. --- include/axextend.idl | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/axextend.idl b/include/axextend.idl index f262f3a..03ca187 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -982,3 +982,13 @@ interface IKsPropertySet : IUnknown [out] DWORD *pTypeSupport); } cpp_quote("#endif /* _IKsPropertySet_ */") + +[ + object, + uuid(36b73883-c2c8-11cf-8b46-00805f6cef60), + pointer_default(unique) +] +interface ISeekingPassThru : IUnknown +{ + HRESULT Init( [in] BOOL bSupportRendering, [in] IPin *pPin); +}
1
0
0
0
Maarten Lankhorst : quartz: Implement stop position in the mpeg splitter.
by Alexandre Julliard
10 Apr '08
10 Apr '08
Module: wine Branch: master Commit: 2734e6332ccceb35182c89fc8cc9d222a0b05dd0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2734e6332ccceb35182c89fc8…
Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 9 12:07:14 2008 -0700 quartz: Implement stop position in the mpeg splitter. --- dlls/quartz/mpegsplit.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 5991795..7577174 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -4,6 +4,7 @@ * Copyright 2003 Robert Shearman * Copyright 2004-2005 Christian Costa * Copyright 2007 Chris Robinson + * Copyright 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 @@ -426,16 +427,22 @@ fail: This->remaining_bytes = 0; This->Parser.pInputPin->rtCurrent = MEDIATIME_FROM_BYTES(BYTES_FROM_MEDIATIME(tStop) - cbSrcStream); - if (This->pCurrentSample) + + /* If set to S_FALSE we keep the sample, to transmit it next time */ + if (hr != S_FALSE && This->pCurrentSample) { IMediaSample_SetActualDataLength(This->pCurrentSample, 0); IMediaSample_Release(This->pCurrentSample); This->pCurrentSample = NULL; } + + /* Sample was rejected because of whatever reason (paused/flushing/etc), no need to terminate the processing */ + if (hr == S_FALSE) + hr = S_OK; break; } - if (BYTES_FROM_MEDIATIME(tStop) >= This->EndOfFile) + if (BYTES_FROM_MEDIATIME(tStop) >= This->EndOfFile || This->position >= This->Parser.mediaSeeking.llStop) { int i; @@ -742,6 +749,10 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin) TRACE("Duration: %d seconds\n", (DWORD)(duration / 10000000)); TRACE("Parsing took %u ms\n", GetTickCount() - ticks); This->duration = duration; + + This->Parser.mediaSeeking.llCurrent = 0; + This->Parser.mediaSeeking.llDuration = duration; + This->Parser.mediaSeeking.llStop = duration; break; } case MPEG_VIDEO_HEADER: @@ -829,6 +840,7 @@ static HRESULT MPEGSplitter_seek(IBaseFilter *iface) TRACE("Moving sound to %08u bytes!\n", (DWORD)bytepos); + EnterCriticalSection(&pin->thread_lock); IPin_BeginFlush((IPin *)pin); /* Make sure this is done while stopped, BeginFlush takes care of this */ @@ -848,6 +860,7 @@ static HRESULT MPEGSplitter_seek(IBaseFilter *iface) TRACE("Done flushing\n"); IPin_EndFlush((IPin *)pin); + LeaveCriticalSection(&pin->thread_lock); } return hr; }
1
0
0
0
Maarten Lankhorst : quartz: Implement stop position in the filtergraph.
by Alexandre Julliard
10 Apr '08
10 Apr '08
Module: wine Branch: master Commit: 43f9fff0a0237efa88de16e8a1ba7da9a58b09d3 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=43f9fff0a0237efa88de16e8a…
Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 9 12:00:13 2008 -0700 quartz: Implement stop position in the filtergraph. --- dlls/quartz/filtergraph.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 91b872d..94e4003 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -203,6 +203,7 @@ typedef struct _IFilterGraphImpl { GUID timeformatseek; LONGLONG start_time; LONGLONG position; + LONGLONG stop_position; } IFilterGraphImpl; static HRESULT WINAPI Filtergraph_QueryInterface(IFilterGraphImpl *This, @@ -2038,10 +2039,23 @@ static HRESULT WINAPI MediaSeeking_GetDuration(IMediaSeeking *iface, static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *pStop) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaSeeking_vtbl, iface); + HRESULT hr = S_OK; - FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pStop); + TRACE("(%p/%p)->(%p)\n", This, iface, pStop); - return S_OK; + if (!pStop) + return E_POINTER; + + EnterCriticalSection(&This->cs); + if (This->stop_position < 0) + /* Stop position not set, use duration instead */ + hr = IMediaSeeking_GetDuration(iface, pStop); + else + *pStop = This->stop_position; + + LeaveCriticalSection(&This->cs); + + return hr; } static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, @@ -2116,7 +2130,9 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, else if ((dwCurrentFlags & 0x7) != AM_SEEKING_NoPositioning) FIXME("Adjust method %x not handled yet!\n", dwCurrentFlags & 0x7); - if ((dwStopFlags & 0x7) != AM_SEEKING_NoPositioning) + if ((dwStopFlags & 0x7) == AM_SEEKING_AbsolutePositioning) + This->stop_position = *pStop; + else if ((dwStopFlags & 0x7) != AM_SEEKING_NoPositioning) FIXME("Stop position not handled yet!\n"); args.current = pCurrent; @@ -5084,6 +5100,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->nItfCacheEntries = 0; memcpy(&fimpl->timeformatseek, &TIME_FORMAT_MEDIA_TIME, sizeof(GUID)); fimpl->start_time = fimpl->position = 0; + fimpl->stop_position = -1; hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (LPVOID*)&fimpl->pFilterMapper2); if (FAILED(hr)) {
1
0
0
0
Alexandre Julliard : programs: Remove winelauncher from install rules.
by Alexandre Julliard
10 Apr '08
10 Apr '08
Module: wine Branch: master Commit: 669949251d0c7ee469433fda92aa14c6c26b0640 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=669949251d0c7ee469433fda9…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 10 09:45:44 2008 +0200 programs: Remove winelauncher from install rules. --- programs/Makefile.in | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/Makefile.in b/programs/Makefile.in index 8908930..7565590 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -141,11 +141,10 @@ install-progs.so: $(INSTALLPROGS:%=%/__installprog__) install-progs: # nothing to do here -install:: winelauncher install-progs$(DLLEXT) $(INSTALLDIRS) - $(INSTALL_SCRIPT) winelauncher $(DESTDIR)$(bindir)/winelauncher +install:: install-progs$(DLLEXT) $(INSTALLDIRS) uninstall:: - -cd $(DESTDIR)$(bindir) && $(RM) wineapploader winelauncher $(INSTALLPROGS) + -cd $(DESTDIR)$(bindir) && $(RM) wineapploader $(INSTALLPROGS) -rmdir $(DESTDIR)$(dlldir) # Rules for testing
1
0
0
0
Alexandre Julliard : user32/tests: Avoid testing uninitialized data.
by Alexandre Julliard
10 Apr '08
10 Apr '08
Module: wine Branch: master Commit: e3ac70c1cbdd9f61272900b29229218a33bf709f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e3ac70c1cbdd9f61272900b29…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 10 09:45:34 2008 +0200 user32/tests: Avoid testing uninitialized data. --- dlls/user32/tests/cursoricon.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 2febfbb..7ea79ad 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -649,13 +649,14 @@ static void test_LoadImage(void) error = GetLastError(); ok(error == 0xdeadbeef, "Last error: %u\n", error); - todo_wine { - ok(icon_info.fIcon == FALSE, "fIcon != FALSE.\n"); - ok(icon_info.xHotspot == 1, "xHotspot is %u.\n", icon_info.xHotspot); - ok(icon_info.yHotspot == 1, "yHotspot is %u.\n", icon_info.yHotspot); - ok(icon_info.hbmColor != NULL, "No hbmColor!\n"); + if (ret) + { + ok(icon_info.fIcon == FALSE, "fIcon != FALSE.\n"); + ok(icon_info.xHotspot == 1, "xHotspot is %u.\n", icon_info.xHotspot); + ok(icon_info.yHotspot == 1, "yHotspot is %u.\n", icon_info.yHotspot); + ok(icon_info.hbmColor != NULL, "No hbmColor!\n"); + ok(icon_info.hbmMask != NULL, "No hbmMask!\n"); } - ok(icon_info.hbmMask != NULL, "No hbmMask!\n"); /* Clean up. */ SetLastError(0xdeadbeef);
1
0
0
0
Tomasz Jezierski : hhctrl.ocx: Fix for writing outside allocated memory in HH_AddToolbar.
by Alexandre Julliard
09 Apr '08
09 Apr '08
Module: wine Branch: master Commit: 0b64b866a42b9a5a00f835047363ac076d24436d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0b64b866a42b9a5a00f835047…
Author: Tomasz Jezierski <developers(a)tefnet.pl> Date: Wed Apr 9 10:03:58 2008 +0200 hhctrl.ocx: Fix for writing outside allocated memory in HH_AddToolbar. --- dlls/hhctrl.ocx/help.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 3ee522e..900cfd9 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -575,7 +575,7 @@ static BOOL HH_AddToolbar(HHInfo *pHHInfo) { LPWSTR szBuf = HH_LoadString(buttons[dwIndex].idCommand); DWORD dwLen = strlenW(szBuf); - szBuf[dwLen + 2] = 0; /* Double-null terminate */ + szBuf[dwLen + 1] = 0; /* Double-null terminate */ buttons[dwIndex].iString = (DWORD)SendMessageW(hToolbar, TB_ADDSTRINGW, 0, (LPARAM)szBuf); heap_free(szBuf);
1
0
0
0
Lei Zhang : user32: Fix a typo.
by Alexandre Julliard
09 Apr '08
09 Apr '08
Module: wine Branch: master Commit: 5cc671eec57dde6659ae058af0b98b4ec1bb71eb URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5cc671eec57dde6659ae058af…
Author: Lei Zhang <thestig(a)google.com> Date: Tue Apr 8 20:10:36 2008 -0700 user32: Fix a typo. --- dlls/user32/edit.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 7fd62cc..85de02e 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -855,10 +855,8 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, if (charW == VK_RETURN || charW == VK_ESCAPE) { if (SendMessageW(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0)) - { SendMessageW(GetParent(hwnd), WM_KEYDOWN, charW, 0); - break; - } + break; } } result = EDIT_WM_Char(es, charW);
1
0
0
0
Lei Zhang : user32: Add edit control check to see if its in a dialog on WM_CHAR/VK_TAB.
by Alexandre Julliard
09 Apr '08
09 Apr '08
Module: wine Branch: master Commit: b7ffa867256f7fdf886c23a93048399bd16794ed URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b7ffa867256f7fdf886c23a93…
Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 9 11:33:32 2008 -0700 user32: Add edit control check to see if its in a dialog on WM_CHAR/VK_TAB. --- dlls/user32/edit.c | 7 ++----- dlls/user32/tests/edit.c | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index a074c17..7fd62cc 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -861,11 +861,6 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, } } } - else - { - if (charW == VK_TAB) - break; - } result = EDIT_WM_Char(es, charW); break; } @@ -4050,6 +4045,8 @@ static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c) if ((es->style & ES_MULTILINE) && !(es->style & ES_READONLY)) { static const WCHAR tabW[] = {'\t',0}; + if (EDIT_IsInsideDialog(es)) + break; EDIT_EM_ReplaceSel(es, TRUE, tabW, TRUE, TRUE); } break; diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 82c4ee0..e5a69ac 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1719,15 +1719,13 @@ static void test_tab(void) ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); r = SendMessage(hwEdit, WM_CHAR, VK_TAB, 0); - todo_wine ok(1 == r, "Expected: %d, got: %d\n", 1, r); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); /* get text */ buffer[0] = 0; r = SendMessage(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); - todo_wine { ok(1 == r, "Expected: %d, got len %d\n", 1, r); ok(0 == strcmp(buffer, "\t"), "expected \"\\t\", got \"%s\"\n", buffer); - } DestroyWindow (hwEdit); @@ -1741,7 +1739,7 @@ static void test_tab(void) ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); r = SendMessage(hwEdit, WM_CHAR, VK_TAB, 0); - todo_wine ok(1 == r, "Expected: %d, got: %d\n", 1, r); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); /* get text */ buffer[0] = 0;
1
0
0
0
Lei Zhang : user32: Add edit control check to see if its in a dialog on WM_CHAR/VK_RETURN.
by Alexandre Julliard
09 Apr '08
09 Apr '08
Module: wine Branch: master Commit: f704d5c69991d59c70859c172e903318e68536c7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f704d5c69991d59c70859c172…
Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 9 11:33:03 2008 -0700 user32: Add edit control check to see if its in a dialog on WM_CHAR/VK_RETURN. --- dlls/user32/edit.c | 38 ++++++++++++++++++++++++++++++++++---- dlls/user32/tests/edit.c | 12 +++++------- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 2159ab7..a074c17 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -863,7 +863,7 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, } else { - if (charW == VK_TAB || charW == VK_RETURN) + if (charW == VK_TAB) break; } result = EDIT_WM_Char(es, charW); @@ -3989,6 +3989,32 @@ static BOOL EDIT_EM_Undo(EDITSTATE *es) } +/* Helper function for WM_CHAR + * + * According to an MSDN blog article titled "Just because you're a control + * doesn't mean that you're necessarily inside a dialog box," multiline edit + * controls without ES_WANTRETURN would attempt to detect whether it is inside + * a dialog box or not. + */ +static BOOL EDIT_IsInsideDialog(EDITSTATE *es) +{ + WND *pParent; + BOOL r = FALSE; + + if (es->hwndParent) + { + pParent = WIN_GetPtr(es->hwndParent); + if (pParent && pParent != WND_OTHER_PROCESS && pParent != WND_DESKTOP) + { + if (pParent->flags & WIN_ISDIALOG) + r = TRUE; + WIN_ReleasePtr(pParent); + } + } + return r; +} + + /********************************************************************* * * WM_CHAR @@ -4002,9 +4028,13 @@ static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c) switch (c) { case '\r': - /* If the edit doesn't want the return and it's not a multiline edit, do nothing */ - if(!(es->style & ES_MULTILINE) && !(es->style & ES_WANTRETURN)) - break; + /* If it's not a multiline edit box, it would be ignored below. + * For multiline edit without ES_WANTRETURN, we have to make a + * special case. + */ + if ((es->style & ES_MULTILINE) && !(es->style & ES_WANTRETURN)) + if (EDIT_IsInsideDialog(es)) + break; case '\n': if (es->style & ES_MULTILINE) { if (es->style & ES_READONLY) { diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 058d9fe..82c4ee0 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1652,15 +1652,13 @@ static void test_enter(void) ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0); - todo_wine ok(1 == r, "Expected: %d, got: %d\n", 1, r); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); /* get text */ buffer[0] = 0; r = SendMessage(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); - todo_wine { ok(2 == r, "Expected: %d, got len %d\n", 2, r); ok(0 == strcmp(buffer, "\r\n"), "expected \"\\r\\n\", got \"%s\"\n", buffer); - } DestroyWindow (hwEdit); @@ -1674,7 +1672,7 @@ static void test_enter(void) ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0); - todo_wine ok(1 == r, "Expected: %d, got: %d\n", 1, r); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); /* get text */ buffer[0] = 0; @@ -1694,7 +1692,7 @@ static void test_enter(void) ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0); - todo_wine ok(1 == r, "Expected: %d, got: %d\n", 1, r); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); /* get text */ buffer[0] = 0; @@ -1844,7 +1842,7 @@ static void test_wantreturn_edit_dialog(void) r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 3); ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_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_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 5); ok(444 == r, "Expected %d, got %d\n", 444, r); @@ -1852,7 +1850,7 @@ static void test_wantreturn_edit_dialog(void) r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 6); todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 7); - 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_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 8); ok(444 == r, "Expected %d, got %d\n", 444, r); }
1
0
0
0
← Newer
1
...
82
83
84
85
86
87
88
...
128
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
Results per page:
10
25
50
100
200