October 2013 - Wine-commits

Henri Verbeet : d3dx9/tests: Use explicit A calls.
by Alexandre Julliard 31 Oct '13

31 Oct '13

Module: wine Branch: master Commit: 3e5dd54971b6c6cb1520b2b600dc18cc318e5aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e5dd54971b6c6cb1520b2b60… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 31 09:40:40 2013 +0100 d3dx9/tests: Use explicit A calls. --- dlls/d3dx9_36/tests/Makefile.in | 1 - dlls/d3dx9_36/tests/core.c | 10 ++-- dlls/d3dx9_36/tests/effect.c | 8 ++-- dlls/d3dx9_36/tests/line.c | 8 ++-- dlls/d3dx9_36/tests/mesh.c | 88 +++++++++++++++++---------------------- dlls/d3dx9_36/tests/shader.c | 18 +++----- dlls/d3dx9_36/tests/surface.c | 16 ++++--- dlls/d3dx9_36/tests/texture.c | 4 +- dlls/d3dx9_36/tests/volume.c | 3 +- 9 files changed, 70 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3e5dd54971b6c6cb1520b…

1 0

Henri Verbeet : ddraw/tests: Use explicit A calls.
by Alexandre Julliard 31 Oct '13

31 Oct '13

Module: wine Branch: master Commit: 026dc116771dd3dc583b5b7db74c56debe2c0d04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=026dc116771dd3dc583b5b7db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 31 09:40:41 2013 +0100 ddraw/tests: Use explicit A calls. --- dlls/ddraw/tests/Makefile.in | 1 - dlls/ddraw/tests/d3d.c | 3 +- dlls/ddraw/tests/ddraw1.c | 8 +++--- dlls/ddraw/tests/ddraw2.c | 8 +++--- dlls/ddraw/tests/ddraw4.c | 8 +++--- dlls/ddraw/tests/ddraw7.c | 8 +++--- dlls/ddraw/tests/ddrawmodes.c | 9 +------ dlls/ddraw/tests/dsurface.c | 12 +++++++--- dlls/ddraw/tests/visual.c | 47 +++++++++++++++++++++------------------- 9 files changed, 53 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=026dc116771dd3dc583b5…

1 0

Henri Verbeet : d3drm: Get rid of the mesh_material typedef.
by Alexandre Julliard 31 Oct '13

31 Oct '13

