wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Paul Gofman : mmdevapi: Return success from SAORS_GetAvailableDynamicObjectCount().
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: 11daf1869078a60ed2588ff5a61a4d9b27985beb URL: https://source.winehq.org/git/wine.git/?a=commit;h=11daf1869078a60ed2588ff5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Apr 21 19:00:23 2021 +0300 mmdevapi: Return success from SAORS_GetAvailableDynamicObjectCount(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Arkadiusz Hiler <arek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/spatialaudio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/spatialaudio.c b/dlls/mmdevapi/spatialaudio.c index 597c2d29933..12ddd5e790a 100644 --- a/dlls/mmdevapi/spatialaudio.c +++ b/dlls/mmdevapi/spatialaudio.c @@ -303,7 +303,9 @@ static HRESULT WINAPI SAORS_GetAvailableDynamicObjectCount( { SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); FIXME("(%p)->(%p)\n", This, count); - return E_NOTIMPL; + + *count = 0; + return S_OK; } static HRESULT WINAPI SAORS_GetService(ISpatialAudioObjectRenderStream *iface,

1 0

Alexandre Julliard : configure: Stop building libwine on Android.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: a639db3e8c18f58d28c3e76bc4f9bc90a48ad93a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a639db3e8c18f58d28c3e76b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 22 15:33:30 2021 +0200 configure: Stop building libwine on Android. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 6 ------ configure.ac | 4 ---- dlls/ntdll/unix/loader.c | 2 -- 3 files changed, 12 deletions(-) diff --git a/configure b/configure index 39639235469..762c0b8e2e2 100755 --- a/configure +++ b/configure @@ -9164,12 +9164,6 @@ if test "x$ac_cv_cflags__fPIC__Wl___export_dynamic" = xyes; then : fi WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" - LIBWINE_SHAREDLIB="libwine.so" - - LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so" - - TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lEGL" >&5 $as_echo_n "checking for -lEGL... " >&6; } if ${ac_cv_lib_soname_EGL+:} false; then : diff --git a/configure.ac b/configure.ac index 797f8cfbbbf..68366339ea2 100644 --- a/configure.ac +++ b/configure.ac @@ -893,10 +893,6 @@ case $host_os in [WINELOADER_LDFLAGS="-Wl,--export-dynamic"]) WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" - AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so") - AC_SUBST(LIBWINE_LDFLAGS,["-shared -Wl,-soname,libwine.so"]) - TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so" - WINE_CHECK_SONAME(EGL,eglGetProcAddress) WINE_CHECK_SONAME(GLESv2,glFlush) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 16bba12b571..9947ff2f447 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -935,8 +935,6 @@ static void load_libwine(void) { #ifdef __APPLE__ #define LIBWINE "libwine.1.dylib" -#elif defined(__ANDROID__) -#define LIBWINE "libwine.so" #else #define LIBWINE "libwine.so.1" #endif

1 0

Alexandre Julliard : ntdll: Remove no longer used defines from the makefile.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: 9f2751ca3ff92e5eb9cf1dd6c8eac5aa01f4642f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f2751ca3ff92e5eb9cf1dd6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 22 15:32:30 2021 +0200 ntdll: Remove no longer used defines from the makefile. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 179d00b29ef..0fdfb83df15 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -70,11 +70,6 @@ RC_SRCS = version.rc EXTRA_OBJS = unix/version.o -server_EXTRADEFS = \ - -DBINDIR=\"${bindir}\" \ - -DBIN_TO_DLLDIR=\"`${MAKEDEP} -R ${bindir} ${dlldir}`\" \ - -DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\" - unix_loader_EXTRADEFS = \ -DBINDIR=\"${bindir}\" \ -DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\" \

1 0

Nikolay Sivov : evr/tests: Simplify d3d9 device creation helper.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: 53b1b034063fa5056952630e7c61413e381700d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53b1b034063fa5056952630e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 22 11:08:06 2021 +0300 evr/tests: Simplify d3d9 device creation helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index bcea437db4c..2643f6ee92a 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -49,10 +49,14 @@ static HWND create_window(void) 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); } -static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window) +static IDirect3DDevice9 *create_device(HWND focus_window) { D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DDevice9 *device = NULL; + IDirect3D9 *d3d9; + + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d9, "Failed to create a D3D object.\n"); present_parameters.BackBufferWidth = 640; present_parameters.BackBufferHeight = 480; @@ -66,6 +70,8 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window) IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); + IDirect3D9_Release(d3d9); + return device; } @@ -719,16 +725,13 @@ static void test_surface_sample(void) DWORD flags, count, length; IDirect3DDevice9 *device; IMFSample *sample; - IDirect3D9 *d3d; IUnknown *unk; HWND window; HRESULT hr; BYTE *data; window = create_window(); - d3d = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window))) + if (!(device = create_device(window))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; @@ -930,7 +933,6 @@ static void test_surface_sample(void) done: if (backbuffer) IDirect3DSurface9_Release(backbuffer); - IDirect3D9_Release(d3d); DestroyWindow(window); } @@ -945,7 +947,6 @@ static void test_default_mixer_type_negotiation(void) IMFTransform *transform; DWORD index, count; GUID guid, *guids; - IDirect3D9 *d3d; IUnknown *unk; HWND window; HRESULT hr; @@ -981,9 +982,7 @@ static void test_default_mixer_type_negotiation(void) /* Now try with device manager. */ window = create_window(); - d3d = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window))) + if (!(device = create_device(window))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; @@ -1118,7 +1117,6 @@ todo_wine done: IMFTransform_Release(transform); - IDirect3D9_Release(d3d); DestroyWindow(window); } @@ -1341,7 +1339,6 @@ static void test_MFCreateVideoSampleAllocator(void) LONG refcount, count; unsigned int token; IMFGetService *gs; - IDirect3D9 *d3d; IUnknown *unk; HWND window; HRESULT hr; @@ -1456,9 +1453,7 @@ static void test_MFCreateVideoSampleAllocator(void) /* Using device manager */ window = create_window(); - d3d = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window))) + if (!(device = create_device(window))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; @@ -1507,7 +1502,6 @@ static void test_MFCreateVideoSampleAllocator(void) IDirect3DDeviceManager9_Release(manager); IDirect3DDevice9_Release(device); done: - IDirect3D9_Release(d3d); DestroyWindow(window); } @@ -2102,7 +2096,6 @@ static void test_presenter_media_type(void) IDirect3DDeviceManager9 *manager; HRESULT hr; IMFTransform *mixer; - IDirect3D9 *d3d; IDirect3DDevice9 *device; unsigned int token; SIZE frame_size; @@ -2112,9 +2105,7 @@ static void test_presenter_media_type(void) RECT dst; window = create_window(); - d3d = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window))) + if (!(device = create_device(window))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; @@ -2196,7 +2187,6 @@ todo_wine { IMFTransform_Release(mixer); done: - IDirect3D9_Release(d3d); DestroyWindow(window); } @@ -2439,16 +2429,13 @@ static void test_mixer_samples(void) DWORD count, flags, color, status; IMFTransform *mixer; IMFSample *sample, *sample2; - IDirect3D9 *d3d; HWND window; UINT token; HRESULT hr; LONGLONG pts, duration; window = create_window(); - d3d = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window))) + if (!(device = create_device(window))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; @@ -2678,7 +2665,6 @@ static void test_mixer_samples(void) IDirect3DDeviceManager9_Release(manager); done: - IDirect3D9_Release(d3d); DestroyWindow(window); }

