May 2016 - Wine-Commits - list.winehq.org

Alexandre Julliard : kernel32: Don' t bother storing the file mask in FindFirstFileEx.
by Alexandre Julliard May 4, 2016

May 4, 2016

Module: wine Branch: master Commit: 0049ca1054df30a2d29a3b6801db14216de02546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0049ca1054df30a2d29a3b680… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 4 12:09:32 2016 +0900 kernel32: Don't bother storing the file mask in FindFirstFileEx. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 56bdb52..2111489 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -58,9 +58,9 @@ typedef struct CRITICAL_SECTION cs; /* crit section protecting this structure */ FINDEX_SEARCH_OPS search_op; /* Flags passed to FindFirst. */ FINDEX_INFO_LEVELS level; /* Level passed to FindFirst */ - UNICODE_STRING mask; /* file mask */ UNICODE_STRING path; /* NT path used to open the directory */ BOOL is_root; /* is directory the root of the drive? */ + BOOL wildcard; /* did the mask contain wildcard characters? */ UINT data_pos; /* current position in dir data */ UINT data_len; /* length of dir data */ UINT data_size; /* size of data buffer, or 0 when everything has been read */ @@ -1939,7 +1939,8 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, LPVOID data, FINDEX_SEARCH_OPS search_op, LPVOID filter, DWORD flags) { - WCHAR *mask, *p; + WCHAR *mask; + BOOL has_wildcard = FALSE; FIND_FIRST_INFO *info = NULL; UNICODE_STRING nt_name; OBJECT_ATTRIBUTES attr; @@ -2003,7 +2004,6 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, goto error; } HeapFree( GetProcessHeap(), 0, dir ); - RtlInitUnicodeString( &info->mask, NULL ); } else if (!mask || !*mask) { @@ -2012,25 +2012,17 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, } else { - if (!RtlCreateUnicodeString( &info->mask, mask )) - { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - goto error; - } - - /* truncate dir name before mask */ - *mask = 0; nt_name.Length = (mask - nt_name.Buffer) * sizeof(WCHAR); + has_wildcard = strpbrkW( mask, wildcardsW ) != NULL; } - /* check if path is the root of the drive */ + /* check if path is the root of the drive, skipping the \??\ prefix */ info->is_root = FALSE; - p = nt_name.Buffer + 4; /* skip \??\ prefix */ - if (p[0] && p[1] == ':') + if (nt_name.Length >= 6 * sizeof(WCHAR) && nt_name.Buffer[5] == ':') { - p += 2; - while (*p == '\\') p++; - info->is_root = (*p == 0); + DWORD pos = 6; + while (pos * sizeof(WCHAR) < nt_name.Length && nt_name.Buffer[pos] == '\\') pos++; + info->is_root = (pos * sizeof(WCHAR) >= nt_name.Length); } attr.Length = sizeof(attr); @@ -2046,7 +2038,6 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, if (status != STATUS_SUCCESS) { - RtlFreeUnicodeString( &info->mask ); if (status == STATUS_OBJECT_NAME_NOT_FOUND) SetLastError( ERROR_PATH_NOT_FOUND ); else @@ -2058,6 +2049,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, info->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FIND_FIRST_INFO.cs"); info->path = nt_name; info->magic = FIND_FIRST_MAGIC; + info->wildcard = has_wildcard; info->data_pos = 0; info->data_len = 0; info->data_size = 0; @@ -2077,8 +2069,9 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, } else { - BOOL has_wildcard = strpbrkW( info->mask.Buffer, wildcardsW ) != NULL; + UNICODE_STRING mask_str; + RtlInitUnicodeString( &mask_str, mask ); info->data_size = has_wildcard ? 8192 : max_entry_size * 2; while (info->data_size) @@ -2091,7 +2084,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, } status = NtQueryDirectoryFile( info->handle, 0, NULL, NULL, &io, info->data, info->data_size, - FileBothDirectoryInformation, FALSE, &info->mask, TRUE ); + FileBothDirectoryInformation, FALSE, &mask_str, TRUE ); if (status) { FindClose( info ); @@ -2174,7 +2167,7 @@ BOOL WINAPI FindNextFileW( HANDLE handle, WIN32_FIND_DATAW *data ) if (info->data_size) status = NtQueryDirectoryFile( info->handle, 0, NULL, NULL, &io, info->data, info->data_size, - FileBothDirectoryInformation, FALSE, &info->mask, FALSE ); + FileBothDirectoryInformation, FALSE, NULL, FALSE ); else status = STATUS_NO_MORE_FILES; @@ -2210,7 +2203,7 @@ BOOL WINAPI FindNextFileW( HANDLE handle, WIN32_FIND_DATAW *data ) /* check for dir symlink */ if ((dir_info->FileAttributes & FILE_ATTRIBUTE_DIRECTORY) && (dir_info->FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) && - strpbrkW( info->mask.Buffer, wildcardsW )) + info->wildcard) { if (!check_dir_symlink( info, dir_info )) continue; } @@ -2270,8 +2263,6 @@ BOOL WINAPI FindClose( HANDLE handle ) info->magic = 0; if (info->handle) CloseHandle( info->handle ); info->handle = 0; - RtlFreeUnicodeString( &info->mask ); - info->mask.Buffer = NULL; RtlFreeUnicodeString( &info->path ); info->data_pos = 0; info->data_len = 0;

