wine-commits January 2018

wine-commits@winehq.org

2 participants
638 discussions

Alexandre Julliard : Release 3.0-rc5.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: bd41696680a15f399558b8635525537337f997d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd41696680a15f399558b863… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 5 20:59:29 2018 +0100 Release 3.0-rc5. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + ANNOUNCE | 204 +++++++++++++++++++++++++++++++++++++++++++------------------- VERSION | 2 +- configure | 18 +++--- 4 files changed, 153 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bd41696680a15f399558…

1 0

Piotr Caban : user32: Add more CB_SETCURSEL tests on ComboBox.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: a5118adbbca903d686b8f12316ab642c682f3db9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5118adbbca903d686b8f123… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 5 19:25:46 2018 +0100 user32: Add more CB_SETCURSEL tests on ComboBox. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 2 +- dlls/user32/tests/msg.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 0c530f7..b69f892 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -726,7 +726,7 @@ static void CBPaintText( static const WCHAR empty_stringW[] = { 0 }; if( CB_HASSTRINGS(lphc) ) SetWindowTextW( lphc->hWndEdit, pText ? pText : empty_stringW ); if( lphc->wState & CBF_FOCUSED ) - SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); + SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, MAXLONG); } else if(!(lphc->wState & CBF_NOREDRAW) && IsWindowVisible( lphc->self )) { diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 64c7967..f391ab9 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6625,6 +6625,14 @@ static const struct message SetCurSelComboSeq2[] = { 0 } }; +static const struct message SetCurSelComboSeq_edit[] = +{ + { CB_SETCURSEL, sent|wparam|lparam, 0, 0 }, + { WM_SETTEXT, sent|wparam, 0 }, + { EM_SETSEL, sent|wparam|lparam, 0, INT_MAX }, + { 0 } +}; + static const struct message WmKeyDownComboSeq[] = { { WM_KEYDOWN, sent|wparam|lparam, VK_DOWN, 0 }, @@ -6926,6 +6934,14 @@ static void test_combobox_messages(void) log_all_parent_messages--; ok_sequence(SetFocusButtonSeq2, "SetFocus on a Button (2)", TRUE); + SetFocus(combo); + SendMessageA(combo, WM_SETREDRAW, FALSE, 0); + flush_sequence(); + log_all_parent_messages++; + SendMessageA(combo, CB_SETCURSEL, 0, 0); + log_all_parent_messages--; + ok_sequence(SetCurSelComboSeq_edit, "CB_SETCURSEL on a ComboBox with edit control", FALSE); + DestroyWindow(button); DestroyWindow(combo);

1 0

Piotr Caban : user32: Redraw combo text field even if it's empty.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: a912b2377117e4b826bdac09cfc87147da3a87c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a912b2377117e4b826bdac09… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 5 19:25:33 2018 +0100 user32: Redraw combo text field even if it's empty. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 956385f..0c530f7 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -720,9 +720,6 @@ static void CBPaintText( pText[size] = '\0'; /* just in case */ } else return; } - else - if( !CB_OWNERDRAWN(lphc) ) - return; if( lphc->wState & CBF_EDIT ) {

1 0

Piotr Caban : user32: Let ComboBox edit control handle the redraw even if CBF_NOREDRAW is set.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: 910129fcf7a7ade52a78d588685a860acae8d8b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=910129fcf7a7ade52a78d588… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 5 19:25:20 2018 +0100 user32: Let ComboBox edit control handle the redraw even if CBF_NOREDRAW is set. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 0e64e85..956385f 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -703,8 +703,6 @@ static void CBPaintText( INT id, size = 0; LPWSTR pText = NULL; - if( lphc->wState & CBF_NOREDRAW ) return; - TRACE("\n"); /* follow Windows combobox that sends a bunch of text @@ -733,8 +731,9 @@ static void CBPaintText( if( lphc->wState & CBF_FOCUSED ) SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); } - else if( IsWindowVisible( lphc->self )) /* paint text field ourselves */ + else if(!(lphc->wState & CBF_NOREDRAW) && IsWindowVisible( lphc->self )) { + /* paint text field ourselves */ HDC hdc = hdc_paint ? hdc_paint : GetDC(lphc->self); UINT itemState = ODS_COMBOBOXEDIT; HFONT hPrevFont = (lphc->hFont) ? SelectObject(hdc, lphc->hFont) : 0;

1 0

Nikolay Sivov : ddraw/tests: Add another invalid arguments test for surface QI.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: 030803b422197c7953894e91458c8247ac3633bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=030803b422197c7953894e91… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 5 18:50:40 2018 +0300 ddraw/tests: Add another invalid arguments test for surface QI. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 1 + dlls/ddraw/tests/ddraw2.c | 1 + dlls/ddraw/tests/ddraw4.c | 1 + dlls/ddraw/tests/ddraw7.c | 1 + dlls/ddraw/tests/dsurface.c | 28 ---------------------------- 5 files changed, 4 insertions(+), 28 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 9a872f8..d416cf5 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1963,6 +1963,7 @@ static void test_surface_qi(void) {&IID_IDirectDrawPalette, NULL, E_INVALIDARG }, {&IID_IDirectDrawClipper, NULL, E_INVALIDARG }, {&IID_IUnknown, &IID_IDirectDrawSurface, S_OK }, + {NULL, NULL, E_INVALIDARG }, }; IDirectDrawSurface *surface; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index dc74c69..2186c31 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2083,6 +2083,7 @@ static void test_surface_qi(void) {&IID_IDirectDrawPalette, NULL, E_INVALIDARG }, {&IID_IDirectDrawClipper, NULL, E_INVALIDARG }, {&IID_IUnknown, &IID_IDirectDrawSurface, S_OK }, + {NULL, NULL, E_INVALIDARG }, }; IDirectDrawSurface *surface; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index aeac118..4c1bd78 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2233,6 +2233,7 @@ static void test_surface_qi(void) {&IID_IDirectDrawPalette, NULL, E_INVALIDARG }, {&IID_IDirectDrawClipper, NULL, E_INVALIDARG }, {&IID_IUnknown, &IID_IDirectDrawSurface, S_OK }, + {NULL, NULL, E_INVALIDARG }, }; IDirectDrawSurface4 *surface; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index ce4117b..d7355cf 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1970,6 +1970,7 @@ static void test_surface_qi(void) {&IID_IDirectDrawPalette, NULL, E_NOINTERFACE}, {&IID_IDirectDrawClipper, NULL, E_NOINTERFACE}, {&IID_IUnknown, &IID_IDirectDrawSurface, S_OK }, + {NULL, NULL, E_INVALIDARG }, }; IDirectDrawSurface7 *surface; diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 9e02295..90e7fcf 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -61,33 +61,6 @@ static void ReleaseDirectDraw(void) } } -static void QueryInterface(void) -{ - IDirectDrawSurface *dsurface; - DDSURFACEDESC surface; - void *object; - HRESULT ret; - - /* Create a surface */ - ZeroMemory(&surface, sizeof(surface)); - surface.dwSize = sizeof(surface); - surface.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; - surface.dwHeight = 10; - surface.dwWidth = 10; - ret = IDirectDraw_CreateSurface(lpDD, &surface, &dsurface, NULL); - if(ret != DD_OK) - { - ok(FALSE, "IDirectDraw::CreateSurface failed with error %x\n", ret); - return; - } - - /* Call IUnknown::QueryInterface */ - ret = IDirectDrawSurface_QueryInterface(dsurface, 0, &object); - ok(ret == DDERR_INVALIDPARAMS, "IDirectDrawSurface::QueryInterface returned %x\n", ret); - - IDirectDrawSurface_Release(dsurface); -} - /* The following tests test which interface is returned by IDirectDrawSurfaceX::GetDDInterface. * It uses refcounts to test that and compares the interface addresses. Partially fits here, and * partially in the refcount test @@ -2632,7 +2605,6 @@ START_TEST(dsurface) return; } - QueryInterface(); GetDDInterface_1(); GetDDInterface_2(); GetDDInterface_4();

1 0

Henri Verbeet : ddraw/tests: Add a depth read-back test.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: f427714bf958a83a8bfb5129044498611dfaff59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f427714bf958a83a8bfb5129… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 5 18:53:13 2018 +0100 ddraw/tests: Add a depth read-back test. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 134 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 132 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 148 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 141 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 555 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f427714bf958a83a8bfb…

1 0

Henri Verbeet : wined3d: Add a download function for WINED3DFMT_X8D24_UNORM.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: bc75bec270bfdc09c881799b331aabf4d119a271 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc75bec270bfdc09c881799b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 5 18:53:12 2018 +0100 wined3d: Add a download function for WINED3DFMT_X8D24_UNORM. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 58 ++++++++++++++++++++++++++++++++++++------ dlls/wined3d/texture.c | 10 ++++---- dlls/wined3d/utils.c | 47 +++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 8 ++++-- 4 files changed, 99 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bc75bec270bfdc09c881…

1 0

Francois Gouget : msvcr90/tests: Make test__vsnwprintf() static.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: c1ff2f19b5ac96b8f1a8f21457b97da6ff323079 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1ff2f19b5ac96b8f1a8f214… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 4 15:56:07 2018 +0100 msvcr90/tests: Make test__vsnwprintf() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 85dd80b..dd62f3a 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -1876,7 +1876,7 @@ static int WINAPIV _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t * return ret; } -void test__vsnwprintf(void) +static void test__vsnwprintf(void) { int ret; WCHAR str[2] = {0};

1 0

Alex Henrie : msvcrt: Don' t include MSVC 7.1+ purecall functions in SOs for older DLLs.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: 5041d89b9779dd3b4f3ef9b9f9e054db714f7e39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5041d89b9779dd3b4f3ef9b9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jan 3 21:33:03 2018 -0700 msvcrt: Don't include MSVC 7.1+ purecall functions in SOs for older DLLs. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 44b29c1..d0e93d7 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -462,6 +462,7 @@ void CDECL _register_thread_local_exe_atexit_callback(_tls_callback_type callbac tls_atexit_callback = callback; } +#if _MSVCR_VER>=71 /********************************************************************* * _set_purecall_handler (MSVCR71.@) */ @@ -473,15 +474,18 @@ MSVCRT_purecall_handler CDECL _set_purecall_handler(MSVCRT_purecall_handler func purecall_handler = function; return ret; } +#endif +#if _MSVCR_VER>=80 /********************************************************************* - * _get_purecall_handler + * _get_purecall_handler (MSVCR80.@) */ MSVCRT_purecall_handler CDECL _get_purecall_handler(void) { TRACE("\n"); return purecall_handler; } +#endif /********************************************************************* * _purecall (MSVCRT.@)

