June 2009 - Wine-commits - list.winehq.org

Paul Vriens : riched32/tests: Fix a few test failures on NT4 and below.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: 8c820434a49a66291ca5a8e5c75310d64bf9918d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c820434a49a66291ca5a8e5c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jun 3 13:31:14 2009 +0200 riched32/tests: Fix a few test failures on NT4 and below. --- dlls/riched32/tests/editor.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index e21c058..079045c 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -53,14 +53,15 @@ static void test_WM_SETTEXT(void) static const struct { const char *itemtext; DWORD lines; + DWORD lines_broken; } testitems[] = { { "TestSomeText", 1}, { "TestSomeText\r", 1}, - { "TestSomeText\rSomeMoreText\r", 2}, + { "TestSomeText\rSomeMoreText\r", 2, 1}, /* NT4 and below */ { "TestSomeText\n\nTestSomeText", 3}, { "TestSomeText\r\r\nTestSomeText", 2}, - { "TestSomeText\r\r\n\rTestSomeText", 3}, - { "TestSomeText\r\n\r\r\n\rTestSomeText", 4}, + { "TestSomeText\r\r\n\rTestSomeText", 3, 2}, /* NT4 and below */ + { "TestSomeText\r\n\r\r\n\rTestSomeText", 4, 3}, /* NT4 and below */ { "TestSomeText\r\n" ,2}, { "TestSomeText\r\nSomeMoreText\r\n", 3}, { "TestSomeText\r\n\r\nTestSomeText", 3}, @@ -68,8 +69,8 @@ static void test_WM_SETTEXT(void) { "TestSomeText \r\nTestSomeText", 2}, { "TestSomeText\r\n \r\nTestSomeText", 3}, { "TestSomeText\n", 2}, - { "TestSomeText\r\r\r", 3}, - { "TestSomeText\r\r\rSomeMoreText", 4} + { "TestSomeText\r\r\r", 3, 1}, /* NT4 and below */ + { "TestSomeText\r\r\rSomeMoreText", 4, 2} /* NT4 and below */ }; HWND hwndRichEdit = new_richedit(NULL); int i; @@ -104,7 +105,8 @@ static void test_WM_SETTEXT(void) ok (result == 0, "[%d] WM_SETTEXT round trip: strcmp = %ld\n", i, result); result = SendMessage(hwndRichEdit, EM_GETLINECOUNT, 0, 0); - ok (result == testitems[i].lines, + ok (result == testitems[i].lines || + broken(testitems[i].lines_broken && result == testitems[i].lines_broken), "[%d] EM_GETLINECOUNT returned %ld, expected %d\n", i, result, testitems[i].lines); }

1 0

Austin Lund : riched20/test: Added a test for TxDraw.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: 1643679476c88953c6c506c152c7d25ba2219716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1643679476c88953c6c506c15… Author: Austin Lund <austin.lund(a)gmail.com> Date: Wed Jun 3 16:02:56 2009 +1000 riched20/test: Added a test for TxDraw. --- dlls/riched20/tests/txtsrv.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index e4d6ae4..da28945 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -739,6 +739,31 @@ static void test_TxGetNaturalSize(void) { CoTaskMemFree(dummyTextHost); } +static void test_TxDraw(void) +{ + HDC tmphdc = GetDC(NULL); + DWORD dwAspect = DVASPECT_CONTENT; + HDC hicTargetDev = NULL; /* Means "default" device */ + DVTARGETDEVICE *ptd = NULL; + void *pvAspect = NULL; + HRESULT result; + RECTL client = {0,0,100,100}; + + if (!init_texthost()) + return; + + todo_wine { + result = ITextServices_TxDraw(txtserv, dwAspect, 0, pvAspect, ptd, + tmphdc, hicTargetDev, &client, NULL, + NULL, NULL, 0, 0); + ok(result == S_OK, "TxDraw failed\n"); + } + + IUnknown_Release(txtserv); + CoTaskMemFree(dummyTextHost); + +} + START_TEST( txtsrv ) { setup_thiscall_wrappers(); @@ -756,6 +781,7 @@ START_TEST( txtsrv ) test_TxGetText(); test_TxSetText(); test_TxGetNaturalSize(); + test_TxDraw(); } if (wrapperCodeMem) VirtualFree(wrapperCodeMem, 0, MEM_RELEASE); }

1 0

