wine-commits February 2020

wine-commits@winehq.org

2 participants
874 discussions

Nikolay Sivov : user32/tests: Link to activation context API directly.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 56c75015c9d113d5a32376e1d2c978bea28ace77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56c75015c9d113d5a32376e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 24 13:20:19 2020 +0300 user32/tests: Link to activation context API directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 49 ++++++++++--------------------------------------- 1 file changed, 10 insertions(+), 39 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 935e4379e9..423157b623 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -74,13 +74,6 @@ #define ARCH "none" #endif -static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); -static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); -static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); -static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); -static BOOL (WINAPI *pQueryActCtxW)(DWORD,HANDLE,void*,ULONG,void*,SIZE_T,SIZE_T*); -static void (WINAPI *pReleaseActCtx)(HANDLE); - /* encoded DRAWITEMSTRUCT into an LPARAM */ typedef struct { @@ -8661,7 +8654,7 @@ static HANDLE test_create(const char *file) actctx.cbSize = sizeof(ACTCTXW); actctx.lpSource = path; - handle = pCreateActCtxW(&actctx); + handle = CreateActCtxW(&actctx); ok(handle != INVALID_HANDLE_VALUE, "failed to create context, error %u\n", GetLastError()); ok(actctx.cbSize == sizeof(actctx), "cbSize=%d\n", actctx.cbSize); @@ -8779,13 +8772,7 @@ static void test_interthread_messages(void) log_all_parent_messages--; DestroyWindow( wnd_event.hwnd ); - /* activation context tests */ - if (!pActivateActCtx) - { - win_skip("Activation contexts are not supported, skipping\n"); - return; - } - + /* Activation context tests */ create_manifest_file("testdep1.manifest", manifest_dep); create_manifest_file("main.manifest", manifest_main); @@ -8794,7 +8781,7 @@ static void test_interthread_messages(void) DeleteFileA("main.manifest"); handle = (void*)0xdeadbeef; - ret = pGetCurrentActCtx(&handle); + ret = GetCurrentActCtx(&handle); ok(ret, "GetCurrentActCtx failed: %u\n", GetLastError()); ok(handle == 0, "active context %p\n", handle); @@ -8805,14 +8792,14 @@ static void test_interthread_messages(void) CloseHandle(wnd_event.start_event); /* context is activated after thread creation, so it doesn't inherit it by default */ - ret = pActivateActCtx(context, &cookie); + ret = ActivateActCtx(context, &cookie); ok(ret, "activation failed: %u\n", GetLastError()); handle = 0; - ret = pGetCurrentActCtx(&handle); + ret = GetCurrentActCtx(&handle); ok(ret, "GetCurrentActCtx failed: %u\n", GetLastError()); ok(handle != 0, "active context %p\n", handle); - pReleaseActCtx(handle); + ReleaseActCtx(handle); /* destination window will test for active context */ ret = SendMessageA(wnd_event.hwnd, WM_USER+10, 0, 0); @@ -8830,9 +8817,9 @@ static void test_interthread_messages(void) ok(WaitForSingleObject(hThread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); CloseHandle(hThread); - ret = pDeactivateActCtx(0, cookie); + ret = DeactivateActCtx(0, cookie); ok(ret, "DeactivateActCtx failed: %u\n", GetLastError()); - pReleaseActCtx(context); + ReleaseActCtx(context); } @@ -9483,12 +9470,12 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, BOOL ret; handle = (void*)0xdeadbeef; - ret = pGetCurrentActCtx(&handle); + ret = GetCurrentActCtx(&handle); ok(ret, "failed to get current context, %u\n", GetLastError()); ok(handle == 0, "got active context %p\n", handle); memset(&basicinfo, 0xff, sizeof(basicinfo)); - ret = pQueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, handle, 0, ActivationContextBasicInformation, + ret = QueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, handle, 0, ActivationContextBasicInformation, &basicinfo, sizeof(basicinfo), NULL); ok(ret, "got %d, error %d\n", ret, GetLastError()); ok(basicinfo.hActCtx == NULL, "got %p\n", basicinfo.hActCtx); @@ -17828,20 +17815,6 @@ static void test_invalid_window(void) ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError()); } -static void init_funcs(void) -{ - HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); - -#define X(f) p##f = (void*)GetProcAddress(hKernel32, #f) - X(ActivateActCtx); - X(CreateActCtxW); - X(DeactivateActCtx); - X(GetCurrentActCtx); - X(QueryActCtxW); - X(ReleaseActCtx); -#undef X -} - START_TEST(msg) { char **test_argv; @@ -17851,8 +17824,6 @@ START_TEST(msg) BOOL (WINAPI *pImmDisableIME)(DWORD); int argc; - init_funcs(); - argc = winetest_get_mainargs( &test_argv ); if (argc >= 3) {