1 0

André Hentschel : user32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard May 4, 2016

May 4, 2016

Module: wine Branch: master Commit: 2d62300060e03801b0646874a9c1d1c885750051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d62300060e03801b0646874a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 3 19:03:11 2016 +0200 user32/tests: Don't test function directly when reporting GetLastError(). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index c931d02..991ea66 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9034,7 +9034,7 @@ static void test_winproc_handles(const char *argv0) HINSTANCE hinst = GetModuleHandleA(NULL); WNDCLASSA wnd_classA; WNDCLASSW wnd_classW; - int count; + int count, ret; PROCESS_INFORMATION info; STARTUPINFOA startup; char cmd[MAX_PATH]; @@ -9042,11 +9042,11 @@ static void test_winproc_handles(const char *argv0) memset(&wnd_classA, 0, sizeof(wnd_classA)); wnd_classA.lpszClassName = "winproc_test"; wnd_classA.lpfnWndProc = winproc; - ok(RegisterClassA(&wnd_classA), - "RegisterClass failed with error %d\n", GetLastError()); + ret = RegisterClassA(&wnd_classA); + ok(ret, "RegisterClass failed with error %d\n", GetLastError()); - ok(GetClassInfoW(hinst, winproc_testW, &wnd_classW), - "GetClassInfoW failed with error %d\n", GetLastError()); + ret = GetClassInfoW(hinst, winproc_testW, &wnd_classW); + ok(ret, "GetClassInfoW failed with error %d\n", GetLastError()); ok(wnd_classA.lpfnWndProc != wnd_classW.lpfnWndProc, "winproc pointers should not be identical\n"); @@ -9057,8 +9057,9 @@ static void test_winproc_handles(const char *argv0) CallWindowProcW(wnd_classW.lpfnWndProc, 0, 0, 0, (LPARAM)&count); ok(count == 1, "winproc should be called once (%d)\n", count); - ok(UnregisterClassW(winproc_testW, hinst), - "UnregisterClass failed with error %d\n", GetLastError()); + ret = UnregisterClassW(winproc_testW, hinst); + ok(ret, "UnregisterClass failed with error %d\n", GetLastError()); + /* crashes on 64-bit windows because lpfnWndProc handle is already freed */ if (sizeof(void*) == 4) { @@ -9082,6 +9083,7 @@ static void test_winproc_handles(const char *argv0) static void test_winproc_limit(void) { WNDPROC winproc_handle; + LONG_PTR ret; HWND hwnd; int i; @@ -9102,13 +9104,13 @@ static void test_winproc_limit(void) } ok(i != 0xffff, "unable to run out of winproc slots\n"); - ok(SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)winproc_convA), - "SetWindowLongPtr failed with error %d\n", GetLastError()); + ret = SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)winproc_convA); + ok(ret, "SetWindowLongPtr failed with error %d\n", GetLastError()); ok(SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"text"), "WM_SETTEXT failed\n"); ok(SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)textW), "WM_SETTEXT with conversion failed\n"); - ok(SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)winproc_convW), - "SetWindowLongPtr failed with error %d\n", GetLastError()); + ret = SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)winproc_convW); + ok(ret, "SetWindowLongPtr failed with error %d\n", GetLastError()); ok(SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"text"), "WM_SETTEXT failed\n"); ok(SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)textW), "WM_SETTEXT with conversion failed\n");

