wine-commits July 2018

wine-commits@winehq.org

2 participants
405 discussions

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 12 Jul '18

12 Jul '18

Module: wine Branch: master Commit: 7022afb3a8011c2562d154d6a4fa44ac3efa250b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7022afb3a8011c2562d154d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 12 20:56:54 2018 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/po/ru.po b/po/ru.po index 156642b..1947549 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-07-06 09:17+0300\n" +"PO-Revision-Date: 2018-07-12 16:25+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -3442,18 +3442,16 @@ msgid "Connections" msgstr "Подключения" #: inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Настройка Wine" +msgstr "Автонастройка" #: inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" -msgstr "" +msgstr "Использовать WPAD" #: inetcpl.rc:127 msgid "Use Proxy Auto-Config (PAC) script" -msgstr "" +msgstr "Использовать PAC-скрипт" #: inetcpl.rc:128 inetcpl.rc:132 msgid "Address:"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 12 Jul '18

12 Jul '18

Module: wine Branch: master Commit: 4c39728c5042ae88f18941e6f709c5ac8021d98f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c39728c5042ae88f18941e6… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Jul 12 20:54:20 2018 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/po/lt.po b/po/lt.po index 34974c2..0da1c2f 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-07-06 09:07+0300\n" +"PO-Revision-Date: 2018-07-12 20:53+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -3437,18 +3437,16 @@ msgid "Connections" msgstr "Ryšiai" #: inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "„Wine“ konfigūravimas" +msgstr "Automatinis konfigūravimas" #: inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" -msgstr "" +msgstr "Naudoti įgaliotojo serverio automatinį radimą (WPAD)" #: inetcpl.rc:127 msgid "Use Proxy Auto-Config (PAC) script" -msgstr "" +msgstr "Naudoti įgaliotojo serverio automatinio konfigūravimo (PAC) skriptą" #: inetcpl.rc:128 inetcpl.rc:132 msgid "Address:"

1 0

Akihiro Sagawa : kernel32: Fix LCMapString(LCMAP_HALFWIDTH) in some cases.
by Alexandre Julliard 12 Jul '18

12 Jul '18

Module: wine Branch: master Commit: a5da5252291c8df05d2f144cb3f6b9d008b4be1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5da5252291c8df05d2f144c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jul 12 23:30:29 2018 +0900 kernel32: Fix LCMapString(LCMAP_HALFWIDTH) in some cases. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45439 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 12 ++++-------- dlls/kernel32/tests/locale.c | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index d21a763..2e0cf83 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3626,21 +3626,17 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW { /* map full-width character to half-width one, e.g. U+30A2 -> U+FF71, U+30D7 -> U+FF8C U+FF9F. */ - if (map_to_halfwidth(wch, dst_ptr, dstlen) == 2) + if (map_to_halfwidth(wch, dst_ptr, len) == 2) { - dstlen--; + len--; dst_ptr++; - if (!dstlen) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return 0; - } + if (!len) break; } } else *dst_ptr = wch; } - if (!(flags & (LCMAP_UPPERCASE | LCMAP_LOWERCASE))) + if (!(flags & (LCMAP_UPPERCASE | LCMAP_LOWERCASE)) || srclen) goto done; srclen = dst_ptr - dst; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index e48bc7a..39d359f 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2516,7 +2516,7 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f SetLastError(0xdeadbeef); ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 1); - todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); SetLastError(0xdeadbeef); @@ -2525,7 +2525,7 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 3); - todo_wine ok(ret == 3, "%s ret %d, expected value 3\n", func_name, ret); + ok(ret == 3, "%s ret %d, expected value 3\n", func_name, ret); ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 4); ok(ret == 3, "%s ret %d, expected value 3\n", func_name, ret);

1 0

Akihiro Sagawa : kernel32/tests: Add more LCMapString tests.
by Alexandre Julliard 12 Jul '18

12 Jul '18

Module: wine Branch: master Commit: ef2df8ed3681a55a66382164227f8a5a1ae4bf51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef2df8ed3681a55a66382164… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jul 12 23:30:28 2018 +0900 kernel32/tests: Add more LCMapString tests. Especially combined with LCMAP_HALFWIDTH and LCMAP_UPPERCASE. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 06a7aa7..e48bc7a 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2509,6 +2509,27 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); + buf[0] = 'a'; + buf[1] = 0x30ac; + ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 0); + ok(ret == 3, "%s ret %d, expected value 3\n", func_name, ret); + + SetLastError(0xdeadbeef); + ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 1); + todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); + + SetLastError(0xdeadbeef); + ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 2); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); + + ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 3); + todo_wine ok(ret == 3, "%s ret %d, expected value 3\n", func_name, ret); + + ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 4); + ok(ret == 3, "%s ret %d, expected value 3\n", func_name, ret); + /* LCMAP_UPPERCASE or LCMAP_LOWERCASE should accept src == dst */ lstrcpyW(buf, lower_case); ret = func_ptr(LCMAP_UPPERCASE, buf, -1, buf, ARRAY_SIZE(buf));

