June 2020 - Wine-Devel - list.winehq.org

[PATCH] kernel32/tests: Fix GetNLSVersion test failure on Windows Server 2003
by Alex Henrie June 4, 2020

June 4, 2020

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/tests/locale.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index c73c4a3f21..5b2f4c2d94 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -6743,7 +6743,9 @@ static void test_NLSVersion(void) info.dwNLSVersionInfoSize = sizeof(info); ret = pGetNLSVersion( 2, LOCALE_USER_DEFAULT, (NLSVERSIONINFO *)&info ); ok( !ret, "GetNLSVersion succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_FLAGS, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_FLAGS || + broken( GetLastError() == ERROR_INSUFFICIENT_BUFFER ), /* win2003 */ + "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); info.dwNLSVersionInfoSize = sizeof(info); -- 2.27.0

1 0

[PATCH resend 1/2] winemenubuilder: Blacklist desktop integration for certain associations
by Alex Henrie June 4, 2020

June 4, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41275 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/mshtml/mshtml.inf | 6 +++ loader/wine.inf.in | 10 ++++ programs/winemenubuilder/winemenubuilder.c | 54 +++++++++++++++++++--- 3 files changed, 63 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf index 4a650b444f..548739f432 100644 --- a/dlls/mshtml/mshtml.inf +++ b/dlls/mshtml/mshtml.inf @@ -111,6 +111,7 @@ HKCR,"giffile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"giffile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"giffile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"giffile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,9" +HKCU,Software\Wine\FileOpenBlacklist\.gif,"iexplore",,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" ;; GZIP HKCR,"MIME\Database\Content Type\application/x-gzip","Extension",,".gz" @@ -158,6 +159,7 @@ HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"jpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" +HKCU,Software\Wine\FileOpenBlacklist\.jpe,"iexplore",,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" ;; JPEG HKCR,"MIME\Database\Content Type\image/jpeg","CLSID",,"%CLSID_HTMLDocument%" @@ -173,6 +175,7 @@ HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"jpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" +HKCU,Software\Wine\FileOpenBlacklist\.jpeg,"iexplore",,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" ;; JPG HKCR,".jpg",,2,"jpegfile" @@ -184,6 +187,7 @@ HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"jpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" +HKCU,Software\Wine\FileOpenBlacklist\.jpg,"iexplore",,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" ;; MHTML HKCR,"MIME\Database\Content Type\message/rfc822","CLSID",,"%CLSID_MHTMLDocument%" @@ -221,6 +225,7 @@ HKCR,"pjpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"pjpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"pjpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"pjpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" +HKCU,Software\Wine\FileOpenBlacklist\.jfif,"iexplore",,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" ;; PNG HKCR,"MIME\Database\Content Type\image/png","Extension",,".png" @@ -234,6 +239,7 @@ HKCR,"pngfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"pngfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"pngfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"pngfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,9" +HKCU,Software\Wine\FileOpenBlacklist\.png,"iexplore",,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" ;; PS HKCR,"MIME\Database\Content Type\application/postscript","Extension",,".ps" diff --git a/loader/wine.inf.in b/loader/wine.inf.in index de0dd4e455..ecce019835 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -501,6 +501,16 @@ HKCR,MIME\Database\Charset\us-ascii,"AliasForCharset",,iso-8859-1 HKCR,MIME\Database\Charset\visual,"AliasForCharset",,iso-8859-8 HKCR,MIME\Database\Charset\Windows-1254,"AliasForCharset",,iso-8859-9 +HKCU,Software\Wine\FileOpenBlacklist\.htm,"winebrowser",,"""%11%\winebrowser.exe"" -nohome" +HKCU,Software\Wine\FileOpenBlacklist\.html,"winebrowser",,"""%11%\winebrowser.exe"" -nohome" +HKCU,Software\Wine\FileOpenBlacklist\.ini,"notepad",,"%11%\notepad.exe %1" +HKCU,Software\Wine\FileOpenBlacklist\.pdf,"winebrowser",,"""%11%\winebrowser.exe"" -nohome" +HKCU,Software\Wine\FileOpenBlacklist\.rtf,"wordpad",,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1" +HKCU,Software\Wine\FileOpenBlacklist\.txt,"notepad",,"%11%\notepad.exe %1" +HKCU,Software\Wine\FileOpenBlacklist\.url,"ieframe",,"rundll32.exe ieframe.dll,OpenURL %l" +HKCU,Software\Wine\FileOpenBlacklist\.wri,"wordpad",,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1" +HKCU,Software\Wine\FileOpenBlacklist\.xml,"winebrowser",,"""%11%\winebrowser.exe"" -nohome" + [ContentIndex] HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"WBreakerClass",,"{369647e0-17b0-11ce-9950-00aa004bbb1f}" HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"StemmerClass",,"" diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index d6fc9e2923..64e1dbdf20 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2470,7 +2470,7 @@ static BOOL write_freedesktop_mime_type_entry(const char *packages_dir, const ch return ret; } -static BOOL is_extension_blacklisted(LPCWSTR extension) +static BOOL is_hard_blacklisted(const WCHAR *extension) { /* These are managed through external tools like wine.desktop, to evade malware created file type associations */ static const WCHAR comW[] = {'.','c','o','m',0}; @@ -2484,6 +2484,42 @@ static BOOL is_extension_blacklisted(LPCWSTR extension) return FALSE; } +static BOOL is_soft_blacklisted(const WCHAR *extension, const WCHAR *command) +{ + static const WCHAR FileOpenBlacklistW[] = {'S','o','f','t','w','a','r','e','\\', + 'W','i','n','e','\\', + 'F','i','l','e','O','p','e','n','B','l','a','c','k','l','i','s','t','\\',0}; + WCHAR blacklist_key_path[MAX_PATH]; + HKEY blacklist_key; + WCHAR program_name[MAX_PATH], *blacklisted_command; + DWORD len = ARRAY_SIZE(program_name); + DWORD i = 0; + + if (ARRAY_SIZE(FileOpenBlacklistW) + lstrlenW(extension) > ARRAY_SIZE(blacklist_key_path)) + return FALSE; + + lstrcpyW(blacklist_key_path, FileOpenBlacklistW); + lstrcatW(blacklist_key_path, extension); + + if (RegOpenKeyExW(HKEY_CURRENT_USER, blacklist_key_path, 0, KEY_QUERY_VALUE, &blacklist_key) != ERROR_SUCCESS) + return FALSE; + + while (RegEnumValueW(blacklist_key, i, program_name, &len, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + blacklisted_command = reg_get_valW(HKEY_CURRENT_USER, blacklist_key_path, program_name); + if (strcmpW(command, blacklisted_command) == 0) + { + RegCloseKey(blacklist_key); + return TRUE; + } + len = ARRAY_SIZE(program_name); + i++; + } + + RegCloseKey(blacklist_key); + return FALSE; +} + static const char* get_special_mime_type(LPCWSTR extension) { static const WCHAR lnkW[] = {'.','l','n','k',0}; @@ -2564,7 +2600,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package size *= 2; } while (ret == ERROR_MORE_DATA); - if (ret == ERROR_SUCCESS && extensionW[0] == '.' && !is_extension_blacklisted(extensionW)) + if (ret == ERROR_SUCCESS && extensionW[0] == '.' && !is_hard_blacklisted(extensionW)) { char *extensionA = NULL; WCHAR *commandW = NULL; @@ -2582,6 +2618,15 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package char *progIdA = NULL; char *mimeProgId = NULL; + commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, openW); + if (commandW == NULL) + /* no command => no application is associated */ + goto end; + + if (is_soft_blacklisted(extensionW, commandW)) + /* command is on the blacklist => desktop integration is not desirable */ + goto end; + extensionA = wchars_to_utf8_chars(strlwrW(extensionW)); if (extensionA == NULL) { @@ -2650,11 +2695,6 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package } } - commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, openW); - if (commandW == NULL) - /* no command => no application is associated */ - goto end; - executableW = assoc_query(ASSOCSTR_EXECUTABLE, extensionW, openW); if (executableW) openWithIconA = extract_icon(executableW, 0, NULL, FALSE); -- 2.26.2