Andrew Eikum : gdiplus: Stub for GdipDeleteEffect.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: 84a434fd25e4cdadfec3ceec05bf48f7c1a07be0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a434fd25e4cdadfec3ceec0… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Tue Jun 2 22:33:32 2009 -0500 gdiplus: Stub for GdipDeleteEffect. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 8 ++++++++ include/gdiplusflat.h | 2 ++ 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index abb20a3..054e71e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -139,7 +139,7 @@ @ stdcall GdipDeleteBrush(ptr) @ stdcall GdipDeleteCachedBitmap(ptr) @ stdcall GdipDeleteCustomLineCap(ptr) -@ stub GdipDeleteEffect +@ stdcall GdipDeleteEffect(ptr) @ stdcall GdipDeleteFont(ptr) @ stdcall GdipDeleteFontFamily(ptr) @ stdcall GdipDeleteGraphics(ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 8691d64..de47c06 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1601,6 +1601,14 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi return retval; } +GpStatus WINGDIPAPI GdipDeleteEffect(CGpEffect *effect) +{ + FIXME("(%p): stub\n", effect); + /* note: According to Jose Roca's GDI+ Docs, this is not implemented + * in Windows's gdiplus */ + return NotImplemented; +} + /***************************************************************************** * GdipSetEffectParameters [GDIPLUS.@] */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 3cf1020..db3045e 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -57,6 +57,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT,INT,INT,PixelFormat,BYTE*, GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromStream(IStream*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromStreamICM(IStream*,GpBitmap**); +GpStatus WINGDIPAPI GdipCreateHICONFromBitmap(GpBitmap*,HICON*); +GpStatus WINGDIPAPI GdipDeleteEffect(CGpEffect*); /* Brush */ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush*,GpBrush**);

1 0

