August 2016 - Wine-commits - list.winehq.org

Jacek Caban : wininet: Return data available in current chunk in chunked_get_avail_data.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 16d300cacdeae49c73e334f5b519b112e019751f URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d300cacdeae49c73e334f5b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 2 15:33:40 2016 +0200 wininet: Return data available in current chunk in chunked_get_avail_data. Based on a patch by Hans Leidekker. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 47700c9..ac79404 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2711,12 +2711,6 @@ static char next_chunked_data_char(chunked_stream_t *stream) return stream->buf[stream->buf_pos++]; } -static DWORD chunked_get_avail_data(data_stream_t *stream, http_request_t *req) -{ - /* Allow reading only from read buffer */ - return 0; -} - static BOOL chunked_end_of_data(data_stream_t *stream, http_request_t *req) { chunked_stream_t *chunked_stream = (chunked_stream_t*)stream; @@ -2858,6 +2852,26 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, return ERROR_SUCCESS; } +static DWORD chunked_get_avail_data(data_stream_t *stream, http_request_t *req) +{ + chunked_stream_t *chunked_stream = (chunked_stream_t*)stream; + DWORD avail = 0; + + if(chunked_stream->state != CHUNKED_STREAM_STATE_READING_CHUNK) { + DWORD res, read; + + /* try to process to the next chunk */ + res = chunked_read(stream, req, NULL, 0, &read, BLOCKING_DISALLOW); + if(res != ERROR_SUCCESS || chunked_stream->state != CHUNKED_STREAM_STATE_READING_CHUNK) + return 0; + } + + if(is_valid_netconn(req->netconn) && chunked_stream->buf_size < chunked_stream->chunk_size) + NETCON_query_data_available(req->netconn, &avail); + + return min(avail + chunked_stream->buf_size, chunked_stream->chunk_size); +} + static BOOL chunked_drain_content(data_stream_t *stream, http_request_t *req) { chunked_stream_t *chunked_stream = (chunked_stream_t*)stream;

1 0

Anton Baskanov : amstream: Fix AMAudioData::QueryInterface.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 4a0db15622b6ea3ce5b0bd827363a83af504d7e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a0db15622b6ea3ce5b0bd827… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Jul 28 21:59:51 2016 +0600 amstream: Fix AMAudioData::QueryInterface. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiodata.c | 1 - dlls/amstream/tests/amstream.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c index c3bc1a6..7adb0c2 100644 --- a/dlls/amstream/audiodata.c +++ b/dlls/amstream/audiodata.c @@ -43,7 +43,6 @@ static HRESULT WINAPI IAudioDataImpl_QueryInterface(IAudioData *iface, REFIID ri TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), ret_iface); if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IMemoryData) || IsEqualGUID(riid, &IID_IAudioData)) { IAudioData_AddRef(iface); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index c9e9392..b4ead56 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -593,6 +593,39 @@ error: IAMMultiMediaStream_Release(pams); } +static IUnknown *create_audio_data(void) +{ + IUnknown *audio_data = NULL; + HRESULT result = CoCreateInstance(&CLSID_AMAudioData, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&audio_data); + ok(S_OK == result, "got 0x%08x\n", result); + return audio_data; +} + +static void test_audiodata_query_interface(void) +{ + IUnknown *unknown = create_audio_data(); + IMemoryData *memory_data = NULL; + IAudioData *audio_data = NULL; + + HRESULT result; + + result = IUnknown_QueryInterface(unknown, &IID_IMemoryData, (void **)&memory_data); + ok(E_NOINTERFACE == result, "got 0x%08x\n", result); + + result = IUnknown_QueryInterface(unknown, &IID_IAudioData, (void **)&audio_data); + ok(S_OK == result, "got 0x%08x\n", result); + if (S_OK == result) + { + result = IAudioData_QueryInterface(audio_data, &IID_IMemoryData, (void **)&memory_data); + ok(E_NOINTERFACE == result, "got 0x%08x\n", result); + + IAudioData_Release(audio_data); + } + + IUnknown_Release(unknown); +} + START_TEST(amstream) { HANDLE file; @@ -611,5 +644,7 @@ START_TEST(amstream) test_renderfile(); } + test_audiodata_query_interface(); + CoUninitialize(); }

1 0

