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
August 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
2 participants
839 discussions
Start a n
N
ew thread
Kirill K. Smirnov : winhlp32: Fix parsing system header of win3.0 help file .
by Alexandre Julliard
05 Aug '08
05 Aug '08
Module: wine Branch: master Commit: 737785635268f21fab3eab8af0d0e10f9c3faddf URL:
http://source.winehq.org/git/wine.git/?a=commit;h=737785635268f21fab3eab8af…
Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Mon Aug 4 03:50:52 2008 +0400 winhlp32: Fix parsing system header of win3.0 help file. --- programs/winhlp32/hlpfile.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 2e3db2c..870bac7 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -1886,6 +1886,17 @@ static BOOL HLPFILE_SystemCommands(HLPFILE* hlpfile) hlpfile->flags = flags; hlpfile->charset = DEFAULT_CHARSET; + if (hlpfile->version <= 16) + { + char *str = (char*)buf + 0x15; + + hlpfile->lpszTitle = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1); + if (!hlpfile->lpszTitle) return FALSE; + lstrcpy(hlpfile->lpszTitle, str); + WINE_TRACE("Title: %s\n", hlpfile->lpszTitle); + /* Nothing more to parse */ + return TRUE; + } for (ptr = buf + 0x15; ptr + 4 <= end; ptr += GET_USHORT(ptr, 2) + 4) { char *str = (char*) ptr + 4;
1
0
0
0
Rico Schüller : inetmib1: Fix wrong arguments.
by Alexandre Julliard
05 Aug '08
05 Aug '08
Module: wine Branch: master Commit: c62529a7ae5e8cf679f788f9343fa558bbd2de94 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c62529a7ae5e8cf679f788f93…
Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Aug 5 13:33:00 2008 +0200 inetmib1: Fix wrong arguments. --- dlls/inetmib1/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index d19f048..3b39174 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -730,7 +730,7 @@ static void mib2IpRouteInit(void) MIB_IPFORWARDTABLE *table = HeapAlloc(GetProcessHeap(), 0, size); if (table) { - if (!GetIpForwardTable(ipRouteTable, &size, TRUE)) ipRouteTable = table; + if (!GetIpForwardTable(table, &size, TRUE)) ipRouteTable = table; else HeapFree(GetProcessHeap(), 0, table ); } } @@ -813,7 +813,7 @@ static void mib2IpNetInit(void) MIB_IPNETTABLE *table = HeapAlloc(GetProcessHeap(), 0, size); if (table) { - if (!GetIpNetTable(ipNetTable, &size, FALSE)) ipNetTable = table; + if (!GetIpNetTable(table, &size, FALSE)) ipNetTable = table; else HeapFree(GetProcessHeap(), 0, table ); } }
1
0
0
0
Paul Vriens : kernel32/tests: Show the setting of the debugger registry value.
by Alexandre Julliard
05 Aug '08
05 Aug '08
Module: wine Branch: master Commit: 0d88bf89dcc6d285949171b6c0b819f8118bbae4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0d88bf89dcc6d285949171b6c…
Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Aug 5 10:53:54 2008 +0200 kernel32/tests: Show the setting of the debugger registry value. --- dlls/kernel32/tests/debugger.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 003403f..0b943f2 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -339,6 +339,7 @@ static void test_ExitCode(void) { debugger_val=HeapAlloc(GetProcessHeap(), 0, debugger_size); RegQueryValueExA(hkey, "debugger", NULL, &debugger_type, debugger_val, &debugger_size); + trace("HKLM\\%s\\debugger is set to '%s'\n", AeDebug, debugger_val); } } else if (ret == ERROR_ACCESS_DENIED)
1
0
0
0
Alexandre Julliard : gdi32/tests: Fix some test failures on Win9x.
by Alexandre Julliard
05 Aug '08
05 Aug '08
Module: wine Branch: master Commit: 73423c1a40523abc0a0d46fa1ef19c49a4b633f5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=73423c1a40523abc0a0d46fa1…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 5 12:48:55 2008 +0200 gdi32/tests: Fix some test failures on Win9x. --- dlls/gdi32/tests/gdiobj.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index bd7a065..6f051b0 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -43,7 +43,7 @@ static void test_gdi_objects(void) */ SetLastError(0); hp = SelectObject(NULL, GetStockObject(BLACK_PEN)); - ok(!hp && GetLastError() == ERROR_INVALID_HANDLE, + ok(!hp && (GetLastError() == ERROR_INVALID_HANDLE || broken(!GetLastError())), "SelectObject(NULL DC) expected 0, ERROR_INVALID_HANDLE, got %p, %u\n", hp, GetLastError()); @@ -77,7 +77,7 @@ static void test_gdi_objects(void) /* GetObject does not SetLastError() on a null object */ SetLastError(0); i = GetObjectA(NULL, sizeof(buff), buff); - ok (!i && !GetLastError(), + ok (!i && (GetLastError() == 0 || GetLastError() == ERROR_INVALID_PARAMETER), "GetObject(NULL obj), expected 0, NO_ERROR, got %d, %u\n", i, GetLastError()); @@ -207,7 +207,7 @@ static void test_GetCurrentObject(void) hobj = GetCurrentObject(hdc, OBJ_PEN); ok(hobj == hpen, "OBJ_PEN is wrong: %p\n", hobj); hobj = GetCurrentObject(hdc, OBJ_EXTPEN); - ok(hobj == hpen, "OBJ_EXTPEN is wrong: %p\n", hobj); + ok(hobj == hpen || broken(hobj == 0) /* win9x */, "OBJ_EXTPEN is wrong: %p\n", hobj); hbrush = CreateSolidBrush(RGB(10, 20, 30)); assert(hbrush != 0); @@ -243,7 +243,7 @@ static void test_GetCurrentObject(void) hobj = GetCurrentObject(hdc, OBJ_PEN); ok(hobj == hpen, "OBJ_PEN is wrong: %p\n", hobj); hobj = GetCurrentObject(hdc, OBJ_EXTPEN); - ok(hobj == hpen, "OBJ_EXTPEN is wrong: %p\n", hobj); + ok(hobj == hpen || broken(hobj == 0) /* win9x */, "OBJ_EXTPEN is wrong: %p\n", hobj); hcs = GetColorSpace(hdc); if (hcs) @@ -254,7 +254,7 @@ static void test_GetCurrentObject(void) ok(hcs != 0, "CreateColorSpace failed\n"); SelectObject(hdc, hcs); hobj = GetCurrentObject(hdc, OBJ_COLORSPACE); - ok(hobj == hcs, "OBJ_COLORSPACE is wrong: %p\n", hobj); + ok(hobj == hcs || broken(hobj == 0) /* win9x */, "OBJ_COLORSPACE is wrong: %p\n", hobj); } hrgn = CreateRectRgn(1, 1, 100, 100);
1
0
0
0
Adam Petaccia : gdiplus: Skip the generic font tests if we don' t have the required fonts.
by Alexandre Julliard
05 Aug '08
05 Aug '08
Module: wine Branch: master Commit: e4cc0bc4229dff8374b1f7117eb2685bd265c4a9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e4cc0bc4229dff8374b1f7117…
Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Mon Aug 4 14:55:06 2008 -0400 gdiplus: Skip the generic font tests if we don't have the required fonts. --- dlls/gdiplus/tests/font.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 8ce0ec6..3d30a86 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -108,6 +108,11 @@ todo_wine { memcpy(&lfw.lfFaceName, arial, 6 * sizeof(WCHAR)); stat = GdipCreateFontFromLogfontW(hdc, &lfw, &font); + if (stat == FileNotFound) + { + skip("Arial not installed.\n"); + return; + } expect(Ok, stat); stat = GdipGetLogFontW(font, graphics, &lfw2); expect(Ok, stat); @@ -282,6 +287,11 @@ static void test_getgenerics (void) ZeroMemory(familyName, sizeof(familyName)/sizeof(WCHAR)); stat = GdipGetGenericFontFamilySansSerif (&family); + if (stat == FontFamilyNotFound) + { + skip("Microsoft Sans Serif not installed\n"); + goto serif; + } expect (Ok, stat); stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL); expect (Ok, stat); @@ -292,7 +302,13 @@ static void test_getgenerics (void) stat = GdipDeleteFontFamily (family); expect (Ok, stat); +serif: stat = GdipGetGenericFontFamilySerif (&family); + if (stat == FontFamilyNotFound) + { + skip("Times New Roman not installed\n"); + goto monospace; + } expect (Ok, stat); stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL); expect (Ok, stat); @@ -301,7 +317,13 @@ static void test_getgenerics (void) stat = GdipDeleteFontFamily (family); expect (Ok, stat); +monospace: stat = GdipGetGenericFontFamilyMonospace (&family); + if (stat == FontFamilyNotFound) + { + skip("Courier New not installed\n"); + return; + } expect (Ok, stat); stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL); expect (Ok, stat);
1
0
0
0
Roy Shea : mstask: Implemented NewWorkItem.
by Alexandre Julliard
05 Aug '08
05 Aug '08
Module: wine Branch: master Commit: 2f366935d55ec3dfaf695f3f726037bbe18c7c12 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2f366935d55ec3dfaf695f3f7…
Author: Roy Shea <royshea(a)gmail.com> Date: Mon Aug 4 11:46:14 2008 -0700 mstask: Implemented NewWorkItem. --- dlls/mstask/task_scheduler.c | 13 +++++++++++-- dlls/mstask/tests/task_scheduler.c | 8 ++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index a1d52a8..bd4cc1d 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -119,9 +119,18 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_NewWorkItem( REFIID riid, IUnknown **ppunk) { - FIXME("%p, %s, %s, %s, %p: stub\n", iface, debugstr_w(pwszTaskName), + HRESULT hr; + TRACE("(%p, %s, %s, %s, %p)\n", iface, debugstr_w(pwszTaskName), debugstr_guid(rclsid) ,debugstr_guid(riid), ppunk); - return E_NOTIMPL; + + if (!IsEqualGUID(rclsid, &CLSID_CTask)) + return CLASS_E_CLASSNOTAVAILABLE; + + if (!IsEqualGUID(riid, &IID_ITask)) + return E_NOINTERFACE; + + hr = TaskConstructor(pwszTaskName, (LPVOID *)ppunk); + return hr; } static HRESULT WINAPI MSTASK_ITaskScheduler_AddWorkItem( diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index 94614dc..5292a3c 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -49,25 +49,25 @@ static void test_NewWorkItem(void) /* Test basic task creation */ hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, &IID_ITask, (IUnknown**)&task); - todo_wine ok(hres == S_OK, "NewNetworkItem failed: %08x\n", hres); + ok(hres == S_OK, "NewNetworkItem failed: %08x\n", hres); if (hres == S_OK) ITask_Release(task); /* Task creation attempt using invalid work item class ID */ hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &GUID_BAD, &IID_ITask, (IUnknown**)&task); - todo_wine ok(hres == CLASS_E_CLASSNOTAVAILABLE, + ok(hres == CLASS_E_CLASSNOTAVAILABLE, "Expected CLASS_E_CLASSNOTAVAILABLE: %08x\n", hres); /* Task creation attempt using invalid interface ID */ hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, &GUID_BAD, (IUnknown**)&task); - todo_wine ok(hres == E_NOINTERFACE, "Expected E_NOINTERFACE: %08x\n", hres); + ok(hres == E_NOINTERFACE, "Expected E_NOINTERFACE: %08x\n", hres); /* Task creation attempt using invalid work item class and interface ID */ hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &GUID_BAD, &GUID_BAD, (IUnknown**)&task); - todo_wine ok(hres == CLASS_E_CLASSNOTAVAILABLE, + ok(hres == CLASS_E_CLASSNOTAVAILABLE, "Expected CLASS_E_CLASSNOTAVAILABLE: %08x\n", hres); ITaskScheduler_Release(test_task_scheduler);
1
0
0
0
Roy Shea : mstask: Task stub with AddRef, QueryInterface, and Release.
by Alexandre Julliard
05 Aug '08
05 Aug '08
Module: wine Branch: master Commit: 777c2f1d4649d9e5f1a3b78737cdc6a72590d26c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=777c2f1d4649d9e5f1a3b7873…
Author: Roy Shea <royshea(a)gmail.com> Date: Mon Aug 4 11:43:21 2008 -0700 mstask: Task stub with AddRef, QueryInterface, and Release. --- dlls/mstask/Makefile.in | 1 + dlls/mstask/mstask_private.h | 9 + dlls/mstask/task.c | 578 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 588 insertions(+), 0 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=777c2f1d4649d9e5f1a3b…
1
0
0
0
Vladimir Pankratov : winecfg: Update Russian translation.
by Alexandre Julliard
05 Aug '08
05 Aug '08
Module: wine Branch: master Commit: 2a4429bfa33124a824281c544413b7f877f6f8ab URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2a4429bfa33124a824281c544…
Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Mon Aug 4 15:45:39 2008 +0500 winecfg: Update Russian translation. --- programs/winecfg/Ru.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index 1d78053..692b5ee 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -204,7 +204,7 @@ BEGIN LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 CONTROL "��������� �:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED - PUSHBUTTON "�������",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED + PUSHBUTTON "�����",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END STRINGTABLE DISCARDABLE
1
0
0
0
Dylan Smith : richedit: Joined paragraph format depends on number of characters deleted.
by Alexandre Julliard
05 Aug '08
05 Aug '08
Module: wine Branch: master Commit: 4e56a3cda93d7332d37779ac1d390f487e025a17 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4e56a3cda93d7332d37779ac1…
Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Aug 4 19:19:01 2008 -0400 richedit: Joined paragraph format depends on number of characters deleted. --- dlls/riched20/caret.c | 6 +++++- dlls/riched20/editor.h | 3 ++- dlls/riched20/para.c | 12 ++++++++---- dlls/riched20/undo.c | 12 +++++++----- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 3f89398..89cd132 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -267,6 +267,7 @@ void ME_InternalDeleteText(ME_TextEditor *editor, int nOfs, { ME_Cursor c; int shift = 0; + int totalChars = nChars; while(nChars > 0) { @@ -275,12 +276,15 @@ void ME_InternalDeleteText(ME_TextEditor *editor, int nOfs, run = &c.pRun->member.run; if (run->nFlags & MERF_ENDPARA) { int eollen = run->nCR + run->nLF; + BOOL keepFirstParaFormat; if (!ME_FindItemFwd(c.pRun, diParagraph)) { return; } - ME_JoinParagraphs(editor, ME_GetParagraph(c.pRun)); + keepFirstParaFormat = (totalChars == nChars && nChars <= eollen && + run->nCharOfs); + ME_JoinParagraphs(editor, ME_GetParagraph(c.pRun), keepFirstParaFormat); /* ME_SkipAndPropagateCharOffset(p->pRun, shift); */ ME_CheckCharOffsets(editor); nChars -= (eollen < nChars) ? eollen : nChars; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 51f7e53..a32811c 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -218,7 +218,8 @@ ME_DisplayItem *ME_GetParagraph(ME_DisplayItem *run); void ME_GetSelectionParas(ME_TextEditor *editor, ME_DisplayItem **para, ME_DisplayItem **para_end); void ME_MakeFirstParagraph(ME_TextEditor *editor); ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *rp, ME_Style *style, int numCR, int numLF); -ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp); +ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, + BOOL keepFirstParaFormat); void ME_DumpParaStyle(ME_Paragraph *s); void ME_DumpParaStyleToBuf(const PARAFORMAT2 *pFmt, char buf[2048]); void ME_SetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, const PARAFORMAT2 *pFmt); diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 4ac234d..5289fdd 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -167,7 +167,8 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, ME /* join tp with tp->member.para.next_para, keeping tp's style; this * is consistent with the original */ -ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp) +ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, + BOOL keepFirstParaFormat) { ME_DisplayItem *pNext, *pFirstRunInNext, *pRun, *pTmp; int i, shift; @@ -195,14 +196,17 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp) ME_InitCharFormat2W(&fmt); ME_SetCharFormat(editor, pNext->member.para.nCharOfs - end_len, end_len, &fmt); } - undo = ME_AddUndoItem(editor, diUndoSplitParagraph, NULL); + undo = ME_AddUndoItem(editor, diUndoSplitParagraph, pNext); if (undo) { undo->nStart = pNext->member.para.nCharOfs - end_len; undo->nCR = pRun->member.run.nCR; undo->nLF = pRun->member.run.nLF; - assert(pNext->member.para.pFmt->cbSize == sizeof(PARAFORMAT2)); - *undo->di.member.para.pFmt = *pNext->member.para.pFmt; + } + if (!keepFirstParaFormat) + { + ME_AddUndoItem(editor, diUndoSetParagraphFormat, tp); + *tp->member.para.pFmt = *pNext->member.para.pFmt; } shift = pNext->member.para.nCharOfs - tp->member.para.nCharOfs - end_len; diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index eaf1791..9fcdc4b 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -89,10 +89,9 @@ ME_UndoItem *ME_AddUndoItem(ME_TextEditor *editor, ME_DIType type, const ME_Disp case diUndoJoinParagraphs: break; case diUndoSplitParagraph: + assert(pdi->member.para.pFmt->cbSize == sizeof(PARAFORMAT2)); pItem->member.para.pFmt = ALLOC_OBJ(PARAFORMAT2); - pItem->member.para.pFmt->cbSize = sizeof(PARAFORMAT2); - pItem->member.para.pFmt->dwMask = 0; - + *pItem->member.para.pFmt = *pdi->member.para.pFmt; break; default: assert(0 == "AddUndoItem, unsupported item type"); @@ -282,8 +281,11 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, ME_DisplayItem *pItem) case diUndoSetParagraphFormat: { ME_Cursor tmp; + ME_DisplayItem *para; ME_CursorFromCharOfs(editor, pItem->member.para.nCharOfs, &tmp); - ME_SetParaFormat(editor, ME_FindItemBack(tmp.pRun, diParagraph), pItem->member.para.pFmt); + para = ME_FindItemBack(tmp.pRun, diParagraph); + ME_AddUndoItem(editor, diUndoSetParagraphFormat, para); + *para->member.para.pFmt = *pItem->member.para.pFmt; break; } case diUndoSetCharFormat: @@ -306,7 +308,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, ME_DisplayItem *pItem) ME_Cursor tmp; ME_CursorFromCharOfs(editor, pUItem->nStart, &tmp); /* the only thing that's needed is paragraph offset, so no need to split runs */ - ME_JoinParagraphs(editor, ME_GetParagraph(tmp.pRun)); + ME_JoinParagraphs(editor, ME_GetParagraph(tmp.pRun), TRUE); break; } case diUndoSplitParagraph:
1
0
0
0
Dylan Smith : richedit: Use tabstops to store cell positions.
by Alexandre Julliard
05 Aug '08
05 Aug '08
Module: wine Branch: master Commit: 11c80396995065701205f2facb3dba10a6f8170f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=11c80396995065701205f2fac…
Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Aug 4 19:18:54 2008 -0400 richedit: Use tabstops to store cell positions. --- dlls/riched20/caret.c | 27 ------------ dlls/riched20/editor.c | 104 ++++++++++++++++++++++++++++++++-------------- dlls/riched20/editor.h | 2 - dlls/riched20/editstr.h | 14 +------ dlls/riched20/list.c | 18 -------- dlls/riched20/paint.c | 2 +- dlls/riched20/para.c | 29 ------------- dlls/riched20/reader.c | 10 ++++- dlls/riched20/rtf.h | 18 ++++++++- dlls/riched20/run.c | 9 +--- dlls/riched20/writer.c | 55 ++++++++++++++++--------- 11 files changed, 138 insertions(+), 150 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=11c80396995065701205f…
1
0
0
0
← Newer
1
...
66
67
68
69
70
71
72
...
84
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
Results per page:
10
25
50
100
200