February 2021 - Wine-Commits

Francois Gouget : testbot/PatchUtils: Add support for .com program tests in _LoadWineFiles().
by Alexandre Julliard Feb. 2, 2021

Feb. 2, 2021

Module: tools Branch: master Commit: 42543d50a3c1ba313c781e0c1959df6ae93f5c96 URL: https://source.winehq.org/git/tools.git/?a=commit;h=42543d50a3c1ba313c781e0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 2 15:17:23 2021 +0100 testbot/PatchUtils: Add support for .com program tests in _LoadWineFiles(). _LoadWineFiles() must use the correct module name so that the lookups succeed in _CreateTestInfo(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48090 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index b2749c4..dda855d 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -107,7 +107,7 @@ sub _LoadWineFiles() my ($Root, $Module, $File) = ($1, $2, $3); next if ($File eq "testlist.c"); next if ($File !~ /\.(?:c|spec)$/); - $Module .= ".exe" if ($Root eq "programs"); + $Module .= ".exe" if ($Root eq "programs" and $Module !~ /\./); $_TestList->{$Module}->{$File} = 1; } }

1 0

Francois Gouget : winetest: Remove the Apache 2.2 instructions.
by Alexandre Julliard Feb. 2, 2021

Feb. 2, 2021

Module: tools Branch: master Commit: 2388b2fd409737ab6512e4716f2ea711d9822d53 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2388b2fd409737ab6512e47… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 2 12:21:27 2021 +0100 winetest: Remove the Apache 2.2 instructions. Apache 2.2 is very old so simplify the sample configuration files. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/vhost_winetest.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/winetest/vhost_winetest.conf b/winetest/vhost_winetest.conf index 797aac3..081025b 100644 --- a/winetest/vhost_winetest.conf +++ b/winetest/vhost_winetest.conf @@ -32,10 +32,6 @@ RewriteEngine On RewriteRule "^$" "/data/" [R] - # Access control the Apache 2.2 way - Order allow,deny - Allow from all - # And the Apache 2.4 way Require all granted </Directory>

1 0

Francois Gouget : patches: Remove the Apache 2.2 instructions.
by Alexandre Julliard Feb. 2, 2021

Feb. 2, 2021

Module: tools Branch: master Commit: c4006a9bdec5c01f14df42c80dc2cb62d974f3a3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c4006a9bdec5c01f14df42c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 2 12:21:16 2021 +0100 patches: Remove the Apache 2.2 instructions. Apache 2.2 is very old so simplify the sample configuration files. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/doc/vhost_source.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/patches/doc/vhost_source.conf b/patches/doc/vhost_source.conf index 03c25c6..01c6dee 100644 --- a/patches/doc/vhost_source.conf +++ b/patches/doc/vhost_source.conf @@ -6,10 +6,6 @@ ServerAdmin winehq(a)example.com <Directory /home/winehq/opt/source> - # Access control the Apache 2.2 way - Order allow,deny - Allow from all - # And the Apache 2.4 way Require all granted </Directory> </VirtualHost>

1 0

Francois Gouget : testbot: Remove the Apache 2.2 instructions.
by Alexandre Julliard Feb. 2, 2021

Feb. 2, 2021

Module: tools Branch: master Commit: d1e20129edb0b69048073ccf19bf66fe1d635847 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d1e20129edb0b69048073cc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 2 12:21:37 2021 +0100 testbot: Remove the Apache 2.2 instructions. Apache 2.2 is very old so simplify the sample configuration files. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/doc/vhost_winetestbot.conf | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/testbot/doc/vhost_winetestbot.conf b/testbot/doc/vhost_winetestbot.conf index 7b84564..48a3917 100644 --- a/testbot/doc/vhost_winetestbot.conf +++ b/testbot/doc/vhost_winetestbot.conf @@ -23,11 +23,6 @@ PerlOptions +ParseHeaders Options +ExecCGI DirectoryIndex index.pl - - # Access control the Apache 2.2 way - Order allow,deny - Allow from all - # And the Apache 2.4 way Require all granted </Directory> </VirtualHost> @@ -61,11 +56,6 @@ PerlOptions +ParseHeaders Options +ExecCGI DirectoryIndex index.pl - - # Access control the Apache 2.2 way - Order allow,deny - Allow from all - # And the Apache 2.4 way Require all granted </Directory> </VirtualHost>