Module: wine Branch: master Commit: 22d40f0305608d2715d482750c6cc169e16cee59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22d40f0305608d2715d482750… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 31 09:40:42 2013 +0100 d3drm: Get rid of the mesh_material typedef. --- dlls/d3drm/meshbuilder.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 5e776d5..486d787 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -62,11 +62,12 @@ struct coords_2d D3DVALUE v; }; -typedef struct { +struct mesh_material +{ D3DCOLOR color; IDirect3DRMMaterial2 *material; IDirect3DRMTexture3 *texture; -} mesh_material; +}; typedef struct { IDirect3DRMMeshBuilder2 IDirect3DRMMeshBuilder2_iface; @@ -86,7 +87,7 @@ typedef struct { IDirect3DRMMaterial2 *material; IDirect3DRMTexture3 *texture; DWORD nb_materials; - mesh_material *materials; + struct mesh_material *materials; DWORD *material_indices; } IDirect3DRMMeshBuilderImpl;

1 0

Henri Verbeet : d3drm: Get rid of the IDirect3DRMMeshBuilderImpl typedef.
by Alexandre Julliard 31 Oct '13

31 Oct '13

Module: wine Branch: master Commit: c35485d627575e1ac993c2a45d955da3521e6941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c35485d627575e1ac993c2a45… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 31 09:40:43 2013 +0100 d3drm: Get rid of the IDirect3DRMMeshBuilderImpl typedef. --- dlls/d3drm/meshbuilder.c | 1211 ++++++++++++++++++++-------------------------- 1 files changed, 534 insertions(+), 677 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c35485d627575e1ac993c…

1 0

Dmitry Timoshkov : ntdll: NtReadFile should not fail for 0-length reads at EOF.
by Alexandre Julliard 31 Oct '13

31 Oct '13

Module: wine Branch: master Commit: a5e80b2d600dbca37e3314c6ac677d6e883df2c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5e80b2d600dbca37e3314c6a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 30 14:24:25 2013 +0900 ntdll: NtReadFile should not fail for 0-length reads at EOF. --- dlls/ntdll/file.c | 4 ++-- dlls/ntdll/tests/file.c | 16 ---------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 8c8f4cf..9b05978 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -636,7 +636,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, lseek( unix_handle, offset->QuadPart + result, SEEK_SET ); total = result; - status = total ? STATUS_SUCCESS : STATUS_END_OF_FILE; + status = (total || !length) ? STATUS_SUCCESS : STATUS_END_OF_FILE; goto done; } } @@ -665,7 +665,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, { case FD_TYPE_FILE: case FD_TYPE_CHAR: - status = STATUS_END_OF_FILE; + status = length ? STATUS_END_OF_FILE : STATUS_SUCCESS; goto done; case FD_TYPE_SERIAL: break; diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index d9e85fd..f857777 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2168,12 +2168,9 @@ todo_wine bytes = -1; SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, 0, &bytes, &ovl); -todo_wine ok(ret, "ReadFile error %d\n", GetLastError()); -todo_wine ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); -todo_wine ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); @@ -2189,11 +2186,8 @@ todo_wine U(iob).Status = -1; iob.Information = -1; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, 0, NULL, NULL); -todo_wine ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); -todo_wine ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); -todo_wine ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); U(iob).Status = -1; @@ -2210,11 +2204,8 @@ todo_wine iob.Information = -1; offset.QuadPart = sizeof(contents); status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, 0, &offset, NULL); -todo_wine ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); -todo_wine ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); -todo_wine ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); U(iob).Status = -1; @@ -2231,11 +2222,8 @@ todo_wine iob.Information = -1; offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, 0, &offset, NULL); -todo_wine ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); -todo_wine ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); -todo_wine ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); for (i = -20; i < 0; i++) @@ -2351,7 +2339,6 @@ todo_wine /* ReadFile return value depends on Windows version and testing it is not practical */ ReadFile(hfile, buf, 0, &bytes, &ovl); ok(bytes == 0, "bytes %u\n", bytes); -todo_wine ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); @@ -2547,11 +2534,8 @@ todo_wine } else { -todo_wine ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", status); -todo_wine ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); -todo_wine ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); }

1 0

Dmitry Timoshkov : ntdll: NtReadFile should update io status block on EOF for a synchronous read.
by Alexandre Julliard 31 Oct '13

31 Oct '13

Module: wine Branch: master Commit: 60ef62c8c2baf00ea335d604195fb1bceb87247e URL: http://source.winehq.org/git/wine.git/?a=commit;h=60ef62c8c2baf00ea335d6041… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 30 14:24:45 2013 +0900 ntdll: NtReadFile should update io status block on EOF for a synchronous read. --- dlls/ntdll/file.c | 10 +++++----- dlls/ntdll/tests/file.c | 15 +++------------ 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 9b05978..bd9516d 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -604,14 +604,14 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, &needs_close, &type, &options ); if (status) return status; + async_read = !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); + if (!virtual_check_buffer_for_write( buffer, length )) { status = STATUS_ACCESS_VIOLATION; goto done; } - async_read = !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); - if (type == FD_TYPE_FILE) { if (async_read && (!offset || offset->QuadPart < 0)) @@ -765,14 +765,14 @@ done: err: if (needs_close) close( unix_handle ); - if (status == STATUS_SUCCESS) + if (status == STATUS_SUCCESS || (status == STATUS_END_OF_FILE && !async_read)) { io_status->u.Status = status; io_status->Information = total; TRACE("= SUCCESS (%u)\n", total); if (hEvent) NtSetEvent( hEvent, NULL ); - if (apc) NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)apc, - (ULONG_PTR)apc_user, (ULONG_PTR)io_status, 0 ); + if (apc && !status) NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)apc, + (ULONG_PTR)apc_user, (ULONG_PTR)io_status, 0 ); } else { diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index f857777..1a04e9a 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -836,9 +836,9 @@ static void read_file_test(void) ResetEvent( event ); status = pNtReadFile( handle, event, apc, &apc_count, &iosb, buffer, 2, &offset, NULL ); ok( status == STATUS_END_OF_FILE, "wrong status %x\n", status ); - todo_wine ok( U(iosb).Status == STATUS_END_OF_FILE, "wrong status %x\n", U(iosb).Status ); - todo_wine ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - todo_wine ok( is_signaled( event ), "event is not signaled\n" ); + ok( U(iosb).Status == STATUS_END_OF_FILE, "wrong status %x\n", U(iosb).Status ); + ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( !apc_count, "apc was called\n" ); @@ -2094,9 +2094,7 @@ static void test_read_write(void) iob.Information = -1; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), NULL, NULL); ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status); -todo_wine ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", U(iob).Status); -todo_wine ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); SetFilePointer(hfile, 0, NULL, FILE_BEGIN); @@ -2156,7 +2154,6 @@ todo_wine ok(!ret, "ReadFile should fail\n"); ok(GetLastError() == ERROR_HANDLE_EOF, "expected ERROR_HANDLE_EOF, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); -todo_wine ok((NTSTATUS)ovl.Internal == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", ovl.Internal); ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); @@ -2178,9 +2175,7 @@ todo_wine iob.Information = -1; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), NULL, NULL); ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status); -todo_wine ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", U(iob).Status); -todo_wine ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); U(iob).Status = -1; @@ -2195,9 +2190,7 @@ todo_wine offset.QuadPart = sizeof(contents); status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status); -todo_wine ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", U(iob).Status); -todo_wine ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); U(iob).Status = -1; @@ -2213,9 +2206,7 @@ todo_wine offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status); -todo_wine ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", U(iob).Status); -todo_wine ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); U(iob).Status = -1;

1 0

Piotr Caban : comctl32: Initialize himlState list in TREEVIEW_Paint when TVS_CHECKBOXES flag is set .
by Alexandre Julliard 31 Oct '13

31 Oct '13

Module: wine Branch: master Commit: 40648ddfd53aef1ddcb9dc5000e4430a030061fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=40648ddfd53aef1ddcb9dc500… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 31 17:27:40 2013 +0100 comctl32: Initialize himlState list in TREEVIEW_Paint when TVS_CHECKBOXES flag is set. --- dlls/comctl32/treeview.c | 123 +++++++++++++++++++++++++-------------------- 1 files changed, 68 insertions(+), 55 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index c73fb54..ae69623 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -2943,6 +2943,62 @@ TREEVIEW_Invalidate(const TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *item) InvalidateRect(infoPtr->hwnd, NULL, TRUE); } +static void +TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) +{ + RECT rc; + HBITMAP hbm, hbmOld; + HDC hdc, hdcScreen; + int nIndex; + + infoPtr->himlState = ImageList_Create(16, 16, ILC_COLOR | ILC_MASK, 3, 0); + + hdcScreen = GetDC(0); + + hdc = CreateCompatibleDC(hdcScreen); + hbm = CreateCompatibleBitmap(hdcScreen, 48, 16); + hbmOld = SelectObject(hdc, hbm); + + SetRect(&rc, 0, 0, 48, 16); + FillRect(hdc, &rc, (HBRUSH)(COLOR_WINDOW+1)); + + SetRect(&rc, 18, 2, 30, 14); + DrawFrameControl(hdc, &rc, DFC_BUTTON, + DFCS_BUTTONCHECK|DFCS_FLAT); + + SetRect(&rc, 34, 2, 46, 14); + DrawFrameControl(hdc, &rc, DFC_BUTTON, + DFCS_BUTTONCHECK|DFCS_FLAT|DFCS_CHECKED); + + SelectObject(hdc, hbmOld); + nIndex = ImageList_AddMasked(infoPtr->himlState, hbm, + comctl32_color.clrWindow); + TRACE("checkbox index %d\n", nIndex); + + DeleteObject(hbm); + DeleteDC(hdc); + ReleaseDC(0, hdcScreen); + + infoPtr->stateImageWidth = 16; + infoPtr->stateImageHeight = 16; +} + +static void +TREEVIEW_ResetImageStateIndex(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) +{ + TREEVIEW_ITEM *child = item->firstChild; + + item->state &= ~TVIS_STATEIMAGEMASK; + item->state |= INDEXTOSTATEIMAGEMASK(1); + + while (child) + { + TREEVIEW_ITEM *next = child->nextSibling; + TREEVIEW_ResetImageStateIndex(infoPtr, child); + child = next; + } +} + static LRESULT TREEVIEW_Paint(TREEVIEW_INFO *infoPtr, HDC hdc_ref) { @@ -2952,6 +3008,17 @@ TREEVIEW_Paint(TREEVIEW_INFO *infoPtr, HDC hdc_ref) TRACE("(%p %p)\n", infoPtr, hdc_ref); + if ((infoPtr->dwStyle & TVS_CHECKBOXES) && !infoPtr->himlState) + { + TREEVIEW_InitCheckboxes(infoPtr); + TREEVIEW_ResetImageStateIndex(infoPtr, infoPtr->root); + + TREEVIEW_EndEditLabelNow(infoPtr, TRUE); + TREEVIEW_UpdateSubTree(infoPtr, infoPtr->root); + TREEVIEW_UpdateScrollBars(infoPtr); + TREEVIEW_Invalidate(infoPtr, NULL); + } + if (hdc_ref) { hdc = hdc_ref; @@ -4972,46 +5039,6 @@ TREEVIEW_MouseWheel(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) /* Create/Destroy *******************************************************/ -static void -TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) -{ - RECT rc; - HBITMAP hbm, hbmOld; - HDC hdc, hdcScreen; - int nIndex; - - infoPtr->himlState = ImageList_Create(16, 16, ILC_COLOR | ILC_MASK, 3, 0); - - hdcScreen = GetDC(0); - - hdc = CreateCompatibleDC(hdcScreen); - hbm = CreateCompatibleBitmap(hdcScreen, 48, 16); - hbmOld = SelectObject(hdc, hbm); - - SetRect(&rc, 0, 0, 48, 16); - FillRect(hdc, &rc, (HBRUSH)(COLOR_WINDOW+1)); - - SetRect(&rc, 18, 2, 30, 14); - DrawFrameControl(hdc, &rc, DFC_BUTTON, - DFCS_BUTTONCHECK|DFCS_FLAT); - - SetRect(&rc, 34, 2, 46, 14); - DrawFrameControl(hdc, &rc, DFC_BUTTON, - DFCS_BUTTONCHECK|DFCS_FLAT|DFCS_CHECKED); - - SelectObject(hdc, hbmOld); - nIndex = ImageList_AddMasked(infoPtr->himlState, hbm, - comctl32_color.clrWindow); - TRACE("checkbox index %d\n", nIndex); - - DeleteObject(hbm); - DeleteDC(hdc); - ReleaseDC(0, hdcScreen); - - infoPtr->stateImageWidth = 16; - infoPtr->stateImageHeight = 16; -} - static LRESULT TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) { @@ -5451,21 +5478,6 @@ TREEVIEW_Size(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) return 0; } -static void TREEVIEW_ResetImageStateIndex(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) -{ - TREEVIEW_ITEM *child = item->firstChild; - - item->state &= ~TVIS_STATEIMAGEMASK; - item->state |= INDEXTOSTATEIMAGEMASK(1); - - while (child) - { - TREEVIEW_ITEM *next = child->nextSibling; - TREEVIEW_ResetImageStateIndex(infoPtr, child); - child = next; - } -} - static LRESULT TREEVIEW_StyleChanged(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { @@ -5509,6 +5521,7 @@ TREEVIEW_StyleChanged(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) infoPtr->dwStyle = dwNewStyle; } + TREEVIEW_EndEditLabelNow(infoPtr, TRUE); TREEVIEW_UpdateSubTree(infoPtr, infoPtr->root); TREEVIEW_UpdateScrollBars(infoPtr); TREEVIEW_Invalidate(infoPtr, NULL);

1 0

Piotr Caban : comctl32: Initialize treeview checkboxes in WM_PAINT when TVS_CHECKBOXES was passed during control creation .
by Alexandre Julliard 31 Oct '13

31 Oct '13

Module: wine Branch: master Commit: 7b1ff882d1abd5a95a943840bfc322b28e4caca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b1ff882d1abd5a95a943840b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 31 17:27:51 2013 +0100 comctl32: Initialize treeview checkboxes in WM_PAINT when TVS_CHECKBOXES was passed during control creation. --- dlls/comctl32/tests/treeview.c | 36 +++++++++++++++++++++++++++++++++++- dlls/comctl32/treeview.c | 3 --- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index d523c23..998cc83 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1771,6 +1771,7 @@ static void test_TVS_CHECKBOXES(void) HWND hTree, hTree2; TVITEMA item; DWORD ret; + MSG msg; hTree = create_treeview_control(0); fill_tree(hTree); @@ -1850,7 +1851,7 @@ static void test_TVS_CHECKBOXES(void) hTree = create_treeview_control(TVS_CHECKBOXES); fill_tree(hTree); himl = (HIMAGELIST)SendMessageA(hTree, TVM_GETIMAGELIST, TVSIL_STATE, 0); - todo_wine ok(himl == NULL, "got %p\n", himl); + ok(himl == NULL, "got %p\n", himl); item.hItem = hRoot; item.mask = TVIF_STATE; @@ -1868,6 +1869,39 @@ static void test_TVS_CHECKBOXES(void) expect(TRUE, ret); ok(item.state == INDEXTOSTATEIMAGEMASK(1), "got 0x%x\n", item.state); + item.hItem = hChild; + item.mask = TVIF_STATE; + item.state = INDEXTOSTATEIMAGEMASK(2); + item.stateMask = TVIS_STATEIMAGEMASK; + ret = SendMessageA(hTree, TVM_SETITEMA, 0, (LPARAM)&item); + expect(TRUE, ret); + + item.hItem = hChild; + item.mask = TVIF_STATE; + item.state = 0; + ret = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, ret); + ok(item.state == INDEXTOSTATEIMAGEMASK(2), "got 0x%x\n", item.state); + + while(GetMessageA(&msg, 0, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + + if((msg.hwnd == hTree) && (msg.message == WM_PAINT)) + break; + } + + item.hItem = hChild; + item.mask = TVIF_STATE; + item.state = 0; + ret = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, ret); + ok(item.state == INDEXTOSTATEIMAGEMASK(1), "got 0x%x\n", item.state); + + himl = (HIMAGELIST)SendMessageA(hTree, TVM_GETIMAGELIST, TVSIL_STATE, 0); + ok(himl != NULL, "got %p\n", himl); + DestroyWindow(hTree); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index ae69623..a885543 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5137,9 +5137,6 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, hwnd, 0, 0, 0); - if (infoPtr->dwStyle & TVS_CHECKBOXES) - TREEVIEW_InitCheckboxes(infoPtr); - /* Make sure actual scrollbar state is consistent with uInternalStatus */ ShowScrollBar(hwnd, SB_VERT, FALSE); ShowScrollBar(hwnd, SB_HORZ, FALSE);

