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

Alexandre Julliard : user32/tests: Fix the listbox delete test on NT4.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 788cdbe6fd2c6d0461d8489d92dc103670676ca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=788cdbe6fd2c6d0461d8489d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 2 11:56:42 2009 +0200 user32/tests: Fix the listbox delete test on NT4. --- dlls/user32/tests/msg.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 1db5146..45ef814 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11072,7 +11072,9 @@ static void check_lb_state_dbg(HWND listbox, int count, int cur_sel, ret = CallWindowProcA(listbox_orig_proc, listbox, LB_GETCURSEL, 0, 0); ok_(__FILE__, line)(ret == cur_sel, "expected cur sel %d, got %ld\n", cur_sel, ret); ret = CallWindowProcA(listbox_orig_proc, listbox, LB_GETCARETINDEX, 0, 0); - ok_(__FILE__, line)(ret == caret_index, "expected caret index %d, got %ld\n", caret_index, ret); + ok_(__FILE__, line)(ret == caret_index || + broken(cur_sel == -1 && caret_index == 0 && ret == -1), /* nt4 */ + "expected caret index %d, got %ld\n", caret_index, ret); ret = CallWindowProcA(listbox_orig_proc, listbox, LB_GETTOPINDEX, 0, 0); ok_(__FILE__, line)(ret == top_index, "expected top index %d, got %ld\n", top_index, ret); }

1 0