1 1

[PATCH] amstream/tests: Define and use a global variable holding an audio media type.
by Zebediah Figura June 4, 2020

June 4, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/amstream/tests/amstream.c | 220 +++++++-------------------------- 1 file changed, 44 insertions(+), 176 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index f082b78347a..2bc1310a96b 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -29,6 +29,26 @@ #include "ksmedia.h" #include "wine/strmbase.h" +static const WAVEFORMATEX audio_format = +{ + .wFormatTag = WAVE_FORMAT_PCM, + .nChannels = 1, + .nSamplesPerSec = 11025, + .wBitsPerSample = 16, + .nBlockAlign = 2, + .nAvgBytesPerSec = 2 * 11025, +}; + +static const AM_MEDIA_TYPE audio_mt = +{ + /* MEDIATYPE_Audio, MEDIASUBTYPE_PCM, FORMAT_WaveFormatEx */ + .majortype = {0x73647561, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0x00000001, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .formattype = {0x05589f81, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(WAVEFORMATEX), + .pbFormat = (BYTE *)&audio_format, +}; + static const WCHAR primary_video_sink_id[] = L"I{A35FF56A-9FDA-11D0-8FDF-00C04FD9189D}"; static const WCHAR primary_audio_sink_id[] = L"I{A35FF56B-9FDA-11D0-8FDF-00C04FD9189D}"; @@ -2888,25 +2908,6 @@ static void test_audiostream_set_format(void) static void test_audiostream_receive_connection(void) { - static const WAVEFORMATEX valid_format = - { - .wFormatTag = WAVE_FORMAT_PCM, - .nChannels = 2, - .nSamplesPerSec = 44100, - .wBitsPerSample = 16, - .nBlockAlign = 4, - .nAvgBytesPerSec = 4 * 44100, - }; - - const AM_MEDIA_TYPE valid_mt = - { - .majortype = MEDIATYPE_Audio, - .subtype = MEDIASUBTYPE_PCM, - .formattype = FORMAT_WaveFormatEx, - .cbFormat = sizeof(WAVEFORMATEX), - .pbFormat = (BYTE *)&valid_format, - }; - WAVEFORMATEXTENSIBLE extensible_format; IAudioMediaStream *audio_stream; IAMMultiMediaStream *mmstream; @@ -2933,56 +2934,56 @@ static void test_audiostream_receive_connection(void) hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &valid_mt); + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); IGraphBuilder_Disconnect(graph, pin); IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); - mt = valid_mt; + mt = audio_mt; mt.majortype = GUID_NULL; hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &mt); ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - mt = valid_mt; + mt = audio_mt; mt.subtype = MEDIASUBTYPE_RGB24; hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); ok(hr == S_OK, "Got hr %#x.\n", hr); IGraphBuilder_Disconnect(graph, pin); IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); - mt = valid_mt; + mt = audio_mt; mt.formattype = GUID_NULL; hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &mt); ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - mt = valid_mt; + mt = audio_mt; mt.cbFormat = sizeof(WAVEFORMATEX) - 1; hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - extensible_format.Format = valid_format; + extensible_format.Format = audio_format; extensible_format.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; extensible_format.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); - extensible_format.Samples.wValidBitsPerSample = valid_format.wBitsPerSample; + extensible_format.Samples.wValidBitsPerSample = audio_format.wBitsPerSample; extensible_format.dwChannelMask = KSAUDIO_SPEAKER_STEREO; extensible_format.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - mt = valid_mt; + mt = audio_mt; mt.cbFormat = sizeof(extensible_format); mt.pbFormat = (BYTE *)&extensible_format; hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); - hr = IAudioMediaStream_SetFormat(audio_stream, &valid_format); + hr = IAudioMediaStream_SetFormat(audio_stream, &audio_format); ok(hr == S_OK, "Got hr %#x.\n", hr); - format = valid_format; - format.nChannels = 1; - mt = valid_mt; + format = audio_format; + format.nChannels = 2; + mt = audio_mt; mt.pbFormat = (BYTE *)&format; hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &valid_mt); + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); IGraphBuilder_Disconnect(graph, pin); IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); @@ -3035,25 +3036,6 @@ static void test_audiostream_set_state(void) void test_audiostream_end_of_stream(void) { - static const WAVEFORMATEX format = - { - .wFormatTag = WAVE_FORMAT_PCM, - .nChannels = 1, - .nSamplesPerSec = 11025, - .wBitsPerSample = 16, - .nBlockAlign = 2, - .nAvgBytesPerSec = 2 * 11025, - }; - - const AM_MEDIA_TYPE mt = - { - .majortype = MEDIATYPE_Audio, - .subtype = MEDIASUBTYPE_PCM, - .formattype = FORMAT_WaveFormatEx, - .cbFormat = sizeof(WAVEFORMATEX), - .pbFormat = (BYTE *)&format, - }; - IAMMultiMediaStream *mmstream = create_ammultimediastream(); struct testfilter source; IGraphBuilder *graph; @@ -3075,7 +3057,7 @@ void test_audiostream_end_of_stream(void) hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_EndOfStream(pin); @@ -3113,25 +3095,6 @@ void test_audiostream_end_of_stream(void) static void test_audiostream_receive(void) { - static const WAVEFORMATEX format = - { - .wFormatTag = WAVE_FORMAT_PCM, - .nChannels = 1, - .nSamplesPerSec = 11025, - .wBitsPerSample = 16, - .nBlockAlign = 2, - .nAvgBytesPerSec = 2 * 11025, - }; - - const AM_MEDIA_TYPE mt = - { - .majortype = MEDIATYPE_Audio, - .subtype = MEDIASUBTYPE_PCM, - .formattype = FORMAT_WaveFormatEx, - .cbFormat = sizeof(WAVEFORMATEX), - .pbFormat = (BYTE *)&format, - }; - ALLOCATOR_PROPERTIES properties = { .cBuffers = 3, @@ -3171,7 +3134,7 @@ static void test_audiostream_receive(void) hr = IMemAllocator_Commit(allocator); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMemAllocator_GetBuffer(allocator, &sample1, NULL, NULL, 0); @@ -3282,25 +3245,6 @@ static void test_audiostream_initialize(void) static void test_audiostream_begin_flush_end_flush(void) { - static const WAVEFORMATEX format = - { - .wFormatTag = WAVE_FORMAT_PCM, - .nChannels = 1, - .nSamplesPerSec = 11025, - .wBitsPerSample = 16, - .nBlockAlign = 2, - .nAvgBytesPerSec = 2 * 11025, - }; - - const AM_MEDIA_TYPE mt = - { - .majortype = MEDIATYPE_Audio, - .subtype = MEDIASUBTYPE_PCM, - .formattype = FORMAT_WaveFormatEx, - .cbFormat = sizeof(WAVEFORMATEX), - .pbFormat = (BYTE *)&format, - }; - IAMMultiMediaStream *mmstream = create_ammultimediastream(); IAudioStreamSample *stream_sample; IAudioMediaStream *audio_stream; @@ -3334,7 +3278,7 @@ static void test_audiostream_begin_flush_end_flush(void) hr = IAudioMediaStream_CreateSample(audio_stream, audio_data, 0, &stream_sample); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); @@ -3455,25 +3399,6 @@ static DWORD CALLBACK audiostream_receive(void *param) static void test_audiostreamsample_update(void) { - static const WAVEFORMATEX format = - { - .wFormatTag = WAVE_FORMAT_PCM, - .nChannels = 1, - .nSamplesPerSec = 11025, - .wBitsPerSample = 16, - .nBlockAlign = 2, - .nAvgBytesPerSec = 2 * 11025, - }; - - const AM_MEDIA_TYPE mt = - { - .majortype = MEDIATYPE_Audio, - .subtype = MEDIASUBTYPE_PCM, - .formattype = FORMAT_WaveFormatEx, - .cbFormat = sizeof(WAVEFORMATEX), - .pbFormat = (BYTE *)&format, - }; - static const BYTE test_data[] = { 0, 1, 2, 3, 4, 5, 6, 7 }; IAMMultiMediaStream *mmstream = create_ammultimediastream(); IAudioStreamSample *stream_sample; @@ -3542,7 +3467,7 @@ static void test_audiostreamsample_update(void) hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -3697,25 +3622,6 @@ static void test_audiostreamsample_update(void) void test_audiostreamsample_completion_status(void) { - static const WAVEFORMATEX format = - { - .wFormatTag = WAVE_FORMAT_PCM, - .nChannels = 1, - .nSamplesPerSec = 11025, - .wBitsPerSample = 16, - .nBlockAlign = 2, - .nAvgBytesPerSec = 2 * 11025, - }; - - const AM_MEDIA_TYPE mt = - { - .majortype = MEDIATYPE_Audio, - .subtype = MEDIASUBTYPE_PCM, - .formattype = FORMAT_WaveFormatEx, - .cbFormat = sizeof(WAVEFORMATEX), - .pbFormat = (BYTE *)&format, - }; - static const BYTE test_data[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; IAMMultiMediaStream *mmstream = create_ammultimediastream(); IAudioStreamSample *stream_sample1; @@ -3762,7 +3668,7 @@ void test_audiostreamsample_completion_status(void) hr = IAudioMediaStream_CreateSample(audio_stream, audio_data2, 0, &stream_sample2); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -4101,25 +4007,6 @@ void test_mediastreamfilter_stop_pause_run(void) static void test_mediastreamfilter_support_seeking(void) { - static const WAVEFORMATEX format = - { - .wFormatTag = WAVE_FORMAT_PCM, - .nChannels = 1, - .nSamplesPerSec = 11025, - .wBitsPerSample = 16, - .nBlockAlign = 2, - .nAvgBytesPerSec = 2 * 11025, - }; - - const AM_MEDIA_TYPE mt = - { - .majortype = MEDIATYPE_Audio, - .subtype = MEDIASUBTYPE_PCM, - .formattype = FORMAT_WaveFormatEx, - .cbFormat = sizeof(WAVEFORMATEX), - .pbFormat = (BYTE *)&format, - }; - IAMMultiMediaStream *mmstream = create_ammultimediastream(); static const MSPID mspid1 = {0x88888888, 1}; static const MSPID mspid2 = {0x88888888, 2}; @@ -4178,7 +4065,7 @@ static void test_mediastreamfilter_support_seeking(void) hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source1.source.pin.IPin_iface, pin1, &mt); + hr = IGraphBuilder_ConnectDirect(graph, &source1.source.pin.IPin_iface, pin1, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); source2.get_duration_hr = E_FAIL; @@ -4186,13 +4073,13 @@ static void test_mediastreamfilter_support_seeking(void) hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source2.source.pin.IPin_iface, pin2, &mt); + hr = IGraphBuilder_ConnectDirect(graph, &source2.source.pin.IPin_iface, pin2, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source3.source.pin.IPin_iface, pin3, &mt); + hr = IGraphBuilder_ConnectDirect(graph, &source3.source.pin.IPin_iface, pin3, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); check_interface(filter, &IID_IMediaSeeking, FALSE); @@ -4238,25 +4125,6 @@ static void test_mediastreamfilter_support_seeking(void) static void test_mediastreamfilter_set_positions(void) { - static const WAVEFORMATEX format = - { - .wFormatTag = WAVE_FORMAT_PCM, - .nChannels = 1, - .nSamplesPerSec = 11025, - .wBitsPerSample = 16, - .nBlockAlign = 2, - .nAvgBytesPerSec = 2 * 11025, - }; - - const AM_MEDIA_TYPE mt = - { - .majortype = MEDIATYPE_Audio, - .subtype = MEDIASUBTYPE_PCM, - .formattype = FORMAT_WaveFormatEx, - .cbFormat = sizeof(WAVEFORMATEX), - .pbFormat = (BYTE *)&format, - }; - IAMMultiMediaStream *mmstream = create_ammultimediastream(); static const MSPID mspid1 = {0x88888888, 1}; static const MSPID mspid2 = {0x88888888, 2}; @@ -4322,15 +4190,15 @@ static void test_mediastreamfilter_set_positions(void) hr = IGraphBuilder_AddFilter(graph, &source3.filter.IBaseFilter_iface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source2.source.pin.IPin_iface, pin2, &mt); + hr = IGraphBuilder_ConnectDirect(graph, &source2.source.pin.IPin_iface, pin2, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source3.source.pin.IPin_iface, pin3, &mt); + hr = IGraphBuilder_ConnectDirect(graph, &source3.source.pin.IPin_iface, pin3, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source1.source.pin.IPin_iface, pin1, &mt); + hr = IGraphBuilder_ConnectDirect(graph, &source1.source.pin.IPin_iface, pin1, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking); -- 2.26.2

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras June 3, 2020