1 0

Alex Henrie : msvcrt: Don' t include MSVC 8.0+ time functions in SOs for older DLLs.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: b4e1390123f372abe9ad0f86a3ca0fbd5743adc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4e1390123f372abe9ad0f86… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jan 3 21:33:02 2018 -0700 msvcrt: Don't include MSVC 8.0+ time functions in SOs for older DLLs. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 57657ca..b7b76af 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -890,6 +890,7 @@ int * CDECL MSVCRT___p__dstbias(void) return &MSVCRT__dstbias; } +#if _MSVCR_VER >= 80 /********************************************************************* * _get_dstbias (MSVCR80.@) */ @@ -899,6 +900,7 @@ int CDECL MSVCRT__get_dstbias(int *seconds) *seconds = MSVCRT__dstbias; return 0; } +#endif /********************************************************************* * __p__timezone (MSVCRT.@) @@ -1246,14 +1248,16 @@ einval_error: return 0; } +#if _MSVCR_VER >= 80 /******************************************************************** - * _strftime_l (MSVCRT.@) + * _strftime_l (MSVCR80.@) */ MSVCRT_size_t CDECL MSVCRT__strftime_l( char *str, MSVCRT_size_t max, const char *format, const struct MSVCRT_tm *mstm, MSVCRT__locale_t loc ) { return strftime_helper(str, max, format, mstm, NULL, loc); } +#endif /********************************************************************* * _Strftime (MSVCRT.@) @@ -1316,8 +1320,9 @@ MSVCRT_size_t CDECL MSVCRT_wcsftime( MSVCRT_wchar_t *str, MSVCRT_size_t max, return wcsftime_helper(str, max, format, mstm, NULL, NULL); } +#if _MSVCR_VER >= 110 /********************************************************************* - * _Wcsftime (MSVCRT.@) + * _Wcsftime (MSVCR110.@) */ MSVCRT_size_t CDECL _Wcsftime(MSVCRT_wchar_t *str, MSVCRT_size_t max, const MSVCRT_wchar_t *format, const struct MSVCRT_tm *mstm, @@ -1325,6 +1330,7 @@ MSVCRT_size_t CDECL _Wcsftime(MSVCRT_wchar_t *str, MSVCRT_size_t max, { return wcsftime_helper(str, max, format, mstm, time_data, NULL); } +#endif static char* asctime_buf(char *buf, const struct MSVCRT_tm *mstm) { @@ -1582,8 +1588,10 @@ int CDECL MSVCRT__wctime32_s(MSVCRT_wchar_t *buf, MSVCRT_size_t size, return MSVCRT__wasctime_s(buf, size, &tm); } +#if _MSVCR_VER >= 80 + /********************************************************************* - * _get_timezone (MSVCR100.@) + * _get_timezone (MSVCR80.@) */ int CDECL _get_timezone(LONG *timezone) { @@ -1594,7 +1602,7 @@ int CDECL _get_timezone(LONG *timezone) } /********************************************************************* - * _get_daylight (MSVCR100.@) + * _get_daylight (MSVCR80.@) */ int CDECL _get_daylight(int *hours) { @@ -1603,3 +1611,5 @@ int CDECL _get_daylight(int *hours) *hours = MSVCRT___daylight; return 0; } + +#endif /* _MSVCR_VER >= 80 */

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2018