Alexandre Julliard : user32/tests: Only check the foreground window when it belongs to the current thread.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: f922283335ba93fea0df4e685f2298e2077328ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f922283335ba93fea0df4e685… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 2 11:56:58 2009 +0200 user32/tests: Only check the foreground window when it belongs to the current thread. --- dlls/user32/tests/win.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 13e5d67..43988b5 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2322,7 +2322,10 @@ static void check_wnd_state_(const char *file, int line, HWND active, HWND foreground, HWND focus, HWND capture) { ok_(file, line)(active == GetActiveWindow(), "GetActiveWindow() = %p\n", GetActiveWindow()); - if (foreground && GetForegroundWindow()) + /* only check foreground if it belongs to the current thread */ + /* foreground can be moved to a different app pretty much at any time */ + if (foreground && GetForegroundWindow() && + GetWindowThreadProcessId(GetForegroundWindow(), NULL) == GetCurrentThreadId()) ok_(file, line)(foreground == GetForegroundWindow(), "GetForegroundWindow() = %p\n", GetForegroundWindow()); ok_(file, line)(focus == GetFocus(), "GetFocus() = %p\n", GetFocus()); ok_(file, line)(capture == GetCapture(), "GetCapture() = %p\n", GetCapture());

1 0

Andrew Eikum : gdiplus: Stub for GdipCloneBitmapArea.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 57134fc8905de19dbdd7ebedd6e6895a7652d73c URL: http://source.winehq.org/git/wine.git/?a=commit;h=57134fc8905de19dbdd7ebedd… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Mon Jun 1 20:01:26 2009 -0500 gdiplus: Stub for GdipCloneBitmapArea. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 10 +++++++++- include/gdiplusflat.h | 2 ++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index e156db4..40f7327 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -46,7 +46,7 @@ @ stdcall GdipBitmapSetResolution(ptr long long) @ stdcall GdipBitmapUnlockBits(ptr ptr) @ stdcall GdipClearPathMarkers(ptr) -@ stub GdipCloneBitmapArea +@ stdcall GdipCloneBitmapArea(long long long long long ptr ptr) @ stdcall GdipCloneBitmapAreaI(long long long long long ptr ptr) @ stdcall GdipCloneBrush(ptr ptr) @ stdcall GdipCloneCustomLineCap(ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 29eb000..8691d64 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -271,10 +271,18 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, return Ok; } +GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL x, REAL y, REAL width, REAL height, + PixelFormat format, GpBitmap* srcBitmap, GpBitmap** dstBitmap) +{ + FIXME("(%f,%f,%f,%f,%i,%p,%p): stub\n", x, y, width, height, format, srcBitmap, dstBitmap); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipCloneBitmapAreaI(INT x, INT y, INT width, INT height, PixelFormat format, GpBitmap* srcBitmap, GpBitmap** dstBitmap) { - FIXME("(%i,%i,%i,%i,%i,%p,%p)\n", x, y, width, height, format, srcBitmap, dstBitmap); + FIXME("(%i,%i,%i,%i,%i,%p,%p): stub\n", x, y, width, height, format, srcBitmap, dstBitmap); return NotImplemented; } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 28cea41..99163ca 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -44,6 +44,8 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap*,GDIPCONST GpRect*,UINT, PixelFormat,BitmapData*); GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap*,INT,INT,ARGB); GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap*,BitmapData*); +GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL,REAL,REAL,REAL,PixelFormat,GpBitmap*,GpBitmap**); +GpStatus WINGDIPAPI GdipCloneBitmapAreaI(INT,INT,INT,INT,PixelFormat,GpBitmap*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromFileICM(GDIPCONST WCHAR*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromGdiDib(GDIPCONST BITMAPINFO*,VOID*,GpBitmap**);

1 0

Andrew Eikum : gdiplus: Stub for GdipComment.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: b850008bec7d949f6344d0572768edded072e0a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b850008bec7d949f6344d0572… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Mon Jun 1 20:01:43 2009 -0500 gdiplus: Stub for GdipComment. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 6 ++++++ include/gdiplusflat.h | 1 + 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 40f7327..beff7a4 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -65,7 +65,7 @@ @ stdcall GdipCombineRegionRect(ptr ptr long) @ stdcall GdipCombineRegionRectI(ptr ptr long) @ stdcall GdipCombineRegionRegion(ptr ptr long) -@ stub GdipComment +@ stdcall GdipComment(ptr long ptr) @ stdcall GdipConvertToEmfPlus(ptr ptr ptr long ptr ptr) @ stub GdipConvertToEmfPlusToFile @ stub GdipConvertToEmfPlusToStream diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index adeea3c..8d3d09e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3164,6 +3164,12 @@ GpStatus WINGDIPAPI GdipBeginContainerI(GpGraphics *graphics, GDIPCONST GpRect * return NotImplemented; } +GpStatus WINGDIPAPI GdipComment(GpGraphics *graphics, UINT sizeData, GDIPCONST BYTE *data) +{ + FIXME("(%p, %d, %p): stub\n", graphics, sizeData, data); + return NotImplemented; +} + GpStatus WINGDIPAPI GdipEndContainer(GpGraphics *graphics, GraphicsState state) { FIXME("(%p, 0x%x)\n", graphics, state); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 99163ca..bade9e5 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -123,6 +123,7 @@ GpStatus WINGDIPAPI GdipFlush(GpGraphics*, GpFlushIntention); GpStatus WINGDIPAPI GdipBeginContainer(GpGraphics*,GDIPCONST GpRectF*,GDIPCONST GpRectF*,GpUnit,GraphicsContainer*); GpStatus WINGDIPAPI GdipBeginContainer2(GpGraphics*,GraphicsContainer*); GpStatus WINGDIPAPI GdipBeginContainerI(GpGraphics*,GDIPCONST GpRect*,GDIPCONST GpRect*,GpUnit,GraphicsContainer*); +GpStatus WINGDIPAPI GdipComment(GpGraphics*,UINT,GDIPCONST BYTE*); GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC,HANDLE,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHWND(HWND,GpGraphics**);

1 0

Henri Verbeet : wined3d: Partially revert 7433eb76b5f05ae54702fe9e57ba315407ed651b.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 812ee5208c380481298183b29f03246f85a171fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=812ee5208c380481298183b29… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 2 09:01:16 2009 +0200 wined3d: Partially revert 7433eb76b5f05ae54702fe9e57ba315407ed651b. The write mask sizes for the input and output semantics can be different, resulting in compilation failure. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2385dbc..d7a8835 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3411,7 +3411,7 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in && !strcmp(semantic_name_in, semantic_name_out)) { shader_addline(buffer, "%s%s = OUT[%u]%s;\n", - destination, reg_mask, j, reg_mask_out); + destination, reg_mask, j, reg_mask); found = TRUE; } }

1 0