1 0

Alexandre Julliard : configure: We no longer use getdirentries.
by Alexandre Julliard May 4, 2016

May 4, 2016

Module: wine Branch: master Commit: 6171cfd0ae2d756c37f3c575879871e7282ddf2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6171cfd0ae2d756c37f3c5758… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 4 11:04:52 2016 +0900 configure: We no longer use getdirentries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- 3 files changed, 5 deletions(-) diff --git a/configure b/configure index 2cd1a27..6b9758f 100755 --- a/configure +++ b/configure @@ -15075,7 +15075,6 @@ for ac_func in \ futimes \ futimesat \ getattrlist \ - getdirentries \ getopt_long_only \ getpwuid \ gettimeofday \ diff --git a/configure.ac b/configure.ac index 5179179..f25c965 100644 --- a/configure.ac +++ b/configure.ac @@ -1997,7 +1997,6 @@ AC_CHECK_FUNCS(\ futimes \ futimesat \ getattrlist \ - getdirentries \ getopt_long_only \ getpwuid \ gettimeofday \ diff --git a/include/config.h.in b/include/config.h.in index 06b192f..8cffef9 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -198,9 +198,6 @@ /* Define to 1 if you have the `getattrlist' function. */ #undef HAVE_GETATTRLIST -/* Define to 1 if you have the `getdirentries' function. */ -#undef HAVE_GETDIRENTRIES - /* Define to 1 if you have the `getnameinfo' function. */ #undef HAVE_GETNAMEINFO

1 0

Michael Müller : amstream: Implement IAMMediaStream:: GetMultiMediaStream for video.
by Alexandre Julliard May 3, 2016

May 3, 2016

Module: wine Branch: master Commit: 0dc09c032dba44a63a072579077dba1a6ee1ed77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dc09c032dba44a63a0725790… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Apr 30 03:56:38 2016 +0200 amstream: Implement IAMMediaStream::GetMultiMediaStream for video. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastream.c | 10 ++++++++-- dlls/amstream/tests/amstream.c | 11 ++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 79f9822..af7bdaf 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -110,9 +110,15 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_GetMultiMediaStre { DirectDrawMediaStreamImpl *This = impl_from_DirectDrawMediaStream_IAMMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, multi_media_stream); + TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); - return S_FALSE; + if (!multi_media_stream) + return E_POINTER; + + IMultiMediaStream_AddRef(This->parent); + *multi_media_stream = This->parent; + + return S_OK; } static HRESULT WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_GetInformation(IAMMediaStream *iface, diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 353ba01..1b41160 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -263,16 +263,13 @@ static void test_media_streams(void) ok((void*)am_media_stream == (void*)video_stream, "Not same interface, got %p expected %p\n", am_media_stream, video_stream); hr = IAMMediaStream_GetMultiMediaStream(am_media_stream, NULL); - todo_wine ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); + ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); multi_media_stream = (void *)0xdeadbeef; hr = IAMMediaStream_GetMultiMediaStream(am_media_stream, &multi_media_stream); - todo_wine ok(hr == S_OK, "IAMMediaStream_GetMultiMediaStream returned: %x\n", hr); - if (hr == S_OK) - { - ok((void *)multi_media_stream == (void *)pams, "Expected %p, got %p\n", pams, multi_media_stream); - IMultiMediaStream_Release(multi_media_stream); - } + ok(hr == S_OK, "IAMMediaStream_GetMultiMediaStream returned: %x\n", hr); + ok((void *)multi_media_stream == (void *)pams, "Expected %p, got %p\n", pams, multi_media_stream); + IMultiMediaStream_Release(multi_media_stream); IAMMediaStream_Release(am_media_stream);

1 0

Sebastian Lackner : amstream/tests: Add tests for GetMultiMediaStream methods.
by Alexandre Julliard May 3, 2016

May 3, 2016