June 3, 2020

2 1

[PATCH 5/6] jscript: Don't realloc interpreter stack.
by Jacek Caban June 3, 2020

June 3, 2020

We share the stack for all calls in script instance, so it no loner makes sense. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/engine.c | 27 ++++++++++----------------- dlls/jscript/jscript.h | 1 - 2 files changed, 10 insertions(+), 18 deletions(-)

2 1

[PATCH 1/6] winex11.drv: Set DM_POSITION and DM_DISPLAYORIENTATION when reporting registry display settings.
by Zhiyi Zhang June 3, 2020

June 3, 2020

Set DM_POSITION and DM_DISPLAYORIENTATION when calling EnumDisplaySettings(ENUM_REGISTRY_SETTINGS). DM_DISPLAYFIXEDOUTPUT is not set because it is not necessarily reported according to tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/sysparams.c | 3 ++- dlls/winex11.drv/settings.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index b37af4d4203..6750325a291 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3319,7 +3319,8 @@ static void test_EnumDisplaySettings(void) } else { - todo_wine ok((dm.dmFields & mode_fields) == mode_fields, "Expect dmFields to contain %#x, got %#x\n", + todo_wine_if(mode != ENUM_REGISTRY_SETTINGS) + ok((dm.dmFields & mode_fields) == mode_fields, "Expect dmFields to contain %#x, got %#x\n", mode_fields, dm.dmFields); } diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 70ce35361b6..bc9f7aa1dca 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -210,7 +210,9 @@ static BOOL read_registry_settings(DEVMODEW *dm) dm->dmFields |= DM_DISPLAYFLAGS; query_value("DefaultSettings.XPanning", &dm->u1.s2.dmPosition.x); query_value("DefaultSettings.YPanning", &dm->u1.s2.dmPosition.y); + dm->dmFields |= DM_POSITION; query_value("DefaultSettings.Orientation", &dm->u1.s2.dmDisplayOrientation); + dm->dmFields |= DM_DISPLAYORIENTATION; query_value("DefaultSettings.FixedOutput", &dm->u1.s2.dmDisplayFixedOutput); #undef query_value -- 2.25.1

2 1

[PATCH v3 1/5] amstream: Leave critical section on error in MediaStreamFilter::EnumPins().
by Zebediah Figura June 3, 2020

June 3, 2020

From: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v3: no changes. dlls/amstream/filter.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index fb9b1d9aee5..f89fe13e625 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -361,14 +361,14 @@ static HRESULT WINAPI filter_EnumPins(IMediaStreamFilter *iface, IEnumPins **enu TRACE("iface %p, enum_pins %p.\n", iface, enum_pins); - EnterCriticalSection(&filter->cs); - if (!enum_pins) return E_POINTER; if (!(object = heap_alloc(sizeof(*object)))) return E_OUTOFMEMORY; + EnterCriticalSection(&filter->cs); + object->IEnumPins_iface.lpVtbl = &enum_pins_vtbl; object->refcount = 1; object->count = filter->nb_streams; @@ -376,6 +376,7 @@ static HRESULT WINAPI filter_EnumPins(IMediaStreamFilter *iface, IEnumPins **enu if (!(object->pins = heap_alloc(filter->nb_streams * sizeof(*object->pins)))) { heap_free(object); + LeaveCriticalSection(&filter->cs); return E_OUTOFMEMORY; } for (i = 0; i < filter->nb_streams; ++i) -- 2.26.2

1 4

[PATCH 1/5] include: Add more Media Foundation error codes.
by Nikolay Sivov June 3, 2020

June 3, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/mferror.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/mferror.h b/include/mferror.h index 523800d7f02..28910d25682 100644 --- a/include/mferror.h +++ b/include/mferror.h @@ -77,12 +77,28 @@ #define MF_E_DISABLED_IN_SAFEMODE _HRESULT_TYPEDEF_(0xc00d36ef) #define MF_E_CANNOT_PARSE_BYTESTREAM _HRESULT_TYPEDEF_(0xc00d36f0) #define MF_E_SOURCERESOLVER_MUTUALLY_EXCLUSIVE_FLAGS _HRESULT_TYPEDEF_(0xc00d36f1) +#define MF_E_CANNOT_CREATE_SINK _HRESULT_TYPEDEF_(0xc00d36fa) #define MF_E_BYTESTREAM_UNKNOWN_LENGTH _HRESULT_TYPEDEF_(0xc00d36fb) +#define MF_E_SESSION_PAUSEWHILESTOPPED _HRESULT_TYPEDEF_(0xc00d36fc) +#define MF_S_ACTIVATE_REPLACED _HRESULT_TYPEDEF_(0x000d36fd) +#define MF_E_FORMAT_CHANGE_NOT_SUPPORTED _HRESULT_TYPEDEF_(0xc00d36fe) #define MF_E_INVALID_WORKQUEUE _HRESULT_TYPEDEF_(0xc00d36ff) +#define MF_E_DRM_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d3700) +#define MF_E_UNAUTHORIZED _HRESULT_TYPEDEF_(0xc00d3701) +#define MF_E_OUT_OF_RANGE _HRESULT_TYPEDEF_(0xc00d3702) +#define MF_E_INVALID_CODEC_MERIT _HRESULT_TYPEDEF_(0xc00d3703) +#define MF_E_HW_MFT_FAILED_START_STREAMING _HRESULT_TYPEDEF_(0xc00d3704) +#define MF_E_OPERATION_IN_PROGRESS _HRESULT_TYPEDEF_(0xc00d3705) +#define MF_E_HARDWARE_DRM_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d3706) +#define MF_E_DURATION_TOO_LONG _HRESULT_TYPEDEF_(0xc00d3707) #define MF_E_NO_EVENTS_AVAILABLE _HRESULT_TYPEDEF_(0xc00d3e80) #define MF_E_INVALID_STATE_TRANSITION _HRESULT_TYPEDEF_(0xc00d3e82) #define MF_E_END_OF_STREAM _HRESULT_TYPEDEF_(0xc00d3e84) #define MF_E_SHUTDOWN _HRESULT_TYPEDEF_(0xc00d3e85) +#define MF_E_MP3_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d3e86) +#define MF_E_MP3_OUT_OF_DATA _HRESULT_TYPEDEF_(0xc00d3e87) +#define MF_E_MP3_NOTMP3 _HRESULT_TYPEDEF_(0xc00d3e88) +#define MF_E_MP3_NOTSUPPORTED _HRESULT_TYPEDEF_(0xc00d3e89) #define MF_E_NO_DURATION _HRESULT_TYPEDEF_(0xc00d3e8a) #define MF_E_INVALID_FORMAT _HRESULT_TYPEDEF_(0xc00d3e8c) #define MF_E_PROPERTY_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d3e8d) @@ -90,9 +106,17 @@ #define MF_E_PROPERTY_NOT_ALLOWED _HRESULT_TYPEDEF_(0xc00d3e8f) #define MF_E_MEDIA_SOURCE_NOT_STARTED _HRESULT_TYPEDEF_(0xc00d3e91) #define MF_E_UNSUPPORTED_FORMAT _HRESULT_TYPEDEF_(0xc00d3e98) +#define MF_E_MP3_BAD_CRC _HRESULT_TYPEDEF_(0xc00d3e99) +#define MF_E_NOT_PROTECTED _HRESULT_TYPEDEF_(0xc00d3e9a) #define MF_E_MEDIA_SOURCE_WRONGSTATE _HRESULT_TYPEDEF_(0xc00d3e9b) #define MF_E_MEDIA_SOURCE_NO_STREAMS_SELECTED _HRESULT_TYPEDEF_(0xc00d3e9c) +#define MF_E_CANNOT_FIND_KEYFRAME_SAMPLE _HRESULT_TYPEDEF_(0xc00d3e9d) #define MF_E_UNSUPPORTED_CHARACTERISTICS _HRESULT_TYPEDEF_(0xc00d3e9e) +#define MF_E_NO_AUDIO_RECORDING_DEVICE _HRESULT_TYPEDEF_(0xc00d3e9f) +#define MF_E_AUDIO_RECORDING_DEVICE_IN_USE _HRESULT_TYPEDEF_(0xc00d3ea0) +#define MF_E_AUDIO_RECORDING_DEVICE_INVALIDATED _HRESULT_TYPEDEF_(0xc00d3ea1) +#define MF_E_VIDEO_RECORDING_DEVICE_INVALIDATED _HRESULT_TYPEDEF_(0xc00d3ea2) +#define MF_E_VIDEO_RECORDING_DEVICE_PREEMPTED _HRESULT_TYPEDEF_(0xc00d3ea3) #define MF_E_STREAMSINK_REMOVED _HRESULT_TYPEDEF_(0xc00d4a38) #define MF_E_STREAMSINKS_OUT_OF_SYNC _HRESULT_TYPEDEF_(0xc00d4a3a) -- 2.26.2

1 4

[PATCH] typelib.dll16: Add stub LoadRegTypeLib function
by Vijay Kiran Kamuju June 3, 2020

June 3, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44781 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v2 1/5] amstream: Leave critical section on error in MediaStreamFilter::EnumPins.
by Anton Baskanov June 3, 2020

June 3, 2020

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/filter.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index fb9b1d9aee..f89fe13e62 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -361,14 +361,14 @@ static HRESULT WINAPI filter_EnumPins(IMediaStreamFilter *iface, IEnumPins **enu TRACE("iface %p, enum_pins %p.\n", iface, enum_pins); - EnterCriticalSection(&filter->cs); - if (!enum_pins) return E_POINTER; if (!(object = heap_alloc(sizeof(*object)))) return E_OUTOFMEMORY; + EnterCriticalSection(&filter->cs); + object->IEnumPins_iface.lpVtbl = &enum_pins_vtbl; object->refcount = 1; object->count = filter->nb_streams; @@ -376,6 +376,7 @@ static HRESULT WINAPI filter_EnumPins(IMediaStreamFilter *iface, IEnumPins **enu if (!(object->pins = heap_alloc(filter->nb_streams * sizeof(*object->pins)))) { heap_free(object); + LeaveCriticalSection(&filter->cs); return E_OUTOFMEMORY; } for (i = 0; i < filter->nb_streams; ++i) -- 2.17.1

1 4