November 2018 - Wine-Commits

Gabriel Ivăncescu : user32/listbox: Use ULONG_PTR instead of DWORD when retrieving text without HAS_STRINGS.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: c920b4dc5aa2758913c141261c7297e60f301977 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c920b4dc5aa2758913c14126… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 15 11:46:18 2018 +0200 user32/listbox: Use ULONG_PTR instead of DWORD when retrieving text without HAS_STRINGS. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 6 +++--- dlls/user32/tests/listbox.c | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index b5b7dc6..5746293 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -799,8 +799,8 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL __ENDTRY } else { if (buffer) - *((LPDWORD)buffer)=*(LPDWORD)(&descr->items[index].data); - len = sizeof(DWORD); + *((ULONG_PTR *)buffer) = descr->items[index].data; + len = sizeof(ULONG_PTR); } return len; } @@ -2707,7 +2707,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - if (!HAS_STRINGS(descr)) return sizeof(DWORD); + if (!HAS_STRINGS(descr)) return sizeof(ULONG_PTR); if (unicode) return strlenW( descr->items[wParam].str ); return WideCharToMultiByte( CP_ACP, 0, descr->items[wParam].str, strlenW(descr->items[wParam].str), NULL, 0, NULL, NULL ); diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 813968f..658893a 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -2091,12 +2091,10 @@ static void test_LBS_NODATA(void) ret = SendMessageA(listbox, LB_SETITEMDATA, valid_idx[i], 42); ok(ret == TRUE, "Unexpected return value %d.\n", ret); ret = SendMessageA(listbox, LB_GETTEXTLEN, valid_idx[i], 0); - todo_wine_if(sizeof(void *) == 8) ok(ret == sizeof(data), "Unexpected return value %d.\n", ret); memset(&data, 0xee, sizeof(data)); ret = SendMessageA(listbox, LB_GETTEXT, valid_idx[i], (LPARAM)&data); - todo_wine_if(sizeof(void *) == 8) ok(ret == sizeof(data), "Unexpected return value %d.\n", ret); todo_wine ok(!memcmp(&data, &zero_data, sizeof(data)), "Unexpected item data.\n");

1 0

Gabriel Ivăncescu : user32/listbox: Clear LBS_OWNERDRAWVARIABLE if LBS_OWNERDRAWFIXED is set.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: 9b59eb477b9d3aa54bb7c5115de8e3dae1be0205 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b59eb477b9d3aa54bb7c511… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 15 11:46:15 2018 +0200 user32/listbox: Clear LBS_OWNERDRAWVARIABLE if LBS_OWNERDRAWFIXED is set. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 2 ++ dlls/user32/tests/listbox.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index c8bd148..f021029 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2525,6 +2525,8 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) if (descr->style & LBS_OWNERDRAWFIXED) { + descr->style &= ~LBS_OWNERDRAWVARIABLE; + if( descr->lphc && (descr->lphc->dwStyle & CBS_DROPDOWN)) { /* WinWord gets VERY unhappy if we send WM_MEASUREITEM from here */ diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index dc5657c..776e3f3 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -374,6 +374,8 @@ static void test_ownerdraw(void) NULL, NULL, NULL, 0); ok(hLB != NULL, "last error 0x%08x\n", GetLastError()); + ok(GetWindowLongA(hLB, GWL_STYLE) & LBS_OWNERDRAWVARIABLE, "Unexpected window style.\n"); + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); @@ -389,7 +391,6 @@ static void test_ownerdraw(void) ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); -todo_wine ok(ret == 42, "Unexpected item height %d.\n", ret); ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0);

1 0

