August 2015 - Wine-commits - list.winehq.org

Józef Kucia : d3dx9: Fix miplevels handling for DDS file format.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: 853be6e1d86b7a23d16b59d5c9cb75095a9645c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=853be6e1d86b7a23d16b59d5c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 20 00:35:08 2015 +0200 d3dx9: Fix miplevels handling for DDS file format. --- dlls/d3dx9_36/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 6150575..c7ed74b 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -390,7 +390,7 @@ static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAG info->Width = header->width; info->Height = header->height; info->Depth = 1; - info->MipLevels = (header->flags & DDS_MIPMAPCOUNT) ? header->miplevels : 1; + info->MipLevels = header->miplevels ? header->miplevels : 1; info->Format = dds_pixel_format_to_d3dformat(&header->pixel_format); if (info->Format == D3DFMT_UNKNOWN)

1 0

Józef Kucia : d3dx9/tests: Add tests for DDS file format size validation.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: 520deb14d28f80bf3c98c6d4e3aaac2e83f645db URL: http://source.winehq.org/git/wine.git/?a=commit;h=520deb14d28f80bf3c98c6d4e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 20 00:35:09 2015 +0200 d3dx9/tests: Add tests for DDS file format size validation. --- dlls/d3dx9_36/tests/surface.c | 178 +++++++++++++++++++++++++++++------------- 1 file changed, 122 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=520deb14d28f80bf3c98c…

1 0