1 0

Nikolay Sivov : mfplat: Reduce duplication in MFCreateMFVideoFormatFromMFMediaType() for ratio attributes.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: 895bb6f260e5c73cf49d417ac7fafe1a4d4cb769 URL: https://source.winehq.org/git/wine.git/?a=commit;h=895bb6f260e5c73cf49d417a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 22 09:25:34 2021 +0300 mfplat: Reduce duplication in MFCreateMFVideoFormatFromMFMediaType() for ratio attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index e0dbb6a1a78..fb90053c605 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -3063,10 +3063,16 @@ HRESULT WINAPI MFCreateVideoMediaTypeFromSubtype(const GUID *subtype, IMFVideoMe return S_OK; } -static void media_type_get_ratio(UINT64 value, UINT32 *numerator, UINT32 *denominator) +static void media_type_get_ratio(IMFMediaType *media_type, const GUID *attr, UINT32 *numerator, + UINT32 *denominator) { - *numerator = value >> 32; - *denominator = value; + UINT64 value; + + if (SUCCEEDED(IMFMediaType_GetUINT64(media_type, attr, &value))) + { + *numerator = value >> 32; + *denominator = value; + } } /*********************************************************************** @@ -3076,7 +3082,6 @@ HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MF { UINT32 flags, palette_size = 0, avgrate; MFVIDEOFORMAT *format; - UINT64 value; INT32 stride; GUID guid; @@ -3101,14 +3106,11 @@ HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MF format->surfaceInfo.Format = guid.Data1; } - if (SUCCEEDED(IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &value))) - media_type_get_ratio(value, &format->videoInfo.dwWidth, &format->videoInfo.dwHeight); - - if (SUCCEEDED(IMFMediaType_GetUINT64(media_type, &MF_MT_PIXEL_ASPECT_RATIO, &value))) - { - media_type_get_ratio(value, &format->videoInfo.PixelAspectRatio.Numerator, - &format->videoInfo.PixelAspectRatio.Denominator); - } + media_type_get_ratio(media_type, &MF_MT_FRAME_SIZE, &format->videoInfo.dwWidth, &format->videoInfo.dwHeight); + media_type_get_ratio(media_type, &MF_MT_PIXEL_ASPECT_RATIO, &format->videoInfo.PixelAspectRatio.Numerator, + &format->videoInfo.PixelAspectRatio.Denominator); + media_type_get_ratio(media_type, &MF_MT_FRAME_RATE, &format->videoInfo.FramesPerSecond.Numerator, + &format->videoInfo.FramesPerSecond.Denominator); IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_CHROMA_SITING, &format->videoInfo.SourceChromaSubsampling); IMFMediaType_GetUINT32(media_type, &MF_MT_INTERLACE_MODE, &format->videoInfo.InterlaceMode); @@ -3116,13 +3118,6 @@ HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MF IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_PRIMARIES, &format->videoInfo.ColorPrimaries); IMFMediaType_GetUINT32(media_type, &MF_MT_YUV_MATRIX, &format->videoInfo.TransferMatrix); IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_LIGHTING, &format->videoInfo.SourceLighting); - - if (SUCCEEDED(IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_RATE, &value))) - { - media_type_get_ratio(value, &format->videoInfo.FramesPerSecond.Numerator, - &format->videoInfo.FramesPerSecond.Denominator); - } - IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_NOMINAL_RANGE, &format->videoInfo.NominalRange); IMFMediaType_GetBlob(media_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&format->videoInfo.GeometricAperture, sizeof(format->videoInfo.GeometricAperture), NULL);