Module: wine Branch: master Commit: 04c3a9bad2585c4b93d23e856dad3d8ab0557885 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04c3a9bad2585c4b93d23e856… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Apr 30 03:56:00 2016 +0200 amstream/tests: Add tests for GetMultiMediaStream methods. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 54 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 1fcffea..353ba01 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -253,6 +253,7 @@ static void test_media_streams(void) if (video_stream) { IAMMediaStream* am_media_stream; + IMultiMediaStream *multi_media_stream; IAudioMediaStream* audio_media_stream; IDirectDrawMediaStream *ddraw_stream = NULL; IDirectDrawStreamSample *ddraw_sample = NULL; @@ -260,8 +261,20 @@ static void test_media_streams(void) hr = IMediaStream_QueryInterface(video_stream, &IID_IAMMediaStream, (LPVOID*)&am_media_stream); ok(hr == S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); ok((void*)am_media_stream == (void*)video_stream, "Not same interface, got %p expected %p\n", am_media_stream, video_stream); + + hr = IAMMediaStream_GetMultiMediaStream(am_media_stream, NULL); + todo_wine ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); + + multi_media_stream = (void *)0xdeadbeef; + hr = IAMMediaStream_GetMultiMediaStream(am_media_stream, &multi_media_stream); + todo_wine ok(hr == S_OK, "IAMMediaStream_GetMultiMediaStream returned: %x\n", hr); if (hr == S_OK) - IAMMediaStream_Release(am_media_stream); + { + ok((void *)multi_media_stream == (void *)pams, "Expected %p, got %p\n", pams, multi_media_stream); + IMultiMediaStream_Release(multi_media_stream); + } + + IAMMediaStream_Release(am_media_stream); hr = IMediaStream_QueryInterface(video_stream, &IID_IAudioMediaStream, (LPVOID*)&audio_media_stream); ok(hr == E_NOINTERFACE, "IMediaStream_QueryInterface returned: %x\n", hr); @@ -280,6 +293,18 @@ static void test_media_streams(void) hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &ddraw_sample); ok(hr == S_OK, "IDirectDrawMediaStream_CreateSample returned: %x\n", hr); + + hr = IDirectDrawMediaStream_GetMultiMediaStream(ddraw_stream, NULL); + todo_wine ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); + + multi_media_stream = (void *)0xdeadbeef; + hr = IDirectDrawMediaStream_GetMultiMediaStream(ddraw_stream, &multi_media_stream); + todo_wine ok(hr == S_OK, "IDirectDrawMediaStream_GetMultiMediaStream returned: %x\n", hr); + if (hr == S_OK) + { + ok((void *)multi_media_stream == (void *)pams, "Expected %p, got %p\n", pams, multi_media_stream); + IMultiMediaStream_Release(multi_media_stream); + } } if (ddraw_sample) @@ -344,6 +369,7 @@ static void test_media_streams(void) if (audio_stream) { IAMMediaStream* am_media_stream; + IMultiMediaStream *multi_media_stream; IDirectDrawMediaStream* ddraw_stream = NULL; IAudioMediaStream* audio_media_stream = NULL; IAudioStreamSample *audio_sample = NULL; @@ -351,8 +377,20 @@ static void test_media_streams(void) hr = IMediaStream_QueryInterface(audio_stream, &IID_IAMMediaStream, (LPVOID*)&am_media_stream); ok(hr == S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); ok((void*)am_media_stream == (void*)audio_stream, "Not same interface, got %p expected %p\n", am_media_stream, audio_stream); + + hr = IAMMediaStream_GetMultiMediaStream(am_media_stream, NULL); + todo_wine ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); + + multi_media_stream = (void *)0xdeadbeef; + hr = IAMMediaStream_GetMultiMediaStream(am_media_stream, &multi_media_stream); + todo_wine ok(hr == S_OK, "IAMMediaStream_GetMultiMediaStream returned: %x\n", hr); if (hr == S_OK) - IAMMediaStream_Release(am_media_stream); + { + ok((void *)multi_media_stream == (void *)pams, "Expected %p, got %p\n", pams, multi_media_stream); + IMultiMediaStream_Release(multi_media_stream); + } + + IAMMediaStream_Release(am_media_stream); hr = IMediaStream_QueryInterface(audio_stream, &IID_IDirectDrawMediaStream, (LPVOID*)&ddraw_stream); ok(hr == E_NOINTERFACE, "IMediaStream_QueryInterface returned: %x\n", hr); @@ -378,6 +416,18 @@ static void test_media_streams(void) hr = IAudioMediaStream_CreateSample(audio_media_stream, audio_data, 0, &audio_sample); ok(hr == S_OK, "IAudioMediaStream_CreateSample returned: %x\n", hr); + hr = IAudioMediaStream_GetMultiMediaStream(audio_media_stream, NULL); + todo_wine ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); + + multi_media_stream = (void *)0xdeadbeef; + hr = IAudioMediaStream_GetMultiMediaStream(audio_media_stream, &multi_media_stream); + todo_wine ok(hr == S_OK, "IAudioMediaStream_GetMultiMediaStream returned: %x\n", hr); + if (hr == S_OK) + { + ok((void *)multi_media_stream == (void *)pams, "Expected %p, got %p\n", pams, multi_media_stream); + IMultiMediaStream_Release(multi_media_stream); + } + if (audio_data) IAudioData_Release(audio_data); if (audio_sample)