Anton Baskanov : amstream: Implement AMAudioData::GetInfo.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 6010ebb22f8f783e5802e691ed7b1b6f0eb88969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6010ebb22f8f783e5802e691e… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Jul 28 21:59:52 2016 +0600 amstream: Implement AMAudioData::GetInfo. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiodata.c | 27 +++++++++++++++++++++++++-- dlls/amstream/tests/amstream.c | 25 +++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c index 7adb0c2..842fc95 100644 --- a/dlls/amstream/audiodata.c +++ b/dlls/amstream/audiodata.c @@ -30,6 +30,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); typedef struct { IAudioData IAudioData_iface; LONG ref; + DWORD size; + BYTE *data; + DWORD actual_data; } AMAudioDataImpl; static inline AMAudioDataImpl *impl_from_IAudioData(IAudioData *iface) @@ -87,9 +90,29 @@ static HRESULT WINAPI IAudioDataImpl_SetBuffer(IAudioData* iface, DWORD size, BY static HRESULT WINAPI IAudioDataImpl_GetInfo(IAudioData* iface, DWORD *length, BYTE **data, DWORD *actual_data) { - FIXME("(%p)->(%p,%p,%p): stub\n", iface, length, data, actual_data); + AMAudioDataImpl *This = impl_from_IAudioData(iface); - return E_NOTIMPL; + TRACE("(%p)->(%p,%p,%p)\n", iface, length, data, actual_data); + + if (!This->data) + { + return MS_E_NOTINIT; + } + + if (length) + { + *length = This->size; + } + if (data) + { + *data = This->data; + } + if (actual_data) + { + *actual_data = This->actual_data; + } + + return S_OK; } static HRESULT WINAPI IAudioDataImpl_SetActual(IAudioData* iface, DWORD data_valid) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index b4ead56..307868d 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -626,6 +626,30 @@ static void test_audiodata_query_interface(void) IUnknown_Release(unknown); } +static void test_audiodata_get_info(void) +{ + IUnknown *unknown = create_audio_data(); + IAudioData *audio_data = NULL; + + HRESULT result; + + result = IUnknown_QueryInterface(unknown, &IID_IAudioData, (void **)&audio_data); + if (FAILED(result)) + { + /* test_audiodata_query_interface handles this case */ + skip("No IAudioData\n"); + goto out_unknown; + } + + result = IAudioData_GetInfo(audio_data, NULL, NULL, NULL); + ok(MS_E_NOTINIT == result, "got 0x%08x\n", result); + + IAudioData_Release(audio_data); + +out_unknown: + IUnknown_Release(unknown); +} + START_TEST(amstream) { HANDLE file; @@ -645,6 +669,7 @@ START_TEST(amstream) } test_audiodata_query_interface(); + test_audiodata_get_info(); CoUninitialize(); }

1 0

Michael Stefaniuc : ddraw: Use SetRectEmpty() instead of memset().
by Alexandre Julliard 01 Aug '16

01 Aug '16