1 0

Nikolay Sivov : ole32/tests: Link to activation context API directly.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 7eb6321466ccc4a7687f21d30c2a5b967a862cd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7eb6321466ccc4a7687f21d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 24 13:20:00 2020 +0300 ole32/tests: Link to activation context API directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 624120890d..cc2737bdd1 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -81,8 +81,6 @@ static HRESULT (WINAPI * pCoDecrementMTAUsage)(CO_MTA_USAGE_COOKIE cookie); static LONG (WINAPI * pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static LONG (WINAPI * pRegOverridePredefKey)(HKEY key, HKEY override); -static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); -static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); static BOOL (WINAPI *pIsWow64Process)(HANDLE, LPBOOL); #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) @@ -242,8 +240,6 @@ static HANDLE activate_context(const char *manifest, ULONG_PTR *cookie) HANDLE handle; BOOL ret; - if (!pCreateActCtxW) return NULL; - create_manifest_file("file.manifest", manifest); MultiByteToWideChar( CP_ACP, 0, "file.manifest", -1, path, MAX_PATH ); @@ -251,7 +247,7 @@ static HANDLE activate_context(const char *manifest, ULONG_PTR *cookie) actctx.cbSize = sizeof(ACTCTXW); actctx.lpSource = path; - handle = pCreateActCtxW(&actctx); + handle = CreateActCtxW(&actctx); ok(handle != INVALID_HANDLE_VALUE || broken(handle == INVALID_HANDLE_VALUE) /* some old XP/2k3 versions */, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); if (handle == INVALID_HANDLE_VALUE) @@ -274,7 +270,7 @@ static HANDLE activate_context(const char *manifest, ULONG_PTR *cookie) if (handle) { - ret = pActivateActCtx(handle, cookie); + ret = ActivateActCtx(handle, cookie); ok(ret, "ActivateActCtx failed: %u\n", GetLastError()); } @@ -3826,8 +3822,6 @@ static void init_funcs(void) pRegDeleteKeyExA = (void*)GetProcAddress(hAdvapi32, "RegDeleteKeyExA"); pRegOverridePredefKey = (void*)GetProcAddress(hAdvapi32, "RegOverridePredefKey"); - pActivateActCtx = (void*)GetProcAddress(hkernel32, "ActivateActCtx"); - pCreateActCtxW = (void*)GetProcAddress(hkernel32, "CreateActCtxW"); pIsWow64Process = (void*)GetProcAddress(hkernel32, "IsWow64Process"); } @@ -3966,9 +3960,6 @@ START_TEST(compobj) lstrcatA(testlib, "\\testlib.dll"); extract_resource("testlib.dll", "TESTDLL", testlib); - if (!pCreateActCtxW) - win_skip("Activation contexts are not supported, some tests will be skipped.\n"); - test_ProgIDFromCLSID(); test_CLSIDFromProgID(); test_CLSIDFromString();

1 0