1 0

Alistair Leslie-Hughes : d3d11shader.h: Add ID3D11Module, ID3D11ModuleInstance interfaces.
by Alexandre Julliard May 3, 2016

May 3, 2016

Module: wine Branch: master Commit: 8bc6d0153c8746af5b89e58b76b81c12f0ea9465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bc6d0153c8746af5b89e58b7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 2 09:32:05 2016 +0000 d3d11shader.h: Add ID3D11Module, ID3D11ModuleInstance interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11shader.h | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/include/d3d11shader.h b/include/d3d11shader.h index 9ee78a8..f9c3b95 100644 --- a/include/d3d11shader.h +++ b/include/d3d11shader.h @@ -205,4 +205,45 @@ DECLARE_INTERFACE_(ID3D11ShaderReflection, IUnknown) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D11ModuleInstance, 0x469e07f7, 0x45a, 0x48d5, 0xaa, 0x12, 0x68, 0xa4, 0x78, 0xcd, 0xf7, 0x5d); + +#define INTERFACE ID3D11ModuleInstance +DECLARE_INTERFACE_(ID3D11ModuleInstance, IUnknown) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + + /* ID3D11ModuleInstance methods */ + STDMETHOD(BindConstantBuffer)(THIS_ UINT srcslot, UINT dstslot, UINT dstoffset) PURE; + STDMETHOD(BindConstantBufferByName)(THIS_ const char *name, UINT dstslot, UINT dstoffset) PURE; + + STDMETHOD(BindResource)(THIS_ UINT srcslot, UINT dstslot, UINT count) PURE; + STDMETHOD(BindResourceByName)(THIS_ const char *name, UINT dstslot, UINT count) PURE; + + STDMETHOD(BindSampler)(THIS_ UINT srcslot, UINT dstslot, UINT count) PURE; + STDMETHOD(BindSamplerByName)(THIS_ const char *name, UINT dstslot, UINT count) PURE; + + STDMETHOD(BindUnorderedAccessView)(THIS_ UINT srcslot, UINT dstslot, UINT count) PURE; + STDMETHOD(BindUnorderedAccessViewByName)(THIS_ const char *name, UINT dstslot, UINT count) PURE; + + STDMETHOD(BindResourceAsUnorderedAccessView)(THIS_ UINT srcslot, UINT dstslot, UINT count) PURE; + STDMETHOD(BindResourceAsUnorderedAccessViewByName)(THIS_ const char *name, UINT dstslot, UINT count) PURE; +}; +#undef INTERFACE + +DEFINE_GUID(IID_ID3D11Module, 0xcac701ee, 0x80fc, 0x4122, 0x82, 0x42, 0x10, 0xb3, 0x9c, 0x8c, 0xec, 0x34); + +#define INTERFACE ID3D11Module +DECLARE_INTERFACE_(ID3D11Module, IUnknown) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + + /* ID3D11Module methods */ + STDMETHOD(CreateInstance)(THIS_ const char *instnamespace, ID3D11ModuleInstance **moduleinstance) PURE; +}; +#undef INTERFACE + #endif

1 0

Michael Müller : amstream: Implement IAudioMediaStream::GetMultiMediaStream.
by Alexandre Julliard May 3, 2016

May 3, 2016