Józef Kucia : d3dx9: Use D3DFMT constants instead of MAKEFOURCC codes.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: ece3af7855f0d13d487719c5693b9e8fa27ad38e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece3af7855f0d13d487719c56… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 20 00:35:10 2015 +0200 d3dx9: Use D3DFMT constants instead of MAKEFOURCC codes. --- dlls/d3dx9_36/surface.c | 18 +++++++++--------- dlls/d3dx9_36/tests/surface.c | 32 ++++++++++++++++---------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index c7ed74b..b8bb710 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -146,15 +146,15 @@ static D3DFORMAT dds_fourcc_to_d3dformat(DWORD fourcc) { unsigned int i; static const DWORD known_fourcc[] = { - MAKEFOURCC('U','Y','V','Y'), - MAKEFOURCC('Y','U','Y','2'), - MAKEFOURCC('R','G','B','G'), - MAKEFOURCC('G','R','G','B'), - MAKEFOURCC('D','X','T','1'), - MAKEFOURCC('D','X','T','2'), - MAKEFOURCC('D','X','T','3'), - MAKEFOURCC('D','X','T','4'), - MAKEFOURCC('D','X','T','5'), + D3DFMT_UYVY, + D3DFMT_YUY2, + D3DFMT_R8G8_B8G8, + D3DFMT_G8R8_G8B8, + D3DFMT_DXT1, + D3DFMT_DXT2, + D3DFMT_DXT3, + D3DFMT_DXT4, + D3DFMT_DXT5, D3DFMT_R16F, D3DFMT_G16R16F, D3DFMT_A16B16G16R16F, diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index f2cc3bc..1697a03 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -318,19 +318,19 @@ static void test_dds_header_handling(void) { { 32, DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 }, DDS_PITCH, 4, 4, -1 /* pitch */, 0, 64, { D3D_OK, 1 } }, /* linear size is ignored */ - { { 32, DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0 }, 0, 4, 4, 0, 0, + { { 32, DDS_PF_FOURCC, D3DFMT_DXT1, 0, 0, 0, 0, 0 }, 0, 4, 4, 0, 0, 7 /* pixel data size */, { D3DXERR_INVALIDDATA, 1 } }, - { { 32, DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 0 /* linear size */, 0, + { { 32, DDS_PF_FOURCC, D3DFMT_DXT1, 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 0 /* linear size */, 0, 8, { D3D_OK, 1 } }, - { { 32, DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 1 /* linear size */, 0, + { { 32, DDS_PF_FOURCC, D3DFMT_DXT1, 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 1 /* linear size */, 0, 8, { D3D_OK, 1 } }, - { { 32, DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 2 /* linear size */, 0, + { { 32, DDS_PF_FOURCC, D3DFMT_DXT1, 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 2 /* linear size */, 0, 8, { D3D_OK, 1 } }, - { { 32, DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 9 /* linear size */, 0, + { { 32, DDS_PF_FOURCC, D3DFMT_DXT1, 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 9 /* linear size */, 0, 8, { D3D_OK, 1 } }, - { { 32, DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 16 /* linear size */, 0, + { { 32, DDS_PF_FOURCC, D3DFMT_DXT1, 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 16 /* linear size */, 0, 8, { D3D_OK, 1 } }, - { { 32, DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, -1 /* linear size */, 0, + { { 32, DDS_PF_FOURCC, D3DFMT_DXT1, 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, -1 /* linear size */, 0, 8, { D3D_OK, 1 } }, /* integer overflows */ { { 32, DDS_PF_RGB, 0, 32, 0xff0000, 0x00ff00, 0x0000ff, 0 }, 0, 0x80000000, 0x80000000 /* 0x80000000 * 0x80000000 * 4 = 0 */, 0, 0, @@ -610,15 +610,15 @@ static void test_D3DXGetImageInfo(void) ok(info.ImageFileFormat == D3DXIFF_DDS, "Got image file format %#x, expected %#x\n", info.ImageFileFormat, D3DXIFF_DDS); } else skip("Couldn't get image info from volume map in memory\n"); - check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0, D3DFMT_DXT1); - check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','2'), 0, 0, 0, 0, 0, D3DFMT_DXT2); - check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','3'), 0, 0, 0, 0, 0, D3DFMT_DXT3); - check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','4'), 0, 0, 0, 0, 0, D3DFMT_DXT4); - check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','5'), 0, 0, 0, 0, 0, D3DFMT_DXT5); - check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('R','G','B','G'), 0, 0, 0, 0, 0, D3DFMT_R8G8_B8G8); - check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('G','R','G','B'), 0, 0, 0, 0, 0, D3DFMT_G8R8_G8B8); - check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('U','Y','V','Y'), 0, 0, 0, 0, 0, D3DFMT_UYVY); - check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('Y','U','Y','2'), 0, 0, 0, 0, 0, D3DFMT_YUY2); + check_dds_pixel_format(DDS_PF_FOURCC, D3DFMT_DXT1, 0, 0, 0, 0, 0, D3DFMT_DXT1); + check_dds_pixel_format(DDS_PF_FOURCC, D3DFMT_DXT2, 0, 0, 0, 0, 0, D3DFMT_DXT2); + check_dds_pixel_format(DDS_PF_FOURCC, D3DFMT_DXT3, 0, 0, 0, 0, 0, D3DFMT_DXT3); + check_dds_pixel_format(DDS_PF_FOURCC, D3DFMT_DXT4, 0, 0, 0, 0, 0, D3DFMT_DXT4); + check_dds_pixel_format(DDS_PF_FOURCC, D3DFMT_DXT5, 0, 0, 0, 0, 0, D3DFMT_DXT5); + check_dds_pixel_format(DDS_PF_FOURCC, D3DFMT_R8G8_B8G8, 0, 0, 0, 0, 0, D3DFMT_R8G8_B8G8); + check_dds_pixel_format(DDS_PF_FOURCC, D3DFMT_G8R8_G8B8, 0, 0, 0, 0, 0, D3DFMT_G8R8_G8B8); + check_dds_pixel_format(DDS_PF_FOURCC, D3DFMT_UYVY, 0, 0, 0, 0, 0, D3DFMT_UYVY); + check_dds_pixel_format(DDS_PF_FOURCC, D3DFMT_YUY2, 0, 0, 0, 0, 0, D3DFMT_YUY2); check_dds_pixel_format(DDS_PF_RGB, 0, 16, 0xf800, 0x07e0, 0x001f, 0, D3DFMT_R5G6B5); check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 16, 0x7c00, 0x03e0, 0x001f, 0x8000, D3DFMT_A1R5G5B5); check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 16, 0x0f00, 0x00f0, 0x000f, 0xf000, D3DFMT_A4R4G4B4);

1 0

Daniel Lehman : kernel32: Return LOCALE_INVARIANT from ConvertDefaultLocale.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: 5bf1423c2c5c081109848d8ac629796b4fbc432c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bf1423c2c5c081109848d8ac… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Aug 17 14:36:19 2015 -0700 kernel32: Return LOCALE_INVARIANT from ConvertDefaultLocale. --- dlls/kernel32/locale.c | 3 +++ dlls/kernel32/tests/locale.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index eaf1183..c0a66ef 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2513,6 +2513,9 @@ LCID WINAPI ConvertDefaultLocale( LCID lcid ) switch (lcid) { + case LOCALE_INVARIANT: + /* keep as-is */ + break; case LOCALE_SYSTEM_DEFAULT: lcid = GetSystemDefaultLCID(); break; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 86adcdb..51e2b07 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3132,6 +3132,9 @@ static void test_ConvertDefaultLocale(void) LCID_RES(LOCALE_SYSTEM_DEFAULT, GetSystemDefaultLCID()); LCID_RES(LOCALE_USER_DEFAULT, GetUserDefaultLCID()); LCID_RES(LOCALE_NEUTRAL, GetUserDefaultLCID()); + lcid = ConvertDefaultLocale(LOCALE_INVARIANT); + ok(lcid == LOCALE_INVARIANT || broken(lcid == 0x47f) /* win2k[3]/winxp */, + "Expected lcid = %08x, got %08x\n", LOCALE_INVARIANT, lcid); } static BOOL CALLBACK langgrp_procA(LGRPID lgrpid, LPSTR lpszNum, LPSTR lpszName,

1 0

Sebastian Lackner : notepad: New files should be created immediately.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: 8a730168196d45f4364473b93e73bd74ad4378ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a730168196d45f4364473b93… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 25 06:57:58 2015 +0200 notepad: New files should be created immediately. --- programs/notepad/main.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 480f866..20e887b 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -702,9 +702,18 @@ static void HandleCommandLine(LPWSTR cmdline) { switch (AlertFileDoesNotExist(file_name)) { case IDYES: + { + + HANDLE file; SetFileNameAndEncoding(file_name, ENCODING_ANSI); + + file = CreateFileW(file_name, GENERIC_WRITE, FILE_SHARE_WRITE, + NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (file != INVALID_HANDLE_VALUE) CloseHandle(file); + UpdateWindowCaption(); break; + } case IDNO: break;

1 0

Józef Kucia : d3d11/tests: Add test for D3D11CreateDevice.
by Alexandre Julliard 24 Aug '15

24 Aug '15

Module: wine Branch: master Commit: 6038e2ab7957b65dd2e13ddd414c206718fb14b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6038e2ab7957b65dd2e13ddd4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 24 01:04:27 2015 +0200 d3d11/tests: Add test for D3D11CreateDevice. --- dlls/d3d11/tests/d3d11.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0595ead..f313806 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -21,6 +21,12 @@ #include "d3d11.h" #include "wine/test.h" +static ULONG get_refcount(IUnknown *iface) +{ + IUnknown_AddRef(iface); + return IUnknown_Release(iface); +} + static ID3D11Device *create_device(D3D_FEATURE_LEVEL feature_level) { ID3D11Device *device; @@ -38,6 +44,52 @@ static ID3D11Device *create_device(D3D_FEATURE_LEVEL feature_level) return NULL; } +static void test_create_device(void) +{ + D3D_FEATURE_LEVEL feature_level, supported_feature_level; + ID3D11DeviceContext *immediate_context = NULL; + ID3D11Device *device; + ULONG refcount; + HRESULT hr; + + hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, &device, + NULL, NULL); + if (FAILED(hr)) + { + skip("Failed to create HAL device, skipping tests.\n"); + return; + } + + supported_feature_level = ID3D11Device_GetFeatureLevel(device); + ID3D11Device_Release(device); + + hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "D3D11CreateDevice failed %#x.\n", hr); + + hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, + &feature_level, NULL); + ok(SUCCEEDED(hr), "D3D11CreateDevice failed %#x.\n", hr); + ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", + feature_level, supported_feature_level); + + hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, NULL, + &immediate_context); + ok(SUCCEEDED(hr), "D3D11CreateDevice failed %#x.\n", hr); + + todo_wine ok(!!immediate_context, "Immediate context is NULL.\n"); + if (!immediate_context) return; + + refcount = get_refcount((IUnknown *)immediate_context); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + ID3D11DeviceContext_GetDevice(immediate_context, &device); + refcount = ID3D11Device_Release(device); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + refcount = ID3D11DeviceContext_Release(immediate_context); + ok(!refcount, "ID3D11DeviceContext has %u references left.\n", refcount); +} + static void test_device_interfaces(void) { static const D3D_FEATURE_LEVEL feature_levels[] = @@ -96,5 +148,6 @@ static void test_device_interfaces(void) START_TEST(d3d11) { + test_create_device(); test_device_interfaces(); }

1 0

Andrew Eikum : xaudio2: Implement IXAudio2::GetDeviceDetails.
by Alexandre Julliard 24 Aug '15

24 Aug '15

Module: wine Branch: master Commit: cc22fdaf4e790c578b8b9135866153590047e82c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc22fdaf4e790c578b8b91358… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 21 11:22:13 2015 -0500 xaudio2: Implement IXAudio2::GetDeviceDetails. --- configure | 1 + configure.ac | 1 + dlls/xaudio2_7/tests/Makefile.in | 5 + dlls/xaudio2_7/tests/xaudio2.c | 93 ++++++++++++++++++ dlls/xaudio2_7/xaudio_dll.c | 197 +++++++++++++++++++++++++++++++++++++-- 5 files changed, 289 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc22fdaf4e790c578b8b9…

1 0

Andrew Eikum : xaudio2: Implement IXAudio2SourceVoice::SetOutputVoices.
by Alexandre Julliard 24 Aug '15

24 Aug '15

Module: wine Branch: master Commit: 8bf4f9068c0675facafa31ebd41c722e2ebce2dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bf4f9068c0675facafa31ebd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 21 11:22:20 2015 -0500 xaudio2: Implement IXAudio2SourceVoice::SetOutputVoices. --- dlls/xaudio2_7/xaudio_dll.c | 52 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 39a5a79..6bb48e6 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -108,10 +108,14 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources(instance); } +typedef struct _IXAudio2Impl IXAudio2Impl; + typedef struct _XA2SourceImpl { IXAudio27SourceVoice IXAudio27SourceVoice_iface; IXAudio2SourceVoice IXAudio2SourceVoice_iface; + IXAudio2Impl *xa2; + BOOL in_use; CRITICAL_SECTION lock; @@ -120,6 +124,9 @@ typedef struct _XA2SourceImpl { IXAudio2VoiceCallback *cb; + DWORD nsends; + XAUDIO2_SEND_DESCRIPTOR *sends; + struct list entry; } XA2SourceImpl; @@ -148,7 +155,7 @@ XA2SubmixImpl *impl_from_IXAudio2SubmixVoice(IXAudio2SubmixVoice *iface) return CONTAINING_RECORD(iface, XA2SubmixImpl, IXAudio2SubmixVoice_iface); } -typedef struct { +struct _IXAudio2Impl { IXAudio27 IXAudio27_iface; IXAudio2 IXAudio2_iface; IXAudio2MasteringVoice IXAudio2MasteringVoice_iface; @@ -166,7 +173,7 @@ typedef struct { WCHAR **devids; UINT32 ndevs; -} IXAudio2Impl; +}; static inline IXAudio2Impl *impl_from_IXAudio2(IXAudio2 *iface) { @@ -194,7 +201,38 @@ static HRESULT WINAPI XA2SRC_SetOutputVoices(IXAudio2SourceVoice *iface, const XAUDIO2_VOICE_SENDS *pSendList) { XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + int i; + XAUDIO2_VOICE_SENDS def_send; + XAUDIO2_SEND_DESCRIPTOR def_desc; + TRACE("%p, %p\n", This, pSendList); + + if(!pSendList){ + def_desc.Flags = 0; + def_desc.pOutputVoice = (IXAudio2Voice*)&This->xa2->IXAudio2MasteringVoice_iface; + + def_send.SendCount = 1; + def_send.pSends = &def_desc; + + pSendList = &def_send; + } + + if(TRACE_ON(xaudio2)){ + for(i = 0; i < pSendList->SendCount; ++i){ + XAUDIO2_SEND_DESCRIPTOR *desc = &pSendList->pSends[i]; + TRACE("Outputting to: 0x%x, %p\n", desc->Flags, desc->pOutputVoice); + } + } + + if(This->nsends < pSendList->SendCount){ + HeapFree(GetProcessHeap(), 0, This->sends); + This->sends = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->sends) * pSendList->SendCount); + This->nsends = pSendList->SendCount; + }else + memset(This->sends, 0, sizeof(*This->sends) * This->nsends); + + memcpy(This->sends, pSendList->pSends, sizeof(*This->sends) * pSendList->SendCount); + return S_OK; } @@ -1114,6 +1152,7 @@ static ULONG WINAPI IXAudio2Impl_Release(IXAudio2 *iface) XA2SubmixImpl *sub, *sub2; LIST_FOR_EACH_ENTRY_SAFE(src, src2, &This->source_voices, XA2SourceImpl, entry){ + HeapFree(GetProcessHeap(), 0, src->sends); IXAudio2SourceVoice_DestroyVoice(&src->IXAudio2SourceVoice_iface); DeleteCriticalSection(&src->lock); HeapFree(GetProcessHeap(), 0, src); @@ -1180,6 +1219,7 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, { IXAudio2Impl *This = impl_from_IXAudio2(iface); XA2SourceImpl *src; + HRESULT hr; TRACE("(%p)->(%p, %p, 0x%x, %f, %p, %p, %p)\n", This, ppSourceVoice, pSourceFormat, flags, maxFrequencyRatio, pCallback, pSendList, @@ -1208,6 +1248,8 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, InitializeCriticalSection(&src->lock); src->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": XA2SourceImpl.lock"); + + src->xa2 = This; } src->in_use = TRUE; @@ -1218,6 +1260,12 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, src->fmt = copy_waveformat(pSourceFormat); + hr = XA2SRC_SetOutputVoices(&src->IXAudio2SourceVoice_iface, pSendList); + if(FAILED(hr)){ + src->in_use = FALSE; + return hr; + } + if(This->version == 27) *ppSourceVoice = (IXAudio2SourceVoice*)&src->IXAudio27SourceVoice_iface; else

1 0

Bruno Jesus : msvidc32: Improve trace messages from CRAM_DecompressQuery.
by Alexandre Julliard 24 Aug '15

24 Aug '15

Module: wine Branch: master Commit: 59222af9c5d3c89a5dc2ab8f652b57f5847bc227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59222af9c5d3c89a5dc2ab8f6… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Aug 23 20:48:54 2015 +0800 msvidc32: Improve trace messages from CRAM_DecompressQuery. --- dlls/msvidc32/msvideo1.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 49f9700..61baa9e 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -299,16 +299,19 @@ CRAM_DecompressQuery( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO out ) if( (info==NULL) || (info->dwMagic!=CRAM_MAGIC) ) return ICERR_BADPARAM; - TRACE("planes = %d\n", in->bmiHeader.biPlanes ); - TRACE("bpp = %d\n", in->bmiHeader.biBitCount ); - TRACE("height = %d\n", in->bmiHeader.biHeight ); - TRACE("width = %d\n", in->bmiHeader.biWidth ); - TRACE("compr = %x\n", in->bmiHeader.biCompression ); + TRACE("in->planes = %d\n", in->bmiHeader.biPlanes ); + TRACE("in->bpp = %d\n", in->bmiHeader.biBitCount ); + TRACE("in->height = %d\n", in->bmiHeader.biHeight ); + TRACE("in->width = %d\n", in->bmiHeader.biWidth ); + TRACE("in->compr = 0x%x\n", in->bmiHeader.biCompression ); if( ( in->bmiHeader.biCompression != CRAM_MAGIC ) && ( in->bmiHeader.biCompression != MSVC_MAGIC ) && ( in->bmiHeader.biCompression != WHAM_MAGIC ) ) + { + TRACE("can't do 0x%x compression\n", in->bmiHeader.biCompression); return ICERR_BADFORMAT; + } if( ( in->bmiHeader.biBitCount != 16 ) && ( in->bmiHeader.biBitCount != 8 ) ) @@ -320,18 +323,21 @@ CRAM_DecompressQuery( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO out ) /* output must be same dimensions as input */ if( out ) { - if( in->bmiHeader.biBitCount != out->bmiHeader.biBitCount ) - return ICERR_BADFORMAT; - if( in->bmiHeader.biPlanes != out->bmiHeader.biPlanes ) - return ICERR_BADFORMAT; - if( in->bmiHeader.biHeight != out->bmiHeader.biHeight ) - return ICERR_BADFORMAT; - if( in->bmiHeader.biWidth != out->bmiHeader.biWidth ) + TRACE("out->planes = %d\n", out->bmiHeader.biPlanes ); + TRACE("out->bpp = %d\n", out->bmiHeader.biBitCount ); + TRACE("out->height = %d\n", out->bmiHeader.biHeight ); + TRACE("out->width = %d\n", out->bmiHeader.biWidth ); + if(( in->bmiHeader.biBitCount != out->bmiHeader.biBitCount ) || + ( in->bmiHeader.biPlanes != out->bmiHeader.biPlanes ) || + ( in->bmiHeader.biHeight != out->bmiHeader.biHeight ) || + ( in->bmiHeader.biWidth != out->bmiHeader.biWidth )) + { + TRACE("incompatible output requested\n"); return ICERR_BADFORMAT; + } } TRACE("OK!\n"); - return ICERR_OK; }

1 0

Sebastian Lackner : mfplat: Add missing export of MFGetPluginControl to specfile.
by Alexandre Julliard 24 Aug '15

24 Aug '15

Module: wine Branch: master Commit: 60d159af4576723c6d8d3329751d420d47836a46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60d159af4576723c6d8d33297… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Aug 24 03:51:37 2015 +0200 mfplat: Add missing export of MFGetPluginControl to specfile. This part was missing in b33d7b869011b0485ce8296004feeea901391a79. --- dlls/mfplat/mfplat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 7100dfd..0b402b7 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -94,7 +94,7 @@ @ stub MFGetNumericNameFromSockaddr @ stub MFGetPlaneSize @ stub MFGetPlatform -@ stub MFGetPluginControl +@ stdcall MFGetPluginControl(ptr) @ stub MFGetPrivateWorkqueues @ stub MFGetSockaddrFromNumericName @ stub MFGetStrideForBitmapInfoHeader

1 0