Andrew Eikum : gdiplus: Stubs for GdipDrawImagePointRect and GdipDrawImagePointRectI.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: eec8d511cc704c62fc7bc543443e9fa9878a1b30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eec8d511cc704c62fc7bc5434… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Tue Jun 2 22:34:37 2009 -0500 gdiplus: Stubs for GdipDrawImagePointRect and GdipDrawImagePointRectI. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/graphics.c | 16 ++++++++++++++++ include/gdiplusflat.h | 2 ++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 054e71e..5f803de 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -175,8 +175,8 @@ @ stdcall GdipDrawImage(ptr ptr long long) @ stub GdipDrawImageFX @ stdcall GdipDrawImageI(ptr ptr long long) -@ stub GdipDrawImagePointRect -@ stub GdipDrawImagePointRectI +@ stdcall GdipDrawImagePointRect(ptr ptr long long long long long long long) +@ stdcall GdipDrawImagePointRectI(ptr ptr long long long long long long long) @ stub GdipDrawImagePoints @ stub GdipDrawImagePointsI @ stdcall GdipDrawImagePointsRect(ptr ptr ptr long long long long long long ptr ptr ptr) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 21ccea6..28cbf3e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1604,6 +1604,22 @@ GpStatus WINGDIPAPI GdipDrawImageI(GpGraphics *graphics, GpImage *image, INT x, return Ok; } +GpStatus WINGDIPAPI GdipDrawImagePointRect(GpGraphics *graphics, GpImage *image, + REAL x, REAL y, REAL srcx, REAL srcy, REAL srcwidth, REAL srcheight, + GpUnit srcUnit) +{ + FIXME("(%p, %p, %f, %f, %f, %f, %f, %f, %d): stub\n", graphics, image, x, y, srcx, srcy, srcwidth, srcheight, srcUnit); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipDrawImagePointRectI(GpGraphics *graphics, GpImage *image, + INT x, INT y, INT srcx, INT srcy, INT srcwidth, INT srcheight, + GpUnit srcUnit) +{ + FIXME("(%p, %p, %d, %d, %d, %d, %d, %d, %d): stub\n", graphics, image, x, y, srcx, srcy, srcwidth, srcheight, srcUnit); + return NotImplemented; +} + /* FIXME: partially implemented (only works for rectangular parallelograms) */ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image, GDIPCONST GpPointF *points, INT count, REAL srcx, REAL srcy, REAL srcwidth, diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index db3045e..864f93c 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -149,6 +149,8 @@ GpStatus WINGDIPAPI GdipDrawEllipse(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawEllipseI(GpGraphics*,GpPen*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipDrawImage(GpGraphics*,GpImage*,REAL,REAL); GpStatus WINGDIPAPI GdipDrawImageI(GpGraphics*,GpImage*,INT,INT); +GpStatus WINGDIPAPI GdipDrawImagePointRect(GpGraphics*,GpImage*,REAL,REAL,REAL,REAL,REAL,REAL,GpUnit); +GpStatus WINGDIPAPI GdipDrawImagePointRectI(GpGraphics*,GpImage*,INT,INT,INT,INT,INT,INT,GpUnit); GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics*,GpImage*, GDIPCONST GpPointF*,INT,REAL,REAL,REAL,REAL,GpUnit, GDIPCONST GpImageAttributes*,DrawImageAbort,VOID*);

1 0

Alexandre Julliard : clock: Build resource files separately instead of including them all from a global file .
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: aa41526c73a5fbcc2c08a9342107ee76173a2b97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa41526c73a5fbcc2c08a9342… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 31 20:11:00 2009 +0200 clock: Build resource files separately instead of including them all from a global file. --- programs/clock/Cs.rc | 2 + programs/clock/Da.rc | 2 + programs/clock/De.rc | 2 + programs/clock/En.rc | 2 + programs/clock/Eo.rc | 2 + programs/clock/Es.rc | 2 + programs/clock/Fi.rc | 2 + programs/clock/Fr.rc | 2 + programs/clock/Hu.rc | 2 + programs/clock/It.rc | 2 + programs/clock/Ja.rc | 4 +- programs/clock/Ko.rc | 2 + programs/clock/Makefile.in | 26 ++++++++++++++++++++++- programs/clock/Nl.rc | 2 + programs/clock/No.rc | 2 + programs/clock/Pl.rc | 2 + programs/clock/Pt.rc | 2 + programs/clock/Ru.rc | 2 + programs/clock/Si.rc | 4 +- programs/clock/Sk.rc | 2 + programs/clock/Sv.rc | 2 + programs/clock/Th.rc | 2 + programs/clock/Tr.rc | 2 + programs/clock/Wa.rc | 2 + programs/clock/Zh.rc | 4 +- programs/clock/clock_res.h | 2 + programs/clock/rsrc.rc | 49 -------------------------------------------- 27 files changed, 75 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa41526c73a5fbcc2c08a…

1 0

Guy Albertelli : kernel32/tests: Add tests for CreateFile errors and opening volumes.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: 25506ca64e055ba0d182732fd4a5e9b105a1b152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25506ca64e055ba0d182732fd… Author: Guy Albertelli <galberte(a)neo.rr.com> Date: Tue Jun 2 21:00:02 2009 -0400 kernel32/tests: Add tests for CreateFile errors and opening volumes. --- dlls/kernel32/tests/file.c | 326 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 324 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25506ca64e055ba0d1827…

1 0

Kai Blin : advapi32: Fix output of GetUserNameW when joined to a domain.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: faf6f3f299a520480546c686ba6fa2178ea571e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faf6f3f299a520480546c686b… Author: Kai Blin <kai.blin(a)gmail.com> Date: Wed Jun 3 09:35:49 2009 +0200 advapi32: Fix output of GetUserNameW when joined to a domain. On a Windows box joined to a domain, GetUserName will not return the domain part. On a Unix box joined to a domain via winbindd, wine_get_user_name will. So we need to cut off the domain instead of just replacing the \ character. --- dlls/advapi32/advapi.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 1be3a17..47286a1 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -32,6 +32,7 @@ #include "wincred.h" #include "wine/library.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(advapi); @@ -86,6 +87,7 @@ GetUserNameW( LPWSTR lpszName, LPDWORD lpSize ) { const char *name = wine_get_user_name(); DWORD i, len = MultiByteToWideChar( CP_UNIXCP, 0, name, -1, NULL, 0 ); + LPWSTR backslash; if (len > *lpSize) { @@ -99,9 +101,22 @@ GetUserNameW( LPWSTR lpszName, LPDWORD lpSize ) /* Word uses the user name to create named mutexes and file mappings, * and backslashes in the name cause the creation to fail. + * Also, Windows doesn't return the domain name in the user name even when + * joined to a domain. A Unix box joined to a domain using winbindd will + * contain the domain name in the username. So we need to cut this off. + * FIXME: Only replaces forward and backslashes for now, should get the + * winbind separator char from winbindd and replace that. */ for (i = 0; lpszName[i]; i++) - if (lpszName[i] == '\\' || lpszName[i] == '/') lpszName[i] = '_'; + if (lpszName[i] == '/') lpszName[i] = '\\'; + + backslash = strrchrW(lpszName, '\\'); + if (backslash == NULL) + return TRUE; + + len = lstrlenW(backslash); + memmove(lpszName, backslash + 1, len * sizeof(WCHAR)); + *lpSize = len; return TRUE; }

1 0

Kai Blin : secur32: Don' t return STATUS_SUCCESS from LsaGetLogonSessionData stub.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: 66b641519352bfba3070848d25c8909d3949d967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66b641519352bfba3070848d2… Author: Kai Blin <kai.blin(a)gmail.com> Date: Wed Jun 3 13:00:36 2009 +0200 secur32: Don't return STATUS_SUCCESS from LsaGetLogonSessionData stub. --- dlls/secur32/lsa.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 0c0fcdc..fa765ed 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -73,7 +73,8 @@ NTSTATUS WINAPI LsaGetLogonSessionData(PLUID LogonId, PSECURITY_LOGON_SESSION_DATA* ppLogonSessionData) { FIXME("%p %p stub\n", LogonId, ppLogonSessionData); - return STATUS_SUCCESS; + *ppLogonSessionData = NULL; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS WINAPI LsaLogonUser(HANDLE LsaHandle, PLSA_STRING OriginName,

1 0

Nikolay Sivov : comctl32/listview: EN_KILLFOCUS handling test.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: 3ebe2ebb0dab93424a82f3a72281a30aa3cfeb5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ebe2ebb0dab93424a82f3a72… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jun 2 23:46:43 2009 +0400 comctl32/listview: EN_KILLFOCUS handling test. --- dlls/comctl32/tests/listview.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index fa110cd..21697c6 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2892,6 +2892,42 @@ static void test_editbox(void) hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); ok(hwndedit == NULL, "Expected Edit window not to be created\n"); + /* check EN_KILLFOCUS handling */ + memset(&item, 0, sizeof(item)); + item.pszText = testitemA; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_SETITEMTEXTA, 0, (LPARAM)&item); + expect(TRUE, r); + + SetFocus(hwnd); + hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); + ok(IsWindow(hwndedit), "Expected Edit window to be created\n"); + /* modify edit and notify control that it lost focus */ + r = SendMessage(hwndedit, WM_SETTEXT, 0, (LPARAM)testitem1A); + expect(TRUE, r); + r = SendMessage(hwnd, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)hwndedit); + expect(0, r); + memset(&item, 0, sizeof(item)); + item.pszText = buffer; + item.cchTextMax = 10; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_GETITEMTEXTA, 0, (LPARAM)&item); + expect(strlen(item.pszText), r); + todo_wine ok(strcmp(buffer, testitem1A) == 0, "Expected item text to change\n"); + /* end edit without saving */ + r = SendMessage(hwndedit, WM_KEYDOWN, VK_ESCAPE, 0); + expect(0, r); + memset(&item, 0, sizeof(item)); + item.pszText = buffer; + item.cchTextMax = 10; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_GETITEMTEXTA, 0, (LPARAM)&item); + expect(strlen(item.pszText), r); + todo_wine ok(strcmp(buffer, testitem1A) == 0, "Expected item text to change\n"); + DestroyWindow(hwnd); }