1 0

Akihiro Sagawa : winmm/tests: Strictly test returned time format of waveInGetPostion().
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: 32d2082e7c728b0085a242760c739418b7e4cdd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32d2082e7c728b0085a24276… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jan 28 21:42:13 2021 +0900 winmm/tests: Strictly test returned time format of waveInGetPostion(). 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/capture.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index f60b44b096c..306c69dd99d 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -62,9 +62,8 @@ static void check_position(int device, HWAVEIN win, DWORD bytes, rc=waveInGetPosition(win, &mmtime, sizeof(mmtime)); ok(rc==MMSYSERR_NOERROR, "waveInGetPosition(%s): rc=%s\n",dev_name(device),wave_in_error(rc)); - if (mmtime.wType != TIME_BYTES && winetest_debug > 1) - trace("waveInGetPosition(%s): TIME_BYTES not supported, returned %s\n", - dev_name(device),wave_time_format(mmtime.wType)); + ok(mmtime.wType == TIME_BYTES, "waveInGetPosition(%s): returned %s\n", + dev_name(device), wave_time_format(mmtime.wType)); returned = time_to_bytes(&mmtime, pwfx); ok(returned == bytes, "waveInGetPosition(%s): returned %d bytes, " "should be %d\n", dev_name(device), returned, bytes); @@ -73,9 +72,8 @@ static void check_position(int device, HWAVEIN win, DWORD bytes, rc=waveInGetPosition(win, &mmtime, sizeof(mmtime)); ok(rc==MMSYSERR_NOERROR, "waveInGetPosition(%s): rc=%s\n",dev_name(device),wave_in_error(rc)); - if (mmtime.wType != TIME_SAMPLES && winetest_debug > 1) - trace("waveInGetPosition(%s): TIME_SAMPLES not supported, " - "returned %s\n",dev_name(device),wave_time_format(mmtime.wType)); + ok(mmtime.wType == TIME_SAMPLES, "waveInGetPosition(%s): returned %s\n", + dev_name(device), wave_time_format(mmtime.wType)); returned = time_to_bytes(&mmtime, pwfx); ok(returned == bytes, "waveInGetPosition(%s): returned %d samples, " "should be %d\n", dev_name(device), bytes_to_samples(returned, pwfx), @@ -85,21 +83,18 @@ static void check_position(int device, HWAVEIN win, DWORD bytes, rc=waveInGetPosition(win, &mmtime, sizeof(mmtime)); ok(rc==MMSYSERR_NOERROR, "waveInGetPosition(%s): rc=%s\n",dev_name(device),wave_in_error(rc)); - if (mmtime.wType != TIME_MS && winetest_debug > 1) - trace("waveInGetPosition(%s): TIME_MS not supported, returned %s\n", - dev_name(device), wave_time_format(mmtime.wType)); + ok(mmtime.wType == TIME_BYTES, "waveInGetPosition(%s): returned %s\n", + dev_name(device), wave_time_format(mmtime.wType)); returned = time_to_bytes(&mmtime, pwfx); - ok(returned == bytes, "waveInGetPosition(%s): returned %d ms, " - "should be %d\n", dev_name(device), bytes_to_ms(returned, pwfx), - bytes_to_ms(bytes, pwfx)); + ok(returned == bytes, "waveInGetPosition(%s): TIME_MS test failed\n", + dev_name(device)); mmtime.wType = TIME_SMPTE; rc=waveInGetPosition(win, &mmtime, sizeof(mmtime)); ok(rc==MMSYSERR_NOERROR, "waveInGetPosition(%s): rc=%s\n",dev_name(device),wave_in_error(rc)); - if (mmtime.wType != TIME_SMPTE && winetest_debug > 1) - trace("waveInGetPosition(%s): TIME_SMPTE not supported, returned %s\n", - dev_name(device),wave_time_format(mmtime.wType)); + ok(mmtime.wType == TIME_BYTES, "waveInGetPosition(%s): returned %s\n", + dev_name(device), wave_time_format(mmtime.wType)); returned = time_to_bytes(&mmtime, pwfx); ok(returned == bytes, "waveInGetPosition(%s): SMPTE test failed\n", dev_name(device)); @@ -108,9 +103,8 @@ static void check_position(int device, HWAVEIN win, DWORD bytes, rc=waveInGetPosition(win, &mmtime, sizeof(mmtime)); ok(rc==MMSYSERR_NOERROR, "waveInGetPosition(%s): rc=%s\n",dev_name(device),wave_in_error(rc)); - if (mmtime.wType != TIME_MIDI && winetest_debug > 1) - trace("waveInGetPosition(%s): TIME_MIDI not supported, returned %s\n", - dev_name(device),wave_time_format(mmtime.wType)); + ok(mmtime.wType == TIME_BYTES, "waveInGetPosition(%s): returned %s\n", + dev_name(device), wave_time_format(mmtime.wType)); returned = time_to_bytes(&mmtime, pwfx); ok(returned == bytes, "waveInGetPosition(%s): MIDI test failed\n", dev_name(device)); @@ -119,9 +113,8 @@ static void check_position(int device, HWAVEIN win, DWORD bytes, rc=waveInGetPosition(win, &mmtime, sizeof(mmtime)); ok(rc==MMSYSERR_NOERROR, "waveInGetPosition(%s): rc=%s\n",dev_name(device),wave_in_error(rc)); - if (mmtime.wType != TIME_TICKS && winetest_debug > 1) - trace("waveInGetPosition(%s): TIME_TICKS not supported, returned %s\n", - dev_name(device),wave_time_format(mmtime.wType)); + ok(mmtime.wType == TIME_BYTES, "waveInGetPosition(%s): returned %s\n", + dev_name(device), wave_time_format(mmtime.wType)); returned = time_to_bytes(&mmtime, pwfx); ok(returned == bytes, "waveInGetPosition(%s): TICKS test failed\n", dev_name(device));

1 0

Roman Pišl : conhost: Fix copy-paste error when setting windows size.
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: 361b4c381e7a94e5a2ef25e7dca77440dd983444 URL: https://source.winehq.org/git/wine.git/?a=commit;h=361b4c381e7a94e5a2ef25e7… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Mon Feb 1 18:29:15 2021 +0100 conhost: Fix copy-paste error when setting windows size. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50602 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 55690377a7e..5e94a1d454e 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -1885,7 +1885,7 @@ static void apply_config( struct console *console, const struct console_config * console->active->attr = config->attr; console->active->popup_attr = config->popup_attr; console->active->win.left = config->win_pos.X; - console->active->win.right = config->win_pos.Y; + console->active->win.top = config->win_pos.Y; console->active->win.right = config->win_pos.X + config->win_width - 1; console->active->win.bottom = config->win_pos.Y + config->win_height - 1; memcpy( console->active->color_map, config->color_map, sizeof(config->color_map) );

1 0

Nikolay Sivov : dwrite: Fix vtable variables types.
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: d905919cfa6466ada5bd78487b74e08286ac13c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d905919cfa6466ada5bd7848… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 1 14:35:23 2021 +0300 dwrite: Fix vtable variables types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 6 ++++-- dlls/dwrite/font.c | 6 +++--- dlls/dwrite/gdiinterop.c | 8 +++++--- dlls/dwrite/main.c | 6 +++--- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 7446665674a..8d573ed530d 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1815,7 +1815,8 @@ static HRESULT WINAPI dwritetextanalyzer2_CheckTypographicFeature(IDWriteTextAna return hr; } -static const struct IDWriteTextAnalyzer2Vtbl textanalyzervtbl = { +static const IDWriteTextAnalyzer2Vtbl textanalyzervtbl = +{ dwritetextanalyzer_QueryInterface, dwritetextanalyzer_AddRef, dwritetextanalyzer_Release, @@ -1891,7 +1892,8 @@ static ULONG WINAPI dwritenumbersubstitution_Release(IDWriteNumberSubstitution * return ref; } -static const struct IDWriteNumberSubstitutionVtbl numbersubstitutionvtbl = { +static const IDWriteNumberSubstitutionVtbl numbersubstitutionvtbl = +{ dwritenumbersubstitution_QueryInterface, dwritenumbersubstitution_AddRef, dwritenumbersubstitution_Release diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 014240a1c8f..f1db6dd732b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4567,7 +4567,7 @@ err: return hr; } -static const struct IDWriteFontFileEnumeratorVtbl systemfontfileenumeratorvtbl = +static const IDWriteFontFileEnumeratorVtbl systemfontfileenumeratorvtbl = { systemfontfileenumerator_QueryInterface, systemfontfileenumerator_AddRef, @@ -5450,7 +5450,7 @@ static HRESULT WINAPI localfontfileloader_GetLastWriteTimeFromKey(IDWriteLocalFo return S_OK; } -static const struct IDWriteLocalFontFileLoaderVtbl localfontfileloadervtbl = +static const IDWriteLocalFontFileLoaderVtbl localfontfileloadervtbl = { localfontfileloader_QueryInterface, localfontfileloader_AddRef, @@ -5873,7 +5873,7 @@ static HRESULT WINAPI glyphrunanalysis_GetAlphaBlendParams(IDWriteGlyphRunAnalys return S_OK; } -static const struct IDWriteGlyphRunAnalysisVtbl glyphrunanalysisvtbl = +static const IDWriteGlyphRunAnalysisVtbl glyphrunanalysisvtbl = { glyphrunanalysis_QueryInterface, glyphrunanalysis_AddRef, diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index ae421822a77..84d1f615f75 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -911,7 +911,8 @@ static HRESULT WINAPI gdiinterop1_GetMatchingFontsByLOGFONT(IDWriteGdiInterop1 * return E_NOTIMPL; } -static const struct IDWriteGdiInterop1Vtbl gdiinteropvtbl = { +static const IDWriteGdiInterop1Vtbl gdiinteropvtbl = +{ gdiinterop_QueryInterface, gdiinterop_AddRef, gdiinterop_Release, @@ -1022,7 +1023,7 @@ static HRESULT WINAPI memresourcestream_GetLastWriteTime(IDWriteFontFileStream * return E_NOTIMPL; } -static const struct IDWriteFontFileStreamVtbl memresourcestreamvtbl = +static const IDWriteFontFileStreamVtbl memresourcestreamvtbl = { memresourcestream_QueryInterface, memresourcestream_AddRef, @@ -1082,7 +1083,8 @@ static HRESULT WINAPI memresourceloader_CreateStreamFromKey(IDWriteFontFileLoade return S_OK; } -static const struct IDWriteFontFileLoaderVtbl memresourceloadervtbl = { +static const IDWriteFontFileLoaderVtbl memresourceloadervtbl = +{ memresourceloader_QueryInterface, memresourceloader_AddRef, memresourceloader_Release, diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 0cc0edd1ffc..f550c204b6d 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -204,7 +204,7 @@ static DWRITE_RENDERING_MODE1 WINAPI renderingparams3_GetRenderingMode1(IDWriteR return params->mode; } -static const struct IDWriteRenderingParams3Vtbl renderingparamsvtbl = +static const IDWriteRenderingParams3Vtbl renderingparamsvtbl = { renderingparams_QueryInterface, renderingparams_AddRef, @@ -1756,7 +1756,7 @@ static HRESULT WINAPI dwritefactory7_GetSystemFontCollection(IDWriteFactory7 *if return E_NOTIMPL; } -static const struct IDWriteFactory7Vtbl dwritefactoryvtbl = +static const IDWriteFactory7Vtbl dwritefactoryvtbl = { dwritefactory_QueryInterface, dwritefactory_AddRef, @@ -1831,7 +1831,7 @@ static ULONG WINAPI shareddwritefactory_Release(IDWriteFactory7 *iface) return 1; } -static const struct IDWriteFactory7Vtbl shareddwritefactoryvtbl = +static const IDWriteFactory7Vtbl shareddwritefactoryvtbl = { dwritefactory_QueryInterface, shareddwritefactory_AddRef,

1 0

Nikolay Sivov : mfreadwrite: Fix vtable variables types.
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: e89a41a963519e4620333caae58395fa2a01e68c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e89a41a963519e4620333caa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 1 14:35:08 2021 +0300 mfreadwrite: Fix vtable variables types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 85aec9aaedc..0e0fe1ad9cd 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -2011,7 +2011,7 @@ static HRESULT WINAPI src_reader_GetPresentationAttribute(IMFSourceReader *iface return hr; } -struct IMFSourceReaderVtbl srcreader_vtbl = +static const IMFSourceReaderVtbl srcreader_vtbl = { src_reader_QueryInterface, src_reader_AddRef, @@ -2536,7 +2536,7 @@ static HRESULT WINAPI classfactory_LockServer(IClassFactory *iface, BOOL dolock) return S_OK; } -static const struct IClassFactoryVtbl classfactoryvtbl = +static const IClassFactoryVtbl classfactoryvtbl = { classfactory_QueryInterface, classfactory_AddRef,

1 0

Akihiro Sagawa : winmm/tests: Get rid of unused functions.
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: cfbbde2abce1eedc7f53db3f8af8078fe4a11cac URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfbbde2abce1eedc7f53db3f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jan 28 21:42:20 2021 +0900 winmm/tests: Get rid of unused functions. 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/wave.c | 12 ------------ dlls/winmm/tests/winmm_test.h | 1 - 2 files changed, 13 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 8afb32d5c73..2f0c8443363 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -456,24 +456,12 @@ DWORD bytes_to_samples(DWORD bytes, LPWAVEFORMATEX pwfx) return bytes / pwfx->nBlockAlign; } -DWORD bytes_to_ms(DWORD bytes, LPWAVEFORMATEX pwfx) -{ - return bytes_to_samples(bytes, pwfx) * 1000 / pwfx->nSamplesPerSec; -} - DWORD time_to_bytes(LPMMTIME mmtime, LPWAVEFORMATEX pwfx) { if (mmtime->wType == TIME_BYTES) return mmtime->u.cb; else if (mmtime->wType == TIME_SAMPLES) return mmtime->u.sample * pwfx->nBlockAlign; - else if (mmtime->wType == TIME_MS) - return mmtime->u.ms * pwfx->nAvgBytesPerSec / 1000; - else if (mmtime->wType == TIME_SMPTE) - return ((mmtime->u.smpte.hour * 60 * 60) + - (mmtime->u.smpte.min * 60) + - (mmtime->u.smpte.sec)) * pwfx->nAvgBytesPerSec + - mmtime->u.smpte.frame * pwfx->nAvgBytesPerSec / 30; trace("FIXME: time_to_bytes() type not supported\n"); return -1; diff --git a/dlls/winmm/tests/winmm_test.h b/dlls/winmm/tests/winmm_test.h index d5fb70afbde..98b461309d7 100644 --- a/dlls/winmm/tests/winmm_test.h +++ b/dlls/winmm/tests/winmm_test.h @@ -76,5 +76,4 @@ extern const char* wave_out_error(MMRESULT); extern const char* get_format_str(WORD format); extern const char* wave_time_format(UINT type); extern DWORD bytes_to_samples(DWORD bytes, LPWAVEFORMATEX pwfx); -extern DWORD bytes_to_ms(DWORD bytes, LPWAVEFORMATEX pwfx); extern DWORD time_to_bytes(LPMMTIME mmtime, LPWAVEFORMATEX pwfx);

1 0

Rémi Bernon : include: Add IWMPGraphCreation interface to wmpservice.idl.
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: 0817bb1789907c70708ed8e43ea1b5c1632aea2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0817bb1789907c70708ed8e4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 1 09:29:28 2021 +0100 include: Add IWMPGraphCreation interface to wmpservice.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/wmpservices.idl | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index b03c2e8c602..5de2a0e3a4f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -798,6 +798,7 @@ SOURCES = \ wmp.idl \ wmpids.h \ wmprealestate.idl \ + wmpservices.idl \ wmsbuffer.idl \ wmsdk.h \ wmsdkidl.idl \ diff --git a/include/wmpservices.idl b/include/wmpservices.idl new file mode 100644 index 00000000000..86f2fc1da72 --- /dev/null +++ b/include/wmpservices.idl @@ -0,0 +1,32 @@ +/* + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +[ + odl, + uuid(bfb377e5-c594-4369-a970-de896d5ece74), + oleautomation +] +interface IWMPGraphCreation : IUnknown +{ + HRESULT GraphCreationPreRender([in] IUnknown *filter_graph, [in] IUnknown *reserved); + HRESULT GraphCreationPostRender([in] IUnknown *filter_graph); + HRESULT GetGraphCreationFlags([out, retval] DWORD *flags); +}

1 0