Module: wine Branch: master Commit: 3e8a683658af896cfef5c160a59982c326f3e1f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e8a683658af896cfef5c160a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jul 30 22:07:45 2016 +0200 ddraw: Use SetRectEmpty() instead of memset(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 398a3ec..db03303 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1012,7 +1012,7 @@ static HRESULT surface_lock(struct ddraw_surface *surface, if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { if (flags & DDLOCK_READONLY) - memset(&surface->ddraw->primary_lock, 0, sizeof(surface->ddraw->primary_lock)); + SetRectEmpty(&surface->ddraw->primary_lock); else if (rect) surface->ddraw->primary_lock = *rect; else

1 0

Nikolay Sivov : ucrtbase: Forward set_terminate().
by Alexandre Julliard 01 Aug '16

01 Aug '16

Module: wine Branch: master Commit: 4fe8b0cc1c6ec9e6e6e9ad088b0bb29f605e6086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fe8b0cc1c6ec9e6e6e9ad088… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 1 14:01:17 2016 +0300 ucrtbase: Forward set_terminate(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index cbda9ce..3ba1016 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -99,7 +99,7 @@ @ cdecl perror(str) ucrtbase.perror @ stub quick_exit @ cdecl raise(long) ucrtbase.raise -@ stub set_terminate +@ cdecl set_terminate(ptr) ucrtbase.set_terminate @ cdecl signal(long long) ucrtbase.signal @ cdecl strerror(long) ucrtbase.strerror @ cdecl strerror_s(ptr long long) ucrtbase.strerror_s diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 24a7f1f..6d7e631 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2480,7 +2480,7 @@ @ cdecl scalbn(double long) MSVCRT__scalb @ cdecl scalbnf(float long) MSVCRT__scalbf @ cdecl scalbnl(double long) MSVCR120_scalbnl -@ stub set_terminate +@ cdecl set_terminate(ptr) MSVCRT_set_terminate @ cdecl set_unexpected(ptr) MSVCRT_set_unexpected @ cdecl setbuf(ptr ptr) MSVCRT_setbuf @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp

1 0

Jacek Caban : wininet: Rewrite chunked stream to store full stream state and allow non-blocking reads crossing chunk boundries.
by Alexandre Julliard 01 Aug '16

01 Aug '16

Module: wine Branch: master Commit: 6e0c842dfa947263eb24cd88371e29e7e00bfd2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e0c842dfa947263eb24cd883… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 1 16:17:00 2016 +0200 wininet: Rewrite chunked stream to store full stream state and allow non-blocking reads crossing chunk boundries. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 278 ++++++++++++++++++++++++---------------------------- 1 file changed, 130 insertions(+), 148 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e0c842dfa947263eb24c…

1 0

Jacek Caban : wininet: Added chunked stream blocking tests.
by Alexandre Julliard 01 Aug '16

01 Aug '16

Module: wine Branch: master Commit: e7d6bba22e469e5508cbd248a4dd4fee4445da15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7d6bba22e469e5508cbd248a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 1 16:17:12 2016 +0200 wininet: Added chunked stream blocking tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index e84ffa3..bf3f690 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4718,6 +4718,47 @@ static void test_http_read(int port) close_async_handle(req.session, hCompleteEvent, 2); + open_read_test_request(port, &req, + "HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "Transfer-Encoding: chunked\r\n" + "\r\n" + "9\r\n123456789"); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "123456789"); + readex_expect_async(req.request, IRF_NO_WAIT, &ib, sizeof(buf)); + + send_response_and_wait("\r\n1\r\na\r\n1\r\nb\r", FALSE, &ib); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "ab"); + readex_expect_async(req.request, IRF_NO_WAIT, &ib, sizeof(buf)); + + send_response_and_wait("\n3\r\nab", FALSE, &ib); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "ab"); + readex_expect_async(req.request, IRF_NO_WAIT, &ib, sizeof(buf)); + + send_response_and_wait("c", FALSE, &ib); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "c"); + readex_expect_async(req.request, IRF_NO_WAIT, &ib, sizeof(buf)); + + send_response_and_wait("\r\n1\r\nx\r\n0\r\n\r\n", TRUE, &ib); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "x"); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), ""); + + close_async_handle(req.session, hCompleteEvent, 2); + + open_read_test_request(port, &req, + "HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "Transfer-Encoding: chunked\r\n" + "\r\n" + "3\r\n123\r\n"); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "123"); + readex_expect_async(req.request, IRF_NO_WAIT, &ib, sizeof(buf)); + + send_response_and_wait("0\r\n\r\n", TRUE, &ib); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), ""); + + close_async_handle(req.session, hCompleteEvent, 2); + CloseHandle(hCompleteEvent); CloseHandle(conn_wait_event); CloseHandle(server_req_rec_event);

1 0

Andrey Gusev : d3dx10: Add D3DX10CreateTextureFromMemory stub.
by Alexandre Julliard 01 Aug '16

01 Aug '16

Module: wine Branch: master Commit: 7aadb08212a5269ebefcb100cf567f7cf7aa0a7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aadb08212a5269ebefcb100c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jul 29 21:21:25 2016 +0300 d3dx10: Add D3DX10CreateTextureFromMemory stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/d3dx10_43_main.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index f410be8..8c71cce 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -44,7 +44,7 @@ @ stub D3DX10CreateSprite(ptr long ptr) @ stub D3DX10CreateTextureFromFileA(ptr str ptr ptr ptr ptr) @ stub D3DX10CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) -@ stub D3DX10CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) +@ stdcall D3DX10CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX10CreateTextureFromResourceA(ptr long str ptr ptr ptr ptr) @ stub D3DX10CreateTextureFromResourceW(ptr long wstr ptr ptr ptr ptr) @ stdcall D3DX10FilterTexture(ptr long long) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 7308373..3f81088 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -187,6 +187,17 @@ HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE drive return hr; } +HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *src_data, + SIZE_T src_data_size, D3DX10_IMAGE_LOAD_INFO *loadinfo, ID3DX10ThreadPump *pump, + ID3D10Resource **texture, HRESULT *hresult) +{ + FIXME("device %p, src_data %p, src_data_size %lu, loadinfo %p, pump %p, texture %p, " + "hresult %p, stub!\n", + device, src_data, src_data_size, loadinfo, pump, texture, hresult); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DX10FilterTexture(ID3D10Resource *texture, UINT src_level, UINT filter) { FIXME("texture %p, src_level %u, filter %#x stub!\n", texture, src_level, filter);

1 0

Huw Davies : gdi32: Only reselect the objects if the linear transform portion changes.
by Alexandre Julliard 01 Aug '16

01 Aug '16

Module: wine Branch: master Commit: 28bb9d15a69a749e3de6a9f5c026dc6cd0a5bf27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28bb9d15a69a749e3de6a9f5c… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 1 09:43:18 2016 +0100 gdi32: Only reselect the objects if the linear transform portion changes. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 92a98df..27e89ae 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -325,6 +325,17 @@ static void construct_window_to_viewport(DC *dc, XFORM *xform) } /*********************************************************************** + * linear_xform_cmp + * + * Compares the linear transform portion of two XFORMs (i.e. the 2x2 submatrix). + * Returns 0 if they match. + */ +static inline int linear_xform_cmp( const XFORM *a, const XFORM *b ) +{ + return memcmp( a, b, FIELD_OFFSET( XFORM, eDx ) ); +} + +/*********************************************************************** * DC_UpdateXforms * * Updates the xformWorld2Vport, xformVport2World and vport2WorldValid @@ -351,7 +362,7 @@ void DC_UpdateXforms( DC *dc ) /* Reselect the font and pen back into the dc so that the size gets updated. */ - if (memcmp(&oldworld2vport, &dc->xformWorld2Vport, sizeof(oldworld2vport)) && + if (linear_xform_cmp( &oldworld2vport, &dc->xformWorld2Vport ) && !GdiIsMetaFileDC(dc->hSelf)) { SelectObject(dc->hSelf, dc->hFont);

1 0

Nikolay Sivov : comctl32/listview: Filter invalid indices when setting selection mark.
by Alexandre Julliard 01 Aug '16

01 Aug '16

Module: wine Branch: master Commit: 5faab43d34f48030fdbf6689c92aa3e82e00aefc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5faab43d34f48030fdbf6689c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 1 12:18:50 2016 +0300 comctl32/listview: Filter invalid indices when setting selection mark. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 3 ++- dlls/comctl32/tests/listview.c | 24 +++++++++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index cfdb7de..a32c594 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9053,7 +9053,8 @@ static INT LISTVIEW_SetSelectionMark(LISTVIEW_INFO *infoPtr, INT nIndex) TRACE("(nIndex=%d)\n", nIndex); - infoPtr->nSelectionMark = nIndex; + if (nIndex >= -1 && nIndex < infoPtr->nItemCount) + infoPtr->nSelectionMark = nIndex; return nOldIndex; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 549dc21..8214d7b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2257,7 +2257,29 @@ static void test_multiselect(void) item_count = SendMessageA(hwnd, LVM_GETITEMCOUNT, 0, 0); expect(items, item_count); - for (i = 0; i < 4; i++) { + r = SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, -1); + ok(r == -1, "got %d\n", r); + + r = SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, 0); + ok(r == -1, "got %d\n", r); + + r = SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, 0); + ok(r == 0, "got %d\n", r); + + /* out of range index */ + r = SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, items); + ok(r == 0, "got %d\n", r); + + r = SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0); + ok(r == 0, "got %d\n", r); + + r = SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, -2); + ok(r == 0, "got %d\n", r); + + r = SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0); + ok(r == 0, "got %d\n", r); + + for (i = 0; i < sizeof(task_list)/sizeof(task_list[0]); i++) { DWORD selected_count; LVITEMA item;

1 0