wine-commits November 2018

wine-commits@winehq.org

2 participants
951 discussions

Nikolay Sivov : msvcrt: Add _iswalnum_l().
by Alexandre Julliard 16 Nov '18

16 Nov '18

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

Nikolay Sivov : msvcrt: Add _iswgraph_l().
by Alexandre Julliard 16 Nov '18

16 Nov '18

Module: wine Branch: master Commit: b71f1ea1c996b5c36c734d1f3e4fc63c97d48add URL: https://source.winehq.org/git/wine.git/?a=commit;h=b71f1ea1c996b5c36c734d1f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 16 09:31:53 2018 +0300 msvcrt: Add _iswgraph_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 4667e99..7693755 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 @@ -27,7 +27,7 @@ @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) ucrtbase._iswctype_l @ cdecl _iswdigit_l(long ptr) ucrtbase._iswdigit_l -@ stub _iswgraph_l +@ cdecl _iswgraph_l(long ptr) ucrtbase._iswgraph_l @ cdecl _iswlower_l(long ptr) ucrtbase._iswlower_l @ stub _iswprint_l @ cdecl _iswpunct_l(long ptr) ucrtbase._iswpunct_l diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 69e5a1b..e38672e 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1023,7 +1023,7 @@ @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l -@ stub _iswgraph_l +@ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l @ stub _iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 8dc1a68..ed930d7 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1369,7 +1369,7 @@ @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l -@ stub _iswgraph_l +@ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l @ stub _iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index d4bcc65..1f3d22d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1375,7 +1375,7 @@ @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l -@ stub _iswgraph_l +@ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l @ stub _iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 42b3e54..aa4b2b8 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1240,7 +1240,7 @@ @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) msvcr120._iswctype_l @ cdecl _iswdigit_l(long ptr) msvcr120._iswdigit_l -@ stub _iswgraph_l +@ cdecl _iswgraph_l(long ptr) msvcr120._iswgraph_l @ cdecl _iswlower_l(long ptr) msvcr120._iswlower_l @ stub _iswprint_l @ cdecl _iswpunct_l(long ptr) msvcr120._iswpunct_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 295fae5..8c69215 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -695,7 +695,7 @@ @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l -@ stub _iswgraph_l +@ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l @ stub _iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 7c3c3e5..842cb5f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -673,7 +673,7 @@ @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l -@ stub _iswgraph_l +@ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l @ stub _iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 9491205..fa234fb 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -638,7 +638,7 @@ # stub _iswcntrl_l(long ptr) @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l -# stub _iswgraph_l(long ptr) +@ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l # stub _iswprint_l(long ptr) @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index b68cc51..c4e27e1 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1855,6 +1855,14 @@ INT CDECL MSVCRT_iswgraph( MSVCRT_wchar_t wc ) } /********************************************************************* + * _iswgraph_l (MSVCRT.@) + */ +int CDECL MSVCRT__iswgraph_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +{ + return isgraphW( wc ); +} + +/********************************************************************* * iswlower (MSVCRT.@) */ INT CDECL MSVCRT_iswlower( MSVCRT_wchar_t wc ) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b3f4d9e..adb3198 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -514,7 +514,7 @@ @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l -@ stub _iswgraph_l +@ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l @ stub _iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l

1 0

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

16 Nov '18

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

Michael Stefaniuc : msgsm32.acm: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 16 Nov '18

16 Nov '18