Gabriel Ivăncescu : user32/tests: Test incompatible styles for LBS_NODATA.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: 24b539dea8d64480f30018183dceba2907a5e061 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24b539dea8d64480f3001818… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 15 11:46:14 2018 +0200 user32/tests: Test incompatible styles for LBS_NODATA. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/listbox.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 6e90d1d..dc5657c 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -264,6 +264,7 @@ static LRESULT WINAPI main_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA } else { + todo_wine_if((style & LBS_NODATA) && strings[mi->itemID]) ok((void*)mi->itemData == strings[mi->itemID], "mi->itemData = %08lx, expected %p\n", mi->itemData, strings[mi->itemID]); } @@ -2042,12 +2043,21 @@ static void test_WM_MEASUREITEM(void) static void test_LBS_NODATA(void) { + static const DWORD invalid_styles[] = + { + 0, + LBS_OWNERDRAWVARIABLE, + LBS_SORT, + LBS_HASSTRINGS, + LBS_OWNERDRAWFIXED | LBS_SORT, + LBS_OWNERDRAWFIXED | LBS_HASSTRINGS, + }; static const UINT invalid_idx[] = { -2, 2 }; static const UINT valid_idx[] = { 0, 1 }; static const ULONG_PTR zero_data; + HWND listbox, parent; unsigned int i; ULONG_PTR data; - HWND listbox; INT ret; listbox = CreateWindowA("listbox", "TestList", LBS_NODATA | LBS_OWNERDRAWFIXED | WS_VISIBLE, @@ -2110,6 +2120,28 @@ todo_wine ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); DestroyWindow(listbox); + + /* Invalid window style combinations. */ + parent = create_parent(); + ok(parent != NULL, "Failed to create parent window.\n"); + + for (i = 0; i < ARRAY_SIZE(invalid_styles); ++i) + { + DWORD style; + + listbox = CreateWindowA("listbox", "TestList", LBS_NODATA | WS_CHILD | invalid_styles[i], + 0, 0, 100, 100, parent, (HMENU)1, NULL, 0); + ok(listbox != NULL, "Failed to create a listbox.\n"); + + style = GetWindowLongA(listbox, GWL_STYLE); + ok((style & invalid_styles[i]) == invalid_styles[i], "%u: unexpected window styles %#x.\n", i, style); + ret = SendMessageA(listbox, LB_SETCOUNT, 100, 0); + todo_wine_if(i == 1 || i == 4) + ok(ret == LB_ERR, "%u: unexpected return value %d.\n", i, ret); + DestroyWindow(listbox); + } + + DestroyWindow(parent); } START_TEST(listbox)

1 0

Michael Stefaniuc : msg711.acm: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: f269827cbbb28edf700e63d5329c4e805dbf223d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f269827cbbb28edf700e63d5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 15 20:42:10 2018 +0100 msg711.acm: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msg711.acm/msg711.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index cb8b762..d20c89b 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -658,13 +658,13 @@ static LRESULT G711_DriverDetails(PACMDRIVERDETAILSW add) add->cFilterTags = 0; add->hicon = NULL; MultiByteToWideChar( CP_ACP, 0, "Microsoft CCITT G.711", -1, - add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); + add->szShortName, ARRAY_SIZE( add->szShortName )); MultiByteToWideChar( CP_ACP, 0, "Wine G711 converter", -1, - add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) ); + add->szLongName, ARRAY_SIZE( add->szLongName )); MultiByteToWideChar( CP_ACP, 0, "Brought to you by the Wine team...", -1, - add->szCopyright, sizeof(add->szCopyright)/sizeof(WCHAR) ); + add->szCopyright, ARRAY_SIZE( add->szCopyright )); MultiByteToWideChar( CP_ACP, 0, "Refer to LICENSE file", -1, - add->szLicensing, sizeof(add->szLicensing)/sizeof(WCHAR) ); + add->szLicensing, ARRAY_SIZE( add->szLicensing )); add->szFeatures[0] = 0; return MMSYSERR_NOERROR;

1 0

Gabriel Ivăncescu : user32/listbox: Disable LBS_NODATA if styles are incompatible with it.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: afe443c3f27d62bd8c4f80fc2a9a632764552e18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afe443c3f27d62bd8c4f80fc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 15 11:46:16 2018 +0200 user32/listbox: Disable LBS_NODATA if styles are incompatible with it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index f021029..2fcd735 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2521,6 +2521,8 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) if (descr->style & LBS_EXTENDEDSEL) descr->style |= LBS_MULTIPLESEL; if (descr->style & LBS_MULTICOLUMN) descr->style &= ~LBS_OWNERDRAWVARIABLE; if (descr->style & LBS_OWNERDRAWVARIABLE) descr->style |= LBS_NOINTEGRALHEIGHT; + if ((descr->style & (LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_SORT)) != LBS_OWNERDRAWFIXED) + descr->style &= ~LBS_NODATA; descr->item_height = LISTBOX_SetFont( descr, 0 ); if (descr->style & LBS_OWNERDRAWFIXED)