Module: wine Branch: master Commit: 9eaa37249948c4d77df37cf3649ad1db59412fcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eaa37249948c4d77df37cf36… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Apr 30 03:59:42 2016 +0200 amstream: Implement IAudioMediaStream::GetMultiMediaStream. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastream.c | 12 +++++++++--- dlls/amstream/tests/amstream.c | 11 ++++------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 0e22537..0ba9eb8 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -686,13 +686,19 @@ static ULONG WINAPI AudioMediaStreamImpl_IAudioMediaStream_Release(IAudioMediaSt /*** IMediaStream methods ***/ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetMultiMediaStream(IAudioMediaStream *iface, - IMultiMediaStream** multimedia_stream) + IMultiMediaStream **multi_media_stream) { AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", iface, This, multimedia_stream); + TRACE("(%p/%p)->(%p)\n", iface, This, multi_media_stream); - return S_FALSE; + if (!multi_media_stream) + return E_POINTER; + + IMultiMediaStream_AddRef(This->parent); + *multi_media_stream = This->parent; + + return S_OK; } static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetInformation(IAudioMediaStream *iface, diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index e026e80..1db88c2 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -408,16 +408,13 @@ static void test_media_streams(void) ok(hr == S_OK, "IAudioMediaStream_CreateSample returned: %x\n", hr); hr = IAudioMediaStream_GetMultiMediaStream(audio_media_stream, NULL); - todo_wine ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); + ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); multi_media_stream = (void *)0xdeadbeef; hr = IAudioMediaStream_GetMultiMediaStream(audio_media_stream, &multi_media_stream); - todo_wine ok(hr == S_OK, "IAudioMediaStream_GetMultiMediaStream returned: %x\n", hr); - if (hr == S_OK) - { - ok((void *)multi_media_stream == (void *)pams, "Expected %p, got %p\n", pams, multi_media_stream); - IMultiMediaStream_Release(multi_media_stream); - } + ok(hr == S_OK, "IAudioMediaStream_GetMultiMediaStream returned: %x\n", hr); + ok((void *)multi_media_stream == (void *)pams, "Expected %p, got %p\n", pams, multi_media_stream); + IMultiMediaStream_Release(multi_media_stream); if (audio_data) IAudioData_Release(audio_data);

1 0

Michael Müller : amstream: Implement IAMMediaStream:: GetMultiMediaStream for audio.
by Alexandre Julliard May 3, 2016

May 3, 2016

Module: wine Branch: master Commit: dc732ffa7fb06768656ae1b6070c6a56d186bdf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc732ffa7fb06768656ae1b60… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Apr 30 03:58:55 2016 +0200 amstream: Implement IAMMediaStream::GetMultiMediaStream for audio. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastream.c | 10 ++++++++-- dlls/amstream/tests/amstream.c | 11 ++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 586e00f..0e22537 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -523,9 +523,15 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetMultiMediaStream(IA { AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, multi_media_stream); + TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); - return S_FALSE; + if (!multi_media_stream) + return E_POINTER; + + IMultiMediaStream_AddRef(This->parent); + *multi_media_stream = This->parent; + + return S_OK; } static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetInformation(IAMMediaStream *iface, diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 3cdb77f..e026e80 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -373,16 +373,13 @@ static void test_media_streams(void) ok((void*)am_media_stream == (void*)audio_stream, "Not same interface, got %p expected %p\n", am_media_stream, audio_stream); hr = IAMMediaStream_GetMultiMediaStream(am_media_stream, NULL); - todo_wine ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); + ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); multi_media_stream = (void *)0xdeadbeef; hr = IAMMediaStream_GetMultiMediaStream(am_media_stream, &multi_media_stream); - todo_wine ok(hr == S_OK, "IAMMediaStream_GetMultiMediaStream returned: %x\n", hr); - if (hr == S_OK) - { - ok((void *)multi_media_stream == (void *)pams, "Expected %p, got %p\n", pams, multi_media_stream); - IMultiMediaStream_Release(multi_media_stream); - } + ok(hr == S_OK, "IAMMediaStream_GetMultiMediaStream returned: %x\n", hr); + ok((void *)multi_media_stream == (void *)pams, "Expected %p, got %p\n", pams, multi_media_stream); + IMultiMediaStream_Release(multi_media_stream); IAMMediaStream_Release(am_media_stream);

1 0

Michael Müller : amstream: Implement IDirectDrawMediaStream::GetMultiMediaStream.
by Alexandre Julliard May 3, 2016

May 3, 2016