1 0

Michael Stefaniuc : msacm32: Avoid an ARRAY_SIZE-like macro.
by Alexandre Julliard 12 Jul '18

12 Jul '18

Module: wine Branch: master Commit: 756958f6113159ccba0ffe58c4c6d8b693cf2aa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=756958f6113159ccba0ffe58… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 11 22:06:17 2018 +0200 msacm32: Avoid an ARRAY_SIZE-like 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/msacm32/pcmconverter.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msacm32/pcmconverter.c b/dlls/msacm32/pcmconverter.c index d52662a..f26f125 100644 --- a/dlls/msacm32/pcmconverter.c +++ b/dlls/msacm32/pcmconverter.c @@ -71,7 +71,6 @@ static DWORD PCM_drvClose(DWORD dwDevID) return 1; } -#define NUM_PCM_FORMATS (sizeof(PCM_Formats) / sizeof(PCM_Formats[0])) #define NUM_OF(a,b) ((a)/(b)) /* flags for fdwDriver */ @@ -114,7 +113,7 @@ static DWORD PCM_GetFormatIndex(LPWAVEFORMATEX wfx) unsigned int i; TRACE("(%p)\n", wfx); - for (i = 0; i < NUM_PCM_FORMATS; i++) { + for (i = 0; i < ARRAY_SIZE(PCM_Formats); i++) { if (wfx->nChannels == PCM_Formats[i].nChannels && wfx->nSamplesPerSec == PCM_Formats[i].rate && wfx->wBitsPerSample == PCM_Formats[i].nBits) @@ -1035,7 +1034,7 @@ static LRESULT PCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); aftd->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CONVERTER; - aftd->cStandardFormats = NUM_PCM_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats); aftd->szFormatTag[0] = 0; return MMSYSERR_NOERROR; @@ -1057,7 +1056,7 @@ static LRESULT PCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) } break; case ACM_FORMATDETAILSF_INDEX: - assert(afd->dwFormatIndex < NUM_PCM_FORMATS); + assert(afd->dwFormatIndex < ARRAY_SIZE(PCM_Formats)); afd->pwfx->wFormatTag = WAVE_FORMAT_PCM; afd->pwfx->nChannels = PCM_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = PCM_Formats[afd->dwFormatIndex].rate;

1 0

Michael Stefaniuc : l3codeca.acm: Avoid ARRAY_SIZE-like macros.
by Alexandre Julliard 12 Jul '18

12 Jul '18

Module: wine Branch: master Commit: c2272212186865e0fff2bb46df9ffb71a28cd453 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2272212186865e0fff2bb46… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 11 22:06:16 2018 +0200 l3codeca.acm: Avoid ARRAY_SIZE-like macros. 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/l3codeca.acm/mpegl3.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/l3codeca.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c index 0e419bd..f71aac3 100644 --- a/dlls/l3codeca.acm/mpegl3.c +++ b/dlls/l3codeca.acm/mpegl3.c @@ -89,9 +89,6 @@ static const Format MPEG3_Formats[] = {1, 0, 48000}, {2, 0, 48000} }; -#define NUM_PCM_FORMATS (sizeof(PCM_Formats) / sizeof(PCM_Formats[0])) -#define NUM_MPEG3_FORMATS (sizeof(MPEG3_Formats) / sizeof(MPEG3_Formats[0])) - /*********************************************************************** * MPEG3_GetFormatIndex */ @@ -103,12 +100,12 @@ static DWORD MPEG3_GetFormatIndex(LPWAVEFORMATEX wfx) switch (wfx->wFormatTag) { case WAVE_FORMAT_PCM: - hi = NUM_PCM_FORMATS; + hi = ARRAY_SIZE(PCM_Formats); fmts = PCM_Formats; break; case WAVE_FORMAT_MPEG: case WAVE_FORMAT_MPEGLAYER3: - hi = NUM_MPEG3_FORMATS; + hi = ARRAY_SIZE(MPEG3_Formats); fmts = MPEG3_Formats; break; default: @@ -733,7 +730,7 @@ static LRESULT MPEG3_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) case 0: aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); - aftd->cStandardFormats = NUM_PCM_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats); lstrcpyW(aftd->szFormatTag, szPcm); break; case 1: @@ -768,7 +765,7 @@ static LRESULT MPEG3_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) switch (afd->dwFormatTag) { case WAVE_FORMAT_PCM: - if (afd->dwFormatIndex >= NUM_PCM_FORMATS) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(PCM_Formats)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = PCM_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = PCM_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = PCM_Formats[afd->dwFormatIndex].nBits;