1 0

Nikolay Sivov : msvcrt: Add _iswxdigit_l().
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: 311a1320904de987913c966db5c457cb4bc665fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=311a1320904de987913c966d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 16 09:31:57 2018 +0300 msvcrt: Add _iswxdigit_l(). 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> --- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index 920d962..0a61576 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -33,7 +33,7 @@ @ cdecl _iswpunct_l(long ptr) ucrtbase._iswpunct_l @ cdecl _iswspace_l(long ptr) ucrtbase._iswspace_l @ cdecl _iswupper_l(long ptr) ucrtbase._iswupper_l -@ stub _iswxdigit_l +@ cdecl _iswxdigit_l(long ptr) ucrtbase._iswxdigit_l @ cdecl _isxdigit_l(long ptr) ucrtbase._isxdigit_l @ cdecl _memccpy(ptr ptr long long) ucrtbase._memccpy @ cdecl _memicmp(str str long) ucrtbase._memicmp diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index de81eb8..151d6ae 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1029,7 +1029,7 @@ @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l -@ stub _iswxdigit_l +@ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l @ cdecl _itoa(long ptr long) MSVCRT__itoa @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 58e4632..abb6ada 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1375,7 +1375,7 @@ @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l -@ stub _iswxdigit_l +@ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l @ cdecl _itoa(long ptr long) MSVCRT__itoa @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index db49594..8b7b154 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1381,7 +1381,7 @@ @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l -@ stub _iswxdigit_l +@ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l @ cdecl _itoa(long ptr long) MSVCRT__itoa @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 749deb8..d293900 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1246,7 +1246,7 @@ @ cdecl _iswpunct_l(long ptr) msvcr120._iswpunct_l @ cdecl _iswspace_l(long ptr) msvcr120._iswspace_l @ cdecl _iswupper_l(long ptr) msvcr120._iswupper_l -@ stub _iswxdigit_l +@ cdecl _iswxdigit_l(long ptr) msvcr120._iswxdigit_l @ cdecl _isxdigit_l(long ptr) msvcr120._isxdigit_l @ cdecl _itoa(long ptr long) msvcr120._itoa @ cdecl _itoa_s(long ptr long long) msvcr120._itoa_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8004353..aa89792 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -701,7 +701,7 @@ @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l -@ stub _iswxdigit_l +@ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l @ cdecl _itoa(long ptr long) MSVCRT__itoa @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index bf0fc97..cf604b7 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -679,7 +679,7 @@ @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l -@ stub _iswxdigit_l +@ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l @ cdecl _itoa(long ptr long) MSVCRT__itoa @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e38647f..e4d0aad 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -644,7 +644,7 @@ @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l -# stub _iswxdigit_l(long ptr) +@ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l @ cdecl _itoa(long ptr long) MSVCRT__itoa @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index caf9b6a..27c9eb8 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1967,6 +1967,14 @@ INT CDECL MSVCRT_iswxdigit( MSVCRT_wchar_t wc ) } /********************************************************************* + * _iswxdigit_l (MSVCRT.@) + */ +int CDECL MSVCRT__iswxdigit_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +{ + return isxdigitW( wc ); +} + +/********************************************************************* * _iswctype_l (MSVCRT.@) */ INT CDECL MSVCRT__iswctype_l( MSVCRT_wchar_t wc, MSVCRT_wctype_t type, MSVCRT__locale_t locale ) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index d68ce7c..1f0975d 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -520,7 +520,7 @@ @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l -@ stub _iswxdigit_l +@ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l @ cdecl _itoa(long ptr long) MSVCRT__itoa @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s

1 0