1 0

Piotr Caban : comctl32: Add more TVS_CHECKBOXES flag tests.
by Alexandre Julliard 31 Oct '13

31 Oct '13

Module: wine Branch: master Commit: c4708bca338dd36bbc381ebfd04a65a4f8802a0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4708bca338dd36bbc381ebfd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 31 17:28:05 2013 +0100 comctl32: Add more TVS_CHECKBOXES flag tests. --- dlls/comctl32/tests/treeview.c | 57 +++++++++++++++++++++++++++++++++++---- 1 files changed, 51 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 998cc83..24206d5 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1842,12 +1842,6 @@ static void test_TVS_CHECKBOXES(void) DestroyWindow(hTree); /* the same, but initially created with TVS_CHECKBOXES */ - hTree = create_treeview_control(0); - fill_tree(hTree); - himl = (HIMAGELIST)SendMessageA(hTree, TVM_GETIMAGELIST, TVSIL_STATE, 0); - ok(himl == NULL, "got %p\n", himl); - DestroyWindow(hTree); - hTree = create_treeview_control(TVS_CHECKBOXES); fill_tree(hTree); himl = (HIMAGELIST)SendMessageA(hTree, TVM_GETIMAGELIST, TVSIL_STATE, 0); @@ -1903,6 +1897,57 @@ static void test_TVS_CHECKBOXES(void) ok(himl != NULL, "got %p\n", himl); DestroyWindow(hTree); + + /* check what happens if TVSIL_STATE image list is removed */ + hTree = create_treeview_control(0); + fill_tree(hTree); + himl = (HIMAGELIST)SendMessageA(hTree, TVM_GETIMAGELIST, TVSIL_STATE, 0); + ok(himl == NULL, "got %p\n", himl); + + SetWindowLongA(hTree, GWL_STYLE, GetWindowLongA(hTree, GWL_STYLE) | TVS_CHECKBOXES); + himl = (HIMAGELIST)SendMessageA(hTree, TVM_GETIMAGELIST, TVSIL_STATE, 0); + ok(himl != NULL, "got %p\n", himl); + + himl2 = (HIMAGELIST)SendMessageA(hTree, TVM_SETIMAGELIST, TVSIL_STATE, 0); + ok(himl2 == himl, "got %p\n", himl2); + + himl2 = (HIMAGELIST)SendMessageA(hTree, TVM_GETIMAGELIST, TVSIL_STATE, 0); + ok(himl2 == NULL, "got %p\n", himl2); + + item.hItem = hChild; + item.mask = TVIF_STATE; + item.state = INDEXTOSTATEIMAGEMASK(2); + item.stateMask = TVIS_STATEIMAGEMASK; + ret = SendMessageA(hTree, TVM_SETITEMA, 0, (LPARAM)&item); + expect(TRUE, ret); + + item.hItem = hChild; + item.mask = TVIF_STATE; + item.state = 0; + ret = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, ret); + ok(item.state == INDEXTOSTATEIMAGEMASK(2), "got 0x%x\n", item.state); + + while(GetMessageA(&msg, 0, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + + if((msg.hwnd == hTree) && (msg.message == WM_PAINT)) + break; + } + + item.hItem = hChild; + item.mask = TVIF_STATE; + item.state = 0; + ret = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, ret); + ok(item.state == INDEXTOSTATEIMAGEMASK(1), "got 0x%x\n", item.state); + + himl = (HIMAGELIST)SendMessageA(hTree, TVM_GETIMAGELIST, TVSIL_STATE, 0); + ok(himl != NULL, "got %p\n", himl); + + DestroyWindow(hTree); } static void test_TVM_GETNEXTITEM(void)

1 0

Vincent Povirk : gdiplus: Use clip region in GdipDrawPath.
by Alexandre Julliard 31 Oct '13

31 Oct '13

Module: wine Branch: master Commit: 08b650202cf9dccd94be8ec9d73564ae539620db URL: http://source.winehq.org/git/wine.git/?a=commit;h=08b650202cf9dccd94be8ec9d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 30 11:13:46 2013 -0500 gdiplus: Use clip region in GdipDrawPath. --- dlls/gdiplus/graphics.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 1b9d0e9..ad5e2be 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3342,6 +3342,7 @@ GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) { INT save_state; GpStatus retval; + HRGN hrgn=NULL; TRACE("(%p, %p, %p)\n", graphics, pen, path); @@ -3359,10 +3360,20 @@ GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) save_state = prepare_dc(graphics, pen); + retval = get_clip_hrgn(graphics, &hrgn); + + if (retval != Ok) + goto end; + + if (hrgn) + ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); + retval = draw_poly(graphics, pen, path->pathdata.Points, path->pathdata.Types, path->pathdata.Count, TRUE); +end: restore_dc(graphics, save_state); + DeleteObject(hrgn); return retval; }

1 0