Module: wine Branch: master Commit: 41b0dbacea989799549b65027948968c881d14bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=41b0dbacea989799549b6502… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 15 20:42:11 2018 +0100 msgsm32.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/msgsm32.acm/msgsm32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c index 99eef96..cbf396f 100644 --- a/dlls/msgsm32.acm/msgsm32.c +++ b/dlls/msgsm32.acm/msgsm32.c @@ -125,13 +125,13 @@ static LRESULT GSM_DriverDetails(PACMDRIVERDETAILSW add) add->cFilterTags = 0; add->hicon = NULL; MultiByteToWideChar( CP_ACP, 0, "Microsoft GSM 6.10", -1, - add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); + add->szShortName, ARRAY_SIZE( add->szShortName )); MultiByteToWideChar( CP_ACP, 0, "Wine GSM 6.10 libgsm codec", -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

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

16 Nov '18

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

Michael Stefaniuc : dsound: Primary buffers don' t support IDirectSoundNotify.
by Alexandre Julliard 16 Nov '18

16 Nov '18

Module: wine Branch: master Commit: b21b6ad717d2cf98ee23591a09442e5ff12813a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b21b6ad717d2cf98ee23591a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 14 22:49:50 2018 +0100 dsound: Primary buffers don't support IDirectSoundNotify. 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/dsound/primary.c | 1 - dlls/dsound/tests/dsound.c | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index c64a6e7..f74db2f 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -1101,7 +1101,6 @@ static HRESULT WINAPI PrimaryBufferImpl_QueryInterface(IDirectSoundBuffer8 *ifac if ( IsEqualGUID( &IID_IDirectSoundNotify, riid ) ) { ERR("app requested IDirectSoundNotify on primary buffer\n"); - /* FIXME: should we support this? */ return E_NOINTERFACE; } diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 0807d43..89f0aa0 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -465,6 +465,7 @@ static HRESULT test_primary(LPGUID lpGuid) trace(" No Primary\n"); else if (rc==DS_OK && primary!=NULL) { LONG vol; + IDirectSoundNotify *notify; /* Try to create a second primary buffer */ /* DSOUND: Error: The primary buffer already exists. @@ -509,8 +510,10 @@ static HRESULT test_primary(LPGUID lpGuid) ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references\n",ref); ref=IDirectSoundBuffer_Release(primary); - ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, " - "should have 0\n",ref); + ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references\n",ref); + + rc=IDirectSoundBuffer_QueryInterface(primary,&IID_IDirectSoundNotify,(void **)&notify); + ok(rc==E_NOINTERFACE,"IDirectSoundBuffer_QueryInterface() failed %08x\n",rc); } /* Set the CooperativeLevel back to normal */

1 0

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

16 Nov '18

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

Paul Gofman : d3dx9/tests: Add tests for using D3DXLoadSurfaceFromSurface( ) with default render target.
by Alexandre Julliard 16 Nov '18

16 Nov '18

Module: wine Branch: master Commit: f9f6f4274968261e3453db586003f03027de797e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9f6f4274968261e3453db58… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Nov 15 20:23:34 2018 +0300 d3dx9/tests: Add tests for using D3DXLoadSurfaceFromSurface() with default render target. 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/tests/surface.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 37c488b..469c864 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -861,7 +861,28 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x\n", hr, D3D_OK); IDirect3DSurface9_Release(newsurf); - } else skip("Failed to create multisampled render target\n"); + } else skip("Failed to create multisampled render target.\n"); + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &newsurf); + ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderTarget returned %#x, expected %#x.\n", hr, D3D_OK); + + hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); + todo_wine + ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); + hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0); + todo_wine + ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); + hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0xff000000); + todo_wine + ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); + hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_TRIANGLE | D3DX_FILTER_MIRROR, 0); + todo_wine + ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); + hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_LINEAR, 0); + todo_wine + ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); + + IDirect3DSurface9_Release(newsurf); check_release((IUnknown*)surf, 0);

1 0

André Hentschel : ntdll: Add more traces to raise_exception on ARM64.
by Alexandre Julliard 16 Nov '18

16 Nov '18

Module: wine Branch: master Commit: b78a5db2dc6147ed8b62bdcff210a78f448e0fa9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b78a5db2dc6147ed8b62bdcf… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Nov 15 19:50:45 2018 +0100 ntdll: Add more traces to raise_exception on ARM64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46126 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 0ab402e..4d2d127 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -545,6 +545,9 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f { DWORD c; + TRACE( "code=%x flags=%x addr=%p pc=%lx tid=%04x\n", + rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, + context->Pc, GetCurrentThreadId() ); for (c = 0; c < rec->NumberParameters; c++) TRACE( " info[%d]=%016lx\n", c, rec->ExceptionInformation[c] ); if (rec->ExceptionCode == EXCEPTION_WINE_STUB) @@ -560,7 +563,24 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f } else { - /* FIXME: dump context */ + TRACE(" x0=%016lx x1=%016lx x2=%016lx x3=%016lx\n", + context->u.s.X0, context->u.s.X1, context->u.s.X2, context->u.s.X3 ); + TRACE(" x4=%016lx x5=%016lx x6=%016lx x7=%016lx\n", + context->u.s.X4, context->u.s.X5, context->u.s.X6, context->u.s.X7 ); + TRACE(" x8=%016lx x9=%016lx x10=%016lx x11=%016lx\n", + context->u.s.X8, context->u.s.X9, context->u.s.X10, context->u.s.X11 ); + TRACE(" x12=%016lx x13=%016lx x14=%016lx x15=%016lx\n", + context->u.s.X12, context->u.s.X13, context->u.s.X14, context->u.s.X15 ); + TRACE(" x16=%016lx x17=%016lx x18=%016lx x19=%016lx\n", + context->u.s.X16, context->u.s.X17, context->u.s.X18, context->u.s.X19 ); + TRACE(" x20=%016lx x21=%016lx x22=%016lx x23=%016lx\n", + context->u.s.X20, context->u.s.X21, context->u.s.X22, context->u.s.X23 ); + TRACE(" x24=%016lx x25=%016lx x26=%016lx x27=%016lx\n", + context->u.s.X24, context->u.s.X25, context->u.s.X26, context->u.s.X27 ); + TRACE(" x28=%016lx fp=%016lx lr=%016lx sp=%016lx\n", + context->u.s.X28, context->u.s.Fp, context->u.s.Lr, context->Sp ); + TRACE(" pc=%016lx\n", + context->Pc ); } status = send_debug_event( rec, TRUE, context );

1 0

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

16 Nov '18

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

← Newer
1
...
58
59
60
61
62
63
64
...
96
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 November 2018