Nikolay Sivov : msvcrt: Add _iswalnum_l().
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: 3c5862102f0d2ce1588aed9cd754c5aae981b3af URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c5862102f0d2ce1588aed9c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 16 09:31:54 2018 +0300 msvcrt: Add _iswalnum_l(). 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> --- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index 7693755..6b01b2b 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -19,7 +19,7 @@ @ stub _ispunct_l @ cdecl _isspace_l(long ptr) ucrtbase._isspace_l @ cdecl _isupper_l(long ptr) ucrtbase._isupper_l -@ stub _iswalnum_l +@ cdecl _iswalnum_l(long ptr) ucrtbase._iswalnum_l @ cdecl _iswalpha_l(long ptr) ucrtbase._iswalpha_l @ cdecl _iswblank_l(long ptr) ucrtbase._iswblank_l @ stub _iswcntrl_l diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index e38672e..5c0506c 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1016,7 +1016,7 @@ @ stub _ispunct_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l -@ stub _iswalnum_l +@ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l @ stub _iswcntrl_l @ stub _iswcsym_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index ed930d7..757ed7c 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1362,7 +1362,7 @@ @ stub _ispunct_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l -@ stub _iswalnum_l +@ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l @ stub _iswcntrl_l @ stub _iswcsym_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 1f3d22d..52a3155 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1367,7 +1367,7 @@ @ stub _ispunct_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l -@ stub _iswalnum_l +@ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l @ cdecl _iswblank_l(long ptr) MSVCRT__iswblank_l @ stub _iswcntrl_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index aa4b2b8..db607e0 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1232,7 +1232,7 @@ @ stub _ispunct_l @ cdecl _isspace_l(long ptr) msvcr120._isspace_l @ cdecl _isupper_l(long ptr) msvcr120._isupper_l -@ stub _iswalnum_l +@ cdecl _iswalnum_l(long ptr) msvcr120._iswalnum_l @ cdecl _iswalpha_l(long ptr) msvcr120._iswalpha_l @ cdecl _iswblank_l(long ptr) msvcr120._iswblank_l @ stub _iswcntrl_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8c69215..baf89f5 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -688,7 +688,7 @@ @ stub _ispunct_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l -@ stub _iswalnum_l +@ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l @ stub _iswcntrl_l @ stub _iswcsym_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 842cb5f..79dab2e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -666,7 +666,7 @@ @ stub _ispunct_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l -@ stub _iswalnum_l +@ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l @ stub _iswcntrl_l @ stub _iswcsym_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index fa234fb..dbff964 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -633,7 +633,7 @@ @ cdecl _isprint_l(long ptr) MSVCRT__isprint_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l -# stub _iswalnum_l(long ptr) +@ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l # stub _iswcntrl_l(long ptr) @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index c4e27e1..72a2b71 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1807,6 +1807,14 @@ INT CDECL MSVCRT_iswalnum( MSVCRT_wchar_t wc ) } /********************************************************************* + * _iswalnum_l (MSVCRT.@) + */ +int CDECL MSVCRT__iswalnum_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +{ + return isalnumW( wc ); +} + +/********************************************************************* * iswalpha (MSVCRT.@) */ INT CDECL MSVCRT_iswalpha( MSVCRT_wchar_t wc ) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index adb3198..32a646a 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -506,7 +506,7 @@ @ stub _ispunct_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l -@ stub _iswalnum_l +@ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l @ cdecl _iswblank_l(long ptr) MSVCRT__iswblank_l @ stub _iswcntrl_l

1 0

Paul Gofman : d3dx9: Add FIXME for unlockable source surface in D3DXLoadSurfaceFromSurface().
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: 126d3b703b91f47d3e335ff346804d01842c699a URL: https://source.winehq.org/git/wine.git/?a=commit;h=126d3b703b91f47d3e335ff3… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Nov 15 20:23:35 2018 +0300 d3dx9: Add FIXME for unlockable source surface in D3DXLoadSurfaceFromSurface(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/surface.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 0a6e20e..a44398c 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1916,7 +1916,10 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, rect = *src_rect; if (FAILED(IDirect3DSurface9_LockRect(src_surface, &lock, NULL, D3DLOCK_READONLY))) + { + FIXME("Called for unlockable source surface.\n"); return D3DXERR_INVALIDDATA; + } hr = D3DXLoadSurfaceFromMemory(dst_surface, dst_palette, dst_rect, lock.pBits, SrcDesc.Format, lock.Pitch, src_palette, &rect, filter, color_key);

1 0