Daniel Lehman : include: Update wcstok declarations.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 7aa1f6ee1c62b0cf39565dca14d71b405fd06203 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7aa1f6ee1c62b0cf39565dca… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Feb 20 22:40:24 2020 -0800 include: Update wcstok declarations. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/string.h | 16 +++++++++++++++- include/msvcrt/wchar.h | 16 +++++++++++++++- include/tchar.h | 2 +- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index f8bc40fb2a..a8bf04d5b4 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -119,8 +119,22 @@ _ACRTIMP wchar_t* __cdecl wcspbrk(const wchar_t*,const wchar_t*); _ACRTIMP wchar_t* __cdecl wcsrchr(const wchar_t*,wchar_t wcFor); _ACRTIMP size_t __cdecl wcsspn(const wchar_t*,const wchar_t*); _ACRTIMP wchar_t* __cdecl wcsstr(const wchar_t*,const wchar_t*); -_ACRTIMP wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*); +_ACRTIMP wchar_t* __cdecl wcstok_s(wchar_t*,const wchar_t*,wchar_t**); _ACRTIMP size_t __cdecl wcsxfrm(wchar_t*,const wchar_t*,size_t); + +#ifdef _UCRT +_ACRTIMP wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*,wchar_t**); +static inline wchar_t* _wcstok(wchar_t* str, const wchar_t *delim) { return wcstok(str, delim, NULL); } +# ifdef __cplusplus +extern "C++" inline wchar_t* wcstok(wchar_t* str, const wchar_t *delim) { return wcstok(str, delim, NULL); } +# elif defined(_CRT_NON_CONFORMING_WCSTOK) +# define wcstok _wcstok +# endif +#else /* _UCRT */ +_ACRTIMP wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*); +# define _wcstok wcstok +#endif /* _UCRT */ + #endif /* _WSTRING_DEFINED */ #ifdef __cplusplus diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index ade970b6f3..6b30645dc0 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -140,8 +140,22 @@ wchar_t* __cdecl wcspbrk(const wchar_t*,const wchar_t*); wchar_t* __cdecl wcsrchr(const wchar_t*,wchar_t wcFor); size_t __cdecl wcsspn(const wchar_t*,const wchar_t*); wchar_t* __cdecl wcsstr(const wchar_t*,const wchar_t*); -wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*); +wchar_t* __cdecl wcstok_s(wchar_t*,const wchar_t*,wchar_t**); size_t __cdecl wcsxfrm(wchar_t*,const wchar_t*,size_t); + +#ifdef _UCRT +wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*,wchar_t**); +static inline wchar_t* _wcstok(wchar_t* str, const wchar_t *delim) { return wcstok(str, delim, NULL); } +# ifdef __cplusplus +extern "C++" inline wchar_t* wcstok(wchar_t* str, const wchar_t *delim) { return wcstok(str, delim, NULL); } +# elif defined(_CRT_NON_CONFORMING_WCSTOK) +# define wcstok _wcstok +# endif +#else /* _UCRT */ +wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*); +# define _wcstok wcstok +#endif /* _UCRT */ + #endif /* _WSTRING_DEFINED */ wchar_t __cdecl btowc(int); diff --git a/include/tchar.h b/include/tchar.h index e14aaf3884..9fc4c72099 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -148,7 +148,7 @@ extern "C" { #define _tcsspn WINE_tchar_routine(strspn, _mbsspn, wcsspn) #define _tcsstr WINE_tchar_routine(strstr, _mbsstr, wcsstr) #define _tcstod WINE_tchar_routine(strtod, strtod, wcstod) -#define _tcstok WINE_tchar_routine(strtok, _mbstok, wcstok) +#define _tcstok WINE_tchar_routine(strtok, _mbstok, _wcstok) #define _tcstol WINE_tchar_routine(strtol, strtol, wcstol) #define _tcstoul WINE_tchar_routine(strtoul, strtoul, wcstoul) #define _tcsupr WINE_tchar_routine(_strupr, _mbsupr, _wcsupr)

1 0