1 0

Nikolay Sivov : mfplat: Remove some unnecessary pointer casts.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: e5475da88e7be1d534b4470504e2614bf73e6183 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5475da88e7be1d534b44705… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 22 09:25:33 2021 +0300 mfplat: Remove some unnecessary pointer casts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index fae4d3e5055..e0dbb6a1a78 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -978,7 +978,7 @@ static const MFVIDEOFORMAT * WINAPI video_mediatype_GetVideoFormat(IMFVideoMedia TRACE("%p.\n", iface); CoTaskMemFree(media_type->video_format); - if (FAILED(hr = MFCreateMFVideoFormatFromMFMediaType((IMFMediaType *)iface, &media_type->video_format, &size))) + if (FAILED(hr = MFCreateMFVideoFormatFromMFMediaType(&media_type->IMFMediaType_iface, &media_type->video_format, &size))) WARN("Failed to create format description, hr %#x.\n", hr); return media_type->video_format; @@ -1378,9 +1378,11 @@ static const WAVEFORMATEX * WINAPI audio_mediatype_GetAudioFormat(IMFAudioMediaT TRACE("%p.\n", iface); CoTaskMemFree(media_type->audio_format); - if (FAILED(hr = MFCreateWaveFormatExFromMFMediaType((IMFMediaType *)iface, &media_type->audio_format, &size, - MFWaveFormatExConvertFlag_Normal))) + if (FAILED(hr = MFCreateWaveFormatExFromMFMediaType(&media_type->IMFMediaType_iface, &media_type->audio_format, + &size, MFWaveFormatExConvertFlag_Normal))) + { WARN("Failed to create wave format description, hr %#x.\n", hr); + } return media_type->audio_format; }

1 0

Rémi Bernon : ntdll: Make sure unix_name is zero terminated (valgrind).
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: b3f6f21d01b281cb928538237eea5c39ec7c0b08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3f6f21d01b281cb92853823… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 22 08:21:11 2021 +0200 ntdll: Make sure unix_name is zero terminated (valgrind). In nt_to_unix_file_name_no_root. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 488f7485ad8..e32de57190b 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3290,6 +3290,7 @@ static NTSTATUS nt_to_unix_file_name_no_root( const UNICODE_STRING *nameW, char if (prefix_len == name_len) /* no subdir, plain DOS device */ { + unix_name[pos + ret] = 0; *unix_name_ret = unix_name; return get_dos_device( unix_name_ret, pos ); }

1 0

Zebediah Figura : windows.media.speech: Link directly to combase.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: e01ad1d275572edf96cc50bb6bb4b344c568aa2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e01ad1d275572edf96cc50bb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 21 20:35:01 2021 -0500 windows.media.speech: Link directly to combase. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/tests/Makefile.in | 2 +- dlls/windows.media.speech/tests/speech.c | 50 ++++++----------------------- 2 files changed, 11 insertions(+), 41 deletions(-) diff --git a/dlls/windows.media.speech/tests/Makefile.in b/dlls/windows.media.speech/tests/Makefile.in index f3e458f53d1..2ee10d3db21 100644 --- a/dlls/windows.media.speech/tests/Makefile.in +++ b/dlls/windows.media.speech/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = windows.media.speech.dll -IMPORTS = uuid +IMPORTS = combase uuid C_SRCS = \ speech.c diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 1c48c5bf933..c949b35900b 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -34,13 +34,6 @@ #include "wine/test.h" -static HRESULT (WINAPI *pRoActivateInstance)(HSTRING, IInspectable **); -static HRESULT (WINAPI *pRoGetActivationFactory)(HSTRING, REFIID, void **); -static HRESULT (WINAPI *pRoInitialize)(RO_INIT_TYPE); -static void (WINAPI *pRoUninitialize)(void); -static HRESULT (WINAPI *pWindowsCreateString)(LPCWSTR, UINT32, HSTRING *); -static HRESULT (WINAPI *pWindowsDeleteString)(HSTRING); - static void test_SpeechSynthesizer(void) { static const WCHAR *speech_synthesizer_name = L"Windows.Media.SpeechSynthesis.SpeechSynthesizer"; @@ -55,13 +48,13 @@ static void test_SpeechSynthesizer(void) HRESULT hr; UINT32 size; - hr = pRoInitialize(RO_INIT_MULTITHREADED); + hr = RoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); - hr = pWindowsCreateString(speech_synthesizer_name, wcslen(speech_synthesizer_name), &str); + hr = WindowsCreateString(speech_synthesizer_name, wcslen(speech_synthesizer_name), &str); ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); - hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); ok(hr == S_OK, "RoGetActivationFactory failed, hr %#x\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable); @@ -116,9 +109,9 @@ static void test_SpeechSynthesizer(void) IInspectable_Release(inspectable); IActivationFactory_Release(factory); - pWindowsDeleteString(str); + WindowsDeleteString(str); - pRoUninitialize(); + RoUninitialize(); } static void test_VoiceInformation(void) @@ -129,45 +122,22 @@ static void test_VoiceInformation(void) HSTRING str; HRESULT hr; - hr = pRoInitialize(RO_INIT_MULTITHREADED); + hr = RoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); - hr = pWindowsCreateString(voice_information_name, wcslen(voice_information_name), &str); + hr = WindowsCreateString(voice_information_name, wcslen(voice_information_name), &str); ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); - hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); ok(hr == REGDB_E_CLASSNOTREG, "RoGetActivationFactory returned unexpected hr %#x\n", hr); - pWindowsDeleteString(str); + WindowsDeleteString(str); - pRoUninitialize(); + RoUninitialize(); } START_TEST(speech) { - HMODULE combase; - - if (!(combase = LoadLibraryW(L"combase.dll"))) - { - win_skip("Failed to load combase.dll, skipping tests\n"); - return; - } - -#define LOAD_FUNCPTR(x) \ - if (!(p##x = (void*)GetProcAddress(combase, #x))) \ - { \ - win_skip("Failed to find %s in combase.dll, skipping tests.\n", #x); \ - return; \ - } - - LOAD_FUNCPTR(RoActivateInstance); - LOAD_FUNCPTR(RoGetActivationFactory); - LOAD_FUNCPTR(RoInitialize); - LOAD_FUNCPTR(RoUninitialize); - LOAD_FUNCPTR(WindowsCreateString); - LOAD_FUNCPTR(WindowsDeleteString); -#undef LOAD_FUNCPTR - test_SpeechSynthesizer(); test_VoiceInformation(); }

1 0

Zebediah Figura : windows.media.devices: Link directly to combase.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: 923af67f24f9b7d552f2c4380c8bd359d4b6de41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=923af67f24f9b7d552f2c438… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 21 20:35:00 2021 -0500 windows.media.devices: Link directly to combase. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.devices/tests/Makefile.in | 2 +- dlls/windows.media.devices/tests/devices.c | 60 ++++++++-------------------- 2 files changed, 17 insertions(+), 45 deletions(-) diff --git a/dlls/windows.media.devices/tests/Makefile.in b/dlls/windows.media.devices/tests/Makefile.in index 42aa4ac9b10..4d107889dad 100644 --- a/dlls/windows.media.devices/tests/Makefile.in +++ b/dlls/windows.media.devices/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = windows.media.devices.dll -IMPORTS = ole32 +IMPORTS = combase C_SRCS = \ devices.c diff --git a/dlls/windows.media.devices/tests/devices.c b/dlls/windows.media.devices/tests/devices.c index f3777944848..d8acc638837 100644 --- a/dlls/windows.media.devices/tests/devices.c +++ b/dlls/windows.media.devices/tests/devices.c @@ -37,13 +37,6 @@ #include "wine/test.h" -static HRESULT (WINAPI *pRoGetActivationFactory)(HSTRING, REFIID, void **); -static HRESULT (WINAPI *pRoInitialize)(RO_INIT_TYPE); -static void (WINAPI *pRoUninitialize)(void); -static HRESULT (WINAPI *pWindowsCreateString)(LPCWSTR, UINT32, HSTRING *); -static HRESULT (WINAPI *pWindowsDeleteString)(HSTRING); -static WCHAR *(WINAPI *pWindowsGetStringRawBuffer)(HSTRING, UINT32 *); - static HRESULT (WINAPI *pActivateAudioInterfaceAsync)(const WCHAR *path, REFIID riid, PROPVARIANT *params, IActivateAudioInterfaceCompletionHandler *done_handler, @@ -141,12 +134,12 @@ static void test_MediaDeviceStatics(void) HRESULT hr; DWORD dr; - hr = pWindowsCreateString(media_device_statics_name, wcslen(media_device_statics_name), &str); + hr = WindowsCreateString(media_device_statics_name, wcslen(media_device_statics_name), &str); ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); - hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); ok(hr == S_OK, "RoGetActivationFactory failed, hr %#x\n", hr); - pWindowsDeleteString(str); + WindowsDeleteString(str); /* interface tests */ hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable); @@ -182,12 +175,12 @@ static void test_MediaDeviceStatics(void) if (g_default_capture_id) { - ok(wcsstr(pWindowsGetStringRawBuffer(str, NULL), g_default_capture_id) != NULL, + ok(wcsstr(WindowsGetStringRawBuffer(str, NULL), g_default_capture_id) != NULL, "Expected to find substring of default capture id in %s\n", - wine_dbgstr_w(pWindowsGetStringRawBuffer(str, NULL))); + wine_dbgstr_w(WindowsGetStringRawBuffer(str, NULL))); /* returned id does not work in GetDevice... */ - hr = IMMDeviceEnumerator_GetDevice(g_mmdevenum, pWindowsGetStringRawBuffer(str, NULL), &mmdev); + hr = IMMDeviceEnumerator_GetDevice(g_mmdevenum, WindowsGetStringRawBuffer(str, NULL), &mmdev); ok(hr == E_INVALIDARG, "GetDevice gave wrong error: %08x\n", hr); /* ...but does work in ActivateAudioInterfaceAsync */ @@ -199,7 +192,7 @@ static void test_MediaDeviceStatics(void) strcpy(async_activate_test.msg_pfx, "capture_activate"); EnterCriticalSection(&async_activate_test.lock); - hr = pActivateAudioInterfaceAsync(pWindowsGetStringRawBuffer(str, NULL), + hr = pActivateAudioInterfaceAsync(WindowsGetStringRawBuffer(str, NULL), &IID_IAudioClient2, NULL, &async_activate_done, &async_activate_test.op); ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); LeaveCriticalSection(&async_activate_test.lock); @@ -212,7 +205,7 @@ static void test_MediaDeviceStatics(void) ok(async_activate_test.result_iface != NULL, "Expected to get WASAPI interface, but got NULL\n"); IUnknown_Release(async_activate_test.result_iface); - pWindowsDeleteString(str); + WindowsDeleteString(str); } /* test default render device creation */ @@ -223,12 +216,12 @@ static void test_MediaDeviceStatics(void) if (g_default_render_id) { - ok(wcsstr(pWindowsGetStringRawBuffer(str, NULL), g_default_render_id) != NULL, + ok(wcsstr(WindowsGetStringRawBuffer(str, NULL), g_default_render_id) != NULL, "Expected to find substring of default render id in %s\n", - wine_dbgstr_w(pWindowsGetStringRawBuffer(str, NULL))); + wine_dbgstr_w(WindowsGetStringRawBuffer(str, NULL))); /* returned id does not work in GetDevice... */ - hr = IMMDeviceEnumerator_GetDevice(g_mmdevenum, pWindowsGetStringRawBuffer(str, NULL), &mmdev); + hr = IMMDeviceEnumerator_GetDevice(g_mmdevenum, WindowsGetStringRawBuffer(str, NULL), &mmdev); ok(hr == E_INVALIDARG, "GetDevice gave wrong error: %08x\n", hr); /* ...but does work in ActivateAudioInterfaceAsync */ @@ -240,7 +233,7 @@ static void test_MediaDeviceStatics(void) strcpy(async_activate_test.msg_pfx, "render_activate"); EnterCriticalSection(&async_activate_test.lock); - hr = pActivateAudioInterfaceAsync(pWindowsGetStringRawBuffer(str, NULL), + hr = pActivateAudioInterfaceAsync(WindowsGetStringRawBuffer(str, NULL), &IID_IAudioClient2, NULL, &async_activate_done, &async_activate_test.op); ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); LeaveCriticalSection(&async_activate_test.lock); @@ -253,7 +246,7 @@ static void test_MediaDeviceStatics(void) ok(async_activate_test.result_iface != NULL, "Expected to get WASAPI interface, but got NULL\n"); IUnknown_Release(async_activate_test.result_iface); - pWindowsDeleteString(str); + WindowsDeleteString(str); } /* cleanup */ @@ -264,31 +257,10 @@ static void test_MediaDeviceStatics(void) START_TEST(devices) { - HMODULE combase, mmdevapi; + HMODULE mmdevapi; IMMDevice *mmdev; HRESULT hr; - if (!(combase = LoadLibraryW(L"combase.dll"))) - { - win_skip("Failed to load combase.dll, skipping tests\n"); - return; - } - -#define LOAD_FUNCPTR(x) \ - if (!(p##x = (void*)GetProcAddress(combase, #x))) \ - { \ - win_skip("Failed to find %s in combase.dll, skipping tests.\n", #x); \ - return; \ - } - - LOAD_FUNCPTR(RoGetActivationFactory); - LOAD_FUNCPTR(RoInitialize); - LOAD_FUNCPTR(RoUninitialize); - LOAD_FUNCPTR(WindowsCreateString); - LOAD_FUNCPTR(WindowsDeleteString); - LOAD_FUNCPTR(WindowsGetStringRawBuffer); -#undef LOAD_FUNCPTR - if (!(mmdevapi = LoadLibraryW(L"mmdevapi.dll"))) { win_skip("Failed to load mmdevapi.dll, skipping tests\n"); @@ -305,7 +277,7 @@ START_TEST(devices) LOAD_FUNCPTR(ActivateAudioInterfaceAsync); #undef LOAD_FUNCPTR - hr = pRoInitialize(RO_INIT_MULTITHREADED); + hr = RoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, @@ -340,5 +312,5 @@ START_TEST(devices) CoTaskMemFree(g_default_render_id); IMMDeviceEnumerator_Release(g_mmdevenum); - pRoUninitialize(); + RoUninitialize(); }

1 0

Zebediah Figura : windows.globalization: Link directly to combase.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: 862684feaec45e3ae13cf6a8de793efff5e435f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=862684feaec45e3ae13cf6a8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 21 20:34:59 2021 -0500 windows.globalization: Link directly to combase. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.globalization/tests/Makefile.in | 2 +- dlls/windows.globalization/tests/globalization.c | 64 +++++++----------------- 2 files changed, 19 insertions(+), 47 deletions(-) diff --git a/dlls/windows.globalization/tests/Makefile.in b/dlls/windows.globalization/tests/Makefile.in index d928414c6ea..7ee2bc407d6 100644 --- a/dlls/windows.globalization/tests/Makefile.in +++ b/dlls/windows.globalization/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = windows.globalization.dll -IMPORTS = uuid +IMPORTS = combase uuid C_SRCS = \ globalization.c diff --git a/dlls/windows.globalization/tests/globalization.c b/dlls/windows.globalization/tests/globalization.c index 631c7ad2449..ebe7ccc4704 100644 --- a/dlls/windows.globalization/tests/globalization.c +++ b/dlls/windows.globalization/tests/globalization.c @@ -38,14 +38,6 @@ /* kernel32.dll */ static INT (WINAPI *pGetUserDefaultGeoName)(LPWSTR, int); -/* combase.dll */ -static HRESULT (WINAPI *pRoGetActivationFactory)(HSTRING, REFIID, void **); -static HRESULT (WINAPI *pRoInitialize)(RO_INIT_TYPE); -static void (WINAPI *pRoUninitialize)(void); -static HRESULT (WINAPI *pWindowsCreateString)(LPCWSTR, UINT32, HSTRING *); -static HRESULT (WINAPI *pWindowsDeleteString)(HSTRING); -static WCHAR *(WINAPI *pWindowsGetStringRawBuffer)(HSTRING, UINT32 *); - static void test_GlobalizationPreferences(void) { @@ -56,28 +48,29 @@ static void test_GlobalizationPreferences(void) IActivationFactory *factory = NULL; IInspectable *inspectable = NULL, *tmp_inspectable = NULL; IAgileObject *agile_object = NULL, *tmp_agile_object = NULL; + WCHAR locale[LOCALE_NAME_MAX_LENGTH]; HSTRING str, tmp_str; + const WCHAR *buf; BOOLEAN found; HRESULT hr; UINT32 len; - WCHAR *buf, locale[LOCALE_NAME_MAX_LENGTH]; UINT32 i, size; GetUserDefaultLocaleName(locale, LOCALE_NAME_MAX_LENGTH); - hr = pRoInitialize(RO_INIT_MULTITHREADED); + hr = RoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); - hr = pWindowsCreateString(class_name, wcslen(class_name), &str); + hr = WindowsCreateString(class_name, wcslen(class_name), &str); ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); - hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "RoGetActivationFactory failed, hr %#x\n", hr); if (hr == REGDB_E_CLASSNOTREG) { win_skip("%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w(class_name)); - pWindowsDeleteString(str); - pRoUninitialize(); + WindowsDeleteString(str); + RoUninitialize(); return; } @@ -103,7 +96,7 @@ static void test_GlobalizationPreferences(void) hr = IGlobalizationPreferencesStatics_get_HomeGeographicRegion(preferences_statics, &tmp_str); ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_HomeGeographicRegion failed, hr %#x\n", hr); - buf = pWindowsGetStringRawBuffer(tmp_str, &len); + buf = WindowsGetStringRawBuffer(tmp_str, &len); ok(buf != NULL && len > 0, "WindowsGetStringRawBuffer returned buf %p, len %u\n", buf, len); if (pGetUserDefaultGeoName) { @@ -116,7 +109,7 @@ static void test_GlobalizationPreferences(void) len, wine_dbgstr_w(buf), wine_dbgstr_w(country)); } - pWindowsDeleteString(tmp_str); + WindowsDeleteString(tmp_str); hr = IGlobalizationPreferencesStatics_get_Languages(preferences_statics, &languages); ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Languages failed, hr %#x\n", hr); @@ -138,7 +131,7 @@ static void test_GlobalizationPreferences(void) hr = IVectorView_HSTRING_GetAt(languages, 0, &tmp_str); ok(hr == S_OK, "IVectorView_HSTRING_GetAt failed, hr %#x\n", hr); - buf = pWindowsGetStringRawBuffer(tmp_str, &len); + buf = WindowsGetStringRawBuffer(tmp_str, &len); ok(buf != NULL && len > 0, "WindowsGetStringRawBuffer returned buf %p, len %u\n", buf, len); ok(wcslen(locale) == len && !memcmp(buf, locale, len), @@ -151,9 +144,9 @@ static void test_GlobalizationPreferences(void) ok(hr == S_OK, "IVectorView_HSTRING_IndexOf failed, hr %#x\n", hr); ok(i == 0 && found == TRUE, "IVectorView_HSTRING_IndexOf returned size %d, found %d\n", size, found); - pWindowsDeleteString(tmp_str); + WindowsDeleteString(tmp_str); - hr = pWindowsCreateString(L"deadbeef", 8, &tmp_str); + hr = WindowsCreateString(L"deadbeef", 8, &tmp_str); ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); i = 0xdeadbeef; @@ -162,7 +155,7 @@ static void test_GlobalizationPreferences(void) ok(hr == S_OK, "IVectorView_HSTRING_IndexOf failed, hr %#x\n", hr); ok(i == 0 && found == FALSE, "IVectorView_HSTRING_IndexOf returned size %d, found %d\n", size, found); - pWindowsDeleteString(tmp_str); + WindowsDeleteString(tmp_str); tmp_str = (HSTRING)0xdeadbeef; hr = IVectorView_HSTRING_GetAt(languages, size, &tmp_str); @@ -178,14 +171,14 @@ static void test_GlobalizationPreferences(void) ok(hr == S_OK, "IVectorView_HSTRING_GetAt failed, hr %#x\n", hr); ok(i == 1, "IVectorView_HSTRING_GetMany returned count %u, expected 1\n", i); - buf = pWindowsGetStringRawBuffer(tmp_str, &len); + buf = WindowsGetStringRawBuffer(tmp_str, &len); ok(buf != NULL && len > 0, "WindowsGetStringRawBuffer returned buf %p, len %u\n", buf, len); ok(wcslen(locale) == len && !memcmp(buf, locale, len), "IGlobalizationPreferencesStatics_get_Languages 0 returned len %u, str %s, expected %s\n", len, wine_dbgstr_w(buf), wine_dbgstr_w(locale)); - pWindowsDeleteString(tmp_str); + WindowsDeleteString(tmp_str); IVectorView_HSTRING_Release(languages); @@ -229,35 +222,14 @@ static void test_GlobalizationPreferences(void) IInspectable_Release(inspectable); IActivationFactory_Release(factory); - pWindowsDeleteString(str); + WindowsDeleteString(str); - pRoUninitialize(); + RoUninitialize(); } START_TEST(globalization) { - HMODULE combase, kernel32; - - if (!(combase = LoadLibraryW(L"combase.dll"))) - { - win_skip("Failed to load combase.dll, skipping tests\n"); - return; - } - -#define LOAD_FUNCPTR(x) \ - if (!(p##x = (void*)GetProcAddress(combase, #x))) \ - { \ - win_skip("Failed to find %s in combase.dll, skipping tests.\n", #x); \ - return; \ - } - - LOAD_FUNCPTR(RoGetActivationFactory); - LOAD_FUNCPTR(RoInitialize); - LOAD_FUNCPTR(RoUninitialize); - LOAD_FUNCPTR(WindowsCreateString); - LOAD_FUNCPTR(WindowsDeleteString); - LOAD_FUNCPTR(WindowsGetStringRawBuffer); -#undef LOAD_FUNCPTR + HMODULE kernel32; kernel32 = GetModuleHandleA("kernel32"); pGetUserDefaultGeoName = (void*)GetProcAddress(kernel32, "GetUserDefaultGeoName");

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
87
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 April 2021