Gabriel Ivăncescu : user32/listbox: Make LBS_NODATA listboxes error on any attempt to find a value.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: dfb57a1655ac3dc6b3a0e571431ed066a9e7e518 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfb57a1655ac3dc6b3a0e571… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 15 11:46:22 2018 +0200 user32/listbox: Make LBS_NODATA listboxes error on any attempt to find a value. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 8 +++++++- dlls/user32/tests/listbox.c | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 7fc724c..286a33b 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -917,6 +917,12 @@ static INT LISTBOX_FindString( LB_DESCR *descr, INT start, LPCWSTR str, BOOL exa INT i; LB_ITEMDATA *item; + if (descr->style & LBS_NODATA) + { + SetLastError(ERROR_INVALID_PARAMETER); + return LB_ERR; + } + if (start >= descr->nb_items) start = -1; item = descr->items + start + 1; if (HAS_STRINGS(descr)) @@ -2455,7 +2461,7 @@ static LRESULT LISTBOX_HandleChar( LB_DESCR *descr, WCHAR charW ) (LPARAM)descr->self ); if (caret == -2) return 0; } - if (caret == -1) + if (caret == -1 && !(descr->style & LBS_NODATA)) caret = LISTBOX_FindString( descr, descr->focus_item, str, FALSE); if (caret != -1) { diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index d0eb731..d13a4e3 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -2103,12 +2103,30 @@ static void test_LBS_NODATA(void) } /* More messages that don't work with LBS_NODATA. */ + SetLastError(0xdeadbeef); + ret = SendMessageA(listbox, LB_FINDSTRING, 1, 0); + ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError should return 0x57, got 0x%X\n", GetLastError()); + SetLastError(0xdeadbeef); ret = SendMessageA(listbox, LB_FINDSTRING, 1, 42); ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError should return 0x57, got 0x%X\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = SendMessageA(listbox, LB_FINDSTRINGEXACT, 1, 0); + ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError should return 0x57, got 0x%X\n", GetLastError()); + SetLastError(0xdeadbeef); ret = SendMessageA(listbox, LB_FINDSTRINGEXACT, 1, 42); ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError should return 0x57, got 0x%X\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = SendMessageA(listbox, LB_SELECTSTRING, 1, 0); + ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError should return 0x57, got 0x%X\n", GetLastError()); + SetLastError(0xdeadbeef); ret = SendMessageA(listbox, LB_SELECTSTRING, 1, 42); ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError should return 0x57, got 0x%X\n", GetLastError()); DestroyWindow(listbox);

1 0

Michael Stefaniuc : winecoreaudio.drv: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: 2170cce2afa8491cc7d99a0ede23890db3e05431 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2170cce2afa8491cc7d99a0e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 15 20:42:21 2018 +0100 winecoreaudio.drv: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/midi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index a40ca2a..edaf128 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -148,7 +148,7 @@ LONG CoreAudio_MIDIInit(void) sources[i].source = MIDIGetSource(i); CoreMIDI_GetObjectName(sources[i].source, szPname, sizeof(szPname)); - MultiByteToWideChar(CP_ACP, 0, szPname, -1, sources[i].caps.szPname, sizeof(sources[i].caps.szPname)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, szPname, -1, sources[i].caps.szPname, ARRAY_SIZE(sources[i].caps.szPname)); MIDIPortConnectSource(MIDIInPort, sources[i].source, &sources[i].wDevID); @@ -164,7 +164,7 @@ LONG CoreAudio_MIDIInit(void) for (i = 0; i < MAX_MIDI_SYNTHS; i++) { snprintf(szPname, sizeof(szPname), "CoreAudio MIDI Synth %d", i); - MultiByteToWideChar(CP_ACP, 0, szPname, -1, destinations[i].caps.szPname, sizeof(destinations[i].caps.szPname)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, szPname, -1, destinations[i].caps.szPname, ARRAY_SIZE(destinations[i].caps.szPname)); destinations[i].caps.wTechnology = MOD_SYNTH; destinations[i].caps.wChannelMask = 0xFFFF; @@ -182,7 +182,7 @@ LONG CoreAudio_MIDIInit(void) destinations[i].dest = MIDIGetDestination(i - MAX_MIDI_SYNTHS); CoreMIDI_GetObjectName(destinations[i].dest, szPname, sizeof(szPname)); - MultiByteToWideChar(CP_ACP, 0, szPname, -1, destinations[i].caps.szPname, sizeof(destinations[i].caps.szPname)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, szPname, -1, destinations[i].caps.szPname, ARRAY_SIZE(destinations[i].caps.szPname)); destinations[i].caps.wTechnology = MOD_MIDIPORT; destinations[i].caps.wChannelMask = 0xFFFF;

1 0