Huw Davies : ole32: In simple mode keep the stream size above the small block limit.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 16dc0378594804ffa926b13cf0df6eeed133eeaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=16dc0378594804ffa926b13cf… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 1 11:36:19 2009 +0100 ole32: In simple mode keep the stream size above the small block limit. --- dlls/ole32/stg_stream.c | 4 ++++ dlls/ole32/tests/storage32.c | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 3fde160..9acd414 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -575,6 +575,10 @@ static HRESULT WINAPI StgStreamImpl_SetSize( return STG_E_ACCESSDENIED; } + /* In simple mode keep the stream size above the small block limit */ + if (This->parentStorage->ancestorStorage->base.openFlags & STGM_SIMPLE) + libNewSize.u.LowPart = max(libNewSize.u.LowPart, LIMIT_TO_USE_SMALL_BLOCK); + if (This->streamSize.u.LowPart == libNewSize.u.LowPart) return S_OK; diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index fa5d46c..438913c 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1354,6 +1354,7 @@ static void test_simple(void) HRESULT r; IStream *stm; static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + static const WCHAR stmname2[] = { 'S','m','a','l','l',0 }; LARGE_INTEGER pos; ULARGE_INTEGER upos; DWORD count; @@ -1400,6 +1401,19 @@ static void test_simple(void) IStream_Release(stm); + r = IStorage_CreateStream(stg, stmname2, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm); + ok(r == S_OK, "got %08x\n", r); + + upos.QuadPart = 100; + r = IStream_SetSize(stm, upos); + ok(r == S_OK, "got %08x\n", r); + + r = IStream_Write(stm, "foo", 3, &count); + ok(r == S_OK, "got %08x\n", r); + ok(count == 3, "got %d\n", count); + + IStream_Release(stm); + IStorage_Commit(stg, STGC_DEFAULT); IStorage_Release(stg); @@ -1415,6 +1429,16 @@ static void test_simple(void) IStream_Release(stm); + r = IStorage_OpenStream(stg, stmname2, NULL, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stm); + ok(r == S_OK, "got %08x\n", r); + + r = IStream_Stat(stm, &stat, STATFLAG_NONAME); + ok(r == S_OK, "got %08x\n", r); + ok(stat.cbSize.QuadPart == 4096, "got %d\n", stat.cbSize.u.LowPart); + + IStream_Release(stm); + + IStorage_Release(stg); DeleteFileW(filename);

1 0

Vitaly Perov : mpr: Don't set LastError if no error occured.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: d7098d0f4fa829ab14fda359284aaecab506533a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7098d0f4fa829ab14fda3592… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Mon Jun 1 20:57:16 2009 +0400 mpr: Don't set LastError if no error occured. --- dlls/mpr/wnet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 241ea2f..cffa340 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1949,7 +1949,7 @@ DWORD WINAPI WNetGetUniversalNameW ( LPCWSTR lpLocalPath, DWORD dwInfoLevel, break; } - SetLastError(err); + if (err != WN_NO_ERROR) SetLastError(err); return err; }

1 0

André Hentschel : winex11: Fix Ctrl+Shift+Tab translation.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: ef016c32c16af11e54c55d294849b6c9127eb3a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef016c32c16af11e54c55d294… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 1 20:10:21 2009 +0200 winex11: Fix Ctrl+Shift+Tab translation. --- dlls/user32/tests/input.c | 2 ++ dlls/winex11.drv/keyboard.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 00d344b..d100610 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1285,6 +1285,8 @@ static void test_ToUnicode(void) state[VK_SHIFT] |= HIGHEST_BIT; state[VK_LSHIFT] |= HIGHEST_BIT; + ret = ToUnicode(VK_TAB, SC_TAB, state, wStr, 2, 0); + ok(ret == 0, "ToUnicode for CTRL + SHIFT + Tab didn't return 0 (was %i)\n", ret); ret = ToUnicode(VK_RETURN, SC_RETURN, state, wStr, 2, 0); todo_wine ok(ret == 0, "ToUnicode for CTRL + SHIFT + Return didn't return 0 (was %i)\n", ret); } diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index ad41c84..05b3b53 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2618,7 +2618,7 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState #endif /* Special case: X turns shift-tab into ISO_Left_Tab. */ /* Here we change it back. */ - if (keysym == XK_ISO_Left_Tab) + if (keysym == XK_ISO_Left_Tab && !(e.state & ControlMask)) { bufW[0] = 0x09; ret = 1;

1 0