1 0

Michael Stefaniuc : imaadp32.acm: Avoid ARRAY_SIZE-like macros.
by Alexandre Julliard 12 Jul '18

12 Jul '18

Module: wine Branch: master Commit: 96cf25ed90e69c8573133a16235d6db1e7fb4de7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96cf25ed90e69c8573133a16… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 11 22:06:15 2018 +0200 imaadp32.acm: Avoid ARRAY_SIZE-like macros. 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/imaadp32.acm/imaadp32.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index 474f548..9518adc 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -79,9 +79,6 @@ static const Format ADPCM_Formats[] = {1, 4, 22050}, {2, 4, 22050}, {1, 4, 44100}, {2, 4, 44100}, }; -#define NUM_PCM_FORMATS (sizeof(PCM_Formats) / sizeof(PCM_Formats[0])) -#define NUM_ADPCM_FORMATS (sizeof(ADPCM_Formats) / sizeof(ADPCM_Formats[0])) - /*********************************************************************** * ADPCM_GetFormatIndex */ @@ -93,11 +90,11 @@ static DWORD ADPCM_GetFormatIndex(const WAVEFORMATEX *wfx) switch (wfx->wFormatTag) { case WAVE_FORMAT_PCM: - hi = NUM_PCM_FORMATS; + hi = ARRAY_SIZE(PCM_Formats); fmts = PCM_Formats; break; case WAVE_FORMAT_IMA_ADPCM: - hi = NUM_ADPCM_FORMATS; + hi = ARRAY_SIZE(ADPCM_Formats); fmts = ADPCM_Formats; break; default: @@ -585,13 +582,13 @@ static LRESULT ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) case 0: aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); - aftd->cStandardFormats = NUM_PCM_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats); lstrcpyW(aftd->szFormatTag, szPcm); break; case 1: aftd->dwFormatTag = WAVE_FORMAT_IMA_ADPCM; aftd->cbFormatSize = sizeof(IMAADPCMWAVEFORMAT); - aftd->cStandardFormats = NUM_ADPCM_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(ADPCM_Formats); lstrcpyW(aftd->szFormatTag, szImaAdPcm); break; } @@ -614,7 +611,7 @@ static LRESULT ADPCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) switch (afd->dwFormatTag) { case WAVE_FORMAT_PCM: - if (afd->dwFormatIndex >= NUM_PCM_FORMATS) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(PCM_Formats)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = PCM_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = PCM_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = PCM_Formats[afd->dwFormatIndex].nBits; @@ -627,7 +624,7 @@ static LRESULT ADPCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) afd->pwfx->nSamplesPerSec * afd->pwfx->nBlockAlign; break; case WAVE_FORMAT_IMA_ADPCM: - if (afd->dwFormatIndex >= NUM_ADPCM_FORMATS) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(ADPCM_Formats)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = ADPCM_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = ADPCM_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = ADPCM_Formats[afd->dwFormatIndex].nBits;

1 0

Johannes Brandstätter : ntdll: Check for NULL context in NtGetContextThread.
by Alexandre Julliard 12 Jul '18

12 Jul '18

Module: wine Branch: master Commit: ec418e7f55f5e38f8825187ae5dfe33fec31689b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec418e7f55f5e38f8825187a… Author: Johannes Brandstätter <jbrandst(a)2ds.eu> Date: Wed Jul 11 17:45:32 2018 +0200 ntdll: Check for NULL context in NtGetContextThread. Crash Bandicoot N. Sane Trilogy calls NtGetContextThread with the context being set to NULL which leads to a crash. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45428 Signed-off-by: Johannes Brandstätter <jbrandst(a)2ds.eu> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 0d25360..e751082 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2160,9 +2160,13 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) { NTSTATUS ret; - DWORD needed_flags = context->ContextFlags; + DWORD needed_flags; BOOL self = (handle == GetCurrentThread()); + if (!context) return STATUS_INVALID_PARAMETER; + + needed_flags = context->ContextFlags; + /* debug registers require a server call */ if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_AMD64)) self = FALSE;

1 0

Akihiro Sagawa : winmm: Support TIME_MIDI position in MIDI stream.
by Alexandre Julliard 12 Jul '18

12 Jul '18