1 0

Nikolay Sivov : comctl32/listview: Handle EN_KILLFOCUS in WM_COMMAND message handler.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: b13cd52b049cacbb1f1176396049c65fd461c079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b13cd52b049cacbb1f1176396… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jun 2 23:47:33 2009 +0400 comctl32/listview: Handle EN_KILLFOCUS in WM_COMMAND message handler. --- dlls/comctl32/listview.c | 96 ++++++++++++++++++++++++--------------- dlls/comctl32/tests/listview.c | 4 +- 2 files changed, 61 insertions(+), 39 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 09d8dae..3fe41bd 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -33,7 +33,6 @@ * TODO: * * Default Message Processing - * -- EN_KILLFOCUS should be handled in WM_COMMAND * -- WM_CREATE: create the icon and small icon image lists at this point only if * the LVS_SHAREIMAGELISTS style is not specified. * -- WM_WINDOWPOSCHANGED: arrange the list items if the current view is icon @@ -412,7 +411,7 @@ static INT LISTVIEW_GetLabelWidth(const LISTVIEW_INFO *, INT); static void LISTVIEW_GetOrigin(const LISTVIEW_INFO *, LPPOINT); static BOOL LISTVIEW_GetViewRect(const LISTVIEW_INFO *, LPRECT); static void LISTVIEW_UpdateSize(LISTVIEW_INFO *); -static LRESULT LISTVIEW_Command(const LISTVIEW_INFO *, WPARAM, LPARAM); +static LRESULT LISTVIEW_Command(LISTVIEW_INFO *, WPARAM, LPARAM); static INT LISTVIEW_GetStringWidthT(const LISTVIEW_INFO *, LPCWSTR, BOOL); static BOOL LISTVIEW_KeySelection(LISTVIEW_INFO *, INT, BOOL); static UINT LISTVIEW_GetItemState(const LISTVIEW_INFO *, INT, UINT); @@ -4920,30 +4919,51 @@ static BOOL LISTVIEW_DeleteItem(LISTVIEW_INFO *infoPtr, INT nItem) * * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure - * [I] pszText : modified text + * [I] storeText : store edit box text as item text * [I] isW : TRUE if psxText is Unicode, FALSE if it's ANSI * * RETURN: * SUCCESS : TRUE * FAILURE : FALSE */ -static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, LPWSTR pszText, BOOL isW) +static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, BOOL storeText, BOOL isW) { HWND hwndSelf = infoPtr->hwndSelf; NMLVDISPINFOW dispInfo; INT editedItem = infoPtr->nEditLabelItem; BOOL bSame; + WCHAR *pszText = NULL; + BOOL res; + + if (storeText) + { + DWORD len = isW ? GetWindowTextLengthW(infoPtr->hwndEdit) : GetWindowTextLengthA(infoPtr->hwndEdit); + + if (len) + { + if ((pszText = Alloc((len+1) * (isW ? sizeof(WCHAR) : sizeof(CHAR))))) + { + if (isW) GetWindowTextW(infoPtr->hwndEdit, pszText, len+1); + else GetWindowTextA(infoPtr->hwndEdit, (CHAR*)pszText, len+1); + } + } + } TRACE("(pszText=%s, isW=%d)\n", debugtext_t(pszText, isW), isW); infoPtr->nEditLabelItem = -1; + infoPtr->hwndEdit = 0; ZeroMemory(&dispInfo, sizeof(dispInfo)); dispInfo.item.mask = LVIF_PARAM | LVIF_STATE | LVIF_TEXT; dispInfo.item.iItem = editedItem; dispInfo.item.iSubItem = 0; dispInfo.item.stateMask = ~0; - if (!LISTVIEW_GetItemW(infoPtr, &dispInfo.item)) return FALSE; + if (!LISTVIEW_GetItemW(infoPtr, &dispInfo.item)) + { + res = FALSE; + goto cleanup; + } if (isW) bSame = (lstrcmpW(dispInfo.item.pszText, pszText) == 0); @@ -4953,7 +4973,11 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, LPWSTR pszText, BOOL bSame = (lstrcmpW(dispInfo.item.pszText, tmp) == 0); textfreeT(tmp, FALSE); } - if (bSame) return TRUE; + if (bSame) + { + res = TRUE; + goto cleanup; + } /* add the text from the edit in */ dispInfo.item.mask |= LVIF_TEXT; @@ -4961,9 +4985,16 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, LPWSTR pszText, BOOL dispInfo.item.cchTextMax = textlenT(pszText, isW); /* Do we need to update the Item Text */ - if (!notify_dispinfoT(infoPtr, LVN_ENDLABELEDITW, &dispInfo, isW)) return FALSE; + if (!notify_dispinfoT(infoPtr, LVN_ENDLABELEDITW, &dispInfo, isW)) + { + res = FALSE; + goto cleanup; + } if (!IsWindow(hwndSelf)) - return FALSE; + { + res = FALSE; + goto cleanup; + } if (!pszText) return TRUE; if (!(infoPtr->dwStyle & LVS_OWNERDATA)) @@ -4973,7 +5004,8 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, LPWSTR pszText, BOOL if (lpItem && lpItem->hdr.pszText == LPSTR_TEXTCALLBACKW) { LISTVIEW_InvalidateItem(infoPtr, editedItem); - return TRUE; + res = TRUE; + goto cleanup; } } @@ -4983,7 +5015,12 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, LPWSTR pszText, BOOL dispInfo.item.iSubItem = 0; dispInfo.item.pszText = pszText; dispInfo.item.cchTextMax = textlenT(pszText, isW); - return LISTVIEW_SetItemT(infoPtr, &dispInfo.item, isW); + res = LISTVIEW_SetItemT(infoPtr, &dispInfo.item, isW); + +cleanup: + Free(pszText); + + return res; } /*** @@ -10454,7 +10491,7 @@ void LISTVIEW_Unregister(void) * RETURN: * Zero. */ -static LRESULT LISTVIEW_Command(const LISTVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) +static LRESULT LISTVIEW_Command(LISTVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { switch (HIWORD(wParam)) { @@ -10504,6 +10541,14 @@ static LRESULT LISTVIEW_Command(const LISTVIEW_INFO *infoPtr, WPARAM wParam, LPA break; } + case EN_KILLFOCUS: + { + /* handle value will be lost after LISTVIEW_EndEditLabelT */ + HWND edit = infoPtr->hwndEdit; + + LISTVIEW_EndEditLabelT(infoPtr, TRUE, IsWindowUnicode(infoPtr->hwndEdit)); + SendMessageW(edit, WM_CLOSE, 0, 0); + } default: return SendMessageW (infoPtr->hwndNotify, WM_COMMAND, wParam, lParam); @@ -10530,7 +10575,7 @@ static LRESULT LISTVIEW_Command(const LISTVIEW_INFO *infoPtr, WPARAM wParam, LPA static LRESULT EditLblWndProcT(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL isW) { LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(GetParent(hwnd), 0); - BOOL cancel = FALSE; + BOOL save = TRUE; TRACE("(hwnd=%p, uMsg=%x, wParam=%lx, lParam=%lx, isW=%d)\n", hwnd, uMsg, wParam, lParam, isW); @@ -10540,9 +10585,6 @@ static LRESULT EditLblWndProcT(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPara case WM_GETDLGCODE: return DLGC_WANTARROWS | DLGC_WANTALLKEYS; - case WM_KILLFOCUS: - break; - case WM_DESTROY: { WNDPROC editProc = infoPtr->EditWndProc; @@ -10554,7 +10596,7 @@ static LRESULT EditLblWndProcT(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPara case WM_KEYDOWN: if (VK_ESCAPE == (INT)wParam) { - cancel = TRUE; + save = FALSE; break; } else if (VK_RETURN == (INT)wParam) @@ -10566,27 +10608,7 @@ static LRESULT EditLblWndProcT(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPara /* kill the edit */ if (infoPtr->hwndEdit) - { - LPWSTR buffer = NULL; - - infoPtr->hwndEdit = 0; - if (!cancel) - { - DWORD len = isW ? GetWindowTextLengthW(hwnd) : GetWindowTextLengthA(hwnd); - - if (len) - { - if ( (buffer = Alloc((len+1) * (isW ? sizeof(WCHAR) : sizeof(CHAR)))) ) - { - if (isW) GetWindowTextW(hwnd, buffer, len+1); - else GetWindowTextA(hwnd, (CHAR*)buffer, len+1); - } - } - } - LISTVIEW_EndEditLabelT(infoPtr, buffer, isW); - - Free(buffer); - } + LISTVIEW_EndEditLabelT(infoPtr, save, isW); SendMessageW(hwnd, WM_CLOSE, 0, 0); return 0; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 21697c6..d0aa1f3 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2915,7 +2915,7 @@ static void test_editbox(void) item.iSubItem = 0; r = SendMessage(hwnd, LVM_GETITEMTEXTA, 0, (LPARAM)&item); expect(strlen(item.pszText), r); - todo_wine ok(strcmp(buffer, testitem1A) == 0, "Expected item text to change\n"); + ok(strcmp(buffer, testitem1A) == 0, "Expected item text to change\n"); /* end edit without saving */ r = SendMessage(hwndedit, WM_KEYDOWN, VK_ESCAPE, 0); expect(0, r); @@ -2926,7 +2926,7 @@ static void test_editbox(void) item.iSubItem = 0; r = SendMessage(hwnd, LVM_GETITEMTEXTA, 0, (LPARAM)&item); expect(strlen(item.pszText), r); - todo_wine ok(strcmp(buffer, testitem1A) == 0, "Expected item text to change\n"); + ok(strcmp(buffer, testitem1A) == 0, "Expected item text to change\n"); DestroyWindow(hwnd); }

1 0