Module: wine Branch: master Commit: c88f4b85bc6f95f621c2185b766eb5997230329a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c88f4b85bc6f95f621c2185b7… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Apr 30 03:57:50 2016 +0200 amstream: Implement IDirectDrawMediaStream::GetMultiMediaStream. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastream.c | 12 +++++++++--- dlls/amstream/tests/amstream.c | 11 ++++------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index af7bdaf..586e00f 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -273,13 +273,19 @@ static ULONG WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_Release(IDi /*** IMediaStream methods ***/ static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetMultiMediaStream(IDirectDrawMediaStream *iface, - IMultiMediaStream** ppMultiMediaStream) + IMultiMediaStream **multi_media_stream) { DirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppMultiMediaStream); + TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); - return S_FALSE; + if (!multi_media_stream) + return E_POINTER; + + IMultiMediaStream_AddRef(This->parent); + *multi_media_stream = This->parent; + + return S_OK; } static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetInformation(IDirectDrawMediaStream *iface, diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 1b41160..3cdb77f 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -292,16 +292,13 @@ static void test_media_streams(void) ok(hr == S_OK, "IDirectDrawMediaStream_CreateSample returned: %x\n", hr); hr = IDirectDrawMediaStream_GetMultiMediaStream(ddraw_stream, NULL); - todo_wine ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); + ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); multi_media_stream = (void *)0xdeadbeef; hr = IDirectDrawMediaStream_GetMultiMediaStream(ddraw_stream, &multi_media_stream); - todo_wine ok(hr == S_OK, "IDirectDrawMediaStream_GetMultiMediaStream returned: %x\n", hr); - if (hr == S_OK) - { - ok((void *)multi_media_stream == (void *)pams, "Expected %p, got %p\n", pams, multi_media_stream); - IMultiMediaStream_Release(multi_media_stream); - } + ok(hr == S_OK, "IDirectDrawMediaStream_GetMultiMediaStream returned: %x\n", hr); + ok((void *)multi_media_stream == (void *)pams, "Expected %p, got %p\n", pams, multi_media_stream); + IMultiMediaStream_Release(multi_media_stream); } if (ddraw_sample)

1 0

Michael Müller : quartz: FileSource_Load should not fail on unknown file formats.
by Alexandre Julliard May 3, 2016

May 3, 2016

Module: wine Branch: master Commit: 355a3248d4b239ad2442ca5245511c59aaa24952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=355a3248d4b239ad2442ca524… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Apr 29 22:13:35 2016 +0200 quartz: FileSource_Load should not fail on unknown file formats. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 5 +++-- dlls/quartz/tests/avisplitter.c | 17 +++++++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index f0f85fd..269dd13 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -655,8 +655,9 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi hr = GetClassMediaFile(pReader, pszFileName, &This->pmt->majortype, &This->pmt->subtype, NULL); if (FAILED(hr)) { - CoTaskMemFree(This->pmt); - This->pmt = NULL; + This->pmt->majortype = MEDIATYPE_Stream; + This->pmt->subtype = MEDIASUBTYPE_NULL; + hr = S_OK; } } else diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index aa938c1..78ca8b8 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -217,6 +217,12 @@ static void test_filesourcefilter(void) 12, &MEDIASUBTYPE_WAVE, }, + { + "unknown format", + "Hello World", + 11, + NULL, /* FIXME: should be &MEDIASUBTYPE_NULL */ + }, }; WCHAR path[MAX_PATH], temp[MAX_PATH]; IFileSourceFilter *filesource; @@ -277,10 +283,13 @@ static void test_filesourcefilter(void) ok(hr == S_OK, "expected S_OK, got %08x\n", hr); ok(!lstrcmpW(olepath, path), "expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(olepath)); - ok(IsEqualGUID(&mt.majortype, &MEDIATYPE_Stream), - "expected MEDIATYPE_Stream, got %s\n", wine_dbgstr_guid(&mt.majortype)); - ok(IsEqualGUID(&mt.subtype, tests[i].subtype), - "expected %s, got %s\n", wine_dbgstr_guid(tests[i].subtype), wine_dbgstr_guid(&mt.subtype)); + if (tests[i].subtype) + { + ok(IsEqualGUID(&mt.majortype, &MEDIATYPE_Stream), + "expected MEDIATYPE_Stream, got %s\n", wine_dbgstr_guid(&mt.majortype)); + ok(IsEqualGUID(&mt.subtype, tests[i].subtype), + "expected %s, got %s\n", wine_dbgstr_guid(tests[i].subtype), wine_dbgstr_guid(&mt.subtype)); + } CoTaskMemFree(olepath); IFileSourceFilter_Release(filesource);

1 0