Olivier F. R. Dierick : winecfg: Add Downloads and Templates to shell folders UI interface.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 7216da88515f88be0550e56eef2c9f44ab1ef53f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7216da88515f88be0550e56e… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Sun Feb 23 23:49:07 2020 +0100 winecfg: Add Downloads and Templates to shell folders UI interface. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48484 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/theme.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index dffe1861e8..b38b2ff26d 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -716,12 +716,16 @@ struct ShellFolderInfo { char szLinkTarget[FILENAME_MAX]; /* in unix locale */ }; +#define CSIDL_DOWNLOADS 0x0047 + static struct ShellFolderInfo asfiInfo[] = { { CSIDL_DESKTOP, "" }, { CSIDL_PERSONAL, "" }, { CSIDL_MYPICTURES, "" }, { CSIDL_MYMUSIC, "" }, - { CSIDL_MYVIDEO, "" } + { CSIDL_MYVIDEO, "" }, + { CSIDL_DOWNLOADS, "" }, + { CSIDL_TEMPLATES, "" } }; static struct ShellFolderInfo *psfiSelected = NULL;

1 0

Zebediah Figura : mp3dmod: Implement IMediaObject::SetInputType().
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: b125571a0ad98a1c53c19a41cb7940682774b375 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b125571a0ad98a1c53c19a41… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 21 19:34:58 2020 -0600 mp3dmod: Implement IMediaObject::SetInputType(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/mp3dmod.c | 36 ++++++++++++++++++++++++++++++--- dlls/mp3dmod/tests/mp3dmod.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 3 deletions(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 4df74fc037..50b6803ff8 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -37,18 +37,23 @@ DEFINE_GUID(WMMEDIATYPE_Audio, 0x73647561,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71); DEFINE_GUID(WMMEDIASUBTYPE_MP3,0x00000055,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71); DEFINE_GUID(WMMEDIASUBTYPE_PCM,0x00000001,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71); +DEFINE_GUID(WMFORMAT_WaveFormatEx, 0x05589f81,0xc356,0x11ce,0xbf,0x01,0x00,0xaa,0x00,0x55,0x59,0x5a); WINE_DEFAULT_DEBUG_CHANNEL(mp3dmod); static HINSTANCE mp3dmod_instance; -struct mp3_decoder { +struct mp3_decoder +{ IUnknown IUnknown_inner; IMediaObject IMediaObject_iface; IUnknown *outer; LONG ref; mpg123_handle *mh; - DMO_MEDIA_TYPE outtype; + + DMO_MEDIA_TYPE intype, outtype; + BOOL intype_set; + IMediaBuffer *buffer; REFERENCE_TIME timestamp; }; @@ -98,6 +103,8 @@ static ULONG WINAPI Unknown_Release(IUnknown *iface) if (!refcount) { + if (This->intype_set) + MoFreeMediaType(&This->intype); MoFreeMediaType(&This->outtype); mpg123_delete(This->mh); heap_free(This); @@ -187,7 +194,30 @@ static HRESULT WINAPI MediaObject_GetOutputType(IMediaObject *iface, DWORD index static HRESULT WINAPI MediaObject_SetInputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) { - FIXME("(%p)->(%d, %p, %#x) stub!\n", iface, index, type, flags); + struct mp3_decoder *dmo = impl_from_IMediaObject(iface); + + TRACE("iface %p, index %u, type %p, flags %#x.\n", iface, index, type, flags); + + if (flags & DMO_SET_TYPEF_CLEAR) + { + if (dmo->intype_set) + MoFreeMediaType(&dmo->intype); + dmo->intype_set = FALSE; + return S_OK; + } + + if (!IsEqualGUID(&type->majortype, &WMMEDIATYPE_Audio) + || !IsEqualGUID(&type->subtype, &WMMEDIASUBTYPE_MP3) + || !IsEqualGUID(&type->formattype, &WMFORMAT_WaveFormatEx)) + return DMO_E_TYPE_NOT_ACCEPTED; + + if (!(flags & DMO_SET_TYPEF_TEST_ONLY)) + { + if (dmo->intype_set) + MoFreeMediaType(&dmo->intype); + MoCopyMediaType(&dmo->intype, type); + dmo->intype_set = TRUE; + } return S_OK; } diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index da78547999..dcf0820afb 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -316,6 +316,20 @@ static void test_stream_info(void) static void test_media_types(void) { + MPEGLAYER3WAVEFORMAT mp3fmt = + { + .wfx.nChannels = 2, + .wfx.nSamplesPerSec = 48000, + }; + DMO_MEDIA_TYPE input_mt = + { + .majortype = MEDIATYPE_Audio, + .subtype = WMMEDIASUBTYPE_MP3, + .formattype = FORMAT_WaveFormatEx, + .cbFormat = sizeof(mp3fmt), + .pbFormat = (BYTE *)&mp3fmt, + }; + DMO_MEDIA_TYPE mt; IMediaObject *dmo; HRESULT hr; @@ -341,6 +355,40 @@ static void test_media_types(void) hr = IMediaObject_GetInputType(dmo, 0, 1, &mt); ok(hr == DMO_E_NO_MORE_ITEMS, "Got hr %#x.\n", hr); + hr = IMediaObject_SetInputType(dmo, 0, &input_mt, DMO_SET_TYPEF_TEST_ONLY); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + input_mt.majortype = GUID_NULL; + hr = IMediaObject_SetInputType(dmo, 0, &input_mt, DMO_SET_TYPEF_TEST_ONLY); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + input_mt.majortype = MEDIATYPE_Stream; + hr = IMediaObject_SetInputType(dmo, 0, &input_mt, DMO_SET_TYPEF_TEST_ONLY); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + input_mt.majortype = MEDIATYPE_Audio; + + input_mt.subtype = GUID_NULL; + hr = IMediaObject_SetInputType(dmo, 0, &input_mt, DMO_SET_TYPEF_TEST_ONLY); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + input_mt.subtype = MEDIASUBTYPE_PCM; + hr = IMediaObject_SetInputType(dmo, 0, &input_mt, DMO_SET_TYPEF_TEST_ONLY); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + input_mt.subtype = WMMEDIASUBTYPE_MP3; + + input_mt.formattype = GUID_NULL; + hr = IMediaObject_SetInputType(dmo, 0, &input_mt, DMO_SET_TYPEF_TEST_ONLY); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + input_mt.formattype = FORMAT_None; + hr = IMediaObject_SetInputType(dmo, 0, &input_mt, DMO_SET_TYPEF_TEST_ONLY); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + input_mt.formattype = FORMAT_WaveFormatEx; + + hr = IMediaObject_SetInputType(dmo, 0, &input_mt, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mp3fmt.wfx.nChannels = 1; + hr = IMediaObject_SetInputType(dmo, 0, &input_mt, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaObject_Release(dmo); }

1 0

Zebediah Figura : mp3dmod: Implement IMediaObject::GetInputType().
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: c37109a5c6d22ac49dc342f548e5cb709a9be0d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c37109a5c6d22ac49dc342f5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 21 19:34:57 2020 -0600 mp3dmod: Implement IMediaObject::GetInputType(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/mp3dmod.c | 14 ++++++++++++-- dlls/mp3dmod/tests/mp3dmod.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 9e86bcc31d..4df74fc037 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -163,9 +163,19 @@ static HRESULT WINAPI MediaObject_GetOutputStreamInfo(IMediaObject *iface, DWORD static HRESULT WINAPI MediaObject_GetInputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) { - FIXME("(%p)->(%d, %d, %p) stub!\n", iface, index, type_index, type); + TRACE("iface %p, index %u, type_index %u, type %p.\n", iface, index, type_index, type); - return E_NOTIMPL; + if (type_index) + return DMO_E_NO_MORE_ITEMS; + + type->majortype = WMMEDIATYPE_Audio; + type->subtype = WMMEDIASUBTYPE_MP3; + type->formattype = GUID_NULL; + type->pUnk = NULL; + type->cbFormat = 0; + type->pbFormat = NULL; + + return S_OK; } static HRESULT WINAPI MediaObject_GetOutputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index 211731db9a..da78547999 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -314,6 +314,36 @@ static void test_stream_info(void) IMediaObject_Release(dmo); } +static void test_media_types(void) +{ + DMO_MEDIA_TYPE mt; + IMediaObject *dmo; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_CMP3DecMediaObject, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaObject, (void **)&dmo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + memset(&mt, 0xcc, sizeof(DMO_MEDIA_TYPE)); + hr = IMediaObject_GetInputType(dmo, 0, 0, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio), "Got major type %s.\n", wine_dbgstr_guid(&mt.majortype)); + ok(IsEqualGUID(&mt.subtype, &WMMEDIASUBTYPE_MP3), "Got subtype %s.\n", wine_dbgstr_guid(&mt.subtype)); + ok(mt.bFixedSizeSamples == 0xcccccccc, "Got fixed size %d.\n", mt.bFixedSizeSamples); + ok(mt.bTemporalCompression == 0xcccccccc, "Got temporal compression %d.\n", mt.bTemporalCompression); + ok(mt.lSampleSize == 0xcccccccc, "Got sample size %u.\n", mt.lSampleSize); + ok(IsEqualGUID(&mt.formattype, &GUID_NULL), "Got format type %s.\n", + wine_dbgstr_guid(&mt.formattype)); + ok(!mt.pUnk, "Got pUnk %p.\n", mt.pUnk); + ok(!mt.cbFormat, "Got format size %u.\n", mt.cbFormat); + ok(!mt.pbFormat, "Got format block %p.\n", mt.pbFormat); + + hr = IMediaObject_GetInputType(dmo, 0, 1, &mt); + ok(hr == DMO_E_NO_MORE_ITEMS, "Got hr %#x.\n", hr); + + IMediaObject_Release(dmo); +} + START_TEST(mp3dmod) { IMediaObject *dmo; @@ -333,6 +363,7 @@ START_TEST(mp3dmod) test_convert(); test_aggregation(); test_stream_info(); + test_media_types(); CoUninitialize(); }

1 0

Zebediah Figura : mp3dmod: Implement IMediaObject::GetOutputStreamInfo().
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 5d4ff5594cc9bb1a9c88b62da09ea671bbd36168 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d4ff5594cc9bb1a9c88b62d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 21 19:34:56 2020 -0600 mp3dmod: Implement IMediaObject::GetOutputStreamInfo(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/mp3dmod.c | 6 ++++-- dlls/mp3dmod/tests/mp3dmod.c | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 8afc128d80..9e86bcc31d 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -154,9 +154,11 @@ static HRESULT WINAPI MediaObject_GetInputStreamInfo(IMediaObject *iface, DWORD static HRESULT WINAPI MediaObject_GetOutputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) { - FIXME("(%p)->(%d, %p) stub!\n", iface, index, flags); + TRACE("iface %p, index %u, flags %p.\n", iface, index, flags); - return E_NOTIMPL; + *flags = 0; + + return S_OK; } static HRESULT WINAPI MediaObject_GetInputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index 713623b244..211731db9a 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -306,6 +306,11 @@ static void test_stream_info(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!flags, "Got flags %#x.\n", flags); + flags = 0xdeadbeef; + hr = IMediaObject_GetOutputStreamInfo(dmo, 0, &flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!flags, "Got flags %#x.\n", flags); + IMediaObject_Release(dmo); }

1 0

Zebediah Figura : mp3dmod: Implement IMediaObject::GetInputStreamInfo().
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 7ee1b20d0dff351e9eddd92c6218b80f1b656447 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ee1b20d0dff351e9eddd92c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 21 19:34:55 2020 -0600 mp3dmod: Implement IMediaObject::GetInputStreamInfo(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/mp3dmod.c | 6 ++++-- dlls/mp3dmod/tests/mp3dmod.c | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 1f3b0126b8..8afc128d80 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -145,9 +145,11 @@ static HRESULT WINAPI MediaObject_GetStreamCount(IMediaObject *iface, DWORD *inp static HRESULT WINAPI MediaObject_GetInputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) { - FIXME("(%p)->(%d, %p) stub!\n", iface, index, flags); + TRACE("iface %p, index %u, flags %p.\n", iface, index, flags); - return E_NOTIMPL; + *flags = 0; + + return S_OK; } static HRESULT WINAPI MediaObject_GetOutputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index 33cc6f3754..713623b244 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -301,6 +301,11 @@ static void test_stream_info(void) ok(input_count == 1, "Got input count %u.\n", input_count); ok(output_count == 1, "Got output count %u.\n", output_count); + flags = 0xdeadbeef; + hr = IMediaObject_GetInputStreamInfo(dmo, 0, &flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!flags, "Got flags %#x.\n", flags); + IMediaObject_Release(dmo); }

1 0

Zebediah Figura : mp3dmod: Implement IMediaObject::GetStreamCount().
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 06fa9bd3f7c538c59ac60d8c5758b80ce3404a53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06fa9bd3f7c538c59ac60d8c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 21 19:34:54 2020 -0600 mp3dmod: Implement IMediaObject::GetStreamCount(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/mp3dmod.c | 6 ++++-- dlls/mp3dmod/tests/mp3dmod.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index c9da2b8a35..1f3b0126b8 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -136,9 +136,11 @@ static ULONG WINAPI MediaObject_Release(IMediaObject *iface) static HRESULT WINAPI MediaObject_GetStreamCount(IMediaObject *iface, DWORD *input, DWORD *output) { - FIXME("(%p)->(%p, %p) stub!\n", iface, input, output); + TRACE("iface %p, input %p, output %p.\n", iface, input, output); - return E_NOTIMPL; + *input = *output = 1; + + return S_OK; } static HRESULT WINAPI MediaObject_GetInputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index 75fd0e2c40..33cc6f3754 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -286,6 +286,24 @@ static void test_aggregation(void) ok(hr == E_NOINTERFACE, "got %#x\n", hr); } +static void test_stream_info(void) +{ + DWORD input_count, output_count, flags; + IMediaObject *dmo; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_CMP3DecMediaObject, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaObject, (void **)&dmo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaObject_GetStreamCount(dmo, &input_count, &output_count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(input_count == 1, "Got input count %u.\n", input_count); + ok(output_count == 1, "Got output count %u.\n", output_count); + + IMediaObject_Release(dmo); +} + START_TEST(mp3dmod) { IMediaObject *dmo; @@ -304,6 +322,7 @@ START_TEST(mp3dmod) test_convert(); test_aggregation(); + test_stream_info(); CoUninitialize(); }

1 0

Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetTextureStageState().
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: c4ebd986b86b04da665e241142a6e14ddb65566d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4ebd986b86b04da665e2411… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 21 17:04:50 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetTextureStageState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 41384d84bc..5e18f64550 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2306,17 +2306,9 @@ static HRESULT WINAPI d3d8_device_SetTextureStageState(IDirect3DDevice8 *iface, wined3d_mutex_lock(); if (l->sampler_state) - { wined3d_stateblock_set_sampler_state(device->update_state, stage, l->u.sampler_state, value); - if (!device->recording) - wined3d_device_set_sampler_state(device->wined3d_device, stage, l->u.sampler_state, value); - } else - { wined3d_stateblock_set_texture_stage_state(device->update_state, stage, l->u.texture_state, value); - if (!device->recording) - wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->u.texture_state, value); - } wined3d_mutex_unlock(); return D3D_OK;

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
88
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 February 2020