Paul Vriens : oleaut32/tests: Fix some intermittent test failures on W98 and NT4.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 28d0487c24442b6a4994f25788f9829ff3e42016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28d0487c24442b6a4994f2578… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jun 1 21:21:25 2009 +0200 oleaut32/tests: Fix some intermittent test failures on W98 and NT4. --- dlls/oleaut32/tests/vartest.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 662c0a0..53b0afc 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -5234,11 +5234,13 @@ static void test_VarAdd(void) static void test_VarCat(void) { LCID lcid; - VARIANT left, right, result, expected; + VARIANT left, right, result, expected, expected_broken; static const WCHAR sz34[] = {'3','4','\0'}; static const WCHAR sz1234[] = {'1','2','3','4','\0'}; static const WCHAR date_sz12[] = {'9','/','3','0','/','1','9','8','0','1','2','\0'}; + static const WCHAR date_sz12_broken[] = {'9','/','3','0','/','8','0','1','2','\0'}; static const WCHAR sz12_date[] = {'1','2','9','/','3','0','/','1','9','8','0','\0'}; + static const WCHAR sz12_date_broken[] = {'1','2','9','/','3','0','/','8','0','\0'}; static const WCHAR sz_empty[] = {'\0'}; TCHAR orig_date_format[128]; VARTYPE leftvt, rightvt, resultvt; @@ -5506,34 +5508,42 @@ static void test_VarCat(void) V_VT(&left) = VT_BSTR; V_VT(&right) = VT_DATE; V_VT(&expected) = VT_BSTR; + V_VT(&expected_broken) = VT_BSTR; V_BSTR(&left) = SysAllocString(sz12); V_DATE(&right) = 29494.0; V_BSTR(&expected)= SysAllocString(sz12_date); + V_BSTR(&expected_broken)= SysAllocString(sz12_date_broken); hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); - ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, + ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ || + broken(VarCmp(&result,&expected_broken,lcid,0) == VARCMP_EQ), /* Some W98 and NT4 (intermittent) */ "VarCat: VT_BSTR concat with VT_DATE returned incorrect result\n"); VariantClear(&left); VariantClear(&right); VariantClear(&result); VariantClear(&expected); + VariantClear(&expected_broken); V_VT(&left) = VT_DATE; V_VT(&right) = VT_BSTR; V_VT(&expected) = VT_BSTR; + V_VT(&expected_broken) = VT_BSTR; V_DATE(&left) = 29494.0; V_BSTR(&right) = SysAllocString(sz12); V_BSTR(&expected)= SysAllocString(date_sz12); + V_BSTR(&expected_broken)= SysAllocString(date_sz12_broken); hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); - ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, + ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ || + broken(VarCmp(&result,&expected_broken,lcid,0) == VARCMP_EQ), /* Some W98 and NT4 (intermittent) */ "VarCat: VT_DATE concat with VT_BSTR returned incorrect result\n"); VariantClear(&left); VariantClear(&right); VariantClear(&result); VariantClear(&expected); + VariantClear(&expected_broken); /* Test of both expressions are empty */ V_VT(&left) = VT_BSTR;

1 0

Nikolay Sivov : comctl32/listview: Block LVM_EDITLABEL when control is unfocused and no label created.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 43d982fde6b363199c95037935e0f5446df8f733 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d982fde6b363199c9503793… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jun 1 23:53:48 2009 +0400 comctl32/listview: Block LVM_EDITLABEL when control is unfocused and no label created. --- dlls/comctl32/listview.c | 2 ++ dlls/comctl32/tests/listview.c | 13 +++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a1aa250..09d8dae 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5010,6 +5010,8 @@ static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *infoPtr, INT nItem, BOOL isW) if (~infoPtr->dwStyle & LVS_EDITLABELS) return 0; if (nItem < 0 || nItem >= infoPtr->nItemCount) return 0; + /* Edit could be created only on focused control and if isn't already created */ + if (GetFocus() != infoPtr->hwndSelf && !IsWindow(infoPtr->hwndEdit)) return 0; infoPtr->nEditLabelItem = nItem; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index dd5fd86..fa110cd 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2836,7 +2836,7 @@ static void test_getitemrect(void) static void test_editbox(void) { - HWND hwnd, hwndedit; + HWND hwnd, hwndedit, hwndedit2; LVITEMA item; DWORD r; static CHAR testitemA[] = "testitem"; @@ -2878,10 +2878,19 @@ static void test_editbox(void) ok(strcmp(buffer, testitem1A) == 0, "Expected item text to change\n"); + /* send LVM_EDITLABEL on already created edit */ + SetFocus(hwnd); + hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); + ok(IsWindow(hwndedit), "Expected Edit window to be created\n"); + /* focus will be set to edit */ + ok(GetFocus() == hwndedit, "Expected Edit window to be focused\n"); + hwndedit2 = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); + ok(IsWindow(hwndedit2), "Expected Edit window to be created\n"); + /* creating label disabled when control isn't focused */ SetFocus(0); hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); - todo_wine ok(hwndedit == NULL, "Expected Edit window not to be created\n"); + ok(hwndedit == NULL, "Expected Edit window not to be created\n"); DestroyWindow(hwnd); }

1 0