Module: wine Branch: master Commit: 95c21f3f9475de09965cd34186e99e9aed86d70d URL: https://source.winehq.org/git/wine.git/?a=commit;h=95c21f3f9475de09965cd341… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jul 11 22:33:25 2018 +0900 winmm: Support TIME_MIDI position in MIDI stream. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/midi.c | 4 ++-- dlls/winmm/winmm.c | 21 ++++++++++++++++++--- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 66f35ef..2b1e91f 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -698,7 +698,7 @@ static void test_midiStream(UINT udev, HWND hwnd) test_position(hm, TIME_MS, TIME_MS); test_position(hm, TIME_TICKS, TIME_TICKS); - todo_wine test_position(hm, TIME_MIDI, TIME_MIDI); + test_position(hm, TIME_MIDI, TIME_MIDI); test_position(hm, TIME_SMPTE, TIME_MS); test_position(hm, TIME_SAMPLES, TIME_MS); test_position(hm, TIME_BYTES, TIME_MS); @@ -933,7 +933,7 @@ static void test_midiStream(UINT udev, HWND hwnd) /* TIME_MIDI value is a quarter of TIME_TICKS, rounded */ expected = (ret + midiprop.tdiv.dwTimeDiv/8) / (midiprop.tdiv.dwTimeDiv/4); ret = get_position(hm, TIME_MIDI); - todo_wine ok(ret == expected, "expected song pointer %u, got %u\n", expected, ret); + ok(ret == expected, "expected song pointer %u, got %u\n", expected, ret); ok(records.count == 2, "expected 2 MM_MOM_DONE messages, got %d\n", records.count); diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index f2dfae9..487bbff 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1508,9 +1508,17 @@ MMRESULT WINAPI midiStreamPosition(HMIDISTRM hMidiStrm, LPMMTIME lpMMT, UINT cbm } else { EnterCriticalSection(&lpMidiStrm->lock); switch (lpMMT->wType) { - default: - FIXME("Unsupported time type %x\n", lpMMT->wType); - /* fall through */ + case TIME_MIDI: + if (lpMidiStrm->dwTimeDiv < 0x8000) { + DWORD tdiv, pulses; + tdiv = (lpMidiStrm->dwTimeDiv > 24) ? lpMidiStrm->dwTimeDiv : 24; + pulses = midistream_get_current_pulse(lpMidiStrm); + lpMMT->u.midi.songptrpos = (pulses + tdiv/8) / (tdiv/4); + if (!lpMMT->u.midi.songptrpos && pulses) lpMMT->u.midi.songptrpos++; + TRACE("=> song position %d (pulses %u, tdiv %u)\n", lpMMT->u.midi.songptrpos, pulses, tdiv); + break; + } + /* fall through */ case TIME_BYTES: case TIME_SAMPLES: lpMMT->wType = TIME_MS; @@ -1523,6 +1531,13 @@ MMRESULT WINAPI midiStreamPosition(HMIDISTRM hMidiStrm, LPMMTIME lpMMT, UINT cbm lpMMT->u.ticks = midistream_get_current_pulse(lpMidiStrm); TRACE("=> %d ticks\n", lpMMT->u.ticks); break; + default: + FIXME("Unsupported time type %x\n", lpMMT->wType); + /* use TIME_MS instead */ + lpMMT->wType = TIME_MS; + lpMMT->u.ms = midistream_get_playing_position(lpMidiStrm); + TRACE("=> %d ms\n", lpMMT->u.ms); + break; } LeaveCriticalSection(&lpMidiStrm->lock); }

1 0

Alex Villacís Lasso : user.exe16: Fix handling of DDL_DRIVES flag in DlgDirList.
by Alexandre Julliard 12 Jul '18

12 Jul '18

Module: wine Branch: master Commit: 0a788caf8b4665d7f56443fc2c6d7790edf9defb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a788caf8b4665d7f56443fc… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Jun 25 04:13:40 2018 +0000 user.exe16: Fix handling of DDL_DRIVES flag in DlgDirList. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18734 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index e5bf7b9..385e859 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -636,7 +636,7 @@ INT16 WINAPI DlgDirList16( HWND16 hDlg, LPSTR spec, INT16 idLBox, * be set automatically (this is different in Win32, and * DIALOG_DlgDirList sends Win32 messages to the control, * so do it here) */ - if (attrib & DDL_DRIVES) attrib |= DDL_EXCLUSIVE; + if (attrib == DDL_DRIVES) attrib |= DDL_EXCLUSIVE; return DlgDirListA( WIN_Handle32(hDlg), spec, idLBox, idStatic, attrib ); }

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
41
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 July 2018